Show More
@@ -137,21 +137,23 def removelargefiles(ui, repo, *pats, ** | |||
|
137 | 137 | if lfutil.standin(f) in manifest] |
|
138 | 138 | for list in [s[0], s[1], s[3], s[6]]] |
|
139 | 139 | |
|
140 |
def warn(files, |
|
|
140 | def warn(files, msg): | |
|
141 | 141 | for f in files: |
|
142 | ui.warn(_('not removing %s: %s (use forget to undo)\n') | |
|
143 | % (m.rel(f), reason)) | |
|
142 | ui.warn(msg % m.rel(f)) | |
|
144 | 143 | return int(len(files) > 0) |
|
145 | 144 | |
|
146 | 145 | result = 0 |
|
147 | 146 | |
|
148 | 147 | if after: |
|
149 | 148 | remove, forget = deleted, [] |
|
150 |
result = warn(modified + added + clean, |
|
|
149 | result = warn(modified + added + clean, | |
|
150 | _('not removing %s: file still exists\n')) | |
|
151 | 151 | else: |
|
152 | 152 | remove, forget = deleted + clean, [] |
|
153 |
result = warn(modified, _('file is modified' |
|
|
154 | result = warn(added, _('file has been marked for add')) or result | |
|
153 | result = warn(modified, _('not removing %s: file is modified (use -f' | |
|
154 | ' to force removal)\n')) | |
|
155 | result = warn(added, _('not removing %s: file has been marked for add' | |
|
156 | ' (use forget to undo)\n')) or result | |
|
155 | 157 | |
|
156 | 158 | for f in sorted(remove + forget): |
|
157 | 159 | if ui.verbose or not m.exact(f): |
@@ -79,15 +79,25 Test status, subdir and unknown files | |||
|
79 | 79 | C sub/normal2 |
|
80 | 80 | $ rm sub/unknown |
|
81 | 81 | |
|
82 |
Test exit codes for remove warning cases |
|
|
82 | Test messages and exit codes for remove warning cases | |
|
83 | 83 | |
|
84 | 84 |
$ |
|
85 |
not removing large1: file still exists |
|
|
85 | not removing large1: file still exists | |
|
86 | 86 | [1] |
|
87 | 87 |
$ |
|
88 | 88 |
$ |
|
89 |
not removing large1: file is modified (use f |
|
|
89 | not removing large1: file is modified (use -f to force removal) | |
|
90 | 90 | [1] |
|
91 | $ echo 'new' > normalnew | |
|
92 | $ hg add normalnew | |
|
93 | $ echo 'new' > largenew | |
|
94 | $ hg add --large normalnew | |
|
95 | normalnew already tracked! | |
|
96 | $ hg remove normalnew largenew | |
|
97 | not removing largenew: file is untracked | |
|
98 | not removing normalnew: file has been marked for add (use forget to undo) | |
|
99 | [1] | |
|
100 | $ rm normalnew largenew | |
|
91 | 101 |
$ |
|
92 | 102 | |
|
93 | 103 | Remove both largefiles and normal files. |
General Comments 0
You need to be logged in to leave comments.
Login now