This is an archive of the discontinued Mercurial Phabricator instance.

Differential D527

rebase: move working parent and bookmark for obsoleted revs (BC)
ClosedPublic

Authored by quark on Aug 27 2017, 5:39 AM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG9422107a6b64: rebase: move working parent and bookmark for obsoleted revs (BC)
Summary

Previously, obsoleted revs with successors in destination are completely
ignored. That caused some inconvenience when working copy is obsoleted. Most
commands avoid working copy being obsoleted, but hg pull is an exception.

This patch makes rebase able to move bookmarks or working parent for those
obsoleted revs. It does so by keeping the obsoleted revs in state and
marking them as "skipped, rebased to desired destination" during run-time.

This reverts part of the behavior change of 3b7cb3d17137 and D24.

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

quark created this revision.Aug 27 2017, 5:39 AM
quark retitled this revision from rebase: move wd and bookmark for obsoleted revs (BC) to rebase: move working parent and bookmark for obsoleted revs (BC).Aug 27 2017, 5:49 AM
quark updated this revision to Diff 1333.Aug 28 2017, 3:23 AM
martinvonz added a subscriber: martinvonz.Aug 29 2017, 7:44 PM
martinvonz added inline comments.
hgext/rebase.py
406

this looks like it would be the same as on line 401

423–424

Why do we still need the adjustment in clearrebased() when we do it here? What kinds of nodes will be adjusted here and what kinds will be left for clearrebased?

martinvonz added inline comments.Aug 29 2017, 7:53 PM
hgext/rebase.py
412

Is the use of unfi necessary? Can the successor be hidden? Only if the destination is hidden, it seems.

(And yes, "hg rebase --continue" after "hg --hidden -r ... -d <hidden>" got interrupted will probably fail, but that should be fixed by adding the destination(s) in _setrebasesetvisibility().)

413–415

looks like this can use _ctxdesc(succctx)

quark added inline comments.Aug 29 2017, 7:55 PM
hgext/rebase.py
423–424

Good question. The reason is this is "skipped" has two cases - 1. obsolete skip 2. "create no commit" skip (line 477), which uses a slightly different p1.

I think we might be able to remove the adjustment in clearrebased. I'll send a follow-up once I figure out the minor differences.

quark marked 3 inline comments as done.Aug 29 2017, 9:40 PM
quark added a child revision: D566: rebase: use _ctxdesc in one more place.
quark updated this revision to Diff 1421.
Closed by commit rHG9422107a6b64: rebase: move working parent and bookmark for obsoleted revs (BC) (authored by quark). · Explain WhyAug 30 2017, 2:02 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext/rebase.py (67 lines)
Mtests/test-rebase-obsolete.t (63 lines)

Diff 1429

hgext/rebase.py

