##// END OF EJS Templates
util: adjust hgexecutable() to handle frozen Mercurial on OS X...
util: adjust hgexecutable() to handle frozen Mercurial on OS X sys.executable is "$appbundle/Contents/MacOS/python" when Mercurial is bundled in a frozen app bundle on OS X, so that isn't appropriate. It appears that this was only visible for things launched via util.system(), like external hooks, where $HG was set wrong. It appears that Mercurial also uses 'sys.modules['__main__'].__file__' (here) and 'sys.argv[0]' (in platform.gethgcmd()) to figure out the command to spawn. In both cases, this points to "$appbundle/Contents/Resources/hg", which invokes the system python since "/usr/bin/env python" is on the shebang line. On my system with a screwed up python install, I get an error importing the os module if this script is invoked. We could take the dirname of sys.executable and join 'hg' instead of this if we want to be paranoid, but py2app boostrap is setting the environment variable since 0.1.6 (current version is 0.9), so it seems safe and we might as well use it.

File last commit:

r27698:dad6404c default
r27765:f1fb93ee default
Show More
localrepo.py
1961 lines | 72.9 KiB | text/x-python | PythonLexer
mpm@selenic.com
Break apart hg.py...
r1089 # localrepo.py - read/write repository class for mercurial
#
Thomas Arendsen Hein
Updated copyright notices and add "and others" to "hg version"
r4635 # Copyright 2005-2007 Matt Mackall <mpm@selenic.com>
mpm@selenic.com
Break apart hg.py...
r1089 #
Martin Geisler
updated license to be explicit about GPL version 2
r8225 # This software may be used and distributed according to the terms of the
Matt Mackall
Update license to GPLv2+
r10263 # GNU General Public License version 2 or any later version.
Gregory Szorc
localrepo: use absolute_import
r27522
from __future__ import absolute_import
import errno
import inspect
import os
import random
import time
Pierre-Yves David
bundle2: advertise bundle2 caps in server capabilities...
r21141 import urllib
Gregory Szorc
localrepo: use absolute_import
r27522 import weakref
from .i18n import _
from .node import (
hex,
nullid,
short,
wdirrev,
)
from . import (
bookmarks,
branchmap,
bundle2,
changegroup,
changelog,
cmdutil,
context,
dirstate,
encoding,
error,
exchange,
extensions,
filelog,
hook,
lock as lockmod,
manifest,
match as matchmod,
merge as mergemod,
namespaces,
obsolete,
pathutil,
peer,
phases,
pushkey,
repoview,
revset,
scmutil,
store,
subrepo,
tags as tagsmod,
transaction,
util,
)
release = lockmod.release
Matt Mackall
localrepo: use propertycache
r8260 propertycache = util.propertycache
Idan Kamara
localrepo: decorate dirstate() with filecache...
r14930 filecache = scmutil.filecache
Ronny Pfannschmidt
switch lock releasing in the core from gc to explicit
r8109
Pierre-Yves David
clfilter: ensure that filecache on localrepo is unfiltered...
r18014 class repofilecache(filecache):
"""All filecache usage on repo are done for logic that should be unfiltered
"""
def __get__(self, repo, type=None):
return super(repofilecache, self).__get__(repo.unfiltered(), type)
def __set__(self, repo, value):
return super(repofilecache, self).__set__(repo.unfiltered(), value)
def __delete__(self, repo):
return super(repofilecache, self).__delete__(repo.unfiltered())
class storecache(repofilecache):
Idan Kamara
filecache: refactor path join logic to a function...
r16198 """filecache for files in the store"""
def join(self, obj, fname):
return obj.sjoin(fname)
Pierre-Yves David
clfilter: add a propertycache that must be unfiltered...
r18013 class unfilteredpropertycache(propertycache):
"""propertycache that apply to unfiltered repo only"""
def __get__(self, repo, type=None):
Pierre-Yves David
repoview: have unfilteredpropertycache using the underlying cache...
r19846 unfi = repo.unfiltered()
if unfi is repo:
return super(unfilteredpropertycache, self).__get__(unfi)
return getattr(unfi, self.name)
Pierre-Yves David
clfilter: add a propertycache that must be unfiltered...
r18013
class filteredpropertycache(propertycache):
"""propertycache that must take filtering in account"""
def cachevalue(self, obj, value):
object.__setattr__(obj, self.name, value)
def hasunfilteredcache(repo, name):
Mads Kiilerich
spelling: fix some minor issues found by spell checker
r18644 """check if a repo has an unfilteredpropertycache value for <name>"""
Pierre-Yves David
clfilter: add a propertycache that must be unfiltered...
r18013 return name in vars(repo.unfiltered())
Pierre-Yves David
clfilter: rename `unfilteredmeth` to `unfilteredmethod`...
r18016 def unfilteredmethod(orig):
Pierre-Yves David
clfilter: introduce an `unfilteredmethod` decorator...
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
Pierre-Yves David
bundle2: allow pulling changegroups using bundle2...
r20955 moderncaps = set(('lookup', 'branchmap', 'pushkey', 'known', 'getbundle',
Pierre-Yves David
bundle2: advertise bundle2 caps in server capabilities...
r21141 'unbundle'))
Pierre-Yves David
localrepo: rename capability set to lower case....
r20776 legacycaps = moderncaps.union(set(['changegroupsubset']))
Peter Arrenbrecht
peer: introduce real peer classes...
r17192
class localpeer(peer.peerrepository):
'''peer for a local repo; reflects only the most recent API'''
Pierre-Yves David
localrepo: rename capability set to lower case....
r20776 def __init__(self, repo, caps=moderncaps):
Peter Arrenbrecht
peer: introduce real peer classes...
r17192 peer.peerrepository.__init__(self)
Kevin Bullock
filtering: rename filters to their antonyms...
r18382 self._repo = repo.filtered('served')
Peter Arrenbrecht
peer: introduce real peer classes...
r17192 self.ui = repo.ui
self._caps = repo._restrictcapabilities(caps)
self.requirements = repo.requirements
self.supportedformats = repo.supportedformats
def close(self):
self._repo.close()
def _capabilities(self):
return self._caps
def local(self):
return self._repo
Sune Foldager
peer: introduce canpush and improve error message
r17193 def canpush(self):
return True
Peter Arrenbrecht
peer: introduce real peer classes...
r17192 def url(self):
return self._repo.url()
def lookup(self, key):
return self._repo.lookup(key)
def branchmap(self):
Pierre-Yves David
clfilter: drop extra filtering in localpeer...
r18279 return self._repo.branchmap()
Peter Arrenbrecht
peer: introduce real peer classes...
r17192
def heads(self):
Pierre-Yves David
clfilter: drop extra filtering in localpeer...
r18279 return self._repo.heads()
Peter Arrenbrecht
peer: introduce real peer classes...
r17192
def known(self, nodes):
return self._repo.known(nodes)
Pierre-Yves David
localpeer: propagate bundlecaps in getbundle call...
r20953 def getbundle(self, source, heads=None, common=None, bundlecaps=None,
Martin von Zweigbergk
localrepo.getbundle: drop unused 'format' argument...
r24639 **kwargs):
Pierre-Yves David
bundle2: return a stream from exchange.getbundle...
r21068 cg = exchange.getbundle(self._repo, source, heads=heads,
Pierre-Yves David
getbundle: pass arbitrary arguments all along the call chain...
r21157 common=common, bundlecaps=bundlecaps, **kwargs)
Pierre-Yves David
bundle2: rename format, parts and config to final names...
r24686 if bundlecaps is not None and 'HG20' in bundlecaps:
Pierre-Yves David
bundle2: return a stream from exchange.getbundle...
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.
Pierre-Yves David
unbundle20: retrieve unbundler instances through a factory function...
r24641 cg = bundle2.getunbundler(self.ui, cg)
Pierre-Yves David
bundle2: return a stream from exchange.getbundle...
r21068 return cg
Peter Arrenbrecht
peer: introduce real peer classes...
r17192
# TODO We might want to move the next two calls into legacypeer and add
# unbundle instead.
Pierre-Yves David
localrepo: add unbundle support...
r20969 def unbundle(self, cg, heads, url):
"""apply a bundle on a repo
This function handles the repo locking itself."""
try:
Pierre-Yves David
bundle2: add on more layer of exception catching in localrepo.unbundle...
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
global: mass rewrite to use modern exception syntax...
r25660 except Exception as exc:
Pierre-Yves David
bundle2-localpeer: properly propagate the server output on error (issue4594)...
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
bundle2: add on more layer of exception catching in localrepo.unbundle...
r24798 raise
Gregory Szorc
global: mass rewrite to use modern exception syntax...
r25660 except error.PushRaced as exc:
Pierre-Yves David
bundle2: gracefully handle PushRaced error during unbundle...
r21186 raise error.ResponseError(_('push failed:'), str(exc))
Pierre-Yves David
localrepo: add unbundle support...
r20969
Peter Arrenbrecht
peer: introduce real peer classes...
r17192 def lock(self):
return self._repo.lock()
def addchangegroup(self, cg, source, url):
Augie Fackler
localrepo: use cg?unpacker.apply() instead of changegroup.addchangegroup()...
r26702 return cg.apply(self._repo, source, url)
Peter Arrenbrecht
peer: introduce real peer classes...
r17192
def pushkey(self, namespace, key, old, new):
return self._repo.pushkey(namespace, key, old, new)
def listkeys(self, namespace):
return self._repo.listkeys(namespace)
def debugwireargs(self, one, two, three=None, four=None, five=None):
'''used to test argument passing over the wire'''
return "%s %s %s %s %s" % (one, two, three, four, five)
class locallegacypeer(localpeer):
'''peer extension which implements legacy methods too; used for tests with
restricted capabilities'''
def __init__(self, repo):
Pierre-Yves David
localrepo: rename capability set to lower case....
r20776 localpeer.__init__(self, repo, caps=legacycaps)
Peter Arrenbrecht
peer: introduce real peer classes...
r17192
def branches(self, nodes):
return self._repo.branches(nodes)
def between(self, pairs):
return self._repo.between(pairs)
def changegroup(self, basenodes, source):
Pierre-Yves David
localrepo: move the changegroup method in changegroup module...
r20931 return changegroup.changegroup(self._repo, basenodes, source)
Peter Arrenbrecht
peer: introduce real peer classes...
r17192
def changegroupsubset(self, bases, heads, source):
Pierre-Yves David
localrepo: move the changegroupsubset method in changegroup module...
r20927 return changegroup.changegroupsubset(self._repo, bases, heads, source)
Peter Arrenbrecht
peer: introduce real peer classes...
r17192
class localrepository(object):
Martin von Zweigbergk
treemanifest: set requires at repo creation time, ignore config after...
r24956 supportedformats = set(('revlogv1', 'generaldelta', 'treemanifest',
'manifestv2'))
FUJIWARA Katsunori
localrepo: make supported features manageable in each repositories individually...
r19778 _basesupported = supportedformats | set(('store', 'fncache', 'shared',
'dotencode'))
Martin von Zweigbergk
treemanifest: set requires at repo creation time, ignore config after...
r24956 openerreqs = set(('revlogv1', 'generaldelta', 'treemanifest', 'manifestv2'))
Pierre-Yves David
clfilter: ensure unfiltered repo have a filtername attribute too...
r18186 filtername = None
Bryan O'Sullivan
localrepo: make requirements and openerreqs mutable by subclasses...
r17137
FUJIWARA Katsunori
localrepo: invoke only feature setup functions for enabled extensions...
r19928 # a list of (ui, featureset) functions.
# only functions defined in module of enabled extensions are invoked
FUJIWARA Katsunori
localrepo: make supported features manageable in each repositories individually...
r19778 featuresetupfuncs = set()
Bryan O'Sullivan
localrepo: make requirements and openerreqs mutable by subclasses...
r17137 def _baserequirements(self, create):
Drew Gottlieb
localrepo: eliminate requirements class variable (API)...
r24913 return ['revlogv1']
Vadim Gelfer
extend network protocol to stop clients from locking servers...
r2439
Martin Geisler
localrepo, sshrepo: use Boolean create argument in __init__
r14363 def __init__(self, baseui, path=None, create=False):
Drew Gottlieb
localrepo: eliminate local requirements var in init...
r24918 self.requirements = set()
FUJIWARA Katsunori
vfs: split "expand" into "realpath"/"expandpath" to apply each separately...
r18945 self.wvfs = scmutil.vfs(path, expandpath=True, realpath=True)
FUJIWARA Katsunori
localrepo: use "vfs" constructor instead of "opener" one...
r17650 self.wopener = self.wvfs
FUJIWARA Katsunori
localrepo: use path expansion API via vfs...
r17157 self.root = self.wvfs.base
FUJIWARA Katsunori
localrepo: use "self.wvfs.join()" instead of "os.path.join()"...
r17158 self.path = self.wvfs.join(".hg")
Benoit Boissinot
move code around
r3850 self.origroot = path
Augie Fackler
pathutil: tease out a new library to break an import cycle from canonpath use
r20033 self.auditor = pathutil.pathauditor(self.root, self._checknested)
Pierre-Yves David
localrepo: add a second auditor without file system check...
r27233 self.nofsauditor = pathutil.pathauditor(self.root, self._checknested,
realfs=False)
FUJIWARA Katsunori
localrepo: use "vfs" constructor instead of "opener" one...
r17650 self.vfs = scmutil.vfs(self.path)
self.opener = self.vfs
Matt Mackall
repo: set up ui and extensions earlier
r8797 self.baseui = baseui
self.ui = baseui.copy()
Simon Heimberg
localrepo: prevent to copy repo local config, copy baseui instead...
r20082 self.ui.copy = baseui.copy # prevent copying repo configuration
Pierre-Yves David
phases: mechanism to allow extension to alter initial computation of phase...
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
repo: set up ui and extensions earlier
r8797 try:
self.ui.readconfig(self.join("hgrc"), self.root)
extensions.loadall(self.ui)
except IOError:
pass
mpm@selenic.com
Break apart hg.py...
r1089
FUJIWARA Katsunori
localrepo: make supported features manageable in each repositories individually...
r19778 if self.featuresetupfuncs:
self.supported = set(self._basesupported) # use private copy
FUJIWARA Katsunori
localrepo: invoke only feature setup functions for enabled extensions...
r19928 extmods = set(m.__name__ for n, m
in extensions.extensions(self.ui))
FUJIWARA Katsunori
localrepo: make supported features manageable in each repositories individually...
r19778 for setupfunc in self.featuresetupfuncs:
FUJIWARA Katsunori
localrepo: invoke only feature setup functions for enabled extensions...
r19928 if setupfunc.__module__ in extmods:
setupfunc(self.ui, self.supported)
FUJIWARA Katsunori
localrepo: make supported features manageable in each repositories individually...
r19778 else:
self.supported = self._basesupported
FUJIWARA Katsunori
localrepo: use file API via vfs while ensuring repository directory...
r17161 if not self.vfs.isdir():
Benoit Boissinot
localrepo: move the repo creation code, fail if the repo exists
r3035 if create:
FUJIWARA Katsunori
localrepo: use file API via vfs while ensuring repository directory...
r17161 if not self.wvfs.exists():
self.wvfs.makedirs()
self.vfs.makedir(notindexed=True)
Drew Gottlieb
localrepo: eliminate local requirements var in init...
r24918 self.requirements.update(self._baserequirements(create))
Matt Mackall
repo: set up ui and extensions earlier
r8797 if self.ui.configbool('format', 'usestore', True):
FUJIWARA Katsunori
localrepo: use file API via vfs while ensuring repository directory...
r17161 self.vfs.mkdir("store")
Drew Gottlieb
localrepo: eliminate local requirements var in init...
r24918 self.requirements.add("store")
Matt Mackall
repo: set up ui and extensions earlier
r8797 if self.ui.configbool('format', 'usefncache', True):
Drew Gottlieb
localrepo: eliminate local requirements var in init...
r24918 self.requirements.add("fncache")
Adrian Buehlmann
store: encode first period or space in filenames (issue1713)...
r12687 if self.ui.configbool('format', 'dotencode', True):
Drew Gottlieb
localrepo: eliminate local requirements var in init...
r24918 self.requirements.add('dotencode')
Alexis S. L. Carvalho
small fixes for the parent patch...
r4166 # create an invalid changelog
FUJIWARA Katsunori
localrepo: use "vfs" intead of "opener" while ensuring repository directory...
r17160 self.vfs.append(
Dan Villiom Podlaski Christiansen
prevent transient leaks of file handle by using new helper functions...
r14168 "00changelog.i",
Alexis S. L. Carvalho
small fixes for the parent patch...
r4166 '\0\0\0\2' # represents revlogv2
' dummy changelog to prevent using the old repo layout'
)
Pierre-Yves David
scmutil: extract general delta config handling in a function...
r26906 if scmutil.gdinitconfig(self.ui):
Drew Gottlieb
localrepo: eliminate local requirements var in init...
r24918 self.requirements.add("generaldelta")
Martin von Zweigbergk
treemanifest: set requires at repo creation time, ignore config after...
r24956 if self.ui.configbool('experimental', 'treemanifest', False):
self.requirements.add("treemanifest")
Martin von Zweigbergk
manifestv2: set requires at repo creation time...
r24571 if self.ui.configbool('experimental', 'manifestv2', False):
Drew Gottlieb
localrepo: eliminate local requirements var in init...
r24918 self.requirements.add("manifestv2")
Benoit Boissinot
localrepo: move the repo creation code, fail if the repo exists
r3035 else:
Matt Mackall
error: move repo errors...
r7637 raise error.RepoError(_("repository %s not found") % path)
Benoit Boissinot
localrepo: move the repo creation code, fail if the repo exists
r3035 elif create:
Matt Mackall
error: move repo errors...
r7637 raise error.RepoError(_("repository %s already exists") % path)
Benoit Boissinot
add "requires" file to the repo, specifying the requirements
r3851 else:
try:
Drew Gottlieb
localrepo: eliminate local requirements var in init...
r24918 self.requirements = scmutil.readrequires(
self.vfs, self.supported)
Gregory Szorc
global: mass rewrite to use modern exception syntax...
r25660 except IOError as inst:
Benoit Boissinot
add "requires" file to the repo, specifying the requirements
r3851 if inst.errno != errno.ENOENT:
raise
mpm@selenic.com
Break apart hg.py...
r1089
Matt Mackall
repo: add internal support for sharing store directories...
r8799 self.sharedpath = self.path
try:
FUJIWARA Katsunori
localrepo: use vfs instead of "os.path.*" in sharedpath checking...
r18946 vfs = scmutil.vfs(self.vfs.read("sharedpath").rstrip('\n'),
realpath=True)
s = vfs.base
if not vfs.exists():
Matt Mackall
repo: add internal support for sharing store directories...
r8799 raise error.RepoError(
Dongsheng Song
Fix warning: Seen unexpected token "%"
r8908 _('.hg/sharedpath points to nonexistent directory %s') % s)
Matt Mackall
repo: add internal support for sharing store directories...
r8799 self.sharedpath = s
Gregory Szorc
global: mass rewrite to use modern exception syntax...
r25660 except IOError as inst:
Matt Mackall
repo: add internal support for sharing store directories...
r8799 if inst.errno != errno.ENOENT:
raise
Drew Gottlieb
localrepo: eliminate local requirements var in init...
r24918 self.store = store.store(
self.requirements, self.sharedpath, scmutil.vfs)
Adrian Buehlmann
introduce store classes...
r6840 self.spath = self.store.path
FUJIWARA Katsunori
localrepo: use "vfs" constructor/field for initialization around "store"
r17654 self.svfs = self.store.vfs
Adrian Buehlmann
introduce store classes...
r6840 self.sjoin = self.store.join
FUJIWARA Katsunori
localrepo: use "vfs" constructor/field for initialization around "store"
r17654 self.vfs.createmode = self.store.createmode
Drew Gottlieb
localrepo: make _applyrequirements more specific...
r24915 self._applyopenerreqs()
Sune Foldager
localrepo: factor out requirement application and write
r12295 if create:
self._writerequirements()
Benoit Boissinot
move code around
r3850
Siddharth Agarwal
localrepo: move dirstate validate function to class scope...
r26155 self._dirstatevalidatewarned = False
Greg Ward
localrepo: rename in-memory tag cache instance attributes (issue548)....
r9146
Pierre-Yves David
branchmap: enable caching for filtered version too...
r18189 self._branchcaches = {}
Durham Goode
revbranchcache: move out of branchmap onto localrepo...
r24373 self._revbranchcache = None
Matt Mackall
unify encode/decode filter routines
r4004 self.filterpats = {}
Patrick Mezard
Register data filters in a localrepo instead of util...
r5966 self._datafilters = {}
Matt Mackall
Use a weakref for recursive transactions
r4916 self._transref = self._lockref = self._wlockref = None
mpm@selenic.com
Break apart hg.py...
r1089
Idan Kamara
localrepo: add a cache with stat info for files under .hg/
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
clfilter: add a cache on repo for set of revision to filter for a given set....
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 = {}
Sean Farley
namespaces: add bookmarks to the names data structure...
r23558 # generic mapping between names and nodes
Ryan McElroy
namespaces: remove weakref; always pass in repo...
r23561 self.names = namespaces.namespaces()
Sean Farley
namespaces: add bookmarks to the names data structure...
r23558
Peter Arrenbrecht
peer: introduce real peer classes...
r17192 def close(self):
Durham Goode
revbranchcache: write cache even during read operations...
r24378 self._writecaches()
def _writecaches(self):
if self._revbranchcache:
self._revbranchcache.write()
Peter Arrenbrecht
peer: introduce real peer classes...
r17192
def _restrictcapabilities(self, caps):
Pierre-Yves David
bundle2: advertise bundle2 by default...
r24696 if self.ui.configbool('experimental', 'bundle2-advertise', True):
Pierre-Yves David
bundle2: allow pulling changegroups using bundle2...
r20955 caps = set(caps)
Pierre-Yves David
bundle2: introduce a `getrepocaps` to retrieve the bundle2 caps of a repo...
r22342 capsblob = bundle2.encodecaps(bundle2.getrepocaps(self))
Pierre-Yves David
bundle2: rename format, parts and config to final names...
r24686 caps.add('bundle2=' + urllib.quote(capsblob))
Peter Arrenbrecht
peer: introduce real peer classes...
r17192 return caps
Drew Gottlieb
localrepo: make _applyrequirements more specific...
r24915 def _applyopenerreqs(self):
self.svfs.options = dict((r, 1) for r in self.requirements
Bryan O'Sullivan
localrepo: make requirements and openerreqs mutable by subclasses...
r17137 if r in self.openerreqs)
Matt Mackall
localrepo: mark format options
r25839 # experimental config: format.chunkcachesize
Brodie Rao
revlog: allow tuning of the chunk cache size (via format.chunkcachesize)...
r20180 chunkcachesize = self.ui.configint('format', 'chunkcachesize')
if chunkcachesize is not None:
Angel Ezquerra
localrepo: remove all internal uses of localrepo.sopener...
r23853 self.svfs.options['chunkcachesize'] = chunkcachesize
Matt Mackall
localrepo: mark format options
r25839 # experimental config: format.maxchainlen
Augie Fackler
localrepo: rename revlog.maxchainlen to format.maxchainlen...
r23256 maxchainlen = self.ui.configint('format', 'maxchainlen')
Mateusz Kwapich
revlog: add config variable for limiting delta-chain length...
r23255 if maxchainlen is not None:
Angel Ezquerra
localrepo: remove all internal uses of localrepo.sopener...
r23853 self.svfs.options['maxchainlen'] = maxchainlen
Matt Mackall
localrepo: mark format options
r25839 # experimental config: format.manifestcachesize
Durham Goode
manifest: make lru size configurable...
r24033 manifestcachesize = self.ui.configint('format', 'manifestcachesize')
if manifestcachesize is not None:
self.svfs.options['manifestcachesize'] = manifestcachesize
Durham Goode
revlog: add an aggressivemergedelta option...
r26118 # experimental config: format.aggressivemergedeltas
aggressivemergedeltas = self.ui.configbool('format',
'aggressivemergedeltas', False)
self.svfs.options['aggressivemergedeltas'] = aggressivemergedeltas
Pierre-Yves David
format: introduce 'format.usegeneraldelta`...
r26907 self.svfs.options['lazydeltabase'] = not scmutil.gddeltaconfig(self.ui)
Sune Foldager
localrepo: factor out requirement application and write
r12295
def _writerequirements(self):
Drew Gottlieb
requires: move requires file writing func from localrepo to scmutil...
r24934 scmutil.writerequires(self.vfs, self.requirements)
Sune Foldager
localrepo: factor out requirement application and write
r12295
Martin Geisler
localrepo: add auditor attribute which knows about subrepos
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
windows: use normalized path to check repository nesting...
r15722 normsubpath = util.pconvert(subpath)
Martin Geisler
localrepo: add auditor attribute which knows about subrepos
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
localrepo: check nested repos against working directory...
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
localrepo: add auditor attribute which knows about subrepos
r12162 parts = util.splitpath(subpath)
while parts:
FUJIWARA Katsunori
windows: use normalized path to check repository nesting...
r15722 prefix = '/'.join(parts)
Martin Geisler
localrepo: add auditor attribute which knows about subrepos
r12162 if prefix in ctx.substate:
FUJIWARA Katsunori
windows: use normalized path to check repository nesting...
r15722 if prefix == normsubpath:
Martin Geisler
localrepo: add auditor attribute which knows about subrepos
r12162 return True
else:
sub = ctx.sub(prefix)
return sub.checknested(subpath[len(prefix) + 1:])
else:
parts.pop()
return False
Peter Arrenbrecht
peer: introduce real peer classes...
r17192 def peer(self):
return localpeer(self) # not cached to avoid reference cycle
Pierre-Yves David
clfilter: introduce an "unfiltered" method on localrepo...
r17993 def unfiltered(self):
"""Return unfiltered version of the repository
Mads Kiilerich
spelling: fix some minor issues found by spell checker
r18644 Intended to be overwritten by filtered repo."""
Pierre-Yves David
clfilter: introduce an "unfiltered" method on localrepo...
r17993 return self
Pierre-Yves David
clfilter: add actual repo filtering mechanism...
r18100 def filtered(self, name):
"""Return a filtered version of a repository"""
# build a new class with the mixin and the current class
Mads Kiilerich
spelling: fix some minor issues found by spell checker
r18644 # (possibly subclass of the repo)
Pierre-Yves David
clfilter: add actual repo filtering mechanism...
r18100 class proxycls(repoview.repoview, self.unfiltered().__class__):
pass
return proxycls(self, name)
Augie Fackler
bmstore: add handling of the active bookmark...
r27698 @repofilecache('bookmarks', 'bookmarks.current')
Matt Mackall
bookmarks: move property methods into localrepo
r13355 def _bookmarks(self):
Augie Fackler
bookmarks: introduce a bmstore to manage bookmark persistence...
r17922 return bookmarks.bmstore(self)
Matt Mackall
bookmarks: move property methods into localrepo
r13355
Augie Fackler
bmstore: add handling of the active bookmark...
r27698 @property
Ryan McElroy
bookmarks: rename bookmarkcurrent to activebookmark (API)...
r24947 def _activebookmark(self):
Augie Fackler
bmstore: add handling of the active bookmark...
r27698 return self._bookmarks.active
Martin Geisler
localrepo: add auditor attribute which knows about subrepos
r12162
David Soria Parra
localrepo: introduce bookmarkheads...
r16707 def bookmarkheads(self, bookmark):
name = bookmark.split('@', 1)[0]
heads = []
for mark, n in self._bookmarks.iteritems():
if mark.split('@', 1)[0] == name:
heads.append(n)
return heads
Pierre-Yves David
phases: basic I/O logic...
r15418
Yuya Nishihara
localrepo: recreate phasecache if changelog was modified (issue4855)...
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
phases: introduce phasecache...
r16657 def _phasecache(self):
return phases.phasecache(self, self._phasedefaults)
Pierre-Yves David
phases: add a cache allowing to know in which phase a changeset is
r15420
Pierre-Yves.David@ens-lyon.org
obsolete: introduction of obsolete markers...
r17070 @storecache('obsstore')
def obsstore(self):
Pierre-Yves David
obsolete: add a "format.obsstore-version" config option...
r22852 # read default format for new obsstore.
Matt Mackall
localrepo: mark format options
r25839 # developer config: format.obsstore-version
Pierre-Yves David
obsolete: add a "format.obsstore-version" config option...
r22852 defaultformat = self.ui.configint('format', 'obsstore-version', None)
# rely on obsstore class default when possible.
kwargs = {}
if defaultformat is not None:
Durham Goode
obsstore: fix defaultformat option passing...
r22948 kwargs['defaultformat'] = defaultformat
Durham Goode
obsolete: add createmarkers option...
r22951 readonly = not obsolete.isenabled(self, obsolete.createmarkersopt)
Angel Ezquerra
localrepo: remove all internal uses of localrepo.sopener...
r23853 store = obsolete.obsstore(self.svfs, readonly=readonly,
Durham Goode
obsolete: add readonly flag to obstore constructor...
r22950 **kwargs)
Durham Goode
obsolete: add createmarkers option...
r22951 if store and readonly:
Matt Mackall
obsolete: mark warning for translation...
r24414 self.ui.warn(
_('obsolete feature not enabled but %i markers found!\n')
% len(list(store)))
Pierre-Yves.David@ens-lyon.org
obsolete: introduction of obsolete markers...
r17070 return store
Idan Kamara
filecache: refactor path join logic to a function...
r16198 @storecache('00changelog.i')
Matt Mackall
localrepo: use propertycache
r8260 def changelog(self):
Angel Ezquerra
localrepo: remove all internal uses of localrepo.sopener...
r23853 c = changelog.changelog(self.svfs)
Matt Mackall
localrepo: use propertycache
r8260 if 'HG_PENDING' in os.environ:
p = os.environ['HG_PENDING']
if p.startswith(self.root):
c.readpending('00changelog.i.a')
return c
Idan Kamara
filecache: refactor path join logic to a function...
r16198 @storecache('00manifest.i')
Matt Mackall
localrepo: use propertycache
r8260 def manifest(self):
Angel Ezquerra
localrepo: remove all internal uses of localrepo.sopener...
r23853 return manifest.manifest(self.svfs)
Matt Mackall
localrepo: use propertycache
r8260
Martin von Zweigbergk
treemanifest: add --dir option to debug{revlog,data,index}...
r25119 def dirlog(self, dir):
Martin von Zweigbergk
treemanifest: cache directory logs and manifests...
r25185 return self.manifest.dirlog(dir)
Martin von Zweigbergk
treemanifest: add --dir option to debug{revlog,data,index}...
r25119
Pierre-Yves David
clfilter: ensure that filecache on localrepo is unfiltered...
r18014 @repofilecache('dirstate')
Matt Mackall
localrepo: use propertycache
r8260 def dirstate(self):
Siddharth Agarwal
localrepo: move dirstate validate function to class scope...
r26155 return dirstate.dirstate(self.vfs, self.ui, self.root,
self._dirstatevalidate)
Matt Mackall
dirstate: warn on invalid parents rather than aborting...
r13032
Siddharth Agarwal
localrepo: move dirstate validate function to class scope...
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
support hooks written in python....
r2155
Matt Mackall
use repo[changeid] to get a changectx
r6747 def __getitem__(self, changeid):
Yuya Nishihara
localrepo: provide workingctx by integer revision...
r25764 if changeid is None or changeid == wdirrev:
Matt Mackall
use repo[changeid] to get a changectx
r6747 return context.workingctx(self)
Eric Sumner
localrepo.__getitem__: add slicing support...
r23630 if isinstance(changeid, slice):
return [context.changectx(self, i)
for i in xrange(*changeid.indices(len(self)))
if i not in self.changelog.filteredrevs]
Matt Mackall
use repo[changeid] to get a changectx
r6747 return context.changectx(self, changeid)
Alexander Solovyov
localrepo: support 'rev in repo' syntax
r9924 def __contains__(self, changeid):
try:
Yuya Nishihara
localrepo: extend "changeid in repo" to return True for workingctx revision...
r24320 self[changeid]
return True
Alexander Solovyov
localrepo: support 'rev in repo' syntax
r9924 except error.RepoLookupError:
return False
Matt Mackall
add __len__ and __iter__ methods to repo and revlog
r6750 def __nonzero__(self):
return True
def __len__(self):
return len(self.changelog)
def __iter__(self):
Pierre-Yves David
clfilter: remove usage of `range` in favor of iteration over changelog...
r17675 return iter(self.changelog)
Vadim Gelfer
support hooks written in python....
r2155
Matt Mackall
localrepo: add revs helper method
r15403 def revs(self, expr, *args):
Gregory Szorc
localrepo: improve docstring for revset methods...
r27071 '''Find revisions matching a revset.
The revset is specified as a string ``expr`` that may contain
%-formatting to escape certain types. See ``revset.formatspec``.
Return a revset.abstractsmartset, which is a list-like interface
that contains integer revisions.
'''
Matt Mackall
localrepo: add revs helper method
r15403 expr = revset.formatspec(expr, *args)
m = revset.match(None, expr)
Yuya Nishihara
revset: make match function initiate query from full set by default...
r24114 return m(self)
Matt Mackall
localrepo: add revs helper method
r15403
Matt Mackall
localrepo: add set method to iterate over a given revset...
r14902 def set(self, expr, *args):
Gregory Szorc
localrepo: improve docstring for revset methods...
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.
Matt Mackall
localrepo: add set method to iterate over a given revset...
r14902 '''
Matt Mackall
localrepo: add revs helper method
r15403 for r in self.revs(expr, *args):
Matt Mackall
localrepo: add set method to iterate over a given revset...
r14902 yield self[r]
Vadim Gelfer
hooks: add url to changegroup, incoming, prechangegroup, pretxnchangegroup hooks...
r2673 def url(self):
return 'file:' + self.root
Vadim Gelfer
make hook code nicer....
r1718 def hook(self, name, throw=False, **args):
Gregory Szorc
localrepo: document localrepo.hook()
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
hooks: separate hook code into a separate module
r4622 return hook.hook(self.ui, self, name, throw, **args)
mpm@selenic.com
Break apart hg.py...
r1089
Pierre-Yves David
localrepo: back out changeset b08af8f0ac01...
r24234 @unfilteredmethod
Pierre-Yves David
tag: remove a mutable default argument...
r26323 def _tag(self, names, node, message, local, user, date, extra=None,
FUJIWARA Katsunori
localrepo: add "editor" argument to "tag()"...
r21237 editor=False):
John Coomes
tag: allow multiple tags to be added or removed...
r6321 if isinstance(names, str):
names = (names,)
Brendan Cully
Break core of repo.tag into dirstate/hook-free repo._tag for convert-repo
r4118
Nicolas Dumazet
tag: warn users about tag/branch possible name conflicts...
r11063 branches = self.branchmap()
John Coomes
tag: allow multiple tags to be added or removed...
r6321 for name in names:
self.hook('pretag', throw=True, node=hex(node), tag=name,
local=local)
Nicolas Dumazet
tag: warn users about tag/branch possible name conflicts...
r11063 if name in branches:
self.ui.warn(_("warning: tag %s conflicts with existing"
" branch name\n") % name)
Brendan Cully
Break core of repo.tag into dirstate/hook-free repo._tag for convert-repo
r4118
John Coomes
tag: allow multiple tags to be added or removed...
r6321 def writetags(fp, names, munge, prevtags):
Alexis S. L. Carvalho
localrepo._tag: add a seek before writing the new tag...
r5985 fp.seek(0, 2)
Bryan O'Sullivan
tag: handle .hgtags and .hg/localtags with missing final newline (issue 601)...
r4932 if prevtags and prevtags[-1] != '\n':
fp.write('\n')
John Coomes
tag: allow multiple tags to be added or removed...
r6321 for name in names:
Jordi Gutiérrez Hermoso
style: kill ersatz if-else ternary operators...
r24306 if munge:
m = munge(name)
else:
m = name
Brodie Rao
cleanup: eradicate long lines
r16683 if (self._tagscache.tagtypes and
name in self._tagscache.tagtypes):
Idan Kamara
localrepo: unify tag related info into a tagscache class
r14936 old = self.tags().get(name, nullid)
Matt Mackall
tag: record tag we're superseding, if any (issue 1102)
r6671 fp.write('%s %s\n' % (hex(old), m))
fp.write('%s %s\n' % (hex(node), m))
Bryan O'Sullivan
tag: handle .hgtags and .hg/localtags with missing final newline (issue 601)...
r4932 fp.close()
Thomas Arendsen Hein
Remove trailing spaces
r5081
Bryan O'Sullivan
tag: handle .hgtags and .hg/localtags with missing final newline (issue 601)...
r4932 prevtags = ''
Brendan Cully
Break core of repo.tag into dirstate/hook-free repo._tag for convert-repo
r4118 if local:
Bryan O'Sullivan
tag: handle .hgtags and .hg/localtags with missing final newline (issue 601)...
r4932 try:
Angel Ezquerra
localrepo: remove all internal uses of localrepo.opener...
r23852 fp = self.vfs('localtags', 'r+')
Peter Arrenbrecht
cleanup: drop unused assignments
r7875 except IOError:
Angel Ezquerra
localrepo: remove all internal uses of localrepo.opener...
r23852 fp = self.vfs('localtags', 'a')
Bryan O'Sullivan
tag: handle .hgtags and .hg/localtags with missing final newline (issue 601)...
r4932 else:
prevtags = fp.read()
Brendan Cully
Break core of repo.tag into dirstate/hook-free repo._tag for convert-repo
r4118 # local tags are stored in the current charset
John Coomes
tag: allow multiple tags to be added or removed...
r6321 writetags(fp, names, None, prevtags)
for name in names:
self.hook('tag', node=hex(node), tag=name, local=local)
Brendan Cully
Break core of repo.tag into dirstate/hook-free repo._tag for convert-repo
r4118 return
Matt Mackall
tag: drop unused use_dirstate and parent from _tag()
r8402 try:
fp = self.wfile('.hgtags', 'rb+')
Gregory Szorc
global: mass rewrite to use modern exception syntax...
r25660 except IOError as e:
Idan Kamara
localrepo: don't attempt to open .hgtags twice if the error isn't ENOENT
r14646 if e.errno != errno.ENOENT:
raise
Matt Mackall
tag: drop unused use_dirstate and parent from _tag()
r8402 fp = self.wfile('.hgtags', 'ab')
Bryan O'Sullivan
tag: handle .hgtags and .hg/localtags with missing final newline (issue 601)...
r4932 else:
Matt Mackall
tag: drop unused use_dirstate and parent from _tag()
r8402 prevtags = fp.read()
Bryan O'Sullivan
tag: handle .hgtags and .hg/localtags with missing final newline (issue 601)...
r4932
Brendan Cully
Break core of repo.tag into dirstate/hook-free repo._tag for convert-repo
r4118 # committed tags are stored in UTF-8
Matt Mackall
move encoding bits from util to encoding...
r7948 writetags(fp, names, encoding.fromlocal, prevtags)
Bryan O'Sullivan
tag: handle .hgtags and .hg/localtags with missing final newline (issue 601)...
r4932
Dan Villiom Podlaski Christiansen
explicitly close files...
r13400 fp.close()
Mads Kiilerich
tag: invalidate tag cache immediately after adding new tag (issue3210)...
r15929 self.invalidatecaches()
Matt Mackall
tag: drop unused use_dirstate and parent from _tag()
r8402 if '.hgtags' not in self.dirstate:
Dirkjan Ochtman
move working dir/dirstate methods from localrepo to workingctx
r11303 self[None].add(['.hgtags'])
Brendan Cully
Break core of repo.tag into dirstate/hook-free repo._tag for convert-repo
r4118
Benoit Boissinot
style: use consistent variable names (*mod) with imports which would shadow
r10651 m = matchmod.exact(self.root, '', ['.hgtags'])
FUJIWARA Katsunori
localrepo: add "editor" argument to "tag()"...
r21237 tagnode = self.commit(message, user, date, extra=extra, match=m,
editor=editor)
Brendan Cully
Break core of repo.tag into dirstate/hook-free repo._tag for convert-repo
r4118
John Coomes
tag: allow multiple tags to be added or removed...
r6321 for name in names:
self.hook('tag', node=hex(node), tag=name, local=local)
Brendan Cully
Break core of repo.tag into dirstate/hook-free repo._tag for convert-repo
r4118
return tagnode
FUJIWARA Katsunori
localrepo: add "editor" argument to "tag()"...
r21237 def tag(self, names, node, message, local, user, date, editor=False):
John Coomes
tag: allow multiple tags to be added or removed...
r6321 '''tag a revision with one or more symbolic names.
Vadim Gelfer
move most of tag code to localrepository class.
r2601
John Coomes
tag: allow multiple tags to be added or removed...
r6321 names is a list of strings or, when adding a single tag, names may be a
string.
Thomas Arendsen Hein
tab/space cleanup
r6334
John Coomes
tag: allow multiple tags to be added or removed...
r6321 if local is True, the tags are stored in a per-repository file.
otherwise, they are stored in the .hgtags file, and a new
Vadim Gelfer
move most of tag code to localrepository class.
r2601 changeset is committed with the change.
keyword arguments:
John Coomes
tag: allow multiple tags to be added or removed...
r6321 local: whether to store tags in non-version-controlled file
Vadim Gelfer
move most of tag code to localrepository class.
r2601 (default False)
message: commit message to use if committing
user: name of user to use if committing
date: date tuple to use if committing'''
Kevin Bullock
tag: don't check .hgtags status if --local passed...
r13133 if not local:
Matt Mackall
tag: only check the status of .hgtags
r22679 m = matchmod.exact(self.root, '', ['.hgtags'])
Augie Fackler
cleanup: use __builtins__.any instead of util.any...
r25149 if any(self.status(match=m, unknown=True, ignored=True)):
Pierre-Yves David
error: get Abort from 'error' instead of 'util'...
r26587 raise error.Abort(_('working copy of .hgtags is changed'),
Matt Mackall
tag: use an abort hint
r22680 hint=_('please commit .hgtags manually'))
Vadim Gelfer
move most of tag code to localrepository class.
r2601
Matt Mackall
tag: force load of tag cache
r7814 self.tags() # instantiate the cache
FUJIWARA Katsunori
localrepo: add "editor" argument to "tag()"...
r21237 self._tag(names, node, message, local, user, date, editor=editor)
Vadim Gelfer
move most of tag code to localrepository class.
r2601
Pierre-Yves David
clfilter: add a propertycache that must be unfiltered...
r18013 @filteredpropertycache
Idan Kamara
localrepo: unify tag related info into a tagscache class
r14936 def _tagscache(self):
Brodie Rao
cleanup: eradicate long lines
r16683 '''Returns a tagscache object that contains various tags related
caches.'''
Idan Kamara
localrepo: unify tag related info into a tagscache class
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
Break apart hg.py...
r1089 def tags(self):
'''return a mapping of tag to node'''
Matt Mackall
tags: defer tag validation until repo.tags() is called...
r16371 t = {}
Pierre-Yves David
clfilter: do not use tags cache if there are filtered changesets...
r17715 if self.changelog.filteredrevs:
tags, tt = self._findtags()
else:
tags = self._tagscache.tags
for k, v in tags.iteritems():
Matt Mackall
tags: defer tag validation until repo.tags() is called...
r16371 try:
# ignore tags to unknown nodes
self.changelog.rev(v)
t[k] = v
Bryan O'Sullivan
parsers: strictly check for 20-byte hashes where they're required
r16679 except (error.LookupError, ValueError):
Matt Mackall
tags: defer tag validation until repo.tags() is called...
r16371 pass
return t
Matt Mackall
Refactor tags code to prepare for improving the algorithm
r4210
Greg Ward
localrepo: factor _findtags() out of tags() (issue548)....
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
Refactor tags code to prepare for improving the algorithm
r4210
Greg Ward
localrepo: factor updatetags() out of readtags() (issue548).
r9148 alltags = {} # map tag name to (node, hist)
Osku Salerma
Properly check tag's existence as a local/global tag when removing it.
r5657 tagtypes = {}
mpm@selenic.com
Break apart hg.py...
r1089
Benoit Boissinot
style: use consistent variable names (*mod) with imports which would shadow
r10651 tagsmod.findglobaltags(self.ui, self, alltags, tagtypes)
tagsmod.readlocaltags(self.ui, self, alltags, tagtypes)
Osku Salerma
Properly check tag's existence as a local/global tag when removing it.
r5657
Greg Ward
tags: support 'instant' tag retrieval (issue548)...
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
localrepo: factor _findtags() out of tags() (issue548)....
r9145 tags = {}
Greg Ward
localrepo: improve readability of _findtags(), readtags() (issue548)....
r9147 for (name, (node, hist)) in alltags.iteritems():
if node != nullid:
Matt Mackall
tags: defer tag validation until repo.tags() is called...
r16371 tags[encoding.tolocal(name)] = node
Greg Ward
localrepo: factor _findtags() out of tags() (issue548)....
r9145 tags['tip'] = self.changelog.tip()
Greg Ward
tags: support 'instant' tag retrieval (issue548)...
r9152 tagtypes = dict([(encoding.tolocal(name), value)
for (name, value) in tagtypes.iteritems()])
Greg Ward
localrepo: factor _findtags() out of tags() (issue548)....
r9145 return (tags, tagtypes)
mpm@selenic.com
Break apart hg.py...
r1089
Osku Salerma
Properly check tag's existence as a local/global tag when removing it.
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
localrepo: unify tag related info into a tagscache class
r14936 return self._tagscache.tagtypes.get(tagname)
Osku Salerma
Properly check tag's existence as a local/global tag when removing it.
r5657
mpm@selenic.com
Break apart hg.py...
r1089 def tagslist(self):
'''return a list of tags ordered by revision'''
Idan Kamara
localrepo: unify tag related info into a tagscache class
r14936 if not self._tagscache.tagslist:
l = []
for t, n in self.tags().iteritems():
Mads Kiilerich
cleanup: fix some list comprehension redefinitions of existing vars...
r22201 l.append((self.changelog.rev(n), t, n))
Idan Kamara
localrepo: unify tag related info into a tagscache class
r14936 self._tagscache.tagslist = [(t, n) for r, t, n in sorted(l)]
return self._tagscache.tagslist
mpm@selenic.com
Break apart hg.py...
r1089
def nodetags(self, node):
'''return the tags associated with a node'''
Idan Kamara
localrepo: unify tag related info into a tagscache class
r14936 if not self._tagscache.nodetagscache:
nodetagscache = {}
Matt Mackall
tags: defer tag validation until repo.tags() is called...
r16371 for t, n in self._tagscache.tags.iteritems():
Idan Kamara
localrepo: unify tag related info into a tagscache class
r14936 nodetagscache.setdefault(n, []).append(t)
for tags in nodetagscache.itervalues():
Eric Eisner
tags: return tags in sorted order...
r11047 tags.sort()
Idan Kamara
localrepo: unify tag related info into a tagscache class
r14936 self._tagscache.nodetagscache = nodetagscache
return self._tagscache.nodetagscache.get(node, [])
mpm@selenic.com
Break apart hg.py...
r1089
David Soria Parra
context: add method to return all bookmarks pointing to a node
r13384 def nodebookmarks(self, node):
Augie Fackler
localrepo: document nodebookmarks
r27166 """return the list of bookmarks pointing to the specified node"""
David Soria Parra
context: add method to return all bookmarks pointing to a node
r13384 marks = []
for bookmark, n in self._bookmarks.iteritems():
if n == node:
marks.append(bookmark)
return sorted(marks)
Georg Brandl
localrepo: introduce method for explicit branch cache update...
r12066 def branchmap(self):
Mads Kiilerich
help: branch names primarily denote the tipmost unclosed branch head...
r20245 '''returns a dictionary {branch: [branchheads]} with branchheads
ordered by increasing revision number'''
Pierre-Yves David
branchmap: enable caching for filtered version too...
r18189 branchmap.updatecache(self)
return self._branchcaches[self.filtername]
Pierre-Yves David
clfilter: do not use branchmap cache if there are filtered changesets...
r17714
Durham Goode
revbranchcache: move out of branchmap onto localrepo...
r24373 @unfilteredmethod
def revbranchcache(self):
if not self._revbranchcache:
self._revbranchcache = branchmap.revbranchcache(self.unfiltered())
return self._revbranchcache
Sean Farley
localrepo: add ignoremissing parameter to branchtip...
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
localrepo: refactor repo.branchtip() to use repo.branchmap().branchtip()
r20187 try:
return self.branchmap().branchtip(branch)
except KeyError:
Sean Farley
localrepo: add ignoremissing parameter to branchtip...
r23775 if not ignoremissing:
raise error.RepoLookupError(_("unknown branch '%s'") % branch)
else:
pass
Brodie Rao
localrepo: add branchtip() method for faster single-branch lookups...
r16719
mpm@selenic.com
Break apart hg.py...
r1089 def lookup(self, key):
Matt Mackall
localrepo: lookup now goes through context
r16378 return self[key].node()
mpm@selenic.com
Break apart hg.py...
r1089
Steve Losh
commands: add more robust support for 'hg log -b' (issue2078)...
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
wireproto: add known([id]) function...
r13723 def known(self, nodes):
Pierre-Yves David
discovery: properly filter changeset in 'peer.known' (issue4982)...
r27319 cl = self.changelog
nm = cl.nodemap
filtered = cl.filteredrevs
Pierre-Yves David
phases: make secret changeset undiscoverable in all case...
r15889 result = []
for n in nodes:
r = nm.get(n)
Pierre-Yves David
discovery: properly filter changeset in 'peer.known' (issue4982)...
r27319 resp = not (r is None or r in filtered)
Pierre-Yves David
phases: make secret changeset undiscoverable in all case...
r15889 result.append(resp)
return result
Peter Arrenbrecht
wireproto: add known([id]) function...
r13723
mpm@selenic.com
Break apart hg.py...
r1089 def local(self):
Matt Mackall
localrepo: local() returns self...
r14603 return self
mpm@selenic.com
Break apart hg.py...
r1089
Matt Mackall
publishing: add helper method to localrepo
r25623 def publishing(self):
Matt Mackall
publishing: unconditionally trust publishing flag...
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
return self.ui.configbool('phases', 'publish', True, untrusted=True)
Matt Mackall
publishing: add helper method to localrepo
r25623
Peter Arrenbrecht
peer: introduce real peer classes...
r17192 def cancopy(self):
Pierre-Yves David
clone: do not turn hidden changeset public on publishing clone (issue3935)...
r20332 # so statichttprepo's override of local() works
if not self.local():
return False
Matt Mackall
publishing: use new helper method
r25624 if not self.publishing():
Pierre-Yves David
clone: do not turn hidden changeset public on publishing clone (issue3935)...
r20332 return True
# if publishing we can't copy if there is filtered content
return not self.filtered('visible').changelog.filteredrevs
Peter Arrenbrecht
peer: introduce real peer classes...
r17192
Angel Ezquerra
localrepo: introduce shared method to check if a repository is shared...
r23666 def shared(self):
'''the type of shared repository (None if not shared)'''
if self.sharedpath != self.path:
return 'store'
return None
Angel Ezquerra
localrepo: make it possible to pass multiple path elements to join and wjoin...
r22362 def join(self, f, *insidef):
Angel Ezquerra
localrepo: use the vfs join method to implement the localrepo join method...
r23667 return self.vfs.join(os.path.join(f, *insidef))
mpm@selenic.com
Break apart hg.py...
r1089
Angel Ezquerra
localrepo: make it possible to pass multiple path elements to join and wjoin...
r22362 def wjoin(self, f, *insidef):
Angel Ezquerra
localrepo: use vfs.reljoin rather than os.path.join in the localrepository class...
r23714 return self.vfs.reljoin(self.root, f, *insidef)
mpm@selenic.com
Break apart hg.py...
r1089
def file(self, f):
Thomas Arendsen Hein
Cleanup of indentation, spacing, newlines, strings and line length
r1615 if f[0] == '/':
f = f[1:]
Angel Ezquerra
localrepo: remove all internal uses of localrepo.sopener...
r23853 return filelog.filelog(self.svfs, f)
mpm@selenic.com
Break apart hg.py...
r1089
Pierre-Yves David
localrepo: reinstate localrepo.parents with a deprecation warning...
r27277 def parents(self, changeid=None):
'''get list of changectxs for parents of changeid'''
msg = 'repo.parents() is deprecated, use repo[%r].parents()' % changeid
self.ui.deprecwarn(msg, '3.7')
return self[changeid].parents()
Matt Mackall
context: avoid using None for working parent
r6739 def changectx(self, changeid):
Matt Mackall
use repo[changeid] to get a changectx
r6747 return self[changeid]
Matt Mackall
merge: use new working context object in update
r3218
Patrick Mezard
localrepo: add setparents() to adjust dirstate copies (issue3407)...
r16551 def setparents(self, p1, p2=nullid):
Durham Goode
dirstate: wrap setparent calls with begin/endparentchange (issue4353)...
r22405 self.dirstate.beginparentchange()
Patrick Mezard
localrepo: add setparents() to adjust dirstate copies (issue3407)...
r16551 copies = self.dirstate.setparents(p1, p2)
Matt Mackall
setparents: drop copies from dropped p2 (issue3843)
r18739 pctx = self[p1]
Patrick Mezard
localrepo: add setparents() to adjust dirstate copies (issue3407)...
r16551 if copies:
# Adjust copy records, the dirstate cannot do it, it
# requires access to parents manifests. Preserve them
# only for entries added to first parent.
for f in copies:
if f not in pctx and copies[f] in pctx:
self.dirstate.copy(copies[f], f)
Matt Mackall
setparents: drop copies from dropped p2 (issue3843)
r18739 if p2 == nullid:
for f, s in sorted(self.dirstate.copies().items()):
if f not in pctx and s not in pctx:
self.dirstate.copy(None, f)
Durham Goode
dirstate: wrap setparent calls with begin/endparentchange (issue4353)...
r22405 self.dirstate.endparentchange()
Patrick Mezard
localrepo: add setparents() to adjust dirstate copies (issue3407)...
r16551
Matt Mackall
Add context helper functions to localrepo
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
Break apart hg.py...
r1089 def getcwd(self):
return self.dirstate.getcwd()
Alexis S. L. Carvalho
Add dirstate.pathto and localrepo.pathto....
r4525 def pathto(self, f, cwd=None):
return self.dirstate.pathto(f, cwd)
mpm@selenic.com
Break apart hg.py...
r1089 def wfile(self, f, mode='r'):
Angel Ezquerra
localrepo: remove all internal uses of localrepo.wopener...
r23854 return self.wvfs(f, mode)
mpm@selenic.com
Break apart hg.py...
r1089
Alexis S. L. Carvalho
use os.path.islink instead of util.is_link; remove util.is_link
r4275 def _link(self, f):
FUJIWARA Katsunori
localrepo: use "vfs.islink()" instead of "os.path.islink()"
r18949 return self.wvfs.islink(f)
Alexis S. L. Carvalho
use os.path.islink instead of util.is_link; remove util.is_link
r4275
Nicolas Dumazet
localrepo: refactor filter computation...
r11698 def _loadfilter(self, filter):
Matt Mackall
unify encode/decode filter routines
r4004 if filter not in self.filterpats:
mpm@selenic.com
Add file encoding/decoding support
r1258 l = []
Matt Mackall
unify encode/decode filter routines
r4004 for pat, cmd in self.ui.configitems(filter):
Mads Kiilerich
Make it possible to disable filtering for a pattern....
r7226 if cmd == '!':
continue
Benoit Boissinot
style: use consistent variable names (*mod) with imports which would shadow
r10651 mf = matchmod.match(self.root, '', [pat])
Patrick Mezard
Register data filters in a localrepo instead of util...
r5966 fn = None
Jesse Glick
Strip filter name from command before passing to filter function....
r6066 params = cmd
Patrick Mezard
Register data filters in a localrepo instead of util...
r5966 for name, filterfn in self._datafilters.iteritems():
Thomas Arendsen Hein
Removed trailing spaces from everything except test output
r6210 if cmd.startswith(name):
Patrick Mezard
Register data filters in a localrepo instead of util...
r5966 fn = filterfn
Jesse Glick
Strip filter name from command before passing to filter function....
r6066 params = cmd[len(name):].lstrip()
Patrick Mezard
Register data filters in a localrepo instead of util...
r5966 break
if not fn:
Jesse Glick
Provide better context for custom Python encode/decode filters....
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
Strip filter name from command before passing to filter function....
r6066 l.append((mf, fn, params))
Matt Mackall
unify encode/decode filter routines
r4004 self.filterpats[filter] = l
Nicolas Dumazet
localrepo: have _loadfilter return the loaded filter patterns
r12706 return self.filterpats[filter]
mpm@selenic.com
Add file encoding/decoding support
r1258
Nicolas Dumazet
localrepo: load filter patterns outside of _filter
r12707 def _filter(self, filterpats, filename, data):
for mf, fn, cmd in filterpats:
mpm@selenic.com
Add file encoding/decoding support
r1258 if mf(filename):
Martin Geisler
do not attempt to translate ui.debug output
r9467 self.ui.debug("filtering %s through %s\n" % (filename, cmd))
Jesse Glick
Provide better context for custom Python encode/decode filters....
r5967 data = fn(data, cmd, ui=self.ui, repo=self, filename=filename)
mpm@selenic.com
Add file encoding/decoding support
r1258 break
return data
mpm@selenic.com
Break apart hg.py...
r1089
Pierre-Yves David
clfilter: add a propertycache that must be unfiltered...
r18013 @unfilteredpropertycache
Nicolas Dumazet
localrepo: use propertycaches to access encode/decode filters
r12708 def _encodefilterpats(self):
return self._loadfilter('encode')
Pierre-Yves David
clfilter: add a propertycache that must be unfiltered...
r18013 @unfilteredpropertycache
Nicolas Dumazet
localrepo: use propertycaches to access encode/decode filters
r12708 def _decodefilterpats(self):
return self._loadfilter('decode')
Patrick Mezard
Register data filters in a localrepo instead of util...
r5966 def adddatafilter(self, name, filter):
self._datafilters[name] = filter
Matt Mackall
unify encode/decode filter routines
r4004 def wread(self, filename):
if self._link(filename):
FUJIWARA Katsunori
localrepo: use "vfs.readlink()" instead of "os.readlink()"
r18950 data = self.wvfs.readlink(filename)
Matt Mackall
unify encode/decode filter routines
r4004 else:
Angel Ezquerra
localrepo: remove all internal uses of localrepo.wopener...
r23854 data = self.wvfs.read(filename)
Nicolas Dumazet
localrepo: use propertycaches to access encode/decode filters
r12708 return self._filter(self._encodefilterpats, filename, data)
mpm@selenic.com
Add file encoding/decoding support
r1258
Matt Mackall
symlinks: add flags param to wwrite...
r4006 def wwrite(self, filename, data, flags):
FUJIWARA Katsunori
revert: apply normallookup on reverted file if size isn't changed (issue4583)...
r24843 """write ``data`` into ``filename`` in the working directory
This returns length of written (maybe decoded) data.
"""
Nicolas Dumazet
localrepo: use propertycaches to access encode/decode filters
r12708 data = self._filter(self._decodefilterpats, filename, data)
Matt Mackall
util: set_flags shouldn't know about repo flag formats
r6877 if 'l' in flags:
Angel Ezquerra
localrepo: remove all internal uses of localrepo.wopener...
r23854 self.wvfs.symlink(data, filename)
Matt Mackall
util: set_flags shouldn't know about repo flag formats
r6877 else:
Angel Ezquerra
localrepo: remove all internal uses of localrepo.wopener...
r23854 self.wvfs.write(filename, data)
Matt Mackall
util: set_flags shouldn't know about repo flag formats
r6877 if 'x' in flags:
FUJIWARA Katsunori
localrepo: use "vfs.setflags()" instead of "util.setflags()"
r18951 self.wvfs.setflags(filename, False, True)
FUJIWARA Katsunori
revert: apply normallookup on reverted file if size isn't changed (issue4583)...
r24843 return len(data)
mpm@selenic.com
Add file encoding/decoding support
r1258
Matt Mackall
replace filehandle version of wwrite with wwritedata
r4005 def wwritedata(self, filename, data):
Nicolas Dumazet
localrepo: use propertycaches to access encode/decode filters
r12708 return self._filter(self._decodefilterpats, filename, data)
mpm@selenic.com
Break apart hg.py...
r1089
Pierre-Yves David
localrepo: add a currenttransaction method...
r23379 def currenttransaction(self):
"""return the current transaction or None if non exists"""
Jordi Gutiérrez Hermoso
style: kill ersatz if-else ternary operators...
r24306 if self._transref:
tr = self._transref()
else:
tr = None
Henrik Stuart
transaction: support multiple, separate transactions...
r8072 if tr and tr.running():
Pierre-Yves David
localrepo: add a currenttransaction method...
r23379 return tr
return None
def transaction(self, desc, report=None):
Pierre-Yves David
devel: rename 'all' to 'all-warnings' (BC)...
r25290 if (self.ui.configbool('devel', 'all-warnings')
Pierre-Yves David
devel: also warn about transaction started without a lock...
r24388 or self.ui.configbool('devel', 'check-locks')):
l = self._lockref and self._lockref()
if l is None or not l.held:
Pierre-Yves David
devel-warn: move the develwarn function as a method of the ui object...
r25629 self.ui.develwarn('transaction with no lock')
Pierre-Yves David
localrepo: add a currenttransaction method...
r23379 tr = self.currenttransaction()
if tr is not None:
Henrik Stuart
transaction: support multiple, separate transactions...
r8072 return tr.nest()
mason@suse.com
Automatic nesting into running transactions in the same repository....
r1806
Matt Mackall
transactions: don't show a backtrace when journal exists...
r5865 # abort here if the journal already exists
FUJIWARA Katsunori
localrepo: use "vfs.exists()" instead of "os.path.exists()"
r18947 if self.svfs.exists("journal"):
Matt Mackall
many, many trivial check-code fixups
r10282 raise error.RepoError(
Johan Bjork
journal: set Abort hint when failing due to an abandoned transaction
r21274 _("abandoned transaction found"),
hint=_("run 'hg recover' to clean up transaction"))
Matt Mackall
transactions: don't show a backtrace when journal exists...
r5865
FUJIWARA Katsunori
localrepo: make journal.dirstate contain in-memory changes before transaction...
r25878 # make journal.dirstate contain in-memory changes at this point
FUJIWARA Katsunori
dirstate: make dirstate.write() callers pass transaction object to it...
r26748 self.dirstate.write(None)
FUJIWARA Katsunori
localrepo: make journal.dirstate contain in-memory changes before transaction...
r25878
FUJIWARA Katsunori
transaction: separate calculating TXNID from creating transaction object...
r25267 idbase = "%.40f#%f" % (random.random(), time.time())
txnid = 'TXN:' + util.sha1(idbase).hexdigest()
FUJIWARA Katsunori
localrepo: pass hook argument txnid to pretxnopen hooks...
r25268 self.hook('pretxnopen', throw=True, txnname=desc, txnid=txnid)
Pierre-Yves David
hook: have a generic hook for transaction opening...
r24281
Idan Kamara
localrepo: refactor retrieving of journal/undo files paths...
r16236 self._writejournal(desc)
FUJIWARA Katsunori
localrepo: use "vfs.rename()" instead of "util.rename()"...
r18952 renames = [(vfs, x, undoname(x)) for vfs, x in self._journalfiles()]
Jordi Gutiérrez Hermoso
style: kill ersatz if-else ternary operators...
r24306 if report:
rp = report
else:
rp = self.ui.warn
Angel Ezquerra
localrepo: remove all internal uses of localrepo.opener...
r23852 vfsmap = {'plain': self.vfs} # root of .hg/
Pierre-Yves David
hook: add a generic hook right before we commit a transaction...
r24284 # we must avoid cyclic reference between repo and transaction.
reporef = weakref.ref(self)
def validate(tr):
"""will run pre-closing hooks"""
FUJIWARA Katsunori
hook: centralize passing HG_PENDING to external hook process...
r26751 reporef().hook('pretxnclose', throw=True,
FUJIWARA Katsunori
localrepo: use correct argument name for pretxnclose hooks (BC)...
r25219 txnname=desc, **tr.hookargs)
FUJIWARA Katsunori
localrepo: execute appropriate actions for dirstate at releasing transaction...
r26577 def releasefn(tr, success):
repo = reporef()
if success:
FUJIWARA Katsunori
dirstate: make writing in-memory changes aware of transaction activity...
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
dirstate: make dirstate.write() callers pass transaction object to it...
r26748 repo.dirstate.write(None)
FUJIWARA Katsunori
localrepo: execute appropriate actions for dirstate at releasing transaction...
r26577 else:
# prevent in-memory changes from being written out at
# the end of outer wlock scope or so
repo.dirstate.invalidate()
# discard all changes (including ones already written
# out) in this transaction
repo.vfs.rename('journal.dirstate', 'dirstate')
Pierre-Yves David
hook: add a generic hook right before we commit a transaction...
r24284
FUJIWARA Katsunori
localrepo: discard objects in _filecache at transaction failure (issue4876)...
r26831 repo.invalidate(clearfilecache=True)
Siddharth Agarwal
localrepo: kill off sopener (API)...
r25667 tr = transaction.transaction(rp, self.svfs, vfsmap,
FUJIWARA Katsunori
transaction: take journal file path relative to vfs to use file API via vfs
r20087 "journal",
Pierre-Yves David
transaction: pass the name of the "undo" journal to the transaction...
r23903 "undo",
Alexander Solovyov
fix bookmarks rollback behavior...
r14266 aftertrans(renames),
Pierre-Yves David
hook: add a generic hook right before we commit a transaction...
r24284 self.store.createmode,
FUJIWARA Katsunori
localrepo: execute appropriate actions for dirstate at releasing transaction...
r26577 validator=validate,
releasefn=releasefn)
Pierre-Yves David
transaction: introduce a transaction ID, to be available to all hooks...
r24740
FUJIWARA Katsunori
transaction: separate calculating TXNID from creating transaction object...
r25267 tr.hookargs['txnid'] = txnid
Pierre-Yves David
fncache: document the fact fncache is outdate at hook run time...
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
hook: add a generic hook after transaction has been closed...
r24282 def txnclosehook(tr2):
"""To be run if transaction is successful, will schedule a hook run
"""
def hook():
reporef().hook('txnclose', throw=False, txnname=desc,
**tr2.hookargs)
reporef()._afterlock(hook)
tr.addfinalize('txnclose-hook', txnclosehook)
Pierre-Yves David
hooks: add a 'txnabort' hook...
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
localrepo: refresh filecache stats only if transaction finished successfully...
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
fix bookmarks rollback behavior...
r14266 self._transref = weakref.ref(tr)
return tr
Idan Kamara
localrepo: refactor retrieving of journal/undo files paths...
r16236 def _journalfiles(self):
FUJIWARA Katsunori
localrepo: use "vfs.rename()" instead of "util.rename()"...
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
localrepo: refactor retrieving of journal/undo files paths...
r16236
def undofiles(self):
FUJIWARA Katsunori
localrepo: make "undofiles()" return list of tuples "(vfs, relative filename)"...
r20975 return [(vfs, undoname(x)) for vfs, x in self._journalfiles()]
Idan Kamara
localrepo: refactor retrieving of journal/undo files paths...
r16236
Alexander Solovyov
fix bookmarks rollback behavior...
r14266 def _writejournal(self, desc):
Angel Ezquerra
localrepo: remove all internal uses of localrepo.opener...
r23852 self.vfs.write("journal.dirstate",
self.vfs.tryread("dirstate"))
self.vfs.write("journal.branch",
Dan Villiom Podlaski Christiansen
prevent transient leaks of file handle by using new helper functions...
r14168 encoding.fromlocal(self.dirstate.branch()))
Angel Ezquerra
localrepo: remove all internal uses of localrepo.opener...
r23852 self.vfs.write("journal.desc",
Dan Villiom Podlaski Christiansen
prevent transient leaks of file handle by using new helper functions...
r14168 "%d\n%s\n" % (len(self), desc))
Angel Ezquerra
localrepo: remove all internal uses of localrepo.opener...
r23852 self.vfs.write("journal.bookmarks",
self.vfs.tryread("bookmarks"))
Angel Ezquerra
localrepo: remove all internal uses of localrepo.sopener...
r23853 self.svfs.write("journal.phaseroots",
self.svfs.tryread("phaseroots"))
Alexander Solovyov
fix bookmarks rollback behavior...
r14266
mpm@selenic.com
Break apart hg.py...
r1089 def recover(self):
Ronny Pfannschmidt
switch lock releasing in the core from gc to explicit
r8109 lock = self.lock()
Matt Mackall
Use try/finally pattern to cleanup locks and transactions
r4915 try:
FUJIWARA Katsunori
localrepo: use "vfs.exists()" instead of "os.path.exists()"
r18947 if self.svfs.exists("journal"):
Matt Mackall
Use try/finally pattern to cleanup locks and transactions
r4915 self.ui.status(_("rolling back interrupted transaction\n"))
Angel Ezquerra
localrepo: remove all internal uses of localrepo.sopener...
r23853 vfsmap = {'': self.svfs,
Angel Ezquerra
localrepo: remove all internal uses of localrepo.opener...
r23852 'plain': self.vfs,}
Angel Ezquerra
localrepo: remove all internal uses of localrepo.sopener...
r23853 transaction.rollback(self.svfs, vfsmap, "journal",
Matt Mackall
many, many trivial check-code fixups
r10282 self.ui.warn)
Matt Mackall
Use try/finally pattern to cleanup locks and transactions
r4915 self.invalidate()
return True
else:
self.ui.warn(_("no interrupted transaction available\n"))
return False
finally:
Ronny Pfannschmidt
switch lock releasing in the core from gc to explicit
r8109 lock.release()
mpm@selenic.com
Break apart hg.py...
r1089
Greg Ward
rollback: avoid unsafe rollback when not at tip (issue2998)...
r15183 def rollback(self, dryrun=False, force=False):
FUJIWARA Katsunori
localrepo: restore dirstate to one before rollbacking if not parent-gone...
r26631 wlock = lock = dsguard = None
Matt Mackall
Use try/finally pattern to cleanup locks and transactions
r4915 try:
mason@suse.com
Allow callers to pass in the dirstate lock in most localrepo.py funcs....
r1712 wlock = self.wlock()
Eric Hopper
Fix hg import --exact bug that hangs hg on failure.
r4438 lock = self.lock()
FUJIWARA Katsunori
localrepo: use "vfs.exists()" instead of "os.path.exists()"
r18947 if self.svfs.exists("undo"):
FUJIWARA Katsunori
localrepo: restore dirstate to one before rollbacking if not parent-gone...
r26631 dsguard = cmdutil.dirstateguard(self, 'rollback')
return self._rollback(dryrun, force, dsguard)
Matt Mackall
Use try/finally pattern to cleanup locks and transactions
r4915 else:
self.ui.warn(_("no rollback information available\n"))
Matt Mackall
commands: initial audit of exit codes...
r11177 return 1
Matt Mackall
Use try/finally pattern to cleanup locks and transactions
r4915 finally:
FUJIWARA Katsunori
localrepo: restore dirstate to one before rollbacking if not parent-gone...
r26631 release(dsguard, lock, wlock)
mpm@selenic.com
Break apart hg.py...
r1089
Pierre-Yves David
clfilter: rename `unfilteredmeth` to `unfilteredmethod`...
r18016 @unfilteredmethod # Until we get smarter cache management
FUJIWARA Katsunori
localrepo: restore dirstate to one before rollbacking if not parent-gone...
r26631 def _rollback(self, dryrun, force, dsguard):
Greg Ward
rollback: refactor for readability; cosmetics....
r15130 ui = self.ui
Greg Ward
rollback: improve readability; clarify that the return value is an int.
r15097 try:
Angel Ezquerra
localrepo: remove all internal uses of localrepo.opener...
r23852 args = self.vfs.read('undo.desc').splitlines()
Greg Ward
rollback: refactor for readability; cosmetics....
r15130 (oldlen, desc, detail) = (int(args[0]), args[1], None)
if len(args) >= 3:
detail = args[2]
oldtip = oldlen - 1
if detail and ui.verbose:
msg = (_('repository tip rolled back to revision %s'
' (undo %s: %s)\n')
% (oldtip, desc, detail))
else:
msg = (_('repository tip rolled back to revision %s'
' (undo %s)\n')
% (oldtip, desc))
Greg Ward
rollback: improve readability; clarify that the return value is an int.
r15097 except IOError:
Greg Ward
rollback: refactor for readability; cosmetics....
r15130 msg = _('rolling back unknown transaction\n')
Greg Ward
rollback: avoid unsafe rollback when not at tip (issue2998)...
r15183 desc = None
if not force and self['.'] != self['tip'] and desc == 'commit':
Pierre-Yves David
error: get Abort from 'error' instead of 'util'...
r26587 raise error.Abort(
Greg Ward
rollback: avoid unsafe rollback when not at tip (issue2998)...
r15183 _('rollback of last commit while not checked out '
Matt Mackall
rollback: use a hint for force
r15187 'may lose data'), hint=_('use -f to force'))
Greg Ward
rollback: avoid unsafe rollback when not at tip (issue2998)...
r15183
Greg Ward
rollback: refactor for readability; cosmetics....
r15130 ui.status(msg)
Greg Ward
rollback: improve readability; clarify that the return value is an int.
r15097 if dryrun:
return 0
Greg Ward
rollback: only restore dirstate and branch when appropriate....
r15131
parents = self.dirstate.parents()
Idan Kamara
localrepo: introduce destroying function
r18310 self.destroying()
Pierre-Yves David
rollback: have an empty entry for the vfsmap in rollback...
r23902 vfsmap = {'plain': self.vfs, '': self.svfs}
Angel Ezquerra
localrepo: remove all internal uses of localrepo.sopener...
r23853 transaction.rollback(self.svfs, vfsmap, 'undo', ui.warn)
FUJIWARA Katsunori
localrepo: use "vfs.exists()" instead of "os.path.exists()"
r18947 if self.vfs.exists('undo.bookmarks'):
FUJIWARA Katsunori
localrepo: use "vfs.rename()" instead of "util.rename()"
r18948 self.vfs.rename('undo.bookmarks', 'bookmarks')
FUJIWARA Katsunori
localrepo: use "vfs.exists()" instead of "os.path.exists()"
r18947 if self.svfs.exists('undo.phaseroots'):
FUJIWARA Katsunori
localrepo: use "vfs.rename()" instead of "util.rename()"
r18948 self.svfs.rename('undo.phaseroots', 'phaseroots')
Greg Ward
rollback: improve readability; clarify that the return value is an int.
r15097 self.invalidate()
Greg Ward
rollback: only restore dirstate and branch when appropriate....
r15131
parentgone = (parents[0] not in self.changelog.nodemap or
parents[1] not in self.changelog.nodemap)
if parentgone:
FUJIWARA Katsunori
localrepo: restore dirstate to one before rollbacking if not parent-gone...
r26631 # prevent dirstateguard from overwriting already restored one
dsguard.close()
FUJIWARA Katsunori
localrepo: use "vfs.rename()" instead of "util.rename()"
r18948 self.vfs.rename('undo.dirstate', 'dirstate')
Greg Ward
rollback: only restore dirstate and branch when appropriate....
r15131 try:
Angel Ezquerra
localrepo: remove all internal uses of localrepo.opener...
r23852 branch = self.vfs.read('undo.branch')
Sune Foldager
rollback: write dirstate branch with correct encoding
r17360 self.dirstate.setbranch(encoding.tolocal(branch))
Greg Ward
rollback: only restore dirstate and branch when appropriate....
r15131 except IOError:
ui.warn(_('named branch could not be reset: '
'current branch is still \'%s\'\n')
% self.dirstate.branch())
self.dirstate.invalidate()
Augie Fackler
commands: inline definition of localrepo.parents() and drop the method (API)...
r27167 parents = tuple([p.rev() for p in self[None].parents()])
Greg Ward
rollback: only restore dirstate and branch when appropriate....
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
localrepo: switch to mergestate.clean()...
r26989 mergemod.mergestate.clean(self, self['.'].node())
Matt Mackall
rollback: clear resolve state (issue4593)
r24784
Joshua Redstone
strip: incrementally update the branchheads cache after a strip...
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
rollback: always call destroyed() (regression from 1.9)...
r15604 self.destroyed()
Greg Ward
rollback: improve readability; clarify that the return value is an int.
r15097 return 0
Benoit Boissinot
strip: invalidate all caches after stripping (fixes issue1951)...
r10547 def invalidatecaches(self):
Idan Kamara
localrepo: delete _phaserev when invalidating caches
r15988
Pierre-Yves David
clfilter: add a propertycache that must be unfiltered...
r18013 if '_tagscache' in vars(self):
# can't use delattr on proxy
del self.__dict__['_tagscache']
Idan Kamara
localrepo: unify tag related info into a tagscache class
r14936
Pierre-Yves David
branchmap: enable caching for filtered version too...
r18189 self.unfiltered()._branchcaches.clear()
Pierre-Yves David
cache: group obscache and revsfiltercache invalidation in a single function...
r18105 self.invalidatevolatilesets()
def invalidatevolatilesets(self):
self.filteredrevcache.clear()
Pierre-Yves David
obsolete: introduce caches for all meaningful sets...
r17469 obsolete.clearobscaches(self)
Benoit Boissinot
revalidate revlog data after locking the repo (issue132)
r1784
Idan Kamara
localrepo: decorate dirstate() with filecache...
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
clfilter: add a propertycache that must be unfiltered...
r18013 if hasunfilteredcache(self, 'dirstate'):
Idan Kamara
dirstate: add filecache support
r16200 for k in self.dirstate._filecache:
try:
delattr(self.dirstate, k)
except AttributeError:
pass
Pierre-Yves David
clfilter: ensure cache invalidation is done on the main unfiltered repo...
r17997 delattr(self.unfiltered(), 'dirstate')
Idan Kamara
localrepo: decorate dirstate() with filecache...
r14930
FUJIWARA Katsunori
localrepo: discard objects in _filecache at transaction failure (issue4876)...
r26831 def invalidate(self, clearfilecache=False):
Mads Kiilerich
spelling: fix some minor issues found by spell checker
r18644 unfiltered = self.unfiltered() # all file caches are stored unfiltered
FUJIWARA Katsunori
localrepo: discard objects in _filecache at transaction failure (issue4876)...
r26831 for k in self._filecache.keys():
Idan Kamara
localrepo: make invalidate() walk _filecache
r14935 # dirstate is invalidated separately in invalidatedirstate()
if k == 'dirstate':
continue
FUJIWARA Katsunori
localrepo: discard objects in _filecache at transaction failure (issue4876)...
r26831 if clearfilecache:
del self._filecache[k]
Idan Kamara
localrepo: make invalidate() walk _filecache
r14935 try:
Pierre-Yves David
clfilter: ensure cache invalidation is done on the main unfiltered repo...
r17997 delattr(unfiltered, k)
Idan Kamara
localrepo: make invalidate() walk _filecache
r14935 except AttributeError:
pass
Benoit Boissinot
strip: invalidate all caches after stripping (fixes issue1951)...
r10547 self.invalidatecaches()
Durham Goode
caches: invalidate store caches when lock is taken...
r20884 self.store.invalidatecaches()
Benoit Boissinot
strip: invalidate all caches after stripping (fixes issue1951)...
r10547
Yuya Nishihara
localrepo: add hook point to invalidate everything on each command-server run...
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()
Yuya Nishihara
localrepo: refresh filecache stats only if transaction finished successfully...
r26251 def _refreshfilecachestats(self, tr):
Yuya Nishihara
localrepo: move closure of lock release to class...
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
localrepo: allow creating inherited locks...
r26439 def _lock(self, vfs, lockname, wait, releasefn, acquirefn, desc,
Siddharth Agarwal
localrepo: prevent wlock from being inherited when a transaction is running...
r26499 inheritchecker=None, parentenvvar=None):
Siddharth Agarwal
localrepo: allow creating inherited locks...
r26439 parentlock = None
Siddharth Agarwal
localrepo: add a note about parentenvvar...
r26472 # the contents of parentenvvar are used by the underlying lock to
# determine whether it can be inherited
Siddharth Agarwal
localrepo: allow creating inherited locks...
r26439 if parentenvvar is not None:
parentlock = os.environ.get(parentenvvar)
mpm@selenic.com
Break apart hg.py...
r1089 try:
Siddharth Agarwal
lock: move acquirefn call to inside the lock...
r26321 l = lockmod.lock(vfs, lockname, 0, releasefn=releasefn,
Siddharth Agarwal
localrepo: allow creating inherited locks...
r26439 acquirefn=acquirefn, desc=desc,
Siddharth Agarwal
localrepo: prevent wlock from being inherited when a transaction is running...
r26499 inheritchecker=inheritchecker,
Siddharth Agarwal
localrepo: allow creating inherited locks...
r26439 parentlock=parentlock)
Gregory Szorc
global: mass rewrite to use modern exception syntax...
r25660 except error.LockHeld as inst:
Benoit Boissinot
add localrepo.wlock for protecting the dirstate...
r1531 if not wait:
Vadim Gelfer
fix backtrace printed when cannot get lock....
r2016 raise
Thomas Arendsen Hein
Corrected "waiting for lock on repository FOO held by BAR" message....
r3688 self.ui.warn(_("waiting for lock on %s held by %r\n") %
(desc, inst.locker))
Vadim Gelfer
fix backtrace printed when cannot get lock....
r2016 # default to 600 seconds timeout
FUJIWARA Katsunori
lock: take both vfs and lock file path relative to vfs to access via vfs...
r20091 l = lockmod.lock(vfs, lockname,
FUJIWARA Katsunori
localrepo: import "lock" module as "lockmod" for readability...
r20088 int(self.ui.config("ui", "timeout", "600")),
Siddharth Agarwal
lock: move acquirefn call to inside the lock...
r26321 releasefn=releasefn, acquirefn=acquirefn,
desc=desc)
Mads Kiilerich
localrepo: give a sigh of relief when getting lock after waiting for it...
r20380 self.ui.warn(_("got lock after %s seconds\n") % l.delay)
Benoit Boissinot
localrepo: refactor the locking functions
r1751 return l
Matt Mackall
localrepo: rename _postrelease to _afterlock
r15587 def _afterlock(self, callback):
Pierre-Yves David
afterlock: add the callback to the top level lock (issue4608)...
r24821 """add a callback to be run when the repository is fully unlocked
Pierre-Yves David
lock: add mechanism to register post release callback
r15583
Pierre-Yves David
afterlock: add the callback to the top level lock (issue4608)...
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
tag: run commit hook when lock is released (issue3344)
r16680 callback()
Pierre-Yves David
lock: add mechanism to register post release callback
r15583
Matt Mackall
repo locks: use True/False
r4914 def lock(self, wait=True):
Greg Ward
localrepo: document the locking scheme a little better...
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
lock: update the docstring with order information...
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.'''
Ronny Pfannschmidt
made repo locks recursive and deprecate refcounting based lock releasing...
r8108 l = self._lockref and self._lockref()
if l is not None and l.held:
l.lock()
return l
Matt Mackall
Make repo locks recursive, eliminate all passing of lock/wlock
r4917
Yuya Nishihara
localrepo: refresh filecache stats only if transaction finished successfully...
r26251 l = self._lock(self.svfs, "lock", wait, None,
Adrian Buehlmann
fncachestore: defer updating the fncache file to a single file open...
r13391 self.invalidate, _('repository %s') % self.origroot)
Matt Mackall
Make repo locks recursive, eliminate all passing of lock/wlock
r4917 self._lockref = weakref.ref(l)
return l
Benoit Boissinot
localrepo: refactor the locking functions
r1751
Siddharth Agarwal
localrepo: prevent wlock from being inherited when a transaction is running...
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
repo locks: use True/False
r4914 def wlock(self, wait=True):
Greg Ward
localrepo: document the locking scheme a little better...
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
lock: update the docstring with order information...
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
wlock: only issue devel warning when actually acquiring the lock...
r24744 l = self._wlockref and self._wlockref()
if l is not None and l.held:
l.lock()
return l
Mads Kiilerich
spelling: trivial spell checking
r26781 # We do not need to check for non-waiting lock acquisition. Such
Pierre-Yves David
wlock: do not warn for non-wait locking...
r24750 # acquisition would not cause dead-lock as they would just fail.
Pierre-Yves David
devel: rename 'all' to 'all-warnings' (BC)...
r25290 if wait and (self.ui.configbool('devel', 'all-warnings')
Pierre-Yves David
wlock: do not warn for non-wait locking...
r24750 or self.ui.configbool('devel', 'check-locks')):
Pierre-Yves David
devel: move the lock-checking code into core...
r24386 l = self._lockref and self._lockref()
if l is not None and l.held:
Pierre-Yves David
devel-warn: move the develwarn function as a method of the ui object...
r25629 self.ui.develwarn('"wlock" acquired after "lock"')
Benoit Boissinot
add localrepo.wlock for protecting the dirstate...
r1531
Idan Kamara
localrepo: decorate dirstate() with filecache...
r14930 def unlock():
Durham Goode
dirstate: add begin/endparentchange to dirstate...
r22404 if self.dirstate.pendingparentchange():
self.dirstate.invalidate()
else:
FUJIWARA Katsunori
dirstate: make dirstate.write() callers pass transaction object to it...
r26748 self.dirstate.write(None)
Durham Goode
dirstate: add begin/endparentchange to dirstate...
r22404
Idan Kamara
localrepo: drop unnecessary check on wlock unlock...
r18318 self._filecache['dirstate'].refresh()
Idan Kamara
localrepo: decorate dirstate() with filecache...
r14930
FUJIWARA Katsunori
lock: take both vfs and lock file path relative to vfs to access via vfs...
r20091 l = self._lock(self.vfs, "wlock", wait, unlock,
Idan Kamara
localrepo: decorate dirstate() with filecache...
r14930 self.invalidatedirstate, _('working directory of %s') %
Siddharth Agarwal
localrepo: prevent wlock from being inherited when a transaction is running...
r26499 self.origroot,
inheritchecker=self._wlockchecktransaction,
parentenvvar='HG_WLOCK_LOCKER')
Matt Mackall
Make repo locks recursive, eliminate all passing of lock/wlock
r4917 self._wlockref = weakref.ref(l)
return l
Benoit Boissinot
add localrepo.wlock for protecting the dirstate...
r1531
Siddharth Agarwal
localrepo: add a way to get the current lock if it's held...
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
localrepo: add a way to get the current wlock if it's held...
r26489 def currentwlock(self):
"""Returns the wlock if it's held, or None if it's not."""
return self._currentlock(self._wlockref)
Matt Mackall
filecommit: swallow some bits from _commitctx, add _
r8401 def _filecommit(self, fctx, manifest1, manifest2, linkrev, tr, changelist):
Matt Mackall
merge: remember rename copies and parents properly on commit...
r3292 """
Matt Mackall
commit: unify file-level commit code
r3294 commit an individual file as part of a larger transaction
"""
Matt Mackall
merge: remember rename copies and parents properly on commit...
r3292
Martijn Pieters
localrepo: Refactor var names in filecommit to improve readability.
r8244 fname = fctx.path()
fparent1 = manifest1.get(fname, nullid)
Matt Mackall
commit: catch changed exec bit on files from p1 (issue4382)
r22492 fparent2 = manifest2.get(fname, nullid)
Mads Kiilerich
localrepo: reuse commit of parent filectx entries without rehashing...
r24394 if isinstance(fctx, context.filectx):
node = fctx.filenode()
if node in [fparent1, fparent2]:
self.ui.debug('reusing %s filelog entry\n' % fname)
return node
Matt Mackall
Refactor excessive merge detection, add test
r1716
Mads Kiilerich
localrepo: reuse commit of parent filectx entries without rehashing...
r24394 flog = self.file(fname)
Matt Mackall
merge: remember rename copies and parents properly on commit...
r3292 meta = {}
Martijn Pieters
localrepo: Refactor var names in filecommit to improve readability.
r8244 copy = fctx.renamed()
if copy and copy[0] != fname:
Alexis S. L. Carvalho
filecommit: don't forget the local parent on a merge with a local rename
r4058 # Mark the new revision of this file as a copy of another
Thomas Arendsen Hein
Removed trailing whitespace and tabs from python files
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
filecommit: don't forget the local parent on a merge with a local rename
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
commit: simplify file copy logic
r6874
Martijn Pieters
localrepo: Refactor var names in filecommit to improve readability.
r8244 cfname = copy[0]
crev = manifest1.get(cfname)
newfparent = fparent2
Matt Mackall
commit: simplify file copy logic
r6874
if manifest2: # branch merge
Martijn Pieters
localrepo: Refactor var names in filecommit to improve readability.
r8244 if fparent2 == nullid or crev is None: # copied on remote side
if cfname in manifest2:
crev = manifest2[cfname]
newfparent = fparent1
Matt Mackall
commit: simplify file copy logic
r6874
Ryan McElroy
commit: remove reverse search for copy source when not in parent (issue4476)...
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
spelling: fixes from proofreading of spell checker issues
r24180 # the parent directory. However, this doesn't actually make sense to
Ryan McElroy
commit: remove reverse search for copy source when not in parent (issue4476)...
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
add a fix for issue 1175...
r6875
Matt Mackall
commit: search both parents for missing copy revision (issue2484)...
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
localrepo: commit: avoid calling expensive ancestor function when p1 is nullrev
r20556 elif fparent1 == nullid:
fparent1, fparent2 = fparent2, nullid
Martijn Pieters
localrepo: Refactor var names in filecommit to improve readability.
r8244 elif fparent2 != nullid:
Matt Mackall
Refactor excessive merge detection, add test
r1716 # is one parent an ancestor of the other?
Mads Kiilerich
localrepo: use commonancestorsheads for checking linear heritage in file commit...
r21106 fparentancestors = flog.commonancestorsheads(fparent1, fparent2)
Mads Kiilerich
commit: use revlog.commonancestors instead of .ancestor...
r20987 if fparent1 in fparentancestors:
Martijn Pieters
localrepo: Refactor var names in filecommit to improve readability.
r8244 fparent1, fparent2 = fparent2, nullid
Mads Kiilerich
commit: use revlog.commonancestors instead of .ancestor...
r20987 elif fparent2 in fparentancestors:
Martijn Pieters
localrepo: Refactor var names in filecommit to improve readability.
r8244 fparent2 = nullid
Matt Mackall
Refactor excessive merge detection, add test
r1716
Matt Mackall
filecommit: swallow some bits from _commitctx, add _
r8401 # is the file changed?
Mads Kiilerich
localrepo: reuse commit of parent filectx entries without rehashing...
r24394 text = fctx.data()
Matt Mackall
filecommit: swallow some bits from _commitctx, add _
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
commit: catch changed exec bit on files from p1 (issue4382)
r22492 elif fname in manifest1 and manifest1.flags(fname) != fctx.flags():
Matt Mackall
filecommit: swallow some bits from _commitctx, add _
r8401 changelist.append(fname)
return fparent1
Matt Mackall
Refactor excessive merge detection, add test
r1716
Pierre-Yves David
clfilter: rename `unfilteredmeth` to `unfilteredmethod`...
r18016 @unfilteredmethod
Matt Mackall
commit: drop the now-unused files parameter
r8706 def commit(self, text="", user=None, date=None, match=None, force=False,
Pierre-Yves David
commit: remove a mutable default argument...
r26322 editor=False, extra=None):
Benoit Boissinot
localrepo: update commit*() docstrings
r8515 """Add a new revision to current repository.
Matt Mackall
commit: drop the now-unused files parameter
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
localrepo: update commit*() docstrings
r8515 """
Pierre-Yves David
commit: remove a mutable default argument...
r26322 if extra is None:
extra = {}
Matt Mackall
commit: move explicit file checking into repo.commit
r8709
Matt Mackall
commit: move some setup outside the lock
r8715 def fail(f, msg):
Pierre-Yves David
error: get Abort from 'error' instead of 'util'...
r26587 raise error.Abort('%s: %s' % (f, msg))
Matt Mackall
commit: move some setup outside the lock
r8715
if not match:
Benoit Boissinot
style: use consistent variable names (*mod) with imports which would shadow
r10651 match = matchmod.always(self.root, '')
Matt Mackall
commit: move some setup outside the lock
r8715
if not force:
vdirs = []
Siddharth Agarwal
localrepo.commit: hook into match.explicitdir
r19138 match.explicitdir = vdirs.append
Matt Mackall
commit: move some setup outside the lock
r8715 match.bad = fail
Laurent Charignon
localrepo: put bookmark move following commit in one transaction...
r26998 wlock = lock = tr = None
Matt Mackall
Use try/finally pattern to cleanup locks and transactions
r4915 try:
Laurent Charignon
localrepo: put bookmark move following commit in one transaction...
r26998 wlock = self.wlock()
FUJIWARA Katsunori
commit: make commit acquire store lock before processing for consistency...
r27291 lock = self.lock() # for recent changelog (see issue4368)
Matt Mackall
commit: recurse into subrepositories
r8813 wctx = self[None]
Benoit Boissinot
localrepo.commit: use explicit variables, avoid creating new contexts
r10970 merge = len(wctx.parents()) > 1
mpm@selenic.com
Break apart hg.py...
r1089
Drew Gottlieb
match: add match.ispartial()...
r25114 if not force and merge and match.ispartial():
Pierre-Yves David
error: get Abort from 'error' instead of 'util'...
r26587 raise error.Abort(_('cannot partially commit a merge '
Matt Mackall
remove deprecated rawcommit
r8397 '(do not specify files or patterns)'))
Patrick Mezard
localrepo: replace dirstate by workingfilectx in filecommit()
r6706
Martin von Zweigbergk
localrepo: access status fields by name rather than index
r22928 status = self.status(match=match, clean=force)
Matt Mackall
commit: drop the now-unused files parameter
r8706 if force:
Martin von Zweigbergk
localrepo: access status fields by name rather than index
r22928 status.modified.extend(status.clean) # mq may commit clean files
Benoit Boissinot
localrepo: factor commit and rawcommit...
r3621
Matt Mackall
commit: recurse into subrepositories
r8813 # check subrepos
subs = []
Matt Mackall
subrepo: rewrite handling of subrepo state at commit (issue2403)...
r16073 commitsubs = set()
newstate = wctx.substate.copy()
# only manage subrepos and .hgsubstate if .hgsub is present
Matt Mackall
subrepo: be more careful with deletions of .hgsub and .hgsubstate (issue2844)...
r14536 if '.hgsub' in wctx:
Matt Mackall
subrepo: rewrite handling of subrepo state at commit (issue2403)...
r16073 # we'll decide whether to track this ourselves, thanks
Martin von Zweigbergk
localrepo: access status fields by name rather than index
r22928 for c in status.modified, status.added, status.removed:
FUJIWARA Katsunori
localrepo: omit ".hgsubstate" also from "added" files...
r20827 if '.hgsubstate' in c:
c.remove('.hgsubstate')
Matt Mackall
subrepo: rewrite handling of subrepo state at commit (issue2403)...
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
error: get Abort from 'error' instead of 'util'...
r26587 raise error.Abort(
Matt Mackall
subrepo: rewrite handling of subrepo state at commit (issue2403)...
r16073 _("commit with new subrepo %s excluded") % s)
FUJIWARA Katsunori
subrepo: add dirtyreason to centralize composing dirty reason message...
r24470 dirtyreason = wctx.sub(s).dirtyreason(True)
if dirtyreason:
Matt Mackall
subrepo: rewrite handling of subrepo state at commit (issue2403)...
r16073 if not self.ui.configbool('ui', 'commitsubrepos'):
Pierre-Yves David
error: get Abort from 'error' instead of 'util'...
r26587 raise error.Abort(dirtyreason,
Matt Mackall
subrepo: rewrite handling of subrepo state at commit (issue2403)...
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
subrepo: be more careful with deletions of .hgsub and .hgsubstate (issue2844)...
r14536 for p in wctx.parents():
Matt Mackall
subrepo: rewrite handling of subrepo state at commit (issue2403)...
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
subrepo: be more careful with deletions of .hgsub and .hgsubstate (issue2844)...
r14536 if (not match('.hgsub') and
'.hgsub' in (wctx.modified() + wctx.added())):
Pierre-Yves David
error: get Abort from 'error' instead of 'util'...
r26587 raise error.Abort(
Matt Mackall
subrepo: be more careful with deletions of .hgsub and .hgsubstate (issue2844)...
r14536 _("can't commit subrepos without .hgsub"))
Martin von Zweigbergk
localrepo: access status fields by name rather than index
r22928 status.modified.insert(0, '.hgsubstate')
Matt Mackall
subrepo: rewrite handling of subrepo state at commit (issue2403)...
r16073
Martin von Zweigbergk
localrepo: access status fields by name rather than index
r22928 elif '.hgsub' in status.removed:
Matt Mackall
subrepo: be more careful with deletions of .hgsub and .hgsubstate (issue2844)...
r14536 # clean up .hgsubstate when .hgsub is removed
if ('.hgsubstate' in wctx and
Martin von Zweigbergk
localrepo: access status fields by name rather than index
r22928 '.hgsubstate' not in (status.modified + status.added +
status.removed)):
status.removed.insert(0, '.hgsubstate')
Matt Mackall
commit: recurse into subrepositories
r8813
Matt Mackall
commit: move explicit file checking into repo.commit
r8709 # make sure all explicit patterns are matched
Martin von Zweigbergk
commit: avoid match.files() in conditions...
r25274 if not force and (match.isexact() or match.prefix()):
Martin von Zweigbergk
localrepo: access status fields by name rather than index
r22928 matched = set(status.modified + status.added + status.removed)
Matt Mackall
commit: move explicit file checking into repo.commit
r8709
for f in match.files():
Matt Mackall
commit: normalize filenames when checking explicit files (issue3576)
r17378 f = self.dirstate.normalize(f)
Matt Mackall
commit: recurse into subrepositories
r8813 if f == '.' or f in matched or f in wctx.substate:
Matt Mackall
commit: move explicit file checking into repo.commit
r8709 continue
Martin von Zweigbergk
localrepo: access status fields by name rather than index
r22928 if f in status.deleted:
Matt Mackall
commit: move explicit file checking into repo.commit
r8709 fail(f, _('file not found!'))
if f in vdirs: # visited directory
d = f + '/'
Matt Mackall
commit: trade O(n^2) file checks for O(n^2) dir checks
r8710 for mf in matched:
if mf.startswith(d):
break
else:
Matt Mackall
commit: move explicit file checking into repo.commit
r8709 fail(f, _("no match under directory!"))
elif f not in self.dirstate:
fail(f, _("file not tracked!"))
FUJIWARA Katsunori
context: add workingcommitctx for exact context to be committed...
r23710 cctx = context.workingcommitctx(self, status,
text, user, date, extra)
David Schleimer
localrepo: create context used for actual commit earlier...
r18659
Matt Mackall
commit: mark internal-only option
r25840 # internal config: ui.allowemptycommit
Pierre-Yves David
commit: no longer allow empty commit with the 'force' argument (API)...
r25021 allowemptycommit = (wctx.branch() != wctx.p1().branch()
Durham Goode
commit: add ui.allowemptycommit config option...
r25018 or extra.get('close') or merge or cctx.files()
or self.ui.configbool('ui', 'allowemptycommit'))
Durham Goode
commit: move empty commit condition to a new line...
r25017 if not allowemptycommit:
Matt Mackall
commit: move 'nothing changed' test into commit()
r8404 return None
David Schleimer
localrepo: use workingctx for validation in commit...
r18660 if merge and cctx.deleted():
Pierre-Yves David
error: get Abort from 'error' instead of 'util'...
r26587 raise error.Abort(_("cannot commit merge with missing files"))
Patrick Mezard
commit: abort on merge with missing files...
r16536
Siddharth Agarwal
localrepo.commit: switch to mergestate.read()...
r26996 ms = mergemod.mergestate.read(self)
Siddharth Agarwal
localrepo.commit: disallow commit when driver-resolved files exist...
r26741
Siddharth Agarwal
localrepo.commit: check all files for resolve state (issue4972)...
r27102 if list(ms.unresolved()):
Siddharth Agarwal
localrepo.commit: disallow commit when driver-resolved files exist...
r26741 raise error.Abort(_('unresolved merge conflicts '
'(see "hg help resolve")'))
Siddharth Agarwal
localrepo.commit: check all files for resolve state (issue4972)...
r27102 if ms.mdstate() != 's' or list(ms.driverresolved()):
Siddharth Agarwal
localrepo.commit: disallow commit when driver-resolved files exist...
r26741 raise error.Abort(_('driver-resolved merge conflicts'),
hint=_('run "hg resolve --all" to resolve'))
Matt Mackall
commit: move editor outside transaction...
r8496
if editor:
Matt Mackall
commit: report modified subrepos in commit editor
r8994 cctx._text = editor(self, cctx, subs)
Greg Ward
commit: if relevant, tell user their commit message was saved....
r9935 edited = (text != cctx._text)
Matt Mackall
commit: recurse into subrepositories
r8813
FUJIWARA Katsunori
localrepo: save manually edited commit message as soon as possible...
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
subrepo: rewrite handling of subrepo state at commit (issue2403)...
r16073 # commit subs and write new state
if subs:
for s in sorted(commitsubs):
Edouard Gomez
subrepo: print paths relative to upper repo root for push/pull/commit...
r11112 sub = wctx.sub(s)
self.ui.status(_('committing subrepository %s\n') %
Mads Kiilerich
subrepo: rename relpath to subrelpath and introduce reporelpath
r12752 subrepo.subrelpath(sub))
Edouard Gomez
subrepo: print paths relative to upper repo root for push/pull/commit...
r11112 sr = sub.commit(cctx._text, user, date)
Matt Mackall
subrepo: rewrite handling of subrepo state at commit (issue2403)...
r16073 newstate[s] = (newstate[s][0], sr)
subrepo.writestate(self, newstate)
Matt Mackall
commit: recurse into subrepositories
r8813
Benoit Boissinot
localrepo.commit: use explicit variables, avoid creating new contexts
r10970 p1, p2 = self.dirstate.parents()
hookp1, hookp2 = hex(p1), (p2 != nullid and hex(p2) or '')
Greg Ward
commit: if relevant, tell user their commit message was saved....
r9935 try:
Brodie Rao
cleanup: eradicate long lines
r16683 self.hook("precommit", throw=True, parent1=hookp1,
parent2=hookp2)
Laurent Charignon
localrepo: put bookmark move following commit in one transaction...
r26998 tr = self.transaction('commit')
Greg Ward
commit: if relevant, tell user their commit message was saved....
r9935 ret = self.commitctx(cctx, True)
Brodie Rao
check-code: ignore naked excepts with a "re-raise" comment...
r16705 except: # re-raises
Greg Ward
commit: if relevant, tell user their commit message was saved....
r9935 if edited:
self.ui.write(
_('note: commit message saved in %s\n') % msgfn)
raise
Matt Mackall
bookmarks: move commit action into core
r13357 # update bookmarks, dirstate and mergestate
David Soria Parra
bookmarks: delete divergent bookmarks on merge
r16706 bookmarks.update(self, [p1, p2], ret)
David Schleimer
commit: factor out post-commit cleanup into workingctx...
r18661 cctx.markcommitted(ret)
Matt Mackall
commit: tidy up mergestate slightly
r8503 ms.reset()
Laurent Charignon
localrepo: put bookmark move following commit in one transaction...
r26998 tr.close()
Patrick Mezard
localrepo: extract _commitctx() from commit()...
r6710 finally:
Laurent Charignon
localrepo: put bookmark move following commit in one transaction...
r26998 lockmod.release(tr, lock, wlock)
Patrick Mezard
localrepo: extract _commitctx() from commit()...
r6710
Mads Kiilerich
tag: run commit hook when lock is released (issue3344)
r16680 def commithook(node=hex(ret), parent1=hookp1, parent2=hookp2):
Pierre-Yves David
hook: protect commit hooks against stripping of temporary commit (issue4422)...
r23129 # hack for command that use a temporary commit (eg: histedit)
# temporary commit got stripped before hook release
FUJIWARA Katsunori
localrepo: use changelog.hasnode instead of self.__contains__...
r24992 if self.changelog.hasnode(ret):
Pierre-Yves David
hook: protect commit hooks against stripping of temporary commit (issue4422)...
r23129 self.hook("commit", node=node, parent1=parent1,
parent2=parent2)
Mads Kiilerich
tag: run commit hook when lock is released (issue3344)
r16680 self._afterlock(commithook)
Sune Foldager
run commit and update hooks after command completion (issue1827)...
r10492 return ret
Pierre-Yves David
clfilter: rename `unfilteredmeth` to `unfilteredmethod`...
r18016 @unfilteredmethod
Matt Mackall
commit: move editor outside transaction...
r8496 def commitctx(self, ctx, error=False):
Patrick Mezard
context: improve memctx documentation
r7077 """Add a new revision to current repository.
Matt Mackall
commit: combine _commitctx and commitctx, drop unused force argument
r8410 Revision information is passed via the context argument.
Patrick Mezard
context: improve memctx documentation
r7077 """
Patrick Mezard
context: add memctx for memory commits
r6715
Martin von Zweigbergk
commit: remove dead initialization of 'lock'...
r22908 tr = None
Matt Mackall
commitctx: use contexts more fully
r8414 p1, p2 = ctx.p1(), ctx.p2()
Matt Mackall
commitctx: eliminate some variables
r8412 user = ctx.user()
mpm@selenic.com
Break apart hg.py...
r1089
Matt Mackall
commit: move lots of commitctx outside of the repo lock
r8411 lock = self.lock()
try:
Steve Borho
localrepo: add desc parameter to transaction...
r10881 tr = self.transaction("commit")
Matt Mackall
transactions: avoid late tear-down (issue641)...
r4970 trp = weakref.proxy(tr)
mpm@selenic.com
Break apart hg.py...
r1089
Peter Arrenbrecht
localrepo: reuse parent manifest in commitctx if no files have changed...
r14162 if ctx.files():
Martin von Zweigbergk
commit: use separate variable for p1 manifest and new manifest...
r22909 m1 = p1.manifest()
Peter Arrenbrecht
localrepo: reuse parent manifest in commitctx if no files have changed...
r14162 m2 = p2.manifest()
Martin von Zweigbergk
commit: use separate variable for p1 manifest and new manifest...
r22909 m = m1.copy()
Peter Arrenbrecht
localrepo: reuse parent manifest in commitctx if no files have changed...
r14162
# check in files
Martin von Zweigbergk
commit: update file nodeid and flags in the same place...
r22910 added = []
Peter Arrenbrecht
localrepo: reuse parent manifest in commitctx if no files have changed...
r14162 changed = []
Martin von Zweigbergk
commit: reduce scope of 'removed' variable...
r22907 removed = list(ctx.removed())
Peter Arrenbrecht
localrepo: reuse parent manifest in commitctx if no files have changed...
r14162 linkrev = len(self)
Mads Kiilerich
localrepo: show headline notes in commitctx before showing filenames...
r23749 self.ui.note(_("committing files:\n"))
Peter Arrenbrecht
localrepo: reuse parent manifest in commitctx if no files have changed...
r14162 for f in sorted(ctx.modified() + ctx.added()):
self.ui.note(f + "\n")
try:
fctx = ctx[f]
Mads Kiilerich
convert: use None value for missing files instead of overloading IOError...
r22296 if fctx is None:
removed.append(f)
else:
Martin von Zweigbergk
commit: update file nodeid and flags in the same place...
r22910 added.append(f)
m[f] = self._filecommit(fctx, m1, m2, linkrev,
trp, changed)
Augie Fackler
manifest: rename ambiguously-named set to setflag...
r22942 m.setflag(f, fctx.flags())
Gregory Szorc
global: mass rewrite to use modern exception syntax...
r25660 except OSError as inst:
Matt Mackall
Use try/finally pattern to cleanup locks and transactions
r4915 self.ui.warn(_("trouble committing %s!\n") % f)
raise
Gregory Szorc
global: mass rewrite to use modern exception syntax...
r25660 except IOError as inst:
Peter Arrenbrecht
localrepo: reuse parent manifest in commitctx if no files have changed...
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
convert: use None value for missing files instead of overloading IOError...
r22296 raise
mpm@selenic.com
Break apart hg.py...
r1089
Peter Arrenbrecht
localrepo: reuse parent manifest in commitctx if no files have changed...
r14162 # update manifest
Mads Kiilerich
localrepo: show headline notes in commitctx before showing filenames...
r23749 self.ui.note(_("committing manifest\n"))
Peter Arrenbrecht
localrepo: reuse parent manifest in commitctx if no files have changed...
r14162 removed = [f for f in sorted(removed) if f in m1 or f in m2]
Martin von Zweigbergk
commit: use separate variable for p1 manifest and new manifest...
r22909 drop = [f for f in removed if f in m]
Peter Arrenbrecht
localrepo: reuse parent manifest in commitctx if no files have changed...
r14162 for f in drop:
Martin von Zweigbergk
commit: use separate variable for p1 manifest and new manifest...
r22909 del m[f]
mn = self.manifest.add(m, trp, linkrev,
p1.manifestnode(), p2.manifestnode(),
Martin von Zweigbergk
commit: update file nodeid and flags in the same place...
r22910 added, drop)
Peter Arrenbrecht
localrepo: reuse parent manifest in commitctx if no files have changed...
r14162 files = changed + removed
else:
mn = p1.manifestnode()
files = []
mpm@selenic.com
Break apart hg.py...
r1089
Matt Mackall
commit: move description trimming into changelog
r8499 # update changelog
Mads Kiilerich
localrepo: show headline notes in commitctx before showing filenames...
r23749 self.ui.note(_("committing changelog\n"))
Pierre-Yves David
changelog: handle writepending in the transaction...
r23203 self.changelog.delayupdate(tr)
Peter Arrenbrecht
localrepo: reuse parent manifest in commitctx if no files have changed...
r14162 n = self.changelog.add(mn, files, ctx.description(),
Matt Mackall
commit: move description trimming into changelog
r8499 trp, p1.node(), p2.node(),
Matt Mackall
commitctx: eliminate some variables
r8412 user, ctx.date(), ctx.extra().copy())
Sune Foldager
run commit and update hooks after command completion (issue1827)...
r10492 xp1, xp2 = p1.hex(), p2 and p2.hex() or ''
Matt Mackall
Use try/finally pattern to cleanup locks and transactions
r4915 self.hook('pretxncommit', throw=True, node=hex(n), parent1=xp1,
FUJIWARA Katsunori
hook: centralize passing HG_PENDING to external hook process...
r26751 parent2=xp2)
Pierre-Yves David
Add a phases.new-commit option to control minimal phase of new commit...
r15706 # set the new commit is proper phase
FUJIWARA Katsunori
subrepo: check phase of state in each subrepositories before committing...
r20176 targetphase = subrepo.newcommitphase(self.ui, ctx)
Pierre-Yves David
Add a phases.new-commit option to control minimal phase of new commit...
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
Pierre-Yves David
phase: add a transaction argument to retractboundary...
r22070 phases.retractboundary(self, tr, targetphase, [n])
Matt Mackall
Use try/finally pattern to cleanup locks and transactions
r4915 tr.close()
Pierre-Yves David
branchmap: update cache of 'unserved' filter on new changesets...
r18394 branchmap.updatecache(self.filtered('served'))
Matt Mackall
Use try/finally pattern to cleanup locks and transactions
r4915 return n
finally:
Ronny Pfannschmidt
make transactions work on non-refcounted python implementations
r11230 if tr:
tr.release()
Matt Mackall
commit: push repo lock down into _commitctx
r8405 lock.release()
mpm@selenic.com
Break apart hg.py...
r1089
Pierre-Yves David
clfilter: rename `unfilteredmeth` to `unfilteredmethod`...
r18016 @unfilteredmethod
Idan Kamara
localrepo: introduce destroying function
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
localrepo: write the phasecache when destroying nodes
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
localrepo: introduce destroying function
r18310 @unfilteredmethod
Pierre-Yves David
destroyed: drop complex branchcache rebuilt logic...
r18395 def destroyed(self):
Greg Ward
localrepo: add destroyed() method for strip/rollback to use (issue548).
r9150 '''Inform the repository that nodes have been destroyed.
Intended for use by strip and rollback, so there's a common
Joshua Redstone
strip: incrementally update the branchheads cache after a strip...
r17013 place for anything that has to be done after destroying history.
'''
Idan Kamara
localrepo: filter unknown nodes from the phasecache on destroyed...
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
localrepo: always write the filtered phasecache when nodes are destroyed (issue3827)...
r18757 self._phasecache.filterunknown(self)
self._phasecache.write()
Idan Kamara
localrepo: filter unknown nodes from the phasecache on destroyed...
r18221
Pierre-Yves David
destroyed: update `unserved` branchcache instead...
r18396 # update the 'served' branch cache to help read only server process
Mads Kiilerich
spelling: fix some minor issues found by spell checker
r18644 # Thanks to branchcache collaboration this is done from the nearest
Pierre-Yves David
destroyed: update `unserved` branchcache instead...
r18396 # filtered subset and it is expected to be fast.
branchmap.updatecache(self.filtered('served'))
Pierre-Yves David
destroyed: filter unknown before computing branchcache...
r18223
Greg Ward
tags: implement persistent tag caching (issue548)....
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
destroyed: keep the filecache in sync with __dict__ (issue3335) (issue3693) (issue3743)...
r18313 self.invalidate()
Idan Kamara
localrepo: clear the filecache on _rollback() and destroyed()...
r17324
Matt Mackall
walk: remove cmdutil.walk
r6585 def walk(self, match, node=None):
Matt Mackall
improve walk docstrings
r3532 '''
walk recursively through the directory tree or a given
changeset, finding all files matched by the match
function
'''
Matt Mackall
context: add walk method
r6764 return self[node].walk(match)
Matt Mackall
improve walk docstrings
r3532
Matt Mackall
status: use contexts
r6769 def status(self, node1='.', node2=None, match=None,
Martin Geisler
status: recurse into subrepositories with --subrepos/-S flag
r12166 ignored=False, clean=False, unknown=False,
listsubrepos=False):
Sean Farley
localrepo: replace status method with a shim...
r21596 '''a convenience method that calls node1.status(node2)'''
return self[node1].status(node2, match, ignored, clean, unknown,
listsubrepos)
Vadim Gelfer
status: add -c (clean) and -A (all files) options...
r2661
John Mulligan
localrepo: remove 'closed' argument to heads(...) function...
r8796 def heads(self, start=None):
Benoit Boissinot
add a -r/--rev option to heads to show only heads descendant from rev
r1550 heads = self.changelog.heads(start)
# sort the output in rev descending order
Thomas Arendsen Hein
coding style: fix gratuitous whitespace after Python keywords
r13075 return sorted(heads, key=self.changelog.rev, reverse=True)
mpm@selenic.com
Break apart hg.py...
r1089
John Mulligan
localrepo: set heads and branchheads to be closed=False by default...
r8694 def branchheads(self, branch=None, start=None, closed=False):
Sune Foldager
localrepo: fix bugs in branchheads and add docstring...
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
use repo[changeid] to get a changectx
r6747 if branch is None:
branch = self[None].branch()
Benoit Boissinot
localrepo/branchcache: remove lbranchmap(), convert users to use utf-8 names...
r9675 branches = self.branchmap()
Eric Hopper
Add option to heads to show only heads for current branch.
r4648 if branch not in branches:
return []
John Mulligan
store all heads of a branch in the branch cache...
r7654 # the cache returns heads ordered lowest to highest
Brodie Rao
localrepo: refactor repo.branchheads() to use repo.branchmap().branchheads()
r20189 bheads = list(reversed(branches.branchheads(branch, closed=closed)))
Eric Hopper
Add option to heads to show only heads for current branch.
r4648 if start is not None:
John Mulligan
store all heads of a branch in the branch cache...
r7654 # filter out the heads that cannot be reached from startrev
Sune Foldager
localrepo: fix bugs in branchheads and add docstring...
r9475 fbheads = set(self.changelog.nodesbetween([start], bheads)[2])
bheads = [h for h in bheads if h in fbheads]
John Mulligan
store all heads of a branch in the branch cache...
r7654 return bheads
Eric Hopper
Add option to heads to show only heads for current branch.
r4648
mpm@selenic.com
Break apart hg.py...
r1089 def branches(self, nodes):
Thomas Arendsen Hein
Cleanup of indentation, spacing, newlines, strings and line length
r1615 if not nodes:
nodes = [self.changelog.tip()]
mpm@selenic.com
Break apart hg.py...
r1089 b = []
for n in nodes:
t = n
Martin Geisler
check-code: flag 0/1 used as constant Boolean expression
r14494 while True:
mpm@selenic.com
Break apart hg.py...
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
wire protocol: avoid infinite loop (issue1483)
r7708 while n != bottom and n != nullid:
mpm@selenic.com
Break apart hg.py...
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
push: pass a `pushoperation` object to localrepo.checkpush...
r20924 def checkpush(self, pushop):
Patrick Mezard
mq: factor out push conditions checks...
r13327 """Extensions can override this function if additional checks have
to be performed before pushing, or call it if they override push
command.
"""
pass
FUJIWARA Katsunori
localrepo: introduce "prepushoutgoinghooks" to extend outgoing check easily...
r21043 @unfilteredpropertycache
def prepushoutgoinghooks(self):
"""Return util.hooks consists of "(repo, remote, outgoing)"
functions, which are called before pushing changesets.
"""
return util.hooks()
Matt Mackall
pushkey: add localrepo support
r11368 def pushkey(self, namespace, key, old, new):
Pierre-Yves David
pushkey: gracefully handle prepushkey hook failure (issue4455)...
r23416 try:
Pierre-Yves David
pushkey: use hook arguments from transaction when one exists...
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
global: mass rewrite to use modern exception syntax...
r25660 except error.HookAbort as exc:
Pierre-Yves David
pushkey: gracefully handle prepushkey hook failure (issue4455)...
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
pushkey: add more verbose debug output regarding pushkey...
r17293 self.ui.debug('pushing key for "%s:%s"\n' % (namespace, key))
Brodie Rao
pushkey: add hooks for pushkey/listkeys
r14102 ret = pushkey.push(self, namespace, key, old, new)
Pierre-Yves David
pushkey: run hook after the lock release...
r23648 def runhook():
self.hook('pushkey', namespace=namespace, key=key, old=old, new=new,
ret=ret)
self._afterlock(runhook)
Brodie Rao
pushkey: add hooks for pushkey/listkeys
r14102 return ret
Matt Mackall
pushkey: add localrepo support
r11368
def listkeys(self, namespace):
Brodie Rao
pushkey: add hooks for pushkey/listkeys
r14102 self.hook('prelistkeys', throw=True, namespace=namespace)
Pierre-Yves David
pushkey: add more verbose debug output regarding pushkey...
r17293 self.ui.debug('listing keys for "%s"\n' % namespace)
Brodie Rao
pushkey: add hooks for pushkey/listkeys
r14102 values = pushkey.list(self, namespace)
self.hook('listkeys', namespace=namespace, values=values)
return values
Matt Mackall
pushkey: add localrepo support
r11368
Peter Arrenbrecht
wireproto: add test for new optional arg missing on server...
r14048 def debugwireargs(self, one, two, three=None, four=None, five=None):
Peter Arrenbrecht
debug: add debugwireargs to test argument passing over the wire...
r13720 '''used to test argument passing over the wire'''
Peter Arrenbrecht
wireproto: add test for new optional arg missing on server...
r14048 return "%s %s %s %s %s" % (one, two, three, four, five)
Matt Mackall
pushkey: add localrepo support
r11368
Patrick Mezard
localrepo: add savecommitmessage() to write last-message.txt
r14529 def savecommitmessage(self, text):
Angel Ezquerra
localrepo: remove all internal uses of localrepo.opener...
r23852 fp = self.vfs('last-message.txt', 'wb')
Patrick Mezard
localrepo: add savecommitmessage() to write last-message.txt
r14529 try:
fp.write(text)
finally:
fp.close()
Mads Kiilerich
check-code: there must also be whitespace between ')' and operator...
r18054 return self.pathto(fp.name[len(self.root) + 1:])
Patrick Mezard
localrepo: add savecommitmessage() to write last-message.txt
r14529
mason@suse.com
Automatic nesting into running transactions in the same repository....
r1806 # used to avoid circular references so destructors work
Benoit Boissinot
localrepo: change aftertrans to be independant of the store path
r3790 def aftertrans(files):
renamefiles = [tuple(t) for t in files]
mason@suse.com
Automatic nesting into running transactions in the same repository....
r1806 def a():
FUJIWARA Katsunori
localrepo: use "vfs.rename()" instead of "util.rename()"...
r18952 for vfs, src, dest in renamefiles:
Alain Leufroy
localrepo: do not complain about missing journal files
r16441 try:
FUJIWARA Katsunori
localrepo: use "vfs.rename()" instead of "util.rename()"...
r18952 vfs.rename(src, dest)
Alain Leufroy
localrepo: do not complain about missing journal files
r16441 except OSError: # journal file does not yet exist
pass
mason@suse.com
Automatic nesting into running transactions in the same repository....
r1806 return a
Alexander Solovyov
fix bookmarks rollback behavior...
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
clean up hg.py: move repo constructor code into each repo module
r2740 def instance(ui, path, create):
Mads Kiilerich
util: rename the util.localpath that uses url to urllocalpath (issue2875)...
r14825 return localrepository(ui, util.urllocalpath(path), create)
Thomas Arendsen Hein
Whitespace/Tab cleanup
r3223
Vadim Gelfer
clean up hg.py: move repo constructor code into each repo module
r2740 def islocal(path):
return True