# HG changeset patch
# User Siddharth Agarwal <sid0@fb.com>
# Date 1379997097 25200
# Node ID 061ce98c888d9983cee0101ee76c853e1c570aaf
# Parent  0f64af33fb630291cef9907ccc927380d46247f9
cmdutil.bailifchanged: standardize error message for dirty working dir

This affects rebase, graft, histedit, and other similar commands.

diff -r 0f64af33fb63 -r 061ce98c888d mercurial/cmdutil.py
--- 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():
diff -r 0f64af33fb63 -r 061ce98c888d tests/test-graft.t
--- 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