Fossil SCM

Change -unmodified/UNMODIFIED to -unchanged/UNCHANGED in status_report() for consistency with the ls -v command

andygoth 2016-11-06 04:17 UTC andygoth-changes
Commit 5775d3761f5180c1b582fc2ea416be42059efaab
Parent d52fd18529c7faf…
1 file changed +13 -13
~ src/checkin.c
M src/checkin.c
+13 -13
--- src/checkin.c
+++ src/checkin.c
@@ -25,13 +25,13 @@
2525
 /*
2626
 ** Change filter options.
2727
 */
2828
 enum {
2929
 /* 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_UNMODIFIED, CB_EXTRA, CB_MERGE ,
32
- CB_RELPATH, CB_CLASSIFY, CB_FATAL , CB_COMMENT ,
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_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. */
@@ -39,20 +39,20 @@
3939
 C_ADDED = 1 << CB_ADDED, /* Added files. */
4040
 C_DELETED = 1 << CB_DELETED, /* Deleted files. */
4141
 C_RENAMED = 1 << CB_RENAMED, /* Renamed files. */
4242
 C_CONFLICT = 1 << CB_CONFLICT, /* Files having merge conflicts. */
4343
 C_META = 1 << CB_META, /* Files with metadata changes. */
44
- C_UNMODIFIED = 1 << CB_UNMODIFIED,/* Unmodified files. */
44
+ C_UNCHANGED = 1 << CB_UNCHANGED, /* Unchanged files. */
4545
 C_EXTRA = 1 << CB_EXTRA, /* Unmanaged files. */
4646
 C_MERGE = 1 << CB_MERGE, /* Merge contributors. */
4747
 C_FILTER = C_EDITED | C_UPDATED | C_CHANGED | C_MISSING | C_ADDED
48
- | C_DELETED | C_RENAMED | C_CONFLICT | C_META | C_UNMODIFIED
48
+ | C_DELETED | C_RENAMED | C_CONFLICT | C_META | C_UNCHANGED
4949
 | C_EXTRA | C_MERGE,
5050
 C_ALL = C_FILTER & ~(C_EXTRA | C_MERGE),
5151
 C_RELPATH = 1 << CB_RELPATH, /* Show relative paths. */
5252
 C_CLASSIFY = 1 << CB_CLASSIFY, /* Show file change types. */
53
- C_DEFAULT = (C_ALL & ~C_UNMODIFIED) | C_MERGE | C_CLASSIFY,
53
+ C_DEFAULT = (C_ALL & ~C_UNCHANGED) | C_MERGE | C_CLASSIFY,
5454
 C_FATAL = (1 << CB_FATAL) | C_MISSING, /* Fail on MISSING/NOT_A_FILE. */
5555
 C_COMMENT = 1 << CB_COMMENT, /* Precede each line with "# ". */
5656
 };
5757
5858
 /*
@@ -146,12 +146,12 @@
146146
 "SELECT pathname, deleted, chnged, rid,"
147147
 " coalesce(origname!=pathname,0) AS renamed, islink, 1 AS managed"
148148
 " FROM vfile"
149149
 " WHERE is_selected(id)%s", blob_sql_text(&where));
150150
151
- /* Exclude unmodified files unless requested. */
152
- if( !(flags & C_UNMODIFIED) ){
151
+ /* Exclude unchanged files unless requested. */
152
+ if( !(flags & C_UNCHANGED) ){
153153
 blob_append_sql(&sql,
154154
 " AND (chnged OR deleted OR rid=0 OR pathname!=origname)");
155155
 }
156156
 }
157157
@@ -226,13 +226,13 @@
226226
 }else if( (flags & (C_EDITED | C_CHANGED)) && isChnged
227227
 && (isChnged<2 || isChnged>9) ){
228228
 zClass = "EDITED";
229229
 }else if( (flags & C_RENAMED) && isRenamed ){
230230
 zClass = "RENAMED";
231
- }else if( (flags & C_UNMODIFIED) && isManaged && !isDeleted && !isMissing
232
- && !isNew && !isChnged && !isRenamed ){
233
- zClass = "UNMODIFIED";
231
+ }else if( (flags & C_UNCHANGED) && isManaged && !isDeleted && !isMissing
232
+ && !isNew && !isChnged && !isRenamed ){
233
+ zClass = "UNCHANGED";
234234
 }else if( (flags & C_EXTRA) && !isManaged ){
235235
 zClass = "EXTRA";
236236
 }
237237
 /* TODO: reimplement ls and extras in terms of this function. */
238238
@@ -391,11 +391,11 @@
391391
 ** --added Display added files.
392392
 ** --deleted Display deleted files.
393393
 ** --renamed Display renamed files.
394394
 ** --conflict Display files having merge conflicts.
395395
 ** --meta Display files with metadata changes.
396
-** --unmodified Display unmodified files.
396
+** --unchanged Display unchanged files.
397397
 ** --all Display all managed files, i.e. all of the above.
398398
 ** --extra Display unmanaged files.
399399
 ** --merge Display merge contributors.
