Mercurial > hg > mercurial

changeset 794:7a8caf98dc6e Gaya-8.1.x

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Explain that a manual recovery is required.
author Dmitry Neverov <dmitry.neverov@gmail.com>
date Mon, 19 May 2014 19:06:19 +0200
parents 0a1ac46bfa8c
children 8f7862c1846e
files mercurial-server/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/MercurialVcsSupport.java
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial-server/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/MercurialVcsSupport.java	Mon May 19 17:14:38 2014 +0200
+++ b/mercurial-server/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/MercurialVcsSupport.java	Mon May 19 19:06:19 2014 +0200
@@ -507,14 +507,14 @@
         return syncRepositoryOnce(root, cmd, workingDir);
       } catch (UnrelatedRepositoryException e) {
         if (customWorkingDir)
-          throw e;
+          throw new VcsException(e.getMessage() + ". VCS root uses a custom clone dir, manual recovery is required.", e);
         Loggers.VCS.warn("Repository at " + workingDir.getAbsolutePath() + " is unrelated to " + root.getRepository() +
                 ". Clone it again, attempts left " + attemptsLeft);
         myMirrorManager.forgetDir(workingDir);
         lastError = e;
       } catch (AbandonedTransactionFound e) {
         if (customWorkingDir)
-          throw e;
+          throw new VcsException(e.getMessage() + ". VCS root uses a custom clone dir, manual recovery is required.", e);
         Loggers.VCS.warn("Abandoned transaction found in repository " + root.getRepository() + " at "
                 + workingDir.getAbsolutePath() + ". Clone it again, attempts left " + attemptsLeft);
         myMirrorManager.forgetDir(workingDir);