Merge "SideBySide2: Disable browser selection and rely on CM3"

Documentation/dev-buck.txt

diff --git a/Documentation/dev-buck.txt b/Documentation/dev-buck.txt
index 611d64d..7b4981a 100644
--- a/Documentation/dev-buck.txt
+++ b/Documentation/dev-buck.txt
@@ -7,7 +7,7 @@
 
 There is currently no binary distribution of Buck, so it has to be manually
 built and installed.  Apache Ant is required.  Currently only Linux and Mac
-OS are supported.
+OS are supported.  Gerrit's buck wrappers require Python version 2.6 or higher.
 
 Clone the git and build it:
 
@@ -130,7 +130,7 @@
 ----
 
 Java binaries, Java sources and Java docs are generated into corresponding
-project directories in buck-out/gen, here as example for plugin API:
+project directories in `buck-out/gen`, here as example for plugin API:
 
 ----
   buck-out/gen/gerrit-plugin-api/plugin-api.jar
@@ -144,7 +144,7 @@
   buck build api_install
 ----
 
-Deploy {extension,plugin,gwt}-api to the remote maven repository
+Deploy {extension,plugin,gwt}-api to the remote maven repository:
 
 ----
   buck build api_deploy
@@ -154,6 +154,11 @@
 * 2.9-SNAPSHOT: snapshot repo
 * 2.9: release repo
 
+Deploying to the remote repository still depends on Maven, and the credentials
+for the repository need to be
+link:dev-release-deploy-config.html#deploy-configuration-settings-xml[
+configured in Maven's settings.xml file].
+
 Plugins
 ~~~~~~~
 

Documentation/dev-readme.txt

diff --git a/Documentation/dev-readme.txt b/Documentation/dev-readme.txt
index e73e039..10455c0 100644
--- a/Documentation/dev-readme.txt
+++ b/Documentation/dev-readme.txt
@@ -28,6 +28,23 @@
 link:dev-buck.html#build[Building on the command line with Buck].
 
 
+Switching between branches
+--------------------------
+
+When switching between branches with `git checkout`, be aware that
+submodule revisions are not altered.  This may result in the wrong
+plugin revisions being present, unneeded plugins being present, or
+expected plugins being missing.
+
+After switching branches, make sure the submodules are at the correct
+revisions for the new branch with the commands:
+
+----
+  git submodule update
+  git clean -fdx
+----
+
+
 Configuring Eclipse
 -------------------
 

gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/DiffTable.ui.xml

diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/DiffTable.ui.xml b/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/DiffTable.ui.xml
index ca64207..05ea366 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/DiffTable.ui.xml
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/DiffTable.ui.xml
@@ -24,6 +24,7 @@
     @external .cm-searching, .cm-trailingspace, .cm-tab;
 
     .fullscreen {
+      background-color: #f7f7f7;
       border-bottom: 1px solid #ddd;
     }
 

gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/PreferencesAction.java

diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/PreferencesAction.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/PreferencesAction.java
index 68a24f5..069e204 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/PreferencesAction.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/PreferencesAction.java
@@ -61,7 +61,7 @@
     popup.setPopupPositionAndShow(new PositionCallback() {
       @Override
       public void setPosition(int offsetWidth, int offsetHeight) {
-        popup.setPopupPosition(390, 120);
+        popup.setPopupPosition(300, 120);
       }
     });
     current.setFocus(true);

gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/SideBySide2.java

diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/SideBySide2.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/SideBySide2.java
index fea1909..4a8b8a1 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/SideBySide2.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/SideBySide2.java
@@ -1285,6 +1285,7 @@
         if (cm.somethingSelected()) {
           lineActiveBoxMap.put(handle,
               addNewDraft(cm, line, fromTo.getTo().getLine() == line ? fromTo : null));
+          cm.setSelection(cm.getCursor());
         } else if (box == null) {
           lineActiveBoxMap.put(handle, addNewDraft(cm, line, null));
         } else if (box instanceof DraftBox) {

gerrit-gwtui/src/main/java/net/codemirror/lib/CodeMirror.java

diff --git a/gerrit-gwtui/src/main/java/net/codemirror/lib/CodeMirror.java b/gerrit-gwtui/src/main/java/net/codemirror/lib/CodeMirror.java
index 6ff6f72..28f5096c 100644
--- a/gerrit-gwtui/src/main/java/net/codemirror/lib/CodeMirror.java
+++ b/gerrit-gwtui/src/main/java/net/codemirror/lib/CodeMirror.java
@@ -209,6 +209,10 @@
     return FromTo.create(getCursor("start"), getCursor("end"));
   }
 
+  public final native void setSelection(LineCharacter lineCh) /*-{
+    this.setSelection(lineCh);
+  }-*/;
+
   public final native void setCursor(LineCharacter lineCh) /*-{
     this.setCursor(lineCh);
   }-*/;