Mercurial > hg
annotate tests/test-status.t @ 43276:d201a637c971
py3: encode underlying error message during parse error of %include
author | Denis Laxalde <denis.laxalde@logilab.fr> |
---|---|
date | Thu, 17 Oct 2019 12:10:42 +0200 |
parents | c929f612afac |
children | aac921f54554 |
rev | line source |
---|---|
11782
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
1 $ hg init repo1 |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
2 $ cd repo1 |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
3 $ mkdir a b a/1 b/1 b/2 |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
4 $ touch in_root a/in_a b/in_b a/1/in_a_1 b/1/in_b_1 b/2/in_b_2 |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
5 |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
6 hg status in repo root: |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
7 |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
8 $ hg status |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
9 ? a/1/in_a_1 |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
10 ? a/in_a |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
11 ? b/1/in_b_1 |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
12 ? b/2/in_b_2 |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
13 ? b/in_b |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
14 ? in_root |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
15 |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
16 hg status . in repo root: |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
17 |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
18 $ hg status . |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
19 ? a/1/in_a_1 |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
20 ? a/in_a |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
21 ? b/1/in_b_1 |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
22 ? b/2/in_b_2 |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
23 ? b/in_b |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
24 ? in_root |
1624
d9e576e55d81
Added test for relative paths and all status flags for 'hg status'
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
25 |
11782
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
26 $ hg status --cwd a |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
27 ? a/1/in_a_1 |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
28 ? a/in_a |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
29 ? b/1/in_b_1 |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
30 ? b/2/in_b_2 |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
31 ? b/in_b |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
32 ? in_root |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
33 $ hg status --cwd a . |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
34 ? 1/in_a_1 |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
35 ? in_a |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
36 $ hg status --cwd a .. |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
37 ? 1/in_a_1 |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
38 ? in_a |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
39 ? ../b/1/in_b_1 |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
40 ? ../b/2/in_b_2 |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
41 ? ../b/in_b |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
42 ? ../in_root |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
43 |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
44 $ hg status --cwd b |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
45 ? a/1/in_a_1 |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
46 ? a/in_a |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
47 ? b/1/in_b_1 |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
48 ? b/2/in_b_2 |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
49 ? b/in_b |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
50 ? in_root |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
51 $ hg status --cwd b . |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
52 ? 1/in_b_1 |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
53 ? 2/in_b_2 |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
54 ? in_b |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
55 $ hg status --cwd b .. |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
56 ? ../a/1/in_a_1 |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
57 ? ../a/in_a |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
58 ? 1/in_b_1 |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
59 ? 2/in_b_2 |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
60 ? in_b |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
61 ? ../in_root |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
62 |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
63 $ hg status --cwd a/1 |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
64 ? a/1/in_a_1 |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
65 ? a/in_a |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
66 ? b/1/in_b_1 |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
67 ? b/2/in_b_2 |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
68 ? b/in_b |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
69 ? in_root |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
70 $ hg status --cwd a/1 . |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
71 ? in_a_1 |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
72 $ hg status --cwd a/1 .. |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
73 ? in_a_1 |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
74 ? ../in_a |
1624
d9e576e55d81
Added test for relative paths and all status flags for 'hg status'
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
75 |
11782
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
76 $ hg status --cwd b/1 |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
77 ? a/1/in_a_1 |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
78 ? a/in_a |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
79 ? b/1/in_b_1 |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
80 ? b/2/in_b_2 |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
81 ? b/in_b |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
82 ? in_root |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
83 $ hg status --cwd b/1 . |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
84 ? in_b_1 |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
85 $ hg status --cwd b/1 .. |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
86 ? in_b_1 |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
87 ? ../2/in_b_2 |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
88 ? ../in_b |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
89 |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
90 $ hg status --cwd b/2 |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
91 ? a/1/in_a_1 |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
92 ? a/in_a |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
93 ? b/1/in_b_1 |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
94 ? b/2/in_b_2 |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
95 ? b/in_b |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
96 ? in_root |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
97 $ hg status --cwd b/2 . |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
98 ? in_b_2 |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
99 $ hg status --cwd b/2 .. |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
100 ? ../1/in_b_1 |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
101 ? in_b_2 |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
102 ? ../in_b |
19107
fcf08023c011
match: fix root calculation for combining regexps with simple paths
Mads Kiilerich <madski@unity3d.com>
parents:
17377
diff
changeset
|
103 |
fcf08023c011
match: fix root calculation for combining regexps with simple paths
Mads Kiilerich <madski@unity3d.com>
parents:
17377
diff
changeset
|
104 combining patterns with root and patterns without a root works |
fcf08023c011
match: fix root calculation for combining regexps with simple paths
Mads Kiilerich <madski@unity3d.com>
parents:
17377
diff
changeset
|
105 |
fcf08023c011
match: fix root calculation for combining regexps with simple paths
Mads Kiilerich <madski@unity3d.com>
parents:
17377
diff
changeset
|
106 $ hg st a/in_a re:.*b$ |
fcf08023c011
match: fix root calculation for combining regexps with simple paths
Mads Kiilerich <madski@unity3d.com>
parents:
17377
diff
changeset
|
107 ? a/in_a |
fcf08023c011
match: fix root calculation for combining regexps with simple paths
Mads Kiilerich <madski@unity3d.com>
parents:
17377
diff
changeset
|
108 ? b/in_b |
fcf08023c011
match: fix root calculation for combining regexps with simple paths
Mads Kiilerich <madski@unity3d.com>
parents:
17377
diff
changeset
|
109 |
32872
9fcb6df413c9
ui: add support for a tweakdefaults knob
Augie Fackler <augie@google.com>
parents:
31766
diff
changeset
|
110 tweaking defaults works |
9fcb6df413c9
ui: add support for a tweakdefaults knob
Augie Fackler <augie@google.com>
parents:
31766
diff
changeset
|
111 $ hg status --cwd a --config ui.tweakdefaults=yes |
38762
fe3ca1e6f786
ui: remove commands.status.terse=u from ui.tweakdefaults
Gregory Szorc <gregory.szorc@gmail.com>
parents:
38545
diff
changeset
|
112 ? 1/in_a_1 |
fe3ca1e6f786
ui: remove commands.status.terse=u from ui.tweakdefaults
Gregory Szorc <gregory.szorc@gmail.com>
parents:
38545
diff
changeset
|
113 ? in_a |
fe3ca1e6f786
ui: remove commands.status.terse=u from ui.tweakdefaults
Gregory Szorc <gregory.szorc@gmail.com>
parents:
38545
diff
changeset
|
114 ? ../b/1/in_b_1 |
fe3ca1e6f786
ui: remove commands.status.terse=u from ui.tweakdefaults
Gregory Szorc <gregory.szorc@gmail.com>
parents:
38545
diff
changeset
|
115 ? ../b/2/in_b_2 |
fe3ca1e6f786
ui: remove commands.status.terse=u from ui.tweakdefaults
Gregory Szorc <gregory.szorc@gmail.com>
parents:
38545
diff
changeset
|
116 ? ../b/in_b |
32872
9fcb6df413c9
ui: add support for a tweakdefaults knob
Augie Fackler <augie@google.com>
parents:
31766
diff
changeset
|
117 ? ../in_root |
9fcb6df413c9
ui: add support for a tweakdefaults knob
Augie Fackler <augie@google.com>
parents:
31766
diff
changeset
|
118 $ HGPLAIN=1 hg status --cwd a --config ui.tweakdefaults=yes |
9fcb6df413c9
ui: add support for a tweakdefaults knob
Augie Fackler <augie@google.com>
parents:
31766
diff
changeset
|
119 ? a/1/in_a_1 (glob) |
9fcb6df413c9
ui: add support for a tweakdefaults knob
Augie Fackler <augie@google.com>
parents:
31766
diff
changeset
|
120 ? a/in_a (glob) |
9fcb6df413c9
ui: add support for a tweakdefaults knob
Augie Fackler <augie@google.com>
parents:
31766
diff
changeset
|
121 ? b/1/in_b_1 (glob) |
9fcb6df413c9
ui: add support for a tweakdefaults knob
Augie Fackler <augie@google.com>
parents:
31766
diff
changeset
|
122 ? b/2/in_b_2 (glob) |
9fcb6df413c9
ui: add support for a tweakdefaults knob
Augie Fackler <augie@google.com>
parents:
31766
diff
changeset
|
123 ? b/in_b (glob) |
9fcb6df413c9
ui: add support for a tweakdefaults knob
Augie Fackler <augie@google.com>
parents:
31766
diff
changeset
|
124 ? in_root |
9fcb6df413c9
ui: add support for a tweakdefaults knob
Augie Fackler <augie@google.com>
parents:
31766
diff
changeset
|
125 $ HGPLAINEXCEPT=tweakdefaults hg status --cwd a --config ui.tweakdefaults=yes |
38762
fe3ca1e6f786
ui: remove commands.status.terse=u from ui.tweakdefaults
Gregory Szorc <gregory.szorc@gmail.com>
parents:
38545
diff
changeset
|
126 ? 1/in_a_1 |
fe3ca1e6f786
ui: remove commands.status.terse=u from ui.tweakdefaults
Gregory Szorc <gregory.szorc@gmail.com>
parents:
38545
diff
changeset
|
127 ? in_a |
fe3ca1e6f786
ui: remove commands.status.terse=u from ui.tweakdefaults
Gregory Szorc <gregory.szorc@gmail.com>
parents:
38545
diff
changeset
|
128 ? ../b/1/in_b_1 |
fe3ca1e6f786
ui: remove commands.status.terse=u from ui.tweakdefaults
Gregory Szorc <gregory.szorc@gmail.com>
parents:
38545
diff
changeset
|
129 ? ../b/2/in_b_2 |
fe3ca1e6f786
ui: remove commands.status.terse=u from ui.tweakdefaults
Gregory Szorc <gregory.szorc@gmail.com>
parents:
38545
diff
changeset
|
130 ? ../b/in_b |
32887
28a0e6a4e824
test-status: glob fixes for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
32872
diff
changeset
|
131 ? ../in_root (glob) |
32872
9fcb6df413c9
ui: add support for a tweakdefaults knob
Augie Fackler <augie@google.com>
parents:
31766
diff
changeset
|
132 |
31589
7e3b145f8247
status: support commands.status.relative config
Martin von Zweigbergk <martinvonz@google.com>
parents:
31423
diff
changeset
|
133 relative paths can be requested |
7e3b145f8247
status: support commands.status.relative config
Martin von Zweigbergk <martinvonz@google.com>
parents:
31423
diff
changeset
|
134 |
41577
5f827e9ce870
status: if ui.relative-paths=no, don't use relative paths even with patterns
Martin von Zweigbergk <martinvonz@google.com>
parents:
41492
diff
changeset
|
135 $ hg status --cwd a --config ui.relative-paths=yes |
41492
02186c6871ac
status: introduce higher-level ui.relative-paths
Martin von Zweigbergk <martinvonz@google.com>
parents:
40278
diff
changeset
|
136 ? 1/in_a_1 |
02186c6871ac
status: introduce higher-level ui.relative-paths
Martin von Zweigbergk <martinvonz@google.com>
parents:
40278
diff
changeset
|
137 ? in_a |
02186c6871ac
status: introduce higher-level ui.relative-paths
Martin von Zweigbergk <martinvonz@google.com>
parents:
40278
diff
changeset
|
138 ? ../b/1/in_b_1 |
02186c6871ac
status: introduce higher-level ui.relative-paths
Martin von Zweigbergk <martinvonz@google.com>
parents:
40278
diff
changeset
|
139 ? ../b/2/in_b_2 |
02186c6871ac
status: introduce higher-level ui.relative-paths
Martin von Zweigbergk <martinvonz@google.com>
parents:
40278
diff
changeset
|
140 ? ../b/in_b |
02186c6871ac
status: introduce higher-level ui.relative-paths
Martin von Zweigbergk <martinvonz@google.com>
parents:
40278
diff
changeset
|
141 ? ../in_root |
02186c6871ac
status: introduce higher-level ui.relative-paths
Martin von Zweigbergk <martinvonz@google.com>
parents:
40278
diff
changeset
|
142 |
41577
5f827e9ce870
status: if ui.relative-paths=no, don't use relative paths even with patterns
Martin von Zweigbergk <martinvonz@google.com>
parents:
41492
diff
changeset
|
143 $ hg status --cwd a . --config ui.relative-paths=legacy |
5f827e9ce870
status: if ui.relative-paths=no, don't use relative paths even with patterns
Martin von Zweigbergk <martinvonz@google.com>
parents:
41492
diff
changeset
|
144 ? 1/in_a_1 |
5f827e9ce870
status: if ui.relative-paths=no, don't use relative paths even with patterns
Martin von Zweigbergk <martinvonz@google.com>
parents:
41492
diff
changeset
|
145 ? in_a |
5f827e9ce870
status: if ui.relative-paths=no, don't use relative paths even with patterns
Martin von Zweigbergk <martinvonz@google.com>
parents:
41492
diff
changeset
|
146 $ hg status --cwd a . --config ui.relative-paths=no |
5f827e9ce870
status: if ui.relative-paths=no, don't use relative paths even with patterns
Martin von Zweigbergk <martinvonz@google.com>
parents:
41492
diff
changeset
|
147 ? a/1/in_a_1 |
5f827e9ce870
status: if ui.relative-paths=no, don't use relative paths even with patterns
Martin von Zweigbergk <martinvonz@google.com>
parents:
41492
diff
changeset
|
148 ? a/in_a |
5f827e9ce870
status: if ui.relative-paths=no, don't use relative paths even with patterns
Martin von Zweigbergk <martinvonz@google.com>
parents:
41492
diff
changeset
|
149 |
41492
02186c6871ac
status: introduce higher-level ui.relative-paths
Martin von Zweigbergk <martinvonz@google.com>
parents:
40278
diff
changeset
|
150 commands.status.relative overrides ui.relative-paths |
02186c6871ac
status: introduce higher-level ui.relative-paths
Martin von Zweigbergk <martinvonz@google.com>
parents:
40278
diff
changeset
|
151 |
02186c6871ac
status: introduce higher-level ui.relative-paths
Martin von Zweigbergk <martinvonz@google.com>
parents:
40278
diff
changeset
|
152 $ cat >> $HGRCPATH <<EOF |
02186c6871ac
status: introduce higher-level ui.relative-paths
Martin von Zweigbergk <martinvonz@google.com>
parents:
40278
diff
changeset
|
153 > [ui] |
02186c6871ac
status: introduce higher-level ui.relative-paths
Martin von Zweigbergk <martinvonz@google.com>
parents:
40278
diff
changeset
|
154 > relative-paths = False |
31589
7e3b145f8247
status: support commands.status.relative config
Martin von Zweigbergk <martinvonz@google.com>
parents:
31423
diff
changeset
|
155 > [commands] |
7e3b145f8247
status: support commands.status.relative config
Martin von Zweigbergk <martinvonz@google.com>
parents:
31423
diff
changeset
|
156 > status.relative = True |
7e3b145f8247
status: support commands.status.relative config
Martin von Zweigbergk <martinvonz@google.com>
parents:
31423
diff
changeset
|
157 > EOF |
7e3b145f8247
status: support commands.status.relative config
Martin von Zweigbergk <martinvonz@google.com>
parents:
31423
diff
changeset
|
158 $ hg status --cwd a |
7e3b145f8247
status: support commands.status.relative config
Martin von Zweigbergk <martinvonz@google.com>
parents:
31423
diff
changeset
|
159 ? 1/in_a_1 |
7e3b145f8247
status: support commands.status.relative config
Martin von Zweigbergk <martinvonz@google.com>
parents:
31423
diff
changeset
|
160 ? in_a |
7e3b145f8247
status: support commands.status.relative config
Martin von Zweigbergk <martinvonz@google.com>
parents:
31423
diff
changeset
|
161 ? ../b/1/in_b_1 |
7e3b145f8247
status: support commands.status.relative config
Martin von Zweigbergk <martinvonz@google.com>
parents:
31423
diff
changeset
|
162 ? ../b/2/in_b_2 |
7e3b145f8247
status: support commands.status.relative config
Martin von Zweigbergk <martinvonz@google.com>
parents:
31423
diff
changeset
|
163 ? ../b/in_b |
7e3b145f8247
status: support commands.status.relative config
Martin von Zweigbergk <martinvonz@google.com>
parents:
31423
diff
changeset
|
164 ? ../in_root |
7e3b145f8247
status: support commands.status.relative config
Martin von Zweigbergk <martinvonz@google.com>
parents:
31423
diff
changeset
|
165 $ HGPLAIN=1 hg status --cwd a |
31766
bdcaf612e75a
tests: add globs for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
31589
diff
changeset
|
166 ? a/1/in_a_1 (glob) |
bdcaf612e75a
tests: add globs for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
31589
diff
changeset
|
167 ? a/in_a (glob) |
bdcaf612e75a
tests: add globs for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
31589
diff
changeset
|
168 ? b/1/in_b_1 (glob) |
bdcaf612e75a
tests: add globs for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
31589
diff
changeset
|
169 ? b/2/in_b_2 (glob) |
bdcaf612e75a
tests: add globs for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
31589
diff
changeset
|
170 ? b/in_b (glob) |
31589
7e3b145f8247
status: support commands.status.relative config
Martin von Zweigbergk <martinvonz@google.com>
parents:
31423
diff
changeset
|
171 ? in_root |
7e3b145f8247
status: support commands.status.relative config
Martin von Zweigbergk <martinvonz@google.com>
parents:
31423
diff
changeset
|
172 |
32872
9fcb6df413c9
ui: add support for a tweakdefaults knob
Augie Fackler <augie@google.com>
parents:
31766
diff
changeset
|
173 if relative paths are explicitly off, tweakdefaults doesn't change it |
9fcb6df413c9
ui: add support for a tweakdefaults knob
Augie Fackler <augie@google.com>
parents:
31766
diff
changeset
|
174 $ cat >> $HGRCPATH <<EOF |
9fcb6df413c9
ui: add support for a tweakdefaults knob
Augie Fackler <augie@google.com>
parents:
31766
diff
changeset
|
175 > [commands] |
9fcb6df413c9
ui: add support for a tweakdefaults knob
Augie Fackler <augie@google.com>
parents:
31766
diff
changeset
|
176 > status.relative = False |
9fcb6df413c9
ui: add support for a tweakdefaults knob
Augie Fackler <augie@google.com>
parents:
31766
diff
changeset
|
177 > EOF |
9fcb6df413c9
ui: add support for a tweakdefaults knob
Augie Fackler <augie@google.com>
parents:
31766
diff
changeset
|
178 $ hg status --cwd a --config ui.tweakdefaults=yes |
38762
fe3ca1e6f786
ui: remove commands.status.terse=u from ui.tweakdefaults
Gregory Szorc <gregory.szorc@gmail.com>
parents:
38545
diff
changeset
|
179 ? a/1/in_a_1 |
fe3ca1e6f786
ui: remove commands.status.terse=u from ui.tweakdefaults
Gregory Szorc <gregory.szorc@gmail.com>
parents:
38545
diff
changeset
|
180 ? a/in_a |
fe3ca1e6f786
ui: remove commands.status.terse=u from ui.tweakdefaults
Gregory Szorc <gregory.szorc@gmail.com>
parents:
38545
diff
changeset
|
181 ? b/1/in_b_1 |
fe3ca1e6f786
ui: remove commands.status.terse=u from ui.tweakdefaults
Gregory Szorc <gregory.szorc@gmail.com>
parents:
38545
diff
changeset
|
182 ? b/2/in_b_2 |
fe3ca1e6f786
ui: remove commands.status.terse=u from ui.tweakdefaults
Gregory Szorc <gregory.szorc@gmail.com>
parents:
38545
diff
changeset
|
183 ? b/in_b |
32872
9fcb6df413c9
ui: add support for a tweakdefaults knob
Augie Fackler <augie@google.com>
parents:
31766
diff
changeset
|
184 ? in_root |
9fcb6df413c9
ui: add support for a tweakdefaults knob
Augie Fackler <augie@google.com>
parents:
31766
diff
changeset
|
185 |
11782
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
186 $ cd .. |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
187 |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
188 $ hg init repo2 |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
189 $ cd repo2 |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
190 $ touch modified removed deleted ignored |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
191 $ echo "^ignored$" > .hgignore |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11782
diff
changeset
|
192 $ hg ci -A -m 'initial checkin' |
11782
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
193 adding .hgignore |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
194 adding deleted |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
195 adding modified |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
196 adding removed |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
197 $ touch modified added unknown ignored |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
198 $ hg add added |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
199 $ hg remove removed |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
200 $ rm deleted |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
201 |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
202 hg status: |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
203 |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
204 $ hg status |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
205 A added |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
206 R removed |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
207 ! deleted |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
208 ? unknown |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
209 |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
210 hg status modified added removed deleted unknown never-existed ignored: |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
211 |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
212 $ hg status modified added removed deleted unknown never-existed ignored |
15521
117f9190c1ba
tests: hide 'No such file or directory' messages
Mads Kiilerich <mads@kiilerich.com>
parents:
14155
diff
changeset
|
213 never-existed: * (glob) |
11782
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
214 A added |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
215 R removed |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
216 ! deleted |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
217 ? unknown |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
218 |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
219 $ hg copy modified copied |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
220 |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
221 hg status -C: |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
222 |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
223 $ hg status -C |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
224 A added |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
225 A copied |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
226 modified |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
227 R removed |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
228 ! deleted |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
229 ? unknown |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
230 |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
231 hg status -A: |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
232 |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
233 $ hg status -A |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
234 A added |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
235 A copied |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
236 modified |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
237 R removed |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
238 ! deleted |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
239 ? unknown |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
240 I ignored |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
241 C .hgignore |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
242 C modified |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
243 |
38545
85e3aa21bcdc
status: add support for log-like template keywords and functions
Yuya Nishihara <yuya@tcha.org>
parents:
38101
diff
changeset
|
244 $ hg status -A -T '{status} {path} {node|shortest}\n' |
85e3aa21bcdc
status: add support for log-like template keywords and functions
Yuya Nishihara <yuya@tcha.org>
parents:
38101
diff
changeset
|
245 A added ffff |
85e3aa21bcdc
status: add support for log-like template keywords and functions
Yuya Nishihara <yuya@tcha.org>
parents:
38101
diff
changeset
|
246 A copied ffff |
85e3aa21bcdc
status: add support for log-like template keywords and functions
Yuya Nishihara <yuya@tcha.org>
parents:
38101
diff
changeset
|
247 R removed ffff |
85e3aa21bcdc
status: add support for log-like template keywords and functions
Yuya Nishihara <yuya@tcha.org>
parents:
38101
diff
changeset
|
248 ! deleted ffff |
85e3aa21bcdc
status: add support for log-like template keywords and functions
Yuya Nishihara <yuya@tcha.org>
parents:
38101
diff
changeset
|
249 ? unknown ffff |
85e3aa21bcdc
status: add support for log-like template keywords and functions
Yuya Nishihara <yuya@tcha.org>
parents:
38101
diff
changeset
|
250 I ignored ffff |
85e3aa21bcdc
status: add support for log-like template keywords and functions
Yuya Nishihara <yuya@tcha.org>
parents:
38101
diff
changeset
|
251 C .hgignore ffff |
85e3aa21bcdc
status: add support for log-like template keywords and functions
Yuya Nishihara <yuya@tcha.org>
parents:
38101
diff
changeset
|
252 C modified ffff |
85e3aa21bcdc
status: add support for log-like template keywords and functions
Yuya Nishihara <yuya@tcha.org>
parents:
38101
diff
changeset
|
253 |
22429
7a7eed5176a4
commands: add hidden -T option for files/manifest/status/tags
Matt Mackall <mpm@selenic.com>
parents:
22424
diff
changeset
|
254 $ hg status -A -Tjson |
7a7eed5176a4
commands: add hidden -T option for files/manifest/status/tags
Matt Mackall <mpm@selenic.com>
parents:
22424
diff
changeset
|
255 [ |
7a7eed5176a4
commands: add hidden -T option for files/manifest/status/tags
Matt Mackall <mpm@selenic.com>
parents:
22424
diff
changeset
|
256 { |
7a7eed5176a4
commands: add hidden -T option for files/manifest/status/tags
Matt Mackall <mpm@selenic.com>
parents:
22424
diff
changeset
|
257 "path": "added", |
7a7eed5176a4
commands: add hidden -T option for files/manifest/status/tags
Matt Mackall <mpm@selenic.com>
parents:
22424
diff
changeset
|
258 "status": "A" |
7a7eed5176a4
commands: add hidden -T option for files/manifest/status/tags
Matt Mackall <mpm@selenic.com>
parents:
22424
diff
changeset
|
259 }, |
7a7eed5176a4
commands: add hidden -T option for files/manifest/status/tags
Matt Mackall <mpm@selenic.com>
parents:
22424
diff
changeset
|
260 { |
7a7eed5176a4
commands: add hidden -T option for files/manifest/status/tags
Matt Mackall <mpm@selenic.com>
parents:
22424
diff
changeset
|
261 "path": "copied", |
39370
46f3ff64bea7
status: rename {copy} to {source} for compatibility with {file_copies} (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
38762
diff
changeset
|
262 "source": "modified", |
22429
7a7eed5176a4
commands: add hidden -T option for files/manifest/status/tags
Matt Mackall <mpm@selenic.com>
parents:
22424
diff
changeset
|
263 "status": "A" |
7a7eed5176a4
commands: add hidden -T option for files/manifest/status/tags
Matt Mackall <mpm@selenic.com>
parents:
22424
diff
changeset
|
264 }, |
7a7eed5176a4
commands: add hidden -T option for files/manifest/status/tags
Matt Mackall <mpm@selenic.com>
parents:
22424
diff
changeset
|
265 { |
7a7eed5176a4
commands: add hidden -T option for files/manifest/status/tags
Matt Mackall <mpm@selenic.com>
parents:
22424
diff
changeset
|
266 "path": "removed", |
7a7eed5176a4
commands: add hidden -T option for files/manifest/status/tags
Matt Mackall <mpm@selenic.com>
parents:
22424
diff
changeset
|
267 "status": "R" |
7a7eed5176a4
commands: add hidden -T option for files/manifest/status/tags
Matt Mackall <mpm@selenic.com>
parents:
22424
diff
changeset
|
268 }, |
7a7eed5176a4
commands: add hidden -T option for files/manifest/status/tags
Matt Mackall <mpm@selenic.com>
parents:
22424
diff
changeset
|
269 { |
7a7eed5176a4
commands: add hidden -T option for files/manifest/status/tags
Matt Mackall <mpm@selenic.com>
parents:
22424
diff
changeset
|
270 "path": "deleted", |
7a7eed5176a4
commands: add hidden -T option for files/manifest/status/tags
Matt Mackall <mpm@selenic.com>
parents:
22424
diff
changeset
|
271 "status": "!" |
7a7eed5176a4
commands: add hidden -T option for files/manifest/status/tags
Matt Mackall <mpm@selenic.com>
parents:
22424
diff
changeset
|
272 }, |
7a7eed5176a4
commands: add hidden -T option for files/manifest/status/tags
Matt Mackall <mpm@selenic.com>
parents:
22424
diff
changeset
|
273 { |
7a7eed5176a4
commands: add hidden -T option for files/manifest/status/tags
Matt Mackall <mpm@selenic.com>
parents:
22424
diff
changeset
|
274 "path": "unknown", |
7a7eed5176a4
commands: add hidden -T option for files/manifest/status/tags
Matt Mackall <mpm@selenic.com>
parents:
22424
diff
changeset
|
275 "status": "?" |
7a7eed5176a4
commands: add hidden -T option for files/manifest/status/tags
Matt Mackall <mpm@selenic.com>
parents:
22424
diff
changeset
|
276 }, |
7a7eed5176a4
commands: add hidden -T option for files/manifest/status/tags
Matt Mackall <mpm@selenic.com>
parents:
22424
diff
changeset
|
277 { |
7a7eed5176a4
commands: add hidden -T option for files/manifest/status/tags
Matt Mackall <mpm@selenic.com>
parents:
22424
diff
changeset
|
278 "path": "ignored", |
7a7eed5176a4
commands: add hidden -T option for files/manifest/status/tags
Matt Mackall <mpm@selenic.com>
parents:
22424
diff
changeset
|
279 "status": "I" |
7a7eed5176a4
commands: add hidden -T option for files/manifest/status/tags
Matt Mackall <mpm@selenic.com>
parents:
22424
diff
changeset
|
280 }, |
7a7eed5176a4
commands: add hidden -T option for files/manifest/status/tags
Matt Mackall <mpm@selenic.com>
parents:
22424
diff
changeset
|
281 { |
7a7eed5176a4
commands: add hidden -T option for files/manifest/status/tags
Matt Mackall <mpm@selenic.com>
parents:
22424
diff
changeset
|
282 "path": ".hgignore", |
7a7eed5176a4
commands: add hidden -T option for files/manifest/status/tags
Matt Mackall <mpm@selenic.com>
parents:
22424
diff
changeset
|
283 "status": "C" |
7a7eed5176a4
commands: add hidden -T option for files/manifest/status/tags
Matt Mackall <mpm@selenic.com>
parents:
22424
diff
changeset
|
284 }, |
7a7eed5176a4
commands: add hidden -T option for files/manifest/status/tags
Matt Mackall <mpm@selenic.com>
parents:
22424
diff
changeset
|
285 { |
7a7eed5176a4
commands: add hidden -T option for files/manifest/status/tags
Matt Mackall <mpm@selenic.com>
parents:
22424
diff
changeset
|
286 "path": "modified", |
7a7eed5176a4
commands: add hidden -T option for files/manifest/status/tags
Matt Mackall <mpm@selenic.com>
parents:
22424
diff
changeset
|
287 "status": "C" |
7a7eed5176a4
commands: add hidden -T option for files/manifest/status/tags
Matt Mackall <mpm@selenic.com>
parents:
22424
diff
changeset
|
288 } |
7a7eed5176a4
commands: add hidden -T option for files/manifest/status/tags
Matt Mackall <mpm@selenic.com>
parents:
22424
diff
changeset
|
289 ] |
11782
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
290 |
22430
968247e8f4ac
formatter: add pickle format
Matt Mackall <mpm@selenic.com>
parents:
22429
diff
changeset
|
291 $ hg status -A -Tpickle > pickle |
29485
6a98f9408a50
py3: make files use absolute_import and print_function
Pulkit Goyal <7895pulkit@gmail.com>
parents:
29000
diff
changeset
|
292 >>> from __future__ import print_function |
41844
2105ed01c431
tests: make test-status.t compatible with test-check-module-imports.t
Pulkit Goyal <pulkit@yandex-team.ru>
parents:
41735
diff
changeset
|
293 >>> from mercurial import util |
2105ed01c431
tests: make test-status.t compatible with test-check-module-imports.t
Pulkit Goyal <pulkit@yandex-team.ru>
parents:
41735
diff
changeset
|
294 >>> pickle = util.pickle |
40278 | 295 >>> data = sorted((x[b'status'].decode(), x[b'path'].decode()) for x in pickle.load(open("pickle", r"rb"))) |
296 >>> for s, p in data: print("%s %s" % (s, p)) | |
297 ! deleted | |
298 ? pickle | |
299 ? unknown | |
300 A added | |
301 A copied | |
302 C .hgignore | |
303 C modified | |
304 I ignored | |
305 R removed | |
22430
968247e8f4ac
formatter: add pickle format
Matt Mackall <mpm@selenic.com>
parents:
22429
diff
changeset
|
306 $ rm pickle |
968247e8f4ac
formatter: add pickle format
Matt Mackall <mpm@selenic.com>
parents:
22429
diff
changeset
|
307 |
11782
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
308 $ echo "^ignoreddir$" > .hgignore |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
309 $ mkdir ignoreddir |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
310 $ touch ignoreddir/file |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
311 |
25515
e8075329c5fb
tests: test basic template support for status
Matt Mackall <mpm@selenic.com>
parents:
24663
diff
changeset
|
312 Test templater support: |
e8075329c5fb
tests: test basic template support for status
Matt Mackall <mpm@selenic.com>
parents:
24663
diff
changeset
|
313 |
39370
46f3ff64bea7
status: rename {copy} to {source} for compatibility with {file_copies} (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
38762
diff
changeset
|
314 $ hg status -AT "[{status}]\t{if(source, '{source} -> ')}{path}\n" |
25515
e8075329c5fb
tests: test basic template support for status
Matt Mackall <mpm@selenic.com>
parents:
24663
diff
changeset
|
315 [M] .hgignore |
e8075329c5fb
tests: test basic template support for status
Matt Mackall <mpm@selenic.com>
parents:
24663
diff
changeset
|
316 [A] added |
e8075329c5fb
tests: test basic template support for status
Matt Mackall <mpm@selenic.com>
parents:
24663
diff
changeset
|
317 [A] modified -> copied |
e8075329c5fb
tests: test basic template support for status
Matt Mackall <mpm@selenic.com>
parents:
24663
diff
changeset
|
318 [R] removed |
e8075329c5fb
tests: test basic template support for status
Matt Mackall <mpm@selenic.com>
parents:
24663
diff
changeset
|
319 [!] deleted |
e8075329c5fb
tests: test basic template support for status
Matt Mackall <mpm@selenic.com>
parents:
24663
diff
changeset
|
320 [?] ignored |
e8075329c5fb
tests: test basic template support for status
Matt Mackall <mpm@selenic.com>
parents:
24663
diff
changeset
|
321 [?] unknown |
e8075329c5fb
tests: test basic template support for status
Matt Mackall <mpm@selenic.com>
parents:
24663
diff
changeset
|
322 [I] ignoreddir/file |
e8075329c5fb
tests: test basic template support for status
Matt Mackall <mpm@selenic.com>
parents:
24663
diff
changeset
|
323 [C] modified |
e8075329c5fb
tests: test basic template support for status
Matt Mackall <mpm@selenic.com>
parents:
24663
diff
changeset
|
324 $ hg status -AT default |
e8075329c5fb
tests: test basic template support for status
Matt Mackall <mpm@selenic.com>
parents:
24663
diff
changeset
|
325 M .hgignore |
e8075329c5fb
tests: test basic template support for status
Matt Mackall <mpm@selenic.com>
parents:
24663
diff
changeset
|
326 A added |
e8075329c5fb
tests: test basic template support for status
Matt Mackall <mpm@selenic.com>
parents:
24663
diff
changeset
|
327 A copied |
e8075329c5fb
tests: test basic template support for status
Matt Mackall <mpm@selenic.com>
parents:
24663
diff
changeset
|
328 modified |
e8075329c5fb
tests: test basic template support for status
Matt Mackall <mpm@selenic.com>
parents:
24663
diff
changeset
|
329 R removed |
e8075329c5fb
tests: test basic template support for status
Matt Mackall <mpm@selenic.com>
parents:
24663
diff
changeset
|
330 ! deleted |
e8075329c5fb
tests: test basic template support for status
Matt Mackall <mpm@selenic.com>
parents:
24663
diff
changeset
|
331 ? ignored |
e8075329c5fb
tests: test basic template support for status
Matt Mackall <mpm@selenic.com>
parents:
24663
diff
changeset
|
332 ? unknown |
e8075329c5fb
tests: test basic template support for status
Matt Mackall <mpm@selenic.com>
parents:
24663
diff
changeset
|
333 I ignoreddir/file |
e8075329c5fb
tests: test basic template support for status
Matt Mackall <mpm@selenic.com>
parents:
24663
diff
changeset
|
334 C modified |
e8075329c5fb
tests: test basic template support for status
Matt Mackall <mpm@selenic.com>
parents:
24663
diff
changeset
|
335 $ hg status -T compact |
e8075329c5fb
tests: test basic template support for status
Matt Mackall <mpm@selenic.com>
parents:
24663
diff
changeset
|
336 abort: "status" not in template map |
e8075329c5fb
tests: test basic template support for status
Matt Mackall <mpm@selenic.com>
parents:
24663
diff
changeset
|
337 [255] |
e8075329c5fb
tests: test basic template support for status
Matt Mackall <mpm@selenic.com>
parents:
24663
diff
changeset
|
338 |
11782
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
339 hg status ignoreddir/file: |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
340 |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
341 $ hg status ignoreddir/file |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
342 |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
343 hg status -i ignoreddir/file: |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
344 |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
345 $ hg status -i ignoreddir/file |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
346 I ignoreddir/file |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
347 $ cd .. |
6200
acc40572da5b
'hg status -q' output skips non-tracked files.
Zoran Bosnjak <zoran.bosnjak@via.si>
parents:
6033
diff
changeset
|
348 |
12328
b63f6422d2a7
tests: fix a bunch of pointless #s in unified tests
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
349 Check 'status -q' and some combinations |
11782
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
350 |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
351 $ hg init repo3 |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
352 $ cd repo3 |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
353 $ touch modified removed deleted ignored |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
354 $ echo "^ignored$" > .hgignore |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
355 $ hg commit -A -m 'initial checkin' |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
356 adding .hgignore |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
357 adding deleted |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
358 adding modified |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
359 adding removed |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
360 $ touch added unknown ignored |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
361 $ hg add added |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
362 $ echo "test" >> modified |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
363 $ hg remove removed |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
364 $ rm deleted |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
365 $ hg copy modified copied |
6200
acc40572da5b
'hg status -q' output skips non-tracked files.
Zoran Bosnjak <zoran.bosnjak@via.si>
parents:
6033
diff
changeset
|
366 |
24419
0e41f110e69e
revset: add wdir() function to specify workingctx revision by command
Yuya Nishihara <yuya@tcha.org>
parents:
23402
diff
changeset
|
367 Specify working directory revision explicitly, that should be the same as |
0e41f110e69e
revset: add wdir() function to specify workingctx revision by command
Yuya Nishihara <yuya@tcha.org>
parents:
23402
diff
changeset
|
368 "hg status" |
0e41f110e69e
revset: add wdir() function to specify workingctx revision by command
Yuya Nishihara <yuya@tcha.org>
parents:
23402
diff
changeset
|
369 |
0e41f110e69e
revset: add wdir() function to specify workingctx revision by command
Yuya Nishihara <yuya@tcha.org>
parents:
23402
diff
changeset
|
370 $ hg status --change "wdir()" |
0e41f110e69e
revset: add wdir() function to specify workingctx revision by command
Yuya Nishihara <yuya@tcha.org>
parents:
23402
diff
changeset
|
371 M modified |
0e41f110e69e
revset: add wdir() function to specify workingctx revision by command
Yuya Nishihara <yuya@tcha.org>
parents:
23402
diff
changeset
|
372 A added |
0e41f110e69e
revset: add wdir() function to specify workingctx revision by command
Yuya Nishihara <yuya@tcha.org>
parents:
23402
diff
changeset
|
373 A copied |
0e41f110e69e
revset: add wdir() function to specify workingctx revision by command
Yuya Nishihara <yuya@tcha.org>
parents:
23402
diff
changeset
|
374 R removed |
0e41f110e69e
revset: add wdir() function to specify workingctx revision by command
Yuya Nishihara <yuya@tcha.org>
parents:
23402
diff
changeset
|
375 ! deleted |
0e41f110e69e
revset: add wdir() function to specify workingctx revision by command
Yuya Nishihara <yuya@tcha.org>
parents:
23402
diff
changeset
|
376 ? unknown |
0e41f110e69e
revset: add wdir() function to specify workingctx revision by command
Yuya Nishihara <yuya@tcha.org>
parents:
23402
diff
changeset
|
377 |
12328
b63f6422d2a7
tests: fix a bunch of pointless #s in unified tests
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
378 Run status with 2 different flags. |
b63f6422d2a7
tests: fix a bunch of pointless #s in unified tests
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
379 Check if result is the same or different. |
b63f6422d2a7
tests: fix a bunch of pointless #s in unified tests
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
380 If result is not as expected, raise error |
11782
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
381 |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
382 $ assert() { |
12365
22f3353bcc36
tests: cleanup exit code handling in unified tests
Matt Mackall <mpm@selenic.com>
parents:
12328
diff
changeset
|
383 > hg status $1 > ../a |
22f3353bcc36
tests: cleanup exit code handling in unified tests
Matt Mackall <mpm@selenic.com>
parents:
12328
diff
changeset
|
384 > hg status $2 > ../b |
22f3353bcc36
tests: cleanup exit code handling in unified tests
Matt Mackall <mpm@selenic.com>
parents:
12328
diff
changeset
|
385 > if diff ../a ../b > /dev/null; then |
22f3353bcc36
tests: cleanup exit code handling in unified tests
Matt Mackall <mpm@selenic.com>
parents:
12328
diff
changeset
|
386 > out=0 |
22f3353bcc36
tests: cleanup exit code handling in unified tests
Matt Mackall <mpm@selenic.com>
parents:
12328
diff
changeset
|
387 > else |
11782
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
388 > out=1 |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
389 > fi |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
390 > if [ $3 -eq 0 ]; then |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
391 > df="same" |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
392 > else |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
393 > df="different" |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
394 > fi |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
395 > if [ $out -ne $3 ]; then |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
396 > echo "Error on $1 and $2, should be $df." |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
397 > fi |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
398 > } |
6200
acc40572da5b
'hg status -q' output skips non-tracked files.
Zoran Bosnjak <zoran.bosnjak@via.si>
parents:
6033
diff
changeset
|
399 |
12328
b63f6422d2a7
tests: fix a bunch of pointless #s in unified tests
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
400 Assert flag1 flag2 [0-same | 1-different] |
11782
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
401 |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
402 $ assert "-q" "-mard" 0 |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
403 $ assert "-A" "-marduicC" 0 |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
404 $ assert "-qA" "-mardcC" 0 |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
405 $ assert "-qAui" "-A" 0 |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
406 $ assert "-qAu" "-marducC" 0 |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
407 $ assert "-qAi" "-mardicC" 0 |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
408 $ assert "-qu" "-u" 0 |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
409 $ assert "-q" "-u" 1 |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
410 $ assert "-m" "-a" 1 |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
411 $ assert "-r" "-d" 1 |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
412 $ cd .. |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
413 |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
414 $ hg init repo4 |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
415 $ cd repo4 |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
416 $ touch modified removed deleted |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11782
diff
changeset
|
417 $ hg ci -q -A -m 'initial checkin' |
11782
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
418 $ touch added unknown |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
419 $ hg add added |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
420 $ hg remove removed |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
421 $ rm deleted |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
422 $ echo x > modified |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
423 $ hg copy modified copied |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
424 $ hg ci -m 'test checkin' -d "1000001 0" |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
425 $ rm * |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
426 $ touch unrelated |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
427 $ hg ci -q -A -m 'unrelated checkin' -d "1000002 0" |
6200
acc40572da5b
'hg status -q' output skips non-tracked files.
Zoran Bosnjak <zoran.bosnjak@via.si>
parents:
6033
diff
changeset
|
428 |
11782
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
429 hg status --change 1: |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
430 |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
431 $ hg status --change 1 |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
432 M modified |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
433 A added |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
434 A copied |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
435 R removed |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
436 |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
437 hg status --change 1 unrelated: |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
438 |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
439 $ hg status --change 1 unrelated |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
440 |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
441 hg status -C --change 1 added modified copied removed deleted: |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
442 |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
443 $ hg status -C --change 1 added modified copied removed deleted |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
444 M modified |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
445 A added |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
446 A copied |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
447 modified |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
448 R removed |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
449 |
15578
db0e277bdd37
status: support revsets with --change
Patrick Mezard <pmezard@gmail.com>
parents:
15521
diff
changeset
|
450 hg status -A --change 1 and revset: |
11782
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
451 |
15578
db0e277bdd37
status: support revsets with --change
Patrick Mezard <pmezard@gmail.com>
parents:
15521
diff
changeset
|
452 $ hg status -A --change '1|1' |
11782
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
453 M modified |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
454 A added |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
455 A copied |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
456 modified |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
457 R removed |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
458 C deleted |
15848
012b285cf643
filectx: fix cmp() of file starting with '\1\n'
Yuya Nishihara <yuya@tcha.org>
parents:
14155
diff
changeset
|
459 |
012b285cf643
filectx: fix cmp() of file starting with '\1\n'
Yuya Nishihara <yuya@tcha.org>
parents:
14155
diff
changeset
|
460 $ cd .. |
012b285cf643
filectx: fix cmp() of file starting with '\1\n'
Yuya Nishihara <yuya@tcha.org>
parents:
14155
diff
changeset
|
461 |
27668
369c8f9453c2
status: revert + flag-change == modified
Martin von Zweigbergk <martinvonz@google.com>
parents:
25515
diff
changeset
|
462 hg status with --rev and reverted changes: |
369c8f9453c2
status: revert + flag-change == modified
Martin von Zweigbergk <martinvonz@google.com>
parents:
25515
diff
changeset
|
463 |
369c8f9453c2
status: revert + flag-change == modified
Martin von Zweigbergk <martinvonz@google.com>
parents:
25515
diff
changeset
|
464 $ hg init reverted-changes-repo |
369c8f9453c2
status: revert + flag-change == modified
Martin von Zweigbergk <martinvonz@google.com>
parents:
25515
diff
changeset
|
465 $ cd reverted-changes-repo |
369c8f9453c2
status: revert + flag-change == modified
Martin von Zweigbergk <martinvonz@google.com>
parents:
25515
diff
changeset
|
466 $ echo a > file |
369c8f9453c2
status: revert + flag-change == modified
Martin von Zweigbergk <martinvonz@google.com>
parents:
25515
diff
changeset
|
467 $ hg add file |
369c8f9453c2
status: revert + flag-change == modified
Martin von Zweigbergk <martinvonz@google.com>
parents:
25515
diff
changeset
|
468 $ hg ci -m a |
369c8f9453c2
status: revert + flag-change == modified
Martin von Zweigbergk <martinvonz@google.com>
parents:
25515
diff
changeset
|
469 $ echo b > file |
369c8f9453c2
status: revert + flag-change == modified
Martin von Zweigbergk <martinvonz@google.com>
parents:
25515
diff
changeset
|
470 $ hg ci -m b |
369c8f9453c2
status: revert + flag-change == modified
Martin von Zweigbergk <martinvonz@google.com>
parents:
25515
diff
changeset
|
471 |
369c8f9453c2
status: revert + flag-change == modified
Martin von Zweigbergk <martinvonz@google.com>
parents:
25515
diff
changeset
|
472 reverted file should appear clean |
369c8f9453c2
status: revert + flag-change == modified
Martin von Zweigbergk <martinvonz@google.com>
parents:
25515
diff
changeset
|
473 |
369c8f9453c2
status: revert + flag-change == modified
Martin von Zweigbergk <martinvonz@google.com>
parents:
25515
diff
changeset
|
474 $ hg revert -r 0 . |
369c8f9453c2
status: revert + flag-change == modified
Martin von Zweigbergk <martinvonz@google.com>
parents:
25515
diff
changeset
|
475 reverting file |
369c8f9453c2
status: revert + flag-change == modified
Martin von Zweigbergk <martinvonz@google.com>
parents:
25515
diff
changeset
|
476 $ hg status -A --rev 0 |
369c8f9453c2
status: revert + flag-change == modified
Martin von Zweigbergk <martinvonz@google.com>
parents:
25515
diff
changeset
|
477 C file |
369c8f9453c2
status: revert + flag-change == modified
Martin von Zweigbergk <martinvonz@google.com>
parents:
25515
diff
changeset
|
478 |
369c8f9453c2
status: revert + flag-change == modified
Martin von Zweigbergk <martinvonz@google.com>
parents:
25515
diff
changeset
|
479 #if execbit |
369c8f9453c2
status: revert + flag-change == modified
Martin von Zweigbergk <martinvonz@google.com>
parents:
25515
diff
changeset
|
480 reverted file with changed flag should appear modified |
369c8f9453c2
status: revert + flag-change == modified
Martin von Zweigbergk <martinvonz@google.com>
parents:
25515
diff
changeset
|
481 |
369c8f9453c2
status: revert + flag-change == modified
Martin von Zweigbergk <martinvonz@google.com>
parents:
25515
diff
changeset
|
482 $ chmod +x file |
369c8f9453c2
status: revert + flag-change == modified
Martin von Zweigbergk <martinvonz@google.com>
parents:
25515
diff
changeset
|
483 $ hg status -A --rev 0 |
369c8f9453c2
status: revert + flag-change == modified
Martin von Zweigbergk <martinvonz@google.com>
parents:
25515
diff
changeset
|
484 M file |
369c8f9453c2
status: revert + flag-change == modified
Martin von Zweigbergk <martinvonz@google.com>
parents:
25515
diff
changeset
|
485 |
27743
5dcadc6c5aed
test-status: stabilize for no-execbit platforms
Matt Harbison <matt_harbison@yahoo.com>
parents:
27720
diff
changeset
|
486 $ hg revert -r 0 . |
5dcadc6c5aed
test-status: stabilize for no-execbit platforms
Matt Harbison <matt_harbison@yahoo.com>
parents:
27720
diff
changeset
|
487 reverting file |
27749
215b47449e47
context: check for differing flags a little earlier
Martin von Zweigbergk <martinvonz@google.com>
parents:
27747
diff
changeset
|
488 |
215b47449e47
context: check for differing flags a little earlier
Martin von Zweigbergk <martinvonz@google.com>
parents:
27747
diff
changeset
|
489 reverted and committed file with changed flag should appear modified |
215b47449e47
context: check for differing flags a little earlier
Martin von Zweigbergk <martinvonz@google.com>
parents:
27747
diff
changeset
|
490 |
215b47449e47
context: check for differing flags a little earlier
Martin von Zweigbergk <martinvonz@google.com>
parents:
27747
diff
changeset
|
491 $ hg co -C . |
215b47449e47
context: check for differing flags a little earlier
Martin von Zweigbergk <martinvonz@google.com>
parents:
27747
diff
changeset
|
492 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
215b47449e47
context: check for differing flags a little earlier
Martin von Zweigbergk <martinvonz@google.com>
parents:
27747
diff
changeset
|
493 $ chmod +x file |
215b47449e47
context: check for differing flags a little earlier
Martin von Zweigbergk <martinvonz@google.com>
parents:
27747
diff
changeset
|
494 $ hg ci -m 'change flag' |
215b47449e47
context: check for differing flags a little earlier
Martin von Zweigbergk <martinvonz@google.com>
parents:
27747
diff
changeset
|
495 $ hg status -A --rev 1 --rev 2 |
215b47449e47
context: check for differing flags a little earlier
Martin von Zweigbergk <martinvonz@google.com>
parents:
27747
diff
changeset
|
496 M file |
215b47449e47
context: check for differing flags a little earlier
Martin von Zweigbergk <martinvonz@google.com>
parents:
27747
diff
changeset
|
497 $ hg diff -r 1 -r 2 |
215b47449e47
context: check for differing flags a little earlier
Martin von Zweigbergk <martinvonz@google.com>
parents:
27747
diff
changeset
|
498 |
27668
369c8f9453c2
status: revert + flag-change == modified
Martin von Zweigbergk <martinvonz@google.com>
parents:
25515
diff
changeset
|
499 #endif |
369c8f9453c2
status: revert + flag-change == modified
Martin von Zweigbergk <martinvonz@google.com>
parents:
25515
diff
changeset
|
500 |
31423
568d80b24b3a
tests: properly drop back to root dir in test-status.t
Ryan McElroy <rmcelroy@fb.com>
parents:
29485
diff
changeset
|
501 $ cd .. |
568d80b24b3a
tests: properly drop back to root dir in test-status.t
Ryan McElroy <rmcelroy@fb.com>
parents:
29485
diff
changeset
|
502 |
15848
012b285cf643
filectx: fix cmp() of file starting with '\1\n'
Yuya Nishihara <yuya@tcha.org>
parents:
14155
diff
changeset
|
503 hg status of binary file starting with '\1\n', a separator for metadata: |
012b285cf643
filectx: fix cmp() of file starting with '\1\n'
Yuya Nishihara <yuya@tcha.org>
parents:
14155
diff
changeset
|
504 |
012b285cf643
filectx: fix cmp() of file starting with '\1\n'
Yuya Nishihara <yuya@tcha.org>
parents:
14155
diff
changeset
|
505 $ hg init repo5 |
012b285cf643
filectx: fix cmp() of file starting with '\1\n'
Yuya Nishihara <yuya@tcha.org>
parents:
14155
diff
changeset
|
506 $ cd repo5 |
38017
6660b90805c6
py3: suppress the value returned by .write() calls
Pulkit Goyal <7895pulkit@gmail.com>
parents:
36039
diff
changeset
|
507 >>> open("010a", r"wb").write(b"\1\nfoo") and None |
15848
012b285cf643
filectx: fix cmp() of file starting with '\1\n'
Yuya Nishihara <yuya@tcha.org>
parents:
14155
diff
changeset
|
508 $ hg ci -q -A -m 'initial checkin' |
012b285cf643
filectx: fix cmp() of file starting with '\1\n'
Yuya Nishihara <yuya@tcha.org>
parents:
14155
diff
changeset
|
509 $ hg status -A |
012b285cf643
filectx: fix cmp() of file starting with '\1\n'
Yuya Nishihara <yuya@tcha.org>
parents:
14155
diff
changeset
|
510 C 010a |
012b285cf643
filectx: fix cmp() of file starting with '\1\n'
Yuya Nishihara <yuya@tcha.org>
parents:
14155
diff
changeset
|
511 |
38017
6660b90805c6
py3: suppress the value returned by .write() calls
Pulkit Goyal <7895pulkit@gmail.com>
parents:
36039
diff
changeset
|
512 >>> open("010a", r"wb").write(b"\1\nbar") and None |
15848
012b285cf643
filectx: fix cmp() of file starting with '\1\n'
Yuya Nishihara <yuya@tcha.org>
parents:
14155
diff
changeset
|
513 $ hg status -A |
012b285cf643
filectx: fix cmp() of file starting with '\1\n'
Yuya Nishihara <yuya@tcha.org>
parents:
14155
diff
changeset
|
514 M 010a |
012b285cf643
filectx: fix cmp() of file starting with '\1\n'
Yuya Nishihara <yuya@tcha.org>
parents:
14155
diff
changeset
|
515 $ hg ci -q -m 'modify 010a' |
012b285cf643
filectx: fix cmp() of file starting with '\1\n'
Yuya Nishihara <yuya@tcha.org>
parents:
14155
diff
changeset
|
516 $ hg status -A --rev 0:1 |
012b285cf643
filectx: fix cmp() of file starting with '\1\n'
Yuya Nishihara <yuya@tcha.org>
parents:
14155
diff
changeset
|
517 M 010a |
012b285cf643
filectx: fix cmp() of file starting with '\1\n'
Yuya Nishihara <yuya@tcha.org>
parents:
14155
diff
changeset
|
518 |
012b285cf643
filectx: fix cmp() of file starting with '\1\n'
Yuya Nishihara <yuya@tcha.org>
parents:
14155
diff
changeset
|
519 $ touch empty |
012b285cf643
filectx: fix cmp() of file starting with '\1\n'
Yuya Nishihara <yuya@tcha.org>
parents:
14155
diff
changeset
|
520 $ hg ci -q -A -m 'add another file' |
012b285cf643
filectx: fix cmp() of file starting with '\1\n'
Yuya Nishihara <yuya@tcha.org>
parents:
14155
diff
changeset
|
521 $ hg status -A --rev 1:2 010a |
012b285cf643
filectx: fix cmp() of file starting with '\1\n'
Yuya Nishihara <yuya@tcha.org>
parents:
14155
diff
changeset
|
522 C 010a |
16144
4546a8513dcd
localrepository: use 'changectx.dirs()' in 'status()' for directory patterns
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
16098
diff
changeset
|
523 |
4546a8513dcd
localrepository: use 'changectx.dirs()' in 'status()' for directory patterns
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
16098
diff
changeset
|
524 $ cd .. |
4546a8513dcd
localrepository: use 'changectx.dirs()' in 'status()' for directory patterns
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
16098
diff
changeset
|
525 |
4546a8513dcd
localrepository: use 'changectx.dirs()' in 'status()' for directory patterns
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
16098
diff
changeset
|
526 test "hg status" with "directory pattern" which matches against files |
4546a8513dcd
localrepository: use 'changectx.dirs()' in 'status()' for directory patterns
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
16098
diff
changeset
|
527 only known on target revision. |
4546a8513dcd
localrepository: use 'changectx.dirs()' in 'status()' for directory patterns
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
16098
diff
changeset
|
528 |
4546a8513dcd
localrepository: use 'changectx.dirs()' in 'status()' for directory patterns
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
16098
diff
changeset
|
529 $ hg init repo6 |
4546a8513dcd
localrepository: use 'changectx.dirs()' in 'status()' for directory patterns
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
16098
diff
changeset
|
530 $ cd repo6 |
4546a8513dcd
localrepository: use 'changectx.dirs()' in 'status()' for directory patterns
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
16098
diff
changeset
|
531 |
4546a8513dcd
localrepository: use 'changectx.dirs()' in 'status()' for directory patterns
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
16098
diff
changeset
|
532 $ echo a > a.txt |
4546a8513dcd
localrepository: use 'changectx.dirs()' in 'status()' for directory patterns
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
16098
diff
changeset
|
533 $ hg add a.txt |
4546a8513dcd
localrepository: use 'changectx.dirs()' in 'status()' for directory patterns
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
16098
diff
changeset
|
534 $ hg commit -m '#0' |
4546a8513dcd
localrepository: use 'changectx.dirs()' in 'status()' for directory patterns
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
16098
diff
changeset
|
535 $ mkdir -p 1/2/3/4/5 |
4546a8513dcd
localrepository: use 'changectx.dirs()' in 'status()' for directory patterns
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
16098
diff
changeset
|
536 $ echo b > 1/2/3/4/5/b.txt |
4546a8513dcd
localrepository: use 'changectx.dirs()' in 'status()' for directory patterns
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
16098
diff
changeset
|
537 $ hg add 1/2/3/4/5/b.txt |
4546a8513dcd
localrepository: use 'changectx.dirs()' in 'status()' for directory patterns
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
16098
diff
changeset
|
538 $ hg commit -m '#1' |
4546a8513dcd
localrepository: use 'changectx.dirs()' in 'status()' for directory patterns
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
16098
diff
changeset
|
539 |
4546a8513dcd
localrepository: use 'changectx.dirs()' in 'status()' for directory patterns
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
16098
diff
changeset
|
540 $ hg update -C 0 > /dev/null |
4546a8513dcd
localrepository: use 'changectx.dirs()' in 'status()' for directory patterns
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
16098
diff
changeset
|
541 $ hg status -A |
4546a8513dcd
localrepository: use 'changectx.dirs()' in 'status()' for directory patterns
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
16098
diff
changeset
|
542 C a.txt |
4546a8513dcd
localrepository: use 'changectx.dirs()' in 'status()' for directory patterns
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
16098
diff
changeset
|
543 |
4546a8513dcd
localrepository: use 'changectx.dirs()' in 'status()' for directory patterns
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
16098
diff
changeset
|
544 the directory matching against specified pattern should be removed, |
4546a8513dcd
localrepository: use 'changectx.dirs()' in 'status()' for directory patterns
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
16098
diff
changeset
|
545 because directory existence prevents 'dirstate.walk()' from showing |
4546a8513dcd
localrepository: use 'changectx.dirs()' in 'status()' for directory patterns
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
16098
diff
changeset
|
546 warning message about such pattern. |
4546a8513dcd
localrepository: use 'changectx.dirs()' in 'status()' for directory patterns
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
16098
diff
changeset
|
547 |
4546a8513dcd
localrepository: use 'changectx.dirs()' in 'status()' for directory patterns
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
16098
diff
changeset
|
548 $ test ! -d 1 |
4546a8513dcd
localrepository: use 'changectx.dirs()' in 'status()' for directory patterns
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
16098
diff
changeset
|
549 $ hg status -A --rev 1 1/2/3/4/5/b.txt |
4546a8513dcd
localrepository: use 'changectx.dirs()' in 'status()' for directory patterns
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
16098
diff
changeset
|
550 R 1/2/3/4/5/b.txt |
4546a8513dcd
localrepository: use 'changectx.dirs()' in 'status()' for directory patterns
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
16098
diff
changeset
|
551 $ hg status -A --rev 1 1/2/3/4/5 |
4546a8513dcd
localrepository: use 'changectx.dirs()' in 'status()' for directory patterns
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
16098
diff
changeset
|
552 R 1/2/3/4/5/b.txt |
4546a8513dcd
localrepository: use 'changectx.dirs()' in 'status()' for directory patterns
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
16098
diff
changeset
|
553 $ hg status -A --rev 1 1/2/3 |
4546a8513dcd
localrepository: use 'changectx.dirs()' in 'status()' for directory patterns
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
16098
diff
changeset
|
554 R 1/2/3/4/5/b.txt |
4546a8513dcd
localrepository: use 'changectx.dirs()' in 'status()' for directory patterns
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
16098
diff
changeset
|
555 $ hg status -A --rev 1 1 |
4546a8513dcd
localrepository: use 'changectx.dirs()' in 'status()' for directory patterns
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
16098
diff
changeset
|
556 R 1/2/3/4/5/b.txt |
4546a8513dcd
localrepository: use 'changectx.dirs()' in 'status()' for directory patterns
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
16098
diff
changeset
|
557 |
22424
1f72226064b8
formatter: make debug style match Python syntax
Matt Mackall <mpm@selenic.com>
parents:
21972
diff
changeset
|
558 $ hg status --config ui.formatdebug=True --rev 1 1 |
1f72226064b8
formatter: make debug style match Python syntax
Matt Mackall <mpm@selenic.com>
parents:
21972
diff
changeset
|
559 status = [ |
40277
1159031ada1e
formatter: make debug output prettier
Yuya Nishihara <yuya@tcha.org>
parents:
39370
diff
changeset
|
560 { |
1159031ada1e
formatter: make debug output prettier
Yuya Nishihara <yuya@tcha.org>
parents:
39370
diff
changeset
|
561 'path': '1/2/3/4/5/b.txt', |
1159031ada1e
formatter: make debug output prettier
Yuya Nishihara <yuya@tcha.org>
parents:
39370
diff
changeset
|
562 'status': 'R' |
1159031ada1e
formatter: make debug output prettier
Yuya Nishihara <yuya@tcha.org>
parents:
39370
diff
changeset
|
563 }, |
22424
1f72226064b8
formatter: make debug style match Python syntax
Matt Mackall <mpm@selenic.com>
parents:
21972
diff
changeset
|
564 ] |
1f72226064b8
formatter: make debug style match Python syntax
Matt Mackall <mpm@selenic.com>
parents:
21972
diff
changeset
|
565 |
17377
a10f7eeb2588
test-status.t: test ui.slash on Windows
Patrick Mezard <patrick@mezard.eu>
parents:
16144
diff
changeset
|
566 #if windows |
a10f7eeb2588
test-status.t: test ui.slash on Windows
Patrick Mezard <patrick@mezard.eu>
parents:
16144
diff
changeset
|
567 $ hg --config ui.slash=false status -A --rev 1 1 |
a10f7eeb2588
test-status.t: test ui.slash on Windows
Patrick Mezard <patrick@mezard.eu>
parents:
16144
diff
changeset
|
568 R 1\2\3\4\5\b.txt |
a10f7eeb2588
test-status.t: test ui.slash on Windows
Patrick Mezard <patrick@mezard.eu>
parents:
16144
diff
changeset
|
569 #endif |
a10f7eeb2588
test-status.t: test ui.slash on Windows
Patrick Mezard <patrick@mezard.eu>
parents:
16144
diff
changeset
|
570 |
16144
4546a8513dcd
localrepository: use 'changectx.dirs()' in 'status()' for directory patterns
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
16098
diff
changeset
|
571 $ cd .. |
23402
2963d5c9d90b
rename: properly report removed and added file as modified (issue4458)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23037
diff
changeset
|
572 |
2963d5c9d90b
rename: properly report removed and added file as modified (issue4458)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23037
diff
changeset
|
573 Status after move overwriting a file (issue4458) |
2963d5c9d90b
rename: properly report removed and added file as modified (issue4458)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23037
diff
changeset
|
574 ================================================= |
2963d5c9d90b
rename: properly report removed and added file as modified (issue4458)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23037
diff
changeset
|
575 |
2963d5c9d90b
rename: properly report removed and added file as modified (issue4458)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23037
diff
changeset
|
576 |
2963d5c9d90b
rename: properly report removed and added file as modified (issue4458)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23037
diff
changeset
|
577 $ hg init issue4458 |
2963d5c9d90b
rename: properly report removed and added file as modified (issue4458)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23037
diff
changeset
|
578 $ cd issue4458 |
2963d5c9d90b
rename: properly report removed and added file as modified (issue4458)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23037
diff
changeset
|
579 $ echo a > a |
2963d5c9d90b
rename: properly report removed and added file as modified (issue4458)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23037
diff
changeset
|
580 $ echo b > b |
2963d5c9d90b
rename: properly report removed and added file as modified (issue4458)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23037
diff
changeset
|
581 $ hg commit -Am base |
2963d5c9d90b
rename: properly report removed and added file as modified (issue4458)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23037
diff
changeset
|
582 adding a |
2963d5c9d90b
rename: properly report removed and added file as modified (issue4458)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23037
diff
changeset
|
583 adding b |
2963d5c9d90b
rename: properly report removed and added file as modified (issue4458)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23037
diff
changeset
|
584 |
2963d5c9d90b
rename: properly report removed and added file as modified (issue4458)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23037
diff
changeset
|
585 |
2963d5c9d90b
rename: properly report removed and added file as modified (issue4458)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23037
diff
changeset
|
586 with --force |
2963d5c9d90b
rename: properly report removed and added file as modified (issue4458)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23037
diff
changeset
|
587 |
2963d5c9d90b
rename: properly report removed and added file as modified (issue4458)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23037
diff
changeset
|
588 $ hg mv b --force a |
2963d5c9d90b
rename: properly report removed and added file as modified (issue4458)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23037
diff
changeset
|
589 $ hg st --copies |
2963d5c9d90b
rename: properly report removed and added file as modified (issue4458)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23037
diff
changeset
|
590 M a |
2963d5c9d90b
rename: properly report removed and added file as modified (issue4458)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23037
diff
changeset
|
591 b |
2963d5c9d90b
rename: properly report removed and added file as modified (issue4458)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23037
diff
changeset
|
592 R b |
2963d5c9d90b
rename: properly report removed and added file as modified (issue4458)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23037
diff
changeset
|
593 $ hg revert --all |
2963d5c9d90b
rename: properly report removed and added file as modified (issue4458)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23037
diff
changeset
|
594 reverting a |
2963d5c9d90b
rename: properly report removed and added file as modified (issue4458)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23037
diff
changeset
|
595 undeleting b |
2963d5c9d90b
rename: properly report removed and added file as modified (issue4458)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23037
diff
changeset
|
596 $ rm *.orig |
2963d5c9d90b
rename: properly report removed and added file as modified (issue4458)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23037
diff
changeset
|
597 |
2963d5c9d90b
rename: properly report removed and added file as modified (issue4458)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23037
diff
changeset
|
598 without force |
2963d5c9d90b
rename: properly report removed and added file as modified (issue4458)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23037
diff
changeset
|
599 |
2963d5c9d90b
rename: properly report removed and added file as modified (issue4458)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23037
diff
changeset
|
600 $ hg rm a |
2963d5c9d90b
rename: properly report removed and added file as modified (issue4458)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23037
diff
changeset
|
601 $ hg st --copies |
2963d5c9d90b
rename: properly report removed and added file as modified (issue4458)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23037
diff
changeset
|
602 R a |
2963d5c9d90b
rename: properly report removed and added file as modified (issue4458)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23037
diff
changeset
|
603 $ hg mv b a |
2963d5c9d90b
rename: properly report removed and added file as modified (issue4458)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23037
diff
changeset
|
604 $ hg st --copies |
2963d5c9d90b
rename: properly report removed and added file as modified (issue4458)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23037
diff
changeset
|
605 M a |
2963d5c9d90b
rename: properly report removed and added file as modified (issue4458)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23037
diff
changeset
|
606 b |
2963d5c9d90b
rename: properly report removed and added file as modified (issue4458)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23037
diff
changeset
|
607 R b |
2963d5c9d90b
rename: properly report removed and added file as modified (issue4458)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23037
diff
changeset
|
608 |
24663
7d01371e6358
commands: add ui.statuscopies config knob
Mathias De Maré <mathias.demare@gmail.com>
parents:
24419
diff
changeset
|
609 using ui.statuscopies setting |
7d01371e6358
commands: add ui.statuscopies config knob
Mathias De Maré <mathias.demare@gmail.com>
parents:
24419
diff
changeset
|
610 $ hg st --config ui.statuscopies=true |
7d01371e6358
commands: add ui.statuscopies config knob
Mathias De Maré <mathias.demare@gmail.com>
parents:
24419
diff
changeset
|
611 M a |
7d01371e6358
commands: add ui.statuscopies config knob
Mathias De Maré <mathias.demare@gmail.com>
parents:
24419
diff
changeset
|
612 b |
7d01371e6358
commands: add ui.statuscopies config knob
Mathias De Maré <mathias.demare@gmail.com>
parents:
24419
diff
changeset
|
613 R b |
7d01371e6358
commands: add ui.statuscopies config knob
Mathias De Maré <mathias.demare@gmail.com>
parents:
24419
diff
changeset
|
614 $ hg st --config ui.statuscopies=false |
7d01371e6358
commands: add ui.statuscopies config knob
Mathias De Maré <mathias.demare@gmail.com>
parents:
24419
diff
changeset
|
615 M a |
7d01371e6358
commands: add ui.statuscopies config knob
Mathias De Maré <mathias.demare@gmail.com>
parents:
24419
diff
changeset
|
616 R b |
35067
929858db4d22
tweakdefaults: turn on ui.statuscopies
Martin von Zweigbergk <martinvonz@google.com>
parents:
32887
diff
changeset
|
617 $ hg st --config ui.tweakdefaults=yes |
929858db4d22
tweakdefaults: turn on ui.statuscopies
Martin von Zweigbergk <martinvonz@google.com>
parents:
32887
diff
changeset
|
618 M a |
929858db4d22
tweakdefaults: turn on ui.statuscopies
Martin von Zweigbergk <martinvonz@google.com>
parents:
32887
diff
changeset
|
619 b |
929858db4d22
tweakdefaults: turn on ui.statuscopies
Martin von Zweigbergk <martinvonz@google.com>
parents:
32887
diff
changeset
|
620 R b |
24663
7d01371e6358
commands: add ui.statuscopies config knob
Mathias De Maré <mathias.demare@gmail.com>
parents:
24419
diff
changeset
|
621 |
29000
2d3837a4bded
log: fix status template to list copy source per dest (issue5155)
Yuya Nishihara <yuya@tcha.org>
parents:
27749
diff
changeset
|
622 using log status template (issue5155) |
2d3837a4bded
log: fix status template to list copy source per dest (issue5155)
Yuya Nishihara <yuya@tcha.org>
parents:
27749
diff
changeset
|
623 $ hg log -Tstatus -r 'wdir()' -C |
2d3837a4bded
log: fix status template to list copy source per dest (issue5155)
Yuya Nishihara <yuya@tcha.org>
parents:
27749
diff
changeset
|
624 changeset: 2147483647:ffffffffffff |
2d3837a4bded
log: fix status template to list copy source per dest (issue5155)
Yuya Nishihara <yuya@tcha.org>
parents:
27749
diff
changeset
|
625 parent: 0:8c55c58b4c0e |
2d3837a4bded
log: fix status template to list copy source per dest (issue5155)
Yuya Nishihara <yuya@tcha.org>
parents:
27749
diff
changeset
|
626 user: test |
2d3837a4bded
log: fix status template to list copy source per dest (issue5155)
Yuya Nishihara <yuya@tcha.org>
parents:
27749
diff
changeset
|
627 date: * (glob) |
2d3837a4bded
log: fix status template to list copy source per dest (issue5155)
Yuya Nishihara <yuya@tcha.org>
parents:
27749
diff
changeset
|
628 files: |
2d3837a4bded
log: fix status template to list copy source per dest (issue5155)
Yuya Nishihara <yuya@tcha.org>
parents:
27749
diff
changeset
|
629 M a |
2d3837a4bded
log: fix status template to list copy source per dest (issue5155)
Yuya Nishihara <yuya@tcha.org>
parents:
27749
diff
changeset
|
630 b |
2d3837a4bded
log: fix status template to list copy source per dest (issue5155)
Yuya Nishihara <yuya@tcha.org>
parents:
27749
diff
changeset
|
631 R b |
2d3837a4bded
log: fix status template to list copy source per dest (issue5155)
Yuya Nishihara <yuya@tcha.org>
parents:
27749
diff
changeset
|
632 |
42501
75334e5b519e
tests: demonstrate missing copy information in working copy with graphlog
Martin von Zweigbergk <martinvonz@google.com>
parents:
41844
diff
changeset
|
633 $ hg log -GTstatus -r 'wdir()' -C |
75334e5b519e
tests: demonstrate missing copy information in working copy with graphlog
Martin von Zweigbergk <martinvonz@google.com>
parents:
41844
diff
changeset
|
634 o changeset: 2147483647:ffffffffffff |
75334e5b519e
tests: demonstrate missing copy information in working copy with graphlog
Martin von Zweigbergk <martinvonz@google.com>
parents:
41844
diff
changeset
|
635 | parent: 0:8c55c58b4c0e |
75334e5b519e
tests: demonstrate missing copy information in working copy with graphlog
Martin von Zweigbergk <martinvonz@google.com>
parents:
41844
diff
changeset
|
636 ~ user: test |
75334e5b519e
tests: demonstrate missing copy information in working copy with graphlog
Martin von Zweigbergk <martinvonz@google.com>
parents:
41844
diff
changeset
|
637 date: * (glob) |
75334e5b519e
tests: demonstrate missing copy information in working copy with graphlog
Martin von Zweigbergk <martinvonz@google.com>
parents:
41844
diff
changeset
|
638 files: |
75334e5b519e
tests: demonstrate missing copy information in working copy with graphlog
Martin von Zweigbergk <martinvonz@google.com>
parents:
41844
diff
changeset
|
639 M a |
42502
c929f612afac
logcmdutil: also check for copies in null revision and working copy
Martin von Zweigbergk <martinvonz@google.com>
parents:
42501
diff
changeset
|
640 b |
42501
75334e5b519e
tests: demonstrate missing copy information in working copy with graphlog
Martin von Zweigbergk <martinvonz@google.com>
parents:
41844
diff
changeset
|
641 R b |
75334e5b519e
tests: demonstrate missing copy information in working copy with graphlog
Martin von Zweigbergk <martinvonz@google.com>
parents:
41844
diff
changeset
|
642 |
29000
2d3837a4bded
log: fix status template to list copy source per dest (issue5155)
Yuya Nishihara <yuya@tcha.org>
parents:
27749
diff
changeset
|
643 |
23402
2963d5c9d90b
rename: properly report removed and added file as modified (issue4458)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23037
diff
changeset
|
644 Other "bug" highlight, the revision status does not report the copy information. |
2963d5c9d90b
rename: properly report removed and added file as modified (issue4458)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23037
diff
changeset
|
645 This is buggy behavior. |
2963d5c9d90b
rename: properly report removed and added file as modified (issue4458)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23037
diff
changeset
|
646 |
2963d5c9d90b
rename: properly report removed and added file as modified (issue4458)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23037
diff
changeset
|
647 $ hg commit -m 'blah' |
2963d5c9d90b
rename: properly report removed and added file as modified (issue4458)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23037
diff
changeset
|
648 $ hg st --copies --change . |
2963d5c9d90b
rename: properly report removed and added file as modified (issue4458)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23037
diff
changeset
|
649 M a |
2963d5c9d90b
rename: properly report removed and added file as modified (issue4458)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23037
diff
changeset
|
650 R b |
2963d5c9d90b
rename: properly report removed and added file as modified (issue4458)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23037
diff
changeset
|
651 |
29000
2d3837a4bded
log: fix status template to list copy source per dest (issue5155)
Yuya Nishihara <yuya@tcha.org>
parents:
27749
diff
changeset
|
652 using log status template, the copy information is displayed correctly. |
2d3837a4bded
log: fix status template to list copy source per dest (issue5155)
Yuya Nishihara <yuya@tcha.org>
parents:
27749
diff
changeset
|
653 $ hg log -Tstatus -r. -C |
2d3837a4bded
log: fix status template to list copy source per dest (issue5155)
Yuya Nishihara <yuya@tcha.org>
parents:
27749
diff
changeset
|
654 changeset: 1:6685fde43d21 |
2d3837a4bded
log: fix status template to list copy source per dest (issue5155)
Yuya Nishihara <yuya@tcha.org>
parents:
27749
diff
changeset
|
655 tag: tip |
2d3837a4bded
log: fix status template to list copy source per dest (issue5155)
Yuya Nishihara <yuya@tcha.org>
parents:
27749
diff
changeset
|
656 user: test |
2d3837a4bded
log: fix status template to list copy source per dest (issue5155)
Yuya Nishihara <yuya@tcha.org>
parents:
27749
diff
changeset
|
657 date: * (glob) |
2d3837a4bded
log: fix status template to list copy source per dest (issue5155)
Yuya Nishihara <yuya@tcha.org>
parents:
27749
diff
changeset
|
658 summary: blah |
2d3837a4bded
log: fix status template to list copy source per dest (issue5155)
Yuya Nishihara <yuya@tcha.org>
parents:
27749
diff
changeset
|
659 files: |
2d3837a4bded
log: fix status template to list copy source per dest (issue5155)
Yuya Nishihara <yuya@tcha.org>
parents:
27749
diff
changeset
|
660 M a |
2d3837a4bded
log: fix status template to list copy source per dest (issue5155)
Yuya Nishihara <yuya@tcha.org>
parents:
27749
diff
changeset
|
661 b |
2d3837a4bded
log: fix status template to list copy source per dest (issue5155)
Yuya Nishihara <yuya@tcha.org>
parents:
27749
diff
changeset
|
662 R b |
2d3837a4bded
log: fix status template to list copy source per dest (issue5155)
Yuya Nishihara <yuya@tcha.org>
parents:
27749
diff
changeset
|
663 |
2d3837a4bded
log: fix status template to list copy source per dest (issue5155)
Yuya Nishihara <yuya@tcha.org>
parents:
27749
diff
changeset
|
664 |
23402
2963d5c9d90b
rename: properly report removed and added file as modified (issue4458)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23037
diff
changeset
|
665 $ cd .. |