# Copyright (c) Facebook, Inc. and its affiliates.
# Copyright (c) Mercurial Contributors.
#
# This software may be used and distributed according to the terms of the
# GNU General Public License version 2 or any later version.

from __future__ import absolute_import

import time

from testutil.dott import feature, sh, testtmp  # noqa: F401


sh % "setconfig 'extensions.treemanifest=!'"
sh % ". helpers-usechg.sh"

sh % "cat" << r"""
[extdiff]
# for portability:
pdiff = sh "$RUNTESTDIR/pdiff"
""" >> "$HGRCPATH"

# Create a repo with some stuff in it:

sh % "hg init a"
sh % "cd a"
sh % "echo a" > "a"
sh % "echo a" > "d"
sh % "echo a" > "e"
sh % "hg ci -qAm0"
sh % "echo b" > "a"
sh % "hg ci -m1 -u bar"
sh % "hg mv a b"
sh % "hg ci -m2"
sh % "hg cp b c"
sh % "hg ci -m3 -u baz"
sh % "echo b" > "d"
sh % "echo f" > "e"
sh % "hg ci -m4"
sh % "hg up -q 3"
sh % "echo b" > "e"
sh % "hg ci -m5"
#  (Make sure mtime < fsnow to make the next merge commit stable)
time.sleep(1)
sh % "hg status"
sh % "hg debugsetparents 4 5"
sh % "hg ci -m6"
#  (Force "refersh" treestate)
sh % "hg up -qC null"
sh % "hg up -qC tip"
sh % "hg phase --public 3"
sh % "hg phase --force --secret 6"

sh % "hg log -G --template '{author}@{rev}.{phase}: {desc}\\n'" == r"""
    @    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"""
# Can't continue without starting:

sh % "hg rm -q e"
sh % "hg graft --continue" == r"""
    abort: no graft in progress
    [255]"""
sh % "hg graft --abort" == r"""
    abort: no graft in progress
    [255]"""
sh % "hg revert -r . -q e"

# Need to specify a rev:

sh % "hg graft" == r"""
    abort: no revisions specified
    [255]"""

# Empty revision set was specified

sh % "hg graft -r '2::1'" == r"""
    abort: empty revision set was specified
    [255]"""

# Can't graft ancestor:

sh % "hg graft 1 2" == r"""
    skipping ancestor revision 1:5d205f8b35b6
    skipping ancestor revision 2:5c095ad7e90f
    [255]"""

# Specify revisions with -r:

sh % "hg graft -r 1 -r 2" == r"""
    skipping ancestor revision 1:5d205f8b35b6
    skipping ancestor revision 2:5c095ad7e90f
    [255]"""

sh % "hg graft -r 1 2" == r"""
    warning: inconsistent use of --rev might give unexpected revision ordering!
    skipping ancestor revision 2:5c095ad7e90f
    skipping ancestor revision 1:5d205f8b35b6
    [255]"""

# Can't graft with dirty wd:

sh % "hg up -q 0"
sh % "echo foo" > "a"
sh % "hg graft 1" == r"""
    abort: uncommitted changes
    [255]"""
sh % "hg revert a"

# Graft a rename:
# (this also tests that editor is invoked if '--edit' is specified)

sh % "hg status --rev '2^1' --rev 2" == r"""
    A b
    R a"""
sh % "'HGEDITOR=cat' hg graft 2 -u foo --edit" == r"""
    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"""
sh % "hg export tip --git" == r"""
    # 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

sh % "hg log --debug -r tip" == r"""
    changeset:   7:ef0ef43d49e79e81ddafdc7997401ba0041efc82
    tag:         tip
    phase:       draft
    parent:      0:68795b066622ca79a25816a662041d8f78f3cd9e
    parent:      -1:0000000000000000000000000000000000000000
    manifest:    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)

sh % "hg graft 1 5 4 3 'merge()' 2 -n" == r'''
    skipping ungraftable merge revision 6
    skipping revision 2:5c095ad7e90f (already grafted to 7:ef0ef43d49e7)
    grafting 1:5d205f8b35b6 "1"
    grafting 5:5345cd5c0f38 "5"
    grafting 4:9c233e8e184d "4"
    grafting 3:4c60f11aa304 "3"'''

