[PATCH 2 of 3 STABLE-v2] obsolete: add debug output regarding obsolete marker exchange
Pierre-Yves David
pierre-yves.david at ens-lyon.org
Sat Jul 28 05:45:58 CDT 2012
# HG changeset patch
# User Pierre-Yves David <pierre-yves.david at logilab.fr>
# Date 1343313702 -7200
# Branch stable
# Node ID de18f44d319d9686b3b461ed4c211963eaa5988a
# Parent 6a44d2a3f69636ecacdc51a0bd7fbfcbc659151b
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
@@ -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']
diff --git a/tests/test-acl.t b/tests/test-acl.t
--- a/tests/test-acl.t
+++ b/tests/test-acl.t
@@ -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"
More information about the Mercurial-devel
mailing list