[PATCH] pull/unbundle: display a list of any new named branches that were added

Sune Foldager cryo at cyanite.org
Sun Sep 14 05:21:13 CDT 2008


> diff -r 0d513661d6c2 -r a1b183df8558 tests/test-acl.out
> --- a/tests/test-acl.out	Sat Sep 13 10:46:47 2008 -0500
> +++ b/tests/test-acl.out	Sun Sep 14 12:44:50 2008 +0200
> @@ -47,6 +47,7 @@
> ef1ea85a6374b77d6da9dcda9541f498f2d17df7
> f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd
> 911600dab2ae7a9baff75958b84fe606851ce955
> +invalidating branch cache (tip differs)
> adding changesets
> add changeset ef1ea85a6374
> add changeset f9cafe1212c8
> @@ -79,6 +80,7 @@
> ef1ea85a6374b77d6da9dcda9541f498f2d17df7
> f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd
> 911600dab2ae7a9baff75958b84fe606851ce955
> +invalidating branch cache (tip differs)
> adding changesets
> add changeset ef1ea85a6374
> add changeset f9cafe1212c8
> @@ -116,6 +118,7 @@
> ef1ea85a6374b77d6da9dcda9541f498f2d17df7
> f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd
> 911600dab2ae7a9baff75958b84fe606851ce955
> +invalidating branch cache (tip differs)
> adding changesets
> add changeset ef1ea85a6374
> add changeset f9cafe1212c8
> @@ -413,6 +416,7 @@
> ef1ea85a6374b77d6da9dcda9541f498f2d17df7
> f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd
> 911600dab2ae7a9baff75958b84fe606851ce955
> +invalidating branch cache (tip differs)
> adding changesets
> add changeset ef1ea85a6374
> add changeset f9cafe1212c8

These changes are necessary because of the following:

- hg rollback apparently leaves the branchcache in a state where the  
tip is incorrect; the next invacation of branchtags() will fix it.
- when fixing it, it also displays a message if --debug is used.
- my patch adds a second call to branchtags() to the pull/unbundle  
code; the existing one doesn't print any messages.
- the acl test does a rollback followed by a hg --debug pull, which  
causes extra messages.

-- Sune.



More information about the Mercurial-devel mailing list