tests: alter email `From` line to a value that's consistently parsed

Python2:
>>> email.header.decode_header('=?UTF-8?q?Rapha=C3=ABl=20Hertzog?= <[e-mail]>')
[('Rapha\xc3\xabl Hertzog', 'utf-8'), ('<[e-mail]>', None)]

Python3:
>>> email.header.decode_header('=?UTF-8?q?Rapha=C3=ABl=20Hertzog?= <[e-mail]>')
[(b'Rapha\xc3\xabl Hertzog', 'utf-8'), (b' <[e-mail]>', None)]

So alter the input to an input that parses to the same result
consistently. After skimming the relevant RFC (1342), I'm not sure if
what we had was valid, or how I could modify it to be more consistent.

Differential Revision: https://phab.mercurial-scm.org/D5769

contrib/python3-whitelist

@@ -1,750 +1,751 b''
 test-abort-checkin.t
 test-absorb-edit-lines.t
 test-absorb-filefixupstate.py
 test-absorb-phase.t
 test-absorb-rename.t
 test-absorb-strip.t
 test-absorb.t
 test-add.t
 test-addremove-similar.t
 test-addremove.t
 test-alias.t
 test-amend-subrepo.t
 test-amend.t
 test-ancestor.py
 test-annotate.py
 test-annotate.t
 test-arbitraryfilectx.t
 test-archive-symlinks.t
 test-archive.t
 test-atomictempfile.py
 test-audit-path.t
 test-audit-subrepo.t
 test-automv.t
 test-backout.t
 test-backwards-remove.t
 test-bad-extension.t
 test-bad-pull.t
 test-basic.t
 test-batching.py
 test-bdiff.py
 test-bheads.t
 test-bisect.t
 test-bisect2.t
 test-bisect3.t
 test-blackbox.t
 test-bookflow.t
 test-bookmarks-current.t
 test-bookmarks-merge.t
 test-bookmarks-pushpull.t
 test-bookmarks-rebase.t
 test-bookmarks-strip.t
 test-bookmarks.t
 test-branch-change.t
 test-branch-option.t
 test-branch-tag-confict.t
 test-branches.t
 test-bugzilla.t
 test-bundle-phases.t
 test-bundle-r.t
 test-bundle-type.t
 test-bundle-vs-outgoing.t
 test-bundle.t
 test-bundle2-exchange.t
 test-bundle2-format.t
 test-bundle2-multiple-changegroups.t
 test-bundle2-pushback.t
 test-bundle2-remote-changegroup.t
 test-cache-abuse.t
 test-cappedreader.py
 test-casecollision-merge.t
 test-casecollision.t
 test-casefolding.t
 test-cat.t
 test-cbor.py
 test-censor.t
 test-changelog-exec.t
 test-check-code.t
 test-check-commit.t
 test-check-config.py
 test-check-config.t
 test-check-execute.t
 test-check-help.t
 test-check-interfaces.py
 test-check-module-imports.t
 test-check-py3-compat.t
 test-check-pyflakes.t
 test-check-pylint.t
 test-check-shbang.t
 test-children.t
 test-churn.t
 test-clone-cgi.t
 test-clone-pull-corruption.t
 test-clone-r.t
 test-clone-uncompressed.t
 test-clone-update-order.t
 test-clone.t
 test-clonebundles.t
 test-close-head.t
 test-commandserver.t
 test-commit-amend.t
 test-commit-interactive.t
 test-commit-multiple.t
 test-commit-unresolved.t
 test-commit.t
 test-committer.t
 test-completion.t
 test-config-env.py
 test-config.t
 test-conflict.t
 test-confused-revert.t
 test-context-metadata.t
 test-context.py
 test-contrib-check-code.t
 test-contrib-check-commit.t
 test-contrib-dumprevlog.t
 test-contrib-perf.t
 test-contrib-relnotes.t
 test-contrib-testparseutil.t
 test-contrib.t
 test-convert-authormap.t
 test-convert-clonebranches.t
 test-convert-cvs-branch.t
 test-convert-cvs-detectmerge.t
 test-convert-cvs-synthetic.t
 test-convert-cvs.t
 test-convert-cvsnt-mergepoints.t
 test-convert-datesort.t
 test-convert-filemap.t
 test-convert-git.t
 test-convert-hg-sink.t
 test-convert-hg-source.t
 test-convert-hg-startrev.t
 test-convert-splicemap.t
 test-convert-svn-sink.t
 test-convert-tagsbranch-topology.t
 test-convert.t
 test-copy-move-merge.t
 test-copy.t
 test-copytrace-heuristics.t
 test-custom-filters.t
 test-debugbuilddag.t
 test-debugbundle.t
 test-debugcommands.t
 test-debugextensions.t
 test-debugindexdot.t
 test-debugrename.t
 test-default-push.t
 test-diff-antipatience.t
 test-diff-binary-file.t
 test-diff-change.t
 test-diff-color.t
 test-diff-copy-depth.t
 test-diff-hashes.t
 test-diff-ignore-whitespace.t
 test-diff-indent-heuristic.t
 test-diff-issue2761.t
 test-diff-newlines.t
 test-diff-reverse.t
 test-diff-subdir.t
 test-diff-unified.t
 test-diff-upgrade.t
 test-diffdir.t
 test-diffstat.t
 test-directaccess.t
 test-dirstate-backup.t
 test-dirstate-nonnormalset.t
 test-dirstate-race.t
 test-dirstate.t
 test-dispatch.py
 test-dispatch.t
 test-doctest.py
 test-double-merge.t
 test-drawdag.t
 test-duplicateoptions.py
 test-editor-filename.t
 test-empty-dir.t
 test-empty-file.t
 test-empty-group.t
 test-empty.t
 test-encode.t
 test-encoding-align.t
 test-encoding-func.py
 test-encoding-textwrap.t
 test-encoding.t
 test-eol-add.t
 test-eol-clone.t
 test-eol-hook.t
 test-eol-patch.t
 test-eol-tag.t
 test-eol-update.t
 test-eol.t
 test-eolfilename.t
 test-excessive-merge.t
 test-exchange-obsmarkers-case-A1.t
 test-exchange-obsmarkers-case-A2.t
 test-exchange-obsmarkers-case-A3.t
 test-exchange-obsmarkers-case-A4.t
 test-exchange-obsmarkers-case-A5.t
 test-exchange-obsmarkers-case-A6.t
 test-exchange-obsmarkers-case-A7.t
 test-exchange-obsmarkers-case-B1.t
 test-exchange-obsmarkers-case-B2.t
 test-exchange-obsmarkers-case-B3.t
 test-exchange-obsmarkers-case-B4.t
 test-exchange-obsmarkers-case-B5.t
 test-exchange-obsmarkers-case-B6.t
 test-exchange-obsmarkers-case-B7.t
 test-exchange-obsmarkers-case-C1.t
 test-exchange-obsmarkers-case-C2.t
 test-exchange-obsmarkers-case-C3.t
 test-exchange-obsmarkers-case-C4.t
 test-exchange-obsmarkers-case-D1.t
 test-exchange-obsmarkers-case-D2.t
 test-exchange-obsmarkers-case-D3.t
 test-exchange-obsmarkers-case-D4.t
 test-execute-bit.t
 test-export.t
 test-extdata.t
 test-extdiff.t
 test-extension-timing.t
 test-extensions-afterloaded.t
 test-extensions-wrapfunction.py
 test-extra-filelog-entry.t
 test-fastannotate-corrupt.t
 test-fastannotate-diffopts.t
 test-fastannotate-hg.t
 test-fastannotate-perfhack.t
 test-fastannotate-protocol.t
 test-fastannotate-renames.t
 test-fastannotate-revmap.py
 test-fastannotate.t
 test-fetch.t
 test-filebranch.t
 test-filecache.py
 test-filelog.py
 test-fileset-generated.t
 test-fileset.t
 test-fix-topology.t
 test-fix.t
 test-flags.t
 test-fncache.t
 test-gendoc-da.t
 test-gendoc-de.t
 test-gendoc-el.t
 test-gendoc-fr.t
 test-gendoc-it.t
 test-gendoc-ja.t
 test-gendoc-pt_BR.t
 test-gendoc-ro.t
 test-gendoc-ru.t
 test-gendoc-sv.t
 test-gendoc-zh_CN.t
 test-gendoc-zh_TW.t
 test-gendoc.t
 test-generaldelta.t
 test-getbundle.t
 test-git-export.t
 test-githelp.t
 test-globalopts.t
 test-glog-beautifygraph.t
 test-glog-topological.t
 test-glog.t
 test-gpg.t
 test-graft.t
 test-grep.t
 test-hardlinks.t
 test-help-hide.t
 test-help.t
 test-hg-parseurl.py
 test-hghave.t
 test-hgignore.t
 test-hgk.t
 test-hgrc.t
 test-hgweb-annotate-whitespace.t
 test-hgweb-auth.py
 test-hgweb-bundle.t
 test-hgweb-commands.t
 test-hgweb-csp.t
 test-hgweb-descend-empties.t
 test-hgweb-diffs.t
 test-hgweb-empty.t
 test-hgweb-filelog.t
 test-hgweb-no-path-info.t
 test-hgweb-no-request-uri.t
 test-hgweb-non-interactive.t
 test-hgweb-raw.t
 test-hgweb-removed.t
 test-hgweb-symrev.t
 test-hgweb.t
 test-hgwebdir-paths.py
 test-hgwebdir.t
 test-hgwebdirsym.t
 test-histedit-arguments.t
 test-histedit-base.t
 test-histedit-bookmark-motion.t
 test-histedit-commute.t
 test-histedit-drop.t
 test-histedit-edit.t
 test-histedit-fold-non-commute.t
 test-histedit-fold.t
 test-histedit-no-backup.t
 test-histedit-no-change.t
 test-histedit-non-commute-abort.t
 test-histedit-non-commute.t
 test-histedit-obsolete.t
 test-histedit-outgoing.t
 test-histedit-templates.t
 test-http-api-httpv2.t
 test-http-api.t
 test-http-bad-server.t
 test-http-branchmap.t
 test-http-bundle1.t
 test-http-clone-r.t
 test-http-permissions.t
 test-http-protocol.t
 test-http.t
 test-hybridencode.py
 test-i18n.t
 test-identify.t
 test-impexp-branch.t
 test-import-bypass.t
 test-import-context.t
 test-import-eol.t
