diff options
36 files changed, 58 insertions, 59 deletions
diff --git a/org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/TestRepository.java b/org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/TestRepository.java index 1eccf133f8..af3e9c1605 100644 --- a/org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/TestRepository.java +++ b/org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/TestRepository.java @@ -310,7 +310,7 @@ public class TestRepository { throws IOException { RefUpdate updateRef; updateRef = repository.updateRef(newRefName); - Ref startRef = repository.getRef(refName); + Ref startRef = repository.findRef(refName); ObjectId startAt = repository.resolve(refName); String startBranch; if (startRef != null) @@ -462,7 +462,7 @@ public class TestRepository { if (dc == null) return true; - Ref ref = repository.getRef(Constants.HEAD); + Ref ref = repository.exactRef(Constants.HEAD); try (RevWalk rw = new RevWalk(repository)) { RevCommit c = rw.parseCommit(ref.getObjectId()); diff --git a/org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/op/RebaseOperationTest.java b/org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/op/RebaseOperationTest.java index 478a76107a..830a09adf2 100644 --- a/org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/op/RebaseOperationTest.java +++ b/org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/op/RebaseOperationTest.java @@ -82,9 +82,8 @@ public class RebaseOperationTest extends GitTestCase { assertEquals(first, topicCommit.getParent(0)); // rebase topic onto master - RebaseOperation op = new RebaseOperation( - testRepository.getRepository(), testRepository.getRepository() - .getRef(MASTER)); + RebaseOperation op = new RebaseOperation(testRepository.getRepository(), + testRepository.getRepository().exactRef(MASTER)); op.execute(null); RebaseResult res = op.getResult(); @@ -127,9 +126,8 @@ public class RebaseOperationTest extends GitTestCase { assertEquals(first, topicCommit.getParent(0)); // rebase topic onto master - RebaseOperation op = new RebaseOperation( - testRepository.getRepository(), testRepository.getRepository() - .getRef(MASTER)); + RebaseOperation op = new RebaseOperation(testRepository.getRepository(), + testRepository.getRepository().exactRef(MASTER)); op.execute(null); RebaseResult res = op.getResult(); @@ -172,9 +170,8 @@ public class RebaseOperationTest extends GitTestCase { assertEquals(first, topicCommit.getParent(0)); // rebase topic onto master - RebaseOperation op = new RebaseOperation( - testRepository.getRepository(), testRepository.getRepository() - .getRef(MASTER)); + RebaseOperation op = new RebaseOperation(testRepository.getRepository(), + testRepository.getRepository().exactRef(MASTER)); op.execute(null); RebaseResult res = op.getResult(); @@ -220,8 +217,8 @@ public class RebaseOperationTest extends GitTestCase { assertEquals(first, topicCommit.getParent(0)); // rebase topic onto master - RebaseOperation op = new RebaseOperation(repository, repository - .getRef(MASTER)); + RebaseOperation op = new RebaseOperation(repository, + repository.exactRef(MASTER)); op.execute(null); RebaseResult res = op.getResult(); @@ -230,7 +227,7 @@ public class RebaseOperationTest extends GitTestCase { try { // let's try to start again, we should get a wrapped // WrongRepositoryStateException - op = new RebaseOperation(repository, repository.getRef(MASTER)); + op = new RebaseOperation(repository, repository.exactRef(MASTER)); op.execute(null); fail("Expected Exception not thrown"); } catch (CoreException e) { diff --git a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/common/LocalRepositoryTestCase.java b/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/common/LocalRepositoryTestCase.java index eee6a7ebea..bd77fb072f 100644 --- a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/common/LocalRepositoryTestCase.java +++ b/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/common/LocalRepositoryTestCase.java @@ -517,7 +517,7 @@ public abstract class LocalRepositoryTestCase extends EGitTestCase { protected static void createBranch(Repository myRepository, String newRefName) throws IOException { RefUpdate updateRef = myRepository.updateRef(newRefName); - Ref sourceBranch = myRepository.getRef("refs/heads/master"); + Ref sourceBranch = myRepository.exactRef("refs/heads/master"); ObjectId startAt = sourceBranch.getObjectId(); String startBranch = Repository.shortenRefName(sourceBranch.getName()); updateRef.setNewObjectId(startAt); diff --git a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/gitflow/AbstractGitflowHandlerTest.java b/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/gitflow/AbstractGitflowHandlerTest.java index e048977827..abc5354e7a 100644 --- a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/gitflow/AbstractGitflowHandlerTest.java +++ b/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/gitflow/AbstractGitflowHandlerTest.java @@ -96,7 +96,7 @@ public abstract class AbstractGitflowHandlerTest extends LocalRepositoryTestCase } protected Ref findBranch(String branchName) throws IOException { - return repository.getRef(R_HEADS + branchName); + return repository.exactRef(R_HEADS + branchName); } protected void init() throws CoreException { diff --git a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/gitflow/InitHandlerTest.java b/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/gitflow/InitHandlerTest.java index 6662edf33e..d7bfa87f4b 100644 --- a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/gitflow/InitHandlerTest.java +++ b/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/gitflow/InitHandlerTest.java @@ -104,7 +104,7 @@ public class InitHandlerTest extends AbstractGitflowHandlerTest { assertEquals(HOTFIX_BRANCH_PREFIX, config.getHotfixPrefix()); assertEquals(VERSION_TAG_PREFIX, config.getVersionTagPrefix()); - assertNotNull(repository.getRef(Constants.R_HEADS + DEVELOP_BRANCH)); + assertNotNull(repository.exactRef(Constants.R_HEADS + DEVELOP_BRANCH)); } @Test @@ -132,7 +132,8 @@ public class InitHandlerTest extends AbstractGitflowHandlerTest { assertEquals(HOTFIX_BRANCH_PREFIX, config.getHotfixPrefix()); assertEquals(VERSION_TAG_PREFIX, config.getVersionTagPrefix()); - assertNotNull(localRepository.getRef(Constants.R_HEADS + DEVELOP_BRANCH)); + assertNotNull( + localRepository.exactRef(Constants.R_HEADS + DEVELOP_BRANCH)); } private void selectProject(String projectName) { diff --git a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/internal/push/PushBranchWizardTest.java b/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/internal/push/PushBranchWizardTest.java index 23a51e358d..eca7c943e0 100644 --- a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/internal/push/PushBranchWizardTest.java +++ b/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/internal/push/PushBranchWizardTest.java @@ -248,7 +248,7 @@ public class PushBranchWizardTest extends LocalRepositoryTestCase { private void checkoutNewLocalBranch(String branchName) throws Exception { CreateLocalBranchOperation createBranch = new CreateLocalBranchOperation( - repository, branchName, repository.getRef("master"), + repository, branchName, repository.findRef("master"), UpstreamConfig.NONE); createBranch.execute(null); BranchOperation checkout = new BranchOperation(repository, branchName); diff --git a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/internal/push/PushToUpstreamTest.java b/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/internal/push/PushToUpstreamTest.java index 0e19fa3ef6..b1f29cdd1d 100644 --- a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/internal/push/PushToUpstreamTest.java +++ b/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/internal/push/PushToUpstreamTest.java @@ -77,7 +77,7 @@ public class PushToUpstreamTest extends LocalRepositoryTestCase { private void checkoutNewLocalBranch(String branchName) throws Exception { CreateLocalBranchOperation createBranch = new CreateLocalBranchOperation( - repository, branchName, repository.getRef("master"), + repository, branchName, repository.findRef("master"), UpstreamConfig.NONE); createBranch.execute(null); BranchOperation checkout = new BranchOperation(repository, branchName); diff --git a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/submodule/SubmoduleUpdateTest.java b/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/submodule/SubmoduleUpdateTest.java index aa2d394e1f..94203c4da9 100644 --- a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/submodule/SubmoduleUpdateTest.java +++ b/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/submodule/SubmoduleUpdateTest.java @@ -76,7 +76,7 @@ public class SubmoduleUpdateTest extends GitRepositoriesViewTestBase { assertNotNull(subRepo); subRepo.close(); - Ref head = subRepo.getRef(Constants.HEAD); + Ref head = subRepo.exactRef(Constants.HEAD); assertNotNull(head); assertTrue(head.isSymbolic()); assertEquals(Constants.R_HEADS + Constants.MASTER, head.getLeaf() @@ -94,7 +94,7 @@ public class SubmoduleUpdateTest extends GitRepositoriesViewTestBase { TestUtil.joinJobs(JobFamilies.SUBMODULE_UPDATE); refreshAndWait(); - head = subRepo.getRef(Constants.HEAD); + head = subRepo.exactRef(Constants.HEAD); assertNotNull(head); assertFalse(head.isSymbolic()); assertEquals(repoHead, head.getObjectId()); diff --git a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/test/history/HistoryViewTest.java b/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/test/history/HistoryViewTest.java index ba34382aed..dc2fbb0c0c 100644 --- a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/test/history/HistoryViewTest.java +++ b/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/test/history/HistoryViewTest.java @@ -401,7 +401,7 @@ public class HistoryViewTest extends LocalRepositoryTestCase { @Ignore public void testRebaseAlreadyUpToDate() throws Exception { Repository repo = lookupRepository(repoFile); - Ref stable = repo.getRef("stable"); + Ref stable = repo.findRef("stable"); SWTBotTable table = getHistoryViewTable(PROJ1); SWTBotTableItem stableItem = getTableItemWithId(table, stable.getObjectId()); diff --git a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/test/stagview/StagingViewTest.java b/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/test/stagview/StagingViewTest.java index 739e989729..e8155b833b 100644 --- a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/test/stagview/StagingViewTest.java +++ b/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/test/stagview/StagingViewTest.java @@ -115,7 +115,7 @@ public class StagingViewTest extends LocalRepositoryTestCase { git.checkout().setName("master").call(); commitOneFileChange("on master"); - git.merge().include(repository.getRef("side")).call(); + git.merge().include(repository.findRef("side")).call(); assertEquals(RepositoryState.MERGING, repository.getRepositoryState()); StagingViewTester stagingView = StagingViewTester diff --git a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/view/repositories/GitRepositoriesViewFetchAndPushTest.java b/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/view/repositories/GitRepositoriesViewFetchAndPushTest.java index 35c103d100..7f44b2afea 100644 --- a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/view/repositories/GitRepositoriesViewFetchAndPushTest.java +++ b/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/view/repositories/GitRepositoriesViewFetchAndPushTest.java @@ -152,7 +152,7 @@ public class GitRepositoriesViewFetchAndPushTest extends confirmed.close(); assertTrue("Up to date expected", uptodate); // touch and run again: expect new branch - String objectIdBefore = repository.getRef(repository.getFullBranch()) + String objectIdBefore = repository.exactRef(repository.getFullBranch()) .getLeaf().getObjectId().name(); objectIdBefore = objectIdBefore.substring(0, 7); touchAndSubmit(null); @@ -236,7 +236,7 @@ public class GitRepositoriesViewFetchAndPushTest extends deleteAllProjects(); shareProjects(clonedRepositoryFile2); - String objid = repository.getRef("refs/heads/master").getTarget() + String objid = repository.exactRef("refs/heads/master").getTarget() .getObjectId().name(); objid = objid.substring(0, 7); touchAndSubmit(null); diff --git a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/view/repositories/GitRepositoriesViewTestBase.java b/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/view/repositories/GitRepositoriesViewTestBase.java index 88766f80a9..42bf48a756 100644 --- a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/view/repositories/GitRepositoriesViewTestBase.java +++ b/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/view/repositories/GitRepositoriesViewTestBase.java @@ -75,7 +75,7 @@ public abstract class GitRepositoriesViewTestBase extends // that we push two branches to remote String newRefName = "refs/heads/stable"; RefUpdate updateRef = myRepository.updateRef(newRefName); - Ref sourceBranch = myRepository.getRef("refs/heads/master"); + Ref sourceBranch = myRepository.exactRef("refs/heads/master"); ObjectId startAt = sourceBranch.getObjectId(); String startBranch = Repository.shortenRefName(sourceBranch.getName()); updateRef.setNewObjectId(startAt); diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/CompareUtils.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/CompareUtils.java index bda01b84b0..9f24738e7c 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/CompareUtils.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/CompareUtils.java @@ -934,7 +934,7 @@ public class CompareUtils { */ public static ITypedElement getHeadTypedElement(Repository repository, String repoRelativePath) { try { - Ref head = repository.getRef(Constants.HEAD); + Ref head = repository.exactRef(Constants.HEAD); if (head == null || head.getObjectId() == null) // Initial import, not yet a HEAD commit return new EmptyTypedElement(""); //$NON-NLS-1$ diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/MergeActionHandler.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/MergeActionHandler.java index 7598cf2a67..96940b62c7 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/MergeActionHandler.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/MergeActionHandler.java @@ -143,7 +143,7 @@ public class MergeActionHandler extends RepositoryActionHandler { public static boolean checkMergeIsPossible(Repository repository, Shell shell) { String message = null; try { - Ref head = repository.getRef(Constants.HEAD); + Ref head = repository.exactRef(Constants.HEAD); if (head == null || !head.isSymbolic()) message = UIText.MergeAction_HeadIsNoBranch; else if (!repository.getRepositoryState().equals( diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/PullFromUpstreamActionHandler.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/PullFromUpstreamActionHandler.java index 12c5a48e22..164e2f8b2b 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/PullFromUpstreamActionHandler.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/PullFromUpstreamActionHandler.java @@ -50,7 +50,7 @@ public class PullFromUpstreamActionHandler extends RepositoryActionHandler { || !fullBranch.startsWith(Constants.R_REFS)) { return false; } - Ref head = repo.getRef(Constants.HEAD); + Ref head = repo.exactRef(Constants.HEAD); if (head == null || head.getObjectId() == null) { return false; } diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/PushActionHandler.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/PushActionHandler.java index e176f25030..5fb3b4ac36 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/PushActionHandler.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/PushActionHandler.java @@ -60,7 +60,7 @@ public class PushActionHandler extends RepositoryActionHandler { if (repository == null) { return false; } - Ref ref = repository.getRef(Constants.HEAD); + Ref ref = repository.exactRef(Constants.HEAD); return ref != null && ref.getObjectId() != null; } catch (IOException e) { Activator.handleError(e.getMessage(), e, false); diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/PushUpstreamOrBranchActionHandler.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/PushUpstreamOrBranchActionHandler.java index 5b1e67a75b..04f380f45c 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/PushUpstreamOrBranchActionHandler.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/PushUpstreamOrBranchActionHandler.java @@ -78,7 +78,7 @@ public class PushUpstreamOrBranchActionHandler extends RepositoryActionHandler { private static Ref getHeadIfSymbolic(Repository repository) { try { - Ref head = repository.getRef(Constants.HEAD); + Ref head = repository.exactRef(Constants.HEAD); if (head != null && head.isSymbolic()) return head; else diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/RepositoryActionHandler.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/RepositoryActionHandler.java index 60ef68d053..046610a018 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/RepositoryActionHandler.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/RepositoryActionHandler.java @@ -479,7 +479,7 @@ abstract class RepositoryActionHandler extends AbstractHandler { rw.setTreeFilter(filter); } - Ref head = repository.getRef(Constants.HEAD); + Ref head = repository.exactRef(Constants.HEAD); if (head == null) { return result; } diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/SwitchToMenu.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/SwitchToMenu.java index 56f12efd5e..b3c1f95382 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/SwitchToMenu.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/SwitchToMenu.java @@ -101,7 +101,7 @@ public class SwitchToMenu extends ContributionItem implements ConfigConstants.CONFIG_WORKFLOW_SECTION, null, ConfigConstants.CONFIG_KEY_DEFBRANCHSTARTPOINT); try { - Ref ref = repository.getRef(sourceRef); + Ref ref = repository.findRef(sourceRef); if (ref != null) BranchOperationUI.createWithRef(repository, ref.getName()).start(); diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/SynchronizeWorkspaceActionHandler.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/SynchronizeWorkspaceActionHandler.java index 54d6edb7a9..73a2f1ae89 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/SynchronizeWorkspaceActionHandler.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/SynchronizeWorkspaceActionHandler.java @@ -124,7 +124,7 @@ public class SynchronizeWorkspaceActionHandler extends RepositoryActionHandler { Ref ref; try { - ref = repo.getRef(HEAD); + ref = repo.exactRef(HEAD); } catch (IOException e) { ref = null; } diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/commands/shared/RebaseCurrentRefCommand.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/commands/shared/RebaseCurrentRefCommand.java index cfc401ae2c..b8248458e5 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/commands/shared/RebaseCurrentRefCommand.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/commands/shared/RebaseCurrentRefCommand.java @@ -91,7 +91,7 @@ public class RebaseCurrentRefCommand extends AbstractRebaseCommandHandler { if (rebaseTargetSelectionDialog.open() == IDialogConstants.OK_ID) { String refName = rebaseTargetSelectionDialog.getRefName(); try { - ref = repository.getRef(refName); + ref = repository.findRef(refName); } catch (IOException e) { throw new ExecutionException(e.getMessage(), e); } @@ -135,7 +135,7 @@ public class RebaseCurrentRefCommand extends AbstractRebaseCommandHandler { private static boolean hasHead(Repository repo) { try { - Ref headRef = repo.getRef(Constants.HEAD); + Ref headRef = repo.exactRef(Constants.HEAD); return headRef != null && headRef.getObjectId() != null; } catch (IOException e) { return false; diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/commit/CommitJob.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/commit/CommitJob.java index 835f1b91e7..c927ca8e63 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/commit/CommitJob.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/commit/CommitJob.java @@ -175,7 +175,7 @@ public class CommitJob extends Job { String fullBranch = repository.getFullBranch(); if (fullBranch != null && fullBranch.startsWith(Constants.R_HEADS)) { - Ref ref = repository.getRef(fullBranch); + Ref ref = repository.exactRef(fullBranch); pushWizard = new PushBranchWizard(repository, ref); } else { pushWizard = new PushBranchWizard(repository, diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/components/RefSpecPanel.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/components/RefSpecPanel.java index e01206f4b3..af2f9f0872 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/components/RefSpecPanel.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/components/RefSpecPanel.java @@ -377,7 +377,7 @@ public class RefSpecPanel { Ref HEAD = null; try { - HEAD = localDb.getRef(Constants.HEAD); + HEAD = localDb.exactRef(Constants.HEAD); } catch (IOException e) { Activator.logError("Couldn't read HEAD from local repository", e); //$NON-NLS-1$ } diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/decorators/GitDocument.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/decorators/GitDocument.java index 46a1ffa5a8..f10b1ec214 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/decorators/GitDocument.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/decorators/GitDocument.java @@ -142,7 +142,7 @@ class GitDocument extends Document implements RefsChangedListener { return; } } else { - if (repository.getRef(Constants.HEAD) == null) { + if (repository.exactRef(Constants.HEAD) == null) { // Complain only if not an unborn branch String msg = NLS.bind(UIText.GitDocument_errorResolveQuickdiff, new Object[] { baseline, resource, repository }); diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/AbstractBranchSelectionDialog.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/AbstractBranchSelectionDialog.java index 963b9df84d..650c5a333b 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/AbstractBranchSelectionDialog.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/AbstractBranchSelectionDialog.java @@ -368,9 +368,9 @@ public abstract class AbstractBranchSelectionDialog extends TitleAreaDialog { /** * Enables the OK button. No-op in case Dialog#createButtonsForButtonBar has * been overridden and the button has not been created. - * + * * @param enabled - * + * * @see org.eclipse.jface.dialogs.Dialog#createButtonsForButtonBar(Composite) */ protected void setOkButtonEnabled(boolean enabled) { @@ -381,7 +381,7 @@ public abstract class AbstractBranchSelectionDialog extends TitleAreaDialog { /** * Returns <code>true</code> if the OK button has been created and is * enabled. - * + * * @return the OK button's enabled state or <code>false</code> if the button * has not been created. */ @@ -405,17 +405,17 @@ public abstract class AbstractBranchSelectionDialog extends TitleAreaDialog { RepositoryTreeNode node; try { if (refName.startsWith(Constants.R_HEADS)) { - Ref ref = repo.getRef(refName); + Ref ref = repo.exactRef(refName); if (ref == null) return false; node = new RefNode(localBranches, repo, ref); } else if (refName.startsWith(Constants.R_REMOTES)) { - Ref ref = repo.getRef(refName); + Ref ref = repo.exactRef(refName); if (ref == null) return false; node = new RefNode(remoteBranches, repo, ref); } else if (Constants.HEAD.equals(refName)) { - Ref ref = repo.getRef(refName); + Ref ref = repo.exactRef(refName); if (ref == null) return false; node = new AdditionalRefNode(references, repo, ref); @@ -424,13 +424,13 @@ public abstract class AbstractBranchSelectionDialog extends TitleAreaDialog { .mapCommitToRef(repo, refName, false); if (mappedRef != null && mappedRef.startsWith(Constants.R_REMOTES)) { - Ref ref = repo.getRef(mappedRef); + Ref ref = repo.exactRef(mappedRef); if (ref == null) return false; node = new RefNode(remoteBranches, repo, ref); } else if (mappedRef != null && mappedRef.startsWith(Constants.R_TAGS)) { - Ref ref = repo.getRef(mappedRef); + Ref ref = repo.exactRef(mappedRef); if (ref == null) return false; node = new TagNode(tags, repo, ref); diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/BranchSelectionAndEditDialog.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/BranchSelectionAndEditDialog.java index fcf6821031..43ced3af2e 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/BranchSelectionAndEditDialog.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/BranchSelectionAndEditDialog.java @@ -175,7 +175,7 @@ public class BranchSelectionAndEditDialog extends ConfigConstants.CONFIG_WORKFLOW_SECTION, null, ConfigConstants.CONFIG_KEY_DEFBRANCHSTARTPOINT); try { - Ref ref = repo.getRef(sourceRef); + Ref ref = repo.findRef(sourceRef); if (ref != null) { base = ref.getName(); } diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/fetch/SimpleConfigureFetchDialog.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/fetch/SimpleConfigureFetchDialog.java index 7b9f5511ac..eb24469250 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/fetch/SimpleConfigureFetchDialog.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/fetch/SimpleConfigureFetchDialog.java @@ -596,7 +596,7 @@ public class SimpleConfigureFetchDialog extends TitleAreaDialog { Ref source; try { // TODO better checks for wild-cards and such - source = repository.getRef(spec.getDestination()); + source = repository.findRef(spec.getDestination()); } catch (IOException e1) { source = null; } diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/history/HistoryPageInput.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/history/HistoryPageInput.java index 2120866158..b62aefadb8 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/history/HistoryPageInput.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/history/HistoryPageInput.java @@ -146,7 +146,7 @@ public class HistoryPageInput { */ public Ref getHead() { try { - Ref h = repo.getRef(Constants.HEAD); + Ref h = repo.exactRef(Constants.HEAD); if (h != null && h.isSymbolic()) return h; return null; diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/push/PushToGerritPage.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/push/PushToGerritPage.java index 149d825cef..fdb57bb061 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/push/PushToGerritPage.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/push/PushToGerritPage.java @@ -470,7 +470,7 @@ class PushToGerritPage extends WizardPage { void doPush() { try { URIish uri = new URIish(uriCombo.getText()); - Ref currentHead = repository.getRef(Constants.HEAD); + Ref currentHead = repository.exactRef(Constants.HEAD); String ref = prefixCombo.getItem(prefixCombo.getSelectionIndex()) + branchText.getText().trim(); if (topicText.isEnabled()) { diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/push/SimpleConfigurePushDialog.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/push/SimpleConfigurePushDialog.java index f43ba3cc43..0481231f82 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/push/SimpleConfigurePushDialog.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/push/SimpleConfigurePushDialog.java @@ -673,7 +673,7 @@ public class SimpleConfigurePushDialog extends TitleAreaDialog { Ref source; try { // TODO better checks for wild-cards and such - source = repository.getRef(spec.getSource()); + source = repository.findRef(spec.getSource()); } catch (IOException e1) { source = null; } diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/repository/CreateBranchPage.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/repository/CreateBranchPage.java index efdbf26519..b1bc99e91d 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/repository/CreateBranchPage.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/repository/CreateBranchPage.java @@ -396,7 +396,7 @@ class CreateBranchPage extends WizardPage { myBaseCommit); else cbop = new CreateLocalBranchOperation(myRepository, newRefName, - myRepository.getRef(this.sourceRefName), + myRepository.findRef(this.sourceRefName), upstreamConfig); cbop.execute(monitor); diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/repository/CreateBranchWizard.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/repository/CreateBranchWizard.java index 83ce84e9b0..12e2fa00bb 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/repository/CreateBranchWizard.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/repository/CreateBranchWizard.java @@ -60,7 +60,7 @@ public class CreateBranchWizard extends Wizard { if (base.startsWith(Constants.R_HEADS) || base.startsWith(Constants.R_REMOTES) || base.startsWith(Constants.R_TAGS)) { - Ref currentBranch = repository.getRef(base); + Ref currentBranch = repository.exactRef(base); myPage = new CreateBranchPage(repository, currentBranch); } else { // the page only knows some special Refs diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/repository/RepositoriesViewContentProvider.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/repository/RepositoriesViewContentProvider.java index 2e9ebe1e9b..7b1e29d653 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/repository/RepositoriesViewContentProvider.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/repository/RepositoriesViewContentProvider.java @@ -645,7 +645,7 @@ public class RepositoriesViewContentProvider implements ITreeContentProvider, */ private boolean hasStashedCommits(final Repository repository) { try { - return repository.getRef(Constants.R_STASH) != null; + return repository.exactRef(Constants.R_STASH) != null; } catch (IOException e) { return false; } diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/repository/RepositoriesViewLabelProvider.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/repository/RepositoriesViewLabelProvider.java index 4610e9dce5..af519466e6 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/repository/RepositoriesViewLabelProvider.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/repository/RepositoriesViewLabelProvider.java @@ -288,7 +288,7 @@ public class RepositoriesViewLabelProvider extends ColumnLabelProvider Ref head; try { - head = repository.getRef(Constants.HEAD); + head = repository.exactRef(Constants.HEAD); } catch (IOException e) { return string; } diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/repository/tree/BranchHierarchyNode.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/repository/tree/BranchHierarchyNode.java index ce4516f598..182b4f4d7b 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/repository/tree/BranchHierarchyNode.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/repository/tree/BranchHierarchyNode.java @@ -73,7 +73,8 @@ public class BranchHierarchyNode extends RepositoryTreeNode<IPath> { int segmentDiff = myPath.segmentCount() - getObject().segmentCount(); if (segmentDiff == 1) { - Ref ref = getRepository().getRef(myPath.toPortableString()); + Ref ref = getRepository() + .findRef(myPath.toPortableString()); childRefs.add(ref); } } diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/repository/tree/command/RepositoriesViewCommandHandler.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/repository/tree/command/RepositoriesViewCommandHandler.java index 15ccd89b39..ac958d56d1 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/repository/tree/command/RepositoriesViewCommandHandler.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/repository/tree/command/RepositoriesViewCommandHandler.java @@ -106,7 +106,7 @@ abstract class RepositoriesViewCommandHandler<T extends RepositoryTreeNode<?>> private boolean repositoryHasHead(T treeNode) { Repository repo = treeNode.getRepository(); try { - Ref ref = repo.getRef(Constants.HEAD); + Ref ref = repo.exactRef(Constants.HEAD); return ref != null && ref.getObjectId() != null; } catch (IOException e) { // ignore and report false |