Package com.aragost.javahg

Examples of com.aragost.javahg.Changeset

18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
        ParentsCommand cmd = ParentsCommand.on(repo);
        List<Changeset> parents = cmd.execute();
        Assert.assertEquals(0, parents.size());
       
        writeFile("a");
        Changeset csRoot = commit();
        parents = cmd.execute();
        Assert.assertEquals(1, parents.size());
        Assert.assertEquals(csRoot, parents.get(0));

        writeFile("b");
        Changeset csB = commit();
        parents = cmd.execute();
        Assert.assertEquals(1, parents.size());
        Assert.assertEquals(csB, parents.get(0));
       
        update(csRoot);
        writeFile("c");
        Changeset csC = commit();
        parents = cmd.execute();
        Assert.assertEquals(1, parents.size());
        Assert.assertEquals(csC, parents.get(0));
       
        MergeCommand.on(repo).execute(null);
        parents = cmd.execute();
        Assert.assertEquals(2, parents.size());
        Assert.assertEquals(csC, parents.get(0));
        Assert.assertEquals(csB, parents.get(1));
       
        writeFile("a");
        Changeset csA2 = commit();
        parents = cmd.execute();
        Assert.assertEquals(1, parents.size());
        Assert.assertEquals(csA2, parents.get(0));
       
        writeFile("a");
        Changeset csA3 = commit();
        parents = cmd.execute();
        Assert.assertEquals(1, parents.size());
        Assert.assertEquals(csA3, parents.get(0));

        parents = cmd.execute("a");
        Assert.assertEquals(1, parents.size());
        Assert.assertEquals(csA3, parents.get(0));

        parents = cmd.execute("b");
        Assert.assertEquals(1, parents.size());
        Assert.assertEquals(csB, parents.get(0));

        parents = cmd.rev(csA3.getNode()).execute("a");
        Assert.assertEquals(1, parents.size());
        Assert.assertEquals(csA2, parents.get(0));
       
        // Diamond shape give two parents with the same node
        parents = cmd.rev(csA2.getNode()).execute("a");
View Full Code Here
21
22
23
24
25
26
27
28
29
30
31
32
33
34
        writeFile("b", "bar");
        AddCommand.on(repo).execute();
        commitCmd.execute();

        writeFile("b", "booo");
        Changeset backoutCs = commitCmd.execute();

        writeFile("a", "foo");
        Changeset curCs = commitCmd.execute();

        BackoutCommand.on(repo).rev(backoutCs.getNode()).merge()
                .message("BackoutMerge").user("user").execute();

        Assert.assertEquals(curCs, repo.workingCopy().getParent1());
View Full Code Here
53
54
55
56
57
58
59
60
61
62
63
64
65
66
        AddCommand.on(repo).execute();
        commitCmd.execute();

        writeFile("b", "booo");

        Changeset backoutCs = commitCmd.execute();

        writeFile("a", "foo");
        Changeset curCs = commitCmd.execute();

        BackoutCommand.on(repo).rev(backoutCs.getNode())
                .message("BackoutMerge").user("user").execute();

        Assert.assertEquals(curCs, repo.workingCopy().getParent1());
View Full Code Here
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
        AddCommand.on(repo).execute();
        commitCmd.execute();

        writeFile("a", "bar");
        writeFile("b", "bar");
        Changeset backoutCs = commitCmd.execute();

        writeFile("a", "foo");
        writeFile("b", "foo");
        commitCmd.execute();

        BackoutCommand command = BackoutCommand.on(repo)
                .rev(backoutCs.getNode()).merge().message("BackoutMerge")
                .user("user");
        BackoutConflictResolvingContext ctx;

        ctx = command.execute();
View Full Code Here
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
        AddCommand.on(repo).execute();
        commitCmd.execute();

        writeFile("a", "bar");
        writeFile("b", "bar");
        Changeset backoutCs = commitCmd.execute();

        writeFile("a", "foo");
        writeFile("b", "foo");
        commitCmd.execute();

        BackoutCommand command = BackoutCommand.on(repo)
                .rev(backoutCs.getNode()).message("BackoutMerge").user("user");
        BackoutConflictResolvingContext ctx;

        ctx = command.execute();

        Assert.assertEquals(2, ctx.getMergeConflicts().size());
