changeset 17294:d2217df3a7cf stable

obsolete: add debug output regarding obsolete marker exchange.
author Pierre-Yves David <pierre-yves.david@logilab.fr>
date Thu, 26 Jul 2012 16:41:42 +0200
parents d3f84ccc5495
children 1f08ecc7febb
files mercurial/localrepo.py tests/test-acl.t
diffstat 2 files changed, 13 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/localrepo.py	Sat Jul 28 12:28:35 2012 +0200
+++ b/mercurial/localrepo.py	Thu Jul 26 16:41:42 2012 +0200
@@ -1783,6 +1783,7 @@
                 # 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:
@@ -1951,6 +1952,7 @@
                         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']
--- a/tests/test-acl.t	Sat Jul 28 12:28:35 2012 +0200
+++ b/tests/test-acl.t	Thu Jul 26 16:41:42 2012 +0200
@@ -117,7 +117,7 @@
   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"
@@ -178,7 +178,7 @@
   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"
@@ -250,7 +250,7 @@
   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"
@@ -742,7 +742,7 @@
   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"
@@ -1059,7 +1059,7 @@
   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"
@@ -1139,7 +1139,7 @@
   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"
@@ -1291,7 +1291,7 @@
   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"
@@ -1492,7 +1492,7 @@
   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"
@@ -1799,7 +1799,7 @@
   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"
@@ -1888,7 +1888,7 @@
   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"
@@ -2050,7 +2050,7 @@
   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"