##// END OF EJS Templates
filemerge: more backwards compatible behavior for ui.merge...
filemerge: more backwards compatible behavior for ui.merge if ui.merge matches a tool in [merge-tools], it is used as the default tool selection but may be rejected by binary or gui or other checks. If ui.merge does not match a merge tool, it is used unconditionally.

File last commit:

r2859:345bac2b default
r6076:0ee885fe default
Show More
remoterepo.py
25 lines | 621 B | text/x-python | PythonLexer
# remoterepo - remote repository proxy classes for mercurial
#
# Copyright 2005, 2006 Matt Mackall <mpm@selenic.com>
#
# 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()