$ cat >> $HGRCPATH <<EOF

  > [extdiff]

  > # for portability:

  > pdiff = sh "$RUNTESTDIR/pdiff"

  > EOF

Create a repo with some stuff in it:

  $ hg init a

  $ cd a

  $ echo a > a

  $ echo a > d

  $ echo a > e

  $ hg ci -qAm0

  $ echo b > a

  $ hg ci -m1 -u bar

  $ hg mv a b

  $ hg ci -m2

  $ hg cp b c

  $ hg ci -m3 -u baz

  $ echo b > d

  $ echo f > e

  $ hg ci -m4

  $ hg up -q 3

  $ echo b > e

  $ hg branch -q stable

  $ hg ci -m5

  $ hg merge -q default --tool internal:local # for conflicts in e, choose 5 and ignore 4

  $ hg branch -q default

  $ hg ci -m6

  $ hg phase --public 3

  $ hg phase --force --secret 6

  $ hg log -G --template '{author}@{rev}.{phase}: {desc}\n'

  @    test@6.secret: 6

  |\

  | o  test@5.draft: 5

  | |

  o |  test@4.draft: 4

  |/

  o  baz@3.public: 3

  |

  o  test@2.public: 2

  |

  o  bar@1.public: 1

  |

  o  test@0.public: 0

Test --base for grafting the merge of 4 from the perspective of 5, thus only getting the change to d

  $ hg up -cqr 3

  $ hg graft -r 6 --base 5

  grafting 6:25a2b029d3ae "6" (tip)

  merging e

  $ hg st --change .

  M d

  $ hg -q strip . --config extensions.strip=

Test --base for collapsing changesets 2 and 3, thus getting both b and c

  $ hg up -cqr 0

  $ hg graft -r 3 --base 1

  grafting 3:4c60f11aa304 "3"

  merging a and b to b

  merging a and c to c

  $ hg st --change .

  A b

  A c

  R a

  $ hg -q strip . --config extensions.strip=

Specifying child as --base revision fails safely (perhaps slightly confusing, but consistent)

  $ hg graft -r 2 --base 3

  grafting 2:5c095ad7e90f "2"

  note: possible conflict - c was deleted and renamed to:

   a

  note: graft of 2:5c095ad7e90f created no changes to commit

Can't continue without starting:

  $ hg -q up -cr tip

  $ hg rm -q e

  $ hg graft --continue

  abort: no graft in progress

  [255]

  $ hg revert -r . -q e

Need to specify a rev:

  $ hg graft

  abort: no revisions specified

  [255]

Can't graft ancestor:

  $ hg graft 1 2

  skipping ancestor revision 1:5d205f8b35b6

  skipping ancestor revision 2:5c095ad7e90f

  [255]

Specify revisions with -r:

  $ hg graft -r 1 -r 2

  skipping ancestor revision 1:5d205f8b35b6

  skipping ancestor revision 2:5c095ad7e90f

  [255]

  $ hg graft -r 1 2

  warning: inconsistent use of --rev might give unexpected revision ordering!

  skipping ancestor revision 2:5c095ad7e90f

  skipping ancestor revision 1:5d205f8b35b6

  [255]

Conflicting date/user options:

  $ hg up -q 0

  $ hg graft -U --user foo 2

  abort: --user and --currentuser are mutually exclusive

  [255]

  $ hg graft -D --date '0 0' 2

  abort: --date and --currentdate are mutually exclusive

  [255]

Can't graft with dirty wd:

  $ hg up -q 0

  $ echo foo > a

  $ hg graft 1

  abort: uncommitted changes

  [255]

  $ hg revert a

Graft a rename:

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

  $ hg status --rev "2^1" --rev 2

  A b

  R a

  $ HGEDITOR=cat hg graft 2 -u foo --edit

  grafting 2:5c095ad7e90f "2"

  merging a and b to b

  2

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

  HG: Leave message empty to abort commit.

  HG: --

  HG: user: foo

  HG: branch 'default'

  HG: added b

  HG: removed a

  $ hg export tip --git

  # HG changeset patch

  # User foo

  # Date 0 0

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

  # Node ID ef0ef43d49e79e81ddafdc7997401ba0041efc82

  # Parent  68795b066622ca79a25816a662041d8f78f3cd9e

  2

  diff --git a/a b/b

  rename from a

  rename to b

