2009-04-26 03:13:08 +04:00
|
|
|
# bundlerepo.py - repository class for viewing uncompressed bundles
|
|
|
|
#
|
|
|
|
# Copyright 2006, 2007 Benoit Boissinot <bboissin@gmail.com>
|
|
|
|
#
|
|
|
|
# This software may be used and distributed according to the terms of the
|
2010-01-20 07:20:08 +03:00
|
|
|
# GNU General Public License version 2 or any later version.
|
2006-03-13 05:54:23 +03:00
|
|
|
|
2009-04-26 03:24:49 +04:00
|
|
|
"""Repository class for viewing uncompressed bundles.
|
|
|
|
|
|
|
|
This provides a read-only repository interface to bundles as if they
|
|
|
|
were part of the actual repository.
|
|
|
|
"""
|
|
|
|
|
2009-03-23 15:12:07 +03:00
|
|
|
from node import nullid
|
2006-12-15 05:25:19 +03:00
|
|
|
from i18n import _
|
2011-05-01 22:08:29 +04:00
|
|
|
import os, tempfile, shutil
|
2012-02-01 03:25:37 +04:00
|
|
|
import changegroup, util, mdiff, discovery, cmdutil
|
2011-04-30 20:43:20 +04:00
|
|
|
import localrepo, changelog, manifest, filelog, revlog, error
|
2006-03-13 05:54:23 +03:00
|
|
|
|
2006-03-13 08:58:31 +03:00
|
|
|
class bundlerevlog(revlog.revlog):
|
2011-04-30 12:41:06 +04:00
|
|
|
def __init__(self, opener, indexfile, bundle, linkmapper):
|
2006-03-13 05:54:23 +03:00
|
|
|
# How it works:
|
|
|
|
# to retrieve a revision, we need to know the offset of
|
2010-09-18 04:24:29 +04:00
|
|
|
# the revision in the bundle (an unbundle object).
|
2006-03-13 05:54:23 +03:00
|
|
|
#
|
|
|
|
# We store this offset in the index (start), to differentiate a
|
|
|
|
# rev in the bundle and from a rev in the revlog, we check
|
|
|
|
# len(index[r]). If the tuple is bigger than 7, it is a bundle
|
|
|
|
# (it is bigger since we store the node to which the delta is)
|
|
|
|
#
|
2007-03-23 03:12:03 +03:00
|
|
|
revlog.revlog.__init__(self, opener, indexfile)
|
2010-09-18 04:24:29 +04:00
|
|
|
self.bundle = bundle
|
2006-04-05 00:38:43 +04:00
|
|
|
self.basemap = {}
|
2008-06-26 23:35:50 +04:00
|
|
|
n = len(self)
|
2011-04-30 12:41:06 +04:00
|
|
|
chain = None
|
2011-06-01 14:38:46 +04:00
|
|
|
while True:
|
2011-04-30 21:01:24 +04:00
|
|
|
chunkdata = bundle.deltachunk(chain)
|
2011-04-30 12:41:06 +04:00
|
|
|
if not chunkdata:
|
|
|
|
break
|
|
|
|
node = chunkdata['node']
|
|
|
|
p1 = chunkdata['p1']
|
|
|
|
p2 = chunkdata['p2']
|
|
|
|
cs = chunkdata['cs']
|
|
|
|
deltabase = chunkdata['deltabase']
|
|
|
|
delta = chunkdata['delta']
|
|
|
|
|
|
|
|
size = len(delta)
|
|
|
|
start = bundle.tell() - size
|
|
|
|
|
|
|
|
link = linkmapper(cs)
|
2006-03-13 05:54:23 +03:00
|
|
|
if node in self.nodemap:
|
2011-04-30 12:41:06 +04:00
|
|
|
# this can happen if two branches make the same change
|
|
|
|
chain = node
|
2006-03-13 05:54:23 +03:00
|
|
|
continue
|
2011-04-30 12:41:06 +04:00
|
|
|
|
2006-03-13 05:54:23 +03:00
|
|
|
for p in (p1, p2):
|
|
|
|
if not p in self.nodemap:
|
2009-10-27 12:33:41 +03:00
|
|
|
raise error.LookupError(p, self.indexfile,
|
2009-01-12 07:48:28 +03:00
|
|
|
_("unknown parent"))
|
2007-08-14 20:25:27 +04:00
|
|
|
# start, size, full unc. size, base (unused), link, p1, p2, node
|
|
|
|
e = (revlog.offset_type(start, 0), size, -1, -1, link,
|
2007-07-24 05:44:08 +04:00
|
|
|
self.rev(p1), self.rev(p2), node)
|
2011-04-30 12:41:06 +04:00
|
|
|
self.basemap[n] = deltabase
|
2007-07-24 05:44:08 +04:00
|
|
|
self.index.insert(-1, e)
|
2006-03-13 05:54:23 +03:00
|
|
|
self.nodemap[node] = n
|
2011-04-30 12:41:06 +04:00
|
|
|
chain = node
|
2006-03-13 05:54:23 +03:00
|
|
|
n += 1
|
|
|
|
|
2010-09-18 04:24:29 +04:00
|
|
|
def inbundle(self, rev):
|
2006-03-13 05:54:23 +03:00
|
|
|
"""is rev from the bundle"""
|
|
|
|
if rev < 0:
|
|
|
|
return False
|
2006-04-05 00:38:43 +04:00
|
|
|
return rev in self.basemap
|
2010-01-25 09:05:27 +03:00
|
|
|
def bundlebase(self, rev):
|
|
|
|
return self.basemap[rev]
|
2009-10-31 18:42:51 +03:00
|
|
|
def _chunk(self, rev):
|
2006-03-13 05:54:23 +03:00
|
|
|
# Warning: in case of bundle, the diff is against bundlebase,
|
|
|
|
# not against rev - 1
|
|
|
|
# XXX: could use some caching
|
2010-09-18 04:24:29 +04:00
|
|
|
if not self.inbundle(rev):
|
2009-10-31 18:42:51 +03:00
|
|
|
return revlog.revlog._chunk(self, rev)
|
2010-09-18 04:24:29 +04:00
|
|
|
self.bundle.seek(self.start(rev))
|
|
|
|
return self.bundle.read(self.length(rev))
|
2006-03-13 05:54:23 +03:00
|
|
|
|
|
|
|
def revdiff(self, rev1, rev2):
|
|
|
|
"""return or calculate a delta between two revisions"""
|
2010-09-18 04:24:29 +04:00
|
|
|
if self.inbundle(rev1) and self.inbundle(rev2):
|
2006-03-13 05:54:23 +03:00
|
|
|
# hot path for bundle
|
|
|
|
revb = self.rev(self.bundlebase(rev2))
|
|
|
|
if revb == rev1:
|
2009-10-31 18:42:51 +03:00
|
|
|
return self._chunk(rev2)
|
2010-09-18 04:24:29 +04:00
|
|
|
elif not self.inbundle(rev1) and not self.inbundle(rev2):
|
2007-01-15 19:56:20 +03:00
|
|
|
return revlog.revlog.revdiff(self, rev1, rev2)
|
2006-03-13 05:54:23 +03:00
|
|
|
|
2007-07-24 05:44:08 +04:00
|
|
|
return mdiff.textdiff(self.revision(self.node(rev1)),
|
2006-03-13 05:54:23 +03:00
|
|
|
self.revision(self.node(rev2)))
|
|
|
|
|
|
|
|
def revision(self, node):
|
|
|
|
"""return an uncompressed revision of a given"""
|
2010-01-25 09:05:27 +03:00
|
|
|
if node == nullid:
|
|
|
|
return ""
|
2006-03-13 05:54:23 +03:00
|
|
|
|
|
|
|
text = None
|
|
|
|
chain = []
|
|
|
|
iter_node = node
|
|
|
|
rev = self.rev(iter_node)
|
|
|
|
# reconstruct the revision if it is from a changegroup
|
2010-09-18 04:24:29 +04:00
|
|
|
while self.inbundle(rev):
|
2007-07-24 05:44:08 +04:00
|
|
|
if self._cache and self._cache[0] == iter_node:
|
|
|
|
text = self._cache[2]
|
2006-03-13 05:54:23 +03:00
|
|
|
break
|
|
|
|
chain.append(rev)
|
|
|
|
iter_node = self.bundlebase(rev)
|
|
|
|
rev = self.rev(iter_node)
|
|
|
|
if text is None:
|
2006-03-13 08:58:31 +03:00
|
|
|
text = revlog.revlog.revision(self, iter_node)
|
2006-03-13 05:54:23 +03:00
|
|
|
|
|
|
|
while chain:
|
2009-10-31 18:42:51 +03:00
|
|
|
delta = self._chunk(chain.pop())
|
2007-07-24 05:44:08 +04:00
|
|
|
text = mdiff.patches(text, [delta])
|
2006-03-13 05:54:23 +03:00
|
|
|
|
|
|
|
p1, p2 = self.parents(node)
|
2006-03-13 08:58:31 +03:00
|
|
|
if node != revlog.hash(text, p1, p2):
|
2009-01-12 07:48:28 +03:00
|
|
|
raise error.RevlogError(_("integrity check failed on %s:%d")
|
2006-05-11 13:24:28 +04:00
|
|
|
% (self.datafile, self.rev(node)))
|
2006-03-13 05:54:23 +03:00
|
|
|
|
2007-07-24 05:44:08 +04:00
|
|
|
self._cache = (node, self.rev(node), text)
|
2006-03-13 05:54:23 +03:00
|
|
|
return text
|
|
|
|
|
|
|
|
def addrevision(self, text, transaction, link, p1=None, p2=None, d=None):
|
|
|
|
raise NotImplementedError
|
2008-06-05 18:25:11 +04:00
|
|
|
def addgroup(self, revs, linkmapper, transaction):
|
2006-03-13 05:54:23 +03:00
|
|
|
raise NotImplementedError
|
|
|
|
def strip(self, rev, minlink):
|
|
|
|
raise NotImplementedError
|
|
|
|
def checksize(self):
|
|
|
|
raise NotImplementedError
|
|
|
|
|
2006-03-13 08:58:31 +03:00
|
|
|
class bundlechangelog(bundlerevlog, changelog.changelog):
|
2010-09-18 04:24:29 +04:00
|
|
|
def __init__(self, opener, bundle):
|
2006-03-13 08:58:31 +03:00
|
|
|
changelog.changelog.__init__(self, opener)
|
2011-04-30 12:41:06 +04:00
|
|
|
linkmapper = lambda x: x
|
|
|
|
bundlerevlog.__init__(self, opener, self.indexfile, bundle,
|
|
|
|
linkmapper)
|
2006-03-13 05:54:23 +03:00
|
|
|
|
2006-03-13 08:58:31 +03:00
|
|
|
class bundlemanifest(bundlerevlog, manifest.manifest):
|
2010-09-18 04:24:29 +04:00
|
|
|
def __init__(self, opener, bundle, linkmapper):
|
2006-03-13 08:58:31 +03:00
|
|
|
manifest.manifest.__init__(self, opener)
|
2010-09-18 04:24:29 +04:00
|
|
|
bundlerevlog.__init__(self, opener, self.indexfile, bundle,
|
2007-03-23 03:12:03 +03:00
|
|
|
linkmapper)
|
2006-03-13 05:54:23 +03:00
|
|
|
|
2006-03-13 08:58:31 +03:00
|
|
|
class bundlefilelog(bundlerevlog, filelog.filelog):
|
2011-05-10 19:38:58 +04:00
|
|
|
def __init__(self, opener, path, bundle, linkmapper, repo):
|
2006-03-13 08:58:31 +03:00
|
|
|
filelog.filelog.__init__(self, opener, path)
|
2010-09-18 04:24:29 +04:00
|
|
|
bundlerevlog.__init__(self, opener, self.indexfile, bundle,
|
2007-03-23 03:12:03 +03:00
|
|
|
linkmapper)
|
2011-05-10 19:38:58 +04:00
|
|
|
self._repo = repo
|
|
|
|
|
|
|
|
def _file(self, f):
|
|
|
|
self._repo.file(f)
|
2006-03-13 05:54:23 +03:00
|
|
|
|
2006-03-13 08:58:31 +03:00
|
|
|
class bundlerepository(localrepo.localrepository):
|
2006-03-13 05:54:23 +03:00
|
|
|
def __init__(self, ui, path, bundlename):
|
2008-03-15 19:04:28 +03:00
|
|
|
self._tempparent = None
|
|
|
|
try:
|
|
|
|
localrepo.localrepository.__init__(self, ui, path)
|
2009-01-12 19:42:31 +03:00
|
|
|
except error.RepoError:
|
2008-03-15 19:04:28 +03:00
|
|
|
self._tempparent = tempfile.mkdtemp()
|
2009-07-23 01:12:54 +04:00
|
|
|
localrepo.instance(ui, self._tempparent, 1)
|
2008-03-15 19:04:28 +03:00
|
|
|
localrepo.localrepository.__init__(self, ui, self._tempparent)
|
2006-07-26 00:50:32 +04:00
|
|
|
|
2008-02-10 10:53:39 +03:00
|
|
|
if path:
|
2009-12-07 13:31:45 +03:00
|
|
|
self._url = 'bundle:' + util.expandpath(path) + '+' + bundlename
|
2008-02-10 10:53:39 +03:00
|
|
|
else:
|
|
|
|
self._url = 'bundle:' + bundlename
|
2006-07-26 00:50:32 +04:00
|
|
|
|
2006-05-12 20:38:56 +04:00
|
|
|
self.tempfile = None
|
2011-01-07 12:48:30 +03:00
|
|
|
f = util.posixfile(bundlename, "rb")
|
2010-09-18 04:24:29 +04:00
|
|
|
self.bundle = changegroup.readbundle(f, bundlename)
|
|
|
|
if self.bundle.compressed():
|
2006-05-12 20:38:56 +04:00
|
|
|
fdtemp, temp = tempfile.mkstemp(prefix="hg-bundle-",
|
|
|
|
suffix=".hg10un", dir=self.path)
|
|
|
|
self.tempfile = temp
|
|
|
|
fptemp = os.fdopen(fdtemp, 'wb')
|
|
|
|
|
|
|
|
try:
|
|
|
|
fptemp.write("HG10UN")
|
2011-06-01 14:38:46 +04:00
|
|
|
while True:
|
2010-09-18 04:24:29 +04:00
|
|
|
chunk = self.bundle.read(2**18)
|
2010-08-26 01:55:54 +04:00
|
|
|
if not chunk:
|
|
|
|
break
|
2006-05-12 20:38:56 +04:00
|
|
|
fptemp.write(chunk)
|
|
|
|
finally:
|
|
|
|
fptemp.close()
|
|
|
|
|
2011-01-07 12:48:30 +03:00
|
|
|
f = util.posixfile(self.tempfile, "rb")
|
2010-09-18 04:24:29 +04:00
|
|
|
self.bundle = changegroup.readbundle(f, bundlename)
|
2010-08-26 01:55:54 +04:00
|
|
|
|
2006-03-13 05:54:23 +03:00
|
|
|
# dict with the mapping 'filename' -> position in the bundle
|
|
|
|
self.bundlefilespos = {}
|
2007-08-28 02:48:21 +04:00
|
|
|
|
2009-04-30 05:47:15 +04:00
|
|
|
@util.propertycache
|
|
|
|
def changelog(self):
|
2011-04-30 21:01:24 +04:00
|
|
|
# consume the header if it exists
|
|
|
|
self.bundle.changelogheader()
|
2010-09-18 04:24:29 +04:00
|
|
|
c = bundlechangelog(self.sopener, self.bundle)
|
|
|
|
self.manstart = self.bundle.tell()
|
2009-04-30 05:47:15 +04:00
|
|
|
return c
|
|
|
|
|
|
|
|
@util.propertycache
|
|
|
|
def manifest(self):
|
2010-09-18 04:24:29 +04:00
|
|
|
self.bundle.seek(self.manstart)
|
2011-04-30 21:01:24 +04:00
|
|
|
# consume the header if it exists
|
|
|
|
self.bundle.manifestheader()
|
2010-09-18 04:24:29 +04:00
|
|
|
m = bundlemanifest(self.sopener, self.bundle, self.changelog.rev)
|
|
|
|
self.filestart = self.bundle.tell()
|
2009-04-30 05:47:15 +04:00
|
|
|
return m
|
|
|
|
|
|
|
|
@util.propertycache
|
|
|
|
def manstart(self):
|
|
|
|
self.changelog
|
|
|
|
return self.manstart
|
|
|
|
|
|
|
|
@util.propertycache
|
|
|
|
def filestart(self):
|
|
|
|
self.manifest
|
|
|
|
return self.filestart
|
2006-03-13 05:54:23 +03:00
|
|
|
|
2006-07-26 00:50:32 +04:00
|
|
|
def url(self):
|
|
|
|
return self._url
|
|
|
|
|
2006-03-13 05:54:23 +03:00
|
|
|
def file(self, f):
|
2007-08-28 02:48:21 +04:00
|
|
|
if not self.bundlefilespos:
|
2010-09-18 04:24:29 +04:00
|
|
|
self.bundle.seek(self.filestart)
|
2011-06-01 14:38:46 +04:00
|
|
|
while True:
|
2011-04-30 21:01:24 +04:00
|
|
|
chunkdata = self.bundle.filelogheader()
|
|
|
|
if not chunkdata:
|
2007-08-28 02:48:21 +04:00
|
|
|
break
|
2011-04-30 21:01:24 +04:00
|
|
|
fname = chunkdata['filename']
|
|
|
|
self.bundlefilespos[fname] = self.bundle.tell()
|
2011-06-01 14:38:46 +04:00
|
|
|
while True:
|
2011-04-30 21:01:24 +04:00
|
|
|
c = self.bundle.deltachunk(None)
|
2010-09-19 21:51:54 +04:00
|
|
|
if not c:
|
|
|
|
break
|
2007-08-28 02:48:21 +04:00
|
|
|
|
2006-03-13 05:54:23 +03:00
|
|
|
if f[0] == '/':
|
|
|
|
f = f[1:]
|
|
|
|
if f in self.bundlefilespos:
|
2010-09-18 04:24:29 +04:00
|
|
|
self.bundle.seek(self.bundlefilespos[f])
|
|
|
|
return bundlefilelog(self.sopener, f, self.bundle,
|
2011-05-10 19:38:58 +04:00
|
|
|
self.changelog.rev, self)
|
2006-03-13 05:54:23 +03:00
|
|
|
else:
|
2006-12-05 13:28:23 +03:00
|
|
|
return filelog.filelog(self.sopener, f)
|
2006-03-13 05:54:23 +03:00
|
|
|
|
2010-09-21 01:14:05 +04:00
|
|
|
def close(self):
|
|
|
|
"""Close assigned bundle file immediately."""
|
|
|
|
self.bundle.close()
|
2010-11-07 22:18:57 +03:00
|
|
|
if self.tempfile is not None:
|
|
|
|
os.unlink(self.tempfile)
|
2008-03-15 19:04:28 +03:00
|
|
|
if self._tempparent:
|
|
|
|
shutil.rmtree(self._tempparent, True)
|
2006-07-31 18:11:12 +04:00
|
|
|
|
2008-03-20 19:12:35 +03:00
|
|
|
def cancopy(self):
|
|
|
|
return False
|
|
|
|
|
2008-11-27 18:07:17 +03:00
|
|
|
def getcwd(self):
|
|
|
|
return os.getcwd() # always outside the repo
|
|
|
|
|
2011-12-01 17:17:17 +04:00
|
|
|
def _writebranchcache(self, branches, tip, tiprev):
|
|
|
|
# don't overwrite the disk cache with bundle-augmented data
|
|
|
|
pass
|
|
|
|
|
2006-07-31 18:11:12 +04:00
|
|
|
def instance(ui, path, create):
|
|
|
|
if create:
|
|
|
|
raise util.Abort(_('cannot create new bundle repository'))
|
2007-12-18 23:11:13 +03:00
|
|
|
parentpath = ui.config("bundle", "mainreporoot", "")
|
2012-02-01 03:25:37 +04:00
|
|
|
if not parentpath:
|
|
|
|
# try to find the correct path to the working directory repo
|
|
|
|
parentpath = cmdutil.findrepo(os.getcwd())
|
|
|
|
if parentpath is None:
|
|
|
|
parentpath = ''
|
2007-12-18 23:11:13 +03:00
|
|
|
if parentpath:
|
|
|
|
# Try to make the full path relative so we get a nice, short URL.
|
|
|
|
# In particular, we don't want temp dir names in test outputs.
|
|
|
|
cwd = os.getcwd()
|
|
|
|
if parentpath == cwd:
|
|
|
|
parentpath = ''
|
|
|
|
else:
|
|
|
|
cwd = os.path.join(cwd,'')
|
|
|
|
if parentpath.startswith(cwd):
|
|
|
|
parentpath = parentpath[len(cwd):]
|
2011-04-30 20:43:20 +04:00
|
|
|
u = util.url(path)
|
url: refactor util.drop_scheme() and hg.localpath() into url.localpath()
This replaces util.drop_scheme() with url.localpath(), using url.url for
parsing instead of doing it on its own. The function is moved from
util to url to avoid an import cycle.
hg.localpath() is removed in favor of using url.localpath(). This
provides more consistent behavior between "hg clone" and other
commands.
To preserve backwards compatibility, URLs like bundle://../foo still
refer to ../foo, not /foo.
If a URL contains a scheme, percent-encoded entities are decoded. When
there's no scheme, all characters are left untouched.
Comparison of old and new behaviors:
URL drop_scheme() hg.localpath() url.localpath()
=== ============= ============== ===============
file://foo/foo /foo foo/foo /foo
file://localhost:80/foo /foo localhost:80/foo /foo
file://localhost:/foo /foo localhost:/foo /foo
file://localhost/foo /foo /foo /foo
file:///foo /foo /foo /foo
file://foo (empty string) foo /
file:/foo /foo /foo /foo
file:foo foo foo foo
file:foo%23bar foo%23bar foo%23bar foo#bar
foo%23bar foo%23bar foo%23bar foo%23bar
/foo /foo /foo /foo
Windows-related paths on Windows:
URL drop_scheme() hg.localpath() url.localpath()
=== ============= ============== ===============
file:///C:/foo C:/C:/foo /C:/foo C:/foo
file:///D:/foo C:/D:/foo /D:/foo D:/foo
file://C:/foo C:/foo C:/foo C:/foo
file://D:/foo C:/foo D:/foo D:/foo
file:////foo/bar //foo/bar //foo/bar //foo/bar
//foo/bar //foo/bar //foo/bar //foo/bar
\\foo\bar //foo/bar //foo/bar \\foo\bar
Windows-related paths on other platforms:
file:///C:/foo C:/C:/foo /C:/foo C:/foo
file:///D:/foo C:/D:/foo /D:/foo D:/foo
file://C:/foo C:/foo C:/foo C:/foo
file://D:/foo C:/foo D:/foo D:/foo
file:////foo/bar //foo/bar //foo/bar //foo/bar
//foo/bar //foo/bar //foo/bar //foo/bar
\\foo\bar //foo/bar //foo/bar \\foo\bar
For more information about file:// URL handling, see:
http://www-archive.mozilla.org/quality/networking/testing/filetests.html
Related issues:
- issue1153: File URIs aren't handled correctly in windows
This patch should preserve the fix implemented in
5c92d05b064e. However, it goes a step further and "promotes"
Windows-style drive letters from being interpreted as host names to
being part of the path.
- issue2154: Cannot escape '#' in Mercurial URLs (#1172 in THG)
The fragment is still interpreted as a revision or a branch, even in
paths to bundles. However, when file: is used, percent-encoded
entities are decoded, so file:test%23bundle.hg can refer to
test#bundle.hg ond isk.
2011-03-31 07:03:05 +04:00
|
|
|
path = u.localpath()
|
|
|
|
if u.scheme == 'bundle':
|
2006-07-31 18:11:12 +04:00
|
|
|
s = path.split("+", 1)
|
|
|
|
if len(s) == 1:
|
2007-12-18 23:11:13 +03:00
|
|
|
repopath, bundlename = parentpath, s[0]
|
2006-07-31 18:11:12 +04:00
|
|
|
else:
|
|
|
|
repopath, bundlename = s
|
|
|
|
else:
|
2007-12-18 23:11:13 +03:00
|
|
|
repopath, bundlename = parentpath, path
|
2006-07-31 18:11:12 +04:00
|
|
|
return bundlerepository(ui, repopath, bundlename)
|
2010-10-15 00:41:43 +04:00
|
|
|
|
2011-05-02 14:36:23 +04:00
|
|
|
def getremotechanges(ui, repo, other, onlyheads=None, bundlename=None,
|
2011-04-30 19:21:37 +04:00
|
|
|
force=False):
|
2011-05-02 14:36:23 +04:00
|
|
|
'''obtains a bundle of changes incoming from other
|
|
|
|
|
|
|
|
"onlyheads" restricts the returned changes to those reachable from the
|
|
|
|
specified heads.
|
|
|
|
"bundlename", if given, stores the bundle to this file path permanently;
|
2011-05-04 22:14:30 +04:00
|
|
|
otherwise it's stored to a temp file and gets deleted again when you call
|
|
|
|
the returned "cleanupfn".
|
2011-05-02 14:36:23 +04:00
|
|
|
"force" indicates whether to proceed on unrelated repos.
|
|
|
|
|
|
|
|
Returns a tuple (local, csets, cleanupfn):
|
|
|
|
|
|
|
|
"local" is a local repo from which to obtain the actual incoming changesets; it
|
|
|
|
is a bundlerepo for the obtained bundle when the original "other" is remote.
|
|
|
|
"csets" lists the incoming changeset node ids.
|
|
|
|
"cleanupfn" must be called without arguments when you're done processing the
|
|
|
|
changes; it closes both the original "other" and the one returned here.
|
|
|
|
'''
|
|
|
|
tmp = discovery.findcommonincoming(repo, other, heads=onlyheads, force=force)
|
2010-10-15 00:41:43 +04:00
|
|
|
common, incoming, rheads = tmp
|
|
|
|
if not incoming:
|
|
|
|
try:
|
2011-09-14 15:51:50 +04:00
|
|
|
if bundlename:
|
|
|
|
os.unlink(bundlename)
|
2011-04-23 01:51:25 +04:00
|
|
|
except OSError:
|
2010-10-15 00:41:43 +04:00
|
|
|
pass
|
2011-05-02 14:36:23 +04:00
|
|
|
return other, [], other.close
|
2010-10-15 00:41:43 +04:00
|
|
|
|
|
|
|
bundle = None
|
2011-05-02 14:36:23 +04:00
|
|
|
bundlerepo = None
|
|
|
|
localrepo = other
|
2010-10-15 00:41:43 +04:00
|
|
|
if bundlename or not other.local():
|
|
|
|
# create a bundle (uncompressed if other repo is not local)
|
|
|
|
|
2011-04-30 19:21:37 +04:00
|
|
|
if other.capable('getbundle'):
|
2011-05-23 22:35:10 +04:00
|
|
|
cg = other.getbundle('incoming', common=common, heads=rheads)
|
|
|
|
elif onlyheads is None and not other.capable('changegroupsubset'):
|
|
|
|
# compat with older servers when pulling all remote heads
|
2010-10-15 00:41:43 +04:00
|
|
|
cg = other.changegroup(incoming, "incoming")
|
2011-05-23 22:35:10 +04:00
|
|
|
rheads = None
|
2010-10-15 00:41:43 +04:00
|
|
|
else:
|
2011-05-23 22:35:10 +04:00
|
|
|
cg = other.changegroupsubset(incoming, rheads, 'incoming')
|
2010-10-15 00:41:43 +04:00
|
|
|
bundletype = other.local() and "HG10BZ" or "HG10UN"
|
|
|
|
fname = bundle = changegroup.writebundle(cg, bundlename, bundletype)
|
|
|
|
# keep written bundle?
|
|
|
|
if bundlename:
|
|
|
|
bundle = None
|
|
|
|
if not other.local():
|
|
|
|
# use the created uncompressed bundlerepo
|
2011-05-02 14:36:23 +04:00
|
|
|
localrepo = bundlerepo = bundlerepository(ui, repo.root, fname)
|
|
|
|
# this repo contains local and other now, so filter out local again
|
|
|
|
common = repo.heads()
|
|
|
|
|
2011-05-23 22:35:10 +04:00
|
|
|
csets = localrepo.changelog.findmissing(common, rheads)
|
2011-05-02 14:36:23 +04:00
|
|
|
|
|
|
|
def cleanup():
|
|
|
|
if bundlerepo:
|
|
|
|
bundlerepo.close()
|
|
|
|
if bundle:
|
|
|
|
os.unlink(bundle)
|
2011-05-04 22:14:30 +04:00
|
|
|
other.close()
|
2011-05-02 14:36:23 +04:00
|
|
|
|
|
|
|
return (localrepo, csets, cleanup)
|
2010-10-15 00:41:43 +04:00
|
|
|
|