Mercurial > hg-stable
changeset 19805:9b088e9c2690
largefiles: standardize error message for dirty working dir
| author | Siddharth Agarwal <sid0@fb.com> |
|---|---|
| date | Mon, 23 Sep 2013 21:41:01 -0700 |
| parents | 061ce98c888d |
| children | 47ff9d1abfa9 |
| files | hgext/largefiles/overrides.py |
| diffstat | 1 files changed, 3 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext/largefiles/overrides.py Mon Sep 23 21:31:37 2013 -0700 +++ b/hgext/largefiles/overrides.py Mon Sep 23 21:41:01 2013 -0700 @@ -315,7 +315,7 @@ lfdirstate.normal(lfile) lfdirstate.write() if mod: - raise util.Abort(_('uncommitted local changes')) + raise util.Abort(_('uncommitted changes')) # XXX handle removed differently if not opts['clean']: for lfile in unsure + modified + added: @@ -946,7 +946,7 @@ modified, added, removed, deleted = repo.status()[:4] repo.lfstatus = False if modified or added or removed or deleted: - raise util.Abort(_('outstanding uncommitted changes')) + raise util.Abort(_('uncommitted changes')) # Fetch doesn't use cmdutil.bailifchanged so override it to add the check def overridefetch(orig, ui, repo, *pats, **opts): @@ -954,7 +954,7 @@ modified, added, removed, deleted = repo.status()[:4] repo.lfstatus = False if modified or added or removed or deleted: - raise util.Abort(_('outstanding uncommitted changes')) + raise util.Abort(_('uncommitted changes')) return orig(ui, repo, *pats, **opts) def overrideforget(orig, ui, repo, *pats, **opts):