sh % "'HGEDITOR=cat' hg graft 1 5 'merge()' 2 --debug --config worker.backgroundclose=False" == r"""
    skipping ungraftable merge revision 6
    scanning for duplicate grafts
    skipping revision 2:5c095ad7e90f (already grafted to 7:ef0ef43d49e7)
    grafting 1:5d205f8b35b6 "1"
      searching for copies back to rev 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
     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
    grafting 5:5345cd5c0f38 "5"
      searching for copies back to rev 1
      unmatched files in other (from topological common ancestor):
       c
    resolving manifests
     branchmerge: True, force: True, partial: False
     ancestor: 4c60f11aa304, local: 6b9e5368ca4e+, remote: 5345cd5c0f38
     e: remote is newer -> g
    getting e
    committing files:
    e
    committing manifest
    committing changelog"""
sh % "'HGEDITOR=cat' hg graft 4 3 --log --debug" == r"""
    scanning for duplicate grafts
    grafting 4:9c233e8e184d "4"
      searching for copies back to rev 1
      unmatched files in other (from topological common ancestor):
       c
    resolving manifests
     branchmerge: True, force: True, partial: False
     ancestor: 4c60f11aa304, local: 9436191a062e+, 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@9436191a062e+ other e@9c233e8e184d ancestor e@4c60f11aa304
     e: versions differ -> m (merge)
    picked tool ':merge' for e (binary False symlink False changedelete False)
    my e@9436191a062e+ other e@9c233e8e184d ancestor e@4c60f11aa304
    warning: 1 conflicts while merging e! (edit, then use 'hg resolve --mark')
    abort: unresolved conflicts, can't continue
    (use 'hg resolve' and 'hg graft --continue --log')
    [255]"""

# Summary should mention graft:

sh % "hg summary" == r"""
    parent: 9:9436191a062e tip
     5
    commit: 2 modified, 2 unknown, 1 unresolved (graft in progress)
    phases: 5 draft, 1 secret"""

# Using status to get more context

sh % "hg status --verbose" == r"""
    M d
    M e
    ? a.orig
    ? e.orig
    # The repository is in an unfinished *graft* state.

    # Unresolved merge conflicts:
    #  (trailing space)
    #     e
    #  (trailing space)
    # To mark files as resolved:  hg resolve --mark FILE

    # To continue:                hg graft --continue
    # To abort:                   hg update --clean .    (warning: this will discard uncommitted changes)"""

# Commit while interrupted should fail:

sh % "hg ci -m 'commit interrupted graft'" == r"""
    abort: graft in progress
    (use 'hg graft --continue' or 'hg graft --abort' to abort)
    [255]"""

# Abort the graft and try committing:

sh % "hg graft --abort" == "2 files updated, 0 files merged, 0 files removed, 0 files unresolved"
sh % "hg status --verbose" == r"""
    ? a.orig
    ? e.orig"""
sh % "echo c" >> "e"
sh % "hg ci -mtest"

sh % "hg debugstrip ." == r"""
    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:

sh % "hg graft 1 5 4 3 'merge()' 2" == r"""
    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:5345cd5c0f38 (already grafted to 9:9436191a062e)
    grafting 4:9c233e8e184d "4"
    merging e
    warning: 1 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:

sh % "hg continue" == r"""
    grafting 4:9c233e8e184d "4"
    abort: unresolved merge conflicts (see 'hg help resolve')
    [255]"""

# Fix up:

sh % "echo b" > "e"
sh % "hg resolve -m e" == r"""
    (no more unresolved files)
    continue: hg graft --continue"""

# Continue with a revision should fail:

sh % "hg graft -c 6" == r"""
    abort: can't specify --continue and revisions
    [255]"""

sh % "hg graft -c -r 6" == r"""
    abort: can't specify --continue and revisions
    [255]"""

sh % "hg graft --abort -r 6" == r"""
    abort: can't specify --abort and revisions
    [255]"""

# Continue for real, clobber usernames

sh % "hg graft -c -U" == r'''
    grafting 4:9c233e8e184d "4"
    grafting 3:4c60f11aa304 "3"'''

# Compare with original:

sh % "hg diff -r 6" == r"""
    diff -r 7f1f8cbe8466 e
    --- a/e	Thu Jan 01 00:00:00 1970 +0000
    +++ b/e	Thu Jan 01 00:00:00 1970 +0000
    @@ -1,1 +1,1 @@
    -f
    +b"""
sh % "hg status --rev '0:.' -C" == r"""
    M d
    M e
    A b
      a
    A c
      a
    R a"""

# View graph:

