{"thread":{"id":"17671","subject":"[PATCH JGIT] Use previous author when amending a commit","startedAt":"2009-02-09T09:30:57Z","lastAt":"2009-02-09T15:29:24Z","messageCount":2,"participants":["Yann Simon","Shawn O. Pearce"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"103829","messageId":"498FF7D1.8030905@gmail.com","threadId":"17671","inReplyTo":null,"subject":"[PATCH JGIT] Use previous author when amending a commit","fromName":"Yann Simon","fromEmail":"yann.simon.fr@gmail.com","sentAt":"2009-02-09T09:30:57Z","receivedAt":"2009-02-09T09:30:57Z","isPatch":true,"sender":{"key":"yann.simon.fr@gmail.com","avatar":"https://gravatar.com/avatar/2d926895d27ac988c5c8e591887e5a6a4c7036390403c74fce92519119b887a0?d=mp&s=160"},"body":"In the commit dialog, when amending the commit, the author of the\nprevious commit is proposed as default in the author field.\n\nSigned-off-by: Yann Simon <yann.simon.fr@gmail.com>\n---\n .../egit/ui/internal/actions/CommitAction.java     |    5 ++++-\n .../egit/ui/internal/dialogs/CommitDialog.java     |   12 ++++++++++++\n 2 files changed, 16 insertions(+), 1 deletions(-)\n\ndiff --git a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/actions/CommitAction.java b/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/actions/CommitAction.java\nindex ae26770..d30172f 100644\n--- a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/actions/CommitAction.java\n+++ b/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/actions/CommitAction.java\n@@ -118,8 +118,11 @@ public void run(IAction act) {\n \t\tcommitDialog.setFileList(files);\n \t\tcommitDialog.setAuthor(author);\n \n-\t\tif (previousCommit != null)\n+\t\tif (previousCommit != null) {\n \t\t\tcommitDialog.setPreviousCommitMessage(previousCommit.getMessage());\n+\t\t\tPersonIdent previousAuthor = previousCommit.getAuthor();\n+\t\t\tcommitDialog.setPreviousAuthor(previousAuthor.getName() + \" <\" + previousAuthor.getEmailAddress() + \">\");\n+\t\t}\n \n \t\tif (commitDialog.open() != IDialogConstants.OK_ID)\n \t\t\treturn;\ndiff --git a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/dialogs/CommitDialog.java b/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/dialogs/CommitDialog.java\nindex fede948..b122fb8 100644\n--- a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/dialogs/CommitDialog.java\n+++ b/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/dialogs/CommitDialog.java\n@@ -175,6 +175,7 @@ public void keyPressed(KeyEvent arg0) {\n \t\t\tamendingButton.setSelection(amending);\n \t\t\tamendingButton.setEnabled(false); // if already set, don't allow any changes\n \t\t\tcommitText.setText(previousCommitMessage);\n+\t\t\tauthorText.setText(previousAuthor);\n \t\t} else if (!amendAllowed) {\n \t\t\tamendingButton.setEnabled(false);\n \t\t}\n@@ -189,6 +190,7 @@ public void widgetSelected(SelectionEvent arg0) {\n \t\t\t\t\tif (curText.length() > 0)\n \t\t\t\t\t\tcurText += \"\\n\"; //$NON-NLS-1$\n \t\t\t\t\tcommitText.setText(curText + previousCommitMessage);\n+\t\t\t\t\tauthorText.setText(previousAuthor);\n \t\t\t\t}\n \t\t\t}\n \n@@ -334,6 +336,7 @@ public void setCommitMessage(String s) {\n \n \tprivate String commitMessage = \"\"; //$NON-NLS-1$\n \tprivate String author = null;\n+\tprivate String previousAuthor = null;\n \tprivate boolean signedOff = false;\n \tprivate boolean amending = false;\n \tprivate boolean amendAllowed = true;\n@@ -470,6 +473,15 @@ public void setAuthor(String author) {\n \t}\n \n \t/**\n+\t * Pre-set the previous author if amending the commit\n+\t *\n+\t * @param previousAuthor\n+\t */\n+\tpublic void setPreviousAuthor(String previousAuthor) {\n+\t\tthis.previousAuthor = previousAuthor;\n+\t}\n+\n+\t/**\n \t * @return whether to auto-add a signed-off line to the message\n \t */\n \tpublic boolean isSignedOff() {\n-- \n1.6.0.4\n"},{"id":"103849","messageId":"20090209152924.GI30949@spearce.org","threadId":"17671","inReplyTo":"498FF7D1.8030905@gmail.com","subject":"Re: [PATCH JGIT] Use previous author when amending a commit","fromName":"Shawn O. Pearce","fromEmail":"spearce@spearce.org","sentAt":"2009-02-09T15:29:24Z","receivedAt":"2009-02-09T15:29:24Z","isPatch":true,"sender":{"key":"spearce@spearce.org","avatar":"https://avatars.githubusercontent.com/u/34844?v=4"},"body":"Yann Simon <yann.simon.fr@gmail.com> wrote:\n> In the commit dialog, when amending the commit, the author of the\n> previous commit is proposed as default in the author field.\n> \n> Signed-off-by: Yann Simon <yann.simon.fr@gmail.com>\n\nMuch better to read when its by itself.\n\nApplied.  Thanks.\n\n>  .../egit/ui/internal/actions/CommitAction.java     |    5 ++++-\n>  .../egit/ui/internal/dialogs/CommitDialog.java     |   12 ++++++++++++\n>  2 files changed, 16 insertions(+), 1 deletions(-)\n\n-- \nShawn.\n"}]}