changeset 436:a85e08df0259

Specify default branch name in RepositoryState
author Dmitry Neverov <dmitry.neverov@jetbrains.com>
date Thu, 17 May 2012 16:36:41 +0400
parents 4b6cca841ea5
children 585a23bc9400
files mercurial-server/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/MercurialVcsSupport.java
diffstat 1 files changed, 5 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial-server/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/MercurialVcsSupport.java	Thu May 17 16:16:22 2012 +0400
+++ b/mercurial-server/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/MercurialVcsSupport.java	Thu May 17 16:36:41 2012 +0400
@@ -452,14 +452,14 @@
 
   @NotNull
   public RepositoryState getCurrentState(@NotNull VcsRoot root) throws VcsException {
-    return RepositoryStateFactory.createRepositoryState(getBranchesRevisions(root));
+    HgVcsRoot hgRoot = myHgVcsRootFactory.createHgRoot(root);
+    return RepositoryStateFactory.createRepositoryState(getBranchesRevisions(hgRoot), hgRoot.getBranchName());
   }
 
   @NotNull
-  private Map<String, String> getBranchesRevisions(@NotNull VcsRoot root) throws VcsException {
-    HgVcsRoot hgRoot = myHgVcsRootFactory.createHgRoot(root);
-    syncRepository(hgRoot);
-    HgRepo repo = createRepo(hgRoot);
+  private Map<String, String> getBranchesRevisions(@NotNull HgVcsRoot root) throws VcsException {
+    syncRepository(root);
+    HgRepo repo = createRepo(root);
     Map<String, String> result = new HashMap<String, String>();
     for (Map.Entry<String, ChangeSet> entry : repo.branches().call().entrySet()) {
       result.put(entry.getKey(), entry.getValue().getId());