##// END OF EJS Templates
merge: allow smarter tool configuration...
merge: allow smarter tool configuration Add [merge-tool] hgrc section with: <tool>.executable = name or path (<tool>) <tool>.args = args with $local/base/other/output ($local $base $other) <tool>.priority = priority (default 0) <tool>.binary = handles binary (False) <tool>.symlink = handles symlinks (False) <tool>.checkconflict = check for conflict markers (False) <tool>.premerge = try internal simplemerge (True if not binary or symlink) Four built-in tools: internal:{merge,local,other,fail} Add [merge-patterns] section of the form: <pattern> = <tool> Priority of settings is: HGMERGE merge-patterns ui:merge merge-tools by priority hgmerge, if it can be found Changes: unsuccessful merges leave .orig files

File last commit:

r5455:08d6e875 default
r6004:5af5f0f9 default
Show More
repo.py
36 lines | 1.2 KiB | text/x-python | PythonLexer
mpm@selenic.com
Break apart hg.py...
r1089 # repo.py - repository base classes for mercurial
#
Thomas Arendsen Hein
Updated copyright notices and add "and others" to "hg version"
r4635 # Copyright 2005, 2006 Matt Mackall <mpm@selenic.com>
Vadim Gelfer
update copyrights.
r2859 # Copyright 2006 Vadim Gelfer <vadim.gelfer@gmail.com>
mpm@selenic.com
Break apart hg.py...
r1089 #
# This software may be used and distributed according to the terms
# of the GNU General Public License, incorporated herein by reference.
Benoit Boissinot
import gettext since '_' is used
r5455 from i18n import _
Vadim Gelfer
add support for streaming clone....
r2612 class RepoError(Exception):
pass
Bryan O'Sullivan
Push capability checking into protocol-level code.
r5259 class NoCapability(RepoError):
pass
Vadim Gelfer
add support for streaming clone....
r2612 class repository(object):
def capable(self, name):
'''tell whether repo supports named capability.
return False if not supported.
if boolean capability, return True.
if string capability, return string.'''
Bryan O'Sullivan
Push capability checking into protocol-level code.
r5259 if name in self.capabilities:
return True
Vadim Gelfer
add support for streaming clone....
r2612 name_eq = name + '='
for cap in self.capabilities:
if cap.startswith(name_eq):
return cap[len(name_eq):]
return False
Bryan O'Sullivan
Push capability checking into protocol-level code.
r5259
def requirecap(self, name, purpose):
'''raise an exception if the given capability is not present'''
if not self.capable(name):
raise NoCapability(_('cannot %s; remote repository does not '
'support the %r capability') %
(purpose, name))