This is an archive of the discontinued Mercurial Phabricator instance.

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#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

			Path	Packages
M			hgext/histedit.py (4 lines)

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	17422		Oct 31 2019, 6:22 PM	★	★
Diff 2	17430		Nov 1 2019, 12:16 AM	★	★
Diff 3	17438		Nov 1 2019, 12:34 PM	★	★
Diff 4	17459	rHG9acc86e812b8178a61f77fdc4668cf66ffef3034	Oct 31 2019, 6:02 PM	★	★

Commit	Parents	Author	Summary	Date
0103b2e3ba2f	a9442e6721e7	Martin von Zweigbergk		Oct 31 2019, 6:02 PM

Status	Author	Revision
Closed	martinvonz	D7186 py3: use native strings as keys into **opts in chistedit
Closed	martinvonz	D7185 py3: open chistedit file in binary mode using vfs
Closed	martinvonz	D7184 py3: avoid another b''.format() in chistedit
Closed	martinvonz	D7183 py3: render message about conflicts in chistedit code
Closed	martinvonz	D7182 py3: handle keypresses in chistedit
Closed	martinvonz	D7181 py3: make chistedit render

Diff 17430

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:

This is an archive of the discontinued Mercurial Phabricator instance.

py3: render message about conflicts in chistedit codeClosedPublic

Details

Diff Detail

Event Timeline

Revision ContentsChangeset List

Diff 17430

hgext/histedit.py

py3: render message about conflicts in chistedit code
ClosedPublic

Revision Contents
Changeset List