Fossil SCM

Add "fossil praise" which is exactly the same as "fossil blame". As in subversion.

jan.nijtmans 2014-03-06 08:50 trunk
Commit fb573e72030b574674e93e261deb199bc3f4a19c
Parent 866251e87839a3e…
1 file changed +7 -5
~ src/diff.c
M src/diff.c
+7 -5
--- src/diff.c
+++ src/diff.c
@@ -2173,10 +2173,11 @@
21732173
 }
21742174
21752175
 /*
21762176
 ** WEBPAGE: annotate
21772177
 ** WEBPAGE: blame
2178
+** WEBPAGE: praise
21782179
 **
21792180
 ** Query parameters:
21802181
 **
21812182
 ** checkin=ID The manifest ID at which to start the annotation
21822183
 ** filename=FILENAME The filename.
@@ -2197,11 +2198,11 @@
21972198
 const char *zCI; /* The check-in containing zFilename */
21982199
 Annotator ann;
21992200
 HQuery url;
22002201
 struct AnnVers *p;
22012202
 unsigned clr1, clr2, clr;
2202
- int bBlame = g.zPath[0]=='b';/* True for BLAME output. False for ANNOTATE. */
2203
+ int bBlame = g.zPath[0]!='a';/* True for BLAME output. False for ANNOTATE. */
22032204
22042205
 /* Gather query parameters */
22052206
 showLog = atoi(PD("log","1"));
22062207
 login_check_credentials();
22072208
 if( !g.perm.Read ){ login_needed(); return; }
@@ -2355,17 +2356,18 @@
23552356
 }
23562357
23572358
 /*
23582359
 ** COMMAND: annotate
23592360
 ** COMMAND: blame
2361
+** COMMAND: praise
23602362
 **
2361
-** %fossil (annotate|blame) ?OPTIONS? FILENAME
2363
+** %fossil (annotate|blame|praise) ?OPTIONS? FILENAME
23622364
 **
23632365
 ** Output the text of a file with markings to show when each line of
23642366
 ** the file was last modified. The "annotate" command shows line numbers
2365
-** and omits the username. The "blame" command shows the user who made each
2366
-** checkin and omits the line number.
2367
+** and omits the username. The "blame" and "praise" commands show the user
2368
+** who made each checkin and omits the line number.
23672369
 **
23682370
 ** Options:
23692371
 ** --filevers Show file version numbers rather than check-in versions
23702372
 ** -l|--log List all versions analyzed
23712373
 ** -n|--limit N Only look backwards in time by N versions
@@ -2390,11 +2392,11 @@
23902392
 u64 diffFlags = 0;/* Flags to control whitespace handling */
23912393
 int fileVers; /* Show file version instead of check-in versions */
23922394
 int annFlags = 0; /* Flags to control annotation properties */
23932395
 int bBlame = 0; /* True for BLAME output. False for ANNOTATE. */
23942396
2395
- bBlame = g.argv[1][0]=='b';
2397
+ bBlame = g.argv[1][0]!='a';
23962398
 zLimit = find_option("limit","n",1);
23972399
 if( zLimit==0 || zLimit[0]==0 ) zLimit = "-1";
23982400
 iLimit = atoi(zLimit);
23992401
 showLog = find_option("log","l",0)!=0;
24002402
 if( find_option("ignore-space-at-sol",0,0)!=0 ) diffFlags |= DIFF_IGNORE_SOLWS;
