# HG changeset patch # User Dmitry Neverov # Date 1412193799 -7200 # Node ID b2816067699a73d36d15eaf9cae362c9710bd226 # Parent b06ea5c379cc6ba9ba733ec81f3e2f93aff24e77 Report lock acquisition progress diff -r b06ea5c379cc -r b2816067699a mercurial-server/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/MercurialVcsSupport.java --- 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 syncRepositoryOnce(@NotNull HgVcsRoot root, @NotNull SyncSettings 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) {