James Moger
2013-05-31 b5a318c0e6340dc546323ea2ccd3861e55beff62
Gracefully handle branch creation in daily log digests
3 files modified
16 ■■■■ changed files
src/main/java/com/gitblit/utils/PushLogUtils.java 6 ●●●● patch | view | raw | blame | history
src/main/java/com/gitblit/wicket/GitBlitWebApp.properties 1 ●●●● patch | view | raw | blame | history
src/main/java/com/gitblit/wicket/panels/PushesPanel.java 9 ●●●● patch | view | raw | blame | history
src/main/java/com/gitblit/utils/PushLogUtils.java
@@ -531,7 +531,11 @@
                    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()));
src/main/java/com/gitblit/wicket/GitBlitWebApp.properties
@@ -477,6 +477,7 @@
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
src/main/java/com/gitblit/wicket/panels/PushesPanel.java
@@ -171,8 +171,13 @@
                            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: