localrepo.py
1938 lines
| 72.7 KiB
| text/x-python
|
PythonLexer
/ mercurial / localrepo.py
|
r1089 | # localrepo.py - read/write repository class for mercurial | ||
# | ||||
|
r4635 | # Copyright 2005-2007 Matt Mackall <mpm@selenic.com> | ||
|
r1089 | # | ||
|
r8225 | # This software may be used and distributed according to the terms of the | ||
|
r10263 | # GNU General Public License version 2 or any later version. | ||
|
r18118 | from node import hex, nullid, short | ||
|
r3891 | from i18n import _ | ||
|
r21141 | import urllib | ||
|
r20930 | import peer, changegroup, subrepo, pushkey, obsolete, repoview | ||
|
r15418 | import changelog, dirstate, filelog, manifest, context, bookmarks, phases | ||
|
r20088 | import lock as lockmod | ||
|
r21068 | import transaction, store, encoding, exchange, bundle2 | ||
|
r14902 | import scmutil, util, extensions, hook, error, revset | ||
|
r10651 | import match as matchmod | ||
import merge as mergemod | ||||
import tags as tagsmod | ||||
|
r8109 | from lock import release | ||
|
r25267 | import weakref, errno, os, time, inspect, random | ||
|
r20033 | import branchmap, pathutil | ||
|
r23558 | import namespaces | ||
|
r8260 | propertycache = util.propertycache | ||
|
r14930 | filecache = scmutil.filecache | ||
|
r8109 | |||
|
r18014 | class repofilecache(filecache): | ||
"""All filecache usage on repo are done for logic that should be unfiltered | ||||
""" | ||||
def __get__(self, repo, type=None): | ||||
return super(repofilecache, self).__get__(repo.unfiltered(), type) | ||||
def __set__(self, repo, value): | ||||
return super(repofilecache, self).__set__(repo.unfiltered(), value) | ||||
def __delete__(self, repo): | ||||
return super(repofilecache, self).__delete__(repo.unfiltered()) | ||||
class storecache(repofilecache): | ||||
|
r16198 | """filecache for files in the store""" | ||
def join(self, obj, fname): | ||||
return obj.sjoin(fname) | ||||
|
r18013 | class unfilteredpropertycache(propertycache): | ||
"""propertycache that apply to unfiltered repo only""" | ||||
def __get__(self, repo, type=None): | ||||
|
r19846 | unfi = repo.unfiltered() | ||
if unfi is repo: | ||||
return super(unfilteredpropertycache, self).__get__(unfi) | ||||
return getattr(unfi, self.name) | ||||
|
r18013 | |||
class filteredpropertycache(propertycache): | ||||
"""propertycache that must take filtering in account""" | ||||
def cachevalue(self, obj, value): | ||||
object.__setattr__(obj, self.name, value) | ||||
def hasunfilteredcache(repo, name): | ||||
|
r18644 | """check if a repo has an unfilteredpropertycache value for <name>""" | ||
|
r18013 | return name in vars(repo.unfiltered()) | ||
|
r18016 | def unfilteredmethod(orig): | ||
|
r17994 | """decorate method that always need to be run on unfiltered version""" | ||
def wrapper(repo, *args, **kwargs): | ||||
return orig(repo.unfiltered(), *args, **kwargs) | ||||
return wrapper | ||||
|
r20955 | moderncaps = set(('lookup', 'branchmap', 'pushkey', 'known', 'getbundle', | ||
|
r21141 | 'unbundle')) | ||
|
r20776 | legacycaps = moderncaps.union(set(['changegroupsubset'])) | ||
|
r17192 | |||
class localpeer(peer.peerrepository): | ||||
'''peer for a local repo; reflects only the most recent API''' | ||||
|
r20776 | def __init__(self, repo, caps=moderncaps): | ||
|
r17192 | peer.peerrepository.__init__(self) | ||
|
r18382 | self._repo = repo.filtered('served') | ||
|
r17192 | self.ui = repo.ui | ||
self._caps = repo._restrictcapabilities(caps) | ||||
self.requirements = repo.requirements | ||||
self.supportedformats = repo.supportedformats | ||||
def close(self): | ||||
self._repo.close() | ||||
def _capabilities(self): | ||||
return self._caps | ||||
def local(self): | ||||
return self._repo | ||||
|
r17193 | def canpush(self): | ||
return True | ||||
|
r17192 | def url(self): | ||
return self._repo.url() | ||||
def lookup(self, key): | ||||
return self._repo.lookup(key) | ||||
def branchmap(self): | ||||
|
r18279 | return self._repo.branchmap() | ||
|
r17192 | |||
def heads(self): | ||||
|
r18279 | return self._repo.heads() | ||
|
r17192 | |||
def known(self, nodes): | ||||
return self._repo.known(nodes) | ||||
|
r20953 | def getbundle(self, source, heads=None, common=None, bundlecaps=None, | ||
|
r24639 | **kwargs): | ||
|
r21068 | cg = exchange.getbundle(self._repo, source, heads=heads, | ||
|
r21157 | common=common, bundlecaps=bundlecaps, **kwargs) | ||
|
r24686 | if bundlecaps is not None and 'HG20' in bundlecaps: | ||
|
r21068 | # When requesting a bundle2, getbundle returns a stream to make the | ||
# wire level function happier. We need to build a proper object | ||||
# from it in local peer. | ||||
|
r24641 | cg = bundle2.getunbundler(self.ui, cg) | ||
|
r21068 | return cg | ||
|
r17192 | |||
# TODO We might want to move the next two calls into legacypeer and add | ||||
# unbundle instead. | ||||
|
r20969 | def unbundle(self, cg, heads, url): | ||
"""apply a bundle on a repo | ||||
This function handles the repo locking itself.""" | ||||
try: | ||||
|
r24798 | try: | ||
cg = exchange.readbundle(self.ui, cg, None) | ||||
ret = exchange.unbundle(self._repo, cg, heads, 'push', url) | ||||
if util.safehasattr(ret, 'getchunks'): | ||||
# This is a bundle20 object, turn it into an unbundler. | ||||
# This little dance should be dropped eventually when the | ||||
# API is finally improved. | ||||
stream = util.chunkbuffer(ret.getchunks()) | ||||
ret = bundle2.getunbundler(self.ui, stream) | ||||
return ret | ||||
except Exception, exc: | ||||
|
r24799 | # If the exception contains output salvaged from a bundle2 | ||
# reply, we need to make sure it is printed before continuing | ||||
# to fail. So we build a bundle2 with such output and consume | ||||
# it directly. | ||||
# | ||||
# This is not very elegant but allows a "simple" solution for | ||||
# issue4594 | ||||
output = getattr(exc, '_bundle2salvagedoutput', ()) | ||||
if output: | ||||
bundler = bundle2.bundle20(self._repo.ui) | ||||
for out in output: | ||||
bundler.addpart(out) | ||||
stream = util.chunkbuffer(bundler.getchunks()) | ||||
b = bundle2.getunbundler(self.ui, stream) | ||||
bundle2.processbundle(self._repo, b) | ||||
|
r24798 | raise | ||
|
r21184 | except error.PushRaced, exc: | ||
|
r21186 | raise error.ResponseError(_('push failed:'), str(exc)) | ||
|
r20969 | |||
|
r17192 | def lock(self): | ||
return self._repo.lock() | ||||
def addchangegroup(self, cg, source, url): | ||||
|
r20933 | return changegroup.addchangegroup(self._repo, cg, source, url) | ||
|
r17192 | |||
def pushkey(self, namespace, key, old, new): | ||||
return self._repo.pushkey(namespace, key, old, new) | ||||
def listkeys(self, namespace): | ||||
return self._repo.listkeys(namespace) | ||||
def debugwireargs(self, one, two, three=None, four=None, five=None): | ||||
'''used to test argument passing over the wire''' | ||||
return "%s %s %s %s %s" % (one, two, three, four, five) | ||||
class locallegacypeer(localpeer): | ||||
'''peer extension which implements legacy methods too; used for tests with | ||||
restricted capabilities''' | ||||
def __init__(self, repo): | ||||
|
r20776 | localpeer.__init__(self, repo, caps=legacycaps) | ||
|
r17192 | |||
def branches(self, nodes): | ||||
return self._repo.branches(nodes) | ||||
def between(self, pairs): | ||||
return self._repo.between(pairs) | ||||
def changegroup(self, basenodes, source): | ||||
|
r20931 | return changegroup.changegroup(self._repo, basenodes, source) | ||
|
r17192 | |||
def changegroupsubset(self, bases, heads, source): | ||||
|
r20927 | return changegroup.changegroupsubset(self._repo, bases, heads, source) | ||
|
r17192 | |||
class localrepository(object): | ||||
|
r24956 | supportedformats = set(('revlogv1', 'generaldelta', 'treemanifest', | ||
'manifestv2')) | ||||
|
r19778 | _basesupported = supportedformats | set(('store', 'fncache', 'shared', | ||
'dotencode')) | ||||
|
r24956 | openerreqs = set(('revlogv1', 'generaldelta', 'treemanifest', 'manifestv2')) | ||
|
r18186 | filtername = None | ||
|
r17137 | |||
|
r19928 | # a list of (ui, featureset) functions. | ||
# only functions defined in module of enabled extensions are invoked | ||||
|
r19778 | featuresetupfuncs = set() | ||
|
r17137 | def _baserequirements(self, create): | ||
|
r24913 | return ['revlogv1'] | ||
|
r2439 | |||
|
r14363 | def __init__(self, baseui, path=None, create=False): | ||
|
r24918 | self.requirements = set() | ||
|
r18945 | self.wvfs = scmutil.vfs(path, expandpath=True, realpath=True) | ||
|
r17650 | self.wopener = self.wvfs | ||
|
r17157 | self.root = self.wvfs.base | ||
|
r17158 | self.path = self.wvfs.join(".hg") | ||
|
r3850 | self.origroot = path | ||
|
r20033 | self.auditor = pathutil.pathauditor(self.root, self._checknested) | ||
|
r17650 | self.vfs = scmutil.vfs(self.path) | ||
self.opener = self.vfs | ||||
|
r8797 | self.baseui = baseui | ||
self.ui = baseui.copy() | ||||
|
r20082 | self.ui.copy = baseui.copy # prevent copying repo configuration | ||
|
r15922 | # A list of callback to shape the phase if no data were found. | ||
# Callback are in the form: func(repo, roots) --> processed root. | ||||
# This list it to be filled by extension during repo setup | ||||
self._phasedefaults = [] | ||||
|
r8797 | try: | ||
self.ui.readconfig(self.join("hgrc"), self.root) | ||||
extensions.loadall(self.ui) | ||||
except IOError: | ||||
pass | ||||
|
r1089 | |||
|
r19778 | if self.featuresetupfuncs: | ||
self.supported = set(self._basesupported) # use private copy | ||||
|
r19928 | extmods = set(m.__name__ for n, m | ||
in extensions.extensions(self.ui)) | ||||
|
r19778 | for setupfunc in self.featuresetupfuncs: | ||
|
r19928 | if setupfunc.__module__ in extmods: | ||
setupfunc(self.ui, self.supported) | ||||
|
r19778 | else: | ||
self.supported = self._basesupported | ||||
|
r17161 | if not self.vfs.isdir(): | ||
|
r3035 | if create: | ||
|
r17161 | if not self.wvfs.exists(): | ||
self.wvfs.makedirs() | ||||
self.vfs.makedir(notindexed=True) | ||||
|
r24918 | self.requirements.update(self._baserequirements(create)) | ||
|
r8797 | if self.ui.configbool('format', 'usestore', True): | ||
|
r17161 | self.vfs.mkdir("store") | ||
|
r24918 | self.requirements.add("store") | ||
|
r8797 | if self.ui.configbool('format', 'usefncache', True): | ||
|
r24918 | self.requirements.add("fncache") | ||
|
r12687 | if self.ui.configbool('format', 'dotencode', True): | ||
|
r24918 | self.requirements.add('dotencode') | ||
|
r4166 | # create an invalid changelog | ||
|
r17160 | self.vfs.append( | ||
|
r14168 | "00changelog.i", | ||
|
r4166 | '\0\0\0\2' # represents revlogv2 | ||
' dummy changelog to prevent using the old repo layout' | ||||
) | ||||
|
r14270 | if self.ui.configbool('format', 'generaldelta', False): | ||
|
r24918 | self.requirements.add("generaldelta") | ||
|
r24956 | if self.ui.configbool('experimental', 'treemanifest', False): | ||
self.requirements.add("treemanifest") | ||||
|
r24571 | if self.ui.configbool('experimental', 'manifestv2', False): | ||
|
r24918 | self.requirements.add("manifestv2") | ||
|
r3035 | else: | ||
|
r7637 | raise error.RepoError(_("repository %s not found") % path) | ||
|
r3035 | elif create: | ||
|
r7637 | raise error.RepoError(_("repository %s already exists") % path) | ||
|
r3851 | else: | ||
try: | ||||
|
r24918 | self.requirements = scmutil.readrequires( | ||
self.vfs, self.supported) | ||||
|
r3851 | except IOError, inst: | ||
if inst.errno != errno.ENOENT: | ||||
raise | ||||
|
r1089 | |||
|
r8799 | self.sharedpath = self.path | ||
try: | ||||
|
r18946 | vfs = scmutil.vfs(self.vfs.read("sharedpath").rstrip('\n'), | ||
realpath=True) | ||||
s = vfs.base | ||||
if not vfs.exists(): | ||||
|
r8799 | raise error.RepoError( | ||
|
r8908 | _('.hg/sharedpath points to nonexistent directory %s') % s) | ||
|
r8799 | self.sharedpath = s | ||
except IOError, inst: | ||||
if inst.errno != errno.ENOENT: | ||||
raise | ||||
|
r24918 | self.store = store.store( | ||
self.requirements, self.sharedpath, scmutil.vfs) | ||||
|
r6840 | self.spath = self.store.path | ||
|
r17654 | self.svfs = self.store.vfs | ||
self.sopener = self.svfs | ||||
|
r6840 | self.sjoin = self.store.join | ||
|
r17654 | self.vfs.createmode = self.store.createmode | ||
|
r24915 | self._applyopenerreqs() | ||
|
r12295 | if create: | ||
self._writerequirements() | ||||
|
r3850 | |||
|
r9146 | |||
|
r18189 | self._branchcaches = {} | ||
|
r24373 | self._revbranchcache = None | ||
|
r4004 | self.filterpats = {} | ||
|
r5966 | self._datafilters = {} | ||
|
r4916 | self._transref = self._lockref = self._wlockref = None | ||
|
r1089 | |||
|
r14929 | # A cache for various files under .hg/ that tracks file changes, | ||
# (used by the filecache decorator) | ||||
# | ||||
# Maps a property name to its util.filecacheentry | ||||
self._filecache = {} | ||||
|
r18101 | # hold sets of revision to be filtered | ||
# should be cleared when something might have changed the filter value: | ||||
# - new changesets, | ||||
# - phase change, | ||||
# - new obsolescence marker, | ||||
# - working directory parent change, | ||||
# - bookmark changes | ||||
self.filteredrevcache = {} | ||||
|
r23558 | # generic mapping between names and nodes | ||
|
r23561 | self.names = namespaces.namespaces() | ||
|
r23558 | |||
|
r17192 | def close(self): | ||
|
r24378 | self._writecaches() | ||
def _writecaches(self): | ||||
if self._revbranchcache: | ||||
self._revbranchcache.write() | ||||
|
r17192 | |||
def _restrictcapabilities(self, caps): | ||||
|
r24696 | if self.ui.configbool('experimental', 'bundle2-advertise', True): | ||
|
r20955 | caps = set(caps) | ||
|
r22342 | capsblob = bundle2.encodecaps(bundle2.getrepocaps(self)) | ||
|
r24686 | caps.add('bundle2=' + urllib.quote(capsblob)) | ||
|
r17192 | return caps | ||
|
r24915 | def _applyopenerreqs(self): | ||
self.svfs.options = dict((r, 1) for r in self.requirements | ||||
|
r17137 | if r in self.openerreqs) | ||
|
r20180 | chunkcachesize = self.ui.configint('format', 'chunkcachesize') | ||
if chunkcachesize is not None: | ||||
|
r23853 | self.svfs.options['chunkcachesize'] = chunkcachesize | ||
|
r23256 | maxchainlen = self.ui.configint('format', 'maxchainlen') | ||
|
r23255 | if maxchainlen is not None: | ||
|
r23853 | self.svfs.options['maxchainlen'] = maxchainlen | ||
|
r24033 | manifestcachesize = self.ui.configint('format', 'manifestcachesize') | ||
if manifestcachesize is not None: | ||||
self.svfs.options['manifestcachesize'] = manifestcachesize | ||||
|
r12295 | |||
def _writerequirements(self): | ||||
|
r24934 | scmutil.writerequires(self.vfs, self.requirements) | ||
|
r12295 | |||
|
r12162 | def _checknested(self, path): | ||
"""Determine if path is a legal nested repository.""" | ||||
if not path.startswith(self.root): | ||||
return False | ||||
subpath = path[len(self.root) + 1:] | ||||
|
r15722 | normsubpath = util.pconvert(subpath) | ||
|
r12162 | |||
# XXX: Checking against the current working copy is wrong in | ||||
# the sense that it can reject things like | ||||
# | ||||
# $ hg cat -r 10 sub/x.txt | ||||
# | ||||
# if sub/ is no longer a subrepository in the working copy | ||||
# parent revision. | ||||
# | ||||
# However, it can of course also allow things that would have | ||||
# been rejected before, such as the above cat command if sub/ | ||||
# is a subrepository now, but was a normal directory before. | ||||
# The old path auditor would have rejected by mistake since it | ||||
# panics when it sees sub/.hg/. | ||||
# | ||||
|
r12174 | # All in all, checking against the working copy seems sensible | ||
# since we want to prevent access to nested repositories on | ||||
# the filesystem *now*. | ||||
ctx = self[None] | ||||
|
r12162 | parts = util.splitpath(subpath) | ||
while parts: | ||||
|
r15722 | prefix = '/'.join(parts) | ||
|
r12162 | if prefix in ctx.substate: | ||
|
r15722 | if prefix == normsubpath: | ||
|
r12162 | return True | ||
else: | ||||
sub = ctx.sub(prefix) | ||||
return sub.checknested(subpath[len(prefix) + 1:]) | ||||
else: | ||||
parts.pop() | ||||
return False | ||||
|
r17192 | def peer(self): | ||
return localpeer(self) # not cached to avoid reference cycle | ||||
|
r17993 | def unfiltered(self): | ||
"""Return unfiltered version of the repository | ||||
|
r18644 | Intended to be overwritten by filtered repo.""" | ||
|
r17993 | return self | ||
|
r18100 | def filtered(self, name): | ||
"""Return a filtered version of a repository""" | ||||
# build a new class with the mixin and the current class | ||||
|
r18644 | # (possibly subclass of the repo) | ||
|
r18100 | class proxycls(repoview.repoview, self.unfiltered().__class__): | ||
pass | ||||
return proxycls(self, name) | ||||
|
r18014 | @repofilecache('bookmarks') | ||
|
r13355 | def _bookmarks(self): | ||
|
r17922 | return bookmarks.bmstore(self) | ||
|
r13355 | |||
|
r18014 | @repofilecache('bookmarks.current') | ||
|
r24947 | def _activebookmark(self): | ||
|
r24946 | return bookmarks.readactive(self) | ||
|
r12162 | |||
|
r16707 | def bookmarkheads(self, bookmark): | ||
name = bookmark.split('@', 1)[0] | ||||
heads = [] | ||||
for mark, n in self._bookmarks.iteritems(): | ||||
if mark.split('@', 1)[0] == name: | ||||
heads.append(n) | ||||
return heads | ||||
|
r15418 | |||
|
r16198 | @storecache('phaseroots') | ||
|
r16657 | def _phasecache(self): | ||
return phases.phasecache(self, self._phasedefaults) | ||||
|
r15420 | |||
|
r17070 | @storecache('obsstore') | ||
def obsstore(self): | ||||
|
r22852 | # read default format for new obsstore. | ||
defaultformat = self.ui.configint('format', 'obsstore-version', None) | ||||
# rely on obsstore class default when possible. | ||||
kwargs = {} | ||||
if defaultformat is not None: | ||||
|
r22948 | kwargs['defaultformat'] = defaultformat | ||
|
r22951 | readonly = not obsolete.isenabled(self, obsolete.createmarkersopt) | ||
|
r23853 | store = obsolete.obsstore(self.svfs, readonly=readonly, | ||
|
r22950 | **kwargs) | ||
|
r22951 | if store and readonly: | ||
|
r24414 | self.ui.warn( | ||
_('obsolete feature not enabled but %i markers found!\n') | ||||
% len(list(store))) | ||||
|
r17070 | return store | ||
|
r16198 | @storecache('00changelog.i') | ||
|
r8260 | def changelog(self): | ||
|
r23853 | c = changelog.changelog(self.svfs) | ||
|
r8260 | if 'HG_PENDING' in os.environ: | ||
p = os.environ['HG_PENDING'] | ||||
if p.startswith(self.root): | ||||
c.readpending('00changelog.i.a') | ||||
return c | ||||
|
r16198 | @storecache('00manifest.i') | ||
|
r8260 | def manifest(self): | ||
|
r23853 | return manifest.manifest(self.svfs) | ||
|
r8260 | |||
|
r25119 | def dirlog(self, dir): | ||
|
r25185 | return self.manifest.dirlog(dir) | ||
|
r25119 | |||
|
r18014 | @repofilecache('dirstate') | ||
|
r8260 | def dirstate(self): | ||
|
r13032 | warned = [0] | ||
def validate(node): | ||||
try: | ||||
|
r14064 | self.changelog.rev(node) | ||
|
r13032 | return node | ||
except error.LookupError: | ||||
if not warned[0]: | ||||
warned[0] = True | ||||
self.ui.warn(_("warning: ignoring unknown" | ||||
|
r13037 | " working parent %s!\n") % short(node)) | ||
|
r13032 | return nullid | ||
|
r23852 | return dirstate.dirstate(self.vfs, self.ui, self.root, validate) | ||
|
r2155 | |||
|
r6747 | def __getitem__(self, changeid): | ||
|
r8527 | if changeid is None: | ||
|
r6747 | return context.workingctx(self) | ||
|
r23630 | if isinstance(changeid, slice): | ||
return [context.changectx(self, i) | ||||
for i in xrange(*changeid.indices(len(self))) | ||||
if i not in self.changelog.filteredrevs] | ||||
|
r6747 | return context.changectx(self, changeid) | ||
|
r9924 | def __contains__(self, changeid): | ||
try: | ||||
|
r24320 | self[changeid] | ||
return True | ||||
|
r9924 | except error.RepoLookupError: | ||
return False | ||||
|
r6750 | def __nonzero__(self): | ||
return True | ||||
def __len__(self): | ||||
return len(self.changelog) | ||||
def __iter__(self): | ||||
|
r17675 | return iter(self.changelog) | ||
|
r2155 | |||
|
r15403 | def revs(self, expr, *args): | ||
'''Return a list of revisions matching the given revset''' | ||||
expr = revset.formatspec(expr, *args) | ||||
m = revset.match(None, expr) | ||||
|
r24114 | return m(self) | ||
|
r15403 | |||
|
r14902 | def set(self, expr, *args): | ||
''' | ||||
Yield a context for each matching revision, after doing arg | ||||
|
r14904 | replacement via revset.formatspec | ||
|
r14902 | ''' | ||
|
r15403 | for r in self.revs(expr, *args): | ||
|
r14902 | yield self[r] | ||
|
r2673 | def url(self): | ||
return 'file:' + self.root | ||||
|
r1718 | def hook(self, name, throw=False, **args): | ||
|
r21866 | """Call a hook, passing this repo instance. | ||
This a convenience method to aid invoking hooks. Extensions likely | ||||
won't call this unless they have registered a custom hook or are | ||||
replacing code that is expected to call a hook. | ||||
""" | ||||
|
r4622 | return hook.hook(self.ui, self, name, throw, **args) | ||
|
r1089 | |||
|
r24234 | @unfilteredmethod | ||
|
r21237 | def _tag(self, names, node, message, local, user, date, extra={}, | ||
editor=False): | ||||
|
r6321 | if isinstance(names, str): | ||
names = (names,) | ||||
|
r4118 | |||
|
r11063 | branches = self.branchmap() | ||
|
r6321 | for name in names: | ||
self.hook('pretag', throw=True, node=hex(node), tag=name, | ||||
local=local) | ||||
|
r11063 | if name in branches: | ||
self.ui.warn(_("warning: tag %s conflicts with existing" | ||||
" branch name\n") % name) | ||||
|
r4118 | |||
|
r6321 | def writetags(fp, names, munge, prevtags): | ||
|
r5985 | fp.seek(0, 2) | ||
|
r4932 | if prevtags and prevtags[-1] != '\n': | ||
fp.write('\n') | ||||
|
r6321 | for name in names: | ||
|
r24306 | if munge: | ||
m = munge(name) | ||||
else: | ||||
m = name | ||||
|
r16683 | if (self._tagscache.tagtypes and | ||
name in self._tagscache.tagtypes): | ||||
|
r14936 | old = self.tags().get(name, nullid) | ||
|
r6671 | fp.write('%s %s\n' % (hex(old), m)) | ||
fp.write('%s %s\n' % (hex(node), m)) | ||||
|
r4932 | fp.close() | ||
|
r5081 | |||
|
r4932 | prevtags = '' | ||
|
r4118 | if local: | ||
|
r4932 | try: | ||
|
r23852 | fp = self.vfs('localtags', 'r+') | ||
|
r7875 | except IOError: | ||
|
r23852 | fp = self.vfs('localtags', 'a') | ||
|
r4932 | else: | ||
prevtags = fp.read() | ||||
|
r4118 | # local tags are stored in the current charset | ||
|
r6321 | writetags(fp, names, None, prevtags) | ||
for name in names: | ||||
self.hook('tag', node=hex(node), tag=name, local=local) | ||||
|
r4118 | return | ||
|
r8402 | try: | ||
fp = self.wfile('.hgtags', 'rb+') | ||||
|
r14646 | except IOError, e: | ||
if e.errno != errno.ENOENT: | ||||
raise | ||||
|
r8402 | fp = self.wfile('.hgtags', 'ab') | ||
|
r4932 | else: | ||
|
r8402 | prevtags = fp.read() | ||
|
r4932 | |||
|
r4118 | # committed tags are stored in UTF-8 | ||
|
r7948 | writetags(fp, names, encoding.fromlocal, prevtags) | ||
|
r4932 | |||
|
r13400 | fp.close() | ||
|
r15929 | self.invalidatecaches() | ||
|
r8402 | if '.hgtags' not in self.dirstate: | ||
|
r11303 | self[None].add(['.hgtags']) | ||
|
r4118 | |||
|
r10651 | m = matchmod.exact(self.root, '', ['.hgtags']) | ||
|
r21237 | tagnode = self.commit(message, user, date, extra=extra, match=m, | ||
editor=editor) | ||||
|
r4118 | |||
|
r6321 | for name in names: | ||
self.hook('tag', node=hex(node), tag=name, local=local) | ||||
|
r4118 | |||
return tagnode | ||||
|
r21237 | def tag(self, names, node, message, local, user, date, editor=False): | ||
|
r6321 | '''tag a revision with one or more symbolic names. | ||
|
r2601 | |||
|
r6321 | names is a list of strings or, when adding a single tag, names may be a | ||
string. | ||||
|
r6334 | |||
|
r6321 | if local is True, the tags are stored in a per-repository file. | ||
otherwise, they are stored in the .hgtags file, and a new | ||||
|
r2601 | changeset is committed with the change. | ||
keyword arguments: | ||||
|
r6321 | local: whether to store tags in non-version-controlled file | ||
|
r2601 | (default False) | ||
message: commit message to use if committing | ||||
user: name of user to use if committing | ||||
date: date tuple to use if committing''' | ||||
|
r13133 | if not local: | ||
|
r22679 | m = matchmod.exact(self.root, '', ['.hgtags']) | ||
|
r25149 | if any(self.status(match=m, unknown=True, ignored=True)): | ||
|
r22680 | raise util.Abort(_('working copy of .hgtags is changed'), | ||
hint=_('please commit .hgtags manually')) | ||||
|
r2601 | |||
|
r7814 | self.tags() # instantiate the cache | ||
|
r21237 | self._tag(names, node, message, local, user, date, editor=editor) | ||
|
r2601 | |||
|
r18013 | @filteredpropertycache | ||
|
r14936 | def _tagscache(self): | ||
|
r16683 | '''Returns a tagscache object that contains various tags related | ||
caches.''' | ||||
|
r14936 | |||
# This simplifies its cache management by having one decorated | ||||
# function (this one) and the rest simply fetch things from it. | ||||
class tagscache(object): | ||||
def __init__(self): | ||||
# These two define the set of tags for this repository. tags | ||||
# maps tag name to node; tagtypes maps tag name to 'global' or | ||||
# 'local'. (Global tags are defined by .hgtags across all | ||||
# heads, and local tags are defined in .hg/localtags.) | ||||
# They constitute the in-memory cache of tags. | ||||
self.tags = self.tagtypes = None | ||||
self.nodetagscache = self.tagslist = None | ||||
cache = tagscache() | ||||
cache.tags, cache.tagtypes = self._findtags() | ||||
return cache | ||||
|
r1089 | def tags(self): | ||
'''return a mapping of tag to node''' | ||||
|
r16371 | t = {} | ||
|
r17715 | if self.changelog.filteredrevs: | ||
tags, tt = self._findtags() | ||||
else: | ||||
tags = self._tagscache.tags | ||||
for k, v in tags.iteritems(): | ||||
|
r16371 | try: | ||
# ignore tags to unknown nodes | ||||
self.changelog.rev(v) | ||||
t[k] = v | ||||
|
r16679 | except (error.LookupError, ValueError): | ||
|
r16371 | pass | ||
return t | ||||
|
r4210 | |||
|
r9145 | def _findtags(self): | ||
'''Do the hard work of finding tags. Return a pair of dicts | ||||
(tags, tagtypes) where tags maps tag name to node, and tagtypes | ||||
maps tag name to a string like \'global\' or \'local\'. | ||||
Subclasses or extensions are free to add their own tags, but | ||||
should be aware that the returned dicts will be retained for the | ||||
duration of the localrepo object.''' | ||||
# XXX what tagtype should subclasses/extensions use? Currently | ||||
# mq and bookmarks add tags, but do not set the tagtype at all. | ||||
# Should each extension invent its own tag type? Should there | ||||
# be one tagtype for all such "virtual" tags? Or is the status | ||||
# quo fine? | ||||
|
r4210 | |||
|
r9148 | alltags = {} # map tag name to (node, hist) | ||
|
r5657 | tagtypes = {} | ||
|
r1089 | |||
|
r10651 | tagsmod.findglobaltags(self.ui, self, alltags, tagtypes) | ||
tagsmod.readlocaltags(self.ui, self, alltags, tagtypes) | ||||
|
r5657 | |||
|
r9152 | # Build the return dicts. Have to re-encode tag names because | ||
# the tags module always uses UTF-8 (in order not to lose info | ||||
# writing to the cache), but the rest of Mercurial wants them in | ||||
# local encoding. | ||||
|
r9145 | tags = {} | ||
|
r9147 | for (name, (node, hist)) in alltags.iteritems(): | ||
if node != nullid: | ||||
|
r16371 | tags[encoding.tolocal(name)] = node | ||
|
r9145 | tags['tip'] = self.changelog.tip() | ||
|
r9152 | tagtypes = dict([(encoding.tolocal(name), value) | ||
for (name, value) in tagtypes.iteritems()]) | ||||
|
r9145 | return (tags, tagtypes) | ||
|
r1089 | |||
|
r5657 | def tagtype(self, tagname): | ||
''' | ||||
return the type of the given tag. result can be: | ||||
'local' : a local tag | ||||
'global' : a global tag | ||||
None : tag does not exist | ||||
''' | ||||
|
r14936 | return self._tagscache.tagtypes.get(tagname) | ||
|
r5657 | |||
|
r1089 | def tagslist(self): | ||
'''return a list of tags ordered by revision''' | ||||
|
r14936 | if not self._tagscache.tagslist: | ||
l = [] | ||||
for t, n in self.tags().iteritems(): | ||||
|
r22201 | l.append((self.changelog.rev(n), t, n)) | ||
|
r14936 | self._tagscache.tagslist = [(t, n) for r, t, n in sorted(l)] | ||
return self._tagscache.tagslist | ||||
|
r1089 | |||
def nodetags(self, node): | ||||
'''return the tags associated with a node''' | ||||
|
r14936 | if not self._tagscache.nodetagscache: | ||
nodetagscache = {} | ||||
|
r16371 | for t, n in self._tagscache.tags.iteritems(): | ||
|
r14936 | nodetagscache.setdefault(n, []).append(t) | ||
for tags in nodetagscache.itervalues(): | ||||
|
r11047 | tags.sort() | ||
|
r14936 | self._tagscache.nodetagscache = nodetagscache | ||
return self._tagscache.nodetagscache.get(node, []) | ||||
|
r1089 | |||
|
r13384 | def nodebookmarks(self, node): | ||
marks = [] | ||||
for bookmark, n in self._bookmarks.iteritems(): | ||||
if n == node: | ||||
marks.append(bookmark) | ||||
return sorted(marks) | ||||
|
r12066 | def branchmap(self): | ||
|
r20245 | '''returns a dictionary {branch: [branchheads]} with branchheads | ||
ordered by increasing revision number''' | ||||
|
r18189 | branchmap.updatecache(self) | ||
return self._branchcaches[self.filtername] | ||||
|
r17714 | |||
|
r24373 | @unfilteredmethod | ||
def revbranchcache(self): | ||||
if not self._revbranchcache: | ||||
self._revbranchcache = branchmap.revbranchcache(self.unfiltered()) | ||||
return self._revbranchcache | ||||
|
r23775 | def branchtip(self, branch, ignoremissing=False): | ||
'''return the tip node for a given branch | ||||
If ignoremissing is True, then this method will not raise an error. | ||||
This is helpful for callers that only expect None for a missing branch | ||||
(e.g. namespace). | ||||
''' | ||||
|
r20187 | try: | ||
return self.branchmap().branchtip(branch) | ||||
except KeyError: | ||||
|
r23775 | if not ignoremissing: | ||
raise error.RepoLookupError(_("unknown branch '%s'") % branch) | ||||
else: | ||||
pass | ||||
|
r16719 | |||
|
r1089 | def lookup(self, key): | ||
|
r16378 | return self[key].node() | ||
|
r1089 | |||
|
r10960 | def lookupbranch(self, key, remote=None): | ||
repo = remote or self | ||||
if key in repo.branchmap(): | ||||
return key | ||||
repo = (remote and remote.local()) and remote or self | ||||
return repo[key].branch() | ||||
|
r13723 | def known(self, nodes): | ||
nm = self.changelog.nodemap | ||||
|
r16657 | pc = self._phasecache | ||
|
r15889 | result = [] | ||
for n in nodes: | ||||
r = nm.get(n) | ||||
|
r16657 | resp = not (r is None or pc.phase(self, r) >= phases.secret) | ||
|
r15889 | result.append(resp) | ||
return result | ||||
|
r13723 | |||
|
r1089 | def local(self): | ||
|
r14603 | return self | ||
|
r1089 | |||
|
r17192 | def cancopy(self): | ||
|
r20332 | # so statichttprepo's override of local() works | ||
if not self.local(): | ||||
return False | ||||
if not self.ui.configbool('phases', 'publish', True): | ||||
return True | ||||
# if publishing we can't copy if there is filtered content | ||||
return not self.filtered('visible').changelog.filteredrevs | ||||
|
r17192 | |||
|
r23666 | def shared(self): | ||
'''the type of shared repository (None if not shared)''' | ||||
if self.sharedpath != self.path: | ||||
return 'store' | ||||
return None | ||||
|
r22362 | def join(self, f, *insidef): | ||
|
r23667 | return self.vfs.join(os.path.join(f, *insidef)) | ||
|
r1089 | |||
|
r22362 | def wjoin(self, f, *insidef): | ||
|
r23714 | return self.vfs.reljoin(self.root, f, *insidef) | ||
|
r1089 | |||
def file(self, f): | ||||
|
r1615 | if f[0] == '/': | ||
f = f[1:] | ||||
|
r23853 | return filelog.filelog(self.svfs, f) | ||
|
r1089 | |||
|
r6739 | def changectx(self, changeid): | ||
|
r6747 | return self[changeid] | ||
|
r3218 | |||
|
r3163 | def parents(self, changeid=None): | ||
|
r6742 | '''get list of changectxs for parents of changeid''' | ||
|
r6747 | return self[changeid].parents() | ||
|
r3163 | |||
|
r16551 | def setparents(self, p1, p2=nullid): | ||
|
r22405 | self.dirstate.beginparentchange() | ||
|
r16551 | copies = self.dirstate.setparents(p1, p2) | ||
|
r18739 | pctx = self[p1] | ||
|
r16551 | if copies: | ||
# Adjust copy records, the dirstate cannot do it, it | ||||
# requires access to parents manifests. Preserve them | ||||
# only for entries added to first parent. | ||||
for f in copies: | ||||
if f not in pctx and copies[f] in pctx: | ||||
self.dirstate.copy(copies[f], f) | ||||
|
r18739 | if p2 == nullid: | ||
for f, s in sorted(self.dirstate.copies().items()): | ||||
if f not in pctx and s not in pctx: | ||||
self.dirstate.copy(None, f) | ||||
|
r22405 | self.dirstate.endparentchange() | ||
|
r16551 | |||
|
r2564 | def filectx(self, path, changeid=None, fileid=None): | ||
"""changeid can be a changeset revision, node, or tag. | ||||
fileid can be a file revision or node.""" | ||||
return context.filectx(self, path, changeid, fileid) | ||||
|
r1089 | def getcwd(self): | ||
return self.dirstate.getcwd() | ||||
|
r4525 | def pathto(self, f, cwd=None): | ||
return self.dirstate.pathto(f, cwd) | ||||
|
r1089 | def wfile(self, f, mode='r'): | ||
|
r23854 | return self.wvfs(f, mode) | ||
|
r1089 | |||
|
r4275 | def _link(self, f): | ||
|
r18949 | return self.wvfs.islink(f) | ||
|
r4275 | |||
|
r11698 | def _loadfilter(self, filter): | ||
|
r4004 | if filter not in self.filterpats: | ||
|
r1258 | l = [] | ||
|
r4004 | for pat, cmd in self.ui.configitems(filter): | ||
|
r7226 | if cmd == '!': | ||
continue | ||||
|
r10651 | mf = matchmod.match(self.root, '', [pat]) | ||
|
r5966 | fn = None | ||
|
r6066 | params = cmd | ||
|
r5966 | for name, filterfn in self._datafilters.iteritems(): | ||
|
r6210 | if cmd.startswith(name): | ||
|
r5966 | fn = filterfn | ||
|
r6066 | params = cmd[len(name):].lstrip() | ||
|
r5966 | break | ||
if not fn: | ||||
|
r5967 | fn = lambda s, c, **kwargs: util.filter(s, c) | ||
# Wrap old filters not supporting keyword arguments | ||||
if not inspect.getargspec(fn)[2]: | ||||
oldfn = fn | ||||
fn = lambda s, c, **kwargs: oldfn(s, c) | ||||
|
r6066 | l.append((mf, fn, params)) | ||
|
r4004 | self.filterpats[filter] = l | ||
|
r12706 | return self.filterpats[filter] | ||
|
r1258 | |||
|
r12707 | def _filter(self, filterpats, filename, data): | ||
for mf, fn, cmd in filterpats: | ||||
|
r1258 | if mf(filename): | ||
|
r9467 | self.ui.debug("filtering %s through %s\n" % (filename, cmd)) | ||
|
r5967 | data = fn(data, cmd, ui=self.ui, repo=self, filename=filename) | ||
|
r1258 | break | ||
return data | ||||
|
r1089 | |||
|
r18013 | @unfilteredpropertycache | ||
|
r12708 | def _encodefilterpats(self): | ||
return self._loadfilter('encode') | ||||
|
r18013 | @unfilteredpropertycache | ||
|
r12708 | def _decodefilterpats(self): | ||
return self._loadfilter('decode') | ||||
|
r5966 | def adddatafilter(self, name, filter): | ||
self._datafilters[name] = filter | ||||
|
r4004 | def wread(self, filename): | ||
if self._link(filename): | ||||
|
r18950 | data = self.wvfs.readlink(filename) | ||
|
r4004 | else: | ||
|
r23854 | data = self.wvfs.read(filename) | ||
|
r12708 | return self._filter(self._encodefilterpats, filename, data) | ||
|
r1258 | |||
|
r4006 | def wwrite(self, filename, data, flags): | ||
|
r24843 | """write ``data`` into ``filename`` in the working directory | ||
This returns length of written (maybe decoded) data. | ||||
""" | ||||
|
r12708 | data = self._filter(self._decodefilterpats, filename, data) | ||
|
r6877 | if 'l' in flags: | ||
|
r23854 | self.wvfs.symlink(data, filename) | ||
|
r6877 | else: | ||
|
r23854 | self.wvfs.write(filename, data) | ||
|
r6877 | if 'x' in flags: | ||
|
r18951 | self.wvfs.setflags(filename, False, True) | ||
|
r24843 | return len(data) | ||
|
r1258 | |||
|
r4005 | def wwritedata(self, filename, data): | ||
|
r12708 | return self._filter(self._decodefilterpats, filename, data) | ||
|
r1089 | |||
|
r23379 | def currenttransaction(self): | ||
"""return the current transaction or None if non exists""" | ||||
|
r24306 | if self._transref: | ||
tr = self._transref() | ||||
else: | ||||
tr = None | ||||
|
r8072 | if tr and tr.running(): | ||
|
r23379 | return tr | ||
return None | ||||
def transaction(self, desc, report=None): | ||||
|
r25290 | if (self.ui.configbool('devel', 'all-warnings') | ||
|
r24388 | or self.ui.configbool('devel', 'check-locks')): | ||
l = self._lockref and self._lockref() | ||||
if l is None or not l.held: | ||||
|
r24748 | scmutil.develwarn(self.ui, 'transaction with no lock') | ||
|
r23379 | tr = self.currenttransaction() | ||
if tr is not None: | ||||
|
r8072 | return tr.nest() | ||
|
r1806 | |||
|
r5865 | # abort here if the journal already exists | ||
|
r18947 | if self.svfs.exists("journal"): | ||
|
r10282 | raise error.RepoError( | ||
|
r21274 | _("abandoned transaction found"), | ||
hint=_("run 'hg recover' to clean up transaction")) | ||||
|
r5865 | |||
|
r25267 | idbase = "%.40f#%f" % (random.random(), time.time()) | ||
txnid = 'TXN:' + util.sha1(idbase).hexdigest() | ||||
|
r25268 | self.hook('pretxnopen', throw=True, txnname=desc, txnid=txnid) | ||
|
r24281 | |||
|
r16236 | self._writejournal(desc) | ||
|
r18952 | renames = [(vfs, x, undoname(x)) for vfs, x in self._journalfiles()] | ||
|
r24306 | if report: | ||
rp = report | ||||
else: | ||||
rp = self.ui.warn | ||||
|
r23852 | vfsmap = {'plain': self.vfs} # root of .hg/ | ||
|
r24284 | # we must avoid cyclic reference between repo and transaction. | ||
reporef = weakref.ref(self) | ||||
def validate(tr): | ||||
"""will run pre-closing hooks""" | ||||
pending = lambda: tr.writepending() and self.root or "" | ||||
reporef().hook('pretxnclose', throw=True, pending=pending, | ||||
|
r25219 | txnname=desc, **tr.hookargs) | ||
|
r24284 | |||
tr = transaction.transaction(rp, self.sopener, vfsmap, | ||||
|
r20087 | "journal", | ||
|
r23903 | "undo", | ||
|
r14266 | aftertrans(renames), | ||
|
r24284 | self.store.createmode, | ||
validator=validate) | ||||
|
r24740 | |||
|
r25267 | tr.hookargs['txnid'] = txnid | ||
|
r23511 | # note: writing the fncache only during finalize mean that the file is | ||
# outdated when running hooks. As fncache is used for streaming clone, | ||||
# this is not expected to break anything that happen during the hooks. | ||||
tr.addfinalize('flush-fncache', self.store.write) | ||||
|
r24282 | def txnclosehook(tr2): | ||
"""To be run if transaction is successful, will schedule a hook run | ||||
""" | ||||
def hook(): | ||||
reporef().hook('txnclose', throw=False, txnname=desc, | ||||
**tr2.hookargs) | ||||
reporef()._afterlock(hook) | ||||
tr.addfinalize('txnclose-hook', txnclosehook) | ||||
|
r24792 | def txnaborthook(tr2): | ||
"""To be run if transaction is aborted | ||||
""" | ||||
reporef().hook('txnabort', throw=False, txnname=desc, | ||||
**tr2.hookargs) | ||||
tr.addabort('txnabort-hook', txnaborthook) | ||||
|
r14266 | self._transref = weakref.ref(tr) | ||
return tr | ||||
|
r16236 | def _journalfiles(self): | ||
|
r18952 | return ((self.svfs, 'journal'), | ||
(self.vfs, 'journal.dirstate'), | ||||
(self.vfs, 'journal.branch'), | ||||
(self.vfs, 'journal.desc'), | ||||
(self.vfs, 'journal.bookmarks'), | ||||
(self.svfs, 'journal.phaseroots')) | ||||
|
r16236 | |||
def undofiles(self): | ||||
|
r20975 | return [(vfs, undoname(x)) for vfs, x in self._journalfiles()] | ||
|
r16236 | |||
|
r14266 | def _writejournal(self, desc): | ||
|
r23852 | self.vfs.write("journal.dirstate", | ||
self.vfs.tryread("dirstate")) | ||||
self.vfs.write("journal.branch", | ||||
|
r14168 | encoding.fromlocal(self.dirstate.branch())) | ||
|
r23852 | self.vfs.write("journal.desc", | ||
|
r14168 | "%d\n%s\n" % (len(self), desc)) | ||
|
r23852 | self.vfs.write("journal.bookmarks", | ||
self.vfs.tryread("bookmarks")) | ||||
|
r23853 | self.svfs.write("journal.phaseroots", | ||
self.svfs.tryread("phaseroots")) | ||||
|
r14266 | |||
|
r1089 | def recover(self): | ||
|
r8109 | lock = self.lock() | ||
|
r4915 | try: | ||
|
r18947 | if self.svfs.exists("journal"): | ||
|
r4915 | self.ui.status(_("rolling back interrupted transaction\n")) | ||
|
r23853 | vfsmap = {'': self.svfs, | ||
|
r23852 | 'plain': self.vfs,} | ||
|
r23853 | transaction.rollback(self.svfs, vfsmap, "journal", | ||
|
r10282 | self.ui.warn) | ||
|
r4915 | self.invalidate() | ||
return True | ||||
else: | ||||
self.ui.warn(_("no interrupted transaction available\n")) | ||||
return False | ||||
finally: | ||||
|
r8109 | lock.release() | ||
|
r1089 | |||
|
r15183 | def rollback(self, dryrun=False, force=False): | ||
|
r4917 | wlock = lock = None | ||
|
r4915 | try: | ||
|
r1712 | wlock = self.wlock() | ||
|
r4438 | lock = self.lock() | ||
|
r18947 | if self.svfs.exists("undo"): | ||
|
r15183 | return self._rollback(dryrun, force) | ||
|
r4915 | else: | ||
self.ui.warn(_("no rollback information available\n")) | ||||
|
r11177 | return 1 | ||
|
r4915 | finally: | ||
|
r8109 | release(lock, wlock) | ||
|
r1089 | |||
|
r18016 | @unfilteredmethod # Until we get smarter cache management | ||
|
r15183 | def _rollback(self, dryrun, force): | ||
|
r15130 | ui = self.ui | ||
|
r15097 | try: | ||
|
r23852 | args = self.vfs.read('undo.desc').splitlines() | ||
|
r15130 | (oldlen, desc, detail) = (int(args[0]), args[1], None) | ||
if len(args) >= 3: | ||||
detail = args[2] | ||||
oldtip = oldlen - 1 | ||||
if detail and ui.verbose: | ||||
msg = (_('repository tip rolled back to revision %s' | ||||
' (undo %s: %s)\n') | ||||
% (oldtip, desc, detail)) | ||||
else: | ||||
msg = (_('repository tip rolled back to revision %s' | ||||
' (undo %s)\n') | ||||
% (oldtip, desc)) | ||||
|
r15097 | except IOError: | ||
|
r15130 | msg = _('rolling back unknown transaction\n') | ||
|
r15183 | desc = None | ||
if not force and self['.'] != self['tip'] and desc == 'commit': | ||||
raise util.Abort( | ||||
_('rollback of last commit while not checked out ' | ||||
|
r15187 | 'may lose data'), hint=_('use -f to force')) | ||
|
r15183 | |||
|
r15130 | ui.status(msg) | ||
|
r15097 | if dryrun: | ||
return 0 | ||||
|
r15131 | |||
parents = self.dirstate.parents() | ||||
|
r18310 | self.destroying() | ||
|
r23902 | vfsmap = {'plain': self.vfs, '': self.svfs} | ||
|
r23853 | transaction.rollback(self.svfs, vfsmap, 'undo', ui.warn) | ||
|
r18947 | if self.vfs.exists('undo.bookmarks'): | ||
|
r18948 | self.vfs.rename('undo.bookmarks', 'bookmarks') | ||
|
r18947 | if self.svfs.exists('undo.phaseroots'): | ||
|
r18948 | self.svfs.rename('undo.phaseroots', 'phaseroots') | ||
|
r15097 | self.invalidate() | ||
|
r15131 | |||
parentgone = (parents[0] not in self.changelog.nodemap or | ||||
parents[1] not in self.changelog.nodemap) | ||||
if parentgone: | ||||
|
r18948 | self.vfs.rename('undo.dirstate', 'dirstate') | ||
|
r15131 | try: | ||
|
r23852 | branch = self.vfs.read('undo.branch') | ||
|
r17360 | self.dirstate.setbranch(encoding.tolocal(branch)) | ||
|
r15131 | except IOError: | ||
ui.warn(_('named branch could not be reset: ' | ||||
'current branch is still \'%s\'\n') | ||||
% self.dirstate.branch()) | ||||
self.dirstate.invalidate() | ||||
parents = tuple([p.rev() for p in self.parents()]) | ||||
if len(parents) > 1: | ||||
ui.status(_('working directory now based on ' | ||||
'revisions %d and %d\n') % parents) | ||||
else: | ||||
ui.status(_('working directory now based on ' | ||||
'revision %d\n') % parents) | ||||
|
r24784 | ms = mergemod.mergestate(self) | ||
ms.reset(self['.'].node()) | ||||
|
r17013 | # TODO: if we know which new heads may result from this rollback, pass | ||
# them to destroy(), which will prevent the branchhead cache from being | ||||
# invalidated. | ||||
|
r15604 | self.destroyed() | ||
|
r15097 | return 0 | ||
|
r10547 | def invalidatecaches(self): | ||
|
r15988 | |||
|
r18013 | if '_tagscache' in vars(self): | ||
# can't use delattr on proxy | ||||
del self.__dict__['_tagscache'] | ||||
|
r14936 | |||
|
r18189 | self.unfiltered()._branchcaches.clear() | ||
|
r18105 | self.invalidatevolatilesets() | ||
def invalidatevolatilesets(self): | ||||
self.filteredrevcache.clear() | ||||
|
r17469 | obsolete.clearobscaches(self) | ||
|
r1784 | |||
|
r14930 | def invalidatedirstate(self): | ||
'''Invalidates the dirstate, causing the next call to dirstate | ||||
to check if it was modified since the last time it was read, | ||||
rereading it if it has. | ||||
This is different to dirstate.invalidate() that it doesn't always | ||||
rereads the dirstate. Use dirstate.invalidate() if you want to | ||||
explicitly read the dirstate again (i.e. restoring it to a previous | ||||
known good state).''' | ||||
|
r18013 | if hasunfilteredcache(self, 'dirstate'): | ||
|
r16200 | for k in self.dirstate._filecache: | ||
try: | ||||
delattr(self.dirstate, k) | ||||
except AttributeError: | ||||
pass | ||||
|
r17997 | delattr(self.unfiltered(), 'dirstate') | ||
|
r14930 | |||
|
r10547 | def invalidate(self): | ||
|
r18644 | unfiltered = self.unfiltered() # all file caches are stored unfiltered | ||
|
r14935 | for k in self._filecache: | ||
# dirstate is invalidated separately in invalidatedirstate() | ||||
if k == 'dirstate': | ||||
continue | ||||
try: | ||||
|
r17997 | delattr(unfiltered, k) | ||
|
r14935 | except AttributeError: | ||
pass | ||||
|
r10547 | self.invalidatecaches() | ||
|
r20884 | self.store.invalidatecaches() | ||
|
r10547 | |||
|
r20627 | def invalidateall(self): | ||
'''Fully invalidates both store and non-store parts, causing the | ||||
subsequent operation to reread any outside changes.''' | ||||
# extension should hook this to invalidate its caches | ||||
self.invalidate() | ||||
self.invalidatedirstate() | ||||
|
r20091 | def _lock(self, vfs, lockname, wait, releasefn, acquirefn, desc): | ||
|
r1089 | try: | ||
|
r20091 | l = lockmod.lock(vfs, lockname, 0, releasefn, desc=desc) | ||
|
r7640 | except error.LockHeld, inst: | ||
|
r1531 | if not wait: | ||
|
r2016 | raise | ||
|
r3688 | self.ui.warn(_("waiting for lock on %s held by %r\n") % | ||
(desc, inst.locker)) | ||||
|
r2016 | # default to 600 seconds timeout | ||
|
r20091 | l = lockmod.lock(vfs, lockname, | ||
|
r20088 | int(self.ui.config("ui", "timeout", "600")), | ||
releasefn, desc=desc) | ||||
|
r20380 | self.ui.warn(_("got lock after %s seconds\n") % l.delay) | ||
|
r1751 | if acquirefn: | ||
acquirefn() | ||||
return l | ||||
|
r15587 | def _afterlock(self, callback): | ||
|
r24821 | """add a callback to be run when the repository is fully unlocked | ||
|
r15583 | |||
|
r24821 | The callback will be executed when the outermost lock is released | ||
(with wlock being higher level than 'lock').""" | ||||
for ref in (self._wlockref, self._lockref): | ||||
l = ref and ref() | ||||
if l and l.held: | ||||
l.postrelease.append(callback) | ||||
break | ||||
else: # no lock have been found. | ||||
|
r16680 | callback() | ||
|
r15583 | |||
|
r4914 | def lock(self, wait=True): | ||
|
r9309 | '''Lock the repository store (.hg/store) and return a weak reference | ||
to the lock. Use this before modifying the store (e.g. committing or | ||||
|
r24746 | stripping). If you are opening a transaction, get a lock as well.) | ||
If both 'lock' and 'wlock' must be acquired, ensure you always acquires | ||||
'wlock' first to avoid a dead-lock hazard.''' | ||||
|
r8108 | l = self._lockref and self._lockref() | ||
if l is not None and l.held: | ||||
l.lock() | ||||
return l | ||||
|
r4917 | |||
|
r14931 | def unlock(): | ||
for k, ce in self._filecache.items(): | ||||
|
r18309 | if k == 'dirstate' or k not in self.__dict__: | ||
|
r14931 | continue | ||
ce.refresh() | ||||
|
r20091 | l = self._lock(self.svfs, "lock", wait, unlock, | ||
|
r13391 | self.invalidate, _('repository %s') % self.origroot) | ||
|
r4917 | self._lockref = weakref.ref(l) | ||
return l | ||||
|
r1751 | |||
|
r4914 | def wlock(self, wait=True): | ||
|
r9309 | '''Lock the non-store parts of the repository (everything under | ||
.hg except .hg/store) and return a weak reference to the lock. | ||||
|
r24746 | |||
Use this before modifying files in .hg. | ||||
If both 'lock' and 'wlock' must be acquired, ensure you always acquires | ||||
'wlock' first to avoid a dead-lock hazard.''' | ||||
|
r24744 | l = self._wlockref and self._wlockref() | ||
if l is not None and l.held: | ||||
l.lock() | ||||
return l | ||||
|
r24750 | # We do not need to check for non-waiting lock aquisition. Such | ||
# acquisition would not cause dead-lock as they would just fail. | ||||
|
r25290 | if wait and (self.ui.configbool('devel', 'all-warnings') | ||
|
r24750 | or self.ui.configbool('devel', 'check-locks')): | ||
|
r24386 | l = self._lockref and self._lockref() | ||
if l is not None and l.held: | ||||
|
r24748 | scmutil.develwarn(self.ui, '"wlock" acquired after "lock"') | ||
|
r1531 | |||
|
r14930 | def unlock(): | ||
|
r22404 | if self.dirstate.pendingparentchange(): | ||
self.dirstate.invalidate() | ||||
else: | ||||
self.dirstate.write() | ||||
|
r18318 | self._filecache['dirstate'].refresh() | ||
|
r14930 | |||
|
r20091 | l = self._lock(self.vfs, "wlock", wait, unlock, | ||
|
r14930 | self.invalidatedirstate, _('working directory of %s') % | ||
|
r4917 | self.origroot) | ||
self._wlockref = weakref.ref(l) | ||||
return l | ||||
|
r1531 | |||
|
r8401 | def _filecommit(self, fctx, manifest1, manifest2, linkrev, tr, changelist): | ||
|
r3292 | """ | ||
|
r3294 | commit an individual file as part of a larger transaction | ||
""" | ||||
|
r3292 | |||
|
r8244 | fname = fctx.path() | ||
fparent1 = manifest1.get(fname, nullid) | ||||
|
r22492 | fparent2 = manifest2.get(fname, nullid) | ||
|
r24394 | if isinstance(fctx, context.filectx): | ||
node = fctx.filenode() | ||||
if node in [fparent1, fparent2]: | ||||
self.ui.debug('reusing %s filelog entry\n' % fname) | ||||
return node | ||||
|
r1716 | |||
|
r24394 | flog = self.file(fname) | ||
|
r3292 | meta = {} | ||
|
r8244 | copy = fctx.renamed() | ||
if copy and copy[0] != fname: | ||||
|
r4058 | # Mark the new revision of this file as a copy of another | ||
|
r4516 | # file. This copy data will effectively act as a parent | ||
# of this new revision. If this is a merge, the first | ||||
|
r4058 | # parent will be the nullid (meaning "look up the copy data") | ||
# and the second one will be the other parent. For example: | ||||
# | ||||
# 0 --- 1 --- 3 rev1 changes file foo | ||||
# \ / rev2 renames foo to bar and changes it | ||||
# \- 2 -/ rev3 should have bar with all changes and | ||||
# should record that bar descends from | ||||
# bar in rev2 and foo in rev1 | ||||
# | ||||
# this allows this merge to succeed: | ||||
# | ||||
# 0 --- 1 --- 3 rev4 reverts the content change from rev2 | ||||
# \ / merging rev3 and rev4 should use bar@rev2 | ||||
# \- 2 --- 4 as the merge base | ||||
# | ||||
|
r6874 | |||
|
r8244 | cfname = copy[0] | ||
crev = manifest1.get(cfname) | ||||
newfparent = fparent2 | ||||
|
r6874 | |||
if manifest2: # branch merge | ||||
|
r8244 | if fparent2 == nullid or crev is None: # copied on remote side | ||
if cfname in manifest2: | ||||
crev = manifest2[cfname] | ||||
newfparent = fparent1 | ||||
|
r6874 | |||
|
r23929 | # Here, we used to search backwards through history to try to find | ||
# where the file copy came from if the source of a copy was not in | ||||
|
r24180 | # the parent directory. However, this doesn't actually make sense to | ||
|
r23929 | # do (what does a copy from something not in your working copy even | ||
# mean?) and it causes bugs (eg, issue4476). Instead, we will warn | ||||
# the user that copy information was dropped, so if they didn't | ||||
# expect this outcome it can be fixed, but this is the correct | ||||
# behavior in this circumstance. | ||||
|
r6875 | |||
|
r13000 | if crev: | ||
self.ui.debug(" %s: copy %s:%s\n" % (fname, cfname, hex(crev))) | ||||
meta["copy"] = cfname | ||||
meta["copyrev"] = hex(crev) | ||||
fparent1, fparent2 = nullid, newfparent | ||||
else: | ||||
self.ui.warn(_("warning: can't find ancestor for '%s' " | ||||
"copied from '%s'!\n") % (fname, cfname)) | ||||
|
r20556 | elif fparent1 == nullid: | ||
fparent1, fparent2 = fparent2, nullid | ||||
|
r8244 | elif fparent2 != nullid: | ||
|
r1716 | # is one parent an ancestor of the other? | ||
|
r21106 | fparentancestors = flog.commonancestorsheads(fparent1, fparent2) | ||
|
r20987 | if fparent1 in fparentancestors: | ||
|
r8244 | fparent1, fparent2 = fparent2, nullid | ||
|
r20987 | elif fparent2 in fparentancestors: | ||
|
r8244 | fparent2 = nullid | ||
|
r1716 | |||
|
r8401 | # is the file changed? | ||
|
r24394 | text = fctx.data() | ||
|
r8401 | if fparent2 != nullid or flog.cmp(fparent1, text) or meta: | ||
changelist.append(fname) | ||||
return flog.add(text, meta, tr, linkrev, fparent1, fparent2) | ||||
# are just the flags changed during merge? | ||||
|
r22492 | elif fname in manifest1 and manifest1.flags(fname) != fctx.flags(): | ||
|
r8401 | changelist.append(fname) | ||
return fparent1 | ||||
|
r1716 | |||
|
r18016 | @unfilteredmethod | ||
|
r8706 | def commit(self, text="", user=None, date=None, match=None, force=False, | ||
editor=False, extra={}): | ||||
|
r8515 | """Add a new revision to current repository. | ||
|
r8706 | Revision information is gathered from the working directory, | ||
match can be used to filter the committed files. If editor is | ||||
supplied, it is called to get a commit message. | ||||
|
r8515 | """ | ||
|
r8709 | |||
|
r8715 | def fail(f, msg): | ||
raise util.Abort('%s: %s' % (f, msg)) | ||||
if not match: | ||||
|
r10651 | match = matchmod.always(self.root, '') | ||
|
r8715 | |||
if not force: | ||||
vdirs = [] | ||||
|
r19138 | match.explicitdir = vdirs.append | ||
|
r8715 | match.bad = fail | ||
|
r8405 | wlock = self.wlock() | ||
|
r4915 | try: | ||
|
r8813 | wctx = self[None] | ||
|
r10970 | merge = len(wctx.parents()) > 1 | ||
|
r1089 | |||
|
r25114 | if not force and merge and match.ispartial(): | ||
|
r8397 | raise util.Abort(_('cannot partially commit a merge ' | ||
'(do not specify files or patterns)')) | ||||
|
r6706 | |||
|
r22928 | status = self.status(match=match, clean=force) | ||
|
r8706 | if force: | ||
|
r22928 | status.modified.extend(status.clean) # mq may commit clean files | ||
|
r3621 | |||
|
r8813 | # check subrepos | ||
subs = [] | ||||
|
r16073 | commitsubs = set() | ||
newstate = wctx.substate.copy() | ||||
# only manage subrepos and .hgsubstate if .hgsub is present | ||||
|
r14536 | if '.hgsub' in wctx: | ||
|
r16073 | # we'll decide whether to track this ourselves, thanks | ||
|
r22928 | for c in status.modified, status.added, status.removed: | ||
|
r20827 | if '.hgsubstate' in c: | ||
c.remove('.hgsubstate') | ||||
|
r16073 | |||
# compare current state to last committed state | ||||
# build new substate based on last committed state | ||||
oldstate = wctx.p1().substate | ||||
for s in sorted(newstate.keys()): | ||||
if not match(s): | ||||
# ignore working copy, use old state if present | ||||
if s in oldstate: | ||||
newstate[s] = oldstate[s] | ||||
continue | ||||
if not force: | ||||
raise util.Abort( | ||||
_("commit with new subrepo %s excluded") % s) | ||||
|
r24470 | dirtyreason = wctx.sub(s).dirtyreason(True) | ||
if dirtyreason: | ||||
|
r16073 | if not self.ui.configbool('ui', 'commitsubrepos'): | ||
|
r24470 | raise util.Abort(dirtyreason, | ||
|
r16073 | hint=_("use --subrepos for recursive commit")) | ||
subs.append(s) | ||||
commitsubs.add(s) | ||||
else: | ||||
bs = wctx.sub(s).basestate() | ||||
newstate[s] = (newstate[s][0], bs, newstate[s][2]) | ||||
if oldstate.get(s, (None, None, None))[1] != bs: | ||||
subs.append(s) | ||||
# check for removed subrepos | ||||
|
r14536 | for p in wctx.parents(): | ||
|
r16073 | r = [s for s in p.substate if s not in newstate] | ||
subs += [s for s in r if match(s)] | ||||
if subs: | ||||
|
r14536 | if (not match('.hgsub') and | ||
'.hgsub' in (wctx.modified() + wctx.added())): | ||||
raise util.Abort( | ||||
_("can't commit subrepos without .hgsub")) | ||||
|
r22928 | status.modified.insert(0, '.hgsubstate') | ||
|
r16073 | |||
|
r22928 | elif '.hgsub' in status.removed: | ||
|
r14536 | # clean up .hgsubstate when .hgsub is removed | ||
if ('.hgsubstate' in wctx and | ||||
|
r22928 | '.hgsubstate' not in (status.modified + status.added + | ||
status.removed)): | ||||
status.removed.insert(0, '.hgsubstate') | ||||
|
r8813 | |||
|
r8709 | # make sure all explicit patterns are matched | ||
|
r25274 | if not force and (match.isexact() or match.prefix()): | ||
|
r22928 | matched = set(status.modified + status.added + status.removed) | ||
|
r8709 | |||
for f in match.files(): | ||||
|
r17378 | f = self.dirstate.normalize(f) | ||
|
r8813 | if f == '.' or f in matched or f in wctx.substate: | ||
|
r8709 | continue | ||
|
r22928 | if f in status.deleted: | ||
|
r8709 | fail(f, _('file not found!')) | ||
if f in vdirs: # visited directory | ||||
d = f + '/' | ||||
|
r8710 | for mf in matched: | ||
if mf.startswith(d): | ||||
break | ||||
else: | ||||
|
r8709 | fail(f, _("no match under directory!")) | ||
elif f not in self.dirstate: | ||||
fail(f, _("file not tracked!")) | ||||
|
r23710 | cctx = context.workingcommitctx(self, status, | ||
text, user, date, extra) | ||||
|
r18659 | |||
|
r25021 | allowemptycommit = (wctx.branch() != wctx.p1().branch() | ||
|
r25018 | or extra.get('close') or merge or cctx.files() | ||
or self.ui.configbool('ui', 'allowemptycommit')) | ||||
|
r25017 | if not allowemptycommit: | ||
|
r8404 | return None | ||
|
r18660 | if merge and cctx.deleted(): | ||
|
r16536 | raise util.Abort(_("cannot commit merge with missing files")) | ||
|
r10651 | ms = mergemod.mergestate(self) | ||
|
r22928 | for f in status.modified: | ||
|
r6888 | if f in ms and ms[f] == 'u': | ||
|
r23917 | raise util.Abort(_('unresolved merge conflicts ' | ||
'(see "hg help resolve")')) | ||||
|
r8496 | |||
if editor: | ||||
|
r8994 | cctx._text = editor(self, cctx, subs) | ||
|
r9935 | edited = (text != cctx._text) | ||
|
r8813 | |||
|
r20765 | # Save commit message in case this transaction gets rolled back | ||
# (e.g. by a pretxncommit hook). Leave the content alone on | ||||
# the assumption that the user will use the same editor again. | ||||
msgfn = self.savecommitmessage(cctx._text) | ||||
|
r16073 | # commit subs and write new state | ||
if subs: | ||||
for s in sorted(commitsubs): | ||||
|
r11112 | sub = wctx.sub(s) | ||
self.ui.status(_('committing subrepository %s\n') % | ||||
|
r12752 | subrepo.subrelpath(sub)) | ||
|
r11112 | sr = sub.commit(cctx._text, user, date) | ||
|
r16073 | newstate[s] = (newstate[s][0], sr) | ||
subrepo.writestate(self, newstate) | ||||
|
r8813 | |||
|
r10970 | p1, p2 = self.dirstate.parents() | ||
hookp1, hookp2 = hex(p1), (p2 != nullid and hex(p2) or '') | ||||
|
r9935 | try: | ||
|
r16683 | self.hook("precommit", throw=True, parent1=hookp1, | ||
parent2=hookp2) | ||||
|
r9935 | ret = self.commitctx(cctx, True) | ||
|
r16705 | except: # re-raises | ||
|
r9935 | if edited: | ||
self.ui.write( | ||||
_('note: commit message saved in %s\n') % msgfn) | ||||
raise | ||||
|
r8496 | |||
|
r13357 | # update bookmarks, dirstate and mergestate | ||
|
r16706 | bookmarks.update(self, [p1, p2], ret) | ||
|
r18661 | cctx.markcommitted(ret) | ||
|
r8503 | ms.reset() | ||
|
r6710 | finally: | ||
|
r8405 | wlock.release() | ||
|
r6710 | |||
|
r16680 | def commithook(node=hex(ret), parent1=hookp1, parent2=hookp2): | ||
|
r23129 | # hack for command that use a temporary commit (eg: histedit) | ||
# temporary commit got stripped before hook release | ||||
|
r24992 | if self.changelog.hasnode(ret): | ||
|
r23129 | self.hook("commit", node=node, parent1=parent1, | ||
parent2=parent2) | ||||
|
r16680 | self._afterlock(commithook) | ||
|
r10492 | return ret | ||
|
r18016 | @unfilteredmethod | ||
|
r8496 | def commitctx(self, ctx, error=False): | ||
|
r7077 | """Add a new revision to current repository. | ||
|
r8410 | Revision information is passed via the context argument. | ||
|
r7077 | """ | ||
|
r6715 | |||
|
r22908 | tr = None | ||
|
r8414 | p1, p2 = ctx.p1(), ctx.p2() | ||
|
r8412 | user = ctx.user() | ||
|
r1089 | |||
|
r8411 | lock = self.lock() | ||
try: | ||||
|
r10881 | tr = self.transaction("commit") | ||
|
r4970 | trp = weakref.proxy(tr) | ||
|
r1089 | |||
|
r14162 | if ctx.files(): | ||
|
r22909 | m1 = p1.manifest() | ||
|
r14162 | m2 = p2.manifest() | ||
|
r22909 | m = m1.copy() | ||
|
r14162 | |||
# check in files | ||||
|
r22910 | added = [] | ||
|
r14162 | changed = [] | ||
|
r22907 | removed = list(ctx.removed()) | ||
|
r14162 | linkrev = len(self) | ||
|
r23749 | self.ui.note(_("committing files:\n")) | ||
|
r14162 | for f in sorted(ctx.modified() + ctx.added()): | ||
self.ui.note(f + "\n") | ||||
try: | ||||
fctx = ctx[f] | ||||
|
r22296 | if fctx is None: | ||
removed.append(f) | ||||
else: | ||||
|
r22910 | added.append(f) | ||
m[f] = self._filecommit(fctx, m1, m2, linkrev, | ||||
trp, changed) | ||||
|
r22942 | m.setflag(f, fctx.flags()) | ||
|
r14162 | except OSError, inst: | ||
|
r4915 | self.ui.warn(_("trouble committing %s!\n") % f) | ||
raise | ||||
|
r14162 | except IOError, inst: | ||
errcode = getattr(inst, 'errno', errno.ENOENT) | ||||
if error or errcode and errcode != errno.ENOENT: | ||||
self.ui.warn(_("trouble committing %s!\n") % f) | ||||
|
r22296 | raise | ||
|
r1089 | |||
|
r14162 | # update manifest | ||
|
r23749 | self.ui.note(_("committing manifest\n")) | ||
|
r14162 | removed = [f for f in sorted(removed) if f in m1 or f in m2] | ||
|
r22909 | drop = [f for f in removed if f in m] | ||
|
r14162 | for f in drop: | ||
|
r22909 | del m[f] | ||
mn = self.manifest.add(m, trp, linkrev, | ||||
p1.manifestnode(), p2.manifestnode(), | ||||
|
r22910 | added, drop) | ||
|
r14162 | files = changed + removed | ||
else: | ||||
mn = p1.manifestnode() | ||||
files = [] | ||||
|
r1089 | |||
|
r8499 | # update changelog | ||
|
r23749 | self.ui.note(_("committing changelog\n")) | ||
|
r23203 | self.changelog.delayupdate(tr) | ||
|
r14162 | n = self.changelog.add(mn, files, ctx.description(), | ||
|
r8499 | trp, p1.node(), p2.node(), | ||
|
r8412 | user, ctx.date(), ctx.extra().copy()) | ||
|
r23203 | p = lambda: tr.writepending() and self.root or "" | ||
|
r10492 | xp1, xp2 = p1.hex(), p2 and p2.hex() or '' | ||
|
r4915 | self.hook('pretxncommit', throw=True, node=hex(n), parent1=xp1, | ||
|
r7787 | parent2=xp2, pending=p) | ||
|
r15706 | # set the new commit is proper phase | ||
|
r20176 | targetphase = subrepo.newcommitphase(self.ui, ctx) | ||
|
r15706 | if targetphase: | ||
# retract boundary do not alter parent changeset. | ||||
# if a parent have higher the resulting phase will | ||||
# be compliant anyway | ||||
# | ||||
# if minimal phase was 0 we don't need to retract anything | ||||
|
r22070 | phases.retractboundary(self, tr, targetphase, [n]) | ||
|
r4915 | tr.close() | ||
|
r18394 | branchmap.updatecache(self.filtered('served')) | ||
|
r4915 | return n | ||
finally: | ||||
|
r11230 | if tr: | ||
tr.release() | ||||
|
r8405 | lock.release() | ||
|
r1089 | |||
|
r18016 | @unfilteredmethod | ||
|
r18310 | def destroying(self): | ||
'''Inform the repository that nodes are about to be destroyed. | ||||
Intended for use by strip and rollback, so there's a common | ||||
place for anything that has to be done before destroying history. | ||||
This is mostly useful for saving state that is in memory and waiting | ||||
to be flushed when the current lock is released. Because a call to | ||||
destroyed is imminent, the repo will be invalidated causing those | ||||
changes to stay in memory (waiting for the next unlock), or vanish | ||||
completely. | ||||
''' | ||||
|
r18312 | # When using the same lock to commit and strip, the phasecache is left | ||
# dirty after committing. Then when we strip, the repo is invalidated, | ||||
# causing those changes to disappear. | ||||
if '_phasecache' in vars(self): | ||||
self._phasecache.write() | ||||
|
r18310 | @unfilteredmethod | ||
|
r18395 | def destroyed(self): | ||
|
r9150 | '''Inform the repository that nodes have been destroyed. | ||
Intended for use by strip and rollback, so there's a common | ||||
|
r17013 | place for anything that has to be done after destroying history. | ||
''' | ||||
|
r18221 | # When one tries to: | ||
# 1) destroy nodes thus calling this method (e.g. strip) | ||||
# 2) use phasecache somewhere (e.g. commit) | ||||
# | ||||
# then 2) will fail because the phasecache contains nodes that were | ||||
# removed. We can either remove phasecache from the filecache, | ||||
# causing it to reload next time it is accessed, or simply filter | ||||
# the removed nodes now and write the updated cache. | ||||
|
r18757 | self._phasecache.filterunknown(self) | ||
self._phasecache.write() | ||||
|
r18221 | |||
|
r18396 | # update the 'served' branch cache to help read only server process | ||
|
r18644 | # Thanks to branchcache collaboration this is done from the nearest | ||
|
r18396 | # filtered subset and it is expected to be fast. | ||
branchmap.updatecache(self.filtered('served')) | ||||
|
r18223 | |||
|
r9151 | # Ensure the persistent tag cache is updated. Doing it now | ||
# means that the tag cache only has to worry about destroyed | ||||
# heads immediately after a strip/rollback. That in turn | ||||
# guarantees that "cachetip == currenttip" (comparing both rev | ||||
# and node) always means no nodes have been added or destroyed. | ||||
# XXX this is suboptimal when qrefresh'ing: we strip the current | ||||
# head, refresh the tag cache, then immediately add a new head. | ||||
# But I think doing it this way is necessary for the "instant | ||||
# tag cache retrieval" case to work. | ||||
|
r18313 | self.invalidate() | ||
|
r17324 | |||
|
r6585 | def walk(self, match, node=None): | ||
|
r3532 | ''' | ||
walk recursively through the directory tree or a given | ||||
changeset, finding all files matched by the match | ||||
function | ||||
''' | ||||
|
r6764 | return self[node].walk(match) | ||
|
r3532 | |||
|
r6769 | def status(self, node1='.', node2=None, match=None, | ||
|
r12166 | ignored=False, clean=False, unknown=False, | ||
listsubrepos=False): | ||||
|
r21596 | '''a convenience method that calls node1.status(node2)''' | ||
return self[node1].status(node2, match, ignored, clean, unknown, | ||||
listsubrepos) | ||||
|
r2661 | |||
|
r8796 | def heads(self, start=None): | ||
|
r1550 | heads = self.changelog.heads(start) | ||
# sort the output in rev descending order | ||||
|
r13075 | return sorted(heads, key=self.changelog.rev, reverse=True) | ||
|
r1089 | |||
|
r8694 | def branchheads(self, branch=None, start=None, closed=False): | ||
|
r9475 | '''return a (possibly filtered) list of heads for the given branch | ||
Heads are returned in topological order, from newest to oldest. | ||||
If branch is None, use the dirstate branch. | ||||
If start is not None, return only heads reachable from start. | ||||
If closed is True, return heads that are marked as closed as well. | ||||
''' | ||||
|
r6747 | if branch is None: | ||
branch = self[None].branch() | ||||
|
r9675 | branches = self.branchmap() | ||
|
r4648 | if branch not in branches: | ||
return [] | ||||
|
r7654 | # the cache returns heads ordered lowest to highest | ||
|
r20189 | bheads = list(reversed(branches.branchheads(branch, closed=closed))) | ||
|
r4648 | if start is not None: | ||
|
r7654 | # filter out the heads that cannot be reached from startrev | ||
|
r9475 | fbheads = set(self.changelog.nodesbetween([start], bheads)[2]) | ||
bheads = [h for h in bheads if h in fbheads] | ||||
|
r7654 | return bheads | ||
|
r4648 | |||
|
r1089 | def branches(self, nodes): | ||
|
r1615 | if not nodes: | ||
nodes = [self.changelog.tip()] | ||||
|
r1089 | b = [] | ||
for n in nodes: | ||||
t = n | ||||
|
r14494 | while True: | ||
|
r1089 | p = self.changelog.parents(n) | ||
if p[1] != nullid or p[0] == nullid: | ||||
b.append((t, n, p[0], p[1])) | ||||
break | ||||
n = p[0] | ||||
return b | ||||
def between(self, pairs): | ||||
r = [] | ||||
for top, bottom in pairs: | ||||
n, l, i = top, [], 0 | ||||
f = 1 | ||||
|
r7708 | while n != bottom and n != nullid: | ||
|
r1089 | p = self.changelog.parents(n)[0] | ||
if i == f: | ||||
l.append(n) | ||||
f = f * 2 | ||||
n = p | ||||
i += 1 | ||||
r.append(l) | ||||
return r | ||||
|
r20924 | def checkpush(self, pushop): | ||
|
r13327 | """Extensions can override this function if additional checks have | ||
to be performed before pushing, or call it if they override push | ||||
command. | ||||
""" | ||||
pass | ||||
|
r21043 | @unfilteredpropertycache | ||
def prepushoutgoinghooks(self): | ||||
"""Return util.hooks consists of "(repo, remote, outgoing)" | ||||
functions, which are called before pushing changesets. | ||||
""" | ||||
return util.hooks() | ||||
|
r24917 | def stream_in(self, remote, remotereqs): | ||
|
r25237 | # Save remote branchmap. We will use it later | ||
# to speed up branchcache creation | ||||
rbranchmap = None | ||||
if remote.capable("branchmap"): | ||||
rbranchmap = remote.branchmap() | ||||
fp = remote.stream_out() | ||||
l = fp.readline() | ||||
try: | ||||
resp = int(l) | ||||
except ValueError: | ||||
raise error.ResponseError( | ||||
_('unexpected response from remote server:'), l) | ||||
if resp == 1: | ||||
raise util.Abort(_('operation forbidden by server')) | ||||
elif resp == 2: | ||||
raise util.Abort(_('locking the remote repository failed')) | ||||
elif resp != 0: | ||||
raise util.Abort(_('the server sent an unknown error code')) | ||||
self.applystreamclone(remotereqs, rbranchmap, fp) | ||||
return len(self.heads()) + 1 | ||||
def applystreamclone(self, remotereqs, remotebranchmap, fp): | ||||
"""Apply stream clone data to this repository. | ||||
"remotereqs" is a set of requirements to handle the incoming data. | ||||
"remotebranchmap" is the result of a branchmap lookup on the remote. It | ||||
can be None. | ||||
"fp" is a file object containing the raw stream data, suitable for | ||||
feeding into exchange.consumestreamclone. | ||||
""" | ||||
|
r13390 | lock = self.lock() | ||
|
r3564 | try: | ||
|
r25236 | exchange.consumestreamclone(self, fp) | ||
|
r12296 | |||
|
r16683 | # new requirements = old non-format requirements + | ||
|
r24917 | # new format-related remote requirements | ||
|
r13390 | # requirements from the streamed-in repository | ||
|
r24917 | self.requirements = remotereqs | ( | ||
|
r24916 | self.requirements - self.supportedformats) | ||
|
r24915 | self._applyopenerreqs() | ||
|
r13390 | self._writerequirements() | ||
|
r12296 | |||
|
r25237 | if remotebranchmap: | ||
|
r17740 | rbheads = [] | ||
|
r23126 | closed = [] | ||
|
r25237 | for bheads in remotebranchmap.itervalues(): | ||
|
r17740 | rbheads.extend(bheads) | ||
|
r23126 | for h in bheads: | ||
r = self.changelog.rev(h) | ||||
b, c = self.changelog.branchinfo(r) | ||||
if c: | ||||
closed.append(h) | ||||
|
r17740 | |||
if rbheads: | ||||
rtiprev = max((int(self.changelog.rev(node)) | ||||
for node in rbheads)) | ||||
|
r25237 | cache = branchmap.branchcache(remotebranchmap, | ||
|
r18126 | self[rtiprev].node(), | ||
|
r23126 | rtiprev, | ||
closednodes=closed) | ||||
|
r18397 | # Try to stick it as low as possible | ||
# filter above served are unlikely to be fetch from a clone | ||||
for candidate in ('base', 'immutable', 'served'): | ||||
rview = self.filtered(candidate) | ||||
if cache.validfor(rview): | ||||
self._branchcaches[candidate] = cache | ||||
cache.write(rview) | ||||
break | ||||
|
r13390 | self.invalidate() | ||
finally: | ||||
lock.release() | ||||
|
r1089 | |||
|
r23546 | def clone(self, remote, heads=[], stream=None): | ||
|
r2612 | '''clone remote repository. | ||
|
r1382 | |||
|
r2612 | keyword arguments: | ||
heads: list of revs to clone (forces use of pull) | ||||
|
r2621 | stream: use streaming clone if possible''' | ||
|
r1089 | |||
|
r2621 | # now, all clients that can request uncompressed clones can | ||
# read repo formats supported by all servers that can serve | ||||
# them. | ||||
|
r1089 | |||
|
r2612 | # if revlog format changes, client will have to check version | ||
|
r2621 | # and format flags on "stream" capability, and use | ||
# uncompressed only if compatible. | ||||
|
r1089 | |||
|
r23546 | if stream is None: | ||
|
r17427 | # if the server explicitly prefers to stream (for fast LANs) | ||
|
r16361 | stream = remote.capable('stream-preferred') | ||
|
r12296 | if stream and not heads: | ||
# 'stream' means remote revlog format is revlogv1 only | ||||
if remote.capable('stream'): | ||||
|
r23116 | self.stream_in(remote, set(('revlogv1',))) | ||
else: | ||||
# otherwise, 'streamreqs' contains the remote revlog format | ||||
streamreqs = remote.capable('streamreqs') | ||||
if streamreqs: | ||||
streamreqs = set(streamreqs.split(',')) | ||||
# if we support it, stream in and adjust our requirements | ||||
if not streamreqs - self.supportedformats: | ||||
self.stream_in(remote, streamreqs) | ||||
|
r22645 | |||
quiet = self.ui.backupconfig('ui', 'quietbookmarkmove') | ||||
try: | ||||
self.ui.setconfig('ui', 'quietbookmarkmove', True, 'clone') | ||||
|
r22696 | ret = exchange.pull(self, remote, heads).cgresult | ||
|
r22645 | finally: | ||
self.ui.restoreconfig(quiet) | ||||
return ret | ||||
|
r1806 | |||
|
r11368 | def pushkey(self, namespace, key, old, new): | ||
|
r23416 | try: | ||
|
r24824 | tr = self.currenttransaction() | ||
hookargs = {} | ||||
if tr is not None: | ||||
hookargs.update(tr.hookargs) | ||||
|
r24825 | pending = lambda: tr.writepending() and self.root or "" | ||
hookargs['pending'] = pending | ||||
|
r24824 | hookargs['namespace'] = namespace | ||
hookargs['key'] = key | ||||
hookargs['old'] = old | ||||
hookargs['new'] = new | ||||
self.hook('prepushkey', throw=True, **hookargs) | ||||
|
r23416 | except error.HookAbort, exc: | ||
self.ui.write_err(_("pushkey-abort: %s\n") % exc) | ||||
if exc.hint: | ||||
self.ui.write_err(_("(%s)\n") % exc.hint) | ||||
return False | ||||
|
r17293 | self.ui.debug('pushing key for "%s:%s"\n' % (namespace, key)) | ||
|
r14102 | ret = pushkey.push(self, namespace, key, old, new) | ||
|
r23648 | def runhook(): | ||
self.hook('pushkey', namespace=namespace, key=key, old=old, new=new, | ||||
ret=ret) | ||||
self._afterlock(runhook) | ||||
|
r14102 | return ret | ||
|
r11368 | |||
def listkeys(self, namespace): | ||||
|
r14102 | self.hook('prelistkeys', throw=True, namespace=namespace) | ||
|
r17293 | self.ui.debug('listing keys for "%s"\n' % namespace) | ||
|
r14102 | values = pushkey.list(self, namespace) | ||
self.hook('listkeys', namespace=namespace, values=values) | ||||
return values | ||||
|
r11368 | |||
|
r14048 | def debugwireargs(self, one, two, three=None, four=None, five=None): | ||
|
r13720 | '''used to test argument passing over the wire''' | ||
|
r14048 | return "%s %s %s %s %s" % (one, two, three, four, five) | ||
|
r11368 | |||
|
r14529 | def savecommitmessage(self, text): | ||
|
r23852 | fp = self.vfs('last-message.txt', 'wb') | ||
|
r14529 | try: | ||
fp.write(text) | ||||
finally: | ||||
fp.close() | ||||
|
r18054 | return self.pathto(fp.name[len(self.root) + 1:]) | ||
|
r14529 | |||
|
r1806 | # used to avoid circular references so destructors work | ||
|
r3790 | def aftertrans(files): | ||
renamefiles = [tuple(t) for t in files] | ||||
|
r1806 | def a(): | ||
|
r18952 | for vfs, src, dest in renamefiles: | ||
|
r16441 | try: | ||
|
r18952 | vfs.rename(src, dest) | ||
|
r16441 | except OSError: # journal file does not yet exist | ||
pass | ||||
|
r1806 | return a | ||
|
r14266 | def undoname(fn): | ||
base, name = os.path.split(fn) | ||||
assert name.startswith('journal') | ||||
return os.path.join(base, name.replace('journal', 'undo', 1)) | ||||
|
r2740 | def instance(ui, path, create): | ||
|
r14825 | return localrepository(ui, util.urllocalpath(path), create) | ||
|
r3223 | |||
|
r2740 | def islocal(path): | ||
return True | ||||