From b6f01308af902f6a34df5e749a4e5f2841663f7d Mon Sep 17 00:00:00 2001 From: David Ostrovsky Date: Wed, 27 Nov 2013 21:22:06 +0100 Subject: [PATCH 1/4] Remove deprecated approve SSH alias Change-Id: I540c8e9f1476c17cfd64079f513de8bd48ce774d --- Documentation/cmd-index.txt | 3 --- .../com/google/gerrit/sshd/commands/MasterCommandModule.java | 2 -- 2 files changed, 5 deletions(-) diff --git a/Documentation/cmd-index.txt b/Documentation/cmd-index.txt index 3ba66a84ab..2395fca3b5 100644 --- a/Documentation/cmd-index.txt +++ b/Documentation/cmd-index.txt @@ -51,9 +51,6 @@ see link:user-upload.html#test_ssh[Testing Your SSH Connection]. [[user_commands]]User Commands ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -'gerrit approve':: - 'Deprecated alias for `gerrit review`.' - link:cmd-ban-commit.html[gerrit ban-commit]:: Bans a commit from a project's repository. diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/MasterCommandModule.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/MasterCommandModule.java index abe202e1cc..a8d5c4de8d 100644 --- a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/MasterCommandModule.java +++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/MasterCommandModule.java @@ -36,8 +36,6 @@ public class MasterCommandModule extends CommandModule { command(gerrit, Receive.class); command(gerrit, AdminSetParent.class); command(gerrit, ReviewCommand.class); - // deprecated alias to review command - alias(gerrit, "approve", ReviewCommand.class); command(gerrit, SetAccountCommand.class); command(gerrit, SetMembersCommand.class); command(gerrit, SetProjectCommand.class); From a752b326f7cf38b2205b67f782e7a252b2541b9d Mon Sep 17 00:00:00 2001 From: Matt Baker Date: Wed, 27 Nov 2013 19:19:31 -0700 Subject: [PATCH 2/4] Fixed several spelling mistakes Change-Id: I82c0819b8ea7d58120929efefba42b135a79f42e --- Documentation/config-login-register.txt | 4 ++-- Documentation/dev-design.txt | 4 ++-- Documentation/intro-change-screen.txt | 4 ++-- Documentation/user-signedoffby.txt | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Documentation/config-login-register.txt b/Documentation/config-login-register.txt index 867f0d4864..1011985db9 100644 --- a/Documentation/config-login-register.txt +++ b/Documentation/config-login-register.txt @@ -1,6 +1,6 @@ [[usersetup]] -Inital Login ------------- +Initial Login +------------- It's time to exit the gerrit2 account as you now have Gerrit running on your host and setup your first workspace. diff --git a/Documentation/dev-design.txt b/Documentation/dev-design.txt index 3cb58b15f7..efc55c0bbb 100644 --- a/Documentation/dev-design.txt +++ b/Documentation/dev-design.txt @@ -455,7 +455,7 @@ Scalability ----------- Gerrit is designed for a very large scale open source project, or -large commerical development project. Roughly this amounts to +large commercial development project. Roughly this amounts to parameters such as the following: .Design Parameters @@ -614,7 +614,7 @@ Disk Usage The average size of a revision in the Linux kernel once compressed by Git is 2,327 bytes, or roughly 2 KiB. Over the course of a year a -Gerrit server running with the estimated maxium parameters above might +Gerrit server running with the estimated maximum parameters above might see an introduction of 1.4 GiB over the total set of 10,000 projects hosted in that server. This figure assumes the majority of the content is human written source code, and not large binary blobs such as disk diff --git a/Documentation/intro-change-screen.txt b/Documentation/intro-change-screen.txt index 3a255e0947..a3173cfc54 100644 --- a/Documentation/intro-change-screen.txt +++ b/Documentation/intro-change-screen.txt @@ -91,7 +91,7 @@ Reply button ------------ This button corresponds to the 'Review' button the on patch set panel on the old -change screen. The only new feature: the user can optionaly send an email +change screen. The only new feature: the user can optionally send an email during the vote. Key bindings: "a" to open the drop down. "ESC" to close it. @@ -108,7 +108,7 @@ Key bindings: "e" to open the drop down. "ESC" to close it. [[star-change]] Star change icon allows to star the change, so that "starredby:self" query can -retrieve the ctarred changes later. If the change is aleady starred, then +retrieve the starred changes later. If the change is already starred, then clicking the icon again unstars the change. Key bindings: "s" to star/unstar the change. diff --git a/Documentation/user-signedoffby.txt b/Documentation/user-signedoffby.txt index 56858bf1a8..cc9a4b103e 100644 --- a/Documentation/user-signedoffby.txt +++ b/Documentation/user-signedoffby.txt @@ -78,7 +78,7 @@ you are responsible for last-minute changes. Example : Signed-off-by: Lucky K Maintainer ---- -This practise is particularly helpful if you maintain a stable branch and +This practice is particularly helpful if you maintain a stable branch and want at the same time to credit the author, track changes, merge the fix, and protect the submitter from complaints. Note that under no circumstances can you change the author's identity (the From header), as it is the one From 6a0467f4642bd138f7678b4b22a3dc303709b038 Mon Sep 17 00:00:00 2001 From: David Pursehouse Date: Thu, 28 Nov 2013 12:16:43 +0900 Subject: [PATCH 3/4] Update documentation of the `review` command The documentation states that the 'CHANGEID,PATCHSET' format for specifying a patch set is 'legacy' and planned to be removed. However, since there are cases where it is not possible to uniquely identify a patch set by sha1, the CHANGEID,PATCHSET format still needs to be supported. Remove the section stating that the 'CHANGEID,PATCHSET' format is legacy. Change-Id: Ie89a69c12a3e566bd5e0c47eb8a79f4b217bd6b7 --- Documentation/cmd-review.txt | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/Documentation/cmd-review.txt b/Documentation/cmd-review.txt index 70213da41a..e14daeff7a 100644 --- a/Documentation/cmd-review.txt +++ b/Documentation/cmd-review.txt @@ -25,16 +25,14 @@ Updates the current user's approval status of the specified patch sets and/or submits them for merging, sending out email notifications and updating the database. -Patch sets should be specified as complete or abbreviated commit -SHA-1s. If the same commit is available in multiple projects the ---project option may be used to limit where Gerrit searches for -the change to only the contents of the specified project. +Patch sets may be specified in 'CHANGEID,PATCHSET' format, such as +'8242,2', or 'COMMIT' format. + +If a patch set is specified with the 'COMMIT' format, the complete +or abbreviated commit SHA-1 may be used. If the same commit is available +in multiple projects the `--project` option may be used to limit where +Gerrit searches for the change to only the contents of the specified project. -For current backward compatibility with user tools patch sets may -also be specified in the legacy 'CHANGEID,PATCHSET' format, such as -'8242,2'. Support for this legacy format is planned to be removed -in a future edition of Gerrit Code Review. Use of commit SHA-1s -is strongly encouraged. OPTIONS ------- From 737f3f5d9e0a6ef2d48b1ce7bf57279dfdf4934c Mon Sep 17 00:00:00 2001 From: David Pursehouse Date: Thu, 28 Nov 2013 10:15:12 +0900 Subject: [PATCH 4/4] Update the 2.8 release notes with recently merged changes Change-Id: I457b62e79fbfec8b2b140f2ac3627514fb923568 --- ReleaseNotes/ReleaseNotes-2.8.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ReleaseNotes/ReleaseNotes-2.8.txt b/ReleaseNotes/ReleaseNotes-2.8.txt index 68b62c87f1..a92e9d5629 100644 --- a/ReleaseNotes/ReleaseNotes-2.8.txt +++ b/ReleaseNotes/ReleaseNotes-2.8.txt @@ -526,6 +526,10 @@ link:https://gerrit-documentation.storage.googleapis.com/Documentation/2.8/cmd-s * The link:https://gerrit-documentation.storage.googleapis.com/Documentation/2.8/cmd-show-queue.html[ `show-queue` command] now shows the time that a task was added to the queue. +* The deprecated `approve` alias of the `review` command is removed. + +* The 'CHANGEID,PATCHSET' format for specifying a patch set in the `review` command +is no longer considered to be a 'legacy' feature that will be removed in future. Daemon ~~~~~~