This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8811

morestatus: mention --stop even if not using --verbose
ClosedPublic

Authored by spectral on Jul 24 2020, 6:21 PM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHGa253ded5b03d: morestatus: mention --stop even if not using --verbose

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.

Revision Contents
Changeset List

Diff 22115

mercurial/state.py

return hint return hint
return self._statushint return self._statushint
def hint(self): def hint(self):
"""returns the hint message corresponding to an interrupted """returns the hint message corresponding to an interrupted
operation operation
""" """
if not self._cmdhint: if not self._cmdhint:
if not self._stopflag:
return _(b"use 'hg %s --continue' or 'hg %s --abort'") % ( return _(b"use 'hg %s --continue' or 'hg %s --abort'") % (
self._opname, self._opname,
self._opname, self._opname,
) )
else:
return _(b"use 'hg %s --continue', 'hg %s --abort', "
b"or 'hg %s --stop'") % (
self._opname,
self._opname,
self._opname,
)
return self._cmdhint return self._cmdhint
def msg(self): def msg(self):
"""returns the status message corresponding to the command""" """returns the status message corresponding to the command"""
if not self._cmdmsg: if not self._cmdmsg:
return _(b'%s in progress') % (self._opname) return _(b'%s in progress') % (self._opname)
return self._cmdmsg return self._cmdmsg

tests/test-absorb-unfinished.t

rebasing 1:c3b6dc0e177a "foo 2" (tip) rebasing 1:c3b6dc0e177a "foo 2" (tip)
merging foo.whole merging foo.whole
warning: conflicts while merging foo.whole! (edit, then use 'hg resolve --mark') warning: conflicts while merging foo.whole! (edit, then use 'hg resolve --mark')
unresolved conflicts (see 'hg resolve', then 'hg rebase --continue') unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')
[1] [1]
$ hg --config extensions.rebase= absorb $ hg --config extensions.rebase= absorb
abort: rebase in progress abort: rebase in progress
(use 'hg rebase --continue' or 'hg rebase --abort') (use 'hg rebase --continue', 'hg rebase --abort', or 'hg rebase --stop')
[255] [255]

tests/test-fix.t

$ hg --config extensions.rebase= fix --working-dir $ hg --config extensions.rebase= fix --working-dir
abort: unresolved conflicts abort: unresolved conflicts
(use 'hg resolve') (use 'hg resolve')
[255] [255]
$ hg --config extensions.rebase= fix -r . $ hg --config extensions.rebase= fix -r .
abort: rebase in progress abort: rebase in progress
(use 'hg rebase --continue' or 'hg rebase --abort') (use 'hg rebase --continue', 'hg rebase --abort', or 'hg rebase --stop')
[255] [255]
$ cd .. $ cd ..
When fixing a file that was renamed, we should diff against the source of the When fixing a file that was renamed, we should diff against the source of the
rename for incremental fixing and we should correctly reproduce the rename in rename for incremental fixing and we should correctly reproduce the rename in
the replacement revision. the replacement revision.

tests/test-rebase-abort.t

