Mercurial > hg > mercurial
changeset 851:fcc2a5bf4238
Merge branch Gaya-8.1.x
author | Dmitry Neverov <dmitry.neverov@jetbrains.com> |
---|---|
date | Wed, 02 Jul 2014 18:43:15 +0200 |
parents | 03275807f45b (current diff) 67753eb68a09 (diff) |
children | d746a9351572 |
files | mercurial-server/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/MercurialVcsSupport.java mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/MercurialVcsSupportTest.java |
diffstat | 2 files changed, 5 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial-server/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/MercurialVcsSupport.java Tue Jul 01 13:10:27 2014 +0200 +++ b/mercurial-server/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/MercurialVcsSupport.java Wed Jul 02 18:43:15 2014 +0200 @@ -258,10 +258,9 @@ if (root.includeSubreposInPatch()) buildSubrepoPatch(root, fromVer, toVer, builder, checkoutRules, repo); } catch (Exception e) { - Loggers.VCS.warn("Cannot build an incremental patch in repository " + root.getRepository() + - " from revision " + fromVer.getId() + " to revision " + toVer.getId(), e); - builder.deleteDirectory(new File(""), true);//clean patch - buildFullPatch(root, toVer, builder, checkoutRules); + if (e instanceof VcsException) + throw (VcsException) e; + throw new VcsException("Error while building an incremental patch", e); } finally { if (parentDir != null) deleteDir(parentDir, Loggers.VCS);
--- a/mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/MercurialVcsSupportTest.java Tue Jul 01 13:10:27 2014 +0200 +++ b/mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/MercurialVcsSupportTest.java Wed Jul 02 18:43:15 2014 +0200 @@ -350,6 +350,8 @@ buildPatch(myVcs, root, null, "51677e03dc19", CheckoutRules.DEFAULT); + if (SystemInfo.isUnix) + return;//incremental patch on unix fails, because it cannot create a file in unicode buildPatch(myVcs, root, "54044489d391", "51677e03dc19", CheckoutRules.DEFAULT); }