Mercurial > hg4j

comparison test/org/tmatesoft/hg/test/TestCommit.java @ 621:99ad1e3a4e4d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
RevlogStream: be aware of existence (not HgDataFile), facilitate use of an added HgDataFile over a commit; Rollback: be more sensitive about file changes (file size is not enough: write/rollback leaves it intact); tests
author Artem Tikhomirov <tikhomirov.artem@gmail.com>
date Sat, 18 May 2013 22:23:57 +0200
parents 7c0d2ce340b8
children fedc54356091
comparison
equal deleted inserted replaced
620:272ecffccc8a 621:99ad1e3a4e4d
35 import org.tmatesoft.hg.core.Nodeid; 35 import org.tmatesoft.hg.core.Nodeid;
36 import org.tmatesoft.hg.core.SessionContext; 36 import org.tmatesoft.hg.core.SessionContext;
37 import org.tmatesoft.hg.internal.ByteArrayChannel; 37 import org.tmatesoft.hg.internal.ByteArrayChannel;
38 import org.tmatesoft.hg.internal.COWTransaction; 38 import org.tmatesoft.hg.internal.COWTransaction;
39 import org.tmatesoft.hg.internal.CommitFacility; 39 import org.tmatesoft.hg.internal.CommitFacility;
40 import org.tmatesoft.hg.internal.DirstateReader;
40 import org.tmatesoft.hg.internal.DataSerializer.ByteArrayDataSource; 41 import org.tmatesoft.hg.internal.DataSerializer.ByteArrayDataSource;
41 import org.tmatesoft.hg.internal.FileContentSupplier; 42 import org.tmatesoft.hg.internal.FileContentSupplier;
42 import org.tmatesoft.hg.internal.Internals; 43 import org.tmatesoft.hg.internal.Internals;
43 import org.tmatesoft.hg.internal.Transaction; 44 import org.tmatesoft.hg.internal.Transaction;
44 import org.tmatesoft.hg.repo.HgDataFile; 45 import org.tmatesoft.hg.repo.HgDataFile;
136 File fileD = new File(repoLoc, "d"); 137 File fileD = new File(repoLoc, "d");
137 assertTrue("[sanity]", fileD.canRead()); 138 assertTrue("[sanity]", fileD.canRead());
138 final int parentCsetRevIndex = hgRepo.getChangelog().getLastRevision(); 139 final int parentCsetRevIndex = hgRepo.getChangelog().getLastRevision();
139 HgChangeset parentCset = new HgLogCommand(hgRepo).range(parentCsetRevIndex, parentCsetRevIndex).execute().get(0); 140 HgChangeset parentCset = new HgLogCommand(hgRepo).range(parentCsetRevIndex, parentCsetRevIndex).execute().get(0);
140 assertEquals("[sanity]", DEFAULT_BRANCH_NAME, parentCset.getBranch()); 141 assertEquals("[sanity]", DEFAULT_BRANCH_NAME, parentCset.getBranch());
142 assertEquals("[sanity]", DEFAULT_BRANCH_NAME, hgRepo.getWorkingCopyBranchName());
141 // 143 //
142 RepoUtils.modifyFileAppend(fileD, "A CHANGE\n"); 144 RepoUtils.modifyFileAppend(fileD, "A CHANGE\n");
143 CommitFacility cf = new CommitFacility(Internals.getInstance(hgRepo), parentCsetRevIndex); 145 CommitFacility cf = new CommitFacility(Internals.getInstance(hgRepo), parentCsetRevIndex);
144 FileContentSupplier contentProvider = new FileContentSupplier(hgRepo, fileD); 146 FileContentSupplier contentProvider = new FileContentSupplier(hgRepo, fileD);
145 cf.add(dfD, contentProvider); 147 cf.add(dfD, contentProvider);
152 assertEquals(1, commits.size()); 154 assertEquals(1, commits.size());
153 HgChangeset c1 = commits.get(0); 155 HgChangeset c1 = commits.get(0);
154 errorCollector.assertEquals(c1.getNodeid(), commitRev1); 156 errorCollector.assertEquals(c1.getNodeid(), commitRev1);
155 errorCollector.assertEquals("branch1", c1.getBranch()); 157 errorCollector.assertEquals("branch1", c1.getBranch());
156 errorCollector.assertEquals("FIRST", c1.getComment()); 158 errorCollector.assertEquals("FIRST", c1.getComment());
159 //
160 // check if cached value in hgRepo got updated
161 errorCollector.assertEquals("branch1", hgRepo.getWorkingCopyBranchName());
157 // 162 //
158 assertHgVerifyOk(repoLoc); 163 assertHgVerifyOk(repoLoc);
159 } 164 }
160 165
161 /** 166 /**
341 errorCollector.assertFalse(hgRepo.getBranches().getBranch(branch) == null); 346 errorCollector.assertFalse(hgRepo.getBranches().getBranch(branch) == null);
342 errorCollector.assertTrue(hgRepo.getTags().tagged(tag).contains(commit)); 347 errorCollector.assertTrue(hgRepo.getTags().tagged(tag).contains(commit));
343 errorCollector.assertTrue(hgRepo.getTags().tags(commit).contains(tag)); 348 errorCollector.assertTrue(hgRepo.getTags().tags(commit).contains(tag));
344 } 349 }
345 350
351 @Test
352 public void testAddedFilesGetStream() throws Exception {
353 File repoLoc = RepoUtils.cloneRepoToTempLocation("log-1", "test-commit-addfile-stream", false);
354 final File newFile = new File(repoLoc, "xx");
355 final byte[] newFileContent = "xyz".getBytes();
356 RepoUtils.createFile(newFile, newFileContent);
357 HgRepository hgRepo = new HgLookup().detect(repoLoc);
358 new HgAddRemoveCommand(hgRepo).add(Path.create("xx")).execute();
359 // save the reference to HgDataFile without valid RevlogStream (entry in the dirstate
360 // doesn't make it valid)
361 final HgDataFile newFileNode = hgRepo.getFileNode("xx");
362 assertFalse(newFileNode.exists());
363 HgCommitCommand cmd = new HgCommitCommand(hgRepo).message("FIRST");
364 Outcome r = cmd.execute();
365 errorCollector.assertTrue(r.isOk());
366 TestStatus.StatusCollector status = new TestStatus.StatusCollector();
367 new HgStatusCommand(hgRepo).all().execute(status);
368 errorCollector.assertTrue(status.getErrors().isEmpty());
369 errorCollector.assertTrue(status.get(Kind.Added).isEmpty());
370 errorCollector.assertTrue(status.get(newFileNode.getPath()).contains(Kind.Clean));
371 //
372 errorCollector.assertTrue(newFileNode.exists());
373 final ByteArrayChannel read1 = new ByteArrayChannel();
374 newFileNode.content(0, read1);
375 errorCollector.assertEquals("Read from existing HgDataFile instance", newFileContent, read1.toArray());
376 final ByteArrayChannel read2 = new ByteArrayChannel();
377 hgRepo.getFileNode(newFileNode.getPath()).content(0, read2);
378 errorCollector.assertEquals("Read from fresh HgDataFile instance", newFileContent, read2.toArray());
379 }
380
381 @Test
382 public void testRollback() throws Exception {
383 File repoLoc = RepoUtils.cloneRepoToTempLocation("log-1", "test-commit-rollback", false);
384 final Path newFilePath = Path.create("xx");
385 final File newFile = new File(repoLoc, newFilePath.toString());
386 RepoUtils.createFile(newFile, "xyz");
387 HgRepository hgRepo = new HgLookup().detect(repoLoc);
388 HgDataFile dfB = hgRepo.getFileNode("b");
389 HgDataFile dfD = hgRepo.getFileNode("d");
390 assertTrue("[sanity]", dfB.exists());
391 assertTrue("[sanity]", dfD.exists());
392 final File modifiedFile = new File(repoLoc, "b");
393 RepoUtils.modifyFileAppend(modifiedFile, " 1 \n");
394 //
395 new HgAddRemoveCommand(hgRepo).add(newFilePath).remove(dfD.getPath()).execute();
396 //
397 TestStatus.StatusCollector status = new TestStatus.StatusCollector();
398 new HgStatusCommand(hgRepo).all().execute(status);
399 assertTrue(status.getErrors().isEmpty());
400 assertTrue(status.get(Kind.Added).contains(newFilePath));
401 assertTrue(status.get(Kind.Modified).contains(dfB.getPath()));
402 assertTrue(status.get(Kind.Removed).contains(dfD.getPath()));
403 assertEquals(DEFAULT_BRANCH_NAME, hgRepo.getWorkingCopyBranchName());
404 //
405 final int lastClogRevision = hgRepo.getChangelog().getLastRevision();
406 final int lastManifestRev = hgRepo.getManifest().getLastRevision();
407 CommitFacility cf = new CommitFacility(Internals.getInstance(hgRepo), lastClogRevision);
408 cf.add(hgRepo.getFileNode("xx"), new FileContentSupplier(hgRepo, newFile));
409 cf.add(dfB, new FileContentSupplier(hgRepo, modifiedFile));
410 cf.forget(dfD);
411 cf.branch("another-branch");
412 Transaction tr = newTransaction(hgRepo);
413 Nodeid commitRev = cf.commit("Commit to fail", tr);
414 // with 1 second timestamp granularity, HgChangelog doesn't
415 // recognize the fact the underlying file got changed twice within
416 // a second, doesn't discard new revision obtained via revisionAdded,
417 // and eventually fails trying to read more revisions than there're in the file
418 Thread.sleep(1000); // FIXME this is a hack to make test pass
419 tr.rollback();
420 //
421 errorCollector.assertEquals(lastClogRevision, hgRepo.getChangelog().getLastRevision());
422 errorCollector.assertEquals(lastManifestRev, hgRepo.getManifest().getLastRevision());
423 errorCollector.assertEquals(DEFAULT_BRANCH_NAME, DirstateReader.readBranch(Internals.getInstance(hgRepo)));
424 errorCollector.assertFalse(hgRepo.getChangelog().isKnown(commitRev));
425 errorCollector.assertFalse(hgRepo.getFileNode("xx").exists());
426 // check dirstate
427 status = new TestStatus.StatusCollector();
428 new HgStatusCommand(hgRepo).all().execute(status);
429 errorCollector.assertTrue(status.getErrors().isEmpty());
430 errorCollector.assertTrue(status.get(Kind.Added).contains(newFilePath));
431 errorCollector.assertTrue(status.get(Kind.Modified).contains(dfB.getPath()));
432 errorCollector.assertTrue(status.get(Kind.Removed).contains(dfD.getPath()));
433
434 assertHgVerifyOk(repoLoc);
435 }
436
346 private void assertHgVerifyOk(File repoLoc) throws InterruptedException, IOException { 437 private void assertHgVerifyOk(File repoLoc) throws InterruptedException, IOException {
347 ExecHelper verifyRun = new ExecHelper(new OutputParser.Stub(), repoLoc); 438 ExecHelper verifyRun = new ExecHelper(new OutputParser.Stub(), repoLoc);
348 verifyRun.run("hg", "verify"); 439 verifyRun.run("hg", "verify");
349 errorCollector.assertEquals("hg verify", 0, verifyRun.getExitValue()); 440 errorCollector.assertEquals("hg verify", 0, verifyRun.getExitValue());
350 } 441 }