Mercurial > hg > mercurial
changeset 249:d0314e530208
Create settings only once
| author | Dmitry Neverov <dmitry.neverov@jetbrains.com> |
|---|---|
| date | Tue, 19 Apr 2011 18:52:31 +0400 |
| parents | 8ffe311f9b8e |
| children | 0c89a207f0a7 |
| files | mercurial-server/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/MercurialVcsSupport.java |
| diffstat | 1 files changed, 2 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial-server/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/MercurialVcsSupport.java Tue Apr 19 16:53:29 2011 +0400 +++ b/mercurial-server/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/MercurialVcsSupport.java Tue Apr 19 18:52:31 2011 +0400 @@ -482,12 +482,11 @@ //we get all branches while clone, if vcs roots are related it is doesn't matter in which one search for branch point Settings settings = createSettings(fromRoot); syncRepository(settings); - String branchPoint = getBranchPoint(fromRoot, fromRootRevision, toRootRevision); + String branchPoint = getBranchPoint(settings, fromRootRevision, toRootRevision); return ((CollectChangesByCheckoutRules) getCollectChangesPolicy()).collectChanges(toRoot, branchPoint, toRootRevision, checkoutRules); } - private String getBranchPoint(@NotNull VcsRoot root, String branchOneRev, String branchTwoRev) throws VcsException { - Settings settings = createSettings(root); + private String getBranchPoint(@NotNull Settings settings, String branchOneRev, String branchTwoRev) throws VcsException { File workingDir = getWorkingDir(settings); LogCommand lc = new LogCommand(settings, workingDir); lc.setFromRevId(new ChangeSetRevision(branchOneRev).getId());