merge with crew
authorMatt Mackall <mpm@selenic.com>
Thu, 27 Feb 2014 15:31:44 -0600
changeset 20583 18ca31bb114f
parent 20580 b75a23eec9c9 (diff)
parent 20582 02c303f64917 (current diff)
child 20584 224a058f7cd1
merge with crew
--- a/mercurial/ui.py	Thu Feb 27 15:39:07 2014 -0500
+++ b/mercurial/ui.py	Thu Feb 27 15:31:44 2014 -0600
@@ -451,7 +451,7 @@
         if not user:
             raise util.Abort(_('no username supplied'),
                              hint=_('use "hg config --edit" '
-                                    ' to set your username'))
+                                    'to set your username'))
         if "\n" in user:
             raise util.Abort(_("username %s contains a newline\n") % repr(user))
         return user
--- a/tests/test-committer.t	Thu Feb 27 15:39:07 2014 -0500
+++ b/tests/test-committer.t	Thu Feb 27 15:31:44 2014 -0600
@@ -50,7 +50,7 @@
   $ echo "username = " >> .hg/hgrc
   $ hg commit -m commit-1
   abort: no username supplied
-  (use "hg config --edit"  to set your username)
+  (use "hg config --edit" to set your username)
   [255]
   $ rm .hg/hgrc
   $ hg commit -m commit-1 2>&1
--- a/tests/test-record.t	Thu Feb 27 15:39:07 2014 -0500
+++ b/tests/test-record.t	Thu Feb 27 15:31:44 2014 -0600
@@ -252,7 +252,7 @@
   $ unset HGUSER
   $ hg record --config ui.username= -d '8 0' -m end plain
   abort: no username supplied
-  (use "hg config --edit"  to set your username)
+  (use "hg config --edit" to set your username)
   [255]