This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6131

crecord: redraw the screen when starting up chunkselector
ClosedPublic

Authored by spectral on Mar 13 2019, 11:17 PM.

Download Raw Diff

Details

Reviewers

None

Group Reviewers

hg-reviewers

Commits

rHGcde5827d09a7: crecord: redraw the screen when starting up chunkselector

Summary

Failure to do this can cause screen corruption like:

<headerline>
 [X] filename.cc
<several blank lines>
<output from previous iteration of split that happened to be here>

I believe this might only happen in some terminals, and maybe only when using
the "alternate screen". Regardless of the exact conditions to reproduce, it
should be safe to always clear it when starting up and is probably the correct
thing to do anyway :)

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

spectral created this revision.Mar 13 2019, 11:17 PM

Herald added a reviewer: hg-reviewers. · View Herald TranscriptMar 13 2019, 11:17 PM

Herald added a subscriber: mercurial-devel. · View Herald Transcript

martinvonz added a subscriber: martinvonz.Mar 14 2019, 12:30 AM

martinvonz added inline comments.

mercurial/crecord.py
536–537	I assume this patch was based on some local commit that we don't have in core (and don't want in core :)). Can you rebase it to @ and update?

spectral updated this revision to Diff 14491.Mar 14 2019, 1:56 AM

spectral added inline comments.Mar 14 2019, 1:57 AM

mercurial/crecord.py
536–537	D6129, apparently... I'll see myself to the shamecube.

Closed by commit rHGcde5827d09a7: crecord: redraw the screen when starting up chunkselector (authored by spectral). · Explain WhyMar 20 2019, 2:07 PM

This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

			Path	Packages
M			mercurial/crecord.py (6 lines)

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	14490		Mar 13 2019, 11:17 PM	★	★
Diff 2	14491		Mar 14 2019, 1:56 AM	★	★
Diff 3	14573	rHGcde5827d09a73cddd67ff69035e33b37ada88de6	Mar 13 2019, 11:09 PM	★	★

Diff 14573

mercurial/crecord.py

	curses interface to get selection of chunks, and mark the applied flags			curses interface to get selection of chunks, and mark the applied flags
	of the chosen chunks.			of the chosen chunks.
	"""			"""
	ui.write(_('starting interactive selection\n'))			ui.write(_('starting interactive selection\n'))
	chunkselector = curseschunkselector(headerlist, ui, operation)			chunkselector = curseschunkselector(headerlist, ui, operation)
	origsigtstp = sentinel = object()			origsigtstp = sentinel = object()
	if util.safehasattr(signal, 'SIGTSTP'):			if util.safehasattr(signal, 'SIGTSTP'):
	origsigtstp = signal.getsignal(signal.SIGTSTP)			origsigtstp = signal.getsignal(signal.SIGTSTP)
	try:			try:
	curses.wrapper(chunkselector.main)			curses.wrapper(chunkselector.main)
	martinvonzUnsubmitted Not Done I assume this patch was based on some local commit that we don't have in core (and don't want in core :)). Can you rebase it to @ and update? martinvonz: I assume this patch was based on some local commit that we don't have in core (and don't want…
	spectralAuthorUnsubmitted Not Done D6129, apparently... I'll see myself to the shamecube. spectral: D6129, apparently... I'll see myself to the shamecube.
	if chunkselector.initexc is not None:			if chunkselector.initexc is not None:
	raise chunkselector.initexc			raise chunkselector.initexc
	# ncurses does not restore signal handler for SIGTSTP			# ncurses does not restore signal handler for SIGTSTP
	finally:			finally:
	if origsigtstp is not sentinel:			if origsigtstp is not sentinel:
	signal.signal(signal.SIGTSTP, origsigtstp)			signal.signal(signal.SIGTSTP, origsigtstp)
	return chunkselector.opts			return chunkselector.opts

	self.yscreensize, self.xscreensize = self.stdscr.getmaxyx()			self.yscreensize, self.xscreensize = self.stdscr.getmaxyx()

	curses.start_color()			curses.start_color()
	try:			try:
	curses.use_default_colors()			curses.use_default_colors()
	except curses.error:			except curses.error:
	self.usecolor = False			self.usecolor = False

				# In some situations we may have some cruft left on the "alternate
				# screen" from another program (or previous iterations of ourself), and
				# we won't clear it if the scroll region is small enough to comfortably
				# fit on the terminal.
				self.stdscr.clear()

	# available colors: black, blue, cyan, green, magenta, white, yellow			# available colors: black, blue, cyan, green, magenta, white, yellow
	# init_pair(color_id, foreground_color, background_color)			# init_pair(color_id, foreground_color, background_color)
	self.initcolorpair(None, None, name="normal")			self.initcolorpair(None, None, name="normal")
	self.initcolorpair(curses.COLOR_WHITE, curses.COLOR_MAGENTA,			self.initcolorpair(curses.COLOR_WHITE, curses.COLOR_MAGENTA,
	name="selected")			name="selected")
	self.initcolorpair(curses.COLOR_RED, None, name="deletion")			self.initcolorpair(curses.COLOR_RED, None, name="deletion")
	self.initcolorpair(curses.COLOR_GREEN, None, name="addition")			self.initcolorpair(curses.COLOR_GREEN, None, name="addition")
	self.initcolorpair(curses.COLOR_WHITE, curses.COLOR_BLUE, name="legend")			self.initcolorpair(curses.COLOR_WHITE, curses.COLOR_BLUE, name="legend")