sh % "hg log -G --template '{author}@{rev}.{phase}: {desc}\\n'" == r"""
    @  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
sh % "hg up -q 0"
sh % "echo g" > "g"
sh % "hg add g" == ""
sh % "hg ci -m 7" == ""
sh % "hg graft 7" == 'grafting 7:ef0ef43d49e7 "2"'

sh % "hg log -r 7 --template '{rev}:{node}\\n'" == "7:ef0ef43d49e79e81ddafdc7997401ba0041efc82"
sh % "hg log -r 2 --template '{rev}:{node}\\n'" == "2:5c095ad7e90f871700f02dd1fa5012cb4498a2d4"

sh % "hg log --debug -r tip" == r"""
    changeset:   13:7a4785234d87ec1aa420ed6b11afe40fa73e12a9
    tag:         tip
    phase:       draft
    parent:      12:b592ea63bb0c19a6c5c44685ee29a2284f9f1b8f
    parent:      -1:0000000000000000000000000000000000000000
    manifest:    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
sh % "hg up -q 6"
sh % "hg graft 7" == r"""
    skipping already grafted revision 7:ef0ef43d49e7 (was grafted from 2:5c095ad7e90f)
    [255]"""

sh % "hg diff -r 2 -r 13" == r"""
    diff -r 5c095ad7e90f -r 7a4785234d87 b
    --- a/b Thu Jan 01 00:00:00 1970 +0000
    +++ b/b Thu Jan 01 00:00:00 1970 +0000
    @@ -1,1 +1,1 @@
    -b
    +a
    diff -r 5c095ad7e90f -r 7a4785234d87 g
    --- /dev/null Thu Jan 01 00:00:00 1970 +0000
    +++ b/g Thu Jan 01 00:00:00 1970 +0000
    @@ -0,0 +1,1 @@
    +g"""

sh % "hg diff -r 2 -r 13 -X ." == ""

# Disallow grafting already grafted csets with the same origin onto each other
sh % "hg up -q 13" == ""
sh % "hg graft 2" == r"""
    skipping revision 2:5c095ad7e90f (already grafted to 13:7a4785234d87)
    [255]"""
sh % "hg graft 7" == r"""
    skipping already grafted revision 7:ef0ef43d49e7 (13:7a4785234d87 also has origin 2:5c095ad7e90f)
    [255]"""

sh % "hg up -q 7"
sh % "hg graft 2" == r"""
    skipping revision 2:5c095ad7e90f (already grafted to 7:ef0ef43d49e7)
    [255]"""
sh % "hg graft tip" == r"""
    skipping already grafted revision 13:7a4785234d87 (7:ef0ef43d49e7 also has origin 2:5c095ad7e90f)
    [255]"""

# Graft with --log

sh % "hg up -Cq 1"
sh % "hg graft 3 --log -u foo" == r"""
    grafting 3:4c60f11aa304 "3"
    warning: can't find ancestor for 'c' copied from 'b'!"""
sh % "hg log --template '{rev}:{node|short} {parents} {desc}\\n' -r tip" == r"""
    14:0c921c65ef1e 1:5d205f8b35b6  3
    (grafted from 4c60f11aa304a54ae1c199feb94e7fc771e51ed8)"""

# Resolve conflicted graft
sh % "hg up -q 0"
sh % "echo b" > "a"
sh % "hg ci -m 8"
sh % "echo c" > "a"
sh % "hg ci -m 9"
sh % "hg graft 1 --tool 'internal:fail'" == r"""
    grafting 1:5d205f8b35b6 "1"
    abort: unresolved conflicts, can't continue
    (use 'hg resolve' and 'hg graft --continue')
    [255]"""
sh % "hg resolve --all" == r"""
    merging a
    warning: 1 conflicts while merging a! (edit, then use 'hg resolve --mark')
    [1]"""
sh % "cat a" == r"""
  <<<<<<< local: aaa4406d4f0a - test: 9
  c
  =======
  b
  >>>>>>> graft: 5d205f8b35b6 - bar: 1"""
sh % "echo b" > "a"
sh % "hg resolve -m a" == r"""
    (no more unresolved files)
    continue: hg graft --continue"""
sh % "hg graft -c" == 'grafting 1:5d205f8b35b6 "1"'
sh % "hg export tip --git" == r"""
    # HG changeset patch
    # User bar
    # Date 0 0
    #      Thu Jan 01 00:00:00 1970 +0000
    # Node ID f67661df0c4804d301f064f332b57e7d5ddaf2be
    # Parent  aaa4406d4f0ae9befd6e58c82ec63706460cbca6
    1

    diff --git a/a b/a
    --- a/a
    +++ b/a
    @@ -1,1 +1,1 @@
    -c
    +b"""

