Fossil SCM
Move the "updated-to:" text to the end of the display for the "update" command, and separately from the changed files by "---------". This at the request of the emacs integration effort.
Commit
3af6cf099301ba7058ce3cc9068b6010dee55151
Parent
64459dd091f4913…
1 file changed
+2
-1
+2
-1
| --- src/update.c | ||
| +++ src/update.c | ||
| @@ -113,11 +113,10 @@ | ||
| 113 | 113 | tid = db_int(0, "SELECT rid FROM leaves, event" |
| 114 | 114 | " WHERE event.objid=leaves.rid" |
| 115 | 115 | " ORDER BY event.mtime DESC"); |
| 116 | 116 | } |
| 117 | 117 | |
| 118 | - show_common_info(tid, "update-to:", 1, 0); | |
| 119 | 118 | if( !verboseFlag && (tid==vid)) return; /* Nothing to update */ |
| 120 | 119 | db_begin_transaction(); |
| 121 | 120 | vfile_check_signature(vid, 1); |
| 122 | 121 | if( !nochangeFlag ) undo_begin(); |
| 123 | 122 | load_vfile_from_rid(tid); |
| @@ -286,10 +285,12 @@ | ||
| 286 | 285 | } |
| 287 | 286 | } |
| 288 | 287 | free(zFullPath); |
| 289 | 288 | } |
| 290 | 289 | db_finalize(&q); |
| 290 | + printf("--------------\n"); | |
| 291 | + show_common_info(tid, "updated-to:", 1, 0); | |
| 291 | 292 | |
| 292 | 293 | /* |
| 293 | 294 | ** Clean up the mid and pid VFILE entries. Then commit the changes. |
| 294 | 295 | */ |
| 295 | 296 | if( nochangeFlag ){ |
| 296 | 297 |
| --- src/update.c | |
| +++ src/update.c | |
| @@ -113,11 +113,10 @@ | |
| 113 | tid = db_int(0, "SELECT rid FROM leaves, event" |
| 114 | " WHERE event.objid=leaves.rid" |
| 115 | " ORDER BY event.mtime DESC"); |
| 116 | } |
| 117 | |
| 118 | show_common_info(tid, "update-to:", 1, 0); |
| 119 | if( !verboseFlag && (tid==vid)) return; /* Nothing to update */ |
| 120 | db_begin_transaction(); |
| 121 | vfile_check_signature(vid, 1); |
| 122 | if( !nochangeFlag ) undo_begin(); |
| 123 | load_vfile_from_rid(tid); |
| @@ -286,10 +285,12 @@ | |
| 286 | } |
| 287 | } |
| 288 | free(zFullPath); |
| 289 | } |
| 290 | db_finalize(&q); |
| 291 | |
| 292 | /* |
| 293 | ** Clean up the mid and pid VFILE entries. Then commit the changes. |
| 294 | */ |
| 295 | if( nochangeFlag ){ |
| 296 |
| --- src/update.c | |
| +++ src/update.c | |
| @@ -113,11 +113,10 @@ | |
| 113 | tid = db_int(0, "SELECT rid FROM leaves, event" |
| 114 | " WHERE event.objid=leaves.rid" |
| 115 | " ORDER BY event.mtime DESC"); |
| 116 | } |
| 117 | |
| 118 | if( !verboseFlag && (tid==vid)) return; /* Nothing to update */ |
| 119 | db_begin_transaction(); |
| 120 | vfile_check_signature(vid, 1); |
| 121 | if( !nochangeFlag ) undo_begin(); |
| 122 | load_vfile_from_rid(tid); |
| @@ -286,10 +285,12 @@ | |
| 285 | } |
| 286 | } |
| 287 | free(zFullPath); |
| 288 | } |
| 289 | db_finalize(&q); |
| 290 | printf("--------------\n"); |
| 291 | show_common_info(tid, "updated-to:", 1, 0); |
| 292 | |
| 293 | /* |
| 294 | ** Clean up the mid and pid VFILE entries. Then commit the changes. |
| 295 | */ |
| 296 | if( nochangeFlag ){ |
| 297 |