facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-07 15:27:13 +03:00
Code Issues Projects Releases Wiki Activity

addchangegroup: pass in lock to release it before changegroup hook is called

Browse Source 
Currently, callers of addchangegroup first acquire the repository
lock, usually to check that an unbundle request isn't racing. This
means that changegroup hook actions that might write to a repo get
stuck waiting for a lock. Here, we add a new optional lock parameter
and update all the callers. Post-1.6 we may make it non-optional.
This commit is contained in:
Matt Mackall 2010-06-25 13:47:28 -05:00
parent f313e6ccd4
commit e4cf775b71
5 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
hgext/bookmarks.py
View File

@ -339,11 +339,10 @@ def reposetup(ui, repo):
return result
def addchangegroup(self, source, srctype, url, emptyok=False):
def addchangegroup(self, *args, **kwargs):
parents = self.dirstate.parents()
result = super(bookmark_repo, self).addchangegroup(
source, srctype, url, emptyok)
result = super(bookmark_repo, self).addchangegroup(*args, **kwargs)
if result > 1:
# We have more heads than before
return result

3
mercurial/commands.py
View File

@ -3745,7 +3745,8 @@ def unbundle(ui, repo, fname1, *fnames, **opts):
for fname in fnames:
f = url.open(ui, fname)
gen = changegroup.readbundle(f, fname)
modheads = repo.addchangegroup(gen, 'unbundle', 'bundle:' + fname)
modheads = repo.addchangegroup(gen, 'unbundle', 'bundle:' + fname,
lock=lock)
finally:
lock.release()

2
mercurial/hgweb/protocol.py
View File

@ -164,7 +164,7 @@ def unbundle(repo, req):
urllib.quote(req.env.get('REMOTE_HOST', '')),
urllib.quote(req.env.get('REMOTE_USER', '')))
try:
ret = repo.addchangegroup(gen, 'serve', url)
ret = repo.addchangegroup(gen, 'serve', url, lock=lock)
except util.Abort, inst:
sys.stdout.write("abort: %s\n" % inst)
ret = 0

10
mercurial/localrepo.py
View File

@ -1199,7 +1199,7 @@ class localrepository(repo.repository):
"other repository doesn't support "
"changegroupsubset."))
cg = remote.changegroupsubset(fetch, heads, 'pull')
return self.addchangegroup(cg, 'pull', remote.url())
return self.addchangegroup(cg, 'pull', remote.url(), lock=lock)
finally:
lock.release()
@ -1233,8 +1233,8 @@ class localrepository(repo.repository):
ret = discovery.prepush(self, remote, force, revs, newbranch)
if ret[0] is not None:
cg, remote_heads = ret
# here, we return an integer indicating remote head count change
return remote.addchangegroup(cg, 'push', self.url())
# we return an integer indicating remote head count change
return remote.addchangegroup(cg, 'push', self.url(), lock=lock)
# and here we return 0 for "nothing to push" or 1 for
# "something to push but I refuse"
return ret[1]
@ -1620,7 +1620,7 @@ class localrepository(repo.repository):
return util.chunkbuffer(gengroup())
def addchangegroup(self, source, srctype, url, emptyok=False):
def addchangegroup(self, source, srctype, url, emptyok=False, lock=None):
"""Add the changegroup returned by source.read() to this repo.
srctype is a string like 'push', 'pull', or 'unbundle'. url is
the URL of the repo where this changegroup is coming from.
@ -1760,6 +1760,8 @@ class localrepository(repo.repository):
tr.close()
finally:
tr.release()
if lock:
lock.release()
if changesets > 0:
# forcefully update the on-disk branch cache

6
mercurial/sshserver.py
View File

@ -161,7 +161,8 @@ class sshserver(object):
return
self.respond("")
r = self.repo.addchangegroup(self.fin, 'serve', self.client_url())
r = self.repo.addchangegroup(self.fin, 'serve', self.client_url(),
lock=self.lock)
self.respond(str(r))
def client_url(self):
@ -205,7 +206,8 @@ class sshserver(object):
# push can proceed
fp.seek(0)
r = self.repo.addchangegroup(fp, 'serve', self.client_url())
r = self.repo.addchangegroup(fp, 'serve', self.client_url(),
lock=self.lock)
self.respond(str(r))
finally:
if not was_locked: