Examples of HgCommitCommand

Examples of org.tmatesoft.hg.core.HgCommitCommand

348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
    try {
      final HgLookup hgLookup = new HgLookup();
      final HgRepository srcRepo = hgLookup.detect(srcRepoLoc);
      final HgRemoteRepository dstRemote = hgLookup.detect(server.getURL());
      RepoUtils.modifyFileAppend(f1, "change1");
      final HgCommitCommand commitCmd = new HgCommitCommand(srcRepo).message("Commit 1");
      assertTrue(commitCmd.execute().isOk());
      assertEquals(bm1, srcRepo.getBookmarks().getActiveBookmarkName());
      assertEquals(commitCmd.getCommittedRevision(), srcRepo.getBookmarks().getRevision(bm1));
      //
      new HgPushCommand(srcRepo).destination(dstRemote).execute();
      Thread.sleep(300); // let the server perform the update
      //
      HgBookmarks srcBookmarks = srcRepo.getBookmarks();
      final HgChangelog srcClog = srcRepo.getChangelog();
      // first, check local bookmarks are intact
      errorCollector.assertEquals(srcClog.getRevision(bm2Local), srcBookmarks.getRevision(bm2));
      errorCollector.assertEquals(srcClog.getRevision(bm3Local), srcBookmarks.getRevision(bm3));
      errorCollector.assertEquals(null, srcBookmarks.getRevision(bm4));
      errorCollector.assertEquals(srcClog.getRevision(bm_4_5), srcBookmarks.getRevision(bm5));
      // now, check remote bookmarks were touched
      HgRepository dstRepo = hgLookup.detect(dstRepoLoc);
      HgBookmarks dstBookmarks = dstRepo.getBookmarks();
      final HgChangelog dstClog = dstRepo.getChangelog();
      // bm1 changed and points to newly pushed commit.
      // if the test fails (bm1 points to r8), chances are server didn't manage to update
      // bookmarks yet (there's Thread.sleep() above to give it a chance).
      errorCollector.assertEquals(commitCmd.getCommittedRevision(), dstBookmarks.getRevision(bm1));
      // bm2 didn't change
      errorCollector.assertEquals(dstClog.getRevision(bm2Remote), dstBookmarks.getRevision(bm2));
      // bm3 did change, now points to value we've got in srcRepo
      errorCollector.assertEquals(srcClog.getRevision(bm3Local), dstBookmarks.getRevision(bm3));
      // bm4 is not affected
View Full Code Here

Examples of org.tmatesoft.hg.core.HgCommitCommand

105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
      final HgRepository srcRepo = hgLookup.detect(srcRepoLoc);
      final HgRemoteRepository dstRemote = hgLookup.detect(server.getURL());
      new HgCheckoutCommand(srcRepo).changeset(6).clean(true).execute();
      assertEquals("[sanity]", "with-merge", srcRepo.getWorkingCopyBranchName());
      RepoUtils.modifyFileAppend(f1, "change1");
      new HgCommitCommand(srcRepo).message("Commit 1").execute();
      new HgCheckoutCommand(srcRepo).changeset(5).clean(true).execute();
      assertEquals("[sanity]", "no-merge", srcRepo.getWorkingCopyBranchName());
      RepoUtils.modifyFileAppend(f1, "change2");
      new HgCommitCommand(srcRepo).message("Commit 2").execute();
      //
      HgOutgoingCommand cmd = new HgOutgoingCommand(srcRepo).against(dstRemote);
      LogOutputParser outParser = new LogOutputParser(true);
      ExecHelper eh = new ExecHelper(outParser, srcRepoLoc);
      HgLogCommand.CollectHandler collector = new HgLogCommand.CollectHandler();
View Full Code Here

Examples of org.tmatesoft.hg.core.HgCommitCommand

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
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
    final File fileA = new File(repoLoc, fa.toString());
    final File fileB = new File(repoLoc, fb.toString());
    RepoUtils.createFile(fileA, "first file");
    RepoUtils.createFile(fileB, "second file");
    new HgAddRemoveCommand(hgRepo).add(fa, fb).execute();
    new HgCommitCommand(hgRepo).message("FIRST").execute();
    // add one more file
    // remove one initial file
    Path fc = Path.create("c");
    final File fileC = new File(repoLoc, fc.toString());
    RepoUtils.createFile(fileC, "third file");
    fileB.delete();
    // TODO HgAddRemoveCommand needs #copy(from, to) method
    new HgAddRemoveCommand(hgRepo).add(fc).remove(fb).execute();
    new HgCommitCommand(hgRepo).message("SECOND").execute();
    //
    assertEquals(2, hgRepo.getChangelog().getRevisionCount());
    errorCollector.assertEquals("SECOND", hgRepo.getCommitLastMessage());
    // checkout previous version
    new HgCheckoutCommand(hgRepo).changeset(0).clean(true).execute();
    assertTrue(fileA.isFile());
    assertTrue(fileB.isFile());
    assertFalse(fileC.isFile());
    // branch/two heads
    RepoUtils.modifyFileAppend(fileA, "A1");
    RepoUtils.modifyFileAppend(fileB, "B1");
    new HgCommitCommand(hgRepo).message("THIRD").execute();
    //
    new HgCheckoutCommand(hgRepo).changeset(1).clean(true).execute();
    assertTrue(fileA.isFile());
    assertFalse(fileB.isFile());
    assertTrue(fileC.isFile());
    RepoUtils.modifyFileAppend(fileA, "A2");
    RepoUtils.modifyFileAppend(fileC, "C1");
    new HgRevertCommand(hgRepo).changeset(1).file(fa).execute();
    errorCollector.assertTrue(new File(fileA.getParent(), fileA.getName() + ".orig").isFile());
    new HgCommitCommand(hgRepo).message("FOURTH").execute();
    // TODO merge and HgMergeCommand
   
    errorCollector.assertEquals(2, hgRepo.getFileNode(fa).getRevisionCount());
    errorCollector.assertEquals(2, hgRepo.getFileNode(fb).getRevisionCount());
    errorCollector.assertEquals(2, hgRepo.getFileNode(fc).getRevisionCount());
View Full Code Here

Examples of org.tmatesoft.hg.core.HgCommitCommand

110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
    final File fileB = new File(repoLoc, fb.toString());
    // rev0: +file1, +file2
    RepoUtils.createFile(fileA, "first file");
    RepoUtils.createFile(fileB, "second file");
    new HgAddRemoveCommand(hgRepo).add(fa, fb).execute();
    final HgCommitCommand commitCmd = new HgCommitCommand(hgRepo);
    commitCmd.message("FIRST").execute();
    // rev1: *file1, *file2
    RepoUtils.modifyFileAppend(fileA, "A1");
    RepoUtils.modifyFileAppend(fileB, "B1");
    commitCmd.message("SECOND").execute();
    // rev2: *file1, -file2
    RepoUtils.modifyFileAppend(fileA, "A2");
    fileB.delete();
    new HgAddRemoveCommand(hgRepo).remove(fb).execute();
    commitCmd.message("THIRD").execute();
    // rev3: fork rev0, +file3, *file2
    new HgCheckoutCommand(hgRepo).changeset(0).clean(true).execute();
    final File fileC = new File(repoLoc, fc.toString());
    RepoUtils.createFile(fileC, "third file");
    RepoUtils.modifyFileAppend(fileB, "B2");
    new HgAddRemoveCommand(hgRepo).add(fc).execute();
    commitCmd.message("FOURTH").execute();
    // rev4: *file3
    RepoUtils.modifyFileAppend(fileC, "C1");
    commitCmd.message("FIFTH").execute();
    // rev5: merge rev2 with rev3
    new HgCheckoutCommand(hgRepo).changeset(2).clean(true).execute();
    new HgMergeCommand(hgRepo).changeset(3).execute(new HgMergeCommand.MediatorBase());
    commitCmd.message("SIXTH: merge rev2 and rev3");
    errorCollector.assertTrue(commitCmd.isMergeCommit());
    HgMergeState ms = hgRepo.getMergeState();
    ms.refresh();
    errorCollector.assertTrue(ms.isMerging());
    errorCollector.assertFalse(ms.isStale());
    errorCollector.assertEquals(0, ms.getConflicts().size());
    Outcome o = commitCmd.execute();
    errorCollector.assertTrue(o.getMessage(), o.isOk());
    ms.refresh();
    errorCollector.assertFalse(ms.isMerging());
    errorCollector.assertEquals(0, ms.getConflicts().size());
    RepoUtils.assertHgVerifyOk(errorCollector, repoLoc);
View Full Code Here
TOP
Copyright © 2018 www.massapi.com. 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.