Mercurial > public > mercurial-scm > hg-stable
diff tests/test-import-git.t @ 48411:6a454e7053a1
errors: return more detailed errors when failing to parse or apply patch
This patch adds subclasses of `PatchError` so we can distinguish
between failure to parse a patch from failure to apply it. It updates
the callers to raise either `InputError` or `StateError` depending on
which type of error occurred.
Differential Revision: https://phab.mercurial-scm.org/D11824
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Fri, 19 Nov 2021 12:57:53 -0800 |
| parents | 8c13f7b0ace6 |
| children | 220506bb213e |
line wrap: on
line diff
--- a/tests/test-import-git.t Fri Nov 26 17:22:14 2021 +0100 +++ b/tests/test-import-git.t Fri Nov 19 12:57:53 2021 -0800 @@ -519,7 +519,7 @@ > EOF applying patch from stdin abort: could not decode "binary2" binary patch: bad base85 character at position 6 - [255] + [10] $ hg revert -aq $ hg import -d "1000000 0" -m rename-as-binary - <<"EOF" @@ -534,7 +534,7 @@ > EOF applying patch from stdin abort: "binary2" length is 5 bytes, should be 6 - [255] + [10] $ hg revert -aq $ hg import -d "1000000 0" -m rename-as-binary - <<"EOF" @@ -548,7 +548,7 @@ > EOF applying patch from stdin abort: could not extract "binary2" binary data - [255] + [10] Simulate a copy/paste turning LF into CRLF (issue2870) @@ -748,7 +748,7 @@ > EOF applying patch from stdin abort: cannot create b: destination already exists - [255] + [20] $ cat b b @@ -768,7 +768,7 @@ cannot create b: destination already exists 1 out of 1 hunks FAILED -- saving rejects to file b.rej abort: patch failed to apply - [255] + [20] $ cat b b @@ -791,7 +791,7 @@ Hunk #1 FAILED at 0 1 out of 1 hunks FAILED -- saving rejects to file linkb.rej abort: patch failed to apply - [255] + [20] $ hg st ? b.rej ? linkb.rej