localrepo.py
2142 lines
| 80.8 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 _ | ||
|
r8813 | import repo, changegroup, subrepo | ||
|
r8312 | import changelog, dirstate, filelog, manifest, context | ||
|
r8390 | import lock, transaction, store, encoding | ||
|
r8312 | import util, extensions, hook, error | ||
|
r6603 | import match as match_ | ||
|
r6888 | import merge as merge_ | ||
|
r9149 | import tags as tags_ | ||
|
r8109 | from lock import release | ||
|
r8731 | import weakref, stat, errno, os, time, inspect | ||
|
r8260 | propertycache = util.propertycache | ||
|
r8109 | |||
|
r2612 | class localrepository(repo.repository): | ||
|
r8562 | capabilities = set(('lookup', 'changegroupsubset', 'branchmap')) | ||
|
r8799 | supported = set('revlogv1 store fncache shared'.split()) | ||
|
r2439 | |||
|
r8189 | def __init__(self, baseui, path=None, create=0): | ||
|
r2612 | repo.repository.__init__(self) | ||
|
r3850 | self.root = os.path.realpath(path) | ||
|
r4170 | self.path = os.path.join(self.root, ".hg") | ||
|
r3850 | self.origroot = path | ||
self.opener = util.opener(self.path) | ||||
self.wopener = util.opener(self.root) | ||||
|
r8797 | self.baseui = baseui | ||
self.ui = baseui.copy() | ||||
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): | ||||
os.mkdir(path) | ||||
os.mkdir(self.path) | ||||
|
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") | ||
|
r4166 | # create an invalid changelog | ||
self.opener("00changelog.i", "a").write( | ||||
'\0\0\0\2' # represents revlogv2 | ||||
' dummy changelog to prevent using the old repo layout' | ||||
) | ||||
|
r3851 | reqfile = self.opener("requires", "w") | ||
for r in requirements: | ||||
reqfile.write("%s\n" % r) | ||||
reqfile.close() | ||||
|
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: | ||
# find requirements | ||||
|
r8262 | requirements = set() | ||
|
r3851 | try: | ||
|
r8262 | requirements = set(self.opener("requires").read().splitlines()) | ||
|
r3851 | except IOError, inst: | ||
if inst.errno != errno.ENOENT: | ||||
raise | ||||
|
r8262 | for r in requirements - self.supported: | ||
raise error.RepoError(_("requirement '%s' not supported") % r) | ||||
|
r1089 | |||
|
r8799 | self.sharedpath = self.path | ||
try: | ||||
s = os.path.realpath(self.opener("sharedpath").read()) | ||||
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 | ||||
self.store = store.store(requirements, self.sharedpath, util.opener) | ||||
|
r6840 | self.spath = self.store.path | ||
self.sopener = self.store.opener | ||||
self.sjoin = self.store.join | ||||
self.opener.createmode = self.store.createmode | ||||
|
r10322 | self.sopener.options = {} | ||
|
r3850 | |||
|
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 | ||||
|
r9674 | self._branchcache = None # in UTF-8 | ||
|
r6121 | self._branchcachetip = None | ||
|
r1089 | self.nodetagscache = None | ||
|
r4004 | self.filterpats = {} | ||
|
r5966 | self._datafilters = {} | ||
|
r4916 | self._transref = self._lockref = self._wlockref = None | ||
|
r1089 | |||
|
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') | ||||
|
r10322 | self.sopener.options['defversion'] = c.version | ||
|
r8260 | return c | ||
@propertycache | ||||
def manifest(self): | ||||
return manifest.manifest(self.sopener) | ||||
@propertycache | ||||
def dirstate(self): | ||||
return dirstate.dirstate(self.opener, self.ui, self.root) | ||||
|
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 | |||
|
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) | ||
|
r6321 | for name in names: | ||
self.hook('pretag', throw=True, node=hex(node), tag=name, | ||||
local=local) | ||||
|
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 | ||
|
r9146 | if self._tagtypes and name in self._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+') | ||||
except IOError: | ||||
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 | |||
|
r8402 | if '.hgtags' not in self.dirstate: | ||
|
r4118 | self.add(['.hgtags']) | ||
|
r8705 | m = match_.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''' | ||||
|
r2875 | for x in self.status()[:5]: | ||
|
r2601 | if '.hgtags' in x: | ||
raise util.Abort(_('working copy of .hgtags is changed ' | ||||
'(please commit .hgtags manually)')) | ||||
|
r7814 | self.tags() # instantiate the cache | ||
|
r6321 | self._tag(names, node, message, local, user, date) | ||
|
r2601 | |||
|
r1089 | def tags(self): | ||
'''return a mapping of tag to node''' | ||||
|
r9146 | if self._tags is None: | ||
(self._tags, self._tagtypes) = self._findtags() | ||||
|
r9145 | |||
|
r9146 | return self._tags | ||
|
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 | |||
|
r9149 | tags_.findglobaltags(self.ui, self, alltags, tagtypes) | ||
tags_.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: | ||||
|
r9152 | 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 | ||||
''' | ||||
self.tags() | ||||
|
r5760 | |||
|
r9146 | return self._tagtypes.get(tagname) | ||
|
r5657 | |||
|
r1089 | def tagslist(self): | ||
'''return a list of tags ordered by revision''' | ||||
l = [] | ||||
|
r7622 | for t, n in self.tags().iteritems(): | ||
|
r1089 | try: | ||
r = self.changelog.rev(n) | ||||
except: | ||||
r = -2 # sort to the beginning of the list if unknown | ||||
|
r1615 | l.append((r, t, n)) | ||
|
r8209 | return [(t, n) for r, t, n in sorted(l)] | ||
|
r1089 | |||
def nodetags(self, node): | ||||
'''return the tags associated with a node''' | ||||
if not self.nodetagscache: | ||||
self.nodetagscache = {} | ||||
|
r7622 | for t, n in self.tags().iteritems(): | ||
|
r1615 | self.nodetagscache.setdefault(n, []).append(t) | ||
|
r1089 | return self.nodetagscache.get(node, []) | ||
|
r6120 | def _branchtags(self, partial, lrev): | ||
|
r7654 | # TODO: rename this function? | ||
|
r6750 | tiprev = len(self) - 1 | ||
|
r3491 | if lrev != tiprev: | ||
|
r10282 | self._updatebranchcache(partial, lrev + 1, tiprev + 1) | ||
|
r3491 | self._writebranchcache(partial, self.changelog.tip(), tiprev) | ||
|
r3826 | return partial | ||
|
r9671 | def branchmap(self): | ||
|
r10327 | '''returns a dictionary {branch: [branchheads]}''' | ||
|
r9671 | tip = self.changelog.tip() | ||
|
r9674 | if self._branchcache is not None and self._branchcachetip == tip: | ||
return self._branchcache | ||||
|
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 | |||
|
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 | ||
|
r7654 | |||
|
r3491 | def _readbranchcache(self): | ||
partial = {} | ||||
|
r3417 | try: | ||
|
r7654 | f = self.opener("branchheads.cache") | ||
|
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) | ||
|
r7654 | partial.setdefault(label.strip(), []).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: | ||
|
r7654 | f = self.opener("branchheads.cache", "w", atomictemp=True) | ||
|
r3491 | f.write("%s %s\n" % (hex(tip), tiprev)) | ||
|
r7654 | for label, nodes in branches.iteritems(): | ||
for node in nodes: | ||||
f.write("%s %s\n" % (hex(node), label)) | ||||
|
r4329 | f.rename() | ||
|
r4415 | except (IOError, OSError): | ||
|
r3452 | pass | ||
|
r3417 | |||
|
r3491 | def _updatebranchcache(self, partial, start, end): | ||
|
r8954 | # collect new branch entries | ||
newbranches = {} | ||||
|
r3491 | for r in xrange(start, end): | ||
|
r6747 | c = self[r] | ||
|
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) | ||||
if len(bheads) < 2: | ||||
continue | ||||
newbheads = [] | ||||
# starting from tip means fewer passes over reachable | ||||
while newnodes: | ||||
latest = newnodes.pop() | ||||
if latest not in bheads: | ||||
continue | ||||
|
r9120 | minbhrev = self[min([self[bh].rev() for bh in bheads])].node() | ||
reachable = self.changelog.reachable(latest, minbhrev) | ||||
|
r8954 | bheads = [b for b in bheads if b not in reachable] | ||
newbheads.insert(0, latest) | ||||
bheads.extend(newbheads) | ||||
partial[branch] = bheads | ||||
|
r3491 | |||
|
r1089 | def lookup(self, key): | ||
|
r7377 | if isinstance(key, int): | ||
return self.changelog.node(key) | ||||
elif key == '.': | ||||
|
r6736 | return self.dirstate.parents()[0] | ||
|
r3801 | elif key == 'null': | ||
return nullid | ||||
|
r7377 | elif key == 'tip': | ||
return self.changelog.tip() | ||||
|
r3453 | n = self.changelog._match(key) | ||
if n: | ||||
return n | ||||
|
r3418 | if key in self.tags(): | ||
|
r1089 | return self.tags()[key] | ||
|
r3418 | if key in self.branchtags(): | ||
return self.branchtags()[key] | ||||
|
r3453 | n = self.changelog._partialmatch(key) | ||
if n: | ||||
return n | ||||
|
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)) | ||||
|
r4916 | try: | ||
if len(key) == 20: | ||||
key = hex(key) | ||||
except: | ||||
pass | ||||
|
r9423 | raise error.RepoLookupError(_("unknown revision '%s'") % key) | ||
|
r1089 | |||
def local(self): | ||||
|
r1101 | return True | ||
|
r1089 | |||
def join(self, f): | ||||
return os.path.join(self.path, f) | ||||
def wjoin(self, f): | ||||
return os.path.join(self.root, f) | ||||
|
r6526 | def rjoin(self, f): | ||
return os.path.join(self.root, util.pconvert(f)) | ||||
|
r6528 | |||
|
r1089 | 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 | |||
|
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)) | ||||
|
r4004 | def _filter(self, filter, filename, data): | ||
if filter not in self.filterpats: | ||||
|
r1258 | l = [] | ||
|
r4004 | for pat, cmd in self.ui.configitems(filter): | ||
|
r7226 | if cmd == '!': | ||
continue | ||||
|
r8567 | mf = match_.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 | ||
|
r1258 | |||
|
r5966 | for mf, fn, cmd in self.filterpats[filter]: | ||
|
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 | |||
|
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: | ||||
data = self.wopener(filename, 'r').read() | ||||
return self._filter("encode", filename, data) | ||||
|
r1258 | |||
|
r4006 | def wwrite(self, filename, data, flags): | ||
|
r4004 | data = self._filter("decode", filename, data) | ||
|
r5703 | try: | ||
os.unlink(self.wjoin(filename)) | ||||
except OSError: | ||||
pass | ||||
|
r6877 | if 'l' in flags: | ||
self.wopener.symlink(data, filename) | ||||
else: | ||||
self.wopener(filename, 'w').write(data) | ||||
if 'x' in flags: | ||||
util.set_flags(self.wjoin(filename), False, True) | ||||
|
r1258 | |||
|
r4005 | def wwritedata(self, filename, data): | ||
return self._filter("decode", filename, data) | ||||
|
r1089 | |||
def transaction(self): | ||||
|
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 | |||
|
r2362 | # save dirstate for rollback | ||
|
r1089 | try: | ||
ds = self.opener("dirstate").read() | ||||
except IOError: | ||||
ds = "" | ||||
self.opener("journal.dirstate", "w").write(ds) | ||||
|
r5814 | self.opener("journal.branch", "w").write(self.dirstate.branch()) | ||
|
r1089 | |||
|
r3790 | renames = [(self.sjoin("journal"), self.sjoin("undo")), | ||
|
r5814 | (self.join("journal.dirstate"), self.join("undo.dirstate")), | ||
(self.join("journal.branch"), self.join("undo.branch"))] | ||||
|
r3457 | tr = transaction.transaction(self.ui.warn, self.sopener, | ||
|
r6065 | self.sjoin("journal"), | ||
aftertrans(renames), | ||||
|
r6894 | self.store.createmode) | ||
|
r4916 | self._transref = weakref.ref(tr) | ||
|
r1806 | return tr | ||
|
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 | |||
|
r4917 | def rollback(self): | ||
wlock = lock = None | ||||
|
r4915 | try: | ||
|
r1712 | wlock = self.wlock() | ||
|
r4438 | lock = self.lock() | ||
|
r4915 | if os.path.exists(self.sjoin("undo")): | ||
self.ui.status(_("rolling back last transaction\n")) | ||||
|
r10282 | transaction.rollback(self.sopener, self.sjoin("undo"), | ||
self.ui.warn) | ||||
|
r4915 | util.rename(self.join("undo.dirstate"), self.join("dirstate")) | ||
|
r6058 | try: | ||
branch = self.opener("undo.branch").read() | ||||
self.dirstate.setbranch(branch) | ||||
except IOError: | ||||
self.ui.warn(_("Named branch could not be reset, " | ||||
"current branch still is: %s\n") | ||||
|
r7948 | % encoding.tolocal(self.dirstate.branch())) | ||
|
r4915 | self.invalidate() | ||
self.dirstate.invalidate() | ||||
|
r9150 | self.destroyed() | ||
|
r4915 | else: | ||
self.ui.warn(_("no rollback information available\n")) | ||||
finally: | ||||
|
r8109 | release(lock, wlock) | ||
|
r1089 | |||
|
r4613 | def invalidate(self): | ||
for a in "changelog manifest".split(): | ||||
|
r6371 | if a in self.__dict__: | ||
delattr(self, a) | ||||
|
r9146 | self._tags = None | ||
self._tagtypes = None | ||||
|
r1784 | self.nodetagscache = None | ||
|
r9674 | self._branchcache = None # in UTF-8 | ||
|
r6121 | self._branchcachetip = None | ||
|
r1784 | |||
|
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 | ||||
|
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 | |||
l = self._lock(self.sjoin("lock"), wait, None, self.invalidate, | ||||
_('repository %s') % self.origroot) | ||||
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 | |||
|
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 | ||||
|
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)) | ||
for ancestor in self['.'].ancestors(): | ||||
if cfname in ancestor: | ||||
crev = ancestor[cfname].filenode() | ||||
|
r6876 | break | ||
|
r6875 | |||
|
r9467 | self.ui.debug(" %s: copy %s:%s\n" % (fname, cfname, hex(crev))) | ||
|
r8244 | meta["copy"] = cfname | ||
meta["copyrev"] = hex(crev) | ||||
fparent1, fparent2 = nullid, newfparent | ||||
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: | ||||
match = match_.always(self.root, '') | ||||
if not force: | ||||
vdirs = [] | ||||
match.dir = vdirs.append | ||||
match.bad = fail | ||||
|
r8405 | wlock = self.wlock() | ||
|
r4915 | try: | ||
|
r8397 | p1, p2 = self.dirstate.parents() | ||
|
r8813 | wctx = self[None] | ||
|
r1089 | |||
|
r8501 | if (not force and p2 != nullid and match and | ||
(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 = [] | ||||
for s in wctx.substate: | ||||
if match(s) and wctx.sub(s).dirty(): | ||||
subs.append(s) | ||||
if subs and '.hgsubstate' not in changes[0]: | ||||
changes[0].insert(0, '.hgsubstate') | ||||
|
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!")) | ||||
|
r8501 | if (not force and not extra.get("close") and p2 == nullid | ||
and not (changes[0] or changes[1] or changes[2]) | ||||
and self[None].branch() == self['.'].branch()): | ||||
|
r8404 | return None | ||
|
r6888 | ms = merge_.mergestate(self) | ||
for f in changes[0]: | ||||
if f in ms and ms[f] == 'u': | ||||
raise util.Abort(_("unresolved merge conflicts " | ||||
"(see hg resolve)")) | ||||
|
r8496 | |||
|
r8712 | cctx = context.workingctx(self, (p1, p2), text, user, date, | ||
|
r6711 | extra, changes) | ||
|
r8496 | if editor: | ||
|
r8994 | cctx._text = editor(self, cctx, subs) | ||
|
r9935 | edited = (text != cctx._text) | ||
|
r8813 | |||
# commit subs | ||||
if subs: | ||||
state = wctx.substate.copy() | ||||
for s in subs: | ||||
self.ui.status(_('committing subrepository %s\n') % s) | ||||
sr = wctx.sub(s).commit(cctx._text, user, date) | ||||
state[s] = (state[s][0], sr) | ||||
subrepo.writestate(self, state) | ||||
|
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. | ||||
msgfile = self.opener('last-message.txt', 'wb') | ||||
msgfile.write(cctx._text) | ||||
|
r9934 | msgfile.close() | ||
|
r9935 | try: | ||
ret = self.commitctx(cctx, True) | ||||
except: | ||||
if edited: | ||||
msgfn = self.pathto(msgfile.name[len(self.root)+1:]) | ||||
self.ui.write( | ||||
_('note: commit message saved in %s\n') % msgfn) | ||||
raise | ||||
|
r8496 | |||
|
r8503 | # update dirstate and mergestate | ||
|
r8416 | for f in changes[0] + changes[1]: | ||
self.dirstate.normal(f) | ||||
for f in changes[2]: | ||||
self.dirstate.forget(f) | ||||
self.dirstate.setparents(ret) | ||||
|
r8503 | ms.reset() | ||
|
r8416 | |||
|
r8415 | return ret | ||
|
r7848 | |||
|
r6710 | finally: | ||
|
r8405 | wlock.release() | ||
|
r6710 | |||
|
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 | ||
|
r8498 | removed = ctx.removed() | ||
|
r8414 | p1, p2 = ctx.p1(), ctx.p2() | ||
m1 = p1.manifest().copy() | ||||
m2 = p2.manifest() | ||||
|
r8412 | user = ctx.user() | ||
|
r1089 | |||
|
r8414 | xp1, xp2 = p1.hex(), p2 and p2.hex() or '' | ||
|
r8411 | self.hook("precommit", throw=True, parent1=xp1, parent2=xp2) | ||
|
r1089 | |||
|
r8411 | lock = self.lock() | ||
try: | ||||
|
r4915 | tr = self.transaction() | ||
|
r4970 | trp = weakref.proxy(tr) | ||
|
r1089 | |||
|
r4915 | # check in files | ||
new = {} | ||||
|
r6710 | changed = [] | ||
|
r6750 | linkrev = len(self) | ||
|
r8412 | for f in sorted(ctx.modified() + ctx.added()): | ||
|
r4915 | self.ui.note(f + "\n") | ||
try: | ||||
|
r8401 | fctx = ctx[f] | ||
new[f] = self._filecommit(fctx, m1, m2, linkrev, trp, | ||||
changed) | ||||
m1.set(f, fctx.flags()) | ||||
|
r4915 | except (OSError, IOError): | ||
|
r8416 | if error: | ||
|
r4915 | self.ui.warn(_("trouble committing %s!\n") % f) | ||
raise | ||||
else: | ||||
|
r8498 | removed.append(f) | ||
|
r1089 | |||
|
r4915 | # update manifest | ||
m1.update(new) | ||||
|
r8498 | 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] | ||||
|
r8414 | mn = self.manifest.add(m1, trp, linkrev, p1.manifestnode(), | ||
|
r8498 | p2.manifestnode(), (new, drop)) | ||
|
r1089 | |||
|
r8499 | # update changelog | ||
|
r7787 | self.changelog.delayupdate() | ||
|
r8499 | n = self.changelog.add(mn, changed + removed, ctx.description(), | ||
trp, p1.node(), p2.node(), | ||||
|
r8412 | user, ctx.date(), ctx.extra().copy()) | ||
|
r7787 | p = lambda: self.changelog.writepending() and self.root or "" | ||
|
r4915 | self.hook('pretxncommit', throw=True, node=hex(n), parent1=xp1, | ||
|
r7787 | parent2=xp2, pending=p) | ||
self.changelog.finalize(trp) | ||||
|
r4915 | tr.close() | ||
|
r1089 | |||
|
r9674 | if self._branchcache: | ||
|
r6121 | self.branchtags() | ||
|
r4019 | |||
|
r4915 | self.hook("commit", node=hex(n), parent1=xp1, parent2=xp2) | ||
return n | ||||
finally: | ||||
|
r6710 | del tr | ||
|
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. | ||||
tags_.findglobaltags(self.ui, self, {}, {}) | ||||
|
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, | ||
|
r6760 | ignored=False, clean=False, unknown=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['.'] | ||
|
r6770 | match = match or match_.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): | ||||
if f not in ctx1: | ||||
self.ui.warn('%s: %s\n' % (self.dirstate.pathto(f), msg)) | ||||
match.bad = bad | ||||
|
r6770 | if working: # we need to scan the working dir | ||
|
r10176 | subrepos = ctx1.substate.keys() | ||
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) | ||
or ctx1[f].cmp(ctx2[f].data())): | ||||
modified.append(f) | ||||
else: | ||||
fixup.append(f) | ||||
if listclean: | ||||
|
r6827 | clean += fixup | ||
|
r4912 | |||
|
r6770 | # update dirstate for files that are actually clean | ||
if fixup: | ||||
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: | ||
|
r4633 | if (mf1.flags(fn) != mf2.flags(fn) or | ||
(mf1[fn] != mf2[fn] and | ||||
|
r6817 | (mf2[fn] or ctx1[fn].cmp(ctx2[fn].data())))): | ||
|
r1616 | modified.append(fn) | ||
|
r6753 | elif listclean: | ||
|
r2661 | clean.append(fn) | ||
|
r1616 | del mf1[fn] | ||
else: | ||||
added.append(fn) | ||||
|
r1617 | removed = mf1.keys() | ||
|
r6827 | r = modified, added, removed, deleted, unknown, ignored, clean | ||
[l.sort() for l in r] | ||||
return r | ||||
|
r2661 | |||
|
r4917 | def add(self, list): | ||
wlock = self.wlock() | ||||
|
r4915 | try: | ||
|
r5688 | rejected = [] | ||
|
r1415 | for f in list: | ||
|
r4915 | p = self.wjoin(f) | ||
|
r1415 | try: | ||
|
r4915 | st = os.lstat(p) | ||
except: | ||||
self.ui.warn(_("%s does not exist!\n") % f) | ||||
|
r5688 | rejected.append(f) | ||
|
r4915 | continue | ||
if st.st_size > 10000000: | ||||
self.ui.warn(_("%s: files over 10MB may cause memory and" | ||||
" performance problems\n" | ||||
"(use 'hg revert %s' to unadd the file)\n") | ||||
% (f, f)) | ||||
if not (stat.S_ISREG(st.st_mode) or stat.S_ISLNK(st.st_mode)): | ||||
self.ui.warn(_("%s not added: only files and symlinks " | ||||
"supported currently\n") % f) | ||||
|
r5688 | rejected.append(p) | ||
|
r5206 | elif self.dirstate[f] in 'amn': | ||
|
r4915 | self.ui.warn(_("%s already tracked!\n") % f) | ||
|
r5207 | elif self.dirstate[f] == 'r': | ||
|
r5210 | self.dirstate.normallookup(f) | ||
|
r4915 | else: | ||
self.dirstate.add(f) | ||||
|
r5688 | return rejected | ||
|
r4915 | finally: | ||
|
r8109 | wlock.release() | ||
|
r1089 | |||
|
r4917 | def forget(self, list): | ||
wlock = self.wlock() | ||||
|
r4915 | try: | ||
for f in list: | ||||
if self.dirstate[f] != 'a': | ||||
self.ui.warn(_("%s not added!\n") % f) | ||||
else: | ||||
self.dirstate.forget(f) | ||||
finally: | ||||
|
r8109 | wlock.release() | ||
|
r1089 | |||
|
r4917 | def remove(self, list, unlink=False): | ||
|
r8646 | if unlink: | ||
for f in list: | ||||
try: | ||||
util.unlink(self.wjoin(f)) | ||||
except OSError, inst: | ||||
if inst.errno != errno.ENOENT: | ||||
raise | ||||
wlock = self.wlock() | ||||
|
r4915 | try: | ||
|
r1415 | for f in list: | ||
|
r4915 | if unlink and os.path.exists(self.wjoin(f)): | ||
self.ui.warn(_("%s still exists!\n") % f) | ||||
elif self.dirstate[f] == 'a': | ||||
self.dirstate.forget(f) | ||||
elif f not in self.dirstate: | ||||
self.ui.warn(_("%s not tracked!\n") % f) | ||||
else: | ||||
self.dirstate.remove(f) | ||||
finally: | ||||
|
r8646 | wlock.release() | ||
|
r1447 | |||
|
r4917 | def undelete(self, list): | ||
|
r8109 | manifests = [self.manifest.read(self.changelog.read(p)[0]) | ||
for p in self.dirstate.parents() if p != nullid] | ||||
wlock = self.wlock() | ||||
|
r4915 | try: | ||
for f in list: | ||||
if self.dirstate[f] != 'r': | ||||
|
r6953 | self.ui.warn(_("%s not removed!\n") % f) | ||
|
r4915 | else: | ||
|
r5323 | m = f in manifests[0] and manifests[0] or manifests[1] | ||
|
r4915 | t = self.file(f).read(m[f]) | ||
self.wwrite(f, t, m.flags(f)) | ||||
self.dirstate.normal(f) | ||||
finally: | ||||
|
r8109 | wlock.release() | ||
|
r1447 | |||
|
r4917 | def copy(self, source, dest): | ||
|
r8109 | p = self.wjoin(dest) | ||
if not (os.path.exists(p) or os.path.islink(p)): | ||||
self.ui.warn(_("%s does not exist!\n") % dest) | ||||
elif not (os.path.isfile(p) or os.path.islink(p)): | ||||
self.ui.warn(_("copy failed: %s is not a file or a " | ||||
"symbolic link\n") % dest) | ||||
else: | ||||
wlock = self.wlock() | ||||
try: | ||||
|
r7121 | if self.dirstate[dest] in '?r': | ||
|
r4915 | self.dirstate.add(dest) | ||
self.dirstate.copy(source, dest) | ||||
|
r8109 | finally: | ||
wlock.release() | ||||
|
r1089 | |||
|
r8796 | def heads(self, start=None): | ||
|
r1550 | heads = self.changelog.heads(start) | ||
# sort the output in rev descending order | ||||
|
r8796 | heads = [(-self.changelog.rev(h), h) for h in heads] | ||
|
r8209 | return [n for (r, n) in sorted(heads)] | ||
|
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 | ||||
|
r2345 | while 1: | ||
|
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 | ||||
|
r1959 | def findincoming(self, remote, base=None, heads=None, force=False): | ||
|
r2339 | """Return list of roots of the subsets of missing nodes from remote | ||
If base dict is specified, assume that these nodes and their parents | ||||
exist on the remote side and that no child of a node of base exists | ||||
in both remote and self. | ||||
Furthermore base will be updated to include the nodes that exists | ||||
in self and remote but no children exists in self and remote. | ||||
If a list of heads is specified, return only nodes which are heads | ||||
or ancestors of these heads. | ||||
All the ancestors of base are in self and in remote. | ||||
All the descendants of the list returned are missing in self. | ||||
(and so we know that the rest of the nodes are missing in remote, see | ||||
outgoing) | ||||
""" | ||||
|
r7415 | return self.findcommonincoming(remote, base, heads, force)[1] | ||
def findcommonincoming(self, remote, base=None, heads=None, force=False): | ||||
"""Return a tuple (common, missing roots, heads) used to identify | ||||
missing nodes from remote. | ||||
If base dict is specified, assume that these nodes and their parents | ||||
exist on the remote side and that no child of a node of base exists | ||||
in both remote and self. | ||||
Furthermore base will be updated to include the nodes that exists | ||||
in self and remote but no children exists in self and remote. | ||||
If a list of heads is specified, return only nodes which are heads | ||||
or ancestors of these heads. | ||||
All the ancestors of base are in self and in remote. | ||||
""" | ||||
|
r1089 | m = self.changelog.nodemap | ||
search = [] | ||||
|
r8156 | fetch = set() | ||
seen = set() | ||||
seenbranch = set() | ||||
|
r8527 | if base is None: | ||
|
r1089 | base = {} | ||
|
r2108 | if not heads: | ||
heads = remote.heads() | ||||
if self.changelog.tip() == nullid: | ||||
|
r2339 | base[nullid] = 1 | ||
|
r2108 | if heads != [nullid]: | ||
|
r7415 | return [nullid], [nullid], list(heads) | ||
return [nullid], [], [] | ||||
|
r2108 | |||
|
r1089 | # assume we're closer to the tip than the root | ||
# and start by examining the heads | ||||
|
r1402 | self.ui.status(_("searching for changes\n")) | ||
|
r1089 | |||
unknown = [] | ||||
for h in heads: | ||||
if h not in m: | ||||
unknown.append(h) | ||||
else: | ||||
base[h] = 1 | ||||
|
r7415 | heads = unknown | ||
|
r1089 | if not unknown: | ||
|
r7415 | return base.keys(), [], [] | ||
|
r1089 | |||
|
r8152 | req = set(unknown) | ||
|
r1089 | reqcnt = 0 | ||
# search through remote branches | ||||
# a 'branch' here is a linear segment of history, with four parts: | ||||
# head, root, first parent, second parent | ||||
# (a branch always has two parents (or none) by definition) | ||||
unknown = remote.branches(unknown) | ||||
while unknown: | ||||
r = [] | ||||
while unknown: | ||||
n = unknown.pop(0) | ||||
if n[0] in seen: | ||||
continue | ||||
|
r9467 | self.ui.debug("examining %s:%s\n" | ||
|
r1615 | % (short(n[0]), short(n[1]))) | ||
|
r2339 | if n[0] == nullid: # found the end of the branch | ||
pass | ||||
elif n in seenbranch: | ||||
|
r9467 | self.ui.debug("branch already found\n") | ||
|
r1089 | continue | ||
|
r2339 | elif n[1] and n[1] in m: # do we know the base? | ||
|
r9467 | self.ui.debug("found incomplete branch %s:%s\n" | ||
|
r1089 | % (short(n[0]), short(n[1]))) | ||
|
r7237 | search.append(n[0:2]) # schedule branch range for scanning | ||
|
r8156 | seenbranch.add(n) | ||
|
r1089 | else: | ||
if n[1] not in seen and n[1] not in fetch: | ||||
if n[2] in m and n[3] in m: | ||||
|
r9467 | self.ui.debug("found new changeset %s\n" % | ||
|
r1089 | short(n[1])) | ||
|
r8156 | fetch.add(n[1]) # earliest unknown | ||
|
r2339 | for p in n[2:4]: | ||
if p in m: | ||||
base[p] = 1 # latest known | ||||
|
r1089 | |||
|
r2339 | for p in n[2:4]: | ||
if p not in req and p not in m: | ||||
r.append(p) | ||||
|
r8152 | req.add(p) | ||
|
r8156 | seen.add(n[0]) | ||
|
r1089 | |||
if r: | ||||
reqcnt += 1 | ||||
|
r9467 | self.ui.debug("request %d: %s\n" % | ||
|
r1089 | (reqcnt, " ".join(map(short, r)))) | ||
|
r3473 | for p in xrange(0, len(r), 10): | ||
|
r10282 | for b in remote.branches(r[p:p + 10]): | ||
|
r9467 | self.ui.debug("received %s:%s\n" % | ||
|
r1089 | (short(b[0]), short(b[1]))) | ||
|
r2339 | unknown.append(b) | ||
|
r1089 | |||
# do binary search on the branches we found | ||||
while search: | ||||
|
r7208 | newsearch = [] | ||
|
r1089 | reqcnt += 1 | ||
|
r7208 | for n, l in zip(search, remote.between(search)): | ||
l.append(n[1]) | ||||
p = n[0] | ||||
f = 1 | ||||
for i in l: | ||||
|
r9467 | self.ui.debug("narrowing %d:%d %s\n" % (f, len(l), short(i))) | ||
|
r7208 | if i in m: | ||
if f <= 2: | ||||
|
r9467 | self.ui.debug("found new branch changeset %s\n" % | ||
|
r7208 | short(p)) | ||
|
r8156 | fetch.add(p) | ||
|
r7208 | base[i] = 1 | ||
else: | ||||
|
r9467 | self.ui.debug("narrowed branch search to %s:%s\n" | ||
|
r7208 | % (short(p), short(i))) | ||
newsearch.append((p, i)) | ||||
break | ||||
p, f = i, f * 2 | ||||
search = newsearch | ||||
|
r1089 | |||
# sanity check our fetch list | ||||
|
r8156 | for f in fetch: | ||
|
r1089 | if f in m: | ||
|
r7637 | raise error.RepoError(_("already have changeset ") | ||
+ short(f[:4])) | ||||
|
r1089 | |||
if base.keys() == [nullid]: | ||||
|
r1959 | if force: | ||
self.ui.warn(_("warning: repository is unrelated\n")) | ||||
else: | ||||
raise util.Abort(_("repository is unrelated")) | ||||
|
r1089 | |||
|
r9467 | self.ui.debug("found new changesets starting at " + | ||
|
r1089 | " ".join([short(f) for f in fetch]) + "\n") | ||
|
r9467 | self.ui.debug("%d total queries\n" % reqcnt) | ||
|
r1089 | |||
|
r8156 | return base.keys(), list(fetch), heads | ||
|
r1089 | |||
|
r1959 | def findoutgoing(self, remote, base=None, heads=None, force=False): | ||
|
r2021 | """Return list of nodes that are roots of subsets not in remote | ||
If base dict is specified, assume that these nodes and their parents | ||||
exist on the remote side. | ||||
If a list of heads is specified, return only nodes which are heads | ||||
or ancestors of these heads, and return a second element which | ||||
contains all remote heads which get new children. | ||||
""" | ||||
|
r8527 | if base is None: | ||
|
r1089 | base = {} | ||
|
r1959 | self.findincoming(remote, base, heads, force=force) | ||
|
r1089 | |||
|
r9467 | self.ui.debug("common changesets up to " | ||
|
r1089 | + " ".join(map(short, base.keys())) + "\n") | ||
|
r8152 | remain = set(self.changelog.nodemap) | ||
|
r1089 | |||
# prune everything remote has from the tree | ||||
|
r8152 | remain.remove(nullid) | ||
|
r1089 | remove = base.keys() | ||
while remove: | ||||
n = remove.pop(0) | ||||
if n in remain: | ||||
|
r8152 | remain.remove(n) | ||
|
r1089 | for p in self.changelog.parents(n): | ||
remove.append(p) | ||||
# find every node whose parents have been pruned | ||||
subset = [] | ||||
|
r2021 | # find every remote head that will get new children | ||
|
r8469 | updated_heads = set() | ||
|
r1089 | for n in remain: | ||
p1, p2 = self.changelog.parents(n) | ||||
if p1 not in remain and p2 not in remain: | ||||
subset.append(n) | ||||
|
r2021 | if heads: | ||
if p1 in heads: | ||||
|
r8469 | updated_heads.add(p1) | ||
|
r2021 | if p2 in heads: | ||
|
r8469 | updated_heads.add(p2) | ||
|
r1089 | |||
# this is the set of all roots we have to push | ||||
|
r2021 | if heads: | ||
|
r8469 | return subset, list(updated_heads) | ||
|
r2021 | else: | ||
return subset | ||||
|
r1089 | |||
|
r4917 | def pull(self, remote, heads=None, force=False): | ||
lock = self.lock() | ||||
|
r2827 | try: | ||
|
r7415 | common, fetch, rheads = self.findcommonincoming(remote, heads=heads, | ||
force=force) | ||||
|
r2827 | if fetch == [nullid]: | ||
self.ui.status(_("requesting all changes\n")) | ||||
|
r1089 | |||
|
r2827 | if not fetch: | ||
self.ui.status(_("no changes found\n")) | ||||
return 0 | ||||
|
r1089 | |||
|
r7415 | if heads is None and remote.capable('changegroupsubset'): | ||
heads = rheads | ||||
|
r2827 | if heads is None: | ||
cg = remote.changegroup(fetch, 'pull') | ||||
else: | ||||
|
r7415 | if not remote.capable('changegroupsubset'): | ||
|
r8663 | raise util.Abort(_("Partial pull cannot be done because " | ||
"other repository doesn't support " | ||||
"changegroupsubset.")) | ||||
|
r2827 | cg = remote.changegroupsubset(fetch, heads, 'pull') | ||
return self.addchangegroup(cg, 'pull', remote.url()) | ||||
finally: | ||||
|
r8109 | lock.release() | ||
|
r1089 | |||
|
r1781 | def push(self, remote, force=False, revs=None): | ||
|
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 | |||
|
r2612 | if remote.capable('unbundle'): | ||
|
r2463 | return self.push_unbundle(remote, force, revs) | ||
return self.push_addchangegroup(remote, force, revs) | ||||
|
r2439 | |||
def prepush(self, remote, force, revs): | ||||
|
r9437 | '''Analyze the local and remote repositories and determine which | ||
changesets need to be pushed to the remote. Return a tuple | ||||
(changegroup, remoteheads). changegroup is a readable file-like | ||||
object whose read() returns successive changegroup chunks ready to | ||||
be sent over the wire. remoteheads is the list of remote heads. | ||||
''' | ||||
|
r7460 | common = {} | ||
|
r2021 | remote_heads = remote.heads() | ||
|
r7460 | inc = self.findincoming(remote, common, remote_heads, force=force) | ||
|
r1089 | |||
|
r7460 | update, updated_heads = self.findoutgoing(remote, common, remote_heads) | ||
|
r9479 | msng_cl, bases, heads = self.changelog.nodesbetween(update, revs) | ||
|
r1781 | |||
|
r10396 | def checkbranch(lheads, rheads, updatelb, branchname=None): | ||
|
r8564 | ''' | ||
check whether there are more local heads than remote heads on | ||||
a specific branch. | ||||
lheads: local branch heads | ||||
rheads: remote branch heads | ||||
|
r9479 | updatelb: outgoing local branch bases | ||
|
r8564 | ''' | ||
warn = 0 | ||||
if not revs and len(lheads) > len(rheads): | ||||
warn = 1 | ||||
else: | ||||
|
r9479 | # add local heads involved in the push | ||
|
r8564 | updatelheads = [self.changelog.heads(x, lheads) | ||
|
r9479 | for x in updatelb] | ||
|
r8564 | newheads = set(sum(updatelheads, [])) & set(lheads) | ||
if not newheads: | ||||
return True | ||||
|
r9479 | # add heads we don't have or that are not involved in the push | ||
|
r8564 | for r in rheads: | ||
if r in self.changelog.nodemap: | ||||
desc = self.changelog.heads(r, heads) | ||||
l = [h for h in heads if h in desc] | ||||
if not l: | ||||
newheads.add(r) | ||||
else: | ||||
newheads.add(r) | ||||
if len(newheads) > len(rheads): | ||||
warn = 1 | ||||
if warn: | ||||
|
r10396 | if branchname is not None: | ||
msg = _("abort: push creates new remote heads" | ||||
" on branch '%s'!\n") % branchname | ||||
else: | ||||
msg = _("abort: push creates new remote heads!\n") | ||||
self.ui.warn(msg) | ||||
if len(lheads) > len(rheads): | ||||
self.ui.status(_("(did you forget to merge?" | ||||
" use push -f to force)\n")) | ||||
else: | ||||
self.ui.status(_("(you should pull and merge or" | ||||
" use push -f to force)\n")) | ||||
|
r8564 | return False | ||
return True | ||||
|
r1781 | if not bases: | ||
|
r1402 | self.ui.status(_("no changes found\n")) | ||
|
r2439 | return None, 1 | ||
|
r1089 | elif not force: | ||
|
r8564 | # Check for each named branch if we're creating new remote heads. | ||
# To be a remote head after push, node must be either: | ||||
|
r3684 | # - unknown locally | ||
# - a local outgoing head descended from update | ||||
# - a remote head that's known locally and not | ||||
# ancestral to an outgoing head | ||||
|
r8564 | # | ||
# New named branches cannot be created without --force. | ||||
|
r3684 | |||
|
r8564 | if remote_heads != [nullid]: | ||
if remote.capable('branchmap'): | ||||
|
r10353 | remotebrheads = remote.branchmap() | ||
|
r8564 | if not revs: | ||
|
r10353 | localbrheads = self.branchmap() | ||
|
r8564 | else: | ||
|
r10353 | localbrheads = {} | ||
|
r8564 | for n in heads: | ||
branch = self[n].branch() | ||||
|
r10353 | localbrheads.setdefault(branch, []).append(n) | ||
|
r3684 | |||
|
r10354 | newbranches = list(set(localbrheads) - set(remotebrheads)) | ||
if newbranches: # new branch requires --force | ||||
|
r10371 | branchnames = ', '.join("%s" % b for b in newbranches) | ||
|
r10354 | self.ui.warn(_("abort: push creates " | ||
"new remote branches: %s!\n") | ||||
% branchnames) | ||||
# propose 'push -b .' in the msg too? | ||||
self.ui.status(_("(use 'hg push -f' to force)\n")) | ||||
return None, 0 | ||||
|
r10353 | for branch, lheads in localbrheads.iteritems(): | ||
|
r10354 | if branch in remotebrheads: | ||
rheads = remotebrheads[branch] | ||||
|
r10396 | if not checkbranch(lheads, rheads, update, branch): | ||
|
r10354 | return None, 0 | ||
|
r8564 | else: | ||
if not checkbranch(heads, remote_heads, update): | ||||
return None, 0 | ||||
|
r3684 | |||
|
r8564 | if inc: | ||
|
r3684 | self.ui.warn(_("note: unsynced remote changes!\n")) | ||
|
r1089 | |||
|
r3682 | |||
|
r1781 | if revs is None: | ||
|
r7460 | # use the fast path, no race possible on push | ||
|
r9820 | nodes = self.changelog.findmissing(common.keys()) | ||
cg = self._changegroup(nodes, 'push') | ||||
|
r1781 | else: | ||
|
r1782 | cg = self.changegroupsubset(update, revs, 'push') | ||
|
r2439 | return cg, remote_heads | ||
def push_addchangegroup(self, remote, force, revs): | ||||
lock = remote.lock() | ||||
|
r4915 | try: | ||
ret = self.prepush(remote, force, revs) | ||||
if ret[0] is not None: | ||||
cg, remote_heads = ret | ||||
return remote.addchangegroup(cg, 'push', self.url()) | ||||
return ret[1] | ||||
finally: | ||||
|
r8109 | lock.release() | ||
|
r2439 | |||
def push_unbundle(self, remote, force, revs): | ||||
# 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. | ||||
ret = self.prepush(remote, force, revs) | ||||
if ret[0] is not None: | ||||
cg, remote_heads = ret | ||||
|
r10282 | if force: | ||
remote_heads = ['force'] | ||||
|
r2439 | return remote.unbundle(cg, remote_heads, 'push') | ||
return ret[1] | ||||
|
r1089 | |||
|
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)) | ||||
|
r5908 | def changegroupsubset(self, bases, heads, source, extranodes=None): | ||
|
r9437 | """Compute a changegroup consisting of all the nodes that are | ||
descendents of any of the bases and ancestors of any of the heads. | ||||
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. | ||
|
r6210 | |||
|
r5908 | The caller can specify some nodes that must be included in the | ||
changegroup using the extranodes argument. It should be a dict | ||||
where the keys are the filenames (or 1 for the manifest), and the | ||||
values are lists of (node, linknode) tuples, where node is a wanted | ||||
node and linknode is the changelog node that should be transmitted as | ||||
the linkrev. | ||||
""" | ||||
|
r1466 | |||
|
r9820 | # Set up some initial variables | ||
# Make it easy to refer to self.changelog | ||||
cl = self.changelog | ||||
# msng is short for missing - compute the list of changesets in this | ||||
# changegroup. | ||||
if not bases: | ||||
bases = [nullid] | ||||
msng_cl_lst, bases, heads = cl.nodesbetween(bases, heads) | ||||
|
r7233 | if extranodes is None: | ||
# can we go through the fast path ? | ||||
heads.sort() | ||||
allheads = self.heads() | ||||
allheads.sort() | ||||
if heads == allheads: | ||||
|
r9820 | return self._changegroup(msng_cl_lst, source) | ||
|
r7233 | |||
|
r9820 | # slow path | ||
|
r1736 | self.hook('preoutgoing', throw=True, source=source) | ||
|
r5763 | self.changegroupinfo(msng_cl_lst, source) | ||
|
r1466 | # Some bases may turn out to be superfluous, and some heads may be | ||
# too. nodesbetween will return the minimal set of bases and heads | ||||
# necessary to re-create the changegroup. | ||||
# Known heads are the list of heads that it is assumed the recipient | ||||
# of this changegroup will know about. | ||||
|
r8469 | knownheads = set() | ||
|
r1466 | # We assume that all parents of bases are known heads. | ||
|
r1460 | for n in bases: | ||
|
r8481 | knownheads.update(cl.parents(n)) | ||
knownheads.discard(nullid) | ||||
|
r8469 | knownheads = list(knownheads) | ||
|
r1460 | if knownheads: | ||
|
r1466 | # Now that we know what heads are known, we can compute which | ||
# changesets are known. The recipient must know about all | ||||
# changesets required to reach the known heads from the null | ||||
# changeset. | ||||
|
r1460 | has_cl_set, junk, junk = cl.nodesbetween(None, knownheads) | ||
|
r1466 | junk = None | ||
|
r8239 | # Transform the list into a set. | ||
|
r8152 | has_cl_set = set(has_cl_set) | ||
|
r1460 | else: | ||
|
r1466 | # If there were no known heads, the recipient cannot be assumed to | ||
# know about any changesets. | ||||
|
r8152 | has_cl_set = set() | ||
|
r1458 | |||
|
r1466 | # Make it easy to refer to self.manifest | ||
|
r1458 | mnfst = self.manifest | ||
|
r1466 | # We don't know which manifests are missing yet | ||
|
r1458 | msng_mnfst_set = {} | ||
|
r1466 | # Nor do we know which filenodes are missing. | ||
|
r1458 | msng_filenode_set = {} | ||
|
r6750 | junk = mnfst.index[len(mnfst) - 1] # Get around a bug in lazyindex | ||
|
r1460 | junk = None | ||
|
r1466 | # A changeset always belongs to itself, so the changenode lookup | ||
# function for a changenode is identity. | ||||
|
r1458 | def identity(x): | ||
return x | ||||
|
r1466 | # If we determine that a particular file or manifest node must be a | ||
# node that the recipient of the changegroup will already have, we can | ||||
# also assume the recipient will have all the parents. This function | ||||
# prunes them from the set of missing nodes. | ||||
|
r1458 | def prune_parents(revlog, hasset, msngset): | ||
|
r10010 | for r in revlog.ancestors(*[revlog.rev(n) for n in hasset]): | ||
msngset.pop(revlog.node(r), None) | ||||
|
r1458 | |||
|
r1466 | # Use the information collected in collect_manifests_and_files to say | ||
# which changenode any manifestnode belongs to. | ||||
|
r1458 | def lookup_manifest_link(mnfstnode): | ||
return msng_mnfst_set[mnfstnode] | ||||
|
r1466 | # A function generating function that sets up the initial environment | ||
# the inner function. | ||||
|
r1458 | def filenode_collector(changedfiles): | ||
|
r1466 | # This gathers information from each manifestnode included in the | ||
# changegroup about which filenodes the manifest node references | ||||
# so we can include those in the changegroup too. | ||||
# | ||||
# It also remembers which changenode each filenode belongs to. It | ||||
# does this by assuming the a filenode belongs to the changenode | ||||
# the first manifest that references it belongs to. | ||||
|
r1458 | def collect_msng_filenodes(mnfstnode): | ||
|
r1462 | r = mnfst.rev(mnfstnode) | ||
|
r10011 | if r - 1 in mnfst.parentrevs(r): | ||
# If the previous rev is one of the parents, | ||||
|
r1462 | # we only need to see a diff. | ||
|
r5175 | deltamf = mnfst.readdelta(mnfstnode) | ||
|
r1466 | # For each line in the delta | ||
|
r7622 | for f, fnode in deltamf.iteritems(): | ||
|
r1462 | f = changedfiles.get(f, None) | ||
|
r1466 | # And if the file is in the list of files we care | ||
# about. | ||||
|
r1462 | if f is not None: | ||
|
r1466 | # Get the changenode this manifest belongs to | ||
clnode = msng_mnfst_set[mnfstnode] | ||||
# Create the set of filenodes for the file if | ||||
# there isn't one already. | ||||
ndset = msng_filenode_set.setdefault(f, {}) | ||||
# And set the filenode's changelog node to the | ||||
# manifest's if it hasn't been set already. | ||||
ndset.setdefault(fnode, clnode) | ||||
else: | ||||
# Otherwise we need a full manifest. | ||||
m = mnfst.read(mnfstnode) | ||||
# For every file in we care about. | ||||
for f in changedfiles: | ||||
fnode = m.get(f, None) | ||||
# If it's in the manifest | ||||
if fnode is not None: | ||||
# See comments above. | ||||
|
r1462 | clnode = msng_mnfst_set[mnfstnode] | ||
ndset = msng_filenode_set.setdefault(f, {}) | ||||
ndset.setdefault(fnode, clnode) | ||||
|
r1460 | return collect_msng_filenodes | ||
|
r1458 | |||
|
r1466 | # We have a list of filenodes we think we need for a file, lets remove | ||
|
r8238 | # all those we know the recipient must have. | ||
|
r1458 | def prune_filenodes(f, filerevlog): | ||
msngset = msng_filenode_set[f] | ||||
|
r8469 | hasset = set() | ||
|
r1466 | # If a 'missing' filenode thinks it belongs to a changenode we | ||
# assume the recipient must have, then the recipient must have | ||||
# that filenode. | ||||
|
r1458 | for n in msngset: | ||
|
r7361 | clnode = cl.node(filerevlog.linkrev(filerevlog.rev(n))) | ||
|
r1458 | if clnode in has_cl_set: | ||
|
r8469 | hasset.add(n) | ||
|
r1458 | prune_parents(filerevlog, hasset, msngset) | ||
|
r1466 | # A function generator function that sets up the a context for the | ||
# inner function. | ||||
|
r1458 | def lookup_filenode_link_func(fname): | ||
msngset = msng_filenode_set[fname] | ||||
|
r1466 | # Lookup the changenode the filenode belongs to. | ||
|
r1458 | def lookup_filenode_link(fnode): | ||
return msngset[fnode] | ||||
return lookup_filenode_link | ||||
|
r1089 | |||
|
r5908 | # Add the nodes that were explicitly requested. | ||
def add_extra_nodes(name, nodes): | ||||
if not extranodes or name not in extranodes: | ||||
return | ||||
for node, linknode in extranodes[name]: | ||||
if node not in nodes: | ||||
nodes[node] = linknode | ||||
|
r1466 | # Now that we have all theses utility functions to help out and | ||
# logically divide up the task, generate the group. | ||||
|
r1089 | def gengroup(): | ||
|
r1466 | # The set of changed files starts empty. | ||
|
r1458 | changedfiles = {} | ||
|
r10356 | collect = changegroup.collector(cl, msng_mnfst_set, changedfiles) | ||
|
r10405 | |||
|
r1466 | # Create a changenode group generator that will call our functions | ||
# back to lookup the owning changenode and collect information. | ||||
|
r10356 | group = cl.group(msng_cl_lst, identity, collect) | ||
|
r1458 | for chnk in group: | ||
yield chnk | ||||
|
r1466 | |||
|
r10357 | # Figure out which manifest nodes (of the ones we think might be | ||
# part of the changegroup) the recipient must know about and | ||||
# remove them from the changegroup. | ||||
has_mnfst_set = set() | ||||
for n in msng_mnfst_set: | ||||
# If a 'missing' manifest thinks it belongs to a changenode | ||||
# the recipient is assumed to have, obviously the recipient | ||||
# must have that manifest. | ||||
linknode = cl.node(mnfst.linkrev(mnfst.rev(n))) | ||||
if linknode in has_cl_set: | ||||
has_mnfst_set.add(n) | ||||
prune_parents(mnfst, has_mnfst_set, msng_mnfst_set) | ||||
|
r5908 | add_extra_nodes(1, msng_mnfst_set) | ||
|
r1458 | msng_mnfst_lst = msng_mnfst_set.keys() | ||
|
r1466 | # Sort the manifestnodes by revision number. | ||
|
r9038 | msng_mnfst_lst.sort(key=mnfst.rev) | ||
|
r1466 | # Create a generator for the manifestnodes that calls our lookup | ||
# and data collection functions back. | ||||
|
r1460 | group = mnfst.group(msng_mnfst_lst, lookup_manifest_link, | ||
|
r1458 | filenode_collector(changedfiles)) | ||
for chnk in group: | ||||
yield chnk | ||||
|
r1466 | |||
# These are no longer needed, dereference and toss the memory for | ||||
# them. | ||||
|
r1458 | msng_mnfst_lst = None | ||
msng_mnfst_set.clear() | ||||
|
r1466 | |||
|
r5908 | if extranodes: | ||
for fname in extranodes: | ||||
if isinstance(fname, int): | ||||
continue | ||||
|
r7134 | msng_filenode_set.setdefault(fname, {}) | ||
|
r5908 | changedfiles[fname] = 1 | ||
|
r1466 | # Go through all our files in order sorted by name. | ||
|
r8209 | 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) | ||
|
r1466 | # Toss out the filenodes that the recipient isn't really | ||
# missing. | ||||
|
r5915 | if fname in msng_filenode_set: | ||
|
r1630 | prune_filenodes(fname, filerevlog) | ||
|
r7134 | add_extra_nodes(fname, msng_filenode_set[fname]) | ||
|
r1630 | msng_filenode_lst = msng_filenode_set[fname].keys() | ||
else: | ||||
msng_filenode_lst = [] | ||||
|
r1466 | # If any filenodes are left, generate the group for them, | ||
# otherwise don't bother. | ||||
|
r1458 | if len(msng_filenode_lst) > 0: | ||
|
r5368 | yield changegroup.chunkheader(len(fname)) | ||
yield fname | ||||
|
r1466 | # Sort the filenodes by their revision # | ||
|
r9038 | msng_filenode_lst.sort(key=filerevlog.rev) | ||
|
r1466 | # Create a group generator and only pass in a changenode | ||
# lookup function as we need to collect no information | ||||
# from filenodes. | ||||
|
r1458 | group = filerevlog.group(msng_filenode_lst, | ||
|
r1460 | lookup_filenode_link_func(fname)) | ||
|
r1458 | for chnk in group: | ||
yield chnk | ||||
|
r5915 | if fname in msng_filenode_set: | ||
|
r1630 | # Don't need this anymore, toss it to free memory. | ||
del msng_filenode_set[fname] | ||||
|
r1466 | # Signal that no more groups are left. | ||
|
r1981 | yield changegroup.closechunk() | ||
|
r1089 | |||
|
r2150 | if msng_cl_lst: | ||
|
r2149 | self.hook('outgoing', node=hex(msng_cl_lst[0]), source=source) | ||
|
r1736 | |||
|
r1458 | return util.chunkbuffer(gengroup()) | ||
|
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 | |||
self.hook('preoutgoing', throw=True, source=source) | ||||
|
r1458 | cl = self.changelog | ||
|
r8152 | revset = set([cl.rev(n) for n in nodes]) | ||
|
r5763 | self.changegroupinfo(nodes, source) | ||
|
r1458 | |||
def identity(x): | ||||
return x | ||||
|
r1089 | |||
|
r6750 | def gennodelst(log): | ||
for r in log: | ||||
|
r7361 | if log.linkrev(r) in revset: | ||
yield log.node(r) | ||||
|
r1458 | |||
def lookuprevlink_func(revlog): | ||||
def lookuprevlink(n): | ||||
|
r7361 | return cl.node(revlog.linkrev(revlog.rev(n))) | ||
|
r1458 | return lookuprevlink | ||
def gengroup(): | ||||
|
r9437 | '''yield a sequence of changegroup chunks (strings)''' | ||
|
r1089 | # construct a list of all changed files | ||
|
r10356 | changedfiles = {} | ||
mmfs = {} | ||||
collect = changegroup.collector(cl, mmfs, changedfiles) | ||||
|
r1458 | |||
|
r10356 | for chnk in cl.group(nodes, identity, collect): | ||
|
r1458 | yield chnk | ||
|
r1089 | |||
|
r1458 | mnfst = self.manifest | ||
nodeiter = gennodelst(mnfst) | ||||
for chnk in mnfst.group(nodeiter, lookuprevlink_func(mnfst)): | ||||
yield chnk | ||||
|
r1089 | |||
|
r8209 | 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) | ||
|
r1458 | nodeiter = gennodelst(filerevlog) | ||
nodeiter = list(nodeiter) | ||||
if nodeiter: | ||||
|
r5368 | yield changegroup.chunkheader(len(fname)) | ||
yield fname | ||||
|
r1458 | lookup = lookuprevlink_func(filerevlog) | ||
for chnk in filerevlog.group(nodeiter, lookup): | ||||
yield chnk | ||||
|
r1089 | |||
|
r1981 | yield changegroup.closechunk() | ||
|
r2107 | |||
if nodes: | ||||
self.hook('outgoing', node=hex(nodes[0]), source=source) | ||||
|
r1089 | |||
|
r1458 | return util.chunkbuffer(gengroup()) | ||
|
r1089 | |||
|
r5907 | def addchangegroup(self, source, srctype, url, emptyok=False): | ||
|
r2019 | """add changegroup to repo. | ||
|
r1089 | |||
|
r3803 | return values: | ||
- nothing changed or no source: 0 | ||||
- more heads than before: 1+added heads (2..n) | ||||
- less heads than before: -1-removed heads (-2..-n) | ||||
- 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 | ||
|
r2395 | # write changelog data to temp files so concurrent readers will not see | ||
# inconsistent view | ||||
|
r4261 | cl = self.changelog | ||
cl.delayupdate() | ||||
oldheads = len(cl.heads()) | ||||
|
r1998 | |||
|
r4915 | tr = self.transaction() | ||
try: | ||||
|
r4970 | trp = weakref.proxy(tr) | ||
|
r4915 | # pull off the changeset group | ||
self.ui.status(_("adding changesets\n")) | ||||
|
r8393 | clstart = len(cl) | ||
|
r4915 | chunkiter = changegroup.chunkiter(source) | ||
|
r6647 | if cl.addgroup(chunkiter, csmap, trp) is None and not emptyok: | ||
|
r4915 | raise util.Abort(_("received changelog group is empty")) | ||
|
r8393 | clend = len(cl) | ||
changesets = clend - clstart | ||||
|
r1089 | |||
|
r4915 | # pull off the manifest group | ||
self.ui.status(_("adding manifests\n")) | ||||
chunkiter = changegroup.chunkiter(source) | ||||
# 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 | ||||
|
r4970 | self.manifest.addgroup(chunkiter, revmap, trp) | ||
|
r1089 | |||
|
r4915 | # process the files | ||
self.ui.status(_("adding file changes\n")) | ||||
while 1: | ||||
f = changegroup.getchunk(source) | ||||
if not f: | ||||
break | ||||
|
r9467 | self.ui.debug("adding %s revisions\n" % f) | ||
|
r4915 | fl = self.file(f) | ||
|
r6750 | o = len(fl) | ||
|
r4915 | chunkiter = changegroup.chunkiter(source) | ||
|
r4970 | if fl.addgroup(chunkiter, revmap, trp) is None: | ||
|
r4915 | raise util.Abort(_("received file revlog group is empty")) | ||
|
r6750 | revisions += len(fl) - o | ||
|
r4915 | files += 1 | ||
|
r8392 | newheads = len(cl.heads()) | ||
|
r4915 | heads = "" | ||
if oldheads and newheads != oldheads: | ||||
heads = _(" (%+d heads)") % (newheads - oldheads) | ||||
|
r1998 | |||
|
r4915 | self.ui.status(_("added %d changesets" | ||
" with %d changes to %d files%s\n") | ||||
% (changesets, revisions, files, heads)) | ||||
|
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) | ||
# make changelog see real files again | ||||
cl.finalize(trp) | ||||
|
r1089 | |||
|
r4915 | tr.close() | ||
finally: | ||||
del tr | ||||
|
r1089 | |||
|
r1375 | if changesets > 0: | ||
|
r5988 | # forcefully update the on-disk branch cache | ||
|
r9467 | self.ui.debug("updating the branch cache\n") | ||
|
r5988 | self.branchtags() | ||
|
r8393 | self.hook("changegroup", node=hex(cl.node(clstart)), | ||
|
r2673 | source=srctype, url=url) | ||
|
r1089 | |||
|
r8393 | for i in xrange(clstart, clend): | ||
|
r8392 | self.hook("incoming", node=hex(cl.node(i)), | ||
|
r2673 | source=srctype, url=url) | ||
|
r1316 | |||
|
r3803 | # never return 0 here: | ||
if newheads < oldheads: | ||||
return newheads - oldheads - 1 | ||||
else: | ||||
return newheads - oldheads + 1 | ||||
|
r2019 | |||
|
r1089 | |||
|
r2612 | def stream_in(self, remote): | ||
|
r2621 | fp = remote.stream_out() | ||
|
r3564 | l = fp.readline() | ||
try: | ||||
resp = int(l) | ||||
except ValueError: | ||||
|
r7641 | raise error.ResponseError( | ||
|
r3564 | _('Unexpected response from remote server:'), l) | ||
|
r3687 | if resp == 1: | ||
|
r2621 | raise util.Abort(_('operation forbidden by server')) | ||
|
r3687 | elif resp == 2: | ||
raise util.Abort(_('locking the remote repository failed')) | ||||
elif resp != 0: | ||||
raise util.Abort(_('the server sent an unknown error code')) | ||||
|
r2612 | self.ui.status(_('streaming all changes\n')) | ||
|
r3564 | l = fp.readline() | ||
try: | ||||
total_files, total_bytes = map(int, l.split(' ', 1)) | ||||
|
r6407 | except (ValueError, TypeError): | ||
|
r7641 | raise error.ResponseError( | ||
|
r3564 | _('Unexpected response from remote server:'), l) | ||
|
r2612 | 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): | ||||
|
r3720 | # XXX doesn't support '\n' or '\r' in filenames | ||
|
r3564 | l = fp.readline() | ||
try: | ||||
name, size = l.split('\0', 1) | ||||
size = int(size) | ||||
|
r7063 | except (ValueError, TypeError): | ||
|
r7641 | raise error.ResponseError( | ||
|
r3564 | _('Unexpected response from remote server:'), l) | ||
|
r9467 | self.ui.debug('adding %s (%s)\n' % (name, util.bytecount(size))) | ||
|
r8531 | # for backwards compat, name was partially encoded | ||
ofp = self.sopener(store.decodedir(name), 'w') | ||||
|
r2612 | for chunk in util.filechunkiter(fp, limit=size): | ||
ofp.write(chunk) | ||||
ofp.close() | ||||
elapsed = time.time() - start | ||||
|
r4128 | if elapsed <= 0: | ||
elapsed = 0.001 | ||||
|
r2612 | self.ui.status(_('transferred %s in %.1f seconds (%s/sec)\n') % | ||
(util.bytecount(total_bytes), elapsed, | ||||
util.bytecount(total_bytes / elapsed))) | ||||
|
r4613 | self.invalidate() | ||
|
r2612 | return len(self.heads()) + 1 | ||
|
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 | |||
|
r2613 | if stream and not heads and remote.capable('stream'): | ||
|
r2612 | return self.stream_in(remote) | ||
return self.pull(remote, heads) | ||||
|
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: | ||
util.rename(src, dest) | ||||
|
r1806 | return a | ||
|
r2740 | def instance(ui, path, create): | ||
return localrepository(ui, util.drop_scheme('file', path), create) | ||||
|
r3223 | |||
|
r2740 | def islocal(path): | ||
return True | ||||