400400
 ** --no-merge Do not display merge contributors.
401401
 **
@@ -410,11 +410,11 @@
410410
 } flagDefs[] = {
411411
 {"edited" , C_EDITED , 0}, {"updated" , C_UPDATED , 0},
412412
 {"changed" , C_CHANGED, 0}, {"missing" , C_MISSING , 0},
413413
 {"added" , C_ADDED , 0}, {"deleted" , C_DELETED , 0},
414414
 {"renamed" , C_RENAMED, 0}, {"conflict" , C_CONFLICT , 0},
415
- {"meta" , C_META , 0}, {"unmodified" , C_UNMODIFIED, 0},
415
+ {"meta" , C_META , 0}, {"unchanged" , C_UNCHANGED , 0},
416416
 {"all" , C_ALL , 0}, {"extra" , C_EXTRA , 0},
417417
 {"merge" , C_MERGE , 0}, {"classify" , C_CLASSIFY , 1},
418418
 }, noFlagDefs[] = {
419419
 {"no-merge", C_MERGE , 0}, {"no-classify", C_CLASSIFY , 1},
420420
 };
421421
--- src/checkin.c
+++ src/checkin.c
@@ -25,13 +25,13 @@
25 /*
26 ** Change filter options.
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_UNMODIFIED, CB_EXTRA, CB_MERGE ,
32 CB_RELPATH, CB_CLASSIFY, 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. */
@@ -39,20 +39,20 @@
39 C_ADDED = 1 << CB_ADDED, /* Added files. */
40 C_DELETED = 1 << CB_DELETED, /* Deleted files. */
41 C_RENAMED = 1 << CB_RENAMED, /* Renamed files. */
42 C_CONFLICT = 1 << CB_CONFLICT, /* Files having merge conflicts. */
43 C_META = 1 << CB_META, /* Files with metadata changes. */
44 C_UNMODIFIED = 1 << CB_UNMODIFIED,/* Unmodified files. */
45 C_EXTRA = 1 << CB_EXTRA, /* Unmanaged files. */
46 C_MERGE = 1 << CB_MERGE, /* Merge contributors. */
47 C_FILTER = C_EDITED | C_UPDATED | C_CHANGED | C_MISSING | C_ADDED
48 | C_DELETED | C_RENAMED | C_CONFLICT | C_META | C_UNMODIFIED
49 | C_EXTRA | C_MERGE,
50 C_ALL = C_FILTER & ~(C_EXTRA | C_MERGE),
51 C_RELPATH = 1 << CB_RELPATH, /* Show relative paths. */
52 C_CLASSIFY = 1 << CB_CLASSIFY, /* Show file change types. */
53 C_DEFAULT = (C_ALL & ~C_UNMODIFIED) | C_MERGE | C_CLASSIFY,
54 C_FATAL = (1 << CB_FATAL) | C_MISSING, /* Fail on MISSING/NOT_A_FILE. */
55 C_COMMENT = 1 << CB_COMMENT, /* Precede each line with "# ". */
56 };
57
58 /*
@@ -146,12 +146,12 @@
146 "SELECT pathname, deleted, chnged, rid,"
147 " coalesce(origname!=pathname,0) AS renamed, islink, 1 AS managed"
148 " FROM vfile"
149 " WHERE is_selected(id)%s", blob_sql_text(&where));
150
151 /* Exclude unmodified files unless requested. */
152 if( !(flags & C_UNMODIFIED) ){
153 blob_append_sql(&sql,
154 " AND (chnged OR deleted OR rid=0 OR pathname!=origname)");
155 }
156 }
157
@@ -226,13 +226,13 @@
226 }else if( (flags & (C_EDITED | C_CHANGED)) && isChnged
227 && (isChnged<2 || isChnged>9) ){
228 zClass = "EDITED";
229 }else if( (flags & C_RENAMED) && isRenamed ){
230 zClass = "RENAMED";
231 }else if( (flags & C_UNMODIFIED) && isManaged && !isDeleted && !isMissing
232 && !isNew && !isChnged && !isRenamed ){
233 zClass = "UNMODIFIED";
234 }else if( (flags & C_EXTRA) && !isManaged ){
235 zClass = "EXTRA";
236 }
237 /* TODO: reimplement ls and extras in terms of this function. */
238
@@ -391,11 +391,11 @@
391 ** --added Display added files.
392 ** --deleted Display deleted files.
393 ** --renamed Display renamed files.
394 ** --conflict Display files having merge conflicts.
395 ** --meta Display files with metadata changes.
396 ** --unmodified Display unmodified files.
397 ** --all Display all managed files, i.e. all of the above.
398 ** --extra Display unmanaged files.
399 ** --merge Display merge contributors.
400 ** --no-merge Do not display merge contributors.
401 **
@@ -410,11 +410,11 @@
410 } flagDefs[] = {
411 {"edited" , C_EDITED , 0}, {"updated" , C_UPDATED , 0},
412 {"changed" , C_CHANGED, 0}, {"missing" , C_MISSING , 0},
413 {"added" , C_ADDED , 0}, {"deleted" , C_DELETED , 0},
414 {"renamed" , C_RENAMED, 0}, {"conflict" , C_CONFLICT , 0},
415 {"meta" , C_META , 0}, {"unmodified" , C_UNMODIFIED, 0},
416 {"all" , C_ALL , 0}, {"extra" , C_EXTRA , 0},
417 {"merge" , C_MERGE , 0}, {"classify" , C_CLASSIFY , 1},
418 }, noFlagDefs[] = {
419 {"no-merge", C_MERGE , 0}, {"no-classify", C_CLASSIFY , 1},
420 };
421
--- src/checkin.c
+++ src/checkin.c
@@ -25,13 +25,13 @@
25 /*
26 ** Change filter options.
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_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. */
@@ -39,20 +39,20 @@
39 C_ADDED = 1 << CB_ADDED, /* Added files. */
40 C_DELETED = 1 << CB_DELETED, /* Deleted files. */
41 C_RENAMED = 1 << CB_RENAMED, /* Renamed files. */
42 C_CONFLICT = 1 << CB_CONFLICT, /* Files having merge conflicts. */
43 C_META = 1 << CB_META, /* Files with metadata changes. */
44 C_UNCHANGED = 1 << CB_UNCHANGED, /* Unchanged files. */
45 C_EXTRA = 1 << CB_EXTRA, /* Unmanaged files. */
46 C_MERGE = 1 << CB_MERGE, /* Merge contributors. */
47 C_FILTER = C_EDITED | C_UPDATED | C_CHANGED | C_MISSING | C_ADDED
48 | C_DELETED | C_RENAMED | C_CONFLICT | C_META | C_UNCHANGED
49 | C_EXTRA | C_MERGE,
50 C_ALL = C_FILTER & ~(C_EXTRA | C_MERGE),
51 C_RELPATH = 1 << CB_RELPATH, /* Show relative paths. */
52 C_CLASSIFY = 1 << CB_CLASSIFY, /* Show file change types. */
53 C_DEFAULT = (C_ALL & ~C_UNCHANGED) | C_MERGE | C_CLASSIFY,
54 C_FATAL = (1 << CB_FATAL) | C_MISSING, /* Fail on MISSING/NOT_A_FILE. */
55 C_COMMENT = 1 << CB_COMMENT, /* Precede each line with "# ". */
56 };
57
58 /*
@@ -146,12 +146,12 @@
146 "SELECT pathname, deleted, chnged, rid,"
147 " coalesce(origname!=pathname,0) AS renamed, islink, 1 AS managed"
148 " FROM vfile"
149 " WHERE is_selected(id)%s", blob_sql_text(&where));
150
151 /* Exclude unchanged files unless requested. */
152 if( !(flags & C_UNCHANGED) ){
153 blob_append_sql(&sql,
154 " AND (chnged OR deleted OR rid=0 OR pathname!=origname)");
155 }
156 }
157
@@ -226,13 +226,13 @@
226 }else if( (flags & (C_EDITED | C_CHANGED)) && isChnged
227 && (isChnged<2 || isChnged>9) ){
228 zClass = "EDITED";
229 }else if( (flags & C_RENAMED) && isRenamed ){
230 zClass = "RENAMED";
231 }else if( (flags & C_UNCHANGED) && isManaged && !isDeleted && !isMissing
232 && !isNew && !isChnged && !isRenamed ){
233 zClass = "UNCHANGED";
234 }else if( (flags & C_EXTRA) && !isManaged ){
235 zClass = "EXTRA";
236 }
237 /* TODO: reimplement ls and extras in terms of this function. */
238
@@ -391,11 +391,11 @@
391 ** --added Display added files.
392 ** --deleted Display deleted files.
393 ** --renamed Display renamed files.
394 ** --conflict Display files having merge conflicts.
395 ** --meta Display files with metadata changes.
396 ** --unchanged Display unchanged files.
397 ** --all Display all managed files, i.e. all of the above.
398 ** --extra Display unmanaged files.
399 ** --merge Display merge contributors.
400 ** --no-merge Do not display merge contributors.
401 **
@@ -410,11 +410,11 @@
410 } flagDefs[] = {
411 {"edited" , C_EDITED , 0}, {"updated" , C_UPDATED , 0},
412 {"changed" , C_CHANGED, 0}, {"missing" , C_MISSING , 0},
413 {"added" , C_ADDED , 0}, {"deleted" , C_DELETED , 0},
414 {"renamed" , C_RENAMED, 0}, {"conflict" , C_CONFLICT , 0},
415 {"meta" , C_META , 0}, {"unchanged" , C_UNCHANGED , 0},
416 {"all" , C_ALL , 0}, {"extra" , C_EXTRA , 0},
417 {"merge" , C_MERGE , 0}, {"classify" , C_CLASSIFY , 1},
418 }, noFlagDefs[] = {
419 {"no-merge", C_MERGE , 0}, {"no-classify", C_CLASSIFY , 1},
420 };
421

Keyboard Shortcuts

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