From f00dee4c8ea03b822a9ea30f0ac810dbd3376b03 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hugo=20Ar=C3=A8s?= <hugo.ares@ericsson.com>
Date: Wed, 14 Sep 2016 09:00:46 -0400
Subject: [PATCH 1/3] Print proper name for QuerySource tasks in show-queue
 command

Before this commit, the tasks name were printed like this:

com.google.gerrit.lucene.LuceneChangeIndex$QuerySource$1@77352d29

Now, the Lucene query is printed, example:

((status:new OR status:draft) owner:1000001)

Change-Id: I9a08a8eef08af5dba9b0948b9ae445a807fe8b87
---
 .../gerrit/lucene/LuceneChangeIndex.java      | 20 +++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/gerrit-lucene/src/main/java/com/google/gerrit/lucene/LuceneChangeIndex.java b/gerrit-lucene/src/main/java/com/google/gerrit/lucene/LuceneChangeIndex.java
index c8099d2189..6af320f480 100644
--- a/gerrit-lucene/src/main/java/com/google/gerrit/lucene/LuceneChangeIndex.java
+++ b/gerrit-lucene/src/main/java/com/google/gerrit/lucene/LuceneChangeIndex.java
@@ -367,8 +367,7 @@ public class LuceneChangeIndex implements ChangeIndex {
     if (!Sets.intersection(statuses, CLOSED_STATUSES).isEmpty()) {
       indexes.add(closedIndex);
     }
-    return new QuerySource(indexes, queryBuilder.toQuery(p), opts,
-        getSort());
+    return new QuerySource(indexes, p, opts, getSort());
   }
 
   @Override
@@ -401,14 +400,18 @@ public class LuceneChangeIndex implements ChangeIndex {
 
   private class QuerySource implements ChangeDataSource {
     private final List<SubIndex> indexes;
+    private final Predicate<ChangeData> predicate;
     private final Query query;
     private final QueryOptions opts;
     private final Sort sort;
 
-    private QuerySource(List<SubIndex> indexes, Query query, QueryOptions opts,
-        Sort sort) {
+
+    private QuerySource(List<SubIndex> indexes, Predicate<ChangeData> predicate,
+        QueryOptions opts, Sort sort) throws QueryParseException {
       this.indexes = indexes;
-      this.query = checkNotNull(query, "null query from Lucene");
+      this.predicate = predicate;
+      this.query = checkNotNull(queryBuilder.toQuery(predicate),
+          "null query from Lucene");
       this.opts = opts;
       this.sort = sort;
     }
@@ -425,7 +428,7 @@ public class LuceneChangeIndex implements ChangeIndex {
 
     @Override
     public String toString() {
-      return query.toString();
+      return predicate.toString();
     }
 
     @Override
@@ -440,6 +443,11 @@ public class LuceneChangeIndex implements ChangeIndex {
             public List<Document> call() throws OrmException {
               return doRead();
             }
+
+            @Override
+            public String toString() {
+              return predicate.toString();
+            }
           }));
     }
 

From 437a1306405e81246aeb8a569cbba2c4b01784a3 Mon Sep 17 00:00:00 2001
From: David Pursehouse <dpursehouse@collab.net>
Date: Wed, 14 Sep 2016 00:20:40 +0200
Subject: [PATCH 2/3] Unified: Set lineWrapping according to user preferences

Change-Id: Ie5e65804ac9d4921a71dc02c45fa8851c8c01a59
---
 .../src/main/java/com/google/gerrit/client/diff/Unified.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/Unified.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/Unified.java
index 64233c993f..a231580065 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/Unified.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/Unified.java
@@ -236,7 +236,7 @@ public class Unified extends DiffScreen {
         .set("inputStyle", "textarea")
         .set("keyMap", "vim_ro")
         .set("lineNumbers", false)
-        .set("lineWrapping", false)
+        .set("lineWrapping", prefs.lineWrapping())
         .set("matchBrackets", prefs.matchBrackets())
         .set("mode", getFileSize() == FileSize.SMALL ? getContentType(meta) : null)
         .set("readOnly", true)

From 756cb5bac15b6576bdd7b7e011d5b0352d52769b Mon Sep 17 00:00:00 2001
From: David Pursehouse <dpursehouse@collab.net>
Date: Wed, 14 Sep 2016 17:05:26 +0200
Subject: [PATCH 3/3] WebLinks: Prevent NPE when file history weblink is null

Change-Id: Ib10ae08934bc517b05eb598da428b2085ef4d0b5
---
 .../src/main/java/com/google/gerrit/server/WebLinks.java       | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/WebLinks.java b/gerrit-server/src/main/java/com/google/gerrit/server/WebLinks.java
index 6057f81b3e..761f2a3d54 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/WebLinks.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/WebLinks.java
@@ -159,6 +159,9 @@ public class WebLinks {
             WebLinkInfo info =
                 ((FileHistoryWebLink) webLink).getFileHistoryWebLink(project,
                     revision, file);
+            if (info == null) {
+              return null;
+            }
             WebLinkInfoCommon commonInfo = new WebLinkInfoCommon();
             commonInfo.name = info.name;
             commonInfo.imageUrl = info.imageUrl;