localrepo.py
2338 lines
| 89.4 KiB
| text/x-python
|
PythonLexer
/ mercurial / localrepo.py
mpm@selenic.com
|
r1089 | # localrepo.py - read/write repository class for mercurial | ||
# | ||||
Thomas Arendsen Hein
|
r4635 | # Copyright 2005-2007 Matt Mackall <mpm@selenic.com> | ||
mpm@selenic.com
|
r1089 | # | ||
Martin Geisler
|
r8225 | # This software may be used and distributed according to the terms of the | ||
Matt Mackall
|
r10263 | # GNU General Public License version 2 or any later version. | ||
Gregory Szorc
|
r27522 | |||
from __future__ import absolute_import | ||||
import errno | ||||
Augie Fackler
|
r29341 | import hashlib | ||
Gregory Szorc
|
r27522 | import inspect | ||
import os | ||||
import random | ||||
import time | ||||
import weakref | ||||
from .i18n import _ | ||||
from .node import ( | ||||
hex, | ||||
nullid, | ||||
short, | ||||
) | ||||
from . import ( | ||||
bookmarks, | ||||
branchmap, | ||||
bundle2, | ||||
changegroup, | ||||
changelog, | ||||
Pierre-Yves David
|
r31111 | color, | ||
Gregory Szorc
|
r27522 | context, | ||
dirstate, | ||||
Augie Fackler
|
r30492 | dirstateguard, | ||
Durham Goode
|
r34099 | discovery, | ||
Gregory Szorc
|
r27522 | encoding, | ||
error, | ||||
exchange, | ||||
extensions, | ||||
filelog, | ||||
hook, | ||||
lock as lockmod, | ||||
manifest, | ||||
match as matchmod, | ||||
merge as mergemod, | ||||
Augie Fackler
|
r30496 | mergeutil, | ||
Gregory Szorc
|
r27522 | namespaces, | ||
obsolete, | ||||
pathutil, | ||||
peer, | ||||
phases, | ||||
pushkey, | ||||
Augie Fackler
|
r31508 | pycompat, | ||
Gregory Szorc
|
r33802 | repository, | ||
Gregory Szorc
|
r27522 | repoview, | ||
revset, | ||||
Yuya Nishihara
|
r31024 | revsetlang, | ||
Gregory Szorc
|
r27522 | scmutil, | ||
Gregory Szorc
|
r33373 | sparse, | ||
Gregory Szorc
|
r27522 | store, | ||
subrepo, | ||||
tags as tagsmod, | ||||
transaction, | ||||
FUJIWARA Katsunori
|
r31054 | txnutil, | ||
Gregory Szorc
|
r27522 | util, | ||
Pierre-Yves David
|
r31231 | vfs as vfsmod, | ||
Gregory Szorc
|
r27522 | ) | ||
release = lockmod.release | ||||
timeless
|
r28883 | urlerr = util.urlerr | ||
urlreq = util.urlreq | ||||
Ronny Pfannschmidt
|
r8109 | |||
FUJIWARA Katsunori
|
r33277 | # set of (path, vfs-location) tuples. vfs-location is: | ||
# - 'plain for vfs relative paths | ||||
# - '' for svfs relative paths | ||||
_cachedfiles = set() | ||||
FUJIWARA Katsunori
|
r33173 | class _basefilecache(scmutil.filecache): | ||
Pierre-Yves David
|
r18014 | """All filecache usage on repo are done for logic that should be unfiltered | ||
""" | ||||
def __get__(self, repo, type=None): | ||||
Martijn Pieters
|
r29373 | if repo is None: | ||
return self | ||||
FUJIWARA Katsunori
|
r33173 | return super(_basefilecache, self).__get__(repo.unfiltered(), type) | ||
Pierre-Yves David
|
r18014 | def __set__(self, repo, value): | ||
FUJIWARA Katsunori
|
r33173 | return super(_basefilecache, self).__set__(repo.unfiltered(), value) | ||
Pierre-Yves David
|
r18014 | def __delete__(self, repo): | ||
FUJIWARA Katsunori
|
r33173 | return super(_basefilecache, self).__delete__(repo.unfiltered()) | ||
Pierre-Yves David
|
r18014 | |||
FUJIWARA Katsunori
|
r33173 | class repofilecache(_basefilecache): | ||
"""filecache for files in .hg but outside of .hg/store""" | ||||
FUJIWARA Katsunori
|
r33277 | def __init__(self, *paths): | ||
super(repofilecache, self).__init__(*paths) | ||||
for path in paths: | ||||
_cachedfiles.add((path, 'plain')) | ||||
FUJIWARA Katsunori
|
r33173 | def join(self, obj, fname): | ||
return obj.vfs.join(fname) | ||||
class storecache(_basefilecache): | ||||
Idan Kamara
|
r16198 | """filecache for files in the store""" | ||
FUJIWARA Katsunori
|
r33277 | def __init__(self, *paths): | ||
super(storecache, self).__init__(*paths) | ||||
for path in paths: | ||||
_cachedfiles.add((path, '')) | ||||
Idan Kamara
|
r16198 | def join(self, obj, fname): | ||
return obj.sjoin(fname) | ||||
FUJIWARA Katsunori
|
r33382 | def isfilecached(repo, name): | ||
"""check if a repo has already cached "name" filecache-ed property | ||||
This returns (cachedobj-or-None, iscached) tuple. | ||||
""" | ||||
cacheentry = repo.unfiltered()._filecache.get(name, None) | ||||
if not cacheentry: | ||||
return None, False | ||||
return cacheentry.obj, True | ||||
Augie Fackler
|
r29104 | class unfilteredpropertycache(util.propertycache): | ||
Pierre-Yves David
|
r18013 | """propertycache that apply to unfiltered repo only""" | ||
def __get__(self, repo, type=None): | ||||
Pierre-Yves David
|
r19846 | unfi = repo.unfiltered() | ||
if unfi is repo: | ||||
return super(unfilteredpropertycache, self).__get__(unfi) | ||||
return getattr(unfi, self.name) | ||||
Pierre-Yves David
|
r18013 | |||
Augie Fackler
|
r29104 | class filteredpropertycache(util.propertycache): | ||
Pierre-Yves David
|
r18013 | """propertycache that must take filtering in account""" | ||
def cachevalue(self, obj, value): | ||||
object.__setattr__(obj, self.name, value) | ||||
def hasunfilteredcache(repo, name): | ||||
Mads Kiilerich
|
r18644 | """check if a repo has an unfilteredpropertycache value for <name>""" | ||
Pierre-Yves David
|
r18013 | return name in vars(repo.unfiltered()) | ||
Pierre-Yves David
|
r18016 | def unfilteredmethod(orig): | ||
Pierre-Yves David
|
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 | ||||
Martin von Zweigbergk
|
r32291 | moderncaps = {'lookup', 'branchmap', 'pushkey', 'known', 'getbundle', | ||
'unbundle'} | ||||
legacycaps = moderncaps.union({'changegroupsubset'}) | ||||
Peter Arrenbrecht
|
r17192 | |||
Gregory Szorc
|
r33802 | class localpeer(repository.peer): | ||
Peter Arrenbrecht
|
r17192 | '''peer for a local repo; reflects only the most recent API''' | ||
Pierre-Yves David
|
r31412 | def __init__(self, repo, caps=None): | ||
Gregory Szorc
|
r33802 | super(localpeer, self).__init__() | ||
Pierre-Yves David
|
r31412 | if caps is None: | ||
caps = moderncaps.copy() | ||||
Kevin Bullock
|
r18382 | self._repo = repo.filtered('served') | ||
Gregory Szorc
|
r33802 | self._ui = repo.ui | ||
Peter Arrenbrecht
|
r17192 | self._caps = repo._restrictcapabilities(caps) | ||
Gregory Szorc
|
r33802 | # Begin of _basepeer interface. | ||
@util.propertycache | ||||
def ui(self): | ||||
return self._ui | ||||
def url(self): | ||||
return self._repo.url() | ||||
def local(self): | ||||
return self._repo | ||||
def peer(self): | ||||
return self | ||||
def canpush(self): | ||||
return True | ||||
Peter Arrenbrecht
|
r17192 | def close(self): | ||
self._repo.close() | ||||
Gregory Szorc
|
r33802 | # End of _basepeer interface. | ||
Peter Arrenbrecht
|
r17192 | |||
Gregory Szorc
|
r33802 | # Begin of _basewirecommands interface. | ||
Peter Arrenbrecht
|
r17192 | |||
def branchmap(self): | ||||
Pierre-Yves David
|
r18279 | return self._repo.branchmap() | ||
Peter Arrenbrecht
|
r17192 | |||
Gregory Szorc
|
r33802 | def capabilities(self): | ||
return self._caps | ||||
Peter Arrenbrecht
|
r17192 | |||
Gregory Szorc
|
r33802 | 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) | ||||
Peter Arrenbrecht
|
r17192 | |||
Pierre-Yves David
|
r20953 | def getbundle(self, source, heads=None, common=None, bundlecaps=None, | ||
Martin von Zweigbergk
|
r24639 | **kwargs): | ||
Gregory Szorc
|
r30187 | chunks = exchange.getbundlechunks(self._repo, source, heads=heads, | ||
common=common, bundlecaps=bundlecaps, | ||||
**kwargs) | ||||
cb = util.chunkbuffer(chunks) | ||||
Martin von Zweigbergk
|
r32149 | if exchange.bundle2requested(bundlecaps): | ||
Pierre-Yves David
|
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. | ||||
Gregory Szorc
|
r30187 | return bundle2.getunbundler(self.ui, cb) | ||
else: | ||||
return changegroup.getunbundler('01', cb, None) | ||||
Peter Arrenbrecht
|
r17192 | |||
Gregory Szorc
|
r33802 | def heads(self): | ||
return self._repo.heads() | ||||
def known(self, nodes): | ||||
return self._repo.known(nodes) | ||||
def listkeys(self, namespace): | ||||
return self._repo.listkeys(namespace) | ||||
def lookup(self, key): | ||||
return self._repo.lookup(key) | ||||
def pushkey(self, namespace, key, old, new): | ||||
return self._repo.pushkey(namespace, key, old, new) | ||||
def stream_out(self): | ||||
raise error.Abort(_('cannot perform stream clone against local ' | ||||
'peer')) | ||||
Peter Arrenbrecht
|
r17192 | |||
Pierre-Yves David
|
r20969 | def unbundle(self, cg, heads, url): | ||
"""apply a bundle on a repo | ||||
This function handles the repo locking itself.""" | ||||
try: | ||||
Pierre-Yves David
|
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 | ||||
Gregory Szorc
|
r25660 | except Exception as exc: | ||
Pierre-Yves David
|
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) | ||||
Pierre-Yves David
|
r24798 | raise | ||
Gregory Szorc
|
r25660 | except error.PushRaced as exc: | ||
Pierre-Yves David
|
r21186 | raise error.ResponseError(_('push failed:'), str(exc)) | ||
Pierre-Yves David
|
r20969 | |||
Gregory Szorc
|
r33802 | # End of _basewirecommands interface. | ||
Peter Arrenbrecht
|
r17192 | |||
Gregory Szorc
|
r33802 | # Begin of peer interface. | ||
Peter Arrenbrecht
|
r17192 | |||
Gregory Szorc
|
r33802 | def iterbatch(self): | ||
return peer.localiterbatcher(self) | ||||
Peter Arrenbrecht
|
r17192 | |||
Gregory Szorc
|
r33802 | # End of peer interface. | ||
class locallegacypeer(repository.legacypeer, localpeer): | ||||
Peter Arrenbrecht
|
r17192 | '''peer extension which implements legacy methods too; used for tests with | ||
restricted capabilities''' | ||||
def __init__(self, repo): | ||||
Gregory Szorc
|
r33802 | super(locallegacypeer, self).__init__(repo, caps=legacycaps) | ||
# Begin of baselegacywirecommands interface. | ||||
def between(self, pairs): | ||||
return self._repo.between(pairs) | ||||
Peter Arrenbrecht
|
r17192 | |||
def branches(self, nodes): | ||||
return self._repo.branches(nodes) | ||||
def changegroup(self, basenodes, source): | ||||
Durham Goode
|
r34102 | outgoing = discovery.outgoing(self._repo, missingroots=basenodes, | ||
missingheads=self._repo.heads()) | ||||
return changegroup.makechangegroup(self._repo, outgoing, '01', source) | ||||
Peter Arrenbrecht
|
r17192 | |||
def changegroupsubset(self, bases, heads, source): | ||||
Durham Goode
|
r34099 | outgoing = discovery.outgoing(self._repo, missingroots=bases, | ||
missingheads=heads) | ||||
return changegroup.makechangegroup(self._repo, outgoing, '01', source) | ||||
Peter Arrenbrecht
|
r17192 | |||
Gregory Szorc
|
r33802 | # End of baselegacywirecommands interface. | ||
Gregory Szorc
|
r32697 | # Increment the sub-version when the revlog v2 format changes to lock out old | ||
# clients. | ||||
REVLOGV2_REQUIREMENT = 'exp-revlogv2.0' | ||||
Peter Arrenbrecht
|
r17192 | class localrepository(object): | ||
Gregory Szorc
|
r32315 | supportedformats = { | ||
'revlogv1', | ||||
'generaldelta', | ||||
'treemanifest', | ||||
'manifestv2', | ||||
Gregory Szorc
|
r32697 | REVLOGV2_REQUIREMENT, | ||
Gregory Szorc
|
r32315 | } | ||
_basesupported = supportedformats | { | ||||
'store', | ||||
'fncache', | ||||
'shared', | ||||
'relshared', | ||||
'dotencode', | ||||
Gregory Szorc
|
r33556 | 'exp-sparse', | ||
Gregory Szorc
|
r32315 | } | ||
openerreqs = { | ||||
'revlogv1', | ||||
'generaldelta', | ||||
'treemanifest', | ||||
'manifestv2', | ||||
} | ||||
Bryan O'Sullivan
|
r17137 | |||
FUJIWARA Katsunori
|
r19928 | # a list of (ui, featureset) functions. | ||
# only functions defined in module of enabled extensions are invoked | ||||
FUJIWARA Katsunori
|
r19778 | featuresetupfuncs = set() | ||
Boris Feld
|
r33436 | # list of prefix for file which can be written without 'wlock' | ||
# Extensions should extend this list when needed | ||||
_wlockfreeprefix = { | ||||
# We migh consider requiring 'wlock' for the next | ||||
# two, but pretty much all the existing code assume | ||||
# wlock is not needed so we keep them excluded for | ||||
# now. | ||||
'hgrc', | ||||
'requires', | ||||
# XXX cache is a complicatged business someone | ||||
# should investigate this in depth at some point | ||||
'cache/', | ||||
# XXX shouldn't be dirstate covered by the wlock? | ||||
'dirstate', | ||||
# XXX bisect was still a bit too messy at the time | ||||
# this changeset was introduced. Someone should fix | ||||
# the remainig bit and drop this line | ||||
'bisect.state', | ||||
} | ||||
Pulkit Goyal
|
r30571 | def __init__(self, baseui, path, create=False): | ||
Drew Gottlieb
|
r24918 | self.requirements = set() | ||
Gregory Szorc
|
r32730 | self.filtername = None | ||
Ryan McElroy
|
r31536 | # wvfs: rooted at the repository root, used to access the working copy | ||
Pierre-Yves David
|
r31231 | self.wvfs = vfsmod.vfs(path, expandpath=True, realpath=True) | ||
Ryan McElroy
|
r31536 | # vfs: rooted at .hg, used to access repo files outside of .hg/store | ||
Pierre-Yves David
|
r31144 | self.vfs = None | ||
Ryan McElroy
|
r31536 | # svfs: usually rooted at .hg/store, used to access repository history | ||
# If this is a shared repository, this vfs may point to another | ||||
# repository's .hg/store directory. | ||||
Pierre-Yves David
|
r31144 | self.svfs = None | ||
FUJIWARA Katsunori
|
r17157 | self.root = self.wvfs.base | ||
FUJIWARA Katsunori
|
r17158 | self.path = self.wvfs.join(".hg") | ||
Benoit Boissinot
|
r3850 | self.origroot = path | ||
r33254 | # These auditor are not used by the vfs, | |||
# only used when writing this comment: basectx.match | ||||
Augie Fackler
|
r20033 | self.auditor = pathutil.pathauditor(self.root, self._checknested) | ||
Pierre-Yves David
|
r27233 | self.nofsauditor = pathutil.pathauditor(self.root, self._checknested, | ||
Yuya Nishihara
|
r33722 | realfs=False, cached=True) | ||
Matt Mackall
|
r8797 | self.baseui = baseui | ||
self.ui = baseui.copy() | ||||
Simon Heimberg
|
r20082 | self.ui.copy = baseui.copy # prevent copying repo configuration | ||
Yuya Nishihara
|
r33722 | self.vfs = vfsmod.vfs(self.path, cacheaudited=True) | ||
Boris Feld
|
r33436 | if (self.ui.configbool('devel', 'all-warnings') or | ||
self.ui.configbool('devel', 'check-locks')): | ||||
self.vfs.audit = self._getvfsward(self.vfs.audit) | ||||
Pierre-Yves David
|
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 = [] | ||||
Matt Mackall
|
r8797 | try: | ||
Pierre-Yves David
|
r31319 | self.ui.readconfig(self.vfs.join("hgrc"), self.root) | ||
Jun Wu
|
r30989 | self._loadextensions() | ||
Matt Mackall
|
r8797 | except IOError: | ||
pass | ||||
mpm@selenic.com
|
r1089 | |||
FUJIWARA Katsunori
|
r19778 | if self.featuresetupfuncs: | ||
self.supported = set(self._basesupported) # use private copy | ||||
FUJIWARA Katsunori
|
r19928 | extmods = set(m.__name__ for n, m | ||
in extensions.extensions(self.ui)) | ||||
FUJIWARA Katsunori
|
r19778 | for setupfunc in self.featuresetupfuncs: | ||
FUJIWARA Katsunori
|
r19928 | if setupfunc.__module__ in extmods: | ||
setupfunc(self.ui, self.supported) | ||||
FUJIWARA Katsunori
|
r19778 | else: | ||
self.supported = self._basesupported | ||||
Pierre-Yves David
|
r31111 | color.setup(self.ui) | ||
FUJIWARA Katsunori
|
r19778 | |||
Gregory Szorc
|
r30818 | # Add compression engines. | ||
for name in util.compengines: | ||||
engine = util.compengines[name] | ||||
if engine.revlogheader(): | ||||
self.supported.add('exp-compression-%s' % name) | ||||
FUJIWARA Katsunori
|
r17161 | if not self.vfs.isdir(): | ||
Benoit Boissinot
|
r3035 | if create: | ||
Gregory Szorc
|
r28164 | self.requirements = newreporequirements(self) | ||
Gregory Szorc
|
r28163 | |||
if not self.wvfs.exists(): | ||||
self.wvfs.makedirs() | ||||
self.vfs.makedir(notindexed=True) | ||||
Gregory Szorc
|
r28164 | if 'store' in self.requirements: | ||
Gregory Szorc
|
r28163 | self.vfs.mkdir("store") | ||
# create an invalid changelog | ||||
self.vfs.append( | ||||
"00changelog.i", | ||||
'\0\0\0\2' # represents revlogv2 | ||||
' dummy changelog to prevent using the old repo layout' | ||||
) | ||||
Benoit Boissinot
|
r3035 | else: | ||
Matt Mackall
|
r7637 | raise error.RepoError(_("repository %s not found") % path) | ||
Benoit Boissinot
|
r3035 | elif create: | ||
Matt Mackall
|
r7637 | raise error.RepoError(_("repository %s already exists") % path) | ||
Benoit Boissinot
|
r3851 | else: | ||
try: | ||||
Drew Gottlieb
|
r24918 | self.requirements = scmutil.readrequires( | ||
self.vfs, self.supported) | ||||
Gregory Szorc
|
r25660 | except IOError as inst: | ||
Benoit Boissinot
|
r3851 | if inst.errno != errno.ENOENT: | ||
raise | ||||
mpm@selenic.com
|
r1089 | |||
Boris Feld
|
r33539 | cachepath = self.vfs.join('cache') | ||
Matt Mackall
|
r8799 | self.sharedpath = self.path | ||
try: | ||||
Dan Villiom Podlaski Christiansen
|
r31133 | sharedpath = self.vfs.read("sharedpath").rstrip('\n') | ||
if 'relshared' in self.requirements: | ||||
sharedpath = self.vfs.join(sharedpath) | ||||
Pierre-Yves David
|
r31231 | vfs = vfsmod.vfs(sharedpath, realpath=True) | ||
Boris Feld
|
r33539 | cachepath = vfs.join('cache') | ||
FUJIWARA Katsunori
|
r18946 | s = vfs.base | ||
if not vfs.exists(): | ||||
Matt Mackall
|
r8799 | raise error.RepoError( | ||
Dongsheng Song
|
r8908 | _('.hg/sharedpath points to nonexistent directory %s') % s) | ||
Matt Mackall
|
r8799 | self.sharedpath = s | ||
Gregory Szorc
|
r25660 | except IOError as inst: | ||
Matt Mackall
|
r8799 | if inst.errno != errno.ENOENT: | ||
raise | ||||
Gregory Szorc
|
r33556 | if 'exp-sparse' in self.requirements and not sparse.enabled: | ||
raise error.RepoError(_('repository is using sparse feature but ' | ||||
'sparse is not enabled; enable the ' | ||||
'"sparse" extensions to access')) | ||||
Drew Gottlieb
|
r24918 | self.store = store.store( | ||
Yuya Nishihara
|
r33722 | self.requirements, self.sharedpath, | ||
lambda base: vfsmod.vfs(base, cacheaudited=True)) | ||||
Adrian Buehlmann
|
r6840 | self.spath = self.store.path | ||
FUJIWARA Katsunori
|
r17654 | self.svfs = self.store.vfs | ||
Adrian Buehlmann
|
r6840 | self.sjoin = self.store.join | ||
FUJIWARA Katsunori
|
r17654 | self.vfs.createmode = self.store.createmode | ||
Yuya Nishihara
|
r33722 | self.cachevfs = vfsmod.vfs(cachepath, cacheaudited=True) | ||
Boris Feld
|
r33533 | self.cachevfs.createmode = self.store.createmode | ||
Boris Feld
|
r33437 | if (self.ui.configbool('devel', 'all-warnings') or | ||
self.ui.configbool('devel', 'check-locks')): | ||||
if util.safehasattr(self.svfs, 'vfs'): # this is filtervfs | ||||
self.svfs.vfs.audit = self._getsvfsward(self.svfs.vfs.audit) | ||||
else: # standard vfs | ||||
self.svfs.audit = self._getsvfsward(self.svfs.audit) | ||||
Drew Gottlieb
|
r24915 | self._applyopenerreqs() | ||
Sune Foldager
|
r12295 | if create: | ||
self._writerequirements() | ||||
Benoit Boissinot
|
r3850 | |||
Siddharth Agarwal
|
r26155 | self._dirstatevalidatewarned = False | ||
Greg Ward
|
r9146 | |||
Pierre-Yves David
|
r18189 | self._branchcaches = {} | ||
Durham Goode
|
r24373 | self._revbranchcache = None | ||
Matt Mackall
|
r4004 | self.filterpats = {} | ||
Patrick Mezard
|
r5966 | self._datafilters = {} | ||
Matt Mackall
|
r4916 | self._transref = self._lockref = self._wlockref = None | ||
mpm@selenic.com
|
r1089 | |||
Idan Kamara
|
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 = {} | ||||
Pierre-Yves David
|
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 = {} | ||||
Siddharth Agarwal
|
r32814 | # post-dirstate-status hooks | ||
self._postdsstatus = [] | ||||
Gregory Szorc
|
r33389 | # Cache of types representing filtered repos. | ||
self._filteredrepotypes = weakref.WeakKeyDictionary() | ||||
Sean Farley
|
r23558 | # generic mapping between names and nodes | ||
Ryan McElroy
|
r23561 | self.names = namespaces.namespaces() | ||
Sean Farley
|
r23558 | |||
Gregory Szorc
|
r33302 | # Key to signature value. | ||
self._sparsesignaturecache = {} | ||||
# Signature to cached matcher instance. | ||||
self._sparsematchercache = {} | ||||
Boris Feld
|
r33436 | def _getvfsward(self, origfunc): | ||
"""build a ward for self.vfs""" | ||||
rref = weakref.ref(self) | ||||
def checkvfs(path, mode=None): | ||||
ret = origfunc(path, mode=mode) | ||||
repo = rref() | ||||
if (repo is None | ||||
or not util.safehasattr(repo, '_wlockref') | ||||
or not util.safehasattr(repo, '_lockref')): | ||||
return | ||||
if mode in (None, 'r', 'rb'): | ||||
return | ||||
if path.startswith(repo.path): | ||||
# truncate name relative to the repository (.hg) | ||||
path = path[len(repo.path) + 1:] | ||||
Boris Feld
|
r33538 | if path.startswith('cache/'): | ||
msg = 'accessing cache with vfs instead of cachevfs: "%s"' | ||||
repo.ui.develwarn(msg % path, stacklevel=2, config="cache-vfs") | ||||
Boris Feld
|
r33436 | if path.startswith('journal.'): | ||
# journal is covered by 'lock' | ||||
if repo._currentlock(repo._lockref) is None: | ||||
repo.ui.develwarn('write with no lock: "%s"' % path, | ||||
Boris Feld
|
r33532 | stacklevel=2, config='check-locks') | ||
Boris Feld
|
r33436 | elif repo._currentlock(repo._wlockref) is None: | ||
# rest of vfs files are covered by 'wlock' | ||||
# | ||||
# exclude special files | ||||
for prefix in self._wlockfreeprefix: | ||||
if path.startswith(prefix): | ||||
return | ||||
repo.ui.develwarn('write with no wlock: "%s"' % path, | ||||
Boris Feld
|
r33532 | stacklevel=2, config='check-locks') | ||
Boris Feld
|
r33436 | return ret | ||
return checkvfs | ||||
Boris Feld
|
r33437 | def _getsvfsward(self, origfunc): | ||
"""build a ward for self.svfs""" | ||||
rref = weakref.ref(self) | ||||
def checksvfs(path, mode=None): | ||||
ret = origfunc(path, mode=mode) | ||||
repo = rref() | ||||
if repo is None or not util.safehasattr(repo, '_lockref'): | ||||
return | ||||
if mode in (None, 'r', 'rb'): | ||||
return | ||||
if path.startswith(repo.sharedpath): | ||||
# truncate name relative to the repository (.hg) | ||||
path = path[len(repo.sharedpath) + 1:] | ||||
if repo._currentlock(repo._lockref) is None: | ||||
repo.ui.develwarn('write with no lock: "%s"' % path, | ||||
stacklevel=3) | ||||
return ret | ||||
return checksvfs | ||||
Peter Arrenbrecht
|
r17192 | def close(self): | ||
Durham Goode
|
r24378 | self._writecaches() | ||
Jun Wu
|
r30989 | def _loadextensions(self): | ||
extensions.loadall(self.ui) | ||||
Durham Goode
|
r24378 | def _writecaches(self): | ||
if self._revbranchcache: | ||||
self._revbranchcache.write() | ||||
Peter Arrenbrecht
|
r17192 | |||
def _restrictcapabilities(self, caps): | ||||
Jun Wu
|
r33499 | if self.ui.configbool('experimental', 'bundle2-advertise'): | ||
Pierre-Yves David
|
r20955 | caps = set(caps) | ||
Pierre-Yves David
|
r22342 | capsblob = bundle2.encodecaps(bundle2.getrepocaps(self)) | ||
timeless
|
r28883 | caps.add('bundle2=' + urlreq.quote(capsblob)) | ||
Peter Arrenbrecht
|
r17192 | return caps | ||
Drew Gottlieb
|
r24915 | def _applyopenerreqs(self): | ||
self.svfs.options = dict((r, 1) for r in self.requirements | ||||
Bryan O'Sullivan
|
r17137 | if r in self.openerreqs) | ||
Matt Mackall
|
r25839 | # experimental config: format.chunkcachesize | ||
Brodie Rao
|
r20180 | chunkcachesize = self.ui.configint('format', 'chunkcachesize') | ||
if chunkcachesize is not None: | ||||
Angel Ezquerra
|
r23853 | self.svfs.options['chunkcachesize'] = chunkcachesize | ||
Matt Mackall
|
r25839 | # experimental config: format.maxchainlen | ||
Augie Fackler
|
r23256 | maxchainlen = self.ui.configint('format', 'maxchainlen') | ||
Mateusz Kwapich
|
r23255 | if maxchainlen is not None: | ||
Angel Ezquerra
|
r23853 | self.svfs.options['maxchainlen'] = maxchainlen | ||
Matt Mackall
|
r25839 | # experimental config: format.manifestcachesize | ||
Durham Goode
|
r24033 | manifestcachesize = self.ui.configint('format', 'manifestcachesize') | ||
if manifestcachesize is not None: | ||||
self.svfs.options['manifestcachesize'] = manifestcachesize | ||||
Durham Goode
|
r26118 | # experimental config: format.aggressivemergedeltas | ||
aggressivemergedeltas = self.ui.configbool('format', | ||||
r33232 | 'aggressivemergedeltas') | |||
Durham Goode
|
r26118 | self.svfs.options['aggressivemergedeltas'] = aggressivemergedeltas | ||
Pierre-Yves David
|
r26907 | self.svfs.options['lazydeltabase'] = not scmutil.gddeltaconfig(self.ui) | ||
Boris Feld
|
r34520 | chainspan = self.ui.configbytes('experimental', 'maxdeltachainspan') | ||
r33202 | if 0 <= chainspan: | |||
self.svfs.options['maxdeltachainspan'] = chainspan | ||||
Mark Thomas
|
r34297 | mmapindexthreshold = self.ui.configbytes('experimental', | ||
Boris Feld
|
r34521 | 'mmapindexthreshold') | ||
Mark Thomas
|
r34297 | if mmapindexthreshold is not None: | ||
self.svfs.options['mmapindexthreshold'] = mmapindexthreshold | ||||
Sune Foldager
|
r12295 | |||
Gregory Szorc
|
r30818 | for r in self.requirements: | ||
if r.startswith('exp-compression-'): | ||||
self.svfs.options['compengine'] = r[len('exp-compression-'):] | ||||
Gregory Szorc
|
r32697 | # TODO move "revlogv2" to openerreqs once finalized. | ||
if REVLOGV2_REQUIREMENT in self.requirements: | ||||
self.svfs.options['revlogv2'] = True | ||||
Sune Foldager
|
r12295 | def _writerequirements(self): | ||
Drew Gottlieb
|
r24934 | scmutil.writerequires(self.vfs, self.requirements) | ||
Sune Foldager
|
r12295 | |||
Martin Geisler
|
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:] | ||||
FUJIWARA Katsunori
|
r15722 | normsubpath = util.pconvert(subpath) | ||
Martin Geisler
|
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/. | ||||
# | ||||
Martin Geisler
|
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] | ||||
Martin Geisler
|
r12162 | parts = util.splitpath(subpath) | ||
while parts: | ||||
FUJIWARA Katsunori
|
r15722 | prefix = '/'.join(parts) | ||
Martin Geisler
|
r12162 | if prefix in ctx.substate: | ||
FUJIWARA Katsunori
|
r15722 | if prefix == normsubpath: | ||
Martin Geisler
|
r12162 | return True | ||
else: | ||||
sub = ctx.sub(prefix) | ||||
return sub.checknested(subpath[len(prefix) + 1:]) | ||||
else: | ||||
parts.pop() | ||||
return False | ||||
Peter Arrenbrecht
|
r17192 | def peer(self): | ||
return localpeer(self) # not cached to avoid reference cycle | ||||
Pierre-Yves David
|
r17993 | def unfiltered(self): | ||
"""Return unfiltered version of the repository | ||||
Mads Kiilerich
|
r18644 | Intended to be overwritten by filtered repo.""" | ||
Pierre-Yves David
|
r17993 | return self | ||
Pierre-Yves David
|
r18100 | def filtered(self, name): | ||
"""Return a filtered version of a repository""" | ||||
Gregory Szorc
|
r33389 | # Python <3.4 easily leaks types via __mro__. See | ||
# https://bugs.python.org/issue17950. We cache dynamically | ||||
# created types so this method doesn't leak on every | ||||
# invocation. | ||||
key = self.unfiltered().__class__ | ||||
if key not in self._filteredrepotypes: | ||||
# Build a new type with the repoview mixin and the base | ||||
# class of this repo. Give it a name containing the | ||||
# filter name to aid debugging. | ||||
bases = (repoview.repoview, key) | ||||
Martin von Zweigbergk
|
r33403 | cls = type(r'%sfilteredrepo' % name, bases, {}) | ||
Gregory Szorc
|
r33389 | self._filteredrepotypes[key] = cls | ||
return self._filteredrepotypes[key](self, name) | ||||
Pierre-Yves David
|
r18100 | |||
Augie Fackler
|
r27698 | @repofilecache('bookmarks', 'bookmarks.current') | ||
Matt Mackall
|
r13355 | def _bookmarks(self): | ||
Augie Fackler
|
r17922 | return bookmarks.bmstore(self) | ||
Matt Mackall
|
r13355 | |||
Augie Fackler
|
r27698 | @property | ||
Ryan McElroy
|
r24947 | def _activebookmark(self): | ||
Augie Fackler
|
r27698 | return self._bookmarks.active | ||
Martin Geisler
|
r12162 | |||
Yuya Nishihara
|
r26405 | # _phaserevs and _phasesets depend on changelog. what we need is to | ||
# call _phasecache.invalidate() if '00changelog.i' was changed, but it | ||||
# can't be easily expressed in filecache mechanism. | ||||
@storecache('phaseroots', '00changelog.i') | ||||
Patrick Mezard
|
r16657 | def _phasecache(self): | ||
return phases.phasecache(self, self._phasedefaults) | ||||
Pierre-Yves David
|
r15420 | |||
Pierre-Yves.David@ens-lyon.org
|
r17070 | @storecache('obsstore') | ||
def obsstore(self): | ||||
Gregory Szorc
|
r32729 | return obsolete.makestore(self.ui, self) | ||
Pierre-Yves.David@ens-lyon.org
|
r17070 | |||
Idan Kamara
|
r16198 | @storecache('00changelog.i') | ||
Matt Mackall
|
r8260 | def changelog(self): | ||
Gregory Szorc
|
r32292 | return changelog.changelog(self.svfs, | ||
trypending=txnutil.mayhavepending(self.root)) | ||||
Matt Mackall
|
r8260 | |||
Durham Goode
|
r30218 | def _constructmanifest(self): | ||
# This is a temporary function while we migrate from manifest to | ||||
# manifestlog. It allows bundlerepo and unionrepo to intercept the | ||||
# manifest creation. | ||||
Durham Goode
|
r30377 | return manifest.manifestrevlog(self.svfs) | ||
Matt Mackall
|
r8260 | |||
Durham Goode
|
r30219 | @storecache('00manifest.i') | ||
Durham Goode
|
r29825 | def manifestlog(self): | ||
Durham Goode
|
r29826 | return manifest.manifestlog(self.svfs, self) | ||
Durham Goode
|
r29825 | |||
Pierre-Yves David
|
r18014 | @repofilecache('dirstate') | ||
Matt Mackall
|
r8260 | def dirstate(self): | ||
Gregory Szorc
|
r33373 | sparsematchfn = lambda: sparse.matcher(self) | ||
Siddharth Agarwal
|
r26155 | return dirstate.dirstate(self.vfs, self.ui, self.root, | ||
Gregory Szorc
|
r33373 | self._dirstatevalidate, sparsematchfn) | ||
Matt Mackall
|
r13032 | |||
Siddharth Agarwal
|
r26155 | def _dirstatevalidate(self, node): | ||
try: | ||||
self.changelog.rev(node) | ||||
return node | ||||
except error.LookupError: | ||||
if not self._dirstatevalidatewarned: | ||||
self._dirstatevalidatewarned = True | ||||
self.ui.warn(_("warning: ignoring unknown" | ||||
" working parent %s!\n") % short(node)) | ||||
return nullid | ||||
Vadim Gelfer
|
r2155 | |||
Matt Mackall
|
r6747 | def __getitem__(self, changeid): | ||
Yuya Nishihara
|
r32658 | if changeid is None: | ||
Matt Mackall
|
r6747 | return context.workingctx(self) | ||
Eric Sumner
|
r23630 | if isinstance(changeid, slice): | ||
Yuya Nishihara
|
r32658 | # wdirrev isn't contiguous so the slice shouldn't include it | ||
Eric Sumner
|
r23630 | return [context.changectx(self, i) | ||
for i in xrange(*changeid.indices(len(self))) | ||||
if i not in self.changelog.filteredrevs] | ||||
Yuya Nishihara
|
r32658 | try: | ||
return context.changectx(self, changeid) | ||||
except error.WdirUnsupported: | ||||
return context.workingctx(self) | ||||
Matt Mackall
|
r6747 | |||
Alexander Solovyov
|
r9924 | def __contains__(self, changeid): | ||
Yuya Nishihara
|
r32481 | """True if the given changeid exists | ||
error.LookupError is raised if an ambiguous node specified. | ||||
""" | ||||
Alexander Solovyov
|
r9924 | try: | ||
Yuya Nishihara
|
r24320 | self[changeid] | ||
return True | ||||
Alexander Solovyov
|
r9924 | except error.RepoLookupError: | ||
return False | ||||
Matt Mackall
|
r6750 | def __nonzero__(self): | ||
return True | ||||
Gregory Szorc
|
r31476 | __bool__ = __nonzero__ | ||
Matt Mackall
|
r6750 | def __len__(self): | ||
return len(self.changelog) | ||||
def __iter__(self): | ||||
Pierre-Yves David
|
r17675 | return iter(self.changelog) | ||
Vadim Gelfer
|
r2155 | |||
Matt Mackall
|
r15403 | def revs(self, expr, *args): | ||
Gregory Szorc
|
r27071 | '''Find revisions matching a revset. | ||
The revset is specified as a string ``expr`` that may contain | ||||
Yuya Nishihara
|
r31024 | %-formatting to escape certain types. See ``revsetlang.formatspec``. | ||
Gregory Szorc
|
r27071 | |||
Gregory Szorc
|
r29417 | Revset aliases from the configuration are not expanded. To expand | ||
Yuya Nishihara
|
r31025 | user aliases, consider calling ``scmutil.revrange()`` or | ||
``repo.anyrevs([expr], user=True)``. | ||||
Gregory Szorc
|
r29417 | |||
Returns a revset.abstractsmartset, which is a list-like interface | ||||
Gregory Szorc
|
r27071 | that contains integer revisions. | ||
''' | ||||
Yuya Nishihara
|
r31024 | expr = revsetlang.formatspec(expr, *args) | ||
Matt Mackall
|
r15403 | m = revset.match(None, expr) | ||
Yuya Nishihara
|
r24114 | return m(self) | ||
Matt Mackall
|
r15403 | |||
Matt Mackall
|
r14902 | def set(self, expr, *args): | ||
Gregory Szorc
|
r27071 | '''Find revisions matching a revset and emit changectx instances. | ||
This is a convenience wrapper around ``revs()`` that iterates the | ||||
result and is a generator of changectx instances. | ||||
Gregory Szorc
|
r29417 | |||
Revset aliases from the configuration are not expanded. To expand | ||||
user aliases, consider calling ``scmutil.revrange()``. | ||||
Matt Mackall
|
r14902 | ''' | ||
Matt Mackall
|
r15403 | for r in self.revs(expr, *args): | ||
Matt Mackall
|
r14902 | yield self[r] | ||
Jun Wu
|
r33336 | def anyrevs(self, specs, user=False, localalias=None): | ||
Yuya Nishihara
|
r31025 | '''Find revisions matching one of the given revsets. | ||
Revset aliases from the configuration are not expanded by default. To | ||||
Jun Wu
|
r33336 | expand user aliases, specify ``user=True``. To provide some local | ||
definitions overriding user aliases, set ``localalias`` to | ||||
``{name: definitionstring}``. | ||||
Yuya Nishihara
|
r31025 | ''' | ||
if user: | ||||
Jun Wu
|
r33336 | m = revset.matchany(self.ui, specs, repo=self, | ||
localalias=localalias) | ||||
Yuya Nishihara
|
r31025 | else: | ||
Jun Wu
|
r33336 | m = revset.matchany(None, specs, localalias=localalias) | ||
Yuya Nishihara
|
r31025 | return m(self) | ||
Vadim Gelfer
|
r2673 | def url(self): | ||
return 'file:' + self.root | ||||
Vadim Gelfer
|
r1718 | def hook(self, name, throw=False, **args): | ||
Gregory Szorc
|
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. | ||||
""" | ||||
Matt Mackall
|
r4622 | return hook.hook(self.ui, self, name, throw, **args) | ||
mpm@selenic.com
|
r1089 | |||
Pierre-Yves David
|
r18013 | @filteredpropertycache | ||
Idan Kamara
|
r14936 | def _tagscache(self): | ||
Brodie Rao
|
r16683 | '''Returns a tagscache object that contains various tags related | ||
caches.''' | ||||
Idan Kamara
|
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 | ||||
mpm@selenic.com
|
r1089 | def tags(self): | ||
'''return a mapping of tag to node''' | ||||
Matt Mackall
|
r16371 | t = {} | ||
Pierre-Yves David
|
r17715 | if self.changelog.filteredrevs: | ||
tags, tt = self._findtags() | ||||
else: | ||||
tags = self._tagscache.tags | ||||
for k, v in tags.iteritems(): | ||||
Matt Mackall
|
r16371 | try: | ||
# ignore tags to unknown nodes | ||||
self.changelog.rev(v) | ||||
t[k] = v | ||||
Bryan O'Sullivan
|
r16679 | except (error.LookupError, ValueError): | ||
Matt Mackall
|
r16371 | pass | ||
return t | ||||
Matt Mackall
|
r4210 | |||
Greg Ward
|
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? | ||||
Matt Mackall
|
r4210 | |||
mpm@selenic.com
|
r1089 | |||
Pierre-Yves David
|
r31709 | # map tag name to (node, hist) | ||
alltags = tagsmod.findglobaltags(self.ui, self) | ||||
# map tag name to tag type | ||||
tagtypes = dict((tag, 'global') for tag in alltags) | ||||
Pierre-Yves David
|
r31706 | |||
Benoit Boissinot
|
r10651 | tagsmod.readlocaltags(self.ui, self, alltags, tagtypes) | ||
Osku Salerma
|
r5657 | |||
Greg Ward
|
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. | ||||
Greg Ward
|
r9145 | tags = {} | ||
Greg Ward
|
r9147 | for (name, (node, hist)) in alltags.iteritems(): | ||
if node != nullid: | ||||
Matt Mackall
|
r16371 | tags[encoding.tolocal(name)] = node | ||
Greg Ward
|
r9145 | tags['tip'] = self.changelog.tip() | ||
Greg Ward
|
r9152 | tagtypes = dict([(encoding.tolocal(name), value) | ||
for (name, value) in tagtypes.iteritems()]) | ||||
Greg Ward
|
r9145 | return (tags, tagtypes) | ||
mpm@selenic.com
|
r1089 | |||
Osku Salerma
|
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 | ||||
''' | ||||
Idan Kamara
|
r14936 | return self._tagscache.tagtypes.get(tagname) | ||
Osku Salerma
|
r5657 | |||
mpm@selenic.com
|
r1089 | def tagslist(self): | ||
'''return a list of tags ordered by revision''' | ||||
Idan Kamara
|
r14936 | if not self._tagscache.tagslist: | ||
l = [] | ||||
for t, n in self.tags().iteritems(): | ||||
Mads Kiilerich
|
r22201 | l.append((self.changelog.rev(n), t, n)) | ||
Idan Kamara
|
r14936 | self._tagscache.tagslist = [(t, n) for r, t, n in sorted(l)] | ||
return self._tagscache.tagslist | ||||
mpm@selenic.com
|
r1089 | |||
def nodetags(self, node): | ||||
'''return the tags associated with a node''' | ||||
Idan Kamara
|
r14936 | if not self._tagscache.nodetagscache: | ||
nodetagscache = {} | ||||
Matt Mackall
|
r16371 | for t, n in self._tagscache.tags.iteritems(): | ||
Idan Kamara
|
r14936 | nodetagscache.setdefault(n, []).append(t) | ||
for tags in nodetagscache.itervalues(): | ||||
Eric Eisner
|
r11047 | tags.sort() | ||
Idan Kamara
|
r14936 | self._tagscache.nodetagscache = nodetagscache | ||
return self._tagscache.nodetagscache.get(node, []) | ||||
mpm@selenic.com
|
r1089 | |||
David Soria Parra
|
r13384 | def nodebookmarks(self, node): | ||
Augie Fackler
|
r27166 | """return the list of bookmarks pointing to the specified node""" | ||
David Soria Parra
|
r13384 | marks = [] | ||
for bookmark, n in self._bookmarks.iteritems(): | ||||
if n == node: | ||||
marks.append(bookmark) | ||||
return sorted(marks) | ||||
Georg Brandl
|
r12066 | def branchmap(self): | ||
Mads Kiilerich
|
r20245 | '''returns a dictionary {branch: [branchheads]} with branchheads | ||
ordered by increasing revision number''' | ||||
Pierre-Yves David
|
r18189 | branchmap.updatecache(self) | ||
return self._branchcaches[self.filtername] | ||||
Pierre-Yves David
|
r17714 | |||
Durham Goode
|
r24373 | @unfilteredmethod | ||
def revbranchcache(self): | ||||
if not self._revbranchcache: | ||||
self._revbranchcache = branchmap.revbranchcache(self.unfiltered()) | ||||
return self._revbranchcache | ||||
Sean Farley
|
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). | ||||
''' | ||||
Brodie Rao
|
r20187 | try: | ||
return self.branchmap().branchtip(branch) | ||||
except KeyError: | ||||
Sean Farley
|
r23775 | if not ignoremissing: | ||
raise error.RepoLookupError(_("unknown branch '%s'") % branch) | ||||
else: | ||||
pass | ||||
Brodie Rao
|
r16719 | |||
mpm@selenic.com
|
r1089 | def lookup(self, key): | ||
Matt Mackall
|
r16378 | return self[key].node() | ||
mpm@selenic.com
|
r1089 | |||
Steve Losh
|
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() | ||||
Peter Arrenbrecht
|
r13723 | def known(self, nodes): | ||
Pierre-Yves David
|
r27319 | cl = self.changelog | ||
nm = cl.nodemap | ||||
filtered = cl.filteredrevs | ||||
Pierre-Yves David
|
r15889 | result = [] | ||
for n in nodes: | ||||
r = nm.get(n) | ||||
Pierre-Yves David
|
r27319 | resp = not (r is None or r in filtered) | ||
Pierre-Yves David
|
r15889 | result.append(resp) | ||
return result | ||||
Peter Arrenbrecht
|
r13723 | |||
mpm@selenic.com
|
r1089 | def local(self): | ||
Matt Mackall
|
r14603 | return self | ||
mpm@selenic.com
|
r1089 | |||
Matt Mackall
|
r25623 | def publishing(self): | ||
Matt Mackall
|
r25625 | # it's safe (and desirable) to trust the publish flag unconditionally | ||
# so that we don't finalize changes shared between users via ssh or nfs | ||||
Jun Wu
|
r33499 | return self.ui.configbool('phases', 'publish', untrusted=True) | ||
Matt Mackall
|
r25623 | |||
Peter Arrenbrecht
|
r17192 | def cancopy(self): | ||
Pierre-Yves David
|
r20332 | # so statichttprepo's override of local() works | ||
if not self.local(): | ||||
return False | ||||
Matt Mackall
|
r25624 | if not self.publishing(): | ||
Pierre-Yves David
|
r20332 | return True | ||
# if publishing we can't copy if there is filtered content | ||||
return not self.filtered('visible').changelog.filteredrevs | ||||
Peter Arrenbrecht
|
r17192 | |||
Angel Ezquerra
|
r23666 | def shared(self): | ||
'''the type of shared repository (None if not shared)''' | ||||
if self.sharedpath != self.path: | ||||
return 'store' | ||||
return None | ||||
Angel Ezquerra
|
r22362 | def wjoin(self, f, *insidef): | ||
Angel Ezquerra
|
r23714 | return self.vfs.reljoin(self.root, f, *insidef) | ||
mpm@selenic.com
|
r1089 | |||
def file(self, f): | ||||
Thomas Arendsen Hein
|
r1615 | if f[0] == '/': | ||
f = f[1:] | ||||
Angel Ezquerra
|
r23853 | return filelog.filelog(self.svfs, f) | ||
mpm@selenic.com
|
r1089 | |||
Matt Mackall
|
r6739 | def changectx(self, changeid): | ||
Matt Mackall
|
r6747 | return self[changeid] | ||
Matt Mackall
|
r3218 | |||
Patrick Mezard
|
r16551 | def setparents(self, p1, p2=nullid): | ||
Augie Fackler
|
r32350 | with self.dirstate.parentchange(): | ||
copies = self.dirstate.setparents(p1, p2) | ||||
pctx = self[p1] | ||||
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) | ||||
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) | ||||
Patrick Mezard
|
r16551 | |||
Matt Mackall
|
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) | ||||
mpm@selenic.com
|
r1089 | def getcwd(self): | ||
return self.dirstate.getcwd() | ||||
Alexis S. L. Carvalho
|
r4525 | def pathto(self, f, cwd=None): | ||
return self.dirstate.pathto(f, cwd) | ||||
Nicolas Dumazet
|
r11698 | def _loadfilter(self, filter): | ||
Matt Mackall
|
r4004 | if filter not in self.filterpats: | ||
mpm@selenic.com
|
r1258 | l = [] | ||
Matt Mackall
|
r4004 | for pat, cmd in self.ui.configitems(filter): | ||
Mads Kiilerich
|
r7226 | if cmd == '!': | ||
continue | ||||
Benoit Boissinot
|
r10651 | mf = matchmod.match(self.root, '', [pat]) | ||
Patrick Mezard
|
r5966 | fn = None | ||
Jesse Glick
|
r6066 | params = cmd | ||
Patrick Mezard
|
r5966 | for name, filterfn in self._datafilters.iteritems(): | ||
Thomas Arendsen Hein
|
r6210 | if cmd.startswith(name): | ||
Patrick Mezard
|
r5966 | fn = filterfn | ||
Jesse Glick
|
r6066 | params = cmd[len(name):].lstrip() | ||
Patrick Mezard
|
r5966 | break | ||
if not fn: | ||||
Jesse Glick
|
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) | ||||
Jesse Glick
|
r6066 | l.append((mf, fn, params)) | ||
Matt Mackall
|
r4004 | self.filterpats[filter] = l | ||
Nicolas Dumazet
|
r12706 | return self.filterpats[filter] | ||
mpm@selenic.com
|
r1258 | |||
Nicolas Dumazet
|
r12707 | def _filter(self, filterpats, filename, data): | ||
for mf, fn, cmd in filterpats: | ||||
mpm@selenic.com
|
r1258 | if mf(filename): | ||
Martin Geisler
|
r9467 | self.ui.debug("filtering %s through %s\n" % (filename, cmd)) | ||
Jesse Glick
|
r5967 | data = fn(data, cmd, ui=self.ui, repo=self, filename=filename) | ||
mpm@selenic.com
|
r1258 | break | ||
return data | ||||
mpm@selenic.com
|
r1089 | |||
Pierre-Yves David
|
r18013 | @unfilteredpropertycache | ||
Nicolas Dumazet
|
r12708 | def _encodefilterpats(self): | ||
return self._loadfilter('encode') | ||||
Pierre-Yves David
|
r18013 | @unfilteredpropertycache | ||
Nicolas Dumazet
|
r12708 | def _decodefilterpats(self): | ||
return self._loadfilter('decode') | ||||
Patrick Mezard
|
r5966 | def adddatafilter(self, name, filter): | ||
self._datafilters[name] = filter | ||||
Matt Mackall
|
r4004 | def wread(self, filename): | ||
Pierre-Yves David
|
r31428 | if self.wvfs.islink(filename): | ||
FUJIWARA Katsunori
|
r18950 | data = self.wvfs.readlink(filename) | ||
Matt Mackall
|
r4004 | else: | ||
Angel Ezquerra
|
r23854 | data = self.wvfs.read(filename) | ||
Nicolas Dumazet
|
r12708 | return self._filter(self._encodefilterpats, filename, data) | ||
mpm@selenic.com
|
r1258 | |||
Gregory Szorc
|
r28198 | def wwrite(self, filename, data, flags, backgroundclose=False): | ||
FUJIWARA Katsunori
|
r24843 | """write ``data`` into ``filename`` in the working directory | ||
This returns length of written (maybe decoded) data. | ||||
""" | ||||
Nicolas Dumazet
|
r12708 | data = self._filter(self._decodefilterpats, filename, data) | ||
Matt Mackall
|
r6877 | if 'l' in flags: | ||
Angel Ezquerra
|
r23854 | self.wvfs.symlink(data, filename) | ||
Matt Mackall
|
r6877 | else: | ||
Gregory Szorc
|
r28198 | self.wvfs.write(filename, data, backgroundclose=backgroundclose) | ||
Matt Mackall
|
r6877 | if 'x' in flags: | ||
FUJIWARA Katsunori
|
r18951 | self.wvfs.setflags(filename, False, True) | ||
FUJIWARA Katsunori
|
r24843 | return len(data) | ||
mpm@selenic.com
|
r1258 | |||
Matt Mackall
|
r4005 | def wwritedata(self, filename, data): | ||
Nicolas Dumazet
|
r12708 | return self._filter(self._decodefilterpats, filename, data) | ||
mpm@selenic.com
|
r1089 | |||
Pierre-Yves David
|
r23379 | def currenttransaction(self): | ||
"""return the current transaction or None if non exists""" | ||||
Jordi Gutiérrez Hermoso
|
r24306 | if self._transref: | ||
tr = self._transref() | ||||
else: | ||||
tr = None | ||||
Henrik Stuart
|
r8072 | if tr and tr.running(): | ||
Pierre-Yves David
|
r23379 | return tr | ||
return None | ||||
def transaction(self, desc, report=None): | ||||
Pierre-Yves David
|
r25290 | if (self.ui.configbool('devel', 'all-warnings') | ||
Pierre-Yves David
|
r24388 | or self.ui.configbool('devel', 'check-locks')): | ||
Pierre-Yves David
|
r29705 | if self._currentlock(self._lockref) is None: | ||
Jun Wu
|
r30574 | raise error.ProgrammingError('transaction requires locking') | ||
Pierre-Yves David
|
r23379 | tr = self.currenttransaction() | ||
if tr is not None: | ||||
Boris Feld
|
r33541 | scmutil.registersummarycallback(self, tr, desc) | ||
Henrik Stuart
|
r8072 | return tr.nest() | ||
mason@suse.com
|
r1806 | |||
Matt Mackall
|
r5865 | # abort here if the journal already exists | ||
FUJIWARA Katsunori
|
r18947 | if self.svfs.exists("journal"): | ||
Matt Mackall
|
r10282 | raise error.RepoError( | ||
Johan Bjork
|
r21274 | _("abandoned transaction found"), | ||
hint=_("run 'hg recover' to clean up transaction")) | ||||
Matt Mackall
|
r5865 | |||
FUJIWARA Katsunori
|
r25267 | idbase = "%.40f#%f" % (random.random(), time.time()) | ||
Augie Fackler
|
r31523 | ha = hex(hashlib.sha1(idbase).digest()) | ||
Augie Fackler
|
r31508 | txnid = 'TXN:' + ha | ||
FUJIWARA Katsunori
|
r25268 | self.hook('pretxnopen', throw=True, txnname=desc, txnid=txnid) | ||
Pierre-Yves David
|
r24281 | |||
Idan Kamara
|
r16236 | self._writejournal(desc) | ||
FUJIWARA Katsunori
|
r18952 | renames = [(vfs, x, undoname(x)) for vfs, x in self._journalfiles()] | ||
Jordi Gutiérrez Hermoso
|
r24306 | if report: | ||
rp = report | ||||
else: | ||||
rp = self.ui.warn | ||||
Angel Ezquerra
|
r23852 | vfsmap = {'plain': self.vfs} # root of .hg/ | ||
Pierre-Yves David
|
r24284 | # we must avoid cyclic reference between repo and transaction. | ||
reporef = weakref.ref(self) | ||||
Pierre-Yves David
|
r31994 | # Code to track tag movement | ||
# | ||||
# Since tags are all handled as file content, it is actually quite hard | ||||
# to track these movement from a code perspective. So we fallback to a | ||||
# tracking at the repository level. One could envision to track changes | ||||
# to the '.hgtags' file through changegroup apply but that fails to | ||||
# cope with case where transaction expose new heads without changegroup | ||||
# being involved (eg: phase movement). | ||||
# | ||||
# For now, We gate the feature behind a flag since this likely comes | ||||
# with performance impacts. The current code run more often than needed | ||||
# and do not use caches as much as it could. The current focus is on | ||||
# the behavior of the feature so we disable it by default. The flag | ||||
# will be removed when we are happy with the performance impact. | ||||
Pierre-Yves David
|
r31996 | # | ||
# Once this feature is no longer experimental move the following | ||||
# documentation to the appropriate help section: | ||||
# | ||||
# The ``HG_TAG_MOVED`` variable will be set if the transaction touched | ||||
# tags (new or changed or deleted tags). In addition the details of | ||||
# these changes are made available in a file at: | ||||
# ``REPOROOT/.hg/changes/tags.changes``. | ||||
# Make sure you check for HG_TAG_MOVED before reading that file as it | ||||
# might exist from a previous transaction even if no tag were touched | ||||
# in this one. Changes are recorded in a line base format:: | ||||
# | ||||
# <action> <hex-node> <tag-name>\n | ||||
# | ||||
# Actions are defined as follow: | ||||
# "-R": tag is removed, | ||||
# "+A": tag is added, | ||||
# "-M": tag is moved (old value), | ||||
# "+M": tag is moved (new value), | ||||
Pierre-Yves David
|
r31994 | tracktags = lambda x: None | ||
# experimental config: experimental.hook-track-tags | ||||
Jun Wu
|
r33499 | shouldtracktags = self.ui.configbool('experimental', 'hook-track-tags') | ||
Pierre-Yves David
|
r31994 | if desc != 'strip' and shouldtracktags: | ||
oldheads = self.changelog.headrevs() | ||||
def tracktags(tr2): | ||||
repo = reporef() | ||||
oldfnodes = tagsmod.fnoderevs(repo.ui, repo, oldheads) | ||||
newheads = repo.changelog.headrevs() | ||||
newfnodes = tagsmod.fnoderevs(repo.ui, repo, newheads) | ||||
# notes: we compare lists here. | ||||
# As we do it only once buiding set would not be cheaper | ||||
Pierre-Yves David
|
r31995 | changes = tagsmod.difftags(repo.ui, repo, oldfnodes, newfnodes) | ||
if changes: | ||||
Pierre-Yves David
|
r31994 | tr2.hookargs['tag_moved'] = '1' | ||
Pierre-Yves David
|
r31996 | with repo.vfs('changes/tags.changes', 'w', | ||
atomictemp=True) as changesfile: | ||||
# note: we do not register the file to the transaction | ||||
# because we needs it to still exist on the transaction | ||||
# is close (for txnclose hooks) | ||||
tagsmod.writediff(changesfile, changes) | ||||
Pierre-Yves David
|
r31994 | def validate(tr2): | ||
Pierre-Yves David
|
r24284 | """will run pre-closing hooks""" | ||
Pierre-Yves David
|
r31994 | # XXX the transaction API is a bit lacking here so we take a hacky | ||
# path for now | ||||
# | ||||
# We cannot add this as a "pending" hooks since the 'tr.hookargs' | ||||
# dict is copied before these run. In addition we needs the data | ||||
# available to in memory hooks too. | ||||
# | ||||
# Moreover, we also need to make sure this runs before txnclose | ||||
# hooks and there is no "pending" mechanism that would execute | ||||
# logic only if hooks are about to run. | ||||
# | ||||
# Fixing this limitation of the transaction is also needed to track | ||||
# other families of changes (bookmarks, phases, obsolescence). | ||||
# | ||||
# This will have to be fixed before we remove the experimental | ||||
# gating. | ||||
tracktags(tr2) | ||||
Boris Feld
|
r34710 | repo = reporef() | ||
if hook.hashook(repo.ui, 'pretxnclose-bookmark'): | ||||
for name, (old, new) in sorted(tr.changes['bookmarks'].items()): | ||||
args = tr.hookargs.copy() | ||||
args.update(bookmarks.preparehookargs(name, old, new)) | ||||
repo.hook('pretxnclose-bookmark', throw=True, | ||||
txnname=desc, | ||||
**pycompat.strkwargs(args)) | ||||
Boris Feld
|
r34712 | if hook.hashook(repo.ui, 'pretxnclose-phase'): | ||
cl = repo.unfiltered().changelog | ||||
for rev, (old, new) in tr.changes['phases'].items(): | ||||
args = tr.hookargs.copy() | ||||
node = hex(cl.node(rev)) | ||||
args.update(phases.preparehookargs(node, old, new)) | ||||
repo.hook('pretxnclose-phase', throw=True, txnname=desc, | ||||
**pycompat.strkwargs(args)) | ||||
Boris Feld
|
r34710 | |||
repo.hook('pretxnclose', throw=True, | ||||
txnname=desc, **pycompat.strkwargs(tr.hookargs)) | ||||
FUJIWARA Katsunori
|
r26577 | def releasefn(tr, success): | ||
repo = reporef() | ||||
if success: | ||||
FUJIWARA Katsunori
|
r26634 | # this should be explicitly invoked here, because | ||
# in-memory changes aren't written out at closing | ||||
# transaction, if tr.addfilegenerator (via | ||||
# dirstate.write or so) isn't invoked while | ||||
# transaction running | ||||
FUJIWARA Katsunori
|
r26748 | repo.dirstate.write(None) | ||
FUJIWARA Katsunori
|
r26577 | else: | ||
# discard all changes (including ones already written | ||||
# out) in this transaction | ||||
Adam Simpkins
|
r33440 | repo.dirstate.restorebackup(None, 'journal.dirstate') | ||
Pierre-Yves David
|
r24284 | |||
FUJIWARA Katsunori
|
r26831 | repo.invalidate(clearfilecache=True) | ||
Siddharth Agarwal
|
r25667 | tr = transaction.transaction(rp, self.svfs, vfsmap, | ||
FUJIWARA Katsunori
|
r20087 | "journal", | ||
Pierre-Yves David
|
r23903 | "undo", | ||
Alexander Solovyov
|
r14266 | aftertrans(renames), | ||
Pierre-Yves David
|
r24284 | self.store.createmode, | ||
FUJIWARA Katsunori
|
r26577 | validator=validate, | ||
FUJIWARA Katsunori
|
r33278 | releasefn=releasefn, | ||
checkambigfiles=_cachedfiles) | ||||
Pierre-Yves David
|
r32262 | tr.changes['revs'] = set() | ||
r33248 | tr.changes['obsmarkers'] = set() | |||
Boris Feld
|
r33451 | tr.changes['phases'] = {} | ||
Boris Feld
|
r33516 | tr.changes['bookmarks'] = {} | ||
Pierre-Yves David
|
r24740 | |||
FUJIWARA Katsunori
|
r25267 | tr.hookargs['txnid'] = txnid | ||
Pierre-Yves David
|
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) | ||||
Pierre-Yves David
|
r24282 | def txnclosehook(tr2): | ||
"""To be run if transaction is successful, will schedule a hook run | ||||
""" | ||||
Gregory Szorc
|
r27907 | # Don't reference tr2 in hook() so we don't hold a reference. | ||
# This reduces memory consumption when there are multiple | ||||
# transactions per lock. This can likely go away if issue5045 | ||||
# fixes the function accumulation. | ||||
hookargs = tr2.hookargs | ||||
Boris Feld
|
r34709 | def hookfunc(): | ||
repo = reporef() | ||||
if hook.hashook(repo.ui, 'txnclose-bookmark'): | ||||
bmchanges = sorted(tr.changes['bookmarks'].items()) | ||||
for name, (old, new) in bmchanges: | ||||
args = tr.hookargs.copy() | ||||
args.update(bookmarks.preparehookargs(name, old, new)) | ||||
repo.hook('txnclose-bookmark', throw=False, | ||||
txnname=desc, **pycompat.strkwargs(args)) | ||||
Boris Feld
|
r34711 | if hook.hashook(repo.ui, 'txnclose-phase'): | ||
cl = repo.unfiltered().changelog | ||||
phasemv = sorted(tr.changes['phases'].items()) | ||||
for rev, (old, new) in phasemv: | ||||
args = tr.hookargs.copy() | ||||
node = hex(cl.node(rev)) | ||||
args.update(phases.preparehookargs(node, old, new)) | ||||
repo.hook('txnclose-phase', throw=False, txnname=desc, | ||||
**pycompat.strkwargs(args)) | ||||
Boris Feld
|
r34709 | repo.hook('txnclose', throw=False, txnname=desc, | ||
**pycompat.strkwargs(hookargs)) | ||||
reporef()._afterlock(hookfunc) | ||||
Pierre-Yves David
|
r24282 | tr.addfinalize('txnclose-hook', txnclosehook) | ||
r32332 | tr.addpostclose('warms-cache', self._buildcacheupdater(tr)) | |||
Pierre-Yves David
|
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) | ||||
Yuya Nishihara
|
r26251 | # avoid eager cache invalidation. in-memory data should be identical | ||
# to stored data if transaction has no error. | ||||
tr.addpostclose('refresh-filecachestats', self._refreshfilecachestats) | ||||
Alexander Solovyov
|
r14266 | self._transref = weakref.ref(tr) | ||
Boris Feld
|
r33541 | scmutil.registersummarycallback(self, tr, desc) | ||
Alexander Solovyov
|
r14266 | return tr | ||
Idan Kamara
|
r16236 | def _journalfiles(self): | ||
FUJIWARA Katsunori
|
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')) | ||||
Idan Kamara
|
r16236 | |||
def undofiles(self): | ||||
FUJIWARA Katsunori
|
r20975 | return [(vfs, undoname(x)) for vfs, x in self._journalfiles()] | ||
Idan Kamara
|
r16236 | |||
r32452 | @unfilteredmethod | |||
Alexander Solovyov
|
r14266 | def _writejournal(self, desc): | ||
Adam Simpkins
|
r33440 | self.dirstate.savebackup(None, 'journal.dirstate') | ||
Angel Ezquerra
|
r23852 | self.vfs.write("journal.branch", | ||
Dan Villiom Podlaski Christiansen
|
r14168 | encoding.fromlocal(self.dirstate.branch())) | ||
Angel Ezquerra
|
r23852 | self.vfs.write("journal.desc", | ||
Dan Villiom Podlaski Christiansen
|
r14168 | "%d\n%s\n" % (len(self), desc)) | ||
Angel Ezquerra
|
r23852 | self.vfs.write("journal.bookmarks", | ||
self.vfs.tryread("bookmarks")) | ||||
Angel Ezquerra
|
r23853 | self.svfs.write("journal.phaseroots", | ||
self.svfs.tryread("phaseroots")) | ||||
Alexander Solovyov
|
r14266 | |||
mpm@selenic.com
|
r1089 | def recover(self): | ||
Bryan O'Sullivan
|
r27846 | with self.lock(): | ||
FUJIWARA Katsunori
|
r18947 | if self.svfs.exists("journal"): | ||
Matt Mackall
|
r4915 | self.ui.status(_("rolling back interrupted transaction\n")) | ||
Angel Ezquerra
|
r23853 | vfsmap = {'': self.svfs, | ||
Angel Ezquerra
|
r23852 | 'plain': self.vfs,} | ||
Angel Ezquerra
|
r23853 | transaction.rollback(self.svfs, vfsmap, "journal", | ||
FUJIWARA Katsunori
|
r33278 | self.ui.warn, | ||
checkambigfiles=_cachedfiles) | ||||
Matt Mackall
|
r4915 | self.invalidate() | ||
return True | ||||
else: | ||||
self.ui.warn(_("no interrupted transaction available\n")) | ||||
return False | ||||
mpm@selenic.com
|
r1089 | |||
Greg Ward
|
r15183 | def rollback(self, dryrun=False, force=False): | ||
FUJIWARA Katsunori
|
r26631 | wlock = lock = dsguard = None | ||
Matt Mackall
|
r4915 | try: | ||
mason@suse.com
|
r1712 | wlock = self.wlock() | ||
Eric Hopper
|
r4438 | lock = self.lock() | ||
FUJIWARA Katsunori
|
r18947 | if self.svfs.exists("undo"): | ||
Augie Fackler
|
r30492 | dsguard = dirstateguard.dirstateguard(self, 'rollback') | ||
FUJIWARA Katsunori
|
r26631 | |||
return self._rollback(dryrun, force, dsguard) | ||||
Matt Mackall
|
r4915 | else: | ||
self.ui.warn(_("no rollback information available\n")) | ||||
Matt Mackall
|
r11177 | return 1 | ||
Matt Mackall
|
r4915 | finally: | ||
FUJIWARA Katsunori
|
r26631 | release(dsguard, lock, wlock) | ||
mpm@selenic.com
|
r1089 | |||
Pierre-Yves David
|
r18016 | @unfilteredmethod # Until we get smarter cache management | ||
FUJIWARA Katsunori
|
r26631 | def _rollback(self, dryrun, force, dsguard): | ||
Greg Ward
|
r15130 | ui = self.ui | ||
Greg Ward
|
r15097 | try: | ||
Angel Ezquerra
|
r23852 | args = self.vfs.read('undo.desc').splitlines() | ||
Greg Ward
|
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: | ||||
Pulkit Goyal
|
r32895 | msg = (_('repository tip rolled back to revision %d' | ||
Greg Ward
|
r15130 | ' (undo %s: %s)\n') | ||
% (oldtip, desc, detail)) | ||||
else: | ||||
Pulkit Goyal
|
r32895 | msg = (_('repository tip rolled back to revision %d' | ||
Greg Ward
|
r15130 | ' (undo %s)\n') | ||
% (oldtip, desc)) | ||||
Greg Ward
|
r15097 | except IOError: | ||
Greg Ward
|
r15130 | msg = _('rolling back unknown transaction\n') | ||
Greg Ward
|
r15183 | desc = None | ||
if not force and self['.'] != self['tip'] and desc == 'commit': | ||||
Pierre-Yves David
|
r26587 | raise error.Abort( | ||
Greg Ward
|
r15183 | _('rollback of last commit while not checked out ' | ||
Matt Mackall
|
r15187 | 'may lose data'), hint=_('use -f to force')) | ||
Greg Ward
|
r15183 | |||
Greg Ward
|
r15130 | ui.status(msg) | ||
Greg Ward
|
r15097 | if dryrun: | ||
return 0 | ||||
Greg Ward
|
r15131 | |||
parents = self.dirstate.parents() | ||||
Idan Kamara
|
r18310 | self.destroying() | ||
Pierre-Yves David
|
r23902 | vfsmap = {'plain': self.vfs, '': self.svfs} | ||
FUJIWARA Katsunori
|
r33278 | transaction.rollback(self.svfs, vfsmap, 'undo', ui.warn, | ||
checkambigfiles=_cachedfiles) | ||||
FUJIWARA Katsunori
|
r18947 | if self.vfs.exists('undo.bookmarks'): | ||
FUJIWARA Katsunori
|
r29352 | self.vfs.rename('undo.bookmarks', 'bookmarks', checkambig=True) | ||
FUJIWARA Katsunori
|
r18947 | if self.svfs.exists('undo.phaseroots'): | ||
FUJIWARA Katsunori
|
r29352 | self.svfs.rename('undo.phaseroots', 'phaseroots', checkambig=True) | ||
Greg Ward
|
r15097 | self.invalidate() | ||
Greg Ward
|
r15131 | |||
parentgone = (parents[0] not in self.changelog.nodemap or | ||||
parents[1] not in self.changelog.nodemap) | ||||
if parentgone: | ||||
FUJIWARA Katsunori
|
r26631 | # prevent dirstateguard from overwriting already restored one | ||
dsguard.close() | ||||
Adam Simpkins
|
r33440 | self.dirstate.restorebackup(None, 'undo.dirstate') | ||
Greg Ward
|
r15131 | try: | ||
Angel Ezquerra
|
r23852 | branch = self.vfs.read('undo.branch') | ||
Sune Foldager
|
r17360 | self.dirstate.setbranch(encoding.tolocal(branch)) | ||
Greg Ward
|
r15131 | except IOError: | ||
ui.warn(_('named branch could not be reset: ' | ||||
'current branch is still \'%s\'\n') | ||||
% self.dirstate.branch()) | ||||
Augie Fackler
|
r27167 | parents = tuple([p.rev() for p in self[None].parents()]) | ||
Greg Ward
|
r15131 | 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) | ||||
Siddharth Agarwal
|
r26989 | mergemod.mergestate.clean(self, self['.'].node()) | ||
Matt Mackall
|
r24784 | |||
Joshua Redstone
|
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. | ||||
Greg Ward
|
r15604 | self.destroyed() | ||
Greg Ward
|
r15097 | return 0 | ||
r32332 | def _buildcacheupdater(self, newtransaction): | |||
"""called during transaction to build the callback updating cache | ||||
Lives on the repository to help extension who might want to augment | ||||
this logic. For this purpose, the created transaction is passed to the | ||||
method. | ||||
""" | ||||
# we must avoid cyclic reference between repo and transaction. | ||||
reporef = weakref.ref(self) | ||||
def updater(tr): | ||||
repo = reporef() | ||||
repo.updatecaches(tr) | ||||
return updater | ||||
Pierre-Yves David
|
r32263 | @unfilteredmethod | ||
Pierre-Yves David
|
r32264 | def updatecaches(self, tr=None): | ||
"""warm appropriate caches | ||||
If this function is called after a transaction closed. The transaction | ||||
will be available in the 'tr' argument. This can be used to selectively | ||||
update caches relevant to the changes in that transaction. | ||||
""" | ||||
if tr is not None and tr.hookargs.get('source') == 'strip': | ||||
Pierre-Yves David
|
r32263 | # During strip, many caches are invalid but | ||
# later call to `destroyed` will refresh them. | ||||
return | ||||
Pierre-Yves David
|
r32264 | if tr is None or tr.changes['revs']: | ||
# updating the unfiltered branchmap should refresh all the others, | ||||
Pierre-Yves David
|
r32267 | self.ui.debug('updating the branch cache\n') | ||
Pierre-Yves David
|
r32263 | branchmap.updatecache(self.filtered('served')) | ||
Benoit Boissinot
|
r10547 | def invalidatecaches(self): | ||
Idan Kamara
|
r15988 | |||
Pierre-Yves David
|
r18013 | if '_tagscache' in vars(self): | ||
# can't use delattr on proxy | ||||
del self.__dict__['_tagscache'] | ||||
Idan Kamara
|
r14936 | |||
Pierre-Yves David
|
r18189 | self.unfiltered()._branchcaches.clear() | ||
Pierre-Yves David
|
r18105 | self.invalidatevolatilesets() | ||
Gregory Szorc
|
r33302 | self._sparsesignaturecache.clear() | ||
Pierre-Yves David
|
r18105 | |||
def invalidatevolatilesets(self): | ||||
self.filteredrevcache.clear() | ||||
Pierre-Yves David
|
r17469 | obsolete.clearobscaches(self) | ||
Benoit Boissinot
|
r1784 | |||
Idan Kamara
|
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).''' | ||||
Pierre-Yves David
|
r18013 | if hasunfilteredcache(self, 'dirstate'): | ||
Idan Kamara
|
r16200 | for k in self.dirstate._filecache: | ||
try: | ||||
delattr(self.dirstate, k) | ||||
except AttributeError: | ||||
pass | ||||
Pierre-Yves David
|
r17997 | delattr(self.unfiltered(), 'dirstate') | ||
Idan Kamara
|
r14930 | |||
FUJIWARA Katsunori
|
r26831 | def invalidate(self, clearfilecache=False): | ||
FUJIWARA Katsunori
|
r29918 | '''Invalidates both store and non-store parts other than dirstate | ||
If a transaction is running, invalidation of store is omitted, | ||||
because discarding in-memory changes might cause inconsistency | ||||
(e.g. incomplete fncache causes unintentional failure, but | ||||
redundant one doesn't). | ||||
''' | ||||
Mads Kiilerich
|
r18644 | unfiltered = self.unfiltered() # all file caches are stored unfiltered | ||
Augie Fackler
|
r31510 | for k in list(self._filecache.keys()): | ||
Idan Kamara
|
r14935 | # dirstate is invalidated separately in invalidatedirstate() | ||
if k == 'dirstate': | ||||
continue | ||||
Martin von Zweigbergk
|
r33672 | if (k == 'changelog' and | ||
self.currenttransaction() and | ||||
self.changelog._delayed): | ||||
# The changelog object may store unwritten revisions. We don't | ||||
# want to lose them. | ||||
# TODO: Solve the problem instead of working around it. | ||||
continue | ||||
Idan Kamara
|
r14935 | |||
FUJIWARA Katsunori
|
r26831 | if clearfilecache: | ||
del self._filecache[k] | ||||
Idan Kamara
|
r14935 | try: | ||
Pierre-Yves David
|
r17997 | delattr(unfiltered, k) | ||
Idan Kamara
|
r14935 | except AttributeError: | ||
pass | ||||
Benoit Boissinot
|
r10547 | self.invalidatecaches() | ||
FUJIWARA Katsunori
|
r29918 | if not self.currenttransaction(): | ||
# TODO: Changing contents of store outside transaction | ||||
# causes inconsistency. We should make in-memory store | ||||
# changes detectable, and abort if changed. | ||||
self.store.invalidatecaches() | ||||
Benoit Boissinot
|
r10547 | |||
Yuya Nishihara
|
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() | ||||
FUJIWARA Katsunori
|
r29920 | @unfilteredmethod | ||
Yuya Nishihara
|
r26251 | def _refreshfilecachestats(self, tr): | ||
Yuya Nishihara
|
r26250 | """Reload stats of cached files so that they are flagged as valid""" | ||
for k, ce in self._filecache.items(): | ||||
if k == 'dirstate' or k not in self.__dict__: | ||||
continue | ||||
ce.refresh() | ||||
Siddharth Agarwal
|
r26439 | def _lock(self, vfs, lockname, wait, releasefn, acquirefn, desc, | ||
Siddharth Agarwal
|
r26499 | inheritchecker=None, parentenvvar=None): | ||
Siddharth Agarwal
|
r26439 | parentlock = None | ||
Siddharth Agarwal
|
r26472 | # the contents of parentenvvar are used by the underlying lock to | ||
# determine whether it can be inherited | ||||
Siddharth Agarwal
|
r26439 | if parentenvvar is not None: | ||
Pulkit Goyal
|
r30634 | parentlock = encoding.environ.get(parentenvvar) | ||
mpm@selenic.com
|
r1089 | try: | ||
Siddharth Agarwal
|
r26321 | l = lockmod.lock(vfs, lockname, 0, releasefn=releasefn, | ||
Siddharth Agarwal
|
r26439 | acquirefn=acquirefn, desc=desc, | ||
Siddharth Agarwal
|
r26499 | inheritchecker=inheritchecker, | ||
Siddharth Agarwal
|
r26439 | parentlock=parentlock) | ||
Gregory Szorc
|
r25660 | except error.LockHeld as inst: | ||
Benoit Boissinot
|
r1531 | if not wait: | ||
Vadim Gelfer
|
r2016 | raise | ||
Mark Ignacio
|
r29883 | # show more details for new-style locks | ||
if ':' in inst.locker: | ||||
host, pid = inst.locker.split(":", 1) | ||||
self.ui.warn( | ||||
_("waiting for lock on %s held by process %r " | ||||
"on host %r\n") % (desc, pid, host)) | ||||
else: | ||||
self.ui.warn(_("waiting for lock on %s held by %r\n") % | ||||
(desc, inst.locker)) | ||||
Vadim Gelfer
|
r2016 | # default to 600 seconds timeout | ||
FUJIWARA Katsunori
|
r20091 | l = lockmod.lock(vfs, lockname, | ||
Jun Wu
|
r33499 | int(self.ui.config("ui", "timeout")), | ||
Siddharth Agarwal
|
r26321 | releasefn=releasefn, acquirefn=acquirefn, | ||
desc=desc) | ||||
Mads Kiilerich
|
r20380 | self.ui.warn(_("got lock after %s seconds\n") % l.delay) | ||
Benoit Boissinot
|
r1751 | return l | ||
Matt Mackall
|
r15587 | def _afterlock(self, callback): | ||
Pierre-Yves David
|
r24821 | """add a callback to be run when the repository is fully unlocked | ||
Pierre-Yves David
|
r15583 | |||
Pierre-Yves David
|
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. | ||||
Mads Kiilerich
|
r16680 | callback() | ||
Pierre-Yves David
|
r15583 | |||
Matt Mackall
|
r4914 | def lock(self, wait=True): | ||
Greg Ward
|
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 | ||||
Pierre-Yves David
|
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.''' | ||||
Pierre-Yves David
|
r29705 | l = self._currentlock(self._lockref) | ||
if l is not None: | ||||
Ronny Pfannschmidt
|
r8108 | l.lock() | ||
return l | ||||
Matt Mackall
|
r4917 | |||
Yuya Nishihara
|
r26251 | l = self._lock(self.svfs, "lock", wait, None, | ||
Adrian Buehlmann
|
r13391 | self.invalidate, _('repository %s') % self.origroot) | ||
Matt Mackall
|
r4917 | self._lockref = weakref.ref(l) | ||
return l | ||||
Benoit Boissinot
|
r1751 | |||
Siddharth Agarwal
|
r26499 | def _wlockchecktransaction(self): | ||
if self.currenttransaction() is not None: | ||||
raise error.LockInheritanceContractViolation( | ||||
'wlock cannot be inherited in the middle of a transaction') | ||||
Matt Mackall
|
r4914 | def wlock(self, wait=True): | ||
Greg Ward
|
r9309 | '''Lock the non-store parts of the repository (everything under | ||
.hg except .hg/store) and return a weak reference to the lock. | ||||
Pierre-Yves David
|
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.''' | ||||
Pierre-Yves David
|
r24744 | l = self._wlockref and self._wlockref() | ||
if l is not None and l.held: | ||||
l.lock() | ||||
return l | ||||
Mads Kiilerich
|
r26781 | # We do not need to check for non-waiting lock acquisition. Such | ||
Pierre-Yves David
|
r24750 | # acquisition would not cause dead-lock as they would just fail. | ||
Pierre-Yves David
|
r25290 | if wait and (self.ui.configbool('devel', 'all-warnings') | ||
Pierre-Yves David
|
r24750 | or self.ui.configbool('devel', 'check-locks')): | ||
Pierre-Yves David
|
r29705 | if self._currentlock(self._lockref) is not None: | ||
Pierre-Yves David
|
r25629 | self.ui.develwarn('"wlock" acquired after "lock"') | ||
Benoit Boissinot
|
r1531 | |||
Idan Kamara
|
r14930 | def unlock(): | ||
Durham Goode
|
r22404 | if self.dirstate.pendingparentchange(): | ||
self.dirstate.invalidate() | ||||
else: | ||||
FUJIWARA Katsunori
|
r26748 | self.dirstate.write(None) | ||
Durham Goode
|
r22404 | |||
Idan Kamara
|
r18318 | self._filecache['dirstate'].refresh() | ||
Idan Kamara
|
r14930 | |||
FUJIWARA Katsunori
|
r20091 | l = self._lock(self.vfs, "wlock", wait, unlock, | ||
Idan Kamara
|
r14930 | self.invalidatedirstate, _('working directory of %s') % | ||
Siddharth Agarwal
|
r26499 | self.origroot, | ||
inheritchecker=self._wlockchecktransaction, | ||||
parentenvvar='HG_WLOCK_LOCKER') | ||||
Matt Mackall
|
r4917 | self._wlockref = weakref.ref(l) | ||
return l | ||||
Benoit Boissinot
|
r1531 | |||
Siddharth Agarwal
|
r26488 | def _currentlock(self, lockref): | ||
"""Returns the lock if it's held, or None if it's not.""" | ||||
if lockref is None: | ||||
return None | ||||
l = lockref() | ||||
if l is None or not l.held: | ||||
return None | ||||
return l | ||||
Siddharth Agarwal
|
r26489 | def currentwlock(self): | ||
"""Returns the wlock if it's held, or None if it's not.""" | ||||
return self._currentlock(self._wlockref) | ||||
Matt Mackall
|
r8401 | def _filecommit(self, fctx, manifest1, manifest2, linkrev, tr, changelist): | ||
Matt Mackall
|
r3292 | """ | ||
Matt Mackall
|
r3294 | commit an individual file as part of a larger transaction | ||
""" | ||||
Matt Mackall
|
r3292 | |||
Martijn Pieters
|
r8244 | fname = fctx.path() | ||
fparent1 = manifest1.get(fname, nullid) | ||||
Matt Mackall
|
r22492 | fparent2 = manifest2.get(fname, nullid) | ||
Mads Kiilerich
|
r24394 | if isinstance(fctx, context.filectx): | ||
node = fctx.filenode() | ||||
if node in [fparent1, fparent2]: | ||||
self.ui.debug('reusing %s filelog entry\n' % fname) | ||||
Mateusz Kwapich
|
r29181 | if manifest1.flags(fname) != fctx.flags(): | ||
changelist.append(fname) | ||||
Mads Kiilerich
|
r24394 | return node | ||
Matt Mackall
|
r1716 | |||
Mads Kiilerich
|
r24394 | flog = self.file(fname) | ||
Matt Mackall
|
r3292 | meta = {} | ||
Martijn Pieters
|
r8244 | copy = fctx.renamed() | ||
if copy and copy[0] != fname: | ||||
Alexis S. L. Carvalho
|
r4058 | # Mark the new revision of this file as a copy of another | ||
Thomas Arendsen Hein
|
r4516 | # file. This copy data will effectively act as a parent | ||
# of this new revision. If this is a merge, the first | ||||
Alexis S. L. Carvalho
|
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 | ||||
# | ||||
Matt Mackall
|
r6874 | |||
Martijn Pieters
|
r8244 | cfname = copy[0] | ||
crev = manifest1.get(cfname) | ||||
newfparent = fparent2 | ||||
Matt Mackall
|
r6874 | |||
if manifest2: # branch merge | ||||
Martijn Pieters
|
r8244 | if fparent2 == nullid or crev is None: # copied on remote side | ||
if cfname in manifest2: | ||||
crev = manifest2[cfname] | ||||
newfparent = fparent1 | ||||
Matt Mackall
|
r6874 | |||
Ryan McElroy
|
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 | ||||
Mads Kiilerich
|
r24180 | # the parent directory. However, this doesn't actually make sense to | ||
Ryan McElroy
|
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. | ||||
Matt Mackall
|
r6875 | |||
Matt Mackall
|
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)) | ||||
Mads Kiilerich
|
r20556 | elif fparent1 == nullid: | ||
fparent1, fparent2 = fparent2, nullid | ||||
Martijn Pieters
|
r8244 | elif fparent2 != nullid: | ||
Matt Mackall
|
r1716 | # is one parent an ancestor of the other? | ||
Mads Kiilerich
|
r21106 | fparentancestors = flog.commonancestorsheads(fparent1, fparent2) | ||
Mads Kiilerich
|
r20987 | if fparent1 in fparentancestors: | ||
Martijn Pieters
|
r8244 | fparent1, fparent2 = fparent2, nullid | ||
Mads Kiilerich
|
r20987 | elif fparent2 in fparentancestors: | ||
Martijn Pieters
|
r8244 | fparent2 = nullid | ||
Matt Mackall
|
r1716 | |||
Matt Mackall
|
r8401 | # is the file changed? | ||
Mads Kiilerich
|
r24394 | text = fctx.data() | ||
Matt Mackall
|
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? | ||||
Matt Mackall
|
r22492 | elif fname in manifest1 and manifest1.flags(fname) != fctx.flags(): | ||
Matt Mackall
|
r8401 | changelist.append(fname) | ||
return fparent1 | ||||
Matt Mackall
|
r1716 | |||
timeless
|
r28813 | def checkcommitpatterns(self, wctx, vdirs, match, status, fail): | ||
Mads Kiilerich
|
r30332 | """check for commit arguments that aren't committable""" | ||
timeless
|
r28814 | if match.isexact() or match.prefix(): | ||
timeless
|
r28813 | matched = set(status.modified + status.added + status.removed) | ||
for f in match.files(): | ||||
f = self.dirstate.normalize(f) | ||||
if f == '.' or f in matched or f in wctx.substate: | ||||
continue | ||||
if f in status.deleted: | ||||
fail(f, _('file not found!')) | ||||
if f in vdirs: # visited directory | ||||
d = f + '/' | ||||
for mf in matched: | ||||
if mf.startswith(d): | ||||
break | ||||
else: | ||||
fail(f, _("no match under directory!")) | ||||
elif f not in self.dirstate: | ||||
fail(f, _("file not tracked!")) | ||||
Pierre-Yves David
|
r18016 | @unfilteredmethod | ||
Matt Mackall
|
r8706 | def commit(self, text="", user=None, date=None, match=None, force=False, | ||
Pierre-Yves David
|
r26322 | editor=False, extra=None): | ||
Benoit Boissinot
|
r8515 | """Add a new revision to current repository. | ||
Matt Mackall
|
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. | ||||
Benoit Boissinot
|
r8515 | """ | ||
Pierre-Yves David
|
r26322 | if extra is None: | ||
extra = {} | ||||
Matt Mackall
|
r8709 | |||
Matt Mackall
|
r8715 | def fail(f, msg): | ||
Pierre-Yves David
|
r26587 | raise error.Abort('%s: %s' % (f, msg)) | ||
Matt Mackall
|
r8715 | |||
if not match: | ||||
Benoit Boissinot
|
r10651 | match = matchmod.always(self.root, '') | ||
Matt Mackall
|
r8715 | |||
if not force: | ||||
vdirs = [] | ||||
Siddharth Agarwal
|
r19138 | match.explicitdir = vdirs.append | ||
Matt Mackall
|
r8715 | match.bad = fail | ||
Laurent Charignon
|
r26998 | wlock = lock = tr = None | ||
Matt Mackall
|
r4915 | try: | ||
Laurent Charignon
|
r26998 | wlock = self.wlock() | ||
FUJIWARA Katsunori
|
r27291 | lock = self.lock() # for recent changelog (see issue4368) | ||
Matt Mackall
|
r8813 | wctx = self[None] | ||
Benoit Boissinot
|
r10970 | merge = len(wctx.parents()) > 1 | ||
mpm@selenic.com
|
r1089 | |||
Martin von Zweigbergk
|
r32312 | if not force and merge and not match.always(): | ||
Pierre-Yves David
|
r26587 | raise error.Abort(_('cannot partially commit a merge ' | ||
Matt Mackall
|
r8397 | '(do not specify files or patterns)')) | ||
Patrick Mezard
|
r6706 | |||
Martin von Zweigbergk
|
r22928 | status = self.status(match=match, clean=force) | ||
Matt Mackall
|
r8706 | if force: | ||
Martin von Zweigbergk
|
r22928 | status.modified.extend(status.clean) # mq may commit clean files | ||
Benoit Boissinot
|
r3621 | |||
Matt Mackall
|
r8813 | # check subrepos | ||
subs = [] | ||||
Matt Mackall
|
r16073 | commitsubs = set() | ||
newstate = wctx.substate.copy() | ||||
# only manage subrepos and .hgsubstate if .hgsub is present | ||||
Matt Mackall
|
r14536 | if '.hgsub' in wctx: | ||
Matt Mackall
|
r16073 | # we'll decide whether to track this ourselves, thanks | ||
Martin von Zweigbergk
|
r22928 | for c in status.modified, status.added, status.removed: | ||
FUJIWARA Katsunori
|
r20827 | if '.hgsubstate' in c: | ||
c.remove('.hgsubstate') | ||||
Matt Mackall
|
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: | ||||
Pierre-Yves David
|
r26587 | raise error.Abort( | ||
Matt Mackall
|
r16073 | _("commit with new subrepo %s excluded") % s) | ||
FUJIWARA Katsunori
|
r24470 | dirtyreason = wctx.sub(s).dirtyreason(True) | ||
if dirtyreason: | ||||
Matt Mackall
|
r16073 | if not self.ui.configbool('ui', 'commitsubrepos'): | ||
Pierre-Yves David
|
r26587 | raise error.Abort(dirtyreason, | ||
Matt Mackall
|
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 | ||||
Matt Mackall
|
r14536 | for p in wctx.parents(): | ||
Matt Mackall
|
r16073 | r = [s for s in p.substate if s not in newstate] | ||
subs += [s for s in r if match(s)] | ||||
if subs: | ||||
Matt Mackall
|
r14536 | if (not match('.hgsub') and | ||
'.hgsub' in (wctx.modified() + wctx.added())): | ||||
Pierre-Yves David
|
r26587 | raise error.Abort( | ||
Matt Mackall
|
r14536 | _("can't commit subrepos without .hgsub")) | ||
Martin von Zweigbergk
|
r22928 | status.modified.insert(0, '.hgsubstate') | ||
Matt Mackall
|
r16073 | |||
Martin von Zweigbergk
|
r22928 | elif '.hgsub' in status.removed: | ||
Matt Mackall
|
r14536 | # clean up .hgsubstate when .hgsub is removed | ||
if ('.hgsubstate' in wctx and | ||||
Martin von Zweigbergk
|
r22928 | '.hgsubstate' not in (status.modified + status.added + | ||
status.removed)): | ||||
status.removed.insert(0, '.hgsubstate') | ||||
Matt Mackall
|
r8813 | |||
Matt Mackall
|
r8709 | # make sure all explicit patterns are matched | ||
timeless
|
r28813 | if not force: | ||
self.checkcommitpatterns(wctx, vdirs, match, status, fail) | ||||
Matt Mackall
|
r8709 | |||
FUJIWARA Katsunori
|
r23710 | cctx = context.workingcommitctx(self, status, | ||
text, user, date, extra) | ||||
David Schleimer
|
r18659 | |||
Matt Mackall
|
r25840 | # internal config: ui.allowemptycommit | ||
Pierre-Yves David
|
r25021 | allowemptycommit = (wctx.branch() != wctx.p1().branch() | ||
Durham Goode
|
r25018 | or extra.get('close') or merge or cctx.files() | ||
or self.ui.configbool('ui', 'allowemptycommit')) | ||||
Durham Goode
|
r25017 | if not allowemptycommit: | ||
Matt Mackall
|
r8404 | return None | ||
David Schleimer
|
r18660 | if merge and cctx.deleted(): | ||
Pierre-Yves David
|
r26587 | raise error.Abort(_("cannot commit merge with missing files")) | ||
Patrick Mezard
|
r16536 | |||
Siddharth Agarwal
|
r26996 | ms = mergemod.mergestate.read(self) | ||
Augie Fackler
|
r30496 | mergeutil.checkunresolved(ms) | ||
Matt Mackall
|
r8496 | |||
if editor: | ||||
Matt Mackall
|
r8994 | cctx._text = editor(self, cctx, subs) | ||
Greg Ward
|
r9935 | edited = (text != cctx._text) | ||
Matt Mackall
|
r8813 | |||
FUJIWARA Katsunori
|
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) | ||||
Matt Mackall
|
r16073 | # commit subs and write new state | ||
if subs: | ||||
for s in sorted(commitsubs): | ||||
Edouard Gomez
|
r11112 | sub = wctx.sub(s) | ||
self.ui.status(_('committing subrepository %s\n') % | ||||
Mads Kiilerich
|
r12752 | subrepo.subrelpath(sub)) | ||
Edouard Gomez
|
r11112 | sr = sub.commit(cctx._text, user, date) | ||
Matt Mackall
|
r16073 | newstate[s] = (newstate[s][0], sr) | ||
subrepo.writestate(self, newstate) | ||||
Matt Mackall
|
r8813 | |||
Benoit Boissinot
|
r10970 | p1, p2 = self.dirstate.parents() | ||
hookp1, hookp2 = hex(p1), (p2 != nullid and hex(p2) or '') | ||||
Greg Ward
|
r9935 | try: | ||
Brodie Rao
|
r16683 | self.hook("precommit", throw=True, parent1=hookp1, | ||
parent2=hookp2) | ||||
Laurent Charignon
|
r26998 | tr = self.transaction('commit') | ||
Greg Ward
|
r9935 | ret = self.commitctx(cctx, True) | ||
Brodie Rao
|
r16705 | except: # re-raises | ||
Greg Ward
|
r9935 | if edited: | ||
self.ui.write( | ||||
_('note: commit message saved in %s\n') % msgfn) | ||||
raise | ||||
Matt Mackall
|
r13357 | # update bookmarks, dirstate and mergestate | ||
David Soria Parra
|
r16706 | bookmarks.update(self, [p1, p2], ret) | ||
David Schleimer
|
r18661 | cctx.markcommitted(ret) | ||
Matt Mackall
|
r8503 | ms.reset() | ||
Laurent Charignon
|
r26998 | tr.close() | ||
Patrick Mezard
|
r6710 | finally: | ||
Laurent Charignon
|
r26998 | lockmod.release(tr, lock, wlock) | ||
Patrick Mezard
|
r6710 | |||
Mads Kiilerich
|
r16680 | def commithook(node=hex(ret), parent1=hookp1, parent2=hookp2): | ||
Pierre-Yves David
|
r23129 | # hack for command that use a temporary commit (eg: histedit) | ||
# temporary commit got stripped before hook release | ||||
FUJIWARA Katsunori
|
r24992 | if self.changelog.hasnode(ret): | ||
Pierre-Yves David
|
r23129 | self.hook("commit", node=node, parent1=parent1, | ||
parent2=parent2) | ||||
Mads Kiilerich
|
r16680 | self._afterlock(commithook) | ||
Sune Foldager
|
r10492 | return ret | ||
Pierre-Yves David
|
r18016 | @unfilteredmethod | ||
Matt Mackall
|
r8496 | def commitctx(self, ctx, error=False): | ||
Patrick Mezard
|
r7077 | """Add a new revision to current repository. | ||
Matt Mackall
|
r8410 | Revision information is passed via the context argument. | ||
Patrick Mezard
|
r7077 | """ | ||
Patrick Mezard
|
r6715 | |||
Martin von Zweigbergk
|
r22908 | tr = None | ||
Matt Mackall
|
r8414 | p1, p2 = ctx.p1(), ctx.p2() | ||
Matt Mackall
|
r8412 | user = ctx.user() | ||
mpm@selenic.com
|
r1089 | |||
Matt Mackall
|
r8411 | lock = self.lock() | ||
try: | ||||
Steve Borho
|
r10881 | tr = self.transaction("commit") | ||
Matt Mackall
|
r4970 | trp = weakref.proxy(tr) | ||
mpm@selenic.com
|
r1089 | |||
Mateusz Kwapich
|
r30566 | if ctx.manifestnode(): | ||
# reuse an existing manifest revision | ||||
mn = ctx.manifestnode() | ||||
files = ctx.files() | ||||
elif ctx.files(): | ||||
Durham Goode
|
r30345 | m1ctx = p1.manifestctx() | ||
m2ctx = p2.manifestctx() | ||||
mctx = m1ctx.copy() | ||||
m = mctx.read() | ||||
m1 = m1ctx.read() | ||||
m2 = m2ctx.read() | ||||
Peter Arrenbrecht
|
r14162 | |||
# check in files | ||||
Martin von Zweigbergk
|
r22910 | added = [] | ||
Peter Arrenbrecht
|
r14162 | changed = [] | ||
Martin von Zweigbergk
|
r22907 | removed = list(ctx.removed()) | ||
Peter Arrenbrecht
|
r14162 | linkrev = len(self) | ||
Mads Kiilerich
|
r23749 | self.ui.note(_("committing files:\n")) | ||
Peter Arrenbrecht
|
r14162 | for f in sorted(ctx.modified() + ctx.added()): | ||
self.ui.note(f + "\n") | ||||
try: | ||||
fctx = ctx[f] | ||||
Mads Kiilerich
|
r22296 | if fctx is None: | ||
removed.append(f) | ||||
else: | ||||
Martin von Zweigbergk
|
r22910 | added.append(f) | ||
m[f] = self._filecommit(fctx, m1, m2, linkrev, | ||||
trp, changed) | ||||
Augie Fackler
|
r22942 | m.setflag(f, fctx.flags()) | ||
Gregory Szorc
|
r25660 | except OSError as inst: | ||
Matt Mackall
|
r4915 | self.ui.warn(_("trouble committing %s!\n") % f) | ||
raise | ||||
Gregory Szorc
|
r25660 | except IOError as inst: | ||
Peter Arrenbrecht
|
r14162 | errcode = getattr(inst, 'errno', errno.ENOENT) | ||
if error or errcode and errcode != errno.ENOENT: | ||||
self.ui.warn(_("trouble committing %s!\n") % f) | ||||
Mads Kiilerich
|
r22296 | raise | ||
mpm@selenic.com
|
r1089 | |||
Peter Arrenbrecht
|
r14162 | # update manifest | ||
Mads Kiilerich
|
r23749 | self.ui.note(_("committing manifest\n")) | ||
Peter Arrenbrecht
|
r14162 | removed = [f for f in sorted(removed) if f in m1 or f in m2] | ||
Martin von Zweigbergk
|
r22909 | drop = [f for f in removed if f in m] | ||
Peter Arrenbrecht
|
r14162 | for f in drop: | ||
Martin von Zweigbergk
|
r22909 | del m[f] | ||
Durham Goode
|
r30345 | mn = mctx.write(trp, linkrev, | ||
p1.manifestnode(), p2.manifestnode(), | ||||
added, drop) | ||||
Peter Arrenbrecht
|
r14162 | files = changed + removed | ||
else: | ||||
mn = p1.manifestnode() | ||||
files = [] | ||||
mpm@selenic.com
|
r1089 | |||
Matt Mackall
|
r8499 | # update changelog | ||
Mads Kiilerich
|
r23749 | self.ui.note(_("committing changelog\n")) | ||
Pierre-Yves David
|
r23203 | self.changelog.delayupdate(tr) | ||
Peter Arrenbrecht
|
r14162 | n = self.changelog.add(mn, files, ctx.description(), | ||
Matt Mackall
|
r8499 | trp, p1.node(), p2.node(), | ||
Matt Mackall
|
r8412 | user, ctx.date(), ctx.extra().copy()) | ||
Sune Foldager
|
r10492 | xp1, xp2 = p1.hex(), p2 and p2.hex() or '' | ||
Matt Mackall
|
r4915 | self.hook('pretxncommit', throw=True, node=hex(n), parent1=xp1, | ||
FUJIWARA Katsunori
|
r26751 | parent2=xp2) | ||
Pierre-Yves David
|
r15706 | # set the new commit is proper phase | ||
FUJIWARA Katsunori
|
r20176 | targetphase = subrepo.newcommitphase(self.ui, ctx) | ||
Pierre-Yves David
|
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 | ||||
Boris Feld
|
r33454 | phases.registernew(self, tr, targetphase, [n]) | ||
Matt Mackall
|
r4915 | tr.close() | ||
return n | ||||
finally: | ||||
Ronny Pfannschmidt
|
r11230 | if tr: | ||
tr.release() | ||||
Matt Mackall
|
r8405 | lock.release() | ||
mpm@selenic.com
|
r1089 | |||
Pierre-Yves David
|
r18016 | @unfilteredmethod | ||
Idan Kamara
|
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. | ||||
''' | ||||
Idan Kamara
|
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() | ||||
Idan Kamara
|
r18310 | @unfilteredmethod | ||
Pierre-Yves David
|
r18395 | def destroyed(self): | ||
Greg Ward
|
r9150 | '''Inform the repository that nodes have been destroyed. | ||
Intended for use by strip and rollback, so there's a common | ||||
Joshua Redstone
|
r17013 | place for anything that has to be done after destroying history. | ||
''' | ||||
Idan Kamara
|
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. | ||||
Idan Kamara
|
r18757 | self._phasecache.filterunknown(self) | ||
self._phasecache.write() | ||||
Idan Kamara
|
r18221 | |||
Pierre-Yves David
|
r32264 | # refresh all repository caches | ||
self.updatecaches() | ||||
Pierre-Yves David
|
r18223 | |||
Greg Ward
|
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. | ||||
Idan Kamara
|
r18313 | self.invalidate() | ||
Idan Kamara
|
r17324 | |||
Matt Mackall
|
r6585 | def walk(self, match, node=None): | ||
Matt Mackall
|
r3532 | ''' | ||
walk recursively through the directory tree or a given | ||||
changeset, finding all files matched by the match | ||||
function | ||||
''' | ||||
Augie Fackler
|
r32364 | self.ui.deprecwarn('use repo[node].walk instead of repo.walk', '4.3') | ||
Matt Mackall
|
r6764 | return self[node].walk(match) | ||
Matt Mackall
|
r3532 | |||
Matt Mackall
|
r6769 | def status(self, node1='.', node2=None, match=None, | ||
Martin Geisler
|
r12166 | ignored=False, clean=False, unknown=False, | ||
listsubrepos=False): | ||||
Sean Farley
|
r21596 | '''a convenience method that calls node1.status(node2)''' | ||
return self[node1].status(node2, match, ignored, clean, unknown, | ||||
listsubrepos) | ||||
Vadim Gelfer
|
r2661 | |||
Siddharth Agarwal
|
r32814 | def addpostdsstatus(self, ps): | ||
"""Add a callback to run within the wlock, at the point at which status | ||||
fixups happen. | ||||
On status completion, callback(wctx, status) will be called with the | ||||
wlock held, unless the dirstate has changed from underneath or the wlock | ||||
couldn't be grabbed. | ||||
Callbacks should not capture and use a cached copy of the dirstate -- | ||||
it might change in the meanwhile. Instead, they should access the | ||||
dirstate via wctx.repo().dirstate. | ||||
This list is emptied out after each status run -- extensions should | ||||
make sure it adds to this list each time dirstate.status is called. | ||||
Extensions should also make sure they don't call this for statuses | ||||
that don't involve the dirstate. | ||||
""" | ||||
# The list is located here for uniqueness reasons -- it is actually | ||||
# managed by the workingctx, but that isn't unique per-repo. | ||||
self._postdsstatus.append(ps) | ||||
def postdsstatus(self): | ||||
"""Used by workingctx to get the list of post-dirstate-status hooks.""" | ||||
return self._postdsstatus | ||||
def clearpostdsstatus(self): | ||||
"""Used by workingctx to clear post-dirstate-status hooks.""" | ||||
del self._postdsstatus[:] | ||||
John Mulligan
|
r8796 | def heads(self, start=None): | ||
Stanislau Hlebik
|
r30875 | if start is None: | ||
Stanislau Hlebik
|
r30905 | cl = self.changelog | ||
Stanislau Hlebik
|
r30906 | headrevs = reversed(cl.headrevs()) | ||
Stanislau Hlebik
|
r30905 | return [cl.node(rev) for rev in headrevs] | ||
Stanislau Hlebik
|
r30875 | |||
Benoit Boissinot
|
r1550 | heads = self.changelog.heads(start) | ||
# sort the output in rev descending order | ||||
Thomas Arendsen Hein
|
r13075 | return sorted(heads, key=self.changelog.rev, reverse=True) | ||
mpm@selenic.com
|
r1089 | |||
John Mulligan
|
r8694 | def branchheads(self, branch=None, start=None, closed=False): | ||
Sune Foldager
|
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. | ||||
''' | ||||
Matt Mackall
|
r6747 | if branch is None: | ||
branch = self[None].branch() | ||||
Benoit Boissinot
|
r9675 | branches = self.branchmap() | ||
Eric Hopper
|
r4648 | if branch not in branches: | ||
return [] | ||||
John Mulligan
|
r7654 | # the cache returns heads ordered lowest to highest | ||
Brodie Rao
|
r20189 | bheads = list(reversed(branches.branchheads(branch, closed=closed))) | ||
Eric Hopper
|
r4648 | if start is not None: | ||
John Mulligan
|
r7654 | # filter out the heads that cannot be reached from startrev | ||
Sune Foldager
|
r9475 | fbheads = set(self.changelog.nodesbetween([start], bheads)[2]) | ||
bheads = [h for h in bheads if h in fbheads] | ||||
John Mulligan
|
r7654 | return bheads | ||
Eric Hopper
|
r4648 | |||
mpm@selenic.com
|
r1089 | def branches(self, nodes): | ||
Thomas Arendsen Hein
|
r1615 | if not nodes: | ||
nodes = [self.changelog.tip()] | ||||
mpm@selenic.com
|
r1089 | b = [] | ||
for n in nodes: | ||||
t = n | ||||
Martin Geisler
|
r14494 | while True: | ||
mpm@selenic.com
|
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 | ||||
Matt Mackall
|
r7708 | while n != bottom and n != nullid: | ||
mpm@selenic.com
|
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 | ||||
Pierre-Yves David
|
r20924 | def checkpush(self, pushop): | ||
Patrick Mezard
|
r13327 | """Extensions can override this function if additional checks have | ||
to be performed before pushing, or call it if they override push | ||||
command. | ||||
""" | ||||
FUJIWARA Katsunori
|
r21043 | @unfilteredpropertycache | ||
def prepushoutgoinghooks(self): | ||||
Mads Kiilerich
|
r28876 | """Return util.hooks consists of a pushop with repo, remote, outgoing | ||
methods, which are called before pushing changesets. | ||||
FUJIWARA Katsunori
|
r21043 | """ | ||
return util.hooks() | ||||
Matt Mackall
|
r11368 | def pushkey(self, namespace, key, old, new): | ||
Pierre-Yves David
|
r23416 | try: | ||
Pierre-Yves David
|
r24824 | tr = self.currenttransaction() | ||
hookargs = {} | ||||
if tr is not None: | ||||
hookargs.update(tr.hookargs) | ||||
hookargs['namespace'] = namespace | ||||
hookargs['key'] = key | ||||
hookargs['old'] = old | ||||
hookargs['new'] = new | ||||
self.hook('prepushkey', throw=True, **hookargs) | ||||
Gregory Szorc
|
r25660 | except error.HookAbort as exc: | ||
Pierre-Yves David
|
r23416 | self.ui.write_err(_("pushkey-abort: %s\n") % exc) | ||
if exc.hint: | ||||
self.ui.write_err(_("(%s)\n") % exc.hint) | ||||
return False | ||||
Pierre-Yves David
|
r17293 | self.ui.debug('pushing key for "%s:%s"\n' % (namespace, key)) | ||
Brodie Rao
|
r14102 | ret = pushkey.push(self, namespace, key, old, new) | ||
Pierre-Yves David
|
r23648 | def runhook(): | ||
self.hook('pushkey', namespace=namespace, key=key, old=old, new=new, | ||||
ret=ret) | ||||
self._afterlock(runhook) | ||||
Brodie Rao
|
r14102 | return ret | ||
Matt Mackall
|
r11368 | |||
def listkeys(self, namespace): | ||||
Brodie Rao
|
r14102 | self.hook('prelistkeys', throw=True, namespace=namespace) | ||
Pierre-Yves David
|
r17293 | self.ui.debug('listing keys for "%s"\n' % namespace) | ||
Brodie Rao
|
r14102 | values = pushkey.list(self, namespace) | ||
self.hook('listkeys', namespace=namespace, values=values) | ||||
return values | ||||
Matt Mackall
|
r11368 | |||
Peter Arrenbrecht
|
r14048 | def debugwireargs(self, one, two, three=None, four=None, five=None): | ||
Peter Arrenbrecht
|
r13720 | '''used to test argument passing over the wire''' | ||
Peter Arrenbrecht
|
r14048 | return "%s %s %s %s %s" % (one, two, three, four, five) | ||
Matt Mackall
|
r11368 | |||
Patrick Mezard
|
r14529 | def savecommitmessage(self, text): | ||
Angel Ezquerra
|
r23852 | fp = self.vfs('last-message.txt', 'wb') | ||
Patrick Mezard
|
r14529 | try: | ||
fp.write(text) | ||||
finally: | ||||
fp.close() | ||||
Mads Kiilerich
|
r18054 | return self.pathto(fp.name[len(self.root) + 1:]) | ||
Patrick Mezard
|
r14529 | |||
mason@suse.com
|
r1806 | # used to avoid circular references so destructors work | ||
Benoit Boissinot
|
r3790 | def aftertrans(files): | ||
renamefiles = [tuple(t) for t in files] | ||||
mason@suse.com
|
r1806 | def a(): | ||
FUJIWARA Katsunori
|
r18952 | for vfs, src, dest in renamefiles: | ||
Ryan McElroy
|
r31550 | # if src and dest refer to a same file, vfs.rename is a no-op, | ||
# leaving both src and dest on disk. delete dest to make sure | ||||
# the rename couldn't be such a no-op. | ||||
vfs.tryunlink(dest) | ||||
Jun Wu
|
r31209 | try: | ||
FUJIWARA Katsunori
|
r18952 | vfs.rename(src, dest) | ||
Alain Leufroy
|
r16441 | except OSError: # journal file does not yet exist | ||
pass | ||||
mason@suse.com
|
r1806 | return a | ||
Alexander Solovyov
|
r14266 | def undoname(fn): | ||
base, name = os.path.split(fn) | ||||
assert name.startswith('journal') | ||||
return os.path.join(base, name.replace('journal', 'undo', 1)) | ||||
Vadim Gelfer
|
r2740 | def instance(ui, path, create): | ||
Mads Kiilerich
|
r14825 | return localrepository(ui, util.urllocalpath(path), create) | ||
Thomas Arendsen Hein
|
r3223 | |||
Vadim Gelfer
|
r2740 | def islocal(path): | ||
return True | ||||
Gregory Szorc
|
r28164 | |||
def newreporequirements(repo): | ||||
"""Determine the set of requirements for a new local repository. | ||||
Extensions can wrap this function to specify custom requirements for | ||||
new repositories. | ||||
""" | ||||
ui = repo.ui | ||||
Martin von Zweigbergk
|
r32291 | requirements = {'revlogv1'} | ||
r33244 | if ui.configbool('format', 'usestore'): | |||
Gregory Szorc
|
r28164 | requirements.add('store') | ||
r33242 | if ui.configbool('format', 'usefncache'): | |||
Gregory Szorc
|
r28164 | requirements.add('fncache') | ||
r33234 | if ui.configbool('format', 'dotencode'): | |||
Gregory Szorc
|
r28164 | requirements.add('dotencode') | ||
Jun Wu
|
r33499 | compengine = ui.config('experimental', 'format.compression') | ||
Gregory Szorc
|
r30818 | if compengine not in util.compengines: | ||
raise error.Abort(_('compression engine %s defined by ' | ||||
'experimental.format.compression not available') % | ||||
compengine, | ||||
hint=_('run "hg debuginstall" to list available ' | ||||
'compression engines')) | ||||
# zlib is the historical default and doesn't need an explicit requirement. | ||||
if compengine != 'zlib': | ||||
requirements.add('exp-compression-%s' % compengine) | ||||
Gregory Szorc
|
r28164 | if scmutil.gdinitconfig(ui): | ||
requirements.add('generaldelta') | ||||
Jun Wu
|
r33499 | if ui.configbool('experimental', 'treemanifest'): | ||
Gregory Szorc
|
r28164 | requirements.add('treemanifest') | ||
Jun Wu
|
r33499 | if ui.configbool('experimental', 'manifestv2'): | ||
Gregory Szorc
|
r28164 | requirements.add('manifestv2') | ||
Gregory Szorc
|
r32697 | revlogv2 = ui.config('experimental', 'revlogv2') | ||
if revlogv2 == 'enable-unstable-format-and-corrupt-my-data': | ||||
requirements.remove('revlogv1') | ||||
# generaldelta is implied by revlogv2. | ||||
requirements.discard('generaldelta') | ||||
requirements.add(REVLOGV2_REQUIREMENT) | ||||
Gregory Szorc
|
r28164 | return requirements | ||