$ 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'

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

  $ hg clone -r0 a b

  adding changesets

  adding manifests

  adding file changes

  added 1 changesets with 2 changes to 2 files

  updating to branch default

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

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

  applying ../exported-tip.patch

message and committer 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

  $ cat > dummypatch.py <<EOF

  > print 'patching file a'

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

  > EOF

  $ chmod +x dummypatch.py

  $ hg clone -r0 a b

  adding changesets

  adding manifests

  adding file changes

  added 1 changesets with 2 changes to 2 files

  updating to branch default

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

  $ hg --config ui.patch='python ../dummypatch.py' --cwd b import ../exported-tip.patch

  applying ../exported-tip.patch

  $ cat b/a

  line2

  $ rm -r b

import of plain diff should fail without message

  $ hg clone -r0 a b

  adding changesets

  adding manifests

  adding file changes

  added 1 changesets with 2 changes to 2 files

  updating to branch default

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

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

  applying ../diffed-tip.patch

  abort: empty commit message

  [255]

  $ 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

  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

  $ hg clone -r0 a b

  adding changesets

  adding manifests

  adding file changes

  added 1 changesets with 2 changes to 2 files

  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

  $ hg clone -r0 a b

  adding changesets

  adding manifests

  adding file changes

  added 1 changesets with 2 changes to 2 files

  updating to branch default

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

  $ hg --cwd b import --no-commit ../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

  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

  [255]

  $ 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

  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

  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

  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, sys

  > msg = email.Message.Message()

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

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

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

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

  > sys.stdout.write(msg.as_string())

  > 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

  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

  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

  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

  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

  [255]

  $ 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

  updating to branch default

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

  $ python mkmsg.py exported-tip.patch | hg --cwd b import -

  applying patch from stdin

  $ hg --cwd b tip | grep second

  summary:     second change

  $ rm -r b

subject: duplicate detection, removal of [PATCH]

The '---' tests the gitsendmail handling without proper mail headers

  $ cat > mkmsg2.py <<EOF

  > import email.Message, sys

  > msg = email.Message.Message()

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

  > msg.set_payload('email patch\n\nnext line\n---\n' + patch)

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

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

  > sys.stdout.write(msg.as_string())

  > EOF

plain diff in email, [PATCH] subject, message body with subject

  $ hg clone -r0 a b

  adding changesets

  adding manifests

  adding file changes

  added 1 changesets with 2 changes to 2 files

  updating to branch default

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

  $ python mkmsg2.py diffed-tip.patch | hg --cwd b import -

  applying patch from stdin

  $ hg --cwd b tip --template '{desc}\n'

  email patch

  next line

  ---

  $ rm -r b

Issue963: Parent of working dir incorrect after import of multiple

patches and rollback

We weren't backing up the correct dirstate file when importing many

patches: import patch1 patch2; rollback

  $ echo line 3 >> a/a

  $ hg --cwd a ci -m'third change'

  $ hg --cwd a export -o '../patch%R' 1 2

  $ hg clone -qr0 a b

  $ hg --cwd b parents --template 'parent: {rev}\n'

  parent: 0

  $ hg --cwd b import -v ../patch1 ../patch2

  applying ../patch1

  patching file a

  a

  created 1d4bd90af0e4