# Resolve conflicted graft with rename
sh % "echo c" > "a"
sh % "hg ci -m 10"
sh % "hg graft 2 --tool 'internal:fail'" == r"""
    grafting 2:5c095ad7e90f "2"
    abort: unresolved conflicts, can't continue
    (use 'hg resolve' and 'hg graft --continue')
    [255]"""
sh % "hg resolve --all" == r"""
    merging a and b to b
    (no more unresolved files)
    continue: hg graft --continue"""
sh % "hg graft -c" == 'grafting 2:5c095ad7e90f "2"'
sh % "hg export tip --git" == r"""
    # HG changeset patch
    # User test
    # Date 0 0
    #      Thu Jan 01 00:00:00 1970 +0000
    # Node ID 9627f653b421c61fc1ea4c4e366745070fa3d2bc
    # Parent  ee295f490a40b97f3d18dd4c4f1c8936c233b612
    2

    diff --git a/a b/b
    rename from a
    rename to b"""

# graft with --force (still doesn't graft merges)

sh % "newrepo"
sh % "drawdag" << r"""
C D
|/|
A B
"""
sh % "hg update -q $C"
sh % "hg graft $B" == 'grafting 1:fc2b737bb2e5 "B"'
sh % "hg rm A B C"
sh % "hg commit -m remove-all"
sh % "hg graft $B $A $D" == r"""
    skipping ungraftable merge revision 3
    skipping ancestor revision 0:426bada5c675
    skipping revision 1:fc2b737bb2e5 (already grafted to 4:bd8a7a0a7392)
    [255]"""
sh % "hg graft $B $A $D --force" == r'''
    skipping ungraftable merge revision 3
    grafting 1:fc2b737bb2e5 "B"
    grafting 0:426bada5c675 "A"'''

# graft --force after backout

sh % "echo abc" > "A"
sh % "hg ci -m to-backout"
sh % "hg bookmark -i to-backout"
sh % "hg backout to-backout" == r"""
    reverting A
    changeset 9:14707ec2ae63 backs out changeset 8:b2fde3ce6adf"""
sh % "hg graft to-backout" == r"""
    skipping ancestor revision 8:b2fde3ce6adf
    [255]"""
sh % "hg graft to-backout --force" == r"""
    grafting 8:b2fde3ce6adf "to-backout" (to-backout)
    merging A"""
sh % "cat A" == "abc"

# graft --continue after --force

sh % "echo def" > "A"
sh % "hg ci -m 31"
sh % "hg graft to-backout --force --tool 'internal:fail'" == r"""
    grafting 8:b2fde3ce6adf "to-backout" (to-backout)
    abort: unresolved conflicts, can't continue
    (use 'hg resolve' and 'hg graft --continue')
    [255]"""
sh % "echo abc" > "A"
sh % "hg resolve -qm A" == "continue: hg graft --continue"
sh % "hg graft -c" == 'grafting 8:b2fde3ce6adf "to-backout" (to-backout)'
sh % "cat A" == "abc"

# Empty graft

sh % "newrepo"
sh % "drawdag" << r"""
A  B  # B/A=A
"""
sh % "hg up -qr $B"
sh % "hg graft $A" == r"""
    grafting 0:426bada5c675 "A"
    note: graft of 0:426bada5c675 created no changes to commit"""

# Graft to duplicate a commit

sh % "newrepo graftsibling"
sh % "touch a"
sh % "hg commit -qAm a"
sh % "touch b"
sh % "hg commit -qAm b"
sh % "hg log -G -T '{rev}\\n'" == r"""
    @  1
    |
    o  0"""
sh % "hg up -q 0"
sh % "hg graft -r 1" == 'grafting 1:0e067c57feba "b" (tip)'
sh % "hg log -G -T '{rev}\\n'" == r"""
    @  2
    |
    | o  1
    |/
    o  0"""
# Graft to duplicate a commit twice

sh % "hg up -q 0"
sh % "hg graft -r 2" == 'grafting 2:044ec77f6389 "b" (tip)'
sh % "hg log -G -T '{rev}\\n'" == r"""
    @  3
    |
    | o  2
    |/
    | o  1
    |/
    o  0"""
# Graft from behind a move or rename
# ==================================

# NOTE: This is affected by issue5343, and will need updating when it's fixed

# Possible cases during a regular graft (when ca is between cta and c2):

