Fossil SCM

Remove hard-coded demo of mtime and size from changes and status commands

andygoth 2016-11-06 22:53 UTC andygoth-changes
Commit 8cd81143e767b7f1a6f64157b4756953bf2f8296
1 file changed +3 -3
+3 -3
--- src/checkin.c
+++ src/checkin.c
@@ -27,11 +27,11 @@
2727
*/
2828
enum {
2929
/* Zero-based bit indexes. */
3030
CB_EDITED , CB_UPDATED , CB_CHANGED, CB_MISSING , CB_ADDED, CB_DELETED,
3131
CB_RENAMED, CB_CONFLICT, CB_META , CB_UNCHANGED, CB_EXTRA, CB_MERGE ,
32
- CB_RELPATH, CB_CLASSIFY, CB_MTIME , CB_SIZE , CB_FATAL, CB_COMMENT,
32
+ CB_RELPATH, CB_CLASSIFY, CB_MTIME , CB_SIZE , CB_FATAL, CB_COMMENT,
3333
3434
/* Bitmask values. */
3535
C_EDITED = 1 << CB_EDITED, /* Edited, merged, and conflicted files. */
3636
C_UPDATED = 1 << CB_UPDATED, /* Files updated by merge/integrate. */
3737
C_CHANGED = 1 << CB_CHANGED, /* Treated the same as the above two. */
@@ -519,11 +519,11 @@
519519
vfile_check_signature(vid, useSha1sum ? CKSIG_SHA1 : 0);
520520
521521
/* Search for unmanaged files if requested. */
522522
if( flags & C_EXTRA ){
523523
Glob *pIgnore = glob_create(zIgnoreFlag);
524
- locate_unmanaged_files(g.argc-2, g.argv+2, scanFlags | SCAN_META, pIgnore);
524
+ locate_unmanaged_files(g.argc-2, g.argv+2, scanFlags, pIgnore);
525525
glob_free(pIgnore);
526526
}
527527
528528
/* The status command prints general information before the change list. */
529529
if( command==STATUS ){
@@ -538,11 +538,11 @@
538538
db_record_repository_filename(0);
539539
}
540540
541541
/* Find and print all requested changes. */
542542
blob_zero(&report);
543
- status_report(&report, flags | C_MTIME | C_SIZE);
543
+ status_report(&report, flags);
544544
if( blob_size(&report) ){
545545
if( showHdr ){
546546
fossil_print("Changes for %s at %s:\n", db_get("project-name", "???"),
547547
g.zLocalRoot);
548548
}
549549
--- src/checkin.c
+++ src/checkin.c
@@ -27,11 +27,11 @@
27 */
28 enum {
29 /* Zero-based bit indexes. */
30 CB_EDITED , CB_UPDATED , CB_CHANGED, CB_MISSING , CB_ADDED, CB_DELETED,
31 CB_RENAMED, CB_CONFLICT, CB_META , CB_UNCHANGED, CB_EXTRA, CB_MERGE ,
32 CB_RELPATH, CB_CLASSIFY, CB_MTIME , CB_SIZE , CB_FATAL, CB_COMMENT,
33
34 /* Bitmask values. */
35 C_EDITED = 1 << CB_EDITED, /* Edited, merged, and conflicted files. */
36 C_UPDATED = 1 << CB_UPDATED, /* Files updated by merge/integrate. */
37 C_CHANGED = 1 << CB_CHANGED, /* Treated the same as the above two. */
@@ -519,11 +519,11 @@
519 vfile_check_signature(vid, useSha1sum ? CKSIG_SHA1 : 0);
520
521 /* Search for unmanaged files if requested. */
522 if( flags & C_EXTRA ){
523 Glob *pIgnore = glob_create(zIgnoreFlag);
524 locate_unmanaged_files(g.argc-2, g.argv+2, scanFlags | SCAN_META, pIgnore);
525 glob_free(pIgnore);
526 }
527
528 /* The status command prints general information before the change list. */
529 if( command==STATUS ){
@@ -538,11 +538,11 @@
538 db_record_repository_filename(0);
539 }
540
541 /* Find and print all requested changes. */
542 blob_zero(&report);
543 status_report(&report, flags | C_MTIME | C_SIZE);
544 if( blob_size(&report) ){
545 if( showHdr ){
546 fossil_print("Changes for %s at %s:\n", db_get("project-name", "???"),
547 g.zLocalRoot);
548 }
549
--- src/checkin.c
+++ src/checkin.c
@@ -27,11 +27,11 @@
27 */
28 enum {
29 /* Zero-based bit indexes. */
30 CB_EDITED , CB_UPDATED , CB_CHANGED, CB_MISSING , CB_ADDED, CB_DELETED,
31 CB_RENAMED, CB_CONFLICT, CB_META , CB_UNCHANGED, CB_EXTRA, CB_MERGE ,
32 CB_RELPATH, CB_CLASSIFY, CB_MTIME , CB_SIZE , CB_FATAL, CB_COMMENT,
33
34 /* Bitmask values. */
35 C_EDITED = 1 << CB_EDITED, /* Edited, merged, and conflicted files. */
36 C_UPDATED = 1 << CB_UPDATED, /* Files updated by merge/integrate. */
37 C_CHANGED = 1 << CB_CHANGED, /* Treated the same as the above two. */
@@ -519,11 +519,11 @@
519 vfile_check_signature(vid, useSha1sum ? CKSIG_SHA1 : 0);
520
521 /* Search for unmanaged files if requested. */
522 if( flags & C_EXTRA ){
523 Glob *pIgnore = glob_create(zIgnoreFlag);
524 locate_unmanaged_files(g.argc-2, g.argv+2, scanFlags, pIgnore);
525 glob_free(pIgnore);
526 }
527
528 /* The status command prints general information before the change list. */
529 if( command==STATUS ){
@@ -538,11 +538,11 @@
538 db_record_repository_filename(0);
539 }
540
541 /* Find and print all requested changes. */
542 blob_zero(&report);
543 status_report(&report, flags);
544 if( blob_size(&report) ){
545 if( showHdr ){
546 fossil_print("Changes for %s at %s:\n", db_get("project-name", "???"),
547 g.zLocalRoot);
548 }
549

Keyboard Shortcuts

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