This is an archive of the discontinued Mercurial Phabricator instance.

Status	Author	Revision
Closed	martinvonz	D11653 chistedit: rename a confusingly named variable
Closed	martinvonz	D11652 chistedit: remove some local variable and access state on self instead
Closed	martinvonz	D11649 chistedit: move changeview() onto state class
Closed	martinvonz	D11648 chistedit: move cycleaction() onto state class
Closed	martinvonz	D11647 chistedit: move changeaction() onto state class
Closed	martinvonz	D11646 chistedit: move swap() onto state class
Closed	martinvonz	D11645 chistedit: move makeselection() onto state class
Closed	martinvonz	D11644 chistedit: move changemode() onto state class
Closed	martinvonz	D11643 chistedit: move movecursor() onto state class
Closed	martinvonz	D11642 chistedit: move patchcontents() onto state class
Closed	martinvonz	D11641 chistedit: move event() onto state class
Closed	martinvonz	D11640 chistedit: move renderpatch() and dependencies onto state class
Closed	martinvonz	D11639 chistedit: move renderrules() onto state class
Closed	martinvonz	D11638 chistedit: move layout() and dependencies onto state class
Closed	martinvonz	D11637 chistedit: move rendercommit() onto state class
Closed	martinvonz	D11636 chistedit: move view state from a dict to a custom class

Diff 30732

hgext/histedit.py

	return self.conflicts			return self.conflicts

	if other in self.conflicts:			if other in self.conflicts:
	self.conflicts.remove(other)			self.conflicts.remove(other)
	return self.conflicts			return self.conflicts


	# ============ EVENTS ===============			# ============ EVENTS ===============
	def changemode(state, mode):
	curmode, _ = state.mode
	state.mode = (mode, curmode)
	if mode == MODE_PATCH:
	state.modes[MODE_PATCH][b'patchcontents'] = state.patch_contents()


	def makeselection(state, pos):			def makeselection(state, pos):
	state.selected = pos			state.selected = pos


	def swap(state, oldpos, newpos):			def swap(state, oldpos, newpos):
	"""Swap two positions and calculate necessary conflicts in			"""Swap two positions and calculate necessary conflicts in
	O(\|newpos-oldpos\|) time"""			O(\|newpos-oldpos\|) time"""

	elif action == b'goto' and int(ch) < len(rules) and len(rules) <= 10:			elif action == b'goto' and int(ch) < len(rules) and len(rules) <= 10:
	newrule = next((r for r in rules if r.origpos == int(ch)))			newrule = next((r for r in rules if r.origpos == int(ch)))
	self.move_cursor(oldpos, newrule.pos)			self.move_cursor(oldpos, newrule.pos)
	if selected is not None:			if selected is not None:
	swap(self, oldpos, newrule.pos)			swap(self, oldpos, newrule.pos)
	elif action.startswith(b'action-'):			elif action.startswith(b'action-'):
	changeaction(self, oldpos, action[7:])			changeaction(self, oldpos, action[7:])
	elif action == b'showpatch':			elif action == b'showpatch':
	changemode(self, MODE_PATCH if curmode != MODE_PATCH else prevmode)			self.change_mode(MODE_PATCH if curmode != MODE_PATCH else prevmode)
	elif action == b'help':			elif action == b'help':
	changemode(self, MODE_HELP if curmode != MODE_HELP else prevmode)			self.change_mode(MODE_HELP if curmode != MODE_HELP else prevmode)
	elif action == b'quit':			elif action == b'quit':
	return E_QUIT			return E_QUIT
	elif action == b'histedit':			elif action == b'histedit':
	return E_HISTEDIT			return E_HISTEDIT
	elif action == b'page-down':			elif action == b'page-down':
	return E_PAGEDOWN			return E_PAGEDOWN
	elif action == b'page-up':			elif action == b'page-up':
	return E_PAGEUP			return E_PAGEUP
	if newpos < modestate[b'line_offset']:			if newpos < modestate[b'line_offset']:
	modestate[b'line_offset'] = newpos			modestate[b'line_offset'] = newpos
	elif newpos > modestate[b'line_offset'] + self.page_height - 1:			elif newpos > modestate[b'line_offset'] + self.page_height - 1:
	modestate[b'line_offset'] = newpos - self.page_height + 1			modestate[b'line_offset'] = newpos - self.page_height + 1

	# Reset the patch view region to the top of the new patch.			# Reset the patch view region to the top of the new patch.
	self.modes[MODE_PATCH][b'line_offset'] = 0			self.modes[MODE_PATCH][b'line_offset'] = 0

				def change_mode(self, mode):
				curmode, _ = self.mode
				self.mode = (mode, curmode)
				if mode == MODE_PATCH:
				self.modes[MODE_PATCH][b'patchcontents'] = self.patch_contents()


	def _chisteditmain(repo, rules, stdscr):			def _chisteditmain(repo, rules, stdscr):
	try:			try:
	curses.use_default_colors()			curses.use_default_colors()
	except curses.error:			except curses.error:
	pass			pass

	# initialize color pattern			# initialize color pattern

	# eventloop			# eventloop
	ch = None			ch = None
	stdscr.clear()			stdscr.clear()
	stdscr.refresh()			stdscr.refresh()
	while True:			while True:
	oldmode, unused = state.mode			oldmode, unused = state.mode
	if oldmode == MODE_INIT:			if oldmode == MODE_INIT:
	changemode(state, MODE_RULES)			state.change_mode(MODE_RULES)
	e = state.event(ch)			e = state.event(ch)

	if e == E_QUIT:			if e == E_QUIT:
	return False			return False
	if e == E_HISTEDIT:			if e == E_HISTEDIT:
	return state.rules			return state.rules
	else:			else:
	if e == E_RESIZE:			if e == E_RESIZE:

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	30732		Oct 12 2021, 1:04 PM	★	★
Diff 2	30784	rHG7d2464b6e30b0951e09c5c1e89d3b42eefdb58d6	Oct 12 2021, 12:16 PM	★	★

This is an archive of the discontinued Mercurial Phabricator instance.

chistedit: move changemode() onto state classClosedPublic

Details

Diff Detail

Event Timeline

Revision ContentsChangeset List

Diff 30732

hgext/histedit.py

chistedit: move changemode() onto state class
ClosedPublic

Revision Contents
Changeset List