Patchwork D11612: largefiles: partially undo 61e526585b20e2ff15f19497d0451d18fea02db8 and child

login
register
mail settings
Submitter phabricator
Date Oct. 5, 2021, 11:44 a.m.
Message ID <differential-rev-PHID-DREV-66trsme5sdi5nk6flrrz-req@mercurial-scm.org>
Download mbox | patch
Permalink /patch/49935/
State Superseded
Headers show

Comments

phabricator - Oct. 5, 2021, 11:44 a.m.
pulkit created this revision.
Herald added a reviewer: hg-reviewers.
Herald added a subscriber: mercurial-patches.

REVISION SUMMARY
  Since the largefiles dirstate is now part of transaction, we get rid of this
  temporary fix which lived for ~7 years.

REPOSITORY
  rHG Mercurial

BRANCH
  default

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

AFFECTED FILES
  hgext/largefiles/overrides.py

CHANGE DETAILS




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

Patch

diff --git a/hgext/largefiles/overrides.py b/hgext/largefiles/overrides.py
--- a/hgext/largefiles/overrides.py
+++ b/hgext/largefiles/overrides.py
@@ -1636,18 +1636,6 @@ 
         for standin in orphans:
             repo.wvfs.unlinkpath(standin, ignoremissing=True)
 
-        lfdirstate = lfutil.openlfdirstate(ui, repo)
-        with lfdirstate.parentchange():
-            orphans = set(lfdirstate)
-            lfiles = lfutil.listlfiles(repo)
-            for file in lfiles:
-                lfutil.synclfdirstate(repo, lfdirstate, file, True)
-                orphans.discard(file)
-            for lfile in orphans:
-                lfdirstate.update_file(
-                    lfile, p1_tracked=False, wc_tracked=False
-                )
-        lfdirstate.write()
     return result