Package com.aragost.javahg

Examples of com.aragost.javahg.Changeset

38
39
40
41
42
43
44
45
    @Test
    public void testSet() throws IOException {
        BaseRepository repo = getTestRepository();
        BranchCommand.on(repo).set("x");
        Changeset cs = commit();
        Assert.assertEquals("x", cs.getBranch());
    }
View Full Code Here
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
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
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
    @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());
View Full Code Here
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
    @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);
        writeFile("file", "Y");
        commit();

        GraftContext ctx = GraftCommand.on(repo).execute(changed1);
        Assert.assertNotNull(ctx);
        Assert.assertTrue(ctx.getFlagConflicts().isEmpty());
        Assert.assertTrue(ctx.getKeepDeleteConflicts().isEmpty());
        MergeConflict mergeConflict = Utils.single(ctx.getMergeConflicts());
        Assert.assertNotNull(mergeConflict);
        // Mercurial 2.2 will skip empty commits, so we must resolve
        // with new content.
        writeFile("file", "XY");
        mergeConflict.markResolved();
        Changeset cs = ctx.commit();
        Assert.assertNotNull(cs);
        Assert.assertEquals(changed1.getNode(), cs.getExtra().getString("source"));
    }
View Full Code Here
38
39
40
41
42
43
44
45
46
47
48
49
50
51
    @Test
    public void testWithMergeConflicts() throws IOException {
        Repository repo = getTestRepository();
        writeFile("a");
        Changeset csetA = commit();
        writeFile("b");
        writeFile("a");
        Changeset csetB = commit();
        UpdateResult result = UpdateCommand.on(repo).rev(csetA).execute();
        verifyResult(result, 1, 0, 1, 0);
        writeFile("a");
        result = UpdateCommand.on(repo).rev(csetB).execute();
        verifyResult(result, 1, 0, 0, 1);
View Full Code Here
53
54
55
56
57
58
59
60
61
62
63
64
65
66
    @Test
    public void testWithMerge() throws IOException {
        Repository repo = getTestRepository();
        writeFile("a", "1\n2\n3\n");
        Changeset csetA = commit();
        writeFile("b");
        writeFile("a", "11\n2\n3\n");
        Changeset csetB = commit();
        UpdateResult result = UpdateCommand.on(repo).rev(csetA).execute();
        verifyResult(result, 1, 0, 1, 0);
        writeFile("a", "1\n2\n\33\n");
        result = UpdateCommand.on(repo).rev(csetB).execute();
        verifyResult(result, 1, 0, 0, 1);
View Full Code Here
68
69
70
71
72
73
74
75
76
77
78
79
80
    @Test
    public void testWithManifestMergeConflict() throws IOException {
        Repository repo = getTestRepository();
        writeFile("a");
        Changeset csetA = commit();
        writeFile("a");
        Changeset csetB = commit();
        UpdateResult result = UpdateCommand.on(repo).rev(csetA).execute();
        verifyResult(result, 1, 0, 0, 0);
        deleteFile("a");
        ManifestMergeOracle oracle = new ManifestMergeOracle();
        result = UpdateCommand.on(repo).rev(csetB).execute(oracle);
View Full Code Here
92
93
94
95
96
97
98
99
100
101
102
103
104
    @Test
    public void testUpdateCrossesBranches() throws IOException {
        Repository repo = getTestRepository();
        writeFile("a");
        Changeset csetA = commit();
        writeFile("a");
        Changeset csetB = commit();

        UpdateCommand.on(repo).rev(csetA).execute();
        writeFile("a");

        commit();
View Full Code Here
48
49
50
51
52
53
54
55
56
57
58
        Repository repo = getTestRepository();
        CommitCommand commitCmd = CommitCommand.on(repo).message("m").user("user");
        writeFile("a", "boo");
        writeFile("b", "boo");
        AddCommand.on(repo).execute();
        Changeset baseCs = commitCmd.execute();

        writeFile("a", "bar");
        writeFile("b", "bar");
        AddCommand.on(repo).execute();
        commitCmd.execute();
View Full Code Here
TOP

Related Classes of com.aragost.javahg.Changeset

  • com.aragost.javahg.commands.AddRemoveCommandTest
  • com.aragost.javahg.commands.AnnotateCommand
  • com.aragost.javahg.commands.AnnotateCommandTest
  • com.aragost.javahg.commands.BackoutCommandTest
  • com.aragost.javahg.commands.BisectCommandTest
  • com.aragost.javahg.commands.BookmarksCommandTest
  • com.aragost.javahg.commands.BranchCommandTest
  • com.aragost.javahg.commands.BranchesTest
  • com.aragost.javahg.commands.CommitCommandTest
  • com.aragost.javahg.commands.GraftCommand
    • 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.