Merge branch 'stable'

* stable:
  Update 2.1.4 release notes
  Don't escape ':' as %253A in query anchors
  Direct default links to queries
  Update to JGit 0.8.4.89-ge2f5716

Conflicts:
	pom.xml

Change-Id: If17a036b72c512c4861c9ca66b18ae72af4a9377

8 files changed, 44 insertions, 32 deletions

diff --git a/ReleaseNotes/ReleaseNotes-2.1.4.txt b/ReleaseNotes/ReleaseNotes-2.1.4.txt
index d882d56f..d4cf741c 100644
--- a/ReleaseNotes/ReleaseNotes-2.1.4.txt
+++ b/ReleaseNotes/ReleaseNotes-2.1.4.txt
@@ -80,6 +80,8 @@ into a commit message.
 
 * issue 559 Allow copying user public ssh key to clipboard
 
+* issue 509 Make branch columns link to changes on that branch
+
 Email Notifications
 ~~~~~~~~~~~~~~~~~~~
 
@@ -129,6 +131,11 @@ be inserted at that position.  When combined with the Push Branch
 permission this creates a per-user branch namespace feature, giving
 each user their own "sandbox" to push changes to.
 
+* issue 313 ssh gerrit create-group
++
+Groups can now be created over SSH by administrators using the
+`gerrit create-group` command.
+
 Authentication
 ~~~~~~~~~~~~~~
 
@@ -174,7 +181,7 @@ SSH still requires `git` on the remote host's PATH.
 
 * Internal dependencies updated
 +
-Updated JGit to 0.8.4.87-g395d236, log4j to 1.2.16, GWT to 2.0.4,
+Updated JGit to 0.8.4.89-ge2f5716, log4j to 1.2.16, GWT to 2.0.4,
 sfl4j to 1.6.1, easymock to 3.0, JUnit to 4.8.1.
 
 Bug Fixes
@@ -195,6 +202,15 @@ the prettify syntax highlighting library.  We moved the prettify
 library into its own iframe so it has a different JavaScript namespace
 in the browser.
 
+* Close button on OpenId register / sign-in dialog
++
+There was no obvious way to leave the sign-in dialog. Fixed.
+
+* Links in OpenId sign-in dialog not focusable
++
+Keyboard navigation to standard links like 'Google Accounts'
+wasn't supported.  Fixed.
+
 Misc.
 ~~~~~
 
@@ -206,4 +222,4 @@ when a fetch/pull/clone or push request timed out.  Fixed.
 Version
 -------
 
