( )⚙ D7183 py3: render message about conflicts in chistedit code

This is an archive of the discontinued Mercurial Phabricator instance.

py3: render message about conflicts in chistedit code
ClosedPublic

Authored by martinvonz on Oct 31 2019, 6:22 PM.

Details

Summary

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

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

martinvonz created this revision.Oct 31 2019, 6:22 PM
indygreg accepted this revision.Oct 31 2019, 10:40 PM
This revision is now accepted and ready to land.Oct 31 2019, 10:40 PM
martinvonz updated this revision to Diff 17430.Nov 1 2019, 12:16 AM
martinvonz updated this revision to Diff 17438.Nov 1 2019, 12:34 PM
This revision was automatically updated to reflect the committed changes.
yuja added a subscriber: yuja.Nov 1 2019, 10:41 PM
if len(conflicts) > 0:
  • conflictstr = b','.join(map(lambda r: str(r.ctx), conflicts))

+ conflictstr = b','.join(map(lambda r: r.ctx.hex(), conflicts))

Seems okay, but it was previously a short hash.

In D7183#105653, @yuja wrote:
if len(conflicts) > 0:
  • conflictstr = b','.join(map(lambda r: str(r.ctx), conflicts))

+ conflictstr = b','.join(map(lambda r: r.ctx.hex(), conflicts))

Seems okay, but it was previously a short hash.

Oh, good point, I had forgotten that hex() is the full hash. I'll send a patch to switch to short(). The full hash is actually used a little further up in the UI, but I'll leave that since it's (probably) been like that for a long time.

In D7183#105653, @yuja wrote:
if len(conflicts) > 0:
  • conflictstr = b','.join(map(lambda r: str(r.ctx), conflicts))

+ conflictstr = b','.join(map(lambda r: r.ctx.hex(), conflicts))

Seems okay, but it was previously a short hash.

Oh, good point, I had forgotten that hex() is the full hash. I'll send a patch to switch to short(). The full hash is actually used a little further up in the UI, but I'll leave that since it's (probably) been like that for a long time.

Nope, it hasn't been like that for a long time, I just changed that in this series :( Sorry, I had tried to verify, but I had forgotten that I had aliased hg to be the new version. I'll fix that instance too.