From b5a318c0e6340dc546323ea2ccd3861e55beff62 Mon Sep 17 00:00:00 2001 From: James Moger Date: Fri, 31 May 2013 08:34:21 -0400 Subject: Gracefully handle branch creation in daily log digests --- src/main/java/com/gitblit/utils/PushLogUtils.java | 6 +++++- src/main/java/com/gitblit/wicket/GitBlitWebApp.properties | 1 + src/main/java/com/gitblit/wicket/panels/PushesPanel.java | 9 +++++++-- 3 files changed, 13 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/main/java/com/gitblit/utils/PushLogUtils.java b/src/main/java/com/gitblit/utils/PushLogUtils.java index e10a6864..6e77169c 100644 --- a/src/main/java/com/gitblit/utils/PushLogUtils.java +++ b/src/main/java/com/gitblit/utils/PushLogUtils.java @@ -531,7 +531,11 @@ public class PushLogUtils { dailydigests.put(dateStr, new DailyLogEntry(repositoryName, date)); } PushLogEntry digest = dailydigests.get(dateStr); - digest.updateRef(branch, ReceiveCommand.Type.UPDATE, commit.getParents()[0].getId().getName(), commit.getName()); + if (commit.getParentCount() == 0) { + digest.updateRef(branch, ReceiveCommand.Type.CREATE); + } else { + digest.updateRef(branch, ReceiveCommand.Type.UPDATE, commit.getParents()[0].getId().getName(), commit.getName()); + } RepositoryCommit repoCommit = digest.addCommit(branch, commit); if (repoCommit != null) { repoCommit.setRefs(allRefs.get(commit.getId())); diff --git a/src/main/java/com/gitblit/wicket/GitBlitWebApp.properties b/src/main/java/com/gitblit/wicket/GitBlitWebApp.properties index 036af264..2fe2293c 100644 --- a/src/main/java/com/gitblit/wicket/GitBlitWebApp.properties +++ b/src/main/java/com/gitblit/wicket/GitBlitWebApp.properties @@ -477,6 +477,7 @@ gb.pushedNewTag = pushed new tag gb.createdNewTag = created new tag gb.deletedTag = deleted tag gb.pushedNewBranch = pushed new branch +gb.createdNewBranch = created new branch gb.deletedBranch = deleted branch gb.rewind = REWIND gb.star = star diff --git a/src/main/java/com/gitblit/wicket/panels/PushesPanel.java b/src/main/java/com/gitblit/wicket/panels/PushesPanel.java index 423c44b4..7bac70e0 100644 --- a/src/main/java/com/gitblit/wicket/panels/PushesPanel.java +++ b/src/main/java/com/gitblit/wicket/panels/PushesPanel.java @@ -171,8 +171,13 @@ public class PushesPanel extends BasePanel { preposition = "gb.to"; } } else { - what = getString("gb.pushedNewBranch"); - preposition = "gb.to"; + if (isDigest) { + what = getString("gb.createdNewBranch"); + preposition = "gb.in"; + } else { + what = getString("gb.pushedNewBranch"); + preposition = "gb.to"; + } } break; case DELETE: -- cgit v1.2.3