equal
deleted
inserted
replaced
1492 cg, remote_heads = ret |
1492 cg, remote_heads = ret |
1493 if force: remote_heads = ['force'] |
1493 if force: remote_heads = ['force'] |
1494 return remote.unbundle(cg, remote_heads, 'push') |
1494 return remote.unbundle(cg, remote_heads, 'push') |
1495 return ret[1] |
1495 return ret[1] |
1496 |
1496 |
1497 def changegroupinfo(self, nodes): |
1497 def changegroupinfo(self, nodes, source): |
1498 self.ui.note(_("%d changesets found\n") % len(nodes)) |
1498 if self.ui.verbose or source == 'bundle': |
|
1499 self.ui.status(_("%d changesets found\n") % len(nodes)) |
1499 if self.ui.debugflag: |
1500 if self.ui.debugflag: |
1500 self.ui.debug(_("List of changesets:\n")) |
1501 self.ui.debug(_("List of changesets:\n")) |
1501 for node in nodes: |
1502 for node in nodes: |
1502 self.ui.debug("%s\n" % hex(node)) |
1503 self.ui.debug("%s\n" % hex(node)) |
1503 |
1504 |
1519 # Make it easy to refer to self.changelog |
1520 # Make it easy to refer to self.changelog |
1520 cl = self.changelog |
1521 cl = self.changelog |
1521 # msng is short for missing - compute the list of changesets in this |
1522 # msng is short for missing - compute the list of changesets in this |
1522 # changegroup. |
1523 # changegroup. |
1523 msng_cl_lst, bases, heads = cl.nodesbetween(bases, heads) |
1524 msng_cl_lst, bases, heads = cl.nodesbetween(bases, heads) |
1524 self.changegroupinfo(msng_cl_lst) |
1525 self.changegroupinfo(msng_cl_lst, source) |
1525 # Some bases may turn out to be superfluous, and some heads may be |
1526 # Some bases may turn out to be superfluous, and some heads may be |
1526 # too. nodesbetween will return the minimal set of bases and heads |
1527 # too. nodesbetween will return the minimal set of bases and heads |
1527 # necessary to re-create the changegroup. |
1528 # necessary to re-create the changegroup. |
1528 |
1529 |
1529 # Known heads are the list of heads that it is assumed the recipient |
1530 # Known heads are the list of heads that it is assumed the recipient |
1783 self.hook('preoutgoing', throw=True, source=source) |
1784 self.hook('preoutgoing', throw=True, source=source) |
1784 |
1785 |
1785 cl = self.changelog |
1786 cl = self.changelog |
1786 nodes = cl.nodesbetween(basenodes, None)[0] |
1787 nodes = cl.nodesbetween(basenodes, None)[0] |
1787 revset = dict.fromkeys([cl.rev(n) for n in nodes]) |
1788 revset = dict.fromkeys([cl.rev(n) for n in nodes]) |
1788 self.changegroupinfo(nodes) |
1789 self.changegroupinfo(nodes, source) |
1789 |
1790 |
1790 def identity(x): |
1791 def identity(x): |
1791 return x |
1792 return x |
1792 |
1793 |
1793 def gennodelst(revlog): |
1794 def gennodelst(revlog): |