Fossil SCM

merge trunk. Add fossil and fossil.exe to "ignore-glob".

jan.nijtmans 2013-03-14 14:41 clean-with-ignore merge
Commit 4acff0a6d34bb2ecafd059401fe9331acfa4723b
Parent 4aa55e553336b21…
3 files changed +2 +2 +9 -4
~ .fossil-settings/ignore-glob + .fossil-settings/ignore-glob ~ src/diff.c
M .fossil-settings/ignore-glob
+2
--- .fossil-settings/ignore-glob
+++ .fossil-settings/ignore-glob
@@ -5,5 +5,7 @@
55
 Makefile
66
 bld/*
77
 wbld/*
88
 autoconfig.h
99
 config.log
10
+fossil
11
+fossil.exe
1012
--- .fossil-settings/ignore-glob
+++ .fossil-settings/ignore-glob
@@ -5,5 +5,7 @@
5 Makefile
6 bld/*
7 wbld/*
8 autoconfig.h
9 config.log
 
 
10
--- .fossil-settings/ignore-glob
+++ .fossil-settings/ignore-glob
@@ -5,5 +5,7 @@
5 Makefile
6 bld/*
7 wbld/*
8 autoconfig.h
9 config.log
10 fossil
11 fossil.exe
12
A .fossil-settings/ignore-glob
+2
--- .fossil-settings/ignore-glob
+++ .fossil-settings/ignore-glob
@@ -5,5 +5,7 @@
55
 Makefile
66
 bld/*
77
 wbld/*
88
 autoconfig.h
99
 config.log
10
+fossil
11
+fossil.exe
1012
--- .fossil-settings/ignore-glob
+++ .fossil-settings/ignore-glob
@@ -5,5 +5,7 @@
5 Makefile
6 bld/*
7 wbld/*
8 autoconfig.h
9 config.log
 
 
10
--- .fossil-settings/ignore-glob
+++ .fossil-settings/ignore-glob
@@ -5,5 +5,7 @@
5 Makefile
6 bld/*
7 wbld/*
8 autoconfig.h
9 config.log
10 fossil
11 fossil.exe
12
M src/diff.c
+9 -4
--- src/diff.c
+++ src/diff.c
@@ -2265,11 +2265,12 @@
22652265
 fossil_print("%10s: %.*s\n", zSrc, x.aOrig[i].n, x.aOrig[i].z);
22662266
 }
22672267
 }
22682268
22692269
 /* Annotation flags */
2270
-#define ANN_FILE_VERS 0x001 /* Show file version rather than commit version */
2270
+#define ANN_FILE_VERS 0x01 /* Show file vers rather than commit vers */
2271
+#define ANN_FILE_ANCEST 0x02 /* Prefer check-ins in the ANCESTOR table */
22712272
22722273
 /*
22732274
 ** Compute a complete annotation on a file. The file is identified
22742275
 ** by its filename number (filename.fnid) and the baseline in which
22752276
 ** it was checked in (mlink.mid).
@@ -2306,12 +2307,14 @@
23062307
 " coalesce(event.euser,event.user),"
23072308
 " mlink.pid"
23082309
 " FROM mlink, event"
23092310
 " WHERE mlink.fid=:rid"
23102311
 " AND event.objid=mlink.mid"
2311
- " ORDER BY event.mtime",
2312
- (annFlags & ANN_FILE_VERS)!=0 ? "fid" : "mid"
2312
+ " ORDER BY %s event.mtime",
2313
+ (annFlags & ANN_FILE_VERS)!=0 ? "fid" : "mid",
2314
+ (annFlags & ANN_FILE_ANCEST)!=0 ?
2315
+ "(mlink.mid IN (SELECT rid FROM ancestor)) DESC,":""
23132316
 );
23142317
23152318
 db_bind_int(&q, ":rid", rid);
23162319
 if( iLimit==0 ) iLimit = 1000000000;
23172320
 while( rid && iLimit>cnt && db_step(&q)==SQLITE_ROW ){
@@ -2352,11 +2355,11 @@
23522355
 void annotation_page(void){
23532356
 int mid;
23542357
 int fnid;
23552358
 int i;
23562359
 int iLimit;
2357
- int annFlags = 0;
2360
+ int annFlags = ANN_FILE_ANCEST;
23582361
 int showLn = 0; /* True if line numbers should be shown */
