Show More
@@ -891,14 +891,14 b" timestamp of them isn't changed on the f" | |||||
891 | > # emulate that patch.patch() is aborted at patching on "abort" file |
|
891 | > # emulate that patch.patch() is aborted at patching on "abort" file | |
892 | > from mercurial import error, extensions, patch as patchmod |
|
892 | > from mercurial import error, extensions, patch as patchmod | |
893 | > def patch(orig, ui, repo, patchname, |
|
893 | > def patch(orig, ui, repo, patchname, | |
894 | > strip=1, prefix='', files=None, |
|
894 | > strip=1, prefix=b'', files=None, | |
895 | > eolmode='strict', similarity=0): |
|
895 | > eolmode=b'strict', similarity=0): | |
896 | > if files is None: |
|
896 | > if files is None: | |
897 | > files = set() |
|
897 | > files = set() | |
898 | > r = orig(ui, repo, patchname, |
|
898 | > r = orig(ui, repo, patchname, | |
899 | > strip=strip, prefix=prefix, files=files, |
|
899 | > strip=strip, prefix=prefix, files=files, | |
900 | > eolmode=eolmode, similarity=similarity) |
|
900 | > eolmode=eolmode, similarity=similarity) | |
901 | > if 'abort' in files: |
|
901 | > if b'abort' in files: | |
902 | > raise error.PatchError('intentional error while patching') |
|
902 | > raise error.PatchError('intentional error while patching') | |
903 | > return r |
|
903 | > return r | |
904 | > def extsetup(ui): |
|
904 | > def extsetup(ui): |
General Comments 0
You need to be logged in to leave comments.
Login now