Mercurial > hg
annotate tests/test-add.t @ 23031:3c0983cc279e
i18n: cache the result of every gettext call
In looking at profiler output for 'hg log' on mozilla-central, I
noticed we spent a _huge_ amount of time in gettext relative to what
it's doing. Caching provides a roughly 15% performance improvement
even on repositories as small as hg.
== hg repo on linux ==
Before:
% cumulative self
time seconds seconds name
5.05 0.19 0.19 i18n.py:62:gettext
4.84 0.18 0.18 revlog.py:88:decompress
2.95 0.17 0.11 changelog.py:201:node
2.32 0.09 0.09 ui.py:577:write
2.11 0.08 0.08 i18n.py:72:gettext
2.11 0.08 0.08 obsolete.py:196:_fm0readmarkers
1.89 0.07 0.07 obsolete.py:569:_load
1.68 0.63 0.06 localrepo.py:29:__get__
real 0m4.026s
user 0m3.993s
sys 0m0.034s
After:
% cumulative self
time seconds seconds name
8.05 0.26 0.26 revlog.py:88:decompress
2.68 0.22 0.09 color.py:395:write
2.20 0.07 0.07 obsolete.py:196:_fm0readmarkers
1.95 0.06 0.06 obsolete.py:174:_fm0readmarkers
1.95 0.06 0.06 ui.py:577:write
1.95 0.06 0.06 util.py:1228:datestr
1.71 0.06 0.06 utf_8.py:16:decode
1.71 0.06 0.06 revlog.py:273:__len__
real 0m3.519s
user 0m3.447s
sys 0m0.073s
== mozilla-central repo on linux ==
Before:
% cumulative self
time seconds seconds name
7.72 2.35 2.35 revlog.py:88:decompress
4.46 1.36 1.36 i18n.py:62:gettext
2.22 0.67 0.67 i18n.py:72:gettext
2.19 1.14 0.67 changelog.py:201:node
2.16 0.66 0.66 ui.py:577:write
1.96 0.60 0.60 utf_8.py:16:decode
1.93 1.97 0.59 color.py:395:write
1.85 0.81 0.56 changelog.py:136:tip
real 0m30.822s
user 0m30.660s
sys 0m0.149s
After:
% cumulative self
time seconds seconds name
9.82 2.49 2.49 revlog.py:88:decompress
2.67 1.31 0.68 localrepo.py:29:__get__
2.57 0.65 0.65 utf_8.py:16:decode
2.48 1.01 0.63 changelog.py:201:node
2.10 0.82 0.53 changelog.py:136:tip
2.01 0.51 0.51 ui.py:577:write
1.91 0.49 0.49 util.py:1232:datestr
1.85 1.65 0.47 color.py:395:write
real 0m25.619s
user 0m25.446s
sys 0m0.166s
== cpython repo on os x =
Before:
% cumulative self
time seconds seconds name
5.05 1.35 1.35 cmdutil.py:982:_show
4.59 1.22 1.22 revlog.py:274:__len__
3.98 1.06 1.06 i18n.py:62:gettext
3.91 1.04 1.04 revlog.py:1016:revision
3.68 0.98 0.98 revlog.py:337:parents
3.45 0.92 0.92 revlog.py:88:decompress
2.91 0.78 0.78 revlog.py:309:rev
2.62 0.70 0.70 revlog.py:1033:revision
real 0m30.414s
user 0m28.145s
sys 0m0.541s
After:
% cumulative self
time seconds seconds name
7.98 1.66 1.66 cmdutil.py:982:_show
6.83 1.42 1.42 changelog.py:46:decodeextra
5.18 1.08 1.08 revlog.py:274:__len__
3.94 0.82 0.82 revlog.py:1016:revision
3.41 0.71 0.71 revlog.py:309:rev
3.32 0.69 0.69 revlog.py:88:decompress
2.99 0.63 0.62 revlog.py:1033:revision
2.69 0.56 0.56 revlog.py:341:start
real 0m22.811s
user 0m21.883s
sys 0m0.397s
author | Augie Fackler <raf@durin42.com> |
---|---|
date | Fri, 17 Oct 2014 13:52:10 -0400 |
parents | b081decd9062 |
children | 10697f29af2b |
rev | line source |
---|---|
11795
06793ad30575
tests: unify test-add
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9166
diff
changeset
|
1 $ hg init a |
06793ad30575
tests: unify test-add
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9166
diff
changeset
|
2 $ cd a |
06793ad30575
tests: unify test-add
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9166
diff
changeset
|
3 $ echo a > a |
06793ad30575
tests: unify test-add
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9166
diff
changeset
|
4 $ hg add -n |
06793ad30575
tests: unify test-add
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9166
diff
changeset
|
5 adding a |
06793ad30575
tests: unify test-add
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9166
diff
changeset
|
6 $ hg st |
06793ad30575
tests: unify test-add
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9166
diff
changeset
|
7 ? a |
06793ad30575
tests: unify test-add
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9166
diff
changeset
|
8 $ hg add |
06793ad30575
tests: unify test-add
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9166
diff
changeset
|
9 adding a |
06793ad30575
tests: unify test-add
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9166
diff
changeset
|
10 $ hg st |
06793ad30575
tests: unify test-add
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9166
diff
changeset
|
11 A a |
06793ad30575
tests: unify test-add
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9166
diff
changeset
|
12 $ hg forget a |
06793ad30575
tests: unify test-add
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9166
diff
changeset
|
13 $ hg add |
06793ad30575
tests: unify test-add
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9166
diff
changeset
|
14 adding a |
06793ad30575
tests: unify test-add
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9166
diff
changeset
|
15 $ hg st |
06793ad30575
tests: unify test-add
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9166
diff
changeset
|
16 A a |
5207
212de429e000
make hg add of a removed file unremove the file
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff
changeset
|
17 |
11795
06793ad30575
tests: unify test-add
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9166
diff
changeset
|
18 $ echo b > b |
06793ad30575
tests: unify test-add
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9166
diff
changeset
|
19 $ hg add -n b |
06793ad30575
tests: unify test-add
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9166
diff
changeset
|
20 $ hg st |
06793ad30575
tests: unify test-add
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9166
diff
changeset
|
21 A a |
06793ad30575
tests: unify test-add
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9166
diff
changeset
|
22 ? b |
12365
22f3353bcc36
tests: cleanup exit code handling in unified tests
Matt Mackall <mpm@selenic.com>
parents:
12316
diff
changeset
|
23 $ hg add b |
11795
06793ad30575
tests: unify test-add
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9166
diff
changeset
|
24 $ hg st |
06793ad30575
tests: unify test-add
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9166
diff
changeset
|
25 A a |
06793ad30575
tests: unify test-add
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9166
diff
changeset
|
26 A b |
06793ad30575
tests: unify test-add
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9166
diff
changeset
|
27 |
06793ad30575
tests: unify test-add
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9166
diff
changeset
|
28 should fail |
5207
212de429e000
make hg add of a removed file unremove the file
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff
changeset
|
29 |
11795
06793ad30575
tests: unify test-add
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9166
diff
changeset
|
30 $ hg add b |
06793ad30575
tests: unify test-add
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9166
diff
changeset
|
31 b already tracked! |
06793ad30575
tests: unify test-add
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9166
diff
changeset
|
32 $ hg st |
06793ad30575
tests: unify test-add
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9166
diff
changeset
|
33 A a |
06793ad30575
tests: unify test-add
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9166
diff
changeset
|
34 A b |
06793ad30575
tests: unify test-add
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9166
diff
changeset
|
35 |
16875
ee9bd7ef0a0e
test-add: enable for Windows
Adrian Buehlmann <adrian@cadifra.com>
parents:
15524
diff
changeset
|
36 #if no-windows |
13962
8b252e826c68
add: introduce a warning message for non-portable filenames (issue2756) (BC)
Adrian Buehlmann <adrian@cadifra.com>
parents:
12399
diff
changeset
|
37 $ echo foo > con.xml |
8b252e826c68
add: introduce a warning message for non-portable filenames (issue2756) (BC)
Adrian Buehlmann <adrian@cadifra.com>
parents:
12399
diff
changeset
|
38 $ hg --config ui.portablefilenames=jump add con.xml |
8b252e826c68
add: introduce a warning message for non-portable filenames (issue2756) (BC)
Adrian Buehlmann <adrian@cadifra.com>
parents:
12399
diff
changeset
|
39 abort: ui.portablefilenames value is invalid ('jump') |
8b252e826c68
add: introduce a warning message for non-portable filenames (issue2756) (BC)
Adrian Buehlmann <adrian@cadifra.com>
parents:
12399
diff
changeset
|
40 [255] |
8b252e826c68
add: introduce a warning message for non-portable filenames (issue2756) (BC)
Adrian Buehlmann <adrian@cadifra.com>
parents:
12399
diff
changeset
|
41 $ hg --config ui.portablefilenames=abort add con.xml |
8b252e826c68
add: introduce a warning message for non-portable filenames (issue2756) (BC)
Adrian Buehlmann <adrian@cadifra.com>
parents:
12399
diff
changeset
|
42 abort: filename contains 'con', which is reserved on Windows: 'con.xml' |
8b252e826c68
add: introduce a warning message for non-portable filenames (issue2756) (BC)
Adrian Buehlmann <adrian@cadifra.com>
parents:
12399
diff
changeset
|
43 [255] |
8b252e826c68
add: introduce a warning message for non-portable filenames (issue2756) (BC)
Adrian Buehlmann <adrian@cadifra.com>
parents:
12399
diff
changeset
|
44 $ hg st |
8b252e826c68
add: introduce a warning message for non-portable filenames (issue2756) (BC)
Adrian Buehlmann <adrian@cadifra.com>
parents:
12399
diff
changeset
|
45 A a |
8b252e826c68
add: introduce a warning message for non-portable filenames (issue2756) (BC)
Adrian Buehlmann <adrian@cadifra.com>
parents:
12399
diff
changeset
|
46 A b |
8b252e826c68
add: introduce a warning message for non-portable filenames (issue2756) (BC)
Adrian Buehlmann <adrian@cadifra.com>
parents:
12399
diff
changeset
|
47 ? con.xml |
8b252e826c68
add: introduce a warning message for non-portable filenames (issue2756) (BC)
Adrian Buehlmann <adrian@cadifra.com>
parents:
12399
diff
changeset
|
48 $ hg add con.xml |
8b252e826c68
add: introduce a warning message for non-portable filenames (issue2756) (BC)
Adrian Buehlmann <adrian@cadifra.com>
parents:
12399
diff
changeset
|
49 warning: filename contains 'con', which is reserved on Windows: 'con.xml' |
8b252e826c68
add: introduce a warning message for non-portable filenames (issue2756) (BC)
Adrian Buehlmann <adrian@cadifra.com>
parents:
12399
diff
changeset
|
50 $ hg st |
8b252e826c68
add: introduce a warning message for non-portable filenames (issue2756) (BC)
Adrian Buehlmann <adrian@cadifra.com>
parents:
12399
diff
changeset
|
51 A a |
8b252e826c68
add: introduce a warning message for non-portable filenames (issue2756) (BC)
Adrian Buehlmann <adrian@cadifra.com>
parents:
12399
diff
changeset
|
52 A b |
8b252e826c68
add: introduce a warning message for non-portable filenames (issue2756) (BC)
Adrian Buehlmann <adrian@cadifra.com>
parents:
12399
diff
changeset
|
53 A con.xml |
16974
01ed5bb5cd41
tests: use hghave eol-in-paths to test for support for ':' in filenames and " "
Mads Kiilerich <mads@kiilerich.com>
parents:
16913
diff
changeset
|
54 $ hg forget con.xml |
01ed5bb5cd41
tests: use hghave eol-in-paths to test for support for ':' in filenames and " "
Mads Kiilerich <mads@kiilerich.com>
parents:
16913
diff
changeset
|
55 $ rm con.xml |
01ed5bb5cd41
tests: use hghave eol-in-paths to test for support for ':' in filenames and " "
Mads Kiilerich <mads@kiilerich.com>
parents:
16913
diff
changeset
|
56 #endif |
01ed5bb5cd41
tests: use hghave eol-in-paths to test for support for ':' in filenames and " "
Mads Kiilerich <mads@kiilerich.com>
parents:
16913
diff
changeset
|
57 |
01ed5bb5cd41
tests: use hghave eol-in-paths to test for support for ':' in filenames and " "
Mads Kiilerich <mads@kiilerich.com>
parents:
16913
diff
changeset
|
58 #if eol-in-paths |
13962
8b252e826c68
add: introduce a warning message for non-portable filenames (issue2756) (BC)
Adrian Buehlmann <adrian@cadifra.com>
parents:
12399
diff
changeset
|
59 $ echo bla > 'hello:world' |
8b252e826c68
add: introduce a warning message for non-portable filenames (issue2756) (BC)
Adrian Buehlmann <adrian@cadifra.com>
parents:
12399
diff
changeset
|
60 $ hg --config ui.portablefilenames=abort add |
8b252e826c68
add: introduce a warning message for non-portable filenames (issue2756) (BC)
Adrian Buehlmann <adrian@cadifra.com>
parents:
12399
diff
changeset
|
61 adding hello:world |
8b252e826c68
add: introduce a warning message for non-portable filenames (issue2756) (BC)
Adrian Buehlmann <adrian@cadifra.com>
parents:
12399
diff
changeset
|
62 abort: filename contains ':', which is reserved on Windows: 'hello:world' |
8b252e826c68
add: introduce a warning message for non-portable filenames (issue2756) (BC)
Adrian Buehlmann <adrian@cadifra.com>
parents:
12399
diff
changeset
|
63 [255] |
8b252e826c68
add: introduce a warning message for non-portable filenames (issue2756) (BC)
Adrian Buehlmann <adrian@cadifra.com>
parents:
12399
diff
changeset
|
64 $ hg st |
8b252e826c68
add: introduce a warning message for non-portable filenames (issue2756) (BC)
Adrian Buehlmann <adrian@cadifra.com>
parents:
12399
diff
changeset
|
65 A a |
8b252e826c68
add: introduce a warning message for non-portable filenames (issue2756) (BC)
Adrian Buehlmann <adrian@cadifra.com>
parents:
12399
diff
changeset
|
66 A b |
8b252e826c68
add: introduce a warning message for non-portable filenames (issue2756) (BC)
Adrian Buehlmann <adrian@cadifra.com>
parents:
12399
diff
changeset
|
67 ? hello:world |
8b252e826c68
add: introduce a warning message for non-portable filenames (issue2756) (BC)
Adrian Buehlmann <adrian@cadifra.com>
parents:
12399
diff
changeset
|
68 $ hg --config ui.portablefilenames=ignore add |
8b252e826c68
add: introduce a warning message for non-portable filenames (issue2756) (BC)
Adrian Buehlmann <adrian@cadifra.com>
parents:
12399
diff
changeset
|
69 adding hello:world |
8b252e826c68
add: introduce a warning message for non-portable filenames (issue2756) (BC)
Adrian Buehlmann <adrian@cadifra.com>
parents:
12399
diff
changeset
|
70 $ hg st |
8b252e826c68
add: introduce a warning message for non-portable filenames (issue2756) (BC)
Adrian Buehlmann <adrian@cadifra.com>
parents:
12399
diff
changeset
|
71 A a |
8b252e826c68
add: introduce a warning message for non-portable filenames (issue2756) (BC)
Adrian Buehlmann <adrian@cadifra.com>
parents:
12399
diff
changeset
|
72 A b |
8b252e826c68
add: introduce a warning message for non-portable filenames (issue2756) (BC)
Adrian Buehlmann <adrian@cadifra.com>
parents:
12399
diff
changeset
|
73 A hello:world |
16875
ee9bd7ef0a0e
test-add: enable for Windows
Adrian Buehlmann <adrian@cadifra.com>
parents:
15524
diff
changeset
|
74 #endif |
13962
8b252e826c68
add: introduce a warning message for non-portable filenames (issue2756) (BC)
Adrian Buehlmann <adrian@cadifra.com>
parents:
12399
diff
changeset
|
75 |
11795
06793ad30575
tests: unify test-add
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9166
diff
changeset
|
76 $ hg ci -m 0 --traceback |
06793ad30575
tests: unify test-add
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9166
diff
changeset
|
77 |
06793ad30575
tests: unify test-add
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9166
diff
changeset
|
78 should fail |
06793ad30575
tests: unify test-add
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9166
diff
changeset
|
79 |
06793ad30575
tests: unify test-add
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9166
diff
changeset
|
80 $ hg add a |
06793ad30575
tests: unify test-add
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9166
diff
changeset
|
81 a already tracked! |
5207
212de429e000
make hg add of a removed file unremove the file
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff
changeset
|
82 |
11795
06793ad30575
tests: unify test-add
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9166
diff
changeset
|
83 $ echo aa > a |
06793ad30575
tests: unify test-add
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9166
diff
changeset
|
84 $ hg ci -m 1 |
06793ad30575
tests: unify test-add
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9166
diff
changeset
|
85 $ hg up 0 |
06793ad30575
tests: unify test-add
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9166
diff
changeset
|
86 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
06793ad30575
tests: unify test-add
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9166
diff
changeset
|
87 $ echo aaa > a |
06793ad30575
tests: unify test-add
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9166
diff
changeset
|
88 $ hg ci -m 2 |
06793ad30575
tests: unify test-add
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9166
diff
changeset
|
89 created new head |
5207
212de429e000
make hg add of a removed file unremove the file
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff
changeset
|
90 |
11795
06793ad30575
tests: unify test-add
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9166
diff
changeset
|
91 $ hg merge |
06793ad30575
tests: unify test-add
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9166
diff
changeset
|
92 merging a |
06793ad30575
tests: unify test-add
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9166
diff
changeset
|
93 warning: conflicts during merge. |
15501
2371f4aea665
merge: give a special message for internal:merge failure (issue3105)
Matt Mackall <mpm@selenic.com>
parents:
15444
diff
changeset
|
94 merging a incomplete! (edit conflicts, then use 'hg resolve --mark') |
11795
06793ad30575
tests: unify test-add
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9166
diff
changeset
|
95 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
12314
f2daa6ab514a
merge: suggest 'hg up -C .' for discarding changes, not 'hg up -C'
Brodie Rao <brodie@bitheap.org>
parents:
11795
diff
changeset
|
96 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
12316
4134686b83e1
tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents:
12314
diff
changeset
|
97 [1] |
11795
06793ad30575
tests: unify test-add
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9166
diff
changeset
|
98 $ hg st |
06793ad30575
tests: unify test-add
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9166
diff
changeset
|
99 M a |
06793ad30575
tests: unify test-add
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9166
diff
changeset
|
100 ? a.orig |
06793ad30575
tests: unify test-add
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9166
diff
changeset
|
101 |
06793ad30575
tests: unify test-add
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9166
diff
changeset
|
102 should fail |
5207
212de429e000
make hg add of a removed file unremove the file
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff
changeset
|
103 |
11795
06793ad30575
tests: unify test-add
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9166
diff
changeset
|
104 $ hg add a |
06793ad30575
tests: unify test-add
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9166
diff
changeset
|
105 a already tracked! |
06793ad30575
tests: unify test-add
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9166
diff
changeset
|
106 $ hg st |
06793ad30575
tests: unify test-add
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9166
diff
changeset
|
107 M a |
06793ad30575
tests: unify test-add
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9166
diff
changeset
|
108 ? a.orig |
06793ad30575
tests: unify test-add
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9166
diff
changeset
|
109 $ hg resolve -m a |
21947
b081decd9062
resolve: add parenthesis around "no more unresolved files" message
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21267
diff
changeset
|
110 (no more unresolved files) |
11795
06793ad30575
tests: unify test-add
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9166
diff
changeset
|
111 $ hg ci -m merge |
06793ad30575
tests: unify test-add
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9166
diff
changeset
|
112 |
12399
4fee1fd3de9a
tests: added a short description to issue numbers
Martin Geisler <mg@aragost.com>
parents:
12365
diff
changeset
|
113 Issue683: peculiarity with hg revert of an removed then added file |
5688
883d887c6408
commands: add exits(1) if a specified file cannot be added (issue 891)
Patrick Mezard <pmezard@gmail.com>
parents:
5207
diff
changeset
|
114 |
11795
06793ad30575
tests: unify test-add
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9166
diff
changeset
|
115 $ hg forget a |
06793ad30575
tests: unify test-add
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9166
diff
changeset
|
116 $ hg add a |
06793ad30575
tests: unify test-add
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9166
diff
changeset
|
117 $ hg st |
06793ad30575
tests: unify test-add
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9166
diff
changeset
|
118 ? a.orig |
06793ad30575
tests: unify test-add
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9166
diff
changeset
|
119 $ hg rm a |
06793ad30575
tests: unify test-add
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9166
diff
changeset
|
120 $ hg st |
06793ad30575
tests: unify test-add
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9166
diff
changeset
|
121 R a |
06793ad30575
tests: unify test-add
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9166
diff
changeset
|
122 ? a.orig |
06793ad30575
tests: unify test-add
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9166
diff
changeset
|
123 $ echo a > a |
06793ad30575
tests: unify test-add
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9166
diff
changeset
|
124 $ hg add a |
06793ad30575
tests: unify test-add
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9166
diff
changeset
|
125 $ hg st |
06793ad30575
tests: unify test-add
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9166
diff
changeset
|
126 M a |
06793ad30575
tests: unify test-add
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9166
diff
changeset
|
127 ? a.orig |
5688
883d887c6408
commands: add exits(1) if a specified file cannot be added (issue 891)
Patrick Mezard <pmezard@gmail.com>
parents:
5207
diff
changeset
|
128 |
11795
06793ad30575
tests: unify test-add
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9166
diff
changeset
|
129 $ hg add c && echo "unexpected addition of missing file" |
15521
117f9190c1ba
tests: hide 'No such file or directory' messages
Mads Kiilerich <mads@kiilerich.com>
parents:
15444
diff
changeset
|
130 c: * (glob) |
12316
4134686b83e1
tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents:
12314
diff
changeset
|
131 [1] |
11795
06793ad30575
tests: unify test-add
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9166
diff
changeset
|
132 $ echo c > c |
06793ad30575
tests: unify test-add
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9166
diff
changeset
|
133 $ hg add d c && echo "unexpected addition of missing file" |
15521
117f9190c1ba
tests: hide 'No such file or directory' messages
Mads Kiilerich <mads@kiilerich.com>
parents:
15444
diff
changeset
|
134 d: * (glob) |
12316
4134686b83e1
tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents:
12314
diff
changeset
|
135 [1] |
11795
06793ad30575
tests: unify test-add
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9166
diff
changeset
|
136 $ hg st |
06793ad30575
tests: unify test-add
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9166
diff
changeset
|
137 M a |
06793ad30575
tests: unify test-add
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9166
diff
changeset
|
138 A c |
06793ad30575
tests: unify test-add
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9166
diff
changeset
|
139 ? a.orig |
19987
ba6486076429
merge: move forgets to the beginning of the action list
Siddharth Agarwal <sid0@fb.com>
parents:
16974
diff
changeset
|
140 $ hg up -C |
ba6486076429
merge: move forgets to the beginning of the action list
Siddharth Agarwal <sid0@fb.com>
parents:
16974
diff
changeset
|
141 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
ba6486076429
merge: move forgets to the beginning of the action list
Siddharth Agarwal <sid0@fb.com>
parents:
16974
diff
changeset
|
142 |
ba6486076429
merge: move forgets to the beginning of the action list
Siddharth Agarwal <sid0@fb.com>
parents:
16974
diff
changeset
|
143 forget and get should have the right order: added but missing dir should be |
ba6486076429
merge: move forgets to the beginning of the action list
Siddharth Agarwal <sid0@fb.com>
parents:
16974
diff
changeset
|
144 forgotten before file with same name is added |
ba6486076429
merge: move forgets to the beginning of the action list
Siddharth Agarwal <sid0@fb.com>
parents:
16974
diff
changeset
|
145 |
ba6486076429
merge: move forgets to the beginning of the action list
Siddharth Agarwal <sid0@fb.com>
parents:
16974
diff
changeset
|
146 $ echo file d > d |
ba6486076429
merge: move forgets to the beginning of the action list
Siddharth Agarwal <sid0@fb.com>
parents:
16974
diff
changeset
|
147 $ hg add d |
ba6486076429
merge: move forgets to the beginning of the action list
Siddharth Agarwal <sid0@fb.com>
parents:
16974
diff
changeset
|
148 $ hg ci -md |
ba6486076429
merge: move forgets to the beginning of the action list
Siddharth Agarwal <sid0@fb.com>
parents:
16974
diff
changeset
|
149 $ hg rm d |
ba6486076429
merge: move forgets to the beginning of the action list
Siddharth Agarwal <sid0@fb.com>
parents:
16974
diff
changeset
|
150 $ mkdir d |
ba6486076429
merge: move forgets to the beginning of the action list
Siddharth Agarwal <sid0@fb.com>
parents:
16974
diff
changeset
|
151 $ echo a > d/a |
ba6486076429
merge: move forgets to the beginning of the action list
Siddharth Agarwal <sid0@fb.com>
parents:
16974
diff
changeset
|
152 $ hg add d/a |
ba6486076429
merge: move forgets to the beginning of the action list
Siddharth Agarwal <sid0@fb.com>
parents:
16974
diff
changeset
|
153 $ rm -r d |
ba6486076429
merge: move forgets to the beginning of the action list
Siddharth Agarwal <sid0@fb.com>
parents:
16974
diff
changeset
|
154 $ hg up -C |
ba6486076429
merge: move forgets to the beginning of the action list
Siddharth Agarwal <sid0@fb.com>
parents:
16974
diff
changeset
|
155 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
ba6486076429
merge: move forgets to the beginning of the action list
Siddharth Agarwal <sid0@fb.com>
parents:
16974
diff
changeset
|
156 $ cat d |
ba6486076429
merge: move forgets to the beginning of the action list
Siddharth Agarwal <sid0@fb.com>
parents:
16974
diff
changeset
|
157 file d |
11795
06793ad30575
tests: unify test-add
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9166
diff
changeset
|
158 |
16913
f2719b387380
tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents:
16875
diff
changeset
|
159 $ cd .. |