[PATCH 9 of 9] largefiles: standardize error message for dirty working dir
Siddharth Agarwal
sid0 at fb.com
Mon Sep 23 23:51:06 CDT 2013
# HG changeset patch
# User Siddharth Agarwal <sid0 at fb.com>
# Date 1379997661 25200
# Mon Sep 23 21:41:01 2013 -0700
# Node ID d36b6ef0ec99108450b1728c4102fd672189d959
# Parent f09250867ab6ad487a2f1bfadc1f204b4db7ccdd
largefiles: standardize error message for dirty working dir
diff --git a/hgext/largefiles/overrides.py b/hgext/largefiles/overrides.py
--- a/hgext/largefiles/overrides.py
+++ b/hgext/largefiles/overrides.py
@@ -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:
@@ -947,7 +947,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):
@@ -955,7 +955,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):
More information about the Mercurial-devel
mailing list