Show More
@@ -1,101 +1,101 b'' | |||||
1 | # highlight.py - highlight extension implementation file |
|
1 | # highlight.py - highlight extension implementation file | |
2 | # |
|
2 | # | |
3 | # Copyright 2007-2009 Adam Hupp <adam@hupp.org> and others |
|
3 | # Copyright 2007-2009 Adam Hupp <adam@hupp.org> and others | |
4 | # |
|
4 | # | |
5 | # This software may be used and distributed according to the terms of the |
|
5 | # This software may be used and distributed according to the terms of the | |
6 | # GNU General Public License version 2 or any later version. |
|
6 | # GNU General Public License version 2 or any later version. | |
7 | # |
|
7 | # | |
8 | # The original module was split in an interface and an implementation |
|
8 | # The original module was split in an interface and an implementation | |
9 | # file to defer pygments loading and speedup extension setup. |
|
9 | # file to defer pygments loading and speedup extension setup. | |
10 |
|
10 | |||
11 | from __future__ import absolute_import |
|
11 | from __future__ import absolute_import | |
12 |
|
12 | |||
13 | from mercurial import demandimport |
|
13 | from mercurial import demandimport | |
14 |
|
14 | |||
15 | demandimport.IGNORES.update([b'pkgutil', b'pkg_resources', b'__main__']) |
|
15 | demandimport.IGNORES.update([b'pkgutil', b'pkg_resources', b'__main__']) | |
16 |
|
16 | |||
17 | from mercurial import ( |
|
17 | from mercurial import ( | |
18 | encoding, |
|
18 | encoding, | |
19 | pycompat, |
|
19 | pycompat, | |
20 | ) |
|
20 | ) | |
21 |
|
21 | |||
22 | from mercurial.utils import stringutil |
|
22 | from mercurial.utils import stringutil | |
23 |
|
23 | |||
24 | with demandimport.deactivated(): |
|
24 | with demandimport.deactivated(): | |
25 | import pygments |
|
25 | import pygments | |
26 | import pygments.formatters |
|
26 | import pygments.formatters | |
27 | import pygments.lexers |
|
27 | import pygments.lexers | |
28 | import pygments.plugin |
|
28 | import pygments.plugin | |
29 | import pygments.util |
|
29 | import pygments.util | |
30 |
|
30 | |||
31 | for unused in pygments.plugin.find_plugin_lexers(): |
|
31 | for unused in pygments.plugin.find_plugin_lexers(): | |
32 | pass |
|
32 | pass | |
33 |
|
33 | |||
34 | highlight = pygments.highlight |
|
34 | highlight = pygments.highlight | |
35 | ClassNotFound = pygments.util.ClassNotFound |
|
35 | ClassNotFound = pygments.util.ClassNotFound | |
36 | guess_lexer = pygments.lexers.guess_lexer |
|
36 | guess_lexer = pygments.lexers.guess_lexer | |
37 | guess_lexer_for_filename = pygments.lexers.guess_lexer_for_filename |
|
37 | guess_lexer_for_filename = pygments.lexers.guess_lexer_for_filename | |
38 | TextLexer = pygments.lexers.TextLexer |
|
38 | TextLexer = pygments.lexers.TextLexer | |
39 | HtmlFormatter = pygments.formatters.HtmlFormatter |
|
39 | HtmlFormatter = pygments.formatters.HtmlFormatter | |
40 |
|
40 | |||
41 | SYNTAX_CSS = ( |
|
41 | SYNTAX_CSS = ( | |
42 | b'\n<link rel="stylesheet" href="{url}highlightcss" type="text/css" />' |
|
42 | b'\n<link rel="stylesheet" href="{url}highlightcss" type="text/css" />' | |
43 | ) |
|
43 | ) | |
44 |
|
44 | |||
45 |
|
45 | |||
46 | def pygmentize(field, fctx, style, tmpl, guessfilenameonly=False): |
|
46 | def pygmentize(field, fctx, style, tmpl, guessfilenameonly=False): | |
47 |
|
47 | |||
48 | # append a <link ...> to the syntax highlighting css |
|
48 | # append a <link ...> to the syntax highlighting css | |
49 | tmpl.load(b'header') |
|
49 | tmpl.load(b'header') | |
50 | old_header = tmpl.cache[b'header'] |
|
50 | old_header = tmpl.cache[b'header'] | |
51 | if SYNTAX_CSS not in old_header: |
|
51 | if SYNTAX_CSS not in old_header: | |
52 | new_header = old_header + SYNTAX_CSS |
|
52 | new_header = old_header + SYNTAX_CSS | |
53 | tmpl.cache[b'header'] = new_header |
|
53 | tmpl.cache[b'header'] = new_header | |
54 |
|
54 | |||
55 | text = fctx.data() |
|
55 | text = fctx.data() | |
56 | if stringutil.binary(text): |
|
56 | if stringutil.binary(text): | |
57 | return |
|
57 | return | |
58 |
|
58 | |||
59 | # str.splitlines() != unicode.splitlines() because "reasons" |
|
59 | # str.splitlines() != unicode.splitlines() because "reasons" | |
60 | for c in b"\x0c\x1c\x1d\x1e": |
|
60 | for c in b"\x0c", b"\x1c", b"\x1d", b"\x1e": | |
61 | if c in text: |
|
61 | if c in text: | |
62 | text = text.replace(c, b'') |
|
62 | text = text.replace(c, b'') | |
63 |
|
63 | |||
64 | # Pygments is best used with Unicode strings: |
|
64 | # Pygments is best used with Unicode strings: | |
65 | # <http://pygments.org/docs/unicode/> |
|
65 | # <http://pygments.org/docs/unicode/> | |
66 | text = text.decode(pycompat.sysstr(encoding.encoding), 'replace') |
|
66 | text = text.decode(pycompat.sysstr(encoding.encoding), 'replace') | |
67 |
|
67 | |||
68 | # To get multi-line strings right, we can't format line-by-line |
|
68 | # To get multi-line strings right, we can't format line-by-line | |
69 | try: |
|
69 | try: | |
70 | path = pycompat.sysstr(fctx.path()) |
|
70 | path = pycompat.sysstr(fctx.path()) | |
71 | lexer = guess_lexer_for_filename(path, text[:1024], stripnl=False) |
|
71 | lexer = guess_lexer_for_filename(path, text[:1024], stripnl=False) | |
72 | except (ClassNotFound, ValueError): |
|
72 | except (ClassNotFound, ValueError): | |
73 | # guess_lexer will return a lexer if *any* lexer matches. There is |
|
73 | # guess_lexer will return a lexer if *any* lexer matches. There is | |
74 | # no way to specify a minimum match score. This can give a high rate of |
|
74 | # no way to specify a minimum match score. This can give a high rate of | |
75 | # false positives on files with an unknown filename pattern. |
|
75 | # false positives on files with an unknown filename pattern. | |
76 | if guessfilenameonly: |
|
76 | if guessfilenameonly: | |
77 | return |
|
77 | return | |
78 |
|
78 | |||
79 | try: |
|
79 | try: | |
80 | lexer = guess_lexer(text[:1024], stripnl=False) |
|
80 | lexer = guess_lexer(text[:1024], stripnl=False) | |
81 | except (ClassNotFound, ValueError): |
|
81 | except (ClassNotFound, ValueError): | |
82 | # Don't highlight unknown files |
|
82 | # Don't highlight unknown files | |
83 | return |
|
83 | return | |
84 |
|
84 | |||
85 | # Don't highlight text files |
|
85 | # Don't highlight text files | |
86 | if isinstance(lexer, TextLexer): |
|
86 | if isinstance(lexer, TextLexer): | |
87 | return |
|
87 | return | |
88 |
|
88 | |||
89 | formatter = HtmlFormatter(nowrap=True, style=pycompat.sysstr(style)) |
|
89 | formatter = HtmlFormatter(nowrap=True, style=pycompat.sysstr(style)) | |
90 |
|
90 | |||
91 | colorized = highlight(text, lexer, formatter) |
|
91 | colorized = highlight(text, lexer, formatter) | |
92 | coloriter = ( |
|
92 | coloriter = ( | |
93 | s.encode(pycompat.sysstr(encoding.encoding), 'replace') |
|
93 | s.encode(pycompat.sysstr(encoding.encoding), 'replace') | |
94 | for s in colorized.splitlines() |
|
94 | for s in colorized.splitlines() | |
95 | ) |
|
95 | ) | |
96 |
|
96 | |||
97 | tmpl._filters[b'colorize'] = lambda x: next(coloriter) |
|
97 | tmpl._filters[b'colorize'] = lambda x: next(coloriter) | |
98 |
|
98 | |||
99 | oldl = tmpl.cache[field] |
|
99 | oldl = tmpl.cache[field] | |
100 | newl = oldl.replace(b'line|escape', b'line|colorize') |
|
100 | newl = oldl.replace(b'line|escape', b'line|colorize') | |
101 | tmpl.cache[field] = newl |
|
101 | tmpl.cache[field] = newl |
@@ -1,3090 +1,3086 b'' | |||||
1 | # exchange.py - utility to exchange data between repos. |
|
1 | # exchange.py - utility to exchange data between repos. | |
2 | # |
|
2 | # | |
3 | # Copyright 2005-2007 Matt Mackall <mpm@selenic.com> |
|
3 | # Copyright 2005-2007 Matt Mackall <mpm@selenic.com> | |
4 | # |
|
4 | # | |
5 | # This software may be used and distributed according to the terms of the |
|
5 | # This software may be used and distributed according to the terms of the | |
6 | # GNU General Public License version 2 or any later version. |
|
6 | # GNU General Public License version 2 or any later version. | |
7 |
|
7 | |||
8 | from __future__ import absolute_import |
|
8 | from __future__ import absolute_import | |
9 |
|
9 | |||
10 | import collections |
|
10 | import collections | |
11 | import hashlib |
|
11 | import hashlib | |
12 |
|
12 | |||
13 | from .i18n import _ |
|
13 | from .i18n import _ | |
14 | from .node import ( |
|
14 | from .node import ( | |
15 | hex, |
|
15 | hex, | |
16 | nullid, |
|
16 | nullid, | |
17 | nullrev, |
|
17 | nullrev, | |
18 | ) |
|
18 | ) | |
19 | from .thirdparty import attr |
|
19 | from .thirdparty import attr | |
20 | from . import ( |
|
20 | from . import ( | |
21 | bookmarks as bookmod, |
|
21 | bookmarks as bookmod, | |
22 | bundle2, |
|
22 | bundle2, | |
23 | changegroup, |
|
23 | changegroup, | |
24 | discovery, |
|
24 | discovery, | |
25 | error, |
|
25 | error, | |
26 | exchangev2, |
|
26 | exchangev2, | |
27 | lock as lockmod, |
|
27 | lock as lockmod, | |
28 | logexchange, |
|
28 | logexchange, | |
29 | narrowspec, |
|
29 | narrowspec, | |
30 | obsolete, |
|
30 | obsolete, | |
|
31 | obsutil, | |||
31 | phases, |
|
32 | phases, | |
32 | pushkey, |
|
33 | pushkey, | |
33 | pycompat, |
|
34 | pycompat, | |
34 | scmutil, |
|
35 | scmutil, | |
35 | sslutil, |
|
36 | sslutil, | |
36 | streamclone, |
|
37 | streamclone, | |
37 | url as urlmod, |
|
38 | url as urlmod, | |
38 | util, |
|
39 | util, | |
39 | wireprototypes, |
|
40 | wireprototypes, | |
40 | ) |
|
41 | ) | |
41 | from .interfaces import repository |
|
42 | from .interfaces import repository | |
42 | from .utils import stringutil |
|
43 | from .utils import stringutil | |
43 |
|
44 | |||
44 | urlerr = util.urlerr |
|
45 | urlerr = util.urlerr | |
45 | urlreq = util.urlreq |
|
46 | urlreq = util.urlreq | |
46 |
|
47 | |||
47 | _NARROWACL_SECTION = b'narrowacl' |
|
48 | _NARROWACL_SECTION = b'narrowacl' | |
48 |
|
49 | |||
49 | # Maps bundle version human names to changegroup versions. |
|
50 | # Maps bundle version human names to changegroup versions. | |
50 | _bundlespeccgversions = { |
|
51 | _bundlespeccgversions = { | |
51 | b'v1': b'01', |
|
52 | b'v1': b'01', | |
52 | b'v2': b'02', |
|
53 | b'v2': b'02', | |
53 | b'packed1': b's1', |
|
54 | b'packed1': b's1', | |
54 | b'bundle2': b'02', # legacy |
|
55 | b'bundle2': b'02', # legacy | |
55 | } |
|
56 | } | |
56 |
|
57 | |||
57 | # Maps bundle version with content opts to choose which part to bundle |
|
58 | # Maps bundle version with content opts to choose which part to bundle | |
58 | _bundlespeccontentopts = { |
|
59 | _bundlespeccontentopts = { | |
59 | b'v1': { |
|
60 | b'v1': { | |
60 | b'changegroup': True, |
|
61 | b'changegroup': True, | |
61 | b'cg.version': b'01', |
|
62 | b'cg.version': b'01', | |
62 | b'obsolescence': False, |
|
63 | b'obsolescence': False, | |
63 | b'phases': False, |
|
64 | b'phases': False, | |
64 | b'tagsfnodescache': False, |
|
65 | b'tagsfnodescache': False, | |
65 | b'revbranchcache': False, |
|
66 | b'revbranchcache': False, | |
66 | }, |
|
67 | }, | |
67 | b'v2': { |
|
68 | b'v2': { | |
68 | b'changegroup': True, |
|
69 | b'changegroup': True, | |
69 | b'cg.version': b'02', |
|
70 | b'cg.version': b'02', | |
70 | b'obsolescence': False, |
|
71 | b'obsolescence': False, | |
71 | b'phases': False, |
|
72 | b'phases': False, | |
72 | b'tagsfnodescache': True, |
|
73 | b'tagsfnodescache': True, | |
73 | b'revbranchcache': True, |
|
74 | b'revbranchcache': True, | |
74 | }, |
|
75 | }, | |
75 | b'packed1': {b'cg.version': b's1'}, |
|
76 | b'packed1': {b'cg.version': b's1'}, | |
76 | } |
|
77 | } | |
77 | _bundlespeccontentopts[b'bundle2'] = _bundlespeccontentopts[b'v2'] |
|
78 | _bundlespeccontentopts[b'bundle2'] = _bundlespeccontentopts[b'v2'] | |
78 |
|
79 | |||
79 | _bundlespecvariants = { |
|
80 | _bundlespecvariants = { | |
80 | b"streamv2": { |
|
81 | b"streamv2": { | |
81 | b"changegroup": False, |
|
82 | b"changegroup": False, | |
82 | b"streamv2": True, |
|
83 | b"streamv2": True, | |
83 | b"tagsfnodescache": False, |
|
84 | b"tagsfnodescache": False, | |
84 | b"revbranchcache": False, |
|
85 | b"revbranchcache": False, | |
85 | } |
|
86 | } | |
86 | } |
|
87 | } | |
87 |
|
88 | |||
88 | # Compression engines allowed in version 1. THIS SHOULD NEVER CHANGE. |
|
89 | # Compression engines allowed in version 1. THIS SHOULD NEVER CHANGE. | |
89 | _bundlespecv1compengines = {b'gzip', b'bzip2', b'none'} |
|
90 | _bundlespecv1compengines = {b'gzip', b'bzip2', b'none'} | |
90 |
|
91 | |||
91 |
|
92 | |||
92 | @attr.s |
|
93 | @attr.s | |
93 | class bundlespec(object): |
|
94 | class bundlespec(object): | |
94 | compression = attr.ib() |
|
95 | compression = attr.ib() | |
95 | wirecompression = attr.ib() |
|
96 | wirecompression = attr.ib() | |
96 | version = attr.ib() |
|
97 | version = attr.ib() | |
97 | wireversion = attr.ib() |
|
98 | wireversion = attr.ib() | |
98 | params = attr.ib() |
|
99 | params = attr.ib() | |
99 | contentopts = attr.ib() |
|
100 | contentopts = attr.ib() | |
100 |
|
101 | |||
101 |
|
102 | |||
102 | def _sortedmarkers(markers): |
|
|||
103 | # last item of marker tuple ('parents') may be None or a tuple |
|
|||
104 | return sorted(markers, key=lambda m: m[:-1] + (m[-1] or (),)) |
|
|||
105 |
|
||||
106 |
|
||||
107 | def parsebundlespec(repo, spec, strict=True): |
|
103 | def parsebundlespec(repo, spec, strict=True): | |
108 | """Parse a bundle string specification into parts. |
|
104 | """Parse a bundle string specification into parts. | |
109 |
|
105 | |||
110 | Bundle specifications denote a well-defined bundle/exchange format. |
|
106 | Bundle specifications denote a well-defined bundle/exchange format. | |
111 | The content of a given specification should not change over time in |
|
107 | The content of a given specification should not change over time in | |
112 | order to ensure that bundles produced by a newer version of Mercurial are |
|
108 | order to ensure that bundles produced by a newer version of Mercurial are | |
113 | readable from an older version. |
|
109 | readable from an older version. | |
114 |
|
110 | |||
115 | The string currently has the form: |
|
111 | The string currently has the form: | |
116 |
|
112 | |||
117 | <compression>-<type>[;<parameter0>[;<parameter1>]] |
|
113 | <compression>-<type>[;<parameter0>[;<parameter1>]] | |
118 |
|
114 | |||
119 | Where <compression> is one of the supported compression formats |
|
115 | Where <compression> is one of the supported compression formats | |
120 | and <type> is (currently) a version string. A ";" can follow the type and |
|
116 | and <type> is (currently) a version string. A ";" can follow the type and | |
121 | all text afterwards is interpreted as URI encoded, ";" delimited key=value |
|
117 | all text afterwards is interpreted as URI encoded, ";" delimited key=value | |
122 | pairs. |
|
118 | pairs. | |
123 |
|
119 | |||
124 | If ``strict`` is True (the default) <compression> is required. Otherwise, |
|
120 | If ``strict`` is True (the default) <compression> is required. Otherwise, | |
125 | it is optional. |
|
121 | it is optional. | |
126 |
|
122 | |||
127 | Returns a bundlespec object of (compression, version, parameters). |
|
123 | Returns a bundlespec object of (compression, version, parameters). | |
128 | Compression will be ``None`` if not in strict mode and a compression isn't |
|
124 | Compression will be ``None`` if not in strict mode and a compression isn't | |
129 | defined. |
|
125 | defined. | |
130 |
|
126 | |||
131 | An ``InvalidBundleSpecification`` is raised when the specification is |
|
127 | An ``InvalidBundleSpecification`` is raised when the specification is | |
132 | not syntactically well formed. |
|
128 | not syntactically well formed. | |
133 |
|
129 | |||
134 | An ``UnsupportedBundleSpecification`` is raised when the compression or |
|
130 | An ``UnsupportedBundleSpecification`` is raised when the compression or | |
135 | bundle type/version is not recognized. |
|
131 | bundle type/version is not recognized. | |
136 |
|
132 | |||
137 | Note: this function will likely eventually return a more complex data |
|
133 | Note: this function will likely eventually return a more complex data | |
138 | structure, including bundle2 part information. |
|
134 | structure, including bundle2 part information. | |
139 | """ |
|
135 | """ | |
140 |
|
136 | |||
141 | def parseparams(s): |
|
137 | def parseparams(s): | |
142 | if b';' not in s: |
|
138 | if b';' not in s: | |
143 | return s, {} |
|
139 | return s, {} | |
144 |
|
140 | |||
145 | params = {} |
|
141 | params = {} | |
146 | version, paramstr = s.split(b';', 1) |
|
142 | version, paramstr = s.split(b';', 1) | |
147 |
|
143 | |||
148 | for p in paramstr.split(b';'): |
|
144 | for p in paramstr.split(b';'): | |
149 | if b'=' not in p: |
|
145 | if b'=' not in p: | |
150 | raise error.InvalidBundleSpecification( |
|
146 | raise error.InvalidBundleSpecification( | |
151 | _( |
|
147 | _( | |
152 | b'invalid bundle specification: ' |
|
148 | b'invalid bundle specification: ' | |
153 | b'missing "=" in parameter: %s' |
|
149 | b'missing "=" in parameter: %s' | |
154 | ) |
|
150 | ) | |
155 | % p |
|
151 | % p | |
156 | ) |
|
152 | ) | |
157 |
|
153 | |||
158 | key, value = p.split(b'=', 1) |
|
154 | key, value = p.split(b'=', 1) | |
159 | key = urlreq.unquote(key) |
|
155 | key = urlreq.unquote(key) | |
160 | value = urlreq.unquote(value) |
|
156 | value = urlreq.unquote(value) | |
161 | params[key] = value |
|
157 | params[key] = value | |
162 |
|
158 | |||
163 | return version, params |
|
159 | return version, params | |
164 |
|
160 | |||
165 | if strict and b'-' not in spec: |
|
161 | if strict and b'-' not in spec: | |
166 | raise error.InvalidBundleSpecification( |
|
162 | raise error.InvalidBundleSpecification( | |
167 | _( |
|
163 | _( | |
168 | b'invalid bundle specification; ' |
|
164 | b'invalid bundle specification; ' | |
169 | b'must be prefixed with compression: %s' |
|
165 | b'must be prefixed with compression: %s' | |
170 | ) |
|
166 | ) | |
171 | % spec |
|
167 | % spec | |
172 | ) |
|
168 | ) | |
173 |
|
169 | |||
174 | if b'-' in spec: |
|
170 | if b'-' in spec: | |
175 | compression, version = spec.split(b'-', 1) |
|
171 | compression, version = spec.split(b'-', 1) | |
176 |
|
172 | |||
177 | if compression not in util.compengines.supportedbundlenames: |
|
173 | if compression not in util.compengines.supportedbundlenames: | |
178 | raise error.UnsupportedBundleSpecification( |
|
174 | raise error.UnsupportedBundleSpecification( | |
179 | _(b'%s compression is not supported') % compression |
|
175 | _(b'%s compression is not supported') % compression | |
180 | ) |
|
176 | ) | |
181 |
|
177 | |||
182 | version, params = parseparams(version) |
|
178 | version, params = parseparams(version) | |
183 |
|
179 | |||
184 | if version not in _bundlespeccgversions: |
|
180 | if version not in _bundlespeccgversions: | |
185 | raise error.UnsupportedBundleSpecification( |
|
181 | raise error.UnsupportedBundleSpecification( | |
186 | _(b'%s is not a recognized bundle version') % version |
|
182 | _(b'%s is not a recognized bundle version') % version | |
187 | ) |
|
183 | ) | |
188 | else: |
|
184 | else: | |
189 | # Value could be just the compression or just the version, in which |
|
185 | # Value could be just the compression or just the version, in which | |
190 | # case some defaults are assumed (but only when not in strict mode). |
|
186 | # case some defaults are assumed (but only when not in strict mode). | |
191 | assert not strict |
|
187 | assert not strict | |
192 |
|
188 | |||
193 | spec, params = parseparams(spec) |
|
189 | spec, params = parseparams(spec) | |
194 |
|
190 | |||
195 | if spec in util.compengines.supportedbundlenames: |
|
191 | if spec in util.compengines.supportedbundlenames: | |
196 | compression = spec |
|
192 | compression = spec | |
197 | version = b'v1' |
|
193 | version = b'v1' | |
198 | # Generaldelta repos require v2. |
|
194 | # Generaldelta repos require v2. | |
199 | if b'generaldelta' in repo.requirements: |
|
195 | if b'generaldelta' in repo.requirements: | |
200 | version = b'v2' |
|
196 | version = b'v2' | |
201 | # Modern compression engines require v2. |
|
197 | # Modern compression engines require v2. | |
202 | if compression not in _bundlespecv1compengines: |
|
198 | if compression not in _bundlespecv1compengines: | |
203 | version = b'v2' |
|
199 | version = b'v2' | |
204 | elif spec in _bundlespeccgversions: |
|
200 | elif spec in _bundlespeccgversions: | |
205 | if spec == b'packed1': |
|
201 | if spec == b'packed1': | |
206 | compression = b'none' |
|
202 | compression = b'none' | |
207 | else: |
|
203 | else: | |
208 | compression = b'bzip2' |
|
204 | compression = b'bzip2' | |
209 | version = spec |
|
205 | version = spec | |
210 | else: |
|
206 | else: | |
211 | raise error.UnsupportedBundleSpecification( |
|
207 | raise error.UnsupportedBundleSpecification( | |
212 | _(b'%s is not a recognized bundle specification') % spec |
|
208 | _(b'%s is not a recognized bundle specification') % spec | |
213 | ) |
|
209 | ) | |
214 |
|
210 | |||
215 | # Bundle version 1 only supports a known set of compression engines. |
|
211 | # Bundle version 1 only supports a known set of compression engines. | |
216 | if version == b'v1' and compression not in _bundlespecv1compengines: |
|
212 | if version == b'v1' and compression not in _bundlespecv1compengines: | |
217 | raise error.UnsupportedBundleSpecification( |
|
213 | raise error.UnsupportedBundleSpecification( | |
218 | _(b'compression engine %s is not supported on v1 bundles') |
|
214 | _(b'compression engine %s is not supported on v1 bundles') | |
219 | % compression |
|
215 | % compression | |
220 | ) |
|
216 | ) | |
221 |
|
217 | |||
222 | # The specification for packed1 can optionally declare the data formats |
|
218 | # The specification for packed1 can optionally declare the data formats | |
223 | # required to apply it. If we see this metadata, compare against what the |
|
219 | # required to apply it. If we see this metadata, compare against what the | |
224 | # repo supports and error if the bundle isn't compatible. |
|
220 | # repo supports and error if the bundle isn't compatible. | |
225 | if version == b'packed1' and b'requirements' in params: |
|
221 | if version == b'packed1' and b'requirements' in params: | |
226 | requirements = set(params[b'requirements'].split(b',')) |
|
222 | requirements = set(params[b'requirements'].split(b',')) | |
227 | missingreqs = requirements - repo.supportedformats |
|
223 | missingreqs = requirements - repo.supportedformats | |
228 | if missingreqs: |
|
224 | if missingreqs: | |
229 | raise error.UnsupportedBundleSpecification( |
|
225 | raise error.UnsupportedBundleSpecification( | |
230 | _(b'missing support for repository features: %s') |
|
226 | _(b'missing support for repository features: %s') | |
231 | % b', '.join(sorted(missingreqs)) |
|
227 | % b', '.join(sorted(missingreqs)) | |
232 | ) |
|
228 | ) | |
233 |
|
229 | |||
234 | # Compute contentopts based on the version |
|
230 | # Compute contentopts based on the version | |
235 | contentopts = _bundlespeccontentopts.get(version, {}).copy() |
|
231 | contentopts = _bundlespeccontentopts.get(version, {}).copy() | |
236 |
|
232 | |||
237 | # Process the variants |
|
233 | # Process the variants | |
238 | if b"stream" in params and params[b"stream"] == b"v2": |
|
234 | if b"stream" in params and params[b"stream"] == b"v2": | |
239 | variant = _bundlespecvariants[b"streamv2"] |
|
235 | variant = _bundlespecvariants[b"streamv2"] | |
240 | contentopts.update(variant) |
|
236 | contentopts.update(variant) | |
241 |
|
237 | |||
242 | engine = util.compengines.forbundlename(compression) |
|
238 | engine = util.compengines.forbundlename(compression) | |
243 | compression, wirecompression = engine.bundletype() |
|
239 | compression, wirecompression = engine.bundletype() | |
244 | wireversion = _bundlespeccgversions[version] |
|
240 | wireversion = _bundlespeccgversions[version] | |
245 |
|
241 | |||
246 | return bundlespec( |
|
242 | return bundlespec( | |
247 | compression, wirecompression, version, wireversion, params, contentopts |
|
243 | compression, wirecompression, version, wireversion, params, contentopts | |
248 | ) |
|
244 | ) | |
249 |
|
245 | |||
250 |
|
246 | |||
251 | def readbundle(ui, fh, fname, vfs=None): |
|
247 | def readbundle(ui, fh, fname, vfs=None): | |
252 | header = changegroup.readexactly(fh, 4) |
|
248 | header = changegroup.readexactly(fh, 4) | |
253 |
|
249 | |||
254 | alg = None |
|
250 | alg = None | |
255 | if not fname: |
|
251 | if not fname: | |
256 | fname = b"stream" |
|
252 | fname = b"stream" | |
257 | if not header.startswith(b'HG') and header.startswith(b'\0'): |
|
253 | if not header.startswith(b'HG') and header.startswith(b'\0'): | |
258 | fh = changegroup.headerlessfixup(fh, header) |
|
254 | fh = changegroup.headerlessfixup(fh, header) | |
259 | header = b"HG10" |
|
255 | header = b"HG10" | |
260 | alg = b'UN' |
|
256 | alg = b'UN' | |
261 | elif vfs: |
|
257 | elif vfs: | |
262 | fname = vfs.join(fname) |
|
258 | fname = vfs.join(fname) | |
263 |
|
259 | |||
264 | magic, version = header[0:2], header[2:4] |
|
260 | magic, version = header[0:2], header[2:4] | |
265 |
|
261 | |||
266 | if magic != b'HG': |
|
262 | if magic != b'HG': | |
267 | raise error.Abort(_(b'%s: not a Mercurial bundle') % fname) |
|
263 | raise error.Abort(_(b'%s: not a Mercurial bundle') % fname) | |
268 | if version == b'10': |
|
264 | if version == b'10': | |
269 | if alg is None: |
|
265 | if alg is None: | |
270 | alg = changegroup.readexactly(fh, 2) |
|
266 | alg = changegroup.readexactly(fh, 2) | |
271 | return changegroup.cg1unpacker(fh, alg) |
|
267 | return changegroup.cg1unpacker(fh, alg) | |
272 | elif version.startswith(b'2'): |
|
268 | elif version.startswith(b'2'): | |
273 | return bundle2.getunbundler(ui, fh, magicstring=magic + version) |
|
269 | return bundle2.getunbundler(ui, fh, magicstring=magic + version) | |
274 | elif version == b'S1': |
|
270 | elif version == b'S1': | |
275 | return streamclone.streamcloneapplier(fh) |
|
271 | return streamclone.streamcloneapplier(fh) | |
276 | else: |
|
272 | else: | |
277 | raise error.Abort( |
|
273 | raise error.Abort( | |
278 | _(b'%s: unknown bundle version %s') % (fname, version) |
|
274 | _(b'%s: unknown bundle version %s') % (fname, version) | |
279 | ) |
|
275 | ) | |
280 |
|
276 | |||
281 |
|
277 | |||
282 | def getbundlespec(ui, fh): |
|
278 | def getbundlespec(ui, fh): | |
283 | """Infer the bundlespec from a bundle file handle. |
|
279 | """Infer the bundlespec from a bundle file handle. | |
284 |
|
280 | |||
285 | The input file handle is seeked and the original seek position is not |
|
281 | The input file handle is seeked and the original seek position is not | |
286 | restored. |
|
282 | restored. | |
287 | """ |
|
283 | """ | |
288 |
|
284 | |||
289 | def speccompression(alg): |
|
285 | def speccompression(alg): | |
290 | try: |
|
286 | try: | |
291 | return util.compengines.forbundletype(alg).bundletype()[0] |
|
287 | return util.compengines.forbundletype(alg).bundletype()[0] | |
292 | except KeyError: |
|
288 | except KeyError: | |
293 | return None |
|
289 | return None | |
294 |
|
290 | |||
295 | b = readbundle(ui, fh, None) |
|
291 | b = readbundle(ui, fh, None) | |
296 | if isinstance(b, changegroup.cg1unpacker): |
|
292 | if isinstance(b, changegroup.cg1unpacker): | |
297 | alg = b._type |
|
293 | alg = b._type | |
298 | if alg == b'_truncatedBZ': |
|
294 | if alg == b'_truncatedBZ': | |
299 | alg = b'BZ' |
|
295 | alg = b'BZ' | |
300 | comp = speccompression(alg) |
|
296 | comp = speccompression(alg) | |
301 | if not comp: |
|
297 | if not comp: | |
302 | raise error.Abort(_(b'unknown compression algorithm: %s') % alg) |
|
298 | raise error.Abort(_(b'unknown compression algorithm: %s') % alg) | |
303 | return b'%s-v1' % comp |
|
299 | return b'%s-v1' % comp | |
304 | elif isinstance(b, bundle2.unbundle20): |
|
300 | elif isinstance(b, bundle2.unbundle20): | |
305 | if b'Compression' in b.params: |
|
301 | if b'Compression' in b.params: | |
306 | comp = speccompression(b.params[b'Compression']) |
|
302 | comp = speccompression(b.params[b'Compression']) | |
307 | if not comp: |
|
303 | if not comp: | |
308 | raise error.Abort( |
|
304 | raise error.Abort( | |
309 | _(b'unknown compression algorithm: %s') % comp |
|
305 | _(b'unknown compression algorithm: %s') % comp | |
310 | ) |
|
306 | ) | |
311 | else: |
|
307 | else: | |
312 | comp = b'none' |
|
308 | comp = b'none' | |
313 |
|
309 | |||
314 | version = None |
|
310 | version = None | |
315 | for part in b.iterparts(): |
|
311 | for part in b.iterparts(): | |
316 | if part.type == b'changegroup': |
|
312 | if part.type == b'changegroup': | |
317 | version = part.params[b'version'] |
|
313 | version = part.params[b'version'] | |
318 | if version in (b'01', b'02'): |
|
314 | if version in (b'01', b'02'): | |
319 | version = b'v2' |
|
315 | version = b'v2' | |
320 | else: |
|
316 | else: | |
321 | raise error.Abort( |
|
317 | raise error.Abort( | |
322 | _( |
|
318 | _( | |
323 | b'changegroup version %s does not have ' |
|
319 | b'changegroup version %s does not have ' | |
324 | b'a known bundlespec' |
|
320 | b'a known bundlespec' | |
325 | ) |
|
321 | ) | |
326 | % version, |
|
322 | % version, | |
327 | hint=_(b'try upgrading your Mercurial client'), |
|
323 | hint=_(b'try upgrading your Mercurial client'), | |
328 | ) |
|
324 | ) | |
329 | elif part.type == b'stream2' and version is None: |
|
325 | elif part.type == b'stream2' and version is None: | |
330 | # A stream2 part requires to be part of a v2 bundle |
|
326 | # A stream2 part requires to be part of a v2 bundle | |
331 | requirements = urlreq.unquote(part.params[b'requirements']) |
|
327 | requirements = urlreq.unquote(part.params[b'requirements']) | |
332 | splitted = requirements.split() |
|
328 | splitted = requirements.split() | |
333 | params = bundle2._formatrequirementsparams(splitted) |
|
329 | params = bundle2._formatrequirementsparams(splitted) | |
334 | return b'none-v2;stream=v2;%s' % params |
|
330 | return b'none-v2;stream=v2;%s' % params | |
335 |
|
331 | |||
336 | if not version: |
|
332 | if not version: | |
337 | raise error.Abort( |
|
333 | raise error.Abort( | |
338 | _(b'could not identify changegroup version in bundle') |
|
334 | _(b'could not identify changegroup version in bundle') | |
339 | ) |
|
335 | ) | |
340 |
|
336 | |||
341 | return b'%s-%s' % (comp, version) |
|
337 | return b'%s-%s' % (comp, version) | |
342 | elif isinstance(b, streamclone.streamcloneapplier): |
|
338 | elif isinstance(b, streamclone.streamcloneapplier): | |
343 | requirements = streamclone.readbundle1header(fh)[2] |
|
339 | requirements = streamclone.readbundle1header(fh)[2] | |
344 | formatted = bundle2._formatrequirementsparams(requirements) |
|
340 | formatted = bundle2._formatrequirementsparams(requirements) | |
345 | return b'none-packed1;%s' % formatted |
|
341 | return b'none-packed1;%s' % formatted | |
346 | else: |
|
342 | else: | |
347 | raise error.Abort(_(b'unknown bundle type: %s') % b) |
|
343 | raise error.Abort(_(b'unknown bundle type: %s') % b) | |
348 |
|
344 | |||
349 |
|
345 | |||
350 | def _computeoutgoing(repo, heads, common): |
|
346 | def _computeoutgoing(repo, heads, common): | |
351 | """Computes which revs are outgoing given a set of common |
|
347 | """Computes which revs are outgoing given a set of common | |
352 | and a set of heads. |
|
348 | and a set of heads. | |
353 |
|
349 | |||
354 | This is a separate function so extensions can have access to |
|
350 | This is a separate function so extensions can have access to | |
355 | the logic. |
|
351 | the logic. | |
356 |
|
352 | |||
357 | Returns a discovery.outgoing object. |
|
353 | Returns a discovery.outgoing object. | |
358 | """ |
|
354 | """ | |
359 | cl = repo.changelog |
|
355 | cl = repo.changelog | |
360 | if common: |
|
356 | if common: | |
361 | hasnode = cl.hasnode |
|
357 | hasnode = cl.hasnode | |
362 | common = [n for n in common if hasnode(n)] |
|
358 | common = [n for n in common if hasnode(n)] | |
363 | else: |
|
359 | else: | |
364 | common = [nullid] |
|
360 | common = [nullid] | |
365 | if not heads: |
|
361 | if not heads: | |
366 | heads = cl.heads() |
|
362 | heads = cl.heads() | |
367 | return discovery.outgoing(repo, common, heads) |
|
363 | return discovery.outgoing(repo, common, heads) | |
368 |
|
364 | |||
369 |
|
365 | |||
370 | def _checkpublish(pushop): |
|
366 | def _checkpublish(pushop): | |
371 | repo = pushop.repo |
|
367 | repo = pushop.repo | |
372 | ui = repo.ui |
|
368 | ui = repo.ui | |
373 | behavior = ui.config(b'experimental', b'auto-publish') |
|
369 | behavior = ui.config(b'experimental', b'auto-publish') | |
374 | if pushop.publish or behavior not in (b'warn', b'confirm', b'abort'): |
|
370 | if pushop.publish or behavior not in (b'warn', b'confirm', b'abort'): | |
375 | return |
|
371 | return | |
376 | remotephases = listkeys(pushop.remote, b'phases') |
|
372 | remotephases = listkeys(pushop.remote, b'phases') | |
377 | if not remotephases.get(b'publishing', False): |
|
373 | if not remotephases.get(b'publishing', False): | |
378 | return |
|
374 | return | |
379 |
|
375 | |||
380 | if pushop.revs is None: |
|
376 | if pushop.revs is None: | |
381 | published = repo.filtered(b'served').revs(b'not public()') |
|
377 | published = repo.filtered(b'served').revs(b'not public()') | |
382 | else: |
|
378 | else: | |
383 | published = repo.revs(b'::%ln - public()', pushop.revs) |
|
379 | published = repo.revs(b'::%ln - public()', pushop.revs) | |
384 | if published: |
|
380 | if published: | |
385 | if behavior == b'warn': |
|
381 | if behavior == b'warn': | |
386 | ui.warn( |
|
382 | ui.warn( | |
387 | _(b'%i changesets about to be published\n') % len(published) |
|
383 | _(b'%i changesets about to be published\n') % len(published) | |
388 | ) |
|
384 | ) | |
389 | elif behavior == b'confirm': |
|
385 | elif behavior == b'confirm': | |
390 | if ui.promptchoice( |
|
386 | if ui.promptchoice( | |
391 | _(b'push and publish %i changesets (yn)?$$ &Yes $$ &No') |
|
387 | _(b'push and publish %i changesets (yn)?$$ &Yes $$ &No') | |
392 | % len(published) |
|
388 | % len(published) | |
393 | ): |
|
389 | ): | |
394 | raise error.Abort(_(b'user quit')) |
|
390 | raise error.Abort(_(b'user quit')) | |
395 | elif behavior == b'abort': |
|
391 | elif behavior == b'abort': | |
396 | msg = _(b'push would publish %i changesets') % len(published) |
|
392 | msg = _(b'push would publish %i changesets') % len(published) | |
397 | hint = _( |
|
393 | hint = _( | |
398 | b"use --publish or adjust 'experimental.auto-publish'" |
|
394 | b"use --publish or adjust 'experimental.auto-publish'" | |
399 | b" config" |
|
395 | b" config" | |
400 | ) |
|
396 | ) | |
401 | raise error.Abort(msg, hint=hint) |
|
397 | raise error.Abort(msg, hint=hint) | |
402 |
|
398 | |||
403 |
|
399 | |||
404 | def _forcebundle1(op): |
|
400 | def _forcebundle1(op): | |
405 | """return true if a pull/push must use bundle1 |
|
401 | """return true if a pull/push must use bundle1 | |
406 |
|
402 | |||
407 | This function is used to allow testing of the older bundle version""" |
|
403 | This function is used to allow testing of the older bundle version""" | |
408 | ui = op.repo.ui |
|
404 | ui = op.repo.ui | |
409 | # The goal is this config is to allow developer to choose the bundle |
|
405 | # The goal is this config is to allow developer to choose the bundle | |
410 | # version used during exchanged. This is especially handy during test. |
|
406 | # version used during exchanged. This is especially handy during test. | |
411 | # Value is a list of bundle version to be picked from, highest version |
|
407 | # Value is a list of bundle version to be picked from, highest version | |
412 | # should be used. |
|
408 | # should be used. | |
413 | # |
|
409 | # | |
414 | # developer config: devel.legacy.exchange |
|
410 | # developer config: devel.legacy.exchange | |
415 | exchange = ui.configlist(b'devel', b'legacy.exchange') |
|
411 | exchange = ui.configlist(b'devel', b'legacy.exchange') | |
416 | forcebundle1 = b'bundle2' not in exchange and b'bundle1' in exchange |
|
412 | forcebundle1 = b'bundle2' not in exchange and b'bundle1' in exchange | |
417 | return forcebundle1 or not op.remote.capable(b'bundle2') |
|
413 | return forcebundle1 or not op.remote.capable(b'bundle2') | |
418 |
|
414 | |||
419 |
|
415 | |||
420 | class pushoperation(object): |
|
416 | class pushoperation(object): | |
421 | """A object that represent a single push operation |
|
417 | """A object that represent a single push operation | |
422 |
|
418 | |||
423 | Its purpose is to carry push related state and very common operations. |
|
419 | Its purpose is to carry push related state and very common operations. | |
424 |
|
420 | |||
425 | A new pushoperation should be created at the beginning of each push and |
|
421 | A new pushoperation should be created at the beginning of each push and | |
426 | discarded afterward. |
|
422 | discarded afterward. | |
427 | """ |
|
423 | """ | |
428 |
|
424 | |||
429 | def __init__( |
|
425 | def __init__( | |
430 | self, |
|
426 | self, | |
431 | repo, |
|
427 | repo, | |
432 | remote, |
|
428 | remote, | |
433 | force=False, |
|
429 | force=False, | |
434 | revs=None, |
|
430 | revs=None, | |
435 | newbranch=False, |
|
431 | newbranch=False, | |
436 | bookmarks=(), |
|
432 | bookmarks=(), | |
437 | publish=False, |
|
433 | publish=False, | |
438 | pushvars=None, |
|
434 | pushvars=None, | |
439 | ): |
|
435 | ): | |
440 | # repo we push from |
|
436 | # repo we push from | |
441 | self.repo = repo |
|
437 | self.repo = repo | |
442 | self.ui = repo.ui |
|
438 | self.ui = repo.ui | |
443 | # repo we push to |
|
439 | # repo we push to | |
444 | self.remote = remote |
|
440 | self.remote = remote | |
445 | # force option provided |
|
441 | # force option provided | |
446 | self.force = force |
|
442 | self.force = force | |
447 | # revs to be pushed (None is "all") |
|
443 | # revs to be pushed (None is "all") | |
448 | self.revs = revs |
|
444 | self.revs = revs | |
449 | # bookmark explicitly pushed |
|
445 | # bookmark explicitly pushed | |
450 | self.bookmarks = bookmarks |
|
446 | self.bookmarks = bookmarks | |
451 | # allow push of new branch |
|
447 | # allow push of new branch | |
452 | self.newbranch = newbranch |
|
448 | self.newbranch = newbranch | |
453 | # step already performed |
|
449 | # step already performed | |
454 | # (used to check what steps have been already performed through bundle2) |
|
450 | # (used to check what steps have been already performed through bundle2) | |
455 | self.stepsdone = set() |
|
451 | self.stepsdone = set() | |
456 | # Integer version of the changegroup push result |
|
452 | # Integer version of the changegroup push result | |
457 | # - None means nothing to push |
|
453 | # - None means nothing to push | |
458 | # - 0 means HTTP error |
|
454 | # - 0 means HTTP error | |
459 | # - 1 means we pushed and remote head count is unchanged *or* |
|
455 | # - 1 means we pushed and remote head count is unchanged *or* | |
460 | # we have outgoing changesets but refused to push |
|
456 | # we have outgoing changesets but refused to push | |
461 | # - other values as described by addchangegroup() |
|
457 | # - other values as described by addchangegroup() | |
462 | self.cgresult = None |
|
458 | self.cgresult = None | |
463 | # Boolean value for the bookmark push |
|
459 | # Boolean value for the bookmark push | |
464 | self.bkresult = None |
|
460 | self.bkresult = None | |
465 | # discover.outgoing object (contains common and outgoing data) |
|
461 | # discover.outgoing object (contains common and outgoing data) | |
466 | self.outgoing = None |
|
462 | self.outgoing = None | |
467 | # all remote topological heads before the push |
|
463 | # all remote topological heads before the push | |
468 | self.remoteheads = None |
|
464 | self.remoteheads = None | |
469 | # Details of the remote branch pre and post push |
|
465 | # Details of the remote branch pre and post push | |
470 | # |
|
466 | # | |
471 | # mapping: {'branch': ([remoteheads], |
|
467 | # mapping: {'branch': ([remoteheads], | |
472 | # [newheads], |
|
468 | # [newheads], | |
473 | # [unsyncedheads], |
|
469 | # [unsyncedheads], | |
474 | # [discardedheads])} |
|
470 | # [discardedheads])} | |
475 | # - branch: the branch name |
|
471 | # - branch: the branch name | |
476 | # - remoteheads: the list of remote heads known locally |
|
472 | # - remoteheads: the list of remote heads known locally | |
477 | # None if the branch is new |
|
473 | # None if the branch is new | |
478 | # - newheads: the new remote heads (known locally) with outgoing pushed |
|
474 | # - newheads: the new remote heads (known locally) with outgoing pushed | |
479 | # - unsyncedheads: the list of remote heads unknown locally. |
|
475 | # - unsyncedheads: the list of remote heads unknown locally. | |
480 | # - discardedheads: the list of remote heads made obsolete by the push |
|
476 | # - discardedheads: the list of remote heads made obsolete by the push | |
481 | self.pushbranchmap = None |
|
477 | self.pushbranchmap = None | |
482 | # testable as a boolean indicating if any nodes are missing locally. |
|
478 | # testable as a boolean indicating if any nodes are missing locally. | |
483 | self.incoming = None |
|
479 | self.incoming = None | |
484 | # summary of the remote phase situation |
|
480 | # summary of the remote phase situation | |
485 | self.remotephases = None |
|
481 | self.remotephases = None | |
486 | # phases changes that must be pushed along side the changesets |
|
482 | # phases changes that must be pushed along side the changesets | |
487 | self.outdatedphases = None |
|
483 | self.outdatedphases = None | |
488 | # phases changes that must be pushed if changeset push fails |
|
484 | # phases changes that must be pushed if changeset push fails | |
489 | self.fallbackoutdatedphases = None |
|
485 | self.fallbackoutdatedphases = None | |
490 | # outgoing obsmarkers |
|
486 | # outgoing obsmarkers | |
491 | self.outobsmarkers = set() |
|
487 | self.outobsmarkers = set() | |
492 | # outgoing bookmarks, list of (bm, oldnode | '', newnode | '') |
|
488 | # outgoing bookmarks, list of (bm, oldnode | '', newnode | '') | |
493 | self.outbookmarks = [] |
|
489 | self.outbookmarks = [] | |
494 | # transaction manager |
|
490 | # transaction manager | |
495 | self.trmanager = None |
|
491 | self.trmanager = None | |
496 | # map { pushkey partid -> callback handling failure} |
|
492 | # map { pushkey partid -> callback handling failure} | |
497 | # used to handle exception from mandatory pushkey part failure |
|
493 | # used to handle exception from mandatory pushkey part failure | |
498 | self.pkfailcb = {} |
|
494 | self.pkfailcb = {} | |
499 | # an iterable of pushvars or None |
|
495 | # an iterable of pushvars or None | |
500 | self.pushvars = pushvars |
|
496 | self.pushvars = pushvars | |
501 | # publish pushed changesets |
|
497 | # publish pushed changesets | |
502 | self.publish = publish |
|
498 | self.publish = publish | |
503 |
|
499 | |||
504 | @util.propertycache |
|
500 | @util.propertycache | |
505 | def futureheads(self): |
|
501 | def futureheads(self): | |
506 | """future remote heads if the changeset push succeeds""" |
|
502 | """future remote heads if the changeset push succeeds""" | |
507 | return self.outgoing.missingheads |
|
503 | return self.outgoing.missingheads | |
508 |
|
504 | |||
509 | @util.propertycache |
|
505 | @util.propertycache | |
510 | def fallbackheads(self): |
|
506 | def fallbackheads(self): | |
511 | """future remote heads if the changeset push fails""" |
|
507 | """future remote heads if the changeset push fails""" | |
512 | if self.revs is None: |
|
508 | if self.revs is None: | |
513 | # not target to push, all common are relevant |
|
509 | # not target to push, all common are relevant | |
514 | return self.outgoing.commonheads |
|
510 | return self.outgoing.commonheads | |
515 | unfi = self.repo.unfiltered() |
|
511 | unfi = self.repo.unfiltered() | |
516 | # I want cheads = heads(::missingheads and ::commonheads) |
|
512 | # I want cheads = heads(::missingheads and ::commonheads) | |
517 | # (missingheads is revs with secret changeset filtered out) |
|
513 | # (missingheads is revs with secret changeset filtered out) | |
518 | # |
|
514 | # | |
519 | # This can be expressed as: |
|
515 | # This can be expressed as: | |
520 | # cheads = ( (missingheads and ::commonheads) |
|
516 | # cheads = ( (missingheads and ::commonheads) | |
521 | # + (commonheads and ::missingheads))" |
|
517 | # + (commonheads and ::missingheads))" | |
522 | # ) |
|
518 | # ) | |
523 | # |
|
519 | # | |
524 | # while trying to push we already computed the following: |
|
520 | # while trying to push we already computed the following: | |
525 | # common = (::commonheads) |
|
521 | # common = (::commonheads) | |
526 | # missing = ((commonheads::missingheads) - commonheads) |
|
522 | # missing = ((commonheads::missingheads) - commonheads) | |
527 | # |
|
523 | # | |
528 | # We can pick: |
|
524 | # We can pick: | |
529 | # * missingheads part of common (::commonheads) |
|
525 | # * missingheads part of common (::commonheads) | |
530 | common = self.outgoing.common |
|
526 | common = self.outgoing.common | |
531 | rev = self.repo.changelog.index.rev |
|
527 | rev = self.repo.changelog.index.rev | |
532 | cheads = [node for node in self.revs if rev(node) in common] |
|
528 | cheads = [node for node in self.revs if rev(node) in common] | |
533 | # and |
|
529 | # and | |
534 | # * commonheads parents on missing |
|
530 | # * commonheads parents on missing | |
535 | revset = unfi.set( |
|
531 | revset = unfi.set( | |
536 | b'%ln and parents(roots(%ln))', |
|
532 | b'%ln and parents(roots(%ln))', | |
537 | self.outgoing.commonheads, |
|
533 | self.outgoing.commonheads, | |
538 | self.outgoing.missing, |
|
534 | self.outgoing.missing, | |
539 | ) |
|
535 | ) | |
540 | cheads.extend(c.node() for c in revset) |
|
536 | cheads.extend(c.node() for c in revset) | |
541 | return cheads |
|
537 | return cheads | |
542 |
|
538 | |||
543 | @property |
|
539 | @property | |
544 | def commonheads(self): |
|
540 | def commonheads(self): | |
545 | """set of all common heads after changeset bundle push""" |
|
541 | """set of all common heads after changeset bundle push""" | |
546 | if self.cgresult: |
|
542 | if self.cgresult: | |
547 | return self.futureheads |
|
543 | return self.futureheads | |
548 | else: |
|
544 | else: | |
549 | return self.fallbackheads |
|
545 | return self.fallbackheads | |
550 |
|
546 | |||
551 |
|
547 | |||
552 | # mapping of message used when pushing bookmark |
|
548 | # mapping of message used when pushing bookmark | |
553 | bookmsgmap = { |
|
549 | bookmsgmap = { | |
554 | b'update': ( |
|
550 | b'update': ( | |
555 | _(b"updating bookmark %s\n"), |
|
551 | _(b"updating bookmark %s\n"), | |
556 | _(b'updating bookmark %s failed!\n'), |
|
552 | _(b'updating bookmark %s failed!\n'), | |
557 | ), |
|
553 | ), | |
558 | b'export': ( |
|
554 | b'export': ( | |
559 | _(b"exporting bookmark %s\n"), |
|
555 | _(b"exporting bookmark %s\n"), | |
560 | _(b'exporting bookmark %s failed!\n'), |
|
556 | _(b'exporting bookmark %s failed!\n'), | |
561 | ), |
|
557 | ), | |
562 | b'delete': ( |
|
558 | b'delete': ( | |
563 | _(b"deleting remote bookmark %s\n"), |
|
559 | _(b"deleting remote bookmark %s\n"), | |
564 | _(b'deleting remote bookmark %s failed!\n'), |
|
560 | _(b'deleting remote bookmark %s failed!\n'), | |
565 | ), |
|
561 | ), | |
566 | } |
|
562 | } | |
567 |
|
563 | |||
568 |
|
564 | |||
569 | def push( |
|
565 | def push( | |
570 | repo, |
|
566 | repo, | |
571 | remote, |
|
567 | remote, | |
572 | force=False, |
|
568 | force=False, | |
573 | revs=None, |
|
569 | revs=None, | |
574 | newbranch=False, |
|
570 | newbranch=False, | |
575 | bookmarks=(), |
|
571 | bookmarks=(), | |
576 | publish=False, |
|
572 | publish=False, | |
577 | opargs=None, |
|
573 | opargs=None, | |
578 | ): |
|
574 | ): | |
579 | '''Push outgoing changesets (limited by revs) from a local |
|
575 | '''Push outgoing changesets (limited by revs) from a local | |
580 | repository to remote. Return an integer: |
|
576 | repository to remote. Return an integer: | |
581 | - None means nothing to push |
|
577 | - None means nothing to push | |
582 | - 0 means HTTP error |
|
578 | - 0 means HTTP error | |
583 | - 1 means we pushed and remote head count is unchanged *or* |
|
579 | - 1 means we pushed and remote head count is unchanged *or* | |
584 | we have outgoing changesets but refused to push |
|
580 | we have outgoing changesets but refused to push | |
585 | - other values as described by addchangegroup() |
|
581 | - other values as described by addchangegroup() | |
586 | ''' |
|
582 | ''' | |
587 | if opargs is None: |
|
583 | if opargs is None: | |
588 | opargs = {} |
|
584 | opargs = {} | |
589 | pushop = pushoperation( |
|
585 | pushop = pushoperation( | |
590 | repo, |
|
586 | repo, | |
591 | remote, |
|
587 | remote, | |
592 | force, |
|
588 | force, | |
593 | revs, |
|
589 | revs, | |
594 | newbranch, |
|
590 | newbranch, | |
595 | bookmarks, |
|
591 | bookmarks, | |
596 | publish, |
|
592 | publish, | |
597 | **pycompat.strkwargs(opargs) |
|
593 | **pycompat.strkwargs(opargs) | |
598 | ) |
|
594 | ) | |
599 | if pushop.remote.local(): |
|
595 | if pushop.remote.local(): | |
600 | missing = ( |
|
596 | missing = ( | |
601 | set(pushop.repo.requirements) - pushop.remote.local().supported |
|
597 | set(pushop.repo.requirements) - pushop.remote.local().supported | |
602 | ) |
|
598 | ) | |
603 | if missing: |
|
599 | if missing: | |
604 | msg = _( |
|
600 | msg = _( | |
605 | b"required features are not" |
|
601 | b"required features are not" | |
606 | b" supported in the destination:" |
|
602 | b" supported in the destination:" | |
607 | b" %s" |
|
603 | b" %s" | |
608 | ) % (b', '.join(sorted(missing))) |
|
604 | ) % (b', '.join(sorted(missing))) | |
609 | raise error.Abort(msg) |
|
605 | raise error.Abort(msg) | |
610 |
|
606 | |||
611 | if not pushop.remote.canpush(): |
|
607 | if not pushop.remote.canpush(): | |
612 | raise error.Abort(_(b"destination does not support push")) |
|
608 | raise error.Abort(_(b"destination does not support push")) | |
613 |
|
609 | |||
614 | if not pushop.remote.capable(b'unbundle'): |
|
610 | if not pushop.remote.capable(b'unbundle'): | |
615 | raise error.Abort( |
|
611 | raise error.Abort( | |
616 | _( |
|
612 | _( | |
617 | b'cannot push: destination does not support the ' |
|
613 | b'cannot push: destination does not support the ' | |
618 | b'unbundle wire protocol command' |
|
614 | b'unbundle wire protocol command' | |
619 | ) |
|
615 | ) | |
620 | ) |
|
616 | ) | |
621 |
|
617 | |||
622 | # get lock as we might write phase data |
|
618 | # get lock as we might write phase data | |
623 | wlock = lock = None |
|
619 | wlock = lock = None | |
624 | try: |
|
620 | try: | |
625 | # bundle2 push may receive a reply bundle touching bookmarks |
|
621 | # bundle2 push may receive a reply bundle touching bookmarks | |
626 | # requiring the wlock. Take it now to ensure proper ordering. |
|
622 | # requiring the wlock. Take it now to ensure proper ordering. | |
627 | maypushback = pushop.ui.configbool(b'experimental', b'bundle2.pushback') |
|
623 | maypushback = pushop.ui.configbool(b'experimental', b'bundle2.pushback') | |
628 | if ( |
|
624 | if ( | |
629 | (not _forcebundle1(pushop)) |
|
625 | (not _forcebundle1(pushop)) | |
630 | and maypushback |
|
626 | and maypushback | |
631 | and not bookmod.bookmarksinstore(repo) |
|
627 | and not bookmod.bookmarksinstore(repo) | |
632 | ): |
|
628 | ): | |
633 | wlock = pushop.repo.wlock() |
|
629 | wlock = pushop.repo.wlock() | |
634 | lock = pushop.repo.lock() |
|
630 | lock = pushop.repo.lock() | |
635 | pushop.trmanager = transactionmanager( |
|
631 | pushop.trmanager = transactionmanager( | |
636 | pushop.repo, b'push-response', pushop.remote.url() |
|
632 | pushop.repo, b'push-response', pushop.remote.url() | |
637 | ) |
|
633 | ) | |
638 | except error.LockUnavailable as err: |
|
634 | except error.LockUnavailable as err: | |
639 | # source repo cannot be locked. |
|
635 | # source repo cannot be locked. | |
640 | # We do not abort the push, but just disable the local phase |
|
636 | # We do not abort the push, but just disable the local phase | |
641 | # synchronisation. |
|
637 | # synchronisation. | |
642 | msg = b'cannot lock source repository: %s\n' % stringutil.forcebytestr( |
|
638 | msg = b'cannot lock source repository: %s\n' % stringutil.forcebytestr( | |
643 | err |
|
639 | err | |
644 | ) |
|
640 | ) | |
645 | pushop.ui.debug(msg) |
|
641 | pushop.ui.debug(msg) | |
646 |
|
642 | |||
647 | with wlock or util.nullcontextmanager(): |
|
643 | with wlock or util.nullcontextmanager(): | |
648 | with lock or util.nullcontextmanager(): |
|
644 | with lock or util.nullcontextmanager(): | |
649 | with pushop.trmanager or util.nullcontextmanager(): |
|
645 | with pushop.trmanager or util.nullcontextmanager(): | |
650 | pushop.repo.checkpush(pushop) |
|
646 | pushop.repo.checkpush(pushop) | |
651 | _checkpublish(pushop) |
|
647 | _checkpublish(pushop) | |
652 | _pushdiscovery(pushop) |
|
648 | _pushdiscovery(pushop) | |
653 | if not _forcebundle1(pushop): |
|
649 | if not _forcebundle1(pushop): | |
654 | _pushbundle2(pushop) |
|
650 | _pushbundle2(pushop) | |
655 | _pushchangeset(pushop) |
|
651 | _pushchangeset(pushop) | |
656 | _pushsyncphase(pushop) |
|
652 | _pushsyncphase(pushop) | |
657 | _pushobsolete(pushop) |
|
653 | _pushobsolete(pushop) | |
658 | _pushbookmark(pushop) |
|
654 | _pushbookmark(pushop) | |
659 |
|
655 | |||
660 | if repo.ui.configbool(b'experimental', b'remotenames'): |
|
656 | if repo.ui.configbool(b'experimental', b'remotenames'): | |
661 | logexchange.pullremotenames(repo, remote) |
|
657 | logexchange.pullremotenames(repo, remote) | |
662 |
|
658 | |||
663 | return pushop |
|
659 | return pushop | |
664 |
|
660 | |||
665 |
|
661 | |||
666 | # list of steps to perform discovery before push |
|
662 | # list of steps to perform discovery before push | |
667 | pushdiscoveryorder = [] |
|
663 | pushdiscoveryorder = [] | |
668 |
|
664 | |||
669 | # Mapping between step name and function |
|
665 | # Mapping between step name and function | |
670 | # |
|
666 | # | |
671 | # This exists to help extensions wrap steps if necessary |
|
667 | # This exists to help extensions wrap steps if necessary | |
672 | pushdiscoverymapping = {} |
|
668 | pushdiscoverymapping = {} | |
673 |
|
669 | |||
674 |
|
670 | |||
675 | def pushdiscovery(stepname): |
|
671 | def pushdiscovery(stepname): | |
676 | """decorator for function performing discovery before push |
|
672 | """decorator for function performing discovery before push | |
677 |
|
673 | |||
678 | The function is added to the step -> function mapping and appended to the |
|
674 | The function is added to the step -> function mapping and appended to the | |
679 | list of steps. Beware that decorated function will be added in order (this |
|
675 | list of steps. Beware that decorated function will be added in order (this | |
680 | may matter). |
|
676 | may matter). | |
681 |
|
677 | |||
682 | You can only use this decorator for a new step, if you want to wrap a step |
|
678 | You can only use this decorator for a new step, if you want to wrap a step | |
683 | from an extension, change the pushdiscovery dictionary directly.""" |
|
679 | from an extension, change the pushdiscovery dictionary directly.""" | |
684 |
|
680 | |||
685 | def dec(func): |
|
681 | def dec(func): | |
686 | assert stepname not in pushdiscoverymapping |
|
682 | assert stepname not in pushdiscoverymapping | |
687 | pushdiscoverymapping[stepname] = func |
|
683 | pushdiscoverymapping[stepname] = func | |
688 | pushdiscoveryorder.append(stepname) |
|
684 | pushdiscoveryorder.append(stepname) | |
689 | return func |
|
685 | return func | |
690 |
|
686 | |||
691 | return dec |
|
687 | return dec | |
692 |
|
688 | |||
693 |
|
689 | |||
694 | def _pushdiscovery(pushop): |
|
690 | def _pushdiscovery(pushop): | |
695 | """Run all discovery steps""" |
|
691 | """Run all discovery steps""" | |
696 | for stepname in pushdiscoveryorder: |
|
692 | for stepname in pushdiscoveryorder: | |
697 | step = pushdiscoverymapping[stepname] |
|
693 | step = pushdiscoverymapping[stepname] | |
698 | step(pushop) |
|
694 | step(pushop) | |
699 |
|
695 | |||
700 |
|
696 | |||
701 | @pushdiscovery(b'changeset') |
|
697 | @pushdiscovery(b'changeset') | |
702 | def _pushdiscoverychangeset(pushop): |
|
698 | def _pushdiscoverychangeset(pushop): | |
703 | """discover the changeset that need to be pushed""" |
|
699 | """discover the changeset that need to be pushed""" | |
704 | fci = discovery.findcommonincoming |
|
700 | fci = discovery.findcommonincoming | |
705 | if pushop.revs: |
|
701 | if pushop.revs: | |
706 | commoninc = fci( |
|
702 | commoninc = fci( | |
707 | pushop.repo, |
|
703 | pushop.repo, | |
708 | pushop.remote, |
|
704 | pushop.remote, | |
709 | force=pushop.force, |
|
705 | force=pushop.force, | |
710 | ancestorsof=pushop.revs, |
|
706 | ancestorsof=pushop.revs, | |
711 | ) |
|
707 | ) | |
712 | else: |
|
708 | else: | |
713 | commoninc = fci(pushop.repo, pushop.remote, force=pushop.force) |
|
709 | commoninc = fci(pushop.repo, pushop.remote, force=pushop.force) | |
714 | common, inc, remoteheads = commoninc |
|
710 | common, inc, remoteheads = commoninc | |
715 | fco = discovery.findcommonoutgoing |
|
711 | fco = discovery.findcommonoutgoing | |
716 | outgoing = fco( |
|
712 | outgoing = fco( | |
717 | pushop.repo, |
|
713 | pushop.repo, | |
718 | pushop.remote, |
|
714 | pushop.remote, | |
719 | onlyheads=pushop.revs, |
|
715 | onlyheads=pushop.revs, | |
720 | commoninc=commoninc, |
|
716 | commoninc=commoninc, | |
721 | force=pushop.force, |
|
717 | force=pushop.force, | |
722 | ) |
|
718 | ) | |
723 | pushop.outgoing = outgoing |
|
719 | pushop.outgoing = outgoing | |
724 | pushop.remoteheads = remoteheads |
|
720 | pushop.remoteheads = remoteheads | |
725 | pushop.incoming = inc |
|
721 | pushop.incoming = inc | |
726 |
|
722 | |||
727 |
|
723 | |||
728 | @pushdiscovery(b'phase') |
|
724 | @pushdiscovery(b'phase') | |
729 | def _pushdiscoveryphase(pushop): |
|
725 | def _pushdiscoveryphase(pushop): | |
730 | """discover the phase that needs to be pushed |
|
726 | """discover the phase that needs to be pushed | |
731 |
|
727 | |||
732 | (computed for both success and failure case for changesets push)""" |
|
728 | (computed for both success and failure case for changesets push)""" | |
733 | outgoing = pushop.outgoing |
|
729 | outgoing = pushop.outgoing | |
734 | unfi = pushop.repo.unfiltered() |
|
730 | unfi = pushop.repo.unfiltered() | |
735 | remotephases = listkeys(pushop.remote, b'phases') |
|
731 | remotephases = listkeys(pushop.remote, b'phases') | |
736 |
|
732 | |||
737 | if ( |
|
733 | if ( | |
738 | pushop.ui.configbool(b'ui', b'_usedassubrepo') |
|
734 | pushop.ui.configbool(b'ui', b'_usedassubrepo') | |
739 | and remotephases # server supports phases |
|
735 | and remotephases # server supports phases | |
740 | and not pushop.outgoing.missing # no changesets to be pushed |
|
736 | and not pushop.outgoing.missing # no changesets to be pushed | |
741 | and remotephases.get(b'publishing', False) |
|
737 | and remotephases.get(b'publishing', False) | |
742 | ): |
|
738 | ): | |
743 | # When: |
|
739 | # When: | |
744 | # - this is a subrepo push |
|
740 | # - this is a subrepo push | |
745 | # - and remote support phase |
|
741 | # - and remote support phase | |
746 | # - and no changeset are to be pushed |
|
742 | # - and no changeset are to be pushed | |
747 | # - and remote is publishing |
|
743 | # - and remote is publishing | |
748 | # We may be in issue 3781 case! |
|
744 | # We may be in issue 3781 case! | |
749 | # We drop the possible phase synchronisation done by |
|
745 | # We drop the possible phase synchronisation done by | |
750 | # courtesy to publish changesets possibly locally draft |
|
746 | # courtesy to publish changesets possibly locally draft | |
751 | # on the remote. |
|
747 | # on the remote. | |
752 | pushop.outdatedphases = [] |
|
748 | pushop.outdatedphases = [] | |
753 | pushop.fallbackoutdatedphases = [] |
|
749 | pushop.fallbackoutdatedphases = [] | |
754 | return |
|
750 | return | |
755 |
|
751 | |||
756 | pushop.remotephases = phases.remotephasessummary( |
|
752 | pushop.remotephases = phases.remotephasessummary( | |
757 | pushop.repo, pushop.fallbackheads, remotephases |
|
753 | pushop.repo, pushop.fallbackheads, remotephases | |
758 | ) |
|
754 | ) | |
759 | droots = pushop.remotephases.draftroots |
|
755 | droots = pushop.remotephases.draftroots | |
760 |
|
756 | |||
761 | extracond = b'' |
|
757 | extracond = b'' | |
762 | if not pushop.remotephases.publishing: |
|
758 | if not pushop.remotephases.publishing: | |
763 | extracond = b' and public()' |
|
759 | extracond = b' and public()' | |
764 | revset = b'heads((%%ln::%%ln) %s)' % extracond |
|
760 | revset = b'heads((%%ln::%%ln) %s)' % extracond | |
765 | # Get the list of all revs draft on remote by public here. |
|
761 | # Get the list of all revs draft on remote by public here. | |
766 | # XXX Beware that revset break if droots is not strictly |
|
762 | # XXX Beware that revset break if droots is not strictly | |
767 | # XXX root we may want to ensure it is but it is costly |
|
763 | # XXX root we may want to ensure it is but it is costly | |
768 | fallback = list(unfi.set(revset, droots, pushop.fallbackheads)) |
|
764 | fallback = list(unfi.set(revset, droots, pushop.fallbackheads)) | |
769 | if not pushop.remotephases.publishing and pushop.publish: |
|
765 | if not pushop.remotephases.publishing and pushop.publish: | |
770 | future = list( |
|
766 | future = list( | |
771 | unfi.set( |
|
767 | unfi.set( | |
772 | b'%ln and (not public() or %ln::)', pushop.futureheads, droots |
|
768 | b'%ln and (not public() or %ln::)', pushop.futureheads, droots | |
773 | ) |
|
769 | ) | |
774 | ) |
|
770 | ) | |
775 | elif not outgoing.missing: |
|
771 | elif not outgoing.missing: | |
776 | future = fallback |
|
772 | future = fallback | |
777 | else: |
|
773 | else: | |
778 | # adds changeset we are going to push as draft |
|
774 | # adds changeset we are going to push as draft | |
779 | # |
|
775 | # | |
780 | # should not be necessary for publishing server, but because of an |
|
776 | # should not be necessary for publishing server, but because of an | |
781 | # issue fixed in xxxxx we have to do it anyway. |
|
777 | # issue fixed in xxxxx we have to do it anyway. | |
782 | fdroots = list( |
|
778 | fdroots = list( | |
783 | unfi.set(b'roots(%ln + %ln::)', outgoing.missing, droots) |
|
779 | unfi.set(b'roots(%ln + %ln::)', outgoing.missing, droots) | |
784 | ) |
|
780 | ) | |
785 | fdroots = [f.node() for f in fdroots] |
|
781 | fdroots = [f.node() for f in fdroots] | |
786 | future = list(unfi.set(revset, fdroots, pushop.futureheads)) |
|
782 | future = list(unfi.set(revset, fdroots, pushop.futureheads)) | |
787 | pushop.outdatedphases = future |
|
783 | pushop.outdatedphases = future | |
788 | pushop.fallbackoutdatedphases = fallback |
|
784 | pushop.fallbackoutdatedphases = fallback | |
789 |
|
785 | |||
790 |
|
786 | |||
791 | @pushdiscovery(b'obsmarker') |
|
787 | @pushdiscovery(b'obsmarker') | |
792 | def _pushdiscoveryobsmarkers(pushop): |
|
788 | def _pushdiscoveryobsmarkers(pushop): | |
793 | if not obsolete.isenabled(pushop.repo, obsolete.exchangeopt): |
|
789 | if not obsolete.isenabled(pushop.repo, obsolete.exchangeopt): | |
794 | return |
|
790 | return | |
795 |
|
791 | |||
796 | if not pushop.repo.obsstore: |
|
792 | if not pushop.repo.obsstore: | |
797 | return |
|
793 | return | |
798 |
|
794 | |||
799 | if b'obsolete' not in listkeys(pushop.remote, b'namespaces'): |
|
795 | if b'obsolete' not in listkeys(pushop.remote, b'namespaces'): | |
800 | return |
|
796 | return | |
801 |
|
797 | |||
802 | repo = pushop.repo |
|
798 | repo = pushop.repo | |
803 | # very naive computation, that can be quite expensive on big repo. |
|
799 | # very naive computation, that can be quite expensive on big repo. | |
804 | # However: evolution is currently slow on them anyway. |
|
800 | # However: evolution is currently slow on them anyway. | |
805 | nodes = (c.node() for c in repo.set(b'::%ln', pushop.futureheads)) |
|
801 | nodes = (c.node() for c in repo.set(b'::%ln', pushop.futureheads)) | |
806 | pushop.outobsmarkers = pushop.repo.obsstore.relevantmarkers(nodes) |
|
802 | pushop.outobsmarkers = pushop.repo.obsstore.relevantmarkers(nodes) | |
807 |
|
803 | |||
808 |
|
804 | |||
809 | @pushdiscovery(b'bookmarks') |
|
805 | @pushdiscovery(b'bookmarks') | |
810 | def _pushdiscoverybookmarks(pushop): |
|
806 | def _pushdiscoverybookmarks(pushop): | |
811 | ui = pushop.ui |
|
807 | ui = pushop.ui | |
812 | repo = pushop.repo.unfiltered() |
|
808 | repo = pushop.repo.unfiltered() | |
813 | remote = pushop.remote |
|
809 | remote = pushop.remote | |
814 | ui.debug(b"checking for updated bookmarks\n") |
|
810 | ui.debug(b"checking for updated bookmarks\n") | |
815 | ancestors = () |
|
811 | ancestors = () | |
816 | if pushop.revs: |
|
812 | if pushop.revs: | |
817 | revnums = pycompat.maplist(repo.changelog.rev, pushop.revs) |
|
813 | revnums = pycompat.maplist(repo.changelog.rev, pushop.revs) | |
818 | ancestors = repo.changelog.ancestors(revnums, inclusive=True) |
|
814 | ancestors = repo.changelog.ancestors(revnums, inclusive=True) | |
819 |
|
815 | |||
820 | remotebookmark = bookmod.unhexlifybookmarks(listkeys(remote, b'bookmarks')) |
|
816 | remotebookmark = bookmod.unhexlifybookmarks(listkeys(remote, b'bookmarks')) | |
821 |
|
817 | |||
822 | explicit = { |
|
818 | explicit = { | |
823 | repo._bookmarks.expandname(bookmark) for bookmark in pushop.bookmarks |
|
819 | repo._bookmarks.expandname(bookmark) for bookmark in pushop.bookmarks | |
824 | } |
|
820 | } | |
825 |
|
821 | |||
826 | comp = bookmod.comparebookmarks(repo, repo._bookmarks, remotebookmark) |
|
822 | comp = bookmod.comparebookmarks(repo, repo._bookmarks, remotebookmark) | |
827 | return _processcompared(pushop, ancestors, explicit, remotebookmark, comp) |
|
823 | return _processcompared(pushop, ancestors, explicit, remotebookmark, comp) | |
828 |
|
824 | |||
829 |
|
825 | |||
830 | def _processcompared(pushop, pushed, explicit, remotebms, comp): |
|
826 | def _processcompared(pushop, pushed, explicit, remotebms, comp): | |
831 | """take decision on bookmarks to push to the remote repo |
|
827 | """take decision on bookmarks to push to the remote repo | |
832 |
|
828 | |||
833 | Exists to help extensions alter this behavior. |
|
829 | Exists to help extensions alter this behavior. | |
834 | """ |
|
830 | """ | |
835 | addsrc, adddst, advsrc, advdst, diverge, differ, invalid, same = comp |
|
831 | addsrc, adddst, advsrc, advdst, diverge, differ, invalid, same = comp | |
836 |
|
832 | |||
837 | repo = pushop.repo |
|
833 | repo = pushop.repo | |
838 |
|
834 | |||
839 | for b, scid, dcid in advsrc: |
|
835 | for b, scid, dcid in advsrc: | |
840 | if b in explicit: |
|
836 | if b in explicit: | |
841 | explicit.remove(b) |
|
837 | explicit.remove(b) | |
842 | if not pushed or repo[scid].rev() in pushed: |
|
838 | if not pushed or repo[scid].rev() in pushed: | |
843 | pushop.outbookmarks.append((b, dcid, scid)) |
|
839 | pushop.outbookmarks.append((b, dcid, scid)) | |
844 | # search added bookmark |
|
840 | # search added bookmark | |
845 | for b, scid, dcid in addsrc: |
|
841 | for b, scid, dcid in addsrc: | |
846 | if b in explicit: |
|
842 | if b in explicit: | |
847 | explicit.remove(b) |
|
843 | explicit.remove(b) | |
848 | pushop.outbookmarks.append((b, b'', scid)) |
|
844 | pushop.outbookmarks.append((b, b'', scid)) | |
849 | # search for overwritten bookmark |
|
845 | # search for overwritten bookmark | |
850 | for b, scid, dcid in list(advdst) + list(diverge) + list(differ): |
|
846 | for b, scid, dcid in list(advdst) + list(diverge) + list(differ): | |
851 | if b in explicit: |
|
847 | if b in explicit: | |
852 | explicit.remove(b) |
|
848 | explicit.remove(b) | |
853 | pushop.outbookmarks.append((b, dcid, scid)) |
|
849 | pushop.outbookmarks.append((b, dcid, scid)) | |
854 | # search for bookmark to delete |
|
850 | # search for bookmark to delete | |
855 | for b, scid, dcid in adddst: |
|
851 | for b, scid, dcid in adddst: | |
856 | if b in explicit: |
|
852 | if b in explicit: | |
857 | explicit.remove(b) |
|
853 | explicit.remove(b) | |
858 | # treat as "deleted locally" |
|
854 | # treat as "deleted locally" | |
859 | pushop.outbookmarks.append((b, dcid, b'')) |
|
855 | pushop.outbookmarks.append((b, dcid, b'')) | |
860 | # identical bookmarks shouldn't get reported |
|
856 | # identical bookmarks shouldn't get reported | |
861 | for b, scid, dcid in same: |
|
857 | for b, scid, dcid in same: | |
862 | if b in explicit: |
|
858 | if b in explicit: | |
863 | explicit.remove(b) |
|
859 | explicit.remove(b) | |
864 |
|
860 | |||
865 | if explicit: |
|
861 | if explicit: | |
866 | explicit = sorted(explicit) |
|
862 | explicit = sorted(explicit) | |
867 | # we should probably list all of them |
|
863 | # we should probably list all of them | |
868 | pushop.ui.warn( |
|
864 | pushop.ui.warn( | |
869 | _( |
|
865 | _( | |
870 | b'bookmark %s does not exist on the local ' |
|
866 | b'bookmark %s does not exist on the local ' | |
871 | b'or remote repository!\n' |
|
867 | b'or remote repository!\n' | |
872 | ) |
|
868 | ) | |
873 | % explicit[0] |
|
869 | % explicit[0] | |
874 | ) |
|
870 | ) | |
875 | pushop.bkresult = 2 |
|
871 | pushop.bkresult = 2 | |
876 |
|
872 | |||
877 | pushop.outbookmarks.sort() |
|
873 | pushop.outbookmarks.sort() | |
878 |
|
874 | |||
879 |
|
875 | |||
880 | def _pushcheckoutgoing(pushop): |
|
876 | def _pushcheckoutgoing(pushop): | |
881 | outgoing = pushop.outgoing |
|
877 | outgoing = pushop.outgoing | |
882 | unfi = pushop.repo.unfiltered() |
|
878 | unfi = pushop.repo.unfiltered() | |
883 | if not outgoing.missing: |
|
879 | if not outgoing.missing: | |
884 | # nothing to push |
|
880 | # nothing to push | |
885 | scmutil.nochangesfound(unfi.ui, unfi, outgoing.excluded) |
|
881 | scmutil.nochangesfound(unfi.ui, unfi, outgoing.excluded) | |
886 | return False |
|
882 | return False | |
887 | # something to push |
|
883 | # something to push | |
888 | if not pushop.force: |
|
884 | if not pushop.force: | |
889 | # if repo.obsstore == False --> no obsolete |
|
885 | # if repo.obsstore == False --> no obsolete | |
890 | # then, save the iteration |
|
886 | # then, save the iteration | |
891 | if unfi.obsstore: |
|
887 | if unfi.obsstore: | |
892 | # this message are here for 80 char limit reason |
|
888 | # this message are here for 80 char limit reason | |
893 | mso = _(b"push includes obsolete changeset: %s!") |
|
889 | mso = _(b"push includes obsolete changeset: %s!") | |
894 | mspd = _(b"push includes phase-divergent changeset: %s!") |
|
890 | mspd = _(b"push includes phase-divergent changeset: %s!") | |
895 | mscd = _(b"push includes content-divergent changeset: %s!") |
|
891 | mscd = _(b"push includes content-divergent changeset: %s!") | |
896 | mst = { |
|
892 | mst = { | |
897 | b"orphan": _(b"push includes orphan changeset: %s!"), |
|
893 | b"orphan": _(b"push includes orphan changeset: %s!"), | |
898 | b"phase-divergent": mspd, |
|
894 | b"phase-divergent": mspd, | |
899 | b"content-divergent": mscd, |
|
895 | b"content-divergent": mscd, | |
900 | } |
|
896 | } | |
901 | # If we are to push if there is at least one |
|
897 | # If we are to push if there is at least one | |
902 | # obsolete or unstable changeset in missing, at |
|
898 | # obsolete or unstable changeset in missing, at | |
903 | # least one of the missinghead will be obsolete or |
|
899 | # least one of the missinghead will be obsolete or | |
904 | # unstable. So checking heads only is ok |
|
900 | # unstable. So checking heads only is ok | |
905 | for node in outgoing.missingheads: |
|
901 | for node in outgoing.missingheads: | |
906 | ctx = unfi[node] |
|
902 | ctx = unfi[node] | |
907 | if ctx.obsolete(): |
|
903 | if ctx.obsolete(): | |
908 | raise error.Abort(mso % ctx) |
|
904 | raise error.Abort(mso % ctx) | |
909 | elif ctx.isunstable(): |
|
905 | elif ctx.isunstable(): | |
910 | # TODO print more than one instability in the abort |
|
906 | # TODO print more than one instability in the abort | |
911 | # message |
|
907 | # message | |
912 | raise error.Abort(mst[ctx.instabilities()[0]] % ctx) |
|
908 | raise error.Abort(mst[ctx.instabilities()[0]] % ctx) | |
913 |
|
909 | |||
914 | discovery.checkheads(pushop) |
|
910 | discovery.checkheads(pushop) | |
915 | return True |
|
911 | return True | |
916 |
|
912 | |||
917 |
|
913 | |||
918 | # List of names of steps to perform for an outgoing bundle2, order matters. |
|
914 | # List of names of steps to perform for an outgoing bundle2, order matters. | |
919 | b2partsgenorder = [] |
|
915 | b2partsgenorder = [] | |
920 |
|
916 | |||
921 | # Mapping between step name and function |
|
917 | # Mapping between step name and function | |
922 | # |
|
918 | # | |
923 | # This exists to help extensions wrap steps if necessary |
|
919 | # This exists to help extensions wrap steps if necessary | |
924 | b2partsgenmapping = {} |
|
920 | b2partsgenmapping = {} | |
925 |
|
921 | |||
926 |
|
922 | |||
927 | def b2partsgenerator(stepname, idx=None): |
|
923 | def b2partsgenerator(stepname, idx=None): | |
928 | """decorator for function generating bundle2 part |
|
924 | """decorator for function generating bundle2 part | |
929 |
|
925 | |||
930 | The function is added to the step -> function mapping and appended to the |
|
926 | The function is added to the step -> function mapping and appended to the | |
931 | list of steps. Beware that decorated functions will be added in order |
|
927 | list of steps. Beware that decorated functions will be added in order | |
932 | (this may matter). |
|
928 | (this may matter). | |
933 |
|
929 | |||
934 | You can only use this decorator for new steps, if you want to wrap a step |
|
930 | You can only use this decorator for new steps, if you want to wrap a step | |
935 | from an extension, attack the b2partsgenmapping dictionary directly.""" |
|
931 | from an extension, attack the b2partsgenmapping dictionary directly.""" | |
936 |
|
932 | |||
937 | def dec(func): |
|
933 | def dec(func): | |
938 | assert stepname not in b2partsgenmapping |
|
934 | assert stepname not in b2partsgenmapping | |
939 | b2partsgenmapping[stepname] = func |
|
935 | b2partsgenmapping[stepname] = func | |
940 | if idx is None: |
|
936 | if idx is None: | |
941 | b2partsgenorder.append(stepname) |
|
937 | b2partsgenorder.append(stepname) | |
942 | else: |
|
938 | else: | |
943 | b2partsgenorder.insert(idx, stepname) |
|
939 | b2partsgenorder.insert(idx, stepname) | |
944 | return func |
|
940 | return func | |
945 |
|
941 | |||
946 | return dec |
|
942 | return dec | |
947 |
|
943 | |||
948 |
|
944 | |||
949 | def _pushb2ctxcheckheads(pushop, bundler): |
|
945 | def _pushb2ctxcheckheads(pushop, bundler): | |
950 | """Generate race condition checking parts |
|
946 | """Generate race condition checking parts | |
951 |
|
947 | |||
952 | Exists as an independent function to aid extensions |
|
948 | Exists as an independent function to aid extensions | |
953 | """ |
|
949 | """ | |
954 | # * 'force' do not check for push race, |
|
950 | # * 'force' do not check for push race, | |
955 | # * if we don't push anything, there are nothing to check. |
|
951 | # * if we don't push anything, there are nothing to check. | |
956 | if not pushop.force and pushop.outgoing.missingheads: |
|
952 | if not pushop.force and pushop.outgoing.missingheads: | |
957 | allowunrelated = b'related' in bundler.capabilities.get( |
|
953 | allowunrelated = b'related' in bundler.capabilities.get( | |
958 | b'checkheads', () |
|
954 | b'checkheads', () | |
959 | ) |
|
955 | ) | |
960 | emptyremote = pushop.pushbranchmap is None |
|
956 | emptyremote = pushop.pushbranchmap is None | |
961 | if not allowunrelated or emptyremote: |
|
957 | if not allowunrelated or emptyremote: | |
962 | bundler.newpart(b'check:heads', data=iter(pushop.remoteheads)) |
|
958 | bundler.newpart(b'check:heads', data=iter(pushop.remoteheads)) | |
963 | else: |
|
959 | else: | |
964 | affected = set() |
|
960 | affected = set() | |
965 | for branch, heads in pycompat.iteritems(pushop.pushbranchmap): |
|
961 | for branch, heads in pycompat.iteritems(pushop.pushbranchmap): | |
966 | remoteheads, newheads, unsyncedheads, discardedheads = heads |
|
962 | remoteheads, newheads, unsyncedheads, discardedheads = heads | |
967 | if remoteheads is not None: |
|
963 | if remoteheads is not None: | |
968 | remote = set(remoteheads) |
|
964 | remote = set(remoteheads) | |
969 | affected |= set(discardedheads) & remote |
|
965 | affected |= set(discardedheads) & remote | |
970 | affected |= remote - set(newheads) |
|
966 | affected |= remote - set(newheads) | |
971 | if affected: |
|
967 | if affected: | |
972 | data = iter(sorted(affected)) |
|
968 | data = iter(sorted(affected)) | |
973 | bundler.newpart(b'check:updated-heads', data=data) |
|
969 | bundler.newpart(b'check:updated-heads', data=data) | |
974 |
|
970 | |||
975 |
|
971 | |||
976 | def _pushing(pushop): |
|
972 | def _pushing(pushop): | |
977 | """return True if we are pushing anything""" |
|
973 | """return True if we are pushing anything""" | |
978 | return bool( |
|
974 | return bool( | |
979 | pushop.outgoing.missing |
|
975 | pushop.outgoing.missing | |
980 | or pushop.outdatedphases |
|
976 | or pushop.outdatedphases | |
981 | or pushop.outobsmarkers |
|
977 | or pushop.outobsmarkers | |
982 | or pushop.outbookmarks |
|
978 | or pushop.outbookmarks | |
983 | ) |
|
979 | ) | |
984 |
|
980 | |||
985 |
|
981 | |||
986 | @b2partsgenerator(b'check-bookmarks') |
|
982 | @b2partsgenerator(b'check-bookmarks') | |
987 | def _pushb2checkbookmarks(pushop, bundler): |
|
983 | def _pushb2checkbookmarks(pushop, bundler): | |
988 | """insert bookmark move checking""" |
|
984 | """insert bookmark move checking""" | |
989 | if not _pushing(pushop) or pushop.force: |
|
985 | if not _pushing(pushop) or pushop.force: | |
990 | return |
|
986 | return | |
991 | b2caps = bundle2.bundle2caps(pushop.remote) |
|
987 | b2caps = bundle2.bundle2caps(pushop.remote) | |
992 | hasbookmarkcheck = b'bookmarks' in b2caps |
|
988 | hasbookmarkcheck = b'bookmarks' in b2caps | |
993 | if not (pushop.outbookmarks and hasbookmarkcheck): |
|
989 | if not (pushop.outbookmarks and hasbookmarkcheck): | |
994 | return |
|
990 | return | |
995 | data = [] |
|
991 | data = [] | |
996 | for book, old, new in pushop.outbookmarks: |
|
992 | for book, old, new in pushop.outbookmarks: | |
997 | data.append((book, old)) |
|
993 | data.append((book, old)) | |
998 | checkdata = bookmod.binaryencode(data) |
|
994 | checkdata = bookmod.binaryencode(data) | |
999 | bundler.newpart(b'check:bookmarks', data=checkdata) |
|
995 | bundler.newpart(b'check:bookmarks', data=checkdata) | |
1000 |
|
996 | |||
1001 |
|
997 | |||
1002 | @b2partsgenerator(b'check-phases') |
|
998 | @b2partsgenerator(b'check-phases') | |
1003 | def _pushb2checkphases(pushop, bundler): |
|
999 | def _pushb2checkphases(pushop, bundler): | |
1004 | """insert phase move checking""" |
|
1000 | """insert phase move checking""" | |
1005 | if not _pushing(pushop) or pushop.force: |
|
1001 | if not _pushing(pushop) or pushop.force: | |
1006 | return |
|
1002 | return | |
1007 | b2caps = bundle2.bundle2caps(pushop.remote) |
|
1003 | b2caps = bundle2.bundle2caps(pushop.remote) | |
1008 | hasphaseheads = b'heads' in b2caps.get(b'phases', ()) |
|
1004 | hasphaseheads = b'heads' in b2caps.get(b'phases', ()) | |
1009 | if pushop.remotephases is not None and hasphaseheads: |
|
1005 | if pushop.remotephases is not None and hasphaseheads: | |
1010 | # check that the remote phase has not changed |
|
1006 | # check that the remote phase has not changed | |
1011 | checks = [[] for p in phases.allphases] |
|
1007 | checks = [[] for p in phases.allphases] | |
1012 | checks[phases.public].extend(pushop.remotephases.publicheads) |
|
1008 | checks[phases.public].extend(pushop.remotephases.publicheads) | |
1013 | checks[phases.draft].extend(pushop.remotephases.draftroots) |
|
1009 | checks[phases.draft].extend(pushop.remotephases.draftroots) | |
1014 | if any(checks): |
|
1010 | if any(checks): | |
1015 | for nodes in checks: |
|
1011 | for nodes in checks: | |
1016 | nodes.sort() |
|
1012 | nodes.sort() | |
1017 | checkdata = phases.binaryencode(checks) |
|
1013 | checkdata = phases.binaryencode(checks) | |
1018 | bundler.newpart(b'check:phases', data=checkdata) |
|
1014 | bundler.newpart(b'check:phases', data=checkdata) | |
1019 |
|
1015 | |||
1020 |
|
1016 | |||
1021 | @b2partsgenerator(b'changeset') |
|
1017 | @b2partsgenerator(b'changeset') | |
1022 | def _pushb2ctx(pushop, bundler): |
|
1018 | def _pushb2ctx(pushop, bundler): | |
1023 | """handle changegroup push through bundle2 |
|
1019 | """handle changegroup push through bundle2 | |
1024 |
|
1020 | |||
1025 | addchangegroup result is stored in the ``pushop.cgresult`` attribute. |
|
1021 | addchangegroup result is stored in the ``pushop.cgresult`` attribute. | |
1026 | """ |
|
1022 | """ | |
1027 | if b'changesets' in pushop.stepsdone: |
|
1023 | if b'changesets' in pushop.stepsdone: | |
1028 | return |
|
1024 | return | |
1029 | pushop.stepsdone.add(b'changesets') |
|
1025 | pushop.stepsdone.add(b'changesets') | |
1030 | # Send known heads to the server for race detection. |
|
1026 | # Send known heads to the server for race detection. | |
1031 | if not _pushcheckoutgoing(pushop): |
|
1027 | if not _pushcheckoutgoing(pushop): | |
1032 | return |
|
1028 | return | |
1033 | pushop.repo.prepushoutgoinghooks(pushop) |
|
1029 | pushop.repo.prepushoutgoinghooks(pushop) | |
1034 |
|
1030 | |||
1035 | _pushb2ctxcheckheads(pushop, bundler) |
|
1031 | _pushb2ctxcheckheads(pushop, bundler) | |
1036 |
|
1032 | |||
1037 | b2caps = bundle2.bundle2caps(pushop.remote) |
|
1033 | b2caps = bundle2.bundle2caps(pushop.remote) | |
1038 | version = b'01' |
|
1034 | version = b'01' | |
1039 | cgversions = b2caps.get(b'changegroup') |
|
1035 | cgversions = b2caps.get(b'changegroup') | |
1040 | if cgversions: # 3.1 and 3.2 ship with an empty value |
|
1036 | if cgversions: # 3.1 and 3.2 ship with an empty value | |
1041 | cgversions = [ |
|
1037 | cgversions = [ | |
1042 | v |
|
1038 | v | |
1043 | for v in cgversions |
|
1039 | for v in cgversions | |
1044 | if v in changegroup.supportedoutgoingversions(pushop.repo) |
|
1040 | if v in changegroup.supportedoutgoingversions(pushop.repo) | |
1045 | ] |
|
1041 | ] | |
1046 | if not cgversions: |
|
1042 | if not cgversions: | |
1047 | raise error.Abort(_(b'no common changegroup version')) |
|
1043 | raise error.Abort(_(b'no common changegroup version')) | |
1048 | version = max(cgversions) |
|
1044 | version = max(cgversions) | |
1049 | cgstream = changegroup.makestream( |
|
1045 | cgstream = changegroup.makestream( | |
1050 | pushop.repo, pushop.outgoing, version, b'push' |
|
1046 | pushop.repo, pushop.outgoing, version, b'push' | |
1051 | ) |
|
1047 | ) | |
1052 | cgpart = bundler.newpart(b'changegroup', data=cgstream) |
|
1048 | cgpart = bundler.newpart(b'changegroup', data=cgstream) | |
1053 | if cgversions: |
|
1049 | if cgversions: | |
1054 | cgpart.addparam(b'version', version) |
|
1050 | cgpart.addparam(b'version', version) | |
1055 | if b'treemanifest' in pushop.repo.requirements: |
|
1051 | if b'treemanifest' in pushop.repo.requirements: | |
1056 | cgpart.addparam(b'treemanifest', b'1') |
|
1052 | cgpart.addparam(b'treemanifest', b'1') | |
1057 | if b'exp-sidedata-flag' in pushop.repo.requirements: |
|
1053 | if b'exp-sidedata-flag' in pushop.repo.requirements: | |
1058 | cgpart.addparam(b'exp-sidedata', b'1') |
|
1054 | cgpart.addparam(b'exp-sidedata', b'1') | |
1059 |
|
1055 | |||
1060 | def handlereply(op): |
|
1056 | def handlereply(op): | |
1061 | """extract addchangegroup returns from server reply""" |
|
1057 | """extract addchangegroup returns from server reply""" | |
1062 | cgreplies = op.records.getreplies(cgpart.id) |
|
1058 | cgreplies = op.records.getreplies(cgpart.id) | |
1063 | assert len(cgreplies[b'changegroup']) == 1 |
|
1059 | assert len(cgreplies[b'changegroup']) == 1 | |
1064 | pushop.cgresult = cgreplies[b'changegroup'][0][b'return'] |
|
1060 | pushop.cgresult = cgreplies[b'changegroup'][0][b'return'] | |
1065 |
|
1061 | |||
1066 | return handlereply |
|
1062 | return handlereply | |
1067 |
|
1063 | |||
1068 |
|
1064 | |||
1069 | @b2partsgenerator(b'phase') |
|
1065 | @b2partsgenerator(b'phase') | |
1070 | def _pushb2phases(pushop, bundler): |
|
1066 | def _pushb2phases(pushop, bundler): | |
1071 | """handle phase push through bundle2""" |
|
1067 | """handle phase push through bundle2""" | |
1072 | if b'phases' in pushop.stepsdone: |
|
1068 | if b'phases' in pushop.stepsdone: | |
1073 | return |
|
1069 | return | |
1074 | b2caps = bundle2.bundle2caps(pushop.remote) |
|
1070 | b2caps = bundle2.bundle2caps(pushop.remote) | |
1075 | ui = pushop.repo.ui |
|
1071 | ui = pushop.repo.ui | |
1076 |
|
1072 | |||
1077 | legacyphase = b'phases' in ui.configlist(b'devel', b'legacy.exchange') |
|
1073 | legacyphase = b'phases' in ui.configlist(b'devel', b'legacy.exchange') | |
1078 | haspushkey = b'pushkey' in b2caps |
|
1074 | haspushkey = b'pushkey' in b2caps | |
1079 | hasphaseheads = b'heads' in b2caps.get(b'phases', ()) |
|
1075 | hasphaseheads = b'heads' in b2caps.get(b'phases', ()) | |
1080 |
|
1076 | |||
1081 | if hasphaseheads and not legacyphase: |
|
1077 | if hasphaseheads and not legacyphase: | |
1082 | return _pushb2phaseheads(pushop, bundler) |
|
1078 | return _pushb2phaseheads(pushop, bundler) | |
1083 | elif haspushkey: |
|
1079 | elif haspushkey: | |
1084 | return _pushb2phasespushkey(pushop, bundler) |
|
1080 | return _pushb2phasespushkey(pushop, bundler) | |
1085 |
|
1081 | |||
1086 |
|
1082 | |||
1087 | def _pushb2phaseheads(pushop, bundler): |
|
1083 | def _pushb2phaseheads(pushop, bundler): | |
1088 | """push phase information through a bundle2 - binary part""" |
|
1084 | """push phase information through a bundle2 - binary part""" | |
1089 | pushop.stepsdone.add(b'phases') |
|
1085 | pushop.stepsdone.add(b'phases') | |
1090 | if pushop.outdatedphases: |
|
1086 | if pushop.outdatedphases: | |
1091 | updates = [[] for p in phases.allphases] |
|
1087 | updates = [[] for p in phases.allphases] | |
1092 | updates[0].extend(h.node() for h in pushop.outdatedphases) |
|
1088 | updates[0].extend(h.node() for h in pushop.outdatedphases) | |
1093 | phasedata = phases.binaryencode(updates) |
|
1089 | phasedata = phases.binaryencode(updates) | |
1094 | bundler.newpart(b'phase-heads', data=phasedata) |
|
1090 | bundler.newpart(b'phase-heads', data=phasedata) | |
1095 |
|
1091 | |||
1096 |
|
1092 | |||
1097 | def _pushb2phasespushkey(pushop, bundler): |
|
1093 | def _pushb2phasespushkey(pushop, bundler): | |
1098 | """push phase information through a bundle2 - pushkey part""" |
|
1094 | """push phase information through a bundle2 - pushkey part""" | |
1099 | pushop.stepsdone.add(b'phases') |
|
1095 | pushop.stepsdone.add(b'phases') | |
1100 | part2node = [] |
|
1096 | part2node = [] | |
1101 |
|
1097 | |||
1102 | def handlefailure(pushop, exc): |
|
1098 | def handlefailure(pushop, exc): | |
1103 | targetid = int(exc.partid) |
|
1099 | targetid = int(exc.partid) | |
1104 | for partid, node in part2node: |
|
1100 | for partid, node in part2node: | |
1105 | if partid == targetid: |
|
1101 | if partid == targetid: | |
1106 | raise error.Abort(_(b'updating %s to public failed') % node) |
|
1102 | raise error.Abort(_(b'updating %s to public failed') % node) | |
1107 |
|
1103 | |||
1108 | enc = pushkey.encode |
|
1104 | enc = pushkey.encode | |
1109 | for newremotehead in pushop.outdatedphases: |
|
1105 | for newremotehead in pushop.outdatedphases: | |
1110 | part = bundler.newpart(b'pushkey') |
|
1106 | part = bundler.newpart(b'pushkey') | |
1111 | part.addparam(b'namespace', enc(b'phases')) |
|
1107 | part.addparam(b'namespace', enc(b'phases')) | |
1112 | part.addparam(b'key', enc(newremotehead.hex())) |
|
1108 | part.addparam(b'key', enc(newremotehead.hex())) | |
1113 | part.addparam(b'old', enc(b'%d' % phases.draft)) |
|
1109 | part.addparam(b'old', enc(b'%d' % phases.draft)) | |
1114 | part.addparam(b'new', enc(b'%d' % phases.public)) |
|
1110 | part.addparam(b'new', enc(b'%d' % phases.public)) | |
1115 | part2node.append((part.id, newremotehead)) |
|
1111 | part2node.append((part.id, newremotehead)) | |
1116 | pushop.pkfailcb[part.id] = handlefailure |
|
1112 | pushop.pkfailcb[part.id] = handlefailure | |
1117 |
|
1113 | |||
1118 | def handlereply(op): |
|
1114 | def handlereply(op): | |
1119 | for partid, node in part2node: |
|
1115 | for partid, node in part2node: | |
1120 | partrep = op.records.getreplies(partid) |
|
1116 | partrep = op.records.getreplies(partid) | |
1121 | results = partrep[b'pushkey'] |
|
1117 | results = partrep[b'pushkey'] | |
1122 | assert len(results) <= 1 |
|
1118 | assert len(results) <= 1 | |
1123 | msg = None |
|
1119 | msg = None | |
1124 | if not results: |
|
1120 | if not results: | |
1125 | msg = _(b'server ignored update of %s to public!\n') % node |
|
1121 | msg = _(b'server ignored update of %s to public!\n') % node | |
1126 | elif not int(results[0][b'return']): |
|
1122 | elif not int(results[0][b'return']): | |
1127 | msg = _(b'updating %s to public failed!\n') % node |
|
1123 | msg = _(b'updating %s to public failed!\n') % node | |
1128 | if msg is not None: |
|
1124 | if msg is not None: | |
1129 | pushop.ui.warn(msg) |
|
1125 | pushop.ui.warn(msg) | |
1130 |
|
1126 | |||
1131 | return handlereply |
|
1127 | return handlereply | |
1132 |
|
1128 | |||
1133 |
|
1129 | |||
1134 | @b2partsgenerator(b'obsmarkers') |
|
1130 | @b2partsgenerator(b'obsmarkers') | |
1135 | def _pushb2obsmarkers(pushop, bundler): |
|
1131 | def _pushb2obsmarkers(pushop, bundler): | |
1136 | if b'obsmarkers' in pushop.stepsdone: |
|
1132 | if b'obsmarkers' in pushop.stepsdone: | |
1137 | return |
|
1133 | return | |
1138 | remoteversions = bundle2.obsmarkersversion(bundler.capabilities) |
|
1134 | remoteversions = bundle2.obsmarkersversion(bundler.capabilities) | |
1139 | if obsolete.commonversion(remoteversions) is None: |
|
1135 | if obsolete.commonversion(remoteversions) is None: | |
1140 | return |
|
1136 | return | |
1141 | pushop.stepsdone.add(b'obsmarkers') |
|
1137 | pushop.stepsdone.add(b'obsmarkers') | |
1142 | if pushop.outobsmarkers: |
|
1138 | if pushop.outobsmarkers: | |
1143 |
markers = |
|
1139 | markers = obsutil.sortedmarkers(pushop.outobsmarkers) | |
1144 | bundle2.buildobsmarkerspart(bundler, markers) |
|
1140 | bundle2.buildobsmarkerspart(bundler, markers) | |
1145 |
|
1141 | |||
1146 |
|
1142 | |||
1147 | @b2partsgenerator(b'bookmarks') |
|
1143 | @b2partsgenerator(b'bookmarks') | |
1148 | def _pushb2bookmarks(pushop, bundler): |
|
1144 | def _pushb2bookmarks(pushop, bundler): | |
1149 | """handle bookmark push through bundle2""" |
|
1145 | """handle bookmark push through bundle2""" | |
1150 | if b'bookmarks' in pushop.stepsdone: |
|
1146 | if b'bookmarks' in pushop.stepsdone: | |
1151 | return |
|
1147 | return | |
1152 | b2caps = bundle2.bundle2caps(pushop.remote) |
|
1148 | b2caps = bundle2.bundle2caps(pushop.remote) | |
1153 |
|
1149 | |||
1154 | legacy = pushop.repo.ui.configlist(b'devel', b'legacy.exchange') |
|
1150 | legacy = pushop.repo.ui.configlist(b'devel', b'legacy.exchange') | |
1155 | legacybooks = b'bookmarks' in legacy |
|
1151 | legacybooks = b'bookmarks' in legacy | |
1156 |
|
1152 | |||
1157 | if not legacybooks and b'bookmarks' in b2caps: |
|
1153 | if not legacybooks and b'bookmarks' in b2caps: | |
1158 | return _pushb2bookmarkspart(pushop, bundler) |
|
1154 | return _pushb2bookmarkspart(pushop, bundler) | |
1159 | elif b'pushkey' in b2caps: |
|
1155 | elif b'pushkey' in b2caps: | |
1160 | return _pushb2bookmarkspushkey(pushop, bundler) |
|
1156 | return _pushb2bookmarkspushkey(pushop, bundler) | |
1161 |
|
1157 | |||
1162 |
|
1158 | |||
1163 | def _bmaction(old, new): |
|
1159 | def _bmaction(old, new): | |
1164 | """small utility for bookmark pushing""" |
|
1160 | """small utility for bookmark pushing""" | |
1165 | if not old: |
|
1161 | if not old: | |
1166 | return b'export' |
|
1162 | return b'export' | |
1167 | elif not new: |
|
1163 | elif not new: | |
1168 | return b'delete' |
|
1164 | return b'delete' | |
1169 | return b'update' |
|
1165 | return b'update' | |
1170 |
|
1166 | |||
1171 |
|
1167 | |||
1172 | def _abortonsecretctx(pushop, node, b): |
|
1168 | def _abortonsecretctx(pushop, node, b): | |
1173 | """abort if a given bookmark points to a secret changeset""" |
|
1169 | """abort if a given bookmark points to a secret changeset""" | |
1174 | if node and pushop.repo[node].phase() == phases.secret: |
|
1170 | if node and pushop.repo[node].phase() == phases.secret: | |
1175 | raise error.Abort( |
|
1171 | raise error.Abort( | |
1176 | _(b'cannot push bookmark %s as it points to a secret changeset') % b |
|
1172 | _(b'cannot push bookmark %s as it points to a secret changeset') % b | |
1177 | ) |
|
1173 | ) | |
1178 |
|
1174 | |||
1179 |
|
1175 | |||
1180 | def _pushb2bookmarkspart(pushop, bundler): |
|
1176 | def _pushb2bookmarkspart(pushop, bundler): | |
1181 | pushop.stepsdone.add(b'bookmarks') |
|
1177 | pushop.stepsdone.add(b'bookmarks') | |
1182 | if not pushop.outbookmarks: |
|
1178 | if not pushop.outbookmarks: | |
1183 | return |
|
1179 | return | |
1184 |
|
1180 | |||
1185 | allactions = [] |
|
1181 | allactions = [] | |
1186 | data = [] |
|
1182 | data = [] | |
1187 | for book, old, new in pushop.outbookmarks: |
|
1183 | for book, old, new in pushop.outbookmarks: | |
1188 | _abortonsecretctx(pushop, new, book) |
|
1184 | _abortonsecretctx(pushop, new, book) | |
1189 | data.append((book, new)) |
|
1185 | data.append((book, new)) | |
1190 | allactions.append((book, _bmaction(old, new))) |
|
1186 | allactions.append((book, _bmaction(old, new))) | |
1191 | checkdata = bookmod.binaryencode(data) |
|
1187 | checkdata = bookmod.binaryencode(data) | |
1192 | bundler.newpart(b'bookmarks', data=checkdata) |
|
1188 | bundler.newpart(b'bookmarks', data=checkdata) | |
1193 |
|
1189 | |||
1194 | def handlereply(op): |
|
1190 | def handlereply(op): | |
1195 | ui = pushop.ui |
|
1191 | ui = pushop.ui | |
1196 | # if success |
|
1192 | # if success | |
1197 | for book, action in allactions: |
|
1193 | for book, action in allactions: | |
1198 | ui.status(bookmsgmap[action][0] % book) |
|
1194 | ui.status(bookmsgmap[action][0] % book) | |
1199 |
|
1195 | |||
1200 | return handlereply |
|
1196 | return handlereply | |
1201 |
|
1197 | |||
1202 |
|
1198 | |||
1203 | def _pushb2bookmarkspushkey(pushop, bundler): |
|
1199 | def _pushb2bookmarkspushkey(pushop, bundler): | |
1204 | pushop.stepsdone.add(b'bookmarks') |
|
1200 | pushop.stepsdone.add(b'bookmarks') | |
1205 | part2book = [] |
|
1201 | part2book = [] | |
1206 | enc = pushkey.encode |
|
1202 | enc = pushkey.encode | |
1207 |
|
1203 | |||
1208 | def handlefailure(pushop, exc): |
|
1204 | def handlefailure(pushop, exc): | |
1209 | targetid = int(exc.partid) |
|
1205 | targetid = int(exc.partid) | |
1210 | for partid, book, action in part2book: |
|
1206 | for partid, book, action in part2book: | |
1211 | if partid == targetid: |
|
1207 | if partid == targetid: | |
1212 | raise error.Abort(bookmsgmap[action][1].rstrip() % book) |
|
1208 | raise error.Abort(bookmsgmap[action][1].rstrip() % book) | |
1213 | # we should not be called for part we did not generated |
|
1209 | # we should not be called for part we did not generated | |
1214 | assert False |
|
1210 | assert False | |
1215 |
|
1211 | |||
1216 | for book, old, new in pushop.outbookmarks: |
|
1212 | for book, old, new in pushop.outbookmarks: | |
1217 | _abortonsecretctx(pushop, new, book) |
|
1213 | _abortonsecretctx(pushop, new, book) | |
1218 | part = bundler.newpart(b'pushkey') |
|
1214 | part = bundler.newpart(b'pushkey') | |
1219 | part.addparam(b'namespace', enc(b'bookmarks')) |
|
1215 | part.addparam(b'namespace', enc(b'bookmarks')) | |
1220 | part.addparam(b'key', enc(book)) |
|
1216 | part.addparam(b'key', enc(book)) | |
1221 | part.addparam(b'old', enc(hex(old))) |
|
1217 | part.addparam(b'old', enc(hex(old))) | |
1222 | part.addparam(b'new', enc(hex(new))) |
|
1218 | part.addparam(b'new', enc(hex(new))) | |
1223 | action = b'update' |
|
1219 | action = b'update' | |
1224 | if not old: |
|
1220 | if not old: | |
1225 | action = b'export' |
|
1221 | action = b'export' | |
1226 | elif not new: |
|
1222 | elif not new: | |
1227 | action = b'delete' |
|
1223 | action = b'delete' | |
1228 | part2book.append((part.id, book, action)) |
|
1224 | part2book.append((part.id, book, action)) | |
1229 | pushop.pkfailcb[part.id] = handlefailure |
|
1225 | pushop.pkfailcb[part.id] = handlefailure | |
1230 |
|
1226 | |||
1231 | def handlereply(op): |
|
1227 | def handlereply(op): | |
1232 | ui = pushop.ui |
|
1228 | ui = pushop.ui | |
1233 | for partid, book, action in part2book: |
|
1229 | for partid, book, action in part2book: | |
1234 | partrep = op.records.getreplies(partid) |
|
1230 | partrep = op.records.getreplies(partid) | |
1235 | results = partrep[b'pushkey'] |
|
1231 | results = partrep[b'pushkey'] | |
1236 | assert len(results) <= 1 |
|
1232 | assert len(results) <= 1 | |
1237 | if not results: |
|
1233 | if not results: | |
1238 | pushop.ui.warn(_(b'server ignored bookmark %s update\n') % book) |
|
1234 | pushop.ui.warn(_(b'server ignored bookmark %s update\n') % book) | |
1239 | else: |
|
1235 | else: | |
1240 | ret = int(results[0][b'return']) |
|
1236 | ret = int(results[0][b'return']) | |
1241 | if ret: |
|
1237 | if ret: | |
1242 | ui.status(bookmsgmap[action][0] % book) |
|
1238 | ui.status(bookmsgmap[action][0] % book) | |
1243 | else: |
|
1239 | else: | |
1244 | ui.warn(bookmsgmap[action][1] % book) |
|
1240 | ui.warn(bookmsgmap[action][1] % book) | |
1245 | if pushop.bkresult is not None: |
|
1241 | if pushop.bkresult is not None: | |
1246 | pushop.bkresult = 1 |
|
1242 | pushop.bkresult = 1 | |
1247 |
|
1243 | |||
1248 | return handlereply |
|
1244 | return handlereply | |
1249 |
|
1245 | |||
1250 |
|
1246 | |||
1251 | @b2partsgenerator(b'pushvars', idx=0) |
|
1247 | @b2partsgenerator(b'pushvars', idx=0) | |
1252 | def _getbundlesendvars(pushop, bundler): |
|
1248 | def _getbundlesendvars(pushop, bundler): | |
1253 | '''send shellvars via bundle2''' |
|
1249 | '''send shellvars via bundle2''' | |
1254 | pushvars = pushop.pushvars |
|
1250 | pushvars = pushop.pushvars | |
1255 | if pushvars: |
|
1251 | if pushvars: | |
1256 | shellvars = {} |
|
1252 | shellvars = {} | |
1257 | for raw in pushvars: |
|
1253 | for raw in pushvars: | |
1258 | if b'=' not in raw: |
|
1254 | if b'=' not in raw: | |
1259 | msg = ( |
|
1255 | msg = ( | |
1260 | b"unable to parse variable '%s', should follow " |
|
1256 | b"unable to parse variable '%s', should follow " | |
1261 | b"'KEY=VALUE' or 'KEY=' format" |
|
1257 | b"'KEY=VALUE' or 'KEY=' format" | |
1262 | ) |
|
1258 | ) | |
1263 | raise error.Abort(msg % raw) |
|
1259 | raise error.Abort(msg % raw) | |
1264 | k, v = raw.split(b'=', 1) |
|
1260 | k, v = raw.split(b'=', 1) | |
1265 | shellvars[k] = v |
|
1261 | shellvars[k] = v | |
1266 |
|
1262 | |||
1267 | part = bundler.newpart(b'pushvars') |
|
1263 | part = bundler.newpart(b'pushvars') | |
1268 |
|
1264 | |||
1269 | for key, value in pycompat.iteritems(shellvars): |
|
1265 | for key, value in pycompat.iteritems(shellvars): | |
1270 | part.addparam(key, value, mandatory=False) |
|
1266 | part.addparam(key, value, mandatory=False) | |
1271 |
|
1267 | |||
1272 |
|
1268 | |||
1273 | def _pushbundle2(pushop): |
|
1269 | def _pushbundle2(pushop): | |
1274 | """push data to the remote using bundle2 |
|
1270 | """push data to the remote using bundle2 | |
1275 |
|
1271 | |||
1276 | The only currently supported type of data is changegroup but this will |
|
1272 | The only currently supported type of data is changegroup but this will | |
1277 | evolve in the future.""" |
|
1273 | evolve in the future.""" | |
1278 | bundler = bundle2.bundle20(pushop.ui, bundle2.bundle2caps(pushop.remote)) |
|
1274 | bundler = bundle2.bundle20(pushop.ui, bundle2.bundle2caps(pushop.remote)) | |
1279 | pushback = pushop.trmanager and pushop.ui.configbool( |
|
1275 | pushback = pushop.trmanager and pushop.ui.configbool( | |
1280 | b'experimental', b'bundle2.pushback' |
|
1276 | b'experimental', b'bundle2.pushback' | |
1281 | ) |
|
1277 | ) | |
1282 |
|
1278 | |||
1283 | # create reply capability |
|
1279 | # create reply capability | |
1284 | capsblob = bundle2.encodecaps( |
|
1280 | capsblob = bundle2.encodecaps( | |
1285 | bundle2.getrepocaps(pushop.repo, allowpushback=pushback, role=b'client') |
|
1281 | bundle2.getrepocaps(pushop.repo, allowpushback=pushback, role=b'client') | |
1286 | ) |
|
1282 | ) | |
1287 | bundler.newpart(b'replycaps', data=capsblob) |
|
1283 | bundler.newpart(b'replycaps', data=capsblob) | |
1288 | replyhandlers = [] |
|
1284 | replyhandlers = [] | |
1289 | for partgenname in b2partsgenorder: |
|
1285 | for partgenname in b2partsgenorder: | |
1290 | partgen = b2partsgenmapping[partgenname] |
|
1286 | partgen = b2partsgenmapping[partgenname] | |
1291 | ret = partgen(pushop, bundler) |
|
1287 | ret = partgen(pushop, bundler) | |
1292 | if callable(ret): |
|
1288 | if callable(ret): | |
1293 | replyhandlers.append(ret) |
|
1289 | replyhandlers.append(ret) | |
1294 | # do not push if nothing to push |
|
1290 | # do not push if nothing to push | |
1295 | if bundler.nbparts <= 1: |
|
1291 | if bundler.nbparts <= 1: | |
1296 | return |
|
1292 | return | |
1297 | stream = util.chunkbuffer(bundler.getchunks()) |
|
1293 | stream = util.chunkbuffer(bundler.getchunks()) | |
1298 | try: |
|
1294 | try: | |
1299 | try: |
|
1295 | try: | |
1300 | with pushop.remote.commandexecutor() as e: |
|
1296 | with pushop.remote.commandexecutor() as e: | |
1301 | reply = e.callcommand( |
|
1297 | reply = e.callcommand( | |
1302 | b'unbundle', |
|
1298 | b'unbundle', | |
1303 | { |
|
1299 | { | |
1304 | b'bundle': stream, |
|
1300 | b'bundle': stream, | |
1305 | b'heads': [b'force'], |
|
1301 | b'heads': [b'force'], | |
1306 | b'url': pushop.remote.url(), |
|
1302 | b'url': pushop.remote.url(), | |
1307 | }, |
|
1303 | }, | |
1308 | ).result() |
|
1304 | ).result() | |
1309 | except error.BundleValueError as exc: |
|
1305 | except error.BundleValueError as exc: | |
1310 | raise error.Abort(_(b'missing support for %s') % exc) |
|
1306 | raise error.Abort(_(b'missing support for %s') % exc) | |
1311 | try: |
|
1307 | try: | |
1312 | trgetter = None |
|
1308 | trgetter = None | |
1313 | if pushback: |
|
1309 | if pushback: | |
1314 | trgetter = pushop.trmanager.transaction |
|
1310 | trgetter = pushop.trmanager.transaction | |
1315 | op = bundle2.processbundle(pushop.repo, reply, trgetter) |
|
1311 | op = bundle2.processbundle(pushop.repo, reply, trgetter) | |
1316 | except error.BundleValueError as exc: |
|
1312 | except error.BundleValueError as exc: | |
1317 | raise error.Abort(_(b'missing support for %s') % exc) |
|
1313 | raise error.Abort(_(b'missing support for %s') % exc) | |
1318 | except bundle2.AbortFromPart as exc: |
|
1314 | except bundle2.AbortFromPart as exc: | |
1319 | pushop.ui.status(_(b'remote: %s\n') % exc) |
|
1315 | pushop.ui.status(_(b'remote: %s\n') % exc) | |
1320 | if exc.hint is not None: |
|
1316 | if exc.hint is not None: | |
1321 | pushop.ui.status(_(b'remote: %s\n') % (b'(%s)' % exc.hint)) |
|
1317 | pushop.ui.status(_(b'remote: %s\n') % (b'(%s)' % exc.hint)) | |
1322 | raise error.Abort(_(b'push failed on remote')) |
|
1318 | raise error.Abort(_(b'push failed on remote')) | |
1323 | except error.PushkeyFailed as exc: |
|
1319 | except error.PushkeyFailed as exc: | |
1324 | partid = int(exc.partid) |
|
1320 | partid = int(exc.partid) | |
1325 | if partid not in pushop.pkfailcb: |
|
1321 | if partid not in pushop.pkfailcb: | |
1326 | raise |
|
1322 | raise | |
1327 | pushop.pkfailcb[partid](pushop, exc) |
|
1323 | pushop.pkfailcb[partid](pushop, exc) | |
1328 | for rephand in replyhandlers: |
|
1324 | for rephand in replyhandlers: | |
1329 | rephand(op) |
|
1325 | rephand(op) | |
1330 |
|
1326 | |||
1331 |
|
1327 | |||
1332 | def _pushchangeset(pushop): |
|
1328 | def _pushchangeset(pushop): | |
1333 | """Make the actual push of changeset bundle to remote repo""" |
|
1329 | """Make the actual push of changeset bundle to remote repo""" | |
1334 | if b'changesets' in pushop.stepsdone: |
|
1330 | if b'changesets' in pushop.stepsdone: | |
1335 | return |
|
1331 | return | |
1336 | pushop.stepsdone.add(b'changesets') |
|
1332 | pushop.stepsdone.add(b'changesets') | |
1337 | if not _pushcheckoutgoing(pushop): |
|
1333 | if not _pushcheckoutgoing(pushop): | |
1338 | return |
|
1334 | return | |
1339 |
|
1335 | |||
1340 | # Should have verified this in push(). |
|
1336 | # Should have verified this in push(). | |
1341 | assert pushop.remote.capable(b'unbundle') |
|
1337 | assert pushop.remote.capable(b'unbundle') | |
1342 |
|
1338 | |||
1343 | pushop.repo.prepushoutgoinghooks(pushop) |
|
1339 | pushop.repo.prepushoutgoinghooks(pushop) | |
1344 | outgoing = pushop.outgoing |
|
1340 | outgoing = pushop.outgoing | |
1345 | # TODO: get bundlecaps from remote |
|
1341 | # TODO: get bundlecaps from remote | |
1346 | bundlecaps = None |
|
1342 | bundlecaps = None | |
1347 | # create a changegroup from local |
|
1343 | # create a changegroup from local | |
1348 | if pushop.revs is None and not ( |
|
1344 | if pushop.revs is None and not ( | |
1349 | outgoing.excluded or pushop.repo.changelog.filteredrevs |
|
1345 | outgoing.excluded or pushop.repo.changelog.filteredrevs | |
1350 | ): |
|
1346 | ): | |
1351 | # push everything, |
|
1347 | # push everything, | |
1352 | # use the fast path, no race possible on push |
|
1348 | # use the fast path, no race possible on push | |
1353 | cg = changegroup.makechangegroup( |
|
1349 | cg = changegroup.makechangegroup( | |
1354 | pushop.repo, |
|
1350 | pushop.repo, | |
1355 | outgoing, |
|
1351 | outgoing, | |
1356 | b'01', |
|
1352 | b'01', | |
1357 | b'push', |
|
1353 | b'push', | |
1358 | fastpath=True, |
|
1354 | fastpath=True, | |
1359 | bundlecaps=bundlecaps, |
|
1355 | bundlecaps=bundlecaps, | |
1360 | ) |
|
1356 | ) | |
1361 | else: |
|
1357 | else: | |
1362 | cg = changegroup.makechangegroup( |
|
1358 | cg = changegroup.makechangegroup( | |
1363 | pushop.repo, outgoing, b'01', b'push', bundlecaps=bundlecaps |
|
1359 | pushop.repo, outgoing, b'01', b'push', bundlecaps=bundlecaps | |
1364 | ) |
|
1360 | ) | |
1365 |
|
1361 | |||
1366 | # apply changegroup to remote |
|
1362 | # apply changegroup to remote | |
1367 | # local repo finds heads on server, finds out what |
|
1363 | # local repo finds heads on server, finds out what | |
1368 | # revs it must push. once revs transferred, if server |
|
1364 | # revs it must push. once revs transferred, if server | |
1369 | # finds it has different heads (someone else won |
|
1365 | # finds it has different heads (someone else won | |
1370 | # commit/push race), server aborts. |
|
1366 | # commit/push race), server aborts. | |
1371 | if pushop.force: |
|
1367 | if pushop.force: | |
1372 | remoteheads = [b'force'] |
|
1368 | remoteheads = [b'force'] | |
1373 | else: |
|
1369 | else: | |
1374 | remoteheads = pushop.remoteheads |
|
1370 | remoteheads = pushop.remoteheads | |
1375 | # ssh: return remote's addchangegroup() |
|
1371 | # ssh: return remote's addchangegroup() | |
1376 | # http: return remote's addchangegroup() or 0 for error |
|
1372 | # http: return remote's addchangegroup() or 0 for error | |
1377 | pushop.cgresult = pushop.remote.unbundle(cg, remoteheads, pushop.repo.url()) |
|
1373 | pushop.cgresult = pushop.remote.unbundle(cg, remoteheads, pushop.repo.url()) | |
1378 |
|
1374 | |||
1379 |
|
1375 | |||
1380 | def _pushsyncphase(pushop): |
|
1376 | def _pushsyncphase(pushop): | |
1381 | """synchronise phase information locally and remotely""" |
|
1377 | """synchronise phase information locally and remotely""" | |
1382 | cheads = pushop.commonheads |
|
1378 | cheads = pushop.commonheads | |
1383 | # even when we don't push, exchanging phase data is useful |
|
1379 | # even when we don't push, exchanging phase data is useful | |
1384 | remotephases = listkeys(pushop.remote, b'phases') |
|
1380 | remotephases = listkeys(pushop.remote, b'phases') | |
1385 | if ( |
|
1381 | if ( | |
1386 | pushop.ui.configbool(b'ui', b'_usedassubrepo') |
|
1382 | pushop.ui.configbool(b'ui', b'_usedassubrepo') | |
1387 | and remotephases # server supports phases |
|
1383 | and remotephases # server supports phases | |
1388 | and pushop.cgresult is None # nothing was pushed |
|
1384 | and pushop.cgresult is None # nothing was pushed | |
1389 | and remotephases.get(b'publishing', False) |
|
1385 | and remotephases.get(b'publishing', False) | |
1390 | ): |
|
1386 | ): | |
1391 | # When: |
|
1387 | # When: | |
1392 | # - this is a subrepo push |
|
1388 | # - this is a subrepo push | |
1393 | # - and remote support phase |
|
1389 | # - and remote support phase | |
1394 | # - and no changeset was pushed |
|
1390 | # - and no changeset was pushed | |
1395 | # - and remote is publishing |
|
1391 | # - and remote is publishing | |
1396 | # We may be in issue 3871 case! |
|
1392 | # We may be in issue 3871 case! | |
1397 | # We drop the possible phase synchronisation done by |
|
1393 | # We drop the possible phase synchronisation done by | |
1398 | # courtesy to publish changesets possibly locally draft |
|
1394 | # courtesy to publish changesets possibly locally draft | |
1399 | # on the remote. |
|
1395 | # on the remote. | |
1400 | remotephases = {b'publishing': b'True'} |
|
1396 | remotephases = {b'publishing': b'True'} | |
1401 | if not remotephases: # old server or public only reply from non-publishing |
|
1397 | if not remotephases: # old server or public only reply from non-publishing | |
1402 | _localphasemove(pushop, cheads) |
|
1398 | _localphasemove(pushop, cheads) | |
1403 | # don't push any phase data as there is nothing to push |
|
1399 | # don't push any phase data as there is nothing to push | |
1404 | else: |
|
1400 | else: | |
1405 | ana = phases.analyzeremotephases(pushop.repo, cheads, remotephases) |
|
1401 | ana = phases.analyzeremotephases(pushop.repo, cheads, remotephases) | |
1406 | pheads, droots = ana |
|
1402 | pheads, droots = ana | |
1407 | ### Apply remote phase on local |
|
1403 | ### Apply remote phase on local | |
1408 | if remotephases.get(b'publishing', False): |
|
1404 | if remotephases.get(b'publishing', False): | |
1409 | _localphasemove(pushop, cheads) |
|
1405 | _localphasemove(pushop, cheads) | |
1410 | else: # publish = False |
|
1406 | else: # publish = False | |
1411 | _localphasemove(pushop, pheads) |
|
1407 | _localphasemove(pushop, pheads) | |
1412 | _localphasemove(pushop, cheads, phases.draft) |
|
1408 | _localphasemove(pushop, cheads, phases.draft) | |
1413 | ### Apply local phase on remote |
|
1409 | ### Apply local phase on remote | |
1414 |
|
1410 | |||
1415 | if pushop.cgresult: |
|
1411 | if pushop.cgresult: | |
1416 | if b'phases' in pushop.stepsdone: |
|
1412 | if b'phases' in pushop.stepsdone: | |
1417 | # phases already pushed though bundle2 |
|
1413 | # phases already pushed though bundle2 | |
1418 | return |
|
1414 | return | |
1419 | outdated = pushop.outdatedphases |
|
1415 | outdated = pushop.outdatedphases | |
1420 | else: |
|
1416 | else: | |
1421 | outdated = pushop.fallbackoutdatedphases |
|
1417 | outdated = pushop.fallbackoutdatedphases | |
1422 |
|
1418 | |||
1423 | pushop.stepsdone.add(b'phases') |
|
1419 | pushop.stepsdone.add(b'phases') | |
1424 |
|
1420 | |||
1425 | # filter heads already turned public by the push |
|
1421 | # filter heads already turned public by the push | |
1426 | outdated = [c for c in outdated if c.node() not in pheads] |
|
1422 | outdated = [c for c in outdated if c.node() not in pheads] | |
1427 | # fallback to independent pushkey command |
|
1423 | # fallback to independent pushkey command | |
1428 | for newremotehead in outdated: |
|
1424 | for newremotehead in outdated: | |
1429 | with pushop.remote.commandexecutor() as e: |
|
1425 | with pushop.remote.commandexecutor() as e: | |
1430 | r = e.callcommand( |
|
1426 | r = e.callcommand( | |
1431 | b'pushkey', |
|
1427 | b'pushkey', | |
1432 | { |
|
1428 | { | |
1433 | b'namespace': b'phases', |
|
1429 | b'namespace': b'phases', | |
1434 | b'key': newremotehead.hex(), |
|
1430 | b'key': newremotehead.hex(), | |
1435 | b'old': b'%d' % phases.draft, |
|
1431 | b'old': b'%d' % phases.draft, | |
1436 | b'new': b'%d' % phases.public, |
|
1432 | b'new': b'%d' % phases.public, | |
1437 | }, |
|
1433 | }, | |
1438 | ).result() |
|
1434 | ).result() | |
1439 |
|
1435 | |||
1440 | if not r: |
|
1436 | if not r: | |
1441 | pushop.ui.warn( |
|
1437 | pushop.ui.warn( | |
1442 | _(b'updating %s to public failed!\n') % newremotehead |
|
1438 | _(b'updating %s to public failed!\n') % newremotehead | |
1443 | ) |
|
1439 | ) | |
1444 |
|
1440 | |||
1445 |
|
1441 | |||
1446 | def _localphasemove(pushop, nodes, phase=phases.public): |
|
1442 | def _localphasemove(pushop, nodes, phase=phases.public): | |
1447 | """move <nodes> to <phase> in the local source repo""" |
|
1443 | """move <nodes> to <phase> in the local source repo""" | |
1448 | if pushop.trmanager: |
|
1444 | if pushop.trmanager: | |
1449 | phases.advanceboundary( |
|
1445 | phases.advanceboundary( | |
1450 | pushop.repo, pushop.trmanager.transaction(), phase, nodes |
|
1446 | pushop.repo, pushop.trmanager.transaction(), phase, nodes | |
1451 | ) |
|
1447 | ) | |
1452 | else: |
|
1448 | else: | |
1453 | # repo is not locked, do not change any phases! |
|
1449 | # repo is not locked, do not change any phases! | |
1454 | # Informs the user that phases should have been moved when |
|
1450 | # Informs the user that phases should have been moved when | |
1455 | # applicable. |
|
1451 | # applicable. | |
1456 | actualmoves = [n for n in nodes if phase < pushop.repo[n].phase()] |
|
1452 | actualmoves = [n for n in nodes if phase < pushop.repo[n].phase()] | |
1457 | phasestr = phases.phasenames[phase] |
|
1453 | phasestr = phases.phasenames[phase] | |
1458 | if actualmoves: |
|
1454 | if actualmoves: | |
1459 | pushop.ui.status( |
|
1455 | pushop.ui.status( | |
1460 | _( |
|
1456 | _( | |
1461 | b'cannot lock source repo, skipping ' |
|
1457 | b'cannot lock source repo, skipping ' | |
1462 | b'local %s phase update\n' |
|
1458 | b'local %s phase update\n' | |
1463 | ) |
|
1459 | ) | |
1464 | % phasestr |
|
1460 | % phasestr | |
1465 | ) |
|
1461 | ) | |
1466 |
|
1462 | |||
1467 |
|
1463 | |||
1468 | def _pushobsolete(pushop): |
|
1464 | def _pushobsolete(pushop): | |
1469 | """utility function to push obsolete markers to a remote""" |
|
1465 | """utility function to push obsolete markers to a remote""" | |
1470 | if b'obsmarkers' in pushop.stepsdone: |
|
1466 | if b'obsmarkers' in pushop.stepsdone: | |
1471 | return |
|
1467 | return | |
1472 | repo = pushop.repo |
|
1468 | repo = pushop.repo | |
1473 | remote = pushop.remote |
|
1469 | remote = pushop.remote | |
1474 | pushop.stepsdone.add(b'obsmarkers') |
|
1470 | pushop.stepsdone.add(b'obsmarkers') | |
1475 | if pushop.outobsmarkers: |
|
1471 | if pushop.outobsmarkers: | |
1476 | pushop.ui.debug(b'try to push obsolete markers to remote\n') |
|
1472 | pushop.ui.debug(b'try to push obsolete markers to remote\n') | |
1477 | rslts = [] |
|
1473 | rslts = [] | |
1478 |
markers = |
|
1474 | markers = obsutil.sortedmarkers(pushop.outobsmarkers) | |
1479 | remotedata = obsolete._pushkeyescape(markers) |
|
1475 | remotedata = obsolete._pushkeyescape(markers) | |
1480 | for key in sorted(remotedata, reverse=True): |
|
1476 | for key in sorted(remotedata, reverse=True): | |
1481 | # reverse sort to ensure we end with dump0 |
|
1477 | # reverse sort to ensure we end with dump0 | |
1482 | data = remotedata[key] |
|
1478 | data = remotedata[key] | |
1483 | rslts.append(remote.pushkey(b'obsolete', key, b'', data)) |
|
1479 | rslts.append(remote.pushkey(b'obsolete', key, b'', data)) | |
1484 | if [r for r in rslts if not r]: |
|
1480 | if [r for r in rslts if not r]: | |
1485 | msg = _(b'failed to push some obsolete markers!\n') |
|
1481 | msg = _(b'failed to push some obsolete markers!\n') | |
1486 | repo.ui.warn(msg) |
|
1482 | repo.ui.warn(msg) | |
1487 |
|
1483 | |||
1488 |
|
1484 | |||
1489 | def _pushbookmark(pushop): |
|
1485 | def _pushbookmark(pushop): | |
1490 | """Update bookmark position on remote""" |
|
1486 | """Update bookmark position on remote""" | |
1491 | if pushop.cgresult == 0 or b'bookmarks' in pushop.stepsdone: |
|
1487 | if pushop.cgresult == 0 or b'bookmarks' in pushop.stepsdone: | |
1492 | return |
|
1488 | return | |
1493 | pushop.stepsdone.add(b'bookmarks') |
|
1489 | pushop.stepsdone.add(b'bookmarks') | |
1494 | ui = pushop.ui |
|
1490 | ui = pushop.ui | |
1495 | remote = pushop.remote |
|
1491 | remote = pushop.remote | |
1496 |
|
1492 | |||
1497 | for b, old, new in pushop.outbookmarks: |
|
1493 | for b, old, new in pushop.outbookmarks: | |
1498 | action = b'update' |
|
1494 | action = b'update' | |
1499 | if not old: |
|
1495 | if not old: | |
1500 | action = b'export' |
|
1496 | action = b'export' | |
1501 | elif not new: |
|
1497 | elif not new: | |
1502 | action = b'delete' |
|
1498 | action = b'delete' | |
1503 |
|
1499 | |||
1504 | with remote.commandexecutor() as e: |
|
1500 | with remote.commandexecutor() as e: | |
1505 | r = e.callcommand( |
|
1501 | r = e.callcommand( | |
1506 | b'pushkey', |
|
1502 | b'pushkey', | |
1507 | { |
|
1503 | { | |
1508 | b'namespace': b'bookmarks', |
|
1504 | b'namespace': b'bookmarks', | |
1509 | b'key': b, |
|
1505 | b'key': b, | |
1510 | b'old': hex(old), |
|
1506 | b'old': hex(old), | |
1511 | b'new': hex(new), |
|
1507 | b'new': hex(new), | |
1512 | }, |
|
1508 | }, | |
1513 | ).result() |
|
1509 | ).result() | |
1514 |
|
1510 | |||
1515 | if r: |
|
1511 | if r: | |
1516 | ui.status(bookmsgmap[action][0] % b) |
|
1512 | ui.status(bookmsgmap[action][0] % b) | |
1517 | else: |
|
1513 | else: | |
1518 | ui.warn(bookmsgmap[action][1] % b) |
|
1514 | ui.warn(bookmsgmap[action][1] % b) | |
1519 | # discovery can have set the value form invalid entry |
|
1515 | # discovery can have set the value form invalid entry | |
1520 | if pushop.bkresult is not None: |
|
1516 | if pushop.bkresult is not None: | |
1521 | pushop.bkresult = 1 |
|
1517 | pushop.bkresult = 1 | |
1522 |
|
1518 | |||
1523 |
|
1519 | |||
1524 | class pulloperation(object): |
|
1520 | class pulloperation(object): | |
1525 | """A object that represent a single pull operation |
|
1521 | """A object that represent a single pull operation | |
1526 |
|
1522 | |||
1527 | It purpose is to carry pull related state and very common operation. |
|
1523 | It purpose is to carry pull related state and very common operation. | |
1528 |
|
1524 | |||
1529 | A new should be created at the beginning of each pull and discarded |
|
1525 | A new should be created at the beginning of each pull and discarded | |
1530 | afterward. |
|
1526 | afterward. | |
1531 | """ |
|
1527 | """ | |
1532 |
|
1528 | |||
1533 | def __init__( |
|
1529 | def __init__( | |
1534 | self, |
|
1530 | self, | |
1535 | repo, |
|
1531 | repo, | |
1536 | remote, |
|
1532 | remote, | |
1537 | heads=None, |
|
1533 | heads=None, | |
1538 | force=False, |
|
1534 | force=False, | |
1539 | bookmarks=(), |
|
1535 | bookmarks=(), | |
1540 | remotebookmarks=None, |
|
1536 | remotebookmarks=None, | |
1541 | streamclonerequested=None, |
|
1537 | streamclonerequested=None, | |
1542 | includepats=None, |
|
1538 | includepats=None, | |
1543 | excludepats=None, |
|
1539 | excludepats=None, | |
1544 | depth=None, |
|
1540 | depth=None, | |
1545 | ): |
|
1541 | ): | |
1546 | # repo we pull into |
|
1542 | # repo we pull into | |
1547 | self.repo = repo |
|
1543 | self.repo = repo | |
1548 | # repo we pull from |
|
1544 | # repo we pull from | |
1549 | self.remote = remote |
|
1545 | self.remote = remote | |
1550 | # revision we try to pull (None is "all") |
|
1546 | # revision we try to pull (None is "all") | |
1551 | self.heads = heads |
|
1547 | self.heads = heads | |
1552 | # bookmark pulled explicitly |
|
1548 | # bookmark pulled explicitly | |
1553 | self.explicitbookmarks = [ |
|
1549 | self.explicitbookmarks = [ | |
1554 | repo._bookmarks.expandname(bookmark) for bookmark in bookmarks |
|
1550 | repo._bookmarks.expandname(bookmark) for bookmark in bookmarks | |
1555 | ] |
|
1551 | ] | |
1556 | # do we force pull? |
|
1552 | # do we force pull? | |
1557 | self.force = force |
|
1553 | self.force = force | |
1558 | # whether a streaming clone was requested |
|
1554 | # whether a streaming clone was requested | |
1559 | self.streamclonerequested = streamclonerequested |
|
1555 | self.streamclonerequested = streamclonerequested | |
1560 | # transaction manager |
|
1556 | # transaction manager | |
1561 | self.trmanager = None |
|
1557 | self.trmanager = None | |
1562 | # set of common changeset between local and remote before pull |
|
1558 | # set of common changeset between local and remote before pull | |
1563 | self.common = None |
|
1559 | self.common = None | |
1564 | # set of pulled head |
|
1560 | # set of pulled head | |
1565 | self.rheads = None |
|
1561 | self.rheads = None | |
1566 | # list of missing changeset to fetch remotely |
|
1562 | # list of missing changeset to fetch remotely | |
1567 | self.fetch = None |
|
1563 | self.fetch = None | |
1568 | # remote bookmarks data |
|
1564 | # remote bookmarks data | |
1569 | self.remotebookmarks = remotebookmarks |
|
1565 | self.remotebookmarks = remotebookmarks | |
1570 | # result of changegroup pulling (used as return code by pull) |
|
1566 | # result of changegroup pulling (used as return code by pull) | |
1571 | self.cgresult = None |
|
1567 | self.cgresult = None | |
1572 | # list of step already done |
|
1568 | # list of step already done | |
1573 | self.stepsdone = set() |
|
1569 | self.stepsdone = set() | |
1574 | # Whether we attempted a clone from pre-generated bundles. |
|
1570 | # Whether we attempted a clone from pre-generated bundles. | |
1575 | self.clonebundleattempted = False |
|
1571 | self.clonebundleattempted = False | |
1576 | # Set of file patterns to include. |
|
1572 | # Set of file patterns to include. | |
1577 | self.includepats = includepats |
|
1573 | self.includepats = includepats | |
1578 | # Set of file patterns to exclude. |
|
1574 | # Set of file patterns to exclude. | |
1579 | self.excludepats = excludepats |
|
1575 | self.excludepats = excludepats | |
1580 | # Number of ancestor changesets to pull from each pulled head. |
|
1576 | # Number of ancestor changesets to pull from each pulled head. | |
1581 | self.depth = depth |
|
1577 | self.depth = depth | |
1582 |
|
1578 | |||
1583 | @util.propertycache |
|
1579 | @util.propertycache | |
1584 | def pulledsubset(self): |
|
1580 | def pulledsubset(self): | |
1585 | """heads of the set of changeset target by the pull""" |
|
1581 | """heads of the set of changeset target by the pull""" | |
1586 | # compute target subset |
|
1582 | # compute target subset | |
1587 | if self.heads is None: |
|
1583 | if self.heads is None: | |
1588 | # We pulled every thing possible |
|
1584 | # We pulled every thing possible | |
1589 | # sync on everything common |
|
1585 | # sync on everything common | |
1590 | c = set(self.common) |
|
1586 | c = set(self.common) | |
1591 | ret = list(self.common) |
|
1587 | ret = list(self.common) | |
1592 | for n in self.rheads: |
|
1588 | for n in self.rheads: | |
1593 | if n not in c: |
|
1589 | if n not in c: | |
1594 | ret.append(n) |
|
1590 | ret.append(n) | |
1595 | return ret |
|
1591 | return ret | |
1596 | else: |
|
1592 | else: | |
1597 | # We pulled a specific subset |
|
1593 | # We pulled a specific subset | |
1598 | # sync on this subset |
|
1594 | # sync on this subset | |
1599 | return self.heads |
|
1595 | return self.heads | |
1600 |
|
1596 | |||
1601 | @util.propertycache |
|
1597 | @util.propertycache | |
1602 | def canusebundle2(self): |
|
1598 | def canusebundle2(self): | |
1603 | return not _forcebundle1(self) |
|
1599 | return not _forcebundle1(self) | |
1604 |
|
1600 | |||
1605 | @util.propertycache |
|
1601 | @util.propertycache | |
1606 | def remotebundle2caps(self): |
|
1602 | def remotebundle2caps(self): | |
1607 | return bundle2.bundle2caps(self.remote) |
|
1603 | return bundle2.bundle2caps(self.remote) | |
1608 |
|
1604 | |||
1609 | def gettransaction(self): |
|
1605 | def gettransaction(self): | |
1610 | # deprecated; talk to trmanager directly |
|
1606 | # deprecated; talk to trmanager directly | |
1611 | return self.trmanager.transaction() |
|
1607 | return self.trmanager.transaction() | |
1612 |
|
1608 | |||
1613 |
|
1609 | |||
1614 | class transactionmanager(util.transactional): |
|
1610 | class transactionmanager(util.transactional): | |
1615 | """An object to manage the life cycle of a transaction |
|
1611 | """An object to manage the life cycle of a transaction | |
1616 |
|
1612 | |||
1617 | It creates the transaction on demand and calls the appropriate hooks when |
|
1613 | It creates the transaction on demand and calls the appropriate hooks when | |
1618 | closing the transaction.""" |
|
1614 | closing the transaction.""" | |
1619 |
|
1615 | |||
1620 | def __init__(self, repo, source, url): |
|
1616 | def __init__(self, repo, source, url): | |
1621 | self.repo = repo |
|
1617 | self.repo = repo | |
1622 | self.source = source |
|
1618 | self.source = source | |
1623 | self.url = url |
|
1619 | self.url = url | |
1624 | self._tr = None |
|
1620 | self._tr = None | |
1625 |
|
1621 | |||
1626 | def transaction(self): |
|
1622 | def transaction(self): | |
1627 | """Return an open transaction object, constructing if necessary""" |
|
1623 | """Return an open transaction object, constructing if necessary""" | |
1628 | if not self._tr: |
|
1624 | if not self._tr: | |
1629 | trname = b'%s\n%s' % (self.source, util.hidepassword(self.url)) |
|
1625 | trname = b'%s\n%s' % (self.source, util.hidepassword(self.url)) | |
1630 | self._tr = self.repo.transaction(trname) |
|
1626 | self._tr = self.repo.transaction(trname) | |
1631 | self._tr.hookargs[b'source'] = self.source |
|
1627 | self._tr.hookargs[b'source'] = self.source | |
1632 | self._tr.hookargs[b'url'] = self.url |
|
1628 | self._tr.hookargs[b'url'] = self.url | |
1633 | return self._tr |
|
1629 | return self._tr | |
1634 |
|
1630 | |||
1635 | def close(self): |
|
1631 | def close(self): | |
1636 | """close transaction if created""" |
|
1632 | """close transaction if created""" | |
1637 | if self._tr is not None: |
|
1633 | if self._tr is not None: | |
1638 | self._tr.close() |
|
1634 | self._tr.close() | |
1639 |
|
1635 | |||
1640 | def release(self): |
|
1636 | def release(self): | |
1641 | """release transaction if created""" |
|
1637 | """release transaction if created""" | |
1642 | if self._tr is not None: |
|
1638 | if self._tr is not None: | |
1643 | self._tr.release() |
|
1639 | self._tr.release() | |
1644 |
|
1640 | |||
1645 |
|
1641 | |||
1646 | def listkeys(remote, namespace): |
|
1642 | def listkeys(remote, namespace): | |
1647 | with remote.commandexecutor() as e: |
|
1643 | with remote.commandexecutor() as e: | |
1648 | return e.callcommand(b'listkeys', {b'namespace': namespace}).result() |
|
1644 | return e.callcommand(b'listkeys', {b'namespace': namespace}).result() | |
1649 |
|
1645 | |||
1650 |
|
1646 | |||
1651 | def _fullpullbundle2(repo, pullop): |
|
1647 | def _fullpullbundle2(repo, pullop): | |
1652 | # The server may send a partial reply, i.e. when inlining |
|
1648 | # The server may send a partial reply, i.e. when inlining | |
1653 | # pre-computed bundles. In that case, update the common |
|
1649 | # pre-computed bundles. In that case, update the common | |
1654 | # set based on the results and pull another bundle. |
|
1650 | # set based on the results and pull another bundle. | |
1655 | # |
|
1651 | # | |
1656 | # There are two indicators that the process is finished: |
|
1652 | # There are two indicators that the process is finished: | |
1657 | # - no changeset has been added, or |
|
1653 | # - no changeset has been added, or | |
1658 | # - all remote heads are known locally. |
|
1654 | # - all remote heads are known locally. | |
1659 | # The head check must use the unfiltered view as obsoletion |
|
1655 | # The head check must use the unfiltered view as obsoletion | |
1660 | # markers can hide heads. |
|
1656 | # markers can hide heads. | |
1661 | unfi = repo.unfiltered() |
|
1657 | unfi = repo.unfiltered() | |
1662 | unficl = unfi.changelog |
|
1658 | unficl = unfi.changelog | |
1663 |
|
1659 | |||
1664 | def headsofdiff(h1, h2): |
|
1660 | def headsofdiff(h1, h2): | |
1665 | """Returns heads(h1 % h2)""" |
|
1661 | """Returns heads(h1 % h2)""" | |
1666 | res = unfi.set(b'heads(%ln %% %ln)', h1, h2) |
|
1662 | res = unfi.set(b'heads(%ln %% %ln)', h1, h2) | |
1667 | return set(ctx.node() for ctx in res) |
|
1663 | return set(ctx.node() for ctx in res) | |
1668 |
|
1664 | |||
1669 | def headsofunion(h1, h2): |
|
1665 | def headsofunion(h1, h2): | |
1670 | """Returns heads((h1 + h2) - null)""" |
|
1666 | """Returns heads((h1 + h2) - null)""" | |
1671 | res = unfi.set(b'heads((%ln + %ln - null))', h1, h2) |
|
1667 | res = unfi.set(b'heads((%ln + %ln - null))', h1, h2) | |
1672 | return set(ctx.node() for ctx in res) |
|
1668 | return set(ctx.node() for ctx in res) | |
1673 |
|
1669 | |||
1674 | while True: |
|
1670 | while True: | |
1675 | old_heads = unficl.heads() |
|
1671 | old_heads = unficl.heads() | |
1676 | clstart = len(unficl) |
|
1672 | clstart = len(unficl) | |
1677 | _pullbundle2(pullop) |
|
1673 | _pullbundle2(pullop) | |
1678 | if repository.NARROW_REQUIREMENT in repo.requirements: |
|
1674 | if repository.NARROW_REQUIREMENT in repo.requirements: | |
1679 | # XXX narrow clones filter the heads on the server side during |
|
1675 | # XXX narrow clones filter the heads on the server side during | |
1680 | # XXX getbundle and result in partial replies as well. |
|
1676 | # XXX getbundle and result in partial replies as well. | |
1681 | # XXX Disable pull bundles in this case as band aid to avoid |
|
1677 | # XXX Disable pull bundles in this case as band aid to avoid | |
1682 | # XXX extra round trips. |
|
1678 | # XXX extra round trips. | |
1683 | break |
|
1679 | break | |
1684 | if clstart == len(unficl): |
|
1680 | if clstart == len(unficl): | |
1685 | break |
|
1681 | break | |
1686 | if all(unficl.hasnode(n) for n in pullop.rheads): |
|
1682 | if all(unficl.hasnode(n) for n in pullop.rheads): | |
1687 | break |
|
1683 | break | |
1688 | new_heads = headsofdiff(unficl.heads(), old_heads) |
|
1684 | new_heads = headsofdiff(unficl.heads(), old_heads) | |
1689 | pullop.common = headsofunion(new_heads, pullop.common) |
|
1685 | pullop.common = headsofunion(new_heads, pullop.common) | |
1690 | pullop.rheads = set(pullop.rheads) - pullop.common |
|
1686 | pullop.rheads = set(pullop.rheads) - pullop.common | |
1691 |
|
1687 | |||
1692 |
|
1688 | |||
1693 | def pull( |
|
1689 | def pull( | |
1694 | repo, |
|
1690 | repo, | |
1695 | remote, |
|
1691 | remote, | |
1696 | heads=None, |
|
1692 | heads=None, | |
1697 | force=False, |
|
1693 | force=False, | |
1698 | bookmarks=(), |
|
1694 | bookmarks=(), | |
1699 | opargs=None, |
|
1695 | opargs=None, | |
1700 | streamclonerequested=None, |
|
1696 | streamclonerequested=None, | |
1701 | includepats=None, |
|
1697 | includepats=None, | |
1702 | excludepats=None, |
|
1698 | excludepats=None, | |
1703 | depth=None, |
|
1699 | depth=None, | |
1704 | ): |
|
1700 | ): | |
1705 | """Fetch repository data from a remote. |
|
1701 | """Fetch repository data from a remote. | |
1706 |
|
1702 | |||
1707 | This is the main function used to retrieve data from a remote repository. |
|
1703 | This is the main function used to retrieve data from a remote repository. | |
1708 |
|
1704 | |||
1709 | ``repo`` is the local repository to clone into. |
|
1705 | ``repo`` is the local repository to clone into. | |
1710 | ``remote`` is a peer instance. |
|
1706 | ``remote`` is a peer instance. | |
1711 | ``heads`` is an iterable of revisions we want to pull. ``None`` (the |
|
1707 | ``heads`` is an iterable of revisions we want to pull. ``None`` (the | |
1712 | default) means to pull everything from the remote. |
|
1708 | default) means to pull everything from the remote. | |
1713 | ``bookmarks`` is an iterable of bookmarks requesting to be pulled. By |
|
1709 | ``bookmarks`` is an iterable of bookmarks requesting to be pulled. By | |
1714 | default, all remote bookmarks are pulled. |
|
1710 | default, all remote bookmarks are pulled. | |
1715 | ``opargs`` are additional keyword arguments to pass to ``pulloperation`` |
|
1711 | ``opargs`` are additional keyword arguments to pass to ``pulloperation`` | |
1716 | initialization. |
|
1712 | initialization. | |
1717 | ``streamclonerequested`` is a boolean indicating whether a "streaming |
|
1713 | ``streamclonerequested`` is a boolean indicating whether a "streaming | |
1718 | clone" is requested. A "streaming clone" is essentially a raw file copy |
|
1714 | clone" is requested. A "streaming clone" is essentially a raw file copy | |
1719 | of revlogs from the server. This only works when the local repository is |
|
1715 | of revlogs from the server. This only works when the local repository is | |
1720 | empty. The default value of ``None`` means to respect the server |
|
1716 | empty. The default value of ``None`` means to respect the server | |
1721 | configuration for preferring stream clones. |
|
1717 | configuration for preferring stream clones. | |
1722 | ``includepats`` and ``excludepats`` define explicit file patterns to |
|
1718 | ``includepats`` and ``excludepats`` define explicit file patterns to | |
1723 | include and exclude in storage, respectively. If not defined, narrow |
|
1719 | include and exclude in storage, respectively. If not defined, narrow | |
1724 | patterns from the repo instance are used, if available. |
|
1720 | patterns from the repo instance are used, if available. | |
1725 | ``depth`` is an integer indicating the DAG depth of history we're |
|
1721 | ``depth`` is an integer indicating the DAG depth of history we're | |
1726 | interested in. If defined, for each revision specified in ``heads``, we |
|
1722 | interested in. If defined, for each revision specified in ``heads``, we | |
1727 | will fetch up to this many of its ancestors and data associated with them. |
|
1723 | will fetch up to this many of its ancestors and data associated with them. | |
1728 |
|
1724 | |||
1729 | Returns the ``pulloperation`` created for this pull. |
|
1725 | Returns the ``pulloperation`` created for this pull. | |
1730 | """ |
|
1726 | """ | |
1731 | if opargs is None: |
|
1727 | if opargs is None: | |
1732 | opargs = {} |
|
1728 | opargs = {} | |
1733 |
|
1729 | |||
1734 | # We allow the narrow patterns to be passed in explicitly to provide more |
|
1730 | # We allow the narrow patterns to be passed in explicitly to provide more | |
1735 | # flexibility for API consumers. |
|
1731 | # flexibility for API consumers. | |
1736 | if includepats or excludepats: |
|
1732 | if includepats or excludepats: | |
1737 | includepats = includepats or set() |
|
1733 | includepats = includepats or set() | |
1738 | excludepats = excludepats or set() |
|
1734 | excludepats = excludepats or set() | |
1739 | else: |
|
1735 | else: | |
1740 | includepats, excludepats = repo.narrowpats |
|
1736 | includepats, excludepats = repo.narrowpats | |
1741 |
|
1737 | |||
1742 | narrowspec.validatepatterns(includepats) |
|
1738 | narrowspec.validatepatterns(includepats) | |
1743 | narrowspec.validatepatterns(excludepats) |
|
1739 | narrowspec.validatepatterns(excludepats) | |
1744 |
|
1740 | |||
1745 | pullop = pulloperation( |
|
1741 | pullop = pulloperation( | |
1746 | repo, |
|
1742 | repo, | |
1747 | remote, |
|
1743 | remote, | |
1748 | heads, |
|
1744 | heads, | |
1749 | force, |
|
1745 | force, | |
1750 | bookmarks=bookmarks, |
|
1746 | bookmarks=bookmarks, | |
1751 | streamclonerequested=streamclonerequested, |
|
1747 | streamclonerequested=streamclonerequested, | |
1752 | includepats=includepats, |
|
1748 | includepats=includepats, | |
1753 | excludepats=excludepats, |
|
1749 | excludepats=excludepats, | |
1754 | depth=depth, |
|
1750 | depth=depth, | |
1755 | **pycompat.strkwargs(opargs) |
|
1751 | **pycompat.strkwargs(opargs) | |
1756 | ) |
|
1752 | ) | |
1757 |
|
1753 | |||
1758 | peerlocal = pullop.remote.local() |
|
1754 | peerlocal = pullop.remote.local() | |
1759 | if peerlocal: |
|
1755 | if peerlocal: | |
1760 | missing = set(peerlocal.requirements) - pullop.repo.supported |
|
1756 | missing = set(peerlocal.requirements) - pullop.repo.supported | |
1761 | if missing: |
|
1757 | if missing: | |
1762 | msg = _( |
|
1758 | msg = _( | |
1763 | b"required features are not" |
|
1759 | b"required features are not" | |
1764 | b" supported in the destination:" |
|
1760 | b" supported in the destination:" | |
1765 | b" %s" |
|
1761 | b" %s" | |
1766 | ) % (b', '.join(sorted(missing))) |
|
1762 | ) % (b', '.join(sorted(missing))) | |
1767 | raise error.Abort(msg) |
|
1763 | raise error.Abort(msg) | |
1768 |
|
1764 | |||
1769 | pullop.trmanager = transactionmanager(repo, b'pull', remote.url()) |
|
1765 | pullop.trmanager = transactionmanager(repo, b'pull', remote.url()) | |
1770 | wlock = util.nullcontextmanager() |
|
1766 | wlock = util.nullcontextmanager() | |
1771 | if not bookmod.bookmarksinstore(repo): |
|
1767 | if not bookmod.bookmarksinstore(repo): | |
1772 | wlock = repo.wlock() |
|
1768 | wlock = repo.wlock() | |
1773 | with wlock, repo.lock(), pullop.trmanager: |
|
1769 | with wlock, repo.lock(), pullop.trmanager: | |
1774 | # Use the modern wire protocol, if available. |
|
1770 | # Use the modern wire protocol, if available. | |
1775 | if remote.capable(b'command-changesetdata'): |
|
1771 | if remote.capable(b'command-changesetdata'): | |
1776 | exchangev2.pull(pullop) |
|
1772 | exchangev2.pull(pullop) | |
1777 | else: |
|
1773 | else: | |
1778 | # This should ideally be in _pullbundle2(). However, it needs to run |
|
1774 | # This should ideally be in _pullbundle2(). However, it needs to run | |
1779 | # before discovery to avoid extra work. |
|
1775 | # before discovery to avoid extra work. | |
1780 | _maybeapplyclonebundle(pullop) |
|
1776 | _maybeapplyclonebundle(pullop) | |
1781 | streamclone.maybeperformlegacystreamclone(pullop) |
|
1777 | streamclone.maybeperformlegacystreamclone(pullop) | |
1782 | _pulldiscovery(pullop) |
|
1778 | _pulldiscovery(pullop) | |
1783 | if pullop.canusebundle2: |
|
1779 | if pullop.canusebundle2: | |
1784 | _fullpullbundle2(repo, pullop) |
|
1780 | _fullpullbundle2(repo, pullop) | |
1785 | _pullchangeset(pullop) |
|
1781 | _pullchangeset(pullop) | |
1786 | _pullphase(pullop) |
|
1782 | _pullphase(pullop) | |
1787 | _pullbookmarks(pullop) |
|
1783 | _pullbookmarks(pullop) | |
1788 | _pullobsolete(pullop) |
|
1784 | _pullobsolete(pullop) | |
1789 |
|
1785 | |||
1790 | # storing remotenames |
|
1786 | # storing remotenames | |
1791 | if repo.ui.configbool(b'experimental', b'remotenames'): |
|
1787 | if repo.ui.configbool(b'experimental', b'remotenames'): | |
1792 | logexchange.pullremotenames(repo, remote) |
|
1788 | logexchange.pullremotenames(repo, remote) | |
1793 |
|
1789 | |||
1794 | return pullop |
|
1790 | return pullop | |
1795 |
|
1791 | |||
1796 |
|
1792 | |||
1797 | # list of steps to perform discovery before pull |
|
1793 | # list of steps to perform discovery before pull | |
1798 | pulldiscoveryorder = [] |
|
1794 | pulldiscoveryorder = [] | |
1799 |
|
1795 | |||
1800 | # Mapping between step name and function |
|
1796 | # Mapping between step name and function | |
1801 | # |
|
1797 | # | |
1802 | # This exists to help extensions wrap steps if necessary |
|
1798 | # This exists to help extensions wrap steps if necessary | |
1803 | pulldiscoverymapping = {} |
|
1799 | pulldiscoverymapping = {} | |
1804 |
|
1800 | |||
1805 |
|
1801 | |||
1806 | def pulldiscovery(stepname): |
|
1802 | def pulldiscovery(stepname): | |
1807 | """decorator for function performing discovery before pull |
|
1803 | """decorator for function performing discovery before pull | |
1808 |
|
1804 | |||
1809 | The function is added to the step -> function mapping and appended to the |
|
1805 | The function is added to the step -> function mapping and appended to the | |
1810 | list of steps. Beware that decorated function will be added in order (this |
|
1806 | list of steps. Beware that decorated function will be added in order (this | |
1811 | may matter). |
|
1807 | may matter). | |
1812 |
|
1808 | |||
1813 | You can only use this decorator for a new step, if you want to wrap a step |
|
1809 | You can only use this decorator for a new step, if you want to wrap a step | |
1814 | from an extension, change the pulldiscovery dictionary directly.""" |
|
1810 | from an extension, change the pulldiscovery dictionary directly.""" | |
1815 |
|
1811 | |||
1816 | def dec(func): |
|
1812 | def dec(func): | |
1817 | assert stepname not in pulldiscoverymapping |
|
1813 | assert stepname not in pulldiscoverymapping | |
1818 | pulldiscoverymapping[stepname] = func |
|
1814 | pulldiscoverymapping[stepname] = func | |
1819 | pulldiscoveryorder.append(stepname) |
|
1815 | pulldiscoveryorder.append(stepname) | |
1820 | return func |
|
1816 | return func | |
1821 |
|
1817 | |||
1822 | return dec |
|
1818 | return dec | |
1823 |
|
1819 | |||
1824 |
|
1820 | |||
1825 | def _pulldiscovery(pullop): |
|
1821 | def _pulldiscovery(pullop): | |
1826 | """Run all discovery steps""" |
|
1822 | """Run all discovery steps""" | |
1827 | for stepname in pulldiscoveryorder: |
|
1823 | for stepname in pulldiscoveryorder: | |
1828 | step = pulldiscoverymapping[stepname] |
|
1824 | step = pulldiscoverymapping[stepname] | |
1829 | step(pullop) |
|
1825 | step(pullop) | |
1830 |
|
1826 | |||
1831 |
|
1827 | |||
1832 | @pulldiscovery(b'b1:bookmarks') |
|
1828 | @pulldiscovery(b'b1:bookmarks') | |
1833 | def _pullbookmarkbundle1(pullop): |
|
1829 | def _pullbookmarkbundle1(pullop): | |
1834 | """fetch bookmark data in bundle1 case |
|
1830 | """fetch bookmark data in bundle1 case | |
1835 |
|
1831 | |||
1836 | If not using bundle2, we have to fetch bookmarks before changeset |
|
1832 | If not using bundle2, we have to fetch bookmarks before changeset | |
1837 | discovery to reduce the chance and impact of race conditions.""" |
|
1833 | discovery to reduce the chance and impact of race conditions.""" | |
1838 | if pullop.remotebookmarks is not None: |
|
1834 | if pullop.remotebookmarks is not None: | |
1839 | return |
|
1835 | return | |
1840 | if pullop.canusebundle2 and b'listkeys' in pullop.remotebundle2caps: |
|
1836 | if pullop.canusebundle2 and b'listkeys' in pullop.remotebundle2caps: | |
1841 | # all known bundle2 servers now support listkeys, but lets be nice with |
|
1837 | # all known bundle2 servers now support listkeys, but lets be nice with | |
1842 | # new implementation. |
|
1838 | # new implementation. | |
1843 | return |
|
1839 | return | |
1844 | books = listkeys(pullop.remote, b'bookmarks') |
|
1840 | books = listkeys(pullop.remote, b'bookmarks') | |
1845 | pullop.remotebookmarks = bookmod.unhexlifybookmarks(books) |
|
1841 | pullop.remotebookmarks = bookmod.unhexlifybookmarks(books) | |
1846 |
|
1842 | |||
1847 |
|
1843 | |||
1848 | @pulldiscovery(b'changegroup') |
|
1844 | @pulldiscovery(b'changegroup') | |
1849 | def _pulldiscoverychangegroup(pullop): |
|
1845 | def _pulldiscoverychangegroup(pullop): | |
1850 | """discovery phase for the pull |
|
1846 | """discovery phase for the pull | |
1851 |
|
1847 | |||
1852 | Current handle changeset discovery only, will change handle all discovery |
|
1848 | Current handle changeset discovery only, will change handle all discovery | |
1853 | at some point.""" |
|
1849 | at some point.""" | |
1854 | tmp = discovery.findcommonincoming( |
|
1850 | tmp = discovery.findcommonincoming( | |
1855 | pullop.repo, pullop.remote, heads=pullop.heads, force=pullop.force |
|
1851 | pullop.repo, pullop.remote, heads=pullop.heads, force=pullop.force | |
1856 | ) |
|
1852 | ) | |
1857 | common, fetch, rheads = tmp |
|
1853 | common, fetch, rheads = tmp | |
1858 | has_node = pullop.repo.unfiltered().changelog.index.has_node |
|
1854 | has_node = pullop.repo.unfiltered().changelog.index.has_node | |
1859 | if fetch and rheads: |
|
1855 | if fetch and rheads: | |
1860 | # If a remote heads is filtered locally, put in back in common. |
|
1856 | # If a remote heads is filtered locally, put in back in common. | |
1861 | # |
|
1857 | # | |
1862 | # This is a hackish solution to catch most of "common but locally |
|
1858 | # This is a hackish solution to catch most of "common but locally | |
1863 | # hidden situation". We do not performs discovery on unfiltered |
|
1859 | # hidden situation". We do not performs discovery on unfiltered | |
1864 | # repository because it end up doing a pathological amount of round |
|
1860 | # repository because it end up doing a pathological amount of round | |
1865 | # trip for w huge amount of changeset we do not care about. |
|
1861 | # trip for w huge amount of changeset we do not care about. | |
1866 | # |
|
1862 | # | |
1867 | # If a set of such "common but filtered" changeset exist on the server |
|
1863 | # If a set of such "common but filtered" changeset exist on the server | |
1868 | # but are not including a remote heads, we'll not be able to detect it, |
|
1864 | # but are not including a remote heads, we'll not be able to detect it, | |
1869 | scommon = set(common) |
|
1865 | scommon = set(common) | |
1870 | for n in rheads: |
|
1866 | for n in rheads: | |
1871 | if has_node(n): |
|
1867 | if has_node(n): | |
1872 | if n not in scommon: |
|
1868 | if n not in scommon: | |
1873 | common.append(n) |
|
1869 | common.append(n) | |
1874 | if set(rheads).issubset(set(common)): |
|
1870 | if set(rheads).issubset(set(common)): | |
1875 | fetch = [] |
|
1871 | fetch = [] | |
1876 | pullop.common = common |
|
1872 | pullop.common = common | |
1877 | pullop.fetch = fetch |
|
1873 | pullop.fetch = fetch | |
1878 | pullop.rheads = rheads |
|
1874 | pullop.rheads = rheads | |
1879 |
|
1875 | |||
1880 |
|
1876 | |||
1881 | def _pullbundle2(pullop): |
|
1877 | def _pullbundle2(pullop): | |
1882 | """pull data using bundle2 |
|
1878 | """pull data using bundle2 | |
1883 |
|
1879 | |||
1884 | For now, the only supported data are changegroup.""" |
|
1880 | For now, the only supported data are changegroup.""" | |
1885 | kwargs = {b'bundlecaps': caps20to10(pullop.repo, role=b'client')} |
|
1881 | kwargs = {b'bundlecaps': caps20to10(pullop.repo, role=b'client')} | |
1886 |
|
1882 | |||
1887 | # make ui easier to access |
|
1883 | # make ui easier to access | |
1888 | ui = pullop.repo.ui |
|
1884 | ui = pullop.repo.ui | |
1889 |
|
1885 | |||
1890 | # At the moment we don't do stream clones over bundle2. If that is |
|
1886 | # At the moment we don't do stream clones over bundle2. If that is | |
1891 | # implemented then here's where the check for that will go. |
|
1887 | # implemented then here's where the check for that will go. | |
1892 | streaming = streamclone.canperformstreamclone(pullop, bundle2=True)[0] |
|
1888 | streaming = streamclone.canperformstreamclone(pullop, bundle2=True)[0] | |
1893 |
|
1889 | |||
1894 | # declare pull perimeters |
|
1890 | # declare pull perimeters | |
1895 | kwargs[b'common'] = pullop.common |
|
1891 | kwargs[b'common'] = pullop.common | |
1896 | kwargs[b'heads'] = pullop.heads or pullop.rheads |
|
1892 | kwargs[b'heads'] = pullop.heads or pullop.rheads | |
1897 |
|
1893 | |||
1898 | # check server supports narrow and then adding includepats and excludepats |
|
1894 | # check server supports narrow and then adding includepats and excludepats | |
1899 | servernarrow = pullop.remote.capable(wireprototypes.NARROWCAP) |
|
1895 | servernarrow = pullop.remote.capable(wireprototypes.NARROWCAP) | |
1900 | if servernarrow and pullop.includepats: |
|
1896 | if servernarrow and pullop.includepats: | |
1901 | kwargs[b'includepats'] = pullop.includepats |
|
1897 | kwargs[b'includepats'] = pullop.includepats | |
1902 | if servernarrow and pullop.excludepats: |
|
1898 | if servernarrow and pullop.excludepats: | |
1903 | kwargs[b'excludepats'] = pullop.excludepats |
|
1899 | kwargs[b'excludepats'] = pullop.excludepats | |
1904 |
|
1900 | |||
1905 | if streaming: |
|
1901 | if streaming: | |
1906 | kwargs[b'cg'] = False |
|
1902 | kwargs[b'cg'] = False | |
1907 | kwargs[b'stream'] = True |
|
1903 | kwargs[b'stream'] = True | |
1908 | pullop.stepsdone.add(b'changegroup') |
|
1904 | pullop.stepsdone.add(b'changegroup') | |
1909 | pullop.stepsdone.add(b'phases') |
|
1905 | pullop.stepsdone.add(b'phases') | |
1910 |
|
1906 | |||
1911 | else: |
|
1907 | else: | |
1912 | # pulling changegroup |
|
1908 | # pulling changegroup | |
1913 | pullop.stepsdone.add(b'changegroup') |
|
1909 | pullop.stepsdone.add(b'changegroup') | |
1914 |
|
1910 | |||
1915 | kwargs[b'cg'] = pullop.fetch |
|
1911 | kwargs[b'cg'] = pullop.fetch | |
1916 |
|
1912 | |||
1917 | legacyphase = b'phases' in ui.configlist(b'devel', b'legacy.exchange') |
|
1913 | legacyphase = b'phases' in ui.configlist(b'devel', b'legacy.exchange') | |
1918 | hasbinaryphase = b'heads' in pullop.remotebundle2caps.get(b'phases', ()) |
|
1914 | hasbinaryphase = b'heads' in pullop.remotebundle2caps.get(b'phases', ()) | |
1919 | if not legacyphase and hasbinaryphase: |
|
1915 | if not legacyphase and hasbinaryphase: | |
1920 | kwargs[b'phases'] = True |
|
1916 | kwargs[b'phases'] = True | |
1921 | pullop.stepsdone.add(b'phases') |
|
1917 | pullop.stepsdone.add(b'phases') | |
1922 |
|
1918 | |||
1923 | if b'listkeys' in pullop.remotebundle2caps: |
|
1919 | if b'listkeys' in pullop.remotebundle2caps: | |
1924 | if b'phases' not in pullop.stepsdone: |
|
1920 | if b'phases' not in pullop.stepsdone: | |
1925 | kwargs[b'listkeys'] = [b'phases'] |
|
1921 | kwargs[b'listkeys'] = [b'phases'] | |
1926 |
|
1922 | |||
1927 | bookmarksrequested = False |
|
1923 | bookmarksrequested = False | |
1928 | legacybookmark = b'bookmarks' in ui.configlist(b'devel', b'legacy.exchange') |
|
1924 | legacybookmark = b'bookmarks' in ui.configlist(b'devel', b'legacy.exchange') | |
1929 | hasbinarybook = b'bookmarks' in pullop.remotebundle2caps |
|
1925 | hasbinarybook = b'bookmarks' in pullop.remotebundle2caps | |
1930 |
|
1926 | |||
1931 | if pullop.remotebookmarks is not None: |
|
1927 | if pullop.remotebookmarks is not None: | |
1932 | pullop.stepsdone.add(b'request-bookmarks') |
|
1928 | pullop.stepsdone.add(b'request-bookmarks') | |
1933 |
|
1929 | |||
1934 | if ( |
|
1930 | if ( | |
1935 | b'request-bookmarks' not in pullop.stepsdone |
|
1931 | b'request-bookmarks' not in pullop.stepsdone | |
1936 | and pullop.remotebookmarks is None |
|
1932 | and pullop.remotebookmarks is None | |
1937 | and not legacybookmark |
|
1933 | and not legacybookmark | |
1938 | and hasbinarybook |
|
1934 | and hasbinarybook | |
1939 | ): |
|
1935 | ): | |
1940 | kwargs[b'bookmarks'] = True |
|
1936 | kwargs[b'bookmarks'] = True | |
1941 | bookmarksrequested = True |
|
1937 | bookmarksrequested = True | |
1942 |
|
1938 | |||
1943 | if b'listkeys' in pullop.remotebundle2caps: |
|
1939 | if b'listkeys' in pullop.remotebundle2caps: | |
1944 | if b'request-bookmarks' not in pullop.stepsdone: |
|
1940 | if b'request-bookmarks' not in pullop.stepsdone: | |
1945 | # make sure to always includes bookmark data when migrating |
|
1941 | # make sure to always includes bookmark data when migrating | |
1946 | # `hg incoming --bundle` to using this function. |
|
1942 | # `hg incoming --bundle` to using this function. | |
1947 | pullop.stepsdone.add(b'request-bookmarks') |
|
1943 | pullop.stepsdone.add(b'request-bookmarks') | |
1948 | kwargs.setdefault(b'listkeys', []).append(b'bookmarks') |
|
1944 | kwargs.setdefault(b'listkeys', []).append(b'bookmarks') | |
1949 |
|
1945 | |||
1950 | # If this is a full pull / clone and the server supports the clone bundles |
|
1946 | # If this is a full pull / clone and the server supports the clone bundles | |
1951 | # feature, tell the server whether we attempted a clone bundle. The |
|
1947 | # feature, tell the server whether we attempted a clone bundle. The | |
1952 | # presence of this flag indicates the client supports clone bundles. This |
|
1948 | # presence of this flag indicates the client supports clone bundles. This | |
1953 | # will enable the server to treat clients that support clone bundles |
|
1949 | # will enable the server to treat clients that support clone bundles | |
1954 | # differently from those that don't. |
|
1950 | # differently from those that don't. | |
1955 | if ( |
|
1951 | if ( | |
1956 | pullop.remote.capable(b'clonebundles') |
|
1952 | pullop.remote.capable(b'clonebundles') | |
1957 | and pullop.heads is None |
|
1953 | and pullop.heads is None | |
1958 | and list(pullop.common) == [nullid] |
|
1954 | and list(pullop.common) == [nullid] | |
1959 | ): |
|
1955 | ): | |
1960 | kwargs[b'cbattempted'] = pullop.clonebundleattempted |
|
1956 | kwargs[b'cbattempted'] = pullop.clonebundleattempted | |
1961 |
|
1957 | |||
1962 | if streaming: |
|
1958 | if streaming: | |
1963 | pullop.repo.ui.status(_(b'streaming all changes\n')) |
|
1959 | pullop.repo.ui.status(_(b'streaming all changes\n')) | |
1964 | elif not pullop.fetch: |
|
1960 | elif not pullop.fetch: | |
1965 | pullop.repo.ui.status(_(b"no changes found\n")) |
|
1961 | pullop.repo.ui.status(_(b"no changes found\n")) | |
1966 | pullop.cgresult = 0 |
|
1962 | pullop.cgresult = 0 | |
1967 | else: |
|
1963 | else: | |
1968 | if pullop.heads is None and list(pullop.common) == [nullid]: |
|
1964 | if pullop.heads is None and list(pullop.common) == [nullid]: | |
1969 | pullop.repo.ui.status(_(b"requesting all changes\n")) |
|
1965 | pullop.repo.ui.status(_(b"requesting all changes\n")) | |
1970 | if obsolete.isenabled(pullop.repo, obsolete.exchangeopt): |
|
1966 | if obsolete.isenabled(pullop.repo, obsolete.exchangeopt): | |
1971 | remoteversions = bundle2.obsmarkersversion(pullop.remotebundle2caps) |
|
1967 | remoteversions = bundle2.obsmarkersversion(pullop.remotebundle2caps) | |
1972 | if obsolete.commonversion(remoteversions) is not None: |
|
1968 | if obsolete.commonversion(remoteversions) is not None: | |
1973 | kwargs[b'obsmarkers'] = True |
|
1969 | kwargs[b'obsmarkers'] = True | |
1974 | pullop.stepsdone.add(b'obsmarkers') |
|
1970 | pullop.stepsdone.add(b'obsmarkers') | |
1975 | _pullbundle2extraprepare(pullop, kwargs) |
|
1971 | _pullbundle2extraprepare(pullop, kwargs) | |
1976 |
|
1972 | |||
1977 | with pullop.remote.commandexecutor() as e: |
|
1973 | with pullop.remote.commandexecutor() as e: | |
1978 | args = dict(kwargs) |
|
1974 | args = dict(kwargs) | |
1979 | args[b'source'] = b'pull' |
|
1975 | args[b'source'] = b'pull' | |
1980 | bundle = e.callcommand(b'getbundle', args).result() |
|
1976 | bundle = e.callcommand(b'getbundle', args).result() | |
1981 |
|
1977 | |||
1982 | try: |
|
1978 | try: | |
1983 | op = bundle2.bundleoperation( |
|
1979 | op = bundle2.bundleoperation( | |
1984 | pullop.repo, pullop.gettransaction, source=b'pull' |
|
1980 | pullop.repo, pullop.gettransaction, source=b'pull' | |
1985 | ) |
|
1981 | ) | |
1986 | op.modes[b'bookmarks'] = b'records' |
|
1982 | op.modes[b'bookmarks'] = b'records' | |
1987 | bundle2.processbundle(pullop.repo, bundle, op=op) |
|
1983 | bundle2.processbundle(pullop.repo, bundle, op=op) | |
1988 | except bundle2.AbortFromPart as exc: |
|
1984 | except bundle2.AbortFromPart as exc: | |
1989 | pullop.repo.ui.status(_(b'remote: abort: %s\n') % exc) |
|
1985 | pullop.repo.ui.status(_(b'remote: abort: %s\n') % exc) | |
1990 | raise error.Abort(_(b'pull failed on remote'), hint=exc.hint) |
|
1986 | raise error.Abort(_(b'pull failed on remote'), hint=exc.hint) | |
1991 | except error.BundleValueError as exc: |
|
1987 | except error.BundleValueError as exc: | |
1992 | raise error.Abort(_(b'missing support for %s') % exc) |
|
1988 | raise error.Abort(_(b'missing support for %s') % exc) | |
1993 |
|
1989 | |||
1994 | if pullop.fetch: |
|
1990 | if pullop.fetch: | |
1995 | pullop.cgresult = bundle2.combinechangegroupresults(op) |
|
1991 | pullop.cgresult = bundle2.combinechangegroupresults(op) | |
1996 |
|
1992 | |||
1997 | # processing phases change |
|
1993 | # processing phases change | |
1998 | for namespace, value in op.records[b'listkeys']: |
|
1994 | for namespace, value in op.records[b'listkeys']: | |
1999 | if namespace == b'phases': |
|
1995 | if namespace == b'phases': | |
2000 | _pullapplyphases(pullop, value) |
|
1996 | _pullapplyphases(pullop, value) | |
2001 |
|
1997 | |||
2002 | # processing bookmark update |
|
1998 | # processing bookmark update | |
2003 | if bookmarksrequested: |
|
1999 | if bookmarksrequested: | |
2004 | books = {} |
|
2000 | books = {} | |
2005 | for record in op.records[b'bookmarks']: |
|
2001 | for record in op.records[b'bookmarks']: | |
2006 | books[record[b'bookmark']] = record[b"node"] |
|
2002 | books[record[b'bookmark']] = record[b"node"] | |
2007 | pullop.remotebookmarks = books |
|
2003 | pullop.remotebookmarks = books | |
2008 | else: |
|
2004 | else: | |
2009 | for namespace, value in op.records[b'listkeys']: |
|
2005 | for namespace, value in op.records[b'listkeys']: | |
2010 | if namespace == b'bookmarks': |
|
2006 | if namespace == b'bookmarks': | |
2011 | pullop.remotebookmarks = bookmod.unhexlifybookmarks(value) |
|
2007 | pullop.remotebookmarks = bookmod.unhexlifybookmarks(value) | |
2012 |
|
2008 | |||
2013 | # bookmark data were either already there or pulled in the bundle |
|
2009 | # bookmark data were either already there or pulled in the bundle | |
2014 | if pullop.remotebookmarks is not None: |
|
2010 | if pullop.remotebookmarks is not None: | |
2015 | _pullbookmarks(pullop) |
|
2011 | _pullbookmarks(pullop) | |
2016 |
|
2012 | |||
2017 |
|
2013 | |||
2018 | def _pullbundle2extraprepare(pullop, kwargs): |
|
2014 | def _pullbundle2extraprepare(pullop, kwargs): | |
2019 | """hook function so that extensions can extend the getbundle call""" |
|
2015 | """hook function so that extensions can extend the getbundle call""" | |
2020 |
|
2016 | |||
2021 |
|
2017 | |||
2022 | def _pullchangeset(pullop): |
|
2018 | def _pullchangeset(pullop): | |
2023 | """pull changeset from unbundle into the local repo""" |
|
2019 | """pull changeset from unbundle into the local repo""" | |
2024 | # We delay the open of the transaction as late as possible so we |
|
2020 | # We delay the open of the transaction as late as possible so we | |
2025 | # don't open transaction for nothing or you break future useful |
|
2021 | # don't open transaction for nothing or you break future useful | |
2026 | # rollback call |
|
2022 | # rollback call | |
2027 | if b'changegroup' in pullop.stepsdone: |
|
2023 | if b'changegroup' in pullop.stepsdone: | |
2028 | return |
|
2024 | return | |
2029 | pullop.stepsdone.add(b'changegroup') |
|
2025 | pullop.stepsdone.add(b'changegroup') | |
2030 | if not pullop.fetch: |
|
2026 | if not pullop.fetch: | |
2031 | pullop.repo.ui.status(_(b"no changes found\n")) |
|
2027 | pullop.repo.ui.status(_(b"no changes found\n")) | |
2032 | pullop.cgresult = 0 |
|
2028 | pullop.cgresult = 0 | |
2033 | return |
|
2029 | return | |
2034 | tr = pullop.gettransaction() |
|
2030 | tr = pullop.gettransaction() | |
2035 | if pullop.heads is None and list(pullop.common) == [nullid]: |
|
2031 | if pullop.heads is None and list(pullop.common) == [nullid]: | |
2036 | pullop.repo.ui.status(_(b"requesting all changes\n")) |
|
2032 | pullop.repo.ui.status(_(b"requesting all changes\n")) | |
2037 | elif pullop.heads is None and pullop.remote.capable(b'changegroupsubset'): |
|
2033 | elif pullop.heads is None and pullop.remote.capable(b'changegroupsubset'): | |
2038 | # issue1320, avoid a race if remote changed after discovery |
|
2034 | # issue1320, avoid a race if remote changed after discovery | |
2039 | pullop.heads = pullop.rheads |
|
2035 | pullop.heads = pullop.rheads | |
2040 |
|
2036 | |||
2041 | if pullop.remote.capable(b'getbundle'): |
|
2037 | if pullop.remote.capable(b'getbundle'): | |
2042 | # TODO: get bundlecaps from remote |
|
2038 | # TODO: get bundlecaps from remote | |
2043 | cg = pullop.remote.getbundle( |
|
2039 | cg = pullop.remote.getbundle( | |
2044 | b'pull', common=pullop.common, heads=pullop.heads or pullop.rheads |
|
2040 | b'pull', common=pullop.common, heads=pullop.heads or pullop.rheads | |
2045 | ) |
|
2041 | ) | |
2046 | elif pullop.heads is None: |
|
2042 | elif pullop.heads is None: | |
2047 | with pullop.remote.commandexecutor() as e: |
|
2043 | with pullop.remote.commandexecutor() as e: | |
2048 | cg = e.callcommand( |
|
2044 | cg = e.callcommand( | |
2049 | b'changegroup', {b'nodes': pullop.fetch, b'source': b'pull',} |
|
2045 | b'changegroup', {b'nodes': pullop.fetch, b'source': b'pull',} | |
2050 | ).result() |
|
2046 | ).result() | |
2051 |
|
2047 | |||
2052 | elif not pullop.remote.capable(b'changegroupsubset'): |
|
2048 | elif not pullop.remote.capable(b'changegroupsubset'): | |
2053 | raise error.Abort( |
|
2049 | raise error.Abort( | |
2054 | _( |
|
2050 | _( | |
2055 | b"partial pull cannot be done because " |
|
2051 | b"partial pull cannot be done because " | |
2056 | b"other repository doesn't support " |
|
2052 | b"other repository doesn't support " | |
2057 | b"changegroupsubset." |
|
2053 | b"changegroupsubset." | |
2058 | ) |
|
2054 | ) | |
2059 | ) |
|
2055 | ) | |
2060 | else: |
|
2056 | else: | |
2061 | with pullop.remote.commandexecutor() as e: |
|
2057 | with pullop.remote.commandexecutor() as e: | |
2062 | cg = e.callcommand( |
|
2058 | cg = e.callcommand( | |
2063 | b'changegroupsubset', |
|
2059 | b'changegroupsubset', | |
2064 | { |
|
2060 | { | |
2065 | b'bases': pullop.fetch, |
|
2061 | b'bases': pullop.fetch, | |
2066 | b'heads': pullop.heads, |
|
2062 | b'heads': pullop.heads, | |
2067 | b'source': b'pull', |
|
2063 | b'source': b'pull', | |
2068 | }, |
|
2064 | }, | |
2069 | ).result() |
|
2065 | ).result() | |
2070 |
|
2066 | |||
2071 | bundleop = bundle2.applybundle( |
|
2067 | bundleop = bundle2.applybundle( | |
2072 | pullop.repo, cg, tr, b'pull', pullop.remote.url() |
|
2068 | pullop.repo, cg, tr, b'pull', pullop.remote.url() | |
2073 | ) |
|
2069 | ) | |
2074 | pullop.cgresult = bundle2.combinechangegroupresults(bundleop) |
|
2070 | pullop.cgresult = bundle2.combinechangegroupresults(bundleop) | |
2075 |
|
2071 | |||
2076 |
|
2072 | |||
2077 | def _pullphase(pullop): |
|
2073 | def _pullphase(pullop): | |
2078 | # Get remote phases data from remote |
|
2074 | # Get remote phases data from remote | |
2079 | if b'phases' in pullop.stepsdone: |
|
2075 | if b'phases' in pullop.stepsdone: | |
2080 | return |
|
2076 | return | |
2081 | remotephases = listkeys(pullop.remote, b'phases') |
|
2077 | remotephases = listkeys(pullop.remote, b'phases') | |
2082 | _pullapplyphases(pullop, remotephases) |
|
2078 | _pullapplyphases(pullop, remotephases) | |
2083 |
|
2079 | |||
2084 |
|
2080 | |||
2085 | def _pullapplyphases(pullop, remotephases): |
|
2081 | def _pullapplyphases(pullop, remotephases): | |
2086 | """apply phase movement from observed remote state""" |
|
2082 | """apply phase movement from observed remote state""" | |
2087 | if b'phases' in pullop.stepsdone: |
|
2083 | if b'phases' in pullop.stepsdone: | |
2088 | return |
|
2084 | return | |
2089 | pullop.stepsdone.add(b'phases') |
|
2085 | pullop.stepsdone.add(b'phases') | |
2090 | publishing = bool(remotephases.get(b'publishing', False)) |
|
2086 | publishing = bool(remotephases.get(b'publishing', False)) | |
2091 | if remotephases and not publishing: |
|
2087 | if remotephases and not publishing: | |
2092 | # remote is new and non-publishing |
|
2088 | # remote is new and non-publishing | |
2093 | pheads, _dr = phases.analyzeremotephases( |
|
2089 | pheads, _dr = phases.analyzeremotephases( | |
2094 | pullop.repo, pullop.pulledsubset, remotephases |
|
2090 | pullop.repo, pullop.pulledsubset, remotephases | |
2095 | ) |
|
2091 | ) | |
2096 | dheads = pullop.pulledsubset |
|
2092 | dheads = pullop.pulledsubset | |
2097 | else: |
|
2093 | else: | |
2098 | # Remote is old or publishing all common changesets |
|
2094 | # Remote is old or publishing all common changesets | |
2099 | # should be seen as public |
|
2095 | # should be seen as public | |
2100 | pheads = pullop.pulledsubset |
|
2096 | pheads = pullop.pulledsubset | |
2101 | dheads = [] |
|
2097 | dheads = [] | |
2102 | unfi = pullop.repo.unfiltered() |
|
2098 | unfi = pullop.repo.unfiltered() | |
2103 | phase = unfi._phasecache.phase |
|
2099 | phase = unfi._phasecache.phase | |
2104 | rev = unfi.changelog.index.get_rev |
|
2100 | rev = unfi.changelog.index.get_rev | |
2105 | public = phases.public |
|
2101 | public = phases.public | |
2106 | draft = phases.draft |
|
2102 | draft = phases.draft | |
2107 |
|
2103 | |||
2108 | # exclude changesets already public locally and update the others |
|
2104 | # exclude changesets already public locally and update the others | |
2109 | pheads = [pn for pn in pheads if phase(unfi, rev(pn)) > public] |
|
2105 | pheads = [pn for pn in pheads if phase(unfi, rev(pn)) > public] | |
2110 | if pheads: |
|
2106 | if pheads: | |
2111 | tr = pullop.gettransaction() |
|
2107 | tr = pullop.gettransaction() | |
2112 | phases.advanceboundary(pullop.repo, tr, public, pheads) |
|
2108 | phases.advanceboundary(pullop.repo, tr, public, pheads) | |
2113 |
|
2109 | |||
2114 | # exclude changesets already draft locally and update the others |
|
2110 | # exclude changesets already draft locally and update the others | |
2115 | dheads = [pn for pn in dheads if phase(unfi, rev(pn)) > draft] |
|
2111 | dheads = [pn for pn in dheads if phase(unfi, rev(pn)) > draft] | |
2116 | if dheads: |
|
2112 | if dheads: | |
2117 | tr = pullop.gettransaction() |
|
2113 | tr = pullop.gettransaction() | |
2118 | phases.advanceboundary(pullop.repo, tr, draft, dheads) |
|
2114 | phases.advanceboundary(pullop.repo, tr, draft, dheads) | |
2119 |
|
2115 | |||
2120 |
|
2116 | |||
2121 | def _pullbookmarks(pullop): |
|
2117 | def _pullbookmarks(pullop): | |
2122 | """process the remote bookmark information to update the local one""" |
|
2118 | """process the remote bookmark information to update the local one""" | |
2123 | if b'bookmarks' in pullop.stepsdone: |
|
2119 | if b'bookmarks' in pullop.stepsdone: | |
2124 | return |
|
2120 | return | |
2125 | pullop.stepsdone.add(b'bookmarks') |
|
2121 | pullop.stepsdone.add(b'bookmarks') | |
2126 | repo = pullop.repo |
|
2122 | repo = pullop.repo | |
2127 | remotebookmarks = pullop.remotebookmarks |
|
2123 | remotebookmarks = pullop.remotebookmarks | |
2128 | bookmod.updatefromremote( |
|
2124 | bookmod.updatefromremote( | |
2129 | repo.ui, |
|
2125 | repo.ui, | |
2130 | repo, |
|
2126 | repo, | |
2131 | remotebookmarks, |
|
2127 | remotebookmarks, | |
2132 | pullop.remote.url(), |
|
2128 | pullop.remote.url(), | |
2133 | pullop.gettransaction, |
|
2129 | pullop.gettransaction, | |
2134 | explicit=pullop.explicitbookmarks, |
|
2130 | explicit=pullop.explicitbookmarks, | |
2135 | ) |
|
2131 | ) | |
2136 |
|
2132 | |||
2137 |
|
2133 | |||
2138 | def _pullobsolete(pullop): |
|
2134 | def _pullobsolete(pullop): | |
2139 | """utility function to pull obsolete markers from a remote |
|
2135 | """utility function to pull obsolete markers from a remote | |
2140 |
|
2136 | |||
2141 | The `gettransaction` is function that return the pull transaction, creating |
|
2137 | The `gettransaction` is function that return the pull transaction, creating | |
2142 | one if necessary. We return the transaction to inform the calling code that |
|
2138 | one if necessary. We return the transaction to inform the calling code that | |
2143 | a new transaction have been created (when applicable). |
|
2139 | a new transaction have been created (when applicable). | |
2144 |
|
2140 | |||
2145 | Exists mostly to allow overriding for experimentation purpose""" |
|
2141 | Exists mostly to allow overriding for experimentation purpose""" | |
2146 | if b'obsmarkers' in pullop.stepsdone: |
|
2142 | if b'obsmarkers' in pullop.stepsdone: | |
2147 | return |
|
2143 | return | |
2148 | pullop.stepsdone.add(b'obsmarkers') |
|
2144 | pullop.stepsdone.add(b'obsmarkers') | |
2149 | tr = None |
|
2145 | tr = None | |
2150 | if obsolete.isenabled(pullop.repo, obsolete.exchangeopt): |
|
2146 | if obsolete.isenabled(pullop.repo, obsolete.exchangeopt): | |
2151 | pullop.repo.ui.debug(b'fetching remote obsolete markers\n') |
|
2147 | pullop.repo.ui.debug(b'fetching remote obsolete markers\n') | |
2152 | remoteobs = listkeys(pullop.remote, b'obsolete') |
|
2148 | remoteobs = listkeys(pullop.remote, b'obsolete') | |
2153 | if b'dump0' in remoteobs: |
|
2149 | if b'dump0' in remoteobs: | |
2154 | tr = pullop.gettransaction() |
|
2150 | tr = pullop.gettransaction() | |
2155 | markers = [] |
|
2151 | markers = [] | |
2156 | for key in sorted(remoteobs, reverse=True): |
|
2152 | for key in sorted(remoteobs, reverse=True): | |
2157 | if key.startswith(b'dump'): |
|
2153 | if key.startswith(b'dump'): | |
2158 | data = util.b85decode(remoteobs[key]) |
|
2154 | data = util.b85decode(remoteobs[key]) | |
2159 | version, newmarks = obsolete._readmarkers(data) |
|
2155 | version, newmarks = obsolete._readmarkers(data) | |
2160 | markers += newmarks |
|
2156 | markers += newmarks | |
2161 | if markers: |
|
2157 | if markers: | |
2162 | pullop.repo.obsstore.add(tr, markers) |
|
2158 | pullop.repo.obsstore.add(tr, markers) | |
2163 | pullop.repo.invalidatevolatilesets() |
|
2159 | pullop.repo.invalidatevolatilesets() | |
2164 | return tr |
|
2160 | return tr | |
2165 |
|
2161 | |||
2166 |
|
2162 | |||
2167 | def applynarrowacl(repo, kwargs): |
|
2163 | def applynarrowacl(repo, kwargs): | |
2168 | """Apply narrow fetch access control. |
|
2164 | """Apply narrow fetch access control. | |
2169 |
|
2165 | |||
2170 | This massages the named arguments for getbundle wire protocol commands |
|
2166 | This massages the named arguments for getbundle wire protocol commands | |
2171 | so requested data is filtered through access control rules. |
|
2167 | so requested data is filtered through access control rules. | |
2172 | """ |
|
2168 | """ | |
2173 | ui = repo.ui |
|
2169 | ui = repo.ui | |
2174 | # TODO this assumes existence of HTTP and is a layering violation. |
|
2170 | # TODO this assumes existence of HTTP and is a layering violation. | |
2175 | username = ui.shortuser(ui.environ.get(b'REMOTE_USER') or ui.username()) |
|
2171 | username = ui.shortuser(ui.environ.get(b'REMOTE_USER') or ui.username()) | |
2176 | user_includes = ui.configlist( |
|
2172 | user_includes = ui.configlist( | |
2177 | _NARROWACL_SECTION, |
|
2173 | _NARROWACL_SECTION, | |
2178 | username + b'.includes', |
|
2174 | username + b'.includes', | |
2179 | ui.configlist(_NARROWACL_SECTION, b'default.includes'), |
|
2175 | ui.configlist(_NARROWACL_SECTION, b'default.includes'), | |
2180 | ) |
|
2176 | ) | |
2181 | user_excludes = ui.configlist( |
|
2177 | user_excludes = ui.configlist( | |
2182 | _NARROWACL_SECTION, |
|
2178 | _NARROWACL_SECTION, | |
2183 | username + b'.excludes', |
|
2179 | username + b'.excludes', | |
2184 | ui.configlist(_NARROWACL_SECTION, b'default.excludes'), |
|
2180 | ui.configlist(_NARROWACL_SECTION, b'default.excludes'), | |
2185 | ) |
|
2181 | ) | |
2186 | if not user_includes: |
|
2182 | if not user_includes: | |
2187 | raise error.Abort( |
|
2183 | raise error.Abort( | |
2188 | _(b"{} configuration for user {} is empty").format( |
|
2184 | _(b"{} configuration for user {} is empty").format( | |
2189 | _NARROWACL_SECTION, username |
|
2185 | _NARROWACL_SECTION, username | |
2190 | ) |
|
2186 | ) | |
2191 | ) |
|
2187 | ) | |
2192 |
|
2188 | |||
2193 | user_includes = [ |
|
2189 | user_includes = [ | |
2194 | b'path:.' if p == b'*' else b'path:' + p for p in user_includes |
|
2190 | b'path:.' if p == b'*' else b'path:' + p for p in user_includes | |
2195 | ] |
|
2191 | ] | |
2196 | user_excludes = [ |
|
2192 | user_excludes = [ | |
2197 | b'path:.' if p == b'*' else b'path:' + p for p in user_excludes |
|
2193 | b'path:.' if p == b'*' else b'path:' + p for p in user_excludes | |
2198 | ] |
|
2194 | ] | |
2199 |
|
2195 | |||
2200 | req_includes = set(kwargs.get('includepats', [])) |
|
2196 | req_includes = set(kwargs.get('includepats', [])) | |
2201 | req_excludes = set(kwargs.get('excludepats', [])) |
|
2197 | req_excludes = set(kwargs.get('excludepats', [])) | |
2202 |
|
2198 | |||
2203 | req_includes, req_excludes, invalid_includes = narrowspec.restrictpatterns( |
|
2199 | req_includes, req_excludes, invalid_includes = narrowspec.restrictpatterns( | |
2204 | req_includes, req_excludes, user_includes, user_excludes |
|
2200 | req_includes, req_excludes, user_includes, user_excludes | |
2205 | ) |
|
2201 | ) | |
2206 |
|
2202 | |||
2207 | if invalid_includes: |
|
2203 | if invalid_includes: | |
2208 | raise error.Abort( |
|
2204 | raise error.Abort( | |
2209 | _(b"The following includes are not accessible for {}: {}").format( |
|
2205 | _(b"The following includes are not accessible for {}: {}").format( | |
2210 | username, invalid_includes |
|
2206 | username, invalid_includes | |
2211 | ) |
|
2207 | ) | |
2212 | ) |
|
2208 | ) | |
2213 |
|
2209 | |||
2214 | new_args = {} |
|
2210 | new_args = {} | |
2215 | new_args.update(kwargs) |
|
2211 | new_args.update(kwargs) | |
2216 | new_args['narrow'] = True |
|
2212 | new_args['narrow'] = True | |
2217 | new_args['narrow_acl'] = True |
|
2213 | new_args['narrow_acl'] = True | |
2218 | new_args['includepats'] = req_includes |
|
2214 | new_args['includepats'] = req_includes | |
2219 | if req_excludes: |
|
2215 | if req_excludes: | |
2220 | new_args['excludepats'] = req_excludes |
|
2216 | new_args['excludepats'] = req_excludes | |
2221 |
|
2217 | |||
2222 | return new_args |
|
2218 | return new_args | |
2223 |
|
2219 | |||
2224 |
|
2220 | |||
2225 | def _computeellipsis(repo, common, heads, known, match, depth=None): |
|
2221 | def _computeellipsis(repo, common, heads, known, match, depth=None): | |
2226 | """Compute the shape of a narrowed DAG. |
|
2222 | """Compute the shape of a narrowed DAG. | |
2227 |
|
2223 | |||
2228 | Args: |
|
2224 | Args: | |
2229 | repo: The repository we're transferring. |
|
2225 | repo: The repository we're transferring. | |
2230 | common: The roots of the DAG range we're transferring. |
|
2226 | common: The roots of the DAG range we're transferring. | |
2231 | May be just [nullid], which means all ancestors of heads. |
|
2227 | May be just [nullid], which means all ancestors of heads. | |
2232 | heads: The heads of the DAG range we're transferring. |
|
2228 | heads: The heads of the DAG range we're transferring. | |
2233 | match: The narrowmatcher that allows us to identify relevant changes. |
|
2229 | match: The narrowmatcher that allows us to identify relevant changes. | |
2234 | depth: If not None, only consider nodes to be full nodes if they are at |
|
2230 | depth: If not None, only consider nodes to be full nodes if they are at | |
2235 | most depth changesets away from one of heads. |
|
2231 | most depth changesets away from one of heads. | |
2236 |
|
2232 | |||
2237 | Returns: |
|
2233 | Returns: | |
2238 | A tuple of (visitnodes, relevant_nodes, ellipsisroots) where: |
|
2234 | A tuple of (visitnodes, relevant_nodes, ellipsisroots) where: | |
2239 |
|
2235 | |||
2240 | visitnodes: The list of nodes (either full or ellipsis) which |
|
2236 | visitnodes: The list of nodes (either full or ellipsis) which | |
2241 | need to be sent to the client. |
|
2237 | need to be sent to the client. | |
2242 | relevant_nodes: The set of changelog nodes which change a file inside |
|
2238 | relevant_nodes: The set of changelog nodes which change a file inside | |
2243 | the narrowspec. The client needs these as non-ellipsis nodes. |
|
2239 | the narrowspec. The client needs these as non-ellipsis nodes. | |
2244 | ellipsisroots: A dict of {rev: parents} that is used in |
|
2240 | ellipsisroots: A dict of {rev: parents} that is used in | |
2245 | narrowchangegroup to produce ellipsis nodes with the |
|
2241 | narrowchangegroup to produce ellipsis nodes with the | |
2246 | correct parents. |
|
2242 | correct parents. | |
2247 | """ |
|
2243 | """ | |
2248 | cl = repo.changelog |
|
2244 | cl = repo.changelog | |
2249 | mfl = repo.manifestlog |
|
2245 | mfl = repo.manifestlog | |
2250 |
|
2246 | |||
2251 | clrev = cl.rev |
|
2247 | clrev = cl.rev | |
2252 |
|
2248 | |||
2253 | commonrevs = {clrev(n) for n in common} | {nullrev} |
|
2249 | commonrevs = {clrev(n) for n in common} | {nullrev} | |
2254 | headsrevs = {clrev(n) for n in heads} |
|
2250 | headsrevs = {clrev(n) for n in heads} | |
2255 |
|
2251 | |||
2256 | if depth: |
|
2252 | if depth: | |
2257 | revdepth = {h: 0 for h in headsrevs} |
|
2253 | revdepth = {h: 0 for h in headsrevs} | |
2258 |
|
2254 | |||
2259 | ellipsisheads = collections.defaultdict(set) |
|
2255 | ellipsisheads = collections.defaultdict(set) | |
2260 | ellipsisroots = collections.defaultdict(set) |
|
2256 | ellipsisroots = collections.defaultdict(set) | |
2261 |
|
2257 | |||
2262 | def addroot(head, curchange): |
|
2258 | def addroot(head, curchange): | |
2263 | """Add a root to an ellipsis head, splitting heads with 3 roots.""" |
|
2259 | """Add a root to an ellipsis head, splitting heads with 3 roots.""" | |
2264 | ellipsisroots[head].add(curchange) |
|
2260 | ellipsisroots[head].add(curchange) | |
2265 | # Recursively split ellipsis heads with 3 roots by finding the |
|
2261 | # Recursively split ellipsis heads with 3 roots by finding the | |
2266 | # roots' youngest common descendant which is an elided merge commit. |
|
2262 | # roots' youngest common descendant which is an elided merge commit. | |
2267 | # That descendant takes 2 of the 3 roots as its own, and becomes a |
|
2263 | # That descendant takes 2 of the 3 roots as its own, and becomes a | |
2268 | # root of the head. |
|
2264 | # root of the head. | |
2269 | while len(ellipsisroots[head]) > 2: |
|
2265 | while len(ellipsisroots[head]) > 2: | |
2270 | child, roots = splithead(head) |
|
2266 | child, roots = splithead(head) | |
2271 | splitroots(head, child, roots) |
|
2267 | splitroots(head, child, roots) | |
2272 | head = child # Recurse in case we just added a 3rd root |
|
2268 | head = child # Recurse in case we just added a 3rd root | |
2273 |
|
2269 | |||
2274 | def splitroots(head, child, roots): |
|
2270 | def splitroots(head, child, roots): | |
2275 | ellipsisroots[head].difference_update(roots) |
|
2271 | ellipsisroots[head].difference_update(roots) | |
2276 | ellipsisroots[head].add(child) |
|
2272 | ellipsisroots[head].add(child) | |
2277 | ellipsisroots[child].update(roots) |
|
2273 | ellipsisroots[child].update(roots) | |
2278 | ellipsisroots[child].discard(child) |
|
2274 | ellipsisroots[child].discard(child) | |
2279 |
|
2275 | |||
2280 | def splithead(head): |
|
2276 | def splithead(head): | |
2281 | r1, r2, r3 = sorted(ellipsisroots[head]) |
|
2277 | r1, r2, r3 = sorted(ellipsisroots[head]) | |
2282 | for nr1, nr2 in ((r2, r3), (r1, r3), (r1, r2)): |
|
2278 | for nr1, nr2 in ((r2, r3), (r1, r3), (r1, r2)): | |
2283 | mid = repo.revs( |
|
2279 | mid = repo.revs( | |
2284 | b'sort(merge() & %d::%d & %d::%d, -rev)', nr1, head, nr2, head |
|
2280 | b'sort(merge() & %d::%d & %d::%d, -rev)', nr1, head, nr2, head | |
2285 | ) |
|
2281 | ) | |
2286 | for j in mid: |
|
2282 | for j in mid: | |
2287 | if j == nr2: |
|
2283 | if j == nr2: | |
2288 | return nr2, (nr1, nr2) |
|
2284 | return nr2, (nr1, nr2) | |
2289 | if j not in ellipsisroots or len(ellipsisroots[j]) < 2: |
|
2285 | if j not in ellipsisroots or len(ellipsisroots[j]) < 2: | |
2290 | return j, (nr1, nr2) |
|
2286 | return j, (nr1, nr2) | |
2291 | raise error.Abort( |
|
2287 | raise error.Abort( | |
2292 | _( |
|
2288 | _( | |
2293 | b'Failed to split up ellipsis node! head: %d, ' |
|
2289 | b'Failed to split up ellipsis node! head: %d, ' | |
2294 | b'roots: %d %d %d' |
|
2290 | b'roots: %d %d %d' | |
2295 | ) |
|
2291 | ) | |
2296 | % (head, r1, r2, r3) |
|
2292 | % (head, r1, r2, r3) | |
2297 | ) |
|
2293 | ) | |
2298 |
|
2294 | |||
2299 | missing = list(cl.findmissingrevs(common=commonrevs, heads=headsrevs)) |
|
2295 | missing = list(cl.findmissingrevs(common=commonrevs, heads=headsrevs)) | |
2300 | visit = reversed(missing) |
|
2296 | visit = reversed(missing) | |
2301 | relevant_nodes = set() |
|
2297 | relevant_nodes = set() | |
2302 | visitnodes = [cl.node(m) for m in missing] |
|
2298 | visitnodes = [cl.node(m) for m in missing] | |
2303 | required = set(headsrevs) | known |
|
2299 | required = set(headsrevs) | known | |
2304 | for rev in visit: |
|
2300 | for rev in visit: | |
2305 | clrev = cl.changelogrevision(rev) |
|
2301 | clrev = cl.changelogrevision(rev) | |
2306 | ps = [prev for prev in cl.parentrevs(rev) if prev != nullrev] |
|
2302 | ps = [prev for prev in cl.parentrevs(rev) if prev != nullrev] | |
2307 | if depth is not None: |
|
2303 | if depth is not None: | |
2308 | curdepth = revdepth[rev] |
|
2304 | curdepth = revdepth[rev] | |
2309 | for p in ps: |
|
2305 | for p in ps: | |
2310 | revdepth[p] = min(curdepth + 1, revdepth.get(p, depth + 1)) |
|
2306 | revdepth[p] = min(curdepth + 1, revdepth.get(p, depth + 1)) | |
2311 | needed = False |
|
2307 | needed = False | |
2312 | shallow_enough = depth is None or revdepth[rev] <= depth |
|
2308 | shallow_enough = depth is None or revdepth[rev] <= depth | |
2313 | if shallow_enough: |
|
2309 | if shallow_enough: | |
2314 | curmf = mfl[clrev.manifest].read() |
|
2310 | curmf = mfl[clrev.manifest].read() | |
2315 | if ps: |
|
2311 | if ps: | |
2316 | # We choose to not trust the changed files list in |
|
2312 | # We choose to not trust the changed files list in | |
2317 | # changesets because it's not always correct. TODO: could |
|
2313 | # changesets because it's not always correct. TODO: could | |
2318 | # we trust it for the non-merge case? |
|
2314 | # we trust it for the non-merge case? | |
2319 | p1mf = mfl[cl.changelogrevision(ps[0]).manifest].read() |
|
2315 | p1mf = mfl[cl.changelogrevision(ps[0]).manifest].read() | |
2320 | needed = bool(curmf.diff(p1mf, match)) |
|
2316 | needed = bool(curmf.diff(p1mf, match)) | |
2321 | if not needed and len(ps) > 1: |
|
2317 | if not needed and len(ps) > 1: | |
2322 | # For merge changes, the list of changed files is not |
|
2318 | # For merge changes, the list of changed files is not | |
2323 | # helpful, since we need to emit the merge if a file |
|
2319 | # helpful, since we need to emit the merge if a file | |
2324 | # in the narrow spec has changed on either side of the |
|
2320 | # in the narrow spec has changed on either side of the | |
2325 | # merge. As a result, we do a manifest diff to check. |
|
2321 | # merge. As a result, we do a manifest diff to check. | |
2326 | p2mf = mfl[cl.changelogrevision(ps[1]).manifest].read() |
|
2322 | p2mf = mfl[cl.changelogrevision(ps[1]).manifest].read() | |
2327 | needed = bool(curmf.diff(p2mf, match)) |
|
2323 | needed = bool(curmf.diff(p2mf, match)) | |
2328 | else: |
|
2324 | else: | |
2329 | # For a root node, we need to include the node if any |
|
2325 | # For a root node, we need to include the node if any | |
2330 | # files in the node match the narrowspec. |
|
2326 | # files in the node match the narrowspec. | |
2331 | needed = any(curmf.walk(match)) |
|
2327 | needed = any(curmf.walk(match)) | |
2332 |
|
2328 | |||
2333 | if needed: |
|
2329 | if needed: | |
2334 | for head in ellipsisheads[rev]: |
|
2330 | for head in ellipsisheads[rev]: | |
2335 | addroot(head, rev) |
|
2331 | addroot(head, rev) | |
2336 | for p in ps: |
|
2332 | for p in ps: | |
2337 | required.add(p) |
|
2333 | required.add(p) | |
2338 | relevant_nodes.add(cl.node(rev)) |
|
2334 | relevant_nodes.add(cl.node(rev)) | |
2339 | else: |
|
2335 | else: | |
2340 | if not ps: |
|
2336 | if not ps: | |
2341 | ps = [nullrev] |
|
2337 | ps = [nullrev] | |
2342 | if rev in required: |
|
2338 | if rev in required: | |
2343 | for head in ellipsisheads[rev]: |
|
2339 | for head in ellipsisheads[rev]: | |
2344 | addroot(head, rev) |
|
2340 | addroot(head, rev) | |
2345 | for p in ps: |
|
2341 | for p in ps: | |
2346 | ellipsisheads[p].add(rev) |
|
2342 | ellipsisheads[p].add(rev) | |
2347 | else: |
|
2343 | else: | |
2348 | for p in ps: |
|
2344 | for p in ps: | |
2349 | ellipsisheads[p] |= ellipsisheads[rev] |
|
2345 | ellipsisheads[p] |= ellipsisheads[rev] | |
2350 |
|
2346 | |||
2351 | # add common changesets as roots of their reachable ellipsis heads |
|
2347 | # add common changesets as roots of their reachable ellipsis heads | |
2352 | for c in commonrevs: |
|
2348 | for c in commonrevs: | |
2353 | for head in ellipsisheads[c]: |
|
2349 | for head in ellipsisheads[c]: | |
2354 | addroot(head, c) |
|
2350 | addroot(head, c) | |
2355 | return visitnodes, relevant_nodes, ellipsisroots |
|
2351 | return visitnodes, relevant_nodes, ellipsisroots | |
2356 |
|
2352 | |||
2357 |
|
2353 | |||
2358 | def caps20to10(repo, role): |
|
2354 | def caps20to10(repo, role): | |
2359 | """return a set with appropriate options to use bundle20 during getbundle""" |
|
2355 | """return a set with appropriate options to use bundle20 during getbundle""" | |
2360 | caps = {b'HG20'} |
|
2356 | caps = {b'HG20'} | |
2361 | capsblob = bundle2.encodecaps(bundle2.getrepocaps(repo, role=role)) |
|
2357 | capsblob = bundle2.encodecaps(bundle2.getrepocaps(repo, role=role)) | |
2362 | caps.add(b'bundle2=' + urlreq.quote(capsblob)) |
|
2358 | caps.add(b'bundle2=' + urlreq.quote(capsblob)) | |
2363 | return caps |
|
2359 | return caps | |
2364 |
|
2360 | |||
2365 |
|
2361 | |||
2366 | # List of names of steps to perform for a bundle2 for getbundle, order matters. |
|
2362 | # List of names of steps to perform for a bundle2 for getbundle, order matters. | |
2367 | getbundle2partsorder = [] |
|
2363 | getbundle2partsorder = [] | |
2368 |
|
2364 | |||
2369 | # Mapping between step name and function |
|
2365 | # Mapping between step name and function | |
2370 | # |
|
2366 | # | |
2371 | # This exists to help extensions wrap steps if necessary |
|
2367 | # This exists to help extensions wrap steps if necessary | |
2372 | getbundle2partsmapping = {} |
|
2368 | getbundle2partsmapping = {} | |
2373 |
|
2369 | |||
2374 |
|
2370 | |||
2375 | def getbundle2partsgenerator(stepname, idx=None): |
|
2371 | def getbundle2partsgenerator(stepname, idx=None): | |
2376 | """decorator for function generating bundle2 part for getbundle |
|
2372 | """decorator for function generating bundle2 part for getbundle | |
2377 |
|
2373 | |||
2378 | The function is added to the step -> function mapping and appended to the |
|
2374 | The function is added to the step -> function mapping and appended to the | |
2379 | list of steps. Beware that decorated functions will be added in order |
|
2375 | list of steps. Beware that decorated functions will be added in order | |
2380 | (this may matter). |
|
2376 | (this may matter). | |
2381 |
|
2377 | |||
2382 | You can only use this decorator for new steps, if you want to wrap a step |
|
2378 | You can only use this decorator for new steps, if you want to wrap a step | |
2383 | from an extension, attack the getbundle2partsmapping dictionary directly.""" |
|
2379 | from an extension, attack the getbundle2partsmapping dictionary directly.""" | |
2384 |
|
2380 | |||
2385 | def dec(func): |
|
2381 | def dec(func): | |
2386 | assert stepname not in getbundle2partsmapping |
|
2382 | assert stepname not in getbundle2partsmapping | |
2387 | getbundle2partsmapping[stepname] = func |
|
2383 | getbundle2partsmapping[stepname] = func | |
2388 | if idx is None: |
|
2384 | if idx is None: | |
2389 | getbundle2partsorder.append(stepname) |
|
2385 | getbundle2partsorder.append(stepname) | |
2390 | else: |
|
2386 | else: | |
2391 | getbundle2partsorder.insert(idx, stepname) |
|
2387 | getbundle2partsorder.insert(idx, stepname) | |
2392 | return func |
|
2388 | return func | |
2393 |
|
2389 | |||
2394 | return dec |
|
2390 | return dec | |
2395 |
|
2391 | |||
2396 |
|
2392 | |||
2397 | def bundle2requested(bundlecaps): |
|
2393 | def bundle2requested(bundlecaps): | |
2398 | if bundlecaps is not None: |
|
2394 | if bundlecaps is not None: | |
2399 | return any(cap.startswith(b'HG2') for cap in bundlecaps) |
|
2395 | return any(cap.startswith(b'HG2') for cap in bundlecaps) | |
2400 | return False |
|
2396 | return False | |
2401 |
|
2397 | |||
2402 |
|
2398 | |||
2403 | def getbundlechunks( |
|
2399 | def getbundlechunks( | |
2404 | repo, source, heads=None, common=None, bundlecaps=None, **kwargs |
|
2400 | repo, source, heads=None, common=None, bundlecaps=None, **kwargs | |
2405 | ): |
|
2401 | ): | |
2406 | """Return chunks constituting a bundle's raw data. |
|
2402 | """Return chunks constituting a bundle's raw data. | |
2407 |
|
2403 | |||
2408 | Could be a bundle HG10 or a bundle HG20 depending on bundlecaps |
|
2404 | Could be a bundle HG10 or a bundle HG20 depending on bundlecaps | |
2409 | passed. |
|
2405 | passed. | |
2410 |
|
2406 | |||
2411 | Returns a 2-tuple of a dict with metadata about the generated bundle |
|
2407 | Returns a 2-tuple of a dict with metadata about the generated bundle | |
2412 | and an iterator over raw chunks (of varying sizes). |
|
2408 | and an iterator over raw chunks (of varying sizes). | |
2413 | """ |
|
2409 | """ | |
2414 | kwargs = pycompat.byteskwargs(kwargs) |
|
2410 | kwargs = pycompat.byteskwargs(kwargs) | |
2415 | info = {} |
|
2411 | info = {} | |
2416 | usebundle2 = bundle2requested(bundlecaps) |
|
2412 | usebundle2 = bundle2requested(bundlecaps) | |
2417 | # bundle10 case |
|
2413 | # bundle10 case | |
2418 | if not usebundle2: |
|
2414 | if not usebundle2: | |
2419 | if bundlecaps and not kwargs.get(b'cg', True): |
|
2415 | if bundlecaps and not kwargs.get(b'cg', True): | |
2420 | raise ValueError( |
|
2416 | raise ValueError( | |
2421 | _(b'request for bundle10 must include changegroup') |
|
2417 | _(b'request for bundle10 must include changegroup') | |
2422 | ) |
|
2418 | ) | |
2423 |
|
2419 | |||
2424 | if kwargs: |
|
2420 | if kwargs: | |
2425 | raise ValueError( |
|
2421 | raise ValueError( | |
2426 | _(b'unsupported getbundle arguments: %s') |
|
2422 | _(b'unsupported getbundle arguments: %s') | |
2427 | % b', '.join(sorted(kwargs.keys())) |
|
2423 | % b', '.join(sorted(kwargs.keys())) | |
2428 | ) |
|
2424 | ) | |
2429 | outgoing = _computeoutgoing(repo, heads, common) |
|
2425 | outgoing = _computeoutgoing(repo, heads, common) | |
2430 | info[b'bundleversion'] = 1 |
|
2426 | info[b'bundleversion'] = 1 | |
2431 | return ( |
|
2427 | return ( | |
2432 | info, |
|
2428 | info, | |
2433 | changegroup.makestream( |
|
2429 | changegroup.makestream( | |
2434 | repo, outgoing, b'01', source, bundlecaps=bundlecaps |
|
2430 | repo, outgoing, b'01', source, bundlecaps=bundlecaps | |
2435 | ), |
|
2431 | ), | |
2436 | ) |
|
2432 | ) | |
2437 |
|
2433 | |||
2438 | # bundle20 case |
|
2434 | # bundle20 case | |
2439 | info[b'bundleversion'] = 2 |
|
2435 | info[b'bundleversion'] = 2 | |
2440 | b2caps = {} |
|
2436 | b2caps = {} | |
2441 | for bcaps in bundlecaps: |
|
2437 | for bcaps in bundlecaps: | |
2442 | if bcaps.startswith(b'bundle2='): |
|
2438 | if bcaps.startswith(b'bundle2='): | |
2443 | blob = urlreq.unquote(bcaps[len(b'bundle2=') :]) |
|
2439 | blob = urlreq.unquote(bcaps[len(b'bundle2=') :]) | |
2444 | b2caps.update(bundle2.decodecaps(blob)) |
|
2440 | b2caps.update(bundle2.decodecaps(blob)) | |
2445 | bundler = bundle2.bundle20(repo.ui, b2caps) |
|
2441 | bundler = bundle2.bundle20(repo.ui, b2caps) | |
2446 |
|
2442 | |||
2447 | kwargs[b'heads'] = heads |
|
2443 | kwargs[b'heads'] = heads | |
2448 | kwargs[b'common'] = common |
|
2444 | kwargs[b'common'] = common | |
2449 |
|
2445 | |||
2450 | for name in getbundle2partsorder: |
|
2446 | for name in getbundle2partsorder: | |
2451 | func = getbundle2partsmapping[name] |
|
2447 | func = getbundle2partsmapping[name] | |
2452 | func( |
|
2448 | func( | |
2453 | bundler, |
|
2449 | bundler, | |
2454 | repo, |
|
2450 | repo, | |
2455 | source, |
|
2451 | source, | |
2456 | bundlecaps=bundlecaps, |
|
2452 | bundlecaps=bundlecaps, | |
2457 | b2caps=b2caps, |
|
2453 | b2caps=b2caps, | |
2458 | **pycompat.strkwargs(kwargs) |
|
2454 | **pycompat.strkwargs(kwargs) | |
2459 | ) |
|
2455 | ) | |
2460 |
|
2456 | |||
2461 | info[b'prefercompressed'] = bundler.prefercompressed |
|
2457 | info[b'prefercompressed'] = bundler.prefercompressed | |
2462 |
|
2458 | |||
2463 | return info, bundler.getchunks() |
|
2459 | return info, bundler.getchunks() | |
2464 |
|
2460 | |||
2465 |
|
2461 | |||
2466 | @getbundle2partsgenerator(b'stream2') |
|
2462 | @getbundle2partsgenerator(b'stream2') | |
2467 | def _getbundlestream2(bundler, repo, *args, **kwargs): |
|
2463 | def _getbundlestream2(bundler, repo, *args, **kwargs): | |
2468 | return bundle2.addpartbundlestream2(bundler, repo, **kwargs) |
|
2464 | return bundle2.addpartbundlestream2(bundler, repo, **kwargs) | |
2469 |
|
2465 | |||
2470 |
|
2466 | |||
2471 | @getbundle2partsgenerator(b'changegroup') |
|
2467 | @getbundle2partsgenerator(b'changegroup') | |
2472 | def _getbundlechangegrouppart( |
|
2468 | def _getbundlechangegrouppart( | |
2473 | bundler, |
|
2469 | bundler, | |
2474 | repo, |
|
2470 | repo, | |
2475 | source, |
|
2471 | source, | |
2476 | bundlecaps=None, |
|
2472 | bundlecaps=None, | |
2477 | b2caps=None, |
|
2473 | b2caps=None, | |
2478 | heads=None, |
|
2474 | heads=None, | |
2479 | common=None, |
|
2475 | common=None, | |
2480 | **kwargs |
|
2476 | **kwargs | |
2481 | ): |
|
2477 | ): | |
2482 | """add a changegroup part to the requested bundle""" |
|
2478 | """add a changegroup part to the requested bundle""" | |
2483 | if not kwargs.get('cg', True): |
|
2479 | if not kwargs.get('cg', True): | |
2484 | return |
|
2480 | return | |
2485 |
|
2481 | |||
2486 | version = b'01' |
|
2482 | version = b'01' | |
2487 | cgversions = b2caps.get(b'changegroup') |
|
2483 | cgversions = b2caps.get(b'changegroup') | |
2488 | if cgversions: # 3.1 and 3.2 ship with an empty value |
|
2484 | if cgversions: # 3.1 and 3.2 ship with an empty value | |
2489 | cgversions = [ |
|
2485 | cgversions = [ | |
2490 | v |
|
2486 | v | |
2491 | for v in cgversions |
|
2487 | for v in cgversions | |
2492 | if v in changegroup.supportedoutgoingversions(repo) |
|
2488 | if v in changegroup.supportedoutgoingversions(repo) | |
2493 | ] |
|
2489 | ] | |
2494 | if not cgversions: |
|
2490 | if not cgversions: | |
2495 | raise error.Abort(_(b'no common changegroup version')) |
|
2491 | raise error.Abort(_(b'no common changegroup version')) | |
2496 | version = max(cgversions) |
|
2492 | version = max(cgversions) | |
2497 |
|
2493 | |||
2498 | outgoing = _computeoutgoing(repo, heads, common) |
|
2494 | outgoing = _computeoutgoing(repo, heads, common) | |
2499 | if not outgoing.missing: |
|
2495 | if not outgoing.missing: | |
2500 | return |
|
2496 | return | |
2501 |
|
2497 | |||
2502 | if kwargs.get('narrow', False): |
|
2498 | if kwargs.get('narrow', False): | |
2503 | include = sorted(filter(bool, kwargs.get('includepats', []))) |
|
2499 | include = sorted(filter(bool, kwargs.get('includepats', []))) | |
2504 | exclude = sorted(filter(bool, kwargs.get('excludepats', []))) |
|
2500 | exclude = sorted(filter(bool, kwargs.get('excludepats', []))) | |
2505 | matcher = narrowspec.match(repo.root, include=include, exclude=exclude) |
|
2501 | matcher = narrowspec.match(repo.root, include=include, exclude=exclude) | |
2506 | else: |
|
2502 | else: | |
2507 | matcher = None |
|
2503 | matcher = None | |
2508 |
|
2504 | |||
2509 | cgstream = changegroup.makestream( |
|
2505 | cgstream = changegroup.makestream( | |
2510 | repo, outgoing, version, source, bundlecaps=bundlecaps, matcher=matcher |
|
2506 | repo, outgoing, version, source, bundlecaps=bundlecaps, matcher=matcher | |
2511 | ) |
|
2507 | ) | |
2512 |
|
2508 | |||
2513 | part = bundler.newpart(b'changegroup', data=cgstream) |
|
2509 | part = bundler.newpart(b'changegroup', data=cgstream) | |
2514 | if cgversions: |
|
2510 | if cgversions: | |
2515 | part.addparam(b'version', version) |
|
2511 | part.addparam(b'version', version) | |
2516 |
|
2512 | |||
2517 | part.addparam(b'nbchanges', b'%d' % len(outgoing.missing), mandatory=False) |
|
2513 | part.addparam(b'nbchanges', b'%d' % len(outgoing.missing), mandatory=False) | |
2518 |
|
2514 | |||
2519 | if b'treemanifest' in repo.requirements: |
|
2515 | if b'treemanifest' in repo.requirements: | |
2520 | part.addparam(b'treemanifest', b'1') |
|
2516 | part.addparam(b'treemanifest', b'1') | |
2521 |
|
2517 | |||
2522 | if b'exp-sidedata-flag' in repo.requirements: |
|
2518 | if b'exp-sidedata-flag' in repo.requirements: | |
2523 | part.addparam(b'exp-sidedata', b'1') |
|
2519 | part.addparam(b'exp-sidedata', b'1') | |
2524 |
|
2520 | |||
2525 | if ( |
|
2521 | if ( | |
2526 | kwargs.get('narrow', False) |
|
2522 | kwargs.get('narrow', False) | |
2527 | and kwargs.get('narrow_acl', False) |
|
2523 | and kwargs.get('narrow_acl', False) | |
2528 | and (include or exclude) |
|
2524 | and (include or exclude) | |
2529 | ): |
|
2525 | ): | |
2530 | # this is mandatory because otherwise ACL clients won't work |
|
2526 | # this is mandatory because otherwise ACL clients won't work | |
2531 | narrowspecpart = bundler.newpart(b'Narrow:responsespec') |
|
2527 | narrowspecpart = bundler.newpart(b'Narrow:responsespec') | |
2532 | narrowspecpart.data = b'%s\0%s' % ( |
|
2528 | narrowspecpart.data = b'%s\0%s' % ( | |
2533 | b'\n'.join(include), |
|
2529 | b'\n'.join(include), | |
2534 | b'\n'.join(exclude), |
|
2530 | b'\n'.join(exclude), | |
2535 | ) |
|
2531 | ) | |
2536 |
|
2532 | |||
2537 |
|
2533 | |||
2538 | @getbundle2partsgenerator(b'bookmarks') |
|
2534 | @getbundle2partsgenerator(b'bookmarks') | |
2539 | def _getbundlebookmarkpart( |
|
2535 | def _getbundlebookmarkpart( | |
2540 | bundler, repo, source, bundlecaps=None, b2caps=None, **kwargs |
|
2536 | bundler, repo, source, bundlecaps=None, b2caps=None, **kwargs | |
2541 | ): |
|
2537 | ): | |
2542 | """add a bookmark part to the requested bundle""" |
|
2538 | """add a bookmark part to the requested bundle""" | |
2543 | if not kwargs.get('bookmarks', False): |
|
2539 | if not kwargs.get('bookmarks', False): | |
2544 | return |
|
2540 | return | |
2545 | if b'bookmarks' not in b2caps: |
|
2541 | if b'bookmarks' not in b2caps: | |
2546 | raise error.Abort(_(b'no common bookmarks exchange method')) |
|
2542 | raise error.Abort(_(b'no common bookmarks exchange method')) | |
2547 | books = bookmod.listbinbookmarks(repo) |
|
2543 | books = bookmod.listbinbookmarks(repo) | |
2548 | data = bookmod.binaryencode(books) |
|
2544 | data = bookmod.binaryencode(books) | |
2549 | if data: |
|
2545 | if data: | |
2550 | bundler.newpart(b'bookmarks', data=data) |
|
2546 | bundler.newpart(b'bookmarks', data=data) | |
2551 |
|
2547 | |||
2552 |
|
2548 | |||
2553 | @getbundle2partsgenerator(b'listkeys') |
|
2549 | @getbundle2partsgenerator(b'listkeys') | |
2554 | def _getbundlelistkeysparts( |
|
2550 | def _getbundlelistkeysparts( | |
2555 | bundler, repo, source, bundlecaps=None, b2caps=None, **kwargs |
|
2551 | bundler, repo, source, bundlecaps=None, b2caps=None, **kwargs | |
2556 | ): |
|
2552 | ): | |
2557 | """add parts containing listkeys namespaces to the requested bundle""" |
|
2553 | """add parts containing listkeys namespaces to the requested bundle""" | |
2558 | listkeys = kwargs.get('listkeys', ()) |
|
2554 | listkeys = kwargs.get('listkeys', ()) | |
2559 | for namespace in listkeys: |
|
2555 | for namespace in listkeys: | |
2560 | part = bundler.newpart(b'listkeys') |
|
2556 | part = bundler.newpart(b'listkeys') | |
2561 | part.addparam(b'namespace', namespace) |
|
2557 | part.addparam(b'namespace', namespace) | |
2562 | keys = repo.listkeys(namespace).items() |
|
2558 | keys = repo.listkeys(namespace).items() | |
2563 | part.data = pushkey.encodekeys(keys) |
|
2559 | part.data = pushkey.encodekeys(keys) | |
2564 |
|
2560 | |||
2565 |
|
2561 | |||
2566 | @getbundle2partsgenerator(b'obsmarkers') |
|
2562 | @getbundle2partsgenerator(b'obsmarkers') | |
2567 | def _getbundleobsmarkerpart( |
|
2563 | def _getbundleobsmarkerpart( | |
2568 | bundler, repo, source, bundlecaps=None, b2caps=None, heads=None, **kwargs |
|
2564 | bundler, repo, source, bundlecaps=None, b2caps=None, heads=None, **kwargs | |
2569 | ): |
|
2565 | ): | |
2570 | """add an obsolescence markers part to the requested bundle""" |
|
2566 | """add an obsolescence markers part to the requested bundle""" | |
2571 | if kwargs.get('obsmarkers', False): |
|
2567 | if kwargs.get('obsmarkers', False): | |
2572 | if heads is None: |
|
2568 | if heads is None: | |
2573 | heads = repo.heads() |
|
2569 | heads = repo.heads() | |
2574 | subset = [c.node() for c in repo.set(b'::%ln', heads)] |
|
2570 | subset = [c.node() for c in repo.set(b'::%ln', heads)] | |
2575 | markers = repo.obsstore.relevantmarkers(subset) |
|
2571 | markers = repo.obsstore.relevantmarkers(subset) | |
2576 |
markers = |
|
2572 | markers = obsutil.sortedmarkers(markers) | |
2577 | bundle2.buildobsmarkerspart(bundler, markers) |
|
2573 | bundle2.buildobsmarkerspart(bundler, markers) | |
2578 |
|
2574 | |||
2579 |
|
2575 | |||
2580 | @getbundle2partsgenerator(b'phases') |
|
2576 | @getbundle2partsgenerator(b'phases') | |
2581 | def _getbundlephasespart( |
|
2577 | def _getbundlephasespart( | |
2582 | bundler, repo, source, bundlecaps=None, b2caps=None, heads=None, **kwargs |
|
2578 | bundler, repo, source, bundlecaps=None, b2caps=None, heads=None, **kwargs | |
2583 | ): |
|
2579 | ): | |
2584 | """add phase heads part to the requested bundle""" |
|
2580 | """add phase heads part to the requested bundle""" | |
2585 | if kwargs.get('phases', False): |
|
2581 | if kwargs.get('phases', False): | |
2586 | if not b'heads' in b2caps.get(b'phases'): |
|
2582 | if not b'heads' in b2caps.get(b'phases'): | |
2587 | raise error.Abort(_(b'no common phases exchange method')) |
|
2583 | raise error.Abort(_(b'no common phases exchange method')) | |
2588 | if heads is None: |
|
2584 | if heads is None: | |
2589 | heads = repo.heads() |
|
2585 | heads = repo.heads() | |
2590 |
|
2586 | |||
2591 | headsbyphase = collections.defaultdict(set) |
|
2587 | headsbyphase = collections.defaultdict(set) | |
2592 | if repo.publishing(): |
|
2588 | if repo.publishing(): | |
2593 | headsbyphase[phases.public] = heads |
|
2589 | headsbyphase[phases.public] = heads | |
2594 | else: |
|
2590 | else: | |
2595 | # find the appropriate heads to move |
|
2591 | # find the appropriate heads to move | |
2596 |
|
2592 | |||
2597 | phase = repo._phasecache.phase |
|
2593 | phase = repo._phasecache.phase | |
2598 | node = repo.changelog.node |
|
2594 | node = repo.changelog.node | |
2599 | rev = repo.changelog.rev |
|
2595 | rev = repo.changelog.rev | |
2600 | for h in heads: |
|
2596 | for h in heads: | |
2601 | headsbyphase[phase(repo, rev(h))].add(h) |
|
2597 | headsbyphase[phase(repo, rev(h))].add(h) | |
2602 | seenphases = list(headsbyphase.keys()) |
|
2598 | seenphases = list(headsbyphase.keys()) | |
2603 |
|
2599 | |||
2604 | # We do not handle anything but public and draft phase for now) |
|
2600 | # We do not handle anything but public and draft phase for now) | |
2605 | if seenphases: |
|
2601 | if seenphases: | |
2606 | assert max(seenphases) <= phases.draft |
|
2602 | assert max(seenphases) <= phases.draft | |
2607 |
|
2603 | |||
2608 | # if client is pulling non-public changesets, we need to find |
|
2604 | # if client is pulling non-public changesets, we need to find | |
2609 | # intermediate public heads. |
|
2605 | # intermediate public heads. | |
2610 | draftheads = headsbyphase.get(phases.draft, set()) |
|
2606 | draftheads = headsbyphase.get(phases.draft, set()) | |
2611 | if draftheads: |
|
2607 | if draftheads: | |
2612 | publicheads = headsbyphase.get(phases.public, set()) |
|
2608 | publicheads = headsbyphase.get(phases.public, set()) | |
2613 |
|
2609 | |||
2614 | revset = b'heads(only(%ln, %ln) and public())' |
|
2610 | revset = b'heads(only(%ln, %ln) and public())' | |
2615 | extraheads = repo.revs(revset, draftheads, publicheads) |
|
2611 | extraheads = repo.revs(revset, draftheads, publicheads) | |
2616 | for r in extraheads: |
|
2612 | for r in extraheads: | |
2617 | headsbyphase[phases.public].add(node(r)) |
|
2613 | headsbyphase[phases.public].add(node(r)) | |
2618 |
|
2614 | |||
2619 | # transform data in a format used by the encoding function |
|
2615 | # transform data in a format used by the encoding function | |
2620 | phasemapping = [] |
|
2616 | phasemapping = [] | |
2621 | for phase in phases.allphases: |
|
2617 | for phase in phases.allphases: | |
2622 | phasemapping.append(sorted(headsbyphase[phase])) |
|
2618 | phasemapping.append(sorted(headsbyphase[phase])) | |
2623 |
|
2619 | |||
2624 | # generate the actual part |
|
2620 | # generate the actual part | |
2625 | phasedata = phases.binaryencode(phasemapping) |
|
2621 | phasedata = phases.binaryencode(phasemapping) | |
2626 | bundler.newpart(b'phase-heads', data=phasedata) |
|
2622 | bundler.newpart(b'phase-heads', data=phasedata) | |
2627 |
|
2623 | |||
2628 |
|
2624 | |||
2629 | @getbundle2partsgenerator(b'hgtagsfnodes') |
|
2625 | @getbundle2partsgenerator(b'hgtagsfnodes') | |
2630 | def _getbundletagsfnodes( |
|
2626 | def _getbundletagsfnodes( | |
2631 | bundler, |
|
2627 | bundler, | |
2632 | repo, |
|
2628 | repo, | |
2633 | source, |
|
2629 | source, | |
2634 | bundlecaps=None, |
|
2630 | bundlecaps=None, | |
2635 | b2caps=None, |
|
2631 | b2caps=None, | |
2636 | heads=None, |
|
2632 | heads=None, | |
2637 | common=None, |
|
2633 | common=None, | |
2638 | **kwargs |
|
2634 | **kwargs | |
2639 | ): |
|
2635 | ): | |
2640 | """Transfer the .hgtags filenodes mapping. |
|
2636 | """Transfer the .hgtags filenodes mapping. | |
2641 |
|
2637 | |||
2642 | Only values for heads in this bundle will be transferred. |
|
2638 | Only values for heads in this bundle will be transferred. | |
2643 |
|
2639 | |||
2644 | The part data consists of pairs of 20 byte changeset node and .hgtags |
|
2640 | The part data consists of pairs of 20 byte changeset node and .hgtags | |
2645 | filenodes raw values. |
|
2641 | filenodes raw values. | |
2646 | """ |
|
2642 | """ | |
2647 | # Don't send unless: |
|
2643 | # Don't send unless: | |
2648 | # - changeset are being exchanged, |
|
2644 | # - changeset are being exchanged, | |
2649 | # - the client supports it. |
|
2645 | # - the client supports it. | |
2650 | if not (kwargs.get('cg', True) and b'hgtagsfnodes' in b2caps): |
|
2646 | if not (kwargs.get('cg', True) and b'hgtagsfnodes' in b2caps): | |
2651 | return |
|
2647 | return | |
2652 |
|
2648 | |||
2653 | outgoing = _computeoutgoing(repo, heads, common) |
|
2649 | outgoing = _computeoutgoing(repo, heads, common) | |
2654 | bundle2.addparttagsfnodescache(repo, bundler, outgoing) |
|
2650 | bundle2.addparttagsfnodescache(repo, bundler, outgoing) | |
2655 |
|
2651 | |||
2656 |
|
2652 | |||
2657 | @getbundle2partsgenerator(b'cache:rev-branch-cache') |
|
2653 | @getbundle2partsgenerator(b'cache:rev-branch-cache') | |
2658 | def _getbundlerevbranchcache( |
|
2654 | def _getbundlerevbranchcache( | |
2659 | bundler, |
|
2655 | bundler, | |
2660 | repo, |
|
2656 | repo, | |
2661 | source, |
|
2657 | source, | |
2662 | bundlecaps=None, |
|
2658 | bundlecaps=None, | |
2663 | b2caps=None, |
|
2659 | b2caps=None, | |
2664 | heads=None, |
|
2660 | heads=None, | |
2665 | common=None, |
|
2661 | common=None, | |
2666 | **kwargs |
|
2662 | **kwargs | |
2667 | ): |
|
2663 | ): | |
2668 | """Transfer the rev-branch-cache mapping |
|
2664 | """Transfer the rev-branch-cache mapping | |
2669 |
|
2665 | |||
2670 | The payload is a series of data related to each branch |
|
2666 | The payload is a series of data related to each branch | |
2671 |
|
2667 | |||
2672 | 1) branch name length |
|
2668 | 1) branch name length | |
2673 | 2) number of open heads |
|
2669 | 2) number of open heads | |
2674 | 3) number of closed heads |
|
2670 | 3) number of closed heads | |
2675 | 4) open heads nodes |
|
2671 | 4) open heads nodes | |
2676 | 5) closed heads nodes |
|
2672 | 5) closed heads nodes | |
2677 | """ |
|
2673 | """ | |
2678 | # Don't send unless: |
|
2674 | # Don't send unless: | |
2679 | # - changeset are being exchanged, |
|
2675 | # - changeset are being exchanged, | |
2680 | # - the client supports it. |
|
2676 | # - the client supports it. | |
2681 | # - narrow bundle isn't in play (not currently compatible). |
|
2677 | # - narrow bundle isn't in play (not currently compatible). | |
2682 | if ( |
|
2678 | if ( | |
2683 | not kwargs.get('cg', True) |
|
2679 | not kwargs.get('cg', True) | |
2684 | or b'rev-branch-cache' not in b2caps |
|
2680 | or b'rev-branch-cache' not in b2caps | |
2685 | or kwargs.get('narrow', False) |
|
2681 | or kwargs.get('narrow', False) | |
2686 | or repo.ui.has_section(_NARROWACL_SECTION) |
|
2682 | or repo.ui.has_section(_NARROWACL_SECTION) | |
2687 | ): |
|
2683 | ): | |
2688 | return |
|
2684 | return | |
2689 |
|
2685 | |||
2690 | outgoing = _computeoutgoing(repo, heads, common) |
|
2686 | outgoing = _computeoutgoing(repo, heads, common) | |
2691 | bundle2.addpartrevbranchcache(repo, bundler, outgoing) |
|
2687 | bundle2.addpartrevbranchcache(repo, bundler, outgoing) | |
2692 |
|
2688 | |||
2693 |
|
2689 | |||
2694 | def check_heads(repo, their_heads, context): |
|
2690 | def check_heads(repo, their_heads, context): | |
2695 | """check if the heads of a repo have been modified |
|
2691 | """check if the heads of a repo have been modified | |
2696 |
|
2692 | |||
2697 | Used by peer for unbundling. |
|
2693 | Used by peer for unbundling. | |
2698 | """ |
|
2694 | """ | |
2699 | heads = repo.heads() |
|
2695 | heads = repo.heads() | |
2700 | heads_hash = hashlib.sha1(b''.join(sorted(heads))).digest() |
|
2696 | heads_hash = hashlib.sha1(b''.join(sorted(heads))).digest() | |
2701 | if not ( |
|
2697 | if not ( | |
2702 | their_heads == [b'force'] |
|
2698 | their_heads == [b'force'] | |
2703 | or their_heads == heads |
|
2699 | or their_heads == heads | |
2704 | or their_heads == [b'hashed', heads_hash] |
|
2700 | or their_heads == [b'hashed', heads_hash] | |
2705 | ): |
|
2701 | ): | |
2706 | # someone else committed/pushed/unbundled while we |
|
2702 | # someone else committed/pushed/unbundled while we | |
2707 | # were transferring data |
|
2703 | # were transferring data | |
2708 | raise error.PushRaced( |
|
2704 | raise error.PushRaced( | |
2709 | b'repository changed while %s - please try again' % context |
|
2705 | b'repository changed while %s - please try again' % context | |
2710 | ) |
|
2706 | ) | |
2711 |
|
2707 | |||
2712 |
|
2708 | |||
2713 | def unbundle(repo, cg, heads, source, url): |
|
2709 | def unbundle(repo, cg, heads, source, url): | |
2714 | """Apply a bundle to a repo. |
|
2710 | """Apply a bundle to a repo. | |
2715 |
|
2711 | |||
2716 | this function makes sure the repo is locked during the application and have |
|
2712 | this function makes sure the repo is locked during the application and have | |
2717 | mechanism to check that no push race occurred between the creation of the |
|
2713 | mechanism to check that no push race occurred between the creation of the | |
2718 | bundle and its application. |
|
2714 | bundle and its application. | |
2719 |
|
2715 | |||
2720 | If the push was raced as PushRaced exception is raised.""" |
|
2716 | If the push was raced as PushRaced exception is raised.""" | |
2721 | r = 0 |
|
2717 | r = 0 | |
2722 | # need a transaction when processing a bundle2 stream |
|
2718 | # need a transaction when processing a bundle2 stream | |
2723 | # [wlock, lock, tr] - needs to be an array so nested functions can modify it |
|
2719 | # [wlock, lock, tr] - needs to be an array so nested functions can modify it | |
2724 | lockandtr = [None, None, None] |
|
2720 | lockandtr = [None, None, None] | |
2725 | recordout = None |
|
2721 | recordout = None | |
2726 | # quick fix for output mismatch with bundle2 in 3.4 |
|
2722 | # quick fix for output mismatch with bundle2 in 3.4 | |
2727 | captureoutput = repo.ui.configbool( |
|
2723 | captureoutput = repo.ui.configbool( | |
2728 | b'experimental', b'bundle2-output-capture' |
|
2724 | b'experimental', b'bundle2-output-capture' | |
2729 | ) |
|
2725 | ) | |
2730 | if url.startswith(b'remote:http:') or url.startswith(b'remote:https:'): |
|
2726 | if url.startswith(b'remote:http:') or url.startswith(b'remote:https:'): | |
2731 | captureoutput = True |
|
2727 | captureoutput = True | |
2732 | try: |
|
2728 | try: | |
2733 | # note: outside bundle1, 'heads' is expected to be empty and this |
|
2729 | # note: outside bundle1, 'heads' is expected to be empty and this | |
2734 | # 'check_heads' call wil be a no-op |
|
2730 | # 'check_heads' call wil be a no-op | |
2735 | check_heads(repo, heads, b'uploading changes') |
|
2731 | check_heads(repo, heads, b'uploading changes') | |
2736 | # push can proceed |
|
2732 | # push can proceed | |
2737 | if not isinstance(cg, bundle2.unbundle20): |
|
2733 | if not isinstance(cg, bundle2.unbundle20): | |
2738 | # legacy case: bundle1 (changegroup 01) |
|
2734 | # legacy case: bundle1 (changegroup 01) | |
2739 | txnname = b"\n".join([source, util.hidepassword(url)]) |
|
2735 | txnname = b"\n".join([source, util.hidepassword(url)]) | |
2740 | with repo.lock(), repo.transaction(txnname) as tr: |
|
2736 | with repo.lock(), repo.transaction(txnname) as tr: | |
2741 | op = bundle2.applybundle(repo, cg, tr, source, url) |
|
2737 | op = bundle2.applybundle(repo, cg, tr, source, url) | |
2742 | r = bundle2.combinechangegroupresults(op) |
|
2738 | r = bundle2.combinechangegroupresults(op) | |
2743 | else: |
|
2739 | else: | |
2744 | r = None |
|
2740 | r = None | |
2745 | try: |
|
2741 | try: | |
2746 |
|
2742 | |||
2747 | def gettransaction(): |
|
2743 | def gettransaction(): | |
2748 | if not lockandtr[2]: |
|
2744 | if not lockandtr[2]: | |
2749 | if not bookmod.bookmarksinstore(repo): |
|
2745 | if not bookmod.bookmarksinstore(repo): | |
2750 | lockandtr[0] = repo.wlock() |
|
2746 | lockandtr[0] = repo.wlock() | |
2751 | lockandtr[1] = repo.lock() |
|
2747 | lockandtr[1] = repo.lock() | |
2752 | lockandtr[2] = repo.transaction(source) |
|
2748 | lockandtr[2] = repo.transaction(source) | |
2753 | lockandtr[2].hookargs[b'source'] = source |
|
2749 | lockandtr[2].hookargs[b'source'] = source | |
2754 | lockandtr[2].hookargs[b'url'] = url |
|
2750 | lockandtr[2].hookargs[b'url'] = url | |
2755 | lockandtr[2].hookargs[b'bundle2'] = b'1' |
|
2751 | lockandtr[2].hookargs[b'bundle2'] = b'1' | |
2756 | return lockandtr[2] |
|
2752 | return lockandtr[2] | |
2757 |
|
2753 | |||
2758 | # Do greedy locking by default until we're satisfied with lazy |
|
2754 | # Do greedy locking by default until we're satisfied with lazy | |
2759 | # locking. |
|
2755 | # locking. | |
2760 | if not repo.ui.configbool( |
|
2756 | if not repo.ui.configbool( | |
2761 | b'experimental', b'bundle2lazylocking' |
|
2757 | b'experimental', b'bundle2lazylocking' | |
2762 | ): |
|
2758 | ): | |
2763 | gettransaction() |
|
2759 | gettransaction() | |
2764 |
|
2760 | |||
2765 | op = bundle2.bundleoperation( |
|
2761 | op = bundle2.bundleoperation( | |
2766 | repo, |
|
2762 | repo, | |
2767 | gettransaction, |
|
2763 | gettransaction, | |
2768 | captureoutput=captureoutput, |
|
2764 | captureoutput=captureoutput, | |
2769 | source=b'push', |
|
2765 | source=b'push', | |
2770 | ) |
|
2766 | ) | |
2771 | try: |
|
2767 | try: | |
2772 | op = bundle2.processbundle(repo, cg, op=op) |
|
2768 | op = bundle2.processbundle(repo, cg, op=op) | |
2773 | finally: |
|
2769 | finally: | |
2774 | r = op.reply |
|
2770 | r = op.reply | |
2775 | if captureoutput and r is not None: |
|
2771 | if captureoutput and r is not None: | |
2776 | repo.ui.pushbuffer(error=True, subproc=True) |
|
2772 | repo.ui.pushbuffer(error=True, subproc=True) | |
2777 |
|
2773 | |||
2778 | def recordout(output): |
|
2774 | def recordout(output): | |
2779 | r.newpart(b'output', data=output, mandatory=False) |
|
2775 | r.newpart(b'output', data=output, mandatory=False) | |
2780 |
|
2776 | |||
2781 | if lockandtr[2] is not None: |
|
2777 | if lockandtr[2] is not None: | |
2782 | lockandtr[2].close() |
|
2778 | lockandtr[2].close() | |
2783 | except BaseException as exc: |
|
2779 | except BaseException as exc: | |
2784 | exc.duringunbundle2 = True |
|
2780 | exc.duringunbundle2 = True | |
2785 | if captureoutput and r is not None: |
|
2781 | if captureoutput and r is not None: | |
2786 | parts = exc._bundle2salvagedoutput = r.salvageoutput() |
|
2782 | parts = exc._bundle2salvagedoutput = r.salvageoutput() | |
2787 |
|
2783 | |||
2788 | def recordout(output): |
|
2784 | def recordout(output): | |
2789 | part = bundle2.bundlepart( |
|
2785 | part = bundle2.bundlepart( | |
2790 | b'output', data=output, mandatory=False |
|
2786 | b'output', data=output, mandatory=False | |
2791 | ) |
|
2787 | ) | |
2792 | parts.append(part) |
|
2788 | parts.append(part) | |
2793 |
|
2789 | |||
2794 | raise |
|
2790 | raise | |
2795 | finally: |
|
2791 | finally: | |
2796 | lockmod.release(lockandtr[2], lockandtr[1], lockandtr[0]) |
|
2792 | lockmod.release(lockandtr[2], lockandtr[1], lockandtr[0]) | |
2797 | if recordout is not None: |
|
2793 | if recordout is not None: | |
2798 | recordout(repo.ui.popbuffer()) |
|
2794 | recordout(repo.ui.popbuffer()) | |
2799 | return r |
|
2795 | return r | |
2800 |
|
2796 | |||
2801 |
|
2797 | |||
2802 | def _maybeapplyclonebundle(pullop): |
|
2798 | def _maybeapplyclonebundle(pullop): | |
2803 | """Apply a clone bundle from a remote, if possible.""" |
|
2799 | """Apply a clone bundle from a remote, if possible.""" | |
2804 |
|
2800 | |||
2805 | repo = pullop.repo |
|
2801 | repo = pullop.repo | |
2806 | remote = pullop.remote |
|
2802 | remote = pullop.remote | |
2807 |
|
2803 | |||
2808 | if not repo.ui.configbool(b'ui', b'clonebundles'): |
|
2804 | if not repo.ui.configbool(b'ui', b'clonebundles'): | |
2809 | return |
|
2805 | return | |
2810 |
|
2806 | |||
2811 | # Only run if local repo is empty. |
|
2807 | # Only run if local repo is empty. | |
2812 | if len(repo): |
|
2808 | if len(repo): | |
2813 | return |
|
2809 | return | |
2814 |
|
2810 | |||
2815 | if pullop.heads: |
|
2811 | if pullop.heads: | |
2816 | return |
|
2812 | return | |
2817 |
|
2813 | |||
2818 | if not remote.capable(b'clonebundles'): |
|
2814 | if not remote.capable(b'clonebundles'): | |
2819 | return |
|
2815 | return | |
2820 |
|
2816 | |||
2821 | with remote.commandexecutor() as e: |
|
2817 | with remote.commandexecutor() as e: | |
2822 | res = e.callcommand(b'clonebundles', {}).result() |
|
2818 | res = e.callcommand(b'clonebundles', {}).result() | |
2823 |
|
2819 | |||
2824 | # If we call the wire protocol command, that's good enough to record the |
|
2820 | # If we call the wire protocol command, that's good enough to record the | |
2825 | # attempt. |
|
2821 | # attempt. | |
2826 | pullop.clonebundleattempted = True |
|
2822 | pullop.clonebundleattempted = True | |
2827 |
|
2823 | |||
2828 | entries = parseclonebundlesmanifest(repo, res) |
|
2824 | entries = parseclonebundlesmanifest(repo, res) | |
2829 | if not entries: |
|
2825 | if not entries: | |
2830 | repo.ui.note( |
|
2826 | repo.ui.note( | |
2831 | _( |
|
2827 | _( | |
2832 | b'no clone bundles available on remote; ' |
|
2828 | b'no clone bundles available on remote; ' | |
2833 | b'falling back to regular clone\n' |
|
2829 | b'falling back to regular clone\n' | |
2834 | ) |
|
2830 | ) | |
2835 | ) |
|
2831 | ) | |
2836 | return |
|
2832 | return | |
2837 |
|
2833 | |||
2838 | entries = filterclonebundleentries( |
|
2834 | entries = filterclonebundleentries( | |
2839 | repo, entries, streamclonerequested=pullop.streamclonerequested |
|
2835 | repo, entries, streamclonerequested=pullop.streamclonerequested | |
2840 | ) |
|
2836 | ) | |
2841 |
|
2837 | |||
2842 | if not entries: |
|
2838 | if not entries: | |
2843 | # There is a thundering herd concern here. However, if a server |
|
2839 | # There is a thundering herd concern here. However, if a server | |
2844 | # operator doesn't advertise bundles appropriate for its clients, |
|
2840 | # operator doesn't advertise bundles appropriate for its clients, | |
2845 | # they deserve what's coming. Furthermore, from a client's |
|
2841 | # they deserve what's coming. Furthermore, from a client's | |
2846 | # perspective, no automatic fallback would mean not being able to |
|
2842 | # perspective, no automatic fallback would mean not being able to | |
2847 | # clone! |
|
2843 | # clone! | |
2848 | repo.ui.warn( |
|
2844 | repo.ui.warn( | |
2849 | _( |
|
2845 | _( | |
2850 | b'no compatible clone bundles available on server; ' |
|
2846 | b'no compatible clone bundles available on server; ' | |
2851 | b'falling back to regular clone\n' |
|
2847 | b'falling back to regular clone\n' | |
2852 | ) |
|
2848 | ) | |
2853 | ) |
|
2849 | ) | |
2854 | repo.ui.warn( |
|
2850 | repo.ui.warn( | |
2855 | _(b'(you may want to report this to the server operator)\n') |
|
2851 | _(b'(you may want to report this to the server operator)\n') | |
2856 | ) |
|
2852 | ) | |
2857 | return |
|
2853 | return | |
2858 |
|
2854 | |||
2859 | entries = sortclonebundleentries(repo.ui, entries) |
|
2855 | entries = sortclonebundleentries(repo.ui, entries) | |
2860 |
|
2856 | |||
2861 | url = entries[0][b'URL'] |
|
2857 | url = entries[0][b'URL'] | |
2862 | repo.ui.status(_(b'applying clone bundle from %s\n') % url) |
|
2858 | repo.ui.status(_(b'applying clone bundle from %s\n') % url) | |
2863 | if trypullbundlefromurl(repo.ui, repo, url): |
|
2859 | if trypullbundlefromurl(repo.ui, repo, url): | |
2864 | repo.ui.status(_(b'finished applying clone bundle\n')) |
|
2860 | repo.ui.status(_(b'finished applying clone bundle\n')) | |
2865 | # Bundle failed. |
|
2861 | # Bundle failed. | |
2866 | # |
|
2862 | # | |
2867 | # We abort by default to avoid the thundering herd of |
|
2863 | # We abort by default to avoid the thundering herd of | |
2868 | # clients flooding a server that was expecting expensive |
|
2864 | # clients flooding a server that was expecting expensive | |
2869 | # clone load to be offloaded. |
|
2865 | # clone load to be offloaded. | |
2870 | elif repo.ui.configbool(b'ui', b'clonebundlefallback'): |
|
2866 | elif repo.ui.configbool(b'ui', b'clonebundlefallback'): | |
2871 | repo.ui.warn(_(b'falling back to normal clone\n')) |
|
2867 | repo.ui.warn(_(b'falling back to normal clone\n')) | |
2872 | else: |
|
2868 | else: | |
2873 | raise error.Abort( |
|
2869 | raise error.Abort( | |
2874 | _(b'error applying bundle'), |
|
2870 | _(b'error applying bundle'), | |
2875 | hint=_( |
|
2871 | hint=_( | |
2876 | b'if this error persists, consider contacting ' |
|
2872 | b'if this error persists, consider contacting ' | |
2877 | b'the server operator or disable clone ' |
|
2873 | b'the server operator or disable clone ' | |
2878 | b'bundles via ' |
|
2874 | b'bundles via ' | |
2879 | b'"--config ui.clonebundles=false"' |
|
2875 | b'"--config ui.clonebundles=false"' | |
2880 | ), |
|
2876 | ), | |
2881 | ) |
|
2877 | ) | |
2882 |
|
2878 | |||
2883 |
|
2879 | |||
2884 | def parseclonebundlesmanifest(repo, s): |
|
2880 | def parseclonebundlesmanifest(repo, s): | |
2885 | """Parses the raw text of a clone bundles manifest. |
|
2881 | """Parses the raw text of a clone bundles manifest. | |
2886 |
|
2882 | |||
2887 | Returns a list of dicts. The dicts have a ``URL`` key corresponding |
|
2883 | Returns a list of dicts. The dicts have a ``URL`` key corresponding | |
2888 | to the URL and other keys are the attributes for the entry. |
|
2884 | to the URL and other keys are the attributes for the entry. | |
2889 | """ |
|
2885 | """ | |
2890 | m = [] |
|
2886 | m = [] | |
2891 | for line in s.splitlines(): |
|
2887 | for line in s.splitlines(): | |
2892 | fields = line.split() |
|
2888 | fields = line.split() | |
2893 | if not fields: |
|
2889 | if not fields: | |
2894 | continue |
|
2890 | continue | |
2895 | attrs = {b'URL': fields[0]} |
|
2891 | attrs = {b'URL': fields[0]} | |
2896 | for rawattr in fields[1:]: |
|
2892 | for rawattr in fields[1:]: | |
2897 | key, value = rawattr.split(b'=', 1) |
|
2893 | key, value = rawattr.split(b'=', 1) | |
2898 | key = urlreq.unquote(key) |
|
2894 | key = urlreq.unquote(key) | |
2899 | value = urlreq.unquote(value) |
|
2895 | value = urlreq.unquote(value) | |
2900 | attrs[key] = value |
|
2896 | attrs[key] = value | |
2901 |
|
2897 | |||
2902 | # Parse BUNDLESPEC into components. This makes client-side |
|
2898 | # Parse BUNDLESPEC into components. This makes client-side | |
2903 | # preferences easier to specify since you can prefer a single |
|
2899 | # preferences easier to specify since you can prefer a single | |
2904 | # component of the BUNDLESPEC. |
|
2900 | # component of the BUNDLESPEC. | |
2905 | if key == b'BUNDLESPEC': |
|
2901 | if key == b'BUNDLESPEC': | |
2906 | try: |
|
2902 | try: | |
2907 | bundlespec = parsebundlespec(repo, value) |
|
2903 | bundlespec = parsebundlespec(repo, value) | |
2908 | attrs[b'COMPRESSION'] = bundlespec.compression |
|
2904 | attrs[b'COMPRESSION'] = bundlespec.compression | |
2909 | attrs[b'VERSION'] = bundlespec.version |
|
2905 | attrs[b'VERSION'] = bundlespec.version | |
2910 | except error.InvalidBundleSpecification: |
|
2906 | except error.InvalidBundleSpecification: | |
2911 | pass |
|
2907 | pass | |
2912 | except error.UnsupportedBundleSpecification: |
|
2908 | except error.UnsupportedBundleSpecification: | |
2913 | pass |
|
2909 | pass | |
2914 |
|
2910 | |||
2915 | m.append(attrs) |
|
2911 | m.append(attrs) | |
2916 |
|
2912 | |||
2917 | return m |
|
2913 | return m | |
2918 |
|
2914 | |||
2919 |
|
2915 | |||
2920 | def isstreamclonespec(bundlespec): |
|
2916 | def isstreamclonespec(bundlespec): | |
2921 | # Stream clone v1 |
|
2917 | # Stream clone v1 | |
2922 | if bundlespec.wirecompression == b'UN' and bundlespec.wireversion == b's1': |
|
2918 | if bundlespec.wirecompression == b'UN' and bundlespec.wireversion == b's1': | |
2923 | return True |
|
2919 | return True | |
2924 |
|
2920 | |||
2925 | # Stream clone v2 |
|
2921 | # Stream clone v2 | |
2926 | if ( |
|
2922 | if ( | |
2927 | bundlespec.wirecompression == b'UN' |
|
2923 | bundlespec.wirecompression == b'UN' | |
2928 | and bundlespec.wireversion == b'02' |
|
2924 | and bundlespec.wireversion == b'02' | |
2929 | and bundlespec.contentopts.get(b'streamv2') |
|
2925 | and bundlespec.contentopts.get(b'streamv2') | |
2930 | ): |
|
2926 | ): | |
2931 | return True |
|
2927 | return True | |
2932 |
|
2928 | |||
2933 | return False |
|
2929 | return False | |
2934 |
|
2930 | |||
2935 |
|
2931 | |||
2936 | def filterclonebundleentries(repo, entries, streamclonerequested=False): |
|
2932 | def filterclonebundleentries(repo, entries, streamclonerequested=False): | |
2937 | """Remove incompatible clone bundle manifest entries. |
|
2933 | """Remove incompatible clone bundle manifest entries. | |
2938 |
|
2934 | |||
2939 | Accepts a list of entries parsed with ``parseclonebundlesmanifest`` |
|
2935 | Accepts a list of entries parsed with ``parseclonebundlesmanifest`` | |
2940 | and returns a new list consisting of only the entries that this client |
|
2936 | and returns a new list consisting of only the entries that this client | |
2941 | should be able to apply. |
|
2937 | should be able to apply. | |
2942 |
|
2938 | |||
2943 | There is no guarantee we'll be able to apply all returned entries because |
|
2939 | There is no guarantee we'll be able to apply all returned entries because | |
2944 | the metadata we use to filter on may be missing or wrong. |
|
2940 | the metadata we use to filter on may be missing or wrong. | |
2945 | """ |
|
2941 | """ | |
2946 | newentries = [] |
|
2942 | newentries = [] | |
2947 | for entry in entries: |
|
2943 | for entry in entries: | |
2948 | spec = entry.get(b'BUNDLESPEC') |
|
2944 | spec = entry.get(b'BUNDLESPEC') | |
2949 | if spec: |
|
2945 | if spec: | |
2950 | try: |
|
2946 | try: | |
2951 | bundlespec = parsebundlespec(repo, spec, strict=True) |
|
2947 | bundlespec = parsebundlespec(repo, spec, strict=True) | |
2952 |
|
2948 | |||
2953 | # If a stream clone was requested, filter out non-streamclone |
|
2949 | # If a stream clone was requested, filter out non-streamclone | |
2954 | # entries. |
|
2950 | # entries. | |
2955 | if streamclonerequested and not isstreamclonespec(bundlespec): |
|
2951 | if streamclonerequested and not isstreamclonespec(bundlespec): | |
2956 | repo.ui.debug( |
|
2952 | repo.ui.debug( | |
2957 | b'filtering %s because not a stream clone\n' |
|
2953 | b'filtering %s because not a stream clone\n' | |
2958 | % entry[b'URL'] |
|
2954 | % entry[b'URL'] | |
2959 | ) |
|
2955 | ) | |
2960 | continue |
|
2956 | continue | |
2961 |
|
2957 | |||
2962 | except error.InvalidBundleSpecification as e: |
|
2958 | except error.InvalidBundleSpecification as e: | |
2963 | repo.ui.debug(stringutil.forcebytestr(e) + b'\n') |
|
2959 | repo.ui.debug(stringutil.forcebytestr(e) + b'\n') | |
2964 | continue |
|
2960 | continue | |
2965 | except error.UnsupportedBundleSpecification as e: |
|
2961 | except error.UnsupportedBundleSpecification as e: | |
2966 | repo.ui.debug( |
|
2962 | repo.ui.debug( | |
2967 | b'filtering %s because unsupported bundle ' |
|
2963 | b'filtering %s because unsupported bundle ' | |
2968 | b'spec: %s\n' % (entry[b'URL'], stringutil.forcebytestr(e)) |
|
2964 | b'spec: %s\n' % (entry[b'URL'], stringutil.forcebytestr(e)) | |
2969 | ) |
|
2965 | ) | |
2970 | continue |
|
2966 | continue | |
2971 | # If we don't have a spec and requested a stream clone, we don't know |
|
2967 | # If we don't have a spec and requested a stream clone, we don't know | |
2972 | # what the entry is so don't attempt to apply it. |
|
2968 | # what the entry is so don't attempt to apply it. | |
2973 | elif streamclonerequested: |
|
2969 | elif streamclonerequested: | |
2974 | repo.ui.debug( |
|
2970 | repo.ui.debug( | |
2975 | b'filtering %s because cannot determine if a stream ' |
|
2971 | b'filtering %s because cannot determine if a stream ' | |
2976 | b'clone bundle\n' % entry[b'URL'] |
|
2972 | b'clone bundle\n' % entry[b'URL'] | |
2977 | ) |
|
2973 | ) | |
2978 | continue |
|
2974 | continue | |
2979 |
|
2975 | |||
2980 | if b'REQUIRESNI' in entry and not sslutil.hassni: |
|
2976 | if b'REQUIRESNI' in entry and not sslutil.hassni: | |
2981 | repo.ui.debug( |
|
2977 | repo.ui.debug( | |
2982 | b'filtering %s because SNI not supported\n' % entry[b'URL'] |
|
2978 | b'filtering %s because SNI not supported\n' % entry[b'URL'] | |
2983 | ) |
|
2979 | ) | |
2984 | continue |
|
2980 | continue | |
2985 |
|
2981 | |||
2986 | newentries.append(entry) |
|
2982 | newentries.append(entry) | |
2987 |
|
2983 | |||
2988 | return newentries |
|
2984 | return newentries | |
2989 |
|
2985 | |||
2990 |
|
2986 | |||
2991 | class clonebundleentry(object): |
|
2987 | class clonebundleentry(object): | |
2992 | """Represents an item in a clone bundles manifest. |
|
2988 | """Represents an item in a clone bundles manifest. | |
2993 |
|
2989 | |||
2994 | This rich class is needed to support sorting since sorted() in Python 3 |
|
2990 | This rich class is needed to support sorting since sorted() in Python 3 | |
2995 | doesn't support ``cmp`` and our comparison is complex enough that ``key=`` |
|
2991 | doesn't support ``cmp`` and our comparison is complex enough that ``key=`` | |
2996 | won't work. |
|
2992 | won't work. | |
2997 | """ |
|
2993 | """ | |
2998 |
|
2994 | |||
2999 | def __init__(self, value, prefers): |
|
2995 | def __init__(self, value, prefers): | |
3000 | self.value = value |
|
2996 | self.value = value | |
3001 | self.prefers = prefers |
|
2997 | self.prefers = prefers | |
3002 |
|
2998 | |||
3003 | def _cmp(self, other): |
|
2999 | def _cmp(self, other): | |
3004 | for prefkey, prefvalue in self.prefers: |
|
3000 | for prefkey, prefvalue in self.prefers: | |
3005 | avalue = self.value.get(prefkey) |
|
3001 | avalue = self.value.get(prefkey) | |
3006 | bvalue = other.value.get(prefkey) |
|
3002 | bvalue = other.value.get(prefkey) | |
3007 |
|
3003 | |||
3008 | # Special case for b missing attribute and a matches exactly. |
|
3004 | # Special case for b missing attribute and a matches exactly. | |
3009 | if avalue is not None and bvalue is None and avalue == prefvalue: |
|
3005 | if avalue is not None and bvalue is None and avalue == prefvalue: | |
3010 | return -1 |
|
3006 | return -1 | |
3011 |
|
3007 | |||
3012 | # Special case for a missing attribute and b matches exactly. |
|
3008 | # Special case for a missing attribute and b matches exactly. | |
3013 | if bvalue is not None and avalue is None and bvalue == prefvalue: |
|
3009 | if bvalue is not None and avalue is None and bvalue == prefvalue: | |
3014 | return 1 |
|
3010 | return 1 | |
3015 |
|
3011 | |||
3016 | # We can't compare unless attribute present on both. |
|
3012 | # We can't compare unless attribute present on both. | |
3017 | if avalue is None or bvalue is None: |
|
3013 | if avalue is None or bvalue is None: | |
3018 | continue |
|
3014 | continue | |
3019 |
|
3015 | |||
3020 | # Same values should fall back to next attribute. |
|
3016 | # Same values should fall back to next attribute. | |
3021 | if avalue == bvalue: |
|
3017 | if avalue == bvalue: | |
3022 | continue |
|
3018 | continue | |
3023 |
|
3019 | |||
3024 | # Exact matches come first. |
|
3020 | # Exact matches come first. | |
3025 | if avalue == prefvalue: |
|
3021 | if avalue == prefvalue: | |
3026 | return -1 |
|
3022 | return -1 | |
3027 | if bvalue == prefvalue: |
|
3023 | if bvalue == prefvalue: | |
3028 | return 1 |
|
3024 | return 1 | |
3029 |
|
3025 | |||
3030 | # Fall back to next attribute. |
|
3026 | # Fall back to next attribute. | |
3031 | continue |
|
3027 | continue | |
3032 |
|
3028 | |||
3033 | # If we got here we couldn't sort by attributes and prefers. Fall |
|
3029 | # If we got here we couldn't sort by attributes and prefers. Fall | |
3034 | # back to index order. |
|
3030 | # back to index order. | |
3035 | return 0 |
|
3031 | return 0 | |
3036 |
|
3032 | |||
3037 | def __lt__(self, other): |
|
3033 | def __lt__(self, other): | |
3038 | return self._cmp(other) < 0 |
|
3034 | return self._cmp(other) < 0 | |
3039 |
|
3035 | |||
3040 | def __gt__(self, other): |
|
3036 | def __gt__(self, other): | |
3041 | return self._cmp(other) > 0 |
|
3037 | return self._cmp(other) > 0 | |
3042 |
|
3038 | |||
3043 | def __eq__(self, other): |
|
3039 | def __eq__(self, other): | |
3044 | return self._cmp(other) == 0 |
|
3040 | return self._cmp(other) == 0 | |
3045 |
|
3041 | |||
3046 | def __le__(self, other): |
|
3042 | def __le__(self, other): | |
3047 | return self._cmp(other) <= 0 |
|
3043 | return self._cmp(other) <= 0 | |
3048 |
|
3044 | |||
3049 | def __ge__(self, other): |
|
3045 | def __ge__(self, other): | |
3050 | return self._cmp(other) >= 0 |
|
3046 | return self._cmp(other) >= 0 | |
3051 |
|
3047 | |||
3052 | def __ne__(self, other): |
|
3048 | def __ne__(self, other): | |
3053 | return self._cmp(other) != 0 |
|
3049 | return self._cmp(other) != 0 | |
3054 |
|
3050 | |||
3055 |
|
3051 | |||
3056 | def sortclonebundleentries(ui, entries): |
|
3052 | def sortclonebundleentries(ui, entries): | |
3057 | prefers = ui.configlist(b'ui', b'clonebundleprefers') |
|
3053 | prefers = ui.configlist(b'ui', b'clonebundleprefers') | |
3058 | if not prefers: |
|
3054 | if not prefers: | |
3059 | return list(entries) |
|
3055 | return list(entries) | |
3060 |
|
3056 | |||
3061 | prefers = [p.split(b'=', 1) for p in prefers] |
|
3057 | prefers = [p.split(b'=', 1) for p in prefers] | |
3062 |
|
3058 | |||
3063 | items = sorted(clonebundleentry(v, prefers) for v in entries) |
|
3059 | items = sorted(clonebundleentry(v, prefers) for v in entries) | |
3064 | return [i.value for i in items] |
|
3060 | return [i.value for i in items] | |
3065 |
|
3061 | |||
3066 |
|
3062 | |||
3067 | def trypullbundlefromurl(ui, repo, url): |
|
3063 | def trypullbundlefromurl(ui, repo, url): | |
3068 | """Attempt to apply a bundle from a URL.""" |
|
3064 | """Attempt to apply a bundle from a URL.""" | |
3069 | with repo.lock(), repo.transaction(b'bundleurl') as tr: |
|
3065 | with repo.lock(), repo.transaction(b'bundleurl') as tr: | |
3070 | try: |
|
3066 | try: | |
3071 | fh = urlmod.open(ui, url) |
|
3067 | fh = urlmod.open(ui, url) | |
3072 | cg = readbundle(ui, fh, b'stream') |
|
3068 | cg = readbundle(ui, fh, b'stream') | |
3073 |
|
3069 | |||
3074 | if isinstance(cg, streamclone.streamcloneapplier): |
|
3070 | if isinstance(cg, streamclone.streamcloneapplier): | |
3075 | cg.apply(repo) |
|
3071 | cg.apply(repo) | |
3076 | else: |
|
3072 | else: | |
3077 | bundle2.applybundle(repo, cg, tr, b'clonebundles', url) |
|
3073 | bundle2.applybundle(repo, cg, tr, b'clonebundles', url) | |
3078 | return True |
|
3074 | return True | |
3079 | except urlerr.httperror as e: |
|
3075 | except urlerr.httperror as e: | |
3080 | ui.warn( |
|
3076 | ui.warn( | |
3081 | _(b'HTTP error fetching bundle: %s\n') |
|
3077 | _(b'HTTP error fetching bundle: %s\n') | |
3082 | % stringutil.forcebytestr(e) |
|
3078 | % stringutil.forcebytestr(e) | |
3083 | ) |
|
3079 | ) | |
3084 | except urlerr.urlerror as e: |
|
3080 | except urlerr.urlerror as e: | |
3085 | ui.warn( |
|
3081 | ui.warn( | |
3086 | _(b'error fetching bundle: %s\n') |
|
3082 | _(b'error fetching bundle: %s\n') | |
3087 | % stringutil.forcebytestr(e.reason) |
|
3083 | % stringutil.forcebytestr(e.reason) | |
3088 | ) |
|
3084 | ) | |
3089 |
|
3085 | |||
3090 | return False |
|
3086 | return False |
@@ -1,3722 +1,3722 b'' | |||||
1 | # localrepo.py - read/write repository class for mercurial |
|
1 | # localrepo.py - read/write repository class for mercurial | |
2 | # |
|
2 | # | |
3 | # Copyright 2005-2007 Matt Mackall <mpm@selenic.com> |
|
3 | # Copyright 2005-2007 Matt Mackall <mpm@selenic.com> | |
4 | # |
|
4 | # | |
5 | # This software may be used and distributed according to the terms of the |
|
5 | # This software may be used and distributed according to the terms of the | |
6 | # GNU General Public License version 2 or any later version. |
|
6 | # GNU General Public License version 2 or any later version. | |
7 |
|
7 | |||
8 | from __future__ import absolute_import |
|
8 | from __future__ import absolute_import | |
9 |
|
9 | |||
10 | import errno |
|
10 | import errno | |
11 | import hashlib |
|
11 | import hashlib | |
12 | import os |
|
12 | import os | |
13 | import random |
|
13 | import random | |
14 | import sys |
|
14 | import sys | |
15 | import time |
|
15 | import time | |
16 | import weakref |
|
16 | import weakref | |
17 |
|
17 | |||
18 | from .i18n import _ |
|
18 | from .i18n import _ | |
19 | from .node import ( |
|
19 | from .node import ( | |
20 | bin, |
|
20 | bin, | |
21 | hex, |
|
21 | hex, | |
22 | nullid, |
|
22 | nullid, | |
23 | nullrev, |
|
23 | nullrev, | |
24 | short, |
|
24 | short, | |
25 | ) |
|
25 | ) | |
26 | from .pycompat import ( |
|
26 | from .pycompat import ( | |
27 | delattr, |
|
27 | delattr, | |
28 | getattr, |
|
28 | getattr, | |
29 | ) |
|
29 | ) | |
30 | from . import ( |
|
30 | from . import ( | |
31 | bookmarks, |
|
31 | bookmarks, | |
32 | branchmap, |
|
32 | branchmap, | |
33 | bundle2, |
|
33 | bundle2, | |
34 | changegroup, |
|
34 | changegroup, | |
35 | color, |
|
35 | color, | |
36 | context, |
|
36 | context, | |
37 | dirstate, |
|
37 | dirstate, | |
38 | dirstateguard, |
|
38 | dirstateguard, | |
39 | discovery, |
|
39 | discovery, | |
40 | encoding, |
|
40 | encoding, | |
41 | error, |
|
41 | error, | |
42 | exchange, |
|
42 | exchange, | |
43 | extensions, |
|
43 | extensions, | |
44 | filelog, |
|
44 | filelog, | |
45 | hook, |
|
45 | hook, | |
46 | lock as lockmod, |
|
46 | lock as lockmod, | |
47 | match as matchmod, |
|
47 | match as matchmod, | |
48 | merge as mergemod, |
|
48 | merge as mergemod, | |
49 | mergeutil, |
|
49 | mergeutil, | |
50 | namespaces, |
|
50 | namespaces, | |
51 | narrowspec, |
|
51 | narrowspec, | |
52 | obsolete, |
|
52 | obsolete, | |
53 | pathutil, |
|
53 | pathutil, | |
54 | phases, |
|
54 | phases, | |
55 | pushkey, |
|
55 | pushkey, | |
56 | pycompat, |
|
56 | pycompat, | |
57 | repoview, |
|
57 | repoview, | |
58 | revset, |
|
58 | revset, | |
59 | revsetlang, |
|
59 | revsetlang, | |
60 | scmutil, |
|
60 | scmutil, | |
61 | sparse, |
|
61 | sparse, | |
62 | store as storemod, |
|
62 | store as storemod, | |
63 | subrepoutil, |
|
63 | subrepoutil, | |
64 | tags as tagsmod, |
|
64 | tags as tagsmod, | |
65 | transaction, |
|
65 | transaction, | |
66 | txnutil, |
|
66 | txnutil, | |
67 | util, |
|
67 | util, | |
68 | vfs as vfsmod, |
|
68 | vfs as vfsmod, | |
69 | ) |
|
69 | ) | |
70 |
|
70 | |||
71 | from .interfaces import ( |
|
71 | from .interfaces import ( | |
72 | repository, |
|
72 | repository, | |
73 | util as interfaceutil, |
|
73 | util as interfaceutil, | |
74 | ) |
|
74 | ) | |
75 |
|
75 | |||
76 | from .utils import ( |
|
76 | from .utils import ( | |
77 | procutil, |
|
77 | procutil, | |
78 | stringutil, |
|
78 | stringutil, | |
79 | ) |
|
79 | ) | |
80 |
|
80 | |||
81 | from .revlogutils import constants as revlogconst |
|
81 | from .revlogutils import constants as revlogconst | |
82 |
|
82 | |||
83 | release = lockmod.release |
|
83 | release = lockmod.release | |
84 | urlerr = util.urlerr |
|
84 | urlerr = util.urlerr | |
85 | urlreq = util.urlreq |
|
85 | urlreq = util.urlreq | |
86 |
|
86 | |||
87 | # set of (path, vfs-location) tuples. vfs-location is: |
|
87 | # set of (path, vfs-location) tuples. vfs-location is: | |
88 | # - 'plain for vfs relative paths |
|
88 | # - 'plain for vfs relative paths | |
89 | # - '' for svfs relative paths |
|
89 | # - '' for svfs relative paths | |
90 | _cachedfiles = set() |
|
90 | _cachedfiles = set() | |
91 |
|
91 | |||
92 |
|
92 | |||
93 | class _basefilecache(scmutil.filecache): |
|
93 | class _basefilecache(scmutil.filecache): | |
94 | """All filecache usage on repo are done for logic that should be unfiltered |
|
94 | """All filecache usage on repo are done for logic that should be unfiltered | |
95 | """ |
|
95 | """ | |
96 |
|
96 | |||
97 | def __get__(self, repo, type=None): |
|
97 | def __get__(self, repo, type=None): | |
98 | if repo is None: |
|
98 | if repo is None: | |
99 | return self |
|
99 | return self | |
100 | # proxy to unfiltered __dict__ since filtered repo has no entry |
|
100 | # proxy to unfiltered __dict__ since filtered repo has no entry | |
101 | unfi = repo.unfiltered() |
|
101 | unfi = repo.unfiltered() | |
102 | try: |
|
102 | try: | |
103 | return unfi.__dict__[self.sname] |
|
103 | return unfi.__dict__[self.sname] | |
104 | except KeyError: |
|
104 | except KeyError: | |
105 | pass |
|
105 | pass | |
106 | return super(_basefilecache, self).__get__(unfi, type) |
|
106 | return super(_basefilecache, self).__get__(unfi, type) | |
107 |
|
107 | |||
108 | def set(self, repo, value): |
|
108 | def set(self, repo, value): | |
109 | return super(_basefilecache, self).set(repo.unfiltered(), value) |
|
109 | return super(_basefilecache, self).set(repo.unfiltered(), value) | |
110 |
|
110 | |||
111 |
|
111 | |||
112 | class repofilecache(_basefilecache): |
|
112 | class repofilecache(_basefilecache): | |
113 | """filecache for files in .hg but outside of .hg/store""" |
|
113 | """filecache for files in .hg but outside of .hg/store""" | |
114 |
|
114 | |||
115 | def __init__(self, *paths): |
|
115 | def __init__(self, *paths): | |
116 | super(repofilecache, self).__init__(*paths) |
|
116 | super(repofilecache, self).__init__(*paths) | |
117 | for path in paths: |
|
117 | for path in paths: | |
118 | _cachedfiles.add((path, b'plain')) |
|
118 | _cachedfiles.add((path, b'plain')) | |
119 |
|
119 | |||
120 | def join(self, obj, fname): |
|
120 | def join(self, obj, fname): | |
121 | return obj.vfs.join(fname) |
|
121 | return obj.vfs.join(fname) | |
122 |
|
122 | |||
123 |
|
123 | |||
124 | class storecache(_basefilecache): |
|
124 | class storecache(_basefilecache): | |
125 | """filecache for files in the store""" |
|
125 | """filecache for files in the store""" | |
126 |
|
126 | |||
127 | def __init__(self, *paths): |
|
127 | def __init__(self, *paths): | |
128 | super(storecache, self).__init__(*paths) |
|
128 | super(storecache, self).__init__(*paths) | |
129 | for path in paths: |
|
129 | for path in paths: | |
130 | _cachedfiles.add((path, b'')) |
|
130 | _cachedfiles.add((path, b'')) | |
131 |
|
131 | |||
132 | def join(self, obj, fname): |
|
132 | def join(self, obj, fname): | |
133 | return obj.sjoin(fname) |
|
133 | return obj.sjoin(fname) | |
134 |
|
134 | |||
135 |
|
135 | |||
136 | class mixedrepostorecache(_basefilecache): |
|
136 | class mixedrepostorecache(_basefilecache): | |
137 | """filecache for a mix files in .hg/store and outside""" |
|
137 | """filecache for a mix files in .hg/store and outside""" | |
138 |
|
138 | |||
139 | def __init__(self, *pathsandlocations): |
|
139 | def __init__(self, *pathsandlocations): | |
140 | # scmutil.filecache only uses the path for passing back into our |
|
140 | # scmutil.filecache only uses the path for passing back into our | |
141 | # join(), so we can safely pass a list of paths and locations |
|
141 | # join(), so we can safely pass a list of paths and locations | |
142 | super(mixedrepostorecache, self).__init__(*pathsandlocations) |
|
142 | super(mixedrepostorecache, self).__init__(*pathsandlocations) | |
143 | _cachedfiles.update(pathsandlocations) |
|
143 | _cachedfiles.update(pathsandlocations) | |
144 |
|
144 | |||
145 | def join(self, obj, fnameandlocation): |
|
145 | def join(self, obj, fnameandlocation): | |
146 | fname, location = fnameandlocation |
|
146 | fname, location = fnameandlocation | |
147 | if location == b'plain': |
|
147 | if location == b'plain': | |
148 | return obj.vfs.join(fname) |
|
148 | return obj.vfs.join(fname) | |
149 | else: |
|
149 | else: | |
150 | if location != b'': |
|
150 | if location != b'': | |
151 | raise error.ProgrammingError( |
|
151 | raise error.ProgrammingError( | |
152 | b'unexpected location: %s' % location |
|
152 | b'unexpected location: %s' % location | |
153 | ) |
|
153 | ) | |
154 | return obj.sjoin(fname) |
|
154 | return obj.sjoin(fname) | |
155 |
|
155 | |||
156 |
|
156 | |||
157 | def isfilecached(repo, name): |
|
157 | def isfilecached(repo, name): | |
158 | """check if a repo has already cached "name" filecache-ed property |
|
158 | """check if a repo has already cached "name" filecache-ed property | |
159 |
|
159 | |||
160 | This returns (cachedobj-or-None, iscached) tuple. |
|
160 | This returns (cachedobj-or-None, iscached) tuple. | |
161 | """ |
|
161 | """ | |
162 | cacheentry = repo.unfiltered()._filecache.get(name, None) |
|
162 | cacheentry = repo.unfiltered()._filecache.get(name, None) | |
163 | if not cacheentry: |
|
163 | if not cacheentry: | |
164 | return None, False |
|
164 | return None, False | |
165 | return cacheentry.obj, True |
|
165 | return cacheentry.obj, True | |
166 |
|
166 | |||
167 |
|
167 | |||
168 | class unfilteredpropertycache(util.propertycache): |
|
168 | class unfilteredpropertycache(util.propertycache): | |
169 | """propertycache that apply to unfiltered repo only""" |
|
169 | """propertycache that apply to unfiltered repo only""" | |
170 |
|
170 | |||
171 | def __get__(self, repo, type=None): |
|
171 | def __get__(self, repo, type=None): | |
172 | unfi = repo.unfiltered() |
|
172 | unfi = repo.unfiltered() | |
173 | if unfi is repo: |
|
173 | if unfi is repo: | |
174 | return super(unfilteredpropertycache, self).__get__(unfi) |
|
174 | return super(unfilteredpropertycache, self).__get__(unfi) | |
175 | return getattr(unfi, self.name) |
|
175 | return getattr(unfi, self.name) | |
176 |
|
176 | |||
177 |
|
177 | |||
178 | class filteredpropertycache(util.propertycache): |
|
178 | class filteredpropertycache(util.propertycache): | |
179 | """propertycache that must take filtering in account""" |
|
179 | """propertycache that must take filtering in account""" | |
180 |
|
180 | |||
181 | def cachevalue(self, obj, value): |
|
181 | def cachevalue(self, obj, value): | |
182 | object.__setattr__(obj, self.name, value) |
|
182 | object.__setattr__(obj, self.name, value) | |
183 |
|
183 | |||
184 |
|
184 | |||
185 | def hasunfilteredcache(repo, name): |
|
185 | def hasunfilteredcache(repo, name): | |
186 | """check if a repo has an unfilteredpropertycache value for <name>""" |
|
186 | """check if a repo has an unfilteredpropertycache value for <name>""" | |
187 | return name in vars(repo.unfiltered()) |
|
187 | return name in vars(repo.unfiltered()) | |
188 |
|
188 | |||
189 |
|
189 | |||
190 | def unfilteredmethod(orig): |
|
190 | def unfilteredmethod(orig): | |
191 | """decorate method that always need to be run on unfiltered version""" |
|
191 | """decorate method that always need to be run on unfiltered version""" | |
192 |
|
192 | |||
193 | def wrapper(repo, *args, **kwargs): |
|
193 | def wrapper(repo, *args, **kwargs): | |
194 | return orig(repo.unfiltered(), *args, **kwargs) |
|
194 | return orig(repo.unfiltered(), *args, **kwargs) | |
195 |
|
195 | |||
196 | return wrapper |
|
196 | return wrapper | |
197 |
|
197 | |||
198 |
|
198 | |||
199 | moderncaps = { |
|
199 | moderncaps = { | |
200 | b'lookup', |
|
200 | b'lookup', | |
201 | b'branchmap', |
|
201 | b'branchmap', | |
202 | b'pushkey', |
|
202 | b'pushkey', | |
203 | b'known', |
|
203 | b'known', | |
204 | b'getbundle', |
|
204 | b'getbundle', | |
205 | b'unbundle', |
|
205 | b'unbundle', | |
206 | } |
|
206 | } | |
207 | legacycaps = moderncaps.union({b'changegroupsubset'}) |
|
207 | legacycaps = moderncaps.union({b'changegroupsubset'}) | |
208 |
|
208 | |||
209 |
|
209 | |||
210 | @interfaceutil.implementer(repository.ipeercommandexecutor) |
|
210 | @interfaceutil.implementer(repository.ipeercommandexecutor) | |
211 | class localcommandexecutor(object): |
|
211 | class localcommandexecutor(object): | |
212 | def __init__(self, peer): |
|
212 | def __init__(self, peer): | |
213 | self._peer = peer |
|
213 | self._peer = peer | |
214 | self._sent = False |
|
214 | self._sent = False | |
215 | self._closed = False |
|
215 | self._closed = False | |
216 |
|
216 | |||
217 | def __enter__(self): |
|
217 | def __enter__(self): | |
218 | return self |
|
218 | return self | |
219 |
|
219 | |||
220 | def __exit__(self, exctype, excvalue, exctb): |
|
220 | def __exit__(self, exctype, excvalue, exctb): | |
221 | self.close() |
|
221 | self.close() | |
222 |
|
222 | |||
223 | def callcommand(self, command, args): |
|
223 | def callcommand(self, command, args): | |
224 | if self._sent: |
|
224 | if self._sent: | |
225 | raise error.ProgrammingError( |
|
225 | raise error.ProgrammingError( | |
226 | b'callcommand() cannot be used after sendcommands()' |
|
226 | b'callcommand() cannot be used after sendcommands()' | |
227 | ) |
|
227 | ) | |
228 |
|
228 | |||
229 | if self._closed: |
|
229 | if self._closed: | |
230 | raise error.ProgrammingError( |
|
230 | raise error.ProgrammingError( | |
231 | b'callcommand() cannot be used after close()' |
|
231 | b'callcommand() cannot be used after close()' | |
232 | ) |
|
232 | ) | |
233 |
|
233 | |||
234 | # We don't need to support anything fancy. Just call the named |
|
234 | # We don't need to support anything fancy. Just call the named | |
235 | # method on the peer and return a resolved future. |
|
235 | # method on the peer and return a resolved future. | |
236 | fn = getattr(self._peer, pycompat.sysstr(command)) |
|
236 | fn = getattr(self._peer, pycompat.sysstr(command)) | |
237 |
|
237 | |||
238 | f = pycompat.futures.Future() |
|
238 | f = pycompat.futures.Future() | |
239 |
|
239 | |||
240 | try: |
|
240 | try: | |
241 | result = fn(**pycompat.strkwargs(args)) |
|
241 | result = fn(**pycompat.strkwargs(args)) | |
242 | except Exception: |
|
242 | except Exception: | |
243 | pycompat.future_set_exception_info(f, sys.exc_info()[1:]) |
|
243 | pycompat.future_set_exception_info(f, sys.exc_info()[1:]) | |
244 | else: |
|
244 | else: | |
245 | f.set_result(result) |
|
245 | f.set_result(result) | |
246 |
|
246 | |||
247 | return f |
|
247 | return f | |
248 |
|
248 | |||
249 | def sendcommands(self): |
|
249 | def sendcommands(self): | |
250 | self._sent = True |
|
250 | self._sent = True | |
251 |
|
251 | |||
252 | def close(self): |
|
252 | def close(self): | |
253 | self._closed = True |
|
253 | self._closed = True | |
254 |
|
254 | |||
255 |
|
255 | |||
256 | @interfaceutil.implementer(repository.ipeercommands) |
|
256 | @interfaceutil.implementer(repository.ipeercommands) | |
257 | class localpeer(repository.peer): |
|
257 | class localpeer(repository.peer): | |
258 | '''peer for a local repo; reflects only the most recent API''' |
|
258 | '''peer for a local repo; reflects only the most recent API''' | |
259 |
|
259 | |||
260 | def __init__(self, repo, caps=None): |
|
260 | def __init__(self, repo, caps=None): | |
261 | super(localpeer, self).__init__() |
|
261 | super(localpeer, self).__init__() | |
262 |
|
262 | |||
263 | if caps is None: |
|
263 | if caps is None: | |
264 | caps = moderncaps.copy() |
|
264 | caps = moderncaps.copy() | |
265 | self._repo = repo.filtered(b'served') |
|
265 | self._repo = repo.filtered(b'served') | |
266 | self.ui = repo.ui |
|
266 | self.ui = repo.ui | |
267 | self._caps = repo._restrictcapabilities(caps) |
|
267 | self._caps = repo._restrictcapabilities(caps) | |
268 |
|
268 | |||
269 | # Begin of _basepeer interface. |
|
269 | # Begin of _basepeer interface. | |
270 |
|
270 | |||
271 | def url(self): |
|
271 | def url(self): | |
272 | return self._repo.url() |
|
272 | return self._repo.url() | |
273 |
|
273 | |||
274 | def local(self): |
|
274 | def local(self): | |
275 | return self._repo |
|
275 | return self._repo | |
276 |
|
276 | |||
277 | def peer(self): |
|
277 | def peer(self): | |
278 | return self |
|
278 | return self | |
279 |
|
279 | |||
280 | def canpush(self): |
|
280 | def canpush(self): | |
281 | return True |
|
281 | return True | |
282 |
|
282 | |||
283 | def close(self): |
|
283 | def close(self): | |
284 | self._repo.close() |
|
284 | self._repo.close() | |
285 |
|
285 | |||
286 | # End of _basepeer interface. |
|
286 | # End of _basepeer interface. | |
287 |
|
287 | |||
288 | # Begin of _basewirecommands interface. |
|
288 | # Begin of _basewirecommands interface. | |
289 |
|
289 | |||
290 | def branchmap(self): |
|
290 | def branchmap(self): | |
291 | return self._repo.branchmap() |
|
291 | return self._repo.branchmap() | |
292 |
|
292 | |||
293 | def capabilities(self): |
|
293 | def capabilities(self): | |
294 | return self._caps |
|
294 | return self._caps | |
295 |
|
295 | |||
296 | def clonebundles(self): |
|
296 | def clonebundles(self): | |
297 | return self._repo.tryread(b'clonebundles.manifest') |
|
297 | return self._repo.tryread(b'clonebundles.manifest') | |
298 |
|
298 | |||
299 | def debugwireargs(self, one, two, three=None, four=None, five=None): |
|
299 | def debugwireargs(self, one, two, three=None, four=None, five=None): | |
300 | """Used to test argument passing over the wire""" |
|
300 | """Used to test argument passing over the wire""" | |
301 | return b"%s %s %s %s %s" % ( |
|
301 | return b"%s %s %s %s %s" % ( | |
302 | one, |
|
302 | one, | |
303 | two, |
|
303 | two, | |
304 | pycompat.bytestr(three), |
|
304 | pycompat.bytestr(three), | |
305 | pycompat.bytestr(four), |
|
305 | pycompat.bytestr(four), | |
306 | pycompat.bytestr(five), |
|
306 | pycompat.bytestr(five), | |
307 | ) |
|
307 | ) | |
308 |
|
308 | |||
309 | def getbundle( |
|
309 | def getbundle( | |
310 | self, source, heads=None, common=None, bundlecaps=None, **kwargs |
|
310 | self, source, heads=None, common=None, bundlecaps=None, **kwargs | |
311 | ): |
|
311 | ): | |
312 | chunks = exchange.getbundlechunks( |
|
312 | chunks = exchange.getbundlechunks( | |
313 | self._repo, |
|
313 | self._repo, | |
314 | source, |
|
314 | source, | |
315 | heads=heads, |
|
315 | heads=heads, | |
316 | common=common, |
|
316 | common=common, | |
317 | bundlecaps=bundlecaps, |
|
317 | bundlecaps=bundlecaps, | |
318 | **kwargs |
|
318 | **kwargs | |
319 | )[1] |
|
319 | )[1] | |
320 | cb = util.chunkbuffer(chunks) |
|
320 | cb = util.chunkbuffer(chunks) | |
321 |
|
321 | |||
322 | if exchange.bundle2requested(bundlecaps): |
|
322 | if exchange.bundle2requested(bundlecaps): | |
323 | # When requesting a bundle2, getbundle returns a stream to make the |
|
323 | # When requesting a bundle2, getbundle returns a stream to make the | |
324 | # wire level function happier. We need to build a proper object |
|
324 | # wire level function happier. We need to build a proper object | |
325 | # from it in local peer. |
|
325 | # from it in local peer. | |
326 | return bundle2.getunbundler(self.ui, cb) |
|
326 | return bundle2.getunbundler(self.ui, cb) | |
327 | else: |
|
327 | else: | |
328 | return changegroup.getunbundler(b'01', cb, None) |
|
328 | return changegroup.getunbundler(b'01', cb, None) | |
329 |
|
329 | |||
330 | def heads(self): |
|
330 | def heads(self): | |
331 | return self._repo.heads() |
|
331 | return self._repo.heads() | |
332 |
|
332 | |||
333 | def known(self, nodes): |
|
333 | def known(self, nodes): | |
334 | return self._repo.known(nodes) |
|
334 | return self._repo.known(nodes) | |
335 |
|
335 | |||
336 | def listkeys(self, namespace): |
|
336 | def listkeys(self, namespace): | |
337 | return self._repo.listkeys(namespace) |
|
337 | return self._repo.listkeys(namespace) | |
338 |
|
338 | |||
339 | def lookup(self, key): |
|
339 | def lookup(self, key): | |
340 | return self._repo.lookup(key) |
|
340 | return self._repo.lookup(key) | |
341 |
|
341 | |||
342 | def pushkey(self, namespace, key, old, new): |
|
342 | def pushkey(self, namespace, key, old, new): | |
343 | return self._repo.pushkey(namespace, key, old, new) |
|
343 | return self._repo.pushkey(namespace, key, old, new) | |
344 |
|
344 | |||
345 | def stream_out(self): |
|
345 | def stream_out(self): | |
346 | raise error.Abort(_(b'cannot perform stream clone against local peer')) |
|
346 | raise error.Abort(_(b'cannot perform stream clone against local peer')) | |
347 |
|
347 | |||
348 | def unbundle(self, bundle, heads, url): |
|
348 | def unbundle(self, bundle, heads, url): | |
349 | """apply a bundle on a repo |
|
349 | """apply a bundle on a repo | |
350 |
|
350 | |||
351 | This function handles the repo locking itself.""" |
|
351 | This function handles the repo locking itself.""" | |
352 | try: |
|
352 | try: | |
353 | try: |
|
353 | try: | |
354 | bundle = exchange.readbundle(self.ui, bundle, None) |
|
354 | bundle = exchange.readbundle(self.ui, bundle, None) | |
355 | ret = exchange.unbundle(self._repo, bundle, heads, b'push', url) |
|
355 | ret = exchange.unbundle(self._repo, bundle, heads, b'push', url) | |
356 | if util.safehasattr(ret, b'getchunks'): |
|
356 | if util.safehasattr(ret, b'getchunks'): | |
357 | # This is a bundle20 object, turn it into an unbundler. |
|
357 | # This is a bundle20 object, turn it into an unbundler. | |
358 | # This little dance should be dropped eventually when the |
|
358 | # This little dance should be dropped eventually when the | |
359 | # API is finally improved. |
|
359 | # API is finally improved. | |
360 | stream = util.chunkbuffer(ret.getchunks()) |
|
360 | stream = util.chunkbuffer(ret.getchunks()) | |
361 | ret = bundle2.getunbundler(self.ui, stream) |
|
361 | ret = bundle2.getunbundler(self.ui, stream) | |
362 | return ret |
|
362 | return ret | |
363 | except Exception as exc: |
|
363 | except Exception as exc: | |
364 | # If the exception contains output salvaged from a bundle2 |
|
364 | # If the exception contains output salvaged from a bundle2 | |
365 | # reply, we need to make sure it is printed before continuing |
|
365 | # reply, we need to make sure it is printed before continuing | |
366 | # to fail. So we build a bundle2 with such output and consume |
|
366 | # to fail. So we build a bundle2 with such output and consume | |
367 | # it directly. |
|
367 | # it directly. | |
368 | # |
|
368 | # | |
369 | # This is not very elegant but allows a "simple" solution for |
|
369 | # This is not very elegant but allows a "simple" solution for | |
370 | # issue4594 |
|
370 | # issue4594 | |
371 | output = getattr(exc, '_bundle2salvagedoutput', ()) |
|
371 | output = getattr(exc, '_bundle2salvagedoutput', ()) | |
372 | if output: |
|
372 | if output: | |
373 | bundler = bundle2.bundle20(self._repo.ui) |
|
373 | bundler = bundle2.bundle20(self._repo.ui) | |
374 | for out in output: |
|
374 | for out in output: | |
375 | bundler.addpart(out) |
|
375 | bundler.addpart(out) | |
376 | stream = util.chunkbuffer(bundler.getchunks()) |
|
376 | stream = util.chunkbuffer(bundler.getchunks()) | |
377 | b = bundle2.getunbundler(self.ui, stream) |
|
377 | b = bundle2.getunbundler(self.ui, stream) | |
378 | bundle2.processbundle(self._repo, b) |
|
378 | bundle2.processbundle(self._repo, b) | |
379 | raise |
|
379 | raise | |
380 | except error.PushRaced as exc: |
|
380 | except error.PushRaced as exc: | |
381 | raise error.ResponseError( |
|
381 | raise error.ResponseError( | |
382 | _(b'push failed:'), stringutil.forcebytestr(exc) |
|
382 | _(b'push failed:'), stringutil.forcebytestr(exc) | |
383 | ) |
|
383 | ) | |
384 |
|
384 | |||
385 | # End of _basewirecommands interface. |
|
385 | # End of _basewirecommands interface. | |
386 |
|
386 | |||
387 | # Begin of peer interface. |
|
387 | # Begin of peer interface. | |
388 |
|
388 | |||
389 | def commandexecutor(self): |
|
389 | def commandexecutor(self): | |
390 | return localcommandexecutor(self) |
|
390 | return localcommandexecutor(self) | |
391 |
|
391 | |||
392 | # End of peer interface. |
|
392 | # End of peer interface. | |
393 |
|
393 | |||
394 |
|
394 | |||
395 | @interfaceutil.implementer(repository.ipeerlegacycommands) |
|
395 | @interfaceutil.implementer(repository.ipeerlegacycommands) | |
396 | class locallegacypeer(localpeer): |
|
396 | class locallegacypeer(localpeer): | |
397 | '''peer extension which implements legacy methods too; used for tests with |
|
397 | '''peer extension which implements legacy methods too; used for tests with | |
398 | restricted capabilities''' |
|
398 | restricted capabilities''' | |
399 |
|
399 | |||
400 | def __init__(self, repo): |
|
400 | def __init__(self, repo): | |
401 | super(locallegacypeer, self).__init__(repo, caps=legacycaps) |
|
401 | super(locallegacypeer, self).__init__(repo, caps=legacycaps) | |
402 |
|
402 | |||
403 | # Begin of baselegacywirecommands interface. |
|
403 | # Begin of baselegacywirecommands interface. | |
404 |
|
404 | |||
405 | def between(self, pairs): |
|
405 | def between(self, pairs): | |
406 | return self._repo.between(pairs) |
|
406 | return self._repo.between(pairs) | |
407 |
|
407 | |||
408 | def branches(self, nodes): |
|
408 | def branches(self, nodes): | |
409 | return self._repo.branches(nodes) |
|
409 | return self._repo.branches(nodes) | |
410 |
|
410 | |||
411 | def changegroup(self, nodes, source): |
|
411 | def changegroup(self, nodes, source): | |
412 | outgoing = discovery.outgoing( |
|
412 | outgoing = discovery.outgoing( | |
413 | self._repo, missingroots=nodes, missingheads=self._repo.heads() |
|
413 | self._repo, missingroots=nodes, missingheads=self._repo.heads() | |
414 | ) |
|
414 | ) | |
415 | return changegroup.makechangegroup(self._repo, outgoing, b'01', source) |
|
415 | return changegroup.makechangegroup(self._repo, outgoing, b'01', source) | |
416 |
|
416 | |||
417 | def changegroupsubset(self, bases, heads, source): |
|
417 | def changegroupsubset(self, bases, heads, source): | |
418 | outgoing = discovery.outgoing( |
|
418 | outgoing = discovery.outgoing( | |
419 | self._repo, missingroots=bases, missingheads=heads |
|
419 | self._repo, missingroots=bases, missingheads=heads | |
420 | ) |
|
420 | ) | |
421 | return changegroup.makechangegroup(self._repo, outgoing, b'01', source) |
|
421 | return changegroup.makechangegroup(self._repo, outgoing, b'01', source) | |
422 |
|
422 | |||
423 | # End of baselegacywirecommands interface. |
|
423 | # End of baselegacywirecommands interface. | |
424 |
|
424 | |||
425 |
|
425 | |||
426 | # Increment the sub-version when the revlog v2 format changes to lock out old |
|
426 | # Increment the sub-version when the revlog v2 format changes to lock out old | |
427 | # clients. |
|
427 | # clients. | |
428 | REVLOGV2_REQUIREMENT = b'exp-revlogv2.1' |
|
428 | REVLOGV2_REQUIREMENT = b'exp-revlogv2.1' | |
429 |
|
429 | |||
430 | # A repository with the sparserevlog feature will have delta chains that |
|
430 | # A repository with the sparserevlog feature will have delta chains that | |
431 | # can spread over a larger span. Sparse reading cuts these large spans into |
|
431 | # can spread over a larger span. Sparse reading cuts these large spans into | |
432 | # pieces, so that each piece isn't too big. |
|
432 | # pieces, so that each piece isn't too big. | |
433 | # Without the sparserevlog capability, reading from the repository could use |
|
433 | # Without the sparserevlog capability, reading from the repository could use | |
434 | # huge amounts of memory, because the whole span would be read at once, |
|
434 | # huge amounts of memory, because the whole span would be read at once, | |
435 | # including all the intermediate revisions that aren't pertinent for the chain. |
|
435 | # including all the intermediate revisions that aren't pertinent for the chain. | |
436 | # This is why once a repository has enabled sparse-read, it becomes required. |
|
436 | # This is why once a repository has enabled sparse-read, it becomes required. | |
437 | SPARSEREVLOG_REQUIREMENT = b'sparserevlog' |
|
437 | SPARSEREVLOG_REQUIREMENT = b'sparserevlog' | |
438 |
|
438 | |||
439 | # A repository with the sidedataflag requirement will allow to store extra |
|
439 | # A repository with the sidedataflag requirement will allow to store extra | |
440 | # information for revision without altering their original hashes. |
|
440 | # information for revision without altering their original hashes. | |
441 | SIDEDATA_REQUIREMENT = b'exp-sidedata-flag' |
|
441 | SIDEDATA_REQUIREMENT = b'exp-sidedata-flag' | |
442 |
|
442 | |||
443 | # A repository with the the copies-sidedata-changeset requirement will store |
|
443 | # A repository with the the copies-sidedata-changeset requirement will store | |
444 | # copies related information in changeset's sidedata. |
|
444 | # copies related information in changeset's sidedata. | |
445 | COPIESSDC_REQUIREMENT = b'exp-copies-sidedata-changeset' |
|
445 | COPIESSDC_REQUIREMENT = b'exp-copies-sidedata-changeset' | |
446 |
|
446 | |||
447 | # Functions receiving (ui, features) that extensions can register to impact |
|
447 | # Functions receiving (ui, features) that extensions can register to impact | |
448 | # the ability to load repositories with custom requirements. Only |
|
448 | # the ability to load repositories with custom requirements. Only | |
449 | # functions defined in loaded extensions are called. |
|
449 | # functions defined in loaded extensions are called. | |
450 | # |
|
450 | # | |
451 | # The function receives a set of requirement strings that the repository |
|
451 | # The function receives a set of requirement strings that the repository | |
452 | # is capable of opening. Functions will typically add elements to the |
|
452 | # is capable of opening. Functions will typically add elements to the | |
453 | # set to reflect that the extension knows how to handle that requirements. |
|
453 | # set to reflect that the extension knows how to handle that requirements. | |
454 | featuresetupfuncs = set() |
|
454 | featuresetupfuncs = set() | |
455 |
|
455 | |||
456 |
|
456 | |||
457 | def makelocalrepository(baseui, path, intents=None): |
|
457 | def makelocalrepository(baseui, path, intents=None): | |
458 | """Create a local repository object. |
|
458 | """Create a local repository object. | |
459 |
|
459 | |||
460 | Given arguments needed to construct a local repository, this function |
|
460 | Given arguments needed to construct a local repository, this function | |
461 | performs various early repository loading functionality (such as |
|
461 | performs various early repository loading functionality (such as | |
462 | reading the ``.hg/requires`` and ``.hg/hgrc`` files), validates that |
|
462 | reading the ``.hg/requires`` and ``.hg/hgrc`` files), validates that | |
463 | the repository can be opened, derives a type suitable for representing |
|
463 | the repository can be opened, derives a type suitable for representing | |
464 | that repository, and returns an instance of it. |
|
464 | that repository, and returns an instance of it. | |
465 |
|
465 | |||
466 | The returned object conforms to the ``repository.completelocalrepository`` |
|
466 | The returned object conforms to the ``repository.completelocalrepository`` | |
467 | interface. |
|
467 | interface. | |
468 |
|
468 | |||
469 | The repository type is derived by calling a series of factory functions |
|
469 | The repository type is derived by calling a series of factory functions | |
470 | for each aspect/interface of the final repository. These are defined by |
|
470 | for each aspect/interface of the final repository. These are defined by | |
471 | ``REPO_INTERFACES``. |
|
471 | ``REPO_INTERFACES``. | |
472 |
|
472 | |||
473 | Each factory function is called to produce a type implementing a specific |
|
473 | Each factory function is called to produce a type implementing a specific | |
474 | interface. The cumulative list of returned types will be combined into a |
|
474 | interface. The cumulative list of returned types will be combined into a | |
475 | new type and that type will be instantiated to represent the local |
|
475 | new type and that type will be instantiated to represent the local | |
476 | repository. |
|
476 | repository. | |
477 |
|
477 | |||
478 | The factory functions each receive various state that may be consulted |
|
478 | The factory functions each receive various state that may be consulted | |
479 | as part of deriving a type. |
|
479 | as part of deriving a type. | |
480 |
|
480 | |||
481 | Extensions should wrap these factory functions to customize repository type |
|
481 | Extensions should wrap these factory functions to customize repository type | |
482 | creation. Note that an extension's wrapped function may be called even if |
|
482 | creation. Note that an extension's wrapped function may be called even if | |
483 | that extension is not loaded for the repo being constructed. Extensions |
|
483 | that extension is not loaded for the repo being constructed. Extensions | |
484 | should check if their ``__name__`` appears in the |
|
484 | should check if their ``__name__`` appears in the | |
485 | ``extensionmodulenames`` set passed to the factory function and no-op if |
|
485 | ``extensionmodulenames`` set passed to the factory function and no-op if | |
486 | not. |
|
486 | not. | |
487 | """ |
|
487 | """ | |
488 | ui = baseui.copy() |
|
488 | ui = baseui.copy() | |
489 | # Prevent copying repo configuration. |
|
489 | # Prevent copying repo configuration. | |
490 | ui.copy = baseui.copy |
|
490 | ui.copy = baseui.copy | |
491 |
|
491 | |||
492 | # Working directory VFS rooted at repository root. |
|
492 | # Working directory VFS rooted at repository root. | |
493 | wdirvfs = vfsmod.vfs(path, expandpath=True, realpath=True) |
|
493 | wdirvfs = vfsmod.vfs(path, expandpath=True, realpath=True) | |
494 |
|
494 | |||
495 | # Main VFS for .hg/ directory. |
|
495 | # Main VFS for .hg/ directory. | |
496 | hgpath = wdirvfs.join(b'.hg') |
|
496 | hgpath = wdirvfs.join(b'.hg') | |
497 | hgvfs = vfsmod.vfs(hgpath, cacheaudited=True) |
|
497 | hgvfs = vfsmod.vfs(hgpath, cacheaudited=True) | |
498 |
|
498 | |||
499 | # The .hg/ path should exist and should be a directory. All other |
|
499 | # The .hg/ path should exist and should be a directory. All other | |
500 | # cases are errors. |
|
500 | # cases are errors. | |
501 | if not hgvfs.isdir(): |
|
501 | if not hgvfs.isdir(): | |
502 | try: |
|
502 | try: | |
503 | hgvfs.stat() |
|
503 | hgvfs.stat() | |
504 | except OSError as e: |
|
504 | except OSError as e: | |
505 | if e.errno != errno.ENOENT: |
|
505 | if e.errno != errno.ENOENT: | |
506 | raise |
|
506 | raise | |
507 |
|
507 | |||
508 | raise error.RepoError(_(b'repository %s not found') % path) |
|
508 | raise error.RepoError(_(b'repository %s not found') % path) | |
509 |
|
509 | |||
510 | # .hg/requires file contains a newline-delimited list of |
|
510 | # .hg/requires file contains a newline-delimited list of | |
511 | # features/capabilities the opener (us) must have in order to use |
|
511 | # features/capabilities the opener (us) must have in order to use | |
512 | # the repository. This file was introduced in Mercurial 0.9.2, |
|
512 | # the repository. This file was introduced in Mercurial 0.9.2, | |
513 | # which means very old repositories may not have one. We assume |
|
513 | # which means very old repositories may not have one. We assume | |
514 | # a missing file translates to no requirements. |
|
514 | # a missing file translates to no requirements. | |
515 | try: |
|
515 | try: | |
516 | requirements = set(hgvfs.read(b'requires').splitlines()) |
|
516 | requirements = set(hgvfs.read(b'requires').splitlines()) | |
517 | except IOError as e: |
|
517 | except IOError as e: | |
518 | if e.errno != errno.ENOENT: |
|
518 | if e.errno != errno.ENOENT: | |
519 | raise |
|
519 | raise | |
520 | requirements = set() |
|
520 | requirements = set() | |
521 |
|
521 | |||
522 | # The .hg/hgrc file may load extensions or contain config options |
|
522 | # The .hg/hgrc file may load extensions or contain config options | |
523 | # that influence repository construction. Attempt to load it and |
|
523 | # that influence repository construction. Attempt to load it and | |
524 | # process any new extensions that it may have pulled in. |
|
524 | # process any new extensions that it may have pulled in. | |
525 | if loadhgrc(ui, wdirvfs, hgvfs, requirements): |
|
525 | if loadhgrc(ui, wdirvfs, hgvfs, requirements): | |
526 | afterhgrcload(ui, wdirvfs, hgvfs, requirements) |
|
526 | afterhgrcload(ui, wdirvfs, hgvfs, requirements) | |
527 | extensions.loadall(ui) |
|
527 | extensions.loadall(ui) | |
528 | extensions.populateui(ui) |
|
528 | extensions.populateui(ui) | |
529 |
|
529 | |||
530 | # Set of module names of extensions loaded for this repository. |
|
530 | # Set of module names of extensions loaded for this repository. | |
531 | extensionmodulenames = {m.__name__ for n, m in extensions.extensions(ui)} |
|
531 | extensionmodulenames = {m.__name__ for n, m in extensions.extensions(ui)} | |
532 |
|
532 | |||
533 | supportedrequirements = gathersupportedrequirements(ui) |
|
533 | supportedrequirements = gathersupportedrequirements(ui) | |
534 |
|
534 | |||
535 | # We first validate the requirements are known. |
|
535 | # We first validate the requirements are known. | |
536 | ensurerequirementsrecognized(requirements, supportedrequirements) |
|
536 | ensurerequirementsrecognized(requirements, supportedrequirements) | |
537 |
|
537 | |||
538 | # Then we validate that the known set is reasonable to use together. |
|
538 | # Then we validate that the known set is reasonable to use together. | |
539 | ensurerequirementscompatible(ui, requirements) |
|
539 | ensurerequirementscompatible(ui, requirements) | |
540 |
|
540 | |||
541 | # TODO there are unhandled edge cases related to opening repositories with |
|
541 | # TODO there are unhandled edge cases related to opening repositories with | |
542 | # shared storage. If storage is shared, we should also test for requirements |
|
542 | # shared storage. If storage is shared, we should also test for requirements | |
543 | # compatibility in the pointed-to repo. This entails loading the .hg/hgrc in |
|
543 | # compatibility in the pointed-to repo. This entails loading the .hg/hgrc in | |
544 | # that repo, as that repo may load extensions needed to open it. This is a |
|
544 | # that repo, as that repo may load extensions needed to open it. This is a | |
545 | # bit complicated because we don't want the other hgrc to overwrite settings |
|
545 | # bit complicated because we don't want the other hgrc to overwrite settings | |
546 | # in this hgrc. |
|
546 | # in this hgrc. | |
547 | # |
|
547 | # | |
548 | # This bug is somewhat mitigated by the fact that we copy the .hg/requires |
|
548 | # This bug is somewhat mitigated by the fact that we copy the .hg/requires | |
549 | # file when sharing repos. But if a requirement is added after the share is |
|
549 | # file when sharing repos. But if a requirement is added after the share is | |
550 | # performed, thereby introducing a new requirement for the opener, we may |
|
550 | # performed, thereby introducing a new requirement for the opener, we may | |
551 | # will not see that and could encounter a run-time error interacting with |
|
551 | # will not see that and could encounter a run-time error interacting with | |
552 | # that shared store since it has an unknown-to-us requirement. |
|
552 | # that shared store since it has an unknown-to-us requirement. | |
553 |
|
553 | |||
554 | # At this point, we know we should be capable of opening the repository. |
|
554 | # At this point, we know we should be capable of opening the repository. | |
555 | # Now get on with doing that. |
|
555 | # Now get on with doing that. | |
556 |
|
556 | |||
557 | features = set() |
|
557 | features = set() | |
558 |
|
558 | |||
559 | # The "store" part of the repository holds versioned data. How it is |
|
559 | # The "store" part of the repository holds versioned data. How it is | |
560 | # accessed is determined by various requirements. The ``shared`` or |
|
560 | # accessed is determined by various requirements. The ``shared`` or | |
561 | # ``relshared`` requirements indicate the store lives in the path contained |
|
561 | # ``relshared`` requirements indicate the store lives in the path contained | |
562 | # in the ``.hg/sharedpath`` file. This is an absolute path for |
|
562 | # in the ``.hg/sharedpath`` file. This is an absolute path for | |
563 | # ``shared`` and relative to ``.hg/`` for ``relshared``. |
|
563 | # ``shared`` and relative to ``.hg/`` for ``relshared``. | |
564 | if b'shared' in requirements or b'relshared' in requirements: |
|
564 | if b'shared' in requirements or b'relshared' in requirements: | |
565 | sharedpath = hgvfs.read(b'sharedpath').rstrip(b'\n') |
|
565 | sharedpath = hgvfs.read(b'sharedpath').rstrip(b'\n') | |
566 | if b'relshared' in requirements: |
|
566 | if b'relshared' in requirements: | |
567 | sharedpath = hgvfs.join(sharedpath) |
|
567 | sharedpath = hgvfs.join(sharedpath) | |
568 |
|
568 | |||
569 | sharedvfs = vfsmod.vfs(sharedpath, realpath=True) |
|
569 | sharedvfs = vfsmod.vfs(sharedpath, realpath=True) | |
570 |
|
570 | |||
571 | if not sharedvfs.exists(): |
|
571 | if not sharedvfs.exists(): | |
572 | raise error.RepoError( |
|
572 | raise error.RepoError( | |
573 | _(b'.hg/sharedpath points to nonexistent directory %s') |
|
573 | _(b'.hg/sharedpath points to nonexistent directory %s') | |
574 | % sharedvfs.base |
|
574 | % sharedvfs.base | |
575 | ) |
|
575 | ) | |
576 |
|
576 | |||
577 | features.add(repository.REPO_FEATURE_SHARED_STORAGE) |
|
577 | features.add(repository.REPO_FEATURE_SHARED_STORAGE) | |
578 |
|
578 | |||
579 | storebasepath = sharedvfs.base |
|
579 | storebasepath = sharedvfs.base | |
580 | cachepath = sharedvfs.join(b'cache') |
|
580 | cachepath = sharedvfs.join(b'cache') | |
581 | else: |
|
581 | else: | |
582 | storebasepath = hgvfs.base |
|
582 | storebasepath = hgvfs.base | |
583 | cachepath = hgvfs.join(b'cache') |
|
583 | cachepath = hgvfs.join(b'cache') | |
584 | wcachepath = hgvfs.join(b'wcache') |
|
584 | wcachepath = hgvfs.join(b'wcache') | |
585 |
|
585 | |||
586 | # The store has changed over time and the exact layout is dictated by |
|
586 | # The store has changed over time and the exact layout is dictated by | |
587 | # requirements. The store interface abstracts differences across all |
|
587 | # requirements. The store interface abstracts differences across all | |
588 | # of them. |
|
588 | # of them. | |
589 | store = makestore( |
|
589 | store = makestore( | |
590 | requirements, |
|
590 | requirements, | |
591 | storebasepath, |
|
591 | storebasepath, | |
592 | lambda base: vfsmod.vfs(base, cacheaudited=True), |
|
592 | lambda base: vfsmod.vfs(base, cacheaudited=True), | |
593 | ) |
|
593 | ) | |
594 | hgvfs.createmode = store.createmode |
|
594 | hgvfs.createmode = store.createmode | |
595 |
|
595 | |||
596 | storevfs = store.vfs |
|
596 | storevfs = store.vfs | |
597 | storevfs.options = resolvestorevfsoptions(ui, requirements, features) |
|
597 | storevfs.options = resolvestorevfsoptions(ui, requirements, features) | |
598 |
|
598 | |||
599 | # The cache vfs is used to manage cache files. |
|
599 | # The cache vfs is used to manage cache files. | |
600 | cachevfs = vfsmod.vfs(cachepath, cacheaudited=True) |
|
600 | cachevfs = vfsmod.vfs(cachepath, cacheaudited=True) | |
601 | cachevfs.createmode = store.createmode |
|
601 | cachevfs.createmode = store.createmode | |
602 | # The cache vfs is used to manage cache files related to the working copy |
|
602 | # The cache vfs is used to manage cache files related to the working copy | |
603 | wcachevfs = vfsmod.vfs(wcachepath, cacheaudited=True) |
|
603 | wcachevfs = vfsmod.vfs(wcachepath, cacheaudited=True) | |
604 | wcachevfs.createmode = store.createmode |
|
604 | wcachevfs.createmode = store.createmode | |
605 |
|
605 | |||
606 | # Now resolve the type for the repository object. We do this by repeatedly |
|
606 | # Now resolve the type for the repository object. We do this by repeatedly | |
607 | # calling a factory function to produces types for specific aspects of the |
|
607 | # calling a factory function to produces types for specific aspects of the | |
608 | # repo's operation. The aggregate returned types are used as base classes |
|
608 | # repo's operation. The aggregate returned types are used as base classes | |
609 | # for a dynamically-derived type, which will represent our new repository. |
|
609 | # for a dynamically-derived type, which will represent our new repository. | |
610 |
|
610 | |||
611 | bases = [] |
|
611 | bases = [] | |
612 | extrastate = {} |
|
612 | extrastate = {} | |
613 |
|
613 | |||
614 | for iface, fn in REPO_INTERFACES: |
|
614 | for iface, fn in REPO_INTERFACES: | |
615 | # We pass all potentially useful state to give extensions tons of |
|
615 | # We pass all potentially useful state to give extensions tons of | |
616 | # flexibility. |
|
616 | # flexibility. | |
617 | typ = fn()( |
|
617 | typ = fn()( | |
618 | ui=ui, |
|
618 | ui=ui, | |
619 | intents=intents, |
|
619 | intents=intents, | |
620 | requirements=requirements, |
|
620 | requirements=requirements, | |
621 | features=features, |
|
621 | features=features, | |
622 | wdirvfs=wdirvfs, |
|
622 | wdirvfs=wdirvfs, | |
623 | hgvfs=hgvfs, |
|
623 | hgvfs=hgvfs, | |
624 | store=store, |
|
624 | store=store, | |
625 | storevfs=storevfs, |
|
625 | storevfs=storevfs, | |
626 | storeoptions=storevfs.options, |
|
626 | storeoptions=storevfs.options, | |
627 | cachevfs=cachevfs, |
|
627 | cachevfs=cachevfs, | |
628 | wcachevfs=wcachevfs, |
|
628 | wcachevfs=wcachevfs, | |
629 | extensionmodulenames=extensionmodulenames, |
|
629 | extensionmodulenames=extensionmodulenames, | |
630 | extrastate=extrastate, |
|
630 | extrastate=extrastate, | |
631 | baseclasses=bases, |
|
631 | baseclasses=bases, | |
632 | ) |
|
632 | ) | |
633 |
|
633 | |||
634 | if not isinstance(typ, type): |
|
634 | if not isinstance(typ, type): | |
635 | raise error.ProgrammingError( |
|
635 | raise error.ProgrammingError( | |
636 | b'unable to construct type for %s' % iface |
|
636 | b'unable to construct type for %s' % iface | |
637 | ) |
|
637 | ) | |
638 |
|
638 | |||
639 | bases.append(typ) |
|
639 | bases.append(typ) | |
640 |
|
640 | |||
641 | # type() allows you to use characters in type names that wouldn't be |
|
641 | # type() allows you to use characters in type names that wouldn't be | |
642 | # recognized as Python symbols in source code. We abuse that to add |
|
642 | # recognized as Python symbols in source code. We abuse that to add | |
643 | # rich information about our constructed repo. |
|
643 | # rich information about our constructed repo. | |
644 | name = pycompat.sysstr( |
|
644 | name = pycompat.sysstr( | |
645 | b'derivedrepo:%s<%s>' % (wdirvfs.base, b','.join(sorted(requirements))) |
|
645 | b'derivedrepo:%s<%s>' % (wdirvfs.base, b','.join(sorted(requirements))) | |
646 | ) |
|
646 | ) | |
647 |
|
647 | |||
648 | cls = type(name, tuple(bases), {}) |
|
648 | cls = type(name, tuple(bases), {}) | |
649 |
|
649 | |||
650 | return cls( |
|
650 | return cls( | |
651 | baseui=baseui, |
|
651 | baseui=baseui, | |
652 | ui=ui, |
|
652 | ui=ui, | |
653 | origroot=path, |
|
653 | origroot=path, | |
654 | wdirvfs=wdirvfs, |
|
654 | wdirvfs=wdirvfs, | |
655 | hgvfs=hgvfs, |
|
655 | hgvfs=hgvfs, | |
656 | requirements=requirements, |
|
656 | requirements=requirements, | |
657 | supportedrequirements=supportedrequirements, |
|
657 | supportedrequirements=supportedrequirements, | |
658 | sharedpath=storebasepath, |
|
658 | sharedpath=storebasepath, | |
659 | store=store, |
|
659 | store=store, | |
660 | cachevfs=cachevfs, |
|
660 | cachevfs=cachevfs, | |
661 | wcachevfs=wcachevfs, |
|
661 | wcachevfs=wcachevfs, | |
662 | features=features, |
|
662 | features=features, | |
663 | intents=intents, |
|
663 | intents=intents, | |
664 | ) |
|
664 | ) | |
665 |
|
665 | |||
666 |
|
666 | |||
667 | def loadhgrc(ui, wdirvfs, hgvfs, requirements): |
|
667 | def loadhgrc(ui, wdirvfs, hgvfs, requirements): | |
668 | """Load hgrc files/content into a ui instance. |
|
668 | """Load hgrc files/content into a ui instance. | |
669 |
|
669 | |||
670 | This is called during repository opening to load any additional |
|
670 | This is called during repository opening to load any additional | |
671 | config files or settings relevant to the current repository. |
|
671 | config files or settings relevant to the current repository. | |
672 |
|
672 | |||
673 | Returns a bool indicating whether any additional configs were loaded. |
|
673 | Returns a bool indicating whether any additional configs were loaded. | |
674 |
|
674 | |||
675 | Extensions should monkeypatch this function to modify how per-repo |
|
675 | Extensions should monkeypatch this function to modify how per-repo | |
676 | configs are loaded. For example, an extension may wish to pull in |
|
676 | configs are loaded. For example, an extension may wish to pull in | |
677 | configs from alternate files or sources. |
|
677 | configs from alternate files or sources. | |
678 | """ |
|
678 | """ | |
679 | try: |
|
679 | try: | |
680 | ui.readconfig(hgvfs.join(b'hgrc'), root=wdirvfs.base) |
|
680 | ui.readconfig(hgvfs.join(b'hgrc'), root=wdirvfs.base) | |
681 | return True |
|
681 | return True | |
682 | except IOError: |
|
682 | except IOError: | |
683 | return False |
|
683 | return False | |
684 |
|
684 | |||
685 |
|
685 | |||
686 | def afterhgrcload(ui, wdirvfs, hgvfs, requirements): |
|
686 | def afterhgrcload(ui, wdirvfs, hgvfs, requirements): | |
687 | """Perform additional actions after .hg/hgrc is loaded. |
|
687 | """Perform additional actions after .hg/hgrc is loaded. | |
688 |
|
688 | |||
689 | This function is called during repository loading immediately after |
|
689 | This function is called during repository loading immediately after | |
690 | the .hg/hgrc file is loaded and before per-repo extensions are loaded. |
|
690 | the .hg/hgrc file is loaded and before per-repo extensions are loaded. | |
691 |
|
691 | |||
692 | The function can be used to validate configs, automatically add |
|
692 | The function can be used to validate configs, automatically add | |
693 | options (including extensions) based on requirements, etc. |
|
693 | options (including extensions) based on requirements, etc. | |
694 | """ |
|
694 | """ | |
695 |
|
695 | |||
696 | # Map of requirements to list of extensions to load automatically when |
|
696 | # Map of requirements to list of extensions to load automatically when | |
697 | # requirement is present. |
|
697 | # requirement is present. | |
698 | autoextensions = { |
|
698 | autoextensions = { | |
699 | b'largefiles': [b'largefiles'], |
|
699 | b'largefiles': [b'largefiles'], | |
700 | b'lfs': [b'lfs'], |
|
700 | b'lfs': [b'lfs'], | |
701 | } |
|
701 | } | |
702 |
|
702 | |||
703 | for requirement, names in sorted(autoextensions.items()): |
|
703 | for requirement, names in sorted(autoextensions.items()): | |
704 | if requirement not in requirements: |
|
704 | if requirement not in requirements: | |
705 | continue |
|
705 | continue | |
706 |
|
706 | |||
707 | for name in names: |
|
707 | for name in names: | |
708 | if not ui.hasconfig(b'extensions', name): |
|
708 | if not ui.hasconfig(b'extensions', name): | |
709 | ui.setconfig(b'extensions', name, b'', source=b'autoload') |
|
709 | ui.setconfig(b'extensions', name, b'', source=b'autoload') | |
710 |
|
710 | |||
711 |
|
711 | |||
712 | def gathersupportedrequirements(ui): |
|
712 | def gathersupportedrequirements(ui): | |
713 | """Determine the complete set of recognized requirements.""" |
|
713 | """Determine the complete set of recognized requirements.""" | |
714 | # Start with all requirements supported by this file. |
|
714 | # Start with all requirements supported by this file. | |
715 | supported = set(localrepository._basesupported) |
|
715 | supported = set(localrepository._basesupported) | |
716 |
|
716 | |||
717 | # Execute ``featuresetupfuncs`` entries if they belong to an extension |
|
717 | # Execute ``featuresetupfuncs`` entries if they belong to an extension | |
718 | # relevant to this ui instance. |
|
718 | # relevant to this ui instance. | |
719 | modules = {m.__name__ for n, m in extensions.extensions(ui)} |
|
719 | modules = {m.__name__ for n, m in extensions.extensions(ui)} | |
720 |
|
720 | |||
721 | for fn in featuresetupfuncs: |
|
721 | for fn in featuresetupfuncs: | |
722 | if fn.__module__ in modules: |
|
722 | if fn.__module__ in modules: | |
723 | fn(ui, supported) |
|
723 | fn(ui, supported) | |
724 |
|
724 | |||
725 | # Add derived requirements from registered compression engines. |
|
725 | # Add derived requirements from registered compression engines. | |
726 | for name in util.compengines: |
|
726 | for name in util.compengines: | |
727 | engine = util.compengines[name] |
|
727 | engine = util.compengines[name] | |
728 | if engine.available() and engine.revlogheader(): |
|
728 | if engine.available() and engine.revlogheader(): | |
729 | supported.add(b'exp-compression-%s' % name) |
|
729 | supported.add(b'exp-compression-%s' % name) | |
730 | if engine.name() == b'zstd': |
|
730 | if engine.name() == b'zstd': | |
731 | supported.add(b'revlog-compression-zstd') |
|
731 | supported.add(b'revlog-compression-zstd') | |
732 |
|
732 | |||
733 | return supported |
|
733 | return supported | |
734 |
|
734 | |||
735 |
|
735 | |||
736 | def ensurerequirementsrecognized(requirements, supported): |
|
736 | def ensurerequirementsrecognized(requirements, supported): | |
737 | """Validate that a set of local requirements is recognized. |
|
737 | """Validate that a set of local requirements is recognized. | |
738 |
|
738 | |||
739 | Receives a set of requirements. Raises an ``error.RepoError`` if there |
|
739 | Receives a set of requirements. Raises an ``error.RepoError`` if there | |
740 | exists any requirement in that set that currently loaded code doesn't |
|
740 | exists any requirement in that set that currently loaded code doesn't | |
741 | recognize. |
|
741 | recognize. | |
742 |
|
742 | |||
743 | Returns a set of supported requirements. |
|
743 | Returns a set of supported requirements. | |
744 | """ |
|
744 | """ | |
745 | missing = set() |
|
745 | missing = set() | |
746 |
|
746 | |||
747 | for requirement in requirements: |
|
747 | for requirement in requirements: | |
748 | if requirement in supported: |
|
748 | if requirement in supported: | |
749 | continue |
|
749 | continue | |
750 |
|
750 | |||
751 | if not requirement or not requirement[0:1].isalnum(): |
|
751 | if not requirement or not requirement[0:1].isalnum(): | |
752 | raise error.RequirementError(_(b'.hg/requires file is corrupt')) |
|
752 | raise error.RequirementError(_(b'.hg/requires file is corrupt')) | |
753 |
|
753 | |||
754 | missing.add(requirement) |
|
754 | missing.add(requirement) | |
755 |
|
755 | |||
756 | if missing: |
|
756 | if missing: | |
757 | raise error.RequirementError( |
|
757 | raise error.RequirementError( | |
758 | _(b'repository requires features unknown to this Mercurial: %s') |
|
758 | _(b'repository requires features unknown to this Mercurial: %s') | |
759 | % b' '.join(sorted(missing)), |
|
759 | % b' '.join(sorted(missing)), | |
760 | hint=_( |
|
760 | hint=_( | |
761 | b'see https://mercurial-scm.org/wiki/MissingRequirement ' |
|
761 | b'see https://mercurial-scm.org/wiki/MissingRequirement ' | |
762 | b'for more information' |
|
762 | b'for more information' | |
763 | ), |
|
763 | ), | |
764 | ) |
|
764 | ) | |
765 |
|
765 | |||
766 |
|
766 | |||
767 | def ensurerequirementscompatible(ui, requirements): |
|
767 | def ensurerequirementscompatible(ui, requirements): | |
768 | """Validates that a set of recognized requirements is mutually compatible. |
|
768 | """Validates that a set of recognized requirements is mutually compatible. | |
769 |
|
769 | |||
770 | Some requirements may not be compatible with others or require |
|
770 | Some requirements may not be compatible with others or require | |
771 | config options that aren't enabled. This function is called during |
|
771 | config options that aren't enabled. This function is called during | |
772 | repository opening to ensure that the set of requirements needed |
|
772 | repository opening to ensure that the set of requirements needed | |
773 | to open a repository is sane and compatible with config options. |
|
773 | to open a repository is sane and compatible with config options. | |
774 |
|
774 | |||
775 | Extensions can monkeypatch this function to perform additional |
|
775 | Extensions can monkeypatch this function to perform additional | |
776 | checking. |
|
776 | checking. | |
777 |
|
777 | |||
778 | ``error.RepoError`` should be raised on failure. |
|
778 | ``error.RepoError`` should be raised on failure. | |
779 | """ |
|
779 | """ | |
780 | if b'exp-sparse' in requirements and not sparse.enabled: |
|
780 | if b'exp-sparse' in requirements and not sparse.enabled: | |
781 | raise error.RepoError( |
|
781 | raise error.RepoError( | |
782 | _( |
|
782 | _( | |
783 | b'repository is using sparse feature but ' |
|
783 | b'repository is using sparse feature but ' | |
784 | b'sparse is not enabled; enable the ' |
|
784 | b'sparse is not enabled; enable the ' | |
785 | b'"sparse" extensions to access' |
|
785 | b'"sparse" extensions to access' | |
786 | ) |
|
786 | ) | |
787 | ) |
|
787 | ) | |
788 |
|
788 | |||
789 |
|
789 | |||
790 | def makestore(requirements, path, vfstype): |
|
790 | def makestore(requirements, path, vfstype): | |
791 | """Construct a storage object for a repository.""" |
|
791 | """Construct a storage object for a repository.""" | |
792 | if b'store' in requirements: |
|
792 | if b'store' in requirements: | |
793 | if b'fncache' in requirements: |
|
793 | if b'fncache' in requirements: | |
794 | return storemod.fncachestore( |
|
794 | return storemod.fncachestore( | |
795 | path, vfstype, b'dotencode' in requirements |
|
795 | path, vfstype, b'dotencode' in requirements | |
796 | ) |
|
796 | ) | |
797 |
|
797 | |||
798 | return storemod.encodedstore(path, vfstype) |
|
798 | return storemod.encodedstore(path, vfstype) | |
799 |
|
799 | |||
800 | return storemod.basicstore(path, vfstype) |
|
800 | return storemod.basicstore(path, vfstype) | |
801 |
|
801 | |||
802 |
|
802 | |||
803 | def resolvestorevfsoptions(ui, requirements, features): |
|
803 | def resolvestorevfsoptions(ui, requirements, features): | |
804 | """Resolve the options to pass to the store vfs opener. |
|
804 | """Resolve the options to pass to the store vfs opener. | |
805 |
|
805 | |||
806 | The returned dict is used to influence behavior of the storage layer. |
|
806 | The returned dict is used to influence behavior of the storage layer. | |
807 | """ |
|
807 | """ | |
808 | options = {} |
|
808 | options = {} | |
809 |
|
809 | |||
810 | if b'treemanifest' in requirements: |
|
810 | if b'treemanifest' in requirements: | |
811 | options[b'treemanifest'] = True |
|
811 | options[b'treemanifest'] = True | |
812 |
|
812 | |||
813 | # experimental config: format.manifestcachesize |
|
813 | # experimental config: format.manifestcachesize | |
814 | manifestcachesize = ui.configint(b'format', b'manifestcachesize') |
|
814 | manifestcachesize = ui.configint(b'format', b'manifestcachesize') | |
815 | if manifestcachesize is not None: |
|
815 | if manifestcachesize is not None: | |
816 | options[b'manifestcachesize'] = manifestcachesize |
|
816 | options[b'manifestcachesize'] = manifestcachesize | |
817 |
|
817 | |||
818 | # In the absence of another requirement superseding a revlog-related |
|
818 | # In the absence of another requirement superseding a revlog-related | |
819 | # requirement, we have to assume the repo is using revlog version 0. |
|
819 | # requirement, we have to assume the repo is using revlog version 0. | |
820 | # This revlog format is super old and we don't bother trying to parse |
|
820 | # This revlog format is super old and we don't bother trying to parse | |
821 | # opener options for it because those options wouldn't do anything |
|
821 | # opener options for it because those options wouldn't do anything | |
822 | # meaningful on such old repos. |
|
822 | # meaningful on such old repos. | |
823 | if b'revlogv1' in requirements or REVLOGV2_REQUIREMENT in requirements: |
|
823 | if b'revlogv1' in requirements or REVLOGV2_REQUIREMENT in requirements: | |
824 | options.update(resolverevlogstorevfsoptions(ui, requirements, features)) |
|
824 | options.update(resolverevlogstorevfsoptions(ui, requirements, features)) | |
825 | else: # explicitly mark repo as using revlogv0 |
|
825 | else: # explicitly mark repo as using revlogv0 | |
826 | options[b'revlogv0'] = True |
|
826 | options[b'revlogv0'] = True | |
827 |
|
827 | |||
828 | if COPIESSDC_REQUIREMENT in requirements: |
|
828 | if COPIESSDC_REQUIREMENT in requirements: | |
829 | options[b'copies-storage'] = b'changeset-sidedata' |
|
829 | options[b'copies-storage'] = b'changeset-sidedata' | |
830 | else: |
|
830 | else: | |
831 | writecopiesto = ui.config(b'experimental', b'copies.write-to') |
|
831 | writecopiesto = ui.config(b'experimental', b'copies.write-to') | |
832 | copiesextramode = (b'changeset-only', b'compatibility') |
|
832 | copiesextramode = (b'changeset-only', b'compatibility') | |
833 | if writecopiesto in copiesextramode: |
|
833 | if writecopiesto in copiesextramode: | |
834 | options[b'copies-storage'] = b'extra' |
|
834 | options[b'copies-storage'] = b'extra' | |
835 |
|
835 | |||
836 | return options |
|
836 | return options | |
837 |
|
837 | |||
838 |
|
838 | |||
839 | def resolverevlogstorevfsoptions(ui, requirements, features): |
|
839 | def resolverevlogstorevfsoptions(ui, requirements, features): | |
840 | """Resolve opener options specific to revlogs.""" |
|
840 | """Resolve opener options specific to revlogs.""" | |
841 |
|
841 | |||
842 | options = {} |
|
842 | options = {} | |
843 | options[b'flagprocessors'] = {} |
|
843 | options[b'flagprocessors'] = {} | |
844 |
|
844 | |||
845 | if b'revlogv1' in requirements: |
|
845 | if b'revlogv1' in requirements: | |
846 | options[b'revlogv1'] = True |
|
846 | options[b'revlogv1'] = True | |
847 | if REVLOGV2_REQUIREMENT in requirements: |
|
847 | if REVLOGV2_REQUIREMENT in requirements: | |
848 | options[b'revlogv2'] = True |
|
848 | options[b'revlogv2'] = True | |
849 |
|
849 | |||
850 | if b'generaldelta' in requirements: |
|
850 | if b'generaldelta' in requirements: | |
851 | options[b'generaldelta'] = True |
|
851 | options[b'generaldelta'] = True | |
852 |
|
852 | |||
853 | # experimental config: format.chunkcachesize |
|
853 | # experimental config: format.chunkcachesize | |
854 | chunkcachesize = ui.configint(b'format', b'chunkcachesize') |
|
854 | chunkcachesize = ui.configint(b'format', b'chunkcachesize') | |
855 | if chunkcachesize is not None: |
|
855 | if chunkcachesize is not None: | |
856 | options[b'chunkcachesize'] = chunkcachesize |
|
856 | options[b'chunkcachesize'] = chunkcachesize | |
857 |
|
857 | |||
858 | deltabothparents = ui.configbool( |
|
858 | deltabothparents = ui.configbool( | |
859 | b'storage', b'revlog.optimize-delta-parent-choice' |
|
859 | b'storage', b'revlog.optimize-delta-parent-choice' | |
860 | ) |
|
860 | ) | |
861 | options[b'deltabothparents'] = deltabothparents |
|
861 | options[b'deltabothparents'] = deltabothparents | |
862 |
|
862 | |||
863 | lazydelta = ui.configbool(b'storage', b'revlog.reuse-external-delta') |
|
863 | lazydelta = ui.configbool(b'storage', b'revlog.reuse-external-delta') | |
864 | lazydeltabase = False |
|
864 | lazydeltabase = False | |
865 | if lazydelta: |
|
865 | if lazydelta: | |
866 | lazydeltabase = ui.configbool( |
|
866 | lazydeltabase = ui.configbool( | |
867 | b'storage', b'revlog.reuse-external-delta-parent' |
|
867 | b'storage', b'revlog.reuse-external-delta-parent' | |
868 | ) |
|
868 | ) | |
869 | if lazydeltabase is None: |
|
869 | if lazydeltabase is None: | |
870 | lazydeltabase = not scmutil.gddeltaconfig(ui) |
|
870 | lazydeltabase = not scmutil.gddeltaconfig(ui) | |
871 | options[b'lazydelta'] = lazydelta |
|
871 | options[b'lazydelta'] = lazydelta | |
872 | options[b'lazydeltabase'] = lazydeltabase |
|
872 | options[b'lazydeltabase'] = lazydeltabase | |
873 |
|
873 | |||
874 | chainspan = ui.configbytes(b'experimental', b'maxdeltachainspan') |
|
874 | chainspan = ui.configbytes(b'experimental', b'maxdeltachainspan') | |
875 | if 0 <= chainspan: |
|
875 | if 0 <= chainspan: | |
876 | options[b'maxdeltachainspan'] = chainspan |
|
876 | options[b'maxdeltachainspan'] = chainspan | |
877 |
|
877 | |||
878 | mmapindexthreshold = ui.configbytes(b'experimental', b'mmapindexthreshold') |
|
878 | mmapindexthreshold = ui.configbytes(b'experimental', b'mmapindexthreshold') | |
879 | if mmapindexthreshold is not None: |
|
879 | if mmapindexthreshold is not None: | |
880 | options[b'mmapindexthreshold'] = mmapindexthreshold |
|
880 | options[b'mmapindexthreshold'] = mmapindexthreshold | |
881 |
|
881 | |||
882 | withsparseread = ui.configbool(b'experimental', b'sparse-read') |
|
882 | withsparseread = ui.configbool(b'experimental', b'sparse-read') | |
883 | srdensitythres = float( |
|
883 | srdensitythres = float( | |
884 | ui.config(b'experimental', b'sparse-read.density-threshold') |
|
884 | ui.config(b'experimental', b'sparse-read.density-threshold') | |
885 | ) |
|
885 | ) | |
886 | srmingapsize = ui.configbytes(b'experimental', b'sparse-read.min-gap-size') |
|
886 | srmingapsize = ui.configbytes(b'experimental', b'sparse-read.min-gap-size') | |
887 | options[b'with-sparse-read'] = withsparseread |
|
887 | options[b'with-sparse-read'] = withsparseread | |
888 | options[b'sparse-read-density-threshold'] = srdensitythres |
|
888 | options[b'sparse-read-density-threshold'] = srdensitythres | |
889 | options[b'sparse-read-min-gap-size'] = srmingapsize |
|
889 | options[b'sparse-read-min-gap-size'] = srmingapsize | |
890 |
|
890 | |||
891 | sparserevlog = SPARSEREVLOG_REQUIREMENT in requirements |
|
891 | sparserevlog = SPARSEREVLOG_REQUIREMENT in requirements | |
892 | options[b'sparse-revlog'] = sparserevlog |
|
892 | options[b'sparse-revlog'] = sparserevlog | |
893 | if sparserevlog: |
|
893 | if sparserevlog: | |
894 | options[b'generaldelta'] = True |
|
894 | options[b'generaldelta'] = True | |
895 |
|
895 | |||
896 | sidedata = SIDEDATA_REQUIREMENT in requirements |
|
896 | sidedata = SIDEDATA_REQUIREMENT in requirements | |
897 | options[b'side-data'] = sidedata |
|
897 | options[b'side-data'] = sidedata | |
898 |
|
898 | |||
899 | maxchainlen = None |
|
899 | maxchainlen = None | |
900 | if sparserevlog: |
|
900 | if sparserevlog: | |
901 | maxchainlen = revlogconst.SPARSE_REVLOG_MAX_CHAIN_LENGTH |
|
901 | maxchainlen = revlogconst.SPARSE_REVLOG_MAX_CHAIN_LENGTH | |
902 | # experimental config: format.maxchainlen |
|
902 | # experimental config: format.maxchainlen | |
903 | maxchainlen = ui.configint(b'format', b'maxchainlen', maxchainlen) |
|
903 | maxchainlen = ui.configint(b'format', b'maxchainlen', maxchainlen) | |
904 | if maxchainlen is not None: |
|
904 | if maxchainlen is not None: | |
905 | options[b'maxchainlen'] = maxchainlen |
|
905 | options[b'maxchainlen'] = maxchainlen | |
906 |
|
906 | |||
907 | for r in requirements: |
|
907 | for r in requirements: | |
908 | # we allow multiple compression engine requirement to co-exist because |
|
908 | # we allow multiple compression engine requirement to co-exist because | |
909 | # strickly speaking, revlog seems to support mixed compression style. |
|
909 | # strickly speaking, revlog seems to support mixed compression style. | |
910 | # |
|
910 | # | |
911 | # The compression used for new entries will be "the last one" |
|
911 | # The compression used for new entries will be "the last one" | |
912 | prefix = r.startswith |
|
912 | prefix = r.startswith | |
913 | if prefix(b'revlog-compression-') or prefix(b'exp-compression-'): |
|
913 | if prefix(b'revlog-compression-') or prefix(b'exp-compression-'): | |
914 | options[b'compengine'] = r.split(b'-', 2)[2] |
|
914 | options[b'compengine'] = r.split(b'-', 2)[2] | |
915 |
|
915 | |||
916 | options[b'zlib.level'] = ui.configint(b'storage', b'revlog.zlib.level') |
|
916 | options[b'zlib.level'] = ui.configint(b'storage', b'revlog.zlib.level') | |
917 | if options[b'zlib.level'] is not None: |
|
917 | if options[b'zlib.level'] is not None: | |
918 | if not (0 <= options[b'zlib.level'] <= 9): |
|
918 | if not (0 <= options[b'zlib.level'] <= 9): | |
919 | msg = _(b'invalid value for `storage.revlog.zlib.level` config: %d') |
|
919 | msg = _(b'invalid value for `storage.revlog.zlib.level` config: %d') | |
920 | raise error.Abort(msg % options[b'zlib.level']) |
|
920 | raise error.Abort(msg % options[b'zlib.level']) | |
921 | options[b'zstd.level'] = ui.configint(b'storage', b'revlog.zstd.level') |
|
921 | options[b'zstd.level'] = ui.configint(b'storage', b'revlog.zstd.level') | |
922 | if options[b'zstd.level'] is not None: |
|
922 | if options[b'zstd.level'] is not None: | |
923 | if not (0 <= options[b'zstd.level'] <= 22): |
|
923 | if not (0 <= options[b'zstd.level'] <= 22): | |
924 | msg = _(b'invalid value for `storage.revlog.zstd.level` config: %d') |
|
924 | msg = _(b'invalid value for `storage.revlog.zstd.level` config: %d') | |
925 | raise error.Abort(msg % options[b'zstd.level']) |
|
925 | raise error.Abort(msg % options[b'zstd.level']) | |
926 |
|
926 | |||
927 | if repository.NARROW_REQUIREMENT in requirements: |
|
927 | if repository.NARROW_REQUIREMENT in requirements: | |
928 | options[b'enableellipsis'] = True |
|
928 | options[b'enableellipsis'] = True | |
929 |
|
929 | |||
930 | return options |
|
930 | return options | |
931 |
|
931 | |||
932 |
|
932 | |||
933 | def makemain(**kwargs): |
|
933 | def makemain(**kwargs): | |
934 | """Produce a type conforming to ``ilocalrepositorymain``.""" |
|
934 | """Produce a type conforming to ``ilocalrepositorymain``.""" | |
935 | return localrepository |
|
935 | return localrepository | |
936 |
|
936 | |||
937 |
|
937 | |||
938 | @interfaceutil.implementer(repository.ilocalrepositoryfilestorage) |
|
938 | @interfaceutil.implementer(repository.ilocalrepositoryfilestorage) | |
939 | class revlogfilestorage(object): |
|
939 | class revlogfilestorage(object): | |
940 | """File storage when using revlogs.""" |
|
940 | """File storage when using revlogs.""" | |
941 |
|
941 | |||
942 | def file(self, path): |
|
942 | def file(self, path): | |
943 | if path[0] == b'/': |
|
943 | if path[0] == b'/': | |
944 | path = path[1:] |
|
944 | path = path[1:] | |
945 |
|
945 | |||
946 | return filelog.filelog(self.svfs, path) |
|
946 | return filelog.filelog(self.svfs, path) | |
947 |
|
947 | |||
948 |
|
948 | |||
949 | @interfaceutil.implementer(repository.ilocalrepositoryfilestorage) |
|
949 | @interfaceutil.implementer(repository.ilocalrepositoryfilestorage) | |
950 | class revlognarrowfilestorage(object): |
|
950 | class revlognarrowfilestorage(object): | |
951 | """File storage when using revlogs and narrow files.""" |
|
951 | """File storage when using revlogs and narrow files.""" | |
952 |
|
952 | |||
953 | def file(self, path): |
|
953 | def file(self, path): | |
954 | if path[0] == b'/': |
|
954 | if path[0] == b'/': | |
955 | path = path[1:] |
|
955 | path = path[1:] | |
956 |
|
956 | |||
957 | return filelog.narrowfilelog(self.svfs, path, self._storenarrowmatch) |
|
957 | return filelog.narrowfilelog(self.svfs, path, self._storenarrowmatch) | |
958 |
|
958 | |||
959 |
|
959 | |||
960 | def makefilestorage(requirements, features, **kwargs): |
|
960 | def makefilestorage(requirements, features, **kwargs): | |
961 | """Produce a type conforming to ``ilocalrepositoryfilestorage``.""" |
|
961 | """Produce a type conforming to ``ilocalrepositoryfilestorage``.""" | |
962 | features.add(repository.REPO_FEATURE_REVLOG_FILE_STORAGE) |
|
962 | features.add(repository.REPO_FEATURE_REVLOG_FILE_STORAGE) | |
963 | features.add(repository.REPO_FEATURE_STREAM_CLONE) |
|
963 | features.add(repository.REPO_FEATURE_STREAM_CLONE) | |
964 |
|
964 | |||
965 | if repository.NARROW_REQUIREMENT in requirements: |
|
965 | if repository.NARROW_REQUIREMENT in requirements: | |
966 | return revlognarrowfilestorage |
|
966 | return revlognarrowfilestorage | |
967 | else: |
|
967 | else: | |
968 | return revlogfilestorage |
|
968 | return revlogfilestorage | |
969 |
|
969 | |||
970 |
|
970 | |||
971 | # List of repository interfaces and factory functions for them. Each |
|
971 | # List of repository interfaces and factory functions for them. Each | |
972 | # will be called in order during ``makelocalrepository()`` to iteratively |
|
972 | # will be called in order during ``makelocalrepository()`` to iteratively | |
973 | # derive the final type for a local repository instance. We capture the |
|
973 | # derive the final type for a local repository instance. We capture the | |
974 | # function as a lambda so we don't hold a reference and the module-level |
|
974 | # function as a lambda so we don't hold a reference and the module-level | |
975 | # functions can be wrapped. |
|
975 | # functions can be wrapped. | |
976 | REPO_INTERFACES = [ |
|
976 | REPO_INTERFACES = [ | |
977 | (repository.ilocalrepositorymain, lambda: makemain), |
|
977 | (repository.ilocalrepositorymain, lambda: makemain), | |
978 | (repository.ilocalrepositoryfilestorage, lambda: makefilestorage), |
|
978 | (repository.ilocalrepositoryfilestorage, lambda: makefilestorage), | |
979 | ] |
|
979 | ] | |
980 |
|
980 | |||
981 |
|
981 | |||
982 | @interfaceutil.implementer(repository.ilocalrepositorymain) |
|
982 | @interfaceutil.implementer(repository.ilocalrepositorymain) | |
983 | class localrepository(object): |
|
983 | class localrepository(object): | |
984 | """Main class for representing local repositories. |
|
984 | """Main class for representing local repositories. | |
985 |
|
985 | |||
986 | All local repositories are instances of this class. |
|
986 | All local repositories are instances of this class. | |
987 |
|
987 | |||
988 | Constructed on its own, instances of this class are not usable as |
|
988 | Constructed on its own, instances of this class are not usable as | |
989 | repository objects. To obtain a usable repository object, call |
|
989 | repository objects. To obtain a usable repository object, call | |
990 | ``hg.repository()``, ``localrepo.instance()``, or |
|
990 | ``hg.repository()``, ``localrepo.instance()``, or | |
991 | ``localrepo.makelocalrepository()``. The latter is the lowest-level. |
|
991 | ``localrepo.makelocalrepository()``. The latter is the lowest-level. | |
992 | ``instance()`` adds support for creating new repositories. |
|
992 | ``instance()`` adds support for creating new repositories. | |
993 | ``hg.repository()`` adds more extension integration, including calling |
|
993 | ``hg.repository()`` adds more extension integration, including calling | |
994 | ``reposetup()``. Generally speaking, ``hg.repository()`` should be |
|
994 | ``reposetup()``. Generally speaking, ``hg.repository()`` should be | |
995 | used. |
|
995 | used. | |
996 | """ |
|
996 | """ | |
997 |
|
997 | |||
998 | # obsolete experimental requirements: |
|
998 | # obsolete experimental requirements: | |
999 | # - manifestv2: An experimental new manifest format that allowed |
|
999 | # - manifestv2: An experimental new manifest format that allowed | |
1000 | # for stem compression of long paths. Experiment ended up not |
|
1000 | # for stem compression of long paths. Experiment ended up not | |
1001 | # being successful (repository sizes went up due to worse delta |
|
1001 | # being successful (repository sizes went up due to worse delta | |
1002 | # chains), and the code was deleted in 4.6. |
|
1002 | # chains), and the code was deleted in 4.6. | |
1003 | supportedformats = { |
|
1003 | supportedformats = { | |
1004 | b'revlogv1', |
|
1004 | b'revlogv1', | |
1005 | b'generaldelta', |
|
1005 | b'generaldelta', | |
1006 | b'treemanifest', |
|
1006 | b'treemanifest', | |
1007 | COPIESSDC_REQUIREMENT, |
|
1007 | COPIESSDC_REQUIREMENT, | |
1008 | REVLOGV2_REQUIREMENT, |
|
1008 | REVLOGV2_REQUIREMENT, | |
1009 | SIDEDATA_REQUIREMENT, |
|
1009 | SIDEDATA_REQUIREMENT, | |
1010 | SPARSEREVLOG_REQUIREMENT, |
|
1010 | SPARSEREVLOG_REQUIREMENT, | |
1011 | bookmarks.BOOKMARKS_IN_STORE_REQUIREMENT, |
|
1011 | bookmarks.BOOKMARKS_IN_STORE_REQUIREMENT, | |
1012 | } |
|
1012 | } | |
1013 | _basesupported = supportedformats | { |
|
1013 | _basesupported = supportedformats | { | |
1014 | b'store', |
|
1014 | b'store', | |
1015 | b'fncache', |
|
1015 | b'fncache', | |
1016 | b'shared', |
|
1016 | b'shared', | |
1017 | b'relshared', |
|
1017 | b'relshared', | |
1018 | b'dotencode', |
|
1018 | b'dotencode', | |
1019 | b'exp-sparse', |
|
1019 | b'exp-sparse', | |
1020 | b'internal-phase', |
|
1020 | b'internal-phase', | |
1021 | } |
|
1021 | } | |
1022 |
|
1022 | |||
1023 | # list of prefix for file which can be written without 'wlock' |
|
1023 | # list of prefix for file which can be written without 'wlock' | |
1024 | # Extensions should extend this list when needed |
|
1024 | # Extensions should extend this list when needed | |
1025 | _wlockfreeprefix = { |
|
1025 | _wlockfreeprefix = { | |
1026 | # We migh consider requiring 'wlock' for the next |
|
1026 | # We migh consider requiring 'wlock' for the next | |
1027 | # two, but pretty much all the existing code assume |
|
1027 | # two, but pretty much all the existing code assume | |
1028 | # wlock is not needed so we keep them excluded for |
|
1028 | # wlock is not needed so we keep them excluded for | |
1029 | # now. |
|
1029 | # now. | |
1030 | b'hgrc', |
|
1030 | b'hgrc', | |
1031 | b'requires', |
|
1031 | b'requires', | |
1032 | # XXX cache is a complicatged business someone |
|
1032 | # XXX cache is a complicatged business someone | |
1033 | # should investigate this in depth at some point |
|
1033 | # should investigate this in depth at some point | |
1034 | b'cache/', |
|
1034 | b'cache/', | |
1035 | # XXX shouldn't be dirstate covered by the wlock? |
|
1035 | # XXX shouldn't be dirstate covered by the wlock? | |
1036 | b'dirstate', |
|
1036 | b'dirstate', | |
1037 | # XXX bisect was still a bit too messy at the time |
|
1037 | # XXX bisect was still a bit too messy at the time | |
1038 | # this changeset was introduced. Someone should fix |
|
1038 | # this changeset was introduced. Someone should fix | |
1039 | # the remainig bit and drop this line |
|
1039 | # the remainig bit and drop this line | |
1040 | b'bisect.state', |
|
1040 | b'bisect.state', | |
1041 | } |
|
1041 | } | |
1042 |
|
1042 | |||
1043 | def __init__( |
|
1043 | def __init__( | |
1044 | self, |
|
1044 | self, | |
1045 | baseui, |
|
1045 | baseui, | |
1046 | ui, |
|
1046 | ui, | |
1047 | origroot, |
|
1047 | origroot, | |
1048 | wdirvfs, |
|
1048 | wdirvfs, | |
1049 | hgvfs, |
|
1049 | hgvfs, | |
1050 | requirements, |
|
1050 | requirements, | |
1051 | supportedrequirements, |
|
1051 | supportedrequirements, | |
1052 | sharedpath, |
|
1052 | sharedpath, | |
1053 | store, |
|
1053 | store, | |
1054 | cachevfs, |
|
1054 | cachevfs, | |
1055 | wcachevfs, |
|
1055 | wcachevfs, | |
1056 | features, |
|
1056 | features, | |
1057 | intents=None, |
|
1057 | intents=None, | |
1058 | ): |
|
1058 | ): | |
1059 | """Create a new local repository instance. |
|
1059 | """Create a new local repository instance. | |
1060 |
|
1060 | |||
1061 | Most callers should use ``hg.repository()``, ``localrepo.instance()``, |
|
1061 | Most callers should use ``hg.repository()``, ``localrepo.instance()``, | |
1062 | or ``localrepo.makelocalrepository()`` for obtaining a new repository |
|
1062 | or ``localrepo.makelocalrepository()`` for obtaining a new repository | |
1063 | object. |
|
1063 | object. | |
1064 |
|
1064 | |||
1065 | Arguments: |
|
1065 | Arguments: | |
1066 |
|
1066 | |||
1067 | baseui |
|
1067 | baseui | |
1068 | ``ui.ui`` instance that ``ui`` argument was based off of. |
|
1068 | ``ui.ui`` instance that ``ui`` argument was based off of. | |
1069 |
|
1069 | |||
1070 | ui |
|
1070 | ui | |
1071 | ``ui.ui`` instance for use by the repository. |
|
1071 | ``ui.ui`` instance for use by the repository. | |
1072 |
|
1072 | |||
1073 | origroot |
|
1073 | origroot | |
1074 | ``bytes`` path to working directory root of this repository. |
|
1074 | ``bytes`` path to working directory root of this repository. | |
1075 |
|
1075 | |||
1076 | wdirvfs |
|
1076 | wdirvfs | |
1077 | ``vfs.vfs`` rooted at the working directory. |
|
1077 | ``vfs.vfs`` rooted at the working directory. | |
1078 |
|
1078 | |||
1079 | hgvfs |
|
1079 | hgvfs | |
1080 | ``vfs.vfs`` rooted at .hg/ |
|
1080 | ``vfs.vfs`` rooted at .hg/ | |
1081 |
|
1081 | |||
1082 | requirements |
|
1082 | requirements | |
1083 | ``set`` of bytestrings representing repository opening requirements. |
|
1083 | ``set`` of bytestrings representing repository opening requirements. | |
1084 |
|
1084 | |||
1085 | supportedrequirements |
|
1085 | supportedrequirements | |
1086 | ``set`` of bytestrings representing repository requirements that we |
|
1086 | ``set`` of bytestrings representing repository requirements that we | |
1087 | know how to open. May be a supetset of ``requirements``. |
|
1087 | know how to open. May be a supetset of ``requirements``. | |
1088 |
|
1088 | |||
1089 | sharedpath |
|
1089 | sharedpath | |
1090 | ``bytes`` Defining path to storage base directory. Points to a |
|
1090 | ``bytes`` Defining path to storage base directory. Points to a | |
1091 | ``.hg/`` directory somewhere. |
|
1091 | ``.hg/`` directory somewhere. | |
1092 |
|
1092 | |||
1093 | store |
|
1093 | store | |
1094 | ``store.basicstore`` (or derived) instance providing access to |
|
1094 | ``store.basicstore`` (or derived) instance providing access to | |
1095 | versioned storage. |
|
1095 | versioned storage. | |
1096 |
|
1096 | |||
1097 | cachevfs |
|
1097 | cachevfs | |
1098 | ``vfs.vfs`` used for cache files. |
|
1098 | ``vfs.vfs`` used for cache files. | |
1099 |
|
1099 | |||
1100 | wcachevfs |
|
1100 | wcachevfs | |
1101 | ``vfs.vfs`` used for cache files related to the working copy. |
|
1101 | ``vfs.vfs`` used for cache files related to the working copy. | |
1102 |
|
1102 | |||
1103 | features |
|
1103 | features | |
1104 | ``set`` of bytestrings defining features/capabilities of this |
|
1104 | ``set`` of bytestrings defining features/capabilities of this | |
1105 | instance. |
|
1105 | instance. | |
1106 |
|
1106 | |||
1107 | intents |
|
1107 | intents | |
1108 | ``set`` of system strings indicating what this repo will be used |
|
1108 | ``set`` of system strings indicating what this repo will be used | |
1109 | for. |
|
1109 | for. | |
1110 | """ |
|
1110 | """ | |
1111 | self.baseui = baseui |
|
1111 | self.baseui = baseui | |
1112 | self.ui = ui |
|
1112 | self.ui = ui | |
1113 | self.origroot = origroot |
|
1113 | self.origroot = origroot | |
1114 | # vfs rooted at working directory. |
|
1114 | # vfs rooted at working directory. | |
1115 | self.wvfs = wdirvfs |
|
1115 | self.wvfs = wdirvfs | |
1116 | self.root = wdirvfs.base |
|
1116 | self.root = wdirvfs.base | |
1117 | # vfs rooted at .hg/. Used to access most non-store paths. |
|
1117 | # vfs rooted at .hg/. Used to access most non-store paths. | |
1118 | self.vfs = hgvfs |
|
1118 | self.vfs = hgvfs | |
1119 | self.path = hgvfs.base |
|
1119 | self.path = hgvfs.base | |
1120 | self.requirements = requirements |
|
1120 | self.requirements = requirements | |
1121 | self.supported = supportedrequirements |
|
1121 | self.supported = supportedrequirements | |
1122 | self.sharedpath = sharedpath |
|
1122 | self.sharedpath = sharedpath | |
1123 | self.store = store |
|
1123 | self.store = store | |
1124 | self.cachevfs = cachevfs |
|
1124 | self.cachevfs = cachevfs | |
1125 | self.wcachevfs = wcachevfs |
|
1125 | self.wcachevfs = wcachevfs | |
1126 | self.features = features |
|
1126 | self.features = features | |
1127 |
|
1127 | |||
1128 | self.filtername = None |
|
1128 | self.filtername = None | |
1129 |
|
1129 | |||
1130 | if self.ui.configbool(b'devel', b'all-warnings') or self.ui.configbool( |
|
1130 | if self.ui.configbool(b'devel', b'all-warnings') or self.ui.configbool( | |
1131 | b'devel', b'check-locks' |
|
1131 | b'devel', b'check-locks' | |
1132 | ): |
|
1132 | ): | |
1133 | self.vfs.audit = self._getvfsward(self.vfs.audit) |
|
1133 | self.vfs.audit = self._getvfsward(self.vfs.audit) | |
1134 | # A list of callback to shape the phase if no data were found. |
|
1134 | # A list of callback to shape the phase if no data were found. | |
1135 | # Callback are in the form: func(repo, roots) --> processed root. |
|
1135 | # Callback are in the form: func(repo, roots) --> processed root. | |
1136 | # This list it to be filled by extension during repo setup |
|
1136 | # This list it to be filled by extension during repo setup | |
1137 | self._phasedefaults = [] |
|
1137 | self._phasedefaults = [] | |
1138 |
|
1138 | |||
1139 | color.setup(self.ui) |
|
1139 | color.setup(self.ui) | |
1140 |
|
1140 | |||
1141 | self.spath = self.store.path |
|
1141 | self.spath = self.store.path | |
1142 | self.svfs = self.store.vfs |
|
1142 | self.svfs = self.store.vfs | |
1143 | self.sjoin = self.store.join |
|
1143 | self.sjoin = self.store.join | |
1144 | if self.ui.configbool(b'devel', b'all-warnings') or self.ui.configbool( |
|
1144 | if self.ui.configbool(b'devel', b'all-warnings') or self.ui.configbool( | |
1145 | b'devel', b'check-locks' |
|
1145 | b'devel', b'check-locks' | |
1146 | ): |
|
1146 | ): | |
1147 | if util.safehasattr(self.svfs, b'vfs'): # this is filtervfs |
|
1147 | if util.safehasattr(self.svfs, b'vfs'): # this is filtervfs | |
1148 | self.svfs.vfs.audit = self._getsvfsward(self.svfs.vfs.audit) |
|
1148 | self.svfs.vfs.audit = self._getsvfsward(self.svfs.vfs.audit) | |
1149 | else: # standard vfs |
|
1149 | else: # standard vfs | |
1150 | self.svfs.audit = self._getsvfsward(self.svfs.audit) |
|
1150 | self.svfs.audit = self._getsvfsward(self.svfs.audit) | |
1151 |
|
1151 | |||
1152 | self._dirstatevalidatewarned = False |
|
1152 | self._dirstatevalidatewarned = False | |
1153 |
|
1153 | |||
1154 | self._branchcaches = branchmap.BranchMapCache() |
|
1154 | self._branchcaches = branchmap.BranchMapCache() | |
1155 | self._revbranchcache = None |
|
1155 | self._revbranchcache = None | |
1156 | self._filterpats = {} |
|
1156 | self._filterpats = {} | |
1157 | self._datafilters = {} |
|
1157 | self._datafilters = {} | |
1158 | self._transref = self._lockref = self._wlockref = None |
|
1158 | self._transref = self._lockref = self._wlockref = None | |
1159 |
|
1159 | |||
1160 | # A cache for various files under .hg/ that tracks file changes, |
|
1160 | # A cache for various files under .hg/ that tracks file changes, | |
1161 | # (used by the filecache decorator) |
|
1161 | # (used by the filecache decorator) | |
1162 | # |
|
1162 | # | |
1163 | # Maps a property name to its util.filecacheentry |
|
1163 | # Maps a property name to its util.filecacheentry | |
1164 | self._filecache = {} |
|
1164 | self._filecache = {} | |
1165 |
|
1165 | |||
1166 | # hold sets of revision to be filtered |
|
1166 | # hold sets of revision to be filtered | |
1167 | # should be cleared when something might have changed the filter value: |
|
1167 | # should be cleared when something might have changed the filter value: | |
1168 | # - new changesets, |
|
1168 | # - new changesets, | |
1169 | # - phase change, |
|
1169 | # - phase change, | |
1170 | # - new obsolescence marker, |
|
1170 | # - new obsolescence marker, | |
1171 | # - working directory parent change, |
|
1171 | # - working directory parent change, | |
1172 | # - bookmark changes |
|
1172 | # - bookmark changes | |
1173 | self.filteredrevcache = {} |
|
1173 | self.filteredrevcache = {} | |
1174 |
|
1174 | |||
1175 | # post-dirstate-status hooks |
|
1175 | # post-dirstate-status hooks | |
1176 | self._postdsstatus = [] |
|
1176 | self._postdsstatus = [] | |
1177 |
|
1177 | |||
1178 | # generic mapping between names and nodes |
|
1178 | # generic mapping between names and nodes | |
1179 | self.names = namespaces.namespaces() |
|
1179 | self.names = namespaces.namespaces() | |
1180 |
|
1180 | |||
1181 | # Key to signature value. |
|
1181 | # Key to signature value. | |
1182 | self._sparsesignaturecache = {} |
|
1182 | self._sparsesignaturecache = {} | |
1183 | # Signature to cached matcher instance. |
|
1183 | # Signature to cached matcher instance. | |
1184 | self._sparsematchercache = {} |
|
1184 | self._sparsematchercache = {} | |
1185 |
|
1185 | |||
1186 | self._extrafilterid = repoview.extrafilter(ui) |
|
1186 | self._extrafilterid = repoview.extrafilter(ui) | |
1187 |
|
1187 | |||
1188 | self.filecopiesmode = None |
|
1188 | self.filecopiesmode = None | |
1189 | if COPIESSDC_REQUIREMENT in self.requirements: |
|
1189 | if COPIESSDC_REQUIREMENT in self.requirements: | |
1190 | self.filecopiesmode = b'changeset-sidedata' |
|
1190 | self.filecopiesmode = b'changeset-sidedata' | |
1191 |
|
1191 | |||
1192 | def _getvfsward(self, origfunc): |
|
1192 | def _getvfsward(self, origfunc): | |
1193 | """build a ward for self.vfs""" |
|
1193 | """build a ward for self.vfs""" | |
1194 | rref = weakref.ref(self) |
|
1194 | rref = weakref.ref(self) | |
1195 |
|
1195 | |||
1196 | def checkvfs(path, mode=None): |
|
1196 | def checkvfs(path, mode=None): | |
1197 | ret = origfunc(path, mode=mode) |
|
1197 | ret = origfunc(path, mode=mode) | |
1198 | repo = rref() |
|
1198 | repo = rref() | |
1199 | if ( |
|
1199 | if ( | |
1200 | repo is None |
|
1200 | repo is None | |
1201 | or not util.safehasattr(repo, b'_wlockref') |
|
1201 | or not util.safehasattr(repo, b'_wlockref') | |
1202 | or not util.safehasattr(repo, b'_lockref') |
|
1202 | or not util.safehasattr(repo, b'_lockref') | |
1203 | ): |
|
1203 | ): | |
1204 | return |
|
1204 | return | |
1205 | if mode in (None, b'r', b'rb'): |
|
1205 | if mode in (None, b'r', b'rb'): | |
1206 | return |
|
1206 | return | |
1207 | if path.startswith(repo.path): |
|
1207 | if path.startswith(repo.path): | |
1208 | # truncate name relative to the repository (.hg) |
|
1208 | # truncate name relative to the repository (.hg) | |
1209 | path = path[len(repo.path) + 1 :] |
|
1209 | path = path[len(repo.path) + 1 :] | |
1210 | if path.startswith(b'cache/'): |
|
1210 | if path.startswith(b'cache/'): | |
1211 | msg = b'accessing cache with vfs instead of cachevfs: "%s"' |
|
1211 | msg = b'accessing cache with vfs instead of cachevfs: "%s"' | |
1212 | repo.ui.develwarn(msg % path, stacklevel=3, config=b"cache-vfs") |
|
1212 | repo.ui.develwarn(msg % path, stacklevel=3, config=b"cache-vfs") | |
1213 | if path.startswith(b'journal.') or path.startswith(b'undo.'): |
|
1213 | if path.startswith(b'journal.') or path.startswith(b'undo.'): | |
1214 | # journal is covered by 'lock' |
|
1214 | # journal is covered by 'lock' | |
1215 | if repo._currentlock(repo._lockref) is None: |
|
1215 | if repo._currentlock(repo._lockref) is None: | |
1216 | repo.ui.develwarn( |
|
1216 | repo.ui.develwarn( | |
1217 | b'write with no lock: "%s"' % path, |
|
1217 | b'write with no lock: "%s"' % path, | |
1218 | stacklevel=3, |
|
1218 | stacklevel=3, | |
1219 | config=b'check-locks', |
|
1219 | config=b'check-locks', | |
1220 | ) |
|
1220 | ) | |
1221 | elif repo._currentlock(repo._wlockref) is None: |
|
1221 | elif repo._currentlock(repo._wlockref) is None: | |
1222 | # rest of vfs files are covered by 'wlock' |
|
1222 | # rest of vfs files are covered by 'wlock' | |
1223 | # |
|
1223 | # | |
1224 | # exclude special files |
|
1224 | # exclude special files | |
1225 | for prefix in self._wlockfreeprefix: |
|
1225 | for prefix in self._wlockfreeprefix: | |
1226 | if path.startswith(prefix): |
|
1226 | if path.startswith(prefix): | |
1227 | return |
|
1227 | return | |
1228 | repo.ui.develwarn( |
|
1228 | repo.ui.develwarn( | |
1229 | b'write with no wlock: "%s"' % path, |
|
1229 | b'write with no wlock: "%s"' % path, | |
1230 | stacklevel=3, |
|
1230 | stacklevel=3, | |
1231 | config=b'check-locks', |
|
1231 | config=b'check-locks', | |
1232 | ) |
|
1232 | ) | |
1233 | return ret |
|
1233 | return ret | |
1234 |
|
1234 | |||
1235 | return checkvfs |
|
1235 | return checkvfs | |
1236 |
|
1236 | |||
1237 | def _getsvfsward(self, origfunc): |
|
1237 | def _getsvfsward(self, origfunc): | |
1238 | """build a ward for self.svfs""" |
|
1238 | """build a ward for self.svfs""" | |
1239 | rref = weakref.ref(self) |
|
1239 | rref = weakref.ref(self) | |
1240 |
|
1240 | |||
1241 | def checksvfs(path, mode=None): |
|
1241 | def checksvfs(path, mode=None): | |
1242 | ret = origfunc(path, mode=mode) |
|
1242 | ret = origfunc(path, mode=mode) | |
1243 | repo = rref() |
|
1243 | repo = rref() | |
1244 | if repo is None or not util.safehasattr(repo, b'_lockref'): |
|
1244 | if repo is None or not util.safehasattr(repo, b'_lockref'): | |
1245 | return |
|
1245 | return | |
1246 | if mode in (None, b'r', b'rb'): |
|
1246 | if mode in (None, b'r', b'rb'): | |
1247 | return |
|
1247 | return | |
1248 | if path.startswith(repo.sharedpath): |
|
1248 | if path.startswith(repo.sharedpath): | |
1249 | # truncate name relative to the repository (.hg) |
|
1249 | # truncate name relative to the repository (.hg) | |
1250 | path = path[len(repo.sharedpath) + 1 :] |
|
1250 | path = path[len(repo.sharedpath) + 1 :] | |
1251 | if repo._currentlock(repo._lockref) is None: |
|
1251 | if repo._currentlock(repo._lockref) is None: | |
1252 | repo.ui.develwarn( |
|
1252 | repo.ui.develwarn( | |
1253 | b'write with no lock: "%s"' % path, stacklevel=4 |
|
1253 | b'write with no lock: "%s"' % path, stacklevel=4 | |
1254 | ) |
|
1254 | ) | |
1255 | return ret |
|
1255 | return ret | |
1256 |
|
1256 | |||
1257 | return checksvfs |
|
1257 | return checksvfs | |
1258 |
|
1258 | |||
1259 | def close(self): |
|
1259 | def close(self): | |
1260 | self._writecaches() |
|
1260 | self._writecaches() | |
1261 |
|
1261 | |||
1262 | def _writecaches(self): |
|
1262 | def _writecaches(self): | |
1263 | if self._revbranchcache: |
|
1263 | if self._revbranchcache: | |
1264 | self._revbranchcache.write() |
|
1264 | self._revbranchcache.write() | |
1265 |
|
1265 | |||
1266 | def _restrictcapabilities(self, caps): |
|
1266 | def _restrictcapabilities(self, caps): | |
1267 | if self.ui.configbool(b'experimental', b'bundle2-advertise'): |
|
1267 | if self.ui.configbool(b'experimental', b'bundle2-advertise'): | |
1268 | caps = set(caps) |
|
1268 | caps = set(caps) | |
1269 | capsblob = bundle2.encodecaps( |
|
1269 | capsblob = bundle2.encodecaps( | |
1270 | bundle2.getrepocaps(self, role=b'client') |
|
1270 | bundle2.getrepocaps(self, role=b'client') | |
1271 | ) |
|
1271 | ) | |
1272 | caps.add(b'bundle2=' + urlreq.quote(capsblob)) |
|
1272 | caps.add(b'bundle2=' + urlreq.quote(capsblob)) | |
1273 | return caps |
|
1273 | return caps | |
1274 |
|
1274 | |||
1275 | def _writerequirements(self): |
|
1275 | def _writerequirements(self): | |
1276 | scmutil.writerequires(self.vfs, self.requirements) |
|
1276 | scmutil.writerequires(self.vfs, self.requirements) | |
1277 |
|
1277 | |||
1278 | # Don't cache auditor/nofsauditor, or you'll end up with reference cycle: |
|
1278 | # Don't cache auditor/nofsauditor, or you'll end up with reference cycle: | |
1279 | # self -> auditor -> self._checknested -> self |
|
1279 | # self -> auditor -> self._checknested -> self | |
1280 |
|
1280 | |||
1281 | @property |
|
1281 | @property | |
1282 | def auditor(self): |
|
1282 | def auditor(self): | |
1283 | # This is only used by context.workingctx.match in order to |
|
1283 | # This is only used by context.workingctx.match in order to | |
1284 | # detect files in subrepos. |
|
1284 | # detect files in subrepos. | |
1285 | return pathutil.pathauditor(self.root, callback=self._checknested) |
|
1285 | return pathutil.pathauditor(self.root, callback=self._checknested) | |
1286 |
|
1286 | |||
1287 | @property |
|
1287 | @property | |
1288 | def nofsauditor(self): |
|
1288 | def nofsauditor(self): | |
1289 | # This is only used by context.basectx.match in order to detect |
|
1289 | # This is only used by context.basectx.match in order to detect | |
1290 | # files in subrepos. |
|
1290 | # files in subrepos. | |
1291 | return pathutil.pathauditor( |
|
1291 | return pathutil.pathauditor( | |
1292 | self.root, callback=self._checknested, realfs=False, cached=True |
|
1292 | self.root, callback=self._checknested, realfs=False, cached=True | |
1293 | ) |
|
1293 | ) | |
1294 |
|
1294 | |||
1295 | def _checknested(self, path): |
|
1295 | def _checknested(self, path): | |
1296 | """Determine if path is a legal nested repository.""" |
|
1296 | """Determine if path is a legal nested repository.""" | |
1297 | if not path.startswith(self.root): |
|
1297 | if not path.startswith(self.root): | |
1298 | return False |
|
1298 | return False | |
1299 | subpath = path[len(self.root) + 1 :] |
|
1299 | subpath = path[len(self.root) + 1 :] | |
1300 | normsubpath = util.pconvert(subpath) |
|
1300 | normsubpath = util.pconvert(subpath) | |
1301 |
|
1301 | |||
1302 | # XXX: Checking against the current working copy is wrong in |
|
1302 | # XXX: Checking against the current working copy is wrong in | |
1303 | # the sense that it can reject things like |
|
1303 | # the sense that it can reject things like | |
1304 | # |
|
1304 | # | |
1305 | # $ hg cat -r 10 sub/x.txt |
|
1305 | # $ hg cat -r 10 sub/x.txt | |
1306 | # |
|
1306 | # | |
1307 | # if sub/ is no longer a subrepository in the working copy |
|
1307 | # if sub/ is no longer a subrepository in the working copy | |
1308 | # parent revision. |
|
1308 | # parent revision. | |
1309 | # |
|
1309 | # | |
1310 | # However, it can of course also allow things that would have |
|
1310 | # However, it can of course also allow things that would have | |
1311 | # been rejected before, such as the above cat command if sub/ |
|
1311 | # been rejected before, such as the above cat command if sub/ | |
1312 | # is a subrepository now, but was a normal directory before. |
|
1312 | # is a subrepository now, but was a normal directory before. | |
1313 | # The old path auditor would have rejected by mistake since it |
|
1313 | # The old path auditor would have rejected by mistake since it | |
1314 | # panics when it sees sub/.hg/. |
|
1314 | # panics when it sees sub/.hg/. | |
1315 | # |
|
1315 | # | |
1316 | # All in all, checking against the working copy seems sensible |
|
1316 | # All in all, checking against the working copy seems sensible | |
1317 | # since we want to prevent access to nested repositories on |
|
1317 | # since we want to prevent access to nested repositories on | |
1318 | # the filesystem *now*. |
|
1318 | # the filesystem *now*. | |
1319 | ctx = self[None] |
|
1319 | ctx = self[None] | |
1320 | parts = util.splitpath(subpath) |
|
1320 | parts = util.splitpath(subpath) | |
1321 | while parts: |
|
1321 | while parts: | |
1322 | prefix = b'/'.join(parts) |
|
1322 | prefix = b'/'.join(parts) | |
1323 | if prefix in ctx.substate: |
|
1323 | if prefix in ctx.substate: | |
1324 | if prefix == normsubpath: |
|
1324 | if prefix == normsubpath: | |
1325 | return True |
|
1325 | return True | |
1326 | else: |
|
1326 | else: | |
1327 | sub = ctx.sub(prefix) |
|
1327 | sub = ctx.sub(prefix) | |
1328 | return sub.checknested(subpath[len(prefix) + 1 :]) |
|
1328 | return sub.checknested(subpath[len(prefix) + 1 :]) | |
1329 | else: |
|
1329 | else: | |
1330 | parts.pop() |
|
1330 | parts.pop() | |
1331 | return False |
|
1331 | return False | |
1332 |
|
1332 | |||
1333 | def peer(self): |
|
1333 | def peer(self): | |
1334 | return localpeer(self) # not cached to avoid reference cycle |
|
1334 | return localpeer(self) # not cached to avoid reference cycle | |
1335 |
|
1335 | |||
1336 | def unfiltered(self): |
|
1336 | def unfiltered(self): | |
1337 | """Return unfiltered version of the repository |
|
1337 | """Return unfiltered version of the repository | |
1338 |
|
1338 | |||
1339 | Intended to be overwritten by filtered repo.""" |
|
1339 | Intended to be overwritten by filtered repo.""" | |
1340 | return self |
|
1340 | return self | |
1341 |
|
1341 | |||
1342 | def filtered(self, name, visibilityexceptions=None): |
|
1342 | def filtered(self, name, visibilityexceptions=None): | |
1343 | """Return a filtered version of a repository |
|
1343 | """Return a filtered version of a repository | |
1344 |
|
1344 | |||
1345 | The `name` parameter is the identifier of the requested view. This |
|
1345 | The `name` parameter is the identifier of the requested view. This | |
1346 | will return a repoview object set "exactly" to the specified view. |
|
1346 | will return a repoview object set "exactly" to the specified view. | |
1347 |
|
1347 | |||
1348 | This function does not apply recursive filtering to a repository. For |
|
1348 | This function does not apply recursive filtering to a repository. For | |
1349 | example calling `repo.filtered("served")` will return a repoview using |
|
1349 | example calling `repo.filtered("served")` will return a repoview using | |
1350 | the "served" view, regardless of the initial view used by `repo`. |
|
1350 | the "served" view, regardless of the initial view used by `repo`. | |
1351 |
|
1351 | |||
1352 | In other word, there is always only one level of `repoview` "filtering". |
|
1352 | In other word, there is always only one level of `repoview` "filtering". | |
1353 | """ |
|
1353 | """ | |
1354 | if self._extrafilterid is not None and b'%' not in name: |
|
1354 | if self._extrafilterid is not None and b'%' not in name: | |
1355 | name = name + b'%' + self._extrafilterid |
|
1355 | name = name + b'%' + self._extrafilterid | |
1356 |
|
1356 | |||
1357 | cls = repoview.newtype(self.unfiltered().__class__) |
|
1357 | cls = repoview.newtype(self.unfiltered().__class__) | |
1358 | return cls(self, name, visibilityexceptions) |
|
1358 | return cls(self, name, visibilityexceptions) | |
1359 |
|
1359 | |||
1360 | @mixedrepostorecache( |
|
1360 | @mixedrepostorecache( | |
1361 | (b'bookmarks', b'plain'), |
|
1361 | (b'bookmarks', b'plain'), | |
1362 | (b'bookmarks.current', b'plain'), |
|
1362 | (b'bookmarks.current', b'plain'), | |
1363 | (b'bookmarks', b''), |
|
1363 | (b'bookmarks', b''), | |
1364 | (b'00changelog.i', b''), |
|
1364 | (b'00changelog.i', b''), | |
1365 | ) |
|
1365 | ) | |
1366 | def _bookmarks(self): |
|
1366 | def _bookmarks(self): | |
1367 | # Since the multiple files involved in the transaction cannot be |
|
1367 | # Since the multiple files involved in the transaction cannot be | |
1368 | # written atomically (with current repository format), there is a race |
|
1368 | # written atomically (with current repository format), there is a race | |
1369 | # condition here. |
|
1369 | # condition here. | |
1370 | # |
|
1370 | # | |
1371 | # 1) changelog content A is read |
|
1371 | # 1) changelog content A is read | |
1372 | # 2) outside transaction update changelog to content B |
|
1372 | # 2) outside transaction update changelog to content B | |
1373 | # 3) outside transaction update bookmark file referring to content B |
|
1373 | # 3) outside transaction update bookmark file referring to content B | |
1374 | # 4) bookmarks file content is read and filtered against changelog-A |
|
1374 | # 4) bookmarks file content is read and filtered against changelog-A | |
1375 | # |
|
1375 | # | |
1376 | # When this happens, bookmarks against nodes missing from A are dropped. |
|
1376 | # When this happens, bookmarks against nodes missing from A are dropped. | |
1377 | # |
|
1377 | # | |
1378 | # Having this happening during read is not great, but it become worse |
|
1378 | # Having this happening during read is not great, but it become worse | |
1379 | # when this happen during write because the bookmarks to the "unknown" |
|
1379 | # when this happen during write because the bookmarks to the "unknown" | |
1380 | # nodes will be dropped for good. However, writes happen within locks. |
|
1380 | # nodes will be dropped for good. However, writes happen within locks. | |
1381 | # This locking makes it possible to have a race free consistent read. |
|
1381 | # This locking makes it possible to have a race free consistent read. | |
1382 | # For this purpose data read from disc before locking are |
|
1382 | # For this purpose data read from disc before locking are | |
1383 | # "invalidated" right after the locks are taken. This invalidations are |
|
1383 | # "invalidated" right after the locks are taken. This invalidations are | |
1384 | # "light", the `filecache` mechanism keep the data in memory and will |
|
1384 | # "light", the `filecache` mechanism keep the data in memory and will | |
1385 | # reuse them if the underlying files did not changed. Not parsing the |
|
1385 | # reuse them if the underlying files did not changed. Not parsing the | |
1386 | # same data multiple times helps performances. |
|
1386 | # same data multiple times helps performances. | |
1387 | # |
|
1387 | # | |
1388 | # Unfortunately in the case describe above, the files tracked by the |
|
1388 | # Unfortunately in the case describe above, the files tracked by the | |
1389 | # bookmarks file cache might not have changed, but the in-memory |
|
1389 | # bookmarks file cache might not have changed, but the in-memory | |
1390 | # content is still "wrong" because we used an older changelog content |
|
1390 | # content is still "wrong" because we used an older changelog content | |
1391 | # to process the on-disk data. So after locking, the changelog would be |
|
1391 | # to process the on-disk data. So after locking, the changelog would be | |
1392 | # refreshed but `_bookmarks` would be preserved. |
|
1392 | # refreshed but `_bookmarks` would be preserved. | |
1393 | # Adding `00changelog.i` to the list of tracked file is not |
|
1393 | # Adding `00changelog.i` to the list of tracked file is not | |
1394 | # enough, because at the time we build the content for `_bookmarks` in |
|
1394 | # enough, because at the time we build the content for `_bookmarks` in | |
1395 | # (4), the changelog file has already diverged from the content used |
|
1395 | # (4), the changelog file has already diverged from the content used | |
1396 | # for loading `changelog` in (1) |
|
1396 | # for loading `changelog` in (1) | |
1397 | # |
|
1397 | # | |
1398 | # To prevent the issue, we force the changelog to be explicitly |
|
1398 | # To prevent the issue, we force the changelog to be explicitly | |
1399 | # reloaded while computing `_bookmarks`. The data race can still happen |
|
1399 | # reloaded while computing `_bookmarks`. The data race can still happen | |
1400 | # without the lock (with a narrower window), but it would no longer go |
|
1400 | # without the lock (with a narrower window), but it would no longer go | |
1401 | # undetected during the lock time refresh. |
|
1401 | # undetected during the lock time refresh. | |
1402 | # |
|
1402 | # | |
1403 | # The new schedule is as follow |
|
1403 | # The new schedule is as follow | |
1404 | # |
|
1404 | # | |
1405 | # 1) filecache logic detect that `_bookmarks` needs to be computed |
|
1405 | # 1) filecache logic detect that `_bookmarks` needs to be computed | |
1406 | # 2) cachestat for `bookmarks` and `changelog` are captured (for book) |
|
1406 | # 2) cachestat for `bookmarks` and `changelog` are captured (for book) | |
1407 | # 3) We force `changelog` filecache to be tested |
|
1407 | # 3) We force `changelog` filecache to be tested | |
1408 | # 4) cachestat for `changelog` are captured (for changelog) |
|
1408 | # 4) cachestat for `changelog` are captured (for changelog) | |
1409 | # 5) `_bookmarks` is computed and cached |
|
1409 | # 5) `_bookmarks` is computed and cached | |
1410 | # |
|
1410 | # | |
1411 | # The step in (3) ensure we have a changelog at least as recent as the |
|
1411 | # The step in (3) ensure we have a changelog at least as recent as the | |
1412 | # cache stat computed in (1). As a result at locking time: |
|
1412 | # cache stat computed in (1). As a result at locking time: | |
1413 | # * if the changelog did not changed since (1) -> we can reuse the data |
|
1413 | # * if the changelog did not changed since (1) -> we can reuse the data | |
1414 | # * otherwise -> the bookmarks get refreshed. |
|
1414 | # * otherwise -> the bookmarks get refreshed. | |
1415 | self._refreshchangelog() |
|
1415 | self._refreshchangelog() | |
1416 | return bookmarks.bmstore(self) |
|
1416 | return bookmarks.bmstore(self) | |
1417 |
|
1417 | |||
1418 | def _refreshchangelog(self): |
|
1418 | def _refreshchangelog(self): | |
1419 | """make sure the in memory changelog match the on-disk one""" |
|
1419 | """make sure the in memory changelog match the on-disk one""" | |
1420 | if 'changelog' in vars(self) and self.currenttransaction() is None: |
|
1420 | if 'changelog' in vars(self) and self.currenttransaction() is None: | |
1421 | del self.changelog |
|
1421 | del self.changelog | |
1422 |
|
1422 | |||
1423 | @property |
|
1423 | @property | |
1424 | def _activebookmark(self): |
|
1424 | def _activebookmark(self): | |
1425 | return self._bookmarks.active |
|
1425 | return self._bookmarks.active | |
1426 |
|
1426 | |||
1427 | # _phasesets depend on changelog. what we need is to call |
|
1427 | # _phasesets depend on changelog. what we need is to call | |
1428 | # _phasecache.invalidate() if '00changelog.i' was changed, but it |
|
1428 | # _phasecache.invalidate() if '00changelog.i' was changed, but it | |
1429 | # can't be easily expressed in filecache mechanism. |
|
1429 | # can't be easily expressed in filecache mechanism. | |
1430 | @storecache(b'phaseroots', b'00changelog.i') |
|
1430 | @storecache(b'phaseroots', b'00changelog.i') | |
1431 | def _phasecache(self): |
|
1431 | def _phasecache(self): | |
1432 | return phases.phasecache(self, self._phasedefaults) |
|
1432 | return phases.phasecache(self, self._phasedefaults) | |
1433 |
|
1433 | |||
1434 | @storecache(b'obsstore') |
|
1434 | @storecache(b'obsstore') | |
1435 | def obsstore(self): |
|
1435 | def obsstore(self): | |
1436 | return obsolete.makestore(self.ui, self) |
|
1436 | return obsolete.makestore(self.ui, self) | |
1437 |
|
1437 | |||
1438 | @storecache(b'00changelog.i') |
|
1438 | @storecache(b'00changelog.i') | |
1439 | def changelog(self): |
|
1439 | def changelog(self): | |
1440 | return self.store.changelog(txnutil.mayhavepending(self.root)) |
|
1440 | return self.store.changelog(txnutil.mayhavepending(self.root)) | |
1441 |
|
1441 | |||
1442 | @storecache(b'00manifest.i') |
|
1442 | @storecache(b'00manifest.i') | |
1443 | def manifestlog(self): |
|
1443 | def manifestlog(self): | |
1444 | return self.store.manifestlog(self, self._storenarrowmatch) |
|
1444 | return self.store.manifestlog(self, self._storenarrowmatch) | |
1445 |
|
1445 | |||
1446 | @repofilecache(b'dirstate') |
|
1446 | @repofilecache(b'dirstate') | |
1447 | def dirstate(self): |
|
1447 | def dirstate(self): | |
1448 | return self._makedirstate() |
|
1448 | return self._makedirstate() | |
1449 |
|
1449 | |||
1450 | def _makedirstate(self): |
|
1450 | def _makedirstate(self): | |
1451 | """Extension point for wrapping the dirstate per-repo.""" |
|
1451 | """Extension point for wrapping the dirstate per-repo.""" | |
1452 | sparsematchfn = lambda: sparse.matcher(self) |
|
1452 | sparsematchfn = lambda: sparse.matcher(self) | |
1453 |
|
1453 | |||
1454 | return dirstate.dirstate( |
|
1454 | return dirstate.dirstate( | |
1455 | self.vfs, self.ui, self.root, self._dirstatevalidate, sparsematchfn |
|
1455 | self.vfs, self.ui, self.root, self._dirstatevalidate, sparsematchfn | |
1456 | ) |
|
1456 | ) | |
1457 |
|
1457 | |||
1458 | def _dirstatevalidate(self, node): |
|
1458 | def _dirstatevalidate(self, node): | |
1459 | try: |
|
1459 | try: | |
1460 | self.changelog.rev(node) |
|
1460 | self.changelog.rev(node) | |
1461 | return node |
|
1461 | return node | |
1462 | except error.LookupError: |
|
1462 | except error.LookupError: | |
1463 | if not self._dirstatevalidatewarned: |
|
1463 | if not self._dirstatevalidatewarned: | |
1464 | self._dirstatevalidatewarned = True |
|
1464 | self._dirstatevalidatewarned = True | |
1465 | self.ui.warn( |
|
1465 | self.ui.warn( | |
1466 | _(b"warning: ignoring unknown working parent %s!\n") |
|
1466 | _(b"warning: ignoring unknown working parent %s!\n") | |
1467 | % short(node) |
|
1467 | % short(node) | |
1468 | ) |
|
1468 | ) | |
1469 | return nullid |
|
1469 | return nullid | |
1470 |
|
1470 | |||
1471 | @storecache(narrowspec.FILENAME) |
|
1471 | @storecache(narrowspec.FILENAME) | |
1472 | def narrowpats(self): |
|
1472 | def narrowpats(self): | |
1473 | """matcher patterns for this repository's narrowspec |
|
1473 | """matcher patterns for this repository's narrowspec | |
1474 |
|
1474 | |||
1475 | A tuple of (includes, excludes). |
|
1475 | A tuple of (includes, excludes). | |
1476 | """ |
|
1476 | """ | |
1477 | return narrowspec.load(self) |
|
1477 | return narrowspec.load(self) | |
1478 |
|
1478 | |||
1479 | @storecache(narrowspec.FILENAME) |
|
1479 | @storecache(narrowspec.FILENAME) | |
1480 | def _storenarrowmatch(self): |
|
1480 | def _storenarrowmatch(self): | |
1481 | if repository.NARROW_REQUIREMENT not in self.requirements: |
|
1481 | if repository.NARROW_REQUIREMENT not in self.requirements: | |
1482 | return matchmod.always() |
|
1482 | return matchmod.always() | |
1483 | include, exclude = self.narrowpats |
|
1483 | include, exclude = self.narrowpats | |
1484 | return narrowspec.match(self.root, include=include, exclude=exclude) |
|
1484 | return narrowspec.match(self.root, include=include, exclude=exclude) | |
1485 |
|
1485 | |||
1486 | @storecache(narrowspec.FILENAME) |
|
1486 | @storecache(narrowspec.FILENAME) | |
1487 | def _narrowmatch(self): |
|
1487 | def _narrowmatch(self): | |
1488 | if repository.NARROW_REQUIREMENT not in self.requirements: |
|
1488 | if repository.NARROW_REQUIREMENT not in self.requirements: | |
1489 | return matchmod.always() |
|
1489 | return matchmod.always() | |
1490 | narrowspec.checkworkingcopynarrowspec(self) |
|
1490 | narrowspec.checkworkingcopynarrowspec(self) | |
1491 | include, exclude = self.narrowpats |
|
1491 | include, exclude = self.narrowpats | |
1492 | return narrowspec.match(self.root, include=include, exclude=exclude) |
|
1492 | return narrowspec.match(self.root, include=include, exclude=exclude) | |
1493 |
|
1493 | |||
1494 | def narrowmatch(self, match=None, includeexact=False): |
|
1494 | def narrowmatch(self, match=None, includeexact=False): | |
1495 | """matcher corresponding the the repo's narrowspec |
|
1495 | """matcher corresponding the the repo's narrowspec | |
1496 |
|
1496 | |||
1497 | If `match` is given, then that will be intersected with the narrow |
|
1497 | If `match` is given, then that will be intersected with the narrow | |
1498 | matcher. |
|
1498 | matcher. | |
1499 |
|
1499 | |||
1500 | If `includeexact` is True, then any exact matches from `match` will |
|
1500 | If `includeexact` is True, then any exact matches from `match` will | |
1501 | be included even if they're outside the narrowspec. |
|
1501 | be included even if they're outside the narrowspec. | |
1502 | """ |
|
1502 | """ | |
1503 | if match: |
|
1503 | if match: | |
1504 | if includeexact and not self._narrowmatch.always(): |
|
1504 | if includeexact and not self._narrowmatch.always(): | |
1505 | # do not exclude explicitly-specified paths so that they can |
|
1505 | # do not exclude explicitly-specified paths so that they can | |
1506 | # be warned later on |
|
1506 | # be warned later on | |
1507 | em = matchmod.exact(match.files()) |
|
1507 | em = matchmod.exact(match.files()) | |
1508 | nm = matchmod.unionmatcher([self._narrowmatch, em]) |
|
1508 | nm = matchmod.unionmatcher([self._narrowmatch, em]) | |
1509 | return matchmod.intersectmatchers(match, nm) |
|
1509 | return matchmod.intersectmatchers(match, nm) | |
1510 | return matchmod.intersectmatchers(match, self._narrowmatch) |
|
1510 | return matchmod.intersectmatchers(match, self._narrowmatch) | |
1511 | return self._narrowmatch |
|
1511 | return self._narrowmatch | |
1512 |
|
1512 | |||
1513 | def setnarrowpats(self, newincludes, newexcludes): |
|
1513 | def setnarrowpats(self, newincludes, newexcludes): | |
1514 | narrowspec.save(self, newincludes, newexcludes) |
|
1514 | narrowspec.save(self, newincludes, newexcludes) | |
1515 | self.invalidate(clearfilecache=True) |
|
1515 | self.invalidate(clearfilecache=True) | |
1516 |
|
1516 | |||
1517 | def __getitem__(self, changeid): |
|
1517 | def __getitem__(self, changeid): | |
1518 | if changeid is None: |
|
1518 | if changeid is None: | |
1519 | return context.workingctx(self) |
|
1519 | return context.workingctx(self) | |
1520 | if isinstance(changeid, context.basectx): |
|
1520 | if isinstance(changeid, context.basectx): | |
1521 | return changeid |
|
1521 | return changeid | |
1522 | if isinstance(changeid, slice): |
|
1522 | if isinstance(changeid, slice): | |
1523 | # wdirrev isn't contiguous so the slice shouldn't include it |
|
1523 | # wdirrev isn't contiguous so the slice shouldn't include it | |
1524 | return [ |
|
1524 | return [ | |
1525 | self[i] |
|
1525 | self[i] | |
1526 | for i in pycompat.xrange(*changeid.indices(len(self))) |
|
1526 | for i in pycompat.xrange(*changeid.indices(len(self))) | |
1527 | if i not in self.changelog.filteredrevs |
|
1527 | if i not in self.changelog.filteredrevs | |
1528 | ] |
|
1528 | ] | |
1529 | try: |
|
1529 | try: | |
1530 | if isinstance(changeid, int): |
|
1530 | if isinstance(changeid, int): | |
1531 | node = self.changelog.node(changeid) |
|
1531 | node = self.changelog.node(changeid) | |
1532 | rev = changeid |
|
1532 | rev = changeid | |
1533 | elif changeid == b'null': |
|
1533 | elif changeid == b'null': | |
1534 | node = nullid |
|
1534 | node = nullid | |
1535 | rev = nullrev |
|
1535 | rev = nullrev | |
1536 | elif changeid == b'tip': |
|
1536 | elif changeid == b'tip': | |
1537 | node = self.changelog.tip() |
|
1537 | node = self.changelog.tip() | |
1538 | rev = self.changelog.rev(node) |
|
1538 | rev = self.changelog.rev(node) | |
1539 | elif changeid == b'.': |
|
1539 | elif changeid == b'.': | |
1540 | # this is a hack to delay/avoid loading obsmarkers |
|
1540 | # this is a hack to delay/avoid loading obsmarkers | |
1541 | # when we know that '.' won't be hidden |
|
1541 | # when we know that '.' won't be hidden | |
1542 | node = self.dirstate.p1() |
|
1542 | node = self.dirstate.p1() | |
1543 | rev = self.unfiltered().changelog.rev(node) |
|
1543 | rev = self.unfiltered().changelog.rev(node) | |
1544 | elif len(changeid) == 20: |
|
1544 | elif len(changeid) == 20: | |
1545 | try: |
|
1545 | try: | |
1546 | node = changeid |
|
1546 | node = changeid | |
1547 | rev = self.changelog.rev(changeid) |
|
1547 | rev = self.changelog.rev(changeid) | |
1548 | except error.FilteredLookupError: |
|
1548 | except error.FilteredLookupError: | |
1549 | changeid = hex(changeid) # for the error message |
|
1549 | changeid = hex(changeid) # for the error message | |
1550 | raise |
|
1550 | raise | |
1551 | except LookupError: |
|
1551 | except LookupError: | |
1552 | # check if it might have come from damaged dirstate |
|
1552 | # check if it might have come from damaged dirstate | |
1553 | # |
|
1553 | # | |
1554 | # XXX we could avoid the unfiltered if we had a recognizable |
|
1554 | # XXX we could avoid the unfiltered if we had a recognizable | |
1555 | # exception for filtered changeset access |
|
1555 | # exception for filtered changeset access | |
1556 | if ( |
|
1556 | if ( | |
1557 | self.local() |
|
1557 | self.local() | |
1558 | and changeid in self.unfiltered().dirstate.parents() |
|
1558 | and changeid in self.unfiltered().dirstate.parents() | |
1559 | ): |
|
1559 | ): | |
1560 | msg = _(b"working directory has unknown parent '%s'!") |
|
1560 | msg = _(b"working directory has unknown parent '%s'!") | |
1561 | raise error.Abort(msg % short(changeid)) |
|
1561 | raise error.Abort(msg % short(changeid)) | |
1562 | changeid = hex(changeid) # for the error message |
|
1562 | changeid = hex(changeid) # for the error message | |
1563 | raise |
|
1563 | raise | |
1564 |
|
1564 | |||
1565 | elif len(changeid) == 40: |
|
1565 | elif len(changeid) == 40: | |
1566 | node = bin(changeid) |
|
1566 | node = bin(changeid) | |
1567 | rev = self.changelog.rev(node) |
|
1567 | rev = self.changelog.rev(node) | |
1568 | else: |
|
1568 | else: | |
1569 | raise error.ProgrammingError( |
|
1569 | raise error.ProgrammingError( | |
1570 | b"unsupported changeid '%s' of type %s" |
|
1570 | b"unsupported changeid '%s' of type %s" | |
1571 | % (changeid, type(changeid)) |
|
1571 | % (changeid, pycompat.sysstr(type(changeid))) | |
1572 | ) |
|
1572 | ) | |
1573 |
|
1573 | |||
1574 | return context.changectx(self, rev, node) |
|
1574 | return context.changectx(self, rev, node) | |
1575 |
|
1575 | |||
1576 | except (error.FilteredIndexError, error.FilteredLookupError): |
|
1576 | except (error.FilteredIndexError, error.FilteredLookupError): | |
1577 | raise error.FilteredRepoLookupError( |
|
1577 | raise error.FilteredRepoLookupError( | |
1578 | _(b"filtered revision '%s'") % pycompat.bytestr(changeid) |
|
1578 | _(b"filtered revision '%s'") % pycompat.bytestr(changeid) | |
1579 | ) |
|
1579 | ) | |
1580 | except (IndexError, LookupError): |
|
1580 | except (IndexError, LookupError): | |
1581 | raise error.RepoLookupError( |
|
1581 | raise error.RepoLookupError( | |
1582 | _(b"unknown revision '%s'") % pycompat.bytestr(changeid) |
|
1582 | _(b"unknown revision '%s'") % pycompat.bytestr(changeid) | |
1583 | ) |
|
1583 | ) | |
1584 | except error.WdirUnsupported: |
|
1584 | except error.WdirUnsupported: | |
1585 | return context.workingctx(self) |
|
1585 | return context.workingctx(self) | |
1586 |
|
1586 | |||
1587 | def __contains__(self, changeid): |
|
1587 | def __contains__(self, changeid): | |
1588 | """True if the given changeid exists |
|
1588 | """True if the given changeid exists | |
1589 |
|
1589 | |||
1590 | error.AmbiguousPrefixLookupError is raised if an ambiguous node |
|
1590 | error.AmbiguousPrefixLookupError is raised if an ambiguous node | |
1591 | specified. |
|
1591 | specified. | |
1592 | """ |
|
1592 | """ | |
1593 | try: |
|
1593 | try: | |
1594 | self[changeid] |
|
1594 | self[changeid] | |
1595 | return True |
|
1595 | return True | |
1596 | except error.RepoLookupError: |
|
1596 | except error.RepoLookupError: | |
1597 | return False |
|
1597 | return False | |
1598 |
|
1598 | |||
1599 | def __nonzero__(self): |
|
1599 | def __nonzero__(self): | |
1600 | return True |
|
1600 | return True | |
1601 |
|
1601 | |||
1602 | __bool__ = __nonzero__ |
|
1602 | __bool__ = __nonzero__ | |
1603 |
|
1603 | |||
1604 | def __len__(self): |
|
1604 | def __len__(self): | |
1605 | # no need to pay the cost of repoview.changelog |
|
1605 | # no need to pay the cost of repoview.changelog | |
1606 | unfi = self.unfiltered() |
|
1606 | unfi = self.unfiltered() | |
1607 | return len(unfi.changelog) |
|
1607 | return len(unfi.changelog) | |
1608 |
|
1608 | |||
1609 | def __iter__(self): |
|
1609 | def __iter__(self): | |
1610 | return iter(self.changelog) |
|
1610 | return iter(self.changelog) | |
1611 |
|
1611 | |||
1612 | def revs(self, expr, *args): |
|
1612 | def revs(self, expr, *args): | |
1613 | '''Find revisions matching a revset. |
|
1613 | '''Find revisions matching a revset. | |
1614 |
|
1614 | |||
1615 | The revset is specified as a string ``expr`` that may contain |
|
1615 | The revset is specified as a string ``expr`` that may contain | |
1616 | %-formatting to escape certain types. See ``revsetlang.formatspec``. |
|
1616 | %-formatting to escape certain types. See ``revsetlang.formatspec``. | |
1617 |
|
1617 | |||
1618 | Revset aliases from the configuration are not expanded. To expand |
|
1618 | Revset aliases from the configuration are not expanded. To expand | |
1619 | user aliases, consider calling ``scmutil.revrange()`` or |
|
1619 | user aliases, consider calling ``scmutil.revrange()`` or | |
1620 | ``repo.anyrevs([expr], user=True)``. |
|
1620 | ``repo.anyrevs([expr], user=True)``. | |
1621 |
|
1621 | |||
1622 | Returns a revset.abstractsmartset, which is a list-like interface |
|
1622 | Returns a revset.abstractsmartset, which is a list-like interface | |
1623 | that contains integer revisions. |
|
1623 | that contains integer revisions. | |
1624 | ''' |
|
1624 | ''' | |
1625 | tree = revsetlang.spectree(expr, *args) |
|
1625 | tree = revsetlang.spectree(expr, *args) | |
1626 | return revset.makematcher(tree)(self) |
|
1626 | return revset.makematcher(tree)(self) | |
1627 |
|
1627 | |||
1628 | def set(self, expr, *args): |
|
1628 | def set(self, expr, *args): | |
1629 | '''Find revisions matching a revset and emit changectx instances. |
|
1629 | '''Find revisions matching a revset and emit changectx instances. | |
1630 |
|
1630 | |||
1631 | This is a convenience wrapper around ``revs()`` that iterates the |
|
1631 | This is a convenience wrapper around ``revs()`` that iterates the | |
1632 | result and is a generator of changectx instances. |
|
1632 | result and is a generator of changectx instances. | |
1633 |
|
1633 | |||
1634 | Revset aliases from the configuration are not expanded. To expand |
|
1634 | Revset aliases from the configuration are not expanded. To expand | |
1635 | user aliases, consider calling ``scmutil.revrange()``. |
|
1635 | user aliases, consider calling ``scmutil.revrange()``. | |
1636 | ''' |
|
1636 | ''' | |
1637 | for r in self.revs(expr, *args): |
|
1637 | for r in self.revs(expr, *args): | |
1638 | yield self[r] |
|
1638 | yield self[r] | |
1639 |
|
1639 | |||
1640 | def anyrevs(self, specs, user=False, localalias=None): |
|
1640 | def anyrevs(self, specs, user=False, localalias=None): | |
1641 | '''Find revisions matching one of the given revsets. |
|
1641 | '''Find revisions matching one of the given revsets. | |
1642 |
|
1642 | |||
1643 | Revset aliases from the configuration are not expanded by default. To |
|
1643 | Revset aliases from the configuration are not expanded by default. To | |
1644 | expand user aliases, specify ``user=True``. To provide some local |
|
1644 | expand user aliases, specify ``user=True``. To provide some local | |
1645 | definitions overriding user aliases, set ``localalias`` to |
|
1645 | definitions overriding user aliases, set ``localalias`` to | |
1646 | ``{name: definitionstring}``. |
|
1646 | ``{name: definitionstring}``. | |
1647 | ''' |
|
1647 | ''' | |
1648 | if user: |
|
1648 | if user: | |
1649 | m = revset.matchany( |
|
1649 | m = revset.matchany( | |
1650 | self.ui, |
|
1650 | self.ui, | |
1651 | specs, |
|
1651 | specs, | |
1652 | lookup=revset.lookupfn(self), |
|
1652 | lookup=revset.lookupfn(self), | |
1653 | localalias=localalias, |
|
1653 | localalias=localalias, | |
1654 | ) |
|
1654 | ) | |
1655 | else: |
|
1655 | else: | |
1656 | m = revset.matchany(None, specs, localalias=localalias) |
|
1656 | m = revset.matchany(None, specs, localalias=localalias) | |
1657 | return m(self) |
|
1657 | return m(self) | |
1658 |
|
1658 | |||
1659 | def url(self): |
|
1659 | def url(self): | |
1660 | return b'file:' + self.root |
|
1660 | return b'file:' + self.root | |
1661 |
|
1661 | |||
1662 | def hook(self, name, throw=False, **args): |
|
1662 | def hook(self, name, throw=False, **args): | |
1663 | """Call a hook, passing this repo instance. |
|
1663 | """Call a hook, passing this repo instance. | |
1664 |
|
1664 | |||
1665 | This a convenience method to aid invoking hooks. Extensions likely |
|
1665 | This a convenience method to aid invoking hooks. Extensions likely | |
1666 | won't call this unless they have registered a custom hook or are |
|
1666 | won't call this unless they have registered a custom hook or are | |
1667 | replacing code that is expected to call a hook. |
|
1667 | replacing code that is expected to call a hook. | |
1668 | """ |
|
1668 | """ | |
1669 | return hook.hook(self.ui, self, name, throw, **args) |
|
1669 | return hook.hook(self.ui, self, name, throw, **args) | |
1670 |
|
1670 | |||
1671 | @filteredpropertycache |
|
1671 | @filteredpropertycache | |
1672 | def _tagscache(self): |
|
1672 | def _tagscache(self): | |
1673 | '''Returns a tagscache object that contains various tags related |
|
1673 | '''Returns a tagscache object that contains various tags related | |
1674 | caches.''' |
|
1674 | caches.''' | |
1675 |
|
1675 | |||
1676 | # This simplifies its cache management by having one decorated |
|
1676 | # This simplifies its cache management by having one decorated | |
1677 | # function (this one) and the rest simply fetch things from it. |
|
1677 | # function (this one) and the rest simply fetch things from it. | |
1678 | class tagscache(object): |
|
1678 | class tagscache(object): | |
1679 | def __init__(self): |
|
1679 | def __init__(self): | |
1680 | # These two define the set of tags for this repository. tags |
|
1680 | # These two define the set of tags for this repository. tags | |
1681 | # maps tag name to node; tagtypes maps tag name to 'global' or |
|
1681 | # maps tag name to node; tagtypes maps tag name to 'global' or | |
1682 | # 'local'. (Global tags are defined by .hgtags across all |
|
1682 | # 'local'. (Global tags are defined by .hgtags across all | |
1683 | # heads, and local tags are defined in .hg/localtags.) |
|
1683 | # heads, and local tags are defined in .hg/localtags.) | |
1684 | # They constitute the in-memory cache of tags. |
|
1684 | # They constitute the in-memory cache of tags. | |
1685 | self.tags = self.tagtypes = None |
|
1685 | self.tags = self.tagtypes = None | |
1686 |
|
1686 | |||
1687 | self.nodetagscache = self.tagslist = None |
|
1687 | self.nodetagscache = self.tagslist = None | |
1688 |
|
1688 | |||
1689 | cache = tagscache() |
|
1689 | cache = tagscache() | |
1690 | cache.tags, cache.tagtypes = self._findtags() |
|
1690 | cache.tags, cache.tagtypes = self._findtags() | |
1691 |
|
1691 | |||
1692 | return cache |
|
1692 | return cache | |
1693 |
|
1693 | |||
1694 | def tags(self): |
|
1694 | def tags(self): | |
1695 | '''return a mapping of tag to node''' |
|
1695 | '''return a mapping of tag to node''' | |
1696 | t = {} |
|
1696 | t = {} | |
1697 | if self.changelog.filteredrevs: |
|
1697 | if self.changelog.filteredrevs: | |
1698 | tags, tt = self._findtags() |
|
1698 | tags, tt = self._findtags() | |
1699 | else: |
|
1699 | else: | |
1700 | tags = self._tagscache.tags |
|
1700 | tags = self._tagscache.tags | |
1701 | rev = self.changelog.rev |
|
1701 | rev = self.changelog.rev | |
1702 | for k, v in pycompat.iteritems(tags): |
|
1702 | for k, v in pycompat.iteritems(tags): | |
1703 | try: |
|
1703 | try: | |
1704 | # ignore tags to unknown nodes |
|
1704 | # ignore tags to unknown nodes | |
1705 | rev(v) |
|
1705 | rev(v) | |
1706 | t[k] = v |
|
1706 | t[k] = v | |
1707 | except (error.LookupError, ValueError): |
|
1707 | except (error.LookupError, ValueError): | |
1708 | pass |
|
1708 | pass | |
1709 | return t |
|
1709 | return t | |
1710 |
|
1710 | |||
1711 | def _findtags(self): |
|
1711 | def _findtags(self): | |
1712 | '''Do the hard work of finding tags. Return a pair of dicts |
|
1712 | '''Do the hard work of finding tags. Return a pair of dicts | |
1713 | (tags, tagtypes) where tags maps tag name to node, and tagtypes |
|
1713 | (tags, tagtypes) where tags maps tag name to node, and tagtypes | |
1714 | maps tag name to a string like \'global\' or \'local\'. |
|
1714 | maps tag name to a string like \'global\' or \'local\'. | |
1715 | Subclasses or extensions are free to add their own tags, but |
|
1715 | Subclasses or extensions are free to add their own tags, but | |
1716 | should be aware that the returned dicts will be retained for the |
|
1716 | should be aware that the returned dicts will be retained for the | |
1717 | duration of the localrepo object.''' |
|
1717 | duration of the localrepo object.''' | |
1718 |
|
1718 | |||
1719 | # XXX what tagtype should subclasses/extensions use? Currently |
|
1719 | # XXX what tagtype should subclasses/extensions use? Currently | |
1720 | # mq and bookmarks add tags, but do not set the tagtype at all. |
|
1720 | # mq and bookmarks add tags, but do not set the tagtype at all. | |
1721 | # Should each extension invent its own tag type? Should there |
|
1721 | # Should each extension invent its own tag type? Should there | |
1722 | # be one tagtype for all such "virtual" tags? Or is the status |
|
1722 | # be one tagtype for all such "virtual" tags? Or is the status | |
1723 | # quo fine? |
|
1723 | # quo fine? | |
1724 |
|
1724 | |||
1725 | # map tag name to (node, hist) |
|
1725 | # map tag name to (node, hist) | |
1726 | alltags = tagsmod.findglobaltags(self.ui, self) |
|
1726 | alltags = tagsmod.findglobaltags(self.ui, self) | |
1727 | # map tag name to tag type |
|
1727 | # map tag name to tag type | |
1728 | tagtypes = dict((tag, b'global') for tag in alltags) |
|
1728 | tagtypes = dict((tag, b'global') for tag in alltags) | |
1729 |
|
1729 | |||
1730 | tagsmod.readlocaltags(self.ui, self, alltags, tagtypes) |
|
1730 | tagsmod.readlocaltags(self.ui, self, alltags, tagtypes) | |
1731 |
|
1731 | |||
1732 | # Build the return dicts. Have to re-encode tag names because |
|
1732 | # Build the return dicts. Have to re-encode tag names because | |
1733 | # the tags module always uses UTF-8 (in order not to lose info |
|
1733 | # the tags module always uses UTF-8 (in order not to lose info | |
1734 | # writing to the cache), but the rest of Mercurial wants them in |
|
1734 | # writing to the cache), but the rest of Mercurial wants them in | |
1735 | # local encoding. |
|
1735 | # local encoding. | |
1736 | tags = {} |
|
1736 | tags = {} | |
1737 | for (name, (node, hist)) in pycompat.iteritems(alltags): |
|
1737 | for (name, (node, hist)) in pycompat.iteritems(alltags): | |
1738 | if node != nullid: |
|
1738 | if node != nullid: | |
1739 | tags[encoding.tolocal(name)] = node |
|
1739 | tags[encoding.tolocal(name)] = node | |
1740 | tags[b'tip'] = self.changelog.tip() |
|
1740 | tags[b'tip'] = self.changelog.tip() | |
1741 | tagtypes = dict( |
|
1741 | tagtypes = dict( | |
1742 | [ |
|
1742 | [ | |
1743 | (encoding.tolocal(name), value) |
|
1743 | (encoding.tolocal(name), value) | |
1744 | for (name, value) in pycompat.iteritems(tagtypes) |
|
1744 | for (name, value) in pycompat.iteritems(tagtypes) | |
1745 | ] |
|
1745 | ] | |
1746 | ) |
|
1746 | ) | |
1747 | return (tags, tagtypes) |
|
1747 | return (tags, tagtypes) | |
1748 |
|
1748 | |||
1749 | def tagtype(self, tagname): |
|
1749 | def tagtype(self, tagname): | |
1750 | ''' |
|
1750 | ''' | |
1751 | return the type of the given tag. result can be: |
|
1751 | return the type of the given tag. result can be: | |
1752 |
|
1752 | |||
1753 | 'local' : a local tag |
|
1753 | 'local' : a local tag | |
1754 | 'global' : a global tag |
|
1754 | 'global' : a global tag | |
1755 | None : tag does not exist |
|
1755 | None : tag does not exist | |
1756 | ''' |
|
1756 | ''' | |
1757 |
|
1757 | |||
1758 | return self._tagscache.tagtypes.get(tagname) |
|
1758 | return self._tagscache.tagtypes.get(tagname) | |
1759 |
|
1759 | |||
1760 | def tagslist(self): |
|
1760 | def tagslist(self): | |
1761 | '''return a list of tags ordered by revision''' |
|
1761 | '''return a list of tags ordered by revision''' | |
1762 | if not self._tagscache.tagslist: |
|
1762 | if not self._tagscache.tagslist: | |
1763 | l = [] |
|
1763 | l = [] | |
1764 | for t, n in pycompat.iteritems(self.tags()): |
|
1764 | for t, n in pycompat.iteritems(self.tags()): | |
1765 | l.append((self.changelog.rev(n), t, n)) |
|
1765 | l.append((self.changelog.rev(n), t, n)) | |
1766 | self._tagscache.tagslist = [(t, n) for r, t, n in sorted(l)] |
|
1766 | self._tagscache.tagslist = [(t, n) for r, t, n in sorted(l)] | |
1767 |
|
1767 | |||
1768 | return self._tagscache.tagslist |
|
1768 | return self._tagscache.tagslist | |
1769 |
|
1769 | |||
1770 | def nodetags(self, node): |
|
1770 | def nodetags(self, node): | |
1771 | '''return the tags associated with a node''' |
|
1771 | '''return the tags associated with a node''' | |
1772 | if not self._tagscache.nodetagscache: |
|
1772 | if not self._tagscache.nodetagscache: | |
1773 | nodetagscache = {} |
|
1773 | nodetagscache = {} | |
1774 | for t, n in pycompat.iteritems(self._tagscache.tags): |
|
1774 | for t, n in pycompat.iteritems(self._tagscache.tags): | |
1775 | nodetagscache.setdefault(n, []).append(t) |
|
1775 | nodetagscache.setdefault(n, []).append(t) | |
1776 | for tags in pycompat.itervalues(nodetagscache): |
|
1776 | for tags in pycompat.itervalues(nodetagscache): | |
1777 | tags.sort() |
|
1777 | tags.sort() | |
1778 | self._tagscache.nodetagscache = nodetagscache |
|
1778 | self._tagscache.nodetagscache = nodetagscache | |
1779 | return self._tagscache.nodetagscache.get(node, []) |
|
1779 | return self._tagscache.nodetagscache.get(node, []) | |
1780 |
|
1780 | |||
1781 | def nodebookmarks(self, node): |
|
1781 | def nodebookmarks(self, node): | |
1782 | """return the list of bookmarks pointing to the specified node""" |
|
1782 | """return the list of bookmarks pointing to the specified node""" | |
1783 | return self._bookmarks.names(node) |
|
1783 | return self._bookmarks.names(node) | |
1784 |
|
1784 | |||
1785 | def branchmap(self): |
|
1785 | def branchmap(self): | |
1786 | '''returns a dictionary {branch: [branchheads]} with branchheads |
|
1786 | '''returns a dictionary {branch: [branchheads]} with branchheads | |
1787 | ordered by increasing revision number''' |
|
1787 | ordered by increasing revision number''' | |
1788 | return self._branchcaches[self] |
|
1788 | return self._branchcaches[self] | |
1789 |
|
1789 | |||
1790 | @unfilteredmethod |
|
1790 | @unfilteredmethod | |
1791 | def revbranchcache(self): |
|
1791 | def revbranchcache(self): | |
1792 | if not self._revbranchcache: |
|
1792 | if not self._revbranchcache: | |
1793 | self._revbranchcache = branchmap.revbranchcache(self.unfiltered()) |
|
1793 | self._revbranchcache = branchmap.revbranchcache(self.unfiltered()) | |
1794 | return self._revbranchcache |
|
1794 | return self._revbranchcache | |
1795 |
|
1795 | |||
1796 | def branchtip(self, branch, ignoremissing=False): |
|
1796 | def branchtip(self, branch, ignoremissing=False): | |
1797 | '''return the tip node for a given branch |
|
1797 | '''return the tip node for a given branch | |
1798 |
|
1798 | |||
1799 | If ignoremissing is True, then this method will not raise an error. |
|
1799 | If ignoremissing is True, then this method will not raise an error. | |
1800 | This is helpful for callers that only expect None for a missing branch |
|
1800 | This is helpful for callers that only expect None for a missing branch | |
1801 | (e.g. namespace). |
|
1801 | (e.g. namespace). | |
1802 |
|
1802 | |||
1803 | ''' |
|
1803 | ''' | |
1804 | try: |
|
1804 | try: | |
1805 | return self.branchmap().branchtip(branch) |
|
1805 | return self.branchmap().branchtip(branch) | |
1806 | except KeyError: |
|
1806 | except KeyError: | |
1807 | if not ignoremissing: |
|
1807 | if not ignoremissing: | |
1808 | raise error.RepoLookupError(_(b"unknown branch '%s'") % branch) |
|
1808 | raise error.RepoLookupError(_(b"unknown branch '%s'") % branch) | |
1809 | else: |
|
1809 | else: | |
1810 | pass |
|
1810 | pass | |
1811 |
|
1811 | |||
1812 | def lookup(self, key): |
|
1812 | def lookup(self, key): | |
1813 | node = scmutil.revsymbol(self, key).node() |
|
1813 | node = scmutil.revsymbol(self, key).node() | |
1814 | if node is None: |
|
1814 | if node is None: | |
1815 | raise error.RepoLookupError(_(b"unknown revision '%s'") % key) |
|
1815 | raise error.RepoLookupError(_(b"unknown revision '%s'") % key) | |
1816 | return node |
|
1816 | return node | |
1817 |
|
1817 | |||
1818 | def lookupbranch(self, key): |
|
1818 | def lookupbranch(self, key): | |
1819 | if self.branchmap().hasbranch(key): |
|
1819 | if self.branchmap().hasbranch(key): | |
1820 | return key |
|
1820 | return key | |
1821 |
|
1821 | |||
1822 | return scmutil.revsymbol(self, key).branch() |
|
1822 | return scmutil.revsymbol(self, key).branch() | |
1823 |
|
1823 | |||
1824 | def known(self, nodes): |
|
1824 | def known(self, nodes): | |
1825 | cl = self.changelog |
|
1825 | cl = self.changelog | |
1826 | get_rev = cl.index.get_rev |
|
1826 | get_rev = cl.index.get_rev | |
1827 | filtered = cl.filteredrevs |
|
1827 | filtered = cl.filteredrevs | |
1828 | result = [] |
|
1828 | result = [] | |
1829 | for n in nodes: |
|
1829 | for n in nodes: | |
1830 | r = get_rev(n) |
|
1830 | r = get_rev(n) | |
1831 | resp = not (r is None or r in filtered) |
|
1831 | resp = not (r is None or r in filtered) | |
1832 | result.append(resp) |
|
1832 | result.append(resp) | |
1833 | return result |
|
1833 | return result | |
1834 |
|
1834 | |||
1835 | def local(self): |
|
1835 | def local(self): | |
1836 | return self |
|
1836 | return self | |
1837 |
|
1837 | |||
1838 | def publishing(self): |
|
1838 | def publishing(self): | |
1839 | # it's safe (and desirable) to trust the publish flag unconditionally |
|
1839 | # it's safe (and desirable) to trust the publish flag unconditionally | |
1840 | # so that we don't finalize changes shared between users via ssh or nfs |
|
1840 | # so that we don't finalize changes shared between users via ssh or nfs | |
1841 | return self.ui.configbool(b'phases', b'publish', untrusted=True) |
|
1841 | return self.ui.configbool(b'phases', b'publish', untrusted=True) | |
1842 |
|
1842 | |||
1843 | def cancopy(self): |
|
1843 | def cancopy(self): | |
1844 | # so statichttprepo's override of local() works |
|
1844 | # so statichttprepo's override of local() works | |
1845 | if not self.local(): |
|
1845 | if not self.local(): | |
1846 | return False |
|
1846 | return False | |
1847 | if not self.publishing(): |
|
1847 | if not self.publishing(): | |
1848 | return True |
|
1848 | return True | |
1849 | # if publishing we can't copy if there is filtered content |
|
1849 | # if publishing we can't copy if there is filtered content | |
1850 | return not self.filtered(b'visible').changelog.filteredrevs |
|
1850 | return not self.filtered(b'visible').changelog.filteredrevs | |
1851 |
|
1851 | |||
1852 | def shared(self): |
|
1852 | def shared(self): | |
1853 | '''the type of shared repository (None if not shared)''' |
|
1853 | '''the type of shared repository (None if not shared)''' | |
1854 | if self.sharedpath != self.path: |
|
1854 | if self.sharedpath != self.path: | |
1855 | return b'store' |
|
1855 | return b'store' | |
1856 | return None |
|
1856 | return None | |
1857 |
|
1857 | |||
1858 | def wjoin(self, f, *insidef): |
|
1858 | def wjoin(self, f, *insidef): | |
1859 | return self.vfs.reljoin(self.root, f, *insidef) |
|
1859 | return self.vfs.reljoin(self.root, f, *insidef) | |
1860 |
|
1860 | |||
1861 | def setparents(self, p1, p2=nullid): |
|
1861 | def setparents(self, p1, p2=nullid): | |
1862 | with self.dirstate.parentchange(): |
|
1862 | with self.dirstate.parentchange(): | |
1863 | copies = self.dirstate.setparents(p1, p2) |
|
1863 | copies = self.dirstate.setparents(p1, p2) | |
1864 | pctx = self[p1] |
|
1864 | pctx = self[p1] | |
1865 | if copies: |
|
1865 | if copies: | |
1866 | # Adjust copy records, the dirstate cannot do it, it |
|
1866 | # Adjust copy records, the dirstate cannot do it, it | |
1867 | # requires access to parents manifests. Preserve them |
|
1867 | # requires access to parents manifests. Preserve them | |
1868 | # only for entries added to first parent. |
|
1868 | # only for entries added to first parent. | |
1869 | for f in copies: |
|
1869 | for f in copies: | |
1870 | if f not in pctx and copies[f] in pctx: |
|
1870 | if f not in pctx and copies[f] in pctx: | |
1871 | self.dirstate.copy(copies[f], f) |
|
1871 | self.dirstate.copy(copies[f], f) | |
1872 | if p2 == nullid: |
|
1872 | if p2 == nullid: | |
1873 | for f, s in sorted(self.dirstate.copies().items()): |
|
1873 | for f, s in sorted(self.dirstate.copies().items()): | |
1874 | if f not in pctx and s not in pctx: |
|
1874 | if f not in pctx and s not in pctx: | |
1875 | self.dirstate.copy(None, f) |
|
1875 | self.dirstate.copy(None, f) | |
1876 |
|
1876 | |||
1877 | def filectx(self, path, changeid=None, fileid=None, changectx=None): |
|
1877 | def filectx(self, path, changeid=None, fileid=None, changectx=None): | |
1878 | """changeid must be a changeset revision, if specified. |
|
1878 | """changeid must be a changeset revision, if specified. | |
1879 | fileid can be a file revision or node.""" |
|
1879 | fileid can be a file revision or node.""" | |
1880 | return context.filectx( |
|
1880 | return context.filectx( | |
1881 | self, path, changeid, fileid, changectx=changectx |
|
1881 | self, path, changeid, fileid, changectx=changectx | |
1882 | ) |
|
1882 | ) | |
1883 |
|
1883 | |||
1884 | def getcwd(self): |
|
1884 | def getcwd(self): | |
1885 | return self.dirstate.getcwd() |
|
1885 | return self.dirstate.getcwd() | |
1886 |
|
1886 | |||
1887 | def pathto(self, f, cwd=None): |
|
1887 | def pathto(self, f, cwd=None): | |
1888 | return self.dirstate.pathto(f, cwd) |
|
1888 | return self.dirstate.pathto(f, cwd) | |
1889 |
|
1889 | |||
1890 | def _loadfilter(self, filter): |
|
1890 | def _loadfilter(self, filter): | |
1891 | if filter not in self._filterpats: |
|
1891 | if filter not in self._filterpats: | |
1892 | l = [] |
|
1892 | l = [] | |
1893 | for pat, cmd in self.ui.configitems(filter): |
|
1893 | for pat, cmd in self.ui.configitems(filter): | |
1894 | if cmd == b'!': |
|
1894 | if cmd == b'!': | |
1895 | continue |
|
1895 | continue | |
1896 | mf = matchmod.match(self.root, b'', [pat]) |
|
1896 | mf = matchmod.match(self.root, b'', [pat]) | |
1897 | fn = None |
|
1897 | fn = None | |
1898 | params = cmd |
|
1898 | params = cmd | |
1899 | for name, filterfn in pycompat.iteritems(self._datafilters): |
|
1899 | for name, filterfn in pycompat.iteritems(self._datafilters): | |
1900 | if cmd.startswith(name): |
|
1900 | if cmd.startswith(name): | |
1901 | fn = filterfn |
|
1901 | fn = filterfn | |
1902 | params = cmd[len(name) :].lstrip() |
|
1902 | params = cmd[len(name) :].lstrip() | |
1903 | break |
|
1903 | break | |
1904 | if not fn: |
|
1904 | if not fn: | |
1905 | fn = lambda s, c, **kwargs: procutil.filter(s, c) |
|
1905 | fn = lambda s, c, **kwargs: procutil.filter(s, c) | |
1906 | fn.__name__ = 'commandfilter' |
|
1906 | fn.__name__ = 'commandfilter' | |
1907 | # Wrap old filters not supporting keyword arguments |
|
1907 | # Wrap old filters not supporting keyword arguments | |
1908 | if not pycompat.getargspec(fn)[2]: |
|
1908 | if not pycompat.getargspec(fn)[2]: | |
1909 | oldfn = fn |
|
1909 | oldfn = fn | |
1910 | fn = lambda s, c, oldfn=oldfn, **kwargs: oldfn(s, c) |
|
1910 | fn = lambda s, c, oldfn=oldfn, **kwargs: oldfn(s, c) | |
1911 | fn.__name__ = 'compat-' + oldfn.__name__ |
|
1911 | fn.__name__ = 'compat-' + oldfn.__name__ | |
1912 | l.append((mf, fn, params)) |
|
1912 | l.append((mf, fn, params)) | |
1913 | self._filterpats[filter] = l |
|
1913 | self._filterpats[filter] = l | |
1914 | return self._filterpats[filter] |
|
1914 | return self._filterpats[filter] | |
1915 |
|
1915 | |||
1916 | def _filter(self, filterpats, filename, data): |
|
1916 | def _filter(self, filterpats, filename, data): | |
1917 | for mf, fn, cmd in filterpats: |
|
1917 | for mf, fn, cmd in filterpats: | |
1918 | if mf(filename): |
|
1918 | if mf(filename): | |
1919 | self.ui.debug( |
|
1919 | self.ui.debug( | |
1920 | b"filtering %s through %s\n" |
|
1920 | b"filtering %s through %s\n" | |
1921 | % (filename, cmd or pycompat.sysbytes(fn.__name__)) |
|
1921 | % (filename, cmd or pycompat.sysbytes(fn.__name__)) | |
1922 | ) |
|
1922 | ) | |
1923 | data = fn(data, cmd, ui=self.ui, repo=self, filename=filename) |
|
1923 | data = fn(data, cmd, ui=self.ui, repo=self, filename=filename) | |
1924 | break |
|
1924 | break | |
1925 |
|
1925 | |||
1926 | return data |
|
1926 | return data | |
1927 |
|
1927 | |||
1928 | @unfilteredpropertycache |
|
1928 | @unfilteredpropertycache | |
1929 | def _encodefilterpats(self): |
|
1929 | def _encodefilterpats(self): | |
1930 | return self._loadfilter(b'encode') |
|
1930 | return self._loadfilter(b'encode') | |
1931 |
|
1931 | |||
1932 | @unfilteredpropertycache |
|
1932 | @unfilteredpropertycache | |
1933 | def _decodefilterpats(self): |
|
1933 | def _decodefilterpats(self): | |
1934 | return self._loadfilter(b'decode') |
|
1934 | return self._loadfilter(b'decode') | |
1935 |
|
1935 | |||
1936 | def adddatafilter(self, name, filter): |
|
1936 | def adddatafilter(self, name, filter): | |
1937 | self._datafilters[name] = filter |
|
1937 | self._datafilters[name] = filter | |
1938 |
|
1938 | |||
1939 | def wread(self, filename): |
|
1939 | def wread(self, filename): | |
1940 | if self.wvfs.islink(filename): |
|
1940 | if self.wvfs.islink(filename): | |
1941 | data = self.wvfs.readlink(filename) |
|
1941 | data = self.wvfs.readlink(filename) | |
1942 | else: |
|
1942 | else: | |
1943 | data = self.wvfs.read(filename) |
|
1943 | data = self.wvfs.read(filename) | |
1944 | return self._filter(self._encodefilterpats, filename, data) |
|
1944 | return self._filter(self._encodefilterpats, filename, data) | |
1945 |
|
1945 | |||
1946 | def wwrite(self, filename, data, flags, backgroundclose=False, **kwargs): |
|
1946 | def wwrite(self, filename, data, flags, backgroundclose=False, **kwargs): | |
1947 | """write ``data`` into ``filename`` in the working directory |
|
1947 | """write ``data`` into ``filename`` in the working directory | |
1948 |
|
1948 | |||
1949 | This returns length of written (maybe decoded) data. |
|
1949 | This returns length of written (maybe decoded) data. | |
1950 | """ |
|
1950 | """ | |
1951 | data = self._filter(self._decodefilterpats, filename, data) |
|
1951 | data = self._filter(self._decodefilterpats, filename, data) | |
1952 | if b'l' in flags: |
|
1952 | if b'l' in flags: | |
1953 | self.wvfs.symlink(data, filename) |
|
1953 | self.wvfs.symlink(data, filename) | |
1954 | else: |
|
1954 | else: | |
1955 | self.wvfs.write( |
|
1955 | self.wvfs.write( | |
1956 | filename, data, backgroundclose=backgroundclose, **kwargs |
|
1956 | filename, data, backgroundclose=backgroundclose, **kwargs | |
1957 | ) |
|
1957 | ) | |
1958 | if b'x' in flags: |
|
1958 | if b'x' in flags: | |
1959 | self.wvfs.setflags(filename, False, True) |
|
1959 | self.wvfs.setflags(filename, False, True) | |
1960 | else: |
|
1960 | else: | |
1961 | self.wvfs.setflags(filename, False, False) |
|
1961 | self.wvfs.setflags(filename, False, False) | |
1962 | return len(data) |
|
1962 | return len(data) | |
1963 |
|
1963 | |||
1964 | def wwritedata(self, filename, data): |
|
1964 | def wwritedata(self, filename, data): | |
1965 | return self._filter(self._decodefilterpats, filename, data) |
|
1965 | return self._filter(self._decodefilterpats, filename, data) | |
1966 |
|
1966 | |||
1967 | def currenttransaction(self): |
|
1967 | def currenttransaction(self): | |
1968 | """return the current transaction or None if non exists""" |
|
1968 | """return the current transaction or None if non exists""" | |
1969 | if self._transref: |
|
1969 | if self._transref: | |
1970 | tr = self._transref() |
|
1970 | tr = self._transref() | |
1971 | else: |
|
1971 | else: | |
1972 | tr = None |
|
1972 | tr = None | |
1973 |
|
1973 | |||
1974 | if tr and tr.running(): |
|
1974 | if tr and tr.running(): | |
1975 | return tr |
|
1975 | return tr | |
1976 | return None |
|
1976 | return None | |
1977 |
|
1977 | |||
1978 | def transaction(self, desc, report=None): |
|
1978 | def transaction(self, desc, report=None): | |
1979 | if self.ui.configbool(b'devel', b'all-warnings') or self.ui.configbool( |
|
1979 | if self.ui.configbool(b'devel', b'all-warnings') or self.ui.configbool( | |
1980 | b'devel', b'check-locks' |
|
1980 | b'devel', b'check-locks' | |
1981 | ): |
|
1981 | ): | |
1982 | if self._currentlock(self._lockref) is None: |
|
1982 | if self._currentlock(self._lockref) is None: | |
1983 | raise error.ProgrammingError(b'transaction requires locking') |
|
1983 | raise error.ProgrammingError(b'transaction requires locking') | |
1984 | tr = self.currenttransaction() |
|
1984 | tr = self.currenttransaction() | |
1985 | if tr is not None: |
|
1985 | if tr is not None: | |
1986 | return tr.nest(name=desc) |
|
1986 | return tr.nest(name=desc) | |
1987 |
|
1987 | |||
1988 | # abort here if the journal already exists |
|
1988 | # abort here if the journal already exists | |
1989 | if self.svfs.exists(b"journal"): |
|
1989 | if self.svfs.exists(b"journal"): | |
1990 | raise error.RepoError( |
|
1990 | raise error.RepoError( | |
1991 | _(b"abandoned transaction found"), |
|
1991 | _(b"abandoned transaction found"), | |
1992 | hint=_(b"run 'hg recover' to clean up transaction"), |
|
1992 | hint=_(b"run 'hg recover' to clean up transaction"), | |
1993 | ) |
|
1993 | ) | |
1994 |
|
1994 | |||
1995 | idbase = b"%.40f#%f" % (random.random(), time.time()) |
|
1995 | idbase = b"%.40f#%f" % (random.random(), time.time()) | |
1996 | ha = hex(hashlib.sha1(idbase).digest()) |
|
1996 | ha = hex(hashlib.sha1(idbase).digest()) | |
1997 | txnid = b'TXN:' + ha |
|
1997 | txnid = b'TXN:' + ha | |
1998 | self.hook(b'pretxnopen', throw=True, txnname=desc, txnid=txnid) |
|
1998 | self.hook(b'pretxnopen', throw=True, txnname=desc, txnid=txnid) | |
1999 |
|
1999 | |||
2000 | self._writejournal(desc) |
|
2000 | self._writejournal(desc) | |
2001 | renames = [(vfs, x, undoname(x)) for vfs, x in self._journalfiles()] |
|
2001 | renames = [(vfs, x, undoname(x)) for vfs, x in self._journalfiles()] | |
2002 | if report: |
|
2002 | if report: | |
2003 | rp = report |
|
2003 | rp = report | |
2004 | else: |
|
2004 | else: | |
2005 | rp = self.ui.warn |
|
2005 | rp = self.ui.warn | |
2006 | vfsmap = {b'plain': self.vfs, b'store': self.svfs} # root of .hg/ |
|
2006 | vfsmap = {b'plain': self.vfs, b'store': self.svfs} # root of .hg/ | |
2007 | # we must avoid cyclic reference between repo and transaction. |
|
2007 | # we must avoid cyclic reference between repo and transaction. | |
2008 | reporef = weakref.ref(self) |
|
2008 | reporef = weakref.ref(self) | |
2009 | # Code to track tag movement |
|
2009 | # Code to track tag movement | |
2010 | # |
|
2010 | # | |
2011 | # Since tags are all handled as file content, it is actually quite hard |
|
2011 | # Since tags are all handled as file content, it is actually quite hard | |
2012 | # to track these movement from a code perspective. So we fallback to a |
|
2012 | # to track these movement from a code perspective. So we fallback to a | |
2013 | # tracking at the repository level. One could envision to track changes |
|
2013 | # tracking at the repository level. One could envision to track changes | |
2014 | # to the '.hgtags' file through changegroup apply but that fails to |
|
2014 | # to the '.hgtags' file through changegroup apply but that fails to | |
2015 | # cope with case where transaction expose new heads without changegroup |
|
2015 | # cope with case where transaction expose new heads without changegroup | |
2016 | # being involved (eg: phase movement). |
|
2016 | # being involved (eg: phase movement). | |
2017 | # |
|
2017 | # | |
2018 | # For now, We gate the feature behind a flag since this likely comes |
|
2018 | # For now, We gate the feature behind a flag since this likely comes | |
2019 | # with performance impacts. The current code run more often than needed |
|
2019 | # with performance impacts. The current code run more often than needed | |
2020 | # and do not use caches as much as it could. The current focus is on |
|
2020 | # and do not use caches as much as it could. The current focus is on | |
2021 | # the behavior of the feature so we disable it by default. The flag |
|
2021 | # the behavior of the feature so we disable it by default. The flag | |
2022 | # will be removed when we are happy with the performance impact. |
|
2022 | # will be removed when we are happy with the performance impact. | |
2023 | # |
|
2023 | # | |
2024 | # Once this feature is no longer experimental move the following |
|
2024 | # Once this feature is no longer experimental move the following | |
2025 | # documentation to the appropriate help section: |
|
2025 | # documentation to the appropriate help section: | |
2026 | # |
|
2026 | # | |
2027 | # The ``HG_TAG_MOVED`` variable will be set if the transaction touched |
|
2027 | # The ``HG_TAG_MOVED`` variable will be set if the transaction touched | |
2028 | # tags (new or changed or deleted tags). In addition the details of |
|
2028 | # tags (new or changed or deleted tags). In addition the details of | |
2029 | # these changes are made available in a file at: |
|
2029 | # these changes are made available in a file at: | |
2030 | # ``REPOROOT/.hg/changes/tags.changes``. |
|
2030 | # ``REPOROOT/.hg/changes/tags.changes``. | |
2031 | # Make sure you check for HG_TAG_MOVED before reading that file as it |
|
2031 | # Make sure you check for HG_TAG_MOVED before reading that file as it | |
2032 | # might exist from a previous transaction even if no tag were touched |
|
2032 | # might exist from a previous transaction even if no tag were touched | |
2033 | # in this one. Changes are recorded in a line base format:: |
|
2033 | # in this one. Changes are recorded in a line base format:: | |
2034 | # |
|
2034 | # | |
2035 | # <action> <hex-node> <tag-name>\n |
|
2035 | # <action> <hex-node> <tag-name>\n | |
2036 | # |
|
2036 | # | |
2037 | # Actions are defined as follow: |
|
2037 | # Actions are defined as follow: | |
2038 | # "-R": tag is removed, |
|
2038 | # "-R": tag is removed, | |
2039 | # "+A": tag is added, |
|
2039 | # "+A": tag is added, | |
2040 | # "-M": tag is moved (old value), |
|
2040 | # "-M": tag is moved (old value), | |
2041 | # "+M": tag is moved (new value), |
|
2041 | # "+M": tag is moved (new value), | |
2042 | tracktags = lambda x: None |
|
2042 | tracktags = lambda x: None | |
2043 | # experimental config: experimental.hook-track-tags |
|
2043 | # experimental config: experimental.hook-track-tags | |
2044 | shouldtracktags = self.ui.configbool( |
|
2044 | shouldtracktags = self.ui.configbool( | |
2045 | b'experimental', b'hook-track-tags' |
|
2045 | b'experimental', b'hook-track-tags' | |
2046 | ) |
|
2046 | ) | |
2047 | if desc != b'strip' and shouldtracktags: |
|
2047 | if desc != b'strip' and shouldtracktags: | |
2048 | oldheads = self.changelog.headrevs() |
|
2048 | oldheads = self.changelog.headrevs() | |
2049 |
|
2049 | |||
2050 | def tracktags(tr2): |
|
2050 | def tracktags(tr2): | |
2051 | repo = reporef() |
|
2051 | repo = reporef() | |
2052 | oldfnodes = tagsmod.fnoderevs(repo.ui, repo, oldheads) |
|
2052 | oldfnodes = tagsmod.fnoderevs(repo.ui, repo, oldheads) | |
2053 | newheads = repo.changelog.headrevs() |
|
2053 | newheads = repo.changelog.headrevs() | |
2054 | newfnodes = tagsmod.fnoderevs(repo.ui, repo, newheads) |
|
2054 | newfnodes = tagsmod.fnoderevs(repo.ui, repo, newheads) | |
2055 | # notes: we compare lists here. |
|
2055 | # notes: we compare lists here. | |
2056 | # As we do it only once buiding set would not be cheaper |
|
2056 | # As we do it only once buiding set would not be cheaper | |
2057 | changes = tagsmod.difftags(repo.ui, repo, oldfnodes, newfnodes) |
|
2057 | changes = tagsmod.difftags(repo.ui, repo, oldfnodes, newfnodes) | |
2058 | if changes: |
|
2058 | if changes: | |
2059 | tr2.hookargs[b'tag_moved'] = b'1' |
|
2059 | tr2.hookargs[b'tag_moved'] = b'1' | |
2060 | with repo.vfs( |
|
2060 | with repo.vfs( | |
2061 | b'changes/tags.changes', b'w', atomictemp=True |
|
2061 | b'changes/tags.changes', b'w', atomictemp=True | |
2062 | ) as changesfile: |
|
2062 | ) as changesfile: | |
2063 | # note: we do not register the file to the transaction |
|
2063 | # note: we do not register the file to the transaction | |
2064 | # because we needs it to still exist on the transaction |
|
2064 | # because we needs it to still exist on the transaction | |
2065 | # is close (for txnclose hooks) |
|
2065 | # is close (for txnclose hooks) | |
2066 | tagsmod.writediff(changesfile, changes) |
|
2066 | tagsmod.writediff(changesfile, changes) | |
2067 |
|
2067 | |||
2068 | def validate(tr2): |
|
2068 | def validate(tr2): | |
2069 | """will run pre-closing hooks""" |
|
2069 | """will run pre-closing hooks""" | |
2070 | # XXX the transaction API is a bit lacking here so we take a hacky |
|
2070 | # XXX the transaction API is a bit lacking here so we take a hacky | |
2071 | # path for now |
|
2071 | # path for now | |
2072 | # |
|
2072 | # | |
2073 | # We cannot add this as a "pending" hooks since the 'tr.hookargs' |
|
2073 | # We cannot add this as a "pending" hooks since the 'tr.hookargs' | |
2074 | # dict is copied before these run. In addition we needs the data |
|
2074 | # dict is copied before these run. In addition we needs the data | |
2075 | # available to in memory hooks too. |
|
2075 | # available to in memory hooks too. | |
2076 | # |
|
2076 | # | |
2077 | # Moreover, we also need to make sure this runs before txnclose |
|
2077 | # Moreover, we also need to make sure this runs before txnclose | |
2078 | # hooks and there is no "pending" mechanism that would execute |
|
2078 | # hooks and there is no "pending" mechanism that would execute | |
2079 | # logic only if hooks are about to run. |
|
2079 | # logic only if hooks are about to run. | |
2080 | # |
|
2080 | # | |
2081 | # Fixing this limitation of the transaction is also needed to track |
|
2081 | # Fixing this limitation of the transaction is also needed to track | |
2082 | # other families of changes (bookmarks, phases, obsolescence). |
|
2082 | # other families of changes (bookmarks, phases, obsolescence). | |
2083 | # |
|
2083 | # | |
2084 | # This will have to be fixed before we remove the experimental |
|
2084 | # This will have to be fixed before we remove the experimental | |
2085 | # gating. |
|
2085 | # gating. | |
2086 | tracktags(tr2) |
|
2086 | tracktags(tr2) | |
2087 | repo = reporef() |
|
2087 | repo = reporef() | |
2088 |
|
2088 | |||
2089 | r = repo.ui.configsuboptions( |
|
2089 | r = repo.ui.configsuboptions( | |
2090 | b'experimental', b'single-head-per-branch' |
|
2090 | b'experimental', b'single-head-per-branch' | |
2091 | ) |
|
2091 | ) | |
2092 | singlehead, singleheadsub = r |
|
2092 | singlehead, singleheadsub = r | |
2093 | if singlehead: |
|
2093 | if singlehead: | |
2094 | accountclosed = singleheadsub.get( |
|
2094 | accountclosed = singleheadsub.get( | |
2095 | b"account-closed-heads", False |
|
2095 | b"account-closed-heads", False | |
2096 | ) |
|
2096 | ) | |
2097 | scmutil.enforcesinglehead(repo, tr2, desc, accountclosed) |
|
2097 | scmutil.enforcesinglehead(repo, tr2, desc, accountclosed) | |
2098 | if hook.hashook(repo.ui, b'pretxnclose-bookmark'): |
|
2098 | if hook.hashook(repo.ui, b'pretxnclose-bookmark'): | |
2099 | for name, (old, new) in sorted( |
|
2099 | for name, (old, new) in sorted( | |
2100 | tr.changes[b'bookmarks'].items() |
|
2100 | tr.changes[b'bookmarks'].items() | |
2101 | ): |
|
2101 | ): | |
2102 | args = tr.hookargs.copy() |
|
2102 | args = tr.hookargs.copy() | |
2103 | args.update(bookmarks.preparehookargs(name, old, new)) |
|
2103 | args.update(bookmarks.preparehookargs(name, old, new)) | |
2104 | repo.hook( |
|
2104 | repo.hook( | |
2105 | b'pretxnclose-bookmark', |
|
2105 | b'pretxnclose-bookmark', | |
2106 | throw=True, |
|
2106 | throw=True, | |
2107 | **pycompat.strkwargs(args) |
|
2107 | **pycompat.strkwargs(args) | |
2108 | ) |
|
2108 | ) | |
2109 | if hook.hashook(repo.ui, b'pretxnclose-phase'): |
|
2109 | if hook.hashook(repo.ui, b'pretxnclose-phase'): | |
2110 | cl = repo.unfiltered().changelog |
|
2110 | cl = repo.unfiltered().changelog | |
2111 | for rev, (old, new) in tr.changes[b'phases'].items(): |
|
2111 | for rev, (old, new) in tr.changes[b'phases'].items(): | |
2112 | args = tr.hookargs.copy() |
|
2112 | args = tr.hookargs.copy() | |
2113 | node = hex(cl.node(rev)) |
|
2113 | node = hex(cl.node(rev)) | |
2114 | args.update(phases.preparehookargs(node, old, new)) |
|
2114 | args.update(phases.preparehookargs(node, old, new)) | |
2115 | repo.hook( |
|
2115 | repo.hook( | |
2116 | b'pretxnclose-phase', |
|
2116 | b'pretxnclose-phase', | |
2117 | throw=True, |
|
2117 | throw=True, | |
2118 | **pycompat.strkwargs(args) |
|
2118 | **pycompat.strkwargs(args) | |
2119 | ) |
|
2119 | ) | |
2120 |
|
2120 | |||
2121 | repo.hook( |
|
2121 | repo.hook( | |
2122 | b'pretxnclose', throw=True, **pycompat.strkwargs(tr.hookargs) |
|
2122 | b'pretxnclose', throw=True, **pycompat.strkwargs(tr.hookargs) | |
2123 | ) |
|
2123 | ) | |
2124 |
|
2124 | |||
2125 | def releasefn(tr, success): |
|
2125 | def releasefn(tr, success): | |
2126 | repo = reporef() |
|
2126 | repo = reporef() | |
2127 | if repo is None: |
|
2127 | if repo is None: | |
2128 | # If the repo has been GC'd (and this release function is being |
|
2128 | # If the repo has been GC'd (and this release function is being | |
2129 | # called from transaction.__del__), there's not much we can do, |
|
2129 | # called from transaction.__del__), there's not much we can do, | |
2130 | # so just leave the unfinished transaction there and let the |
|
2130 | # so just leave the unfinished transaction there and let the | |
2131 | # user run `hg recover`. |
|
2131 | # user run `hg recover`. | |
2132 | return |
|
2132 | return | |
2133 | if success: |
|
2133 | if success: | |
2134 | # this should be explicitly invoked here, because |
|
2134 | # this should be explicitly invoked here, because | |
2135 | # in-memory changes aren't written out at closing |
|
2135 | # in-memory changes aren't written out at closing | |
2136 | # transaction, if tr.addfilegenerator (via |
|
2136 | # transaction, if tr.addfilegenerator (via | |
2137 | # dirstate.write or so) isn't invoked while |
|
2137 | # dirstate.write or so) isn't invoked while | |
2138 | # transaction running |
|
2138 | # transaction running | |
2139 | repo.dirstate.write(None) |
|
2139 | repo.dirstate.write(None) | |
2140 | else: |
|
2140 | else: | |
2141 | # discard all changes (including ones already written |
|
2141 | # discard all changes (including ones already written | |
2142 | # out) in this transaction |
|
2142 | # out) in this transaction | |
2143 | narrowspec.restorebackup(self, b'journal.narrowspec') |
|
2143 | narrowspec.restorebackup(self, b'journal.narrowspec') | |
2144 | narrowspec.restorewcbackup(self, b'journal.narrowspec.dirstate') |
|
2144 | narrowspec.restorewcbackup(self, b'journal.narrowspec.dirstate') | |
2145 | repo.dirstate.restorebackup(None, b'journal.dirstate') |
|
2145 | repo.dirstate.restorebackup(None, b'journal.dirstate') | |
2146 |
|
2146 | |||
2147 | repo.invalidate(clearfilecache=True) |
|
2147 | repo.invalidate(clearfilecache=True) | |
2148 |
|
2148 | |||
2149 | tr = transaction.transaction( |
|
2149 | tr = transaction.transaction( | |
2150 | rp, |
|
2150 | rp, | |
2151 | self.svfs, |
|
2151 | self.svfs, | |
2152 | vfsmap, |
|
2152 | vfsmap, | |
2153 | b"journal", |
|
2153 | b"journal", | |
2154 | b"undo", |
|
2154 | b"undo", | |
2155 | aftertrans(renames), |
|
2155 | aftertrans(renames), | |
2156 | self.store.createmode, |
|
2156 | self.store.createmode, | |
2157 | validator=validate, |
|
2157 | validator=validate, | |
2158 | releasefn=releasefn, |
|
2158 | releasefn=releasefn, | |
2159 | checkambigfiles=_cachedfiles, |
|
2159 | checkambigfiles=_cachedfiles, | |
2160 | name=desc, |
|
2160 | name=desc, | |
2161 | ) |
|
2161 | ) | |
2162 | tr.changes[b'origrepolen'] = len(self) |
|
2162 | tr.changes[b'origrepolen'] = len(self) | |
2163 | tr.changes[b'obsmarkers'] = set() |
|
2163 | tr.changes[b'obsmarkers'] = set() | |
2164 | tr.changes[b'phases'] = {} |
|
2164 | tr.changes[b'phases'] = {} | |
2165 | tr.changes[b'bookmarks'] = {} |
|
2165 | tr.changes[b'bookmarks'] = {} | |
2166 |
|
2166 | |||
2167 | tr.hookargs[b'txnid'] = txnid |
|
2167 | tr.hookargs[b'txnid'] = txnid | |
2168 | tr.hookargs[b'txnname'] = desc |
|
2168 | tr.hookargs[b'txnname'] = desc | |
2169 | # note: writing the fncache only during finalize mean that the file is |
|
2169 | # note: writing the fncache only during finalize mean that the file is | |
2170 | # outdated when running hooks. As fncache is used for streaming clone, |
|
2170 | # outdated when running hooks. As fncache is used for streaming clone, | |
2171 | # this is not expected to break anything that happen during the hooks. |
|
2171 | # this is not expected to break anything that happen during the hooks. | |
2172 | tr.addfinalize(b'flush-fncache', self.store.write) |
|
2172 | tr.addfinalize(b'flush-fncache', self.store.write) | |
2173 |
|
2173 | |||
2174 | def txnclosehook(tr2): |
|
2174 | def txnclosehook(tr2): | |
2175 | """To be run if transaction is successful, will schedule a hook run |
|
2175 | """To be run if transaction is successful, will schedule a hook run | |
2176 | """ |
|
2176 | """ | |
2177 | # Don't reference tr2 in hook() so we don't hold a reference. |
|
2177 | # Don't reference tr2 in hook() so we don't hold a reference. | |
2178 | # This reduces memory consumption when there are multiple |
|
2178 | # This reduces memory consumption when there are multiple | |
2179 | # transactions per lock. This can likely go away if issue5045 |
|
2179 | # transactions per lock. This can likely go away if issue5045 | |
2180 | # fixes the function accumulation. |
|
2180 | # fixes the function accumulation. | |
2181 | hookargs = tr2.hookargs |
|
2181 | hookargs = tr2.hookargs | |
2182 |
|
2182 | |||
2183 | def hookfunc(): |
|
2183 | def hookfunc(): | |
2184 | repo = reporef() |
|
2184 | repo = reporef() | |
2185 | if hook.hashook(repo.ui, b'txnclose-bookmark'): |
|
2185 | if hook.hashook(repo.ui, b'txnclose-bookmark'): | |
2186 | bmchanges = sorted(tr.changes[b'bookmarks'].items()) |
|
2186 | bmchanges = sorted(tr.changes[b'bookmarks'].items()) | |
2187 | for name, (old, new) in bmchanges: |
|
2187 | for name, (old, new) in bmchanges: | |
2188 | args = tr.hookargs.copy() |
|
2188 | args = tr.hookargs.copy() | |
2189 | args.update(bookmarks.preparehookargs(name, old, new)) |
|
2189 | args.update(bookmarks.preparehookargs(name, old, new)) | |
2190 | repo.hook( |
|
2190 | repo.hook( | |
2191 | b'txnclose-bookmark', |
|
2191 | b'txnclose-bookmark', | |
2192 | throw=False, |
|
2192 | throw=False, | |
2193 | **pycompat.strkwargs(args) |
|
2193 | **pycompat.strkwargs(args) | |
2194 | ) |
|
2194 | ) | |
2195 |
|
2195 | |||
2196 | if hook.hashook(repo.ui, b'txnclose-phase'): |
|
2196 | if hook.hashook(repo.ui, b'txnclose-phase'): | |
2197 | cl = repo.unfiltered().changelog |
|
2197 | cl = repo.unfiltered().changelog | |
2198 | phasemv = sorted(tr.changes[b'phases'].items()) |
|
2198 | phasemv = sorted(tr.changes[b'phases'].items()) | |
2199 | for rev, (old, new) in phasemv: |
|
2199 | for rev, (old, new) in phasemv: | |
2200 | args = tr.hookargs.copy() |
|
2200 | args = tr.hookargs.copy() | |
2201 | node = hex(cl.node(rev)) |
|
2201 | node = hex(cl.node(rev)) | |
2202 | args.update(phases.preparehookargs(node, old, new)) |
|
2202 | args.update(phases.preparehookargs(node, old, new)) | |
2203 | repo.hook( |
|
2203 | repo.hook( | |
2204 | b'txnclose-phase', |
|
2204 | b'txnclose-phase', | |
2205 | throw=False, |
|
2205 | throw=False, | |
2206 | **pycompat.strkwargs(args) |
|
2206 | **pycompat.strkwargs(args) | |
2207 | ) |
|
2207 | ) | |
2208 |
|
2208 | |||
2209 | repo.hook( |
|
2209 | repo.hook( | |
2210 | b'txnclose', throw=False, **pycompat.strkwargs(hookargs) |
|
2210 | b'txnclose', throw=False, **pycompat.strkwargs(hookargs) | |
2211 | ) |
|
2211 | ) | |
2212 |
|
2212 | |||
2213 | reporef()._afterlock(hookfunc) |
|
2213 | reporef()._afterlock(hookfunc) | |
2214 |
|
2214 | |||
2215 | tr.addfinalize(b'txnclose-hook', txnclosehook) |
|
2215 | tr.addfinalize(b'txnclose-hook', txnclosehook) | |
2216 | # Include a leading "-" to make it happen before the transaction summary |
|
2216 | # Include a leading "-" to make it happen before the transaction summary | |
2217 | # reports registered via scmutil.registersummarycallback() whose names |
|
2217 | # reports registered via scmutil.registersummarycallback() whose names | |
2218 | # are 00-txnreport etc. That way, the caches will be warm when the |
|
2218 | # are 00-txnreport etc. That way, the caches will be warm when the | |
2219 | # callbacks run. |
|
2219 | # callbacks run. | |
2220 | tr.addpostclose(b'-warm-cache', self._buildcacheupdater(tr)) |
|
2220 | tr.addpostclose(b'-warm-cache', self._buildcacheupdater(tr)) | |
2221 |
|
2221 | |||
2222 | def txnaborthook(tr2): |
|
2222 | def txnaborthook(tr2): | |
2223 | """To be run if transaction is aborted |
|
2223 | """To be run if transaction is aborted | |
2224 | """ |
|
2224 | """ | |
2225 | reporef().hook( |
|
2225 | reporef().hook( | |
2226 | b'txnabort', throw=False, **pycompat.strkwargs(tr2.hookargs) |
|
2226 | b'txnabort', throw=False, **pycompat.strkwargs(tr2.hookargs) | |
2227 | ) |
|
2227 | ) | |
2228 |
|
2228 | |||
2229 | tr.addabort(b'txnabort-hook', txnaborthook) |
|
2229 | tr.addabort(b'txnabort-hook', txnaborthook) | |
2230 | # avoid eager cache invalidation. in-memory data should be identical |
|
2230 | # avoid eager cache invalidation. in-memory data should be identical | |
2231 | # to stored data if transaction has no error. |
|
2231 | # to stored data if transaction has no error. | |
2232 | tr.addpostclose(b'refresh-filecachestats', self._refreshfilecachestats) |
|
2232 | tr.addpostclose(b'refresh-filecachestats', self._refreshfilecachestats) | |
2233 | self._transref = weakref.ref(tr) |
|
2233 | self._transref = weakref.ref(tr) | |
2234 | scmutil.registersummarycallback(self, tr, desc) |
|
2234 | scmutil.registersummarycallback(self, tr, desc) | |
2235 | return tr |
|
2235 | return tr | |
2236 |
|
2236 | |||
2237 | def _journalfiles(self): |
|
2237 | def _journalfiles(self): | |
2238 | return ( |
|
2238 | return ( | |
2239 | (self.svfs, b'journal'), |
|
2239 | (self.svfs, b'journal'), | |
2240 | (self.svfs, b'journal.narrowspec'), |
|
2240 | (self.svfs, b'journal.narrowspec'), | |
2241 | (self.vfs, b'journal.narrowspec.dirstate'), |
|
2241 | (self.vfs, b'journal.narrowspec.dirstate'), | |
2242 | (self.vfs, b'journal.dirstate'), |
|
2242 | (self.vfs, b'journal.dirstate'), | |
2243 | (self.vfs, b'journal.branch'), |
|
2243 | (self.vfs, b'journal.branch'), | |
2244 | (self.vfs, b'journal.desc'), |
|
2244 | (self.vfs, b'journal.desc'), | |
2245 | (bookmarks.bookmarksvfs(self), b'journal.bookmarks'), |
|
2245 | (bookmarks.bookmarksvfs(self), b'journal.bookmarks'), | |
2246 | (self.svfs, b'journal.phaseroots'), |
|
2246 | (self.svfs, b'journal.phaseroots'), | |
2247 | ) |
|
2247 | ) | |
2248 |
|
2248 | |||
2249 | def undofiles(self): |
|
2249 | def undofiles(self): | |
2250 | return [(vfs, undoname(x)) for vfs, x in self._journalfiles()] |
|
2250 | return [(vfs, undoname(x)) for vfs, x in self._journalfiles()] | |
2251 |
|
2251 | |||
2252 | @unfilteredmethod |
|
2252 | @unfilteredmethod | |
2253 | def _writejournal(self, desc): |
|
2253 | def _writejournal(self, desc): | |
2254 | self.dirstate.savebackup(None, b'journal.dirstate') |
|
2254 | self.dirstate.savebackup(None, b'journal.dirstate') | |
2255 | narrowspec.savewcbackup(self, b'journal.narrowspec.dirstate') |
|
2255 | narrowspec.savewcbackup(self, b'journal.narrowspec.dirstate') | |
2256 | narrowspec.savebackup(self, b'journal.narrowspec') |
|
2256 | narrowspec.savebackup(self, b'journal.narrowspec') | |
2257 | self.vfs.write( |
|
2257 | self.vfs.write( | |
2258 | b"journal.branch", encoding.fromlocal(self.dirstate.branch()) |
|
2258 | b"journal.branch", encoding.fromlocal(self.dirstate.branch()) | |
2259 | ) |
|
2259 | ) | |
2260 | self.vfs.write(b"journal.desc", b"%d\n%s\n" % (len(self), desc)) |
|
2260 | self.vfs.write(b"journal.desc", b"%d\n%s\n" % (len(self), desc)) | |
2261 | bookmarksvfs = bookmarks.bookmarksvfs(self) |
|
2261 | bookmarksvfs = bookmarks.bookmarksvfs(self) | |
2262 | bookmarksvfs.write( |
|
2262 | bookmarksvfs.write( | |
2263 | b"journal.bookmarks", bookmarksvfs.tryread(b"bookmarks") |
|
2263 | b"journal.bookmarks", bookmarksvfs.tryread(b"bookmarks") | |
2264 | ) |
|
2264 | ) | |
2265 | self.svfs.write(b"journal.phaseroots", self.svfs.tryread(b"phaseroots")) |
|
2265 | self.svfs.write(b"journal.phaseroots", self.svfs.tryread(b"phaseroots")) | |
2266 |
|
2266 | |||
2267 | def recover(self): |
|
2267 | def recover(self): | |
2268 | with self.lock(): |
|
2268 | with self.lock(): | |
2269 | if self.svfs.exists(b"journal"): |
|
2269 | if self.svfs.exists(b"journal"): | |
2270 | self.ui.status(_(b"rolling back interrupted transaction\n")) |
|
2270 | self.ui.status(_(b"rolling back interrupted transaction\n")) | |
2271 | vfsmap = { |
|
2271 | vfsmap = { | |
2272 | b'': self.svfs, |
|
2272 | b'': self.svfs, | |
2273 | b'plain': self.vfs, |
|
2273 | b'plain': self.vfs, | |
2274 | } |
|
2274 | } | |
2275 | transaction.rollback( |
|
2275 | transaction.rollback( | |
2276 | self.svfs, |
|
2276 | self.svfs, | |
2277 | vfsmap, |
|
2277 | vfsmap, | |
2278 | b"journal", |
|
2278 | b"journal", | |
2279 | self.ui.warn, |
|
2279 | self.ui.warn, | |
2280 | checkambigfiles=_cachedfiles, |
|
2280 | checkambigfiles=_cachedfiles, | |
2281 | ) |
|
2281 | ) | |
2282 | self.invalidate() |
|
2282 | self.invalidate() | |
2283 | return True |
|
2283 | return True | |
2284 | else: |
|
2284 | else: | |
2285 | self.ui.warn(_(b"no interrupted transaction available\n")) |
|
2285 | self.ui.warn(_(b"no interrupted transaction available\n")) | |
2286 | return False |
|
2286 | return False | |
2287 |
|
2287 | |||
2288 | def rollback(self, dryrun=False, force=False): |
|
2288 | def rollback(self, dryrun=False, force=False): | |
2289 | wlock = lock = dsguard = None |
|
2289 | wlock = lock = dsguard = None | |
2290 | try: |
|
2290 | try: | |
2291 | wlock = self.wlock() |
|
2291 | wlock = self.wlock() | |
2292 | lock = self.lock() |
|
2292 | lock = self.lock() | |
2293 | if self.svfs.exists(b"undo"): |
|
2293 | if self.svfs.exists(b"undo"): | |
2294 | dsguard = dirstateguard.dirstateguard(self, b'rollback') |
|
2294 | dsguard = dirstateguard.dirstateguard(self, b'rollback') | |
2295 |
|
2295 | |||
2296 | return self._rollback(dryrun, force, dsguard) |
|
2296 | return self._rollback(dryrun, force, dsguard) | |
2297 | else: |
|
2297 | else: | |
2298 | self.ui.warn(_(b"no rollback information available\n")) |
|
2298 | self.ui.warn(_(b"no rollback information available\n")) | |
2299 | return 1 |
|
2299 | return 1 | |
2300 | finally: |
|
2300 | finally: | |
2301 | release(dsguard, lock, wlock) |
|
2301 | release(dsguard, lock, wlock) | |
2302 |
|
2302 | |||
2303 | @unfilteredmethod # Until we get smarter cache management |
|
2303 | @unfilteredmethod # Until we get smarter cache management | |
2304 | def _rollback(self, dryrun, force, dsguard): |
|
2304 | def _rollback(self, dryrun, force, dsguard): | |
2305 | ui = self.ui |
|
2305 | ui = self.ui | |
2306 | try: |
|
2306 | try: | |
2307 | args = self.vfs.read(b'undo.desc').splitlines() |
|
2307 | args = self.vfs.read(b'undo.desc').splitlines() | |
2308 | (oldlen, desc, detail) = (int(args[0]), args[1], None) |
|
2308 | (oldlen, desc, detail) = (int(args[0]), args[1], None) | |
2309 | if len(args) >= 3: |
|
2309 | if len(args) >= 3: | |
2310 | detail = args[2] |
|
2310 | detail = args[2] | |
2311 | oldtip = oldlen - 1 |
|
2311 | oldtip = oldlen - 1 | |
2312 |
|
2312 | |||
2313 | if detail and ui.verbose: |
|
2313 | if detail and ui.verbose: | |
2314 | msg = _( |
|
2314 | msg = _( | |
2315 | b'repository tip rolled back to revision %d' |
|
2315 | b'repository tip rolled back to revision %d' | |
2316 | b' (undo %s: %s)\n' |
|
2316 | b' (undo %s: %s)\n' | |
2317 | ) % (oldtip, desc, detail) |
|
2317 | ) % (oldtip, desc, detail) | |
2318 | else: |
|
2318 | else: | |
2319 | msg = _( |
|
2319 | msg = _( | |
2320 | b'repository tip rolled back to revision %d (undo %s)\n' |
|
2320 | b'repository tip rolled back to revision %d (undo %s)\n' | |
2321 | ) % (oldtip, desc) |
|
2321 | ) % (oldtip, desc) | |
2322 | except IOError: |
|
2322 | except IOError: | |
2323 | msg = _(b'rolling back unknown transaction\n') |
|
2323 | msg = _(b'rolling back unknown transaction\n') | |
2324 | desc = None |
|
2324 | desc = None | |
2325 |
|
2325 | |||
2326 | if not force and self[b'.'] != self[b'tip'] and desc == b'commit': |
|
2326 | if not force and self[b'.'] != self[b'tip'] and desc == b'commit': | |
2327 | raise error.Abort( |
|
2327 | raise error.Abort( | |
2328 | _( |
|
2328 | _( | |
2329 | b'rollback of last commit while not checked out ' |
|
2329 | b'rollback of last commit while not checked out ' | |
2330 | b'may lose data' |
|
2330 | b'may lose data' | |
2331 | ), |
|
2331 | ), | |
2332 | hint=_(b'use -f to force'), |
|
2332 | hint=_(b'use -f to force'), | |
2333 | ) |
|
2333 | ) | |
2334 |
|
2334 | |||
2335 | ui.status(msg) |
|
2335 | ui.status(msg) | |
2336 | if dryrun: |
|
2336 | if dryrun: | |
2337 | return 0 |
|
2337 | return 0 | |
2338 |
|
2338 | |||
2339 | parents = self.dirstate.parents() |
|
2339 | parents = self.dirstate.parents() | |
2340 | self.destroying() |
|
2340 | self.destroying() | |
2341 | vfsmap = {b'plain': self.vfs, b'': self.svfs} |
|
2341 | vfsmap = {b'plain': self.vfs, b'': self.svfs} | |
2342 | transaction.rollback( |
|
2342 | transaction.rollback( | |
2343 | self.svfs, vfsmap, b'undo', ui.warn, checkambigfiles=_cachedfiles |
|
2343 | self.svfs, vfsmap, b'undo', ui.warn, checkambigfiles=_cachedfiles | |
2344 | ) |
|
2344 | ) | |
2345 | bookmarksvfs = bookmarks.bookmarksvfs(self) |
|
2345 | bookmarksvfs = bookmarks.bookmarksvfs(self) | |
2346 | if bookmarksvfs.exists(b'undo.bookmarks'): |
|
2346 | if bookmarksvfs.exists(b'undo.bookmarks'): | |
2347 | bookmarksvfs.rename( |
|
2347 | bookmarksvfs.rename( | |
2348 | b'undo.bookmarks', b'bookmarks', checkambig=True |
|
2348 | b'undo.bookmarks', b'bookmarks', checkambig=True | |
2349 | ) |
|
2349 | ) | |
2350 | if self.svfs.exists(b'undo.phaseroots'): |
|
2350 | if self.svfs.exists(b'undo.phaseroots'): | |
2351 | self.svfs.rename(b'undo.phaseroots', b'phaseroots', checkambig=True) |
|
2351 | self.svfs.rename(b'undo.phaseroots', b'phaseroots', checkambig=True) | |
2352 | self.invalidate() |
|
2352 | self.invalidate() | |
2353 |
|
2353 | |||
2354 | has_node = self.changelog.index.has_node |
|
2354 | has_node = self.changelog.index.has_node | |
2355 | parentgone = any(not has_node(p) for p in parents) |
|
2355 | parentgone = any(not has_node(p) for p in parents) | |
2356 | if parentgone: |
|
2356 | if parentgone: | |
2357 | # prevent dirstateguard from overwriting already restored one |
|
2357 | # prevent dirstateguard from overwriting already restored one | |
2358 | dsguard.close() |
|
2358 | dsguard.close() | |
2359 |
|
2359 | |||
2360 | narrowspec.restorebackup(self, b'undo.narrowspec') |
|
2360 | narrowspec.restorebackup(self, b'undo.narrowspec') | |
2361 | narrowspec.restorewcbackup(self, b'undo.narrowspec.dirstate') |
|
2361 | narrowspec.restorewcbackup(self, b'undo.narrowspec.dirstate') | |
2362 | self.dirstate.restorebackup(None, b'undo.dirstate') |
|
2362 | self.dirstate.restorebackup(None, b'undo.dirstate') | |
2363 | try: |
|
2363 | try: | |
2364 | branch = self.vfs.read(b'undo.branch') |
|
2364 | branch = self.vfs.read(b'undo.branch') | |
2365 | self.dirstate.setbranch(encoding.tolocal(branch)) |
|
2365 | self.dirstate.setbranch(encoding.tolocal(branch)) | |
2366 | except IOError: |
|
2366 | except IOError: | |
2367 | ui.warn( |
|
2367 | ui.warn( | |
2368 | _( |
|
2368 | _( | |
2369 | b'named branch could not be reset: ' |
|
2369 | b'named branch could not be reset: ' | |
2370 | b'current branch is still \'%s\'\n' |
|
2370 | b'current branch is still \'%s\'\n' | |
2371 | ) |
|
2371 | ) | |
2372 | % self.dirstate.branch() |
|
2372 | % self.dirstate.branch() | |
2373 | ) |
|
2373 | ) | |
2374 |
|
2374 | |||
2375 | parents = tuple([p.rev() for p in self[None].parents()]) |
|
2375 | parents = tuple([p.rev() for p in self[None].parents()]) | |
2376 | if len(parents) > 1: |
|
2376 | if len(parents) > 1: | |
2377 | ui.status( |
|
2377 | ui.status( | |
2378 | _( |
|
2378 | _( | |
2379 | b'working directory now based on ' |
|
2379 | b'working directory now based on ' | |
2380 | b'revisions %d and %d\n' |
|
2380 | b'revisions %d and %d\n' | |
2381 | ) |
|
2381 | ) | |
2382 | % parents |
|
2382 | % parents | |
2383 | ) |
|
2383 | ) | |
2384 | else: |
|
2384 | else: | |
2385 | ui.status( |
|
2385 | ui.status( | |
2386 | _(b'working directory now based on revision %d\n') % parents |
|
2386 | _(b'working directory now based on revision %d\n') % parents | |
2387 | ) |
|
2387 | ) | |
2388 | mergemod.mergestate.clean(self, self[b'.'].node()) |
|
2388 | mergemod.mergestate.clean(self, self[b'.'].node()) | |
2389 |
|
2389 | |||
2390 | # TODO: if we know which new heads may result from this rollback, pass |
|
2390 | # TODO: if we know which new heads may result from this rollback, pass | |
2391 | # them to destroy(), which will prevent the branchhead cache from being |
|
2391 | # them to destroy(), which will prevent the branchhead cache from being | |
2392 | # invalidated. |
|
2392 | # invalidated. | |
2393 | self.destroyed() |
|
2393 | self.destroyed() | |
2394 | return 0 |
|
2394 | return 0 | |
2395 |
|
2395 | |||
2396 | def _buildcacheupdater(self, newtransaction): |
|
2396 | def _buildcacheupdater(self, newtransaction): | |
2397 | """called during transaction to build the callback updating cache |
|
2397 | """called during transaction to build the callback updating cache | |
2398 |
|
2398 | |||
2399 | Lives on the repository to help extension who might want to augment |
|
2399 | Lives on the repository to help extension who might want to augment | |
2400 | this logic. For this purpose, the created transaction is passed to the |
|
2400 | this logic. For this purpose, the created transaction is passed to the | |
2401 | method. |
|
2401 | method. | |
2402 | """ |
|
2402 | """ | |
2403 | # we must avoid cyclic reference between repo and transaction. |
|
2403 | # we must avoid cyclic reference between repo and transaction. | |
2404 | reporef = weakref.ref(self) |
|
2404 | reporef = weakref.ref(self) | |
2405 |
|
2405 | |||
2406 | def updater(tr): |
|
2406 | def updater(tr): | |
2407 | repo = reporef() |
|
2407 | repo = reporef() | |
2408 | repo.updatecaches(tr) |
|
2408 | repo.updatecaches(tr) | |
2409 |
|
2409 | |||
2410 | return updater |
|
2410 | return updater | |
2411 |
|
2411 | |||
2412 | @unfilteredmethod |
|
2412 | @unfilteredmethod | |
2413 | def updatecaches(self, tr=None, full=False): |
|
2413 | def updatecaches(self, tr=None, full=False): | |
2414 | """warm appropriate caches |
|
2414 | """warm appropriate caches | |
2415 |
|
2415 | |||
2416 | If this function is called after a transaction closed. The transaction |
|
2416 | If this function is called after a transaction closed. The transaction | |
2417 | will be available in the 'tr' argument. This can be used to selectively |
|
2417 | will be available in the 'tr' argument. This can be used to selectively | |
2418 | update caches relevant to the changes in that transaction. |
|
2418 | update caches relevant to the changes in that transaction. | |
2419 |
|
2419 | |||
2420 | If 'full' is set, make sure all caches the function knows about have |
|
2420 | If 'full' is set, make sure all caches the function knows about have | |
2421 | up-to-date data. Even the ones usually loaded more lazily. |
|
2421 | up-to-date data. Even the ones usually loaded more lazily. | |
2422 | """ |
|
2422 | """ | |
2423 | if tr is not None and tr.hookargs.get(b'source') == b'strip': |
|
2423 | if tr is not None and tr.hookargs.get(b'source') == b'strip': | |
2424 | # During strip, many caches are invalid but |
|
2424 | # During strip, many caches are invalid but | |
2425 | # later call to `destroyed` will refresh them. |
|
2425 | # later call to `destroyed` will refresh them. | |
2426 | return |
|
2426 | return | |
2427 |
|
2427 | |||
2428 | if tr is None or tr.changes[b'origrepolen'] < len(self): |
|
2428 | if tr is None or tr.changes[b'origrepolen'] < len(self): | |
2429 | # accessing the 'ser ved' branchmap should refresh all the others, |
|
2429 | # accessing the 'ser ved' branchmap should refresh all the others, | |
2430 | self.ui.debug(b'updating the branch cache\n') |
|
2430 | self.ui.debug(b'updating the branch cache\n') | |
2431 | self.filtered(b'served').branchmap() |
|
2431 | self.filtered(b'served').branchmap() | |
2432 | self.filtered(b'served.hidden').branchmap() |
|
2432 | self.filtered(b'served.hidden').branchmap() | |
2433 |
|
2433 | |||
2434 | if full: |
|
2434 | if full: | |
2435 | unfi = self.unfiltered() |
|
2435 | unfi = self.unfiltered() | |
2436 | rbc = unfi.revbranchcache() |
|
2436 | rbc = unfi.revbranchcache() | |
2437 | for r in unfi.changelog: |
|
2437 | for r in unfi.changelog: | |
2438 | rbc.branchinfo(r) |
|
2438 | rbc.branchinfo(r) | |
2439 | rbc.write() |
|
2439 | rbc.write() | |
2440 |
|
2440 | |||
2441 | # ensure the working copy parents are in the manifestfulltextcache |
|
2441 | # ensure the working copy parents are in the manifestfulltextcache | |
2442 | for ctx in self[b'.'].parents(): |
|
2442 | for ctx in self[b'.'].parents(): | |
2443 | ctx.manifest() # accessing the manifest is enough |
|
2443 | ctx.manifest() # accessing the manifest is enough | |
2444 |
|
2444 | |||
2445 | # accessing fnode cache warms the cache |
|
2445 | # accessing fnode cache warms the cache | |
2446 | tagsmod.fnoderevs(self.ui, unfi, unfi.changelog.revs()) |
|
2446 | tagsmod.fnoderevs(self.ui, unfi, unfi.changelog.revs()) | |
2447 | # accessing tags warm the cache |
|
2447 | # accessing tags warm the cache | |
2448 | self.tags() |
|
2448 | self.tags() | |
2449 | self.filtered(b'served').tags() |
|
2449 | self.filtered(b'served').tags() | |
2450 |
|
2450 | |||
2451 | # The `full` arg is documented as updating even the lazily-loaded |
|
2451 | # The `full` arg is documented as updating even the lazily-loaded | |
2452 | # caches immediately, so we're forcing a write to cause these caches |
|
2452 | # caches immediately, so we're forcing a write to cause these caches | |
2453 | # to be warmed up even if they haven't explicitly been requested |
|
2453 | # to be warmed up even if they haven't explicitly been requested | |
2454 | # yet (if they've never been used by hg, they won't ever have been |
|
2454 | # yet (if they've never been used by hg, they won't ever have been | |
2455 | # written, even if they're a subset of another kind of cache that |
|
2455 | # written, even if they're a subset of another kind of cache that | |
2456 | # *has* been used). |
|
2456 | # *has* been used). | |
2457 | for filt in repoview.filtertable.keys(): |
|
2457 | for filt in repoview.filtertable.keys(): | |
2458 | filtered = self.filtered(filt) |
|
2458 | filtered = self.filtered(filt) | |
2459 | filtered.branchmap().write(filtered) |
|
2459 | filtered.branchmap().write(filtered) | |
2460 |
|
2460 | |||
2461 | def invalidatecaches(self): |
|
2461 | def invalidatecaches(self): | |
2462 |
|
2462 | |||
2463 | if '_tagscache' in vars(self): |
|
2463 | if '_tagscache' in vars(self): | |
2464 | # can't use delattr on proxy |
|
2464 | # can't use delattr on proxy | |
2465 | del self.__dict__['_tagscache'] |
|
2465 | del self.__dict__['_tagscache'] | |
2466 |
|
2466 | |||
2467 | self._branchcaches.clear() |
|
2467 | self._branchcaches.clear() | |
2468 | self.invalidatevolatilesets() |
|
2468 | self.invalidatevolatilesets() | |
2469 | self._sparsesignaturecache.clear() |
|
2469 | self._sparsesignaturecache.clear() | |
2470 |
|
2470 | |||
2471 | def invalidatevolatilesets(self): |
|
2471 | def invalidatevolatilesets(self): | |
2472 | self.filteredrevcache.clear() |
|
2472 | self.filteredrevcache.clear() | |
2473 | obsolete.clearobscaches(self) |
|
2473 | obsolete.clearobscaches(self) | |
2474 |
|
2474 | |||
2475 | def invalidatedirstate(self): |
|
2475 | def invalidatedirstate(self): | |
2476 | '''Invalidates the dirstate, causing the next call to dirstate |
|
2476 | '''Invalidates the dirstate, causing the next call to dirstate | |
2477 | to check if it was modified since the last time it was read, |
|
2477 | to check if it was modified since the last time it was read, | |
2478 | rereading it if it has. |
|
2478 | rereading it if it has. | |
2479 |
|
2479 | |||
2480 | This is different to dirstate.invalidate() that it doesn't always |
|
2480 | This is different to dirstate.invalidate() that it doesn't always | |
2481 | rereads the dirstate. Use dirstate.invalidate() if you want to |
|
2481 | rereads the dirstate. Use dirstate.invalidate() if you want to | |
2482 | explicitly read the dirstate again (i.e. restoring it to a previous |
|
2482 | explicitly read the dirstate again (i.e. restoring it to a previous | |
2483 | known good state).''' |
|
2483 | known good state).''' | |
2484 | if hasunfilteredcache(self, 'dirstate'): |
|
2484 | if hasunfilteredcache(self, 'dirstate'): | |
2485 | for k in self.dirstate._filecache: |
|
2485 | for k in self.dirstate._filecache: | |
2486 | try: |
|
2486 | try: | |
2487 | delattr(self.dirstate, k) |
|
2487 | delattr(self.dirstate, k) | |
2488 | except AttributeError: |
|
2488 | except AttributeError: | |
2489 | pass |
|
2489 | pass | |
2490 | delattr(self.unfiltered(), 'dirstate') |
|
2490 | delattr(self.unfiltered(), 'dirstate') | |
2491 |
|
2491 | |||
2492 | def invalidate(self, clearfilecache=False): |
|
2492 | def invalidate(self, clearfilecache=False): | |
2493 | '''Invalidates both store and non-store parts other than dirstate |
|
2493 | '''Invalidates both store and non-store parts other than dirstate | |
2494 |
|
2494 | |||
2495 | If a transaction is running, invalidation of store is omitted, |
|
2495 | If a transaction is running, invalidation of store is omitted, | |
2496 | because discarding in-memory changes might cause inconsistency |
|
2496 | because discarding in-memory changes might cause inconsistency | |
2497 | (e.g. incomplete fncache causes unintentional failure, but |
|
2497 | (e.g. incomplete fncache causes unintentional failure, but | |
2498 | redundant one doesn't). |
|
2498 | redundant one doesn't). | |
2499 | ''' |
|
2499 | ''' | |
2500 | unfiltered = self.unfiltered() # all file caches are stored unfiltered |
|
2500 | unfiltered = self.unfiltered() # all file caches are stored unfiltered | |
2501 | for k in list(self._filecache.keys()): |
|
2501 | for k in list(self._filecache.keys()): | |
2502 | # dirstate is invalidated separately in invalidatedirstate() |
|
2502 | # dirstate is invalidated separately in invalidatedirstate() | |
2503 | if k == b'dirstate': |
|
2503 | if k == b'dirstate': | |
2504 | continue |
|
2504 | continue | |
2505 | if ( |
|
2505 | if ( | |
2506 | k == b'changelog' |
|
2506 | k == b'changelog' | |
2507 | and self.currenttransaction() |
|
2507 | and self.currenttransaction() | |
2508 | and self.changelog._delayed |
|
2508 | and self.changelog._delayed | |
2509 | ): |
|
2509 | ): | |
2510 | # The changelog object may store unwritten revisions. We don't |
|
2510 | # The changelog object may store unwritten revisions. We don't | |
2511 | # want to lose them. |
|
2511 | # want to lose them. | |
2512 | # TODO: Solve the problem instead of working around it. |
|
2512 | # TODO: Solve the problem instead of working around it. | |
2513 | continue |
|
2513 | continue | |
2514 |
|
2514 | |||
2515 | if clearfilecache: |
|
2515 | if clearfilecache: | |
2516 | del self._filecache[k] |
|
2516 | del self._filecache[k] | |
2517 | try: |
|
2517 | try: | |
2518 | delattr(unfiltered, k) |
|
2518 | delattr(unfiltered, k) | |
2519 | except AttributeError: |
|
2519 | except AttributeError: | |
2520 | pass |
|
2520 | pass | |
2521 | self.invalidatecaches() |
|
2521 | self.invalidatecaches() | |
2522 | if not self.currenttransaction(): |
|
2522 | if not self.currenttransaction(): | |
2523 | # TODO: Changing contents of store outside transaction |
|
2523 | # TODO: Changing contents of store outside transaction | |
2524 | # causes inconsistency. We should make in-memory store |
|
2524 | # causes inconsistency. We should make in-memory store | |
2525 | # changes detectable, and abort if changed. |
|
2525 | # changes detectable, and abort if changed. | |
2526 | self.store.invalidatecaches() |
|
2526 | self.store.invalidatecaches() | |
2527 |
|
2527 | |||
2528 | def invalidateall(self): |
|
2528 | def invalidateall(self): | |
2529 | '''Fully invalidates both store and non-store parts, causing the |
|
2529 | '''Fully invalidates both store and non-store parts, causing the | |
2530 | subsequent operation to reread any outside changes.''' |
|
2530 | subsequent operation to reread any outside changes.''' | |
2531 | # extension should hook this to invalidate its caches |
|
2531 | # extension should hook this to invalidate its caches | |
2532 | self.invalidate() |
|
2532 | self.invalidate() | |
2533 | self.invalidatedirstate() |
|
2533 | self.invalidatedirstate() | |
2534 |
|
2534 | |||
2535 | @unfilteredmethod |
|
2535 | @unfilteredmethod | |
2536 | def _refreshfilecachestats(self, tr): |
|
2536 | def _refreshfilecachestats(self, tr): | |
2537 | """Reload stats of cached files so that they are flagged as valid""" |
|
2537 | """Reload stats of cached files so that they are flagged as valid""" | |
2538 | for k, ce in self._filecache.items(): |
|
2538 | for k, ce in self._filecache.items(): | |
2539 | k = pycompat.sysstr(k) |
|
2539 | k = pycompat.sysstr(k) | |
2540 | if k == 'dirstate' or k not in self.__dict__: |
|
2540 | if k == 'dirstate' or k not in self.__dict__: | |
2541 | continue |
|
2541 | continue | |
2542 | ce.refresh() |
|
2542 | ce.refresh() | |
2543 |
|
2543 | |||
2544 | def _lock( |
|
2544 | def _lock( | |
2545 | self, |
|
2545 | self, | |
2546 | vfs, |
|
2546 | vfs, | |
2547 | lockname, |
|
2547 | lockname, | |
2548 | wait, |
|
2548 | wait, | |
2549 | releasefn, |
|
2549 | releasefn, | |
2550 | acquirefn, |
|
2550 | acquirefn, | |
2551 | desc, |
|
2551 | desc, | |
2552 | inheritchecker=None, |
|
2552 | inheritchecker=None, | |
2553 | parentenvvar=None, |
|
2553 | parentenvvar=None, | |
2554 | ): |
|
2554 | ): | |
2555 | parentlock = None |
|
2555 | parentlock = None | |
2556 | # the contents of parentenvvar are used by the underlying lock to |
|
2556 | # the contents of parentenvvar are used by the underlying lock to | |
2557 | # determine whether it can be inherited |
|
2557 | # determine whether it can be inherited | |
2558 | if parentenvvar is not None: |
|
2558 | if parentenvvar is not None: | |
2559 | parentlock = encoding.environ.get(parentenvvar) |
|
2559 | parentlock = encoding.environ.get(parentenvvar) | |
2560 |
|
2560 | |||
2561 | timeout = 0 |
|
2561 | timeout = 0 | |
2562 | warntimeout = 0 |
|
2562 | warntimeout = 0 | |
2563 | if wait: |
|
2563 | if wait: | |
2564 | timeout = self.ui.configint(b"ui", b"timeout") |
|
2564 | timeout = self.ui.configint(b"ui", b"timeout") | |
2565 | warntimeout = self.ui.configint(b"ui", b"timeout.warn") |
|
2565 | warntimeout = self.ui.configint(b"ui", b"timeout.warn") | |
2566 | # internal config: ui.signal-safe-lock |
|
2566 | # internal config: ui.signal-safe-lock | |
2567 | signalsafe = self.ui.configbool(b'ui', b'signal-safe-lock') |
|
2567 | signalsafe = self.ui.configbool(b'ui', b'signal-safe-lock') | |
2568 |
|
2568 | |||
2569 | l = lockmod.trylock( |
|
2569 | l = lockmod.trylock( | |
2570 | self.ui, |
|
2570 | self.ui, | |
2571 | vfs, |
|
2571 | vfs, | |
2572 | lockname, |
|
2572 | lockname, | |
2573 | timeout, |
|
2573 | timeout, | |
2574 | warntimeout, |
|
2574 | warntimeout, | |
2575 | releasefn=releasefn, |
|
2575 | releasefn=releasefn, | |
2576 | acquirefn=acquirefn, |
|
2576 | acquirefn=acquirefn, | |
2577 | desc=desc, |
|
2577 | desc=desc, | |
2578 | inheritchecker=inheritchecker, |
|
2578 | inheritchecker=inheritchecker, | |
2579 | parentlock=parentlock, |
|
2579 | parentlock=parentlock, | |
2580 | signalsafe=signalsafe, |
|
2580 | signalsafe=signalsafe, | |
2581 | ) |
|
2581 | ) | |
2582 | return l |
|
2582 | return l | |
2583 |
|
2583 | |||
2584 | def _afterlock(self, callback): |
|
2584 | def _afterlock(self, callback): | |
2585 | """add a callback to be run when the repository is fully unlocked |
|
2585 | """add a callback to be run when the repository is fully unlocked | |
2586 |
|
2586 | |||
2587 | The callback will be executed when the outermost lock is released |
|
2587 | The callback will be executed when the outermost lock is released | |
2588 | (with wlock being higher level than 'lock').""" |
|
2588 | (with wlock being higher level than 'lock').""" | |
2589 | for ref in (self._wlockref, self._lockref): |
|
2589 | for ref in (self._wlockref, self._lockref): | |
2590 | l = ref and ref() |
|
2590 | l = ref and ref() | |
2591 | if l and l.held: |
|
2591 | if l and l.held: | |
2592 | l.postrelease.append(callback) |
|
2592 | l.postrelease.append(callback) | |
2593 | break |
|
2593 | break | |
2594 | else: # no lock have been found. |
|
2594 | else: # no lock have been found. | |
2595 | callback() |
|
2595 | callback() | |
2596 |
|
2596 | |||
2597 | def lock(self, wait=True): |
|
2597 | def lock(self, wait=True): | |
2598 | '''Lock the repository store (.hg/store) and return a weak reference |
|
2598 | '''Lock the repository store (.hg/store) and return a weak reference | |
2599 | to the lock. Use this before modifying the store (e.g. committing or |
|
2599 | to the lock. Use this before modifying the store (e.g. committing or | |
2600 | stripping). If you are opening a transaction, get a lock as well.) |
|
2600 | stripping). If you are opening a transaction, get a lock as well.) | |
2601 |
|
2601 | |||
2602 | If both 'lock' and 'wlock' must be acquired, ensure you always acquires |
|
2602 | If both 'lock' and 'wlock' must be acquired, ensure you always acquires | |
2603 | 'wlock' first to avoid a dead-lock hazard.''' |
|
2603 | 'wlock' first to avoid a dead-lock hazard.''' | |
2604 | l = self._currentlock(self._lockref) |
|
2604 | l = self._currentlock(self._lockref) | |
2605 | if l is not None: |
|
2605 | if l is not None: | |
2606 | l.lock() |
|
2606 | l.lock() | |
2607 | return l |
|
2607 | return l | |
2608 |
|
2608 | |||
2609 | l = self._lock( |
|
2609 | l = self._lock( | |
2610 | vfs=self.svfs, |
|
2610 | vfs=self.svfs, | |
2611 | lockname=b"lock", |
|
2611 | lockname=b"lock", | |
2612 | wait=wait, |
|
2612 | wait=wait, | |
2613 | releasefn=None, |
|
2613 | releasefn=None, | |
2614 | acquirefn=self.invalidate, |
|
2614 | acquirefn=self.invalidate, | |
2615 | desc=_(b'repository %s') % self.origroot, |
|
2615 | desc=_(b'repository %s') % self.origroot, | |
2616 | ) |
|
2616 | ) | |
2617 | self._lockref = weakref.ref(l) |
|
2617 | self._lockref = weakref.ref(l) | |
2618 | return l |
|
2618 | return l | |
2619 |
|
2619 | |||
2620 | def _wlockchecktransaction(self): |
|
2620 | def _wlockchecktransaction(self): | |
2621 | if self.currenttransaction() is not None: |
|
2621 | if self.currenttransaction() is not None: | |
2622 | raise error.LockInheritanceContractViolation( |
|
2622 | raise error.LockInheritanceContractViolation( | |
2623 | b'wlock cannot be inherited in the middle of a transaction' |
|
2623 | b'wlock cannot be inherited in the middle of a transaction' | |
2624 | ) |
|
2624 | ) | |
2625 |
|
2625 | |||
2626 | def wlock(self, wait=True): |
|
2626 | def wlock(self, wait=True): | |
2627 | '''Lock the non-store parts of the repository (everything under |
|
2627 | '''Lock the non-store parts of the repository (everything under | |
2628 | .hg except .hg/store) and return a weak reference to the lock. |
|
2628 | .hg except .hg/store) and return a weak reference to the lock. | |
2629 |
|
2629 | |||
2630 | Use this before modifying files in .hg. |
|
2630 | Use this before modifying files in .hg. | |
2631 |
|
2631 | |||
2632 | If both 'lock' and 'wlock' must be acquired, ensure you always acquires |
|
2632 | If both 'lock' and 'wlock' must be acquired, ensure you always acquires | |
2633 | 'wlock' first to avoid a dead-lock hazard.''' |
|
2633 | 'wlock' first to avoid a dead-lock hazard.''' | |
2634 | l = self._wlockref and self._wlockref() |
|
2634 | l = self._wlockref and self._wlockref() | |
2635 | if l is not None and l.held: |
|
2635 | if l is not None and l.held: | |
2636 | l.lock() |
|
2636 | l.lock() | |
2637 | return l |
|
2637 | return l | |
2638 |
|
2638 | |||
2639 | # We do not need to check for non-waiting lock acquisition. Such |
|
2639 | # We do not need to check for non-waiting lock acquisition. Such | |
2640 | # acquisition would not cause dead-lock as they would just fail. |
|
2640 | # acquisition would not cause dead-lock as they would just fail. | |
2641 | if wait and ( |
|
2641 | if wait and ( | |
2642 | self.ui.configbool(b'devel', b'all-warnings') |
|
2642 | self.ui.configbool(b'devel', b'all-warnings') | |
2643 | or self.ui.configbool(b'devel', b'check-locks') |
|
2643 | or self.ui.configbool(b'devel', b'check-locks') | |
2644 | ): |
|
2644 | ): | |
2645 | if self._currentlock(self._lockref) is not None: |
|
2645 | if self._currentlock(self._lockref) is not None: | |
2646 | self.ui.develwarn(b'"wlock" acquired after "lock"') |
|
2646 | self.ui.develwarn(b'"wlock" acquired after "lock"') | |
2647 |
|
2647 | |||
2648 | def unlock(): |
|
2648 | def unlock(): | |
2649 | if self.dirstate.pendingparentchange(): |
|
2649 | if self.dirstate.pendingparentchange(): | |
2650 | self.dirstate.invalidate() |
|
2650 | self.dirstate.invalidate() | |
2651 | else: |
|
2651 | else: | |
2652 | self.dirstate.write(None) |
|
2652 | self.dirstate.write(None) | |
2653 |
|
2653 | |||
2654 | self._filecache[b'dirstate'].refresh() |
|
2654 | self._filecache[b'dirstate'].refresh() | |
2655 |
|
2655 | |||
2656 | l = self._lock( |
|
2656 | l = self._lock( | |
2657 | self.vfs, |
|
2657 | self.vfs, | |
2658 | b"wlock", |
|
2658 | b"wlock", | |
2659 | wait, |
|
2659 | wait, | |
2660 | unlock, |
|
2660 | unlock, | |
2661 | self.invalidatedirstate, |
|
2661 | self.invalidatedirstate, | |
2662 | _(b'working directory of %s') % self.origroot, |
|
2662 | _(b'working directory of %s') % self.origroot, | |
2663 | inheritchecker=self._wlockchecktransaction, |
|
2663 | inheritchecker=self._wlockchecktransaction, | |
2664 | parentenvvar=b'HG_WLOCK_LOCKER', |
|
2664 | parentenvvar=b'HG_WLOCK_LOCKER', | |
2665 | ) |
|
2665 | ) | |
2666 | self._wlockref = weakref.ref(l) |
|
2666 | self._wlockref = weakref.ref(l) | |
2667 | return l |
|
2667 | return l | |
2668 |
|
2668 | |||
2669 | def _currentlock(self, lockref): |
|
2669 | def _currentlock(self, lockref): | |
2670 | """Returns the lock if it's held, or None if it's not.""" |
|
2670 | """Returns the lock if it's held, or None if it's not.""" | |
2671 | if lockref is None: |
|
2671 | if lockref is None: | |
2672 | return None |
|
2672 | return None | |
2673 | l = lockref() |
|
2673 | l = lockref() | |
2674 | if l is None or not l.held: |
|
2674 | if l is None or not l.held: | |
2675 | return None |
|
2675 | return None | |
2676 | return l |
|
2676 | return l | |
2677 |
|
2677 | |||
2678 | def currentwlock(self): |
|
2678 | def currentwlock(self): | |
2679 | """Returns the wlock if it's held, or None if it's not.""" |
|
2679 | """Returns the wlock if it's held, or None if it's not.""" | |
2680 | return self._currentlock(self._wlockref) |
|
2680 | return self._currentlock(self._wlockref) | |
2681 |
|
2681 | |||
2682 | def _filecommit( |
|
2682 | def _filecommit( | |
2683 | self, |
|
2683 | self, | |
2684 | fctx, |
|
2684 | fctx, | |
2685 | manifest1, |
|
2685 | manifest1, | |
2686 | manifest2, |
|
2686 | manifest2, | |
2687 | linkrev, |
|
2687 | linkrev, | |
2688 | tr, |
|
2688 | tr, | |
2689 | changelist, |
|
2689 | changelist, | |
2690 | includecopymeta, |
|
2690 | includecopymeta, | |
2691 | ): |
|
2691 | ): | |
2692 | """ |
|
2692 | """ | |
2693 | commit an individual file as part of a larger transaction |
|
2693 | commit an individual file as part of a larger transaction | |
2694 | """ |
|
2694 | """ | |
2695 |
|
2695 | |||
2696 | fname = fctx.path() |
|
2696 | fname = fctx.path() | |
2697 | fparent1 = manifest1.get(fname, nullid) |
|
2697 | fparent1 = manifest1.get(fname, nullid) | |
2698 | fparent2 = manifest2.get(fname, nullid) |
|
2698 | fparent2 = manifest2.get(fname, nullid) | |
2699 | if isinstance(fctx, context.filectx): |
|
2699 | if isinstance(fctx, context.filectx): | |
2700 | node = fctx.filenode() |
|
2700 | node = fctx.filenode() | |
2701 | if node in [fparent1, fparent2]: |
|
2701 | if node in [fparent1, fparent2]: | |
2702 | self.ui.debug(b'reusing %s filelog entry\n' % fname) |
|
2702 | self.ui.debug(b'reusing %s filelog entry\n' % fname) | |
2703 | if ( |
|
2703 | if ( | |
2704 | fparent1 != nullid |
|
2704 | fparent1 != nullid | |
2705 | and manifest1.flags(fname) != fctx.flags() |
|
2705 | and manifest1.flags(fname) != fctx.flags() | |
2706 | ) or ( |
|
2706 | ) or ( | |
2707 | fparent2 != nullid |
|
2707 | fparent2 != nullid | |
2708 | and manifest2.flags(fname) != fctx.flags() |
|
2708 | and manifest2.flags(fname) != fctx.flags() | |
2709 | ): |
|
2709 | ): | |
2710 | changelist.append(fname) |
|
2710 | changelist.append(fname) | |
2711 | return node |
|
2711 | return node | |
2712 |
|
2712 | |||
2713 | flog = self.file(fname) |
|
2713 | flog = self.file(fname) | |
2714 | meta = {} |
|
2714 | meta = {} | |
2715 | cfname = fctx.copysource() |
|
2715 | cfname = fctx.copysource() | |
2716 | if cfname and cfname != fname: |
|
2716 | if cfname and cfname != fname: | |
2717 | # Mark the new revision of this file as a copy of another |
|
2717 | # Mark the new revision of this file as a copy of another | |
2718 | # file. This copy data will effectively act as a parent |
|
2718 | # file. This copy data will effectively act as a parent | |
2719 | # of this new revision. If this is a merge, the first |
|
2719 | # of this new revision. If this is a merge, the first | |
2720 | # parent will be the nullid (meaning "look up the copy data") |
|
2720 | # parent will be the nullid (meaning "look up the copy data") | |
2721 | # and the second one will be the other parent. For example: |
|
2721 | # and the second one will be the other parent. For example: | |
2722 | # |
|
2722 | # | |
2723 | # 0 --- 1 --- 3 rev1 changes file foo |
|
2723 | # 0 --- 1 --- 3 rev1 changes file foo | |
2724 | # \ / rev2 renames foo to bar and changes it |
|
2724 | # \ / rev2 renames foo to bar and changes it | |
2725 | # \- 2 -/ rev3 should have bar with all changes and |
|
2725 | # \- 2 -/ rev3 should have bar with all changes and | |
2726 | # should record that bar descends from |
|
2726 | # should record that bar descends from | |
2727 | # bar in rev2 and foo in rev1 |
|
2727 | # bar in rev2 and foo in rev1 | |
2728 | # |
|
2728 | # | |
2729 | # this allows this merge to succeed: |
|
2729 | # this allows this merge to succeed: | |
2730 | # |
|
2730 | # | |
2731 | # 0 --- 1 --- 3 rev4 reverts the content change from rev2 |
|
2731 | # 0 --- 1 --- 3 rev4 reverts the content change from rev2 | |
2732 | # \ / merging rev3 and rev4 should use bar@rev2 |
|
2732 | # \ / merging rev3 and rev4 should use bar@rev2 | |
2733 | # \- 2 --- 4 as the merge base |
|
2733 | # \- 2 --- 4 as the merge base | |
2734 | # |
|
2734 | # | |
2735 |
|
2735 | |||
2736 | cnode = manifest1.get(cfname) |
|
2736 | cnode = manifest1.get(cfname) | |
2737 | newfparent = fparent2 |
|
2737 | newfparent = fparent2 | |
2738 |
|
2738 | |||
2739 | if manifest2: # branch merge |
|
2739 | if manifest2: # branch merge | |
2740 | if fparent2 == nullid or cnode is None: # copied on remote side |
|
2740 | if fparent2 == nullid or cnode is None: # copied on remote side | |
2741 | if cfname in manifest2: |
|
2741 | if cfname in manifest2: | |
2742 | cnode = manifest2[cfname] |
|
2742 | cnode = manifest2[cfname] | |
2743 | newfparent = fparent1 |
|
2743 | newfparent = fparent1 | |
2744 |
|
2744 | |||
2745 | # Here, we used to search backwards through history to try to find |
|
2745 | # Here, we used to search backwards through history to try to find | |
2746 | # where the file copy came from if the source of a copy was not in |
|
2746 | # where the file copy came from if the source of a copy was not in | |
2747 | # the parent directory. However, this doesn't actually make sense to |
|
2747 | # the parent directory. However, this doesn't actually make sense to | |
2748 | # do (what does a copy from something not in your working copy even |
|
2748 | # do (what does a copy from something not in your working copy even | |
2749 | # mean?) and it causes bugs (eg, issue4476). Instead, we will warn |
|
2749 | # mean?) and it causes bugs (eg, issue4476). Instead, we will warn | |
2750 | # the user that copy information was dropped, so if they didn't |
|
2750 | # the user that copy information was dropped, so if they didn't | |
2751 | # expect this outcome it can be fixed, but this is the correct |
|
2751 | # expect this outcome it can be fixed, but this is the correct | |
2752 | # behavior in this circumstance. |
|
2752 | # behavior in this circumstance. | |
2753 |
|
2753 | |||
2754 | if cnode: |
|
2754 | if cnode: | |
2755 | self.ui.debug( |
|
2755 | self.ui.debug( | |
2756 | b" %s: copy %s:%s\n" % (fname, cfname, hex(cnode)) |
|
2756 | b" %s: copy %s:%s\n" % (fname, cfname, hex(cnode)) | |
2757 | ) |
|
2757 | ) | |
2758 | if includecopymeta: |
|
2758 | if includecopymeta: | |
2759 | meta[b"copy"] = cfname |
|
2759 | meta[b"copy"] = cfname | |
2760 | meta[b"copyrev"] = hex(cnode) |
|
2760 | meta[b"copyrev"] = hex(cnode) | |
2761 | fparent1, fparent2 = nullid, newfparent |
|
2761 | fparent1, fparent2 = nullid, newfparent | |
2762 | else: |
|
2762 | else: | |
2763 | self.ui.warn( |
|
2763 | self.ui.warn( | |
2764 | _( |
|
2764 | _( | |
2765 | b"warning: can't find ancestor for '%s' " |
|
2765 | b"warning: can't find ancestor for '%s' " | |
2766 | b"copied from '%s'!\n" |
|
2766 | b"copied from '%s'!\n" | |
2767 | ) |
|
2767 | ) | |
2768 | % (fname, cfname) |
|
2768 | % (fname, cfname) | |
2769 | ) |
|
2769 | ) | |
2770 |
|
2770 | |||
2771 | elif fparent1 == nullid: |
|
2771 | elif fparent1 == nullid: | |
2772 | fparent1, fparent2 = fparent2, nullid |
|
2772 | fparent1, fparent2 = fparent2, nullid | |
2773 | elif fparent2 != nullid: |
|
2773 | elif fparent2 != nullid: | |
2774 | # is one parent an ancestor of the other? |
|
2774 | # is one parent an ancestor of the other? | |
2775 | fparentancestors = flog.commonancestorsheads(fparent1, fparent2) |
|
2775 | fparentancestors = flog.commonancestorsheads(fparent1, fparent2) | |
2776 | if fparent1 in fparentancestors: |
|
2776 | if fparent1 in fparentancestors: | |
2777 | fparent1, fparent2 = fparent2, nullid |
|
2777 | fparent1, fparent2 = fparent2, nullid | |
2778 | elif fparent2 in fparentancestors: |
|
2778 | elif fparent2 in fparentancestors: | |
2779 | fparent2 = nullid |
|
2779 | fparent2 = nullid | |
2780 |
|
2780 | |||
2781 | # is the file changed? |
|
2781 | # is the file changed? | |
2782 | text = fctx.data() |
|
2782 | text = fctx.data() | |
2783 | if fparent2 != nullid or flog.cmp(fparent1, text) or meta: |
|
2783 | if fparent2 != nullid or flog.cmp(fparent1, text) or meta: | |
2784 | changelist.append(fname) |
|
2784 | changelist.append(fname) | |
2785 | return flog.add(text, meta, tr, linkrev, fparent1, fparent2) |
|
2785 | return flog.add(text, meta, tr, linkrev, fparent1, fparent2) | |
2786 | # are just the flags changed during merge? |
|
2786 | # are just the flags changed during merge? | |
2787 | elif fname in manifest1 and manifest1.flags(fname) != fctx.flags(): |
|
2787 | elif fname in manifest1 and manifest1.flags(fname) != fctx.flags(): | |
2788 | changelist.append(fname) |
|
2788 | changelist.append(fname) | |
2789 |
|
2789 | |||
2790 | return fparent1 |
|
2790 | return fparent1 | |
2791 |
|
2791 | |||
2792 | def checkcommitpatterns(self, wctx, vdirs, match, status, fail): |
|
2792 | def checkcommitpatterns(self, wctx, vdirs, match, status, fail): | |
2793 | """check for commit arguments that aren't committable""" |
|
2793 | """check for commit arguments that aren't committable""" | |
2794 | if match.isexact() or match.prefix(): |
|
2794 | if match.isexact() or match.prefix(): | |
2795 | matched = set(status.modified + status.added + status.removed) |
|
2795 | matched = set(status.modified + status.added + status.removed) | |
2796 |
|
2796 | |||
2797 | for f in match.files(): |
|
2797 | for f in match.files(): | |
2798 | f = self.dirstate.normalize(f) |
|
2798 | f = self.dirstate.normalize(f) | |
2799 | if f == b'.' or f in matched or f in wctx.substate: |
|
2799 | if f == b'.' or f in matched or f in wctx.substate: | |
2800 | continue |
|
2800 | continue | |
2801 | if f in status.deleted: |
|
2801 | if f in status.deleted: | |
2802 | fail(f, _(b'file not found!')) |
|
2802 | fail(f, _(b'file not found!')) | |
2803 | if f in vdirs: # visited directory |
|
2803 | if f in vdirs: # visited directory | |
2804 | d = f + b'/' |
|
2804 | d = f + b'/' | |
2805 | for mf in matched: |
|
2805 | for mf in matched: | |
2806 | if mf.startswith(d): |
|
2806 | if mf.startswith(d): | |
2807 | break |
|
2807 | break | |
2808 | else: |
|
2808 | else: | |
2809 | fail(f, _(b"no match under directory!")) |
|
2809 | fail(f, _(b"no match under directory!")) | |
2810 | elif f not in self.dirstate: |
|
2810 | elif f not in self.dirstate: | |
2811 | fail(f, _(b"file not tracked!")) |
|
2811 | fail(f, _(b"file not tracked!")) | |
2812 |
|
2812 | |||
2813 | @unfilteredmethod |
|
2813 | @unfilteredmethod | |
2814 | def commit( |
|
2814 | def commit( | |
2815 | self, |
|
2815 | self, | |
2816 | text=b"", |
|
2816 | text=b"", | |
2817 | user=None, |
|
2817 | user=None, | |
2818 | date=None, |
|
2818 | date=None, | |
2819 | match=None, |
|
2819 | match=None, | |
2820 | force=False, |
|
2820 | force=False, | |
2821 | editor=False, |
|
2821 | editor=False, | |
2822 | extra=None, |
|
2822 | extra=None, | |
2823 | ): |
|
2823 | ): | |
2824 | """Add a new revision to current repository. |
|
2824 | """Add a new revision to current repository. | |
2825 |
|
2825 | |||
2826 | Revision information is gathered from the working directory, |
|
2826 | Revision information is gathered from the working directory, | |
2827 | match can be used to filter the committed files. If editor is |
|
2827 | match can be used to filter the committed files. If editor is | |
2828 | supplied, it is called to get a commit message. |
|
2828 | supplied, it is called to get a commit message. | |
2829 | """ |
|
2829 | """ | |
2830 | if extra is None: |
|
2830 | if extra is None: | |
2831 | extra = {} |
|
2831 | extra = {} | |
2832 |
|
2832 | |||
2833 | def fail(f, msg): |
|
2833 | def fail(f, msg): | |
2834 | raise error.Abort(b'%s: %s' % (f, msg)) |
|
2834 | raise error.Abort(b'%s: %s' % (f, msg)) | |
2835 |
|
2835 | |||
2836 | if not match: |
|
2836 | if not match: | |
2837 | match = matchmod.always() |
|
2837 | match = matchmod.always() | |
2838 |
|
2838 | |||
2839 | if not force: |
|
2839 | if not force: | |
2840 | vdirs = [] |
|
2840 | vdirs = [] | |
2841 | match.explicitdir = vdirs.append |
|
2841 | match.explicitdir = vdirs.append | |
2842 | match.bad = fail |
|
2842 | match.bad = fail | |
2843 |
|
2843 | |||
2844 | # lock() for recent changelog (see issue4368) |
|
2844 | # lock() for recent changelog (see issue4368) | |
2845 | with self.wlock(), self.lock(): |
|
2845 | with self.wlock(), self.lock(): | |
2846 | wctx = self[None] |
|
2846 | wctx = self[None] | |
2847 | merge = len(wctx.parents()) > 1 |
|
2847 | merge = len(wctx.parents()) > 1 | |
2848 |
|
2848 | |||
2849 | if not force and merge and not match.always(): |
|
2849 | if not force and merge and not match.always(): | |
2850 | raise error.Abort( |
|
2850 | raise error.Abort( | |
2851 | _( |
|
2851 | _( | |
2852 | b'cannot partially commit a merge ' |
|
2852 | b'cannot partially commit a merge ' | |
2853 | b'(do not specify files or patterns)' |
|
2853 | b'(do not specify files or patterns)' | |
2854 | ) |
|
2854 | ) | |
2855 | ) |
|
2855 | ) | |
2856 |
|
2856 | |||
2857 | status = self.status(match=match, clean=force) |
|
2857 | status = self.status(match=match, clean=force) | |
2858 | if force: |
|
2858 | if force: | |
2859 | status.modified.extend( |
|
2859 | status.modified.extend( | |
2860 | status.clean |
|
2860 | status.clean | |
2861 | ) # mq may commit clean files |
|
2861 | ) # mq may commit clean files | |
2862 |
|
2862 | |||
2863 | # check subrepos |
|
2863 | # check subrepos | |
2864 | subs, commitsubs, newstate = subrepoutil.precommit( |
|
2864 | subs, commitsubs, newstate = subrepoutil.precommit( | |
2865 | self.ui, wctx, status, match, force=force |
|
2865 | self.ui, wctx, status, match, force=force | |
2866 | ) |
|
2866 | ) | |
2867 |
|
2867 | |||
2868 | # make sure all explicit patterns are matched |
|
2868 | # make sure all explicit patterns are matched | |
2869 | if not force: |
|
2869 | if not force: | |
2870 | self.checkcommitpatterns(wctx, vdirs, match, status, fail) |
|
2870 | self.checkcommitpatterns(wctx, vdirs, match, status, fail) | |
2871 |
|
2871 | |||
2872 | cctx = context.workingcommitctx( |
|
2872 | cctx = context.workingcommitctx( | |
2873 | self, status, text, user, date, extra |
|
2873 | self, status, text, user, date, extra | |
2874 | ) |
|
2874 | ) | |
2875 |
|
2875 | |||
2876 | # internal config: ui.allowemptycommit |
|
2876 | # internal config: ui.allowemptycommit | |
2877 | allowemptycommit = ( |
|
2877 | allowemptycommit = ( | |
2878 | wctx.branch() != wctx.p1().branch() |
|
2878 | wctx.branch() != wctx.p1().branch() | |
2879 | or extra.get(b'close') |
|
2879 | or extra.get(b'close') | |
2880 | or merge |
|
2880 | or merge | |
2881 | or cctx.files() |
|
2881 | or cctx.files() | |
2882 | or self.ui.configbool(b'ui', b'allowemptycommit') |
|
2882 | or self.ui.configbool(b'ui', b'allowemptycommit') | |
2883 | ) |
|
2883 | ) | |
2884 | if not allowemptycommit: |
|
2884 | if not allowemptycommit: | |
2885 | return None |
|
2885 | return None | |
2886 |
|
2886 | |||
2887 | if merge and cctx.deleted(): |
|
2887 | if merge and cctx.deleted(): | |
2888 | raise error.Abort(_(b"cannot commit merge with missing files")) |
|
2888 | raise error.Abort(_(b"cannot commit merge with missing files")) | |
2889 |
|
2889 | |||
2890 | ms = mergemod.mergestate.read(self) |
|
2890 | ms = mergemod.mergestate.read(self) | |
2891 | mergeutil.checkunresolved(ms) |
|
2891 | mergeutil.checkunresolved(ms) | |
2892 |
|
2892 | |||
2893 | if editor: |
|
2893 | if editor: | |
2894 | cctx._text = editor(self, cctx, subs) |
|
2894 | cctx._text = editor(self, cctx, subs) | |
2895 | edited = text != cctx._text |
|
2895 | edited = text != cctx._text | |
2896 |
|
2896 | |||
2897 | # Save commit message in case this transaction gets rolled back |
|
2897 | # Save commit message in case this transaction gets rolled back | |
2898 | # (e.g. by a pretxncommit hook). Leave the content alone on |
|
2898 | # (e.g. by a pretxncommit hook). Leave the content alone on | |
2899 | # the assumption that the user will use the same editor again. |
|
2899 | # the assumption that the user will use the same editor again. | |
2900 | msgfn = self.savecommitmessage(cctx._text) |
|
2900 | msgfn = self.savecommitmessage(cctx._text) | |
2901 |
|
2901 | |||
2902 | # commit subs and write new state |
|
2902 | # commit subs and write new state | |
2903 | if subs: |
|
2903 | if subs: | |
2904 | uipathfn = scmutil.getuipathfn(self) |
|
2904 | uipathfn = scmutil.getuipathfn(self) | |
2905 | for s in sorted(commitsubs): |
|
2905 | for s in sorted(commitsubs): | |
2906 | sub = wctx.sub(s) |
|
2906 | sub = wctx.sub(s) | |
2907 | self.ui.status( |
|
2907 | self.ui.status( | |
2908 | _(b'committing subrepository %s\n') |
|
2908 | _(b'committing subrepository %s\n') | |
2909 | % uipathfn(subrepoutil.subrelpath(sub)) |
|
2909 | % uipathfn(subrepoutil.subrelpath(sub)) | |
2910 | ) |
|
2910 | ) | |
2911 | sr = sub.commit(cctx._text, user, date) |
|
2911 | sr = sub.commit(cctx._text, user, date) | |
2912 | newstate[s] = (newstate[s][0], sr) |
|
2912 | newstate[s] = (newstate[s][0], sr) | |
2913 | subrepoutil.writestate(self, newstate) |
|
2913 | subrepoutil.writestate(self, newstate) | |
2914 |
|
2914 | |||
2915 | p1, p2 = self.dirstate.parents() |
|
2915 | p1, p2 = self.dirstate.parents() | |
2916 | hookp1, hookp2 = hex(p1), (p2 != nullid and hex(p2) or b'') |
|
2916 | hookp1, hookp2 = hex(p1), (p2 != nullid and hex(p2) or b'') | |
2917 | try: |
|
2917 | try: | |
2918 | self.hook( |
|
2918 | self.hook( | |
2919 | b"precommit", throw=True, parent1=hookp1, parent2=hookp2 |
|
2919 | b"precommit", throw=True, parent1=hookp1, parent2=hookp2 | |
2920 | ) |
|
2920 | ) | |
2921 | with self.transaction(b'commit'): |
|
2921 | with self.transaction(b'commit'): | |
2922 | ret = self.commitctx(cctx, True) |
|
2922 | ret = self.commitctx(cctx, True) | |
2923 | # update bookmarks, dirstate and mergestate |
|
2923 | # update bookmarks, dirstate and mergestate | |
2924 | bookmarks.update(self, [p1, p2], ret) |
|
2924 | bookmarks.update(self, [p1, p2], ret) | |
2925 | cctx.markcommitted(ret) |
|
2925 | cctx.markcommitted(ret) | |
2926 | ms.reset() |
|
2926 | ms.reset() | |
2927 | except: # re-raises |
|
2927 | except: # re-raises | |
2928 | if edited: |
|
2928 | if edited: | |
2929 | self.ui.write( |
|
2929 | self.ui.write( | |
2930 | _(b'note: commit message saved in %s\n') % msgfn |
|
2930 | _(b'note: commit message saved in %s\n') % msgfn | |
2931 | ) |
|
2931 | ) | |
2932 | raise |
|
2932 | raise | |
2933 |
|
2933 | |||
2934 | def commithook(): |
|
2934 | def commithook(): | |
2935 | # hack for command that use a temporary commit (eg: histedit) |
|
2935 | # hack for command that use a temporary commit (eg: histedit) | |
2936 | # temporary commit got stripped before hook release |
|
2936 | # temporary commit got stripped before hook release | |
2937 | if self.changelog.hasnode(ret): |
|
2937 | if self.changelog.hasnode(ret): | |
2938 | self.hook( |
|
2938 | self.hook( | |
2939 | b"commit", node=hex(ret), parent1=hookp1, parent2=hookp2 |
|
2939 | b"commit", node=hex(ret), parent1=hookp1, parent2=hookp2 | |
2940 | ) |
|
2940 | ) | |
2941 |
|
2941 | |||
2942 | self._afterlock(commithook) |
|
2942 | self._afterlock(commithook) | |
2943 | return ret |
|
2943 | return ret | |
2944 |
|
2944 | |||
2945 | @unfilteredmethod |
|
2945 | @unfilteredmethod | |
2946 | def commitctx(self, ctx, error=False, origctx=None): |
|
2946 | def commitctx(self, ctx, error=False, origctx=None): | |
2947 | """Add a new revision to current repository. |
|
2947 | """Add a new revision to current repository. | |
2948 | Revision information is passed via the context argument. |
|
2948 | Revision information is passed via the context argument. | |
2949 |
|
2949 | |||
2950 | ctx.files() should list all files involved in this commit, i.e. |
|
2950 | ctx.files() should list all files involved in this commit, i.e. | |
2951 | modified/added/removed files. On merge, it may be wider than the |
|
2951 | modified/added/removed files. On merge, it may be wider than the | |
2952 | ctx.files() to be committed, since any file nodes derived directly |
|
2952 | ctx.files() to be committed, since any file nodes derived directly | |
2953 | from p1 or p2 are excluded from the committed ctx.files(). |
|
2953 | from p1 or p2 are excluded from the committed ctx.files(). | |
2954 |
|
2954 | |||
2955 | origctx is for convert to work around the problem that bug |
|
2955 | origctx is for convert to work around the problem that bug | |
2956 | fixes to the files list in changesets change hashes. For |
|
2956 | fixes to the files list in changesets change hashes. For | |
2957 | convert to be the identity, it can pass an origctx and this |
|
2957 | convert to be the identity, it can pass an origctx and this | |
2958 | function will use the same files list when it makes sense to |
|
2958 | function will use the same files list when it makes sense to | |
2959 | do so. |
|
2959 | do so. | |
2960 | """ |
|
2960 | """ | |
2961 |
|
2961 | |||
2962 | p1, p2 = ctx.p1(), ctx.p2() |
|
2962 | p1, p2 = ctx.p1(), ctx.p2() | |
2963 | user = ctx.user() |
|
2963 | user = ctx.user() | |
2964 |
|
2964 | |||
2965 | if self.filecopiesmode == b'changeset-sidedata': |
|
2965 | if self.filecopiesmode == b'changeset-sidedata': | |
2966 | writechangesetcopy = True |
|
2966 | writechangesetcopy = True | |
2967 | writefilecopymeta = True |
|
2967 | writefilecopymeta = True | |
2968 | writecopiesto = None |
|
2968 | writecopiesto = None | |
2969 | else: |
|
2969 | else: | |
2970 | writecopiesto = self.ui.config(b'experimental', b'copies.write-to') |
|
2970 | writecopiesto = self.ui.config(b'experimental', b'copies.write-to') | |
2971 | writefilecopymeta = writecopiesto != b'changeset-only' |
|
2971 | writefilecopymeta = writecopiesto != b'changeset-only' | |
2972 | writechangesetcopy = writecopiesto in ( |
|
2972 | writechangesetcopy = writecopiesto in ( | |
2973 | b'changeset-only', |
|
2973 | b'changeset-only', | |
2974 | b'compatibility', |
|
2974 | b'compatibility', | |
2975 | ) |
|
2975 | ) | |
2976 | p1copies, p2copies = None, None |
|
2976 | p1copies, p2copies = None, None | |
2977 | if writechangesetcopy: |
|
2977 | if writechangesetcopy: | |
2978 | p1copies = ctx.p1copies() |
|
2978 | p1copies = ctx.p1copies() | |
2979 | p2copies = ctx.p2copies() |
|
2979 | p2copies = ctx.p2copies() | |
2980 | filesadded, filesremoved = None, None |
|
2980 | filesadded, filesremoved = None, None | |
2981 | with self.lock(), self.transaction(b"commit") as tr: |
|
2981 | with self.lock(), self.transaction(b"commit") as tr: | |
2982 | trp = weakref.proxy(tr) |
|
2982 | trp = weakref.proxy(tr) | |
2983 |
|
2983 | |||
2984 | if ctx.manifestnode(): |
|
2984 | if ctx.manifestnode(): | |
2985 | # reuse an existing manifest revision |
|
2985 | # reuse an existing manifest revision | |
2986 | self.ui.debug(b'reusing known manifest\n') |
|
2986 | self.ui.debug(b'reusing known manifest\n') | |
2987 | mn = ctx.manifestnode() |
|
2987 | mn = ctx.manifestnode() | |
2988 | files = ctx.files() |
|
2988 | files = ctx.files() | |
2989 | if writechangesetcopy: |
|
2989 | if writechangesetcopy: | |
2990 | filesadded = ctx.filesadded() |
|
2990 | filesadded = ctx.filesadded() | |
2991 | filesremoved = ctx.filesremoved() |
|
2991 | filesremoved = ctx.filesremoved() | |
2992 | elif ctx.files(): |
|
2992 | elif ctx.files(): | |
2993 | m1ctx = p1.manifestctx() |
|
2993 | m1ctx = p1.manifestctx() | |
2994 | m2ctx = p2.manifestctx() |
|
2994 | m2ctx = p2.manifestctx() | |
2995 | mctx = m1ctx.copy() |
|
2995 | mctx = m1ctx.copy() | |
2996 |
|
2996 | |||
2997 | m = mctx.read() |
|
2997 | m = mctx.read() | |
2998 | m1 = m1ctx.read() |
|
2998 | m1 = m1ctx.read() | |
2999 | m2 = m2ctx.read() |
|
2999 | m2 = m2ctx.read() | |
3000 |
|
3000 | |||
3001 | # check in files |
|
3001 | # check in files | |
3002 | added = [] |
|
3002 | added = [] | |
3003 | changed = [] |
|
3003 | changed = [] | |
3004 | removed = list(ctx.removed()) |
|
3004 | removed = list(ctx.removed()) | |
3005 | linkrev = len(self) |
|
3005 | linkrev = len(self) | |
3006 | self.ui.note(_(b"committing files:\n")) |
|
3006 | self.ui.note(_(b"committing files:\n")) | |
3007 | uipathfn = scmutil.getuipathfn(self) |
|
3007 | uipathfn = scmutil.getuipathfn(self) | |
3008 | for f in sorted(ctx.modified() + ctx.added()): |
|
3008 | for f in sorted(ctx.modified() + ctx.added()): | |
3009 | self.ui.note(uipathfn(f) + b"\n") |
|
3009 | self.ui.note(uipathfn(f) + b"\n") | |
3010 | try: |
|
3010 | try: | |
3011 | fctx = ctx[f] |
|
3011 | fctx = ctx[f] | |
3012 | if fctx is None: |
|
3012 | if fctx is None: | |
3013 | removed.append(f) |
|
3013 | removed.append(f) | |
3014 | else: |
|
3014 | else: | |
3015 | added.append(f) |
|
3015 | added.append(f) | |
3016 | m[f] = self._filecommit( |
|
3016 | m[f] = self._filecommit( | |
3017 | fctx, |
|
3017 | fctx, | |
3018 | m1, |
|
3018 | m1, | |
3019 | m2, |
|
3019 | m2, | |
3020 | linkrev, |
|
3020 | linkrev, | |
3021 | trp, |
|
3021 | trp, | |
3022 | changed, |
|
3022 | changed, | |
3023 | writefilecopymeta, |
|
3023 | writefilecopymeta, | |
3024 | ) |
|
3024 | ) | |
3025 | m.setflag(f, fctx.flags()) |
|
3025 | m.setflag(f, fctx.flags()) | |
3026 | except OSError: |
|
3026 | except OSError: | |
3027 | self.ui.warn( |
|
3027 | self.ui.warn( | |
3028 | _(b"trouble committing %s!\n") % uipathfn(f) |
|
3028 | _(b"trouble committing %s!\n") % uipathfn(f) | |
3029 | ) |
|
3029 | ) | |
3030 | raise |
|
3030 | raise | |
3031 | except IOError as inst: |
|
3031 | except IOError as inst: | |
3032 | errcode = getattr(inst, 'errno', errno.ENOENT) |
|
3032 | errcode = getattr(inst, 'errno', errno.ENOENT) | |
3033 | if error or errcode and errcode != errno.ENOENT: |
|
3033 | if error or errcode and errcode != errno.ENOENT: | |
3034 | self.ui.warn( |
|
3034 | self.ui.warn( | |
3035 | _(b"trouble committing %s!\n") % uipathfn(f) |
|
3035 | _(b"trouble committing %s!\n") % uipathfn(f) | |
3036 | ) |
|
3036 | ) | |
3037 | raise |
|
3037 | raise | |
3038 |
|
3038 | |||
3039 | # update manifest |
|
3039 | # update manifest | |
3040 | removed = [f for f in removed if f in m1 or f in m2] |
|
3040 | removed = [f for f in removed if f in m1 or f in m2] | |
3041 | drop = sorted([f for f in removed if f in m]) |
|
3041 | drop = sorted([f for f in removed if f in m]) | |
3042 | for f in drop: |
|
3042 | for f in drop: | |
3043 | del m[f] |
|
3043 | del m[f] | |
3044 | if p2.rev() != nullrev: |
|
3044 | if p2.rev() != nullrev: | |
3045 |
|
3045 | |||
3046 | @util.cachefunc |
|
3046 | @util.cachefunc | |
3047 | def mas(): |
|
3047 | def mas(): | |
3048 | p1n = p1.node() |
|
3048 | p1n = p1.node() | |
3049 | p2n = p2.node() |
|
3049 | p2n = p2.node() | |
3050 | cahs = self.changelog.commonancestorsheads(p1n, p2n) |
|
3050 | cahs = self.changelog.commonancestorsheads(p1n, p2n) | |
3051 | if not cahs: |
|
3051 | if not cahs: | |
3052 | cahs = [nullrev] |
|
3052 | cahs = [nullrev] | |
3053 | return [self[r].manifest() for r in cahs] |
|
3053 | return [self[r].manifest() for r in cahs] | |
3054 |
|
3054 | |||
3055 | def deletionfromparent(f): |
|
3055 | def deletionfromparent(f): | |
3056 | # When a file is removed relative to p1 in a merge, this |
|
3056 | # When a file is removed relative to p1 in a merge, this | |
3057 | # function determines whether the absence is due to a |
|
3057 | # function determines whether the absence is due to a | |
3058 | # deletion from a parent, or whether the merge commit |
|
3058 | # deletion from a parent, or whether the merge commit | |
3059 | # itself deletes the file. We decide this by doing a |
|
3059 | # itself deletes the file. We decide this by doing a | |
3060 | # simplified three way merge of the manifest entry for |
|
3060 | # simplified three way merge of the manifest entry for | |
3061 | # the file. There are two ways we decide the merge |
|
3061 | # the file. There are two ways we decide the merge | |
3062 | # itself didn't delete a file: |
|
3062 | # itself didn't delete a file: | |
3063 | # - neither parent (nor the merge) contain the file |
|
3063 | # - neither parent (nor the merge) contain the file | |
3064 | # - exactly one parent contains the file, and that |
|
3064 | # - exactly one parent contains the file, and that | |
3065 | # parent has the same filelog entry as the merge |
|
3065 | # parent has the same filelog entry as the merge | |
3066 | # ancestor (or all of them if there two). In other |
|
3066 | # ancestor (or all of them if there two). In other | |
3067 | # words, that parent left the file unchanged while the |
|
3067 | # words, that parent left the file unchanged while the | |
3068 | # other one deleted it. |
|
3068 | # other one deleted it. | |
3069 | # One way to think about this is that deleting a file is |
|
3069 | # One way to think about this is that deleting a file is | |
3070 | # similar to emptying it, so the list of changed files |
|
3070 | # similar to emptying it, so the list of changed files | |
3071 | # should be similar either way. The computation |
|
3071 | # should be similar either way. The computation | |
3072 | # described above is not done directly in _filecommit |
|
3072 | # described above is not done directly in _filecommit | |
3073 | # when creating the list of changed files, however |
|
3073 | # when creating the list of changed files, however | |
3074 | # it does something very similar by comparing filelog |
|
3074 | # it does something very similar by comparing filelog | |
3075 | # nodes. |
|
3075 | # nodes. | |
3076 | if f in m1: |
|
3076 | if f in m1: | |
3077 | return f not in m2 and all( |
|
3077 | return f not in m2 and all( | |
3078 | f in ma and ma.find(f) == m1.find(f) |
|
3078 | f in ma and ma.find(f) == m1.find(f) | |
3079 | for ma in mas() |
|
3079 | for ma in mas() | |
3080 | ) |
|
3080 | ) | |
3081 | elif f in m2: |
|
3081 | elif f in m2: | |
3082 | return all( |
|
3082 | return all( | |
3083 | f in ma and ma.find(f) == m2.find(f) |
|
3083 | f in ma and ma.find(f) == m2.find(f) | |
3084 | for ma in mas() |
|
3084 | for ma in mas() | |
3085 | ) |
|
3085 | ) | |
3086 | else: |
|
3086 | else: | |
3087 | return True |
|
3087 | return True | |
3088 |
|
3088 | |||
3089 | removed = [f for f in removed if not deletionfromparent(f)] |
|
3089 | removed = [f for f in removed if not deletionfromparent(f)] | |
3090 |
|
3090 | |||
3091 | files = changed + removed |
|
3091 | files = changed + removed | |
3092 | md = None |
|
3092 | md = None | |
3093 | if not files: |
|
3093 | if not files: | |
3094 | # if no "files" actually changed in terms of the changelog, |
|
3094 | # if no "files" actually changed in terms of the changelog, | |
3095 | # try hard to detect unmodified manifest entry so that the |
|
3095 | # try hard to detect unmodified manifest entry so that the | |
3096 | # exact same commit can be reproduced later on convert. |
|
3096 | # exact same commit can be reproduced later on convert. | |
3097 | md = m1.diff(m, scmutil.matchfiles(self, ctx.files())) |
|
3097 | md = m1.diff(m, scmutil.matchfiles(self, ctx.files())) | |
3098 | if not files and md: |
|
3098 | if not files and md: | |
3099 | self.ui.debug( |
|
3099 | self.ui.debug( | |
3100 | b'not reusing manifest (no file change in ' |
|
3100 | b'not reusing manifest (no file change in ' | |
3101 | b'changelog, but manifest differs)\n' |
|
3101 | b'changelog, but manifest differs)\n' | |
3102 | ) |
|
3102 | ) | |
3103 | if files or md: |
|
3103 | if files or md: | |
3104 | self.ui.note(_(b"committing manifest\n")) |
|
3104 | self.ui.note(_(b"committing manifest\n")) | |
3105 | # we're using narrowmatch here since it's already applied at |
|
3105 | # we're using narrowmatch here since it's already applied at | |
3106 | # other stages (such as dirstate.walk), so we're already |
|
3106 | # other stages (such as dirstate.walk), so we're already | |
3107 | # ignoring things outside of narrowspec in most cases. The |
|
3107 | # ignoring things outside of narrowspec in most cases. The | |
3108 | # one case where we might have files outside the narrowspec |
|
3108 | # one case where we might have files outside the narrowspec | |
3109 | # at this point is merges, and we already error out in the |
|
3109 | # at this point is merges, and we already error out in the | |
3110 | # case where the merge has files outside of the narrowspec, |
|
3110 | # case where the merge has files outside of the narrowspec, | |
3111 | # so this is safe. |
|
3111 | # so this is safe. | |
3112 | mn = mctx.write( |
|
3112 | mn = mctx.write( | |
3113 | trp, |
|
3113 | trp, | |
3114 | linkrev, |
|
3114 | linkrev, | |
3115 | p1.manifestnode(), |
|
3115 | p1.manifestnode(), | |
3116 | p2.manifestnode(), |
|
3116 | p2.manifestnode(), | |
3117 | added, |
|
3117 | added, | |
3118 | drop, |
|
3118 | drop, | |
3119 | match=self.narrowmatch(), |
|
3119 | match=self.narrowmatch(), | |
3120 | ) |
|
3120 | ) | |
3121 |
|
3121 | |||
3122 | if writechangesetcopy: |
|
3122 | if writechangesetcopy: | |
3123 | filesadded = [ |
|
3123 | filesadded = [ | |
3124 | f for f in changed if not (f in m1 or f in m2) |
|
3124 | f for f in changed if not (f in m1 or f in m2) | |
3125 | ] |
|
3125 | ] | |
3126 | filesremoved = removed |
|
3126 | filesremoved = removed | |
3127 | else: |
|
3127 | else: | |
3128 | self.ui.debug( |
|
3128 | self.ui.debug( | |
3129 | b'reusing manifest from p1 (listed files ' |
|
3129 | b'reusing manifest from p1 (listed files ' | |
3130 | b'actually unchanged)\n' |
|
3130 | b'actually unchanged)\n' | |
3131 | ) |
|
3131 | ) | |
3132 | mn = p1.manifestnode() |
|
3132 | mn = p1.manifestnode() | |
3133 | else: |
|
3133 | else: | |
3134 | self.ui.debug(b'reusing manifest from p1 (no file change)\n') |
|
3134 | self.ui.debug(b'reusing manifest from p1 (no file change)\n') | |
3135 | mn = p1.manifestnode() |
|
3135 | mn = p1.manifestnode() | |
3136 | files = [] |
|
3136 | files = [] | |
3137 |
|
3137 | |||
3138 | if writecopiesto == b'changeset-only': |
|
3138 | if writecopiesto == b'changeset-only': | |
3139 | # If writing only to changeset extras, use None to indicate that |
|
3139 | # If writing only to changeset extras, use None to indicate that | |
3140 | # no entry should be written. If writing to both, write an empty |
|
3140 | # no entry should be written. If writing to both, write an empty | |
3141 | # entry to prevent the reader from falling back to reading |
|
3141 | # entry to prevent the reader from falling back to reading | |
3142 | # filelogs. |
|
3142 | # filelogs. | |
3143 | p1copies = p1copies or None |
|
3143 | p1copies = p1copies or None | |
3144 | p2copies = p2copies or None |
|
3144 | p2copies = p2copies or None | |
3145 | filesadded = filesadded or None |
|
3145 | filesadded = filesadded or None | |
3146 | filesremoved = filesremoved or None |
|
3146 | filesremoved = filesremoved or None | |
3147 |
|
3147 | |||
3148 | if origctx and origctx.manifestnode() == mn: |
|
3148 | if origctx and origctx.manifestnode() == mn: | |
3149 | files = origctx.files() |
|
3149 | files = origctx.files() | |
3150 |
|
3150 | |||
3151 | # update changelog |
|
3151 | # update changelog | |
3152 | self.ui.note(_(b"committing changelog\n")) |
|
3152 | self.ui.note(_(b"committing changelog\n")) | |
3153 | self.changelog.delayupdate(tr) |
|
3153 | self.changelog.delayupdate(tr) | |
3154 | n = self.changelog.add( |
|
3154 | n = self.changelog.add( | |
3155 | mn, |
|
3155 | mn, | |
3156 | files, |
|
3156 | files, | |
3157 | ctx.description(), |
|
3157 | ctx.description(), | |
3158 | trp, |
|
3158 | trp, | |
3159 | p1.node(), |
|
3159 | p1.node(), | |
3160 | p2.node(), |
|
3160 | p2.node(), | |
3161 | user, |
|
3161 | user, | |
3162 | ctx.date(), |
|
3162 | ctx.date(), | |
3163 | ctx.extra().copy(), |
|
3163 | ctx.extra().copy(), | |
3164 | p1copies, |
|
3164 | p1copies, | |
3165 | p2copies, |
|
3165 | p2copies, | |
3166 | filesadded, |
|
3166 | filesadded, | |
3167 | filesremoved, |
|
3167 | filesremoved, | |
3168 | ) |
|
3168 | ) | |
3169 | xp1, xp2 = p1.hex(), p2 and p2.hex() or b'' |
|
3169 | xp1, xp2 = p1.hex(), p2 and p2.hex() or b'' | |
3170 | self.hook( |
|
3170 | self.hook( | |
3171 | b'pretxncommit', |
|
3171 | b'pretxncommit', | |
3172 | throw=True, |
|
3172 | throw=True, | |
3173 | node=hex(n), |
|
3173 | node=hex(n), | |
3174 | parent1=xp1, |
|
3174 | parent1=xp1, | |
3175 | parent2=xp2, |
|
3175 | parent2=xp2, | |
3176 | ) |
|
3176 | ) | |
3177 | # set the new commit is proper phase |
|
3177 | # set the new commit is proper phase | |
3178 | targetphase = subrepoutil.newcommitphase(self.ui, ctx) |
|
3178 | targetphase = subrepoutil.newcommitphase(self.ui, ctx) | |
3179 | if targetphase: |
|
3179 | if targetphase: | |
3180 | # retract boundary do not alter parent changeset. |
|
3180 | # retract boundary do not alter parent changeset. | |
3181 | # if a parent have higher the resulting phase will |
|
3181 | # if a parent have higher the resulting phase will | |
3182 | # be compliant anyway |
|
3182 | # be compliant anyway | |
3183 | # |
|
3183 | # | |
3184 | # if minimal phase was 0 we don't need to retract anything |
|
3184 | # if minimal phase was 0 we don't need to retract anything | |
3185 | phases.registernew(self, tr, targetphase, [n]) |
|
3185 | phases.registernew(self, tr, targetphase, [n]) | |
3186 | return n |
|
3186 | return n | |
3187 |
|
3187 | |||
3188 | @unfilteredmethod |
|
3188 | @unfilteredmethod | |
3189 | def destroying(self): |
|
3189 | def destroying(self): | |
3190 | '''Inform the repository that nodes are about to be destroyed. |
|
3190 | '''Inform the repository that nodes are about to be destroyed. | |
3191 | Intended for use by strip and rollback, so there's a common |
|
3191 | Intended for use by strip and rollback, so there's a common | |
3192 | place for anything that has to be done before destroying history. |
|
3192 | place for anything that has to be done before destroying history. | |
3193 |
|
3193 | |||
3194 | This is mostly useful for saving state that is in memory and waiting |
|
3194 | This is mostly useful for saving state that is in memory and waiting | |
3195 | to be flushed when the current lock is released. Because a call to |
|
3195 | to be flushed when the current lock is released. Because a call to | |
3196 | destroyed is imminent, the repo will be invalidated causing those |
|
3196 | destroyed is imminent, the repo will be invalidated causing those | |
3197 | changes to stay in memory (waiting for the next unlock), or vanish |
|
3197 | changes to stay in memory (waiting for the next unlock), or vanish | |
3198 | completely. |
|
3198 | completely. | |
3199 | ''' |
|
3199 | ''' | |
3200 | # When using the same lock to commit and strip, the phasecache is left |
|
3200 | # When using the same lock to commit and strip, the phasecache is left | |
3201 | # dirty after committing. Then when we strip, the repo is invalidated, |
|
3201 | # dirty after committing. Then when we strip, the repo is invalidated, | |
3202 | # causing those changes to disappear. |
|
3202 | # causing those changes to disappear. | |
3203 | if '_phasecache' in vars(self): |
|
3203 | if '_phasecache' in vars(self): | |
3204 | self._phasecache.write() |
|
3204 | self._phasecache.write() | |
3205 |
|
3205 | |||
3206 | @unfilteredmethod |
|
3206 | @unfilteredmethod | |
3207 | def destroyed(self): |
|
3207 | def destroyed(self): | |
3208 | '''Inform the repository that nodes have been destroyed. |
|
3208 | '''Inform the repository that nodes have been destroyed. | |
3209 | Intended for use by strip and rollback, so there's a common |
|
3209 | Intended for use by strip and rollback, so there's a common | |
3210 | place for anything that has to be done after destroying history. |
|
3210 | place for anything that has to be done after destroying history. | |
3211 | ''' |
|
3211 | ''' | |
3212 | # When one tries to: |
|
3212 | # When one tries to: | |
3213 | # 1) destroy nodes thus calling this method (e.g. strip) |
|
3213 | # 1) destroy nodes thus calling this method (e.g. strip) | |
3214 | # 2) use phasecache somewhere (e.g. commit) |
|
3214 | # 2) use phasecache somewhere (e.g. commit) | |
3215 | # |
|
3215 | # | |
3216 | # then 2) will fail because the phasecache contains nodes that were |
|
3216 | # then 2) will fail because the phasecache contains nodes that were | |
3217 | # removed. We can either remove phasecache from the filecache, |
|
3217 | # removed. We can either remove phasecache from the filecache, | |
3218 | # causing it to reload next time it is accessed, or simply filter |
|
3218 | # causing it to reload next time it is accessed, or simply filter | |
3219 | # the removed nodes now and write the updated cache. |
|
3219 | # the removed nodes now and write the updated cache. | |
3220 | self._phasecache.filterunknown(self) |
|
3220 | self._phasecache.filterunknown(self) | |
3221 | self._phasecache.write() |
|
3221 | self._phasecache.write() | |
3222 |
|
3222 | |||
3223 | # refresh all repository caches |
|
3223 | # refresh all repository caches | |
3224 | self.updatecaches() |
|
3224 | self.updatecaches() | |
3225 |
|
3225 | |||
3226 | # Ensure the persistent tag cache is updated. Doing it now |
|
3226 | # Ensure the persistent tag cache is updated. Doing it now | |
3227 | # means that the tag cache only has to worry about destroyed |
|
3227 | # means that the tag cache only has to worry about destroyed | |
3228 | # heads immediately after a strip/rollback. That in turn |
|
3228 | # heads immediately after a strip/rollback. That in turn | |
3229 | # guarantees that "cachetip == currenttip" (comparing both rev |
|
3229 | # guarantees that "cachetip == currenttip" (comparing both rev | |
3230 | # and node) always means no nodes have been added or destroyed. |
|
3230 | # and node) always means no nodes have been added or destroyed. | |
3231 |
|
3231 | |||
3232 | # XXX this is suboptimal when qrefresh'ing: we strip the current |
|
3232 | # XXX this is suboptimal when qrefresh'ing: we strip the current | |
3233 | # head, refresh the tag cache, then immediately add a new head. |
|
3233 | # head, refresh the tag cache, then immediately add a new head. | |
3234 | # But I think doing it this way is necessary for the "instant |
|
3234 | # But I think doing it this way is necessary for the "instant | |
3235 | # tag cache retrieval" case to work. |
|
3235 | # tag cache retrieval" case to work. | |
3236 | self.invalidate() |
|
3236 | self.invalidate() | |
3237 |
|
3237 | |||
3238 | def status( |
|
3238 | def status( | |
3239 | self, |
|
3239 | self, | |
3240 | node1=b'.', |
|
3240 | node1=b'.', | |
3241 | node2=None, |
|
3241 | node2=None, | |
3242 | match=None, |
|
3242 | match=None, | |
3243 | ignored=False, |
|
3243 | ignored=False, | |
3244 | clean=False, |
|
3244 | clean=False, | |
3245 | unknown=False, |
|
3245 | unknown=False, | |
3246 | listsubrepos=False, |
|
3246 | listsubrepos=False, | |
3247 | ): |
|
3247 | ): | |
3248 | '''a convenience method that calls node1.status(node2)''' |
|
3248 | '''a convenience method that calls node1.status(node2)''' | |
3249 | return self[node1].status( |
|
3249 | return self[node1].status( | |
3250 | node2, match, ignored, clean, unknown, listsubrepos |
|
3250 | node2, match, ignored, clean, unknown, listsubrepos | |
3251 | ) |
|
3251 | ) | |
3252 |
|
3252 | |||
3253 | def addpostdsstatus(self, ps): |
|
3253 | def addpostdsstatus(self, ps): | |
3254 | """Add a callback to run within the wlock, at the point at which status |
|
3254 | """Add a callback to run within the wlock, at the point at which status | |
3255 | fixups happen. |
|
3255 | fixups happen. | |
3256 |
|
3256 | |||
3257 | On status completion, callback(wctx, status) will be called with the |
|
3257 | On status completion, callback(wctx, status) will be called with the | |
3258 | wlock held, unless the dirstate has changed from underneath or the wlock |
|
3258 | wlock held, unless the dirstate has changed from underneath or the wlock | |
3259 | couldn't be grabbed. |
|
3259 | couldn't be grabbed. | |
3260 |
|
3260 | |||
3261 | Callbacks should not capture and use a cached copy of the dirstate -- |
|
3261 | Callbacks should not capture and use a cached copy of the dirstate -- | |
3262 | it might change in the meanwhile. Instead, they should access the |
|
3262 | it might change in the meanwhile. Instead, they should access the | |
3263 | dirstate via wctx.repo().dirstate. |
|
3263 | dirstate via wctx.repo().dirstate. | |
3264 |
|
3264 | |||
3265 | This list is emptied out after each status run -- extensions should |
|
3265 | This list is emptied out after each status run -- extensions should | |
3266 | make sure it adds to this list each time dirstate.status is called. |
|
3266 | make sure it adds to this list each time dirstate.status is called. | |
3267 | Extensions should also make sure they don't call this for statuses |
|
3267 | Extensions should also make sure they don't call this for statuses | |
3268 | that don't involve the dirstate. |
|
3268 | that don't involve the dirstate. | |
3269 | """ |
|
3269 | """ | |
3270 |
|
3270 | |||
3271 | # The list is located here for uniqueness reasons -- it is actually |
|
3271 | # The list is located here for uniqueness reasons -- it is actually | |
3272 | # managed by the workingctx, but that isn't unique per-repo. |
|
3272 | # managed by the workingctx, but that isn't unique per-repo. | |
3273 | self._postdsstatus.append(ps) |
|
3273 | self._postdsstatus.append(ps) | |
3274 |
|
3274 | |||
3275 | def postdsstatus(self): |
|
3275 | def postdsstatus(self): | |
3276 | """Used by workingctx to get the list of post-dirstate-status hooks.""" |
|
3276 | """Used by workingctx to get the list of post-dirstate-status hooks.""" | |
3277 | return self._postdsstatus |
|
3277 | return self._postdsstatus | |
3278 |
|
3278 | |||
3279 | def clearpostdsstatus(self): |
|
3279 | def clearpostdsstatus(self): | |
3280 | """Used by workingctx to clear post-dirstate-status hooks.""" |
|
3280 | """Used by workingctx to clear post-dirstate-status hooks.""" | |
3281 | del self._postdsstatus[:] |
|
3281 | del self._postdsstatus[:] | |
3282 |
|
3282 | |||
3283 | def heads(self, start=None): |
|
3283 | def heads(self, start=None): | |
3284 | if start is None: |
|
3284 | if start is None: | |
3285 | cl = self.changelog |
|
3285 | cl = self.changelog | |
3286 | headrevs = reversed(cl.headrevs()) |
|
3286 | headrevs = reversed(cl.headrevs()) | |
3287 | return [cl.node(rev) for rev in headrevs] |
|
3287 | return [cl.node(rev) for rev in headrevs] | |
3288 |
|
3288 | |||
3289 | heads = self.changelog.heads(start) |
|
3289 | heads = self.changelog.heads(start) | |
3290 | # sort the output in rev descending order |
|
3290 | # sort the output in rev descending order | |
3291 | return sorted(heads, key=self.changelog.rev, reverse=True) |
|
3291 | return sorted(heads, key=self.changelog.rev, reverse=True) | |
3292 |
|
3292 | |||
3293 | def branchheads(self, branch=None, start=None, closed=False): |
|
3293 | def branchheads(self, branch=None, start=None, closed=False): | |
3294 | '''return a (possibly filtered) list of heads for the given branch |
|
3294 | '''return a (possibly filtered) list of heads for the given branch | |
3295 |
|
3295 | |||
3296 | Heads are returned in topological order, from newest to oldest. |
|
3296 | Heads are returned in topological order, from newest to oldest. | |
3297 | If branch is None, use the dirstate branch. |
|
3297 | If branch is None, use the dirstate branch. | |
3298 | If start is not None, return only heads reachable from start. |
|
3298 | If start is not None, return only heads reachable from start. | |
3299 | If closed is True, return heads that are marked as closed as well. |
|
3299 | If closed is True, return heads that are marked as closed as well. | |
3300 | ''' |
|
3300 | ''' | |
3301 | if branch is None: |
|
3301 | if branch is None: | |
3302 | branch = self[None].branch() |
|
3302 | branch = self[None].branch() | |
3303 | branches = self.branchmap() |
|
3303 | branches = self.branchmap() | |
3304 | if not branches.hasbranch(branch): |
|
3304 | if not branches.hasbranch(branch): | |
3305 | return [] |
|
3305 | return [] | |
3306 | # the cache returns heads ordered lowest to highest |
|
3306 | # the cache returns heads ordered lowest to highest | |
3307 | bheads = list(reversed(branches.branchheads(branch, closed=closed))) |
|
3307 | bheads = list(reversed(branches.branchheads(branch, closed=closed))) | |
3308 | if start is not None: |
|
3308 | if start is not None: | |
3309 | # filter out the heads that cannot be reached from startrev |
|
3309 | # filter out the heads that cannot be reached from startrev | |
3310 | fbheads = set(self.changelog.nodesbetween([start], bheads)[2]) |
|
3310 | fbheads = set(self.changelog.nodesbetween([start], bheads)[2]) | |
3311 | bheads = [h for h in bheads if h in fbheads] |
|
3311 | bheads = [h for h in bheads if h in fbheads] | |
3312 | return bheads |
|
3312 | return bheads | |
3313 |
|
3313 | |||
3314 | def branches(self, nodes): |
|
3314 | def branches(self, nodes): | |
3315 | if not nodes: |
|
3315 | if not nodes: | |
3316 | nodes = [self.changelog.tip()] |
|
3316 | nodes = [self.changelog.tip()] | |
3317 | b = [] |
|
3317 | b = [] | |
3318 | for n in nodes: |
|
3318 | for n in nodes: | |
3319 | t = n |
|
3319 | t = n | |
3320 | while True: |
|
3320 | while True: | |
3321 | p = self.changelog.parents(n) |
|
3321 | p = self.changelog.parents(n) | |
3322 | if p[1] != nullid or p[0] == nullid: |
|
3322 | if p[1] != nullid or p[0] == nullid: | |
3323 | b.append((t, n, p[0], p[1])) |
|
3323 | b.append((t, n, p[0], p[1])) | |
3324 | break |
|
3324 | break | |
3325 | n = p[0] |
|
3325 | n = p[0] | |
3326 | return b |
|
3326 | return b | |
3327 |
|
3327 | |||
3328 | def between(self, pairs): |
|
3328 | def between(self, pairs): | |
3329 | r = [] |
|
3329 | r = [] | |
3330 |
|
3330 | |||
3331 | for top, bottom in pairs: |
|
3331 | for top, bottom in pairs: | |
3332 | n, l, i = top, [], 0 |
|
3332 | n, l, i = top, [], 0 | |
3333 | f = 1 |
|
3333 | f = 1 | |
3334 |
|
3334 | |||
3335 | while n != bottom and n != nullid: |
|
3335 | while n != bottom and n != nullid: | |
3336 | p = self.changelog.parents(n)[0] |
|
3336 | p = self.changelog.parents(n)[0] | |
3337 | if i == f: |
|
3337 | if i == f: | |
3338 | l.append(n) |
|
3338 | l.append(n) | |
3339 | f = f * 2 |
|
3339 | f = f * 2 | |
3340 | n = p |
|
3340 | n = p | |
3341 | i += 1 |
|
3341 | i += 1 | |
3342 |
|
3342 | |||
3343 | r.append(l) |
|
3343 | r.append(l) | |
3344 |
|
3344 | |||
3345 | return r |
|
3345 | return r | |
3346 |
|
3346 | |||
3347 | def checkpush(self, pushop): |
|
3347 | def checkpush(self, pushop): | |
3348 | """Extensions can override this function if additional checks have |
|
3348 | """Extensions can override this function if additional checks have | |
3349 | to be performed before pushing, or call it if they override push |
|
3349 | to be performed before pushing, or call it if they override push | |
3350 | command. |
|
3350 | command. | |
3351 | """ |
|
3351 | """ | |
3352 |
|
3352 | |||
3353 | @unfilteredpropertycache |
|
3353 | @unfilteredpropertycache | |
3354 | def prepushoutgoinghooks(self): |
|
3354 | def prepushoutgoinghooks(self): | |
3355 | """Return util.hooks consists of a pushop with repo, remote, outgoing |
|
3355 | """Return util.hooks consists of a pushop with repo, remote, outgoing | |
3356 | methods, which are called before pushing changesets. |
|
3356 | methods, which are called before pushing changesets. | |
3357 | """ |
|
3357 | """ | |
3358 | return util.hooks() |
|
3358 | return util.hooks() | |
3359 |
|
3359 | |||
3360 | def pushkey(self, namespace, key, old, new): |
|
3360 | def pushkey(self, namespace, key, old, new): | |
3361 | try: |
|
3361 | try: | |
3362 | tr = self.currenttransaction() |
|
3362 | tr = self.currenttransaction() | |
3363 | hookargs = {} |
|
3363 | hookargs = {} | |
3364 | if tr is not None: |
|
3364 | if tr is not None: | |
3365 | hookargs.update(tr.hookargs) |
|
3365 | hookargs.update(tr.hookargs) | |
3366 | hookargs = pycompat.strkwargs(hookargs) |
|
3366 | hookargs = pycompat.strkwargs(hookargs) | |
3367 | hookargs['namespace'] = namespace |
|
3367 | hookargs['namespace'] = namespace | |
3368 | hookargs['key'] = key |
|
3368 | hookargs['key'] = key | |
3369 | hookargs['old'] = old |
|
3369 | hookargs['old'] = old | |
3370 | hookargs['new'] = new |
|
3370 | hookargs['new'] = new | |
3371 | self.hook(b'prepushkey', throw=True, **hookargs) |
|
3371 | self.hook(b'prepushkey', throw=True, **hookargs) | |
3372 | except error.HookAbort as exc: |
|
3372 | except error.HookAbort as exc: | |
3373 | self.ui.write_err(_(b"pushkey-abort: %s\n") % exc) |
|
3373 | self.ui.write_err(_(b"pushkey-abort: %s\n") % exc) | |
3374 | if exc.hint: |
|
3374 | if exc.hint: | |
3375 | self.ui.write_err(_(b"(%s)\n") % exc.hint) |
|
3375 | self.ui.write_err(_(b"(%s)\n") % exc.hint) | |
3376 | return False |
|
3376 | return False | |
3377 | self.ui.debug(b'pushing key for "%s:%s"\n' % (namespace, key)) |
|
3377 | self.ui.debug(b'pushing key for "%s:%s"\n' % (namespace, key)) | |
3378 | ret = pushkey.push(self, namespace, key, old, new) |
|
3378 | ret = pushkey.push(self, namespace, key, old, new) | |
3379 |
|
3379 | |||
3380 | def runhook(): |
|
3380 | def runhook(): | |
3381 | self.hook( |
|
3381 | self.hook( | |
3382 | b'pushkey', |
|
3382 | b'pushkey', | |
3383 | namespace=namespace, |
|
3383 | namespace=namespace, | |
3384 | key=key, |
|
3384 | key=key, | |
3385 | old=old, |
|
3385 | old=old, | |
3386 | new=new, |
|
3386 | new=new, | |
3387 | ret=ret, |
|
3387 | ret=ret, | |
3388 | ) |
|
3388 | ) | |
3389 |
|
3389 | |||
3390 | self._afterlock(runhook) |
|
3390 | self._afterlock(runhook) | |
3391 | return ret |
|
3391 | return ret | |
3392 |
|
3392 | |||
3393 | def listkeys(self, namespace): |
|
3393 | def listkeys(self, namespace): | |
3394 | self.hook(b'prelistkeys', throw=True, namespace=namespace) |
|
3394 | self.hook(b'prelistkeys', throw=True, namespace=namespace) | |
3395 | self.ui.debug(b'listing keys for "%s"\n' % namespace) |
|
3395 | self.ui.debug(b'listing keys for "%s"\n' % namespace) | |
3396 | values = pushkey.list(self, namespace) |
|
3396 | values = pushkey.list(self, namespace) | |
3397 | self.hook(b'listkeys', namespace=namespace, values=values) |
|
3397 | self.hook(b'listkeys', namespace=namespace, values=values) | |
3398 | return values |
|
3398 | return values | |
3399 |
|
3399 | |||
3400 | def debugwireargs(self, one, two, three=None, four=None, five=None): |
|
3400 | def debugwireargs(self, one, two, three=None, four=None, five=None): | |
3401 | '''used to test argument passing over the wire''' |
|
3401 | '''used to test argument passing over the wire''' | |
3402 | return b"%s %s %s %s %s" % ( |
|
3402 | return b"%s %s %s %s %s" % ( | |
3403 | one, |
|
3403 | one, | |
3404 | two, |
|
3404 | two, | |
3405 | pycompat.bytestr(three), |
|
3405 | pycompat.bytestr(three), | |
3406 | pycompat.bytestr(four), |
|
3406 | pycompat.bytestr(four), | |
3407 | pycompat.bytestr(five), |
|
3407 | pycompat.bytestr(five), | |
3408 | ) |
|
3408 | ) | |
3409 |
|
3409 | |||
3410 | def savecommitmessage(self, text): |
|
3410 | def savecommitmessage(self, text): | |
3411 | fp = self.vfs(b'last-message.txt', b'wb') |
|
3411 | fp = self.vfs(b'last-message.txt', b'wb') | |
3412 | try: |
|
3412 | try: | |
3413 | fp.write(text) |
|
3413 | fp.write(text) | |
3414 | finally: |
|
3414 | finally: | |
3415 | fp.close() |
|
3415 | fp.close() | |
3416 | return self.pathto(fp.name[len(self.root) + 1 :]) |
|
3416 | return self.pathto(fp.name[len(self.root) + 1 :]) | |
3417 |
|
3417 | |||
3418 |
|
3418 | |||
3419 | # used to avoid circular references so destructors work |
|
3419 | # used to avoid circular references so destructors work | |
3420 | def aftertrans(files): |
|
3420 | def aftertrans(files): | |
3421 | renamefiles = [tuple(t) for t in files] |
|
3421 | renamefiles = [tuple(t) for t in files] | |
3422 |
|
3422 | |||
3423 | def a(): |
|
3423 | def a(): | |
3424 | for vfs, src, dest in renamefiles: |
|
3424 | for vfs, src, dest in renamefiles: | |
3425 | # if src and dest refer to a same file, vfs.rename is a no-op, |
|
3425 | # if src and dest refer to a same file, vfs.rename is a no-op, | |
3426 | # leaving both src and dest on disk. delete dest to make sure |
|
3426 | # leaving both src and dest on disk. delete dest to make sure | |
3427 | # the rename couldn't be such a no-op. |
|
3427 | # the rename couldn't be such a no-op. | |
3428 | vfs.tryunlink(dest) |
|
3428 | vfs.tryunlink(dest) | |
3429 | try: |
|
3429 | try: | |
3430 | vfs.rename(src, dest) |
|
3430 | vfs.rename(src, dest) | |
3431 | except OSError: # journal file does not yet exist |
|
3431 | except OSError: # journal file does not yet exist | |
3432 | pass |
|
3432 | pass | |
3433 |
|
3433 | |||
3434 | return a |
|
3434 | return a | |
3435 |
|
3435 | |||
3436 |
|
3436 | |||
3437 | def undoname(fn): |
|
3437 | def undoname(fn): | |
3438 | base, name = os.path.split(fn) |
|
3438 | base, name = os.path.split(fn) | |
3439 | assert name.startswith(b'journal') |
|
3439 | assert name.startswith(b'journal') | |
3440 | return os.path.join(base, name.replace(b'journal', b'undo', 1)) |
|
3440 | return os.path.join(base, name.replace(b'journal', b'undo', 1)) | |
3441 |
|
3441 | |||
3442 |
|
3442 | |||
3443 | def instance(ui, path, create, intents=None, createopts=None): |
|
3443 | def instance(ui, path, create, intents=None, createopts=None): | |
3444 | localpath = util.urllocalpath(path) |
|
3444 | localpath = util.urllocalpath(path) | |
3445 | if create: |
|
3445 | if create: | |
3446 | createrepository(ui, localpath, createopts=createopts) |
|
3446 | createrepository(ui, localpath, createopts=createopts) | |
3447 |
|
3447 | |||
3448 | return makelocalrepository(ui, localpath, intents=intents) |
|
3448 | return makelocalrepository(ui, localpath, intents=intents) | |
3449 |
|
3449 | |||
3450 |
|
3450 | |||
3451 | def islocal(path): |
|
3451 | def islocal(path): | |
3452 | return True |
|
3452 | return True | |
3453 |
|
3453 | |||
3454 |
|
3454 | |||
3455 | def defaultcreateopts(ui, createopts=None): |
|
3455 | def defaultcreateopts(ui, createopts=None): | |
3456 | """Populate the default creation options for a repository. |
|
3456 | """Populate the default creation options for a repository. | |
3457 |
|
3457 | |||
3458 | A dictionary of explicitly requested creation options can be passed |
|
3458 | A dictionary of explicitly requested creation options can be passed | |
3459 | in. Missing keys will be populated. |
|
3459 | in. Missing keys will be populated. | |
3460 | """ |
|
3460 | """ | |
3461 | createopts = dict(createopts or {}) |
|
3461 | createopts = dict(createopts or {}) | |
3462 |
|
3462 | |||
3463 | if b'backend' not in createopts: |
|
3463 | if b'backend' not in createopts: | |
3464 | # experimental config: storage.new-repo-backend |
|
3464 | # experimental config: storage.new-repo-backend | |
3465 | createopts[b'backend'] = ui.config(b'storage', b'new-repo-backend') |
|
3465 | createopts[b'backend'] = ui.config(b'storage', b'new-repo-backend') | |
3466 |
|
3466 | |||
3467 | return createopts |
|
3467 | return createopts | |
3468 |
|
3468 | |||
3469 |
|
3469 | |||
3470 | def newreporequirements(ui, createopts): |
|
3470 | def newreporequirements(ui, createopts): | |
3471 | """Determine the set of requirements for a new local repository. |
|
3471 | """Determine the set of requirements for a new local repository. | |
3472 |
|
3472 | |||
3473 | Extensions can wrap this function to specify custom requirements for |
|
3473 | Extensions can wrap this function to specify custom requirements for | |
3474 | new repositories. |
|
3474 | new repositories. | |
3475 | """ |
|
3475 | """ | |
3476 | # If the repo is being created from a shared repository, we copy |
|
3476 | # If the repo is being created from a shared repository, we copy | |
3477 | # its requirements. |
|
3477 | # its requirements. | |
3478 | if b'sharedrepo' in createopts: |
|
3478 | if b'sharedrepo' in createopts: | |
3479 | requirements = set(createopts[b'sharedrepo'].requirements) |
|
3479 | requirements = set(createopts[b'sharedrepo'].requirements) | |
3480 | if createopts.get(b'sharedrelative'): |
|
3480 | if createopts.get(b'sharedrelative'): | |
3481 | requirements.add(b'relshared') |
|
3481 | requirements.add(b'relshared') | |
3482 | else: |
|
3482 | else: | |
3483 | requirements.add(b'shared') |
|
3483 | requirements.add(b'shared') | |
3484 |
|
3484 | |||
3485 | return requirements |
|
3485 | return requirements | |
3486 |
|
3486 | |||
3487 | if b'backend' not in createopts: |
|
3487 | if b'backend' not in createopts: | |
3488 | raise error.ProgrammingError( |
|
3488 | raise error.ProgrammingError( | |
3489 | b'backend key not present in createopts; ' |
|
3489 | b'backend key not present in createopts; ' | |
3490 | b'was defaultcreateopts() called?' |
|
3490 | b'was defaultcreateopts() called?' | |
3491 | ) |
|
3491 | ) | |
3492 |
|
3492 | |||
3493 | if createopts[b'backend'] != b'revlogv1': |
|
3493 | if createopts[b'backend'] != b'revlogv1': | |
3494 | raise error.Abort( |
|
3494 | raise error.Abort( | |
3495 | _( |
|
3495 | _( | |
3496 | b'unable to determine repository requirements for ' |
|
3496 | b'unable to determine repository requirements for ' | |
3497 | b'storage backend: %s' |
|
3497 | b'storage backend: %s' | |
3498 | ) |
|
3498 | ) | |
3499 | % createopts[b'backend'] |
|
3499 | % createopts[b'backend'] | |
3500 | ) |
|
3500 | ) | |
3501 |
|
3501 | |||
3502 | requirements = {b'revlogv1'} |
|
3502 | requirements = {b'revlogv1'} | |
3503 | if ui.configbool(b'format', b'usestore'): |
|
3503 | if ui.configbool(b'format', b'usestore'): | |
3504 | requirements.add(b'store') |
|
3504 | requirements.add(b'store') | |
3505 | if ui.configbool(b'format', b'usefncache'): |
|
3505 | if ui.configbool(b'format', b'usefncache'): | |
3506 | requirements.add(b'fncache') |
|
3506 | requirements.add(b'fncache') | |
3507 | if ui.configbool(b'format', b'dotencode'): |
|
3507 | if ui.configbool(b'format', b'dotencode'): | |
3508 | requirements.add(b'dotencode') |
|
3508 | requirements.add(b'dotencode') | |
3509 |
|
3509 | |||
3510 | compengine = ui.config(b'format', b'revlog-compression') |
|
3510 | compengine = ui.config(b'format', b'revlog-compression') | |
3511 | if compengine not in util.compengines: |
|
3511 | if compengine not in util.compengines: | |
3512 | raise error.Abort( |
|
3512 | raise error.Abort( | |
3513 | _( |
|
3513 | _( | |
3514 | b'compression engine %s defined by ' |
|
3514 | b'compression engine %s defined by ' | |
3515 | b'format.revlog-compression not available' |
|
3515 | b'format.revlog-compression not available' | |
3516 | ) |
|
3516 | ) | |
3517 | % compengine, |
|
3517 | % compengine, | |
3518 | hint=_( |
|
3518 | hint=_( | |
3519 | b'run "hg debuginstall" to list available ' |
|
3519 | b'run "hg debuginstall" to list available ' | |
3520 | b'compression engines' |
|
3520 | b'compression engines' | |
3521 | ), |
|
3521 | ), | |
3522 | ) |
|
3522 | ) | |
3523 |
|
3523 | |||
3524 | # zlib is the historical default and doesn't need an explicit requirement. |
|
3524 | # zlib is the historical default and doesn't need an explicit requirement. | |
3525 | elif compengine == b'zstd': |
|
3525 | elif compengine == b'zstd': | |
3526 | requirements.add(b'revlog-compression-zstd') |
|
3526 | requirements.add(b'revlog-compression-zstd') | |
3527 | elif compengine != b'zlib': |
|
3527 | elif compengine != b'zlib': | |
3528 | requirements.add(b'exp-compression-%s' % compengine) |
|
3528 | requirements.add(b'exp-compression-%s' % compengine) | |
3529 |
|
3529 | |||
3530 | if scmutil.gdinitconfig(ui): |
|
3530 | if scmutil.gdinitconfig(ui): | |
3531 | requirements.add(b'generaldelta') |
|
3531 | requirements.add(b'generaldelta') | |
3532 | if ui.configbool(b'format', b'sparse-revlog'): |
|
3532 | if ui.configbool(b'format', b'sparse-revlog'): | |
3533 | requirements.add(SPARSEREVLOG_REQUIREMENT) |
|
3533 | requirements.add(SPARSEREVLOG_REQUIREMENT) | |
3534 |
|
3534 | |||
3535 | # experimental config: format.exp-use-side-data |
|
3535 | # experimental config: format.exp-use-side-data | |
3536 | if ui.configbool(b'format', b'exp-use-side-data'): |
|
3536 | if ui.configbool(b'format', b'exp-use-side-data'): | |
3537 | requirements.add(SIDEDATA_REQUIREMENT) |
|
3537 | requirements.add(SIDEDATA_REQUIREMENT) | |
3538 | # experimental config: format.exp-use-copies-side-data-changeset |
|
3538 | # experimental config: format.exp-use-copies-side-data-changeset | |
3539 | if ui.configbool(b'format', b'exp-use-copies-side-data-changeset'): |
|
3539 | if ui.configbool(b'format', b'exp-use-copies-side-data-changeset'): | |
3540 | requirements.add(SIDEDATA_REQUIREMENT) |
|
3540 | requirements.add(SIDEDATA_REQUIREMENT) | |
3541 | requirements.add(COPIESSDC_REQUIREMENT) |
|
3541 | requirements.add(COPIESSDC_REQUIREMENT) | |
3542 | if ui.configbool(b'experimental', b'treemanifest'): |
|
3542 | if ui.configbool(b'experimental', b'treemanifest'): | |
3543 | requirements.add(b'treemanifest') |
|
3543 | requirements.add(b'treemanifest') | |
3544 |
|
3544 | |||
3545 | revlogv2 = ui.config(b'experimental', b'revlogv2') |
|
3545 | revlogv2 = ui.config(b'experimental', b'revlogv2') | |
3546 | if revlogv2 == b'enable-unstable-format-and-corrupt-my-data': |
|
3546 | if revlogv2 == b'enable-unstable-format-and-corrupt-my-data': | |
3547 | requirements.remove(b'revlogv1') |
|
3547 | requirements.remove(b'revlogv1') | |
3548 | # generaldelta is implied by revlogv2. |
|
3548 | # generaldelta is implied by revlogv2. | |
3549 | requirements.discard(b'generaldelta') |
|
3549 | requirements.discard(b'generaldelta') | |
3550 | requirements.add(REVLOGV2_REQUIREMENT) |
|
3550 | requirements.add(REVLOGV2_REQUIREMENT) | |
3551 | # experimental config: format.internal-phase |
|
3551 | # experimental config: format.internal-phase | |
3552 | if ui.configbool(b'format', b'internal-phase'): |
|
3552 | if ui.configbool(b'format', b'internal-phase'): | |
3553 | requirements.add(b'internal-phase') |
|
3553 | requirements.add(b'internal-phase') | |
3554 |
|
3554 | |||
3555 | if createopts.get(b'narrowfiles'): |
|
3555 | if createopts.get(b'narrowfiles'): | |
3556 | requirements.add(repository.NARROW_REQUIREMENT) |
|
3556 | requirements.add(repository.NARROW_REQUIREMENT) | |
3557 |
|
3557 | |||
3558 | if createopts.get(b'lfs'): |
|
3558 | if createopts.get(b'lfs'): | |
3559 | requirements.add(b'lfs') |
|
3559 | requirements.add(b'lfs') | |
3560 |
|
3560 | |||
3561 | if ui.configbool(b'format', b'bookmarks-in-store'): |
|
3561 | if ui.configbool(b'format', b'bookmarks-in-store'): | |
3562 | requirements.add(bookmarks.BOOKMARKS_IN_STORE_REQUIREMENT) |
|
3562 | requirements.add(bookmarks.BOOKMARKS_IN_STORE_REQUIREMENT) | |
3563 |
|
3563 | |||
3564 | return requirements |
|
3564 | return requirements | |
3565 |
|
3565 | |||
3566 |
|
3566 | |||
3567 | def filterknowncreateopts(ui, createopts): |
|
3567 | def filterknowncreateopts(ui, createopts): | |
3568 | """Filters a dict of repo creation options against options that are known. |
|
3568 | """Filters a dict of repo creation options against options that are known. | |
3569 |
|
3569 | |||
3570 | Receives a dict of repo creation options and returns a dict of those |
|
3570 | Receives a dict of repo creation options and returns a dict of those | |
3571 | options that we don't know how to handle. |
|
3571 | options that we don't know how to handle. | |
3572 |
|
3572 | |||
3573 | This function is called as part of repository creation. If the |
|
3573 | This function is called as part of repository creation. If the | |
3574 | returned dict contains any items, repository creation will not |
|
3574 | returned dict contains any items, repository creation will not | |
3575 | be allowed, as it means there was a request to create a repository |
|
3575 | be allowed, as it means there was a request to create a repository | |
3576 | with options not recognized by loaded code. |
|
3576 | with options not recognized by loaded code. | |
3577 |
|
3577 | |||
3578 | Extensions can wrap this function to filter out creation options |
|
3578 | Extensions can wrap this function to filter out creation options | |
3579 | they know how to handle. |
|
3579 | they know how to handle. | |
3580 | """ |
|
3580 | """ | |
3581 | known = { |
|
3581 | known = { | |
3582 | b'backend', |
|
3582 | b'backend', | |
3583 | b'lfs', |
|
3583 | b'lfs', | |
3584 | b'narrowfiles', |
|
3584 | b'narrowfiles', | |
3585 | b'sharedrepo', |
|
3585 | b'sharedrepo', | |
3586 | b'sharedrelative', |
|
3586 | b'sharedrelative', | |
3587 | b'shareditems', |
|
3587 | b'shareditems', | |
3588 | b'shallowfilestore', |
|
3588 | b'shallowfilestore', | |
3589 | } |
|
3589 | } | |
3590 |
|
3590 | |||
3591 | return {k: v for k, v in createopts.items() if k not in known} |
|
3591 | return {k: v for k, v in createopts.items() if k not in known} | |
3592 |
|
3592 | |||
3593 |
|
3593 | |||
3594 | def createrepository(ui, path, createopts=None): |
|
3594 | def createrepository(ui, path, createopts=None): | |
3595 | """Create a new repository in a vfs. |
|
3595 | """Create a new repository in a vfs. | |
3596 |
|
3596 | |||
3597 | ``path`` path to the new repo's working directory. |
|
3597 | ``path`` path to the new repo's working directory. | |
3598 | ``createopts`` options for the new repository. |
|
3598 | ``createopts`` options for the new repository. | |
3599 |
|
3599 | |||
3600 | The following keys for ``createopts`` are recognized: |
|
3600 | The following keys for ``createopts`` are recognized: | |
3601 |
|
3601 | |||
3602 | backend |
|
3602 | backend | |
3603 | The storage backend to use. |
|
3603 | The storage backend to use. | |
3604 | lfs |
|
3604 | lfs | |
3605 | Repository will be created with ``lfs`` requirement. The lfs extension |
|
3605 | Repository will be created with ``lfs`` requirement. The lfs extension | |
3606 | will automatically be loaded when the repository is accessed. |
|
3606 | will automatically be loaded when the repository is accessed. | |
3607 | narrowfiles |
|
3607 | narrowfiles | |
3608 | Set up repository to support narrow file storage. |
|
3608 | Set up repository to support narrow file storage. | |
3609 | sharedrepo |
|
3609 | sharedrepo | |
3610 | Repository object from which storage should be shared. |
|
3610 | Repository object from which storage should be shared. | |
3611 | sharedrelative |
|
3611 | sharedrelative | |
3612 | Boolean indicating if the path to the shared repo should be |
|
3612 | Boolean indicating if the path to the shared repo should be | |
3613 | stored as relative. By default, the pointer to the "parent" repo |
|
3613 | stored as relative. By default, the pointer to the "parent" repo | |
3614 | is stored as an absolute path. |
|
3614 | is stored as an absolute path. | |
3615 | shareditems |
|
3615 | shareditems | |
3616 | Set of items to share to the new repository (in addition to storage). |
|
3616 | Set of items to share to the new repository (in addition to storage). | |
3617 | shallowfilestore |
|
3617 | shallowfilestore | |
3618 | Indicates that storage for files should be shallow (not all ancestor |
|
3618 | Indicates that storage for files should be shallow (not all ancestor | |
3619 | revisions are known). |
|
3619 | revisions are known). | |
3620 | """ |
|
3620 | """ | |
3621 | createopts = defaultcreateopts(ui, createopts=createopts) |
|
3621 | createopts = defaultcreateopts(ui, createopts=createopts) | |
3622 |
|
3622 | |||
3623 | unknownopts = filterknowncreateopts(ui, createopts) |
|
3623 | unknownopts = filterknowncreateopts(ui, createopts) | |
3624 |
|
3624 | |||
3625 | if not isinstance(unknownopts, dict): |
|
3625 | if not isinstance(unknownopts, dict): | |
3626 | raise error.ProgrammingError( |
|
3626 | raise error.ProgrammingError( | |
3627 | b'filterknowncreateopts() did not return a dict' |
|
3627 | b'filterknowncreateopts() did not return a dict' | |
3628 | ) |
|
3628 | ) | |
3629 |
|
3629 | |||
3630 | if unknownopts: |
|
3630 | if unknownopts: | |
3631 | raise error.Abort( |
|
3631 | raise error.Abort( | |
3632 | _( |
|
3632 | _( | |
3633 | b'unable to create repository because of unknown ' |
|
3633 | b'unable to create repository because of unknown ' | |
3634 | b'creation option: %s' |
|
3634 | b'creation option: %s' | |
3635 | ) |
|
3635 | ) | |
3636 | % b', '.join(sorted(unknownopts)), |
|
3636 | % b', '.join(sorted(unknownopts)), | |
3637 | hint=_(b'is a required extension not loaded?'), |
|
3637 | hint=_(b'is a required extension not loaded?'), | |
3638 | ) |
|
3638 | ) | |
3639 |
|
3639 | |||
3640 | requirements = newreporequirements(ui, createopts=createopts) |
|
3640 | requirements = newreporequirements(ui, createopts=createopts) | |
3641 |
|
3641 | |||
3642 | wdirvfs = vfsmod.vfs(path, expandpath=True, realpath=True) |
|
3642 | wdirvfs = vfsmod.vfs(path, expandpath=True, realpath=True) | |
3643 |
|
3643 | |||
3644 | hgvfs = vfsmod.vfs(wdirvfs.join(b'.hg')) |
|
3644 | hgvfs = vfsmod.vfs(wdirvfs.join(b'.hg')) | |
3645 | if hgvfs.exists(): |
|
3645 | if hgvfs.exists(): | |
3646 | raise error.RepoError(_(b'repository %s already exists') % path) |
|
3646 | raise error.RepoError(_(b'repository %s already exists') % path) | |
3647 |
|
3647 | |||
3648 | if b'sharedrepo' in createopts: |
|
3648 | if b'sharedrepo' in createopts: | |
3649 | sharedpath = createopts[b'sharedrepo'].sharedpath |
|
3649 | sharedpath = createopts[b'sharedrepo'].sharedpath | |
3650 |
|
3650 | |||
3651 | if createopts.get(b'sharedrelative'): |
|
3651 | if createopts.get(b'sharedrelative'): | |
3652 | try: |
|
3652 | try: | |
3653 | sharedpath = os.path.relpath(sharedpath, hgvfs.base) |
|
3653 | sharedpath = os.path.relpath(sharedpath, hgvfs.base) | |
3654 | except (IOError, ValueError) as e: |
|
3654 | except (IOError, ValueError) as e: | |
3655 | # ValueError is raised on Windows if the drive letters differ |
|
3655 | # ValueError is raised on Windows if the drive letters differ | |
3656 | # on each path. |
|
3656 | # on each path. | |
3657 | raise error.Abort( |
|
3657 | raise error.Abort( | |
3658 | _(b'cannot calculate relative path'), |
|
3658 | _(b'cannot calculate relative path'), | |
3659 | hint=stringutil.forcebytestr(e), |
|
3659 | hint=stringutil.forcebytestr(e), | |
3660 | ) |
|
3660 | ) | |
3661 |
|
3661 | |||
3662 | if not wdirvfs.exists(): |
|
3662 | if not wdirvfs.exists(): | |
3663 | wdirvfs.makedirs() |
|
3663 | wdirvfs.makedirs() | |
3664 |
|
3664 | |||
3665 | hgvfs.makedir(notindexed=True) |
|
3665 | hgvfs.makedir(notindexed=True) | |
3666 | if b'sharedrepo' not in createopts: |
|
3666 | if b'sharedrepo' not in createopts: | |
3667 | hgvfs.mkdir(b'cache') |
|
3667 | hgvfs.mkdir(b'cache') | |
3668 | hgvfs.mkdir(b'wcache') |
|
3668 | hgvfs.mkdir(b'wcache') | |
3669 |
|
3669 | |||
3670 | if b'store' in requirements and b'sharedrepo' not in createopts: |
|
3670 | if b'store' in requirements and b'sharedrepo' not in createopts: | |
3671 | hgvfs.mkdir(b'store') |
|
3671 | hgvfs.mkdir(b'store') | |
3672 |
|
3672 | |||
3673 | # We create an invalid changelog outside the store so very old |
|
3673 | # We create an invalid changelog outside the store so very old | |
3674 | # Mercurial versions (which didn't know about the requirements |
|
3674 | # Mercurial versions (which didn't know about the requirements | |
3675 | # file) encounter an error on reading the changelog. This |
|
3675 | # file) encounter an error on reading the changelog. This | |
3676 | # effectively locks out old clients and prevents them from |
|
3676 | # effectively locks out old clients and prevents them from | |
3677 | # mucking with a repo in an unknown format. |
|
3677 | # mucking with a repo in an unknown format. | |
3678 | # |
|
3678 | # | |
3679 | # The revlog header has version 2, which won't be recognized by |
|
3679 | # The revlog header has version 2, which won't be recognized by | |
3680 | # such old clients. |
|
3680 | # such old clients. | |
3681 | hgvfs.append( |
|
3681 | hgvfs.append( | |
3682 | b'00changelog.i', |
|
3682 | b'00changelog.i', | |
3683 | b'\0\0\0\2 dummy changelog to prevent using the old repo ' |
|
3683 | b'\0\0\0\2 dummy changelog to prevent using the old repo ' | |
3684 | b'layout', |
|
3684 | b'layout', | |
3685 | ) |
|
3685 | ) | |
3686 |
|
3686 | |||
3687 | scmutil.writerequires(hgvfs, requirements) |
|
3687 | scmutil.writerequires(hgvfs, requirements) | |
3688 |
|
3688 | |||
3689 | # Write out file telling readers where to find the shared store. |
|
3689 | # Write out file telling readers where to find the shared store. | |
3690 | if b'sharedrepo' in createopts: |
|
3690 | if b'sharedrepo' in createopts: | |
3691 | hgvfs.write(b'sharedpath', sharedpath) |
|
3691 | hgvfs.write(b'sharedpath', sharedpath) | |
3692 |
|
3692 | |||
3693 | if createopts.get(b'shareditems'): |
|
3693 | if createopts.get(b'shareditems'): | |
3694 | shared = b'\n'.join(sorted(createopts[b'shareditems'])) + b'\n' |
|
3694 | shared = b'\n'.join(sorted(createopts[b'shareditems'])) + b'\n' | |
3695 | hgvfs.write(b'shared', shared) |
|
3695 | hgvfs.write(b'shared', shared) | |
3696 |
|
3696 | |||
3697 |
|
3697 | |||
3698 | def poisonrepository(repo): |
|
3698 | def poisonrepository(repo): | |
3699 | """Poison a repository instance so it can no longer be used.""" |
|
3699 | """Poison a repository instance so it can no longer be used.""" | |
3700 | # Perform any cleanup on the instance. |
|
3700 | # Perform any cleanup on the instance. | |
3701 | repo.close() |
|
3701 | repo.close() | |
3702 |
|
3702 | |||
3703 | # Our strategy is to replace the type of the object with one that |
|
3703 | # Our strategy is to replace the type of the object with one that | |
3704 | # has all attribute lookups result in error. |
|
3704 | # has all attribute lookups result in error. | |
3705 | # |
|
3705 | # | |
3706 | # But we have to allow the close() method because some constructors |
|
3706 | # But we have to allow the close() method because some constructors | |
3707 | # of repos call close() on repo references. |
|
3707 | # of repos call close() on repo references. | |
3708 | class poisonedrepository(object): |
|
3708 | class poisonedrepository(object): | |
3709 | def __getattribute__(self, item): |
|
3709 | def __getattribute__(self, item): | |
3710 | if item == 'close': |
|
3710 | if item == 'close': | |
3711 | return object.__getattribute__(self, item) |
|
3711 | return object.__getattribute__(self, item) | |
3712 |
|
3712 | |||
3713 | raise error.ProgrammingError( |
|
3713 | raise error.ProgrammingError( | |
3714 | b'repo instances should not be used after unshare' |
|
3714 | b'repo instances should not be used after unshare' | |
3715 | ) |
|
3715 | ) | |
3716 |
|
3716 | |||
3717 | def close(self): |
|
3717 | def close(self): | |
3718 | pass |
|
3718 | pass | |
3719 |
|
3719 | |||
3720 | # We may have a repoview, which intercepts __setattr__. So be sure |
|
3720 | # We may have a repoview, which intercepts __setattr__. So be sure | |
3721 | # we operate at the lowest level possible. |
|
3721 | # we operate at the lowest level possible. | |
3722 | object.__setattr__(repo, '__class__', poisonedrepository) |
|
3722 | object.__setattr__(repo, '__class__', poisonedrepository) |
@@ -1,1035 +1,1040 b'' | |||||
1 | # obsutil.py - utility functions for obsolescence |
|
1 | # obsutil.py - utility functions for obsolescence | |
2 | # |
|
2 | # | |
3 | # Copyright 2017 Boris Feld <boris.feld@octobus.net> |
|
3 | # Copyright 2017 Boris Feld <boris.feld@octobus.net> | |
4 | # |
|
4 | # | |
5 | # This software may be used and distributed according to the terms of the |
|
5 | # This software may be used and distributed according to the terms of the | |
6 | # GNU General Public License version 2 or any later version. |
|
6 | # GNU General Public License version 2 or any later version. | |
7 |
|
7 | |||
8 | from __future__ import absolute_import |
|
8 | from __future__ import absolute_import | |
9 |
|
9 | |||
10 | import re |
|
10 | import re | |
11 |
|
11 | |||
12 | from .i18n import _ |
|
12 | from .i18n import _ | |
13 | from . import ( |
|
13 | from . import ( | |
14 | diffutil, |
|
14 | diffutil, | |
15 | encoding, |
|
15 | encoding, | |
16 | node as nodemod, |
|
16 | node as nodemod, | |
17 | phases, |
|
17 | phases, | |
18 | pycompat, |
|
18 | pycompat, | |
19 | util, |
|
19 | util, | |
20 | ) |
|
20 | ) | |
21 | from .utils import dateutil |
|
21 | from .utils import dateutil | |
22 |
|
22 | |||
23 | ### obsolescence marker flag |
|
23 | ### obsolescence marker flag | |
24 |
|
24 | |||
25 | ## bumpedfix flag |
|
25 | ## bumpedfix flag | |
26 | # |
|
26 | # | |
27 | # When a changeset A' succeed to a changeset A which became public, we call A' |
|
27 | # When a changeset A' succeed to a changeset A which became public, we call A' | |
28 | # "bumped" because it's a successors of a public changesets |
|
28 | # "bumped" because it's a successors of a public changesets | |
29 | # |
|
29 | # | |
30 | # o A' (bumped) |
|
30 | # o A' (bumped) | |
31 | # |`: |
|
31 | # |`: | |
32 | # | o A |
|
32 | # | o A | |
33 | # |/ |
|
33 | # |/ | |
34 | # o Z |
|
34 | # o Z | |
35 | # |
|
35 | # | |
36 | # The way to solve this situation is to create a new changeset Ad as children |
|
36 | # The way to solve this situation is to create a new changeset Ad as children | |
37 | # of A. This changeset have the same content than A'. So the diff from A to A' |
|
37 | # of A. This changeset have the same content than A'. So the diff from A to A' | |
38 | # is the same than the diff from A to Ad. Ad is marked as a successors of A' |
|
38 | # is the same than the diff from A to Ad. Ad is marked as a successors of A' | |
39 | # |
|
39 | # | |
40 | # o Ad |
|
40 | # o Ad | |
41 | # |`: |
|
41 | # |`: | |
42 | # | x A' |
|
42 | # | x A' | |
43 | # |'| |
|
43 | # |'| | |
44 | # o | A |
|
44 | # o | A | |
45 | # |/ |
|
45 | # |/ | |
46 | # o Z |
|
46 | # o Z | |
47 | # |
|
47 | # | |
48 | # But by transitivity Ad is also a successors of A. To avoid having Ad marked |
|
48 | # But by transitivity Ad is also a successors of A. To avoid having Ad marked | |
49 | # as bumped too, we add the `bumpedfix` flag to the marker. <A', (Ad,)>. |
|
49 | # as bumped too, we add the `bumpedfix` flag to the marker. <A', (Ad,)>. | |
50 | # This flag mean that the successors express the changes between the public and |
|
50 | # This flag mean that the successors express the changes between the public and | |
51 | # bumped version and fix the situation, breaking the transitivity of |
|
51 | # bumped version and fix the situation, breaking the transitivity of | |
52 | # "bumped" here. |
|
52 | # "bumped" here. | |
53 | bumpedfix = 1 |
|
53 | bumpedfix = 1 | |
54 | usingsha256 = 2 |
|
54 | usingsha256 = 2 | |
55 |
|
55 | |||
56 |
|
56 | |||
57 | class marker(object): |
|
57 | class marker(object): | |
58 | """Wrap obsolete marker raw data""" |
|
58 | """Wrap obsolete marker raw data""" | |
59 |
|
59 | |||
60 | def __init__(self, repo, data): |
|
60 | def __init__(self, repo, data): | |
61 | # the repo argument will be used to create changectx in later version |
|
61 | # the repo argument will be used to create changectx in later version | |
62 | self._repo = repo |
|
62 | self._repo = repo | |
63 | self._data = data |
|
63 | self._data = data | |
64 | self._decodedmeta = None |
|
64 | self._decodedmeta = None | |
65 |
|
65 | |||
66 | def __hash__(self): |
|
66 | def __hash__(self): | |
67 | return hash(self._data) |
|
67 | return hash(self._data) | |
68 |
|
68 | |||
69 | def __eq__(self, other): |
|
69 | def __eq__(self, other): | |
70 | if type(other) != type(self): |
|
70 | if type(other) != type(self): | |
71 | return False |
|
71 | return False | |
72 | return self._data == other._data |
|
72 | return self._data == other._data | |
73 |
|
73 | |||
74 | def prednode(self): |
|
74 | def prednode(self): | |
75 | """Predecessor changeset node identifier""" |
|
75 | """Predecessor changeset node identifier""" | |
76 | return self._data[0] |
|
76 | return self._data[0] | |
77 |
|
77 | |||
78 | def succnodes(self): |
|
78 | def succnodes(self): | |
79 | """List of successor changesets node identifiers""" |
|
79 | """List of successor changesets node identifiers""" | |
80 | return self._data[1] |
|
80 | return self._data[1] | |
81 |
|
81 | |||
82 | def parentnodes(self): |
|
82 | def parentnodes(self): | |
83 | """Parents of the predecessors (None if not recorded)""" |
|
83 | """Parents of the predecessors (None if not recorded)""" | |
84 | return self._data[5] |
|
84 | return self._data[5] | |
85 |
|
85 | |||
86 | def metadata(self): |
|
86 | def metadata(self): | |
87 | """Decoded metadata dictionary""" |
|
87 | """Decoded metadata dictionary""" | |
88 | return dict(self._data[3]) |
|
88 | return dict(self._data[3]) | |
89 |
|
89 | |||
90 | def date(self): |
|
90 | def date(self): | |
91 | """Creation date as (unixtime, offset)""" |
|
91 | """Creation date as (unixtime, offset)""" | |
92 | return self._data[4] |
|
92 | return self._data[4] | |
93 |
|
93 | |||
94 | def flags(self): |
|
94 | def flags(self): | |
95 | """The flags field of the marker""" |
|
95 | """The flags field of the marker""" | |
96 | return self._data[2] |
|
96 | return self._data[2] | |
97 |
|
97 | |||
98 |
|
98 | |||
99 | def getmarkers(repo, nodes=None, exclusive=False): |
|
99 | def getmarkers(repo, nodes=None, exclusive=False): | |
100 | """returns markers known in a repository |
|
100 | """returns markers known in a repository | |
101 |
|
101 | |||
102 | If <nodes> is specified, only markers "relevant" to those nodes are are |
|
102 | If <nodes> is specified, only markers "relevant" to those nodes are are | |
103 | returned""" |
|
103 | returned""" | |
104 | if nodes is None: |
|
104 | if nodes is None: | |
105 | rawmarkers = repo.obsstore |
|
105 | rawmarkers = repo.obsstore | |
106 | elif exclusive: |
|
106 | elif exclusive: | |
107 | rawmarkers = exclusivemarkers(repo, nodes) |
|
107 | rawmarkers = exclusivemarkers(repo, nodes) | |
108 | else: |
|
108 | else: | |
109 | rawmarkers = repo.obsstore.relevantmarkers(nodes) |
|
109 | rawmarkers = repo.obsstore.relevantmarkers(nodes) | |
110 |
|
110 | |||
111 | for markerdata in rawmarkers: |
|
111 | for markerdata in rawmarkers: | |
112 | yield marker(repo, markerdata) |
|
112 | yield marker(repo, markerdata) | |
113 |
|
113 | |||
114 |
|
114 | |||
|
115 | def sortedmarkers(markers): | |||
|
116 | # last item of marker tuple ('parents') may be None or a tuple | |||
|
117 | return sorted(markers, key=lambda m: m[:-1] + (m[-1] or (),)) | |||
|
118 | ||||
|
119 | ||||
115 | def closestpredecessors(repo, nodeid): |
|
120 | def closestpredecessors(repo, nodeid): | |
116 | """yield the list of next predecessors pointing on visible changectx nodes |
|
121 | """yield the list of next predecessors pointing on visible changectx nodes | |
117 |
|
122 | |||
118 | This function respect the repoview filtering, filtered revision will be |
|
123 | This function respect the repoview filtering, filtered revision will be | |
119 | considered missing. |
|
124 | considered missing. | |
120 | """ |
|
125 | """ | |
121 |
|
126 | |||
122 | precursors = repo.obsstore.predecessors |
|
127 | precursors = repo.obsstore.predecessors | |
123 | stack = [nodeid] |
|
128 | stack = [nodeid] | |
124 | seen = set(stack) |
|
129 | seen = set(stack) | |
125 |
|
130 | |||
126 | while stack: |
|
131 | while stack: | |
127 | current = stack.pop() |
|
132 | current = stack.pop() | |
128 | currentpreccs = precursors.get(current, ()) |
|
133 | currentpreccs = precursors.get(current, ()) | |
129 |
|
134 | |||
130 | for prec in currentpreccs: |
|
135 | for prec in currentpreccs: | |
131 | precnodeid = prec[0] |
|
136 | precnodeid = prec[0] | |
132 |
|
137 | |||
133 | # Basic cycle protection |
|
138 | # Basic cycle protection | |
134 | if precnodeid in seen: |
|
139 | if precnodeid in seen: | |
135 | continue |
|
140 | continue | |
136 | seen.add(precnodeid) |
|
141 | seen.add(precnodeid) | |
137 |
|
142 | |||
138 | if precnodeid in repo: |
|
143 | if precnodeid in repo: | |
139 | yield precnodeid |
|
144 | yield precnodeid | |
140 | else: |
|
145 | else: | |
141 | stack.append(precnodeid) |
|
146 | stack.append(precnodeid) | |
142 |
|
147 | |||
143 |
|
148 | |||
144 | def allpredecessors(obsstore, nodes, ignoreflags=0): |
|
149 | def allpredecessors(obsstore, nodes, ignoreflags=0): | |
145 | """Yield node for every precursors of <nodes>. |
|
150 | """Yield node for every precursors of <nodes>. | |
146 |
|
151 | |||
147 | Some precursors may be unknown locally. |
|
152 | Some precursors may be unknown locally. | |
148 |
|
153 | |||
149 | This is a linear yield unsuited to detecting folded changesets. It includes |
|
154 | This is a linear yield unsuited to detecting folded changesets. It includes | |
150 | initial nodes too.""" |
|
155 | initial nodes too.""" | |
151 |
|
156 | |||
152 | remaining = set(nodes) |
|
157 | remaining = set(nodes) | |
153 | seen = set(remaining) |
|
158 | seen = set(remaining) | |
154 | prec = obsstore.predecessors.get |
|
159 | prec = obsstore.predecessors.get | |
155 | while remaining: |
|
160 | while remaining: | |
156 | current = remaining.pop() |
|
161 | current = remaining.pop() | |
157 | yield current |
|
162 | yield current | |
158 | for mark in prec(current, ()): |
|
163 | for mark in prec(current, ()): | |
159 | # ignore marker flagged with specified flag |
|
164 | # ignore marker flagged with specified flag | |
160 | if mark[2] & ignoreflags: |
|
165 | if mark[2] & ignoreflags: | |
161 | continue |
|
166 | continue | |
162 | suc = mark[0] |
|
167 | suc = mark[0] | |
163 | if suc not in seen: |
|
168 | if suc not in seen: | |
164 | seen.add(suc) |
|
169 | seen.add(suc) | |
165 | remaining.add(suc) |
|
170 | remaining.add(suc) | |
166 |
|
171 | |||
167 |
|
172 | |||
168 | def allsuccessors(obsstore, nodes, ignoreflags=0): |
|
173 | def allsuccessors(obsstore, nodes, ignoreflags=0): | |
169 | """Yield node for every successor of <nodes>. |
|
174 | """Yield node for every successor of <nodes>. | |
170 |
|
175 | |||
171 | Some successors may be unknown locally. |
|
176 | Some successors may be unknown locally. | |
172 |
|
177 | |||
173 | This is a linear yield unsuited to detecting split changesets. It includes |
|
178 | This is a linear yield unsuited to detecting split changesets. It includes | |
174 | initial nodes too.""" |
|
179 | initial nodes too.""" | |
175 | remaining = set(nodes) |
|
180 | remaining = set(nodes) | |
176 | seen = set(remaining) |
|
181 | seen = set(remaining) | |
177 | while remaining: |
|
182 | while remaining: | |
178 | current = remaining.pop() |
|
183 | current = remaining.pop() | |
179 | yield current |
|
184 | yield current | |
180 | for mark in obsstore.successors.get(current, ()): |
|
185 | for mark in obsstore.successors.get(current, ()): | |
181 | # ignore marker flagged with specified flag |
|
186 | # ignore marker flagged with specified flag | |
182 | if mark[2] & ignoreflags: |
|
187 | if mark[2] & ignoreflags: | |
183 | continue |
|
188 | continue | |
184 | for suc in mark[1]: |
|
189 | for suc in mark[1]: | |
185 | if suc not in seen: |
|
190 | if suc not in seen: | |
186 | seen.add(suc) |
|
191 | seen.add(suc) | |
187 | remaining.add(suc) |
|
192 | remaining.add(suc) | |
188 |
|
193 | |||
189 |
|
194 | |||
190 | def _filterprunes(markers): |
|
195 | def _filterprunes(markers): | |
191 | """return a set with no prune markers""" |
|
196 | """return a set with no prune markers""" | |
192 | return set(m for m in markers if m[1]) |
|
197 | return set(m for m in markers if m[1]) | |
193 |
|
198 | |||
194 |
|
199 | |||
195 | def exclusivemarkers(repo, nodes): |
|
200 | def exclusivemarkers(repo, nodes): | |
196 | """set of markers relevant to "nodes" but no other locally-known nodes |
|
201 | """set of markers relevant to "nodes" but no other locally-known nodes | |
197 |
|
202 | |||
198 | This function compute the set of markers "exclusive" to a locally-known |
|
203 | This function compute the set of markers "exclusive" to a locally-known | |
199 | node. This means we walk the markers starting from <nodes> until we reach a |
|
204 | node. This means we walk the markers starting from <nodes> until we reach a | |
200 | locally-known precursors outside of <nodes>. Element of <nodes> with |
|
205 | locally-known precursors outside of <nodes>. Element of <nodes> with | |
201 | locally-known successors outside of <nodes> are ignored (since their |
|
206 | locally-known successors outside of <nodes> are ignored (since their | |
202 | precursors markers are also relevant to these successors). |
|
207 | precursors markers are also relevant to these successors). | |
203 |
|
208 | |||
204 | For example: |
|
209 | For example: | |
205 |
|
210 | |||
206 | # (A0 rewritten as A1) |
|
211 | # (A0 rewritten as A1) | |
207 | # |
|
212 | # | |
208 | # A0 <-1- A1 # Marker "1" is exclusive to A1 |
|
213 | # A0 <-1- A1 # Marker "1" is exclusive to A1 | |
209 |
|
214 | |||
210 | or |
|
215 | or | |
211 |
|
216 | |||
212 | # (A0 rewritten as AX; AX rewritten as A1; AX is unkown locally) |
|
217 | # (A0 rewritten as AX; AX rewritten as A1; AX is unkown locally) | |
213 | # |
|
218 | # | |
214 | # <-1- A0 <-2- AX <-3- A1 # Marker "2,3" are exclusive to A1 |
|
219 | # <-1- A0 <-2- AX <-3- A1 # Marker "2,3" are exclusive to A1 | |
215 |
|
220 | |||
216 | or |
|
221 | or | |
217 |
|
222 | |||
218 | # (A0 has unknown precursors, A0 rewritten as A1 and A2 (divergence)) |
|
223 | # (A0 has unknown precursors, A0 rewritten as A1 and A2 (divergence)) | |
219 | # |
|
224 | # | |
220 | # <-2- A1 # Marker "2" is exclusive to A0,A1 |
|
225 | # <-2- A1 # Marker "2" is exclusive to A0,A1 | |
221 | # / |
|
226 | # / | |
222 | # <-1- A0 |
|
227 | # <-1- A0 | |
223 | # \ |
|
228 | # \ | |
224 | # <-3- A2 # Marker "3" is exclusive to A0,A2 |
|
229 | # <-3- A2 # Marker "3" is exclusive to A0,A2 | |
225 | # |
|
230 | # | |
226 | # in addition: |
|
231 | # in addition: | |
227 | # |
|
232 | # | |
228 | # Markers "2,3" are exclusive to A1,A2 |
|
233 | # Markers "2,3" are exclusive to A1,A2 | |
229 | # Markers "1,2,3" are exclusive to A0,A1,A2 |
|
234 | # Markers "1,2,3" are exclusive to A0,A1,A2 | |
230 |
|
235 | |||
231 | See test/test-obsolete-bundle-strip.t for more examples. |
|
236 | See test/test-obsolete-bundle-strip.t for more examples. | |
232 |
|
237 | |||
233 | An example usage is strip. When stripping a changeset, we also want to |
|
238 | An example usage is strip. When stripping a changeset, we also want to | |
234 | strip the markers exclusive to this changeset. Otherwise we would have |
|
239 | strip the markers exclusive to this changeset. Otherwise we would have | |
235 | "dangling"" obsolescence markers from its precursors: Obsolescence markers |
|
240 | "dangling"" obsolescence markers from its precursors: Obsolescence markers | |
236 | marking a node as obsolete without any successors available locally. |
|
241 | marking a node as obsolete without any successors available locally. | |
237 |
|
242 | |||
238 | As for relevant markers, the prune markers for children will be followed. |
|
243 | As for relevant markers, the prune markers for children will be followed. | |
239 | Of course, they will only be followed if the pruned children is |
|
244 | Of course, they will only be followed if the pruned children is | |
240 | locally-known. Since the prune markers are relevant to the pruned node. |
|
245 | locally-known. Since the prune markers are relevant to the pruned node. | |
241 | However, while prune markers are considered relevant to the parent of the |
|
246 | However, while prune markers are considered relevant to the parent of the | |
242 | pruned changesets, prune markers for locally-known changeset (with no |
|
247 | pruned changesets, prune markers for locally-known changeset (with no | |
243 | successors) are considered exclusive to the pruned nodes. This allows |
|
248 | successors) are considered exclusive to the pruned nodes. This allows | |
244 | to strip the prune markers (with the rest of the exclusive chain) alongside |
|
249 | to strip the prune markers (with the rest of the exclusive chain) alongside | |
245 | the pruned changesets. |
|
250 | the pruned changesets. | |
246 | """ |
|
251 | """ | |
247 | # running on a filtered repository would be dangerous as markers could be |
|
252 | # running on a filtered repository would be dangerous as markers could be | |
248 | # reported as exclusive when they are relevant for other filtered nodes. |
|
253 | # reported as exclusive when they are relevant for other filtered nodes. | |
249 | unfi = repo.unfiltered() |
|
254 | unfi = repo.unfiltered() | |
250 |
|
255 | |||
251 | # shortcut to various useful item |
|
256 | # shortcut to various useful item | |
252 | has_node = unfi.changelog.index.has_node |
|
257 | has_node = unfi.changelog.index.has_node | |
253 | precursorsmarkers = unfi.obsstore.predecessors |
|
258 | precursorsmarkers = unfi.obsstore.predecessors | |
254 | successormarkers = unfi.obsstore.successors |
|
259 | successormarkers = unfi.obsstore.successors | |
255 | childrenmarkers = unfi.obsstore.children |
|
260 | childrenmarkers = unfi.obsstore.children | |
256 |
|
261 | |||
257 | # exclusive markers (return of the function) |
|
262 | # exclusive markers (return of the function) | |
258 | exclmarkers = set() |
|
263 | exclmarkers = set() | |
259 | # we need fast membership testing |
|
264 | # we need fast membership testing | |
260 | nodes = set(nodes) |
|
265 | nodes = set(nodes) | |
261 | # looking for head in the obshistory |
|
266 | # looking for head in the obshistory | |
262 | # |
|
267 | # | |
263 | # XXX we are ignoring all issues in regard with cycle for now. |
|
268 | # XXX we are ignoring all issues in regard with cycle for now. | |
264 | stack = [n for n in nodes if not _filterprunes(successormarkers.get(n, ()))] |
|
269 | stack = [n for n in nodes if not _filterprunes(successormarkers.get(n, ()))] | |
265 | stack.sort() |
|
270 | stack.sort() | |
266 | # nodes already stacked |
|
271 | # nodes already stacked | |
267 | seennodes = set(stack) |
|
272 | seennodes = set(stack) | |
268 | while stack: |
|
273 | while stack: | |
269 | current = stack.pop() |
|
274 | current = stack.pop() | |
270 | # fetch precursors markers |
|
275 | # fetch precursors markers | |
271 | markers = list(precursorsmarkers.get(current, ())) |
|
276 | markers = list(precursorsmarkers.get(current, ())) | |
272 | # extend the list with prune markers |
|
277 | # extend the list with prune markers | |
273 | for mark in successormarkers.get(current, ()): |
|
278 | for mark in successormarkers.get(current, ()): | |
274 | if not mark[1]: |
|
279 | if not mark[1]: | |
275 | markers.append(mark) |
|
280 | markers.append(mark) | |
276 | # and markers from children (looking for prune) |
|
281 | # and markers from children (looking for prune) | |
277 | for mark in childrenmarkers.get(current, ()): |
|
282 | for mark in childrenmarkers.get(current, ()): | |
278 | if not mark[1]: |
|
283 | if not mark[1]: | |
279 | markers.append(mark) |
|
284 | markers.append(mark) | |
280 | # traverse the markers |
|
285 | # traverse the markers | |
281 | for mark in markers: |
|
286 | for mark in markers: | |
282 | if mark in exclmarkers: |
|
287 | if mark in exclmarkers: | |
283 | # markers already selected |
|
288 | # markers already selected | |
284 | continue |
|
289 | continue | |
285 |
|
290 | |||
286 | # If the markers is about the current node, select it |
|
291 | # If the markers is about the current node, select it | |
287 | # |
|
292 | # | |
288 | # (this delay the addition of markers from children) |
|
293 | # (this delay the addition of markers from children) | |
289 | if mark[1] or mark[0] == current: |
|
294 | if mark[1] or mark[0] == current: | |
290 | exclmarkers.add(mark) |
|
295 | exclmarkers.add(mark) | |
291 |
|
296 | |||
292 | # should we keep traversing through the precursors? |
|
297 | # should we keep traversing through the precursors? | |
293 | prec = mark[0] |
|
298 | prec = mark[0] | |
294 |
|
299 | |||
295 | # nodes in the stack or already processed |
|
300 | # nodes in the stack or already processed | |
296 | if prec in seennodes: |
|
301 | if prec in seennodes: | |
297 | continue |
|
302 | continue | |
298 |
|
303 | |||
299 | # is this a locally known node ? |
|
304 | # is this a locally known node ? | |
300 | known = has_node(prec) |
|
305 | known = has_node(prec) | |
301 | # if locally-known and not in the <nodes> set the traversal |
|
306 | # if locally-known and not in the <nodes> set the traversal | |
302 | # stop here. |
|
307 | # stop here. | |
303 | if known and prec not in nodes: |
|
308 | if known and prec not in nodes: | |
304 | continue |
|
309 | continue | |
305 |
|
310 | |||
306 | # do not keep going if there are unselected markers pointing to this |
|
311 | # do not keep going if there are unselected markers pointing to this | |
307 | # nodes. If we end up traversing these unselected markers later the |
|
312 | # nodes. If we end up traversing these unselected markers later the | |
308 | # node will be taken care of at that point. |
|
313 | # node will be taken care of at that point. | |
309 | precmarkers = _filterprunes(successormarkers.get(prec)) |
|
314 | precmarkers = _filterprunes(successormarkers.get(prec)) | |
310 | if precmarkers.issubset(exclmarkers): |
|
315 | if precmarkers.issubset(exclmarkers): | |
311 | seennodes.add(prec) |
|
316 | seennodes.add(prec) | |
312 | stack.append(prec) |
|
317 | stack.append(prec) | |
313 |
|
318 | |||
314 | return exclmarkers |
|
319 | return exclmarkers | |
315 |
|
320 | |||
316 |
|
321 | |||
317 | def foreground(repo, nodes): |
|
322 | def foreground(repo, nodes): | |
318 | """return all nodes in the "foreground" of other node |
|
323 | """return all nodes in the "foreground" of other node | |
319 |
|
324 | |||
320 | The foreground of a revision is anything reachable using parent -> children |
|
325 | The foreground of a revision is anything reachable using parent -> children | |
321 | or precursor -> successor relation. It is very similar to "descendant" but |
|
326 | or precursor -> successor relation. It is very similar to "descendant" but | |
322 | augmented with obsolescence information. |
|
327 | augmented with obsolescence information. | |
323 |
|
328 | |||
324 | Beware that possible obsolescence cycle may result if complex situation. |
|
329 | Beware that possible obsolescence cycle may result if complex situation. | |
325 | """ |
|
330 | """ | |
326 | repo = repo.unfiltered() |
|
331 | repo = repo.unfiltered() | |
327 | foreground = set(repo.set(b'%ln::', nodes)) |
|
332 | foreground = set(repo.set(b'%ln::', nodes)) | |
328 | if repo.obsstore: |
|
333 | if repo.obsstore: | |
329 | # We only need this complicated logic if there is obsolescence |
|
334 | # We only need this complicated logic if there is obsolescence | |
330 | # XXX will probably deserve an optimised revset. |
|
335 | # XXX will probably deserve an optimised revset. | |
331 | has_node = repo.changelog.index.has_node |
|
336 | has_node = repo.changelog.index.has_node | |
332 | plen = -1 |
|
337 | plen = -1 | |
333 | # compute the whole set of successors or descendants |
|
338 | # compute the whole set of successors or descendants | |
334 | while len(foreground) != plen: |
|
339 | while len(foreground) != plen: | |
335 | plen = len(foreground) |
|
340 | plen = len(foreground) | |
336 | succs = set(c.node() for c in foreground) |
|
341 | succs = set(c.node() for c in foreground) | |
337 | mutable = [c.node() for c in foreground if c.mutable()] |
|
342 | mutable = [c.node() for c in foreground if c.mutable()] | |
338 | succs.update(allsuccessors(repo.obsstore, mutable)) |
|
343 | succs.update(allsuccessors(repo.obsstore, mutable)) | |
339 | known = (n for n in succs if has_node(n)) |
|
344 | known = (n for n in succs if has_node(n)) | |
340 | foreground = set(repo.set(b'%ln::', known)) |
|
345 | foreground = set(repo.set(b'%ln::', known)) | |
341 | return set(c.node() for c in foreground) |
|
346 | return set(c.node() for c in foreground) | |
342 |
|
347 | |||
343 |
|
348 | |||
344 | # effectflag field |
|
349 | # effectflag field | |
345 | # |
|
350 | # | |
346 | # Effect-flag is a 1-byte bit field used to store what changed between a |
|
351 | # Effect-flag is a 1-byte bit field used to store what changed between a | |
347 | # changeset and its successor(s). |
|
352 | # changeset and its successor(s). | |
348 | # |
|
353 | # | |
349 | # The effect flag is stored in obs-markers metadata while we iterate on the |
|
354 | # The effect flag is stored in obs-markers metadata while we iterate on the | |
350 | # information design. That's why we have the EFFECTFLAGFIELD. If we come up |
|
355 | # information design. That's why we have the EFFECTFLAGFIELD. If we come up | |
351 | # with an incompatible design for effect flag, we can store a new design under |
|
356 | # with an incompatible design for effect flag, we can store a new design under | |
352 | # another field name so we don't break readers. We plan to extend the existing |
|
357 | # another field name so we don't break readers. We plan to extend the existing | |
353 | # obsmarkers bit-field when the effect flag design will be stabilized. |
|
358 | # obsmarkers bit-field when the effect flag design will be stabilized. | |
354 | # |
|
359 | # | |
355 | # The effect-flag is placed behind an experimental flag |
|
360 | # The effect-flag is placed behind an experimental flag | |
356 | # `effect-flags` set to off by default. |
|
361 | # `effect-flags` set to off by default. | |
357 | # |
|
362 | # | |
358 |
|
363 | |||
359 | EFFECTFLAGFIELD = b"ef1" |
|
364 | EFFECTFLAGFIELD = b"ef1" | |
360 |
|
365 | |||
361 | DESCCHANGED = 1 << 0 # action changed the description |
|
366 | DESCCHANGED = 1 << 0 # action changed the description | |
362 | METACHANGED = 1 << 1 # action change the meta |
|
367 | METACHANGED = 1 << 1 # action change the meta | |
363 | DIFFCHANGED = 1 << 3 # action change diff introduced by the changeset |
|
368 | DIFFCHANGED = 1 << 3 # action change diff introduced by the changeset | |
364 | PARENTCHANGED = 1 << 2 # action change the parent |
|
369 | PARENTCHANGED = 1 << 2 # action change the parent | |
365 | USERCHANGED = 1 << 4 # the user changed |
|
370 | USERCHANGED = 1 << 4 # the user changed | |
366 | DATECHANGED = 1 << 5 # the date changed |
|
371 | DATECHANGED = 1 << 5 # the date changed | |
367 | BRANCHCHANGED = 1 << 6 # the branch changed |
|
372 | BRANCHCHANGED = 1 << 6 # the branch changed | |
368 |
|
373 | |||
369 | METABLACKLIST = [ |
|
374 | METABLACKLIST = [ | |
370 | re.compile(b'^branch$'), |
|
375 | re.compile(b'^branch$'), | |
371 | re.compile(b'^.*-source$'), |
|
376 | re.compile(b'^.*-source$'), | |
372 | re.compile(b'^.*_source$'), |
|
377 | re.compile(b'^.*_source$'), | |
373 | re.compile(b'^source$'), |
|
378 | re.compile(b'^source$'), | |
374 | ] |
|
379 | ] | |
375 |
|
380 | |||
376 |
|
381 | |||
377 | def metanotblacklisted(metaitem): |
|
382 | def metanotblacklisted(metaitem): | |
378 | """ Check that the key of a meta item (extrakey, extravalue) does not |
|
383 | """ Check that the key of a meta item (extrakey, extravalue) does not | |
379 | match at least one of the blacklist pattern |
|
384 | match at least one of the blacklist pattern | |
380 | """ |
|
385 | """ | |
381 | metakey = metaitem[0] |
|
386 | metakey = metaitem[0] | |
382 |
|
387 | |||
383 | return not any(pattern.match(metakey) for pattern in METABLACKLIST) |
|
388 | return not any(pattern.match(metakey) for pattern in METABLACKLIST) | |
384 |
|
389 | |||
385 |
|
390 | |||
386 | def _prepare_hunk(hunk): |
|
391 | def _prepare_hunk(hunk): | |
387 | """Drop all information but the username and patch""" |
|
392 | """Drop all information but the username and patch""" | |
388 | cleanhunk = [] |
|
393 | cleanhunk = [] | |
389 | for line in hunk.splitlines(): |
|
394 | for line in hunk.splitlines(): | |
390 | if line.startswith(b'# User') or not line.startswith(b'#'): |
|
395 | if line.startswith(b'# User') or not line.startswith(b'#'): | |
391 | if line.startswith(b'@@'): |
|
396 | if line.startswith(b'@@'): | |
392 | line = b'@@\n' |
|
397 | line = b'@@\n' | |
393 | cleanhunk.append(line) |
|
398 | cleanhunk.append(line) | |
394 | return cleanhunk |
|
399 | return cleanhunk | |
395 |
|
400 | |||
396 |
|
401 | |||
397 | def _getdifflines(iterdiff): |
|
402 | def _getdifflines(iterdiff): | |
398 | """return a cleaned up lines""" |
|
403 | """return a cleaned up lines""" | |
399 | lines = next(iterdiff, None) |
|
404 | lines = next(iterdiff, None) | |
400 |
|
405 | |||
401 | if lines is None: |
|
406 | if lines is None: | |
402 | return lines |
|
407 | return lines | |
403 |
|
408 | |||
404 | return _prepare_hunk(lines) |
|
409 | return _prepare_hunk(lines) | |
405 |
|
410 | |||
406 |
|
411 | |||
407 | def _cmpdiff(leftctx, rightctx): |
|
412 | def _cmpdiff(leftctx, rightctx): | |
408 | """return True if both ctx introduce the "same diff" |
|
413 | """return True if both ctx introduce the "same diff" | |
409 |
|
414 | |||
410 | This is a first and basic implementation, with many shortcoming. |
|
415 | This is a first and basic implementation, with many shortcoming. | |
411 | """ |
|
416 | """ | |
412 | diffopts = diffutil.diffallopts(leftctx.repo().ui, {b'git': True}) |
|
417 | diffopts = diffutil.diffallopts(leftctx.repo().ui, {b'git': True}) | |
413 |
|
418 | |||
414 | # Leftctx or right ctx might be filtered, so we need to use the contexts |
|
419 | # Leftctx or right ctx might be filtered, so we need to use the contexts | |
415 | # with an unfiltered repository to safely compute the diff |
|
420 | # with an unfiltered repository to safely compute the diff | |
416 |
|
421 | |||
417 | # leftctx and rightctx can be from different repository views in case of |
|
422 | # leftctx and rightctx can be from different repository views in case of | |
418 | # hgsubversion, do don't try to access them from same repository |
|
423 | # hgsubversion, do don't try to access them from same repository | |
419 | # rightctx.repo() and leftctx.repo() are not always the same |
|
424 | # rightctx.repo() and leftctx.repo() are not always the same | |
420 | leftunfi = leftctx._repo.unfiltered()[leftctx.rev()] |
|
425 | leftunfi = leftctx._repo.unfiltered()[leftctx.rev()] | |
421 | leftdiff = leftunfi.diff(opts=diffopts) |
|
426 | leftdiff = leftunfi.diff(opts=diffopts) | |
422 | rightunfi = rightctx._repo.unfiltered()[rightctx.rev()] |
|
427 | rightunfi = rightctx._repo.unfiltered()[rightctx.rev()] | |
423 | rightdiff = rightunfi.diff(opts=diffopts) |
|
428 | rightdiff = rightunfi.diff(opts=diffopts) | |
424 |
|
429 | |||
425 | left, right = (0, 0) |
|
430 | left, right = (0, 0) | |
426 | while None not in (left, right): |
|
431 | while None not in (left, right): | |
427 | left = _getdifflines(leftdiff) |
|
432 | left = _getdifflines(leftdiff) | |
428 | right = _getdifflines(rightdiff) |
|
433 | right = _getdifflines(rightdiff) | |
429 |
|
434 | |||
430 | if left != right: |
|
435 | if left != right: | |
431 | return False |
|
436 | return False | |
432 | return True |
|
437 | return True | |
433 |
|
438 | |||
434 |
|
439 | |||
435 | def geteffectflag(source, successors): |
|
440 | def geteffectflag(source, successors): | |
436 | """ From an obs-marker relation, compute what changed between the |
|
441 | """ From an obs-marker relation, compute what changed between the | |
437 | predecessor and the successor. |
|
442 | predecessor and the successor. | |
438 | """ |
|
443 | """ | |
439 | effects = 0 |
|
444 | effects = 0 | |
440 |
|
445 | |||
441 | for changectx in successors: |
|
446 | for changectx in successors: | |
442 | # Check if description has changed |
|
447 | # Check if description has changed | |
443 | if changectx.description() != source.description(): |
|
448 | if changectx.description() != source.description(): | |
444 | effects |= DESCCHANGED |
|
449 | effects |= DESCCHANGED | |
445 |
|
450 | |||
446 | # Check if user has changed |
|
451 | # Check if user has changed | |
447 | if changectx.user() != source.user(): |
|
452 | if changectx.user() != source.user(): | |
448 | effects |= USERCHANGED |
|
453 | effects |= USERCHANGED | |
449 |
|
454 | |||
450 | # Check if date has changed |
|
455 | # Check if date has changed | |
451 | if changectx.date() != source.date(): |
|
456 | if changectx.date() != source.date(): | |
452 | effects |= DATECHANGED |
|
457 | effects |= DATECHANGED | |
453 |
|
458 | |||
454 | # Check if branch has changed |
|
459 | # Check if branch has changed | |
455 | if changectx.branch() != source.branch(): |
|
460 | if changectx.branch() != source.branch(): | |
456 | effects |= BRANCHCHANGED |
|
461 | effects |= BRANCHCHANGED | |
457 |
|
462 | |||
458 | # Check if at least one of the parent has changed |
|
463 | # Check if at least one of the parent has changed | |
459 | if changectx.parents() != source.parents(): |
|
464 | if changectx.parents() != source.parents(): | |
460 | effects |= PARENTCHANGED |
|
465 | effects |= PARENTCHANGED | |
461 |
|
466 | |||
462 | # Check if other meta has changed |
|
467 | # Check if other meta has changed | |
463 | changeextra = changectx.extra().items() |
|
468 | changeextra = changectx.extra().items() | |
464 | ctxmeta = list(filter(metanotblacklisted, changeextra)) |
|
469 | ctxmeta = list(filter(metanotblacklisted, changeextra)) | |
465 |
|
470 | |||
466 | sourceextra = source.extra().items() |
|
471 | sourceextra = source.extra().items() | |
467 | srcmeta = list(filter(metanotblacklisted, sourceextra)) |
|
472 | srcmeta = list(filter(metanotblacklisted, sourceextra)) | |
468 |
|
473 | |||
469 | if ctxmeta != srcmeta: |
|
474 | if ctxmeta != srcmeta: | |
470 | effects |= METACHANGED |
|
475 | effects |= METACHANGED | |
471 |
|
476 | |||
472 | # Check if the diff has changed |
|
477 | # Check if the diff has changed | |
473 | if not _cmpdiff(source, changectx): |
|
478 | if not _cmpdiff(source, changectx): | |
474 | effects |= DIFFCHANGED |
|
479 | effects |= DIFFCHANGED | |
475 |
|
480 | |||
476 | return effects |
|
481 | return effects | |
477 |
|
482 | |||
478 |
|
483 | |||
479 | def getobsoleted(repo, tr): |
|
484 | def getobsoleted(repo, tr): | |
480 | """return the set of pre-existing revisions obsoleted by a transaction""" |
|
485 | """return the set of pre-existing revisions obsoleted by a transaction""" | |
481 | torev = repo.unfiltered().changelog.index.get_rev |
|
486 | torev = repo.unfiltered().changelog.index.get_rev | |
482 | phase = repo._phasecache.phase |
|
487 | phase = repo._phasecache.phase | |
483 | succsmarkers = repo.obsstore.successors.get |
|
488 | succsmarkers = repo.obsstore.successors.get | |
484 | public = phases.public |
|
489 | public = phases.public | |
485 | addedmarkers = tr.changes[b'obsmarkers'] |
|
490 | addedmarkers = tr.changes[b'obsmarkers'] | |
486 | origrepolen = tr.changes[b'origrepolen'] |
|
491 | origrepolen = tr.changes[b'origrepolen'] | |
487 | seenrevs = set() |
|
492 | seenrevs = set() | |
488 | obsoleted = set() |
|
493 | obsoleted = set() | |
489 | for mark in addedmarkers: |
|
494 | for mark in addedmarkers: | |
490 | node = mark[0] |
|
495 | node = mark[0] | |
491 | rev = torev(node) |
|
496 | rev = torev(node) | |
492 | if rev is None or rev in seenrevs or rev >= origrepolen: |
|
497 | if rev is None or rev in seenrevs or rev >= origrepolen: | |
493 | continue |
|
498 | continue | |
494 | seenrevs.add(rev) |
|
499 | seenrevs.add(rev) | |
495 | if phase(repo, rev) == public: |
|
500 | if phase(repo, rev) == public: | |
496 | continue |
|
501 | continue | |
497 | if set(succsmarkers(node) or []).issubset(addedmarkers): |
|
502 | if set(succsmarkers(node) or []).issubset(addedmarkers): | |
498 | obsoleted.add(rev) |
|
503 | obsoleted.add(rev) | |
499 | return obsoleted |
|
504 | return obsoleted | |
500 |
|
505 | |||
501 |
|
506 | |||
502 | class _succs(list): |
|
507 | class _succs(list): | |
503 | """small class to represent a successors with some metadata about it""" |
|
508 | """small class to represent a successors with some metadata about it""" | |
504 |
|
509 | |||
505 | def __init__(self, *args, **kwargs): |
|
510 | def __init__(self, *args, **kwargs): | |
506 | super(_succs, self).__init__(*args, **kwargs) |
|
511 | super(_succs, self).__init__(*args, **kwargs) | |
507 | self.markers = set() |
|
512 | self.markers = set() | |
508 |
|
513 | |||
509 | def copy(self): |
|
514 | def copy(self): | |
510 | new = _succs(self) |
|
515 | new = _succs(self) | |
511 | new.markers = self.markers.copy() |
|
516 | new.markers = self.markers.copy() | |
512 | return new |
|
517 | return new | |
513 |
|
518 | |||
514 | @util.propertycache |
|
519 | @util.propertycache | |
515 | def _set(self): |
|
520 | def _set(self): | |
516 | # immutable |
|
521 | # immutable | |
517 | return set(self) |
|
522 | return set(self) | |
518 |
|
523 | |||
519 | def canmerge(self, other): |
|
524 | def canmerge(self, other): | |
520 | return self._set.issubset(other._set) |
|
525 | return self._set.issubset(other._set) | |
521 |
|
526 | |||
522 |
|
527 | |||
523 | def successorssets(repo, initialnode, closest=False, cache=None): |
|
528 | def successorssets(repo, initialnode, closest=False, cache=None): | |
524 | """Return set of all latest successors of initial nodes |
|
529 | """Return set of all latest successors of initial nodes | |
525 |
|
530 | |||
526 | The successors set of a changeset A are the group of revisions that succeed |
|
531 | The successors set of a changeset A are the group of revisions that succeed | |
527 | A. It succeeds A as a consistent whole, each revision being only a partial |
|
532 | A. It succeeds A as a consistent whole, each revision being only a partial | |
528 | replacement. By default, the successors set contains non-obsolete |
|
533 | replacement. By default, the successors set contains non-obsolete | |
529 | changesets only, walking the obsolescence graph until reaching a leaf. If |
|
534 | changesets only, walking the obsolescence graph until reaching a leaf. If | |
530 | 'closest' is set to True, closest successors-sets are return (the |
|
535 | 'closest' is set to True, closest successors-sets are return (the | |
531 | obsolescence walk stops on known changesets). |
|
536 | obsolescence walk stops on known changesets). | |
532 |
|
537 | |||
533 | This function returns the full list of successor sets which is why it |
|
538 | This function returns the full list of successor sets which is why it | |
534 | returns a list of tuples and not just a single tuple. Each tuple is a valid |
|
539 | returns a list of tuples and not just a single tuple. Each tuple is a valid | |
535 | successors set. Note that (A,) may be a valid successors set for changeset A |
|
540 | successors set. Note that (A,) may be a valid successors set for changeset A | |
536 | (see below). |
|
541 | (see below). | |
537 |
|
542 | |||
538 | In most cases, a changeset A will have a single element (e.g. the changeset |
|
543 | In most cases, a changeset A will have a single element (e.g. the changeset | |
539 | A is replaced by A') in its successors set. Though, it is also common for a |
|
544 | A is replaced by A') in its successors set. Though, it is also common for a | |
540 | changeset A to have no elements in its successor set (e.g. the changeset |
|
545 | changeset A to have no elements in its successor set (e.g. the changeset | |
541 | has been pruned). Therefore, the returned list of successors sets will be |
|
546 | has been pruned). Therefore, the returned list of successors sets will be | |
542 | [(A',)] or [], respectively. |
|
547 | [(A',)] or [], respectively. | |
543 |
|
548 | |||
544 | When a changeset A is split into A' and B', however, it will result in a |
|
549 | When a changeset A is split into A' and B', however, it will result in a | |
545 | successors set containing more than a single element, i.e. [(A',B')]. |
|
550 | successors set containing more than a single element, i.e. [(A',B')]. | |
546 | Divergent changesets will result in multiple successors sets, i.e. [(A',), |
|
551 | Divergent changesets will result in multiple successors sets, i.e. [(A',), | |
547 | (A'')]. |
|
552 | (A'')]. | |
548 |
|
553 | |||
549 | If a changeset A is not obsolete, then it will conceptually have no |
|
554 | If a changeset A is not obsolete, then it will conceptually have no | |
550 | successors set. To distinguish this from a pruned changeset, the successor |
|
555 | successors set. To distinguish this from a pruned changeset, the successor | |
551 | set will contain itself only, i.e. [(A,)]. |
|
556 | set will contain itself only, i.e. [(A,)]. | |
552 |
|
557 | |||
553 | Finally, final successors unknown locally are considered to be pruned |
|
558 | Finally, final successors unknown locally are considered to be pruned | |
554 | (pruned: obsoleted without any successors). (Final: successors not affected |
|
559 | (pruned: obsoleted without any successors). (Final: successors not affected | |
555 | by markers). |
|
560 | by markers). | |
556 |
|
561 | |||
557 | The 'closest' mode respect the repoview filtering. For example, without |
|
562 | The 'closest' mode respect the repoview filtering. For example, without | |
558 | filter it will stop at the first locally known changeset, with 'visible' |
|
563 | filter it will stop at the first locally known changeset, with 'visible' | |
559 | filter it will stop on visible changesets). |
|
564 | filter it will stop on visible changesets). | |
560 |
|
565 | |||
561 | The optional `cache` parameter is a dictionary that may contains |
|
566 | The optional `cache` parameter is a dictionary that may contains | |
562 | precomputed successors sets. It is meant to reuse the computation of a |
|
567 | precomputed successors sets. It is meant to reuse the computation of a | |
563 | previous call to `successorssets` when multiple calls are made at the same |
|
568 | previous call to `successorssets` when multiple calls are made at the same | |
564 | time. The cache dictionary is updated in place. The caller is responsible |
|
569 | time. The cache dictionary is updated in place. The caller is responsible | |
565 | for its life span. Code that makes multiple calls to `successorssets` |
|
570 | for its life span. Code that makes multiple calls to `successorssets` | |
566 | *should* use this cache mechanism or risk a performance hit. |
|
571 | *should* use this cache mechanism or risk a performance hit. | |
567 |
|
572 | |||
568 | Since results are different depending of the 'closest' most, the same cache |
|
573 | Since results are different depending of the 'closest' most, the same cache | |
569 | cannot be reused for both mode. |
|
574 | cannot be reused for both mode. | |
570 | """ |
|
575 | """ | |
571 |
|
576 | |||
572 | succmarkers = repo.obsstore.successors |
|
577 | succmarkers = repo.obsstore.successors | |
573 |
|
578 | |||
574 | # Stack of nodes we search successors sets for |
|
579 | # Stack of nodes we search successors sets for | |
575 | toproceed = [initialnode] |
|
580 | toproceed = [initialnode] | |
576 | # set version of above list for fast loop detection |
|
581 | # set version of above list for fast loop detection | |
577 | # element added to "toproceed" must be added here |
|
582 | # element added to "toproceed" must be added here | |
578 | stackedset = set(toproceed) |
|
583 | stackedset = set(toproceed) | |
579 | if cache is None: |
|
584 | if cache is None: | |
580 | cache = {} |
|
585 | cache = {} | |
581 |
|
586 | |||
582 | # This while loop is the flattened version of a recursive search for |
|
587 | # This while loop is the flattened version of a recursive search for | |
583 | # successors sets |
|
588 | # successors sets | |
584 | # |
|
589 | # | |
585 | # def successorssets(x): |
|
590 | # def successorssets(x): | |
586 | # successors = directsuccessors(x) |
|
591 | # successors = directsuccessors(x) | |
587 | # ss = [[]] |
|
592 | # ss = [[]] | |
588 | # for succ in directsuccessors(x): |
|
593 | # for succ in directsuccessors(x): | |
589 | # # product as in itertools cartesian product |
|
594 | # # product as in itertools cartesian product | |
590 | # ss = product(ss, successorssets(succ)) |
|
595 | # ss = product(ss, successorssets(succ)) | |
591 | # return ss |
|
596 | # return ss | |
592 | # |
|
597 | # | |
593 | # But we can not use plain recursive calls here: |
|
598 | # But we can not use plain recursive calls here: | |
594 | # - that would blow the python call stack |
|
599 | # - that would blow the python call stack | |
595 | # - obsolescence markers may have cycles, we need to handle them. |
|
600 | # - obsolescence markers may have cycles, we need to handle them. | |
596 | # |
|
601 | # | |
597 | # The `toproceed` list act as our call stack. Every node we search |
|
602 | # The `toproceed` list act as our call stack. Every node we search | |
598 | # successors set for are stacked there. |
|
603 | # successors set for are stacked there. | |
599 | # |
|
604 | # | |
600 | # The `stackedset` is set version of this stack used to check if a node is |
|
605 | # The `stackedset` is set version of this stack used to check if a node is | |
601 | # already stacked. This check is used to detect cycles and prevent infinite |
|
606 | # already stacked. This check is used to detect cycles and prevent infinite | |
602 | # loop. |
|
607 | # loop. | |
603 | # |
|
608 | # | |
604 | # successors set of all nodes are stored in the `cache` dictionary. |
|
609 | # successors set of all nodes are stored in the `cache` dictionary. | |
605 | # |
|
610 | # | |
606 | # After this while loop ends we use the cache to return the successors sets |
|
611 | # After this while loop ends we use the cache to return the successors sets | |
607 | # for the node requested by the caller. |
|
612 | # for the node requested by the caller. | |
608 | while toproceed: |
|
613 | while toproceed: | |
609 | # Every iteration tries to compute the successors sets of the topmost |
|
614 | # Every iteration tries to compute the successors sets of the topmost | |
610 | # node of the stack: CURRENT. |
|
615 | # node of the stack: CURRENT. | |
611 | # |
|
616 | # | |
612 | # There are four possible outcomes: |
|
617 | # There are four possible outcomes: | |
613 | # |
|
618 | # | |
614 | # 1) We already know the successors sets of CURRENT: |
|
619 | # 1) We already know the successors sets of CURRENT: | |
615 | # -> mission accomplished, pop it from the stack. |
|
620 | # -> mission accomplished, pop it from the stack. | |
616 | # 2) Stop the walk: |
|
621 | # 2) Stop the walk: | |
617 | # default case: Node is not obsolete |
|
622 | # default case: Node is not obsolete | |
618 | # closest case: Node is known at this repo filter level |
|
623 | # closest case: Node is known at this repo filter level | |
619 | # -> the node is its own successors sets. Add it to the cache. |
|
624 | # -> the node is its own successors sets. Add it to the cache. | |
620 | # 3) We do not know successors set of direct successors of CURRENT: |
|
625 | # 3) We do not know successors set of direct successors of CURRENT: | |
621 | # -> We add those successors to the stack. |
|
626 | # -> We add those successors to the stack. | |
622 | # 4) We know successors sets of all direct successors of CURRENT: |
|
627 | # 4) We know successors sets of all direct successors of CURRENT: | |
623 | # -> We can compute CURRENT successors set and add it to the |
|
628 | # -> We can compute CURRENT successors set and add it to the | |
624 | # cache. |
|
629 | # cache. | |
625 | # |
|
630 | # | |
626 | current = toproceed[-1] |
|
631 | current = toproceed[-1] | |
627 |
|
632 | |||
628 | # case 2 condition is a bit hairy because of closest, |
|
633 | # case 2 condition is a bit hairy because of closest, | |
629 | # we compute it on its own |
|
634 | # we compute it on its own | |
630 | case2condition = (current not in succmarkers) or ( |
|
635 | case2condition = (current not in succmarkers) or ( | |
631 | closest and current != initialnode and current in repo |
|
636 | closest and current != initialnode and current in repo | |
632 | ) |
|
637 | ) | |
633 |
|
638 | |||
634 | if current in cache: |
|
639 | if current in cache: | |
635 | # case (1): We already know the successors sets |
|
640 | # case (1): We already know the successors sets | |
636 | stackedset.remove(toproceed.pop()) |
|
641 | stackedset.remove(toproceed.pop()) | |
637 | elif case2condition: |
|
642 | elif case2condition: | |
638 | # case (2): end of walk. |
|
643 | # case (2): end of walk. | |
639 | if current in repo: |
|
644 | if current in repo: | |
640 | # We have a valid successors. |
|
645 | # We have a valid successors. | |
641 | cache[current] = [_succs((current,))] |
|
646 | cache[current] = [_succs((current,))] | |
642 | else: |
|
647 | else: | |
643 | # Final obsolete version is unknown locally. |
|
648 | # Final obsolete version is unknown locally. | |
644 | # Do not count that as a valid successors |
|
649 | # Do not count that as a valid successors | |
645 | cache[current] = [] |
|
650 | cache[current] = [] | |
646 | else: |
|
651 | else: | |
647 | # cases (3) and (4) |
|
652 | # cases (3) and (4) | |
648 | # |
|
653 | # | |
649 | # We proceed in two phases. Phase 1 aims to distinguish case (3) |
|
654 | # We proceed in two phases. Phase 1 aims to distinguish case (3) | |
650 | # from case (4): |
|
655 | # from case (4): | |
651 | # |
|
656 | # | |
652 | # For each direct successors of CURRENT, we check whether its |
|
657 | # For each direct successors of CURRENT, we check whether its | |
653 | # successors sets are known. If they are not, we stack the |
|
658 | # successors sets are known. If they are not, we stack the | |
654 | # unknown node and proceed to the next iteration of the while |
|
659 | # unknown node and proceed to the next iteration of the while | |
655 | # loop. (case 3) |
|
660 | # loop. (case 3) | |
656 | # |
|
661 | # | |
657 | # During this step, we may detect obsolescence cycles: a node |
|
662 | # During this step, we may detect obsolescence cycles: a node | |
658 | # with unknown successors sets but already in the call stack. |
|
663 | # with unknown successors sets but already in the call stack. | |
659 | # In such a situation, we arbitrary set the successors sets of |
|
664 | # In such a situation, we arbitrary set the successors sets of | |
660 | # the node to nothing (node pruned) to break the cycle. |
|
665 | # the node to nothing (node pruned) to break the cycle. | |
661 | # |
|
666 | # | |
662 | # If no break was encountered we proceed to phase 2. |
|
667 | # If no break was encountered we proceed to phase 2. | |
663 | # |
|
668 | # | |
664 | # Phase 2 computes successors sets of CURRENT (case 4); see details |
|
669 | # Phase 2 computes successors sets of CURRENT (case 4); see details | |
665 | # in phase 2 itself. |
|
670 | # in phase 2 itself. | |
666 | # |
|
671 | # | |
667 | # Note the two levels of iteration in each phase. |
|
672 | # Note the two levels of iteration in each phase. | |
668 | # - The first one handles obsolescence markers using CURRENT as |
|
673 | # - The first one handles obsolescence markers using CURRENT as | |
669 | # precursor (successors markers of CURRENT). |
|
674 | # precursor (successors markers of CURRENT). | |
670 | # |
|
675 | # | |
671 | # Having multiple entry here means divergence. |
|
676 | # Having multiple entry here means divergence. | |
672 | # |
|
677 | # | |
673 | # - The second one handles successors defined in each marker. |
|
678 | # - The second one handles successors defined in each marker. | |
674 | # |
|
679 | # | |
675 | # Having none means pruned node, multiple successors means split, |
|
680 | # Having none means pruned node, multiple successors means split, | |
676 | # single successors are standard replacement. |
|
681 | # single successors are standard replacement. | |
677 | # |
|
682 | # | |
678 | for mark in sorted(succmarkers[current]): |
|
683 | for mark in sortedmarkers(succmarkers[current]): | |
679 | for suc in mark[1]: |
|
684 | for suc in mark[1]: | |
680 | if suc not in cache: |
|
685 | if suc not in cache: | |
681 | if suc in stackedset: |
|
686 | if suc in stackedset: | |
682 | # cycle breaking |
|
687 | # cycle breaking | |
683 | cache[suc] = [] |
|
688 | cache[suc] = [] | |
684 | else: |
|
689 | else: | |
685 | # case (3) If we have not computed successors sets |
|
690 | # case (3) If we have not computed successors sets | |
686 | # of one of those successors we add it to the |
|
691 | # of one of those successors we add it to the | |
687 | # `toproceed` stack and stop all work for this |
|
692 | # `toproceed` stack and stop all work for this | |
688 | # iteration. |
|
693 | # iteration. | |
689 | toproceed.append(suc) |
|
694 | toproceed.append(suc) | |
690 | stackedset.add(suc) |
|
695 | stackedset.add(suc) | |
691 | break |
|
696 | break | |
692 | else: |
|
697 | else: | |
693 | continue |
|
698 | continue | |
694 | break |
|
699 | break | |
695 | else: |
|
700 | else: | |
696 | # case (4): we know all successors sets of all direct |
|
701 | # case (4): we know all successors sets of all direct | |
697 | # successors |
|
702 | # successors | |
698 | # |
|
703 | # | |
699 | # Successors set contributed by each marker depends on the |
|
704 | # Successors set contributed by each marker depends on the | |
700 | # successors sets of all its "successors" node. |
|
705 | # successors sets of all its "successors" node. | |
701 | # |
|
706 | # | |
702 | # Each different marker is a divergence in the obsolescence |
|
707 | # Each different marker is a divergence in the obsolescence | |
703 | # history. It contributes successors sets distinct from other |
|
708 | # history. It contributes successors sets distinct from other | |
704 | # markers. |
|
709 | # markers. | |
705 | # |
|
710 | # | |
706 | # Within a marker, a successor may have divergent successors |
|
711 | # Within a marker, a successor may have divergent successors | |
707 | # sets. In such a case, the marker will contribute multiple |
|
712 | # sets. In such a case, the marker will contribute multiple | |
708 | # divergent successors sets. If multiple successors have |
|
713 | # divergent successors sets. If multiple successors have | |
709 | # divergent successors sets, a Cartesian product is used. |
|
714 | # divergent successors sets, a Cartesian product is used. | |
710 | # |
|
715 | # | |
711 | # At the end we post-process successors sets to remove |
|
716 | # At the end we post-process successors sets to remove | |
712 | # duplicated entry and successors set that are strict subset of |
|
717 | # duplicated entry and successors set that are strict subset of | |
713 | # another one. |
|
718 | # another one. | |
714 | succssets = [] |
|
719 | succssets = [] | |
715 | for mark in sorted(succmarkers[current]): |
|
720 | for mark in sortedmarkers(succmarkers[current]): | |
716 | # successors sets contributed by this marker |
|
721 | # successors sets contributed by this marker | |
717 | base = _succs() |
|
722 | base = _succs() | |
718 | base.markers.add(mark) |
|
723 | base.markers.add(mark) | |
719 | markss = [base] |
|
724 | markss = [base] | |
720 | for suc in mark[1]: |
|
725 | for suc in mark[1]: | |
721 | # cardinal product with previous successors |
|
726 | # cardinal product with previous successors | |
722 | productresult = [] |
|
727 | productresult = [] | |
723 | for prefix in markss: |
|
728 | for prefix in markss: | |
724 | for suffix in cache[suc]: |
|
729 | for suffix in cache[suc]: | |
725 | newss = prefix.copy() |
|
730 | newss = prefix.copy() | |
726 | newss.markers.update(suffix.markers) |
|
731 | newss.markers.update(suffix.markers) | |
727 | for part in suffix: |
|
732 | for part in suffix: | |
728 | # do not duplicated entry in successors set |
|
733 | # do not duplicated entry in successors set | |
729 | # first entry wins. |
|
734 | # first entry wins. | |
730 | if part not in newss: |
|
735 | if part not in newss: | |
731 | newss.append(part) |
|
736 | newss.append(part) | |
732 | productresult.append(newss) |
|
737 | productresult.append(newss) | |
733 | if productresult: |
|
738 | if productresult: | |
734 | markss = productresult |
|
739 | markss = productresult | |
735 | succssets.extend(markss) |
|
740 | succssets.extend(markss) | |
736 | # remove duplicated and subset |
|
741 | # remove duplicated and subset | |
737 | seen = [] |
|
742 | seen = [] | |
738 | final = [] |
|
743 | final = [] | |
739 | candidates = sorted( |
|
744 | candidates = sorted( | |
740 | (s for s in succssets if s), key=len, reverse=True |
|
745 | (s for s in succssets if s), key=len, reverse=True | |
741 | ) |
|
746 | ) | |
742 | for cand in candidates: |
|
747 | for cand in candidates: | |
743 | for seensuccs in seen: |
|
748 | for seensuccs in seen: | |
744 | if cand.canmerge(seensuccs): |
|
749 | if cand.canmerge(seensuccs): | |
745 | seensuccs.markers.update(cand.markers) |
|
750 | seensuccs.markers.update(cand.markers) | |
746 | break |
|
751 | break | |
747 | else: |
|
752 | else: | |
748 | final.append(cand) |
|
753 | final.append(cand) | |
749 | seen.append(cand) |
|
754 | seen.append(cand) | |
750 | final.reverse() # put small successors set first |
|
755 | final.reverse() # put small successors set first | |
751 | cache[current] = final |
|
756 | cache[current] = final | |
752 | return cache[initialnode] |
|
757 | return cache[initialnode] | |
753 |
|
758 | |||
754 |
|
759 | |||
755 | def successorsandmarkers(repo, ctx): |
|
760 | def successorsandmarkers(repo, ctx): | |
756 | """compute the raw data needed for computing obsfate |
|
761 | """compute the raw data needed for computing obsfate | |
757 | Returns a list of dict, one dict per successors set |
|
762 | Returns a list of dict, one dict per successors set | |
758 | """ |
|
763 | """ | |
759 | if not ctx.obsolete(): |
|
764 | if not ctx.obsolete(): | |
760 | return None |
|
765 | return None | |
761 |
|
766 | |||
762 | ssets = successorssets(repo, ctx.node(), closest=True) |
|
767 | ssets = successorssets(repo, ctx.node(), closest=True) | |
763 |
|
768 | |||
764 | # closestsuccessors returns an empty list for pruned revisions, remap it |
|
769 | # closestsuccessors returns an empty list for pruned revisions, remap it | |
765 | # into a list containing an empty list for future processing |
|
770 | # into a list containing an empty list for future processing | |
766 | if ssets == []: |
|
771 | if ssets == []: | |
767 | ssets = [[]] |
|
772 | ssets = [[]] | |
768 |
|
773 | |||
769 | # Try to recover pruned markers |
|
774 | # Try to recover pruned markers | |
770 | succsmap = repo.obsstore.successors |
|
775 | succsmap = repo.obsstore.successors | |
771 | fullsuccessorsets = [] # successor set + markers |
|
776 | fullsuccessorsets = [] # successor set + markers | |
772 | for sset in ssets: |
|
777 | for sset in ssets: | |
773 | if sset: |
|
778 | if sset: | |
774 | fullsuccessorsets.append(sset) |
|
779 | fullsuccessorsets.append(sset) | |
775 | else: |
|
780 | else: | |
776 | # successorsset return an empty set() when ctx or one of its |
|
781 | # successorsset return an empty set() when ctx or one of its | |
777 | # successors is pruned. |
|
782 | # successors is pruned. | |
778 | # In this case, walk the obs-markers tree again starting with ctx |
|
783 | # In this case, walk the obs-markers tree again starting with ctx | |
779 | # and find the relevant pruning obs-makers, the ones without |
|
784 | # and find the relevant pruning obs-makers, the ones without | |
780 | # successors. |
|
785 | # successors. | |
781 | # Having these markers allow us to compute some information about |
|
786 | # Having these markers allow us to compute some information about | |
782 | # its fate, like who pruned this changeset and when. |
|
787 | # its fate, like who pruned this changeset and when. | |
783 |
|
788 | |||
784 | # XXX we do not catch all prune markers (eg rewritten then pruned) |
|
789 | # XXX we do not catch all prune markers (eg rewritten then pruned) | |
785 | # (fix me later) |
|
790 | # (fix me later) | |
786 | foundany = False |
|
791 | foundany = False | |
787 | for mark in succsmap.get(ctx.node(), ()): |
|
792 | for mark in succsmap.get(ctx.node(), ()): | |
788 | if not mark[1]: |
|
793 | if not mark[1]: | |
789 | foundany = True |
|
794 | foundany = True | |
790 | sset = _succs() |
|
795 | sset = _succs() | |
791 | sset.markers.add(mark) |
|
796 | sset.markers.add(mark) | |
792 | fullsuccessorsets.append(sset) |
|
797 | fullsuccessorsets.append(sset) | |
793 | if not foundany: |
|
798 | if not foundany: | |
794 | fullsuccessorsets.append(_succs()) |
|
799 | fullsuccessorsets.append(_succs()) | |
795 |
|
800 | |||
796 | values = [] |
|
801 | values = [] | |
797 | for sset in fullsuccessorsets: |
|
802 | for sset in fullsuccessorsets: | |
798 | values.append({b'successors': sset, b'markers': sset.markers}) |
|
803 | values.append({b'successors': sset, b'markers': sset.markers}) | |
799 |
|
804 | |||
800 | return values |
|
805 | return values | |
801 |
|
806 | |||
802 |
|
807 | |||
803 | def _getobsfate(successorssets): |
|
808 | def _getobsfate(successorssets): | |
804 | """ Compute a changeset obsolescence fate based on its successorssets. |
|
809 | """ Compute a changeset obsolescence fate based on its successorssets. | |
805 | Successors can be the tipmost ones or the immediate ones. This function |
|
810 | Successors can be the tipmost ones or the immediate ones. This function | |
806 | return values are not meant to be shown directly to users, it is meant to |
|
811 | return values are not meant to be shown directly to users, it is meant to | |
807 | be used by internal functions only. |
|
812 | be used by internal functions only. | |
808 | Returns one fate from the following values: |
|
813 | Returns one fate from the following values: | |
809 | - pruned |
|
814 | - pruned | |
810 | - diverged |
|
815 | - diverged | |
811 | - superseded |
|
816 | - superseded | |
812 | - superseded_split |
|
817 | - superseded_split | |
813 | """ |
|
818 | """ | |
814 |
|
819 | |||
815 | if len(successorssets) == 0: |
|
820 | if len(successorssets) == 0: | |
816 | # The commit has been pruned |
|
821 | # The commit has been pruned | |
817 | return b'pruned' |
|
822 | return b'pruned' | |
818 | elif len(successorssets) > 1: |
|
823 | elif len(successorssets) > 1: | |
819 | return b'diverged' |
|
824 | return b'diverged' | |
820 | else: |
|
825 | else: | |
821 | # No divergence, only one set of successors |
|
826 | # No divergence, only one set of successors | |
822 | successors = successorssets[0] |
|
827 | successors = successorssets[0] | |
823 |
|
828 | |||
824 | if len(successors) == 1: |
|
829 | if len(successors) == 1: | |
825 | return b'superseded' |
|
830 | return b'superseded' | |
826 | else: |
|
831 | else: | |
827 | return b'superseded_split' |
|
832 | return b'superseded_split' | |
828 |
|
833 | |||
829 |
|
834 | |||
830 | def obsfateverb(successorset, markers): |
|
835 | def obsfateverb(successorset, markers): | |
831 | """ Return the verb summarizing the successorset and potentially using |
|
836 | """ Return the verb summarizing the successorset and potentially using | |
832 | information from the markers |
|
837 | information from the markers | |
833 | """ |
|
838 | """ | |
834 | if not successorset: |
|
839 | if not successorset: | |
835 | verb = b'pruned' |
|
840 | verb = b'pruned' | |
836 | elif len(successorset) == 1: |
|
841 | elif len(successorset) == 1: | |
837 | verb = b'rewritten' |
|
842 | verb = b'rewritten' | |
838 | else: |
|
843 | else: | |
839 | verb = b'split' |
|
844 | verb = b'split' | |
840 | return verb |
|
845 | return verb | |
841 |
|
846 | |||
842 |
|
847 | |||
843 | def markersdates(markers): |
|
848 | def markersdates(markers): | |
844 | """returns the list of dates for a list of markers |
|
849 | """returns the list of dates for a list of markers | |
845 | """ |
|
850 | """ | |
846 | return [m[4] for m in markers] |
|
851 | return [m[4] for m in markers] | |
847 |
|
852 | |||
848 |
|
853 | |||
849 | def markersusers(markers): |
|
854 | def markersusers(markers): | |
850 | """ Returns a sorted list of markers users without duplicates |
|
855 | """ Returns a sorted list of markers users without duplicates | |
851 | """ |
|
856 | """ | |
852 | markersmeta = [dict(m[3]) for m in markers] |
|
857 | markersmeta = [dict(m[3]) for m in markers] | |
853 | users = set( |
|
858 | users = set( | |
854 | encoding.tolocal(meta[b'user']) |
|
859 | encoding.tolocal(meta[b'user']) | |
855 | for meta in markersmeta |
|
860 | for meta in markersmeta | |
856 | if meta.get(b'user') |
|
861 | if meta.get(b'user') | |
857 | ) |
|
862 | ) | |
858 |
|
863 | |||
859 | return sorted(users) |
|
864 | return sorted(users) | |
860 |
|
865 | |||
861 |
|
866 | |||
862 | def markersoperations(markers): |
|
867 | def markersoperations(markers): | |
863 | """ Returns a sorted list of markers operations without duplicates |
|
868 | """ Returns a sorted list of markers operations without duplicates | |
864 | """ |
|
869 | """ | |
865 | markersmeta = [dict(m[3]) for m in markers] |
|
870 | markersmeta = [dict(m[3]) for m in markers] | |
866 | operations = set( |
|
871 | operations = set( | |
867 | meta.get(b'operation') for meta in markersmeta if meta.get(b'operation') |
|
872 | meta.get(b'operation') for meta in markersmeta if meta.get(b'operation') | |
868 | ) |
|
873 | ) | |
869 |
|
874 | |||
870 | return sorted(operations) |
|
875 | return sorted(operations) | |
871 |
|
876 | |||
872 |
|
877 | |||
873 | def obsfateprinter(ui, repo, successors, markers, formatctx): |
|
878 | def obsfateprinter(ui, repo, successors, markers, formatctx): | |
874 | """ Build a obsfate string for a single successorset using all obsfate |
|
879 | """ Build a obsfate string for a single successorset using all obsfate | |
875 | related function defined in obsutil |
|
880 | related function defined in obsutil | |
876 | """ |
|
881 | """ | |
877 | quiet = ui.quiet |
|
882 | quiet = ui.quiet | |
878 | verbose = ui.verbose |
|
883 | verbose = ui.verbose | |
879 | normal = not verbose and not quiet |
|
884 | normal = not verbose and not quiet | |
880 |
|
885 | |||
881 | line = [] |
|
886 | line = [] | |
882 |
|
887 | |||
883 | # Verb |
|
888 | # Verb | |
884 | line.append(obsfateverb(successors, markers)) |
|
889 | line.append(obsfateverb(successors, markers)) | |
885 |
|
890 | |||
886 | # Operations |
|
891 | # Operations | |
887 | operations = markersoperations(markers) |
|
892 | operations = markersoperations(markers) | |
888 | if operations: |
|
893 | if operations: | |
889 | line.append(b" using %s" % b", ".join(operations)) |
|
894 | line.append(b" using %s" % b", ".join(operations)) | |
890 |
|
895 | |||
891 | # Successors |
|
896 | # Successors | |
892 | if successors: |
|
897 | if successors: | |
893 | fmtsuccessors = [formatctx(repo[succ]) for succ in successors] |
|
898 | fmtsuccessors = [formatctx(repo[succ]) for succ in successors] | |
894 | line.append(b" as %s" % b", ".join(fmtsuccessors)) |
|
899 | line.append(b" as %s" % b", ".join(fmtsuccessors)) | |
895 |
|
900 | |||
896 | # Users |
|
901 | # Users | |
897 | users = markersusers(markers) |
|
902 | users = markersusers(markers) | |
898 | # Filter out current user in not verbose mode to reduce amount of |
|
903 | # Filter out current user in not verbose mode to reduce amount of | |
899 | # information |
|
904 | # information | |
900 | if not verbose: |
|
905 | if not verbose: | |
901 | currentuser = ui.username(acceptempty=True) |
|
906 | currentuser = ui.username(acceptempty=True) | |
902 | if len(users) == 1 and currentuser in users: |
|
907 | if len(users) == 1 and currentuser in users: | |
903 | users = None |
|
908 | users = None | |
904 |
|
909 | |||
905 | if (verbose or normal) and users: |
|
910 | if (verbose or normal) and users: | |
906 | line.append(b" by %s" % b", ".join(users)) |
|
911 | line.append(b" by %s" % b", ".join(users)) | |
907 |
|
912 | |||
908 | # Date |
|
913 | # Date | |
909 | dates = markersdates(markers) |
|
914 | dates = markersdates(markers) | |
910 |
|
915 | |||
911 | if dates and verbose: |
|
916 | if dates and verbose: | |
912 | min_date = min(dates) |
|
917 | min_date = min(dates) | |
913 | max_date = max(dates) |
|
918 | max_date = max(dates) | |
914 |
|
919 | |||
915 | if min_date == max_date: |
|
920 | if min_date == max_date: | |
916 | fmtmin_date = dateutil.datestr(min_date, b'%Y-%m-%d %H:%M %1%2') |
|
921 | fmtmin_date = dateutil.datestr(min_date, b'%Y-%m-%d %H:%M %1%2') | |
917 | line.append(b" (at %s)" % fmtmin_date) |
|
922 | line.append(b" (at %s)" % fmtmin_date) | |
918 | else: |
|
923 | else: | |
919 | fmtmin_date = dateutil.datestr(min_date, b'%Y-%m-%d %H:%M %1%2') |
|
924 | fmtmin_date = dateutil.datestr(min_date, b'%Y-%m-%d %H:%M %1%2') | |
920 | fmtmax_date = dateutil.datestr(max_date, b'%Y-%m-%d %H:%M %1%2') |
|
925 | fmtmax_date = dateutil.datestr(max_date, b'%Y-%m-%d %H:%M %1%2') | |
921 | line.append(b" (between %s and %s)" % (fmtmin_date, fmtmax_date)) |
|
926 | line.append(b" (between %s and %s)" % (fmtmin_date, fmtmax_date)) | |
922 |
|
927 | |||
923 | return b"".join(line) |
|
928 | return b"".join(line) | |
924 |
|
929 | |||
925 |
|
930 | |||
926 | filteredmsgtable = { |
|
931 | filteredmsgtable = { | |
927 | b"pruned": _(b"hidden revision '%s' is pruned"), |
|
932 | b"pruned": _(b"hidden revision '%s' is pruned"), | |
928 | b"diverged": _(b"hidden revision '%s' has diverged"), |
|
933 | b"diverged": _(b"hidden revision '%s' has diverged"), | |
929 | b"superseded": _(b"hidden revision '%s' was rewritten as: %s"), |
|
934 | b"superseded": _(b"hidden revision '%s' was rewritten as: %s"), | |
930 | b"superseded_split": _(b"hidden revision '%s' was split as: %s"), |
|
935 | b"superseded_split": _(b"hidden revision '%s' was split as: %s"), | |
931 | b"superseded_split_several": _( |
|
936 | b"superseded_split_several": _( | |
932 | b"hidden revision '%s' was split as: %s and %d more" |
|
937 | b"hidden revision '%s' was split as: %s and %d more" | |
933 | ), |
|
938 | ), | |
934 | } |
|
939 | } | |
935 |
|
940 | |||
936 |
|
941 | |||
937 | def _getfilteredreason(repo, changeid, ctx): |
|
942 | def _getfilteredreason(repo, changeid, ctx): | |
938 | """return a human-friendly string on why a obsolete changeset is hidden |
|
943 | """return a human-friendly string on why a obsolete changeset is hidden | |
939 | """ |
|
944 | """ | |
940 | successors = successorssets(repo, ctx.node()) |
|
945 | successors = successorssets(repo, ctx.node()) | |
941 | fate = _getobsfate(successors) |
|
946 | fate = _getobsfate(successors) | |
942 |
|
947 | |||
943 | # Be more precise in case the revision is superseded |
|
948 | # Be more precise in case the revision is superseded | |
944 | if fate == b'pruned': |
|
949 | if fate == b'pruned': | |
945 | return filteredmsgtable[b'pruned'] % changeid |
|
950 | return filteredmsgtable[b'pruned'] % changeid | |
946 | elif fate == b'diverged': |
|
951 | elif fate == b'diverged': | |
947 | return filteredmsgtable[b'diverged'] % changeid |
|
952 | return filteredmsgtable[b'diverged'] % changeid | |
948 | elif fate == b'superseded': |
|
953 | elif fate == b'superseded': | |
949 | single_successor = nodemod.short(successors[0][0]) |
|
954 | single_successor = nodemod.short(successors[0][0]) | |
950 | return filteredmsgtable[b'superseded'] % (changeid, single_successor) |
|
955 | return filteredmsgtable[b'superseded'] % (changeid, single_successor) | |
951 | elif fate == b'superseded_split': |
|
956 | elif fate == b'superseded_split': | |
952 |
|
957 | |||
953 | succs = [] |
|
958 | succs = [] | |
954 | for node_id in successors[0]: |
|
959 | for node_id in successors[0]: | |
955 | succs.append(nodemod.short(node_id)) |
|
960 | succs.append(nodemod.short(node_id)) | |
956 |
|
961 | |||
957 | if len(succs) <= 2: |
|
962 | if len(succs) <= 2: | |
958 | fmtsuccs = b', '.join(succs) |
|
963 | fmtsuccs = b', '.join(succs) | |
959 | return filteredmsgtable[b'superseded_split'] % (changeid, fmtsuccs) |
|
964 | return filteredmsgtable[b'superseded_split'] % (changeid, fmtsuccs) | |
960 | else: |
|
965 | else: | |
961 | firstsuccessors = b', '.join(succs[:2]) |
|
966 | firstsuccessors = b', '.join(succs[:2]) | |
962 | remainingnumber = len(succs) - 2 |
|
967 | remainingnumber = len(succs) - 2 | |
963 |
|
968 | |||
964 | args = (changeid, firstsuccessors, remainingnumber) |
|
969 | args = (changeid, firstsuccessors, remainingnumber) | |
965 | return filteredmsgtable[b'superseded_split_several'] % args |
|
970 | return filteredmsgtable[b'superseded_split_several'] % args | |
966 |
|
971 | |||
967 |
|
972 | |||
968 | def divergentsets(repo, ctx): |
|
973 | def divergentsets(repo, ctx): | |
969 | """Compute sets of commits divergent with a given one""" |
|
974 | """Compute sets of commits divergent with a given one""" | |
970 | cache = {} |
|
975 | cache = {} | |
971 | base = {} |
|
976 | base = {} | |
972 | for n in allpredecessors(repo.obsstore, [ctx.node()]): |
|
977 | for n in allpredecessors(repo.obsstore, [ctx.node()]): | |
973 | if n == ctx.node(): |
|
978 | if n == ctx.node(): | |
974 | # a node can't be a base for divergence with itself |
|
979 | # a node can't be a base for divergence with itself | |
975 | continue |
|
980 | continue | |
976 | nsuccsets = successorssets(repo, n, cache) |
|
981 | nsuccsets = successorssets(repo, n, cache) | |
977 | for nsuccset in nsuccsets: |
|
982 | for nsuccset in nsuccsets: | |
978 | if ctx.node() in nsuccset: |
|
983 | if ctx.node() in nsuccset: | |
979 | # we are only interested in *other* successor sets |
|
984 | # we are only interested in *other* successor sets | |
980 | continue |
|
985 | continue | |
981 | if tuple(nsuccset) in base: |
|
986 | if tuple(nsuccset) in base: | |
982 | # we already know the latest base for this divergency |
|
987 | # we already know the latest base for this divergency | |
983 | continue |
|
988 | continue | |
984 | base[tuple(nsuccset)] = n |
|
989 | base[tuple(nsuccset)] = n | |
985 | return [ |
|
990 | return [ | |
986 | {b'divergentnodes': divset, b'commonpredecessor': b} |
|
991 | {b'divergentnodes': divset, b'commonpredecessor': b} | |
987 | for divset, b in pycompat.iteritems(base) |
|
992 | for divset, b in pycompat.iteritems(base) | |
988 | ] |
|
993 | ] | |
989 |
|
994 | |||
990 |
|
995 | |||
991 | def whyunstable(repo, ctx): |
|
996 | def whyunstable(repo, ctx): | |
992 | result = [] |
|
997 | result = [] | |
993 | if ctx.orphan(): |
|
998 | if ctx.orphan(): | |
994 | for parent in ctx.parents(): |
|
999 | for parent in ctx.parents(): | |
995 | kind = None |
|
1000 | kind = None | |
996 | if parent.orphan(): |
|
1001 | if parent.orphan(): | |
997 | kind = b'orphan' |
|
1002 | kind = b'orphan' | |
998 | elif parent.obsolete(): |
|
1003 | elif parent.obsolete(): | |
999 | kind = b'obsolete' |
|
1004 | kind = b'obsolete' | |
1000 | if kind is not None: |
|
1005 | if kind is not None: | |
1001 | result.append( |
|
1006 | result.append( | |
1002 | { |
|
1007 | { | |
1003 | b'instability': b'orphan', |
|
1008 | b'instability': b'orphan', | |
1004 | b'reason': b'%s parent' % kind, |
|
1009 | b'reason': b'%s parent' % kind, | |
1005 | b'node': parent.hex(), |
|
1010 | b'node': parent.hex(), | |
1006 | } |
|
1011 | } | |
1007 | ) |
|
1012 | ) | |
1008 | if ctx.phasedivergent(): |
|
1013 | if ctx.phasedivergent(): | |
1009 | predecessors = allpredecessors( |
|
1014 | predecessors = allpredecessors( | |
1010 | repo.obsstore, [ctx.node()], ignoreflags=bumpedfix |
|
1015 | repo.obsstore, [ctx.node()], ignoreflags=bumpedfix | |
1011 | ) |
|
1016 | ) | |
1012 | immutable = [ |
|
1017 | immutable = [ | |
1013 | repo[p] for p in predecessors if p in repo and not repo[p].mutable() |
|
1018 | repo[p] for p in predecessors if p in repo and not repo[p].mutable() | |
1014 | ] |
|
1019 | ] | |
1015 | for predecessor in immutable: |
|
1020 | for predecessor in immutable: | |
1016 | result.append( |
|
1021 | result.append( | |
1017 | { |
|
1022 | { | |
1018 | b'instability': b'phase-divergent', |
|
1023 | b'instability': b'phase-divergent', | |
1019 | b'reason': b'immutable predecessor', |
|
1024 | b'reason': b'immutable predecessor', | |
1020 | b'node': predecessor.hex(), |
|
1025 | b'node': predecessor.hex(), | |
1021 | } |
|
1026 | } | |
1022 | ) |
|
1027 | ) | |
1023 | if ctx.contentdivergent(): |
|
1028 | if ctx.contentdivergent(): | |
1024 | dsets = divergentsets(repo, ctx) |
|
1029 | dsets = divergentsets(repo, ctx) | |
1025 | for dset in dsets: |
|
1030 | for dset in dsets: | |
1026 | divnodes = [repo[n] for n in dset[b'divergentnodes']] |
|
1031 | divnodes = [repo[n] for n in dset[b'divergentnodes']] | |
1027 | result.append( |
|
1032 | result.append( | |
1028 | { |
|
1033 | { | |
1029 | b'instability': b'content-divergent', |
|
1034 | b'instability': b'content-divergent', | |
1030 | b'divergentnodes': divnodes, |
|
1035 | b'divergentnodes': divnodes, | |
1031 | b'reason': b'predecessor', |
|
1036 | b'reason': b'predecessor', | |
1032 | b'node': nodemod.hex(dset[b'commonpredecessor']), |
|
1037 | b'node': nodemod.hex(dset[b'commonpredecessor']), | |
1033 | } |
|
1038 | } | |
1034 | ) |
|
1039 | ) | |
1035 | return result |
|
1040 | return result |
1 | NO CONTENT: file copied from relnotes/next to relnotes/5.2 |
|
NO CONTENT: file copied from relnotes/next to relnotes/5.2 |
@@ -1,30 +1,14 b'' | |||||
1 | == New Features == |
|
1 | == New Features == | |
2 |
|
2 | |||
3 | * The amend extension supports the `--currentuser` argument. |
|
|||
4 |
|
||||
5 | * The amend extension supports the `--close-branch` argument. |
|
|||
6 |
|
||||
7 | * The amend extension supports the `--secret` argument. |
|
|||
8 |
|
||||
9 | * The uncommit extension supports the `rewrite.update-timestamp` config option. |
|
|||
10 |
|
3 | |||
11 | == New Experimental Features == |
|
4 | == New Experimental Features == | |
12 |
|
5 | |||
13 |
|
6 | |||
14 | == Bug Fixes == |
|
7 | == Bug Fixes == | |
15 |
|
8 | |||
16 |
|
9 | |||
17 | == Backwards Compatibility Changes == |
|
10 | == Backwards Compatibility Changes == | |
18 |
|
11 | |||
19 | * A shell that supports `$(command)`` syntax for command substitution is now |
|
|||
20 | required for running the test suite. The test runner normally uses |
|
|||
21 | `sh`, so if that is a shell that doesn't support `$(command)` syntax, |
|
|||
22 | you can override it by setting `$HGTEST_SHELL` or by passing it to |
|
|||
23 | `run-tests.py --shell <shell>`. |
|
|||
24 |
|
||||
25 | * The (experimental) narrow extension's wire protocol changed. If |
|
|||
26 | you're using it, you'll need to make sure to upgrade server and |
|
|||
27 | client at the same time. |
|
|||
28 |
|
12 | |||
29 | == Internal API Changes == |
|
13 | == Internal API Changes == | |
30 |
|
14 |
General Comments 0
You need to be logged in to leave comments.
Login now