Mercurial > hg-stable

changeset 19804:061ce98c888d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
cmdutil.bailifchanged: standardize error message for dirty working dir This affects rebase, graft, histedit, and other similar commands.
author Siddharth Agarwal <sid0@fb.com>
date Mon, 23 Sep 2013 21:31:37 -0700
parents 0f64af33fb63
children 9b088e9c2690
files mercurial/cmdutil.py tests/test-graft.t
diffstat 2 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/cmdutil.py	Mon Sep 23 20:53:14 2013 -0700
+++ b/mercurial/cmdutil.py	Mon Sep 23 21:31:37 2013 -0700
@@ -84,7 +84,7 @@
         raise util.Abort(_('outstanding uncommitted merge'))
     modified, added, removed, deleted = repo.status()[:4]
     if modified or added or removed or deleted:
-        raise util.Abort(_("outstanding uncommitted changes"))
+        raise util.Abort(_('uncommitted changes'))
     ctx = repo[None]
     for s in sorted(ctx.substate):
         if ctx.sub(s).dirty():
--- a/tests/test-graft.t	Mon Sep 23 20:53:14 2013 -0700
+++ b/tests/test-graft.t	Mon Sep 23 21:31:37 2013 -0700
@@ -71,7 +71,7 @@
   $ hg up -q 0
   $ echo foo > a
   $ hg graft 1
-  abort: outstanding uncommitted changes
+  abort: uncommitted changes
   [255]
   $ hg revert a