# HG changeset patch
# User Anton Shestakov <av6@dwimlabs.net>
# Date 1614033061 -28800
# Node ID 5d00679d78aa6483345674cd84175afc00e4213c
# Parent  2e1747baf55084bcd15ce357213c2cd22f2c7ae5
evolve: rely on ctx.__bytes__() for formatting instead of using ctx.hex()[:12]

diff -r 2e1747baf550 -r 5d00679d78aa hgext3rd/evolve/evolvecmd.py
--- a/hgext3rd/evolve/evolvecmd.py	Tue Feb 23 06:06:06 2021 +0800
+++ b/hgext3rd/evolve/evolvecmd.py	Tue Feb 23 06:31:01 2021 +0800
@@ -588,11 +588,11 @@
     assert local != other
     if local not in repo[None].parents():
         repo.ui.note(_(b"updating to \"local\" side of the conflict: %s\n") %
-                     local.hex()[:12])
+                     local)
         compat.update(local)
     # merging the two content-divergent changesets
     repo.ui.note(_(b"merging \"other\" %s changeset '%s'\n") %
-                 (TROUBLES['CONTENTDIVERGENT'], other.hex()[:12]))
+                 (TROUBLES['CONTENTDIVERGENT'], other))
     if progresscb:
         progresscb()
     with state.saver(evolvestate):
@@ -1722,7 +1722,7 @@
             compat.clean_update(pctx)
             ui.status(_(b'evolve aborted\n'))
             ui.status(_(b'working directory is now at %s\n')
-                      % pctx.hex()[:12])
+                      % pctx)
             evolvestate.delete()
             return 0
         return abortevolve(ui, repo, evolvestate)
@@ -1981,7 +1981,7 @@
             compat.clean_update(pctx)
             ui.status(_(b'evolve aborted\n'))
             ui.status(_(b'working directory is now at %s\n')
-                      % pctx.hex()[:12])
+                      % pctx)
             evolvestate.delete()
             return 0
         return abortevolve(ui, repo, evolvestate)