Mercurial > hg > mercurial
diff mercurial-server/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/MercurialCollectChangesPolicy.java @ 696:a07f685ce394
Get rid of depricated getCurrentVersion() method
| author | Dmitry Neverov <dmitry.neverov@jetbrains.com> |
|---|---|
| date | Fri, 27 Dec 2013 19:10:48 +0100 |
| parents | d4ef6a366768 |
| children | d1469a7cc038 |
line wrap: on
line diff
--- a/mercurial-server/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/MercurialCollectChangesPolicy.java Thu Dec 19 19:27:07 2013 +0100 +++ b/mercurial-server/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/MercurialCollectChangesPolicy.java Fri Dec 27 19:10:48 2013 +0100 @@ -103,7 +103,11 @@ @NotNull CheckoutRules checkoutRules) throws VcsException { HgVcsRoot hgRoot = myHgVcsRootFactory.createHgRoot(toRoot); myVcs.syncRepository(hgRoot); - String toRevision = toRootRevision != null ? toRootRevision : myVcs.getCurrentVersion(toRoot); + String toRevision = toRootRevision; + if (toRevision == null) { + RepositoryStateData state = myVcs.getCollectChangesPolicy().getCurrentState(toRoot); + toRevision = state.getBranchRevisions().get(state.getDefaultBranchName()); + } String mergeBase = getMergeBase(hgRoot, fromRootRevision, toRevision); if (mergeBase == null) return Collections.emptyList();