# HG changeset patch
# User Martin von Zweigbergk <martinvonz@google.com>
# Date 1572559323 25200
# Node ID 7f56b0cbd2454e720b11266ea985837509cc9bd5
# Parent  8aa54c5a257734ee12fbd7139c28e72707e5bb28
py3: render message about conflicts in chistedit code

Now you can also reorder commits that (potentially) conflict. Just
don't try to confirm the changes yet (because then it crashes).

Differential Revision: https://phab.mercurial-scm.org/D7183

diff -r 8aa54c5a2577 -r 7f56b0cbd245 hgext/histedit.py
--- a/hgext/histedit.py	Thu Oct 31 14:46:17 2019 -0700
+++ b/hgext/histedit.py	Thu Oct 31 15:02:03 2019 -0700
@@ -1432,7 +1432,7 @@
 
         conflicts = rule.conflicts
         if len(conflicts) > 0:
-            conflictstr = b','.join(map(lambda r: str(r.ctx), conflicts))
+            conflictstr = b','.join(map(lambda r: r.ctx.hex(), conflicts))
             conflictstr = b"changed files overlap with %s" % conflictstr
         else:
             conflictstr = b'no overlap'
@@ -1471,7 +1471,9 @@
 
         conflicts = [r.ctx for r in rules if r.conflicts]
         if len(conflicts) > 0:
-            line = b"potential conflict in %s" % b','.join(map(str, conflicts))
+            line = b"potential conflict in %s" % b','.join(
+                map(pycompat.bytestr, conflicts)
+            )
             addln(rulesscr, -1, 0, line, curses.color_pair(COLOR_WARN))
 
         for y, rule in enumerate(rules[start:]):