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

annotate mercurial/bundlerepo.py @ 47260:130c9f7ed914

revlog: add a "data compression mode" entry in the index tuple That will make it possible to keep track of compression information in the revlog index, opening the way to more efficient revision restoration (in native code, but the python usage is already defeating performance work). We start with adding a new entry to the index tuple, using a value matching the current behavior. We will introduce storage and other value in later changesets. Differential Revision: https://phab.mercurial-scm.org/D10646

author	Pierre-Yves David <pierre-yves.david@octobus.net>
date	Mon, 03 May 2021 18:19:16 +0200
parents	96ee8ca99f5a
children	2b69555e4875

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 _
46114 59fa3890d40a node: import symbols explicitly Joerg Sonnenberger <joerg@bec.de> parents: 45957 diff changeset	20 from .node import (
59fa3890d40a node: import symbols explicitly Joerg Sonnenberger <joerg@bec.de> parents: 45957 diff changeset	21 hex,
59fa3890d40a node: import symbols explicitly Joerg Sonnenberger <joerg@bec.de> parents: 45957 diff changeset	22 nullrev,
59fa3890d40a node: import symbols explicitly Joerg Sonnenberger <joerg@bec.de> parents: 45957 diff changeset	23 )
25920 5aaf51c14fea bundlerepo: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25830 diff changeset	24
5aaf51c14fea bundlerepo: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25830 diff changeset	25 from . import (
5aaf51c14fea bundlerepo: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25830 diff changeset	26 bundle2,
5aaf51c14fea bundlerepo: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25830 diff changeset	27 changegroup,
5aaf51c14fea bundlerepo: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25830 diff changeset	28 changelog,
5aaf51c14fea bundlerepo: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25830 diff changeset	29 cmdutil,
5aaf51c14fea bundlerepo: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25830 diff changeset	30 discovery,
39823 24e493ec2229 py3: rename pycompat.getcwd() to encoding.getcwd() (API) Matt Harbison <matt_harbison@yahoo.com> parents: 39779 diff changeset	31 encoding,
25920 5aaf51c14fea bundlerepo: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25830 diff changeset	32 error,
5aaf51c14fea bundlerepo: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25830 diff changeset	33 exchange,
5aaf51c14fea bundlerepo: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25830 diff changeset	34 filelog,
5aaf51c14fea bundlerepo: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25830 diff changeset	35 localrepo,
5aaf51c14fea bundlerepo: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25830 diff changeset	36 manifest,
5aaf51c14fea bundlerepo: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25830 diff changeset	37 mdiff,
5aaf51c14fea bundlerepo: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25830 diff changeset	38 pathutil,
5aaf51c14fea bundlerepo: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25830 diff changeset	39 phases,
30528 20a42325fdef py3: use pycompat.getcwd() instead of os.getcwd() Pulkit Goyal <7895pulkit@gmail.com> parents: 30385 diff changeset	40 pycompat,
25920 5aaf51c14fea bundlerepo: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25830 diff changeset	41 revlog,
5aaf51c14fea bundlerepo: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25830 diff changeset	42 util,
31250 5f68e7341ada vfs: use 'vfs' module directly in 'mercurial.bundlerepo' Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 30944 diff changeset	43 vfs as vfsmod,
25920 5aaf51c14fea bundlerepo: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25830 diff changeset	44 )
46907 ffd3e823a7e5 urlutil: extract `url` related code from `util` into the new module Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46793 diff changeset	45 from .utils import (
ffd3e823a7e5 urlutil: extract `url` related code from `util` into the new module Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46793 diff changeset	46 urlutil,
ffd3e823a7e5 urlutil: extract `url` related code from `util` into the new module Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46793 diff changeset	47 )
1942 9da45de3118d add bundlerepo.py: a read-only repo that can use uncompressed bundles Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	48
47089 4c041c71ec01 revlog: introduce an explicit tracking of what the revlog is about Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47055 diff changeset	49 from .revlogutils import (
4c041c71ec01 revlog: introduce an explicit tracking of what the revlog is about Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47055 diff changeset	50 constants as revlog_constants,
4c041c71ec01 revlog: introduce an explicit tracking of what the revlog is about Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47055 diff changeset	51 )
4c041c71ec01 revlog: introduce an explicit tracking of what the revlog is about Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47055 diff changeset	52
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42833 diff changeset	53
1946 9fee186f7f0d bundlerepo: remove relative import, fix a comment Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1942 diff changeset	54 class bundlerevlog(revlog.revlog):
47164 8d3c2f9d4af7 revlog: use a "radix" to address revlog Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47162 diff changeset	55 def __init__(self, opener, target, radix, 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	56 # How it works:
18410 de7dac2a58e8 bundlerepo: fix outdated comment Mads Kiilerich <madski@unity3d.com> parents: 18216 diff changeset	57 # 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	58 # 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	59 # (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	60 #
18410 de7dac2a58e8 bundlerepo: fix outdated comment Mads Kiilerich <madski@unity3d.com> parents: 18216 diff changeset	61 # 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	62 # check revision against repotiprev.
31250 5f68e7341ada vfs: use 'vfs' module directly in 'mercurial.bundlerepo' Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 30944 diff changeset	63 opener = vfsmod.readonlyvfs(opener)
47164 8d3c2f9d4af7 revlog: use a "radix" to address revlog Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47162 diff changeset	64 revlog.revlog.__init__(self, opener, target=target, radix=radix)
35099 90609be10891 bundlerepo: rename "bundle" arguments to "cgunpacker" Gregory Szorc <gregory.szorc@gmail.com> parents: 35098 diff changeset	65 self.bundle = cgunpacker
6750 fb42030d79d6 add __len__ and __iter__ methods to repo and revlog Matt Mackall <mpm@selenic.com> parents: 6647 diff changeset	66 n = len(self)
18643 cc28a84db8c9 bundlerepo: replace basemap with the base field in the index Mads Kiilerich <mads@kiilerich.com> parents: 18568 diff changeset	67 self.repotiprev = n - 1
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42833 diff changeset	68 self.bundlerevs = set() # used by 'bundle()' revset expression
35099 90609be10891 bundlerepo: rename "bundle" arguments to "cgunpacker" Gregory Szorc <gregory.szorc@gmail.com> parents: 35098 diff changeset	69 for deltadata in cgunpacker.deltaiter():
46724 a41565bef69f changegroup: add v4 changegroup for revlog v2 exchange Rapha?l Gom?s <rgomes@octobus.net> parents: 46114 diff changeset	70 node, p1, p2, cs, deltabase, delta, flags, sidedata = deltadata
14142 cb91ea6af733 bundlerepo: port to new bundle API Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 14076 diff changeset	71
cb91ea6af733 bundlerepo: port to new bundle API Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 14076 diff changeset	72 size = len(delta)
35099 90609be10891 bundlerepo: rename "bundle" arguments to "cgunpacker" Gregory Szorc <gregory.szorc@gmail.com> parents: 35098 diff changeset	73 start = cgunpacker.tell() - size
14142 cb91ea6af733 bundlerepo: port to new bundle API Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 14076 diff changeset	74
43590 5f347567589b index: use `index.has_node` in `bundlerepo.bundlerevlog` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 43581 diff changeset	75 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	76 # this can happen if two branches make the same change
43612 698e11f7be6a index: use `index.rev` in `bundlerepo.bundlerevlog` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 43590 diff changeset	77 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	78 continue
45833 88d5abec8f61 bundlerepo: don't insert index tuples with full nodes as linkrev Joerg Sonnenberger <joerg@bec.de> parents: 43612 diff changeset	79 if cs == node:
88d5abec8f61 bundlerepo: don't insert index tuples with full nodes as linkrev Joerg Sonnenberger <joerg@bec.de> parents: 43612 diff changeset	80 linkrev = nullrev
88d5abec8f61 bundlerepo: don't insert index tuples with full nodes as linkrev Joerg Sonnenberger <joerg@bec.de> parents: 43612 diff changeset	81 else:
88d5abec8f61 bundlerepo: don't insert index tuples with full nodes as linkrev Joerg Sonnenberger <joerg@bec.de> parents: 43612 diff changeset	82 linkrev = linkmapper(cs)
14142 cb91ea6af733 bundlerepo: port to new bundle API Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 14076 diff changeset	83
1942 9da45de3118d add bundlerepo.py: a read-only repo that can use uncompressed bundles Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	84 for p in (p1, p2):
43590 5f347567589b index: use `index.has_node` in `bundlerepo.bundlerevlog` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 43581 diff changeset	85 if not self.index.has_node(p):
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42833 diff changeset	86 raise error.LookupError(
47169 96ee8ca99f5a revlog: use revlog.display_id in LookupError Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47164 diff changeset	87 p, self.display_id, _(b"unknown parent")
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42833 diff changeset	88 )
18416 87f370c5fef5 bundlerepo: store validated deltabase rev in basemap instead of node Mads Kiilerich <madski@unity3d.com> parents: 18415 diff changeset	89
43590 5f347567589b index: use `index.has_node` in `bundlerepo.bundlerevlog` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 43581 diff changeset	90 if not self.index.has_node(deltabase):
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42833 diff changeset	91 raise LookupError(
47169 96ee8ca99f5a revlog: use revlog.display_id in LookupError Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47164 diff changeset	92 deltabase, self.display_id, _(b'unknown delta base')
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42833 diff changeset	93 )
18416 87f370c5fef5 bundlerepo: store validated deltabase rev in basemap instead of node Mads Kiilerich <madski@unity3d.com> parents: 18415 diff changeset	94
87f370c5fef5 bundlerepo: store validated deltabase rev in basemap instead of node Mads Kiilerich <madski@unity3d.com> parents: 18415 diff changeset	95 baserev = self.rev(deltabase)
47157 47ffc754989a revlog: always "append" full size tuple Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47089 diff changeset	96 # start, size, full unc. size, base (unused), link, p1, p2, node, sidedata_offset (unused), sidedata_size (unused)
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42833 diff changeset	97 e = (
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42833 diff changeset	98 revlog.offset_type(start, flags),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42833 diff changeset	99 size,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42833 diff changeset	100 -1,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42833 diff changeset	101 baserev,
45833 88d5abec8f61 bundlerepo: don't insert index tuples with full nodes as linkrev Joerg Sonnenberger <joerg@bec.de> parents: 43612 diff changeset	102 linkrev,
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42833 diff changeset	103 self.rev(p1),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42833 diff changeset	104 self.rev(p2),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42833 diff changeset	105 node,
47157 47ffc754989a revlog: always "append" full size tuple Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47089 diff changeset	106 0,
47ffc754989a revlog: always "append" full size tuple Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47089 diff changeset	107 0,
47260 130c9f7ed914 revlog: add a "data compression mode" entry in the index tuple Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47169 diff changeset	108 revlog_constants.COMP_MODE_INLINE,
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42833 diff changeset	109 )
38889 6104b203bec8 index: replace insert(-1, e) method by append(e) method Martin von Zweigbergk <martinvonz@google.com> parents: 38198 diff changeset	110 self.index.append(e)
18411 8b0f0dd56cec bundlerepo: improve performance for bundle() revset expression Mads Kiilerich <madski@unity3d.com> parents: 18410 diff changeset	111 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	112 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	113
35070 32d079f37207 bundlerepo: make methods agree with base class Gregory Szorc <gregory.szorc@gmail.com> parents: 35050 diff changeset	114 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	115 # 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	116 # 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	117 # 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	118 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	119 return revlog.revlog._chunk(self, rev)
12332 680fe77ab5b8 bundlerepo: use bundle objects everywhere Matt Mackall <mpm@selenic.com> parents: 12331 diff changeset	120 self.bundle.seek(self.start(rev))
680fe77ab5b8 bundlerepo: use bundle objects everywhere Matt Mackall <mpm@selenic.com> parents: 12331 diff changeset	121 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	122
9da45de3118d add bundlerepo.py: a read-only repo that can use uncompressed bundles Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	123 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	124 """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	125 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	126 # 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	127 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	128 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	129 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	130 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	131 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	132
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42833 diff changeset	133 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	134
42831 c070ca6ed86d bundlerepo: simplify code to take advantage of `_rawtext` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 42786 diff changeset	135 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: 42786 diff changeset	136 if rev is None:
16375 d7d64b89a65c revlog: allow retrieving contents by revision number Matt Mackall <mpm@selenic.com> parents: 16195 diff changeset	137 rev = self.rev(node)
42831 c070ca6ed86d bundlerepo: simplify code to take advantage of `_rawtext` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 42786 diff changeset	138 validated = False
31836 4598e8f43e20 bundlerepo: fix raw handling in revision() Jun Wu <quark@fb.com> parents: 31835 diff changeset	139 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	140 chain = []
18415 95b8629fd2de bundlerepo: use rev instead of node for iteration in revision() Mads Kiilerich <madski@unity3d.com> parents: 18414 diff changeset	141 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	142 # 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	143 while iterrev > self.repotiprev:
40053 55db747a21ad revlog: rename _cache to _revisioncache Gregory Szorc <gregory.szorc@gmail.com> parents: 39945 diff changeset	144 if self._revisioncache and self._revisioncache[1] == iterrev:
55db747a21ad revlog: rename _cache to _revisioncache Gregory Szorc <gregory.szorc@gmail.com> parents: 39945 diff changeset	145 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	146 break
18415 95b8629fd2de bundlerepo: use rev instead of node for iteration in revision() Mads Kiilerich <madski@unity3d.com> parents: 18414 diff changeset	147 chain.append(iterrev)
18643 cc28a84db8c9 bundlerepo: replace basemap with the base field in the index Mads Kiilerich <mads@kiilerich.com> parents: 18568 diff changeset	148 iterrev = self.index[iterrev][3]
42831 c070ca6ed86d bundlerepo: simplify code to take advantage of `_rawtext` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 42786 diff changeset	149 if iterrev == nullrev:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	150 rawtext = b''
42831 c070ca6ed86d bundlerepo: simplify code to take advantage of `_rawtext` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 42786 diff changeset	151 elif rawtext is None:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42833 diff changeset	152 r = super(bundlerevlog, self)._rawtext(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42833 diff changeset	153 self.node(iterrev), iterrev, _df=_df
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42833 diff changeset	154 )
42831 c070ca6ed86d bundlerepo: simplify code to take advantage of `_rawtext` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 42786 diff changeset	155 __, rawtext, validated = r
c070ca6ed86d bundlerepo: simplify code to take advantage of `_rawtext` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 42786 diff changeset	156 if chain:
c070ca6ed86d bundlerepo: simplify code to take advantage of `_rawtext` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 42786 diff changeset	157 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	158 while chain:
9676 48bf28d3c8dd bundlerepo: keep the bundlerevlog interface in sync with revlog Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 9650 diff changeset	159 delta = self._chunk(chain.pop())
31836 4598e8f43e20 bundlerepo: fix raw handling in revision() Jun Wu <quark@fb.com> parents: 31835 diff changeset	160 rawtext = mdiff.patches(rawtext, [delta])
42831 c070ca6ed86d bundlerepo: simplify code to take advantage of `_rawtext` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 42786 diff changeset	161 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	162
35070 32d079f37207 bundlerepo: make methods agree with base class Gregory Szorc <gregory.szorc@gmail.com> parents: 35050 diff changeset	163 def addrevision(self, args, *kwargs):
32d079f37207 bundlerepo: make methods agree with base class Gregory Szorc <gregory.szorc@gmail.com> parents: 35050 diff changeset	164 raise NotImplementedError
32d079f37207 bundlerepo: make methods agree with base class Gregory Szorc <gregory.szorc@gmail.com> parents: 35050 diff changeset	165
32d079f37207 bundlerepo: make methods agree with base class Gregory Szorc <gregory.szorc@gmail.com> parents: 35050 diff changeset	166 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	167 raise NotImplementedError
35070 32d079f37207 bundlerepo: make methods agree with base class Gregory Szorc <gregory.szorc@gmail.com> parents: 35050 diff changeset	168
32d079f37207 bundlerepo: make methods agree with base class Gregory Szorc <gregory.szorc@gmail.com> parents: 35050 diff changeset	169 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	170 raise NotImplementedError
35070 32d079f37207 bundlerepo: make methods agree with base class Gregory Szorc <gregory.szorc@gmail.com> parents: 35050 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 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	173 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	174
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42833 diff changeset	175
1946 9fee186f7f0d bundlerepo: remove relative import, fix a comment Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1942 diff changeset	176 class bundlechangelog(bundlerevlog, changelog.changelog):
35099 90609be10891 bundlerepo: rename "bundle" arguments to "cgunpacker" Gregory Szorc <gregory.szorc@gmail.com> parents: 35098 diff changeset	177 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	178 changelog.changelog.__init__(self, opener)
14142 cb91ea6af733 bundlerepo: port to new bundle API Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 14076 diff changeset	179 linkmapper = lambda x: x
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42833 diff changeset	180 bundlerevlog.__init__(
47089 4c041c71ec01 revlog: introduce an explicit tracking of what the revlog is about Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47055 diff changeset	181 self,
4c041c71ec01 revlog: introduce an explicit tracking of what the revlog is about Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47055 diff changeset	182 opener,
4c041c71ec01 revlog: introduce an explicit tracking of what the revlog is about Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47055 diff changeset	183 (revlog_constants.KIND_CHANGELOG, None),
47164 8d3c2f9d4af7 revlog: use a "radix" to address revlog Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47162 diff changeset	184 self.radix,
47089 4c041c71ec01 revlog: introduce an explicit tracking of what the revlog is about Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47055 diff changeset	185 cgunpacker,
4c041c71ec01 revlog: introduce an explicit tracking of what the revlog is about Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47055 diff changeset	186 linkmapper,
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42833 diff changeset	187 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42833 diff changeset	188
1942 9da45de3118d add bundlerepo.py: a read-only repo that can use uncompressed bundles Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	189
30383 31de088945cd manifest: add bundlemanifestlog support Durham Goode <durham@fb.com> parents: 30218 diff changeset	190 class bundlemanifest(bundlerevlog, manifest.manifestrevlog):
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42833 diff changeset	191 def __init__(
46793 6266d19556ad node: introduce nodeconstants class Joerg Sonnenberger <joerg@bec.de> parents: 46724 diff changeset	192 self,
6266d19556ad node: introduce nodeconstants class Joerg Sonnenberger <joerg@bec.de> parents: 46724 diff changeset	193 nodeconstants,
6266d19556ad node: introduce nodeconstants class Joerg Sonnenberger <joerg@bec.de> parents: 46724 diff changeset	194 opener,
6266d19556ad node: introduce nodeconstants class Joerg Sonnenberger <joerg@bec.de> parents: 46724 diff changeset	195 cgunpacker,
6266d19556ad node: introduce nodeconstants class Joerg Sonnenberger <joerg@bec.de> parents: 46724 diff changeset	196 linkmapper,
6266d19556ad node: introduce nodeconstants class Joerg Sonnenberger <joerg@bec.de> parents: 46724 diff changeset	197 dirlogstarts=None,
6266d19556ad node: introduce nodeconstants class Joerg Sonnenberger <joerg@bec.de> parents: 46724 diff changeset	198 dir=b'',
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42833 diff changeset	199 ):
46793 6266d19556ad node: introduce nodeconstants class Joerg Sonnenberger <joerg@bec.de> parents: 46724 diff changeset	200 manifest.manifestrevlog.__init__(self, nodeconstants, opener, tree=dir)
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42833 diff changeset	201 bundlerevlog.__init__(
47089 4c041c71ec01 revlog: introduce an explicit tracking of what the revlog is about Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47055 diff changeset	202 self,
4c041c71ec01 revlog: introduce an explicit tracking of what the revlog is about Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47055 diff changeset	203 opener,
4c041c71ec01 revlog: introduce an explicit tracking of what the revlog is about Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47055 diff changeset	204 (revlog_constants.KIND_MANIFESTLOG, dir),
47164 8d3c2f9d4af7 revlog: use a "radix" to address revlog Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47162 diff changeset	205 self._revlog.radix,
47089 4c041c71ec01 revlog: introduce an explicit tracking of what the revlog is about Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47055 diff changeset	206 cgunpacker,
4c041c71ec01 revlog: introduce an explicit tracking of what the revlog is about Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47055 diff changeset	207 linkmapper,
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42833 diff changeset	208 )
29728 55d341877316 bundlerepo: add support for treemanifests in cg3 bundles Augie Fackler <augie@google.com> parents: 29726 diff changeset	209 if dirlogstarts is None:
55d341877316 bundlerepo: add support for treemanifests in cg3 bundles Augie Fackler <augie@google.com> parents: 29726 diff changeset	210 dirlogstarts = {}
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	211 if self.bundle.version == b"03":
29728 55d341877316 bundlerepo: add support for treemanifests in cg3 bundles Augie Fackler <augie@google.com> parents: 29726 diff changeset	212 dirlogstarts = _getfilestarts(self.bundle)
55d341877316 bundlerepo: add support for treemanifests in cg3 bundles Augie Fackler <augie@google.com> parents: 29726 diff changeset	213 self._dirlogstarts = dirlogstarts
55d341877316 bundlerepo: add support for treemanifests in cg3 bundles Augie Fackler <augie@google.com> parents: 29726 diff changeset	214 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	215
29728 55d341877316 bundlerepo: add support for treemanifests in cg3 bundles Augie Fackler <augie@google.com> parents: 29726 diff changeset	216 def dirlog(self, d):
55d341877316 bundlerepo: add support for treemanifests in cg3 bundles Augie Fackler <augie@google.com> parents: 29726 diff changeset	217 if d in self._dirlogstarts:
55d341877316 bundlerepo: add support for treemanifests in cg3 bundles Augie Fackler <augie@google.com> parents: 29726 diff changeset	218 self.bundle.seek(self._dirlogstarts[d])
55d341877316 bundlerepo: add support for treemanifests in cg3 bundles Augie Fackler <augie@google.com> parents: 29726 diff changeset	219 return bundlemanifest(
46793 6266d19556ad node: introduce nodeconstants class Joerg Sonnenberger <joerg@bec.de> parents: 46724 diff changeset	220 self.nodeconstants,
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42833 diff changeset	221 self.opener,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42833 diff changeset	222 self.bundle,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42833 diff changeset	223 self._linkmapper,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42833 diff changeset	224 self._dirlogstarts,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42833 diff changeset	225 dir=d,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42833 diff changeset	226 )
29728 55d341877316 bundlerepo: add support for treemanifests in cg3 bundles Augie Fackler <augie@google.com> parents: 29726 diff changeset	227 return super(bundlemanifest, self).dirlog(d)
55d341877316 bundlerepo: add support for treemanifests in cg3 bundles Augie Fackler <augie@google.com> parents: 29726 diff changeset	228
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42833 diff changeset	229
37497 1541e1a8e87d filelog: wrap revlog instead of inheriting it (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 37331 diff changeset	230 class bundlefilelog(filelog.filelog):
35099 90609be10891 bundlerepo: rename "bundle" arguments to "cgunpacker" Gregory Szorc <gregory.szorc@gmail.com> parents: 35098 diff changeset	231 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	232 filelog.filelog.__init__(self, opener, path)
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42833 diff changeset	233 self._revlog = bundlerevlog(
47089 4c041c71ec01 revlog: introduce an explicit tracking of what the revlog is about Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47055 diff changeset	234 opener,
4c041c71ec01 revlog: introduce an explicit tracking of what the revlog is about Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47055 diff changeset	235 # XXX should use the unencoded path
4c041c71ec01 revlog: introduce an explicit tracking of what the revlog is about Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47055 diff changeset	236 target=(revlog_constants.KIND_FILELOG, path),
47164 8d3c2f9d4af7 revlog: use a "radix" to address revlog Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47162 diff changeset	237 radix=self._revlog.radix,
47089 4c041c71ec01 revlog: introduce an explicit tracking of what the revlog is about Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47055 diff changeset	238 cgunpacker=cgunpacker,
4c041c71ec01 revlog: introduce an explicit tracking of what the revlog is about Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47055 diff changeset	239 linkmapper=linkmapper,
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42833 diff changeset	240 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42833 diff changeset	241
14287 7c231754a621 filelog: add file function to open other filelogs Sune Foldager <cryo@cyanite.org> parents: 14190 diff changeset	242
17193 1d710fe5ee0e peer: introduce canpush and improve error message Sune Foldager <cryo@cyanite.org> parents: 17191 diff changeset	243 class bundlepeer(localrepo.localpeer):
1d710fe5ee0e peer: introduce canpush and improve error message Sune Foldager <cryo@cyanite.org> parents: 17191 diff changeset	244 def canpush(self):
1d710fe5ee0e peer: introduce canpush and improve error message Sune Foldager <cryo@cyanite.org> parents: 17191 diff changeset	245 return False
1d710fe5ee0e peer: introduce canpush and improve error message Sune Foldager <cryo@cyanite.org> parents: 17191 diff changeset	246
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42833 diff changeset	247
23631 b8260abfeb7d bundlerepo: implement safe phasecache Eric Sumner <ericsumner@fb.com> parents: 22182 diff changeset	248 class bundlephasecache(phases.phasecache):
b8260abfeb7d bundlerepo: implement safe phasecache Eric Sumner <ericsumner@fb.com> parents: 22182 diff changeset	249 def __init__(self, args, *kwargs):
b8260abfeb7d bundlerepo: implement safe phasecache Eric Sumner <ericsumner@fb.com> parents: 22182 diff changeset	250 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	251 if util.safehasattr(self, 'opener'):
31250 5f68e7341ada vfs: use 'vfs' module directly in 'mercurial.bundlerepo' Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 30944 diff changeset	252 self.opener = vfsmod.readonlyvfs(self.opener)
23631 b8260abfeb7d bundlerepo: implement safe phasecache Eric Sumner <ericsumner@fb.com> parents: 22182 diff changeset	253
b8260abfeb7d bundlerepo: implement safe phasecache Eric Sumner <ericsumner@fb.com> parents: 22182 diff changeset	254 def write(self):
b8260abfeb7d bundlerepo: implement safe phasecache Eric Sumner <ericsumner@fb.com> parents: 22182 diff changeset	255 raise NotImplementedError
b8260abfeb7d bundlerepo: implement safe phasecache Eric Sumner <ericsumner@fb.com> parents: 22182 diff changeset	256
b8260abfeb7d bundlerepo: implement safe phasecache Eric Sumner <ericsumner@fb.com> parents: 22182 diff changeset	257 def _write(self, fp):
b8260abfeb7d bundlerepo: implement safe phasecache Eric Sumner <ericsumner@fb.com> parents: 22182 diff changeset	258 raise NotImplementedError
b8260abfeb7d bundlerepo: implement safe phasecache Eric Sumner <ericsumner@fb.com> parents: 22182 diff changeset	259
b8260abfeb7d bundlerepo: implement safe phasecache Eric Sumner <ericsumner@fb.com> parents: 22182 diff changeset	260 def _updateroots(self, phase, newroots, tr):
b8260abfeb7d bundlerepo: implement safe phasecache Eric Sumner <ericsumner@fb.com> parents: 22182 diff changeset	261 self.phaseroots[phase] = newroots
b8260abfeb7d bundlerepo: implement safe phasecache Eric Sumner <ericsumner@fb.com> parents: 22182 diff changeset	262 self.invalidate()
b8260abfeb7d bundlerepo: implement safe phasecache Eric Sumner <ericsumner@fb.com> parents: 22182 diff changeset	263 self.dirty = True
b8260abfeb7d bundlerepo: implement safe phasecache Eric Sumner <ericsumner@fb.com> parents: 22182 diff changeset	264
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42833 diff changeset	265
35099 90609be10891 bundlerepo: rename "bundle" arguments to "cgunpacker" Gregory Szorc <gregory.szorc@gmail.com> parents: 35098 diff changeset	266 def _getfilestarts(cgunpacker):
35100 cd4cd7b94ff1 bundlerepo: rename "bundlefilespos" variable and attribute Gregory Szorc <gregory.szorc@gmail.com> parents: 35099 diff changeset	267 filespos = {}
35099 90609be10891 bundlerepo: rename "bundle" arguments to "cgunpacker" Gregory Szorc <gregory.szorc@gmail.com> parents: 35098 diff changeset	268 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	269 fname = chunkdata[b'filename']
35100 cd4cd7b94ff1 bundlerepo: rename "bundlefilespos" variable and attribute Gregory Szorc <gregory.szorc@gmail.com> parents: 35099 diff changeset	270 filespos[fname] = cgunpacker.tell()
35099 90609be10891 bundlerepo: rename "bundle" arguments to "cgunpacker" Gregory Szorc <gregory.szorc@gmail.com> parents: 35098 diff changeset	271 for chunk in iter(lambda: cgunpacker.deltachunk(None), {}):
29725 9e88077f972c bundlerepo: introduce method to find file starts and use it Augie Fackler <augie@google.com> parents: 29724 diff changeset	272 pass
35100 cd4cd7b94ff1 bundlerepo: rename "bundlefilespos" variable and attribute Gregory Szorc <gregory.szorc@gmail.com> parents: 35099 diff changeset	273 return filespos
29725 9e88077f972c bundlerepo: introduce method to find file starts and use it Augie Fackler <augie@google.com> parents: 29724 diff changeset	274
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42833 diff changeset	275
39620 335ae4d0a552 bundlerepo: dynamically create repository type from base repository Gregory Szorc <gregory.szorc@gmail.com> parents: 39619 diff changeset	276 class bundlerepository(object):
35073 d2458ba810c5 bundlerepo: add docstring for bundlerepository class Gregory Szorc <gregory.szorc@gmail.com> parents: 35072 diff changeset	277 """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: 35072 diff changeset	278
d2458ba810c5 bundlerepo: add docstring for bundlerepository class Gregory Szorc <gregory.szorc@gmail.com> parents: 35072 diff changeset	279 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: 35072 diff changeset	280 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: 35072 diff changeset	281 conceptually similar to the state of a repository after an
d2458ba810c5 bundlerepo: add docstring for bundlerepository class Gregory Szorc <gregory.szorc@gmail.com> parents: 35072 diff changeset	282 ``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: 35072 diff changeset	283 applied to the actual base repository.
39620 335ae4d0a552 bundlerepo: dynamically create repository type from base repository Gregory Szorc <gregory.szorc@gmail.com> parents: 39619 diff changeset	284
335ae4d0a552 bundlerepo: dynamically create repository type from base repository Gregory Szorc <gregory.szorc@gmail.com> parents: 39619 diff changeset	285 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: 39619 diff changeset	286 Use instance() or makebundlerepository() to create instances.
35073 d2458ba810c5 bundlerepo: add docstring for bundlerepository class Gregory Szorc <gregory.szorc@gmail.com> parents: 35072 diff changeset	287 """
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42833 diff changeset	288
39620 335ae4d0a552 bundlerepo: dynamically create repository type from base repository Gregory Szorc <gregory.szorc@gmail.com> parents: 39619 diff changeset	289 def __init__(self, bundlepath, url, tempparent):
335ae4d0a552 bundlerepo: dynamically create repository type from base repository Gregory Szorc <gregory.szorc@gmail.com> parents: 39619 diff changeset	290 self._tempparent = tempparent
335ae4d0a552 bundlerepo: dynamically create repository type from base repository Gregory Szorc <gregory.szorc@gmail.com> parents: 39619 diff changeset	291 self._url = url
335ae4d0a552 bundlerepo: dynamically create repository type from base repository Gregory Szorc <gregory.szorc@gmail.com> parents: 39619 diff changeset	292
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	293 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	294
2273 f116ddea537f add support for compressed bundle repositories Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2257 diff changeset	295 self.tempfile = None
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	296 f = util.posixfile(bundlepath, b"rb")
39620 335ae4d0a552 bundlerepo: dynamically create repository type from base repository Gregory Szorc <gregory.szorc@gmail.com> parents: 39619 diff changeset	297 bundle = exchange.readbundle(self.ui, f, bundlepath)
12044 bcc7139521b7 bundlerepo: remove duplication of bundle decompressors Matt Mackall <mpm@selenic.com> parents: 11154 diff changeset	298
35076 495fcff10124 bundlerepo: assign bundle attributes in bundle type blocks Gregory Szorc <gregory.szorc@gmail.com> parents: 35075 diff changeset	299 if isinstance(bundle, bundle2.unbundle20):
495fcff10124 bundlerepo: assign bundle attributes in bundle type blocks Gregory Szorc <gregory.szorc@gmail.com> parents: 35075 diff changeset	300 self._bundlefile = bundle
35077 3f393e4593f2 bundlerepo: rename _bundle to _cgunpacker Gregory Szorc <gregory.szorc@gmail.com> parents: 35076 diff changeset	301 self._cgunpacker = None
35076 495fcff10124 bundlerepo: assign bundle attributes in bundle type blocks Gregory Szorc <gregory.szorc@gmail.com> parents: 35075 diff changeset	302
35136 2b72bc88043f bundle2: only seek to beginning of part in bundlerepo Gregory Szorc <gregory.szorc@gmail.com> parents: 35100 diff changeset	303 cgpart = None
35137 da91e7309daf bundle2: don't use seekable bundle2 parts by default (issue5691) Gregory Szorc <gregory.szorc@gmail.com> parents: 35136 diff changeset	304 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	305 if part.type == b'changegroup':
35136 2b72bc88043f bundle2: only seek to beginning of part in bundlerepo Gregory Szorc <gregory.szorc@gmail.com> parents: 35100 diff changeset	306 if cgpart:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42833 diff changeset	307 raise NotImplementedError(
43117 8ff1ecfadcd1 cleanup: join string literals that are already on one line Martin von Zweigbergk <martinvonz@google.com> parents: 43115 diff changeset	308 b"can't process multiple changegroups"
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42833 diff changeset	309 )
35136 2b72bc88043f bundle2: only seek to beginning of part in bundlerepo Gregory Szorc <gregory.szorc@gmail.com> parents: 35100 diff changeset	310 cgpart = part
24073 ff5caa8dfd99 bundlerepo: basic bundle2 support Eric Sumner <ericsumner@fb.com> parents: 24072 diff changeset	311
35076 495fcff10124 bundlerepo: assign bundle attributes in bundle type blocks Gregory Szorc <gregory.szorc@gmail.com> parents: 35075 diff changeset	312 self._handlebundle2part(bundle, part)
24073 ff5caa8dfd99 bundlerepo: basic bundle2 support Eric Sumner <ericsumner@fb.com> parents: 24072 diff changeset	313
35136 2b72bc88043f bundle2: only seek to beginning of part in bundlerepo Gregory Szorc <gregory.szorc@gmail.com> parents: 35100 diff changeset	314 if not cgpart:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	315 raise error.Abort(_(b"No changegroups found"))
35136 2b72bc88043f bundle2: only seek to beginning of part in bundlerepo Gregory Szorc <gregory.szorc@gmail.com> parents: 35100 diff changeset	316
2b72bc88043f bundle2: only seek to beginning of part in bundlerepo Gregory Szorc <gregory.szorc@gmail.com> parents: 35100 diff changeset	317 # 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: 35100 diff changeset	318 # 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: 35100 diff changeset	319 # 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: 35100 diff changeset	320 # 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: 35100 diff changeset	321 # generator returns control to iterparts().
2b72bc88043f bundle2: only seek to beginning of part in bundlerepo Gregory Szorc <gregory.szorc@gmail.com> parents: 35100 diff changeset	322 cgpart.seek(0, os.SEEK_SET)
2b72bc88043f bundle2: only seek to beginning of part in bundlerepo Gregory Szorc <gregory.szorc@gmail.com> parents: 35100 diff changeset	323
35076 495fcff10124 bundlerepo: assign bundle attributes in bundle type blocks Gregory Szorc <gregory.szorc@gmail.com> parents: 35075 diff changeset	324 elif isinstance(bundle, changegroup.cg1unpacker):
495fcff10124 bundlerepo: assign bundle attributes in bundle type blocks Gregory Szorc <gregory.szorc@gmail.com> parents: 35075 diff changeset	325 if bundle.compressed():
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42833 diff changeset	326 f = self._writetempbundle(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	327 bundle.read, b'.hg10un', header=b'HG10UN'
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42833 diff changeset	328 )
39620 335ae4d0a552 bundlerepo: dynamically create repository type from base repository Gregory Szorc <gregory.szorc@gmail.com> parents: 39619 diff changeset	329 bundle = exchange.readbundle(self.ui, f, bundlepath, self.vfs)
35076 495fcff10124 bundlerepo: assign bundle attributes in bundle type blocks Gregory Szorc <gregory.szorc@gmail.com> parents: 35075 diff changeset	330
495fcff10124 bundlerepo: assign bundle attributes in bundle type blocks Gregory Szorc <gregory.szorc@gmail.com> parents: 35075 diff changeset	331 self._bundlefile = bundle
35077 3f393e4593f2 bundlerepo: rename _bundle to _cgunpacker Gregory Szorc <gregory.szorc@gmail.com> parents: 35076 diff changeset	332 self._cgunpacker = bundle
35074 4f04c9207a76 bundlerepo: don't assume there are only two bundle classes Gregory Szorc <gregory.szorc@gmail.com> parents: 35073 diff changeset	333 else:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	334 raise error.Abort(
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	335 _(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	336 )
26801 73bf76bf6f14 bundlerepo: uncompress changegroup in bundle1 case only Pierre-Yves David <pierre-yves.david@fb.com> parents: 26800 diff changeset	337
35100 cd4cd7b94ff1 bundlerepo: rename "bundlefilespos" variable and attribute Gregory Szorc <gregory.szorc@gmail.com> parents: 35099 diff changeset	338 # dict with the mapping 'filename' -> position in the changegroup.
cd4cd7b94ff1 bundlerepo: rename "bundlefilespos" variable and attribute Gregory Szorc <gregory.szorc@gmail.com> parents: 35099 diff changeset	339 self._cgfilespos = {}
5262 a35756389ef4 Make bundlerepo lazier Brendan Cully <brendan@kublai.com> parents: 5167 diff changeset	340
23632 e7fcf58acd71 bundlerepo: retract phase boundary Eric Sumner <ericsumner@fb.com> parents: 23631 diff changeset	341 self.firstnewrev = self.changelog.repotiprev + 1
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42833 diff changeset	342 phases.retractboundary(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42833 diff changeset	343 self,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42833 diff changeset	344 None,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42833 diff changeset	345 phases.draft,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42833 diff changeset	346 [ctx.node() for ctx in self[self.firstnewrev :]],
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42833 diff changeset	347 )
23632 e7fcf58acd71 bundlerepo: retract phase boundary Eric Sumner <ericsumner@fb.com> parents: 23631 diff changeset	348
35076 495fcff10124 bundlerepo: assign bundle attributes in bundle type blocks Gregory Szorc <gregory.szorc@gmail.com> parents: 35075 diff changeset	349 def _handlebundle2part(self, bundle, part):
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	350 if part.type != b'changegroup':
35098 3eeb0a3eeaed bundlerepo: use early return Gregory Szorc <gregory.szorc@gmail.com> parents: 35077 diff changeset	351 return
33907 f672d060a931 bundlerepo: move bundle2 part handling out to a function Durham Goode <durham@fb.com> parents: 33906 diff changeset	352
35098 3eeb0a3eeaed bundlerepo: use early return Gregory Szorc <gregory.szorc@gmail.com> parents: 35077 diff changeset	353 cgstream = part
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	354 version = part.params.get(b'version', b'01')
35098 3eeb0a3eeaed bundlerepo: use early return Gregory Szorc <gregory.szorc@gmail.com> parents: 35077 diff changeset	355 legalcgvers = changegroup.supportedincomingversions(self)
3eeb0a3eeaed bundlerepo: use early return Gregory Szorc <gregory.szorc@gmail.com> parents: 35077 diff changeset	356 if version not in legalcgvers:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	357 msg = _(b'Unsupported changegroup version: %s')
35098 3eeb0a3eeaed bundlerepo: use early return Gregory Szorc <gregory.szorc@gmail.com> parents: 35077 diff changeset	358 raise error.Abort(msg % version)
3eeb0a3eeaed bundlerepo: use early return Gregory Szorc <gregory.szorc@gmail.com> parents: 35077 diff changeset	359 if bundle.compressed():
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	360 cgstream = self._writetempbundle(part.read, b'.cg%sun' % version)
35098 3eeb0a3eeaed bundlerepo: use early return Gregory Szorc <gregory.szorc@gmail.com> parents: 35077 diff changeset	361
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	362 self._cgunpacker = changegroup.getunbundler(version, cgstream, b'UN')
33907 f672d060a931 bundlerepo: move bundle2 part handling out to a function Durham Goode <durham@fb.com> parents: 33906 diff changeset	363
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	364 def _writetempbundle(self, readfn, suffix, header=b''):
45957 89a2afe31e82 formating: upgrade to black 20.8b1 Augie Fackler <raf@durin42.com> parents: 45833 diff changeset	365 """Write a temporary file to disk"""
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	366 fdtemp, temp = self.vfs.mkstemp(prefix=b"hg-bundle-", suffix=suffix)
33905 702a26fec3e2 bundlerepo: move temp bundle creation to a separate function Durham Goode <durham@fb.com> parents: 33184 diff changeset	367 self.tempfile = temp
702a26fec3e2 bundlerepo: move temp bundle creation to a separate function Durham Goode <durham@fb.com> parents: 33184 diff changeset	368
43554 9f70512ae2cf cleanup: remove pointless r-prefixes on single-quoted strings Augie Fackler <augie@google.com> parents: 43117 diff changeset	369 with os.fdopen(fdtemp, 'wb') as fptemp:
33905 702a26fec3e2 bundlerepo: move temp bundle creation to a separate function Durham Goode <durham@fb.com> parents: 33184 diff changeset	370 fptemp.write(header)
702a26fec3e2 bundlerepo: move temp bundle creation to a separate function Durham Goode <durham@fb.com> parents: 33184 diff changeset	371 while True:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42833 diff changeset	372 chunk = readfn(2 ** 18)
33905 702a26fec3e2 bundlerepo: move temp bundle creation to a separate function Durham Goode <durham@fb.com> parents: 33184 diff changeset	373 if not chunk:
702a26fec3e2 bundlerepo: move temp bundle creation to a separate function Durham Goode <durham@fb.com> parents: 33184 diff changeset	374 break
702a26fec3e2 bundlerepo: move temp bundle creation to a separate function Durham Goode <durham@fb.com> parents: 33184 diff changeset	375 fptemp.write(chunk)
702a26fec3e2 bundlerepo: move temp bundle creation to a separate function Durham Goode <durham@fb.com> parents: 33184 diff changeset	376
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	377 return self.vfs.open(self.tempfile, mode=b"rb")
33905 702a26fec3e2 bundlerepo: move temp bundle creation to a separate function Durham Goode <durham@fb.com> parents: 33184 diff changeset	378
18014 a39fe76c4c65 clfilter: ensure that filecache on localrepo is unfiltered Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17913 diff changeset	379 @localrepo.unfilteredpropertycache
23631 b8260abfeb7d bundlerepo: implement safe phasecache Eric Sumner <ericsumner@fb.com> parents: 22182 diff changeset	380 def _phasecache(self):
b8260abfeb7d bundlerepo: implement safe phasecache Eric Sumner <ericsumner@fb.com> parents: 22182 diff changeset	381 return bundlephasecache(self, self._phasedefaults)
b8260abfeb7d bundlerepo: implement safe phasecache Eric Sumner <ericsumner@fb.com> parents: 22182 diff changeset	382
b8260abfeb7d bundlerepo: implement safe phasecache Eric Sumner <ericsumner@fb.com> parents: 22182 diff changeset	383 @localrepo.unfilteredpropertycache
8260 54a4b520bd7d localrepo: use propertycache Matt Mackall <mpm@selenic.com> parents: 8227 diff changeset	384 def changelog(self):
14144 3c3c53d8343a unbundler: separate delta and header parsing Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 14142 diff changeset	385 # consume the header if it exists
35077 3f393e4593f2 bundlerepo: rename _bundle to _cgunpacker Gregory Szorc <gregory.szorc@gmail.com> parents: 35076 diff changeset	386 self._cgunpacker.changelogheader()
3f393e4593f2 bundlerepo: rename _bundle to _cgunpacker Gregory Szorc <gregory.szorc@gmail.com> parents: 35076 diff changeset	387 c = bundlechangelog(self.svfs, self._cgunpacker)
3f393e4593f2 bundlerepo: rename _bundle to _cgunpacker Gregory Szorc <gregory.szorc@gmail.com> parents: 35076 diff changeset	388 self.manstart = self._cgunpacker.tell()
8260 54a4b520bd7d localrepo: use propertycache Matt Mackall <mpm@selenic.com> parents: 8227 diff changeset	389 return c
54a4b520bd7d localrepo: use propertycache Matt Mackall <mpm@selenic.com> parents: 8227 diff changeset	390
42182 3472a3f9d785 localrepo: introduce a `_refreshchangelog` method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 41041 diff changeset	391 def _refreshchangelog(self):
3472a3f9d785 localrepo: introduce a `_refreshchangelog` method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 41041 diff changeset	392 # 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: 41041 diff changeset	393 # applicable.
3472a3f9d785 localrepo: introduce a `_refreshchangelog` method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 41041 diff changeset	394 pass
3472a3f9d785 localrepo: introduce a `_refreshchangelog` method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 41041 diff changeset	395
39779 5ccd791344f3 localrepo: pass root manifest into manifestlog.__init__ Gregory Szorc <gregory.szorc@gmail.com> parents: 39620 diff changeset	396 @localrepo.unfilteredpropertycache
5ccd791344f3 localrepo: pass root manifest into manifestlog.__init__ Gregory Szorc <gregory.szorc@gmail.com> parents: 39620 diff changeset	397 def manifestlog(self):
35077 3f393e4593f2 bundlerepo: rename _bundle to _cgunpacker Gregory Szorc <gregory.szorc@gmail.com> parents: 35076 diff changeset	398 self._cgunpacker.seek(self.manstart)
14144 3c3c53d8343a unbundler: separate delta and header parsing Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 14142 diff changeset	399 # consume the header if it exists
35077 3f393e4593f2 bundlerepo: rename _bundle to _cgunpacker Gregory Szorc <gregory.szorc@gmail.com> parents: 35076 diff changeset	400 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	401 linkmapper = self.unfiltered().changelog.rev
46793 6266d19556ad node: introduce nodeconstants class Joerg Sonnenberger <joerg@bec.de> parents: 46724 diff changeset	402 rootstore = bundlemanifest(
6266d19556ad node: introduce nodeconstants class Joerg Sonnenberger <joerg@bec.de> parents: 46724 diff changeset	403 self.nodeconstants, self.svfs, self._cgunpacker, linkmapper
6266d19556ad node: introduce nodeconstants class Joerg Sonnenberger <joerg@bec.de> parents: 46724 diff changeset	404 )
35077 3f393e4593f2 bundlerepo: rename _bundle to _cgunpacker Gregory Szorc <gregory.szorc@gmail.com> parents: 35076 diff changeset	405 self.filestart = self._cgunpacker.tell()
39779 5ccd791344f3 localrepo: pass root manifest into manifestlog.__init__ Gregory Szorc <gregory.szorc@gmail.com> parents: 39620 diff changeset	406
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42833 diff changeset	407 return manifest.manifestlog(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42833 diff changeset	408 self.svfs, self, rootstore, self.narrowmatch()
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42833 diff changeset	409 )
8260 54a4b520bd7d localrepo: use propertycache Matt Mackall <mpm@selenic.com> parents: 8227 diff changeset	410
35050 a2dfc723b6b5 bundle: allow bundlerepo to support alternative manifest implementations Durham Goode <durham@fb.com> parents: 34300 diff changeset	411 def _consumemanifest(self):
a2dfc723b6b5 bundle: allow bundlerepo to support alternative manifest implementations Durham Goode <durham@fb.com> parents: 34300 diff changeset	412 """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: 34300 diff changeset	413 file portion can be read."""
35077 3f393e4593f2 bundlerepo: rename _bundle to _cgunpacker Gregory Szorc <gregory.szorc@gmail.com> parents: 35076 diff changeset	414 self._cgunpacker.seek(self.manstart)
3f393e4593f2 bundlerepo: rename _bundle to _cgunpacker Gregory Szorc <gregory.szorc@gmail.com> parents: 35076 diff changeset	415 self._cgunpacker.manifestheader()
3f393e4593f2 bundlerepo: rename _bundle to _cgunpacker Gregory Szorc <gregory.szorc@gmail.com> parents: 35076 diff changeset	416 for delta in self._cgunpacker.deltaiter():
35050 a2dfc723b6b5 bundle: allow bundlerepo to support alternative manifest implementations Durham Goode <durham@fb.com> parents: 34300 diff changeset	417 pass
35077 3f393e4593f2 bundlerepo: rename _bundle to _cgunpacker Gregory Szorc <gregory.szorc@gmail.com> parents: 35076 diff changeset	418 self.filestart = self._cgunpacker.tell()
35050 a2dfc723b6b5 bundle: allow bundlerepo to support alternative manifest implementations Durham Goode <durham@fb.com> parents: 34300 diff changeset	419
18014 a39fe76c4c65 clfilter: ensure that filecache on localrepo is unfiltered Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17913 diff changeset	420 @localrepo.unfilteredpropertycache
8260 54a4b520bd7d localrepo: use propertycache Matt Mackall <mpm@selenic.com> parents: 8227 diff changeset	421 def manstart(self):
54a4b520bd7d localrepo: use propertycache Matt Mackall <mpm@selenic.com> parents: 8227 diff changeset	422 self.changelog
54a4b520bd7d localrepo: use propertycache Matt Mackall <mpm@selenic.com> parents: 8227 diff changeset	423 return self.manstart
54a4b520bd7d localrepo: use propertycache Matt Mackall <mpm@selenic.com> parents: 8227 diff changeset	424
18014 a39fe76c4c65 clfilter: ensure that filecache on localrepo is unfiltered Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17913 diff changeset	425 @localrepo.unfilteredpropertycache
8260 54a4b520bd7d localrepo: use propertycache Matt Mackall <mpm@selenic.com> parents: 8227 diff changeset	426 def filestart(self):
30385 11b8b740d54a manifest: remove last uses of repo.manifest Durham Goode <durham@fb.com> parents: 30383 diff changeset	427 self.manifestlog
35050 a2dfc723b6b5 bundle: allow bundlerepo to support alternative manifest implementations Durham Goode <durham@fb.com> parents: 34300 diff changeset	428
a2dfc723b6b5 bundle: allow bundlerepo to support alternative manifest implementations Durham Goode <durham@fb.com> parents: 34300 diff changeset	429 # 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: 34300 diff changeset	430 # manifestlog implementation did not consume the manifests from the
a2dfc723b6b5 bundle: allow bundlerepo to support alternative manifest implementations Durham Goode <durham@fb.com> parents: 34300 diff changeset	431 # 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: 34300 diff changeset	432 # part instead). So we need to manually consume it.
43554 9f70512ae2cf cleanup: remove pointless r-prefixes on single-quoted strings Augie Fackler <augie@google.com> parents: 43117 diff changeset	433 if 'filestart' not in self.__dict__:
35050 a2dfc723b6b5 bundle: allow bundlerepo to support alternative manifest implementations Durham Goode <durham@fb.com> parents: 34300 diff changeset	434 self._consumemanifest()
a2dfc723b6b5 bundle: allow bundlerepo to support alternative manifest implementations Durham Goode <durham@fb.com> parents: 34300 diff changeset	435
8260 54a4b520bd7d localrepo: use propertycache Matt Mackall <mpm@selenic.com> parents: 8227 diff changeset	436 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	437
2673 109a22f5434a hooks: add url to changegroup, incoming, prechangegroup, pretxnchangegroup hooks Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2273 diff changeset	438 def url(self):
109a22f5434a hooks: add url to changegroup, incoming, prechangegroup, pretxnchangegroup hooks Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2273 diff changeset	439 return self._url
109a22f5434a hooks: add url to changegroup, incoming, prechangegroup, pretxnchangegroup hooks Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2273 diff changeset	440
1942 9da45de3118d add bundlerepo.py: a read-only repo that can use uncompressed bundles Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	441 def file(self, f):
35100 cd4cd7b94ff1 bundlerepo: rename "bundlefilespos" variable and attribute Gregory Szorc <gregory.szorc@gmail.com> parents: 35099 diff changeset	442 if not self._cgfilespos:
35077 3f393e4593f2 bundlerepo: rename _bundle to _cgunpacker Gregory Szorc <gregory.szorc@gmail.com> parents: 35076 diff changeset	443 self._cgunpacker.seek(self.filestart)
35100 cd4cd7b94ff1 bundlerepo: rename "bundlefilespos" variable and attribute Gregory Szorc <gregory.szorc@gmail.com> parents: 35099 diff changeset	444 self._cgfilespos = _getfilestarts(self._cgunpacker)
5262 a35756389ef4 Make bundlerepo lazier Brendan Cully <brendan@kublai.com> parents: 5167 diff changeset	445
35100 cd4cd7b94ff1 bundlerepo: rename "bundlefilespos" variable and attribute Gregory Szorc <gregory.szorc@gmail.com> parents: 35099 diff changeset	446 if f in self._cgfilespos:
cd4cd7b94ff1 bundlerepo: rename "bundlefilespos" variable and attribute Gregory Szorc <gregory.szorc@gmail.com> parents: 35099 diff changeset	447 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	448 linkmapper = self.unfiltered().changelog.rev
35077 3f393e4593f2 bundlerepo: rename _bundle to _cgunpacker Gregory Szorc <gregory.szorc@gmail.com> parents: 35076 diff changeset	449 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	450 else:
37331 c68262401c8c bundlerepo: use super() when calling file() Gregory Szorc <gregory.szorc@gmail.com> parents: 36843 diff changeset	451 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	452
12347 6277a9469dff bundlerepo: restore close() method Matt Mackall <mpm@selenic.com> parents: 12335 diff changeset	453 def close(self):
6277a9469dff bundlerepo: restore close() method Matt Mackall <mpm@selenic.com> parents: 12335 diff changeset	454 """Close assigned bundle file immediately."""
35075 df2a676a2e9e bundlerepo: make bundle and bundlefile attributes private Gregory Szorc <gregory.szorc@gmail.com> parents: 35074 diff changeset	455 self._bundlefile.close()
12962 ff083040a555 bundlerepository: get rid of temporary bundle files (issue2478) Klaus Koch <kuk42@gmx.net> parents: 12961 diff changeset	456 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	457 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	458 if self._tempparent:
9a1c59283ad3 Add ability to directly clone from all-history bundles John Mulligan <phlogistonjohn@asynchrono.us> parents: 6312 diff changeset	459 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	460
6315 5c96a4bca66b clone: use cancopy Matt Mackall <mpm@selenic.com> parents: 6314 diff changeset	461 def cancopy(self):
5c96a4bca66b clone: use cancopy Matt Mackall <mpm@selenic.com> parents: 6314 diff changeset	462 return False
5c96a4bca66b clone: use cancopy Matt Mackall <mpm@selenic.com> parents: 6314 diff changeset	463
17193 1d710fe5ee0e peer: introduce canpush and improve error message Sune Foldager <cryo@cyanite.org> parents: 17191 diff changeset	464 def peer(self):
1d710fe5ee0e peer: introduce canpush and improve error message Sune Foldager <cryo@cyanite.org> parents: 17191 diff changeset	465 return bundlepeer(self)
1d710fe5ee0e peer: introduce canpush and improve error message Sune Foldager <cryo@cyanite.org> parents: 17191 diff changeset	466
7435 5e13df32fb74 bundlerepo doesn't really have a dirstate, throw AttributeError if requested Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6953 diff changeset	467 def getcwd(self):
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42833 diff changeset	468 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	469
28714 dac81729fea4 bundle: warn when update to revision existing only in a bundle (issue5004) liscju <piotr.listkiewicz@gmail.com> parents: 28666 diff changeset	470 # Check if parents exist in localrepo before setting
47055 d55b71393907 node: replace nullid and friends with nodeconstants class Joerg Sonnenberger <joerg@bec.de> parents: 46907 diff changeset	471 def setparents(self, p1, p2=None):
d55b71393907 node: replace nullid and friends with nodeconstants class Joerg Sonnenberger <joerg@bec.de> parents: 46907 diff changeset	472 if p2 is None:
d55b71393907 node: replace nullid and friends with nodeconstants class Joerg Sonnenberger <joerg@bec.de> parents: 46907 diff changeset	473 p2 = self.nullid
28714 dac81729fea4 bundle: warn when update to revision existing only in a bundle (issue5004) liscju <piotr.listkiewicz@gmail.com> parents: 28666 diff changeset	474 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	475 p2rev = self.changelog.rev(p2)
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	476 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	477 if self.changelog.repotiprev < p1rev:
46114 59fa3890d40a node: import symbols explicitly Joerg Sonnenberger <joerg@bec.de> parents: 45957 diff changeset	478 self.ui.warn(msg % hex(p1))
28714 dac81729fea4 bundle: warn when update to revision existing only in a bundle (issue5004) liscju <piotr.listkiewicz@gmail.com> parents: 28666 diff changeset	479 if self.changelog.repotiprev < p2rev:
46114 59fa3890d40a node: import symbols explicitly Joerg Sonnenberger <joerg@bec.de> parents: 45957 diff changeset	480 self.ui.warn(msg % hex(p2))
28714 dac81729fea4 bundle: warn when update to revision existing only in a bundle (issue5004) liscju <piotr.listkiewicz@gmail.com> parents: 28666 diff changeset	481 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	482
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42833 diff changeset	483
39565 089fc0db0954 hg: allow extra arguments to be passed to repo creation (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 39271 diff changeset	484 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	485 if create:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	486 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	487 # internal config: bundle.mainreporoot
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	488 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	489 if not parentpath:
4b7aa1c899dc bundlerepo: try to find containing repo on creation (issue1812) Matt Mackall <mpm@selenic.com> parents: 15597 diff changeset	490 # try to find the correct path to the working directory repo
39823 24e493ec2229 py3: rename pycompat.getcwd() to encoding.getcwd() (API) Matt Harbison <matt_harbison@yahoo.com> parents: 39779 diff changeset	491 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	492 if parentpath is None:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	493 parentpath = b''
5664 da72b4d24797 Fix income/pull with bundle and -R (issue 820). Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 5558 diff changeset	494 if parentpath:
da72b4d24797 Fix income/pull with bundle and -R (issue 820). Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 5558 diff changeset	495 # 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	496 # In particular, we don't want temp dir names in test outputs.
39823 24e493ec2229 py3: rename pycompat.getcwd() to encoding.getcwd() (API) Matt Harbison <matt_harbison@yahoo.com> parents: 39779 diff changeset	497 cwd = encoding.getcwd()
5664 da72b4d24797 Fix income/pull with bundle and -R (issue 820). Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 5558 diff changeset	498 if parentpath == cwd:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	499 parentpath = b''
5664 da72b4d24797 Fix income/pull with bundle and -R (issue 820). Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 5558 diff changeset	500 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	501 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	502 if parentpath.startswith(cwd):
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42833 diff changeset	503 parentpath = parentpath[len(cwd) :]
46907 ffd3e823a7e5 urlutil: extract `url` related code from `util` into the new module Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46793 diff changeset	504 u = urlutil.url(path)
13826 e574207e3bcd url: refactor util.drop_scheme() and hg.localpath() into url.localpath() Brodie Rao <brodie@bitheap.org> parents: 13742 diff changeset	505 path = u.localpath()
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	506 if u.scheme == b'bundle':
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	507 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	508 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	509 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	510 else:
386f04d6ecb3 clean up hg.py: move repo constructor code into each repo module Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2673 diff changeset	511 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	512 else:
5664 da72b4d24797 Fix income/pull with bundle and -R (issue 820). Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 5558 diff changeset	513 repopath, bundlename = parentpath, path
39619 a8d2faeca49e bundlerepo: factor out code for instantiating a bundle repository Gregory Szorc <gregory.szorc@gmail.com> parents: 39618 diff changeset	514
a8d2faeca49e bundlerepo: factor out code for instantiating a bundle repository Gregory Szorc <gregory.szorc@gmail.com> parents: 39618 diff changeset	515 return makebundlerepository(ui, repopath, bundlename)
a8d2faeca49e bundlerepo: factor out code for instantiating a bundle repository Gregory Szorc <gregory.szorc@gmail.com> parents: 39618 diff changeset	516
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42833 diff changeset	517
39619 a8d2faeca49e bundlerepo: factor out code for instantiating a bundle repository Gregory Szorc <gregory.szorc@gmail.com> parents: 39618 diff changeset	518 def makebundlerepository(ui, repopath, bundlepath):
a8d2faeca49e bundlerepo: factor out code for instantiating a bundle repository Gregory Szorc <gregory.szorc@gmail.com> parents: 39618 diff changeset	519 """Make a bundle repository object based on repo and bundle paths."""
39620 335ae4d0a552 bundlerepo: dynamically create repository type from base repository Gregory Szorc <gregory.szorc@gmail.com> parents: 39619 diff changeset	520 if repopath:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	521 url = b'bundle:%s+%s' % (util.expandpath(repopath), bundlepath)
39620 335ae4d0a552 bundlerepo: dynamically create repository type from base repository Gregory Szorc <gregory.szorc@gmail.com> parents: 39619 diff changeset	522 else:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	523 url = b'bundle:%s' % bundlepath
39620 335ae4d0a552 bundlerepo: dynamically create repository type from base repository Gregory Szorc <gregory.szorc@gmail.com> parents: 39619 diff changeset	524
335ae4d0a552 bundlerepo: dynamically create repository type from base repository Gregory Szorc <gregory.szorc@gmail.com> parents: 39619 diff changeset	525 # 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: 39619 diff changeset	526 # 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: 39619 diff changeset	527 # 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: 39619 diff changeset	528 # call the base repository's constructor!
335ae4d0a552 bundlerepo: dynamically create repository type from base repository Gregory Szorc <gregory.szorc@gmail.com> parents: 39619 diff changeset	529 #
335ae4d0a552 bundlerepo: dynamically create repository type from base repository Gregory Szorc <gregory.szorc@gmail.com> parents: 39619 diff changeset	530 # 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: 39619 diff changeset	531 # 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: 39619 diff changeset	532 # 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: 39619 diff changeset	533 # 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: 39619 diff changeset	534 # 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: 39619 diff changeset	535
335ae4d0a552 bundlerepo: dynamically create repository type from base repository Gregory Szorc <gregory.szorc@gmail.com> parents: 39619 diff changeset	536 try:
39945 75b53b809e87 bundlerepo: remove a variable alias Martin von Zweigbergk <martinvonz@google.com> parents: 39823 diff changeset	537 repo = localrepo.instance(ui, repopath, create=False)
39620 335ae4d0a552 bundlerepo: dynamically create repository type from base repository Gregory Szorc <gregory.szorc@gmail.com> parents: 39619 diff changeset	538 tempparent = None
335ae4d0a552 bundlerepo: dynamically create repository type from base repository Gregory Szorc <gregory.szorc@gmail.com> parents: 39619 diff changeset	539 except error.RepoError:
335ae4d0a552 bundlerepo: dynamically create repository type from base repository Gregory Szorc <gregory.szorc@gmail.com> parents: 39619 diff changeset	540 tempparent = pycompat.mkdtemp()
335ae4d0a552 bundlerepo: dynamically create repository type from base repository Gregory Szorc <gregory.szorc@gmail.com> parents: 39619 diff changeset	541 try:
39945 75b53b809e87 bundlerepo: remove a variable alias Martin von Zweigbergk <martinvonz@google.com> parents: 39823 diff changeset	542 repo = localrepo.instance(ui, tempparent, create=True)
39620 335ae4d0a552 bundlerepo: dynamically create repository type from base repository Gregory Szorc <gregory.szorc@gmail.com> parents: 39619 diff changeset	543 except Exception:
335ae4d0a552 bundlerepo: dynamically create repository type from base repository Gregory Szorc <gregory.szorc@gmail.com> parents: 39619 diff changeset	544 shutil.rmtree(tempparent)
335ae4d0a552 bundlerepo: dynamically create repository type from base repository Gregory Szorc <gregory.szorc@gmail.com> parents: 39619 diff changeset	545 raise
335ae4d0a552 bundlerepo: dynamically create repository type from base repository Gregory Szorc <gregory.szorc@gmail.com> parents: 39619 diff changeset	546
39945 75b53b809e87 bundlerepo: remove a variable alias Martin von Zweigbergk <martinvonz@google.com> parents: 39823 diff changeset	547 class derivedbundlerepository(bundlerepository, repo.__class__):
39620 335ae4d0a552 bundlerepo: dynamically create repository type from base repository Gregory Szorc <gregory.szorc@gmail.com> parents: 39619 diff changeset	548 pass
335ae4d0a552 bundlerepo: dynamically create repository type from base repository Gregory Szorc <gregory.szorc@gmail.com> parents: 39619 diff changeset	549
335ae4d0a552 bundlerepo: dynamically create repository type from base repository Gregory Szorc <gregory.szorc@gmail.com> parents: 39619 diff changeset	550 repo.__class__ = derivedbundlerepository
335ae4d0a552 bundlerepo: dynamically create repository type from base repository Gregory Szorc <gregory.szorc@gmail.com> parents: 39619 diff changeset	551 bundlerepository.__init__(repo, bundlepath, url, tempparent)
335ae4d0a552 bundlerepo: dynamically create repository type from base repository Gregory Szorc <gregory.szorc@gmail.com> parents: 39619 diff changeset	552
335ae4d0a552 bundlerepo: dynamically create repository type from base repository Gregory Szorc <gregory.szorc@gmail.com> parents: 39619 diff changeset	553 return repo
12734 5dfd1c49dcc5 bundlerepo: unify common code into a new getremotechanges Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 12347 diff changeset	554
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42833 diff changeset	555
23633 96c3cbec006f incoming: handle phases the same as pull Eric Sumner <ericsumner@fb.com> parents: 23632 diff changeset	556 class bundletransactionmanager(object):
96c3cbec006f incoming: handle phases the same as pull Eric Sumner <ericsumner@fb.com> parents: 23632 diff changeset	557 def transaction(self):
96c3cbec006f incoming: handle phases the same as pull Eric Sumner <ericsumner@fb.com> parents: 23632 diff changeset	558 return None
96c3cbec006f incoming: handle phases the same as pull Eric Sumner <ericsumner@fb.com> parents: 23632 diff changeset	559
96c3cbec006f incoming: handle phases the same as pull Eric Sumner <ericsumner@fb.com> parents: 23632 diff changeset	560 def close(self):
96c3cbec006f incoming: handle phases the same as pull Eric Sumner <ericsumner@fb.com> parents: 23632 diff changeset	561 raise NotImplementedError
96c3cbec006f incoming: handle phases the same as pull Eric Sumner <ericsumner@fb.com> parents: 23632 diff changeset	562
96c3cbec006f incoming: handle phases the same as pull Eric Sumner <ericsumner@fb.com> parents: 23632 diff changeset	563 def release(self):
96c3cbec006f incoming: handle phases the same as pull Eric Sumner <ericsumner@fb.com> parents: 23632 diff changeset	564 raise NotImplementedError
96c3cbec006f incoming: handle phases the same as pull Eric Sumner <ericsumner@fb.com> parents: 23632 diff changeset	565
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42833 diff changeset	566
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42833 diff changeset	567 def getremotechanges(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42833 diff changeset	568 ui, repo, peer, onlyheads=None, bundlename=None, force=False
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42833 diff changeset	569 ):
45957 89a2afe31e82 formating: upgrade to black 20.8b1 Augie Fackler <raf@durin42.com> parents: 45833 diff changeset	570 """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	571
8a0fca925992 bundlerepo: fix and improve getremotechanges Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14158 diff changeset	572 "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	573 specified heads.
8a0fca925992 bundlerepo: fix and improve getremotechanges Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14158 diff changeset	574 "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	575 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	576 the returned "cleanupfn".
14161 8a0fca925992 bundlerepo: fix and improve getremotechanges Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14158 diff changeset	577 "force" indicates whether to proceed on unrelated repos.
8a0fca925992 bundlerepo: fix and improve getremotechanges Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14158 diff changeset	578
8a0fca925992 bundlerepo: fix and improve getremotechanges Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14158 diff changeset	579 Returns a tuple (local, csets, cleanupfn):
8a0fca925992 bundlerepo: fix and improve getremotechanges Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14158 diff changeset	580
16683 525fdb738975 cleanup: eradicate long lines Brodie Rao <brodie@sf.io> parents: 16435 diff changeset	581 "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	582 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	583 original "peer" is remote.
14161 8a0fca925992 bundlerepo: fix and improve getremotechanges Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14158 diff changeset	584 "csets" lists the incoming changeset node ids.
16683 525fdb738975 cleanup: eradicate long lines Brodie Rao <brodie@sf.io> parents: 16435 diff changeset	585 "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	586 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	587 here.
45957 89a2afe31e82 formating: upgrade to black 20.8b1 Augie Fackler <raf@durin42.com> parents: 45833 diff changeset	588 """
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42833 diff changeset	589 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	590 common, incoming, rheads = tmp
5dfd1c49dcc5 bundlerepo: unify common code into a new getremotechanges Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 12347 diff changeset	591 if not incoming:
5dfd1c49dcc5 bundlerepo: unify common code into a new getremotechanges Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 12347 diff changeset	592 try:
15091 106f89299da6 bundlerepo: add argument check before unlink Sune Foldager <cryo@cyanite.org> parents: 14494 diff changeset	593 if bundlename:
21694 c08a22bfa16e bundlerepo: backout dbf292f65b09 Matt Mackall <mpm@selenic.com> parents: 21562 diff changeset	594 os.unlink(bundlename)
14004 97ed99d1f419 eliminate various naked except clauses Idan Kamara <idankk86@gmail.com> parents: 13826 diff changeset	595 except OSError:
12734 5dfd1c49dcc5 bundlerepo: unify common code into a new getremotechanges Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 12347 diff changeset	596 pass
37642 d959277ff1b5 bundlerepo: rename "other" to "peer" Gregory Szorc <gregory.szorc@gmail.com> parents: 37635 diff changeset	597 return repo, [], peer.close
12734 5dfd1c49dcc5 bundlerepo: unify common code into a new getremotechanges Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 12347 diff changeset	598
22182 510cafe72004 incoming: don't request heads that already are common Mads Kiilerich <madski@unity3d.com> parents: 21694 diff changeset	599 commonset = set(common)
510cafe72004 incoming: don't request heads that already are common Mads Kiilerich <madski@unity3d.com> parents: 21694 diff changeset	600 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	601
12734 5dfd1c49dcc5 bundlerepo: unify common code into a new getremotechanges Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 12347 diff changeset	602 bundle = None
14161 8a0fca925992 bundlerepo: fix and improve getremotechanges Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14158 diff changeset	603 bundlerepo = None
37642 d959277ff1b5 bundlerepo: rename "other" to "peer" Gregory Szorc <gregory.szorc@gmail.com> parents: 37635 diff changeset	604 localrepo = peer.local()
17191 5884812686f7 peer: introduce peer methods to prepare for peer classes Sune Foldager <cryo@cyanite.org> parents: 16686 diff changeset	605 if bundlename or not localrepo:
37642 d959277ff1b5 bundlerepo: rename "other" to "peer" Gregory Szorc <gregory.szorc@gmail.com> parents: 37635 diff changeset	606 # 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	607
29698 ff5d5751fc1b bundlerepo: also read the 'devel.legacy.exchange' config Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 29389 diff changeset	608 # developer config: devel.legacy.exchange
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	609 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	610 forcebundle1 = b'bundle2' not in legexc and b'bundle1' in legexc
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42833 diff changeset	611 canbundle2 = (
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42833 diff changeset	612 not forcebundle1
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	613 and peer.capable(b'getbundle')
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	614 and peer.capable(b'bundle2')
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42833 diff changeset	615 )
26544 1e8e0b01faba incoming: request a bundle2 when possible (BC) Pierre-Yves David <pierre-yves.david@fb.com> parents: 26543 diff changeset	616 if canbundle2:
37643 1aa4d646d0de bundlerepo: use command executor for wire protocol commands Gregory Szorc <gregory.szorc@gmail.com> parents: 37642 diff changeset	617 with peer.commandexecutor() as e:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42833 diff changeset	618 b2 = e.callcommand(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	619 b'getbundle',
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42833 diff changeset	620 {
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	621 b'source': b'incoming',
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	622 b'common': common,
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	623 b'heads': rheads,
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	624 b'bundlecaps': exchange.caps20to10(
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	625 repo, role=b'client'
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	626 ),
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	627 b'cg': True,
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42833 diff changeset	628 },
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42833 diff changeset	629 ).result()
37643 1aa4d646d0de bundlerepo: use command executor for wire protocol commands Gregory Szorc <gregory.szorc@gmail.com> parents: 37642 diff changeset	630
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42833 diff changeset	631 fname = bundle = changegroup.writechunks(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42833 diff changeset	632 ui, b2._forwardchunks(), bundlename
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42833 diff changeset	633 )
26544 1e8e0b01faba incoming: request a bundle2 when possible (BC) Pierre-Yves David <pierre-yves.david@fb.com> parents: 26543 diff changeset	634 else:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	635 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	636 with peer.commandexecutor() as e:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42833 diff changeset	637 cg = e.callcommand(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	638 b'getbundle',
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42833 diff changeset	639 {
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	640 b'source': b'incoming',
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	641 b'common': common,
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	642 b'heads': rheads,
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42833 diff changeset	643 },
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42833 diff changeset	644 ).result()
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	645 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	646 # 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	647
37642 d959277ff1b5 bundlerepo: rename "other" to "peer" Gregory Szorc <gregory.szorc@gmail.com> parents: 37635 diff changeset	648 with peer.commandexecutor() as e:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42833 diff changeset	649 cg = e.callcommand(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	650 b'changegroup',
45957 89a2afe31e82 formating: upgrade to black 20.8b1 Augie Fackler <raf@durin42.com> parents: 45833 diff changeset	651 {
89a2afe31e82 formating: upgrade to black 20.8b1 Augie Fackler <raf@durin42.com> parents: 45833 diff changeset	652 b'nodes': incoming,
89a2afe31e82 formating: upgrade to black 20.8b1 Augie Fackler <raf@durin42.com> parents: 45833 diff changeset	653 b'source': b'incoming',
89a2afe31e82 formating: upgrade to black 20.8b1 Augie Fackler <raf@durin42.com> parents: 45833 diff changeset	654 },
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42833 diff changeset	655 ).result()
37635 cc8c06835097 wireproto: convert legacy commands to command executor Gregory Szorc <gregory.szorc@gmail.com> parents: 37497 diff changeset	656
26543 a018cbabdb51 bundlerepo: indent some code to prepare next patch Pierre-Yves David <pierre-yves.david@fb.com> parents: 26399 diff changeset	657 rheads = None
a018cbabdb51 bundlerepo: indent some code to prepare next patch Pierre-Yves David <pierre-yves.david@fb.com> parents: 26399 diff changeset	658 else:
37642 d959277ff1b5 bundlerepo: rename "other" to "peer" Gregory Szorc <gregory.szorc@gmail.com> parents: 37635 diff changeset	659 with peer.commandexecutor() as e:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42833 diff changeset	660 cg = e.callcommand(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	661 b'changegroupsubset',
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42833 diff changeset	662 {
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	663 b'bases': incoming,
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	664 b'heads': rheads,
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	665 b'source': b'incoming',
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42833 diff changeset	666 },
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42833 diff changeset	667 ).result()
37635 cc8c06835097 wireproto: convert legacy commands to command executor Gregory Szorc <gregory.szorc@gmail.com> parents: 37497 diff changeset	668
26543 a018cbabdb51 bundlerepo: indent some code to prepare next patch Pierre-Yves David <pierre-yves.david@fb.com> parents: 26399 diff changeset	669 if localrepo:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	670 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	671 else:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	672 bundletype = b"HG10UN"
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42833 diff changeset	673 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	674 # keep written bundle?
5dfd1c49dcc5 bundlerepo: unify common code into a new getremotechanges Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 12347 diff changeset	675 if bundlename:
5dfd1c49dcc5 bundlerepo: unify common code into a new getremotechanges Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 12347 diff changeset	676 bundle = None
17191 5884812686f7 peer: introduce peer methods to prepare for peer classes Sune Foldager <cryo@cyanite.org> parents: 16686 diff changeset	677 if not localrepo:
12734 5dfd1c49dcc5 bundlerepo: unify common code into a new getremotechanges Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 12347 diff changeset	678 # use the created uncompressed bundlerepo
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42833 diff changeset	679 localrepo = bundlerepo = makebundlerepository(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42833 diff changeset	680 repo.baseui, repo.root, fname
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42833 diff changeset	681 )
39619 a8d2faeca49e bundlerepo: factor out code for instantiating a bundle repository Gregory Szorc <gregory.szorc@gmail.com> parents: 39618 diff changeset	682
37642 d959277ff1b5 bundlerepo: rename "other" to "peer" Gregory Szorc <gregory.szorc@gmail.com> parents: 37635 diff changeset	683 # 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	684 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	685 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	686 # 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	687 # 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	688 # 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	689 localrepo = localrepo.unfiltered()
14161 8a0fca925992 bundlerepo: fix and improve getremotechanges Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14158 diff changeset	690
14412 9ac479758d3b bundlerepo: make getremotechanges support filtering of incoming Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14287 diff changeset	691 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	692
23633 96c3cbec006f incoming: handle phases the same as pull Eric Sumner <ericsumner@fb.com> parents: 23632 diff changeset	693 if bundlerepo:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42833 diff changeset	694 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	695
1aa4d646d0de bundlerepo: use command executor for wire protocol commands Gregory Szorc <gregory.szorc@gmail.com> parents: 37642 diff changeset	696 with peer.commandexecutor() as e:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42833 diff changeset	697 remotephases = e.callcommand(
45957 89a2afe31e82 formating: upgrade to black 20.8b1 Augie Fackler <raf@durin42.com> parents: 45833 diff changeset	698 b'listkeys',
89a2afe31e82 formating: upgrade to black 20.8b1 Augie Fackler <raf@durin42.com> parents: 45833 diff changeset	699 {
89a2afe31e82 formating: upgrade to black 20.8b1 Augie Fackler <raf@durin42.com> parents: 45833 diff changeset	700 b'namespace': b'phases',
89a2afe31e82 formating: upgrade to black 20.8b1 Augie Fackler <raf@durin42.com> parents: 45833 diff changeset	701 },
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42833 diff changeset	702 ).result()
23633 96c3cbec006f incoming: handle phases the same as pull Eric Sumner <ericsumner@fb.com> parents: 23632 diff changeset	703
37642 d959277ff1b5 bundlerepo: rename "other" to "peer" Gregory Szorc <gregory.szorc@gmail.com> parents: 37635 diff changeset	704 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	705 pullop.trmanager = bundletransactionmanager()
96c3cbec006f incoming: handle phases the same as pull Eric Sumner <ericsumner@fb.com> parents: 23632 diff changeset	706 exchange._pullapplyphases(pullop, remotephases)
96c3cbec006f incoming: handle phases the same as pull Eric Sumner <ericsumner@fb.com> parents: 23632 diff changeset	707
14161 8a0fca925992 bundlerepo: fix and improve getremotechanges Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14158 diff changeset	708 def cleanup():
8a0fca925992 bundlerepo: fix and improve getremotechanges Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14158 diff changeset	709 if bundlerepo:
8a0fca925992 bundlerepo: fix and improve getremotechanges Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14158 diff changeset	710 bundlerepo.close()
8a0fca925992 bundlerepo: fix and improve getremotechanges Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14158 diff changeset	711 if bundle:
21694 c08a22bfa16e bundlerepo: backout dbf292f65b09 Matt Mackall <mpm@selenic.com> parents: 21562 diff changeset	712 os.unlink(bundle)
37642 d959277ff1b5 bundlerepo: rename "other" to "peer" Gregory Szorc <gregory.szorc@gmail.com> parents: 37635 diff changeset	713 peer.close()
14161 8a0fca925992 bundlerepo: fix and improve getremotechanges Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14158 diff changeset	714
8a0fca925992 bundlerepo: fix and improve getremotechanges Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14158 diff changeset	715 return (localrepo, csets, cleanup)

Mercurial > public > mercurial-scm > hg-stable

annotate mercurial/bundlerepo.py @ 47260:130c9f7ed914