Package com.aragost.javahg

Examples of com.aragost.javahg.BaseRepository

30
31
32
33
34
35
36
37
38
39
40
    }

    @Test
    public void testGraftSelf() throws IOException {
        Assume.assumeTrue(isGraftSupported());
        BaseRepository repo = getTestRepository();
        Changeset cs = createChangeset();
        GraftCommand.on(repo).execute(cs);
        List<Changeset> heads = repo.heads();
        assertSingleton(cs, heads);
    }
View Full Code Here
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
    }

    @Test
    public void test() throws IOException {
        Assume.assumeTrue(isGraftSupported());
        BaseRepository repo = getTestRepository();
        Changeset base = createChangeset();
        writeFile("a");
        Changeset cs = commit();
        update(base);
        writeFile("b");
        commit();
        ConflictResolvingContext r = GraftCommand.on(repo).execute(cs);
        Assert.assertNull(r);
        Changeset tip = repo.tip();
        String source = tip.getExtra().getString("source");
        Assert.assertEquals(cs.getNode(), source);
    }
View Full Code Here
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
    }

    @Test
    public void testKeepDeleteConflict() throws IOException {
        Assume.assumeTrue(isGraftSupported());
        BaseRepository repo = getTestRepository();
        writeFile("file", "");
        Changeset base = commit();
        writeFile("file", "X");
        Changeset changed = commit();
        update(base);
        RemoveCommand.on(repo).execute("file");
        Changeset removed = commit();

        GraftContext ctx = GraftCommand.on(repo).execute(changed);
        Assert.assertNotNull(ctx);
        Assert.assertTrue(ctx.getFlagConflicts().isEmpty());
        Assert.assertTrue(ctx.getMergeConflicts().isEmpty());
        KeepDeleteConflict kdc = Utils.single(ctx.getKeepDeleteConflicts());
        Assert.assertNotNull(kdc);
        Assert.assertSame(removed, repo.tip());
        Assert.assertEquals("file", kdc.getFilename());
        Assert.assertSame(changed, ctx.getSource());
        kdc.delete();
        // TODO commiting results in an error, see issue 3261
        // Changeset cs = ctx.commit();
View Full Code Here
84
85
86
87
88
89
90
91
92
93
94
    }

    @Test
    public void testMergeConflict() throws IOException {
        Assume.assumeTrue(isGraftSupported());
        BaseRepository repo = getTestRepository();
        writeFile("file", "");
        Changeset base = commit();
        writeFile("file", "X");
        Changeset changed1 = commit();
        update(base);
View Full Code Here
TOP

Related Classes of com.aragost.javahg.BaseRepository

  • com.aragost.javahg.commands.BranchCommandTest
  • com.aragost.javahg.commands.CatCommandTest
  • com.aragost.javahg.commands.GraftCommandTest
  • com.aragost.javahg.commands.PhaseCommandTest
  • com.aragost.javahg.commands.PushCommandTest
  • com.aragost.javahg.commands.RevertCommandTest
  • com.aragost.javahg.commands.RollbackCommandTest
  • com.aragost.javahg.internals.JavaHgMercurialExtensionTest
  • com.aragost.javahg.internals.JavaHgTestMercurialExtensionTest
  • com.aragost.javahg.internals.Server
    • Copyright © 2018 www.massapicom. All rights reserved.
    All source code are property of their respective owners. Java is a trademark of Sun Microsystems, Inc and owned by ORACLE Inc. Contact coftware#gmail.com.