* Copyright (C) 2010, 2013 Mathias Kinzler <mathias.kinzler@sap.com>

* and other copyright owners as documented in the project's IP log.

*

* This program and the accompanying materials are made available

* under the terms of the Eclipse Distribution License v1.0 which

* accompanies this distribution, is reproduced below, and is

* available at http://www.eclipse.org/org/documents/edl-v10.php

*

* All rights reserved.

*

* Redistribution and use in source and binary forms, with or

* without modification, are permitted provided that the following

* conditions are met:

*

* - Redistributions of source code must retain the above copyright

*   notice, this list of conditions and the following disclaimer.

*

* - Redistributions in binary form must reproduce the above

*   copyright notice, this list of conditions and the following

*   disclaimer in the documentation and/or other materials provided

*   with the distribution.

*

* - Neither the name of the Eclipse Foundation, Inc. nor the

*   names of its contributors may be used to endorse or promote

*   products derived from this software without specific prior

*   written permission.

*

* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND

* CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,

* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES

* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE

* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR

* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,

* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT

* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;

* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER

* CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,

* STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)

* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF

* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

*/

  private static final String GIT_REBASE_TODO = "rebase-merge/git-rebase-todo";

  private static final String FILE1 = "file1";

  protected Git git;

  @Override

  @Before

  public void setUp() throws Exception {

    super.setUp();

    this.git = new Git(db);

  }

  private void checkoutCommit(RevCommit commit) throws IllegalStateException,

      IOException {

    RevWalk walk = new RevWalk(db);

    RevCommit head = walk.parseCommit(db.resolve(Constants.HEAD));

    DirCacheCheckout dco = new DirCacheCheckout(db, head.getTree(), db

        .lockDirCache(), commit.getTree());

    dco.setFailOnConflict(true);

    dco.checkout();

    walk.release();

    // update the HEAD

    RefUpdate refUpdate = db.updateRef(Constants.HEAD, true);

    refUpdate.setNewObjectId(commit);

    refUpdate.setRefLogMessage("checkout: moving to " + head.getName(),

        false);

    refUpdate.forceUpdate();

  }

  @Test

  public void testFastForwardWithNewFile() throws Exception {

    // create file1 on master

    writeTrashFile(FILE1, FILE1);

    git.add().addFilepattern(FILE1).call();

    RevCommit first = git.commit().setMessage("Add file1").call();

    assertTrue(new File(db.getWorkTree(), FILE1).exists());

    // create a topic branch

    createBranch(first, "refs/heads/topic");

    // create file2 on master

    File file2 = writeTrashFile("file2", "file2");

    git.add().addFilepattern("file2").call();

    RevCommit second = git.commit().setMessage("Add file2").call();

    assertTrue(new File(db.getWorkTree(), "file2").exists());

    checkoutBranch("refs/heads/topic");

    assertFalse(new File(db.getWorkTree(), "file2").exists());

    RebaseResult res = git.rebase().setUpstream("refs/heads/master").call();

    assertTrue(new File(db.getWorkTree(), "file2").exists());

    checkFile(file2, "file2");

    assertEquals(Status.FAST_FORWARD, res.getStatus());

    List<ReflogEntry> headLog = db.getReflogReader(Constants.HEAD)

        .getReverseEntries();

    List<ReflogEntry> topicLog = db.getReflogReader("refs/heads/topic")

        .getReverseEntries();

    List<ReflogEntry> masterLog = db.getReflogReader("refs/heads/master")

        .getReverseEntries();

    assertEquals("rebase finished: returning to refs/heads/topic", headLog

        .get(0).getComment());

    assertEquals("checkout: moving from topic to " + second.getName(),

        headLog.get(1).getComment());

    assertEquals(2, masterLog.size());

    assertEquals(2, topicLog.size());

    assertEquals(

        "rebase finished: refs/heads/topic onto " + second.getName(),

        topicLog.get(0).getComment());

  }

  @Test

  public void testFastForwardWithMultipleCommits() throws Exception {

    // create file1 on master

    writeTrashFile(FILE1, FILE1);

    git.add().addFilepattern(FILE1).call();

    RevCommit first = git.commit().setMessage("Add file1").call();

    assertTrue(new File(db.getWorkTree(), FILE1).exists());

    // create a topic branch

    createBranch(first, "refs/heads/topic");

    // create file2 on master

    File file2 = writeTrashFile("file2", "file2");

    git.add().addFilepattern("file2").call();

    git.commit().setMessage("Add file2").call();

    assertTrue(new File(db.getWorkTree(), "file2").exists());

    // write a second commit

    writeTrashFile("file2", "file2 new content");

    git.add().addFilepattern("file2").call();

    RevCommit second = git.commit().setMessage("Change content of file2")

        .call();

    checkoutBranch("refs/heads/topic");

    assertFalse(new File(db.getWorkTree(), "file2").exists());

    RebaseResult res = git.rebase().setUpstream("refs/heads/master").call();

    assertTrue(new File(db.getWorkTree(), "file2").exists());

    checkFile(file2, "file2 new content");

    assertEquals(Status.FAST_FORWARD, res.getStatus());

    List<ReflogEntry> headLog = db.getReflogReader(Constants.HEAD)

        .getReverseEntries();

    List<ReflogEntry> topicLog = db.getReflogReader("refs/heads/topic")

        .getReverseEntries();

    List<ReflogEntry> masterLog = db.getReflogReader("refs/heads/master")

        .getReverseEntries();

    assertEquals("rebase finished: returning to refs/heads/topic", headLog

        .get(0).getComment());

    assertEquals("checkout: moving from topic to " + second.getName(),

        headLog.get(1).getComment());

    assertEquals(3, masterLog.size());

    assertEquals(2, topicLog.size());

    assertEquals(

        "rebase finished: refs/heads/topic onto " + second.getName(),

        topicLog.get(0).getComment());

  }

  /**

   * Create the following commits and then attempt to rebase topic onto

   * master. This will serialize the branches.

   *

   * <pre>

   * A - B (master)

   *   \

   *    C - D - F (topic)

   *     \      /

   *      E  -  (side)

   * </pre>

   *

   * into

   *

   * <pre>

   * A - B - (master)  C' - D' - E' (topic')

   *   \

   *    C - D - F (topic)

   *     \      /

   *      E  -  (side)

   * </pre>

   *

   * @throws Exception

   */

  @Test

  public void testRebaseShouldIgnoreMergeCommits()

      throws Exception {

    // create file1 on master

    writeTrashFile(FILE1, FILE1);

    git.add().addFilepattern(FILE1).call();

    RevCommit a = git.commit().setMessage("Add file1").call();

    assertTrue(new File(db.getWorkTree(), FILE1).exists());

    // create a topic branch

    createBranch(a, "refs/heads/topic");

    // update FILE1 on master

    writeTrashFile(FILE1, "blah");

    git.add().addFilepattern(FILE1).call();

    RevCommit b = git.commit().setMessage("updated file1 on master").call();

    checkoutBranch("refs/heads/topic");

    writeTrashFile("file3", "more changess");

    git.add().addFilepattern("file3").call();

    RevCommit c = git.commit()

        .setMessage("update file3 on topic").call();

    // create a branch from the topic commit

    createBranch(c, "refs/heads/side");

    // second commit on topic

    writeTrashFile("file2", "file2");

    git.add().addFilepattern("file2").call();

    RevCommit d = git.commit().setMessage("Add file2").call();

    assertTrue(new File(db.getWorkTree(), "file2").exists());

    // switch to side branch and update file2

    checkoutBranch("refs/heads/side");

    writeTrashFile("file3", "more change");

    git.add().addFilepattern("file3").call();

    RevCommit e = git.commit().setMessage("update file2 on side")

        .call();

    // switch back to topic and merge in side, creating f

    checkoutBranch("refs/heads/topic");

    MergeResult result = git.merge().include(e.getId())

        .setStrategy(MergeStrategy.RESOLVE).call();

    assertEquals(MergeStatus.MERGED, result.getMergeStatus());

    RebaseResult res = git.rebase().setUpstream("refs/heads/master").call();

    assertEquals(Status.OK, res.getStatus());

    RevWalk rw = new RevWalk(db);

    rw.markStart(rw.parseCommit(db.resolve("refs/heads/topic")));

    assertDerivedFrom(rw.next(), e);

    assertDerivedFrom(rw.next(), d);

    assertDerivedFrom(rw.next(), c);

    assertEquals(b, rw.next());

    assertEquals(a, rw.next());

    List<ReflogEntry> headLog = db.getReflogReader(Constants.HEAD)

        .getReverseEntries();

    List<ReflogEntry> sideLog = db.getReflogReader("refs/heads/side")

        .getReverseEntries();

    List<ReflogEntry> topicLog = db.getReflogReader("refs/heads/topic")

        .getReverseEntries();

    List<ReflogEntry> masterLog = db.getReflogReader("refs/heads/master")

        .getReverseEntries();

    assertEquals("rebase finished: returning to refs/heads/topic", headLog

        .get(0).getComment());

    assertEquals("rebase: update file2 on side", headLog.get(1)

        .getComment());

    assertEquals("rebase: Add file2", headLog.get(2).getComment());

    assertEquals("rebase: update file3 on topic", headLog.get(3)

        .getComment());

    assertEquals("checkout: moving from topic to " + b.getName(), headLog

        .get(4).getComment());

    assertEquals(2, masterLog.size());

    assertEquals(2, sideLog.size());

    assertEquals(5, topicLog.size());

    assertEquals("rebase finished: refs/heads/topic onto " + b.getName(),

        topicLog.get(0).getComment());

  }

  static void assertDerivedFrom(RevCommit derived, RevCommit original) {

    assertThat(derived, not(equalTo(original)));

    assertEquals(original.getFullMessage(), derived.getFullMessage());

  }

  @Test

  public void testRebasePreservingMerges1() throws Exception {