equal
deleted
inserted
replaced
1334 cg, remote_heads = ret |
1334 cg, remote_heads = ret |
1335 if force: remote_heads = ['force'] |
1335 if force: remote_heads = ['force'] |
1336 return remote.unbundle(cg, remote_heads, 'push') |
1336 return remote.unbundle(cg, remote_heads, 'push') |
1337 return ret[1] |
1337 return ret[1] |
1338 |
1338 |
|
1339 def changegroupinfo(self, nodes): |
|
1340 self.ui.note(_("%d changesets found\n") % len(nodes)) |
|
1341 if self.ui.debugflag: |
|
1342 self.ui.debug(_("List of changesets:\n")) |
|
1343 for node in nodes: |
|
1344 self.ui.debug("%s\n" % hex(node)) |
|
1345 |
1339 def changegroupsubset(self, bases, heads, source): |
1346 def changegroupsubset(self, bases, heads, source): |
1340 """This function generates a changegroup consisting of all the nodes |
1347 """This function generates a changegroup consisting of all the nodes |
1341 that are descendents of any of the bases, and ancestors of any of |
1348 that are descendents of any of the bases, and ancestors of any of |
1342 the heads. |
1349 the heads. |
1343 |
1350 |
1354 # Make it easy to refer to self.changelog |
1361 # Make it easy to refer to self.changelog |
1355 cl = self.changelog |
1362 cl = self.changelog |
1356 # msng is short for missing - compute the list of changesets in this |
1363 # msng is short for missing - compute the list of changesets in this |
1357 # changegroup. |
1364 # changegroup. |
1358 msng_cl_lst, bases, heads = cl.nodesbetween(bases, heads) |
1365 msng_cl_lst, bases, heads = cl.nodesbetween(bases, heads) |
|
1366 self.changegroupinfo(msng_cl_lst) |
1359 # Some bases may turn out to be superfluous, and some heads may be |
1367 # Some bases may turn out to be superfluous, and some heads may be |
1360 # too. nodesbetween will return the minimal set of bases and heads |
1368 # too. nodesbetween will return the minimal set of bases and heads |
1361 # necessary to re-create the changegroup. |
1369 # necessary to re-create the changegroup. |
1362 |
1370 |
1363 # Known heads are the list of heads that it is assumed the recipient |
1371 # Known heads are the list of heads that it is assumed the recipient |
1617 self.hook('preoutgoing', throw=True, source=source) |
1625 self.hook('preoutgoing', throw=True, source=source) |
1618 |
1626 |
1619 cl = self.changelog |
1627 cl = self.changelog |
1620 nodes = cl.nodesbetween(basenodes, None)[0] |
1628 nodes = cl.nodesbetween(basenodes, None)[0] |
1621 revset = dict.fromkeys([cl.rev(n) for n in nodes]) |
1629 revset = dict.fromkeys([cl.rev(n) for n in nodes]) |
|
1630 self.changegroupinfo(nodes) |
1622 |
1631 |
1623 def identity(x): |
1632 def identity(x): |
1624 return x |
1633 return x |
1625 |
1634 |
1626 def gennodelst(revlog): |
1635 def gennodelst(revlog): |