if (not (self.keepf or allowunstable) if (not (self.keepf or allowunstable)
and self.repo.revs('first(children(%ld) - %ld)', and self.repo.revs('first(children(%ld) - %ld)',
rebaseset, rebaseset)): rebaseset, rebaseset)):
raise error.Abort( raise error.Abort(
_("can't remove original changesets with" _("can't remove original changesets with"
" unrebased descendants"), " unrebased descendants"),
hint=_('use --keep to keep original changesets')) hint=_('use --keep to keep original changesets'))
obsrevs = _filterobsoleterevs(self.repo, rebaseset) result = buildstate(self.repo, destmap, self.collapsef)
self._handleskippingobsolete(obsrevs, destmap)
result = buildstate(self.repo, destmap, self.collapsef,
self.obsoletenotrebased)
if not result: if not result:
# Empty state built, nothing to rebase # Empty state built, nothing to rebase
self.ui.status(_('nothing to rebase\n')) self.ui.status(_('nothing to rebase\n'))
return _nothingtorebase() return _nothingtorebase()
for root in self.repo.set('roots(%ld)', rebaseset): for root in self.repo.set('roots(%ld)', rebaseset):
if not self.keepf and not root.mutable(): if not self.keepf and not root.mutable():
if self.collapsef: if self.collapsef:
branches = set() branches = set()
for rev in self.state: for rev in self.state:
branches.add(repo[rev].branch()) branches.add(repo[rev].branch())
if len(branches) > 1: if len(branches) > 1:
raise error.Abort(_('cannot collapse multiple named ' raise error.Abort(_('cannot collapse multiple named '
'branches')) 'branches'))
# Calculate self.obsoletenotrebased
obsrevs = _filterobsoleterevs(self.repo, self.state)
self._handleskippingobsolete(obsrevs, self.destmap)
# Keep track of the active bookmarks in order to reset them later # Keep track of the active bookmarks in order to reset them later
self.activebookmark = self.activebookmark or repo._activebookmark self.activebookmark = self.activebookmark or repo._activebookmark
if self.activebookmark: if self.activebookmark:
bookmarks.deactivate(repo) bookmarks.deactivate(repo)
# Store the state before we begin so users can run 'hg rebase --abort' # Store the state before we begin so users can run 'hg rebase --abort'
# if we fail before the transaction closes. # if we fail before the transaction closes.
self.storestatus() self.storestatus()
repo, ui, opts = self.repo, self.ui, self.opts repo, ui, opts = self.repo, self.ui, self.opts
sortedrevs = repo.revs('sort(%ld, -topo)', subset) sortedrevs = repo.revs('sort(%ld, -topo)', subset)
for rev in sortedrevs: for rev in sortedrevs:
dest = self.destmap[rev] dest = self.destmap[rev]
ctx = repo[rev] ctx = repo[rev]
desc = _ctxdesc(ctx) desc = _ctxdesc(ctx)
if self.state[rev] == rev: if self.state[rev] == rev:
ui.status(_('already rebased %s\n') % desc) ui.status(_('already rebased %s\n') % desc)
elif rev in self.obsoletenotrebased:
succ = self.obsoletenotrebased[rev]
if succ is None:
martinvonzUnsubmitted
Done

this looks like it would be the same as on line 401

martinvonz: this looks like it would be the same as on line 401
msg = _('note: not rebasing %s, it has no '
'successor\n') % desc
else:
succctx = repo[succ]
succdesc = '%d:%s "%s"' % (
succctx.rev(), succctx,
martinvonzUnsubmitted
Done

Is the use of unfi necessary? Can the successor be hidden? Only if the destination is hidden, it seems.

(And yes, "hg rebase --continue" after "hg --hidden -r ... -d <hidden>" got interrupted will probably fail, but that should be fixed by adding the destination(s) in _setrebasesetvisibility().)

martinvonz: Is the use of unfi necessary? Can the successor be hidden? Only if the destination is hidden…
succctx.description().split('\n', 1)[0])
msg = (_('note: not rebasing %s, already in '
'destination as %s\n') % (desc, succdesc))
martinvonzUnsubmitted
Done

looks like this can use _ctxdesc(succctx)

martinvonz: looks like this can use _ctxdesc(succctx)
repo.ui.status(msg)
# Make clearrebased aware state[rev] is not a true successor
self.skipped.add(rev)
# Record rev as moved to its desired destination in self.state.
# This helps bookmark and working parent movement.
dest = max(adjustdest(repo, rev, self.destmap, self.state,
self.skipped))
self.state[rev] = dest
elif self.state[rev] == revtodo: elif self.state[rev] == revtodo:
martinvonzUnsubmitted
Not Done

Why do we still need the adjustment in clearrebased() when we do it here? What kinds of nodes will be adjusted here and what kinds will be left for clearrebased?

martinvonz: Why do we still need the adjustment in clearrebased() when we do it here? What kinds of nodes…
quarkAuthorUnsubmitted
Not Done

Good question. The reason is this is "skipped" has two cases - 1. obsolete skip 2. "create no commit" skip (line 477), which uses a slightly different p1.

