D11108: largefile: use `parentchange` during rollback
marmoute (Pierre-Yves David)
phabricator at mercurial-scm.org
Sun Jul 18 21:53:19 UTC 2021
marmoute created this revision.
Herald added a reviewer: hg-reviewers.
Herald added a subscriber: mercurial-patches.
REVISION SUMMARY
rollback is updating parent without touching the working copy. It should wrapped
in a `parentchange` context.
REPOSITORY
rHG Mercurial
BRANCH
default
REVISION DETAIL
https://phab.mercurial-scm.org/D11108
AFFECTED FILES
hgext/largefiles/overrides.py
CHANGE DETAILS
diff --git a/hgext/largefiles/overrides.py b/hgext/largefiles/overrides.py
--- a/hgext/largefiles/overrides.py
+++ b/hgext/largefiles/overrides.py
@@ -1636,13 +1636,14 @@
repo.wvfs.unlinkpath(standin, ignoremissing=True)
lfdirstate = lfutil.openlfdirstate(ui, repo)
- 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.drop(lfile)
+ 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.drop(lfile)
lfdirstate.write()
return result
To: marmoute, #hg-reviewers
Cc: mercurial-patches, mercurial-devel
More information about the Mercurial-devel
mailing list