Mercurial > hg4j

annotate test/org/tmatesoft/hg/test/TestCommit.java @ 591:e447384f3771

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
CommitFacility as internal class; refactored infrastructure around internals (access to RevlogStream)
author Artem Tikhomirov <tikhomirov.artem@gmail.com>
date Tue, 30 Apr 2013 18:55:42 +0200
parents 41218d84842a
children c56edf42be64
rev   line source
534
243202f1bda5 Commit: refactor revision creation code from clone command to work separately, fit into existing library structure
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents:
diff changeset
1 /*
243202f1bda5 Commit: refactor revision creation code from clone command to work separately, fit into existing library structure
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents:
diff changeset
2 * Copyright (c) 2013 TMate Software Ltd
243202f1bda5 Commit: refactor revision creation code from clone command to work separately, fit into existing library structure
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents:
diff changeset
3 *
243202f1bda5 Commit: refactor revision creation code from clone command to work separately, fit into existing library structure
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents:
diff changeset
4 * This program is free software; you can redistribute it and/or modify
243202f1bda5 Commit: refactor revision creation code from clone command to work separately, fit into existing library structure
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents:
diff changeset
5 * it under the terms of the GNU General Public License as published by
243202f1bda5 Commit: refactor revision creation code from clone command to work separately, fit into existing library structure
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents:
diff changeset
6 * the Free Software Foundation; version 2 of the License.
243202f1bda5 Commit: refactor revision creation code from clone command to work separately, fit into existing library structure
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents:
diff changeset
7 *
243202f1bda5 Commit: refactor revision creation code from clone command to work separately, fit into existing library structure
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents:
diff changeset
8 * This program is distributed in the hope that it will be useful,
243202f1bda5 Commit: refactor revision creation code from clone command to work separately, fit into existing library structure
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents:
diff changeset
9 * but WITHOUT ANY WARRANTY; without even the implied warranty of
243202f1bda5 Commit: refactor revision creation code from clone command to work separately, fit into existing library structure
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents:
diff changeset
10 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
243202f1bda5 Commit: refactor revision creation code from clone command to work separately, fit into existing library structure
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents:
diff changeset
11 * GNU General Public License for more details.
243202f1bda5 Commit: refactor revision creation code from clone command to work separately, fit into existing library structure
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents:
diff changeset
12 *
243202f1bda5 Commit: refactor revision creation code from clone command to work separately, fit into existing library structure
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents:
diff changeset
13 * For information on how to redistribute this software under
243202f1bda5 Commit: refactor revision creation code from clone command to work separately, fit into existing library structure
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents:
diff changeset
14 * the terms of a license other than GNU General Public License
243202f1bda5 Commit: refactor revision creation code from clone command to work separately, fit into existing library structure
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents:
diff changeset
15 * contact TMate Software at support@hg4j.com
243202f1bda5 Commit: refactor revision creation code from clone command to work separately, fit into existing library structure
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents:
diff changeset
16 */
243202f1bda5 Commit: refactor revision creation code from clone command to work separately, fit into existing library structure
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents:
diff changeset
17 package org.tmatesoft.hg.test;
243202f1bda5 Commit: refactor revision creation code from clone command to work separately, fit into existing library structure
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents:
diff changeset
18
559
6ca3d0c5b4bc Commit: tests and fixes for defects discovered
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 539
diff changeset
19 import static org.junit.Assert.*;
6ca3d0c5b4bc Commit: tests and fixes for defects discovered
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 539
diff changeset
20 import static org.tmatesoft.hg.repo.HgRepository.*;
539
9edfd5a223b8 Commit: handle empty repository case
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 538
diff changeset
21
538
dd4f6311af52 Commit: first working version
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 534
diff changeset
22 import java.io.File;
559
6ca3d0c5b4bc Commit: tests and fixes for defects discovered
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 539
diff changeset
23 import java.io.IOException;
538
dd4f6311af52 Commit: first working version
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 534
diff changeset
24 import java.nio.ByteBuffer;
559
6ca3d0c5b4bc Commit: tests and fixes for defects discovered
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 539
diff changeset
25 import java.util.List;
538
dd4f6311af52 Commit: first working version
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 534
diff changeset
26
588
41218d84842a Update dirstate after commit
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 586
diff changeset
27 import org.junit.Rule;
534
243202f1bda5 Commit: refactor revision creation code from clone command to work separately, fit into existing library structure
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents:
diff changeset
28 import org.junit.Test;
559
6ca3d0c5b4bc Commit: tests and fixes for defects discovered
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 539
diff changeset
29 import org.tmatesoft.hg.core.HgAddRemoveCommand;
6ca3d0c5b4bc Commit: tests and fixes for defects discovered
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 539
diff changeset
30 import org.tmatesoft.hg.core.HgCatCommand;
6ca3d0c5b4bc Commit: tests and fixes for defects discovered
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 539
diff changeset
31 import org.tmatesoft.hg.core.HgChangeset;
586
73c20c648c1f HgCommitCommand initial support
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 565
diff changeset
32 import org.tmatesoft.hg.core.HgCommitCommand;
559
6ca3d0c5b4bc Commit: tests and fixes for defects discovered
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 539
diff changeset
33 import org.tmatesoft.hg.core.HgLogCommand;
586
73c20c648c1f HgCommitCommand initial support
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 565
diff changeset
34 import org.tmatesoft.hg.core.HgStatus.Kind;
73c20c648c1f HgCommitCommand initial support
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 565
diff changeset
35 import org.tmatesoft.hg.core.HgStatusCommand;
559
6ca3d0c5b4bc Commit: tests and fixes for defects discovered
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 539
diff changeset
36 import org.tmatesoft.hg.core.Nodeid;
6ca3d0c5b4bc Commit: tests and fixes for defects discovered
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 539
diff changeset
37 import org.tmatesoft.hg.internal.ByteArrayChannel;
591
e447384f3771 CommitFacility as internal class; refactored infrastructure around internals (access to RevlogStream)
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 588
diff changeset
38 import org.tmatesoft.hg.internal.CommitFacility;
586
73c20c648c1f HgCommitCommand initial support
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 565
diff changeset
39 import org.tmatesoft.hg.internal.FileContentSupplier;
591
e447384f3771 CommitFacility as internal class; refactored infrastructure around internals (access to RevlogStream)
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 588
diff changeset
40 import org.tmatesoft.hg.internal.Internals;
559
6ca3d0c5b4bc Commit: tests and fixes for defects discovered
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 539
diff changeset
41 import org.tmatesoft.hg.repo.HgDataFile;
538
dd4f6311af52 Commit: first working version
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 534
diff changeset
42 import org.tmatesoft.hg.repo.HgLookup;
dd4f6311af52 Commit: first working version
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 534
diff changeset
43 import org.tmatesoft.hg.repo.HgRepository;
586
73c20c648c1f HgCommitCommand initial support
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 565
diff changeset
44 import org.tmatesoft.hg.util.Outcome;
559
6ca3d0c5b4bc Commit: tests and fixes for defects discovered
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 539
diff changeset
45 import org.tmatesoft.hg.util.Path;
534
243202f1bda5 Commit: refactor revision creation code from clone command to work separately, fit into existing library structure
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents:
diff changeset
46
243202f1bda5 Commit: refactor revision creation code from clone command to work separately, fit into existing library structure
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents:
diff changeset
47 /**
559
6ca3d0c5b4bc Commit: tests and fixes for defects discovered
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 539
diff changeset
48 * Handy for debug to see patch content:
6ca3d0c5b4bc Commit: tests and fixes for defects discovered
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 539
diff changeset
49 * ...RevlogDump /tmp/test-commit2non-empty/.hg/ store/data/file1.i dumpData
534
243202f1bda5 Commit: refactor revision creation code from clone command to work separately, fit into existing library structure
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents:
diff changeset
50 *
243202f1bda5 Commit: refactor revision creation code from clone command to work separately, fit into existing library structure
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents:
diff changeset
51 * @author Artem Tikhomirov
243202f1bda5 Commit: refactor revision creation code from clone command to work separately, fit into existing library structure
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents:
diff changeset
52 * @author TMate Software Ltd.
243202f1bda5 Commit: refactor revision creation code from clone command to work separately, fit into existing library structure
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents:
diff changeset
53 */
243202f1bda5 Commit: refactor revision creation code from clone command to work separately, fit into existing library structure
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents:
diff changeset
54 public class TestCommit {
243202f1bda5 Commit: refactor revision creation code from clone command to work separately, fit into existing library structure
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents:
diff changeset
55
588
41218d84842a Update dirstate after commit
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 586
diff changeset
56 @Rule
41218d84842a Update dirstate after commit
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 586
diff changeset
57 public ErrorCollectorExt errorCollector = new ErrorCollectorExt();
41218d84842a Update dirstate after commit
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 586
diff changeset
58
534
243202f1bda5 Commit: refactor revision creation code from clone command to work separately, fit into existing library structure
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents:
diff changeset
59 @Test
538
dd4f6311af52 Commit: first working version
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 534
diff changeset
60 public void testCommitToNonEmpty() throws Exception {
dd4f6311af52 Commit: first working version
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 534
diff changeset
61 File repoLoc = RepoUtils.initEmptyTempRepo("test-commit2non-empty");
559
6ca3d0c5b4bc Commit: tests and fixes for defects discovered
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 539
diff changeset
62 RepoUtils.createFile(new File(repoLoc, "file1"), "hello\n");
6ca3d0c5b4bc Commit: tests and fixes for defects discovered
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 539
diff changeset
63 new ExecHelper(new OutputParser.Stub(), repoLoc).run("hg", "commit", "--addremove", "-m", "FIRST");
538
dd4f6311af52 Commit: first working version
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 534
diff changeset
64 //
dd4f6311af52 Commit: first working version
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 534
diff changeset
65 HgRepository hgRepo = new HgLookup().detect(repoLoc);
591
e447384f3771 CommitFacility as internal class; refactored infrastructure around internals (access to RevlogStream)
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 588
diff changeset
66 CommitFacility cf = new CommitFacility(Internals.getInstance(hgRepo), 0);
559
6ca3d0c5b4bc Commit: tests and fixes for defects discovered
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 539
diff changeset
67 // FIXME test diff for processing changed newlines (ie \r\n -> \n or vice verse) - if a whole line or
6ca3d0c5b4bc Commit: tests and fixes for defects discovered
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 539
diff changeset
68 // just changed endings are in the patch!
6ca3d0c5b4bc Commit: tests and fixes for defects discovered
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 539
diff changeset
69 HgDataFile df = hgRepo.getFileNode("file1");
6ca3d0c5b4bc Commit: tests and fixes for defects discovered
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 539
diff changeset
70 cf.add(df, new ByteArraySupplier("hello\nworld".getBytes()));
6ca3d0c5b4bc Commit: tests and fixes for defects discovered
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 539
diff changeset
71 Nodeid secondRev = cf.commit("SECOND");
6ca3d0c5b4bc Commit: tests and fixes for defects discovered
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 539
diff changeset
72 //
6ca3d0c5b4bc Commit: tests and fixes for defects discovered
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 539
diff changeset
73 List<HgChangeset> commits = new HgLogCommand(hgRepo).execute();
588
41218d84842a Update dirstate after commit
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 586
diff changeset
74 errorCollector.assertEquals(2, commits.size());
559
6ca3d0c5b4bc Commit: tests and fixes for defects discovered
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 539
diff changeset
75 HgChangeset c1 = commits.get(0);
6ca3d0c5b4bc Commit: tests and fixes for defects discovered
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 539
diff changeset
76 HgChangeset c2 = commits.get(1);
588
41218d84842a Update dirstate after commit
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 586
diff changeset
77 errorCollector.assertEquals("FIRST", c1.getComment());
41218d84842a Update dirstate after commit
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 586
diff changeset
78 errorCollector.assertEquals("SECOND", c2.getComment());
41218d84842a Update dirstate after commit
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 586
diff changeset
79 errorCollector.assertEquals(df.getPath(), c2.getAffectedFiles().get(0));
41218d84842a Update dirstate after commit
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 586
diff changeset
80 errorCollector.assertEquals(c1.getNodeid(), c2.getFirstParentRevision());
41218d84842a Update dirstate after commit
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 586
diff changeset
81 errorCollector.assertEquals(Nodeid.NULL, c2.getSecondParentRevision());
41218d84842a Update dirstate after commit
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 586
diff changeset
82 errorCollector.assertEquals(secondRev, c2.getNodeid());
539
9edfd5a223b8 Commit: handle empty repository case
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 538
diff changeset
83 }
9edfd5a223b8 Commit: handle empty repository case
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 538
diff changeset
84
9edfd5a223b8 Commit: handle empty repository case
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 538
diff changeset
85 @Test
9edfd5a223b8 Commit: handle empty repository case
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 538
diff changeset
86 public void testCommitToEmpty() throws Exception {
9edfd5a223b8 Commit: handle empty repository case
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 538
diff changeset
87 File repoLoc = RepoUtils.initEmptyTempRepo("test-commit2empty");
559
6ca3d0c5b4bc Commit: tests and fixes for defects discovered
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 539
diff changeset
88 String fname = "file1";
6ca3d0c5b4bc Commit: tests and fixes for defects discovered
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 539
diff changeset
89 RepoUtils.createFile(new File(repoLoc, fname), null);
6ca3d0c5b4bc Commit: tests and fixes for defects discovered
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 539
diff changeset
90 new ExecHelper(new OutputParser.Stub(), repoLoc).run("hg", "add", fname);
539
9edfd5a223b8 Commit: handle empty repository case
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 538
diff changeset
91 //
9edfd5a223b8 Commit: handle empty repository case
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 538
diff changeset
92 HgRepository hgRepo = new HgLookup().detect(repoLoc);
559
6ca3d0c5b4bc Commit: tests and fixes for defects discovered
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 539
diff changeset
93 assertEquals("[sanity]", 0, new HgLogCommand(hgRepo).execute().size());
591
e447384f3771 CommitFacility as internal class; refactored infrastructure around internals (access to RevlogStream)
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 588
diff changeset
94 CommitFacility cf = new CommitFacility(Internals.getInstance(hgRepo), NO_REVISION);
559
6ca3d0c5b4bc Commit: tests and fixes for defects discovered
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 539
diff changeset
95 HgDataFile df = hgRepo.getFileNode(fname);
6ca3d0c5b4bc Commit: tests and fixes for defects discovered
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 539
diff changeset
96 final byte[] initialContent = "hello\nworld".getBytes();
6ca3d0c5b4bc Commit: tests and fixes for defects discovered
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 539
diff changeset
97 cf.add(df, new ByteArraySupplier(initialContent));
6ca3d0c5b4bc Commit: tests and fixes for defects discovered
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 539
diff changeset
98 String comment = "commit 1";
6ca3d0c5b4bc Commit: tests and fixes for defects discovered
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 539
diff changeset
99 Nodeid c1Rev = cf.commit(comment);
6ca3d0c5b4bc Commit: tests and fixes for defects discovered
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 539
diff changeset
100 List<HgChangeset> commits = new HgLogCommand(hgRepo).execute();
588
41218d84842a Update dirstate after commit
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 586
diff changeset
101 errorCollector.assertEquals(1, commits.size());
559
6ca3d0c5b4bc Commit: tests and fixes for defects discovered
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 539
diff changeset
102 HgChangeset c1 = commits.get(0);
588
41218d84842a Update dirstate after commit
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 586
diff changeset
103 errorCollector.assertEquals(1, c1.getAffectedFiles().size());
41218d84842a Update dirstate after commit
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 586
diff changeset
104 errorCollector.assertEquals(df.getPath(), c1.getAffectedFiles().get(0));
41218d84842a Update dirstate after commit
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 586
diff changeset
105 errorCollector.assertEquals(0, c1.getRevisionIndex());
41218d84842a Update dirstate after commit
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 586
diff changeset
106 errorCollector.assertEquals(Nodeid.NULL, c1.getFirstParentRevision());
41218d84842a Update dirstate after commit
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 586
diff changeset
107 errorCollector.assertEquals(Nodeid.NULL, c1.getSecondParentRevision());
41218d84842a Update dirstate after commit
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 586
diff changeset
108 errorCollector.assertEquals(HgRepository.DEFAULT_BRANCH_NAME, c1.getBranch());
41218d84842a Update dirstate after commit
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 586
diff changeset
109 errorCollector.assertEquals(comment, c1.getComment());
41218d84842a Update dirstate after commit
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 586
diff changeset
110 errorCollector.assertEquals(c1Rev, c1.getNodeid());
559
6ca3d0c5b4bc Commit: tests and fixes for defects discovered
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 539
diff changeset
111 ByteArrayChannel bac = new ByteArrayChannel();
6ca3d0c5b4bc Commit: tests and fixes for defects discovered
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 539
diff changeset
112 new HgCatCommand(hgRepo).file(df.getPath()).execute(bac);
6ca3d0c5b4bc Commit: tests and fixes for defects discovered
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 539
diff changeset
113 assertArrayEquals(initialContent, bac.toArray());
6ca3d0c5b4bc Commit: tests and fixes for defects discovered
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 539
diff changeset
114 }
6ca3d0c5b4bc Commit: tests and fixes for defects discovered
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 539
diff changeset
115
6ca3d0c5b4bc Commit: tests and fixes for defects discovered
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 539
diff changeset
116 @Test
6ca3d0c5b4bc Commit: tests and fixes for defects discovered
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 539
diff changeset
117 public void testCommitIntoBranch() throws Exception {
6ca3d0c5b4bc Commit: tests and fixes for defects discovered
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 539
diff changeset
118 File repoLoc = RepoUtils.cloneRepoToTempLocation("log-1", "test-add-remove-commit", false);
6ca3d0c5b4bc Commit: tests and fixes for defects discovered
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 539
diff changeset
119 HgRepository hgRepo = new HgLookup().detect(repoLoc);
6ca3d0c5b4bc Commit: tests and fixes for defects discovered
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 539
diff changeset
120 HgDataFile dfD = hgRepo.getFileNode("d");
6ca3d0c5b4bc Commit: tests and fixes for defects discovered
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 539
diff changeset
121 assertTrue("[sanity]", dfD.exists());
6ca3d0c5b4bc Commit: tests and fixes for defects discovered
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 539
diff changeset
122 File fileD = new File(repoLoc, "d");
6ca3d0c5b4bc Commit: tests and fixes for defects discovered
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 539
diff changeset
123 assertTrue("[sanity]", fileD.canRead());
6ca3d0c5b4bc Commit: tests and fixes for defects discovered
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 539
diff changeset
124 final int parentCsetRevIndex = hgRepo.getChangelog().getLastRevision();
6ca3d0c5b4bc Commit: tests and fixes for defects discovered
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 539
diff changeset
125 HgChangeset parentCset = new HgLogCommand(hgRepo).range(parentCsetRevIndex, parentCsetRevIndex).execute().get(0);
6ca3d0c5b4bc Commit: tests and fixes for defects discovered
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 539
diff changeset
126 assertEquals("[sanity]", DEFAULT_BRANCH_NAME, parentCset.getBranch());
6ca3d0c5b4bc Commit: tests and fixes for defects discovered
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 539
diff changeset
127 //
6ca3d0c5b4bc Commit: tests and fixes for defects discovered
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 539
diff changeset
128 RepoUtils.modifyFileAppend(fileD, "A CHANGE\n");
591
e447384f3771 CommitFacility as internal class; refactored infrastructure around internals (access to RevlogStream)
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 588
diff changeset
129 CommitFacility cf = new CommitFacility(Internals.getInstance(hgRepo), parentCsetRevIndex);
559
6ca3d0c5b4bc Commit: tests and fixes for defects discovered
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 539
diff changeset
130 FileContentSupplier contentProvider = new FileContentSupplier(fileD);
6ca3d0c5b4bc Commit: tests and fixes for defects discovered
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 539
diff changeset
131 cf.add(dfD, contentProvider);
6ca3d0c5b4bc Commit: tests and fixes for defects discovered
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 539
diff changeset
132 cf.branch("branch1");
6ca3d0c5b4bc Commit: tests and fixes for defects discovered
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 539
diff changeset
133 Nodeid commitRev1 = cf.commit("FIRST");
6ca3d0c5b4bc Commit: tests and fixes for defects discovered
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 539
diff changeset
134 contentProvider.done();
6ca3d0c5b4bc Commit: tests and fixes for defects discovered
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 539
diff changeset
135 //
6ca3d0c5b4bc Commit: tests and fixes for defects discovered
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 539
diff changeset
136 // FIXME requirement to reload repository is disgusting
6ca3d0c5b4bc Commit: tests and fixes for defects discovered
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 539
diff changeset
137 hgRepo = new HgLookup().detect(repoLoc);
6ca3d0c5b4bc Commit: tests and fixes for defects discovered
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 539
diff changeset
138 List<HgChangeset> commits = new HgLogCommand(hgRepo).range(parentCsetRevIndex+1, TIP).execute();
6ca3d0c5b4bc Commit: tests and fixes for defects discovered
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 539
diff changeset
139 assertEquals(1, commits.size());
6ca3d0c5b4bc Commit: tests and fixes for defects discovered
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 539
diff changeset
140 HgChangeset c1 = commits.get(0);
588
41218d84842a Update dirstate after commit
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 586
diff changeset
141 errorCollector.assertEquals(c1.getNodeid(), commitRev1);
41218d84842a Update dirstate after commit
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 586
diff changeset
142 errorCollector.assertEquals("branch1", c1.getBranch());
41218d84842a Update dirstate after commit
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 586
diff changeset
143 errorCollector.assertEquals("FIRST", c1.getComment());
559
6ca3d0c5b4bc Commit: tests and fixes for defects discovered
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 539
diff changeset
144 //
6ca3d0c5b4bc Commit: tests and fixes for defects discovered
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 539
diff changeset
145 assertHgVerifyOk(repoLoc);
6ca3d0c5b4bc Commit: tests and fixes for defects discovered
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 539
diff changeset
146 }
6ca3d0c5b4bc Commit: tests and fixes for defects discovered
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 539
diff changeset
147
6ca3d0c5b4bc Commit: tests and fixes for defects discovered
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 539
diff changeset
148 /**
6ca3d0c5b4bc Commit: tests and fixes for defects discovered
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 539
diff changeset
149 * use own add and remove commands and then commit
6ca3d0c5b4bc Commit: tests and fixes for defects discovered
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 539
diff changeset
150 */
6ca3d0c5b4bc Commit: tests and fixes for defects discovered
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 539
diff changeset
151 @Test
6ca3d0c5b4bc Commit: tests and fixes for defects discovered
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 539
diff changeset
152 public void testCommitWithAddRemove() throws Exception {
6ca3d0c5b4bc Commit: tests and fixes for defects discovered
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 539
diff changeset
153 File repoLoc = RepoUtils.cloneRepoToTempLocation("log-1", "test-add-remove-commit", false);
6ca3d0c5b4bc Commit: tests and fixes for defects discovered
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 539
diff changeset
154 HgRepository hgRepo = new HgLookup().detect(repoLoc);
6ca3d0c5b4bc Commit: tests and fixes for defects discovered
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 539
diff changeset
155 assertTrue("[sanity]", hgRepo.getFileNode("d").exists());
6ca3d0c5b4bc Commit: tests and fixes for defects discovered
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 539
diff changeset
156 assertTrue("[sanity]", new File(repoLoc, "d").canRead());
6ca3d0c5b4bc Commit: tests and fixes for defects discovered
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 539
diff changeset
157 RepoUtils.createFile(new File(repoLoc, "xx"), "xyz");
6ca3d0c5b4bc Commit: tests and fixes for defects discovered
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 539
diff changeset
158 new HgAddRemoveCommand(hgRepo).add(Path.create("xx")).remove(Path.create("d")).execute();
591
e447384f3771 CommitFacility as internal class; refactored infrastructure around internals (access to RevlogStream)
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 588
diff changeset
159 CommitFacility cf = new CommitFacility(Internals.getInstance(hgRepo), hgRepo.getChangelog().getLastRevision());
559
6ca3d0c5b4bc Commit: tests and fixes for defects discovered
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 539
diff changeset
160 FileContentSupplier contentProvider = new FileContentSupplier(new File(repoLoc, "xx"));
6ca3d0c5b4bc Commit: tests and fixes for defects discovered
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 539
diff changeset
161 cf.add(hgRepo.getFileNode("xx"), contentProvider);
6ca3d0c5b4bc Commit: tests and fixes for defects discovered
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 539
diff changeset
162 cf.forget(hgRepo.getFileNode("d"));
6ca3d0c5b4bc Commit: tests and fixes for defects discovered
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 539
diff changeset
163 Nodeid commitRev = cf.commit("Commit with add/remove cmd");
6ca3d0c5b4bc Commit: tests and fixes for defects discovered
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 539
diff changeset
164 contentProvider.done();
6ca3d0c5b4bc Commit: tests and fixes for defects discovered
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 539
diff changeset
165 // Note, working directory still points to original revision, CommitFacility doesn't update dirstate
6ca3d0c5b4bc Commit: tests and fixes for defects discovered
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 539
diff changeset
166 //
6ca3d0c5b4bc Commit: tests and fixes for defects discovered
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 539
diff changeset
167 // FIXME requirement to reload repository is disgusting
6ca3d0c5b4bc Commit: tests and fixes for defects discovered
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 539
diff changeset
168 hgRepo = new HgLookup().detect(repoLoc);
6ca3d0c5b4bc Commit: tests and fixes for defects discovered
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 539
diff changeset
169 List<HgChangeset> commits = new HgLogCommand(hgRepo).changeset(commitRev).execute();
6ca3d0c5b4bc Commit: tests and fixes for defects discovered
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 539
diff changeset
170 HgChangeset cmt = commits.get(0);
588
41218d84842a Update dirstate after commit
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 586
diff changeset
171 errorCollector.assertEquals(1, cmt.getAddedFiles().size());
41218d84842a Update dirstate after commit
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 586
diff changeset
172 errorCollector.assertEquals("xx", cmt.getAddedFiles().get(0).getPath().toString());
41218d84842a Update dirstate after commit
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 586
diff changeset
173 errorCollector.assertEquals(1, cmt.getRemovedFiles().size());
41218d84842a Update dirstate after commit
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 586
diff changeset
174 errorCollector.assertEquals("d", cmt.getRemovedFiles().get(0).toString());
559
6ca3d0c5b4bc Commit: tests and fixes for defects discovered
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 539
diff changeset
175 ByteArrayChannel sink = new ByteArrayChannel();
6ca3d0c5b4bc Commit: tests and fixes for defects discovered
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 539
diff changeset
176 new HgCatCommand(hgRepo).file(Path.create("xx")).changeset(commitRev).execute(sink);
6ca3d0c5b4bc Commit: tests and fixes for defects discovered
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 539
diff changeset
177 assertArrayEquals("xyz".getBytes(), sink.toArray());
6ca3d0c5b4bc Commit: tests and fixes for defects discovered
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 539
diff changeset
178 //
6ca3d0c5b4bc Commit: tests and fixes for defects discovered
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 539
diff changeset
179 assertHgVerifyOk(repoLoc);
6ca3d0c5b4bc Commit: tests and fixes for defects discovered
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 539
diff changeset
180 }
6ca3d0c5b4bc Commit: tests and fixes for defects discovered
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 539
diff changeset
181 /**
6ca3d0c5b4bc Commit: tests and fixes for defects discovered
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 539
diff changeset
182 * perform few commits one by one, into different branches
6ca3d0c5b4bc Commit: tests and fixes for defects discovered
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 539
diff changeset
183 */
6ca3d0c5b4bc Commit: tests and fixes for defects discovered
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 539
diff changeset
184 @Test
6ca3d0c5b4bc Commit: tests and fixes for defects discovered
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 539
diff changeset
185 public void testSequentialCommits() throws Exception {
6ca3d0c5b4bc Commit: tests and fixes for defects discovered
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 539
diff changeset
186 File repoLoc = RepoUtils.cloneRepoToTempLocation("log-1", "test-add-remove-commit", false);
6ca3d0c5b4bc Commit: tests and fixes for defects discovered
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 539
diff changeset
187 HgRepository hgRepo = new HgLookup().detect(repoLoc);
6ca3d0c5b4bc Commit: tests and fixes for defects discovered
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 539
diff changeset
188 HgDataFile dfD = hgRepo.getFileNode("d");
6ca3d0c5b4bc Commit: tests and fixes for defects discovered
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 539
diff changeset
189 assertTrue("[sanity]", dfD.exists());
6ca3d0c5b4bc Commit: tests and fixes for defects discovered
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 539
diff changeset
190 File fileD = new File(repoLoc, "d");
6ca3d0c5b4bc Commit: tests and fixes for defects discovered
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 539
diff changeset
191 assertTrue("[sanity]", fileD.canRead());
6ca3d0c5b4bc Commit: tests and fixes for defects discovered
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 539
diff changeset
192 //
6ca3d0c5b4bc Commit: tests and fixes for defects discovered
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 539
diff changeset
193 RepoUtils.modifyFileAppend(fileD, " 1 \n");
6ca3d0c5b4bc Commit: tests and fixes for defects discovered
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 539
diff changeset
194 final int parentCsetRevIndex = hgRepo.getChangelog().getLastRevision();
591
e447384f3771 CommitFacility as internal class; refactored infrastructure around internals (access to RevlogStream)
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 588
diff changeset
195 CommitFacility cf = new CommitFacility(Internals.getInstance(hgRepo), parentCsetRevIndex);
559
6ca3d0c5b4bc Commit: tests and fixes for defects discovered
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 539
diff changeset
196 FileContentSupplier contentProvider = new FileContentSupplier(fileD);
6ca3d0c5b4bc Commit: tests and fixes for defects discovered
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 539
diff changeset
197 cf.add(dfD, contentProvider);
6ca3d0c5b4bc Commit: tests and fixes for defects discovered
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 539
diff changeset
198 cf.branch("branch1");
6ca3d0c5b4bc Commit: tests and fixes for defects discovered
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 539
diff changeset
199 Nodeid commitRev1 = cf.commit("FIRST");
6ca3d0c5b4bc Commit: tests and fixes for defects discovered
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 539
diff changeset
200 contentProvider.done();
6ca3d0c5b4bc Commit: tests and fixes for defects discovered
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 539
diff changeset
201 //
6ca3d0c5b4bc Commit: tests and fixes for defects discovered
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 539
diff changeset
202 RepoUtils.modifyFileAppend(fileD, " 2 \n");
6ca3d0c5b4bc Commit: tests and fixes for defects discovered
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 539
diff changeset
203 cf.add(dfD, contentProvider = new FileContentSupplier(fileD));
6ca3d0c5b4bc Commit: tests and fixes for defects discovered
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 539
diff changeset
204 cf.branch("branch2");
6ca3d0c5b4bc Commit: tests and fixes for defects discovered
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 539
diff changeset
205 Nodeid commitRev2 = cf.commit("SECOND");
6ca3d0c5b4bc Commit: tests and fixes for defects discovered
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 539
diff changeset
206 contentProvider.done();
6ca3d0c5b4bc Commit: tests and fixes for defects discovered
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 539
diff changeset
207 //
6ca3d0c5b4bc Commit: tests and fixes for defects discovered
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 539
diff changeset
208 RepoUtils.modifyFileAppend(fileD, " 2 \n");
6ca3d0c5b4bc Commit: tests and fixes for defects discovered
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 539
diff changeset
209 cf.add(dfD, contentProvider = new FileContentSupplier(fileD));
6ca3d0c5b4bc Commit: tests and fixes for defects discovered
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 539
diff changeset
210 cf.branch(DEFAULT_BRANCH_NAME);
6ca3d0c5b4bc Commit: tests and fixes for defects discovered
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 539
diff changeset
211 Nodeid commitRev3 = cf.commit("THIRD");
6ca3d0c5b4bc Commit: tests and fixes for defects discovered
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 539
diff changeset
212 contentProvider.done();
6ca3d0c5b4bc Commit: tests and fixes for defects discovered
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 539
diff changeset
213 //
6ca3d0c5b4bc Commit: tests and fixes for defects discovered
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 539
diff changeset
214 // FIXME requirement to reload repository is disgusting
6ca3d0c5b4bc Commit: tests and fixes for defects discovered
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 539
diff changeset
215 hgRepo = new HgLookup().detect(repoLoc);
6ca3d0c5b4bc Commit: tests and fixes for defects discovered
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 539
diff changeset
216 List<HgChangeset> commits = new HgLogCommand(hgRepo).range(parentCsetRevIndex+1, TIP).execute();
6ca3d0c5b4bc Commit: tests and fixes for defects discovered
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 539
diff changeset
217 assertEquals(3, commits.size());
6ca3d0c5b4bc Commit: tests and fixes for defects discovered
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 539
diff changeset
218 HgChangeset c1 = commits.get(0);
6ca3d0c5b4bc Commit: tests and fixes for defects discovered
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 539
diff changeset
219 HgChangeset c2 = commits.get(1);
6ca3d0c5b4bc Commit: tests and fixes for defects discovered
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 539
diff changeset
220 HgChangeset c3 = commits.get(2);
588
41218d84842a Update dirstate after commit
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 586
diff changeset
221 errorCollector.assertEquals(c1.getNodeid(), commitRev1);
41218d84842a Update dirstate after commit
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 586
diff changeset
222 errorCollector.assertEquals(c2.getNodeid(), commitRev2);
41218d84842a Update dirstate after commit
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 586
diff changeset
223 errorCollector.assertEquals(c3.getNodeid(), commitRev3);
41218d84842a Update dirstate after commit
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 586
diff changeset
224 errorCollector.assertEquals("branch1", c1.getBranch());
41218d84842a Update dirstate after commit
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 586
diff changeset
225 errorCollector.assertEquals("branch2", c2.getBranch());
41218d84842a Update dirstate after commit
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 586
diff changeset
226 errorCollector.assertEquals(DEFAULT_BRANCH_NAME, c3.getBranch());
41218d84842a Update dirstate after commit
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 586
diff changeset
227 errorCollector.assertEquals("FIRST", c1.getComment());
41218d84842a Update dirstate after commit
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 586
diff changeset
228 errorCollector.assertEquals("SECOND", c2.getComment());
41218d84842a Update dirstate after commit
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 586
diff changeset
229 errorCollector.assertEquals("THIRD", c3.getComment());
559
6ca3d0c5b4bc Commit: tests and fixes for defects discovered
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 539
diff changeset
230 assertHgVerifyOk(repoLoc);
6ca3d0c5b4bc Commit: tests and fixes for defects discovered
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 539
diff changeset
231 }
6ca3d0c5b4bc Commit: tests and fixes for defects discovered
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 539
diff changeset
232
586
73c20c648c1f HgCommitCommand initial support
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 565
diff changeset
233 @Test
73c20c648c1f HgCommitCommand initial support
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 565
diff changeset
234 public void testCommandBasics() throws Exception {
73c20c648c1f HgCommitCommand initial support
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 565
diff changeset
235 File repoLoc = RepoUtils.cloneRepoToTempLocation("log-1", "test-commit-cmd", false);
73c20c648c1f HgCommitCommand initial support
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 565
diff changeset
236 HgRepository hgRepo = new HgLookup().detect(repoLoc);
73c20c648c1f HgCommitCommand initial support
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 565
diff changeset
237 HgDataFile dfB = hgRepo.getFileNode("b");
73c20c648c1f HgCommitCommand initial support
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 565
diff changeset
238 assertTrue("[sanity]", dfB.exists());
73c20c648c1f HgCommitCommand initial support
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 565
diff changeset
239 File fileB = new File(repoLoc, "b");
73c20c648c1f HgCommitCommand initial support
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 565
diff changeset
240 assertTrue("[sanity]", fileB.canRead());
73c20c648c1f HgCommitCommand initial support
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 565
diff changeset
241 RepoUtils.modifyFileAppend(fileB, " 1 \n");
73c20c648c1f HgCommitCommand initial support
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 565
diff changeset
242
73c20c648c1f HgCommitCommand initial support
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 565
diff changeset
243 HgCommitCommand cmd = new HgCommitCommand(hgRepo);
73c20c648c1f HgCommitCommand initial support
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 565
diff changeset
244 assertFalse(cmd.isMergeCommit());
73c20c648c1f HgCommitCommand initial support
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 565
diff changeset
245 Outcome r = cmd.message("FIRST").execute();
588
41218d84842a Update dirstate after commit
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 586
diff changeset
246 errorCollector.assertTrue(r.isOk());
586
73c20c648c1f HgCommitCommand initial support
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 565
diff changeset
247 Nodeid c1 = cmd.getCommittedRevision();
73c20c648c1f HgCommitCommand initial support
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 565
diff changeset
248
588
41218d84842a Update dirstate after commit
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 586
diff changeset
249 // check that modified files are no longer reported as such
586
73c20c648c1f HgCommitCommand initial support
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 565
diff changeset
250 hgRepo = new HgLookup().detect(repoLoc);
73c20c648c1f HgCommitCommand initial support
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 565
diff changeset
251 TestStatus.StatusCollector status = new TestStatus.StatusCollector();
588
41218d84842a Update dirstate after commit
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 586
diff changeset
252 new HgStatusCommand(hgRepo).all().execute(status);
41218d84842a Update dirstate after commit
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 586
diff changeset
253 errorCollector.assertTrue(status.getErrors().isEmpty());
41218d84842a Update dirstate after commit
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 586
diff changeset
254 errorCollector.assertTrue(status.get(Kind.Modified).isEmpty());
41218d84842a Update dirstate after commit
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 586
diff changeset
255 errorCollector.assertEquals(1, status.get(dfB.getPath()).size());
41218d84842a Update dirstate after commit
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 586
diff changeset
256 errorCollector.assertTrue(status.get(dfB.getPath()).contains(Kind.Clean));
586
73c20c648c1f HgCommitCommand initial support
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 565
diff changeset
257
73c20c648c1f HgCommitCommand initial support
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 565
diff changeset
258 HgDataFile dfD = hgRepo.getFileNode("d");
73c20c648c1f HgCommitCommand initial support
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 565
diff changeset
259 assertTrue("[sanity]", dfD.exists());
73c20c648c1f HgCommitCommand initial support
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 565
diff changeset
260 File fileD = new File(repoLoc, "d");
73c20c648c1f HgCommitCommand initial support
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 565
diff changeset
261 assertTrue("[sanity]", fileD.canRead());
73c20c648c1f HgCommitCommand initial support
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 565
diff changeset
262 //
73c20c648c1f HgCommitCommand initial support
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 565
diff changeset
263 RepoUtils.modifyFileAppend(fileD, " 1 \n");
73c20c648c1f HgCommitCommand initial support
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 565
diff changeset
264 cmd = new HgCommitCommand(hgRepo);
73c20c648c1f HgCommitCommand initial support
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 565
diff changeset
265 assertFalse(cmd.isMergeCommit());
73c20c648c1f HgCommitCommand initial support
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 565
diff changeset
266 r = cmd.message("SECOND").execute();
588
41218d84842a Update dirstate after commit
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 586
diff changeset
267 errorCollector.assertTrue(r.isOk());
586
73c20c648c1f HgCommitCommand initial support
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 565
diff changeset
268 Nodeid c2 = cmd.getCommittedRevision();
73c20c648c1f HgCommitCommand initial support
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 565
diff changeset
269 //
73c20c648c1f HgCommitCommand initial support
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 565
diff changeset
270 hgRepo = new HgLookup().detect(repoLoc);
73c20c648c1f HgCommitCommand initial support
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 565
diff changeset
271 int lastRev = hgRepo.getChangelog().getLastRevision();
73c20c648c1f HgCommitCommand initial support
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 565
diff changeset
272 List<HgChangeset> csets = new HgLogCommand(hgRepo).range(lastRev-1, lastRev).execute();
588
41218d84842a Update dirstate after commit
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 586
diff changeset
273 errorCollector.assertEquals(csets.get(0).getNodeid(), c1);
41218d84842a Update dirstate after commit
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 586
diff changeset
274 errorCollector.assertEquals(csets.get(1).getNodeid(), c2);
41218d84842a Update dirstate after commit
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 586
diff changeset
275 errorCollector.assertEquals(csets.get(0).getComment(), "FIRST");
41218d84842a Update dirstate after commit
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 586
diff changeset
276 errorCollector.assertEquals(csets.get(1).getComment(), "SECOND");
586
73c20c648c1f HgCommitCommand initial support
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 565
diff changeset
277 assertHgVerifyOk(repoLoc);
73c20c648c1f HgCommitCommand initial support
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 565
diff changeset
278 }
73c20c648c1f HgCommitCommand initial support
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 565
diff changeset
279
559
6ca3d0c5b4bc Commit: tests and fixes for defects discovered
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 539
diff changeset
280 private void assertHgVerifyOk(File repoLoc) throws InterruptedException, IOException {
6ca3d0c5b4bc Commit: tests and fixes for defects discovered
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 539
diff changeset
281 ExecHelper verifyRun = new ExecHelper(new OutputParser.Stub(), repoLoc);
6ca3d0c5b4bc Commit: tests and fixes for defects discovered
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 539
diff changeset
282 verifyRun.run("hg", "verify");
588
41218d84842a Update dirstate after commit
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 586
diff changeset
283 errorCollector.assertEquals("hg verify", 0, verifyRun.getExitValue());
538
dd4f6311af52 Commit: first working version
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 534
diff changeset
284 }
539
9edfd5a223b8 Commit: handle empty repository case
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 538
diff changeset
285
538
dd4f6311af52 Commit: first working version
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 534
diff changeset
286 public static void main(String[] args) throws Exception {
539
9edfd5a223b8 Commit: handle empty repository case
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 538
diff changeset
287 new TestCommit().testCommitToEmpty();
9edfd5a223b8 Commit: handle empty repository case
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 538
diff changeset
288 if (Boolean.TRUE.booleanValue()) {
9edfd5a223b8 Commit: handle empty repository case
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 538
diff changeset
289 return;
9edfd5a223b8 Commit: handle empty repository case
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 538
diff changeset
290 }
538
dd4f6311af52 Commit: first working version
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 534
diff changeset
291 String input = "abcdefghijklmnopqrstuvwxyz";
dd4f6311af52 Commit: first working version
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 534
diff changeset
292 ByteArraySupplier bas = new ByteArraySupplier(input.getBytes());
dd4f6311af52 Commit: first working version
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 534
diff changeset
293 ByteBuffer bb = ByteBuffer.allocate(7);
dd4f6311af52 Commit: first working version
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 534
diff changeset
294 byte[] result = new byte[26];
dd4f6311af52 Commit: first working version
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 534
diff changeset
295 int rpos = 0;
dd4f6311af52 Commit: first working version
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 534
diff changeset
296 while (bas.read(bb) != -1) {
dd4f6311af52 Commit: first working version
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 534
diff changeset
297 bb.flip();
dd4f6311af52 Commit: first working version
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 534
diff changeset
298 bb.get(result, rpos, bb.limit());
dd4f6311af52 Commit: first working version
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 534
diff changeset
299 rpos += bb.limit();
dd4f6311af52 Commit: first working version
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 534
diff changeset
300 bb.clear();
dd4f6311af52 Commit: first working version
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 534
diff changeset
301 }
dd4f6311af52 Commit: first working version
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 534
diff changeset
302 if (input.length() != rpos) {
dd4f6311af52 Commit: first working version
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 534
diff changeset
303 throw new AssertionError();
dd4f6311af52 Commit: first working version
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 534
diff changeset
304 }
dd4f6311af52 Commit: first working version
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 534
diff changeset
305 String output = new String(result);
dd4f6311af52 Commit: first working version
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 534
diff changeset
306 if (!input.equals(output)) {
dd4f6311af52 Commit: first working version
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 534
diff changeset
307 throw new AssertionError();
dd4f6311af52 Commit: first working version
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 534
diff changeset
308 }
dd4f6311af52 Commit: first working version
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 534
diff changeset
309 System.out.println(output);
dd4f6311af52 Commit: first working version
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 534
diff changeset
310 }
dd4f6311af52 Commit: first working version
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 534
diff changeset
311
dd4f6311af52 Commit: first working version
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 534
diff changeset
312 static class ByteArraySupplier implements CommitFacility.ByteDataSupplier {
dd4f6311af52 Commit: first working version
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 534
diff changeset
313
dd4f6311af52 Commit: first working version
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 534
diff changeset
314 private final byte[] data;
dd4f6311af52 Commit: first working version
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 534
diff changeset
315 private int pos = 0;
dd4f6311af52 Commit: first working version
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 534
diff changeset
316
dd4f6311af52 Commit: first working version
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 534
diff changeset
317 public ByteArraySupplier(byte[] source) {
dd4f6311af52 Commit: first working version
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 534
diff changeset
318 data = source;
dd4f6311af52 Commit: first working version
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 534
diff changeset
319 }
dd4f6311af52 Commit: first working version
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 534
diff changeset
320
dd4f6311af52 Commit: first working version
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 534
diff changeset
321 public int read(ByteBuffer buf) {
dd4f6311af52 Commit: first working version
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 534
diff changeset
322 if (pos >= data.length) {
dd4f6311af52 Commit: first working version
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 534
diff changeset
323 return -1;
dd4f6311af52 Commit: first working version
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 534
diff changeset
324 }
dd4f6311af52 Commit: first working version
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 534
diff changeset
325 int count = Math.min(buf.remaining(), data.length - pos);
dd4f6311af52 Commit: first working version
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 534
diff changeset
326 buf.put(data, pos, count);
dd4f6311af52 Commit: first working version
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 534
diff changeset
327 pos += count;
dd4f6311af52 Commit: first working version
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 534
diff changeset
328 return count;
dd4f6311af52 Commit: first working version
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents: 534
diff changeset
329 }
534
243202f1bda5 Commit: refactor revision creation code from clone command to work separately, fit into existing library structure
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents:
diff changeset
330 }
243202f1bda5 Commit: refactor revision creation code from clone command to work separately, fit into existing library structure
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents:
diff changeset
331 }