Patchwork D11112: largefile: use `parentchange` markcommitted

login
register
mail settings
Submitter phabricator
Date July 18, 2021, 9:53 p.m.
Message ID <differential-rev-PHID-DREV-dnaxeaeitqkgtyzkpv23-req@mercurial-scm.org>
Download mbox | patch
Permalink /patch/49424/
State Superseded
Headers show

Comments

phabricator - July 18, 2021, 9:53 p.m.
marmoute created this revision.
Herald added a reviewer: hg-reviewers.
Herald added a subscriber: mercurial-patches.

REPOSITORY
  rHG Mercurial

BRANCH
  default

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

AFFECTED FILES
  hgext/largefiles/lfutil.py

CHANGE DETAILS




To: marmoute, #hg-reviewers
Cc: mercurial-patches, mercurial-devel

Patch

diff --git a/hgext/largefiles/lfutil.py b/hgext/largefiles/lfutil.py
--- a/hgext/largefiles/lfutil.py
+++ b/hgext/largefiles/lfutil.py
@@ -574,7 +574,8 @@ 
 def markcommitted(orig, ctx, node):
     repo = ctx.repo()
 
-    with ctx._repo.dirstate.parentchange():
+    lfdirstate = openlfdirstate(repo.ui, repo)
+    with lfdirstate.parentchange():
         orig(node)
 
         # ATTENTION: "ctx.files()" may differ from "repo[node].files()"
@@ -586,7 +587,6 @@ 
         # - have to be marked as "n" after commit, but
         # - aren't listed in "repo[node].files()"
 
-        lfdirstate = openlfdirstate(repo.ui, repo)
         for f in ctx.files():
             lfile = splitstandin(f)
             if lfile is not None: