Mercurial Mercurial > pub > hg > evolve / 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.
stablerangecache: fix output in the drifted case stable
authorPierre-Yves David <pierre-yves.david@octobus.net>
Mon, 27 Aug 2018 10:16:12 +0200
branchstable
changeset 4020 47b00d3b8ea2
parent 4019 8a6a2c37c0fa
child 4021 bebba5a5c82d
stablerangecache: fix output in the drifted case The node were not hex, and the field had different order in the pair. This is now fixed.
hgext3rd/evolve/stablerangecache.py file | annotate | diff | comparison | revisions 
--- a/hgext3rd/evolve/stablerangecache.py	Mon Aug 27 00:35:51 2018 +0200
+++ b/hgext3rd/evolve/stablerangecache.py	Mon Aug 27 10:16:12 2018 +0200
@@ -17,6 +17,7 @@
 from mercurial import (
     error,
     localrepo,
+    node as nodemod,
     util,
 )
 
@@ -271,8 +272,9 @@
                 # to add. This will confuse sqlite
                 msg = _('stable-range cache: skipping write, '
                         'database drifted under my feet\n')
-                hint = _('(disk: %s-%s vs mem: %s%s)\n')
-                data = (meta[2], meta[1], self._ondisktiprev, self._ondisktipnode)
+                hint = _('(disk: %s-%s vs mem: %s-%s)\n')
+                data = (nodemod.hex(meta[2]), meta[1],
+                        nodemod.hex(self._ondisktipnode), self._ondisktiprev)
                 repo.ui.warn(msg)
                 repo.ui.warn(hint % data)
                 con.execute('ROLLBACK;')
evolve