localrepo.py
2353 lines
| 89.4 KiB
| text/x-python
|
PythonLexer
/ mercurial / localrepo.py
|
r1089 | # localrepo.py - read/write repository class for mercurial | ||
# | ||||
|
r4635 | # Copyright 2005-2007 Matt Mackall <mpm@selenic.com> | ||
|
r1089 | # | ||
|
r8225 | # This software may be used and distributed according to the terms of the | ||
|
r10263 | # GNU General Public License version 2 or any later version. | ||
|
r1089 | |||
|
r6211 | from node import bin, hex, nullid, nullrev, short | ||
|
r3891 | from i18n import _ | ||
|
r11368 | import repo, changegroup, subrepo, discovery, pushkey | ||
|
r15418 | import changelog, dirstate, filelog, manifest, context, bookmarks, phases | ||
|
r8390 | import lock, transaction, store, encoding | ||
|
r14902 | import scmutil, util, extensions, hook, error, revset | ||
|
r10651 | import match as matchmod | ||
import merge as mergemod | ||||
import tags as tagsmod | ||||
|
r8109 | from lock import release | ||
|
r11303 | import weakref, errno, os, time, inspect | ||
|
r8260 | propertycache = util.propertycache | ||
|
r14930 | filecache = scmutil.filecache | ||
|
r8109 | |||
|
r16198 | class storecache(filecache): | ||
"""filecache for files in the store""" | ||||
def join(self, obj, fname): | ||||
return obj.sjoin(fname) | ||||
|
r2612 | class localrepository(repo.repository): | ||
|
r13723 | capabilities = set(('lookup', 'changegroupsubset', 'branchmap', 'pushkey', | ||
|
r13741 | 'known', 'getbundle')) | ||
|
r14270 | supportedformats = set(('revlogv1', 'generaldelta')) | ||
|
r12687 | supported = supportedformats | set(('store', 'fncache', 'shared', | ||
'dotencode')) | ||||
|
r2439 | |||
|
r14363 | def __init__(self, baseui, path=None, create=False): | ||
|
r2612 | repo.repository.__init__(self) | ||
|
r15381 | self.root = os.path.realpath(util.expandpath(path)) | ||
|
r4170 | self.path = os.path.join(self.root, ".hg") | ||
|
r3850 | self.origroot = path | ||
|
r14220 | self.auditor = scmutil.pathauditor(self.root, self._checknested) | ||
|
r13970 | self.opener = scmutil.opener(self.path) | ||
self.wopener = scmutil.opener(self.root) | ||||
|
r8797 | self.baseui = baseui | ||
self.ui = baseui.copy() | ||||
|
r15454 | self._dirtyphases = False | ||
|
r15922 | # A list of callback to shape the phase if no data were found. | ||
# Callback are in the form: func(repo, roots) --> processed root. | ||||
# This list it to be filled by extension during repo setup | ||||
self._phasedefaults = [] | ||||
|
r8797 | |||
try: | ||||
self.ui.readconfig(self.join("hgrc"), self.root) | ||||
extensions.loadall(self.ui) | ||||
except IOError: | ||||
pass | ||||
|
r1089 | |||
|
r3035 | if not os.path.isdir(self.path): | ||
if create: | ||||
if not os.path.exists(path): | ||||
|
r11640 | util.makedirs(path) | ||
|
r13795 | util.makedir(self.path, notindexed=True) | ||
|
r4166 | requirements = ["revlogv1"] | ||
|
r8797 | if self.ui.configbool('format', 'usestore', True): | ||
|
r4163 | os.mkdir(os.path.join(self.path, "store")) | ||
|
r4166 | requirements.append("store") | ||
|
r8797 | if self.ui.configbool('format', 'usefncache', True): | ||
|
r7234 | requirements.append("fncache") | ||
|
r12687 | if self.ui.configbool('format', 'dotencode', True): | ||
requirements.append('dotencode') | ||||
|
r4166 | # create an invalid changelog | ||
|
r14168 | self.opener.append( | ||
"00changelog.i", | ||||
|
r4166 | '\0\0\0\2' # represents revlogv2 | ||
' dummy changelog to prevent using the old repo layout' | ||||
) | ||||
|
r14270 | if self.ui.configbool('format', 'generaldelta', False): | ||
requirements.append("generaldelta") | ||||
|
r14905 | requirements = set(requirements) | ||
|
r3035 | else: | ||
|
r7637 | raise error.RepoError(_("repository %s not found") % path) | ||
|
r3035 | elif create: | ||
|
r7637 | raise error.RepoError(_("repository %s already exists") % path) | ||
|
r3851 | else: | ||
try: | ||||
|
r14482 | requirements = scmutil.readrequires(self.opener, self.supported) | ||
|
r3851 | except IOError, inst: | ||
if inst.errno != errno.ENOENT: | ||||
raise | ||||
|
r14482 | requirements = set() | ||
|
r1089 | |||
|
r8799 | self.sharedpath = self.path | ||
try: | ||||
|
r15381 | s = os.path.realpath(self.opener.read("sharedpath").rstrip('\n')) | ||
|
r8799 | if not os.path.exists(s): | ||
raise error.RepoError( | ||||
|
r8908 | _('.hg/sharedpath points to nonexistent directory %s') % s) | ||
|
r8799 | self.sharedpath = s | ||
except IOError, inst: | ||||
if inst.errno != errno.ENOENT: | ||||
raise | ||||
|
r13970 | self.store = store.store(requirements, self.sharedpath, scmutil.opener) | ||
|
r6840 | self.spath = self.store.path | ||
self.sopener = self.store.opener | ||||
self.sjoin = self.store.join | ||||
self.opener.createmode = self.store.createmode | ||||
|
r12295 | self._applyrequirements(requirements) | ||
if create: | ||||
self._writerequirements() | ||||
|
r3850 | |||
|
r9146 | |||
|
r13047 | self._branchcache = None | ||
|
r6121 | self._branchcachetip = None | ||
|
r4004 | self.filterpats = {} | ||
|
r5966 | self._datafilters = {} | ||
|
r4916 | self._transref = self._lockref = self._wlockref = None | ||
|
r1089 | |||
|
r14929 | # A cache for various files under .hg/ that tracks file changes, | ||
# (used by the filecache decorator) | ||||
# | ||||
# Maps a property name to its util.filecacheentry | ||||
self._filecache = {} | ||||
|
r12295 | def _applyrequirements(self, requirements): | ||
self.requirements = requirements | ||||
|
r14333 | openerreqs = set(('revlogv1', 'generaldelta')) | ||
self.sopener.options = dict((r, 1) for r in requirements | ||||
if r in openerreqs) | ||||
|
r12295 | |||
def _writerequirements(self): | ||||
reqfile = self.opener("requires", "w") | ||||
for r in self.requirements: | ||||
reqfile.write("%s\n" % r) | ||||
reqfile.close() | ||||
|
r12162 | def _checknested(self, path): | ||
"""Determine if path is a legal nested repository.""" | ||||
if not path.startswith(self.root): | ||||
return False | ||||
subpath = path[len(self.root) + 1:] | ||||
|
r15722 | normsubpath = util.pconvert(subpath) | ||
|
r12162 | |||
# XXX: Checking against the current working copy is wrong in | ||||
# the sense that it can reject things like | ||||
# | ||||
# $ hg cat -r 10 sub/x.txt | ||||
# | ||||
# if sub/ is no longer a subrepository in the working copy | ||||
# parent revision. | ||||
# | ||||
# However, it can of course also allow things that would have | ||||
# been rejected before, such as the above cat command if sub/ | ||||
# is a subrepository now, but was a normal directory before. | ||||
# The old path auditor would have rejected by mistake since it | ||||
# panics when it sees sub/.hg/. | ||||
# | ||||
|
r12174 | # All in all, checking against the working copy seems sensible | ||
# since we want to prevent access to nested repositories on | ||||
# the filesystem *now*. | ||||
ctx = self[None] | ||||
|
r12162 | parts = util.splitpath(subpath) | ||
while parts: | ||||
|
r15722 | prefix = '/'.join(parts) | ||
|
r12162 | if prefix in ctx.substate: | ||
|
r15722 | if prefix == normsubpath: | ||
|
r12162 | return True | ||
else: | ||||
sub = ctx.sub(prefix) | ||||
return sub.checknested(subpath[len(prefix) + 1:]) | ||||
else: | ||||
parts.pop() | ||||
return False | ||||
|
r14933 | @filecache('bookmarks') | ||
|
r13355 | def _bookmarks(self): | ||
return bookmarks.read(self) | ||||
|
r14933 | @filecache('bookmarks.current') | ||
|
r13355 | def _bookmarkcurrent(self): | ||
return bookmarks.readcurrent(self) | ||||
|
r12162 | |||
|
r15237 | def _writebookmarks(self, marks): | ||
bookmarks.write(self) | ||||
|
r16198 | @storecache('phaseroots') | ||
|
r15418 | def _phaseroots(self): | ||
|
r15454 | self._dirtyphases = False | ||
|
r15456 | phaseroots = phases.readroots(self) | ||
phases.filterunknown(self, phaseroots) | ||||
return phaseroots | ||||
|
r15418 | |||
|
r15420 | @propertycache | ||
def _phaserev(self): | ||||
|
r15818 | cache = [phases.public] * len(self) | ||
|
r15420 | for phase in phases.trackedphases: | ||
roots = map(self.changelog.rev, self._phaseroots[phase]) | ||||
if roots: | ||||
for rev in roots: | ||||
cache[rev] = phase | ||||
for rev in self.changelog.descendants(*roots): | ||||
cache[rev] = phase | ||||
return cache | ||||
|
r16198 | @storecache('00changelog.i') | ||
|
r8260 | 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 | ||||
|
r16198 | @storecache('00manifest.i') | ||
|
r8260 | def manifest(self): | ||
return manifest.manifest(self.sopener) | ||||
|
r14930 | @filecache('dirstate') | ||
|
r8260 | def dirstate(self): | ||
|
r13032 | warned = [0] | ||
def validate(node): | ||||
try: | ||||
|
r14064 | self.changelog.rev(node) | ||
|
r13032 | return node | ||
except error.LookupError: | ||||
if not warned[0]: | ||||
warned[0] = True | ||||
self.ui.warn(_("warning: ignoring unknown" | ||||
|
r13037 | " working parent %s!\n") % short(node)) | ||
|
r13032 | return nullid | ||
return dirstate.dirstate(self.opener, self.ui, self.root, validate) | ||||
|
r2155 | |||
|
r6747 | def __getitem__(self, changeid): | ||
|
r8527 | if changeid is None: | ||
|
r6747 | return context.workingctx(self) | ||
return context.changectx(self, changeid) | ||||
|
r9924 | def __contains__(self, changeid): | ||
try: | ||||
return bool(self.lookup(changeid)) | ||||
except error.RepoLookupError: | ||||
return False | ||||
|
r6750 | def __nonzero__(self): | ||
return True | ||||
def __len__(self): | ||||
return len(self.changelog) | ||||
def __iter__(self): | ||||
for i in xrange(len(self)): | ||||
yield i | ||||
|
r2155 | |||
|
r15403 | def revs(self, expr, *args): | ||
'''Return a list of revisions matching the given revset''' | ||||
expr = revset.formatspec(expr, *args) | ||||
m = revset.match(None, expr) | ||||
return [r for r in m(self, range(len(self)))] | ||||
|
r14902 | def set(self, expr, *args): | ||
''' | ||||
Yield a context for each matching revision, after doing arg | ||||
|
r14904 | replacement via revset.formatspec | ||
|
r14902 | ''' | ||
|
r15403 | for r in self.revs(expr, *args): | ||
|
r14902 | yield self[r] | ||
|
r2673 | def url(self): | ||
return 'file:' + self.root | ||||
|
r1718 | def hook(self, name, throw=False, **args): | ||
|
r4622 | return hook.hook(self.ui, self, name, throw, **args) | ||
|
r1089 | |||
|
r2601 | tag_disallowed = ':\r\n' | ||
|
r8402 | def _tag(self, names, node, message, local, user, date, extra={}): | ||
|
r6321 | if isinstance(names, str): | ||
allchars = names | ||||
names = (names,) | ||||
else: | ||||
allchars = ''.join(names) | ||||
|
r4118 | for c in self.tag_disallowed: | ||
|
r6321 | if c in allchars: | ||
|
r4118 | raise util.Abort(_('%r cannot be used in a tag name') % c) | ||
|
r11063 | branches = self.branchmap() | ||
|
r6321 | for name in names: | ||
self.hook('pretag', throw=True, node=hex(node), tag=name, | ||||
local=local) | ||||
|
r11063 | if name in branches: | ||
self.ui.warn(_("warning: tag %s conflicts with existing" | ||||
" branch name\n") % name) | ||||
|
r4118 | |||
|
r6321 | def writetags(fp, names, munge, prevtags): | ||
|
r5985 | fp.seek(0, 2) | ||
|
r4932 | if prevtags and prevtags[-1] != '\n': | ||
fp.write('\n') | ||||
|
r6321 | for name in names: | ||
|
r6671 | m = munge and munge(name) or name | ||
|
r14936 | if self._tagscache.tagtypes and name in self._tagscache.tagtypes: | ||
old = self.tags().get(name, nullid) | ||||
|
r6671 | fp.write('%s %s\n' % (hex(old), m)) | ||
fp.write('%s %s\n' % (hex(node), m)) | ||||
|
r4932 | fp.close() | ||
|
r5081 | |||
|
r4932 | prevtags = '' | ||
|
r4118 | if local: | ||
|
r4932 | try: | ||
fp = self.opener('localtags', 'r+') | ||||
|
r7875 | except IOError: | ||
|
r4932 | fp = self.opener('localtags', 'a') | ||
else: | ||||
prevtags = fp.read() | ||||
|
r4118 | # local tags are stored in the current charset | ||
|
r6321 | writetags(fp, names, None, prevtags) | ||
for name in names: | ||||
self.hook('tag', node=hex(node), tag=name, local=local) | ||||
|
r4118 | return | ||
|
r8402 | try: | ||
fp = self.wfile('.hgtags', 'rb+') | ||||
|
r14646 | except IOError, e: | ||
if e.errno != errno.ENOENT: | ||||
raise | ||||
|
r8402 | fp = self.wfile('.hgtags', 'ab') | ||
|
r4932 | else: | ||
|
r8402 | prevtags = fp.read() | ||
|
r4932 | |||
|
r4118 | # committed tags are stored in UTF-8 | ||
|
r7948 | writetags(fp, names, encoding.fromlocal, prevtags) | ||
|
r4932 | |||
|
r13400 | fp.close() | ||
|
r15929 | self.invalidatecaches() | ||
|
r8402 | if '.hgtags' not in self.dirstate: | ||
|
r11303 | self[None].add(['.hgtags']) | ||
|
r4118 | |||
|
r10651 | m = matchmod.exact(self.root, '', ['.hgtags']) | ||
|
r8706 | tagnode = self.commit(message, user, date, extra=extra, match=m) | ||
|
r4118 | |||
|
r6321 | for name in names: | ||
self.hook('tag', node=hex(node), tag=name, local=local) | ||||
|
r4118 | |||
return tagnode | ||||
|
r6321 | def tag(self, names, node, message, local, user, date): | ||
'''tag a revision with one or more symbolic names. | ||||
|
r2601 | |||
|
r6321 | names is a list of strings or, when adding a single tag, names may be a | ||
string. | ||||
|
r6334 | |||
|
r6321 | if local is True, the tags are stored in a per-repository file. | ||
otherwise, they are stored in the .hgtags file, and a new | ||||
|
r2601 | changeset is committed with the change. | ||
keyword arguments: | ||||
|
r6321 | local: whether to store tags in non-version-controlled file | ||
|
r2601 | (default False) | ||
message: commit message to use if committing | ||||
user: name of user to use if committing | ||||
date: date tuple to use if committing''' | ||||
|
r13133 | if not local: | ||
for x in self.status()[:5]: | ||||
if '.hgtags' in x: | ||||
raise util.Abort(_('working copy of .hgtags is changed ' | ||||
'(please commit .hgtags manually)')) | ||||
|
r2601 | |||
|
r7814 | self.tags() # instantiate the cache | ||
|
r6321 | self._tag(names, node, message, local, user, date) | ||
|
r2601 | |||
|
r14936 | @propertycache | ||
def _tagscache(self): | ||||
'''Returns a tagscache object that contains various tags related caches.''' | ||||
# This simplifies its cache management by having one decorated | ||||
# function (this one) and the rest simply fetch things from it. | ||||
class tagscache(object): | ||||
def __init__(self): | ||||
# These two define the set of tags for this repository. tags | ||||
# maps tag name to node; tagtypes maps tag name to 'global' or | ||||
# 'local'. (Global tags are defined by .hgtags across all | ||||
# heads, and local tags are defined in .hg/localtags.) | ||||
# They constitute the in-memory cache of tags. | ||||
self.tags = self.tagtypes = None | ||||
self.nodetagscache = self.tagslist = None | ||||
cache = tagscache() | ||||
cache.tags, cache.tagtypes = self._findtags() | ||||
return cache | ||||
|
r1089 | def tags(self): | ||
'''return a mapping of tag to node''' | ||||
|
r16371 | t = {} | ||
for k, v in self._tagscache.tags.iteritems(): | ||||
try: | ||||
# ignore tags to unknown nodes | ||||
self.changelog.rev(v) | ||||
t[k] = v | ||||
|
r16679 | except (error.LookupError, ValueError): | ||
|
r16371 | pass | ||
return t | ||||
|
r4210 | |||
|
r9145 | def _findtags(self): | ||
'''Do the hard work of finding tags. Return a pair of dicts | ||||
(tags, tagtypes) where tags maps tag name to node, and tagtypes | ||||
maps tag name to a string like \'global\' or \'local\'. | ||||
Subclasses or extensions are free to add their own tags, but | ||||
should be aware that the returned dicts will be retained for the | ||||
duration of the localrepo object.''' | ||||
# XXX what tagtype should subclasses/extensions use? Currently | ||||
# mq and bookmarks add tags, but do not set the tagtype at all. | ||||
# Should each extension invent its own tag type? Should there | ||||
# be one tagtype for all such "virtual" tags? Or is the status | ||||
# quo fine? | ||||
|
r4210 | |||
|
r9148 | alltags = {} # map tag name to (node, hist) | ||
|
r5657 | tagtypes = {} | ||
|
r1089 | |||
|
r10651 | tagsmod.findglobaltags(self.ui, self, alltags, tagtypes) | ||
tagsmod.readlocaltags(self.ui, self, alltags, tagtypes) | ||||
|
r5657 | |||
|
r9152 | # Build the return dicts. Have to re-encode tag names because | ||
# the tags module always uses UTF-8 (in order not to lose info | ||||
# writing to the cache), but the rest of Mercurial wants them in | ||||
# local encoding. | ||||
|
r9145 | tags = {} | ||
|
r9147 | for (name, (node, hist)) in alltags.iteritems(): | ||
if node != nullid: | ||||
|
r16371 | tags[encoding.tolocal(name)] = node | ||
|
r9145 | tags['tip'] = self.changelog.tip() | ||
|
r9152 | tagtypes = dict([(encoding.tolocal(name), value) | ||
for (name, value) in tagtypes.iteritems()]) | ||||
|
r9145 | return (tags, tagtypes) | ||
|
r1089 | |||
|
r5657 | def tagtype(self, tagname): | ||
''' | ||||
return the type of the given tag. result can be: | ||||
'local' : a local tag | ||||
'global' : a global tag | ||||
None : tag does not exist | ||||
''' | ||||
|
r14936 | return self._tagscache.tagtypes.get(tagname) | ||
|
r5657 | |||
|
r1089 | def tagslist(self): | ||
'''return a list of tags ordered by revision''' | ||||
|
r14936 | if not self._tagscache.tagslist: | ||
l = [] | ||||
for t, n in self.tags().iteritems(): | ||||
r = self.changelog.rev(n) | ||||
l.append((r, t, n)) | ||||
self._tagscache.tagslist = [(t, n) for r, t, n in sorted(l)] | ||||
return self._tagscache.tagslist | ||||
|
r1089 | |||
def nodetags(self, node): | ||||
'''return the tags associated with a node''' | ||||
|
r14936 | if not self._tagscache.nodetagscache: | ||
nodetagscache = {} | ||||
|
r16371 | for t, n in self._tagscache.tags.iteritems(): | ||
|
r14936 | nodetagscache.setdefault(n, []).append(t) | ||
for tags in nodetagscache.itervalues(): | ||||
|
r11047 | tags.sort() | ||
|
r14936 | self._tagscache.nodetagscache = nodetagscache | ||
return self._tagscache.nodetagscache.get(node, []) | ||||
|
r1089 | |||
|
r13384 | def nodebookmarks(self, node): | ||
marks = [] | ||||
for bookmark, n in self._bookmarks.iteritems(): | ||||
if n == node: | ||||
marks.append(bookmark) | ||||
return sorted(marks) | ||||
|
r6120 | def _branchtags(self, partial, lrev): | ||
|
r7654 | # TODO: rename this function? | ||
|
r6750 | tiprev = len(self) - 1 | ||
|
r3491 | if lrev != tiprev: | ||
|
r10770 | ctxgen = (self[r] for r in xrange(lrev + 1, tiprev + 1)) | ||
self._updatebranchcache(partial, ctxgen) | ||||
|
r3491 | self._writebranchcache(partial, self.changelog.tip(), tiprev) | ||
|
r3826 | return partial | ||
|
r12066 | def updatebranchcache(self): | ||
|
r9671 | tip = self.changelog.tip() | ||
|
r9674 | if self._branchcache is not None and self._branchcachetip == tip: | ||
|
r15884 | return | ||
|
r9671 | |||
|
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) | ||||
|
r9674 | partial = self._branchcache | ||
|
r6121 | |||
|
r6120 | self._branchtags(partial, lrev) | ||
|
r7654 | # this private cache holds all heads (not just tips) | ||
|
r9674 | self._branchcache = partial | ||
|
r3826 | |||
|
r12066 | def branchmap(self): | ||
'''returns a dictionary {branch: [branchheads]}''' | ||||
self.updatebranchcache() | ||||
|
r9674 | return self._branchcache | ||
|
r7654 | |||
def branchtags(self): | ||||
'''return a dict where branch names map to the tipmost head of | ||||
|
r7656 | the branch, open heads come before closed''' | ||
bt = {} | ||||
|
r9675 | for bn, heads in self.branchmap().iteritems(): | ||
|
r10392 | tip = heads[-1] | ||
for h in reversed(heads): | ||||
|
r7656 | if 'close' not in self.changelog.read(h)[5]: | ||
|
r10392 | tip = h | ||
|
r7656 | break | ||
|
r10392 | bt[bn] = tip | ||
|
r7656 | return bt | ||
|
r3491 | def _readbranchcache(self): | ||
partial = {} | ||||
|
r3417 | try: | ||
|
r13341 | f = self.opener("cache/branchheads") | ||
|
r3668 | lines = f.read().split('\n') | ||
f.close() | ||||
|
r4415 | except (IOError, OSError): | ||
return {}, nullid, nullrev | ||||
try: | ||||
|
r4167 | last, lrev = lines.pop(0).split(" ", 1) | ||
|
r3417 | last, lrev = bin(last), int(lrev) | ||
|
r6750 | if lrev >= len(self) or self[lrev].node() != last: | ||
|
r3761 | # invalidate the cache | ||
|
r6056 | raise ValueError('invalidating branch cache (tip differs)') | ||
|
r3761 | for l in lines: | ||
|
r10282 | if not l: | ||
continue | ||||
|
r4167 | node, label = l.split(" ", 1) | ||
|
r13047 | label = encoding.tolocal(label.strip()) | ||
partial.setdefault(label, []).append(bin(node)) | ||||
|
r7644 | except KeyboardInterrupt: | ||
|
r3761 | raise | ||
except Exception, inst: | ||||
if self.ui.debugflag: | ||||
self.ui.warn(str(inst), '\n') | ||||
partial, last, lrev = {}, nullid, nullrev | ||||
|
r3491 | return partial, last, lrev | ||
|
r3417 | |||
|
r3491 | def _writebranchcache(self, branches, tip, tiprev): | ||
|
r3452 | try: | ||
|
r13341 | f = self.opener("cache/branchheads", "w", atomictemp=True) | ||
|
r3491 | f.write("%s %s\n" % (hex(tip), tiprev)) | ||
|
r7654 | for label, nodes in branches.iteritems(): | ||
for node in nodes: | ||||
|
r13047 | f.write("%s %s\n" % (hex(node), encoding.fromlocal(label))) | ||
|
r15057 | f.close() | ||
|
r4415 | except (IOError, OSError): | ||
|
r3452 | pass | ||
|
r3417 | |||
|
r10770 | def _updatebranchcache(self, partial, ctxgen): | ||
|
r8954 | # collect new branch entries | ||
newbranches = {} | ||||
|
r10770 | for c in ctxgen: | ||
|
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) | ||||
|
r10920 | if len(bheads) <= 1: | ||
|
r8954 | continue | ||
|
r14056 | bheads = sorted(bheads, key=lambda x: self[x].rev()) | ||
|
r8954 | # starting from tip means fewer passes over reachable | ||
while newnodes: | ||||
latest = newnodes.pop() | ||||
if latest not in bheads: | ||||
continue | ||||
|
r14056 | minbhrev = self[bheads[0]].node() | ||
|
r9120 | reachable = self.changelog.reachable(latest, minbhrev) | ||
|
r10920 | reachable.remove(latest) | ||
|
r14056 | if reachable: | ||
bheads = [b for b in bheads if b not in reachable] | ||||
|
r8954 | partial[branch] = bheads | ||
|
r3491 | |||
|
r1089 | def lookup(self, key): | ||
|
r16378 | return self[key].node() | ||
|
r1089 | |||
|
r10960 | def lookupbranch(self, key, remote=None): | ||
repo = remote or self | ||||
if key in repo.branchmap(): | ||||
return key | ||||
repo = (remote and remote.local()) and remote or self | ||||
return repo[key].branch() | ||||
|
r13723 | def known(self, nodes): | ||
nm = self.changelog.nodemap | ||||
|
r15889 | result = [] | ||
for n in nodes: | ||||
r = nm.get(n) | ||||
resp = not (r is None or self._phaserev[r] >= phases.secret) | ||||
result.append(resp) | ||||
return result | ||||
|
r13723 | |||
|
r1089 | def local(self): | ||
|
r14603 | return self | ||
|
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): | ||||
|
r1615 | if f[0] == '/': | ||
f = f[1:] | ||||
|
r4258 | return filelog.filelog(self.sopener, f) | ||
|
r1089 | |||
|
r6739 | def changectx(self, changeid): | ||
|
r6747 | return self[changeid] | ||
|
r3218 | |||
|
r3163 | def parents(self, changeid=None): | ||
|
r6742 | '''get list of changectxs for parents of changeid''' | ||
|
r6747 | return self[changeid].parents() | ||
|
r3163 | |||
|
r16551 | def setparents(self, p1, p2=nullid): | ||
copies = self.dirstate.setparents(p1, p2) | ||||
if copies: | ||||
# Adjust copy records, the dirstate cannot do it, it | ||||
# requires access to parents manifests. Preserve them | ||||
# only for entries added to first parent. | ||||
pctx = self[p1] | ||||
for f in copies: | ||||
if f not in pctx and copies[f] in pctx: | ||||
self.dirstate.copy(copies[f], f) | ||||
|
r2564 | def filectx(self, path, changeid=None, fileid=None): | ||
"""changeid can be a changeset revision, node, or tag. | ||||
fileid can be a file revision or node.""" | ||||
return context.filectx(self, path, changeid, fileid) | ||||
|
r1089 | def getcwd(self): | ||
return self.dirstate.getcwd() | ||||
|
r4525 | def pathto(self, f, cwd=None): | ||
return self.dirstate.pathto(f, cwd) | ||||
|
r1089 | def wfile(self, f, mode='r'): | ||
return self.wopener(f, mode) | ||||
|
r4275 | def _link(self, f): | ||
return os.path.islink(self.wjoin(f)) | ||||
|
r11698 | def _loadfilter(self, filter): | ||
|
r4004 | if filter not in self.filterpats: | ||
|
r1258 | l = [] | ||
|
r4004 | for pat, cmd in self.ui.configitems(filter): | ||
|
r7226 | if cmd == '!': | ||
continue | ||||
|
r10651 | mf = matchmod.match(self.root, '', [pat]) | ||
|
r5966 | fn = None | ||
|
r6066 | params = cmd | ||
|
r5966 | for name, filterfn in self._datafilters.iteritems(): | ||
|
r6210 | if cmd.startswith(name): | ||
|
r5966 | fn = filterfn | ||
|
r6066 | params = cmd[len(name):].lstrip() | ||
|
r5966 | break | ||
if not fn: | ||||
|
r5967 | fn = lambda s, c, **kwargs: util.filter(s, c) | ||
# Wrap old filters not supporting keyword arguments | ||||
if not inspect.getargspec(fn)[2]: | ||||
oldfn = fn | ||||
fn = lambda s, c, **kwargs: oldfn(s, c) | ||||
|
r6066 | l.append((mf, fn, params)) | ||
|
r4004 | self.filterpats[filter] = l | ||
|
r12706 | return self.filterpats[filter] | ||
|
r1258 | |||
|
r12707 | def _filter(self, filterpats, filename, data): | ||
for mf, fn, cmd in filterpats: | ||||
|
r1258 | if mf(filename): | ||
|
r9467 | self.ui.debug("filtering %s through %s\n" % (filename, cmd)) | ||
|
r5967 | data = fn(data, cmd, ui=self.ui, repo=self, filename=filename) | ||
|
r1258 | break | ||
return data | ||||
|
r1089 | |||
|
r12708 | @propertycache | ||
def _encodefilterpats(self): | ||||
return self._loadfilter('encode') | ||||
@propertycache | ||||
def _decodefilterpats(self): | ||||
return self._loadfilter('decode') | ||||
|
r5966 | def adddatafilter(self, name, filter): | ||
self._datafilters[name] = filter | ||||
|
r4004 | def wread(self, filename): | ||
if self._link(filename): | ||||
data = os.readlink(self.wjoin(filename)) | ||||
else: | ||||
|
r14168 | data = self.wopener.read(filename) | ||
|
r12708 | return self._filter(self._encodefilterpats, filename, data) | ||
|
r1258 | |||
|
r4006 | def wwrite(self, filename, data, flags): | ||
|
r12708 | data = self._filter(self._decodefilterpats, filename, data) | ||
|
r6877 | if 'l' in flags: | ||
self.wopener.symlink(data, filename) | ||||
else: | ||||
|
r14184 | self.wopener.write(filename, data) | ||
|
r6877 | if 'x' in flags: | ||
|
r14232 | util.setflags(self.wjoin(filename), False, True) | ||
|
r1258 | |||
|
r4005 | def wwritedata(self, filename, data): | ||
|
r12708 | return self._filter(self._decodefilterpats, filename, data) | ||
|
r1089 | |||
|
r10881 | def transaction(self, desc): | ||
|
r8072 | tr = self._transref and self._transref() or None | ||
if tr and tr.running(): | ||||
return tr.nest() | ||||
|
r1806 | |||
|
r5865 | # abort here if the journal already exists | ||
if os.path.exists(self.sjoin("journal")): | ||||
|
r10282 | raise error.RepoError( | ||
_("abandoned transaction found - run hg recover")) | ||||
|
r5865 | |||
|
r16236 | self._writejournal(desc) | ||
renames = [(x, undoname(x)) for x in self._journalfiles()] | ||||
|
r14266 | |||
tr = transaction.transaction(self.ui.warn, self.sopener, | ||||
self.sjoin("journal"), | ||||
aftertrans(renames), | ||||
self.store.createmode) | ||||
self._transref = weakref.ref(tr) | ||||
return tr | ||||
|
r16236 | def _journalfiles(self): | ||
return (self.sjoin('journal'), self.join('journal.dirstate'), | ||||
self.join('journal.branch'), self.join('journal.desc'), | ||||
self.join('journal.bookmarks'), | ||||
self.sjoin('journal.phaseroots')) | ||||
def undofiles(self): | ||||
return [undoname(x) for x in self._journalfiles()] | ||||
|
r14266 | def _writejournal(self, desc): | ||
|
r16456 | self.opener.write("journal.dirstate", | ||
self.opener.tryread("dirstate")) | ||||
|
r14168 | self.opener.write("journal.branch", | ||
encoding.fromlocal(self.dirstate.branch())) | ||||
self.opener.write("journal.desc", | ||||
"%d\n%s\n" % (len(self), desc)) | ||||
|
r16456 | self.opener.write("journal.bookmarks", | ||
self.opener.tryread("bookmarks")) | ||||
self.sopener.write("journal.phaseroots", | ||||
self.sopener.tryread("phaseroots")) | ||||
|
r14266 | |||
|
r1089 | def recover(self): | ||
|
r8109 | lock = self.lock() | ||
|
r4915 | try: | ||
if os.path.exists(self.sjoin("journal")): | ||||
self.ui.status(_("rolling back interrupted transaction\n")) | ||||
|
r10282 | transaction.rollback(self.sopener, self.sjoin("journal"), | ||
self.ui.warn) | ||||
|
r4915 | self.invalidate() | ||
return True | ||||
else: | ||||
self.ui.warn(_("no interrupted transaction available\n")) | ||||
return False | ||||
finally: | ||||
|
r8109 | lock.release() | ||
|
r1089 | |||
|
r15183 | def rollback(self, dryrun=False, force=False): | ||
|
r4917 | wlock = lock = None | ||
|
r4915 | try: | ||
|
r1712 | wlock = self.wlock() | ||
|
r4438 | lock = self.lock() | ||
|
r4915 | if os.path.exists(self.sjoin("undo")): | ||
|
r15183 | return self._rollback(dryrun, force) | ||
|
r4915 | else: | ||
self.ui.warn(_("no rollback information available\n")) | ||||
|
r11177 | return 1 | ||
|
r4915 | finally: | ||
|
r8109 | release(lock, wlock) | ||
|
r1089 | |||
|
r15183 | def _rollback(self, dryrun, force): | ||
|
r15130 | ui = self.ui | ||
|
r15097 | try: | ||
|
r15130 | args = self.opener.read('undo.desc').splitlines() | ||
(oldlen, desc, detail) = (int(args[0]), args[1], None) | ||||
if len(args) >= 3: | ||||
detail = args[2] | ||||
oldtip = oldlen - 1 | ||||
if detail and ui.verbose: | ||||
msg = (_('repository tip rolled back to revision %s' | ||||
' (undo %s: %s)\n') | ||||
% (oldtip, desc, detail)) | ||||
else: | ||||
msg = (_('repository tip rolled back to revision %s' | ||||
' (undo %s)\n') | ||||
% (oldtip, desc)) | ||||
|
r15097 | except IOError: | ||
|
r15130 | msg = _('rolling back unknown transaction\n') | ||
|
r15183 | desc = None | ||
if not force and self['.'] != self['tip'] and desc == 'commit': | ||||
raise util.Abort( | ||||
_('rollback of last commit while not checked out ' | ||||
|
r15187 | 'may lose data'), hint=_('use -f to force')) | ||
|
r15183 | |||
|
r15130 | ui.status(msg) | ||
|
r15097 | if dryrun: | ||
return 0 | ||||
|
r15131 | |||
parents = self.dirstate.parents() | ||||
|
r15130 | transaction.rollback(self.sopener, self.sjoin('undo'), ui.warn) | ||
|
r15097 | if os.path.exists(self.join('undo.bookmarks')): | ||
util.rename(self.join('undo.bookmarks'), | ||||
self.join('bookmarks')) | ||||
|
r15455 | if os.path.exists(self.sjoin('undo.phaseroots')): | ||
util.rename(self.sjoin('undo.phaseroots'), | ||||
self.sjoin('phaseroots')) | ||||
|
r15097 | self.invalidate() | ||
|
r15131 | |||
|
r16805 | # Discard all cache entries to force reloading everything. | ||
self._filecache.clear() | ||||
|
r15131 | parentgone = (parents[0] not in self.changelog.nodemap or | ||
parents[1] not in self.changelog.nodemap) | ||||
if parentgone: | ||||
util.rename(self.join('undo.dirstate'), self.join('dirstate')) | ||||
try: | ||||
branch = self.opener.read('undo.branch') | ||||
self.dirstate.setbranch(branch) | ||||
except IOError: | ||||
ui.warn(_('named branch could not be reset: ' | ||||
'current branch is still \'%s\'\n') | ||||
% self.dirstate.branch()) | ||||
self.dirstate.invalidate() | ||||
parents = tuple([p.rev() for p in self.parents()]) | ||||
if len(parents) > 1: | ||||
ui.status(_('working directory now based on ' | ||||
'revisions %d and %d\n') % parents) | ||||
else: | ||||
ui.status(_('working directory now based on ' | ||||
'revision %d\n') % parents) | ||||
|
r15604 | self.destroyed() | ||
|
r15097 | return 0 | ||
|
r10547 | def invalidatecaches(self): | ||
|
r15988 | def delcache(name): | ||
try: | ||||
delattr(self, name) | ||||
except AttributeError: | ||||
pass | ||||
delcache('_tagscache') | ||||
delcache('_phaserev') | ||||
|
r14936 | |||
|
r9674 | self._branchcache = None # in UTF-8 | ||
|
r6121 | self._branchcachetip = None | ||
|
r1784 | |||
|
r14930 | def invalidatedirstate(self): | ||
'''Invalidates the dirstate, causing the next call to dirstate | ||||
to check if it was modified since the last time it was read, | ||||
rereading it if it has. | ||||
This is different to dirstate.invalidate() that it doesn't always | ||||
rereads the dirstate. Use dirstate.invalidate() if you want to | ||||
explicitly read the dirstate again (i.e. restoring it to a previous | ||||
known good state).''' | ||||
|
r16200 | if 'dirstate' in self.__dict__: | ||
for k in self.dirstate._filecache: | ||||
try: | ||||
delattr(self.dirstate, k) | ||||
except AttributeError: | ||||
pass | ||||
|
r14930 | delattr(self, 'dirstate') | ||
|
r10547 | def invalidate(self): | ||
|
r14935 | for k in self._filecache: | ||
# dirstate is invalidated separately in invalidatedirstate() | ||||
if k == 'dirstate': | ||||
continue | ||||
try: | ||||
delattr(self, k) | ||||
except AttributeError: | ||||
pass | ||||
|
r10547 | self.invalidatecaches() | ||
|
r4913 | def _lock(self, lockname, wait, releasefn, acquirefn, desc): | ||
|
r1089 | try: | ||
|
r3457 | l = lock.lock(lockname, 0, releasefn, desc=desc) | ||
|
r7640 | except error.LockHeld, inst: | ||
|
r1531 | if not wait: | ||
|
r2016 | raise | ||
|
r3688 | self.ui.warn(_("waiting for lock on %s held by %r\n") % | ||
(desc, inst.locker)) | ||||
|
r2016 | # default to 600 seconds timeout | ||
|
r3457 | l = lock.lock(lockname, int(self.ui.config("ui", "timeout", "600")), | ||
|
r2016 | releasefn, desc=desc) | ||
|
r1751 | if acquirefn: | ||
acquirefn() | ||||
return l | ||||
|
r15587 | def _afterlock(self, callback): | ||
|
r15583 | """add a callback to the current repository lock. | ||
The callback will be executed on lock release.""" | ||||
l = self._lockref and self._lockref() | ||||
|
r15588 | if l: | ||
|
r15589 | l.postrelease.append(callback) | ||
|
r16680 | else: | ||
callback() | ||||
|
r15583 | |||
|
r4914 | def lock(self, wait=True): | ||
|
r9309 | '''Lock the repository store (.hg/store) and return a weak reference | ||
to the lock. Use this before modifying the store (e.g. committing or | ||||
stripping). If you are opening a transaction, get a lock as well.)''' | ||||
|
r8108 | l = self._lockref and self._lockref() | ||
if l is not None and l.held: | ||||
l.lock() | ||||
return l | ||||
|
r4917 | |||
|
r14931 | def unlock(): | ||
self.store.write() | ||||
|
r15454 | if self._dirtyphases: | ||
phases.writeroots(self) | ||||
|
r16113 | self._dirtyphases = False | ||
|
r14931 | for k, ce in self._filecache.items(): | ||
if k == 'dirstate': | ||||
continue | ||||
ce.refresh() | ||||
l = self._lock(self.sjoin("lock"), wait, unlock, | ||||
|
r13391 | self.invalidate, _('repository %s') % self.origroot) | ||
|
r4917 | self._lockref = weakref.ref(l) | ||
return l | ||||
|
r1751 | |||
|
r4914 | def wlock(self, wait=True): | ||
|
r9309 | '''Lock the non-store parts of the repository (everything under | ||
.hg except .hg/store) and return a weak reference to the lock. | ||||
Use this before modifying files in .hg.''' | ||||
|
r8108 | l = self._wlockref and self._wlockref() | ||
if l is not None and l.held: | ||||
l.lock() | ||||
return l | ||||
|
r1531 | |||
|
r14930 | def unlock(): | ||
self.dirstate.write() | ||||
ce = self._filecache.get('dirstate') | ||||
if ce: | ||||
ce.refresh() | ||||
l = self._lock(self.join("wlock"), wait, unlock, | ||||
self.invalidatedirstate, _('working directory of %s') % | ||||
|
r4917 | self.origroot) | ||
self._wlockref = weakref.ref(l) | ||||
return l | ||||
|
r1531 | |||
|
r8401 | def _filecommit(self, fctx, manifest1, manifest2, linkrev, tr, changelist): | ||
|
r3292 | """ | ||
|
r3294 | commit an individual file as part of a larger transaction | ||
""" | ||||
|
r3292 | |||
|
r8244 | fname = fctx.path() | ||
text = fctx.data() | ||||
flog = self.file(fname) | ||||
fparent1 = manifest1.get(fname, nullid) | ||||
|
r8401 | fparent2 = fparent2o = manifest2.get(fname, nullid) | ||
|
r1716 | |||
|
r3292 | meta = {} | ||
|
r8244 | copy = fctx.renamed() | ||
if copy and copy[0] != fname: | ||||
|
r4058 | # Mark the new revision of this file as a copy of another | ||
|
r4516 | # file. This copy data will effectively act as a parent | ||
# of this new revision. If this is a merge, the first | ||||
|
r4058 | # parent will be the nullid (meaning "look up the copy data") | ||
# and the second one will be the other parent. For example: | ||||
# | ||||
# 0 --- 1 --- 3 rev1 changes file foo | ||||
# \ / rev2 renames foo to bar and changes it | ||||
# \- 2 -/ rev3 should have bar with all changes and | ||||
# should record that bar descends from | ||||
# bar in rev2 and foo in rev1 | ||||
# | ||||
# this allows this merge to succeed: | ||||
# | ||||
# 0 --- 1 --- 3 rev4 reverts the content change from rev2 | ||||
# \ / merging rev3 and rev4 should use bar@rev2 | ||||
# \- 2 --- 4 as the merge base | ||||
# | ||||
|
r6874 | |||
|
r8244 | cfname = copy[0] | ||
crev = manifest1.get(cfname) | ||||
newfparent = fparent2 | ||||
|
r6874 | |||
if manifest2: # branch merge | ||||
|
r8244 | if fparent2 == nullid or crev is None: # copied on remote side | ||
if cfname in manifest2: | ||||
crev = manifest2[cfname] | ||||
newfparent = fparent1 | ||||
|
r6874 | |||
|
r6875 | # find source in nearest ancestor if we've lost track | ||
|
r8244 | if not crev: | ||
|
r9467 | self.ui.debug(" %s: searching for copy revision for %s\n" % | ||
|
r8244 | (fname, cfname)) | ||
|
r13000 | for ancestor in self[None].ancestors(): | ||
|
r8244 | if cfname in ancestor: | ||
crev = ancestor[cfname].filenode() | ||||
|
r6876 | break | ||
|
r6875 | |||
|
r13000 | if crev: | ||
self.ui.debug(" %s: copy %s:%s\n" % (fname, cfname, hex(crev))) | ||||
meta["copy"] = cfname | ||||
meta["copyrev"] = hex(crev) | ||||
fparent1, fparent2 = nullid, newfparent | ||||
else: | ||||
self.ui.warn(_("warning: can't find ancestor for '%s' " | ||||
"copied from '%s'!\n") % (fname, cfname)) | ||||
|
r8244 | elif fparent2 != nullid: | ||
|
r1716 | # is one parent an ancestor of the other? | ||
|
r8244 | fparentancestor = flog.ancestor(fparent1, fparent2) | ||
if fparentancestor == fparent1: | ||||
fparent1, fparent2 = fparent2, nullid | ||||
elif fparentancestor == fparent2: | ||||
fparent2 = nullid | ||||
|
r1716 | |||
|
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) | ||||
|
r1716 | |||
|
r8401 | # are just the flags changed during merge? | ||
|
r10320 | if fparent1 != fparent2o and manifest1.flags(fname) != fctx.flags(): | ||
|
r8401 | changelist.append(fname) | ||
return fparent1 | ||||
|
r1716 | |||
|
r8706 | def commit(self, text="", user=None, date=None, match=None, force=False, | ||
editor=False, extra={}): | ||||
|
r8515 | """Add a new revision to current repository. | ||
|
r8706 | Revision information is gathered from the working directory, | ||
match can be used to filter the committed files. If editor is | ||||
supplied, it is called to get a commit message. | ||||
|
r8515 | """ | ||
|
r8709 | |||
|
r8715 | def fail(f, msg): | ||
raise util.Abort('%s: %s' % (f, msg)) | ||||
if not match: | ||||
|
r10651 | match = matchmod.always(self.root, '') | ||
|
r8715 | |||
if not force: | ||||
vdirs = [] | ||||
match.dir = vdirs.append | ||||
match.bad = fail | ||||
|
r8405 | wlock = self.wlock() | ||
|
r4915 | try: | ||
|
r8813 | wctx = self[None] | ||
|
r10970 | merge = len(wctx.parents()) > 1 | ||
|
r1089 | |||
|
r10970 | if (not force and merge and match and | ||
|
r8501 | (match.files() or match.anypats())): | ||
|
r8397 | raise util.Abort(_('cannot partially commit a merge ' | ||
'(do not specify files or patterns)')) | ||||
|
r6706 | |||
|
r8706 | changes = self.status(match=match, clean=force) | ||
if force: | ||||
changes[0].extend(changes[6]) # mq may commit unchanged files | ||||
|
r3621 | |||
|
r8813 | # check subrepos | ||
subs = [] | ||||
|
r16073 | commitsubs = set() | ||
newstate = wctx.substate.copy() | ||||
# only manage subrepos and .hgsubstate if .hgsub is present | ||||
|
r14536 | if '.hgsub' in wctx: | ||
|
r16073 | # we'll decide whether to track this ourselves, thanks | ||
if '.hgsubstate' in changes[0]: | ||||
changes[0].remove('.hgsubstate') | ||||
if '.hgsubstate' in changes[2]: | ||||
changes[2].remove('.hgsubstate') | ||||
# compare current state to last committed state | ||||
# build new substate based on last committed state | ||||
oldstate = wctx.p1().substate | ||||
for s in sorted(newstate.keys()): | ||||
if not match(s): | ||||
# ignore working copy, use old state if present | ||||
if s in oldstate: | ||||
newstate[s] = oldstate[s] | ||||
continue | ||||
if not force: | ||||
raise util.Abort( | ||||
_("commit with new subrepo %s excluded") % s) | ||||
if wctx.sub(s).dirty(True): | ||||
if not self.ui.configbool('ui', 'commitsubrepos'): | ||||
raise util.Abort( | ||||
_("uncommitted changes in subrepo %s") % s, | ||||
hint=_("use --subrepos for recursive commit")) | ||||
subs.append(s) | ||||
commitsubs.add(s) | ||||
else: | ||||
bs = wctx.sub(s).basestate() | ||||
newstate[s] = (newstate[s][0], bs, newstate[s][2]) | ||||
if oldstate.get(s, (None, None, None))[1] != bs: | ||||
subs.append(s) | ||||
# check for removed subrepos | ||||
|
r14536 | for p in wctx.parents(): | ||
|
r16073 | r = [s for s in p.substate if s not in newstate] | ||
subs += [s for s in r if match(s)] | ||||
if subs: | ||||
|
r14536 | if (not match('.hgsub') and | ||
'.hgsub' in (wctx.modified() + wctx.added())): | ||||
raise util.Abort( | ||||
_("can't commit subrepos without .hgsub")) | ||||
|
r16073 | changes[0].insert(0, '.hgsubstate') | ||
|
r14536 | 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') | ||||
|
r8813 | |||
|
r8709 | # make sure all explicit patterns are matched | ||
if not force and match.files(): | ||||
|
r8710 | matched = set(changes[0] + changes[1] + changes[2]) | ||
|
r8709 | |||
for f in match.files(): | ||||
|
r8813 | if f == '.' or f in matched or f in wctx.substate: | ||
|
r8709 | continue | ||
if f in changes[3]: # missing | ||||
fail(f, _('file not found!')) | ||||
if f in vdirs: # visited directory | ||||
d = f + '/' | ||||
|
r8710 | for mf in matched: | ||
if mf.startswith(d): | ||||
break | ||||
else: | ||||
|
r8709 | fail(f, _("no match under directory!")) | ||
elif f not in self.dirstate: | ||||
fail(f, _("file not tracked!")) | ||||
|
r10970 | if (not force and not extra.get("close") and not merge | ||
|
r8501 | and not (changes[0] or changes[1] or changes[2]) | ||
|
r10970 | and wctx.branch() == wctx.p1().branch()): | ||
|
r8404 | return None | ||
|
r16536 | if merge and changes[3]: | ||
raise util.Abort(_("cannot commit merge with missing files")) | ||||
|
r10651 | ms = mergemod.mergestate(self) | ||
|
r6888 | for f in changes[0]: | ||
if f in ms and ms[f] == 'u': | ||||
raise util.Abort(_("unresolved merge conflicts " | ||||
|
r13541 | "(see hg help resolve)")) | ||
|
r8496 | |||
|
r10969 | cctx = context.workingctx(self, text, user, date, extra, changes) | ||
|
r8496 | if editor: | ||
|
r8994 | cctx._text = editor(self, cctx, subs) | ||
|
r9935 | edited = (text != cctx._text) | ||
|
r8813 | |||
|
r16073 | # commit subs and write new state | ||
if subs: | ||||
for s in sorted(commitsubs): | ||||
|
r11112 | sub = wctx.sub(s) | ||
self.ui.status(_('committing subrepository %s\n') % | ||||
|
r12752 | subrepo.subrelpath(sub)) | ||
|
r11112 | sr = sub.commit(cctx._text, user, date) | ||
|
r16073 | newstate[s] = (newstate[s][0], sr) | ||
subrepo.writestate(self, newstate) | ||||
|
r8813 | |||
|
r9934 | # Save commit message in case this transaction gets rolled back | ||
|
r9949 | # (e.g. by a pretxncommit hook). Leave the content alone on | ||
# the assumption that the user will use the same editor again. | ||||
|
r14529 | msgfn = self.savecommitmessage(cctx._text) | ||
|
r9934 | |||
|
r10970 | p1, p2 = self.dirstate.parents() | ||
hookp1, hookp2 = hex(p1), (p2 != nullid and hex(p2) or '') | ||||
|
r9935 | try: | ||
|
r10492 | self.hook("precommit", throw=True, parent1=hookp1, parent2=hookp2) | ||
|
r9935 | ret = self.commitctx(cctx, True) | ||
except: | ||||
if edited: | ||||
self.ui.write( | ||||
_('note: commit message saved in %s\n') % msgfn) | ||||
raise | ||||
|
r8496 | |||
|
r13357 | # update bookmarks, dirstate and mergestate | ||
|
r14498 | bookmarks.update(self, p1, ret) | ||
|
r8416 | for f in changes[0] + changes[1]: | ||
self.dirstate.normal(f) | ||||
for f in changes[2]: | ||||
|
r14434 | self.dirstate.drop(f) | ||
|
r8416 | self.dirstate.setparents(ret) | ||
|
r8503 | ms.reset() | ||
|
r6710 | finally: | ||
|
r8405 | wlock.release() | ||
|
r6710 | |||
|
r16680 | def commithook(node=hex(ret), parent1=hookp1, parent2=hookp2): | ||
self.hook("commit", node=node, parent1=parent1, parent2=parent2) | ||||
self._afterlock(commithook) | ||||
|
r10492 | return ret | ||
|
r8496 | def commitctx(self, ctx, error=False): | ||
|
r7077 | """Add a new revision to current repository. | ||
|
r8410 | Revision information is passed via the context argument. | ||
|
r7077 | """ | ||
|
r6715 | |||
|
r8412 | tr = lock = None | ||
|
r12899 | removed = list(ctx.removed()) | ||
|
r8414 | p1, p2 = ctx.p1(), ctx.p2() | ||
|
r8412 | user = ctx.user() | ||
|
r1089 | |||
|
r8411 | lock = self.lock() | ||
try: | ||||
|
r10881 | tr = self.transaction("commit") | ||
|
r4970 | trp = weakref.proxy(tr) | ||
|
r1089 | |||
|
r14162 | if ctx.files(): | ||
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: | ||||
|
r4915 | self.ui.warn(_("trouble committing %s!\n") % f) | ||
raise | ||||
|
r14162 | except IOError, inst: | ||
errcode = getattr(inst, 'errno', errno.ENOENT) | ||||
if error or errcode and errcode != errno.ENOENT: | ||||
self.ui.warn(_("trouble committing %s!\n") % f) | ||||
raise | ||||
else: | ||||
removed.append(f) | ||||
|
r1089 | |||
|
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 = [] | ||||
|
r1089 | |||
|
r8499 | # update changelog | ||
|
r7787 | self.changelog.delayupdate() | ||
|
r14162 | n = self.changelog.add(mn, files, ctx.description(), | ||
|
r8499 | trp, p1.node(), p2.node(), | ||
|
r8412 | user, ctx.date(), ctx.extra().copy()) | ||
|
r7787 | p = lambda: self.changelog.writepending() and self.root or "" | ||
|
r10492 | xp1, xp2 = p1.hex(), p2 and p2.hex() or '' | ||
|
r4915 | self.hook('pretxncommit', throw=True, node=hex(n), parent1=xp1, | ||
|
r7787 | parent2=xp2, pending=p) | ||
self.changelog.finalize(trp) | ||||
|
r15706 | # set the new commit is proper phase | ||
|
r16030 | targetphase = phases.newcommitphase(self.ui) | ||
|
r15706 | if targetphase: | ||
# retract boundary do not alter parent changeset. | ||||
# if a parent have higher the resulting phase will | ||||
# be compliant anyway | ||||
# | ||||
# if minimal phase was 0 we don't need to retract anything | ||||
phases.retractboundary(self, targetphase, [n]) | ||||
|
r4915 | tr.close() | ||
|
r15886 | self.updatebranchcache() | ||
|
r4915 | return n | ||
finally: | ||||
|
r11230 | if tr: | ||
tr.release() | ||||
|
r8405 | lock.release() | ||
|
r1089 | |||
|
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 | ||||
|
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. | ||||
|
r10547 | self.invalidatecaches() | ||
|
r9150 | |||
|
r6585 | def walk(self, match, node=None): | ||
|
r3532 | ''' | ||
walk recursively through the directory tree or a given | ||||
changeset, finding all files matched by the match | ||||
function | ||||
''' | ||||
|
r6764 | return self[node].walk(match) | ||
|
r3532 | |||
|
r6769 | def status(self, node1='.', node2=None, match=None, | ||
|
r12166 | ignored=False, clean=False, unknown=False, | ||
listsubrepos=False): | ||||
|
r2661 | """return status of files between two nodes or node and working directory | ||
|
r1616 | |||
If node1 is None, use the first dirstate parent instead. | ||||
If node2 is None, compare node1 with working directory. | ||||
""" | ||||
|
r1089 | |||
|
r6769 | def mfmatches(ctx): | ||
mf = ctx.manifest().copy() | ||||
|
r1089 | for fn in mf.keys(): | ||
if not match(fn): | ||||
del mf[fn] | ||||
return mf | ||||
|
r7090 | if isinstance(node1, context.changectx): | ||
ctx1 = node1 | ||||
else: | ||||
ctx1 = self[node1] | ||||
if isinstance(node2, context.changectx): | ||||
ctx2 = node2 | ||||
else: | ||||
ctx2 = self[node2] | ||||
|
r7435 | working = ctx2.rev() is None | ||
|
r6769 | parentworking = working and ctx1 == self['.'] | ||
|
r10651 | match = match or matchmod.always(self.root, self.getcwd()) | ||
|
r6753 | listignored, listclean, listunknown = ignored, clean, unknown | ||
|
r2474 | |||
|
r7090 | # load earliest manifest first for caching reasons | ||
if not working and ctx2.rev() < ctx1.rev(): | ||||
ctx2.manifest() | ||||
|
r7067 | if not parentworking: | ||
def bad(f, msg): | ||||
|
r16144 | # 'f' may be a directory pattern from 'match.files()', | ||
# so 'f not in ctx1' is not enough | ||||
if f not in ctx1 and f not in ctx1.dirs(): | ||||
|
r7067 | self.ui.warn('%s: %s\n' % (self.dirstate.pathto(f), msg)) | ||
match.bad = bad | ||||
|
r6770 | if working: # we need to scan the working dir | ||
|
r11227 | subrepos = [] | ||
if '.hgsub' in self.dirstate: | ||||
|
r14870 | subrepos = ctx2.substate.keys() | ||
|
r10176 | s = self.dirstate.status(match, subrepos, listignored, | ||
listclean, listunknown) | ||||
|
r6770 | cmp, modified, added, removed, deleted, unknown, ignored, clean = s | ||
|
r1089 | |||
|
r6770 | # check for any possibly clean files | ||
if parentworking and cmp: | ||||
fixup = [] | ||||
# do a full compare of any files that might have changed | ||||
|
r8395 | for f in sorted(cmp): | ||
|
r6770 | if (f not in ctx1 or ctx2.flags(f) != ctx1.flags(f) | ||
|
r11702 | or ctx1[f].cmp(ctx2[f])): | ||
|
r6770 | modified.append(f) | ||
else: | ||||
fixup.append(f) | ||||
# update dirstate for files that are actually clean | ||||
if fixup: | ||||
|
r11669 | if listclean: | ||
clean += fixup | ||||
|
r6770 | try: | ||
|
r8647 | # updating the dirstate is optional | ||
# so we don't wait on the lock | ||||
|
r8646 | wlock = self.wlock(False) | ||
|
r4915 | try: | ||
|
r6770 | for f in fixup: | ||
self.dirstate.normal(f) | ||||
|
r8646 | finally: | ||
wlock.release() | ||||
except error.LockError: | ||||
pass | ||||
|
r2661 | |||
|
r6769 | if not parentworking: | ||
mf1 = mfmatches(ctx1) | ||||
|
r6770 | if working: | ||
|
r1616 | # we are comparing working dir against non-parent | ||
# generate a pseudo-manifest for the working dir | ||||
|
r6769 | mf2 = mfmatches(self['.']) | ||
|
r6770 | for f in cmp + modified + added: | ||
|
r6769 | mf2[f] = None | ||
|
r6817 | mf2.set(f, ctx2.flags(f)) | ||
|
r1617 | for f in removed: | ||
|
r1616 | if f in mf2: | ||
del mf2[f] | ||||
|
r6770 | else: | ||
# we are comparing two revisions | ||||
deleted, unknown, ignored = [], [], [] | ||||
mf2 = mfmatches(ctx2) | ||||
|
r4372 | |||
|
r2661 | modified, added, clean = [], [], [] | ||
|
r6827 | for fn in mf2: | ||
|
r5915 | if fn in mf1: | ||
|
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]))))): | ||||
|
r1616 | modified.append(fn) | ||
|
r6753 | elif listclean: | ||
|
r2661 | clean.append(fn) | ||
|
r1616 | del mf1[fn] | ||
|
r14500 | elif fn not in deleted: | ||
|
r1616 | added.append(fn) | ||
|
r1617 | removed = mf1.keys() | ||
|
r15348 | if working and modified and not self.dirstate._checklink: | ||
# Symlink placeholders may get non-symlink-like contents | ||||
# via user error or dereferencing by NFS or Samba servers, | ||||
# so we filter out any placeholders that don't look like a | ||||
# symlink | ||||
sane = [] | ||||
for f in modified: | ||||
if ctx2.flags(f) == 'l': | ||||
d = ctx2[f].data() | ||||
if len(d) >= 1024 or '\n' in d or util.binary(d): | ||||
self.ui.debug('ignoring suspect symlink placeholder' | ||||
' "%s"\n' % f) | ||||
continue | ||||
sane.append(f) | ||||
modified = sane | ||||
|
r6827 | r = modified, added, removed, deleted, unknown, ignored, clean | ||
|
r12166 | |||
if listsubrepos: | ||||
|
r12176 | for subpath, sub in subrepo.itersubrepos(ctx1, ctx2): | ||
|
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) | ||||
|
r13412 | for l in r: | ||
l.sort() | ||||
|
r6827 | return r | ||
|
r2661 | |||
|
r8796 | def heads(self, start=None): | ||
|
r1550 | heads = self.changelog.heads(start) | ||
# sort the output in rev descending order | ||||
|
r13075 | return sorted(heads, key=self.changelog.rev, reverse=True) | ||
|
r1089 | |||
|
r8694 | def branchheads(self, branch=None, start=None, closed=False): | ||
|
r9475 | '''return a (possibly filtered) list of heads for the given branch | ||
Heads are returned in topological order, from newest to oldest. | ||||
If branch is None, use the dirstate branch. | ||||
If start is not None, return only heads reachable from start. | ||||
If closed is True, return heads that are marked as closed as well. | ||||
''' | ||||
|
r6747 | if branch is None: | ||
branch = self[None].branch() | ||||
|
r9675 | branches = self.branchmap() | ||
|
r4648 | if branch not in branches: | ||
return [] | ||||
|
r7654 | # the cache returns heads ordered lowest to highest | ||
|
r9475 | bheads = list(reversed(branches[branch])) | ||
|
r4648 | if start is not None: | ||
|
r7654 | # filter out the heads that cannot be reached from startrev | ||
|
r9475 | fbheads = set(self.changelog.nodesbetween([start], bheads)[2]) | ||
bheads = [h for h in bheads if h in fbheads] | ||||
|
r7656 | if not closed: | ||
|
r7670 | bheads = [h for h in bheads if | ||
|
r7656 | ('close' not in self.changelog.read(h)[5])] | ||
|
r7654 | return bheads | ||
|
r4648 | |||
|
r1089 | def branches(self, nodes): | ||
|
r1615 | if not nodes: | ||
nodes = [self.changelog.tip()] | ||||
|
r1089 | b = [] | ||
for n in nodes: | ||||
t = n | ||||
|
r14494 | while True: | ||
|
r1089 | p = self.changelog.parents(n) | ||
if p[1] != nullid or p[0] == nullid: | ||||
b.append((t, n, p[0], p[1])) | ||||
break | ||||
n = p[0] | ||||
return b | ||||
def between(self, pairs): | ||||
r = [] | ||||
for top, bottom in pairs: | ||||
n, l, i = top, [], 0 | ||||
f = 1 | ||||
|
r7708 | while n != bottom and n != nullid: | ||
|
r1089 | p = self.changelog.parents(n)[0] | ||
if i == f: | ||||
l.append(n) | ||||
f = f * 2 | ||||
n = p | ||||
i += 1 | ||||
r.append(l) | ||||
return r | ||||
|
r4917 | def pull(self, remote, heads=None, force=False): | ||
lock = self.lock() | ||||
|
r2827 | try: | ||
|
r11301 | tmp = discovery.findcommonincoming(self, remote, heads=heads, | ||
force=force) | ||||
common, fetch, rheads = tmp | ||||
|
r2827 | if not fetch: | ||
self.ui.status(_("no changes found\n")) | ||||
|
r15650 | added = [] | ||
|
r13364 | result = 0 | ||
else: | ||||
|
r13742 | if heads is None and list(common) == [nullid]: | ||
|
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 | ||||
|
r7415 | |||
|
r14073 | if remote.capable('getbundle'): | ||
|
r13742 | cg = remote.getbundle('pull', common=common, | ||
heads=heads or rheads) | ||||
elif heads is None: | ||||
|
r13364 | cg = remote.changegroup(fetch, 'pull') | ||
elif not remote.capable('changegroupsubset'): | ||||
|
r12067 | raise util.Abort(_("partial pull cannot be done because " | ||
|
r13364 | "other repository doesn't support " | ||
"changegroupsubset.")) | ||||
else: | ||||
cg = remote.changegroupsubset(fetch, heads, 'pull') | ||||
|
r15650 | clstart = len(self.changelog) | ||
|
r15585 | result = self.addchangegroup(cg, 'pull', remote.url()) | ||
|
r15650 | clend = len(self.changelog) | ||
added = [self.changelog.node(r) for r in xrange(clstart, clend)] | ||||
|
r15956 | # compute target subset | ||
if heads is None: | ||||
# We pulled every thing possible | ||||
# sync on everything common | ||||
subset = common + added | ||||
else: | ||||
# We pulled a specific subset | ||||
# sync on this subset | ||||
subset = heads | ||||
|
r15650 | |||
# Get remote phases data from remote | ||||
remotephases = remote.listkeys('phases') | ||||
publishing = bool(remotephases.get('publishing', False)) | ||||
if remotephases and not publishing: | ||||
# remote is new and unpublishing | ||||
|
r15892 | pheads, _dr = phases.analyzeremotephases(self, subset, | ||
remotephases) | ||||
phases.advanceboundary(self, phases.public, pheads) | ||||
|
r15956 | phases.advanceboundary(self, phases.draft, subset) | ||
|
r15650 | else: | ||
# Remote is old or publishing all common changesets | ||||
# should be seen as public | ||||
|
r15956 | phases.advanceboundary(self, phases.public, subset) | ||
|
r2827 | finally: | ||
|
r8109 | lock.release() | ||
|
r1089 | |||
|
r13364 | return result | ||
|
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 | ||||
|
r11211 | def push(self, remote, force=False, revs=None, newbranch=False): | ||
|
r11153 | '''Push outgoing changesets (limited by revs) from the current | ||
repository to remote. Return an integer: | ||||
|
r16023 | - None means nothing to push | ||
- 0 means HTTP error | ||||
|
r11153 | - 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() | ||||
''' | ||||
|
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). | ||||
|
r1089 | |||
|
r15952 | # get local lock as we might write phase data | ||
locallock = self.lock() | ||||
|
r4915 | try: | ||
|
r15952 | self.checkpush(force, revs) | ||
lock = None | ||||
unbundle = remote.capable('unbundle') | ||||
if not unbundle: | ||||
lock = remote.lock() | ||||
|
r15485 | try: | ||
|
r15932 | # discovery | ||
fci = discovery.findcommonincoming | ||||
commoninc = fci(self, remote, force=force) | ||||
common, inc, remoteheads = commoninc | ||||
fco = discovery.findcommonoutgoing | ||||
outgoing = fco(self, remote, onlyheads=revs, | ||||
commoninc=commoninc, force=force) | ||||
if not outgoing.missing: | ||||
# nothing to push | ||||
|
r15993 | scmutil.nochangesfound(self.ui, outgoing.excluded) | ||
|
r16023 | ret = None | ||
|
r15932 | else: | ||
# something to push | ||||
if not force: | ||||
discovery.checkheads(self, remote, outgoing, | ||||
|
r15986 | remoteheads, newbranch, | ||
bool(inc)) | ||||
|
r15932 | |||
# create a changegroup from local | ||||
if revs is None and not outgoing.excluded: | ||||
# push everything, | ||||
# use the fast path, no race possible on push | ||||
cg = self._changegroup(outgoing.missing, 'push') | ||||
else: | ||||
cg = self.getlocalbundle('push', outgoing) | ||||
# apply changegroup to remote | ||||
|
r15485 | 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: | ||||
|
r15932 | remoteheads = ['force'] | ||
|
r15485 | # ssh: return remote's addchangegroup() | ||
# http: return remote's addchangegroup() or 0 for error | ||||
|
r15932 | ret = remote.unbundle(cg, remoteheads, 'push') | ||
|
r15485 | else: | ||
# we return an integer indicating remote head count change | ||||
|
r15585 | ret = remote.addchangegroup(cg, 'push', self.url()) | ||
|
r15651 | |||
|
r15933 | if ret: | ||
|
r15956 | # push succeed, synchonize target of the push | ||
cheads = outgoing.missingheads | ||||
elif revs is None: | ||||
# All out push fails. synchronize all common | ||||
cheads = outgoing.commonheads | ||||
else: | ||||
# I want cheads = heads(::missingheads and ::commonheads) | ||||
# (missingheads is revs with secret changeset filtered out) | ||||
# | ||||
# This can be expressed as: | ||||
# cheads = ( (missingheads and ::commonheads) | ||||
# + (commonheads and ::missingheads))" | ||||
# ) | ||||
# | ||||
# while trying to push we already computed the following: | ||||
# common = (::commonheads) | ||||
# missing = ((commonheads::missingheads) - commonheads) | ||||
# | ||||
# We can pick: | ||||
# * missingheads part of comon (::commonheads) | ||||
common = set(outgoing.common) | ||||
|
r16020 | cheads = [node for node in revs if node in common] | ||
|
r15956 | # and | ||
# * commonheads parents on missing | ||||
|
r16020 | revset = self.set('%ln and parents(roots(%ln))', | ||
outgoing.commonheads, | ||||
outgoing.missing) | ||||
cheads.extend(c.node() for c in revset) | ||||
|
r15651 | # even when we don't push, exchanging phase data is useful | ||
remotephases = remote.listkeys('phases') | ||||
if not remotephases: # old server or public only repo | ||||
|
r15933 | phases.advanceboundary(self, phases.public, cheads) | ||
|
r15651 | # don't push any phase data as there is nothing to push | ||
|
r13364 | else: | ||
|
r15933 | ana = phases.analyzeremotephases(self, cheads, remotephases) | ||
|
r15892 | pheads, droots = ana | ||
|
r15651 | ### Apply remote phase on local | ||
if remotephases.get('publishing', False): | ||||
|
r15933 | phases.advanceboundary(self, phases.public, cheads) | ||
|
r15651 | else: # publish = False | ||
|
r15892 | phases.advanceboundary(self, phases.public, pheads) | ||
|
r15933 | phases.advanceboundary(self, phases.draft, cheads) | ||
|
r15651 | ### Apply local phase on remote | ||
|
r15820 | |||
|
r15892 | # Get the list of all revs draft on remote by public here. | ||
# XXX Beware that revset break if droots is not strictly | ||||
# XXX root we may want to ensure it is but it is costly | ||||
outdated = self.set('heads((%ln::%ln) and public())', | ||||
|
r15933 | droots, cheads) | ||
|
r15892 | for newremotehead in outdated: | ||
|
r15820 | r = remote.pushkey('phases', | ||
newremotehead.hex(), | ||||
|
r15892 | str(phases.draft), | ||
str(phases.public)) | ||||
|
r15820 | if not r: | ||
|
r15892 | self.ui.warn(_('updating %s to public failed!\n') | ||
% newremotehead) | ||||
|
r15485 | finally: | ||
|
r15952 | if lock is not None: | ||
lock.release() | ||||
|
r4915 | finally: | ||
|
r15952 | locallock.release() | ||
|
r1089 | |||
|
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 | ||||
|
r5763 | def changegroupinfo(self, nodes, source): | ||
if self.ui.verbose or source == 'bundle': | ||||
self.ui.status(_("%d changesets found\n") % len(nodes)) | ||||
|
r3513 | if self.ui.debugflag: | ||
|
r9467 | self.ui.debug("list of changesets:\n") | ||
|
r3513 | for node in nodes: | ||
self.ui.debug("%s\n" % hex(node)) | ||||
|
r13703 | def changegroupsubset(self, bases, heads, source): | ||
|
r9437 | """Compute a changegroup consisting of all the nodes that are | ||
|
r14549 | descendants of any of the bases and ancestors of any of the heads. | ||
|
r9437 | Return a chunkbuffer object whose read() method will return | ||
successive changegroup chunks. | ||||
|
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 | ||||
|
r5908 | the changegroup a particular filenode or manifestnode belongs to. | ||
""" | ||||
|
r9820 | cl = self.changelog | ||
if not bases: | ||||
bases = [nullid] | ||||
|
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) | ||||
|
r15837 | def getlocalbundle(self, source, outgoing): | ||
"""Like getbundle, but taking a discovery.outgoing as an argument. | ||||
This is only implemented for local repos and reuses potentially | ||||
precomputed sets in outgoing.""" | ||||
if not outgoing.missing: | ||||
return None | ||||
return self._changegroupsubset(outgoing.common, | ||||
outgoing.missing, | ||||
outgoing.missingheads, | ||||
source) | ||||
|
r13741 | 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]. | ||||
|
r9820 | |||
|
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() | ||||
|
r15837 | return self.getlocalbundle(source, | ||
discovery.outgoing(cl, common, heads)) | ||||
|
r13741 | |||
def _changegroupsubset(self, commonrevs, csets, heads, source): | ||||
|
r1466 | |||
|
r9820 | cl = self.changelog | ||
|
r13706 | mf = self.manifest | ||
mfs = {} # needed manifests | ||||
fnodes = {} # needed file nodes | ||||
|
r13812 | changedfiles = set() | ||
|
r13829 | fstate = ['', {}] | ||
|
r16421 | count = [0, 0] | ||
|
r13706 | |||
|
r13703 | # can we go through the fast path ? | ||
heads.sort() | ||||
|
r13707 | if heads == sorted(self.heads()): | ||
|
r13706 | return self._changegroup(csets, source) | ||
|
r7233 | |||
|
r9820 | # slow path | ||
|
r1736 | self.hook('preoutgoing', throw=True, source=source) | ||
|
r13706 | self.changegroupinfo(csets, source) | ||
|
r1458 | |||
|
r13810 | # filter any nodes that claim to be part of the known set | ||
def prune(revlog, missing): | ||||
|
r16426 | rr, rl = revlog.rev, revlog.linkrev | ||
|
r14521 | return [n for n in missing | ||
|
r16426 | if rl(rr(n)) not in commonrevs] | ||
|
r1458 | |||
|
r16420 | progress = self.ui.progress | ||
_bundling = _('bundling') | ||||
_changesets = _('changesets') | ||||
_manifests = _('manifests') | ||||
_files = _('files') | ||||
|
r13830 | def lookup(revlog, x): | ||
if revlog == cl: | ||||
c = cl.read(x) | ||||
changedfiles.update(c[3]) | ||||
mfs.setdefault(c[0], x) | ||||
count[0] += 1 | ||||
|
r16420 | progress(_bundling, count[0], | ||
|
r16421 | unit=_changesets, total=count[1]) | ||
|
r13830 | return x | ||
elif revlog == mf: | ||||
clnode = mfs[x] | ||||
mdata = mf.readfast(x) | ||||
|
r16422 | for f, n in mdata.iteritems(): | ||
|
r16419 | if f in changedfiles: | ||
|
r16422 | fnodes[f].setdefault(n, clnode) | ||
|
r13830 | count[0] += 1 | ||
|
r16420 | progress(_bundling, count[0], | ||
|
r16421 | unit=_manifests, total=count[1]) | ||
|
r16422 | return clnode | ||
|
r13830 | else: | ||
|
r16420 | progress(_bundling, count[0], item=fstate[0], | ||
|
r16421 | unit=_files, total=count[1]) | ||
|
r13830 | return fstate[1][x] | ||
|
r1458 | |||
|
r13831 | bundler = changegroup.bundle10(lookup) | ||
|
r14365 | reorder = self.ui.config('bundle', 'reorder', 'auto') | ||
if reorder == 'auto': | ||||
reorder = None | ||||
else: | ||||
reorder = util.parsebool(reorder) | ||||
|
r1089 | |||
def gengroup(): | ||||
|
r1466 | # Create a changenode group generator that will call our functions | ||
# back to lookup the owning changenode and collect information. | ||||
|
r16421 | count[:] = [0, len(csets)] | ||
|
r14365 | for chunk in cl.group(csets, bundler, reorder=reorder): | ||
|
r13709 | yield chunk | ||
|
r16420 | progress(_bundling, None) | ||
|
r10432 | |||
|
r1466 | # Create a generator for the manifestnodes that calls our lookup | ||
# and data collection functions back. | ||||
|
r16422 | for f in changedfiles: | ||
fnodes[f] = {} | ||||
|
r16421 | count[:] = [0, len(mfs)] | ||
|
r14365 | for chunk in mf.group(prune(mf, mfs), bundler, reorder=reorder): | ||
|
r13709 | yield chunk | ||
|
r16420 | progress(_bundling, None) | ||
|
r1466 | |||
|
r13706 | mfs.clear() | ||
|
r1466 | |||
# Go through all our files in order sorted by name. | ||||
|
r16421 | count[:] = [0, len(changedfiles)] | ||
|
r13829 | for fname in sorted(changedfiles): | ||
|
r1458 | filerevlog = self.file(fname) | ||
|
r6750 | if not len(filerevlog): | ||
|
r5666 | raise util.Abort(_("empty or missing revlog for %s") % fname) | ||
|
r13829 | fstate[0] = fname | ||
fstate[1] = fnodes.pop(fname, {}) | ||||
|
r13783 | |||
|
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 | ||||
|
r1466 | # Signal that no more groups are left. | ||
|
r13831 | yield bundler.close() | ||
|
r16420 | progress(_bundling, None) | ||
|
r1089 | |||
|
r13706 | if csets: | ||
self.hook('outgoing', node=hex(csets[0]), source=source) | ||||
|
r1736 | |||
|
r12337 | return changegroup.unbundle10(util.chunkbuffer(gengroup()), 'UN') | ||
|
r1458 | |||
|
r1736 | def changegroup(self, basenodes, source): | ||
|
r7233 | # to avoid a race we use changegroupsubset() (issue1320) | ||
return self.changegroupsubset(basenodes, self.heads(), source) | ||||
|
r9820 | def _changegroup(self, nodes, source): | ||
|
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. | ||||
|
r1466 | |||
This is much easier than the previous function as we can assume that | ||||
|
r7233 | the recipient has any changenode we aren't sending them. | ||
|
r9820 | nodes is the set of nodes to send""" | ||
|
r1736 | |||
|
r13812 | cl = self.changelog | ||
mf = self.manifest | ||||
mfs = {} | ||||
changedfiles = set() | ||||
|
r13829 | fstate = [''] | ||
|
r16421 | count = [0, 0] | ||
|
r1736 | |||
|
r13812 | self.hook('preoutgoing', throw=True, source=source) | ||
|
r5763 | self.changegroupinfo(nodes, source) | ||
|
r1458 | |||
|
r8152 | revset = set([cl.rev(n) for n in nodes]) | ||
|
r1089 | |||
|
r6750 | def gennodelst(log): | ||
|
r16425 | ln, llr = log.node, log.linkrev | ||
return [ln(r) for r in log if llr(r) in revset] | ||||
|
r16420 | progress = self.ui.progress | ||
_bundling = _('bundling') | ||||
_changesets = _('changesets') | ||||
_manifests = _('manifests') | ||||
_files = _('files') | ||||
|
r1458 | |||
|
r13830 | def lookup(revlog, x): | ||
if revlog == cl: | ||||
c = cl.read(x) | ||||
changedfiles.update(c[3]) | ||||
mfs.setdefault(c[0], x) | ||||
count[0] += 1 | ||||
|
r16420 | progress(_bundling, count[0], | ||
|
r16421 | unit=_changesets, total=count[1]) | ||
|
r13830 | return x | ||
elif revlog == mf: | ||||
count[0] += 1 | ||||
|
r16420 | progress(_bundling, count[0], | ||
|
r16421 | unit=_manifests, total=count[1]) | ||
|
r13830 | return cl.node(revlog.linkrev(revlog.rev(x))) | ||
else: | ||||
|
r16420 | progress(_bundling, count[0], item=fstate[0], | ||
|
r16421 | total=count[1], unit=_files) | ||
|
r13830 | return cl.node(revlog.linkrev(revlog.rev(x))) | ||
|
r13829 | |||
|
r13831 | bundler = changegroup.bundle10(lookup) | ||
|
r14365 | reorder = self.ui.config('bundle', 'reorder', 'auto') | ||
if reorder == 'auto': | ||||
reorder = None | ||||
else: | ||||
reorder = util.parsebool(reorder) | ||||
|
r1458 | |||
def gengroup(): | ||||
|
r9437 | '''yield a sequence of changegroup chunks (strings)''' | ||
|
r1089 | # construct a list of all changed files | ||
|
r1458 | |||
|
r16421 | count[:] = [0, len(nodes)] | ||
|
r14365 | for chunk in cl.group(nodes, bundler, reorder=reorder): | ||
|
r13716 | yield chunk | ||
|
r16420 | progress(_bundling, None) | ||
|
r1089 | |||
|
r16421 | count[:] = [0, len(mfs)] | ||
|
r14365 | for chunk in mf.group(gennodelst(mf), bundler, reorder=reorder): | ||
|
r13716 | yield chunk | ||
|
r16420 | progress(_bundling, None) | ||
|
r1089 | |||
|
r16421 | count[:] = [0, len(changedfiles)] | ||
|
r13829 | for fname in sorted(changedfiles): | ||
|
r1458 | filerevlog = self.file(fname) | ||
|
r6750 | if not len(filerevlog): | ||
|
r5666 | raise util.Abort(_("empty or missing revlog for %s") % fname) | ||
|
r13829 | fstate[0] = fname | ||
|
r14522 | nodelist = gennodelst(filerevlog) | ||
if nodelist: | ||||
count[0] += 1 | ||||
yield bundler.fileheader(fname) | ||||
for chunk in filerevlog.group(nodelist, bundler, reorder): | ||||
yield chunk | ||||
|
r13831 | yield bundler.close() | ||
|
r16420 | progress(_bundling, None) | ||
|
r1089 | |||
|
r2107 | if nodes: | ||
self.hook('outgoing', node=hex(nodes[0]), source=source) | ||||
|
r1089 | |||
|
r12337 | return changegroup.unbundle10(util.chunkbuffer(gengroup()), 'UN') | ||
|
r1089 | |||
|
r15585 | def addchangegroup(self, source, srctype, url, emptyok=False): | ||
|
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. | ||||
|
r1089 | |||
|
r11153 | Return an integer summarizing the change to this repo: | ||
|
r3803 | - nothing changed or no source: 0 | ||
- more heads than before: 1+added heads (2..n) | ||||
|
r11153 | - fewer heads than before: -1-removed heads (-2..-n) | ||
|
r3803 | - number of heads stays the same: 1 | ||
""" | ||||
|
r1089 | def csmap(x): | ||
|
r9467 | self.ui.debug("add changeset %s\n" % short(x)) | ||
|
r6750 | return len(cl) | ||
|
r1089 | |||
def revmap(x): | ||||
|
r1998 | return cl.rev(x) | ||
|
r1089 | |||
|
r1615 | if not source: | ||
|
r2019 | return 0 | ||
|
r1730 | |||
|
r2673 | self.hook('prechangegroup', throw=True, source=srctype, url=url) | ||
|
r1730 | |||
|
r1089 | changesets = files = revisions = 0 | ||
|
r10888 | efiles = set() | ||
|
r1089 | |||
|
r2395 | # write changelog data to temp files so concurrent readers will not see | ||
# inconsistent view | ||||
|
r4261 | cl = self.changelog | ||
cl.delayupdate() | ||||
|
r14036 | oldheads = cl.heads() | ||
|
r1998 | |||
|
r14076 | tr = self.transaction("\n".join([srctype, util.hidepassword(url)])) | ||
|
r4915 | try: | ||
|
r4970 | trp = weakref.proxy(tr) | ||
|
r4915 | # pull off the changeset group | ||
self.ui.status(_("adding changesets\n")) | ||||
|
r8393 | clstart = len(cl) | ||
|
r10430 | class prog(object): | ||
|
r10496 | step = _('changesets') | ||
|
r10430 | count = 1 | ||
ui = self.ui | ||||
|
r10888 | total = None | ||
|
r10430 | def __call__(self): | ||
|
r10888 | self.ui.progress(self.step, self.count, unit=_('chunks'), | ||
total=self.total) | ||||
|
r10430 | self.count += 1 | ||
pr = prog() | ||||
|
r12334 | source.callback = pr | ||
|
r14144 | source.changelogheader() | ||
|
r15890 | srccontent = cl.addgroup(source, csmap, trp) | ||
if not (srccontent or emptyok): | ||||
|
r4915 | raise util.Abort(_("received changelog group is empty")) | ||
|
r8393 | clend = len(cl) | ||
changesets = clend - clstart | ||||
|
r10888 | for c in xrange(clstart, clend): | ||
efiles.update(self[c].files()) | ||||
efiles = len(efiles) | ||||
|
r10496 | self.ui.progress(_('changesets'), None) | ||
|
r1089 | |||
|
r4915 | # pull off the manifest group | ||
self.ui.status(_("adding manifests\n")) | ||||
|
r10496 | pr.step = _('manifests') | ||
|
r10430 | pr.count = 1 | ||
|
r10888 | pr.total = changesets # manifests <= changesets | ||
|
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 | ||||
|
r14144 | source.manifestheader() | ||
|
r12335 | self.manifest.addgroup(source, revmap, trp) | ||
|
r10496 | self.ui.progress(_('manifests'), None) | ||
|
r1089 | |||
|
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) | ||||
|
r4915 | # process the files | ||
self.ui.status(_("adding file changes\n")) | ||||
|
r14756 | pr.step = _('files') | ||
|
r10430 | pr.count = 1 | ||
|
r10888 | pr.total = efiles | ||
|
r12334 | source.callback = None | ||
|
r14494 | while True: | ||
|
r14144 | chunkdata = source.filelogheader() | ||
if not chunkdata: | ||||
|
r4915 | break | ||
|
r14144 | f = chunkdata["filename"] | ||
|
r9467 | self.ui.debug("adding %s revisions\n" % f) | ||
|
r10888 | pr() | ||
|
r4915 | fl = self.file(f) | ||
|
r6750 | o = len(fl) | ||
|
r15890 | if not fl.addgroup(source, revmap, trp): | ||
|
r4915 | raise util.Abort(_("received file revlog group is empty")) | ||
|
r6750 | revisions += len(fl) - o | ||
|
r4915 | files += 1 | ||
|
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] | ||||
|
r10496 | self.ui.progress(_('files'), None) | ||
|
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))) | ||||
|
r4915 | |||
|
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 | ||||
|
r1998 | |||
|
r4915 | self.ui.status(_("added %d changesets" | ||
" with %d changes to %d files%s\n") | ||||
|
r14036 | % (changesets, revisions, files, htext)) | ||
|
r1089 | |||
|
r4915 | if changesets > 0: | ||
|
r8392 | p = lambda: cl.writepending() and self.root or "" | ||
|
r4915 | self.hook('pretxnchangegroup', throw=True, | ||
|
r8393 | node=hex(cl.node(clstart)), source=srctype, | ||
|
r7787 | url=url, pending=p) | ||
|
r15484 | added = [cl.node(r) for r in xrange(clstart, clend)] | ||
|
r15659 | publishing = self.ui.configbool('phases', 'publish', True) | ||
|
r15891 | if srctype == 'push': | ||
|
r15659 | # Old server can not push the boundary themself. | ||
|
r15891 | # New server won't push the boundary if changeset already | ||
# existed locally as secrete | ||||
# | ||||
# We should not use added here but the list of all change in | ||||
# the bundle | ||||
if publishing: | ||||
phases.advanceboundary(self, phases.public, srccontent) | ||||
else: | ||||
phases.advanceboundary(self, phases.draft, srccontent) | ||||
phases.retractboundary(self, phases.draft, added) | ||||
elif srctype != 'strip': | ||||
# publishing only alter behavior during push | ||||
# | ||||
# strip should not touch boundary at all | ||||
|
r15818 | phases.retractboundary(self, phases.draft, added) | ||
|
r15646 | |||
|
r7787 | # make changelog see real files again | ||
cl.finalize(trp) | ||||
|
r1089 | |||
|
r4915 | tr.close() | ||
|
r15584 | |||
|
r15586 | if changesets > 0: | ||
def runhooks(): | ||||
|
r15584 | # forcefully update the on-disk branch cache | ||
self.ui.debug("updating the branch cache\n") | ||||
self.updatebranchcache() | ||||
self.hook("changegroup", node=hex(cl.node(clstart)), | ||||
source=srctype, url=url) | ||||
for n in added: | ||||
self.hook("incoming", node=hex(n), source=srctype, | ||||
url=url) | ||||
|
r15587 | self._afterlock(runhooks) | ||
|
r15584 | |||
|
r4915 | finally: | ||
|
r11230 | tr.release() | ||
|
r3803 | # never return 0 here: | ||
|
r14036 | if dh < 0: | ||
return dh - 1 | ||||
|
r3803 | else: | ||
|
r14036 | return dh + 1 | ||
|
r1089 | |||
|
r12296 | def stream_in(self, remote, requirements): | ||
|
r13390 | lock = self.lock() | ||
|
r3564 | try: | ||
|
r13390 | fp = remote.stream_out() | ||
|
r3564 | l = fp.readline() | ||
try: | ||||
|
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)) | ||||
|
r7063 | except (ValueError, TypeError): | ||
|
r7641 | raise error.ResponseError( | ||
|
r3564 | _('Unexpected response from remote server:'), l) | ||
|
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) | ||||
|
r16398 | if self.ui.debugflag: | ||
self.ui.debug('adding %s (%s)\n' % | ||||
(name, util.bytecount(size))) | ||||
|
r13390 | # 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))) | ||||
|
r12296 | |||
|
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() | ||||
|
r12296 | |||
|
r13390 | self.invalidate() | ||
return len(self.heads()) + 1 | ||||
finally: | ||||
lock.release() | ||||
|
r1089 | |||
|
r2613 | def clone(self, remote, heads=[], stream=False): | ||
|
r2612 | '''clone remote repository. | ||
|
r1382 | |||
|
r2612 | keyword arguments: | ||
heads: list of revs to clone (forces use of pull) | ||||
|
r2621 | stream: use streaming clone if possible''' | ||
|
r1089 | |||
|
r2621 | # now, all clients that can request uncompressed clones can | ||
# read repo formats supported by all servers that can serve | ||||
# them. | ||||
|
r1089 | |||
|
r2612 | # if revlog format changes, client will have to check version | ||
|
r2621 | # and format flags on "stream" capability, and use | ||
# uncompressed only if compatible. | ||||
|
r1089 | |||
|
r16361 | if not stream: | ||
# if the server explicitely prefer to stream (for fast LANs) | ||||
stream = remote.capable('stream-preferred') | ||||
|
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) | ||||
|
r2612 | return self.pull(remote, heads) | ||
|
r1806 | |||
|
r11368 | def pushkey(self, namespace, key, old, new): | ||
|
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 | ||||
|
r11368 | |||
def listkeys(self, namespace): | ||||
|
r14102 | self.hook('prelistkeys', throw=True, namespace=namespace) | ||
values = pushkey.list(self, namespace) | ||||
self.hook('listkeys', namespace=namespace, values=values) | ||||
return values | ||||
|
r11368 | |||
|
r14048 | def debugwireargs(self, one, two, three=None, four=None, five=None): | ||
|
r13720 | '''used to test argument passing over the wire''' | ||
|
r14048 | return "%s %s %s %s %s" % (one, two, three, four, five) | ||
|
r11368 | |||
|
r14529 | def savecommitmessage(self, text): | ||
fp = self.opener('last-message.txt', 'wb') | ||||
try: | ||||
fp.write(text) | ||||
finally: | ||||
fp.close() | ||||
return self.pathto(fp.name[len(self.root)+1:]) | ||||
|
r1806 | # used to avoid circular references so destructors work | ||
|
r3790 | def aftertrans(files): | ||
renamefiles = [tuple(t) for t in files] | ||||
|
r1806 | def a(): | ||
|
r3790 | for src, dest in renamefiles: | ||
|
r16441 | try: | ||
util.rename(src, dest) | ||||
except OSError: # journal file does not yet exist | ||||
pass | ||||
|
r1806 | return a | ||
|
r14266 | def undoname(fn): | ||
base, name = os.path.split(fn) | ||||
assert name.startswith('journal') | ||||
return os.path.join(base, name.replace('journal', 'undo', 1)) | ||||
|
r2740 | def instance(ui, path, create): | ||
|
r14825 | return localrepository(ui, util.urllocalpath(path), create) | ||
|
r3223 | |||
|
r2740 | def islocal(path): | ||
return True | ||||