This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9339

errors: introduce CanceledError and use it in a few places
ClosedPublic

Authored by martinvonz on Nov 17 2020, 7:56 PM.

Details

Reviewers
mharbison72
Group Reviewers
hg-reviewers
Commits
rHGac362d5a7893: errors: introduce CanceledError and use it in a few places
rHGa189f6482f03: errors: introduce CanceledError and use it in a few places
Summary

This very similar to earlier patches (e.g. for InputError) and part
of https://www.mercurial-scm.org/wiki/ErrorCategoriesPlan.

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.

Revision Contents
Changeset List

Diff 23562

hgext/absorb.py

if not opts.get(b'dry_run'): if not opts.get(b'dry_run'):
if ( if (
not opts.get(b'apply_changes') not opts.get(b'apply_changes')
and state.ctxaffected and state.ctxaffected
and ui.promptchoice( and ui.promptchoice(
b"apply changes (y/N)? $$ &Yes $$ &No", default=1 b"apply changes (y/N)? $$ &Yes $$ &No", default=1
) )
): ):
raise error.Abort(_(b'absorb cancelled\n')) raise error.CanceledError(_(b'absorb cancelled\n'))
state.apply() state.apply()
if state.commit(): if state.commit():
state.printchunkstats() state.printchunkstats()
elif not ui.quiet: elif not ui.quiet:
ui.write(_(b'nothing applied\n')) ui.write(_(b'nothing applied\n'))
return state return state

mercurial/commands.py

hint=b'use --all to re-merge all unresolved files', hint=b'use --all to re-merge all unresolved files',
) )
if confirm: if confirm:
if all: if all:
if ui.promptchoice( if ui.promptchoice(
_(b're-merge all unresolved files (yn)?$$ &Yes $$ &No') _(b're-merge all unresolved files (yn)?$$ &Yes $$ &No')
): ):
raise error.Abort(_(b'user quit')) raise error.CanceledError(_(b'user quit'))
if mark and not pats: if mark and not pats:
if ui.promptchoice( if ui.promptchoice(
_( _(
b'mark all unresolved files as resolved (yn)?' b'mark all unresolved files as resolved (yn)?'
b'$$ &Yes $$ &No' b'$$ &Yes $$ &No'
) )
): ):
raise error.Abort(_(b'user quit')) raise error.CanceledError(_(b'user quit'))
if unmark and not pats: if unmark and not pats:
if ui.promptchoice( if ui.promptchoice(
_( _(
b'mark all resolved files as unresolved (yn)?' b'mark all resolved files as unresolved (yn)?'
b'$$ &Yes $$ &No' b'$$ &Yes $$ &No'
) )
): ):
raise error.Abort(_(b'user quit')) raise error.CanceledError(_(b'user quit'))
uipathfn = scmutil.getuipathfn(repo) uipathfn = scmutil.getuipathfn(repo)
if show: if show:
ui.pager(b'resolve') ui.pager(b'resolve')
fm = ui.formatter(b'resolve', opts) fm = ui.formatter(b'resolve', opts)
ms = mergestatemod.mergestate.read(repo) ms = mergestatemod.mergestate.read(repo)
wctx = repo[None] wctx = repo[None]

mercurial/crecord.py

self.downarrowshiftevent() self.downarrowshiftevent()
elif keypressed in ["l", "KEY_RIGHT"]: elif keypressed in ["l", "KEY_RIGHT"]:
self.rightarrowevent() self.rightarrowevent()
elif keypressed in ["h", "KEY_LEFT"]: elif keypressed in ["h", "KEY_LEFT"]:
self.leftarrowevent() self.leftarrowevent()
elif keypressed in ["H", "KEY_SLEFT"]: elif keypressed in ["H", "KEY_SLEFT"]:
self.leftarrowshiftevent() self.leftarrowshiftevent()
elif keypressed in ["q"]: elif keypressed in ["q"]:
raise error.Abort(_(b'user quit')) raise error.CanceledError(_(b'user quit'))
elif keypressed in ['a']: elif keypressed in ['a']:
self.flipselections() self.flipselections()
elif keypressed in ["c"]: elif keypressed in ["c"]:
return True return True
elif keypressed in ["r"]: elif keypressed in ["r"]:
if self.reviewcommit(): if self.reviewcommit():
self.opts[b'review'] = True self.opts[b'review'] = True
return True return True

