changeset 925:160ec318eac7

Merge branch Hajipur-9.0.x
author Dmitry Neverov <dmitry.neverov@jetbrains.com>
date Wed, 11 Feb 2015 14:20:06 +0100
parents ecb5340d71b9 (diff) ef9d14cbca44 (current diff)
children 9291f2627c2a
files
diffstat 16 files changed, 29 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial-common/src/python/load-commands-command.py	Wed Feb 11 14:18:51 2015 +0100
+++ b/mercurial-common/src/python/load-commands-command.py	Wed Feb 11 14:20:06 2015 +0100
@@ -36,7 +36,7 @@
       if len(line) <= 0:
         continue
 
-      file_commands.append(str(line))
+      file_commands.append(line.encode("utf-8"))
   return file_commands
 
 
--- a/mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/MercurialVcsSupportTest.java	Wed Feb 11 14:18:51 2015 +0100
+++ b/mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/MercurialVcsSupportTest.java	Wed Feb 11 14:20:06 2015 +0100
@@ -184,6 +184,22 @@
     checkPatchResult(output.toByteArray());
   }
 
+  public void test_build_incremental_patch_file_non_ascii_does_not_fail() throws IOException, VcsException {
+    final String path = Util.getHgPath();
+    final VersionCommand versionCommand = new VersionCommand(new TestCommandSettingsFactory().create(), path, new File(".."));
+    final HgVersion version = versionCommand.call();
+
+    if (!version.isEqualsOrGreaterThan(new HgVersion(2,7,0))) {
+      return;
+    }
+
+    setName("patch-non-ascii");
+    VcsRootImpl vcsRoot = createVcsRoot(new File("mercurial-tests/testData/repo-non-ascii").getAbsolutePath());
+
+    buildPatch(myVcs, vcsRoot, null, "0:7bd814e7540e", new CheckoutRules(""));
+    buildPatch(myVcs, vcsRoot, "0:7bd814e7540e", "1:03c93a16132d", new CheckoutRules(""));
+  }
+
   public void test_get_content() throws IOException, VcsException {
     VcsRootImpl vcsRoot = createVcsRoot(simpleRepo());
 
Binary file mercurial-tests/testData/repo-non-ascii/hg/00changelog.i has changed
Binary file mercurial-tests/testData/repo-non-ascii/hg/dirstate has changed
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mercurial-tests/testData/repo-non-ascii/hg/last-message.txt	Wed Feb 11 14:20:06 2015 +0100
@@ -0,0 +1,2 @@
+hohoho
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mercurial-tests/testData/repo-non-ascii/hg/requires	Wed Feb 11 14:20:06 2015 +0100
@@ -0,0 +1,4 @@
+dotencode
+fncache
+revlogv1
+store
Binary file mercurial-tests/testData/repo-non-ascii/hg/store/00changelog.i has changed
Binary file mercurial-tests/testData/repo-non-ascii/hg/store/00manifest.i has changed
Binary file mercurial-tests/testData/repo-non-ascii/hg/store/data/~ea~f0~f3~f2~ee.txt.i has changed
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mercurial-tests/testData/repo-non-ascii/hg/store/fncache	Wed Feb 11 14:20:06 2015 +0100
@@ -0,0 +1,1 @@
+data/круто.txt.i
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mercurial-tests/testData/repo-non-ascii/hg/store/phaseroots	Wed Feb 11 14:20:06 2015 +0100
@@ -0,0 +1,1 @@
+1 7bd814e7540eb9ed74deae5a029392615cf7cdcb
Binary file mercurial-tests/testData/repo-non-ascii/hg/store/undo has changed
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mercurial-tests/testData/repo-non-ascii/hg/store/undo.phaseroots	Wed Feb 11 14:20:06 2015 +0100
@@ -0,0 +1,1 @@
+1 7bd814e7540eb9ed74deae5a029392615cf7cdcb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mercurial-tests/testData/repo-non-ascii/hg/undo.branch	Wed Feb 11 14:20:06 2015 +0100
@@ -0,0 +1,1 @@
+default
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mercurial-tests/testData/repo-non-ascii/hg/undo.desc	Wed Feb 11 14:20:06 2015 +0100
@@ -0,0 +1,2 @@
+1
+commit
Binary file mercurial-tests/testData/repo-non-ascii/hg/undo.dirstate has changed