This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11825

patch: add hint about mangled whitespace on bad patch
ClosedPublic

Authored by martinvonz on Nov 29 2021, 4:57 PM.

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHG220506bb213e: patch: add hint about mangled whitespace on bad patch
Summary

One of the most common reasons that a patch doesn't apply is because
its whitespace has been mangled (e.g. by their mail client or though
copy&paste). Let's provide a hint about that.

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

PathPackages
Mmercurial/cmdutil.py (14 lines)
Mtests/test-import-git.t (3 lines)
Mtests/test-import.t (3 lines)

Diff 31212

mercurial/cmdutil.py

tmpname, tmpname,
strip=strip, strip=strip,
prefix=prefix, prefix=prefix,
files=files, files=files,
eolmode=None, eolmode=None,
similarity=sim / 100.0, similarity=sim / 100.0,
) )
except error.PatchParseError as e: except error.PatchParseError as e:
raise error.InputError(pycompat.bytestr(e)) raise error.InputError(
pycompat.bytestr(e),
hint=_(
b'check that whitespace in the patch has not been mangled'
),
)
except error.PatchApplicationError as e: except error.PatchApplicationError as e:
if not partial: if not partial:
raise error.StateError(pycompat.bytestr(e)) raise error.StateError(pycompat.bytestr(e))
if partial: if partial:
rejects = True rejects = True
files = list(files) files = list(files)
if nocommit: if nocommit:
store, store,
tmpname, tmpname,
strip, strip,
prefix, prefix,
files, files,
eolmode=None, eolmode=None,
) )
except error.PatchParseError as e: except error.PatchParseError as e:
raise error.InputError(stringutil.forcebytestr(e)) raise error.InputError(
stringutil.forcebytestr(e),
hint=_(
b'check that whitespace in the patch has not been mangled'
),
)
except error.PatchApplicationError as e: except error.PatchApplicationError as e:
raise error.StateError(stringutil.forcebytestr(e)) raise error.StateError(stringutil.forcebytestr(e))
if opts.get(b'exact'): if opts.get(b'exact'):
editor = None editor = None
else: else:
editor = getcommiteditor(editform=b'import.bypass') editor = getcommiteditor(editform=b'import.bypass')
memctx = context.memctx( memctx = context.memctx(
repo, repo,

tests/test-import-git.t

> index 78981922613b2afb6025042ff6bd878ac1994e85..10efcb362e9f3b3420fcfbfc0e37f3dc16e29757 > index 78981922613b2afb6025042ff6bd878ac1994e85..10efcb362e9f3b3420fcfbfc0e37f3dc16e29757
> GIT binary patch > GIT binary patch
> literal 5 > literal 5
> Mc$`b*O.$Pw00T?_*Z=?k > Mc$`b*O.$Pw00T?_*Z=?k
> >
> EOF > EOF
applying patch from stdin applying patch from stdin
abort: could not decode "binary2" binary patch: bad base85 character at position 6 abort: could not decode "binary2" binary patch: bad base85 character at position 6
(check that whitespace in the patch has not been mangled)
[10] [10]
$ hg revert -aq $ hg revert -aq
$ hg import -d "1000000 0" -m rename-as-binary - <<"EOF" $ hg import -d "1000000 0" -m rename-as-binary - <<"EOF"
> diff --git a/text2 b/binary2 > diff --git a/text2 b/binary2
> rename from text2 > rename from text2
> rename to binary2 > rename to binary2
> index 78981922613b2afb6025042ff6bd878ac1994e85..10efcb362e9f3b3420fcfbfc0e37f3dc16e29757 > index 78981922613b2afb6025042ff6bd878ac1994e85..10efcb362e9f3b3420fcfbfc0e37f3dc16e29757
> GIT binary patch > GIT binary patch
> literal 6 > literal 6
> Mc$`b*O5$Pw00T?_*Z=?k > Mc$`b*O5$Pw00T?_*Z=?k
> >
> EOF > EOF
applying patch from stdin applying patch from stdin
abort: "binary2" length is 5 bytes, should be 6 abort: "binary2" length is 5 bytes, should be 6
(check that whitespace in the patch has not been mangled)
[10] [10]
$ hg revert -aq $ hg revert -aq
$ hg import -d "1000000 0" -m rename-as-binary - <<"EOF" $ hg import -d "1000000 0" -m rename-as-binary - <<"EOF"
> diff --git a/text2 b/binary2 > diff --git a/text2 b/binary2
> rename from text2 > rename from text2
> rename to binary2 > rename to binary2
> index 78981922613b2afb6025042ff6bd878ac1994e85..10efcb362e9f3b3420fcfbfc0e37f3dc16e29757 > index 78981922613b2afb6025042ff6bd878ac1994e85..10efcb362e9f3b3420fcfbfc0e37f3dc16e29757
> GIT binary patch > GIT binary patch
> Mc$`b*O5$Pw00T?_*Z=?k > Mc$`b*O5$Pw00T?_*Z=?k
> >
> EOF > EOF
applying patch from stdin applying patch from stdin
abort: could not extract "binary2" binary data abort: could not extract "binary2" binary data
(check that whitespace in the patch has not been mangled)
[10] [10]
Simulate a copy/paste turning LF into CRLF (issue2870) Simulate a copy/paste turning LF into CRLF (issue2870)
$ hg revert -aq $ hg revert -aq
$ cat > binary.diff <<"EOF" $ cat > binary.diff <<"EOF"
> diff --git a/text2 b/binary2 > diff --git a/text2 b/binary2
> rename from text2 > rename from text2

tests/test-import.t

added 1 changesets with 2 changes to 2 files added 1 changesets with 2 changes to 2 files
new changesets 80971e65b431 new changesets 80971e65b431
updating to branch default updating to branch default
2 files updated, 0 files merged, 0 files removed, 0 files unresolved 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ sed 's/1,1/foo/' < diffed-tip.patch > broken.patch $ sed 's/1,1/foo/' < diffed-tip.patch > broken.patch
$ hg --cwd b import -mpatch ../broken.patch $ hg --cwd b import -mpatch ../broken.patch
applying ../broken.patch applying ../broken.patch
abort: bad hunk #1 abort: bad hunk #1
(check that whitespace in the patch has not been mangled)
[10] [10]
$ rm -r b $ rm -r b
hg -R repo import hg -R repo import
put the clone in a subdir - having a directory named "a" put the clone in a subdir - having a directory named "a"
used to hide a bug. used to hide a bug.
$ mkdir dir $ mkdir dir
$ hg import - <<'EOF' $ hg import - <<'EOF'
> diff --git a/foo b/foo > diff --git a/foo b/foo
> --- a/foo > --- a/foo
> --- b/foo > --- b/foo
> @@ -0,0 +1,1 @@ > @@ -0,0 +1,1 @@
> EOF > EOF
applying patch from stdin applying patch from stdin
abort: bad hunk #1: incomplete hunk abort: bad hunk #1: incomplete hunk
(check that whitespace in the patch has not been mangled)
[10] [10]
$ hg import - <<'EOF' $ hg import - <<'EOF'
> diff --git a/foo b/foo > diff --git a/foo b/foo
> --- a/foo > --- a/foo
> --- b/foo > --- b/foo
> @@ -0,0 +1,1 @@ > @@ -0,0 +1,1 @@
> \ No newline at end of file > \ No newline at end of file
> EOF > EOF
applying patch from stdin applying patch from stdin
abort: bad hunk #1: incomplete hunk abort: bad hunk #1: incomplete hunk
(check that whitespace in the patch has not been mangled)
[10] [10]