Mercurial > hg
annotate tests/test-remove.t @ 41710:4028897dfa05
url: always use str for proxy configuration
Previously, proxies didn't work on Python 3 for various reasons.
First, the keys to the "proxies" dict are fed into a
`setattr(self, "%s_open", ...)` call and passing bytestrings
results in setting an oddly named attribute due to the b''
in %s formatting. This resulted in "http_open" and "https_open"
not being properly overridden and proxies not being used.
Second, the standard library was expecting proxy URLs to be
str. And various operations (including our custom code in
url.py) would fail to account for the str/bytes mismatch.
This commit normalizes everything to str and adjusts our
proxy code in url.py to account for the presence of str
on Python 3.
Differential Revision: https://phab.mercurial-scm.org/D5952
author | Gregory Szorc <gregory.szorc@gmail.com> |
---|---|
date | Fri, 15 Feb 2019 13:16:07 -0800 |
parents | 824b687ff6af |
children |
rev | line source |
---|---|
12099
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
1 $ remove() { |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
2 > hg rm $@ |
19381
e033a7d444ac
tests: do not skip code-checking on some whole files
Simon Heimberg <simohe@besonet.ch>
parents:
18053
diff
changeset
|
3 > echo "exit code: $?" |
12099
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
4 > hg st |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
5 > # do not use ls -R, which recurses in .hg subdirs on Mac OS X 10.5 |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
6 > find . -name .hg -prune -o -type f -print | sort |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
7 > hg up -C |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
8 > } |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
9 |
28606
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
19381
diff
changeset
|
10 $ cat >> $HGRCPATH <<EOF |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
19381
diff
changeset
|
11 > [progress] |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
19381
diff
changeset
|
12 > disable=False |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
19381
diff
changeset
|
13 > assume-tty = 1 |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
19381
diff
changeset
|
14 > delay = 0 |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
19381
diff
changeset
|
15 > # set changedelay really large so we don't see nested topics |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
19381
diff
changeset
|
16 > changedelay = 30000 |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
19381
diff
changeset
|
17 > format = topic bar number |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
19381
diff
changeset
|
18 > refresh = 0 |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
19381
diff
changeset
|
19 > width = 60 |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
19381
diff
changeset
|
20 > EOF |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
19381
diff
changeset
|
21 |
12099
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
22 $ hg init a |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
23 $ cd a |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
24 $ echo a > foo |
936 | 25 |
12099
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
26 file not managed |
6346
8e3b651382f5
improved semantics for remove (issue438)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
4394
diff
changeset
|
27 |
12099
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
28 $ remove foo |
28608
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
29 \r (no-eol) (esc) |
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
30 deleting [===========================================>] 1/1\r (no-eol) (esc) |
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
31 \r (no-eol) (esc) |
12099
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
32 not removing foo: file is untracked |
12130 | 33 exit code: 1 |
12099
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
34 ? foo |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
35 ./foo |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
36 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
37 |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
38 $ hg add foo |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
39 $ hg commit -m1 |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
40 |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
41 the table cases |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
42 00 state added, options none |
6346
8e3b651382f5
improved semantics for remove (issue438)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
4394
diff
changeset
|
43 |
12099
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
44 $ echo b > bar |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
45 $ hg add bar |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
46 $ remove bar |
28608
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
47 \r (no-eol) (esc) |
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
48 deleting [===========================================>] 1/1\r (no-eol) (esc) |
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
49 \r (no-eol) (esc) |
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
50 \r (no-eol) (esc) |
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
51 skipping [===========================================>] 1/1\r (no-eol) (esc) |
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
52 \r (no-eol) (esc) |
29963
e824de573112
remove: specify hg in added warning
timeless <timeless@mozdev.org>
parents:
29089
diff
changeset
|
53 not removing bar: file has been marked for add (use 'hg forget' to undo add) |
12130 | 54 exit code: 1 |
12099
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
55 A bar |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
56 ./bar |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
57 ./foo |
28606
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
19381
diff
changeset
|
58 \r (no-eol) (esc) |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
19381
diff
changeset
|
59 updating [===========================================>] 1/1\r (no-eol) (esc) |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
19381
diff
changeset
|
60 \r (no-eol) (esc) |
12099
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
61 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
6346
8e3b651382f5
improved semantics for remove (issue438)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
4394
diff
changeset
|
62 |
12099
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
63 01 state clean, options none |
6346
8e3b651382f5
improved semantics for remove (issue438)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
4394
diff
changeset
|
64 |
12099
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
65 $ remove foo |
28608
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
66 \r (no-eol) (esc) |
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
67 deleting [===========================================>] 1/1\r (no-eol) (esc) |
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
68 \r (no-eol) (esc) |
12130 | 69 exit code: 0 |
12099
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
70 R foo |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
71 ? bar |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
72 ./bar |
28606
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
19381
diff
changeset
|
73 \r (no-eol) (esc) |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
19381
diff
changeset
|
74 updating [===========================================>] 1/1\r (no-eol) (esc) |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
19381
diff
changeset
|
75 \r (no-eol) (esc) |
12099
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
76 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
77 |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
78 02 state modified, options none |
6346
8e3b651382f5
improved semantics for remove (issue438)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
4394
diff
changeset
|
79 |
12099
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
80 $ echo b >> foo |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
81 $ remove foo |
28608
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
82 \r (no-eol) (esc) |
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
83 deleting [===========================================>] 1/1\r (no-eol) (esc) |
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
84 \r (no-eol) (esc) |
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
85 \r (no-eol) (esc) |
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
86 skipping [===========================================>] 1/1\r (no-eol) (esc) |
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
87 \r (no-eol) (esc) |
12099
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
88 not removing foo: file is modified (use -f to force removal) |
12130 | 89 exit code: 1 |
12099
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
90 M foo |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
91 ? bar |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
92 ./bar |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
93 ./foo |
28606
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
19381
diff
changeset
|
94 \r (no-eol) (esc) |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
19381
diff
changeset
|
95 updating [===========================================>] 1/1\r (no-eol) (esc) |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
19381
diff
changeset
|
96 \r (no-eol) (esc) |
12099
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
97 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
98 |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
99 03 state missing, options none |
6346
8e3b651382f5
improved semantics for remove (issue438)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
4394
diff
changeset
|
100 |
12099
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
101 $ rm foo |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
102 $ remove foo |
28608
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
103 \r (no-eol) (esc) |
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
104 deleting [===========================================>] 1/1\r (no-eol) (esc) |
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
105 \r (no-eol) (esc) |
12130 | 106 exit code: 0 |
12099
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
107 R foo |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
108 ? bar |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
109 ./bar |
28606
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
19381
diff
changeset
|
110 \r (no-eol) (esc) |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
19381
diff
changeset
|
111 updating [===========================================>] 1/1\r (no-eol) (esc) |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
19381
diff
changeset
|
112 \r (no-eol) (esc) |
12099
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
113 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
114 |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
115 10 state added, options -f |
6346
8e3b651382f5
improved semantics for remove (issue438)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
4394
diff
changeset
|
116 |
12099
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
117 $ echo b > bar |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
118 $ hg add bar |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
119 $ remove -f bar |
28608
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
120 \r (no-eol) (esc) |
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
121 deleting [===========================================>] 1/1\r (no-eol) (esc) |
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
122 \r (no-eol) (esc) |
12130 | 123 exit code: 0 |
12099
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
124 ? bar |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
125 ./bar |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
126 ./foo |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
127 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
128 $ rm bar |
6346
8e3b651382f5
improved semantics for remove (issue438)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
4394
diff
changeset
|
129 |
12099
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
130 11 state clean, options -f |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
131 |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
132 $ remove -f foo |
28608
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
133 \r (no-eol) (esc) |
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
134 deleting [===========================================>] 1/1\r (no-eol) (esc) |
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
135 \r (no-eol) (esc) |
12130 | 136 exit code: 0 |
12099
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
137 R foo |
28606
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
19381
diff
changeset
|
138 \r (no-eol) (esc) |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
19381
diff
changeset
|
139 updating [===========================================>] 1/1\r (no-eol) (esc) |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
19381
diff
changeset
|
140 \r (no-eol) (esc) |
12099
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
141 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
142 |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
143 12 state modified, options -f |
6346
8e3b651382f5
improved semantics for remove (issue438)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
4394
diff
changeset
|
144 |
12099
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
145 $ echo b >> foo |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
146 $ remove -f foo |
28608
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
147 \r (no-eol) (esc) |
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
148 deleting [===========================================>] 1/1\r (no-eol) (esc) |
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
149 \r (no-eol) (esc) |
12130 | 150 exit code: 0 |
12099
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
151 R foo |
28606
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
19381
diff
changeset
|
152 \r (no-eol) (esc) |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
19381
diff
changeset
|
153 updating [===========================================>] 1/1\r (no-eol) (esc) |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
19381
diff
changeset
|
154 \r (no-eol) (esc) |
12099
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
155 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
156 |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
157 13 state missing, options -f |
6346
8e3b651382f5
improved semantics for remove (issue438)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
4394
diff
changeset
|
158 |
12099
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
159 $ rm foo |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
160 $ remove -f foo |
28608
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
161 \r (no-eol) (esc) |
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
162 deleting [===========================================>] 1/1\r (no-eol) (esc) |
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
163 \r (no-eol) (esc) |
12130 | 164 exit code: 0 |
12099
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
165 R foo |
28606
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
19381
diff
changeset
|
166 \r (no-eol) (esc) |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
19381
diff
changeset
|
167 updating [===========================================>] 1/1\r (no-eol) (esc) |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
19381
diff
changeset
|
168 \r (no-eol) (esc) |
12099
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
169 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
170 |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
171 20 state added, options -A |
6346
8e3b651382f5
improved semantics for remove (issue438)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
4394
diff
changeset
|
172 |
12099
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
173 $ echo b > bar |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
174 $ hg add bar |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
175 $ remove -A bar |
28608
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
176 \r (no-eol) (esc) |
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
177 deleting [===========================================>] 1/1\r (no-eol) (esc) |
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
178 \r (no-eol) (esc) |
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
179 \r (no-eol) (esc) |
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
180 skipping [===========================================>] 1/1\r (no-eol) (esc) |
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
181 \r (no-eol) (esc) |
18053
0c2f0048125d
rm: drop misleading 'use -f' hint for the rm --after 'not removing' warning
Mads Kiilerich <madski@unity3d.com>
parents:
17862
diff
changeset
|
182 not removing bar: file still exists |
12130 | 183 exit code: 1 |
12099
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
184 A bar |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
185 ./bar |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
186 ./foo |
28606
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
19381
diff
changeset
|
187 \r (no-eol) (esc) |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
19381
diff
changeset
|
188 updating [===========================================>] 1/1\r (no-eol) (esc) |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
19381
diff
changeset
|
189 \r (no-eol) (esc) |
12099
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
190 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
6346
8e3b651382f5
improved semantics for remove (issue438)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
4394
diff
changeset
|
191 |
35123
7a58608281dd
remove: print message for each file in verbose mode only while using `-A` (BC)
pavanpc@fb.com
parents:
29963
diff
changeset
|
192 21 state clean, options -Av |
12099
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
193 |
35123
7a58608281dd
remove: print message for each file in verbose mode only while using `-A` (BC)
pavanpc@fb.com
parents:
29963
diff
changeset
|
194 $ remove -Av foo |
28608
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
195 \r (no-eol) (esc) |
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
196 deleting [===========================================>] 1/1\r (no-eol) (esc) |
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
197 \r (no-eol) (esc) |
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
198 \r (no-eol) (esc) |
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
199 skipping [===========================================>] 1/1\r (no-eol) (esc) |
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
200 \r (no-eol) (esc) |
18053
0c2f0048125d
rm: drop misleading 'use -f' hint for the rm --after 'not removing' warning
Mads Kiilerich <madski@unity3d.com>
parents:
17862
diff
changeset
|
201 not removing foo: file still exists |
12130 | 202 exit code: 1 |
12099
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
203 ? bar |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
204 ./bar |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
205 ./foo |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
206 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
207 |
35123
7a58608281dd
remove: print message for each file in verbose mode only while using `-A` (BC)
pavanpc@fb.com
parents:
29963
diff
changeset
|
208 22 state modified, options -Av |
936 | 209 |
12099
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
210 $ echo b >> foo |
35123
7a58608281dd
remove: print message for each file in verbose mode only while using `-A` (BC)
pavanpc@fb.com
parents:
29963
diff
changeset
|
211 $ remove -Av foo |
28608
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
212 \r (no-eol) (esc) |
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
213 deleting [===========================================>] 1/1\r (no-eol) (esc) |
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
214 \r (no-eol) (esc) |
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
215 \r (no-eol) (esc) |
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
216 skipping [===========================================>] 1/1\r (no-eol) (esc) |
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
217 \r (no-eol) (esc) |
18053
0c2f0048125d
rm: drop misleading 'use -f' hint for the rm --after 'not removing' warning
Mads Kiilerich <madski@unity3d.com>
parents:
17862
diff
changeset
|
218 not removing foo: file still exists |
12130 | 219 exit code: 1 |
12099
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
220 M foo |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
221 ? bar |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
222 ./bar |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
223 ./foo |
28606
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
19381
diff
changeset
|
224 \r (no-eol) (esc) |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
19381
diff
changeset
|
225 updating [===========================================>] 1/1\r (no-eol) (esc) |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
19381
diff
changeset
|
226 \r (no-eol) (esc) |
12099
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
227 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
6346
8e3b651382f5
improved semantics for remove (issue438)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
4394
diff
changeset
|
228 |
12099
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
229 23 state missing, options -A |
6346
8e3b651382f5
improved semantics for remove (issue438)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
4394
diff
changeset
|
230 |
12099
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
231 $ rm foo |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
232 $ remove -A foo |
28608
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
233 \r (no-eol) (esc) |
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
234 deleting [===========================================>] 1/1\r (no-eol) (esc) |
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
235 \r (no-eol) (esc) |
12130 | 236 exit code: 0 |
12099
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
237 R foo |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
238 ? bar |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
239 ./bar |
28606
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
19381
diff
changeset
|
240 \r (no-eol) (esc) |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
19381
diff
changeset
|
241 updating [===========================================>] 1/1\r (no-eol) (esc) |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
19381
diff
changeset
|
242 \r (no-eol) (esc) |
12099
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
243 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
244 |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
245 30 state added, options -Af |
6346
8e3b651382f5
improved semantics for remove (issue438)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
4394
diff
changeset
|
246 |
12099
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
247 $ echo b > bar |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
248 $ hg add bar |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
249 $ remove -Af bar |
28608
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
250 \r (no-eol) (esc) |
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
251 deleting [===========================================>] 1/1\r (no-eol) (esc) |
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
252 \r (no-eol) (esc) |
12130 | 253 exit code: 0 |
12099
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
254 ? bar |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
255 ./bar |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
256 ./foo |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
257 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
258 $ rm bar |
6346
8e3b651382f5
improved semantics for remove (issue438)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
4394
diff
changeset
|
259 |
12099
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
260 31 state clean, options -Af |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
261 |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
262 $ remove -Af foo |
28608
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
263 \r (no-eol) (esc) |
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
264 deleting [===========================================>] 1/1\r (no-eol) (esc) |
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
265 \r (no-eol) (esc) |
12130 | 266 exit code: 0 |
12099
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
267 R foo |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
268 ./foo |
28606
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
19381
diff
changeset
|
269 \r (no-eol) (esc) |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
19381
diff
changeset
|
270 updating [===========================================>] 1/1\r (no-eol) (esc) |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
19381
diff
changeset
|
271 \r (no-eol) (esc) |
12099
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
272 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
6346
8e3b651382f5
improved semantics for remove (issue438)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
4394
diff
changeset
|
273 |
12099
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
274 32 state modified, options -Af |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
275 |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
276 $ echo b >> foo |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
277 $ remove -Af foo |
28608
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
278 \r (no-eol) (esc) |
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
279 deleting [===========================================>] 1/1\r (no-eol) (esc) |
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
280 \r (no-eol) (esc) |
12130 | 281 exit code: 0 |
12099
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
282 R foo |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
283 ./foo |
28606
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
19381
diff
changeset
|
284 \r (no-eol) (esc) |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
19381
diff
changeset
|
285 updating [===========================================>] 1/1\r (no-eol) (esc) |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
19381
diff
changeset
|
286 \r (no-eol) (esc) |
12099
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
287 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
2309
b2f37c7026ca
remove: rewrite to be ~400x faster, bit more friendly
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2180
diff
changeset
|
288 |
12099
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
289 33 state missing, options -Af |
6346
8e3b651382f5
improved semantics for remove (issue438)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
4394
diff
changeset
|
290 |
12099
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
291 $ rm foo |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
292 $ remove -Af foo |
28608
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
293 \r (no-eol) (esc) |
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
294 deleting [===========================================>] 1/1\r (no-eol) (esc) |
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
295 \r (no-eol) (esc) |
12130 | 296 exit code: 0 |
12099
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
297 R foo |
28606
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
19381
diff
changeset
|
298 \r (no-eol) (esc) |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
19381
diff
changeset
|
299 updating [===========================================>] 1/1\r (no-eol) (esc) |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
19381
diff
changeset
|
300 \r (no-eol) (esc) |
12099
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
301 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
302 |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
303 test some directory stuff |
6346
8e3b651382f5
improved semantics for remove (issue438)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
4394
diff
changeset
|
304 |
12099
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
305 $ mkdir test |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
306 $ echo a > test/foo |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
307 $ echo b > test/bar |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
308 $ hg ci -Am2 |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
309 adding test/bar |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
310 adding test/foo |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
311 |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
312 dir, options none |
6346
8e3b651382f5
improved semantics for remove (issue438)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
4394
diff
changeset
|
313 |
12099
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
314 $ rm test/bar |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
315 $ remove test |
28608
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
316 \r (no-eol) (esc) |
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
317 deleting [===========================================>] 1/1\r (no-eol) (esc) |
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
318 \r (no-eol) (esc) |
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
319 \r (no-eol) (esc) |
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
320 deleting [=====================> ] 1/2\r (no-eol) (esc) |
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
321 \r (no-eol) (esc) |
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
322 \r (no-eol) (esc) |
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
323 deleting [===========================================>] 2/2\r (no-eol) (esc) |
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
324 \r (no-eol) (esc) |
35393
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
35123
diff
changeset
|
325 removing test/bar |
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
35123
diff
changeset
|
326 removing test/foo |
12130 | 327 exit code: 0 |
12099
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
328 R test/bar |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
329 R test/foo |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
330 ./foo |
28606
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
19381
diff
changeset
|
331 \r (no-eol) (esc) |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
19381
diff
changeset
|
332 updating [===========================================>] 2/2\r (no-eol) (esc) |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
19381
diff
changeset
|
333 \r (no-eol) (esc) |
12099
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
334 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
335 |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
336 dir, options -f |
6346
8e3b651382f5
improved semantics for remove (issue438)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
4394
diff
changeset
|
337 |
12099
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
338 $ rm test/bar |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
339 $ remove -f test |
28608
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
340 \r (no-eol) (esc) |
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
341 deleting [===========================================>] 1/1\r (no-eol) (esc) |
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
342 \r (no-eol) (esc) |
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
343 \r (no-eol) (esc) |
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
344 deleting [=====================> ] 1/2\r (no-eol) (esc) |
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
345 \r (no-eol) (esc) |
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
346 \r (no-eol) (esc) |
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
347 deleting [===========================================>] 2/2\r (no-eol) (esc) |
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
348 \r (no-eol) (esc) |
35393
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
35123
diff
changeset
|
349 removing test/bar |
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
35123
diff
changeset
|
350 removing test/foo |
12130 | 351 exit code: 0 |
12099
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
352 R test/bar |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
353 R test/foo |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
354 ./foo |
28606
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
19381
diff
changeset
|
355 \r (no-eol) (esc) |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
19381
diff
changeset
|
356 updating [===========================================>] 2/2\r (no-eol) (esc) |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
19381
diff
changeset
|
357 \r (no-eol) (esc) |
12099
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
358 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
359 |
35123
7a58608281dd
remove: print message for each file in verbose mode only while using `-A` (BC)
pavanpc@fb.com
parents:
29963
diff
changeset
|
360 dir, options -Av |
6346
8e3b651382f5
improved semantics for remove (issue438)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
4394
diff
changeset
|
361 |
12099
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
362 $ rm test/bar |
35123
7a58608281dd
remove: print message for each file in verbose mode only while using `-A` (BC)
pavanpc@fb.com
parents:
29963
diff
changeset
|
363 $ remove -Av test |
7a58608281dd
remove: print message for each file in verbose mode only while using `-A` (BC)
pavanpc@fb.com
parents:
29963
diff
changeset
|
364 \r (no-eol) (esc) |
7a58608281dd
remove: print message for each file in verbose mode only while using `-A` (BC)
pavanpc@fb.com
parents:
29963
diff
changeset
|
365 deleting [===========================================>] 1/1\r (no-eol) (esc) |
7a58608281dd
remove: print message for each file in verbose mode only while using `-A` (BC)
pavanpc@fb.com
parents:
29963
diff
changeset
|
366 \r (no-eol) (esc) |
7a58608281dd
remove: print message for each file in verbose mode only while using `-A` (BC)
pavanpc@fb.com
parents:
29963
diff
changeset
|
367 \r (no-eol) (esc) |
7a58608281dd
remove: print message for each file in verbose mode only while using `-A` (BC)
pavanpc@fb.com
parents:
29963
diff
changeset
|
368 skipping [===========================================>] 1/1\r (no-eol) (esc) |
7a58608281dd
remove: print message for each file in verbose mode only while using `-A` (BC)
pavanpc@fb.com
parents:
29963
diff
changeset
|
369 \r (no-eol) (esc) |
7a58608281dd
remove: print message for each file in verbose mode only while using `-A` (BC)
pavanpc@fb.com
parents:
29963
diff
changeset
|
370 \r (no-eol) (esc) |
7a58608281dd
remove: print message for each file in verbose mode only while using `-A` (BC)
pavanpc@fb.com
parents:
29963
diff
changeset
|
371 deleting [===========================================>] 1/1\r (no-eol) (esc) |
7a58608281dd
remove: print message for each file in verbose mode only while using `-A` (BC)
pavanpc@fb.com
parents:
29963
diff
changeset
|
372 \r (no-eol) (esc) |
35393
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
35123
diff
changeset
|
373 removing test/bar |
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
35123
diff
changeset
|
374 not removing test/foo: file still exists |
35123
7a58608281dd
remove: print message for each file in verbose mode only while using `-A` (BC)
pavanpc@fb.com
parents:
29963
diff
changeset
|
375 exit code: 1 |
7a58608281dd
remove: print message for each file in verbose mode only while using `-A` (BC)
pavanpc@fb.com
parents:
29963
diff
changeset
|
376 R test/bar |
7a58608281dd
remove: print message for each file in verbose mode only while using `-A` (BC)
pavanpc@fb.com
parents:
29963
diff
changeset
|
377 ./foo |
7a58608281dd
remove: print message for each file in verbose mode only while using `-A` (BC)
pavanpc@fb.com
parents:
29963
diff
changeset
|
378 ./test/foo |
7a58608281dd
remove: print message for each file in verbose mode only while using `-A` (BC)
pavanpc@fb.com
parents:
29963
diff
changeset
|
379 \r (no-eol) (esc) |
7a58608281dd
remove: print message for each file in verbose mode only while using `-A` (BC)
pavanpc@fb.com
parents:
29963
diff
changeset
|
380 updating [===========================================>] 1/1\r (no-eol) (esc) |
7a58608281dd
remove: print message for each file in verbose mode only while using `-A` (BC)
pavanpc@fb.com
parents:
29963
diff
changeset
|
381 \r (no-eol) (esc) |
7a58608281dd
remove: print message for each file in verbose mode only while using `-A` (BC)
pavanpc@fb.com
parents:
29963
diff
changeset
|
382 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
7a58608281dd
remove: print message for each file in verbose mode only while using `-A` (BC)
pavanpc@fb.com
parents:
29963
diff
changeset
|
383 |
7a58608281dd
remove: print message for each file in verbose mode only while using `-A` (BC)
pavanpc@fb.com
parents:
29963
diff
changeset
|
384 dir, options -A <dir> |
7a58608281dd
remove: print message for each file in verbose mode only while using `-A` (BC)
pavanpc@fb.com
parents:
29963
diff
changeset
|
385 $ rm test/bar |
12099
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
386 $ remove -A test |
28608
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
387 \r (no-eol) (esc) |
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
388 deleting [===========================================>] 1/1\r (no-eol) (esc) |
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
389 \r (no-eol) (esc) |
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
390 \r (no-eol) (esc) |
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
391 skipping [===========================================>] 1/1\r (no-eol) (esc) |
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
392 \r (no-eol) (esc) |
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
393 \r (no-eol) (esc) |
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
394 deleting [===========================================>] 1/1\r (no-eol) (esc) |
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
395 \r (no-eol) (esc) |
35393
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
35123
diff
changeset
|
396 removing test/bar |
35123
7a58608281dd
remove: print message for each file in verbose mode only while using `-A` (BC)
pavanpc@fb.com
parents:
29963
diff
changeset
|
397 exit code: 1 |
7a58608281dd
remove: print message for each file in verbose mode only while using `-A` (BC)
pavanpc@fb.com
parents:
29963
diff
changeset
|
398 R test/bar |
7a58608281dd
remove: print message for each file in verbose mode only while using `-A` (BC)
pavanpc@fb.com
parents:
29963
diff
changeset
|
399 ./foo |
7a58608281dd
remove: print message for each file in verbose mode only while using `-A` (BC)
pavanpc@fb.com
parents:
29963
diff
changeset
|
400 ./test/foo |
7a58608281dd
remove: print message for each file in verbose mode only while using `-A` (BC)
pavanpc@fb.com
parents:
29963
diff
changeset
|
401 \r (no-eol) (esc) |
7a58608281dd
remove: print message for each file in verbose mode only while using `-A` (BC)
pavanpc@fb.com
parents:
29963
diff
changeset
|
402 updating [===========================================>] 1/1\r (no-eol) (esc) |
7a58608281dd
remove: print message for each file in verbose mode only while using `-A` (BC)
pavanpc@fb.com
parents:
29963
diff
changeset
|
403 \r (no-eol) (esc) |
7a58608281dd
remove: print message for each file in verbose mode only while using `-A` (BC)
pavanpc@fb.com
parents:
29963
diff
changeset
|
404 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
7a58608281dd
remove: print message for each file in verbose mode only while using `-A` (BC)
pavanpc@fb.com
parents:
29963
diff
changeset
|
405 |
7a58608281dd
remove: print message for each file in verbose mode only while using `-A` (BC)
pavanpc@fb.com
parents:
29963
diff
changeset
|
406 without any files/dirs, options -A |
7a58608281dd
remove: print message for each file in verbose mode only while using `-A` (BC)
pavanpc@fb.com
parents:
29963
diff
changeset
|
407 $ rm test/bar |
7a58608281dd
remove: print message for each file in verbose mode only while using `-A` (BC)
pavanpc@fb.com
parents:
29963
diff
changeset
|
408 $ remove -A |
7a58608281dd
remove: print message for each file in verbose mode only while using `-A` (BC)
pavanpc@fb.com
parents:
29963
diff
changeset
|
409 \r (no-eol) (esc) |
7a58608281dd
remove: print message for each file in verbose mode only while using `-A` (BC)
pavanpc@fb.com
parents:
29963
diff
changeset
|
410 skipping [=====================> ] 1/2\r (no-eol) (esc) |
7a58608281dd
remove: print message for each file in verbose mode only while using `-A` (BC)
pavanpc@fb.com
parents:
29963
diff
changeset
|
411 skipping [===========================================>] 2/2\r (no-eol) (esc) |
7a58608281dd
remove: print message for each file in verbose mode only while using `-A` (BC)
pavanpc@fb.com
parents:
29963
diff
changeset
|
412 \r (no-eol) (esc) |
7a58608281dd
remove: print message for each file in verbose mode only while using `-A` (BC)
pavanpc@fb.com
parents:
29963
diff
changeset
|
413 \r (no-eol) (esc) |
7a58608281dd
remove: print message for each file in verbose mode only while using `-A` (BC)
pavanpc@fb.com
parents:
29963
diff
changeset
|
414 deleting [===========================================>] 1/1\r (no-eol) (esc) |
7a58608281dd
remove: print message for each file in verbose mode only while using `-A` (BC)
pavanpc@fb.com
parents:
29963
diff
changeset
|
415 \r (no-eol) (esc) |
35393
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
35123
diff
changeset
|
416 removing test/bar |
12130 | 417 exit code: 1 |
12099
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
418 R test/bar |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
419 ./foo |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
420 ./test/foo |
28606
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
19381
diff
changeset
|
421 \r (no-eol) (esc) |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
19381
diff
changeset
|
422 updating [===========================================>] 1/1\r (no-eol) (esc) |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
19381
diff
changeset
|
423 \r (no-eol) (esc) |
12099
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
424 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
6346
8e3b651382f5
improved semantics for remove (issue438)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
4394
diff
changeset
|
425 |
12099
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
426 dir, options -Af |
9572
1f665246dab3
windows: fix unlink() not dropping empty tree (issue1861)
Patrick Mezard <pmezard@gmail.com>
parents:
6358
diff
changeset
|
427 |
12099
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
428 $ rm test/bar |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
429 $ remove -Af test |
28608
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
430 \r (no-eol) (esc) |
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
431 deleting [===========================================>] 1/1\r (no-eol) (esc) |
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
432 \r (no-eol) (esc) |
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
433 \r (no-eol) (esc) |
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
434 deleting [=====================> ] 1/2\r (no-eol) (esc) |
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
435 \r (no-eol) (esc) |
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
436 \r (no-eol) (esc) |
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
437 deleting [===========================================>] 2/2\r (no-eol) (esc) |
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
438 \r (no-eol) (esc) |
35393
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
35123
diff
changeset
|
439 removing test/bar |
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
35123
diff
changeset
|
440 removing test/foo |
12130 | 441 exit code: 0 |
12099
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
442 R test/bar |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
443 R test/foo |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
444 ./foo |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
445 ./test/foo |
28606
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
19381
diff
changeset
|
446 \r (no-eol) (esc) |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
19381
diff
changeset
|
447 updating [===========================================>] 2/2\r (no-eol) (esc) |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
19381
diff
changeset
|
448 \r (no-eol) (esc) |
12099
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
449 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
450 |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
451 test remove dropping empty trees (issue1861) |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
452 |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
453 $ mkdir -p issue1861/b/c |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
454 $ echo x > issue1861/x |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
455 $ echo y > issue1861/b/c/y |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
456 $ hg ci -Am add |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
457 adding issue1861/b/c/y |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
458 adding issue1861/x |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
459 $ hg rm issue1861/b |
28608
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
460 \r (no-eol) (esc) |
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
461 deleting [===========================================>] 1/1\r (no-eol) (esc) |
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
462 \r (no-eol) (esc) |
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
463 \r (no-eol) (esc) |
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
464 deleting [===========================================>] 1/1\r (no-eol) (esc) |
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
465 \r (no-eol) (esc) |
35393
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
35123
diff
changeset
|
466 removing issue1861/b/c/y |
12099
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
467 $ hg ci -m remove |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
468 $ ls issue1861 |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
469 x |
16904
9d0f988364bd
test-remove-new: integrate into test-remove.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
15447
diff
changeset
|
470 |
9d0f988364bd
test-remove-new: integrate into test-remove.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
15447
diff
changeset
|
471 test that commit does not crash if the user removes a newly added file |
9d0f988364bd
test-remove-new: integrate into test-remove.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
15447
diff
changeset
|
472 |
9d0f988364bd
test-remove-new: integrate into test-remove.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
15447
diff
changeset
|
473 $ touch f1 |
9d0f988364bd
test-remove-new: integrate into test-remove.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
15447
diff
changeset
|
474 $ hg add f1 |
9d0f988364bd
test-remove-new: integrate into test-remove.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
15447
diff
changeset
|
475 $ rm f1 |
9d0f988364bd
test-remove-new: integrate into test-remove.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
15447
diff
changeset
|
476 $ hg ci -A -mx |
9d0f988364bd
test-remove-new: integrate into test-remove.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
15447
diff
changeset
|
477 removing f1 |
9d0f988364bd
test-remove-new: integrate into test-remove.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
15447
diff
changeset
|
478 nothing changed |
9d0f988364bd
test-remove-new: integrate into test-remove.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
15447
diff
changeset
|
479 [1] |
16913
f2719b387380
tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents:
16904
diff
changeset
|
480 |
17848
66f0c78350ab
remove: don't return error on directories with tracked files
Matt Mackall <mpm@selenic.com>
parents:
16913
diff
changeset
|
481 handling of untracked directories and missing files |
66f0c78350ab
remove: don't return error on directories with tracked files
Matt Mackall <mpm@selenic.com>
parents:
16913
diff
changeset
|
482 |
66f0c78350ab
remove: don't return error on directories with tracked files
Matt Mackall <mpm@selenic.com>
parents:
16913
diff
changeset
|
483 $ mkdir d1 |
66f0c78350ab
remove: don't return error on directories with tracked files
Matt Mackall <mpm@selenic.com>
parents:
16913
diff
changeset
|
484 $ echo a > d1/a |
66f0c78350ab
remove: don't return error on directories with tracked files
Matt Mackall <mpm@selenic.com>
parents:
16913
diff
changeset
|
485 $ hg rm --after d1 |
28608
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
486 \r (no-eol) (esc) |
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
487 deleting [===========================================>] 1/1\r (no-eol) (esc) |
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
488 \r (no-eol) (esc) |
17848
66f0c78350ab
remove: don't return error on directories with tracked files
Matt Mackall <mpm@selenic.com>
parents:
16913
diff
changeset
|
489 not removing d1: no tracked files |
66f0c78350ab
remove: don't return error on directories with tracked files
Matt Mackall <mpm@selenic.com>
parents:
16913
diff
changeset
|
490 [1] |
66f0c78350ab
remove: don't return error on directories with tracked files
Matt Mackall <mpm@selenic.com>
parents:
16913
diff
changeset
|
491 $ hg add d1/a |
66f0c78350ab
remove: don't return error on directories with tracked files
Matt Mackall <mpm@selenic.com>
parents:
16913
diff
changeset
|
492 $ rm d1/a |
66f0c78350ab
remove: don't return error on directories with tracked files
Matt Mackall <mpm@selenic.com>
parents:
16913
diff
changeset
|
493 $ hg rm --after d1 |
28608
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
494 \r (no-eol) (esc) |
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
495 deleting [===========================================>] 1/1\r (no-eol) (esc) |
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
496 \r (no-eol) (esc) |
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
497 \r (no-eol) (esc) |
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
498 deleting [===========================================>] 1/1\r (no-eol) (esc) |
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
499 \r (no-eol) (esc) |
35393
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
35123
diff
changeset
|
500 removing d1/a |
28889
7a1e0711401e
test-remove: drop a useless Windows specific conditional
Matt Harbison <matt_harbison@yahoo.com>
parents:
28608
diff
changeset
|
501 |
17862
2142691be14f
test-remove: adapt to differing error message on Windows
Adrian Buehlmann <adrian@cadifra.com>
parents:
17861
diff
changeset
|
502 $ hg rm --after nosuch |
2142691be14f
test-remove: adapt to differing error message on Windows
Adrian Buehlmann <adrian@cadifra.com>
parents:
17861
diff
changeset
|
503 nosuch: * (glob) |
28608
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
504 \r (no-eol) (esc) |
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
505 deleting [===========================================>] 1/1\r (no-eol) (esc) |
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
506 \r (no-eol) (esc) |
17848
66f0c78350ab
remove: don't return error on directories with tracked files
Matt Mackall <mpm@selenic.com>
parents:
16913
diff
changeset
|
507 [1] |
37150
335e19c6b7fa
remove: add dry-run functionality
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
35393
diff
changeset
|
508 |
335e19c6b7fa
remove: add dry-run functionality
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
35393
diff
changeset
|
509 test dry-run for remove |
335e19c6b7fa
remove: add dry-run functionality
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
35393
diff
changeset
|
510 |
335e19c6b7fa
remove: add dry-run functionality
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
35393
diff
changeset
|
511 $ hg init testdryrun |
335e19c6b7fa
remove: add dry-run functionality
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
35393
diff
changeset
|
512 $ cd testdryrun |
335e19c6b7fa
remove: add dry-run functionality
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
35393
diff
changeset
|
513 $ echo a>a |
335e19c6b7fa
remove: add dry-run functionality
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
35393
diff
changeset
|
514 $ hg ci -qAm1 |
335e19c6b7fa
remove: add dry-run functionality
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
35393
diff
changeset
|
515 $ hg remove a -nv |
335e19c6b7fa
remove: add dry-run functionality
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
35393
diff
changeset
|
516 \r (no-eol) (esc) |
335e19c6b7fa
remove: add dry-run functionality
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
35393
diff
changeset
|
517 deleting [===========================================>] 1/1\r (no-eol) (esc) |
335e19c6b7fa
remove: add dry-run functionality
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
35393
diff
changeset
|
518 \r (no-eol) (esc) |
335e19c6b7fa
remove: add dry-run functionality
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
35393
diff
changeset
|
519 \r (no-eol) (esc) |
335e19c6b7fa
remove: add dry-run functionality
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
35393
diff
changeset
|
520 deleting [===========================================>] 1/1\r (no-eol) (esc) |
335e19c6b7fa
remove: add dry-run functionality
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
35393
diff
changeset
|
521 \r (no-eol) (esc) |
335e19c6b7fa
remove: add dry-run functionality
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
35393
diff
changeset
|
522 removing a |
39090
1320df0dcaae
remove: add a label for messages about removed files
Boris Feld <boris.feld@octobus.net>
parents:
37150
diff
changeset
|
523 $ hg remove a -nv --color debug |
1320df0dcaae
remove: add a label for messages about removed files
Boris Feld <boris.feld@octobus.net>
parents:
37150
diff
changeset
|
524 \r (no-eol) (esc) |
1320df0dcaae
remove: add a label for messages about removed files
Boris Feld <boris.feld@octobus.net>
parents:
37150
diff
changeset
|
525 deleting [===========================================>] 1/1\r (no-eol) (esc) |
1320df0dcaae
remove: add a label for messages about removed files
Boris Feld <boris.feld@octobus.net>
parents:
37150
diff
changeset
|
526 \r (no-eol) (esc) |
1320df0dcaae
remove: add a label for messages about removed files
Boris Feld <boris.feld@octobus.net>
parents:
37150
diff
changeset
|
527 \r (no-eol) (esc) |
1320df0dcaae
remove: add a label for messages about removed files
Boris Feld <boris.feld@octobus.net>
parents:
37150
diff
changeset
|
528 deleting [===========================================>] 1/1\r (no-eol) (esc) |
1320df0dcaae
remove: add a label for messages about removed files
Boris Feld <boris.feld@octobus.net>
parents:
37150
diff
changeset
|
529 \r (no-eol) (esc) |
40367
824b687ff6af
addremove: add "ui." prefix to message color keys
Yuya Nishihara <yuya@tcha.org>
parents:
39090
diff
changeset
|
530 [ui.addremove.removed ui.status|removing a] |
37150
335e19c6b7fa
remove: add dry-run functionality
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
35393
diff
changeset
|
531 $ hg diff |
335e19c6b7fa
remove: add dry-run functionality
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
35393
diff
changeset
|
532 |
335e19c6b7fa
remove: add dry-run functionality
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
35393
diff
changeset
|
533 $ cat >> .hg/hgrc <<EOF |
335e19c6b7fa
remove: add dry-run functionality
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
35393
diff
changeset
|
534 > [extensions] |
335e19c6b7fa
remove: add dry-run functionality
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
35393
diff
changeset
|
535 > largefiles= |
335e19c6b7fa
remove: add dry-run functionality
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
35393
diff
changeset
|
536 > EOF |
335e19c6b7fa
remove: add dry-run functionality
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
35393
diff
changeset
|
537 $ echo 'B as largefile' > B |
335e19c6b7fa
remove: add dry-run functionality
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
35393
diff
changeset
|
538 $ hg add --large B |
335e19c6b7fa
remove: add dry-run functionality
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
35393
diff
changeset
|
539 $ hg ci -m "B" |
335e19c6b7fa
remove: add dry-run functionality
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
35393
diff
changeset
|
540 $ hg remove B -nv |
335e19c6b7fa
remove: add dry-run functionality
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
35393
diff
changeset
|
541 removing B |
335e19c6b7fa
remove: add dry-run functionality
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
35393
diff
changeset
|
542 $ hg st |
335e19c6b7fa
remove: add dry-run functionality
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
35393
diff
changeset
|
543 |
335e19c6b7fa
remove: add dry-run functionality
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
35393
diff
changeset
|
544 $ cd .. |