[PATCH 2 of 3 STABLE] obsolete: add debug output regarding obsolete marker exchange

[pierre-yves.david at logilab.fr]

# HG changeset patch
# User Pierre-Yves David <pierre-yves.david at logilab.fr>
# Date 1343313702 -7200
# Branch stable
# Node ID 179fab052e985e418e30ca4e8980120753f27e65
# Parent  2db9bef469b3bcae4f16938774f0e3051b604ee6
obsolete: add debug output regarding obsolete marker exchange.

diff --git a/mercurial/localrepo.py b/mercurial/localrepo.py
--- a/mercurial/localrepo.py
+++ b/mercurial/localrepo.py
@@ -1781,10 +1781,11 @@ class localrepository(object):
             else:
                 # Remote is old or publishing all common changesets
                 # should be seen as public
                 phases.advanceboundary(self, phases.public, subset)
 
+            self.ui.debug('fetching remote obsolete markers')
             remoteobs = remote.listkeys('obsolete')
             if 'dump' in remoteobs:
                 if tr is None:
                     tr = self.transaction(trname)
                 data = base85.b85decode(remoteobs['dump'])
@@ -1949,10 +1950,11 @@ class localrepository(object):
                                            str(phases.draft),
                                            str(phases.public))
                         if not r:
                             self.ui.warn(_('updating %s to public failed!\n')
                                             % newremotehead)
+                self.ui.debug('try to push obsolete markers to remote\n')
                 if (self.obsstore and
                     'obsolete' in remote.listkeys('namespaces')):
                     data = self.listkeys('obsolete')['dump']
                     r = remote.pushkey('obsolete', 'dump', '', data)
                     if not r:
diff --git a/tests/test-acl.t b/tests/test-acl.t
--- a/tests/test-acl.t
+++ b/tests/test-acl.t
@@ -115,11 +115,11 @@ Extension disabled for lack of a hook
   files: 2/3 chunks (66.67%)
   adding quux/file.py revisions
   files: 3/3 chunks (100.00%)
   added 3 changesets with 3 changes to 3 files
   listing keys for "phases"
-  listing keys for "namespaces"
+  try to push obsolete markers to remote
   updating the branch cache
   checking for updated bookmarks
   listing keys for "bookmarks"
   repository tip rolled back to revision 0 (undo push)
   0:6675d58eff77
@@ -176,11 +176,11 @@ Extension disabled for lack of acl.sourc
   files: 3/3 chunks (100.00%)
   added 3 changesets with 3 changes to 3 files
   calling hook pretxnchangegroup.acl: hgext.acl.hook
   acl: changes have source "push" - skipping
   listing keys for "phases"
-  listing keys for "namespaces"
+  try to push obsolete markers to remote
   updating the branch cache
   checking for updated bookmarks
   listing keys for "bookmarks"
   repository tip rolled back to revision 0 (undo push)
   0:6675d58eff77
@@ -248,11 +248,11 @@ No [acl.allow]/[acl.deny]
   acl: branch access granted: "f9cafe1212c8" on branch "default"
   acl: path access granted: "f9cafe1212c8"
   acl: branch access granted: "911600dab2ae" on branch "default"
   acl: path access granted: "911600dab2ae"
   listing keys for "phases"
-  listing keys for "namespaces"
+  try to push obsolete markers to remote
   updating the branch cache
   checking for updated bookmarks
   listing keys for "bookmarks"
   repository tip rolled back to revision 0 (undo push)
   0:6675d58eff77
@@ -740,11 +740,11 @@ barney is allowed everywhere
   acl: branch access granted: "f9cafe1212c8" on branch "default"
   acl: path access granted: "f9cafe1212c8"
   acl: branch access granted: "911600dab2ae" on branch "default"
   acl: path access granted: "911600dab2ae"
   listing keys for "phases"
-  listing keys for "namespaces"
+  try to push obsolete markers to remote
   updating the branch cache
   checking for updated bookmarks
   listing keys for "bookmarks"
   repository tip rolled back to revision 0 (undo push)
   0:6675d58eff77