-df89f998d5c0fa5802a70482d4582b6313a018e4
+ae59d1bf232bba16d4d03ca924884234c68be0f2
diff --git a/gerrit-common/src/main/java/com/google/gerrit/common/PageLinks.java b/gerrit-common/src/main/java/com/google/gerrit/common/PageLinks.java
index 43541b7b..0f292142 100644
--- a/gerrit-common/src/main/java/com/google/gerrit/common/PageLinks.java
+++ b/gerrit-common/src/main/java/com/google/gerrit/common/PageLinks.java
@@ -38,14 +38,6 @@ public class PageLinks {
   public static final String TOP = "n,z";
 
   public static final String MINE = "mine";
-  public static final String MINE_STARRED = "mine,starred";
-  public static final String MINE_DRAFTS = "mine,drafts";
-  public static final String MINE_WATCHED = "mine,watched," + TOP;
-
-  public static final String ALL_ABANDONED = "all,abandoned," + TOP;
-  public static final String ALL_MERGED = "all,merged," + TOP;
-  public static final String ALL_OPEN = "all,open," + TOP;
-
   public static final String ADMIN_GROUPS = "admin,groups";
   public static final String ADMIN_PROJECTS = "admin,projects";
 
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/Dispatcher.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/Dispatcher.java
index f93fd5eb..383a226b 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/Dispatcher.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/Dispatcher.java
@@ -17,8 +17,6 @@ package com.google.gerrit.client;
 import static com.google.gerrit.common.PageLinks.ADMIN_GROUPS;
 import static com.google.gerrit.common.PageLinks.ADMIN_PROJECTS;
 import static com.google.gerrit.common.PageLinks.MINE;
-import static com.google.gerrit.common.PageLinks.MINE_DRAFTS;
-import static com.google.gerrit.common.PageLinks.MINE_STARRED;
 import static com.google.gerrit.common.PageLinks.REGISTER;
 import static com.google.gerrit.common.PageLinks.SETTINGS;
 import static com.google.gerrit.common.PageLinks.SETTINGS_AGREEMENTS;
@@ -157,10 +155,10 @@ public class Dispatcher {
         return r;
       }
 
-    } else if (MINE_STARRED.equals(token)) {
+    } else if ("mine,starred".equals(token)) {
       return QueryScreen.forQuery("is:starred");
 
-    } else if (MINE_DRAFTS.equals(token)) {
+    } else if ("mine,drafts".equals(token)) {
       return QueryScreen.forQuery("has:draft");
 
     } else {
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/Gerrit.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/Gerrit.java
index ecb4cd61..ec6b9ed4 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/Gerrit.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/Gerrit.java
@@ -223,8 +223,11 @@ public class Gerrit implements EntryPoint {
 
     KeyUtil.setEncoderImpl(new KeyUtil.Encoder() {
       @Override
-      public String encode(final String e) {
-        return fixPathImpl(URL.encodeComponent(e));
+      public String encode(String e) {
+        e = URL.encodeComponent(e);
+        e = fixPathImpl(e);
+        e = fixColonImpl(e);
+        return e;
       }
 
       @Override
@@ -234,6 +237,9 @@ public class Gerrit implements EntryPoint {
 
       private native String fixPathImpl(String path)
       /*-{ return path.replace(/%2F/g, "/"); }-*/;
+
+      private native String fixColonImpl(String path)
+      /*-{ return path.replace(/%3A/g, ":"); }-*/;
     });
 
     initHostname();
@@ -400,7 +406,7 @@ public class Gerrit implements EntryPoint {
       if (isSignedIn()) {
         display(PageLinks.MINE);
       } else {
-        display(PageLinks.ALL_OPEN);
+        display(PageLinks.toChangeQuery("status:open"));
       }
     } else {
       display(History.getToken());
@@ -416,17 +422,17 @@ public class Gerrit implements EntryPoint {
     LinkMenuBar m;
 
     m = new LinkMenuBar();
-    addLink(m, C.menuAllOpen(), PageLinks.ALL_OPEN);
-    addLink(m, C.menuAllMerged(), PageLinks.ALL_MERGED);
-    addLink(m, C.menuAllAbandoned(), PageLinks.ALL_ABANDONED);
+    addLink(m, C.menuAllOpen(), PageLinks.toChangeQuery("status:open"));
+    addLink(m, C.menuAllMerged(), PageLinks.toChangeQuery("status:merged"));
+    addLink(m, C.menuAllAbandoned(), PageLinks.toChangeQuery("status:abandoned"));
     menuLeft.add(m, C.menuAll());
 
     if (signedIn) {
       m = new LinkMenuBar();
       addLink(m, C.menuMyChanges(), PageLinks.MINE);
-      addLink(m, C.menuMyDrafts(), PageLinks.MINE_DRAFTS);
-      addLink(m, C.menuMyWatchedChanges(), PageLinks.MINE_WATCHED);
-      addLink(m, C.menuMyStarredChanges(), PageLinks.MINE_STARRED);
+      addLink(m, C.menuMyDrafts(), PageLinks.toChangeQuery("has:draft"));
+      addLink(m, C.menuMyWatchedChanges(), PageLinks.toChangeQuery("is:watched status:open"));
+      addLink(m, C.menuMyStarredChanges(), PageLinks.toChangeQuery("is:starred"));
       menuLeft.add(m, C.menuMine());
       menuLeft.selectTab(1);
     } else {
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/JumpKeys.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/JumpKeys.java
index 3ec53727..873045dd 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/JumpKeys.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/JumpKeys.java
@@ -29,19 +29,19 @@ class JumpKeys {
     jumps.add(new KeyCommand(0, 'o', Gerrit.C.jumpAllOpen()) {
       @Override
       public void onKeyPress(final KeyPressEvent event) {
-        Gerrit.display(PageLinks.ALL_OPEN);
+        Gerrit.display(PageLinks.toChangeQuery("status:open"));
       }
     });
     jumps.add(new KeyCommand(0, 'm', Gerrit.C.jumpAllMerged()) {
       @Override
       public void onKeyPress(final KeyPressEvent event) {
-        Gerrit.display(PageLinks.ALL_MERGED);
+        Gerrit.display(PageLinks.toChangeQuery("status:merged"));
       }
     });
     jumps.add(new KeyCommand(0, 'a', Gerrit.C.jumpAllAbandoned()) {
       @Override
       public void onKeyPress(final KeyPressEvent event) {
-        Gerrit.display(PageLinks.ALL_ABANDONED);
+        Gerrit.display(PageLinks.toChangeQuery("status:abandoned"));
       }
     });
 
@@ -55,19 +55,19 @@ class JumpKeys {
       jumps.add(new KeyCommand(0, 'd', Gerrit.C.jumpMineDrafts()) {
         @Override
         public void onKeyPress(final KeyPressEvent event) {
-          Gerrit.display(PageLinks.MINE_DRAFTS);
+          Gerrit.display(PageLinks.toChangeQuery("has:draft"));
         }
       });
       jumps.add(new KeyCommand(0, 'w', Gerrit.C.jumpMineWatched()) {
         @Override
         public void onKeyPress(final KeyPressEvent event) {
-          Gerrit.display(PageLinks.MINE_WATCHED);
+          Gerrit.display(PageLinks.toChangeQuery("is:watched status:open"));
         }
       });
       jumps.add(new KeyCommand(0, 's', Gerrit.C.jumpMineStarred()) {
         @Override
         public void onKeyPress(final KeyPressEvent event) {
-          Gerrit.display(PageLinks.MINE_STARRED);
+          Gerrit.display(PageLinks.toChangeQuery("is:starred"));
         }
       });
     }
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/ChangeScreen.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/ChangeScreen.java
index ae2dd119..36d36815 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/ChangeScreen.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/ChangeScreen.java
@@ -356,7 +356,7 @@ public class ChangeScreen extends Screen {
       if (Gerrit.isSignedIn()) {
         Gerrit.display(PageLinks.MINE);
       } else {
-        Gerrit.display(PageLinks.ALL_OPEN);
+        Gerrit.display(PageLinks.toChangeQuery("status:open"));
       }
     }
   }
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/Screen.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/Screen.java
index a52b4ba6..a854abcc 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/Screen.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/Screen.java
@@ -119,7 +119,7 @@ public abstract class Screen extends View {
   /** Invoked if this screen is the current screen and the user signs out. */
   public void onSignOut() {
     if (isRequiresSignIn()) {
-      History.newItem(PageLinks.ALL_OPEN);
+      History.newItem(PageLinks.toChangeQuery("status:open"));
     }
   }
 
diff --git a/pom.xml b/pom.xml
index ee4dd655..beab0438 100644
--- a/pom.xml
+++ b/pom.xml
@@ -46,7 +46,7 @@ limitations under the License.
   </issueManagement>
 
   <properties>
-    <jgitVersion>0.8.4.240-g8e9cc82</jgitVersion>
+    <jgitVersion>0.8.4.242-g09130b8</jgitVersion>
     <gwtormVersion>1.1.4</gwtormVersion>
     <gwtjsonrpcVersion>1.2.2</gwtjsonrpcVersion>
     <gwtexpuiVersion>1.2.1</gwtexpuiVersion>