comparison mercurial/hg.py @ 15887:12dea4d998ec

bookmarks: primarily use repo lock, not wlock

Bookmarks are repository data, not working directory data. Only the current
bookmark is working directory data.

Some lock shuffling is required to avoid lockout between the initial mock lock
and locking of the localrepo instance that is created after copying.

15886:a5917346c72e

            self.dir_ = None
        def cleanup(self):
            if self.dir_:
                self.rmtree(self.dir_, True)

    srclock = destlock = dircleanup = None
    try:
        abspath = origsource
        if islocal(origsource):
            abspath = os.path.abspath(util.urllocalpath(origsource))

            destlock = copystore(ui, srcrepo, destpath)

            # we need to re-init the repo after manually copying the data
            # into it
            destrepo = repository(remoteui(ui, peeropts), dest)
            srcrepo.hook('outgoing', source='clone',
                          node=node.hex(node.nullid))
        else:
            try:
                destrepo = repository(remoteui(ui, peeropts), dest,

                destrepo.ui.status(_("updating to branch %s\n") % bn)
                _update(destrepo, uprev)

        return srcrepo, destrepo
    finally:
        release(srclock, destlock)
        if dircleanup is not None:
            dircleanup.cleanup()

def _showstats(repo, stats):
    repo.ui.status(_("%d files updated, %d files merged, "

15887:12dea4d998ec

            self.dir_ = None
        def cleanup(self):
            if self.dir_:
                self.rmtree(self.dir_, True)

    srclock = destwlock = destlock = dircleanup = None
    try:
        abspath = origsource
        if islocal(origsource):
            abspath = os.path.abspath(util.urllocalpath(origsource))

            destlock = copystore(ui, srcrepo, destpath)

            # 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:
            try:
                destrepo = repository(remoteui(ui, peeropts), dest,

                destrepo.ui.status(_("updating to branch %s\n") % bn)
                _update(destrepo, uprev)

        return srcrepo, destrepo
    finally:
        release(srclock, destlock, destwlock)
        if dircleanup is not None:
            dircleanup.cleanup()

def _showstats(repo, stats):
    repo.ui.status(_("%d files updated, %d files merged, "