localrepo.py
1863 lines
| 69.0 KiB
| text/x-python
|
PythonLexer
/ mercurial / localrepo.py
|
r1089 | # localrepo.py - read/write repository class for mercurial | ||
# | ||||
|
r2859 | # Copyright 2005, 2006 Matt Mackall <mpm@selenic.com> | ||
|
r1089 | # | ||
# This software may be used and distributed according to the terms | ||||
# of the GNU General Public License, incorporated herein by reference. | ||||
|
r1100 | from node import * | ||
|
r3891 | from i18n import _ | ||
|
r3877 | import repo, appendfile, changegroup | ||
import changelog, dirstate, filelog, manifest, context | ||||
import re, lock, transaction, tempfile, stat, mdiff, errno, ui | ||||
import os, revlog, time, util | ||||
|
r1089 | |||
|
r2612 | class localrepository(repo.repository): | ||
|
r3448 | capabilities = ('lookup', 'changegroupsubset') | ||
|
r3853 | supported = ('revlogv1', 'store') | ||
|
r2439 | |||
|
r1806 | def __del__(self): | ||
self.transhandle = None | ||||
|
r1839 | def __init__(self, parentui, path=None, create=0): | ||
|
r2612 | repo.repository.__init__(self) | ||
|
r1101 | if not path: | ||
p = os.getcwd() | ||||
while not os.path.isdir(os.path.join(p, ".hg")): | ||||
oldp = p | ||||
p = os.path.dirname(p) | ||||
|
r1615 | if p == oldp: | ||
|
r3079 | raise repo.RepoError(_("There is no Mercurial repository" | ||
" here (.hg not found)")) | ||||
|
r1101 | path = p | ||
|
r3850 | |||
|
r1101 | self.path = os.path.join(path, ".hg") | ||
|
r3850 | self.root = os.path.realpath(path) | ||
self.origroot = path | ||||
self.opener = util.opener(self.path) | ||||
self.wopener = util.opener(self.root) | ||||
|
r1089 | |||
|
r3035 | if not os.path.isdir(self.path): | ||
if create: | ||||
if not os.path.exists(path): | ||||
os.mkdir(path) | ||||
os.mkdir(self.path) | ||||
|
r3853 | os.mkdir(os.path.join(self.path, "store")) | ||
requirements = ("revlogv1", "store") | ||||
|
r3851 | reqfile = self.opener("requires", "w") | ||
for r in requirements: | ||||
reqfile.write("%s\n" % r) | ||||
reqfile.close() | ||||
|
r3853 | # create an invalid changelog | ||
|
r3861 | self.opener("00changelog.i", "a").write( | ||
'\0\0\0\2' # represents revlogv2 | ||||
' dummy changelog to prevent using the old repo layout' | ||||
) | ||||
|
r3035 | else: | ||
raise repo.RepoError(_("repository %s not found") % path) | ||||
elif create: | ||||
raise repo.RepoError(_("repository %s already exists") % path) | ||||
|
r3851 | else: | ||
# find requirements | ||||
try: | ||||
requirements = self.opener("requires").read().splitlines() | ||||
except IOError, inst: | ||||
if inst.errno != errno.ENOENT: | ||||
raise | ||||
requirements = [] | ||||
# check them | ||||
for r in requirements: | ||||
if r not in self.supported: | ||||
raise repo.RepoError(_("requirement '%s' not supported") % r) | ||||
|
r1089 | |||
|
r3850 | # setup store | ||
|
r3853 | if "store" in requirements: | ||
self.encodefn = util.encodefilename | ||||
self.decodefn = util.decodefilename | ||||
self.spath = os.path.join(self.path, "store") | ||||
else: | ||||
self.encodefn = lambda x: x | ||||
self.decodefn = lambda x: x | ||||
self.spath = self.path | ||||
self.sopener = util.encodedopener(util.opener(self.spath), self.encodefn) | ||||
|
r3850 | |||
|
r1839 | self.ui = ui.ui(parentui=parentui) | ||
|
r2072 | try: | ||
self.ui.readconfig(self.join("hgrc"), self.root) | ||||
except IOError: | ||||
pass | ||||
|
r3340 | v = self.ui.configrevlog() | ||
|
r2222 | self.revlogversion = int(v.get('format', revlog.REVLOG_DEFAULT_FORMAT)) | ||
|
r2152 | self.revlogv1 = self.revlogversion != revlog.REVLOGV0 | ||
|
r2222 | fl = v.get('flags', None) | ||
|
r2073 | flags = 0 | ||
|
r2222 | if fl != None: | ||
for x in fl.split(): | ||||
flags |= revlog.flagstr(x) | ||||
elif self.revlogv1: | ||||
flags = revlog.REVLOG_DEFAULT_FLAGS | ||||
|
r2073 | |||
v = self.revlogversion | flags | ||||
|
r3457 | self.manifest = manifest.manifest(self.sopener, v) | ||
self.changelog = changelog.changelog(self.sopener, v) | ||||
|
r2072 | |||
|
r3835 | fallback = self.ui.config('ui', 'fallbackencoding') | ||
if fallback: | ||||
util._fallbackencoding = fallback | ||||
|
r2073 | # the changelog might not have the inline index flag | ||
# on. If the format of the changelog is the same as found in | ||||
# .hgrc, apply any flags found in the .hgrc as well. | ||||
# Otherwise, just version from the changelog | ||||
v = self.changelog.version | ||||
if v == self.revlogversion: | ||||
v |= flags | ||||
self.revlogversion = v | ||||
|
r1089 | self.tagscache = None | ||
|
r3417 | self.branchcache = None | ||
|
r1089 | self.nodetagscache = None | ||
|
r1258 | self.encodepats = None | ||
self.decodepats = None | ||||
|
r1806 | self.transhandle = None | ||
|
r1089 | |||
|
r1839 | self.dirstate = dirstate.dirstate(self.opener, self.ui, self.root) | ||
|
r2155 | |||
|
r2673 | def url(self): | ||
return 'file:' + self.root | ||||
|
r1718 | def hook(self, name, throw=False, **args): | ||
|
r2155 | def callhook(hname, funcname): | ||
'''call python hook. hook is callable object, looked up as | ||||
name in python module. if callable returns "true", hook | ||||
|
r2221 | fails, else passes. if hook raises exception, treated as | ||
hook failure. exception propagates if throw is "true". | ||||
reason for "true" meaning "hook failed" is so that | ||||
unmodified commands (e.g. mercurial.commands.update) can | ||||
be run as hooks without wrappers to convert return values.''' | ||||
|
r2155 | |||
self.ui.note(_("calling hook %s: %s\n") % (hname, funcname)) | ||||
d = funcname.rfind('.') | ||||
if d == -1: | ||||
raise util.Abort(_('%s hook is invalid ("%s" not in a module)') | ||||
% (hname, funcname)) | ||||
modname = funcname[:d] | ||||
try: | ||||
obj = __import__(modname) | ||||
except ImportError: | ||||
|
r2581 | try: | ||
# extensions are loaded with hgext_ prefix | ||||
obj = __import__("hgext_%s" % modname) | ||||
except ImportError: | ||||
raise util.Abort(_('%s hook is invalid ' | ||||
'(import of "%s" failed)') % | ||||
(hname, modname)) | ||||
|
r2155 | try: | ||
for p in funcname.split('.')[1:]: | ||||
obj = getattr(obj, p) | ||||
except AttributeError, err: | ||||
raise util.Abort(_('%s hook is invalid ' | ||||
'("%s" is not defined)') % | ||||
(hname, funcname)) | ||||
if not callable(obj): | ||||
raise util.Abort(_('%s hook is invalid ' | ||||
'("%s" is not callable)') % | ||||
(hname, funcname)) | ||||
try: | ||||
|
r2190 | r = obj(ui=self.ui, repo=self, hooktype=name, **args) | ||
|
r2155 | except (KeyboardInterrupt, util.SignalInterrupt): | ||
raise | ||||
except Exception, exc: | ||||
if isinstance(exc, util.Abort): | ||||
self.ui.warn(_('error: %s hook failed: %s\n') % | ||||
|
r3072 | (hname, exc.args[0])) | ||
|
r2155 | else: | ||
self.ui.warn(_('error: %s hook raised an exception: ' | ||||
'%s\n') % (hname, exc)) | ||||
if throw: | ||||
raise | ||||
|
r2335 | self.ui.print_exc() | ||
|
r2221 | return True | ||
if r: | ||||
|
r2155 | if throw: | ||
raise util.Abort(_('%s hook failed') % hname) | ||||
|
r2221 | self.ui.warn(_('warning: %s hook failed\n') % hname) | ||
|
r2155 | return r | ||
|
r1480 | def runhook(name, cmd): | ||
self.ui.note(_("running hook %s: %s\n") % (name, cmd)) | ||||
|
r2288 | env = dict([('HG_' + k.upper(), v) for k, v in args.iteritems()]) | ||
|
r1882 | r = util.system(cmd, environ=env, cwd=self.root) | ||
|
r1089 | if r: | ||
|
r1718 | desc, r = util.explain_exit(r) | ||
if throw: | ||||
raise util.Abort(_('%s hook %s') % (name, desc)) | ||||
|
r2221 | self.ui.warn(_('warning: %s hook %s\n') % (name, desc)) | ||
return r | ||||
|
r1480 | |||
|
r2221 | r = False | ||
|
r1838 | hooks = [(hname, cmd) for hname, cmd in self.ui.configitems("hooks") | ||
if hname.split(".", 1)[0] == name and cmd] | ||||
hooks.sort() | ||||
for hname, cmd in hooks: | ||||
|
r2155 | if cmd.startswith('python:'): | ||
|
r2221 | r = callhook(hname, cmd[7:].strip()) or r | ||
|
r2155 | else: | ||
|
r2221 | r = runhook(hname, cmd) or r | ||
|
r1480 | return r | ||
|
r1089 | |||
|
r2601 | tag_disallowed = ':\r\n' | ||
|
r2967 | def tag(self, name, node, message, local, user, date): | ||
|
r2601 | '''tag a revision with a symbolic name. | ||
if local is True, the tag is stored in a per-repository file. | ||||
otherwise, it is stored in the .hgtags file, and a new | ||||
changeset is committed with the change. | ||||
keyword arguments: | ||||
local: whether to store tag in non-version-controlled file | ||||
(default False) | ||||
message: commit message to use if committing | ||||
user: name of user to use if committing | ||||
date: date tuple to use if committing''' | ||||
for c in self.tag_disallowed: | ||||
if c in name: | ||||
raise util.Abort(_('%r cannot be used in a tag name') % c) | ||||
|
r2967 | self.hook('pretag', throw=True, node=hex(node), tag=name, local=local) | ||
|
r2601 | |||
if local: | ||||
|
r3772 | # local tags are stored in the current charset | ||
|
r2967 | self.opener('localtags', 'a').write('%s %s\n' % (hex(node), name)) | ||
self.hook('tag', node=hex(node), tag=name, local=local) | ||||
|
r2601 | return | ||
|
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)')) | ||||
|
r3772 | # committed tags are stored in UTF-8 | ||
line = '%s %s\n' % (hex(node), util.fromlocal(name)) | ||||
self.wfile('.hgtags', 'ab').write(line) | ||||
|
r2601 | if self.dirstate.state('.hgtags') == '?': | ||
self.add(['.hgtags']) | ||||
self.commit(['.hgtags'], message, user, date) | ||||
|
r2967 | self.hook('tag', node=hex(node), tag=name, local=local) | ||
|
r2601 | |||
|
r1089 | def tags(self): | ||
'''return a mapping of tag to node''' | ||||
if not self.tagscache: | ||||
self.tagscache = {} | ||||
|
r1986 | def parsetag(line, context): | ||
if not line: | ||||
return | ||||
s = l.split(" ", 1) | ||||
if len(s) != 2: | ||||
|
r2320 | self.ui.warn(_("%s: cannot parse entry\n") % context) | ||
|
r1986 | return | ||
node, key = s | ||||
|
r3772 | key = util.tolocal(key.strip()) # stored in UTF-8 | ||
|
r1986 | try: | ||
bin_n = bin(node) | ||||
except TypeError: | ||||
|
r2320 | self.ui.warn(_("%s: node '%s' is not well formed\n") % | ||
(context, node)) | ||||
|
r1986 | return | ||
if bin_n not in self.changelog.nodemap: | ||||
|
r2320 | self.ui.warn(_("%s: tag '%s' refers to unknown node\n") % | ||
(context, key)) | ||||
|
r1986 | return | ||
|
r2320 | self.tagscache[key] = bin_n | ||
|
r1986 | |||
|
r2320 | # read the tags file from each head, ending with the tip, | ||
|
r1986 | # and add each tag found to the map, with "newer" ones | ||
# taking precedence | ||||
|
r3577 | f = None | ||
for rev, node, fnode in self._hgtagsnodes(): | ||||
f = (f and f.filectx(fnode) or | ||||
self.filectx('.hgtags', fileid=fnode)) | ||||
|
r1986 | count = 0 | ||
|
r3455 | for l in f.data().splitlines(): | ||
|
r1986 | count += 1 | ||
|
r3455 | parsetag(l, _("%s, line %d") % (str(f), count)) | ||
|
r3456 | |||
|
r1089 | try: | ||
f = self.opener("localtags") | ||||
|
r1986 | count = 0 | ||
|
r1089 | for l in f: | ||
|
r3772 | # localtags are stored in the local character set | ||
# while the internal tag table is stored in UTF-8 | ||||
l = util.fromlocal(l) | ||||
|
r1986 | count += 1 | ||
|
r2320 | parsetag(l, _("localtags, line %d") % count) | ||
|
r1089 | except IOError: | ||
pass | ||||
self.tagscache['tip'] = self.changelog.tip() | ||||
return self.tagscache | ||||
|
r3577 | def _hgtagsnodes(self): | ||
heads = self.heads() | ||||
heads.reverse() | ||||
last = {} | ||||
ret = [] | ||||
for node in heads: | ||||
c = self.changectx(node) | ||||
rev = c.rev() | ||||
try: | ||||
fnode = c.filenode('.hgtags') | ||||
except repo.LookupError: | ||||
continue | ||||
ret.append((rev, node, fnode)) | ||||
if fnode in last: | ||||
ret[last[fnode]] = None | ||||
last[fnode] = len(ret) - 1 | ||||
return [item for item in ret if item] | ||||
|
r1089 | def tagslist(self): | ||
'''return a list of tags ordered by revision''' | ||||
l = [] | ||||
for t, n in self.tags().items(): | ||||
try: | ||||
r = self.changelog.rev(n) | ||||
except: | ||||
r = -2 # sort to the beginning of the list if unknown | ||||
|
r1615 | l.append((r, t, n)) | ||
|
r1089 | l.sort() | ||
|
r1615 | return [(t, n) for r, t, n in l] | ||
|
r1089 | |||
def nodetags(self, node): | ||||
'''return the tags associated with a node''' | ||||
if not self.nodetagscache: | ||||
self.nodetagscache = {} | ||||
|
r1615 | for t, n in self.tags().items(): | ||
self.nodetagscache.setdefault(n, []).append(t) | ||||
|
r1089 | return self.nodetagscache.get(node, []) | ||
|
r3826 | def _branchtags(self): | ||
|
r3491 | partial, last, lrev = self._readbranchcache() | ||
tiprev = self.changelog.count() - 1 | ||||
if lrev != tiprev: | ||||
self._updatebranchcache(partial, lrev+1, tiprev+1) | ||||
self._writebranchcache(partial, self.changelog.tip(), tiprev) | ||||
|
r3826 | return partial | ||
def branchtags(self): | ||||
if self.branchcache is not None: | ||||
return self.branchcache | ||||
self.branchcache = {} # avoid recursion in changectx | ||||
partial = self._branchtags() | ||||
|
r3773 | # the branch cache is stored on disk as UTF-8, but in the local | ||
# charset internally | ||||
for k, v in partial.items(): | ||||
self.branchcache[util.tolocal(k)] = v | ||||
|
r3491 | return self.branchcache | ||
def _readbranchcache(self): | ||||
partial = {} | ||||
|
r3417 | try: | ||
f = self.opener("branches.cache") | ||||
|
r3668 | lines = f.read().split('\n') | ||
f.close() | ||||
last, lrev = lines.pop(0).rstrip().split(" ", 1) | ||||
|
r3417 | last, lrev = bin(last), int(lrev) | ||
|
r3761 | if not (lrev < self.changelog.count() and | ||
self.changelog.node(lrev) == last): # sanity check | ||||
# invalidate the cache | ||||
raise ValueError('Invalid branch cache: unknown tip') | ||||
for l in lines: | ||||
if not l: continue | ||||
node, label = l.rstrip().split(" ", 1) | ||||
partial[label] = bin(node) | ||||
except (KeyboardInterrupt, util.SignalInterrupt): | ||||
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: | ||
f = self.opener("branches.cache", "w") | ||||
|
r3491 | f.write("%s %s\n" % (hex(tip), tiprev)) | ||
for label, node in branches.iteritems(): | ||||
|
r3452 | f.write("%s %s\n" % (hex(node), label)) | ||
except IOError: | ||||
pass | ||||
|
r3417 | |||
|
r3491 | def _updatebranchcache(self, partial, start, end): | ||
for r in xrange(start, end): | ||||
c = self.changectx(r) | ||||
b = c.branch() | ||||
if b: | ||||
partial[b] = c.node() | ||||
|
r1089 | def lookup(self, key): | ||
|
r3418 | if key == '.': | ||
key = self.dirstate.parents()[0] | ||||
if key == nullid: | ||||
raise repo.RepoError(_("no revision checked out")) | ||||
|
r3801 | elif key == 'null': | ||
return nullid | ||||
|
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 | ||||
raise repo.RepoError(_("unknown revision '%s'") % key) | ||||
|
r1089 | |||
def dev(self): | ||||
|
r2448 | return os.lstat(self.path).st_dev | ||
|
r1089 | |||
def local(self): | ||||
|
r1101 | return True | ||
|
r1089 | |||
def join(self, f): | ||||
return os.path.join(self.path, f) | ||||
|
r3457 | def sjoin(self, f): | ||
|
r3853 | f = self.encodefn(f) | ||
|
r3791 | return os.path.join(self.spath, f) | ||
|
r3457 | |||
|
r1089 | def wjoin(self, f): | ||
return os.path.join(self.root, f) | ||||
def file(self, f): | ||||
|
r1615 | if f[0] == '/': | ||
f = f[1:] | ||||
|
r3457 | return filelog.filelog(self.sopener, f, self.revlogversion) | ||
|
r1089 | |||
|
r3132 | def changectx(self, changeid=None): | ||
|
r2564 | return context.changectx(self, changeid) | ||
|
r3218 | def workingctx(self): | ||
return context.workingctx(self) | ||||
|
r3163 | def parents(self, changeid=None): | ||
''' | ||||
get list of changectxs for parents of changeid or working directory | ||||
''' | ||||
if changeid is None: | ||||
pl = self.dirstate.parents() | ||||
else: | ||||
n = self.changelog.lookup(changeid) | ||||
pl = self.changelog.parents(n) | ||||
|
r3164 | if pl[1] == nullid: | ||
return [self.changectx(pl[0])] | ||||
return [self.changectx(pl[0]), self.changectx(pl[1])] | ||||
|
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() | ||||
def wfile(self, f, mode='r'): | ||||
return self.wopener(f, mode) | ||||
def wread(self, filename): | ||||
|
r1258 | if self.encodepats == None: | ||
l = [] | ||||
for pat, cmd in self.ui.configitems("encode"): | ||||
|
r1947 | mf = util.matcher(self.root, "", [pat], [], [])[1] | ||
|
r1258 | l.append((mf, cmd)) | ||
self.encodepats = l | ||||
data = self.wopener(filename, 'r').read() | ||||
for mf, cmd in self.encodepats: | ||||
if mf(filename): | ||||
|
r1402 | self.ui.debug(_("filtering %s through %s\n") % (filename, cmd)) | ||
|
r1258 | data = util.filter(data, cmd) | ||
break | ||||
return data | ||||
|
r1089 | |||
def wwrite(self, filename, data, fd=None): | ||||
|
r1258 | if self.decodepats == None: | ||
l = [] | ||||
for pat, cmd in self.ui.configitems("decode"): | ||||
|
r1947 | mf = util.matcher(self.root, "", [pat], [], [])[1] | ||
|
r1258 | l.append((mf, cmd)) | ||
self.decodepats = l | ||||
for mf, cmd in self.decodepats: | ||||
if mf(filename): | ||||
|
r1402 | self.ui.debug(_("filtering %s through %s\n") % (filename, cmd)) | ||
|
r1258 | data = util.filter(data, cmd) | ||
break | ||||
|
r1089 | if fd: | ||
return fd.write(data) | ||||
return self.wopener(filename, 'w').write(data) | ||||
def transaction(self): | ||||
|
r1806 | tr = self.transhandle | ||
if tr != None and tr.running(): | ||||
return tr.nest() | ||||
|
r2362 | # save dirstate for rollback | ||
|
r1089 | try: | ||
ds = self.opener("dirstate").read() | ||||
except IOError: | ||||
ds = "" | ||||
self.opener("journal.dirstate", "w").write(ds) | ||||
|
r3790 | renames = [(self.sjoin("journal"), self.sjoin("undo")), | ||
(self.join("journal.dirstate"), self.join("undo.dirstate"))] | ||||
|
r3457 | tr = transaction.transaction(self.ui.warn, self.sopener, | ||
self.sjoin("journal"), | ||||
|
r3790 | aftertrans(renames)) | ||
|
r1806 | self.transhandle = tr | ||
return tr | ||||
|
r1089 | |||
def recover(self): | ||||
|
r1749 | l = self.lock() | ||
|
r3457 | if os.path.exists(self.sjoin("journal")): | ||
|
r1402 | self.ui.status(_("rolling back interrupted transaction\n")) | ||
|
r3457 | transaction.rollback(self.sopener, self.sjoin("journal")) | ||
|
r1784 | self.reload() | ||
|
r1516 | return True | ||
|
r1089 | else: | ||
|
r1402 | self.ui.warn(_("no interrupted transaction available\n")) | ||
|
r1516 | return False | ||
|
r1089 | |||
|
r2362 | def rollback(self, wlock=None): | ||
|
r1712 | if not wlock: | ||
wlock = self.wlock() | ||||
|
r1749 | l = self.lock() | ||
|
r3457 | if os.path.exists(self.sjoin("undo")): | ||
|
r1402 | self.ui.status(_("rolling back last transaction\n")) | ||
|
r3457 | transaction.rollback(self.sopener, self.sjoin("undo")) | ||
|
r1089 | util.rename(self.join("undo.dirstate"), self.join("dirstate")) | ||
|
r1784 | self.reload() | ||
self.wreload() | ||||
|
r1089 | else: | ||
|
r2362 | self.ui.warn(_("no rollback information available\n")) | ||
|
r1089 | |||
|
r1784 | def wreload(self): | ||
self.dirstate.read() | ||||
def reload(self): | ||||
self.changelog.load() | ||||
self.manifest.load() | ||||
self.tagscache = None | ||||
self.nodetagscache = None | ||||
|
r2016 | def do_lock(self, lockname, wait, releasefn=None, acquirefn=None, | ||
desc=None): | ||||
|
r1089 | try: | ||
|
r3457 | l = lock.lock(lockname, 0, releasefn, desc=desc) | ||
|
r1531 | except lock.LockHeld, inst: | ||
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 | ||||
def lock(self, wait=1): | ||||
|
r3457 | return self.do_lock(self.sjoin("lock"), wait, acquirefn=self.reload, | ||
|
r2016 | desc=_('repository %s') % self.origroot) | ||
|
r1751 | |||
def wlock(self, wait=1): | ||||
|
r3457 | return self.do_lock(self.join("wlock"), wait, self.dirstate.write, | ||
|
r2016 | self.wreload, | ||
desc=_('working directory of %s') % self.origroot) | ||||
|
r1531 | |||
|
r3294 | def filecommit(self, fn, manifest1, manifest2, linkrev, transaction, changelist): | ||
|
r3292 | """ | ||
|
r3294 | commit an individual file as part of a larger transaction | ||
""" | ||||
|
r3292 | |||
|
r3294 | t = self.wread(fn) | ||
fl = self.file(fn) | ||||
fp1 = manifest1.get(fn, nullid) | ||||
fp2 = manifest2.get(fn, nullid) | ||||
|
r1716 | |||
|
r3292 | meta = {} | ||
|
r3294 | cp = self.dirstate.copied(fn) | ||
|
r3292 | if cp: | ||
meta["copy"] = cp | ||||
if not manifest2: # not a branch merge | ||||
meta["copyrev"] = hex(manifest1.get(cp, nullid)) | ||||
fp2 = nullid | ||||
elif fp2 != nullid: # copied on remote side | ||||
meta["copyrev"] = hex(manifest1.get(cp, nullid)) | ||||
|
r3733 | elif fp1 != nullid: # copied on local side, reversed | ||
|
r3292 | meta["copyrev"] = hex(manifest2.get(cp)) | ||
fp2 = nullid | ||||
|
r3733 | else: # directory rename | ||
meta["copyrev"] = hex(manifest1.get(cp, nullid)) | ||||
|
r3292 | self.ui.debug(_(" %s: copy %s:%s\n") % | ||
|
r3294 | (fn, cp, meta["copyrev"])) | ||
|
r3292 | fp1 = nullid | ||
elif fp2 != nullid: | ||||
|
r1716 | # is one parent an ancestor of the other? | ||
|
r3294 | fpa = fl.ancestor(fp1, fp2) | ||
|
r1716 | if fpa == fp1: | ||
fp1, fp2 = fp2, nullid | ||||
elif fpa == fp2: | ||||
fp2 = nullid | ||||
# is the file unmodified from the parent? report existing entry | ||||
|
r3294 | if fp2 == nullid and not fl.cmp(fp1, t): | ||
return fp1 | ||||
|
r1716 | |||
|
r3294 | changelist.append(fn) | ||
return fl.add(t, meta, transaction, linkrev, fp1, fp2) | ||||
|
r1716 | |||
|
r1712 | def rawcommit(self, files, text, user, date, p1=None, p2=None, wlock=None): | ||
|
r3621 | if p1 is None: | ||
p1, p2 = self.dirstate.parents() | ||||
return self.commit(files=files, text=text, user=user, date=date, | ||||
p1=p1, p2=p2, wlock=wlock) | ||||
|
r1089 | |||
|
r1615 | def commit(self, files=None, text="", user=None, date=None, | ||
|
r2267 | match=util.always, force=False, lock=None, wlock=None, | ||
|
r3664 | force_editor=False, p1=None, p2=None, extra={}): | ||
|
r3621 | |||
|
r1089 | commit = [] | ||
remove = [] | ||||
changed = [] | ||||
|
r3621 | use_dirstate = (p1 is None) # not rawcommit | ||
|
r3664 | extra = extra.copy() | ||
|
r1089 | |||
|
r3621 | if use_dirstate: | ||
if files: | ||||
for f in files: | ||||
s = self.dirstate.state(f) | ||||
if s in 'nmai': | ||||
commit.append(f) | ||||
elif s == 'r': | ||||
remove.append(f) | ||||
else: | ||||
self.ui.warn(_("%s not tracked!\n") % f) | ||||
else: | ||||
changes = self.status(match=match)[:5] | ||||
modified, added, removed, deleted, unknown = changes | ||||
commit = modified + added | ||||
remove = removed | ||||
|
r1089 | else: | ||
|
r3621 | commit = files | ||
|
r1089 | |||
|
r3621 | if use_dirstate: | ||
p1, p2 = self.dirstate.parents() | ||||
update_dirstate = True | ||||
else: | ||||
p1, p2 = p1, p2 or nullid | ||||
update_dirstate = (self.dirstate.parents()[0] == p1) | ||||
|
r1089 | c1 = self.changelog.read(p1) | ||
c2 = self.changelog.read(p2) | ||||
|
r2840 | m1 = self.manifest.read(c1[0]).copy() | ||
|
r1089 | m2 = self.manifest.read(c2[0]) | ||
|
r3621 | if use_dirstate: | ||
|
r3862 | branchname = self.workingctx().branch() | ||
try: | ||||
branchname = branchname.decode('UTF-8').encode('UTF-8') | ||||
except UnicodeDecodeError: | ||||
raise util.Abort(_('branch name not in UTF-8!')) | ||||
|
r3621 | else: | ||
branchname = "" | ||||
|
r3419 | |||
|
r3621 | if use_dirstate: | ||
|
r3773 | oldname = c1[5].get("branch", "") # stored in UTF-8 | ||
|
r3621 | if not commit and not remove and not force and p2 == nullid and \ | ||
branchname == oldname: | ||||
self.ui.status(_("nothing changed\n")) | ||||
return None | ||||
|
r1089 | |||
|
r1721 | xp1 = hex(p1) | ||
if p2 == nullid: xp2 = '' | ||||
else: xp2 = hex(p2) | ||||
|
r1727 | self.hook("precommit", throw=True, parent1=xp1, parent2=xp2) | ||
|
r1089 | |||
|
r1712 | if not wlock: | ||
wlock = self.wlock() | ||||
|
r1807 | if not lock: | ||
lock = self.lock() | ||||
|
r1089 | tr = self.transaction() | ||
# check in files | ||||
|
r3675 | new = {} | ||
|
r1089 | linkrev = self.changelog.count() | ||
commit.sort() | ||||
for f in commit: | ||||
self.ui.note(f + "\n") | ||||
try: | ||||
|
r3675 | new[f] = self.filecommit(f, m1, m2, linkrev, tr, changed) | ||
|
r2840 | m1.set(f, util.is_exec(self.wjoin(f), m1.execf(f))) | ||
|
r1089 | except IOError: | ||
|
r3621 | if use_dirstate: | ||
self.ui.warn(_("trouble committing %s!\n") % f) | ||||
raise | ||||
else: | ||||
remove.append(f) | ||||
|
r1089 | |||
# update manifest | ||||
|
r3675 | m1.update(new) | ||
|
r3620 | remove.sort() | ||
|
r1089 | for f in remove: | ||
if f in m1: | ||||
del m1[f] | ||||
|
r3294 | mn = self.manifest.add(m1, tr, linkrev, c1[0], c2[0], (new, remove)) | ||
|
r1089 | |||
# add changeset | ||||
|
r3675 | new = new.keys() | ||
new.sort() | ||||
|
r1983 | user = user or self.ui.username() | ||
|
r2267 | if not text or force_editor: | ||
edittext = [] | ||||
if text: | ||||
edittext.append(text) | ||||
edittext.append("") | ||||
|
r3721 | edittext.append("HG: user: %s" % user) | ||
|
r1089 | if p2 != nullid: | ||
|
r1709 | edittext.append("HG: branch merge") | ||
edittext.extend(["HG: changed %s" % f for f in changed]) | ||||
edittext.extend(["HG: removed %s" % f for f in remove]) | ||||
|
r1089 | if not changed and not remove: | ||
|
r1709 | edittext.append("HG: no files changed") | ||
edittext.append("") | ||||
|
r1706 | # run editor in the repository root | ||
olddir = os.getcwd() | ||||
os.chdir(self.root) | ||||
|
r2301 | text = self.ui.edit("\n".join(edittext), user) | ||
|
r1706 | os.chdir(olddir) | ||
|
r1089 | |||
|
r2301 | lines = [line.rstrip() for line in text.rstrip().splitlines()] | ||
while lines and not lines[0]: | ||||
del lines[0] | ||||
if not lines: | ||||
return None | ||||
text = '\n'.join(lines) | ||||
|
r3419 | if branchname: | ||
extra["branch"] = branchname | ||||
n = self.changelog.add(mn, changed + remove, text, tr, p1, p2, | ||||
user, date, extra) | ||||
|
r1727 | self.hook('pretxncommit', throw=True, node=hex(n), parent1=xp1, | ||
parent2=xp2) | ||||
|
r1089 | tr.close() | ||
|
r3621 | if use_dirstate or update_dirstate: | ||
self.dirstate.setparents(n) | ||||
if use_dirstate: | ||||
self.dirstate.update(new, "n") | ||||
self.dirstate.forget(remove) | ||||
|
r1089 | |||
|
r1727 | self.hook("commit", node=hex(n), parent1=xp1, parent2=xp2) | ||
|
r1089 | return n | ||
|
r2029 | def walk(self, node=None, files=[], match=util.always, badmatch=None): | ||
|
r3532 | ''' | ||
walk recursively through the directory tree or a given | ||||
changeset, finding all files matched by the match | ||||
function | ||||
results are yielded in a tuple (src, filename), where src | ||||
is one of: | ||||
'f' the file was found in the directory tree | ||||
'm' the file was only in the dirstate and not in the tree | ||||
'b' file was not found and matched badmatch | ||||
''' | ||||
|
r1089 | if node: | ||
|
r1582 | fdict = dict.fromkeys(files) | ||
|
r1089 | for fn in self.manifest.read(self.changelog.read(node)[0]): | ||
|
r3019 | for ffn in fdict: | ||
# match if the file is the exact name or a directory | ||||
if ffn == fn or fn.startswith("%s/" % ffn): | ||||
del fdict[ffn] | ||||
break | ||||
|
r1582 | if match(fn): | ||
yield 'm', fn | ||||
for fn in fdict: | ||||
|
r2029 | if badmatch and badmatch(fn): | ||
if match(fn): | ||||
yield 'b', fn | ||||
else: | ||||
self.ui.warn(_('%s: No such file in rev %s\n') % ( | ||||
util.pathto(self.getcwd(), fn), short(node))) | ||||
|
r1089 | else: | ||
|
r2042 | for src, fn in self.dirstate.walk(files, match, badmatch=badmatch): | ||
|
r1089 | yield src, fn | ||
|
r2661 | def status(self, node1=None, node2=None, files=[], match=util.always, | ||
wlock=None, list_ignored=False, list_clean=False): | ||||
"""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 | |||
def fcmp(fn, mf): | ||||
t1 = self.wread(fn) | ||||
|
r2887 | return self.file(fn).cmp(mf.get(fn, nullid), t1) | ||
|
r1089 | |||
def mfmatches(node): | ||||
|
r1616 | change = self.changelog.read(node) | ||
|
r3322 | mf = self.manifest.read(change[0]).copy() | ||
|
r1089 | for fn in mf.keys(): | ||
if not match(fn): | ||||
del mf[fn] | ||||
return mf | ||||
|
r2661 | modified, added, removed, deleted, unknown = [], [], [], [], [] | ||
ignored, clean = [], [] | ||||
|
r2474 | compareworking = False | ||
|
r2491 | if not node1 or (not node2 and node1 == self.dirstate.parents()[0]): | ||
|
r2474 | compareworking = True | ||
if not compareworking: | ||||
|
r1802 | # read the manifest from node1 before the manifest from node2, | ||
# so that we'll hit the manifest cache if we're going through | ||||
# all the revisions in parent->child order. | ||||
mf1 = mfmatches(node1) | ||||
|
r1089 | # are we comparing the working directory? | ||
if not node2: | ||||
|
r1712 | if not wlock: | ||
try: | ||||
wlock = self.wlock(wait=0) | ||||
|
r1754 | except lock.LockException: | ||
|
r1712 | wlock = None | ||
|
r2661 | (lookup, modified, added, removed, deleted, unknown, | ||
ignored, clean) = self.dirstate.status(files, match, | ||||
list_ignored, list_clean) | ||||
|
r1089 | |||
# are we comparing working dir against its parent? | ||||
|
r2474 | if compareworking: | ||
|
r1616 | if lookup: | ||
|
r1089 | # do a full compare of any files that might have changed | ||
|
r1616 | mf2 = mfmatches(self.dirstate.parents()[0]) | ||
for f in lookup: | ||||
|
r1089 | if fcmp(f, mf2): | ||
|
r1616 | modified.append(f) | ||
|
r2961 | else: | ||
clean.append(f) | ||||
if wlock is not None: | ||||
self.dirstate.update([f], "n") | ||||
|
r1616 | else: | ||
# we are comparing working dir against non-parent | ||||
# generate a pseudo-manifest for the working dir | ||||
|
r3322 | # XXX: create it in dirstate.py ? | ||
|
r1616 | mf2 = mfmatches(self.dirstate.parents()[0]) | ||
for f in lookup + modified + added: | ||||
mf2[f] = "" | ||||
|
r3322 | mf2.set(f, execf=util.is_exec(self.wjoin(f), mf2.execf(f))) | ||
|
r1617 | for f in removed: | ||
|
r1616 | if f in mf2: | ||
del mf2[f] | ||||
|
r1089 | else: | ||
|
r1616 | # we are comparing two revisions | ||
mf2 = mfmatches(node2) | ||||
|
r1089 | |||
|
r2474 | if not compareworking: | ||
|
r1616 | # flush lists from dirstate before comparing manifests | ||
|
r2661 | modified, added, clean = [], [], [] | ||
|
r1089 | |||
|
r2474 | # make sure to sort the files so we talk to the disk in a | ||
# reasonable order | ||||
mf2keys = mf2.keys() | ||||
mf2keys.sort() | ||||
for fn in mf2keys: | ||||
|
r1616 | if mf1.has_key(fn): | ||
|
r3322 | if mf1.flags(fn) != mf2.flags(fn) or \ | ||
(mf1[fn] != mf2[fn] and (mf2[fn] != "" or fcmp(fn, mf1))): | ||||
|
r1616 | modified.append(fn) | ||
|
r2661 | elif list_clean: | ||
clean.append(fn) | ||||
|
r1616 | del mf1[fn] | ||
else: | ||||
added.append(fn) | ||||
|
r1089 | |||
|
r1617 | removed = mf1.keys() | ||
|
r1616 | # sort and return results: | ||
|
r2661 | for l in modified, added, removed, deleted, unknown, ignored, clean: | ||
|
r1089 | l.sort() | ||
|
r2661 | return (modified, added, removed, deleted, unknown, ignored, clean) | ||
|
r1712 | def add(self, list, wlock=None): | ||
if not wlock: | ||||
wlock = self.wlock() | ||||
|
r1089 | for f in list: | ||
p = self.wjoin(f) | ||||
if not os.path.exists(p): | ||||
|
r1402 | self.ui.warn(_("%s does not exist!\n") % f) | ||
|
r1089 | elif not os.path.isfile(p): | ||
|
r1615 | self.ui.warn(_("%s not added: only files supported currently\n") | ||
% f) | ||||
|
r1089 | elif self.dirstate.state(f) in 'an': | ||
|
r1402 | self.ui.warn(_("%s already tracked!\n") % f) | ||
|
r1089 | else: | ||
self.dirstate.update([f], "a") | ||||
|
r1712 | def forget(self, list, wlock=None): | ||
if not wlock: | ||||
wlock = self.wlock() | ||||
|
r1089 | for f in list: | ||
if self.dirstate.state(f) not in 'ai': | ||||
|
r1402 | self.ui.warn(_("%s not added!\n") % f) | ||
|
r1089 | else: | ||
self.dirstate.forget([f]) | ||||
|
r1712 | def remove(self, list, unlink=False, wlock=None): | ||
|
r1415 | if unlink: | ||
for f in list: | ||||
try: | ||||
util.unlink(self.wjoin(f)) | ||||
except OSError, inst: | ||||
|
r1615 | if inst.errno != errno.ENOENT: | ||
raise | ||||
|
r1712 | if not wlock: | ||
wlock = self.wlock() | ||||
|
r1089 | for f in list: | ||
p = self.wjoin(f) | ||||
if os.path.exists(p): | ||||
|
r1402 | self.ui.warn(_("%s still exists!\n") % f) | ||
|
r1089 | elif self.dirstate.state(f) == 'a': | ||
self.dirstate.forget([f]) | ||||
elif f not in self.dirstate: | ||||
|
r1402 | self.ui.warn(_("%s not tracked!\n") % f) | ||
|
r1089 | else: | ||
self.dirstate.update([f], "r") | ||||
|
r1712 | def undelete(self, list, wlock=None): | ||
|
r1448 | p = self.dirstate.parents()[0] | ||
|
r1447 | mn = self.changelog.read(p)[0] | ||
m = self.manifest.read(mn) | ||||
|
r1712 | if not wlock: | ||
wlock = self.wlock() | ||||
|
r1447 | for f in list: | ||
if self.dirstate.state(f) not in "r": | ||||
self.ui.warn("%s not removed!\n" % f) | ||||
else: | ||||
t = self.file(f).read(m[f]) | ||||
|
r1477 | self.wwrite(f, t) | ||
|
r2840 | util.set_exec(self.wjoin(f), m.execf(f)) | ||
|
r1447 | self.dirstate.update([f], "n") | ||
|
r1712 | def copy(self, source, dest, wlock=None): | ||
|
r1089 | p = self.wjoin(dest) | ||
if not os.path.exists(p): | ||||
|
r1402 | self.ui.warn(_("%s does not exist!\n") % dest) | ||
|
r1089 | elif not os.path.isfile(p): | ||
|
r1402 | self.ui.warn(_("copy failed: %s is not a file\n") % dest) | ||
|
r1089 | else: | ||
|
r1712 | if not wlock: | ||
wlock = self.wlock() | ||||
|
r1089 | if self.dirstate.state(dest) == '?': | ||
self.dirstate.update([dest], "a") | ||||
self.dirstate.copy(source, dest) | ||||
|
r1551 | def heads(self, start=None): | ||
|
r1550 | heads = self.changelog.heads(start) | ||
# sort the output in rev descending order | ||||
heads = [(-self.changelog.rev(h), h) for h in heads] | ||||
heads.sort() | ||||
return [n for (r, n) in heads] | ||||
|
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 | ||||
while n != bottom: | ||||
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) | ||||
""" | ||||
|
r1089 | m = self.changelog.nodemap | ||
search = [] | ||||
fetch = {} | ||||
seen = {} | ||||
seenbranch = {} | ||||
if base == None: | ||||
base = {} | ||||
|
r2108 | if not heads: | ||
heads = remote.heads() | ||||
if self.changelog.tip() == nullid: | ||||
|
r2339 | base[nullid] = 1 | ||
|
r2108 | if heads != [nullid]: | ||
return [nullid] | ||||
return [] | ||||
|
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 | ||||
if not unknown: | ||||
|
r1895 | return [] | ||
|
r1089 | |||
|
r2339 | req = dict.fromkeys(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 | ||||
|
r1615 | self.ui.debug(_("examining %s:%s\n") | ||
% (short(n[0]), short(n[1]))) | ||||
|
r2339 | if n[0] == nullid: # found the end of the branch | ||
pass | ||||
elif n in seenbranch: | ||||
|
r1402 | self.ui.debug(_("branch already found\n")) | ||
|
r1089 | continue | ||
|
r2339 | elif n[1] and n[1] in m: # do we know the base? | ||
|
r1402 | self.ui.debug(_("found incomplete branch %s:%s\n") | ||
|
r1089 | % (short(n[0]), short(n[1]))) | ||
search.append(n) # schedule branch range for scanning | ||||
seenbranch[n] = 1 | ||||
else: | ||||
if n[1] not in seen and n[1] not in fetch: | ||||
if n[2] in m and n[3] in m: | ||||
|
r1402 | self.ui.debug(_("found new changeset %s\n") % | ||
|
r1089 | short(n[1])) | ||
fetch[n[1]] = 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) | ||||
req[p] = 1 | ||||
|
r1089 | seen[n[0]] = 1 | ||
if r: | ||||
reqcnt += 1 | ||||
|
r1402 | self.ui.debug(_("request %d: %s\n") % | ||
|
r1089 | (reqcnt, " ".join(map(short, r)))) | ||
|
r3473 | for p in xrange(0, len(r), 10): | ||
|
r1089 | for b in remote.branches(r[p:p+10]): | ||
|
r1402 | 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: | ||||
n = search.pop(0) | ||||
reqcnt += 1 | ||||
l = remote.between([(n[0], n[1])])[0] | ||||
l.append(n[1]) | ||||
p = n[0] | ||||
f = 1 | ||||
for i in l: | ||||
|
r1402 | self.ui.debug(_("narrowing %d:%d %s\n") % (f, len(l), short(i))) | ||
|
r1089 | if i in m: | ||
if f <= 2: | ||||
|
r1402 | self.ui.debug(_("found new branch changeset %s\n") % | ||
|
r1089 | short(p)) | ||
fetch[p] = 1 | ||||
base[i] = 1 | ||||
else: | ||||
|
r1402 | self.ui.debug(_("narrowed branch search to %s:%s\n") | ||
|
r1089 | % (short(p), short(i))) | ||
search.append((p, i)) | ||||
break | ||||
p, f = i, f * 2 | ||||
# sanity check our fetch list | ||||
for f in fetch.keys(): | ||||
if f in m: | ||||
|
r1402 | raise repo.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 | |||
|
r2965 | self.ui.debug(_("found new changesets starting at ") + | ||
|
r1089 | " ".join([short(f) for f in fetch]) + "\n") | ||
|
r1402 | self.ui.debug(_("%d total queries\n") % reqcnt) | ||
|
r1089 | |||
return fetch.keys() | ||||
|
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. | ||||
""" | ||||
|
r1089 | if base == None: | ||
base = {} | ||||
|
r1959 | self.findincoming(remote, base, heads, force=force) | ||
|
r1089 | |||
|
r1402 | self.ui.debug(_("common changesets up to ") | ||
|
r1089 | + " ".join(map(short, base.keys())) + "\n") | ||
remain = dict.fromkeys(self.changelog.nodemap) | ||||
# prune everything remote has from the tree | ||||
del remain[nullid] | ||||
remove = base.keys() | ||||
while remove: | ||||
n = remove.pop(0) | ||||
if n in remain: | ||||
del remain[n] | ||||
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 | ||
updated_heads = {} | ||||
|
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: | ||||
updated_heads[p1] = True | ||||
if p2 in heads: | ||||
updated_heads[p2] = True | ||||
|
r1089 | |||
# this is the set of all roots we have to push | ||||
|
r2021 | if heads: | ||
return subset, updated_heads.keys() | ||||
else: | ||||
return subset | ||||
|
r1089 | |||
|
r2827 | def pull(self, remote, heads=None, force=False, lock=None): | ||
mylock = False | ||||
if not lock: | ||||
lock = self.lock() | ||||
mylock = True | ||||
|
r1089 | |||
|
r2827 | try: | ||
fetch = self.findincoming(remote, force=force) | ||||
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 | |||
|
r2827 | if heads is None: | ||
cg = remote.changegroup(fetch, 'pull') | ||||
else: | ||||
|
r3448 | if 'changegroupsubset' not in remote.capabilities: | ||
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: | ||||
if mylock: | ||||
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): | ||||
|
r1089 | base = {} | ||
|
r2021 | remote_heads = remote.heads() | ||
inc = self.findincoming(remote, base, remote_heads, force=force) | ||||
|
r1089 | |||
|
r2021 | update, updated_heads = self.findoutgoing(remote, base, remote_heads) | ||
|
r1781 | if revs is not None: | ||
msng_cl, bases, heads = self.changelog.nodesbetween(update, revs) | ||||
else: | ||||
bases, heads = update, self.changelog.heads() | ||||
if not bases: | ||||
|
r1402 | self.ui.status(_("no changes found\n")) | ||
|
r2439 | return None, 1 | ||
|
r1089 | elif not force: | ||
|
r3684 | # check if we're creating new remote heads | ||
# to be a remote head after push, node must be either | ||||
# - unknown locally | ||||
# - a local outgoing head descended from update | ||||
# - a remote head that's known locally and not | ||||
# ancestral to an outgoing head | ||||
warn = 0 | ||||
if remote_heads == [nullid]: | ||||
warn = 0 | ||||
elif not revs and len(heads) > len(remote_heads): | ||||
warn = 1 | ||||
else: | ||||
newheads = list(heads) | ||||
for r in remote_heads: | ||||
if r in self.changelog.nodemap: | ||||
desc = self.changelog.heads(r) | ||||
l = [h for h in heads if h in desc] | ||||
if not l: | ||||
newheads.append(r) | ||||
else: | ||||
newheads.append(r) | ||||
if len(newheads) > len(remote_heads): | ||||
warn = 1 | ||||
if warn: | ||||
|
r1402 | self.ui.warn(_("abort: push creates new remote branches!\n")) | ||
self.ui.status(_("(did you forget to merge?" | ||||
" use push -f to force)\n")) | ||||
|
r2439 | return None, 1 | ||
|
r3684 | elif inc: | ||
self.ui.warn(_("note: unsynced remote changes!\n")) | ||||
|
r1089 | |||
|
r3682 | |||
|
r1781 | if revs is None: | ||
|
r1782 | cg = self.changegroup(update, '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() | ||||
ret = self.prepush(remote, force, revs) | ||||
if ret[0] is not None: | ||||
cg, remote_heads = ret | ||||
|
r2673 | return remote.addchangegroup(cg, 'push', self.url()) | ||
|
r2439 | return ret[1] | ||
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 | ||||
if force: remote_heads = ['force'] | ||||
return remote.unbundle(cg, remote_heads, 'push') | ||||
return ret[1] | ||||
|
r1089 | |||
|
r3513 | def changegroupinfo(self, nodes): | ||
self.ui.note(_("%d changesets found\n") % len(nodes)) | ||||
if self.ui.debugflag: | ||||
self.ui.debug(_("List of changesets:\n")) | ||||
for node in nodes: | ||||
self.ui.debug("%s\n" % hex(node)) | ||||
|
r1736 | def changegroupsubset(self, bases, heads, source): | ||
|
r1466 | """This function generates a changegroup consisting of all the nodes | ||
that are descendents of any of the bases, and ancestors of any of | ||||
the heads. | ||||
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 | ||||
the changegroup a particular filenode or manifestnode belongs to.""" | ||||
|
r1736 | self.hook('preoutgoing', throw=True, source=source) | ||
|
r1466 | # Set up some initial variables | ||
# Make it easy to refer to self.changelog | ||||
|
r1458 | cl = self.changelog | ||
|
r1466 | # msng is short for missing - compute the list of changesets in this | ||
# changegroup. | ||||
|
r1460 | msng_cl_lst, bases, heads = cl.nodesbetween(bases, heads) | ||
|
r3513 | self.changegroupinfo(msng_cl_lst) | ||
|
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. | ||||
|
r1458 | knownheads = {} | ||
|
r1466 | # We assume that all parents of bases are known heads. | ||
|
r1460 | for n in bases: | ||
|
r1458 | for p in cl.parents(n): | ||
if p != nullid: | ||||
knownheads[p] = 1 | ||||
knownheads = knownheads.keys() | ||||
|
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 | ||
# Transform the list into an ersatz set. | ||||
|
r1464 | has_cl_set = dict.fromkeys(has_cl_set) | ||
|
r1460 | else: | ||
|
r1466 | # If there were no known heads, the recipient cannot be assumed to | ||
# know about any changesets. | ||||
|
r1460 | has_cl_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 = {} | ||
|
r1460 | junk = mnfst.index[mnfst.count() - 1] # Get around a bug in lazyindex | ||
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 | # A function generating function. Sets up an environment for the | ||
# inner function. | ||||
|
r1458 | def cmp_by_rev_func(revlog): | ||
|
r1466 | # Compare two nodes by their revision number in the environment's | ||
# revision history. Since the revision number both represents the | ||||
# most efficient order to read the nodes in, and represents a | ||||
# topological sorting of the nodes, this function is often useful. | ||||
def cmp_by_rev(a, b): | ||||
|
r1458 | return cmp(revlog.rev(a), revlog.rev(b)) | ||
|
r1466 | return cmp_by_rev | ||
|
r1458 | |||
|
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): | ||
haslst = hasset.keys() | ||||
haslst.sort(cmp_by_rev_func(revlog)) | ||||
for node in haslst: | ||||
parentlst = [p for p in revlog.parents(node) if p != nullid] | ||||
while parentlst: | ||||
n = parentlst.pop() | ||||
if n not in hasset: | ||||
hasset[n] = 1 | ||||
p = [p for p in revlog.parents(n) if p != nullid] | ||||
parentlst.extend(p) | ||||
for n in hasset: | ||||
msngset.pop(n, None) | ||||
|
r1466 | # This is a function generating function used to set up an environment | ||
# for the inner function to execute in. | ||||
|
r1458 | def manifest_and_file_collector(changedfileset): | ||
|
r1466 | # This is an information gathering function that gathers | ||
# information from each changeset node that goes out as part of | ||||
# the changegroup. The information gathered is a list of which | ||||
# manifest nodes are potentially required (the recipient may | ||||
# already have them) and total list of all files which were | ||||
# changed in any changeset in the changegroup. | ||||
# | ||||
# We also remember the first changenode we saw any manifest | ||||
# referenced by so we can later determine which changenode 'owns' | ||||
# the manifest. | ||||
|
r1458 | def collect_manifests_and_files(clnode): | ||
c = cl.read(clnode) | ||||
for f in c[3]: | ||||
# This is to make sure we only have one instance of each | ||||
# filename string for each filename. | ||||
|
r1460 | changedfileset.setdefault(f, f) | ||
msng_mnfst_set.setdefault(c[0], clnode) | ||||
|
r1458 | return collect_manifests_and_files | ||
|
r1466 | # 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. | ||||
|
r1458 | def prune_manifests(): | ||
has_mnfst_set = {} | ||||
for n in msng_mnfst_set: | ||||
|
r1466 | # If a 'missing' manifest thinks it belongs to a changenode | ||
# the recipient is assumed to have, obviously the recipient | ||||
# must have that manifest. | ||||
|
r1458 | linknode = cl.node(mnfst.linkrev(n)) | ||
if linknode in has_cl_set: | ||||
has_mnfst_set[n] = 1 | ||||
prune_parents(mnfst, has_mnfst_set, msng_mnfst_set) | ||||
|
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): | ||
|
r1462 | next_rev = [0] | ||
|
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) | ||
if r == next_rev[0]: | ||||
# If the last rev we looked at was the one just previous, | ||||
# we only need to see a diff. | ||||
delta = mdiff.patchtext(mnfst.delta(mnfstnode)) | ||||
|
r1466 | # For each line in the delta | ||
|
r1462 | for dline in delta.splitlines(): | ||
|
r1466 | # get the filename and filenode for that line | ||
|
r1462 | f, fnode = dline.split('\0') | ||
fnode = bin(fnode[:40]) | ||||
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) | ||||
|
r1466 | # Remember the revision we hope to see next. | ||
|
r1462 | next_rev[0] = r + 1 | ||
|
r1460 | return collect_msng_filenodes | ||
|
r1458 | |||
|
r1466 | # We have a list of filenodes we think we need for a file, lets remove | ||
# all those we now the recipient must have. | ||||
|
r1458 | def prune_filenodes(f, filerevlog): | ||
msngset = msng_filenode_set[f] | ||||
hasset = {} | ||||
|
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: | ||
clnode = cl.node(filerevlog.linkrev(n)) | ||||
if clnode in has_cl_set: | ||||
hasset[n] = 1 | ||||
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 | |||
|
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 = {} | ||
|
r1466 | # Create a changenode group generator that will call our functions | ||
# back to lookup the owning changenode and collect information. | ||||
|
r1458 | group = cl.group(msng_cl_lst, identity, | ||
manifest_and_file_collector(changedfiles)) | ||||
for chnk in group: | ||||
yield chnk | ||||
|
r1466 | |||
# The list of manifests has been collected by the generator | ||||
# calling our functions back. | ||||
|
r1458 | prune_manifests() | ||
msng_mnfst_lst = msng_mnfst_set.keys() | ||||
|
r1466 | # Sort the manifestnodes by revision number. | ||
|
r1458 | msng_mnfst_lst.sort(cmp_by_rev_func(mnfst)) | ||
|
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 | |||
|
r1462 | changedfiles = changedfiles.keys() | ||
changedfiles.sort() | ||||
|
r1466 | # Go through all our files in order sorted by name. | ||
|
r1458 | for fname in changedfiles: | ||
filerevlog = self.file(fname) | ||||
|
r1466 | # Toss out the filenodes that the recipient isn't really | ||
# missing. | ||||
|
r1630 | if msng_filenode_set.has_key(fname): | ||
prune_filenodes(fname, filerevlog) | ||||
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: | ||
|
r1981 | yield changegroup.genchunk(fname) | ||
|
r1466 | # Sort the filenodes by their revision # | ||
|
r1458 | msng_filenode_lst.sort(cmp_by_rev_func(filerevlog)) | ||
|
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 | ||||
|
r1630 | if msng_filenode_set.has_key(fname): | ||
# 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): | ||
|
r1466 | """Generate a changegroup of all nodes that we have that a recipient | ||
doesn't. | ||||
This is much easier than the previous function as we can assume that | ||||
the recipient has any changenode we aren't sending them.""" | ||||
|
r1736 | |||
self.hook('preoutgoing', throw=True, source=source) | ||||
|
r1458 | cl = self.changelog | ||
nodes = cl.nodesbetween(basenodes, None)[0] | ||||
revset = dict.fromkeys([cl.rev(n) for n in nodes]) | ||||
|
r3513 | self.changegroupinfo(nodes) | ||
|
r1458 | |||
def identity(x): | ||||
return x | ||||
|
r1089 | |||
|
r1458 | def gennodelst(revlog): | ||
for r in xrange(0, revlog.count()): | ||||
n = revlog.node(r) | ||||
if revlog.linkrev(n) in revset: | ||||
yield n | ||||
def changed_file_collector(changedfileset): | ||||
def collect_changed_files(clnode): | ||||
c = cl.read(clnode) | ||||
for fname in c[3]: | ||||
changedfileset[fname] = 1 | ||||
return collect_changed_files | ||||
def lookuprevlink_func(revlog): | ||||
def lookuprevlink(n): | ||||
return cl.node(revlog.linkrev(n)) | ||||
return lookuprevlink | ||||
def gengroup(): | ||||
|
r1089 | # construct a list of all changed files | ||
|
r1458 | changedfiles = {} | ||
for chnk in cl.group(nodes, identity, | ||||
changed_file_collector(changedfiles)): | ||||
yield chnk | ||||
changedfiles = changedfiles.keys() | ||||
changedfiles.sort() | ||||
|
r1089 | |||
|
r1458 | mnfst = self.manifest | ||
nodeiter = gennodelst(mnfst) | ||||
for chnk in mnfst.group(nodeiter, lookuprevlink_func(mnfst)): | ||||
yield chnk | ||||
|
r1089 | |||
|
r1458 | for fname in changedfiles: | ||
filerevlog = self.file(fname) | ||||
nodeiter = gennodelst(filerevlog) | ||||
nodeiter = list(nodeiter) | ||||
if nodeiter: | ||||
|
r1981 | yield changegroup.genchunk(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 | |||
|
r2673 | def addchangegroup(self, source, srctype, url): | ||
|
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): | ||
|
r1402 | self.ui.debug(_("add changeset %s\n") % short(x)) | ||
|
r1998 | return cl.count() | ||
|
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 | ||
tr = self.transaction() | ||||
|
r2395 | # write changelog data to temp files so concurrent readers will not see | ||
# inconsistent view | ||||
|
r2232 | cl = None | ||
try: | ||||
|
r3457 | cl = appendfile.appendchangelog(self.sopener, | ||
self.changelog.version) | ||||
|
r1998 | |||
|
r2232 | oldheads = len(cl.heads()) | ||
|
r1089 | |||
|
r2232 | # pull off the changeset group | ||
self.ui.status(_("adding changesets\n")) | ||||
|
r2347 | cor = cl.count() - 1 | ||
|
r2232 | chunkiter = changegroup.chunkiter(source) | ||
|
r2354 | if cl.addgroup(chunkiter, csmap, tr, 1) is None: | ||
raise util.Abort(_("received changelog group is empty")) | ||||
|
r2347 | cnr = cl.count() - 1 | ||
|
r2232 | changesets = cnr - cor | ||
|
r1089 | |||
|
r2395 | # 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 | ||||
self.manifest.addgroup(chunkiter, revmap, tr) | ||||
|
r1089 | |||
|
r2395 | # process the files | ||
self.ui.status(_("adding file changes\n")) | ||||
while 1: | ||||
f = changegroup.getchunk(source) | ||||
if not f: | ||||
break | ||||
self.ui.debug(_("adding %s revisions\n") % f) | ||||
fl = self.file(f) | ||||
o = fl.count() | ||||
chunkiter = changegroup.chunkiter(source) | ||||
if fl.addgroup(chunkiter, revmap, tr) is None: | ||||
raise util.Abort(_("received file revlog group is empty")) | ||||
revisions += fl.count() - o | ||||
files += 1 | ||||
|
r1089 | |||
|
r2232 | cl.writedata() | ||
finally: | ||||
if cl: | ||||
cl.cleanup() | ||||
|
r1998 | |||
|
r2395 | # make changelog see real files again | ||
|
r3457 | self.changelog = changelog.changelog(self.sopener, | ||
self.changelog.version) | ||||
|
r2075 | self.changelog.checkinlinesize(tr) | ||
|
r1998 | |||
|
r1089 | newheads = len(self.changelog.heads()) | ||
heads = "" | ||||
|
r2424 | if oldheads and newheads != oldheads: | ||
heads = _(" (%+d heads)") % (newheads - oldheads) | ||||
|
r1089 | |||
|
r1402 | self.ui.status(_("added %d changesets" | ||
" with %d changes to %d files%s\n") | ||||
% (changesets, revisions, files, heads)) | ||||
|
r1089 | |||
|
r2259 | if changesets > 0: | ||
self.hook('pretxnchangegroup', throw=True, | ||||
|
r2673 | node=hex(self.changelog.node(cor+1)), source=srctype, | ||
url=url) | ||||
|
r1730 | |||
|
r1089 | tr.close() | ||
|
r1375 | if changesets > 0: | ||
|
r2229 | self.hook("changegroup", node=hex(self.changelog.node(cor+1)), | ||
|
r2673 | source=srctype, url=url) | ||
|
r1089 | |||
|
r3473 | for i in xrange(cor + 1, cnr + 1): | ||
|
r2229 | self.hook("incoming", node=hex(self.changelog.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: | ||||
raise util.UnexpectedOutput( | ||||
_('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)) | ||||
except ValueError, TypeError: | ||||
raise util.UnexpectedOutput( | ||||
_('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) | ||||
except ValueError, TypeError: | ||||
raise util.UnexpectedOutput( | ||||
_('Unexpected response from remote server:'), l) | ||||
|
r2612 | self.ui.debug('adding %s (%s)\n' % (name, util.bytecount(size))) | ||
|
r3457 | ofp = self.sopener(name, 'w') | ||
|
r2612 | for chunk in util.filechunkiter(fp, limit=size): | ||
ofp.write(chunk) | ||||
ofp.close() | ||||
elapsed = time.time() - start | ||||
self.ui.status(_('transferred %s in %.1f seconds (%s/sec)\n') % | ||||
(util.bytecount(total_bytes), elapsed, | ||||
util.bytecount(total_bytes / elapsed))) | ||||
self.reload() | ||||
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 | ||||