comparison mercurial/localrepo.py @ 11442:ee1ed6afac21 stable

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

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.

11441:d74fe370ab04

                if not remote.capable('changegroupsubset'):
                    raise util.Abort(_("Partial pull cannot be done because "
                                       "other repository doesn't support "
                                       "changegroupsubset."))
                cg = remote.changegroupsubset(fetch, heads, 'pull')
            return self.addchangegroup(cg, 'pull', remote.url())
        finally:
            lock.release()

    def push(self, remote, force=False, revs=None, newbranch=False):
        '''Push outgoing changesets (limited by revs) from the current

        lock = remote.lock()
        try:
            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())
            # and here we return 0 for "nothing to push" or 1 for
            # "something to push but I refuse"
            return ret[1]
        finally:
            lock.release()

            if nodes:
                self.hook('outgoing', node=hex(nodes[0]), source=source)

        return util.chunkbuffer(gengroup())

    def addchangegroup(self, source, srctype, url, emptyok=False):
        """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.

        Return an integer summarizing the change to this repo:

            cl.finalize(trp)

            tr.close()
        finally:
            tr.release()

        if changesets > 0:
            # forcefully update the on-disk branch cache
            self.ui.debug("updating the branch cache\n")
            self.branchtags()

11442:ee1ed6afac21

                if not remote.capable('changegroupsubset'):
                    raise util.Abort(_("Partial pull cannot be done because "
                                       "other repository doesn't support "
                                       "changegroupsubset."))
                cg = remote.changegroupsubset(fetch, heads, 'pull')
            return self.addchangegroup(cg, 'pull', remote.url(), lock=lock)
        finally:
            lock.release()

    def push(self, remote, force=False, revs=None, newbranch=False):
        '''Push outgoing changesets (limited by revs) from the current

        lock = remote.lock()
        try:
            ret = discovery.prepush(self, remote, force, revs, newbranch)
            if ret[0] is not None:
                cg, remote_heads = ret
                # 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]
        finally:
            lock.release()

            if nodes:
                self.hook('outgoing', node=hex(nodes[0]), source=source)

        return util.chunkbuffer(gengroup())

    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.

        Return an integer summarizing the change to this repo:

            cl.finalize(trp)

            tr.close()
        finally:
            tr.release()
            if lock:
                lock.release()

        if changesets > 0:
            # forcefully update the on-disk branch cache
            self.ui.debug("updating the branch cache\n")
            self.branchtags()