View Full Code Here
141
142
143
144
145
146
147
148
149
150
151
152
153
        writeFile("b", "bar");
        AddCommand.on(repo).execute();
        commitCmd.execute();

        writeFile("b", "booo");
        Changeset backoutCs = commitCmd.execute();

        BackoutCommand.on(repo).rev(backoutCs.getNode()).merge()
                .message("BackoutMerge").user("user").execute();

        Assert.assertEquals(backoutCs, repo.workingCopy().getParent1().getParent1());
        Assert.assertEquals(null, repo.workingCopy().getParent2());       
        Assert.assertEquals(null, repo.workingCopy().getParent1().getParent2());
View Full Code Here
167
168
169
170
171
172
173
174
175
176
177
178
179
        writeFile("b", "bar");
        AddCommand.on(repo).execute();
        commitCmd.execute();

        writeFile("b", "booo");
        Changeset backoutCs = commitCmd.execute();

        BackoutCommand.on(repo).rev(backoutCs.getNode())
                .message("BackoutMerge").user("user").execute();

        Assert.assertEquals(backoutCs, repo.workingCopy().getParent1().getParent1());
        Assert.assertEquals(null, repo.workingCopy().getParent2());       
        Assert.assertEquals(null, repo.workingCopy().getParent1().getParent2());
View Full Code Here
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
    @Test
    public void testBranches() throws IOException {
        Repository repo = getTestRepository();
        writeFile("default");
        Changeset defaultBranch = commit();
        BranchCommand.on(repo).set(" branch A ");
        commit();
        update(defaultBranch);
        BranchCommand.on(repo).set(" branch B ");
        Changeset branchB = commit(); // B is inactive
        BranchCommand.on(repo).force().set(" branch A ");
        Changeset branchATip = commit();
        BranchCommand.on(repo).set("branch C");
        commit();
        Changeset branchC = CommitCommand.on(repo).message("test").user("user").closeBranch().execute();

        List<Branch> branches = BranchesCommand.on(repo).closed().execute();
        Collections.sort(branches);

        Assert.assertEquals(4, branches.size());
View Full Code Here
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
    @Test
    public void test() throws IOException {
        Assume.assumeTrue(isPhasesSupported());
        BaseRepository repo = getTestRepository();
        Changeset cs1 = createChangeset();
        Changeset cs2 = createChangeset();
        Assert.assertEquals(DRAFT, cs1.phase());
        Assert.assertEquals(DRAFT, cs2.phase());
        PhaseCommand cmd = PhaseCommand.on(repo).pub().rev(cs2.getNode());
        cmd.execute();
        Assert.assertEquals(PUBLIC, cs1.phase());
        Assert.assertEquals(PUBLIC, cs2.phase());

        cmd = PhaseCommand.on(repo).secret().rev(cs2.getNode());
        Assert.assertFalse(cmd.execute());
        Assert.assertEquals(PUBLIC, cs1.phase());
        Assert.assertEquals(PUBLIC, cs2.phase());

        cmd = PhaseCommand.on(repo).secret().force().rev(cs1.getNode());
        Assert.assertTrue(cmd.execute());
        Assert.assertEquals(SECRET, cs1.phase());
        Assert.assertEquals(SECRET, cs2.phase());
       
        cmd = PhaseCommand.on(repo).pub().force().rev(cs1.getNode());
        cmd.execute();
        Assert.assertEquals(PUBLIC, cs1.phase());
        Assert.assertEquals(SECRET, cs2.phase());
    }
View Full Code Here
60
61
62
63
64
65
66
67
68
    @Test
    public void testPhaseMakesNoChanges() throws IOException {
        Assume.assumeTrue(isPhasesSupported());
        BaseRepository repo = getTestRepository();
        Changeset cs = createChangeset();
        PhaseCommand cmd = PhaseCommand.on(repo).draft().rev(cs.getNode());
        Assert.assertFalse(cmd.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.