aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Fick <mfick@codeaurora.org>2011-08-02 13:22:05 -0700
committerAndroid Code Review <code-review@android.com>2011-08-02 13:22:05 -0700
commit55b35eeddb31377423f0c4b3df844319ed3f2723 (patch)
tree3af7ec42fd948c30b114773d1c048588e9960846
parent76dae2dac3c7bd80df5ee2f642d331d8cfc6205f (diff)
parentad9f33713553919ef9959abc14794de2a47267b2 (diff)
downloadgerrit-55b35eeddb31377423f0c4b3df844319ed3f2723.tar.gz
Merge "Output patchset creation date for 'query' command."
-rw-r--r--gerrit-server/src/main/java/com/google/gerrit/server/events/EventFactory.java1
-rw-r--r--gerrit-server/src/main/java/com/google/gerrit/server/events/PatchSetAttribute.java1
-rw-r--r--gerrit-server/src/main/java/com/google/gerrit/server/query/change/QueryProcessor.java3
3 files changed, 4 insertions, 1 deletions
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/events/EventFactory.java b/gerrit-server/src/main/java/com/google/gerrit/server/events/EventFactory.java
index ba9fa2cf..2740d7f2 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/events/EventFactory.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/events/EventFactory.java
@@ -174,6 +174,7 @@ public class EventFactory {
p.number = Integer.toString(patchSet.getPatchSetId());
p.ref = patchSet.getRefName();
p.uploader = asAccountAttribute(patchSet.getUploader());
+ p.createdOn = patchSet.getCreatedOn().getTime() / 1000L;
return p;
}
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/events/PatchSetAttribute.java b/gerrit-server/src/main/java/com/google/gerrit/server/events/PatchSetAttribute.java
index a6d0eca7..ee293146 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/events/PatchSetAttribute.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/events/PatchSetAttribute.java
@@ -21,6 +21,7 @@ public class PatchSetAttribute {
public String revision;
public String ref;
public AccountAttribute uploader;
+ public Long createdOn;
public List<ApprovalAttribute> approvals;
public List<PatchSetCommentAttribute> comments;
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/QueryProcessor.java b/gerrit-server/src/main/java/com/google/gerrit/server/query/change/QueryProcessor.java
index 20db0f9e..2abec9a1 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/QueryProcessor.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/query/change/QueryProcessor.java
@@ -345,7 +345,8 @@ public class QueryProcessor {
private static boolean isDateField(String name) {
return "lastUpdated".equals(name) //
|| "grantedOn".equals(name) //
- || "timestamp".equals(name);
+ || "timestamp".equals(name) //
+ || "createdOn".equals(name);
}
private List<Field> fieldsOf(Class<?> type) {