This is an archive of the discontinued Mercurial Phabricator instance.

Differential D1247

rebase: pass the wctx object (IMM or on-disk) to merge.update
ClosedPublic

Authored by phillco on Oct 26 2017, 12:48 AM.

Details

Reviewers
durin42
Group Reviewers
hg-reviewers
Commits
rHG2bac2d836ce0: rebase: pass the wctx object (IMM or on-disk) to merge.update
Summary

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

phillco updated this revision to Diff 4193.Dec 7 2017, 4:22 PM
phillco updated this revision to Diff 4212.Dec 7 2017, 4:45 PM
durin42 accepted this revision.Dec 7 2017, 4:59 PM
This revision is now accepted and ready to land.Dec 7 2017, 4:59 PM
Closed by commit rHG2bac2d836ce0: rebase: pass the wctx object (IMM or on-disk) to merge.update (authored by phillco). · Explain WhyDec 8 2017, 3:28 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext/rebase.py (2 lines)

Diff 4264

hgext/rebase.py

repo.ui.debug(" already in destination\n") repo.ui.debug(" already in destination\n")
repo.dirstate.write(repo.currenttransaction()) repo.dirstate.write(repo.currenttransaction())
repo.ui.debug(" merge against %d:%s\n" % (rev, repo[rev])) repo.ui.debug(" merge against %d:%s\n" % (rev, repo[rev]))
if base is not None: if base is not None:
repo.ui.debug(" detach base %d:%s\n" % (base, repo[base])) repo.ui.debug(" detach base %d:%s\n" % (base, repo[base]))
# When collapsing in-place, the parent is the common ancestor, we # When collapsing in-place, the parent is the common ancestor, we
# have to allow merging with it. # have to allow merging with it.
stats = mergemod.update(repo, rev, True, True, base, collapse, stats = mergemod.update(repo, rev, True, True, base, collapse,
labels=['dest', 'source']) labels=['dest', 'source'], wc=wctx)
if collapse: if collapse:
copies.duplicatecopies(repo, wctx, rev, dest) copies.duplicatecopies(repo, wctx, rev, dest)
else: else:
# If we're not using --collapse, we need to # If we're not using --collapse, we need to
# 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.