2005-08-28 01:21:25 +04:00
|
|
|
# localrepo.py - read/write repository class for mercurial
|
|
|
|
#
|
2006-08-12 23:30:02 +04:00
|
|
|
# Copyright 2005, 2006 Matt Mackall <mpm@selenic.com>
|
2005-08-28 01:21:25 +04:00
|
|
|
#
|
|
|
|
# This software may be used and distributed according to the terms
|
|
|
|
# of the GNU General Public License, incorporated herein by reference.
|
|
|
|
|
2005-08-28 02:35:37 +04:00
|
|
|
from node import *
|
2005-10-19 05:37:48 +04:00
|
|
|
from i18n import gettext as _
|
2005-08-28 02:09:46 +04:00
|
|
|
from demandload import *
|
2006-07-14 22:17:22 +04:00
|
|
|
import repo
|
fix race in localrepo.addchangegroup.
localrepo.addchangegroup writes to changelog, then manifest, then normal
files. this breaks access ordering. if reader reads changelog while
manifest is being written, can find pointers into places in manifest
that are not yet written. same can happen for manifest and normal files.
fix is to make almost no change to localrepo.addchangegroup. it must
to write changelog and manifest data early because it has to read them
while writing other files. instead, write changelog and manifest data
to temp file that reader cannot see, then append temp data to manifest
after all normal files written, finally append temp data to changelog.
temp file code is in new appendfile module. can be used in other places
with small changes.
much smaller race still left. we write all new data in one write call,
but reader can maybe see partial update because python or os or filesystem
cannot always make write really atomic. file locking no help: slow, not
portable, not reliable over nfs. only real safe other plan is write to
temp file every time and rename, but performance bad when manifest or
changelog is big.
2006-03-24 20:08:12 +03:00
|
|
|
demandload(globals(), "appendfile changegroup")
|
2006-07-14 22:17:22 +04:00
|
|
|
demandload(globals(), "changelog dirstate filelog manifest context")
|
2006-04-29 02:50:22 +04:00
|
|
|
demandload(globals(), "re lock transaction tempfile stat mdiff errno ui")
|
2006-07-14 22:17:22 +04:00
|
|
|
demandload(globals(), "os revlog time util")
|
2005-08-28 01:21:25 +04:00
|
|
|
|
2006-07-14 22:17:22 +04:00
|
|
|
class localrepository(repo.repository):
|
2006-09-10 05:25:07 +04:00
|
|
|
capabilities = ('lookup', 'changegroupsubset')
|
2006-06-16 03:37:23 +04:00
|
|
|
|
2006-02-28 21:24:54 +03:00
|
|
|
def __del__(self):
|
|
|
|
self.transhandle = None
|
2006-03-06 19:47:41 +03:00
|
|
|
def __init__(self, parentui, path=None, create=0):
|
2006-07-14 22:17:22 +04:00
|
|
|
repo.repository.__init__(self)
|
2005-08-28 03:28:53 +04:00
|
|
|
if not path:
|
|
|
|
p = os.getcwd()
|
|
|
|
while not os.path.isdir(os.path.join(p, ".hg")):
|
|
|
|
oldp = p
|
|
|
|
p = os.path.dirname(p)
|
2006-01-12 09:57:58 +03:00
|
|
|
if p == oldp:
|
2006-09-11 12:08:30 +04:00
|
|
|
raise repo.RepoError(_("There is no Mercurial repository"
|
|
|
|
" here (.hg not found)"))
|
2005-08-28 03:28:53 +04:00
|
|
|
path = p
|
|
|
|
self.path = os.path.join(path, ".hg")
|
2006-12-05 13:28:23 +03:00
|
|
|
self.spath = self.path
|
2005-08-28 03:28:53 +04:00
|
|
|
|
2006-09-03 01:06:47 +04:00
|
|
|
if not os.path.isdir(self.path):
|
|
|
|
if create:
|
|
|
|
if not os.path.exists(path):
|
|
|
|
os.mkdir(path)
|
|
|
|
os.mkdir(self.path)
|
2006-12-05 13:28:23 +03:00
|
|
|
if self.spath != self.path:
|
|
|
|
os.mkdir(self.spath)
|
2006-09-03 01:06:47 +04:00
|
|
|
else:
|
|
|
|
raise repo.RepoError(_("repository %s not found") % path)
|
|
|
|
elif create:
|
|
|
|
raise repo.RepoError(_("repository %s already exists") % path)
|
2005-08-28 01:21:25 +04:00
|
|
|
|
2006-11-08 00:35:07 +03:00
|
|
|
self.root = os.path.realpath(path)
|
2006-03-28 21:01:07 +04:00
|
|
|
self.origroot = path
|
2006-03-06 19:47:41 +03:00
|
|
|
self.ui = ui.ui(parentui=parentui)
|
2005-08-28 03:34:54 +04:00
|
|
|
self.opener = util.opener(self.path)
|
2006-12-05 13:28:23 +03:00
|
|
|
self.sopener = util.opener(self.spath)
|
2005-08-28 03:34:54 +04:00
|
|
|
self.wopener = util.opener(self.root)
|
2006-04-05 00:38:43 +04:00
|
|
|
|
|
|
|
try:
|
|
|
|
self.ui.readconfig(self.join("hgrc"), self.root)
|
|
|
|
except IOError:
|
|
|
|
pass
|
|
|
|
|
2006-10-11 01:43:20 +04:00
|
|
|
v = self.ui.configrevlog()
|
2006-05-08 23:26:18 +04:00
|
|
|
self.revlogversion = int(v.get('format', revlog.REVLOG_DEFAULT_FORMAT))
|
2006-04-28 23:52:08 +04:00
|
|
|
self.revlogv1 = self.revlogversion != revlog.REVLOGV0
|
2006-05-08 23:26:18 +04:00
|
|
|
fl = v.get('flags', None)
|
2006-04-05 00:38:43 +04:00
|
|
|
flags = 0
|
2006-05-08 23:26:18 +04:00
|
|
|
if fl != None:
|
|
|
|
for x in fl.split():
|
|
|
|
flags |= revlog.flagstr(x)
|
|
|
|
elif self.revlogv1:
|
|
|
|
flags = revlog.REVLOG_DEFAULT_FLAGS
|
2006-04-05 00:38:43 +04:00
|
|
|
|
|
|
|
v = self.revlogversion | flags
|
2006-10-24 02:12:20 +04:00
|
|
|
self.manifest = manifest.manifest(self.sopener, v)
|
|
|
|
self.changelog = changelog.changelog(self.sopener, v)
|
2006-04-05 00:38:43 +04:00
|
|
|
|
|
|
|
# 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
|
2006-04-05 00:38:43 +04:00
|
|
|
|
2005-08-28 01:21:25 +04:00
|
|
|
self.tagscache = None
|
2006-10-18 03:31:18 +04:00
|
|
|
self.branchcache = None
|
2005-08-28 01:21:25 +04:00
|
|
|
self.nodetagscache = None
|
2005-09-15 11:59:16 +04:00
|
|
|
self.encodepats = None
|
|
|
|
self.decodepats = None
|
2006-02-28 21:24:54 +03:00
|
|
|
self.transhandle = None
|
2005-08-28 01:21:25 +04:00
|
|
|
|
2006-03-06 19:47:41 +03:00
|
|
|
self.dirstate = dirstate.dirstate(self.opener, self.ui, self.root)
|
2006-04-29 02:50:22 +04:00
|
|
|
|
2006-07-26 00:50:32 +04:00
|
|
|
def url(self):
|
|
|
|
return 'file:' + self.root
|
|
|
|
|
2006-02-15 02:28:06 +03:00
|
|
|
def hook(self, name, throw=False, **args):
|
2006-04-29 02:50:22 +04:00
|
|
|
def callhook(hname, funcname):
|
|
|
|
'''call python hook. hook is callable object, looked up as
|
|
|
|
name in python module. if callable returns "true", hook
|
2006-05-08 21:59:58 +04:00
|
|
|
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.'''
|
2006-04-29 02:50:22 +04:00
|
|
|
|
|
|
|
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:
|
2006-07-09 13:10:11 +04:00
|
|
|
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))
|
2006-04-29 02:50:22 +04:00
|
|
|
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:
|
2006-05-03 22:00:24 +04:00
|
|
|
r = obj(ui=self.ui, repo=self, hooktype=name, **args)
|
2006-04-29 02:50:22 +04:00
|
|
|
except (KeyboardInterrupt, util.SignalInterrupt):
|
|
|
|
raise
|
|
|
|
except Exception, exc:
|
|
|
|
if isinstance(exc, util.Abort):
|
|
|
|
self.ui.warn(_('error: %s hook failed: %s\n') %
|
2006-09-08 11:36:18 +04:00
|
|
|
(hname, exc.args[0]))
|
2006-04-29 02:50:22 +04:00
|
|
|
else:
|
|
|
|
self.ui.warn(_('error: %s hook raised an exception: '
|
|
|
|
'%s\n') % (hname, exc))
|
|
|
|
if throw:
|
|
|
|
raise
|
2006-05-22 19:47:53 +04:00
|
|
|
self.ui.print_exc()
|
2006-05-08 21:59:58 +04:00
|
|
|
return True
|
|
|
|
if r:
|
2006-04-29 02:50:22 +04:00
|
|
|
if throw:
|
|
|
|
raise util.Abort(_('%s hook failed') % hname)
|
2006-05-08 21:59:58 +04:00
|
|
|
self.ui.warn(_('warning: %s hook failed\n') % hname)
|
2006-04-29 02:50:22 +04:00
|
|
|
return r
|
|
|
|
|
2005-10-30 00:44:05 +04:00
|
|
|
def runhook(name, cmd):
|
|
|
|
self.ui.note(_("running hook %s: %s\n") % (name, cmd))
|
2006-05-15 20:13:00 +04:00
|
|
|
env = dict([('HG_' + k.upper(), v) for k, v in args.iteritems()])
|
2006-03-11 09:42:59 +03:00
|
|
|
r = util.system(cmd, environ=env, cwd=self.root)
|
2005-08-28 01:21:25 +04:00
|
|
|
if r:
|
2006-02-15 02:28:06 +03:00
|
|
|
desc, r = util.explain_exit(r)
|
|
|
|
if throw:
|
|
|
|
raise util.Abort(_('%s hook %s') % (name, desc))
|
2006-05-08 21:59:58 +04:00
|
|
|
self.ui.warn(_('warning: %s hook %s\n') % (name, desc))
|
|
|
|
return r
|
2005-10-30 00:44:05 +04:00
|
|
|
|
2006-05-08 21:59:58 +04:00
|
|
|
r = False
|
2006-03-06 19:34:49 +03:00
|
|
|
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:
|
2006-04-29 02:50:22 +04:00
|
|
|
if cmd.startswith('python:'):
|
2006-05-08 21:59:58 +04:00
|
|
|
r = callhook(hname, cmd[7:].strip()) or r
|
2006-04-29 02:50:22 +04:00
|
|
|
else:
|
2006-05-08 21:59:58 +04:00
|
|
|
r = runhook(hname, cmd) or r
|
2005-10-30 00:44:05 +04:00
|
|
|
return r
|
2005-08-28 01:21:25 +04:00
|
|
|
|
2006-07-12 19:59:20 +04:00
|
|
|
tag_disallowed = ':\r\n'
|
|
|
|
|
2006-08-21 08:52:52 +04:00
|
|
|
def tag(self, name, node, message, local, user, date):
|
2006-07-12 19:59:20 +04:00
|
|
|
'''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)
|
|
|
|
|
2006-08-21 08:52:52 +04:00
|
|
|
self.hook('pretag', throw=True, node=hex(node), tag=name, local=local)
|
2006-07-12 19:59:20 +04:00
|
|
|
|
|
|
|
if local:
|
2006-12-04 01:16:33 +03:00
|
|
|
# local tags are stored in the current charset
|
2006-08-21 08:52:52 +04:00
|
|
|
self.opener('localtags', 'a').write('%s %s\n' % (hex(node), name))
|
|
|
|
self.hook('tag', node=hex(node), tag=name, local=local)
|
2006-07-12 19:59:20 +04:00
|
|
|
return
|
|
|
|
|
2006-08-13 03:40:12 +04:00
|
|
|
for x in self.status()[:5]:
|
2006-07-12 19:59:20 +04:00
|
|
|
if '.hgtags' in x:
|
|
|
|
raise util.Abort(_('working copy of .hgtags is changed '
|
|
|
|
'(please commit .hgtags manually)'))
|
|
|
|
|
2006-12-04 01:16:33 +03:00
|
|
|
# committed tags are stored in UTF-8
|
|
|
|
line = '%s %s\n' % (hex(node), util.fromlocal(name))
|
|
|
|
self.wfile('.hgtags', 'ab').write(line)
|
2006-07-12 19:59:20 +04:00
|
|
|
if self.dirstate.state('.hgtags') == '?':
|
|
|
|
self.add(['.hgtags'])
|
|
|
|
|
|
|
|
self.commit(['.hgtags'], message, user, date)
|
2006-08-21 08:52:52 +04:00
|
|
|
self.hook('tag', node=hex(node), tag=name, local=local)
|
2006-07-12 19:59:20 +04:00
|
|
|
|
2005-08-28 01:21:25 +04:00
|
|
|
def tags(self):
|
|
|
|
'''return a mapping of tag to node'''
|
|
|
|
if not self.tagscache:
|
|
|
|
self.tagscache = {}
|
2006-03-22 07:30:47 +03:00
|
|
|
|
|
|
|
def parsetag(line, context):
|
|
|
|
if not line:
|
|
|
|
return
|
|
|
|
s = l.split(" ", 1)
|
|
|
|
if len(s) != 2:
|
2006-05-19 10:31:12 +04:00
|
|
|
self.ui.warn(_("%s: cannot parse entry\n") % context)
|
2006-03-22 07:30:47 +03:00
|
|
|
return
|
|
|
|
node, key = s
|
2006-12-04 01:16:33 +03:00
|
|
|
key = util.tolocal(key.strip()) # stored in UTF-8
|
2005-08-28 01:21:25 +04:00
|
|
|
try:
|
2006-03-22 07:30:47 +03:00
|
|
|
bin_n = bin(node)
|
2005-08-28 01:21:25 +04:00
|
|
|
except TypeError:
|
2006-05-19 10:31:12 +04:00
|
|
|
self.ui.warn(_("%s: node '%s' is not well formed\n") %
|
|
|
|
(context, node))
|
2006-03-22 07:30:47 +03:00
|
|
|
return
|
|
|
|
if bin_n not in self.changelog.nodemap:
|
2006-05-19 10:31:12 +04:00
|
|
|
self.ui.warn(_("%s: tag '%s' refers to unknown node\n") %
|
|
|
|
(context, key))
|
2006-03-22 07:30:47 +03:00
|
|
|
return
|
2006-05-19 10:31:12 +04:00
|
|
|
self.tagscache[key] = bin_n
|
2005-08-28 01:21:25 +04:00
|
|
|
|
2006-05-19 10:31:12 +04:00
|
|
|
# read the tags file from each head, ending with the tip,
|
2006-03-22 07:30:47 +03:00
|
|
|
# and add each tag found to the map, with "newer" ones
|
|
|
|
# taking precedence
|
2006-10-29 05:37:59 +03:00
|
|
|
f = None
|
|
|
|
for rev, node, fnode in self._hgtagsnodes():
|
|
|
|
f = (f and f.filectx(fnode) or
|
|
|
|
self.filectx('.hgtags', fileid=fnode))
|
2006-03-22 07:30:47 +03:00
|
|
|
count = 0
|
2006-10-18 23:14:59 +04:00
|
|
|
for l in f.data().splitlines():
|
2006-03-22 07:30:47 +03:00
|
|
|
count += 1
|
2006-10-18 23:14:59 +04:00
|
|
|
parsetag(l, _("%s, line %d") % (str(f), count))
|
2006-10-19 07:38:23 +04:00
|
|
|
|
2005-08-28 01:21:25 +04:00
|
|
|
try:
|
|
|
|
f = self.opener("localtags")
|
2006-03-22 07:30:47 +03:00
|
|
|
count = 0
|
2005-08-28 01:21:25 +04:00
|
|
|
for l in f:
|
2006-12-04 01:16:33 +03:00
|
|
|
# localtags are stored in the local character set
|
|
|
|
# while the internal tag table is stored in UTF-8
|
|
|
|
l = util.fromlocal(l)
|
2006-03-22 07:30:47 +03:00
|
|
|
count += 1
|
2006-05-19 10:31:12 +04:00
|
|
|
parsetag(l, _("localtags, line %d") % count)
|
2005-08-28 01:21:25 +04:00
|
|
|
except IOError:
|
|
|
|
pass
|
|
|
|
|
|
|
|
self.tagscache['tip'] = self.changelog.tip()
|
|
|
|
|
|
|
|
return self.tagscache
|
|
|
|
|
2006-10-29 05:37:59 +03:00
|
|
|
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]
|
|
|
|
|
2005-08-28 01:21:25 +04:00
|
|
|
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
|
2006-01-12 09:57:58 +03:00
|
|
|
l.append((r, t, n))
|
2005-08-28 01:21:25 +04:00
|
|
|
l.sort()
|
2006-01-12 09:57:58 +03:00
|
|
|
return [(t, n) for r, t, n in l]
|
2005-08-28 01:21:25 +04:00
|
|
|
|
|
|
|
def nodetags(self, node):
|
|
|
|
'''return the tags associated with a node'''
|
|
|
|
if not self.nodetagscache:
|
|
|
|
self.nodetagscache = {}
|
2006-01-12 09:57:58 +03:00
|
|
|
for t, n in self.tags().items():
|
|
|
|
self.nodetagscache.setdefault(n, []).append(t)
|
2005-08-28 01:21:25 +04:00
|
|
|
return self.nodetagscache.get(node, [])
|
|
|
|
|
2006-10-18 03:31:18 +04:00
|
|
|
def branchtags(self):
|
|
|
|
if self.branchcache != None:
|
|
|
|
return self.branchcache
|
|
|
|
|
2006-10-18 07:09:56 +04:00
|
|
|
self.branchcache = {} # avoid recursion in changectx
|
2006-10-18 03:31:18 +04:00
|
|
|
|
2006-10-24 06:32:56 +04:00
|
|
|
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)
|
|
|
|
|
2006-12-04 01:16:33 +03:00
|
|
|
# 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
|
2006-10-24 06:32:56 +04:00
|
|
|
return self.branchcache
|
|
|
|
|
|
|
|
def _readbranchcache(self):
|
|
|
|
partial = {}
|
2006-10-18 03:31:18 +04:00
|
|
|
try:
|
|
|
|
f = self.opener("branches.cache")
|
2006-11-15 22:56:57 +03:00
|
|
|
lines = f.read().split('\n')
|
|
|
|
f.close()
|
|
|
|
last, lrev = lines.pop(0).rstrip().split(" ", 1)
|
2006-10-18 03:31:18 +04:00
|
|
|
last, lrev = bin(last), int(lrev)
|
2006-12-02 08:38:55 +03:00
|
|
|
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
|
2006-10-24 06:32:56 +04:00
|
|
|
return partial, last, lrev
|
2006-10-18 03:31:18 +04:00
|
|
|
|
2006-10-24 06:32:56 +04:00
|
|
|
def _writebranchcache(self, branches, tip, tiprev):
|
2006-10-18 19:46:51 +04:00
|
|
|
try:
|
|
|
|
f = self.opener("branches.cache", "w")
|
2006-10-24 06:32:56 +04:00
|
|
|
f.write("%s %s\n" % (hex(tip), tiprev))
|
|
|
|
for label, node in branches.iteritems():
|
2006-10-18 19:46:51 +04:00
|
|
|
f.write("%s %s\n" % (hex(node), label))
|
|
|
|
except IOError:
|
|
|
|
pass
|
2006-10-18 03:31:18 +04:00
|
|
|
|
2006-10-24 06:32:56 +04:00
|
|
|
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()
|
|
|
|
|
2005-08-28 01:21:25 +04:00
|
|
|
def lookup(self, key):
|
2006-10-18 03:31:56 +04:00
|
|
|
if key == '.':
|
|
|
|
key = self.dirstate.parents()[0]
|
|
|
|
if key == nullid:
|
|
|
|
raise repo.RepoError(_("no revision checked out"))
|
2006-12-06 00:41:42 +03:00
|
|
|
elif key == 'null':
|
|
|
|
return nullid
|
2006-10-18 20:44:56 +04:00
|
|
|
n = self.changelog._match(key)
|
|
|
|
if n:
|
|
|
|
return n
|
2006-10-18 03:31:56 +04:00
|
|
|
if key in self.tags():
|
2005-08-28 01:21:25 +04:00
|
|
|
return self.tags()[key]
|
2006-10-18 03:31:56 +04:00
|
|
|
if key in self.branchtags():
|
|
|
|
return self.branchtags()[key]
|
2006-10-18 20:44:56 +04:00
|
|
|
n = self.changelog._partialmatch(key)
|
|
|
|
if n:
|
|
|
|
return n
|
|
|
|
raise repo.RepoError(_("unknown revision '%s'") % key)
|
2005-08-28 01:21:25 +04:00
|
|
|
|
|
|
|
def dev(self):
|
2006-06-16 23:58:24 +04:00
|
|
|
return os.lstat(self.path).st_dev
|
2005-08-28 01:21:25 +04:00
|
|
|
|
|
|
|
def local(self):
|
2005-08-28 03:28:53 +04:00
|
|
|
return True
|
2005-08-28 01:21:25 +04:00
|
|
|
|
|
|
|
def join(self, f):
|
|
|
|
return os.path.join(self.path, f)
|
|
|
|
|
2006-10-24 02:12:20 +04:00
|
|
|
def sjoin(self, f):
|
2006-12-05 13:28:23 +03:00
|
|
|
return os.path.join(self.spath, f)
|
2006-10-24 02:12:20 +04:00
|
|
|
|
2005-08-28 01:21:25 +04:00
|
|
|
def wjoin(self, f):
|
|
|
|
return os.path.join(self.root, f)
|
|
|
|
|
|
|
|
def file(self, f):
|
2006-01-12 09:57:58 +03:00
|
|
|
if f[0] == '/':
|
|
|
|
f = f[1:]
|
2006-10-24 02:12:20 +04:00
|
|
|
return filelog.filelog(self.sopener, f, self.revlogversion)
|
2005-08-28 01:21:25 +04:00
|
|
|
|
2006-09-16 02:23:52 +04:00
|
|
|
def changectx(self, changeid=None):
|
2006-06-29 02:08:10 +04:00
|
|
|
return context.changectx(self, changeid)
|
|
|
|
|
2006-10-03 10:21:46 +04:00
|
|
|
def workingctx(self):
|
|
|
|
return context.workingctx(self)
|
|
|
|
|
2006-09-30 00:48:16 +04:00
|
|
|
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)
|
2006-09-30 00:56:36 +04:00
|
|
|
if pl[1] == nullid:
|
|
|
|
return [self.changectx(pl[0])]
|
|
|
|
return [self.changectx(pl[0]), self.changectx(pl[1])]
|
2006-09-30 00:48:16 +04:00
|
|
|
|
2006-06-29 02:08:10 +04:00
|
|
|
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)
|
|
|
|
|
2005-08-28 01:21:25 +04:00
|
|
|
def getcwd(self):
|
|
|
|
return self.dirstate.getcwd()
|
|
|
|
|
|
|
|
def wfile(self, f, mode='r'):
|
|
|
|
return self.wopener(f, mode)
|
|
|
|
|
|
|
|
def wread(self, filename):
|
2005-09-15 11:59:16 +04:00
|
|
|
if self.encodepats == None:
|
|
|
|
l = []
|
|
|
|
for pat, cmd in self.ui.configitems("encode"):
|
2006-03-14 01:32:57 +03:00
|
|
|
mf = util.matcher(self.root, "", [pat], [], [])[1]
|
2005-09-15 11:59:16 +04:00
|
|
|
l.append((mf, cmd))
|
|
|
|
self.encodepats = l
|
|
|
|
|
|
|
|
data = self.wopener(filename, 'r').read()
|
|
|
|
|
|
|
|
for mf, cmd in self.encodepats:
|
|
|
|
if mf(filename):
|
2005-10-19 05:38:39 +04:00
|
|
|
self.ui.debug(_("filtering %s through %s\n") % (filename, cmd))
|
2005-09-15 11:59:16 +04:00
|
|
|
data = util.filter(data, cmd)
|
|
|
|
break
|
|
|
|
|
|
|
|
return data
|
2005-08-28 01:21:25 +04:00
|
|
|
|
|
|
|
def wwrite(self, filename, data, fd=None):
|
2005-09-15 11:59:16 +04:00
|
|
|
if self.decodepats == None:
|
|
|
|
l = []
|
|
|
|
for pat, cmd in self.ui.configitems("decode"):
|
2006-03-14 01:32:57 +03:00
|
|
|
mf = util.matcher(self.root, "", [pat], [], [])[1]
|
2005-09-15 11:59:16 +04:00
|
|
|
l.append((mf, cmd))
|
|
|
|
self.decodepats = l
|
|
|
|
|
|
|
|
for mf, cmd in self.decodepats:
|
|
|
|
if mf(filename):
|
2005-10-19 05:38:39 +04:00
|
|
|
self.ui.debug(_("filtering %s through %s\n") % (filename, cmd))
|
2005-09-15 11:59:16 +04:00
|
|
|
data = util.filter(data, cmd)
|
|
|
|
break
|
|
|
|
|
2005-08-28 01:21:25 +04:00
|
|
|
if fd:
|
|
|
|
return fd.write(data)
|
|
|
|
return self.wopener(filename, 'w').write(data)
|
|
|
|
|
|
|
|
def transaction(self):
|
2006-02-28 21:24:54 +03:00
|
|
|
tr = self.transhandle
|
|
|
|
if tr != None and tr.running():
|
|
|
|
return tr.nest()
|
|
|
|
|
2006-06-01 21:08:29 +04:00
|
|
|
# save dirstate for rollback
|
2005-08-28 01:21:25 +04:00
|
|
|
try:
|
|
|
|
ds = self.opener("dirstate").read()
|
|
|
|
except IOError:
|
|
|
|
ds = ""
|
|
|
|
self.opener("journal.dirstate", "w").write(ds)
|
|
|
|
|
2006-12-05 13:28:21 +03:00
|
|
|
renames = [(self.sjoin("journal"), self.sjoin("undo")),
|
|
|
|
(self.join("journal.dirstate"), self.join("undo.dirstate"))]
|
2006-10-24 02:12:20 +04:00
|
|
|
tr = transaction.transaction(self.ui.warn, self.sopener,
|
|
|
|
self.sjoin("journal"),
|
2006-12-05 13:28:21 +03:00
|
|
|
aftertrans(renames))
|
2006-02-28 21:24:54 +03:00
|
|
|
self.transhandle = tr
|
|
|
|
return tr
|
2005-08-28 01:21:25 +04:00
|
|
|
|
|
|
|
def recover(self):
|
2006-02-19 21:43:03 +03:00
|
|
|
l = self.lock()
|
2006-10-24 02:12:20 +04:00
|
|
|
if os.path.exists(self.sjoin("journal")):
|
2005-10-19 05:38:39 +04:00
|
|
|
self.ui.status(_("rolling back interrupted transaction\n"))
|
2006-10-24 02:12:20 +04:00
|
|
|
transaction.rollback(self.sopener, self.sjoin("journal"))
|
2006-02-22 09:26:29 +03:00
|
|
|
self.reload()
|
2005-11-09 01:22:03 +03:00
|
|
|
return True
|
2005-08-28 01:21:25 +04:00
|
|
|
else:
|
2005-10-19 05:38:39 +04:00
|
|
|
self.ui.warn(_("no interrupted transaction available\n"))
|
2005-11-09 01:22:03 +03:00
|
|
|
return False
|
2005-08-28 01:21:25 +04:00
|
|
|
|
2006-06-01 21:08:29 +04:00
|
|
|
def rollback(self, wlock=None):
|
2006-02-10 02:18:43 +03:00
|
|
|
if not wlock:
|
|
|
|
wlock = self.wlock()
|
2006-02-19 21:43:03 +03:00
|
|
|
l = self.lock()
|
2006-10-24 02:12:20 +04:00
|
|
|
if os.path.exists(self.sjoin("undo")):
|
2005-10-19 05:38:39 +04:00
|
|
|
self.ui.status(_("rolling back last transaction\n"))
|
2006-10-24 02:12:20 +04:00
|
|
|
transaction.rollback(self.sopener, self.sjoin("undo"))
|
2005-08-28 01:21:25 +04:00
|
|
|
util.rename(self.join("undo.dirstate"), self.join("dirstate"))
|
2006-02-22 09:26:29 +03:00
|
|
|
self.reload()
|
|
|
|
self.wreload()
|
2005-08-28 01:21:25 +04:00
|
|
|
else:
|
2006-06-01 21:08:29 +04:00
|
|
|
self.ui.warn(_("no rollback information available\n"))
|
2005-08-28 01:21:25 +04:00
|
|
|
|
2006-02-22 09:26:29 +03:00
|
|
|
def wreload(self):
|
|
|
|
self.dirstate.read()
|
|
|
|
|
|
|
|
def reload(self):
|
|
|
|
self.changelog.load()
|
|
|
|
self.manifest.load()
|
|
|
|
self.tagscache = None
|
|
|
|
self.nodetagscache = None
|
|
|
|
|
2006-03-28 21:01:07 +04:00
|
|
|
def do_lock(self, lockname, wait, releasefn=None, acquirefn=None,
|
|
|
|
desc=None):
|
2005-08-28 01:21:25 +04:00
|
|
|
try:
|
2006-10-24 02:12:20 +04:00
|
|
|
l = lock.lock(lockname, 0, releasefn, desc=desc)
|
2005-11-12 02:34:13 +03:00
|
|
|
except lock.LockHeld, inst:
|
|
|
|
if not wait:
|
2006-03-28 21:01:07 +04:00
|
|
|
raise
|
2006-11-20 21:55:59 +03:00
|
|
|
self.ui.warn(_("waiting for lock on %s held by %r\n") %
|
|
|
|
(desc, inst.locker))
|
2006-03-28 21:01:07 +04:00
|
|
|
# default to 600 seconds timeout
|
2006-10-24 02:12:20 +04:00
|
|
|
l = lock.lock(lockname, int(self.ui.config("ui", "timeout", "600")),
|
2006-03-28 21:01:07 +04:00
|
|
|
releasefn, desc=desc)
|
2006-02-20 00:39:09 +03:00
|
|
|
if acquirefn:
|
|
|
|
acquirefn()
|
|
|
|
return l
|
|
|
|
|
|
|
|
def lock(self, wait=1):
|
2006-10-24 02:12:20 +04:00
|
|
|
return self.do_lock(self.sjoin("lock"), wait, acquirefn=self.reload,
|
2006-03-28 21:01:07 +04:00
|
|
|
desc=_('repository %s') % self.origroot)
|
2006-02-20 00:39:09 +03:00
|
|
|
|
|
|
|
def wlock(self, wait=1):
|
2006-10-24 02:12:20 +04:00
|
|
|
return self.do_lock(self.join("wlock"), wait, self.dirstate.write,
|
2006-03-28 21:01:07 +04:00
|
|
|
self.wreload,
|
|
|
|
desc=_('working directory of %s') % self.origroot)
|
2005-11-12 02:34:13 +03:00
|
|
|
|
2006-10-09 23:02:01 +04:00
|
|
|
def filecommit(self, fn, manifest1, manifest2, linkrev, transaction, changelist):
|
2006-10-09 04:57:45 +04:00
|
|
|
"""
|
2006-10-09 23:02:01 +04:00
|
|
|
commit an individual file as part of a larger transaction
|
2006-10-09 04:57:45 +04:00
|
|
|
"""
|
2006-10-09 23:02:01 +04:00
|
|
|
|
|
|
|
t = self.wread(fn)
|
|
|
|
fl = self.file(fn)
|
|
|
|
fp1 = manifest1.get(fn, nullid)
|
|
|
|
fp2 = manifest2.get(fn, nullid)
|
2006-02-18 02:23:53 +03:00
|
|
|
|
2006-10-09 04:57:45 +04:00
|
|
|
meta = {}
|
2006-10-09 23:02:01 +04:00
|
|
|
cp = self.dirstate.copied(fn)
|
2006-10-09 04:57:45 +04:00
|
|
|
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))
|
2006-12-01 02:36:33 +03:00
|
|
|
elif fp1 != nullid: # copied on local side, reversed
|
2006-10-09 04:57:45 +04:00
|
|
|
meta["copyrev"] = hex(manifest2.get(cp))
|
|
|
|
fp2 = nullid
|
2006-12-01 02:36:33 +03:00
|
|
|
else: # directory rename
|
|
|
|
meta["copyrev"] = hex(manifest1.get(cp, nullid))
|
2006-10-09 04:57:45 +04:00
|
|
|
self.ui.debug(_(" %s: copy %s:%s\n") %
|
2006-10-09 23:02:01 +04:00
|
|
|
(fn, cp, meta["copyrev"]))
|
2006-10-09 04:57:45 +04:00
|
|
|
fp1 = nullid
|
|
|
|
elif fp2 != nullid:
|
2006-02-18 02:23:53 +03:00
|
|
|
# is one parent an ancestor of the other?
|
2006-10-09 23:02:01 +04:00
|
|
|
fpa = fl.ancestor(fp1, fp2)
|
2006-02-18 02:23:53 +03:00
|
|
|
if fpa == fp1:
|
|
|
|
fp1, fp2 = fp2, nullid
|
|
|
|
elif fpa == fp2:
|
|
|
|
fp2 = nullid
|
|
|
|
|
|
|
|
# is the file unmodified from the parent? report existing entry
|
2006-10-09 23:02:01 +04:00
|
|
|
if fp2 == nullid and not fl.cmp(fp1, t):
|
|
|
|
return fp1
|
2006-02-18 02:23:53 +03:00
|
|
|
|
2006-10-09 23:02:01 +04:00
|
|
|
changelist.append(fn)
|
|
|
|
return fl.add(t, meta, transaction, linkrev, fp1, fp2)
|
2005-11-12 02:34:13 +03:00
|
|
|
|
2006-02-10 02:18:43 +03:00
|
|
|
def rawcommit(self, files, text, user, date, p1=None, p2=None, wlock=None):
|
2006-11-07 23:43:19 +03:00
|
|
|
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)
|
2005-08-28 01:21:25 +04:00
|
|
|
|
2006-01-12 09:57:58 +03:00
|
|
|
def commit(self, files=None, text="", user=None, date=None,
|
2006-05-12 01:32:09 +04:00
|
|
|
match=util.always, force=False, lock=None, wlock=None,
|
2006-11-08 22:28:33 +03:00
|
|
|
force_editor=False, p1=None, p2=None, extra={}):
|
2006-11-07 23:43:19 +03:00
|
|
|
|
2005-08-28 01:21:25 +04:00
|
|
|
commit = []
|
|
|
|
remove = []
|
|
|
|
changed = []
|
2006-11-07 23:43:19 +03:00
|
|
|
use_dirstate = (p1 is None) # not rawcommit
|
2006-11-08 22:28:33 +03:00
|
|
|
extra = extra.copy()
|
2006-11-07 23:43:19 +03:00
|
|
|
|
|
|
|
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
|
|
|
|
else:
|
|
|
|
commit = files
|
2005-08-28 01:21:25 +04:00
|
|
|
|
2006-11-07 23:43:19 +03:00
|
|
|
if use_dirstate:
|
|
|
|
p1, p2 = self.dirstate.parents()
|
|
|
|
update_dirstate = True
|
2005-08-28 01:21:25 +04:00
|
|
|
else:
|
2006-11-07 23:43:19 +03:00
|
|
|
p1, p2 = p1, p2 or nullid
|
|
|
|
update_dirstate = (self.dirstate.parents()[0] == p1)
|
2005-08-28 01:21:25 +04:00
|
|
|
|
|
|
|
c1 = self.changelog.read(p1)
|
|
|
|
c2 = self.changelog.read(p2)
|
2006-08-11 19:57:42 +04:00
|
|
|
m1 = self.manifest.read(c1[0]).copy()
|
2005-08-28 01:21:25 +04:00
|
|
|
m2 = self.manifest.read(c2[0])
|
|
|
|
|
2006-11-07 23:43:19 +03:00
|
|
|
if use_dirstate:
|
2006-12-04 01:16:33 +03:00
|
|
|
branchname = util.fromlocal(self.workingctx().branch())
|
2006-11-07 23:43:19 +03:00
|
|
|
else:
|
|
|
|
branchname = ""
|
2006-10-18 03:32:00 +04:00
|
|
|
|
2006-11-07 23:43:19 +03:00
|
|
|
if use_dirstate:
|
2006-12-04 01:16:33 +03:00
|
|
|
oldname = c1[5].get("branch", "") # stored in UTF-8
|
2006-11-07 23:43:19 +03:00
|
|
|
if not commit and not remove and not force and p2 == nullid and \
|
|
|
|
branchname == oldname:
|
|
|
|
self.ui.status(_("nothing changed\n"))
|
|
|
|
return None
|
2005-08-28 01:21:25 +04:00
|
|
|
|
2006-02-15 04:13:18 +03:00
|
|
|
xp1 = hex(p1)
|
|
|
|
if p2 == nullid: xp2 = ''
|
|
|
|
else: xp2 = hex(p2)
|
|
|
|
|
2006-02-16 19:48:31 +03:00
|
|
|
self.hook("precommit", throw=True, parent1=xp1, parent2=xp2)
|
2005-08-28 01:21:25 +04:00
|
|
|
|
2006-02-10 02:18:43 +03:00
|
|
|
if not wlock:
|
|
|
|
wlock = self.wlock()
|
2006-02-28 21:25:10 +03:00
|
|
|
if not lock:
|
|
|
|
lock = self.lock()
|
2005-08-28 01:21:25 +04:00
|
|
|
tr = self.transaction()
|
|
|
|
|
|
|
|
# check in files
|
2006-11-19 00:44:42 +03:00
|
|
|
new = {}
|
2005-08-28 01:21:25 +04:00
|
|
|
linkrev = self.changelog.count()
|
|
|
|
commit.sort()
|
|
|
|
for f in commit:
|
|
|
|
self.ui.note(f + "\n")
|
|
|
|
try:
|
2006-11-19 00:44:42 +03:00
|
|
|
new[f] = self.filecommit(f, m1, m2, linkrev, tr, changed)
|
2006-08-11 19:57:42 +04:00
|
|
|
m1.set(f, util.is_exec(self.wjoin(f), m1.execf(f)))
|
2005-08-28 01:21:25 +04:00
|
|
|
except IOError:
|
2006-11-07 23:43:19 +03:00
|
|
|
if use_dirstate:
|
|
|
|
self.ui.warn(_("trouble committing %s!\n") % f)
|
|
|
|
raise
|
|
|
|
else:
|
|
|
|
remove.append(f)
|
2005-08-28 01:21:25 +04:00
|
|
|
|
|
|
|
# update manifest
|
2006-11-19 00:44:42 +03:00
|
|
|
m1.update(new)
|
2006-11-07 23:43:15 +03:00
|
|
|
remove.sort()
|
|
|
|
|
2005-08-28 01:21:25 +04:00
|
|
|
for f in remove:
|
|
|
|
if f in m1:
|
|
|
|
del m1[f]
|
2006-10-09 23:02:01 +04:00
|
|
|
mn = self.manifest.add(m1, tr, linkrev, c1[0], c2[0], (new, remove))
|
2005-08-28 01:21:25 +04:00
|
|
|
|
|
|
|
# add changeset
|
2006-11-19 00:44:42 +03:00
|
|
|
new = new.keys()
|
|
|
|
new.sort()
|
|
|
|
|
2006-03-21 14:45:27 +03:00
|
|
|
user = user or self.ui.username()
|
2006-05-12 01:32:09 +04:00
|
|
|
if not text or force_editor:
|
|
|
|
edittext = []
|
|
|
|
if text:
|
|
|
|
edittext.append(text)
|
|
|
|
edittext.append("")
|
2006-11-28 23:16:05 +03:00
|
|
|
edittext.append("HG: user: %s" % user)
|
2005-08-28 01:21:25 +04:00
|
|
|
if p2 != nullid:
|
2006-02-09 09:24:34 +03:00
|
|
|
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])
|
2005-08-28 01:21:25 +04:00
|
|
|
if not changed and not remove:
|
2006-02-09 09:24:34 +03:00
|
|
|
edittext.append("HG: no files changed")
|
|
|
|
edittext.append("")
|
2006-02-09 09:01:23 +03:00
|
|
|
# run editor in the repository root
|
|
|
|
olddir = os.getcwd()
|
|
|
|
os.chdir(self.root)
|
2006-05-17 21:38:41 +04:00
|
|
|
text = self.ui.edit("\n".join(edittext), user)
|
2006-02-09 09:01:23 +03:00
|
|
|
os.chdir(olddir)
|
2005-08-28 01:21:25 +04:00
|
|
|
|
2006-05-17 21:38:41 +04:00
|
|
|
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)
|
2006-10-18 03:32:00 +04:00
|
|
|
if branchname:
|
|
|
|
extra["branch"] = branchname
|
|
|
|
n = self.changelog.add(mn, changed + remove, text, tr, p1, p2,
|
|
|
|
user, date, extra)
|
2006-02-16 19:48:31 +03:00
|
|
|
self.hook('pretxncommit', throw=True, node=hex(n), parent1=xp1,
|
|
|
|
parent2=xp2)
|
2005-08-28 01:21:25 +04:00
|
|
|
tr.close()
|
|
|
|
|
2006-11-07 23:43:19 +03:00
|
|
|
if use_dirstate or update_dirstate:
|
|
|
|
self.dirstate.setparents(n)
|
|
|
|
if use_dirstate:
|
|
|
|
self.dirstate.update(new, "n")
|
|
|
|
self.dirstate.forget(remove)
|
2005-08-28 01:21:25 +04:00
|
|
|
|
2006-02-16 19:48:31 +03:00
|
|
|
self.hook("commit", node=hex(n), parent1=xp1, parent2=xp2)
|
2005-08-28 01:21:25 +04:00
|
|
|
return n
|
|
|
|
|
2006-03-31 22:37:25 +04:00
|
|
|
def walk(self, node=None, files=[], match=util.always, badmatch=None):
|
2006-10-27 20:24:10 +04:00
|
|
|
'''
|
|
|
|
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
|
|
|
|
'''
|
|
|
|
|
2005-08-28 01:21:25 +04:00
|
|
|
if node:
|
2005-12-06 16:10:38 +03:00
|
|
|
fdict = dict.fromkeys(files)
|
2005-08-28 01:21:25 +04:00
|
|
|
for fn in self.manifest.read(self.changelog.read(node)[0]):
|
2006-08-28 23:49:02 +04:00
|
|
|
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
|
2005-12-06 16:10:38 +03:00
|
|
|
if match(fn):
|
|
|
|
yield 'm', fn
|
|
|
|
for fn in fdict:
|
2006-03-31 22:37:25 +04:00
|
|
|
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)))
|
2005-08-28 01:21:25 +04:00
|
|
|
else:
|
2006-04-03 21:02:09 +04:00
|
|
|
for src, fn in self.dirstate.walk(files, match, badmatch=badmatch):
|
2005-08-28 01:21:25 +04:00
|
|
|
yield src, fn
|
|
|
|
|
2006-07-21 03:21:07 +04:00
|
|
|
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
|
2006-01-12 13:32:07 +03:00
|
|
|
|
|
|
|
If node1 is None, use the first dirstate parent instead.
|
|
|
|
If node2 is None, compare node1 with working directory.
|
|
|
|
"""
|
2005-08-28 01:21:25 +04:00
|
|
|
|
|
|
|
def fcmp(fn, mf):
|
|
|
|
t1 = self.wread(fn)
|
2006-08-15 00:07:00 +04:00
|
|
|
return self.file(fn).cmp(mf.get(fn, nullid), t1)
|
2005-08-28 01:21:25 +04:00
|
|
|
|
|
|
|
def mfmatches(node):
|
2006-01-12 13:32:07 +03:00
|
|
|
change = self.changelog.read(node)
|
2006-10-10 02:02:30 +04:00
|
|
|
mf = self.manifest.read(change[0]).copy()
|
2005-08-28 01:21:25 +04:00
|
|
|
for fn in mf.keys():
|
|
|
|
if not match(fn):
|
|
|
|
del mf[fn]
|
|
|
|
return mf
|
|
|
|
|
2006-07-21 03:21:07 +04:00
|
|
|
modified, added, removed, deleted, unknown = [], [], [], [], []
|
|
|
|
ignored, clean = [], []
|
|
|
|
|
2006-06-21 20:28:48 +04:00
|
|
|
compareworking = False
|
2006-06-24 03:42:48 +04:00
|
|
|
if not node1 or (not node2 and node1 == self.dirstate.parents()[0]):
|
2006-06-21 20:28:48 +04:00
|
|
|
compareworking = True
|
|
|
|
|
|
|
|
if not compareworking:
|
2006-02-25 15:44:40 +03:00
|
|
|
# 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)
|
|
|
|
|
2005-08-28 01:21:25 +04:00
|
|
|
# are we comparing the working directory?
|
|
|
|
if not node2:
|
2006-02-10 02:18:43 +03:00
|
|
|
if not wlock:
|
|
|
|
try:
|
|
|
|
wlock = self.wlock(wait=0)
|
2006-02-20 03:12:03 +03:00
|
|
|
except lock.LockException:
|
2006-02-10 02:18:43 +03:00
|
|
|
wlock = None
|
2006-07-21 03:21:07 +04:00
|
|
|
(lookup, modified, added, removed, deleted, unknown,
|
|
|
|
ignored, clean) = self.dirstate.status(files, match,
|
|
|
|
list_ignored, list_clean)
|
2005-08-28 01:21:25 +04:00
|
|
|
|
|
|
|
# are we comparing working dir against its parent?
|
2006-06-21 20:28:48 +04:00
|
|
|
if compareworking:
|
2006-01-12 13:32:07 +03:00
|
|
|
if lookup:
|
2005-08-28 01:21:25 +04:00
|
|
|
# do a full compare of any files that might have changed
|
2006-01-12 13:32:07 +03:00
|
|
|
mf2 = mfmatches(self.dirstate.parents()[0])
|
|
|
|
for f in lookup:
|
2005-08-28 01:21:25 +04:00
|
|
|
if fcmp(f, mf2):
|
2006-01-12 13:32:07 +03:00
|
|
|
modified.append(f)
|
2006-08-20 07:44:54 +04:00
|
|
|
else:
|
|
|
|
clean.append(f)
|
|
|
|
if wlock is not None:
|
|
|
|
self.dirstate.update([f], "n")
|
2006-01-12 13:32:07 +03:00
|
|
|
else:
|
|
|
|
# we are comparing working dir against non-parent
|
|
|
|
# generate a pseudo-manifest for the working dir
|
2006-10-10 02:02:30 +04:00
|
|
|
# XXX: create it in dirstate.py ?
|
2006-01-12 13:32:07 +03:00
|
|
|
mf2 = mfmatches(self.dirstate.parents()[0])
|
|
|
|
for f in lookup + modified + added:
|
|
|
|
mf2[f] = ""
|
2006-10-10 02:02:30 +04:00
|
|
|
mf2.set(f, execf=util.is_exec(self.wjoin(f), mf2.execf(f)))
|
2006-01-12 14:22:28 +03:00
|
|
|
for f in removed:
|
2006-01-12 13:32:07 +03:00
|
|
|
if f in mf2:
|
|
|
|
del mf2[f]
|
2005-08-28 01:21:25 +04:00
|
|
|
else:
|
2006-01-12 13:32:07 +03:00
|
|
|
# we are comparing two revisions
|
|
|
|
mf2 = mfmatches(node2)
|
2005-08-28 01:21:25 +04:00
|
|
|
|
2006-06-21 20:28:48 +04:00
|
|
|
if not compareworking:
|
2006-01-12 13:32:07 +03:00
|
|
|
# flush lists from dirstate before comparing manifests
|
2006-07-21 03:21:07 +04:00
|
|
|
modified, added, clean = [], [], []
|
2005-08-28 01:21:25 +04:00
|
|
|
|
2006-06-21 20:28:48 +04:00
|
|
|
# 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:
|
2006-01-12 13:32:07 +03:00
|
|
|
if mf1.has_key(fn):
|
2006-10-10 02:02:30 +04:00
|
|
|
if mf1.flags(fn) != mf2.flags(fn) or \
|
|
|
|
(mf1[fn] != mf2[fn] and (mf2[fn] != "" or fcmp(fn, mf1))):
|
2006-01-12 13:32:07 +03:00
|
|
|
modified.append(fn)
|
2006-07-21 03:21:07 +04:00
|
|
|
elif list_clean:
|
|
|
|
clean.append(fn)
|
2006-01-12 13:32:07 +03:00
|
|
|
del mf1[fn]
|
|
|
|
else:
|
|
|
|
added.append(fn)
|
2005-08-28 01:21:25 +04:00
|
|
|
|
2006-01-12 14:22:28 +03:00
|
|
|
removed = mf1.keys()
|
|
|
|
|
2006-01-12 13:32:07 +03:00
|
|
|
# sort and return results:
|
2006-07-21 03:21:07 +04:00
|
|
|
for l in modified, added, removed, deleted, unknown, ignored, clean:
|
2005-08-28 01:21:25 +04:00
|
|
|
l.sort()
|
2006-07-21 03:21:07 +04:00
|
|
|
return (modified, added, removed, deleted, unknown, ignored, clean)
|
|
|
|
|
2006-02-10 02:18:43 +03:00
|
|
|
def add(self, list, wlock=None):
|
|
|
|
if not wlock:
|
|
|
|
wlock = self.wlock()
|
2005-08-28 01:21:25 +04:00
|
|
|
for f in list:
|
|
|
|
p = self.wjoin(f)
|
|
|
|
if not os.path.exists(p):
|
2005-10-19 05:38:39 +04:00
|
|
|
self.ui.warn(_("%s does not exist!\n") % f)
|
2005-08-28 01:21:25 +04:00
|
|
|
elif not os.path.isfile(p):
|
2006-01-12 09:57:58 +03:00
|
|
|
self.ui.warn(_("%s not added: only files supported currently\n")
|
|
|
|
% f)
|
2005-08-28 01:21:25 +04:00
|
|
|
elif self.dirstate.state(f) in 'an':
|
2005-10-19 05:38:39 +04:00
|
|
|
self.ui.warn(_("%s already tracked!\n") % f)
|
2005-08-28 01:21:25 +04:00
|
|
|
else:
|
|
|
|
self.dirstate.update([f], "a")
|
|
|
|
|
2006-02-10 02:18:43 +03:00
|
|
|
def forget(self, list, wlock=None):
|
|
|
|
if not wlock:
|
|
|
|
wlock = self.wlock()
|
2005-08-28 01:21:25 +04:00
|
|
|
for f in list:
|
|
|
|
if self.dirstate.state(f) not in 'ai':
|
2005-10-19 05:38:39 +04:00
|
|
|
self.ui.warn(_("%s not added!\n") % f)
|
2005-08-28 01:21:25 +04:00
|
|
|
else:
|
|
|
|
self.dirstate.forget([f])
|
|
|
|
|
2006-02-10 02:18:43 +03:00
|
|
|
def remove(self, list, unlink=False, wlock=None):
|
2005-10-19 11:10:52 +04:00
|
|
|
if unlink:
|
|
|
|
for f in list:
|
|
|
|
try:
|
|
|
|
util.unlink(self.wjoin(f))
|
|
|
|
except OSError, inst:
|
2006-01-12 09:57:58 +03:00
|
|
|
if inst.errno != errno.ENOENT:
|
|
|
|
raise
|
2006-02-10 02:18:43 +03:00
|
|
|
if not wlock:
|
|
|
|
wlock = self.wlock()
|
2005-08-28 01:21:25 +04:00
|
|
|
for f in list:
|
|
|
|
p = self.wjoin(f)
|
|
|
|
if os.path.exists(p):
|
2005-10-19 05:38:39 +04:00
|
|
|
self.ui.warn(_("%s still exists!\n") % f)
|
2005-08-28 01:21:25 +04:00
|
|
|
elif self.dirstate.state(f) == 'a':
|
|
|
|
self.dirstate.forget([f])
|
|
|
|
elif f not in self.dirstate:
|
2005-10-19 05:38:39 +04:00
|
|
|
self.ui.warn(_("%s not tracked!\n") % f)
|
2005-08-28 01:21:25 +04:00
|
|
|
else:
|
|
|
|
self.dirstate.update([f], "r")
|
|
|
|
|
2006-02-10 02:18:43 +03:00
|
|
|
def undelete(self, list, wlock=None):
|
2005-10-26 02:52:27 +04:00
|
|
|
p = self.dirstate.parents()[0]
|
2005-10-26 02:51:28 +04:00
|
|
|
mn = self.changelog.read(p)[0]
|
|
|
|
m = self.manifest.read(mn)
|
2006-02-10 02:18:43 +03:00
|
|
|
if not wlock:
|
|
|
|
wlock = self.wlock()
|
2005-10-26 02:51:28 +04:00
|
|
|
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])
|
2005-10-28 22:01:25 +04:00
|
|
|
self.wwrite(f, t)
|
2006-08-11 19:57:42 +04:00
|
|
|
util.set_exec(self.wjoin(f), m.execf(f))
|
2005-10-26 02:51:28 +04:00
|
|
|
self.dirstate.update([f], "n")
|
|
|
|
|
2006-02-10 02:18:43 +03:00
|
|
|
def copy(self, source, dest, wlock=None):
|
2005-08-28 01:21:25 +04:00
|
|
|
p = self.wjoin(dest)
|
|
|
|
if not os.path.exists(p):
|
2005-10-19 05:38:39 +04:00
|
|
|
self.ui.warn(_("%s does not exist!\n") % dest)
|
2005-08-28 01:21:25 +04:00
|
|
|
elif not os.path.isfile(p):
|
2005-10-19 05:38:39 +04:00
|
|
|
self.ui.warn(_("copy failed: %s is not a file\n") % dest)
|
2005-08-28 01:21:25 +04:00
|
|
|
else:
|
2006-02-10 02:18:43 +03:00
|
|
|
if not wlock:
|
|
|
|
wlock = self.wlock()
|
2005-08-28 01:21:25 +04:00
|
|
|
if self.dirstate.state(dest) == '?':
|
|
|
|
self.dirstate.update([dest], "a")
|
|
|
|
self.dirstate.copy(source, dest)
|
|
|
|
|
2005-11-16 14:56:19 +03:00
|
|
|
def heads(self, start=None):
|
2005-11-16 14:08:25 +03:00
|
|
|
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]
|
2005-08-28 01:21:25 +04:00
|
|
|
|
|
|
|
# branchlookup returns a dict giving a list of branches for
|
|
|
|
# each head. A branch is defined as the tag of a node or
|
|
|
|
# the branch of the node's parents. If a node has multiple
|
|
|
|
# branch tags, tags are eliminated if they are visible from other
|
|
|
|
# branch tags.
|
|
|
|
#
|
|
|
|
# So, for this graph: a->b->c->d->e
|
|
|
|
# \ /
|
|
|
|
# aa -----/
|
|
|
|
# a has tag 2.6.12
|
|
|
|
# d has tag 2.6.13
|
|
|
|
# e would have branch tags for 2.6.12 and 2.6.13. Because the node
|
|
|
|
# for 2.6.12 can be reached from the node 2.6.13, that is eliminated
|
|
|
|
# from the list.
|
|
|
|
#
|
|
|
|
# It is possible that more than one head will have the same branch tag.
|
|
|
|
# callers need to check the result for multiple heads under the same
|
|
|
|
# branch tag if that is a problem for them (ie checkout of a specific
|
|
|
|
# branch).
|
|
|
|
#
|
|
|
|
# passing in a specific branch will limit the depth of the search
|
|
|
|
# through the parents. It won't limit the branches returned in the
|
|
|
|
# result though.
|
|
|
|
def branchlookup(self, heads=None, branch=None):
|
|
|
|
if not heads:
|
|
|
|
heads = self.heads()
|
|
|
|
headt = [ h for h in heads ]
|
|
|
|
chlog = self.changelog
|
|
|
|
branches = {}
|
|
|
|
merges = []
|
|
|
|
seenmerge = {}
|
|
|
|
|
|
|
|
# traverse the tree once for each head, recording in the branches
|
|
|
|
# dict which tags are visible from this head. The branches
|
|
|
|
# dict also records which tags are visible from each tag
|
|
|
|
# while we traverse.
|
|
|
|
while headt or merges:
|
|
|
|
if merges:
|
|
|
|
n, found = merges.pop()
|
|
|
|
visit = [n]
|
|
|
|
else:
|
|
|
|
h = headt.pop()
|
|
|
|
visit = [h]
|
|
|
|
found = [h]
|
|
|
|
seen = {}
|
|
|
|
while visit:
|
|
|
|
n = visit.pop()
|
|
|
|
if n in seen:
|
|
|
|
continue
|
|
|
|
pp = chlog.parents(n)
|
|
|
|
tags = self.nodetags(n)
|
|
|
|
if tags:
|
|
|
|
for x in tags:
|
|
|
|
if x == 'tip':
|
|
|
|
continue
|
|
|
|
for f in found:
|
|
|
|
branches.setdefault(f, {})[n] = 1
|
|
|
|
branches.setdefault(n, {})[n] = 1
|
|
|
|
break
|
|
|
|
if n not in found:
|
|
|
|
found.append(n)
|
|
|
|
if branch in tags:
|
|
|
|
continue
|
|
|
|
seen[n] = 1
|
|
|
|
if pp[1] != nullid and n not in seenmerge:
|
|
|
|
merges.append((pp[1], [x for x in found]))
|
|
|
|
seenmerge[n] = 1
|
|
|
|
if pp[0] != nullid:
|
|
|
|
visit.append(pp[0])
|
|
|
|
# traverse the branches dict, eliminating branch tags from each
|
|
|
|
# head that are visible from another branch tag for that head.
|
|
|
|
out = {}
|
|
|
|
viscache = {}
|
|
|
|
for h in heads:
|
|
|
|
def visible(node):
|
|
|
|
if node in viscache:
|
|
|
|
return viscache[node]
|
|
|
|
ret = {}
|
|
|
|
visit = [node]
|
|
|
|
while visit:
|
|
|
|
x = visit.pop()
|
|
|
|
if x in viscache:
|
|
|
|
ret.update(viscache[x])
|
|
|
|
elif x not in ret:
|
|
|
|
ret[x] = 1
|
|
|
|
if x in branches:
|
|
|
|
visit[len(visit):] = branches[x].keys()
|
|
|
|
viscache[node] = ret
|
|
|
|
return ret
|
|
|
|
if h not in branches:
|
|
|
|
continue
|
|
|
|
# O(n^2), but somewhat limited. This only searches the
|
|
|
|
# tags visible from a specific head, not all the tags in the
|
|
|
|
# whole repo.
|
|
|
|
for b in branches[h]:
|
|
|
|
vis = False
|
|
|
|
for bb in branches[h].keys():
|
|
|
|
if b != bb:
|
|
|
|
if b in visible(bb):
|
|
|
|
vis = True
|
|
|
|
break
|
|
|
|
if not vis:
|
|
|
|
l = out.setdefault(h, [])
|
|
|
|
l[len(l):] = self.nodetags(b)
|
|
|
|
return out
|
|
|
|
|
|
|
|
def branches(self, nodes):
|
2006-01-12 09:57:58 +03:00
|
|
|
if not nodes:
|
|
|
|
nodes = [self.changelog.tip()]
|
2005-08-28 01:21:25 +04:00
|
|
|
b = []
|
|
|
|
for n in nodes:
|
|
|
|
t = n
|
2006-05-24 03:01:39 +04:00
|
|
|
while 1:
|
2005-08-28 01:21:25 +04:00
|
|
|
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
|
|
|
|
|
2006-03-15 09:58:14 +03:00
|
|
|
def findincoming(self, remote, base=None, heads=None, force=False):
|
2006-05-23 12:44:40 +04:00
|
|
|
"""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)
|
|
|
|
"""
|
2005-08-28 01:21:25 +04:00
|
|
|
m = self.changelog.nodemap
|
|
|
|
search = []
|
|
|
|
fetch = {}
|
|
|
|
seen = {}
|
|
|
|
seenbranch = {}
|
|
|
|
if base == None:
|
|
|
|
base = {}
|
|
|
|
|
2006-04-22 00:33:51 +04:00
|
|
|
if not heads:
|
|
|
|
heads = remote.heads()
|
|
|
|
|
|
|
|
if self.changelog.tip() == nullid:
|
2006-05-23 12:44:40 +04:00
|
|
|
base[nullid] = 1
|
2006-04-22 00:33:51 +04:00
|
|
|
if heads != [nullid]:
|
|
|
|
return [nullid]
|
|
|
|
return []
|
|
|
|
|
2005-08-28 01:21:25 +04:00
|
|
|
# assume we're closer to the tip than the root
|
|
|
|
# and start by examining the heads
|
2005-10-19 05:38:39 +04:00
|
|
|
self.ui.status(_("searching for changes\n"))
|
2005-08-28 01:21:25 +04:00
|
|
|
|
|
|
|
unknown = []
|
|
|
|
for h in heads:
|
|
|
|
if h not in m:
|
|
|
|
unknown.append(h)
|
|
|
|
else:
|
|
|
|
base[h] = 1
|
|
|
|
|
|
|
|
if not unknown:
|
2006-03-13 02:02:33 +03:00
|
|
|
return []
|
2005-08-28 01:21:25 +04:00
|
|
|
|
2006-05-23 12:44:40 +04:00
|
|
|
req = dict.fromkeys(unknown)
|
2005-08-28 01:21:25 +04:00
|
|
|
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
|
|
|
|
|
2006-01-12 09:57:58 +03:00
|
|
|
self.ui.debug(_("examining %s:%s\n")
|
|
|
|
% (short(n[0]), short(n[1])))
|
2006-05-23 12:44:40 +04:00
|
|
|
if n[0] == nullid: # found the end of the branch
|
|
|
|
pass
|
|
|
|
elif n in seenbranch:
|
2005-10-19 05:38:39 +04:00
|
|
|
self.ui.debug(_("branch already found\n"))
|
2005-08-28 01:21:25 +04:00
|
|
|
continue
|
2006-05-23 12:44:40 +04:00
|
|
|
elif n[1] and n[1] in m: # do we know the base?
|
2005-10-19 05:38:39 +04:00
|
|
|
self.ui.debug(_("found incomplete branch %s:%s\n")
|
2005-08-28 01:21:25 +04:00
|
|
|
% (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:
|
2005-10-19 05:38:39 +04:00
|
|
|
self.ui.debug(_("found new changeset %s\n") %
|
2005-08-28 01:21:25 +04:00
|
|
|
short(n[1]))
|
|
|
|
fetch[n[1]] = 1 # earliest unknown
|
2006-05-23 12:44:40 +04:00
|
|
|
for p in n[2:4]:
|
|
|
|
if p in m:
|
|
|
|
base[p] = 1 # latest known
|
|
|
|
|
|
|
|
for p in n[2:4]:
|
|
|
|
if p not in req and p not in m:
|
|
|
|
r.append(p)
|
|
|
|
req[p] = 1
|
2005-08-28 01:21:25 +04:00
|
|
|
seen[n[0]] = 1
|
|
|
|
|
|
|
|
if r:
|
|
|
|
reqcnt += 1
|
2005-10-19 05:38:39 +04:00
|
|
|
self.ui.debug(_("request %d: %s\n") %
|
2005-08-28 01:21:25 +04:00
|
|
|
(reqcnt, " ".join(map(short, r))))
|
2006-10-19 16:16:51 +04:00
|
|
|
for p in xrange(0, len(r), 10):
|
2005-08-28 01:21:25 +04:00
|
|
|
for b in remote.branches(r[p:p+10]):
|
2005-10-19 05:38:39 +04:00
|
|
|
self.ui.debug(_("received %s:%s\n") %
|
2005-08-28 01:21:25 +04:00
|
|
|
(short(b[0]), short(b[1])))
|
2006-05-23 12:44:40 +04:00
|
|
|
unknown.append(b)
|
2005-08-28 01:21:25 +04:00
|
|
|
|
|
|
|
# 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:
|
2005-10-19 05:38:39 +04:00
|
|
|
self.ui.debug(_("narrowing %d:%d %s\n") % (f, len(l), short(i)))
|
2005-08-28 01:21:25 +04:00
|
|
|
if i in m:
|
|
|
|
if f <= 2:
|
2005-10-19 05:38:39 +04:00
|
|
|
self.ui.debug(_("found new branch changeset %s\n") %
|
2005-08-28 01:21:25 +04:00
|
|
|
short(p))
|
|
|
|
fetch[p] = 1
|
|
|
|
base[i] = 1
|
|
|
|
else:
|
2005-10-19 05:38:39 +04:00
|
|
|
self.ui.debug(_("narrowed branch search to %s:%s\n")
|
2005-08-28 01:21:25 +04:00
|
|
|
% (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:
|
2005-10-19 05:38:39 +04:00
|
|
|
raise repo.RepoError(_("already have changeset ") + short(f[:4]))
|
2005-08-28 01:21:25 +04:00
|
|
|
|
|
|
|
if base.keys() == [nullid]:
|
2006-03-15 09:58:14 +03:00
|
|
|
if force:
|
|
|
|
self.ui.warn(_("warning: repository is unrelated\n"))
|
|
|
|
else:
|
|
|
|
raise util.Abort(_("repository is unrelated"))
|
2005-08-28 01:21:25 +04:00
|
|
|
|
2006-08-21 06:59:51 +04:00
|
|
|
self.ui.debug(_("found new changesets starting at ") +
|
2005-08-28 01:21:25 +04:00
|
|
|
" ".join([short(f) for f in fetch]) + "\n")
|
|
|
|
|
2005-10-19 05:38:39 +04:00
|
|
|
self.ui.debug(_("%d total queries\n") % reqcnt)
|
2005-08-28 01:21:25 +04:00
|
|
|
|
|
|
|
return fetch.keys()
|
|
|
|
|
2006-03-15 09:58:14 +03:00
|
|
|
def findoutgoing(self, remote, base=None, heads=None, force=False):
|
2006-03-30 00:35:21 +04:00
|
|
|
"""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.
|
|
|
|
"""
|
2005-08-28 01:21:25 +04:00
|
|
|
if base == None:
|
|
|
|
base = {}
|
2006-03-15 09:58:14 +03:00
|
|
|
self.findincoming(remote, base, heads, force=force)
|
2005-08-28 01:21:25 +04:00
|
|
|
|
2005-10-19 05:38:39 +04:00
|
|
|
self.ui.debug(_("common changesets up to ")
|
2005-08-28 01:21:25 +04:00
|
|
|
+ " ".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 = []
|
2006-03-30 00:35:21 +04:00
|
|
|
# find every remote head that will get new children
|
|
|
|
updated_heads = {}
|
2005-08-28 01:21:25 +04:00
|
|
|
for n in remain:
|
|
|
|
p1, p2 = self.changelog.parents(n)
|
|
|
|
if p1 not in remain and p2 not in remain:
|
|
|
|
subset.append(n)
|
2006-03-30 00:35:21 +04:00
|
|
|
if heads:
|
|
|
|
if p1 in heads:
|
|
|
|
updated_heads[p1] = True
|
|
|
|
if p2 in heads:
|
|
|
|
updated_heads[p2] = True
|
2005-08-28 01:21:25 +04:00
|
|
|
|
|
|
|
# this is the set of all roots we have to push
|
2006-03-30 00:35:21 +04:00
|
|
|
if heads:
|
|
|
|
return subset, updated_heads.keys()
|
|
|
|
else:
|
|
|
|
return subset
|
2005-08-28 01:21:25 +04:00
|
|
|
|
2006-08-09 04:08:59 +04:00
|
|
|
def pull(self, remote, heads=None, force=False, lock=None):
|
|
|
|
mylock = False
|
|
|
|
if not lock:
|
|
|
|
lock = self.lock()
|
|
|
|
mylock = True
|
2005-08-28 01:21:25 +04:00
|
|
|
|
2006-08-09 04:08:59 +04:00
|
|
|
try:
|
|
|
|
fetch = self.findincoming(remote, force=force)
|
|
|
|
if fetch == [nullid]:
|
|
|
|
self.ui.status(_("requesting all changes\n"))
|
2005-08-28 01:21:25 +04:00
|
|
|
|
2006-08-09 04:08:59 +04:00
|
|
|
if not fetch:
|
|
|
|
self.ui.status(_("no changes found\n"))
|
|
|
|
return 0
|
2005-08-28 01:21:25 +04:00
|
|
|
|
2006-08-09 04:08:59 +04:00
|
|
|
if heads is None:
|
|
|
|
cg = remote.changegroup(fetch, 'pull')
|
|
|
|
else:
|
2006-09-10 05:25:07 +04:00
|
|
|
if 'changegroupsubset' not in remote.capabilities:
|
|
|
|
raise util.Abort(_("Partial pull cannot be done because other repository doesn't support changegroupsubset."))
|
2006-08-09 04:08:59 +04:00
|
|
|
cg = remote.changegroupsubset(fetch, heads, 'pull')
|
|
|
|
return self.addchangegroup(cg, 'pull', remote.url())
|
|
|
|
finally:
|
|
|
|
if mylock:
|
|
|
|
lock.release()
|
2005-08-28 01:21:25 +04:00
|
|
|
|
2006-02-14 23:11:57 +03:00
|
|
|
def push(self, remote, force=False, revs=None):
|
2006-06-16 03:37:23 +04:00
|
|
|
# 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).
|
|
|
|
|
2006-07-14 22:17:22 +04:00
|
|
|
if remote.capable('unbundle'):
|
2006-06-21 02:14:12 +04:00
|
|
|
return self.push_unbundle(remote, force, revs)
|
|
|
|
return self.push_addchangegroup(remote, force, revs)
|
2005-08-28 01:21:25 +04:00
|
|
|
|
2006-06-16 03:37:23 +04:00
|
|
|
def prepush(self, remote, force, revs):
|
2005-08-28 01:21:25 +04:00
|
|
|
base = {}
|
2006-03-30 00:35:21 +04:00
|
|
|
remote_heads = remote.heads()
|
|
|
|
inc = self.findincoming(remote, base, remote_heads, force=force)
|
2005-08-28 01:21:25 +04:00
|
|
|
|
2006-03-30 00:35:21 +04:00
|
|
|
update, updated_heads = self.findoutgoing(remote, base, remote_heads)
|
2006-02-14 23:11:57 +03:00
|
|
|
if revs is not None:
|
|
|
|
msng_cl, bases, heads = self.changelog.nodesbetween(update, revs)
|
|
|
|
else:
|
|
|
|
bases, heads = update, self.changelog.heads()
|
|
|
|
|
|
|
|
if not bases:
|
2005-10-19 05:38:39 +04:00
|
|
|
self.ui.status(_("no changes found\n"))
|
2006-06-16 03:37:23 +04:00
|
|
|
return None, 1
|
2005-08-28 01:21:25 +04:00
|
|
|
elif not force:
|
2006-11-20 01:32:36 +03:00
|
|
|
# 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:
|
2005-10-19 05:38:39 +04:00
|
|
|
self.ui.warn(_("abort: push creates new remote branches!\n"))
|
|
|
|
self.ui.status(_("(did you forget to merge?"
|
|
|
|
" use push -f to force)\n"))
|
2006-06-16 03:37:23 +04:00
|
|
|
return None, 1
|
2006-11-20 01:32:36 +03:00
|
|
|
elif inc:
|
|
|
|
self.ui.warn(_("note: unsynced remote changes!\n"))
|
2005-08-28 01:21:25 +04:00
|
|
|
|
2006-11-20 01:32:36 +03:00
|
|
|
|
2006-02-14 23:11:57 +03:00
|
|
|
if revs is None:
|
2006-02-21 18:46:38 +03:00
|
|
|
cg = self.changegroup(update, 'push')
|
2006-02-14 23:11:57 +03:00
|
|
|
else:
|
2006-02-21 18:46:38 +03:00
|
|
|
cg = self.changegroupsubset(update, revs, 'push')
|
2006-06-16 03:37:23 +04:00
|
|
|
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
|
2006-07-26 00:50:32 +04:00
|
|
|
return remote.addchangegroup(cg, 'push', self.url())
|
2006-06-16 03:37:23 +04:00
|
|
|
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]
|
2005-08-28 01:21:25 +04:00
|
|
|
|
2006-10-25 20:45:18 +04:00
|
|
|
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))
|
|
|
|
|
2006-02-17 19:26:21 +03:00
|
|
|
def changegroupsubset(self, bases, heads, source):
|
2005-10-12 05:56:47 +04:00
|
|
|
"""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.
|
2005-08-28 01:21:25 +04:00
|
|
|
|
2005-10-12 05:56:47 +04:00
|
|
|
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.
|
2005-08-28 01:21:25 +04:00
|
|
|
|
2005-10-12 05:56:47 +04:00
|
|
|
Another wrinkle is doing the reverse, figuring out which changeset in
|
|
|
|
the changegroup a particular filenode or manifestnode belongs to."""
|
2005-08-28 01:21:25 +04:00
|
|
|
|
2006-02-17 19:26:21 +03:00
|
|
|
self.hook('preoutgoing', throw=True, source=source)
|
|
|
|
|
2005-10-12 05:56:47 +04:00
|
|
|
# Set up some initial variables
|
|
|
|
# Make it easy to refer to self.changelog
|
2005-10-07 21:57:11 +04:00
|
|
|
cl = self.changelog
|
2005-10-12 05:56:47 +04:00
|
|
|
# msng is short for missing - compute the list of changesets in this
|
|
|
|
# changegroup.
|
2005-10-08 06:49:25 +04:00
|
|
|
msng_cl_lst, bases, heads = cl.nodesbetween(bases, heads)
|
2006-10-25 20:45:18 +04:00
|
|
|
self.changegroupinfo(msng_cl_lst)
|
2005-10-12 05:56:47 +04:00
|
|
|
# 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.
|
2005-10-07 21:57:11 +04:00
|
|
|
knownheads = {}
|
2005-10-12 05:56:47 +04:00
|
|
|
# We assume that all parents of bases are known heads.
|
2005-10-08 06:49:25 +04:00
|
|
|
for n in bases:
|
2005-10-07 21:57:11 +04:00
|
|
|
for p in cl.parents(n):
|
|
|
|
if p != nullid:
|
|
|
|
knownheads[p] = 1
|
|
|
|
knownheads = knownheads.keys()
|
2005-10-08 06:49:25 +04:00
|
|
|
if knownheads:
|
2005-10-12 05:56:47 +04:00
|
|
|
# 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.
|
2005-10-08 06:49:25 +04:00
|
|
|
has_cl_set, junk, junk = cl.nodesbetween(None, knownheads)
|
2005-10-12 05:56:47 +04:00
|
|
|
junk = None
|
|
|
|
# Transform the list into an ersatz set.
|
2005-10-11 19:06:52 +04:00
|
|
|
has_cl_set = dict.fromkeys(has_cl_set)
|
2005-10-08 06:49:25 +04:00
|
|
|
else:
|
2005-10-12 05:56:47 +04:00
|
|
|
# If there were no known heads, the recipient cannot be assumed to
|
|
|
|
# know about any changesets.
|
2005-10-08 06:49:25 +04:00
|
|
|
has_cl_set = {}
|
2005-10-07 21:57:11 +04:00
|
|
|
|
2005-10-12 05:56:47 +04:00
|
|
|
# Make it easy to refer to self.manifest
|
2005-10-07 21:57:11 +04:00
|
|
|
mnfst = self.manifest
|
2005-10-12 05:56:47 +04:00
|
|
|
# We don't know which manifests are missing yet
|
2005-10-07 21:57:11 +04:00
|
|
|
msng_mnfst_set = {}
|
2005-10-12 05:56:47 +04:00
|
|
|
# Nor do we know which filenodes are missing.
|
2005-10-07 21:57:11 +04:00
|
|
|
msng_filenode_set = {}
|
|
|
|
|
2005-10-08 06:49:25 +04:00
|
|
|
junk = mnfst.index[mnfst.count() - 1] # Get around a bug in lazyindex
|
|
|
|
junk = None
|
|
|
|
|
2005-10-12 05:56:47 +04:00
|
|
|
# A changeset always belongs to itself, so the changenode lookup
|
|
|
|
# function for a changenode is identity.
|
2005-10-07 21:57:11 +04:00
|
|
|
def identity(x):
|
|
|
|
return x
|
|
|
|
|
2005-10-12 05:56:47 +04:00
|
|
|
# A function generating function. Sets up an environment for the
|
|
|
|
# inner function.
|
2005-10-07 21:57:11 +04:00
|
|
|
def cmp_by_rev_func(revlog):
|
2005-10-12 05:56:47 +04:00
|
|
|
# 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):
|
2005-10-07 21:57:11 +04:00
|
|
|
return cmp(revlog.rev(a), revlog.rev(b))
|
2005-10-12 05:56:47 +04:00
|
|
|
return cmp_by_rev
|
2005-10-07 21:57:11 +04:00
|
|
|
|
2005-10-12 05:56:47 +04:00
|
|
|
# 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.
|
2005-10-07 21:57:11 +04:00
|
|
|
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)
|
|
|
|
|
2005-10-12 05:56:47 +04:00
|
|
|
# This is a function generating function used to set up an environment
|
|
|
|
# for the inner function to execute in.
|
2005-10-07 21:57:11 +04:00
|
|
|
def manifest_and_file_collector(changedfileset):
|
2005-10-12 05:56:47 +04:00
|
|
|
# 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.
|
2005-10-07 21:57:11 +04:00
|
|
|
def collect_manifests_and_files(clnode):
|
|
|
|
c = cl.read(clnode)
|
2005-08-28 01:21:25 +04:00
|
|
|
for f in c[3]:
|
2005-10-07 21:57:11 +04:00
|
|
|
# This is to make sure we only have one instance of each
|
|
|
|
# filename string for each filename.
|
2005-10-08 06:49:25 +04:00
|
|
|
changedfileset.setdefault(f, f)
|
|
|
|
msng_mnfst_set.setdefault(c[0], clnode)
|
2005-10-07 21:57:11 +04:00
|
|
|
return collect_manifests_and_files
|
|
|
|
|
2005-10-12 05:56:47 +04:00
|
|
|
# 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.
|
2005-10-07 21:57:11 +04:00
|
|
|
def prune_manifests():
|
|
|
|
has_mnfst_set = {}
|
|
|
|
for n in msng_mnfst_set:
|
2005-10-12 05:56:47 +04:00
|
|
|
# If a 'missing' manifest thinks it belongs to a changenode
|
|
|
|
# the recipient is assumed to have, obviously the recipient
|
|
|
|
# must have that manifest.
|
2005-10-07 21:57:11 +04:00
|
|
|
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)
|
|
|
|
|
2005-10-12 05:56:47 +04:00
|
|
|
# Use the information collected in collect_manifests_and_files to say
|
|
|
|
# which changenode any manifestnode belongs to.
|
2005-10-07 21:57:11 +04:00
|
|
|
def lookup_manifest_link(mnfstnode):
|
|
|
|
return msng_mnfst_set[mnfstnode]
|
|
|
|
|
2005-10-12 05:56:47 +04:00
|
|
|
# A function generating function that sets up the initial environment
|
|
|
|
# the inner function.
|
2005-10-07 21:57:11 +04:00
|
|
|
def filenode_collector(changedfiles):
|
2005-10-10 19:36:29 +04:00
|
|
|
next_rev = [0]
|
2005-10-12 05:56:47 +04:00
|
|
|
# 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.
|
2005-10-07 21:57:11 +04:00
|
|
|
def collect_msng_filenodes(mnfstnode):
|
2005-10-10 19:36:29 +04:00
|
|
|
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))
|
2005-10-12 05:56:47 +04:00
|
|
|
# For each line in the delta
|
2005-10-10 19:36:29 +04:00
|
|
|
for dline in delta.splitlines():
|
2005-10-12 05:56:47 +04:00
|
|
|
# get the filename and filenode for that line
|
2005-10-10 19:36:29 +04:00
|
|
|
f, fnode = dline.split('\0')
|
|
|
|
fnode = bin(fnode[:40])
|
|
|
|
f = changedfiles.get(f, None)
|
2005-10-12 05:56:47 +04:00
|
|
|
# And if the file is in the list of files we care
|
|
|
|
# about.
|
2005-10-10 19:36:29 +04:00
|
|
|
if f is not None:
|
2005-10-12 05:56:47 +04:00
|
|
|
# Get the changenode this manifest belongs to
|
2005-10-10 19:36:29 +04:00
|
|
|
clnode = msng_mnfst_set[mnfstnode]
|
2005-10-12 05:56:47 +04:00
|
|
|
# Create the set of filenodes for the file if
|
|
|
|
# there isn't one already.
|
2005-10-10 19:36:29 +04:00
|
|
|
ndset = msng_filenode_set.setdefault(f, {})
|
2005-10-12 05:56:47 +04:00
|
|
|
# And set the filenode's changelog node to the
|
|
|
|
# manifest's if it hasn't been set already.
|
2005-10-10 19:36:29 +04:00
|
|
|
ndset.setdefault(fnode, clnode)
|
|
|
|
else:
|
2005-10-12 05:56:47 +04:00
|
|
|
# Otherwise we need a full manifest.
|
2005-10-10 19:36:29 +04:00
|
|
|
m = mnfst.read(mnfstnode)
|
2005-10-12 05:56:47 +04:00
|
|
|
# For every file in we care about.
|
2005-10-10 19:36:29 +04:00
|
|
|
for f in changedfiles:
|
|
|
|
fnode = m.get(f, None)
|
2005-10-12 05:56:47 +04:00
|
|
|
# If it's in the manifest
|
2005-10-10 19:36:29 +04:00
|
|
|
if fnode is not None:
|
2005-10-12 05:56:47 +04:00
|
|
|
# See comments above.
|
2005-10-10 19:36:29 +04:00
|
|
|
clnode = msng_mnfst_set[mnfstnode]
|
|
|
|
ndset = msng_filenode_set.setdefault(f, {})
|
|
|
|
ndset.setdefault(fnode, clnode)
|
2005-10-12 05:56:47 +04:00
|
|
|
# Remember the revision we hope to see next.
|
2005-10-10 19:36:29 +04:00
|
|
|
next_rev[0] = r + 1
|
2005-10-08 06:49:25 +04:00
|
|
|
return collect_msng_filenodes
|
2005-10-07 21:57:11 +04:00
|
|
|
|
2005-10-12 05:56:47 +04:00
|
|
|
# We have a list of filenodes we think we need for a file, lets remove
|
|
|
|
# all those we now the recipient must have.
|
2005-10-07 21:57:11 +04:00
|
|
|
def prune_filenodes(f, filerevlog):
|
|
|
|
msngset = msng_filenode_set[f]
|
|
|
|
hasset = {}
|
2005-10-12 05:56:47 +04:00
|
|
|
# If a 'missing' filenode thinks it belongs to a changenode we
|
|
|
|
# assume the recipient must have, then the recipient must have
|
|
|
|
# that filenode.
|
2005-10-07 21:57:11 +04:00
|
|
|
for n in msngset:
|
|
|
|
clnode = cl.node(filerevlog.linkrev(n))
|
|
|
|
if clnode in has_cl_set:
|
|
|
|
hasset[n] = 1
|
|
|
|
prune_parents(filerevlog, hasset, msngset)
|
|
|
|
|
2005-10-12 05:56:47 +04:00
|
|
|
# A function generator function that sets up the a context for the
|
|
|
|
# inner function.
|
2005-10-07 21:57:11 +04:00
|
|
|
def lookup_filenode_link_func(fname):
|
|
|
|
msngset = msng_filenode_set[fname]
|
2005-10-12 05:56:47 +04:00
|
|
|
# Lookup the changenode the filenode belongs to.
|
2005-10-07 21:57:11 +04:00
|
|
|
def lookup_filenode_link(fnode):
|
|
|
|
return msngset[fnode]
|
|
|
|
return lookup_filenode_link
|
2005-08-28 01:21:25 +04:00
|
|
|
|
2005-10-12 05:56:47 +04:00
|
|
|
# Now that we have all theses utility functions to help out and
|
|
|
|
# logically divide up the task, generate the group.
|
2005-08-28 01:21:25 +04:00
|
|
|
def gengroup():
|
2005-10-12 05:56:47 +04:00
|
|
|
# The set of changed files starts empty.
|
2005-10-07 21:57:11 +04:00
|
|
|
changedfiles = {}
|
2005-10-12 05:56:47 +04:00
|
|
|
# Create a changenode group generator that will call our functions
|
|
|
|
# back to lookup the owning changenode and collect information.
|
2005-10-07 21:57:11 +04:00
|
|
|
group = cl.group(msng_cl_lst, identity,
|
|
|
|
manifest_and_file_collector(changedfiles))
|
|
|
|
for chnk in group:
|
|
|
|
yield chnk
|
2005-10-12 05:56:47 +04:00
|
|
|
|
|
|
|
# The list of manifests has been collected by the generator
|
|
|
|
# calling our functions back.
|
2005-10-07 21:57:11 +04:00
|
|
|
prune_manifests()
|
|
|
|
msng_mnfst_lst = msng_mnfst_set.keys()
|
2005-10-12 05:56:47 +04:00
|
|
|
# Sort the manifestnodes by revision number.
|
2005-10-07 21:57:11 +04:00
|
|
|
msng_mnfst_lst.sort(cmp_by_rev_func(mnfst))
|
2005-10-12 05:56:47 +04:00
|
|
|
# Create a generator for the manifestnodes that calls our lookup
|
|
|
|
# and data collection functions back.
|
2005-10-08 06:49:25 +04:00
|
|
|
group = mnfst.group(msng_mnfst_lst, lookup_manifest_link,
|
2005-10-07 21:57:11 +04:00
|
|
|
filenode_collector(changedfiles))
|
|
|
|
for chnk in group:
|
|
|
|
yield chnk
|
2005-10-12 05:56:47 +04:00
|
|
|
|
|
|
|
# These are no longer needed, dereference and toss the memory for
|
|
|
|
# them.
|
2005-10-07 21:57:11 +04:00
|
|
|
msng_mnfst_lst = None
|
|
|
|
msng_mnfst_set.clear()
|
2005-10-12 05:56:47 +04:00
|
|
|
|
2005-10-10 19:36:29 +04:00
|
|
|
changedfiles = changedfiles.keys()
|
|
|
|
changedfiles.sort()
|
2005-10-12 05:56:47 +04:00
|
|
|
# Go through all our files in order sorted by name.
|
2005-10-07 21:57:11 +04:00
|
|
|
for fname in changedfiles:
|
|
|
|
filerevlog = self.file(fname)
|
2005-10-12 05:56:47 +04:00
|
|
|
# Toss out the filenodes that the recipient isn't really
|
|
|
|
# missing.
|
2006-01-20 20:35:43 +03:00
|
|
|
if msng_filenode_set.has_key(fname):
|
|
|
|
prune_filenodes(fname, filerevlog)
|
|
|
|
msng_filenode_lst = msng_filenode_set[fname].keys()
|
|
|
|
else:
|
|
|
|
msng_filenode_lst = []
|
2005-10-12 05:56:47 +04:00
|
|
|
# If any filenodes are left, generate the group for them,
|
|
|
|
# otherwise don't bother.
|
2005-10-07 21:57:11 +04:00
|
|
|
if len(msng_filenode_lst) > 0:
|
2006-03-21 13:47:21 +03:00
|
|
|
yield changegroup.genchunk(fname)
|
2005-10-12 05:56:47 +04:00
|
|
|
# Sort the filenodes by their revision #
|
2005-10-07 21:57:11 +04:00
|
|
|
msng_filenode_lst.sort(cmp_by_rev_func(filerevlog))
|
2005-10-12 05:56:47 +04:00
|
|
|
# Create a group generator and only pass in a changenode
|
|
|
|
# lookup function as we need to collect no information
|
|
|
|
# from filenodes.
|
2005-10-07 21:57:11 +04:00
|
|
|
group = filerevlog.group(msng_filenode_lst,
|
2005-10-08 06:49:25 +04:00
|
|
|
lookup_filenode_link_func(fname))
|
2005-10-07 21:57:11 +04:00
|
|
|
for chnk in group:
|
|
|
|
yield chnk
|
2006-01-20 20:35:43 +03:00
|
|
|
if msng_filenode_set.has_key(fname):
|
|
|
|
# Don't need this anymore, toss it to free memory.
|
|
|
|
del msng_filenode_set[fname]
|
2005-10-12 05:56:47 +04:00
|
|
|
# Signal that no more groups are left.
|
2006-03-21 13:47:21 +03:00
|
|
|
yield changegroup.closechunk()
|
2005-08-28 01:21:25 +04:00
|
|
|
|
2006-04-28 13:36:33 +04:00
|
|
|
if msng_cl_lst:
|
2006-04-28 09:29:02 +04:00
|
|
|
self.hook('outgoing', node=hex(msng_cl_lst[0]), source=source)
|
2006-02-17 19:26:21 +03:00
|
|
|
|
2005-10-07 21:57:11 +04:00
|
|
|
return util.chunkbuffer(gengroup())
|
2005-08-28 01:21:25 +04:00
|
|
|
|
2006-02-17 19:26:21 +03:00
|
|
|
def changegroup(self, basenodes, source):
|
2005-10-12 05:56:47 +04:00
|
|
|
"""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."""
|
2006-02-17 19:26:21 +03:00
|
|
|
|
|
|
|
self.hook('preoutgoing', throw=True, source=source)
|
|
|
|
|
2005-10-07 21:57:11 +04:00
|
|
|
cl = self.changelog
|
|
|
|
nodes = cl.nodesbetween(basenodes, None)[0]
|
|
|
|
revset = dict.fromkeys([cl.rev(n) for n in nodes])
|
2006-10-25 20:45:18 +04:00
|
|
|
self.changegroupinfo(nodes)
|
2005-10-07 21:57:11 +04:00
|
|
|
|
|
|
|
def identity(x):
|
|
|
|
return x
|
|
|
|
|
|
|
|
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
|
2005-08-28 01:21:25 +04:00
|
|
|
|
2005-10-07 21:57:11 +04:00
|
|
|
def gengroup():
|
|
|
|
# construct a list of all changed files
|
|
|
|
changedfiles = {}
|
|
|
|
|
|
|
|
for chnk in cl.group(nodes, identity,
|
|
|
|
changed_file_collector(changedfiles)):
|
|
|
|
yield chnk
|
|
|
|
changedfiles = changedfiles.keys()
|
|
|
|
changedfiles.sort()
|
|
|
|
|
|
|
|
mnfst = self.manifest
|
|
|
|
nodeiter = gennodelst(mnfst)
|
|
|
|
for chnk in mnfst.group(nodeiter, lookuprevlink_func(mnfst)):
|
|
|
|
yield chnk
|
|
|
|
|
|
|
|
for fname in changedfiles:
|
|
|
|
filerevlog = self.file(fname)
|
|
|
|
nodeiter = gennodelst(filerevlog)
|
|
|
|
nodeiter = list(nodeiter)
|
|
|
|
if nodeiter:
|
2006-03-21 13:47:21 +03:00
|
|
|
yield changegroup.genchunk(fname)
|
2005-10-07 21:57:11 +04:00
|
|
|
lookup = lookuprevlink_func(filerevlog)
|
|
|
|
for chnk in filerevlog.group(nodeiter, lookup):
|
|
|
|
yield chnk
|
2005-08-28 01:21:25 +04:00
|
|
|
|
2006-03-21 13:47:21 +03:00
|
|
|
yield changegroup.closechunk()
|
2006-04-22 00:14:27 +04:00
|
|
|
|
|
|
|
if nodes:
|
|
|
|
self.hook('outgoing', node=hex(nodes[0]), source=source)
|
2005-08-28 01:21:25 +04:00
|
|
|
|
2005-10-07 21:57:11 +04:00
|
|
|
return util.chunkbuffer(gengroup())
|
2005-08-28 01:21:25 +04:00
|
|
|
|
2006-07-26 00:50:32 +04:00
|
|
|
def addchangegroup(self, source, srctype, url):
|
2006-03-29 22:27:16 +04:00
|
|
|
"""add changegroup to repo.
|
2005-08-28 01:21:25 +04:00
|
|
|
|
2006-12-06 01:25:28 +03:00
|
|
|
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
|
|
|
|
"""
|
2005-08-28 01:21:25 +04:00
|
|
|
def csmap(x):
|
2005-10-19 05:38:39 +04:00
|
|
|
self.ui.debug(_("add changeset %s\n") % short(x))
|
fix race in localrepo.addchangegroup.
localrepo.addchangegroup writes to changelog, then manifest, then normal
files. this breaks access ordering. if reader reads changelog while
manifest is being written, can find pointers into places in manifest
that are not yet written. same can happen for manifest and normal files.
fix is to make almost no change to localrepo.addchangegroup. it must
to write changelog and manifest data early because it has to read them
while writing other files. instead, write changelog and manifest data
to temp file that reader cannot see, then append temp data to manifest
after all normal files written, finally append temp data to changelog.
temp file code is in new appendfile module. can be used in other places
with small changes.
much smaller race still left. we write all new data in one write call,
but reader can maybe see partial update because python or os or filesystem
cannot always make write really atomic. file locking no help: slow, not
portable, not reliable over nfs. only real safe other plan is write to
temp file every time and rename, but performance bad when manifest or
changelog is big.
2006-03-24 20:08:12 +03:00
|
|
|
return cl.count()
|
2005-08-28 01:21:25 +04:00
|
|
|
|
|
|
|
def revmap(x):
|
fix race in localrepo.addchangegroup.
localrepo.addchangegroup writes to changelog, then manifest, then normal
files. this breaks access ordering. if reader reads changelog while
manifest is being written, can find pointers into places in manifest
that are not yet written. same can happen for manifest and normal files.
fix is to make almost no change to localrepo.addchangegroup. it must
to write changelog and manifest data early because it has to read them
while writing other files. instead, write changelog and manifest data
to temp file that reader cannot see, then append temp data to manifest
after all normal files written, finally append temp data to changelog.
temp file code is in new appendfile module. can be used in other places
with small changes.
much smaller race still left. we write all new data in one write call,
but reader can maybe see partial update because python or os or filesystem
cannot always make write really atomic. file locking no help: slow, not
portable, not reliable over nfs. only real safe other plan is write to
temp file every time and rename, but performance bad when manifest or
changelog is big.
2006-03-24 20:08:12 +03:00
|
|
|
return cl.rev(x)
|
2005-08-28 01:21:25 +04:00
|
|
|
|
2006-01-12 09:57:58 +03:00
|
|
|
if not source:
|
2006-03-29 22:27:16 +04:00
|
|
|
return 0
|
2006-02-15 21:49:30 +03:00
|
|
|
|
2006-07-26 00:50:32 +04:00
|
|
|
self.hook('prechangegroup', throw=True, source=srctype, url=url)
|
2006-02-15 21:49:30 +03:00
|
|
|
|
2005-08-28 01:21:25 +04:00
|
|
|
changesets = files = revisions = 0
|
|
|
|
|
|
|
|
tr = self.transaction()
|
|
|
|
|
2006-06-04 19:46:33 +04:00
|
|
|
# write changelog data to temp files so concurrent readers will not see
|
|
|
|
# inconsistent view
|
2006-05-09 19:03:00 +04:00
|
|
|
cl = None
|
|
|
|
try:
|
2006-10-24 02:12:20 +04:00
|
|
|
cl = appendfile.appendchangelog(self.sopener,
|
|
|
|
self.changelog.version)
|
2006-05-09 19:03:00 +04:00
|
|
|
|
|
|
|
oldheads = len(cl.heads())
|
|
|
|
|
|
|
|
# pull off the changeset group
|
|
|
|
self.ui.status(_("adding changesets\n"))
|
2006-05-24 12:59:30 +04:00
|
|
|
cor = cl.count() - 1
|
2006-03-21 13:47:21 +03:00
|
|
|
chunkiter = changegroup.chunkiter(source)
|
2006-06-01 00:25:20 +04:00
|
|
|
if cl.addgroup(chunkiter, csmap, tr, 1) is None:
|
|
|
|
raise util.Abort(_("received changelog group is empty"))
|
2006-05-24 12:59:30 +04:00
|
|
|
cnr = cl.count() - 1
|
2006-05-09 19:03:00 +04:00
|
|
|
changesets = cnr - cor
|
|
|
|
|
2006-06-04 19:46:33 +04:00
|
|
|
# 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)
|
|
|
|
|
|
|
|
# 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()
|
2006-05-09 19:03:00 +04:00
|
|
|
chunkiter = changegroup.chunkiter(source)
|
2006-06-04 19:46:33 +04:00
|
|
|
if fl.addgroup(chunkiter, revmap, tr) is None:
|
|
|
|
raise util.Abort(_("received file revlog group is empty"))
|
|
|
|
revisions += fl.count() - o
|
|
|
|
files += 1
|
|
|
|
|
2006-05-09 19:03:00 +04:00
|
|
|
cl.writedata()
|
|
|
|
finally:
|
|
|
|
if cl:
|
|
|
|
cl.cleanup()
|
fix race in localrepo.addchangegroup.
localrepo.addchangegroup writes to changelog, then manifest, then normal
files. this breaks access ordering. if reader reads changelog while
manifest is being written, can find pointers into places in manifest
that are not yet written. same can happen for manifest and normal files.
fix is to make almost no change to localrepo.addchangegroup. it must
to write changelog and manifest data early because it has to read them
while writing other files. instead, write changelog and manifest data
to temp file that reader cannot see, then append temp data to manifest
after all normal files written, finally append temp data to changelog.
temp file code is in new appendfile module. can be used in other places
with small changes.
much smaller race still left. we write all new data in one write call,
but reader can maybe see partial update because python or os or filesystem
cannot always make write really atomic. file locking no help: slow, not
portable, not reliable over nfs. only real safe other plan is write to
temp file every time and rename, but performance bad when manifest or
changelog is big.
2006-03-24 20:08:12 +03:00
|
|
|
|
2006-06-04 19:46:33 +04:00
|
|
|
# make changelog see real files again
|
2006-10-24 02:12:20 +04:00
|
|
|
self.changelog = changelog.changelog(self.sopener,
|
|
|
|
self.changelog.version)
|
2006-04-05 00:38:43 +04:00
|
|
|
self.changelog.checkinlinesize(tr)
|
fix race in localrepo.addchangegroup.
localrepo.addchangegroup writes to changelog, then manifest, then normal
files. this breaks access ordering. if reader reads changelog while
manifest is being written, can find pointers into places in manifest
that are not yet written. same can happen for manifest and normal files.
fix is to make almost no change to localrepo.addchangegroup. it must
to write changelog and manifest data early because it has to read them
while writing other files. instead, write changelog and manifest data
to temp file that reader cannot see, then append temp data to manifest
after all normal files written, finally append temp data to changelog.
temp file code is in new appendfile module. can be used in other places
with small changes.
much smaller race still left. we write all new data in one write call,
but reader can maybe see partial update because python or os or filesystem
cannot always make write really atomic. file locking no help: slow, not
portable, not reliable over nfs. only real safe other plan is write to
temp file every time and rename, but performance bad when manifest or
changelog is big.
2006-03-24 20:08:12 +03:00
|
|
|
|
2005-08-28 01:21:25 +04:00
|
|
|
newheads = len(self.changelog.heads())
|
|
|
|
heads = ""
|
2006-06-10 19:39:29 +04:00
|
|
|
if oldheads and newheads != oldheads:
|
|
|
|
heads = _(" (%+d heads)") % (newheads - oldheads)
|
2005-08-28 01:21:25 +04:00
|
|
|
|
2005-10-19 05:38:39 +04:00
|
|
|
self.ui.status(_("added %d changesets"
|
|
|
|
" with %d changes to %d files%s\n")
|
|
|
|
% (changesets, revisions, files, heads))
|
2005-08-28 01:21:25 +04:00
|
|
|
|
2006-05-11 17:01:30 +04:00
|
|
|
if changesets > 0:
|
|
|
|
self.hook('pretxnchangegroup', throw=True,
|
2006-07-26 00:50:32 +04:00
|
|
|
node=hex(self.changelog.node(cor+1)), source=srctype,
|
|
|
|
url=url)
|
2006-02-15 21:49:30 +03:00
|
|
|
|
2005-08-28 01:21:25 +04:00
|
|
|
tr.close()
|
|
|
|
|
2005-10-04 01:45:14 +04:00
|
|
|
if changesets > 0:
|
2006-05-09 03:07:56 +04:00
|
|
|
self.hook("changegroup", node=hex(self.changelog.node(cor+1)),
|
2006-07-26 00:50:32 +04:00
|
|
|
source=srctype, url=url)
|
2005-08-28 01:21:25 +04:00
|
|
|
|
2006-10-19 16:16:51 +04:00
|
|
|
for i in xrange(cor + 1, cnr + 1):
|
2006-05-09 03:07:56 +04:00
|
|
|
self.hook("incoming", node=hex(self.changelog.node(i)),
|
2006-07-26 00:50:32 +04:00
|
|
|
source=srctype, url=url)
|
2005-09-22 21:12:42 +04:00
|
|
|
|
2006-12-06 01:25:28 +03:00
|
|
|
# never return 0 here:
|
|
|
|
if newheads < oldheads:
|
|
|
|
return newheads - oldheads - 1
|
|
|
|
else:
|
|
|
|
return newheads - oldheads + 1
|
2006-03-29 22:27:16 +04:00
|
|
|
|
2006-02-28 21:24:54 +03:00
|
|
|
|
2006-07-14 22:17:22 +04:00
|
|
|
def stream_in(self, remote):
|
|
|
|
fp = remote.stream_out()
|
2006-10-27 20:17:12 +04:00
|
|
|
l = fp.readline()
|
|
|
|
try:
|
|
|
|
resp = int(l)
|
|
|
|
except ValueError:
|
|
|
|
raise util.UnexpectedOutput(
|
|
|
|
_('Unexpected response from remote server:'), l)
|
2006-11-20 21:41:49 +03:00
|
|
|
if resp == 1:
|
2006-07-16 03:06:35 +04:00
|
|
|
raise util.Abort(_('operation forbidden by server'))
|
2006-11-20 21:41:49 +03:00
|
|
|
elif resp == 2:
|
|
|
|
raise util.Abort(_('locking the remote repository failed'))
|
|
|
|
elif resp != 0:
|
|
|
|
raise util.Abort(_('the server sent an unknown error code'))
|
2006-07-16 03:06:35 +04:00
|
|
|
self.ui.status(_('streaming all changes\n'))
|
2006-10-27 20:17:12 +04:00
|
|
|
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)
|
2006-07-14 22:17:22 +04:00
|
|
|
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):
|
2006-11-28 21:11:46 +03:00
|
|
|
# XXX doesn't support '\n' or '\r' in filenames
|
2006-10-27 20:17:12 +04:00
|
|
|
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)
|
2006-07-14 22:17:22 +04:00
|
|
|
self.ui.debug('adding %s (%s)\n' % (name, util.bytecount(size)))
|
2006-10-24 02:12:20 +04:00
|
|
|
ofp = self.sopener(name, 'w')
|
2006-07-14 22:17:22 +04:00
|
|
|
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
|
2006-08-08 01:27:09 +04:00
|
|
|
|
2006-07-15 01:51:36 +04:00
|
|
|
def clone(self, remote, heads=[], stream=False):
|
2006-07-14 22:17:22 +04:00
|
|
|
'''clone remote repository.
|
|
|
|
|
|
|
|
keyword arguments:
|
|
|
|
heads: list of revs to clone (forces use of pull)
|
2006-07-16 03:06:35 +04:00
|
|
|
stream: use streaming clone if possible'''
|
2006-07-14 22:17:22 +04:00
|
|
|
|
2006-07-16 03:06:35 +04:00
|
|
|
# now, all clients that can request uncompressed clones can
|
|
|
|
# read repo formats supported by all servers that can serve
|
|
|
|
# them.
|
2006-07-14 22:17:22 +04:00
|
|
|
|
|
|
|
# if revlog format changes, client will have to check version
|
2006-07-16 03:06:35 +04:00
|
|
|
# and format flags on "stream" capability, and use
|
|
|
|
# uncompressed only if compatible.
|
2006-07-14 22:17:22 +04:00
|
|
|
|
2006-07-15 01:51:36 +04:00
|
|
|
if stream and not heads and remote.capable('stream'):
|
2006-07-14 22:17:22 +04:00
|
|
|
return self.stream_in(remote)
|
|
|
|
return self.pull(remote, heads)
|
|
|
|
|
2006-02-28 21:24:54 +03:00
|
|
|
# used to avoid circular references so destructors work
|
2006-12-05 13:28:21 +03:00
|
|
|
def aftertrans(files):
|
|
|
|
renamefiles = [tuple(t) for t in files]
|
2006-02-28 21:24:54 +03:00
|
|
|
def a():
|
2006-12-05 13:28:21 +03:00
|
|
|
for src, dest in renamefiles:
|
|
|
|
util.rename(src, dest)
|
2006-02-28 21:24:54 +03:00
|
|
|
return a
|
|
|
|
|
2006-07-31 18:11:12 +04:00
|
|
|
def instance(ui, path, create):
|
|
|
|
return localrepository(ui, util.drop_scheme('file', path), create)
|
2006-10-01 21:26:33 +04:00
|
|
|
|
2006-07-31 18:11:12 +04:00
|
|
|
def islocal(path):
|
|
|
|
return True
|