mercurial/error.py

class StateError(Abort): class StateError(Abort):
"""Indicates that the operation might work if retried in a different state. """Indicates that the operation might work if retried in a different state.
Examples: Unresolved merge conflicts, unfinished operations. Examples: Unresolved merge conflicts, unfinished operations.
""" """
class CanceledError(Abort):
"""Indicates that the user canceled the operation.
Examples: Close commit editor with error status, quit chistedit.
"""
class HookLoadError(Abort): class HookLoadError(Abort):
"""raised when loading a hook fails, aborting an operation """raised when loading a hook fails, aborting an operation
Exists to allow more specialized catching.""" Exists to allow more specialized catching."""
class HookAbort(Abort): class HookAbort(Abort):
"""raised when a validation hook fails, aborting an operation """raised when a validation hook fails, aborting an operation

mercurial/exchange.py

ui.warn( ui.warn(
_(b'%i changesets about to be published\n') % len(published) _(b'%i changesets about to be published\n') % len(published)
) )
elif behavior == b'confirm': elif behavior == b'confirm':
if ui.promptchoice( if ui.promptchoice(
_(b'push and publish %i changesets (yn)?$$ &Yes $$ &No') _(b'push and publish %i changesets (yn)?$$ &Yes $$ &No')
% len(published) % len(published)
): ):
raise error.Abort(_(b'user quit')) raise error.CanceledError(_(b'user quit'))
elif behavior == b'abort': elif behavior == b'abort':
msg = _(b'push would publish %i changesets') % len(published) msg = _(b'push would publish %i changesets') % len(published)
hint = _( hint = _(
b"use --publish or adjust 'experimental.auto-publish'" b"use --publish or adjust 'experimental.auto-publish'"
b" config" b" config"
) )
raise error.Abort(msg, hint=hint) raise error.Abort(msg, hint=hint)

mercurial/patch.py

ret = skipfile = False ret = skipfile = False
elif r == 4: # file (Record remaining) elif r == 4: # file (Record remaining)
ret = skipfile = True ret = skipfile = True
elif r == 5: # done, skip remaining elif r == 5: # done, skip remaining
ret = skipall = False ret = skipall = False
elif r == 6: # all elif r == 6: # all
ret = skipall = True ret = skipall = True
elif r == 7: # quit elif r == 7: # quit
raise error.Abort(_(b'user quit')) raise error.CanceledError(_(b'user quit'))
return ret, skipfile, skipall, newpatches return ret, skipfile, skipall, newpatches
seen = set() seen = set()
applied = {} # 'filename' -> [] of chunks applied = {} # 'filename' -> [] of chunks
skipfile, skipall = None, None skipfile, skipall = None, None
pos, total = 1, sum(len(h.hunks) for h in headers) pos, total = 1, sum(len(h.hunks) for h in headers)
for h in headers: for h in headers:
pos += len(h.hunks) pos += len(h.hunks)

mercurial/scmutil.py

ui.error(_(b"abort: working directory revision cannot be specified\n")) ui.error(_(b"abort: working directory revision cannot be specified\n"))
except error.Abort as inst: except error.Abort as inst:
if isinstance(inst, error.InputError): if isinstance(inst, error.InputError):
detailed_exit_code = 10 detailed_exit_code = 10
elif isinstance(inst, error.StateError): elif isinstance(inst, error.StateError):
detailed_exit_code = 20 detailed_exit_code = 20
elif isinstance(inst, error.ConfigError): elif isinstance(inst, error.ConfigError):
detailed_exit_code = 30 detailed_exit_code = 30
elif isinstance(inst, error.CanceledError):
detailed_exit_code = 250
ui.error(_(b"abort: %s\n") % inst.message) ui.error(_(b"abort: %s\n") % inst.message)
if inst.hint: if inst.hint:
ui.error(_(b"(%s)\n") % inst.hint) ui.error(_(b"(%s)\n") % inst.hint)
except error.WorkerError as inst: except error.WorkerError as inst:
# Don't print a message -- the worker already should have # Don't print a message -- the worker already should have
return inst.status_code return inst.status_code
except ImportError as inst: except ImportError as inst:
ui.error(_(b"abort: %s!\n") % stringutil.forcebytestr(inst)) ui.error(_(b"abort: %s!\n") % stringutil.forcebytestr(inst))

