From f66e89662c091e082bd1d2feb6ac91513ccff273 Mon Sep 17 00:00:00 2001
From: Rafael Cavazin <rafaelcavazin@gmail.com>
Date: Sun, 21 Jul 2013 09:59:00 -0400
Subject: [PATCH] Merge branch 'master' of https://github.com/gitblit/gitblit
---
src/main/java/com/gitblit/models/DailyLogEntry.java | 81 ++++++++++++++++++++++++++++++++++++++++
1 files changed, 81 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/gitblit/models/DailyLogEntry.java b/src/main/java/com/gitblit/models/DailyLogEntry.java
new file mode 100644
index 0000000..41f1381
--- /dev/null
+++ b/src/main/java/com/gitblit/models/DailyLogEntry.java
@@ -0,0 +1,81 @@
+/*
+ * Copyright 2013 gitblit.com.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.gitblit.models;
+
+import java.io.Serializable;
+import java.util.Date;
+
+import org.eclipse.jgit.lib.PersonIdent;
+import org.eclipse.jgit.transport.ReceiveCommand;
+
+/**
+ * Model class to simulate a push for presentation in the push log news feed
+ * for a repository that does not have a Gitblit push log. Commits are grouped
+ * by date and may be additionally split by ref.
+ *
+ * @author James Moger
+ */
+public class DailyLogEntry extends RefLogEntry implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ public DailyLogEntry(String repository, Date date) {
+ super(repository, date, new UserModel("digest"));
+ }
+
+ public DailyLogEntry(String repository, Date date, UserModel user) {
+ super(repository, date, user);
+ }
+
+ @Override
+ public PersonIdent getCommitterIdent() {
+ if (getAuthorCount() == 1) {
+ return getCommits().get(0).getCommitterIdent();
+ }
+
+ return super.getCommitterIdent();
+ }
+
+ @Override
+ public PersonIdent getAuthorIdent() {
+ if (getAuthorCount() == 1) {
+ return getCommits().get(0).getAuthorIdent();
+ }
+
+ return super.getAuthorIdent();
+ }
+
+ /**
+ * Tracks the change type for the specified ref.
+ *
+ * @param ref
+ * @param type
+ * @param oldId
+ * @param newId
+ */
+ public void updateRef(String ref, ReceiveCommand.Type type, String oldId, String newId) {
+ // daily digests are filled from most recent to oldest
+ String preservedNewId = getNewId(ref);
+ if (preservedNewId == null) {
+ // no preserved new id, this is newest commit
+ // for this ref
+ preservedNewId = newId;
+ }
+ refUpdates.put(ref, type);
+ refIdChanges.put(ref, oldId + "-" + preservedNewId);
+ }
+
+}
--
Gitblit v1.9.1