changeset 876:b2816067699a

Report lock acquisition progress
author Dmitry Neverov <dmitry.neverov@jetbrains.com>
date Wed, 01 Oct 2014 22:03:19 +0200
parents b06ea5c379cc
children 45311425ee3c
files mercurial-server/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/MercurialVcsSupport.java
diffstat 1 files changed, 9 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial-server/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/MercurialVcsSupport.java	Wed Oct 01 14:21:31 2014 +0200
+++ b/mercurial-server/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/MercurialVcsSupport.java	Wed Oct 01 22:03:19 2014 +0200
@@ -584,7 +584,7 @@
 
 
   private <T> T syncRepositoryOnce(@NotNull HgVcsRoot root, @NotNull SyncSettings<T> settings, @NotNull File workingDir) throws VcsException {
-    lockWorkDir(workingDir);
+    lockWorkDir(workingDir, settings.getProgressConsumer());
     HgRepo repo = createRepo(root);
     try {
       if (!repo.isValidRepository())
@@ -673,7 +673,15 @@
   }
 
   private void lockWorkDir(@NotNull File workDir) {
+    lockWorkDir(workDir, null);
+  }
+
+  private void lockWorkDir(@NotNull File workDir, @Nullable ProgressParser.ProgressConsumer progressConsumer) {
+    if (progressConsumer != null)
+      progressConsumer.consume(-1f, "Acquire repository lock");
     myMirrorManager.lockDir(workDir);
+    if (progressConsumer != null)
+      progressConsumer.consume(-1f, "Repository lock acquired");
   }
 
   private void unlockWorkDir(@NotNull File workDir) {