mercurial/ui.py

if pending: if pending:
environ.update({b'HG_PENDING': pending}) environ.update({b'HG_PENDING': pending})
editor = self.geteditor() editor = self.geteditor()
self.system( self.system(
b"%s \"%s\"" % (editor, name), b"%s \"%s\"" % (editor, name),
environ=environ, environ=environ,
onerr=error.Abort, onerr=error.CanceledError,
errprefix=_(b"edit failed"), errprefix=_(b"edit failed"),
blockedtag=b'editor', blockedtag=b'editor',
) )
with open(name, 'rb') as f: with open(name, 'rb') as f:
t = util.fromnativeeol(f.read()) t = util.fromnativeeol(f.read())
finally: finally:
os.unlink(name) os.unlink(name)

tests/test-commit-interactive.t

d - done, skip remaining changes and files d - done, skip remaining changes and files
a - record all changes to all remaining files a - record all changes to all remaining files
q - quit, recording no changes q - quit, recording no changes
? - ? (display help) ? - ? (display help)
examine changes to 'subdir/f1'? examine changes to 'subdir/f1'?
(enter ? for help) [Ynesfdaq?] q (enter ? for help) [Ynesfdaq?] q
abort: user quit abort: user quit
[255] [250]
Patterns Patterns
$ hg commit -i 'glob:f*' << EOF $ hg commit -i 'glob:f*' << EOF
> y > y
> n > n
> y > y
> n > n
(enter ? for help) [Ynesfdaq?] f (enter ? for help) [Ynesfdaq?] f
diff --git a/subdir/f2 b/subdir/f2 diff --git a/subdir/f2 b/subdir/f2
1 hunks, 1 lines changed 1 hunks, 1 lines changed
examine changes to 'subdir/f2'? examine changes to 'subdir/f2'?
(enter ? for help) [Ynesfdaq?] q (enter ? for help) [Ynesfdaq?] q
abort: user quit abort: user quit
[255] [250]
s, all s, all
$ hg commit -i -d '18 0' -mx <<EOF $ hg commit -i -d '18 0' -mx <<EOF
> s > s
> a > a
> EOF > EOF
diff --git a/subdir/f1 b/subdir/f1 diff --git a/subdir/f1 b/subdir/f1
examine changes to 'editedfile'? examine changes to 'editedfile'?
(enter ? for help) [Ynesfdaq?] e (enter ? for help) [Ynesfdaq?] e
cannot edit patch for whole file cannot edit patch for whole file
examine changes to 'editedfile'? examine changes to 'editedfile'?
(enter ? for help) [Ynesfdaq?] q (enter ? for help) [Ynesfdaq?] q
abort: user quit abort: user quit
[255] [250]
$ hg revert editedfile $ hg revert editedfile
Removing changes from patch Removing changes from patch
$ sed -e '3s/third/second/' -e '2s/will/will not/' -e 1d editedfile > tmp $ sed -e '3s/third/second/' -e '2s/will/will not/' -e 1d editedfile > tmp
$ mv tmp editedfile $ mv tmp editedfile
$ echo "This line has been added" >> editedfile $ echo "This line has been added" >> editedfile
$ cat > editor.sh << '__EOF__' $ cat > editor.sh << '__EOF__'

tests/test-commit.t

Failed commit with --addremove should not update dirstate Failed commit with --addremove should not update dirstate
$ echo foo > newfile $ echo foo > newfile
$ hg status $ hg status
? newfile ? newfile
$ HGEDITOR=false hg ci --addremove $ HGEDITOR=false hg ci --addremove
adding newfile adding newfile
abort: edit failed: false exited with status 1 abort: edit failed: false exited with status 1
[255] [250]
$ hg status $ hg status
? newfile ? newfile
Make sure we do not obscure unknown requires file entries (issue2649) Make sure we do not obscure unknown requires file entries (issue2649)
$ echo foo >> foo $ echo foo >> foo
$ echo fake >> .hg/requires $ echo fake >> .hg/requires
$ hg commit -m bla $ hg commit -m bla

tests/test-editor-filename.t

