$ hg init a

  $ mkdir a/d1

  $ mkdir a/d1/d2

  $ echo line 1 > a/a

  $ echo line 1 > a/d1/d2/a

  $ hg --cwd a ci -Ama

  adding a

  adding d1/d2/a

  $ echo line 2 >> a/a

  $ hg --cwd a ci -u someone -d '1 0' -m'second change'

import with no args:

  $ hg --cwd a import

  abort: need at least one patch to import

  [10]

generate patches for the test

  $ hg --cwd a export tip > exported-tip.patch

  $ hg --cwd a diff -r0:1 > diffed-tip.patch

import exported patch

(this also tests that editor is not invoked, if the patch contains the

commit message and '--edit' is not specified)

  $ hg clone -r0 a b

  adding changesets

  adding manifests

  adding file changes

  added 1 changesets with 2 changes to 2 files

  new changesets 80971e65b431

  updating to branch default

  2 files updated, 0 files merged, 0 files removed, 0 files unresolved

  $ HGEDITOR=cat hg --cwd b import --debug ../exported-tip.patch

  applying ../exported-tip.patch

  Subject: 

  Content-Type: text/plain

  found patch at byte 202

  patch generated by hg export

  From: someone

  Date: 1 0

  Node ID: 1d4bd90af0e43687763d158dfa83ff2a4b6c0c32

  message:

  second change

  patching file a

  committing files:

  a

  committing manifest

  committing changelog

  created 1d4bd90af0e4

  updating the branch cache

message and committer and date should be same

  $ hg --cwd b tip

  changeset:   1:1d4bd90af0e4

  tag:         tip

  user:        someone

  date:        Thu Jan 01 00:00:01 1970 +0000

  summary:     second change

  $ rm -r b

import exported patch with external patcher

(this also tests that editor is invoked, if the '--edit' is specified,

regardless of the commit message in the patch)

  $ cat > dummypatch.py <<EOF

  > print('patching file a')

  > open('a', 'wb').write(b'line2\n')

  > EOF

  $ hg clone -r0 a b

  adding changesets

  adding manifests

  adding file changes

  added 1 changesets with 2 changes to 2 files

  new changesets 80971e65b431

  updating to branch default

  2 files updated, 0 files merged, 0 files removed, 0 files unresolved

  $ HGEDITOR=cat hg --config ui.patch="\"$PYTHON\" ../dummypatch.py" --cwd b import --edit ../exported-tip.patch

  applying ../exported-tip.patch

  second change

  HG: Enter commit message.  Lines beginning with 'HG:' are removed.

  HG: Leave message empty to abort commit.

  HG: --

  HG: user: someone

  HG: branch 'default'

  HG: changed a

  $ cat b/a

  line2

  $ rm -r b

import of plain diff should fail without message

(this also tests that editor is invoked, if the patch doesn't contain

the commit message, regardless of '--edit')

  $ hg clone -r0 a b

  adding changesets

  adding manifests

  adding file changes

  added 1 changesets with 2 changes to 2 files

  new changesets 80971e65b431

  updating to branch default

  2 files updated, 0 files merged, 0 files removed, 0 files unresolved

  $ cat > $TESTTMP/editor.sh <<EOF

  > env | grep HGEDITFORM

  > cat \$1

  > EOF

  $ HGEDITOR="sh $TESTTMP/editor.sh" hg --cwd b import ../diffed-tip.patch

  applying ../diffed-tip.patch

  HGEDITFORM=import.normal.normal

  HG: Enter commit message.  Lines beginning with 'HG:' are removed.

  HG: Leave message empty to abort commit.

  HG: --

  HG: user: test

  HG: branch 'default'

  HG: changed a

  abort: empty commit message

  [10]

Test avoiding editor invocation at applying the patch with --exact,

