Show More
@@ -130,7 +130,7 b' def override_remove(orig, ui, repo, *pat' | |||
|
130 | 130 | orig(ui, repo, *pats, **opts) |
|
131 | 131 | restorematchfn() |
|
132 | 132 | |
|
133 |
after |
|
|
133 | after = opts.get('after') | |
|
134 | 134 | if not pats and not after: |
|
135 | 135 | raise util.Abort(_('no files specified')) |
|
136 | 136 | m = scmutil.match(repo[None], pats, opts) |
@@ -145,12 +145,10 b' def override_remove(orig, ui, repo, *pat' | |||
|
145 | 145 | |
|
146 | 146 | def warn(files, reason): |
|
147 | 147 | for f in files: |
|
148 |
ui.warn(_('not removing %s: %s (use |
|
|
148 | ui.warn(_('not removing %s: %s (use forget to undo)\n') | |
|
149 | 149 | % (m.rel(f), reason)) |
|
150 | 150 | |
|
151 |
if |
|
|
152 | remove, forget = modified + deleted + clean, added | |
|
153 | elif after: | |
|
151 | if after: | |
|
154 | 152 | remove, forget = deleted, [] |
|
155 | 153 | warn(modified + added + clean, _('file still exists')) |
|
156 | 154 | else: |
@@ -839,7 +837,11 b' def override_outgoing(orig, ui, repo, de' | |||
|
839 | 837 | ui.status('\n') |
|
840 | 838 | |
|
841 | 839 | def override_summary(orig, ui, repo, *pats, **opts): |
|
840 | try: | |
|
841 | repo.lfstatus = True | |
|
842 | 842 | orig(ui, repo, *pats, **opts) |
|
843 | finally: | |
|
844 | repo.lfstatus = False | |
|
843 | 845 | |
|
844 | 846 | if opts.pop('large', None): |
|
845 | 847 | toupload = getoutgoinglfiles(ui, repo, None, **opts) |
@@ -17,7 +17,8 b'' | |||
|
17 | 17 | > EOF |
|
18 | 18 | |
|
19 | 19 | Create the repo with a couple of revisions of both large and normal |
|
20 |
files, testing that status correctly shows largefiles |
|
|
20 | files, testing that status correctly shows largefiles and that summary output | |
|
21 | is correct. | |
|
21 | 22 | |
|
22 | 23 | $ hg init a |
|
23 | 24 | $ cd a |
@@ -38,7 +39,20 b' files, testing that status correctly sho' | |||
|
38 | 39 | M normal1 |
|
39 | 40 | M sub/large2 |
|
40 | 41 | M sub/normal2 |
|
42 | $ hg sum | |
|
43 | parent: 0:30d30fe6a5be tip | |
|
44 | add files | |
|
45 | branch: default | |
|
46 | commit: 4 modified | |
|
47 | update: (current) | |
|
41 | 48 | $ hg commit -m "edit files" |
|
49 | $ hg sum --large | |
|
50 | parent: 1:ce8896473775 tip | |
|
51 | edit files | |
|
52 | branch: default | |
|
53 | commit: (clean) | |
|
54 | update: (current) | |
|
55 | largefiles: No remote repo | |
|
42 | 56 | |
|
43 | 57 | Commit preserved largefile contents. |
|
44 | 58 | |
@@ -57,6 +71,18 b' Remove both largefiles and normal files.' | |||
|
57 | 71 | $ hg commit -m "remove files" |
|
58 | 72 | $ ls |
|
59 | 73 | sub |
|
74 | $ echo "testlargefile" > large1-test | |
|
75 | $ hg add --large large1-test | |
|
76 | $ hg st | |
|
77 | A large1-test | |
|
78 | $ hg rm large1-test | |
|
79 | not removing large1-test: file has been marked for add (use forget to undo) | |
|
80 | $ hg st | |
|
81 | A large1-test | |
|
82 | $ hg forget large1-test | |
|
83 | $ hg st | |
|
84 | ? large1-test | |
|
85 | $ rm large1-test | |
|
60 | 86 | |
|
61 | 87 | Copy both largefiles and normal files (testing that status output is correct). |
|
62 | 88 |
General Comments 0
You need to be logged in to leave comments.
Login now