Show More
@@ -1,355 +1,356 b'' | |||||
1 | # setdiscovery.py - improved discovery of common nodeset for mercurial |
|
1 | # setdiscovery.py - improved discovery of common nodeset for mercurial | |
2 | # |
|
2 | # | |
3 | # Copyright 2010 Benoit Boissinot <bboissin@gmail.com> |
|
3 | # Copyright 2010 Benoit Boissinot <bboissin@gmail.com> | |
4 | # and Peter Arrenbrecht <peter@arrenbrecht.ch> |
|
4 | # and Peter Arrenbrecht <peter@arrenbrecht.ch> | |
5 | # |
|
5 | # | |
6 | # This software may be used and distributed according to the terms of the |
|
6 | # This software may be used and distributed according to the terms of the | |
7 | # GNU General Public License version 2 or any later version. |
|
7 | # GNU General Public License version 2 or any later version. | |
8 | """ |
|
8 | """ | |
9 | Algorithm works in the following way. You have two repository: local and |
|
9 | Algorithm works in the following way. You have two repository: local and | |
10 | remote. They both contains a DAG of changelists. |
|
10 | remote. They both contains a DAG of changelists. | |
11 |
|
11 | |||
12 | The goal of the discovery protocol is to find one set of node *common*, |
|
12 | The goal of the discovery protocol is to find one set of node *common*, | |
13 | the set of nodes shared by local and remote. |
|
13 | the set of nodes shared by local and remote. | |
14 |
|
14 | |||
15 | One of the issue with the original protocol was latency, it could |
|
15 | One of the issue with the original protocol was latency, it could | |
16 | potentially require lots of roundtrips to discover that the local repo was a |
|
16 | potentially require lots of roundtrips to discover that the local repo was a | |
17 | subset of remote (which is a very common case, you usually have few changes |
|
17 | subset of remote (which is a very common case, you usually have few changes | |
18 | compared to upstream, while upstream probably had lots of development). |
|
18 | compared to upstream, while upstream probably had lots of development). | |
19 |
|
19 | |||
20 | The new protocol only requires one interface for the remote repo: `known()`, |
|
20 | The new protocol only requires one interface for the remote repo: `known()`, | |
21 | which given a set of changelists tells you if they are present in the DAG. |
|
21 | which given a set of changelists tells you if they are present in the DAG. | |
22 |
|
22 | |||
23 | The algorithm then works as follow: |
|
23 | The algorithm then works as follow: | |
24 |
|
24 | |||
25 | - We will be using three sets, `common`, `missing`, `unknown`. Originally |
|
25 | - We will be using three sets, `common`, `missing`, `unknown`. Originally | |
26 | all nodes are in `unknown`. |
|
26 | all nodes are in `unknown`. | |
27 | - Take a sample from `unknown`, call `remote.known(sample)` |
|
27 | - Take a sample from `unknown`, call `remote.known(sample)` | |
28 | - For each node that remote knows, move it and all its ancestors to `common` |
|
28 | - For each node that remote knows, move it and all its ancestors to `common` | |
29 | - For each node that remote doesn't know, move it and all its descendants |
|
29 | - For each node that remote doesn't know, move it and all its descendants | |
30 | to `missing` |
|
30 | to `missing` | |
31 | - Iterate until `unknown` is empty |
|
31 | - Iterate until `unknown` is empty | |
32 |
|
32 | |||
33 | There are a couple optimizations, first is instead of starting with a random |
|
33 | There are a couple optimizations, first is instead of starting with a random | |
34 | sample of missing, start by sending all heads, in the case where the local |
|
34 | sample of missing, start by sending all heads, in the case where the local | |
35 | repo is a subset, you computed the answer in one round trip. |
|
35 | repo is a subset, you computed the answer in one round trip. | |
36 |
|
36 | |||
37 | Then you can do something similar to the bisecting strategy used when |
|
37 | Then you can do something similar to the bisecting strategy used when | |
38 | finding faulty changesets. Instead of random samples, you can try picking |
|
38 | finding faulty changesets. Instead of random samples, you can try picking | |
39 | nodes that will maximize the number of nodes that will be |
|
39 | nodes that will maximize the number of nodes that will be | |
40 | classified with it (since all ancestors or descendants will be marked as well). |
|
40 | classified with it (since all ancestors or descendants will be marked as well). | |
41 | """ |
|
41 | """ | |
42 |
|
42 | |||
43 | from __future__ import absolute_import |
|
43 | from __future__ import absolute_import | |
44 |
|
44 | |||
45 | import collections |
|
45 | import collections | |
46 | import random |
|
46 | import random | |
47 |
|
47 | |||
48 | from .i18n import _ |
|
48 | from .i18n import _ | |
49 | from .node import ( |
|
49 | from .node import ( | |
50 | nullid, |
|
50 | nullid, | |
51 | nullrev, |
|
51 | nullrev, | |
52 | ) |
|
52 | ) | |
53 | from . import ( |
|
53 | from . import ( | |
54 | error, |
|
54 | error, | |
55 | util, |
|
55 | util, | |
56 | ) |
|
56 | ) | |
57 |
|
57 | |||
58 | def _updatesample(revs, heads, sample, parentfn, quicksamplesize=0): |
|
58 | def _updatesample(revs, heads, sample, parentfn, quicksamplesize=0): | |
59 | """update an existing sample to match the expected size |
|
59 | """update an existing sample to match the expected size | |
60 |
|
60 | |||
61 | The sample is updated with revs exponentially distant from each head of the |
|
61 | The sample is updated with revs exponentially distant from each head of the | |
62 | <revs> set. (H~1, H~2, H~4, H~8, etc). |
|
62 | <revs> set. (H~1, H~2, H~4, H~8, etc). | |
63 |
|
63 | |||
64 | If a target size is specified, the sampling will stop once this size is |
|
64 | If a target size is specified, the sampling will stop once this size is | |
65 | reached. Otherwise sampling will happen until roots of the <revs> set are |
|
65 | reached. Otherwise sampling will happen until roots of the <revs> set are | |
66 | reached. |
|
66 | reached. | |
67 |
|
67 | |||
68 | :revs: set of revs we want to discover (if None, assume the whole dag) |
|
68 | :revs: set of revs we want to discover (if None, assume the whole dag) | |
69 | :heads: set of DAG head revs |
|
69 | :heads: set of DAG head revs | |
70 | :sample: a sample to update |
|
70 | :sample: a sample to update | |
71 | :parentfn: a callable to resolve parents for a revision |
|
71 | :parentfn: a callable to resolve parents for a revision | |
72 | :quicksamplesize: optional target size of the sample""" |
|
72 | :quicksamplesize: optional target size of the sample""" | |
73 | dist = {} |
|
73 | dist = {} | |
74 | visit = collections.deque(heads) |
|
74 | visit = collections.deque(heads) | |
75 | seen = set() |
|
75 | seen = set() | |
76 | factor = 1 |
|
76 | factor = 1 | |
77 | while visit: |
|
77 | while visit: | |
78 | curr = visit.popleft() |
|
78 | curr = visit.popleft() | |
79 | if curr in seen: |
|
79 | if curr in seen: | |
80 | continue |
|
80 | continue | |
81 | d = dist.setdefault(curr, 1) |
|
81 | d = dist.setdefault(curr, 1) | |
82 | if d > factor: |
|
82 | if d > factor: | |
83 | factor *= 2 |
|
83 | factor *= 2 | |
84 | if d == factor: |
|
84 | if d == factor: | |
85 | sample.add(curr) |
|
85 | sample.add(curr) | |
86 | if quicksamplesize and (len(sample) >= quicksamplesize): |
|
86 | if quicksamplesize and (len(sample) >= quicksamplesize): | |
87 | return |
|
87 | return | |
88 | seen.add(curr) |
|
88 | seen.add(curr) | |
89 |
|
89 | |||
90 | for p in parentfn(curr): |
|
90 | for p in parentfn(curr): | |
91 | if p != nullrev and (not revs or p in revs): |
|
91 | if p != nullrev and (not revs or p in revs): | |
92 | dist.setdefault(p, d + 1) |
|
92 | dist.setdefault(p, d + 1) | |
93 | visit.append(p) |
|
93 | visit.append(p) | |
94 |
|
94 | |||
95 | def _takequicksample(repo, headrevs, revs, size): |
|
95 | def _takequicksample(repo, headrevs, revs, size): | |
96 | """takes a quick sample of size <size> |
|
96 | """takes a quick sample of size <size> | |
97 |
|
97 | |||
98 | It is meant for initial sampling and focuses on querying heads and close |
|
98 | It is meant for initial sampling and focuses on querying heads and close | |
99 | ancestors of heads. |
|
99 | ancestors of heads. | |
100 |
|
100 | |||
101 | :dag: a dag object |
|
101 | :dag: a dag object | |
102 | :headrevs: set of head revisions in local DAG to consider |
|
102 | :headrevs: set of head revisions in local DAG to consider | |
103 | :revs: set of revs to discover |
|
103 | :revs: set of revs to discover | |
104 | :size: the maximum size of the sample""" |
|
104 | :size: the maximum size of the sample""" | |
105 | if len(revs) <= size: |
|
105 | if len(revs) <= size: | |
106 | return list(revs) |
|
106 | return list(revs) | |
107 | sample = set(repo.revs('heads(%ld)', revs)) |
|
107 | sample = set(repo.revs('heads(%ld)', revs)) | |
108 |
|
108 | |||
109 | if len(sample) >= size: |
|
109 | if len(sample) >= size: | |
110 | return _limitsample(sample, size) |
|
110 | return _limitsample(sample, size) | |
111 |
|
111 | |||
112 | _updatesample(None, headrevs, sample, repo.changelog.parentrevs, |
|
112 | _updatesample(None, headrevs, sample, repo.changelog.parentrevs, | |
113 | quicksamplesize=size) |
|
113 | quicksamplesize=size) | |
114 | return sample |
|
114 | return sample | |
115 |
|
115 | |||
116 | def _takefullsample(repo, headrevs, revs, size): |
|
116 | def _takefullsample(repo, headrevs, revs, size): | |
117 | if len(revs) <= size: |
|
117 | if len(revs) <= size: | |
118 | return list(revs) |
|
118 | return list(revs) | |
119 | sample = set(repo.revs('heads(%ld)', revs)) |
|
119 | sample = set(repo.revs('heads(%ld)', revs)) | |
120 |
|
120 | |||
121 | # update from heads |
|
121 | # update from heads | |
122 | revsheads = set(repo.revs('heads(%ld)', revs)) |
|
122 | revsheads = set(repo.revs('heads(%ld)', revs)) | |
123 | _updatesample(revs, revsheads, sample, repo.changelog.parentrevs) |
|
123 | _updatesample(revs, revsheads, sample, repo.changelog.parentrevs) | |
124 |
|
124 | |||
125 | # update from roots |
|
125 | # update from roots | |
126 | revsroots = set(repo.revs('roots(%ld)', revs)) |
|
126 | revsroots = set(repo.revs('roots(%ld)', revs)) | |
127 |
|
127 | |||
128 | # _updatesample() essentially does interaction over revisions to look up |
|
128 | # _updatesample() essentially does interaction over revisions to look up | |
129 | # their children. This lookup is expensive and doing it in a loop is |
|
129 | # their children. This lookup is expensive and doing it in a loop is | |
130 | # quadratic. We precompute the children for all relevant revisions and |
|
130 | # quadratic. We precompute the children for all relevant revisions and | |
131 | # make the lookup in _updatesample() a simple dict lookup. |
|
131 | # make the lookup in _updatesample() a simple dict lookup. | |
132 | # |
|
132 | # | |
133 | # Because this function can be called multiple times during discovery, we |
|
133 | # Because this function can be called multiple times during discovery, we | |
134 | # may still perform redundant work and there is room to optimize this by |
|
134 | # may still perform redundant work and there is room to optimize this by | |
135 | # keeping a persistent cache of children across invocations. |
|
135 | # keeping a persistent cache of children across invocations. | |
136 | children = {} |
|
136 | children = {} | |
137 |
|
137 | |||
138 | parentrevs = repo.changelog.parentrevs |
|
138 | parentrevs = repo.changelog.parentrevs | |
139 | for rev in repo.changelog.revs(start=min(revsroots)): |
|
139 | for rev in repo.changelog.revs(start=min(revsroots)): | |
140 | # Always ensure revision has an entry so we don't need to worry about |
|
140 | # Always ensure revision has an entry so we don't need to worry about | |
141 | # missing keys. |
|
141 | # missing keys. | |
142 | children.setdefault(rev, []) |
|
142 | children.setdefault(rev, []) | |
143 |
|
143 | |||
144 | for prev in parentrevs(rev): |
|
144 | for prev in parentrevs(rev): | |
145 | if prev == nullrev: |
|
145 | if prev == nullrev: | |
146 | continue |
|
146 | continue | |
147 |
|
147 | |||
148 | children.setdefault(prev, []).append(rev) |
|
148 | children.setdefault(prev, []).append(rev) | |
149 |
|
149 | |||
150 | _updatesample(revs, revsroots, sample, children.__getitem__) |
|
150 | _updatesample(revs, revsroots, sample, children.__getitem__) | |
151 | assert sample |
|
151 | assert sample | |
152 | sample = _limitsample(sample, size) |
|
152 | sample = _limitsample(sample, size) | |
153 | if len(sample) < size: |
|
153 | if len(sample) < size: | |
154 | more = size - len(sample) |
|
154 | more = size - len(sample) | |
155 | sample.update(random.sample(list(revs - sample), more)) |
|
155 | sample.update(random.sample(list(revs - sample), more)) | |
156 | return sample |
|
156 | return sample | |
157 |
|
157 | |||
158 | def _limitsample(sample, desiredlen): |
|
158 | def _limitsample(sample, desiredlen): | |
159 | """return a random subset of sample of at most desiredlen item""" |
|
159 | """return a random subset of sample of at most desiredlen item""" | |
160 | if len(sample) > desiredlen: |
|
160 | if len(sample) > desiredlen: | |
161 | sample = set(random.sample(sample, desiredlen)) |
|
161 | sample = set(random.sample(sample, desiredlen)) | |
162 | return sample |
|
162 | return sample | |
163 |
|
163 | |||
164 | class partialdiscovery(object): |
|
164 | class partialdiscovery(object): | |
165 | """an object representing ongoing discovery |
|
165 | """an object representing ongoing discovery | |
166 |
|
166 | |||
167 | Feed with data from the remote repository, this object keep track of the |
|
167 | Feed with data from the remote repository, this object keep track of the | |
168 | current set of changeset in various states: |
|
168 | current set of changeset in various states: | |
169 |
|
169 | |||
170 | - common: revs also known remotely |
|
170 | - common: revs also known remotely | |
171 | - undecided: revs we don't have information on yet |
|
171 | - undecided: revs we don't have information on yet | |
172 | - missing: revs missing remotely |
|
172 | - missing: revs missing remotely | |
173 | (all tracked revisions are known locally) |
|
173 | (all tracked revisions are known locally) | |
174 | """ |
|
174 | """ | |
175 |
|
175 | |||
176 | def __init__(self, repo, targetheads): |
|
176 | def __init__(self, repo, targetheads): | |
177 | self._repo = repo |
|
177 | self._repo = repo | |
178 | self._targetheads = targetheads |
|
178 | self._targetheads = targetheads | |
179 | self._common = repo.changelog.incrementalmissingrevs() |
|
179 | self._common = repo.changelog.incrementalmissingrevs() | |
180 | self._undecided = None |
|
180 | self._undecided = None | |
181 | self.missing = set() |
|
181 | self.missing = set() | |
182 |
|
182 | |||
183 | def addcommons(self, commons): |
|
183 | def addcommons(self, commons): | |
184 | """registrer nodes known as common""" |
|
184 | """registrer nodes known as common""" | |
185 | self._common.addbases(commons) |
|
185 | self._common.addbases(commons) | |
186 | self._common.removeancestorsfrom(self.undecided) |
|
186 | if self._undecided is not None: | |
|
187 | self._common.removeancestorsfrom(self._undecided) | |||
187 |
|
188 | |||
188 | def addmissings(self, missings): |
|
189 | def addmissings(self, missings): | |
189 | """registrer some nodes as missing""" |
|
190 | """registrer some nodes as missing""" | |
190 | newmissing = self._repo.revs('%ld::%ld', missings, self.undecided) |
|
191 | newmissing = self._repo.revs('%ld::%ld', missings, self.undecided) | |
191 | if newmissing: |
|
192 | if newmissing: | |
192 | self.missing.update(newmissing) |
|
193 | self.missing.update(newmissing) | |
193 | self.undecided.difference_update(newmissing) |
|
194 | self.undecided.difference_update(newmissing) | |
194 |
|
195 | |||
195 | def addinfo(self, sample): |
|
196 | def addinfo(self, sample): | |
196 | """consume an iterable of (rev, known) tuples""" |
|
197 | """consume an iterable of (rev, known) tuples""" | |
197 | common = set() |
|
198 | common = set() | |
198 | missing = set() |
|
199 | missing = set() | |
199 | for rev, known in sample: |
|
200 | for rev, known in sample: | |
200 | if known: |
|
201 | if known: | |
201 | common.add(rev) |
|
202 | common.add(rev) | |
202 | else: |
|
203 | else: | |
203 | missing.add(rev) |
|
204 | missing.add(rev) | |
204 | if common: |
|
205 | if common: | |
205 | self.addcommons(common) |
|
206 | self.addcommons(common) | |
206 | if missing: |
|
207 | if missing: | |
207 | self.addmissings(missing) |
|
208 | self.addmissings(missing) | |
208 |
|
209 | |||
209 | def hasinfo(self): |
|
210 | def hasinfo(self): | |
210 | """return True is we have any clue about the remote state""" |
|
211 | """return True is we have any clue about the remote state""" | |
211 | return self._common.hasbases() |
|
212 | return self._common.hasbases() | |
212 |
|
213 | |||
213 | def iscomplete(self): |
|
214 | def iscomplete(self): | |
214 | """True if all the necessary data have been gathered""" |
|
215 | """True if all the necessary data have been gathered""" | |
215 | return self._undecided is not None and not self._undecided |
|
216 | return self._undecided is not None and not self._undecided | |
216 |
|
217 | |||
217 | @property |
|
218 | @property | |
218 | def undecided(self): |
|
219 | def undecided(self): | |
219 | if self._undecided is not None: |
|
220 | if self._undecided is not None: | |
220 | return self._undecided |
|
221 | return self._undecided | |
221 | self._undecided = set(self._common.missingancestors(self._targetheads)) |
|
222 | self._undecided = set(self._common.missingancestors(self._targetheads)) | |
222 | return self._undecided |
|
223 | return self._undecided | |
223 |
|
224 | |||
224 | def commonheads(self): |
|
225 | def commonheads(self): | |
225 | """the heads of the known common set""" |
|
226 | """the heads of the known common set""" | |
226 | # heads(common) == heads(common.bases) since common represents |
|
227 | # heads(common) == heads(common.bases) since common represents | |
227 | # common.bases and all its ancestors |
|
228 | # common.bases and all its ancestors | |
228 | return self._common.basesheads() |
|
229 | return self._common.basesheads() | |
229 |
|
230 | |||
230 | def findcommonheads(ui, local, remote, |
|
231 | def findcommonheads(ui, local, remote, | |
231 | initialsamplesize=100, |
|
232 | initialsamplesize=100, | |
232 | fullsamplesize=200, |
|
233 | fullsamplesize=200, | |
233 | abortwhenunrelated=True, |
|
234 | abortwhenunrelated=True, | |
234 | ancestorsof=None): |
|
235 | ancestorsof=None): | |
235 | '''Return a tuple (common, anyincoming, remoteheads) used to identify |
|
236 | '''Return a tuple (common, anyincoming, remoteheads) used to identify | |
236 | missing nodes from or in remote. |
|
237 | missing nodes from or in remote. | |
237 | ''' |
|
238 | ''' | |
238 | start = util.timer() |
|
239 | start = util.timer() | |
239 |
|
240 | |||
240 | roundtrips = 0 |
|
241 | roundtrips = 0 | |
241 | cl = local.changelog |
|
242 | cl = local.changelog | |
242 | clnode = cl.node |
|
243 | clnode = cl.node | |
243 | clrev = cl.rev |
|
244 | clrev = cl.rev | |
244 |
|
245 | |||
245 | if ancestorsof is not None: |
|
246 | if ancestorsof is not None: | |
246 | ownheads = [clrev(n) for n in ancestorsof] |
|
247 | ownheads = [clrev(n) for n in ancestorsof] | |
247 | else: |
|
248 | else: | |
248 | ownheads = [rev for rev in cl.headrevs() if rev != nullrev] |
|
249 | ownheads = [rev for rev in cl.headrevs() if rev != nullrev] | |
249 |
|
250 | |||
250 | # early exit if we know all the specified remote heads already |
|
251 | # early exit if we know all the specified remote heads already | |
251 | ui.debug("query 1; heads\n") |
|
252 | ui.debug("query 1; heads\n") | |
252 | roundtrips += 1 |
|
253 | roundtrips += 1 | |
253 | sample = _limitsample(ownheads, initialsamplesize) |
|
254 | sample = _limitsample(ownheads, initialsamplesize) | |
254 | # indices between sample and externalized version must match |
|
255 | # indices between sample and externalized version must match | |
255 | sample = list(sample) |
|
256 | sample = list(sample) | |
256 |
|
257 | |||
257 | with remote.commandexecutor() as e: |
|
258 | with remote.commandexecutor() as e: | |
258 | fheads = e.callcommand('heads', {}) |
|
259 | fheads = e.callcommand('heads', {}) | |
259 | fknown = e.callcommand('known', { |
|
260 | fknown = e.callcommand('known', { | |
260 | 'nodes': [clnode(r) for r in sample], |
|
261 | 'nodes': [clnode(r) for r in sample], | |
261 | }) |
|
262 | }) | |
262 |
|
263 | |||
263 | srvheadhashes, yesno = fheads.result(), fknown.result() |
|
264 | srvheadhashes, yesno = fheads.result(), fknown.result() | |
264 |
|
265 | |||
265 | if cl.tip() == nullid: |
|
266 | if cl.tip() == nullid: | |
266 | if srvheadhashes != [nullid]: |
|
267 | if srvheadhashes != [nullid]: | |
267 | return [nullid], True, srvheadhashes |
|
268 | return [nullid], True, srvheadhashes | |
268 | return [nullid], False, [] |
|
269 | return [nullid], False, [] | |
269 |
|
270 | |||
270 | # start actual discovery (we note this before the next "if" for |
|
271 | # start actual discovery (we note this before the next "if" for | |
271 | # compatibility reasons) |
|
272 | # compatibility reasons) | |
272 | ui.status(_("searching for changes\n")) |
|
273 | ui.status(_("searching for changes\n")) | |
273 |
|
274 | |||
274 | srvheads = [] |
|
275 | srvheads = [] | |
275 | for node in srvheadhashes: |
|
276 | for node in srvheadhashes: | |
276 | if node == nullid: |
|
277 | if node == nullid: | |
277 | continue |
|
278 | continue | |
278 |
|
279 | |||
279 | try: |
|
280 | try: | |
280 | srvheads.append(clrev(node)) |
|
281 | srvheads.append(clrev(node)) | |
281 | # Catches unknown and filtered nodes. |
|
282 | # Catches unknown and filtered nodes. | |
282 | except error.LookupError: |
|
283 | except error.LookupError: | |
283 | continue |
|
284 | continue | |
284 |
|
285 | |||
285 | if len(srvheads) == len(srvheadhashes): |
|
286 | if len(srvheads) == len(srvheadhashes): | |
286 | ui.debug("all remote heads known locally\n") |
|
287 | ui.debug("all remote heads known locally\n") | |
287 | return srvheadhashes, False, srvheadhashes |
|
288 | return srvheadhashes, False, srvheadhashes | |
288 |
|
289 | |||
289 | if len(sample) == len(ownheads) and all(yesno): |
|
290 | if len(sample) == len(ownheads) and all(yesno): | |
290 | ui.note(_("all local heads known remotely\n")) |
|
291 | ui.note(_("all local heads known remotely\n")) | |
291 | ownheadhashes = [clnode(r) for r in ownheads] |
|
292 | ownheadhashes = [clnode(r) for r in ownheads] | |
292 | return ownheadhashes, True, srvheadhashes |
|
293 | return ownheadhashes, True, srvheadhashes | |
293 |
|
294 | |||
294 | # full blown discovery |
|
295 | # full blown discovery | |
295 |
|
296 | |||
296 | disco = partialdiscovery(local, ownheads) |
|
297 | disco = partialdiscovery(local, ownheads) | |
297 | # treat remote heads (and maybe own heads) as a first implicit sample |
|
298 | # treat remote heads (and maybe own heads) as a first implicit sample | |
298 | # response |
|
299 | # response | |
299 | disco.addcommons(srvheads) |
|
300 | disco.addcommons(srvheads) | |
300 | disco.addinfo(zip(sample, yesno)) |
|
301 | disco.addinfo(zip(sample, yesno)) | |
301 |
|
302 | |||
302 | full = False |
|
303 | full = False | |
303 | progress = ui.makeprogress(_('searching'), unit=_('queries')) |
|
304 | progress = ui.makeprogress(_('searching'), unit=_('queries')) | |
304 | while not disco.iscomplete(): |
|
305 | while not disco.iscomplete(): | |
305 |
|
306 | |||
306 | if full or disco.hasinfo(): |
|
307 | if full or disco.hasinfo(): | |
307 | if full: |
|
308 | if full: | |
308 | ui.note(_("sampling from both directions\n")) |
|
309 | ui.note(_("sampling from both directions\n")) | |
309 | else: |
|
310 | else: | |
310 | ui.debug("taking initial sample\n") |
|
311 | ui.debug("taking initial sample\n") | |
311 | samplefunc = _takefullsample |
|
312 | samplefunc = _takefullsample | |
312 | targetsize = fullsamplesize |
|
313 | targetsize = fullsamplesize | |
313 | else: |
|
314 | else: | |
314 | # use even cheaper initial sample |
|
315 | # use even cheaper initial sample | |
315 | ui.debug("taking quick initial sample\n") |
|
316 | ui.debug("taking quick initial sample\n") | |
316 | samplefunc = _takequicksample |
|
317 | samplefunc = _takequicksample | |
317 | targetsize = initialsamplesize |
|
318 | targetsize = initialsamplesize | |
318 | sample = samplefunc(local, ownheads, disco.undecided, targetsize) |
|
319 | sample = samplefunc(local, ownheads, disco.undecided, targetsize) | |
319 |
|
320 | |||
320 | roundtrips += 1 |
|
321 | roundtrips += 1 | |
321 | progress.update(roundtrips) |
|
322 | progress.update(roundtrips) | |
322 | ui.debug("query %i; still undecided: %i, sample size is: %i\n" |
|
323 | ui.debug("query %i; still undecided: %i, sample size is: %i\n" | |
323 | % (roundtrips, len(disco.undecided), len(sample))) |
|
324 | % (roundtrips, len(disco.undecided), len(sample))) | |
324 | # indices between sample and externalized version must match |
|
325 | # indices between sample and externalized version must match | |
325 | sample = list(sample) |
|
326 | sample = list(sample) | |
326 |
|
327 | |||
327 | with remote.commandexecutor() as e: |
|
328 | with remote.commandexecutor() as e: | |
328 | yesno = e.callcommand('known', { |
|
329 | yesno = e.callcommand('known', { | |
329 | 'nodes': [clnode(r) for r in sample], |
|
330 | 'nodes': [clnode(r) for r in sample], | |
330 | }).result() |
|
331 | }).result() | |
331 |
|
332 | |||
332 | full = True |
|
333 | full = True | |
333 |
|
334 | |||
334 | disco.addinfo(zip(sample, yesno)) |
|
335 | disco.addinfo(zip(sample, yesno)) | |
335 |
|
336 | |||
336 | result = disco.commonheads() |
|
337 | result = disco.commonheads() | |
337 | elapsed = util.timer() - start |
|
338 | elapsed = util.timer() - start | |
338 | progress.complete() |
|
339 | progress.complete() | |
339 | ui.debug("%d total queries in %.4fs\n" % (roundtrips, elapsed)) |
|
340 | ui.debug("%d total queries in %.4fs\n" % (roundtrips, elapsed)) | |
340 | msg = ('found %d common and %d unknown server heads,' |
|
341 | msg = ('found %d common and %d unknown server heads,' | |
341 | ' %d roundtrips in %.4fs\n') |
|
342 | ' %d roundtrips in %.4fs\n') | |
342 | missing = set(result) - set(srvheads) |
|
343 | missing = set(result) - set(srvheads) | |
343 | ui.log('discovery', msg, len(result), len(missing), roundtrips, |
|
344 | ui.log('discovery', msg, len(result), len(missing), roundtrips, | |
344 | elapsed) |
|
345 | elapsed) | |
345 |
|
346 | |||
346 | if not result and srvheadhashes != [nullid]: |
|
347 | if not result and srvheadhashes != [nullid]: | |
347 | if abortwhenunrelated: |
|
348 | if abortwhenunrelated: | |
348 | raise error.Abort(_("repository is unrelated")) |
|
349 | raise error.Abort(_("repository is unrelated")) | |
349 | else: |
|
350 | else: | |
350 | ui.warn(_("warning: repository is unrelated\n")) |
|
351 | ui.warn(_("warning: repository is unrelated\n")) | |
351 | return ({nullid}, True, srvheadhashes,) |
|
352 | return ({nullid}, True, srvheadhashes,) | |
352 |
|
353 | |||
353 | anyincoming = (srvheadhashes != [nullid]) |
|
354 | anyincoming = (srvheadhashes != [nullid]) | |
354 | result = {clnode(r) for r in result} |
|
355 | result = {clnode(r) for r in result} | |
355 | return result, anyincoming, srvheadhashes |
|
356 | return result, anyincoming, srvheadhashes |
General Comments 0
You need to be logged in to leave comments.
Login now