# [PATCH JGIT] In the commit dialog, deal with Signed-off-by not on the last line 2 messages from 2009-02-12 to 2009-02-18. Participants: Yann Simon, Shawn O. Pearce. Thread: https://gitlist.dev/t/17741 ## Yann Simon, 2009-02-12 08:21 Subject: [PATCH JGIT] In the commit dialog, deal with Signed-off-by not on the last line Message-ID: <4993DBF0.8070901@gmail.com> URL: https://gitlist.dev/e/4993DBF0.8070901%40gmail.com ``` The previous implementation made the assumption that the Signed-off-by is always on the last line. Correct this assumption and deal with Signed-off-by everywhere in the commit message. Signed-off-by: Yann Simon --- .../egit/ui/internal/dialogs/CommitDialog.java | 65 ++++++++++++-------- 1 files changed, 40 insertions(+), 25 deletions(-) diff --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 index bbe7193..403d69d 100644 --- 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 @@ -179,14 +179,16 @@ public void keyPressed(KeyEvent arg0) { if (committer != null) committerText.setText(committer); committerText.addModifyListener(new ModifyListener() { + String oldCommitter = committerText.getText(); public void modifyText(ModifyEvent e) { if (signedOffButton.getSelection()) { // the commit message is signed // the signature must be updated - String oldCommitText = commitText.getText(); - oldCommitText = removeLastLine(oldCommitText); - oldCommitText = signOff(oldCommitText); - commitText.setText(oldCommitText); + String neuCommitter = committerText.getText(); + String oldSignOff = getSignedOff(oldCommitter); + String neuSignOff = getSignedOff(neuCommitter); + commitText.setText(replaceSignOff(commitText.getText(), oldSignOff, neuSignOff)); + oldCommitter = neuCommitter; } } }); @@ -230,12 +232,16 @@ public void widgetDefaultSelected(SelectionEvent arg0) { signedOffButton.addSelectionListener(new SelectionListener() { public void widgetSelected(SelectionEvent arg0) { + String curText = commitText.getText(); if (signedOffButton.getSelection()) { // add signed off line - commitText.setText(signOff(commitText.getText())); + commitText.setText(signOff(curText)); } else { // remove signed off line - commitText.setText(removeLastLine(commitText.getText())); + curText = replaceSignOff(curText, getSignedOff(), ""); + if (curText.endsWith(Text.DELIMITER + Text.DELIMITER)) + curText = curText.substring(0, curText.length() - Text.DELIMITER.length()); + commitText.setText(curText); } } @@ -279,11 +285,19 @@ public void modifyText(ModifyEvent e) { } private void updateSignedOffButton() { - signedOffButton.setSelection(getLastLine(commitText.getText()).equals(getSignedOff())); + String curText = commitText.getText(); + if (!curText.endsWith(Text.DELIMITER)) + curText += Text.DELIMITER; + + signedOffButton.setSelection(curText.indexOf(getSignedOff() + Text.DELIMITER) != -1); } private String getSignedOff() { - return Constants.SIGNED_OFF_BY_TAG + committerText.getText(); + return getSignedOff(committerText.getText()); + } + + private String getSignedOff(String signer) { + return Constants.SIGNED_OFF_BY_TAG + signer; } private String signOff(String input) { @@ -299,32 +313,33 @@ private String signOff(String input) { } private String getLastLine(String input) { - String output = removeLastLineBreak(input); + String output = input; int breakLength = Text.DELIMITER.length(); - // get the last line + // remove last line break if exist int lastIndexOfLineBreak = output.lastIndexOf(Text.DELIMITER); + if (lastIndexOfLineBreak != -1 && lastIndexOfLineBreak == output.length() - breakLength) + output = output.substring(0, output.length() - breakLength); + + // get the last line + lastIndexOfLineBreak = output.lastIndexOf(Text.DELIMITER); return lastIndexOfLineBreak == -1 ? output : output.substring(lastIndexOfLineBreak + breakLength, output.length()); } - private String removeLastLine(String input) { - String output = removeLastLineBreak(input); + private String replaceSignOff(String input, String oldSignOff, String newSignOff) { + assert input != null; + assert oldSignOff != null; + assert newSignOff != null; - // remove the last line if possible - int lastIndexOfLineBreak = output.lastIndexOf(Text.DELIMITER); - return lastIndexOfLineBreak == -1 ? "" : output.substring(0, lastIndexOfLineBreak); //$NON-NLS-1$ - } - - private String removeLastLineBreak(String input) { - String output = input; - int breakLength = Text.DELIMITER.length(); + String curText = input; + if (!curText.endsWith(Text.DELIMITER)) + curText += Text.DELIMITER; - // remove last line break if exist - int lastIndexOfLineBreak = output.lastIndexOf(Text.DELIMITER); - if (lastIndexOfLineBreak != -1 && lastIndexOfLineBreak == output.length() - breakLength) - output = output.substring(0, output.length() - breakLength); + int indexOfSignOff = curText.indexOf(oldSignOff + Text.DELIMITER); + if (indexOfSignOff == -1) + return input; - return output; + return input.substring(0, indexOfSignOff) + newSignOff + input.substring(indexOfSignOff + oldSignOff.length(), input.length()); } private Menu getContextMenu() { -- 1.6.0.4 ``` ## Shawn O. Pearce, 2009-02-18 17:01 Subject: Re: [PATCH JGIT] In the commit dialog, deal with Signed-off-by not on the last line Message-ID: <20090218170116.GC22848@spearce.org> URL: https://gitlist.dev/e/20090218170116.GC22848%40spearce.org In-Reply-To: <4993DBF0.8070901@gmail.com> ``` Yann Simon wrote: > The previous implementation made the assumption that > the Signed-off-by is always on the last line. > > Correct this assumption and deal with Signed-off-by everywhere in > the commit message. > > Signed-off-by: Yann Simon > --- > .../egit/ui/internal/dialogs/CommitDialog.java | 65 > ++++++++++++-------- > 1 files changed, 40 insertions(+), 25 deletions(-) This patch is whitespace damaged and can't be applied by machine. > diff --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 > index bbe7193..403d69d 100644 > --- > 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 -- Shawn. ```