Merge branch 'stable-2.6'

* stable-2.6:
  Fix ls-user-refs command name in documentation
  Mark project and user options as required for LsUserRefs
  Fix setting account's full name via ssh
  TrivialRebase: tidy up docstrings to follow PEP-0257

Change-Id: Ibd4563a8418e823d700082bc4fbcf465085d4719

4 files changed, 21 insertions, 19 deletions

diff --git a/Documentation/cmd-ls-user-refs.txt b/Documentation/cmd-ls-user-refs.txt
index c0e072d268..25a99d1205 100644
--- a/Documentation/cmd-ls-user-refs.txt
+++ b/Documentation/cmd-ls-user-refs.txt
@@ -8,7 +8,7 @@ gerrit ls-user-refs - List refs visible to a specific user
 SYNOPSIS
 --------
 [verse]
-'ssh' -p <port> <host> 'gerrit ls-user-ref'
+'ssh' -p <port> <host> 'gerrit ls-user-refs'
   [--project PROJECT> | -p <PROJECT>]
   [--user <USER> | -u <USER>]
   [--only-refs-heads]
@@ -31,11 +31,11 @@ OPTIONS
 -------
 --project::
 -p::
-	Name of the project for which the refs should be listed.
+	Required; Name of the project for which the refs should be listed.
 
 --user::
 -u::
-	User for which the visible refs should be listed. Gerrit
+	Required; User for which the visible refs should be listed. Gerrit
 	will query the database to find matching users, so the
 	full identity/name does not need to be specified.
 
diff --git a/contrib/trivial_rebase.py b/contrib/trivial_rebase.py
index e5005a3f4a..7764470430 100755
--- a/contrib/trivial_rebase.py
+++ b/contrib/trivial_rebase.py
@@ -27,12 +27,14 @@
 # OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
 # IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-# This script is designed to detect when a patchset uploaded to Gerrit is
-# 'identical' (determined via git-patch-id) and reapply reviews onto the new
-# patchset from the previous patchset.
+""" This script is designed to detect when a patchset uploaded to Gerrit is
+'identical' (determined via git-patch-id) and reapply reviews onto the new
+patchset from the previous patchset.
 
-# Get usage and help info by running: ./trivial_rebase.py --help
-# Documentation is available here: https://www.codeaurora.org/xwiki/bin/QAEP/Gerrit
+Get usage and help info by running: ./trivial_rebase.py --help
+Documentation is available here: https://www.codeaurora.org/xwiki/bin/QAEP/Gerrit
+
+"""
 
 import argparse
 import json
@@ -88,6 +90,7 @@ class TrivialRebase:
     """Like subprocess.check_call() but returns stdout.
 
     Works on python 2.4
+
     """
     try:
       process = subprocess.Popen(command, cwd=cwd, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
@@ -99,7 +102,7 @@ class TrivialRebase:
     return std_out, std_err
 
   def GsqlQuery(self, sql_query):
-    """Runs a gerrit gsql query and returns the result"""
+    """Run a gerrit gsql query and return the result."""
     gsql_cmd = [self.ssh, self.ssh_port_flag, self.port, self.server, 'gerrit', 'gsql',
                 '--format', 'JSON', '-c', sql_query]
     try:
@@ -113,7 +116,7 @@ class TrivialRebase:
     return new_out.split('split here\n')
 
   def FindPrevRev(self):
-    """Finds the revision of the previous patch set on the change"""
+    """Find the revision of the previous patch set on the change."""
     sql_query = ("\"SELECT revision FROM patch_sets WHERE "
                  "change_id = %s AND patch_set_id = %s\"" %
                  (self.changeId, (self.patchset - 1)))
@@ -123,9 +126,11 @@ class TrivialRebase:
     return json_dict["columns"]["revision"]
 
   def GetApprovals(self):
-    """Get all the approvals on a specific patch set
+    """Get all the approvals on a specific patch set.
 
-    Returns a list of approval dicts"""
+    Returns a list of approval dicts.
+
+    """
     sql_query = ("\"SELECT value,account_id,category_id FROM patch_set_approvals "
                  "WHERE change_id = %s AND patch_set_id = %s AND value != 0\""
                  % (self.changeId, (self.patchset - 1)))
@@ -145,7 +150,7 @@ class TrivialRebase:
     self.acct_approvals[account_id] = newval
 
   def GetEmailFromAcctId(self, account_id):
-    """Returns the preferred email address associated with the account_id"""
+    """Return the preferred email address associated with the account_id."""
     sql_query = ("\"SELECT preferred_email FROM accounts WHERE account_id = %s\""
                  % account_id)
     email_addr = self.GsqlQuery(sql_query)
diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/LsUserRefs.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/LsUserRefs.java
index 2be3d86f5f..58abf9580a 100644
--- a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/LsUserRefs.java
+++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/LsUserRefs.java
@@ -58,11 +58,11 @@ public class LsUserRefs extends SshCommand {
   private ChangeCache changeCache;
 
   @Option(name = "--project", aliases = {"-p"}, metaVar = "PROJECT",
-      usage = "project for which the refs should be listed")
+      required = true, usage = "project for which the refs should be listed")
   private ProjectControl projectControl;
 
   @Option(name = "--user", aliases = {"-u"},  metaVar = "USER",
-      usage = "user for which the groups should be listed")
+      required = true, usage = "user for which the groups should be listed")
   private String userName;
 
   @Option(name = "--only-refs-heads", usage = "list only refs under refs/heads")
@@ -73,10 +73,6 @@ public class LsUserRefs extends SshCommand {
 
   @Override
   protected void run() throws Failure {
-    if (userName == null || projectControl == null) {
-      throw new UnloggedFailure(1, "fatal: --user and --project options must be used.");
-    }
-
     Account userAccount = null;
     try {
       userAccount = accountResolver.find(userName);
diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/SetAccountCommand.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/SetAccountCommand.java
index 8b8e1d2616..a3e9d6ef23 100644
--- a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/SetAccountCommand.java
+++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/SetAccountCommand.java
@@ -147,6 +147,7 @@ final class SetAccountCommand extends BaseCommand {
     if (fullName != null) {
       if (realm.allowsEdit(FieldName.FULL_NAME)) {
         account.setFullName(fullName);
+        accountUpdated = true;
       } else {
         throw new UnloggedFailure(1, "The realm doesn't allow editing names");
       }