I think we might be able to remove the adjustment in clearrebased. I'll send a follow-up once I figure out the minor differences.

quark: Good question. The reason is this is "skipped" has two cases - 1. obsolete skip 2. "create no…
pos += 1 pos += 1
ui.status(_('rebasing %s\n') % desc) ui.status(_('rebasing %s\n') % desc)
ui.progress(_("rebasing"), pos, ("%d:%s" % (rev, ctx)), ui.progress(_("rebasing"), pos, ("%d:%s" % (rev, ctx)),
_('changesets'), total) _('changesets'), total)
p1, p2, base = defineparents(repo, rev, self.destmap, p1, p2, base = defineparents(repo, rev, self.destmap,
self.state) self.state, self.skipped,
self.obsoletenotrebased)
self.storestatus(tr=tr) self.storestatus(tr=tr)
storecollapsemsg(repo, self.collapsemsg) storecollapsemsg(repo, self.collapsemsg)
if len(repo[None].parents()) == 2: if len(repo[None].parents()) == 2:
repo.ui.debug('resuming interrupted rebase\n') repo.ui.debug('resuming interrupted rebase\n')
else: else:
try: try:
ui.setconfig('ui', 'forcemerge', opts.get('tool', ''), ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
'rebase') 'rebase')
ui.status(_('already rebased %s as %s\n') % ui.status(_('already rebased %s as %s\n') %
(desc, repo[self.state[rev]])) (desc, repo[self.state[rev]]))
return pos return pos
def _finishrebase(self): def _finishrebase(self):
repo, ui, opts = self.repo, self.ui, self.opts repo, ui, opts = self.repo, self.ui, self.opts
if self.collapsef and not self.keepopen: if self.collapsef and not self.keepopen:
p1, p2, _base = defineparents(repo, min(self.state), self.destmap, p1, p2, _base = defineparents(repo, min(self.state), self.destmap,
self.state) self.state, self.skipped,
self.obsoletenotrebased)
editopt = opts.get('edit') editopt = opts.get('edit')
editform = 'rebase.collapse' editform = 'rebase.collapse'
if self.collapsemsg: if self.collapsemsg:
commitmsg = self.collapsemsg commitmsg = self.collapsemsg
else: else:
commitmsg = 'Collapsed revision' commitmsg = 'Collapsed revision'
for rebased in sorted(self.state): for rebased in sorted(self.state):
if rebased not in self.skipped: if rebased not in self.skipped:
# duplicate copies between the revision we're # duplicate copies between the revision we're
# rebasing and its first parent, but *not* # rebasing and its first parent, but *not*
# duplicate any copies that have already been # duplicate any copies that have already been
# performed in the destination. # performed in the destination.
p1rev = repo[rev].p1().rev() p1rev = repo[rev].p1().rev()
copies.duplicatecopies(repo, rev, p1rev, skiprev=dest) copies.duplicatecopies(repo, rev, p1rev, skiprev=dest)
return stats return stats
def adjustdest(repo, rev, destmap, state): def adjustdest(repo, rev, destmap, state, skipped):
"""adjust rebase destination given the current rebase state """adjust rebase destination given the current rebase state
rev is what is being rebased. Return a list of two revs, which are the rev is what is being rebased. Return a list of two revs, which are the
adjusted destinations for rev's p1 and p2, respectively. If a parent is adjusted destinations for rev's p1 and p2, respectively. If a parent is
nullrev, return dest without adjustment for it. nullrev, return dest without adjustment for it.
For example, when doing rebasing B+E to F, C to G, rebase will first move B For example, when doing rebasing B+E to F, C to G, rebase will first move B
to B1, and E's destination will be adjusted from F to B1. to B1, and E's destination will be adjusted from F to B1.
C' After rebasing C, when considering B's destination, use C' C' After rebasing C, when considering B's destination, use C'
| instead of the original C. | instead of the original C.
B D B D
\ / \ /
A A
""" """
# pick already rebased revs with same dest from state as interesting source # pick already rebased revs with same dest from state as interesting source
dest = destmap[rev] dest = destmap[rev]
source = [s for s, d in state.items() if d > 0 and destmap[s] == dest] source = [s for s, d in state.items()
if d > 0 and destmap[s] == dest and s not in skipped]
result = [] result = []
for prev in repo.changelog.parentrevs(rev): for prev in repo.changelog.parentrevs(rev):
adjusted = dest adjusted = dest
if prev != nullrev: if prev != nullrev:
candidate = repo.revs('max(%ld and (::%d))', source, prev).first() candidate = repo.revs('max(%ld and (::%d))', source, prev).first()
if candidate is not None: if candidate is not None:
adjusted = state[candidate] adjusted = state[candidate]
def successorrevs(repo, rev): def successorrevs(repo, rev):
"""yield revision numbers for successors of rev""" """yield revision numbers for successors of rev"""
unfi = repo.unfiltered() unfi = repo.unfiltered()
nodemap = unfi.changelog.nodemap nodemap = unfi.changelog.nodemap
for s in obsutil.allsuccessors(unfi.obsstore, [unfi[rev].node()]): for s in obsutil.allsuccessors(unfi.obsstore, [unfi[rev].node()]):
if s in nodemap: if s in nodemap:
yield nodemap[s] yield nodemap[s]
def defineparents(repo, rev, destmap, state): def defineparents(repo, rev, destmap, state, skipped, obsskipped):
"""Return new parents and optionally a merge base for rev being rebased """Return new parents and optionally a merge base for rev being rebased
The destination specified by "dest" cannot always be used directly because The destination specified by "dest" cannot always be used directly because
previously rebase result could affect destination. For example, previously rebase result could affect destination. For example,
D E rebase -r C+D+E -d B D E rebase -r C+D+E -d B
|/ C will be rebased to C' |/ C will be rebased to C'
B C D's new destination will be C' instead of B B C D's new destination will be C' instead of B
return True return True
elif a > b: elif a > b:
return False return False
return cl.isancestor(cl.node(a), cl.node(b)) return cl.isancestor(cl.node(a), cl.node(b))
dest = destmap[rev] dest = destmap[rev]
oldps = repo.changelog.parentrevs(rev) # old parents oldps = repo.changelog.parentrevs(rev) # old parents
newps = [nullrev, nullrev] # new parents newps = [nullrev, nullrev] # new parents
dests = adjustdest(repo, rev, destmap, state) # adjusted destinations dests = adjustdest(repo, rev, destmap, state, skipped)
bases = list(oldps) # merge base candidates, initially just old parents bases = list(oldps) # merge base candidates, initially just old parents
if all(r == nullrev for r in oldps[1:]): if all(r == nullrev for r in oldps[1:]):
# For non-merge changeset, just move p to adjusted dest as requested. # For non-merge changeset, just move p to adjusted dest as requested.
newps[0] = dests[0] newps[0] = dests[0]
else: else:
# For merge changeset, if we move p to dests[i] unconditionally, both # For merge changeset, if we move p to dests[i] unconditionally, both
# parents may change and the end result looks like "the merge loses a # parents may change and the end result looks like "the merge loses a
# Revisions in the side (not chosen as merge base) branch that # Revisions in the side (not chosen as merge base) branch that
# might contain "surprising" contents # might contain "surprising" contents
siderevs = list(repo.revs('((%ld-%d) %% (%d+%d))', siderevs = list(repo.revs('((%ld-%d) %% (%d+%d))',
bases, base, base, dest)) bases, base, base, dest))
# If those revisions are covered by rebaseset, the result is good. # If those revisions are covered by rebaseset, the result is good.
# A merge in rebaseset would be considered to cover its ancestors. # A merge in rebaseset would be considered to cover its ancestors.
if siderevs: if siderevs:
rebaseset = [r for r, d in state.items() if d > 0] rebaseset = [r for r, d in state.items()
if d > 0 and r not in obsskipped]
merges = [r for r in rebaseset merges = [r for r in rebaseset
if cl.parentrevs(r)[1] != nullrev] if cl.parentrevs(r)[1] != nullrev]
unwanted[i] = list(repo.revs('%ld - (::%ld) - %ld', unwanted[i] = list(repo.revs('%ld - (::%ld) - %ld',
siderevs, merges, rebaseset)) siderevs, merges, rebaseset))
# Choose a merge base that has a minimal number of unwanted revs. # Choose a merge base that has a minimal number of unwanted revs.
l, i = min((len(revs), i) l, i = min((len(revs), i)
for i, revs in enumerate(unwanted) if revs is not None) for i, revs in enumerate(unwanted) if revs is not None)
for r in srclist: for r in srclist:
if destmap[r] not in srcset: if destmap[r] not in srcset:
result.append(r) result.append(r)
if not result: if not result:
raise error.Abort(_('source and destination form a cycle')) raise error.Abort(_('source and destination form a cycle'))
srcset -= set(result) srcset -= set(result)
yield result yield result
def buildstate(repo, destmap, collapse, obsoletenotrebased): def buildstate(repo, destmap, collapse):
'''Define which revisions are going to be rebased and where '''Define which revisions are going to be rebased and where
repo: repo repo: repo
destmap: {srcrev: destrev} destmap: {srcrev: destrev}
''' '''
rebaseset = destmap.keys() rebaseset = destmap.keys()
originalwd = repo['.'].rev() originalwd = repo['.'].rev()
_setrebasesetvisibility(repo, set(rebaseset) | {originalwd}) _setrebasesetvisibility(repo, set(rebaseset) | {originalwd})
repo.ui.debug('rebase onto %s starting from %s\n' % (dest, root)) repo.ui.debug('rebase onto %s starting from %s\n' % (dest, root))
if emptyrebase: if emptyrebase:
return None return None
for rev in sorted(state): for rev in sorted(state):
parents = [p for p in repo.changelog.parentrevs(rev) if p != nullrev] parents = [p for p in repo.changelog.parentrevs(rev) if p != nullrev]
# if all parents of this revision are done, then so is this revision # if all parents of this revision are done, then so is this revision
if parents and all((state.get(p) == p for p in parents)): if parents and all((state.get(p) == p for p in parents)):
state[rev] = rev state[rev] = rev
unfi = repo.unfiltered()
for r in obsoletenotrebased:
desc = _ctxdesc(unfi[r])
succ = obsoletenotrebased[r]
if succ is None:
msg = _('note: not rebasing %s, it has no successor\n') % desc
del state[r]
del destmap[r]
else:
destctx = unfi[succ]
destdesc = '%d:%s "%s"' % (destctx.rev(), destctx,
destctx.description().split('\n', 1)[0])
msg = (_('note: not rebasing %s, already in destination as %s\n')
% (desc, destdesc))
del state[r]
del destmap[r]
repo.ui.status(msg)
return originalwd, destmap, state return originalwd, destmap, state
def clearrebased(ui, repo, destmap, state, skipped, collapsedas=None): def clearrebased(ui, repo, destmap, state, skipped, collapsedas=None):
"""dispose of rebased revision at the end of the rebase """dispose of rebased revision at the end of the rebase
If `collapsedas` is not None, the rebase was a collapse whose result if the If `collapsedas` is not None, the rebase was a collapse whose result if the
`collapsedas` node.""" `collapsedas` node."""
tonode = repo.changelog.node tonode = repo.changelog.node