# name | c1<-cta | cta<->ca | ca->c2
# A.0  |         |          |
# A.1  |    X    |          |
# A.2  |         |     X    |
# A.3  |         |          |   X
# A.4  |    X    |     X    |
# A.5  |    X    |          |   X
# A.6  |         |     X    |   X
# A.7  |    X    |     X    |   X

# A.0 is trivial, and doesn't need copy tracking.
# For A.1, a forward rename is recorded in the c1 pass, to be followed later.
# In A.2, the rename is recorded in the c2 pass and followed backwards.
# A.3 is recorded in the c2 pass as a forward rename to be duplicated on target.
# In A.4, both passes of checkcopies record incomplete renames, which are
# then joined in mergecopies to record a rename to be followed.
# In A.5 and A.7, the c1 pass records an incomplete rename, while the c2 pass
# records an incomplete divergence. The incomplete rename is then joined to the
# appropriate side of the incomplete divergence, and the result is recorded as a
# divergence. The code doesn't distinguish at all between these two cases, since
# the end result of them is the same: an incomplete divergence joined with an
# incomplete rename into a divergence.
# Finally, A.6 records a divergence entirely in the c2 pass.

# A.4 has a degenerate case a<-b<-a->a, where checkcopies isn't needed at all.
# A.5 has a special case a<-b<-b->a, which is treated like a<-b->a in a merge.
# A.6 has a special case a<-a<-b->a. Here, checkcopies will find a spurious
# incomplete divergence, which is in fact complete. This is handled later in
# mergecopies.
# A.7 has 4 special cases: a<-b<-a->b (the "ping-pong" case), a<-b<-c->b,
# a<-b<-a->c and a<-b<-c->a. Of these, only the "ping-pong" case is interesting,
# the others are fairly trivial (a<-b<-c->b and a<-b<-a->c proceed like the base
# case, a<-b<-c->a is treated the same as a<-b<-b->a).

# f5a therefore tests the "ping-pong" rename case, where a file is renamed to the
# same name on both branches, then the rename is backed out on one branch, and
# the backout is grafted to the other branch. This creates a challenging rename
# sequence of a<-b<-a->b in the graft target, topological CA, graft CA and graft
# source, respectively. Since rename detection will run on the c1 side for such a
# sequence (as for technical reasons, we split the c1 and c2 sides not at the
# graft CA, but rather at the topological CA), it will pick up a false rename,
# and cause a spurious merge conflict. This false rename is always exactly the
# reverse of the true rename that would be detected on the c2 side, so we can
# correct for it by detecting this condition and reversing as necessary.

# First, set up the repository with commits to be grafted

sh % "hg init ../graftmove"
sh % "cd ../graftmove"
sh % "echo c1a" > "f1a"
sh % "echo c2a" > "f2a"
sh % "echo c3a" > "f3a"
sh % "echo c4a" > "f4a"
sh % "echo c5a" > "f5a"
sh % "hg ci -qAm A0"
sh % "hg mv f1a f1b"
sh % "hg mv f3a f3b"
sh % "hg mv f5a f5b"
sh % "hg ci -qAm B0"
sh % "echo c1c" > "f1b"
sh % "hg mv f2a f2c"
sh % "hg mv f5b f5a"
sh % "echo c5c" > "f5a"
sh % "hg ci -qAm C0"
sh % "hg mv f3b f3d"
sh % "echo c4d" > "f4a"
sh % "hg ci -qAm D0"
sh % "hg log -G" == r"""
    @  changeset:   3:b69f5839d2d9
    |  tag:         tip
    |  user:        test
    |  date:        Thu Jan 01 00:00:00 1970 +0000
    |  summary:     D0
    |
    o  changeset:   2:f58c7e2b28fa
    |  user:        test
    |  date:        Thu Jan 01 00:00:00 1970 +0000
    |  summary:     C0
    |
    o  changeset:   1:3d7bba921b5d
    |  user:        test
    |  date:        Thu Jan 01 00:00:00 1970 +0000
    |  summary:     B0
    |
    o  changeset:   0:11f7a1b56675
       user:        test
       date:        Thu Jan 01 00:00:00 1970 +0000
       summary:     A0"""

# Test the cases A.2 (f1x), A.3 (f2x) and a special case of A.6 (f5x) where the
# two renames actually converge to the same name (thus no actual divergence).

sh % "hg up -q 'desc(\"A0\")'"
sh % "'HGEDITOR=echo C1 >' hg graft -r 'desc(\"C0\")' --edit" == r"""
    grafting 2:f58c7e2b28fa "C0"
    merging f1a and f1b to f1a
    merging f5a
    warning: can't find ancestor for 'f5a' copied from 'f5b'!"""