even if commit message is empty

  $ echo a >> b/a

  $ hg --cwd b commit -m ' '

  $ hg --cwd b tip -T "{node}\n"

  d8804f3f5396d800812f579c8452796a5993bdb2

  $ hg --cwd b export -o ../empty-log.diff .

  $ hg --cwd b update -q -C ".^1"

  $ hg --cwd b --config extensions.strip= strip -q tip

  $ HGEDITOR=cat hg --cwd b import --exact ../empty-log.diff

  applying ../empty-log.diff

  $ hg --cwd b tip -T "{node}\n"

  d8804f3f5396d800812f579c8452796a5993bdb2

  $ rm -r b

import of plain diff should be ok with message

  $ hg clone -r0 a b

  adding changesets

  adding manifests

  adding file changes

  added 1 changesets with 2 changes to 2 files

  new changesets 80971e65b431

  updating to branch default

  2 files updated, 0 files merged, 0 files removed, 0 files unresolved

  $ hg --cwd b import -mpatch ../diffed-tip.patch

  applying ../diffed-tip.patch

  $ rm -r b

import of plain diff with specific date and user

(this also tests that editor is not invoked, if

'--message'/'--logfile' is specified and '--edit' is not)

  $ hg clone -r0 a b

  adding changesets

  adding manifests

  adding file changes

  added 1 changesets with 2 changes to 2 files

  new changesets 80971e65b431

  updating to branch default

  2 files updated, 0 files merged, 0 files removed, 0 files unresolved

  $ hg --cwd b import -mpatch -d '1 0' -u 'user@nowhere.net' ../diffed-tip.patch

  applying ../diffed-tip.patch

  $ hg -R b tip -pv

  changeset:   1:ca68f19f3a40

  tag:         tip

  user:        user@nowhere.net

  date:        Thu Jan 01 00:00:01 1970 +0000

  files:       a

  description:

  patch

  diff -r 80971e65b431 -r ca68f19f3a40 a

  --- a/a	Thu Jan 01 00:00:00 1970 +0000

  +++ b/a	Thu Jan 01 00:00:01 1970 +0000

  @@ -1,1 +1,2 @@

   line 1

  +line 2

  $ rm -r b

import of plain diff should be ok with --no-commit

(this also tests that editor is not invoked, if '--no-commit' is

specified, regardless of '--edit')

  $ hg clone -r0 a b

  adding changesets

  adding manifests

  adding file changes

  added 1 changesets with 2 changes to 2 files

  new changesets 80971e65b431

  updating to branch default

  2 files updated, 0 files merged, 0 files removed, 0 files unresolved

  $ HGEDITOR=cat hg --cwd b import --no-commit --edit ../diffed-tip.patch

  applying ../diffed-tip.patch

  $ hg --cwd b diff --nodates

  diff -r 80971e65b431 a

  --- a/a

  +++ b/a

  @@ -1,1 +1,2 @@

   line 1

  +line 2

  $ rm -r b

import of malformed plain diff should fail

  $ hg clone -r0 a b

  adding changesets

  adding manifests

  adding file changes

  added 1 changesets with 2 changes to 2 files

  new changesets 80971e65b431

  updating to branch default

  2 files updated, 0 files merged, 0 files removed, 0 files unresolved

  $ sed 's/1,1/foo/' < diffed-tip.patch > broken.patch

  $ hg --cwd b import -mpatch ../broken.patch

  applying ../broken.patch

  abort: bad hunk #1

  (check that whitespace in the patch has not been mangled)

  [10]

  $ rm -r b

hg -R repo import

put the clone in a subdir - having a directory named "a"

used to hide a bug.

  $ mkdir dir

  $ hg clone -r0 a dir/b

  adding changesets

  adding manifests

  adding file changes

  added 1 changesets with 2 changes to 2 files

  new changesets 80971e65b431

  updating to branch default

  2 files updated, 0 files merged, 0 files removed, 0 files unresolved

  $ cd dir

  $ hg -R b import ../exported-tip.patch

  applying ../exported-tip.patch

  $ cd ..

  $ rm -r dir