$ HGEDITOR="sh $TESTTMP/editor.sh" $ HGEDITOR="sh $TESTTMP/editor.sh"
$ export HGEDITOR $ export HGEDITOR
Verify that the path for a commit editor has the expected suffix. Verify that the path for a commit editor has the expected suffix.
$ hg commit $ hg commit
*.commit.hg.txt (glob) *.commit.hg.txt (glob)
abort: edit failed: sh exited with status 1 abort: edit failed: sh exited with status 1
[255] [250]
Verify that the path for a histedit editor has the expected suffix. Verify that the path for a histedit editor has the expected suffix.
$ cat >> $HGRCPATH <<EOF $ cat >> $HGRCPATH <<EOF
> [extensions] > [extensions]
> rebase= > rebase=
> histedit= > histedit=
> EOF > EOF
$ hg commit --message 'At least one commit for histedit.' $ hg commit --message 'At least one commit for histedit.'
$ hg histedit $ hg histedit
*.histedit.hg.txt (glob) *.histedit.hg.txt (glob)
abort: edit failed: sh exited with status 1 abort: edit failed: sh exited with status 1
[255] [250]
Verify that when performing an action that has the side-effect of creating an Verify that when performing an action that has the side-effect of creating an
editor for a diff, the file ends in .diff. editor for a diff, the file ends in .diff.
$ echo 1 > one $ echo 1 > one
$ echo 2 > two $ echo 2 > two
$ hg add $ hg add
adding one adding one
(enter ? for help) [Ynesfdaq?] e (enter ? for help) [Ynesfdaq?] e
*.diff (glob) *.diff (glob)
editor exited with exit code 1 editor exited with exit code 1
record change 1/2 to 'one'? record change 1/2 to 'one'?
(enter ? for help) [Ynesfdaq?] q (enter ? for help) [Ynesfdaq?] q
abort: user quit abort: user quit
[255] [250]

tests/test-rebase-collapse.t

$ echo BD > A $ echo BD > A
$ hg resolve -m $ hg resolve -m
(no more unresolved files) (no more unresolved files)
continue: hg rebase --continue continue: hg rebase --continue
$ HGEDITOR=false hg rebase --continue --config ui.interactive=1 $ HGEDITOR=false hg rebase --continue --config ui.interactive=1
already rebased 1:f899f3910ce7 B "B" as 82b8abf9c185 already rebased 1:f899f3910ce7 B "B" as 82b8abf9c185
rebasing 3:63668d570d21 C tip "C" rebasing 3:63668d570d21 C tip "C"
abort: edit failed: false exited with status 1 abort: edit failed: false exited with status 1
[255] [250]
$ hg tglog $ hg tglog
o 3: 63668d570d21 'C' o 3: 63668d570d21 'C'
| |
| @ 2: 82b8abf9c185 'D' | @ 2: 82b8abf9c185 'D'
| | | |
o | 1: f899f3910ce7 'B' o | 1: f899f3910ce7 'B'
|/ |/
o 0: 4a2df7238c3b 'A' o 0: 4a2df7238c3b 'A'
$ hg rebase --continue $ hg rebase --continue
already rebased 1:f899f3910ce7 B "B" as 82b8abf9c185 already rebased 1:f899f3910ce7 B "B" as 82b8abf9c185
already rebased 3:63668d570d21 C tip "C" as 82b8abf9c185 already rebased 3:63668d570d21 C tip "C" as 82b8abf9c185
saved backup bundle to $TESTTMP/aborted-editor/.hg/strip-backup/f899f3910ce7-7cab5e15-rebase.hg saved backup bundle to $TESTTMP/aborted-editor/.hg/strip-backup/f899f3910ce7-7cab5e15-rebase.hg

tests/test-rebase-transaction.t

> EOF > EOF
$ HGEDITOR=false hg --config ui.interactive=1 rebase --collapse -b D -d Z $ HGEDITOR=false hg --config ui.interactive=1 rebase --collapse -b D -d Z
rebasing 1:112478962961 B "B" rebasing 1:112478962961 B "B"
rebasing 3:26805aba1e60 C "C" rebasing 3:26805aba1e60 C "C"
rebasing 5:f585351a92f8 D tip "D" rebasing 5:f585351a92f8 D tip "D"
transaction abort! transaction abort!
rollback completed rollback completed
abort: edit failed: false exited with status 1 abort: edit failed: false exited with status 1
[255] [250]
$ hg tglog $ hg tglog
o 5: D o 5: D
| |
| o 4: Z | o 4: Z
| | | |
o | 3: C o | 3: C
| | | |
| o 2: Y | o 2: Y

