[PATCH] push: fix bug in detection of remote obsolete support
pierre-yves.david at logilab.fr
pierre-yves.david at logilab.fr
Fri Jul 6 11:41:02 CDT 2012
# HG changeset patch
# User Pierre-Yves David <pierre-yves.david at logilab.fr>
# Date 1341592845 -7200
# Node ID 6d629cdc2d0fad72444721078ebd5f0c1e1cb629
# Parent 2e13c1bd34dc6afda8fc7cfa22a8cd658276724f
push: fix bug in detection of remote obsolete support
Current code check obsolete availability in local repo.
diff --git a/mercurial/localrepo.py b/mercurial/localrepo.py
--- a/mercurial/localrepo.py
+++ b/mercurial/localrepo.py
@@ -1816,11 +1816,11 @@ class localrepository(repo.repository):
str(phases.draft),
str(phases.public))
if not r:
self.ui.warn(_('updating %s to public failed!\n')
% newremotehead)
- if 'obsolete' in self.listkeys('namespaces') and self.obsstore:
+ if 'obsolete' in remote.listkeys('namespaces') and self.obsstore:
data = self.obsstore._writemarkers()
r = remote.pushkey('obsolete', 'dump', '',
base85.b85encode(data))
if not r:
self.ui.warn(_('failed to push obsolete markers!\n'))
More information about the Mercurial-devel
mailing list