Mercurial > hg
annotate tests/test-status.t @ 31741:728d37353e1e
run-tests: auto-replace 'TXNID' output
Hooks related to the transaction are aware of the transaction id. By definition
this txn-id is unique and different for each transaction. As a result it can
never be predicted in test and always needs matching. As a result, touching any
like with this data is annoying. We solve the problem once and for all by
installing an automatic replacement. In test, this will now show as:
TXNID=TXN:$ID$
author | Pierre-Yves David <pierre-yves.david@ens-lyon.org> |
---|---|
date | Thu, 30 Mar 2017 17:29:03 +0200 |
parents | 7e3b145f8247 |
children | bdcaf612e75a |
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 |
31589
7e3b145f8247
status: support commands.status.relative config
Martin von Zweigbergk <martinvonz@google.com>
parents:
31423
diff
changeset
|
110 relative paths can be requested |
7e3b145f8247
status: support commands.status.relative config
Martin von Zweigbergk <martinvonz@google.com>
parents:
31423
diff
changeset
|
111 |
7e3b145f8247
status: support commands.status.relative config
Martin von Zweigbergk <martinvonz@google.com>
parents:
31423
diff
changeset
|
112 $ cat >> $HGRCPATH <<EOF |
7e3b145f8247
status: support commands.status.relative config
Martin von Zweigbergk <martinvonz@google.com>
parents:
31423
diff
changeset
|
113 > [commands] |
7e3b145f8247
status: support commands.status.relative config
Martin von Zweigbergk <martinvonz@google.com>
parents:
31423
diff
changeset
|
114 > status.relative = True |
7e3b145f8247
status: support commands.status.relative config
Martin von Zweigbergk <martinvonz@google.com>
parents:
31423
diff
changeset
|
115 > EOF |
7e3b145f8247
status: support commands.status.relative config
Martin von Zweigbergk <martinvonz@google.com>
parents:
31423
diff
changeset
|
116 $ hg status --cwd a |
7e3b145f8247
status: support commands.status.relative config
Martin von Zweigbergk <martinvonz@google.com>
parents:
31423
diff
changeset
|
117 ? 1/in_a_1 |
7e3b145f8247
status: support commands.status.relative config
Martin von Zweigbergk <martinvonz@google.com>
parents:
31423
diff
changeset
|
118 ? in_a |
7e3b145f8247
status: support commands.status.relative config
Martin von Zweigbergk <martinvonz@google.com>
parents:
31423
diff
changeset
|
119 ? ../b/1/in_b_1 |
7e3b145f8247
status: support commands.status.relative config
Martin von Zweigbergk <martinvonz@google.com>
parents:
31423
diff
changeset
|
120 ? ../b/2/in_b_2 |
7e3b145f8247
status: support commands.status.relative config
Martin von Zweigbergk <martinvonz@google.com>
parents:
31423
diff
changeset
|
121 ? ../b/in_b |
7e3b145f8247
status: support commands.status.relative config
Martin von Zweigbergk <martinvonz@google.com>
parents:
31423
diff
changeset
|
122 ? ../in_root |
7e3b145f8247
status: support commands.status.relative config
Martin von Zweigbergk <martinvonz@google.com>
parents:
31423
diff
changeset
|
123 $ HGPLAIN=1 hg status --cwd a |
7e3b145f8247
status: support commands.status.relative config
Martin von Zweigbergk <martinvonz@google.com>
parents:
31423
diff
changeset
|
124 ? a/1/in_a_1 |
7e3b145f8247
status: support commands.status.relative config
Martin von Zweigbergk <martinvonz@google.com>
parents:
31423
diff
changeset
|
125 ? a/in_a |
7e3b145f8247
status: support commands.status.relative config
Martin von Zweigbergk <martinvonz@google.com>
parents:
31423
diff
changeset
|
126 ? b/1/in_b_1 |
7e3b145f8247
status: support commands.status.relative config
Martin von Zweigbergk <martinvonz@google.com>
parents:
31423
diff
changeset
|
127 ? b/2/in_b_2 |
7e3b145f8247
status: support commands.status.relative config
Martin von Zweigbergk <martinvonz@google.com>
parents:
31423
diff
changeset
|
128 ? b/in_b |
7e3b145f8247
status: support commands.status.relative config
Martin von Zweigbergk <martinvonz@google.com>
parents:
31423
diff
changeset
|
129 ? in_root |
7e3b145f8247
status: support commands.status.relative config
Martin von Zweigbergk <martinvonz@google.com>
parents:
31423
diff
changeset
|
130 |
11782
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
131 $ cd .. |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
132 |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
133 $ hg init repo2 |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
134 $ cd repo2 |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
135 $ touch modified removed deleted ignored |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
136 $ echo "^ignored$" > .hgignore |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11782
diff
changeset
|
137 $ hg ci -A -m 'initial checkin' |
11782
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
138 adding .hgignore |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
139 adding deleted |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
140 adding modified |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
141 adding removed |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
142 $ touch modified added unknown ignored |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
143 $ hg add added |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
144 $ hg remove removed |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
145 $ rm deleted |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
146 |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
147 hg status: |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
148 |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
149 $ hg status |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
150 A added |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
151 R removed |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
152 ! deleted |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
153 ? unknown |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
154 |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
155 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
|
156 |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
157 $ 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
|
158 never-existed: * (glob) |
11782
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
159 A added |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
160 R removed |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
161 ! deleted |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
162 ? unknown |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
163 |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
164 $ hg copy modified copied |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
165 |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
166 hg status -C: |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
167 |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
168 $ hg status -C |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
169 A added |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
170 A copied |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
171 modified |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
172 R removed |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
173 ! deleted |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
174 ? unknown |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
175 |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
176 hg status -A: |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
177 |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
178 $ hg status -A |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
179 A added |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
180 A copied |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
181 modified |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
182 R removed |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
183 ! deleted |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
184 ? unknown |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
185 I ignored |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
186 C .hgignore |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
187 C modified |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
188 |
22429
7a7eed5176a4
commands: add hidden -T option for files/manifest/status/tags
Matt Mackall <mpm@selenic.com>
parents:
22424
diff
changeset
|
189 $ hg status -A -Tjson |
7a7eed5176a4
commands: add hidden -T option for files/manifest/status/tags
Matt Mackall <mpm@selenic.com>
parents:
22424
diff
changeset
|
190 [ |
7a7eed5176a4
commands: add hidden -T option for files/manifest/status/tags
Matt Mackall <mpm@selenic.com>
parents:
22424
diff
changeset
|
191 { |
7a7eed5176a4
commands: add hidden -T option for files/manifest/status/tags
Matt Mackall <mpm@selenic.com>
parents:
22424
diff
changeset
|
192 "path": "added", |
7a7eed5176a4
commands: add hidden -T option for files/manifest/status/tags
Matt Mackall <mpm@selenic.com>
parents:
22424
diff
changeset
|
193 "status": "A" |
7a7eed5176a4
commands: add hidden -T option for files/manifest/status/tags
Matt Mackall <mpm@selenic.com>
parents:
22424
diff
changeset
|
194 }, |
7a7eed5176a4
commands: add hidden -T option for files/manifest/status/tags
Matt Mackall <mpm@selenic.com>
parents:
22424
diff
changeset
|
195 { |
7a7eed5176a4
commands: add hidden -T option for files/manifest/status/tags
Matt Mackall <mpm@selenic.com>
parents:
22424
diff
changeset
|
196 "copy": "modified", |
7a7eed5176a4
commands: add hidden -T option for files/manifest/status/tags
Matt Mackall <mpm@selenic.com>
parents:
22424
diff
changeset
|
197 "path": "copied", |
7a7eed5176a4
commands: add hidden -T option for files/manifest/status/tags
Matt Mackall <mpm@selenic.com>
parents:
22424
diff
changeset
|
198 "status": "A" |
7a7eed5176a4
commands: add hidden -T option for files/manifest/status/tags
Matt Mackall <mpm@selenic.com>
parents:
22424
diff
changeset
|
199 }, |
7a7eed5176a4
commands: add hidden -T option for files/manifest/status/tags
Matt Mackall <mpm@selenic.com>
parents:
22424
diff
changeset
|
200 { |
7a7eed5176a4
commands: add hidden -T option for files/manifest/status/tags
Matt Mackall <mpm@selenic.com>
parents:
22424
diff
changeset
|
201 "path": "removed", |
7a7eed5176a4
commands: add hidden -T option for files/manifest/status/tags
Matt Mackall <mpm@selenic.com>
parents:
22424
diff
changeset
|
202 "status": "R" |
7a7eed5176a4
commands: add hidden -T option for files/manifest/status/tags
Matt Mackall <mpm@selenic.com>
parents:
22424
diff
changeset
|
203 }, |
7a7eed5176a4
commands: add hidden -T option for files/manifest/status/tags
Matt Mackall <mpm@selenic.com>
parents:
22424
diff
changeset
|
204 { |
7a7eed5176a4
commands: add hidden -T option for files/manifest/status/tags
Matt Mackall <mpm@selenic.com>
parents:
22424
diff
changeset
|
205 "path": "deleted", |
7a7eed5176a4
commands: add hidden -T option for files/manifest/status/tags
Matt Mackall <mpm@selenic.com>
parents:
22424
diff
changeset
|
206 "status": "!" |
7a7eed5176a4
commands: add hidden -T option for files/manifest/status/tags
Matt Mackall <mpm@selenic.com>
parents:
22424
diff
changeset
|
207 }, |
7a7eed5176a4
commands: add hidden -T option for files/manifest/status/tags
Matt Mackall <mpm@selenic.com>
parents:
22424
diff
changeset
|
208 { |
7a7eed5176a4
commands: add hidden -T option for files/manifest/status/tags
Matt Mackall <mpm@selenic.com>
parents:
22424
diff
changeset
|
209 "path": "unknown", |
7a7eed5176a4
commands: add hidden -T option for files/manifest/status/tags
Matt Mackall <mpm@selenic.com>
parents:
22424
diff
changeset
|
210 "status": "?" |
7a7eed5176a4
commands: add hidden -T option for files/manifest/status/tags
Matt Mackall <mpm@selenic.com>
parents:
22424
diff
changeset
|
211 }, |
7a7eed5176a4
commands: add hidden -T option for files/manifest/status/tags
Matt Mackall <mpm@selenic.com>
parents:
22424
diff
changeset
|
212 { |
7a7eed5176a4
commands: add hidden -T option for files/manifest/status/tags
Matt Mackall <mpm@selenic.com>
parents:
22424
diff
changeset
|
213 "path": "ignored", |
7a7eed5176a4
commands: add hidden -T option for files/manifest/status/tags
Matt Mackall <mpm@selenic.com>
parents:
22424
diff
changeset
|
214 "status": "I" |
7a7eed5176a4
commands: add hidden -T option for files/manifest/status/tags
Matt Mackall <mpm@selenic.com>
parents:
22424
diff
changeset
|
215 }, |
7a7eed5176a4
commands: add hidden -T option for files/manifest/status/tags
Matt Mackall <mpm@selenic.com>
parents:
22424
diff
changeset
|
216 { |
7a7eed5176a4
commands: add hidden -T option for files/manifest/status/tags
Matt Mackall <mpm@selenic.com>
parents:
22424
diff
changeset
|
217 "path": ".hgignore", |
7a7eed5176a4
commands: add hidden -T option for files/manifest/status/tags
Matt Mackall <mpm@selenic.com>
parents:
22424
diff
changeset
|
218 "status": "C" |
7a7eed5176a4
commands: add hidden -T option for files/manifest/status/tags
Matt Mackall <mpm@selenic.com>
parents:
22424
diff
changeset
|
219 }, |
7a7eed5176a4
commands: add hidden -T option for files/manifest/status/tags
Matt Mackall <mpm@selenic.com>
parents:
22424
diff
changeset
|
220 { |
7a7eed5176a4
commands: add hidden -T option for files/manifest/status/tags
Matt Mackall <mpm@selenic.com>
parents:
22424
diff
changeset
|
221 "path": "modified", |
7a7eed5176a4
commands: add hidden -T option for files/manifest/status/tags
Matt Mackall <mpm@selenic.com>
parents:
22424
diff
changeset
|
222 "status": "C" |
7a7eed5176a4
commands: add hidden -T option for files/manifest/status/tags
Matt Mackall <mpm@selenic.com>
parents:
22424
diff
changeset
|
223 } |
7a7eed5176a4
commands: add hidden -T option for files/manifest/status/tags
Matt Mackall <mpm@selenic.com>
parents:
22424
diff
changeset
|
224 ] |
11782
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
225 |
22430
968247e8f4ac
formatter: add pickle format
Matt Mackall <mpm@selenic.com>
parents:
22429
diff
changeset
|
226 $ 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
|
227 >>> from __future__ import print_function |
22430
968247e8f4ac
formatter: add pickle format
Matt Mackall <mpm@selenic.com>
parents:
22429
diff
changeset
|
228 >>> import pickle |
29485
6a98f9408a50
py3: make files use absolute_import and print_function
Pulkit Goyal <7895pulkit@gmail.com>
parents:
29000
diff
changeset
|
229 >>> print(sorted((x['status'], x['path']) for x in pickle.load(open("pickle")))) |
22430
968247e8f4ac
formatter: add pickle format
Matt Mackall <mpm@selenic.com>
parents:
22429
diff
changeset
|
230 [('!', 'deleted'), ('?', 'pickle'), ('?', 'unknown'), ('A', 'added'), ('A', 'copied'), ('C', '.hgignore'), ('C', 'modified'), ('I', 'ignored'), ('R', 'removed')] |
968247e8f4ac
formatter: add pickle format
Matt Mackall <mpm@selenic.com>
parents:
22429
diff
changeset
|
231 $ rm pickle |
968247e8f4ac
formatter: add pickle format
Matt Mackall <mpm@selenic.com>
parents:
22429
diff
changeset
|
232 |
11782
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
233 $ echo "^ignoreddir$" > .hgignore |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
234 $ mkdir ignoreddir |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
235 $ touch ignoreddir/file |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
236 |
25515
e8075329c5fb
tests: test basic template support for status
Matt Mackall <mpm@selenic.com>
parents:
24663
diff
changeset
|
237 Test templater support: |
e8075329c5fb
tests: test basic template support for status
Matt Mackall <mpm@selenic.com>
parents:
24663
diff
changeset
|
238 |
e8075329c5fb
tests: test basic template support for status
Matt Mackall <mpm@selenic.com>
parents:
24663
diff
changeset
|
239 $ hg status -AT "[{status}]\t{if(copy, '{copy} -> ')}{path}\n" |
e8075329c5fb
tests: test basic template support for status
Matt Mackall <mpm@selenic.com>
parents:
24663
diff
changeset
|
240 [M] .hgignore |
e8075329c5fb
tests: test basic template support for status
Matt Mackall <mpm@selenic.com>
parents:
24663
diff
changeset
|
241 [A] added |
e8075329c5fb
tests: test basic template support for status
Matt Mackall <mpm@selenic.com>
parents:
24663
diff
changeset
|
242 [A] modified -> copied |
e8075329c5fb
tests: test basic template support for status
Matt Mackall <mpm@selenic.com>
parents:
24663
diff
changeset
|
243 [R] removed |
e8075329c5fb
tests: test basic template support for status
Matt Mackall <mpm@selenic.com>
parents:
24663
diff
changeset
|
244 [!] deleted |
e8075329c5fb
tests: test basic template support for status
Matt Mackall <mpm@selenic.com>
parents:
24663
diff
changeset
|
245 [?] ignored |
e8075329c5fb
tests: test basic template support for status
Matt Mackall <mpm@selenic.com>
parents:
24663
diff
changeset
|
246 [?] unknown |
e8075329c5fb
tests: test basic template support for status
Matt Mackall <mpm@selenic.com>
parents:
24663
diff
changeset
|
247 [I] ignoreddir/file |
e8075329c5fb
tests: test basic template support for status
Matt Mackall <mpm@selenic.com>
parents:
24663
diff
changeset
|
248 [C] modified |
e8075329c5fb
tests: test basic template support for status
Matt Mackall <mpm@selenic.com>
parents:
24663
diff
changeset
|
249 $ hg status -AT default |
e8075329c5fb
tests: test basic template support for status
Matt Mackall <mpm@selenic.com>
parents:
24663
diff
changeset
|
250 M .hgignore |
e8075329c5fb
tests: test basic template support for status
Matt Mackall <mpm@selenic.com>
parents:
24663
diff
changeset
|
251 A added |
e8075329c5fb
tests: test basic template support for status
Matt Mackall <mpm@selenic.com>
parents:
24663
diff
changeset
|
252 A copied |
e8075329c5fb
tests: test basic template support for status
Matt Mackall <mpm@selenic.com>
parents:
24663
diff
changeset
|
253 modified |
e8075329c5fb
tests: test basic template support for status
Matt Mackall <mpm@selenic.com>
parents:
24663
diff
changeset
|
254 R removed |
e8075329c5fb
tests: test basic template support for status
Matt Mackall <mpm@selenic.com>
parents:
24663
diff
changeset
|
255 ! deleted |
e8075329c5fb
tests: test basic template support for status
Matt Mackall <mpm@selenic.com>
parents:
24663
diff
changeset
|
256 ? ignored |
e8075329c5fb
tests: test basic template support for status
Matt Mackall <mpm@selenic.com>
parents:
24663
diff
changeset
|
257 ? unknown |
e8075329c5fb
tests: test basic template support for status
Matt Mackall <mpm@selenic.com>
parents:
24663
diff
changeset
|
258 I ignoreddir/file |
e8075329c5fb
tests: test basic template support for status
Matt Mackall <mpm@selenic.com>
parents:
24663
diff
changeset
|
259 C modified |
e8075329c5fb
tests: test basic template support for status
Matt Mackall <mpm@selenic.com>
parents:
24663
diff
changeset
|
260 $ hg status -T compact |
e8075329c5fb
tests: test basic template support for status
Matt Mackall <mpm@selenic.com>
parents:
24663
diff
changeset
|
261 abort: "status" not in template map |
e8075329c5fb
tests: test basic template support for status
Matt Mackall <mpm@selenic.com>
parents:
24663
diff
changeset
|
262 [255] |
e8075329c5fb
tests: test basic template support for status
Matt Mackall <mpm@selenic.com>
parents:
24663
diff
changeset
|
263 |
11782
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
264 hg status ignoreddir/file: |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
265 |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
266 $ hg status ignoreddir/file |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
267 |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
268 hg status -i ignoreddir/file: |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
269 |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
270 $ hg status -i ignoreddir/file |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
271 I ignoreddir/file |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
272 $ cd .. |
6200
acc40572da5b
'hg status -q' output skips non-tracked files.
Zoran Bosnjak <zoran.bosnjak@via.si>
parents:
6033
diff
changeset
|
273 |
12328
b63f6422d2a7
tests: fix a bunch of pointless #s in unified tests
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
274 Check 'status -q' and some combinations |
11782
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
275 |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
276 $ hg init repo3 |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
277 $ cd repo3 |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
278 $ touch modified removed deleted ignored |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
279 $ echo "^ignored$" > .hgignore |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
280 $ hg commit -A -m 'initial checkin' |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
281 adding .hgignore |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
282 adding deleted |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
283 adding modified |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
284 adding removed |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
285 $ touch added unknown ignored |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
286 $ hg add added |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
287 $ echo "test" >> modified |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
288 $ hg remove removed |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
289 $ rm deleted |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
290 $ hg copy modified copied |
6200
acc40572da5b
'hg status -q' output skips non-tracked files.
Zoran Bosnjak <zoran.bosnjak@via.si>
parents:
6033
diff
changeset
|
291 |
24419
0e41f110e69e
revset: add wdir() function to specify workingctx revision by command
Yuya Nishihara <yuya@tcha.org>
parents:
23402
diff
changeset
|
292 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
|
293 "hg status" |
0e41f110e69e
revset: add wdir() function to specify workingctx revision by command
Yuya Nishihara <yuya@tcha.org>
parents:
23402
diff
changeset
|
294 |
0e41f110e69e
revset: add wdir() function to specify workingctx revision by command
Yuya Nishihara <yuya@tcha.org>
parents:
23402
diff
changeset
|
295 $ hg status --change "wdir()" |
0e41f110e69e
revset: add wdir() function to specify workingctx revision by command
Yuya Nishihara <yuya@tcha.org>
parents:
23402
diff
changeset
|
296 M modified |
0e41f110e69e
revset: add wdir() function to specify workingctx revision by command
Yuya Nishihara <yuya@tcha.org>
parents:
23402
diff
changeset
|
297 A added |
0e41f110e69e
revset: add wdir() function to specify workingctx revision by command
Yuya Nishihara <yuya@tcha.org>
parents:
23402
diff
changeset
|
298 A copied |
0e41f110e69e
revset: add wdir() function to specify workingctx revision by command
Yuya Nishihara <yuya@tcha.org>
parents:
23402
diff
changeset
|
299 R removed |
0e41f110e69e
revset: add wdir() function to specify workingctx revision by command
Yuya Nishihara <yuya@tcha.org>
parents:
23402
diff
changeset
|
300 ! deleted |
0e41f110e69e
revset: add wdir() function to specify workingctx revision by command
Yuya Nishihara <yuya@tcha.org>
parents:
23402
diff
changeset
|
301 ? unknown |
0e41f110e69e
revset: add wdir() function to specify workingctx revision by command
Yuya Nishihara <yuya@tcha.org>
parents:
23402
diff
changeset
|
302 |
12328
b63f6422d2a7
tests: fix a bunch of pointless #s in unified tests
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
303 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
|
304 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
|
305 If result is not as expected, raise error |
11782
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
306 |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
307 $ assert() { |
12365
22f3353bcc36
tests: cleanup exit code handling in unified tests
Matt Mackall <mpm@selenic.com>
parents:
12328
diff
changeset
|
308 > hg status $1 > ../a |
22f3353bcc36
tests: cleanup exit code handling in unified tests
Matt Mackall <mpm@selenic.com>
parents:
12328
diff
changeset
|
309 > hg status $2 > ../b |
22f3353bcc36
tests: cleanup exit code handling in unified tests
Matt Mackall <mpm@selenic.com>
parents:
12328
diff
changeset
|
310 > 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
|
311 > out=0 |
22f3353bcc36
tests: cleanup exit code handling in unified tests
Matt Mackall <mpm@selenic.com>
parents:
12328
diff
changeset
|
312 > else |
11782
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
313 > out=1 |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
314 > fi |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
315 > if [ $3 -eq 0 ]; then |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
316 > df="same" |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
317 > else |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
318 > df="different" |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
319 > fi |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
320 > if [ $out -ne $3 ]; then |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
321 > echo "Error on $1 and $2, should be $df." |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
322 > fi |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
323 > } |
6200
acc40572da5b
'hg status -q' output skips non-tracked files.
Zoran Bosnjak <zoran.bosnjak@via.si>
parents:
6033
diff
changeset
|
324 |
12328
b63f6422d2a7
tests: fix a bunch of pointless #s in unified tests
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
325 Assert flag1 flag2 [0-same | 1-different] |
11782
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
326 |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
327 $ assert "-q" "-mard" 0 |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
328 $ assert "-A" "-marduicC" 0 |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
329 $ assert "-qA" "-mardcC" 0 |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
330 $ assert "-qAui" "-A" 0 |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
331 $ assert "-qAu" "-marducC" 0 |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
332 $ assert "-qAi" "-mardicC" 0 |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
333 $ assert "-qu" "-u" 0 |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
334 $ assert "-q" "-u" 1 |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
335 $ assert "-m" "-a" 1 |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
336 $ assert "-r" "-d" 1 |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
337 $ cd .. |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
338 |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
339 $ hg init repo4 |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
340 $ cd repo4 |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
341 $ touch modified removed deleted |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11782
diff
changeset
|
342 $ hg ci -q -A -m 'initial checkin' |
11782
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
343 $ touch added unknown |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
344 $ hg add added |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
345 $ hg remove removed |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
346 $ rm deleted |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
347 $ echo x > modified |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
348 $ hg copy modified copied |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
349 $ hg ci -m 'test checkin' -d "1000001 0" |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
350 $ rm * |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
351 $ touch unrelated |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
352 $ 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
|
353 |
11782
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
354 hg status --change 1: |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
355 |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
356 $ hg status --change 1 |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
357 M modified |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
358 A added |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
359 A copied |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
360 R removed |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
361 |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
362 hg status --change 1 unrelated: |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
363 |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
364 $ hg status --change 1 unrelated |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
365 |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
366 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
|
367 |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
368 $ 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
|
369 M modified |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
370 A added |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
371 A copied |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
372 modified |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
373 R removed |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
374 |
15578
db0e277bdd37
status: support revsets with --change
Patrick Mezard <pmezard@gmail.com>
parents:
15521
diff
changeset
|
375 hg status -A --change 1 and revset: |
11782
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
376 |
15578
db0e277bdd37
status: support revsets with --change
Patrick Mezard <pmezard@gmail.com>
parents:
15521
diff
changeset
|
377 $ hg status -A --change '1|1' |
11782
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
378 M modified |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
379 A added |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
380 A copied |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
381 modified |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
382 R removed |
992506c14217
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10014
diff
changeset
|
383 C deleted |
15848
012b285cf643
filectx: fix cmp() of file starting with '\1\n'
Yuya Nishihara <yuya@tcha.org>
parents:
14155
diff
changeset
|
384 |
012b285cf643
filectx: fix cmp() of file starting with '\1\n'
Yuya Nishihara <yuya@tcha.org>
parents:
14155
diff
changeset
|
385 $ cd .. |
012b285cf643
filectx: fix cmp() of file starting with '\1\n'
Yuya Nishihara <yuya@tcha.org>
parents:
14155
diff
changeset
|
386 |
27668
369c8f9453c2
status: revert + flag-change == modified
Martin von Zweigbergk <martinvonz@google.com>
parents:
25515
diff
changeset
|
387 hg status with --rev and reverted changes: |
369c8f9453c2
status: revert + flag-change == modified
Martin von Zweigbergk <martinvonz@google.com>
parents:
25515
diff
changeset
|
388 |
369c8f9453c2
status: revert + flag-change == modified
Martin von Zweigbergk <martinvonz@google.com>
parents:
25515
diff
changeset
|
389 $ hg init reverted-changes-repo |
369c8f9453c2
status: revert + flag-change == modified
Martin von Zweigbergk <martinvonz@google.com>
parents:
25515
diff
changeset
|
390 $ cd reverted-changes-repo |
369c8f9453c2
status: revert + flag-change == modified
Martin von Zweigbergk <martinvonz@google.com>
parents:
25515
diff
changeset
|
391 $ echo a > file |
369c8f9453c2
status: revert + flag-change == modified
Martin von Zweigbergk <martinvonz@google.com>
parents:
25515
diff
changeset
|
392 $ hg add file |
369c8f9453c2
status: revert + flag-change == modified
Martin von Zweigbergk <martinvonz@google.com>
parents:
25515
diff
changeset
|
393 $ hg ci -m a |
369c8f9453c2
status: revert + flag-change == modified
Martin von Zweigbergk <martinvonz@google.com>
parents:
25515
diff
changeset
|
394 $ echo b > file |
369c8f9453c2
status: revert + flag-change == modified
Martin von Zweigbergk <martinvonz@google.com>
parents:
25515
diff
changeset
|
395 $ hg ci -m b |
369c8f9453c2
status: revert + flag-change == modified
Martin von Zweigbergk <martinvonz@google.com>
parents:
25515
diff
changeset
|
396 |
369c8f9453c2
status: revert + flag-change == modified
Martin von Zweigbergk <martinvonz@google.com>
parents:
25515
diff
changeset
|
397 reverted file should appear clean |
369c8f9453c2
status: revert + flag-change == modified
Martin von Zweigbergk <martinvonz@google.com>
parents:
25515
diff
changeset
|
398 |
369c8f9453c2
status: revert + flag-change == modified
Martin von Zweigbergk <martinvonz@google.com>
parents:
25515
diff
changeset
|
399 $ hg revert -r 0 . |
369c8f9453c2
status: revert + flag-change == modified
Martin von Zweigbergk <martinvonz@google.com>
parents:
25515
diff
changeset
|
400 reverting file |
369c8f9453c2
status: revert + flag-change == modified
Martin von Zweigbergk <martinvonz@google.com>
parents:
25515
diff
changeset
|
401 $ hg status -A --rev 0 |
369c8f9453c2
status: revert + flag-change == modified
Martin von Zweigbergk <martinvonz@google.com>
parents:
25515
diff
changeset
|
402 C file |
369c8f9453c2
status: revert + flag-change == modified
Martin von Zweigbergk <martinvonz@google.com>
parents:
25515
diff
changeset
|
403 |
369c8f9453c2
status: revert + flag-change == modified
Martin von Zweigbergk <martinvonz@google.com>
parents:
25515
diff
changeset
|
404 #if execbit |
369c8f9453c2
status: revert + flag-change == modified
Martin von Zweigbergk <martinvonz@google.com>
parents:
25515
diff
changeset
|
405 reverted file with changed flag should appear modified |
369c8f9453c2
status: revert + flag-change == modified
Martin von Zweigbergk <martinvonz@google.com>
parents:
25515
diff
changeset
|
406 |
369c8f9453c2
status: revert + flag-change == modified
Martin von Zweigbergk <martinvonz@google.com>
parents:
25515
diff
changeset
|
407 $ chmod +x file |
369c8f9453c2
status: revert + flag-change == modified
Martin von Zweigbergk <martinvonz@google.com>
parents:
25515
diff
changeset
|
408 $ hg status -A --rev 0 |
369c8f9453c2
status: revert + flag-change == modified
Martin von Zweigbergk <martinvonz@google.com>
parents:
25515
diff
changeset
|
409 M file |
369c8f9453c2
status: revert + flag-change == modified
Martin von Zweigbergk <martinvonz@google.com>
parents:
25515
diff
changeset
|
410 |
27743
5dcadc6c5aed
test-status: stabilize for no-execbit platforms
Matt Harbison <matt_harbison@yahoo.com>
parents:
27720
diff
changeset
|
411 $ hg revert -r 0 . |
5dcadc6c5aed
test-status: stabilize for no-execbit platforms
Matt Harbison <matt_harbison@yahoo.com>
parents:
27720
diff
changeset
|
412 reverting file |
27749
215b47449e47
context: check for differing flags a little earlier
Martin von Zweigbergk <martinvonz@google.com>
parents:
27747
diff
changeset
|
413 |
215b47449e47
context: check for differing flags a little earlier
Martin von Zweigbergk <martinvonz@google.com>
parents:
27747
diff
changeset
|
414 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
|
415 |
215b47449e47
context: check for differing flags a little earlier
Martin von Zweigbergk <martinvonz@google.com>
parents:
27747
diff
changeset
|
416 $ hg co -C . |
215b47449e47
context: check for differing flags a little earlier
Martin von Zweigbergk <martinvonz@google.com>
parents:
27747
diff
changeset
|
417 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
|
418 $ chmod +x file |
215b47449e47
context: check for differing flags a little earlier
Martin von Zweigbergk <martinvonz@google.com>
parents:
27747
diff
changeset
|
419 $ hg ci -m 'change flag' |
215b47449e47
context: check for differing flags a little earlier
Martin von Zweigbergk <martinvonz@google.com>
parents:
27747
diff
changeset
|
420 $ 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
|
421 M file |
215b47449e47
context: check for differing flags a little earlier
Martin von Zweigbergk <martinvonz@google.com>
parents:
27747
diff
changeset
|
422 $ 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
|
423 |
27668
369c8f9453c2
status: revert + flag-change == modified
Martin von Zweigbergk <martinvonz@google.com>
parents:
25515
diff
changeset
|
424 #endif |
369c8f9453c2
status: revert + flag-change == modified
Martin von Zweigbergk <martinvonz@google.com>
parents:
25515
diff
changeset
|
425 |
31423
568d80b24b3a
tests: properly drop back to root dir in test-status.t
Ryan McElroy <rmcelroy@fb.com>
parents:
29485
diff
changeset
|
426 $ cd .. |
568d80b24b3a
tests: properly drop back to root dir in test-status.t
Ryan McElroy <rmcelroy@fb.com>
parents:
29485
diff
changeset
|
427 |
15848
012b285cf643
filectx: fix cmp() of file starting with '\1\n'
Yuya Nishihara <yuya@tcha.org>
parents:
14155
diff
changeset
|
428 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
|
429 |
012b285cf643
filectx: fix cmp() of file starting with '\1\n'
Yuya Nishihara <yuya@tcha.org>
parents:
14155
diff
changeset
|
430 $ hg init repo5 |
012b285cf643
filectx: fix cmp() of file starting with '\1\n'
Yuya Nishihara <yuya@tcha.org>
parents:
14155
diff
changeset
|
431 $ cd repo5 |
16098
c6c9b83a1e8a
tests: tighten checks for octal escapes in shell printf.
Jim Hague <jim.hague@acm.org>
parents:
15869
diff
changeset
|
432 >>> open("010a", "wb").write("\1\nfoo") |
15848
012b285cf643
filectx: fix cmp() of file starting with '\1\n'
Yuya Nishihara <yuya@tcha.org>
parents:
14155
diff
changeset
|
433 $ 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
|
434 $ hg status -A |
012b285cf643
filectx: fix cmp() of file starting with '\1\n'
Yuya Nishihara <yuya@tcha.org>
parents:
14155
diff
changeset
|
435 C 010a |
012b285cf643
filectx: fix cmp() of file starting with '\1\n'
Yuya Nishihara <yuya@tcha.org>
parents:
14155
diff
changeset
|
436 |
16098
c6c9b83a1e8a
tests: tighten checks for octal escapes in shell printf.
Jim Hague <jim.hague@acm.org>
parents:
15869
diff
changeset
|
437 >>> open("010a", "wb").write("\1\nbar") |
15848
012b285cf643
filectx: fix cmp() of file starting with '\1\n'
Yuya Nishihara <yuya@tcha.org>
parents:
14155
diff
changeset
|
438 $ hg status -A |
012b285cf643
filectx: fix cmp() of file starting with '\1\n'
Yuya Nishihara <yuya@tcha.org>
parents:
14155
diff
changeset
|
439 M 010a |
012b285cf643
filectx: fix cmp() of file starting with '\1\n'
Yuya Nishihara <yuya@tcha.org>
parents:
14155
diff
changeset
|
440 $ 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
|
441 $ 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
|
442 M 010a |
012b285cf643
filectx: fix cmp() of file starting with '\1\n'
Yuya Nishihara <yuya@tcha.org>
parents:
14155
diff
changeset
|
443 |
012b285cf643
filectx: fix cmp() of file starting with '\1\n'
Yuya Nishihara <yuya@tcha.org>
parents:
14155
diff
changeset
|
444 $ touch empty |
012b285cf643
filectx: fix cmp() of file starting with '\1\n'
Yuya Nishihara <yuya@tcha.org>
parents:
14155
diff
changeset
|
445 $ 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
|
446 $ 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
|
447 C 010a |
16144
4546a8513dcd
localrepository: use 'changectx.dirs()' in 'status()' for directory patterns
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
16098
diff
changeset
|
448 |
4546a8513dcd
localrepository: use 'changectx.dirs()' in 'status()' for directory patterns
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
16098
diff
changeset
|
449 $ cd .. |
4546a8513dcd
localrepository: use 'changectx.dirs()' in 'status()' for directory patterns
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
16098
diff
changeset
|
450 |
4546a8513dcd
localrepository: use 'changectx.dirs()' in 'status()' for directory patterns
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
16098
diff
changeset
|
451 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
|
452 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
|
453 |
4546a8513dcd
localrepository: use 'changectx.dirs()' in 'status()' for directory patterns
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
16098
diff
changeset
|
454 $ hg init repo6 |
4546a8513dcd
localrepository: use 'changectx.dirs()' in 'status()' for directory patterns
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
16098
diff
changeset
|
455 $ cd repo6 |
4546a8513dcd
localrepository: use 'changectx.dirs()' in 'status()' for directory patterns
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
16098
diff
changeset
|
456 |
4546a8513dcd
localrepository: use 'changectx.dirs()' in 'status()' for directory patterns
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
16098
diff
changeset
|
457 $ 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
|
458 $ 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
|
459 $ 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
|
460 $ 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
|
461 $ 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
|
462 $ 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
|
463 $ 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
|
464 |
4546a8513dcd
localrepository: use 'changectx.dirs()' in 'status()' for directory patterns
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
16098
diff
changeset
|
465 $ 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
|
466 $ hg status -A |
4546a8513dcd
localrepository: use 'changectx.dirs()' in 'status()' for directory patterns
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
16098
diff
changeset
|
467 C a.txt |
4546a8513dcd
localrepository: use 'changectx.dirs()' in 'status()' for directory patterns
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
16098
diff
changeset
|
468 |
4546a8513dcd
localrepository: use 'changectx.dirs()' in 'status()' for directory patterns
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
16098
diff
changeset
|
469 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
|
470 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
|
471 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
|
472 |
4546a8513dcd
localrepository: use 'changectx.dirs()' in 'status()' for directory patterns
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
16098
diff
changeset
|
473 $ test ! -d 1 |
4546a8513dcd
localrepository: use 'changectx.dirs()' in 'status()' for directory patterns
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
16098
diff
changeset
|
474 $ 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
|
475 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
|
476 $ 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
|
477 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
|
478 $ 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
|
479 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
|
480 $ 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
|
481 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
|
482 |
22424
1f72226064b8
formatter: make debug style match Python syntax
Matt Mackall <mpm@selenic.com>
parents:
21972
diff
changeset
|
483 $ 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
|
484 status = [ |
1f72226064b8
formatter: make debug style match Python syntax
Matt Mackall <mpm@selenic.com>
parents:
21972
diff
changeset
|
485 {*'path': '1/2/3/4/5/b.txt'*}, (glob) |
1f72226064b8
formatter: make debug style match Python syntax
Matt Mackall <mpm@selenic.com>
parents:
21972
diff
changeset
|
486 ] |
1f72226064b8
formatter: make debug style match Python syntax
Matt Mackall <mpm@selenic.com>
parents:
21972
diff
changeset
|
487 |
17377
a10f7eeb2588
test-status.t: test ui.slash on Windows
Patrick Mezard <patrick@mezard.eu>
parents:
16144
diff
changeset
|
488 #if windows |
a10f7eeb2588
test-status.t: test ui.slash on Windows
Patrick Mezard <patrick@mezard.eu>
parents:
16144
diff
changeset
|
489 $ 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
|
490 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
|
491 #endif |
a10f7eeb2588
test-status.t: test ui.slash on Windows
Patrick Mezard <patrick@mezard.eu>
parents:
16144
diff
changeset
|
492 |
16144
4546a8513dcd
localrepository: use 'changectx.dirs()' in 'status()' for directory patterns
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
16098
diff
changeset
|
493 $ 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
|
494 |
2963d5c9d90b
rename: properly report removed and added file as modified (issue4458)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23037
diff
changeset
|
495 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
|
496 ================================================= |
2963d5c9d90b
rename: properly report removed and added file as modified (issue4458)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23037
diff
changeset
|
497 |
2963d5c9d90b
rename: properly report removed and added file as modified (issue4458)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23037
diff
changeset
|
498 |
2963d5c9d90b
rename: properly report removed and added file as modified (issue4458)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23037
diff
changeset
|
499 $ 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
|
500 $ 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
|
501 $ 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
|
502 $ 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
|
503 $ 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
|
504 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
|
505 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
|
506 |
2963d5c9d90b
rename: properly report removed and added file as modified (issue4458)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23037
diff
changeset
|
507 |
2963d5c9d90b
rename: properly report removed and added file as modified (issue4458)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23037
diff
changeset
|
508 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
|
509 |
2963d5c9d90b
rename: properly report removed and added file as modified (issue4458)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23037
diff
changeset
|
510 $ 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
|
511 $ 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
|
512 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
|
513 b |
2963d5c9d90b
rename: properly report removed and added file as modified (issue4458)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23037
diff
changeset
|
514 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
|
515 $ 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
|
516 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
|
517 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
|
518 $ 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
|
519 |
2963d5c9d90b
rename: properly report removed and added file as modified (issue4458)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23037
diff
changeset
|
520 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
|
521 |
2963d5c9d90b
rename: properly report removed and added file as modified (issue4458)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23037
diff
changeset
|
522 $ 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
|
523 $ 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
|
524 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
|
525 $ 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
|
526 $ 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
|
527 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
|
528 b |
2963d5c9d90b
rename: properly report removed and added file as modified (issue4458)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23037
diff
changeset
|
529 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
|
530 |
24663
7d01371e6358
commands: add ui.statuscopies config knob
Mathias De Maré <mathias.demare@gmail.com>
parents:
24419
diff
changeset
|
531 using ui.statuscopies setting |
7d01371e6358
commands: add ui.statuscopies config knob
Mathias De Maré <mathias.demare@gmail.com>
parents:
24419
diff
changeset
|
532 $ hg st --config ui.statuscopies=true |
7d01371e6358
commands: add ui.statuscopies config knob
Mathias De Maré <mathias.demare@gmail.com>
parents:
24419
diff
changeset
|
533 M a |
7d01371e6358
commands: add ui.statuscopies config knob
Mathias De Maré <mathias.demare@gmail.com>
parents:
24419
diff
changeset
|
534 b |
7d01371e6358
commands: add ui.statuscopies config knob
Mathias De Maré <mathias.demare@gmail.com>
parents:
24419
diff
changeset
|
535 R b |
7d01371e6358
commands: add ui.statuscopies config knob
Mathias De Maré <mathias.demare@gmail.com>
parents:
24419
diff
changeset
|
536 $ hg st --config ui.statuscopies=false |
7d01371e6358
commands: add ui.statuscopies config knob
Mathias De Maré <mathias.demare@gmail.com>
parents:
24419
diff
changeset
|
537 M a |
7d01371e6358
commands: add ui.statuscopies config knob
Mathias De Maré <mathias.demare@gmail.com>
parents:
24419
diff
changeset
|
538 R b |
7d01371e6358
commands: add ui.statuscopies config knob
Mathias De Maré <mathias.demare@gmail.com>
parents:
24419
diff
changeset
|
539 |
29000
2d3837a4bded
log: fix status template to list copy source per dest (issue5155)
Yuya Nishihara <yuya@tcha.org>
parents:
27749
diff
changeset
|
540 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
|
541 $ 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
|
542 changeset: 2147483647:ffffffffffff |
2d3837a4bded
log: fix status template to list copy source per dest (issue5155)
Yuya Nishihara <yuya@tcha.org>
parents:
27749
diff
changeset
|
543 parent: 0:8c55c58b4c0e |
2d3837a4bded
log: fix status template to list copy source per dest (issue5155)
Yuya Nishihara <yuya@tcha.org>
parents:
27749
diff
changeset
|
544 user: test |
2d3837a4bded
log: fix status template to list copy source per dest (issue5155)
Yuya Nishihara <yuya@tcha.org>
parents:
27749
diff
changeset
|
545 date: * (glob) |
2d3837a4bded
log: fix status template to list copy source per dest (issue5155)
Yuya Nishihara <yuya@tcha.org>
parents:
27749
diff
changeset
|
546 files: |
2d3837a4bded
log: fix status template to list copy source per dest (issue5155)
Yuya Nishihara <yuya@tcha.org>
parents:
27749
diff
changeset
|
547 M a |
2d3837a4bded
log: fix status template to list copy source per dest (issue5155)
Yuya Nishihara <yuya@tcha.org>
parents:
27749
diff
changeset
|
548 b |
2d3837a4bded
log: fix status template to list copy source per dest (issue5155)
Yuya Nishihara <yuya@tcha.org>
parents:
27749
diff
changeset
|
549 R b |
2d3837a4bded
log: fix status template to list copy source per dest (issue5155)
Yuya Nishihara <yuya@tcha.org>
parents:
27749
diff
changeset
|
550 |
2d3837a4bded
log: fix status template to list copy source per dest (issue5155)
Yuya Nishihara <yuya@tcha.org>
parents:
27749
diff
changeset
|
551 |
23402
2963d5c9d90b
rename: properly report removed and added file as modified (issue4458)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23037
diff
changeset
|
552 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
|
553 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
|
554 |
2963d5c9d90b
rename: properly report removed and added file as modified (issue4458)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23037
diff
changeset
|
555 $ 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
|
556 $ 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
|
557 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
|
558 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
|
559 |
29000
2d3837a4bded
log: fix status template to list copy source per dest (issue5155)
Yuya Nishihara <yuya@tcha.org>
parents:
27749
diff
changeset
|
560 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
|
561 $ 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
|
562 changeset: 1:6685fde43d21 |
2d3837a4bded
log: fix status template to list copy source per dest (issue5155)
Yuya Nishihara <yuya@tcha.org>
parents:
27749
diff
changeset
|
563 tag: tip |
2d3837a4bded
log: fix status template to list copy source per dest (issue5155)
Yuya Nishihara <yuya@tcha.org>
parents:
27749
diff
changeset
|
564 user: test |
2d3837a4bded
log: fix status template to list copy source per dest (issue5155)
Yuya Nishihara <yuya@tcha.org>
parents:
27749
diff
changeset
|
565 date: * (glob) |
2d3837a4bded
log: fix status template to list copy source per dest (issue5155)
Yuya Nishihara <yuya@tcha.org>
parents:
27749
diff
changeset
|
566 summary: blah |
2d3837a4bded
log: fix status template to list copy source per dest (issue5155)
Yuya Nishihara <yuya@tcha.org>
parents:
27749
diff
changeset
|
567 files: |
2d3837a4bded
log: fix status template to list copy source per dest (issue5155)
Yuya Nishihara <yuya@tcha.org>
parents:
27749
diff
changeset
|
568 M a |
2d3837a4bded
log: fix status template to list copy source per dest (issue5155)
Yuya Nishihara <yuya@tcha.org>
parents:
27749
diff
changeset
|
569 b |
2d3837a4bded
log: fix status template to list copy source per dest (issue5155)
Yuya Nishihara <yuya@tcha.org>
parents:
27749
diff
changeset
|
570 R b |
2d3837a4bded
log: fix status template to list copy source per dest (issue5155)
Yuya Nishihara <yuya@tcha.org>
parents:
27749
diff
changeset
|
571 |
2d3837a4bded
log: fix status template to list copy source per dest (issue5155)
Yuya Nishihara <yuya@tcha.org>
parents:
27749
diff
changeset
|
572 |
23402
2963d5c9d90b
rename: properly report removed and added file as modified (issue4458)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23037
diff
changeset
|
573 $ cd .. |