$ hg up -C 0 # user does other stuff in the repo $ hg up -C 0 # user does other stuff in the repo
0 files updated, 0 files merged, 1 files removed, 0 files unresolved 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ mv rebasestate .hg/ # user upgrades to 2.7 $ mv rebasestate .hg/ # user upgrades to 2.7
$ echo new > a $ echo new > a
$ hg up 1 # user gets an error saying to run hg rebase --abort $ hg up 1 # user gets an error saying to run hg rebase --abort
abort: rebase in progress abort: rebase in progress
(use 'hg rebase --continue' or 'hg rebase --abort') (use 'hg rebase --continue', 'hg rebase --abort', or 'hg rebase --stop')
[255] [255]
$ cat a $ cat a
new new
$ hg abort $ hg abort
rebase aborted rebase aborted
$ cat a $ cat a
new new
.hg/merge/state .hg/merge/state
.hg/rebasestate .hg/rebasestate
.hg/undo.backup.dirstate .hg/undo.backup.dirstate
.hg/undo.dirstate .hg/undo.dirstate
.hg/updatestate .hg/updatestate
$ hg rebase -s 3 -d tip $ hg rebase -s 3 -d tip
abort: rebase in progress abort: rebase in progress
(use 'hg rebase --continue' or 'hg rebase --abort') (use 'hg rebase --continue', 'hg rebase --abort', or 'hg rebase --stop')
[255] [255]
$ hg up . $ hg up .
abort: rebase in progress abort: rebase in progress
(use 'hg rebase --continue' or 'hg rebase --abort') (use 'hg rebase --continue', 'hg rebase --abort', or 'hg rebase --stop')
[255] [255]
$ hg up -C . $ hg up -C .
abort: rebase in progress abort: rebase in progress
(use 'hg rebase --continue' or 'hg rebase --abort') (use 'hg rebase --continue', 'hg rebase --abort', or 'hg rebase --stop')
[255] [255]
$ hg graft 3 $ hg graft 3
abort: rebase in progress abort: rebase in progress
(use 'hg rebase --continue' or 'hg rebase --abort') (use 'hg rebase --continue', 'hg rebase --abort', or 'hg rebase --stop')
[255] [255]
$ hg abort $ hg abort
saved backup bundle to $TESTTMP/interrupted/.hg/strip-backup/3d8812cf300d-93041a90-backup.hg saved backup bundle to $TESTTMP/interrupted/.hg/strip-backup/3d8812cf300d-93041a90-backup.hg
rebase aborted rebase aborted
$ hg log -G --template "{rev} {desc} {bookmarks}" $ hg log -G --template "{rev} {desc} {bookmarks}"
o 6 no-a o 6 no-a
| |

tests/test-rebase-inmemory.t

hit merge conflicts; re-running rebase without in-memory merge hit merge conflicts; re-running rebase without in-memory merge
rebasing 2:b4d249fbf8dd "bye from foo" rebasing 2:b4d249fbf8dd "bye from foo"
merging foo merging foo
warning: conflicts while merging foo! (edit, then use 'hg resolve --mark') warning: conflicts while merging foo! (edit, then use 'hg resolve --mark')
unresolved conflicts (see 'hg resolve', then 'hg rebase --continue') unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')
[1] [1]
$ hg rebase -r 3 -d 1 -t:merge3 $ hg rebase -r 3 -d 1 -t:merge3
abort: rebase in progress abort: rebase in progress
(use 'hg rebase --continue' or 'hg rebase --abort') (use 'hg rebase --continue', 'hg rebase --abort', or 'hg rebase --stop')
[255] [255]
$ hg resolve --list $ hg resolve --list
U foo U foo
$ hg resolve --all --re-merge -t:other $ hg resolve --all --re-merge -t:other
(no more unresolved files) (no more unresolved files)
continue: hg rebase --continue continue: hg rebase --continue
$ hg rebase --continue $ hg rebase --continue
rebasing 2:b4d249fbf8dd "bye from foo" rebasing 2:b4d249fbf8dd "bye from foo"

tests/test-rebase-obsolete.t

unresolved conflicts (see 'hg resolve', then 'hg rebase --continue') unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')
[1] [1]
$ hg rebase --stop --dry-run $ hg rebase --stop --dry-run
abort: cannot specify both --stop and --dry-run abort: cannot specify both --stop and --dry-run
[255] [255]
$ hg rebase -s 3 -d 5 $ hg rebase -s 3 -d 5
abort: rebase in progress abort: rebase in progress
(use 'hg rebase --continue' or 'hg rebase --abort') (use 'hg rebase --continue', 'hg rebase --abort', or 'hg rebase --stop')
[255] [255]
$ hg rebase --stop --continue $ hg rebase --stop --continue
abort: cannot specify both --stop and --continue abort: cannot specify both --stop and --continue
[255] [255]
Test --stop moves bookmarks of original revisions to new rebased nodes: Test --stop moves bookmarks of original revisions to new rebased nodes:
====================================================================== ======================================================================
$ cd .. $ cd ..