##// END OF EJS Templates
cmdserver: don't raise EOFError when trying to read 0 bytes from the client
cmdserver: don't raise EOFError when trying to read 0 bytes from the client

File last commit:

r14646:001788ef default
r14706:5fd5dd9a stable
Show More
localrepo.py
1991 lines | 74.6 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.
mpm@selenic.com
Break apart hg.py...
r1089
Joel Rosdahl
Expand import * to allow Pyflakes to find problems
r6211 from node import bin, hex, nullid, nullrev, short
Matt Mackall
Simplify i18n imports
r3891 from i18n import _
Matt Mackall
pushkey: add localrepo support
r11368 import repo, changegroup, subrepo, discovery, pushkey
Matt Mackall
bookmarks: move property methods into localrepo
r13355 import changelog, dirstate, filelog, manifest, context, bookmarks
Peter Arrenbrecht
drop unused imports
r8390 import lock, transaction, store, encoding
Adrian Buehlmann
move opener from util to scmutil
r13970 import scmutil, util, extensions, hook, error
Benoit Boissinot
style: use consistent variable names (*mod) with imports which would shadow
r10651 import match as matchmod
import merge as mergemod
import tags as tagsmod
Ronny Pfannschmidt
switch lock releasing in the core from gc to explicit
r8109 from lock import release
Dirkjan Ochtman
move working dir/dirstate methods from localrepo to workingctx
r11303 import weakref, errno, os, time, inspect
Matt Mackall
localrepo: use propertycache
r8260 propertycache = util.propertycache
Ronny Pfannschmidt
switch lock releasing in the core from gc to explicit
r8109
Vadim Gelfer
add support for streaming clone....
r2612 class localrepository(repo.repository):
Peter Arrenbrecht
wireproto: add known([id]) function...
r13723 capabilities = set(('lookup', 'changegroupsubset', 'branchmap', 'pushkey',
Peter Arrenbrecht
wireproto: add getbundle() function...
r13741 'known', 'getbundle'))
Sune Foldager
revlog: support writing generaldelta revlogs...
r14270 supportedformats = set(('revlogv1', 'generaldelta'))
Adrian Buehlmann
store: encode first period or space in filenames (issue1713)...
r12687 supported = supportedformats | set(('store', 'fncache', 'shared',
'dotencode'))
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):
Vadim Gelfer
add support for streaming clone....
r2612 repo.repository.__init__(self)
Alexander Solovyov
expand paths to local repository or bundle in appropriate classes...
r11154 self.root = os.path.realpath(util.expandpath(path))
Alexis S. L. Carvalho
Save an absolute path in repo.path...
r4170 self.path = os.path.join(self.root, ".hg")
Benoit Boissinot
move code around
r3850 self.origroot = path
Adrian Buehlmann
rename path_auditor to pathauditor...
r14220 self.auditor = scmutil.pathauditor(self.root, self._checknested)
Adrian Buehlmann
move opener from util to scmutil
r13970 self.opener = scmutil.opener(self.path)
self.wopener = scmutil.opener(self.root)
Matt Mackall
repo: set up ui and extensions earlier
r8797 self.baseui = baseui
self.ui = baseui.copy()
try:
self.ui.readconfig(self.join("hgrc"), self.root)
extensions.loadall(self.ui)
except IOError:
pass
mpm@selenic.com
Break apart hg.py...
r1089
Benoit Boissinot
localrepo: move the repo creation code, fail if the repo exists
r3035 if not os.path.isdir(self.path):
if create:
if not os.path.exists(path):
Mads Kiilerich
init: create target directory recursively...
r11640 util.makedirs(path)
Adrian Buehlmann
set NOT_CONTENT_INDEXED on .hg dir (issue2694)...
r13795 util.makedir(self.path, notindexed=True)
Alexis S. L. Carvalho
small fixes for the parent patch...
r4166 requirements = ["revlogv1"]
Matt Mackall
repo: set up ui and extensions earlier
r8797 if self.ui.configbool('format', 'usestore', True):
Matt Mackall
Allow disabling store format to work with absurdly long filenames
r4163 os.mkdir(os.path.join(self.path, "store"))
Alexis S. L. Carvalho
small fixes for the parent patch...
r4166 requirements.append("store")
Matt Mackall
repo: set up ui and extensions earlier
r8797 if self.ui.configbool('format', 'usefncache', True):
Adrian Buehlmann
add format.usefncache config option (default is true)...
r7234 requirements.append("fncache")
Adrian Buehlmann
store: encode first period or space in filenames (issue1713)...
r12687 if self.ui.configbool('format', 'dotencode', True):
requirements.append('dotencode')
Alexis S. L. Carvalho
small fixes for the parent patch...
r4166 # create an invalid changelog
Dan Villiom Podlaski Christiansen
prevent transient leaks of file handle by using new helper functions...
r14168 self.opener.append(
"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'
)
Sune Foldager
revlog: support writing generaldelta revlogs...
r14270 if self.ui.configbool('format', 'generaldelta', False):
requirements.append("generaldelta")
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:
Adrian Buehlmann
introduce new function scmutil.readrequires...
r14482 requirements = scmutil.readrequires(self.opener, self.supported)
Benoit Boissinot
add "requires" file to the repo, specifying the requirements
r3851 except IOError, inst:
if inst.errno != errno.ENOENT:
raise
Adrian Buehlmann
introduce new function scmutil.readrequires...
r14482 requirements = set()
mpm@selenic.com
Break apart hg.py...
r1089
Matt Mackall
repo: add internal support for sharing store directories...
r8799 self.sharedpath = self.path
try:
Dan Villiom Podlaski Christiansen
prevent transient leaks of file handle by using new helper functions...
r14168 s = os.path.realpath(self.opener.read("sharedpath"))
Matt Mackall
repo: add internal support for sharing store directories...
r8799 if not os.path.exists(s):
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
except IOError, inst:
if inst.errno != errno.ENOENT:
raise
Adrian Buehlmann
move opener from util to scmutil
r13970 self.store = store.store(requirements, self.sharedpath, scmutil.opener)
Adrian Buehlmann
introduce store classes...
r6840 self.spath = self.store.path
self.sopener = self.store.opener
self.sjoin = self.store.join
self.opener.createmode = self.store.createmode
Sune Foldager
localrepo: factor out requirement application and write
r12295 self._applyrequirements(requirements)
if create:
self._writerequirements()
Benoit Boissinot
move code around
r3850
Greg Ward
localrepo: rename in-memory tag cache instance attributes (issue548)....
r9146 # 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 = None
self._tagtypes = None
Matt Mackall
branch: operate on branch names in local string space where possible...
r13047 self._branchcache = None
Alexis S. L. Carvalho
automatically update the branch cache when tip changes
r6121 self._branchcachetip = None
mpm@selenic.com
Break apart hg.py...
r1089 self.nodetagscache = 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
Sune Foldager
localrepo: factor out requirement application and write
r12295 def _applyrequirements(self, requirements):
self.requirements = requirements
Sune Foldager
revlog: get rid of defversion...
r14333 openerreqs = set(('revlogv1', 'generaldelta'))
self.sopener.options = dict((r, 1) for r in requirements
if r in openerreqs)
Sune Foldager
localrepo: factor out requirement application and write
r12295
def _writerequirements(self):
reqfile = self.opener("requires", "w")
for r in self.requirements:
reqfile.write("%s\n" % r)
reqfile.close()
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:]
# 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:
prefix = os.sep.join(parts)
if prefix in ctx.substate:
if prefix == subpath:
return True
else:
sub = ctx.sub(prefix)
return sub.checknested(subpath[len(prefix) + 1:])
else:
parts.pop()
return False
Matt Mackall
bookmarks: move property methods into localrepo
r13355 @util.propertycache
def _bookmarks(self):
return bookmarks.read(self)
@util.propertycache
def _bookmarkcurrent(self):
return bookmarks.readcurrent(self)
Martin Geisler
localrepo: add auditor attribute which knows about subrepos
r12162
Matt Mackall
localrepo: use propertycache
r8260 @propertycache
def changelog(self):
c = changelog.changelog(self.sopener)
if 'HG_PENDING' in os.environ:
p = os.environ['HG_PENDING']
if p.startswith(self.root):
c.readpending('00changelog.i.a')
return c
@propertycache
def manifest(self):
return manifest.manifest(self.sopener)
@propertycache
def dirstate(self):
Matt Mackall
dirstate: warn on invalid parents rather than aborting...
r13032 warned = [0]
def validate(node):
try:
Alexander Solovyov
remove unused imports and variables
r14064 self.changelog.rev(node)
Matt Mackall
dirstate: warn on invalid parents rather than aborting...
r13032 return node
except error.LookupError:
if not warned[0]:
warned[0] = True
self.ui.warn(_("warning: ignoring unknown"
Martin Geisler
localrepo: move string formatting out of gettext call
r13037 " working parent %s!\n") % short(node))
Matt Mackall
dirstate: warn on invalid parents rather than aborting...
r13032 return nullid
return dirstate.dirstate(self.opener, self.ui, self.root, validate)
Vadim Gelfer
support hooks written in python....
r2155
Matt Mackall
use repo[changeid] to get a changectx
r6747 def __getitem__(self, changeid):
Martin Geisler
use 'x is None' instead of 'x == None'...
r8527 if changeid is None:
Matt Mackall
use repo[changeid] to get a changectx
r6747 return context.workingctx(self)
return context.changectx(self, changeid)
Alexander Solovyov
localrepo: support 'rev in repo' syntax
r9924 def __contains__(self, changeid):
try:
return bool(self.lookup(changeid))
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):
for i in xrange(len(self)):
yield i
Vadim Gelfer
support hooks written in python....
r2155
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):
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
Vadim Gelfer
move most of tag code to localrepository class.
r2601 tag_disallowed = ':\r\n'
Matt Mackall
tag: drop unused use_dirstate and parent from _tag()
r8402 def _tag(self, names, node, message, local, user, date, extra={}):
John Coomes
tag: allow multiple tags to be added or removed...
r6321 if isinstance(names, str):
allchars = names
names = (names,)
else:
allchars = ''.join(names)
Brendan Cully
Break core of repo.tag into dirstate/hook-free repo._tag for convert-repo
r4118 for c in self.tag_disallowed:
John Coomes
tag: allow multiple tags to be added or removed...
r6321 if c in allchars:
Brendan Cully
Break core of repo.tag into dirstate/hook-free repo._tag for convert-repo
r4118 raise util.Abort(_('%r cannot be used in a tag name') % c)
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:
Matt Mackall
tag: record tag we're superseding, if any (issue 1102)
r6671 m = munge and munge(name) or name
Greg Ward
localrepo: rename in-memory tag cache instance attributes (issue548)....
r9146 if self._tagtypes and name in self._tagtypes:
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:
fp = self.opener('localtags', 'r+')
Peter Arrenbrecht
cleanup: drop unused assignments
r7875 except IOError:
Bryan O'Sullivan
tag: handle .hgtags and .hg/localtags with missing final newline (issue 601)...
r4932 fp = self.opener('localtags', 'a')
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+')
Idan Kamara
localrepo: don't attempt to open .hgtags twice if the error isn't ENOENT
r14646 except IOError, e:
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()
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'])
Matt Mackall
commit: drop the now-unused files parameter
r8706 tagnode = self.commit(message, user, date, extra=extra, match=m)
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
John Coomes
tag: allow multiple tags to be added or removed...
r6321 def tag(self, names, node, message, local, user, date):
'''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:
for x in self.status()[:5]:
if '.hgtags' in x:
raise util.Abort(_('working copy of .hgtags is changed '
'(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
John Coomes
tag: allow multiple tags to be added or removed...
r6321 self._tag(names, node, message, local, user, date)
Vadim Gelfer
move most of tag code to localrepository class.
r2601
mpm@selenic.com
Break apart hg.py...
r1089 def tags(self):
'''return a mapping of tag to node'''
Greg Ward
localrepo: rename in-memory tag cache instance attributes (issue548)....
r9146 if self._tags is None:
(self._tags, self._tagtypes) = self._findtags()
Greg Ward
localrepo: factor _findtags() out of tags() (issue548)....
r9145
Greg Ward
localrepo: rename in-memory tag cache instance attributes (issue548)....
r9146 return self._tags
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:
Idan Kamara
localrepo: ignore tags to unknown nodes (issue2750)
r14499 try:
# ignore tags to unknown nodes
self.changelog.lookup(node)
tags[encoding.tolocal(name)] = node
except error.LookupError:
pass
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
'''
self.tags()
Thomas Arendsen Hein
Removed tabs and trailing whitespace in python files
r5760
Greg Ward
localrepo: rename in-memory tag cache instance attributes (issue548)....
r9146 return self._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'''
l = []
Dirkjan Ochtman
use dict.iteritems() rather than dict.items()...
r7622 for t, n in self.tags().iteritems():
Idan Kamara
tags: remove another check for valid nodes...
r13909 r = self.changelog.rev(n)
Thomas Arendsen Hein
Cleanup of indentation, spacing, newlines, strings and line length
r1615 l.append((r, t, n))
Matt Mackall
replace util.sort with sorted built-in...
r8209 return [(t, n) for r, t, n in sorted(l)]
mpm@selenic.com
Break apart hg.py...
r1089
def nodetags(self, node):
'''return the tags associated with a node'''
if not self.nodetagscache:
self.nodetagscache = {}
Dirkjan Ochtman
use dict.iteritems() rather than dict.items()...
r7622 for t, n in self.tags().iteritems():
Thomas Arendsen Hein
Cleanup of indentation, spacing, newlines, strings and line length
r1615 self.nodetagscache.setdefault(n, []).append(t)
Eric Eisner
tags: return tags in sorted order...
r11047 for tags in self.nodetagscache.itervalues():
tags.sort()
mpm@selenic.com
Break apart hg.py...
r1089 return self.nodetagscache.get(node, [])
David Soria Parra
context: add method to return all bookmarks pointing to a node
r13384 def nodebookmarks(self, node):
marks = []
for bookmark, n in self._bookmarks.iteritems():
if n == node:
marks.append(bookmark)
return sorted(marks)
Alexis S. L. Carvalho
move the reading of branch.cache from _branchtags to branchtags
r6120 def _branchtags(self, partial, lrev):
John Mulligan
store all heads of a branch in the branch cache...
r7654 # TODO: rename this function?
Matt Mackall
add __len__ and __iter__ methods to repo and revlog
r6750 tiprev = len(self) - 1
Alexis S. L. Carvalho
Split branchtags into two additional functions....
r3491 if lrev != tiprev:
Sune Foldager
localrepo: change _updatebranchcache to use a context generator
r10770 ctxgen = (self[r] for r in xrange(lrev + 1, tiprev + 1))
self._updatebranchcache(partial, ctxgen)
Alexis S. L. Carvalho
Split branchtags into two additional functions....
r3491 self._writebranchcache(partial, self.changelog.tip(), tiprev)
Alexis S. L. Carvalho
fix encoding conversion of branch names when mq is loaded
r3826 return partial
Georg Brandl
localrepo: introduce method for explicit branch cache update...
r12066 def updatebranchcache(self):
Henrik Stuart
transfer branchmap branch names over the wire in utf-8
r9671 tip = self.changelog.tip()
Benoit Boissinot
localrepo/branchcache: kill unused localrepo.branchcache...
r9674 if self._branchcache is not None and self._branchcachetip == tip:
return self._branchcache
Henrik Stuart
transfer branchmap branch names over the wire in utf-8
r9671
Alexis S. L. Carvalho
automatically update the branch cache when tip changes
r6121 oldtip = self._branchcachetip
self._branchcachetip = tip
if oldtip is None or oldtip not in self.changelog.nodemap:
partial, last, lrev = self._readbranchcache()
else:
lrev = self.changelog.rev(oldtip)
Benoit Boissinot
localrepo/branchcache: kill unused localrepo.branchcache...
r9674 partial = self._branchcache
Alexis S. L. Carvalho
automatically update the branch cache when tip changes
r6121
Alexis S. L. Carvalho
move the reading of branch.cache from _branchtags to branchtags
r6120 self._branchtags(partial, lrev)
John Mulligan
store all heads of a branch in the branch cache...
r7654 # this private cache holds all heads (not just tips)
Benoit Boissinot
localrepo/branchcache: kill unused localrepo.branchcache...
r9674 self._branchcache = partial
Alexis S. L. Carvalho
fix encoding conversion of branch names when mq is loaded
r3826
Georg Brandl
localrepo: introduce method for explicit branch cache update...
r12066 def branchmap(self):
'''returns a dictionary {branch: [branchheads]}'''
self.updatebranchcache()
Benoit Boissinot
localrepo/branchcache: kill unused localrepo.branchcache...
r9674 return self._branchcache
John Mulligan
store all heads of a branch in the branch cache...
r7654
def branchtags(self):
'''return a dict where branch names map to the tipmost head of
John Mulligan
branch closing: referencing open and closed branches/heads...
r7656 the branch, open heads come before closed'''
bt = {}
Benoit Boissinot
localrepo/branchcache: remove lbranchmap(), convert users to use utf-8 names...
r9675 for bn, heads in self.branchmap().iteritems():
Benoit Boissinot
localrepo: cleanup branch tip computation
r10392 tip = heads[-1]
for h in reversed(heads):
John Mulligan
branch closing: referencing open and closed branches/heads...
r7656 if 'close' not in self.changelog.read(h)[5]:
Benoit Boissinot
localrepo: cleanup branch tip computation
r10392 tip = h
John Mulligan
branch closing: referencing open and closed branches/heads...
r7656 break
Benoit Boissinot
localrepo: cleanup branch tip computation
r10392 bt[bn] = tip
John Mulligan
branch closing: referencing open and closed branches/heads...
r7656 return bt
Alexis S. L. Carvalho
Split branchtags into two additional functions....
r3491 def _readbranchcache(self):
partial = {}
Matt Mackall
Add branchtags function with cache...
r3417 try:
Adrian Buehlmann
remove pointless os.path.join calls when opening files in .hg/cache...
r13341 f = self.opener("cache/branchheads")
Alexis S. L. Carvalho
don't use readline() to read branches.cache...
r3668 lines = f.read().split('\n')
f.close()
Matt Mackall
branch.cache: silently ignore I/O and OS errors
r4415 except (IOError, OSError):
return {}, nullid, nullrev
try:
Thomas Arendsen Hein
Store empty (default) branch in branch cache, too....
r4167 last, lrev = lines.pop(0).split(" ", 1)
Matt Mackall
Add branchtags function with cache...
r3417 last, lrev = bin(last), int(lrev)
Matt Mackall
add __len__ and __iter__ methods to repo and revlog
r6750 if lrev >= len(self) or self[lrev].node() != last:
Alexis S. L. Carvalho
Ignore all errors while parsing the branch cache.
r3761 # invalidate the cache
Thomas Arendsen Hein
Print less scary warning when invalidating the branch cache.
r6056 raise ValueError('invalidating branch cache (tip differs)')
Alexis S. L. Carvalho
Ignore all errors while parsing the branch cache.
r3761 for l in lines:
Matt Mackall
many, many trivial check-code fixups
r10282 if not l:
continue
Thomas Arendsen Hein
Store empty (default) branch in branch cache, too....
r4167 node, label = l.split(" ", 1)
Matt Mackall
branch: operate on branch names in local string space where possible...
r13047 label = encoding.tolocal(label.strip())
partial.setdefault(label, []).append(bin(node))
Matt Mackall
error: move SignalInterrupt...
r7644 except KeyboardInterrupt:
Alexis S. L. Carvalho
Ignore all errors while parsing the branch cache.
r3761 raise
except Exception, inst:
if self.ui.debugflag:
self.ui.warn(str(inst), '\n')
partial, last, lrev = {}, nullid, nullrev
Alexis S. L. Carvalho
Split branchtags into two additional functions....
r3491 return partial, last, lrev
Matt Mackall
Add branchtags function with cache...
r3417
Alexis S. L. Carvalho
Split branchtags into two additional functions....
r3491 def _writebranchcache(self, branches, tip, tiprev):
Matt Mackall
If we can't write the branch cache, fail quietly.
r3452 try:
Adrian Buehlmann
remove pointless os.path.join calls when opening files in .hg/cache...
r13341 f = self.opener("cache/branchheads", "w", atomictemp=True)
Alexis S. L. Carvalho
Split branchtags into two additional functions....
r3491 f.write("%s %s\n" % (hex(tip), tiprev))
John Mulligan
store all heads of a branch in the branch cache...
r7654 for label, nodes in branches.iteritems():
for node in nodes:
Matt Mackall
branch: operate on branch names in local string space where possible...
r13047 f.write("%s %s\n" % (hex(node), encoding.fromlocal(label)))
Alexis S. L. Carvalho
use atomictemp files to write branch.cache
r4329 f.rename()
Matt Mackall
branch.cache: silently ignore I/O and OS errors
r4415 except (IOError, OSError):
Matt Mackall
If we can't write the branch cache, fail quietly.
r3452 pass
Matt Mackall
Add branchtags function with cache...
r3417
Sune Foldager
localrepo: change _updatebranchcache to use a context generator
r10770 def _updatebranchcache(self, partial, ctxgen):
Brendan Cully
Branch heads should not include "heads" that are ancestors of other heads....
r8954 # collect new branch entries
newbranches = {}
Sune Foldager
localrepo: change _updatebranchcache to use a context generator
r10770 for c in ctxgen:
Brendan Cully
Branch heads should not include "heads" that are ancestors of other heads....
r8954 newbranches.setdefault(c.branch(), []).append(c.node())
# if older branchheads are reachable from new ones, they aren't
# really branchheads. Note checking parents is insufficient:
# 1 (branch a) -> 2 (branch b) -> 3 (branch a)
for branch, newnodes in newbranches.iteritems():
bheads = partial.setdefault(branch, [])
bheads.extend(newnodes)
Sune Foldager
localrepo: simplify _updatebranchcache slightly
r10920 if len(bheads) <= 1:
Brendan Cully
Branch heads should not include "heads" that are ancestors of other heads....
r8954 continue
Dan Villiom Podlaski Christiansen
branchcache: improve speed relative to the amount of heads...
r14056 bheads = sorted(bheads, key=lambda x: self[x].rev())
Brendan Cully
Branch heads should not include "heads" that are ancestors of other heads....
r8954 # starting from tip means fewer passes over reachable
while newnodes:
latest = newnodes.pop()
if latest not in bheads:
continue
Dan Villiom Podlaski Christiansen
branchcache: improve speed relative to the amount of heads...
r14056 minbhrev = self[bheads[0]].node()
Henrik Stuart
branch heads: optimise computation of branch head cache (issue1734)...
r9120 reachable = self.changelog.reachable(latest, minbhrev)
Sune Foldager
localrepo: simplify _updatebranchcache slightly
r10920 reachable.remove(latest)
Dan Villiom Podlaski Christiansen
branchcache: improve speed relative to the amount of heads...
r14056 if reachable:
bheads = [b for b in bheads if b not in reachable]
Brendan Cully
Branch heads should not include "heads" that are ancestors of other heads....
r8954 partial[branch] = bheads
Alexis S. L. Carvalho
Split branchtags into two additional functions....
r3491
mpm@selenic.com
Break apart hg.py...
r1089 def lookup(self, key):
Matt Mackall
lookup: fast-paths for int and 'tip'
r7377 if isinstance(key, int):
return self.changelog.node(key)
elif key == '.':
Matt Mackall
misc: replace .parents()[0] with p1()
r13878 return self.dirstate.p1()
Brendan Cully
Add "null" pseudo-tag pointing to nullid
r3801 elif key == 'null':
return nullid
Matt Mackall
lookup: fast-paths for int and 'tip'
r7377 elif key == 'tip':
return self.changelog.tip()
Matt Mackall
Only look up tags and branches as a last resort
r3453 n = self.changelog._match(key)
if n:
return n
Matt Mackall
bookmarks: merge lookup into localrepo
r13363 if key in self._bookmarks:
return self._bookmarks[key]
Matt Mackall
Make lookup aware of branch labels...
r3418 if key in self.tags():
mpm@selenic.com
Break apart hg.py...
r1089 return self.tags()[key]
Matt Mackall
Make lookup aware of branch labels...
r3418 if key in self.branchtags():
return self.branchtags()[key]
Matt Mackall
Only look up tags and branches as a last resort
r3453 n = self.changelog._partialmatch(key)
if n:
return n
Matt Mackall
lookup: check for dirstate damage on failure
r8639
# can't find key, check if it might have come from damaged dirstate
if key in self.dirstate.parents():
raise error.Abort(_("working directory has unknown parent '%s'!")
% short(key))
Matt Mackall
Use a weakref for recursive transactions
r4916 try:
if len(key) == 20:
key = hex(key)
Idan Kamara
eliminate various naked except clauses
r14004 except TypeError:
Matt Mackall
Use a weakref for recursive transactions
r4916 pass
Matt Mackall
Make distinct lookup error for localrepo.lookup...
r9423 raise error.RepoLookupError(_("unknown revision '%s'") % key)
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):
nm = self.changelog.nodemap
return [(n in nm) for n in nodes]
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
def join(self, f):
return os.path.join(self.path, f)
def wjoin(self, f):
return os.path.join(self.root, f)
def file(self, f):
Thomas Arendsen Hein
Cleanup of indentation, spacing, newlines, strings and line length
r1615 if f[0] == '/':
f = f[1:]
Matt Mackall
revlog: simplify revlog version handling...
r4258 return filelog.filelog(self.sopener, f)
mpm@selenic.com
Break apart hg.py...
r1089
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
Matt Mackall
Add localrepo.parents to get parent changectxs.
r3163 def parents(self, changeid=None):
Matt Mackall
context: clean up parents()
r6742 '''get list of changectxs for parents of changeid'''
Matt Mackall
use repo[changeid] to get a changectx
r6747 return self[changeid].parents()
Matt Mackall
Add localrepo.parents to get parent changectxs.
r3163
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'):
return self.wopener(f, mode)
Alexis S. L. Carvalho
use os.path.islink instead of util.is_link; remove util.is_link
r4275 def _link(self, f):
return os.path.islink(self.wjoin(f))
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
Nicolas Dumazet
localrepo: use propertycaches to access encode/decode filters
r12708 @propertycache
def _encodefilterpats(self):
return self._loadfilter('encode')
@propertycache
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):
data = os.readlink(self.wjoin(filename))
else:
Dan Villiom Podlaski Christiansen
prevent transient leaks of file handle by using new helper functions...
r14168 data = self.wopener.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):
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:
self.wopener.symlink(data, filename)
else:
Sune Foldager
fix errors reported by pyflakes test
r14184 self.wopener.write(filename, data)
Matt Mackall
util: set_flags shouldn't know about repo flag formats
r6877 if 'x' in flags:
Adrian Buehlmann
rename util.set_flags to setflags
r14232 util.setflags(self.wjoin(filename), False, True)
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
Steve Borho
localrepo: add desc parameter to transaction...
r10881 def transaction(self, desc):
Henrik Stuart
transaction: support multiple, separate transactions...
r8072 tr = self._transref and self._transref() or None
if tr and tr.running():
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
if os.path.exists(self.sjoin("journal")):
Matt Mackall
many, many trivial check-code fixups
r10282 raise error.RepoError(
_("abandoned transaction found - run hg recover"))
Matt Mackall
transactions: don't show a backtrace when journal exists...
r5865
Alexander Solovyov
fix bookmarks rollback behavior...
r14266 journalfiles = self._writejournal(desc)
renames = [(x, undoname(x)) for x in journalfiles]
tr = transaction.transaction(self.ui.warn, self.sopener,
self.sjoin("journal"),
aftertrans(renames),
self.store.createmode)
self._transref = weakref.ref(tr)
return tr
def _writejournal(self, desc):
Thomas Arendsen Hein
Renamed localrepo.undo() to rollback() and talk about "rollback information".
r2362 # save dirstate for rollback
mpm@selenic.com
Break apart hg.py...
r1089 try:
Dan Villiom Podlaski Christiansen
prevent transient leaks of file handle by using new helper functions...
r14168 ds = self.opener.read("dirstate")
mpm@selenic.com
Break apart hg.py...
r1089 except IOError:
ds = ""
Dan Villiom Podlaski Christiansen
prevent transient leaks of file handle by using new helper functions...
r14168 self.opener.write("journal.dirstate", ds)
self.opener.write("journal.branch",
encoding.fromlocal(self.dirstate.branch()))
self.opener.write("journal.desc",
"%d\n%s\n" % (len(self), desc))
mpm@selenic.com
Break apart hg.py...
r1089
Alexander Solovyov
fix bookmarks rollback behavior...
r14266 bkname = self.join('bookmarks')
if os.path.exists(bkname):
util.copyfile(bkname, self.join('journal.bookmarks'))
else:
Matt Mackall
merge with crew
r14274 self.opener.write('journal.bookmarks', '')
Alexander Solovyov
fix bookmarks rollback behavior...
r14266
return (self.sjoin('journal'), self.join('journal.dirstate'),
self.join('journal.branch'), self.join('journal.desc'),
self.join('journal.bookmarks'))
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:
if os.path.exists(self.sjoin("journal")):
self.ui.status(_("rolling back interrupted transaction\n"))
Matt Mackall
many, many trivial check-code fixups
r10282 transaction.rollback(self.sopener, self.sjoin("journal"),
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
Steve Borho
rollback: add dry-run argument, emit transaction description
r10882 def rollback(self, dryrun=False):
Matt Mackall
Make repo locks recursive, eliminate all passing of lock/wlock
r4917 wlock = lock = 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()
Matt Mackall
Use try/finally pattern to cleanup locks and transactions
r4915 if os.path.exists(self.sjoin("undo")):
Steve Borho
rollback: add dry-run argument, emit transaction description
r10882 try:
Dan Villiom Podlaski Christiansen
prevent transient leaks of file handle by using new helper functions...
r14168 args = self.opener.read("undo.desc").splitlines()
Matt Mackall
transaction: use newlines to separate description elements
r10892 if len(args) >= 3 and self.ui.verbose:
Gilles Moris
rollback: clarifies the message about the reverted state (issue2628)...
r13446 desc = _("repository tip rolled back to revision %s"
Matt Mackall
rollback: improve message
r10893 " (undo %s: %s)\n") % (
Matt Mackall
rollback: fix off-by-one in message
r11174 int(args[0]) - 1, args[1], args[2])
Matt Mackall
transaction: use newlines to separate description elements
r10892 elif len(args) >= 2:
Gilles Moris
rollback: clarifies the message about the reverted state (issue2628)...
r13446 desc = _("repository tip rolled back to revision %s"
" (undo %s)\n") % (
Matt Mackall
rollback: fix off-by-one in message
r11174 int(args[0]) - 1, args[1])
Matt Mackall
transaction: use newlines to separate description elements
r10892 except IOError:
Steve Borho
rollback: add dry-run argument, emit transaction description
r10882 desc = _("rolling back unknown transaction\n")
self.ui.status(desc)
if dryrun:
return
Matt Mackall
many, many trivial check-code fixups
r10282 transaction.rollback(self.sopener, self.sjoin("undo"),
self.ui.warn)
Matt Mackall
Use try/finally pattern to cleanup locks and transactions
r4915 util.rename(self.join("undo.dirstate"), self.join("dirstate"))
Matt Mackall
bookmarks: merge rollback support into localrepo
r13356 if os.path.exists(self.join('undo.bookmarks')):
util.rename(self.join('undo.bookmarks'),
self.join('bookmarks'))
Thomas Arendsen Hein
Do not abort rollback if undo.branch isn't available, but warn.
r6058 try:
Dan Villiom Podlaski Christiansen
prevent transient leaks of file handle by using new helper functions...
r14168 branch = self.opener.read("undo.branch")
Thomas Arendsen Hein
Do not abort rollback if undo.branch isn't available, but warn.
r6058 self.dirstate.setbranch(branch)
except IOError:
Martin Geisler
rollback: lower-case warning issued when branch cannot be reset...
r13957 self.ui.warn(_("named branch could not be reset, "
"current branch is still: %s\n")
Matt Mackall
branch: operate on branch names in local string space where possible...
r13047 % self.dirstate.branch())
Matt Mackall
Use try/finally pattern to cleanup locks and transactions
r4915 self.invalidate()
self.dirstate.invalidate()
Greg Ward
localrepo: add destroyed() method for strip/rollback to use (issue548).
r9150 self.destroyed()
Wagner Bruna
rollback, i18n: avoid parameterized message
r13455 parents = tuple([p.rev() for p in self.parents()])
if len(parents) > 1:
self.ui.status(_("working directory now based on "
"revisions %d and %d\n") % parents)
else:
self.ui.status(_("working directory now based on "
"revision %d\n") % parents)
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:
Ronny Pfannschmidt
switch lock releasing in the core from gc to explicit
r8109 release(lock, wlock)
mpm@selenic.com
Break apart hg.py...
r1089
Benoit Boissinot
strip: invalidate all caches after stripping (fixes issue1951)...
r10547 def invalidatecaches(self):
Greg Ward
localrepo: rename in-memory tag cache instance attributes (issue548)....
r9146 self._tags = None
self._tagtypes = None
Benoit Boissinot
revalidate revlog data after locking the repo (issue132)
r1784 self.nodetagscache = None
Benoit Boissinot
localrepo/branchcache: kill unused localrepo.branchcache...
r9674 self._branchcache = None # in UTF-8
Alexis S. L. Carvalho
automatically update the branch cache when tip changes
r6121 self._branchcachetip = None
Benoit Boissinot
revalidate revlog data after locking the repo (issue132)
r1784
Benoit Boissinot
strip: invalidate all caches after stripping (fixes issue1951)...
r10547 def invalidate(self):
Steve Borho
bookmark: fix invalidation of localrepo._bookmarkcurrent
r13526 for a in ("changelog", "manifest", "_bookmarks", "_bookmarkcurrent"):
Benoit Boissinot
strip: invalidate all caches after stripping (fixes issue1951)...
r10547 if a in self.__dict__:
delattr(self, a)
self.invalidatecaches()
Matt Mackall
rename and simplify do_lock
r4913 def _lock(self, lockname, wait, releasefn, acquirefn, desc):
mpm@selenic.com
Break apart hg.py...
r1089 try:
Matt Mackall
localrepo: add separate methods for manipulating repository data...
r3457 l = lock.lock(lockname, 0, releasefn, desc=desc)
Matt Mackall
error: move lock errors...
r7640 except error.LockHeld, 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
Matt Mackall
localrepo: add separate methods for manipulating repository data...
r3457 l = lock.lock(lockname, int(self.ui.config("ui", "timeout", "600")),
Vadim Gelfer
fix backtrace printed when cannot get lock....
r2016 releasefn, desc=desc)
Benoit Boissinot
localrepo: refactor the locking functions
r1751 if acquirefn:
acquirefn()
return l
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
stripping). If you are opening a transaction, get a lock as well.)'''
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
Adrian Buehlmann
fncachestore: defer updating the fncache file to a single file open...
r13391 l = self._lock(self.sjoin("lock"), wait, self.store.write,
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
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.
Use this before modifying files in .hg.'''
Ronny Pfannschmidt
made repo locks recursive and deprecate refcounting based lock releasing...
r8108 l = self._wlockref and self._wlockref()
if l is not None and l.held:
l.lock()
return l
Benoit Boissinot
add localrepo.wlock for protecting the dirstate...
r1531
Matt Mackall
Make repo locks recursive, eliminate all passing of lock/wlock
r4917 l = self._lock(self.join("wlock"), wait, self.dirstate.write,
self.dirstate.invalidate, _('working directory of %s') %
self.origroot)
self._wlockref = weakref.ref(l)
return l
Benoit Boissinot
add localrepo.wlock for protecting the dirstate...
r1531
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()
text = fctx.data()
flog = self.file(fname)
fparent1 = manifest1.get(fname, nullid)
Matt Mackall
filecommit: swallow some bits from _commitctx, add _
r8401 fparent2 = fparent2o = manifest2.get(fname, nullid)
Matt Mackall
Refactor excessive merge detection, add test
r1716
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
Matt Mackall
add a fix for issue 1175...
r6875 # find source in nearest ancestor if we've lost track
Martijn Pieters
localrepo: Refactor var names in filecommit to improve readability.
r8244 if not crev:
Martin Geisler
do not attempt to translate ui.debug output
r9467 self.ui.debug(" %s: searching for copy revision for %s\n" %
Martijn Pieters
localrepo: Refactor var names in filecommit to improve readability.
r8244 (fname, cfname))
Matt Mackall
commit: search both parents for missing copy revision (issue2484)...
r13000 for ancestor in self[None].ancestors():
Martijn Pieters
localrepo: Refactor var names in filecommit to improve readability.
r8244 if cfname in ancestor:
crev = ancestor[cfname].filenode()
Matt Mackall
Merge with stable...
r6876 break
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))
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?
Martijn Pieters
localrepo: Refactor var names in filecommit to improve readability.
r8244 fparentancestor = flog.ancestor(fparent1, fparent2)
if fparentancestor == fparent1:
fparent1, fparent2 = fparent2, nullid
elif fparentancestor == fparent2:
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?
if fparent2 != nullid or flog.cmp(fparent1, text) or meta:
changelist.append(fname)
return flog.add(text, meta, tr, linkrev, fparent1, fparent2)
Matt Mackall
Refactor excessive merge detection, add test
r1716
Matt Mackall
filecommit: swallow some bits from _commitctx, add _
r8401 # are just the flags changed during merge?
Henri Wiechers
localrepo: minor formatting - remove double space
r10320 if fparent1 != fparent2o 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
Matt Mackall
commit: drop the now-unused files parameter
r8706 def commit(self, text="", user=None, date=None, match=None, force=False,
editor=False, extra={}):
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 """
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):
raise util.Abort('%s: %s' % (f, msg))
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 = []
match.dir = vdirs.append
match.bad = fail
Matt Mackall
commit: push repo lock down into _commitctx
r8405 wlock = self.wlock()
Matt Mackall
Use try/finally pattern to cleanup locks and transactions
r4915 try:
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
Benoit Boissinot
localrepo.commit: use explicit variables, avoid creating new contexts
r10970 if (not force and merge and match and
Matt Mackall
commit: some tidying...
r8501 (match.files() or match.anypats())):
Matt Mackall
remove deprecated rawcommit
r8397 raise util.Abort(_('cannot partially commit a merge '
'(do not specify files or patterns)'))
Patrick Mezard
localrepo: replace dirstate by workingfilectx in filecommit()
r6706
Matt Mackall
commit: drop the now-unused files parameter
r8706 changes = self.status(match=match, clean=force)
if force:
changes[0].extend(changes[6]) # mq may commit unchanged files
Benoit Boissinot
localrepo: factor commit and rawcommit...
r3621
Matt Mackall
commit: recurse into subrepositories
r8813 # check subrepos
subs = []
Saint Germain
subrepo: Update .hgsubstate in case of deleted subrepo...
r10522 removedsubs = set()
Matt Mackall
subrepo: be more careful with deletions of .hgsub and .hgsubstate (issue2844)...
r14536 if '.hgsub' in wctx:
# only manage subrepos and .hgsubstate if .hgsub is present
for p in wctx.parents():
removedsubs.update(s for s in p.substate if match(s))
for s in wctx.substate:
removedsubs.discard(s)
if match(s) and wctx.sub(s).dirty():
subs.append(s)
if (subs or removedsubs):
if (not match('.hgsub') and
'.hgsub' in (wctx.modified() + wctx.added())):
raise util.Abort(
_("can't commit subrepos without .hgsub"))
if '.hgsubstate' not in changes[0]:
changes[0].insert(0, '.hgsubstate')
if '.hgsubstate' in changes[2]:
changes[2].remove('.hgsubstate')
elif '.hgsub' in changes[2]:
# clean up .hgsubstate when .hgsub is removed
if ('.hgsubstate' in wctx and
'.hgsubstate' not in changes[0] + changes[1] + changes[2]):
changes[2].insert(0, '.hgsubstate')
Matt Mackall
commit: recurse into subrepositories
r8813
Patrick Mezard
commit: abort if a subrepo is modified and ui.commitsubrepos=no...
r13411 if subs and not self.ui.configbool('ui', 'commitsubrepos', True):
changedsubs = [s for s in subs if wctx.sub(s).dirty(True)]
if changedsubs:
raise util.Abort(_("uncommitted changes in subrepo %s")
% changedsubs[0])
Matt Mackall
commit: move explicit file checking into repo.commit
r8709 # make sure all explicit patterns are matched
if not force and match.files():
Matt Mackall
commit: trade O(n^2) file checks for O(n^2) dir checks
r8710 matched = set(changes[0] + changes[1] + changes[2])
Matt Mackall
commit: move explicit file checking into repo.commit
r8709
for f in match.files():
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
if f in changes[3]: # missing
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!"))
Benoit Boissinot
localrepo.commit: use explicit variables, avoid creating new contexts
r10970 if (not force and not extra.get("close") and not merge
Matt Mackall
commit: some tidying...
r8501 and not (changes[0] or changes[1] or changes[2])
Benoit Boissinot
localrepo.commit: use explicit variables, avoid creating new contexts
r10970 and wctx.branch() == wctx.p1().branch()):
Matt Mackall
commit: move 'nothing changed' test into commit()
r8404 return None
Benoit Boissinot
style: use consistent variable names (*mod) with imports which would shadow
r10651 ms = mergemod.mergestate(self)
Stefano Tortarolo
make commit fail when committing unresolved files
r6888 for f in changes[0]:
if f in ms and ms[f] == 'u':
raise util.Abort(_("unresolved merge conflicts "
Patrick Mezard
Improve unresolved merge conflicts warning (issue2681)...
r13541 "(see hg help resolve)"))
Matt Mackall
commit: move editor outside transaction...
r8496
Benoit Boissinot
context: remove parents parameter to workingctx...
r10969 cctx = context.workingctx(self, text, user, date, extra, changes)
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
# commit subs
Saint Germain
subrepo: Update .hgsubstate in case of deleted subrepo...
r10522 if subs or removedsubs:
Matt Mackall
commit: recurse into subrepositories
r8813 state = wctx.substate.copy()
Martin Geisler
commit: sort subrepos before committing for stable test output
r12127 for s in sorted(subs):
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
commit: recurse into subrepositories
r8813 state[s] = (state[s][0], sr)
Erik Zielke
subrepo: backout f02d7a562a21...
r13172 subrepo.writestate(self, state)
Matt Mackall
commit: recurse into subrepositories
r8813
Greg Ward
commit: save commit message so it's not destroyed by rollback....
r9934 # Save commit message in case this transaction gets rolled back
Greg Ward
commit: write last-message.txt with no content modifications....
r9949 # (e.g. by a pretxncommit hook). Leave the content alone on
# the assumption that the user will use the same editor again.
Patrick Mezard
localrepo: add savecommitmessage() to write last-message.txt
r14529 msgfn = self.savecommitmessage(cctx._text)
Greg Ward
commit: save commit message so it's not destroyed by rollback....
r9934
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:
Sune Foldager
run commit and update hooks after command completion (issue1827)...
r10492 self.hook("precommit", throw=True, parent1=hookp1, parent2=hookp2)
Greg Ward
commit: if relevant, tell user their commit message was saved....
r9935 ret = self.commitctx(cctx, True)
except:
if edited:
self.ui.write(
_('note: commit message saved in %s\n') % msgfn)
raise
Matt Mackall
commit: move editor outside transaction...
r8496
Matt Mackall
bookmarks: move commit action into core
r13357 # update bookmarks, dirstate and mergestate
David Soria Parra
bookmarks: do not forward merged bookmark (issue1877)
r14498 bookmarks.update(self, p1, ret)
Matt Mackall
commit: hoist the rest of the dirstate manipulation out of commitctx
r8416 for f in changes[0] + changes[1]:
self.dirstate.normal(f)
for f in changes[2]:
Matt Mackall
dirstate: rename forget to drop...
r14434 self.dirstate.drop(f)
Matt Mackall
commit: hoist the rest of the dirstate manipulation out of commitctx
r8416 self.dirstate.setparents(ret)
Matt Mackall
commit: tidy up mergestate slightly
r8503 ms.reset()
Patrick Mezard
localrepo: extract _commitctx() from commit()...
r6710 finally:
Matt Mackall
commit: push repo lock down into _commitctx
r8405 wlock.release()
Patrick Mezard
localrepo: extract _commitctx() from commit()...
r6710
Sune Foldager
run commit and update hooks after command completion (issue1827)...
r10492 self.hook("commit", node=hex(ret), parent1=hookp1, parent2=hookp2)
return ret
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
Matt Mackall
commitctx: eliminate some variables
r8412 tr = lock = None
Patrick Mezard
localrepo: do not modify ctx.remove() list in-place
r12899 removed = list(ctx.removed())
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():
m1 = p1.manifest().copy()
m2 = p2.manifest()
# check in files
new = {}
changed = []
linkrev = len(self)
for f in sorted(ctx.modified() + ctx.added()):
self.ui.note(f + "\n")
try:
fctx = ctx[f]
new[f] = self._filecommit(fctx, m1, m2, linkrev, trp,
changed)
m1.set(f, fctx.flags())
except OSError, inst:
Matt Mackall
Use try/finally pattern to cleanup locks and transactions
r4915 self.ui.warn(_("trouble committing %s!\n") % f)
raise
Peter Arrenbrecht
localrepo: reuse parent manifest in commitctx if no files have changed...
r14162 except IOError, inst:
errcode = getattr(inst, 'errno', errno.ENOENT)
if error or errcode and errcode != errno.ENOENT:
self.ui.warn(_("trouble committing %s!\n") % f)
raise
else:
removed.append(f)
mpm@selenic.com
Break apart hg.py...
r1089
Peter Arrenbrecht
localrepo: reuse parent manifest in commitctx if no files have changed...
r14162 # update manifest
m1.update(new)
removed = [f for f in sorted(removed) if f in m1 or f in m2]
drop = [f for f in removed if f in m1]
for f in drop:
del m1[f]
mn = self.manifest.add(m1, trp, linkrev, p1.manifestnode(),
p2.manifestnode(), (new, drop))
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
Matt Mackall
Introduce HG_PREPEND to solve pretxn races...
r7787 self.changelog.delayupdate()
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())
Matt Mackall
Introduce HG_PREPEND to solve pretxn races...
r7787 p = lambda: self.changelog.writepending() and self.root or ""
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,
Matt Mackall
Introduce HG_PREPEND to solve pretxn races...
r7787 parent2=xp2, pending=p)
self.changelog.finalize(trp)
Matt Mackall
Use try/finally pattern to cleanup locks and transactions
r4915 tr.close()
mpm@selenic.com
Break apart hg.py...
r1089
Benoit Boissinot
localrepo/branchcache: kill unused localrepo.branchcache...
r9674 if self._branchcache:
Georg Brandl
localrepo: introduce method for explicit branch cache update...
r12066 self.updatebranchcache()
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
Greg Ward
localrepo: add destroyed() method for strip/rollback to use (issue548).
r9150 def destroyed(self):
'''Inform the repository that nodes have been destroyed.
Intended for use by strip and rollback, so there's a common
place for anything that has to be done after destroying history.'''
# XXX it might be nice if we could take the list of destroyed
# nodes, but I don't see an easy way for rollback() to do that
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.
Benoit Boissinot
strip: invalidate all caches after stripping (fixes issue1951)...
r10547 self.invalidatecaches()
Greg Ward
localrepo: add destroyed() method for strip/rollback to use (issue548).
r9150
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):
Vadim Gelfer
status: add -c (clean) and -A (all files) options...
r2661 """return status of files between two nodes or node and working directory
Thomas Arendsen Hein
Cleaned up localrepo.changes()
r1616
If node1 is None, use the first dirstate parent instead.
If node2 is None, compare node1 with working directory.
"""
mpm@selenic.com
Break apart hg.py...
r1089
Matt Mackall
status: use contexts
r6769 def mfmatches(ctx):
mf = ctx.manifest().copy()
mpm@selenic.com
Break apart hg.py...
r1089 for fn in mf.keys():
if not match(fn):
del mf[fn]
return mf
Matt Mackall
diff: pass contexts to status...
r7090 if isinstance(node1, context.changectx):
ctx1 = node1
else:
ctx1 = self[node1]
if isinstance(node2, context.changectx):
ctx2 = node2
else:
ctx2 = self[node2]
Dirkjan Ochtman
bundlerepo doesn't really have a dirstate, throw AttributeError if requested
r7435 working = ctx2.rev() is None
Matt Mackall
status: use contexts
r6769 parentworking = working and ctx1 == self['.']
Benoit Boissinot
style: use consistent variable names (*mod) with imports which would shadow
r10651 match = match or matchmod.always(self.root, self.getcwd())
Matt Mackall
repo.status: eliminate list_
r6753 listignored, listclean, listunknown = ignored, clean, unknown
Chris Mason
Fix cold cache diff performance...
r2474
Matt Mackall
diff: pass contexts to status...
r7090 # load earliest manifest first for caching reasons
if not working and ctx2.rev() < ctx1.rev():
ctx2.manifest()
Matt Mackall
status: don't warn about missing files present in base revision (issue1323)
r7067 if not parentworking:
def bad(f, msg):
if f not in ctx1:
self.ui.warn('%s: %s\n' % (self.dirstate.pathto(f), msg))
match.bad = bad
Matt Mackall
status: various cleanups...
r6770 if working: # we need to scan the working dir
Matt Mackall
status: avoid performance regression when no .hgsub is present...
r11227 subrepos = []
if '.hgsub' in self.dirstate:
subrepos = ctx1.substate.keys()
Augie Fackler
dirstate: don't check state of subrepo directories
r10176 s = self.dirstate.status(match, subrepos, listignored,
listclean, listunknown)
Matt Mackall
status: various cleanups...
r6770 cmp, modified, added, removed, deleted, unknown, ignored, clean = s
mpm@selenic.com
Break apart hg.py...
r1089
Matt Mackall
status: various cleanups...
r6770 # check for any possibly clean files
if parentworking and cmp:
fixup = []
# do a full compare of any files that might have changed
Matt Mackall
status: check cmp list in order
r8395 for f in sorted(cmp):
Matt Mackall
status: various cleanups...
r6770 if (f not in ctx1 or ctx2.flags(f) != ctx1.flags(f)
Nicolas Dumazet
filectx: use cmp(self, fctx) instead of cmp(self, text)...
r11702 or ctx1[f].cmp(ctx2[f])):
Matt Mackall
status: various cleanups...
r6770 modified.append(f)
else:
fixup.append(f)
# update dirstate for files that are actually clean
if fixup:
Nicolas Dumazet
localrepo.status: move fixup concatenation inside if block for clarity...
r11669 if listclean:
clean += fixup
Matt Mackall
status: various cleanups...
r6770 try:
Adrian Buehlmann
localrepo: move comment
r8647 # updating the dirstate is optional
# so we don't wait on the lock
Simon Heimberg
localrepo: use lock.release for single lock
r8646 wlock = self.wlock(False)
Matt Mackall
Use try/finally pattern to cleanup locks and transactions
r4915 try:
Matt Mackall
status: various cleanups...
r6770 for f in fixup:
self.dirstate.normal(f)
Simon Heimberg
localrepo: use lock.release for single lock
r8646 finally:
wlock.release()
except error.LockError:
pass
Vadim Gelfer
status: add -c (clean) and -A (all files) options...
r2661
Matt Mackall
status: use contexts
r6769 if not parentworking:
mf1 = mfmatches(ctx1)
Matt Mackall
status: various cleanups...
r6770 if working:
Thomas Arendsen Hein
Cleaned up localrepo.changes()
r1616 # we are comparing working dir against non-parent
# generate a pseudo-manifest for the working dir
Matt Mackall
status: use contexts
r6769 mf2 = mfmatches(self['.'])
Matt Mackall
status: various cleanups...
r6770 for f in cmp + modified + added:
Matt Mackall
status: use contexts
r6769 mf2[f] = None
Matt Mackall
minor status fixups
r6817 mf2.set(f, ctx2.flags(f))
Thomas Arendsen Hein
Make localrepo.changes() internally distinguish between removed and deleted.
r1617 for f in removed:
Thomas Arendsen Hein
Cleaned up localrepo.changes()
r1616 if f in mf2:
del mf2[f]
Matt Mackall
status: various cleanups...
r6770 else:
# we are comparing two revisions
deleted, unknown, ignored = [], [], []
mf2 = mfmatches(ctx2)
Bryan O'Sullivan
localrepository.status: only acquire wlock if actually needed....
r4372
Vadim Gelfer
status: add -c (clean) and -A (all files) options...
r2661 modified, added, clean = [], [], []
Matt Mackall
dirstate.walk: push sorting up
r6827 for fn in mf2:
Christian Ebert
Prefer i in d over d.has_key(i)
r5915 if fn in mf1:
Idan Kamara
localrepo: don't add deleted files to list of modified/added files (issue2761)...
r14500 if (fn not in deleted and
(mf1.flags(fn) != mf2.flags(fn) or
(mf1[fn] != mf2[fn] and
(mf2[fn] or ctx1[fn].cmp(ctx2[fn]))))):
Thomas Arendsen Hein
Cleaned up localrepo.changes()
r1616 modified.append(fn)
Matt Mackall
repo.status: eliminate list_
r6753 elif listclean:
Vadim Gelfer
status: add -c (clean) and -A (all files) options...
r2661 clean.append(fn)
Thomas Arendsen Hein
Cleaned up localrepo.changes()
r1616 del mf1[fn]
Idan Kamara
localrepo: don't add deleted files to list of modified/added files (issue2761)...
r14500 elif fn not in deleted:
Thomas Arendsen Hein
Cleaned up localrepo.changes()
r1616 added.append(fn)
Thomas Arendsen Hein
Make localrepo.changes() internally distinguish between removed and deleted.
r1617 removed = mf1.keys()
Matt Mackall
dirstate.walk: push sorting up
r6827 r = modified, added, removed, deleted, unknown, ignored, clean
Martin Geisler
status: recurse into subrepositories with --subrepos/-S flag
r12166
if listsubrepos:
Martin Geisler
subrepos: add function for iterating over ctx subrepos
r12176 for subpath, sub in subrepo.itersubrepos(ctx1, ctx2):
Martin Geisler
status: recurse into subrepositories with --subrepos/-S flag
r12166 if working:
rev2 = None
else:
rev2 = ctx2.substate[subpath][1]
try:
submatch = matchmod.narrowmatcher(subpath, match)
s = sub.status(rev2, match=submatch, ignored=listignored,
clean=listclean, unknown=listunknown,
listsubrepos=True)
for rfiles, sfiles in zip(r, s):
rfiles.extend("%s/%s" % (subpath, f) for f in sfiles)
except error.LookupError:
self.ui.status(_("skipping missing subrepository: %s\n")
% subpath)
Martin Geisler
remove unnecessary list comprehensions...
r13412 for l in r:
l.sort()
Matt Mackall
dirstate.walk: push sorting up
r6827 return r
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
Sune Foldager
localrepo: fix bugs in branchheads and add docstring...
r9475 bheads = list(reversed(branches[branch]))
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
branch closing: referencing open and closed branches/heads...
r7656 if not closed:
Dirkjan Ochtman
kill some trailing whitespace
r7670 bheads = [h for h in bheads if
John Mulligan
branch closing: referencing open and closed branches/heads...
r7656 ('close' not in self.changelog.read(h)[5])]
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
Matt Mackall
Make repo locks recursive, eliminate all passing of lock/wlock
r4917 def pull(self, remote, heads=None, force=False):
lock = self.lock()
Vadim Gelfer
fetch: hold lock and wlock across all operations
r2827 try:
Dirkjan Ochtman
move discovery methods from localrepo into new discovery module
r11301 tmp = discovery.findcommonincoming(self, remote, heads=heads,
force=force)
common, fetch, rheads = tmp
Vadim Gelfer
fetch: hold lock and wlock across all operations
r2827 if not fetch:
self.ui.status(_("no changes found\n"))
Matt Mackall
bookmarks: merge low-level push/pull support into core
r13364 result = 0
else:
Peter Arrenbrecht
discovery: avoid discovery when local graph is a subset of remote...
r13742 if heads is None and list(common) == [nullid]:
Matt Mackall
bookmarks: merge low-level push/pull support into core
r13364 self.ui.status(_("requesting all changes\n"))
elif heads is None and remote.capable('changegroupsubset'):
# issue1320, avoid a race if remote changed after discovery
heads = rheads
Benoit Boissinot
protocol: use changegroupsubset() if possible (issue1389)...
r7415
Peter Arrenbrecht
discovery: drop findoutgoing and simplify findcommonincoming's api...
r14073 if remote.capable('getbundle'):
Peter Arrenbrecht
discovery: avoid discovery when local graph is a subset of remote...
r13742 cg = remote.getbundle('pull', common=common,
heads=heads or rheads)
elif heads is None:
Matt Mackall
bookmarks: merge low-level push/pull support into core
r13364 cg = remote.changegroup(fetch, 'pull')
elif not remote.capable('changegroupsubset'):
Martin Geisler
Lowercase error messages
r12067 raise util.Abort(_("partial pull cannot be done because "
Matt Mackall
bookmarks: merge low-level push/pull support into core
r13364 "other repository doesn't support "
"changegroupsubset."))
else:
cg = remote.changegroupsubset(fetch, heads, 'pull')
result = self.addchangegroup(cg, 'pull', remote.url(),
lock=lock)
Vadim Gelfer
fetch: hold lock and wlock across all operations
r2827 finally:
Ronny Pfannschmidt
switch lock releasing in the core from gc to explicit
r8109 lock.release()
mpm@selenic.com
Break apart hg.py...
r1089
Matt Mackall
bookmarks: merge low-level push/pull support into core
r13364 return result
Patrick Mezard
mq: factor out push conditions checks...
r13327 def checkpush(self, force, revs):
"""Extensions can override this function if additional checks have
to be performed before pushing, or call it if they override push
command.
"""
pass
Sune Foldager
push: add --new-branch option to allow intial push of new branches...
r11211 def push(self, remote, force=False, revs=None, newbranch=False):
Greg Ward
push: document return values between various repo methods....
r11153 '''Push outgoing changesets (limited by revs) from the current
repository to remote. Return an integer:
- 0 means HTTP error *or* nothing to push
- 1 means we pushed and remote head count is unchanged *or*
we have outgoing changesets but refused to push
- other values as described by addchangegroup()
'''
Vadim Gelfer
extend network protocol to stop clients from locking servers...
r2439 # there are two ways to push to remote repo:
#
# addchangegroup assumes local user can lock remote
# repo (local filesystem, old ssh servers).
#
# unbundle assumes local user cannot lock remote repo (new ssh
# servers, http servers).
mpm@selenic.com
Break apart hg.py...
r1089
Patrick Mezard
mq: factor out push conditions checks...
r13327 self.checkpush(force, revs)
Benoit Boissinot
localrepo: remove push_{unbundle,addchangegroup}(), factor it inside push()
r11598 lock = None
unbundle = remote.capable('unbundle')
if not unbundle:
lock = remote.lock()
Matt Mackall
Use try/finally pattern to cleanup locks and transactions
r4915 try:
Matt Mackall
bookmarks: merge low-level push/pull support into core
r13364 cg, remote_heads = discovery.prepush(self, remote, force, revs,
newbranch)
ret = remote_heads
if cg is not None:
if unbundle:
# local repo finds heads on server, finds out what
# revs it must push. once revs transferred, if server
# finds it has different heads (someone else won
# commit/push race), server aborts.
if force:
remote_heads = ['force']
# ssh: return remote's addchangegroup()
# http: return remote's addchangegroup() or 0 for error
ret = remote.unbundle(cg, remote_heads, 'push')
else:
# we return an integer indicating remote head count change
ret = remote.addchangegroup(cg, 'push', self.url(),
lock=lock)
Matt Mackall
Use try/finally pattern to cleanup locks and transactions
r4915 finally:
Benoit Boissinot
localrepo: remove push_{unbundle,addchangegroup}(), factor it inside push()
r11598 if lock is not None:
lock.release()
mpm@selenic.com
Break apart hg.py...
r1089
Matt Mackall
bookmarks: merge low-level push/pull support into core
r13364 self.ui.debug("checking for updated bookmarks\n")
rb = remote.listkeys('bookmarks')
for k in rb.keys():
if k in self._bookmarks:
nr, nl = rb[k], hex(self._bookmarks[k])
if nr in self:
cr = self[nr]
cl = self[nl]
if cl in cr.descendants():
r = remote.pushkey('bookmarks', k, nr, nl)
if r:
self.ui.status(_("updating bookmark %s\n") % k)
else:
self.ui.warn(_('updating bookmark %s'
' failed!\n') % k)
return ret
Thomas Arendsen Hein
Show number of changesets written to bundle files by default (issue569)...
r5763 def changegroupinfo(self, nodes, source):
if self.ui.verbose or source == 'bundle':
self.ui.status(_("%d changesets found\n") % len(nodes))
Thomas Arendsen Hein
Show number (-v) and list (--debug) of changesets with bundle/pull/push etc.
r3513 if self.ui.debugflag:
Martin Geisler
do not attempt to translate ui.debug output
r9467 self.ui.debug("list of changesets:\n")
Thomas Arendsen Hein
Show number (-v) and list (--debug) of changesets with bundle/pull/push etc.
r3513 for node in nodes:
self.ui.debug("%s\n" % hex(node))
Benoit Boissinot
changegroupsubset: extranodes are no longer needed
r13703 def changegroupsubset(self, bases, heads, source):
Greg Ward
Improve some docstrings relating to changegroups and prepush().
r9437 """Compute a changegroup consisting of all the nodes that are
Matt Mackall
check-code: catch misspellings of descendant...
r14549 descendants of any of the bases and ancestors of any of the heads.
Greg Ward
Improve some docstrings relating to changegroups and prepush().
r9437 Return a chunkbuffer object whose read() method will return
successive changegroup chunks.
Eric Hopper
Added a lot of comments to changegroupsubset.
r1466
It is fairly complex as determining which filenodes and which
manifest nodes need to be included for the changeset to be complete
is non-trivial.
Another wrinkle is doing the reverse, figuring out which changeset in
Alexis S. L. Carvalho
changegroupsubset: accept list of per-revlog nodes to include...
r5908 the changegroup a particular filenode or manifestnode belongs to.
"""
Peter Arrenbrecht
bundle: don't send too many changesets (Issue1704)...
r9820 cl = self.changelog
if not bases:
bases = [nullid]
Peter Arrenbrecht
wireproto: add getbundle() function...
r13741 csets, bases, heads = cl.nodesbetween(bases, heads)
# We assume that all ancestors of bases are known
common = set(cl.ancestors(*[cl.rev(n) for n in bases]))
return self._changegroupsubset(common, csets, heads, source)
def getbundle(self, source, heads=None, common=None):
"""Like changegroupsubset, but returns the set difference between the
ancestors of heads and the ancestors common.
If heads is None, use the local heads. If common is None, use [nullid].
Peter Arrenbrecht
bundle: don't send too many changesets (Issue1704)...
r9820
Peter Arrenbrecht
wireproto: add getbundle() function...
r13741 The nodes in common might not all be known locally due to the way the
current discovery protocol works.
"""
cl = self.changelog
if common:
nm = cl.nodemap
common = [n for n in common if n in nm]
else:
common = [nullid]
if not heads:
heads = cl.heads()
common, missing = cl.findcommonmissing(common, heads)
Peter Arrenbrecht
discovery: drop findoutgoing and simplify findcommonincoming's api...
r14073 if not missing:
return None
Peter Arrenbrecht
wireproto: add getbundle() function...
r13741 return self._changegroupsubset(common, missing, heads, source)
def _changegroupsubset(self, commonrevs, csets, heads, source):
Eric Hopper
Added a lot of comments to changegroupsubset.
r1466
Peter Arrenbrecht
bundle: don't send too many changesets (Issue1704)...
r9820 cl = self.changelog
Matt Mackall
changegroupsubset: minor cleanups...
r13706 mf = self.manifest
mfs = {} # needed manifests
fnodes = {} # needed file nodes
Matt Mackall
changegroup: minor ordering and renaming changes for similarity...
r13812 changedfiles = set()
Matt Mackall
changegroup: unnest flookup
r13829 fstate = ['', {}]
Matt Mackall
changegroup: unnest some lookup functions
r13813 count = [0]
Matt Mackall
changegroupsubset: minor cleanups...
r13706
Benoit Boissinot
changegroupsubset: extranodes are no longer needed
r13703 # can we go through the fast path ?
heads.sort()
Matt Mackall
changegroupsubset: more minor cleanups...
r13707 if heads == sorted(self.heads()):
Matt Mackall
changegroupsubset: minor cleanups...
r13706 return self._changegroup(csets, source)
Benoit Boissinot
fix pull racing with push/commit (issue1320)...
r7233
Peter Arrenbrecht
bundle: don't send too many changesets (Issue1704)...
r9820 # slow path
Vadim Gelfer
add preoutgoing and outgoing hooks....
r1736 self.hook('preoutgoing', throw=True, source=source)
Matt Mackall
changegroupsubset: minor cleanups...
r13706 self.changegroupinfo(csets, source)
Eric Hopper
This changes the revlog.group and re-implements the localrepo.changeroup...
r1458
Matt Mackall
changegroup: refactor prune as a filter
r13810 # filter any nodes that claim to be part of the known set
def prune(revlog, missing):
Sune Foldager
localrepo: use list comprehension instead of generators...
r14521 return [n for n in missing
if revlog.linkrev(revlog.rev(n)) not in commonrevs]
Eric Hopper
This changes the revlog.group and re-implements the localrepo.changeroup...
r1458
Matt Mackall
changegroup: combine lookup functions
r13830 def lookup(revlog, x):
if revlog == cl:
c = cl.read(x)
changedfiles.update(c[3])
mfs.setdefault(c[0], x)
count[0] += 1
Sune Foldager
localrepo: add total to changeset progress in bundle/push
r14520 self.ui.progress(_('bundling'), count[0],
unit=_('changesets'), total=len(csets))
Matt Mackall
changegroup: combine lookup functions
r13830 return x
elif revlog == mf:
clnode = mfs[x]
mdata = mf.readfast(x)
for f in changedfiles:
if f in mdata:
fnodes.setdefault(f, {}).setdefault(mdata[f], clnode)
count[0] += 1
self.ui.progress(_('bundling'), count[0],
unit=_('manifests'), total=len(mfs))
return mfs[x]
else:
self.ui.progress(
_('bundling'), count[0], item=fstate[0],
unit=_('files'), total=len(changedfiles))
return fstate[1][x]
Eric Hopper
This changes the revlog.group and re-implements the localrepo.changeroup...
r1458
Matt Mackall
changegroup: introduce bundler objects...
r13831 bundler = changegroup.bundle10(lookup)
Sune Foldager
revlog: linearize created changegroups in generaldelta revlogs...
r14365 reorder = self.ui.config('bundle', 'reorder', 'auto')
if reorder == 'auto':
reorder = None
else:
reorder = util.parsebool(reorder)
mpm@selenic.com
Break apart hg.py...
r1089
def gengroup():
Eric Hopper
Added a lot of comments to changegroupsubset.
r1466 # Create a changenode group generator that will call our functions
# back to lookup the owning changenode and collect information.
Sune Foldager
revlog: linearize created changegroups in generaldelta revlogs...
r14365 for chunk in cl.group(csets, bundler, reorder=reorder):
Matt Mackall
changegroupsubset: more renaming
r13709 yield chunk
Augie Fackler
bundle progress: offer best-guess deterministic progress information...
r13116 self.ui.progress(_('bundling'), None)
Augie Fackler
localrepo: provide indeterminate progress information while bundling
r10432
Eric Hopper
Added a lot of comments to changegroupsubset.
r1466 # Create a generator for the manifestnodes that calls our lookup
# and data collection functions back.
Matt Mackall
changegroup: unnest some lookup functions
r13813 count[0] = 0
Sune Foldager
revlog: linearize created changegroups in generaldelta revlogs...
r14365 for chunk in mf.group(prune(mf, mfs), bundler, reorder=reorder):
Matt Mackall
changegroupsubset: more renaming
r13709 yield chunk
Augie Fackler
bundle progress: offer best-guess deterministic progress information...
r13116 self.ui.progress(_('bundling'), None)
Eric Hopper
Added a lot of comments to changegroupsubset.
r1466
Matt Mackall
changegroupsubset: minor cleanups...
r13706 mfs.clear()
Eric Hopper
Added a lot of comments to changegroupsubset.
r1466
# Go through all our files in order sorted by name.
Matt Mackall
changegroup: unnest flookup
r13829 count[0] = 0
for fname in sorted(changedfiles):
Eric Hopper
This changes the revlog.group and re-implements the localrepo.changeroup...
r1458 filerevlog = self.file(fname)
Matt Mackall
add __len__ and __iter__ methods to repo and revlog
r6750 if not len(filerevlog):
Matt Mackall
fix spelling error
r5666 raise util.Abort(_("empty or missing revlog for %s") % fname)
Matt Mackall
changegroup: unnest flookup
r13829 fstate[0] = fname
fstate[1] = fnodes.pop(fname, {})
Matt Mackall
changegroup: fold progress meter into callbacks...
r13783
Sune Foldager
localrepo: simplify file bundling code and fix progress bug...
r14522 nodelist = prune(filerevlog, fstate[1])
if nodelist:
count[0] += 1
yield bundler.fileheader(fname)
for chunk in filerevlog.group(nodelist, bundler, reorder):
yield chunk
Eric Hopper
Added a lot of comments to changegroupsubset.
r1466 # Signal that no more groups are left.
Matt Mackall
changegroup: introduce bundler objects...
r13831 yield bundler.close()
Augie Fackler
bundle progress: offer best-guess deterministic progress information...
r13116 self.ui.progress(_('bundling'), None)
mpm@selenic.com
Break apart hg.py...
r1089
Matt Mackall
changegroupsubset: minor cleanups...
r13706 if csets:
self.hook('outgoing', node=hex(csets[0]), source=source)
Vadim Gelfer
add preoutgoing and outgoing hooks....
r1736
Matt Mackall
bundle: encapsulate all bundle streams in unbundle class
r12337 return changegroup.unbundle10(util.chunkbuffer(gengroup()), 'UN')
Eric Hopper
This changes the revlog.group and re-implements the localrepo.changeroup...
r1458
Vadim Gelfer
add preoutgoing and outgoing hooks....
r1736 def changegroup(self, basenodes, source):
Benoit Boissinot
fix pull racing with push/commit (issue1320)...
r7233 # to avoid a race we use changegroupsubset() (issue1320)
return self.changegroupsubset(basenodes, self.heads(), source)
Peter Arrenbrecht
bundle: don't send too many changesets (Issue1704)...
r9820 def _changegroup(self, nodes, source):
Greg Ward
Improve some docstrings relating to changegroups and prepush().
r9437 """Compute the changegroup of all nodes that we have that a recipient
doesn't. Return a chunkbuffer object whose read() method will return
successive changegroup chunks.
Eric Hopper
Added a lot of comments to changegroupsubset.
r1466
This is much easier than the previous function as we can assume that
Benoit Boissinot
fix pull racing with push/commit (issue1320)...
r7233 the recipient has any changenode we aren't sending them.
Peter Arrenbrecht
bundle: don't send too many changesets (Issue1704)...
r9820 nodes is the set of nodes to send"""
Vadim Gelfer
add preoutgoing and outgoing hooks....
r1736
Matt Mackall
changegroup: minor ordering and renaming changes for similarity...
r13812 cl = self.changelog
mf = self.manifest
mfs = {}
changedfiles = set()
Matt Mackall
changegroup: unnest flookup
r13829 fstate = ['']
count = [0]
Vadim Gelfer
add preoutgoing and outgoing hooks....
r1736
Matt Mackall
changegroup: minor ordering and renaming changes for similarity...
r13812 self.hook('preoutgoing', throw=True, source=source)
Thomas Arendsen Hein
Show number of changesets written to bundle files by default (issue569)...
r5763 self.changegroupinfo(nodes, source)
Eric Hopper
This changes the revlog.group and re-implements the localrepo.changeroup...
r1458
Martin Geisler
replace set-like dictionaries with real sets...
r8152 revset = set([cl.rev(n) for n in nodes])
mpm@selenic.com
Break apart hg.py...
r1089
Matt Mackall
add __len__ and __iter__ methods to repo and revlog
r6750 def gennodelst(log):
Sune Foldager
localrepo: use list comprehension instead of generators...
r14521 return [log.node(r) for r in log if log.linkrev(r) in revset]
Eric Hopper
This changes the revlog.group and re-implements the localrepo.changeroup...
r1458
Matt Mackall
changegroup: combine lookup functions
r13830 def lookup(revlog, x):
if revlog == cl:
c = cl.read(x)
changedfiles.update(c[3])
mfs.setdefault(c[0], x)
count[0] += 1
Sune Foldager
localrepo: add total to changeset progress in bundle/push
r14520 self.ui.progress(_('bundling'), count[0],
unit=_('changesets'), total=len(nodes))
Matt Mackall
changegroup: combine lookup functions
r13830 return x
elif revlog == mf:
count[0] += 1
self.ui.progress(_('bundling'), count[0],
unit=_('manifests'), total=len(mfs))
return cl.node(revlog.linkrev(revlog.rev(x)))
else:
self.ui.progress(
_('bundling'), count[0], item=fstate[0],
total=len(changedfiles), unit=_('files'))
return cl.node(revlog.linkrev(revlog.rev(x)))
Matt Mackall
changegroup: unnest flookup
r13829
Matt Mackall
changegroup: introduce bundler objects...
r13831 bundler = changegroup.bundle10(lookup)
Sune Foldager
revlog: linearize created changegroups in generaldelta revlogs...
r14365 reorder = self.ui.config('bundle', 'reorder', 'auto')
if reorder == 'auto':
reorder = None
else:
reorder = util.parsebool(reorder)
Eric Hopper
This changes the revlog.group and re-implements the localrepo.changeroup...
r1458
def gengroup():
Greg Ward
Improve some docstrings relating to changegroups and prepush().
r9437 '''yield a sequence of changegroup chunks (strings)'''
mpm@selenic.com
Break apart hg.py...
r1089 # construct a list of all changed files
Eric Hopper
This changes the revlog.group and re-implements the localrepo.changeroup...
r1458
Sune Foldager
revlog: linearize created changegroups in generaldelta revlogs...
r14365 for chunk in cl.group(nodes, bundler, reorder=reorder):
Matt Mackall
changegroup: minor cleanups
r13716 yield chunk
Augie Fackler
bundle progress: offer best-guess deterministic progress information...
r13116 self.ui.progress(_('bundling'), None)
mpm@selenic.com
Break apart hg.py...
r1089
Matt Mackall
changegroup: unnest flookup
r13829 count[0] = 0
Sune Foldager
revlog: linearize created changegroups in generaldelta revlogs...
r14365 for chunk in mf.group(gennodelst(mf), bundler, reorder=reorder):
Matt Mackall
changegroup: minor cleanups
r13716 yield chunk
Augie Fackler
bundle progress: offer best-guess deterministic progress information...
r13116 self.ui.progress(_('bundling'), None)
mpm@selenic.com
Break apart hg.py...
r1089
Matt Mackall
changegroup: unnest flookup
r13829 count[0] = 0
for fname in sorted(changedfiles):
Eric Hopper
This changes the revlog.group and re-implements the localrepo.changeroup...
r1458 filerevlog = self.file(fname)
Matt Mackall
add __len__ and __iter__ methods to repo and revlog
r6750 if not len(filerevlog):
Matt Mackall
fix spelling error
r5666 raise util.Abort(_("empty or missing revlog for %s") % fname)
Matt Mackall
changegroup: unnest flookup
r13829 fstate[0] = fname
Sune Foldager
localrepo: simplify file bundling code and fix progress bug...
r14522 nodelist = gennodelst(filerevlog)
if nodelist:
count[0] += 1
yield bundler.fileheader(fname)
for chunk in filerevlog.group(nodelist, bundler, reorder):
yield chunk
Matt Mackall
changegroup: introduce bundler objects...
r13831 yield bundler.close()
Augie Fackler
bundle progress: offer best-guess deterministic progress information...
r13116 self.ui.progress(_('bundling'), None)
mpm@selenic.com
Break apart hg.py...
r1089
Matt Mackall
Don't die calling outgoing hook if we have no changesets
r2107 if nodes:
self.hook('outgoing', node=hex(nodes[0]), source=source)
mpm@selenic.com
Break apart hg.py...
r1089
Matt Mackall
bundle: encapsulate all bundle streams in unbundle class
r12337 return changegroup.unbundle10(util.chunkbuffer(gengroup()), 'UN')
mpm@selenic.com
Break apart hg.py...
r1089
Matt Mackall
addchangegroup: pass in lock to release it before changegroup hook is called...
r11442 def addchangegroup(self, source, srctype, url, emptyok=False, lock=None):
Greg Ward
push: document return values between various repo methods....
r11153 """Add the changegroup returned by source.read() to this repo.
srctype is a string like 'push', 'pull', or 'unbundle'. url is
the URL of the repo where this changegroup is coming from.
Benoit Boissinot
addchangegroup: document the current locking semantics
r13271 If lock is not None, the function takes ownership of the lock
and releases it after the changegroup is added.
mpm@selenic.com
Break apart hg.py...
r1089
Greg Ward
push: document return values between various repo methods....
r11153 Return an integer summarizing the change to this repo:
Thomas Arendsen Hein
Don't report an error when closing heads during local push (issue387)
r3803 - nothing changed or no source: 0
- more heads than before: 1+added heads (2..n)
Greg Ward
push: document return values between various repo methods....
r11153 - fewer heads than before: -1-removed heads (-2..-n)
Thomas Arendsen Hein
Don't report an error when closing heads during local push (issue387)
r3803 - number of heads stays the same: 1
"""
mpm@selenic.com
Break apart hg.py...
r1089 def csmap(x):
Martin Geisler
do not attempt to translate ui.debug output
r9467 self.ui.debug("add changeset %s\n" % short(x))
Matt Mackall
add __len__ and __iter__ methods to repo and revlog
r6750 return len(cl)
mpm@selenic.com
Break apart hg.py...
r1089
def revmap(x):
Vadim Gelfer
fix race in localrepo.addchangegroup....
r1998 return cl.rev(x)
mpm@selenic.com
Break apart hg.py...
r1089
Thomas Arendsen Hein
Cleanup of indentation, spacing, newlines, strings and line length
r1615 if not source:
Vadim Gelfer
add merge command. means same thing as "update -m"....
r2019 return 0
Vadim Gelfer
add prechangegroup and pretxnchangegroup hooks....
r1730
Vadim Gelfer
hooks: add url to changegroup, incoming, prechangegroup, pretxnchangegroup hooks...
r2673 self.hook('prechangegroup', throw=True, source=srctype, url=url)
Vadim Gelfer
add prechangegroup and pretxnchangegroup hooks....
r1730
mpm@selenic.com
Break apart hg.py...
r1089 changesets = files = revisions = 0
Matt Mackall
progress: show approximate progress info for pull
r10888 efiles = set()
mpm@selenic.com
Break apart hg.py...
r1089
Benoit Boissinot
remove appendfile for the manifest when adding a changegroup...
r2395 # write changelog data to temp files so concurrent readers will not see
# inconsistent view
Matt Mackall
restructure changelog file appending...
r4261 cl = self.changelog
cl.delayupdate()
Adrian Buehlmann
changegroup: do not count closed new heads (issue2697)...
r14036 oldheads = cl.heads()
Vadim Gelfer
fix race in localrepo.addchangegroup....
r1998
Brodie Rao
url: move URL parsing functions into util to improve startup time...
r14076 tr = self.transaction("\n".join([srctype, util.hidepassword(url)]))
Matt Mackall
Use try/finally pattern to cleanup locks and transactions
r4915 try:
Matt Mackall
transactions: avoid late tear-down (issue641)...
r4970 trp = weakref.proxy(tr)
Matt Mackall
Use try/finally pattern to cleanup locks and transactions
r4915 # pull off the changeset group
self.ui.status(_("adding changesets\n"))
Peter Arrenbrecht
localrepo: use more direct vars in addchangegroup
r8393 clstart = len(cl)
Augie Fackler
localrepo: show indeterminate progress for incoming data...
r10430 class prog(object):
Martin Geisler
progress: mark strings for translation
r10496 step = _('changesets')
Augie Fackler
localrepo: show indeterminate progress for incoming data...
r10430 count = 1
ui = self.ui
Matt Mackall
progress: show approximate progress info for pull
r10888 total = None
Augie Fackler
localrepo: show indeterminate progress for incoming data...
r10430 def __call__(self):
Matt Mackall
progress: show approximate progress info for pull
r10888 self.ui.progress(self.step, self.count, unit=_('chunks'),
total=self.total)
Augie Fackler
localrepo: show indeterminate progress for incoming data...
r10430 self.count += 1
pr = prog()
Matt Mackall
bundle: refactor progress callback...
r12334 source.callback = pr
Benoit Boissinot
unbundler: separate delta and header parsing...
r14144 source.changelogheader()
Matt Mackall
bundle: get rid of chunkiter
r12335 if (cl.addgroup(source, csmap, trp) is None
Matt Mackall
bundle: make getchunk() a method
r12333 and not emptyok):
Matt Mackall
Use try/finally pattern to cleanup locks and transactions
r4915 raise util.Abort(_("received changelog group is empty"))
Peter Arrenbrecht
localrepo: use more direct vars in addchangegroup
r8393 clend = len(cl)
changesets = clend - clstart
Matt Mackall
progress: show approximate progress info for pull
r10888 for c in xrange(clstart, clend):
efiles.update(self[c].files())
efiles = len(efiles)
Martin Geisler
progress: mark strings for translation
r10496 self.ui.progress(_('changesets'), None)
mpm@selenic.com
Break apart hg.py...
r1089
Matt Mackall
Use try/finally pattern to cleanup locks and transactions
r4915 # pull off the manifest group
self.ui.status(_("adding manifests\n"))
Martin Geisler
progress: mark strings for translation
r10496 pr.step = _('manifests')
Augie Fackler
localrepo: show indeterminate progress for incoming data...
r10430 pr.count = 1
Matt Mackall
progress: show approximate progress info for pull
r10888 pr.total = changesets # manifests <= changesets
Matt Mackall
Use try/finally pattern to cleanup locks and transactions
r4915 # no need to check for empty manifest group here:
# if the result of the merge of 1 and 2 is the same in 3 and 4,
# no new manifest will be created and the manifest group will
# be empty during the pull
Benoit Boissinot
unbundler: separate delta and header parsing...
r14144 source.manifestheader()
Matt Mackall
bundle: get rid of chunkiter
r12335 self.manifest.addgroup(source, revmap, trp)
Martin Geisler
progress: mark strings for translation
r10496 self.ui.progress(_('manifests'), None)
mpm@selenic.com
Break apart hg.py...
r1089
Augie Fackler
localrepo: add optional validation (defaults to off) for incoming changes...
r10418 needfiles = {}
if self.ui.configbool('server', 'validate', default=False):
# validate incoming csets have their manifests
for cset in xrange(clstart, clend):
mfest = self.changelog.read(self.changelog.node(cset))[0]
mfest = self.manifest.readdelta(mfest)
# store file nodes we must see
for f, n in mfest.iteritems():
needfiles.setdefault(f, set()).add(n)
Matt Mackall
Use try/finally pattern to cleanup locks and transactions
r4915 # process the files
self.ui.status(_("adding file changes\n"))
Augie Fackler
localrepo: show indeterminate progress for incoming data...
r10430 pr.step = 'files'
pr.count = 1
Matt Mackall
progress: show approximate progress info for pull
r10888 pr.total = efiles
Matt Mackall
bundle: refactor progress callback...
r12334 source.callback = None
Martin Geisler
check-code: flag 0/1 used as constant Boolean expression
r14494 while True:
Benoit Boissinot
unbundler: separate delta and header parsing...
r14144 chunkdata = source.filelogheader()
if not chunkdata:
Matt Mackall
Use try/finally pattern to cleanup locks and transactions
r4915 break
Benoit Boissinot
unbundler: separate delta and header parsing...
r14144 f = chunkdata["filename"]
Martin Geisler
do not attempt to translate ui.debug output
r9467 self.ui.debug("adding %s revisions\n" % f)
Matt Mackall
progress: show approximate progress info for pull
r10888 pr()
Matt Mackall
Use try/finally pattern to cleanup locks and transactions
r4915 fl = self.file(f)
Matt Mackall
add __len__ and __iter__ methods to repo and revlog
r6750 o = len(fl)
Matt Mackall
bundle: get rid of chunkiter
r12335 if fl.addgroup(source, revmap, trp) is None:
Matt Mackall
Use try/finally pattern to cleanup locks and transactions
r4915 raise util.Abort(_("received file revlog group is empty"))
Matt Mackall
add __len__ and __iter__ methods to repo and revlog
r6750 revisions += len(fl) - o
Matt Mackall
Use try/finally pattern to cleanup locks and transactions
r4915 files += 1
Augie Fackler
localrepo: add optional validation (defaults to off) for incoming changes...
r10418 if f in needfiles:
needs = needfiles[f]
for new in xrange(o, len(fl)):
n = fl.node(new)
if n in needs:
needs.remove(n)
if not needs:
del needfiles[f]
Martin Geisler
progress: mark strings for translation
r10496 self.ui.progress(_('files'), None)
Augie Fackler
localrepo: add optional validation (defaults to off) for incoming changes...
r10418
for f, needs in needfiles.iteritems():
fl = self.file(f)
for n in needs:
try:
fl.rev(n)
except error.LookupError:
raise util.Abort(
_('missing file data for %s:%s - run hg verify') %
(f, hex(n)))
Matt Mackall
Use try/finally pattern to cleanup locks and transactions
r4915
Adrian Buehlmann
changegroup: do not count closed new heads (issue2697)...
r14036 dh = 0
if oldheads:
heads = cl.heads()
dh = len(heads) - len(oldheads)
for h in heads:
if h not in oldheads and 'close' in self[h].extra():
dh -= 1
htext = ""
if dh:
htext = _(" (%+d heads)") % dh
Vadim Gelfer
fix race in localrepo.addchangegroup....
r1998
Matt Mackall
Use try/finally pattern to cleanup locks and transactions
r4915 self.ui.status(_("added %d changesets"
" with %d changes to %d files%s\n")
Adrian Buehlmann
changegroup: do not count closed new heads (issue2697)...
r14036 % (changesets, revisions, files, htext))
mpm@selenic.com
Break apart hg.py...
r1089
Matt Mackall
Use try/finally pattern to cleanup locks and transactions
r4915 if changesets > 0:
Peter Arrenbrecht
localrepo: use cl throughout in addchangegroup
r8392 p = lambda: cl.writepending() and self.root or ""
Matt Mackall
Use try/finally pattern to cleanup locks and transactions
r4915 self.hook('pretxnchangegroup', throw=True,
Peter Arrenbrecht
localrepo: use more direct vars in addchangegroup
r8393 node=hex(cl.node(clstart)), source=srctype,
Matt Mackall
Introduce HG_PREPEND to solve pretxn races...
r7787 url=url, pending=p)
# make changelog see real files again
cl.finalize(trp)
mpm@selenic.com
Break apart hg.py...
r1089
Matt Mackall
Use try/finally pattern to cleanup locks and transactions
r4915 tr.close()
finally:
Ronny Pfannschmidt
make transactions work on non-refcounted python implementations
r11230 tr.release()
Matt Mackall
addchangegroup: pass in lock to release it before changegroup hook is called...
r11442 if lock:
lock.release()
mpm@selenic.com
Break apart hg.py...
r1089
Benoit Boissinot
Fix traceback when nothing was added during unbundle...
r1375 if changesets > 0:
Alexis S. L. Carvalho
update the branch cache at the end of addchangegroup...
r5988 # forcefully update the on-disk branch cache
Martin Geisler
do not attempt to translate ui.debug output
r9467 self.ui.debug("updating the branch cache\n")
Georg Brandl
localrepo: introduce method for explicit branch cache update...
r12066 self.updatebranchcache()
Peter Arrenbrecht
localrepo: use more direct vars in addchangegroup
r8393 self.hook("changegroup", node=hex(cl.node(clstart)),
Vadim Gelfer
hooks: add url to changegroup, incoming, prechangegroup, pretxnchangegroup hooks...
r2673 source=srctype, url=url)
mpm@selenic.com
Break apart hg.py...
r1089
Peter Arrenbrecht
localrepo: use more direct vars in addchangegroup
r8393 for i in xrange(clstart, clend):
Peter Arrenbrecht
localrepo: use cl throughout in addchangegroup
r8392 self.hook("incoming", node=hex(cl.node(i)),
Vadim Gelfer
hooks: add url to changegroup, incoming, prechangegroup, pretxnchangegroup hooks...
r2673 source=srctype, url=url)
mpm@selenic.com
Hook fixups...
r1316
Thomas Arendsen Hein
Don't report an error when closing heads during local push (issue387)
r3803 # never return 0 here:
Adrian Buehlmann
changegroup: do not count closed new heads (issue2697)...
r14036 if dh < 0:
return dh - 1
Thomas Arendsen Hein
Don't report an error when closing heads during local push (issue387)
r3803 else:
Adrian Buehlmann
changegroup: do not count closed new heads (issue2697)...
r14036 return dh + 1
mpm@selenic.com
Break apart hg.py...
r1089
Sune Foldager
clone: only use stream when we understand the revlog format...
r12296 def stream_in(self, remote, requirements):
Adrian Buehlmann
localrepo: acquire lock on stream_in
r13390 lock = self.lock()
Thomas Arendsen Hein
New UnexpectedOutput exception to catch server errors in localrepo.stream_in...
r3564 try:
Adrian Buehlmann
localrepo: acquire lock on stream_in
r13390 fp = remote.stream_out()
Thomas Arendsen Hein
New UnexpectedOutput exception to catch server errors in localrepo.stream_in...
r3564 l = fp.readline()
try:
Adrian Buehlmann
localrepo: acquire lock on stream_in
r13390 resp = int(l)
except ValueError:
raise error.ResponseError(
_('Unexpected response from remote server:'), l)
if resp == 1:
raise util.Abort(_('operation forbidden by server'))
elif resp == 2:
raise util.Abort(_('locking the remote repository failed'))
elif resp != 0:
raise util.Abort(_('the server sent an unknown error code'))
self.ui.status(_('streaming all changes\n'))
l = fp.readline()
try:
total_files, total_bytes = map(int, l.split(' ', 1))
Bernhard Leiner
Add missing catch of a TypeError
r7063 except (ValueError, TypeError):
Matt Mackall
error: move UnexpectedOutput (now ResponseError)
r7641 raise error.ResponseError(
Thomas Arendsen Hein
New UnexpectedOutput exception to catch server errors in localrepo.stream_in...
r3564 _('Unexpected response from remote server:'), l)
Adrian Buehlmann
localrepo: acquire lock on stream_in
r13390 self.ui.status(_('%d files to transfer, %s of data\n') %
(total_files, util.bytecount(total_bytes)))
start = time.time()
for i in xrange(total_files):
# XXX doesn't support '\n' or '\r' in filenames
l = fp.readline()
try:
name, size = l.split('\0', 1)
size = int(size)
except (ValueError, TypeError):
raise error.ResponseError(
_('Unexpected response from remote server:'), l)
self.ui.debug('adding %s (%s)\n' % (name, util.bytecount(size)))
# for backwards compat, name was partially encoded
ofp = self.sopener(store.decodedir(name), 'w')
for chunk in util.filechunkiter(fp, limit=size):
ofp.write(chunk)
ofp.close()
elapsed = time.time() - start
if elapsed <= 0:
elapsed = 0.001
self.ui.status(_('transferred %s in %.1f seconds (%s/sec)\n') %
(util.bytecount(total_bytes), elapsed,
util.bytecount(total_bytes / elapsed)))
Sune Foldager
clone: only use stream when we understand the revlog format...
r12296
Adrian Buehlmann
localrepo: acquire lock on stream_in
r13390 # new requirements = old non-format requirements + new format-related
# requirements from the streamed-in repository
requirements.update(set(self.requirements) - self.supportedformats)
self._applyrequirements(requirements)
self._writerequirements()
Sune Foldager
clone: only use stream when we understand the revlog format...
r12296
Adrian Buehlmann
localrepo: acquire lock on stream_in
r13390 self.invalidate()
return len(self.heads()) + 1
finally:
lock.release()
mpm@selenic.com
Break apart hg.py...
r1089
Vadim Gelfer
clone: do not make streaming default. add --stream option instead.
r2613 def clone(self, remote, heads=[], stream=False):
Vadim Gelfer
add support for streaming clone....
r2612 '''clone remote repository.
Matt Mackall
hg verify: more consistency checking between changesets and manifests
r1382
Vadim Gelfer
add support for streaming clone....
r2612 keyword arguments:
heads: list of revs to clone (forces use of pull)
Vadim Gelfer
clone: disable stream support on server side by default....
r2621 stream: use streaming clone if possible'''
mpm@selenic.com
Break apart hg.py...
r1089
Vadim Gelfer
clone: disable stream support on server side by default....
r2621 # now, all clients that can request uncompressed clones can
# read repo formats supported by all servers that can serve
# them.
mpm@selenic.com
Break apart hg.py...
r1089
Vadim Gelfer
add support for streaming clone....
r2612 # if revlog format changes, client will have to check version
Vadim Gelfer
clone: disable stream support on server side by default....
r2621 # and format flags on "stream" capability, and use
# uncompressed only if compatible.
mpm@selenic.com
Break apart hg.py...
r1089
Sune Foldager
clone: only use stream when we understand the revlog format...
r12296 if stream and not heads:
# 'stream' means remote revlog format is revlogv1 only
if remote.capable('stream'):
return self.stream_in(remote, set(('revlogv1',)))
# otherwise, 'streamreqs' contains the remote revlog format
streamreqs = remote.capable('streamreqs')
if streamreqs:
streamreqs = set(streamreqs.split(','))
# if we support it, stream in and adjust our requirements
if not streamreqs - self.supportedformats:
return self.stream_in(remote, streamreqs)
Vadim Gelfer
add support for streaming clone....
r2612 return self.pull(remote, heads)
mason@suse.com
Automatic nesting into running transactions in the same repository....
r1806
Matt Mackall
pushkey: add localrepo support
r11368 def pushkey(self, namespace, key, old, new):
Brodie Rao
pushkey: add hooks for pushkey/listkeys
r14102 self.hook('prepushkey', throw=True, namespace=namespace, key=key,
old=old, new=new)
ret = pushkey.push(self, namespace, key, old, new)
self.hook('pushkey', namespace=namespace, key=key, old=old, new=new,
ret=ret)
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)
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):
fp = self.opener('last-message.txt', 'wb')
try:
fp.write(text)
finally:
fp.close()
return self.pathto(fp.name[len(self.root)+1:])
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():
Benoit Boissinot
localrepo: change aftertrans to be independant of the store path
r3790 for src, dest in renamefiles:
util.rename(src, dest)
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):
Brodie Rao
url: move URL parsing functions into util to improve startup time...
r14076 return localrepository(ui, util.localpath(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