largefiles: standardize error message for dirty working dir

This commit is contained in:
Siddharth Agarwal 2013-09-23 21:41:01 -07:00
parent 1addd98f97
commit 99a29f5838

View File

@ -315,7 +315,7 @@ def overrideupdate(orig, ui, repo, *pats, **opts):
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 @@ def overridebailifchanged(orig, repo):
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 @@ def overridefetch(orig, ui, repo, *pats, **opts):
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):