Patchwork D7857: graft: extract repo[None] to a variable

login
register
mail settings
Submitter phabricator
Date Jan. 14, 2020, 5:07 p.m.
Message ID <differential-rev-PHID-DREV-7eja4zmue7piiyv2atha-req@mercurial-scm.org>
Download mbox | patch
Permalink /patch/44322/
State Superseded
Headers show

Comments

phabricator - Jan. 14, 2020, 5:07 p.m.
martinvonz created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.

REVISION SUMMARY
  I plan to allow the caller pass in an overlayworkingctx, so this
  prepares for that.

REPOSITORY
  rHG Mercurial

BRANCH
  default

REVISION DETAIL
  https://phab.mercurial-scm.org/D7857

AFFECTED FILES
  mercurial/merge.py

CHANGE DETAILS




To: martinvonz, #hg-reviewers
Cc: mercurial-devel

Patch

diff --git a/mercurial/merge.py b/mercurial/merge.py
--- a/mercurial/merge.py
+++ b/mercurial/merge.py
@@ -2605,7 +2605,8 @@ 
     # to copy commits), and 2) informs update that the incoming changes are
     # newer than the destination so it doesn't prompt about "remote changed foo
     # which local deleted".
-    pctx = repo[b'.']
+    wctx = repo[None]
+    pctx = wctx.p1()
     mergeancestor = repo.changelog.isancestor(pctx.node(), ctx.node())
 
     stats = update(
@@ -2634,7 +2635,7 @@ 
         repo.setparents(pctx.node(), pother)
         repo.dirstate.write(repo.currenttransaction())
         # fix up dirstate for copies and renames
-        copies.duplicatecopies(repo, repo[None], ctx.rev(), base.rev())
+        copies.duplicatecopies(repo, wctx, ctx.rev(), base.rev())
     return stats