sh % "hg status --change ." == r"""
    M f1a
    M f5a
    A f2c
    R f2a"""
sh % "hg cat f1a" == "c1c"
sh % "hg cat f1b" == r"""
    f1b: no such file in rev c9763722f9bd
    [1]"""

# Test the cases A.0 (f4x) and A.6 (f3x)

sh % "'HGEDITOR=echo D1 >' hg graft -r 'desc(\"D0\")' --edit" == r"""
    grafting 3:b69f5839d2d9 "D0"
    note: possible conflict - f3b was renamed multiple times to:
     f3d
     f3a
    warning: can't find ancestor for 'f3d' copied from 'f3b'!"""

# Set up the repository for some further tests

sh % "hg up -q 'min(desc(A0))'"
sh % "hg mv f1a f1e"
sh % "echo c2e" > "f2a"
sh % "hg mv f3a f3e"
sh % "hg mv f4a f4e"
sh % "hg mv f5a f5b"
sh % "hg ci -qAm E0"
sh % "hg log -G" == r"""
    @  changeset:   6:6bd1736cab86
    |  tag:         tip
    |  parent:      0:11f7a1b56675
    |  user:        test
    |  date:        Thu Jan 01 00:00:00 1970 +0000
    |  summary:     E0
    |
    | o  changeset:   5:560daee679da
    | |  user:        test
    | |  date:        Thu Jan 01 00:00:00 1970 +0000
    | |  summary:     D1
    | |
    | o  changeset:   4:c9763722f9bd
    |/   parent:      0:11f7a1b56675
    |    user:        test
    |    date:        Thu Jan 01 00:00:00 1970 +0000
    |    summary:     C1
    |
    | o  changeset:   3:b69f5839d2d9
    | |  user:        test
    | |  date:        Thu Jan 01 00:00:00 1970 +0000
    | |  summary:     D0
    | |
    | o  changeset:   2:f58c7e2b28fa
    | |  user:        test
    | |  date:        Thu Jan 01 00:00:00 1970 +0000
    | |  summary:     C0
    | |
    | o  changeset:   1:3d7bba921b5d
    |/   user:        test
    |    date:        Thu Jan 01 00:00:00 1970 +0000
    |    summary:     B0
    |
    o  changeset:   0:11f7a1b56675
       user:        test
       date:        Thu Jan 01 00:00:00 1970 +0000
       summary:     A0"""

# Test the cases A.4 (f1x), the "ping-pong" special case of A.7 (f5x),
# and A.3 with a local content change to be preserved (f2x).

sh % "'HGEDITOR=echo C2 >' hg graft -r 'desc(\"C0\")' --edit" == r"""
    grafting 2:f58c7e2b28fa "C0"
    merging f1e and f1b to f1e
    merging f2a and f2c to f2c
    merging f5b and f5a to f5a"""

# Test the cases A.1 (f4x) and A.7 (f3x).

sh % "'HGEDITOR=echo D2 >' hg graft -r 'desc(\"D0\")' --edit" == r"""
    grafting 3:b69f5839d2d9 "D0"
    note: possible conflict - f3b was renamed multiple times to:
     f3e
     f3d
    merging f4e and f4a to f4e
    warning: can't find ancestor for 'f3d' copied from 'f3b'!"""

# Check the results of the grafts tested

