Mercurial Mercurial > hg / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
push: fix bug in detection of remote obsolete support
authorPierre-Yves David <pierre-yves.david@ens-lyon.org>
Thu, 12 Jul 2012 03:03:19 +0200
changeset 17183 4253cfee08ef
parent 17182 cdf1532d89c6
child 17184 5fa09a3b0034
push: fix bug in detection of remote obsolete support Current code check obsolete availability in local repo.
mercurial/localrepo.py file | annotate | diff | comparison | revisions
tests/test-hook.t file | annotate | diff | comparison | revisions 
--- a/mercurial/localrepo.py	Wed Jul 11 18:22:07 2012 +0200
+++ b/mercurial/localrepo.py	Thu Jul 12 03:03:19 2012 +0200
@@ -1839,7 +1839,8 @@
                         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.listkeys('obsolete')['dump']
                     r = remote.pushkey('obsolete', 'dump', '', data)
                     if not r:
--- a/tests/test-hook.t	Wed Jul 11 18:22:07 2012 +0200
+++ b/tests/test-hook.t	Thu Jul 12 03:03:19 2012 +0200
@@ -214,6 +214,7 @@
   searching for changes
   no changes found
   listkeys hook: HG_NAMESPACE=phases HG_VALUES={'cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b': '1', 'publishing': 'True'}
+  listkeys hook: HG_NAMESPACE=namespaces HG_VALUES={'bookmarks': '', 'namespaces': '', 'obsolete': '', 'phases': ''}
   listkeys hook: HG_NAMESPACE=bookmarks HG_VALUES={'bar': '0000000000000000000000000000000000000000', 'foo': '0000000000000000000000000000000000000000'}
   listkeys hook: HG_NAMESPACE=bookmarks HG_VALUES={'bar': '0000000000000000000000000000000000000000', 'foo': '0000000000000000000000000000000000000000'}
   exporting bookmark baz
Mercurial