Mercurial > hg > mercurial

changeset 411:490024d8e5fd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Test patch from newer revision to earlier
author Dmitry Neverov <dmitry.neverov@jetbrains.com>
date Tue, 20 Mar 2012 18:25:43 +0400
parents 4fcc61e5d8ea
children 5d4351306d57
files mercurial-server/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/MercurialVcsSupport.java mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/MercurialVcsSupportTest.java mercurial-tests/testData/patch5/after/dir1/file1.txt mercurial-tests/testData/patch5/after/dir1/file3.txt mercurial-tests/testData/patch5/after/dir1/subdir/file2.txt mercurial-tests/testData/patch5/before/dir with space/file with space.txt mercurial-tests/testData/patch5/before/dir1/file1.txt mercurial-tests/testData/patch5/before/dir1/file3.txt mercurial-tests/testData/patch5/before/dir1/subdir/file2.txt
diffstat 9 files changed, 24 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial-server/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/MercurialVcsSupport.java	Mon Mar 05 13:24:20 2012 +0400
+++ b/mercurial-server/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/MercurialVcsSupport.java	Tue Mar 20 18:25:43 2012 +0400
@@ -768,4 +768,12 @@
       return "default";
     }
   }
+
+  @NotNull
+  @Override
+  public Set<String> getSignificantVcsProperties(@NotNull VcsRoot root) {
+    Set<String> properties = new HashSet<String>(root.getProperties().keySet());
+    properties.remove(Constants.BRANCH_NAME_PROP);
+    return properties;
+  }
 }
--- a/mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/MercurialVcsSupportTest.java	Mon Mar 05 13:24:20 2012 +0400
+++ b/mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/MercurialVcsSupportTest.java	Tue Mar 20 18:25:43 2012 +0400
@@ -391,6 +391,13 @@
     assertTrue(new File(cloneDir, new File(vcsRoot.getProperty(Constants.REPOSITORY_PROP)).getName()).isDirectory());
   }
 
+  public void build_patch_from_newer_revision_to_earlier() throws Exception {
+    setName("patch5");
+    VcsRootImpl vcsRoot = createVcsRoot(simpleRepo());
+    ByteArrayOutputStream output = buildPatch(vcsRoot, "6:b9deb9a1c6f4", "3:9522278aa38d", CheckoutRules.DEFAULT);
+    checkPatchResult(output.toByteArray());
+  }
+
   private String mergeCommittsRepo() {
     return new File("mercurial-tests/testData/rep2").getAbsolutePath();
   }
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mercurial-tests/testData/patch5/after/dir1/file1.txt	Tue Mar 20 18:25:43 2012 +0400
@@ -0,0 +1,1 @@
+aaa
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mercurial-tests/testData/patch5/after/dir1/file3.txt	Tue Mar 20 18:25:43 2012 +0400
@@ -0,0 +1,1 @@
+ccc
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mercurial-tests/testData/patch5/after/dir1/subdir/file2.txt	Tue Mar 20 18:25:43 2012 +0400
@@ -0,0 +1,1 @@
+bbb
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mercurial-tests/testData/patch5/before/dir with space/file with space.txt	Tue Mar 20 18:25:43 2012 +0400
@@ -0,0 +1,1 @@
+some text
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mercurial-tests/testData/patch5/before/dir1/file1.txt	Tue Mar 20 18:25:43 2012 +0400
@@ -0,0 +1,1 @@
+aaa
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mercurial-tests/testData/patch5/before/dir1/file3.txt	Tue Mar 20 18:25:43 2012 +0400
@@ -0,0 +1,2 @@
+ccc
+ddd
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mercurial-tests/testData/patch5/before/dir1/subdir/file2.txt	Tue Mar 20 18:25:43 2012 +0400
@@ -0,0 +1,2 @@
+modified
+bbb
\ No newline at end of file