D7183: py3: render message about conflicts in chistedit code
martinvonz (Martin von Zweigbergk)
phabricator at mercurial-scm.org
Sat Nov 2 04:42:46 UTC 2019
martinvonz added a comment.
In D7183#105654 <https://phab.mercurial-scm.org/D7183#105654>, @martinvonz wrote:
> In D7183#105653 <https://phab.mercurial-scm.org/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.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST ACTION
https://phab.mercurial-scm.org/D7183/new/
REVISION DETAIL
https://phab.mercurial-scm.org/D7183
To: martinvonz, durin42, #hg-reviewers, indygreg
Cc: yuja, mercurial-devel
More information about the Mercurial-devel
mailing list