This is an archive of the discontinued Mercurial Phabricator instance.

Differential D7912

py3: fix curses chunkselector fallback (when diffs are too large) on py3
ClosedPublic

Authored by spectral on Jan 16 2020, 3:20 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG19533e4c3450: py3: fix curses chunkselector fallback (when diffs are too large) on py3
Summary

Previously we showed the message using Exception.message, which is removed in
py3. Since crecordmod.fallbackerror inherits from error.Abort, we can just use
b'%s' % exception to print the message. This does not print the hint, but
that's fine - we don't set one. We inherit from error.Abort so that if a
codepath doesn't handle fallback specially, it exits to the terminal with a sane
message instead of an unknown exception error.

Diff Detail

Repository
rHG Mercurial
Branch
default
Lint
No Linters Available
Unit
No Unit Test Coverage

Event Timeline

spectral created this revision.Jan 16 2020, 3:20 PM
spectral added a commit: rHG19533e4c3450: py3: fix curses chunkselector fallback (when diffs are too large) on py3.Jan 16 2020, 4:49 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHG19533e4c3450: py3: fix curses chunkselector fallback (when diffs are too large) on py3 (authored by spectral). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/cmdutil.py (2 lines)

Diff 19379

mercurial/cmdutil.py

) )
else: else:
recordfn = crecordmod.chunkselector recordfn = crecordmod.chunkselector
return crecordmod.filterpatch( return crecordmod.filterpatch(
ui, originalhunks, recordfn, operation ui, originalhunks, recordfn, operation
) )
except crecordmod.fallbackerror as e: except crecordmod.fallbackerror as e:
ui.warn(b'%s\n' % e.message) # pytype: disable=attribute-error ui.warn(b'%s\n' % e)
ui.warn(_(b'falling back to text mode\n')) ui.warn(_(b'falling back to text mode\n'))
return patch.filterpatch(ui, originalhunks, match, operation) return patch.filterpatch(ui, originalhunks, match, operation)
def recordfilter(ui, originalhunks, match, operation=None): def recordfilter(ui, originalhunks, match, operation=None):
""" Prompts the user to filter the originalhunks and return a list of """ Prompts the user to filter the originalhunks and return a list of
selected hunks. selected hunks.