Show More
@@ -733,13 +733,16 b' def debugdeltachain(ui, repo, file_=None' | |||
|
733 | 733 | fm.end() |
|
734 | 734 | |
|
735 | 735 | @command('debugdirstate|debugstate', |
|
736 | [('', 'nodates', None, _('do not display the saved mtime')), | |
|
736 | [('', 'nodates', None, _('do not display the saved mtime (DEPRECATED)')), | |
|
737 | ('', 'dates', True, _('display the saved mtime')), | |
|
737 | 738 | ('', 'datesort', None, _('sort by saved mtime'))], |
|
738 | 739 | _('[OPTION]...')) |
|
739 | 740 | def debugstate(ui, repo, **opts): |
|
740 | 741 | """show the contents of the current dirstate""" |
|
741 | 742 | |
|
742 |
nodates = opts |
|
|
743 | nodates = not opts[r'dates'] | |
|
744 | if opts.get(r'nodates') is not None: | |
|
745 | nodates = True | |
|
743 | 746 | datesort = opts.get(r'datesort') |
|
744 | 747 | |
|
745 | 748 | timestr = "" |
@@ -144,7 +144,7 b' transaction: in-memory dirstate changes ' | |||
|
144 | 144 | $ touch -t 200001010000 c |
|
145 | 145 | $ hg status -A |
|
146 | 146 | C c |
|
147 | $ hg debugstate --nodates | |
|
147 | $ hg debugstate --no-dates | |
|
148 | 148 | n 644 12 set c |
|
149 | 149 | $ hg backout -d '6 0' -m 'to be rollback-ed soon' -r . |
|
150 | 150 | removing c |
@@ -154,7 +154,7 b' transaction: in-memory dirstate changes ' | |||
|
154 | 154 | $ hg status -A |
|
155 | 155 | A b |
|
156 | 156 | R c |
|
157 | $ hg debugstate --nodates | |
|
157 | $ hg debugstate --no-dates | |
|
158 | 158 | a 0 -1 unset b |
|
159 | 159 | r 0 0 set c |
|
160 | 160 |
@@ -271,7 +271,7 b' Show all commands + options' | |||
|
271 | 271 | debugdata: changelog, manifest, dir |
|
272 | 272 | debugdate: extended |
|
273 | 273 | debugdeltachain: changelog, manifest, dir, template |
|
274 | debugdirstate: nodates, datesort | |
|
274 | debugdirstate: nodates, dates, datesort | |
|
275 | 275 | debugdiscovery: old, nonheads, rev, ssh, remotecmd, insecure |
|
276 | 276 | debugdownload: output |
|
277 | 277 | debugextensions: template |
@@ -41,7 +41,7 b' Creating branch b:' | |||
|
41 | 41 | |
|
42 | 42 | We shouldn't have anything but n state here: |
|
43 | 43 | |
|
44 | $ hg debugstate --nodates | grep -v "^n" | |
|
44 | $ hg debugstate --no-dates | grep -v "^n" | |
|
45 | 45 | [1] |
|
46 | 46 | |
|
47 | 47 | Merging: |
@@ -412,7 +412,7 b' Test a linear merge to a revision contai' | |||
|
412 | 412 | $ hg update -q 5 |
|
413 | 413 | remote turned local largefile large2 into a normal file |
|
414 | 414 | keep (l)argefile or use (n)ormal file? l |
|
415 | $ hg debugdirstate --nodates | grep large2 | |
|
415 | $ hg debugdirstate --no-dates | grep large2 | |
|
416 | 416 | a 0 -1 unset .hglf/large2 |
|
417 | 417 | r 0 0 set large2 |
|
418 | 418 | $ hg status -A large2 |
@@ -428,7 +428,7 b' Test a linear merge to a revision contai' | |||
|
428 | 428 | $ hg update -q 5 |
|
429 | 429 | remote turned local largefile large3 into a normal file |
|
430 | 430 | keep (l)argefile or use (n)ormal file? l |
|
431 | $ hg debugdirstate --nodates | grep large3 | |
|
431 | $ hg debugdirstate --no-dates | grep large3 | |
|
432 | 432 | a 0 -1 unset .hglf/large3 |
|
433 | 433 | r 0 0 set large3 |
|
434 | 434 | $ hg status -A large3 |
@@ -43,12 +43,12 b' Test status and dirstate of largefiles a' | |||
|
43 | 43 | $ touch large1 sub/large2 |
|
44 | 44 | $ sleep 1 |
|
45 | 45 | $ hg st |
|
46 | $ hg debugstate --nodates | |
|
46 | $ hg debugstate --no-dates | |
|
47 | 47 | n 644 41 set .hglf/large1 |
|
48 | 48 | n 644 41 set .hglf/sub/large2 |
|
49 | 49 | n 644 8 set normal1 |
|
50 | 50 | n 644 8 set sub/normal2 |
|
51 | $ hg debugstate --large --nodates | |
|
51 | $ hg debugstate --large --no-dates | |
|
52 | 52 | n 644 7 set large1 |
|
53 | 53 | n 644 7 set sub/large2 |
|
54 | 54 | $ echo normal11 > normal1 |
@@ -20,7 +20,7 b'' | |||
|
20 | 20 | 1 files updated, 1 files merged, 0 files removed, 0 files unresolved |
|
21 | 21 | (branch merge, don't forget to commit) |
|
22 | 22 | |
|
23 | $ hg debugstate --nodates | |
|
23 | $ hg debugstate --no-dates | |
|
24 | 24 | m 0 -2 unset bar |
|
25 | 25 | m 0 -2 unset foo1 |
|
26 | 26 | copy: foo -> foo1 |
@@ -36,7 +36,7 b' Removing foo1 and bar:' | |||
|
36 | 36 | $ cp bar B |
|
37 | 37 | $ hg rm -f foo1 bar |
|
38 | 38 | |
|
39 | $ hg debugstate --nodates | |
|
39 | $ hg debugstate --no-dates | |
|
40 | 40 | r 0 -1 set bar |
|
41 | 41 | r 0 -1 set foo1 |
|
42 | 42 | copy: foo -> foo1 |
@@ -54,7 +54,7 b' Re-adding foo1 and bar:' | |||
|
54 | 54 | adding bar |
|
55 | 55 | adding foo1 |
|
56 | 56 | |
|
57 | $ hg debugstate --nodates | |
|
57 | $ hg debugstate --no-dates | |
|
58 | 58 | n 0 -2 unset bar |
|
59 | 59 | n 0 -2 unset foo1 |
|
60 | 60 | copy: foo -> foo1 |
@@ -73,7 +73,7 b' Reverting foo1 and bar:' | |||
|
73 | 73 | reverting bar |
|
74 | 74 | reverting foo1 |
|
75 | 75 | |
|
76 | $ hg debugstate --nodates | |
|
76 | $ hg debugstate --no-dates | |
|
77 | 77 | n 0 -2 unset bar |
|
78 | 78 | n 0 -2 unset foo1 |
|
79 | 79 | copy: foo -> foo1 |
@@ -103,5 +103,5 b" dirstate file, and therefore we'll be ab" | |||
|
103 | 103 | debugdirstate. If we don't do this, the test can be slightly flaky. |
|
104 | 104 | $ sleep 3 |
|
105 | 105 | $ hg status |
|
106 | $ hg debugdirstate --nodates | |
|
106 | $ hg debugdirstate --no-dates | |
|
107 | 107 | n 644 10 set inside/f1 |
@@ -47,14 +47,14 b' basic test for hg debugrebuildstate' | |||
|
47 | 47 | |
|
48 | 48 | state dump after |
|
49 | 49 | |
|
50 | $ hg debugstate --nodates | sort | |
|
50 | $ hg debugstate --no-dates | sort | |
|
51 | 51 | n 0 -1 unset bar |
|
52 | 52 | n 0 -1 unset foo |
|
53 | 53 | |
|
54 | 54 | $ hg debugadddrop --normal-lookup file1 file2 |
|
55 | 55 | $ hg debugadddrop --drop bar |
|
56 | 56 | $ hg debugadddrop --drop |
|
57 | $ hg debugstate --nodates | |
|
57 | $ hg debugstate --no-dates | |
|
58 | 58 | n 0 -1 unset file1 |
|
59 | 59 | n 0 -1 unset file2 |
|
60 | 60 | n 0 -1 unset foo |
@@ -78,13 +78,13 b' but in the dirstate' | |||
|
78 | 78 | ? baz |
|
79 | 79 | C foo |
|
80 | 80 | $ hg debugadddrop --normal-lookup baz |
|
81 | $ hg debugdirstate --nodates | |
|
81 | $ hg debugdirstate --no-dates | |
|
82 | 82 | r 0 0 * bar (glob) |
|
83 | 83 | n 0 -1 * baz (glob) |
|
84 | 84 | n 644 0 * foo (glob) |
|
85 | 85 | a 0 -1 * qux (glob) |
|
86 | 86 | $ hg debugrebuilddirstate --minimal |
|
87 | $ hg debugdirstate --nodates | |
|
87 | $ hg debugdirstate --no-dates | |
|
88 | 88 | r 0 0 * bar (glob) |
|
89 | 89 | n 644 0 * foo (glob) |
|
90 | 90 | a 0 -1 * qux (glob) |
@@ -104,16 +104,16 b' dirstate' | |||
|
104 | 104 | R bar |
|
105 | 105 | ? baz |
|
106 | 106 | C foo |
|
107 | $ hg debugdirstate --nodates | |
|
107 | $ hg debugdirstate --no-dates | |
|
108 | 108 | r 0 0 * bar (glob) |
|
109 | 109 | n 644 0 * foo (glob) |
|
110 | 110 | a 0 -1 * qux (glob) |
|
111 | 111 | $ hg debugadddrop --drop foo |
|
112 | $ hg debugdirstate --nodates | |
|
112 | $ hg debugdirstate --no-dates | |
|
113 | 113 | r 0 0 * bar (glob) |
|
114 | 114 | a 0 -1 * qux (glob) |
|
115 | 115 | $ hg debugrebuilddirstate --minimal |
|
116 | $ hg debugdirstate --nodates | |
|
116 | $ hg debugdirstate --no-dates | |
|
117 | 117 | r 0 0 * bar (glob) |
|
118 | 118 | n 0 -1 * foo (glob) |
|
119 | 119 | a 0 -1 * qux (glob) |
@@ -385,10 +385,10 b' dirstate' | |||
|
385 | 385 | $ cp ../dirstateallexcluded .hg/dirstate |
|
386 | 386 | $ touch includedadded |
|
387 | 387 | $ hg add includedadded |
|
388 | $ hg debugdirstate --nodates | |
|
388 | $ hg debugdirstate --no-dates | |
|
389 | 389 | a 0 -1 unset includedadded |
|
390 | 390 | $ hg debugrebuilddirstate --minimal |
|
391 | $ hg debugdirstate --nodates | |
|
391 | $ hg debugdirstate --no-dates | |
|
392 | 392 | n 0 -1 unset included |
|
393 | 393 | a 0 -1 * includedadded (glob) |
|
394 | 394 | |
@@ -410,13 +410,13 b' manifest' | |||
|
410 | 410 | included |
|
411 | 411 | We have files in the dirstate that are included and excluded. Some are in the |
|
412 | 412 | manifest and some are not. |
|
413 | $ hg debugdirstate --nodates | |
|
413 | $ hg debugdirstate --no-dates | |
|
414 | 414 | n 644 0 * excluded (glob) |
|
415 | 415 | a 0 -1 * excludednomanifest (glob) |
|
416 | 416 | n 644 0 * included (glob) |
|
417 | 417 | a 0 -1 * includedadded (glob) |
|
418 | 418 | $ hg debugrebuilddirstate --minimal |
|
419 | $ hg debugdirstate --nodates | |
|
419 | $ hg debugdirstate --no-dates | |
|
420 | 420 | n 644 0 * included (glob) |
|
421 | 421 | a 0 -1 * includedadded (glob) |
|
422 | 422 |
General Comments 0
You need to be logged in to leave comments.
Login now