Show More
@@ -2798,7 +2798,7 b' def pull(ui, repo, source="default", **o' | |||||
2798 | try: |
|
2798 | try: | |
2799 | revs = [other.lookup(rev) for rev in revs] |
|
2799 | revs = [other.lookup(rev) for rev in revs] | |
2800 | except error.CapabilityError: |
|
2800 | except error.CapabilityError: | |
2801 |
err = _(" |
|
2801 | err = _("other repository doesn't support revision lookup, " | |
2802 | "so a rev cannot be specified.") |
|
2802 | "so a rev cannot be specified.") | |
2803 | raise util.Abort(err) |
|
2803 | raise util.Abort(err) | |
2804 |
|
2804 | |||
@@ -2913,21 +2913,24 b' def remove(ui, repo, *pats, **opts):' | |||||
2913 | ui.warn(_('not removing %s: file is untracked\n') % m.rel(f)) |
|
2913 | ui.warn(_('not removing %s: file is untracked\n') % m.rel(f)) | |
2914 | ret = 1 |
|
2914 | ret = 1 | |
2915 |
|
2915 | |||
2916 | def warn(files, reason): |
|
|||
2917 | for f in files: |
|
|||
2918 | ui.warn(_('not removing %s: file %s (use -f to force removal)\n') |
|
|||
2919 | % (m.rel(f), reason)) |
|
|||
2920 | ret = 1 |
|
|||
2921 |
|
||||
2922 | if force: |
|
2916 | if force: | |
2923 | remove, forget = modified + deleted + clean, added |
|
2917 | remove, forget = modified + deleted + clean, added | |
2924 | elif after: |
|
2918 | elif after: | |
2925 | remove, forget = deleted, [] |
|
2919 | remove, forget = deleted, [] | |
2926 |
|
|
2920 | for f in modified + added + clean: | |
|
2921 | ui.warn(_('not removing %s: file still exists (use -f' | |||
|
2922 | ' to force removal)\n') % m.rel(f)) | |||
|
2923 | ret = 1 | |||
2927 | else: |
|
2924 | else: | |
2928 | remove, forget = deleted + clean, [] |
|
2925 | remove, forget = deleted + clean, [] | |
2929 | warn(modified, _('is modified')) |
|
2926 | for f in modified: | |
2930 | warn(added, _('has been marked for add')) |
|
2927 | ui.warn(_('not removing %s: file is modified (use -f' | |
|
2928 | ' to force removal)\n') % m.rel(f)) | |||
|
2929 | ret = 1 | |||
|
2930 | for f in added: | |||
|
2931 | ui.warn(_('not removing %s: file has been marked for add (use -f' | |||
|
2932 | ' to force removal)\n') % m.rel(f)) | |||
|
2933 | ret = 1 | |||
2931 |
|
2934 | |||
2932 | for f in sorted(remove + forget): |
|
2935 | for f in sorted(remove + forget): | |
2933 | if ui.verbose or not m.exact(f): |
|
2936 | if ui.verbose or not m.exact(f): |
@@ -1,5 +1,6 b'' | |||||
1 | $ remove() { |
|
1 | $ remove() { | |
2 | > hg rm $@ |
|
2 | > hg rm $@ | |
|
3 | > echo "exit code: $?" | |||
3 | > hg st |
|
4 | > hg st | |
4 | > # do not use ls -R, which recurses in .hg subdirs on Mac OS X 10.5 |
|
5 | > # do not use ls -R, which recurses in .hg subdirs on Mac OS X 10.5 | |
5 | > find . -name .hg -prune -o -type f -print | sort |
|
6 | > find . -name .hg -prune -o -type f -print | sort | |
@@ -14,6 +15,7 b' file not managed' | |||||
14 |
|
15 | |||
15 | $ remove foo |
|
16 | $ remove foo | |
16 | not removing foo: file is untracked |
|
17 | not removing foo: file is untracked | |
|
18 | exit code: 1 | |||
17 | ? foo |
|
19 | ? foo | |
18 | ./foo |
|
20 | ./foo | |
19 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
21 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
@@ -28,6 +30,7 b' 00 state added, options none' | |||||
28 | $ hg add bar |
|
30 | $ hg add bar | |
29 | $ remove bar |
|
31 | $ remove bar | |
30 | not removing bar: file has been marked for add (use -f to force removal) |
|
32 | not removing bar: file has been marked for add (use -f to force removal) | |
|
33 | exit code: 1 | |||
31 | A bar |
|
34 | A bar | |
32 | ./bar |
|
35 | ./bar | |
33 | ./foo |
|
36 | ./foo | |
@@ -36,6 +39,7 b' 00 state added, options none' | |||||
36 | 01 state clean, options none |
|
39 | 01 state clean, options none | |
37 |
|
40 | |||
38 | $ remove foo |
|
41 | $ remove foo | |
|
42 | exit code: 0 | |||
39 | R foo |
|
43 | R foo | |
40 | ? bar |
|
44 | ? bar | |
41 | ./bar |
|
45 | ./bar | |
@@ -46,6 +50,7 b' 02 state modified, options none' | |||||
46 | $ echo b >> foo |
|
50 | $ echo b >> foo | |
47 | $ remove foo |
|
51 | $ remove foo | |
48 | not removing foo: file is modified (use -f to force removal) |
|
52 | not removing foo: file is modified (use -f to force removal) | |
|
53 | exit code: 1 | |||
49 | M foo |
|
54 | M foo | |
50 | ? bar |
|
55 | ? bar | |
51 | ./bar |
|
56 | ./bar | |
@@ -56,6 +61,7 b' 03 state missing, options none' | |||||
56 |
|
61 | |||
57 | $ rm foo |
|
62 | $ rm foo | |
58 | $ remove foo |
|
63 | $ remove foo | |
|
64 | exit code: 0 | |||
59 | R foo |
|
65 | R foo | |
60 | ? bar |
|
66 | ? bar | |
61 | ./bar |
|
67 | ./bar | |
@@ -66,6 +72,7 b' 10 state added, options -f' | |||||
66 | $ echo b > bar |
|
72 | $ echo b > bar | |
67 | $ hg add bar |
|
73 | $ hg add bar | |
68 | $ remove -f bar |
|
74 | $ remove -f bar | |
|
75 | exit code: 0 | |||
69 | ? bar |
|
76 | ? bar | |
70 | ./bar |
|
77 | ./bar | |
71 | ./foo |
|
78 | ./foo | |
@@ -75,6 +82,7 b' 10 state added, options -f' | |||||
75 | 11 state clean, options -f |
|
82 | 11 state clean, options -f | |
76 |
|
83 | |||
77 | $ remove -f foo |
|
84 | $ remove -f foo | |
|
85 | exit code: 0 | |||
78 | R foo |
|
86 | R foo | |
79 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
87 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
80 |
|
88 | |||
@@ -82,6 +90,7 b' 12 state modified, options -f' | |||||
82 |
|
90 | |||
83 | $ echo b >> foo |
|
91 | $ echo b >> foo | |
84 | $ remove -f foo |
|
92 | $ remove -f foo | |
|
93 | exit code: 0 | |||
85 | R foo |
|
94 | R foo | |
86 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
95 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
87 |
|
96 | |||
@@ -89,6 +98,7 b' 13 state missing, options -f' | |||||
89 |
|
98 | |||
90 | $ rm foo |
|
99 | $ rm foo | |
91 | $ remove -f foo |
|
100 | $ remove -f foo | |
|
101 | exit code: 0 | |||
92 | R foo |
|
102 | R foo | |
93 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
103 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
94 |
|
104 | |||
@@ -98,6 +108,7 b' 20 state added, options -A' | |||||
98 | $ hg add bar |
|
108 | $ hg add bar | |
99 | $ remove -A bar |
|
109 | $ remove -A bar | |
100 | not removing bar: file still exists (use -f to force removal) |
|
110 | not removing bar: file still exists (use -f to force removal) | |
|
111 | exit code: 1 | |||
101 | A bar |
|
112 | A bar | |
102 | ./bar |
|
113 | ./bar | |
103 | ./foo |
|
114 | ./foo | |
@@ -107,6 +118,7 b' 21 state clean, options -A' | |||||
107 |
|
118 | |||
108 | $ remove -A foo |
|
119 | $ remove -A foo | |
109 | not removing foo: file still exists (use -f to force removal) |
|
120 | not removing foo: file still exists (use -f to force removal) | |
|
121 | exit code: 1 | |||
110 | ? bar |
|
122 | ? bar | |
111 | ./bar |
|
123 | ./bar | |
112 | ./foo |
|
124 | ./foo | |
@@ -117,6 +129,7 b' 22 state modified, options -A' | |||||
117 | $ echo b >> foo |
|
129 | $ echo b >> foo | |
118 | $ remove -A foo |
|
130 | $ remove -A foo | |
119 | not removing foo: file still exists (use -f to force removal) |
|
131 | not removing foo: file still exists (use -f to force removal) | |
|
132 | exit code: 1 | |||
120 | M foo |
|
133 | M foo | |
121 | ? bar |
|
134 | ? bar | |
122 | ./bar |
|
135 | ./bar | |
@@ -127,6 +140,7 b' 23 state missing, options -A' | |||||
127 |
|
140 | |||
128 | $ rm foo |
|
141 | $ rm foo | |
129 | $ remove -A foo |
|
142 | $ remove -A foo | |
|
143 | exit code: 0 | |||
130 | R foo |
|
144 | R foo | |
131 | ? bar |
|
145 | ? bar | |
132 | ./bar |
|
146 | ./bar | |
@@ -137,6 +151,7 b' 30 state added, options -Af' | |||||
137 | $ echo b > bar |
|
151 | $ echo b > bar | |
138 | $ hg add bar |
|
152 | $ hg add bar | |
139 | $ remove -Af bar |
|
153 | $ remove -Af bar | |
|
154 | exit code: 0 | |||
140 | ? bar |
|
155 | ? bar | |
141 | ./bar |
|
156 | ./bar | |
142 | ./foo |
|
157 | ./foo | |
@@ -146,6 +161,7 b' 30 state added, options -Af' | |||||
146 | 31 state clean, options -Af |
|
161 | 31 state clean, options -Af | |
147 |
|
162 | |||
148 | $ remove -Af foo |
|
163 | $ remove -Af foo | |
|
164 | exit code: 0 | |||
149 | R foo |
|
165 | R foo | |
150 | ./foo |
|
166 | ./foo | |
151 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
167 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
@@ -154,6 +170,7 b' 32 state modified, options -Af' | |||||
154 |
|
170 | |||
155 | $ echo b >> foo |
|
171 | $ echo b >> foo | |
156 | $ remove -Af foo |
|
172 | $ remove -Af foo | |
|
173 | exit code: 0 | |||
157 | R foo |
|
174 | R foo | |
158 | ./foo |
|
175 | ./foo | |
159 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
176 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
@@ -162,6 +179,7 b' 33 state missing, options -Af' | |||||
162 |
|
179 | |||
163 | $ rm foo |
|
180 | $ rm foo | |
164 | $ remove -Af foo |
|
181 | $ remove -Af foo | |
|
182 | exit code: 0 | |||
165 | R foo |
|
183 | R foo | |
166 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
184 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
167 |
|
185 | |||
@@ -180,6 +198,7 b' dir, options none' | |||||
180 | $ remove test |
|
198 | $ remove test | |
181 | removing test/bar |
|
199 | removing test/bar | |
182 | removing test/foo |
|
200 | removing test/foo | |
|
201 | exit code: 0 | |||
183 | R test/bar |
|
202 | R test/bar | |
184 | R test/foo |
|
203 | R test/foo | |
185 | ./foo |
|
204 | ./foo | |
@@ -191,6 +210,7 b' dir, options -f' | |||||
191 | $ remove -f test |
|
210 | $ remove -f test | |
192 | removing test/bar |
|
211 | removing test/bar | |
193 | removing test/foo |
|
212 | removing test/foo | |
|
213 | exit code: 0 | |||
194 | R test/bar |
|
214 | R test/bar | |
195 | R test/foo |
|
215 | R test/foo | |
196 | ./foo |
|
216 | ./foo | |
@@ -202,6 +222,7 b' dir, options -A' | |||||
202 | $ remove -A test |
|
222 | $ remove -A test | |
203 | not removing test/foo: file still exists (use -f to force removal) |
|
223 | not removing test/foo: file still exists (use -f to force removal) | |
204 | removing test/bar |
|
224 | removing test/bar | |
|
225 | exit code: 1 | |||
205 | R test/bar |
|
226 | R test/bar | |
206 | ./foo |
|
227 | ./foo | |
207 | ./test/foo |
|
228 | ./test/foo | |
@@ -213,6 +234,7 b' dir, options -Af' | |||||
213 | $ remove -Af test |
|
234 | $ remove -Af test | |
214 | removing test/bar |
|
235 | removing test/bar | |
215 | removing test/foo |
|
236 | removing test/foo | |
|
237 | exit code: 0 | |||
216 | R test/bar |
|
238 | R test/bar | |
217 | R test/foo |
|
239 | R test/foo | |
218 | ./foo |
|
240 | ./foo |
General Comments 0
You need to be logged in to leave comments.
Login now