Show More
@@ -21,7 +21,6 b' from .node import (' | |||||
21 |
|
21 | |||
22 | from . import ( |
|
22 | from . import ( | |
23 | dagutil, |
|
23 | dagutil, | |
24 | discovery, |
|
|||
25 | error, |
|
24 | error, | |
26 | mdiff, |
|
25 | mdiff, | |
27 | phases, |
|
26 | phases, | |
@@ -951,12 +950,6 b' def getchangegroup(repo, source, outgoin' | |||||
951 | return makechangegroup(repo, outgoing, version, source, |
|
950 | return makechangegroup(repo, outgoing, version, source, | |
952 | bundlecaps=bundlecaps) |
|
951 | bundlecaps=bundlecaps) | |
953 |
|
952 | |||
954 | def changegroup(repo, basenodes, source): |
|
|||
955 | # to avoid a race we use changegroupsubset() (issue1320) |
|
|||
956 | outgoing = discovery.outgoing(repo, missingroots=basenodes, |
|
|||
957 | missingheads=repo.heads()) |
|
|||
958 | return makechangegroup(repo, outgoing, '01', source) |
|
|||
959 |
|
||||
960 | def _addchangegroupfiles(repo, source, revmap, trp, expectedfiles, needfiles): |
|
953 | def _addchangegroupfiles(repo, source, revmap, trp, expectedfiles, needfiles): | |
961 | revisions = 0 |
|
954 | revisions = 0 | |
962 | files = 0 |
|
955 | files = 0 |
@@ -287,7 +287,9 b' class locallegacypeer(repository.legacyp' | |||||
287 | return self._repo.branches(nodes) |
|
287 | return self._repo.branches(nodes) | |
288 |
|
288 | |||
289 | def changegroup(self, basenodes, source): |
|
289 | def changegroup(self, basenodes, source): | |
290 | return changegroup.changegroup(self._repo, basenodes, source) |
|
290 | outgoing = discovery.outgoing(self._repo, missingroots=basenodes, | |
|
291 | missingheads=self._repo.heads()) | |||
|
292 | return changegroup.makechangegroup(self._repo, outgoing, '01', source) | |||
291 |
|
293 | |||
292 | def changegroupsubset(self, bases, heads, source): |
|
294 | def changegroupsubset(self, bases, heads, source): | |
293 | outgoing = discovery.outgoing(self._repo, missingroots=bases, |
|
295 | outgoing = discovery.outgoing(self._repo, missingroots=bases, |
@@ -795,7 +795,9 b' def capabilities(repo, proto):' | |||||
795 | @wireprotocommand('changegroup', 'roots') |
|
795 | @wireprotocommand('changegroup', 'roots') | |
796 | def changegroup(repo, proto, roots): |
|
796 | def changegroup(repo, proto, roots): | |
797 | nodes = decodelist(roots) |
|
797 | nodes = decodelist(roots) | |
798 | cg = changegroupmod.changegroup(repo, nodes, 'serve') |
|
798 | outgoing = discovery.outgoing(repo, missingroots=nodes, | |
|
799 | missingheads=repo.heads()) | |||
|
800 | cg = changegroupmod.makechangegroup(repo, outgoing, '01', 'serve') | |||
799 | return streamres(reader=cg, v1compressible=True) |
|
801 | return streamres(reader=cg, v1compressible=True) | |
800 |
|
802 | |||
801 | @wireprotocommand('changegroupsubset', 'bases heads') |
|
803 | @wireprotocommand('changegroupsubset', 'bases heads') |
General Comments 0
You need to be logged in to leave comments.
Login now