comparison tests/test-commit-interactive.t @ 45877:ac362d5a7893

errors: introduce CanceledError and use it in a few places This very similar to earlier patches (e.g. for `InputError`) and part of https://www.mercurial-scm.org/wiki/ErrorCategoriesPlan. Differential Revision: https://phab.mercurial-scm.org/D9339
author Martin von Zweigbergk <martinvonz@google.com>
date Thu, 22 Oct 2020 14:14:59 -0700
parents 96ca817ec192
children 00ae1fb6c459
comparison
equal deleted inserted replaced
45876:568c05d8f3d2 45877:ac362d5a7893
883 ? - ? (display help) 883 ? - ? (display help)
884 examine changes to 'subdir/f1'? 884 examine changes to 'subdir/f1'?
885 (enter ? for help) [Ynesfdaq?] q 885 (enter ? for help) [Ynesfdaq?] q
886 886
887 abort: user quit 887 abort: user quit
888 [255] 888 [250]
889 889
890 Patterns 890 Patterns
891 891
892 $ hg commit -i 'glob:f*' << EOF 892 $ hg commit -i 'glob:f*' << EOF
893 > y 893 > y
1012 1 hunks, 1 lines changed 1012 1 hunks, 1 lines changed
1013 examine changes to 'subdir/f2'? 1013 examine changes to 'subdir/f2'?
1014 (enter ? for help) [Ynesfdaq?] q 1014 (enter ? for help) [Ynesfdaq?] q
1015 1015
1016 abort: user quit 1016 abort: user quit
1017 [255] 1017 [250]
1018 1018
1019 s, all 1019 s, all
1020 1020
1021 $ hg commit -i -d '18 0' -mx <<EOF 1021 $ hg commit -i -d '18 0' -mx <<EOF
1022 > s 1022 > s
1417 cannot edit patch for whole file 1417 cannot edit patch for whole file
1418 examine changes to 'editedfile'? 1418 examine changes to 'editedfile'?
1419 (enter ? for help) [Ynesfdaq?] q 1419 (enter ? for help) [Ynesfdaq?] q
1420 1420
1421 abort: user quit 1421 abort: user quit
1422 [255] 1422 [250]
1423 $ hg revert editedfile 1423 $ hg revert editedfile
1424 1424
1425 Removing changes from patch 1425 Removing changes from patch
1426 1426
1427 $ sed -e '3s/third/second/' -e '2s/will/will not/' -e 1d editedfile > tmp 1427 $ sed -e '3s/third/second/' -e '2s/will/will not/' -e 1d editedfile > tmp