This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8952

remotefilelog: acquire lock before writing requirements on clone
ClosedPublic

Authored by pulkit on Aug 26 2020, 6:04 AM.

Details

Reviewers
marmoute
indygreg
Group Reviewers
hg-reviewers
Commits
rHGbddc4f2ef317: remotefilelog: acquire lock before writing requirements on clone
Summary

Performing a shallow clone in remotefilelog does not acquire lock. This leads to
following warning when we try to write some requirements in store:

--- /home/gps/src/hg-committed/tests/test-remotefilelog-share.t
+++ /home/gps/src/hg-committed/tests/test-remotefilelog-share.t#safe.err
@@ -28,6 +28,7 @@


   $ hgcloneshallow ssh://user@dummy/master source --noupdate -q
+  devel-warn: write with no lock: "requires" at: /home/gps/src/hg-committed/mercurial/scmutil.py:1505 (writerequires)
   $ hg share source dest
   updating working directory
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved

Let's lock before writing the requirements file.

Another solution which I can think of is not warn about missing lock when
writing to requires file in store.

Diff Detail

Repository
rHG Mercurial
Branch
default
Lint
No Linters Available
Unit
No Unit Test Coverage

Revision Contents
Changeset List

PathPackages
Mhgext/remotefilelog/__init__.py (5 lines)

Diff 22449

hgext/remotefilelog/__init__.py

# setupclient fixed the class on the repo itself # setupclient fixed the class on the repo itself
# but we also need to fix it on the repoview # but we also need to fix it on the repoview
if isinstance(self, repoview.repoview): if isinstance(self, repoview.repoview):
self.__class__.__bases__ = ( self.__class__.__bases__ = (
self.__class__.__bases__[0], self.__class__.__bases__[0],
self.unfiltered().__class__, self.unfiltered().__class__,
) )
self.requirements.add(constants.SHALLOWREPO_REQUIREMENT) self.requirements.add(constants.SHALLOWREPO_REQUIREMENT)
with self.lock():
# acquire store lock before writing requirements as some
# requirements might be written to .hg/store/requires
scmutil.writereporequirements(self) scmutil.writereporequirements(self)
# Since setupclient hadn't been called, exchange.pull was not # Since setupclient hadn't been called, exchange.pull was not
# wrapped. So we need to manually invoke our version of it. # wrapped. So we need to manually invoke our version of it.
return exchangepull(orig, self, *args, **kwargs) return exchangepull(orig, self, *args, **kwargs)
else: else:
return orig(self, *args, **kwargs) return orig(self, *args, **kwargs)
extensions.wrapfunction(exchange, b'pull', pull_shallow) extensions.wrapfunction(exchange, b'pull', pull_shallow)