23592362
 char zLn[10]; /* Line number buffer */
23602363
 char zFormat[10]; /* Format string for line numbers */
23612364
 Annotator ann;
23622365
@@ -2368,10 +2371,11 @@
23682371
 if( mid==0 || fnid==0 ){ fossil_redirect_home(); }
23692372
 iLimit = atoi(PD("limit","-1"));
23702373
 if( !db_exists("SELECT 1 FROM mlink WHERE mid=%d AND fnid=%d",mid,fnid) ){
23712374
 fossil_redirect_home();
23722375
 }
2376
+ compute_direct_ancestors(mid, 10000000);
23732377
 style_header("File Annotation");
23742378
 if( P("filevers") ) annFlags |= ANN_FILE_VERS;
23752379
 annotate_file(&ann, fnid, mid, g.perm.Hyperlink, iLimit, annFlags);
23762380
 if( P("log") ){
23772381
 int i;
@@ -2461,10 +2465,11 @@
24612465
 fid, fnid);
24622466
 if( mid==0 ){
24632467
 fossil_panic("unable to find manifest");
24642468
 }
24652469
 if( fileVers ) annFlags |= ANN_FILE_VERS;
2470
+ annFlags |= ANN_FILE_ANCEST;
24662471
 annotate_file(&ann, fnid, mid, 0, iLimit, annFlags);
24672472
 if( showLog ){
24682473
 for(i=0; i<ann.nVers; i++){
24692474
 printf("version %3d: %s\n", i+1, ann.azVers[i]);
24702475
 }
24712476
--- src/diff.c
+++ src/diff.c
@@ -2265,11 +2265,12 @@
2265 fossil_print("%10s: %.*s\n", zSrc, x.aOrig[i].n, x.aOrig[i].z);
2266 }
2267 }
2268
2269 /* Annotation flags */
2270 #define ANN_FILE_VERS 0x001 /* Show file version rather than commit version */
 
2271
2272 /*
2273 ** Compute a complete annotation on a file. The file is identified
2274 ** by its filename number (filename.fnid) and the baseline in which
2275 ** it was checked in (mlink.mid).
@@ -2306,12 +2307,14 @@
2306 " coalesce(event.euser,event.user),"
2307 " mlink.pid"
2308 " FROM mlink, event"
2309 " WHERE mlink.fid=:rid"
2310 " AND event.objid=mlink.mid"
2311 " ORDER BY event.mtime",
2312 (annFlags & ANN_FILE_VERS)!=0 ? "fid" : "mid"
 
 
2313 );
2314
2315 db_bind_int(&q, ":rid", rid);
2316 if( iLimit==0 ) iLimit = 1000000000;
2317 while( rid && iLimit>cnt && db_step(&q)==SQLITE_ROW ){
@@ -2352,11 +2355,11 @@
2352 void annotation_page(void){
2353 int mid;
2354 int fnid;
2355 int i;
2356 int iLimit;
2357 int annFlags = 0;
2358 int showLn = 0; /* True if line numbers should be shown */
2359 char zLn[10]; /* Line number buffer */
2360 char zFormat[10]; /* Format string for line numbers */
2361 Annotator ann;
2362
@@ -2368,10 +2371,11 @@
2368 if( mid==0 || fnid==0 ){ fossil_redirect_home(); }
2369 iLimit = atoi(PD("limit","-1"));
2370 if( !db_exists("SELECT 1 FROM mlink WHERE mid=%d AND fnid=%d",mid,fnid) ){
2371 fossil_redirect_home();
2372 }
 
