Fossil SCM

Fix oversize lines in the update.c source file.

drh 2012-02-03 17:00 trunk
Commit b18a178d8eb8f305d79f816a2379ab46d08293e7
Parent 68d84047c0a4dcc…
1 file changed +13 -7
~ src/update.c
M src/update.c
+13 -7
--- src/update.c
+++ src/update.c
@@ -263,22 +263,26 @@
263263
 /*
264264
 ** Add islink information
265265
 */
266266
 db_multi_exec(
267267
 "UPDATE fv SET"
268
- " islinkv=coalesce((SELECT islink FROM vfile WHERE vid=%d AND pathname=fnt),0),"
269
- " islinkt=coalesce((SELECT islink FROM vfile WHERE vid=%d AND pathname=fnt),0)",
268
+ " islinkv=coalesce((SELECT islink FROM vfile"
269
+ " WHERE vid=%d AND pathname=fnt),0),"
270
+ " islinkt=coalesce((SELECT islink FROM vfile"
271
+ " WHERE vid=%d AND pathname=fnt),0)",
270272
 vid, tid
271273
 );
272274
273275
274276
 if( debugFlag ){
275277
 db_prepare(&q,
276
- "SELECT rowid, fn, fnt, chnged, ridv, ridt, isexe, islinkv, islinkt FROM fv"
278
+ "SELECT rowid, fn, fnt, chnged, ridv, ridt, isexe,"
279
+ " islinkv, islinkt FROM fv"
277280
 );
278281
 while( db_step(&q)==SQLITE_ROW ){
279
- fossil_print("%3d: ridv=%-4d ridt=%-4d chnged=%d isexe=%d islinkv=%d islinkt=%d\n",
282
+ fossil_print("%3d: ridv=%-4d ridt=%-4d chnged=%d isexe=%d"
283
+ " islinkv=%d islinkt=%d\n",
280284
 db_column_int(&q, 0),
281285
 db_column_int(&q, 4),
282286
 db_column_int(&q, 5),
283287
 db_column_int(&q, 3),
284288
 db_column_int(&q, 6),
@@ -325,11 +329,12 @@
325329
 /*
326330
 ** Alter the content of the checkout so that it conforms with the
327331
 ** target
328332
 */
329333
 db_prepare(&q,
330
- "SELECT fn, idv, ridv, idt, ridt, chnged, fnt, isexe, islinkv, islinkt FROM fv ORDER BY 1"
334
+ "SELECT fn, idv, ridv, idt, ridt, chnged, fnt,"
335
+ " isexe, islinkv, islinkt FROM fv ORDER BY 1"
331336
 );
332337
 db_prepare(&mtimeXfer,
333338
 "UPDATE vfile SET mtime=(SELECT mtime FROM vfile WHERE id=:idv)"
334339
 " WHERE id=:idt"
335340
 );
@@ -666,11 +671,12 @@
666671
 int isExe = 0;
667672
 int isLink = 0;
668673
 char *zFull;
669674
 zFile = db_column_text(&q, 0);
670675
 zFull = mprintf("%/%/", g.zLocalRoot, zFile);
671
- errCode = historical_version_of_file(zRevision, zFile, &record, &isLink, &isExe,2);
676
+ errCode = historical_version_of_file(zRevision, zFile, &record,
677
+ &isLink, &isExe,2);
672678
 if( errCode==2 ){
673679
 if( db_int(0, "SELECT rid FROM vfile WHERE pathname=%Q", zFile)==0 ){
674680
 fossil_print("UNMANAGE: %s\n", zFile);
675681
 }else{
676682
 undo_save(zFile);
@@ -692,11 +698,11 @@
692698
 file_wd_setexe(zFull, isExe);
693699
 fossil_print("REVERTED: %s\n", zFile);
694700
 mtime = file_wd_mtime(zFull);
695701
 db_multi_exec(
696702
 "UPDATE vfile"
697
- " SET mtime=%lld, chnged=0, deleted=0, isexe=%d, islink=%d, mrid=rid,"
703
+ " SET mtime=%lld, chnged=0, deleted=0, isexe=%d, islink=%d,mrid=rid,"
698704
 " pathname=coalesce(origname,pathname), origname=NULL"
699705
 " WHERE pathname=%Q",
700706
 mtime, isExe, isLink, zFile
701707
 );
702708
 }
703709
--- src/update.c
+++ src/update.c
@@ -263,22 +263,26 @@
263 /*
264 ** Add islink information
265 */
266 db_multi_exec(
267 "UPDATE fv SET"
268 " islinkv=coalesce((SELECT islink FROM vfile WHERE vid=%d AND pathname=fnt),0),"
269 " islinkt=coalesce((SELECT islink FROM vfile WHERE vid=%d AND pathname=fnt),0)",
 
 
270 vid, tid
271 );
272
273
274 if( debugFlag ){
275 db_prepare(&q,
276 "SELECT rowid, fn, fnt, chnged, ridv, ridt, isexe, islinkv, islinkt FROM fv"
 
277 );
278 while( db_step(&q)==SQLITE_ROW ){
279 fossil_print("%3d: ridv=%-4d ridt=%-4d chnged=%d isexe=%d islinkv=%d islinkt=%d\n",
 
280 db_column_int(&q, 0),
281 db_column_int(&q, 4),
282 db_column_int(&q, 5),
283 db_column_int(&q, 3),
284 db_column_int(&q, 6),
@@ -325,11 +329,12 @@
325 /*
326 ** Alter the content of the checkout so that it conforms with the
327 ** target
328 */
329 db_prepare(&q,
330 "SELECT fn, idv, ridv, idt, ridt, chnged, fnt, isexe, islinkv, islinkt FROM fv ORDER BY 1"
 
331 );
332 db_prepare(&mtimeXfer,
333 "UPDATE vfile SET mtime=(SELECT mtime FROM vfile WHERE id=:idv)"
334 " WHERE id=:idt"
335 );
@@ -666,11 +671,12 @@
666 int isExe = 0;
667 int isLink = 0;
668 char *zFull;
669 zFile = db_column_text(&q, 0);
670 zFull = mprintf("%/%/", g.zLocalRoot, zFile);
671 errCode = historical_version_of_file(zRevision, zFile, &record, &isLink, &isExe,2);
 
672 if( errCode==2 ){
673 if( db_int(0, "SELECT rid FROM vfile WHERE pathname=%Q", zFile)==0 ){
674 fossil_print("UNMANAGE: %s\n", zFile);
675 }else{
676 undo_save(zFile);
@@ -692,11 +698,11 @@
692 file_wd_setexe(zFull, isExe);
693 fossil_print("REVERTED: %s\n", zFile);
694 mtime = file_wd_mtime(zFull);
695 db_multi_exec(
696 "UPDATE vfile"
697 " SET mtime=%lld, chnged=0, deleted=0, isexe=%d, islink=%d, mrid=rid,"
698 " pathname=coalesce(origname,pathname), origname=NULL"
699 " WHERE pathname=%Q",
700 mtime, isExe, isLink, zFile
701 );
702 }
703
--- src/update.c
+++ src/update.c
@@ -263,22 +263,26 @@
263 /*
264 ** Add islink information
265 */
266 db_multi_exec(
267 "UPDATE fv SET"
268 " islinkv=coalesce((SELECT islink FROM vfile"
269 " WHERE vid=%d AND pathname=fnt),0),"
270 " islinkt=coalesce((SELECT islink FROM vfile"
271 " WHERE vid=%d AND pathname=fnt),0)",
272 vid, tid
273 );
274
275
276 if( debugFlag ){
277 db_prepare(&q,
278 "SELECT rowid, fn, fnt, chnged, ridv, ridt, isexe,"
279 " islinkv, islinkt FROM fv"
280 );
281 while( db_step(&q)==SQLITE_ROW ){
282 fossil_print("%3d: ridv=%-4d ridt=%-4d chnged=%d isexe=%d"
283 " islinkv=%d islinkt=%d\n",
284 db_column_int(&q, 0),
285 db_column_int(&q, 4),
286 db_column_int(&q, 5),
287 db_column_int(&q, 3),
288 db_column_int(&q, 6),
@@ -325,11 +329,12 @@
329 /*
330 ** Alter the content of the checkout so that it conforms with the
331 ** target
332 */
333 db_prepare(&q,
334 "SELECT fn, idv, ridv, idt, ridt, chnged, fnt,"
335 " isexe, islinkv, islinkt FROM fv ORDER BY 1"
336 );
337 db_prepare(&mtimeXfer,
338 "UPDATE vfile SET mtime=(SELECT mtime FROM vfile WHERE id=:idv)"
339 " WHERE id=:idt"
340 );
@@ -666,11 +671,12 @@
671 int isExe = 0;
672 int isLink = 0;
673 char *zFull;
674 zFile = db_column_text(&q, 0);
675 zFull = mprintf("%/%/", g.zLocalRoot, zFile);
676 errCode = historical_version_of_file(zRevision, zFile, &record,
677 &isLink, &isExe,2);
678 if( errCode==2 ){
679 if( db_int(0, "SELECT rid FROM vfile WHERE pathname=%Q", zFile)==0 ){
680 fossil_print("UNMANAGE: %s\n", zFile);
681 }else{
682 undo_save(zFile);
@@ -692,11 +698,11 @@
698 file_wd_setexe(zFull, isExe);
699 fossil_print("REVERTED: %s\n", zFile);
700 mtime = file_wd_mtime(zFull);
701 db_multi_exec(
702 "UPDATE vfile"
703 " SET mtime=%lld, chnged=0, deleted=0, isexe=%d, islink=%d,mrid=rid,"
704 " pathname=coalesce(origname,pathname), origname=NULL"
705 " WHERE pathname=%Q",
706 mtime, isExe, isLink, zFile
707 );
708 }
709

Keyboard Shortcuts

Open search /
Next entry (timeline) j
Previous entry (timeline) k
Open focused entry Enter
Show this help ?
Toggle theme Top nav button