update: standardize error message for dirty update --check

This and following patches will standardize the error message for dirty working
directories to "uncommitted changes".

mercurial/commands.py

@@ -5850,7 +5850,7 b' def update(ui, repo, node=None, rev=None'
     if check:
         c = repo[None]
         if c.dirty(merge=False, branch=False, missing=True):
-            raise util.Abort(_("uncommitted local changes"))
+            raise util.Abort(_("uncommitted changes"))
         if rev is None:
             rev = repo[repo[None].branch()].rev()
         mergemod._checkunknown(repo, repo[None], repo[rev])

mercurial/merge.py

@@ -669,7 +669,7 b' def update(repo, node, branchmerge, forc'
     2 = abort: uncommitted changes (commit and merge, or update --clean to
                  discard changes)
     3 = abort: uncommitted changes (commit or update --clean to discard changes)
-    4 = abort: uncommitted local changes
+    4 = abort: uncommitted changes (checked in commands.py)
     5 = incompatible options (checked in commands.py)
 
     Return the same tuple as applyupdates().

tests/test-casecollision-merge.t

@@ -293,7 +293,7 b' test for rename awareness of case-foldin'
   [255]
 
   $ hg update --check
-  abort: uncommitted local changes
+  abort: uncommitted changes
   [255]
 
   $ hg update --clean

tests/test-largefiles.t

@@ -1104,7 +1104,7 b' Rollback on largefiles.'
 
 "update --check" refuses to update with uncommitted changes.
   $ hg update --check 8
-  abort: uncommitted local changes
+  abort: uncommitted changes
   [255]
 
 "update --clean" leaves correct largefiles in working copy, even when there is

tests/test-merge5.t

@@ -19,7 +19,7 b''
   [255]
   $ rm b
   $ hg update -c
-  abort: uncommitted local changes
+  abort: uncommitted changes
   [255]
   $ hg revert b
   $ hg update -c

tests/test-update-branches.t

@@ -157,12 +157,12 b' Cases are run as shown in that table, ro'
   parent=2
 
   $ revtest '-c dirty linear'   dirty 1 2 -c
-  abort: uncommitted local changes
+  abort: uncommitted changes
   parent=1
   M foo
 
   $ revtest '-c dirtysub linear'   dirtysub 1 2 -c
-  abort: uncommitted local changes
+  abort: uncommitted changes
   parent=1
   M sub/suba
 

tests/test-update-issue1456.t

@@ -18,7 +18,7 b' Test that local removed/deleted, remote '
 
   $ echo dirty > foo
   $ hg up -c
-  abort: uncommitted local changes
+  abort: uncommitted changes
   [255]
   $ hg up -q
   $ cat foo