Mercurial > hg > mercurial
changeset 226:2b2dab847ac8
Rename private methods
author | Dmitry Neverov <dmitry.neverov@jetbrains.com> |
---|---|
date | Wed, 06 Apr 2011 11:47:30 +0400 |
parents | 1ef1baff91af |
children | 061486453bd9 9e60b6d1e5fd |
files | mercurial-server/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/MercurialVcsSupport.java |
diffstat | 1 files changed, 9 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial-server/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/MercurialVcsSupport.java Wed Apr 06 11:46:39 2011 +0400 +++ b/mercurial-server/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/MercurialVcsSupport.java Wed Apr 06 11:47:30 2011 +0400 @@ -141,7 +141,7 @@ @NotNull public byte[] getContent(@NotNull final String filePath, @NotNull final VcsRoot vcsRoot, @NotNull final String version) throws VcsException { ChangeSet cset = new ChangeSet(version); - syncClonedRepository(vcsRoot, cset); + syncRepository(vcsRoot, cset); Settings settings = createSettings(vcsRoot); File workingDir = getWorkingDir(settings); CatCommand cc = new CatCommand(settings, workingDir); @@ -199,7 +199,7 @@ @NotNull public String getCurrentVersion(@NotNull final VcsRoot root) throws VcsException { // we will return full version of the most recent change as current version - syncClonedRepository(root); + syncRepository(root); Settings settings = createSettings(root); File workingDir = getWorkingDir(settings); BranchesCommand branches = new BranchesCommand(settings, workingDir); @@ -387,7 +387,7 @@ /** * clone the repo if it doesn't exist, pull the repo if it doesn't contain specified changeSet */ - private void syncClonedRepository(final VcsRoot root, final ChangeSet cset) throws VcsException { + private void syncRepository(final VcsRoot root, final ChangeSet cset) throws VcsException { Settings settings = createSettings(root); File workingDir = getWorkingDir(settings); lockWorkDir(workingDir); @@ -408,7 +408,7 @@ } // updates current working copy of repository by pulling changes from the repository specified in VCS root - private void syncClonedRepository(final VcsRoot root) throws VcsException { + private void syncRepository(final VcsRoot root) throws VcsException { Settings settings = createSettings(root); File workingDir = getWorkingDir(settings); lockWorkDir(workingDir); @@ -461,7 +461,7 @@ @NotNull public Map<String, String> getBranchesRevisions(@NotNull VcsRoot root) throws VcsException { - syncClonedRepository(root); + syncRepository(root); Settings settings = createSettings(root); File workingDir = getWorkingDir(settings); BranchesCommand branches = new BranchesCommand(settings, workingDir); @@ -483,7 +483,7 @@ @NotNull VcsRoot toRoot, @Nullable String toRootRevision, @NotNull CheckoutRules checkoutRules) throws VcsException { //we get all branches while clone, if vcs roots are related it is doesn't matter in which one search for branch point - syncClonedRepository(fromRoot); + syncRepository(fromRoot); String branchPoint = getBranchPoint(fromRoot, fromRootRevision, toRootRevision); return ((CollectChangesByCheckoutRules) getCollectChangesPolicy()).collectChanges(toRoot, branchPoint, toRootRevision, checkoutRules); } @@ -508,7 +508,7 @@ public CollectChangesPolicy getCollectChangesPolicy() { return new CollectChangesByCheckoutRules() { public List<ModificationData> collectChanges(@NotNull VcsRoot root, @NotNull String fromVersion, @Nullable String currentVersion, @NotNull CheckoutRules checkoutRules) throws VcsException { - syncClonedRepository(root); + syncRepository(root); // first obtain changes between specified versions List<ModificationData> result = new ArrayList<ModificationData>(); @@ -572,7 +572,7 @@ @NotNull final String toVersion, @NotNull final PatchBuilder builder, @NotNull final CheckoutRules checkoutRules) throws IOException, VcsException { - syncClonedRepository(root); + syncRepository(root); Settings settings = createSettings(root); if (fromVersion == null) { buildFullPatch(settings, new ChangeSet(toVersion), builder, checkoutRules); @@ -638,7 +638,7 @@ } public String label(@NotNull String label, @NotNull String version, @NotNull VcsRoot root, @NotNull CheckoutRules checkoutRules) throws VcsException { - syncClonedRepository(root); + syncRepository(root); Settings settings = createSettings(root); File workingDir = getWorkingDir(settings);