##// END OF EJS Templates
# User Dan Villiom Podlaski Christiansen <danchr@gmail.com>...
# User Dan Villiom Podlaski Christiansen <danchr@gmail.com> # Date 1289564504 -3600 # Node ID b75264c15cc888cf38c3c7b8f619801e3c2589c7 # Parent 89b2e5d940f669e590096c6be70eee61c9172fff revsets: overload the branch() revset to also take a branch name. This should only change semantics in the specific case of a tag/branch conflict where the tag wasn't done on the branch with the same name. Previously, branch(whatever) would resolve to the branch of the tag in that case, whereas now it will resolve to the branch of the name. The previous behaviour, while documented, seemed very counter-intuitive to me. An alternate approach would be to introduce a new revset such as branchname() or namedbranch(). While this would retain backwards compatibility, the distinction between it and branch() would not be readily apparent to users. The most intuitive behaviour would be to have branch(x) require 'x' to be a branch name, and something like branchof(x) or samebranch(x) do what branch(x) currently does. Unfortunately, our backwards compatibility guarantees prevent us from doing that. Please note that while 'hg tag' guards against shadowing a branch, 'hg branch' does not. Besides, even if it did, that wouldn't solve the issue of conversions with such tags and branches...

File last commit:

r13382:d747774c default
r13750:7eb82f88 default
Show More
repo.py
40 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 #
Martin Geisler
updated license to be explicit about GPL version 2
r8225 # This software may be used and distributed according to the terms of the
Matt Mackall
Update license to GPLv2+
r10263 # GNU General Public License version 2 or any later version.
mpm@selenic.com
Break apart hg.py...
r1089
Benoit Boissinot
import gettext since '_' is used
r5455 from i18n import _
Peter Arrenbrecht
cleanup: drop unused imports
r7873 import error
Benoit Boissinot
import gettext since '_' is used
r5455
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):
Matt Mackall
error: move repo errors...
r7637 raise error.CapabilityError(
_('cannot %s; remote repository does not '
'support the %r capability') % (purpose, name))
John Mulligan
Add default local() and cancopy() methods to repository base class
r6311
def local(self):
return False
def cancopy(self):
return self.local()
Adrian Buehlmann
Make sure bundlerepo doesn't leak temp files (issue2491)...
r13382
def close(self):
pass