sh % "hg log -CGv --patch --git" == r"""
    @  changeset:   8:93ee502e8b0a
    |  tag:         tip
    |  user:        test
    |  date:        Thu Jan 01 00:00:00 1970 +0000
    |  files:       f3d f4e
    |  description:
    |  D2
    |
    |
    |  diff --git a/f3d b/f3d
    |  new file mode 100644
    |  --- /dev/null
    |  +++ b/f3d
    |  @@ -0,0 +1,1 @@
    |  +c3a
    |  diff --git a/f4e b/f4e
    |  --- a/f4e
    |  +++ b/f4e
    |  @@ -1,1 +1,1 @@
    |  -c4a
    |  +c4d
    |
    o  changeset:   7:539cf145f496
    |  user:        test
    |  date:        Thu Jan 01 00:00:00 1970 +0000
    |  files:       f1e f2a f2c f5a f5b
    |  copies:      f2c (f2a) f5a (f5b)
    |  description:
    |  C2
    |
    |
    |  diff --git a/f1e b/f1e
    |  --- a/f1e
    |  +++ b/f1e
    |  @@ -1,1 +1,1 @@
    |  -c1a
    |  +c1c
    |  diff --git a/f2a b/f2c
    |  rename from f2a
    |  rename to f2c
    |  diff --git a/f5b b/f5a
    |  rename from f5b
    |  rename to f5a
    |  --- a/f5b
    |  +++ b/f5a
    |  @@ -1,1 +1,1 @@
    |  -c5a
    |  +c5c
    |
    o  changeset:   6:6bd1736cab86
    |  parent:      0:11f7a1b56675
    |  user:        test
    |  date:        Thu Jan 01 00:00:00 1970 +0000
    |  files:       f1a f1e f2a f3a f3e f4a f4e f5a f5b
    |  copies:      f1e (f1a) f3e (f3a) f4e (f4a) f5b (f5a)
    |  description:
    |  E0
    |
    |
    |  diff --git a/f1a b/f1e
    |  rename from f1a
    |  rename to f1e
    |  diff --git a/f2a b/f2a
    |  --- a/f2a
    |  +++ b/f2a
    |  @@ -1,1 +1,1 @@
    |  -c2a
    |  +c2e
    |  diff --git a/f3a b/f3e
    |  rename from f3a
    |  rename to f3e
    |  diff --git a/f4a b/f4e
    |  rename from f4a
    |  rename to f4e
    |  diff --git a/f5a b/f5b
    |  rename from f5a
    |  rename to f5b
    |
    | o  changeset:   5:560daee679da
    | |  user:        test
    | |  date:        Thu Jan 01 00:00:00 1970 +0000
    | |  files:       f3d f4a
    | |  description:
    | |  D1
    | |
    | |
    | |  diff --git a/f3d b/f3d
    | |  new file mode 100644
    | |  --- /dev/null
    | |  +++ b/f3d
    | |  @@ -0,0 +1,1 @@
    | |  +c3a
    | |  diff --git a/f4a b/f4a
    | |  --- a/f4a
    | |  +++ b/f4a
    | |  @@ -1,1 +1,1 @@
    | |  -c4a
    | |  +c4d
    | |
    | o  changeset:   4:c9763722f9bd
    |/   parent:      0:11f7a1b56675
    |    user:        test
    |    date:        Thu Jan 01 00:00:00 1970 +0000
    |    files:       f1a f2a f2c f5a
    |    copies:      f2c (f2a)
    |    description:
    |    C1
    |
    |
    |    diff --git a/f1a b/f1a
    |    --- a/f1a
    |    +++ b/f1a
    |    @@ -1,1 +1,1 @@
    |    -c1a
    |    +c1c
    |    diff --git a/f2a b/f2c
    |    rename from f2a
    |    rename to f2c
    |    diff --git a/f5a b/f5a
    |    --- a/f5a
    |    +++ b/f5a
    |    @@ -1,1 +1,1 @@
    |    -c5a
    |    +c5c
    |
    | o  changeset:   3:b69f5839d2d9
    | |  user:        test
    | |  date:        Thu Jan 01 00:00:00 1970 +0000
    | |  files:       f3b f3d f4a
    | |  copies:      f3d (f3b)
    | |  description:
    | |  D0
    | |
    | |
    | |  diff --git a/f3b b/f3d
    | |  rename from f3b
    | |  rename to f3d
    | |  diff --git a/f4a b/f4a
    | |  --- a/f4a
    | |  +++ b/f4a
    | |  @@ -1,1 +1,1 @@
    | |  -c4a
    | |  +c4d
    | |
    | o  changeset:   2:f58c7e2b28fa
    | |  user:        test
    | |  date:        Thu Jan 01 00:00:00 1970 +0000
    | |  files:       f1b f2a f2c f5a f5b
    | |  copies:      f2c (f2a) f5a (f5b)
    | |  description:
    | |  C0
    | |
    | |
    | |  diff --git a/f1b b/f1b
    | |  --- a/f1b
    | |  +++ b/f1b
    | |  @@ -1,1 +1,1 @@
    | |  -c1a
    | |  +c1c
    | |  diff --git a/f2a b/f2c
    | |  rename from f2a
    | |  rename to f2c
    | |  diff --git a/f5b b/f5a
    | |  rename from f5b
    | |  rename to f5a
    | |  --- a/f5b
    | |  +++ b/f5a
    | |  @@ -1,1 +1,1 @@
    | |  -c5a
    | |  +c5c
    | |
    | o  changeset:   1:3d7bba921b5d
    |/   user:        test
    |    date:        Thu Jan 01 00:00:00 1970 +0000
    |    files:       f1a f1b f3a f3b f5a f5b
    |    copies:      f1b (f1a) f3b (f3a) f5b (f5a)
    |    description:
    |    B0
    |
    |
    |    diff --git a/f1a b/f1b
    |    rename from f1a
    |    rename to f1b
    |    diff --git a/f3a b/f3b
    |    rename from f3a
    |    rename to f3b
    |    diff --git a/f5a b/f5b
    |    rename from f5a
    |    rename to f5b
    |
    o  changeset:   0:11f7a1b56675
       user:        test
       date:        Thu Jan 01 00:00:00 1970 +0000
       files:       f1a f2a f3a f4a f5a
       description:
       A0


       diff --git a/f1a b/f1a
       new file mode 100644
       --- /dev/null
       +++ b/f1a
       @@ -0,0 +1,1 @@
       +c1a
       diff --git a/f2a b/f2a
       new file mode 100644
       --- /dev/null
       +++ b/f2a
       @@ -0,0 +1,1 @@
       +c2a
       diff --git a/f3a b/f3a
       new file mode 100644
       --- /dev/null
       +++ b/f3a
       @@ -0,0 +1,1 @@
       +c3a
       diff --git a/f4a b/f4a
       new file mode 100644
       --- /dev/null
       +++ b/f4a
       @@ -0,0 +1,1 @@
       +c4a
       diff --git a/f5a b/f5a
       new file mode 100644
       --- /dev/null
       +++ b/f5a
       @@ -0,0 +1,1 @@
       +c5a"""