Look for extra:source

  $ hg log --debug -r tip

  changeset:   7:ef0ef43d49e79e81ddafdc7997401ba0041efc82

  tag:         tip

  phase:       draft

  parent:      0:68795b066622ca79a25816a662041d8f78f3cd9e

  parent:      -1:0000000000000000000000000000000000000000

  manifest:    7:e59b6b228f9cbf9903d5e9abf996e083a1f533eb

  user:        foo

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

  files+:      b

  files-:      a

  extra:       branch=default

  extra:       source=5c095ad7e90f871700f02dd1fa5012cb4498a2d4

  description:

  2

Graft out of order, skipping a merge and a duplicate

(this also tests that editor is not invoked if '--edit' is not specified)

  $ hg graft 1 5 4 3 'merge()' 2 -n

  skipping ungraftable merge revision 6

  skipping revision 2:5c095ad7e90f (already grafted to 7:ef0ef43d49e7)

  grafting 1:5d205f8b35b6 "1"

  grafting 5:97f8bfe72746 "5"

  grafting 4:9c233e8e184d "4"

  grafting 3:4c60f11aa304 "3"

  $ HGEDITOR=cat hg graft 1 5 'merge()' 2 --debug

  skipping ungraftable merge revision 6

  scanning for duplicate grafts

  skipping revision 2:5c095ad7e90f (already grafted to 7:ef0ef43d49e7)

  grafting 1:5d205f8b35b6 "1"

    unmatched files in local:

     b

    all copies found (* = to merge, ! = divergent, % = renamed and deleted):

     src: 'a' -> dst: 'b' *

    checking for directory renames

  resolving manifests

   branchmerge: True, force: True, partial: False

   ancestor: 68795b066622, local: ef0ef43d49e7+, remote: 5d205f8b35b6

   preserving b for resolve of b

  starting 4 threads for background file closing (?)

   b: local copied/moved from a -> m (premerge)

  picked tool ':merge' for b (binary False symlink False changedelete False)

  merging b and a to b

  my b@ef0ef43d49e7+ other a@5d205f8b35b6 ancestor a@68795b066622

   premerge successful

  committing files:

  b

  committing manifest

  committing changelog

  updating the branch cache

  grafting 5:97f8bfe72746 "5"

    all copies found (* = to merge, ! = divergent, % = renamed and deleted):

     src: 'c' -> dst: 'b' 

    checking for directory renames

  resolving manifests

   branchmerge: True, force: True, partial: False

   ancestor: 4c60f11aa304, local: 6b9e5368ca4e+, remote: 97f8bfe72746

   e: remote is newer -> g

  getting e

  committing files:

  e

  committing manifest

  committing changelog

  updating the branch cache

  $ HGEDITOR=cat hg graft 4 3 --log --debug

  scanning for duplicate grafts

  grafting 4:9c233e8e184d "4"

    all copies found (* = to merge, ! = divergent, % = renamed and deleted):

     src: 'c' -> dst: 'b' 

    checking for directory renames

  resolving manifests

   branchmerge: True, force: True, partial: False

   ancestor: 4c60f11aa304, local: 1905859650ec+, remote: 9c233e8e184d

   preserving e for resolve of e

   d: remote is newer -> g

  getting d

   e: versions differ -> m (premerge)

  picked tool ':merge' for e (binary False symlink False changedelete False)

  merging e

  my e@1905859650ec+ other e@9c233e8e184d ancestor e@4c60f11aa304

   e: versions differ -> m (merge)

  picked tool ':merge' for e (binary False symlink False changedelete False)

  my e@1905859650ec+ other e@9c233e8e184d ancestor e@4c60f11aa304

  warning: conflicts while merging e! (edit, then use 'hg resolve --mark')

  abort: unresolved conflicts, can't continue

  (use 'hg resolve' and 'hg graft --continue')

  [255]

Summary should mention graft:

  $ hg summary |grep graft

  commit: 2 modified, 2 unknown, 1 unresolved (graft in progress)

Using status to get more context

  $ hg status --verbose

  M d

  M e

  ? a.orig

  ? e.orig

  # The repository is in an unfinished *graft* state.

  # Unresolved merge conflicts:

  # 

  #     e

  # 

  # To mark files as resolved:  hg resolve --mark FILE

  # To continue:    hg graft --continue

  # To abort:       hg graft --abort