+test-import-git.t
 test-import-merge.t
 test-import-unknown.t
 test-import.t
 test-imports-checker.t
 test-incoming-outgoing.t
 test-infinitepush-bundlestore.t
 test-infinitepush-ci.t
 test-infinitepush.t
 test-inherit-mode.t
 test-init.t
 test-install.t
 test-issue1089.t
 test-issue1102.t
 test-issue1175.t
 test-issue1306.t
 test-issue1438.t
 test-issue1502.t
 test-issue1802.t
 test-issue1877.t
 test-issue1993.t
 test-issue2137.t
 test-issue3084.t
 test-issue4074.t
 test-issue522.t
 test-issue586.t
 test-issue5979.t
 test-issue612.t
 test-issue619.t
 test-issue660.t
 test-issue672.t
 test-issue842.t
 test-journal-exists.t
 test-journal-share.t
 test-journal.t
 test-keyword.t
 test-known.t
 test-largefiles-cache.t
 test-largefiles-misc.t
 test-largefiles-small-disk.t
 test-largefiles-update.t
 test-largefiles-wireproto.t
 test-largefiles.t
 test-lfconvert.t
 test-lfs-bundle.t
 test-lfs-largefiles.t
 test-lfs-pointer.py
 test-lfs-test-server.t
 test-lfs.t
 test-linelog.py
 test-linerange.py
 test-locate.t
 test-lock-badness.t
 test-lock.py
 test-log-exthook.t
 test-log-linerange.t
 test-log.t
 test-logexchange.t
 test-logtoprocess.t
 test-lrucachedict.py
 test-mactext.t
 test-mailmap.t
 test-manifest-merging.t
 test-manifest.py
 test-manifest.t
 test-match.py
 test-mdiff.py
 test-merge-changedelete.t
 test-merge-closedheads.t
 test-merge-commit.t
 test-merge-criss-cross.t
 test-merge-default.t
 test-merge-force.t
 test-merge-halt.t
 test-merge-internal-tools-pattern.t
 test-merge-local.t
 test-merge-no-file-change.t
 test-merge-remove.t
 test-merge-revert.t
 test-merge-revert2.t
 test-merge-subrepos.t
 test-merge-symlinks.t
 test-merge-tools.t
 test-merge-types.t
 test-merge1.t
 test-merge10.t
 test-merge2.t
 test-merge4.t
 test-merge5.t
 test-merge6.t
 test-merge7.t
 test-merge8.t
 test-merge9.t
 test-minifileset.py
 test-minirst.py
 test-missing-capability.t
 test-mq-eol.t
 test-mq-git.t
 test-mq-guards.t
 test-mq-header-date.t
 test-mq-header-from.t
 test-mq-merge.t
 test-mq-missingfiles.t
 test-mq-pull-from-bundle.t
 test-mq-qclone-http.t
 test-mq-qdelete.t
 test-mq-qdiff.t
 test-mq-qfold.t
 test-mq-qgoto.t
 test-mq-qimport-fail-cleanup.t
 test-mq-qimport.t
 test-mq-qnew.t
 test-mq-qpush-exact.t
 test-mq-qpush-fail.t
 test-mq-qqueue.t
 test-mq-qrefresh-interactive.t
 test-mq-qrefresh-replace-log-message.t
 test-mq-qrefresh.t
 test-mq-qrename.t
 test-mq-qsave.t
 test-mq-safety.t
 test-mq-subrepo.t
 test-mq-symlinks.t
 test-mq.t
 test-mv-cp-st-diff.t
 test-narrow-acl.t
 test-narrow-archive.t
 test-narrow-clone-no-ellipsis.t
 test-narrow-clone-non-narrow-server.t
 test-narrow-clone-nonlinear.t
 test-narrow-clone-stream.t
 test-narrow-clone.t
 test-narrow-commit.t
 test-narrow-copies.t
 test-narrow-debugcommands.t
 test-narrow-debugrebuilddirstate.t
 test-narrow-exchange-merges.t
 test-narrow-exchange.t
 test-narrow-expanddirstate.t
 test-narrow-merge.t
 test-narrow-patch.t
 test-narrow-patterns.t
 test-narrow-pull.t
 test-narrow-rebase.t
 test-narrow-shallow-merges.t
 test-narrow-shallow.t
 test-narrow-share.t
 test-narrow-sparse.t
 test-narrow-strip.t
 test-narrow-trackedcmd.t
 test-narrow-update.t
 test-narrow-widen-no-ellipsis.t
 test-narrow-widen.t
 test-narrow.t
 test-nested-repo.t
 test-newbranch.t
 test-newcgi.t
 test-newercgi.t
 test-nointerrupt.t
 test-notify-changegroup.t
 test-obshistory.t
 test-obsmarker-template.t
 test-obsmarkers-effectflag.t
 test-obsolete-bounds-checking.t
 test-obsolete-bundle-strip.t
 test-obsolete-changeset-exchange.t
 test-obsolete-checkheads.t
 test-obsolete-distributed.t
 test-obsolete-divergent.t
 test-obsolete-tag-cache.t
 test-obsolete.t
 test-oldcgi.t
 test-origbackup-conflict.t
 test-pager-legacy.t
 test-pager.t
 test-parents.t
 test-parse-date.t
 test-parseindex.t
 test-parseindex2.py
 test-patch-offset.t
 test-patch.t
 test-patchbomb-bookmark.t
 test-patchbomb-tls.t
 test-patchbomb.t
 test-pathconflicts-basic.t
 test-pathconflicts-merge.t
 test-pathconflicts-update.t
 test-pathencode.py
 test-pending.t
 test-permissions.t
 test-phases-exchange.t
 test-phases.t
 test-profile.t
 test-progress.t
 test-propertycache.py
 test-pull-branch.t
 test-pull-bundle.t
 test-pull-http.t
 test-pull-permission.t
 test-pull-pull-corruption.t
 test-pull-r.t
 test-pull-update.t
 test-pull.t
 test-purge.t
 test-push-cgi.t
 test-push-checkheads-partial-C1.t
 test-push-checkheads-partial-C2.t
 test-push-checkheads-partial-C3.t
 test-push-checkheads-partial-C4.t
 test-push-checkheads-pruned-B1.t
 test-push-checkheads-pruned-B2.t
 test-push-checkheads-pruned-B3.t
 test-push-checkheads-pruned-B4.t
 test-push-checkheads-pruned-B5.t
 test-push-checkheads-pruned-B6.t
 test-push-checkheads-pruned-B7.t
 test-push-checkheads-pruned-B8.t
 test-push-checkheads-superceed-A1.t
 test-push-checkheads-superceed-A2.t
 test-push-checkheads-superceed-A3.t
 test-push-checkheads-superceed-A4.t
 test-push-checkheads-superceed-A5.t
 test-push-checkheads-superceed-A6.t
 test-push-checkheads-superceed-A7.t
 test-push-checkheads-superceed-A8.t
 test-push-checkheads-unpushed-D1.t
 test-push-checkheads-unpushed-D2.t
 test-push-checkheads-unpushed-D3.t
 test-push-checkheads-unpushed-D4.t
 test-push-checkheads-unpushed-D5.t
 test-push-checkheads-unpushed-D6.t
 test-push-checkheads-unpushed-D7.t
 test-push-http.t
 test-push-race.t
 test-push-warn.t
 test-push.t
 test-pushvars.t
 test-qrecord.t
 test-rebase-abort.t
 test-rebase-backup.t
 test-rebase-base-flag.t
 test-rebase-bookmarks.t
 test-rebase-brute-force.t
 test-rebase-cache.t
 test-rebase-check-restore.t
 test-rebase-collapse.t
 test-rebase-conflicts.t
 test-rebase-dest.t
 test-rebase-detach.t
 test-rebase-emptycommit.t
 test-rebase-inmemory.t
 test-rebase-interruptions.t
 test-rebase-issue-noparam-single-rev.t
 test-rebase-legacy.t
 test-rebase-mq-skip.t
 test-rebase-mq.t
 test-rebase-named-branches.t
 test-rebase-newancestor.t
 test-rebase-obsolete.t
 test-rebase-parameters.t
 test-rebase-partial.t
 test-rebase-pull.t
 test-rebase-rename.t
 test-rebase-scenario-global.t
 test-rebase-templates.t
 test-rebase-transaction.t
 test-rebuildstate.t
 test-record.t
 test-releasenotes-formatting.t
 test-releasenotes-merging.t
 test-releasenotes-parsing.t
 test-relink.t
 test-remotefilelog-bad-configs.t
 test-remotefilelog-bgprefetch.t
 test-remotefilelog-blame.t
 test-remotefilelog-bundle2.t
 test-remotefilelog-bundles.t
 test-remotefilelog-cacheprocess.t
 test-remotefilelog-clone-tree.t
 test-remotefilelog-clone.t
 test-remotefilelog-datapack.py
 test-remotefilelog-gcrepack.t
 test-remotefilelog-histpack.py
 test-remotefilelog-http.t
 test-remotefilelog-keepset.t
 test-remotefilelog-local.t
 test-remotefilelog-log.t
 test-remotefilelog-partial-shallow.t
 test-remotefilelog-permissions.t
 test-remotefilelog-permisssions.t
 test-remotefilelog-prefetch.t
 test-remotefilelog-pull-noshallow.t
 test-remotefilelog-share.t
 test-remotefilelog-sparse.t
 test-remotefilelog-tags.t
 test-remotefilelog-wireproto.t
 test-remove.t
 test-removeemptydirs.t
 test-rename-after-merge.t
 test-rename-dir-merge.t
 test-rename-merge1.t
 test-rename-merge2.t
 test-rename.t
 test-repair-strip.t
 test-repo-compengines.t
 test-requires.t
 test-resolve.t
 test-revert-flags.t
 test-revert-interactive.t
 test-revert-unknown.t
 test-revert.t
 test-revisions.t
 test-revlog-ancestry.py
 test-revlog-group-emptyiter.t
 test-revlog-mmapindex.t
 test-revlog-packentry.t
 test-revlog-raw.py
 test-revlog-v2.t
 test-revlog.t
 test-revset-dirstate-parents.t
 test-revset-legacy-lookup.t
 test-revset-outgoing.t
 test-revset2.t
 test-rollback.t
 test-run-tests.py
 test-run-tests.t
 test-rust-ancestor.py
 test-schemes.t
 test-serve.t
 test-setdiscovery.t
 test-share.t
 test-shelve.t
 test-shelve2.t
 test-show-stack.t
 test-show-work.t
 test-show.t
 test-simple-update.t
 test-simplekeyvaluefile.py
 test-simplemerge.py
 test-single-head.t
 test-sparse-clear.t
 test-sparse-clone.t
 test-sparse-import.t
 test-sparse-merges.t
 test-sparse-profiles.t
 test-sparse-requirement.t
 test-sparse-verbose-json.t
 test-sparse.t
 test-split.t
 test-ssh-bundle1.t
 test-ssh-clone-r.t
 test-ssh-proto-unbundle.t
 test-ssh-proto.t
 test-ssh-repoerror.t
 test-ssh.t
 test-sshserver.py
 test-stack.t
 test-static-http.t
 test-status-color.t
 test-status-inprocess.py
 test-status-rev.t
 test-status-terse.t
 test-status.t
 test-storage.py
 test-stream-bundle-v2.t
 test-strict.t
 test-strip-cross.t
 test-strip.t
 test-subrepo-deep-nested-change.t
 test-subrepo-git.t
 test-subrepo-missing.t
 test-subrepo-paths.t
 test-subrepo-recursion.t
 test-subrepo-relative-path.t
 test-subrepo.t
 test-symlink-os-yes-fs-no.py
 test-symlink-placeholder.t
 test-symlinks.t
 test-tag.t
 test-tags.t
 test-template-basic.t
 test-template-functions.t
 test-template-keywords.t
 test-template-map.t
 test-tools.t
 test-transplant.t
 test-treediscovery-legacy.t
 test-treediscovery.t
 test-treemanifest.t
 test-ui-color.py
 test-ui-config.py
 test-ui-verbosity.py
 test-unamend.t
 test-unbundlehash.t
 test-uncommit.t
 test-unified-test.t
 test-unionrepo.t
 test-unrelated-pull.t
 test-up-local-change.t
 test-update-atomic.t
 test-update-branches.t
 test-update-dest.t
 test-update-issue1456.t
 test-update-names.t
 test-update-reverse.t
 test-upgrade-repo.t
 test-url-download.t
 test-url-rev.t
 test-url.py
 test-username-newline.t
 test-util.py
 test-verify.t
 test-walk.t
 test-walkrepo.py
 test-websub.t
 test-win32text.t
 test-wireproto-caching.t
 test-wireproto-clientreactor.py
 test-wireproto-command-branchmap.t
 test-wireproto-command-capabilities.t
 test-wireproto-command-changesetdata.t
 test-wireproto-command-filedata.t
 test-wireproto-command-filesdata.t
 test-wireproto-command-heads.t
 test-wireproto-command-known.t
 test-wireproto-command-listkeys.t
 test-wireproto-command-lookup.t
 test-wireproto-command-manifestdata.t
 test-wireproto-command-pushkey.t
 test-wireproto-command-rawstorefiledata.t
 test-wireproto-content-redirects.t
 test-wireproto-exchangev2.t
 test-wireproto-framing.py
 test-wireproto-serverreactor.py
 test-wireproto.py
 test-wireproto.t
 test-wsgirequest.py
 test-xdg.t

