This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9238

errors: add config that lets user get more detailed exit codes
ClosedPublic

Authored by martinvonz on Oct 22 2020, 12:07 PM.

Details

Reviewers
durin42
Group Reviewers
hg-reviewers
Commits
rHG21733e8c924f: errors: add config that lets user get more detailed exit codes
Summary

This adds an experimental config that lets the user get more detailed
exit codes. For example, there will be a specific error code for
input/user errors. This is part of
https://www.mercurial-scm.org/wiki/ErrorCategoriesPlan. I've made the
config part of tweakdefaults.

I've made the config enabled by default in tests. My reasoning is that
we want to see that each specific error case gives the right exit code
and we don't want to duplicate all error cases in the entire test
suite. It also makes it easy to grep the .t files for [255] to
find which cases we have left to fix. The logic for the current exit
codes is quite simple, so I'm not too worried about regressions
there. I've added a test case specifically for the "legacy" exit
codes.

I've set the detailed exit status only for the case of
InterventionRequired and SystemExit for now (the cases where we
currently return something other than 255), just to show that it
works.

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

martinvonz created this revision.Oct 22 2020, 12:07 PM
martinvonz edited the summary of this revision. (Show Details)Oct 22 2020, 2:21 PM
martinvonz edited the summary of this revision. (Show Details)Oct 22 2020, 4:08 PM
martinvonz updated this revision to Diff 23287.
martinvonz updated this revision to Diff 23369.Oct 29 2020, 4:39 PM
mharbison72 added a subscriber: mharbison72.Nov 3 2020, 6:05 PM
mharbison72 added inline comments.
tests/test-ssh-proto.t
101 ↗(On Diff #23369)

The other non zero -> non zero changes make sense, but was it intended for this to go from zero to non zero exit status? The plan page says this code is for "unexpected", but it seems like it's just an exit? Or was this missing from before?

martinvonz planned changes to this revision.Nov 3 2020, 6:54 PM
martinvonz added inline comments.
tests/test-ssh-proto.t
101 ↗(On Diff #23369)

Thanks for reviewing carefully! I'm pretty sure that's because sshserver.serve_forever() calls sys.exit(0). I'll fix that in some way. I had seen that comment in scmutil.callcatch() about handling SystemExit but I was lazy and just assumed that it wasn't something that we actually do. It seems that the right fix is to search the code for sys.exit() calls and clean those up before this patch. Then SystemExit will be a real programming error and we can correctly use exit 254.

martinvonz added a comment.Nov 3 2020, 11:49 PM

test-ssh-proto.t is no longer affected by this patch, thanks to a few other patches insert ahead of this one. Thanks again for your careful review!

mharbison72 added inline comments.Nov 4 2020, 7:39 PM
tests/test-fix.t
661

Sorry I missed this before. This appears to be just an error.Abort, so I can't figure out how this gets converted to 254 in the SystemExit(?) handler. Was that intentional? I don't care too much, and was kind of wondering if this is (conceptually) an InterventionRequired case.

I don't want to stall this if you have a plan or are doing more refinement in this area.

tests/test-largefiles-update.t
765

I assume we don't care about no longer propagating the extension's exit status because it's a python extension, so no API guarantees? Just pointing it out in case this was overlooked in the sea of changes.

tests/test-worker.t
85 ↗(On Diff #23416)

It seems strange that the exit code differs with --traceback (below) vs not (here).

The "known exception" here initially threw me for a bit, but that's from the extension raising the Abort, and not really contra the 254 description of "unknown" from the plan page. So I guess I can see 254 for both of these.

martinvonz marked an inline comment as done.Nov 9 2020, 2:40 PM
martinvonz added inline comments.
tests/test-fix.t
661

Ah, that happens because worker.py calls sys.exit(). I'll insert a patch before this one to fix that. Thanks again for pointing out these things! I clearly should have reviewed my patch much more carefully myself.

tests/test-largefiles-update.t
765

Hmm, I had not noticed this one either. It seems better to consider it an internal error if an extension raises SystemExit, so I think this looks like an improvement.

tests/test-worker.t
85 ↗(On Diff #23416)

Same problem as the one above.

martinvonz added a commit: rHG21733e8c924f: errors: add config that lets user get more detailed exit codes.Nov 9 2020, 7:37 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHG21733e8c924f: errors: add config that lets user get more detailed exit codes (authored by martinvonz). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/configitems.py (3 lines)
Mmercurial/scmutil.py (13 lines)
Mmercurial/ui.py (2 lines)
Mtests/run-tests.py (1 line)
Mtests/test-absorb-unfinished.t (2 lines)
Mtests/test-basic.t (1 line)
Mtests/test-bookmarks-rebase.t (4 lines)
Mtests/test-commandserver.t (2 lines)
Mtests/test-copytrace-heuristics.t (6 lines)
Mtests/test-fix.t (2 lines)
Mtests/test-histedit-arguments.t (10 lines)
Mtests/test-histedit-edit.t (2 lines)
Mtests/test-histedit-fold.t (4 lines)
Mtests/test-histedit-no-backup.t (4 lines)
Mtests/test-histedit-obsolete.t (14 lines)
Mtests/test-largefiles-update.t (4 lines)
AMtests/test-legacy-exit-code.t (49 lines)
Mtests/test-merge-halt.t (12 lines)
Mtests/test-qrecord.t (2 lines)
Mtests/test-rebase-abort.t (14 lines)
Mtests/test-rebase-backup.t (4 lines)
Mtests/test-rebase-bookmarks.t (2 lines)
Mtests/test-rebase-check-restore.t (4 lines)
Mtests/test-rebase-collapse.t (8 lines)
Mtests/test-rebase-conflicts.t (10 lines)
Mtests/test-rebase-dest.t (2 lines)
Mtests/test-rebase-detach.t (2 lines)
Mtests/test-rebase-inmemory.t (6 lines)
Mtests/test-rebase-interruptions.t (14 lines)
Mtests/test-rebase-mq-skip.t (2 lines)
Mtests/test-rebase-mq.t (4 lines)
Mtests/test-rebase-obsolete.t (16 lines)
Mtests/test-rebase-parameters.t (2 lines)
Mtests/test-rebase-partial.t (2 lines)
Mtests/test-rebase-pull.t (2 lines)
Mtests/test-rebase-transaction.t (2 lines)
Mtests/test-resolve.t (2 lines)
Mtests/test-shelve.t (8 lines)
Mtests/test-shelve2.t (24 lines)
Mtests/test-sparse-profiles.t (2 lines)
Mtests/test-sparse.t (2 lines)
Mtests/test-state-extension.t (2 lines)

Diff 23448

mercurial/configitems.py

) )
coreconfigitem( coreconfigitem(
b'ui', b'debugger', default=None, b'ui', b'debugger', default=None,
) )
coreconfigitem( coreconfigitem(
b'ui', b'editor', default=dynamicdefault, b'ui', b'editor', default=dynamicdefault,
) )
coreconfigitem( coreconfigitem(
b'ui', b'detailed-exit-code', default=False, experimental=True,
)
coreconfigitem(
b'ui', b'fallbackencoding', default=None, b'ui', b'fallbackencoding', default=None,
) )
coreconfigitem( coreconfigitem(
b'ui', b'forcecwd', default=None, b'ui', b'forcecwd', default=None,
) )
coreconfigitem( coreconfigitem(
b'ui', b'forcemerge', default=None, b'ui', b'forcemerge', default=None,
) )

mercurial/scmutil.py

def callcatch(ui, func): def callcatch(ui, func):
"""call func() with global exception handling """call func() with global exception handling
return func() if no exception happens. otherwise do some error handling return func() if no exception happens. otherwise do some error handling
and return an exit code accordingly. does not handle all exceptions. and return an exit code accordingly. does not handle all exceptions.
""" """
coarse_exit_code = -1
detailed_exit_code = -1
try: try:
try: try:
return func() return func()
except: # re-raises except: # re-raises
ui.traceback() ui.traceback()
raise raise
# Global exception handling, alphabetically # Global exception handling, alphabetically
# Mercurial-specific first, followed by built-in and library exceptions # Mercurial-specific first, followed by built-in and library exceptions
except error.StorageError as inst: except error.StorageError as inst:
ui.error(_(b"abort: %s!\n") % inst) ui.error(_(b"abort: %s!\n") % inst)
if inst.hint: if inst.hint:
ui.error(_(b"(%s)\n") % inst.hint) ui.error(_(b"(%s)\n") % inst.hint)
except error.InterventionRequired as inst: except error.InterventionRequired as inst:
ui.error(b"%s\n" % inst) ui.error(b"%s\n" % inst)
if inst.hint: if inst.hint:
ui.error(_(b"(%s)\n") % inst.hint) ui.error(_(b"(%s)\n") % inst.hint)
return 1 detailed_exit_code = 240
coarse_exit_code = 1
except error.WdirUnsupported: except error.WdirUnsupported:
ui.error(_(b"abort: working directory revision cannot be specified\n")) ui.error(_(b"abort: working directory revision cannot be specified\n"))
except error.Abort as inst: except error.Abort as inst:
ui.error(_(b"abort: %s\n") % inst.message) ui.error(_(b"abort: %s\n") % inst.message)
if inst.hint: if inst.hint:
ui.error(_(b"(%s)\n") % inst.hint) ui.error(_(b"(%s)\n") % inst.hint)
except error.WorkerError as inst: except error.WorkerError as inst:
# Don't print a message -- the worker already should have # Don't print a message -- the worker already should have
ui.error(_(b"abort: %s\n") % encoding.strtolocal(inst.strerror)) ui.error(_(b"abort: %s\n") % encoding.strtolocal(inst.strerror))
else: # suspicious IOError else: # suspicious IOError
raise raise
except MemoryError: except MemoryError:
ui.error(_(b"abort: out of memory\n")) ui.error(_(b"abort: out of memory\n"))
except SystemExit as inst: except SystemExit as inst:
# Commands shouldn't sys.exit directly, but give a return code. # Commands shouldn't sys.exit directly, but give a return code.
# Just in case catch this and and pass exit code to caller. # Just in case catch this and and pass exit code to caller.
return inst.code detailed_exit_code = 254
coarse_exit_code = inst.code
return -1 if ui.configbool(b'ui', b'detailed-exit-code'):
return detailed_exit_code
else:
return coarse_exit_code
def checknewlabel(repo, lbl, kind): def checknewlabel(repo, lbl, kind):
# Do not use the "kind" parameter in ui output. # Do not use the "kind" parameter in ui output.
# It makes strings difficult to translate. # It makes strings difficult to translate.
if lbl in [b'tip', b'.', b'null']: if lbl in [b'tip', b'.', b'null']:
raise error.Abort(_(b"the name '%s' is reserved") % lbl) raise error.Abort(_(b"the name '%s' is reserved") % lbl)
for c in (b':', b'\0', b'\n', b'\r'): for c in (b':', b'\0', b'\n', b'\r'):

mercurial/ui.py

# for use with str.translate(None, _keepalnum), to keep just alphanumerics # for use with str.translate(None, _keepalnum), to keep just alphanumerics
_keepalnum = b''.join( _keepalnum = b''.join(
c for c in map(pycompat.bytechr, range(256)) if not c.isalnum() c for c in map(pycompat.bytechr, range(256)) if not c.isalnum()
) )
# The config knobs that will be altered (if unset) by ui.tweakdefaults. # The config knobs that will be altered (if unset) by ui.tweakdefaults.
tweakrc = b""" tweakrc = b"""
[ui] [ui]
# Gives detailed exit codes for input/user errors, config errors, etc.
detailed-exit-code = True
# The rollback command is dangerous. As a rule, don't use it. # The rollback command is dangerous. As a rule, don't use it.
rollback = False rollback = False
# Make `hg status` report copy information # Make `hg status` report copy information
statuscopies = yes statuscopies = yes
# Prefer curses UIs when available. Revert to plain-text with `text`. # Prefer curses UIs when available. Revert to plain-text with `text`.
interface = curses interface = curses
# Make compatible commands emit cwd-relative paths by default. # Make compatible commands emit cwd-relative paths by default.
relative-paths = yes relative-paths = yes

tests/run-tests.py

return env return env
def _createhgrc(self, path): def _createhgrc(self, path):
"""Create an hgrc file for this test.""" """Create an hgrc file for this test."""
with open(path, 'wb') as hgrc: with open(path, 'wb') as hgrc:
hgrc.write(b'[ui]\n') hgrc.write(b'[ui]\n')
hgrc.write(b'slash = True\n') hgrc.write(b'slash = True\n')
hgrc.write(b'interactive = False\n') hgrc.write(b'interactive = False\n')
hgrc.write(b'detailed-exit-code = True\n')
hgrc.write(b'merge = internal:merge\n') hgrc.write(b'merge = internal:merge\n')
hgrc.write(b'mergemarkers = detailed\n') hgrc.write(b'mergemarkers = detailed\n')
hgrc.write(b'promptecho = True\n') hgrc.write(b'promptecho = True\n')
hgrc.write(b'[defaults]\n') hgrc.write(b'[defaults]\n')
hgrc.write(b'[devel]\n') hgrc.write(b'[devel]\n')
hgrc.write(b'all-warnings = true\n') hgrc.write(b'all-warnings = true\n')
hgrc.write(b'default-date = 0 0\n') hgrc.write(b'default-date = 0 0\n')
hgrc.write(b'[largefiles]\n') hgrc.write(b'[largefiles]\n')

tests/test-absorb-unfinished.t

$ echo "foo2" > foo.whole $ echo "foo2" > foo.whole
$ hg commit -Aqm "foo 2" $ hg commit -Aqm "foo 2"
$ hg --config extensions.rebase= rebase -r 1 -d 0 $ hg --config extensions.rebase= rebase -r 1 -d 0
rebasing 1:c3b6dc0e177a tip "foo 2" rebasing 1:c3b6dc0e177a tip "foo 2"
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] [240]
$ hg --config extensions.rebase= absorb $ hg --config extensions.rebase= absorb
abort: rebase in progress abort: rebase in progress
(use 'hg rebase --continue', 'hg rebase --abort', or 'hg rebase --stop') (use 'hg rebase --continue', 'hg rebase --abort', or 'hg rebase --stop')
[255] [255]

tests/test-basic.t

Create a repository: Create a repository:
#if no-extraextensions #if no-extraextensions
$ hg config $ hg config
devel.all-warnings=true devel.all-warnings=true
devel.default-date=0 0 devel.default-date=0 0
extensions.fsmonitor= (fsmonitor !) extensions.fsmonitor= (fsmonitor !)
largefiles.usercache=$TESTTMP/.cache/largefiles largefiles.usercache=$TESTTMP/.cache/largefiles
lfs.usercache=$TESTTMP/.cache/lfs lfs.usercache=$TESTTMP/.cache/lfs
ui.slash=True ui.slash=True
ui.interactive=False ui.interactive=False
ui.detailed-exit-code=True
ui.merge=internal:merge ui.merge=internal:merge
ui.mergemarkers=detailed ui.mergemarkers=detailed
ui.promptecho=True ui.promptecho=True
web.address=localhost web.address=localhost
web\.ipv6=(?:True|False) (re) web\.ipv6=(?:True|False) (re)
web.server-header=testing stub value web.server-header=testing stub value
#endif #endif

tests/test-bookmarks-rebase.t

adding d adding d
created new head created new head
$ hg bookmark three $ hg bookmark three
$ hg rebase -s three -d two $ hg rebase -s three -d two
rebasing 4:dd7c838e8362 three tip "4" rebasing 4:dd7c838e8362 three tip "4"
merging d merging d
warning: conflicts while merging d! (edit, then use 'hg resolve --mark') warning: conflicts while merging d! (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] [240]
$ hg rebase --abort $ hg rebase --abort
rebase aborted rebase aborted
$ hg bookmark $ hg bookmark
one 1:925d80f479bb one 1:925d80f479bb
* three 4:dd7c838e8362 * three 4:dd7c838e8362
two 3:42e5ed2cdcf4 two 3:42e5ed2cdcf4
after aborted rebase, restoring a bookmark that has been removed should not fail after aborted rebase, restoring a bookmark that has been removed should not fail
$ hg rebase -s three -d two $ hg rebase -s three -d two
rebasing 4:dd7c838e8362 three tip "4" rebasing 4:dd7c838e8362 three tip "4"
merging d merging d
warning: conflicts while merging d! (edit, then use 'hg resolve --mark') warning: conflicts while merging d! (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] [240]
$ hg bookmark -d three $ hg bookmark -d three
$ hg rebase --abort $ hg rebase --abort
rebase aborted rebase aborted
$ hg bookmark $ hg bookmark
one 1:925d80f479bb one 1:925d80f479bb
two 3:42e5ed2cdcf4 two 3:42e5ed2cdcf4

tests/test-commandserver.t

bundle.mainreporoot=$TESTTMP/repo bundle.mainreporoot=$TESTTMP/repo
devel.all-warnings=true devel.all-warnings=true
devel.default-date=0 0 devel.default-date=0 0
extensions.fsmonitor= (fsmonitor !) extensions.fsmonitor= (fsmonitor !)
largefiles.usercache=$TESTTMP/.cache/largefiles largefiles.usercache=$TESTTMP/.cache/largefiles
lfs.usercache=$TESTTMP/.cache/lfs lfs.usercache=$TESTTMP/.cache/lfs
ui.slash=True ui.slash=True
ui.interactive=False ui.interactive=False
ui.detailed-exit-code=True
ui.merge=internal:merge ui.merge=internal:merge
ui.mergemarkers=detailed ui.mergemarkers=detailed
ui.foo=bar ui.foo=bar
ui.nontty=true ui.nontty=true
web.address=localhost web.address=localhost
web\.ipv6=(?:True|False) (re) web\.ipv6=(?:True|False) (re)
web.server-header=testing stub value web.server-header=testing stub value
*** runcommand init foo *** runcommand init foo
*** runcommand -R foo showconfig ui defaults *** runcommand -R foo showconfig ui defaults
ui.slash=True ui.slash=True
ui.interactive=False ui.interactive=False
ui.detailed-exit-code=True
ui.merge=internal:merge ui.merge=internal:merge
ui.mergemarkers=detailed ui.mergemarkers=detailed
ui.nontty=true ui.nontty=true
#endif #endif
$ rm -R foo $ rm -R foo
#if windows #if windows

tests/test-copytrace-heuristics.t

desc: initial desc: initial
$ hg rebase -s . -d 1 $ hg rebase -s . -d 1
rebasing 2:d526312210b9 tip "mode a" rebasing 2:d526312210b9 tip "mode a"
file 'a' was deleted in local [dest] but was modified in other [source]. file 'a' was deleted in local [dest] but was modified in other [source].
You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved. You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
What do you want to do? u What do you want to do? u
unresolved conflicts (see 'hg resolve', then 'hg rebase --continue') unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')
[1] [240]
$ cd .. $ cd ..
$ rm -rf repo $ rm -rf repo
Test when lca didn't modified the file that was moved Test when lca didn't modified the file that was moved
----------------------------------------------------- -----------------------------------------------------
$ hg init repo $ hg init repo
$ hg rebase -s 2 -d 1 --config experimental.copytrace.movecandidateslimit=0 $ hg rebase -s 2 -d 1 --config experimental.copytrace.movecandidateslimit=0
rebasing 2:ef716627c70b tip "mod a" rebasing 2:ef716627c70b tip "mod a"
skipping copytracing for 'a', more candidates than the limit: 7 skipping copytracing for 'a', more candidates than the limit: 7
file 'a' was deleted in local [dest] but was modified in other [source]. file 'a' was deleted in local [dest] but was modified in other [source].
You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved. You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
What do you want to do? u What do you want to do? u
unresolved conflicts (see 'hg resolve', then 'hg rebase --continue') unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')
[1] [240]
$ hg rebase --abort $ hg rebase --abort
rebase aborted rebase aborted
With default limit which is 100 With default limit which is 100
$ hg rebase -s 2 -d 1 $ hg rebase -s 2 -d 1
rebasing 2:ef716627c70b tip "mod a" rebasing 2:ef716627c70b tip "mod a"
When the sourcecommitlimit is small and we have more drafts, we use heuristics only When the sourcecommitlimit is small and we have more drafts, we use heuristics only
$ hg rebase -s 1 -d . $ hg rebase -s 1 -d .
rebasing 1:8b6e13696c38 "added more things to a" rebasing 1:8b6e13696c38 "added more things to a"
file 'a' was deleted in local [dest] but was modified in other [source]. file 'a' was deleted in local [dest] but was modified in other [source].
You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved. You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
What do you want to do? u What do you want to do? u
unresolved conflicts (see 'hg resolve', then 'hg rebase --continue') unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')
[1] [240]
But when we have "sourcecommitlimit > (no. of drafts from base to c1)", we do But when we have "sourcecommitlimit > (no. of drafts from base to c1)", we do
fullcopytracing fullcopytracing
$ hg rebase --abort $ hg rebase --abort
rebase aborted rebase aborted
$ hg rebase -s 1 -d . --config experimental.copytrace.sourcecommitlimit=100 $ hg rebase -s 1 -d . --config experimental.copytrace.sourcecommitlimit=100
rebasing 1:8b6e13696c38 "added more things to a" rebasing 1:8b6e13696c38 "added more things to a"
merging foo/bar and a to foo/bar merging foo/bar and a to foo/bar
saved backup bundle to $TESTTMP/repo/repo/repo/.hg/strip-backup/8b6e13696c38-fc14ac83-rebase.hg saved backup bundle to $TESTTMP/repo/repo/repo/.hg/strip-backup/8b6e13696c38-fc14ac83-rebase.hg
$ cd .. $ cd ..
$ rm -rf repo $ rm -rf repo

tests/test-fix.t

$ hg --config "fix.fail:command=sh $TESTTMP/fail.sh {rootpath}" \ $ hg --config "fix.fail:command=sh $TESTTMP/fail.sh {rootpath}" \
> --config "fix.fail:pattern=hello.txt" \ > --config "fix.fail:pattern=hello.txt" \
> --config "fix.failure=abort" \ > --config "fix.failure=abort" \
> fix --working-dir > fix --working-dir
[wdir] fail: hello.txt: some [wdir] fail: hello.txt: some
[wdir] fail: error that did stop the tool [wdir] fail: error that did stop the tool
abort: no fixes will be applied abort: no fixes will be applied
(use --config fix.failure=continue to apply any successful fixes anyway) (use --config fix.failure=continue to apply any successful fixes anyway)
[255] [255]
mharbison72Unsubmitted
Not Done

Sorry I missed this before. This appears to be just an error.Abort, so I can't figure out how this gets converted to 254 in the SystemExit(?) handler. Was that intentional? I don't care too much, and was kind of wondering if this is (conceptually) an InterventionRequired case.

I don't want to stall this if you have a plan or are doing more refinement in this area.

mharbison72: Sorry I missed this before. This appears to be just an `error.Abort`, so I can't figure out…
martinvonzAuthorUnsubmitted
Done

Ah, that happens because worker.py calls sys.exit(). I'll insert a patch before this one to fix that. Thanks again for pointing out these things! I clearly should have reviewed my patch much more carefully myself.

martinvonz: Ah, that happens because `worker.py` calls `sys.exit()`. I'll insert a patch before this one to…
$ cat hello.txt $ cat hello.txt
goodbye goodbye
$ cat foo.whole $ cat foo.whole
foo foo
$ hg --config "fix.fail:command=sh $TESTTMP/fail.sh {rootpath}" \ $ hg --config "fix.fail:command=sh $TESTTMP/fail.sh {rootpath}" \
> --config "fix.fail:pattern=hello.txt" \ > --config "fix.fail:pattern=hello.txt" \
> fix --working-dir > fix --working-dir
$ echo "foo2" > foo.whole $ echo "foo2" > foo.whole
$ hg commit -Aqm "foo 2" $ hg commit -Aqm "foo 2"
$ hg --config extensions.rebase= rebase -r 1 -d 0 $ hg --config extensions.rebase= rebase -r 1 -d 0
rebasing 1:c3b6dc0e177a tip "foo 2" rebasing 1:c3b6dc0e177a tip "foo 2"
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] [240]
$ 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

