[PATCH 3 of 5] rebase: use scmutil.cleanupnodes (issue5606) (BC)
Jun Wu
quark at fb.com
Mon Jun 26 18:35:30 EDT 2017
# HG changeset patch
# User Jun Wu <quark at fb.com>
# Date 1498508807 25200
# Mon Jun 26 13:26:47 2017 -0700
# Node ID 7a7f6844fe0b0e0545510ea4a73b00432029a12c
# Parent 845ce766fcf0bc75a5bfff22cf5a121ad6777c05
# Available At https://bitbucket.org/quark-zju/hg-draft
# hg pull https://bitbucket.org/quark-zju/hg-draft -r 7a7f6844fe0b
rebase: use scmutil.cleanupnodes (issue5606) (BC)
This patch migrates rebase to use scmutil.cleanupnodes API. It simplifies
the code and makes rebase work inside a transaction. rbsrt._finishrebase is
moved inside the transaction.
This is a BC because the backup file is no longer strip-backup/*-backup.hg,
but strip-backup/*-rebase.hg. The latter looks more reasonable since the
directory name is "strip-backup" so there is no need to repeat "backup".
I think the backup file name change is probably fine as a BC. The end result
of this series will be a much more consistent and unified backup names:
command | old backup file suffix | new backup file suffix
-------------------------------------------------------------------
amend | amend-backup.hg | amend.hg
histedit | backup.hg (could be 2 files) | histedit.hg (single file)
rebase | backup.hg | rebase.hg
strip | backup.hg | backup.hg
(note: backup files are under .hg/strip-backup)
It also fixes issue5606 as a side effect because the new "delayedstrip" code
path will carefully examine nodes (safestriproots) to make sure orphaned
changesets won't get stripped by accident.
Some warning messages are changed to the new "warning: orphaned descendants
detected, not stripping HASHES", which provides more information about
exactly what changesets are left behind.
Another minor behavior change is when there is an obsoleted changeset with a
successor in the destination branch, bookmarks pointing to that obsoleted
changeset will not be moved. I have commented in test-rebase-obsolete.t
explaining why that is more desirable.
diff --git a/hgext/rebase.py b/hgext/rebase.py
--- a/hgext/rebase.py
+++ b/hgext/rebase.py
@@ -139,5 +139,4 @@ class rebaseruntime(object):
self.state = {}
self.activebookmark = None
- self.currentbookmarks = None
self.dest = None
self.skipped = set()
@@ -364,6 +363,5 @@ class rebaseruntime(object):
inclusive=True)
- # Keep track of the current bookmarks in order to reset them later
- self.currentbookmarks = repo._bookmarks.copy()
+ # Keep track of the active bookmarks in order to reset them later
self.activebookmark = self.activebookmark or repo._activebookmark
if self.activebookmark:
@@ -510,17 +508,4 @@ class rebaseruntime(object):
updatemq(repo, self.state, self.skipped, **opts)
- if self.currentbookmarks:
- # Nodeids are needed to reset bookmarks
- nstate = {}
- for k, v in self.state.iteritems():
- if v > nullmerge and v != k:
- nstate[repo[k].node()] = repo[v].node()
- elif v == revprecursor:
- succ = self.obsoletenotrebased[k]
- nstate[repo[k].node()] = repo[succ].node()
- # XXX this is the same as dest.node() for the non-continue path --
- # this should probably be cleaned up
- destnode = repo[self.dest].node()
-
# restore original working directory
# (we do this before stripping)
@@ -535,12 +520,4 @@ class rebaseruntime(object):
hg.updaterepo(repo, newwd, False)
- if self.currentbookmarks:
- with repo.transaction('bookmark') as tr:
- updatebookmarks(repo, destnode, nstate,
- self.currentbookmarks, tr)
- if self.activebookmark not in repo._bookmarks:
- # active bookmark was divergent one and has been deleted
- self.activebookmark = None
-
if not self.keepf:
collapsedas = None
@@ -558,5 +535,5 @@ class rebaseruntime(object):
ui.note(_("%d revisions have been skipped\n") % skippedlen)
- if (self.activebookmark and
+ if (self.activebookmark and self.activebookmark in repo._bookmarks and
repo['.'].node() == repo._bookmarks[self.activebookmark]):
bookmarks.activate(repo, self.activebookmark)
@@ -749,5 +726,5 @@ def rebase(ui, repo, **opts):
release(dsguard)
raise
- rbsrt._finishrebase()
+ rbsrt._finishrebase()
def _definesets(ui, repo, destf=None, srcf=None, basef=None, revf=None,
@@ -1109,14 +1086,4 @@ def updatemq(repo, state, skipped, **opt
mq.savedirty()
-def updatebookmarks(repo, destnode, nstate, originalbookmarks, tr):
- 'Move bookmarks to their correct changesets, and delete divergent ones'
- marks = repo._bookmarks
- for k, v in originalbookmarks.iteritems():
- if v in nstate:
- # update the bookmarks for revs that have moved
- marks[k] = nstate[v]
- bookmarks.deletedivergent(repo, [destnode], k)
- marks.recordchange(tr)
-
def storecollapsemsg(repo, collapsemsg):
'Store the collapse message to allow recovery'
@@ -1345,6 +1312,7 @@ def clearrebased(ui, repo, state, skippe
If `collapsedas` is not None, the rebase was a collapse whose result if the
`collapsedas` node."""
- if obsolete.isenabled(repo, obsolete.createmarkersopt):
- markers = []
+ tonode = repo.changelog.node
+ mapping = {}
+ if True:
for rev, newrev in sorted(state.items()):
if newrev >= 0 and newrev != rev:
@@ -1352,25 +1320,9 @@ def clearrebased(ui, repo, state, skippe
succs = ()
elif collapsedas is not None:
- succs = (repo[collapsedas],)
+ succs = (collapsedas,)
else:
- succs = (repo[newrev],)
- markers.append((repo[rev], succs))
- if markers:
- obsolete.createmarkers(repo, markers, operation='rebase')
- else:
- rebased = [rev for rev in state
- if state[rev] > nullmerge and state[rev] != rev]
- if rebased:
- stripped = []
- for root in repo.set('roots(%ld)', rebased):
- if set(repo.changelog.descendants([root.rev()])) - set(state):
- ui.warn(_("warning: new changesets detected "
- "on source branch, not stripping\n"))
- else:
- stripped.append(root.node())
- if stripped:
- # backup the old csets by default
- repair.strip(ui, repo, stripped, "all")
-
+ succs = (tonode(newrev),)
+ mapping[tonode(rev)] = succs
+ scmutil.cleanupnodes(repo, mapping, 'rebase')
def pullrebase(orig, ui, repo, *args, **opts):
diff --git a/tests/test-bookmarks-rebase.t b/tests/test-bookmarks-rebase.t
--- a/tests/test-bookmarks-rebase.t
+++ b/tests/test-bookmarks-rebase.t
@@ -39,5 +39,5 @@ rebase
$ hg rebase -s two -d one
rebasing 3:2ae46b1d99a7 "3" (tip two)
- saved backup bundle to $TESTTMP/.hg/strip-backup/2ae46b1d99a7-e6b057bc-backup.hg (glob)
+ saved backup bundle to $TESTTMP/.hg/strip-backup/2ae46b1d99a7-e6b057bc-rebase.hg (glob)
$ hg log
diff --git a/tests/test-copy-move-merge.t b/tests/test-copy-move-merge.t
--- a/tests/test-copy-move-merge.t
+++ b/tests/test-copy-move-merge.t
@@ -120,5 +120,5 @@ Verify disabling copy tracing still keep
$ hg rebase -d . -b 2 --config extensions.rebase= --config experimental.disablecopytrace=True
rebasing 2:6adcf8c12e7d "copy b->x"
- saved backup bundle to $TESTTMP/copydisable/.hg/strip-backup/6adcf8c12e7d-ce4b3e75-backup.hg (glob)
+ saved backup bundle to $TESTTMP/copydisable/.hg/strip-backup/6adcf8c12e7d-ce4b3e75-rebase.hg (glob)
$ hg up -q 3
$ hg log -f x -T '{rev} {desc}\n'
@@ -153,5 +153,5 @@ Verify we duplicate existing copies, ins
$ hg rebase -d 2 -s 3 --config extensions.rebase= --config experimental.disablecopytrace=True
rebasing 3:47e1a9e6273b "copy a->b (2)" (tip)
- saved backup bundle to $TESTTMP/copydisable3/.hg/strip-backup/47e1a9e6273b-2d099c59-backup.hg (glob)
+ saved backup bundle to $TESTTMP/copydisable3/.hg/strip-backup/47e1a9e6273b-2d099c59-rebase.hg (glob)
$ hg log -G -f b
diff --git a/tests/test-largefiles.t b/tests/test-largefiles.t
--- a/tests/test-largefiles.t
+++ b/tests/test-largefiles.t
@@ -1210,5 +1210,5 @@ rebased or not.
M sub/normal4
M sub2/large6
- saved backup bundle to $TESTTMP/d/.hg/strip-backup/f574fb32bb45-dd1d9f80-backup.hg (glob)
+ saved backup bundle to $TESTTMP/d/.hg/strip-backup/f574fb32bb45-dd1d9f80-rebase.hg (glob)
0 largefiles cached
$ [ -f .hg/largefiles/e166e74c7303192238d60af5a9c4ce9bef0b7928 ]
@@ -1269,5 +1269,5 @@ rebased or not.
M sub/normal4
M sub2/large6
- saved backup bundle to $TESTTMP/e/.hg/strip-backup/f574fb32bb45-dd1d9f80-backup.hg (glob)
+ saved backup bundle to $TESTTMP/e/.hg/strip-backup/f574fb32bb45-dd1d9f80-rebase.hg (glob)
$ hg log --template '{rev}:{node|short} {desc|firstline}\n'
9:598410d3eb9a modify normal file largefile in repo d
diff --git a/tests/test-rebase-bookmarks.t b/tests/test-rebase-bookmarks.t
--- a/tests/test-rebase-bookmarks.t
+++ b/tests/test-rebase-bookmarks.t
@@ -76,5 +76,5 @@ Test deleting divergent bookmarks from d
$ hg rebase -s Y -d 3
rebasing 2:49cb3485fa0c "C" (Y Z)
- saved backup bundle to $TESTTMP/a1/.hg/strip-backup/49cb3485fa0c-126f3e97-backup.hg (glob)
+ saved backup bundle to $TESTTMP/a1/.hg/strip-backup/49cb3485fa0c-126f3e97-rebase.hg (glob)
$ hg tglog
@@ -98,5 +98,5 @@ Do not try to keep active but deleted di
$ hg rebase -s W -d .
rebasing 3:41acb9dca9eb "D" (tip W)
- saved backup bundle to $TESTTMP/a4/.hg/strip-backup/41acb9dca9eb-b35a6a63-backup.hg (glob)
+ saved backup bundle to $TESTTMP/a4/.hg/strip-backup/41acb9dca9eb-b35a6a63-rebase.hg (glob)
$ hg bookmarks
@@ -117,5 +117,5 @@ Keep bookmarks to the correct rebased ch
rebasing 1:6c81ed0049f8 "B" (X)
rebasing 2:49cb3485fa0c "C" (Y Z)
- saved backup bundle to $TESTTMP/a2/.hg/strip-backup/6c81ed0049f8-a687065f-backup.hg (glob)
+ saved backup bundle to $TESTTMP/a2/.hg/strip-backup/6c81ed0049f8-a687065f-rebase.hg (glob)
$ hg tglog
@@ -140,5 +140,5 @@ Keep active bookmark on the correct chan
rebasing 1:6c81ed0049f8 "B" (X)
rebasing 2:49cb3485fa0c "C" (Y Z)
- saved backup bundle to $TESTTMP/a3/.hg/strip-backup/6c81ed0049f8-a687065f-backup.hg (glob)
+ saved backup bundle to $TESTTMP/a3/.hg/strip-backup/6c81ed0049f8-a687065f-rebase.hg (glob)
$ hg tglog
@@ -180,5 +180,5 @@ rebase --continue with bookmarks present
$ hg rebase --continue
rebasing 3:3d5fa227f4b5 "C" (Y Z)
- saved backup bundle to $TESTTMP/a3/.hg/strip-backup/3d5fa227f4b5-c6ea2371-backup.hg (glob)
+ saved backup bundle to $TESTTMP/a3/.hg/strip-backup/3d5fa227f4b5-c6ea2371-rebase.hg (glob)
$ hg tglog
@ 4: 'C' bookmarks: Y Z
@@ -210,3 +210,3 @@ as --rev arguments (issue3950)
rebasing 6:f677a2907404 "bisect2"
rebasing 7:325c16001345 "bisect3" (tip bisect)
- saved backup bundle to $TESTTMP/a3/.hg/strip-backup/345c90f326a4-b4840586-backup.hg (glob)
+ saved backup bundle to $TESTTMP/a3/.hg/strip-backup/345c90f326a4-b4840586-rebase.hg (glob)
diff --git a/tests/test-rebase-cache.t b/tests/test-rebase-cache.t
--- a/tests/test-rebase-cache.t
+++ b/tests/test-rebase-cache.t
@@ -105,5 +105,5 @@ Rebase part of branch2 (5-6) onto branch
rebasing 5:635859577d0b "D"
rebasing 6:5097051d331d "E"
- saved backup bundle to $TESTTMP/a1/.hg/strip-backup/635859577d0b-89160bff-backup.hg (glob)
+ saved backup bundle to $TESTTMP/a1/.hg/strip-backup/635859577d0b-89160bff-rebase.hg (glob)
$ hg branches
@@ -167,5 +167,5 @@ Rebase head of branch3 (8) onto branch2
$ hg rebase -s 8 -d 6
rebasing 8:4666b71e8e32 "F" (tip)
- saved backup bundle to $TESTTMP/a2/.hg/strip-backup/4666b71e8e32-fc1c4e96-backup.hg (glob)
+ saved backup bundle to $TESTTMP/a2/.hg/strip-backup/4666b71e8e32-fc1c4e96-rebase.hg (glob)
$ hg branches
@@ -234,5 +234,5 @@ Rebase entire branch3 (7-8) onto branch2
note: rebase of 7:653b9feb4616 created no changes to commit
rebasing 8:4666b71e8e32 "F" (tip)
- saved backup bundle to $TESTTMP/a3/.hg/strip-backup/653b9feb4616-3c88de16-backup.hg (glob)
+ saved backup bundle to $TESTTMP/a3/.hg/strip-backup/653b9feb4616-3c88de16-rebase.hg (glob)
$ hg branches
@@ -481,3 +481,3 @@ Turn most changeset public
rebasing 8:326cfedc031c "I" (tip)
HGEDITFORM=rebase.normal
- saved backup bundle to $TESTTMP/a3/c4/.hg/strip-backup/361a99976cc9-35e980d0-backup.hg (glob)
+ saved backup bundle to $TESTTMP/a3/c4/.hg/strip-backup/361a99976cc9-35e980d0-rebase.hg (glob)
diff --git a/tests/test-rebase-check-restore.t b/tests/test-rebase-check-restore.t
--- a/tests/test-rebase-check-restore.t
+++ b/tests/test-rebase-check-restore.t
@@ -139,5 +139,5 @@ Solve the conflict and go on:
$ hg rebase --continue
rebasing 5:01e6ebbd8272 "F" (tip)
- saved backup bundle to $TESTTMP/a2/.hg/strip-backup/01e6ebbd8272-6fd3a015-backup.hg (glob)
+ saved backup bundle to $TESTTMP/a2/.hg/strip-backup/01e6ebbd8272-6fd3a015-rebase.hg (glob)
$ hg tglog
diff --git a/tests/test-rebase-collapse.t b/tests/test-rebase-collapse.t
--- a/tests/test-rebase-collapse.t
+++ b/tests/test-rebase-collapse.t
@@ -79,5 +79,5 @@ Rebasing B onto H and collapsing changes
HG: added D
====
- saved backup bundle to $TESTTMP/a1/.hg/strip-backup/42ccdea3bb16-3cb021d3-backup.hg (glob)
+ saved backup bundle to $TESTTMP/a1/.hg/strip-backup/42ccdea3bb16-3cb021d3-rebase.hg (glob)
$ hg tglogp
@@ -119,5 +119,5 @@ Rebasing E onto H:
rebasing 4:9520eea781bc "E"
rebasing 6:eea13746799a "G"
- saved backup bundle to $TESTTMP/a2/.hg/strip-backup/9520eea781bc-fcd8edd4-backup.hg (glob)
+ saved backup bundle to $TESTTMP/a2/.hg/strip-backup/9520eea781bc-fcd8edd4-rebase.hg (glob)
$ hg tglog
@@ -162,5 +162,5 @@ Rebasing G onto H with custom message:
rebasing 6:eea13746799a "G"
HGEDITFORM=rebase.collapse
- saved backup bundle to $TESTTMP/a3/.hg/strip-backup/9520eea781bc-fcd8edd4-backup.hg (glob)
+ saved backup bundle to $TESTTMP/a3/.hg/strip-backup/9520eea781bc-fcd8edd4-rebase.hg (glob)
$ hg tglog
@@ -272,5 +272,5 @@ Rebase and collapse - E onto H:
rebasing 5:7f219660301f "F"
rebasing 6:c772a8b2dc17 "G"
- saved backup bundle to $TESTTMP/b1/.hg/strip-backup/8a5212ebc852-75046b61-backup.hg (glob)
+ saved backup bundle to $TESTTMP/b1/.hg/strip-backup/8a5212ebc852-75046b61-rebase.hg (glob)
$ hg tglog
@@ -425,5 +425,5 @@ Rebase and collapse - E onto I:
rebasing 6:55a44ad28289 "G"
rebasing 7:417d3b648079 "H"
- saved backup bundle to $TESTTMP/c1/.hg/strip-backup/8a5212ebc852-f95d0879-backup.hg (glob)
+ saved backup bundle to $TESTTMP/c1/.hg/strip-backup/8a5212ebc852-f95d0879-rebase.hg (glob)
$ hg tglog
@@ -518,5 +518,5 @@ Rebase and collapse - B onto F:
rebasing 3:7bbcd6078bcc "D"
rebasing 4:0a42590ed746 "E"
- saved backup bundle to $TESTTMP/d1/.hg/strip-backup/27547f69f254-9a3f7d92-backup.hg (glob)
+ saved backup bundle to $TESTTMP/d1/.hg/strip-backup/27547f69f254-9a3f7d92-rebase.hg (glob)
$ hg tglog
@@ -605,5 +605,5 @@ Interactions between collapse and keepbr
rebasing 5:fbfb97b1089a "E" (tip)
note: rebase of 5:fbfb97b1089a created no changes to commit
- saved backup bundle to $TESTTMP/e/.hg/strip-backup/fbfb97b1089a-553e1d85-backup.hg (glob)
+ saved backup bundle to $TESTTMP/e/.hg/strip-backup/fbfb97b1089a-553e1d85-rebase.hg (glob)
$ hg tglog
@ 4: 'E'
@@ -663,5 +663,5 @@ Rebase, collapse and copies
merging f and c to c
merging e and g to g
- saved backup bundle to $TESTTMP/copies/.hg/strip-backup/6e7340ee38c0-ef8ef003-backup.hg (glob)
+ saved backup bundle to $TESTTMP/copies/.hg/strip-backup/6e7340ee38c0-ef8ef003-rebase.hg (glob)
$ hg st
$ hg st --copies --change tip
@@ -704,5 +704,5 @@ Test collapsing in place
rebasing 1:1352765a01d4 "change"
rebasing 2:64b456429f67 "Collapsed revision" (tip)
- saved backup bundle to $TESTTMP/copies/.hg/strip-backup/1352765a01d4-45a352ea-backup.hg (glob)
+ saved backup bundle to $TESTTMP/copies/.hg/strip-backup/1352765a01d4-45a352ea-rebase.hg (glob)
$ hg st --change tip --copies
M a
@@ -796,5 +796,5 @@ Test collapsing changes that add then re
rebasing 1:6d8d9f24eec3 "a"
rebasing 2:1cc73eca5ecc "b" (tip foo)
- saved backup bundle to $TESTTMP/collapseaddremove/.hg/strip-backup/6d8d9f24eec3-77d3b6e2-backup.hg (glob)
+ saved backup bundle to $TESTTMP/collapseaddremove/.hg/strip-backup/6d8d9f24eec3-77d3b6e2-rebase.hg (glob)
$ hg log -G --template "{rev}: '{desc}' {bookmarks}"
@ 1: 'collapsed' foo
@@ -837,5 +837,5 @@ running into merge conflict and invoking
$ hg rebase --continue
rebasing 2:b8d8db2b242d "a-dev" (tip)
- saved backup bundle to $TESTTMP/collapse_remember_message/.hg/strip-backup/b8d8db2b242d-f474c19a-backup.hg (glob)
+ saved backup bundle to $TESTTMP/collapse_remember_message/.hg/strip-backup/b8d8db2b242d-f474c19a-rebase.hg (glob)
$ hg log
changeset: 2:45ba1d1a8665
diff --git a/tests/test-rebase-conflicts.t b/tests/test-rebase-conflicts.t
--- a/tests/test-rebase-conflicts.t
+++ b/tests/test-rebase-conflicts.t
@@ -88,5 +88,5 @@ Conclude rebase:
rebasing 4:46f0b057b5c0 "L2"
rebasing 5:8029388f38dc "L3" (mybook)
- saved backup bundle to $TESTTMP/a/.hg/strip-backup/3163e20567cc-5ca4656e-backup.hg (glob)
+ saved backup bundle to $TESTTMP/a/.hg/strip-backup/3163e20567cc-5ca4656e-rebase.hg (glob)
$ hg tglog
@@ -269,6 +269,4 @@ Check that the right ancestors is used w
rebased as 2a7f09cac94c
rebase merging completed
- rebase status stored
- updating the branch cache
update back to initial working directory parent
resolving manifests
@@ -279,4 +277,6 @@ Check that the right ancestors is used w
f2.txt: remote created -> g
getting f2.txt
+ rebase completed
+ updating the branch cache
2 changesets found
list of changesets:
@@ -286,5 +286,5 @@ Check that the right ancestors is used w
bundle2-output-part: "changegroup" (params: 1 mandatory 1 advisory) streamed payload
bundle2-output-part: "phase-heads" 24 bytes payload
- saved backup bundle to $TESTTMP/issue4041/.hg/strip-backup/e31216eec445-15f7a814-backup.hg (glob)
+ saved backup bundle to $TESTTMP/issue4041/.hg/strip-backup/e31216eec445-15f7a814-rebase.hg (glob)
3 changesets found
list of changesets:
@@ -312,5 +312,4 @@ Check that the right ancestors is used w
updating the branch cache
invalid branchheads cache (served): tip differs
- rebase completed
Test minimization of merge conflicts
@@ -399,14 +398,19 @@ Test rebase with obsstore turned on and
not rebasing ignored 2:26805aba1e60 "C" (C)
rebasing 3:f585351a92f8 "D" (D)
- saved backup bundle to $TESTTMP/b/.hg/strip-backup/f585351a92f8-cb2a9b47-backup.hg (glob)
+ warning: orphaned descendants detected, not stripping 112478962961
+ saved backup bundle to $TESTTMP/b/.hg/strip-backup/f585351a92f8-e536a9e4-rebase.hg (glob)
$ rm .hg/localtags
$ hg tglog
- o 3:draft 'D'
+ o 5:draft 'D'
+ |
+ o 4:draft 'B'
|
- o 2:draft 'B'
+ @ 3:draft 'E'
|
- @ 1:draft 'E'
- |
+ | o 2:draft 'C'
+ | |
+ | o 1:draft 'B'
+ |/
o 0:draft 'A'
diff --git a/tests/test-rebase-dest.t b/tests/test-rebase-dest.t
--- a/tests/test-rebase-dest.t
+++ b/tests/test-rebase-dest.t
@@ -22,13 +22,13 @@ Require a destination
$ hg rebase -d 1
rebasing 2:5db65b93a12b "cc" (tip)
- saved backup bundle to $TESTTMP/repo/.hg/strip-backup/5db65b93a12b-4fb789ec-backup.hg (glob)
+ saved backup bundle to $TESTTMP/repo/.hg/strip-backup/5db65b93a12b-4fb789ec-rebase.hg (glob)
$ hg rebase -d 0 -r . -q
$ HGPLAIN=1 hg rebase
rebasing 2:889b0bc6a730 "cc" (tip)
- saved backup bundle to $TESTTMP/repo/.hg/strip-backup/889b0bc6a730-41ec4f81-backup.hg (glob)
+ saved backup bundle to $TESTTMP/repo/.hg/strip-backup/889b0bc6a730-41ec4f81-rebase.hg (glob)
$ hg rebase -d 0 -r . -q
$ hg --config commands.rebase.requiredest=False rebase
rebasing 2:279de9495438 "cc" (tip)
- saved backup bundle to $TESTTMP/repo/.hg/strip-backup/279de9495438-ab0a5128-backup.hg (glob)
+ saved backup bundle to $TESTTMP/repo/.hg/strip-backup/279de9495438-ab0a5128-rebase.hg (glob)
Requiring dest should not break continue or other rebase options
@@ -57,5 +57,5 @@ Requiring dest should not break continue
$ hg rebase --continue
rebasing 3:0537f6b50def "dc" (tip)
- saved backup bundle to $TESTTMP/repo/.hg/strip-backup/0537f6b50def-be4c7386-backup.hg (glob)
+ saved backup bundle to $TESTTMP/repo/.hg/strip-backup/0537f6b50def-be4c7386-rebase.hg (glob)
$ cd ..
diff --git a/tests/test-rebase-detach.t b/tests/test-rebase-detach.t
--- a/tests/test-rebase-detach.t
+++ b/tests/test-rebase-detach.t
@@ -50,5 +50,5 @@ Rebasing D onto H detaching from C:
$ hg rebase -s 3 -d 7
rebasing 3:32af7686d403 "D"
- saved backup bundle to $TESTTMP/a1/.hg/strip-backup/32af7686d403-6f7dface-backup.hg (glob)
+ saved backup bundle to $TESTTMP/a1/.hg/strip-backup/32af7686d403-6f7dface-rebase.hg (glob)
$ hg log -G --template "{rev}:{phase} '{desc}' {branches}\n"
@@ -103,5 +103,5 @@ Rebasing C onto H detaching from B:
rebasing 2:5fddd98957c8 "C"
rebasing 3:32af7686d403 "D"
- saved backup bundle to $TESTTMP/a2/.hg/strip-backup/5fddd98957c8-f9244fa1-backup.hg (glob)
+ saved backup bundle to $TESTTMP/a2/.hg/strip-backup/5fddd98957c8-f9244fa1-rebase.hg (glob)
$ hg tglog
@@ -158,5 +158,5 @@ Rebasing B onto H using detach (same as
rebasing 2:5fddd98957c8 "C"
rebasing 3:32af7686d403 "D"
- saved backup bundle to $TESTTMP/a3/.hg/strip-backup/42ccdea3bb16-3cb021d3-backup.hg (glob)
+ saved backup bundle to $TESTTMP/a3/.hg/strip-backup/42ccdea3bb16-3cb021d3-rebase.hg (glob)
$ hg tglog
@@ -214,5 +214,5 @@ Rebasing C onto H detaching from B and c
rebasing 2:5fddd98957c8 "C"
rebasing 3:32af7686d403 "D"
- saved backup bundle to $TESTTMP/a4/.hg/strip-backup/5fddd98957c8-f9244fa1-backup.hg (glob)
+ saved backup bundle to $TESTTMP/a4/.hg/strip-backup/5fddd98957c8-f9244fa1-rebase.hg (glob)
$ hg log -G --template "{rev}:{phase} '{desc}' {branches}\n"
@@ -276,5 +276,5 @@ Rebasing across null as ancestor
rebasing 2:5fddd98957c8 "C"
rebasing 3:32af7686d403 "D"
- saved backup bundle to $TESTTMP/a5/.hg/strip-backup/42ccdea3bb16-3cb021d3-backup.hg (glob)
+ saved backup bundle to $TESTTMP/a5/.hg/strip-backup/42ccdea3bb16-3cb021d3-rebase.hg (glob)
$ hg tglog
@@ -301,5 +301,5 @@ Rebasing across null as ancestor
rebasing 7:13547172c9c0 "C"
rebasing 8:4e27a76c371a "D" (tip)
- saved backup bundle to $TESTTMP/a5/.hg/strip-backup/13547172c9c0-35685ded-backup.hg (glob)
+ saved backup bundle to $TESTTMP/a5/.hg/strip-backup/13547172c9c0-35685ded-rebase.hg (glob)
$ hg tglog
o 8: 'D'
@@ -342,5 +342,5 @@ Verify that target is not selected as ex
rebasing 9:5d7b11f5fb97 "Merge"
rebasing 10:9427d4d5af81 "J" (tip)
- saved backup bundle to $TESTTMP/a6/.hg/strip-backup/9790e768172d-c2111e9d-backup.hg (glob)
+ saved backup bundle to $TESTTMP/a6/.hg/strip-backup/9790e768172d-c2111e9d-rebase.hg (glob)
$ hg tglog
@@ -396,5 +396,5 @@ Ensure --continue restores a correct sta
rebasing 8:6215fafa5447 "H2" (tip)
note: rebase of 8:6215fafa5447 created no changes to commit
- saved backup bundle to $TESTTMP/a7/.hg/strip-backup/6215fafa5447-5804ebd5-backup.hg (glob)
+ saved backup bundle to $TESTTMP/a7/.hg/strip-backup/6215fafa5447-5804ebd5-rebase.hg (glob)
$ hg log -G --template "{rev}:{phase} '{desc}' {branches}\n"
@ 7:draft 'H'
diff --git a/tests/test-rebase-interruptions.t b/tests/test-rebase-interruptions.t
--- a/tests/test-rebase-interruptions.t
+++ b/tests/test-rebase-interruptions.t
@@ -113,5 +113,5 @@ Solve the conflict and go on:
already rebased 1:27547f69f254 "B" as 45396c49d53b
rebasing 2:965c486023db "C"
- warning: new changesets detected on source branch, not stripping
+ warning: orphaned descendants detected, not stripping 27547f69f254, 965c486023db
$ hg tglogp
@@ -299,5 +299,5 @@ Make sure merge state is cleaned up afte
rebasing 1:fdaca8533b86 "b"
note: rebase of 1:fdaca8533b86 created no changes to commit
- saved backup bundle to $TESTTMP/repo/.hg/strip-backup/fdaca8533b86-7fd70513-backup.hg (glob)
+ saved backup bundle to $TESTTMP/repo/.hg/strip-backup/fdaca8533b86-7fd70513-rebase.hg (glob)
$ hg resolve --list
$ test -f .hg/merge
diff --git a/tests/test-rebase-issue-noparam-single-rev.t b/tests/test-rebase-issue-noparam-single-rev.t
--- a/tests/test-rebase-issue-noparam-single-rev.t
+++ b/tests/test-rebase-issue-noparam-single-rev.t
@@ -54,5 +54,5 @@ Rebase with no arguments - single revisi
$ hg rebase
rebasing 2:87c180a611f2 "l1"
- saved backup bundle to $TESTTMP/a/.hg/strip-backup/87c180a611f2-a5be192d-backup.hg (glob)
+ saved backup bundle to $TESTTMP/a/.hg/strip-backup/87c180a611f2-a5be192d-rebase.hg (glob)
$ hg tglog
@@ -114,5 +114,5 @@ Rebase with no arguments - single revisi
rebasing 2:87c180a611f2 "l1"
rebasing 3:1ac923b736ef "l2"
- saved backup bundle to $TESTTMP/b/.hg/strip-backup/87c180a611f2-b980535c-backup.hg (glob)
+ saved backup bundle to $TESTTMP/b/.hg/strip-backup/87c180a611f2-b980535c-rebase.hg (glob)
$ hg tglog
diff --git a/tests/test-rebase-mq-skip.t b/tests/test-rebase-mq-skip.t
--- a/tests/test-rebase-mq-skip.t
+++ b/tests/test-rebase-mq-skip.t
@@ -69,4 +69,6 @@ already has one local mq patch
updating mq patch p0.patch to 5:9ecc820b1737
$TESTTMP/a/.hg/patches/p0.patch (glob)
+ rebase completed
+ 1 revisions have been skipped
2 changesets found
uncompressed size of bundle content:
@@ -75,5 +77,5 @@ already has one local mq patch
129 p0
129 p1
- saved backup bundle to $TESTTMP/a/.hg/strip-backup/13a46ce44f60-5da6ecfb-backup.hg (glob)
+ saved backup bundle to $TESTTMP/a/.hg/strip-backup/13a46ce44f60-5da6ecfb-rebase.hg (glob)
2 changesets found
uncompressed size of bundle content:
@@ -87,6 +89,4 @@ already has one local mq patch
adding file changes
added 2 changesets with 2 changes to 2 files
- rebase completed
- 1 revisions have been skipped
$ hg tglog
@@ -167,5 +167,5 @@ already has one local mq patch
rebasing 6:512a1f24768b "r6" (qtip r6)
note: rebase of 6:512a1f24768b created no changes to commit
- saved backup bundle to $TESTTMP/b/.hg/strip-backup/b4bffa6e4776-b9bfb84d-backup.hg (glob)
+ saved backup bundle to $TESTTMP/b/.hg/strip-backup/b4bffa6e4776-b9bfb84d-rebase.hg (glob)
$ hg tglog
diff --git a/tests/test-rebase-mq.t b/tests/test-rebase-mq.t
--- a/tests/test-rebase-mq.t
+++ b/tests/test-rebase-mq.t
@@ -89,5 +89,5 @@ Fix the 2nd conflict:
already rebased 2:3504f44bffc0 "P0" (f.patch qbase) as ebe9914c0d1c
rebasing 3:929394423cd3 "P1" (f2.patch qtip)
- saved backup bundle to $TESTTMP/a/.hg/strip-backup/3504f44bffc0-30595b40-backup.hg (glob)
+ saved backup bundle to $TESTTMP/a/.hg/strip-backup/3504f44bffc0-30595b40-rebase.hg (glob)
$ hg tglog
@@ -206,5 +206,5 @@ Rebase the applied mq patches:
rebasing 2:0c587ffcb480 "P0 (git)" (f_git.patch qbase)
rebasing 3:c7f18665e4bc "P1" (f.patch qtip tip)
- saved backup bundle to $TESTTMP/a/.hg/strip-backup/0c587ffcb480-0ea5695f-backup.hg (glob)
+ saved backup bundle to $TESTTMP/a/.hg/strip-backup/0c587ffcb480-0ea5695f-rebase.hg (glob)
$ hg qci -m 'save patch state'
diff --git a/tests/test-rebase-named-branches.t b/tests/test-rebase-named-branches.t
--- a/tests/test-rebase-named-branches.t
+++ b/tests/test-rebase-named-branches.t
@@ -73,5 +73,5 @@ Branch name containing a dash (issue3181
rebasing 7:02de42196ebe "H"
rebasing 9:cb039b7cae8e "dev-two named branch" (tip)
- saved backup bundle to $TESTTMP/a1/.hg/strip-backup/24b6387c8c8c-24cb8001-backup.hg (glob)
+ saved backup bundle to $TESTTMP/a1/.hg/strip-backup/24b6387c8c8c-24cb8001-rebase.hg (glob)
$ hg tglog
@@ -102,5 +102,5 @@ Branch name containing a dash (issue3181
rebasing 8:31d0e4ba75e6 "H"
rebasing 9:9e70cd31750f "dev-two named branch" (tip)
- saved backup bundle to $TESTTMP/a1/.hg/strip-backup/643fc9128048-c4ee9ef5-backup.hg (glob)
+ saved backup bundle to $TESTTMP/a1/.hg/strip-backup/643fc9128048-c4ee9ef5-rebase.hg (glob)
$ hg tglog
@@ -162,5 +162,5 @@ Branch name containing a dash (issue3181
rebasing 8:904590360559 "H"
rebasing 9:59c2e59309fe "dev-two named branch"
- saved backup bundle to $TESTTMP/a1/.hg/strip-backup/bc8139ee757c-f11c1080-backup.hg (glob)
+ saved backup bundle to $TESTTMP/a1/.hg/strip-backup/bc8139ee757c-f11c1080-rebase.hg (glob)
$ hg tglog
@@ -191,5 +191,5 @@ Branch name containing a dash (issue3181
rebasing 8:12b2bc666e20 "H"
rebasing 9:71325f8bc082 "dev-two named branch" (tip)
- saved backup bundle to $TESTTMP/a1/.hg/strip-backup/643fc9128048-6cdd1a52-backup.hg (glob)
+ saved backup bundle to $TESTTMP/a1/.hg/strip-backup/643fc9128048-6cdd1a52-rebase.hg (glob)
$ hg tglog
@@ -222,5 +222,5 @@ Rebasing descendant onto ancestor across
rebasing 2:5fddd98957c8 "C"
rebasing 3:32af7686d403 "D"
- saved backup bundle to $TESTTMP/a1/.hg/strip-backup/42ccdea3bb16-3cb021d3-backup.hg (glob)
+ saved backup bundle to $TESTTMP/a1/.hg/strip-backup/42ccdea3bb16-3cb021d3-rebase.hg (glob)
$ hg tglog
@@ -254,5 +254,5 @@ Rebasing descendant onto ancestor across
rebasing 8:a0d543090fa4 "C"
rebasing 9:e9f862ce8bad "D" (tip)
- saved backup bundle to $TESTTMP/a1/.hg/strip-backup/3944801ae4ea-fb46ed74-backup.hg (glob)
+ saved backup bundle to $TESTTMP/a1/.hg/strip-backup/3944801ae4ea-fb46ed74-rebase.hg (glob)
$ hg tglog
@@ -291,5 +291,5 @@ Reopen branch by rebase
rebasing 8:810110211f50 "C"
rebasing 9:e522577ccdbd "D"
- saved backup bundle to $TESTTMP/a1/.hg/strip-backup/8e279d293175-b023e27c-backup.hg (glob)
+ saved backup bundle to $TESTTMP/a1/.hg/strip-backup/8e279d293175-b023e27c-rebase.hg (glob)
$ cd ..
@@ -330,5 +330,5 @@ rebase 'b2' to another lower branch head
rebasing 2:792845bb77ee "b2"
note: rebase of 2:792845bb77ee created no changes to commit
- saved backup bundle to $TESTTMP/case1/.hg/strip-backup/792845bb77ee-627120ee-backup.hg (glob)
+ saved backup bundle to $TESTTMP/case1/.hg/strip-backup/792845bb77ee-627120ee-rebase.hg (glob)
$ hg tglog
o 2: 'c1' c
@@ -345,5 +345,5 @@ rebase 'b1' on top of the tip of the bra
$ hg rebase
rebasing 1:40039acb7ca5 "b1"
- saved backup bundle to $TESTTMP/case2/.hg/strip-backup/40039acb7ca5-342b72d1-backup.hg (glob)
+ saved backup bundle to $TESTTMP/case2/.hg/strip-backup/40039acb7ca5-342b72d1-rebase.hg (glob)
$ hg tglog
@ 3: 'b1' b
@@ -396,5 +396,5 @@ rebase 'c1' to the branch head 'c2' that
rebasing 4:8427af5d86f2 "c2 closed" (tip)
note: rebase of 4:8427af5d86f2 created no changes to commit
- saved backup bundle to $TESTTMP/case2/.hg/strip-backup/76abc1c6f8c7-cd698d13-backup.hg (glob)
+ saved backup bundle to $TESTTMP/case2/.hg/strip-backup/76abc1c6f8c7-cd698d13-rebase.hg (glob)
$ hg tglog
o 3: 'b1' x
diff --git a/tests/test-rebase-newancestor.t b/tests/test-rebase-newancestor.t
--- a/tests/test-rebase-newancestor.t
+++ b/tests/test-rebase-newancestor.t
@@ -45,5 +45,5 @@
rebasing 2:30ae917c0e4f "C"
merging a
- saved backup bundle to $TESTTMP/repo/.hg/strip-backup/0f4f7cb4f549-82b3b163-backup.hg (glob)
+ saved backup bundle to $TESTTMP/repo/.hg/strip-backup/0f4f7cb4f549-82b3b163-rebase.hg (glob)
$ hg tglog
@@ -139,5 +139,5 @@ Full rebase all the way back from branch
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? c
rebasing 6:9455ee510502 "dev: merge default"
- saved backup bundle to $TESTTMP/ancestor-merge/.hg/strip-backup/1d1a643d390e-43e9e04b-backup.hg (glob)
+ saved backup bundle to $TESTTMP/ancestor-merge/.hg/strip-backup/1d1a643d390e-43e9e04b-rebase.hg (glob)
$ hg tglog
o 6: 'dev: merge default'
@@ -168,5 +168,5 @@ Grafty cherry picking rebasing:
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? c
rebasing 6:9455ee510502 "dev: merge default"
- saved backup bundle to $TESTTMP/ancestor-merge-2/.hg/strip-backup/ec2c14fb2984-62d0b222-backup.hg (glob)
+ saved backup bundle to $TESTTMP/ancestor-merge-2/.hg/strip-backup/ec2c14fb2984-62d0b222-rebase.hg (glob)
$ hg tglog
o 7: 'dev: merge default'
@@ -240,5 +240,5 @@ Test order of parents of rebased merged
$ hg rebase -r 4 -d 2
rebasing 4:6990226659be "merge p1 3=outside p2 1=ancestor"
- saved backup bundle to $TESTTMP/parentorder/.hg/strip-backup/6990226659be-4d67a0d3-backup.hg (glob)
+ saved backup bundle to $TESTTMP/parentorder/.hg/strip-backup/6990226659be-4d67a0d3-rebase.hg (glob)
$ hg tip
changeset: 5:cca50676b1c5
@@ -252,5 +252,5 @@ Test order of parents of rebased merged
$ hg rebase -r 4 -d 2
rebasing 4:a57575f79074 "merge p1 1=ancestor p2 3=outside"
- saved backup bundle to $TESTTMP/parentorder/.hg/strip-backup/a57575f79074-385426e5-backup.hg (glob)
+ saved backup bundle to $TESTTMP/parentorder/.hg/strip-backup/a57575f79074-385426e5-rebase.hg (glob)
$ hg tip
changeset: 5:f9daf77ffe76
@@ -303,4 +303,5 @@ rebase of merge of ancestors
committing changelog
rebase merging completed
+ rebase completed
1 changesets found
uncompressed size of bundle content:
@@ -308,5 +309,5 @@ rebase of merge of ancestors
216 (manifests)
182 other
- saved backup bundle to $TESTTMP/parentorder/.hg/strip-backup/4c5f12f25ebe-f46990e5-backup.hg (glob)
+ saved backup bundle to $TESTTMP/parentorder/.hg/strip-backup/4c5f12f25ebe-f46990e5-rebase.hg (glob)
1 changesets found
uncompressed size of bundle content:
@@ -319,5 +320,4 @@ rebase of merge of ancestors
adding file changes
added 1 changesets with 1 changes to 1 files
- rebase completed
$ hg tglog
@ 6: 'merge rebase ancestors'
diff --git a/tests/test-rebase-obsolete.t b/tests/test-rebase-obsolete.t
--- a/tests/test-rebase-obsolete.t
+++ b/tests/test-rebase-obsolete.t
@@ -975,8 +975,11 @@ during the rebase operation
3:be1832deae9a b (no-eol)
-Check that bookmark was moved to rev 3 although rev 2 was skipped
-during the rebase operation
+Check that bookmark was not moved to rev 3 if rev 2 was skipped during the
+rebase operation. This makes sense because if rev 2 has a successor, the
+operation generating that successor (ex. rebase) should be responsible for
+moving bookmarks. If the bookmark is on a precursor, like rev 2, that means the
+user manually moved it back. In that case we should not move it again.
$ hg bookmarks
- mybook 3:be1832deae9a
+ mybook 2:1e9a3c00cbe9
$ hg debugobsolete --rev tip
1e9a3c00cbe90d236ac05ef61efcc5e40b7412bc be1832deae9ac531caa7438b8dcf6055a122cd8e 0 (*) {'user': 'test'} (glob)
diff --git a/tests/test-rebase-parameters.t b/tests/test-rebase-parameters.t
--- a/tests/test-rebase-parameters.t
+++ b/tests/test-rebase-parameters.t
@@ -135,5 +135,5 @@ Rebase with no arguments (from 3 onto 8)
rebasing 2:5fddd98957c8 "C"
rebasing 3:32af7686d403 "D"
- saved backup bundle to $TESTTMP/a1/.hg/strip-backup/42ccdea3bb16-3cb021d3-backup.hg (glob)
+ saved backup bundle to $TESTTMP/a1/.hg/strip-backup/42ccdea3bb16-3cb021d3-rebase.hg (glob)
$ hg tglog
@@ -169,5 +169,5 @@ Rebase with base == '.' => same as no ar
rebasing 2:5fddd98957c8 "C"
rebasing 3:32af7686d403 "D"
- saved backup bundle to $TESTTMP/a2/.hg/strip-backup/42ccdea3bb16-3cb021d3-backup.hg (glob)
+ saved backup bundle to $TESTTMP/a2/.hg/strip-backup/42ccdea3bb16-3cb021d3-rebase.hg (glob)
$ hg tglog
@@ -198,5 +198,5 @@ Rebase with dest == branch(.) => same as
rebasing 2:5fddd98957c8 "C"
rebasing 3:32af7686d403 "D"
- saved backup bundle to $TESTTMP/a3/.hg/strip-backup/42ccdea3bb16-3cb021d3-backup.hg (glob)
+ saved backup bundle to $TESTTMP/a3/.hg/strip-backup/42ccdea3bb16-3cb021d3-rebase.hg (glob)
$ hg tglog
@@ -230,5 +230,5 @@ Specify only source (from 2 onto 8):
rebasing 2:5fddd98957c8 "C"
rebasing 3:32af7686d403 "D"
- saved backup bundle to $TESTTMP/a4/.hg/strip-backup/5fddd98957c8-f9244fa1-backup.hg (glob)
+ saved backup bundle to $TESTTMP/a4/.hg/strip-backup/5fddd98957c8-f9244fa1-rebase.hg (glob)
$ hg tglog
@@ -259,5 +259,5 @@ Specify only dest (from 3 onto 6):
rebasing 2:5fddd98957c8 "C"
rebasing 3:32af7686d403 "D"
- saved backup bundle to $TESTTMP/a5/.hg/strip-backup/42ccdea3bb16-3cb021d3-backup.hg (glob)
+ saved backup bundle to $TESTTMP/a5/.hg/strip-backup/42ccdea3bb16-3cb021d3-rebase.hg (glob)
$ hg tglog
@@ -292,5 +292,5 @@ Specify only base (from 1 onto 8):
rebasing 2:5fddd98957c8 "C"
rebasing 3:32af7686d403 "D"
- saved backup bundle to $TESTTMP/a6/.hg/strip-backup/42ccdea3bb16-3cb021d3-backup.hg (glob)
+ saved backup bundle to $TESTTMP/a6/.hg/strip-backup/42ccdea3bb16-3cb021d3-rebase.hg (glob)
$ hg tglog
@@ -320,5 +320,5 @@ Specify source and dest (from 2 onto 7):
rebasing 2:5fddd98957c8 "C"
rebasing 3:32af7686d403 "D"
- saved backup bundle to $TESTTMP/a7/.hg/strip-backup/5fddd98957c8-f9244fa1-backup.hg (glob)
+ saved backup bundle to $TESTTMP/a7/.hg/strip-backup/5fddd98957c8-f9244fa1-rebase.hg (glob)
$ hg tglog
@@ -353,5 +353,5 @@ Specify base and dest (from 1 onto 7):
rebasing 2:5fddd98957c8 "C"
rebasing 3:32af7686d403 "D"
- saved backup bundle to $TESTTMP/a8/.hg/strip-backup/42ccdea3bb16-3cb021d3-backup.hg (glob)
+ saved backup bundle to $TESTTMP/a8/.hg/strip-backup/42ccdea3bb16-3cb021d3-rebase.hg (glob)
$ hg tglog
@@ -385,5 +385,5 @@ Specify only revs (from 2 onto 8)
rebasing 2:5fddd98957c8 "C"
rebasing 3:32af7686d403 "D"
- saved backup bundle to $TESTTMP/a9/.hg/strip-backup/5fddd98957c8-f9244fa1-backup.hg (glob)
+ saved backup bundle to $TESTTMP/a9/.hg/strip-backup/5fddd98957c8-f9244fa1-rebase.hg (glob)
$ hg tglog
@@ -411,5 +411,5 @@ Rebasing both a single revision and a me
rebasing 3:32af7686d403 "D"
rebasing 6:eea13746799a "G"
- saved backup bundle to $TESTTMP/aX/.hg/strip-backup/eea13746799a-ad273fd6-backup.hg (glob)
+ saved backup bundle to $TESTTMP/aX/.hg/strip-backup/eea13746799a-ad273fd6-rebase.hg (glob)
$ cd ..
@@ -441,5 +441,5 @@ Test --tool parameter:
rebasing 2:e4e3f3546619 "c2b" (tip)
note: rebase of 2:e4e3f3546619 created no changes to commit
- saved backup bundle to $TESTTMP/b1/.hg/strip-backup/e4e3f3546619-b0841178-backup.hg (glob)
+ saved backup bundle to $TESTTMP/b1/.hg/strip-backup/e4e3f3546619-b0841178-rebase.hg (glob)
$ hg cat c2
@@ -454,5 +454,5 @@ Test --tool parameter:
$ hg rebase -s 2 -d 1 --tool internal:other
rebasing 2:e4e3f3546619 "c2b" (tip)
- saved backup bundle to $TESTTMP/b2/.hg/strip-backup/e4e3f3546619-b0841178-backup.hg (glob)
+ saved backup bundle to $TESTTMP/b2/.hg/strip-backup/e4e3f3546619-b0841178-rebase.hg (glob)
$ hg cat c2
@@ -494,5 +494,5 @@ Test --tool parameter:
rebasing 2:e4e3f3546619 "c2b" (tip)
note: rebase of 2:e4e3f3546619 created no changes to commit
- saved backup bundle to $TESTTMP/b3/.hg/strip-backup/e4e3f3546619-b0841178-backup.hg (glob)
+ saved backup bundle to $TESTTMP/b3/.hg/strip-backup/e4e3f3546619-b0841178-rebase.hg (glob)
$ hg rebase -i
diff --git a/tests/test-rebase-pull.t b/tests/test-rebase-pull.t
--- a/tests/test-rebase-pull.t
+++ b/tests/test-rebase-pull.t
@@ -56,5 +56,5 @@ Now b has one revision to be pulled from
added 1 changesets with 1 changes to 1 files (+1 heads)
rebasing 2:ff8d69a621f9 "L1"
- saved backup bundle to $TESTTMP/b/.hg/strip-backup/ff8d69a621f9-160fa373-backup.hg (glob)
+ saved backup bundle to $TESTTMP/b/.hg/strip-backup/ff8d69a621f9-160fa373-rebase.hg (glob)
$ hg tglog
@@ -212,5 +212,5 @@ pull --rebase works when a specific revi
added 2 changesets with 2 changes to 2 files
rebasing 3:ff8d69a621f9 "L1"
- saved backup bundle to $TESTTMP/c/.hg/strip-backup/ff8d69a621f9-160fa373-backup.hg (glob)
+ saved backup bundle to $TESTTMP/c/.hg/strip-backup/ff8d69a621f9-160fa373-rebase.hg (glob)
$ hg tglog
@ 5: 'L1'
@@ -254,5 +254,5 @@ pull --rebase works with bundle2 turned
added 1 changesets with 1 changes to 1 files (+1 heads)
rebasing 5:518d153c0ba3 "L1"
- saved backup bundle to $TESTTMP/c/.hg/strip-backup/518d153c0ba3-73407f14-backup.hg (glob)
+ saved backup bundle to $TESTTMP/c/.hg/strip-backup/518d153c0ba3-73407f14-rebase.hg (glob)
$ hg tglog
@ 6: 'L1'
@@ -307,5 +307,5 @@ pull --rebase only update if there is no
rebasing 6:0d0727eb7ce0 "L1"
rebasing 7:c1f58876e3bf "L2"
- saved backup bundle to $TESTTMP/c/.hg/strip-backup/0d0727eb7ce0-ef61ccb2-backup.hg (glob)
+ saved backup bundle to $TESTTMP/c/.hg/strip-backup/0d0727eb7ce0-ef61ccb2-rebase.hg (glob)
$ hg tglog
o 8: 'L2'
@@ -423,5 +423,5 @@ The second local head should not confuse
rebasing 7:864e0a2d2614 "L1"
rebasing 8:6dc0ea5dcf55 "L2"
- saved backup bundle to $TESTTMP/c/.hg/strip-backup/864e0a2d2614-2f72c89c-backup.hg (glob)
+ saved backup bundle to $TESTTMP/c/.hg/strip-backup/864e0a2d2614-2f72c89c-rebase.hg (glob)
$ hg tglog
@ 12: 'L2'
diff --git a/tests/test-rebase-rename.t b/tests/test-rebase-rename.t
--- a/tests/test-rebase-rename.t
+++ b/tests/test-rebase-rename.t
@@ -62,5 +62,5 @@ Rebase the revision containing the renam
$ hg rebase -s 3 -d 2
rebasing 3:73a3ee40125d "rename A" (tip)
- saved backup bundle to $TESTTMP/a/.hg/strip-backup/73a3ee40125d-1d78ebcf-backup.hg (glob)
+ saved backup bundle to $TESTTMP/a/.hg/strip-backup/73a3ee40125d-1d78ebcf-rebase.hg (glob)
$ hg tglog
@@ -153,5 +153,5 @@ Rebase the revision containing the copy:
$ hg rebase -s 3 -d 2
rebasing 3:0a8162ff18a8 "copy A" (tip)
- saved backup bundle to $TESTTMP/b/.hg/strip-backup/0a8162ff18a8-dd06302a-backup.hg (glob)
+ saved backup bundle to $TESTTMP/b/.hg/strip-backup/0a8162ff18a8-dd06302a-rebase.hg (glob)
$ hg tglog
@@ -237,5 +237,5 @@ Test rebase across repeating renames:
$ hg rebase -s 4 -d 3
rebasing 4:b918d683b091 "Another unrelated change" (tip)
- saved backup bundle to $TESTTMP/repo/.hg/strip-backup/b918d683b091-3024bc57-backup.hg (glob)
+ saved backup bundle to $TESTTMP/repo/.hg/strip-backup/b918d683b091-3024bc57-rebase.hg (glob)
$ hg diff --stat -c .
@@ -288,5 +288,5 @@ Rebase the copies on top of the unrelate
rebasing 2:327f772bc074 "File c created as copy of b and modified"
rebasing 3:421b7e82bb85 "File d created as copy of c and modified"
- saved backup bundle to $TESTTMP/copy-gets-preserved/.hg/strip-backup/79d255d24ad2-a2265555-backup.hg (glob)
+ saved backup bundle to $TESTTMP/copy-gets-preserved/.hg/strip-backup/79d255d24ad2-a2265555-rebase.hg (glob)
$ hg update 4
3 files updated, 0 files merged, 0 files removed, 0 files unresolved
@@ -315,5 +315,5 @@ copy records collapse correctly.
rebasing 4:dbb9ba033561 "File d created as copy of c and modified"
merging c and d to d
- saved backup bundle to $TESTTMP/copy-gets-preserved/.hg/strip-backup/68bf06433839-dde37595-backup.hg (glob)
+ saved backup bundle to $TESTTMP/copy-gets-preserved/.hg/strip-backup/68bf06433839-dde37595-rebase.hg (glob)
$ hg co tip
3 files updated, 0 files merged, 0 files removed, 0 files unresolved
diff --git a/tests/test-rebase-scenario-global.t b/tests/test-rebase-scenario-global.t
--- a/tests/test-rebase-scenario-global.t
+++ b/tests/test-rebase-scenario-global.t
@@ -66,5 +66,5 @@ can abort or warn for colliding untracke
HG: branch 'default'
HG: added D
- saved backup bundle to $TESTTMP/a1/.hg/strip-backup/32af7686d403-6f7dface-backup.hg (glob)
+ saved backup bundle to $TESTTMP/a1/.hg/strip-backup/32af7686d403-6f7dface-rebase.hg (glob)
$ cat D.orig
collide
@@ -101,5 +101,5 @@ that we can ignore for colliding untrack
$ HGEDITOR=cat hg rebase -s 3 -d 5 --config merge.checkunknown=ignore
rebasing 3:32af7686d403 "D"
- saved backup bundle to $TESTTMP/a2/.hg/strip-backup/32af7686d403-6f7dface-backup.hg (glob)
+ saved backup bundle to $TESTTMP/a2/.hg/strip-backup/32af7686d403-6f7dface-rebase.hg (glob)
$ cat D.orig
collide
@@ -139,5 +139,5 @@ if they have the same contents)
rebasing 6:eea13746799a "G"
note: rebase of 6:eea13746799a created no changes to commit
- saved backup bundle to $TESTTMP/a3/.hg/strip-backup/9520eea781bc-fcd8edd4-backup.hg (glob)
+ saved backup bundle to $TESTTMP/a3/.hg/strip-backup/9520eea781bc-fcd8edd4-rebase.hg (glob)
$ f E.orig
E.orig: file not found
@@ -171,5 +171,5 @@ F onto E - rebase of a branching point (
note: rebase of 6:eea13746799a created no changes to commit
rebasing 7:02de42196ebe "H" (tip)
- saved backup bundle to $TESTTMP/a4/.hg/strip-backup/24b6387c8c8c-c3fe765d-backup.hg (glob)
+ saved backup bundle to $TESTTMP/a4/.hg/strip-backup/24b6387c8c8c-c3fe765d-rebase.hg (glob)
$ hg tglog
@@ -198,5 +198,5 @@ G onto H - merged revision having a pare
$ hg rebase -s 6 -d 7
rebasing 6:eea13746799a "G"
- saved backup bundle to $TESTTMP/a5/.hg/strip-backup/eea13746799a-883828ed-backup.hg (glob)
+ saved backup bundle to $TESTTMP/a5/.hg/strip-backup/eea13746799a-883828ed-rebase.hg (glob)
$ hg tglog
@@ -229,5 +229,5 @@ F onto B - G maintains E as parent:
rebasing 6:eea13746799a "G"
rebasing 7:02de42196ebe "H" (tip)
- saved backup bundle to $TESTTMP/a6/.hg/strip-backup/24b6387c8c8c-c3fe765d-backup.hg (glob)
+ saved backup bundle to $TESTTMP/a6/.hg/strip-backup/24b6387c8c8c-c3fe765d-rebase.hg (glob)
$ hg tglog
@@ -304,5 +304,5 @@ C onto A - rebase onto an ancestor:
rebasing 2:5fddd98957c8 "C"
rebasing 3:32af7686d403 "D"
- saved backup bundle to $TESTTMP/a7/.hg/strip-backup/5fddd98957c8-f9244fa1-backup.hg (glob)
+ saved backup bundle to $TESTTMP/a7/.hg/strip-backup/5fddd98957c8-f9244fa1-rebase.hg (glob)
$ hg tglog
o 7: 'D'
@@ -348,5 +348,5 @@ Source phase greater or equal to destina
$ hg rebase -s9 -d0
rebasing 9:2b23e52411f4 "D" (tip)
- saved backup bundle to $TESTTMP/a7/.hg/strip-backup/2b23e52411f4-f942decf-backup.hg (glob)
+ saved backup bundle to $TESTTMP/a7/.hg/strip-backup/2b23e52411f4-f942decf-rebase.hg (glob)
$ hg id -n # check we updated back to parent
5
@@ -355,5 +355,5 @@ Source phase greater or equal to destina
$ hg rebase -s9 -d1
rebasing 9:2cb10d0cfc6c "D" (tip)
- saved backup bundle to $TESTTMP/a7/.hg/strip-backup/2cb10d0cfc6c-ddb0f256-backup.hg (glob)
+ saved backup bundle to $TESTTMP/a7/.hg/strip-backup/2cb10d0cfc6c-ddb0f256-rebase.hg (glob)
$ hg log --template "{phase}\n" -r 9
draft
@@ -361,10 +361,10 @@ Source phase greater or equal to destina
$ hg rebase -s9 -d0
rebasing 9:c5b12b67163a "D" (tip)
- saved backup bundle to $TESTTMP/a7/.hg/strip-backup/c5b12b67163a-4e372053-backup.hg (glob)
+ saved backup bundle to $TESTTMP/a7/.hg/strip-backup/c5b12b67163a-4e372053-rebase.hg (glob)
$ hg log --template "{phase}\n" -r 9
secret
$ hg rebase -s9 -d1
rebasing 9:2a0524f868ac "D" (tip)
- saved backup bundle to $TESTTMP/a7/.hg/strip-backup/2a0524f868ac-cefd8574-backup.hg (glob)
+ saved backup bundle to $TESTTMP/a7/.hg/strip-backup/2a0524f868ac-cefd8574-rebase.hg (glob)
$ hg log --template "{phase}\n" -r 9
secret
@@ -372,5 +372,5 @@ Source phase lower than destination phas
$ hg rebase -s8 -d9
rebasing 8:6d4f22462821 "C"
- saved backup bundle to $TESTTMP/a7/.hg/strip-backup/6d4f22462821-3441f70b-backup.hg (glob)
+ saved backup bundle to $TESTTMP/a7/.hg/strip-backup/6d4f22462821-3441f70b-rebase.hg (glob)
$ hg log --template "{phase}\n" -r 'rev(9)'
secret
@@ -600,5 +600,5 @@ rebase on ancestor with revset
rebasing 7:72434a4e60b0 "H"
rebasing 8:479ddb54a924 "I" (tip)
- saved backup bundle to $TESTTMP/ah5/.hg/strip-backup/3d8a618087a7-b4f73f31-backup.hg (glob)
+ saved backup bundle to $TESTTMP/ah5/.hg/strip-backup/3d8a618087a7-b4f73f31-rebase.hg (glob)
$ hg tglog
o 8: 'I'
@@ -635,5 +635,5 @@ We would expect heads are I, F if it was
rebasing 7:72434a4e60b0 "H"
rebasing 8:479ddb54a924 "I" (tip)
- saved backup bundle to $TESTTMP/ah6/.hg/strip-backup/3d8a618087a7-aae93a24-backup.hg (glob)
+ saved backup bundle to $TESTTMP/ah6/.hg/strip-backup/3d8a618087a7-aae93a24-rebase.hg (glob)
$ hg tglog
o 8: 'I'
@@ -704,5 +704,5 @@ each root have a different common ancest
rebasing 8:e7ec4e813ba6 "I"
rebasing 10:23a4ace37988 "K" (tip)
- saved backup bundle to $TESTTMP/a8/.hg/strip-backup/23a4ace37988-b06984b3-backup.hg (glob)
+ saved backup bundle to $TESTTMP/a8/.hg/strip-backup/23a4ace37988-b06984b3-rebase.hg (glob)
$ hg log --rev 'children(desc(G))'
changeset: 9:adb617877056
@@ -771,5 +771,5 @@ Test that rebase is not confused by $CWD
(consider changing to repo root: $TESTTMP/cwd-vanish)
rebasing 3:a7d6f3a00bf3 "second source with subdir" (tip)
- saved backup bundle to $TESTTMP/cwd-vanish/.hg/strip-backup/779a07b1b7a0-853e0073-backup.hg (glob)
+ saved backup bundle to $TESTTMP/cwd-vanish/.hg/strip-backup/779a07b1b7a0-853e0073-rebase.hg (glob)
#else
$ hg rebase -b . -d 1 --traceback
@@ -828,5 +828,5 @@ Test that rebase is done in topo order (
rebasing 3:ab709c9f7171 "D"
rebasing 5:412b391de760 "F"
- saved backup bundle to $TESTTMP/order/.hg/strip-backup/76035bbd54bd-e341bc99-backup.hg (glob)
+ saved backup bundle to $TESTTMP/order/.hg/strip-backup/76035bbd54bd-e341bc99-rebase.hg (glob)
$ hg tglog
diff --git a/tests/test-shelve.t b/tests/test-shelve.t
--- a/tests/test-shelve.t
+++ b/tests/test-shelve.t
@@ -627,5 +627,5 @@ shelve should leave dirstate clean (issu
rebasing 2:323bfa07f744 "xyz" (tip)
merging x
- saved backup bundle to $TESTTMP/shelverebase/.hg/strip-backup/323bfa07f744-78114325-backup.hg (glob)
+ saved backup bundle to $TESTTMP/shelverebase/.hg/strip-backup/323bfa07f744-78114325-rebase.hg (glob)
$ hg unshelve
unshelving change 'default'
More information about the Mercurial-devel
mailing list