DESCRIPTION

Support multiple ICommitMessageProvider implementations

In case, that multiple implementations of ICommitMessageProvider
are available in Eclipse, the commit messages of all providers
are concatenated and provided in the CommitMessageComponent.

Bug: 376388
Change-Id: I38f37116956b65fe9433ef77d1728caa4e69c6af
Signed-off-by: Vincent Mcfarland xxx@xxx.xxx
Signed-off-by: James Mcgee xxx@xxx.xxx


COMMENTS

author: James Mcgee
date: 2017-05-10 14:18:28.000000000

Uploaded patch set 4: Commit message was updated.

-------------------------------------
author: Brenden Conley
date: 2017-05-10 14:48:48.000000000

Patch Set 4:

Build Started https://hudson.eclipse.org/egit/job/egit.gerrit/9819/

-------------------------------------
author: Alayna Houston
date: 2017-05-10 14:52:30.000000000

Patch Set 4:

(6 comments)

Line:697, org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/CommitMessageComponent.java -> if (message != null && !message.trim().isEmpty()) { ...

No need for those extra parentheses that only make the code difficult to read, and no need for "" either.

Line:706, org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/CommitMessageComponent.java -> I prefer not adding it at all. Something like:

  for (ICommitMessageProvider messageProvider : messageProviders) {
    String message = null;
    try {
      message = messageProvider.getMessage(resourcesArray);
    } catch (RuntimeException e) {
      // TODO: log; don't re-throw
    }
    if (message == null) {
      continue;
    }
    message = message.trim();
    if (message.isEmpty()) {
      continue;
    }
    if (calculatedCommitMessage.length() > 0) {
      calculatedCommitMessage.append(providedMessageSeparator);
    }
    calculatedCommitMessage.append(message);
  }

The try-catch is also necessary -- we're calling out to contributed code that may come from anywhere. It might crash. If it does, it shouldn't take down EGit components.

Line:723, org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/CommitMessageComponent.java -> Add here:

  String contributorName = "<unknown>";

Line:724, org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/CommitMessageComponent.java -> Add here:

  contributorName =
    config.getDeclaringExtension().getContributor().getName();

Line:740, org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/CommitMessageComponent.java -> And then just remove this.

Line:742, org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/CommitMessageComponent.java -> We nowadays prefer to use MessageFormat.format() instead of NLS.bind().

-------------------------------------
author: Brenden Conley
date: 2017-05-10 15:14:09.000000000

Patch Set 4: Verified+1

Build Successful 

https://hudson.eclipse.org/egit/job/egit.gerrit/9819/ : SUCCESS

-------------------------------------
author: Douglas Trujillo
date: 2017-05-10 20:31:31.000000000

Patch Set 4:

(3 comments)

can you please some tests ?

-------------------------------------
