This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3730

morestatus: remove some extra spaces
ClosedPublic

Authored by pulkit on Jun 13 2018, 3:12 PM.

Details

Reviewers
durin42
Group Reviewers
hg-reviewers
Commits
rHG50f5fc232c16: morestatus: remove some extra spaces
Summary

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.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

pulkit created this revision.Jun 13 2018, 3:12 PM
Closed by commit rHG50f5fc232c16: morestatus: remove some extra spaces (authored by pulkit). · Explain WhyJun 17 2018, 12:20 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 9120

mercurial/cmdutil.py

To mark files as resolved: hg resolve --mark FILE''') % mergeliststr To mark files as resolved: hg resolve --mark FILE''') % mergeliststr
else: else:
msg = _('No unresolved merge conflicts.') msg = _('No unresolved merge conflicts.')
return _commentlines(msg) return _commentlines(msg)
def _helpmessage(continuecmd, abortcmd): def _helpmessage(continuecmd, abortcmd):
msg = _('To continue: %s\n' msg = _('To continue: %s\n'
'To abort: %s') % (continuecmd, abortcmd) 'To abort: %s') % (continuecmd, abortcmd)
return _commentlines(msg) return _commentlines(msg)
def _rebasemsg(): def _rebasemsg():
return _helpmessage('hg rebase --continue', 'hg rebase --abort') return _helpmessage('hg rebase --continue', 'hg rebase --abort')
def _histeditmsg(): def _histeditmsg():
return _helpmessage('hg histedit --continue', 'hg histedit --abort') return _helpmessage('hg histedit --continue', 'hg histedit --abort')
def _unshelvemsg(): def _unshelvemsg():
return _helpmessage('hg unshelve --continue', 'hg unshelve --abort') return _helpmessage('hg unshelve --continue', 'hg unshelve --abort')
def _updatecleanmsg(dest=None): def _updatecleanmsg(dest=None):
warning = _('warning: this will discard uncommitted changes') 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(): def _graftmsg():
# tweakdefaults requires `update` to have a rev hence the `.` # tweakdefaults requires `update` to have a rev hence the `.`
return _helpmessage('hg graft --continue', _updatecleanmsg()) return _helpmessage('hg graft --continue', _updatecleanmsg())
def _mergemsg(): def _mergemsg():
# tweakdefaults requires `update` to have a rev hence the `.` # tweakdefaults requires `update` to have a rev hence the `.`
return _helpmessage('hg commit', _updatecleanmsg()) return _helpmessage('hg commit', _updatecleanmsg())

tests/test-conflict.t

# The repository is in an unfinished *merge* state. # The repository is in an unfinished *merge* state.
# Unresolved merge conflicts: # Unresolved merge conflicts:
# #
# a # a
# #
# To mark files as resolved: hg resolve --mark FILE # To mark files as resolved: hg resolve --mark FILE
# To continue: hg commit # To continue: hg commit
# To abort: hg update --clean . (warning: this will discard uncommitted changes) # To abort: hg update --clean . (warning: this will discard uncommitted changes)
$ cat a $ cat a
Small Mathematical Series. Small Mathematical Series.
1 1
2 2
3 3
<<<<<<< working copy: 618808747361 - test: branch2 <<<<<<< working copy: 618808747361 - test: branch2

tests/test-graft.t

# The repository is in an unfinished *graft* state. # The repository is in an unfinished *graft* state.
# Unresolved merge conflicts: # Unresolved merge conflicts:
# #
# e # e
# #
# To mark files as resolved: hg resolve --mark FILE # To mark files as resolved: hg resolve --mark FILE
# To continue: hg graft --continue # To continue: hg graft --continue
# To abort: hg update --clean . (warning: this will discard uncommitted changes) # To abort: hg update --clean . (warning: this will discard uncommitted changes)
Commit while interrupted should fail: Commit while interrupted should fail:
$ hg ci -m 'commit interrupted graft' $ hg ci -m 'commit interrupted graft'
abort: graft in progress abort: graft in progress
(use 'hg graft --continue' or 'hg graft --stop' to stop) (use 'hg graft --continue' or 'hg graft --stop' to stop)
[255] [255]

tests/test-histedit-fold.t

# The repository is in an unfinished *histedit* state. # The repository is in an unfinished *histedit* state.
# Unresolved merge conflicts: # Unresolved merge conflicts:
# #
# file # file
# #
# To mark files as resolved: hg resolve --mark FILE # To mark files as resolved: hg resolve --mark FILE
# To continue: hg histedit --continue # To continue: hg histedit --continue
# To abort: hg histedit --abort # To abort: hg histedit --abort
$ hg resolve -l $ hg resolve -l
U file U file
$ hg revert -r 'p1()' file $ hg revert -r 'p1()' file
$ hg resolve --mark file $ hg resolve --mark file
(no more unresolved files) (no more unresolved files)
continue: hg histedit --continue continue: hg histedit --continue
$ hg histedit --continue $ hg histedit --continue

tests/test-rebase-conflicts.t

# The repository is in an unfinished *rebase* state. # The repository is in an unfinished *rebase* state.
# Unresolved merge conflicts: # Unresolved merge conflicts:
# #
# common # common
# #
# To mark files as resolved: hg resolve --mark FILE # To mark files as resolved: hg resolve --mark FILE
# To continue: hg rebase --continue # To continue: hg rebase --continue
# To abort: hg rebase --abort # To abort: hg rebase --abort
Try to continue without solving the conflict: Try to continue without solving the conflict:
$ hg rebase --continue $ hg rebase --continue
abort: unresolved merge conflicts (see 'hg help resolve') abort: unresolved merge conflicts (see 'hg help resolve')
[255] [255]

tests/test-shelve.t

# The repository is in an unfinished *unshelve* state. # The repository is in an unfinished *unshelve* state.
# Unresolved merge conflicts: # Unresolved merge conflicts:
# #
# a/a # a/a
# #
# To mark files as resolved: hg resolve --mark FILE # To mark files as resolved: hg resolve --mark FILE
# To continue: hg unshelve --continue # To continue: hg unshelve --continue
# To abort: hg unshelve --abort # To abort: hg unshelve --abort
ensure that we have a merge with unresolved conflicts ensure that we have a merge with unresolved conflicts
$ hg heads -q --template '{rev}\n' $ hg heads -q --template '{rev}\n'
5 5
4 4
$ hg parents -q --template '{rev}\n' $ hg parents -q --template '{rev}\n'