diff --git a/mercurial/localrepo.py b/mercurial/localrepo.py --- a/mercurial/localrepo.py +++ b/mercurial/localrepo.py @@ -1336,6 +1336,13 @@ class localrepository(repo.repository): return remote.unbundle(cg, remote_heads, 'push') return ret[1] + def changegroupinfo(self, nodes): + self.ui.note(_("%d changesets found\n") % len(nodes)) + if self.ui.debugflag: + self.ui.debug(_("List of changesets:\n")) + for node in nodes: + self.ui.debug("%s\n" % hex(node)) + def changegroupsubset(self, bases, heads, source): """This function generates a changegroup consisting of all the nodes that are descendents of any of the bases, and ancestors of any of @@ -1356,6 +1363,7 @@ class localrepository(repo.repository): # msng is short for missing - compute the list of changesets in this # changegroup. msng_cl_lst, bases, heads = cl.nodesbetween(bases, heads) + self.changegroupinfo(msng_cl_lst) # Some bases may turn out to be superfluous, and some heads may be # too. nodesbetween will return the minimal set of bases and heads # necessary to re-create the changegroup. @@ -1619,6 +1627,7 @@ class localrepository(repo.repository): cl = self.changelog nodes = cl.nodesbetween(basenodes, None)[0] revset = dict.fromkeys([cl.rev(n) for n in nodes]) + self.changegroupinfo(nodes) def identity(x): return x diff --git a/tests/test-acl.out b/tests/test-acl.out --- a/tests/test-acl.out +++ b/tests/test-acl.out @@ -16,6 +16,11 @@ hgrc = """ pushing to ../b searching for changes common changesets up to 6675d58eff77 +3 changesets found +List of changesets: +ef1ea85a6374b77d6da9dcda9541f498f2d17df7 +f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd +911600dab2ae7a9baff75958b84fe606851ce955 adding changesets add changeset ef1ea85a6374 add changeset f9cafe1212c8 @@ -38,6 +43,11 @@ pretxnchangegroup.acl = python:hgext.acl pushing to ../b searching for changes common changesets up to 6675d58eff77 +3 changesets found +List of changesets: +ef1ea85a6374b77d6da9dcda9541f498f2d17df7 +f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd +911600dab2ae7a9baff75958b84fe606851ce955 adding changesets add changeset ef1ea85a6374 add changeset f9cafe1212c8 @@ -66,6 +76,11 @@ sources = push pushing to ../b searching for changes common changesets up to 6675d58eff77 +3 changesets found +List of changesets: +ef1ea85a6374b77d6da9dcda9541f498f2d17df7 +f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd +911600dab2ae7a9baff75958b84fe606851ce955 adding changesets add changeset ef1ea85a6374 add changeset f9cafe1212c8 @@ -97,6 +112,11 @@ sources = push pushing to ../b searching for changes common changesets up to 6675d58eff77 +3 changesets found +List of changesets: +ef1ea85a6374b77d6da9dcda9541f498f2d17df7 +f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd +911600dab2ae7a9baff75958b84fe606851ce955 adding changesets add changeset ef1ea85a6374 add changeset f9cafe1212c8 @@ -131,6 +151,11 @@ foo/** = fred pushing to ../b searching for changes common changesets up to 6675d58eff77 +3 changesets found +List of changesets: +ef1ea85a6374b77d6da9dcda9541f498f2d17df7 +f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd +911600dab2ae7a9baff75958b84fe606851ce955 adding changesets add changeset ef1ea85a6374 add changeset f9cafe1212c8 @@ -168,6 +193,11 @@ foo/** = fred pushing to ../b searching for changes common changesets up to 6675d58eff77 +3 changesets found +List of changesets: +ef1ea85a6374b77d6da9dcda9541f498f2d17df7 +f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd +911600dab2ae7a9baff75958b84fe606851ce955 adding changesets add changeset ef1ea85a6374 add changeset f9cafe1212c8 @@ -204,6 +234,11 @@ foo/bar/** = fred pushing to ../b searching for changes common changesets up to 6675d58eff77 +3 changesets found +List of changesets: +ef1ea85a6374b77d6da9dcda9541f498f2d17df7 +f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd +911600dab2ae7a9baff75958b84fe606851ce955 adding changesets add changeset ef1ea85a6374 add changeset f9cafe1212c8 @@ -243,6 +278,11 @@ foo/Bar/** = fred pushing to ../b searching for changes common changesets up to 6675d58eff77 +3 changesets found +List of changesets: +ef1ea85a6374b77d6da9dcda9541f498f2d17df7 +f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd +911600dab2ae7a9baff75958b84fe606851ce955 adding changesets add changeset ef1ea85a6374 add changeset f9cafe1212c8 @@ -281,6 +321,11 @@ foo/Bar/** = fred pushing to ../b searching for changes common changesets up to 6675d58eff77 +3 changesets found +List of changesets: +ef1ea85a6374b77d6da9dcda9541f498f2d17df7 +f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd +911600dab2ae7a9baff75958b84fe606851ce955 adding changesets add changeset ef1ea85a6374 add changeset f9cafe1212c8 @@ -320,6 +365,11 @@ foo/Bar/** = fred pushing to ../b searching for changes common changesets up to 6675d58eff77 +3 changesets found +List of changesets: +ef1ea85a6374b77d6da9dcda9541f498f2d17df7 +f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd +911600dab2ae7a9baff75958b84fe606851ce955 adding changesets add changeset ef1ea85a6374 add changeset f9cafe1212c8 @@ -358,6 +408,11 @@ foo/Bar/** = fred pushing to ../b searching for changes common changesets up to 6675d58eff77 +3 changesets found +List of changesets: +ef1ea85a6374b77d6da9dcda9541f498f2d17df7 +f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd +911600dab2ae7a9baff75958b84fe606851ce955 adding changesets add changeset ef1ea85a6374 add changeset f9cafe1212c8 @@ -402,6 +457,11 @@ config = ../acl.config pushing to ../b searching for changes common changesets up to 6675d58eff77 +3 changesets found +List of changesets: +ef1ea85a6374b77d6da9dcda9541f498f2d17df7 +f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd +911600dab2ae7a9baff75958b84fe606851ce955 adding changesets add changeset ef1ea85a6374 add changeset f9cafe1212c8 @@ -446,6 +506,11 @@ foo/** = betty pushing to ../b searching for changes common changesets up to 6675d58eff77 +3 changesets found +List of changesets: +ef1ea85a6374b77d6da9dcda9541f498f2d17df7 +f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd +911600dab2ae7a9baff75958b84fe606851ce955 adding changesets add changeset ef1ea85a6374 add changeset f9cafe1212c8 @@ -496,6 +561,11 @@ changegroup.acl = false pushing to ../b searching for changes common changesets up to 6675d58eff77 +3 changesets found +List of changesets: +ef1ea85a6374b77d6da9dcda9541f498f2d17df7 +f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd +911600dab2ae7a9baff75958b84fe606851ce955 adding changesets add changeset ef1ea85a6374 add changeset f9cafe1212c8