opendev/gerrit
Code Issues Proposed changes

Merge "Merge branch 'stable-2.6' into stable-2.7" into stable-2.7

Browse Source
This commit is contained in:
Dave Borowitz
2013-09-18 17:40:57 +00:00
committed by Gerrit Code Review
parent 72fa3c2422 88976d45be
commit 3347628510
3 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Documentation/prolog-cookbook.txt
View File

@@ -303,11 +303,11 @@ Testing submit rules
The prolog environment running the `submit_rule` is loaded with state describing the The prolog environment running the `submit_rule` is loaded with state describing the
change that is being evaluated. The easiest way to load this state is to test your change that is being evaluated. The easiest way to load this state is to test your
`submit_rule` against a real change on a running gerrit instance. The command `submit_rule` against a real change on a running gerrit instance. The command
link:cmd-test-submit-rule.html[test-submit-rule] loads a specific change and executes link:cmd-test-submit-rule.html[test-submit rule] loads a specific change and executes
the `submit_rule`. It optionally reads the rule from from `stdin` to facilitate easy testing. the `submit_rule`. It optionally reads the rule from from `stdin` to facilitate easy testing.
==== ====
cat rules.pl | ssh gerrit_srv gerrit test-submit-rule I45e080b105a50a625cc8e1fb5b357c0bfabe6d68 -s cat rules.pl | ssh gerrit_srv gerrit test-submit rule I45e080b105a50a625cc8e1fb5b357c0bfabe6d68 -s
==== ====
Prolog vs Gerrit plugin for project specific submit rules Prolog vs Gerrit plugin for project specific submit rules

4
gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/AdminConstants.properties
View File

@@ -22,8 +22,8 @@ projects = All projects
projectRepoBrowser = Repository Browser projectRepoBrowser = Repository Browser
useContentMerge = Automatically resolve conflicts useContentMerge = Automatically resolve conflicts
useContributorAgreements = Require a valid contributor agreement to upload useContributorAgreements = Require a valid contributor agreement to upload
useSignedOffBy = Require <a href="http://gerrit-documentation.googlecode.com/svn/Documentation/2.5/user-signedoffby.html#Signed-off-by" target="_blank"><code>Signed-off-by</code></a> in commit message useSignedOffBy = Require <code>Signed-off-by</code> in commit message
requireChangeID = Require <a href="http://gerrit-documentation.googlecode.com/svn/Documentation/2.5/user-changeid.html" target="_blank"><code>Change-Id</code></a> in commit message requireChangeID = Require <code>Change-Id</code> in commit message
headingGroupOptions = Group Options headingGroupOptions = Group Options
isVisibleToAll = Make group visible to all registered users. isVisibleToAll = Make group visible to all registered users.
buttonSaveGroupOptions = Save Group Options buttonSaveGroupOptions = Save Group Options

4
gerrit-server/src/main/java/com/google/gerrit/server/changedetail/DeleteDraftPatchSet.java
View File

@@ -112,9 +112,7 @@ public class DeleteDraftPatchSet implements Callable<ReviewResult> {
} }
if (change.currentPatchSetId().equals(patchSetId)) { if (change.currentPatchSetId().equals(patchSetId)) {
try { try {
PatchSet.Id id = change.setCurrentPatchSet(patchSetInfoFactory.get(db, highestId));
new PatchSet.Id(patchSetId.getParentKey(), patchSetId.get() - 1);
change.setCurrentPatchSet(patchSetInfoFactory.get(db, id));
} catch (PatchSetInfoNotAvailableException e) { } catch (PatchSetInfoNotAvailableException e) {
throw new NoSuchChangeException(changeId); throw new NoSuchChangeException(changeId);
} }