comparison tests/test-rebase-detach.t @ 45826:21733e8c924f

errors: add config that lets user get more detailed exit codes This adds an experimental config that lets the user get more detailed exit codes. For example, there will be a specific error code for input/user errors. This is part of https://www.mercurial-scm.org/wiki/ErrorCategoriesPlan. I've made the config part of tweakdefaults. I've made the config enabled by default in tests. My reasoning is that we want to see that each specific error case gives the right exit code and we don't want to duplicate all error cases in the entire test suite. It also makes it easy to grep the `.t` files for `[255]` to find which cases we have left to fix. The logic for the current exit codes is quite simple, so I'm not too worried about regressions there. I've added a test case specifically for the "legacy" exit codes. I've set the detailed exit status only for the case of `InterventionRequired` and `SystemExit` for now (the cases where we currently return something other than 255), just to show that it works. Differential Revision: https://phab.mercurial-scm.org/D9238
author Martin von Zweigbergk <martinvonz@google.com>
date Wed, 21 Oct 2020 19:00:16 -0700
parents f90a5c211251
children
comparison
equal deleted inserted replaced
45825:8f07f5a9c3de 45826:21733e8c924f
296 $ hg rebase -s . -d B --config ui.merge=internal:merge 296 $ hg rebase -s . -d B --config ui.merge=internal:merge
297 rebasing 3:17b4880d2402 tip "B2" 297 rebasing 3:17b4880d2402 tip "B2"
298 merging B 298 merging B
299 warning: conflicts while merging B! (edit, then use 'hg resolve --mark') 299 warning: conflicts while merging B! (edit, then use 'hg resolve --mark')
300 unresolved conflicts (see 'hg resolve', then 'hg rebase --continue') 300 unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')
301 [1] 301 [240]
302 $ hg resolve --all -t internal:local 302 $ hg resolve --all -t internal:local
303 (no more unresolved files) 303 (no more unresolved files)
304 continue: hg rebase --continue 304 continue: hg rebase --continue
305 $ hg rebase -c 305 $ hg rebase -c
306 rebasing 3:17b4880d2402 tip "B2" 306 rebasing 3:17b4880d2402 tip "B2"