This is an archive of the discontinued Mercurial Phabricator instance.

Differential D7183

py3: render message about conflicts in chistedit code
ClosedPublic

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

Details

Reviewers
durin42
indygreg
Group Reviewers
hg-reviewers
Commits
rHG7f56b0cbd245: py3: render message about conflicts in chistedit code
rHGaf4deb90cc81: py3: render message about conflicts in chistedit code
rHG9acc86e812b8: py3: render message about conflicts in chistedit code
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
martinvonz added a commit: rHG9acc86e812b8: py3: render message about conflicts in chistedit code.Nov 1 2019, 1:30 PM
Closed by commit rHG9acc86e812b8: py3: render message about conflicts in chistedit code (authored by martinvonz). · Explain Why
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.

martinvonz added a comment.Nov 2 2019, 12:37 AM
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.

martinvonz added a comment.Nov 2 2019, 12:42 AM
In D7183#105654, @martinvonz wrote:
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.

Revision Contents
Changeset List

PathPackages
Mhgext/histedit.py (4 lines)

Diff 17459

hgext/histedit.py

win.addstr(y, fnx, _trunc_tail(b','.join(files[i:]), fnmaxx)) win.addstr(y, fnx, _trunc_tail(b','.join(files[i:]), fnmaxx))
y = y + 1 y = y + 1
break break
win.addstr(y, fnx, _trunc_head(line1, fnmaxx)) win.addstr(y, fnx, _trunc_head(line1, fnmaxx))
y = y + 1 y = y + 1
conflicts = rule.conflicts conflicts = rule.conflicts
if len(conflicts) > 0: 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 conflictstr = b"changed files overlap with %s" % conflictstr
else: else:
conflictstr = b'no overlap' conflictstr = b'no overlap'
win.addstr(y, 1, conflictstr[:length]) win.addstr(y, 1, conflictstr[:length])
win.noutrefresh() win.noutrefresh()
def helplines(mode): def helplines(mode):
def renderrules(rulesscr, state): def renderrules(rulesscr, state):
rules = state[b'rules'] rules = state[b'rules']
pos = state[b'pos'] pos = state[b'pos']
selected = state[b'selected'] selected = state[b'selected']
start = state[b'modes'][MODE_RULES][b'line_offset'] start = state[b'modes'][MODE_RULES][b'line_offset']
conflicts = [r.ctx for r in rules if r.conflicts] conflicts = [r.ctx for r in rules if r.conflicts]
if len(conflicts) > 0: 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)) addln(rulesscr, -1, 0, line, curses.color_pair(COLOR_WARN))
for y, rule in enumerate(rules[start:]): for y, rule in enumerate(rules[start:]):
if y >= state[b'page_height']: if y >= state[b'page_height']:
break break
if len(rule.conflicts) > 0: if len(rule.conflicts) > 0:
rulesscr.addstr(y, 0, b" ", curses.color_pair(COLOR_WARN)) rulesscr.addstr(y, 0, b" ", curses.color_pair(COLOR_WARN))
else: else: