mercurial-scm/hg: mercurial/bundlerepo.py annotate

annotate mercurial/bundlerepo.py @ 45814:88d5abec8f61

bundlerepo: don't insert index tuples with full nodes as linkrev The index format has a documented format and latter changes will start to enforce the field types. The bundlerepo uses full nodes for the linkrev field when it should be using revision numbers. Use the link mapping to resolve them, except in the special case of self-references. Those are actually indications of a missing linkrev. Differential Revision: https://phab.mercurial-scm.org/D9160

author	Joerg Sonnenberger <joerg@bec.de>
date	Wed, 07 Oct 2020 03:00:01 +0200
parents	698e11f7be6a
children	89a2afe31e82

rev	line source
8226 8b2cd04a6e97 put license and copyright info into comment blocks Martin Geisler <mg@lazybytes.net> parents: 8225 diff changeset	1 # bundlerepo.py - repository class for viewing uncompressed bundles
8b2cd04a6e97 put license and copyright info into comment blocks Martin Geisler <mg@lazybytes.net> parents: 8225 diff changeset	2 #
8b2cd04a6e97 put license and copyright info into comment blocks Martin Geisler <mg@lazybytes.net> parents: 8225 diff changeset	3 # Copyright 2006, 2007 Benoit Boissinot <bboissin@gmail.com>
8b2cd04a6e97 put license and copyright info into comment blocks Martin Geisler <mg@lazybytes.net> parents: 8225 diff changeset	4 #
8b2cd04a6e97 put license and copyright info into comment blocks Martin Geisler <mg@lazybytes.net> parents: 8225 diff changeset	5 # This software may be used and distributed according to the terms of the
10263 25e572394f5c Update license to GPLv2+ Matt Mackall <mpm@selenic.com> parents: 9676 diff changeset	6 # GNU General Public License version 2 or any later version.
1942 9da45de3118d add bundlerepo.py: a read-only repo that can use uncompressed bundles Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	7
8227 0a9542703300 turn some comments back into module docstrings Martin Geisler <mg@lazybytes.net> parents: 8226 diff changeset	8 """Repository class for viewing uncompressed bundles.
0a9542703300 turn some comments back into module docstrings Martin Geisler <mg@lazybytes.net> parents: 8226 diff changeset	9
0a9542703300 turn some comments back into module docstrings Martin Geisler <mg@lazybytes.net> parents: 8226 diff changeset	10 This provides a read-only repository interface to bundles as if they
0a9542703300 turn some comments back into module docstrings Martin Geisler <mg@lazybytes.net> parents: 8226 diff changeset	11 were part of the actual repository.
0a9542703300 turn some comments back into module docstrings Martin Geisler <mg@lazybytes.net> parents: 8226 diff changeset	12 """
0a9542703300 turn some comments back into module docstrings Martin Geisler <mg@lazybytes.net> parents: 8226 diff changeset	13
25920 5aaf51c14fea bundlerepo: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25830 diff changeset	14 from __future__ import absolute_import
5aaf51c14fea bundlerepo: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25830 diff changeset	15
5aaf51c14fea bundlerepo: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25830 diff changeset	16 import os
5aaf51c14fea bundlerepo: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25830 diff changeset	17 import shutil
5aaf51c14fea bundlerepo: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25830 diff changeset	18
5aaf51c14fea bundlerepo: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25830 diff changeset	19 from .i18n import _
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42823 diff changeset	20 from .node import nullid, nullrev
25920 5aaf51c14fea bundlerepo: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25830 diff changeset	21
5aaf51c14fea bundlerepo: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25830 diff changeset	22 from . import (
5aaf51c14fea bundlerepo: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25830 diff changeset	23 bundle2,
5aaf51c14fea bundlerepo: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25830 diff changeset	24 changegroup,
5aaf51c14fea bundlerepo: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25830 diff changeset	25 changelog,
5aaf51c14fea bundlerepo: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25830 diff changeset	26 cmdutil,
5aaf51c14fea bundlerepo: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25830 diff changeset	27 discovery,
39818 24e493ec2229 py3: rename pycompat.getcwd() to encoding.getcwd() (API) Matt Harbison <matt_harbison@yahoo.com> parents: 39763 diff changeset	28 encoding,
25920 5aaf51c14fea bundlerepo: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25830 diff changeset	29 error,
5aaf51c14fea bundlerepo: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25830 diff changeset	30 exchange,
5aaf51c14fea bundlerepo: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25830 diff changeset	31 filelog,
5aaf51c14fea bundlerepo: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25830 diff changeset	32 localrepo,
5aaf51c14fea bundlerepo: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25830 diff changeset	33 manifest,
5aaf51c14fea bundlerepo: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25830 diff changeset	34 mdiff,
28714 dac81729fea4 bundle: warn when update to revision existing only in a bundle (issue5004) liscju <piotr.listkiewicz@gmail.com> parents: 28666 diff changeset	35 node as nodemod,
25920 5aaf51c14fea bundlerepo: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25830 diff changeset	36 pathutil,
5aaf51c14fea bundlerepo: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25830 diff changeset	37 phases,
30519 20a42325fdef py3: use pycompat.getcwd() instead of os.getcwd() Pulkit Goyal <7895pulkit@gmail.com> parents: 30375 diff changeset	38 pycompat,
25920 5aaf51c14fea bundlerepo: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25830 diff changeset	39 revlog,
5aaf51c14fea bundlerepo: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25830 diff changeset	40 util,
31240 5f68e7341ada vfs: use 'vfs' module directly in 'mercurial.bundlerepo' Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 30924 diff changeset	41 vfs as vfsmod,
25920 5aaf51c14fea bundlerepo: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25830 diff changeset	42 )
1942 9da45de3118d add bundlerepo.py: a read-only repo that can use uncompressed bundles Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	43
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42823 diff changeset	44
1946 9fee186f7f0d bundlerepo: remove relative import, fix a comment Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1942 diff changeset	45 class bundlerevlog(revlog.revlog):
35076 90609be10891 bundlerepo: rename "bundle" arguments to "cgunpacker" Gregory Szorc <gregory.szorc@gmail.com> parents: 35075 diff changeset	46 def __init__(self, opener, indexfile, cgunpacker, linkmapper):
1942 9da45de3118d add bundlerepo.py: a read-only repo that can use uncompressed bundles Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	47 # How it works:
18410 de7dac2a58e8 bundlerepo: fix outdated comment Mads Kiilerich <madski@unity3d.com> parents: 18216 diff changeset	48 # To retrieve a revision, we need to know the offset of the revision in
de7dac2a58e8 bundlerepo: fix outdated comment Mads Kiilerich <madski@unity3d.com> parents: 18216 diff changeset	49 # the bundle (an unbundle object). We store this offset in the index
18643 cc28a84db8c9 bundlerepo: replace basemap with the base field in the index Mads Kiilerich <mads@kiilerich.com> parents: 18568 diff changeset	50 # (start). The base of the delta is stored in the base field.
1942 9da45de3118d add bundlerepo.py: a read-only repo that can use uncompressed bundles Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	51 #
18410 de7dac2a58e8 bundlerepo: fix outdated comment Mads Kiilerich <madski@unity3d.com> parents: 18216 diff changeset	52 # To differentiate a rev in the bundle from a rev in the revlog, we
18643 cc28a84db8c9 bundlerepo: replace basemap with the base field in the index Mads Kiilerich <mads@kiilerich.com> parents: 18568 diff changeset	53 # check revision against repotiprev.
31240 5f68e7341ada vfs: use 'vfs' module directly in 'mercurial.bundlerepo' Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 30924 diff changeset	54 opener = vfsmod.readonlyvfs(opener)
4257 1b5c38e9d7aa revlog: don't pass datafile as an argument Matt Mackall <mpm@selenic.com> parents: 4029 diff changeset	55 revlog.revlog.__init__(self, opener, indexfile)
35076 90609be10891 bundlerepo: rename "bundle" arguments to "cgunpacker" Gregory Szorc <gregory.szorc@gmail.com> parents: 35075 diff changeset	56 self.bundle = cgunpacker
6750 fb42030d79d6 add __len__ and __iter__ methods to repo and revlog Matt Mackall <mpm@selenic.com> parents: 6647 diff changeset	57 n = len(self)
18643 cc28a84db8c9 bundlerepo: replace basemap with the base field in the index Mads Kiilerich <mads@kiilerich.com> parents: 18568 diff changeset	58 self.repotiprev = n - 1
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42823 diff changeset	59 self.bundlerevs = set() # used by 'bundle()' revset expression
35076 90609be10891 bundlerepo: rename "bundle" arguments to "cgunpacker" Gregory Szorc <gregory.szorc@gmail.com> parents: 35075 diff changeset	60 for deltadata in cgunpacker.deltaiter():
34293 0fe62d8bdd50 bundlerepo: update to use new deltaiter api Durham Goode <durham@fb.com> parents: 34219 diff changeset	61 node, p1, p2, cs, deltabase, delta, flags = deltadata
14142 cb91ea6af733 bundlerepo: port to new bundle API Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 14076 diff changeset	62
cb91ea6af733 bundlerepo: port to new bundle API Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 14076 diff changeset	63 size = len(delta)
35076 90609be10891 bundlerepo: rename "bundle" arguments to "cgunpacker" Gregory Szorc <gregory.szorc@gmail.com> parents: 35075 diff changeset	64 start = cgunpacker.tell() - size
14142 cb91ea6af733 bundlerepo: port to new bundle API Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 14076 diff changeset	65
43542 5f347567589b index: use `index.has_node` in `bundlerepo.bundlerevlog` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 43533 diff changeset	66 if self.index.has_node(node):
14142 cb91ea6af733 bundlerepo: port to new bundle API Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 14076 diff changeset	67 # this can happen if two branches make the same change
43564 698e11f7be6a index: use `index.rev` in `bundlerepo.bundlerevlog` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 43542 diff changeset	68 self.bundlerevs.add(self.index.rev(node))
1942 9da45de3118d add bundlerepo.py: a read-only repo that can use uncompressed bundles Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	69 continue
45814 88d5abec8f61 bundlerepo: don't insert index tuples with full nodes as linkrev Joerg Sonnenberger <joerg@bec.de> parents: 43564 diff changeset	70 if cs == node:
88d5abec8f61 bundlerepo: don't insert index tuples with full nodes as linkrev Joerg Sonnenberger <joerg@bec.de> parents: 43564 diff changeset	71 linkrev = nullrev
88d5abec8f61 bundlerepo: don't insert index tuples with full nodes as linkrev Joerg Sonnenberger <joerg@bec.de> parents: 43564 diff changeset	72 else:
88d5abec8f61 bundlerepo: don't insert index tuples with full nodes as linkrev Joerg Sonnenberger <joerg@bec.de> parents: 43564 diff changeset	73 linkrev = linkmapper(cs)
14142 cb91ea6af733 bundlerepo: port to new bundle API Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 14076 diff changeset	74
1942 9da45de3118d add bundlerepo.py: a read-only repo that can use uncompressed bundles Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	75 for p in (p1, p2):
43542 5f347567589b index: use `index.has_node` in `bundlerepo.bundlerevlog` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 43533 diff changeset	76 if not self.index.has_node(p):
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42823 diff changeset	77 raise error.LookupError(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	78 p, self.indexfile, _(b"unknown parent")
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42823 diff changeset	79 )
18416 87f370c5fef5 bundlerepo: store validated deltabase rev in basemap instead of node Mads Kiilerich <madski@unity3d.com> parents: 18415 diff changeset	80
43542 5f347567589b index: use `index.has_node` in `bundlerepo.bundlerevlog` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 43533 diff changeset	81 if not self.index.has_node(deltabase):
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42823 diff changeset	82 raise LookupError(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	83 deltabase, self.indexfile, _(b'unknown delta base')
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42823 diff changeset	84 )
18416 87f370c5fef5 bundlerepo: store validated deltabase rev in basemap instead of node Mads Kiilerich <madski@unity3d.com> parents: 18415 diff changeset	85
87f370c5fef5 bundlerepo: store validated deltabase rev in basemap instead of node Mads Kiilerich <madski@unity3d.com> parents: 18415 diff changeset	86 baserev = self.rev(deltabase)
5167 aba624d2301d fix bundlerepo broken by 4205f626dc05 Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 4989 diff changeset	87 # start, size, full unc. size, base (unused), link, p1, p2, node
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42823 diff changeset	88 e = (
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42823 diff changeset	89 revlog.offset_type(start, flags),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42823 diff changeset	90 size,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42823 diff changeset	91 -1,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42823 diff changeset	92 baserev,
45814 88d5abec8f61 bundlerepo: don't insert index tuples with full nodes as linkrev Joerg Sonnenberger <joerg@bec.de> parents: 43564 diff changeset	93 linkrev,
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42823 diff changeset	94 self.rev(p1),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42823 diff changeset	95 self.rev(p2),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42823 diff changeset	96 node,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42823 diff changeset	97 )
38850 6104b203bec8 index: replace insert(-1, e) method by append(e) method Martin von Zweigbergk <martinvonz@google.com> parents: 38165 diff changeset	98 self.index.append(e)
18411 8b0f0dd56cec bundlerepo: improve performance for bundle() revset expression Mads Kiilerich <madski@unity3d.com> parents: 18410 diff changeset	99 self.bundlerevs.add(n)
1942 9da45de3118d add bundlerepo.py: a read-only repo that can use uncompressed bundles Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	100 n += 1
9da45de3118d add bundlerepo.py: a read-only repo that can use uncompressed bundles Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	101
35047 32d079f37207 bundlerepo: make methods agree with base class Gregory Szorc <gregory.szorc@gmail.com> parents: 35011 diff changeset	102 def _chunk(self, rev, df=None):
18643 cc28a84db8c9 bundlerepo: replace basemap with the base field in the index Mads Kiilerich <mads@kiilerich.com> parents: 18568 diff changeset	103 # Warning: in case of bundle, the diff is against what we stored as
cc28a84db8c9 bundlerepo: replace basemap with the base field in the index Mads Kiilerich <mads@kiilerich.com> parents: 18568 diff changeset	104 # delta base, not against rev - 1
1942 9da45de3118d add bundlerepo.py: a read-only repo that can use uncompressed bundles Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	105 # XXX: could use some caching
18643 cc28a84db8c9 bundlerepo: replace basemap with the base field in the index Mads Kiilerich <mads@kiilerich.com> parents: 18568 diff changeset	106 if rev <= self.repotiprev:
9676 48bf28d3c8dd bundlerepo: keep the bundlerevlog interface in sync with revlog Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 9650 diff changeset	107 return revlog.revlog._chunk(self, rev)
12332 680fe77ab5b8 bundlerepo: use bundle objects everywhere Matt Mackall <mpm@selenic.com> parents: 12331 diff changeset	108 self.bundle.seek(self.start(rev))
680fe77ab5b8 bundlerepo: use bundle objects everywhere Matt Mackall <mpm@selenic.com> parents: 12331 diff changeset	109 return self.bundle.read(self.length(rev))
1942 9da45de3118d add bundlerepo.py: a read-only repo that can use uncompressed bundles Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	110
9da45de3118d add bundlerepo.py: a read-only repo that can use uncompressed bundles Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	111 def revdiff(self, rev1, rev2):
9da45de3118d add bundlerepo.py: a read-only repo that can use uncompressed bundles Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	112 """return or calculate a delta between two revisions"""
18643 cc28a84db8c9 bundlerepo: replace basemap with the base field in the index Mads Kiilerich <mads@kiilerich.com> parents: 18568 diff changeset	113 if rev1 > self.repotiprev and rev2 > self.repotiprev:
1942 9da45de3118d add bundlerepo.py: a read-only repo that can use uncompressed bundles Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	114 # hot path for bundle
18643 cc28a84db8c9 bundlerepo: replace basemap with the base field in the index Mads Kiilerich <mads@kiilerich.com> parents: 18568 diff changeset	115 revb = self.index[rev2][3]
1942 9da45de3118d add bundlerepo.py: a read-only repo that can use uncompressed bundles Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	116 if revb == rev1:
9676 48bf28d3c8dd bundlerepo: keep the bundlerevlog interface in sync with revlog Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 9650 diff changeset	117 return self._chunk(rev2)
18643 cc28a84db8c9 bundlerepo: replace basemap with the base field in the index Mads Kiilerich <mads@kiilerich.com> parents: 18568 diff changeset	118 elif rev1 <= self.repotiprev and rev2 <= self.repotiprev:
4028 540d1059c802 bundlerepo: it was meant to be revdiff() instead of chunk() Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3791 diff changeset	119 return revlog.revlog.revdiff(self, rev1, rev2)
1942 9da45de3118d add bundlerepo.py: a read-only repo that can use uncompressed bundles Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	120
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42823 diff changeset	121 return mdiff.textdiff(self.rawdata(rev1), self.rawdata(rev2))
1942 9da45de3118d add bundlerepo.py: a read-only repo that can use uncompressed bundles Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	122
42821 c070ca6ed86d bundlerepo: simplify code to take advantage of `_rawtext` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 42770 diff changeset	123 def _rawtext(self, node, rev, _df=None):
c070ca6ed86d bundlerepo: simplify code to take advantage of `_rawtext` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 42770 diff changeset	124 if rev is None:
16375 d7d64b89a65c revlog: allow retrieving contents by revision number Matt Mackall <mpm@selenic.com> parents: 16195 diff changeset	125 rev = self.rev(node)
42821 c070ca6ed86d bundlerepo: simplify code to take advantage of `_rawtext` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 42770 diff changeset	126 validated = False
31836 4598e8f43e20 bundlerepo: fix raw handling in revision() Jun Wu <quark@fb.com> parents: 31835 diff changeset	127 rawtext = None
1942 9da45de3118d add bundlerepo.py: a read-only repo that can use uncompressed bundles Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	128 chain = []
18415 95b8629fd2de bundlerepo: use rev instead of node for iteration in revision() Mads Kiilerich <madski@unity3d.com> parents: 18414 diff changeset	129 iterrev = rev
1942 9da45de3118d add bundlerepo.py: a read-only repo that can use uncompressed bundles Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	130 # reconstruct the revision if it is from a changegroup
18643 cc28a84db8c9 bundlerepo: replace basemap with the base field in the index Mads Kiilerich <mads@kiilerich.com> parents: 18568 diff changeset	131 while iterrev > self.repotiprev:
40052 55db747a21ad revlog: rename _cache to _revisioncache Gregory Szorc <gregory.szorc@gmail.com> parents: 39944 diff changeset	132 if self._revisioncache and self._revisioncache[1] == iterrev:
55db747a21ad revlog: rename _cache to _revisioncache Gregory Szorc <gregory.szorc@gmail.com> parents: 39944 diff changeset	133 rawtext = self._revisioncache[2]
1942 9da45de3118d add bundlerepo.py: a read-only repo that can use uncompressed bundles Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	134 break
18415 95b8629fd2de bundlerepo: use rev instead of node for iteration in revision() Mads Kiilerich <madski@unity3d.com> parents: 18414 diff changeset	135 chain.append(iterrev)
18643 cc28a84db8c9 bundlerepo: replace basemap with the base field in the index Mads Kiilerich <mads@kiilerich.com> parents: 18568 diff changeset	136 iterrev = self.index[iterrev][3]
42821 c070ca6ed86d bundlerepo: simplify code to take advantage of `_rawtext` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 42770 diff changeset	137 if iterrev == nullrev:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	138 rawtext = b''
42821 c070ca6ed86d bundlerepo: simplify code to take advantage of `_rawtext` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 42770 diff changeset	139 elif rawtext is None:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42823 diff changeset	140 r = super(bundlerevlog, self)._rawtext(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42823 diff changeset	141 self.node(iterrev), iterrev, _df=_df
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42823 diff changeset	142 )
42821 c070ca6ed86d bundlerepo: simplify code to take advantage of `_rawtext` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 42770 diff changeset	143 __, rawtext, validated = r
c070ca6ed86d bundlerepo: simplify code to take advantage of `_rawtext` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 42770 diff changeset	144 if chain:
c070ca6ed86d bundlerepo: simplify code to take advantage of `_rawtext` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 42770 diff changeset	145 validated = False
1942 9da45de3118d add bundlerepo.py: a read-only repo that can use uncompressed bundles Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	146 while chain:
9676 48bf28d3c8dd bundlerepo: keep the bundlerevlog interface in sync with revlog Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 9650 diff changeset	147 delta = self._chunk(chain.pop())
31836 4598e8f43e20 bundlerepo: fix raw handling in revision() Jun Wu <quark@fb.com> parents: 31835 diff changeset	148 rawtext = mdiff.patches(rawtext, [delta])
42821 c070ca6ed86d bundlerepo: simplify code to take advantage of `_rawtext` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 42770 diff changeset	149 return rev, rawtext, validated
1942 9da45de3118d add bundlerepo.py: a read-only repo that can use uncompressed bundles Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	150
35047 32d079f37207 bundlerepo: make methods agree with base class Gregory Szorc <gregory.szorc@gmail.com> parents: 35011 diff changeset	151 def addrevision(self, args, *kwargs):
32d079f37207 bundlerepo: make methods agree with base class Gregory Szorc <gregory.szorc@gmail.com> parents: 35011 diff changeset	152 raise NotImplementedError
32d079f37207 bundlerepo: make methods agree with base class Gregory Szorc <gregory.szorc@gmail.com> parents: 35011 diff changeset	153
32d079f37207 bundlerepo: make methods agree with base class Gregory Szorc <gregory.szorc@gmail.com> parents: 35011 diff changeset	154 def addgroup(self, args, *kwargs):
1942 9da45de3118d add bundlerepo.py: a read-only repo that can use uncompressed bundles Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	155 raise NotImplementedError
35047 32d079f37207 bundlerepo: make methods agree with base class Gregory Szorc <gregory.szorc@gmail.com> parents: 35011 diff changeset	156
32d079f37207 bundlerepo: make methods agree with base class Gregory Szorc <gregory.szorc@gmail.com> parents: 35011 diff changeset	157 def strip(self, args, *kwargs):
1942 9da45de3118d add bundlerepo.py: a read-only repo that can use uncompressed bundles Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	158 raise NotImplementedError
35047 32d079f37207 bundlerepo: make methods agree with base class Gregory Szorc <gregory.szorc@gmail.com> parents: 35011 diff changeset	159
1942 9da45de3118d add bundlerepo.py: a read-only repo that can use uncompressed bundles Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	160 def checksize(self):
9da45de3118d add bundlerepo.py: a read-only repo that can use uncompressed bundles Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	161 raise NotImplementedError
9da45de3118d add bundlerepo.py: a read-only repo that can use uncompressed bundles Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	162
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42823 diff changeset	163
1946 9fee186f7f0d bundlerepo: remove relative import, fix a comment Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1942 diff changeset	164 class bundlechangelog(bundlerevlog, changelog.changelog):
35076 90609be10891 bundlerepo: rename "bundle" arguments to "cgunpacker" Gregory Szorc <gregory.szorc@gmail.com> parents: 35075 diff changeset	165 def __init__(self, opener, cgunpacker):
1946 9fee186f7f0d bundlerepo: remove relative import, fix a comment Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1942 diff changeset	166 changelog.changelog.__init__(self, opener)
14142 cb91ea6af733 bundlerepo: port to new bundle API Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 14076 diff changeset	167 linkmapper = lambda x: x
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42823 diff changeset	168 bundlerevlog.__init__(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42823 diff changeset	169 self, opener, self.indexfile, cgunpacker, linkmapper
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42823 diff changeset	170 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42823 diff changeset	171
1942 9da45de3118d add bundlerepo.py: a read-only repo that can use uncompressed bundles Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	172
30373 31de088945cd manifest: add bundlemanifestlog support Durham Goode <durham@fb.com> parents: 30218 diff changeset	173 class bundlemanifest(bundlerevlog, manifest.manifestrevlog):
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42823 diff changeset	174 def __init__(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	175 self, opener, cgunpacker, linkmapper, dirlogstarts=None, dir=b''
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42823 diff changeset	176 ):
39243 0d97530eb535 manifest: rename dir argument and attribute to tree Gregory Szorc <gregory.szorc@gmail.com> parents: 38850 diff changeset	177 manifest.manifestrevlog.__init__(self, opener, tree=dir)
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42823 diff changeset	178 bundlerevlog.__init__(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42823 diff changeset	179 self, opener, self.indexfile, cgunpacker, linkmapper
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42823 diff changeset	180 )
29715 55d341877316 bundlerepo: add support for treemanifests in cg3 bundles Augie Fackler <augie@google.com> parents: 29713 diff changeset	181 if dirlogstarts is None:
55d341877316 bundlerepo: add support for treemanifests in cg3 bundles Augie Fackler <augie@google.com> parents: 29713 diff changeset	182 dirlogstarts = {}
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	183 if self.bundle.version == b"03":
29715 55d341877316 bundlerepo: add support for treemanifests in cg3 bundles Augie Fackler <augie@google.com> parents: 29713 diff changeset	184 dirlogstarts = _getfilestarts(self.bundle)
55d341877316 bundlerepo: add support for treemanifests in cg3 bundles Augie Fackler <augie@google.com> parents: 29713 diff changeset	185 self._dirlogstarts = dirlogstarts
55d341877316 bundlerepo: add support for treemanifests in cg3 bundles Augie Fackler <augie@google.com> parents: 29713 diff changeset	186 self._linkmapper = linkmapper
1942 9da45de3118d add bundlerepo.py: a read-only repo that can use uncompressed bundles Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	187
29715 55d341877316 bundlerepo: add support for treemanifests in cg3 bundles Augie Fackler <augie@google.com> parents: 29713 diff changeset	188 def dirlog(self, d):
55d341877316 bundlerepo: add support for treemanifests in cg3 bundles Augie Fackler <augie@google.com> parents: 29713 diff changeset	189 if d in self._dirlogstarts:
55d341877316 bundlerepo: add support for treemanifests in cg3 bundles Augie Fackler <augie@google.com> parents: 29713 diff changeset	190 self.bundle.seek(self._dirlogstarts[d])
55d341877316 bundlerepo: add support for treemanifests in cg3 bundles Augie Fackler <augie@google.com> parents: 29713 diff changeset	191 return bundlemanifest(
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42823 diff changeset	192 self.opener,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42823 diff changeset	193 self.bundle,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42823 diff changeset	194 self._linkmapper,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42823 diff changeset	195 self._dirlogstarts,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42823 diff changeset	196 dir=d,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42823 diff changeset	197 )
29715 55d341877316 bundlerepo: add support for treemanifests in cg3 bundles Augie Fackler <augie@google.com> parents: 29713 diff changeset	198 return super(bundlemanifest, self).dirlog(d)
55d341877316 bundlerepo: add support for treemanifests in cg3 bundles Augie Fackler <augie@google.com> parents: 29713 diff changeset	199
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42823 diff changeset	200
37497 1541e1a8e87d filelog: wrap revlog instead of inheriting it (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 37331 diff changeset	201 class bundlefilelog(filelog.filelog):
35076 90609be10891 bundlerepo: rename "bundle" arguments to "cgunpacker" Gregory Szorc <gregory.szorc@gmail.com> parents: 35075 diff changeset	202 def __init__(self, opener, path, cgunpacker, linkmapper):
1946 9fee186f7f0d bundlerepo: remove relative import, fix a comment Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1942 diff changeset	203 filelog.filelog.__init__(self, opener, path)
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42823 diff changeset	204 self._revlog = bundlerevlog(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42823 diff changeset	205 opener, self.indexfile, cgunpacker, linkmapper
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42823 diff changeset	206 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42823 diff changeset	207
14287 7c231754a621 filelog: add file function to open other filelogs Sune Foldager <cryo@cyanite.org> parents: 14190 diff changeset	208
17193 1d710fe5ee0e peer: introduce canpush and improve error message Sune Foldager <cryo@cyanite.org> parents: 17191 diff changeset	209 class bundlepeer(localrepo.localpeer):
1d710fe5ee0e peer: introduce canpush and improve error message Sune Foldager <cryo@cyanite.org> parents: 17191 diff changeset	210 def canpush(self):
1d710fe5ee0e peer: introduce canpush and improve error message Sune Foldager <cryo@cyanite.org> parents: 17191 diff changeset	211 return False
1d710fe5ee0e peer: introduce canpush and improve error message Sune Foldager <cryo@cyanite.org> parents: 17191 diff changeset	212
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42823 diff changeset	213
23631 b8260abfeb7d bundlerepo: implement safe phasecache Eric Sumner <ericsumner@fb.com> parents: 22182 diff changeset	214 class bundlephasecache(phases.phasecache):
b8260abfeb7d bundlerepo: implement safe phasecache Eric Sumner <ericsumner@fb.com> parents: 22182 diff changeset	215 def __init__(self, args, *kwargs):
b8260abfeb7d bundlerepo: implement safe phasecache Eric Sumner <ericsumner@fb.com> parents: 22182 diff changeset	216 super(bundlephasecache, self).__init__(args, *kwargs)
43115 4aa72cdf616f py3: delete b'' prefix from safehasattr arguments Martin von Zweigbergk <martinvonz@google.com> parents: 43077 diff changeset	217 if util.safehasattr(self, 'opener'):
31240 5f68e7341ada vfs: use 'vfs' module directly in 'mercurial.bundlerepo' Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 30924 diff changeset	218 self.opener = vfsmod.readonlyvfs(self.opener)
23631 b8260abfeb7d bundlerepo: implement safe phasecache Eric Sumner <ericsumner@fb.com> parents: 22182 diff changeset	219
b8260abfeb7d bundlerepo: implement safe phasecache Eric Sumner <ericsumner@fb.com> parents: 22182 diff changeset	220 def write(self):
b8260abfeb7d bundlerepo: implement safe phasecache Eric Sumner <ericsumner@fb.com> parents: 22182 diff changeset	221 raise NotImplementedError
b8260abfeb7d bundlerepo: implement safe phasecache Eric Sumner <ericsumner@fb.com> parents: 22182 diff changeset	222
b8260abfeb7d bundlerepo: implement safe phasecache Eric Sumner <ericsumner@fb.com> parents: 22182 diff changeset	223 def _write(self, fp):
b8260abfeb7d bundlerepo: implement safe phasecache Eric Sumner <ericsumner@fb.com> parents: 22182 diff changeset	224 raise NotImplementedError
b8260abfeb7d bundlerepo: implement safe phasecache Eric Sumner <ericsumner@fb.com> parents: 22182 diff changeset	225
b8260abfeb7d bundlerepo: implement safe phasecache Eric Sumner <ericsumner@fb.com> parents: 22182 diff changeset	226 def _updateroots(self, phase, newroots, tr):
b8260abfeb7d bundlerepo: implement safe phasecache Eric Sumner <ericsumner@fb.com> parents: 22182 diff changeset	227 self.phaseroots[phase] = newroots
b8260abfeb7d bundlerepo: implement safe phasecache Eric Sumner <ericsumner@fb.com> parents: 22182 diff changeset	228 self.invalidate()
b8260abfeb7d bundlerepo: implement safe phasecache Eric Sumner <ericsumner@fb.com> parents: 22182 diff changeset	229 self.dirty = True
b8260abfeb7d bundlerepo: implement safe phasecache Eric Sumner <ericsumner@fb.com> parents: 22182 diff changeset	230
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42823 diff changeset	231
35076 90609be10891 bundlerepo: rename "bundle" arguments to "cgunpacker" Gregory Szorc <gregory.szorc@gmail.com> parents: 35075 diff changeset	232 def _getfilestarts(cgunpacker):
35077 cd4cd7b94ff1 bundlerepo: rename "bundlefilespos" variable and attribute Gregory Szorc <gregory.szorc@gmail.com> parents: 35076 diff changeset	233 filespos = {}
35076 90609be10891 bundlerepo: rename "bundle" arguments to "cgunpacker" Gregory Szorc <gregory.szorc@gmail.com> parents: 35075 diff changeset	234 for chunkdata in iter(cgunpacker.filelogheader, {}):
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	235 fname = chunkdata[b'filename']
35077 cd4cd7b94ff1 bundlerepo: rename "bundlefilespos" variable and attribute Gregory Szorc <gregory.szorc@gmail.com> parents: 35076 diff changeset	236 filespos[fname] = cgunpacker.tell()
35076 90609be10891 bundlerepo: rename "bundle" arguments to "cgunpacker" Gregory Szorc <gregory.szorc@gmail.com> parents: 35075 diff changeset	237 for chunk in iter(lambda: cgunpacker.deltachunk(None), {}):
29712 9e88077f972c bundlerepo: introduce method to find file starts and use it Augie Fackler <augie@google.com> parents: 29711 diff changeset	238 pass
35077 cd4cd7b94ff1 bundlerepo: rename "bundlefilespos" variable and attribute Gregory Szorc <gregory.szorc@gmail.com> parents: 35076 diff changeset	239 return filespos
29712 9e88077f972c bundlerepo: introduce method to find file starts and use it Augie Fackler <augie@google.com> parents: 29711 diff changeset	240
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42823 diff changeset	241
39604 335ae4d0a552 bundlerepo: dynamically create repository type from base repository Gregory Szorc <gregory.szorc@gmail.com> parents: 39603 diff changeset	242 class bundlerepository(object):
35050 d2458ba810c5 bundlerepo: add docstring for bundlerepository class Gregory Szorc <gregory.szorc@gmail.com> parents: 35049 diff changeset	243 """A repository instance that is a union of a local repo and a bundle.
d2458ba810c5 bundlerepo: add docstring for bundlerepository class Gregory Szorc <gregory.szorc@gmail.com> parents: 35049 diff changeset	244
d2458ba810c5 bundlerepo: add docstring for bundlerepository class Gregory Szorc <gregory.szorc@gmail.com> parents: 35049 diff changeset	245 Instances represent a read-only repository composed of a local repository
d2458ba810c5 bundlerepo: add docstring for bundlerepository class Gregory Szorc <gregory.szorc@gmail.com> parents: 35049 diff changeset	246 with the contents of a bundle file applied. The repository instance is
d2458ba810c5 bundlerepo: add docstring for bundlerepository class Gregory Szorc <gregory.szorc@gmail.com> parents: 35049 diff changeset	247 conceptually similar to the state of a repository after an
d2458ba810c5 bundlerepo: add docstring for bundlerepository class Gregory Szorc <gregory.szorc@gmail.com> parents: 35049 diff changeset	248 ``hg unbundle`` operation. However, the contents of the bundle are never
d2458ba810c5 bundlerepo: add docstring for bundlerepository class Gregory Szorc <gregory.szorc@gmail.com> parents: 35049 diff changeset	249 applied to the actual base repository.
39604 335ae4d0a552 bundlerepo: dynamically create repository type from base repository Gregory Szorc <gregory.szorc@gmail.com> parents: 39603 diff changeset	250
335ae4d0a552 bundlerepo: dynamically create repository type from base repository Gregory Szorc <gregory.szorc@gmail.com> parents: 39603 diff changeset	251 Instances constructed directly are not usable as repository objects.
335ae4d0a552 bundlerepo: dynamically create repository type from base repository Gregory Szorc <gregory.szorc@gmail.com> parents: 39603 diff changeset	252 Use instance() or makebundlerepository() to create instances.
35050 d2458ba810c5 bundlerepo: add docstring for bundlerepository class Gregory Szorc <gregory.szorc@gmail.com> parents: 35049 diff changeset	253 """
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42823 diff changeset	254
39604 335ae4d0a552 bundlerepo: dynamically create repository type from base repository Gregory Szorc <gregory.szorc@gmail.com> parents: 39603 diff changeset	255 def __init__(self, bundlepath, url, tempparent):
335ae4d0a552 bundlerepo: dynamically create repository type from base repository Gregory Szorc <gregory.szorc@gmail.com> parents: 39603 diff changeset	256 self._tempparent = tempparent
335ae4d0a552 bundlerepo: dynamically create repository type from base repository Gregory Szorc <gregory.szorc@gmail.com> parents: 39603 diff changeset	257 self._url = url
335ae4d0a552 bundlerepo: dynamically create repository type from base repository Gregory Szorc <gregory.szorc@gmail.com> parents: 39603 diff changeset	258
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	259 self.ui.setconfig(b'phases', b'publish', False, b'bundlerepo')
2673 109a22f5434a hooks: add url to changegroup, incoming, prechangegroup, pretxnchangegroup hooks Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2273 diff changeset	260
2273 f116ddea537f add support for compressed bundle repositories Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2257 diff changeset	261 self.tempfile = None
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	262 f = util.posixfile(bundlepath, b"rb")
39604 335ae4d0a552 bundlerepo: dynamically create repository type from base repository Gregory Szorc <gregory.szorc@gmail.com> parents: 39603 diff changeset	263 bundle = exchange.readbundle(self.ui, f, bundlepath)
12044 bcc7139521b7 bundlerepo: remove duplication of bundle decompressors Matt Mackall <mpm@selenic.com> parents: 11154 diff changeset	264
35053 495fcff10124 bundlerepo: assign bundle attributes in bundle type blocks Gregory Szorc <gregory.szorc@gmail.com> parents: 35052 diff changeset	265 if isinstance(bundle, bundle2.unbundle20):
495fcff10124 bundlerepo: assign bundle attributes in bundle type blocks Gregory Szorc <gregory.szorc@gmail.com> parents: 35052 diff changeset	266 self._bundlefile = bundle
35054 3f393e4593f2 bundlerepo: rename _bundle to _cgunpacker Gregory Szorc <gregory.szorc@gmail.com> parents: 35053 diff changeset	267 self._cgunpacker = None
35053 495fcff10124 bundlerepo: assign bundle attributes in bundle type blocks Gregory Szorc <gregory.szorc@gmail.com> parents: 35052 diff changeset	268
35115 2b72bc88043f bundle2: only seek to beginning of part in bundlerepo Gregory Szorc <gregory.szorc@gmail.com> parents: 35077 diff changeset	269 cgpart = None
35116 da91e7309daf bundle2: don't use seekable bundle2 parts by default (issue5691) Gregory Szorc <gregory.szorc@gmail.com> parents: 35115 diff changeset	270 for part in bundle.iterparts(seekable=True):
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	271 if part.type == b'changegroup':
35115 2b72bc88043f bundle2: only seek to beginning of part in bundlerepo Gregory Szorc <gregory.szorc@gmail.com> parents: 35077 diff changeset	272 if cgpart:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42823 diff changeset	273 raise NotImplementedError(
43117 8ff1ecfadcd1 cleanup: join string literals that are already on one line Martin von Zweigbergk <martinvonz@google.com> parents: 43115 diff changeset	274 b"can't process multiple changegroups"
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42823 diff changeset	275 )
35115 2b72bc88043f bundle2: only seek to beginning of part in bundlerepo Gregory Szorc <gregory.szorc@gmail.com> parents: 35077 diff changeset	276 cgpart = part
24073 ff5caa8dfd99 bundlerepo: basic bundle2 support Eric Sumner <ericsumner@fb.com> parents: 24072 diff changeset	277
35053 495fcff10124 bundlerepo: assign bundle attributes in bundle type blocks Gregory Szorc <gregory.szorc@gmail.com> parents: 35052 diff changeset	278 self._handlebundle2part(bundle, part)
24073 ff5caa8dfd99 bundlerepo: basic bundle2 support Eric Sumner <ericsumner@fb.com> parents: 24072 diff changeset	279
35115 2b72bc88043f bundle2: only seek to beginning of part in bundlerepo Gregory Szorc <gregory.szorc@gmail.com> parents: 35077 diff changeset	280 if not cgpart:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	281 raise error.Abort(_(b"No changegroups found"))
35115 2b72bc88043f bundle2: only seek to beginning of part in bundlerepo Gregory Szorc <gregory.szorc@gmail.com> parents: 35077 diff changeset	282
2b72bc88043f bundle2: only seek to beginning of part in bundlerepo Gregory Szorc <gregory.szorc@gmail.com> parents: 35077 diff changeset	283 # This is required to placate a later consumer, which expects
2b72bc88043f bundle2: only seek to beginning of part in bundlerepo Gregory Szorc <gregory.szorc@gmail.com> parents: 35077 diff changeset	284 # the payload offset to be at the beginning of the changegroup.
2b72bc88043f bundle2: only seek to beginning of part in bundlerepo Gregory Szorc <gregory.szorc@gmail.com> parents: 35077 diff changeset	285 # We need to do this after the iterparts() generator advances
2b72bc88043f bundle2: only seek to beginning of part in bundlerepo Gregory Szorc <gregory.szorc@gmail.com> parents: 35077 diff changeset	286 # because iterparts() will seek to end of payload after the
2b72bc88043f bundle2: only seek to beginning of part in bundlerepo Gregory Szorc <gregory.szorc@gmail.com> parents: 35077 diff changeset	287 # generator returns control to iterparts().
2b72bc88043f bundle2: only seek to beginning of part in bundlerepo Gregory Szorc <gregory.szorc@gmail.com> parents: 35077 diff changeset	288 cgpart.seek(0, os.SEEK_SET)
2b72bc88043f bundle2: only seek to beginning of part in bundlerepo Gregory Szorc <gregory.szorc@gmail.com> parents: 35077 diff changeset	289
35053 495fcff10124 bundlerepo: assign bundle attributes in bundle type blocks Gregory Szorc <gregory.szorc@gmail.com> parents: 35052 diff changeset	290 elif isinstance(bundle, changegroup.cg1unpacker):
495fcff10124 bundlerepo: assign bundle attributes in bundle type blocks Gregory Szorc <gregory.szorc@gmail.com> parents: 35052 diff changeset	291 if bundle.compressed():
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42823 diff changeset	292 f = self._writetempbundle(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	293 bundle.read, b'.hg10un', header=b'HG10UN'
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42823 diff changeset	294 )
39604 335ae4d0a552 bundlerepo: dynamically create repository type from base repository Gregory Szorc <gregory.szorc@gmail.com> parents: 39603 diff changeset	295 bundle = exchange.readbundle(self.ui, f, bundlepath, self.vfs)
35053 495fcff10124 bundlerepo: assign bundle attributes in bundle type blocks Gregory Szorc <gregory.szorc@gmail.com> parents: 35052 diff changeset	296
495fcff10124 bundlerepo: assign bundle attributes in bundle type blocks Gregory Szorc <gregory.szorc@gmail.com> parents: 35052 diff changeset	297 self._bundlefile = bundle
35054 3f393e4593f2 bundlerepo: rename _bundle to _cgunpacker Gregory Szorc <gregory.szorc@gmail.com> parents: 35053 diff changeset	298 self._cgunpacker = bundle
35051 4f04c9207a76 bundlerepo: don't assume there are only two bundle classes Gregory Szorc <gregory.szorc@gmail.com> parents: 35050 diff changeset	299 else:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	300 raise error.Abort(
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	301 _(b'bundle type %s cannot be read') % type(bundle)
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	302 )
26801 73bf76bf6f14 bundlerepo: uncompress changegroup in bundle1 case only Pierre-Yves David <pierre-yves.david@fb.com> parents: 26800 diff changeset	303
35077 cd4cd7b94ff1 bundlerepo: rename "bundlefilespos" variable and attribute Gregory Szorc <gregory.szorc@gmail.com> parents: 35076 diff changeset	304 # dict with the mapping 'filename' -> position in the changegroup.
cd4cd7b94ff1 bundlerepo: rename "bundlefilespos" variable and attribute Gregory Szorc <gregory.szorc@gmail.com> parents: 35076 diff changeset	305 self._cgfilespos = {}
5262 a35756389ef4 Make bundlerepo lazier Brendan Cully <brendan@kublai.com> parents: 5167 diff changeset	306
23632 e7fcf58acd71 bundlerepo: retract phase boundary Eric Sumner <ericsumner@fb.com> parents: 23631 diff changeset	307 self.firstnewrev = self.changelog.repotiprev + 1
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42823 diff changeset	308 phases.retractboundary(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42823 diff changeset	309 self,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42823 diff changeset	310 None,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42823 diff changeset	311 phases.draft,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42823 diff changeset	312 [ctx.node() for ctx in self[self.firstnewrev :]],
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42823 diff changeset	313 )
23632 e7fcf58acd71 bundlerepo: retract phase boundary Eric Sumner <ericsumner@fb.com> parents: 23631 diff changeset	314
35053 495fcff10124 bundlerepo: assign bundle attributes in bundle type blocks Gregory Szorc <gregory.szorc@gmail.com> parents: 35052 diff changeset	315 def _handlebundle2part(self, bundle, part):
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	316 if part.type != b'changegroup':
35075 3eeb0a3eeaed bundlerepo: use early return Gregory Szorc <gregory.szorc@gmail.com> parents: 35054 diff changeset	317 return
33889 f672d060a931 bundlerepo: move bundle2 part handling out to a function Durham Goode <durham@fb.com> parents: 33888 diff changeset	318
35075 3eeb0a3eeaed bundlerepo: use early return Gregory Szorc <gregory.szorc@gmail.com> parents: 35054 diff changeset	319 cgstream = part
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	320 version = part.params.get(b'version', b'01')
35075 3eeb0a3eeaed bundlerepo: use early return Gregory Szorc <gregory.szorc@gmail.com> parents: 35054 diff changeset	321 legalcgvers = changegroup.supportedincomingversions(self)
3eeb0a3eeaed bundlerepo: use early return Gregory Szorc <gregory.szorc@gmail.com> parents: 35054 diff changeset	322 if version not in legalcgvers:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	323 msg = _(b'Unsupported changegroup version: %s')
35075 3eeb0a3eeaed bundlerepo: use early return Gregory Szorc <gregory.szorc@gmail.com> parents: 35054 diff changeset	324 raise error.Abort(msg % version)
3eeb0a3eeaed bundlerepo: use early return Gregory Szorc <gregory.szorc@gmail.com> parents: 35054 diff changeset	325 if bundle.compressed():
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	326 cgstream = self._writetempbundle(part.read, b'.cg%sun' % version)
35075 3eeb0a3eeaed bundlerepo: use early return Gregory Szorc <gregory.szorc@gmail.com> parents: 35054 diff changeset	327
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	328 self._cgunpacker = changegroup.getunbundler(version, cgstream, b'UN')
33889 f672d060a931 bundlerepo: move bundle2 part handling out to a function Durham Goode <durham@fb.com> parents: 33888 diff changeset	329
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	330 def _writetempbundle(self, readfn, suffix, header=b''):
33887 702a26fec3e2 bundlerepo: move temp bundle creation to a separate function Durham Goode <durham@fb.com> parents: 33182 diff changeset	331 """Write a temporary file to disk
702a26fec3e2 bundlerepo: move temp bundle creation to a separate function Durham Goode <durham@fb.com> parents: 33182 diff changeset	332 """
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	333 fdtemp, temp = self.vfs.mkstemp(prefix=b"hg-bundle-", suffix=suffix)
33887 702a26fec3e2 bundlerepo: move temp bundle creation to a separate function Durham Goode <durham@fb.com> parents: 33182 diff changeset	334 self.tempfile = temp
702a26fec3e2 bundlerepo: move temp bundle creation to a separate function Durham Goode <durham@fb.com> parents: 33182 diff changeset	335
43506 9f70512ae2cf cleanup: remove pointless r-prefixes on single-quoted strings Augie Fackler <augie@google.com> parents: 43117 diff changeset	336 with os.fdopen(fdtemp, 'wb') as fptemp:
33887 702a26fec3e2 bundlerepo: move temp bundle creation to a separate function Durham Goode <durham@fb.com> parents: 33182 diff changeset	337 fptemp.write(header)
702a26fec3e2 bundlerepo: move temp bundle creation to a separate function Durham Goode <durham@fb.com> parents: 33182 diff changeset	338 while True:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42823 diff changeset	339 chunk = readfn(2 ** 18)
33887 702a26fec3e2 bundlerepo: move temp bundle creation to a separate function Durham Goode <durham@fb.com> parents: 33182 diff changeset	340 if not chunk:
702a26fec3e2 bundlerepo: move temp bundle creation to a separate function Durham Goode <durham@fb.com> parents: 33182 diff changeset	341 break
702a26fec3e2 bundlerepo: move temp bundle creation to a separate function Durham Goode <durham@fb.com> parents: 33182 diff changeset	342 fptemp.write(chunk)
702a26fec3e2 bundlerepo: move temp bundle creation to a separate function Durham Goode <durham@fb.com> parents: 33182 diff changeset	343
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	344 return self.vfs.open(self.tempfile, mode=b"rb")
33887 702a26fec3e2 bundlerepo: move temp bundle creation to a separate function Durham Goode <durham@fb.com> parents: 33182 diff changeset	345
18014 a39fe76c4c65 clfilter: ensure that filecache on localrepo is unfiltered Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17913 diff changeset	346 @localrepo.unfilteredpropertycache
23631 b8260abfeb7d bundlerepo: implement safe phasecache Eric Sumner <ericsumner@fb.com> parents: 22182 diff changeset	347 def _phasecache(self):
b8260abfeb7d bundlerepo: implement safe phasecache Eric Sumner <ericsumner@fb.com> parents: 22182 diff changeset	348 return bundlephasecache(self, self._phasedefaults)
b8260abfeb7d bundlerepo: implement safe phasecache Eric Sumner <ericsumner@fb.com> parents: 22182 diff changeset	349
b8260abfeb7d bundlerepo: implement safe phasecache Eric Sumner <ericsumner@fb.com> parents: 22182 diff changeset	350 @localrepo.unfilteredpropertycache
8260 54a4b520bd7d localrepo: use propertycache Matt Mackall <mpm@selenic.com> parents: 8227 diff changeset	351 def changelog(self):
14144 3c3c53d8343a unbundler: separate delta and header parsing Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 14142 diff changeset	352 # consume the header if it exists
35054 3f393e4593f2 bundlerepo: rename _bundle to _cgunpacker Gregory Szorc <gregory.szorc@gmail.com> parents: 35053 diff changeset	353 self._cgunpacker.changelogheader()
3f393e4593f2 bundlerepo: rename _bundle to _cgunpacker Gregory Szorc <gregory.szorc@gmail.com> parents: 35053 diff changeset	354 c = bundlechangelog(self.svfs, self._cgunpacker)
3f393e4593f2 bundlerepo: rename _bundle to _cgunpacker Gregory Szorc <gregory.szorc@gmail.com> parents: 35053 diff changeset	355 self.manstart = self._cgunpacker.tell()
8260 54a4b520bd7d localrepo: use propertycache Matt Mackall <mpm@selenic.com> parents: 8227 diff changeset	356 return c
54a4b520bd7d localrepo: use propertycache Matt Mackall <mpm@selenic.com> parents: 8227 diff changeset	357
42510 3472a3f9d785 localrepo: introduce a `_refreshchangelog` method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 41038 diff changeset	358 def _refreshchangelog(self):
3472a3f9d785 localrepo: introduce a `_refreshchangelog` method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 41038 diff changeset	359 # changelog for bundle repo are not filecache, this method is not
3472a3f9d785 localrepo: introduce a `_refreshchangelog` method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 41038 diff changeset	360 # applicable.
3472a3f9d785 localrepo: introduce a `_refreshchangelog` method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 41038 diff changeset	361 pass
3472a3f9d785 localrepo: introduce a `_refreshchangelog` method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 41038 diff changeset	362
39763 5ccd791344f3 localrepo: pass root manifest into manifestlog.__init__ Gregory Szorc <gregory.szorc@gmail.com> parents: 39604 diff changeset	363 @localrepo.unfilteredpropertycache
5ccd791344f3 localrepo: pass root manifest into manifestlog.__init__ Gregory Szorc <gregory.szorc@gmail.com> parents: 39604 diff changeset	364 def manifestlog(self):
35054 3f393e4593f2 bundlerepo: rename _bundle to _cgunpacker Gregory Szorc <gregory.szorc@gmail.com> parents: 35053 diff changeset	365 self._cgunpacker.seek(self.manstart)
14144 3c3c53d8343a unbundler: separate delta and header parsing Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 14142 diff changeset	366 # consume the header if it exists
35054 3f393e4593f2 bundlerepo: rename _bundle to _cgunpacker Gregory Szorc <gregory.szorc@gmail.com> parents: 35053 diff changeset	367 self._cgunpacker.manifestheader()
28221 7a8c44844f57 bundlerepo: properly handle hidden linkrev in manifestlog (issue4945) Pierre-Yves David <pierre-yves.david@fb.com> parents: 28186 diff changeset	368 linkmapper = self.unfiltered().changelog.rev
39763 5ccd791344f3 localrepo: pass root manifest into manifestlog.__init__ Gregory Szorc <gregory.szorc@gmail.com> parents: 39604 diff changeset	369 rootstore = bundlemanifest(self.svfs, self._cgunpacker, linkmapper)
35054 3f393e4593f2 bundlerepo: rename _bundle to _cgunpacker Gregory Szorc <gregory.szorc@gmail.com> parents: 35053 diff changeset	370 self.filestart = self._cgunpacker.tell()
39763 5ccd791344f3 localrepo: pass root manifest into manifestlog.__init__ Gregory Szorc <gregory.szorc@gmail.com> parents: 39604 diff changeset	371
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42823 diff changeset	372 return manifest.manifestlog(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42823 diff changeset	373 self.svfs, self, rootstore, self.narrowmatch()
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42823 diff changeset	374 )
8260 54a4b520bd7d localrepo: use propertycache Matt Mackall <mpm@selenic.com> parents: 8227 diff changeset	375
35011 a2dfc723b6b5 bundle: allow bundlerepo to support alternative manifest implementations Durham Goode <durham@fb.com> parents: 34293 diff changeset	376 def _consumemanifest(self):
a2dfc723b6b5 bundle: allow bundlerepo to support alternative manifest implementations Durham Goode <durham@fb.com> parents: 34293 diff changeset	377 """Consumes the manifest portion of the bundle, setting filestart so the
a2dfc723b6b5 bundle: allow bundlerepo to support alternative manifest implementations Durham Goode <durham@fb.com> parents: 34293 diff changeset	378 file portion can be read."""
35054 3f393e4593f2 bundlerepo: rename _bundle to _cgunpacker Gregory Szorc <gregory.szorc@gmail.com> parents: 35053 diff changeset	379 self._cgunpacker.seek(self.manstart)
3f393e4593f2 bundlerepo: rename _bundle to _cgunpacker Gregory Szorc <gregory.szorc@gmail.com> parents: 35053 diff changeset	380 self._cgunpacker.manifestheader()
3f393e4593f2 bundlerepo: rename _bundle to _cgunpacker Gregory Szorc <gregory.szorc@gmail.com> parents: 35053 diff changeset	381 for delta in self._cgunpacker.deltaiter():
35011 a2dfc723b6b5 bundle: allow bundlerepo to support alternative manifest implementations Durham Goode <durham@fb.com> parents: 34293 diff changeset	382 pass
35054 3f393e4593f2 bundlerepo: rename _bundle to _cgunpacker Gregory Szorc <gregory.szorc@gmail.com> parents: 35053 diff changeset	383 self.filestart = self._cgunpacker.tell()
35011 a2dfc723b6b5 bundle: allow bundlerepo to support alternative manifest implementations Durham Goode <durham@fb.com> parents: 34293 diff changeset	384
18014 a39fe76c4c65 clfilter: ensure that filecache on localrepo is unfiltered Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17913 diff changeset	385 @localrepo.unfilteredpropertycache
8260 54a4b520bd7d localrepo: use propertycache Matt Mackall <mpm@selenic.com> parents: 8227 diff changeset	386 def manstart(self):
54a4b520bd7d localrepo: use propertycache Matt Mackall <mpm@selenic.com> parents: 8227 diff changeset	387 self.changelog
54a4b520bd7d localrepo: use propertycache Matt Mackall <mpm@selenic.com> parents: 8227 diff changeset	388 return self.manstart
54a4b520bd7d localrepo: use propertycache Matt Mackall <mpm@selenic.com> parents: 8227 diff changeset	389
18014 a39fe76c4c65 clfilter: ensure that filecache on localrepo is unfiltered Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17913 diff changeset	390 @localrepo.unfilteredpropertycache
8260 54a4b520bd7d localrepo: use propertycache Matt Mackall <mpm@selenic.com> parents: 8227 diff changeset	391 def filestart(self):
30375 11b8b740d54a manifest: remove last uses of repo.manifest Durham Goode <durham@fb.com> parents: 30373 diff changeset	392 self.manifestlog
35011 a2dfc723b6b5 bundle: allow bundlerepo to support alternative manifest implementations Durham Goode <durham@fb.com> parents: 34293 diff changeset	393
a2dfc723b6b5 bundle: allow bundlerepo to support alternative manifest implementations Durham Goode <durham@fb.com> parents: 34293 diff changeset	394 # If filestart was not set by self.manifestlog, that means the
a2dfc723b6b5 bundle: allow bundlerepo to support alternative manifest implementations Durham Goode <durham@fb.com> parents: 34293 diff changeset	395 # manifestlog implementation did not consume the manifests from the
a2dfc723b6b5 bundle: allow bundlerepo to support alternative manifest implementations Durham Goode <durham@fb.com> parents: 34293 diff changeset	396 # changegroup (ex: it might be consuming trees from a separate bundle2
a2dfc723b6b5 bundle: allow bundlerepo to support alternative manifest implementations Durham Goode <durham@fb.com> parents: 34293 diff changeset	397 # part instead). So we need to manually consume it.
43506 9f70512ae2cf cleanup: remove pointless r-prefixes on single-quoted strings Augie Fackler <augie@google.com> parents: 43117 diff changeset	398 if 'filestart' not in self.__dict__:
35011 a2dfc723b6b5 bundle: allow bundlerepo to support alternative manifest implementations Durham Goode <durham@fb.com> parents: 34293 diff changeset	399 self._consumemanifest()
a2dfc723b6b5 bundle: allow bundlerepo to support alternative manifest implementations Durham Goode <durham@fb.com> parents: 34293 diff changeset	400
8260 54a4b520bd7d localrepo: use propertycache Matt Mackall <mpm@selenic.com> parents: 8227 diff changeset	401 return self.filestart
1942 9da45de3118d add bundlerepo.py: a read-only repo that can use uncompressed bundles Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	402
2673 109a22f5434a hooks: add url to changegroup, incoming, prechangegroup, pretxnchangegroup hooks Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2273 diff changeset	403 def url(self):
109a22f5434a hooks: add url to changegroup, incoming, prechangegroup, pretxnchangegroup hooks Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2273 diff changeset	404 return self._url
109a22f5434a hooks: add url to changegroup, incoming, prechangegroup, pretxnchangegroup hooks Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2273 diff changeset	405
1942 9da45de3118d add bundlerepo.py: a read-only repo that can use uncompressed bundles Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	406 def file(self, f):
35077 cd4cd7b94ff1 bundlerepo: rename "bundlefilespos" variable and attribute Gregory Szorc <gregory.szorc@gmail.com> parents: 35076 diff changeset	407 if not self._cgfilespos:
35054 3f393e4593f2 bundlerepo: rename _bundle to _cgunpacker Gregory Szorc <gregory.szorc@gmail.com> parents: 35053 diff changeset	408 self._cgunpacker.seek(self.filestart)
35077 cd4cd7b94ff1 bundlerepo: rename "bundlefilespos" variable and attribute Gregory Szorc <gregory.szorc@gmail.com> parents: 35076 diff changeset	409 self._cgfilespos = _getfilestarts(self._cgunpacker)
5262 a35756389ef4 Make bundlerepo lazier Brendan Cully <brendan@kublai.com> parents: 5167 diff changeset	410
35077 cd4cd7b94ff1 bundlerepo: rename "bundlefilespos" variable and attribute Gregory Szorc <gregory.szorc@gmail.com> parents: 35076 diff changeset	411 if f in self._cgfilespos:
cd4cd7b94ff1 bundlerepo: rename "bundlefilespos" variable and attribute Gregory Szorc <gregory.szorc@gmail.com> parents: 35076 diff changeset	412 self._cgunpacker.seek(self._cgfilespos[f])
28186 5ab6f0fde75f bundlerepo: properly handle hidden linkrev in filelog (issue4945) Pierre-Yves David <pierre-yves.david@fb.com> parents: 27953 diff changeset	413 linkmapper = self.unfiltered().changelog.rev
35054 3f393e4593f2 bundlerepo: rename _bundle to _cgunpacker Gregory Szorc <gregory.szorc@gmail.com> parents: 35053 diff changeset	414 return bundlefilelog(self.svfs, f, self._cgunpacker, linkmapper)
1942 9da45de3118d add bundlerepo.py: a read-only repo that can use uncompressed bundles Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	415 else:
37331 c68262401c8c bundlerepo: use super() when calling file() Gregory Szorc <gregory.szorc@gmail.com> parents: 36835 diff changeset	416 return super(bundlerepository, self).file(f)
1942 9da45de3118d add bundlerepo.py: a read-only repo that can use uncompressed bundles Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	417
12347 6277a9469dff bundlerepo: restore close() method Matt Mackall <mpm@selenic.com> parents: 12335 diff changeset	418 def close(self):
6277a9469dff bundlerepo: restore close() method Matt Mackall <mpm@selenic.com> parents: 12335 diff changeset	419 """Close assigned bundle file immediately."""
35052 df2a676a2e9e bundlerepo: make bundle and bundlefile attributes private Gregory Szorc <gregory.szorc@gmail.com> parents: 35051 diff changeset	420 self._bundlefile.close()
12962 ff083040a555 bundlerepository: get rid of temporary bundle files (issue2478) Klaus Koch <kuk42@gmx.net> parents: 12961 diff changeset	421 if self.tempfile is not None:
20981 4fdd1172d37e bundlerepo: treat temporarily extracted bundle file via vfs FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20790 diff changeset	422 self.vfs.unlink(self.tempfile)
6314 9a1c59283ad3 Add ability to directly clone from all-history bundles John Mulligan <phlogistonjohn@asynchrono.us> parents: 6312 diff changeset	423 if self._tempparent:
9a1c59283ad3 Add ability to directly clone from all-history bundles John Mulligan <phlogistonjohn@asynchrono.us> parents: 6312 diff changeset	424 shutil.rmtree(self._tempparent, True)
2740 386f04d6ecb3 clean up hg.py: move repo constructor code into each repo module Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2673 diff changeset	425
6315 5c96a4bca66b clone: use cancopy Matt Mackall <mpm@selenic.com> parents: 6314 diff changeset	426 def cancopy(self):
5c96a4bca66b clone: use cancopy Matt Mackall <mpm@selenic.com> parents: 6314 diff changeset	427 return False
5c96a4bca66b clone: use cancopy Matt Mackall <mpm@selenic.com> parents: 6314 diff changeset	428
17193 1d710fe5ee0e peer: introduce canpush and improve error message Sune Foldager <cryo@cyanite.org> parents: 17191 diff changeset	429 def peer(self):
1d710fe5ee0e peer: introduce canpush and improve error message Sune Foldager <cryo@cyanite.org> parents: 17191 diff changeset	430 return bundlepeer(self)
1d710fe5ee0e peer: introduce canpush and improve error message Sune Foldager <cryo@cyanite.org> parents: 17191 diff changeset	431
7435 5e13df32fb74 bundlerepo doesn't really have a dirstate, throw AttributeError if requested Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6953 diff changeset	432 def getcwd(self):
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42823 diff changeset	433 return encoding.getcwd() # always outside the repo
7435 5e13df32fb74 bundlerepo doesn't really have a dirstate, throw AttributeError if requested Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6953 diff changeset	434
28714 dac81729fea4 bundle: warn when update to revision existing only in a bundle (issue5004) liscju <piotr.listkiewicz@gmail.com> parents: 28666 diff changeset	435 # Check if parents exist in localrepo before setting
dac81729fea4 bundle: warn when update to revision existing only in a bundle (issue5004) liscju <piotr.listkiewicz@gmail.com> parents: 28666 diff changeset	436 def setparents(self, p1, p2=nullid):
dac81729fea4 bundle: warn when update to revision existing only in a bundle (issue5004) liscju <piotr.listkiewicz@gmail.com> parents: 28666 diff changeset	437 p1rev = self.changelog.rev(p1)
dac81729fea4 bundle: warn when update to revision existing only in a bundle (issue5004) liscju <piotr.listkiewicz@gmail.com> parents: 28666 diff changeset	438 p2rev = self.changelog.rev(p2)
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	439 msg = _(b"setting parent to node %s that only exists in the bundle\n")
28714 dac81729fea4 bundle: warn when update to revision existing only in a bundle (issue5004) liscju <piotr.listkiewicz@gmail.com> parents: 28666 diff changeset	440 if self.changelog.repotiprev < p1rev:
dac81729fea4 bundle: warn when update to revision existing only in a bundle (issue5004) liscju <piotr.listkiewicz@gmail.com> parents: 28666 diff changeset	441 self.ui.warn(msg % nodemod.hex(p1))
dac81729fea4 bundle: warn when update to revision existing only in a bundle (issue5004) liscju <piotr.listkiewicz@gmail.com> parents: 28666 diff changeset	442 if self.changelog.repotiprev < p2rev:
dac81729fea4 bundle: warn when update to revision existing only in a bundle (issue5004) liscju <piotr.listkiewicz@gmail.com> parents: 28666 diff changeset	443 self.ui.warn(msg % nodemod.hex(p2))
dac81729fea4 bundle: warn when update to revision existing only in a bundle (issue5004) liscju <piotr.listkiewicz@gmail.com> parents: 28666 diff changeset	444 return super(bundlerepository, self).setparents(p1, p2)
15597 bc0778f5619a bundlerepo: don't write branch cache to disk Sune Foldager <cryo@cyanite.org> parents: 15091 diff changeset	445
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42823 diff changeset	446
39549 089fc0db0954 hg: allow extra arguments to be passed to repo creation (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 39243 diff changeset	447 def instance(ui, path, create, intents=None, createopts=None):
2740 386f04d6ecb3 clean up hg.py: move repo constructor code into each repo module Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2673 diff changeset	448 if create:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	449 raise error.Abort(_(b'cannot create new bundle repository'))
25830 5418dd5be8ac bundlerepo: mark internal-only config variable Matt Mackall <mpm@selenic.com> parents: 24921 diff changeset	450 # internal config: bundle.mainreporoot
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	451 parentpath = ui.config(b"bundle", b"mainreporoot")
16042 4b7aa1c899dc bundlerepo: try to find containing repo on creation (issue1812) Matt Mackall <mpm@selenic.com> parents: 15597 diff changeset	452 if not parentpath:
4b7aa1c899dc bundlerepo: try to find containing repo on creation (issue1812) Matt Mackall <mpm@selenic.com> parents: 15597 diff changeset	453 # try to find the correct path to the working directory repo
39818 24e493ec2229 py3: rename pycompat.getcwd() to encoding.getcwd() (API) Matt Harbison <matt_harbison@yahoo.com> parents: 39763 diff changeset	454 parentpath = cmdutil.findrepo(encoding.getcwd())
16042 4b7aa1c899dc bundlerepo: try to find containing repo on creation (issue1812) Matt Mackall <mpm@selenic.com> parents: 15597 diff changeset	455 if parentpath is None:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	456 parentpath = b''
5664 da72b4d24797 Fix income/pull with bundle and -R (issue 820). Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 5558 diff changeset	457 if parentpath:
da72b4d24797 Fix income/pull with bundle and -R (issue 820). Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 5558 diff changeset	458 # Try to make the full path relative so we get a nice, short URL.
da72b4d24797 Fix income/pull with bundle and -R (issue 820). Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 5558 diff changeset	459 # In particular, we don't want temp dir names in test outputs.
39818 24e493ec2229 py3: rename pycompat.getcwd() to encoding.getcwd() (API) Matt Harbison <matt_harbison@yahoo.com> parents: 39763 diff changeset	460 cwd = encoding.getcwd()
5664 da72b4d24797 Fix income/pull with bundle and -R (issue 820). Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 5558 diff changeset	461 if parentpath == cwd:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	462 parentpath = b''
5664 da72b4d24797 Fix income/pull with bundle and -R (issue 820). Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 5558 diff changeset	463 else:
24834 6e31e1274080 bundlerepo: use pathutil.normasprefix to ensure os.sep at the end of cwd FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 24686 diff changeset	464 cwd = pathutil.normasprefix(cwd)
5664 da72b4d24797 Fix income/pull with bundle and -R (issue 820). Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 5558 diff changeset	465 if parentpath.startswith(cwd):
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42823 diff changeset	466 parentpath = parentpath[len(cwd) :]
14076 924c82157d46 url: move URL parsing functions into util to improve startup time Brodie Rao <brodie@bitheap.org> parents: 14073 diff changeset	467 u = util.url(path)
13826 e574207e3bcd url: refactor util.drop_scheme() and hg.localpath() into url.localpath() Brodie Rao <brodie@bitheap.org> parents: 13742 diff changeset	468 path = u.localpath()
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	469 if u.scheme == b'bundle':
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	470 s = path.split(b"+", 1)
2740 386f04d6ecb3 clean up hg.py: move repo constructor code into each repo module Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2673 diff changeset	471 if len(s) == 1:
5664 da72b4d24797 Fix income/pull with bundle and -R (issue 820). Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 5558 diff changeset	472 repopath, bundlename = parentpath, s[0]
2740 386f04d6ecb3 clean up hg.py: move repo constructor code into each repo module Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2673 diff changeset	473 else:
386f04d6ecb3 clean up hg.py: move repo constructor code into each repo module Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2673 diff changeset	474 repopath, bundlename = s
386f04d6ecb3 clean up hg.py: move repo constructor code into each repo module Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2673 diff changeset	475 else:
5664 da72b4d24797 Fix income/pull with bundle and -R (issue 820). Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 5558 diff changeset	476 repopath, bundlename = parentpath, path
39603 a8d2faeca49e bundlerepo: factor out code for instantiating a bundle repository Gregory Szorc <gregory.szorc@gmail.com> parents: 39602 diff changeset	477
a8d2faeca49e bundlerepo: factor out code for instantiating a bundle repository Gregory Szorc <gregory.szorc@gmail.com> parents: 39602 diff changeset	478 return makebundlerepository(ui, repopath, bundlename)
a8d2faeca49e bundlerepo: factor out code for instantiating a bundle repository Gregory Szorc <gregory.szorc@gmail.com> parents: 39602 diff changeset	479
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42823 diff changeset	480
39603 a8d2faeca49e bundlerepo: factor out code for instantiating a bundle repository Gregory Szorc <gregory.szorc@gmail.com> parents: 39602 diff changeset	481 def makebundlerepository(ui, repopath, bundlepath):
a8d2faeca49e bundlerepo: factor out code for instantiating a bundle repository Gregory Szorc <gregory.szorc@gmail.com> parents: 39602 diff changeset	482 """Make a bundle repository object based on repo and bundle paths."""
39604 335ae4d0a552 bundlerepo: dynamically create repository type from base repository Gregory Szorc <gregory.szorc@gmail.com> parents: 39603 diff changeset	483 if repopath:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	484 url = b'bundle:%s+%s' % (util.expandpath(repopath), bundlepath)
39604 335ae4d0a552 bundlerepo: dynamically create repository type from base repository Gregory Szorc <gregory.szorc@gmail.com> parents: 39603 diff changeset	485 else:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	486 url = b'bundle:%s' % bundlepath
39604 335ae4d0a552 bundlerepo: dynamically create repository type from base repository Gregory Szorc <gregory.szorc@gmail.com> parents: 39603 diff changeset	487
335ae4d0a552 bundlerepo: dynamically create repository type from base repository Gregory Szorc <gregory.szorc@gmail.com> parents: 39603 diff changeset	488 # Because we can't make any guarantees about the type of the base
335ae4d0a552 bundlerepo: dynamically create repository type from base repository Gregory Szorc <gregory.szorc@gmail.com> parents: 39603 diff changeset	489 # repository, we can't have a static class representing the bundle
335ae4d0a552 bundlerepo: dynamically create repository type from base repository Gregory Szorc <gregory.szorc@gmail.com> parents: 39603 diff changeset	490 # repository. We also can't make any guarantees about how to even
335ae4d0a552 bundlerepo: dynamically create repository type from base repository Gregory Szorc <gregory.szorc@gmail.com> parents: 39603 diff changeset	491 # call the base repository's constructor!
335ae4d0a552 bundlerepo: dynamically create repository type from base repository Gregory Szorc <gregory.szorc@gmail.com> parents: 39603 diff changeset	492 #
335ae4d0a552 bundlerepo: dynamically create repository type from base repository Gregory Szorc <gregory.szorc@gmail.com> parents: 39603 diff changeset	493 # So, our strategy is to go through ``localrepo.instance()`` to construct
335ae4d0a552 bundlerepo: dynamically create repository type from base repository Gregory Szorc <gregory.szorc@gmail.com> parents: 39603 diff changeset	494 # a repo instance. Then, we dynamically create a new type derived from
335ae4d0a552 bundlerepo: dynamically create repository type from base repository Gregory Szorc <gregory.szorc@gmail.com> parents: 39603 diff changeset	495 # both it and our ``bundlerepository`` class which overrides some
335ae4d0a552 bundlerepo: dynamically create repository type from base repository Gregory Szorc <gregory.szorc@gmail.com> parents: 39603 diff changeset	496 # functionality. We then change the type of the constructed repository
335ae4d0a552 bundlerepo: dynamically create repository type from base repository Gregory Szorc <gregory.szorc@gmail.com> parents: 39603 diff changeset	497 # to this new type and initialize the bundle-specific bits of it.
335ae4d0a552 bundlerepo: dynamically create repository type from base repository Gregory Szorc <gregory.szorc@gmail.com> parents: 39603 diff changeset	498
335ae4d0a552 bundlerepo: dynamically create repository type from base repository Gregory Szorc <gregory.szorc@gmail.com> parents: 39603 diff changeset	499 try:
39944 75b53b809e87 bundlerepo: remove a variable alias Martin von Zweigbergk <martinvonz@google.com> parents: 39818 diff changeset	500 repo = localrepo.instance(ui, repopath, create=False)
39604 335ae4d0a552 bundlerepo: dynamically create repository type from base repository Gregory Szorc <gregory.szorc@gmail.com> parents: 39603 diff changeset	501 tempparent = None
335ae4d0a552 bundlerepo: dynamically create repository type from base repository Gregory Szorc <gregory.szorc@gmail.com> parents: 39603 diff changeset	502 except error.RepoError:
335ae4d0a552 bundlerepo: dynamically create repository type from base repository Gregory Szorc <gregory.szorc@gmail.com> parents: 39603 diff changeset	503 tempparent = pycompat.mkdtemp()
335ae4d0a552 bundlerepo: dynamically create repository type from base repository Gregory Szorc <gregory.szorc@gmail.com> parents: 39603 diff changeset	504 try:
39944 75b53b809e87 bundlerepo: remove a variable alias Martin von Zweigbergk <martinvonz@google.com> parents: 39818 diff changeset	505 repo = localrepo.instance(ui, tempparent, create=True)
39604 335ae4d0a552 bundlerepo: dynamically create repository type from base repository Gregory Szorc <gregory.szorc@gmail.com> parents: 39603 diff changeset	506 except Exception:
335ae4d0a552 bundlerepo: dynamically create repository type from base repository Gregory Szorc <gregory.szorc@gmail.com> parents: 39603 diff changeset	507 shutil.rmtree(tempparent)
335ae4d0a552 bundlerepo: dynamically create repository type from base repository Gregory Szorc <gregory.szorc@gmail.com> parents: 39603 diff changeset	508 raise
335ae4d0a552 bundlerepo: dynamically create repository type from base repository Gregory Szorc <gregory.szorc@gmail.com> parents: 39603 diff changeset	509
39944 75b53b809e87 bundlerepo: remove a variable alias Martin von Zweigbergk <martinvonz@google.com> parents: 39818 diff changeset	510 class derivedbundlerepository(bundlerepository, repo.__class__):
39604 335ae4d0a552 bundlerepo: dynamically create repository type from base repository Gregory Szorc <gregory.szorc@gmail.com> parents: 39603 diff changeset	511 pass
335ae4d0a552 bundlerepo: dynamically create repository type from base repository Gregory Szorc <gregory.szorc@gmail.com> parents: 39603 diff changeset	512
335ae4d0a552 bundlerepo: dynamically create repository type from base repository Gregory Szorc <gregory.szorc@gmail.com> parents: 39603 diff changeset	513 repo.__class__ = derivedbundlerepository
335ae4d0a552 bundlerepo: dynamically create repository type from base repository Gregory Szorc <gregory.szorc@gmail.com> parents: 39603 diff changeset	514 bundlerepository.__init__(repo, bundlepath, url, tempparent)
335ae4d0a552 bundlerepo: dynamically create repository type from base repository Gregory Szorc <gregory.szorc@gmail.com> parents: 39603 diff changeset	515
335ae4d0a552 bundlerepo: dynamically create repository type from base repository Gregory Szorc <gregory.szorc@gmail.com> parents: 39603 diff changeset	516 return repo
12734 5dfd1c49dcc5 bundlerepo: unify common code into a new getremotechanges Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 12347 diff changeset	517
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42823 diff changeset	518
23633 96c3cbec006f incoming: handle phases the same as pull Eric Sumner <ericsumner@fb.com> parents: 23632 diff changeset	519 class bundletransactionmanager(object):
96c3cbec006f incoming: handle phases the same as pull Eric Sumner <ericsumner@fb.com> parents: 23632 diff changeset	520 def transaction(self):
96c3cbec006f incoming: handle phases the same as pull Eric Sumner <ericsumner@fb.com> parents: 23632 diff changeset	521 return None
96c3cbec006f incoming: handle phases the same as pull Eric Sumner <ericsumner@fb.com> parents: 23632 diff changeset	522
96c3cbec006f incoming: handle phases the same as pull Eric Sumner <ericsumner@fb.com> parents: 23632 diff changeset	523 def close(self):
96c3cbec006f incoming: handle phases the same as pull Eric Sumner <ericsumner@fb.com> parents: 23632 diff changeset	524 raise NotImplementedError
96c3cbec006f incoming: handle phases the same as pull Eric Sumner <ericsumner@fb.com> parents: 23632 diff changeset	525
96c3cbec006f incoming: handle phases the same as pull Eric Sumner <ericsumner@fb.com> parents: 23632 diff changeset	526 def release(self):
96c3cbec006f incoming: handle phases the same as pull Eric Sumner <ericsumner@fb.com> parents: 23632 diff changeset	527 raise NotImplementedError
96c3cbec006f incoming: handle phases the same as pull Eric Sumner <ericsumner@fb.com> parents: 23632 diff changeset	528
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42823 diff changeset	529
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42823 diff changeset	530 def getremotechanges(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42823 diff changeset	531 ui, repo, peer, onlyheads=None, bundlename=None, force=False
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42823 diff changeset	532 ):
37642 d959277ff1b5 bundlerepo: rename "other" to "peer" Gregory Szorc <gregory.szorc@gmail.com> parents: 37635 diff changeset	533 '''obtains a bundle of changes incoming from peer
14161 8a0fca925992 bundlerepo: fix and improve getremotechanges Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14158 diff changeset	534
8a0fca925992 bundlerepo: fix and improve getremotechanges Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14158 diff changeset	535 "onlyheads" restricts the returned changes to those reachable from the
8a0fca925992 bundlerepo: fix and improve getremotechanges Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14158 diff changeset	536 specified heads.
8a0fca925992 bundlerepo: fix and improve getremotechanges Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14158 diff changeset	537 "bundlename", if given, stores the bundle to this file path permanently;
14190 8aab5a82685f bundlerepo: fix closing and docstring of getremotechanges Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14161 diff changeset	538 otherwise it's stored to a temp file and gets deleted again when you call
8aab5a82685f bundlerepo: fix closing and docstring of getremotechanges Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14161 diff changeset	539 the returned "cleanupfn".
14161 8a0fca925992 bundlerepo: fix and improve getremotechanges Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14158 diff changeset	540 "force" indicates whether to proceed on unrelated repos.
8a0fca925992 bundlerepo: fix and improve getremotechanges Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14158 diff changeset	541
8a0fca925992 bundlerepo: fix and improve getremotechanges Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14158 diff changeset	542 Returns a tuple (local, csets, cleanupfn):
8a0fca925992 bundlerepo: fix and improve getremotechanges Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14158 diff changeset	543
16683 525fdb738975 cleanup: eradicate long lines Brodie Rao <brodie@sf.io> parents: 16435 diff changeset	544 "local" is a local repo from which to obtain the actual incoming
525fdb738975 cleanup: eradicate long lines Brodie Rao <brodie@sf.io> parents: 16435 diff changeset	545 changesets; it is a bundlerepo for the obtained bundle when the
37642 d959277ff1b5 bundlerepo: rename "other" to "peer" Gregory Szorc <gregory.szorc@gmail.com> parents: 37635 diff changeset	546 original "peer" is remote.
14161 8a0fca925992 bundlerepo: fix and improve getremotechanges Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14158 diff changeset	547 "csets" lists the incoming changeset node ids.
16683 525fdb738975 cleanup: eradicate long lines Brodie Rao <brodie@sf.io> parents: 16435 diff changeset	548 "cleanupfn" must be called without arguments when you're done processing
37642 d959277ff1b5 bundlerepo: rename "other" to "peer" Gregory Szorc <gregory.szorc@gmail.com> parents: 37635 diff changeset	549 the changes; it closes both the original "peer" and the one returned
16683 525fdb738975 cleanup: eradicate long lines Brodie Rao <brodie@sf.io> parents: 16435 diff changeset	550 here.
14161 8a0fca925992 bundlerepo: fix and improve getremotechanges Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14158 diff changeset	551 '''
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42823 diff changeset	552 tmp = discovery.findcommonincoming(repo, peer, heads=onlyheads, force=force)
12734 5dfd1c49dcc5 bundlerepo: unify common code into a new getremotechanges Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 12347 diff changeset	553 common, incoming, rheads = tmp
5dfd1c49dcc5 bundlerepo: unify common code into a new getremotechanges Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 12347 diff changeset	554 if not incoming:
5dfd1c49dcc5 bundlerepo: unify common code into a new getremotechanges Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 12347 diff changeset	555 try:
15091 106f89299da6 bundlerepo: add argument check before unlink Sune Foldager <cryo@cyanite.org> parents: 14494 diff changeset	556 if bundlename:
21694 c08a22bfa16e bundlerepo: backout dbf292f65b09 Matt Mackall <mpm@selenic.com> parents: 21562 diff changeset	557 os.unlink(bundlename)
14004 97ed99d1f419 eliminate various naked except clauses Idan Kamara <idankk86@gmail.com> parents: 13826 diff changeset	558 except OSError:
12734 5dfd1c49dcc5 bundlerepo: unify common code into a new getremotechanges Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 12347 diff changeset	559 pass
37642 d959277ff1b5 bundlerepo: rename "other" to "peer" Gregory Szorc <gregory.szorc@gmail.com> parents: 37635 diff changeset	560 return repo, [], peer.close
12734 5dfd1c49dcc5 bundlerepo: unify common code into a new getremotechanges Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 12347 diff changeset	561
22182 510cafe72004 incoming: don't request heads that already are common Mads Kiilerich <madski@unity3d.com> parents: 21694 diff changeset	562 commonset = set(common)
510cafe72004 incoming: don't request heads that already are common Mads Kiilerich <madski@unity3d.com> parents: 21694 diff changeset	563 rheads = [x for x in rheads if x not in commonset]
510cafe72004 incoming: don't request heads that already are common Mads Kiilerich <madski@unity3d.com> parents: 21694 diff changeset	564
12734 5dfd1c49dcc5 bundlerepo: unify common code into a new getremotechanges Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 12347 diff changeset	565 bundle = None
14161 8a0fca925992 bundlerepo: fix and improve getremotechanges Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14158 diff changeset	566 bundlerepo = None
37642 d959277ff1b5 bundlerepo: rename "other" to "peer" Gregory Szorc <gregory.szorc@gmail.com> parents: 37635 diff changeset	567 localrepo = peer.local()
17191 5884812686f7 peer: introduce peer methods to prepare for peer classes Sune Foldager <cryo@cyanite.org> parents: 16686 diff changeset	568 if bundlename or not localrepo:
37642 d959277ff1b5 bundlerepo: rename "other" to "peer" Gregory Szorc <gregory.szorc@gmail.com> parents: 37635 diff changeset	569 # create a bundle (uncompressed if peer repo is not local)
12734 5dfd1c49dcc5 bundlerepo: unify common code into a new getremotechanges Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 12347 diff changeset	570
29684 ff5d5751fc1b bundlerepo: also read the 'devel.legacy.exchange' config Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 29389 diff changeset	571 # developer config: devel.legacy.exchange
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	572 legexc = ui.configlist(b'devel', b'legacy.exchange')
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	573 forcebundle1 = b'bundle2' not in legexc and b'bundle1' in legexc
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42823 diff changeset	574 canbundle2 = (
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42823 diff changeset	575 not forcebundle1
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	576 and peer.capable(b'getbundle')
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	577 and peer.capable(b'bundle2')
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42823 diff changeset	578 )
26544 1e8e0b01faba incoming: request a bundle2 when possible (BC) Pierre-Yves David <pierre-yves.david@fb.com> parents: 26543 diff changeset	579 if canbundle2:
37643 1aa4d646d0de bundlerepo: use command executor for wire protocol commands Gregory Szorc <gregory.szorc@gmail.com> parents: 37642 diff changeset	580 with peer.commandexecutor() as e:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42823 diff changeset	581 b2 = e.callcommand(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	582 b'getbundle',
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42823 diff changeset	583 {
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	584 b'source': b'incoming',
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	585 b'common': common,
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	586 b'heads': rheads,
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	587 b'bundlecaps': exchange.caps20to10(
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	588 repo, role=b'client'
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	589 ),
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	590 b'cg': True,
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42823 diff changeset	591 },
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42823 diff changeset	592 ).result()
37643 1aa4d646d0de bundlerepo: use command executor for wire protocol commands Gregory Szorc <gregory.szorc@gmail.com> parents: 37642 diff changeset	593
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42823 diff changeset	594 fname = bundle = changegroup.writechunks(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42823 diff changeset	595 ui, b2._forwardchunks(), bundlename
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42823 diff changeset	596 )
26544 1e8e0b01faba incoming: request a bundle2 when possible (BC) Pierre-Yves David <pierre-yves.david@fb.com> parents: 26543 diff changeset	597 else:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	598 if peer.capable(b'getbundle'):
37643 1aa4d646d0de bundlerepo: use command executor for wire protocol commands Gregory Szorc <gregory.szorc@gmail.com> parents: 37642 diff changeset	599 with peer.commandexecutor() as e:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42823 diff changeset	600 cg = e.callcommand(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	601 b'getbundle',
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42823 diff changeset	602 {
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	603 b'source': b'incoming',
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	604 b'common': common,
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	605 b'heads': rheads,
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42823 diff changeset	606 },
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42823 diff changeset	607 ).result()
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	608 elif onlyheads is None and not peer.capable(b'changegroupsubset'):
26543 a018cbabdb51 bundlerepo: indent some code to prepare next patch Pierre-Yves David <pierre-yves.david@fb.com> parents: 26399 diff changeset	609 # compat with older servers when pulling all remote heads
37635 cc8c06835097 wireproto: convert legacy commands to command executor Gregory Szorc <gregory.szorc@gmail.com> parents: 37497 diff changeset	610
37642 d959277ff1b5 bundlerepo: rename "other" to "peer" Gregory Szorc <gregory.szorc@gmail.com> parents: 37635 diff changeset	611 with peer.commandexecutor() as e:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42823 diff changeset	612 cg = e.callcommand(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	613 b'changegroup',
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	614 {b'nodes': incoming, b'source': b'incoming',},
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42823 diff changeset	615 ).result()
37635 cc8c06835097 wireproto: convert legacy commands to command executor Gregory Szorc <gregory.szorc@gmail.com> parents: 37497 diff changeset	616
26543 a018cbabdb51 bundlerepo: indent some code to prepare next patch Pierre-Yves David <pierre-yves.david@fb.com> parents: 26399 diff changeset	617 rheads = None
a018cbabdb51 bundlerepo: indent some code to prepare next patch Pierre-Yves David <pierre-yves.david@fb.com> parents: 26399 diff changeset	618 else:
37642 d959277ff1b5 bundlerepo: rename "other" to "peer" Gregory Szorc <gregory.szorc@gmail.com> parents: 37635 diff changeset	619 with peer.commandexecutor() as e:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42823 diff changeset	620 cg = e.callcommand(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	621 b'changegroupsubset',
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42823 diff changeset	622 {
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	623 b'bases': incoming,
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	624 b'heads': rheads,
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	625 b'source': b'incoming',
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42823 diff changeset	626 },
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42823 diff changeset	627 ).result()
37635 cc8c06835097 wireproto: convert legacy commands to command executor Gregory Szorc <gregory.szorc@gmail.com> parents: 37497 diff changeset	628
26543 a018cbabdb51 bundlerepo: indent some code to prepare next patch Pierre-Yves David <pierre-yves.david@fb.com> parents: 26399 diff changeset	629 if localrepo:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	630 bundletype = b"HG10BZ"
26543 a018cbabdb51 bundlerepo: indent some code to prepare next patch Pierre-Yves David <pierre-yves.david@fb.com> parents: 26399 diff changeset	631 else:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	632 bundletype = b"HG10UN"
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42823 diff changeset	633 fname = bundle = bundle2.writebundle(ui, cg, bundlename, bundletype)
12734 5dfd1c49dcc5 bundlerepo: unify common code into a new getremotechanges Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 12347 diff changeset	634 # keep written bundle?
5dfd1c49dcc5 bundlerepo: unify common code into a new getremotechanges Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 12347 diff changeset	635 if bundlename:
5dfd1c49dcc5 bundlerepo: unify common code into a new getremotechanges Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 12347 diff changeset	636 bundle = None
17191 5884812686f7 peer: introduce peer methods to prepare for peer classes Sune Foldager <cryo@cyanite.org> parents: 16686 diff changeset	637 if not localrepo:
12734 5dfd1c49dcc5 bundlerepo: unify common code into a new getremotechanges Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 12347 diff changeset	638 # use the created uncompressed bundlerepo
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42823 diff changeset	639 localrepo = bundlerepo = makebundlerepository(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42823 diff changeset	640 repo.baseui, repo.root, fname
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42823 diff changeset	641 )
39603 a8d2faeca49e bundlerepo: factor out code for instantiating a bundle repository Gregory Szorc <gregory.szorc@gmail.com> parents: 39602 diff changeset	642
37642 d959277ff1b5 bundlerepo: rename "other" to "peer" Gregory Szorc <gregory.szorc@gmail.com> parents: 37635 diff changeset	643 # this repo contains local and peer now, so filter out local again
14161 8a0fca925992 bundlerepo: fix and improve getremotechanges Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14158 diff changeset	644 common = repo.heads()
18568 cd403d6d96ef incoming: fix incoming when a local head is remotely filtered (issue3805) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18418 diff changeset	645 if localrepo:
cd403d6d96ef incoming: fix incoming when a local head is remotely filtered (issue3805) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18418 diff changeset	646 # Part of common may be remotely filtered
cd403d6d96ef incoming: fix incoming when a local head is remotely filtered (issue3805) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18418 diff changeset	647 # So use an unfiltered version
cd403d6d96ef incoming: fix incoming when a local head is remotely filtered (issue3805) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18418 diff changeset	648 # The discovery process probably need cleanup to avoid that
cd403d6d96ef incoming: fix incoming when a local head is remotely filtered (issue3805) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18418 diff changeset	649 localrepo = localrepo.unfiltered()
14161 8a0fca925992 bundlerepo: fix and improve getremotechanges Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14158 diff changeset	650
14412 9ac479758d3b bundlerepo: make getremotechanges support filtering of incoming Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14287 diff changeset	651 csets = localrepo.changelog.findmissing(common, rheads)
12734 5dfd1c49dcc5 bundlerepo: unify common code into a new getremotechanges Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 12347 diff changeset	652
23633 96c3cbec006f incoming: handle phases the same as pull Eric Sumner <ericsumner@fb.com> parents: 23632 diff changeset	653 if bundlerepo:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42823 diff changeset	654 reponodes = [ctx.node() for ctx in bundlerepo[bundlerepo.firstnewrev :]]
37643 1aa4d646d0de bundlerepo: use command executor for wire protocol commands Gregory Szorc <gregory.szorc@gmail.com> parents: 37642 diff changeset	655
1aa4d646d0de bundlerepo: use command executor for wire protocol commands Gregory Szorc <gregory.szorc@gmail.com> parents: 37642 diff changeset	656 with peer.commandexecutor() as e:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42823 diff changeset	657 remotephases = e.callcommand(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	658 b'listkeys', {b'namespace': b'phases',}
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42823 diff changeset	659 ).result()
23633 96c3cbec006f incoming: handle phases the same as pull Eric Sumner <ericsumner@fb.com> parents: 23632 diff changeset	660
37642 d959277ff1b5 bundlerepo: rename "other" to "peer" Gregory Szorc <gregory.szorc@gmail.com> parents: 37635 diff changeset	661 pullop = exchange.pulloperation(bundlerepo, peer, heads=reponodes)
23633 96c3cbec006f incoming: handle phases the same as pull Eric Sumner <ericsumner@fb.com> parents: 23632 diff changeset	662 pullop.trmanager = bundletransactionmanager()
96c3cbec006f incoming: handle phases the same as pull Eric Sumner <ericsumner@fb.com> parents: 23632 diff changeset	663 exchange._pullapplyphases(pullop, remotephases)
96c3cbec006f incoming: handle phases the same as pull Eric Sumner <ericsumner@fb.com> parents: 23632 diff changeset	664
14161 8a0fca925992 bundlerepo: fix and improve getremotechanges Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14158 diff changeset	665 def cleanup():
8a0fca925992 bundlerepo: fix and improve getremotechanges Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14158 diff changeset	666 if bundlerepo:
8a0fca925992 bundlerepo: fix and improve getremotechanges Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14158 diff changeset	667 bundlerepo.close()
8a0fca925992 bundlerepo: fix and improve getremotechanges Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14158 diff changeset	668 if bundle:
21694 c08a22bfa16e bundlerepo: backout dbf292f65b09 Matt Mackall <mpm@selenic.com> parents: 21562 diff changeset	669 os.unlink(bundle)
37642 d959277ff1b5 bundlerepo: rename "other" to "peer" Gregory Szorc <gregory.szorc@gmail.com> parents: 37635 diff changeset	670 peer.close()
14161 8a0fca925992 bundlerepo: fix and improve getremotechanges Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14158 diff changeset	671
8a0fca925992 bundlerepo: fix and improve getremotechanges Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14158 diff changeset	672 return (localrepo, csets, cleanup)

Mercurial > public > mercurial-scm > hg

annotate mercurial/bundlerepo.py @ 45814:88d5abec8f61