Show More
@@ -1,1266 +1,1260 b'' | |||
|
1 | 1 | # exchange.py - utility to exchange data between repos. |
|
2 | 2 | # |
|
3 | 3 | # Copyright 2005-2007 Matt Mackall <mpm@selenic.com> |
|
4 | 4 | # |
|
5 | 5 | # This software may be used and distributed according to the terms of the |
|
6 | 6 | # GNU General Public License version 2 or any later version. |
|
7 | 7 | |
|
8 | 8 | from i18n import _ |
|
9 | 9 | from node import hex, nullid |
|
10 | 10 | import errno, urllib |
|
11 | 11 | import util, scmutil, changegroup, base85, error |
|
12 | 12 | import discovery, phases, obsolete, bookmarks as bookmod, bundle2, pushkey |
|
13 | 13 | |
|
14 | 14 | def readbundle(ui, fh, fname, vfs=None): |
|
15 | 15 | header = changegroup.readexactly(fh, 4) |
|
16 | 16 | |
|
17 | 17 | alg = None |
|
18 | 18 | if not fname: |
|
19 | 19 | fname = "stream" |
|
20 | 20 | if not header.startswith('HG') and header.startswith('\0'): |
|
21 | 21 | fh = changegroup.headerlessfixup(fh, header) |
|
22 | 22 | header = "HG10" |
|
23 | 23 | alg = 'UN' |
|
24 | 24 | elif vfs: |
|
25 | 25 | fname = vfs.join(fname) |
|
26 | 26 | |
|
27 | 27 | magic, version = header[0:2], header[2:4] |
|
28 | 28 | |
|
29 | 29 | if magic != 'HG': |
|
30 | 30 | raise util.Abort(_('%s: not a Mercurial bundle') % fname) |
|
31 | 31 | if version == '10': |
|
32 | 32 | if alg is None: |
|
33 | 33 | alg = changegroup.readexactly(fh, 2) |
|
34 | 34 | return changegroup.cg1unpacker(fh, alg) |
|
35 | 35 | elif version == '2Y': |
|
36 | 36 | return bundle2.unbundle20(ui, fh, header=magic + version) |
|
37 | 37 | else: |
|
38 | 38 | raise util.Abort(_('%s: unknown bundle version %s') % (fname, version)) |
|
39 | 39 | |
|
40 | 40 | def buildobsmarkerspart(bundler, markers): |
|
41 | 41 | """add an obsmarker part to the bundler with <markers> |
|
42 | 42 | |
|
43 | 43 | No part is created if markers is empty. |
|
44 | 44 | Raises ValueError if the bundler doesn't support any known obsmarker format. |
|
45 | 45 | """ |
|
46 | 46 | if markers: |
|
47 | 47 | remoteversions = bundle2.obsmarkersversion(bundler.capabilities) |
|
48 | 48 | version = obsolete.commonversion(remoteversions) |
|
49 | 49 | if version is None: |
|
50 | 50 | raise ValueError('bundler do not support common obsmarker format') |
|
51 | 51 | stream = obsolete.encodemarkers(markers, True, version=version) |
|
52 | 52 | return bundler.newpart('B2X:OBSMARKERS', data=stream) |
|
53 | 53 | return None |
|
54 | 54 | |
|
55 | 55 | class pushoperation(object): |
|
56 | 56 | """A object that represent a single push operation |
|
57 | 57 | |
|
58 | 58 | It purpose is to carry push related state and very common operation. |
|
59 | 59 | |
|
60 | 60 | A new should be created at the beginning of each push and discarded |
|
61 | 61 | afterward. |
|
62 | 62 | """ |
|
63 | 63 | |
|
64 | 64 | def __init__(self, repo, remote, force=False, revs=None, newbranch=False, |
|
65 | 65 | bookmarks=()): |
|
66 | 66 | # repo we push from |
|
67 | 67 | self.repo = repo |
|
68 | 68 | self.ui = repo.ui |
|
69 | 69 | # repo we push to |
|
70 | 70 | self.remote = remote |
|
71 | 71 | # force option provided |
|
72 | 72 | self.force = force |
|
73 | 73 | # revs to be pushed (None is "all") |
|
74 | 74 | self.revs = revs |
|
75 | 75 | # bookmark explicitly pushed |
|
76 | 76 | self.bookmarks = bookmarks |
|
77 | 77 | # allow push of new branch |
|
78 | 78 | self.newbranch = newbranch |
|
79 | 79 | # did a local lock get acquired? |
|
80 | 80 | self.locallocked = None |
|
81 | 81 | # step already performed |
|
82 | 82 | # (used to check what steps have been already performed through bundle2) |
|
83 | 83 | self.stepsdone = set() |
|
84 | 84 | # Integer version of the changegroup push result |
|
85 | 85 | # - None means nothing to push |
|
86 | 86 | # - 0 means HTTP error |
|
87 | 87 | # - 1 means we pushed and remote head count is unchanged *or* |
|
88 | 88 | # we have outgoing changesets but refused to push |
|
89 | 89 | # - other values as described by addchangegroup() |
|
90 | 90 | self.cgresult = None |
|
91 | 91 | # Boolean value for the bookmark push |
|
92 | 92 | self.bkresult = None |
|
93 | 93 | # discover.outgoing object (contains common and outgoing data) |
|
94 | 94 | self.outgoing = None |
|
95 | 95 | # all remote heads before the push |
|
96 | 96 | self.remoteheads = None |
|
97 | 97 | # testable as a boolean indicating if any nodes are missing locally. |
|
98 | 98 | self.incoming = None |
|
99 | 99 | # phases changes that must be pushed along side the changesets |
|
100 | 100 | self.outdatedphases = None |
|
101 | 101 | # phases changes that must be pushed if changeset push fails |
|
102 | 102 | self.fallbackoutdatedphases = None |
|
103 | 103 | # outgoing obsmarkers |
|
104 | 104 | self.outobsmarkers = set() |
|
105 | 105 | # outgoing bookmarks |
|
106 | 106 | self.outbookmarks = [] |
|
107 | 107 | |
|
108 | 108 | @util.propertycache |
|
109 | 109 | def futureheads(self): |
|
110 | 110 | """future remote heads if the changeset push succeeds""" |
|
111 | 111 | return self.outgoing.missingheads |
|
112 | 112 | |
|
113 | 113 | @util.propertycache |
|
114 | 114 | def fallbackheads(self): |
|
115 | 115 | """future remote heads if the changeset push fails""" |
|
116 | 116 | if self.revs is None: |
|
117 | 117 | # not target to push, all common are relevant |
|
118 | 118 | return self.outgoing.commonheads |
|
119 | 119 | unfi = self.repo.unfiltered() |
|
120 | 120 | # I want cheads = heads(::missingheads and ::commonheads) |
|
121 | 121 | # (missingheads is revs with secret changeset filtered out) |
|
122 | 122 | # |
|
123 | 123 | # This can be expressed as: |
|
124 | 124 | # cheads = ( (missingheads and ::commonheads) |
|
125 | 125 | # + (commonheads and ::missingheads))" |
|
126 | 126 | # ) |
|
127 | 127 | # |
|
128 | 128 | # while trying to push we already computed the following: |
|
129 | 129 | # common = (::commonheads) |
|
130 | 130 | # missing = ((commonheads::missingheads) - commonheads) |
|
131 | 131 | # |
|
132 | 132 | # We can pick: |
|
133 | 133 | # * missingheads part of common (::commonheads) |
|
134 | 134 | common = set(self.outgoing.common) |
|
135 | 135 | nm = self.repo.changelog.nodemap |
|
136 | 136 | cheads = [node for node in self.revs if nm[node] in common] |
|
137 | 137 | # and |
|
138 | 138 | # * commonheads parents on missing |
|
139 | 139 | revset = unfi.set('%ln and parents(roots(%ln))', |
|
140 | 140 | self.outgoing.commonheads, |
|
141 | 141 | self.outgoing.missing) |
|
142 | 142 | cheads.extend(c.node() for c in revset) |
|
143 | 143 | return cheads |
|
144 | 144 | |
|
145 | 145 | @property |
|
146 | 146 | def commonheads(self): |
|
147 | 147 | """set of all common heads after changeset bundle push""" |
|
148 | 148 | if self.cgresult: |
|
149 | 149 | return self.futureheads |
|
150 | 150 | else: |
|
151 | 151 | return self.fallbackheads |
|
152 | 152 | |
|
153 | 153 | # mapping of message used when pushing bookmark |
|
154 | 154 | bookmsgmap = {'update': (_("updating bookmark %s\n"), |
|
155 | 155 | _('updating bookmark %s failed!\n')), |
|
156 | 156 | 'export': (_("exporting bookmark %s\n"), |
|
157 | 157 | _('exporting bookmark %s failed!\n')), |
|
158 | 158 | 'delete': (_("deleting remote bookmark %s\n"), |
|
159 | 159 | _('deleting remote bookmark %s failed!\n')), |
|
160 | 160 | } |
|
161 | 161 | |
|
162 | 162 | |
|
163 | 163 | def push(repo, remote, force=False, revs=None, newbranch=False, bookmarks=()): |
|
164 | 164 | '''Push outgoing changesets (limited by revs) from a local |
|
165 | 165 | repository to remote. Return an integer: |
|
166 | 166 | - None means nothing to push |
|
167 | 167 | - 0 means HTTP error |
|
168 | 168 | - 1 means we pushed and remote head count is unchanged *or* |
|
169 | 169 | we have outgoing changesets but refused to push |
|
170 | 170 | - other values as described by addchangegroup() |
|
171 | 171 | ''' |
|
172 | 172 | pushop = pushoperation(repo, remote, force, revs, newbranch, bookmarks) |
|
173 | 173 | if pushop.remote.local(): |
|
174 | 174 | missing = (set(pushop.repo.requirements) |
|
175 | 175 | - pushop.remote.local().supported) |
|
176 | 176 | if missing: |
|
177 | 177 | msg = _("required features are not" |
|
178 | 178 | " supported in the destination:" |
|
179 | 179 | " %s") % (', '.join(sorted(missing))) |
|
180 | 180 | raise util.Abort(msg) |
|
181 | 181 | |
|
182 | 182 | # there are two ways to push to remote repo: |
|
183 | 183 | # |
|
184 | 184 | # addchangegroup assumes local user can lock remote |
|
185 | 185 | # repo (local filesystem, old ssh servers). |
|
186 | 186 | # |
|
187 | 187 | # unbundle assumes local user cannot lock remote repo (new ssh |
|
188 | 188 | # servers, http servers). |
|
189 | 189 | |
|
190 | 190 | if not pushop.remote.canpush(): |
|
191 | 191 | raise util.Abort(_("destination does not support push")) |
|
192 | 192 | # get local lock as we might write phase data |
|
193 | 193 | locallock = None |
|
194 | 194 | try: |
|
195 | 195 | locallock = pushop.repo.lock() |
|
196 | 196 | pushop.locallocked = True |
|
197 | 197 | except IOError, err: |
|
198 | 198 | pushop.locallocked = False |
|
199 | 199 | if err.errno != errno.EACCES: |
|
200 | 200 | raise |
|
201 | 201 | # source repo cannot be locked. |
|
202 | 202 | # We do not abort the push, but just disable the local phase |
|
203 | 203 | # synchronisation. |
|
204 | 204 | msg = 'cannot lock source repository: %s\n' % err |
|
205 | 205 | pushop.ui.debug(msg) |
|
206 | 206 | try: |
|
207 | 207 | pushop.repo.checkpush(pushop) |
|
208 | 208 | lock = None |
|
209 | 209 | unbundle = pushop.remote.capable('unbundle') |
|
210 | 210 | if not unbundle: |
|
211 | 211 | lock = pushop.remote.lock() |
|
212 | 212 | try: |
|
213 | 213 | _pushdiscovery(pushop) |
|
214 | 214 | if (pushop.repo.ui.configbool('experimental', 'bundle2-exp', |
|
215 | 215 | False) |
|
216 | 216 | and pushop.remote.capable('bundle2-exp')): |
|
217 | 217 | _pushbundle2(pushop) |
|
218 | 218 | _pushchangeset(pushop) |
|
219 | 219 | _pushsyncphase(pushop) |
|
220 | 220 | _pushobsolete(pushop) |
|
221 | 221 | _pushbookmark(pushop) |
|
222 | 222 | finally: |
|
223 | 223 | if lock is not None: |
|
224 | 224 | lock.release() |
|
225 | 225 | finally: |
|
226 | 226 | if locallock is not None: |
|
227 | 227 | locallock.release() |
|
228 | 228 | |
|
229 | 229 | return pushop |
|
230 | 230 | |
|
231 | 231 | # list of steps to perform discovery before push |
|
232 | 232 | pushdiscoveryorder = [] |
|
233 | 233 | |
|
234 | 234 | # Mapping between step name and function |
|
235 | 235 | # |
|
236 | 236 | # This exists to help extensions wrap steps if necessary |
|
237 | 237 | pushdiscoverymapping = {} |
|
238 | 238 | |
|
239 | 239 | def pushdiscovery(stepname): |
|
240 | 240 | """decorator for function performing discovery before push |
|
241 | 241 | |
|
242 | 242 | The function is added to the step -> function mapping and appended to the |
|
243 | 243 | list of steps. Beware that decorated function will be added in order (this |
|
244 | 244 | may matter). |
|
245 | 245 | |
|
246 | 246 | You can only use this decorator for a new step, if you want to wrap a step |
|
247 | 247 | from an extension, change the pushdiscovery dictionary directly.""" |
|
248 | 248 | def dec(func): |
|
249 | 249 | assert stepname not in pushdiscoverymapping |
|
250 | 250 | pushdiscoverymapping[stepname] = func |
|
251 | 251 | pushdiscoveryorder.append(stepname) |
|
252 | 252 | return func |
|
253 | 253 | return dec |
|
254 | 254 | |
|
255 | 255 | def _pushdiscovery(pushop): |
|
256 | 256 | """Run all discovery steps""" |
|
257 | 257 | for stepname in pushdiscoveryorder: |
|
258 | 258 | step = pushdiscoverymapping[stepname] |
|
259 | 259 | step(pushop) |
|
260 | 260 | |
|
261 | 261 | @pushdiscovery('changeset') |
|
262 | 262 | def _pushdiscoverychangeset(pushop): |
|
263 | 263 | """discover the changeset that need to be pushed""" |
|
264 | 264 | unfi = pushop.repo.unfiltered() |
|
265 | 265 | fci = discovery.findcommonincoming |
|
266 | 266 | commoninc = fci(unfi, pushop.remote, force=pushop.force) |
|
267 | 267 | common, inc, remoteheads = commoninc |
|
268 | 268 | fco = discovery.findcommonoutgoing |
|
269 | 269 | outgoing = fco(unfi, pushop.remote, onlyheads=pushop.revs, |
|
270 | 270 | commoninc=commoninc, force=pushop.force) |
|
271 | 271 | pushop.outgoing = outgoing |
|
272 | 272 | pushop.remoteheads = remoteheads |
|
273 | 273 | pushop.incoming = inc |
|
274 | 274 | |
|
275 | 275 | @pushdiscovery('phase') |
|
276 | 276 | def _pushdiscoveryphase(pushop): |
|
277 | 277 | """discover the phase that needs to be pushed |
|
278 | 278 | |
|
279 | 279 | (computed for both success and failure case for changesets push)""" |
|
280 | 280 | outgoing = pushop.outgoing |
|
281 | 281 | unfi = pushop.repo.unfiltered() |
|
282 | 282 | remotephases = pushop.remote.listkeys('phases') |
|
283 | 283 | publishing = remotephases.get('publishing', False) |
|
284 | 284 | ana = phases.analyzeremotephases(pushop.repo, |
|
285 | 285 | pushop.fallbackheads, |
|
286 | 286 | remotephases) |
|
287 | 287 | pheads, droots = ana |
|
288 | 288 | extracond = '' |
|
289 | 289 | if not publishing: |
|
290 | 290 | extracond = ' and public()' |
|
291 | 291 | revset = 'heads((%%ln::%%ln) %s)' % extracond |
|
292 | 292 | # Get the list of all revs draft on remote by public here. |
|
293 | 293 | # XXX Beware that revset break if droots is not strictly |
|
294 | 294 | # XXX root we may want to ensure it is but it is costly |
|
295 | 295 | fallback = list(unfi.set(revset, droots, pushop.fallbackheads)) |
|
296 | 296 | if not outgoing.missing: |
|
297 | 297 | future = fallback |
|
298 | 298 | else: |
|
299 | 299 | # adds changeset we are going to push as draft |
|
300 | 300 | # |
|
301 | 301 | # should not be necessary for pushblishing server, but because of an |
|
302 | 302 | # issue fixed in xxxxx we have to do it anyway. |
|
303 | 303 | fdroots = list(unfi.set('roots(%ln + %ln::)', |
|
304 | 304 | outgoing.missing, droots)) |
|
305 | 305 | fdroots = [f.node() for f in fdroots] |
|
306 | 306 | future = list(unfi.set(revset, fdroots, pushop.futureheads)) |
|
307 | 307 | pushop.outdatedphases = future |
|
308 | 308 | pushop.fallbackoutdatedphases = fallback |
|
309 | 309 | |
|
310 | 310 | @pushdiscovery('obsmarker') |
|
311 | 311 | def _pushdiscoveryobsmarkers(pushop): |
|
312 | 312 | if (obsolete.isenabled(pushop.repo, obsolete.exchangeopt) |
|
313 | 313 | and pushop.repo.obsstore |
|
314 | 314 | and 'obsolete' in pushop.remote.listkeys('namespaces')): |
|
315 | 315 | repo = pushop.repo |
|
316 | 316 | # very naive computation, that can be quite expensive on big repo. |
|
317 | 317 | # However: evolution is currently slow on them anyway. |
|
318 | 318 | nodes = (c.node() for c in repo.set('::%ln', pushop.futureheads)) |
|
319 | 319 | pushop.outobsmarkers = pushop.repo.obsstore.relevantmarkers(nodes) |
|
320 | 320 | |
|
321 | 321 | @pushdiscovery('bookmarks') |
|
322 | 322 | def _pushdiscoverybookmarks(pushop): |
|
323 | 323 | ui = pushop.ui |
|
324 | 324 | repo = pushop.repo.unfiltered() |
|
325 | 325 | remote = pushop.remote |
|
326 | 326 | ui.debug("checking for updated bookmarks\n") |
|
327 | 327 | ancestors = () |
|
328 | 328 | if pushop.revs: |
|
329 | 329 | revnums = map(repo.changelog.rev, pushop.revs) |
|
330 | 330 | ancestors = repo.changelog.ancestors(revnums, inclusive=True) |
|
331 | 331 | remotebookmark = remote.listkeys('bookmarks') |
|
332 | 332 | |
|
333 | 333 | explicit = set(pushop.bookmarks) |
|
334 | 334 | |
|
335 | 335 | comp = bookmod.compare(repo, repo._bookmarks, remotebookmark, srchex=hex) |
|
336 | 336 | addsrc, adddst, advsrc, advdst, diverge, differ, invalid = comp |
|
337 | 337 | for b, scid, dcid in advsrc: |
|
338 | 338 | if b in explicit: |
|
339 | 339 | explicit.remove(b) |
|
340 | 340 | if not ancestors or repo[scid].rev() in ancestors: |
|
341 | 341 | pushop.outbookmarks.append((b, dcid, scid)) |
|
342 | 342 | # search added bookmark |
|
343 | 343 | for b, scid, dcid in addsrc: |
|
344 | 344 | if b in explicit: |
|
345 | 345 | explicit.remove(b) |
|
346 | 346 | pushop.outbookmarks.append((b, '', scid)) |
|
347 | 347 | # search for overwritten bookmark |
|
348 | 348 | for b, scid, dcid in advdst + diverge + differ: |
|
349 | 349 | if b in explicit: |
|
350 | 350 | explicit.remove(b) |
|
351 | 351 | pushop.outbookmarks.append((b, dcid, scid)) |
|
352 | 352 | # search for bookmark to delete |
|
353 | 353 | for b, scid, dcid in adddst: |
|
354 | 354 | if b in explicit: |
|
355 | 355 | explicit.remove(b) |
|
356 | 356 | # treat as "deleted locally" |
|
357 | 357 | pushop.outbookmarks.append((b, dcid, '')) |
|
358 | 358 | |
|
359 | 359 | if explicit: |
|
360 | 360 | explicit = sorted(explicit) |
|
361 | 361 | # we should probably list all of them |
|
362 | 362 | ui.warn(_('bookmark %s does not exist on the local ' |
|
363 | 363 | 'or remote repository!\n') % explicit[0]) |
|
364 | 364 | pushop.bkresult = 2 |
|
365 | 365 | |
|
366 | 366 | pushop.outbookmarks.sort() |
|
367 | 367 | |
|
368 | 368 | def _pushcheckoutgoing(pushop): |
|
369 | 369 | outgoing = pushop.outgoing |
|
370 | 370 | unfi = pushop.repo.unfiltered() |
|
371 | 371 | if not outgoing.missing: |
|
372 | 372 | # nothing to push |
|
373 | 373 | scmutil.nochangesfound(unfi.ui, unfi, outgoing.excluded) |
|
374 | 374 | return False |
|
375 | 375 | # something to push |
|
376 | 376 | if not pushop.force: |
|
377 | 377 | # if repo.obsstore == False --> no obsolete |
|
378 | 378 | # then, save the iteration |
|
379 | 379 | if unfi.obsstore: |
|
380 | 380 | # this message are here for 80 char limit reason |
|
381 | 381 | mso = _("push includes obsolete changeset: %s!") |
|
382 | 382 | mst = {"unstable": _("push includes unstable changeset: %s!"), |
|
383 | 383 | "bumped": _("push includes bumped changeset: %s!"), |
|
384 | 384 | "divergent": _("push includes divergent changeset: %s!")} |
|
385 | 385 | # If we are to push if there is at least one |
|
386 | 386 | # obsolete or unstable changeset in missing, at |
|
387 | 387 | # least one of the missinghead will be obsolete or |
|
388 | 388 | # unstable. So checking heads only is ok |
|
389 | 389 | for node in outgoing.missingheads: |
|
390 | 390 | ctx = unfi[node] |
|
391 | 391 | if ctx.obsolete(): |
|
392 | 392 | raise util.Abort(mso % ctx) |
|
393 | 393 | elif ctx.troubled(): |
|
394 | 394 | raise util.Abort(mst[ctx.troubles()[0]] % ctx) |
|
395 | 395 | newbm = pushop.ui.configlist('bookmarks', 'pushing') |
|
396 | 396 | discovery.checkheads(unfi, pushop.remote, outgoing, |
|
397 | 397 | pushop.remoteheads, |
|
398 | 398 | pushop.newbranch, |
|
399 | 399 | bool(pushop.incoming), |
|
400 | 400 | newbm) |
|
401 | 401 | return True |
|
402 | 402 | |
|
403 | 403 | # List of names of steps to perform for an outgoing bundle2, order matters. |
|
404 | 404 | b2partsgenorder = [] |
|
405 | 405 | |
|
406 | 406 | # Mapping between step name and function |
|
407 | 407 | # |
|
408 | 408 | # This exists to help extensions wrap steps if necessary |
|
409 | 409 | b2partsgenmapping = {} |
|
410 | 410 | |
|
411 | 411 | def b2partsgenerator(stepname): |
|
412 | 412 | """decorator for function generating bundle2 part |
|
413 | 413 | |
|
414 | 414 | The function is added to the step -> function mapping and appended to the |
|
415 | 415 | list of steps. Beware that decorated functions will be added in order |
|
416 | 416 | (this may matter). |
|
417 | 417 | |
|
418 | 418 | You can only use this decorator for new steps, if you want to wrap a step |
|
419 | 419 | from an extension, attack the b2partsgenmapping dictionary directly.""" |
|
420 | 420 | def dec(func): |
|
421 | 421 | assert stepname not in b2partsgenmapping |
|
422 | 422 | b2partsgenmapping[stepname] = func |
|
423 | 423 | b2partsgenorder.append(stepname) |
|
424 | 424 | return func |
|
425 | 425 | return dec |
|
426 | 426 | |
|
427 | 427 | @b2partsgenerator('changeset') |
|
428 | 428 | def _pushb2ctx(pushop, bundler): |
|
429 | 429 | """handle changegroup push through bundle2 |
|
430 | 430 | |
|
431 | 431 | addchangegroup result is stored in the ``pushop.cgresult`` attribute. |
|
432 | 432 | """ |
|
433 | 433 | if 'changesets' in pushop.stepsdone: |
|
434 | 434 | return |
|
435 | 435 | pushop.stepsdone.add('changesets') |
|
436 | 436 | # Send known heads to the server for race detection. |
|
437 | 437 | if not _pushcheckoutgoing(pushop): |
|
438 | 438 | return |
|
439 | 439 | pushop.repo.prepushoutgoinghooks(pushop.repo, |
|
440 | 440 | pushop.remote, |
|
441 | 441 | pushop.outgoing) |
|
442 | 442 | if not pushop.force: |
|
443 | 443 | bundler.newpart('B2X:CHECK:HEADS', data=iter(pushop.remoteheads)) |
|
444 | 444 | cg = changegroup.getlocalchangegroup(pushop.repo, 'push', pushop.outgoing) |
|
445 | 445 | cgpart = bundler.newpart('B2X:CHANGEGROUP', data=cg.getchunks()) |
|
446 | 446 | def handlereply(op): |
|
447 | 447 | """extract addchangroup returns from server reply""" |
|
448 | 448 | cgreplies = op.records.getreplies(cgpart.id) |
|
449 | 449 | assert len(cgreplies['changegroup']) == 1 |
|
450 | 450 | pushop.cgresult = cgreplies['changegroup'][0]['return'] |
|
451 | 451 | return handlereply |
|
452 | 452 | |
|
453 | 453 | @b2partsgenerator('phase') |
|
454 | 454 | def _pushb2phases(pushop, bundler): |
|
455 | 455 | """handle phase push through bundle2""" |
|
456 | 456 | if 'phases' in pushop.stepsdone: |
|
457 | 457 | return |
|
458 | 458 | b2caps = bundle2.bundle2caps(pushop.remote) |
|
459 | 459 | if not 'b2x:pushkey' in b2caps: |
|
460 | 460 | return |
|
461 | 461 | pushop.stepsdone.add('phases') |
|
462 | 462 | part2node = [] |
|
463 | 463 | enc = pushkey.encode |
|
464 | 464 | for newremotehead in pushop.outdatedphases: |
|
465 | 465 | part = bundler.newpart('b2x:pushkey') |
|
466 | 466 | part.addparam('namespace', enc('phases')) |
|
467 | 467 | part.addparam('key', enc(newremotehead.hex())) |
|
468 | 468 | part.addparam('old', enc(str(phases.draft))) |
|
469 | 469 | part.addparam('new', enc(str(phases.public))) |
|
470 | 470 | part2node.append((part.id, newremotehead)) |
|
471 | 471 | def handlereply(op): |
|
472 | 472 | for partid, node in part2node: |
|
473 | 473 | partrep = op.records.getreplies(partid) |
|
474 | 474 | results = partrep['pushkey'] |
|
475 | 475 | assert len(results) <= 1 |
|
476 | 476 | msg = None |
|
477 | 477 | if not results: |
|
478 | 478 | msg = _('server ignored update of %s to public!\n') % node |
|
479 | 479 | elif not int(results[0]['return']): |
|
480 | 480 | msg = _('updating %s to public failed!\n') % node |
|
481 | 481 | if msg is not None: |
|
482 | 482 | pushop.ui.warn(msg) |
|
483 | 483 | return handlereply |
|
484 | 484 | |
|
485 | 485 | @b2partsgenerator('obsmarkers') |
|
486 | 486 | def _pushb2obsmarkers(pushop, bundler): |
|
487 | 487 | if 'obsmarkers' in pushop.stepsdone: |
|
488 | 488 | return |
|
489 | 489 | remoteversions = bundle2.obsmarkersversion(bundler.capabilities) |
|
490 | 490 | if obsolete.commonversion(remoteversions) is None: |
|
491 | 491 | return |
|
492 | 492 | pushop.stepsdone.add('obsmarkers') |
|
493 | 493 | if pushop.outobsmarkers: |
|
494 | 494 | buildobsmarkerspart(bundler, pushop.outobsmarkers) |
|
495 | 495 | |
|
496 | 496 | @b2partsgenerator('bookmarks') |
|
497 | 497 | def _pushb2bookmarks(pushop, bundler): |
|
498 | 498 | """handle phase push through bundle2""" |
|
499 | 499 | if 'bookmarks' in pushop.stepsdone: |
|
500 | 500 | return |
|
501 | 501 | b2caps = bundle2.bundle2caps(pushop.remote) |
|
502 | 502 | if 'b2x:pushkey' not in b2caps: |
|
503 | 503 | return |
|
504 | 504 | pushop.stepsdone.add('bookmarks') |
|
505 | 505 | part2book = [] |
|
506 | 506 | enc = pushkey.encode |
|
507 | 507 | for book, old, new in pushop.outbookmarks: |
|
508 | 508 | part = bundler.newpart('b2x:pushkey') |
|
509 | 509 | part.addparam('namespace', enc('bookmarks')) |
|
510 | 510 | part.addparam('key', enc(book)) |
|
511 | 511 | part.addparam('old', enc(old)) |
|
512 | 512 | part.addparam('new', enc(new)) |
|
513 | 513 | action = 'update' |
|
514 | 514 | if not old: |
|
515 | 515 | action = 'export' |
|
516 | 516 | elif not new: |
|
517 | 517 | action = 'delete' |
|
518 | 518 | part2book.append((part.id, book, action)) |
|
519 | 519 | |
|
520 | 520 | |
|
521 | 521 | def handlereply(op): |
|
522 | 522 | ui = pushop.ui |
|
523 | 523 | for partid, book, action in part2book: |
|
524 | 524 | partrep = op.records.getreplies(partid) |
|
525 | 525 | results = partrep['pushkey'] |
|
526 | 526 | assert len(results) <= 1 |
|
527 | 527 | if not results: |
|
528 | 528 | pushop.ui.warn(_('server ignored bookmark %s update\n') % book) |
|
529 | 529 | else: |
|
530 | 530 | ret = int(results[0]['return']) |
|
531 | 531 | if ret: |
|
532 | 532 | ui.status(bookmsgmap[action][0] % book) |
|
533 | 533 | else: |
|
534 | 534 | ui.warn(bookmsgmap[action][1] % book) |
|
535 | 535 | if pushop.bkresult is not None: |
|
536 | 536 | pushop.bkresult = 1 |
|
537 | 537 | return handlereply |
|
538 | 538 | |
|
539 | 539 | |
|
540 | 540 | def _pushbundle2(pushop): |
|
541 | 541 | """push data to the remote using bundle2 |
|
542 | 542 | |
|
543 | 543 | The only currently supported type of data is changegroup but this will |
|
544 | 544 | evolve in the future.""" |
|
545 | 545 | bundler = bundle2.bundle20(pushop.ui, bundle2.bundle2caps(pushop.remote)) |
|
546 | 546 | # create reply capability |
|
547 | 547 | capsblob = bundle2.encodecaps(bundle2.getrepocaps(pushop.repo)) |
|
548 | 548 | bundler.newpart('b2x:replycaps', data=capsblob) |
|
549 | 549 | replyhandlers = [] |
|
550 | 550 | for partgenname in b2partsgenorder: |
|
551 | 551 | partgen = b2partsgenmapping[partgenname] |
|
552 | 552 | ret = partgen(pushop, bundler) |
|
553 | 553 | if callable(ret): |
|
554 | 554 | replyhandlers.append(ret) |
|
555 | 555 | # do not push if nothing to push |
|
556 | 556 | if bundler.nbparts <= 1: |
|
557 | 557 | return |
|
558 | 558 | stream = util.chunkbuffer(bundler.getchunks()) |
|
559 | 559 | try: |
|
560 | 560 | reply = pushop.remote.unbundle(stream, ['force'], 'push') |
|
561 | 561 | except error.BundleValueError, exc: |
|
562 | 562 | raise util.Abort('missing support for %s' % exc) |
|
563 | 563 | try: |
|
564 | 564 | op = bundle2.processbundle(pushop.repo, reply) |
|
565 | 565 | except error.BundleValueError, exc: |
|
566 | 566 | raise util.Abort('missing support for %s' % exc) |
|
567 | 567 | for rephand in replyhandlers: |
|
568 | 568 | rephand(op) |
|
569 | 569 | |
|
570 | 570 | def _pushchangeset(pushop): |
|
571 | 571 | """Make the actual push of changeset bundle to remote repo""" |
|
572 | 572 | if 'changesets' in pushop.stepsdone: |
|
573 | 573 | return |
|
574 | 574 | pushop.stepsdone.add('changesets') |
|
575 | 575 | if not _pushcheckoutgoing(pushop): |
|
576 | 576 | return |
|
577 | 577 | pushop.repo.prepushoutgoinghooks(pushop.repo, |
|
578 | 578 | pushop.remote, |
|
579 | 579 | pushop.outgoing) |
|
580 | 580 | outgoing = pushop.outgoing |
|
581 | 581 | unbundle = pushop.remote.capable('unbundle') |
|
582 | 582 | # TODO: get bundlecaps from remote |
|
583 | 583 | bundlecaps = None |
|
584 | 584 | # create a changegroup from local |
|
585 | 585 | if pushop.revs is None and not (outgoing.excluded |
|
586 | 586 | or pushop.repo.changelog.filteredrevs): |
|
587 | 587 | # push everything, |
|
588 | 588 | # use the fast path, no race possible on push |
|
589 | 589 | bundler = changegroup.cg1packer(pushop.repo, bundlecaps) |
|
590 | 590 | cg = changegroup.getsubset(pushop.repo, |
|
591 | 591 | outgoing, |
|
592 | 592 | bundler, |
|
593 | 593 | 'push', |
|
594 | 594 | fastpath=True) |
|
595 | 595 | else: |
|
596 | 596 | cg = changegroup.getlocalchangegroup(pushop.repo, 'push', outgoing, |
|
597 | 597 | bundlecaps) |
|
598 | 598 | |
|
599 | 599 | # apply changegroup to remote |
|
600 | 600 | if unbundle: |
|
601 | 601 | # local repo finds heads on server, finds out what |
|
602 | 602 | # revs it must push. once revs transferred, if server |
|
603 | 603 | # finds it has different heads (someone else won |
|
604 | 604 | # commit/push race), server aborts. |
|
605 | 605 | if pushop.force: |
|
606 | 606 | remoteheads = ['force'] |
|
607 | 607 | else: |
|
608 | 608 | remoteheads = pushop.remoteheads |
|
609 | 609 | # ssh: return remote's addchangegroup() |
|
610 | 610 | # http: return remote's addchangegroup() or 0 for error |
|
611 | 611 | pushop.cgresult = pushop.remote.unbundle(cg, remoteheads, |
|
612 | 612 | pushop.repo.url()) |
|
613 | 613 | else: |
|
614 | 614 | # we return an integer indicating remote head count |
|
615 | 615 | # change |
|
616 | 616 | pushop.cgresult = pushop.remote.addchangegroup(cg, 'push', |
|
617 | 617 | pushop.repo.url()) |
|
618 | 618 | |
|
619 | 619 | def _pushsyncphase(pushop): |
|
620 | 620 | """synchronise phase information locally and remotely""" |
|
621 | 621 | cheads = pushop.commonheads |
|
622 | 622 | # even when we don't push, exchanging phase data is useful |
|
623 | 623 | remotephases = pushop.remote.listkeys('phases') |
|
624 | 624 | if (pushop.ui.configbool('ui', '_usedassubrepo', False) |
|
625 | 625 | and remotephases # server supports phases |
|
626 | 626 | and pushop.cgresult is None # nothing was pushed |
|
627 | 627 | and remotephases.get('publishing', False)): |
|
628 | 628 | # When: |
|
629 | 629 | # - this is a subrepo push |
|
630 | 630 | # - and remote support phase |
|
631 | 631 | # - and no changeset was pushed |
|
632 | 632 | # - and remote is publishing |
|
633 | 633 | # We may be in issue 3871 case! |
|
634 | 634 | # We drop the possible phase synchronisation done by |
|
635 | 635 | # courtesy to publish changesets possibly locally draft |
|
636 | 636 | # on the remote. |
|
637 | 637 | remotephases = {'publishing': 'True'} |
|
638 | 638 | if not remotephases: # old server or public only reply from non-publishing |
|
639 | 639 | _localphasemove(pushop, cheads) |
|
640 | 640 | # don't push any phase data as there is nothing to push |
|
641 | 641 | else: |
|
642 | 642 | ana = phases.analyzeremotephases(pushop.repo, cheads, |
|
643 | 643 | remotephases) |
|
644 | 644 | pheads, droots = ana |
|
645 | 645 | ### Apply remote phase on local |
|
646 | 646 | if remotephases.get('publishing', False): |
|
647 | 647 | _localphasemove(pushop, cheads) |
|
648 | 648 | else: # publish = False |
|
649 | 649 | _localphasemove(pushop, pheads) |
|
650 | 650 | _localphasemove(pushop, cheads, phases.draft) |
|
651 | 651 | ### Apply local phase on remote |
|
652 | 652 | |
|
653 | 653 | if pushop.cgresult: |
|
654 | 654 | if 'phases' in pushop.stepsdone: |
|
655 | 655 | # phases already pushed though bundle2 |
|
656 | 656 | return |
|
657 | 657 | outdated = pushop.outdatedphases |
|
658 | 658 | else: |
|
659 | 659 | outdated = pushop.fallbackoutdatedphases |
|
660 | 660 | |
|
661 | 661 | pushop.stepsdone.add('phases') |
|
662 | 662 | |
|
663 | 663 | # filter heads already turned public by the push |
|
664 | 664 | outdated = [c for c in outdated if c.node() not in pheads] |
|
665 | 665 | b2caps = bundle2.bundle2caps(pushop.remote) |
|
666 | 666 | if 'b2x:pushkey' in b2caps: |
|
667 | 667 | # server supports bundle2, let's do a batched push through it |
|
668 | 668 | # |
|
669 | 669 | # This will eventually be unified with the changesets bundle2 push |
|
670 | 670 | bundler = bundle2.bundle20(pushop.ui, b2caps) |
|
671 | 671 | capsblob = bundle2.encodecaps(bundle2.getrepocaps(pushop.repo)) |
|
672 | 672 | bundler.newpart('b2x:replycaps', data=capsblob) |
|
673 | 673 | part2node = [] |
|
674 | 674 | enc = pushkey.encode |
|
675 | 675 | for newremotehead in outdated: |
|
676 | 676 | part = bundler.newpart('b2x:pushkey') |
|
677 | 677 | part.addparam('namespace', enc('phases')) |
|
678 | 678 | part.addparam('key', enc(newremotehead.hex())) |
|
679 | 679 | part.addparam('old', enc(str(phases.draft))) |
|
680 | 680 | part.addparam('new', enc(str(phases.public))) |
|
681 | 681 | part2node.append((part.id, newremotehead)) |
|
682 | 682 | stream = util.chunkbuffer(bundler.getchunks()) |
|
683 | 683 | try: |
|
684 | 684 | reply = pushop.remote.unbundle(stream, ['force'], 'push') |
|
685 | 685 | op = bundle2.processbundle(pushop.repo, reply) |
|
686 | 686 | except error.BundleValueError, exc: |
|
687 | 687 | raise util.Abort('missing support for %s' % exc) |
|
688 | 688 | for partid, node in part2node: |
|
689 | 689 | partrep = op.records.getreplies(partid) |
|
690 | 690 | results = partrep['pushkey'] |
|
691 | 691 | assert len(results) <= 1 |
|
692 | 692 | msg = None |
|
693 | 693 | if not results: |
|
694 | 694 | msg = _('server ignored update of %s to public!\n') % node |
|
695 | 695 | elif not int(results[0]['return']): |
|
696 | 696 | msg = _('updating %s to public failed!\n') % node |
|
697 | 697 | if msg is not None: |
|
698 | 698 | pushop.ui.warn(msg) |
|
699 | 699 | |
|
700 | 700 | else: |
|
701 | 701 | # fallback to independant pushkey command |
|
702 | 702 | for newremotehead in outdated: |
|
703 | 703 | r = pushop.remote.pushkey('phases', |
|
704 | 704 | newremotehead.hex(), |
|
705 | 705 | str(phases.draft), |
|
706 | 706 | str(phases.public)) |
|
707 | 707 | if not r: |
|
708 | 708 | pushop.ui.warn(_('updating %s to public failed!\n') |
|
709 | 709 | % newremotehead) |
|
710 | 710 | |
|
711 | 711 | def _localphasemove(pushop, nodes, phase=phases.public): |
|
712 | 712 | """move <nodes> to <phase> in the local source repo""" |
|
713 | 713 | if pushop.locallocked: |
|
714 | 714 | tr = pushop.repo.transaction('push-phase-sync') |
|
715 | 715 | try: |
|
716 | 716 | phases.advanceboundary(pushop.repo, tr, phase, nodes) |
|
717 | 717 | tr.close() |
|
718 | 718 | finally: |
|
719 | 719 | tr.release() |
|
720 | 720 | else: |
|
721 | 721 | # repo is not locked, do not change any phases! |
|
722 | 722 | # Informs the user that phases should have been moved when |
|
723 | 723 | # applicable. |
|
724 | 724 | actualmoves = [n for n in nodes if phase < pushop.repo[n].phase()] |
|
725 | 725 | phasestr = phases.phasenames[phase] |
|
726 | 726 | if actualmoves: |
|
727 | 727 | pushop.ui.status(_('cannot lock source repo, skipping ' |
|
728 | 728 | 'local %s phase update\n') % phasestr) |
|
729 | 729 | |
|
730 | 730 | def _pushobsolete(pushop): |
|
731 | 731 | """utility function to push obsolete markers to a remote""" |
|
732 | 732 | if 'obsmarkers' in pushop.stepsdone: |
|
733 | 733 | return |
|
734 | 734 | pushop.ui.debug('try to push obsolete markers to remote\n') |
|
735 | 735 | repo = pushop.repo |
|
736 | 736 | remote = pushop.remote |
|
737 | 737 | pushop.stepsdone.add('obsmarkers') |
|
738 | 738 | if pushop.outobsmarkers: |
|
739 | 739 | rslts = [] |
|
740 | 740 | remotedata = obsolete._pushkeyescape(pushop.outobsmarkers) |
|
741 | 741 | for key in sorted(remotedata, reverse=True): |
|
742 | 742 | # reverse sort to ensure we end with dump0 |
|
743 | 743 | data = remotedata[key] |
|
744 | 744 | rslts.append(remote.pushkey('obsolete', key, '', data)) |
|
745 | 745 | if [r for r in rslts if not r]: |
|
746 | 746 | msg = _('failed to push some obsolete markers!\n') |
|
747 | 747 | repo.ui.warn(msg) |
|
748 | 748 | |
|
749 | 749 | def _pushbookmark(pushop): |
|
750 | 750 | """Update bookmark position on remote""" |
|
751 | 751 | if pushop.cgresult == 0 or 'bookmarks' in pushop.stepsdone: |
|
752 | 752 | return |
|
753 | 753 | pushop.stepsdone.add('bookmarks') |
|
754 | 754 | ui = pushop.ui |
|
755 | 755 | remote = pushop.remote |
|
756 | 756 | |
|
757 | 757 | for b, old, new in pushop.outbookmarks: |
|
758 | 758 | action = 'update' |
|
759 | 759 | if not old: |
|
760 | 760 | action = 'export' |
|
761 | 761 | elif not new: |
|
762 | 762 | action = 'delete' |
|
763 | 763 | if remote.pushkey('bookmarks', b, old, new): |
|
764 | 764 | ui.status(bookmsgmap[action][0] % b) |
|
765 | 765 | else: |
|
766 | 766 | ui.warn(bookmsgmap[action][1] % b) |
|
767 | 767 | # discovery can have set the value form invalid entry |
|
768 | 768 | if pushop.bkresult is not None: |
|
769 | 769 | pushop.bkresult = 1 |
|
770 | 770 | |
|
771 | 771 | class pulloperation(object): |
|
772 | 772 | """A object that represent a single pull operation |
|
773 | 773 | |
|
774 | 774 | It purpose is to carry push related state and very common operation. |
|
775 | 775 | |
|
776 | 776 | A new should be created at the beginning of each pull and discarded |
|
777 | 777 | afterward. |
|
778 | 778 | """ |
|
779 | 779 | |
|
780 | 780 | def __init__(self, repo, remote, heads=None, force=False, bookmarks=()): |
|
781 | 781 | # repo we pull into |
|
782 | 782 | self.repo = repo |
|
783 | 783 | # repo we pull from |
|
784 | 784 | self.remote = remote |
|
785 | 785 | # revision we try to pull (None is "all") |
|
786 | 786 | self.heads = heads |
|
787 | 787 | # bookmark pulled explicitly |
|
788 | 788 | self.explicitbookmarks = bookmarks |
|
789 | 789 | # do we force pull? |
|
790 | 790 | self.force = force |
|
791 | 791 | # the name the pull transaction |
|
792 | 792 | self._trname = 'pull\n' + util.hidepassword(remote.url()) |
|
793 | 793 | # hold the transaction once created |
|
794 | 794 | self._tr = None |
|
795 | 795 | # set of common changeset between local and remote before pull |
|
796 | 796 | self.common = None |
|
797 | 797 | # set of pulled head |
|
798 | 798 | self.rheads = None |
|
799 | 799 | # list of missing changeset to fetch remotely |
|
800 | 800 | self.fetch = None |
|
801 | 801 | # remote bookmarks data |
|
802 | 802 | self.remotebookmarks = None |
|
803 | 803 | # result of changegroup pulling (used as return code by pull) |
|
804 | 804 | self.cgresult = None |
|
805 | 805 | # list of step already done |
|
806 | 806 | self.stepsdone = set() |
|
807 | 807 | |
|
808 | 808 | @util.propertycache |
|
809 | 809 | def pulledsubset(self): |
|
810 | 810 | """heads of the set of changeset target by the pull""" |
|
811 | 811 | # compute target subset |
|
812 | 812 | if self.heads is None: |
|
813 | 813 | # We pulled every thing possible |
|
814 | 814 | # sync on everything common |
|
815 | 815 | c = set(self.common) |
|
816 | 816 | ret = list(self.common) |
|
817 | 817 | for n in self.rheads: |
|
818 | 818 | if n not in c: |
|
819 | 819 | ret.append(n) |
|
820 | 820 | return ret |
|
821 | 821 | else: |
|
822 | 822 | # We pulled a specific subset |
|
823 | 823 | # sync on this subset |
|
824 | 824 | return self.heads |
|
825 | 825 | |
|
826 | 826 | def gettransaction(self): |
|
827 | 827 | """get appropriate pull transaction, creating it if needed""" |
|
828 | 828 | if self._tr is None: |
|
829 | 829 | self._tr = self.repo.transaction(self._trname) |
|
830 | 830 | self._tr.hookargs['source'] = 'pull' |
|
831 | 831 | self._tr.hookargs['url'] = self.remote.url() |
|
832 | 832 | return self._tr |
|
833 | 833 | |
|
834 | 834 | def closetransaction(self): |
|
835 | 835 | """close transaction if created""" |
|
836 | 836 | if self._tr is not None: |
|
837 | 837 | repo = self.repo |
|
838 | 838 | cl = repo.unfiltered().changelog |
|
839 | 839 | p = cl.writepending() and repo.root or "" |
|
840 | 840 | p = cl.writepending() and repo.root or "" |
|
841 | 841 | repo.hook('b2x-pretransactionclose', throw=True, pending=p, |
|
842 | 842 | **self._tr.hookargs) |
|
843 | 843 | self._tr.close() |
|
844 | 844 | repo.hook('b2x-transactionclose', **self._tr.hookargs) |
|
845 | 845 | |
|
846 | 846 | def releasetransaction(self): |
|
847 | 847 | """release transaction if created""" |
|
848 | 848 | if self._tr is not None: |
|
849 | 849 | self._tr.release() |
|
850 | 850 | |
|
851 | 851 | def pull(repo, remote, heads=None, force=False, bookmarks=()): |
|
852 | 852 | pullop = pulloperation(repo, remote, heads, force, bookmarks=bookmarks) |
|
853 | 853 | if pullop.remote.local(): |
|
854 | 854 | missing = set(pullop.remote.requirements) - pullop.repo.supported |
|
855 | 855 | if missing: |
|
856 | 856 | msg = _("required features are not" |
|
857 | 857 | " supported in the destination:" |
|
858 | 858 | " %s") % (', '.join(sorted(missing))) |
|
859 | 859 | raise util.Abort(msg) |
|
860 | 860 | |
|
861 | 861 | pullop.remotebookmarks = remote.listkeys('bookmarks') |
|
862 | 862 | lock = pullop.repo.lock() |
|
863 | 863 | try: |
|
864 | 864 | _pulldiscovery(pullop) |
|
865 | 865 | if (pullop.repo.ui.configbool('experimental', 'bundle2-exp', False) |
|
866 | 866 | and pullop.remote.capable('bundle2-exp')): |
|
867 | 867 | _pullbundle2(pullop) |
|
868 | 868 | _pullchangeset(pullop) |
|
869 | 869 | _pullphase(pullop) |
|
870 | 870 | _pullbookmarks(pullop) |
|
871 | 871 | _pullobsolete(pullop) |
|
872 | 872 | pullop.closetransaction() |
|
873 | 873 | finally: |
|
874 | 874 | pullop.releasetransaction() |
|
875 | 875 | lock.release() |
|
876 | 876 | |
|
877 | 877 | return pullop |
|
878 | 878 | |
|
879 | 879 | # list of steps to perform discovery before pull |
|
880 | 880 | pulldiscoveryorder = [] |
|
881 | 881 | |
|
882 | 882 | # Mapping between step name and function |
|
883 | 883 | # |
|
884 | 884 | # This exists to help extensions wrap steps if necessary |
|
885 | 885 | pulldiscoverymapping = {} |
|
886 | 886 | |
|
887 | 887 | def pulldiscovery(stepname): |
|
888 | 888 | """decorator for function performing discovery before pull |
|
889 | 889 | |
|
890 | 890 | The function is added to the step -> function mapping and appended to the |
|
891 | 891 | list of steps. Beware that decorated function will be added in order (this |
|
892 | 892 | may matter). |
|
893 | 893 | |
|
894 | 894 | You can only use this decorator for a new step, if you want to wrap a step |
|
895 | 895 | from an extension, change the pulldiscovery dictionary directly.""" |
|
896 | 896 | def dec(func): |
|
897 | 897 | assert stepname not in pulldiscoverymapping |
|
898 | 898 | pulldiscoverymapping[stepname] = func |
|
899 | 899 | pulldiscoveryorder.append(stepname) |
|
900 | 900 | return func |
|
901 | 901 | return dec |
|
902 | 902 | |
|
903 | 903 | def _pulldiscovery(pullop): |
|
904 | 904 | """Run all discovery steps""" |
|
905 | 905 | for stepname in pulldiscoveryorder: |
|
906 | 906 | step = pulldiscoverymapping[stepname] |
|
907 | 907 | step(pullop) |
|
908 | 908 | |
|
909 | 909 | @pulldiscovery('changegroup') |
|
910 | 910 | def _pulldiscoverychangegroup(pullop): |
|
911 | 911 | """discovery phase for the pull |
|
912 | 912 | |
|
913 | 913 | Current handle changeset discovery only, will change handle all discovery |
|
914 | 914 | at some point.""" |
|
915 | 915 | tmp = discovery.findcommonincoming(pullop.repo.unfiltered(), |
|
916 | 916 | pullop.remote, |
|
917 | 917 | heads=pullop.heads, |
|
918 | 918 | force=pullop.force) |
|
919 | 919 | pullop.common, pullop.fetch, pullop.rheads = tmp |
|
920 | 920 | |
|
921 | 921 | def _pullbundle2(pullop): |
|
922 | 922 | """pull data using bundle2 |
|
923 | 923 | |
|
924 | 924 | For now, the only supported data are changegroup.""" |
|
925 | 925 | remotecaps = bundle2.bundle2caps(pullop.remote) |
|
926 | 926 | kwargs = {'bundlecaps': caps20to10(pullop.repo)} |
|
927 | 927 | # pulling changegroup |
|
928 | 928 | pullop.stepsdone.add('changegroup') |
|
929 | 929 | |
|
930 | 930 | kwargs['common'] = pullop.common |
|
931 | 931 | kwargs['heads'] = pullop.heads or pullop.rheads |
|
932 | 932 | kwargs['cg'] = pullop.fetch |
|
933 | 933 | if 'b2x:listkeys' in remotecaps: |
|
934 | 934 | kwargs['listkeys'] = ['phase', 'bookmarks'] |
|
935 | 935 | if not pullop.fetch: |
|
936 | 936 | pullop.repo.ui.status(_("no changes found\n")) |
|
937 | 937 | pullop.cgresult = 0 |
|
938 | 938 | else: |
|
939 | 939 | if pullop.heads is None and list(pullop.common) == [nullid]: |
|
940 | 940 | pullop.repo.ui.status(_("requesting all changes\n")) |
|
941 | 941 | if obsolete.isenabled(pullop.repo, obsolete.exchangeopt): |
|
942 | 942 | remoteversions = bundle2.obsmarkersversion(remotecaps) |
|
943 | 943 | if obsolete.commonversion(remoteversions) is not None: |
|
944 | 944 | kwargs['obsmarkers'] = True |
|
945 | 945 | pullop.stepsdone.add('obsmarkers') |
|
946 | 946 | _pullbundle2extraprepare(pullop, kwargs) |
|
947 | 947 | if kwargs.keys() == ['format']: |
|
948 | 948 | return # nothing to pull |
|
949 | 949 | bundle = pullop.remote.getbundle('pull', **kwargs) |
|
950 | 950 | try: |
|
951 | 951 | op = bundle2.processbundle(pullop.repo, bundle, pullop.gettransaction) |
|
952 | 952 | except error.BundleValueError, exc: |
|
953 | 953 | raise util.Abort('missing support for %s' % exc) |
|
954 | 954 | |
|
955 | 955 | if pullop.fetch: |
|
956 | 956 | changedheads = 0 |
|
957 | 957 | pullop.cgresult = 1 |
|
958 | 958 | for cg in op.records['changegroup']: |
|
959 | 959 | ret = cg['return'] |
|
960 | 960 | # If any changegroup result is 0, return 0 |
|
961 | 961 | if ret == 0: |
|
962 | 962 | pullop.cgresult = 0 |
|
963 | 963 | break |
|
964 | 964 | if ret < -1: |
|
965 | 965 | changedheads += ret + 1 |
|
966 | 966 | elif ret > 1: |
|
967 | 967 | changedheads += ret - 1 |
|
968 | 968 | if changedheads > 0: |
|
969 | 969 | pullop.cgresult = 1 + changedheads |
|
970 | 970 | elif changedheads < 0: |
|
971 | 971 | pullop.cgresult = -1 + changedheads |
|
972 | 972 | |
|
973 | 973 | # processing phases change |
|
974 | 974 | for namespace, value in op.records['listkeys']: |
|
975 | 975 | if namespace == 'phases': |
|
976 | 976 | _pullapplyphases(pullop, value) |
|
977 | 977 | |
|
978 | 978 | # processing bookmark update |
|
979 | 979 | for namespace, value in op.records['listkeys']: |
|
980 | 980 | if namespace == 'bookmarks': |
|
981 | 981 | pullop.remotebookmarks = value |
|
982 | 982 | _pullbookmarks(pullop) |
|
983 | 983 | |
|
984 | 984 | def _pullbundle2extraprepare(pullop, kwargs): |
|
985 | 985 | """hook function so that extensions can extend the getbundle call""" |
|
986 | 986 | pass |
|
987 | 987 | |
|
988 | 988 | def _pullchangeset(pullop): |
|
989 | 989 | """pull changeset from unbundle into the local repo""" |
|
990 | 990 | # We delay the open of the transaction as late as possible so we |
|
991 | 991 | # don't open transaction for nothing or you break future useful |
|
992 | 992 | # rollback call |
|
993 | 993 | if 'changegroup' in pullop.stepsdone: |
|
994 | 994 | return |
|
995 | 995 | pullop.stepsdone.add('changegroup') |
|
996 | 996 | if not pullop.fetch: |
|
997 | 997 | pullop.repo.ui.status(_("no changes found\n")) |
|
998 | 998 | pullop.cgresult = 0 |
|
999 | 999 | return |
|
1000 | 1000 | pullop.gettransaction() |
|
1001 | 1001 | if pullop.heads is None and list(pullop.common) == [nullid]: |
|
1002 | 1002 | pullop.repo.ui.status(_("requesting all changes\n")) |
|
1003 | 1003 | elif pullop.heads is None and pullop.remote.capable('changegroupsubset'): |
|
1004 | 1004 | # issue1320, avoid a race if remote changed after discovery |
|
1005 | 1005 | pullop.heads = pullop.rheads |
|
1006 | 1006 | |
|
1007 | 1007 | if pullop.remote.capable('getbundle'): |
|
1008 | 1008 | # TODO: get bundlecaps from remote |
|
1009 | 1009 | cg = pullop.remote.getbundle('pull', common=pullop.common, |
|
1010 | 1010 | heads=pullop.heads or pullop.rheads) |
|
1011 | 1011 | elif pullop.heads is None: |
|
1012 | 1012 | cg = pullop.remote.changegroup(pullop.fetch, 'pull') |
|
1013 | 1013 | elif not pullop.remote.capable('changegroupsubset'): |
|
1014 | 1014 | raise util.Abort(_("partial pull cannot be done because " |
|
1015 | 1015 | "other repository doesn't support " |
|
1016 | 1016 | "changegroupsubset.")) |
|
1017 | 1017 | else: |
|
1018 | 1018 | cg = pullop.remote.changegroupsubset(pullop.fetch, pullop.heads, 'pull') |
|
1019 | 1019 | pullop.cgresult = changegroup.addchangegroup(pullop.repo, cg, 'pull', |
|
1020 | 1020 | pullop.remote.url()) |
|
1021 | 1021 | |
|
1022 | 1022 | def _pullphase(pullop): |
|
1023 | 1023 | # Get remote phases data from remote |
|
1024 | 1024 | if 'phases' in pullop.stepsdone: |
|
1025 | 1025 | return |
|
1026 | 1026 | remotephases = pullop.remote.listkeys('phases') |
|
1027 | 1027 | _pullapplyphases(pullop, remotephases) |
|
1028 | 1028 | |
|
1029 | 1029 | def _pullapplyphases(pullop, remotephases): |
|
1030 | 1030 | """apply phase movement from observed remote state""" |
|
1031 | 1031 | if 'phases' in pullop.stepsdone: |
|
1032 | 1032 | return |
|
1033 | 1033 | pullop.stepsdone.add('phases') |
|
1034 | 1034 | publishing = bool(remotephases.get('publishing', False)) |
|
1035 | 1035 | if remotephases and not publishing: |
|
1036 | 1036 | # remote is new and unpublishing |
|
1037 | 1037 | pheads, _dr = phases.analyzeremotephases(pullop.repo, |
|
1038 | 1038 | pullop.pulledsubset, |
|
1039 | 1039 | remotephases) |
|
1040 | 1040 | dheads = pullop.pulledsubset |
|
1041 | 1041 | else: |
|
1042 | 1042 | # Remote is old or publishing all common changesets |
|
1043 | 1043 | # should be seen as public |
|
1044 | 1044 | pheads = pullop.pulledsubset |
|
1045 | 1045 | dheads = [] |
|
1046 | 1046 | unfi = pullop.repo.unfiltered() |
|
1047 | 1047 | phase = unfi._phasecache.phase |
|
1048 | 1048 | rev = unfi.changelog.nodemap.get |
|
1049 | 1049 | public = phases.public |
|
1050 | 1050 | draft = phases.draft |
|
1051 | 1051 | |
|
1052 | 1052 | # exclude changesets already public locally and update the others |
|
1053 | 1053 | pheads = [pn for pn in pheads if phase(unfi, rev(pn)) > public] |
|
1054 | 1054 | if pheads: |
|
1055 | 1055 | tr = pullop.gettransaction() |
|
1056 | 1056 | phases.advanceboundary(pullop.repo, tr, public, pheads) |
|
1057 | 1057 | |
|
1058 | 1058 | # exclude changesets already draft locally and update the others |
|
1059 | 1059 | dheads = [pn for pn in dheads if phase(unfi, rev(pn)) > draft] |
|
1060 | 1060 | if dheads: |
|
1061 | 1061 | tr = pullop.gettransaction() |
|
1062 | 1062 | phases.advanceboundary(pullop.repo, tr, draft, dheads) |
|
1063 | 1063 | |
|
1064 | 1064 | def _pullbookmarks(pullop): |
|
1065 | 1065 | """process the remote bookmark information to update the local one""" |
|
1066 | 1066 | if 'bookmarks' in pullop.stepsdone: |
|
1067 | 1067 | return |
|
1068 | 1068 | pullop.stepsdone.add('bookmarks') |
|
1069 | 1069 | repo = pullop.repo |
|
1070 | 1070 | remotebookmarks = pullop.remotebookmarks |
|
1071 | 1071 | bookmod.updatefromremote(repo.ui, repo, remotebookmarks, |
|
1072 | 1072 | pullop.remote.url(), |
|
1073 | 1073 | pullop.gettransaction, |
|
1074 | 1074 | explicit=pullop.explicitbookmarks) |
|
1075 | 1075 | |
|
1076 | 1076 | def _pullobsolete(pullop): |
|
1077 | 1077 | """utility function to pull obsolete markers from a remote |
|
1078 | 1078 | |
|
1079 | 1079 | The `gettransaction` is function that return the pull transaction, creating |
|
1080 | 1080 | one if necessary. We return the transaction to inform the calling code that |
|
1081 | 1081 | a new transaction have been created (when applicable). |
|
1082 | 1082 | |
|
1083 | 1083 | Exists mostly to allow overriding for experimentation purpose""" |
|
1084 | 1084 | if 'obsmarkers' in pullop.stepsdone: |
|
1085 | 1085 | return |
|
1086 | 1086 | pullop.stepsdone.add('obsmarkers') |
|
1087 | 1087 | tr = None |
|
1088 | 1088 | if obsolete.isenabled(pullop.repo, obsolete.exchangeopt): |
|
1089 | 1089 | pullop.repo.ui.debug('fetching remote obsolete markers\n') |
|
1090 | 1090 | remoteobs = pullop.remote.listkeys('obsolete') |
|
1091 | 1091 | if 'dump0' in remoteobs: |
|
1092 | 1092 | tr = pullop.gettransaction() |
|
1093 | 1093 | for key in sorted(remoteobs, reverse=True): |
|
1094 | 1094 | if key.startswith('dump'): |
|
1095 | 1095 | data = base85.b85decode(remoteobs[key]) |
|
1096 | 1096 | pullop.repo.obsstore.mergemarkers(tr, data) |
|
1097 | 1097 | pullop.repo.invalidatevolatilesets() |
|
1098 | 1098 | return tr |
|
1099 | 1099 | |
|
1100 | 1100 | def caps20to10(repo): |
|
1101 | 1101 | """return a set with appropriate options to use bundle20 during getbundle""" |
|
1102 | 1102 | caps = set(['HG2Y']) |
|
1103 | 1103 | capsblob = bundle2.encodecaps(bundle2.getrepocaps(repo)) |
|
1104 | 1104 | caps.add('bundle2=' + urllib.quote(capsblob)) |
|
1105 | 1105 | return caps |
|
1106 | 1106 | |
|
1107 | 1107 | # List of names of steps to perform for a bundle2 for getbundle, order matters. |
|
1108 | 1108 | getbundle2partsorder = [] |
|
1109 | 1109 | |
|
1110 | 1110 | # Mapping between step name and function |
|
1111 | 1111 | # |
|
1112 | 1112 | # This exists to help extensions wrap steps if necessary |
|
1113 | 1113 | getbundle2partsmapping = {} |
|
1114 | 1114 | |
|
1115 | 1115 | def getbundle2partsgenerator(stepname): |
|
1116 | 1116 | """decorator for function generating bundle2 part for getbundle |
|
1117 | 1117 | |
|
1118 | 1118 | The function is added to the step -> function mapping and appended to the |
|
1119 | 1119 | list of steps. Beware that decorated functions will be added in order |
|
1120 | 1120 | (this may matter). |
|
1121 | 1121 | |
|
1122 | 1122 | You can only use this decorator for new steps, if you want to wrap a step |
|
1123 | 1123 | from an extension, attack the getbundle2partsmapping dictionary directly.""" |
|
1124 | 1124 | def dec(func): |
|
1125 | 1125 | assert stepname not in getbundle2partsmapping |
|
1126 | 1126 | getbundle2partsmapping[stepname] = func |
|
1127 | 1127 | getbundle2partsorder.append(stepname) |
|
1128 | 1128 | return func |
|
1129 | 1129 | return dec |
|
1130 | 1130 | |
|
1131 | 1131 | def getbundle(repo, source, heads=None, common=None, bundlecaps=None, |
|
1132 | 1132 | **kwargs): |
|
1133 | 1133 | """return a full bundle (with potentially multiple kind of parts) |
|
1134 | 1134 | |
|
1135 | 1135 | Could be a bundle HG10 or a bundle HG2Y depending on bundlecaps |
|
1136 | 1136 | passed. For now, the bundle can contain only changegroup, but this will |
|
1137 | 1137 | changes when more part type will be available for bundle2. |
|
1138 | 1138 | |
|
1139 | 1139 | This is different from changegroup.getchangegroup that only returns an HG10 |
|
1140 | 1140 | changegroup bundle. They may eventually get reunited in the future when we |
|
1141 | 1141 | have a clearer idea of the API we what to query different data. |
|
1142 | 1142 | |
|
1143 | 1143 | The implementation is at a very early stage and will get massive rework |
|
1144 | 1144 | when the API of bundle is refined. |
|
1145 | 1145 | """ |
|
1146 | 1146 | # bundle10 case |
|
1147 | 1147 | if bundlecaps is None or 'HG2Y' not in bundlecaps: |
|
1148 | 1148 | if bundlecaps and not kwargs.get('cg', True): |
|
1149 | 1149 | raise ValueError(_('request for bundle10 must include changegroup')) |
|
1150 | 1150 | |
|
1151 | 1151 | if kwargs: |
|
1152 | 1152 | raise ValueError(_('unsupported getbundle arguments: %s') |
|
1153 | 1153 | % ', '.join(sorted(kwargs.keys()))) |
|
1154 | 1154 | return changegroup.getchangegroup(repo, source, heads=heads, |
|
1155 | 1155 | common=common, bundlecaps=bundlecaps) |
|
1156 | 1156 | |
|
1157 | 1157 | # bundle20 case |
|
1158 | 1158 | b2caps = {} |
|
1159 | 1159 | for bcaps in bundlecaps: |
|
1160 | 1160 | if bcaps.startswith('bundle2='): |
|
1161 | 1161 | blob = urllib.unquote(bcaps[len('bundle2='):]) |
|
1162 | 1162 | b2caps.update(bundle2.decodecaps(blob)) |
|
1163 | 1163 | bundler = bundle2.bundle20(repo.ui, b2caps) |
|
1164 | 1164 | |
|
1165 | 1165 | for name in getbundle2partsorder: |
|
1166 | 1166 | func = getbundle2partsmapping[name] |
|
1167 | 1167 | kwargs['heads'] = heads |
|
1168 | 1168 | kwargs['common'] = common |
|
1169 | 1169 | func(bundler, repo, source, bundlecaps=bundlecaps, b2caps=b2caps, |
|
1170 | 1170 | **kwargs) |
|
1171 | 1171 | |
|
1172 | 1172 | return util.chunkbuffer(bundler.getchunks()) |
|
1173 | 1173 | |
|
1174 | 1174 | @getbundle2partsgenerator('changegroup') |
|
1175 | 1175 | def _getbundlechangegrouppart(bundler, repo, source, bundlecaps=None, |
|
1176 | 1176 | b2caps=None, heads=None, common=None, **kwargs): |
|
1177 | 1177 | """add a changegroup part to the requested bundle""" |
|
1178 | 1178 | cg = None |
|
1179 | 1179 | if kwargs.get('cg', True): |
|
1180 | 1180 | # build changegroup bundle here. |
|
1181 | 1181 | cg = changegroup.getchangegroup(repo, source, heads=heads, |
|
1182 | 1182 | common=common, bundlecaps=bundlecaps) |
|
1183 | 1183 | |
|
1184 | 1184 | if cg: |
|
1185 | 1185 | bundler.newpart('b2x:changegroup', data=cg.getchunks()) |
|
1186 | 1186 | |
|
1187 | 1187 | @getbundle2partsgenerator('listkeys') |
|
1188 | 1188 | def _getbundlelistkeysparts(bundler, repo, source, bundlecaps=None, |
|
1189 | 1189 | b2caps=None, **kwargs): |
|
1190 | 1190 | """add parts containing listkeys namespaces to the requested bundle""" |
|
1191 | 1191 | listkeys = kwargs.get('listkeys', ()) |
|
1192 | 1192 | for namespace in listkeys: |
|
1193 | 1193 | part = bundler.newpart('b2x:listkeys') |
|
1194 | 1194 | part.addparam('namespace', namespace) |
|
1195 | 1195 | keys = repo.listkeys(namespace).items() |
|
1196 | 1196 | part.data = pushkey.encodekeys(keys) |
|
1197 | 1197 | |
|
1198 | 1198 | @getbundle2partsgenerator('obsmarkers') |
|
1199 | 1199 | def _getbundleobsmarkerpart(bundler, repo, source, bundlecaps=None, |
|
1200 | 1200 | b2caps=None, heads=None, **kwargs): |
|
1201 | 1201 | """add an obsolescence markers part to the requested bundle""" |
|
1202 | 1202 | if kwargs.get('obsmarkers', False): |
|
1203 | 1203 | if heads is None: |
|
1204 | 1204 | heads = repo.heads() |
|
1205 | 1205 | subset = [c.node() for c in repo.set('::%ln', heads)] |
|
1206 | 1206 | markers = repo.obsstore.relevantmarkers(subset) |
|
1207 | 1207 | buildobsmarkerspart(bundler, markers) |
|
1208 | 1208 | |
|
1209 | @getbundle2partsgenerator('extra') | |
|
1210 | def _getbundleextrapart(bundler, repo, source, bundlecaps=None, | |
|
1211 | b2caps=None, **kwargs): | |
|
1212 | """hook function to let extensions add parts to the requested bundle""" | |
|
1213 | pass | |
|
1214 | ||
|
1215 | 1209 | def check_heads(repo, their_heads, context): |
|
1216 | 1210 | """check if the heads of a repo have been modified |
|
1217 | 1211 | |
|
1218 | 1212 | Used by peer for unbundling. |
|
1219 | 1213 | """ |
|
1220 | 1214 | heads = repo.heads() |
|
1221 | 1215 | heads_hash = util.sha1(''.join(sorted(heads))).digest() |
|
1222 | 1216 | if not (their_heads == ['force'] or their_heads == heads or |
|
1223 | 1217 | their_heads == ['hashed', heads_hash]): |
|
1224 | 1218 | # someone else committed/pushed/unbundled while we |
|
1225 | 1219 | # were transferring data |
|
1226 | 1220 | raise error.PushRaced('repository changed while %s - ' |
|
1227 | 1221 | 'please try again' % context) |
|
1228 | 1222 | |
|
1229 | 1223 | def unbundle(repo, cg, heads, source, url): |
|
1230 | 1224 | """Apply a bundle to a repo. |
|
1231 | 1225 | |
|
1232 | 1226 | this function makes sure the repo is locked during the application and have |
|
1233 | 1227 | mechanism to check that no push race occurred between the creation of the |
|
1234 | 1228 | bundle and its application. |
|
1235 | 1229 | |
|
1236 | 1230 | If the push was raced as PushRaced exception is raised.""" |
|
1237 | 1231 | r = 0 |
|
1238 | 1232 | # need a transaction when processing a bundle2 stream |
|
1239 | 1233 | tr = None |
|
1240 | 1234 | lock = repo.lock() |
|
1241 | 1235 | try: |
|
1242 | 1236 | check_heads(repo, heads, 'uploading changes') |
|
1243 | 1237 | # push can proceed |
|
1244 | 1238 | if util.safehasattr(cg, 'params'): |
|
1245 | 1239 | try: |
|
1246 | 1240 | tr = repo.transaction('unbundle') |
|
1247 | 1241 | tr.hookargs['source'] = source |
|
1248 | 1242 | tr.hookargs['url'] = url |
|
1249 | 1243 | tr.hookargs['bundle2-exp'] = '1' |
|
1250 | 1244 | r = bundle2.processbundle(repo, cg, lambda: tr).reply |
|
1251 | 1245 | cl = repo.unfiltered().changelog |
|
1252 | 1246 | p = cl.writepending() and repo.root or "" |
|
1253 | 1247 | repo.hook('b2x-pretransactionclose', throw=True, pending=p, |
|
1254 | 1248 | **tr.hookargs) |
|
1255 | 1249 | tr.close() |
|
1256 | 1250 | repo.hook('b2x-transactionclose', **tr.hookargs) |
|
1257 | 1251 | except Exception, exc: |
|
1258 | 1252 | exc.duringunbundle2 = True |
|
1259 | 1253 | raise |
|
1260 | 1254 | else: |
|
1261 | 1255 | r = changegroup.addchangegroup(repo, cg, source, url) |
|
1262 | 1256 | finally: |
|
1263 | 1257 | if tr is not None: |
|
1264 | 1258 | tr.release() |
|
1265 | 1259 | lock.release() |
|
1266 | 1260 | return r |
General Comments 0
You need to be logged in to leave comments.
Login now