annotate tests/test-status-terse.t @ 50235:385977432227 stable

dirstate: add append/new-file variants in the dirstate's read race tests This covers more ground and finds more bugs. At that point I gave up on making things as `known-bad-output` / `missing-correct-output` as this gets too messy.
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Mon, 27 Feb 2023 03:14:30 +0100
parents f9db8eeb3aec
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
33548
4cd4344a53c4 status: add a flag to terse the output (issue4119)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
1 $ mkdir folder
4cd4344a53c4 status: add a flag to terse the output (issue4119)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
2 $ cd folder
4cd4344a53c4 status: add a flag to terse the output (issue4119)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
3 $ hg init
4cd4344a53c4 status: add a flag to terse the output (issue4119)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
4 $ mkdir x x/l x/m x/n x/l/u x/l/u/a
4cd4344a53c4 status: add a flag to terse the output (issue4119)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
5 $ touch a b x/aa.o x/bb.o
4cd4344a53c4 status: add a flag to terse the output (issue4119)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
6 $ hg status
4cd4344a53c4 status: add a flag to terse the output (issue4119)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
7 ? a
4cd4344a53c4 status: add a flag to terse the output (issue4119)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
8 ? b
4cd4344a53c4 status: add a flag to terse the output (issue4119)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
9 ? x/aa.o
4cd4344a53c4 status: add a flag to terse the output (issue4119)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
10 ? x/bb.o
4cd4344a53c4 status: add a flag to terse the output (issue4119)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
11
4cd4344a53c4 status: add a flag to terse the output (issue4119)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
12 $ hg status --terse u
4cd4344a53c4 status: add a flag to terse the output (issue4119)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
13 ? a
4cd4344a53c4 status: add a flag to terse the output (issue4119)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
14 ? b
4cd4344a53c4 status: add a flag to terse the output (issue4119)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
15 ? x/
4cd4344a53c4 status: add a flag to terse the output (issue4119)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
16 $ hg status --terse maudric
4cd4344a53c4 status: add a flag to terse the output (issue4119)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
17 ? a
4cd4344a53c4 status: add a flag to terse the output (issue4119)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
18 ? b
4cd4344a53c4 status: add a flag to terse the output (issue4119)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
19 ? x/
4cd4344a53c4 status: add a flag to terse the output (issue4119)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
20 $ hg status --terse madric
4cd4344a53c4 status: add a flag to terse the output (issue4119)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
21 ? a
4cd4344a53c4 status: add a flag to terse the output (issue4119)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
22 ? b
4cd4344a53c4 status: add a flag to terse the output (issue4119)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
23 ? x/aa.o
4cd4344a53c4 status: add a flag to terse the output (issue4119)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
24 ? x/bb.o
4cd4344a53c4 status: add a flag to terse the output (issue4119)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
25 $ hg status --terse f
4cd4344a53c4 status: add a flag to terse the output (issue4119)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
26 abort: 'f' not recognized
45827
8d72e29ad1e0 errors: introduce InputError and use it from commands and cmdutil
Martin von Zweigbergk <martinvonz@google.com>
parents: 38467
diff changeset
27 [10]
33548
4cd4344a53c4 status: add a flag to terse the output (issue4119)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
28
4cd4344a53c4 status: add a flag to terse the output (issue4119)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
29 Add a .hgignore so that we can also have ignored files
4cd4344a53c4 status: add a flag to terse the output (issue4119)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
30
4cd4344a53c4 status: add a flag to terse the output (issue4119)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
31 $ echo ".*\.o" > .hgignore
4cd4344a53c4 status: add a flag to terse the output (issue4119)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
32 $ hg status
4cd4344a53c4 status: add a flag to terse the output (issue4119)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
33 ? .hgignore
4cd4344a53c4 status: add a flag to terse the output (issue4119)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
34 ? a
4cd4344a53c4 status: add a flag to terse the output (issue4119)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
35 ? b
4cd4344a53c4 status: add a flag to terse the output (issue4119)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
36 $ hg status -i
4cd4344a53c4 status: add a flag to terse the output (issue4119)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
37 I x/aa.o
4cd4344a53c4 status: add a flag to terse the output (issue4119)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
38 I x/bb.o
4cd4344a53c4 status: add a flag to terse the output (issue4119)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
39
4cd4344a53c4 status: add a flag to terse the output (issue4119)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
40 Tersing ignored files
4cd4344a53c4 status: add a flag to terse the output (issue4119)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
41 $ hg status -t i --ignored
4cd4344a53c4 status: add a flag to terse the output (issue4119)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
42 I x/
4cd4344a53c4 status: add a flag to terse the output (issue4119)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
43
4cd4344a53c4 status: add a flag to terse the output (issue4119)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
44 Adding more files
4cd4344a53c4 status: add a flag to terse the output (issue4119)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
45 $ mkdir y
4cd4344a53c4 status: add a flag to terse the output (issue4119)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
46 $ touch x/aa x/bb y/l y/m y/l.o y/m.o
4cd4344a53c4 status: add a flag to terse the output (issue4119)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
47 $ touch x/l/aa x/m/aa x/n/aa x/l/u/bb x/l/u/a/bb
4cd4344a53c4 status: add a flag to terse the output (issue4119)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
48
4cd4344a53c4 status: add a flag to terse the output (issue4119)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
49 $ hg status
4cd4344a53c4 status: add a flag to terse the output (issue4119)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
50 ? .hgignore
4cd4344a53c4 status: add a flag to terse the output (issue4119)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
51 ? a
4cd4344a53c4 status: add a flag to terse the output (issue4119)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
52 ? b
4cd4344a53c4 status: add a flag to terse the output (issue4119)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
53 ? x/aa
4cd4344a53c4 status: add a flag to terse the output (issue4119)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
54 ? x/bb
4cd4344a53c4 status: add a flag to terse the output (issue4119)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
55 ? x/l/aa
4cd4344a53c4 status: add a flag to terse the output (issue4119)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
56 ? x/l/u/a/bb
4cd4344a53c4 status: add a flag to terse the output (issue4119)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
57 ? x/l/u/bb
4cd4344a53c4 status: add a flag to terse the output (issue4119)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
58 ? x/m/aa
4cd4344a53c4 status: add a flag to terse the output (issue4119)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
59 ? x/n/aa
4cd4344a53c4 status: add a flag to terse the output (issue4119)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
60 ? y/l
4cd4344a53c4 status: add a flag to terse the output (issue4119)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
61 ? y/m
4cd4344a53c4 status: add a flag to terse the output (issue4119)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
62
4cd4344a53c4 status: add a flag to terse the output (issue4119)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
63 $ hg status --terse u
4cd4344a53c4 status: add a flag to terse the output (issue4119)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
64 ? .hgignore
4cd4344a53c4 status: add a flag to terse the output (issue4119)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
65 ? a
4cd4344a53c4 status: add a flag to terse the output (issue4119)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
66 ? b
4cd4344a53c4 status: add a flag to terse the output (issue4119)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
67 ? x/
4cd4344a53c4 status: add a flag to terse the output (issue4119)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
68 ? y/
4cd4344a53c4 status: add a flag to terse the output (issue4119)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
69
38467
09b09fe7ee90 terse: add tests of running from subdirectory
Martin von Zweigbergk <martinvonz@google.com>
parents: 38100
diff changeset
70 Run from subdirectory
09b09fe7ee90 terse: add tests of running from subdirectory
Martin von Zweigbergk <martinvonz@google.com>
parents: 38100
diff changeset
71 $ hg status --terse u --cwd x/l
09b09fe7ee90 terse: add tests of running from subdirectory
Martin von Zweigbergk <martinvonz@google.com>
parents: 38100
diff changeset
72 ? .hgignore
09b09fe7ee90 terse: add tests of running from subdirectory
Martin von Zweigbergk <martinvonz@google.com>
parents: 38100
diff changeset
73 ? a
09b09fe7ee90 terse: add tests of running from subdirectory
Martin von Zweigbergk <martinvonz@google.com>
parents: 38100
diff changeset
74 ? b
09b09fe7ee90 terse: add tests of running from subdirectory
Martin von Zweigbergk <martinvonz@google.com>
parents: 38100
diff changeset
75 ? x/
09b09fe7ee90 terse: add tests of running from subdirectory
Martin von Zweigbergk <martinvonz@google.com>
parents: 38100
diff changeset
76 ? y/
09b09fe7ee90 terse: add tests of running from subdirectory
Martin von Zweigbergk <martinvonz@google.com>
parents: 38100
diff changeset
77 $ relstatus() {
09b09fe7ee90 terse: add tests of running from subdirectory
Martin von Zweigbergk <martinvonz@google.com>
parents: 38100
diff changeset
78 > hg status --terse u --config commands.status.relative=1 "$@";
09b09fe7ee90 terse: add tests of running from subdirectory
Martin von Zweigbergk <martinvonz@google.com>
parents: 38100
diff changeset
79 > }
09b09fe7ee90 terse: add tests of running from subdirectory
Martin von Zweigbergk <martinvonz@google.com>
parents: 38100
diff changeset
80 This should probably have {"l/", "m/", "n/"} instead of {"."}. They should
09b09fe7ee90 terse: add tests of running from subdirectory
Martin von Zweigbergk <martinvonz@google.com>
parents: 38100
diff changeset
81 probably come after "../y/".
09b09fe7ee90 terse: add tests of running from subdirectory
Martin von Zweigbergk <martinvonz@google.com>
parents: 38100
diff changeset
82 $ relstatus --cwd x
09b09fe7ee90 terse: add tests of running from subdirectory
Martin von Zweigbergk <martinvonz@google.com>
parents: 38100
diff changeset
83 ? ../.hgignore
09b09fe7ee90 terse: add tests of running from subdirectory
Martin von Zweigbergk <martinvonz@google.com>
parents: 38100
diff changeset
84 ? ../a
09b09fe7ee90 terse: add tests of running from subdirectory
Martin von Zweigbergk <martinvonz@google.com>
parents: 38100
diff changeset
85 ? ../b
09b09fe7ee90 terse: add tests of running from subdirectory
Martin von Zweigbergk <martinvonz@google.com>
parents: 38100
diff changeset
86 ? .
09b09fe7ee90 terse: add tests of running from subdirectory
Martin von Zweigbergk <martinvonz@google.com>
parents: 38100
diff changeset
87 ? ../y/
09b09fe7ee90 terse: add tests of running from subdirectory
Martin von Zweigbergk <martinvonz@google.com>
parents: 38100
diff changeset
88 This should probably have {"u/", "../m/", "../n/"} instead of {"../"}.
09b09fe7ee90 terse: add tests of running from subdirectory
Martin von Zweigbergk <martinvonz@google.com>
parents: 38100
diff changeset
89 $ relstatus --cwd x/l
09b09fe7ee90 terse: add tests of running from subdirectory
Martin von Zweigbergk <martinvonz@google.com>
parents: 38100
diff changeset
90 ? ../../.hgignore
09b09fe7ee90 terse: add tests of running from subdirectory
Martin von Zweigbergk <martinvonz@google.com>
parents: 38100
diff changeset
91 ? ../../a
09b09fe7ee90 terse: add tests of running from subdirectory
Martin von Zweigbergk <martinvonz@google.com>
parents: 38100
diff changeset
92 ? ../../b
09b09fe7ee90 terse: add tests of running from subdirectory
Martin von Zweigbergk <martinvonz@google.com>
parents: 38100
diff changeset
93 ? ../
09b09fe7ee90 terse: add tests of running from subdirectory
Martin von Zweigbergk <martinvonz@google.com>
parents: 38100
diff changeset
94 ? ../../y/
09b09fe7ee90 terse: add tests of running from subdirectory
Martin von Zweigbergk <martinvonz@google.com>
parents: 38100
diff changeset
95 This should probably have {"a/", "bb", "../aa", "../../m/", "../../n/"}
09b09fe7ee90 terse: add tests of running from subdirectory
Martin von Zweigbergk <martinvonz@google.com>
parents: 38100
diff changeset
96 instead of {"../../"}.
09b09fe7ee90 terse: add tests of running from subdirectory
Martin von Zweigbergk <martinvonz@google.com>
parents: 38100
diff changeset
97 $ relstatus --cwd x/l/u
09b09fe7ee90 terse: add tests of running from subdirectory
Martin von Zweigbergk <martinvonz@google.com>
parents: 38100
diff changeset
98 ? ../../../.hgignore
09b09fe7ee90 terse: add tests of running from subdirectory
Martin von Zweigbergk <martinvonz@google.com>
parents: 38100
diff changeset
99 ? ../../../a
09b09fe7ee90 terse: add tests of running from subdirectory
Martin von Zweigbergk <martinvonz@google.com>
parents: 38100
diff changeset
100 ? ../../../b
09b09fe7ee90 terse: add tests of running from subdirectory
Martin von Zweigbergk <martinvonz@google.com>
parents: 38100
diff changeset
101 ? ../../
09b09fe7ee90 terse: add tests of running from subdirectory
Martin von Zweigbergk <martinvonz@google.com>
parents: 38100
diff changeset
102 ? ../../../y/
09b09fe7ee90 terse: add tests of running from subdirectory
Martin von Zweigbergk <martinvonz@google.com>
parents: 38100
diff changeset
103 This should probably have {"bb", "../bb", "../../aa", "../../../m/",
09b09fe7ee90 terse: add tests of running from subdirectory
Martin von Zweigbergk <martinvonz@google.com>
parents: 38100
diff changeset
104 "../../../n/"} instead of {"../../../"}.
09b09fe7ee90 terse: add tests of running from subdirectory
Martin von Zweigbergk <martinvonz@google.com>
parents: 38100
diff changeset
105 $ relstatus --cwd x/l/u/a
09b09fe7ee90 terse: add tests of running from subdirectory
Martin von Zweigbergk <martinvonz@google.com>
parents: 38100
diff changeset
106 ? ../../../../.hgignore
09b09fe7ee90 terse: add tests of running from subdirectory
Martin von Zweigbergk <martinvonz@google.com>
parents: 38100
diff changeset
107 ? ../../../../a
09b09fe7ee90 terse: add tests of running from subdirectory
Martin von Zweigbergk <martinvonz@google.com>
parents: 38100
diff changeset
108 ? ../../../../b
09b09fe7ee90 terse: add tests of running from subdirectory
Martin von Zweigbergk <martinvonz@google.com>
parents: 38100
diff changeset
109 ? ../../../
09b09fe7ee90 terse: add tests of running from subdirectory
Martin von Zweigbergk <martinvonz@google.com>
parents: 38100
diff changeset
110 ? ../../../../y/
09b09fe7ee90 terse: add tests of running from subdirectory
Martin von Zweigbergk <martinvonz@google.com>
parents: 38100
diff changeset
111
33548
4cd4344a53c4 status: add a flag to terse the output (issue4119)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
112 $ hg add x/aa x/bb .hgignore
4cd4344a53c4 status: add a flag to terse the output (issue4119)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
113 $ hg status --terse au
4cd4344a53c4 status: add a flag to terse the output (issue4119)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
114 A .hgignore
4cd4344a53c4 status: add a flag to terse the output (issue4119)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
115 A x/aa
4cd4344a53c4 status: add a flag to terse the output (issue4119)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
116 A x/bb
4cd4344a53c4 status: add a flag to terse the output (issue4119)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
117 ? a
4cd4344a53c4 status: add a flag to terse the output (issue4119)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
118 ? b
4cd4344a53c4 status: add a flag to terse the output (issue4119)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
119 ? x/l/
4cd4344a53c4 status: add a flag to terse the output (issue4119)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
120 ? x/m/
4cd4344a53c4 status: add a flag to terse the output (issue4119)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
121 ? x/n/
4cd4344a53c4 status: add a flag to terse the output (issue4119)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
122 ? y/
4cd4344a53c4 status: add a flag to terse the output (issue4119)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
123
4cd4344a53c4 status: add a flag to terse the output (issue4119)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
124 Including ignored files
4cd4344a53c4 status: add a flag to terse the output (issue4119)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
125
4cd4344a53c4 status: add a flag to terse the output (issue4119)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
126 $ hg status --terse aui
4cd4344a53c4 status: add a flag to terse the output (issue4119)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
127 A .hgignore
4cd4344a53c4 status: add a flag to terse the output (issue4119)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
128 A x/aa
4cd4344a53c4 status: add a flag to terse the output (issue4119)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
129 A x/bb
4cd4344a53c4 status: add a flag to terse the output (issue4119)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
130 ? a
4cd4344a53c4 status: add a flag to terse the output (issue4119)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
131 ? b
4cd4344a53c4 status: add a flag to terse the output (issue4119)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
132 ? x/l/
4cd4344a53c4 status: add a flag to terse the output (issue4119)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
133 ? x/m/
4cd4344a53c4 status: add a flag to terse the output (issue4119)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
134 ? x/n/
4cd4344a53c4 status: add a flag to terse the output (issue4119)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
135 ? y/l
4cd4344a53c4 status: add a flag to terse the output (issue4119)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
136 ? y/m
4cd4344a53c4 status: add a flag to terse the output (issue4119)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
137 $ hg status --terse au -i
4cd4344a53c4 status: add a flag to terse the output (issue4119)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
138 I x/aa.o
4cd4344a53c4 status: add a flag to terse the output (issue4119)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
139 I x/bb.o
4cd4344a53c4 status: add a flag to terse the output (issue4119)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
140 I y/l.o
4cd4344a53c4 status: add a flag to terse the output (issue4119)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
141 I y/m.o
4cd4344a53c4 status: add a flag to terse the output (issue4119)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
142
4cd4344a53c4 status: add a flag to terse the output (issue4119)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
143 Committing some of the files
4cd4344a53c4 status: add a flag to terse the output (issue4119)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
144
4cd4344a53c4 status: add a flag to terse the output (issue4119)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
145 $ hg commit x/aa x/bb .hgignore -m "First commit"
4cd4344a53c4 status: add a flag to terse the output (issue4119)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
146 $ hg status
4cd4344a53c4 status: add a flag to terse the output (issue4119)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
147 ? a
4cd4344a53c4 status: add a flag to terse the output (issue4119)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
148 ? b
4cd4344a53c4 status: add a flag to terse the output (issue4119)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
149 ? x/l/aa
4cd4344a53c4 status: add a flag to terse the output (issue4119)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
150 ? x/l/u/a/bb
4cd4344a53c4 status: add a flag to terse the output (issue4119)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
151 ? x/l/u/bb
4cd4344a53c4 status: add a flag to terse the output (issue4119)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
152 ? x/m/aa
4cd4344a53c4 status: add a flag to terse the output (issue4119)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
153 ? x/n/aa
4cd4344a53c4 status: add a flag to terse the output (issue4119)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
154 ? y/l
4cd4344a53c4 status: add a flag to terse the output (issue4119)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
155 ? y/m
4cd4344a53c4 status: add a flag to terse the output (issue4119)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
156 $ hg status --terse mardu
4cd4344a53c4 status: add a flag to terse the output (issue4119)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
157 ? a
4cd4344a53c4 status: add a flag to terse the output (issue4119)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
158 ? b
4cd4344a53c4 status: add a flag to terse the output (issue4119)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
159 ? x/l/
4cd4344a53c4 status: add a flag to terse the output (issue4119)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
160 ? x/m/
4cd4344a53c4 status: add a flag to terse the output (issue4119)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
161 ? x/n/
4cd4344a53c4 status: add a flag to terse the output (issue4119)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
162 ? y/
4cd4344a53c4 status: add a flag to terse the output (issue4119)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
163
4cd4344a53c4 status: add a flag to terse the output (issue4119)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
164 Modifying already committed files
4cd4344a53c4 status: add a flag to terse the output (issue4119)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
165
4cd4344a53c4 status: add a flag to terse the output (issue4119)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
166 $ echo "Hello" >> x/aa
4cd4344a53c4 status: add a flag to terse the output (issue4119)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
167 $ echo "World" >> x/bb
4cd4344a53c4 status: add a flag to terse the output (issue4119)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
168 $ hg status --terse maurdc
4cd4344a53c4 status: add a flag to terse the output (issue4119)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
169 M x/aa
4cd4344a53c4 status: add a flag to terse the output (issue4119)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
170 M x/bb
4cd4344a53c4 status: add a flag to terse the output (issue4119)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
171 ? a
4cd4344a53c4 status: add a flag to terse the output (issue4119)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
172 ? b
4cd4344a53c4 status: add a flag to terse the output (issue4119)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
173 ? x/l/
4cd4344a53c4 status: add a flag to terse the output (issue4119)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
174 ? x/m/
4cd4344a53c4 status: add a flag to terse the output (issue4119)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
175 ? x/n/
4cd4344a53c4 status: add a flag to terse the output (issue4119)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
176 ? y/
4cd4344a53c4 status: add a flag to terse the output (issue4119)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
177
4cd4344a53c4 status: add a flag to terse the output (issue4119)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
178 Respecting other flags
4cd4344a53c4 status: add a flag to terse the output (issue4119)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
179
4cd4344a53c4 status: add a flag to terse the output (issue4119)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
180 $ hg status --terse marduic --all
4cd4344a53c4 status: add a flag to terse the output (issue4119)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
181 M x/aa
4cd4344a53c4 status: add a flag to terse the output (issue4119)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
182 M x/bb
4cd4344a53c4 status: add a flag to terse the output (issue4119)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
183 ? a
4cd4344a53c4 status: add a flag to terse the output (issue4119)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
184 ? b
4cd4344a53c4 status: add a flag to terse the output (issue4119)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
185 ? x/l/
4cd4344a53c4 status: add a flag to terse the output (issue4119)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
186 ? x/m/
4cd4344a53c4 status: add a flag to terse the output (issue4119)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
187 ? x/n/
4cd4344a53c4 status: add a flag to terse the output (issue4119)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
188 ? y/l
4cd4344a53c4 status: add a flag to terse the output (issue4119)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
189 ? y/m
4cd4344a53c4 status: add a flag to terse the output (issue4119)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
190 I x/aa.o
4cd4344a53c4 status: add a flag to terse the output (issue4119)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
191 I x/bb.o
4cd4344a53c4 status: add a flag to terse the output (issue4119)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
192 I y/l.o
4cd4344a53c4 status: add a flag to terse the output (issue4119)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
193 I y/m.o
4cd4344a53c4 status: add a flag to terse the output (issue4119)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
194 C .hgignore
4cd4344a53c4 status: add a flag to terse the output (issue4119)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
195 $ hg status --terse marduic -a
4cd4344a53c4 status: add a flag to terse the output (issue4119)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
196 $ hg status --terse marduic -c
4cd4344a53c4 status: add a flag to terse the output (issue4119)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
197 C .hgignore
4cd4344a53c4 status: add a flag to terse the output (issue4119)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
198 $ hg status --terse marduic -m
4cd4344a53c4 status: add a flag to terse the output (issue4119)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
199 M x/aa
4cd4344a53c4 status: add a flag to terse the output (issue4119)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
200 M x/bb
4cd4344a53c4 status: add a flag to terse the output (issue4119)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
201
4cd4344a53c4 status: add a flag to terse the output (issue4119)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
202 Passing 'i' in terse value will consider the ignored files while tersing
4cd4344a53c4 status: add a flag to terse the output (issue4119)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
203
4cd4344a53c4 status: add a flag to terse the output (issue4119)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
204 $ hg status --terse marduic -u
4cd4344a53c4 status: add a flag to terse the output (issue4119)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
205 ? a
4cd4344a53c4 status: add a flag to terse the output (issue4119)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
206 ? b
4cd4344a53c4 status: add a flag to terse the output (issue4119)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
207 ? x/l/
4cd4344a53c4 status: add a flag to terse the output (issue4119)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
208 ? x/m/
4cd4344a53c4 status: add a flag to terse the output (issue4119)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
209 ? x/n/
4cd4344a53c4 status: add a flag to terse the output (issue4119)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
210 ? y/l
4cd4344a53c4 status: add a flag to terse the output (issue4119)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
211 ? y/m
4cd4344a53c4 status: add a flag to terse the output (issue4119)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
212
4cd4344a53c4 status: add a flag to terse the output (issue4119)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
213 Omitting 'i' in terse value does not consider ignored files while tersing
4cd4344a53c4 status: add a flag to terse the output (issue4119)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
214
4cd4344a53c4 status: add a flag to terse the output (issue4119)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
215 $ hg status --terse marduc -u
4cd4344a53c4 status: add a flag to terse the output (issue4119)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
216 ? a
4cd4344a53c4 status: add a flag to terse the output (issue4119)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
217 ? b
4cd4344a53c4 status: add a flag to terse the output (issue4119)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
218 ? x/l/
4cd4344a53c4 status: add a flag to terse the output (issue4119)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
219 ? x/m/
4cd4344a53c4 status: add a flag to terse the output (issue4119)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
220 ? x/n/
4cd4344a53c4 status: add a flag to terse the output (issue4119)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
221 ? y/
4cd4344a53c4 status: add a flag to terse the output (issue4119)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
222
4cd4344a53c4 status: add a flag to terse the output (issue4119)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
223 Trying with --rev
4cd4344a53c4 status: add a flag to terse the output (issue4119)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
224
4cd4344a53c4 status: add a flag to terse the output (issue4119)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
225 $ hg status --terse marduic --rev 0 --rev 1
4cd4344a53c4 status: add a flag to terse the output (issue4119)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
226 abort: cannot use --terse with --rev
45827
8d72e29ad1e0 errors: introduce InputError and use it from commands and cmdutil
Martin von Zweigbergk <martinvonz@google.com>
parents: 38467
diff changeset
227 [10]
38100
18424aeece7f status: add a config knob for setting default of --terse
Augie Fackler <augie@google.com>
parents: 34000
diff changeset
228
18424aeece7f status: add a config knob for setting default of --terse
Augie Fackler <augie@google.com>
parents: 34000
diff changeset
229 Config item to set the default terseness
18424aeece7f status: add a config knob for setting default of --terse
Augie Fackler <augie@google.com>
parents: 34000
diff changeset
230 $ cat <<EOF >> $HGRCPATH
18424aeece7f status: add a config knob for setting default of --terse
Augie Fackler <augie@google.com>
parents: 34000
diff changeset
231 > [commands]
18424aeece7f status: add a config knob for setting default of --terse
Augie Fackler <augie@google.com>
parents: 34000
diff changeset
232 > status.terse = u
18424aeece7f status: add a config knob for setting default of --terse
Augie Fackler <augie@google.com>
parents: 34000
diff changeset
233 > EOF
18424aeece7f status: add a config knob for setting default of --terse
Augie Fackler <augie@google.com>
parents: 34000
diff changeset
234 $ hg status -mu
18424aeece7f status: add a config knob for setting default of --terse
Augie Fackler <augie@google.com>
parents: 34000
diff changeset
235 M x/aa
18424aeece7f status: add a config knob for setting default of --terse
Augie Fackler <augie@google.com>
parents: 34000
diff changeset
236 M x/bb
18424aeece7f status: add a config knob for setting default of --terse
Augie Fackler <augie@google.com>
parents: 34000
diff changeset
237 ? a
18424aeece7f status: add a config knob for setting default of --terse
Augie Fackler <augie@google.com>
parents: 34000
diff changeset
238 ? b
18424aeece7f status: add a config knob for setting default of --terse
Augie Fackler <augie@google.com>
parents: 34000
diff changeset
239 ? x/l/
18424aeece7f status: add a config knob for setting default of --terse
Augie Fackler <augie@google.com>
parents: 34000
diff changeset
240 ? x/m/
18424aeece7f status: add a config knob for setting default of --terse
Augie Fackler <augie@google.com>
parents: 34000
diff changeset
241 ? x/n/
18424aeece7f status: add a config knob for setting default of --terse
Augie Fackler <augie@google.com>
parents: 34000
diff changeset
242 ? y/
18424aeece7f status: add a config knob for setting default of --terse
Augie Fackler <augie@google.com>
parents: 34000
diff changeset
243
18424aeece7f status: add a config knob for setting default of --terse
Augie Fackler <augie@google.com>
parents: 34000
diff changeset
244 Command line flag overrides the default
18424aeece7f status: add a config knob for setting default of --terse
Augie Fackler <augie@google.com>
parents: 34000
diff changeset
245 $ hg status --terse=
18424aeece7f status: add a config knob for setting default of --terse
Augie Fackler <augie@google.com>
parents: 34000
diff changeset
246 M x/aa
18424aeece7f status: add a config knob for setting default of --terse
Augie Fackler <augie@google.com>
parents: 34000
diff changeset
247 M x/bb
18424aeece7f status: add a config knob for setting default of --terse
Augie Fackler <augie@google.com>
parents: 34000
diff changeset
248 ? a
18424aeece7f status: add a config knob for setting default of --terse
Augie Fackler <augie@google.com>
parents: 34000
diff changeset
249 ? b
18424aeece7f status: add a config knob for setting default of --terse
Augie Fackler <augie@google.com>
parents: 34000
diff changeset
250 ? x/l/aa
18424aeece7f status: add a config knob for setting default of --terse
Augie Fackler <augie@google.com>
parents: 34000
diff changeset
251 ? x/l/u/a/bb
18424aeece7f status: add a config knob for setting default of --terse
Augie Fackler <augie@google.com>
parents: 34000
diff changeset
252 ? x/l/u/bb
18424aeece7f status: add a config knob for setting default of --terse
Augie Fackler <augie@google.com>
parents: 34000
diff changeset
253 ? x/m/aa
18424aeece7f status: add a config knob for setting default of --terse
Augie Fackler <augie@google.com>
parents: 34000
diff changeset
254 ? x/n/aa
18424aeece7f status: add a config knob for setting default of --terse
Augie Fackler <augie@google.com>
parents: 34000
diff changeset
255 ? y/l
18424aeece7f status: add a config knob for setting default of --terse
Augie Fackler <augie@google.com>
parents: 34000
diff changeset
256 ? y/m
18424aeece7f status: add a config knob for setting default of --terse
Augie Fackler <augie@google.com>
parents: 34000
diff changeset
257 $ hg status --terse=mardu
18424aeece7f status: add a config knob for setting default of --terse
Augie Fackler <augie@google.com>
parents: 34000
diff changeset
258 M x/aa
18424aeece7f status: add a config knob for setting default of --terse
Augie Fackler <augie@google.com>
parents: 34000
diff changeset
259 M x/bb
18424aeece7f status: add a config knob for setting default of --terse
Augie Fackler <augie@google.com>
parents: 34000
diff changeset
260 ? a
18424aeece7f status: add a config knob for setting default of --terse
Augie Fackler <augie@google.com>
parents: 34000
diff changeset
261 ? b
18424aeece7f status: add a config knob for setting default of --terse
Augie Fackler <augie@google.com>
parents: 34000
diff changeset
262 ? x/l/
18424aeece7f status: add a config knob for setting default of --terse
Augie Fackler <augie@google.com>
parents: 34000
diff changeset
263 ? x/m/
18424aeece7f status: add a config knob for setting default of --terse
Augie Fackler <augie@google.com>
parents: 34000
diff changeset
264 ? x/n/
18424aeece7f status: add a config knob for setting default of --terse
Augie Fackler <augie@google.com>
parents: 34000
diff changeset
265 ? y/
18424aeece7f status: add a config knob for setting default of --terse
Augie Fackler <augie@google.com>
parents: 34000
diff changeset
266
18424aeece7f status: add a config knob for setting default of --terse
Augie Fackler <augie@google.com>
parents: 34000
diff changeset
267 Specifying --rev should still work, with the terseness disabled.
18424aeece7f status: add a config knob for setting default of --terse
Augie Fackler <augie@google.com>
parents: 34000
diff changeset
268 $ hg status --rev 0
18424aeece7f status: add a config knob for setting default of --terse
Augie Fackler <augie@google.com>
parents: 34000
diff changeset
269 M x/aa
18424aeece7f status: add a config knob for setting default of --terse
Augie Fackler <augie@google.com>
parents: 34000
diff changeset
270 M x/bb
18424aeece7f status: add a config knob for setting default of --terse
Augie Fackler <augie@google.com>
parents: 34000
diff changeset
271 ? a
18424aeece7f status: add a config knob for setting default of --terse
Augie Fackler <augie@google.com>
parents: 34000
diff changeset
272 ? b
18424aeece7f status: add a config knob for setting default of --terse
Augie Fackler <augie@google.com>
parents: 34000
diff changeset
273 ? x/l/aa
18424aeece7f status: add a config knob for setting default of --terse
Augie Fackler <augie@google.com>
parents: 34000
diff changeset
274 ? x/l/u/a/bb
18424aeece7f status: add a config knob for setting default of --terse
Augie Fackler <augie@google.com>
parents: 34000
diff changeset
275 ? x/l/u/bb
18424aeece7f status: add a config knob for setting default of --terse
Augie Fackler <augie@google.com>
parents: 34000
diff changeset
276 ? x/m/aa
18424aeece7f status: add a config knob for setting default of --terse
Augie Fackler <augie@google.com>
parents: 34000
diff changeset
277 ? x/n/aa
18424aeece7f status: add a config knob for setting default of --terse
Augie Fackler <augie@google.com>
parents: 34000
diff changeset
278 ? y/l
18424aeece7f status: add a config knob for setting default of --terse
Augie Fackler <augie@google.com>
parents: 34000
diff changeset
279 ? y/m