# HG changeset patch # User Siddharth Agarwal # Date 1379997661 25200 # Node ID 9b088e9c2690c1762bcbc4416f736ce341dfd549 # Parent 061ce98c888d9983cee0101ee76c853e1c570aaf largefiles: standardize error message for dirty working dir diff -r 061ce98c888d -r 9b088e9c2690 hgext/largefiles/overrides.py --- 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):