Commit while interrupted should fail:

  $ hg ci -m 'commit interrupted graft'

  abort: graft in progress

  (use 'hg graft --continue' or 'hg graft --stop' to stop)

  [255]

Abort the graft and try committing:

  $ hg up -C .

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

  $ echo c >> e

  $ hg ci -mtest

  $ hg strip . --config extensions.strip=

  1 files updated, 0 files merged, 0 files removed, 0 files unresolved

  saved backup bundle to $TESTTMP/a/.hg/strip-backup/*-backup.hg (glob)

Graft again:

  $ hg graft 1 5 4 3 'merge()' 2

  skipping ungraftable merge revision 6

  skipping revision 2:5c095ad7e90f (already grafted to 7:ef0ef43d49e7)

  skipping revision 1:5d205f8b35b6 (already grafted to 8:6b9e5368ca4e)

  skipping revision 5:97f8bfe72746 (already grafted to 9:1905859650ec)

  grafting 4:9c233e8e184d "4"

  merging e

  warning: conflicts while merging e! (edit, then use 'hg resolve --mark')

  abort: unresolved conflicts, can't continue

  (use 'hg resolve' and 'hg graft --continue')

  [255]

Continue without resolve should fail:

  $ hg graft -c

  grafting 4:9c233e8e184d "4"

  abort: unresolved merge conflicts (see 'hg help resolve')

  [255]

Fix up:

  $ echo b > e

  $ hg resolve -m e

  (no more unresolved files)

  continue: hg graft --continue

Continue with a revision should fail:

  $ hg graft -c 6

  abort: can't specify --continue and revisions

  [255]

  $ hg graft -c -r 6

  abort: can't specify --continue and revisions

  [255]

Continue for real, clobber usernames

  $ hg graft -c -U

  grafting 4:9c233e8e184d "4"

  grafting 3:4c60f11aa304 "3"

Compare with original:

  $ hg diff -r 6

  $ hg status --rev 0:. -C

  M d

  M e

  A b

    a

  A c

    a

  R a

View graph:

  $ hg log -G --template '{author}@{rev}.{phase}: {desc}\n'

  @  test@11.draft: 3

  |

  o  test@10.draft: 4

  |

  o  test@9.draft: 5

  |

  o  bar@8.draft: 1

  |

  o  foo@7.draft: 2

  |

  | o    test@6.secret: 6

  | |\

  | | o  test@5.draft: 5

  | | |

  | o |  test@4.draft: 4

  | |/

  | o  baz@3.public: 3

  | |

  | o  test@2.public: 2

  | |

  | o  bar@1.public: 1

  |/

  o  test@0.public: 0

Graft again onto another branch should preserve the original source

  $ hg up -q 0

  $ echo 'g'>g

  $ hg add g

  $ hg ci -m 7

  created new head

  $ hg graft 7

  grafting 7:ef0ef43d49e7 "2"

  $ hg log -r 7 --template '{rev}:{node}\n'

  7:ef0ef43d49e79e81ddafdc7997401ba0041efc82

  $ hg log -r 2 --template '{rev}:{node}\n'

  2:5c095ad7e90f871700f02dd1fa5012cb4498a2d4

  $ hg log --debug -r tip

  changeset:   13:7a4785234d87ec1aa420ed6b11afe40fa73e12a9

  tag:         tip

  phase:       draft

  parent:      12:b592ea63bb0c19a6c5c44685ee29a2284f9f1b8f

  parent:      -1:0000000000000000000000000000000000000000

  manifest:    13:dc313617b8c32457c0d589e0dbbedfe71f3cd637

  user:        foo

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

  files+:      b

  files-:      a

  extra:       branch=default

  extra:       intermediate-source=ef0ef43d49e79e81ddafdc7997401ba0041efc82

  extra:       source=5c095ad7e90f871700f02dd1fa5012cb4498a2d4

  description:

  2

Disallow grafting an already grafted cset onto its original branch

  $ hg up -q 6

  $ hg graft 7

  skipping already grafted revision 7:ef0ef43d49e7 (was grafted from 2:5c095ad7e90f)

  [255]

  $ hg pdiff --config extensions.extdiff= --patch -r 2 -r 13

  --- */hg-5c095ad7e90f.patch	* (glob)