tests/test-histedit-arguments.t

| |
~ ~
$ HGEDITOR=cat hg histedit -r 4 --commands - << EOF $ HGEDITOR=cat hg histedit -r 4 --commands - << EOF
> edit 08d98a8350f3 4 five > edit 08d98a8350f3 4 five
> EOF > EOF
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
Editing (08d98a8350f3), you may commit or record as needed now. Editing (08d98a8350f3), you may commit or record as needed now.
(hg histedit --continue to resume) (hg histedit --continue to resume)
[1] [240]
$ hg graft --continue $ hg graft --continue
abort: no graft in progress abort: no graft in progress
(continue: hg histedit --continue) (continue: hg histedit --continue)
[255] [255]
$ mv .hg/histedit-state .hg/histedit-state.back $ mv .hg/histedit-state .hg/histedit-state.back
$ hg update --quiet --clean 2 $ hg update --quiet --clean 2
$ hg strip -q -r . --config extensions.strip= $ hg strip -q -r . --config extensions.strip=
$ hg histedit '.^' -q --keep --commands - << EOF $ hg histedit '.^' -q --keep --commands - << EOF
> edit eb57da33312f 2 three > edit eb57da33312f 2 three
> pick f3cfcca30c44 4 x > pick f3cfcca30c44 4 x
> EOF > EOF
Editing (eb57da33312f), you may commit or record as needed now. Editing (eb57da33312f), you may commit or record as needed now.
(hg histedit --continue to resume) (hg histedit --continue to resume)
[1] [240]
$ echo edit >> alpha $ echo edit >> alpha
$ hg histedit -q --continue $ hg histedit -q --continue
$ hg log -G -T '{rev}:{node|short} {desc}' $ hg log -G -T '{rev}:{node|short} {desc}'
@ 6:8fda0c726bf2 x @ 6:8fda0c726bf2 x
| |
o 5:63379946892c three o 5:63379946892c three
| |
| o 4:f3cfcca30c44 x | o 4:f3cfcca30c44 x
Test that abort fails gracefully on exception Test that abort fails gracefully on exception
---------------------------------------------- ----------------------------------------------
$ hg histedit . -q --commands - << EOF $ hg histedit . -q --commands - << EOF
> edit 8fda0c726bf2 6 x > edit 8fda0c726bf2 6 x
> EOF > EOF
Editing (8fda0c726bf2), you may commit or record as needed now. Editing (8fda0c726bf2), you may commit or record as needed now.
(hg histedit --continue to resume) (hg histedit --continue to resume)
[1] [240]
Corrupt histedit state file Corrupt histedit state file
$ sed 's/8fda0c726bf2/123456789012/' .hg/histedit-state > ../corrupt-histedit $ sed 's/8fda0c726bf2/123456789012/' .hg/histedit-state > ../corrupt-histedit
$ mv ../corrupt-histedit .hg/histedit-state $ mv ../corrupt-histedit .hg/histedit-state
$ hg abort $ hg abort
warning: encountered an exception during histedit --abort; the repository may not have been completely cleaned up warning: encountered an exception during histedit --abort; the repository may not have been completely cleaned up
abort: $TESTTMP/foo/.hg/strip-backup/*-histedit.hg: $ENOENT$ (glob) (windows !) abort: $TESTTMP/foo/.hg/strip-backup/*-histedit.hg: $ENOENT$ (glob) (windows !)
abort: $ENOENT$: '$TESTTMP/foo/.hg/strip-backup/*-histedit.hg' (glob) (no-windows !) abort: $ENOENT$: '$TESTTMP/foo/.hg/strip-backup/*-histedit.hg' (glob) (no-windows !)
[255] [255]
$ hg histedit 6f2f0241f119 --commands - <<EOF $ hg histedit 6f2f0241f119 --commands - <<EOF
> pick 8cde254db839 > pick 8cde254db839
> edit 6f2f0241f119 > edit 6f2f0241f119
> EOF > EOF
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')
Fix up the change (pick 8cde254db839) Fix up the change (pick 8cde254db839)
(hg histedit --continue to resume) (hg histedit --continue to resume)
[1] [240]
$ hg resolve -m --all $ hg resolve -m --all
(no more unresolved files) (no more unresolved files)
continue: hg histedit --continue continue: hg histedit --continue
$ hg histedit --cont $ hg histedit --cont
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')
Editing (6f2f0241f119), you may commit or record as needed now. Editing (6f2f0241f119), you may commit or record as needed now.
(hg histedit --continue to resume) (hg histedit --continue to resume)
[1] [240]
$ hg resolve -m --all $ hg resolve -m --all
(no more unresolved files) (no more unresolved files)
continue: hg histedit --continue continue: hg histedit --continue
$ hg commit --amend -m 'reject this fold' $ hg commit --amend -m 'reject this fold'
abort: histedit in progress abort: histedit in progress
(use 'hg histedit --continue' or 'hg histedit --abort') (use 'hg histedit --continue' or 'hg histedit --abort')
[255] [255]

tests/test-histedit-edit.t

$ cd r0 $ cd r0
$ hg phase -fdr0 $ hg phase -fdr0
$ hg histedit --commands - 0 2>&1 << EOF $ hg histedit --commands - 0 2>&1 << EOF
> edit cb9a9f314b8b a > $EDITED > edit cb9a9f314b8b a > $EDITED
> EOF > EOF
0 files updated, 0 files merged, 1 files removed, 0 files unresolved 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
Editing (cb9a9f314b8b), you may commit or record as needed now. Editing (cb9a9f314b8b), you may commit or record as needed now.
(hg histedit --continue to resume) (hg histedit --continue to resume)
[1] [240]
$ HGEDITOR=true hg histedit --continue $ HGEDITOR=true hg histedit --continue
saved backup bundle to $TESTTMP/r0/.hg/strip-backup/cb9a9f314b8b-cc5ccb0b-histedit.hg saved backup bundle to $TESTTMP/r0/.hg/strip-backup/cb9a9f314b8b-cc5ccb0b-histedit.hg
$ hg log -G $ hg log -G
@ changeset: 0:0efcea34f18a @ changeset: 0:0efcea34f18a
tag: tip tag: tip
user: test user: test
date: Thu Jan 01 00:00:00 1970 +0000 date: Thu Jan 01 00:00:00 1970 +0000

tests/test-histedit-fold.t

> pick 617f94f13c0f 1 +4 > pick 617f94f13c0f 1 +4
> drop 888f9082bf99 2 +5 > drop 888f9082bf99 2 +5
> fold 251d831eeec5 3 +6 > fold 251d831eeec5 3 +6
> EOF > EOF
merging file merging file
warning: conflicts while merging file! (edit, then use 'hg resolve --mark') warning: conflicts while merging file! (edit, then use 'hg resolve --mark')
Fix up the change (fold 251d831eeec5) Fix up the change (fold 251d831eeec5)
(hg histedit --continue to resume) (hg histedit --continue to resume)
[1] [240]
There were conflicts, we keep P1 content. This There were conflicts, we keep P1 content. This
should effectively drop the changes from +6. should effectively drop the changes from +6.
$ hg status -v $ hg status -v
M file M file
? file.orig ? file.orig
# The repository is in an unfinished *histedit* state. # The repository is in an unfinished *histedit* state.
> pick 617f94f13c0f 1 +4 > pick 617f94f13c0f 1 +4
> drop 888f9082bf99 2 +5 > drop 888f9082bf99 2 +5
> fold 251d831eeec5 3 +6 > fold 251d831eeec5 3 +6
> EOF > EOF
merging file merging file
warning: conflicts while merging file! (edit, then use 'hg resolve --mark') warning: conflicts while merging file! (edit, then use 'hg resolve --mark')
Fix up the change (fold 251d831eeec5) Fix up the change (fold 251d831eeec5)
(hg histedit --continue to resume) (hg histedit --continue to resume)
[1] [240]
$ cat > file << EOF $ cat > file << EOF
> 1 > 1
> 2 > 2
> 3 > 3
> 4 > 4
> 5 > 5
> EOF > EOF
$ hg resolve --mark file $ hg resolve --mark file

tests/test-histedit-no-backup.t

> pick 36b4bdd91f5b 0 one > pick 36b4bdd91f5b 0 one
> pick 6153eb23e623 1 two > pick 6153eb23e623 1 two
> roll 80d23dfa866d 2 three > roll 80d23dfa866d 2 three
> edit 7d5187087c79 3 four > edit 7d5187087c79 3 four
> EOF > EOF
merging file merging file
Editing (7d5187087c79), you may commit or record as needed now. Editing (7d5187087c79), you may commit or record as needed now.
(hg histedit --continue to resume) (hg histedit --continue to resume)
[1] [240]
$ hg abort $ hg abort
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
saved backup bundle to $TESTTMP/foo/.hg/strip-backup/1d8f701c7b35-cf7be322-backup.hg saved backup bundle to $TESTTMP/foo/.hg/strip-backup/1d8f701c7b35-cf7be322-backup.hg
saved backup bundle to $TESTTMP/foo/.hg/strip-backup/5c0056670bce-b54b65d0-backup.hg saved backup bundle to $TESTTMP/foo/.hg/strip-backup/5c0056670bce-b54b65d0-backup.hg
Test when `backup-bundle` config option is not enabled Test when `backup-bundle` config option is not enabled
Enable config option: Enable config option:
$ cat >>$HGRCPATH <<EOF $ cat >>$HGRCPATH <<EOF
> [rewrite] > [rewrite]
> backup-bundle = False > backup-bundle = False
> EOF > EOF
$ hg histedit -r '36b4bdd91f5b' --commands - << EOF $ hg histedit -r '36b4bdd91f5b' --commands - << EOF
> pick 36b4bdd91f5b 0 one > pick 36b4bdd91f5b 0 one
> pick 6153eb23e623 1 two > pick 6153eb23e623 1 two
> roll 80d23dfa866d 2 three > roll 80d23dfa866d 2 three
> edit 7d5187087c79 3 four > edit 7d5187087c79 3 four
> EOF > EOF
merging file merging file
Editing (7d5187087c79), you may commit or record as needed now. Editing (7d5187087c79), you may commit or record as needed now.
(hg histedit --continue to resume) (hg histedit --continue to resume)
[1] [240]
$ hg abort $ hg abort
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved

tests/test-histedit-obsolete.t

$ hg ci -Am c $ hg ci -Am c
adding d adding d
$ echo "pick `hg log -r 0 -T '{node|short}'`" > plan $ echo "pick `hg log -r 0 -T '{node|short}'`" > plan
$ echo "pick `hg log -r 2 -T '{node|short}'`" >> plan $ echo "pick `hg log -r 2 -T '{node|short}'`" >> plan
$ echo "edit `hg log -r 1 -T '{node|short}'`" >> plan $ echo "edit `hg log -r 1 -T '{node|short}'`" >> plan
$ hg histedit -r 'all()' --commands plan $ hg histedit -r 'all()' --commands plan
Editing (1b2d564fad96), you may commit or record as needed now. Editing (1b2d564fad96), you may commit or record as needed now.
(hg histedit --continue to resume) (hg histedit --continue to resume)
[1] [240]
$ hg st $ hg st
A b A b
A c A c
? plan ? plan
$ hg commit --amend b $ hg commit --amend b
$ hg histedit --continue $ hg histedit --continue
$ hg log -G $ hg log -G
@ 5:46abc7c4d873 b @ 5:46abc7c4d873 b
With some node gone missing during the edit. With some node gone missing during the edit.
$ echo "pick `hg log -r 0 -T '{node|short}'`" > plan $ echo "pick `hg log -r 0 -T '{node|short}'`" > plan
$ echo "pick `hg log -r 5 -T '{node|short}'`" >> plan $ echo "pick `hg log -r 5 -T '{node|short}'`" >> plan
$ echo "edit `hg log -r 4 -T '{node|short}'`" >> plan $ echo "edit `hg log -r 4 -T '{node|short}'`" >> plan
$ hg histedit -r 'all()' --commands plan $ hg histedit -r 'all()' --commands plan
Editing (49d44ab2be1b), you may commit or record as needed now. Editing (49d44ab2be1b), you may commit or record as needed now.
(hg histedit --continue to resume) (hg histedit --continue to resume)
[1] [240]
$ hg st $ hg st
A b A b
A d A d
? plan ? plan
$ hg commit --amend -X . -m XXXXXX $ hg commit --amend -X . -m XXXXXX
$ hg commit --amend -X . -m b2 $ hg commit --amend -X . -m b2
$ hg --hidden --config extensions.strip= strip 'desc(XXXXXX)' --no-backup $ hg --hidden --config extensions.strip= strip 'desc(XXXXXX)' --no-backup
$ hg histedit --continue $ hg histedit --continue
$ hg log -r 'children(.)' $ hg log -r 'children(.)'
11:c13eb81022ca f (no-eol) 11:c13eb81022ca f (no-eol)
$ hg histedit -r '.' --commands - <<EOF $ hg histedit -r '.' --commands - <<EOF
> edit b346ab9a313d 6 c > edit b346ab9a313d 6 c
> EOF > EOF
0 files updated, 0 files merged, 1 files removed, 0 files unresolved 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
Editing (b346ab9a313d), you may commit or record as needed now. Editing (b346ab9a313d), you may commit or record as needed now.
(hg histedit --continue to resume) (hg histedit --continue to resume)
[1] [240]
$ echo c >> c $ echo c >> c
$ hg histedit --continue $ hg histedit --continue
1 new orphan changesets 1 new orphan changesets
$ hg log -r 'orphan()' $ hg log -r 'orphan()'
11:c13eb81022ca f (no-eol) 11:c13eb81022ca f (no-eol)
stabilise stabilise
> pick 7395e1ff83bd 13 h > pick 7395e1ff83bd 13 h
> pick b605fb7503f2 14 i > pick b605fb7503f2 14 i
> pick 3a6c53ee7f3d 15 j > pick 3a6c53ee7f3d 15 j
> pick ee118ab9fa44 16 k > pick ee118ab9fa44 16 k
> EOF > EOF
0 files updated, 0 files merged, 6 files removed, 0 files unresolved 0 files updated, 0 files merged, 6 files removed, 0 files unresolved
Editing (b449568bf7fc), you may commit or record as needed now. Editing (b449568bf7fc), you may commit or record as needed now.
(hg histedit --continue to resume) (hg histedit --continue to resume)
[1] [240]
$ echo f >> f $ echo f >> f
$ hg histedit --continue $ hg histedit --continue
$ hg log -G $ hg log -G
@ 24:12e89af74238 (secret) k @ 24:12e89af74238 (secret) k
| |
o 23:636a8687b22e (secret) j o 23:636a8687b22e (secret) j
| |
o 22:ccaf0a38653f (secret) i o 22:ccaf0a38653f (secret) i
> pick 7395e1ff83bd 13 h > pick 7395e1ff83bd 13 h
> pick b605fb7503f2 14 i > pick b605fb7503f2 14 i
> pick 3a6c53ee7f3d 15 j > pick 3a6c53ee7f3d 15 j
> pick ee118ab9fa44 16 k > pick ee118ab9fa44 16 k
> EOF > EOF
0 files updated, 0 files merged, 6 files removed, 0 files unresolved 0 files updated, 0 files merged, 6 files removed, 0 files unresolved
Editing (b449568bf7fc), you may commit or record as needed now. Editing (b449568bf7fc), you may commit or record as needed now.
(hg histedit --continue to resume) (hg histedit --continue to resume)
[1] [240]
$ echo f >> f $ echo f >> f
$ hg histedit --continue $ hg histedit --continue
$ hg log -G $ hg log -G
@ 24:12e89af74238 (secret) k @ 24:12e89af74238 (secret) k
| |
o 23:636a8687b22e (secret) j o 23:636a8687b22e (secret) j
| |
o 22:ccaf0a38653f (secret) i o 22:ccaf0a38653f (secret) i
> pick 7395e1ff83bd 15 h > pick 7395e1ff83bd 15 h
> pick 6b70183d2492 14 g > pick 6b70183d2492 14 g
> pick b605fb7503f2 16 i > pick b605fb7503f2 16 i
> roll 3a6c53ee7f3d 17 j > roll 3a6c53ee7f3d 17 j
> edit ee118ab9fa44 18 k > edit ee118ab9fa44 18 k
> EOF > EOF
Editing (ee118ab9fa44), you may commit or record as needed now. Editing (ee118ab9fa44), you may commit or record as needed now.
(hg histedit --continue to resume) (hg histedit --continue to resume)
[1] [240]
#if abortcommand #if abortcommand
when in dry-run mode when in dry-run mode
$ hg abort --dry-run $ hg abort --dry-run
histedit in progress, will be aborted histedit in progress, will be aborted
#endif #endif
$ hg abort $ hg abort
> pick 7395e1ff83bd 15 h > pick 7395e1ff83bd 15 h
> pick 6b70183d2492 14 g > pick 6b70183d2492 14 g
> pick b605fb7503f2 16 i > pick b605fb7503f2 16 i
> pick 3a6c53ee7f3d 17 j > pick 3a6c53ee7f3d 17 j
> edit ee118ab9fa44 18 k > edit ee118ab9fa44 18 k
> EOF > EOF
Editing (ee118ab9fa44), you may commit or record as needed now. Editing (ee118ab9fa44), you may commit or record as needed now.
(hg histedit --continue to resume) (hg histedit --continue to resume)
[1] [240]
$ hg histedit --continue --config experimental.evolution.track-operation=1 $ hg histedit --continue --config experimental.evolution.track-operation=1
$ hg log -G $ hg log -G
@ 23:175d6b286a22 (secret) k @ 23:175d6b286a22 (secret) k
| |
o 22:44ca09d59ae4 (secret) j o 22:44ca09d59ae4 (secret) j
| |
o 21:31747692a644 (secret) i o 21:31747692a644 (secret) i
| |

tests/test-largefiles-update.t

rebasing 1:72518492caa6 "#1" rebasing 1:72518492caa6 "#1"
largefile large1 has a merge conflict largefile large1 has a merge conflict
ancestor was 4669e532d5b2c093a78eca010077e708a071bb64 ancestor was 4669e532d5b2c093a78eca010077e708a071bb64
you can keep (l)ocal e5bb990443d6a92aaf7223813720f7566c9dd05b or take (o)ther 58e24f733a964da346e2407a2bee99d9001184f5. you can keep (l)ocal e5bb990443d6a92aaf7223813720f7566c9dd05b or take (o)ther 58e24f733a964da346e2407a2bee99d9001184f5.
what do you want to do? o what do you want to do? o
merging normal1 merging normal1
warning: conflicts while merging normal1! (edit, then use 'hg resolve --mark') warning: conflicts while merging normal1! (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] [240]
$ cat .hglf/large1 $ cat .hglf/large1
58e24f733a964da346e2407a2bee99d9001184f5 58e24f733a964da346e2407a2bee99d9001184f5
$ cat large1 $ cat large1
large1 in #1 large1 in #1
$ rm normal1.orig $ rm normal1.orig
Test that rebase updates standins for manually modified largefiles at Test that rebase updates standins for manually modified largefiles at
the 1st commit of resuming. the 1st commit of resuming.
added: added:
$ cat << EOF > ../crashupdatelfiles.py $ cat << EOF > ../crashupdatelfiles.py
> import hgext.largefiles.lfutil > import hgext.largefiles.lfutil
> def getlfilestoupdate(oldstandins, newstandins): > def getlfilestoupdate(oldstandins, newstandins):
> raise SystemExit(7) > raise SystemExit(7)
> hgext.largefiles.lfutil.getlfilestoupdate = getlfilestoupdate > hgext.largefiles.lfutil.getlfilestoupdate = getlfilestoupdate
> EOF > EOF
$ hg up -Cr "8" --config extensions.crashupdatelfiles=../crashupdatelfiles.py $ hg up -Cr "8" --config extensions.crashupdatelfiles=../crashupdatelfiles.py
[7] [254]
mharbison72Unsubmitted
Not Done

I assume we don't care about no longer propagating the extension's exit status because it's a python extension, so no API guarantees? Just pointing it out in case this was overlooked in the sea of changes.

mharbison72: I assume we don't care about no longer propagating the extension's exit status because it's a…
martinvonzAuthorUnsubmitted
Done

Hmm, I had not noticed this one either. It seems better to consider it an internal error if an extension raises SystemExit, so I think this looks like an improvement.

martinvonz: Hmm, I had not noticed this one either. It seems better to consider it an internal error if an…
Check large1 content and status ... and that update will undo modifications: Check large1 content and status ... and that update will undo modifications:
$ cat large1 $ cat large1
large1 in #3 large1 in #3
$ hg st $ hg st
M large1 M large1
! largeX ! largeX
$ hg up -Cr . $ hg up -Cr .
getting changed largefiles getting changed largefiles

tests/test-legacy-exit-code.t

  • This file was added.
Tests that the exit code is as expected when ui.detailed-exit-code is *not*
enabled.
$ cat >> $HGRCPATH << EOF
> [ui]
> detailed-exit-code=no
> EOF
$ hg init
$ echo a > a
Expect exit code 0 on success
$ hg ci -Aqm initial
$ hg co nonexistent
abort: unknown revision 'nonexistent'!
[255]
$ hg co 'none()'
abort: empty revision set
[255]
$ hg co 'invalid('
hg: parse error at 8: not a prefix: end
(invalid(
^ here)
[255]
$ hg co 'invalid('
hg: parse error at 8: not a prefix: end
(invalid(
^ here)
[255]
$ hg continue
abort: no operation in progress
[255]
$ hg st --config a=b
abort: malformed --config option: 'a=b' (use --config section.name=value)
[255]
$ echo b > a
$ hg ci -m second
$ echo c > a
$ hg ci -m third
$ hg --config extensions.rebase= rebase -r . -d 0 -q
warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')
[1]

tests/test-merge-halt.t

$ echo on-failure=continue >> $HGRCPATH $ echo on-failure=continue >> $HGRCPATH
$ hg rebase -s 1 -d 2 --tool false $ hg rebase -s 1 -d 2 --tool false
rebasing 1:1f28a51c3c9b "c" rebasing 1:1f28a51c3c9b "c"
merging a merging a
merging b merging b
merging a failed! merging a failed!
merging b failed! merging b failed!
unresolved conflicts (see 'hg resolve', then 'hg rebase --continue') unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')
[1] [240]
$ hg resolve --list $ hg resolve --list
U a U a
U b U b
$ hg rebase --abort $ hg rebase --abort
rebase aborted rebase aborted
Testing on-failure=halt Testing on-failure=halt
$ echo on-failure=halt >> $HGRCPATH $ echo on-failure=halt >> $HGRCPATH
$ hg rebase -s 1 -d 2 --tool false $ hg rebase -s 1 -d 2 --tool false
rebasing 1:1f28a51c3c9b "c" rebasing 1:1f28a51c3c9b "c"
merging a merging a
merging b merging b
merging a failed! merging a failed!
merge halted after failed merge (see hg resolve) merge halted after failed merge (see hg resolve)
[1] [240]
$ hg resolve --list $ hg resolve --list
U a U a
U b U b
$ hg rebase --abort $ hg rebase --abort
rebase aborted rebase aborted
rebasing 1:1f28a51c3c9b "c" rebasing 1:1f28a51c3c9b "c"
merging a merging a
merging b merging b
merging a failed! merging a failed!
continue merge operation (yn)? y continue merge operation (yn)? y
merging b failed! merging b failed!
continue merge operation (yn)? n continue merge operation (yn)? n
merge halted after failed merge (see hg resolve) merge halted after failed merge (see hg resolve)
[1] [240]
$ hg resolve --list $ hg resolve --list
U a U a
U b U b
$ hg rebase --abort $ hg rebase --abort
rebase aborted rebase aborted
merging b merging b
output file a appears unchanged output file a appears unchanged
was merge successful (yn)? y was merge successful (yn)? y
output file b appears unchanged output file b appears unchanged
was merge successful (yn)? n was merge successful (yn)? n
merging b failed! merging b failed!
continue merge operation (yn)? n continue merge operation (yn)? n
merge halted after failed merge (see hg resolve) merge halted after failed merge (see hg resolve)
[1] [240]
$ hg resolve --list $ hg resolve --list
R a R a
U b U b
$ hg rebase --abort $ hg rebase --abort
rebase aborted rebase aborted
Check that conflicts with conflict check also halts the merge Check that conflicts with conflict check also halts the merge
$ cat <<EOS >> $HGRCPATH $ cat <<EOS >> $HGRCPATH
> [merge-tools] > [merge-tools]
> true.check=conflicts > true.check=conflicts
> true.premerge=keep > true.premerge=keep
> [merge] > [merge]
> on-failure=halt > on-failure=halt
> EOS > EOS
$ hg rebase -s 1 -d 2 --tool true $ hg rebase -s 1 -d 2 --tool true
rebasing 1:1f28a51c3c9b "c" rebasing 1:1f28a51c3c9b "c"
merging a merging a
merging b merging b
merging a failed! merging a failed!
merge halted after failed merge (see hg resolve) merge halted after failed merge (see hg resolve)
[1] [240]
$ hg resolve --list $ hg resolve --list
U a U a
U b U b
$ hg rebase --abort $ hg rebase --abort
rebase aborted rebase aborted
Check that always-prompt also can halt the merge Check that always-prompt also can halt the merge
$ cat <<EOS | hg rebase -s 1 -d 2 --tool true --config merge-tools.true.check=prompt $ cat <<EOS | hg rebase -s 1 -d 2 --tool true --config merge-tools.true.check=prompt
> y > y
> n > n
> EOS > EOS
rebasing 1:1f28a51c3c9b "c" rebasing 1:1f28a51c3c9b "c"
merging a merging a
merging b merging b
was merge of 'a' successful (yn)? y was merge of 'a' successful (yn)? y
was merge of 'b' successful (yn)? n was merge of 'b' successful (yn)? n
merging b failed! merging b failed!
merge halted after failed merge (see hg resolve) merge halted after failed merge (see hg resolve)
[1] [240]
$ hg resolve --list $ hg resolve --list
R a R a
U b U b
$ hg rebase --abort $ hg rebase --abort
rebase aborted rebase aborted
Check that successful tool otherwise allows the merge to continue Check that successful tool otherwise allows the merge to continue
$ hg rebase -s 1 -d 2 --tool echo --keep --config merge-tools.echo.premerge=keep $ hg rebase -s 1 -d 2 --tool echo --keep --config merge-tools.echo.premerge=keep
rebasing 1:1f28a51c3c9b "c" rebasing 1:1f28a51c3c9b "c"
merging a merging a
merging b merging b
$TESTTMP/repo/a *a~base* *a~other* (glob) $TESTTMP/repo/a *a~base* *a~other* (glob)
$TESTTMP/repo/b *b~base* *b~other* (glob) $TESTTMP/repo/b *b~base* *b~other* (glob)

tests/test-qrecord.t

summary: foo bar summary: foo bar
$ hg histedit tip --commands - 2>&1 <<EOF $ hg histedit tip --commands - 2>&1 <<EOF
> edit ea55e2ae468f foo bar > edit ea55e2ae468f foo bar
> EOF > EOF
0 files updated, 0 files merged, 1 files removed, 0 files unresolved 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
Editing (ea55e2ae468f), you may commit or record as needed now. Editing (ea55e2ae468f), you may commit or record as needed now.
(hg histedit --continue to resume) (hg histedit --continue to resume)
[1] [240]
$ echo 'foo bar' > a $ echo 'foo bar' > a
$ hg qrecord -d '0 0' -m aaa a.patch <<EOF $ hg qrecord -d '0 0' -m aaa a.patch <<EOF
> y > y
> y > y
> n > n
> y > y
> y > y
> n > n
> EOF > EOF
abort: histedit in progress abort: histedit in progress
(use 'hg histedit --continue' or 'hg histedit --abort') (use 'hg histedit --continue' or 'hg histedit --abort')
[255] [255]

tests/test-rebase-abort.t

Conflicting rebase: Conflicting rebase:
$ hg rebase -s 3 -d 2 $ hg rebase -s 3 -d 2
rebasing 3:3163e20567cc "L1" rebasing 3:3163e20567cc "L1"
rebasing 4:46f0b057b5c0 tip "L2" rebasing 4:46f0b057b5c0 tip "L2"
merging common merging common
warning: conflicts while merging common! (edit, then use 'hg resolve --mark') warning: conflicts while merging common! (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] [240]
Insert unsupported advisory merge record: Insert unsupported advisory merge record:
$ hg --config extensions.fakemergerecord=$TESTDIR/fakemergerecord.py fakemergerecord -x $ hg --config extensions.fakemergerecord=$TESTDIR/fakemergerecord.py fakemergerecord -x
$ hg debugmergestate $ hg debugmergestate
local (dest): 3e046f2ecedb793b97ed32108086edd1a162f8bc local (dest): 3e046f2ecedb793b97ed32108086edd1a162f8bc
other (source): 46f0b057b5c061d276b91491c22151f78698abd2 other (source): 46f0b057b5c061d276b91491c22151f78698abd2
file: common (state "u") file: common (state "u")
earlier than 2.7 by renaming ".hg/rebasestate" temporarily. earlier than 2.7 by renaming ".hg/rebasestate" temporarily.
$ hg rebase -s 3 -d 2 $ hg rebase -s 3 -d 2
rebasing 3:3163e20567cc "L1" rebasing 3:3163e20567cc "L1"
rebasing 4:46f0b057b5c0 tip "L2" rebasing 4:46f0b057b5c0 tip "L2"
merging common merging common
warning: conflicts while merging common! (edit, then use 'hg resolve --mark') warning: conflicts while merging common! (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] [240]
$ mv .hg/rebasestate .hg/rebasestate.back $ mv .hg/rebasestate .hg/rebasestate.back
$ hg update --quiet --clean 2 $ hg update --quiet --clean 2
$ hg --config extensions.mq= strip --quiet "destination()" $ hg --config extensions.mq= strip --quiet "destination()"
$ mv .hg/rebasestate.back .hg/rebasestate $ mv .hg/rebasestate.back .hg/rebasestate
$ hg continue $ hg continue
abort: cannot continue inconsistent rebase abort: cannot continue inconsistent rebase
$ hg rebase -b 4 -d 2 $ hg rebase -b 4 -d 2
rebasing 3:a6484957d6b9 "B bis" rebasing 3:a6484957d6b9 "B bis"
note: not rebasing 3:a6484957d6b9 "B bis", its destination already has all its changes note: not rebasing 3:a6484957d6b9 "B bis", its destination already has all its changes
rebasing 4:145842775fec tip "C1" rebasing 4:145842775fec tip "C1"
merging c merging c
warning: conflicts while merging c! (edit, then use 'hg resolve --mark') warning: conflicts while merging c! (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] [240]
$ hg tglog $ hg tglog
% 4:draft 'C1' % 4:draft 'C1'
| |
o 3:draft 'B bis' o 3:draft 'B bis'
| |
| @ 2:secret 'C' | @ 2:secret 'C'
| | | |
o 0 a o 0 a
$ hg rebase -d master -r foo $ hg rebase -d master -r foo
rebasing 3:6c0f977a22d8 foo tip "C" rebasing 3:6c0f977a22d8 foo tip "C"
merging c merging c
warning: conflicts while merging c! (edit, then use 'hg resolve --mark') warning: conflicts while merging c! (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] [240]
$ hg abort $ hg abort
rebase aborted rebase aborted
$ hg log -G --template "{rev} {desc} {bookmarks}" $ hg log -G --template "{rev} {desc} {bookmarks}"
@ 3 C foo @ 3 C foo
| |
| o 2 c master | o 2 c master
| | | |
o | 1 b o | 1 b
$ echo y > b $ echo y > b
$ hg add b $ hg add b
$ hg commit -m b2 $ hg commit -m b2
created new head created new head
$ hg rebase -d @ -b foo --tool=internal:fail $ hg rebase -d @ -b foo --tool=internal:fail
rebasing 2:070cf4580bb5 foo tip "b2" rebasing 2:070cf4580bb5 foo tip "b2"
unresolved conflicts (see 'hg resolve', then 'hg rebase --continue') unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')
[1] [240]
$ mv .hg/rebasestate ./ # so we're allowed to hg up like in mercurial <2.6.3 $ mv .hg/rebasestate ./ # so we're allowed to hg up like in mercurial <2.6.3
$ 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 ci -m "conflicting 1" $ hg ci -m "conflicting 1"
created new head created new head
$ echo "conflicting change 2" > foo.txt $ echo "conflicting change 2" > foo.txt
$ hg ci -m "conflicting 2" $ hg ci -m "conflicting 2"
$ hg rebase -d 1 --tool 'internal:fail' $ hg rebase -d 1 --tool 'internal:fail'
rebasing 2:e4ea5cdc9789 "conflicting 1" rebasing 2:e4ea5cdc9789 "conflicting 1"
unresolved conflicts (see 'hg resolve', then 'hg rebase --continue') unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')
[1] [240]
$ hg abort $ hg abort
rebase aborted rebase aborted
$ hg summary $ hg summary
parent: 3:b16646383533 tip parent: 3:b16646383533 tip
conflicting 2 conflicting 2
branch: default branch: default
commit: (clean) commit: (clean)
update: 1 new changesets, 2 branch heads (merge) update: 1 new changesets, 2 branch heads (merge)
$ echo 'addedcontADDEDentadded' > root $ echo 'addedcontADDEDentadded' > root
commit will cause merge conflict on rebase commit will cause merge conflict on rebase
$ hg commit -m 'add content draft' -q $ hg commit -m 'add content draft' -q
$ hg rebase -d 'public()' --tool :merge -q $ hg rebase -d 'public()' --tool :merge -q
note: not rebasing 3:0682fd3dabf5 "disappear draft", its destination already has all its changes note: not rebasing 3:0682fd3dabf5 "disappear draft", its destination already has all its changes
warning: conflicts while merging root! (edit, then use 'hg resolve --mark') warning: conflicts while merging root! (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] [240]
$ hg abort $ hg abort
rebase aborted rebase aborted
$ cd .. $ cd ..

tests/test-rebase-backup.t

> backup-bundle = True > backup-bundle = True
> EOF > EOF
$ hg rebase -s 5 -d . $ hg rebase -s 5 -d .
rebasing 5:1f8148a544ee "b" rebasing 5:1f8148a544ee "b"
rebasing 6:f8bc7d28e573 "c" rebasing 6:f8bc7d28e573 "c"
merging c merging c
warning: conflicts while merging c! (edit, then use 'hg resolve --mark') warning: conflicts while merging c! (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] [240]
$ hg rebase --abort $ hg rebase --abort
saved backup bundle to $TESTTMP/repo1/.hg/strip-backup/818c1a43c916-2b644d96-backup.hg saved backup bundle to $TESTTMP/repo1/.hg/strip-backup/818c1a43c916-2b644d96-backup.hg
rebase aborted rebase aborted
When backup-bundle = False: When backup-bundle = False:
$ cat << EOF >> $HGRCPATH $ cat << EOF >> $HGRCPATH
> [rewrite] > [rewrite]
> backup-bundle = False > backup-bundle = False
> EOF > EOF
$ hg rebase -s 5 -d . $ hg rebase -s 5 -d .
rebasing 5:1f8148a544ee "b" rebasing 5:1f8148a544ee "b"
rebasing 6:f8bc7d28e573 "c" rebasing 6:f8bc7d28e573 "c"
merging c merging c
warning: conflicts while merging c! (edit, then use 'hg resolve --mark') warning: conflicts while merging c! (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] [240]
$ hg rebase --abort $ hg rebase --abort
rebase aborted rebase aborted
$ cd .. $ cd ..

tests/test-rebase-bookmarks.t

created new head created new head
$ hg up 3 $ hg up 3
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg rebase --dest 4 $ hg rebase --dest 4
rebasing 3:3d5fa227f4b5 Y Z "C" rebasing 3:3d5fa227f4b5 Y Z "C"
merging c merging c
warning: conflicts while merging c! (edit, then use 'hg resolve --mark') warning: conflicts while merging c! (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] [240]
$ echo 'c' > c $ echo 'c' > c
$ hg resolve --mark c $ hg resolve --mark c
(no more unresolved files) (no more unresolved files)
continue: hg rebase --continue continue: hg rebase --continue
$ hg rebase --continue $ hg rebase --continue
rebasing 3:3d5fa227f4b5 Y Z "C" rebasing 3:3d5fa227f4b5 Y Z "C"
saved backup bundle to $TESTTMP/a3/.hg/strip-backup/3d5fa227f4b5-c6ea2371-rebase.hg saved backup bundle to $TESTTMP/a3/.hg/strip-backup/3d5fa227f4b5-c6ea2371-rebase.hg
$ hg tglog $ hg tglog

tests/test-rebase-check-restore.t

o 0:draft 'A' o 0:draft 'A'
$ hg rebase -s 1 -d 4 --keep $ hg rebase -s 1 -d 4 --keep
rebasing 1:27547f69f254 "B" rebasing 1:27547f69f254 "B"
rebasing 2:965c486023db "C" rebasing 2:965c486023db "C"
merging A merging A
warning: conflicts while merging A! (edit, then use 'hg resolve --mark') warning: conflicts while merging A! (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] [240]
Solve the conflict and go on: Solve the conflict and go on:
$ echo 'conflict solved' > A $ echo 'conflict solved' > A
$ rm A.orig $ rm A.orig
$ hg resolve -m A $ hg resolve -m A
(no more unresolved files) (no more unresolved files)
continue: hg rebase --continue continue: hg rebase --continue
|/ |/
o 0:draft 'A' o 0:draft 'A'
$ hg rebase -s 5 -d 4 --keepbranches $ hg rebase -s 5 -d 4 --keepbranches
rebasing 5:01e6ebbd8272 tip "F" rebasing 5:01e6ebbd8272 tip "F"
merging A merging A
warning: conflicts while merging A! (edit, then use 'hg resolve --mark') warning: conflicts while merging A! (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] [240]
Solve the conflict and go on: Solve the conflict and go on:
$ echo 'conflict solved' > A $ echo 'conflict solved' > A
$ rm A.orig $ rm A.orig
$ hg resolve -m A $ hg resolve -m A
(no more unresolved files) (no more unresolved files)
continue: hg rebase --continue continue: hg rebase --continue

tests/test-rebase-collapse.t

> EOF > EOF
$ hg rebase -s F --dest I --collapse # root (F) is not a merge $ hg rebase -s F --dest I --collapse # root (F) is not a merge
rebasing 6:c82b08f646f1 F "F" rebasing 6:c82b08f646f1 F "F"
file 'E' was deleted in local [dest] but was modified in other [source]. file 'E' was deleted in local [dest] but was modified in other [source].
You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved. You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
What do you want to do? u What do you want to do? u
unresolved conflicts (see 'hg resolve', then 'hg rebase --continue') unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')
[1] [240]
$ echo F > E $ echo F > E
$ hg resolve -m $ hg resolve -m
(no more unresolved files) (no more unresolved files)
continue: hg rebase --continue continue: hg rebase --continue
$ hg rebase -c $ hg rebase -c
rebasing 6:c82b08f646f1 F "F" rebasing 6:c82b08f646f1 F "F"
rebasing 7:a6db7fa104e1 G "G" rebasing 7:a6db7fa104e1 G "G"
> |/ # C/A = C\n > |/ # C/A = C\n
> A > A
> EOF > EOF
$ hg rebase --collapse -m "new message" -b B -d C $ hg rebase --collapse -m "new message" -b B -d C
rebasing 1:81e5401e4d37 B "B" rebasing 1:81e5401e4d37 B "B"
merging A merging A
warning: conflicts while merging A! (edit, then use 'hg resolve --mark') warning: conflicts while merging A! (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] [240]
$ rm A.orig $ rm A.orig
$ hg resolve --mark A $ hg resolve --mark A
(no more unresolved files) (no more unresolved files)
continue: hg rebase --continue continue: hg rebase --continue
$ hg rebase --continue $ hg rebase --continue
rebasing 1:81e5401e4d37 B "B" rebasing 1:81e5401e4d37 B "B"
saved backup bundle to $TESTTMP/collapse_remember_message/.hg/strip-backup/81e5401e4d37-96c3dd30-rebase.hg saved backup bundle to $TESTTMP/collapse_remember_message/.hg/strip-backup/81e5401e4d37-96c3dd30-rebase.hg
$ hg log $ hg log
> |/ # A/A = A\n > |/ # A/A = A\n
> A > A
> EOF > EOF
$ hg rebase --collapse -t internal:merge3 -s B -d D $ hg rebase --collapse -t internal:merge3 -s B -d D
rebasing 1:f899f3910ce7 B "B" rebasing 1:f899f3910ce7 B "B"
merging A merging A
warning: conflicts while merging A! (edit, then use 'hg resolve --mark') warning: conflicts while merging A! (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] [240]
$ hg tglog $ hg tglog
o 3: 63668d570d21 'C' o 3: 63668d570d21 'C'
| |
| @ 2: 82b8abf9c185 'D' | @ 2: 82b8abf9c185 'D'
| | | |
% | 1: f899f3910ce7 'B' % | 1: f899f3910ce7 'B'
|/ |/
o 0: 4a2df7238c3b 'A' o 0: 4a2df7238c3b 'A'
(no more unresolved files) (no more unresolved files)
continue: hg rebase --continue continue: hg rebase --continue
$ hg rebase --continue $ hg rebase --continue
rebasing 1:f899f3910ce7 B "B" rebasing 1:f899f3910ce7 B "B"
rebasing 3:63668d570d21 C tip "C" rebasing 3:63668d570d21 C tip "C"
merging A merging A
warning: conflicts while merging A! (edit, then use 'hg resolve --mark') warning: conflicts while merging A! (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] [240]
$ hg tglog $ hg tglog
% 3: 63668d570d21 'C' % 3: 63668d570d21 'C'
| |
| @ 2: 82b8abf9c185 'D' | @ 2: 82b8abf9c185 'D'
| | | |
o | 1: f899f3910ce7 'B' o | 1: f899f3910ce7 'B'
|/ |/
o 0: 4a2df7238c3b 'A' o 0: 4a2df7238c3b 'A'

tests/test-rebase-conflicts.t

Conflicting rebase: Conflicting rebase:
$ hg rebase -s 3 -d 2 $ hg rebase -s 3 -d 2
rebasing 3:3163e20567cc "L1" rebasing 3:3163e20567cc "L1"
rebasing 4:46f0b057b5c0 "L2" rebasing 4:46f0b057b5c0 "L2"
merging common merging common
warning: conflicts while merging common! (edit, then use 'hg resolve --mark') warning: conflicts while merging common! (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] [240]
$ hg status --config commands.status.verbose=1 $ hg status --config commands.status.verbose=1
M common M common
? common.orig ? common.orig
# The repository is in an unfinished *rebase* state. # The repository is in an unfinished *rebase* state.
# Unresolved merge conflicts: # Unresolved merge conflicts:
# #
$ echo b >> a $ echo b >> a
$ echo c >> a $ echo c >> a
$ hg commit -q -m 'abc' $ hg commit -q -m 'abc'
$ hg rebase -s 7bc217434fc1 -d ab --keep $ hg rebase -s 7bc217434fc1 -d ab --keep
rebasing 13:7bc217434fc1 tip "abc" rebasing 13:7bc217434fc1 tip "abc"
merging a merging a
warning: conflicts while merging a! (edit, then use 'hg resolve --mark') warning: conflicts while merging a! (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] [240]
$ hg diff $ hg diff
diff -r 328e4ab1f7cc a diff -r 328e4ab1f7cc a
--- a/a Thu Jan 01 00:00:00 1970 +0000 --- a/a Thu Jan 01 00:00:00 1970 +0000
+++ b/a * (glob) +++ b/a * (glob)
@@ -1,2 +1,6 @@ @@ -1,2 +1,6 @@
a a
b b
+<<<<<<< dest: 328e4ab1f7cc ab - test: ab +<<<<<<< dest: 328e4ab1f7cc ab - test: ab
+======= +=======
+c +c
+>>>>>>> source: 7bc217434fc1 - test: abc +>>>>>>> source: 7bc217434fc1 - test: abc
$ hg rebase --abort $ hg rebase --abort
rebase aborted rebase aborted
$ hg up -q -C 7bc217434fc1 $ hg up -q -C 7bc217434fc1
$ hg rebase -s . -d ab --keep -t internal:merge3 $ hg rebase -s . -d ab --keep -t internal:merge3
rebasing 13:7bc217434fc1 tip "abc" rebasing 13:7bc217434fc1 tip "abc"
merging a merging a
warning: conflicts while merging a! (edit, then use 'hg resolve --mark') warning: conflicts while merging a! (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] [240]
$ hg diff $ hg diff
diff -r 328e4ab1f7cc a diff -r 328e4ab1f7cc a
--- a/a Thu Jan 01 00:00:00 1970 +0000 --- a/a Thu Jan 01 00:00:00 1970 +0000
+++ b/a * (glob) +++ b/a * (glob)
@@ -1,2 +1,8 @@ @@ -1,2 +1,8 @@
a a
+<<<<<<< dest: 328e4ab1f7cc ab - test: ab +<<<<<<< dest: 328e4ab1f7cc ab - test: ab
b b
$ hg update E -q $ hg update E -q
$ echo 3 > B $ echo 3 > B
$ hg commit --amend -m E -A B -q $ hg commit --amend -m E -A B -q
$ hg rebase -r B+D -d . --config experimental.evolution=true $ hg rebase -r B+D -d . --config experimental.evolution=true
rebasing 1:112478962961 B "B" rebasing 1:112478962961 B "B"
merging B merging B
warning: conflicts while merging B! (edit, then use 'hg resolve --mark') warning: conflicts while merging B! (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] [240]
$ echo 4 > B $ echo 4 > B
$ hg resolve -m $ hg resolve -m
(no more unresolved files) (no more unresolved files)
continue: hg rebase --continue continue: hg rebase --continue
$ hg rebase --continue --config experimental.evolution=none $ hg rebase --continue --config experimental.evolution=none
rebasing 1:112478962961 B "B" rebasing 1:112478962961 B "B"
rebasing 3:f585351a92f8 D "D" rebasing 3:f585351a92f8 D "D"
$ hg rebase -d B $ hg rebase -d B
rebasing 2:dc0947a82db8 C "C" rebasing 2:dc0947a82db8 C "C"
rebasing 3:e7b3f00ed42e D "D" rebasing 3:e7b3f00ed42e D "D"
rebasing 4:03ca77807e91 E "E" rebasing 4:03ca77807e91 E "E"
rebasing 5:9a6b91dc2044 F tip "F" rebasing 5:9a6b91dc2044 F tip "F"
merging conflict merging conflict
warning: conflicts while merging conflict! (edit, then use 'hg resolve --mark') warning: conflicts while merging conflict! (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] [240]
$ hg tglog $ hg tglog
@ 8:draft 'E' @ 8:draft 'E'
| |
| @ 7:draft 'D' | @ 7:draft 'D'
|/ |/
o 6:draft 'C' o 6:draft 'C'
| |
| % 5:draft 'F' | % 5:draft 'F'

tests/test-rebase-dest.t

| |
o 0 aa o 0 aa
$ hg rebase -d 2 $ hg rebase -d 2
rebasing 3:0537f6b50def tip "dc" rebasing 3:0537f6b50def tip "dc"
merging c merging c
warning: conflicts while merging c! (edit, then use 'hg resolve --mark') warning: conflicts while merging c! (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] [240]
$ echo d > c $ echo d > c
$ hg resolve --mark --all $ hg resolve --mark --all
(no more unresolved files) (no more unresolved files)
continue: hg rebase --continue continue: hg rebase --continue
$ hg rebase --continue $ hg rebase --continue
rebasing 3:0537f6b50def tip "dc" rebasing 3:0537f6b50def tip "dc"
saved backup bundle to $TESTTMP/repo/.hg/strip-backup/0537f6b50def-be4c7386-rebase.hg saved backup bundle to $TESTTMP/repo/.hg/strip-backup/0537f6b50def-be4c7386-rebase.hg

tests/test-rebase-detach.t

$ hg ci -A -m 'B2' $ hg ci -A -m 'B2'
adding B adding B
$ hg phase --force --secret . $ hg phase --force --secret .
$ hg rebase -s . -d B --config ui.merge=internal:merge $ hg rebase -s . -d B --config ui.merge=internal:merge
rebasing 3:17b4880d2402 tip "B2" rebasing 3:17b4880d2402 tip "B2"
merging B merging B
warning: conflicts while merging B! (edit, then use 'hg resolve --mark') warning: conflicts while merging B! (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] [240]
$ hg resolve --all -t internal:local $ hg resolve --all -t internal:local
(no more unresolved files) (no more unresolved files)
continue: hg rebase --continue continue: hg rebase --continue
$ hg rebase -c $ hg rebase -c
rebasing 3:17b4880d2402 tip "B2" rebasing 3:17b4880d2402 tip "B2"
note: not rebasing 3:17b4880d2402 tip "B2", its destination already has all its changes note: not rebasing 3:17b4880d2402 tip "B2", its destination already has all its changes
saved backup bundle to $TESTTMP/a7/.hg/strip-backup/17b4880d2402-1ae1f6cc-rebase.hg saved backup bundle to $TESTTMP/a7/.hg/strip-backup/17b4880d2402-1ae1f6cc-rebase.hg
$ hg log -G --template "{rev}:{phase} '{desc}' {branches}\n" $ hg log -G --template "{rev}:{phase} '{desc}' {branches}\n"
o 2:draft 'C' o 2:draft 'C'
| |
| @ 1:draft 'B' | @ 1:draft 'B'
|/ |/
o 0:draft 'A' o 0:draft 'A'
$ cd .. $ cd ..

tests/test-rebase-inmemory.t

rebasing 2:177f92b77385 "c" rebasing 2:177f92b77385 "c"
rebasing 3:055a42cdd887 "d" rebasing 3:055a42cdd887 "d"
rebasing 4:e860deea161a "e" rebasing 4:e860deea161a "e"
merging e merging e
hit merge conflicts; rebasing that commit again in the working copy hit merge conflicts; rebasing that commit again in the working copy
merging e merging e
warning: conflicts while merging e! (edit, then use 'hg resolve --mark') warning: conflicts while merging e! (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] [240]
$ hg rebase --abort $ hg rebase --abort
saved backup bundle to $TESTTMP/repo3/.hg/strip-backup/c1e524d4287c-f91f82e1-backup.hg saved backup bundle to $TESTTMP/repo3/.hg/strip-backup/c1e524d4287c-f91f82e1-backup.hg
rebase aborted rebase aborted
Retrying without in-memory merge won't lose working copy changes Retrying without in-memory merge won't lose working copy changes
$ cd .. $ cd ..
$ hg clone repo3 repo3-dirty -q $ hg clone repo3 repo3-dirty -q
$ cd repo3-dirty $ cd repo3-dirty
$ hg rebase -r . -d 1 --config ui.merge=internal:merge3 $ hg rebase -r . -d 1 --config ui.merge=internal:merge3
rebasing 2:fb62b706688e tip "add b to foo" rebasing 2:fb62b706688e tip "add b to foo"
merging foo merging foo
hit merge conflicts; rebasing that commit again in the working copy hit merge conflicts; rebasing that commit again in the working copy
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] [240]
$ cd $TESTTMP $ cd $TESTTMP
Test rebasing when we're in the middle of a rebase already Test rebasing when we're in the middle of a rebase already
$ hg init test_issue6214 $ hg init test_issue6214
$ cd test_issue6214 $ cd test_issue6214
$ echo r0 > r0 $ echo r0 > r0
$ hg ci -qAm 'r0' $ hg ci -qAm 'r0'
r0 r0
$ hg rebase -r 2 -d 1 -t:merge3 $ hg rebase -r 2 -d 1 -t:merge3
rebasing 2:b4d249fbf8dd "bye from foo" rebasing 2:b4d249fbf8dd "bye from foo"
merging foo merging foo
hit merge conflicts; rebasing that commit again in the working copy hit merge conflicts; rebasing that commit again in the working copy
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] [240]
$ 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', 'hg rebase --abort', or 'hg rebase --stop') (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)

tests/test-rebase-interruptions.t

Rebasing B onto E: Rebasing B onto E:
$ hg rebase -s 1 -d 4 $ hg rebase -s 1 -d 4
rebasing 1:27547f69f254 "B" rebasing 1:27547f69f254 "B"
rebasing 2:965c486023db "C" rebasing 2:965c486023db "C"
merging A merging A
warning: conflicts while merging A! (edit, then use 'hg resolve --mark') warning: conflicts while merging A! (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] [240]
Force a commit on C during the interruption: Force a commit on C during the interruption:
$ hg up -q -C 2 --config 'extensions.rebase=!' $ hg up -q -C 2 --config 'extensions.rebase=!'
$ echo 'Extra' > Extra $ echo 'Extra' > Extra
$ hg add Extra $ hg add Extra
$ hg ci -m 'Extra' --config 'extensions.rebase=!' $ hg ci -m 'Extra' --config 'extensions.rebase=!'
Resume the rebasing: Resume the rebasing:
$ hg rebase --continue $ hg rebase --continue
already rebased 1:27547f69f254 "B" as 45396c49d53b already rebased 1:27547f69f254 "B" as 45396c49d53b
rebasing 2:965c486023db "C" rebasing 2:965c486023db "C"
merging A merging A
warning: conflicts while merging A! (edit, then use 'hg resolve --mark') warning: conflicts while merging A! (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] [240]
Solve the conflict and go on: Solve the conflict and go on:
$ echo 'conflict solved' > A $ echo 'conflict solved' > A
$ rm A.orig $ rm A.orig
$ hg resolve -m A $ hg resolve -m A
(no more unresolved files) (no more unresolved files)
continue: hg rebase --continue continue: hg rebase --continue
Rebasing B onto E: Rebasing B onto E:
$ hg rebase -s 1 -d 4 $ hg rebase -s 1 -d 4
rebasing 1:27547f69f254 "B" rebasing 1:27547f69f254 "B"
rebasing 2:965c486023db "C" rebasing 2:965c486023db "C"
merging A merging A
warning: conflicts while merging A! (edit, then use 'hg resolve --mark') warning: conflicts while merging A! (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] [240]
Force a commit on B' during the interruption: Force a commit on B' during the interruption:
$ hg up -q -C 5 --config 'extensions.rebase=!' $ hg up -q -C 5 --config 'extensions.rebase=!'
$ echo 'Extra' > Extra $ echo 'Extra' > Extra
$ hg add Extra $ hg add Extra
$ hg ci -m 'Extra' --config 'extensions.rebase=!' $ hg ci -m 'Extra' --config 'extensions.rebase=!'
Rebasing B onto E: Rebasing B onto E:
$ hg rebase -s 1 -d 4 $ hg rebase -s 1 -d 4
rebasing 1:27547f69f254 "B" rebasing 1:27547f69f254 "B"
rebasing 2:965c486023db "C" rebasing 2:965c486023db "C"
merging A merging A
warning: conflicts while merging A! (edit, then use 'hg resolve --mark') warning: conflicts while merging A! (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] [240]
Change phase on B and B' Change phase on B and B'
$ hg up -q -C 5 --config 'extensions.rebase=!' $ hg up -q -C 5 --config 'extensions.rebase=!'
$ hg phase --public 1 $ hg phase --public 1
$ hg phase --public 5 $ hg phase --public 5
$ hg phase --secret -f 2 $ hg phase --secret -f 2
o 0: 4a2df7238c3b 'A' o 0: 4a2df7238c3b 'A'
$ hg rebase -s 1 -d 4 $ hg rebase -s 1 -d 4
rebasing 1:27547f69f254 "B" rebasing 1:27547f69f254 "B"
rebasing 2:965c486023db "C" rebasing 2:965c486023db "C"
merging A merging A
warning: conflicts while merging A! (edit, then use 'hg resolve --mark') warning: conflicts while merging A! (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] [240]
$ hg tglog $ hg tglog
@ 5: 45396c49d53b 'B' @ 5: 45396c49d53b 'B'
| |
o 4: ae36e8e3dfd7 'E' o 4: ae36e8e3dfd7 'E'
| |
o 3: 46b37eabc604 'D' o 3: 46b37eabc604 'D'
| |
| % 2: 965c486023db 'C' | % 2: 965c486023db 'C'
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ echo c >> a $ echo c >> a
$ hg commit -qm c $ hg commit -qm c
$ hg rebase -s 1 -d 2 --noninteractive $ hg rebase -s 1 -d 2 --noninteractive
rebasing 1:fdaca8533b86 "b" rebasing 1:fdaca8533b86 "b"
merging a merging a
warning: conflicts while merging a! (edit, then use 'hg resolve --mark') warning: conflicts while merging a! (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] [240]
$ echo a > a $ echo a > a
$ echo c >> a $ echo c >> a
$ hg resolve --mark a $ hg resolve --mark a
(no more unresolved files) (no more unresolved files)
continue: hg rebase --continue continue: hg rebase --continue
$ hg rebase --continue $ hg rebase --continue
rebasing 1:fdaca8533b86 "b" rebasing 1:fdaca8533b86 "b"
note: not rebasing 1:fdaca8533b86 "b", its destination already has all its changes note: not rebasing 1:fdaca8533b86 "b", its destination already has all its changes
saved backup bundle to $TESTTMP/repo/.hg/strip-backup/fdaca8533b86-7fd70513-rebase.hg saved backup bundle to $TESTTMP/repo/.hg/strip-backup/fdaca8533b86-7fd70513-rebase.hg
$ hg resolve --list $ hg resolve --list
$ test -d .hg/merge $ test -d .hg/merge
[1] [1]
Now try again with --collapse Now try again with --collapse
$ hg unbundle -q .hg/strip-backup/fdaca8533b86-7fd70513-rebase.hg $ hg unbundle -q .hg/strip-backup/fdaca8533b86-7fd70513-rebase.hg
$ hg rebase -s 2 -d 1 --noninteractive --collapse $ hg rebase -s 2 -d 1 --noninteractive --collapse
rebasing 2:fdaca8533b86 tip "b" rebasing 2:fdaca8533b86 tip "b"
merging a merging a
warning: conflicts while merging a! (edit, then use 'hg resolve --mark') warning: conflicts while merging a! (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] [240]
$ echo a > a $ echo a > a
$ echo c >> a $ echo c >> a
$ hg resolve --mark a $ hg resolve --mark a
(no more unresolved files) (no more unresolved files)
continue: hg rebase --continue continue: hg rebase --continue
$ hg rebase --continue $ hg rebase --continue
rebasing 2:fdaca8533b86 tip "b" rebasing 2:fdaca8533b86 tip "b"
saved backup bundle to $TESTTMP/repo/.hg/strip-backup/fdaca8533b86-7fd70513-rebase.hg saved backup bundle to $TESTTMP/repo/.hg/strip-backup/fdaca8533b86-7fd70513-rebase.hg
$ hg resolve --list $ hg resolve --list
$ test -d .hg/merge $ test -d .hg/merge
[1] [1]

tests/test-rebase-mq-skip.t

$ HGMERGE=internal:fail hg rebase $ HGMERGE=internal:fail hg rebase
rebasing 1:b4bffa6e4776 qbase r1 "r1" rebasing 1:b4bffa6e4776 qbase r1 "r1"
note: not rebasing 1:b4bffa6e4776 qbase r1 "r1", its destination already has all its changes note: not rebasing 1:b4bffa6e4776 qbase r1 "r1", its destination already has all its changes
rebasing 2:c0fd129beb01 r2 "r2" rebasing 2:c0fd129beb01 r2 "r2"
rebasing 3:6ff5b8feed8e r3 "r3" rebasing 3:6ff5b8feed8e r3 "r3"
note: not rebasing 3:6ff5b8feed8e r3 "r3", its destination already has all its changes note: not rebasing 3:6ff5b8feed8e r3 "r3", its destination already has all its changes
rebasing 4:094320fec554 r4 "r4" rebasing 4:094320fec554 r4 "r4"
unresolved conflicts (see 'hg resolve', then 'hg rebase --continue') unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')
[1] [240]
$ HGMERGE=internal:local hg resolve --all $ HGMERGE=internal:local hg resolve --all
(no more unresolved files) (no more unresolved files)
continue: hg rebase --continue continue: hg rebase --continue
$ hg continue $ hg continue
already rebased 1:b4bffa6e4776 qbase r1 "r1" as 057f55ff8f44 already rebased 1:b4bffa6e4776 qbase r1 "r1" as 057f55ff8f44
already rebased 2:c0fd129beb01 r2 "r2" as 1660ab13ce9a already rebased 2:c0fd129beb01 r2 "r2" as 1660ab13ce9a

tests/test-rebase-mq.t

Rebase - generate a conflict: Rebase - generate a conflict:
$ hg rebase -s 2 -d 1 $ hg rebase -s 2 -d 1
rebasing 2:3504f44bffc0 f.patch qbase "P0" rebasing 2:3504f44bffc0 f.patch qbase "P0"
merging f merging f
warning: conflicts while merging f! (edit, then use 'hg resolve --mark') warning: conflicts while merging f! (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] [240]
Fix the 1st conflict: Fix the 1st conflict:
$ echo mq1r1 > f $ echo mq1r1 > f
$ hg resolve -m f $ hg resolve -m f
(no more unresolved files) (no more unresolved files)
continue: hg rebase --continue continue: hg rebase --continue
$ hg rebase -c $ hg rebase -c
rebasing 2:3504f44bffc0 f.patch qbase "P0" rebasing 2:3504f44bffc0 f.patch qbase "P0"
rebasing 3:929394423cd3 f2.patch qtip tip "P1" rebasing 3:929394423cd3 f2.patch qtip tip "P1"
merging f merging f
warning: conflicts while merging f! (edit, then use 'hg resolve --mark') warning: conflicts while merging f! (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] [240]
Fix the 2nd conflict: Fix the 2nd conflict:
$ echo mq1r1mq2 > f $ echo mq1r1mq2 > f
$ hg resolve -m f $ hg resolve -m f
(no more unresolved files) (no more unresolved files)
continue: hg rebase --continue continue: hg rebase --continue
$ hg rebase -c $ hg rebase -c

tests/test-rebase-obsolete.t

o 16:61bd55f69bc4 bar foo o 16:61bd55f69bc4 bar foo
| |
~ ~
$ hg rebase -r ".^^ + .^ + ." -d 18 $ hg rebase -r ".^^ + .^ + ." -d 18
rebasing 19:b82fb57ea638 "willconflict second version" rebasing 19:b82fb57ea638 "willconflict second version"
merging willconflict merging willconflict
warning: conflicts while merging willconflict! (edit, then use 'hg resolve --mark') warning: conflicts while merging willconflict! (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] [240]
$ hg resolve --mark willconflict $ hg resolve --mark willconflict
(no more unresolved files) (no more unresolved files)
continue: hg rebase --continue continue: hg rebase --continue
$ hg rebase --continue $ hg rebase --continue
rebasing 19:b82fb57ea638 "willconflict second version" rebasing 19:b82fb57ea638 "willconflict second version"
note: not rebasing 20:8b31da3c4919 "dummy change", already in destination as 18:601db7a18f51 "dummy change successor" note: not rebasing 20:8b31da3c4919 "dummy change", already in destination as 18:601db7a18f51 "dummy change successor"
rebasing 21:7bdc8a87673d tip "dummy change" rebasing 21:7bdc8a87673d tip "dummy change"
$ hg update -q $C --hidden $ hg update -q $C --hidden
updated to hidden changeset 7829726be4dc updated to hidden changeset 7829726be4dc
(hidden revision '7829726be4dc' is pruned) (hidden revision '7829726be4dc' is pruned)
$ hg rebase -s $B -d $D $ hg rebase -s $B -d $D
rebasing 1:2ec65233581b "B" rebasing 1:2ec65233581b "B"
merging D merging D
warning: conflicts while merging D! (edit, then use 'hg resolve --mark') warning: conflicts while merging D! (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] [240]
$ cp -R . $TESTTMP/hidden-state2 $ cp -R . $TESTTMP/hidden-state2
$ hg log -G $ hg log -G
@ 2:b18e25de2cf5 D @ 2:b18e25de2cf5 D
| |
| % 1:2ec65233581b B (pruned using prune) | % 1:2ec65233581b B (pruned using prune)
|/ |/
$ hg rebase -s 1 -d 5 $ hg rebase -s 1 -d 5
rebasing 1:d2ae7f538514 "b" rebasing 1:d2ae7f538514 "b"
rebasing 2:177f92b77385 "c" rebasing 2:177f92b77385 "c"
rebasing 3:055a42cdd887 "d" rebasing 3:055a42cdd887 "d"
merging d merging d
warning: conflicts while merging d! (edit, then use 'hg resolve --mark') warning: conflicts while merging d! (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] [240]
$ hg rebase --stop $ hg rebase --stop
1 new orphan changesets 1 new orphan changesets
$ hg log -G --template "{rev}:{short(node)} {person(author)}\n{firstline(desc)} {topic}\n\n" $ hg log -G --template "{rev}:{short(node)} {person(author)}\n{firstline(desc)} {topic}\n\n"
o 7:7fffad344617 test o 7:7fffad344617 test
| c | c
| |
o 6:b15528633407 test o 6:b15528633407 test
| b | b
$ hg rebase -s 1 -d 5 $ hg rebase -s 1 -d 5
rebasing 1:d2ae7f538514 "b" rebasing 1:d2ae7f538514 "b"
rebasing 2:177f92b77385 "c" rebasing 2:177f92b77385 "c"
rebasing 3:055a42cdd887 "d" rebasing 3:055a42cdd887 "d"
merging d merging d
warning: conflicts while merging d! (edit, then use 'hg resolve --mark') warning: conflicts while merging d! (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] [240]
$ hg rebase --stop $ hg rebase --stop
abort: cannot remove original changesets with unrebased descendants abort: cannot remove original changesets with unrebased descendants
(either enable obsmarkers to allow unstable revisions or use --keep to keep original changesets) (either enable obsmarkers to allow unstable revisions or use --keep to keep original changesets)
[255] [255]
$ hg rebase --abort $ hg rebase --abort
saved backup bundle to $TESTTMP/rbstop/.hg/strip-backup/b15528633407-6eb72b6f-backup.hg saved backup bundle to $TESTTMP/rbstop/.hg/strip-backup/b15528633407-6eb72b6f-backup.hg
rebase aborted rebase aborted
Test --stop when --keep is passed: Test --stop when --keep is passed:
================================== ==================================
$ hg rebase -s 1 -d 5 --keep $ hg rebase -s 1 -d 5 --keep
rebasing 1:d2ae7f538514 "b" rebasing 1:d2ae7f538514 "b"
rebasing 2:177f92b77385 "c" rebasing 2:177f92b77385 "c"
rebasing 3:055a42cdd887 "d" rebasing 3:055a42cdd887 "d"
merging d merging d
warning: conflicts while merging d! (edit, then use 'hg resolve --mark') warning: conflicts while merging d! (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] [240]
$ hg rebase --stop $ hg rebase --stop
$ hg log -G --template "{rev}:{short(node)} {person(author)}\n{firstline(desc)} {topic}\n\n" $ hg log -G --template "{rev}:{short(node)} {person(author)}\n{firstline(desc)} {topic}\n\n"
o 7:7fffad344617 test o 7:7fffad344617 test
| c | c
| |
o 6:b15528633407 test o 6:b15528633407 test
| b | b
| |
$ hg rebase -s 1 -d 5 --collapse -m "collapsed b c d" $ hg rebase -s 1 -d 5 --collapse -m "collapsed b c d"
rebasing 1:d2ae7f538514 "b" rebasing 1:d2ae7f538514 "b"
rebasing 2:177f92b77385 "c" rebasing 2:177f92b77385 "c"
rebasing 3:055a42cdd887 "d" rebasing 3:055a42cdd887 "d"
merging d merging d
warning: conflicts while merging d! (edit, then use 'hg resolve --mark') warning: conflicts while merging d! (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] [240]
$ hg rebase --stop $ hg rebase --stop
abort: cannot stop in --collapse session abort: cannot stop in --collapse session
[255] [255]
$ hg rebase --abort $ hg rebase --abort
rebase aborted rebase aborted
$ hg diff $ hg diff
$ hg log -G --template "{rev}:{short(node)} {person(author)}\n{firstline(desc)} {topic}\n\n" $ hg log -G --template "{rev}:{short(node)} {person(author)}\n{firstline(desc)} {topic}\n\n"
o 5:00bfc9898aeb test o 5:00bfc9898aeb test
Test --stop raise errors with conflicting options: Test --stop raise errors with conflicting options:
================================================= =================================================
$ hg rebase -s 3 -d 5 $ hg rebase -s 3 -d 5
rebasing 3:055a42cdd887 "d" rebasing 3:055a42cdd887 "d"
merging d merging d
warning: conflicts while merging d! (edit, then use 'hg resolve --mark') warning: conflicts while merging d! (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] [240]
$ 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', 'hg rebase --abort', or 'hg rebase --stop') (use 'hg rebase --continue', 'hg rebase --abort', or 'hg rebase --stop')
[255] [255]
$ hg rebase -s 1 -d 5 $ hg rebase -s 1 -d 5
rebasing 1:6c81ed0049f8 X "B" rebasing 1:6c81ed0049f8 X "B"
rebasing 2:49cb3485fa0c Y "C" rebasing 2:49cb3485fa0c Y "C"
rebasing 3:67a385d4e6f2 Z "D" rebasing 3:67a385d4e6f2 Z "D"
merging d merging d
warning: conflicts while merging d! (edit, then use 'hg resolve --mark') warning: conflicts while merging d! (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] [240]
$ hg rebase --stop $ hg rebase --stop
1 new orphan changesets 1 new orphan changesets
$ hg log -GT "{rev}: {node|short} '{desc}' bookmarks: {bookmarks}\n" $ hg log -GT "{rev}: {node|short} '{desc}' bookmarks: {bookmarks}\n"
o 7: 9c86c650b686 'C' bookmarks: Y o 7: 9c86c650b686 'C' bookmarks: Y
| |
o 6: 9b87b54e5fd8 'B' bookmarks: X o 6: 9b87b54e5fd8 'B' bookmarks: X
| |
@ 5: 39adf30bc1be 'conflict with d' bookmarks: @ 5: 39adf30bc1be 'conflict with d' bookmarks:

tests/test-rebase-parameters.t

$ hg clone -q -u . b b3 $ hg clone -q -u . b b3
$ cd b3 $ cd b3
$ hg rebase -s 2 -d 1 --tool internal:fail $ hg rebase -s 2 -d 1 --tool internal:fail
rebasing 2:e4e3f3546619 tip "c2b" rebasing 2:e4e3f3546619 tip "c2b"
unresolved conflicts (see 'hg resolve', then 'hg rebase --continue') unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')
[1] [240]
$ hg summary $ hg summary
parent: 1:56daeba07f4b parent: 1:56daeba07f4b
c2 c2
branch: default branch: default
commit: 1 unresolved (clean) commit: 1 unresolved (clean)
update: 1 new changesets, 2 branch heads (merge) update: 1 new changesets, 2 branch heads (merge)
phases: 3 draft phases: 3 draft

tests/test-rebase-partial.t

> |/ # D/file = D > |/ # D/file = D
> A > A
> EOF > EOF
$ hg rebase -r C+D -d B $ hg rebase -r C+D -d B
rebasing 2:ef8c0fe0897b D "D" rebasing 2:ef8c0fe0897b D "D"
merging file merging file
warning: conflicts while merging file! (edit, then use 'hg resolve --mark') warning: conflicts while merging file! (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] [240]
$ hg rebase --abort $ hg rebase --abort
rebase aborted rebase aborted
$ hg tglog $ hg tglog
o 3: 79f6d6ab7b14 C o 3: 79f6d6ab7b14 C
| |
| o 2: ef8c0fe0897b D | o 2: ef8c0fe0897b D
| | | |
o | 1: 594087dbaf71 B o | 1: 594087dbaf71 B

tests/test-rebase-pull.t

Abort pull early if another operation (histedit) is in progress: Abort pull early if another operation (histedit) is in progress:
$ hg histedit . -q --commands - << EOF $ hg histedit . -q --commands - << EOF
> edit d80cc2da061e histedit: generate unfinished state > edit d80cc2da061e histedit: generate unfinished state
> EOF > EOF
Editing (d80cc2da061e), you may commit or record as needed now. Editing (d80cc2da061e), you may commit or record as needed now.
(hg histedit --continue to resume) (hg histedit --continue to resume)
[1] [240]
$ hg pull --rebase $ hg pull --rebase
abort: histedit in progress abort: histedit in progress
(use 'hg histedit --continue' or 'hg histedit --abort') (use 'hg histedit --continue' or 'hg histedit --abort')
[255] [255]
$ hg histedit --abort --quiet $ hg histedit --abort --quiet
Abort pull early with pending uncommitted merge: Abort pull early with pending uncommitted merge:

tests/test-rebase-transaction.t

> A > A
> EOF > EOF
$ hg rebase --collapse -b D -d Z $ hg rebase --collapse -b D -d Z
rebasing 1:112478962961 B "B" rebasing 1:112478962961 B "B"
rebasing 3:c26739dbe603 C "C" rebasing 3:c26739dbe603 C "C"
merging conflict merging conflict
warning: conflicts while merging conflict! (edit, then use 'hg resolve --mark') warning: conflicts while merging conflict! (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] [240]
$ hg tglog $ hg tglog
o 5: D o 5: D
| |
| @ 4: Z | @ 4: Z
| | | |
% | 3: C % | 3: C
| | | |
| o 2: Y | o 2: Y

tests/test-resolve.t

rebasing 1:f30f98a8181f "added emp1 emp2 emp3" rebasing 1:f30f98a8181f "added emp1 emp2 emp3"
merging emp1 merging emp1
merging emp2 merging emp2
merging emp3 merging emp3
warning: conflicts while merging emp1! (edit, then use 'hg resolve --mark') warning: conflicts while merging emp1! (edit, then use 'hg resolve --mark')
warning: conflicts while merging emp2! (edit, then use 'hg resolve --mark') warning: conflicts while merging emp2! (edit, then use 'hg resolve --mark')
warning: conflicts while merging emp3! (edit, then use 'hg resolve --mark') warning: conflicts while merging emp3! (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] [240]
Test when commands.resolve.confirm config option is not set: Test when commands.resolve.confirm config option is not set:
=========================================================== ===========================================================
$ hg resolve --all $ hg resolve --all
merging emp1 merging emp1
merging emp2 merging emp2
merging emp3 merging emp3
warning: conflicts while merging emp1! (edit, then use 'hg resolve --mark') warning: conflicts while merging emp1! (edit, then use 'hg resolve --mark')

tests/test-shelve.t

$ hg unshelve $ hg unshelve
unshelving change 'default' unshelving change 'default'
temporarily committing pending changes (restore with 'hg unshelve --abort') temporarily committing pending changes (restore with 'hg unshelve --abort')
rebasing shelved changes rebasing shelved changes
merging a/a merging a/a
warning: conflicts while merging a/a! (edit, then use 'hg resolve --mark') warning: conflicts while merging a/a! (edit, then use 'hg resolve --mark')
unresolved conflicts (see 'hg resolve', then 'hg unshelve --continue') unresolved conflicts (see 'hg resolve', then 'hg unshelve --continue')
[1] [240]
$ hg status -v $ hg status -v
M a/a M a/a
M b.rename/b M b.rename/b
M c.copy M c.copy
R b/b R b/b
R d R d
? a/a.orig ? a/a.orig
# The repository is in an unfinished *unshelve* state. # The repository is in an unfinished *unshelve* state.
A foo/foo A foo/foo
? a/a.orig ? a/a.orig
redo the unshelve to get a conflict redo the unshelve to get a conflict
$ hg unshelve -q $ hg unshelve -q
warning: conflicts while merging a/a! (edit, then use 'hg resolve --mark') warning: conflicts while merging a/a! (edit, then use 'hg resolve --mark')
unresolved conflicts (see 'hg resolve', then 'hg unshelve --continue') unresolved conflicts (see 'hg resolve', then 'hg unshelve --continue')
[1] [240]
attempt to continue attempt to continue
$ hg unshelve -c $ hg unshelve -c
abort: unresolved conflicts, can't continue abort: unresolved conflicts, can't continue
(see 'hg resolve', then 'hg unshelve --continue') (see 'hg resolve', then 'hg unshelve --continue')
[255] [255]
$ hg bookmark $ hg bookmark
\* test (4|13):33f7f61e6c5e (re) \* test (4|13):33f7f61e6c5e (re)
$ hg unshelve $ hg unshelve
unshelving change 'default' unshelving change 'default'
rebasing shelved changes rebasing shelved changes
merging a/a merging a/a
warning: conflicts while merging a/a! (edit, then use 'hg resolve --mark') warning: conflicts while merging a/a! (edit, then use 'hg resolve --mark')
unresolved conflicts (see 'hg resolve', then 'hg unshelve --continue') unresolved conflicts (see 'hg resolve', then 'hg unshelve --continue')
[1] [240]
$ hg bookmark $ hg bookmark
test (4|13):33f7f61e6c5e (re) test (4|13):33f7f61e6c5e (re)
Test that resolving all conflicts in one direction (so that the rebase Test that resolving all conflicts in one direction (so that the rebase
is a no-op), works (issue4398) is a no-op), works (issue4398)
$ hg revert -a -r . $ hg revert -a -r .
reverting a/a reverting a/a
$ hg unshelve -i $ hg unshelve -i
unshelving change 'default-01' unshelving change 'default-01'
rebasing shelved changes rebasing shelved changes
merging bar1 merging bar1
merging bar2 merging bar2
warning: conflicts while merging bar1! (edit, then use 'hg resolve --mark') warning: conflicts while merging bar1! (edit, then use 'hg resolve --mark')
warning: conflicts while merging bar2! (edit, then use 'hg resolve --mark') warning: conflicts while merging bar2! (edit, then use 'hg resolve --mark')
unresolved conflicts (see 'hg resolve', then 'hg unshelve --continue') unresolved conflicts (see 'hg resolve', then 'hg unshelve --continue')
[1] [240]
$ cat > bar1 <<EOF $ cat > bar1 <<EOF
> A > A
> B > B
> C > C
> EOF > EOF
$ cat > bar2 <<EOF $ cat > bar2 <<EOF
> A > A

tests/test-shelve2.t

$ echo 1 > a $ echo 1 > a
$ hg unshelve --date '1073741824 0' $ hg unshelve --date '1073741824 0'
unshelving change 'default' unshelving change 'default'
temporarily committing pending changes (restore with 'hg unshelve --abort') temporarily committing pending changes (restore with 'hg unshelve --abort')
rebasing shelved changes rebasing shelved changes
merging f merging f
warning: conflicts while merging f! (edit, then use 'hg resolve --mark') warning: conflicts while merging f! (edit, then use 'hg resolve --mark')
unresolved conflicts (see 'hg resolve', then 'hg unshelve --continue') unresolved conflicts (see 'hg resolve', then 'hg unshelve --continue')
[1] [240]
#if phasebased #if phasebased
$ hg log -G --template '{rev} {desc|firstline} {author} {date|isodate}' $ hg log -G --template '{rev} {desc|firstline} {author} {date|isodate}'
@ 9 pending changes temporary commit shelve@localhost 2004-01-10 13:37 +0000 @ 9 pending changes temporary commit shelve@localhost 2004-01-10 13:37 +0000
| |
| @ 8 changes to: commit stuff shelve@localhost 1970-01-01 00:00 +0000 | @ 8 changes to: commit stuff shelve@localhost 1970-01-01 00:00 +0000
|/ |/
o 7 commit stuff test 1970-01-01 00:00 +0000 o 7 commit stuff test 1970-01-01 00:00 +0000
$ hg ci a -m 'intermediate other change' $ hg ci a -m 'intermediate other change'
$ mv f.orig f $ mv f.orig f
$ hg unshelve $ hg unshelve
unshelving change 'default' unshelving change 'default'
rebasing shelved changes rebasing shelved changes
merging f merging f
warning: conflicts while merging f! (edit, then use 'hg resolve --mark') warning: conflicts while merging f! (edit, then use 'hg resolve --mark')
unresolved conflicts (see 'hg resolve', then 'hg unshelve --continue') unresolved conflicts (see 'hg resolve', then 'hg unshelve --continue')
[1] [240]
$ hg st $ hg st
M f M f
? f.orig ? f.orig
$ cat f $ cat f
<<<<<<< working-copy: 6b563750f973 - test: intermediate other change <<<<<<< working-copy: 6b563750f973 - test: intermediate other change
g g
======= =======
f f
$ echo 'content' > root $ echo 'content' > root
$ hg commit -A -m 'root' -q $ hg commit -A -m 'root' -q
$ echo '' > root $ echo '' > root
$ hg shelve -q $ hg shelve -q
$ echo 'contADDent' > root $ echo 'contADDent' > root
$ hg unshelve -q --config 'ui.origbackuppath=.hg/origbackups' $ hg unshelve -q --config 'ui.origbackuppath=.hg/origbackups'
warning: conflicts while merging root! (edit, then use 'hg resolve --mark') warning: conflicts while merging root! (edit, then use 'hg resolve --mark')
unresolved conflicts (see 'hg resolve', then 'hg unshelve --continue') unresolved conflicts (see 'hg resolve', then 'hg unshelve --continue')
[1] [240]
$ ls .hg/origbackups $ ls .hg/origbackups
root root
$ rm -rf .hg/origbackups $ rm -rf .hg/origbackups
test Abort unshelve always gets user out of the unshelved state test Abort unshelve always gets user out of the unshelved state
--------------------------------------------------------------- ---------------------------------------------------------------
with a corrupted shelve state file with a corrupted shelve state file
M a M a
$ hg unshelve $ hg unshelve
unshelving change 'default' unshelving change 'default'
temporarily committing pending changes (restore with 'hg unshelve --abort') temporarily committing pending changes (restore with 'hg unshelve --abort')
rebasing shelved changes rebasing shelved changes
merging a merging a
warning: conflicts while merging a! (edit, then use 'hg resolve --mark') warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
unresolved conflicts (see 'hg resolve', then 'hg unshelve --continue') unresolved conflicts (see 'hg resolve', then 'hg unshelve --continue')
[1] [240]
$ echo "aaabbbccc" > a $ echo "aaabbbccc" > a
$ rm a.orig $ rm a.orig
$ hg resolve --mark a $ hg resolve --mark a
(no more unresolved files) (no more unresolved files)
continue: hg unshelve --continue continue: hg unshelve --continue
$ hg continue $ hg continue
marked working directory as branch test marked working directory as branch test
unshelve of 'default' complete unshelve of 'default' complete
M a M a
$ hg unshelve $ hg unshelve
unshelving change 'default' unshelving change 'default'
temporarily committing pending changes (restore with 'hg unshelve --abort') temporarily committing pending changes (restore with 'hg unshelve --abort')
rebasing shelved changes rebasing shelved changes
merging a merging a
warning: conflicts while merging a! (edit, then use 'hg resolve --mark') warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
unresolved conflicts (see 'hg resolve', then 'hg unshelve --continue') unresolved conflicts (see 'hg resolve', then 'hg unshelve --continue')
[1] [240]
Removing restore branch information from shelvedstate file(making it looks like Removing restore branch information from shelvedstate file(making it looks like
in previous versions) and running unshelve --continue in previous versions) and running unshelve --continue
$ cp .hg/shelvedstate .hg/shelvedstate_old $ cp .hg/shelvedstate .hg/shelvedstate_old
$ cat .hg/shelvedstate_old | grep -v 'branchtorestore' > .hg/shelvedstate $ cat .hg/shelvedstate_old | grep -v 'branchtorestore' > .hg/shelvedstate
$ echo "aaabbbccc" > a $ echo "aaabbbccc" > a
$ echo text2 > file && hg ci -Am text1 $ echo text2 > file && hg ci -Am text1
adding file adding file
$ hg unshelve $ hg unshelve
unshelving change 'default' unshelving change 'default'
rebasing shelved changes rebasing shelved changes
merging file merging file
warning: conflicts while merging file! (edit, then use 'hg resolve --mark') warning: conflicts while merging file! (edit, then use 'hg resolve --mark')
unresolved conflicts (see 'hg resolve', then 'hg unshelve --continue') unresolved conflicts (see 'hg resolve', then 'hg unshelve --continue')
[1] [240]
$ echo somethingsomething > .hg/shelvedstate $ echo somethingsomething > .hg/shelvedstate
Unshelve --continue fails with appropriate message if shelvedstate is corrupted Unshelve --continue fails with appropriate message if shelvedstate is corrupted
$ hg continue $ hg continue
abort: corrupted shelved state file abort: corrupted shelved state file
(please run hg unshelve --abort to abort unshelve operation) (please run hg unshelve --abort to abort unshelve operation)
[255] [255]
$ hg shelve --list $ hg shelve --list
default (*s ago) * changes to: 1 (glob) default (*s ago) * changes to: 1 (glob)
$ hg unshelve --keep $ hg unshelve --keep
unshelving change 'default' unshelving change 'default'
rebasing shelved changes rebasing shelved changes
merging file merging file
warning: conflicts while merging file! (edit, then use 'hg resolve --mark') warning: conflicts while merging file! (edit, then use 'hg resolve --mark')
unresolved conflicts (see 'hg resolve', then 'hg unshelve --continue') unresolved conflicts (see 'hg resolve', then 'hg unshelve --continue')
[1] [240]
$ hg resolve --mark file $ hg resolve --mark file
(no more unresolved files) (no more unresolved files)
continue: hg unshelve --continue continue: hg unshelve --continue
$ hg continue $ hg continue
unshelve of 'default' complete unshelve of 'default' complete
$ hg shelve --list $ hg shelve --list
default (*s ago) * changes to: 1 (glob) default (*s ago) * changes to: 1 (glob)
$ cd .. $ cd ..
$ hg ci -Am a $ hg ci -Am a
adding a adding a
$ hg unshelve $ hg unshelve
unshelving change 'ashelve' unshelving change 'ashelve'
rebasing shelved changes rebasing shelved changes
merging a merging a
warning: conflicts while merging a! (edit, then use 'hg resolve --mark') warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
unresolved conflicts (see 'hg resolve', then 'hg unshelve --continue') unresolved conflicts (see 'hg resolve', then 'hg unshelve --continue')
[1] [240]
putting v1 shelvedstate file in place of a created v2 putting v1 shelvedstate file in place of a created v2
$ cat << EOF > .hg/shelvedstate $ cat << EOF > .hg/shelvedstate
> 1 > 1
> ashelve > ashelve
> 8b058dae057a5a78f393f4535d9e363dd5efac9d > 8b058dae057a5a78f393f4535d9e363dd5efac9d
> 8b058dae057a5a78f393f4535d9e363dd5efac9d > 8b058dae057a5a78f393f4535d9e363dd5efac9d
> 8b058dae057a5a78f393f4535d9e363dd5efac9d f543b27db2cdb41737e2e0008dc524c471da1446 > 8b058dae057a5a78f393f4535d9e363dd5efac9d f543b27db2cdb41737e2e0008dc524c471da1446
> f543b27db2cdb41737e2e0008dc524c471da1446 > f543b27db2cdb41737e2e0008dc524c471da1446
$ rm .hg/shelved/default.shelve $ rm .hg/shelved/default.shelve
$ hg unshelve $ hg unshelve
unshelving change 'default' unshelving change 'default'
temporarily committing pending changes (restore with 'hg unshelve --abort') temporarily committing pending changes (restore with 'hg unshelve --abort')
rebasing shelved changes rebasing shelved changes
merging a merging a
warning: conflicts while merging a! (edit, then use 'hg resolve --mark') warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
unresolved conflicts (see 'hg resolve', then 'hg unshelve --continue') unresolved conflicts (see 'hg resolve', then 'hg unshelve --continue')
[1] [240]
$ hg abort $ hg abort
unshelve of 'default' aborted unshelve of 'default' aborted
Unshelve without .shelve metadata (can happen when upgrading a repository with old shelve) Unshelve without .shelve metadata (can happen when upgrading a repository with old shelve)
$ cat .hg/shelved/default.shelve $ cat .hg/shelved/default.shelve
node=82e0cb9893247d12667017593ce1e5655860f1ac node=82e0cb9893247d12667017593ce1e5655860f1ac
$ hg strip --hidden --rev 82e0cb989324 --no-backup $ hg strip --hidden --rev 82e0cb989324 --no-backup
$ rm .hg/shelved/default.shelve $ rm .hg/shelved/default.shelve
$ hg unshelve $ hg unshelve
unshelving change 'default' unshelving change 'default'
temporarily committing pending changes (restore with 'hg unshelve --abort') temporarily committing pending changes (restore with 'hg unshelve --abort')
rebasing shelved changes rebasing shelved changes
merging a merging a
warning: conflicts while merging a! (edit, then use 'hg resolve --mark') warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
unresolved conflicts (see 'hg resolve', then 'hg unshelve --continue') unresolved conflicts (see 'hg resolve', then 'hg unshelve --continue')
[1] [240]
$ cat .hg/shelved/default.shelve $ cat .hg/shelved/default.shelve
node=82e0cb9893247d12667017593ce1e5655860f1ac node=82e0cb9893247d12667017593ce1e5655860f1ac
$ hg abort $ hg abort
unshelve of 'default' aborted unshelve of 'default' aborted
#endif #endif
$ cd .. $ cd ..
$ echo foobar > a $ echo foobar > a
$ hg unshelve $ hg unshelve
unshelving change 'default' unshelving change 'default'
temporarily committing pending changes (restore with 'hg unshelve --abort') temporarily committing pending changes (restore with 'hg unshelve --abort')
rebasing shelved changes rebasing shelved changes
merging a merging a
warning: conflicts while merging a! (edit, then use 'hg resolve --mark') warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
unresolved conflicts (see 'hg resolve', then 'hg unshelve --continue') unresolved conflicts (see 'hg resolve', then 'hg unshelve --continue')
[1] [240]
$ hg log --template '{desc|firstline} {author} {date|isodate} \n' -r . $ hg log --template '{desc|firstline} {author} {date|isodate} \n' -r .
pending changes temporary commit shelve@localhost 1970-01-01 00:00 +0000 pending changes temporary commit shelve@localhost 1970-01-01 00:00 +0000
$ hg merge --abort $ hg merge --abort
abort: cannot abort merge with unshelve in progress abort: cannot abort merge with unshelve in progress
(use 'hg unshelve --continue' or 'hg unshelve --abort') (use 'hg unshelve --continue' or 'hg unshelve --abort')
[255] [255]
$ echo r0 > foo $ echo r0 > foo
$ hg ci -qAm r0 $ hg ci -qAm r0
$ echo "this will be shelved" >> foo $ echo "this will be shelved" >> foo
$ hg shelve -q $ hg shelve -q
$ echo "this is in wdir, conflicts with shelve" >> foo $ echo "this is in wdir, conflicts with shelve" >> foo
$ hg unshelve -q $ hg unshelve -q
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 unshelve --continue') unresolved conflicts (see 'hg resolve', then 'hg unshelve --continue')
[1] [240]
$ cat foo $ cat foo
r0 r0
<<<<<<< working-copy: 0b2fcf2a90e9 - shelve: pending changes temporary commit <<<<<<< working-copy: 0b2fcf2a90e9 - shelve: pending changes temporary commit
this is in wdir, conflicts with shelve this is in wdir, conflicts with shelve
======= =======
this will be shelved this will be shelved
>>>>>>> shelve: 9c072a2163db - shelve: changes to: r0 >>>>>>> shelve: 9c072a2163db - shelve: changes to: r0
$ cd .. $ cd ..

tests/test-sparse-profiles.t

$ hg rebase -d 2 $ hg rebase -d 2
rebasing 1:a2b1de640a62 "edit profile" rebasing 1:a2b1de640a62 "edit profile"
temporarily included 2 file(s) in the sparse checkout for merging temporarily included 2 file(s) in the sparse checkout for merging
merging backend.sparse merging backend.sparse
merging data.py merging data.py
warning: conflicts while merging backend.sparse! (edit, then use 'hg resolve --mark') warning: conflicts while merging backend.sparse! (edit, then use 'hg resolve --mark')
warning: conflicts while merging data.py! (edit, then use 'hg resolve --mark') warning: conflicts while merging data.py! (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] [240]
$ rm *.orig $ rm *.orig
$ ls -A $ ls -A
.hg .hg
backend.sparse backend.sparse
data.py data.py
index.html index.html
webpage.sparse webpage.sparse

tests/test-sparse.t

Verify rebase temporarily includes excluded files Verify rebase temporarily includes excluded files
$ hg rebase -d 1 -r 2 --config extensions.rebase= $ hg rebase -d 1 -r 2 --config extensions.rebase=
rebasing 2:b91df4f39e75 tip "edit hide" rebasing 2:b91df4f39e75 tip "edit hide"
temporarily included 2 file(s) in the sparse checkout for merging temporarily included 2 file(s) in the sparse checkout for merging
merging hide merging hide
warning: conflicts while merging hide! (edit, then use 'hg resolve --mark') warning: conflicts while merging hide! (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] [240]
$ hg debugsparse $ hg debugsparse
[exclude] [exclude]
hide* hide*
Temporarily Included Files (for merge/rebase): Temporarily Included Files (for merge/rebase):
hide hide

tests/test-state-extension.t

rebasing f8596309dff8 onto 8430cfdf77c2 rebasing f8596309dff8 onto 8430cfdf77c2
rebasing 2:f8596309dff8 "add other file" rebasing 2:f8596309dff8 "add other file"
saved backup bundle to $TESTTMP/* (glob) saved backup bundle to $TESTTMP/* (glob)
rebasing a858b338b3e9 onto 83c722183a8e rebasing a858b338b3e9 onto 83c722183a8e
rebasing 2:a858b338b3e9 "add conflicting file" rebasing 2:a858b338b3e9 "add conflicting file"
merging file1 merging file1
warning: conflicts while merging file1! (edit, then use 'hg resolve --mark') warning: conflicts while merging file1! (edit, then use 'hg resolve --mark')
unresolved conflicts (see 'hg resolve', then 'hg chainify --continue') unresolved conflicts (see 'hg resolve', then 'hg chainify --continue')
[1] [240]
$ hg status --config commands.status.verbose=True $ hg status --config commands.status.verbose=True
M file1 M file1
? file1.orig ? file1.orig
# The repository is in an unfinished *chainify* state. # The repository is in an unfinished *chainify* state.
# Unresolved merge conflicts: # Unresolved merge conflicts:
# #
# file1 # file1