tests/test-import-git.t

@@ -1,848 +1,848 b''
   $ hg init repo
   $ cd repo
 
 New file:
 
   $ hg import -d "1000000 0" -mnew - <<EOF
   > diff --git a/new b/new
   > new file mode 100644
   > index 0000000..7898192
   > --- /dev/null
   > +++ b/new
   > @@ -0,0 +1 @@
   > +a
   > EOF
   applying patch from stdin
 
   $ hg tip -q
   0:ae3ee40d2079
 
 New empty file:
 
   $ hg import -d "1000000 0" -mempty - <<EOF
   > diff --git a/empty b/empty
   > new file mode 100644
   > EOF
   applying patch from stdin
 
   $ hg tip -q
   1:ab199dc869b5
 
   $ hg locate empty
   empty
 
 chmod +x:
 
   $ hg import -d "1000000 0" -msetx - <<EOF
   > diff --git a/new b/new
   > old mode 100644
   > new mode 100755
   > EOF
   applying patch from stdin
 
 #if execbit
   $ hg tip -q
   2:3a34410f282e
   $ test -x new
   $ hg rollback -q
 #else
   $ hg tip -q
   1:ab199dc869b5
 #endif
 
 Copy and removing x bit:
 
   $ hg import -f -d "1000000 0" -mcopy - <<EOF
   > diff --git a/new b/copy
   > old mode 100755
   > new mode 100644
   > similarity index 100%
   > copy from new
   > copy to copy
   > diff --git a/new b/copyx
   > similarity index 100%
   > copy from new
   > copy to copyx
   > EOF
   applying patch from stdin
 
   $ test -f copy
 #if execbit
   $ test ! -x copy
   $ test -x copyx
   $ hg tip -q
   2:21dfaae65c71
 #else
   $ hg tip -q
   2:0efdaa8e3bf3
 #endif
 
   $ hg up -qCr1
   $ hg rollback -q
 
 Copy (like above but independent of execbit):
 
   $ hg import -d "1000000 0" -mcopy - <<EOF
   > diff --git a/new b/copy
   > similarity index 100%
   > copy from new
   > copy to copy
   > diff --git a/new b/copyx
   > similarity index 100%
   > copy from new
   > copy to copyx
   > EOF
   applying patch from stdin
 
   $ hg tip -q
   2:0efdaa8e3bf3
   $ test -f copy
 
   $ cat copy
   a
 
   $ hg cat copy
   a
 
 Rename:
 
   $ hg import -d "1000000 0" -mrename - <<EOF
   > diff --git a/copy b/rename
   > similarity index 100%
   > rename from copy
   > rename to rename
   > EOF
   applying patch from stdin
 
   $ hg tip -q
   3:b1f57753fad2
 
   $ hg locate
   copyx
   empty
   new
   rename
 
 Delete:
 
   $ hg import -d "1000000 0" -mdelete - <<EOF
   > diff --git a/copyx b/copyx
   > deleted file mode 100755
   > index 7898192..0000000
   > --- a/copyx
   > +++ /dev/null
   > @@ -1 +0,0 @@
   > -a
   > EOF
   applying patch from stdin
 
   $ hg tip -q
   4:1bd1da94b9b2
 
   $ hg locate
   empty
   new
   rename
 
   $ test -f copyx
   [1]
 
 Regular diff:
 
   $ hg import -d "1000000 0" -mregular - <<EOF
   > diff --git a/rename b/rename
   > index 7898192..72e1fe3 100644
   > --- a/rename
   > +++ b/rename
   > @@ -1 +1,5 @@
   >  a
   > +a
   > +a
   > +a
   > +a
   > EOF
   applying patch from stdin
 
   $ hg tip -q
   5:46fe99cb3035
 
 Copy and modify:
 
   $ hg import -d "1000000 0" -mcopymod - <<EOF
   > diff --git a/rename b/copy2
   > similarity index 80%
   > copy from rename
   > copy to copy2
   > index 72e1fe3..b53c148 100644
   > --- a/rename
   > +++ b/copy2
   > @@ -1,5 +1,5 @@
   >  a
   >  a
   > -a
   > +b
   >  a
   >  a
   > EOF
   applying patch from stdin
 
   $ hg tip -q
   6:ffeb3197c12d
 
   $ hg cat copy2
   a
   a
   b
   a
   a
 
 Rename and modify:
 
   $ hg import -d "1000000 0" -mrenamemod - <<EOF
   > diff --git a/copy2 b/rename2
   > similarity index 80%
   > rename from copy2
   > rename to rename2
   > index b53c148..8f81e29 100644
   > --- a/copy2
   > +++ b/rename2
   > @@ -1,5 +1,5 @@
   >  a
   >  a
   >  b
   > -a
   > +c
   >  a
   > EOF
   applying patch from stdin
 
   $ hg tip -q
   7:401aede9e6bb
 
   $ hg locate copy2
   [1]
   $ hg cat rename2
   a
   a
   b
   c
   a
 
 One file renamed multiple times:
 
   $ hg import -d "1000000 0" -mmultirenames - <<EOF
   > diff --git a/rename2 b/rename3
   > rename from rename2
   > rename to rename3
   > diff --git a/rename2 b/rename3-2
   > rename from rename2
   > rename to rename3-2
   > EOF
   applying patch from stdin
 
   $ hg tip -q
   8:2ef727e684e8
 
   $ hg log -vr. --template '{rev} {files} / {file_copies}\n'
   8 rename2 rename3 rename3-2 / rename3 (rename2)rename3-2 (rename2)
 
   $ hg locate rename2 rename3 rename3-2
   rename3
   rename3-2
 
   $ hg cat rename3
   a
   a
   b
   c
   a
 
   $ hg cat rename3-2
   a
   a
   b
   c
   a
 
   $ echo foo > foo
   $ hg add foo
   $ hg ci -m 'add foo'
 
 Binary files and regular patch hunks:
 
   $ hg import -d "1000000 0" -m binaryregular - <<EOF
   > diff --git a/binary b/binary
   > new file mode 100644
   > index 0000000000000000000000000000000000000000..593f4708db84ac8fd0f5cc47c634f38c013fe9e4
   > GIT binary patch
   > literal 4
   > Lc\${NkU|;|M00aO5
   > 
   > diff --git a/foo b/foo2
   > rename from foo
   > rename to foo2
   > EOF
   applying patch from stdin
 
   $ hg tip -q
   10:27377172366e
 
   $ cat foo2
   foo
 
   $ hg manifest --debug | grep binary
   045c85ba38952325e126c70962cc0f9d9077bc67 644   binary
 
 Multiple binary files:
 
   $ hg import -d "1000000 0" -m multibinary - <<EOF
   > diff --git a/mbinary1 b/mbinary1
   > new file mode 100644
   > index 0000000000000000000000000000000000000000..593f4708db84ac8fd0f5cc47c634f38c013fe9e4
   > GIT binary patch
   > literal 4
   > Lc\${NkU|;|M00aO5
   > 
   > diff --git a/mbinary2 b/mbinary2
   > new file mode 100644
   > index 0000000000000000000000000000000000000000..112363ac1917b417ffbd7f376ca786a1e5fa7490
   > GIT binary patch
   > literal 5
   > Mc\${NkU|\`?^000jF3jhEB
   > 
   > EOF
   applying patch from stdin
 
   $ hg tip -q
   11:18b73a84b4ab
 
   $ hg manifest --debug | grep mbinary
   045c85ba38952325e126c70962cc0f9d9077bc67 644   mbinary1
   a874b471193996e7cb034bb301cac7bdaf3e3f46 644   mbinary2
 
 Binary file and delta hunk (we build the patch using this sed hack to
 avoid an unquoted ^, which check-code says breaks sh on Solaris):
 
   $ sed 's/ caret /^/g;s/ dollarparen /$(/g' > quote-hack.patch <<'EOF'
   > diff --git a/delta b/delta
   > new file mode 100644
   > index 0000000000000000000000000000000000000000..8c9b7831b231c2600843e303e66b521353a200b3
   > GIT binary patch
   > literal 3749
   > zcmV;W4qEYvP)<h;3K|Lk000e1NJLTq006iE002D*0ssI2kt{U(0000PbVXQnQ*UN;
   > zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU=M@d9MRCwC#oC!>o#}>x{(W-y~UN*tK
   > z%A%sxiUy2Ys)0Vm#ueArYKoYqX;GuiqZpgirM6nCVoYk?YNAz3G~z;BZ~@~&OQEe4
   > zmGvS5isFJI;Pd_7J+EKxyHZeu` caret t4r2>F;h-+VK3{_{WoGv8dSpFDYDrA%3UX03pt
   > zOaVoi0*W#P6lDr1$`nwPDWE7*rhuYM0Y#YtiZTThWeO<D6i}2YpqR<%$s>bRRaI42
   > zS3iFIxJ8Q=EnBv1Z7?pBw_bLjJb3V+tgP(Tty_2R-mR#p04x78n2n7MSOFyt4i1iv
   > zjxH`PPEJmgD7U?IK&h;(EGQ@_DJc<@01=4fiNXHcKZ8LhZQ8T}E3U4tUS3}OrcgQW
   > zWdX{K8#l7Ev&#$ysR)G#0*rC+<WGZ3?CtG4bm-ve>Dj$|_qJ`@D*stNP_AFUe&x!Q
   > zJ9q9B7Z=ym)MyZ?Tg1ROunUYr81nV?B@!tYS~5_|%gfW#(_s<4UN1!Q?Dv8d>g#m6
   > z%*@R2@bI2JdnzxQ!EDU`$eQY!tgI~Zn$prz;gaXNod5*5p(1Bz=P$qfvZ$y?dC@X~
   > zlAD+NAKhB{=;6bMwzjqn>9mavvKOGd`s%A+fBiL>Q;xJWpa72C+}u{JTHUX>{~}Qj
   > zUb%hyHgN~c?cBLjInvUALMD9g-aXt54ZL8AOCvXL-V6!~ijR*kEG$&Mv?!pE61OlI
   > z8nzMSPE8F7bH|Py*RNl1VUCggq<V)>@_6gkEeiz7{rmTeuNTW6+KVS#0FG%IHf-3L
   > zGiS21vn>WCCr+GLx caret !uNetzB6u3o(w6&1C2?_LW8ij$+$sZ*zZ`|US3H@8N~%&V%Z
   > zAeA0HdhFS=$6|nzn3%YH`SN<>DQRO;Qc caret )dfdvA caret 5u`Xf;Zzu<ZQHgG?28V-#s<;T
   > zzkh#LA)v7gpoE5ou3o*GoUUF%b#iht&kl9d0)><$FE1}ACr68;uCA`6DrGmz_U+rp
   > zL>Rx;X_yhk$fP_yJrTCQ|NgsW0A<985g&c@k-NKly<>mgU8n||ZPPV<`SN8#%$+-T
   > zfP$T!ou8jypFVwnzqhxyUvIxXd-wF~*U!ht=hCH1wzjqn9x#)IrhDa;S0JbK caret z_$W
   > zd(8rX@;7|t*;GJ5h$SZ{v(}+UBEs$4w~?{@9%`_Z<P<kox5bMWuUWH(sF9hONgd$Q
   > zunCgwT@1|CU9+;X caret 4z&|M~@yw23Ay50NFWn=FqF%yLZEUty;AT2??1oV@B)Nt))J7
   > zh>{5j2@f7T=-an%L_`E)h;mZ4D_5>?7tjQtVPRo2XU-&;mX(!l-MSTJP4XWY82JAC
   > z@57+y&!1=P{Mn{W8)-HzEsgAtd63}Cazc>O6vGb>51%@9DzbyI3?4j~$ijmT95_IS
   > zS#r!LCDW%*4-O7CGnkr$xXR1RQ&UrA<CQt} caret 73NL%zk`)Jk!yxUAt-1r}ggLn-Zq}
   > z*s){8pw68;i+kiG%CpBKYSJLLFyq&*U8}qDp+kpe&6<Vp(Z58%l#~>ZK?&s7y?b}i
   > zuwcOgO%x-27A;y785zknl_{sU;E6v$8{pWmVS{KaJPpu`i;HP$#flY@u~Ua~K3%tN
   > z-LhrNh{9SoHgDd%WXTc$$~Dq{?AWou3!H&?V8K{ caret {P9Ot5vecD?%1&-E-ntBFj87(
   > zy5`QE%QRX7qcHC%1{Ua}M~}L6=`wQUNEQ=I;qc+ZMMXtK2T+0os;jEco;}OV9z1w3
   > zARqv caret bm-85xnRCng3OT|MyVSmR3ND7 caret ?KaQGG! caret (aTbo1N;Nz;X3Q9FJbwK6`0?Yp
   > zj*X2ac;Pw3!I2|JShDaF>-gJmzm1NLj){rk&o|$E caret WAsfrK=x&@B!`w7Hik81sPz4
   > zuJTaiCppM>-+c!wPzcUw)5@?J4U-u|pJ~xbWUe-C+60k caret 7>9!)56DbjmA~`OJJ40v
   > zu3hCA7eJXZWeN|1iJLu87$;+fS8+Kq6O`aT)*_x@sY#t7LxwoEcVw*)cWhhQW@l%!
   > z{#Z=y+qcK@%z{p*D=8_Fcg278AnH3fI5;~yGu?9TscxXaaP*4$f<LIv! caret 5Lfr%vKg
   > zpxmunH#%=+ICMvZA~wyNH%~eMl!-g caret R!cYJ#WmLq5N8viz#J%%LPtkO?V)tZ81cp>
   > z{ALK?fNPePmd;289&M8Q3>YwgZX5GcGY&n>K1<x)!`;Qjg&}bb!Lrnl@xH#kS~VYE
   > zpJmIJO`A3iy+Y3X`k>cY-@}Iw2Onq`=!ba3eATgs3yg3Wej=+P-Z8WF#w=RXvS@J3
   > zEyhVTj-gO?kfDu1g9afo<RkPrYzG#_yF41IFxF%Ylg>9lx6<clPweR-b7Hn+r)e1l
   > zO6c6FbNt@;;*w$z;N|H>h{czme)_4V6UC4hv**kX2@L caret Bgds dollarparen &P7M4dhfmWe)!=B
   > zR3X=Y{P9N}p@-##@1ZNW1YbVaiP~D@8m&<dzEP&cO|87Ju#j*=;wH~Exr>i*Hpp&@
   > z`9!Sj+O;byD~s8qZ>6QB8uv7Bpn&&?xe;;e<M4F8KEID&pT7QmqoSgq&06adp5T=U
   > z6DH*4=AB7C1D9Amu?ia-wtxSAlmTEO96XHx)-+rKP;ip$pukuSJGW3P1aUmc2yo%)
   > z&<t3F>d1X+1qzaag-%x+eKHx{?Afz3GBQSw9u0lw<mB+I#v11TKRpKWQS+lvVL7=u
   > zHr6)1ynEF<i3kO6A8&ppPMo-F=PnWfXkSj@i*7J6C<F}wR?s(O0niC?t+6;+k}pPq
   > zrok&TPU40rL0ZYDwenNrrmPZ`gjo@DEF`7 caret cKP||pUr;+r)hyn9O37=xA`3%Bj-ih
   > z+1usk<%5G-y+R?tA`qY=)6&vNjL{P?QzHg%P%>`ZxP=QB%DHY6L26?36V_p caret {}n$q
   > z3@9W=KmGI*Ng_Q#AzA%-z|Z caret |#oW(hkfgpuS$RKRhlrarX%efMMCs}GLChec5+y{6
   > z1Qnxim_C-fmQuaAK_NUHUBV&;1c0V)wji<RcdZ*aAWTwyt>hVnlt caret asFCe0&a@tqp
   > zEEy;$L}D$X6)wfQNl8gu6Z>oB3_RrP=gTyK2@@w#LbQfLNHj>Q&z(C5wUFhK+}0aV
   > zSohlc=7K+spN<ctf}5KgKqNyJDNP9;LZd)nTE=9|6Xdr9%Hzk63-tL2c9FD*rsyYY
   > z!}t+Yljq7-p$X;4_YL?6d;mdY3R##o1e%rlPxrsMh8|;sKTr~ caret QD#sw3&vS$FwlTk
   > zp1#Gw!Qo-$LtvpXt#ApV0g) caret F=qFB`VB!W297x=$mr<$>rco3v$QKih_xN!k6;M=@
   > zCr?gDNQj7tm@;JwD;Ty&NlBSCYZk(b3dZeN8D4h2{r20dSFc7;(>E&r`s=TVtzpB4
   > zk+ caret N&zCAiRns(?p6iBlk9v&h{1ve(FNtc)td51M>)TkXhc6{>5C)`fS$&)A1*CP1%
   > zld+peue4aYbg3C0!+4mu+}vE caret j_feX+ZijvffBI7Ofh#RZ*U3<3J5(+nfRCzexqQ5
   > zgM&##Y4Dd{e%ZKjqrbm@|Ni}l4jo!AqtFynj3Xsd$o caret ?yV4$|UQ(j&UWCH>M=o_&N
   > zmclXc3i|Q#<;#EoG>~V}4unTHbUK}u=y4;rA3S&vzC3 caret aJP!&D4RvvGfoyo(>C>la
   > zijP<=v>X{3Ne&2BXo}DV8l0V-jdv`$am0ubG{Wuh%CTd|l9Q7m;G&|U@#Dvbhlj(d
   > zg6W{3ATxYt#T?)3;SmIgOP4M|Dki~I_TX7SxP0x}wI~DQI7Lhm2BI7gph(aPIFAd;
   > zQ&UsF`Q{rOz+z=87c5v%@5u~d6dWV5OlX`oH3cAH&UlvsZUEo(Q(P|lKs17rXvaiU
   > zQcj}IEufi1+Bnh6&(EhF{7O3vLHp`jjlp0J<M1kh$+$2xGm~Zk7OY7(q=&Rdhq*RG
   > zwrmcd5MnP}xByB_)P@{J>DR9x6;`cUwPM8z){yooNiXPOc9_{W-gtwxE5TUg0vJk6
   > zO#JGruV&1cL6VGK2?+_YQr4`+EY8;Sm$9U$uuGRN=uj3k7?O9b+R~J7t_y*K64ZnI
   > zM+{aE<b(v?vSmw;9zFP!aE266zHIhlmdI@ caret xa6o2jwdRk54a$>pcRbC29ZyG!Cfdp
   > zutFf`Q`vljgo!(wHf=)F#m2_MIuj;L(2ja2YsQRX+rswV{d<H`Ar;(@%aNa9VPU8Z
   > z;tq*`y}dm#NDJHKlV}uTIm!_vAq5E7!X-p{P=Z=Sh668>PuVS1*6e}OwOiMc;u3OQ
   > z@Bs)w3=lzfKoufH$SFuPG@uZ4NOnM#+=8LnQ2Q4zUd+nM+OT26;lqbN{P07dhH{jH
   > zManE8 caret dLms-Q2;1kB<*Q1a3f8kZr;xX=!Qro@`~@xN*Qj>gx;i;0Z24!~i2uLb`}v
   > zA?R$|wvC+m caret Ups=*(4lDh*=UN8{5h(A?p#D caret 2N$8u4Z55!q?ZAh(iEEng9_Zi>IgO
   > z#~**JC8hE4@n{hO&8btT5F*?nC_%LhA3i)PDhh-pB_&1wGrDIl caret *=8x3n&;akBf caret -
   > zJd&86kq$%%907v caret tgWoQdwI`|oNK%VvU~S#C<o caret F?6c48?Cjj#-4P<>HFD%&|Ni~t
   > zKJ(|#H`$<5W+6ZkBb213rXonKZLB+X> caret L}J@W6osP3piLD_5?R!`S}*{xLBzFiL4@
   > zX+}l{`A%?f@T5tT%ztu60p;)be`fWC`tP@WpO=?cpf8Xuf1OSj6d3f@Ki(ovDYq%0
   > z{4ZSe`kOay5@=lAT!}vFzxyemC{sXDrhuYM0Y#ZI1r%ipD9W11{w=@&xgJ}t2x;ep
   > P00000NkvXXu0mjfZ5|Er
   > 
   > literal 0
   > HcmV?d00001
   > 
   > EOF
   $ hg import -d "1000000 0" -m delta quote-hack.patch
   applying quote-hack.patch
   $ rm quote-hack.patch
 
   $ hg manifest --debug | grep delta
   9600f98bb60ce732634d126aaa4ac1ec959c573e 644   delta
 
   $ hg import -d "1000000 0" -m delta - <<'EOF'
   > diff --git a/delta b/delta
   > index 8c9b7831b231c2600843e303e66b521353a200b3..0021dd95bc0dba53c39ce81377126d43731d68df 100644
   > GIT binary patch
   > delta 49
   > zcmZ1~yHs|=21Z8J$r~9bFdA-lVv=EEw4WT$qRf2QSa5SIOAHI6(&k4T8H|kLo4vWB
   > FSO9ZT4bA`n
   > 
   > delta 49
   > zcmV-10M7rV9i<(xumJ(}ld%Di0Xefm0vrMXpOaq%BLm9I%d>?9Tm%6Vv*HM70RcC&
   > HOA1;9yU-AD
   > 
   > EOF
   applying patch from stdin
 
   $ hg manifest --debug | grep delta
   56094bbea136dcf8dbd4088f6af469bde1a98b75 644   delta
 
 Filenames with spaces:
 
   $ sed 's,EOL$,,g' <<EOF | hg import -d "1000000 0" -m spaces -
   > diff --git a/foo bar b/foo bar
   > new file mode 100644
   > index 0000000..257cc56
   > --- /dev/null
   > +++ b/foo bar	EOL
   > @@ -0,0 +1 @@
   > +foo
   > EOF
   applying patch from stdin
 
   $ hg tip -q
   14:4b79479c9a6d
 
   $ cat "foo bar"
   foo
 
 Copy then modify the original file:
 
   $ hg import -d "1000000 0" -m copy-mod-orig - <<EOF
   > diff --git a/foo2 b/foo2
   > index 257cc56..fe08ec6 100644
   > --- a/foo2
   > +++ b/foo2
   > @@ -1 +1,2 @@
   >  foo
   > +new line
   > diff --git a/foo2 b/foo3
   > similarity index 100%
   > copy from foo2
   > copy to foo3
   > EOF
   applying patch from stdin
 
   $ hg tip -q
   15:9cbe44af4ae9
 
   $ cat foo3
   foo
 
 Move text file and patch as binary
 
   $ echo a > text2
   $ hg ci -Am0
   adding text2
   $ hg import -d "1000000 0" -m rename-as-binary - <<"EOF"
   > diff --git a/text2 b/binary2
   > rename from text2
   > rename to binary2
   > index 78981922613b2afb6025042ff6bd878ac1994e85..10efcb362e9f3b3420fcfbfc0e37f3dc16e29757
   > GIT binary patch
   > literal 5
   > Mc$`b*O5$Pw00T?_*Z=?k
   > 
   > EOF
   applying patch from stdin
 
   $ cat binary2
   a
   b
   \x00 (no-eol) (esc)
 
   $ hg st --copies --change .
   A binary2
     text2
   R text2
 
 Invalid base85 content
 
   $ hg rollback
   repository tip rolled back to revision 16 (undo import)
   working directory now based on revision 16
   $ hg revert -aq
   $ hg import -d "1000000 0" -m invalid-binary - <<"EOF"
   > diff --git a/text2 b/binary2
   > rename from text2
   > rename to binary2
   > index 78981922613b2afb6025042ff6bd878ac1994e85..10efcb362e9f3b3420fcfbfc0e37f3dc16e29757
   > GIT binary patch
   > literal 5
   > Mc$`b*O.$Pw00T?_*Z=?k
   > 
   > EOF
   applying patch from stdin
   abort: could not decode "binary2" binary patch: bad base85 character at position 6
   [255]
 
   $ hg revert -aq
   $ hg import -d "1000000 0" -m rename-as-binary - <<"EOF"
   > diff --git a/text2 b/binary2
   > rename from text2
   > rename to binary2
   > index 78981922613b2afb6025042ff6bd878ac1994e85..10efcb362e9f3b3420fcfbfc0e37f3dc16e29757
   > GIT binary patch
   > literal 6
   > Mc$`b*O5$Pw00T?_*Z=?k
   > 
   > EOF
   applying patch from stdin
   abort: "binary2" length is 5 bytes, should be 6
   [255]
 
   $ hg revert -aq
   $ hg import -d "1000000 0" -m rename-as-binary - <<"EOF"
   > diff --git a/text2 b/binary2
   > rename from text2
   > rename to binary2
   > index 78981922613b2afb6025042ff6bd878ac1994e85..10efcb362e9f3b3420fcfbfc0e37f3dc16e29757
   > GIT binary patch
   > Mc$`b*O5$Pw00T?_*Z=?k
   > 
   > EOF
   applying patch from stdin
   abort: could not extract "binary2" binary data
   [255]
 
 Simulate a copy/paste turning LF into CRLF (issue2870)
 
   $ hg revert -aq
   $ cat > binary.diff <<"EOF"
   > diff --git a/text2 b/binary2
   > rename from text2
   > rename to binary2
   > index 78981922613b2afb6025042ff6bd878ac1994e85..10efcb362e9f3b3420fcfbfc0e37f3dc16e29757
   > GIT binary patch
   > literal 5
   > Mc$`b*O5$Pw00T?_*Z=?k
   > 
   > EOF
   >>> fp = open('binary.diff', 'rb')
   >>> data = fp.read()
   >>> fp.close()
   >>> open('binary.diff', 'wb').write(data.replace(b'\n', b'\r\n')) and None
   $ rm binary2
   $ hg import --no-commit binary.diff
   applying binary.diff
 
   $ cd ..
 
 Consecutive import with renames (issue2459)
 
   $ hg init issue2459
   $ cd issue2459
   $ hg import --no-commit --force - <<EOF
   > diff --git a/a b/a
   > new file mode 100644
   > EOF
   applying patch from stdin
   $ hg import --no-commit --force - <<EOF
   > diff --git a/a b/b
   > rename from a
   > rename to b
   > EOF
   applying patch from stdin
   a has not been committed yet, so no copy data will be stored for b.
   $ hg debugstate
   a   0         -1 unset               b
   $ hg ci -m done
   $ cd ..
 
 Renames and strip
 
   $ hg init renameandstrip
   $ cd renameandstrip
   $ echo a > a
   $ hg ci -Am adda
   adding a
   $ hg import --no-commit -p2 - <<EOF
   > diff --git a/foo/a b/foo/b
   > rename from foo/a
   > rename to foo/b
   > EOF
   applying patch from stdin
   $ hg st --copies
   A b
     a
   R a
 
 Prefix with strip, renames, creates etc
 
   $ hg revert -aC
   forgetting b
   undeleting a
   $ rm b
   $ mkdir -p dir/dir2
   $ echo b > dir/dir2/b
   $ echo c > dir/dir2/c
   $ echo d > dir/d
   $ hg ci -Am addbcd
   adding dir/d
   adding dir/dir2/b
   adding dir/dir2/c
 
 prefix '.' is the same as no prefix
   $ hg import --no-commit --prefix . - <<EOF
   > diff --git a/dir/a b/dir/a
   > --- /dev/null
   > +++ b/dir/a
   > @@ -0,0 +1 @@
   > +aaaa
   > diff --git a/dir/d b/dir/d
   > --- a/dir/d
   > +++ b/dir/d
   > @@ -1,1 +1,2 @@
   >  d
   > +dddd
   > EOF
   applying patch from stdin
   $ cat dir/a
   aaaa
   $ cat dir/d
   d
   dddd
   $ hg revert -aC
   forgetting dir/a
   reverting dir/d
   $ rm dir/a
 
 prefix with default strip
   $ hg import --no-commit --prefix dir/ - <<EOF
   > diff --git a/a b/a
   > --- /dev/null
   > +++ b/a
   > @@ -0,0 +1 @@
   > +aaa
   > diff --git a/d b/d
   > --- a/d
   > +++ b/d
   > @@ -1,1 +1,2 @@
   >  d
   > +dd
   > EOF
   applying patch from stdin
   $ cat dir/a
   aaa
   $ cat dir/d
   d
   dd
   $ hg revert -aC
   forgetting dir/a
   reverting dir/d
   $ rm dir/a
 (test that prefixes are relative to the cwd)
   $ mkdir tmpdir
   $ cd tmpdir
   $ hg import --no-commit -p2 --prefix ../dir/ - <<EOF
   > diff --git a/foo/a b/foo/a
   > new file mode 100644
   > --- /dev/null
   > +++ b/foo/a
   > @@ -0,0 +1 @@
   > +a
   > diff --git a/foo/dir2/b b/foo/dir2/b2
   > rename from foo/dir2/b
   > rename to foo/dir2/b2
   > diff --git a/foo/dir2/c b/foo/dir2/c
   > --- a/foo/dir2/c
   > +++ b/foo/dir2/c
   > @@ -0,0 +1 @@
   > +cc
   > diff --git a/foo/d b/foo/d
   > deleted file mode 100644
   > --- a/foo/d
   > +++ /dev/null
   > @@ -1,1 +0,0 @@
   > -d
   > EOF
   applying patch from stdin
   $ hg st --copies
   M dir/dir2/c
   A dir/a
   A dir/dir2/b2
     dir/dir2/b
   R dir/d
   R dir/dir2/b
   $ cd ..
 
 Renames, similarity and git diff
 
   $ hg revert -aC
   forgetting dir/a
   forgetting dir/dir2/b2
   reverting dir/dir2/c
   undeleting dir/d
   undeleting dir/dir2/b
   $ rm dir/a dir/dir2/b2
   $ hg import --similarity 90 --no-commit - <<EOF
   > diff --git a/a b/b
   > rename from a
   > rename to b
   > EOF
   applying patch from stdin
   $ hg st --copies
   A b
     a
   R a
   $ cd ..
 
 Pure copy with existing destination
 
   $ hg init copytoexisting
   $ cd copytoexisting
   $ echo a > a
   $ echo b > b
   $ hg ci -Am add
   adding a
   adding b
   $ hg import --no-commit - <<EOF
   > diff --git a/a b/b
   > copy from a
   > copy to b
   > EOF
   applying patch from stdin
   abort: cannot create b: destination already exists
   [255]
   $ cat b
   b
 
 Copy and changes with existing destination
 
   $ hg import --no-commit - <<EOF
   > diff --git a/a b/b
   > copy from a
   > copy to b
   > --- a/a
   > +++ b/b
   > @@ -1,1 +1,2 @@
   > a
   > +b
   > EOF
   applying patch from stdin
   cannot create b: destination already exists
   1 out of 1 hunks FAILED -- saving rejects to file b.rej
   abort: patch failed to apply
   [255]
   $ cat b
   b
 
 #if symlink
 
   $ ln -s b linkb
   $ hg add linkb
   $ hg ci -m addlinkb
   $ hg import --no-commit - <<EOF
   > diff --git a/linkb b/linkb
   > deleted file mode 120000
   > --- a/linkb
   > +++ /dev/null
   > @@ -1,1 +0,0 @@
   > -badhunk
   > \ No newline at end of file
   > EOF
   applying patch from stdin
   patching file linkb
   Hunk #1 FAILED at 0
   1 out of 1 hunks FAILED -- saving rejects to file linkb.rej
   abort: patch failed to apply
   [255]
   $ hg st
   ? b.rej
   ? linkb.rej
 
 #endif
 
 Test corner case involving copies and multiple hunks (issue3384)
 
   $ hg revert -qa
   $ hg import --no-commit - <<EOF
   > diff --git a/a b/c
   > copy from a
   > copy to c
   > --- a/a
   > +++ b/c
   > @@ -1,1 +1,2 @@
   >  a
   > +a
   > @@ -2,1 +2,2 @@
   >  a
   > +a
   > diff --git a/a b/a
   > --- a/a
   > +++ b/a
   > @@ -1,1 +1,2 @@
   >  a
   > +b
   > EOF
   applying patch from stdin
 
 Test email metadata
 
   $ hg revert -qa
   $ hg --encoding utf-8 import - <<EOF
-  > From: =?UTF-8?q?Rapha=C3=ABl=20Hertzog?= <[e-mail]>
+  > From: =?utf-8?q?Rapha=C3=ABl_Hertzog_=3Chertzog=40debian=2Eorg=3E?=
   > Subject: [PATCH] =?UTF-8?q?=C5=A7=E2=82=AC=C3=9F=E1=B9=AA?=
   > 
   > diff --git a/a b/a
   > --- a/a
   > +++ b/a
   > @@ -1,1 +1,2 @@
   >  a
   > +a
   > EOF
   applying patch from stdin
   $ hg --encoding utf-8 log -r .
   changeset:   *:* (glob)
   tag:         tip
   user:        Rapha\xc3\xabl Hertzog <[e-mail]> (esc)
   date:        * (glob)
   summary:     \xc5\xa7\xe2\x82\xac\xc3\x9f\xe1\xb9\xaa (esc)
   
 
   $ cd ..