morestatus: remove some extra spaces
The information about unfinished states in `hg status -v` had a lot of spaces
which are not required and feels weird. Let's limit the spacing to four spaces.
Differential Revision: https://phab.mercurial-scm.org/D3730
--- a/mercurial/cmdutil.py Fri Jun 15 16:32:31 2018 -0700
+++ b/mercurial/cmdutil.py Wed Jun 13 22:50:32 2018 +0530
@@ -588,8 +588,8 @@
return _commentlines(msg)
def _helpmessage(continuecmd, abortcmd):
- msg = _('To continue: %s\n'
- 'To abort: %s') % (continuecmd, abortcmd)
+ msg = _('To continue: %s\n'
+ 'To abort: %s') % (continuecmd, abortcmd)
return _commentlines(msg)
def _rebasemsg():
@@ -603,7 +603,7 @@
def _updatecleanmsg(dest=None):
warning = _('warning: this will discard uncommitted changes')
- return 'hg update --clean %s (%s)' % (dest or '.', warning)
+ return 'hg update --clean %s (%s)' % (dest or '.', warning)
def _graftmsg():
# tweakdefaults requires `update` to have a rev hence the `.`
--- a/tests/test-conflict.t Fri Jun 15 16:32:31 2018 -0700
+++ b/tests/test-conflict.t Wed Jun 13 22:50:32 2018 +0530
@@ -57,8 +57,8 @@
#
# To mark files as resolved: hg resolve --mark FILE
- # To continue: hg commit
- # To abort: hg update --clean . (warning: this will discard uncommitted changes)
+ # To continue: hg commit
+ # To abort: hg update --clean . (warning: this will discard uncommitted changes)
$ cat a
--- a/tests/test-graft.t Fri Jun 15 16:32:31 2018 -0700
+++ b/tests/test-graft.t Wed Jun 13 22:50:32 2018 +0530
@@ -236,8 +236,8 @@
#
# To mark files as resolved: hg resolve --mark FILE
- # To continue: hg graft --continue
- # To abort: hg update --clean . (warning: this will discard uncommitted changes)
+ # To continue: hg graft --continue
+ # To abort: hg update --clean . (warning: this will discard uncommitted changes)
Commit while interrupted should fail:
--- a/tests/test-histedit-fold.t Fri Jun 15 16:32:31 2018 -0700
+++ b/tests/test-histedit-fold.t Wed Jun 13 22:50:32 2018 +0530
@@ -306,8 +306,8 @@
#
# To mark files as resolved: hg resolve --mark FILE
- # To continue: hg histedit --continue
- # To abort: hg histedit --abort
+ # To continue: hg histedit --continue
+ # To abort: hg histedit --abort
$ hg resolve -l
U file
--- a/tests/test-rebase-conflicts.t Fri Jun 15 16:32:31 2018 -0700
+++ b/tests/test-rebase-conflicts.t Wed Jun 13 22:50:32 2018 +0530
@@ -80,8 +80,8 @@
#
# To mark files as resolved: hg resolve --mark FILE
- # To continue: hg rebase --continue
- # To abort: hg rebase --abort
+ # To continue: hg rebase --continue
+ # To abort: hg rebase --abort
Try to continue without solving the conflict:
--- a/tests/test-shelve.t Fri Jun 15 16:32:31 2018 -0700
+++ b/tests/test-shelve.t Wed Jun 13 22:50:32 2018 +0530
@@ -354,8 +354,8 @@
#
# To mark files as resolved: hg resolve --mark FILE
- # To continue: hg unshelve --continue
- # To abort: hg unshelve --abort
+ # To continue: hg unshelve --continue
+ # To abort: hg unshelve --abort
ensure that we have a merge with unresolved conflicts