Mercurial > hg
diff hgext/largefiles/overrides.py @ 15788:07b6af9076b4
merge with stable
author | Martin Geisler <mg@aragost.com> |
---|---|
date | Sun, 08 Jan 2012 14:50:20 +0100 |
parents | acb0a40fa14d 0c7b83a057aa |
children | 7cbba3adabc7 |
line wrap: on
line diff
--- a/hgext/largefiles/overrides.py Sat Jan 07 23:37:19 2012 +0100 +++ b/hgext/largefiles/overrides.py Sun Jan 08 14:50:20 2012 +0100 @@ -130,7 +130,7 @@ orig(ui, repo, *pats, **opts) restorematchfn() - after, force = opts.get('after'), opts.get('force') + after = opts.get('after') if not pats and not after: raise util.Abort(_('no files specified')) m = scmutil.match(repo[None], pats, opts) @@ -145,12 +145,10 @@ def warn(files, reason): for f in files: - ui.warn(_('not removing %s: %s (use -f to force removal)\n') + ui.warn(_('not removing %s: %s (use forget to undo)\n') % (m.rel(f), reason)) - if force: - remove, forget = modified + deleted + clean, added - elif after: + if after: remove, forget = deleted, [] warn(modified + added + clean, _('file still exists')) else: @@ -839,7 +837,11 @@ ui.status('\n') def override_summary(orig, ui, repo, *pats, **opts): - orig(ui, repo, *pats, **opts) + try: + repo.lfstatus = True + orig(ui, repo, *pats, **opts) + finally: + repo.lfstatus = False if opts.pop('large', None): toupload = getoutgoinglfiles(ui, repo, None, **opts)