Martin von Zweigbergk <martinvonz@google.com> [Thu, 31 Oct 2019 15:02:03 -0700] rev 43370
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
Martin von Zweigbergk <martinvonz@google.com> [Thu, 31 Oct 2019 14:46:17 -0700] rev 43369
py3: handle keypresses in chistedit
Now you can navigate and change the action for a commit. You can also
reorder commits, as long as that doesn't result in a conflict (then it
crashes).
Differential Revision: https://phab.mercurial-scm.org/D7182
Martin von Zweigbergk <martinvonz@google.com> [Thu, 31 Oct 2019 14:25:51 -0700] rev 43368
py3: make chistedit render
Now you can see the list of commits, but it crashes when you press a
key.
Differential Revision: https://phab.mercurial-scm.org/D7181
Emmanuel Leblond <emmanuel.leblond@gmail.com> [Fri, 01 Nov 2019 17:23:02 +0100] rev 43367
py3: fix exception display encoding in contrib/simplemerge.py
Differential Revision: https://phab.mercurial-scm.org/D7191
Emmanuel Leblond <emmanuel.leblond@gmail.com> [Fri, 01 Nov 2019 17:31:47 +0100] rev 43366
py3: fix exception message check in test-linerange.py's testOutOfRange
Differential Revision: https://phab.mercurial-scm.org/D7192
Emmanuel Leblond <emmanuel.leblond@gmail.com> [Fri, 01 Nov 2019 17:35:36 +0100] rev 43365
py3: fix exception message encoding in scmutil.py's simplekeyvaluefile.read
Differential Revision: https://phab.mercurial-scm.org/D7193
Emmanuel Leblond <emmanuel.leblond@gmail.com> [Fri, 01 Nov 2019 17:38:07 +0100] rev 43364
py3: fix crecord.py's editpatchwitheditor exception message encoding
Differential Revision: https://phab.mercurial-scm.org/D7194