view mercurial/remoterepo.py @ 4362:465b9ea02868

Import 3-way merge code from bzr

merge3.py is imported as contrib/simplemerge
test_merge3.py is imported as tests/test-simplemerge.py

# remoterepo - remote repository proxy classes for mercurial
#
# Copyright 2005, 2006 Matt Mackall <[e-mail]>
#
# This software may be used and distributed according to the terms
# of the GNU General Public License, incorporated herein by reference.

import repo

class remoterepository(repo.repository):
    def dev(self):
        return -1

    def local(self):
        return False

class remotelock(object):
    def __init__(self, repo):
        self.repo = repo
    def release(self):
        self.repo.unlock()
        self.repo = None
    def __del__(self):
        if self.repo:
            self.release()