24012403
--- src/diff.c
+++ src/diff.c
@@ -2173,10 +2173,11 @@
2173 }
2174
2175 /*
2176 ** WEBPAGE: annotate
2177 ** WEBPAGE: blame
 
2178 **
2179 ** Query parameters:
2180 **
2181 ** checkin=ID The manifest ID at which to start the annotation
2182 ** filename=FILENAME The filename.
@@ -2197,11 +2198,11 @@
2197 const char *zCI; /* The check-in containing zFilename */
2198 Annotator ann;
2199 HQuery url;
2200 struct AnnVers *p;
2201 unsigned clr1, clr2, clr;
2202 int bBlame = g.zPath[0]=='b';/* True for BLAME output. False for ANNOTATE. */
2203
2204 /* Gather query parameters */
2205 showLog = atoi(PD("log","1"));
2206 login_check_credentials();
2207 if( !g.perm.Read ){ login_needed(); return; }
@@ -2355,17 +2356,18 @@
2355 }
2356
2357 /*
2358 ** COMMAND: annotate
2359 ** COMMAND: blame
 
2360 **
2361 ** %fossil (annotate|blame) ?OPTIONS? FILENAME
2362 **
2363 ** Output the text of a file with markings to show when each line of
2364 ** the file was last modified. The "annotate" command shows line numbers
2365 ** and omits the username. The "blame" command shows the user who made each
2366 ** checkin and omits the line number.
2367 **
2368 ** Options:
2369 ** --filevers Show file version numbers rather than check-in versions
2370 ** -l|--log List all versions analyzed
2371 ** -n|--limit N Only look backwards in time by N versions
@@ -2390,11 +2392,11 @@
2390 u64 diffFlags = 0;/* Flags to control whitespace handling */
2391 int fileVers; /* Show file version instead of check-in versions */
2392 int annFlags = 0; /* Flags to control annotation properties */
2393 int bBlame = 0; /* True for BLAME output. False for ANNOTATE. */
2394
2395 bBlame = g.argv[1][0]=='b';
2396 zLimit = find_option("limit","n",1);
2397 if( zLimit==0 || zLimit[0]==0 ) zLimit = "-1";
2398 iLimit = atoi(zLimit);
2399 showLog = find_option("log","l",0)!=0;
2400 if( find_option("ignore-space-at-sol",0,0)!=0 ) diffFlags |= DIFF_IGNORE_SOLWS;
2401
--- src/diff.c
+++ src/diff.c
@@ -2173,10 +2173,11 @@
2173 }
2174
2175 /*
2176 ** WEBPAGE: annotate
2177 ** WEBPAGE: blame
2178 ** WEBPAGE: praise
2179 **
2180 ** Query parameters:
2181 **
2182 ** checkin=ID The manifest ID at which to start the annotation
2183 ** filename=FILENAME The filename.
@@ -2197,11 +2198,11 @@
2198 const char *zCI; /* The check-in containing zFilename */
2199 Annotator ann;
2200 HQuery url;
2201 struct AnnVers *p;
2202 unsigned clr1, clr2, clr;
2203 int bBlame = g.zPath[0]!='a';/* True for BLAME output. False for ANNOTATE. */
2204
2205 /* Gather query parameters */
2206 showLog = atoi(PD("log","1"));
2207 login_check_credentials();
2208 if( !g.perm.Read ){ login_needed(); return; }
@@ -2355,17 +2356,18 @@
2356 }
2357
2358 /*
2359 ** COMMAND: annotate
2360 ** COMMAND: blame
2361 ** COMMAND: praise
2362 **
2363 ** %fossil (annotate|blame|praise) ?OPTIONS? FILENAME
2364 **
2365 ** Output the text of a file with markings to show when each line of
2366 ** the file was last modified. The "annotate" command shows line numbers
2367 ** and omits the username. The "blame" and "praise" commands show the user
2368 ** who made each checkin and omits the line number.
2369 **
2370 ** Options:
2371 ** --filevers Show file version numbers rather than check-in versions
2372 ** -l|--log List all versions analyzed
2373 ** -n|--limit N Only look backwards in time by N versions
@@ -2390,11 +2392,11 @@
2392 u64 diffFlags = 0;/* Flags to control whitespace handling */
2393 int fileVers; /* Show file version instead of check-in versions */
2394 int annFlags = 0; /* Flags to control annotation properties */
2395 int bBlame = 0; /* True for BLAME output. False for ANNOTATE. */
2396
2397 bBlame = g.argv[1][0]!='a';
2398 zLimit = find_option("limit","n",1);
2399 if( zLimit==0 || zLimit[0]==0 ) zLimit = "-1";
2400 iLimit = atoi(zLimit);
2401 showLog = find_option("log","l",0)!=0;
2402 if( find_option("ignore-space-at-sol",0,0)!=0 ) diffFlags |= DIFF_IGNORE_SOLWS;
2403

Keyboard Shortcuts

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