Patchwork [9,of,9] largefiles: standardize error message for dirty working dir

login
register
mail settings
Submitter Siddharth Agarwal
Date Sept. 24, 2013, 4:51 a.m.
Message ID <d36b6ef0ec99108450b1.1379998266@dev1091.prn1.facebook.com>
Download mbox | patch
Permalink /patch/2621/
State Accepted
Commit 9b088e9c2690c1762bcbc4416f736ce341dfd549
Headers show

Comments

Siddharth Agarwal - Sept. 24, 2013, 4:51 a.m.
# HG changeset patch
# User Siddharth Agarwal <sid0@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
Matt Mackall - Sept. 24, 2013, 5:58 p.m.
On Mon, 2013-09-23 at 21:51 -0700, Siddharth Agarwal wrote:
> # HG changeset patch
> # User Siddharth Agarwal <sid0@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

These are queued for default, thanks.

Patch

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):