import from stdin

  $ hg clone -r0 a b

  adding changesets

  adding manifests

  adding file changes

  added 1 changesets with 2 changes to 2 files

  new changesets 80971e65b431

  updating to branch default

  2 files updated, 0 files merged, 0 files removed, 0 files unresolved

  $ hg --cwd b import - < exported-tip.patch

  applying patch from stdin

  $ rm -r b

import two patches in one stream

  $ hg init b

  $ hg --cwd a export 0:tip | hg --cwd b import -

  applying patch from stdin

  $ hg --cwd a id

  1d4bd90af0e4 tip

  $ hg --cwd b id

  1d4bd90af0e4 tip

  $ rm -r b

override commit message

  $ hg clone -r0 a b

  adding changesets

  adding manifests

  adding file changes

  added 1 changesets with 2 changes to 2 files

  new changesets 80971e65b431

  updating to branch default

  2 files updated, 0 files merged, 0 files removed, 0 files unresolved

  $ hg --cwd b import -m 'override' - < exported-tip.patch

  applying patch from stdin

  $ hg --cwd b tip | grep override

  summary:     override

  $ rm -r b

  $ cat > mkmsg.py <<EOF

  > import email.message

  > import sys

  > msg = email.message.Message()

  > patch = open(sys.argv[1], 'rb').read()

  > msg.set_payload(b'email commit message\n' + patch)

  > msg['Subject'] = 'email patch'

  > msg['From'] = 'email patcher'

  > open(sys.argv[2], 'wb').write(bytes(msg))

  > EOF

plain diff in email, subject, message body

  $ hg clone -r0 a b

  adding changesets

  adding manifests

  adding file changes

  added 1 changesets with 2 changes to 2 files

  new changesets 80971e65b431

  updating to branch default

  2 files updated, 0 files merged, 0 files removed, 0 files unresolved

  $ "$PYTHON" mkmsg.py diffed-tip.patch msg.patch

  $ hg --cwd b import ../msg.patch

  applying ../msg.patch

  $ hg --cwd b tip | grep email

  user:        email patcher

  summary:     email patch

  $ rm -r b

plain diff in email, no subject, message body

  $ hg clone -r0 a b

  adding changesets

  adding manifests

  adding file changes

  added 1 changesets with 2 changes to 2 files

  new changesets 80971e65b431

  updating to branch default

  2 files updated, 0 files merged, 0 files removed, 0 files unresolved

  $ grep -v '^Subject:' msg.patch | hg --cwd b import -

  applying patch from stdin

  $ rm -r b

plain diff in email, subject, no message body

  $ hg clone -r0 a b

  adding changesets

  adding manifests

  adding file changes

  added 1 changesets with 2 changes to 2 files

  new changesets 80971e65b431

  updating to branch default

  2 files updated, 0 files merged, 0 files removed, 0 files unresolved

  $ grep -v '^email ' msg.patch | hg --cwd b import -

  applying patch from stdin

  $ rm -r b

plain diff in email, no subject, no message body, should fail

  $ hg clone -r0 a b

  adding changesets

  adding manifests

  adding file changes

  added 1 changesets with 2 changes to 2 files

  new changesets 80971e65b431

  updating to branch default

  2 files updated, 0 files merged, 0 files removed, 0 files unresolved

  $ egrep -v '^(Subject|email)' msg.patch | hg --cwd b import -

  applying patch from stdin

  abort: empty commit message

  [10]

  $ rm -r b

hg export in email, should use patch header

  $ hg clone -r0 a b

  adding changesets

  adding manifests

  adding file changes

  added 1 changesets with 2 changes to 2 files

  new changesets 80971e65b431

  updating to branch default

  2 files updated, 0 files merged, 0 files removed, 0 files unresolved

  $ "$PYTHON" mkmsg.py exported-tip.patch msg.patch

  $ cat msg.patch | hg --cwd b import -

  applying patch from stdin

  $ hg --cwd b tip | grep second