From mboxrd@z Thu Jan 1 00:00:00 1970 From: Robin Rosenberg Subject: [EGIT PATCH v5 5/7] Add ref rename support to the branch dialog Date: Wed, 10 Jun 2009 23:22:23 +0200 Message-ID: <1244668945-12622-6-git-send-email-robin.rosenberg@dewire.com> References: <1241652781-16873-1-git-send-email-robin.rosenberg@dewire.com> <1244668945-12622-1-git-send-email-robin.rosenberg@dewire.com> <1244668945-12622-2-git-send-email-robin.rosenberg@dewire.com> <1244668945-12622-3-git-send-email-robin.rosenberg@dewire.com> <1244668945-12622-4-git-send-email-robin.rosenberg@dewire.com> <1244668945-12622-5-git-send-email-robin.rosenberg@dewire.com> Cc: git@vger.kernel.org, Robin Rosenberg To: spearce@spearce.org X-From: git-owner@vger.kernel.org Wed Jun 10 23:23:40 2009 Return-path: Envelope-to: gcvg-git-2@gmane.org Received: from vger.kernel.org ([209.132.176.167]) by lo.gmane.org with esmtp (Exim 4.50) id 1MEVGl-0007wr-C0 for gcvg-git-2@gmane.org; Wed, 10 Jun 2009 23:23:39 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757512AbZFJVWq (ORCPT ); Wed, 10 Jun 2009 17:22:46 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1757154AbZFJVWo (ORCPT ); Wed, 10 Jun 2009 17:22:44 -0400 Received: from mail.dewire.com ([83.140.172.130]:3888 "EHLO dewire.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755333AbZFJVWe (ORCPT ); Wed, 10 Jun 2009 17:22:34 -0400 Received: from localhost (localhost [127.0.0.1]) by dewire.com (Postfix) with ESMTP id D32B0147D59F; Wed, 10 Jun 2009 23:22:35 +0200 (CEST) X-Virus-Scanned: by amavisd-new at dewire.com Received: from dewire.com ([127.0.0.1]) by localhost (torino.dewire.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id IWIL43O8vVqi; Wed, 10 Jun 2009 23:22:34 +0200 (CEST) Received: from localhost.localdomain (unknown [10.9.0.8]) by dewire.com (Postfix) with ESMTP id 8BD55147D5AE; Wed, 10 Jun 2009 23:22:28 +0200 (CEST) X-Mailer: git-send-email 1.6.3.2.199.g7340d In-Reply-To: <1244668945-12622-5-git-send-email-robin.rosenberg@dewire.com> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: Signed-off-by: Robin Rosenberg --- .../src/org/spearce/egit/ui/UIText.java | 12 ++ .../ui/internal/dialogs/BranchSelectionDialog.java | 106 ++++++++++++++++---- .../src/org/spearce/egit/ui/uitext.properties | 5 + 3 files changed, 103 insertions(+), 20 deletions(-) diff --git a/org.spearce.egit.ui/src/org/spearce/egit/ui/UIText.java b/org.spearce.egit.ui/src/org/spearce/egit/ui/UIText.java index 654e155..aa31a93 100644 --- a/org.spearce.egit.ui/src/org/spearce/egit/ui/UIText.java +++ b/org.spearce.egit.ui/src/org/spearce/egit/ui/UIText.java @@ -893,6 +893,12 @@ public static String BranchSelectionDialog_ErrorCouldNotRefresh; /** */ + public static String BranchSelectionDialog_ErrorCouldNotRenameRef; + + /** */ + public static String BranchSelectionDialog_ErrorCouldNotRenameRef2; + + /** */ public static String BranchSelectionDialog_BranchSuffix_Current; /** */ @@ -929,6 +935,12 @@ public static String BranchSelectionDialog_QuestionNewBranchTitle; /** */ + public static String BranchSelectionDialog_QuestionNewBranchNameTitle; + + /** */ + public static String BranchSelectionDialog_QuestionNewBranchNameMessage; + + /** */ public static String BranchSelectionDialog_QuestionNewBranchMessage; /** */ diff --git a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/dialogs/BranchSelectionDialog.java b/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/dialogs/BranchSelectionDialog.java index 9aad95b..28105af 100644 --- a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/dialogs/BranchSelectionDialog.java +++ b/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/dialogs/BranchSelectionDialog.java @@ -48,8 +48,11 @@ import org.spearce.egit.ui.UIText; import org.spearce.jgit.lib.Constants; import org.spearce.jgit.lib.ObjectId; +import org.spearce.jgit.lib.Ref; +import org.spearce.jgit.lib.RefRename; import org.spearce.jgit.lib.RefUpdate; import org.spearce.jgit.lib.Repository; +import org.spearce.jgit.lib.RefUpdate.Result; /** * The branch and reset selection dialog @@ -277,6 +280,30 @@ private void refNameFromDialog() { } } + private InputDialog getRefNameInputDialog(String prompt) { + InputDialog labelDialog = new InputDialog( + getShell(), + UIText.BranchSelectionDialog_QuestionNewBranchTitle, + prompt, + null, new IInputValidator() { + public String isValid(String newText) { + String testFor = Constants.R_HEADS + newText; + try { + if (repo.resolve(testFor) != null) + return UIText.BranchSelectionDialog_ErrorAlreadyExists; + } catch (IOException e1) { + Activator.logError(NLS.bind( + UIText.BranchSelectionDialog_ErrorCouldNotResolve, testFor), e1); + } + if (!Repository.isValidRefName(testFor)) + return UIText.BranchSelectionDialog_ErrorInvalidRefName; + return null; + } + }); + labelDialog.setBlockOnOpen(true); + return labelDialog; + } + @Override protected void createButtonsForButtonBar(Composite parent) { if (!showResetType) { @@ -284,43 +311,81 @@ protected void createButtonsForButtonBar(Composite parent) { newButton.setFont(JFaceResources.getDialogFont()); newButton.setText(UIText.BranchSelectionDialog_NewBranch); ((GridLayout)parent.getLayout()).numColumns++; + Button renameButton = new Button(parent, SWT.PUSH); + renameButton.setText("&Rename"); + renameButton.addSelectionListener(new SelectionListener() { + public void widgetSelected(SelectionEvent e) { + // check what ref name the user selected, if any. + refNameFromDialog(); + + String branchName; + if (refName.startsWith(Constants.R_HEADS)) + branchName = refName.substring(Constants.R_HEADS.length()); + else + branchName = refName; + InputDialog labelDialog = getRefNameInputDialog(NLS + .bind( + UIText.BranchSelectionDialog_QuestionNewBranchNameMessage, + branchName)); + if (labelDialog.open() == Window.OK) { + String newRefName = Constants.R_HEADS + labelDialog.getValue(); + try { + RefRename renameRef = repo.renameRef(refName, newRefName); + if (renameRef.rename() != Result.RENAMED) { + MessageDialog.openError(getShell(), + "Rename failed", + NLS.bind(UIText.BranchSelectionDialog_ErrorCouldNotRenameRef, + new Object[] { refName, newRefName, renameRef.getResult() })); + Activator.logError(NLS.bind( + UIText.BranchSelectionDialog_ErrorCouldNotRenameRef2, + new Object[] { refName, newRefName }), null); + } + // FIXME: Update HEAD + } catch (IOException e1) { + Activator.logError(NLS.bind( + UIText.BranchSelectionDialog_ErrorCouldNotRenameRef2, + newRefName), e1); + } + try { + branchTree.removeAll(); + fillTreeWithBranches(newRefName); + } catch (IOException e1) { + Activator.logError( + UIText.BranchSelectionDialog_ErrorCouldNotRefreshBranchList, + e1); + } + } + } + public void widgetDefaultSelected(SelectionEvent e) { + widgetSelected(e); + } + }); newButton.addSelectionListener(new SelectionListener() { public void widgetSelected(SelectionEvent e) { // check what ref name the user selected, if any. refNameFromDialog(); - InputDialog labelDialog = new InputDialog( - getShell(), - UIText.BranchSelectionDialog_QuestionNewBranchTitle, - UIText.BranchSelectionDialog_QuestionNewBranchMessage, - null, new IInputValidator() { - public String isValid(String newText) { - String testFor = Constants.R_HEADS + newText; - try { - if (repo.resolve(testFor) != null) - return UIText.BranchSelectionDialog_ErrorAlreadyExists; - } catch (IOException e1) { - Activator.logError(NLS.bind( - UIText.BranchSelectionDialog_ErrorCouldNotResolve, testFor), e1); - } - if (!Repository.isValidRefName(testFor)) - return UIText.BranchSelectionDialog_ErrorInvalidRefName; - return null; - } - }); - labelDialog.setBlockOnOpen(true); + InputDialog labelDialog = getRefNameInputDialog(UIText.BranchSelectionDialog_QuestionNewBranchNameMessage); if (labelDialog.open() == Window.OK) { String newRefName = Constants.R_HEADS + labelDialog.getValue(); RefUpdate updateRef; try { updateRef = repo.updateRef(newRefName); + Ref startRef = repo.getRef(refName); ObjectId startAt; if (refName == null) startAt = repo.resolve(Constants.HEAD); else startAt = repo.resolve(refName); + String startBranch; + if (startRef != null) + startBranch = refName; + else + startBranch = startAt.name(); + startBranch = repo.shortenRefName(startBranch); updateRef.setNewObjectId(startAt); + updateRef.setRefLogMessage("branch: Created from " + startBranch, false); updateRef.update(); } catch (IOException e1) { Activator.logError(NLS.bind( @@ -338,6 +403,7 @@ public String isValid(String newText) { } } + public void widgetDefaultSelected(SelectionEvent e) { widgetSelected(e); } diff --git a/org.spearce.egit.ui/src/org/spearce/egit/ui/uitext.properties b/org.spearce.egit.ui/src/org/spearce/egit/ui/uitext.properties index 1d21c81..f19db60 100644 --- a/org.spearce.egit.ui/src/org/spearce/egit/ui/uitext.properties +++ b/org.spearce.egit.ui/src/org/spearce/egit/ui/uitext.properties @@ -340,6 +340,9 @@ BranchSelectionDialog_ErrorCouldNotRefresh=Could not refresh list of branches BranchSelectionDialog_ErrorCouldNotRefreshBranchList=Could not refresh list of branches BranchSelectionDialog_ErrorCouldNotResolve=Could not attempt to resolve {0} BranchSelectionDialog_ErrorInvalidRefName=Invalid ref name +BranchSelectionDialog_ErrorCouldNotRenameRef=Failed to rename branch {0} -> {1}, status={2} +BranchSelectionDialog_ErrorCouldNotRenameRef2=Failed to rename branch {0} -> {1} + BranchSelectionDialog_LocalBranches=Local Branches BranchSelectionDialog_NewBranch=&New branch BranchSelectionDialog_NoBranchSeletectMessage=You must select a valid ref. @@ -347,7 +350,9 @@ BranchSelectionDialog_NoBranchSeletectTitle=No branch/tag selected BranchSelectionDialog_OkCheckout=&Checkout BranchSelectionDialog_OkReset=&Reset BranchSelectionDialog_QuestionNewBranchMessage=Enter name of new branch. It will branch from the selected branch. refs/heads/ will be prepended to the name you type +BranchSelectionDialog_QuestionNewBranchNameMessage=Enter new name of the {0} branch. refs/heads/ will be prepended to the name you type BranchSelectionDialog_QuestionNewBranchTitle=New branch +BranchSelectionDialog_QuestionNewBranchNameTitle=Rename branch BranchSelectionDialog_ReallyResetMessage=Resetting will overwrite any changes in your working directory.\n\nDo you wish to continue? BranchSelectionDialog_ReallyResetTitle=Really reset? BranchSelectionDialog_RemoteBranches=Remote Branches -- 1.6.3.2.199.g7340d