@@ -1057,11 +1057,11 @@ acl.config can set only [acl.allow]/[acl
   acl: branch access granted: "f9cafe1212c8" on branch "default"
   acl: path access granted: "f9cafe1212c8"
   acl: branch access granted: "911600dab2ae" on branch "default"
   acl: path access granted: "911600dab2ae"
   listing keys for "phases"
-  listing keys for "namespaces"
+  try to push obsolete markers to remote
   updating the branch cache
   checking for updated bookmarks
   listing keys for "bookmarks"
   repository tip rolled back to revision 0 (undo push)
   0:6675d58eff77
@@ -1137,11 +1137,11 @@ fred is always allowed
   acl: branch access granted: "f9cafe1212c8" on branch "default"
   acl: path access granted: "f9cafe1212c8"
   acl: branch access granted: "911600dab2ae" on branch "default"
   acl: path access granted: "911600dab2ae"
   listing keys for "phases"
-  listing keys for "namespaces"
+  try to push obsolete markers to remote
   updating the branch cache
   checking for updated bookmarks
   listing keys for "bookmarks"
   repository tip rolled back to revision 0 (undo push)
   0:6675d58eff77
@@ -1289,11 +1289,11 @@ OS-level groups
   acl: branch access granted: "f9cafe1212c8" on branch "default"
   acl: path access granted: "f9cafe1212c8"
   acl: branch access granted: "911600dab2ae" on branch "default"
   acl: path access granted: "911600dab2ae"
   listing keys for "phases"
-  listing keys for "namespaces"
+  try to push obsolete markers to remote
   updating the branch cache
   checking for updated bookmarks
   listing keys for "bookmarks"
   repository tip rolled back to revision 0 (undo push)
   0:6675d58eff77
@@ -1490,11 +1490,11 @@ No branch acls specified
   acl: branch access granted: "911600dab2ae" on branch "default"
   acl: path access granted: "911600dab2ae"
   acl: branch access granted: "e8fc755d4d82" on branch "foobar"
   acl: path access granted: "e8fc755d4d82"
   listing keys for "phases"
-  listing keys for "namespaces"
+  try to push obsolete markers to remote
   updating the branch cache
   checking for updated bookmarks
   listing keys for "bookmarks"
   repository tip rolled back to revision 2 (undo push)
   2:fb35475503ef
@@ -1797,11 +1797,11 @@ Branch acl allow other
   acl: branch access granted: "911600dab2ae" on branch "default"
   acl: path access granted: "911600dab2ae"
   acl: branch access granted: "e8fc755d4d82" on branch "foobar"
   acl: path access granted: "e8fc755d4d82"
   listing keys for "phases"
-  listing keys for "namespaces"
+  try to push obsolete markers to remote
   updating the branch cache
   checking for updated bookmarks
   listing keys for "bookmarks"
   repository tip rolled back to revision 2 (undo push)
   2:fb35475503ef
@@ -1886,11 +1886,11 @@ push foobar into the remote
   acl: branch access granted: "911600dab2ae" on branch "default"
   acl: path access granted: "911600dab2ae"
   acl: branch access granted: "e8fc755d4d82" on branch "foobar"
   acl: path access granted: "e8fc755d4d82"
   listing keys for "phases"
-  listing keys for "namespaces"
+  try to push obsolete markers to remote
   updating the branch cache
   checking for updated bookmarks
   listing keys for "bookmarks"
   repository tip rolled back to revision 2 (undo push)
   2:fb35475503ef
@@ -2048,11 +2048,11 @@ User 'astro' must not be denied
   acl: branch access granted: "911600dab2ae" on branch "default"
   acl: path access granted: "911600dab2ae"
   acl: branch access granted: "e8fc755d4d82" on branch "foobar"
   acl: path access granted: "e8fc755d4d82"
   listing keys for "phases"
-  listing keys for "namespaces"
+  try to push obsolete markers to remote
   updating the branch cache
   checking for updated bookmarks
   listing keys for "bookmarks"
   repository tip rolled back to revision 2 (undo push)
   2:fb35475503ef