tests/test-resolve.t

abort: no files or directories specified abort: no files or directories specified
(use --all to re-merge all unresolved files) (use --all to re-merge all unresolved files)
[10] [10]
$ hg resolve --all << EOF $ hg resolve --all << EOF
> n > n
> EOF > EOF
re-merge all unresolved files (yn)? n re-merge all unresolved files (yn)? n
abort: user quit abort: user quit
[255] [250]
$ hg resolve --all << EOF $ hg resolve --all << EOF
> y > y
> EOF > EOF
re-merge all unresolved files (yn)? y re-merge all unresolved files (yn)? y
merging emp1 merging emp1
merging emp2 merging emp2
merging emp3 merging emp3
U emp2 U emp2
U emp3 U emp3
$ hg resolve -m << EOF $ hg resolve -m << EOF
> n > n
> EOF > EOF
mark all unresolved files as resolved (yn)? n mark all unresolved files as resolved (yn)? n
abort: user quit abort: user quit
[255] [250]
$ hg resolve -m << EOF $ hg resolve -m << EOF
> y > y
> EOF > EOF
mark all unresolved files as resolved (yn)? y mark all unresolved files as resolved (yn)? y
(no more unresolved files) (no more unresolved files)
continue: hg rebase --continue continue: hg rebase --continue
$ hg resolve -l $ hg resolve -l
R emp2 R emp2
R emp3 R emp3
$ hg resolve -u << EOF $ hg resolve -u << EOF
> n > n
> EOF > EOF
mark all resolved files as unresolved (yn)? n mark all resolved files as unresolved (yn)? n
abort: user quit abort: user quit
[255] [250]
$ hg resolve -m << EOF $ hg resolve -m << EOF
> y > y
> EOF > EOF
mark all unresolved files as resolved (yn)? y mark all unresolved files as resolved (yn)? y
(no more unresolved files) (no more unresolved files)
continue: hg rebase --continue continue: hg rebase --continue

tests/test-revert-interactive.t

$ echo q | hg revert -i -r 2 $ echo q | hg revert -i -r 2
diff --git a/folder1/g b/folder1/g diff --git a/folder1/g b/folder1/g
1 hunks, 1 lines changed 1 hunks, 1 lines changed
examine changes to 'folder1/g'? examine changes to 'folder1/g'?
(enter ? for help) [Ynesfdaq?] q (enter ? for help) [Ynesfdaq?] q
abort: user quit abort: user quit
[255] [250]
$ ls folder1/ $ ls folder1/
g g
Test that a noop revert doesn't do an unnecessary backup Test that a noop revert doesn't do an unnecessary backup
$ (echo n) | hg revert -i -r 2 folder1/g $ (echo n) | hg revert -i -r 2 folder1/g
diff --git a/folder1/g b/folder1/g diff --git a/folder1/g b/folder1/g
1 hunks, 1 lines changed 1 hunks, 1 lines changed
@@ -3,4 +3,3 @@ @@ -3,4 +3,3 @@

tests/test-split.t

-5 -5
+55 +55
record change 3/3 to 'a'? record change 3/3 to 'a'?
(enter ? for help) [Ynesfdaq?] y (enter ? for help) [Ynesfdaq?] y
transaction abort! transaction abort!
rollback completed rollback completed
abort: edit failed: false exited with status 1 abort: edit failed: false exited with status 1
[255] [250]
$ hg status $ hg status
$ HGEDITOR="\"$PYTHON\" $TESTTMP/editor.py" $ HGEDITOR="\"$PYTHON\" $TESTTMP/editor.py"
$ runsplit $ runsplit
diff --git a/a b/a diff --git a/a b/a
3 hunks, 3 lines changed 3 hunks, 3 lines changed
examine changes to 'a'? examine changes to 'a'?
(enter ? for help) [Ynesfdaq?] y (enter ? for help) [Ynesfdaq?] y