2373 style_header("File Annotation");
2374 if( P("filevers") ) annFlags |= ANN_FILE_VERS;
2375 annotate_file(&ann, fnid, mid, g.perm.Hyperlink, iLimit, annFlags);
2376 if( P("log") ){
2377 int i;
@@ -2461,10 +2465,11 @@
2461 fid, fnid);
2462 if( mid==0 ){
2463 fossil_panic("unable to find manifest");
2464 }
2465 if( fileVers ) annFlags |= ANN_FILE_VERS;
 
2466 annotate_file(&ann, fnid, mid, 0, iLimit, annFlags);
2467 if( showLog ){
2468 for(i=0; i<ann.nVers; i++){
2469 printf("version %3d: %s\n", i+1, ann.azVers[i]);
2470 }
2471
--- src/diff.c
+++ src/diff.c
@@ -2265,11 +2265,12 @@
2265 fossil_print("%10s: %.*s\n", zSrc, x.aOrig[i].n, x.aOrig[i].z);
2266 }
2267 }
2268
2269 /* Annotation flags */
2270 #define ANN_FILE_VERS 0x01 /* Show file vers rather than commit vers */
2271 #define ANN_FILE_ANCEST 0x02 /* Prefer check-ins in the ANCESTOR table */
2272
2273 /*
2274 ** Compute a complete annotation on a file. The file is identified
2275 ** by its filename number (filename.fnid) and the baseline in which
2276 ** it was checked in (mlink.mid).
@@ -2306,12 +2307,14 @@
2307 " coalesce(event.euser,event.user),"
2308 " mlink.pid"
2309 " FROM mlink, event"
2310 " WHERE mlink.fid=:rid"
2311 " AND event.objid=mlink.mid"
2312 " ORDER BY %s event.mtime",
2313 (annFlags & ANN_FILE_VERS)!=0 ? "fid" : "mid",
2314 (annFlags & ANN_FILE_ANCEST)!=0 ?
2315 "(mlink.mid IN (SELECT rid FROM ancestor)) DESC,":""
2316 );
2317
2318 db_bind_int(&q, ":rid", rid);
2319 if( iLimit==0 ) iLimit = 1000000000;
2320 while( rid && iLimit>cnt && db_step(&q)==SQLITE_ROW ){
@@ -2352,11 +2355,11 @@
2355 void annotation_page(void){
2356 int mid;
2357 int fnid;
2358 int i;
2359 int iLimit;
2360 int annFlags = ANN_FILE_ANCEST;
2361 int showLn = 0; /* True if line numbers should be shown */
2362 char zLn[10]; /* Line number buffer */
2363 char zFormat[10]; /* Format string for line numbers */
2364 Annotator ann;
2365
@@ -2368,10 +2371,11 @@
2371 if( mid==0 || fnid==0 ){ fossil_redirect_home(); }
2372 iLimit = atoi(PD("limit","-1"));
2373 if( !db_exists("SELECT 1 FROM mlink WHERE mid=%d AND fnid=%d",mid,fnid) ){
2374 fossil_redirect_home();
2375 }
2376 compute_direct_ancestors(mid, 10000000);
2377 style_header("File Annotation");
2378 if( P("filevers") ) annFlags |= ANN_FILE_VERS;
2379 annotate_file(&ann, fnid, mid, g.perm.Hyperlink, iLimit, annFlags);
2380 if( P("log") ){
2381 int i;
@@ -2461,10 +2465,11 @@
2465 fid, fnid);
2466 if( mid==0 ){
2467 fossil_panic("unable to find manifest");
2468 }
2469 if( fileVers ) annFlags |= ANN_FILE_VERS;
2470 annFlags |= ANN_FILE_ANCEST;
2471 annotate_file(&ann, fnid, mid, 0, iLimit, annFlags);
2472 if( showLog ){
2473 for(i=0; i<ann.nVers; i++){
2474 printf("version %3d: %s\n", i+1, ann.azVers[i]);
2475 }
2476

Keyboard Shortcuts

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