sh % "hg cat f2c" == "c2e"

# Check superfluous filemerge of files renamed in the past but untouched by graft

sh % "echo a" > "a"
sh % "hg ci -qAma"
sh % "hg mv a b"
sh % "echo b" > "b"
sh % "hg ci -qAmb"
sh % "echo c" > "c"
sh % "hg ci -qAmc"
sh % "hg up -q '.~2'"
sh % "hg graft tip '-qt:fail'"

sh % "cd .."

# Graft a change into a new file previously grafted into a renamed directory

sh % "hg init dirmovenewfile"
sh % "cd dirmovenewfile"
sh % "mkdir a"
sh % "echo a" > "a/a"
sh % "hg ci -qAma"
sh % "echo x" > "a/x"
sh % "hg ci -qAmx"
sh % "hg up -q 0"
sh % "hg mv -q a b"
sh % "hg ci -qAmb"
sh % "hg graft -q 1"
sh % "hg up -q 1"
sh % "echo y" > "a/x"
sh % "hg ci -qAmy"
sh % "hg up -q 3"
sh % "hg graft -q 4"
sh % "hg status --change ." == "M b/x"

# Prepare for test of skipped changesets and how merges can influence it:

sh % "hg merge -q -r 1 --tool ':local'"
sh % "hg ci -m m"
sh % "echo xx" >> "b/x"
sh % "hg ci -m xx"

sh % "hg log -G -T '{rev} {desc|firstline}'" == r"""
    @  7 xx
    |
    o    6 m
    |\
    | o  5 y
    | |
    +---o  4 y
    | |
    | o  3 x
    | |
    | o  2 b
    | |
    o |  1 x
    |/
    o  0 a"""
# Grafting of plain changes correctly detects that 3 and 5 should be skipped:

sh % "hg up -qCr 4"
sh % "hg graft --tool ':local' -r '2::5'" == r'''
    skipping already grafted revision 3:ca093ca2f1d9 (was grafted from 1:13ec5badbf2a)
    skipping already grafted revision 5:43e9eb70dab0 (was grafted from 4:6c9a1289e5f1)
    grafting 2:42127f193bcd "b"'''

# Extending the graft range to include a (skipped) merge of 3 will not prevent us from
# also detecting that both 3 and 5 should be skipped:

sh % "hg up -qCr 4"
sh % "hg graft --tool ':local' -r '2::7'" == r"""
    skipping ungraftable merge revision 6
    skipping already grafted revision 3:ca093ca2f1d9 (was grafted from 1:13ec5badbf2a)
    skipping already grafted revision 5:43e9eb70dab0 (was grafted from 4:6c9a1289e5f1)
    grafting 2:42127f193bcd "b"
    grafting 7:d3c3f2b38ecc "xx"
    note: graft of 7:d3c3f2b38ecc created no changes to commit"""

sh % "cd .."