tests/test-rebase-obsolete.t

|/| |/|
o | 5:24b6387c8c8c F o | 5:24b6387c8c8c F
| | | |
| o 4:9520eea781bc E | o 4:9520eea781bc E
|/ |/
o 0:cd010b8cd998 A o 0:cd010b8cd998 A
$ hg rebase --source 'desc(B)' --dest 'tip' --config experimental.rebaseskipobsolete=True $ hg rebase --source 'desc(B)' --dest 'tip' --config experimental.rebaseskipobsolete=True
note: not rebasing 9:08483444fef9 "D", already in destination as 11:4596109a6a43 "D"
rebasing 8:8877864f1edb "B" rebasing 8:8877864f1edb "B"
note: not rebasing 9:08483444fef9 "D", already in destination as 11:4596109a6a43 "D"
rebasing 10:5ae4c968c6ac "C" rebasing 10:5ae4c968c6ac "C"
$ hg debugobsolete $ hg debugobsolete
42ccdea3bb16d28e1848c95fe2e44c000f3f21b1 0 {cd010b8cd998f3981a5a8115f94f8da4ab506089} (*) {'user': 'test'} (glob) 42ccdea3bb16d28e1848c95fe2e44c000f3f21b1 0 {cd010b8cd998f3981a5a8115f94f8da4ab506089} (*) {'user': 'test'} (glob)
5fddd98957c8a54a4d436dfe1da9d87f21a1b97b 5ae4c968c6aca831df823664e706c9d4aa34473d 0 (*) {'user': 'test'} (glob) 5fddd98957c8a54a4d436dfe1da9d87f21a1b97b 5ae4c968c6aca831df823664e706c9d4aa34473d 0 (*) {'user': 'test'} (glob)
32af7686d403cf45b5d95f2d70cebea587ac806a 0 {5fddd98957c8a54a4d436dfe1da9d87f21a1b97b} (*) {'user': 'test'} (glob) 32af7686d403cf45b5d95f2d70cebea587ac806a 0 {5fddd98957c8a54a4d436dfe1da9d87f21a1b97b} (*) {'user': 'test'} (glob)
08483444fef91d6224f6655ee586a65d263ad34c 4596109a6a4328c398bde3a4a3b6737cfade3003 0 (*) {'user': 'test'} (glob) 08483444fef91d6224f6655ee586a65d263ad34c 4596109a6a4328c398bde3a4a3b6737cfade3003 0 (*) {'user': 'test'} (glob)
8877864f1edb05d0e07dc4ba77b67a80a7b86672 462a34d07e599b87ea08676a449373fe4e2e1347 0 (*) {'user': 'test'} (glob) 8877864f1edb05d0e07dc4ba77b67a80a7b86672 462a34d07e599b87ea08676a449373fe4e2e1347 0 (*) {'user': 'test'} (glob)
5ae4c968c6aca831df823664e706c9d4aa34473d 98f6af4ee9539e14da4465128f894c274900b6e5 0 (*) {'user': 'test'} (glob) 5ae4c968c6aca831df823664e706c9d4aa34473d 98f6af4ee9539e14da4465128f894c274900b6e5 0 (*) {'user': 'test'} (glob)
|/ |/
o 2:261e70097290 B2 o 2:261e70097290 B2
| |
o 0:4a2df7238c3b A o 0:4a2df7238c3b A
$ hg debugobsolete `hg log -r 7 -T '{node}\n'` --config experimental.stabilization=all $ hg debugobsolete `hg log -r 7 -T '{node}\n'` --config experimental.stabilization=all
obsoleted 1 changesets obsoleted 1 changesets
$ hg rebase -d 6 -r "4::" $ hg rebase -d 6 -r "4::"
note: not rebasing 7:360bbaa7d3ce "O", it has no successor
rebasing 4:ff2c4d47b71d "C" rebasing 4:ff2c4d47b71d "C"
note: not rebasing 7:360bbaa7d3ce "O", it has no successor
rebasing 8:8d47583e023f "P" (tip) rebasing 8:8d47583e023f "P" (tip)
If all the changeset to be rebased are obsolete and present in the destination, we If all the changeset to be rebased are obsolete and present in the destination, we
should display a friendly error message should display a friendly error message
$ hg log -G $ hg log -G
@ 10:121d9e3bc4c6 P @ 10:121d9e3bc4c6 P
| |
$ hg debugobsolete `hg log -r 11 -T '{node}\n'` --config experimental.stabilization=all $ hg debugobsolete `hg log -r 11 -T '{node}\n'` --config experimental.stabilization=all
obsoleted 1 changesets obsoleted 1 changesets
$ hg rebase -r . -d 10 $ hg rebase -r . -d 10
note: not rebasing 11:f44da1f4954c "nonrelevant" (tip), it has no successor note: not rebasing 11:f44da1f4954c "nonrelevant" (tip), it has no successor
If a rebase is going to create divergence, it should abort If a rebase is going to create divergence, it should abort
$ hg log -G $ hg log -G
@ 11:f44da1f4954c nonrelevant @ 10:121d9e3bc4c6 P
| |
| o 10:121d9e3bc4c6 P
|/
o 9:4be60e099a77 C o 9:4be60e099a77 C
| |
o 6:9c48361117de D o 6:9c48361117de D
| |
o 2:261e70097290 B2 o 2:261e70097290 B2
| |
o 0:4a2df7238c3b A o 0:4a2df7238c3b A
| o 19:601db7a18f51 dummy change successor | o 19:601db7a18f51 dummy change successor
| | | |
| o 18:357ddf1602d5 willconflict first version | o 18:357ddf1602d5 willconflict first version
|/ |/
o 17:61bd55f69bc4 bar foo o 17:61bd55f69bc4 bar foo
| |
~ ~
$ hg rebase -r ".^^ + .^ + ." -d 19 $ hg rebase -r ".^^ + .^ + ." -d 19
note: not rebasing 21:8b31da3c4919 "dummy change", already in destination as 19:601db7a18f51 "dummy change successor"
rebasing 20:b82fb57ea638 "willconflict second version" rebasing 20: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] [1]
$ 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 20:b82fb57ea638 "willconflict second version" rebasing 20:b82fb57ea638 "willconflict second version"
note: not rebasing 21:8b31da3c4919 "dummy change", already in destination as 19:601db7a18f51 "dummy change successor"
rebasing 22:7bdc8a87673d "dummy change" (tip) rebasing 22:7bdc8a87673d "dummy change" (tip)
$ cd .. $ cd ..
Rebase merge where successor of one parent is equal to destination (issue5198) Rebase merge where successor of one parent is equal to destination (issue5198)
$ hg init p1-succ-is-dest $ hg init p1-succ-is-dest
$ cd p1-succ-is-dest $ cd p1-succ-is-dest
> F C > F C
> /| | > /| |
> E D B # replace: E -> B > E D B # replace: E -> B
> \|/ > \|/
> A > A
> EOF > EOF
$ hg rebase -d C -b F $ hg rebase -d C -b F
note: not rebasing 3:7fb047a69f22 "E" (E), already in destination as 1:112478962961 "B"
rebasing 2:b18e25de2cf5 "D" (D) rebasing 2:b18e25de2cf5 "D" (D)
note: not rebasing 3:7fb047a69f22 "E" (E), already in destination as 1:112478962961 "B"
rebasing 5:66f1a38021c9 "F" (F tip) rebasing 5:66f1a38021c9 "F" (F tip)
note: rebase of 5:66f1a38021c9 created no changes to commit note: rebase of 5:66f1a38021c9 created no changes to commit
$ hg log -G $ hg log -G
o 6:8f47515dda15 D o 6:8f47515dda15 D
| |
| x 5:66f1a38021c9 F | x 5:66f1a38021c9 F
| |\ | |\
o | | 4:26805aba1e60 C o | | 4:26805aba1e60 C
$ hg init p1-move-p2-succ $ hg init p1-move-p2-succ
$ cd p1-move-p2-succ $ cd p1-move-p2-succ
$ hg debugdrawdag <<'EOS' $ hg debugdrawdag <<'EOS'
> D Z > D Z
> /| | # replace: B -> C > /| | # replace: B -> C
> A B C # D/D = D > A B C # D/D = D
> EOS > EOS
$ hg rebase -r B+A+D -d Z $ hg rebase -r B+A+D -d Z
note: not rebasing 1:fc2b737bb2e5 "B" (B), already in destination as 2:96cc3511f894 "C"
rebasing 0:426bada5c675 "A" (A) rebasing 0:426bada5c675 "A" (A)
note: not rebasing 1:fc2b737bb2e5 "B" (B), already in destination as 2:96cc3511f894 "C"
rebasing 3:b8ed089c80ad "D" (D) rebasing 3:b8ed089c80ad "D" (D)
$ rm .hg/localtags $ rm .hg/localtags
$ hg log -G $ hg log -G
o 6:1b355ed94d82 D o 6:1b355ed94d82 D
| |
o 5:a81a74d764a6 A o 5:a81a74d764a6 A
| |
$ hg log -r . # working dir is at rev 3 (successor of 2) $ hg log -r . # working dir is at rev 3 (successor of 2)
3:be1832deae9a b (no-eol) 3:be1832deae9a b (no-eol)
$ hg book -r 2 mybook --hidden # rev 2 has a bookmark on it now $ hg book -r 2 mybook --hidden # rev 2 has a bookmark on it now
$ hg up 2 && hg log -r . # working dir is at rev 2 again $ hg up 2 && hg log -r . # working dir is at rev 2 again
0 files updated, 0 files merged, 1 files removed, 0 files unresolved 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
2:1e9a3c00cbe9 b (no-eol) 2:1e9a3c00cbe9 b (no-eol)
$ hg rebase -r 2 -d 3 --config experimental.stabilization.track-operation=1 $ hg rebase -r 2 -d 3 --config experimental.stabilization.track-operation=1
note: not rebasing 2:1e9a3c00cbe9 "b" (mybook), already in destination as 3:be1832deae9a "b" note: not rebasing 2:1e9a3c00cbe9 "b" (mybook), already in destination as 3:be1832deae9a "b"
Check that working directory was not updated to rev 3 because rev 2 was skipped Check that working directory and bookmark was updated to rev 3 although rev 2
during the rebase operation was skipped
$ hg log -r . $ hg log -r .
2:1e9a3c00cbe9 b (no-eol) 3:be1832deae9a b (no-eol)
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 $ hg bookmarks
mybook 2:1e9a3c00cbe9 mybook 3:be1832deae9a
$ hg debugobsolete --rev tip $ hg debugobsolete --rev tip
1e9a3c00cbe90d236ac05ef61efcc5e40b7412bc be1832deae9ac531caa7438b8dcf6055a122cd8e 0 (*) {'user': 'test'} (glob) 1e9a3c00cbe90d236ac05ef61efcc5e40b7412bc be1832deae9ac531caa7438b8dcf6055a122cd8e 0 (*) {'user': 'test'} (glob)
Obsoleted working parent and bookmark could be moved if an ancestor of working
parent gets moved:
$ hg init $TESTTMP/ancestor-wd-move
$ cd $TESTTMP/ancestor-wd-move
$ hg debugdrawdag <<'EOS'
> E D1 # rebase: D1 -> D2
> | |
> | C
> D2 |
> | B
> |/
> A
> EOS
$ hg update D1 -q
$ hg bookmark book -i
$ hg rebase -r B+D1 -d E
rebasing 1:112478962961 "B" (B)
note: not rebasing 5:15ecf15e0114 "D1" (D1 tip book), already in destination as 2:0807738e0be9 "D2"
$ hg log -G -T '{desc} {bookmarks}'
@ B book
|
| x D1
| |
o | E
| |
| o C
| |
o | D2
| |
| x B
|/
o A