Mercurial > public > mercurial-scm > hg
diff mercurial/hg.py @ 15908:60cb4f381a78
bookmarks: backout locking change in 12dea4d998ec
Repo lock only applies to data in .hg/store/
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Wed, 18 Jan 2012 14:56:52 -0600 |
| parents | 12dea4d998ec |
| children | 963c8a553524 |
line wrap: on
line diff
--- a/mercurial/hg.py Tue Jan 17 20:23:23 2012 +0100 +++ b/mercurial/hg.py Wed Jan 18 14:56:52 2012 -0600 @@ -279,7 +279,7 @@ if self.dir_: self.rmtree(self.dir_, True) - srclock = destwlock = destlock = dircleanup = None + srclock = destlock = dircleanup = None try: abspath = origsource if islocal(origsource): @@ -325,11 +325,6 @@ # we need to re-init the repo after manually copying the data # into it destrepo = repository(remoteui(ui, peeropts), dest) - # we need full recursive locking of the new repo instance - destwlock = destrepo.wlock() - if destlock: - destlock.release() # a little race condition - but no deadlock - destlock = destrepo.lock() srcrepo.hook('outgoing', source='clone', node=node.hex(node.nullid)) else: @@ -406,7 +401,7 @@ return srcrepo, destrepo finally: - release(srclock, destlock, destwlock) + release(srclock, destlock) if dircleanup is not None: dircleanup.cleanup()