diff --git a/BUILD b/BUILD index c3c774a..5b420a7 100644 --- a/BUILD +++ b/BUILD @@ -11,7 +11,7 @@ gerrit_plugin( "Implementation-Title: Qt Code Review Flow Plugin", "Implementation-URL: https://codereview.qt-project.org/p/qtqa/gerrit-plugin-qt-workflow.git", ], - resources = glob(["src/main/**/*"]), + resources = glob(["src/main/resources/**/*"]), ) junit_tests( diff --git a/README.md b/README.md index faaaa55..72a370a 100644 --- a/README.md +++ b/README.md @@ -71,16 +71,14 @@ Building the Java Plugin * have a gerrit checkout and clone the plugin to plugins/gerrit-plugin-qt-workflow (we should add it as submodule when it's done) - * run "bazel build plugins/gerrit-plugin-qt-workflow" + * run "bazelisk build plugins/gerrit-plugin-qt-workflow" * the binary will be "bazel-genfiles/plugins/gerrit-plugin-qt-workflow/gerrit-plugin-qt-workflow.jar" Building Gerrit - * run "bazel build release" + * run "bazelisk build release" * copy binary file to the gerrit site directory: "cp bazel-bin/release.war thedir/bin/gerrit.war" Working with the local development environment - * Setup database - https://codereview.qt-project.org/Documentation/install.html#createdb * Init test site https://gerrit-review.googlesource.com/Documentation/dev-readme.html#init * Set access righs for test projects: @@ -98,22 +96,18 @@ ssh -p 29418 admin@localhost gerrit-plugin-qt-workflow staging-approve --branch master --build-id b001 --project JustTest --result pass ssh -p 29418 admin@localhost gerrit stream-events ssh -p 29418 admin@localhost gerrit index changes 17 26 27 28 - * useful Git commands - git pull --recurse-submodules - git clone ssh://admin@localhost:29418/arepo.git - git push origin HEAD:refs/for/master + * Fetching staging and builds refs to work area. git fetch -f origin refs/staging/*:refs/staging/* git fetch -f origin refs/builds/*:refs/builds/* - git fetch origin - git reset --hard origin/master * Running tests: - bazel test --test_output=streamed //plugins/gerrit-plugin-qt-workflow:* + bazelisk test --test_output=streamed //plugins/gerrit-plugin-qt-workflow:* + * Running a single test, for example: + bazelisk test --test_output=streamed //plugins/gerrit-plugin-qt-workflow:qtcodereview_tests --test_filter=singleChange_Defer_QtAbandon * Test coverage: install genhtml tool, for example: brew install lcov - run: bazel coverage //plugins/gerrit-plugin-qt-workflow:* - cd plugins/gerrit-plugin-qt-workflow - ./tools/coverage.sh thecoveragefile.dat - => html report available at ./coverage/index.html + run: bazelisk coverage //plugins/gerrit-plugin-qt-workflow:* + genhtml -o ./coveragedir --ignore-errors source thegeneratedcoveragefile.dat + => html report available at ./coveragedir/index.html ## Installation @@ -125,17 +119,8 @@ rebuild with the patches. The plan is to upstream these changes. Access rights: - * FIXME: Stage/Unstage requires push permission to refs/staging/* branch - we should instead have an explicit staging right * Defer/Reopen requires same permissions as abandon * CI needs the permission to created references (refs/builds/*), push to branches (refs/heads/*) and force push to staging refs (refs/staging/*) Copy static files into the site dir: cp gerrit-plugin-qt-workflow/static/* gerritsitedir/static/ - -## Open Items - - * Events are needed for staged, integrating and deferred status changes - * There is currently no rights management for when to show the staging button - * In testing the staging branch was not created automatically - * Are email notifications needed for deferred, reopened status changes? - * automated tests for UI? diff --git a/qt-gerrit-ui-plugin/qt-gerrit-ui-plugin.html b/qt-gerrit-ui-plugin/qt-gerrit-ui-plugin.html deleted file mode 100644 index 9bedbb9..0000000 --- a/qt-gerrit-ui-plugin/qt-gerrit-ui-plugin.html +++ /dev/null @@ -1,165 +0,0 @@ -// -// Copyright (C) 2019 The Qt Company -// -// This plugin provides UI customization for codereview.qt-project.org -// - - - - diff --git a/qt-gerrit-ui-plugin/qt-gerrit-ui-plugin.js b/qt-gerrit-ui-plugin/qt-gerrit-ui-plugin.js new file mode 100644 index 0000000..e724756 --- /dev/null +++ b/qt-gerrit-ui-plugin/qt-gerrit-ui-plugin.js @@ -0,0 +1,341 @@ +// +// Copyright (C) 2019-22 The Qt Company +// +// This plugin provides UI customization for codereview.qt-project.org +// + +'use strict'; + +var BUTTONS = [ + 'gerrit-plugin-qt-workflow~abandon', + 'gerrit-plugin-qt-workflow~defer', + 'gerrit-plugin-qt-workflow~reopen', + 'gerrit-plugin-qt-workflow~stage', + 'gerrit-plugin-qt-workflow~unstage', + 'gerrit-plugin-qt-workflow~precheck' +]; + +Gerrit.install(plugin => { + + plugin.buttons = null; + + function htmlToElement(html) { + var template = document.createElement('template'); + html = html.trim(); // No white space + template.innerHTML = html; + return template.content.firstChild; + } + + // Customize header + plugin.hook('header-title', {replace: true} ).onAttached(element => { + const css_str = ''; + const html_str = '
\ +
Code Review
\ +
'; + var elem = htmlToElement(css_str); + element.appendChild(elem); + elem = htmlToElement(html_str); + element.appendChild(elem); + }); + + // Hide Sanity Bot review score row by default in reply dialog + plugin.hook('review-label-scores-sanity-review').onAttached(element => { + const html = '
\ +
more...
\ + \ +
'; + var wrapper_elem = document.createElement('div'); + wrapper_elem.innerHTML = html; + + // Place the sanity review label elements inside the new wrapper element. + // When upgrading to a new Gerrit release use, "console.log(element)" to debug structure of the elements + var sanity_elem_root = element.parentNode.host; + var child_elem; + while (sanity_elem_root.childNodes.length) { + child_elem = sanity_elem_root.removeChild(sanity_elem_root.childNodes[0]); + wrapper_elem.querySelector("#sanitybotreviewscorediv").appendChild(child_elem); + } + sanity_elem_root.appendChild(wrapper_elem); + + // Install click listener to show the score buttons when clicking on more. + var more_button_handler = wrapper_elem.querySelector("#review-label-scores-sanity-review-more-button"); + var more_button_div = wrapper_elem.querySelector("#sanitybotreviewmorediv"); + var review_score_div = wrapper_elem.querySelector("#sanitybotreviewscorediv"); + more_button_handler.addEventListener("click", function() { + more_button_div.style.display = "none"; + review_score_div.style.display = "block"; + }); + }); + + // Customize change view + plugin.on('show-revision-actions', function(revisionActions, changeInfo) { + var actions = Object.assign({}, revisionActions, changeInfo.actions); + var cActions = plugin.changeActions(); + + // always hide the rebase button + cActions.setActionHidden('revision', 'rebase', true); + + // Hide 'Sanity-Review+1' button in header + var secondaryActionsElem = cActions.el.root; + if (secondaryActionsElem && + secondaryActionsElem.innerHTML && + secondaryActionsElem.innerHTML.indexOf('Sanity-Review+1') != -1) { + cActions.hideQuickApproveAction(); + } + + // Remove any existing buttons + if (plugin.buttons) { + BUTTONS.forEach((key) => { + if (typeof plugin.buttons[key] !== 'undefined' && plugin.buttons[key] !== null) { + cActions.removeTapListener(plugin.buttons[key], (param) => {} ); + cActions.remove(plugin.buttons[key]); + plugin.buttons[key] = null; + } + }); + } else plugin.buttons = []; + + function onPrecheckBtn(c) { + plugin.popup('precheck-dialog').then((v) => { + const dialog = v.popup.querySelector('#precheckdialog') + const confirmBtn = dialog.querySelector('#confirmBtn') + const cancelBtn = dialog.querySelector('#cancelBtn') + + dialog.querySelector('#typeSelect').addEventListener('change', (event) => { + const typeSelect = event.currentTarget.value; + const checkboxes = dialog.querySelector('#checkboxes'); + if (typeSelect === 'custom') { + checkboxes.hidden = false; + } else { + checkboxes.hidden = true; + } + }); + + // The gerrit plugin popup api does not delete the dom elements + // a manual deleting is needed or the ids confuse the scripts. + document.addEventListener('iron-overlay-canceled', (event) => { + v.popup.remove(); + }); + + confirmBtn.addEventListener('click', function onOpen() { + confirmBtn.disabled = true + confirmBtn.setAttribute('loading'); + + plugin.restApi().post(actions["gerrit-plugin-qt-workflow~precheck"].__url, { + type: dialog.querySelector('#typeSelect').value, + onlyBuild: dialog.querySelector('#BuildOnlyCheckBox').checked, + platforms: dialog.querySelector('#PlatformsInput').value + }).then(() => { + confirmBtn.removeAttribute('loading'); + confirmBtn.disabled = false; + window.location.reload(true); + }).catch((failed_resp) => { + this.dispatchEvent( + new CustomEvent('show-alert', { + detail: {message: failed_resp}, + composed: true, + bubbles: true, + }) + ); + }); + }); + + cancelBtn.addEventListener('click', function onOpen() { + v.close() + v.popup.remove(); + }); + }); + } + + function createPrecheck() { + // Avoids defining precheck module twice which would cause exception. + // This would happend during some UI actions e.g. opening edit mode. + var precheck = customElements.get('precheck-dialog') + if (precheck) { + return + } + + Polymer({ + is: 'precheck-dialog', + + ready: function() { + this.innerHTML = ` + +
+ +
+
+
Precheck
+

Select the precheck type. Default will run targets from precheck.yaml, equal to full if yaml not found. + Full will run all targets. Custom will allow manual selection of the targets.

+
+

+
+
+
+
+ + +
+
+ +
+
+
+ Confirm + Cancel +
+
+ +
`; + } + }); + + plugin.registerDynamicCustomComponent('precheck-dialog', 'precheck-dialog'); + } + + // Add buttons based on server response + BUTTONS.forEach((key) => { + var action = actions[key]; + if (action) { + // hide dropdown action + cActions.setActionHidden(action.__type, action.__key, true); + + // add button + plugin.buttons[key] = cActions.add(action.__type, action.label); + cActions.setTitle(plugin.buttons[key], action.title); + cActions.setEnabled(plugin.buttons[key], action.enabled===true); + if (key === 'gerrit-plugin-qt-workflow~precheck') { + createPrecheck() + cActions.addTapListener(plugin.buttons[key], onPrecheckBtn); + } else { + cActions.addTapListener(plugin.buttons[key], buttonEventCallback); + } + + if (key === 'gerrit-plugin-qt-workflow~stage') { + // use the submit icon for our stage button + cActions.setIcon(plugin.buttons[key], 'submit'); + // hide submit button when it would be disabled next to the stage button + let submit = actions['submit']; + if (!submit.enabled) { + cActions.setActionHidden('revision', 'submit', true); + } + } + + } + }); + + function buttonEventCallback(event) { + var button_key = event.type.substring(0, event.type.indexOf('-tap')); + var button_action = null; + var button_index; + for (var k in plugin.buttons) { + if (plugin.buttons[k] === button_key) { + button_action = actions[k]; + button_index = k; + break; + } + } + if (button_action) { + const buttonEl = this.shadowRoot.querySelector(`[data-action-key="${button_key}"]`); + buttonEl.setAttribute('loading', true); + buttonEl.disabled = true; + plugin.restApi().post(button_action.__url, {}) + .then((ok_resp) => { + buttonEl.removeAttribute('loading'); + buttonEl.disabled = false; + window.location.reload(true); + }).catch((failed_resp) => { + buttonEl.removeAttribute('loading'); + buttonEl.disabled = false; + this.dispatchEvent( + new CustomEvent('show-alert', { + detail: {message: failed_resp}, + composed: true, + bubbles: true, + }) + ); + }); + } else console.log('unexpected error: no action'); + } + }); +}); diff --git a/src/main/java/com/googlesource/gerrit/plugins/qtcodereview/QtAbandon.java b/src/main/java/com/googlesource/gerrit/plugins/qtcodereview/QtAbandon.java index 9df4a9a..2a5a1d3 100644 --- a/src/main/java/com/googlesource/gerrit/plugins/qtcodereview/QtAbandon.java +++ b/src/main/java/com/googlesource/gerrit/plugins/qtcodereview/QtAbandon.java @@ -1,18 +1,19 @@ // -// Copyright (C) 2019 The Qt Company +// Copyright (C) 2019-22 The Qt Company // package com.googlesource.gerrit.plugins.qtcodereview; -import com.google.common.base.Strings; import com.google.common.flogger.FluentLogger; +import com.google.gerrit.entities.Change; +import com.google.gerrit.exceptions.StorageException; import com.google.gerrit.extensions.api.changes.AbandonInput; import com.google.gerrit.extensions.common.ChangeInfo; import com.google.gerrit.extensions.restapi.ResourceConflictException; +import com.google.gerrit.extensions.restapi.Response; import com.google.gerrit.extensions.restapi.RestApiException; +import com.google.gerrit.extensions.restapi.RestModifyView; import com.google.gerrit.extensions.webui.UiAction; -import com.google.gerrit.reviewdb.client.Change; -import com.google.gerrit.reviewdb.server.ReviewDb; import com.google.gerrit.server.ChangeMessagesUtil; import com.google.gerrit.server.ChangeUtil; import com.google.gerrit.server.PatchSetUtil; @@ -21,100 +22,94 @@ import com.google.gerrit.server.permissions.ChangePermission; import com.google.gerrit.server.permissions.PermissionBackendException; import com.google.gerrit.server.update.BatchUpdate; -import com.google.gerrit.server.update.RetryHelper; -import com.google.gerrit.server.update.RetryingRestModifyView; import com.google.gerrit.server.update.UpdateException; import com.google.gerrit.server.util.time.TimeUtil; -import com.google.gwtorm.server.OrmException; import com.google.inject.Inject; -import com.google.inject.Provider; import com.google.inject.Singleton; import java.io.IOException; - // Standard Abandon is not allowed if already in a closed state // This class handles transition from DEFERRED to ABANDONED @Singleton -public class QtAbandon extends RetryingRestModifyView - implements UiAction { - private static final FluentLogger logger = FluentLogger.forEnclosingClass(); - - private final Provider dbProvider; - private final ChangeJson.Factory json; - private final PatchSetUtil psUtil; - private final QtChangeUpdateOp.Factory qtUpdateFactory; - - @Inject - QtAbandon(Provider dbProvider, - ChangeJson.Factory json, - RetryHelper retryHelper, - PatchSetUtil psUtil, - QtChangeUpdateOp.Factory qtUpdateFactory) { - super(retryHelper); - this.dbProvider = dbProvider; - this.json = json; - this.psUtil = psUtil; - this.qtUpdateFactory = qtUpdateFactory; +public class QtAbandon + implements RestModifyView, UiAction { + private static final FluentLogger logger = FluentLogger.forEnclosingClass(); + + private final BatchUpdate.Factory updateFactory; + private final ChangeJson.Factory json; + private final PatchSetUtil psUtil; + private final QtChangeUpdateOp.Factory qtUpdateFactory; + + @Inject + QtAbandon( + BatchUpdate.Factory updateFactory, + ChangeJson.Factory json, + PatchSetUtil psUtil, + QtChangeUpdateOp.Factory qtUpdateFactory) { + this.updateFactory = updateFactory; + this.json = json; + this.psUtil = psUtil; + this.qtUpdateFactory = qtUpdateFactory; + } + + @Override + public Response apply(ChangeResource rsrc, AbandonInput input) + throws RestApiException, UpdateException, PermissionBackendException, IOException { + Change change = rsrc.getChange(); + logger.atInfo().log("abandon %s", change); + + // Not allowed to abandon if the current patch set is locked. + psUtil.checkPatchSetNotLocked(rsrc.getNotes()); + + rsrc.permissions().check(ChangePermission.ABANDON); + + if (change.getStatus() != Change.Status.DEFERRED) { + logger.atSevere().log("change %s status wrong %s", change.getId(), change.getStatus()); + throw new ResourceConflictException("change is " + ChangeUtil.status(change)); + } + + QtChangeUpdateOp op = + qtUpdateFactory.create( + Change.Status.ABANDONED, + null, + "Abandoned", + input.message, + ChangeMessagesUtil.TAG_ABANDON, + null); + try (BatchUpdate u = + updateFactory.create(change.getProject(), rsrc.getUser(), TimeUtil.nowTs())) { + u.addOp(rsrc.getId(), op).execute(); } - @Override - protected ChangeInfo applyImpl(BatchUpdate.Factory updateFactory, - ChangeResource rsrc, - AbandonInput input) - throws RestApiException, UpdateException, - OrmException, PermissionBackendException, - IOException { - Change change = rsrc.getChange(); - logger.atInfo().log("qtcodereview: abandon %s", change); - - // Not allowed to abandon if the current patch set is locked. - psUtil.checkPatchSetNotLocked(rsrc.getNotes()); - - rsrc.permissions().database(dbProvider).check(ChangePermission.ABANDON); - - if (change.getStatus() != Change.Status.DEFERRED) { - logger.atSevere().log("qtcodereview: qtabandon: change %s status wrong %s", change, change.getStatus()); - throw new ResourceConflictException("change is " + ChangeUtil.status(change)); - } - - QtChangeUpdateOp op = qtUpdateFactory.create(Change.Status.ABANDONED, - null, - "Abandoned", - input.message, - ChangeMessagesUtil.TAG_ABANDON, - null); - try (BatchUpdate u = updateFactory.create(dbProvider.get(), change.getProject(), rsrc.getUser(), TimeUtil.nowTs())) { - u.addOp(rsrc.getId(), op).execute(); - } - - logger.atInfo().log("qtcodereview: abandoned %s", change); - - change = op.getChange(); - return json.noOptions().format(change); + logger.atInfo().log("abandoned change %s,%s", change.getId(), change.getKey()); + + change = op.getChange(); + return Response.ok(json.noOptions().format(change)); + } + + @Override + public UiAction.Description getDescription(ChangeResource rsrc) { + UiAction.Description description = + new UiAction.Description() + .setLabel("Abandon") + .setTitle("Abandon the change") + .setVisible(false); + Change change = rsrc.getChange(); + if (change.getStatus() != Change.Status.DEFERRED) { + return description; } - @Override - public UiAction.Description getDescription(ChangeResource rsrc) { - UiAction.Description description = new UiAction.Description() - .setLabel("Abandon") - .setTitle("Abandon the change") - .setVisible(false) - .setEnabled(false); - Change change = rsrc.getChange(); - if (change.getStatus() != Change.Status.DEFERRED) { - return description; - } - - try { - if (psUtil.isPatchSetLocked(rsrc.getNotes())) { - return description; - } - } catch (OrmException | IOException e) { - logger.atSevere().withCause(e).log("Failed to check if the current patch set of change %s is locked", change.getId()); - return description; - } - - return description.setVisible(rsrc.permissions().testOrFalse(ChangePermission.ABANDON)); + try { + if (psUtil.isPatchSetLocked(rsrc.getNotes())) { + return description; + } + } catch (StorageException e) { + logger.atSevere().withCause(e).log( + "Failed to check if the current patch set of change %s is locked", change.getId()); + return description; } + + return description.setVisible(rsrc.permissions().testOrFalse(ChangePermission.ABANDON)); + } } diff --git a/src/main/java/com/googlesource/gerrit/plugins/qtcodereview/QtBuildFailedEmailTemplateRegister.java b/src/main/java/com/googlesource/gerrit/plugins/qtcodereview/QtBuildFailedEmailTemplateRegister.java new file mode 100644 index 0000000..3c7d697 --- /dev/null +++ b/src/main/java/com/googlesource/gerrit/plugins/qtcodereview/QtBuildFailedEmailTemplateRegister.java @@ -0,0 +1,23 @@ +// +// Copyright (C) 2022 The Qt Company +// + +package com.googlesource.gerrit.plugins.qtcodereview; + +import com.google.gerrit.server.mail.send.MailSoyTemplateProvider; +import java.util.HashSet; +import java.util.Set; + +public class QtBuildFailedEmailTemplateRegister implements MailSoyTemplateProvider { + + public String getPath() { + return "mail"; + } + + public Set getFileNames() { + Set set = new HashSet<>(); + set.add("QtBuildFailed.soy"); + set.add("QtBuildFailedHtml.soy"); + return set; + } +} diff --git a/src/main/java/com/googlesource/gerrit/plugins/qtcodereview/QtBuildFailedSender.java b/src/main/java/com/googlesource/gerrit/plugins/qtcodereview/QtBuildFailedSender.java index eea7082..8e55016 100644 --- a/src/main/java/com/googlesource/gerrit/plugins/qtcodereview/QtBuildFailedSender.java +++ b/src/main/java/com/googlesource/gerrit/plugins/qtcodereview/QtBuildFailedSender.java @@ -1,60 +1,54 @@ // -// Copyright (C) 2019 The Qt Company +// Copyright (C) 2019-22 The Qt Company // package com.googlesource.gerrit.plugins.qtcodereview; -import com.google.gerrit.common.errors.EmailException; -import com.google.gerrit.reviewdb.client.Change; -import com.google.gerrit.reviewdb.client.Project; -import com.google.gerrit.server.account.ProjectWatches.NotifyType; +import com.google.gerrit.entities.Change; +import com.google.gerrit.entities.NotifyConfig.NotifyType; +import com.google.gerrit.entities.Project; +import com.google.gerrit.exceptions.EmailException; import com.google.gerrit.server.mail.send.EmailArguments; import com.google.gerrit.server.mail.send.ReplyToChangeSender; -import com.google.gwtorm.server.OrmException; import com.google.inject.Inject; import com.google.inject.assistedinject.Assisted; - import java.util.ArrayList; import java.util.List; // Send email when build has failed public class QtBuildFailedSender extends ReplyToChangeSender { - public interface Factory { - QtBuildFailedSender create(Project.NameKey project, Change.Id id); - } - - @Inject - public QtBuildFailedSender(EmailArguments ea, - @Assisted Project.NameKey project, - @Assisted Change.Id id) - throws OrmException { - super(ea, "comment", newChangeData(ea, project, id)); - } - - @Override - protected void init() throws EmailException { - super.init(); - - ccAllApprovals(); - bccStarredBy(); - includeWatchers(NotifyType.ALL_COMMENTS); - removeUsersThatIgnoredTheChange(); - } - - @Override - protected void formatChange() throws EmailException { - appendText(textTemplate("Comment")); - } - - @Override - protected void setupSoyContext() { - super.setupSoyContext(); - List emptyList = new ArrayList<>(); - soyContext.put("commentFiles", emptyList); - } - - @Override - protected boolean supportsHtml() { - return false; + public interface Factory { + QtBuildFailedSender create(Project.NameKey project, Change.Id id); + } + + @Inject + public QtBuildFailedSender( + EmailArguments ea, @Assisted Project.NameKey project, @Assisted Change.Id id) { + super(ea, "qtbuildfailed", newChangeData(ea, project, id)); + } + + @Override + protected void init() throws EmailException { + super.init(); + + ccAllApprovals(); + bccStarredBy(); + includeWatchers(NotifyType.ALL_COMMENTS); + removeUsersThatIgnoredTheChange(); + } + + @Override + protected void formatChange() throws EmailException { + appendText(textTemplate("QtBuildFailed")); + if (useHtml()) { + appendHtml(soyHtmlTemplate("QtBuildFailedHtml")); } + } + + @Override + protected void setupSoyContext() { + super.setupSoyContext(); + List emptyList = new ArrayList<>(); + soyContext.put("commentFiles", emptyList); + } } diff --git a/src/main/java/com/googlesource/gerrit/plugins/qtcodereview/QtChangeIntegrationFailEvent.java b/src/main/java/com/googlesource/gerrit/plugins/qtcodereview/QtChangeIntegrationFailEvent.java new file mode 100644 index 0000000..f877314 --- /dev/null +++ b/src/main/java/com/googlesource/gerrit/plugins/qtcodereview/QtChangeIntegrationFailEvent.java @@ -0,0 +1,20 @@ +// +// Copyright (C) 2020 The Qt Company +// + +package com.googlesource.gerrit.plugins.qtcodereview; + +import com.google.common.base.Supplier; +import com.google.gerrit.entities.Change; +import com.google.gerrit.server.data.AccountAttribute; +import com.google.gerrit.server.events.PatchSetEvent; + +public class QtChangeIntegrationFailEvent extends PatchSetEvent { + public static final String TYPE = "change-integration-fail"; + public Supplier submitter; + public String newRev; + + public QtChangeIntegrationFailEvent(Change change) { + super(TYPE, change); + } +} diff --git a/src/main/java/com/googlesource/gerrit/plugins/qtcodereview/QtChangeIntegrationPassEvent.java b/src/main/java/com/googlesource/gerrit/plugins/qtcodereview/QtChangeIntegrationPassEvent.java new file mode 100644 index 0000000..ab3fb64 --- /dev/null +++ b/src/main/java/com/googlesource/gerrit/plugins/qtcodereview/QtChangeIntegrationPassEvent.java @@ -0,0 +1,20 @@ +// +// Copyright (C) 2020 The Qt Company +// + +package com.googlesource.gerrit.plugins.qtcodereview; + +import com.google.common.base.Supplier; +import com.google.gerrit.entities.Change; +import com.google.gerrit.server.data.AccountAttribute; +import com.google.gerrit.server.events.PatchSetEvent; + +public class QtChangeIntegrationPassEvent extends PatchSetEvent { + public static final String TYPE = "change-integration-pass"; + public Supplier submitter; + public String newRev; + + public QtChangeIntegrationPassEvent(Change change) { + super(TYPE, change); + } +} diff --git a/src/main/java/com/googlesource/gerrit/plugins/qtcodereview/QtChangeMessageModifier.java b/src/main/java/com/googlesource/gerrit/plugins/qtcodereview/QtChangeMessageModifier.java index 32cbdd7..7c01e85 100644 --- a/src/main/java/com/googlesource/gerrit/plugins/qtcodereview/QtChangeMessageModifier.java +++ b/src/main/java/com/googlesource/gerrit/plugins/qtcodereview/QtChangeMessageModifier.java @@ -1,31 +1,46 @@ // -// Copyright (C) 2019 The Qt Company +// Copyright (C) 2019-22 The Qt Company // package com.googlesource.gerrit.plugins.qtcodereview; -import com.google.gerrit.reviewdb.client.Branch; +import com.google.gerrit.entities.BranchNameKey; import com.google.gerrit.server.git.ChangeMessageModifier; +import com.google.gerrit.server.project.NoSuchProjectException; +import com.google.inject.Inject; import com.google.inject.Singleton; import org.eclipse.jgit.revwalk.RevCommit; @Singleton -public class QtChangeMessageModifier implements ChangeMessageModifier { +public class QtChangeMessageModifier implements ChangeMessageModifier { - // Remove extra commit message footers - @Override - public String onSubmit(String commitMessage, RevCommit original, RevCommit mergeTip, Branch.NameKey destination) { - StringBuilder stringBuilder = new StringBuilder(""); - String[] lines = commitMessage.split("\n"); + @Inject private com.google.gerrit.server.config.PluginConfigFactory cfg; - for (String line : lines) { - if (!line.startsWith("Reviewed-on: ") && - !line.startsWith("Tested-by: ") && - !line.startsWith("Sanity-Review: ") && - !line.startsWith("ChangeLog: ") ) { - stringBuilder.append(line).append("\n"); - } - } - return stringBuilder.toString(); + // Remove extra commit message footers + @Override + public String onSubmit( + String commitMessage, RevCommit original, RevCommit mergeTip, BranchNameKey destination) { + StringBuilder stringBuilder = new StringBuilder(""); + String[] lines = commitMessage.split("\n"); + + boolean showReviewedOn = false; + try { + showReviewedOn = + cfg.getFromProjectConfigWithInheritance( + destination.project(), "gerrit-plugin-qt-workflow") + .getBoolean("showReviewedOnFooter", false); + } catch (NoSuchProjectException e) { + // Project not found, using default + } + + for (String line : lines) { + if ((!line.startsWith("Reviewed-on: ") || showReviewedOn == true) + && !line.startsWith("Tested-by: ") + && !line.startsWith("Sanity-Review: ") + && !line.startsWith("ChangeLog: ")) { + stringBuilder.append(line).append("\n"); + } } + return stringBuilder.toString(); + } } diff --git a/src/main/java/com/googlesource/gerrit/plugins/qtcodereview/QtChangePreCheckEvent.java b/src/main/java/com/googlesource/gerrit/plugins/qtcodereview/QtChangePreCheckEvent.java new file mode 100644 index 0000000..dbf858b --- /dev/null +++ b/src/main/java/com/googlesource/gerrit/plugins/qtcodereview/QtChangePreCheckEvent.java @@ -0,0 +1,25 @@ +// +// Copyright (C) 2021 The Qt Company +// + +package com.googlesource.gerrit.plugins.qtcodereview; + +import com.google.gerrit.entities.Change; +import com.google.gerrit.extensions.common.InputWithMessage; +import com.google.gerrit.server.events.PatchSetEvent; +import com.googlesource.gerrit.plugins.qtcodereview.QtPrecheckMessage; + +public class QtChangePreCheckEvent extends PatchSetEvent { + public static final String TYPE = "precheck"; + public String commitID = ""; + public String precheckType = ""; + public String platforms = ""; + public boolean onlyBuild = false; + + public QtChangePreCheckEvent(Change change, QtPrecheckMessage message) { + super(TYPE, change); + this.onlyBuild = message.onlyBuild; + this.precheckType = message.type; + this.platforms = message.platforms; + } +} diff --git a/src/main/java/com/googlesource/gerrit/plugins/qtcodereview/QtChangeStagedEvent.java b/src/main/java/com/googlesource/gerrit/plugins/qtcodereview/QtChangeStagedEvent.java new file mode 100644 index 0000000..0f2ed35 --- /dev/null +++ b/src/main/java/com/googlesource/gerrit/plugins/qtcodereview/QtChangeStagedEvent.java @@ -0,0 +1,20 @@ +// +// Copyright (C) 2020 The Qt Company +// + +package com.googlesource.gerrit.plugins.qtcodereview; + +import com.google.common.base.Supplier; +import com.google.gerrit.entities.Change; +import com.google.gerrit.server.data.AccountAttribute; +import com.google.gerrit.server.events.PatchSetEvent; + +public class QtChangeStagedEvent extends PatchSetEvent { + public static final String TYPE = "change-staged"; + public Supplier submitter; + public String newRev; + + public QtChangeStagedEvent(Change change) { + super(TYPE, change); + } +} diff --git a/src/main/java/com/googlesource/gerrit/plugins/qtcodereview/QtChangeUnStagedEvent.java b/src/main/java/com/googlesource/gerrit/plugins/qtcodereview/QtChangeUnStagedEvent.java new file mode 100644 index 0000000..4f04968 --- /dev/null +++ b/src/main/java/com/googlesource/gerrit/plugins/qtcodereview/QtChangeUnStagedEvent.java @@ -0,0 +1,20 @@ +// +// Copyright (C) 2020 The Qt Company +// + +package com.googlesource.gerrit.plugins.qtcodereview; + +import com.google.common.base.Supplier; +import com.google.gerrit.entities.Change; +import com.google.gerrit.server.data.AccountAttribute; +import com.google.gerrit.server.events.PatchSetEvent; + +public class QtChangeUnStagedEvent extends PatchSetEvent { + public static final String TYPE = "change-unstaged"; + public Supplier submitter; + public String newRev; + + public QtChangeUnStagedEvent(Change change) { + super(TYPE, change); + } +} diff --git a/src/main/java/com/googlesource/gerrit/plugins/qtcodereview/QtChangeUpdateOp.java b/src/main/java/com/googlesource/gerrit/plugins/qtcodereview/QtChangeUpdateOp.java index 7301484..0b711a2 100644 --- a/src/main/java/com/googlesource/gerrit/plugins/qtcodereview/QtChangeUpdateOp.java +++ b/src/main/java/com/googlesource/gerrit/plugins/qtcodereview/QtChangeUpdateOp.java @@ -1,28 +1,26 @@ // -// Copyright (C) 2019 The Qt Company +// Copyright (C) 2019-21 The Qt Company // package com.googlesource.gerrit.plugins.qtcodereview; -import com.google.common.base.Strings; import com.google.common.base.Function; -import com.google.common.collect.Iterables; +import com.google.common.base.Strings; import com.google.common.flogger.FluentLogger; import com.google.gerrit.common.Nullable; +import com.google.gerrit.entities.Change; +import com.google.gerrit.entities.LabelId; +import com.google.gerrit.entities.PatchSet; +import com.google.gerrit.entities.PatchSetApproval; +import com.google.gerrit.entities.SubmissionId; import com.google.gerrit.extensions.restapi.ResourceConflictException; -import com.google.gerrit.reviewdb.client.Change; -import com.google.gerrit.reviewdb.client.ChangeMessage; -import com.google.gerrit.reviewdb.client.LabelId; -import com.google.gerrit.reviewdb.client.PatchSet; -import com.google.gerrit.reviewdb.client.PatchSetApproval; -import com.google.gerrit.server.ApprovalsUtil; import com.google.gerrit.server.ChangeMessagesUtil; -import com.google.gerrit.server.git.CodeReviewCommit; +import com.google.gerrit.server.approval.ApprovalsUtil; import com.google.gerrit.server.change.LabelNormalizer; +import com.google.gerrit.server.git.CodeReviewCommit; import com.google.gerrit.server.notedb.ChangeUpdate; import com.google.gerrit.server.update.BatchUpdateOp; import com.google.gerrit.server.update.ChangeContext; -import com.google.gwtorm.server.OrmException; import com.google.inject.Inject; import com.google.inject.assistedinject.Assisted; import java.io.IOException; @@ -31,172 +29,173 @@ public class QtChangeUpdateOp implements BatchUpdateOp { - public interface Factory { - QtChangeUpdateOp create(@Assisted("newStatus") Change.Status newStatus, - @Assisted("oldStatus") Change.Status oldStatus, - @Assisted("defaultMessage") String defaultMessage, - @Assisted("inputMessage") String inputMessage, - @Assisted("tag") String tag, - CodeReviewCommit copyApprovalsFrom); + public interface Factory { + QtChangeUpdateOp create( + @Assisted("newStatus") Change.Status newStatus, + @Assisted("oldStatus") Change.Status oldStatus, + @Assisted("defaultMessage") String defaultMessage, + @Assisted("inputMessage") String inputMessage, + @Assisted("tag") String tag, + CodeReviewCommit copyApprovalsFrom); + } + + private static final FluentLogger logger = FluentLogger.forEnclosingClass(); + + private final Change.Status newStatus; + private final Change.Status oldStatus; + private final String defaultMessage; + private final String inputMessage; + private final String tag; + private CodeReviewCommit copyApprovalsFrom; + + private Change change; + private PatchSetApproval submitter; + + private final ChangeMessagesUtil cmUtil; + private final ApprovalsUtil approvalsUtil; + private final LabelNormalizer labelNormalizer; + + @Inject + QtChangeUpdateOp( + ChangeMessagesUtil cmUtil, + ApprovalsUtil approvalsUtil, + LabelNormalizer labelNormalizer, + @Nullable @Assisted("newStatus") Change.Status newStatus, + @Nullable @Assisted("oldStatus") Change.Status oldStatus, + @Nullable @Assisted("defaultMessage") String defaultMessage, + @Nullable @Assisted("inputMessage") String inputMessage, + @Nullable @Assisted("tag") String tag, + @Nullable @Assisted CodeReviewCommit copyApprovalsFrom) { + this.cmUtil = cmUtil; + this.approvalsUtil = approvalsUtil; + this.labelNormalizer = labelNormalizer; + this.newStatus = newStatus; + this.oldStatus = oldStatus; + this.defaultMessage = defaultMessage; + this.inputMessage = inputMessage; + this.tag = tag; + this.copyApprovalsFrom = copyApprovalsFrom; + } + + public Change getChange() { + return change; + } + + @Override + public boolean updateChange(ChangeContext ctx) throws IOException, ResourceConflictException { + boolean updated = false; + change = ctx.getChange(); + PatchSet.Id psId = change.currentPatchSetId(); + ChangeUpdate update = ctx.getUpdate(psId); + + if (newStatus != null && (oldStatus == null || change.getStatus() == oldStatus)) { + change.setStatus(newStatus); + if (newStatus == Change.Status.MERGED) { + SubmissionId submissionId = new SubmissionId(change); + change.setSubmissionId(submissionId.toString()); + update.fixStatusToMerged(submissionId); + } else { + update.setStatus(newStatus); + } + updated = true; } - private static final FluentLogger logger = FluentLogger.forEnclosingClass(); - - private final Change.Status newStatus; - private final Change.Status oldStatus; - private final String defaultMessage; - private final String inputMessage; - private final String tag; - private CodeReviewCommit copyApprovalsFrom; - - private Change change; - private PatchSetApproval submitter; - - private final ChangeMessagesUtil cmUtil; - private final ApprovalsUtil approvalsUtil; - private final LabelNormalizer labelNormalizer; - - @Inject - QtChangeUpdateOp(ChangeMessagesUtil cmUtil, - ApprovalsUtil approvalsUtil, - LabelNormalizer labelNormalizer, - @Nullable @Assisted("newStatus") Change.Status newStatus, - @Nullable @Assisted("oldStatus") Change.Status oldStatus, - @Nullable @Assisted("defaultMessage") String defaultMessage, - @Nullable @Assisted("inputMessage") String inputMessage, - @Nullable @Assisted("tag") String tag, - @Nullable @Assisted CodeReviewCommit copyApprovalsFrom) { - this.cmUtil = cmUtil; - this.approvalsUtil = approvalsUtil; - this.labelNormalizer = labelNormalizer; - this.newStatus = newStatus; - this.oldStatus = oldStatus; - this.defaultMessage = defaultMessage; - this.inputMessage = inputMessage; - this.tag = tag; - this.copyApprovalsFrom = copyApprovalsFrom; - } - - public Change getChange() { - return change; - } - - @Override - public boolean updateChange(ChangeContext ctx) throws OrmException, IOException, ResourceConflictException { - boolean updated = false; - change = ctx.getChange(); - PatchSet.Id psId = change.currentPatchSetId(); - ChangeUpdate update = ctx.getUpdate(psId); - - if (newStatus != null && (oldStatus == null || change.getStatus() == oldStatus)) { - change.setStatus(newStatus); - update.fixStatus(newStatus); - updated = true; - } + if (copyApprovalsFrom != null) { + Change.Id id = ctx.getChange().getId(); + PatchSet.Id oldPsId = copyApprovalsFrom.getPatchsetId(); - if (copyApprovalsFrom != null) { - Change.Id id = ctx.getChange().getId(); - PatchSet.Id oldPsId = copyApprovalsFrom.getPatchsetId(); + logger.atFine().log("Copy approval for %s oldps=%s newps=%s", id, oldPsId, psId); + ChangeUpdate origPsUpdate = ctx.getUpdate(oldPsId); + LabelNormalizer.Result normalized = approve(ctx, origPsUpdate); - logger.atFine().log("Copy approval for %s oldps=%s newps=%s", id, oldPsId, psId); - ChangeUpdate origPsUpdate = ctx.getUpdate(oldPsId); - LabelNormalizer.Result normalized = approve(ctx, origPsUpdate); + ChangeUpdate newPsUpdate = ctx.getUpdate(psId); - ChangeUpdate newPsUpdate = ctx.getUpdate(psId); - - saveApprovals(normalized, ctx, newPsUpdate, true); - submitter = convertPatchSet(psId).apply(submitter); - updated = true; - } - - if (updated == true) { - change.setLastUpdatedOn(ctx.getWhen()); - } - - if (defaultMessage != null) { - cmUtil.addChangeMessage(ctx.getDb(), update, newMessage(ctx)); - updated = true; - } - - return updated; + saveApprovals(normalized, newPsUpdate, true); + submitter = convertPatchSet(psId).apply(submitter); + updated = true; } - private ChangeMessage newMessage(ChangeContext ctx) { - StringBuilder msg = new StringBuilder(); - msg.append(defaultMessage); - if (!Strings.nullToEmpty(inputMessage).trim().isEmpty()) { - msg.append("\n\n"); - msg.append(inputMessage.trim()); - } - return ChangeMessagesUtil.newMessage(ctx, msg.toString(), tag); + if (updated == true) { + change.setLastUpdatedOn(ctx.getWhen()); } - private LabelNormalizer.Result approve(ChangeContext ctx, ChangeUpdate update) - throws OrmException, IOException { - PatchSet.Id psId = update.getPatchSetId(); - Map byKey = new HashMap<>(); - for (PatchSetApproval psa : approvalsUtil.byPatchSet(ctx.getDb(), - ctx.getNotes(), - psId, - ctx.getRevWalk(), - ctx.getRepoView().getConfig())) { - byKey.put(psa.getKey(), psa); - } - - submitter = ApprovalsUtil.newApproval(psId, ctx.getUser(), LabelId.legacySubmit(), 1, ctx.getWhen()); - byKey.put(submitter.getKey(), submitter); - - LabelNormalizer.Result normalized = labelNormalizer.normalize(ctx.getNotes(), byKey.values()); - update.putApproval(submitter.getLabel(), submitter.getValue()); - saveApprovals(normalized, ctx, update, false); - return normalized; + if (defaultMessage != null) { + cmUtil.setChangeMessage(update, newMessage(ctx), null); + updated = true; } - private void saveApprovals(LabelNormalizer.Result normalized, - ChangeContext ctx, - ChangeUpdate update, - boolean includeUnchanged) - throws OrmException { - PatchSet.Id psId = update.getPatchSetId(); - ctx.getDb().patchSetApprovals().upsert(convertPatchSet(normalized.getNormalized(), psId)); - ctx.getDb().patchSetApprovals().upsert(zero(convertPatchSet(normalized.deleted(), psId))); - for (PatchSetApproval psa : normalized.updated()) { - update.putApprovalFor(psa.getAccountId(), psa.getLabel(), psa.getValue()); - } - for (PatchSetApproval psa : normalized.deleted()) { - update.removeApprovalFor(psa.getAccountId(), psa.getLabel()); - } - - for (PatchSetApproval psa : normalized.unchanged()) { - if (includeUnchanged || psa.isLegacySubmit()) { - logger.atFine().log("Adding submit label %s", psa); - update.putApprovalFor(psa.getAccountId(), psa.getLabel(), psa.getValue()); - } - } - } + return updated; + } - private Function convertPatchSet(final PatchSet.Id psId) { - return psa -> { - if (psa.getPatchSetId().equals(psId)) { - return psa; - } - return new PatchSetApproval(psId, psa); - }; + private String newMessage(ChangeContext ctx) { + StringBuilder msg = new StringBuilder(); + msg.append(defaultMessage); + if (!Strings.nullToEmpty(inputMessage).trim().isEmpty()) { + msg.append("\n\n"); + msg.append(inputMessage.trim()); } - - private Iterable convertPatchSet(Iterable approvals, PatchSet.Id psId) { - return Iterables.transform(approvals, convertPatchSet(psId)); + return msg.toString(); + } + + private LabelNormalizer.Result approve(ChangeContext ctx, ChangeUpdate update) + throws IOException { + PatchSet.Id psId = update.getPatchSetId(); + Map byKey = new HashMap<>(); + for (PatchSetApproval psa : + approvalsUtil.byPatchSet( + ctx.getNotes(), psId, ctx.getRevWalk(), ctx.getRepoView().getConfig())) { + byKey.put(psa.key(), psa); } - private Iterable zero(Iterable approvals) { - return Iterables.transform( - approvals, - a -> { - PatchSetApproval copy = new PatchSetApproval(a.getPatchSetId(), a); - copy.setValue((short) 0); - return copy; - } - ); + submitter = + ApprovalsUtil.newApproval(psId, ctx.getUser(), LabelId.legacySubmit(), 1, ctx.getWhen()) + .build(); + byKey.put(submitter.key(), submitter); + + LabelNormalizer.Result normalized = labelNormalizer.normalize(ctx.getNotes(), byKey.values()); + update.putApproval(submitter.label(), submitter.value()); + saveApprovals(normalized, update, false); + return normalized; + } + + private void saveApprovals( + LabelNormalizer.Result normalized, ChangeUpdate update, boolean includeUnchanged) { + for (PatchSetApproval psa : normalized.updated()) { + update.putApprovalFor(psa.accountId(), psa.label(), psa.value()); + } + for (PatchSetApproval psa : normalized.deleted()) { + update.removeApprovalFor(psa.accountId(), psa.label()); } + for (PatchSetApproval psa : normalized.unchanged()) { + if (includeUnchanged || psa.isLegacySubmit()) { + logger.atFine().log("Adding submit label %s", psa); + update.putApprovalFor(psa.accountId(), psa.label(), psa.value()); + } + } + } + + private Function convertPatchSet(final PatchSet.Id psId) { + return psa -> { + if (psa.patchSetId().equals(psId)) { + return psa; + } + return psa.copyWithPatchSet(psId); + }; + } + + // private Iterable convertPatchSet( + // Iterable approvals, PatchSet.Id psId) { + // return Iterables.transform(approvals, convertPatchSet(psId)); + // } + // + // private Iterable zero(Iterable approvals) { + // return Iterables.transform( + // approvals, + // a -> { + // PatchSetApproval copy = new PatchSetApproval(a.getPatchSetId(), a); + // copy.setValue((short) 0); + // return copy; + // }); + // } } diff --git a/src/main/java/com/googlesource/gerrit/plugins/qtcodereview/QtCherryPickPatch.java b/src/main/java/com/googlesource/gerrit/plugins/qtcodereview/QtCherryPickPatch.java index bd8c9cd..6dfcb43 100644 --- a/src/main/java/com/googlesource/gerrit/plugins/qtcodereview/QtCherryPickPatch.java +++ b/src/main/java/com/googlesource/gerrit/plugins/qtcodereview/QtCherryPickPatch.java @@ -1,34 +1,25 @@ // -// Copyright (C) 2019 The Qt Company +// Copyright (C) 2021-22 The Qt Company // package com.googlesource.gerrit.plugins.qtcodereview; +import static com.google.gerrit.server.project.ProjectCache.noSuchProject; + import com.google.common.flogger.FluentLogger; -import com.google.gerrit.extensions.restapi.BadRequestException; -import com.google.gerrit.extensions.restapi.MergeConflictException; -import com.google.gerrit.extensions.restapi.MethodNotAllowedException; -import com.google.gerrit.extensions.restapi.RestApiException; -import com.google.gerrit.reviewdb.client.Change; -import com.google.gerrit.reviewdb.client.PatchSet; -import com.google.gerrit.reviewdb.client.Project; -import com.google.gerrit.reviewdb.server.ReviewDb; +import com.google.gerrit.entities.Change; +import com.google.gerrit.entities.Project; import com.google.gerrit.server.IdentifiedUser; import com.google.gerrit.server.git.CodeReviewCommit; import com.google.gerrit.server.git.CodeReviewCommit.CodeReviewRevWalk; import com.google.gerrit.server.git.GitRepositoryManager; import com.google.gerrit.server.git.MergeUtil; -import com.google.gerrit.server.project.NoSuchProjectException; import com.google.gerrit.server.project.NoSuchRefException; import com.google.gerrit.server.project.ProjectCache; import com.google.gerrit.server.project.ProjectState; import com.google.gerrit.server.query.change.ChangeData; -import com.google.gerrit.server.submit.IntegrationException; -import com.google.gerrit.server.submit.MergeIdenticalTreeException; +import com.google.gerrit.server.submit.IntegrationConflictException; import com.google.gerrit.server.update.BatchUpdate; -import com.google.gerrit.server.update.UpdateException; -import com.google.gerrit.server.util.time.TimeUtil; -import com.google.gwtorm.server.OrmException; import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.Singleton; @@ -46,126 +37,127 @@ @Singleton public class QtCherryPickPatch { - private static final FluentLogger logger = FluentLogger.forEnclosingClass(); - - private final Provider dbProvider; - private final BatchUpdate.Factory batchUpdateFactory; - private final GitRepositoryManager gitManager; - private final Provider user; - private final MergeUtil.Factory mergeUtilFactory; - private final ProjectCache projectCache; - private final QtChangeUpdateOp.Factory qtUpdateFactory; - - @Inject - QtCherryPickPatch(Provider dbProvider, - BatchUpdate.Factory batchUpdateFactory, - GitRepositoryManager gitManager, - Provider user, - MergeUtil.Factory mergeUtilFactory, - ProjectCache projectCache, - QtChangeUpdateOp.Factory qtUpdateFactory) { - this.dbProvider = dbProvider; - this.batchUpdateFactory = batchUpdateFactory; - this.gitManager = gitManager; - this.user = user; - this.mergeUtilFactory = mergeUtilFactory; - this.projectCache = projectCache; - this.qtUpdateFactory = qtUpdateFactory; - } - - public CodeReviewCommit cherryPickPatch(ChangeData changeData, - Project.NameKey project, - ObjectId sourceId, - ObjectId destId, - boolean allowFastForward, - Change.Status newStatus, - String defaultMessage, - String inputMessage, - String tag) - throws IntegrationException { - - IdentifiedUser identifiedUser = user.get(); - try (Repository git = gitManager.openRepository(project); - ObjectInserter oi = git.newObjectInserter(); - ObjectReader reader = oi.newReader(); - CodeReviewRevWalk revWalk = CodeReviewCommit.newRevWalk(reader)) { - - if (!git.hasObject(sourceId)) throw new NoSuchRefException("Invalid source objectId: " + sourceId); - if (!git.hasObject(destId)) throw new NoSuchRefException("Invalid destination objectid: " + destId); - - RevCommit baseCommit = revWalk.parseCommit(destId); - CodeReviewCommit commitToCherryPick = revWalk.parseCommit(sourceId); - - List parents = Arrays.asList(commitToCherryPick.getParents()); - if (allowFastForward == true && parents.contains(baseCommit) && commitToCherryPick.getParentCount() < 2) { - logger.atInfo().log("qtcodereview: cherrypick fast forward %s on top of %s", sourceId, destId); - return commitToCherryPick; - } - - // Copy the committer, but change the date to now. - PersonIdent committerIdent = new PersonIdent(commitToCherryPick.getCommitterIdent(), new Date()); - - commitToCherryPick.setPatchsetId(changeData.currentPatchSet().getId()); - commitToCherryPick.setNotes(changeData.notes()); - - CodeReviewCommit cherryPickCommit; - - ProjectState projectState = projectCache.checkedGet(project); - if (projectState == null) throw new NoSuchProjectException(project); - - MergeUtil mergeUtil = mergeUtilFactory.create(projectState, true); - if (commitToCherryPick.getParentCount() > 1) { - // Merge commit cannot be cherrypicked - logger.atInfo().log("qtcodereview: merge commit detected %s", commitToCherryPick); - - if (commitToCherryPick.getParent(0).equals(baseCommit)) { - // allow fast forward, when parent index 0 is correct - logger.atInfo().log("qtcodereview: merge commit fast forwarded"); - cherryPickCommit = commitToCherryPick; - } else { - logger.atInfo().log("qtcodereview: merge of merge created"); - RevCommit commit = QtUtil.merge(committerIdent, - git, oi, - revWalk, - commitToCherryPick, - baseCommit, - true); - cherryPickCommit = revWalk.parseCommit(commit); - } - } else { - String commitMessage = mergeUtil.createCommitMessageOnSubmit(commitToCherryPick, baseCommit); - cherryPickCommit = mergeUtil.createCherryPickFromCommit(oi, - git.getConfig(), - baseCommit, - commitToCherryPick, - committerIdent, - commitMessage, - revWalk, - 0, - true, // ignoreIdenticalTree - false); // allowConflicts - } - - boolean patchSetNotChanged = cherryPickCommit.equals(commitToCherryPick); - if (!patchSetNotChanged) { - logger.atInfo().log("qtcodereview: %s cherrypicked as %s", commitToCherryPick, cherryPickCommit); - oi.flush(); - } - Timestamp commitTimestamp = new Timestamp(committerIdent.getWhen().getTime()); - BatchUpdate bu = batchUpdateFactory.create(dbProvider.get(), project, identifiedUser, commitTimestamp); - bu.addOp(changeData.getId(), qtUpdateFactory.create(newStatus, - null, - defaultMessage, - inputMessage, - tag, - null)); - - bu.execute(); - logger.atInfo().log("qtcodereview: cherrypick done %s", changeData.getId()); - return cherryPickCommit; - } catch (Exception e) { - throw new IntegrationException("Reason: " + e.getMessage()); + private static final FluentLogger logger = FluentLogger.forEnclosingClass(); + + private final BatchUpdate.Factory batchUpdateFactory; + private final GitRepositoryManager gitManager; + private final Provider user; + private final MergeUtil.Factory mergeUtilFactory; + private final ProjectCache projectCache; + private final QtChangeUpdateOp.Factory qtUpdateFactory; + + @Inject + QtCherryPickPatch( + BatchUpdate.Factory batchUpdateFactory, + GitRepositoryManager gitManager, + Provider user, + MergeUtil.Factory mergeUtilFactory, + ProjectCache projectCache, + QtChangeUpdateOp.Factory qtUpdateFactory) { + this.batchUpdateFactory = batchUpdateFactory; + this.gitManager = gitManager; + this.user = user; + this.mergeUtilFactory = mergeUtilFactory; + this.projectCache = projectCache; + this.qtUpdateFactory = qtUpdateFactory; + } + + public CodeReviewCommit cherryPickPatch( + ChangeData changeData, + Project.NameKey project, + ObjectId sourceId, + ObjectId destId, + boolean allowFastForward, + Change.Status newStatus, + String defaultMessage, + String inputMessage, + String tag) + throws IntegrationConflictException { + + IdentifiedUser identifiedUser = user.get(); + try (Repository git = gitManager.openRepository(project); + ObjectInserter oi = git.newObjectInserter(); + ObjectReader reader = oi.newReader(); + CodeReviewRevWalk revWalk = CodeReviewCommit.newRevWalk(reader)) { + + if (!git.hasObject(sourceId)) + throw new NoSuchRefException("Invalid source objectId: " + sourceId); + if (!git.hasObject(destId)) + throw new NoSuchRefException("Invalid destination objectid: " + destId); + + RevCommit baseCommit = revWalk.parseCommit(destId); + CodeReviewCommit commitToCherryPick = revWalk.parseCommit(sourceId); + + List parents = Arrays.asList(commitToCherryPick.getParents()); + if (allowFastForward == true + && parents.contains(baseCommit) + && commitToCherryPick.getParentCount() < 2) { + logger.atInfo().log( + "cherrypick fast forward %s on top of %s", sourceId.name(), destId.name()); + return commitToCherryPick; + } + + // Copy the committer, but change the date to now. + PersonIdent committerIdent = + new PersonIdent(commitToCherryPick.getCommitterIdent(), new Date()); + + commitToCherryPick.setPatchsetId(changeData.currentPatchSet().id()); + commitToCherryPick.setNotes(changeData.notes()); + + CodeReviewCommit cherryPickCommit; + ProjectState projectState = projectCache.get(project).orElseThrow(noSuchProject(project)); + + MergeUtil mergeUtil = mergeUtilFactory.create(projectState, true); + if (commitToCherryPick.getParentCount() > 1) { + // Merge commit cannot be cherrypicked + logger.atInfo().log("merge commit detected %s", commitToCherryPick.name()); + + if (commitToCherryPick.getParent(0).equals(baseCommit)) { + // allow fast forward, when parent index 0 is correct + logger.atInfo().log("merge commit fast forwarded"); + cherryPickCommit = commitToCherryPick; + } else { + logger.atInfo().log("merge of merge created"); + RevCommit commit = + QtUtil.merge( + committerIdent, git, oi, revWalk, commitToCherryPick, baseCommit, null, true); + cherryPickCommit = revWalk.parseCommit(commit); + logger.atInfo().log( + "commit %s merged as %s", commitToCherryPick.name(), cherryPickCommit.name()); } + } else { + String commitMessage = + mergeUtil.createCommitMessageOnSubmit(commitToCherryPick, baseCommit); + cherryPickCommit = + mergeUtil.createCherryPickFromCommit( + oi, + git.getConfig(), + baseCommit, + commitToCherryPick, + committerIdent, + commitMessage, + revWalk, + 0, + true, // ignoreIdenticalTree + false); // allowConflicts + boolean patchSetNotChanged = cherryPickCommit.equals(commitToCherryPick); + if (!patchSetNotChanged) { + logger.atInfo().log( + "commit %s cherrypicked as %s", commitToCherryPick.name(), cherryPickCommit.name()); + oi.flush(); + } + } + + Timestamp commitTimestamp = new Timestamp(committerIdent.getWhen().getTime()); + BatchUpdate bu = batchUpdateFactory.create(project, identifiedUser, commitTimestamp); + bu.addOp( + changeData.getId(), + qtUpdateFactory.create(newStatus, null, defaultMessage, inputMessage, tag, null)); + bu.execute(); + logger.atInfo().log("cherrypick done for change %s", changeData.getId()); + return cherryPickCommit; + } catch (Exception e) { + throw new IntegrationConflictException("Reason: " + e.getMessage()); } - + } } diff --git a/src/main/java/com/googlesource/gerrit/plugins/qtcodereview/QtCommandAdminChangeStatus.java b/src/main/java/com/googlesource/gerrit/plugins/qtcodereview/QtCommandAdminChangeStatus.java index f128b33..9a7fa61 100644 --- a/src/main/java/com/googlesource/gerrit/plugins/qtcodereview/QtCommandAdminChangeStatus.java +++ b/src/main/java/com/googlesource/gerrit/plugins/qtcodereview/QtCommandAdminChangeStatus.java @@ -1,127 +1,134 @@ // -// Copyright (C) 2019 The Qt Company +// Copyright (C) 2019-22 The Qt Company // package com.googlesource.gerrit.plugins.qtcodereview; import com.google.common.flogger.FluentLogger; import com.google.gerrit.common.data.GlobalCapability; +import com.google.gerrit.entities.Change; +import com.google.gerrit.entities.Project; import com.google.gerrit.extensions.annotations.RequiresCapability; import com.google.gerrit.extensions.restapi.RestApiException; -import com.google.gerrit.reviewdb.client.Change; -import com.google.gerrit.reviewdb.client.Project; -import com.google.gerrit.reviewdb.server.ReviewDb; -import com.google.gerrit.server.query.change.InternalChangeQuery; import com.google.gerrit.server.query.change.ChangeData; +import com.google.gerrit.server.query.change.InternalChangeQuery; import com.google.gerrit.server.update.BatchUpdate; import com.google.gerrit.server.update.UpdateException; import com.google.gerrit.server.util.time.TimeUtil; -import com.google.gerrit.sshd.SshCommand; import com.google.gerrit.sshd.CommandMetaData; -import com.google.gwtorm.server.OrmException; - +import com.google.gerrit.sshd.SshCommand; import com.google.inject.Inject; import com.google.inject.Provider; - -import java.lang.NumberFormatException; import java.util.List; - import org.kohsuke.args4j.Option; @RequiresCapability(GlobalCapability.ADMINISTRATE_SERVER) -@CommandMetaData(name="change-status", description="Modify change status for admins. NOTE: This only affects change attribure. No real git merge or revert will be performed.") +@CommandMetaData( + name = "change-status", + description = + "Modify change status for admins. NOTE: This only affects change attribure. No real git" + + " merge or revert will be performed.") class QtCommandAdminChangeStatus extends SshCommand { - @Inject - private Provider dbProvider; - - @Inject - Provider queryProvider; - - @Inject - private BatchUpdate.Factory updateFactory; - - @Inject - private QtChangeUpdateOp.Factory qtUpdateFactory; - - @Option(name = "--project", aliases = {"-p"}, - required = true, usage = "project name") - private String project; - - @Option(name = "--change-id", aliases = {"-c"}, - required = true, usage = "change id (numeric, like in web url)") - private String changeId; - - @Option(name = "--from", - required = true, usage = "new, staged, integrating, merged, abandoned, deferred") - private String fromStr; - - @Option(name = "--to", - required = true, usage = "new, staged, integrating, merged, abandoned, deferred") - private String toStr; - - private static final FluentLogger logger = FluentLogger.forEnclosingClass(); - - @Override - protected void run() throws UnloggedFailure { - logger.atInfo().log("qtcodereview: admin change-status start " + changeId); - - try { - Change.Status to = toStatus(toStr); - if (to == null) throw die("invalid to status"); - - Change.Status from = toStatus(fromStr); - if (from == null) throw die("invalid from status"); - - Change.Id id = Change.Id.parse(changeId); - if (id.get() == 0) throw die("invalid change-id"); - - InternalChangeQuery query = queryProvider.get(); - List list = query.byLegacyChangeId(id); - if (list.isEmpty()) throw die("change not found"); - if (list.size() > 1) throw die("multiple changes found"); - ChangeData change = list.get(0); - - Project.NameKey projectKey = QtUtil.getProjectKey(project); - QtChangeUpdateOp op = qtUpdateFactory.create(to, null, null, null, QtUtil.TAG_ADMINCHANGE, null); - try (BatchUpdate u = updateFactory.create(dbProvider.get(), projectKey, user, TimeUtil.nowTs())) { - Change c = change.change(); - if (c.getStatus() == from) { - u.addOp(c.getId(), op); - u.execute(); - } else { - throw die("change status was not " + fromStr); - } - } - logger.atInfo().log("qtcodereview: admin change-status done"); - } catch(NumberFormatException e) { - throw die("change-id not numeric"); - } catch(OrmException e) { - logger.atSevere().log("qtcodereview: change-status error %s", e.getMessage()); - throw die("Database query failed"); - } catch (UpdateException | RestApiException e) { - logger.atSevere().log("qtcodereview: change-status error %s", e.getMessage()); - throw die("Database update failed"); + @Inject Provider queryProvider; + + @Inject private BatchUpdate.Factory updateFactory; + + @Inject private QtChangeUpdateOp.Factory qtUpdateFactory; + + @Option( + name = "--project", + aliases = {"-p"}, + required = true, + usage = "project name") + private String project; + + @Option( + name = "--change-id", + aliases = {"-c"}, + required = true, + usage = "change id (numeric, like in web url)") + private String changeId; + + @Option( + name = "--from", + required = true, + usage = "new, staged, integrating, merged, abandoned, deferred") + private String fromStr; + + @Option( + name = "--to", + required = true, + usage = "new, staged, integrating, merged, abandoned, deferred") + private String toStr; + + private static final FluentLogger logger = FluentLogger.forEnclosingClass(); + + @Override + protected void run() throws UnloggedFailure { + logger.atInfo().log("admin change-status start " + changeId); + + try { + Change.Status to = toStatus(toStr); + if (to == null) throw die("invalid to status"); + + Change.Status from = toStatus(fromStr); + if (from == null) throw die("invalid from status"); + + Change.Id id; + try { + id = Change.Id.parse(changeId); + } catch (IllegalArgumentException e) { + if (e.getMessage().contains("invalid change ID")) { + throw new NumberFormatException(); + } else { + throw e; } - } - - private Change.Status toStatus(String str) { - switch (str) { - case "new": - return Change.Status.NEW; - case "staged": - return Change.Status.STAGED; - case "integrating": - return Change.Status.INTEGRATING; - case "merged": - return Change.Status.MERGED; - case "abandoned": - return Change.Status.ABANDONED; - case "deferred": - return Change.Status.DEFERRED; - default: - return null; + } + if (id.get() == 0) throw die("invalid change-id"); + + InternalChangeQuery query = queryProvider.get(); + List list = query.byLegacyChangeId(id); + if (list.isEmpty()) throw die("change not found"); + if (list.size() > 1) throw die("multiple changes found"); + ChangeData change = list.get(0); + + Project.NameKey projectKey = QtUtil.getProjectKey(project); + QtChangeUpdateOp op = qtUpdateFactory.create(to, null, null, null, null, null); + try (BatchUpdate u = updateFactory.create(projectKey, user, TimeUtil.nowTs())) { + Change c = change.change(); + if (c.getStatus() == from) { + u.addOp(c.getId(), op); + u.execute(); + } else { + throw die("change status was not " + fromStr); } + } + logger.atInfo().log("admin change-status done"); + } catch (NumberFormatException e) { + throw die("change-id not numeric"); + } catch (UpdateException | RestApiException e) { + logger.atSevere().log("admin change-status error %s", e.getMessage()); + throw die("Database update failed"); } - + } + + private Change.Status toStatus(String str) { + switch (str) { + case "new": + return Change.Status.NEW; + case "staged": + return Change.Status.STAGED; + case "integrating": + return Change.Status.INTEGRATING; + case "merged": + return Change.Status.MERGED; + case "abandoned": + return Change.Status.ABANDONED; + case "deferred": + return Change.Status.DEFERRED; + default: + return null; + } + } } diff --git a/src/main/java/com/googlesource/gerrit/plugins/qtcodereview/QtCommandBuildApprove.java b/src/main/java/com/googlesource/gerrit/plugins/qtcodereview/QtCommandBuildApprove.java index dab69b1..793e6f1 100644 --- a/src/main/java/com/googlesource/gerrit/plugins/qtcodereview/QtCommandBuildApprove.java +++ b/src/main/java/com/googlesource/gerrit/plugins/qtcodereview/QtCommandBuildApprove.java @@ -1,393 +1,405 @@ // -// Copyright (C) 2019 The Qt Company +// Copyright (C) 2021-22 The Qt Company // package com.googlesource.gerrit.plugins.qtcodereview; import com.google.common.flogger.FluentLogger; -import com.google.gerrit.extensions.api.changes.NotifyHandling; -import com.google.gerrit.extensions.restapi.BadRequestException; +import com.google.gerrit.entities.BranchNameKey; +import com.google.gerrit.entities.Change; +import com.google.gerrit.entities.PatchSet; +import com.google.gerrit.entities.Project; import com.google.gerrit.extensions.restapi.AuthException; +import com.google.gerrit.extensions.restapi.BadRequestException; import com.google.gerrit.extensions.restapi.RestApiException; -import com.google.gerrit.reviewdb.client.Branch; -import com.google.gerrit.reviewdb.client.Change; -import com.google.gerrit.reviewdb.client.PatchSet; -import com.google.gerrit.reviewdb.client.Project; -import com.google.gerrit.reviewdb.server.ReviewDb; import com.google.gerrit.server.ChangeMessagesUtil; import com.google.gerrit.server.ChangeUtil; -import com.google.gerrit.server.IdentifiedUser; import com.google.gerrit.server.change.PatchSetInserter; import com.google.gerrit.server.extensions.events.ChangeMerged; import com.google.gerrit.server.extensions.events.GitReferenceUpdated; import com.google.gerrit.server.git.CodeReviewCommit; import com.google.gerrit.server.git.GitRepositoryManager; -import com.google.gerrit.server.mail.send.MergedSender; import com.google.gerrit.server.notedb.ChangeNotes; import com.google.gerrit.server.permissions.PermissionBackend; import com.google.gerrit.server.permissions.PermissionBackendException; -import com.google.gerrit.server.permissions.ProjectPermission; import com.google.gerrit.server.permissions.RefPermission; -import com.google.gerrit.server.project.NoSuchProjectException; import com.google.gerrit.server.project.NoSuchRefException; import com.google.gerrit.server.query.change.ChangeData; import com.google.gerrit.server.update.BatchUpdate; import com.google.gerrit.server.update.UpdateException; import com.google.gerrit.server.util.time.TimeUtil; -import com.google.gerrit.sshd.SshCommand; import com.google.gerrit.sshd.CommandMetaData; - -import com.google.gwtorm.server.OrmException; - +import com.google.gerrit.sshd.SshCommand; import com.google.inject.Inject; -import com.google.inject.Provider; - -import org.eclipse.jgit.errors.ConfigInvalidException; -import org.eclipse.jgit.errors.MissingObjectException; -import org.eclipse.jgit.errors.RepositoryNotFoundException; -import org.eclipse.jgit.lib.ObjectId; -import org.eclipse.jgit.lib.PersonIdent; -import org.eclipse.jgit.lib.RefUpdate.Result; -import org.eclipse.jgit.lib.Repository; -import org.eclipse.jgit.revwalk.RevCommit; -import org.kohsuke.args4j.Option; - import java.io.BufferedReader; import java.io.IOException; import java.io.InputStreamReader; import java.sql.Timestamp; -import java.util.Arrays; import java.util.ArrayList; import java.util.List; -import java.util.Map.Entry; import java.util.Map; - +import java.util.Map.Entry; +import java.util.concurrent.locks.ReentrantLock; +import org.eclipse.jgit.errors.ConfigInvalidException; +import org.eclipse.jgit.errors.RepositoryNotFoundException; +import org.eclipse.jgit.lib.ObjectId; +import org.eclipse.jgit.lib.Repository; +import org.eclipse.jgit.revwalk.RevCommit; +import org.kohsuke.args4j.Option; /** - * A command to report pass or fail status for builds. When a build receives - * pass status, the branch is updated with build ref and all open changes in - * the build are marked as merged. When a build receives fail status, all - * change in the build are marked as new and they need to be staged again. + * A command to report pass or fail status for builds. When a build receives pass status, the branch + * is updated with build ref and all open changes in the build are marked as merged. When a build + * receives fail status, all change in the build are marked as new and they need to be staged again. * - * For example, how to approve a build - * $ ssh -p 29418 localhost gerrit-plugin-qt-workflow staging-approve -p project -b master -i 123 -r=pass + *

For example, how to approve a build $ ssh -p 29418 localhost gerrit-plugin-qt-workflow + * staging-approve -p project -b master -i 123 -r=pass */ -@CommandMetaData(name="staging-approve", description="Report pass or fail status for builds. If passed changed are merged into target branch.") +@CommandMetaData( + name = "staging-approve", + description = + "Report pass or fail status for builds. If passed changed are merged into target branch.") class QtCommandBuildApprove extends SshCommand { - @Inject - private PermissionBackend permissionBackend; - - @Inject - private GitRepositoryManager gitManager; - - @Inject - private Provider dbProvider; - - @Inject - private MergedSender.Factory mergedSenderFactory; - - @Inject - QtBuildFailedSender.Factory qtBuildFailedSenderFactory; - - @Inject - private BatchUpdate.Factory updateFactory; - - @Inject - private PatchSetInserter.Factory patchSetInserterFactory; - - @Inject - private GitReferenceUpdated referenceUpdated; - - @Inject - private ChangeMerged changeMerged; + @Inject private PermissionBackend permissionBackend; - @Inject - private QtUtil qtUtil; + @Inject private GitRepositoryManager gitManager; - @Inject - private QtChangeUpdateOp.Factory qtUpdateFactory; + @Inject private BatchUpdate.Factory updateFactory; - @Option(name = "--project", aliases = {"-p"}, - required = true, usage = "project name") - private String project; + @Inject private PatchSetInserter.Factory patchSetInserterFactory; - @Option(name = "--build-id", aliases = {"-i"}, - required = true, usage = "build branch containing changes, e.g. refs/builds/123 or 123") - private String buildBranch; + @Inject private GitReferenceUpdated referenceUpdated; - @Option(name = "--result", aliases = {"-r"}, - required = true, usage = "pass or fail") - private String result; + @Inject private ChangeMerged changeMerged; - @Option(name = "--message", aliases = {"-m"}, metaVar ="-|MESSAGE", - usage = "message added to all changes") - private String message; + @Inject private QtUtil qtUtil; - @Option(name = "--branch", aliases = {"-b"}, metaVar = "BRANCH", - required = true, usage = "destination branch, e.g. refs/heads/master or just master") - private String destBranch; + @Inject private QtEmailSender qtEmailSender; - private static final FluentLogger logger = FluentLogger.forEnclosingClass(); + @Inject private QtChangeUpdateOp.Factory qtUpdateFactory; - private Repository git; + private final ReentrantLock buildApproveLock = new ReentrantLock(); - /** Parameter value for pass result. */ - private static final String PASS = "pass"; - /** Parameter value for fail result. */ - private static final String FAIL = "fail"; - /** Parameter value for stdin message. */ - private static final String STDIN_MESSAGE = "-"; + @Option( + name = "--project", + aliases = {"-p"}, + required = true, + usage = "project name") + private String project; - private Project.NameKey projectKey; - private Branch.NameKey buildBranchKey; - private Branch.NameKey destBranchKey; - private Branch.NameKey stagingBranchKey; - private Branch.NameKey destBranchShortKey; + @Option( + name = "--build-id", + aliases = {"-i"}, + required = true, + usage = "build branch containing changes, e.g. refs/builds/123 or 123") + private String buildBranch; - private List> affectedChanges = null; + @Option( + name = "--result", + aliases = {"-r"}, + required = true, + usage = "pass or fail") + private String result; - @Override - protected void run() throws UnloggedFailure { - logger.atInfo().log("qtcodereview: staging-approve -p %s -i %s -r %s -m %s -b %s", - project, buildBranch, result, message, destBranch); + @Option( + name = "--message", + aliases = {"-m"}, + metaVar = "-|MESSAGE", + usage = "message added to all changes") + private String message; - readMessageParameter(); + @Option( + name = "--branch", + aliases = {"-b"}, + metaVar = "BRANCH", + required = true, + usage = "destination branch, e.g. refs/heads/master or just master") + private String destBranch; - projectKey = QtUtil.getProjectKey(project); - buildBranchKey = QtUtil.getNameKeyLong(project, QtUtil.R_BUILDS, buildBranch); - destBranchKey = QtUtil.getNameKeyLong(project, QtUtil.R_HEADS, destBranch); - stagingBranchKey = QtUtil.getNameKeyLong(project, QtUtil.R_STAGING, destBranch); - destBranchShortKey = QtUtil.getNameKeyShort(project, QtUtil.R_HEADS, destBranch); + private static final FluentLogger logger = FluentLogger.forEnclosingClass(); - try { - git = gitManager.openRepository(projectKey); + private Repository git; - // Check required permissions - permissionBackend.user(user).project(projectKey).ref(destBranchKey.get()).check(RefPermission.UPDATE); - permissionBackend.user(user).project(projectKey).ref(stagingBranchKey.get()).check(RefPermission.UPDATE); - permissionBackend.user(user).project(projectKey).ref(buildBranchKey.get()).check(RefPermission.READ); + /** Parameter value for pass result. */ + private static final String PASS = "pass"; + /** Parameter value for fail result. */ + private static final String FAIL = "fail"; + /** Parameter value for stdin message. */ + private static final String STDIN_MESSAGE = "-"; - if (git.resolve(destBranchKey.get()) == null) throw die("branch not found"); - if (git.resolve(buildBranchKey.get()) == null) throw die("build not found"); + private Project.NameKey projectKey; + private BranchNameKey buildBranchKey; + private BranchNameKey destBranchKey; + private BranchNameKey stagingBranchKey; + private BranchNameKey destBranchShortKey; - // Initialize and populate open changes list. - affectedChanges = qtUtil.listChangesNotMerged(git, buildBranchKey, destBranchKey); + private List> affectedChanges = null; - // Notify user that build did not have any open changes. The build has already been approved. - if (affectedChanges.isEmpty()) { - logger.atInfo().log("qtcodereview: staging-approve build %s already in project %s branch %s", - buildBranch, projectKey, destBranchKey); - throw die("No open changes in the build branch"); - } - - if (result.toLowerCase().equals(PASS)) { - approveBuildChanges(); - } else if (result.toLowerCase().equals(FAIL)) { - rejectBuildChanges(); - } else { - throw die("result argument accepts only value pass or fail."); - } - - } catch (AuthException e) { - throw die("not authorized"); - } catch (PermissionBackendException e) { - throw die("git permission error"); - } catch (RepositoryNotFoundException e) { - throw die("project not found"); - } catch (IOException e) { - throw die(e.getMessage()); - } catch (OrmException e) { - throw die("Failed to access database"); - } catch (QtUtil.BranchNotFoundException e) { - throw die("invalid branch " + e.getMessage()); - } catch (NoSuchRefException e) { - throw die("invalid reference " + e.getMessage()); - } catch (UpdateException | RestApiException | ConfigInvalidException e ) { - logger.atSevere().log("qtcodereview: staging-napprove failed to update change status %s", e); - throw die("Failed to update change status"); - } catch (QtUtil.MergeConflictException e) { - String msg = String.format("Merge build %s to branch %s failed", buildBranch, destBranchKey); - logger.atSevere().log("qtcodereview: %s", msg); - throw die(String.format("Merge conflict! build branch %s into %s failed", buildBranch, destBranch)); - } finally { - if (git != null) git.close(); - } + @Override + protected void run() throws UnloggedFailure { + buildApproveLock.lock(); // block processing of parallel requests + try { + runBuildApprove(); + } finally { + buildApproveLock.unlock(); } - - private void approveBuildChanges() throws QtUtil.MergeConflictException, NoSuchRefException, - IOException, UpdateException, RestApiException, - OrmException, ConfigInvalidException { - if (message == null) message = String.format("Change merged into branch %s", destBranchKey); - - ObjectId oldId = git.resolve(destBranchKey.get()); - - Result result = QtUtil.mergeBranches(user.asIdentifiedUser(), git, buildBranchKey, destBranchKey); - - if (result != Result.FAST_FORWARD) { - message = "Branch update failed, changed back to NEW. Either the destination branch was changed externally, or this is an issue in the Qt plugin."; - rejectBuildChanges(); - return; - } - - updateChanges(affectedChanges, Change.Status.MERGED, null, - message, ChangeMessagesUtil.TAG_MERGED, true); - - logger.atInfo().log("qtcodereview: staging-approve build %s merged into branch %s", - buildBranch, destBranchKey); - - ObjectId newId = git.resolve(destBranchKey.get()); - // send ref updated event only if there are changes to build - if (!newId.equals(oldId)) { - referenceUpdated.fire(projectKey, destBranchKey.get(), oldId, newId, user.asIdentifiedUser().state()); - } + } + + private void runBuildApprove() throws UnloggedFailure { + logger.atInfo().log( + "staging-approve -p %s -i %s -r %s -m %s -b %s", + project, buildBranch, result, message, destBranch); + + readMessageParameter(); + + projectKey = QtUtil.getProjectKey(project); + buildBranchKey = QtUtil.getNameKeyLong(project, QtUtil.R_BUILDS, buildBranch); + destBranchKey = QtUtil.getNameKeyLong(project, QtUtil.R_HEADS, destBranch); + stagingBranchKey = QtUtil.getNameKeyLong(project, QtUtil.R_STAGING, destBranch); + destBranchShortKey = QtUtil.getNameKeyShort(project, QtUtil.R_HEADS, destBranch); + + try { + git = gitManager.openRepository(projectKey); + + // Check required permissions + permissionBackend + .user(user) + .project(projectKey) + .ref(destBranchKey.branch()) + .check(RefPermission.UPDATE); + permissionBackend + .user(user) + .project(projectKey) + .ref(stagingBranchKey.branch()) + .check(RefPermission.UPDATE); + permissionBackend + .user(user) + .project(projectKey) + .ref(buildBranchKey.branch()) + .check(RefPermission.READ); + + if (git.resolve(destBranchKey.branch()) == null) throw die("branch not found"); + if (git.resolve(buildBranchKey.branch()) == null) throw die("build not found"); + + if (result.toLowerCase().equals(PASS)) { + approveBuildChanges(); + } else if (result.toLowerCase().equals(FAIL)) { + rejectBuildChanges(); + } else { + throw die("result argument accepts only value pass or fail."); + } + + } catch (AuthException e) { + throw die("not authorized"); + } catch (PermissionBackendException e) { + throw die("git permission error"); + } catch (RepositoryNotFoundException e) { + throw die("project not found"); + } catch (IOException e) { + throw die(e.getMessage()); + } catch (QtUtil.BranchNotFoundException e) { + throw die("invalid branch " + e.getMessage()); + } catch (UpdateException | RestApiException | ConfigInvalidException e) { + logger.atSevere().log("staging-napprove failed to update change status %s", e); + throw die("Failed to update change status"); + } catch (QtUtil.MergeConflictException e) { + String msg = + String.format( + "Merge build '%s' to branch '%s' failed", buildBranch, destBranchKey.shortName()); + logger.atSevere().log("%s", msg); + throw die( + String.format( + "Merge conflict! build branch '%s' into '%s' failed", buildBranch, destBranch)); + } finally { + if (git != null) git.close(); } - - private void rejectBuildChanges() throws QtUtil.MergeConflictException, UpdateException, - RestApiException, OrmException, IOException, - ConfigInvalidException { - if (message == null) message = String.format("Change rejected for branch %s", destBranchKey); - - updateChanges(affectedChanges, Change.Status.NEW, Change.Status.INTEGRATING, - message, ChangeMessagesUtil.TAG_REVERT, false); - - // need to rebuild the staging ref because the reject changes need to be removed from there - qtUtil.rebuildStagingBranch(git, user.asIdentifiedUser(), projectKey, stagingBranchKey, destBranchShortKey); - - logger.atInfo().log("qtcodereview: staging-approve build %s rejected for branch %s", - buildBranch, destBranchKey); + } + + private void approveBuildChanges() + throws QtUtil.MergeConflictException, IOException, UpdateException, UnloggedFailure, + RestApiException, ConfigInvalidException, QtUtil.BranchNotFoundException { + if (message == null) + message = String.format("Change merged into branch '%s'", destBranchKey.shortName()); + + ObjectId oldId = git.resolve(destBranchKey.branch()); + + try { + affectedChanges = + qtUtil.mergeIntegrationToBranch( + user.asIdentifiedUser(), + git, + projectKey, + buildBranchKey, + destBranchKey, + "Merge integration " + buildBranch); + } catch (NoSuchRefException e) { + message = "Gerrit plugin internal error. Please contact Gerrit Admin."; + logger.atInfo().log(e.getMessage()); + rejectBuildChanges(); + return; + } catch (QtUtil.MergeConflictException e) { + message = + "Unable to merge this integration because another integration parallel to this one " + + "successfully merged first and created a conflict in one of the tested changes.\n" + + "Please review, resolve conflicts if necessary, and restage."; + logger.atInfo().log(e.getMessage()); + rejectBuildChanges(); + return; } - private void updateChanges(List> list, - Change.Status status, - Change.Status oldStatus, - String changeMessage, - String tag, - Boolean passed) - throws UpdateException, RestApiException, OrmException, - IOException, ConfigInvalidException { - - List> emailingList = new ArrayList>(); - - // do the db update - QtChangeUpdateOp op = qtUpdateFactory.create(status, oldStatus, changeMessage, null, tag, null); - try (BatchUpdate u = updateFactory.create(dbProvider.get(), projectKey, user, TimeUtil.nowTs())) { - for (Entry item : list) { - ChangeData cd = item.getKey(); - Change change = cd.change(); - if ((oldStatus == null || change.getStatus() == oldStatus) - && change.getStatus() != Change.Status.MERGED) { - if (status == Change.Status.MERGED) { - ObjectId obj = git.resolve(cd.currentPatchSet().getRevision().get()); - CodeReviewCommit currCommit = new CodeReviewCommit(obj); - currCommit.setPatchsetId(cd.currentPatchSet().getId()); - CodeReviewCommit newCommit = new CodeReviewCommit(item.getValue()); - Change.Id changeId = insertPatchSet(u, git, cd.notes(), newCommit); - if (!changeId.equals(cd.getId())) { - logger.atWarning().log("staging-approve wrong changeId for new patchSet %s != %s", - changeId, cd.getId()); - } - u.addOp(changeId, qtUpdateFactory.create(status, - oldStatus, - changeMessage, - null, - tag, - currCommit)); - } else { - u.addOp(change.getId(), op); - } - emailingList.add(item); - } - } - u.execute(); - } - - // do rest - for (Entry item : emailingList) { - ChangeData cd = item.getKey(); - Change change = cd.change(); - if (passed) { - sendMergeEvent(cd); - sendMergedEmail(change.getId()); - logger.atInfo().log("qtcodereview: staging-approve change %s merged into %s", - change, destBranchKey); - } else { - sendBuildFailedEmail(change.getId()); - logger.atInfo().log("qtcodereview: staging-approve change %s rejected for %s", - change, destBranchKey); - } - } - + updateChanges( + affectedChanges, + Change.Status.MERGED, + Change.Status.INTEGRATING, + message, + ChangeMessagesUtil.TAG_MERGED, + true); + + logger.atInfo().log( + "build '%s' merged into branch '%s'", buildBranch, destBranchKey.shortName()); + + // need to rebuild the staging ref to include recently merged changes + qtUtil.rebuildStagingBranch( + git, user.asIdentifiedUser(), projectKey, stagingBranchKey, destBranchShortKey); + + ObjectId newId = git.resolve(destBranchKey.branch()); + // send ref updated event only if there are changes to build + if (!newId.equals(oldId)) { + referenceUpdated.fire( + projectKey, destBranchKey.branch(), oldId, newId, user.asIdentifiedUser().state()); } - private Change.Id insertPatchSet(BatchUpdate bu, - Repository git, - ChangeNotes destNotes, - CodeReviewCommit cherryPickCommit) - throws IOException, OrmException, BadRequestException, ConfigInvalidException { - Change destChange = destNotes.getChange(); - PatchSet.Id psId = ChangeUtil.nextPatchSetId(git, destChange.currentPatchSetId()); - PatchSetInserter inserter = patchSetInserterFactory.create(destNotes, psId, cherryPickCommit); - inserter.setNotify(NotifyHandling.NONE) - .setAllowClosed(true); - // .setCopyApprovals(true) doesn't work, so copying done in QtChangeUpdateOp - bu.addOp(destChange.getId(), inserter); - return destChange.getId(); - } + // return merged sha1 to the caller + stdout.println(newId.name()); + } - private void sendMergeEvent(ChangeData changeData) throws OrmException { - Timestamp ts = TimeUtil.nowTs(); + private void rejectBuildChanges() + throws QtUtil.MergeConflictException, UpdateException, RestApiException, IOException, + ConfigInvalidException, QtUtil.BranchNotFoundException, UnloggedFailure { + if (message == null) + message = String.format("Change rejected for branch '%s'", destBranchKey.shortName()); - try { - PatchSet ps = changeData.currentPatchSet(); - changeMerged.fire(changeData.change(), ps, user.asIdentifiedUser().state(), - ps.getRevision().get(), ts); - } catch ( OrmException e) { - logger.atInfo().log("qtcodereview: staging-approve sending merge event failed for %s", - changeData.change()); - } + affectedChanges = qtUtil.listChangesNotMerged(git, buildBranchKey, destBranchKey); + + // Notify user that build did not have any open changes. The build has already been approved. + if (affectedChanges.isEmpty()) { + logger.atInfo().log( + "build '%s' already in project '%s' branch '%s'", + buildBranch, projectKey, destBranchKey.shortName()); + throw die("No open changes in the build branch"); } - private void readMessageParameter() throws UnloggedFailure { - if (message == null) return; - - try { - // User will submit message through stdin. - if (message.equals(STDIN_MESSAGE)) { - // Clear stdin indicator. - message = ""; - - // Read message from stdin. - BufferedReader stdin = new BufferedReader(new InputStreamReader(in, "UTF-8")); - String line; - while ((line = stdin.readLine()) != null) { - message += line + "\n"; - } + updateChanges( + affectedChanges, + Change.Status.NEW, + Change.Status.INTEGRATING, + message, + ChangeMessagesUtil.TAG_REVERT, + false); + + logger.atInfo().log( + "build '%s' rejected for branch '%s'", buildBranch, destBranchKey.shortName()); + } + + private void updateChanges( + List> list, + Change.Status newStatus, + Change.Status oldStatus, + String changeMessage, + String tag, + Boolean passed) + throws UpdateException, RestApiException, IOException, ConfigInvalidException { + + List> emailingList = + new ArrayList>(); + + // do the db update + QtChangeUpdateOp op = + qtUpdateFactory.create(newStatus, oldStatus, changeMessage, null, tag, null); + try (BatchUpdate u = updateFactory.create(projectKey, user, TimeUtil.nowTs())) { + for (Entry item : list) { + ChangeData cd = item.getKey(); + Change change = cd.change(); + if (change.getStatus() == oldStatus) { + if (newStatus == Change.Status.MERGED) { + ObjectId obj = git.resolve(cd.currentPatchSet().commitId().name()); + CodeReviewCommit currCommit = new CodeReviewCommit(obj); + currCommit.setPatchsetId(cd.currentPatchSet().id()); + CodeReviewCommit newCommit = new CodeReviewCommit(item.getValue()); + Change.Id changeId = insertPatchSet(u, git, cd.notes(), newCommit); + if (!changeId.equals(cd.getId())) { + logger.atWarning().log( + "wrong changeId for new patchSet %s != %s", changeId, cd.getId()); } - } catch (IOException e) { - throw new UnloggedFailure(1, "fatal: " + e.getMessage(), e); + u.addOp( + changeId, + qtUpdateFactory.create(newStatus, oldStatus, changeMessage, null, tag, currCommit)); + } else { + u.addOp(change.getId(), op); + } + emailingList.add(item); } + } + u.execute(); } - private void sendMergedEmail(Change.Id changeId) { - try { - MergedSender mcm = mergedSenderFactory.create(projectKey, changeId); - mcm.setFrom(user.getAccountId()); - mcm.send(); - } catch (Exception e) { - logger.atWarning().log("qtcodereview: staging-approve Merged notification not sent for %s %s", changeId, e); - } + // do rest + for (Entry item : emailingList) { + ChangeData cd = item.getKey(); + Change change = cd.change(); + if (passed) { + qtUtil.postChangeIntegrationPassEvent(change); + sendMergeEvent(cd); + qtEmailSender.sendMergedEmail(projectKey, change, user.getAccountId()); + logger.atInfo().log( + " change %s merged into '%s'", change.getId(), destBranchKey.shortName()); + } else { + qtUtil.postChangeIntegrationFailEvent(change); + qtEmailSender.sendBuildFailedEmail(projectKey, change, user.getAccountId(), message); + logger.atInfo().log( + " change %s rejected for '%s'", change.getId(), destBranchKey.shortName()); + } } - - private void sendBuildFailedEmail(Change.Id changeId) { - try { - QtBuildFailedSender cm = qtBuildFailedSenderFactory.create(projectKey, changeId); - cm.setFrom(user.getAccountId()); - cm.setChangeMessage(message, TimeUtil.nowTs()); - cm.send(); - } catch (Exception e) { - logger.atWarning().log("qtcodereview: staging-approve Build Failed not sent notification for %s %s", changeId, e); + } + + private Change.Id insertPatchSet( + BatchUpdate bu, Repository git, ChangeNotes destNotes, CodeReviewCommit cherryPickCommit) + throws IOException, BadRequestException, ConfigInvalidException { + Change destChange = destNotes.getChange(); + PatchSet.Id psId = ChangeUtil.nextPatchSetId(git, destChange.currentPatchSetId()); + PatchSetInserter inserter = patchSetInserterFactory.create(destNotes, psId, cherryPickCommit); + inserter.setSendEmail(false).setAllowClosed(true); + // .setCopyApprovals(true) doesn't work, so copying done in QtChangeUpdateOp + bu.addOp(destChange.getId(), inserter); + return destChange.getId(); + } + + private void sendMergeEvent(ChangeData changeData) { + Timestamp ts = TimeUtil.nowTs(); + + PatchSet ps = changeData.currentPatchSet(); + changeMerged.fire(changeData, ps, user.asIdentifiedUser().state(), ps.commitId().name(), ts); + } + + private void readMessageParameter() throws UnloggedFailure { + if (message == null) return; + + try { + // User will submit message through stdin. + if (message.equals(STDIN_MESSAGE)) { + // Clear stdin indicator. + message = ""; + + // Read message from stdin. + BufferedReader stdin = new BufferedReader(new InputStreamReader(in, "UTF-8")); + String line; + while ((line = stdin.readLine()) != null) { + message += line + "\n"; } + } + } catch (IOException e) { + throw new UnloggedFailure(1, "fatal: " + e.getMessage(), e); } - + } } diff --git a/src/main/java/com/googlesource/gerrit/plugins/qtcodereview/QtCommandListStaging.java b/src/main/java/com/googlesource/gerrit/plugins/qtcodereview/QtCommandListStaging.java index 5ae07ed..801b6fb 100644 --- a/src/main/java/com/googlesource/gerrit/plugins/qtcodereview/QtCommandListStaging.java +++ b/src/main/java/com/googlesource/gerrit/plugins/qtcodereview/QtCommandListStaging.java @@ -1,124 +1,130 @@ // -// Copyright (C) 2019 The Qt Company +// Copyright (C) 2019-22 The Qt Company // package com.googlesource.gerrit.plugins.qtcodereview; import com.google.common.flogger.FluentLogger; +import com.google.gerrit.entities.BranchNameKey; +import com.google.gerrit.entities.Change; +import com.google.gerrit.entities.Project; import com.google.gerrit.extensions.restapi.AuthException; -import com.google.gerrit.reviewdb.client.Branch; -import com.google.gerrit.reviewdb.client.Change; -import com.google.gerrit.reviewdb.client.Project; -import com.google.gerrit.reviewdb.server.ReviewDb; import com.google.gerrit.server.git.GitRepositoryManager; import com.google.gerrit.server.permissions.PermissionBackend; import com.google.gerrit.server.permissions.PermissionBackendException; import com.google.gerrit.server.permissions.RefPermission; import com.google.gerrit.server.query.change.ChangeData; -import com.google.gerrit.sshd.SshCommand; import com.google.gerrit.sshd.CommandMetaData; - +import com.google.gerrit.sshd.SshCommand; import com.google.inject.Inject; -import com.google.inject.Provider; - -import com.google.gwtorm.server.OrmException; - -import org.eclipse.jgit.errors.RepositoryNotFoundException; -import org.eclipse.jgit.lib.Repository; -import org.eclipse.jgit.revwalk.RevCommit; -import org.kohsuke.args4j.Option; - import java.io.IOException; import java.io.PrintWriter; import java.util.List; import java.util.Map.Entry; +import org.eclipse.jgit.errors.RepositoryNotFoundException; +import org.eclipse.jgit.lib.Repository; +import org.eclipse.jgit.revwalk.RevCommit; +import org.kohsuke.args4j.Option; -@CommandMetaData(name = "staging-ls", description = "List all the changes that have been applied to the staging or build ref that are not in the destination branch yet.") +@CommandMetaData( + name = "staging-ls", + description = + "List all the changes that have been applied to the staging or build ref that are not in" + + " the destination branch yet.") class QtCommandListStaging extends SshCommand { - @Inject - private PermissionBackend permissionBackend; - - @Inject - private GitRepositoryManager gitManager; - - @Inject - private ReviewDb db; - - @Inject - private QtUtil qtUtil; - - @Option(name = "--project", aliases = {"-p"}, - required = true, usage = "project name") - private String project; - - @Option(name = "--branch", aliases = {"-b"}, - required = true, usage = "any ref, e.g. refs/staging/master or refs/builds/my_build") - private String branch; - - @Option(name = "--destination", aliases = {"-d"}, - required = true, usage = "destination branch filter, e.g. refs/heads/master or just master") - private String destination; - - private static final FluentLogger logger = FluentLogger.forEnclosingClass(); - - private Repository git; - - - @Override - protected void run() throws UnloggedFailure { - logger.atInfo().log("qtcodereview: staging-ls -p %s -b %s", project, branch); - - final PrintWriter stdout = toPrintWriter(out); - - Project.NameKey projectKey = new Project.NameKey(project); - Branch.NameKey aBranchKey = new Branch.NameKey(projectKey, branch); - Branch.NameKey destBranchShortKey = QtUtil.getNameKeyShort(project, QtUtil.R_HEADS, destination); - - try { - git = gitManager.openRepository(projectKey); - - permissionBackend.user(user).project(projectKey).ref(aBranchKey.get()).check(RefPermission.READ); - permissionBackend.user(user).project(projectKey).ref(destBranchShortKey.get()).check(RefPermission.READ); - - if (git.resolve(aBranchKey.get()) == null) { - throw die("branch ref not found"); - } - - final List> open = qtUtil.listChangesNotMerged(git, aBranchKey, destBranchShortKey); - - for (Entry item : open) { - final Change change = item.getKey().change(); - final Change.Status status = change.getStatus(); - - if (status == Change.Status.STAGED || status == Change.Status.INTEGRATING) { - final RevCommit commit = item.getValue(); - stdout.println(commit.name() + " " + change.currentPatchSetId() + " " + change.getSubject()); - } - } - - logger.atInfo().log("qtcodereview: staging-ls done"); - } catch (AuthException e) { - logger.atSevere().log("qtcodereview: staging-ls Authentication failed to access repository: %s", e); - throw die("not authorized"); - } catch (PermissionBackendException e) { - logger.atSevere().log("qtcodereview: staging-ls permission error %s", e); - } catch (RepositoryNotFoundException e) { - logger.atSevere().log("qtcodereview: staging-ls repository not found: %s", e); - throw die("project not found"); - } catch (QtUtil.BranchNotFoundException e) { - throw die("invalid branch " + e.getMessage()); - } catch (IOException e) { - logger.atSevere().log("qtcodereview: staging-ls IOException %s", e); - throw die(e.getMessage()); - } catch (OrmException e) { - logger.atSevere().log("qtcodereview: staging-ls cannot access Gerrit database %s", e); - throw die("cannot access Gerrit database"); - } finally { - stdout.flush(); - if (git != null) { - git.close(); - } + @Inject private PermissionBackend permissionBackend; + + @Inject private GitRepositoryManager gitManager; + + @Inject private QtUtil qtUtil; + + @Option( + name = "--project", + aliases = {"-p"}, + required = true, + usage = "project name") + private String project; + + @Option( + name = "--branch", + aliases = {"-b"}, + required = true, + usage = "any ref, e.g. refs/staging/master or refs/builds/my_build") + private String branch; + + @Option( + name = "--destination", + aliases = {"-d"}, + required = true, + usage = "destination branch filter, e.g. refs/heads/master or just master") + private String destination; + + private static final FluentLogger logger = FluentLogger.forEnclosingClass(); + + private Repository git; + + @Override + protected void run() throws UnloggedFailure { + logger.atInfo().log("staging-ls -p %s -b %s", project, branch); + + final PrintWriter stdout = toPrintWriter(out); + + Project.NameKey projectKey = Project.nameKey(project); + BranchNameKey aBranchKey = BranchNameKey.create(projectKey, branch); + BranchNameKey destBranchShortKey = QtUtil.getNameKeyShort(project, QtUtil.R_HEADS, destination); + + try { + git = gitManager.openRepository(projectKey); + + permissionBackend + .user(user) + .project(projectKey) + .ref(aBranchKey.branch()) + .check(RefPermission.READ); + permissionBackend + .user(user) + .project(projectKey) + .ref(destBranchShortKey.branch()) + .check(RefPermission.READ); + + if (git.resolve(aBranchKey.branch()) == null) { + throw die("branch ref not found"); + } + + final List> open = + qtUtil.listChangesNotMerged(git, aBranchKey, destBranchShortKey); + + for (Entry item : open) { + final Change change = item.getKey().change(); + final Change.Status status = change.getStatus(); + + if (status == Change.Status.STAGED || status == Change.Status.INTEGRATING) { + final RevCommit commit = item.getValue(); + stdout.println( + commit.name() + " " + change.currentPatchSetId() + " " + change.getSubject()); } + } + + logger.atInfo().log("staging-ls done"); + } catch (AuthException e) { + logger.atSevere().log("staging-ls Authentication failed to access repository: %s", e); + throw die("not authorized"); + } catch (PermissionBackendException e) { + logger.atSevere().log("staging-ls permission error %s", e); + } catch (RepositoryNotFoundException e) { + logger.atSevere().log("staging-ls repository not found: %s", e); + throw die("project not found"); + } catch (QtUtil.BranchNotFoundException e) { + throw die("invalid branch " + e.getMessage()); + } catch (IOException e) { + logger.atSevere().log("staging-ls IOException %s", e); + throw die(e.getMessage()); + } finally { + stdout.flush(); + if (git != null) { + git.close(); + } } + } } diff --git a/src/main/java/com/googlesource/gerrit/plugins/qtcodereview/QtCommandNewBuild.java b/src/main/java/com/googlesource/gerrit/plugins/qtcodereview/QtCommandNewBuild.java index 266f830..39d37f1 100644 --- a/src/main/java/com/googlesource/gerrit/plugins/qtcodereview/QtCommandNewBuild.java +++ b/src/main/java/com/googlesource/gerrit/plugins/qtcodereview/QtCommandNewBuild.java @@ -1,180 +1,198 @@ // -// Copyright (C) 2019 The Qt Company +// Copyright (C) 2019-22 The Qt Company // package com.googlesource.gerrit.plugins.qtcodereview; import com.google.common.flogger.FluentLogger; +import com.google.gerrit.entities.BranchNameKey; +import com.google.gerrit.entities.Change; +import com.google.gerrit.entities.Project; import com.google.gerrit.extensions.restapi.AuthException; import com.google.gerrit.extensions.restapi.RestApiException; -import com.google.gerrit.reviewdb.client.Branch; -import com.google.gerrit.reviewdb.client.Change; -import com.google.gerrit.reviewdb.client.PatchSet; -import com.google.gerrit.reviewdb.client.Project; -import com.google.gerrit.reviewdb.server.ReviewDb; -import com.google.gerrit.server.InternalUser; import com.google.gerrit.server.git.GitRepositoryManager; import com.google.gerrit.server.permissions.PermissionBackend; import com.google.gerrit.server.permissions.PermissionBackendException; -import com.google.gerrit.server.permissions.ProjectPermission; import com.google.gerrit.server.permissions.RefPermission; -import com.google.gerrit.server.project.NoSuchProjectException; import com.google.gerrit.server.project.NoSuchRefException; import com.google.gerrit.server.query.change.ChangeData; import com.google.gerrit.server.update.BatchUpdate; import com.google.gerrit.server.update.UpdateException; import com.google.gerrit.server.util.time.TimeUtil; -import com.google.gerrit.sshd.SshCommand; import com.google.gerrit.sshd.CommandMetaData; - -import com.google.gwtorm.server.OrmException; - +import com.google.gerrit.sshd.SshCommand; import com.google.inject.Inject; -import com.google.inject.Provider; - -import org.eclipse.jgit.errors.MissingObjectException; +import java.io.IOException; +import java.util.List; +import java.util.Map.Entry; import org.eclipse.jgit.errors.RepositoryNotFoundException; import org.eclipse.jgit.lib.RefUpdate.Result; import org.eclipse.jgit.lib.Repository; import org.eclipse.jgit.revwalk.RevCommit; import org.kohsuke.args4j.Option; -import java.io.IOException; -import java.util.List; -import java.util.Map.Entry; - -@CommandMetaData(name="staging-new-build", description="Create unique build branch of the current staging branch and change the gerrit status of the changes to INTEGRATING.") +@CommandMetaData( + name = "staging-new-build", + description = + "Create unique build branch of the current staging branch and change the gerrit status of" + + " the changes to INTEGRATING.") class QtCommandNewBuild extends SshCommand { - @Inject - private PermissionBackend permissionBackend; - - @Inject - private GitRepositoryManager gitManager; - - @Inject - private Provider dbProvider; - - @Inject - private BatchUpdate.Factory updateFactory; - - @Inject - private QtUtil qtUtil; - - @Inject - private QtChangeUpdateOp.Factory qtUpdateFactory; - - @Option(name = "--project", aliases = {"-p"}, - required = true, usage = "project name") - private String project; - - @Option(name = "--staging-branch", aliases = {"-s"}, - required = true, usage = "branch name, e.g. refs/staging/master or just master") - private String stagingBranch; - - @Option(name = "--build-id", aliases = {"-i"}, - required = true, usage = "build id, e.g. refs/builds/my_build or just my_build") - private String build; - - private static final FluentLogger logger = FluentLogger.forEnclosingClass(); - - private Repository git; - - - @Override - protected void run() throws UnloggedFailure { - - logger.atInfo().log("qtcodereview: staging-new-build -p %s -s %s -i %s", project, stagingBranch, build); - - try { - Project.NameKey projectKey = new Project.NameKey(project); - git = gitManager.openRepository(projectKey); - - Branch.NameKey buildBranchKey = QtUtil.getNameKeyLong(project, QtUtil.R_BUILDS, build); - Branch.NameKey stagingBranchKey = QtUtil.getNameKeyLong(project, QtUtil.R_STAGING, stagingBranch); - Branch.NameKey destBranchShortKey = QtUtil.getNameKeyShort(project, QtUtil.R_STAGING, stagingBranch); - Branch.NameKey destinationKey = QtUtil.getNameKeyLong(project, QtUtil.R_HEADS, stagingBranch); - - // Check required permissions - permissionBackend.user(user).project(projectKey).ref(destinationKey.get()).check(RefPermission.UPDATE); - permissionBackend.user(user).project(projectKey).ref(buildBranchKey.get()).check(RefPermission.CREATE); - - if (QtUtil.branchExists(git, buildBranchKey) == true) { - logger.atSevere().log("qtcodereview: staging-new-build Target build %s already exists", buildBranchKey); - throw die("Target build already exists!"); - } - - if (QtUtil.branchExists(git, stagingBranchKey) == false) { - logger.atSevere().log("qtcodereview: staging-new-build staging ref %s not found", stagingBranchKey); - throw die("Staging ref not found!"); - } - - // Create build reference. - Result result = qtUtil.createBuildRef(git, user.asIdentifiedUser(), - projectKey, stagingBranchKey, buildBranchKey); - String message = String.format("Added to build %s for %s", build, destinationKey); + @Inject private PermissionBackend permissionBackend; + + @Inject private GitRepositoryManager gitManager; + + @Inject private BatchUpdate.Factory updateFactory; + + @Inject private QtUtil qtUtil; + + @Inject private QtChangeUpdateOp.Factory qtUpdateFactory; + + @Option( + name = "--project", + aliases = {"-p"}, + required = true, + usage = "project name") + private String project; + + @Option( + name = "--staging-branch", + aliases = {"-s"}, + required = true, + usage = "branch name, e.g. refs/staging/master or just master") + private String stagingBranch; + + @Option( + name = "--build-id", + aliases = {"-i"}, + required = true, + usage = "build id, e.g. refs/builds/my_build or just my_build") + private String build; + + private static final FluentLogger logger = FluentLogger.forEnclosingClass(); + + private Repository git; + + @Override + protected void run() throws UnloggedFailure { + + logger.atInfo().log("staging-new-build -p %s -s %s -i %s", project, stagingBranch, build); + + try { + Project.NameKey projectKey = Project.nameKey(project); + git = gitManager.openRepository(projectKey); + + BranchNameKey buildBranchKey = QtUtil.getNameKeyLong(project, QtUtil.R_BUILDS, build); + BranchNameKey stagingBranchKey = + QtUtil.getNameKeyLong(project, QtUtil.R_STAGING, stagingBranch); + BranchNameKey destBranchShortKey = + QtUtil.getNameKeyShort(project, QtUtil.R_STAGING, stagingBranch); + BranchNameKey destinationKey = QtUtil.getNameKeyLong(project, QtUtil.R_HEADS, stagingBranch); + + // Check required permissions + permissionBackend + .user(user) + .project(projectKey) + .ref(destinationKey.branch()) + .check(RefPermission.UPDATE); + permissionBackend + .user(user) + .project(projectKey) + .ref(buildBranchKey.branch()) + .check(RefPermission.CREATE); + + if (QtUtil.branchExists(git, buildBranchKey) == true) { + logger.atSevere().log( + "staging-new-build Target build '%s' already exists", buildBranchKey.branch()); + throw die("Target build already exists!"); + } + + if (QtUtil.branchExists(git, stagingBranchKey) == false) { + logger.atSevere().log( + "staging-new-build staging ref '%s' not found", stagingBranchKey.branch()); + throw die("Staging ref not found!"); + } + + // Create build reference. + Result result = + qtUtil.createBuildRef( + git, user.asIdentifiedUser(), projectKey, stagingBranchKey, buildBranchKey); + String message = + String.format("Added to build '%s' for '%s'", build, destinationKey.shortName()); + + if (result != Result.NEW && result != Result.FAST_FORWARD) { + logger.atSevere().log( + "staging-new-build failed to create new build ref '%s' result %s", + buildBranchKey.branch(), result); + throw new UnloggedFailure(1, "fatal: failed to create new build ref: " + result); + } else { + // list the changes in staging branch but missing from the destination branch + List> openChanges = + qtUtil.listChangesNotMerged(git, buildBranchKey, destBranchShortKey); + + // Make sure that there are changes in the staging branch. + if (openChanges.isEmpty()) { + logger.atSevere().log( + "staging-new-build No changes in staging branch %s.", stagingBranchKey.branch()); + throw die("No changes in staging branch. Not creating a build reference"); + } - if (result != Result.NEW && result != Result.FAST_FORWARD) { - logger.atSevere().log("qtcodereview: staging-new-build failed to create new build ref %s result %s", - buildBranchKey, result); - throw new UnloggedFailure(1, "fatal: failed to create new build ref: " + result); + QtChangeUpdateOp op = + qtUpdateFactory.create( + Change.Status.INTEGRATING, + Change.Status.STAGED, + message, + null, + QtUtil.TAG_CI, + null); + try (BatchUpdate u = updateFactory.create(projectKey, user, TimeUtil.nowTs())) { + for (Entry item : openChanges) { + Change change = item.getKey().change(); + if (change.getStatus() == Change.Status.STAGED) { + logger.atInfo().log( + "staging-new-build inserted change %s,%s into build '%s' for '%s'", + change.getId(), change.getKey(), build, destinationKey.shortName()); + u.addOp(change.getId(), op); } else { - // list the changes in staging branch but missing from the destination branch - List> openChanges = qtUtil.listChangesNotMerged(git, buildBranchKey, destBranchShortKey); - - // Make sure that there are changes in the staging branch. - if (openChanges.isEmpty()) { - logger.atSevere().log("qtcodereview: staging-new-build No changes in staging branch %s.", stagingBranchKey); - throw die("No changes in staging branch. Not creating a build reference"); - } - - QtChangeUpdateOp op = qtUpdateFactory.create(Change.Status.INTEGRATING, Change.Status.STAGED, message, null, QtUtil.TAG_CI, null); - try (BatchUpdate u = updateFactory.create(dbProvider.get(), projectKey, user, TimeUtil.nowTs())) { - for (Entry item: openChanges) { - Change change = item.getKey().change(); - if (change.getStatus() == Change.Status.STAGED) { - logger.atInfo().log("qtcodereview: staging-new-build inserted change %s (%s) into build %s for %s", - change, item.getValue().toString(), build, destinationKey); - u.addOp(change.getId(), op); - } else { - logger.atInfo().log("qtcodereview: staging-new-build change %s (%s) is included in build %s for %s", - change, item.getValue().toString(), build, destinationKey); - } - } - u.execute(); - } - } - - logger.atInfo().log("qtcodereview: staging-new-build build %s for %s created", build, destBranchShortKey); - - } catch (AuthException e) { - logger.atSevere().log("qtcodereview: staging-new-build Authentication failed to access repository: %s", e); - throw die("Authentication failed to access repository"); - } catch (PermissionBackendException e) { - logger.atSevere().log("qtcodereview: staging-new-build Not enough permissions to access repository %s", e); - throw die("Not enough permissions to access repository"); - } catch (RepositoryNotFoundException e) { - throw die("project not found"); - } catch (IOException e) { - logger.atSevere().log("qtcodereview: staging-new-build Failed to access repository %s", e); - throw die("Failed to access repository"); - } catch (OrmException e) { - logger.atSevere().log("qtcodereview: staging-new-build Failed to access database %s", e); - throw die("Failed to access database"); - } catch (QtUtil.BranchNotFoundException e) { - logger.atSevere().log("qtcodereview: staging-new-build Failed to access build or staging ref %s", e); - throw die("Failed to access build or staging ref"); - } catch (NoSuchRefException e) { - logger.atSevere().log("qtcodereview: staging-new-build Invalid branch name %s", e); - throw die("Invalid branch name"); - } catch (UpdateException | RestApiException e) { - logger.atSevere().log("qtcodereview: staging-new-build failed to update change status %s", e); - throw die("Failed to update change status"); - } finally { - if (git != null) { - git.close(); + logger.atInfo().log( + "staging-new-build change %s, %s is included in build '%s' for '%s'", + change.getId(), change.getKey(), build, destinationKey.shortName()); } + } + u.execute(); } + } + + // reset staging ref back to branch head + result = QtUtil.createStagingBranch(git, destBranchShortKey); + + logger.atInfo().log( + "staging-new-build build '%s' for '%s' created", build, destBranchShortKey.shortName()); + + } catch (AuthException e) { + logger.atSevere().log("staging-new-build Authentication failed to access repository: %s", e); + throw die("Authentication failed to access repository"); + } catch (PermissionBackendException e) { + logger.atSevere().log("staging-new-build Not enough permissions to access repository %s", e); + throw die("Not enough permissions to access repository"); + } catch (RepositoryNotFoundException e) { + throw die("project not found"); + } catch (IOException e) { + logger.atSevere().log("staging-new-build Failed to access repository %s", e); + throw die("Failed to access repository"); + } catch (QtUtil.BranchNotFoundException e) { + logger.atSevere().log("staging-new-build Failed to access build or staging ref %s", e); + throw die("Failed to access build or staging ref"); + } catch (NoSuchRefException e) { + logger.atSevere().log("staging-new-build Invalid branch name %s", e); + throw die("Invalid branch name"); + } catch (UpdateException | RestApiException e) { + logger.atSevere().log("staging-new-build failed to update change status %s", e); + throw die("Failed to update change status"); + } finally { + if (git != null) { + git.close(); + } } - + } } diff --git a/src/main/java/com/googlesource/gerrit/plugins/qtcodereview/QtCommandPing.java b/src/main/java/com/googlesource/gerrit/plugins/qtcodereview/QtCommandPing.java index 6d9dea0..a11d2d1 100644 --- a/src/main/java/com/googlesource/gerrit/plugins/qtcodereview/QtCommandPing.java +++ b/src/main/java/com/googlesource/gerrit/plugins/qtcodereview/QtCommandPing.java @@ -4,17 +4,18 @@ package com.googlesource.gerrit.plugins.qtcodereview; -import com.google.gerrit.sshd.SshCommand; import com.google.gerrit.sshd.CommandMetaData; +import com.google.gerrit.sshd.SshCommand; -@CommandMetaData(name="ping", description="Ping the SSH Command interface") +@CommandMetaData(name = "ping", description = "Ping the SSH Command interface") class QtCommandPing extends SshCommand { - @Override - protected void run() { - stdout.print(String.format("Pong\n username=%s\n name=%s\n email=%s\n", - user.asIdentifiedUser().getUserName(), - user.asIdentifiedUser().getName(), - user.asIdentifiedUser().getNameEmail())); - } + @Override + protected void run() { + stdout.print( + String.format( + "Pong\n username=%s\n name=%s\n email=%s\n", + user.asIdentifiedUser().getUserName(), + user.asIdentifiedUser().getName(), + user.asIdentifiedUser().getNameEmail())); + } } - diff --git a/src/main/java/com/googlesource/gerrit/plugins/qtcodereview/QtCommandRebuildStaging.java b/src/main/java/com/googlesource/gerrit/plugins/qtcodereview/QtCommandRebuildStaging.java index 32b1af9..ced9d3c 100644 --- a/src/main/java/com/googlesource/gerrit/plugins/qtcodereview/QtCommandRebuildStaging.java +++ b/src/main/java/com/googlesource/gerrit/plugins/qtcodereview/QtCommandRebuildStaging.java @@ -1,101 +1,96 @@ // -// Copyright (C) 2019 The Qt Company +// Copyright (C) 2019-22 The Qt Company // package com.googlesource.gerrit.plugins.qtcodereview; import com.google.common.flogger.FluentLogger; +import com.google.gerrit.entities.BranchNameKey; +import com.google.gerrit.entities.Project; import com.google.gerrit.extensions.restapi.AuthException; -import com.google.gerrit.reviewdb.client.Branch; -import com.google.gerrit.reviewdb.client.Change; -import com.google.gerrit.reviewdb.client.Project; -import com.google.gerrit.reviewdb.server.ReviewDb; import com.google.gerrit.server.git.GitRepositoryManager; import com.google.gerrit.server.permissions.PermissionBackend; import com.google.gerrit.server.permissions.PermissionBackendException; import com.google.gerrit.server.permissions.RefPermission; import com.google.gerrit.server.update.BatchUpdate; -import com.google.gerrit.sshd.SshCommand; import com.google.gerrit.sshd.CommandMetaData; - +import com.google.gerrit.sshd.SshCommand; import com.google.inject.Inject; -import com.google.inject.Provider; - +import java.io.IOException; import org.eclipse.jgit.errors.RepositoryNotFoundException; import org.eclipse.jgit.lib.Repository; import org.kohsuke.args4j.Option; -import java.io.IOException; - - -@CommandMetaData(name="staging-rebuild", description="Rebuild a staging branch.") +@CommandMetaData(name = "staging-rebuild", description = "Rebuild a staging branch.") class QtCommandRebuildStaging extends SshCommand { - @Inject - private PermissionBackend permissionBackend; - - @Inject - private GitRepositoryManager gitManager; - - @Inject - private ReviewDb db; - - @Inject - private BatchUpdate.Factory updateFactory; - - @Inject - private QtUtil qtUtil; - - @Option(name = "--project", aliases = {"-p"}, - required = true, usage = "project name") - private String project; - - @Option(name = "--branch", aliases = {"-b"}, - required = true, usage = "branch name, e.g. refs/heads/master or just master") - private String branch; - - private static final FluentLogger logger = FluentLogger.forEnclosingClass(); - - private Repository git; - - - @Override - protected void run() throws UnloggedFailure { - logger.atInfo().log("qtcodereview: staging-rebuild -p %s -b %s", project, branch); - - Branch.NameKey stagingBranchKey = QtUtil.getNameKeyLong(project, QtUtil.R_STAGING, branch); - Branch.NameKey destBranchShortKey = QtUtil.getNameKeyShort(project, QtUtil.R_HEADS, branch); - - try { - Project.NameKey projectKey = new Project.NameKey(project); - git = gitManager.openRepository(projectKey); - - permissionBackend.user(user).project(projectKey).ref(destBranchShortKey.get()).check(RefPermission.UPDATE); - - if (git.resolve(stagingBranchKey.get()) == null) throw die("branch staging ref not found"); - - qtUtil.rebuildStagingBranch(git, user.asIdentifiedUser(), projectKey, stagingBranchKey, destBranchShortKey); - - logger.atInfo().log("qtcodereview: staging-rebuild done for %s", stagingBranchKey); - } catch (AuthException e) { - logger.atSevere().log("qtcodereview: staging-rebuild Authentication failed to access repository: %s", e); - throw die("not authorized"); - } catch (PermissionBackendException e) { - logger.atSevere().log("qtcodereview: staging-rebuild permission error %s", e); - } catch (RepositoryNotFoundException e) { - logger.atSevere().log("qtcodereview: staging-rebuild repository not found: %s", e); - throw die("project not found"); - } catch (IOException e) { - logger.atSevere().log("qtcodereview: staging-rebuild IOException %s", e); - throw die(e.getMessage()); - } catch (QtUtil.MergeConflictException e) { - logger.atSevere().log("qtcodereview: staging-rebuild error %s", e); - throw die("staging rebuild failed, merge conflict"); - } finally { - if (git != null) { - git.close(); - } - } - + @Inject private PermissionBackend permissionBackend; + + @Inject private GitRepositoryManager gitManager; + + @Inject private BatchUpdate.Factory updateFactory; + + @Inject private QtUtil qtUtil; + + @Option( + name = "--project", + aliases = {"-p"}, + required = true, + usage = "project name") + private String project; + + @Option( + name = "--branch", + aliases = {"-b"}, + required = true, + usage = "branch name, e.g. refs/heads/master or just master") + private String branch; + + private static final FluentLogger logger = FluentLogger.forEnclosingClass(); + + private Repository git; + + @Override + protected void run() throws UnloggedFailure { + logger.atInfo().log("staging-rebuild -p %s -b %s", project, branch); + + BranchNameKey stagingBranchKey = QtUtil.getNameKeyLong(project, QtUtil.R_STAGING, branch); + BranchNameKey destBranchShortKey = QtUtil.getNameKeyShort(project, QtUtil.R_HEADS, branch); + + try { + Project.NameKey projectKey = Project.nameKey(project); + git = gitManager.openRepository(projectKey); + + permissionBackend + .user(user) + .project(projectKey) + .ref(destBranchShortKey.branch()) + .check(RefPermission.UPDATE); + + if (git.resolve(stagingBranchKey.branch()) == null) throw die("branch staging ref not found"); + + qtUtil.rebuildStagingBranch( + git, user.asIdentifiedUser(), projectKey, stagingBranchKey, destBranchShortKey); + + logger.atInfo().log("staging-rebuild done for %s", stagingBranchKey.shortName()); + } catch (AuthException e) { + logger.atSevere().log("staging-rebuild Authentication failed to access repository: %s", e); + throw die("not authorized"); + } catch (PermissionBackendException e) { + logger.atSevere().log("staging-rebuild permission error %s", e); + } catch (RepositoryNotFoundException e) { + logger.atSevere().log("staging-rebuild repository not found: %s", e); + throw die("project not found"); + } catch (IOException e) { + logger.atSevere().log("staging-rebuild IOException %s", e); + throw die(e.getMessage()); + } catch (QtUtil.MergeConflictException e) { + logger.atSevere().log("staging-rebuild error %s", e); + throw die("staging rebuild failed, merge conflict"); + } finally { + if (git != null) { + git.close(); + } } + } } diff --git a/src/main/java/com/googlesource/gerrit/plugins/qtcodereview/QtCommandStage.java b/src/main/java/com/googlesource/gerrit/plugins/qtcodereview/QtCommandStage.java index 5a851c4..5f0598d 100644 --- a/src/main/java/com/googlesource/gerrit/plugins/qtcodereview/QtCommandStage.java +++ b/src/main/java/com/googlesource/gerrit/plugins/qtcodereview/QtCommandStage.java @@ -1,76 +1,71 @@ // -// Copyright (C) 2019 The Qt Company +// Copyright (C) 2019-22 The Qt Company // package com.googlesource.gerrit.plugins.qtcodereview; import com.google.common.flogger.FluentLogger; - +import com.google.gerrit.entities.PatchSet; import com.google.gerrit.extensions.api.changes.SubmitInput; import com.google.gerrit.extensions.restapi.IdString; import com.google.gerrit.server.change.ChangeResource; import com.google.gerrit.server.change.RevisionResource; import com.google.gerrit.server.restapi.change.ChangesCollection; import com.google.gerrit.server.restapi.change.Revisions; -import com.google.gerrit.reviewdb.client.PatchSet; -import com.google.gerrit.sshd.SshCommand; import com.google.gerrit.sshd.CommandMetaData; +import com.google.gerrit.sshd.SshCommand; import com.google.gerrit.sshd.commands.PatchSetParser; -import com.google.gwtorm.server.OrmException; import com.google.inject.Inject; import java.util.HashSet; import java.util.Set; import org.kohsuke.args4j.Argument; -@CommandMetaData(name="stage", description="Stage a change.") +@CommandMetaData(name = "stage", description = "Stage a change.") class QtCommandStage extends SshCommand { - @Inject private QtStage qtStage; - @Inject private ChangesCollection changes; - @Inject private PatchSetParser psParser; - @Inject private Revisions revisions; + @Inject private QtStage qtStage; + @Inject private ChangesCollection changes; + @Inject private PatchSetParser psParser; + @Inject private Revisions revisions; - private static final FluentLogger logger = FluentLogger.forEnclosingClass(); + private static final FluentLogger logger = FluentLogger.forEnclosingClass(); - private final Set patchSets = new HashSet<>(); + private final Set patchSets = new HashSet<>(); - @Argument( - index = 0, - required = true, - multiValued = true, - metaVar = "{COMMIT | CHANGE,PATCHSET}", - usage = "list of commits or patch sets to stage") - void addPatchSetId(String token) { - try { - PatchSet ps = psParser.parsePatchSet(token, null, null); - patchSets.add(ps); - } catch (UnloggedFailure e) { - throw new IllegalArgumentException(e.getMessage(), e); - } catch (OrmException e) { - throw new IllegalArgumentException("database error", e); - } + @Argument( + index = 0, + required = true, + multiValued = true, + metaVar = "{COMMIT | CHANGE,PATCHSET}", + usage = "list of commits or patch sets to stage") + void addPatchSetId(String token) { + try { + PatchSet ps = psParser.parsePatchSet(token, null, null); + patchSets.add(ps); + } catch (UnloggedFailure e) { + throw new IllegalArgumentException(e.getMessage(), e); } + } - @Override - protected void run() throws UnloggedFailure { - boolean ok = true; + @Override + protected void run() throws UnloggedFailure { + boolean ok = true; - for (PatchSet patchSet : patchSets) { - try { - logger.atInfo().log("qtcodereview: ssh command stage %s", patchSet.getId()); - ChangeResource c = changes.parse(patchSet.getId().getParentKey()); - IdString id = IdString.fromDecoded(patchSet.getRevision().get()); - RevisionResource r = revisions.parse(c, id); - qtStage.apply(r, new SubmitInput()); - } catch (Exception e) { - ok = false; - writeError("error", e.getMessage() + "\n"); - } - } - - if (!ok) { - throw die("one or more stages failed; review output above"); - } + for (PatchSet patchSet : patchSets) { + try { + logger.atInfo().log("ssh command stage %s", patchSet.id()); + ChangeResource c = changes.parse(patchSet.id().changeId()); + IdString id = IdString.fromDecoded(patchSet.commitId().name()); + RevisionResource r = revisions.parse(c, id); + qtStage.apply(r, new SubmitInput()); + } catch (Exception e) { + ok = false; + writeError("error", e.getMessage() + "\n"); + } } + if (!ok) { + throw die("one or more stages failed; review output above"); + } + } } diff --git a/src/main/java/com/googlesource/gerrit/plugins/qtcodereview/QtDefer.java b/src/main/java/com/googlesource/gerrit/plugins/qtcodereview/QtDefer.java index 03452de..87ed166 100644 --- a/src/main/java/com/googlesource/gerrit/plugins/qtcodereview/QtDefer.java +++ b/src/main/java/com/googlesource/gerrit/plugins/qtcodereview/QtDefer.java @@ -1,6 +1,7 @@ // -// Copyright (C) 2019 The Qt Company -// Modified from https://gerrit.googlesource.com/gerrit/+/refs/heads/stable-2.16/java/com/google/gerrit/server/restapi/change/Abandon.java +// Copyright (C) 2019-22 The Qt Company +// Modified from +// https://gerrit.googlesource.com/gerrit/+/refs/heads/stable-2.16/java/com/google/gerrit/server/restapi/change/Abandon.java // // Copyright (C) 2012 The Android Open Source Project // @@ -18,15 +19,16 @@ package com.googlesource.gerrit.plugins.qtcodereview; -import com.google.common.base.Strings; import com.google.common.flogger.FluentLogger; +import com.google.gerrit.entities.Change; +import com.google.gerrit.exceptions.StorageException; import com.google.gerrit.extensions.api.changes.AbandonInput; import com.google.gerrit.extensions.common.ChangeInfo; import com.google.gerrit.extensions.restapi.ResourceConflictException; +import com.google.gerrit.extensions.restapi.Response; import com.google.gerrit.extensions.restapi.RestApiException; +import com.google.gerrit.extensions.restapi.RestModifyView; import com.google.gerrit.extensions.webui.UiAction; -import com.google.gerrit.reviewdb.client.Change; -import com.google.gerrit.reviewdb.server.ReviewDb; import com.google.gerrit.server.ChangeMessagesUtil; import com.google.gerrit.server.ChangeUtil; import com.google.gerrit.server.PatchSetUtil; @@ -35,95 +37,91 @@ import com.google.gerrit.server.permissions.ChangePermission; import com.google.gerrit.server.permissions.PermissionBackendException; import com.google.gerrit.server.update.BatchUpdate; -import com.google.gerrit.server.update.RetryHelper; -import com.google.gerrit.server.update.RetryingRestModifyView; import com.google.gerrit.server.update.UpdateException; import com.google.gerrit.server.util.time.TimeUtil; -import com.google.gwtorm.server.OrmException; import com.google.inject.Inject; -import com.google.inject.Provider; import com.google.inject.Singleton; import java.io.IOException; - @Singleton -class QtDefer extends RetryingRestModifyView - implements UiAction { - - private static final FluentLogger logger = FluentLogger.forEnclosingClass(); - - private final Provider dbProvider; - private final ChangeJson.Factory json; - private final PatchSetUtil psUtil; - private final QtChangeUpdateOp.Factory qtUpdateFactory; - - @Inject - QtDefer(Provider dbProvider, - ChangeJson.Factory json, - RetryHelper retryHelper, - PatchSetUtil psUtil, - QtChangeUpdateOp.Factory qtUpdateFactory) { - super(retryHelper); - this.dbProvider = dbProvider; - this.json = json; - this.psUtil = psUtil; - this.qtUpdateFactory = qtUpdateFactory; +public class QtDefer + implements RestModifyView, UiAction { + + private static final FluentLogger logger = FluentLogger.forEnclosingClass(); + + private final BatchUpdate.Factory updateFactory; + private final ChangeJson.Factory json; + private final PatchSetUtil psUtil; + private final QtChangeUpdateOp.Factory qtUpdateFactory; + + @Inject + QtDefer( + BatchUpdate.Factory updateFactory, + ChangeJson.Factory json, + PatchSetUtil psUtil, + QtChangeUpdateOp.Factory qtUpdateFactory) { + this.updateFactory = updateFactory; + this.json = json; + this.psUtil = psUtil; + this.qtUpdateFactory = qtUpdateFactory; + } + + @Override + public Response apply(ChangeResource rsrc, AbandonInput input) + throws RestApiException, UpdateException, PermissionBackendException, IOException { + Change change = rsrc.getChange(); + logger.atInfo().log("defer %s", rsrc.getChange().toString()); + + // Not allowed to defer if the current patch set is locked. + psUtil.checkPatchSetNotLocked(rsrc.getNotes()); + + // Defer uses same permission as abandon + rsrc.permissions().check(ChangePermission.ABANDON); + + if (change.getStatus() != Change.Status.NEW && change.getStatus() != Change.Status.ABANDONED) { + logger.atSevere().log("defer: change %s status wrong %s", change.getId(), change.getStatus()); + throw new ResourceConflictException("change is " + ChangeUtil.status(change)); } - @Override - protected ChangeInfo applyImpl(BatchUpdate.Factory updateFactory, - ChangeResource rsrc, - AbandonInput input) - throws RestApiException, UpdateException, - OrmException, PermissionBackendException, - IOException { - Change change = rsrc.getChange(); - logger.atInfo().log("qtcodereview: defer %s", rsrc.getChange().toString()); - - // Not allowed to defer if the current patch set is locked. - psUtil.checkPatchSetNotLocked(rsrc.getNotes()); - - // Defer uses same permission as abandon - rsrc.permissions().database(dbProvider).check(ChangePermission.ABANDON); + QtChangeUpdateOp op = + qtUpdateFactory.create( + Change.Status.DEFERRED, + null, + "Deferred", + input.message, + ChangeMessagesUtil.TAG_ABANDON, + null); + try (BatchUpdate u = + updateFactory.create(change.getProject(), rsrc.getUser(), TimeUtil.nowTs())) { + u.addOp(rsrc.getId(), op).execute(); + } - if (change.getStatus() != Change.Status.NEW && change.getStatus() != Change.Status.ABANDONED) { - logger.atSevere().log("qtcodereview: defer: change %s status wrong %s", change, change.getStatus()); - throw new ResourceConflictException("change is " + ChangeUtil.status(change)); - } + change = op.getChange(); + logger.atInfo().log("deferred %s,%s", change.getId(), change.getKey()); - QtChangeUpdateOp op = qtUpdateFactory.create(Change.Status.DEFERRED, null, "Deferred", input.message, ChangeMessagesUtil.TAG_ABANDON, null); - try (BatchUpdate u = updateFactory.create(dbProvider.get(), change.getProject(), rsrc.getUser(), TimeUtil.nowTs())) { - u.addOp(rsrc.getId(), op).execute(); - } + return Response.ok(json.noOptions().format(change)); + } - change = op.getChange(); - logger.atInfo().log("qtcodereview: deferred %s", change); + @Override + public UiAction.Description getDescription(ChangeResource rsrc) { + UiAction.Description description = + new UiAction.Description().setLabel("Defer").setTitle("Defer the change").setVisible(false); - return json.noOptions().format(change); + Change change = rsrc.getChange(); + if (change.getStatus() != Change.Status.NEW && change.getStatus() != Change.Status.ABANDONED) { + return description; } - @Override - public UiAction.Description getDescription(ChangeResource rsrc) { - UiAction.Description description = new UiAction.Description() - .setLabel("Defer") - .setTitle("Defer the change") - .setVisible(false); - - Change change = rsrc.getChange(); - if (change.getStatus() != Change.Status.NEW && change.getStatus() != Change.Status.ABANDONED) { - return description; - } - - try { - if (psUtil.isPatchSetLocked(rsrc.getNotes())) { - return description; - } - } catch (OrmException | IOException e) { - logger.atSevere().withCause(e).log("Failed to check if the current patch set of change %s is locked", change.getId()); - return description; - } - - return description.setVisible(rsrc.permissions().testOrFalse(ChangePermission.ABANDON)); + try { + if (psUtil.isPatchSetLocked(rsrc.getNotes())) { + return description; + } + } catch (StorageException e) { + logger.atSevere().withCause(e).log( + "Failed to check if the current patch set of change %s is locked", change.getId()); + return description; } + return description.setVisible(rsrc.permissions().testOrFalse(ChangePermission.ABANDON)); + } } diff --git a/src/main/java/com/googlesource/gerrit/plugins/qtcodereview/QtEmailSender.java b/src/main/java/com/googlesource/gerrit/plugins/qtcodereview/QtEmailSender.java new file mode 100644 index 0000000..af0cee5 --- /dev/null +++ b/src/main/java/com/googlesource/gerrit/plugins/qtcodereview/QtEmailSender.java @@ -0,0 +1,52 @@ +// +// Copyright (C) 2021 The Qt Company +// + +package com.googlesource.gerrit.plugins.qtcodereview; + +import com.google.common.flogger.FluentLogger; +import com.google.gerrit.entities.Account; +import com.google.gerrit.entities.Change; +import com.google.gerrit.entities.Project; +import com.google.gerrit.server.mail.send.MergedSender; +import com.google.gerrit.server.mail.send.MessageIdGenerator; +import com.google.gerrit.server.util.time.TimeUtil; +import com.google.inject.Inject; +import com.google.inject.Singleton; +import java.util.Optional; + +@Singleton +public class QtEmailSender { + + @Inject private MergedSender.Factory mergedSenderFactory; + + @Inject private QtBuildFailedSender.Factory qtBuildFailedSenderFactory; + + @Inject private MessageIdGenerator messageIdGenerator; + + private static final FluentLogger logger = FluentLogger.forEnclosingClass(); + + public void sendMergedEmail(Project.NameKey projectKey, Change change, Account.Id fromAccount) { + try { + MergedSender mcm = mergedSenderFactory.create(projectKey, change.getId(), Optional.empty()); + mcm.setFrom(fromAccount); + mcm.setMessageId(messageIdGenerator.fromChangeUpdate(projectKey, change.currentPatchSetId())); + mcm.send(); + } catch (Exception e) { + logger.atWarning().log("Merged notification not sent for %s %s", change.getId(), e); + } + } + + public void sendBuildFailedEmail( + Project.NameKey projectKey, Change change, Account.Id fromAccount, String message) { + try { + QtBuildFailedSender cm = qtBuildFailedSenderFactory.create(projectKey, change.getId()); + cm.setFrom(fromAccount); + cm.setMessageId(messageIdGenerator.fromChangeUpdate(projectKey, change.currentPatchSetId())); + cm.setChangeMessage(message, TimeUtil.nowTs()); + cm.send(); + } catch (Exception e) { + logger.atWarning().log("Build Failed not sent notification for %s %s", change.getId(), e); + } + } +} diff --git a/src/main/java/com/googlesource/gerrit/plugins/qtcodereview/QtModule.java b/src/main/java/com/googlesource/gerrit/plugins/qtcodereview/QtModule.java index c264e3a..5b17e51 100644 --- a/src/main/java/com/googlesource/gerrit/plugins/qtcodereview/QtModule.java +++ b/src/main/java/com/googlesource/gerrit/plugins/qtcodereview/QtModule.java @@ -1,5 +1,5 @@ // -// Copyright (C) 2019 The Qt Company +// Copyright (C) 2020-22 The Qt Company // package com.googlesource.gerrit.plugins.qtcodereview; @@ -7,39 +7,48 @@ import static com.google.gerrit.server.change.ChangeResource.CHANGE_KIND; import static com.google.gerrit.server.change.RevisionResource.REVISION_KIND; -import com.google.common.flogger.FluentLogger; +import com.google.gerrit.extensions.annotations.Exports; import com.google.gerrit.extensions.config.FactoryModule; import com.google.gerrit.extensions.registration.DynamicSet; import com.google.gerrit.extensions.restapi.RestApiModule; +import com.google.gerrit.server.config.ProjectConfigEntry; +import com.google.gerrit.server.events.EventTypes; import com.google.gerrit.server.git.ChangeMessageModifier; - -import com.google.inject.Inject; -import com.google.inject.AbstractModule; - -public class QtModule extends FactoryModule { - - private static final FluentLogger logger = FluentLogger.forEnclosingClass(); - - @Override - protected void configure() { - - factory(QtBuildFailedSender.Factory.class); - factory(QtChangeUpdateOp.Factory.class); - DynamicSet.bind(binder(), ChangeMessageModifier.class).to(QtChangeMessageModifier.class); - - install( - new RestApiModule() { - @Override - protected void configure() { - post(CHANGE_KIND, "abandon").to(QtAbandon.class); - post(CHANGE_KIND, "defer").to(QtDefer.class); - post(CHANGE_KIND, "reopen").to(QtReOpen.class); - post(REVISION_KIND, "stage").to(QtStage.class); - post(REVISION_KIND, "unstage").to(QtUnStage.class); - } - } - ); - - } - +import com.google.gerrit.server.mail.send.MailSoyTemplateProvider; + +public class QtModule extends FactoryModule { + + static { + EventTypes.register(QtChangeStagedEvent.TYPE, QtChangeStagedEvent.class); + EventTypes.register(QtChangeUnStagedEvent.TYPE, QtChangeUnStagedEvent.class); + EventTypes.register(QtChangePreCheckEvent.TYPE, QtChangePreCheckEvent.class); + } + + @Override + protected void configure() { + + // Plugin settings + bind(ProjectConfigEntry.class) + .annotatedWith(Exports.named("showReviewedOnFooter")) + .toInstance(new ProjectConfigEntry("Show 'Reviewed-on' footer in commit messages", false)); + + factory(QtBuildFailedSender.Factory.class); + factory(QtChangeUpdateOp.Factory.class); + DynamicSet.bind(binder(), ChangeMessageModifier.class).to(QtChangeMessageModifier.class); + DynamicSet.bind(binder(), MailSoyTemplateProvider.class) + .to(QtBuildFailedEmailTemplateRegister.class); + + install( + new RestApiModule() { + @Override + protected void configure() { + post(CHANGE_KIND, "abandon").to(QtAbandon.class); + post(CHANGE_KIND, "defer").to(QtDefer.class); + post(CHANGE_KIND, "reopen").to(QtReOpen.class); + post(REVISION_KIND, "stage").to(QtStage.class); + post(REVISION_KIND, "unstage").to(QtUnStage.class); + post(REVISION_KIND, "precheck").to(QtPreCheck.class); + } + }); + } } diff --git a/src/main/java/com/googlesource/gerrit/plugins/qtcodereview/QtPreCheck.java b/src/main/java/com/googlesource/gerrit/plugins/qtcodereview/QtPreCheck.java new file mode 100644 index 0000000..0a89a40 --- /dev/null +++ b/src/main/java/com/googlesource/gerrit/plugins/qtcodereview/QtPreCheck.java @@ -0,0 +1,194 @@ +// +// Copyright (C) 2021-22 The Qt Company +// + +package com.googlesource.gerrit.plugins.qtcodereview; + +import com.google.common.base.MoreObjects; +import com.google.common.base.Strings; +import com.google.common.collect.ImmutableMap; +import com.google.common.flogger.FluentLogger; +import com.google.gerrit.common.data.ParameterizedString; +import com.google.gerrit.entities.Change; +import com.google.gerrit.extensions.common.InputWithMessage; +import com.google.gerrit.extensions.restapi.AuthException; +import com.google.gerrit.extensions.restapi.Response; +import com.google.gerrit.extensions.restapi.RestApiException; +import com.google.gerrit.extensions.restapi.RestModifyView; +import com.google.gerrit.extensions.webui.UiAction; +import com.google.gerrit.server.change.RevisionResource; +import com.google.gerrit.server.config.GerritServerConfig; +import com.google.gerrit.server.config.PluginConfigFactory; +import com.google.gerrit.server.permissions.LabelPermission; +import com.google.gerrit.server.permissions.LabelPermission.ForUser; +import com.google.gerrit.server.permissions.PermissionBackend; +import com.google.gerrit.server.permissions.PermissionBackendException; +import com.google.gerrit.server.update.BatchUpdate; +import com.google.gerrit.server.update.UpdateException; +import com.google.gerrit.server.util.time.TimeUtil; +import com.google.inject.Inject; +import com.google.inject.Singleton; +import com.googlesource.gerrit.plugins.qtcodereview.QtPrecheckMessage; +import java.io.IOException; +import java.util.Arrays; +import java.util.Map; +import org.eclipse.jgit.errors.ConfigInvalidException; +import org.eclipse.jgit.errors.RepositoryNotFoundException; +import org.eclipse.jgit.lib.Config; +import org.eclipse.jgit.lib.ObjectId; + +@Singleton +public class QtPreCheck + implements RestModifyView, UiAction { + + private static final FluentLogger logger = FluentLogger.forEnclosingClass(); + private static final String DEFAULT_TOOLTIP = "Trigger a precheck integration"; + private static final String DEFAULT_TOOLTIP_DISABLED = "Precheck disabled for this project"; + private static final String LABEL_CODE_REVIEW = "Code-Review"; + private static final short LABEL_CODE_REVIEW_VALUE = 2; + + public static class Output { + transient Change change; + + private Output(Change c) { + change = c; + } + } + + private final PermissionBackend permissionBackend; + private final BatchUpdate.Factory updateFactory; + private final QtUtil qtUtil; + private final String label; + private final ParameterizedString titlePattern; + private final ParameterizedString titlePatternDisabled; + + @Inject private PluginConfigFactory pluginCfg; + + @Inject private QtChangeUpdateOp.Factory qtUpdateFactory; + + @Inject + QtPreCheck( + PermissionBackend permissionBackend, + @GerritServerConfig Config cfg, + BatchUpdate.Factory updateFactory, + QtUtil qtUtil) { + + this.permissionBackend = permissionBackend; + this.updateFactory = updateFactory; + this.qtUtil = qtUtil; + this.label = "PreCheck"; + this.titlePattern = + new ParameterizedString( + MoreObjects.firstNonNull( + cfg.getString("precheck", null, "precheckTooltip"), DEFAULT_TOOLTIP)); + this.titlePatternDisabled = + new ParameterizedString( + MoreObjects.firstNonNull( + cfg.getString("precheck", null, "precheckTooltip"), DEFAULT_TOOLTIP_DISABLED)); + } + + @Override + public Response apply(RevisionResource rsrc, QtPrecheckMessage in) + throws RestApiException, RepositoryNotFoundException, IOException, PermissionBackendException, + UpdateException, ConfigInvalidException { + logger.atInfo().log("precheck request for %s", rsrc.getChange().toString()); + + boolean canReview; + + canReview = + rsrc.permissions() + .test( + new LabelPermission.WithValue( + ForUser.SELF, LABEL_CODE_REVIEW, LABEL_CODE_REVIEW_VALUE)); + + if (!canReview) { + throw new AuthException( + String.format( + "Precheck request from user %s without permission, %s", + rsrc.getUser().getUserName(), rsrc.getChange().toString())); + } + + if (!isPreCheckAllowed(rsrc)) { + throw new AuthException( + String.format( + "Precheck request for project not allowed, %s", rsrc.getChange().toString())); + } + + Change change = rsrc.getChange(); + Output output; + output = new Output(change); + this.qtUtil.postChangePreCheckEvent(change, rsrc.getPatchSet(), in); + + // Generate user friendly message + StringBuilder msg = new StringBuilder(); + msg.append("type: " + in.type); + msg.append(", buildonly: " + in.onlyBuild); + if (in.type.equals("custom")) { + msg.append(", input: " + in.platforms); + } + + QtChangeUpdateOp op = + qtUpdateFactory.create( + null, + null, + String.format("Precheck requested with params %s", msg.toString()), + null, + QtUtil.TAG_CI, + null); + try (BatchUpdate u = + updateFactory.create(change.getProject(), rsrc.getUser(), TimeUtil.nowTs())) { + u.addOp(change.getId(), op).execute(); + } + return Response.ok(output); + } + + @Override + public UiAction.Description getDescription(RevisionResource resource) { + boolean canReview; + try { + canReview = + resource + .permissions() + .test( + new LabelPermission.WithValue( + ForUser.SELF, LABEL_CODE_REVIEW, LABEL_CODE_REVIEW_VALUE)); + } catch (PermissionBackendException e) { + logger.atInfo().log(e.getMessage()); + return null; + } + + if (!canReview) { + return null; + } + + Change change = resource.getChange(); + if (!change.getStatus().isOpen() || !resource.isCurrent()) { + return null; // precheck not visible + } + + boolean enabled = isPreCheckAllowed(resource); + + ObjectId revId = resource.getPatchSet().commitId(); + Map params = + ImmutableMap.of( + "patchSet", String.valueOf(resource.getPatchSet().number()), + "branch", change.getDest().shortName(), + "commit", revId.abbreviate(7).name()); + return new UiAction.Description() + .setLabel(this.label) + .setTitle( + Strings.emptyToNull( + enabled ? titlePattern.replace(params) : titlePatternDisabled.replace(params))) + .setVisible(true) + .setEnabled(enabled); + } + + private boolean isPreCheckAllowed(RevisionResource resource) { + String[] disabledProjects = + pluginCfg + .getGlobalPluginConfig("gerrit-plugin-qt-workflow") + .getStringList("precheck", "disabled", "projects"); + + return !Arrays.asList(disabledProjects).contains(resource.getProject().get()); + } +} diff --git a/src/main/java/com/googlesource/gerrit/plugins/qtcodereview/QtPrecheckMessage.java b/src/main/java/com/googlesource/gerrit/plugins/qtcodereview/QtPrecheckMessage.java new file mode 100644 index 0000000..205dbb2 --- /dev/null +++ b/src/main/java/com/googlesource/gerrit/plugins/qtcodereview/QtPrecheckMessage.java @@ -0,0 +1,17 @@ +// +// Copyright (C) 2023 The Qt Company +// + +package com.googlesource.gerrit.plugins.qtcodereview; + +public class QtPrecheckMessage { + public boolean onlyBuild; + public String type; + public String platforms; + + public QtPrecheckMessage(boolean onlyBuild, String type, String platforms) { + this.onlyBuild = onlyBuild; + this.type = type; + this.platforms = platforms; + } +} diff --git a/src/main/java/com/googlesource/gerrit/plugins/qtcodereview/QtReOpen.java b/src/main/java/com/googlesource/gerrit/plugins/qtcodereview/QtReOpen.java index 3e90109..a610210 100644 --- a/src/main/java/com/googlesource/gerrit/plugins/qtcodereview/QtReOpen.java +++ b/src/main/java/com/googlesource/gerrit/plugins/qtcodereview/QtReOpen.java @@ -1,19 +1,21 @@ // -// Copyright (C) 2019 The Qt Company +// Copyright (C) 2019-22 The Qt Company // - package com.googlesource.gerrit.plugins.qtcodereview; -import com.google.common.base.Strings; +import static com.google.gerrit.server.project.ProjectCache.illegalState; + import com.google.common.flogger.FluentLogger; +import com.google.gerrit.entities.Change; +import com.google.gerrit.exceptions.StorageException; import com.google.gerrit.extensions.api.changes.RestoreInput; import com.google.gerrit.extensions.common.ChangeInfo; import com.google.gerrit.extensions.restapi.ResourceConflictException; +import com.google.gerrit.extensions.restapi.Response; import com.google.gerrit.extensions.restapi.RestApiException; +import com.google.gerrit.extensions.restapi.RestModifyView; import com.google.gerrit.extensions.webui.UiAction; -import com.google.gerrit.reviewdb.client.Change; -import com.google.gerrit.reviewdb.server.ReviewDb; import com.google.gerrit.server.ChangeUtil; import com.google.gerrit.server.PatchSetUtil; import com.google.gerrit.server.change.ChangeJson; @@ -21,111 +23,113 @@ import com.google.gerrit.server.permissions.ChangePermission; import com.google.gerrit.server.permissions.PermissionBackendException; import com.google.gerrit.server.project.ProjectCache; +import com.google.gerrit.server.project.ProjectState; import com.google.gerrit.server.update.BatchUpdate; -import com.google.gerrit.server.update.RetryHelper; -import com.google.gerrit.server.update.RetryingRestModifyView; import com.google.gerrit.server.update.UpdateException; import com.google.gerrit.server.util.time.TimeUtil; -import com.google.gwtorm.server.OrmException; import com.google.inject.Inject; -import com.google.inject.Provider; import com.google.inject.Singleton; import java.io.IOException; - @Singleton -class QtReOpen extends RetryingRestModifyView - implements UiAction { - - private static final FluentLogger logger = FluentLogger.forEnclosingClass(); - - private final Provider dbProvider; - private final ChangeJson.Factory json; - private final PatchSetUtil psUtil; - private final ProjectCache projectCache; - private final QtChangeUpdateOp.Factory qtUpdateFactory; - - @Inject - QtReOpen(Provider dbProvider, - ChangeJson.Factory json, - PatchSetUtil psUtil, - RetryHelper retryHelper, - ProjectCache projectCache, - QtChangeUpdateOp.Factory qtUpdateFactory) { - super(retryHelper); - this.dbProvider = dbProvider; - this.json = json; - this.psUtil = psUtil; - this.projectCache = projectCache; - this.qtUpdateFactory = qtUpdateFactory; +class QtReOpen implements RestModifyView, UiAction { + + private static final FluentLogger logger = FluentLogger.forEnclosingClass(); + + private final BatchUpdate.Factory updateFactory; + private final ChangeJson.Factory json; + private final PatchSetUtil psUtil; + private final ProjectCache projectCache; + private final QtChangeUpdateOp.Factory qtUpdateFactory; + + @Inject + QtReOpen( + BatchUpdate.Factory updateFactory, + ChangeJson.Factory json, + PatchSetUtil psUtil, + ProjectCache projectCache, + QtChangeUpdateOp.Factory qtUpdateFactory) { + this.updateFactory = updateFactory; + this.json = json; + this.psUtil = psUtil; + this.projectCache = projectCache; + this.qtUpdateFactory = qtUpdateFactory; + } + + @Override + public Response apply(ChangeResource rsrc, RestoreInput input) + throws RestApiException, UpdateException, PermissionBackendException, IOException { + Change change = rsrc.getChange(); + logger.atInfo().log("reopen %s", change); + + // Not allowed to restore if the current patch set is locked. + psUtil.checkPatchSetNotLocked(rsrc.getNotes()); + + // Use same permission as Restore. Note that Abandon permission grants the + // Restore if the user also has push permission on the change’s destination ref. + rsrc.permissions().check(ChangePermission.RESTORE); + projectCache + .get(rsrc.getProject()) + .orElseThrow(illegalState(rsrc.getProject())) + .checkStatePermitsWrite(); + + if (change.getStatus() != Change.Status.DEFERRED) { + logger.atSevere().log("reopen %s status wrong %s", change.getId(), change.getStatus()); + throw new ResourceConflictException("change is " + ChangeUtil.status(change)); } + QtChangeUpdateOp op = + qtUpdateFactory.create( + Change.Status.NEW, + Change.Status.DEFERRED, + "Reopened", + input.message, + QtUtil.TAG_REOPENED, + null); + try (BatchUpdate u = + updateFactory.create(change.getProject(), rsrc.getUser(), TimeUtil.nowTs())) { + u.addOp(rsrc.getId(), op).execute(); + } + + change = op.getChange(); + logger.atInfo().log("reopened %s,%s", change.getId(), change.getKey()); + return Response.ok(json.noOptions().format(change)); + } + + @Override + public UiAction.Description getDescription(ChangeResource rsrc) { + UiAction.Description description = + new UiAction.Description() + .setLabel("Reopen") + .setTitle("Reopen the change") + .setVisible(false); + + Change change = rsrc.getChange(); + if (change.getStatus() != Change.Status.DEFERRED) { + return description; + } - @Override - protected ChangeInfo applyImpl(BatchUpdate.Factory updateFactory, - ChangeResource rsrc, - RestoreInput input) - throws RestApiException, UpdateException, - OrmException, PermissionBackendException, - IOException { - Change change = rsrc.getChange(); - logger.atInfo().log("qtcodereview: reopen %s", change); - - // Not allowed to restore if the current patch set is locked. - psUtil.checkPatchSetNotLocked(rsrc.getNotes()); - - // Use same permission as Restore. Note that Abandon permission grants the - // Restore if the user also has push permission on the change’s destination ref. - rsrc.permissions().database(dbProvider).check(ChangePermission.RESTORE); - projectCache.checkedGet(rsrc.getProject()).checkStatePermitsWrite(); - - if (change.getStatus() != Change.Status.DEFERRED) { - logger.atSevere().log("qtcodereview: reopen %s status wrong %s", change, change.getStatus()); - throw new ResourceConflictException("change is " + ChangeUtil.status(change)); - } - - QtChangeUpdateOp op = qtUpdateFactory.create(Change.Status.NEW, Change.Status.DEFERRED, "Reopened", input.message, QtUtil.TAG_REOPENED, null); - try (BatchUpdate u = updateFactory.create(dbProvider.get(), change.getProject(), rsrc.getUser(), TimeUtil.nowTs())) { - u.addOp(rsrc.getId(), op).execute(); - } - - change = op.getChange(); - logger.atInfo().log("qtcodereview: reopened %s", change); - return json.noOptions().format(change); + try { + if (!projectCache.get(rsrc.getProject()).map(ProjectState::statePermitsRead).orElse(false)) { + return description; + } + } catch (StorageException e) { + logger.atSevere().withCause(e).log( + "Failed to check if project state permits write: %s", rsrc.getProject()); + return description; } - @Override - public UiAction.Description getDescription(ChangeResource rsrc) { - UiAction.Description description = new UiAction.Description() - .setLabel("Reopen") - .setTitle("Reopen the change") - .setVisible(false); - - Change change = rsrc.getChange(); - if (change.getStatus() != Change.Status.DEFERRED) { - return description; - } - - try { - if (!projectCache.checkedGet(rsrc.getProject()).statePermitsWrite()) { - return description; - } - } catch (IOException e) { - logger.atSevere().withCause(e).log("Failed to check if project state permits write: %s", rsrc.getProject()); - return description; - } - - try { - if (psUtil.isPatchSetLocked(rsrc.getNotes())) { - return description; - } - } catch (OrmException | IOException e) { - logger.atSevere().withCause(e).log("Failed to check if the current patch set of change %s is locked", change.getId()); - return description; - } - - boolean visible = rsrc.permissions().database(dbProvider).testOrFalse(ChangePermission.RESTORE); - return description.setVisible(visible); + try { + if (psUtil.isPatchSetLocked(rsrc.getNotes())) { + return description; + } + } catch (StorageException e) { + logger.atSevere().withCause(e).log( + "Failed to check if the current patch set of change %s is locked", change.getId()); + return description; } + boolean visible = rsrc.permissions().testOrFalse(ChangePermission.RESTORE); + return description.setVisible(visible); + } } diff --git a/src/main/java/com/googlesource/gerrit/plugins/qtcodereview/QtSshModule.java b/src/main/java/com/googlesource/gerrit/plugins/qtcodereview/QtSshModule.java index 8d72353..04aefc5 100644 --- a/src/main/java/com/googlesource/gerrit/plugins/qtcodereview/QtSshModule.java +++ b/src/main/java/com/googlesource/gerrit/plugins/qtcodereview/QtSshModule.java @@ -8,14 +8,14 @@ class QtSshModule extends PluginCommandModule { - @Override - protected void configureCommands() { - command(QtCommandPing.class); - command(QtCommandAdminChangeStatus.class); - command(QtCommandBuildApprove.class); - command(QtCommandNewBuild.class); - command(QtCommandListStaging.class); - command(QtCommandRebuildStaging.class); - command(QtCommandStage.class); - } + @Override + protected void configureCommands() { + command(QtCommandPing.class); + command(QtCommandAdminChangeStatus.class); + command(QtCommandBuildApprove.class); + command(QtCommandNewBuild.class); + command(QtCommandListStaging.class); + command(QtCommandRebuildStaging.class); + command(QtCommandStage.class); + } } diff --git a/src/main/java/com/googlesource/gerrit/plugins/qtcodereview/QtStage.java b/src/main/java/com/googlesource/gerrit/plugins/qtcodereview/QtStage.java index 3a63981..61472b3 100644 --- a/src/main/java/com/googlesource/gerrit/plugins/qtcodereview/QtStage.java +++ b/src/main/java/com/googlesource/gerrit/plugins/qtcodereview/QtStage.java @@ -1,27 +1,28 @@ // -// Copyright (C) 2019 The Qt Company +// Copyright (C) 2020-22 The Qt Company // package com.googlesource.gerrit.plugins.qtcodereview; +import static com.google.gerrit.server.project.ProjectCache.illegalState; + import com.google.common.base.MoreObjects; import com.google.common.base.Strings; import com.google.common.collect.ImmutableMap; import com.google.common.flogger.FluentLogger; import com.google.gerrit.common.data.ParameterizedString; +import com.google.gerrit.entities.BranchNameKey; +import com.google.gerrit.entities.Change; +import com.google.gerrit.entities.Change.Status; +import com.google.gerrit.entities.PatchSet; +import com.google.gerrit.entities.Project; +import com.google.gerrit.exceptions.StorageException; import com.google.gerrit.extensions.api.changes.SubmitInput; -import com.google.gerrit.extensions.restapi.AuthException; import com.google.gerrit.extensions.restapi.ResourceConflictException; +import com.google.gerrit.extensions.restapi.Response; import com.google.gerrit.extensions.restapi.RestApiException; import com.google.gerrit.extensions.restapi.RestModifyView; -import com.google.gerrit.extensions.restapi.UnprocessableEntityException; import com.google.gerrit.extensions.webui.UiAction; -import com.google.gerrit.reviewdb.client.Branch; -import com.google.gerrit.reviewdb.client.Change; -import com.google.gerrit.reviewdb.client.Project; -import com.google.gerrit.reviewdb.client.RevId; -import com.google.gerrit.reviewdb.server.ReviewDb; -import com.google.gerrit.server.CurrentUser; import com.google.gerrit.server.IdentifiedUser; import com.google.gerrit.server.ProjectUtil; import com.google.gerrit.server.account.AccountResolver; @@ -33,234 +34,295 @@ import com.google.gerrit.server.permissions.ChangePermission; import com.google.gerrit.server.permissions.PermissionBackend; import com.google.gerrit.server.permissions.PermissionBackendException; -import com.google.gerrit.server.permissions.RefPermission; +import com.google.gerrit.server.project.NoSuchRefException; import com.google.gerrit.server.project.ProjectCache; +import com.google.gerrit.server.project.ProjectState; import com.google.gerrit.server.query.change.ChangeData; import com.google.gerrit.server.query.change.InternalChangeQuery; -import com.google.gerrit.server.project.NoSuchRefException; -import com.google.gerrit.server.submit.IntegrationException; +import com.google.gerrit.server.submit.IntegrationConflictException; import com.google.gerrit.server.submit.MergeOp; import com.google.gerrit.server.update.UpdateException; -import com.google.gwtorm.server.OrmException; -import com.google.gwtorm.server.OrmRuntimeException; import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.Singleton; import java.io.IOException; +import java.util.List; import java.util.Map; +import java.util.concurrent.locks.ReentrantLock; import org.eclipse.jgit.errors.ConfigInvalidException; import org.eclipse.jgit.errors.RepositoryNotFoundException; import org.eclipse.jgit.lib.Config; import org.eclipse.jgit.lib.ObjectId; -import org.eclipse.jgit.lib.Repository; import org.eclipse.jgit.lib.RefUpdate.Result; +import org.eclipse.jgit.lib.Repository; +import org.eclipse.jgit.revwalk.RevCommit; +import org.eclipse.jgit.revwalk.RevWalk; @Singleton -public class QtStage implements RestModifyView, - UiAction { +public class QtStage + implements RestModifyView, UiAction { - private static final FluentLogger logger = FluentLogger.forEnclosingClass(); + private static final FluentLogger logger = FluentLogger.forEnclosingClass(); - private static final String DEFAULT_TOOLTIP = "Stage patch set ${patchSet} into ${branch}"; + private static final String DEFAULT_TOOLTIP = "Stage patch set ${patchSet} into ${branch}"; - public static class Output { - transient Change change; - private Output(Change c) { - change = c; - } - } + public static class Output { + transient Change change; - private final Provider dbProvider; - private final GitRepositoryManager repoManager; - private final PermissionBackend permissionBackend; - private final ChangeData.Factory changeDataFactory; - private final ProjectCache projectCache; - private final GitReferenceUpdated referenceUpdated; - private final QtCherryPickPatch qtCherryPickPatch; - private final QtUtil qtUtil; - - private final AccountResolver accountResolver; - private final String label; - private final ParameterizedString titlePattern; - - private Change change; - private Project.NameKey projectKey; - private Branch.NameKey destBranchKey; - private Branch.NameKey stagingBranchKey; - - @Inject - QtStage(Provider dbProvider, - GitRepositoryManager repoManager, - PermissionBackend permissionBackend, - ChangeData.Factory changeDataFactory, - AccountResolver accountResolver, - @GerritServerConfig Config cfg, - ProjectCache projectCache, - GitReferenceUpdated referenceUpdated, - QtCherryPickPatch qtCherryPickPatch, - QtUtil qtUtil) { - - this.dbProvider = dbProvider; - this.repoManager = repoManager; - this.permissionBackend = permissionBackend; - this.changeDataFactory = changeDataFactory; - this.accountResolver = accountResolver; - this.label = "Stage"; - this.titlePattern = - new ParameterizedString( - MoreObjects.firstNonNull( - cfg.getString("change", null, "stageTooltip"), DEFAULT_TOOLTIP)); - this.projectCache = projectCache; - this.referenceUpdated = referenceUpdated; - this.qtCherryPickPatch = qtCherryPickPatch; - this.qtUtil = qtUtil; + private Output(Change c) { + change = c; } + } - @Override - public Output apply(RevisionResource rsrc, SubmitInput input) - throws RestApiException, RepositoryNotFoundException, IOException, OrmException, - PermissionBackendException, UpdateException, ConfigInvalidException { - - logger.atInfo().log("qtcodereview: stage %s", rsrc.getChange().toString()); - - IdentifiedUser submitter = rsrc.getUser().asIdentifiedUser(); - change = rsrc.getChange(); - projectKey = rsrc.getProject(); - destBranchKey = change.getDest(); - stagingBranchKey = QtUtil.getStagingBranch(destBranchKey); + private final ReentrantLock stageLock = new ReentrantLock(); + private final GitRepositoryManager repoManager; + private final PermissionBackend permissionBackend; + private final ChangeData.Factory changeDataFactory; + private final ProjectCache projectCache; + private final GitReferenceUpdated referenceUpdated; + private final QtCherryPickPatch qtCherryPickPatch; + private final QtUtil qtUtil; + private final Provider queryProvider; + + private final AccountResolver accountResolver; + private final String label; + private final ParameterizedString titlePattern; + + private Change change; + private Project.NameKey projectKey; + private BranchNameKey destBranchKey; + private BranchNameKey stagingBranchKey; + + @Inject + QtStage( + GitRepositoryManager repoManager, + PermissionBackend permissionBackend, + ChangeData.Factory changeDataFactory, + AccountResolver accountResolver, + @GerritServerConfig Config cfg, + ProjectCache projectCache, + GitReferenceUpdated referenceUpdated, + QtCherryPickPatch qtCherryPickPatch, + QtUtil qtUtil, + Provider queryProvider) { + + this.repoManager = repoManager; + this.permissionBackend = permissionBackend; + this.changeDataFactory = changeDataFactory; + this.accountResolver = accountResolver; + this.label = "Stage"; + this.titlePattern = + new ParameterizedString( + MoreObjects.firstNonNull( + cfg.getString("change", null, "stageTooltip"), DEFAULT_TOOLTIP)); + this.projectCache = projectCache; + this.referenceUpdated = referenceUpdated; + this.qtCherryPickPatch = qtCherryPickPatch; + this.qtUtil = qtUtil; + this.queryProvider = queryProvider; + } - rsrc.permissions().check(ChangePermission.QT_STAGE); + @Override + public Response apply(RevisionResource rsrc, SubmitInput input) + throws RestApiException, RepositoryNotFoundException, IOException, PermissionBackendException, + UpdateException, ConfigInvalidException { + + Output output; + logger.atInfo().log("stage request reveived for %s", rsrc.getChange().toString()); + + stageLock.lock(); // block processing of parallel stage requests + try { + IdentifiedUser submitter = rsrc.getUser().asIdentifiedUser(); + change = rsrc.getChange(); + projectKey = rsrc.getProject(); + destBranchKey = change.getDest(); + stagingBranchKey = QtUtil.getStagingBranch(destBranchKey); + + rsrc.permissions().check(ChangePermission.QT_STAGE); + projectCache + .get(rsrc.getProject()) + .orElseThrow(illegalState(rsrc.getProject())) + .checkStatePermitsWrite(); + + output = new Output(changeToStaging(rsrc, submitter, input)); + } finally { + stageLock.unlock(); + } - projectCache.checkedGet(rsrc.getProject()).checkStatePermitsWrite(); + return Response.ok(output); + } - return new Output(changeToStaging(rsrc, submitter, input)); + private Change changeToStaging(RevisionResource rsrc, IdentifiedUser submitter, SubmitInput input) + throws RestApiException, IOException, UpdateException, ConfigInvalidException, + PermissionBackendException { + logger.atInfo().log("changeToStaging starts for %s", change.getId()); + + if (change.getStatus() != Change.Status.NEW) { + logger.atSevere().log( + "stage: change %s status wrong: %s", change.getId(), change.getStatus()); + throw new ResourceConflictException("Change is " + change.getStatus()); + } else if (!ProjectUtil.branchExists(repoManager, change.getDest())) { + logger.atSevere().log( + "stage: change %s destination branch \"%s\" not found", + change, change.getDest().branch()); + throw new ResourceConflictException( + String.format("Destination branch \"%s\" not found.", change.getDest().branch())); + } else if (!rsrc.getPatchSet().id().equals(change.currentPatchSetId())) { + logger.atSevere().log( + "stage: change %s revision %s is not current revision", + change.getId(), rsrc.getPatchSet().commitId()); + throw new ResourceConflictException( + String.format("Revision %s is not current.", rsrc.getPatchSet().commitId())); } - private Change changeToStaging(RevisionResource rsrc, IdentifiedUser submitter, SubmitInput input) - throws OrmException, RestApiException, IOException, UpdateException, ConfigInvalidException, - PermissionBackendException { - logger.atInfo().log("qtcodereview: changeToStaging starts"); - - if (change.getStatus() != Change.Status.NEW) { - logger.atSevere().log("qtcodereview: stage: change %s status wrong: %s", - change, change.getStatus()); - throw new ResourceConflictException("Change is " + change.getStatus()); - } else if (!ProjectUtil.branchExists(repoManager, change.getDest())) { - logger.atSevere().log("qtcodereview: stage: change %s destination branch \"%s\" not found", - change, change.getDest().get()); - throw new ResourceConflictException(String.format("Destination branch \"%s\" not found.", - change.getDest().get())); - } else if (!rsrc.getPatchSet().getId().equals(change.currentPatchSetId())) { - logger.atSevere().log("qtcodereview: stage: change %s revision %s is not current revision", - change, rsrc.getPatchSet().getRevision().get()); - throw new ResourceConflictException(String.format("Revision %s is not current.", - rsrc.getPatchSet().getRevision().get())); - } - - Repository git = null; - ObjectId destId = null; - ObjectId sourceId = null; - ChangeData changeData; - - try { - git = repoManager.openRepository(projectKey); - // Check if staging branch exists. Create the staging branch if it does not exist. - if (!ProjectUtil.branchExists(repoManager, stagingBranchKey)) { - Result result = QtUtil.createStagingBranch(git, destBranchKey); - if (result == null) throw new NoSuchRefException("Cannot create staging ref: " + stagingBranchKey.get()); - } - destId = git.resolve(stagingBranchKey.get()); - if (destId == null) throw new NoSuchRefException("Invalid Revision: " + stagingBranchKey.get()); - - sourceId = git.resolve(rsrc.getPatchSet().getRevision().get()); - if (sourceId == null) throw new NoSuchRefException("Invalid Revision: " + rsrc.getPatchSet().getRevision().get()); - - changeData = changeDataFactory.create(dbProvider.get(), change); - MergeOp.checkSubmitRule(changeData, false); - - CodeReviewCommit commit = qtCherryPickPatch.cherryPickPatch(changeData, - projectKey, - sourceId, - destId, - false, // allowFastForward - Change.Status.STAGED, - "Staged for CI", // defaultMessage - null, // inputMessage - QtUtil.TAG_CI // tag - ); - Result result = qtUtil.updateRef(git, stagingBranchKey.get(), commit.toObjectId(), false); - referenceUpdated.fire(projectKey, stagingBranchKey.get(), destId, commit.toObjectId(), submitter.state()); - - } catch (IntegrationException e) { - logger.atInfo().log("qtcodereview: stage merge error %s", e); - throw new ResourceConflictException(e.getMessage()); - } catch (NoSuchRefException e) { - logger.atSevere().log("qtcodereview: stage error %s", e); - throw new ResourceConflictException(e.getMessage()); - } finally { - if (git != null) { - git.close(); - } - } + Repository git = null; + ObjectId destId = null; + ObjectId sourceId = null; + ChangeData changeData; + + try { + git = repoManager.openRepository(projectKey); + // Check if staging branch exists. Create the staging branch if it does not exist. + if (!ProjectUtil.branchExists(repoManager, stagingBranchKey)) { + Result result = QtUtil.createStagingBranch(git, destBranchKey); + if (result == null) + throw new NoSuchRefException("Cannot create staging ref: " + stagingBranchKey.branch()); + } + destId = git.resolve(stagingBranchKey.branch()); + if (destId == null) + throw new NoSuchRefException("Invalid Revision: " + stagingBranchKey.branch()); + + sourceId = git.resolve(rsrc.getPatchSet().commitId().name()); + if (sourceId == null) + throw new NoSuchRefException("Invalid Revision: " + rsrc.getPatchSet().commitId()); + + checkParents(git, rsrc); + + changeData = changeDataFactory.create(change); + MergeOp.checkSubmitRule(changeData, false); + + CodeReviewCommit commit = + qtCherryPickPatch.cherryPickPatch( + changeData, + projectKey, + sourceId, + destId, + false, // allowFastForward + Change.Status.STAGED, + "Staged for CI", // defaultMessage + null, // inputMessage + QtUtil.TAG_CI // tag + ); + Result result = qtUtil.updateRef(git, stagingBranchKey.branch(), commit.toObjectId(), false); + referenceUpdated.fire( + projectKey, stagingBranchKey.branch(), destId, commit.toObjectId(), submitter.state()); + + } catch (IntegrationConflictException e) { + logger.atInfo().log("stage merge error %s", e); + throw new ResourceConflictException(e.getMessage()); + } catch (NoSuchRefException e) { + logger.atSevere().log("stage error %s", e); + throw new ResourceConflictException(e.getMessage()); + } finally { + if (git != null) { + git.close(); + } + } - change = changeData.reloadChange(); - switch (change.getStatus()) { - case STAGED: - logger.atInfo().log("qtcodereview: changeToStaging %s added to %s", change, stagingBranchKey); - return change; // this doesn't return data to client, if needed use ChangeJson to convert it - default: - throw new ResourceConflictException("Change is unexpectedly " + change.getStatus()); - } + change = changeData.reloadChange(); + switch (change.getStatus()) { + case STAGED: + qtUtil.postChangeStagedEvent(change); + logger.atInfo().log( + "changeToStaging %s,%s added to %s", + change.getId(), change.getKey(), stagingBranchKey.branch()); + return change; // this doesn't return data to client, if needed use ChangeJson to convert it + default: + throw new ResourceConflictException("Change is unexpectedly " + change.getStatus()); + } + } + private void checkParents(RevisionResource resource) throws ResourceConflictException { + try (final Repository repository = repoManager.openRepository(resource.getProject())) { + checkParents(repository, resource); + } catch (IOException e) { + throw new ResourceConflictException("Can not read repository.", e); } + } - @Override - public UiAction.Description getDescription(RevisionResource resource) { - Change change = resource.getChange(); - if (!change.getStatus().isOpen() - || change.isWorkInProgress() - || !resource.isCurrent() - || !resource.permissions().testOrFalse(ChangePermission.QT_STAGE)) { - return null; // submit not visible - } - try { - if (!projectCache.checkedGet(resource.getProject()).statePermitsWrite()) { - return null; // stage not visible - } - } catch (IOException e) { - logger.atSevere().withCause(e).log("Error checking if change is submittable"); - throw new OrmRuntimeException("Could not determine problems for the change", e); + private void checkParents(Repository repository, RevisionResource resource) + throws ResourceConflictException { + try (final RevWalk rw = new RevWalk(repository)) { + final PatchSet ps = resource.getPatchSet(); + final RevCommit rc = rw.parseCommit(ObjectId.fromString(ps.commitId().name())); + if (rc.getParentCount() < 2) { + return; + } + for (final RevCommit parent : rc.getParents()) { + final List changes = + queryProvider + .get() + .enforceVisibility(true) + .byProjectCommit(resource.getProject(), parent); + for (ChangeData cd : changes) { + final Change change = cd.change(); + if (change.getStatus() != Status.MERGED) { + throw new ResourceConflictException( + String.format( + "Can not stage: Parent \"%s\" of a merged commit is not merged.", + parent.name())); + } } + } + } catch (IOException e) { + throw new ResourceConflictException("Can not read repository.", e); + } + } - ReviewDb db = dbProvider.get(); - ChangeData cd = changeDataFactory.create(db, resource.getNotes()); - try { - MergeOp.checkSubmitRule(cd, false); - } catch (ResourceConflictException e) { - return null; // stage not visible - } catch (OrmException e) { - logger.atSevere().withCause(e).log("Error checking if change is submittable"); - throw new OrmRuntimeException("Could not determine problems for the change", e); - } + @Override + public UiAction.Description getDescription(RevisionResource resource) { + Change change = resource.getChange(); + if (!change.getStatus().isOpen() + || change.isWorkInProgress() + || !resource.isCurrent() + || !resource.permissions().testOrFalse(ChangePermission.QT_STAGE)) { + return null; // submit not visible + } + try { + checkParents(resource); + } catch (ResourceConflictException e) { + logger.atWarning().log("Parent(s) check failed. %s", e.getMessage()); + return null; + } + try { + if (!projectCache + .get(resource.getProject()) + .map(ProjectState::statePermitsWrite) + .orElse(false)) { + return null; // stage not visible + } + } catch (StorageException e) { + logger.atSevere().withCause(e).log("Error checking if change is submittable"); + throw new StorageException("Could not determine problems for the change", e); + } - Boolean enabled; - try { - enabled = cd.isMergeable(); - } catch (OrmException e) { - throw new OrmRuntimeException("Could not determine mergeability", e); - } + ChangeData cd = changeDataFactory.create(resource.getNotes()); + try { + MergeOp.checkSubmitRule(cd, false); + } catch (ResourceConflictException e) { + return null; // stage not visible + } - RevId revId = resource.getPatchSet().getRevision(); - Map params = - ImmutableMap.of( - "patchSet", String.valueOf(resource.getPatchSet().getPatchSetId()), - "branch", change.getDest().getShortName(), - "commit", ObjectId.fromString(revId.get()).abbreviate(7).name() ); - return new UiAction.Description() - .setLabel( label) - .setTitle(Strings.emptyToNull(titlePattern.replace(params))) - .setVisible(true) - .setEnabled(Boolean.TRUE.equals(enabled)); + ObjectId revId = resource.getPatchSet().commitId(); + Map params = + ImmutableMap.of( + "patchSet", String.valueOf(resource.getPatchSet().number()), + "branch", change.getDest().shortName(), + "commit", revId.abbreviate(7).name()); + return new UiAction.Description() + .setLabel(label) + .setTitle(Strings.emptyToNull(titlePattern.replace(params))) + .setVisible(true) + .setEnabled(true); } - } diff --git a/src/main/java/com/googlesource/gerrit/plugins/qtcodereview/QtUnStage.java b/src/main/java/com/googlesource/gerrit/plugins/qtcodereview/QtUnStage.java index 8618842..b340a93 100644 --- a/src/main/java/com/googlesource/gerrit/plugins/qtcodereview/QtUnStage.java +++ b/src/main/java/com/googlesource/gerrit/plugins/qtcodereview/QtUnStage.java @@ -1,25 +1,24 @@ // -// Copyright (C) 2019 The Qt Company +// Copyright (C) 2020-22 The Qt Company // - package com.googlesource.gerrit.plugins.qtcodereview; -import com.google.common.base.Strings; +import static com.google.gerrit.server.project.ProjectCache.illegalState; + import com.google.common.flogger.FluentLogger; +import com.google.gerrit.entities.BranchNameKey; +import com.google.gerrit.entities.Change; +import com.google.gerrit.entities.PatchSet; +import com.google.gerrit.entities.Project; +import com.google.gerrit.exceptions.StorageException; import com.google.gerrit.extensions.api.changes.SubmitInput; import com.google.gerrit.extensions.restapi.AuthException; import com.google.gerrit.extensions.restapi.ResourceConflictException; +import com.google.gerrit.extensions.restapi.Response; import com.google.gerrit.extensions.restapi.RestApiException; import com.google.gerrit.extensions.restapi.RestModifyView; -import com.google.gerrit.extensions.restapi.UnprocessableEntityException; import com.google.gerrit.extensions.webui.UiAction; -import com.google.gerrit.reviewdb.client.Branch; -import com.google.gerrit.reviewdb.client.Change; -import com.google.gerrit.reviewdb.client.Project; -import com.google.gerrit.reviewdb.server.ReviewDb; -import com.google.gerrit.reviewdb.client.PatchSet; -import com.google.gerrit.server.CurrentUser; import com.google.gerrit.server.IdentifiedUser; import com.google.gerrit.server.ProjectUtil; import com.google.gerrit.server.account.AccountResolver; @@ -28,179 +27,189 @@ import com.google.gerrit.server.permissions.ChangePermission; import com.google.gerrit.server.permissions.PermissionBackend; import com.google.gerrit.server.permissions.PermissionBackendException; -import com.google.gerrit.server.permissions.RefPermission; import com.google.gerrit.server.project.ProjectCache; -import com.google.gerrit.server.query.change.InternalChangeQuery; +import com.google.gerrit.server.project.ProjectState; import com.google.gerrit.server.update.BatchUpdate; import com.google.gerrit.server.update.UpdateException; import com.google.gerrit.server.util.time.TimeUtil; -import com.google.gwtorm.server.OrmException; import com.google.inject.Inject; -import com.google.inject.Provider; import java.io.IOException; import org.eclipse.jgit.errors.ConfigInvalidException; -import org.eclipse.jgit.lib.Repository; import org.eclipse.jgit.lib.ObjectId; +import org.eclipse.jgit.lib.Repository; +class QtUnStage + implements RestModifyView, UiAction { -class QtUnStage implements RestModifyView, UiAction { - - private static final FluentLogger logger = FluentLogger.forEnclosingClass(); - - public static class Output { - transient Change change; + private static final FluentLogger logger = FluentLogger.forEnclosingClass(); - private Output(Change c) { - change = c; - } - } + public static class Output { + transient Change change; - private final Provider dbProvider; - private final GitRepositoryManager repoManager; - private final PermissionBackend permissionBackend; - private final BatchUpdate.Factory updateFactory; - private final AccountResolver accountResolver; - private final ProjectCache projectCache; - - private final QtUtil qtUtil; - private final QtChangeUpdateOp.Factory qtUpdateFactory; - - private Change change; - private Project.NameKey projectKey; - private Branch.NameKey destBranchKey; - private Branch.NameKey stagingBranchKey; - - @Inject - QtUnStage( - Provider dbProvider, - GitRepositoryManager repoManager, - PermissionBackend permissionBackend, - BatchUpdate.Factory updateFactory, - AccountResolver accountResolver, - ProjectCache projectCache, - QtUtil qtUtil, - QtChangeUpdateOp.Factory qtUpdateFactory) { - this.dbProvider = dbProvider; - this.repoManager = repoManager; - this.permissionBackend = permissionBackend; - this.updateFactory = updateFactory; - this.accountResolver = accountResolver; - this.projectCache = projectCache; - this.qtUtil = qtUtil; - this.qtUpdateFactory = qtUpdateFactory; + private Output(Change c) { + change = c; } + } + + private final GitRepositoryManager repoManager; + private final PermissionBackend permissionBackend; + private final BatchUpdate.Factory updateFactory; + private final AccountResolver accountResolver; + private final ProjectCache projectCache; + + private final QtUtil qtUtil; + private final QtChangeUpdateOp.Factory qtUpdateFactory; + + private Change change; + private Project.NameKey projectKey; + private BranchNameKey destBranchKey; + private BranchNameKey stagingBranchKey; + + @Inject + QtUnStage( + GitRepositoryManager repoManager, + PermissionBackend permissionBackend, + BatchUpdate.Factory updateFactory, + AccountResolver accountResolver, + ProjectCache projectCache, + QtUtil qtUtil, + QtChangeUpdateOp.Factory qtUpdateFactory) { + this.repoManager = repoManager; + this.permissionBackend = permissionBackend; + this.updateFactory = updateFactory; + this.accountResolver = accountResolver; + this.projectCache = projectCache; + this.qtUtil = qtUtil; + this.qtUpdateFactory = qtUpdateFactory; + } @Override - public Output apply(RevisionResource rsrc, SubmitInput input) - throws RestApiException, IOException, OrmException, UpdateException, - PermissionBackendException, ConfigInvalidException { - - logger.atInfo().log("qtcodereview: unstage %s", rsrc.getChange().toString()); - - IdentifiedUser submitter = rsrc.getUser().asIdentifiedUser(); - - change = rsrc.getChange(); - projectKey = rsrc.getProject(); - destBranchKey = change.getDest(); - stagingBranchKey = QtUtil.getStagingBranch(destBranchKey); + public Response apply(RevisionResource rsrc, SubmitInput input) + throws RestApiException, IOException, UpdateException, PermissionBackendException, + ConfigInvalidException { + + logger.atInfo().log("unstage %s", rsrc.getChange().toString()); + + IdentifiedUser submitter = rsrc.getUser().asIdentifiedUser(); + + change = rsrc.getChange(); + projectKey = rsrc.getProject(); + destBranchKey = change.getDest(); + stagingBranchKey = QtUtil.getStagingBranch(destBranchKey); + + rsrc.permissions().check(ChangePermission.QT_STAGE); + projectCache + .get(rsrc.getProject()) + .orElseThrow(illegalState(rsrc.getProject())) + .checkStatePermitsWrite(); + + return Response.ok(new Output(removeChangeFromStaging(rsrc, submitter))); + } + + private Change removeChangeFromStaging(RevisionResource rsrc, IdentifiedUser submitter) + throws IOException, ResourceConflictException, RestApiException, UpdateException { + + Repository git = null; + final Project.NameKey projectKey = rsrc.getProject(); + PatchSet patchSet = rsrc.getPatchSet(); + + logger.atInfo().log("unstage start for %s", change); + + if (change.getStatus() != Change.Status.STAGED) { + logger.atSevere().log( + "unstage: change %s status wrong %s", change.getId(), change.getStatus()); + throw new ResourceConflictException("change is " + change.getStatus()); + } else if (!ProjectUtil.branchExists(repoManager, change.getDest())) { + logger.atSevere().log( + "unstage: change %s destination branch \"%s\" not found", + change, change.getDest().branch()); + throw new ResourceConflictException( + String.format("destination branch \"%s\" not found.", change.getDest().branch())); + } else if (!rsrc.getPatchSet().id().equals(change.currentPatchSetId())) { + logger.atSevere().log( + "unstage: change %s revision %s is not current revision", + change, rsrc.getPatchSet().commitId()); + throw new ResourceConflictException( + String.format("revision %s is not current revision", rsrc.getPatchSet().commitId())); + } - rsrc.permissions().check(ChangePermission.QT_STAGE); + final BranchNameKey destBranchShortKey = + QtUtil.getNameKeyShort(projectKey.get(), QtUtil.R_STAGING, stagingBranchKey.branch()); + + try { + git = repoManager.openRepository(projectKey); + + ObjectId srcId = git.resolve(patchSet.commitId().name()); + if (srcId == null) { + logger.atSevere().log( + "unstage merge: change %s has invalid revision %s", change.getId(), patchSet); + throw new ResourceConflictException("Invalid Revision: " + patchSet); + } + + QtChangeUpdateOp op = + qtUpdateFactory.create( + Change.Status.NEW, Change.Status.STAGED, "Unstaged", null, QtUtil.TAG_CI, null); + BatchUpdate u = updateFactory.create(projectKey, submitter, TimeUtil.nowTs()); + u.addOp(rsrc.getChange().getId(), op).execute(); + + qtUtil.rebuildStagingBranch(git, submitter, projectKey, stagingBranchKey, destBranchShortKey); + + change = op.getChange(); + qtUtil.postChangeUnStagedEvent(change); + logger.atInfo().log( + "unstaged %s,%s from %s", change.getId(), change.getKey(), stagingBranchKey.shortName()); + + } catch (ResourceConflictException e) { + logger.atSevere().log("unstage resource conflict error %s", e); + throw new ResourceConflictException(e.toString()); + } catch (QtUtil.MergeConflictException e) { + logger.atSevere().log("unstage merge conflict error %s", e); + throw new IOException(e); + } catch (IOException e) { + logger.atSevere().log("unstage IOException %s", e); + throw new IOException(e); + } finally { + if (git != null) { + git.close(); + } + } - projectCache.checkedGet(rsrc.getProject()).checkStatePermitsWrite(); + return change; // this doesn't return data to client, if needed use ChangeJson to convert it + } - return new Output(removeChangeFromStaging(rsrc, submitter)); + @Override + public UiAction.Description getDescription(RevisionResource rsrc) { + UiAction.Description description = + new UiAction.Description() + .setLabel("Unstage") + .setTitle("Unstage the change") + .setVisible(false); + + Change change = rsrc.getChange(); + if (change.getStatus() != Change.Status.STAGED) { + return description; } - private Change removeChangeFromStaging(RevisionResource rsrc, IdentifiedUser submitter) - throws IOException, ResourceConflictException, RestApiException, UpdateException { - - Repository git = null; - final Project.NameKey projectKey = rsrc.getProject(); - PatchSet patchSet = rsrc.getPatchSet(); - - logger.atInfo().log("qtcodereview: unstage start for %s", change); - - if (change.getStatus() != Change.Status.STAGED) { - logger.atSevere().log("qtcodereview: unstage: change %s status wrong %s", change, change.getStatus()); - throw new ResourceConflictException("change is " + change.getStatus()); - } else if (!ProjectUtil.branchExists(repoManager, change.getDest())) { - logger.atSevere().log("qtcodereview: unstage: change %s destination branch \"%s\" not found", change, change.getDest().get()); - throw new ResourceConflictException(String.format("destination branch \"%s\" not found.", change.getDest().get())); - } else if (!rsrc.getPatchSet().getId().equals(change.currentPatchSetId())) { - logger.atSevere().log("qtcodereview: unstage: change %s revision %s is not current revision", change, rsrc.getPatchSet().getRevision().get()); - throw new ResourceConflictException(String.format("revision %s is not current revision", rsrc.getPatchSet().getRevision().get())); - } - - final Branch.NameKey destBranchShortKey = QtUtil.getNameKeyShort(projectKey.get(), QtUtil.R_STAGING, stagingBranchKey.get()); - - try { - git = repoManager.openRepository(projectKey); - - ObjectId srcId = git.resolve(patchSet.getRevision().get()); - if (srcId == null) { - logger.atSevere().log("qtcodereview: unstage merge: change %s has invalid revision %s", change, patchSet); - throw new ResourceConflictException("Invalid Revision: " + patchSet); - } - - QtChangeUpdateOp op = qtUpdateFactory.create(Change.Status.NEW, Change.Status.STAGED, "Unstaged", null, QtUtil.TAG_CI, null); - BatchUpdate u = updateFactory.create(dbProvider.get(), projectKey, submitter, TimeUtil.nowTs()); - u.addOp(rsrc.getChange().getId(), op).execute(); - - qtUtil.rebuildStagingBranch(git, submitter, projectKey, stagingBranchKey, destBranchShortKey); - - change = op.getChange(); - logger.atInfo().log("qtcodereview: unstaged %s from %s", change, stagingBranchKey); - - } catch (ResourceConflictException e) { - logger.atSevere().log("qtcodereview: unstage resource conflict error %s", e); - throw new ResourceConflictException(e.toString()); - } catch (QtUtil.MergeConflictException e) { - logger.atSevere().log("qtcodereview: unstage merge conflict error %s", e); - throw new IOException(e); - } catch (IOException e) { - logger.atSevere().log("qtcodereview: unstage IOException %s", e); - throw new IOException(e); - } finally { - if (git != null) { - git.close(); - } - } - - return change; // this doesn't return data to client, if needed use ChangeJson to convert it + try { + change = rsrc.getChange(); + projectKey = rsrc.getProject(); + destBranchKey = change.getDest(); + stagingBranchKey = QtUtil.getStagingBranch(destBranchKey); + rsrc.permissions().check(ChangePermission.QT_STAGE); + } catch (AuthException | PermissionBackendException e) { + return description; } - @Override - public UiAction.Description getDescription(RevisionResource rsrc) { - UiAction.Description description = new UiAction.Description() - .setLabel("Unstage") - .setTitle("Unstage the change") - .setVisible(false); - - Change change = rsrc.getChange(); - if (change.getStatus() != Change.Status.STAGED) { - return description; - } - - try { - change = rsrc.getChange(); - projectKey = rsrc.getProject(); - destBranchKey = change.getDest(); - stagingBranchKey = QtUtil.getStagingBranch(destBranchKey); - rsrc.permissions().check(ChangePermission.QT_STAGE); - } catch (AuthException | PermissionBackendException e) { - return description; - } - - try { - if (!projectCache.checkedGet(rsrc.getProject()).statePermitsWrite()) { - return description; - } - } catch (IOException e) { - logger.atSevere().withCause(e).log("Failed to check if project state permits write: %s", rsrc.getProject()); - return description; - } - - return description.setVisible(true); + try { + if (!projectCache.get(rsrc.getProject()).map(ProjectState::statePermitsWrite).orElse(false)) { + return description; + } + } catch (StorageException e) { + logger.atSevere().withCause(e).log( + "Failed to check if project state permits write: %s", rsrc.getProject()); + return description; } + return description.setVisible(true); + } } diff --git a/src/main/java/com/googlesource/gerrit/plugins/qtcodereview/QtUtil.java b/src/main/java/com/googlesource/gerrit/plugins/qtcodereview/QtUtil.java index 639df57..42c3442 100644 --- a/src/main/java/com/googlesource/gerrit/plugins/qtcodereview/QtUtil.java +++ b/src/main/java/com/googlesource/gerrit/plugins/qtcodereview/QtUtil.java @@ -1,6 +1,6 @@ // Copyright (C) 2011 The Android Open Source Project // Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -// Copyright (C) 2019 The Qt Company +// Copyright (C) 2021-22 The Qt Company // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -16,35 +16,57 @@ package com.googlesource.gerrit.plugins.qtcodereview; +import static com.google.gerrit.server.project.ProjectCache.noSuchProject; + +import com.google.common.base.Supplier; +import com.google.common.base.Suppliers; +import com.google.common.flogger.FluentLogger; import com.google.gerrit.common.FooterConstants; -import com.google.common.collect.Lists; +import com.google.gerrit.entities.BranchNameKey; +import com.google.gerrit.entities.Change; +import com.google.gerrit.entities.PatchSet; +import com.google.gerrit.entities.Project; +import com.google.gerrit.exceptions.StorageException; +import com.google.gerrit.extensions.common.InputWithMessage; +import com.google.gerrit.extensions.registration.DynamicItem; import com.google.gerrit.extensions.restapi.RestApiException; -import com.google.common.flogger.FluentLogger; -import com.google.gerrit.reviewdb.client.Branch; -import com.google.gerrit.reviewdb.client.Change; -import com.google.gerrit.reviewdb.client.PatchSet; -import com.google.gerrit.reviewdb.client.Project; -import com.google.gerrit.reviewdb.server.ReviewDb; import com.google.gerrit.server.ChangeMessagesUtil; import com.google.gerrit.server.IdentifiedUser; +import com.google.gerrit.server.data.ChangeAttribute; +import com.google.gerrit.server.events.EventDispatcher; +import com.google.gerrit.server.events.EventFactory; import com.google.gerrit.server.extensions.events.GitReferenceUpdated; +import com.google.gerrit.server.git.CodeReviewCommit; +import com.google.gerrit.server.git.MergeUtil; +import com.google.gerrit.server.notedb.ChangeNotes; +import com.google.gerrit.server.permissions.PermissionBackendException; import com.google.gerrit.server.project.NoSuchRefException; -import com.google.gerrit.server.query.change.InternalChangeQuery; +import com.google.gerrit.server.project.ProjectCache; +import com.google.gerrit.server.project.ProjectState; import com.google.gerrit.server.query.change.ChangeData; -import com.google.gerrit.server.submit.IntegrationException; +import com.google.gerrit.server.query.change.InternalChangeQuery; import com.google.gerrit.server.update.BatchUpdate; import com.google.gerrit.server.update.UpdateException; import com.google.gerrit.server.util.time.TimeUtil; -import com.google.gwtorm.server.OrmException; import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.Singleton; - -import org.eclipse.jgit.errors.MissingObjectException; +import com.googlesource.gerrit.plugins.qtcodereview.QtPrecheckMessage; +import java.io.IOException; +import java.sql.Timestamp; +import java.util.AbstractMap; +import java.util.ArrayList; +import java.util.Date; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.TimeZone; import org.eclipse.jgit.lib.CommitBuilder; import org.eclipse.jgit.lib.Constants; import org.eclipse.jgit.lib.ObjectId; import org.eclipse.jgit.lib.ObjectInserter; +import org.eclipse.jgit.lib.ObjectReader; import org.eclipse.jgit.lib.PersonIdent; import org.eclipse.jgit.lib.Ref; import org.eclipse.jgit.lib.RefUpdate; @@ -56,596 +78,881 @@ import org.eclipse.jgit.revwalk.RevWalk; import org.eclipse.jgit.transport.ReceiveCommand; -import java.io.IOException; -import java.sql.Timestamp; -import java.util.AbstractMap; -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.TimeZone; - - -/** - * Utility methods for working with git and database. - */ +/** Utility methods for working with git and database. */ @Singleton public class QtUtil { - private static final FluentLogger logger = FluentLogger.forEnclosingClass(); - - public static final String R_HEADS = "refs/heads/"; - public static final String R_STAGING = "refs/staging/"; - public static final String R_BUILDS = "refs/builds/"; - public static final String TAG_CI = ChangeMessagesUtil.AUTOGENERATED_TAG_PREFIX + "qt:ci"; - public static final String TAG_ADMINCHANGE = ChangeMessagesUtil.AUTOGENERATED_TAG_PREFIX + "qt:adminchange"; - public static final String TAG_REOPENED = ChangeMessagesUtil.AUTOGENERATED_TAG_PREFIX + "qt:reopened"; - - - private final Provider dbProvider; - private final Provider queryProvider; - private final GitReferenceUpdated referenceUpdated; - private final BatchUpdate.Factory updateFactory; - private final QtCherryPickPatch qtCherryPickPatch; - private final QtChangeUpdateOp.Factory qtUpdateFactory; - - @Inject - QtUtil(Provider dbProvider, - Provider queryProvider, - GitReferenceUpdated referenceUpdated, - BatchUpdate.Factory updateFactory, - QtCherryPickPatch qtCherryPickPatch, - QtChangeUpdateOp.Factory qtUpdateFactory) { - this.dbProvider = dbProvider; - this.queryProvider = queryProvider; - this.referenceUpdated = referenceUpdated; - this.updateFactory = updateFactory; - this.qtCherryPickPatch = qtCherryPickPatch; - this.qtUpdateFactory = qtUpdateFactory; - } - - public static class MergeConflictException extends Exception { - private static final long serialVersionUID = 1L; - public MergeConflictException(final String message) { - super(message); - } + private static final FluentLogger logger = FluentLogger.forEnclosingClass(); + + public static final String R_HEADS = "refs/heads/"; + public static final String R_STAGING = "refs/staging/"; + public static final String R_BUILDS = "refs/builds/"; + public static final String TAG_CI = ChangeMessagesUtil.AUTOGENERATED_TAG_PREFIX + "qt:ci"; + public static final String TAG_ADMINCHANGE = + ChangeMessagesUtil.AUTOGENERATED_TAG_PREFIX + "qt:adminchange"; + public static final String TAG_REOPENED = + ChangeMessagesUtil.AUTOGENERATED_TAG_PREFIX + "qt:reopened"; + + private final Provider queryProvider; + private final GitReferenceUpdated referenceUpdated; + private final BatchUpdate.Factory updateFactory; + private final ChangeNotes.Factory changeNotesFactory; + private final DynamicItem eventDispatcher; + private final EventFactory eventFactory; + private final MergeUtil.Factory mergeUtilFactory; + private final ProjectCache projectCache; + private final QtCherryPickPatch qtCherryPickPatch; + private final QtChangeUpdateOp.Factory qtUpdateFactory; + private final QtEmailSender qtEmailSender; + + @Inject + QtUtil( + Provider queryProvider, + GitReferenceUpdated referenceUpdated, + BatchUpdate.Factory updateFactory, + ChangeNotes.Factory changeNotesFactory, + EventFactory eventFactory, + DynamicItem eventDispatcher, + MergeUtil.Factory mergeUtilFactory, + ProjectCache projectCache, + QtCherryPickPatch qtCherryPickPatch, + QtChangeUpdateOp.Factory qtUpdateFactory, + QtEmailSender qtEmailSender) { + this.queryProvider = queryProvider; + this.referenceUpdated = referenceUpdated; + this.updateFactory = updateFactory; + this.changeNotesFactory = changeNotesFactory; + this.eventDispatcher = eventDispatcher; + this.eventFactory = eventFactory; + this.mergeUtilFactory = mergeUtilFactory; + this.projectCache = projectCache; + this.qtCherryPickPatch = qtCherryPickPatch; + this.qtUpdateFactory = qtUpdateFactory; + this.qtEmailSender = qtEmailSender; + } + + public static class MergeConflictException extends Exception { + private static final long serialVersionUID = 1L; + + public MergeConflictException(final String message) { + super(message); } + } - public static class BranchNotFoundException extends Exception { - private static final long serialVersionUID = 1L; - public BranchNotFoundException(final String message) { - super(message); - } - } + public static class BranchNotFoundException extends Exception { + private static final long serialVersionUID = 1L; - public static Project.NameKey getProjectKey(final String project) { - String projectName = project; - if (project.endsWith(Constants.DOT_GIT_EXT)) { - projectName = project.substring(0, project.length() - Constants.DOT_GIT_EXT.length()); - } - return new Project.NameKey(projectName); - } - - /** - * Creates a branch key including ref prefix. - * @param project Project for the branch key. - * @param prefix Expected prefix. - * @param branch Branch name with or without prefix. - * @return Branch name key with prefix. - */ - public static Branch.NameKey getNameKeyLong(final String project, - final String prefix, - final String branch) { - final Project.NameKey projectKey = getProjectKey(project); - if (branch.startsWith(prefix)) { - return new Branch.NameKey(projectKey, branch); - } else { - return new Branch.NameKey(projectKey, prefix + branch); - } + public BranchNotFoundException(final String message) { + super(message); } + } - /** - * Creates a branch key without any prefix. - * @param project Project for the branch key. - * @param prefix Prefix to remove. - * @param branch Branch name with or without prefix. - * @return Branch name key without prefix. - */ - public static Branch.NameKey getNameKeyShort(final String project, - final String prefix, - final String branch) { - final Project.NameKey projectKey = getProjectKey(project); - if (branch.startsWith(prefix)) { - return new Branch.NameKey(projectKey, branch.substring(prefix.length())); - } else { - return new Branch.NameKey(projectKey, branch); - } + public static Project.NameKey getProjectKey(final String project) { + String projectName = project; + if (project.endsWith(Constants.DOT_GIT_EXT)) { + projectName = project.substring(0, project.length() - Constants.DOT_GIT_EXT.length()); + } + return Project.nameKey(projectName); + } + + /** + * Creates a branch key including ref prefix. + * + * @param project Project for the branch key. + * @param prefix Expected prefix. + * @param branch Branch name with or without prefix. + * @return Branch name key with prefix. + */ + public static BranchNameKey getNameKeyLong( + final String project, final String prefix, final String branch) { + final Project.NameKey projectKey = getProjectKey(project); + if (branch.startsWith(prefix)) { + return BranchNameKey.create(projectKey, branch); + } else { + return BranchNameKey.create(projectKey, prefix + branch); + } + } + + /** + * Creates a branch key without any prefix. + * + * @param project Project for the branch key. + * @param prefix Prefix to remove. + * @param branch Branch name with or without prefix. + * @return Branch name key without prefix. + */ + public static BranchNameKey getNameKeyShort( + final String project, final String prefix, final String branch) { + final Project.NameKey projectKey = getProjectKey(project); + if (branch.startsWith(prefix)) { + return BranchNameKey.create(projectKey, branch.substring(prefix.length())); + } else { + return BranchNameKey.create(projectKey, branch); + } + } + + public static boolean branchExists(Repository git, final BranchNameKey branch) + throws IOException { + return git.getRefDatabase().getRef(branch.branch()) != null; + } + + /** + * Gets a staging branch for a branch. + * + * @param branch Branch under refs/heads. E.g. refs/heads/master. Can be short name. + * @return Matching staging branch. E.g. refs/staging/master + */ + public static BranchNameKey getStagingBranch(final BranchNameKey branch) { + return getBranchWithNewPrefix(branch, R_HEADS, R_STAGING); + } + + private static BranchNameKey getBranchWithNewPrefix( + final BranchNameKey branch, final String oldPrefix, final String newPrefix) { + final String ref = branch.branch(); + + if (ref.startsWith(oldPrefix)) { + // Create new ref replacing the old prefix with new. + return BranchNameKey.create(branch.project(), newPrefix + ref.substring(oldPrefix.length())); + } + // Treat the ref as short name. + return BranchNameKey.create(branch.project(), newPrefix + ref); + } + + public static Result createStagingBranch(Repository git, final BranchNameKey sourceBranch) { + try { + final String sourceBranchName; + if (sourceBranch.branch().startsWith(R_HEADS)) { + sourceBranchName = sourceBranch.branch(); + } else { + sourceBranchName = R_HEADS + sourceBranch.branch(); + } + + final String stagingBranch = R_STAGING + sourceBranch.shortName(); + + return updateRef(git, stagingBranch, sourceBranchName, true); + } catch (NoSuchRefException | IOException e) { + return null; + } + } + + /** + * Creates a build ref. Build refs are stored under refs/builds. + * + * @param git Git repository. + * @param stagingBranch Staging branch to create the build ref from. Can be short name. + * @param newBranch Build ref name, under refs/builds. Can be short name. + * @return + * @throws IOException + * @throws NoSuchRefException + */ + public Result createBuildRef( + Repository git, + IdentifiedUser user, + final Project.NameKey projectKey, + final BranchNameKey stagingBranch, + final BranchNameKey newBranch) + throws IOException, NoSuchRefException { + final String stagingBranchName; + if (stagingBranch.branch().startsWith(R_STAGING)) { + stagingBranchName = stagingBranch.branch(); + } else { + stagingBranchName = R_STAGING + stagingBranch.branch(); } - public static boolean branchExists(Repository git, final Branch.NameKey branch) - throws IOException { - return git.getRefDatabase().getRef(branch.get()) != null; + final String buildBranchName; + if (newBranch.branch().startsWith(R_BUILDS)) { + buildBranchName = newBranch.branch(); + } else { + buildBranchName = R_BUILDS + newBranch.branch(); } - /** - * Gets a staging branch for a branch. - * @param branch Branch under refs/heads. E.g. refs/heads/master. Can be short - * name. - * @return Matching staging branch. E.g. refs/staging/master - */ - public static Branch.NameKey getStagingBranch(final Branch.NameKey branch) { - return getBranchWithNewPrefix(branch, R_HEADS, R_STAGING); + Ref sourceRef = git.getRefDatabase().getRef(stagingBranchName); + if (sourceRef == null) { + throw new NoSuchRefException(stagingBranchName); } - private static Branch.NameKey getBranchWithNewPrefix(final Branch.NameKey branch, - final String oldPrefix, - final String newPrefix) { - final String ref = branch.get(); + RefUpdate refUpdate = git.updateRef(buildBranchName); + refUpdate.setNewObjectId(sourceRef.getObjectId()); + refUpdate.setForceUpdate(false); + RefUpdate.Result result = refUpdate.update(); + + // send ref created event + referenceUpdated.fire(projectKey, refUpdate, ReceiveCommand.Type.CREATE, user.state()); + + return result; + } + + private static Result updateRef( + Repository git, final String ref, final String newValue, final boolean force) + throws IOException, NoSuchRefException { + Ref sourceRef = git.getRefDatabase().getRef(newValue); + if (sourceRef == null) { + throw new NoSuchRefException(newValue); + } - if (ref.startsWith(oldPrefix)) { - // Create new ref replacing the old prefix with new. - return new Branch.NameKey(branch.getParentKey(), newPrefix + ref.substring(oldPrefix.length())); + return updateRef(git, ref, sourceRef.getObjectId(), force); + } + + public static Result updateRef( + Repository git, final String ref, final ObjectId id, final boolean force) + throws IOException, NoSuchRefException { + RefUpdate refUpdate = git.updateRef(ref); + refUpdate.setNewObjectId(id); + refUpdate.setForceUpdate(force); + RefUpdate.Result result = refUpdate.update(); + return result; + } + + private static String getChangeId(RevCommit commit) { + List changeIds = commit.getFooterLines(FooterConstants.CHANGE_ID); + String changeId = null; + if (!changeIds.isEmpty()) changeId = changeIds.get(0); + return changeId; + } + + private ChangeData findChangeFromList(String changeId, List changes) { + for (ChangeData item : changes) { + if (item.change().getKey().get().equals(changeId)) return item; + } + return null; + } + + // Step backwards from the ref and return change list in the same order + private List arrangeOrderLikeInRef( + Repository git, ObjectId refObj, ObjectId tipObj, List changeList) + throws Exception { + List results = new ArrayList(); + int count = 0; + logger.atInfo().log("Arranging change order to match original"); + + try { + if (refObj.equals(tipObj)) return results; + + RevWalk revWalk = new RevWalk(git); + RevCommit branchHead = revWalk.parseCommit(tipObj); + RevCommit commit = revWalk.parseCommit(refObj); + + do { + count++; + String changeId = getChangeId(commit); + + if (commit.getParentCount() == 0) { + commit = null; // something is going wrong, just exit + } else { + if (changeId == null && commit.getParentCount() > 1) { + changeId = getChangeId(revWalk.parseCommit(commit.getParent(1))); + } + ChangeData change = findChangeFromList(changeId, changeList); + if (change != null) results.add(0, change); + + // It can always be trusted that parent in index 0 is the correct one + commit = revWalk.parseCommit(commit.getParent(0)); } - // Treat the ref as short name. - return new Branch.NameKey(branch.getParentKey(), newPrefix + ref); + } while (commit != null && !revWalk.isMergedInto(commit, branchHead) && count < 200); + } catch (Exception e) { + throw new Exception("arranging change order failed: " + e.getMessage()); } - public static Result createStagingBranch(Repository git, - final Branch.NameKey sourceBranch) { - try { - final String sourceBranchName; - if (sourceBranch.get().startsWith(R_HEADS)) { - sourceBranchName = sourceBranch.get(); - } else { - sourceBranchName = R_HEADS + sourceBranch.get(); - } + if (count == 200) throw new Exception("arranging change order failed: too many commits"); + + return results; + } + + private ObjectId pickChangesToStagingRef( + Repository git, final Project.NameKey projectKey, List changes, ObjectId tipObj) + throws Exception { + ObjectId newId = tipObj; + logger.atInfo().log("Cherry-picking changes on top of %s", tipObj.name()); + + try { + for (ChangeData item : changes) { + Change change = item.change(); + logger.atInfo().log("cherry-picking %s,%s", change.getId(), change.getKey()); + PatchSet p = item.currentPatchSet(); + ObjectId srcId = git.resolve(p.commitId().name()); + newId = + qtCherryPickPatch + .cherryPickPatch( + item, + projectKey, + srcId, + newId, + false, // allowFastForward + null, // newStatus + null, // defaultMessage + null, // inputMessage + TAG_CI // tag + ) + .toObjectId(); + } + } catch (Exception e) { + throw new Exception("cherry-picking changes failed: " + e.getMessage()); + } + return newId; + } + + // Step backwards from staging head and find commit that can be reused + private ObjectId findReusableStagingHead( + Repository git, ObjectId stagingHead, ObjectId branchHead, List stagedChanges) { + ObjectId reusableHead = null; + logger.atInfo().log("Finding reusable staging commit"); + if (stagingHead.equals(branchHead)) return branchHead; + + try { + RevWalk revWalk = new RevWalk(git); + RevCommit branch = revWalk.parseCommit(branchHead); + RevCommit commit = revWalk.parseCommit(stagingHead); + logger.atInfo().log("Branch head: " + branch.name()); + logger.atInfo().log("Staging head: " + commit.name()); + + if (!revWalk.isMergedInto(branch, commit)) return branchHead; + + int count = 0; + do { + count++; + String changeId = getChangeId(commit); + ChangeData change = findChangeFromList(changeId, stagedChanges); + if (change != null) { + if (reusableHead == null) reusableHead = commit; + } else reusableHead = null; + + if (commit.getParentCount() > 0) { + // It can always be trusted that parent in index 0 is the correct one + commit = revWalk.parseCommit(commit.getParent(0)); + } else commit = null; + } while (commit != null && !commit.equals(branchHead) && count < 200); + + if (count == 200) throw new Exception("can't find ref, too many commits"); + } catch (Exception e) { + reusableHead = null; + logger.atSevere().log("Finding reusable staging commit failed: %s", e.getMessage()); + } - final String stagingBranch = R_STAGING + sourceBranch.getShortName(); + if (reusableHead == null) { + reusableHead = branchHead; + logger.atInfo().log("Reusable staging commit not found"); + } - return updateRef(git, stagingBranch, sourceBranchName, true); - } catch (NoSuchRefException | IOException e ) { - return null; + return reusableHead; + } + + public void rebuildStagingBranch( + Repository git, + IdentifiedUser user, + final Project.NameKey projectKey, + final BranchNameKey stagingBranchKey, + final BranchNameKey destBranchShortKey) + throws MergeConflictException { + InternalChangeQuery query = null; + List changes_staged = null; + List changes_to_cherrypick = null; + ObjectId oldStageRef = null; + ObjectId branchRef = null; + ObjectId newStageRef = null; + String stagingBranchName = null; + + logger.atInfo().log("Rebuilding %s", stagingBranchKey.branch()); + + try { + stagingBranchName = stagingBranchKey.branch(); + oldStageRef = git.resolve(stagingBranchName); + branchRef = git.resolve(destBranchShortKey.branch()); + + query = queryProvider.get(); + changes_staged = query.byBranchStatus(destBranchShortKey, Change.Status.STAGED); + } catch (IOException e) { + logger.atSevere().log( + "rebuild staging ref '%s' db query failed. Exception %s", stagingBranchKey.branch(), e); + throw new MergeConflictException("fatal: " + e.getMessage()); + } + + try { + logger.atInfo().log( + "staging ref %s reseted to %s", stagingBranchKey.branch(), destBranchShortKey.branch()); + + Result result = QtUtil.createStagingBranch(git, destBranchShortKey); + if (result == null) + throw new NoSuchRefException("Cannot create staging ref %s" + stagingBranchName); + + newStageRef = findReusableStagingHead(git, oldStageRef, branchRef, changes_staged); + logger.atInfo().log("reused staging ref is %s", newStageRef.name()); + + changes_to_cherrypick = arrangeOrderLikeInRef(git, oldStageRef, newStageRef, changes_staged); + String changeStr = ""; + for (ChangeData item : changes_to_cherrypick) changeStr += " " + item.change().getKey(); + logger.atInfo().log("changes to be cherry-picked: %s", changeStr); + + newStageRef = pickChangesToStagingRef(git, projectKey, changes_to_cherrypick, newStageRef); + } catch (Exception e) { + logger.atSevere().log( + "rebuild staging ref %s failed: %s", stagingBranchKey.branch(), e.getMessage()); + newStageRef = branchRef; + String message = + "Merge conflict in staging branch. Status changed back to new. Please stage again."; + QtChangeUpdateOp op = + qtUpdateFactory.create( + Change.Status.NEW, Change.Status.STAGED, message, null, null, null); + try (BatchUpdate u = updateFactory.create(projectKey, user, TimeUtil.nowTs())) { + for (ChangeData item : changes_staged) { + Change change = item.change(); + logger.atInfo().log("change %s,%s back to NEW", change.getId(), change.getKey()); + u.addOp(change.getId(), op); } + u.execute(); + + } catch (UpdateException | RestApiException ex) { + logger.atSevere().log("Failed to update change status %s", ex); + } + + for (ChangeData item : changes_staged) { + Change change = item.change(); + qtEmailSender.sendBuildFailedEmail(projectKey, change, user.getAccountId(), message); + } } - /** - * Creates a build ref. Build refs are stored under refs/builds. - * - * @param git Git repository. - * @param stagingBranch Staging branch to create the build ref from. Can be - * short name. - * @param newBranch Build ref name, under refs/builds. Can be short name. - * @return - * @throws IOException - * @throws NoSuchRefException - */ - public Result createBuildRef(Repository git, - IdentifiedUser user, - final Project.NameKey projectKey, - final Branch.NameKey stagingBranch, - final Branch.NameKey newBranch) - throws IOException, NoSuchRefException { - final String stagingBranchName; - if (stagingBranch.get().startsWith(R_STAGING)) { - stagingBranchName = stagingBranch.get(); - } else { - stagingBranchName = R_STAGING + stagingBranch.get(); + try { + RefUpdate refUpdate = git.updateRef(stagingBranchName); + refUpdate.setNewObjectId(newStageRef); + refUpdate.update(); + logger.atInfo().log("Ref %s points now to %s", stagingBranchKey.branch(), newStageRef.name()); + + // send ref updated event only if it changed + if (!newStageRef.equals(oldStageRef)) { + referenceUpdated.fire( + projectKey, stagingBranchName, oldStageRef, newStageRef, user.state()); + } + } catch (IOException e) { + logger.atSevere().log("rebuild %s failed to update ref %s", stagingBranchKey.branch(), e); + throw new MergeConflictException("fatal: IOException"); + } + } + + /** + * Lists not merged changes between branches. + * + * @param git jGit Repository. Must be open. + * @param db ReviewDb of a Gerrit site. + * @param branch Branch to search for the changes. + * @param destination Destination branch for changes. + * @return List of not merged changes. + * @throws IOException Thrown by Repository or RevWalk if repository is not accessible. + */ + public List> listChangesNotMerged( + Repository git, final BranchNameKey branch, final BranchNameKey destination) + throws IOException, BranchNotFoundException { + + Map> map = new HashMap<>(); + RevWalk revWalk = new RevWalk(git); + + try { + Ref ref = git.getRefDatabase().getRef(branch.branch()); + if (ref == null) throw new BranchNotFoundException("No such branch: " + branch); + Ref refDest = git.getRefDatabase().getRef(destination.branch()); + if (refDest == null) throw new BranchNotFoundException("No such branch: " + destination); + RevCommit firstCommit = revWalk.parseCommit(ref.getObjectId()); + revWalk.markStart(firstCommit); + // Destination is the walker end point + revWalk.markUninteresting(revWalk.parseCommit(refDest.getObjectId())); + + Iterator i = revWalk.iterator(); + while (i.hasNext()) { + RevCommit commit = i.next(); + String changeId = getChangeId(commit); + List changes = null; + + if (changeId != null) { + Change.Key key = Change.key(changeId); + changes = queryProvider.get().byBranchKey(destination, key); } - final String buildBranchName; - if (newBranch.get().startsWith(R_BUILDS)) { - buildBranchName = newBranch.get(); - } else { - buildBranchName = R_BUILDS + newBranch.get(); + if (changes != null && !changes.isEmpty()) { + if (changes.size() > 1) + logger.atWarning().log("commit belongs to multiple changes: %s", commit.name()); + ChangeData cd = changes.get(0); + map.put(cd.getId(), new AbstractMap.SimpleEntry(cd, commit)); } + } + } finally { + revWalk.dispose(); + } + return new ArrayList>(map.values()); + } + + public static RevCommit merge( + PersonIdent committerIdent, + Repository git, + ObjectInserter objInserter, + RevWalk revWalk, + RevCommit toMerge, + RevCommit mergeTip, + String customCommitMessage, + boolean mergeAlways) + throws NoSuchRefException, IOException, MergeConflictException { + + if (revWalk.isMergedInto(toMerge, mergeTip)) { + logger.atWarning().log("commit %s already in %s", toMerge.name(), mergeTip.name()); + return mergeTip; // already up to date + } - Ref sourceRef = git.getRefDatabase().getRef(stagingBranchName); - if (sourceRef == null) { throw new NoSuchRefException(stagingBranchName); } + ThreeWayMerger merger = MergeStrategy.RESOLVE.newMerger(git, true); + if (!merger.merge(mergeTip, toMerge)) { + logger.atWarning().log("merge conflict %s on top of %s", toMerge.name(), mergeTip.name()); + throw new MergeConflictException("Merge conflict"); + } - RefUpdate refUpdate = git.updateRef(buildBranchName); - refUpdate.setNewObjectId(sourceRef.getObjectId()); - refUpdate.setForceUpdate(false); - RefUpdate.Result result = refUpdate.update(); + if (!mergeAlways && merger.getResultTreeId().equals(toMerge.getTree().toObjectId())) { + // Just fast forward, note that this will bring in all dependencies from source + logger.atInfo().log("merge fast forward %s on top of %s", toMerge.name(), mergeTip.name()); + return toMerge; + } - // send ref created event - referenceUpdated.fire(projectKey, refUpdate, ReceiveCommand.Type.CREATE, user.state()); + String message = customCommitMessage; + if (message == null) { + try { + message = "Merge \"" + revWalk.parseCommit(toMerge).getShortMessage() + "\""; + } catch (Exception e) { + message = "Merge"; + } + } - return result; + final CommitBuilder mergeCommit = new CommitBuilder(); + mergeCommit.setTreeId(merger.getResultTreeId()); + mergeCommit.setParentIds(mergeTip, toMerge); // important: mergeTip must be parent index 0 + mergeCommit.setAuthor(committerIdent); + mergeCommit.setCommitter(committerIdent); + mergeCommit.setMessage(message); + + ObjectId commit = objInserter.insert(mergeCommit); + objInserter.flush(); + return revWalk.parseCommit(commit); + } + + public static RefUpdate.Result mergeBranches( + IdentifiedUser user, + Repository git, + final BranchNameKey branch, + final BranchNameKey destination, + String customCommitMessage) + throws NoSuchRefException, IOException, MergeConflictException { + + ObjectId srcId = git.resolve(branch.branch()); + if (srcId == null) throw new NoSuchRefException("Invalid Revision: " + branch); + + return mergeObjectToBranch(user, git, srcId, destination, customCommitMessage); + } + + private static RefUpdate.Result mergeObjectToBranch( + IdentifiedUser user, + Repository git, + ObjectId srcId, + final BranchNameKey destination, + String customCommitMessage) + throws NoSuchRefException, IOException, MergeConflictException { + + Ref destRef = git.getRefDatabase().getRef(destination.branch()); + if (destRef == null) throw new NoSuchRefException("No such branch: " + destination); + + ObjectId destId = git.resolve(destination.branch()); + if (destId == null) throw new NoSuchRefException("Invalid Revision: " + destination); + + RevWalk revWalk = new RevWalk(git); + try { + + ObjectInserter objInserter = git.newObjectInserter(); + RevCommit mergeTip = revWalk.lookupCommit(destId); + RevCommit toMerge = revWalk.lookupCommit(srcId); + PersonIdent committer = + user.newCommitterIdent(new Timestamp(System.currentTimeMillis()), TimeZone.getDefault()); + + RevCommit mergeCommit = + merge( + committer, git, objInserter, revWalk, toMerge, mergeTip, customCommitMessage, false); + logger.atInfo().log("merge commit %s added to %s", srcId.name(), destination.branch()); + + RefUpdate refUpdate = git.updateRef(destination.branch()); + refUpdate.setNewObjectId(mergeCommit); + return refUpdate.update(); + } catch (Exception e) { + logger.atWarning().log("merge failed, %s", e); + return null; + } finally { + revWalk.dispose(); + } + } + + private RefUpdate.Result fastForwardBranch( + Repository git, String branchName, ObjectId toObjectId) { + + RefUpdate.Result result = null; + + try { + RefUpdate refUpdate = git.updateRef(branchName); + refUpdate.setNewObjectId(toObjectId); + refUpdate.setForceUpdate(false); + result = refUpdate.update(); + logger.atInfo().log( + "fastforward branch %s to %s, result: %s", branchName, toObjectId.name(), result); + } catch (Exception e) { + result = null; + logger.atWarning().log("fastforward failed for %s: %s", branchName, e); } - private static Result updateRef(Repository git, - final String ref, - final String newValue, - final boolean force) - throws IOException, NoSuchRefException { - Ref sourceRef = git.getRefDatabase().getRef(newValue); - if (sourceRef == null) { - throw new NoSuchRefException(newValue); - } + return result; + } - return updateRef(git, ref, sourceRef.getObjectId(), force); - } + private List listCommitsInIntegrationBranch( + Repository git, ObjectId integrationHeadId, ObjectId targetBranchHeadId) { + + List commits = new ArrayList(); + int count = 0; - public static Result updateRef(Repository git, - final String ref, - final ObjectId id, - final boolean force) - throws IOException, NoSuchRefException { - RefUpdate refUpdate = git.updateRef(ref); - refUpdate.setNewObjectId(id); - refUpdate.setForceUpdate(force); - RefUpdate.Result result = refUpdate.update(); - return result; + try { + RevWalk revWalk = new RevWalk(git); + RevCommit commit = revWalk.parseCommit(integrationHeadId); + RevCommit targetHeadCommit = revWalk.parseCommit(targetBranchHeadId); + + do { + if (revWalk.isMergedInto(commit, targetHeadCommit)) { + commit = null; + } else { + commits.add(0, commit); + if (commit.getParentCount() > 0) { + // Qt Gerrit plugins's merges always have the branch as parent 0 + commit = revWalk.parseCommit(commit.getParent(0)); + } else commit = null; + } + count++; + } while (commit != null && count < 200); + } catch (Exception e) { + commits = null; + logger.atWarning().log("listing commits in a branch failed: %s", e); } - private String getChangeId(RevCommit commit) { - List changeIds = commit.getFooterLines(FooterConstants.CHANGE_ID); - String changeId = null; - if (!changeIds.isEmpty()) changeId = changeIds.get(0); - return changeId; + if (count >= 200) { + logger.atWarning().log("listing commits in a branch failed: too many commits"); + return null; } - private ChangeData findChangeFromList(String changeId, List changes) - throws OrmException { - for (ChangeData item : changes) { - if (item.change().getKey().get().equals(changeId)) return item; - } - return null; - } - - // Step backwards from the ref and return change list in the same order - private List arrangeOrderLikeInRef(Repository git, - ObjectId refObj, - ObjectId tipObj, - List changeList) - throws MissingObjectException, OrmException, - IOException { - List results = new ArrayList(); - if (refObj.equals(tipObj)) return results; - - RevWalk revWalk = new RevWalk(git); - RevCommit commit = revWalk.parseCommit(refObj); - int count = 0; - do { - count++; - String changeId = getChangeId(commit); - - if (commit.getParentCount() == 0) { - commit = null; // something is going wrong, just exit - } else { - if (changeId == null && commit.getParentCount() > 1) { - changeId = getChangeId(revWalk.parseCommit(commit.getParent(1))); - } - ChangeData change = findChangeFromList(changeId, changeList); - if (change != null) results.add(0, change); - - // It can always be trusted that parent in index 0 is the correct one - commit = revWalk.parseCommit(commit.getParent(0)); - } - } while (commit != null && !commit.equals(tipObj) && count < 100); - - if (count == 100) return null; - return results; - } - - private ObjectId pickChangesToStagingRef(Repository git, - final Project.NameKey projectKey, - List changes, - ObjectId tipObj) - throws OrmException, IOException, IntegrationException { - ObjectId newId = tipObj; - for (ChangeData item : changes) { - Change change = item.change(); - logger.atInfo().log("qtcodereview: rebuilding add %s", change); - PatchSet p = item.currentPatchSet(); - ObjectId srcId = git.resolve(p.getRevision().get()); - newId = qtCherryPickPatch.cherryPickPatch(item, - projectKey, - srcId, - newId, - false, // allowFastForward - null, // newStatus - null, // defaultMessage - null, // inputMessage - TAG_CI // tag - ).toObjectId(); - } - return newId; - } - - // Step backwards from staging head and return 1st commit in integrating status - private ObjectId findIntegrationHead(Repository git, - ObjectId stagingHead, - ObjectId branchHead, - List integratingChanges) - throws MissingObjectException, OrmException, IOException { - - if (stagingHead.equals(branchHead)) return branchHead; - - RevWalk revWalk = new RevWalk(git); - RevCommit commit = revWalk.parseCommit(stagingHead); - int count = 0; - do { - count++; - String changeId = getChangeId(commit); - ChangeData change = findChangeFromList(changeId, integratingChanges); - if (change != null) return commit; - - if (commit.getParentCount() > 0) { - // It can always be trusted that parent in index 0 is the correct one - commit = revWalk.parseCommit(commit.getParent(0)); - } else commit = null; - - } while (commit != null && !commit.equals(branchHead) && count < 100); - - return branchHead; - } - - // Step backwards from staging head and find commit that can be reused - private ObjectId findReusableStagingHead(Repository git, - ObjectId stagingHead, - ObjectId integrationHead, - List stagedChanges) - throws MissingObjectException, OrmException, IOException { - - if (stagingHead.equals(integrationHead)) return integrationHead; - - ObjectId reusableHead = null; - RevWalk revWalk = new RevWalk(git); - RevCommit commit = revWalk.parseCommit(stagingHead); - int count = 0; - do { - count++; - String changeId = getChangeId(commit); - ChangeData change = findChangeFromList(changeId, stagedChanges); - if (change != null) { - if (reusableHead == null) reusableHead = commit; - } else reusableHead = null; - - if (commit.getParentCount() > 0) { - // It can always be trusted that parent in index 0 is the correct one - commit = revWalk.parseCommit(commit.getParent(0)); - } else commit = null; - - } while (commit != null && !commit.equals(integrationHead) && count < 100); - - if (reusableHead == null) reusableHead = integrationHead; - return reusableHead; - } - - public void rebuildStagingBranch(Repository git, - IdentifiedUser user, - final Project.NameKey projectKey, - final Branch.NameKey stagingBranchKey, - final Branch.NameKey destBranchShortKey) - throws MergeConflictException { - InternalChangeQuery query = null; - List changes_integrating = null; - List changes_staged = null; - List changes_to_cherrypick = null; - ObjectId oldStageRef = null; - ObjectId branchRef = null; - ObjectId newStageRef = null; - ObjectId integratingRef = null; - String stagingBranchName = null; - - try { - stagingBranchName = stagingBranchKey.get(); - oldStageRef = git.resolve(stagingBranchName); - branchRef = git.resolve(destBranchShortKey.get()); - - query = queryProvider.get(); - changes_integrating = query.byBranchStatus(destBranchShortKey, Change.Status.INTEGRATING); - - query = queryProvider.get(); - changes_staged = query.byBranchStatus(destBranchShortKey, Change.Status.STAGED); - } catch (OrmException | IOException e) { - logger.atSevere().log("qtcodereview: rebuild staging ref %s db query failed. Exception %s", - stagingBranchKey, e); - throw new MergeConflictException("fatal: " + e.getMessage()); - } - - try { - logger.atInfo().log("qtcodereview: rebuild staging ref reset %s back to %s", - stagingBranchKey, destBranchShortKey); - Result result = QtUtil.createStagingBranch(git, destBranchShortKey); - if (result == null) throw new NoSuchRefException("Cannot create staging ref: " + stagingBranchName); - logger.atInfo().log("qtcodereview: rebuild staging ref reset to %s with result %s", branchRef, result); - integratingRef = findIntegrationHead(git, oldStageRef, branchRef, changes_integrating); - logger.atInfo().log("qtcodereview: rebuild staging integration ref is %s", integratingRef); - newStageRef = findReusableStagingHead(git, oldStageRef, integratingRef, changes_staged); - logger.atInfo().log("qtcodereview: rebuild staging reused staging ref is %s", newStageRef); - changes_to_cherrypick = arrangeOrderLikeInRef(git, oldStageRef, newStageRef, changes_staged); - } catch (NoSuchRefException | IOException | OrmException e) { - logger.atSevere().log("qtcodereview: rebuild staging ref reset %s failed. Exception %s", - stagingBranchKey, e); - throw new MergeConflictException("fatal: " + e.getMessage()); - } - - try { - newStageRef = pickChangesToStagingRef(git, projectKey, changes_to_cherrypick, newStageRef); - } catch(Exception e) { - logger.atInfo().log("qtcodereview: rebuild staging ref %s merge conflict", stagingBranchKey); - newStageRef = integratingRef; - String message = "Merge conflict in staging branch. Status changed back to new. Please stage again."; - QtChangeUpdateOp op = qtUpdateFactory.create(Change.Status.NEW, Change.Status.STAGED, message, null, null, null); - try (BatchUpdate u = updateFactory.create(dbProvider.get(), projectKey, user, TimeUtil.nowTs())) { - for (ChangeData item: changes_staged) { - Change change = item.change(); - logger.atInfo().log("qtcodereview: staging ref rebuild merge conflict. Change %s back to NEW", change); - u.addOp(change.getId(), op); - } - u.execute(); - } catch (OrmException ex) { - logger.atSevere().log("qtcodereview: staging ref rebuild. Failed to access database %s", ex); - } catch (UpdateException | RestApiException ex) { - logger.atSevere().log("qtcodereview: staging ref rebuild. Failed to update change status %s", ex); - } - } - - try { - RefUpdate refUpdate = git.updateRef(stagingBranchName); - refUpdate.setNewObjectId(newStageRef); - refUpdate.update(); - - // send ref updated event only if it changed - if (!newStageRef.equals(oldStageRef)) { - referenceUpdated.fire(projectKey, stagingBranchName, oldStageRef, newStageRef, user.state()); - } - } catch (IOException e) { - logger.atSevere().log("qtcodereview: rebuild %s failed to update ref %s", stagingBranchKey, e); - throw new MergeConflictException("fatal: IOException"); - } - } - - /** - * Lists not merged changes between branches. - * @param git jGit Repository. Must be open. - * @param db ReviewDb of a Gerrit site. - * @param branch Branch to search for the changes. - * @param destination Destination branch for changes. - * @return List of not merged changes. - * @throws IOException Thrown by Repository or RevWalk if repository is not - * accessible. - * @throws OrmException Thrown if ReviewDb is not accessible. - */ - public List> listChangesNotMerged(Repository git, - final Branch.NameKey branch, - final Branch.NameKey destination) - throws IOException, OrmException, - BranchNotFoundException { - - List> result = new ArrayList>(); - RevWalk revWalk = new RevWalk(git); - - try { - Ref ref = git.getRefDatabase().getRef(branch.get()); - if (ref == null) throw new BranchNotFoundException("No such branch: " + branch); - Ref refDest = git.getRefDatabase().getRef(destination.get()); - if (refDest == null) throw new BranchNotFoundException("No such branch: " + destination); - RevCommit firstCommit = revWalk.parseCommit(ref.getObjectId()); - revWalk.markStart(firstCommit); - // Destination is the walker end point - revWalk.markUninteresting(revWalk.parseCommit(refDest.getObjectId())); - - Iterator i = revWalk.iterator(); - while (i.hasNext()) { - RevCommit commit = i.next(); - String changeId = getChangeId(commit); - List changes = null; - - if (changeId != null) { - Change.Key key = new Change.Key(changeId); - changes = queryProvider.get().byBranchKey(destination, key); - } - - if (changes != null && !changes.isEmpty()) { - if (changes.size() > 1) logger.atWarning().log("qtcodereview: commit belongs to multiple changes: %s", commit.name()); - ChangeData cd = changes.get(0); - result.add(new AbstractMap.SimpleEntry(cd, commit)); - } - } - } finally { - revWalk.dispose(); - } - return result; + return commits; + } + + private Boolean isCherryPickingAllowed(List commits) { + // Cherry-picking merge commits is not allowed, because it would squash + // the merge into one single commit + for (RevCommit commit : commits) { + if (commit.getParentCount() > 1) return false; + } + return true; + } + + private List cherryPickCommitsToBranch( + Repository git, Project.NameKey project, String branchName, List commits) { + + try { + ProjectState projectState = projectCache.get(project).orElseThrow(noSuchProject(project)); + MergeUtil mergeUtil = mergeUtilFactory.create(projectState, true); + ObjectInserter objInserter = git.newObjectInserter(); + ObjectReader reader = objInserter.newReader(); + CodeReviewCommit.CodeReviewRevWalk revWalk = CodeReviewCommit.newRevWalk(reader); + RevCommit newBranchHead = revWalk.parseCommit(git.resolve(branchName)); + + List cherryPicked = new ArrayList(); + + for (RevCommit commit : commits) { + CodeReviewCommit cherryPickCommit = + mergeUtil.createCherryPickFromCommit( + objInserter, + git.getConfig(), + newBranchHead, + commit, + new PersonIdent(commit.getCommitterIdent(), new Date()), + commit.getFullMessage(), + revWalk, + 0, + true, // ignoreIdenticalTree + false); // allowConflicts + objInserter.flush(); + logger.atInfo().log( + "created cherrypick commit %s from %s", cherryPickCommit.name(), commit.name()); + newBranchHead = cherryPickCommit; + cherryPicked.add(cherryPickCommit); + } + + RefUpdate.Result result = fastForwardBranch(git, branchName, newBranchHead); + if (result != RefUpdate.Result.FAST_FORWARD) return null; + + return cherryPicked; + } catch (Exception e) { + logger.atWarning().log("cherrypicking commits to branch failed: %s", e); + return null; } + } - public static RevCommit merge(PersonIdent committerIdent, - Repository git, - ObjectInserter objInserter, - RevWalk revWalk, - RevCommit toMerge, - RevCommit mergeTip, - boolean mergeAlways) - throws NoSuchRefException, IOException, MergeConflictException { + private List> listChanges( + Repository git, BranchNameKey destination, List commits) throws Exception { - if (revWalk.isMergedInto(toMerge, mergeTip)) { - logger.atWarning().log("qtcodereview: commit %s already in %s", toMerge, mergeTip); - return mergeTip; // already up to date - } + Map> map = new HashMap<>(); - ThreeWayMerger merger = MergeStrategy.RESOLVE.newMerger(git, true); - if (!merger.merge(mergeTip, toMerge)) { - logger.atWarning().log("qtcodereview: merge conflict %s on top of %s", toMerge, mergeTip); - throw new MergeConflictException("Merge conflict"); - } + for (RevCommit commit : commits) { + String changeId = getChangeId(commit); + List changes = null; - if (!mergeAlways && merger.getResultTreeId().equals(toMerge.getTree().toObjectId())) { - // Just fast forward, note that this will bring in all dependencies from source - logger.atInfo().log("qtcodereview: merge fast forward %s on top of %s", toMerge, mergeTip); - return toMerge; - } + if (changeId == null && commit.getParentCount() > 1) { + // Merge commit without Change-Id, so done by plugin: changes merged in will be parent 1 + changeId = getChangeId(commit.getParent(1)); + } - String message; - try { - message = revWalk.parseCommit(toMerge).getShortMessage(); - } catch (Exception e) { - message = toMerge.toString(); - } - message = "Merge \"" + message + "\""; - - final CommitBuilder mergeCommit = new CommitBuilder(); - mergeCommit.setTreeId(merger.getResultTreeId()); - mergeCommit.setParentIds(mergeTip, toMerge); // important: mergeTip must be parent index 0 - mergeCommit.setAuthor(toMerge.getAuthorIdent()); - mergeCommit.setCommitter(committerIdent); - mergeCommit.setMessage(message); - - return revWalk.parseCommit(objInserter.insert(mergeCommit)); - } - - public static RefUpdate.Result mergeBranches(IdentifiedUser user, - Repository git, - final Branch.NameKey branch, - final Branch.NameKey destination) - throws NoSuchRefException, IOException, MergeConflictException { - - ObjectId srcId = git.resolve(branch.get()); - if (srcId == null) throw new NoSuchRefException("Invalid Revision: " + branch); - - return mergeObjectToBranch(user, git, srcId, destination); - } - - private static RefUpdate.Result mergeObjectToBranch(IdentifiedUser user, - Repository git, - ObjectId srcId, - final Branch.NameKey destination) - throws NoSuchRefException, IOException, MergeConflictException { - - Ref destRef = git.getRefDatabase().getRef(destination.get()); - if (destRef == null) throw new NoSuchRefException("No such branch: " + destination); - - ObjectId destId = git.resolve(destination.get()); - if (destId == null) throw new NoSuchRefException("Invalid Revision: " + destination); - - RevWalk revWalk = new RevWalk(git); - try { - - ObjectInserter objInserter = git.newObjectInserter(); - RevCommit mergeTip = revWalk.lookupCommit(destId); - RevCommit toMerge = revWalk.lookupCommit(srcId); - PersonIdent committer = user.newCommitterIdent(new Timestamp(System.currentTimeMillis()), TimeZone.getDefault()); - - RevCommit mergeCommit = merge(committer, - git, - objInserter, - revWalk, - toMerge, - mergeTip, - false); - objInserter.flush(); - logger.atInfo().log("qtcodereview: merge commit for %s added to %s", srcId, destination); - - RefUpdate refUpdate = git.updateRef(destination.get()); - refUpdate.setNewObjectId(mergeCommit); - return refUpdate.update(); - } catch (Exception e) { - logger.atWarning().log("qtcodereview: merge failed, %s", e); - return null; - } finally { - revWalk.dispose(); + if (changeId != null) { + Change.Key key = Change.key(changeId); + changes = queryProvider.get().byBranchKey(destination, key); + } + + if (changes != null && !changes.isEmpty()) { + if (changes.size() > 1) { + String msg = + String.format("Same Change-Id in several changes on same branch: %s", commit.name()); + throw new Exception(msg); } + ChangeData cd = changes.get(0); + map.put(cd.getId(), new AbstractMap.SimpleEntry(cd, commit)); + } + } + return new ArrayList>(map.values()); + } + + public List> mergeIntegrationToBranch( + IdentifiedUser user, + Repository git, + Project.NameKey project, + final BranchNameKey integrationBranch, + final BranchNameKey targetBranch, + String customCommitMessage) + throws MergeConflictException, NoSuchRefException { + + List commitsInBranch = null; + RevCommit newBranchHead = null; + RefUpdate.Result result = null; + ObjectId sourceId = null; + ObjectId targetId = null; + + logger.atInfo().log( + "start merging integration %s to %s", integrationBranch.branch(), targetBranch.branch()); + + try { + sourceId = git.resolve(integrationBranch.branch()); + if (sourceId == null) throw new NoSuchRefException("Invalid Revision: " + integrationBranch); + + Ref targetRef = git.getRefDatabase().getRef(targetBranch.branch()); + if (targetRef == null) throw new NoSuchRefException("No such branch: " + targetBranch); + + targetId = git.resolve(targetBranch.branch()); + if (targetId == null) throw new NoSuchRefException("Invalid Revision: " + targetBranch); + + if (sourceId.equals(targetId)) throw new NoSuchRefException("Nothing to merge"); + + commitsInBranch = listCommitsInIntegrationBranch(git, sourceId, targetId); + if (commitsInBranch == null) + throw new NoSuchRefException("Failed to list commits in " + integrationBranch); + else if (commitsInBranch.isEmpty()) + throw new NoSuchRefException("No commits in " + integrationBranch); + } catch (Exception e) { + logger.atWarning().log("preconditions of merging integration failed: %s", e); + throw new NoSuchRefException(e.getMessage()); } + try { + logger.atInfo().log("Trying to fast forward..."); + result = fastForwardBranch(git, targetBranch.branch(), sourceId); + if (result == RefUpdate.Result.FAST_FORWARD) + return listChanges(git, targetBranch, commitsInBranch); + + if (isCherryPickingAllowed(commitsInBranch)) { + logger.atInfo().log("Trying to rebase integration onto the target branch..."); + List cherrypicks = + cherryPickCommitsToBranch(git, project, targetBranch.branch(), commitsInBranch); + if (cherrypicks != null) return listChanges(git, targetBranch, cherrypicks); + } + + logger.atInfo().log("Trying to create merge commit..."); + List> mergedCommits = + listChangesNotMerged(git, integrationBranch, targetBranch); + result = mergeBranches(user, git, integrationBranch, targetBranch, customCommitMessage); + if (result != RefUpdate.Result.FAST_FORWARD) throw new Exception("Merge conflict"); + return mergedCommits; + } catch (Exception e) { + result = null; + logger.atWarning().log( + "Merging integration %s to %s failed: %s", + integrationBranch.branch(), targetBranch.branch(), e.getMessage()); + throw new MergeConflictException( + "Merge conflict:" + integrationBranch.branch() + " to " + targetBranch.branch()); + } + } + + private Supplier changeAttributeSupplier(Change change, ChangeNotes notes) { + return Suppliers.memoize( + () -> { + try { + return eventFactory.asChangeAttribute(change, notes); + } catch (StorageException e) { + throw new RuntimeException(e); + } + }); + } + + public void postChangeStagedEvent(Change change) { + try { + ChangeNotes notes = changeNotesFactory.createChecked(change); + QtChangeStagedEvent event = new QtChangeStagedEvent(change); + event.change = changeAttributeSupplier(change, notes); + eventDispatcher.get().postEvent(event); + } catch (StorageException | PermissionBackendException e) { + logger.atWarning().log("postChangeStagedEvent failed: %s", e); + } + } + + public void postChangeUnStagedEvent(Change change) { + try { + ChangeNotes notes = changeNotesFactory.createChecked(change); + QtChangeUnStagedEvent event = new QtChangeUnStagedEvent(change); + event.change = changeAttributeSupplier(change, notes); + eventDispatcher.get().postEvent(event); + } catch (StorageException | PermissionBackendException e) { + logger.atWarning().log("postChangeUnStagedEvent failed: %s", e); + } + } + + public void postChangeIntegrationPassEvent(Change change) { + try { + ChangeNotes notes = changeNotesFactory.createChecked(change); + QtChangeIntegrationPassEvent event = new QtChangeIntegrationPassEvent(change); + event.change = changeAttributeSupplier(change, notes); + eventDispatcher.get().postEvent(event); + } catch (StorageException | PermissionBackendException e) { + logger.atWarning().log("postChangeIntegrationPassEvent failed: %s", e); + } + } + + public void postChangeIntegrationFailEvent(Change change) { + try { + ChangeNotes notes = changeNotesFactory.createChecked(change); + QtChangeIntegrationFailEvent event = new QtChangeIntegrationFailEvent(change); + event.change = changeAttributeSupplier(change, notes); + eventDispatcher.get().postEvent(event); + } catch (StorageException | PermissionBackendException e) { + logger.atWarning().log("postChangeIntegrationFailEvent failed: %s", e); + } + } + + public void postChangePreCheckEvent(Change change, PatchSet patchSet, QtPrecheckMessage data) { + try { + ChangeNotes notes = changeNotesFactory.createChecked(change); + QtChangePreCheckEvent event = new QtChangePreCheckEvent(change, data); + event.change = changeAttributeSupplier(change, notes); + event.commitID = patchSet.commitId().name(); + eventDispatcher.get().postEvent(event); + } catch (StorageException | PermissionBackendException e) { + logger.atWarning().log("postChangePreCheckEvent failed: %s", e); + } + } } diff --git a/src/main/resources/mail/QtBuildFailed.soy b/src/main/resources/mail/QtBuildFailed.soy new file mode 100644 index 0000000..0892380 --- /dev/null +++ b/src/main/resources/mail/QtBuildFailed.soy @@ -0,0 +1,27 @@ +/** + * Copyright (C) 2022 The Qt Company + */ + +{namespace com.google.gerrit.server.mail.template} + +/** + * The .QtBuildFailed template will determine the contents of the email related to a + * change failed CI. + */ + +{template .QtBuildFailed kind="text"} + {@param change: ?} + {@param coverLetter: ?} + {@param email: ?} + The change has failed CI. + {if $email.changeUrl} ( {$email.changeUrl} ){/if}{\n} + {\n} + Change subject: {$change.subject}{\n} + ......................................................................{\n} + {if $coverLetter} + {\n} + {\n} + {$coverLetter} + {\n} + {/if} +{/template} diff --git a/src/main/resources/mail/QtBuildFailedHtml.soy b/src/main/resources/mail/QtBuildFailedHtml.soy new file mode 100644 index 0000000..c6a9a3c --- /dev/null +++ b/src/main/resources/mail/QtBuildFailedHtml.soy @@ -0,0 +1,28 @@ +/** + * Copyright (C) 2022 The Qt Company + */ + +{namespace com.google.gerrit.server.mail.template} + +/** + * The .QtBuildFailed template will determine the contents of the email related to a + * change failed CI. + */ + +{template .QtBuildFailedHtml} + {@param coverLetter: ?} + {@param email: ?} +

+ The change has failed CI. +

+ + {if $email.changeUrl} +

+ {call .ViewChangeButton data="all" /} +

+ {/if} + + {if $coverLetter} +
{$coverLetter}
+ {/if} +{/template} diff --git a/src/test/java/com/googlesource/gerrit/plugins/qtcodereview/QtAbandonIT.java b/src/test/java/com/googlesource/gerrit/plugins/qtcodereview/QtAbandonIT.java index 44448f3..34be82c 100644 --- a/src/test/java/com/googlesource/gerrit/plugins/qtcodereview/QtAbandonIT.java +++ b/src/test/java/com/googlesource/gerrit/plugins/qtcodereview/QtAbandonIT.java @@ -1,111 +1,101 @@ -// Copyright (C) 2018 The Qt Company +// Copyright (C) 2018-21 The Qt Company package com.googlesource.gerrit.plugins.qtcodereview; -import static com.google.gerrit.server.group.SystemGroupBackend.REGISTERED_USERS; - import static com.google.common.truth.Truth.assertThat; +import static com.google.gerrit.server.group.SystemGroupBackend.REGISTERED_USERS; -import com.google.gerrit.acceptance.LightweightPluginDaemonTest; import com.google.gerrit.acceptance.PushOneCommit; import com.google.gerrit.acceptance.RestResponse; import com.google.gerrit.acceptance.TestPlugin; import com.google.gerrit.acceptance.UseSsh; - -import com.google.gerrit.common.data.Permission; +import com.google.gerrit.acceptance.testsuite.project.TestProjectUpdate; +import com.google.gerrit.entities.Permission; import com.google.gerrit.extensions.api.changes.AbandonInput; -import com.google.gerrit.reviewdb.client.Change; - -import org.eclipse.jgit.revwalk.RevCommit; - +import com.google.gerrit.entities.Change; +import org.apache.http.HttpStatus; import org.junit.Before; import org.junit.Test; -import org.apache.http.HttpStatus; - @TestPlugin( name = "gerrit-plugin-qt-workflow", sysModule = "com.googlesource.gerrit.plugins.qtcodereview.QtModule", - sshModule = "com.googlesource.gerrit.plugins.qtcodereview.QtSshModule" -) - + sshModule = "com.googlesource.gerrit.plugins.qtcodereview.QtSshModule") @UseSsh public class QtAbandonIT extends QtCodeReviewIT { - @Before - public void SetDefaultPermissions() throws Exception { - grant(project, "refs/heads/master", Permission.ABANDON, false, REGISTERED_USERS); - } - - @Test - public void singleChange_Defer_QtAbandon() throws Exception { - PushOneCommit.Result c = pushCommit("master", "commitmsg1", "file1", "content1"); - QtDefer(c); - qtAbandon(c); - } - - @Test - public void singleChange_Defer_QtAbandon_With_Input_Messsage() throws Exception { - PushOneCommit.Result c = pushCommit("master", "commitmsg1", "file1", "content1"); - approve(c.getChangeId()); - String changeId = c.getChangeId(); - - QtDefer(c); - - AbandonInput abandonInput = new AbandonInput(); - abandonInput.message = "myabandonednote"; - - String url = "/changes/" + changeId + "/gerrit-plugin-qt-workflow~abandon"; - RestResponse response = userRestSession.post(url, abandonInput); - response.assertOK(); - Change change = c.getChange().change(); - assertThat(change.getStatus()).isEqualTo(Change.Status.ABANDONED); - } - - @Test - public void errorQtAbandon_No_Permission() throws Exception { - PushOneCommit.Result c = pushCommit("master", "commitmsg1", "file1", "content1"); - - QtDefer(c); - - deny(project, "refs/heads/master", Permission.ABANDON, REGISTERED_USERS); - RestResponse response = qtAbandonExpectFail(c, HttpStatus.SC_FORBIDDEN); - assertThat(response.getEntityContent()).isEqualTo("abandon not permitted"); - grant(project, "refs/heads/master", Permission.ABANDON, false, REGISTERED_USERS); - } - - @Test - public void errorQtAbandon_Wrong_Status() throws Exception { - PushOneCommit.Result c = pushCommit("master", "commitmsg1", "file1", "content1"); - - RestResponse response = qtAbandonExpectFail(c, HttpStatus.SC_CONFLICT); - assertThat(response.getEntityContent()).isEqualTo("change is new"); - } - - private void qtAbandon(PushOneCommit.Result c) throws Exception { - RestResponse response = call_REST_API_QtAbandon(c.getChangeId()); - response.assertOK(); - - Change change = c.getChange().change(); - assertThat(change.getStatus()).isEqualTo(Change.Status.ABANDONED); - } - - private RestResponse qtAbandonExpectFail(PushOneCommit.Result c, - int expectedStatus) - throws Exception { - RestResponse response = call_REST_API_QtAbandon(c.getChangeId()); - response.assertStatus(expectedStatus); - - Change change = c.getChange().change(); - assertThat(change.getStatus()).isNotEqualTo(Change.Status.ABANDONED); - - return response; - } - - private RestResponse call_REST_API_QtAbandon(String changeId) throws Exception { - String url = "/changes/" + changeId + "/gerrit-plugin-qt-workflow~abandon"; - RestResponse response = userRestSession.post(url); - return response; - } - + @Before + public void SetDefaultPermissions() throws Exception { + projectOperations.project(project).forUpdate().add(TestProjectUpdate.allow(Permission.ABANDON).ref("refs/heads/master").group(REGISTERED_USERS)).update(); + } + + @Test + public void singleChange_Defer_QtAbandon() throws Exception { + PushOneCommit.Result c = pushCommit("master", "commitmsg1", "file1", "content1"); + QtDefer(c); + qtAbandon(c); + } + + @Test + public void singleChange_Defer_QtAbandon_With_Input_Messsage() throws Exception { + PushOneCommit.Result c = pushCommit("master", "commitmsg1", "file1", "content1"); + approve(c.getChangeId()); + String changeId = c.getChangeId(); + + QtDefer(c); + + AbandonInput abandonInput = new AbandonInput(); + abandonInput.message = "myabandonednote"; + + String url = "/changes/" + changeId + "/gerrit-plugin-qt-workflow~abandon"; + RestResponse response = userRestSession.post(url, abandonInput); + response.assertOK(); + Change change = c.getChange().change(); + assertThat(change.getStatus()).isEqualTo(Change.Status.ABANDONED); + } + + @Test + public void errorQtAbandon_No_Permission() throws Exception { + PushOneCommit.Result c = pushCommit("master", "commitmsg1", "file1", "content1"); + + QtDefer(c); + + projectOperations.project(project).forUpdate().add(TestProjectUpdate.deny(Permission.ABANDON).ref("refs/heads/master").group(REGISTERED_USERS)).update(); + RestResponse response = qtAbandonExpectFail(c, HttpStatus.SC_FORBIDDEN); + assertThat(response.getEntityContent()).isEqualTo("abandon not permitted"); + projectOperations.project(project).forUpdate().add(TestProjectUpdate.allow(Permission.ABANDON).ref("refs/heads/master").group(REGISTERED_USERS)).update(); + } + + @Test + public void errorQtAbandon_Wrong_Status() throws Exception { + PushOneCommit.Result c = pushCommit("master", "commitmsg1", "file1", "content1"); + + RestResponse response = qtAbandonExpectFail(c, HttpStatus.SC_CONFLICT); + assertThat(response.getEntityContent()).isEqualTo("change is new"); + } + + private void qtAbandon(PushOneCommit.Result c) throws Exception { + RestResponse response = call_REST_API_QtAbandon(c.getChangeId()); + response.assertOK(); + + Change change = c.getChange().change(); + assertThat(change.getStatus()).isEqualTo(Change.Status.ABANDONED); + } + + private RestResponse qtAbandonExpectFail(PushOneCommit.Result c, int expectedStatus) + throws Exception { + RestResponse response = call_REST_API_QtAbandon(c.getChangeId()); + response.assertStatus(expectedStatus); + + Change change = c.getChange().change(); + assertThat(change.getStatus()).isNotEqualTo(Change.Status.ABANDONED); + + return response; + } + + private RestResponse call_REST_API_QtAbandon(String changeId) throws Exception { + String url = "/changes/" + changeId + "/gerrit-plugin-qt-workflow~abandon"; + RestResponse response = userRestSession.post(url); + return response; + } } diff --git a/src/test/java/com/googlesource/gerrit/plugins/qtcodereview/QtCodeReviewIT.java b/src/test/java/com/googlesource/gerrit/plugins/qtcodereview/QtCodeReviewIT.java index f813466..1e35c8f 100644 --- a/src/test/java/com/googlesource/gerrit/plugins/qtcodereview/QtCodeReviewIT.java +++ b/src/test/java/com/googlesource/gerrit/plugins/qtcodereview/QtCodeReviewIT.java @@ -1,8 +1,11 @@ -// Copyright (C) 2019 The Qt Company +// Copyright (C) 2021-22 The Qt Company package com.googlesource.gerrit.plugins.qtcodereview; import static com.google.common.truth.Truth.assertThat; +import static com.google.common.truth.Truth.assertWithMessage; +import static com.google.gerrit.acceptance.GitUtil.assertPushOk; +import static com.google.gerrit.acceptance.GitUtil.pushHead; import static com.google.gerrit.extensions.client.ListChangesOption.CURRENT_COMMIT; import static com.google.gerrit.extensions.client.ListChangesOption.CURRENT_REVISION; import static com.google.gerrit.extensions.client.ListChangesOption.DETAILED_LABELS; @@ -13,294 +16,376 @@ import com.google.gerrit.acceptance.RestResponse; import com.google.gerrit.acceptance.TestAccount; import com.google.gerrit.acceptance.TestPlugin; -import com.google.gerrit.acceptance.UseSsh; +import com.google.gerrit.acceptance.testsuite.project.ProjectOperations; import com.google.gerrit.common.FooterConstants; +import com.google.gerrit.extensions.api.changes.CherryPickInput; import com.google.gerrit.extensions.client.ChangeStatus; import com.google.gerrit.extensions.common.ApprovalInfo; import com.google.gerrit.extensions.common.ChangeInfo; import com.google.gerrit.extensions.common.LabelInfo; -import com.google.gerrit.reviewdb.client.Change; - -import org.eclipse.jgit.lib.Repository; -import org.eclipse.jgit.revwalk.RevCommit; -import org.eclipse.jgit.revwalk.RevWalk; - +import com.google.gerrit.entities.Change; +import com.google.gerrit.entities.Project; +import com.google.inject.Inject; +import java.util.List; import org.apache.log4j.ConsoleAppender; import org.apache.log4j.Level; -import org.apache.log4j.Logger; import org.apache.log4j.LogManager; +import org.apache.log4j.Logger; import org.apache.log4j.PatternLayout; - -import java.util.List; - +import org.eclipse.jgit.lib.Constants; +import org.eclipse.jgit.lib.Ref; +import org.eclipse.jgit.lib.Repository; +import org.eclipse.jgit.revwalk.RevCommit; +import org.eclipse.jgit.revwalk.RevWalk; import org.junit.Before; import org.junit.Test; - @TestPlugin( name = "gerrit-plugin-qt-workflow", sysModule = "com.googlesource.gerrit.plugins.qtcodereview.QtModule", - sshModule = "com.googlesource.gerrit.plugins.qtcodereview.QtSshModule" -) - + sshModule = "com.googlesource.gerrit.plugins.qtcodereview.QtSshModule") public class QtCodeReviewIT extends LightweightPluginDaemonTest { - - protected static final String R_HEADS = "refs/heads/"; - protected static final String R_STAGING = "refs/staging/"; - protected static final String R_BUILDS = "refs/builds/"; - protected static final String R_PUSH = "refs/for/"; - - protected static final String CONTENT_DATA = "hereisjustsomecontentforthecommits"; - protected static final String BUILD_PASS_MESSAGE = "thebuildpassed"; - protected static final String BUILD_FAIL_MESSAGE = "thebuildfailed"; - - @Before - public void ReduceLogging() throws Exception { - LogManager.resetConfiguration(); - - final PatternLayout layout = new PatternLayout(); - layout.setConversionPattern("%-5p %c %x: %m%n"); - - final ConsoleAppender dst = new ConsoleAppender(); - dst.setLayout(layout); - dst.setTarget("System.err"); - dst.setThreshold(Level.INFO); - dst.activateOptions(); - - final Logger root = LogManager.getRootLogger(); - root.removeAllAppenders(); - root.addAppender(dst); + @Inject public ProjectOperations projectOperations; + + protected static final String R_HEADS = "refs/heads/"; + protected static final String R_STAGING = "refs/staging/"; + protected static final String R_BUILDS = "refs/builds/"; + protected static final String R_PUSH = "refs/for/"; + + protected static final String CONTENT_DATA = "hereisjustsomecontentforthecommits"; + protected static final String BUILD_PASS_MESSAGE = "thebuildpassed"; + protected static final String BUILD_FAIL_MESSAGE = "thebuildfailed"; + + private RevCommit lastGeneratedCommit; + + @Before + public void ReduceLogging() throws Exception { + LogManager.resetConfiguration(); + + final PatternLayout layout = new PatternLayout(); + layout.setConversionPattern("%-5p %c %x: %m%n"); + + final ConsoleAppender dst = new ConsoleAppender(); + dst.setLayout(layout); + dst.setTarget("System.err"); + dst.setThreshold(Level.INFO); + dst.activateOptions(); + + final Logger root = LogManager.getRootLogger(); + root.removeAllAppenders(); + root.addAppender(dst); + } + + @Before + public void GenerateCommits() throws Exception { + // Generate 100+ commits to match more like production environment + RevCommit parent = getRemoteHead(); + for (int i = 0; i <= 101; i++) { + RevCommit c = testRepo.commit() + .message("a commit " + String.valueOf(i)) + .add("afile" + String.valueOf(i), "somecontent") + .parent(parent) + .insertChangeId() + .create(); + testRepo.reset(c); + assertPushOk(pushHead(testRepo, "refs/heads/master", false), "refs/heads/master"); + parent = c; } - - @Test - public void dummyTest() throws Exception { - + lastGeneratedCommit = parent; + resetEvents(); + } + + @Test + public void dummyTest() throws Exception {} + + // Helper functions + + protected void QtDefer(PushOneCommit.Result c) throws Exception { + RestResponse response = call_REST_API_Defer(c.getChangeId()); + response.assertOK(); + Change change = c.getChange().change(); + assertThat(change.getStatus()).isEqualTo(Change.Status.DEFERRED); + } + + protected RestResponse call_REST_API_Defer(String changeId) throws Exception { + String url = "/changes/" + changeId + "/gerrit-plugin-qt-workflow~defer"; + RestResponse response = userRestSession.post(url); + return response; + } + + protected void QtStage(PushOneCommit.Result c) throws Exception { + RestResponse response = call_REST_API_Stage(c.getChangeId(), c.getCommit().getName()); + response.assertOK(); + Change change = c.getChange().change(); + assertStatusStaged(change); + String branch = getBranchNameFromRef(change.getDest().branch()); + RevCommit stagingHead = getRemoteHead(project, R_STAGING + branch); + assertReviewedByFooter(stagingHead, true); + resetEvents(); + } + + protected RestResponse call_REST_API_Stage(String changeId, String revisionId) throws Exception { + String url = + "/changes/" + changeId + "/revisions/" + revisionId + "/gerrit-plugin-qt-workflow~stage"; + RestResponse response = userRestSession.post(url); + return response; + } + + protected ChangeInfo cherryPick(final PushOneCommit.Result c, final String branch) throws Exception { + // If the commit message does not specify a Change-Id, a new one is picked for the destination change. + final CherryPickInput input = new CherryPickInput(); + input.message = "CHERRY" + c.getCommit().getFullMessage(); + input.destination = branch; + + final RestResponse response = call_REST_API_CherryPick(c.getChangeId(), c.getCommit().getName(), input); + response.assertOK(); + return newGson().fromJson(response.getReader(), ChangeInfo.class); + } + + protected RestResponse call_REST_API_CherryPick( + final String changeId, final String revisionId, final CherryPickInput input) + throws Exception { + final String url = "/changes/" + changeId + "/revisions/" + revisionId + "/cherrypick"; + return userRestSession.post(url, input); + } + + protected void QtUnStage(PushOneCommit.Result c) throws Exception { + RestResponse response = call_REST_API_UnStage(c.getChangeId(), getCurrentPatchId(c)); + response.assertOK(); + assertStatusNew(c.getChange().change()); + } + + protected RestResponse call_REST_API_UnStage(String changeId, String revisionId) + throws Exception { + String url = + "/changes/" + changeId + "/revisions/" + revisionId + "/gerrit-plugin-qt-workflow~unstage"; + RestResponse response = userRestSession.post(url); + return response; + } + + protected void QtNewBuild(String branch, String buildId) throws Exception { + String commandStr; + commandStr = "gerrit-plugin-qt-workflow staging-new-build"; + commandStr += " --project " + project.get(); + commandStr += " --staging-branch " + branch; + commandStr += " --build-id " + buildId; + String resultStr = adminSshSession.exec(commandStr); + assertThat(adminSshSession.getError()).isNull(); + RevCommit buildHead = getRemoteHead(project, R_BUILDS + buildId); + assertReviewedByFooter(buildHead, true); + resetEvents(); + } + + protected void QtApproveBuild(String branch, String buildId) throws Exception { + String commandStr; + commandStr = "gerrit-plugin-qt-workflow staging-approve"; + commandStr += " --project " + project.get(); + commandStr += " --branch " + branch; + commandStr += " --build-id " + buildId; + commandStr += " --result pass"; + commandStr += " --message " + BUILD_PASS_MESSAGE; + String resultStr = adminSshSession.exec(commandStr); + assertThat(adminSshSession.getError()).isNull(); + RevCommit branchHead = getRemoteHead(project, R_HEADS + branch); + assertReviewedByFooter(branchHead, true); + assertThat(resultStr).isEqualTo(branchHead.name()); + } + + protected void QtFailBuild(String branch, String buildId) throws Exception { + String commandStr; + commandStr = "gerrit-plugin-qt-workflow staging-approve"; + commandStr += " --project " + project.get(); + commandStr += " --branch " + branch; + commandStr += " --build-id " + buildId; + commandStr += " --result fail"; + commandStr += " --message " + BUILD_FAIL_MESSAGE; + String resultStr = adminSshSession.exec(commandStr); + assertThat(adminSshSession.getError()).isNull(); + } + + protected PushOneCommit.Result pushCommit( + String branch, String message, String file, String content) throws Exception { + String pushRef = R_PUSH + branch; + PushOneCommit.Result c = createUserChange(pushRef, message, file, content); + assertStatusNew(c.getChange().change()); + return c; + } + + protected PushOneCommit.Result amendCommit(String changeId) throws Exception { + String branch = "master"; + String pushRef = R_PUSH + branch; + PushOneCommit push = + pushFactory.create( + user.newIdent(), + testRepo, + PushOneCommit.SUBJECT, + PushOneCommit.FILE_NAME, + CONTENT_DATA, + changeId); + return push.to(pushRef); + } + + protected PushOneCommit.Result createUserChange( + String ref, String message, String file, String content) throws Exception { + PushOneCommit push = pushFactory.create(user.newIdent(), testRepo, message, file, content); + PushOneCommit.Result result = push.to(ref); + result.assertOkStatus(); + return result; + } + + protected void assertCherryPick(RevCommit head, RevCommit source, RevCommit base) throws Exception { + // Fetch all commit data + Repository repo = repoManager.openRepository(project); + RevWalk revWalk = new RevWalk(repo); + source = revWalk.parseCommit(source); + head = revWalk.parseCommit(head); + + assertThat(head).isNotEqualTo(source); + assertThat(head.getName()).isNotEqualTo(source.getName()); + assertThat(head.getShortMessage()).isEqualTo(source.getShortMessage()); + assertThat(head.getFooterLines("Change-Id")).isEqualTo(source.getFooterLines("Change-Id")); + assertThat(head.getParentCount()).isEqualTo(1); + + if (base != null) assertThat(head.getParent(0)).isEqualTo(base); + } + + private void assertStatus(Change change, ChangeStatus status, boolean approved, boolean footer) + throws Exception { + ChangeInfo cf; + + if (approved) { + cf = + gApi.changes() + .id(change.getChangeId()) + .get(DETAILED_LABELS, CURRENT_REVISION, CURRENT_COMMIT); + Integer vote = getLabelValue(cf, "Code-Review", admin); + assertWithMessage("label = Code-Review").that(vote).isEqualTo(2); + } else { + cf = gApi.changes().id(change.getChangeId()).get(CURRENT_REVISION, CURRENT_COMMIT); } -// Helper functions + assertThat(cf.status).isEqualTo(status); + String commitMsg = cf.revisions.get(cf.currentRevision).commit.message; - protected void QtDefer(PushOneCommit.Result c) throws Exception { - RestResponse response = call_REST_API_Defer(c.getChangeId()); - response.assertOK(); - Change change = c.getChange().change(); - assertThat(change.getStatus()).isEqualTo(Change.Status.DEFERRED); + if (footer && cf.revisions.get(cf.currentRevision).commit.parents.size() == 1) { + assertThat(commitMsg).contains("Reviewed-by"); + } else { + assertThat(commitMsg).doesNotContain("Reviewed-by"); } + } - protected RestResponse call_REST_API_Defer(String changeId) throws Exception { - String url = "/changes/"+changeId+"/gerrit-plugin-qt-workflow~defer"; - RestResponse response = userRestSession.post(url); - return response; - } - - protected void QtStage(PushOneCommit.Result c) throws Exception { - RestResponse response = call_REST_API_Stage(c.getChangeId(), c.getCommit().getName()); - response.assertOK(); - Change change = c.getChange().change(); - assertStatusStaged(change); - String branch = getBranchNameFromRef(change.getDest().get()); - RevCommit stagingHead = getRemoteHead(project, R_STAGING + branch); - assertReviewedByFooter(stagingHead, true); - resetEvents(); - } + protected void assertStatusNew(Change change) throws Exception { + assertStatus(change, ChangeStatus.NEW, false, false); + } - protected RestResponse call_REST_API_Stage(String changeId, String revisionId) throws Exception { - String url = "/changes/" + changeId + "/revisions/" + revisionId + "/gerrit-plugin-qt-workflow~stage"; - RestResponse response = userRestSession.post(url); - return response; - } + protected void assertStatusStaged(Change change) throws Exception { + assertStatus(change, ChangeStatus.STAGED, true, false); + } - protected void QtUnStage(PushOneCommit.Result c) throws Exception { - RestResponse response = call_REST_API_UnStage(c.getChangeId(), getCurrentPatchId(c)); - response.assertOK(); - assertStatusNew(c.getChange().change()); - } + protected void assertStatusIntegrating(Change change) throws Exception { + assertStatus(change, ChangeStatus.INTEGRATING, true, false); + } - protected RestResponse call_REST_API_UnStage(String changeId, String revisionId) throws Exception { - String url = "/changes/" + changeId + "/revisions/" + revisionId + "/gerrit-plugin-qt-workflow~unstage"; - RestResponse response = userRestSession.post(url); - return response; - } + protected void assertStatusMerged(Change change) throws Exception { + assertStatus(change, ChangeStatus.MERGED, true, true); + } - protected void QtNewBuild(String branch, String buildId) throws Exception { - String commandStr; - commandStr ="gerrit-plugin-qt-workflow staging-new-build"; - commandStr += " --project " + project.get(); - commandStr += " --staging-branch " + branch; - commandStr += " --build-id " + buildId; - String resultStr = adminSshSession.exec(commandStr); - assertThat(adminSshSession.getError()).isNull(); - RevCommit buildHead = getRemoteHead(project, R_BUILDS + buildId); - assertReviewedByFooter(buildHead, true); - resetEvents(); - } + private Integer getLabelValue(ChangeInfo c, String label, TestAccount user) { + Integer vote = 0; + LabelInfo labels = c.labels.get(label); - protected void QtApproveBuild(String branch, String buildId) throws Exception { - String commandStr; - commandStr ="gerrit-plugin-qt-workflow staging-approve"; - commandStr += " --project " + project.get(); - commandStr += " --branch " + branch; - commandStr += " --build-id "+ buildId; - commandStr += " --result pass"; - commandStr += " --message " + BUILD_PASS_MESSAGE; - String resultStr = adminSshSession.exec(commandStr); - assertThat(adminSshSession.getError()).isNull(); - RevCommit branchHead = getRemoteHead(project, R_HEADS + branch); - assertReviewedByFooter(branchHead, true); - } - - protected void QtFailBuild(String branch, String buildId) throws Exception { - String commandStr; - commandStr ="gerrit-plugin-qt-workflow staging-approve"; - commandStr += " --project " + project.get(); - commandStr += " --branch " + branch; - commandStr += " --build-id "+ buildId; - commandStr += " --result fail"; - commandStr += " --message " + BUILD_FAIL_MESSAGE; - String resultStr = adminSshSession.exec(commandStr); - assertThat(adminSshSession.getError()).isNull(); - } - - protected PushOneCommit.Result pushCommit(String branch, - String message, - String file, - String content) - throws Exception { - String pushRef = R_PUSH + branch; - PushOneCommit.Result c = createUserChange(pushRef, message, file, content); - assertStatusNew(c.getChange().change()); - return c; - } - - protected PushOneCommit.Result amendCommit(String changeId) throws Exception { - String branch = "master"; - String pushRef = R_PUSH + branch; - PushOneCommit push = pushFactory.create(db, - user.getIdent(), - testRepo, - PushOneCommit.SUBJECT, - PushOneCommit.FILE_NAME, - CONTENT_DATA, - changeId); - return push.to(pushRef); - } - - protected PushOneCommit.Result createUserChange(String ref, String message, String file, String content) throws Exception { - PushOneCommit push = pushFactory.create(db, user.getIdent(), testRepo, message, file, content); - PushOneCommit.Result result = push.to(ref); - result.assertOkStatus(); - return result; - } - - protected void assertCherryPick(RevCommit head, RevCommit source, RevCommit base) { - assertThat(head).isNotEqualTo(source); - assertThat(head.getName()).isNotEqualTo(source.getName()); - assertThat(head.getShortMessage()).isEqualTo(source.getShortMessage()); - assertThat(head.getFooterLines("Change-Id")).isEqualTo(source.getFooterLines("Change-Id")); - assertThat(head.getParentCount()).isEqualTo(1); - - if (base != null) assertThat(head.getParent(0)).isEqualTo(base); - } - - private void assertStatus(Change change, ChangeStatus status, boolean approved, boolean footer) - throws Exception { - ChangeInfo cf; - - if (approved) { - cf = gApi.changes().id(change.getChangeId()).get(DETAILED_LABELS, CURRENT_REVISION, CURRENT_COMMIT); - Integer vote = getLabelValue(cf, "Code-Review", admin); - assertThat(vote).named("label = Code-Review").isEqualTo(2); - } else { - cf = gApi.changes().id(change.getChangeId()).get(CURRENT_REVISION, CURRENT_COMMIT); - } - - assertThat(cf.status).isEqualTo(status); - String commitMsg = cf.revisions.get(cf.currentRevision).commit.message; - - if (footer && cf.revisions.get(cf.currentRevision).commit.parents.size() == 1) { - assertThat(commitMsg).contains("Reviewed-by"); - } else { - assertThat(commitMsg).doesNotContain("Reviewed-by"); + if (labels != null && labels.all != null) { + for (ApprovalInfo approval : labels.all) { + if (approval._accountId == user.id().get()) { + vote = approval.value; + break; } + } } + return vote; + } - protected void assertStatusNew(Change change) throws Exception { - assertStatus(change, ChangeStatus.NEW, false, false); - } + protected void assertApproval(String changeId, TestAccount user) throws Exception { + ChangeInfo c = + gApi.changes().id(changeId).get(DETAILED_LABELS, CURRENT_REVISION, CURRENT_COMMIT); - protected void assertStatusStaged(Change change) throws Exception { - assertStatus(change, ChangeStatus.STAGED, true, false); - } + String label = "Code-Review"; + int expectedVote = 2; + Integer vote = 0; - protected void assertStatusIntegrating(Change change) throws Exception { - assertStatus(change, ChangeStatus.INTEGRATING, true, false); - } + vote = getLabelValue(c, label, user); + assertWithMessage("label = " + label).that(vote).isEqualTo(expectedVote); + } - protected void assertStatusMerged(Change change) throws Exception { - assertStatus(change, ChangeStatus.MERGED, true, true); - } + protected void assertReviewedByFooter(RevCommit commit, boolean exists) { - private Integer getLabelValue(ChangeInfo c, String label, TestAccount user) { - Integer vote = 0; - LabelInfo labels = c.labels.get(label); - - if (labels != null && labels.all != null) { - for (ApprovalInfo approval : labels.all) { - if (approval._accountId == user.id.get()) { - vote = approval.value; - break; - } - } - } - return vote; - } + // Skip initial commit and merge commits + if (commit.getParentCount() != 1 || commit.equals(lastGeneratedCommit)) return; - protected void assertApproval(String changeId, TestAccount user) throws Exception { - ChangeInfo c = gApi.changes().id(changeId).get(DETAILED_LABELS, CURRENT_REVISION, CURRENT_COMMIT); + List changeIds = commit.getFooterLines(FooterConstants.REVIEWED_BY); + assertThat(!changeIds.isEmpty()).isEqualTo(exists); + } - String label = "Code-Review"; - int expectedVote = 2; - Integer vote = 0; + protected void assertRefUpdatedEvents(String refName, RevCommit... expected) throws Exception { + eventRecorder.assertRefUpdatedEvents(project.get(), refName, expected); + } - vote = getLabelValue(c, label, user); - assertThat(vote).named("label = " + label).isEqualTo(expectedVote); - } + protected void resetEvents() { + closeEventRecorder(); + startEventRecorder(); + } - protected void assertReviewedByFooter(RevCommit commit, boolean exists) { - - // Skip initial commit and merge commits - if (commit.getParentCount() != 1) return; - - List changeIds = commit.getFooterLines(FooterConstants.REVIEWED_BY); - assertThat(!changeIds.isEmpty()).isEqualTo(exists); + protected String getBranchNameFromRef(String refStr) { + if (refStr.startsWith(R_HEADS)) { + return refStr.substring(R_HEADS.length()); + } else { + return refStr; } + } - protected void assertRefUpdatedEvents(String refName, RevCommit ... expected) throws Exception { - eventRecorder.assertRefUpdatedEvents(project.get(), refName, expected); + private RevCommit getRefHead(Repository repo, String name) throws Exception { + try (RevWalk rw = new RevWalk(repo)) { + Ref r = repo.exactRef(name); + return r != null ? rw.parseCommit(r.getObjectId()) : null; } + } - protected void resetEvents() { - closeEventRecorder(); - startEventRecorder(); + protected RevCommit getRemoteRefHead(Project.NameKey project, String branch) throws Exception { + try (Repository repo = repoManager.openRepository(project)) { + return getRefHead( + repo, branch.startsWith(Constants.R_REFS) ? branch : "refs/heads/" + branch); } + } - protected String getBranchNameFromRef(String refStr) { - if (refStr.startsWith(R_HEADS)) { - return refStr.substring(R_HEADS.length()); - } else { - return refStr; - } - } - - protected List getRemoteLog(String ref) throws Exception { - try (Repository repo = repoManager.openRepository(project); - RevWalk rw = new RevWalk(repo)) { - rw.markStart(rw.parseCommit(repo.exactRef(ref).getObjectId())); - return Lists.newArrayList(rw); - } - } + protected String getCurrentPatchSHA(PushOneCommit.Result c) throws Exception { + return c.getChange().currentPatchSet().commitId().name(); + } - protected String getCurrentPatchId(PushOneCommit.Result c) throws Exception { - return String.valueOf(c.getChange().currentPatchSet().getPatchSetId()); + protected List getRemoteLog(String ref) throws Exception { + try (Repository repo = repoManager.openRepository(project); + RevWalk rw = new RevWalk(repo)) { + rw.markStart(rw.parseCommit(repo.exactRef(ref).getObjectId())); + return Lists.newArrayList(rw); } + } + + protected String getCurrentPatchId(PushOneCommit.Result c) throws Exception { + return String.valueOf(c.getChange().currentPatchSet().number()); + } + + // Restored from commit edb599b65eb412ed5f4c59372fa06135b0d8864c which inlined the methods. + protected RevCommit getRemoteHead(Project.NameKey project, String branch) throws Exception { + return projectOperations.project(project).getHead(branch); + } + + protected RevCommit getRemoteHead() throws Exception { + return getRemoteHead(project, "master"); + } + + protected RevCommit loadCommit(RevCommit commit) throws Exception { + Repository repo = repoManager.openRepository(project); + RevWalk revWalk = new RevWalk(repo); + return revWalk.parseCommit(commit); + } } diff --git a/src/test/java/com/googlesource/gerrit/plugins/qtcodereview/QtCommandAdminChangeStatusIT.java b/src/test/java/com/googlesource/gerrit/plugins/qtcodereview/QtCommandAdminChangeStatusIT.java index 4a29127..05a7cec 100644 --- a/src/test/java/com/googlesource/gerrit/plugins/qtcodereview/QtCommandAdminChangeStatusIT.java +++ b/src/test/java/com/googlesource/gerrit/plugins/qtcodereview/QtCommandAdminChangeStatusIT.java @@ -7,145 +7,126 @@ import com.google.gerrit.acceptance.PushOneCommit; import com.google.gerrit.acceptance.TestPlugin; import com.google.gerrit.acceptance.UseSsh; -import com.google.gerrit.reviewdb.client.Change; -import com.google.gerrit.reviewdb.client.ChangeMessage; - +import com.google.gerrit.entities.Change; import org.junit.Test; @TestPlugin( name = "gerrit-plugin-qt-workflow", sysModule = "com.googlesource.gerrit.plugins.qtcodereview.QtModule", - sshModule = "com.googlesource.gerrit.plugins.qtcodereview.QtSshModule" -) - + sshModule = "com.googlesource.gerrit.plugins.qtcodereview.QtSshModule") @UseSsh public class QtCommandAdminChangeStatusIT extends QtCodeReviewIT { - @Test - public void New_Staged_Integrating_Merged_Abandoned_Deferred_New() throws Exception { - PushOneCommit.Result c = pushCommit("master", "commitmsg1", "file1", "content1"); - - String changeId = Integer.toString(c.getChange().getId().get()); - qtAdminChangeStatus(c, changeId, "new", "staged", Change.Status.STAGED); - qtAdminChangeStatus(c, changeId, "staged", "integrating", Change.Status.INTEGRATING); - qtAdminChangeStatus(c, changeId, "integrating", "merged", Change.Status.MERGED); - qtAdminChangeStatus(c, changeId, "merged", "abandoned", Change.Status.ABANDONED); - qtAdminChangeStatus(c, changeId, "abandoned", "deferred", Change.Status.DEFERRED); - qtAdminChangeStatus(c, changeId, "deferred", "new", Change.Status.NEW); - } - - @Test - public void error_ChangeNotFound() throws Exception { - PushOneCommit.Result c = pushCommit("master", "commitmsg1", "file1", "content1"); - String result; - result = qtAdminChangeStatusExpectFail(c, "9999", "new", "staged", Change.Status.NEW); - assertThat(result).contains("change not found"); - } - - @Test - public void error_InvalidChangeId() throws Exception { - PushOneCommit.Result c = pushCommit("master", "commitmsg1", "file1", "content1"); - String result; - result = qtAdminChangeStatusExpectFail(c, "invalid", "new", "staged", Change.Status.NEW); - assertThat(result).contains("change-id not numeric"); - } - - @Test - public void error_Invalid_From_Status() throws Exception { - PushOneCommit.Result c = pushCommit("master", "commitmsg1", "file1", "content1"); - - String result; - String changeId = Integer.toString(c.getChange().getId().get()); - result = qtAdminChangeStatusExpectFail(c, changeId, "invalid", "staged", Change.Status.NEW); - assertThat(result).contains("invalid from status"); - } - - @Test - public void error_Invalid_To_Status() throws Exception { - PushOneCommit.Result c = pushCommit("master", "commitmsg1", "file1", "content1"); - - String result; - String changeId = Integer.toString(c.getChange().getId().get()); - result = qtAdminChangeStatusExpectFail(c, changeId, "new", "staaaaged", Change.Status.NEW); - assertThat(result).contains("invalid to status"); - } - - @Test - public void error_Wrong_From_Status() throws Exception { - PushOneCommit.Result c = pushCommit("master", "commitmsg1", "file1", "content1"); - - String result; - String changeId = Integer.toString(c.getChange().getId().get()); - result = qtAdminChangeStatusExpectFail(c, changeId, "merged", "staged", Change.Status.NEW); - assertThat(result).contains("change status was not"); - } - @Test - public void error_NoPermission() throws Exception { - PushOneCommit.Result c = pushCommit("master", "commitmsg1", "file1", "content1"); - String changeId = Integer.toString(c.getChange().getId().get()); - - String commandStr; - commandStr ="gerrit-plugin-qt-workflow change-status"; - commandStr += " --project " + project.get(); - commandStr += " --change-id " + changeId; - commandStr += " --from new"; - commandStr += " --to merged"; - String resultStr = userSshSession.exec(commandStr); - assertThat(userSshSession.getError()).contains("not permitted"); - - Change change = c.getChange().change(); - assertThat(change.getStatus()).isEqualTo(Change.Status.NEW); - } - - private void qtAdminChangeStatus(PushOneCommit.Result c, - String changeId, - String from, - String to, - Change.Status expectedStatus) - throws Exception { - String result = qtAdminChangeStatusCommon(c, - changeId, - from, - to, - expectedStatus, - false); - assertThat(result).isNull(); - } - - private String qtAdminChangeStatusExpectFail(PushOneCommit.Result c, - String changeId, - String from, - String to, - Change.Status expectedStatus) - throws Exception { - return qtAdminChangeStatusCommon(c, - changeId, - from, - to, - expectedStatus, - true); - } - - - private String qtAdminChangeStatusCommon(PushOneCommit.Result c, - String changeId, - String from, - String to, - Change.Status expectedStatus, - Boolean expectFail) - throws Exception { - String commandStr; - commandStr ="gerrit-plugin-qt-workflow change-status"; - commandStr += " --project " + project.get(); - commandStr += " --change-id " + changeId; - commandStr += " --from " + from; - commandStr += " --to " + to; - String resultStr = adminSshSession.exec(commandStr); - if (expectFail) assertThat(adminSshSession.getError()).isNotNull(); - else assertThat(adminSshSession.getError()).isNull(); - - Change change = c.getChange().change(); - assertThat(change.getStatus()).isEqualTo(expectedStatus); - return adminSshSession.getError(); - } + @Test + public void New_Staged_Integrating_Merged_Abandoned_Deferred_New() throws Exception { + PushOneCommit.Result c = pushCommit("master", "commitmsg1", "file1", "content1"); + + String changeId = Integer.toString(c.getChange().getId().get()); + qtAdminChangeStatus(c, changeId, "new", "staged", Change.Status.STAGED); + qtAdminChangeStatus(c, changeId, "staged", "integrating", Change.Status.INTEGRATING); + qtAdminChangeStatus(c, changeId, "integrating", "merged", Change.Status.MERGED); + qtAdminChangeStatus(c, changeId, "merged", "abandoned", Change.Status.ABANDONED); + qtAdminChangeStatus(c, changeId, "abandoned", "deferred", Change.Status.DEFERRED); + qtAdminChangeStatus(c, changeId, "deferred", "new", Change.Status.NEW); + } + + @Test + public void error_ChangeNotFound() throws Exception { + PushOneCommit.Result c = pushCommit("master", "commitmsg1", "file1", "content1"); + String result; + result = qtAdminChangeStatusExpectFail(c, "9999", "new", "staged", Change.Status.NEW); + assertThat(result).contains("change not found"); + } + + @Test + public void error_InvalidChangeId() throws Exception { + PushOneCommit.Result c = pushCommit("master", "commitmsg1", "file1", "content1"); + String result; + result = qtAdminChangeStatusExpectFail(c, "invalid", "new", "staged", Change.Status.NEW); + assertThat(result).contains("change-id not numeric"); + } + + @Test + public void error_Invalid_From_Status() throws Exception { + PushOneCommit.Result c = pushCommit("master", "commitmsg1", "file1", "content1"); + + String result; + String changeId = Integer.toString(c.getChange().getId().get()); + result = qtAdminChangeStatusExpectFail(c, changeId, "invalid", "staged", Change.Status.NEW); + assertThat(result).contains("invalid from status"); + } + + @Test + public void error_Invalid_To_Status() throws Exception { + PushOneCommit.Result c = pushCommit("master", "commitmsg1", "file1", "content1"); + + String result; + String changeId = Integer.toString(c.getChange().getId().get()); + result = qtAdminChangeStatusExpectFail(c, changeId, "new", "staaaaged", Change.Status.NEW); + assertThat(result).contains("invalid to status"); + } + + @Test + public void error_Wrong_From_Status() throws Exception { + PushOneCommit.Result c = pushCommit("master", "commitmsg1", "file1", "content1"); + + String result; + String changeId = Integer.toString(c.getChange().getId().get()); + result = qtAdminChangeStatusExpectFail(c, changeId, "merged", "staged", Change.Status.NEW); + assertThat(result).contains("change status was not"); + } + + @Test + public void error_NoPermission() throws Exception { + PushOneCommit.Result c = pushCommit("master", "commitmsg1", "file1", "content1"); + String changeId = Integer.toString(c.getChange().getId().get()); + + String commandStr; + commandStr = "gerrit-plugin-qt-workflow change-status"; + commandStr += " --project " + project.get(); + commandStr += " --change-id " + changeId; + commandStr += " --from new"; + commandStr += " --to merged"; + String resultStr = userSshSession.exec(commandStr); + assertThat(userSshSession.getError()).contains("not permitted"); + + Change change = c.getChange().change(); + assertThat(change.getStatus()).isEqualTo(Change.Status.NEW); + } + + private void qtAdminChangeStatus( + PushOneCommit.Result c, String changeId, String from, String to, Change.Status expectedStatus) + throws Exception { + String result = qtAdminChangeStatusCommon(c, changeId, from, to, expectedStatus, false); + assertThat(result).isNull(); + } + + private String qtAdminChangeStatusExpectFail( + PushOneCommit.Result c, String changeId, String from, String to, Change.Status expectedStatus) + throws Exception { + return qtAdminChangeStatusCommon(c, changeId, from, to, expectedStatus, true); + } + + private String qtAdminChangeStatusCommon( + PushOneCommit.Result c, + String changeId, + String from, + String to, + Change.Status expectedStatus, + Boolean expectFail) + throws Exception { + String commandStr; + commandStr = "gerrit-plugin-qt-workflow change-status"; + commandStr += " --project " + project.get(); + commandStr += " --change-id " + changeId; + commandStr += " --from " + from; + commandStr += " --to " + to; + String resultStr = adminSshSession.exec(commandStr); + if (expectFail) assertThat(adminSshSession.getError()).isNotNull(); + else assertThat(adminSshSession.getError()).isNull(); + + Change change = c.getChange().change(); + assertThat(change.getStatus()).isEqualTo(expectedStatus); + return adminSshSession.getError(); + } } diff --git a/src/test/java/com/googlesource/gerrit/plugins/qtcodereview/QtCommandBuildApproveIT.java b/src/test/java/com/googlesource/gerrit/plugins/qtcodereview/QtCommandBuildApproveIT.java index fd0fa23..15c87ba 100644 --- a/src/test/java/com/googlesource/gerrit/plugins/qtcodereview/QtCommandBuildApproveIT.java +++ b/src/test/java/com/googlesource/gerrit/plugins/qtcodereview/QtCommandBuildApproveIT.java @@ -1,378 +1,611 @@ -// Copyright (C) 2019 The Qt Company +// Copyright (C) 2021-22 The Qt Company package com.googlesource.gerrit.plugins.qtcodereview; -import static com.google.gerrit.server.group.SystemGroupBackend.REGISTERED_USERS; - import static com.google.common.truth.Truth.assertThat; +import static com.google.gerrit.extensions.client.ListChangesOption.CURRENT_REVISION; +import static com.google.gerrit.server.group.SystemGroupBackend.REGISTERED_USERS; +import com.google.common.collect.ImmutableList; import com.google.gerrit.acceptance.PushOneCommit; import com.google.gerrit.acceptance.TestPlugin; import com.google.gerrit.acceptance.UseSsh; - -import com.google.gerrit.common.data.Permission; -import com.google.gerrit.reviewdb.client.Change; -import com.google.gerrit.reviewdb.client.ChangeMessage; - -import org.eclipse.jgit.revwalk.RevCommit; - +import com.google.gerrit.acceptance.testsuite.project.TestProjectUpdate; +import com.google.gerrit.entities.Permission; +import com.google.gerrit.extensions.api.changes.Changes; +import com.google.gerrit.extensions.client.ChangeStatus; +import com.google.gerrit.extensions.common.ChangeInfo; +import com.google.gerrit.entities.BranchNameKey; +import com.google.gerrit.entities.Change; +import com.google.gerrit.entities.ChangeMessage; import java.util.ArrayList; -import java.io.StringBufferInputStream; - +import org.eclipse.jgit.revwalk.RevCommit; import org.junit.Before; import org.junit.Test; @TestPlugin( name = "gerrit-plugin-qt-workflow", sysModule = "com.googlesource.gerrit.plugins.qtcodereview.QtModule", - sshModule = "com.googlesource.gerrit.plugins.qtcodereview.QtSshModule" -) - + sshModule = "com.googlesource.gerrit.plugins.qtcodereview.QtSshModule") @UseSsh public class QtCommandBuildApproveIT extends QtCodeReviewIT { - private final String MERGED_MSG = "thebuildwasapproved"; - private final String FAILED_MSG = "thebuildfailed"; - - @Before - public void SetDefaultPermissions() throws Exception { - grant(project, "refs/heads/master", Permission.QT_STAGE, false, REGISTERED_USERS); - grant(project, "refs/staging/*", Permission.PUSH, false, adminGroupUuid()); - grant(project, "refs/builds/*", Permission.CREATE, false, adminGroupUuid()); - } - - @Test - public void singleChange_New_Staged_Integrating_Merged() throws Exception { - PushOneCommit.Result c = pushCommit("master", "commitmsg1", "file1", "content1"); - approve(c.getChangeId()); - QtStage(c); - QtNewBuild("master", "test-build-100"); - - RevCommit updatedHead = qtApproveBuild("master", "test-build-100", c, null); - } - - @Test - public void multiChange_New_Staged_Integrating_Merged() throws Exception { - // Push 3 independent commits - RevCommit initialHead = getRemoteHead(); - PushOneCommit.Result c1 = pushCommit("master", "commitmsg1", "file1", "content1"); - testRepo.reset(initialHead); - PushOneCommit.Result c2 = pushCommit("master", "commitmsg2", "file2", "content2"); - testRepo.reset(initialHead); - PushOneCommit.Result c3 = pushCommit("master", "commitmsg3", "file3", "content3"); - - approve(c1.getChangeId()); - approve(c2.getChangeId()); - approve(c3.getChangeId()); - QtStage(c1); - QtStage(c2); - QtStage(c3); - - QtNewBuild("master", "test-build-101"); - - RevCommit updatedHead = qtApproveBuild("master", "test-build-101", c3, null); - assertStatusMerged(c1.getChange().change()); - assertStatusMerged(c2.getChange().change()); - } - - @Test - public void singleChange_New_Staged_Integrating_Fail() throws Exception { - RevCommit initialHead = getRemoteHead(); - PushOneCommit.Result c = pushCommit("master", "commitmsg1", "file1", "content1"); - approve(c.getChangeId()); - QtStage(c); - QtNewBuild("master", "test-build-200"); - - RevCommit updatedHead = qtFailBuild("master", "test-build-200", c, initialHead); - } - - @Test - public void multiChange_New_Staged_Integrating_Failed() throws Exception { - // Push 3 independent commits - RevCommit initialHead = getRemoteHead(); - PushOneCommit.Result c1 = pushCommit("master", "commitmsg1", "file1", "content1"); - testRepo.reset(initialHead); - PushOneCommit.Result c2 = pushCommit("master", "commitmsg2", "file2", "content2"); - testRepo.reset(initialHead); - PushOneCommit.Result c3 = pushCommit("master", "commitmsg3", "file3", "content3"); - - approve(c1.getChangeId()); - approve(c2.getChangeId()); - approve(c3.getChangeId()); - QtStage(c1); - QtStage(c2); - QtStage(c3); - - QtNewBuild("master", "test-build-201"); - - RevCommit updatedHead = qtFailBuild("master", "test-build-201", c3, initialHead); - assertStatusNew(c1.getChange().change()); - assertStatusNew(c2.getChange().change()); - } - - @Test - public void errorApproveBuild_NoPermission() throws Exception { - PushOneCommit.Result c = pushCommit("master", "commitmsg1", "file1", "content1"); - approve(c.getChangeId()); - QtStage(c); - QtNewBuild("master", "test-build-600"); - - String commandStr; - commandStr ="gerrit-plugin-qt-workflow staging-approve"; - commandStr += " --project " + project.get(); - commandStr += " --branch master"; - commandStr += " --build-id test-build-600"; - commandStr += " --result pass"; - commandStr += " --message " + MERGED_MSG; - String resultStr = userSshSession.exec(commandStr); - assertThat(userSshSession.getError()).contains("not authorized"); - } - - @Test - public void errorApproveBuild_RepoNotFound() throws Exception { - PushOneCommit.Result c = pushCommit("master", "commitmsg1", "file1", "content1"); - approve(c.getChangeId()); - QtStage(c); - QtNewBuild("master", "test-build-600"); - - String commandStr; - commandStr ="gerrit-plugin-qt-workflow staging-approve"; - commandStr += " --project notarepo" ; - commandStr += " --branch master"; - commandStr += " --build-id test-build-600"; - commandStr += " --result pass"; - commandStr += " --message " + MERGED_MSG; - String resultStr = adminSshSession.exec(commandStr); - assertThat(adminSshSession.getError()).contains("project not found"); - } - - @Test - public void errorApproveBuild_WrongParameter() throws Exception { - PushOneCommit.Result c = pushCommit("master", "commitmsg1", "file1", "content1"); - approve(c.getChangeId()); - QtStage(c); - QtNewBuild("master", "test-build-601"); - - String resultStr = qtApproveBuildExpectFail("maybe", "master", "test-build-601"); - assertThat(resultStr).contains("result argument accepts only value pass or fail"); - } - - @Test - public void errorApproveBuild_NoChanges() throws Exception { - PushOneCommit.Result c = pushCommit("master", "commitmsg1", "file1", "content1"); - approve(c.getChangeId()); - QtStage(c); - QtNewBuild("master", "test-build-602"); - RevCommit updatedHead = qtApproveBuild("master", "test-build-602", c, null); - - String resultStr = qtApproveBuildExpectFail("pass", "master", "test-build-602"); - assertThat(resultStr).contains("No open changes in the build branch"); - } - - @Test - public void errorApproveBuild_NonExistingBranch() throws Exception { - PushOneCommit.Result c = pushCommit("master", "commitmsg1", "file1", "content1"); - approve(c.getChangeId()); - QtStage(c); - QtNewBuild("master", "test-build-603"); - - String resultStr = qtApproveBuildExpectFail("pass", "invalidbranch", "test-build-603"); - assertThat(resultStr).contains("branch not found"); - } - - @Test - public void errorApproveBuild_NonExistingBuild() throws Exception { - PushOneCommit.Result c = pushCommit("master", "commitmsg1", "file1", "content1"); - approve(c.getChangeId()); - QtStage(c); - QtNewBuild("master", "test-build-604"); - - String resultStr = qtApproveBuildExpectFail("pass", "master", "doesnotexist"); - assertThat(resultStr).contains("build not found"); - } - - @Test - public void errorApproveBuild_FastForwardFail() throws Exception { - RevCommit initialHead = getRemoteHead(); - PushOneCommit.Result c = pushCommit("master", "commitmsg1", "file1", "content1"); - approve(c.getChangeId()); - QtStage(c); - QtNewBuild("master", "test-build-605"); - - // direct push that causes fast forward failure - testRepo.reset(initialHead); - PushOneCommit.Result d = pushCommit("master", "commitmsg2", "file2", "content2"); - approve(d.getChangeId()); - gApi.changes().id(d.getChangeId()).current().submit(); - RevCommit branchHead = getRemoteHead(); - - - String stagingRef = R_STAGING + "master"; - String branchRef = R_HEADS + "master"; - String commandStr; - commandStr ="gerrit-plugin-qt-workflow staging-approve"; - commandStr += " --project " + project.get(); - commandStr += " --branch master"; - commandStr += " --build-id test-build-605"; - commandStr += " --result pass"; - commandStr += " --message " + MERGED_MSG; - adminSshSession.exec(commandStr); - assertThat(adminSshSession.getError()).isNull(); - - RevCommit updatedHead = getRemoteHead(project, branchRef); - assertThat(updatedHead).isEqualTo(branchHead); // master is not updated - RevCommit stagingHead = getRemoteHead(project, stagingRef); - assertThat(stagingHead).isEqualTo(branchHead); // staging is updated to branch head - - assertStatusNew(c.getChange().change()); - Change change = d.getChange().change(); - assertThat(change.getStatus()).isEqualTo(Change.Status.MERGED); - } - - @Test - public void approveBuild_MultiLineMessage() throws Exception { - PushOneCommit.Result c = pushCommit("master", "commitmsg1", "file1", "content1"); - approve(c.getChangeId()); - QtStage(c); - QtNewBuild("master", "test-build-605"); - - String commandStr; - commandStr ="gerrit-plugin-qt-workflow staging-approve"; - commandStr += " --project " + project.get(); - commandStr += " --branch master"; - commandStr += " --build-id test-build-605"; - commandStr += " --result pass"; - commandStr += " --message -"; - String multiMessage = "the build\nwas\n\"approved\"\n"; - StringBufferInputStream input = new StringBufferInputStream(multiMessage); - - String resultStr = adminSshSession.exec(commandStr, input); - assertThat(resultStr).isEqualTo(""); - assertThat(adminSshSession.getError()).isNull(); - - ArrayList messages = new ArrayList(c.getChange().messages()); - assertThat(messages.get(messages.size()-1).getMessage()).isEqualTo(multiMessage); // check last message - } - - private RevCommit qtApproveBuild(String branch, - String buildId, - PushOneCommit.Result expectedContent, - RevCommit expectedHead) - throws Exception { - String stagingRef = R_STAGING + branch; - String branchRef = R_HEADS + branch; - String buildRef = R_BUILDS + buildId; - - RevCommit stagingHeadOld = getRemoteHead(project, stagingRef); - RevCommit initialHead = getRemoteHead(project, branchRef); - String commandStr; - - commandStr ="gerrit-plugin-qt-workflow staging-approve"; - commandStr += " --project " + project.get(); - commandStr += " --branch " + branch; - commandStr += " --build-id " + buildId; - commandStr += " --result pass"; - commandStr += " --message " + MERGED_MSG; - String resultStr = adminSshSession.exec(commandStr); - assertThat(adminSshSession.getError()).isNull(); - - RevCommit buildHead = getRemoteHead(project, buildRef); - assertThat(buildHead.getId()).isNotNull(); // build ref is still there - assertReviewedByFooter(buildHead, true); - - RevCommit updatedHead = getRemoteHead(project, branchRef); - if (expectedContent != null && expectedHead == null) { - RevCommit commit = expectedContent.getCommit(); - assertCherryPick(updatedHead, commit, null); - expectedHead = updatedHead; - } else { - assertThat(updatedHead).isEqualTo(expectedHead); // master is updated - } - - RevCommit stagingHead = getRemoteHead(project, stagingRef); - assertThat(stagingHead).isEqualTo(stagingHeadOld); // staging remains the same - - assertRefUpdatedEvents(branchRef, initialHead, expectedHead); - resetEvents(); - - assertStatusMerged(expectedContent.getChange().change()); - - ArrayList messages = new ArrayList(expectedContent.getChange().messages()); - assertThat(messages.get(messages.size()-1).getMessage()).isEqualTo(MERGED_MSG); // check last message - - return updatedHead; - } - - private RevCommit qtFailBuild(String branch, - String buildId, - PushOneCommit.Result c, - RevCommit expectedStagingHead) - throws Exception { - String stagingRef = R_STAGING + branch; - String branchRef = R_HEADS + branch; - String buildRef = R_BUILDS + buildId; - RevCommit stagingHeadOld = getRemoteHead(project, stagingRef); - RevCommit initialHead = getRemoteHead(project, branchRef); - String commandStr; - - commandStr ="gerrit-plugin-qt-workflow staging-approve"; - commandStr += " --project " + project.get(); - commandStr += " --branch " + branch; - commandStr += " --build-id " + buildId; - commandStr += " --result fail"; - commandStr += " --message " + FAILED_MSG; - String resultStr = adminSshSession.exec(commandStr); - assertThat(adminSshSession.getError()).isNull(); - - RevCommit updatedHead = getRemoteHead(project, branchRef); - assertThat(updatedHead.getId()).isEqualTo(initialHead.getId()); // master is not updated - - RevCommit stagingHead = getRemoteHead(project, stagingRef); - - if (c != null && expectedStagingHead == null) { - assertCherryPick(stagingHead, c.getCommit(), null); - expectedStagingHead = stagingHead; - } - assertThat(stagingHead).isEqualTo(expectedStagingHead); // staging is rebuild - - RevCommit buildHead = getRemoteHead(project, buildRef); - assertThat(buildHead.getId()).isNotNull(); // build ref is still there - - assertRefUpdatedEvents(stagingRef, stagingHeadOld, stagingHead); // staging is rebuild - - assertStatusNew(c.getChange().change()); - - ArrayList messages = new ArrayList(c.getChange().messages()); - assertThat(messages.get(messages.size()-1).getMessage()).isEqualTo(FAILED_MSG); // check last message - - return updatedHead; - } - - private String qtApproveBuildExpectFail(String cmd, - String branch, - String buildId) - throws Exception { - String stagingRef = R_STAGING + branch; - String branchRef = R_HEADS + branch; - RevCommit initialHead = getRemoteHead(project, branchRef); - RevCommit stagingHeadOld = getRemoteHead(project, stagingRef); - String commandStr; - - commandStr ="gerrit-plugin-qt-workflow staging-approve"; - commandStr += " --project " + project.get(); - commandStr += " --branch " + branch; - commandStr += " --build-id " + buildId; - commandStr += " --result " + cmd; - commandStr += " --message " + MERGED_MSG; - String resultStr = adminSshSession.exec(commandStr); - - RevCommit updatedHead = getRemoteHead(project, branchRef); - if (updatedHead != null) assertThat(updatedHead).isEqualTo(initialHead); // master is not updated - - RevCommit stagingHead = getRemoteHead(project, stagingRef); - if (stagingHead != null) assertThat(stagingHead).isEqualTo(stagingHeadOld); // staging is not updated - - return adminSshSession.getError(); + private final String MERGED_MSG = "thebuildwasapproved"; + private final String FAILED_MSG = "thebuildfailed"; + + @Before + public void SetDefaultPermissions() throws Exception { + createBranch(BranchNameKey.create(project, "feature")); + + projectOperations.project(project).forUpdate().add(TestProjectUpdate.allow(Permission.QT_STAGE).ref("refs/heads/master").group(REGISTERED_USERS)).update(); + projectOperations.project(project).forUpdate().add(TestProjectUpdate.allow(Permission.QT_STAGE).ref("refs/heads/feature").group(REGISTERED_USERS)).update(); + projectOperations.project(project).forUpdate().add(TestProjectUpdate.allow(Permission.PUSH).ref("refs/staging/*").group(adminGroupUuid())).update(); + projectOperations.project(project).forUpdate().add(TestProjectUpdate.allow(Permission.CREATE).ref("refs/builds/*").group(adminGroupUuid())).update(); + } + + @Test + public void singleChange_New_Staged_Integrating_Merged() throws Exception { + PushOneCommit.Result c = pushCommit("master", "commitmsg1", "file1", "content1"); + approve(c.getChangeId()); + QtStage(c); + QtNewBuild("master", "test-build-100"); + + RevCommit updatedHead = qtApproveBuild("master", "test-build-100", c, false); + } + + @Test + public void multiChange_New_Staged_Integrating_Merged() throws Exception { + // Push 3 independent commits + RevCommit initialHead = getRemoteHead(); + PushOneCommit.Result c1 = pushCommit("master", "commitmsg1", "file1", "content1"); + testRepo.reset(initialHead); + PushOneCommit.Result c2 = pushCommit("master", "commitmsg2", "file2", "content2"); + testRepo.reset(initialHead); + PushOneCommit.Result c3 = pushCommit("master", "commitmsg3", "file3", "content3"); + + approve(c1.getChangeId()); + approve(c2.getChangeId()); + approve(c3.getChangeId()); + QtStage(c1); + QtStage(c2); + QtStage(c3); + + QtNewBuild("master", "test-build-101"); + + RevCommit updatedHead = qtApproveBuild("master", "test-build-101", c3, false); + assertStatusMerged(c1.getChange().change()); + assertStatusMerged(c2.getChange().change()); + } + + @Test + public void singleChange_New_Staged_Integrating_Fail() throws Exception { + RevCommit initialHead = getRemoteHead(); + PushOneCommit.Result c = pushCommit("master", "commitmsg1", "file1", "content1"); + approve(c.getChangeId()); + QtStage(c); + QtNewBuild("master", "test-build-200"); + + RevCommit updatedHead = qtFailBuild("master", "test-build-200", c); + } + + @Test + public void RebuildStagingRefAfterPassingBuild() throws Exception { + RevCommit initialHead = getRemoteHead(); + PushOneCommit.Result c1 = pushCommit("master", "commitmsg1", "file1", "content1"); + approve(c1.getChangeId()); + QtStage(c1); + QtNewBuild("master", "test-build-parallel-1"); + + testRepo.reset(initialHead); + PushOneCommit.Result c2 = pushCommit("master", "commitmsg2", "file2", "content2"); + approve(c2.getChangeId()); + QtStage(c2); + + testRepo.reset(initialHead); + PushOneCommit.Result c3 = pushCommit("master", "commitmsg3", "file3", "content3"); + approve(c3.getChangeId()); + QtStage(c3); + + RevCommit updatedHead = qtApproveBuild("master", "test-build-parallel-1", c1, false); + assertStatusStaged(c2.getChange().change()); + assertStatusStaged(c3.getChange().change()); + + // verify that staged changes are in the rebuilt staging ref + RevCommit stagingHead = getRemoteRefHead(project, R_STAGING + "master"); + assertCherryPick(stagingHead, c3.getCommit(), null); + assertCherryPick(stagingHead.getParent(0), c2.getCommit(), updatedHead); + } + + @Test + public void RebuildStagingRefFailsAfterPassingBuild() throws Exception { + RevCommit initialHead = getRemoteHead(); + PushOneCommit.Result c = pushCommit("master", "commitmsg1", "thesamefile", "content1"); + approve(c.getChangeId()); + QtStage(c); + QtNewBuild("master", "test-build-201"); + + testRepo.reset(initialHead); + PushOneCommit.Result d1 = pushCommit("master", "commitmsg2", "file2", "content2"); + approve(d1.getChangeId()); + QtStage(d1); + + testRepo.reset(initialHead); + PushOneCommit.Result d2 = pushCommit("master", "commitmsg3", "thesamefile", "content3"); + approve(d2.getChangeId()); + QtStage(d2); + + testRepo.reset(initialHead); + PushOneCommit.Result d3 = pushCommit("master", "commitmsg4", "file4", "content4"); + approve(d3.getChangeId()); + QtStage(d3); + + RevCommit updatedHead = qtApproveBuild("master", "test-build-201", c, false); + + RevCommit stagingHead = getRemoteRefHead(project, R_STAGING + "master"); + assertThat(stagingHead).isEqualTo(updatedHead); // staging is not updated + assertStatusMerged(c.getChange().change()); + assertStatusNew(d1.getChange().change()); + assertStatusNew(d2.getChange().change()); + assertStatusNew(d3.getChange().change()); + } + + @Test + public void parallelBuilds_CherryPicksVerify() throws Exception { + // created 3 parallel builds + RevCommit initialHead = getRemoteHead(); + PushOneCommit.Result c1 = pushCommit("master", "commitmsg1", "file1", "content1"); + approve(c1.getChangeId()); + QtStage(c1); + QtNewBuild("master", "test-build-parallel-1"); + + testRepo.reset(initialHead); + PushOneCommit.Result c2 = pushCommit("master", "commitmsg2", "file2", "content2"); + approve(c2.getChangeId()); + QtStage(c2); + QtNewBuild("master", "test-build-parallel-2"); + + testRepo.reset(initialHead); + PushOneCommit.Result c3 = pushCommit("master", "commitmsg3", "file3", "content3"); + approve(c3.getChangeId()); + PushOneCommit.Result c4 = pushCommit("master", "commitmsg4", "file4", "content4"); + approve(c4.getChangeId()); + PushOneCommit.Result c5 = pushCommit("master", "commitmsg5", "file5", "content5"); + approve(c5.getChangeId()); + QtStage(c3); + QtStage(c4); + QtStage(c5); + QtNewBuild("master", "test-build-parallel-3"); + + RevCommit updatedHead = qtApproveBuild("master", "test-build-parallel-1", c1, false); + assertThat(updatedHead.getFullMessage()).doesNotContain("Merge"); + assertThat(updatedHead.getShortMessage()).isEqualTo("commitmsg1"); + + updatedHead = qtApproveBuild("master", "test-build-parallel-2", c2, false); + assertThat(updatedHead.getFullMessage()).doesNotContain("Merge"); + assertThat(updatedHead.getShortMessage()).isEqualTo("commitmsg2"); + + updatedHead = qtApproveBuild("master", "test-build-parallel-3", c5, false); + assertThat(updatedHead.getFullMessage()).doesNotContain("Merge"); + assertThat(updatedHead.getShortMessage()).isEqualTo("commitmsg5"); + assertCherryPick(updatedHead.getParent(0), c4.getCommit(), null); + assertCherryPick(loadCommit(updatedHead.getParent(0)).getParent(0), c3.getCommit(), null); + + assertStatusMerged(c1.getChange().change()); + assertStatusMerged(c2.getChange().change()); + assertStatusMerged(c3.getChange().change()); + assertStatusMerged(c4.getChange().change()); + assertStatusMerged(c5.getChange().change()); + } + + @Test + public void parallelBuilds_MergeCommitIntegrationVerify() throws Exception { + + // make a change on feature branch + final PushOneCommit.Result f1 = pushCommit("feature", "f1-commitmsg", "f1-file", "f1-content"); + approve(f1.getChangeId()); + gApi.changes().id(f1.getCommit().getName()).current().submit(); + + // make a change on master branch + final PushOneCommit.Result m1 = pushCommit("master", "m1-commitmsg", "m1-file", "m1-content"); + approve(m1.getChangeId()); + gApi.changes().id(m1.getCommit().getName()).current().submit(); + + // Start a build + RevCommit initialHead = getRemoteHead(); + PushOneCommit.Result c1 = pushCommit("master", "commitmsg1", "file1", "content1"); + approve(c1.getChangeId()); + QtStage(c1); + QtNewBuild("master", "test-build-parallel"); + + // Start parallel build with a merge commit + final PushOneCommit mm = pushFactory.create(admin.newIdent(), testRepo); + mm.setParents(ImmutableList.of(f1.getCommit(), m1.getCommit())); + final PushOneCommit.Result m = mm.to("refs/for/master"); + m.assertOkStatus(); + approve(m.getChangeId()); + QtStage(m); + QtNewBuild("master", "test-build-parallel-with-merge"); + + RevCommit updatedHead = qtApproveBuild("master", "test-build-parallel", c1, false); + + updatedHead = qtApproveBuild("master", "test-build-parallel-with-merge", m, true); + assertThat(updatedHead.getFullMessage()).contains("Merge integration test-build-parallel-with-merge"); + } + + @Test + public void cherryPicked_Stays_Intact_After_Merge_And_Build() throws Exception { + // make a change on feature branch + final PushOneCommit.Result f1 = pushCommit("feature", "f1-commitmsg", "f1-file", "f1-content"); + approve(f1.getChangeId()); + gApi.changes().id(f1.getCommit().getName()).current().submit(); + + // cherry pick it to the master branch (now there are two changes with same change-id) + final ChangeInfo cp = cherryPick(f1, "master"); + + // make another change on feature branch + final PushOneCommit.Result f2 = pushCommit("feature", "f2-commitmsg", "f2-file", "f2-content"); + approve(f2.getChangeId()); + QtStage(f2); + QtNewBuild("feature", "feature-build-000"); + QtApproveBuild("feature", "feature-build-000"); + + // make a change on master branch + final PushOneCommit.Result m1 = pushCommit("master", "m1-commitmsg", "m1-file", "m1-content"); + approve(m1.getChangeId()); + QtStage(m1); + QtNewBuild("master", "master-build-000"); + QtApproveBuild("master", "master-build-000"); + + // merge feature branch into master + final PushOneCommit mm = pushFactory.create(admin.newIdent(), testRepo); + mm.setParents(ImmutableList.of(f2.getCommit(), m1.getCommit())); + final PushOneCommit.Result m = mm.to("refs/for/master"); + m.assertOkStatus(); + approve(m.getChangeId()); + QtStage(m); + QtNewBuild("master", "merge-build-000"); + QtApproveBuild("master", "merge-build-000"); + + final Changes changes = gApi.changes(); + assertThat(changes.id(project.get(), "feature", f1.getChangeId()).get(CURRENT_REVISION).status).isEqualTo(ChangeStatus.MERGED); + assertThat(changes.id(project.get(), "feature", f2.getChangeId()).get(CURRENT_REVISION).status).isEqualTo(ChangeStatus.MERGED); + assertThat(changes.id(project.get(), "master", m1.getChangeId()).get(CURRENT_REVISION).status).isEqualTo(ChangeStatus.MERGED); + assertThat(changes.id(project.get(), "master", m.getChangeId()).get(CURRENT_REVISION).status).isEqualTo(ChangeStatus.MERGED); + assertThat(changes.id(project.get(), "master", cp.changeId).get(CURRENT_REVISION).status).isEqualTo(ChangeStatus.NEW); + } + + @Test + public void avoid_Double_Handling_Of_Change_On_Merge_Of_Merge() throws Exception { + // make a change on feature branch + final PushOneCommit.Result f1 = pushCommit("feature", "f1-commitmsg", "f1-file", "f1-content"); + approve(f1.getChangeId()); + gApi.changes().id(f1.getCommit().getName()).current().submit(); + + // make a change on master branch + final PushOneCommit.Result m1 = pushCommit("master", "m1-commitmsg", "m1-file", "m1-content"); + approve(m1.getChangeId()); + + // make another change on master branch + final PushOneCommit.Result m2 = pushCommit("master", "m2-commitmsg", "m2-file", "m2-content"); + approve(m2.getChangeId()); + QtStage(m2); + QtNewBuild("master", "merge-build-001"); + QtApproveBuild("master", "merge-build-001"); + + // merge feature branch into master + final PushOneCommit mm = pushFactory.create(admin.newIdent(), testRepo); + mm.setParents(ImmutableList.of(f1.getCommit(), m2.getCommit())); + final PushOneCommit.Result m = mm.to("refs/for/master"); + m.assertOkStatus(); + approve(m.getChangeId()); + + // Stage master branch change + QtStage(m1); + // Stage merge change + QtStage(m); + + // Create build and approve it + QtNewBuild("master", "merge-build-002"); + QtApproveBuild("master", "merge-build-002"); + + final Changes changes = gApi.changes(); + assertThat(changes.id(project.get(), "feature", f1.getChangeId()).get(CURRENT_REVISION).status).isEqualTo(ChangeStatus.MERGED); + assertThat(changes.id(project.get(), "master", m1.getChangeId()).get(CURRENT_REVISION).status).isEqualTo(ChangeStatus.MERGED); + assertThat(changes.id(project.get(), "master", m2.getChangeId()).get(CURRENT_REVISION).status).isEqualTo(ChangeStatus.MERGED); + assertThat(changes.id(project.get(), "master", m.getChangeId()).get(CURRENT_REVISION).status).isEqualTo(ChangeStatus.MERGED); + } + + @Test + public void multiChange_New_Staged_Integrating_Failed() throws Exception { + // Push 3 independent commits + RevCommit initialHead = getRemoteHead(); + PushOneCommit.Result c1 = pushCommit("master", "commitmsg1", "file1", "content1"); + testRepo.reset(initialHead); + PushOneCommit.Result c2 = pushCommit("master", "commitmsg2", "file2", "content2"); + testRepo.reset(initialHead); + PushOneCommit.Result c3 = pushCommit("master", "commitmsg3", "file3", "content3"); + + approve(c1.getChangeId()); + approve(c2.getChangeId()); + approve(c3.getChangeId()); + QtStage(c1); + QtStage(c2); + QtStage(c3); + + QtNewBuild("master", "test-build-201"); + + RevCommit updatedHead = qtFailBuild("master", "test-build-201", c3); + assertStatusNew(c1.getChange().change()); + assertStatusNew(c2.getChange().change()); + } + + @Test + public void errorApproveBuild_NoPermission() throws Exception { + PushOneCommit.Result c = pushCommit("master", "commitmsg1", "file1", "content1"); + approve(c.getChangeId()); + QtStage(c); + QtNewBuild("master", "test-build-600"); + + String commandStr; + commandStr = "gerrit-plugin-qt-workflow staging-approve"; + commandStr += " --project " + project.get(); + commandStr += " --branch master"; + commandStr += " --build-id test-build-600"; + commandStr += " --result pass"; + commandStr += " --message " + MERGED_MSG; + String resultStr = userSshSession.exec(commandStr); + assertThat(userSshSession.getError()).contains("not authorized"); + } + + @Test + public void errorApproveBuild_RepoNotFound() throws Exception { + PushOneCommit.Result c = pushCommit("master", "commitmsg1", "file1", "content1"); + approve(c.getChangeId()); + QtStage(c); + QtNewBuild("master", "test-build-600"); + + String commandStr; + commandStr = "gerrit-plugin-qt-workflow staging-approve"; + commandStr += " --project notarepo"; + commandStr += " --branch master"; + commandStr += " --build-id test-build-600"; + commandStr += " --result pass"; + commandStr += " --message " + MERGED_MSG; + String resultStr = adminSshSession.exec(commandStr); + assertThat(adminSshSession.getError()).contains("project not found"); + } + + @Test + public void errorApproveBuild_WrongParameter() throws Exception { + PushOneCommit.Result c = pushCommit("master", "commitmsg1", "file1", "content1"); + approve(c.getChangeId()); + QtStage(c); + QtNewBuild("master", "test-build-601"); + + String resultStr = qtApproveBuildExpectFail("maybe", "master", "test-build-601"); + assertThat(resultStr).contains("result argument accepts only value pass or fail"); + } + + @Test + public void errorApproveBuild_NoChanges() throws Exception { + PushOneCommit.Result c = pushCommit("master", "commitmsg1", "file1", "content1"); + approve(c.getChangeId()); + QtStage(c); + QtNewBuild("master", "test-build-602"); + RevCommit updatedHead = qtApproveBuild("master", "test-build-602", c, false); + + String resultStr = qtApproveBuildExpectFail("pass", "master", "test-build-602"); + assertThat(resultStr).contains("No open changes in the build branch"); + } + + @Test + public void errorApproveBuild_NonExistingBranch() throws Exception { + PushOneCommit.Result c = pushCommit("master", "commitmsg1", "file1", "content1"); + approve(c.getChangeId()); + QtStage(c); + QtNewBuild("master", "test-build-603"); + + String resultStr = qtApproveBuildExpectFail("pass", "invalidbranch", "test-build-603"); + assertThat(resultStr).contains("branch not found"); + } + + @Test + public void errorApproveBuild_NonExistingBuild() throws Exception { + PushOneCommit.Result c = pushCommit("master", "commitmsg1", "file1", "content1"); + approve(c.getChangeId()); + QtStage(c); + QtNewBuild("master", "test-build-604"); + + String resultStr = qtApproveBuildExpectFail("pass", "master", "doesnotexist"); + assertThat(resultStr).contains("build not found"); + } + + @Test + public void errorApproveBuild_MergeFailInParallelBuilds() throws Exception { + RevCommit initialHead = getRemoteHead(); + PushOneCommit.Result c = pushCommit("master", "commitmsg1", "file1", "content1"); + approve(c.getChangeId()); + QtStage(c); + QtNewBuild("master", "test-build-605"); + + // parallel change causing a merge conflict + testRepo.reset(initialHead); + PushOneCommit.Result d = pushCommit("master", "commitmsg2", "file1", "content2"); + approve(d.getChangeId()); + QtStage(d); + QtNewBuild("master", "test-build-606"); + QtApproveBuild("master", "test-build-606"); + RevCommit branchHead = getRemoteHead(); + + String stagingRef = R_STAGING + "master"; + String commandStr; + commandStr = "gerrit-plugin-qt-workflow staging-approve"; + commandStr += " --project " + project.get(); + commandStr += " --branch master"; + commandStr += " --build-id test-build-605"; + commandStr += " --result pass"; + commandStr += " --message " + MERGED_MSG; + adminSshSession.exec(commandStr); + assertThat(adminSshSession.getError()).isNull(); + + RevCommit updatedHead = getRemoteHead(); + assertThat(updatedHead).isEqualTo(branchHead); // master is not updated + RevCommit stagingHead = getRemoteRefHead(project, stagingRef); + assertThat(stagingHead).isEqualTo(branchHead); // staging is not updated + + assertStatusNew(c.getChange().change()); + assertStatusMerged(d.getChange().change()); + } + +/* + This test is not testing the multi line message properly. + Need to be tested manually from command line. For example: + ssh -p 29418 admin@localhost gerrit-plugin-qt-workflow staging-approve --branch master--build-id build1 --project test --result fail \'--message=" + > this + > is + > multiline"\' + + @Test + public void approveBuild_MultiLineMessage() throws Exception { + PushOneCommit.Result c = pushCommit("master", "commitmsg1", "file1", "content1"); + approve(c.getChangeId()); + QtStage(c); + QtNewBuild("master", "test-build-607"); + + String multiLineMessage = "\'the build\nwas\n\"approved\"\n\'"; + + String commandStr; + commandStr = "gerrit-plugin-qt-workflow staging-approve"; + commandStr += " --project " + project.get(); + commandStr += " --branch master"; + commandStr += " --build-id test-build-607"; + commandStr += " --result pass"; + commandStr += " --message -" + multiLineMessage; + + String resultStr = adminSshSession.exec(commandStr); + assertThat(resultStr).isEqualTo(""); + assertThat(adminSshSession.getError()).isNull(); + + ArrayList messages = new ArrayList(c.getChange().messages()); + assertThat(messages.get(messages.size() - 1).getMessage()) + .isEqualTo(multiLineMessage); // check last message + } +*/ + + private RevCommit qtApproveBuild( + String branch, String buildId, PushOneCommit.Result expectedContent, boolean expectMerge) + throws Exception { + String stagingRef = R_STAGING + branch; + String branchRef = R_HEADS + branch; + String buildRef = R_BUILDS + buildId; + + RevCommit stagingHeadOld = getRemoteRefHead(project, stagingRef); + RevCommit initialHead = getRemoteHead(project, branchRef); + String commandStr; + + commandStr = "gerrit-plugin-qt-workflow staging-approve"; + commandStr += " --project " + project.get(); + commandStr += " --branch " + branch; + commandStr += " --build-id " + buildId; + commandStr += " --result pass"; + commandStr += " --message " + MERGED_MSG; + String resultStr = adminSshSession.exec(commandStr); + assertThat(adminSshSession.getError()).isNull(); + + RevCommit buildHead = getRemoteHead(project, buildRef); + assertThat(buildHead.getId()).isNotNull(); // build ref is still there + assertReviewedByFooter(buildHead, true); + + RevCommit updatedHead = getRemoteHead(project, branchRef); + assertThat(resultStr).isEqualTo(updatedHead.name()); + + if (expectMerge) { + assertThat(updatedHead.getParentCount()).isEqualTo(2); + assertThat(updatedHead.getName()).isNotEqualTo(expectedContent.getCommit().getName()); + assertThat(updatedHead.getShortMessage()).contains("Merge"); + assertThat(updatedHead.getAuthorIdent().getEmailAddress()).isEqualTo(admin.email()); + assertThat(updatedHead.getCommitterIdent().getEmailAddress()).isEqualTo(admin.email()); + } else { + assertCherryPick(updatedHead, expectedContent.getCommit(), null); + assertThat(updatedHead.getAuthorIdent().getEmailAddress()).isEqualTo(user.email()); + assertThat(updatedHead.getCommitterIdent().getEmailAddress()).isEqualTo(user.email()); } + RevCommit stagingHead = getRemoteRefHead(project, stagingRef); + assertThat(stagingHead).isNotEqualTo(stagingHeadOld); // staging is rebuilt + + assertRefUpdatedEvents(branchRef, initialHead, updatedHead); + resetEvents(); + + assertStatusMerged(expectedContent.getChange().change()); + + ArrayList messages = new ArrayList(expectedContent.getChange().messages()); + assertThat(messages.get(messages.size() - 1).getMessage()) + .isEqualTo(MERGED_MSG); // check last message + + return updatedHead; + } + + private RevCommit qtFailBuild(String branch, String buildId, PushOneCommit.Result c) + throws Exception { + String stagingRef = R_STAGING + branch; + String branchRef = R_HEADS + branch; + String buildRef = R_BUILDS + buildId; + RevCommit stagingHeadOld = getRemoteRefHead(project, stagingRef); + RevCommit initialHead = getRemoteHead(project, branchRef); + String commandStr; + + commandStr = "gerrit-plugin-qt-workflow staging-approve"; + commandStr += " --project " + project.get(); + commandStr += " --branch " + branch; + commandStr += " --build-id " + buildId; + commandStr += " --result fail"; + commandStr += " --message " + FAILED_MSG; + String resultStr = adminSshSession.exec(commandStr); + assertThat(adminSshSession.getError()).isNull(); + + RevCommit updatedHead = getRemoteHead(project, branchRef); + assertThat(updatedHead.getId()).isEqualTo(initialHead.getId()); // master is not updated + + RevCommit stagingHead = getRemoteRefHead(project, stagingRef); + assertThat(stagingHead).isEqualTo(stagingHeadOld); // staging ref remains the same + + RevCommit buildHead = getRemoteHead(project, buildRef); + assertThat(buildHead.getId()).isNotNull(); // build ref is still there + + assertStatusNew(c.getChange().change()); + + ArrayList messages = new ArrayList(c.getChange().messages()); + assertThat(messages.get(messages.size() - 1).getMessage()) + .isEqualTo(FAILED_MSG); // check last message + + return updatedHead; + } + + private String qtApproveBuildExpectFail(String cmd, String branch, String buildId) + throws Exception { + String stagingRef = R_STAGING + branch; + String branchRef = R_HEADS + branch; + RevCommit initialHead = getRemoteRefHead(project, branchRef); + RevCommit stagingHeadOld = getRemoteRefHead(project, stagingRef); + String commandStr; + + commandStr = "gerrit-plugin-qt-workflow staging-approve"; + commandStr += " --project " + project.get(); + commandStr += " --branch " + branch; + commandStr += " --build-id " + buildId; + commandStr += " --result " + cmd; + commandStr += " --message " + MERGED_MSG; + String resultStr = adminSshSession.exec(commandStr); + + RevCommit updatedHead = getRemoteRefHead(project, branchRef); + if (updatedHead != null) + assertThat(updatedHead).isEqualTo(initialHead); // master is not updated + + RevCommit stagingHead = getRemoteRefHead(project, stagingRef); + if (stagingHead != null) + assertThat(stagingHead).isEqualTo(stagingHeadOld); // staging is not updated + + return adminSshSession.getError(); + } } diff --git a/src/test/java/com/googlesource/gerrit/plugins/qtcodereview/QtCommandListStagingIT.java b/src/test/java/com/googlesource/gerrit/plugins/qtcodereview/QtCommandListStagingIT.java index 5af6fc6..98b5255 100644 --- a/src/test/java/com/googlesource/gerrit/plugins/qtcodereview/QtCommandListStagingIT.java +++ b/src/test/java/com/googlesource/gerrit/plugins/qtcodereview/QtCommandListStagingIT.java @@ -1,128 +1,116 @@ -// Copyright (C) 2019 The Qt Company +// Copyright (C) 2019-21 The Qt Company package com.googlesource.gerrit.plugins.qtcodereview; -import static com.google.gerrit.server.group.SystemGroupBackend.REGISTERED_USERS; - import static com.google.common.truth.Truth.assertThat; +import static com.google.gerrit.server.group.SystemGroupBackend.REGISTERED_USERS; import com.google.gerrit.acceptance.PushOneCommit; import com.google.gerrit.acceptance.TestPlugin; import com.google.gerrit.acceptance.UseSsh; - -import com.google.gerrit.common.data.Permission; - +import com.google.gerrit.acceptance.testsuite.project.TestProjectUpdate; +import com.google.gerrit.entities.Permission; import org.eclipse.jgit.revwalk.RevCommit; - import org.junit.Before; import org.junit.Test; @TestPlugin( name = "gerrit-plugin-qt-workflow", sysModule = "com.googlesource.gerrit.plugins.qtcodereview.QtModule", - sshModule = "com.googlesource.gerrit.plugins.qtcodereview.QtSshModule" -) - + sshModule = "com.googlesource.gerrit.plugins.qtcodereview.QtSshModule") @UseSsh public class QtCommandListStagingIT extends QtCodeReviewIT { - @Before - public void SetDefaultPermissions() throws Exception { - grant(project, "refs/heads/master", Permission.QT_STAGE, false, REGISTERED_USERS); - grant(project, "refs/staging/*", Permission.PUSH, false, adminGroupUuid()); - grant(project, "refs/builds/*", Permission.CREATE, false, adminGroupUuid()); - } - - @Test - public void multiChange_ListStaging() throws Exception { - // Push 3 independent commits - RevCommit initialHead = getRemoteHead(); - PushOneCommit.Result c1 = pushCommit("master", "commitmsg1", "file1", "content1"); - testRepo.reset(initialHead); - PushOneCommit.Result c2 = pushCommit("master", "commitmsg2", "file2", "content2"); - testRepo.reset(initialHead); - PushOneCommit.Result c3 = pushCommit("master", "commitmsg3", "file3", "content3"); - - approve(c1.getChangeId()); - QtStage(c1); - RevCommit stagingHead1 = getRemoteHead(project, R_STAGING + "master"); - - approve(c2.getChangeId()); - QtStage(c2); - RevCommit stagingHead2 = getRemoteHead(project, R_STAGING + "master"); - - approve(c3.getChangeId()); - QtStage(c3); - RevCommit stagingHead3 = getRemoteHead(project, R_STAGING + "master"); - - String result = qtListStaging("refs/staging/master", "master"); - assertThat(result).contains(stagingHead1.getId().name()); - assertThat(result).contains(stagingHead2.getId().name()); - assertThat(result).contains(stagingHead3.getId().name()); - - QtNewBuild("master", "test-build-251"); - result = qtListStaging("refs/staging/master", "refs/heads/master"); - assertThat(result).contains(stagingHead1.getId().name()); - assertThat(result).contains(stagingHead2.getId().name()); - assertThat(result).contains(stagingHead3.getId().name()); - - result = qtListStaging("refs/builds/test-build-251", "master"); - assertThat(result).contains(stagingHead1.getId().name()); - assertThat(result).contains(stagingHead2.getId().name()); - assertThat(result).contains(stagingHead3.getId().name()); - } - - @Test - public void errorListStaging_RepoNotFound() throws Exception { - PushOneCommit.Result c = pushCommit("master", "commitmsg1", "file1", "content1"); - approve(c.getChangeId()); - QtStage(c); - - String commandStr; - commandStr ="gerrit-plugin-qt-workflow staging-ls"; - commandStr += " --project notarepo" ; - commandStr += " --branch refs/staging/master"; - commandStr += " --destination master"; - String resultStr = adminSshSession.exec(commandStr); - assertThat(adminSshSession.getError()).contains("project not found"); - } - - @Test - public void errorListStaging_InvalidBranch() throws Exception { - PushOneCommit.Result c = pushCommit("master", "commitmsg1", "file1", "content1"); - approve(c.getChangeId()); - QtStage(c); - - String resultStr = qtListStagingExpectFail("refs/staging/invalidref", "master"); - assertThat(resultStr).contains("branch ref not found"); - } - - private String qtListStaging(String ref, - String destination) - throws Exception { - String commandStr; - commandStr ="gerrit-plugin-qt-workflow staging-ls"; - commandStr += " --project " + project.get(); - commandStr += " --branch " + ref; - commandStr += " --destination " + destination; - String resultStr = adminSshSession.exec(commandStr); - assertThat(adminSshSession.getError()).isNull(); - - return resultStr; - } - - private String qtListStagingExpectFail(String ref, - String destination) - throws Exception { - String commandStr; - commandStr ="gerrit-plugin-qt-workflow staging-ls"; - commandStr += " --project " + project.get(); - commandStr += " --branch " + ref; - commandStr += " --destination " + destination; - String resultStr = adminSshSession.exec(commandStr); - assertThat(adminSshSession.getError()).isNotNull(); - - return adminSshSession.getError(); - } - + @Before + public void SetDefaultPermissions() throws Exception { + projectOperations.project(project).forUpdate().add(TestProjectUpdate.allow(Permission.QT_STAGE).ref("refs/heads/master").group(REGISTERED_USERS)).update(); + projectOperations.project(project).forUpdate().add(TestProjectUpdate.allow(Permission.PUSH).ref("refs/staging/*").group(adminGroupUuid())).update(); + projectOperations.project(project).forUpdate().add(TestProjectUpdate.allow(Permission.CREATE).ref("refs/builds/*").group(adminGroupUuid())).update(); + } + + @Test + public void multiChange_ListStaging() throws Exception { + // Push 3 independent commits + RevCommit initialHead = getRemoteHead(); + PushOneCommit.Result c1 = pushCommit("master", "commitmsg1", "file1", "content1"); + testRepo.reset(initialHead); + PushOneCommit.Result c2 = pushCommit("master", "commitmsg2", "file2", "content2"); + testRepo.reset(initialHead); + PushOneCommit.Result c3 = pushCommit("master", "commitmsg3", "file3", "content3"); + + approve(c1.getChangeId()); + QtStage(c1); + RevCommit stagingHead1 = getRemoteHead(project, R_STAGING + "master"); + + approve(c2.getChangeId()); + QtStage(c2); + RevCommit stagingHead2 = getRemoteHead(project, R_STAGING + "master"); + + approve(c3.getChangeId()); + QtStage(c3); + RevCommit stagingHead3 = getRemoteHead(project, R_STAGING + "master"); + + String result = qtListStaging("refs/staging/master", "master"); + assertThat(result).contains(stagingHead1.getId().name()); + assertThat(result).contains(stagingHead2.getId().name()); + assertThat(result).contains(stagingHead3.getId().name()); + + QtNewBuild("master", "test-build-251"); + result = qtListStaging("refs/staging/master", "refs/heads/master"); + assertThat(result).isEmpty(); + + result = qtListStaging("refs/builds/test-build-251", "master"); + assertThat(result).contains(stagingHead1.getId().name()); + assertThat(result).contains(stagingHead2.getId().name()); + assertThat(result).contains(stagingHead3.getId().name()); + } + + @Test + public void errorListStaging_RepoNotFound() throws Exception { + PushOneCommit.Result c = pushCommit("master", "commitmsg1", "file1", "content1"); + approve(c.getChangeId()); + QtStage(c); + + String commandStr; + commandStr = "gerrit-plugin-qt-workflow staging-ls"; + commandStr += " --project notarepo"; + commandStr += " --branch refs/staging/master"; + commandStr += " --destination master"; + String resultStr = adminSshSession.exec(commandStr); + assertThat(adminSshSession.getError()).contains("project not found"); + } + + @Test + public void errorListStaging_InvalidBranch() throws Exception { + PushOneCommit.Result c = pushCommit("master", "commitmsg1", "file1", "content1"); + approve(c.getChangeId()); + QtStage(c); + + String resultStr = qtListStagingExpectFail("refs/staging/invalidref", "master"); + assertThat(resultStr).contains("branch ref not found"); + } + + private String qtListStaging(String ref, String destination) throws Exception { + String commandStr; + commandStr = "gerrit-plugin-qt-workflow staging-ls"; + commandStr += " --project " + project.get(); + commandStr += " --branch " + ref; + commandStr += " --destination " + destination; + String resultStr = adminSshSession.exec(commandStr); + assertThat(adminSshSession.getError()).isNull(); + + return resultStr; + } + + private String qtListStagingExpectFail(String ref, String destination) throws Exception { + String commandStr; + commandStr = "gerrit-plugin-qt-workflow staging-ls"; + commandStr += " --project " + project.get(); + commandStr += " --branch " + ref; + commandStr += " --destination " + destination; + String resultStr = adminSshSession.exec(commandStr); + assertThat(adminSshSession.getError()).isNotNull(); + + return adminSshSession.getError(); + } } diff --git a/src/test/java/com/googlesource/gerrit/plugins/qtcodereview/QtCommandNewBuildIT.java b/src/test/java/com/googlesource/gerrit/plugins/qtcodereview/QtCommandNewBuildIT.java index 841b177..706f0e2 100644 --- a/src/test/java/com/googlesource/gerrit/plugins/qtcodereview/QtCommandNewBuildIT.java +++ b/src/test/java/com/googlesource/gerrit/plugins/qtcodereview/QtCommandNewBuildIT.java @@ -1,228 +1,244 @@ -// Copyright (C) 2019 The Qt Company +// Copyright (C) 2019-21 The Qt Company package com.googlesource.gerrit.plugins.qtcodereview; -import static com.google.gerrit.server.group.SystemGroupBackend.REGISTERED_USERS; - import static com.google.common.truth.Truth.assertThat; +import static com.google.gerrit.server.group.SystemGroupBackend.REGISTERED_USERS; import com.google.gerrit.acceptance.PushOneCommit; -import com.google.gerrit.acceptance.RestResponse; import com.google.gerrit.acceptance.TestPlugin; import com.google.gerrit.acceptance.UseSsh; - -import com.google.gerrit.common.data.Permission; -import com.google.gerrit.reviewdb.client.Change; -import com.google.gerrit.reviewdb.client.ChangeMessage; - -import org.eclipse.jgit.revwalk.RevCommit; - +import com.google.gerrit.acceptance.testsuite.project.TestProjectUpdate; +import com.google.gerrit.entities.Permission; +import com.google.gerrit.entities.ChangeMessage; import java.util.ArrayList; - +import org.eclipse.jgit.revwalk.RevCommit; import org.junit.Before; import org.junit.Test; @TestPlugin( name = "gerrit-plugin-qt-workflow", sysModule = "com.googlesource.gerrit.plugins.qtcodereview.QtModule", - sshModule = "com.googlesource.gerrit.plugins.qtcodereview.QtSshModule" -) - + sshModule = "com.googlesource.gerrit.plugins.qtcodereview.QtSshModule") @UseSsh public class QtCommandNewBuildIT extends QtCodeReviewIT { - private final String BUILDING_MSG = "Added to build "; - - @Before - public void SetDefaultPermissions() throws Exception { - grant(project, "refs/heads/master", Permission.QT_STAGE, false, REGISTERED_USERS); - grant(project, "refs/staging/*", Permission.PUSH, false, adminGroupUuid()); - grant(project, "refs/builds/*", Permission.CREATE, false, adminGroupUuid()); + private final String BUILDING_MSG = "Added to build "; + + @Before + public void SetDefaultPermissions() throws Exception { + projectOperations.project(project).forUpdate().add(TestProjectUpdate.allow(Permission.QT_STAGE).ref("refs/heads/master").group(REGISTERED_USERS)).update(); + projectOperations.project(project).forUpdate().add(TestProjectUpdate.allow(Permission.PUSH).ref("refs/staging/*").group(adminGroupUuid())).update(); + projectOperations.project(project).forUpdate().add(TestProjectUpdate.allow(Permission.CREATE).ref("refs/builds/*").group(adminGroupUuid())).update(); + } + + @Test + public void singleChange_New_Staged_Integrating() throws Exception { + PushOneCommit.Result c = pushCommit("master", "commitmsg1", "file1", "content1"); + approve(c.getChangeId()); + QtStage(c); + + RevCommit buildHead = qtNewBuild("master", "test-build-100", c, null); + } + + @Test + public void multiChange_New_Staged_Integrating() throws Exception { + // Push 3 independent commits + RevCommit initialHead = getRemoteHead(); + PushOneCommit.Result c1 = pushCommit("master", "commitmsg1", "file1", "content1"); + testRepo.reset(initialHead); + PushOneCommit.Result c2 = pushCommit("master", "commitmsg2", "file2", "content2"); + testRepo.reset(initialHead); + PushOneCommit.Result c3 = pushCommit("master", "commitmsg3", "file3", "content3"); + approve(c1.getChangeId()); + approve(c2.getChangeId()); + approve(c3.getChangeId()); + QtStage(c1); + QtStage(c2); + QtStage(c3); + + RevCommit buildHead = qtNewBuild("master", "test-build-101", c3, null); + assertStatusIntegrating(c1.getChange().change()); + assertStatusIntegrating(c2.getChange().change()); + } + + @Test + public void parallelBuilds_New_Staged_Integrating() throws Exception { + // 3 parallel integrations + RevCommit initialHead = getRemoteHead(); + PushOneCommit.Result c1 = pushCommit("master", "commitmsg1", "file1", "content1"); + approve(c1.getChangeId()); + QtStage(c1); + RevCommit buildHead1 = qtNewBuild("master", "test-build-paraller-1", c1, null); + + testRepo.reset(initialHead); + PushOneCommit.Result c2 = pushCommit("master", "commitmsg2", "file2", "content2"); + approve(c2.getChangeId()); + QtStage(c2); + RevCommit buildHead2 = qtNewBuild("master", "test-build-paraller-2", c2, null); + + testRepo.reset(initialHead); + PushOneCommit.Result c3 = pushCommit("master", "commitmsg3", "file3", "content3"); + approve(c3.getChangeId()); + QtStage(c3); + RevCommit buildHead3 = qtNewBuild("master", "test-build-paraller-3", c3, null); + + assertStatusIntegrating(c1.getChange().change()); + assertStatusIntegrating(c2.getChange().change()); + assertStatusIntegrating(c3.getChange().change()); + } + + @Test + public void errorNewBuild_NoPermission() throws Exception { + PushOneCommit.Result c = pushCommit("master", "commitmsg1", "file1", "content1"); + approve(c.getChangeId()); + QtStage(c); + + String commandStr; + commandStr = "gerrit-plugin-qt-workflow staging-new-build"; + commandStr += " --project " + project.get(); + commandStr += " --staging-branch master"; + commandStr += " --build-id test-build-500"; + String resultStr = userSshSession.exec(commandStr); + assertThat(userSshSession.getError()).contains("Authentication failed to access repository"); + } + + @Test + public void errorNewBuild_RepoNotFound() throws Exception { + PushOneCommit.Result c = pushCommit("master", "commitmsg1", "file1", "content1"); + approve(c.getChangeId()); + QtStage(c); + + String commandStr; + commandStr = "gerrit-plugin-qt-workflow staging-new-build"; + commandStr += " --project notarepo"; + commandStr += " --staging-branch master"; + commandStr += " --build-id test-build-500"; + String resultStr = adminSshSession.exec(commandStr); + assertThat(adminSshSession.getError()).contains("project not found"); + } + + @Test + public void errorNewBuild_BuildAlreadyExists() throws Exception { + PushOneCommit.Result c = pushCommit("master", "commitmsg1", "file1", "content1"); + approve(c.getChangeId()); + QtStage(c); + + RevCommit buildHead = qtNewBuild("master", "test-build-501", c, null); + String resultStr = qtNewBuildExpectFail("master", "test-build-501"); + assertThat(resultStr).contains("Target build already exists!"); + } + + @Test + public void errorNewBuild_NoChanges() throws Exception { + RevCommit initialHead = getRemoteHead(); + PushOneCommit.Result c = pushCommit("master", "commitmsg1", "file1", "content1"); + approve(c.getChangeId()); + QtStage(c); + QtUnStage(c); + + String resultStr = qtNewBuildExpectFail("master", "test-build-502"); + assertThat(resultStr).contains("No changes in staging branch. Not creating a build reference"); + } + + @Test + public void errorNewBuild_NoStagingRef() throws Exception { + PushOneCommit.Result c = pushCommit("master", "commitmsg1", "file1", "content1"); + + String resultStr = qtNewBuildExpectFail("master", "test-build-503"); + assertThat(resultStr).contains("Staging ref not found!"); + } + + @Test + public void errorNewBuild_NonExistingBranch() throws Exception { + PushOneCommit.Result c = pushCommit("master", "commitmsg1", "file1", "content1"); + approve(c.getChangeId()); + QtStage(c); + + String resultStr = qtNewBuildExpectFail("invalidbranchname", "test-build-504"); + assertThat(resultStr).contains("Staging ref not found!"); + } + + @Test + public void errorAmend_Status_Integrating() throws Exception { + RevCommit initialHead = getRemoteHead(); + PushOneCommit.Result c1 = pushCommit("master", "commitmsg1", "file1", "content1"); + approve(c1.getChangeId()); + QtStage(c1); + RevCommit buildHead = qtNewBuild("master", "test-build-150", c1, null); + + PushOneCommit.Result c2 = amendCommit(c1.getChangeId()); + c2.assertErrorStatus(" closed"); + + RevCommit updatedHead = getRemoteHead(project, "master"); + assertThat(updatedHead.getId()).isEqualTo(initialHead.getId()); // not updated + } + + private RevCommit qtNewBuild( + String branch, String buildId, PushOneCommit.Result c, RevCommit expectedHead) + throws Exception { + String stagingRef = R_STAGING + branch; + String branchRef = R_HEADS + branch; + String buildRef = R_BUILDS + buildId; + String commandStr; + RevCommit initialHead = getRemoteHead(project, branchRef); + RevCommit stagingHead = getRemoteRefHead(project, stagingRef); + + if (expectedHead == null) { + assertCherryPick(stagingHead, c.getCommit(), null); + expectedHead = stagingHead; } - @Test - public void singleChange_New_Staged_Integrating() throws Exception { - PushOneCommit.Result c = pushCommit("master", "commitmsg1", "file1", "content1"); - approve(c.getChangeId()); - QtStage(c); + commandStr = "gerrit-plugin-qt-workflow staging-new-build"; + commandStr += " --project " + project.get(); + commandStr += " --staging-branch " + branch; + commandStr += " --build-id " + buildId; + String resultStr = adminSshSession.exec(commandStr); + assertThat(adminSshSession.getError()).isNull(); - RevCommit buildHead = qtNewBuild("master", "test-build-100", c, null); - } + RevCommit updatedHead = getRemoteHead(project, branchRef); + assertThat(updatedHead.getId()).isEqualTo(initialHead.getId()); // master is not updated - @Test - public void multiChange_New_Staged_Integrating() throws Exception { - // Push 3 independent commits - RevCommit initialHead = getRemoteHead(); - PushOneCommit.Result c1 = pushCommit("master", "commitmsg1", "file1", "content1"); - testRepo.reset(initialHead); - PushOneCommit.Result c2 = pushCommit("master", "commitmsg2", "file2", "content2"); - testRepo.reset(initialHead); - PushOneCommit.Result c3 = pushCommit("master", "commitmsg3", "file3", "content3"); - approve(c1.getChangeId()); - approve(c2.getChangeId()); - approve(c3.getChangeId()); - QtStage(c1); - QtStage(c2); - QtStage(c3); - - RevCommit buildHead = qtNewBuild("master", "test-build-101", c3, null); - assertStatusIntegrating(c1.getChange().change()); - assertStatusIntegrating(c2.getChange().change()); - } + stagingHead = getRemoteRefHead(project, stagingRef); + assertThat(stagingHead.getId()).isEqualTo(initialHead.getId()); // staging reset back to master + RevCommit buildHead = getRemoteHead(project, buildRef); + assertThat(buildHead).isEqualTo(expectedHead); // build ref is updated + assertRefUpdatedEvents(buildRef, null, expectedHead); + assertReviewedByFooter(buildHead, true); - @Test - public void errorNewBuild_NoPermission() throws Exception { - PushOneCommit.Result c = pushCommit("master", "commitmsg1", "file1", "content1"); - approve(c.getChangeId()); - QtStage(c); + resetEvents(); - String commandStr; - commandStr ="gerrit-plugin-qt-workflow staging-new-build"; - commandStr += " --project " + project.get(); - commandStr += " --staging-branch master"; - commandStr += " --build-id test-build-500"; - String resultStr = userSshSession.exec(commandStr); - assertThat(userSshSession.getError()).contains("Authentication failed to access repository"); - } + assertStatusIntegrating(c.getChange().change()); - @Test - public void errorNewBuild_RepoNotFound() throws Exception { - PushOneCommit.Result c = pushCommit("master", "commitmsg1", "file1", "content1"); - approve(c.getChangeId()); - QtStage(c); - - String commandStr; - commandStr ="gerrit-plugin-qt-workflow staging-new-build"; - commandStr += " --project notarepo"; - commandStr += " --staging-branch master"; - commandStr += " --build-id test-build-500"; - String resultStr = adminSshSession.exec(commandStr); - assertThat(adminSshSession.getError()).contains("project not found"); - } + ArrayList messages = new ArrayList(c.getChange().messages()); + assertThat(messages.get(messages.size() - 1).getMessage()) + .contains(BUILDING_MSG + "'" + buildId + "'"); // check last message - @Test - public void errorNewBuild_BuildAlreadyExists() throws Exception { - PushOneCommit.Result c = pushCommit("master", "commitmsg1", "file1", "content1"); - approve(c.getChangeId()); - QtStage(c); + return buildHead; + } - RevCommit buildHead = qtNewBuild("master", "test-build-501", c, null); - String resultStr = qtNewBuildExpectFail("master", "test-build-501"); - assertThat(resultStr).contains("Target build already exists!"); - } + private String qtNewBuildExpectFail(String branch, String buildId) throws Exception { + String stagingRef = R_STAGING + branch; + String branchRef = R_HEADS + branch; + String commandStr; + RevCommit initialHead = getRemoteRefHead(project, branchRef); + RevCommit stagingHeadOld = getRemoteRefHead(project, stagingRef); - @Test - public void errorNewBuild_NoChanges() throws Exception { - RevCommit initialHead = getRemoteHead(); - PushOneCommit.Result c = pushCommit("master", "commitmsg1", "file1", "content1"); - approve(c.getChangeId()); - QtStage(c); - QtUnStage(c); + commandStr = "gerrit-plugin-qt-workflow staging-new-build"; + commandStr += " --project " + project.get(); + commandStr += " --staging-branch " + branch; + commandStr += " --build-id " + buildId; + String resultStr = adminSshSession.exec(commandStr); - String resultStr = qtNewBuildExpectFail("master", "test-build-502"); - assertThat(resultStr).contains("No changes in staging branch. Not creating a build reference"); - } + RevCommit updatedHead = getRemoteRefHead(project, branchRef); + if (updatedHead != null) + assertThat(updatedHead.getId()).isEqualTo(initialHead.getId()); // master is not updated - @Test - public void errorNewBuild_NoStagingRef() throws Exception { - PushOneCommit.Result c = pushCommit("master", "commitmsg1", "file1", "content1"); - - String resultStr = qtNewBuildExpectFail("master", "test-build-503"); - assertThat(resultStr).contains("Staging ref not found!"); - } - - @Test - public void errorNewBuild_NonExistingBranch() throws Exception { - PushOneCommit.Result c = pushCommit("master", "commitmsg1", "file1", "content1"); - approve(c.getChangeId()); - QtStage(c); - - String resultStr = qtNewBuildExpectFail("invalidbranchname", "test-build-504"); - assertThat(resultStr).contains("Staging ref not found!"); - } - - @Test - public void errorAmend_Status_Integrating() throws Exception { - RevCommit initialHead = getRemoteHead(); - PushOneCommit.Result c1 = pushCommit("master", "commitmsg1", "file1", "content1"); - approve(c1.getChangeId()); - QtStage(c1); - RevCommit buildHead = qtNewBuild("master", "test-build-150", c1, null); - - PushOneCommit.Result c2 = amendCommit(c1.getChangeId()); - c2.assertErrorStatus(" closed"); - - RevCommit updatedHead = getRemoteHead(project, "master"); - assertThat(updatedHead.getId()).isEqualTo(initialHead.getId()); // not updated - } - - private RevCommit qtNewBuild(String branch, - String buildId, - PushOneCommit.Result c, - RevCommit expectedHead) - throws Exception { - String stagingRef = R_STAGING + branch; - String branchRef = R_HEADS + branch; - String buildRef = R_BUILDS + buildId; - String commandStr; - RevCommit initialHead = getRemoteHead(project, branchRef); - - commandStr ="gerrit-plugin-qt-workflow staging-new-build"; - commandStr += " --project " + project.get(); - commandStr += " --staging-branch " + branch; - commandStr += " --build-id " + buildId; - String resultStr = adminSshSession.exec(commandStr); - assertThat(adminSshSession.getError()).isNull(); - - RevCommit updatedHead = getRemoteHead(project, branchRef); - assertThat(updatedHead.getId()).isEqualTo(initialHead.getId()); // master is not updated - - RevCommit stagingHead = getRemoteHead(project, stagingRef); - assertThat(stagingHead.getId()).isNotEqualTo(initialHead.getId()); // staging is not master - - if (expectedHead == null) { - assertCherryPick(stagingHead, c.getCommit(), null); - expectedHead = stagingHead; - } - - RevCommit buildHead = getRemoteHead(project, buildRef); - assertThat(buildHead).isEqualTo(expectedHead); // build ref is updated - assertRefUpdatedEvents(buildRef, null, expectedHead); - assertReviewedByFooter(buildHead, true); - - resetEvents(); - - assertStatusIntegrating(c.getChange().change()); - - ArrayList messages = new ArrayList(c.getChange().messages()); - assertThat(messages.get(messages.size() - 1).getMessage()).contains(BUILDING_MSG + buildId); // check last message - - return buildHead; - } - - private String qtNewBuildExpectFail(String branch, - String buildId) - throws Exception { - String stagingRef = R_STAGING + branch; - String branchRef = R_HEADS + branch; - String commandStr; - RevCommit initialHead = getRemoteHead(project, branchRef); - RevCommit stagingHeadOld = getRemoteHead(project, stagingRef); - - commandStr ="gerrit-plugin-qt-workflow staging-new-build"; - commandStr += " --project " + project.get(); - commandStr += " --staging-branch " + branch; - commandStr += " --build-id " + buildId; - String resultStr = adminSshSession.exec(commandStr); - - RevCommit updatedHead = getRemoteHead(project, branchRef); - if (updatedHead != null) assertThat(updatedHead.getId()).isEqualTo(initialHead.getId()); // master is not updated - - RevCommit stagingHead = getRemoteHead(project, stagingRef); - if (stagingHeadOld != null && stagingHead != null) assertThat(stagingHead.getId()).isEqualTo(stagingHeadOld.getId()); // staging is not updated - - return adminSshSession.getError(); - } + RevCommit stagingHead = getRemoteRefHead(project, stagingRef); + if (stagingHeadOld != null && stagingHead != null) + assertThat(stagingHead.getId()).isEqualTo(stagingHeadOld.getId()); // staging is not updated + return adminSshSession.getError(); + } } diff --git a/src/test/java/com/googlesource/gerrit/plugins/qtcodereview/QtCommandRebuildStagingIT.java b/src/test/java/com/googlesource/gerrit/plugins/qtcodereview/QtCommandRebuildStagingIT.java index 01f6d3b..ae3d85f 100644 --- a/src/test/java/com/googlesource/gerrit/plugins/qtcodereview/QtCommandRebuildStagingIT.java +++ b/src/test/java/com/googlesource/gerrit/plugins/qtcodereview/QtCommandRebuildStagingIT.java @@ -1,182 +1,173 @@ -// Copyright (C) 2019 The Qt Company +// Copyright (C) 2019-21 The Qt Company package com.googlesource.gerrit.plugins.qtcodereview; -import static com.google.gerrit.server.group.SystemGroupBackend.REGISTERED_USERS; - import static com.google.common.truth.Truth.assertThat; +import static com.google.gerrit.server.group.SystemGroupBackend.REGISTERED_USERS; import com.google.gerrit.acceptance.PushOneCommit; -import com.google.gerrit.acceptance.RestResponse; import com.google.gerrit.acceptance.TestPlugin; import com.google.gerrit.acceptance.UseSsh; - -import com.google.gerrit.common.data.Permission; - +import com.google.gerrit.acceptance.testsuite.project.TestProjectUpdate; +import com.google.gerrit.entities.Permission; import org.eclipse.jgit.revwalk.RevCommit; - -import java.util.ArrayList; - import org.junit.Before; import org.junit.Test; @TestPlugin( name = "gerrit-plugin-qt-workflow", sysModule = "com.googlesource.gerrit.plugins.qtcodereview.QtModule", - sshModule = "com.googlesource.gerrit.plugins.qtcodereview.QtSshModule" -) - + sshModule = "com.googlesource.gerrit.plugins.qtcodereview.QtSshModule") @UseSsh public class QtCommandRebuildStagingIT extends QtCodeReviewIT { - @Before - public void SetDefaultPermissions() throws Exception { - grant(project, "refs/heads/master", Permission.QT_STAGE, false, REGISTERED_USERS); - grant(project, "refs/staging/*", Permission.PUSH, false, adminGroupUuid()); - grant(project, "refs/builds/*", Permission.CREATE, false, adminGroupUuid()); - } - - @Test - public void multiChange_RebuildStaging() throws Exception { - // Push 3 independent commits - RevCommit initialHead = getRemoteHead(); - PushOneCommit.Result c1 = pushCommit("master", "commitmsg1", "file1", "content1"); - testRepo.reset(initialHead); - PushOneCommit.Result c2 = pushCommit("master", "commitmsg2", "file2", "content2"); - testRepo.reset(initialHead); - PushOneCommit.Result c3 = pushCommit("master", "commitmsg3", "file3", "content3"); - approve(c1.getChangeId()); - approve(c2.getChangeId()); - approve(c3.getChangeId()); - QtStage(c1); - QtStage(c2); - QtStage(c3); - RevCommit stagingExpected = getRemoteHead(project, R_STAGING + "master"); - - RevCommit stagingHead = qtRebuildStaging("master", null, stagingExpected); - } - - @Test - public void multiChange_RebuildStaging_WhileBuilding() throws Exception { - // Push 3 independent commits - RevCommit initialHead = getRemoteHead(); - PushOneCommit.Result c1 = pushCommit("master", "commitmsg1", "file1", "content1"); - testRepo.reset(initialHead); - PushOneCommit.Result c2 = pushCommit("master", "commitmsg2", "file2", "content2"); - testRepo.reset(initialHead); - PushOneCommit.Result c3 = pushCommit("master", "commitmsg3", "file3", "content3"); - approve(c1.getChangeId()); - approve(c2.getChangeId()); - approve(c3.getChangeId()); - QtStage(c1); - QtStage(c2); - QtNewBuild("master", "test-build-250"); - QtStage(c3); - RevCommit stagingExpected = getRemoteHead(project, R_STAGING + "master"); - - RevCommit stagingHead = qtRebuildStaging("master", null, stagingExpected); + @Before + public void SetDefaultPermissions() throws Exception { + projectOperations.project(project).forUpdate().add(TestProjectUpdate.allow(Permission.QT_STAGE).ref("refs/heads/master").group(REGISTERED_USERS)).update(); + projectOperations.project(project).forUpdate().add(TestProjectUpdate.allow(Permission.PUSH).ref("refs/staging/*").group(adminGroupUuid())).update(); + projectOperations.project(project).forUpdate().add(TestProjectUpdate.allow(Permission.CREATE).ref("refs/builds/*").group(adminGroupUuid())).update(); + } + + @Test + public void multiChange_RebuildStaging() throws Exception { + // Push 3 independent commits + RevCommit initialHead = getRemoteHead(); + PushOneCommit.Result c1 = pushCommit("master", "commitmsg1", "file1", "content1"); + testRepo.reset(initialHead); + PushOneCommit.Result c2 = pushCommit("master", "commitmsg2", "file2", "content2"); + testRepo.reset(initialHead); + PushOneCommit.Result c3 = pushCommit("master", "commitmsg3", "file3", "content3"); + approve(c1.getChangeId()); + approve(c2.getChangeId()); + approve(c3.getChangeId()); + QtStage(c1); + QtStage(c2); + QtStage(c3); + RevCommit stagingExpected = getRemoteHead(project, R_STAGING + "master"); + + RevCommit stagingHead = qtRebuildStaging("master", null, stagingExpected); + } + + @Test + public void multiChange_RebuildStaging_WhileBuilding() throws Exception { + // Push 3 independent commits + RevCommit initialHead = getRemoteHead(); + PushOneCommit.Result c1 = pushCommit("master", "commitmsg1", "file1", "content1"); + testRepo.reset(initialHead); + PushOneCommit.Result c2 = pushCommit("master", "commitmsg2", "file2", "content2"); + testRepo.reset(initialHead); + PushOneCommit.Result c3 = pushCommit("master", "commitmsg3", "file3", "content3"); + approve(c1.getChangeId()); + approve(c2.getChangeId()); + approve(c3.getChangeId()); + QtStage(c1); + QtStage(c2); + QtNewBuild("master", "test-build-250"); + QtStage(c3); + RevCommit stagingExpected = getRemoteHead(project, R_STAGING + "master"); + + RevCommit stagingHead = qtRebuildStaging("master", null, stagingExpected); + } + + @Test + public void errorRebuildStaging_NoPermission() throws Exception { + PushOneCommit.Result c = pushCommit("master", "commitmsg1", "file1", "content1"); + approve(c.getChangeId()); + QtStage(c); + + projectOperations.project(project).forUpdate().add(TestProjectUpdate.deny(Permission.SUBMIT).ref("refs/heads/master").group(REGISTERED_USERS)).update(); + + String commandStr; + commandStr = "gerrit-plugin-qt-workflow staging-rebuild"; + commandStr += " --project " + project.get(); + commandStr += " --branch master"; + String resultStr = userSshSession.exec(commandStr); + assertThat(userSshSession.getError()).contains("not authorized"); + + projectOperations.project(project).forUpdate().add(TestProjectUpdate.allow(Permission.SUBMIT).ref("refs/heads/master").group(REGISTERED_USERS)).update(); + } + + @Test + public void errorRebuildStaging_RepoNotFound() throws Exception { + PushOneCommit.Result c = pushCommit("master", "commitmsg1", "file1", "content1"); + approve(c.getChangeId()); + QtStage(c); + + String commandStr = "gerrit-plugin-qt-workflow staging-rebuild"; + commandStr += " --project notarepo --branch master"; + String resultStr = adminSshSession.exec(commandStr); + assertThat(adminSshSession.getError()).contains("project not found"); + } + + @Test + public void errorRebuildStaging_InvalidBranch() throws Exception { + PushOneCommit.Result c = pushCommit("master", "commitmsg1", "file1", "content1"); + approve(c.getChangeId()); + QtStage(c); + + String resultStr = qtRebuildStagingExpectFail("invalidbranch"); + assertThat(resultStr).contains("branch staging ref not found"); + } + + private RevCommit qtRebuildStaging( + String branch, PushOneCommit.Result expectedContent, RevCommit expectedStagingHead) + throws Exception { + String stagingRef = R_STAGING + branch; + String branchRef = R_HEADS + branch; + RevCommit initialHead = getRemoteHead(project, branchRef); + RevCommit oldStagingHead = getRemoteRefHead(project, stagingRef); + + String commandStr; + commandStr = "gerrit-plugin-qt-workflow staging-rebuild"; + commandStr += " --project " + project.get(); + commandStr += " --branch " + branch; + String resultStr = adminSshSession.exec(commandStr); + assertThat(adminSshSession.getError()).isNull(); + + RevCommit updatedHead = getRemoteHead(project, branchRef); + assertThat(updatedHead.getId()).isEqualTo(initialHead.getId()); // master is not updated + + RevCommit stagingHead = getRemoteRefHead(project, stagingRef); + assertReviewedByFooter(stagingHead, true); + + if (expectedStagingHead == null && expectedContent != null) { + assertCherryPick(stagingHead, expectedContent.getCommit(), null); + expectedStagingHead = stagingHead; + } else { + assertThat(stagingHead).isEqualTo(expectedStagingHead); // staging is updated } - @Test - public void errorRebuildStaging_NoPermission() throws Exception { - PushOneCommit.Result c = pushCommit("master", "commitmsg1", "file1", "content1"); - approve(c.getChangeId()); - QtStage(c); - - deny(project, "refs/heads/master", Permission.SUBMIT, REGISTERED_USERS); - - String commandStr; - commandStr ="gerrit-plugin-qt-workflow staging-rebuild"; - commandStr += " --project " + project.get(); - commandStr += " --branch master"; - String resultStr = userSshSession.exec(commandStr); - assertThat(userSshSession.getError()).contains("not authorized"); - - grant(project, "refs/heads/master", Permission.SUBMIT, false, REGISTERED_USERS); - } - - @Test - public void errorRebuildStaging_RepoNotFound() throws Exception { - PushOneCommit.Result c = pushCommit("master", "commitmsg1", "file1", "content1"); - approve(c.getChangeId()); - QtStage(c); - - String commandStr ="gerrit-plugin-qt-workflow staging-rebuild"; - commandStr += " --project notarepo --branch master"; - String resultStr = adminSshSession.exec(commandStr); - assertThat(adminSshSession.getError()).contains("project not found"); + if (expectedStagingHead.equals(oldStagingHead)) { + assertRefUpdatedEvents(stagingRef); // no events + } else { + assertRefUpdatedEvents(stagingRef, oldStagingHead, expectedStagingHead); + resetEvents(); } - @Test - public void errorRebuildStaging_InvalidBranch() throws Exception { - PushOneCommit.Result c = pushCommit("master", "commitmsg1", "file1", "content1"); - approve(c.getChangeId()); - QtStage(c); + return stagingHead; + } - String resultStr = qtRebuildStagingExpectFail("invalidbranch"); - assertThat(resultStr).contains("branch staging ref not found"); - } - - private RevCommit qtRebuildStaging(String branch, - PushOneCommit.Result expectedContent, - RevCommit expectedStagingHead) - throws Exception { - String stagingRef = R_STAGING + branch; - String branchRef = R_HEADS + branch; - RevCommit initialHead = getRemoteHead(project, branchRef); - RevCommit oldStagingHead = getRemoteHead(project, stagingRef); - - String commandStr; - commandStr ="gerrit-plugin-qt-workflow staging-rebuild"; - commandStr += " --project " + project.get(); - commandStr += " --branch " + branch; - String resultStr = adminSshSession.exec(commandStr); - assertThat(adminSshSession.getError()).isNull(); - - RevCommit updatedHead = getRemoteHead(project, branchRef); - assertThat(updatedHead.getId()).isEqualTo(initialHead.getId()); // master is not updated - - RevCommit stagingHead = getRemoteHead(project, stagingRef); - assertReviewedByFooter(stagingHead, true); - - if (expectedStagingHead == null && expectedContent != null) { - assertCherryPick(stagingHead, expectedContent.getCommit(), null); - expectedStagingHead = stagingHead; - } else { - assertThat(stagingHead).isEqualTo(expectedStagingHead); // staging is updated - } - - if (expectedStagingHead.equals(oldStagingHead)) { - assertRefUpdatedEvents(stagingRef); // no events - } else { - assertRefUpdatedEvents(stagingRef, oldStagingHead, expectedStagingHead); - resetEvents(); - } - - return stagingHead; - } + private String qtRebuildStagingExpectFail(String branch) throws Exception { + String stagingRef = R_STAGING + branch; + String branchRef = R_HEADS + branch; + RevCommit initialHead = getRemoteRefHead(project, branchRef); + RevCommit oldStagingHead = getRemoteRefHead(project, stagingRef); - private String qtRebuildStagingExpectFail(String branch) - throws Exception { - String stagingRef = R_STAGING + branch; - String branchRef = R_HEADS + branch; - RevCommit initialHead = getRemoteHead(project, branchRef); - RevCommit oldStagingHead = getRemoteHead(project, stagingRef); + String commandStr; + commandStr = "gerrit-plugin-qt-workflow staging-rebuild"; + commandStr += " --project " + project.get(); + commandStr += " --branch " + branch; + String resultStr = adminSshSession.exec(commandStr); + assertThat(adminSshSession.getError()).isNotNull(); - String commandStr; - commandStr ="gerrit-plugin-qt-workflow staging-rebuild"; - commandStr += " --project " + project.get(); - commandStr += " --branch " + branch; - String resultStr = adminSshSession.exec(commandStr); - assertThat(adminSshSession.getError()).isNotNull(); + RevCommit updatedHead = getRemoteRefHead(project, branchRef); + if (updatedHead != null) + assertThat(updatedHead.getId()).isEqualTo(initialHead.getId()); // master is not updated - RevCommit updatedHead = getRemoteHead(project, branchRef); - if (updatedHead != null) assertThat(updatedHead.getId()).isEqualTo(initialHead.getId()); // master is not updated - - RevCommit stagingHead = getRemoteHead(project, stagingRef); - if (stagingHead != null) assertThat(stagingHead.getId()).isEqualTo(oldStagingHead.getId()); // staging is not updated - - return adminSshSession.getError(); - } + RevCommit stagingHead = getRemoteRefHead(project, stagingRef); + if (stagingHead != null) + assertThat(stagingHead.getId()).isEqualTo(oldStagingHead.getId()); // staging is not updated + return adminSshSession.getError(); + } } diff --git a/src/test/java/com/googlesource/gerrit/plugins/qtcodereview/QtCommandStageIT.java b/src/test/java/com/googlesource/gerrit/plugins/qtcodereview/QtCommandStageIT.java index a9e381b..3286db7 100644 --- a/src/test/java/com/googlesource/gerrit/plugins/qtcodereview/QtCommandStageIT.java +++ b/src/test/java/com/googlesource/gerrit/plugins/qtcodereview/QtCommandStageIT.java @@ -1,16 +1,16 @@ -// Copyright (C) 2019 The Qt Company +// Copyright (C) 2019-21 The Qt Company package com.googlesource.gerrit.plugins.qtcodereview; -import static com.google.gerrit.server.group.SystemGroupBackend.REGISTERED_USERS; import static com.google.common.truth.Truth.assertThat; +import static com.google.gerrit.server.group.SystemGroupBackend.REGISTERED_USERS; import com.google.gerrit.acceptance.PushOneCommit; import com.google.gerrit.acceptance.TestPlugin; import com.google.gerrit.acceptance.UseSsh; -import com.google.gerrit.common.data.Permission; -import com.google.gerrit.reviewdb.client.Change; -import com.google.gerrit.reviewdb.client.ChangeMessage; +import com.google.gerrit.acceptance.testsuite.project.TestProjectUpdate; +import com.google.gerrit.entities.Permission; +import com.google.gerrit.entities.Change; import org.eclipse.jgit.revwalk.RevCommit; import org.junit.Before; import org.junit.Test; @@ -18,151 +18,153 @@ @TestPlugin( name = "gerrit-plugin-qt-workflow", sysModule = "com.googlesource.gerrit.plugins.qtcodereview.QtModule", - sshModule = "com.googlesource.gerrit.plugins.qtcodereview.QtSshModule" -) - + sshModule = "com.googlesource.gerrit.plugins.qtcodereview.QtSshModule") @UseSsh public class QtCommandStageIT extends QtCodeReviewIT { - @Before - public void SetDefaultPermissions() throws Exception { - grant(project, "refs/heads/master", Permission.QT_STAGE, false, REGISTERED_USERS); - } - - @Test - public void single_Change_Stage() throws Exception { - PushOneCommit.Result c = pushCommit("master", "commitmsg1", "file1", "content1"); - approve(c.getChangeId()); - qtSshStage(c); - } - - @Test - public void multi_Change_Stage() throws Exception { - // Push 3 independent commits - RevCommit initialHead = getRemoteHead(); - PushOneCommit.Result c1 = pushCommit("master", "commitmsg1", "file1", "content1"); - testRepo.reset(initialHead); - PushOneCommit.Result c2 = pushCommit("master", "commitmsg2", "file2", "content2"); - testRepo.reset(initialHead); - PushOneCommit.Result c3 = pushCommit("master", "commitmsg3", "file3", "content3"); - - approve(c1.getChangeId()); - approve(c2.getChangeId()); - approve(c3.getChangeId()); - - String changes; - changes = String.valueOf(c1.getPatchSetId().getParentKey().get()) + "," + c1.getPatchSetId().getId(); - changes += " " + String.valueOf(c2.getPatchSetId().getParentKey().get()) + "," + c2.getPatchSetId().getId(); - changes += " " + String.valueOf(c3.getPatchSetId().getParentKey().get()) + "," + c3.getPatchSetId().getId(); - String result = qtSshStageCommon(c1, changes, false); - assertThat(result).isNull(); - } - - @Test - public void error_InvalidPatch() throws Exception { - PushOneCommit.Result c = pushCommit("master", "commitmsg1", "file1", "content1"); - approve(c.getChangeId()); - - String changes = "invalid"; - String result = qtSshStageCommon(c, changes, true); - assertThat(result).contains("is not a valid patch set"); - } - - @Test - public void error_ChangeNotFound() throws Exception { - PushOneCommit.Result c = pushCommit("master", "commitmsg1", "file1", "content1"); - approve(c.getChangeId()); - - String changes = "9999,1"; - String result = qtSshStageCommon(c, changes, true); - assertThat(result).contains("no such change"); - } - - @Test - public void error_PatchNotFound() throws Exception { - PushOneCommit.Result c = pushCommit("master", "commitmsg1", "file1", "content1"); - approve(c.getChangeId()); - String changes = String.valueOf(c.getPatchSetId().getParentKey().get()) +",9999"; - String result = qtSshStageCommon(c, changes, true); - assertThat(result).contains("no such patch set"); - } - - @Test - public void error_PatchNotCurrent() throws Exception { - PushOneCommit.Result c1 = pushCommit("master", "commitmsg1", "file1", "content1"); - PushOneCommit.Result c2 = amendCommit(c1.getChangeId()); - approve(c2.getChangeId()); - - String changes = String.valueOf(c2.getPatchSetId().getParentKey().get()) +",1"; - String result = qtSshStageCommon(c2, changes, true); - assertThat(result).contains("is not current"); - } - - @Test - public void error_Wrong_Status() throws Exception { - PushOneCommit.Result c = pushCommit("master", "commitmsg1", "file1", "content1"); - approve(c.getChangeId()); - - grant(project, "refs/heads/master", Permission.ABANDON, false, REGISTERED_USERS); - QtDefer(c); - deny(project, "refs/heads/master", Permission.ABANDON, REGISTERED_USERS); - - String result = qtSshStageExpectFail(c); - assertThat(result).contains("Change is DEFERRED"); - } - - @Test - public void error_NoPermission() throws Exception { - deny(project, "refs/heads/master", Permission.QT_STAGE, REGISTERED_USERS); - PushOneCommit.Result c = pushCommit("master", "commitmsg1", "file1", "content1"); - approve(c.getChangeId()); - - String result = qtSshStageExpectFail(c); - assertThat(result).contains("not permitted"); - grant(project, "refs/heads/master", Permission.QT_STAGE, false, REGISTERED_USERS); - } - - @Test - public void error_notReviewed() throws Exception { - PushOneCommit.Result c = pushCommit("master", "commitmsg1", "file1", "content1"); - - String result = qtSshStageExpectFail(c); - assertThat(result).contains("needs Code-Review"); - } - - private void qtSshStage(PushOneCommit.Result c) throws Exception { - qtSshStageCommon(c, false); - } - - private String qtSshStageExpectFail(PushOneCommit.Result c) throws Exception { - return qtSshStageCommon(c, true); - } - - private String qtSshStageCommon(PushOneCommit.Result c, - Boolean expectFail) - throws Exception { - String changes; - changes = String.valueOf(c.getPatchSetId().getParentKey().get()) + ","; - changes += c.getPatchSetId().getId(); - - return qtSshStageCommon(c, changes, expectFail); - } - - private String qtSshStageCommon(PushOneCommit.Result c, - String changes, - Boolean expectFail) - throws Exception { - String commandStr ="gerrit-plugin-qt-workflow stage " + changes; - - String resultStr = adminSshSession.exec(commandStr); - if (expectFail) assertThat(adminSshSession.getError()).isNotNull(); - else assertThat(adminSshSession.getError()).isNull(); - - Change change = c.getChange().change(); - if (expectFail) assertThat(change.getStatus()).isNotEqualTo(Change.Status.STAGED); - else assertStatusStaged(change); - - return adminSshSession.getError(); - } - + @Before + public void SetDefaultPermissions() throws Exception { + projectOperations.project(project).forUpdate().add(TestProjectUpdate.allow(Permission.QT_STAGE).ref("refs/heads/master").group(REGISTERED_USERS)).update(); + } + + @Test + public void single_Change_Stage() throws Exception { + PushOneCommit.Result c = pushCommit("master", "commitmsg1", "file1", "content1"); + approve(c.getChangeId()); + qtSshStage(c); + } + + @Test + public void multi_Change_Stage() throws Exception { + // Push 3 independent commits + RevCommit initialHead = getRemoteHead(); + PushOneCommit.Result c1 = pushCommit("master", "commitmsg1", "file1", "content1"); + testRepo.reset(initialHead); + PushOneCommit.Result c2 = pushCommit("master", "commitmsg2", "file2", "content2"); + testRepo.reset(initialHead); + PushOneCommit.Result c3 = pushCommit("master", "commitmsg3", "file3", "content3"); + + approve(c1.getChangeId()); + approve(c2.getChangeId()); + approve(c3.getChangeId()); + + String changes; + changes = + String.valueOf(c1.getPatchSetId().changeId().get()) + "," + c1.getPatchSetId().getId(); + changes += + " " + + String.valueOf(c2.getPatchSetId().changeId().get()) + + "," + + c2.getPatchSetId().getId(); + changes += + " " + + String.valueOf(c3.getPatchSetId().changeId().get()) + + "," + + c3.getPatchSetId().getId(); + String result = qtSshStageCommon(c1, changes, false); + assertThat(result).isNull(); + } + + @Test + public void error_InvalidPatch() throws Exception { + PushOneCommit.Result c = pushCommit("master", "commitmsg1", "file1", "content1"); + approve(c.getChangeId()); + + String changes = "invalid"; + String result = qtSshStageCommon(c, changes, true); + assertThat(result).contains("is not a valid patch set"); + } + + @Test + public void error_ChangeNotFound() throws Exception { + PushOneCommit.Result c = pushCommit("master", "commitmsg1", "file1", "content1"); + approve(c.getChangeId()); + + String changes = "9999,1"; + String result = qtSshStageCommon(c, changes, true); + assertThat(result).contains("no such change"); + } + + @Test + public void error_PatchNotFound() throws Exception { + PushOneCommit.Result c = pushCommit("master", "commitmsg1", "file1", "content1"); + approve(c.getChangeId()); + String changes = String.valueOf(c.getPatchSetId().changeId().get()) + ",9999"; + String result = qtSshStageCommon(c, changes, true); + assertThat(result).contains("no such patch set"); + } + + @Test + public void error_PatchNotCurrent() throws Exception { + PushOneCommit.Result c1 = pushCommit("master", "commitmsg1", "file1", "content1"); + PushOneCommit.Result c2 = amendCommit(c1.getChangeId()); + approve(c2.getChangeId()); + + String changes = String.valueOf(c2.getPatchSetId().changeId().get()) + ",1"; + String result = qtSshStageCommon(c2, changes, true); + assertThat(result).contains("is not current"); + } + + @Test + public void error_Wrong_Status() throws Exception { + PushOneCommit.Result c = pushCommit("master", "commitmsg1", "file1", "content1"); + approve(c.getChangeId()); + + projectOperations.project(project).forUpdate().add(TestProjectUpdate.allow(Permission.ABANDON).ref("refs/heads/master").group(REGISTERED_USERS)).update(); + QtDefer(c); + projectOperations.project(project).forUpdate().add(TestProjectUpdate.deny(Permission.ABANDON).ref("refs/heads/master").group(REGISTERED_USERS)).update(); + + String result = qtSshStageExpectFail(c); + assertThat(result).contains("Change is DEFERRED"); + } + + @Test + public void error_NoPermission() throws Exception { + projectOperations.project(project).forUpdate().add(TestProjectUpdate.deny(Permission.QT_STAGE).ref("refs/heads/master").group(REGISTERED_USERS)).update(); + PushOneCommit.Result c = pushCommit("master", "commitmsg1", "file1", "content1"); + approve(c.getChangeId()); + + String result = qtSshStageExpectFail(c); + assertThat(result).contains("not permitted"); + projectOperations.project(project).forUpdate().add(TestProjectUpdate.allow(Permission.QT_STAGE).ref("refs/heads/master").group(REGISTERED_USERS)).update(); + } + + @Test + public void error_notReviewed() throws Exception { + PushOneCommit.Result c = pushCommit("master", "commitmsg1", "file1", "content1"); + + String result = qtSshStageExpectFail(c); + assertThat(result).contains("needs Code-Review"); + } + + private void qtSshStage(PushOneCommit.Result c) throws Exception { + qtSshStageCommon(c, false); + } + + private String qtSshStageExpectFail(PushOneCommit.Result c) throws Exception { + return qtSshStageCommon(c, true); + } + + private String qtSshStageCommon(PushOneCommit.Result c, Boolean expectFail) throws Exception { + String changes; + changes = String.valueOf(c.getPatchSetId().changeId().get()) + ","; + changes += c.getPatchSetId().getId(); + + return qtSshStageCommon(c, changes, expectFail); + } + + private String qtSshStageCommon(PushOneCommit.Result c, String changes, Boolean expectFail) + throws Exception { + String commandStr = "gerrit-plugin-qt-workflow stage " + changes; + + String resultStr = adminSshSession.exec(commandStr); + if (expectFail) assertThat(adminSshSession.getError()).isNotNull(); + else assertThat(adminSshSession.getError()).isNull(); + + Change change = c.getChange().change(); + if (expectFail) assertThat(change.getStatus()).isNotEqualTo(Change.Status.STAGED); + else assertStatusStaged(change); + + return adminSshSession.getError(); + } } diff --git a/src/test/java/com/googlesource/gerrit/plugins/qtcodereview/QtCommitFooterIT.java b/src/test/java/com/googlesource/gerrit/plugins/qtcodereview/QtCommitFooterIT.java index 6f2874a..b9b342b 100644 --- a/src/test/java/com/googlesource/gerrit/plugins/qtcodereview/QtCommitFooterIT.java +++ b/src/test/java/com/googlesource/gerrit/plugins/qtcodereview/QtCommitFooterIT.java @@ -1,4 +1,4 @@ -// Copyright (C) 2019 The Qt Company +// Copyright (C) 2019-21 The Qt Company package com.googlesource.gerrit.plugins.qtcodereview; @@ -6,76 +6,126 @@ import static com.google.gerrit.extensions.client.ListChangesOption.CURRENT_COMMIT; import static com.google.gerrit.extensions.client.ListChangesOption.CURRENT_REVISION; import static com.google.gerrit.server.group.SystemGroupBackend.REGISTERED_USERS; -import static com.google.gerrit.server.project.testing.Util.category; -import static com.google.gerrit.server.project.testing.Util.value; +import static com.google.gerrit.server.project.testing.TestLabels.label; +import static com.google.gerrit.server.project.testing.TestLabels.value; +import static com.google.gerrit.acceptance.testsuite.project.TestProjectUpdate.allowLabel; -import com.google.gerrit.acceptance.LightweightPluginDaemonTest; +import com.google.gerrit.acceptance.GitUtil; import com.google.gerrit.acceptance.PushOneCommit; import com.google.gerrit.acceptance.TestPlugin; import com.google.gerrit.acceptance.UseSsh; - +import com.google.gerrit.acceptance.testsuite.project.ProjectOperations; +import com.google.gerrit.acceptance.testsuite.request.RequestScopeOperations; +import com.google.gerrit.entities.LabelType; +import com.google.gerrit.entities.RefNames; +import com.google.gerrit.extensions.api.changes.ReviewInput; import com.google.gerrit.extensions.api.projects.ProjectInput; import com.google.gerrit.extensions.client.SubmitType; import com.google.gerrit.extensions.common.ChangeInfo; -import com.google.gerrit.common.data.LabelType; -import com.google.gerrit.common.data.Permission; -import com.google.gerrit.extensions.api.changes.ReviewInput; -import com.google.gerrit.reviewdb.client.AccountGroup; -import com.google.gerrit.server.project.testing.Util; - +import com.google.gerrit.entities.AccountGroup; +import com.google.gerrit.server.project.testing.TestLabels; +import com.google.inject.Inject; +import org.eclipse.jgit.lib.Config; +import org.eclipse.jgit.revwalk.RevCommit; import org.junit.Test; @TestPlugin( name = "gerrit-plugin-qt-workflow", sysModule = "com.googlesource.gerrit.plugins.qtcodereview.QtModule", - sshModule = "com.googlesource.gerrit.plugins.qtcodereview.QtSshModule" -) - + sshModule = "com.googlesource.gerrit.plugins.qtcodereview.QtSshModule") @UseSsh -public class QtCommitFooterIT extends LightweightPluginDaemonTest { +public class QtCommitFooterIT extends QtCodeReviewIT { + @Inject private ProjectOperations projectOperations; + @Inject private RequestScopeOperations requestScopeOperations; - @Override - protected void updateProjectInput(ProjectInput in) { - // Reviewed-on and Tested-by footers are generated only in cherry pick mode - in.submitType = SubmitType.CHERRY_PICK; - } + @Override + protected void updateProjectInput(ProjectInput in) { + // Reviewed-on and Tested-by footers are generated only in cherry pick mode + in.submitType = SubmitType.CHERRY_PICK; + } - @Test - public void removeCommitFooterLines() throws Exception { - LabelType sanity = category("Sanity-Review", value(1, "Passes"), value(0, "No score"), value(-1, "Failed")); - LabelType verified = category("Verified", value(1, "Passes"), value(0, "No score"), value(-1, "Failed")); - LabelType changelog = category("ChangeLog", value(1, "Passes"), value(0, "No score"), value(-1, "Failed")); - try (ProjectConfigUpdate u = updateProject(project)) { - u.getConfig().getLabelSections().put(sanity.getName(), sanity); - u.getConfig().getLabelSections().put(verified.getName(), verified); - u.getConfig().getLabelSections().put(changelog.getName(), changelog); - AccountGroup.UUID registered = systemGroupBackend.getGroup(REGISTERED_USERS).getUUID(); - String heads = "refs/heads/*"; - Util.allow(u.getConfig(), Permission.forLabel("Sanity-Review"), -1, 1, registered, heads); - Util.allow(u.getConfig(), Permission.forLabel("Code-Review"), -2, +2, registered, heads); - Util.allow(u.getConfig(), Permission.forLabel("Verified"), -1, +1, registered, heads); - Util.allow(u.getConfig(), Permission.forLabel("ChangeLog"), -1, +1, registered, heads); - u.save(); - } - - PushOneCommit.Result change = createChange(); - setApiUser(user); - ReviewInput input = new ReviewInput(); - input.label("Code-Review", 2); - input.label(verified.getName(), 1); - input.label(sanity.getName(), 1); - input.label(changelog.getName(), 1); - gApi.changes().id(change.getChangeId()).current().review(input); - - setApiUser(admin); - gApi.changes().id(change.getChangeId()).current().submit(); - - ChangeInfo cf = gApi.changes().id(change.getChangeId()).get(CURRENT_REVISION, CURRENT_COMMIT); - String commitMsg = cf.revisions.get(cf.currentRevision).commit.message; - assertThat(commitMsg).contains("Reviewed-by"); - assertThat(commitMsg).doesNotContain("Reviewed-on"); - assertThat(commitMsg).doesNotContain("Sanity-Review"); - assertThat(commitMsg).doesNotContain("Tested-by"); - assertThat(commitMsg).doesNotContain("ChangeLog"); + @Test + public void removeCommitFooterLines() throws Exception { + LabelType sanity = + label("Sanity-Review", value(1, "Passes"), value(0, "No score"), value(-1, "Failed")); + LabelType verified = + label("Verified", value(1, "Passes"), value(0, "No score"), value(-1, "Failed")); + LabelType changelog = + label("ChangeLog", value(1, "Passes"), value(0, "No score"), value(-1, "Failed")); + try (ProjectConfigUpdate u = updateProject(project)) { + u.getConfig().getLabelSections().put(sanity.getName(), sanity); + u.getConfig().getLabelSections().put(verified.getName(), verified); + u.getConfig().getLabelSections().put(changelog.getName(), changelog); + u.save(); } + AccountGroup.UUID registered = systemGroupBackend.getGroup(REGISTERED_USERS).getUUID(); + String heads = "refs/heads/*"; + + projectOperations.project(project).forUpdate() + .add(allowLabel(sanity.getName()).ref(heads).group(registered).range(-1, 1)) + .add(allowLabel(TestLabels.codeReview().getName()).ref(heads).group(registered).range(-2, 2)) + .add(allowLabel(verified.getName()).ref(heads).group(registered).range(-1, 1)) + .add(allowLabel(changelog.getName()).ref(heads).group(registered).range(-1, 1)) + .update(); + + PushOneCommit.Result change = createChange(); + requestScopeOperations.setApiUser(user.id()); + ReviewInput input = new ReviewInput(); + input.label("Code-Review", 2); + input.label(verified.getName(), 1); + input.label(sanity.getName(), 1); + input.label(changelog.getName(), 1); + gApi.changes().id(change.getChangeId()).current().review(input); + + requestScopeOperations.setApiUser(admin.id()); + gApi.changes().id(change.getChangeId()).current().submit(); + + ChangeInfo cf = gApi.changes().id(change.getChangeId()).get(CURRENT_REVISION, CURRENT_COMMIT); + String commitMsg = cf.revisions.get(cf.currentRevision).commit.message; + assertThat(commitMsg).contains("Reviewed-by"); + assertThat(commitMsg).doesNotContain("Reviewed-on"); + assertThat(commitMsg).doesNotContain("Sanity-Review"); + assertThat(commitMsg).doesNotContain("Tested-by"); + assertThat(commitMsg).doesNotContain("ChangeLog"); + } + + @Test + public void removeCommitFooterLinesKeepReviewedOn() throws Exception { + + RevCommit initialHead = getRemoteHead(); + + // Change setting for the project to show 'Reviewed-on' commit message footer + Config cfg = new Config(); + cfg.fromText(projectOperations.project(project).getConfig().toText()); + cfg.setBoolean("plugin", "gerrit-plugin-qt-workflow", "showReviewedOnFooter", true); + GitUtil.fetch(testRepo, RefNames.REFS_CONFIG + ":" + RefNames.REFS_CONFIG); + testRepo.reset(RefNames.REFS_CONFIG); + PushOneCommit.Result r = + pushFactory + .create(admin.newIdent(), testRepo, "Subject", "project.config", cfg.toText()) + .to(RefNames.REFS_CONFIG); + r.assertOkStatus(); + + AccountGroup.UUID registered = systemGroupBackend.getGroup(REGISTERED_USERS).getUUID(); + + projectOperations.project(project).forUpdate() + .add(allowLabel(TestLabels.codeReview().getName()).ref("refs/heads/*").group(registered).range(-2, 2)) + .update(); + + testRepo.reset(initialHead); + PushOneCommit.Result change = createChange(); + requestScopeOperations.setApiUser(user.id()); + ReviewInput input = new ReviewInput(); + input.label("Code-Review", 2); + gApi.changes().id(change.getChangeId()).current().review(input); + + requestScopeOperations.setApiUser(admin.id()); + gApi.changes().id(change.getChangeId()).current().submit(); + + ChangeInfo cf = gApi.changes().id(change.getChangeId()).get(CURRENT_REVISION, CURRENT_COMMIT); + String commitMsg = cf.revisions.get(cf.currentRevision).commit.message; + assertThat(commitMsg).contains("Reviewed-by"); + assertThat(commitMsg).contains("Reviewed-on"); + } + } diff --git a/src/test/java/com/googlesource/gerrit/plugins/qtcodereview/QtCommonFlowsIT.java b/src/test/java/com/googlesource/gerrit/plugins/qtcodereview/QtCommonFlowsIT.java index e844158..2a12e90 100644 --- a/src/test/java/com/googlesource/gerrit/plugins/qtcodereview/QtCommonFlowsIT.java +++ b/src/test/java/com/googlesource/gerrit/plugins/qtcodereview/QtCommonFlowsIT.java @@ -1,381 +1,377 @@ -// Copyright (C) 2019 The Qt Company +// Copyright (C) 2019-21 The Qt Company package com.googlesource.gerrit.plugins.qtcodereview; import static com.google.common.truth.Truth.assertThat; - import static com.google.gerrit.server.group.SystemGroupBackend.REGISTERED_USERS; import com.google.common.collect.ImmutableList; -import com.google.gerrit.common.data.Permission; import com.google.gerrit.acceptance.PushOneCommit; import com.google.gerrit.acceptance.TestPlugin; import com.google.gerrit.acceptance.UseSsh; -import com.google.gerrit.reviewdb.client.Branch; -import com.google.gerrit.reviewdb.client.Change; - +import com.google.gerrit.acceptance.testsuite.project.TestProjectUpdate; +import com.google.gerrit.entities.Permission; +import com.google.gerrit.entities.BranchNameKey; import org.eclipse.jgit.revwalk.RevCommit; - import org.junit.Before; import org.junit.Test; @TestPlugin( name = "gerrit-plugin-qt-workflow", sysModule = "com.googlesource.gerrit.plugins.qtcodereview.QtModule", - sshModule = "com.googlesource.gerrit.plugins.qtcodereview.QtSshModule" -) - + sshModule = "com.googlesource.gerrit.plugins.qtcodereview.QtSshModule") @UseSsh public class QtCommonFlowsIT extends QtCodeReviewIT { - @Before - public void SetDefaultPermissions() throws Exception { - createBranch(new Branch.NameKey(project, "5.12")); - - grant(project, "refs/heads/master", Permission.QT_STAGE, false, REGISTERED_USERS); - grant(project, "refs/heads/5.12", Permission.QT_STAGE, false, REGISTERED_USERS); - grant(project, "refs/staging/*", Permission.PUSH, false, adminGroupUuid()); - grant(project, "refs/builds/*", Permission.CREATE, false, adminGroupUuid()); - } - - @Test - public void pingSSHTest() throws Exception { - assertThat(adminSshSession.exec("gerrit-plugin-qt-workflow ping")).contains("Pong"); - assertThat(adminSshSession.getError()).isNull(); - } - - @Test - public void emptyChange_Stage_Integrating_Merged() throws Exception { - RevCommit initialHead = getRemoteHead(); - PushOneCommit.Result c = pushCommit("master", "1st commit", "afile", ""); - approve(c.getChangeId()); - QtStage(c); - - // no changes in this commit - c = pushCommit("master", "no content", "afile", ""); - approve(c.getChangeId()); - QtStage(c); - assertStatusStaged(c.getChange().change()); - RevCommit stagingHead = getRemoteHead(project, "refs/staging/master"); - - QtNewBuild("master", "master-build-000"); - assertStatusIntegrating(c.getChange().change()); - - QtApproveBuild("master", "master-build-000"); - assertStatusMerged(c.getChange().change()); - - String gitLog = getRemoteLog("refs/staging/master").toString(); - assertThat(gitLog).contains(stagingHead.getId().name()); - } - - @Test - public void mergeCommit_Stage_Integrating_Merged() throws Exception { - RevCommit initialHead = getRemoteHead(); - - // make changes on feature branch - PushOneCommit.Result f1 = pushCommit("5.12", "commitmsg1", "file1", "content1"); - approve(f1.getChangeId()); - gApi.changes().id(f1.getChangeId()).current().submit(); - PushOneCommit.Result f2 = pushCommit("5.12", "commitmsg2", "file2", "content2"); - approve(f2.getChangeId()); - gApi.changes().id(f2.getChangeId()).current().submit(); - - // make a change on master branch - testRepo.reset(initialHead); - PushOneCommit.Result c1 = pushCommit("master", "commitmsg3", "file3", "content3"); - approve(c1.getChangeId()); - gApi.changes().id(c1.getChangeId()).current().submit(); - - // merge feature branch into master - PushOneCommit mm = pushFactory.create(db, admin.getIdent(), testRepo); - mm.setParents(ImmutableList.of(c1.getCommit(), f2.getCommit())); - PushOneCommit.Result m = mm.to("refs/for/master"); - m.assertOkStatus(); - approve(m.getChangeId()); - QtStage(m); - assertStatusStaged(m.getChange().change()); - - QtNewBuild("master", "master-build-001"); - assertStatusIntegrating(m.getChange().change()); - - QtApproveBuild("master", "master-build-001"); - assertStatusMerged(m.getChange().change()); - - // check that all commits are in staging ref - String gitLog = getRemoteLog("refs/heads/master").toString(); - assertThat(gitLog).contains(initialHead.getId().name()); - assertThat(gitLog).contains(c1.getCommit().getId().name()); - assertThat(gitLog).contains(f1.getCommit().getId().name()); - assertThat(gitLog).contains(f2.getCommit().getId().name()); - assertThat(gitLog).contains(m.getCommit().getId().name()); - } - - @Test - public void multiBranch_New_Staged_Integrating_Merged() throws Exception { - // Push 3 independent commits - RevCommit initialHead = getRemoteHead(); - PushOneCommit.Result c1 = pushCommit("master", "commitmsg1", "file1", "content1"); - testRepo.reset(initialHead); - PushOneCommit.Result c2 = pushCommit("5.12", "commitmsg2", "file2", "content2"); - testRepo.reset(initialHead); - PushOneCommit.Result c3 = pushCommit("master", "commitmsg3", "file3", "content3"); - approve(c1.getChangeId()); - approve(c2.getChangeId()); - approve(c3.getChangeId()); - - QtStage(c1); - QtStage(c2); - QtStage(c3); - - QtNewBuild("master", "master-build-100"); - assertStatusIntegrating(c1.getChange().change()); - assertStatusStaged(c2.getChange().change()); - - QtNewBuild("5.12", "5.12-build-100"); - QtApproveBuild("5.12", "5.12-build-100"); - assertStatusIntegrating(c1.getChange().change()); - assertStatusIntegrating(c3.getChange().change()); - - QtApproveBuild("master", "master-build-100"); - RevCommit branchHeadMaster = getRemoteHead(project, R_HEADS + "master"); - RevCommit branchHead_5_12 = getRemoteHead(project, R_HEADS + "5.12"); - assertThat(branchHeadMaster.getId()).isNotEqualTo(branchHead_5_12.getId()); - } - - @Test - public void multiBranch_New_Staged_Integrating_Failed() throws Exception { - // Push 3 independent commits - RevCommit initialHead = getRemoteHead(); - PushOneCommit.Result c1 = pushCommit("5.12", "commitmsg1", "file1", "content1"); - testRepo.reset(initialHead); - PushOneCommit.Result c2 = pushCommit("5.12", "commitmsg2", "file2", "content2"); - testRepo.reset(initialHead); - PushOneCommit.Result c3 = pushCommit("master", "commitmsg3", "file3", "content3"); - approve(c1.getChangeId()); - approve(c2.getChangeId()); - approve(c3.getChangeId()); - - QtStage(c1); - QtStage(c2); - QtStage(c3); - - QtNewBuild("5.12", "5.12-build-101"); - assertStatusIntegrating(c1.getChange().change()); - assertStatusStaged(c3.getChange().change()); - - QtNewBuild("master", "master-build-101"); - QtFailBuild("master", "master-build-101"); - assertStatusIntegrating(c1.getChange().change()); - assertStatusIntegrating(c2.getChange().change()); - - QtFailBuild("5.12", "5.12-build-101"); - RevCommit branchHeadMaster = getRemoteHead(project, R_HEADS + "master"); - RevCommit branchHead_5_12 = getRemoteHead(project, R_HEADS + "5.12"); - assertThat(branchHeadMaster.getId()).isEqualTo(branchHead_5_12.getId()); - } - - @Test - public void multiBranch_UnStage() throws Exception { - // Push 2 independent commits - RevCommit initialHead = getRemoteHead(); - PushOneCommit.Result c1 = pushCommit("master", "commitmsg1", "file1", "content1"); - testRepo.reset(initialHead); - PushOneCommit.Result c2 = pushCommit("5.12", "commitmsg2", "file2", "content2"); - approve(c1.getChangeId()); - approve(c2.getChangeId()); - - QtStage(c1); - QtStage(c2); - - QtUnStage(c1); - assertStatusStaged(c2.getChange().change()); - - QtUnStage(c2); - RevCommit stagingHeadMaster = getRemoteHead(project, R_STAGING + "master"); - RevCommit stagingHead_5_12 = getRemoteHead(project, R_STAGING + "5.12"); - assertThat(stagingHeadMaster.getId()).isEqualTo(stagingHead_5_12.getId()); - } - - @Test - public void newStageWhileBuilding_Pass_Pass() throws Exception { - RevCommit initialHead = getRemoteHead(); - PushOneCommit.Result c1 = pushCommit("master", "commitmsg1", "file1", "content1"); - testRepo.reset(initialHead); - PushOneCommit.Result c2 = pushCommit("master", "commitmsg2", "file2", "content2"); - approve(c1.getChangeId()); - approve(c2.getChangeId()); - - QtStage(c1); - assertStatusNew(c2.getChange().change()); - - QtNewBuild("master", "master-build-401"); - RevCommit build1Head = getRemoteHead(project, R_BUILDS + "master-build-401"); - assertStatusNew(c2.getChange().change()); - - QtStage(c2); - QtApproveBuild("master", "master-build-401"); - assertStatusStaged(c2.getChange().change()); - - QtNewBuild("master", "master-build-402"); - RevCommit build2Head = getRemoteHead(project, R_BUILDS + "master-build-402"); - QtApproveBuild("master", "master-build-402"); - - String gitLog = getRemoteLog("refs/heads/master").toString(); - assertThat(gitLog).contains(build1Head.getId().name()); - assertThat(gitLog).contains(build2Head.getId().name()); - - RevCommit updatedHead = getRemoteHead(); - assertThat(updatedHead.getShortMessage()).isEqualTo(c2.getCommit().getShortMessage()); - } - - @Test - public void newStageWhileBuilding_Pass_Fail() throws Exception { - RevCommit initialHead = getRemoteHead(); - PushOneCommit.Result c1 = pushCommit("master", "commitmsg1", "file1", "content1"); - testRepo.reset(initialHead); - PushOneCommit.Result c2 = pushCommit("master", "commitmsg2", "file2", "content2"); - approve(c1.getChangeId()); - approve(c2.getChangeId()); - - QtStage(c1); - assertStatusNew(c2.getChange().change()); - - QtNewBuild("master", "master-build-401"); - RevCommit build1Head = getRemoteHead(project, R_BUILDS + "master-build-401"); - assertStatusNew(c2.getChange().change()); - - QtStage(c2); - QtApproveBuild("master", "master-build-401"); - assertStatusStaged(c2.getChange().change()); - - QtNewBuild("master", "master-build-402"); - RevCommit build2Head = getRemoteHead(project, R_BUILDS + "master-build-402"); - QtFailBuild("master", "master-build-402"); - - String gitLog = getRemoteLog("refs/heads/master").toString(); - assertThat(gitLog).contains(build1Head.getId().name()); - assertThat(gitLog).doesNotContain(build2Head.getId().name()); - - RevCommit updatedHead = getRemoteHead(); - assertThat(updatedHead.getShortMessage()).isEqualTo(c1.getCommit().getShortMessage()); - } - - @Test - public void newStageWhileBuilding_Fail_Pass() throws Exception { - RevCommit initialHead = getRemoteHead(); - PushOneCommit.Result c1 = pushCommit("master", "commitmsg1", "file1", "content1"); - testRepo.reset(initialHead); - PushOneCommit.Result c2 = pushCommit("master", "commitmsg2", "file2", "content2"); - approve(c1.getChangeId()); - approve(c2.getChangeId()); - - QtStage(c1); - assertStatusNew(c2.getChange().change()); - - QtNewBuild("master", "master-build-401"); - RevCommit build1Head = getRemoteHead(project, R_BUILDS + "master-build-401"); - assertStatusNew(c2.getChange().change()); - - QtStage(c2); - QtFailBuild("master", "master-build-401"); - assertStatusStaged(c2.getChange().change()); - - QtNewBuild("master", "master-build-402"); - RevCommit build2Head = getRemoteHead(project, R_BUILDS + "master-build-402"); - QtApproveBuild("master", "master-build-402"); - assertStatusNew(c1.getChange().change());; - - String gitLog = getRemoteLog("refs/heads/master").toString(); - assertThat(gitLog).doesNotContain(build1Head.getId().name()); - assertThat(gitLog).contains(build2Head.getId().name()); - - RevCommit updatedHead = getRemoteHead(); - assertThat(updatedHead.getShortMessage()).isEqualTo(c2.getCommit().getShortMessage()); - } - - @Test - public void newStageWhileBuilding_Fail_Fail() throws Exception { - RevCommit initialHead = getRemoteHead(); - PushOneCommit.Result c1 = pushCommit("master", "commitmsg1", "file1", "content1"); - testRepo.reset(initialHead); - PushOneCommit.Result c2 = pushCommit("master", "commitmsg2", "file2", "content2"); - approve(c1.getChangeId()); - approve(c2.getChangeId()); - - QtStage(c1); - assertStatusNew(c2.getChange().change()); - - QtNewBuild("master", "master-build-401"); - assertStatusNew(c2.getChange().change()); - - QtStage(c2); - QtFailBuild("master", "master-build-401"); - assertStatusStaged(c2.getChange().change()); - - QtNewBuild("master", "master-build-402"); - QtFailBuild("master", "master-build-402"); - - RevCommit updatedHead = getRemoteHead(); - assertThat(updatedHead).isEqualTo(initialHead); - } - - @Test - public void unStageWhileBuilding() throws Exception { - RevCommit initialHead = getRemoteHead(); - PushOneCommit.Result c1 = pushCommit("master", "commitmsg1", "file1", "content1"); - approve(c1.getChangeId()); - QtStage(c1); - QtNewBuild("master", "master-build-402"); - - PushOneCommit.Result c2 = pushCommit("master", "commitmsg2", "file2", "content2"); - approve(c2.getChangeId()); - QtStage(c2); - RevCommit stagingExpected = getRemoteHead(project, R_STAGING + "master"); - - PushOneCommit.Result c3 = pushCommit("master", "commitmsg3", "file3", "content3"); - approve(c3.getChangeId()); - QtStage(c3); - - QtUnStage(c3); - RevCommit stagingHead = getRemoteHead(project, R_STAGING + "master"); - assertThat(stagingHead).isEqualTo(stagingExpected); - - assertStatusIntegrating(c1.getChange().change()); - assertStatusStaged(c2.getChange().change()); - assertStatusNew(c3.getChange().change()); - } - - @Test - public void unStage_MergeConflict_While_Building() throws Exception { - RevCommit initialHead = getRemoteHead(); - PushOneCommit.Result c1 = pushCommit("master", "commitmsg1", "file1", "content1"); - testRepo.reset(initialHead); - PushOneCommit.Result c2 = pushCommit("master", "commitmsg2", "file2", "content2"); - testRepo.reset(initialHead); - PushOneCommit.Result c3 = pushCommit("master", "commitmsg3", "thesamefile", "content3"); - // c4 depends on c3 - PushOneCommit.Result c4 = pushCommit("master", "commitmsg4", "thesamefile", "conflict content3"); - approve(c1.getChangeId()); - approve(c2.getChangeId()); - approve(c3.getChangeId()); - approve(c4.getChangeId()); - - QtStage(c1); - QtNewBuild("master", "master-build-500"); - RevCommit stagingExpected = getRemoteHead(project, R_STAGING + "master"); - - QtStage(c2); - QtStage(c3); - QtStage(c4); - - QtUnStage(c3); - assertStatusIntegrating(c1.getChange().change()); - assertStatusNew(c2.getChange().change()); - assertStatusNew(c3.getChange().change()); - assertStatusNew(c4.getChange().change()); - - RevCommit stagingHeadMaster = getRemoteHead(project, R_STAGING + "master"); - assertThat(stagingHeadMaster.getId()).isEqualTo(stagingExpected.getId()); - } - + @Before + public void SetDefaultPermissions() throws Exception { + createBranch(BranchNameKey.create(project, "5.12")); + + projectOperations.project(project).forUpdate().add(TestProjectUpdate.allow(Permission.QT_STAGE).ref("refs/heads/master").group(REGISTERED_USERS)).update(); + projectOperations.project(project).forUpdate().add(TestProjectUpdate.allow(Permission.QT_STAGE).ref("refs/heads/5.12").group(REGISTERED_USERS)).update(); + projectOperations.project(project).forUpdate().add(TestProjectUpdate.allow(Permission.PUSH).ref("refs/staging/*").group(adminGroupUuid())).update(); + projectOperations.project(project).forUpdate().add(TestProjectUpdate.allow(Permission.CREATE).ref("refs/builds/*").group(adminGroupUuid())).update(); + } + + @Test + public void pingSSHTest() throws Exception { + assertThat(adminSshSession.exec("gerrit-plugin-qt-workflow ping")).contains("Pong"); + assertThat(adminSshSession.getError()).isNull(); + } + + @Test + public void emptyChange_Stage_Integrating_Merged() throws Exception { + RevCommit initialHead = getRemoteHead(); + PushOneCommit.Result c = pushCommit("master", "1st commit", "afile", ""); + approve(c.getChangeId()); + QtStage(c); + + // no changes in this commit + c = pushCommit("master", "no content", "afile", ""); + approve(c.getChangeId()); + QtStage(c); + assertStatusStaged(c.getChange().change()); + RevCommit stagingHead = getRemoteHead(project, "refs/staging/master"); + + QtNewBuild("master", "master-build-000"); + assertStatusIntegrating(c.getChange().change()); + + QtApproveBuild("master", "master-build-000"); + assertStatusMerged(c.getChange().change()); + + String gitLog = getRemoteLog("refs/staging/master").toString(); + assertThat(gitLog).contains(stagingHead.getId().name()); + } + + @Test + public void mergeCommit_Stage_Integrating_Merged() throws Exception { + RevCommit initialHead = getRemoteHead(); + + // make changes on feature branch + PushOneCommit.Result f1 = pushCommit("5.12", "commitmsg1", "file1", "content1"); + approve(f1.getChangeId()); + gApi.changes().id(f1.getChangeId()).current().submit(); + PushOneCommit.Result f2 = pushCommit("5.12", "commitmsg2", "file2", "content2"); + approve(f2.getChangeId()); + gApi.changes().id(f2.getChangeId()).current().submit(); + + // make a change on master branch + testRepo.reset(initialHead); + PushOneCommit.Result c1 = pushCommit("master", "commitmsg3", "file3", "content3"); + approve(c1.getChangeId()); + gApi.changes().id(c1.getChangeId()).current().submit(); + + // merge feature branch into master + PushOneCommit mm = pushFactory.create(admin.newIdent(), testRepo); + mm.setParents(ImmutableList.of(c1.getCommit(), f2.getCommit())); + PushOneCommit.Result m = mm.to("refs/for/master"); + m.assertOkStatus(); + approve(m.getChangeId()); + QtStage(m); + assertStatusStaged(m.getChange().change()); + + QtNewBuild("master", "master-build-001"); + assertStatusIntegrating(m.getChange().change()); + + QtApproveBuild("master", "master-build-001"); + assertStatusMerged(m.getChange().change()); + + // check that all commits are in staging ref + String gitLog = getRemoteLog("refs/heads/master").toString(); + assertThat(gitLog).contains(initialHead.getId().name()); + assertThat(gitLog).contains(c1.getCommit().getId().name()); + assertThat(gitLog).contains(f1.getCommit().getId().name()); + assertThat(gitLog).contains(f2.getCommit().getId().name()); + assertThat(gitLog).contains(m.getCommit().getId().name()); + } + + @Test + public void multiBranch_New_Staged_Integrating_Merged() throws Exception { + // Push 3 independent commits + RevCommit initialHead = getRemoteHead(); + PushOneCommit.Result c1 = pushCommit("master", "commitmsg1", "file1", "content1"); + testRepo.reset(initialHead); + PushOneCommit.Result c2 = pushCommit("5.12", "commitmsg2", "file2", "content2"); + testRepo.reset(initialHead); + PushOneCommit.Result c3 = pushCommit("master", "commitmsg3", "file3", "content3"); + approve(c1.getChangeId()); + approve(c2.getChangeId()); + approve(c3.getChangeId()); + + QtStage(c1); + QtStage(c2); + QtStage(c3); + + QtNewBuild("master", "master-build-100"); + assertStatusIntegrating(c1.getChange().change()); + assertStatusStaged(c2.getChange().change()); + + QtNewBuild("5.12", "5.12-build-100"); + QtApproveBuild("5.12", "5.12-build-100"); + assertStatusIntegrating(c1.getChange().change()); + assertStatusIntegrating(c3.getChange().change()); + + QtApproveBuild("master", "master-build-100"); + RevCommit branchHeadMaster = getRemoteHead(project, R_HEADS + "master"); + RevCommit branchHead_5_12 = getRemoteHead(project, R_HEADS + "5.12"); + assertThat(branchHeadMaster.getId()).isNotEqualTo(branchHead_5_12.getId()); + } + + @Test + public void multiBranch_New_Staged_Integrating_Failed() throws Exception { + // Push 3 independent commits + RevCommit initialHead = getRemoteHead(); + PushOneCommit.Result c1 = pushCommit("5.12", "commitmsg1", "file1", "content1"); + testRepo.reset(initialHead); + PushOneCommit.Result c2 = pushCommit("5.12", "commitmsg2", "file2", "content2"); + testRepo.reset(initialHead); + PushOneCommit.Result c3 = pushCommit("master", "commitmsg3", "file3", "content3"); + approve(c1.getChangeId()); + approve(c2.getChangeId()); + approve(c3.getChangeId()); + + QtStage(c1); + QtStage(c2); + QtStage(c3); + + QtNewBuild("5.12", "5.12-build-101"); + assertStatusIntegrating(c1.getChange().change()); + assertStatusStaged(c3.getChange().change()); + + QtNewBuild("master", "master-build-101"); + QtFailBuild("master", "master-build-101"); + assertStatusIntegrating(c1.getChange().change()); + assertStatusIntegrating(c2.getChange().change()); + + QtFailBuild("5.12", "5.12-build-101"); + RevCommit branchHeadMaster = getRemoteHead(project, R_HEADS + "master"); + RevCommit branchHead_5_12 = getRemoteHead(project, R_HEADS + "5.12"); + assertThat(branchHeadMaster.getId()).isEqualTo(branchHead_5_12.getId()); + } + + @Test + public void multiBranch_UnStage() throws Exception { + // Push 2 independent commits + RevCommit initialHead = getRemoteHead(); + PushOneCommit.Result c1 = pushCommit("master", "commitmsg1", "file1", "content1"); + testRepo.reset(initialHead); + PushOneCommit.Result c2 = pushCommit("5.12", "commitmsg2", "file2", "content2"); + approve(c1.getChangeId()); + approve(c2.getChangeId()); + + QtStage(c1); + QtStage(c2); + + QtUnStage(c1); + assertStatusStaged(c2.getChange().change()); + + QtUnStage(c2); + RevCommit stagingHeadMaster = getRemoteHead(project, R_STAGING + "master"); + RevCommit stagingHead_5_12 = getRemoteHead(project, R_STAGING + "5.12"); + assertThat(stagingHeadMaster.getId()).isEqualTo(stagingHead_5_12.getId()); + } + + @Test + public void newStageWhileBuilding_Pass_Pass() throws Exception { + RevCommit initialHead = getRemoteHead(); + PushOneCommit.Result c1 = pushCommit("master", "commitmsg1", "file1", "content1"); + testRepo.reset(initialHead); + PushOneCommit.Result c2 = pushCommit("master", "commitmsg2", "file2", "content2"); + approve(c1.getChangeId()); + approve(c2.getChangeId()); + + QtStage(c1); + assertStatusNew(c2.getChange().change()); + + QtNewBuild("master", "master-build-401"); + RevCommit build1Head = getRemoteHead(project, R_BUILDS + "master-build-401"); + assertStatusNew(c2.getChange().change()); + + QtStage(c2); + QtApproveBuild("master", "master-build-401"); + assertStatusStaged(c2.getChange().change()); + + QtNewBuild("master", "master-build-402"); + RevCommit build2Head = getRemoteHead(project, R_BUILDS + "master-build-402"); + QtApproveBuild("master", "master-build-402"); + + String gitLog = getRemoteLog("refs/heads/master").toString(); + assertThat(gitLog).contains(build1Head.getId().name()); + assertThat(gitLog).contains(build2Head.getId().name()); + + RevCommit updatedHead = getRemoteHead(); + assertThat(updatedHead.getShortMessage()).isEqualTo(c2.getCommit().getShortMessage()); + } + + @Test + public void newStageWhileBuilding_Pass_Fail() throws Exception { + RevCommit initialHead = getRemoteHead(); + PushOneCommit.Result c1 = pushCommit("master", "commitmsg1", "file1", "content1"); + testRepo.reset(initialHead); + PushOneCommit.Result c2 = pushCommit("master", "commitmsg2", "file2", "content2"); + approve(c1.getChangeId()); + approve(c2.getChangeId()); + + QtStage(c1); + assertStatusNew(c2.getChange().change()); + + QtNewBuild("master", "master-build-401"); + RevCommit build1Head = getRemoteHead(project, R_BUILDS + "master-build-401"); + assertStatusNew(c2.getChange().change()); + + QtStage(c2); + QtApproveBuild("master", "master-build-401"); + assertStatusStaged(c2.getChange().change()); + + QtNewBuild("master", "master-build-402"); + RevCommit build2Head = getRemoteHead(project, R_BUILDS + "master-build-402"); + QtFailBuild("master", "master-build-402"); + + String gitLog = getRemoteLog("refs/heads/master").toString(); + assertThat(gitLog).contains(build1Head.getId().name()); + assertThat(gitLog).doesNotContain(build2Head.getId().name()); + + RevCommit updatedHead = getRemoteHead(); + assertThat(updatedHead.getShortMessage()).isEqualTo(c1.getCommit().getShortMessage()); + } + + @Test + public void newStageWhileBuilding_Fail_Pass() throws Exception { + RevCommit initialHead = getRemoteHead(); + PushOneCommit.Result c1 = pushCommit("master", "commitmsg1", "file1", "content1"); + testRepo.reset(initialHead); + PushOneCommit.Result c2 = pushCommit("master", "commitmsg2", "file2", "content2"); + approve(c1.getChangeId()); + approve(c2.getChangeId()); + + QtStage(c1); + assertStatusNew(c2.getChange().change()); + + QtNewBuild("master", "master-build-401"); + RevCommit build1Head = getRemoteHead(project, R_BUILDS + "master-build-401"); + assertStatusNew(c2.getChange().change()); + + QtStage(c2); + QtFailBuild("master", "master-build-401"); + assertStatusStaged(c2.getChange().change()); + + QtNewBuild("master", "master-build-402"); + RevCommit build2Head = getRemoteHead(project, R_BUILDS + "master-build-402"); + QtApproveBuild("master", "master-build-402"); + assertStatusNew(c1.getChange().change()); + ; + + String gitLog = getRemoteLog("refs/heads/master").toString(); + assertThat(gitLog).doesNotContain(build1Head.getId().name()); + assertThat(gitLog).contains(build2Head.getId().name()); + + RevCommit updatedHead = getRemoteHead(); + assertThat(updatedHead.getShortMessage()).isEqualTo(c2.getCommit().getShortMessage()); + } + + @Test + public void newStageWhileBuilding_Fail_Fail() throws Exception { + RevCommit initialHead = getRemoteHead(); + PushOneCommit.Result c1 = pushCommit("master", "commitmsg1", "file1", "content1"); + testRepo.reset(initialHead); + PushOneCommit.Result c2 = pushCommit("master", "commitmsg2", "file2", "content2"); + approve(c1.getChangeId()); + approve(c2.getChangeId()); + + QtStage(c1); + assertStatusNew(c2.getChange().change()); + + QtNewBuild("master", "master-build-401"); + assertStatusNew(c2.getChange().change()); + + QtStage(c2); + QtFailBuild("master", "master-build-401"); + assertStatusStaged(c2.getChange().change()); + + QtNewBuild("master", "master-build-402"); + QtFailBuild("master", "master-build-402"); + + RevCommit updatedHead = getRemoteHead(); + assertThat(updatedHead).isEqualTo(initialHead); + } + + @Test + public void unStageWhileBuilding() throws Exception { + RevCommit initialHead = getRemoteHead(); + PushOneCommit.Result c1 = pushCommit("master", "commitmsg1", "file1", "content1"); + approve(c1.getChangeId()); + QtStage(c1); + QtNewBuild("master", "master-build-402"); + + PushOneCommit.Result c2 = pushCommit("master", "commitmsg2", "file2", "content2"); + approve(c2.getChangeId()); + QtStage(c2); + RevCommit stagingExpected = getRemoteHead(project, R_STAGING + "master"); + + PushOneCommit.Result c3 = pushCommit("master", "commitmsg3", "file3", "content3"); + approve(c3.getChangeId()); + QtStage(c3); + + QtUnStage(c3); + RevCommit stagingHead = getRemoteHead(project, R_STAGING + "master"); + assertThat(stagingHead).isEqualTo(stagingExpected); + + assertStatusIntegrating(c1.getChange().change()); + assertStatusStaged(c2.getChange().change()); + assertStatusNew(c3.getChange().change()); + } + + @Test + public void unStage_MergeConflict_While_Building() throws Exception { + RevCommit initialHead = getRemoteHead(); + PushOneCommit.Result c1 = pushCommit("master", "commitmsg1", "file1", "content1"); + testRepo.reset(initialHead); + PushOneCommit.Result c2 = pushCommit("master", "commitmsg2", "file2", "content2"); + testRepo.reset(initialHead); + PushOneCommit.Result c3 = pushCommit("master", "commitmsg3", "thesamefile", "content3"); + // c4 depends on c3 + PushOneCommit.Result c4 = + pushCommit("master", "commitmsg4", "thesamefile", "conflict content3"); + approve(c1.getChangeId()); + approve(c2.getChangeId()); + approve(c3.getChangeId()); + approve(c4.getChangeId()); + + QtStage(c1); + QtNewBuild("master", "master-build-500"); + RevCommit stagingExpected = getRemoteHead(project, R_STAGING + "master"); + + QtStage(c2); + QtStage(c3); + QtStage(c4); + + QtUnStage(c3); + assertStatusIntegrating(c1.getChange().change()); + assertStatusNew(c2.getChange().change()); + assertStatusNew(c3.getChange().change()); + assertStatusNew(c4.getChange().change()); + + RevCommit stagingHeadMaster = getRemoteHead(project, R_STAGING + "master"); + assertThat(stagingHeadMaster.getId()).isEqualTo(stagingExpected.getId()); + } } diff --git a/src/test/java/com/googlesource/gerrit/plugins/qtcodereview/QtDeferIT.java b/src/test/java/com/googlesource/gerrit/plugins/qtcodereview/QtDeferIT.java index b2b46b8..d3d1239 100644 --- a/src/test/java/com/googlesource/gerrit/plugins/qtcodereview/QtDeferIT.java +++ b/src/test/java/com/googlesource/gerrit/plugins/qtcodereview/QtDeferIT.java @@ -1,124 +1,111 @@ -// Copyright (C) 2018 The Qt Company +// Copyright (C) 2018-21 The Qt Company package com.googlesource.gerrit.plugins.qtcodereview; -import static com.google.gerrit.server.group.SystemGroupBackend.REGISTERED_USERS; - import static com.google.common.truth.Truth.assertThat; +import static com.google.gerrit.server.group.SystemGroupBackend.REGISTERED_USERS; -import com.google.gerrit.acceptance.LightweightPluginDaemonTest; import com.google.gerrit.acceptance.PushOneCommit; import com.google.gerrit.acceptance.RestResponse; import com.google.gerrit.acceptance.TestPlugin; import com.google.gerrit.acceptance.UseSsh; - -import com.google.gerrit.common.data.Permission; +import com.google.gerrit.acceptance.testsuite.project.TestProjectUpdate; +import com.google.gerrit.entities.Permission; import com.google.gerrit.extensions.api.changes.AbandonInput; -import com.google.gerrit.reviewdb.client.Change; - +import com.google.gerrit.entities.Change; +import org.apache.http.HttpStatus; import org.eclipse.jgit.revwalk.RevCommit; - import org.junit.Before; import org.junit.Test; -import org.apache.http.HttpStatus; - @TestPlugin( name = "gerrit-plugin-qt-workflow", sysModule = "com.googlesource.gerrit.plugins.qtcodereview.QtModule", - sshModule = "com.googlesource.gerrit.plugins.qtcodereview.QtSshModule" -) - + sshModule = "com.googlesource.gerrit.plugins.qtcodereview.QtSshModule") @UseSsh public class QtDeferIT extends QtCodeReviewIT { - @Before - public void SetDefaultPermissions() throws Exception { - grant(project, "refs/heads/master", Permission.ABANDON, false, REGISTERED_USERS); - } - - @Test - public void singleChange_Defer() throws Exception { - RevCommit initialHead = getRemoteHead(); - PushOneCommit.Result c = pushCommit("master", "commitmsg1","file1", "content1"); - - RevCommit updatedHead = qtDefer(c, initialHead); - } - - @Test - public void singleChange_Defer_With_Input_Message() throws Exception { - PushOneCommit.Result c = pushCommit("master", "commitmsg1","file1", "content1"); - approve(c.getChangeId()); - String changeId = c.getChangeId(); - - AbandonInput abandonInput = new AbandonInput(); - abandonInput.message = "myabandonednote"; + @Before + public void SetDefaultPermissions() throws Exception { + projectOperations.project(project).forUpdate().add(TestProjectUpdate.allow(Permission.ABANDON).ref("refs/heads/master").group(REGISTERED_USERS)).update(); + } - String url = "/changes/"+changeId+"/gerrit-plugin-qt-workflow~defer"; - RestResponse response = userRestSession.post(url, abandonInput); - response.assertOK(); - Change change = c.getChange().change(); - assertThat(change.getStatus()).isEqualTo(Change.Status.DEFERRED); - } + @Test + public void singleChange_Defer() throws Exception { + RevCommit initialHead = getRemoteHead(); + PushOneCommit.Result c = pushCommit("master", "commitmsg1", "file1", "content1"); - @Test - public void errorDefer_No_Permission() throws Exception { - deny(project, "refs/heads/master", Permission.ABANDON, REGISTERED_USERS); + RevCommit updatedHead = qtDefer(c, initialHead); + } - PushOneCommit.Result c = pushCommit("master", "commitmsg1", "file1", "content1"); - RestResponse response = qtDeferExpectFail(c, HttpStatus.SC_FORBIDDEN); - assertThat(response.getEntityContent()).isEqualTo("abandon not permitted"); + @Test + public void singleChange_Defer_With_Input_Message() throws Exception { + PushOneCommit.Result c = pushCommit("master", "commitmsg1", "file1", "content1"); + approve(c.getChangeId()); + String changeId = c.getChangeId(); - grant(project, "refs/heads/master", Permission.ABANDON, false, REGISTERED_USERS); - } + AbandonInput abandonInput = new AbandonInput(); + abandonInput.message = "myabandonednote"; - @Test - public void errorDefer_Wrong_Status() throws Exception { - RevCommit initialHead = getRemoteHead(); - PushOneCommit.Result c = pushCommit("master", "commitmsg1", "file1", "content1"); - merge(c); + String url = "/changes/" + changeId + "/gerrit-plugin-qt-workflow~defer"; + RestResponse response = userRestSession.post(url, abandonInput); + response.assertOK(); + Change change = c.getChange().change(); + assertThat(change.getStatus()).isEqualTo(Change.Status.DEFERRED); + } - RestResponse response = qtDeferExpectFail(c, HttpStatus.SC_CONFLICT); - assertThat(response.getEntityContent()).isEqualTo("change is merged"); - } + @Test + public void errorDefer_No_Permission() throws Exception { + projectOperations.project(project).forUpdate().add(TestProjectUpdate.deny(Permission.ABANDON).ref("refs/heads/master").group(REGISTERED_USERS)).update(); + PushOneCommit.Result c = pushCommit("master", "commitmsg1", "file1", "content1"); + RestResponse response = qtDeferExpectFail(c, HttpStatus.SC_FORBIDDEN); + assertThat(response.getEntityContent()).isEqualTo("abandon not permitted"); - private RevCommit qtDefer(PushOneCommit.Result c, - RevCommit initialHead) - throws Exception { - String masterRef = R_HEADS + "master"; - String stagingRef = R_STAGING + "master"; + projectOperations.project(project).forUpdate().add(TestProjectUpdate.allow(Permission.ABANDON).ref("refs/heads/master").group(REGISTERED_USERS)).update(); + } - RestResponse response = call_REST_API_Defer(c.getChangeId()); - response.assertOK(); + @Test + public void errorDefer_Wrong_Status() throws Exception { + RevCommit initialHead = getRemoteHead(); + PushOneCommit.Result c = pushCommit("master", "commitmsg1", "file1", "content1"); + merge(c); - RevCommit masterHead = getRemoteHead(project, masterRef); - assertThat(masterHead.getId()).isEqualTo(initialHead.getId()); // master is not updated + RestResponse response = qtDeferExpectFail(c, HttpStatus.SC_CONFLICT); + assertThat(response.getEntityContent()).isEqualTo("change is merged"); + } - RevCommit stagingHead = getRemoteHead(project, stagingRef); - if (stagingHead != null) assertThat(stagingHead.getId()).isEqualTo(initialHead.getId()); // staging is not updated + private RevCommit qtDefer(PushOneCommit.Result c, RevCommit initialHead) throws Exception { + String masterRef = R_HEADS + "master"; + String stagingRef = R_STAGING + "master"; - assertRefUpdatedEvents(masterRef); // no events - assertRefUpdatedEvents(stagingRef); // no events + RestResponse response = call_REST_API_Defer(c.getChangeId()); + response.assertOK(); - Change change = c.getChange().change(); - assertThat(change.getStatus()).isEqualTo(Change.Status.DEFERRED); + RevCommit masterHead = getRemoteHead(project, masterRef); + assertThat(masterHead.getId()).isEqualTo(initialHead.getId()); // master is not updated - return masterHead; - } + RevCommit stagingHead = getRemoteRefHead(project, stagingRef); + if (stagingHead != null) + assertThat(stagingHead.getId()).isEqualTo(initialHead.getId()); // staging is not updated - private RestResponse qtDeferExpectFail(PushOneCommit.Result c, - int expectedStatus) - throws Exception { - RestResponse response = call_REST_API_Defer(c.getChangeId()); - response.assertStatus(expectedStatus); + assertRefUpdatedEvents(masterRef); // no events + assertRefUpdatedEvents(stagingRef); // no events - Change change = c.getChange().change(); - assertThat(change.getStatus()).isNotEqualTo(Change.Status.DEFERRED); + Change change = c.getChange().change(); + assertThat(change.getStatus()).isEqualTo(Change.Status.DEFERRED); - return response; - } + return masterHead; + } + private RestResponse qtDeferExpectFail(PushOneCommit.Result c, int expectedStatus) + throws Exception { + RestResponse response = call_REST_API_Defer(c.getChangeId()); + response.assertStatus(expectedStatus); + Change change = c.getChange().change(); + assertThat(change.getStatus()).isNotEqualTo(Change.Status.DEFERRED); + return response; + } } diff --git a/src/test/java/com/googlesource/gerrit/plugins/qtcodereview/QtEmailSendingIT.java b/src/test/java/com/googlesource/gerrit/plugins/qtcodereview/QtEmailSendingIT.java index 2c6ac1b..0a460dd 100644 --- a/src/test/java/com/googlesource/gerrit/plugins/qtcodereview/QtEmailSendingIT.java +++ b/src/test/java/com/googlesource/gerrit/plugins/qtcodereview/QtEmailSendingIT.java @@ -1,22 +1,21 @@ // -// Copyright (C) 2019 The Qt Company +// Copyright (C) 2019-22 The Qt Company // package com.googlesource.gerrit.plugins.qtcodereview; import static com.google.common.truth.Truth.assertThat; +import static com.google.gerrit.acceptance.testsuite.project.TestProjectUpdate.allowLabel; import static com.google.gerrit.server.group.SystemGroupBackend.REGISTERED_USERS; import com.google.gerrit.acceptance.PushOneCommit; import com.google.gerrit.acceptance.RestResponse; import com.google.gerrit.acceptance.TestPlugin; import com.google.gerrit.acceptance.UseSsh; -import com.google.gerrit.common.data.Permission; -import com.google.gerrit.mail.Address; -import com.google.gerrit.mail.EmailHeader; -import com.google.gerrit.reviewdb.client.Change; -import com.google.gerrit.server.project.ProjectConfig; -import com.google.gerrit.server.project.testing.Util; +import com.google.gerrit.acceptance.testsuite.project.TestProjectUpdate; +import com.google.gerrit.entities.Address; +import com.google.gerrit.entities.EmailHeader; +import com.google.gerrit.entities.Permission; import com.google.gerrit.testing.FakeEmailSender; import org.junit.Before; import org.junit.Test; @@ -24,102 +23,102 @@ @TestPlugin( name = "gerrit-plugin-qt-workflow", sysModule = "com.googlesource.gerrit.plugins.qtcodereview.QtModule", - sshModule = "com.googlesource.gerrit.plugins.qtcodereview.QtSshModule" -) - + sshModule = "com.googlesource.gerrit.plugins.qtcodereview.QtSshModule") @UseSsh public class QtEmailSendingIT extends QtCodeReviewIT { - @Before - public void grantPermissions() throws Exception { - grant(project, "refs/heads/master", Permission.QT_STAGE, false, REGISTERED_USERS); - grant(project, "refs/staging/*", Permission.PUSH, false, adminGroupUuid()); - grant(project, "refs/builds/*", Permission.CREATE, false, adminGroupUuid()); - - ProjectConfig cfg = projectCache.get(project).getConfig(); - Util.allow(cfg, Permission.forLabel("Code-Review"), -2, +2, REGISTERED_USERS, "refs/*"); - } - - @Test - public void stagedByOwnerBuildPass() throws Exception { - PushOneCommit.Result c = pushCommit("master", "commitmsg1", "file1", "content1"); - approve(c.getChangeId()); - QtStage(c); - QtNewBuild("master", "test_build_01"); - sender.clear(); - QtApproveBuild("master", "test_build_01"); - - FakeEmailSender.Message m = sender.getMessages(c.getChangeId(), "merged").get(0); - Address expectedTo = new Address(user.fullName, user.email); - assertThat(m.rcpt()).containsExactly(expectedTo); - assertThat(((EmailHeader.AddressList) m.headers().get("To")).getAddressList()) - .containsExactly(expectedTo); - assertThat(m.body()).contains(c.getChangeId()); - } - - @Test - public void stagedByOwnerBuildFail() throws Exception { - PushOneCommit.Result c = pushCommit("master", "commitmsg1", "file1", "content1"); - approve(c.getChangeId()); - QtStage(c); - QtNewBuild("master", "test_build_02"); - sender.clear(); - QtFailBuild("master", "test_build_02"); - - FakeEmailSender.Message m = sender.getMessages(c.getChangeId(), "comment").get(0); - Address expectedTo = new Address(user.fullName, user.email); - assertThat(m.rcpt()).containsExactly(expectedTo); - assertThat(((EmailHeader.AddressList) m.headers().get("To")).getAddressList()) - .containsExactly(expectedTo); - assertThat(m.body()).contains(c.getChangeId()); - assertThat(m.body()).contains(BUILD_FAIL_MESSAGE); - } - - @Test - public void stagedByOtherBuildPass() throws Exception { - PushOneCommit.Result c = pushCommit("master", "commitmsg1", "file1", "content1"); - approve(c.getChangeId()); - QtStageByAdmin(c); - QtNewBuild("master", "test_build_03"); - sender.clear(); - QtApproveBuild("master", "test_build_03"); - - FakeEmailSender.Message m = sender.getMessages(c.getChangeId(), "merged").get(0); - Address expectedTo = new Address(user.fullName, user.email); - assertThat(m.rcpt()).containsExactly(expectedTo); - assertThat(((EmailHeader.AddressList) m.headers().get("To")).getAddressList()) - .containsExactly(expectedTo); - assertThat(m.body()).contains(c.getChangeId()); - } - - @Test - public void stagedByOtherBuildFail() throws Exception { - PushOneCommit.Result c = pushCommit("master", "commitmsg1", "file1", "content1"); - approve(c.getChangeId()); - QtStageByAdmin(c); - QtNewBuild("master", "test_build_04"); - sender.clear(); - QtFailBuild("master", "test_build_04"); - - FakeEmailSender.Message m = sender.getMessages(c.getChangeId(), "comment").get(0); - Address expectedTo = new Address(user.fullName, user.email); - assertThat(m.rcpt()).containsExactly(expectedTo); - assertThat(((EmailHeader.AddressList) m.headers().get("To")).getAddressList()) - .containsExactly(expectedTo); - assertThat(m.body()).contains(c.getChangeId()); - assertThat(m.body()).contains(BUILD_FAIL_MESSAGE); - } - - private void QtStageByAdmin(PushOneCommit.Result c) throws Exception { - RestResponse response = call_REST_API_Stage_By_Admin(c.getChangeId(), c.getCommit().getName()); - response.assertOK(); - assertStatusStaged(c.getChange().change()); - } - - private RestResponse call_REST_API_Stage_By_Admin(String changeId, String revisionId) throws Exception { - String url = "/changes/" + changeId + "/revisions/" + revisionId + "/gerrit-plugin-qt-workflow~stage"; - RestResponse response = adminRestSession.post(url); - return response; - } - + @Before + public void grantPermissions() throws Exception { + projectOperations.project(project).forUpdate().add(TestProjectUpdate.allow(Permission.QT_STAGE).ref("refs/heads/master").group(REGISTERED_USERS)).update(); + projectOperations.project(project).forUpdate().add(TestProjectUpdate.allow(Permission.PUSH).ref("refs/staging/*").group(adminGroupUuid())).update(); + projectOperations.project(project).forUpdate().add(TestProjectUpdate.allow(Permission.CREATE).ref("refs/builds/*").group(adminGroupUuid())).update(); + + projectOperations.project(project).forUpdate() + .add(allowLabel("Sanity-Review").ref("refs/*").group(REGISTERED_USERS).range(-2, 2)) + .update(); + } + + @Test + public void stagedByOwnerBuildPass() throws Exception { + PushOneCommit.Result c = pushCommit("master", "commitmsg1", "file1", "content1"); + approve(c.getChangeId()); + QtStage(c); + QtNewBuild("master", "test_build_01"); + sender.clear(); + QtApproveBuild("master", "test_build_01"); + + FakeEmailSender.Message m = sender.getMessages(c.getChangeId(), "merged").get(0); + Address expectedTo = Address.create(user.fullName(), user.email()); + assertThat(m.rcpt()).containsExactly(expectedTo); + assertThat(((EmailHeader.AddressList) m.headers().get("To")).getAddressList()) + .containsExactly(expectedTo); + assertThat(m.body()).contains(c.getChangeId()); + } + + @Test + public void stagedByOwnerBuildFail() throws Exception { + PushOneCommit.Result c = pushCommit("master", "commitmsg1", "file1", "content1"); + approve(c.getChangeId()); + QtStage(c); + QtNewBuild("master", "test_build_02"); + sender.clear(); + QtFailBuild("master", "test_build_02"); + + FakeEmailSender.Message m = sender.getMessages(c.getChangeId(), "qtbuildfailed").get(0); + Address expectedTo = Address.create(user.fullName(), user.email()); + assertThat(m.rcpt()).containsExactly(expectedTo); + assertThat(((EmailHeader.AddressList) m.headers().get("To")).getAddressList()) + .containsExactly(expectedTo); + assertThat(m.body()).contains(c.getChangeId()); + assertThat(m.body()).contains(BUILD_FAIL_MESSAGE); + } + + @Test + public void stagedByOtherBuildPass() throws Exception { + PushOneCommit.Result c = pushCommit("master", "commitmsg1", "file1", "content1"); + approve(c.getChangeId()); + QtStageByAdmin(c); + QtNewBuild("master", "test_build_03"); + sender.clear(); + QtApproveBuild("master", "test_build_03"); + + FakeEmailSender.Message m = sender.getMessages(c.getChangeId(), "merged").get(0); + Address expectedTo = Address.create(user.fullName(), user.email()); + assertThat(m.rcpt()).containsExactly(expectedTo); + assertThat(((EmailHeader.AddressList) m.headers().get("To")).getAddressList()) + .containsExactly(expectedTo); + assertThat(m.body()).contains(c.getChangeId()); + } + + @Test + public void stagedByOtherBuildFail() throws Exception { + PushOneCommit.Result c = pushCommit("master", "commitmsg1", "file1", "content1"); + approve(c.getChangeId()); + QtStageByAdmin(c); + QtNewBuild("master", "test_build_04"); + sender.clear(); + QtFailBuild("master", "test_build_04"); + + FakeEmailSender.Message m = sender.getMessages(c.getChangeId(), "qtbuildfailed").get(0); + Address expectedTo = Address.create(user.fullName(), user.email()); + assertThat(m.rcpt()).containsExactly(expectedTo); + assertThat(((EmailHeader.AddressList) m.headers().get("To")).getAddressList()) + .containsExactly(expectedTo); + assertThat(m.body()).contains(c.getChangeId()); + assertThat(m.body()).contains(BUILD_FAIL_MESSAGE); + } + + private void QtStageByAdmin(PushOneCommit.Result c) throws Exception { + RestResponse response = call_REST_API_Stage_By_Admin(c.getChangeId(), c.getCommit().getName()); + response.assertOK(); + assertStatusStaged(c.getChange().change()); + } + + private RestResponse call_REST_API_Stage_By_Admin(String changeId, String revisionId) + throws Exception { + String url = + "/changes/" + changeId + "/revisions/" + revisionId + "/gerrit-plugin-qt-workflow~stage"; + RestResponse response = adminRestSession.post(url); + return response; + } } diff --git a/src/test/java/com/googlesource/gerrit/plugins/qtcodereview/QtPreCheckIT.java b/src/test/java/com/googlesource/gerrit/plugins/qtcodereview/QtPreCheckIT.java new file mode 100644 index 0000000..2f3784b --- /dev/null +++ b/src/test/java/com/googlesource/gerrit/plugins/qtcodereview/QtPreCheckIT.java @@ -0,0 +1,123 @@ +// Copyright (C) 2021-22 The Qt Company + +package com.googlesource.gerrit.plugins.qtcodereview; + +import static com.google.gerrit.server.group.SystemGroupBackend.REGISTERED_USERS; +import static com.google.gerrit.acceptance.testsuite.project.TestProjectUpdate.allowLabel; + +import com.google.gerrit.acceptance.config.GlobalPluginConfig; +import com.google.gerrit.acceptance.PushOneCommit; +import com.google.gerrit.acceptance.RestResponse; +import com.google.gerrit.acceptance.TestPlugin; +import com.google.gerrit.acceptance.UseLocalDisk; +import com.google.gerrit.acceptance.UseSsh; +import com.google.gerrit.entities.AccountGroup; +import com.google.gerrit.extensions.common.InputWithMessage; +import com.googlesource.gerrit.plugins.qtcodereview.QtPrecheckMessage; +import org.apache.http.HttpStatus; +import org.junit.Test; + +@TestPlugin( + name = "gerrit-plugin-qt-workflow", + sysModule = "com.googlesource.gerrit.plugins.qtcodereview.QtModule", + sshModule = "com.googlesource.gerrit.plugins.qtcodereview.QtSshModule") + +@UseSsh +public class QtPreCheckIT extends QtCodeReviewIT { + + static final QtPrecheckMessage inputDefault = new QtPrecheckMessage(false, "default", ""); + static final QtPrecheckMessage inputFull = new QtPrecheckMessage(true ,"full", ""); + static final QtPrecheckMessage inputCustom = new QtPrecheckMessage(false, "custom", "os:linux and arch: arm64"); + + @Test + public void preCheck_Ok() throws Exception { + PushOneCommit.Result c = pushCommit("master", "commitmsg1", "file1", "content1"); + + AccountGroup.UUID registered = systemGroupBackend.getGroup(REGISTERED_USERS).getUUID(); + projectOperations.project(project).forUpdate() + .add(allowLabel("Code-Review").ref("refs/heads/*").group(registered).range(-2, 2)) + .update(); + + RestResponse response = call_REST_API_PreCheck(c.getChangeId(), c.getCommit().getName()); + response.assertOK(); + } + + @Test + @UseLocalDisk + @GlobalPluginConfig(pluginName = "gerrit-plugin-qt-workflow", name = "precheck.disabled.projects", + values = {"qt/qt5", "qt/test-qt5"}) + public void errorPreCheck_OK_Allowed() throws Exception { + PushOneCommit.Result c = pushCommit("master", "commitmsg1", "file1", "content1"); + + AccountGroup.UUID registered = systemGroupBackend.getGroup(REGISTERED_USERS).getUUID(); + projectOperations.project(project).forUpdate() + .add(allowLabel("Code-Review").ref("refs/heads/*").group(registered).range(-2, 2)) + .update(); + + RestResponse response = call_REST_API_PreCheck(c.getChangeId(), c.getCommit().getName()); + response.assertOK(); + } + + @Test + @UseLocalDisk + @GlobalPluginConfig(pluginName = "gerrit-plugin-qt-workflow", name = "precheck.disabled.projects", + values = { + "qt/qt5", + "com.googlesource.gerrit.plugins.qtcodereview.QtPreCheckIT_errorPreCheck_Not_Allowed_project" + }) + public void errorPreCheck_Not_Allowed() throws Exception { + PushOneCommit.Result c = pushCommit("master", "commitmsg1", "file1", "content1"); + + AccountGroup.UUID registered = systemGroupBackend.getGroup(REGISTERED_USERS).getUUID(); + projectOperations.project(project).forUpdate() + .add(allowLabel("Code-Review").ref("refs/heads/*").group(registered).range(-2, 2)) + .update(); + + RestResponse response = call_REST_API_PreCheck(c.getChangeId(), c.getCommit().getName()); + response.assertStatus(HttpStatus.SC_FORBIDDEN); + } + + @Test + public void errorPreCheck_No_Permission() throws Exception { + PushOneCommit.Result c = pushCommit("master", "commitmsg1", "file1", "content1"); + + AccountGroup.UUID registered = systemGroupBackend.getGroup(REGISTERED_USERS).getUUID(); + projectOperations.project(project).forUpdate() + .add(allowLabel("Code-Review").ref("refs/heads/*").group(registered).range(-1, 1)) + .update(); + + RestResponse response = call_REST_API_PreCheck(c.getChangeId(), c.getCommit().getName()); + response.assertStatus(HttpStatus.SC_FORBIDDEN); + } + + @Test + public void preCheck_Ok_TestInputs() throws Exception { + PushOneCommit.Result c = pushCommit("master", "commitmsg1", "file1", "content1"); + + AccountGroup.UUID registered = systemGroupBackend.getGroup(REGISTERED_USERS).getUUID(); + projectOperations.project(project).forUpdate() + .add(allowLabel("Code-Review").ref("refs/heads/*").group(registered).range(-2, 2)) + .update(); + + RestResponse response; + response = call_REST_API_PreCheck(c.getChangeId(), c.getCommit().getName(), inputFull); + response.assertOK(); + + response = call_REST_API_PreCheck(c.getChangeId(), c.getCommit().getName(), inputCustom); + response.assertOK(); + } + + protected RestResponse call_REST_API_PreCheck(String changeId, String revisionId) + throws Exception { + return call_REST_API_PreCheck(changeId,revisionId, inputDefault); + } + + protected RestResponse call_REST_API_PreCheck(String changeId, String revisionId, QtPrecheckMessage input) + throws Exception { + String url = + "/changes/" + changeId + "/revisions/" + revisionId + "/gerrit-plugin-qt-workflow~precheck"; + RestResponse response = userRestSession.post(url, input); + return response; + } + +} diff --git a/src/test/java/com/googlesource/gerrit/plugins/qtcodereview/QtReOpenIT.java b/src/test/java/com/googlesource/gerrit/plugins/qtcodereview/QtReOpenIT.java index ea6b9a1..39cfec1 100644 --- a/src/test/java/com/googlesource/gerrit/plugins/qtcodereview/QtReOpenIT.java +++ b/src/test/java/com/googlesource/gerrit/plugins/qtcodereview/QtReOpenIT.java @@ -1,121 +1,110 @@ -// Copyright (C) 2019 The Qt Company +// Copyright (C) 2019-21 The Qt Company package com.googlesource.gerrit.plugins.qtcodereview; -import static com.google.gerrit.server.group.SystemGroupBackend.REGISTERED_USERS; - import static com.google.common.truth.Truth.assertThat; +import static com.google.gerrit.server.group.SystemGroupBackend.REGISTERED_USERS; -import com.google.gerrit.acceptance.LightweightPluginDaemonTest; import com.google.gerrit.acceptance.PushOneCommit; import com.google.gerrit.acceptance.RestResponse; import com.google.gerrit.acceptance.TestPlugin; import com.google.gerrit.acceptance.UseSsh; - -import com.google.gerrit.common.data.Permission; +import com.google.gerrit.acceptance.testsuite.project.TestProjectUpdate; +import com.google.gerrit.entities.Permission; import com.google.gerrit.extensions.api.changes.RestoreInput; -import com.google.gerrit.reviewdb.client.Change; - +import org.apache.http.HttpStatus; import org.eclipse.jgit.revwalk.RevCommit; - import org.junit.Before; import org.junit.Test; -import org.apache.http.HttpStatus; - @TestPlugin( name = "gerrit-plugin-qt-workflow", sysModule = "com.googlesource.gerrit.plugins.qtcodereview.QtModule", - sshModule = "com.googlesource.gerrit.plugins.qtcodereview.QtSshModule" -) - + sshModule = "com.googlesource.gerrit.plugins.qtcodereview.QtSshModule") @UseSsh public class QtReOpenIT extends QtCodeReviewIT { - @Before - public void SetDefaultPermissions() throws Exception { - grant(project, "refs/heads/master", Permission.ABANDON, false, REGISTERED_USERS); - } - - @Test - public void singleChange_New_Defer_ReOpen() throws Exception { - RevCommit initialHead = getRemoteHead(); - PushOneCommit.Result c = pushCommit("master", "commitmsg1", "file1", "content1"); - - QtDefer(c); - RevCommit updatedHead = qtReOpen(c, initialHead); - } - - @Test - public void singleChange_Defer_ReOpen_With_Input_Messsage() throws Exception { - PushOneCommit.Result c = pushCommit("master", "commitmsg1", "file1", "content1"); - approve(c.getChangeId()); - String changeId = c.getChangeId(); - - QtDefer(c); - - RestoreInput restoreInput = new RestoreInput(); - restoreInput.message = "myrestorenote"; - - String url = "/changes/" + changeId + "/gerrit-plugin-qt-workflow~reopen"; - RestResponse response = adminRestSession.post(url, restoreInput); - response.assertOK(); - assertStatusNew(c.getChange().change()); - } - - @Test - public void errorReOpen_No_Permission() throws Exception { - PushOneCommit.Result c = pushCommit("master", "commitmsg1", "file1", "content1"); - QtDefer(c); - - deny(project, "refs/heads/master", Permission.ABANDON, REGISTERED_USERS); - RestResponse response = qtReOpenExpectFail(c, HttpStatus.SC_FORBIDDEN); - assertThat(response.getEntityContent()).isEqualTo("restore not permitted"); - grant(project, "refs/heads/master", Permission.ABANDON, false, REGISTERED_USERS); - } - - @Test - public void errorReOpen_Wrong_Status() throws Exception { - PushOneCommit.Result c = pushCommit("master", "commitmsg1", "file1", "content1"); - RestResponse response = qtReOpenExpectFail(c, HttpStatus.SC_CONFLICT); - assertThat(response.getEntityContent()).isEqualTo("change is new"); - } - - private RevCommit qtReOpen(PushOneCommit.Result c, - RevCommit initialHead) - throws Exception { - String masterRef = R_HEADS + "master"; - String stagingRef = R_STAGING + "master"; - - RestResponse response = call_REST_API_ReOpen(c.getChangeId()); - response.assertOK(); - - RevCommit masterHead = getRemoteHead(project, masterRef); - assertThat(masterHead.getId()).isEqualTo(initialHead.getId()); // master is not updated - - RevCommit stagingHead = getRemoteHead(project, stagingRef); - if (stagingHead != null) assertThat(stagingHead.getId()).isEqualTo(initialHead.getId()); // staging is not updated - - assertRefUpdatedEvents(masterRef); // no events - assertRefUpdatedEvents(stagingRef); // no events - - assertStatusNew(c.getChange().change()); - - return masterHead; - } - - private RestResponse qtReOpenExpectFail(PushOneCommit.Result c, - int expectedStatus) - throws Exception { - RestResponse response = call_REST_API_ReOpen(c.getChangeId()); - response.assertStatus(expectedStatus); - return response; - } - - private RestResponse call_REST_API_ReOpen(String changeId) throws Exception { - String url = "/changes/" + changeId + "/gerrit-plugin-qt-workflow~reopen"; - RestResponse response = userRestSession.post(url); - return response; - } - + @Before + public void SetDefaultPermissions() throws Exception { + projectOperations.project(project).forUpdate().add(TestProjectUpdate.allow(Permission.ABANDON).ref("refs/heads/master").group(REGISTERED_USERS)).update(); + } + + @Test + public void singleChange_New_Defer_ReOpen() throws Exception { + RevCommit initialHead = getRemoteHead(); + PushOneCommit.Result c = pushCommit("master", "commitmsg1", "file1", "content1"); + + QtDefer(c); + RevCommit updatedHead = qtReOpen(c, initialHead); + } + + @Test + public void singleChange_Defer_ReOpen_With_Input_Messsage() throws Exception { + PushOneCommit.Result c = pushCommit("master", "commitmsg1", "file1", "content1"); + approve(c.getChangeId()); + String changeId = c.getChangeId(); + + QtDefer(c); + + RestoreInput restoreInput = new RestoreInput(); + restoreInput.message = "myrestorenote"; + + String url = "/changes/" + changeId + "/gerrit-plugin-qt-workflow~reopen"; + RestResponse response = adminRestSession.post(url, restoreInput); + response.assertOK(); + assertStatusNew(c.getChange().change()); + } + + @Test + public void errorReOpen_No_Permission() throws Exception { + PushOneCommit.Result c = pushCommit("master", "commitmsg1", "file1", "content1"); + QtDefer(c); + + projectOperations.project(project).forUpdate().add(TestProjectUpdate.deny(Permission.ABANDON).ref("refs/heads/master").group(REGISTERED_USERS)).update(); + RestResponse response = qtReOpenExpectFail(c, HttpStatus.SC_FORBIDDEN); + assertThat(response.getEntityContent()).isEqualTo("restore not permitted"); + projectOperations.project(project).forUpdate().add(TestProjectUpdate.allow(Permission.ABANDON).ref("refs/heads/master").group(REGISTERED_USERS)).update(); + } + + @Test + public void errorReOpen_Wrong_Status() throws Exception { + PushOneCommit.Result c = pushCommit("master", "commitmsg1", "file1", "content1"); + RestResponse response = qtReOpenExpectFail(c, HttpStatus.SC_CONFLICT); + assertThat(response.getEntityContent()).isEqualTo("change is new"); + } + + private RevCommit qtReOpen(PushOneCommit.Result c, RevCommit initialHead) throws Exception { + String masterRef = R_HEADS + "master"; + String stagingRef = R_STAGING + "master"; + + RestResponse response = call_REST_API_ReOpen(c.getChangeId()); + response.assertOK(); + + RevCommit masterHead = getRemoteHead(project, masterRef); + assertThat(masterHead.getId()).isEqualTo(initialHead.getId()); // master is not updated + + RevCommit stagingHead = getRemoteRefHead(project, stagingRef); + if (stagingHead != null) + assertThat(stagingHead.getId()).isEqualTo(initialHead.getId()); // staging is not updated + + assertRefUpdatedEvents(masterRef); // no events + assertRefUpdatedEvents(stagingRef); // no events + + assertStatusNew(c.getChange().change()); + + return masterHead; + } + + private RestResponse qtReOpenExpectFail(PushOneCommit.Result c, int expectedStatus) + throws Exception { + RestResponse response = call_REST_API_ReOpen(c.getChangeId()); + response.assertStatus(expectedStatus); + return response; + } + + private RestResponse call_REST_API_ReOpen(String changeId) throws Exception { + String url = "/changes/" + changeId + "/gerrit-plugin-qt-workflow~reopen"; + RestResponse response = userRestSession.post(url); + return response; + } } diff --git a/src/test/java/com/googlesource/gerrit/plugins/qtcodereview/QtStageIT.java b/src/test/java/com/googlesource/gerrit/plugins/qtcodereview/QtStageIT.java index 270dd8a..6a016e8 100644 --- a/src/test/java/com/googlesource/gerrit/plugins/qtcodereview/QtStageIT.java +++ b/src/test/java/com/googlesource/gerrit/plugins/qtcodereview/QtStageIT.java @@ -1,338 +1,347 @@ -// Copyright (C) 2019 The Qt Company +// Copyright (C) 2019-21 The Qt Company package com.googlesource.gerrit.plugins.qtcodereview; -import static com.google.gerrit.server.group.SystemGroupBackend.REGISTERED_USERS; import static com.google.common.truth.Truth.assertThat; +import static com.google.gerrit.server.group.SystemGroupBackend.REGISTERED_USERS; import com.google.common.collect.ImmutableList; -import com.google.gerrit.acceptance.LightweightPluginDaemonTest; import com.google.gerrit.acceptance.PushOneCommit; import com.google.gerrit.acceptance.RestResponse; import com.google.gerrit.acceptance.TestPlugin; import com.google.gerrit.acceptance.UseSsh; - -import com.google.gerrit.common.data.Permission; -import com.google.gerrit.extensions.api.changes.SubmitInput; -import com.google.gerrit.reviewdb.client.Branch; -import com.google.gerrit.reviewdb.client.Change; -import com.google.gerrit.reviewdb.client.ChangeMessage; - +import com.google.gerrit.acceptance.testsuite.project.TestProjectUpdate; +import com.google.gerrit.entities.Permission; +import com.google.gerrit.entities.BranchNameKey; +import com.google.gerrit.entities.ChangeMessage; +import java.util.ArrayList; import org.apache.http.HttpStatus; - import org.eclipse.jgit.revwalk.RevCommit; - -import java.util.ArrayList; - import org.junit.Before; import org.junit.Test; @TestPlugin( name = "gerrit-plugin-qt-workflow", sysModule = "com.googlesource.gerrit.plugins.qtcodereview.QtModule", - sshModule = "com.googlesource.gerrit.plugins.qtcodereview.QtSshModule" -) - + sshModule = "com.googlesource.gerrit.plugins.qtcodereview.QtSshModule") @UseSsh public class QtStageIT extends QtCodeReviewIT { - private final String STAGED_MSG = "Staged for CI"; - - @Before - public void SetDefaultPermissions() throws Exception { - createBranch(new Branch.NameKey(project, "feature")); - - grant(project, "refs/heads/master", Permission.QT_STAGE, false, REGISTERED_USERS); - grant(project, "refs/heads/feature", Permission.QT_STAGE, false, REGISTERED_USERS); - } - - @Test - public void singleChange_Stage() throws Exception { - RevCommit initialHead = getRemoteHead(); - PushOneCommit.Result c = pushCommit("master", "commitmsg1", "file1", "content1"); - approve(c.getChangeId()); - RevCommit stagingHead = qtStage(c); - assertApproval(c.getChangeId(), admin); - } - - @Test - public void multiChange_Stage() throws Exception { - RevCommit initialHead; - RevCommit stagingHead; - - // Push 3 independent commits - initialHead = getRemoteHead(); - PushOneCommit.Result c1 = pushCommit("master", "commitmsg1", "file1", "content1"); - testRepo.reset(initialHead); - PushOneCommit.Result c2 = pushCommit("master", "commitmsg2", "file2", "content2"); - testRepo.reset(initialHead); - PushOneCommit.Result c3 = pushCommit("master", "commitmsg3", "file3", "content3"); - - approve(c1.getChangeId()); - approve(c2.getChangeId()); - approve(c3.getChangeId()); - - stagingHead = qtStage(c1); - stagingHead = qtStage(c2, stagingHead); - stagingHead = qtStage(c3, stagingHead); - } - - @Test - public void mergeCommit_Stage() throws Exception { - RevCommit initialHead = getRemoteHead(); - - // make changes on feature branch - PushOneCommit.Result f1 = pushCommit("feature", "commitmsg1", "file1", "content1"); - PushOneCommit.Result f2 = pushCommit("feature", "commitmsg2", "file2", "content2"); - approve(f1.getChangeId()); - gApi.changes().id(f1.getChangeId()).current().submit(); - approve(f2.getChangeId()); - gApi.changes().id(f2.getChangeId()).current().submit(); - - // make a change on master branch - testRepo.reset(initialHead); - PushOneCommit.Result c1 = pushCommit("master", "commitmsg3", "file3", "content3"); - approve(c1.getChangeId()); - gApi.changes().id(c1.getChangeId()).current().submit(); - - // merge feature branch into master - PushOneCommit mm = pushFactory.create(db, admin.getIdent(), testRepo); - mm.setParents(ImmutableList.of(c1.getCommit(), f2.getCommit())); - PushOneCommit.Result m = mm.to("refs/for/master"); - m.assertOkStatus(); - approve(m.getChangeId()); - RevCommit stagingHead = qtStageExpectMergeFastForward(m); - - // check that all commits are in staging ref - String gitLog = getRemoteLog("refs/staging/master").toString(); - assertThat(gitLog).contains(initialHead.getId().name()); - assertThat(gitLog).contains(c1.getCommit().getId().name()); - assertThat(gitLog).contains(f1.getCommit().getId().name()); - assertThat(gitLog).contains(f2.getCommit().getId().name()); - assertThat(gitLog).contains(m.getCommit().getId().name()); - } - - @Test - public void mergeCommit_Stage_ExpectMergeOfMerge() throws Exception { - RevCommit initialHead = getRemoteHead(); - - // make changes on feature branch - PushOneCommit.Result f1 = pushCommit("feature", "commitmsg1", "file1", "content1"); - PushOneCommit.Result f2 = pushCommit("feature", "commitmsg2", "file2", "content2"); - approve(f1.getChangeId()); - gApi.changes().id(f1.getChangeId()).current().submit(); - approve(f2.getChangeId()); - gApi.changes().id(f2.getChangeId()).current().submit(); - - // make a change on master branch - testRepo.reset(initialHead); - PushOneCommit.Result c1 = pushCommit("master", "commitmsg3", "file3", "content3"); - approve(c1.getChangeId()); - gApi.changes().id(c1.getChangeId()).current().submit(); - - // merge feature branch into master - PushOneCommit mm = pushFactory.create(db, admin.getIdent(), testRepo); - mm.setParents(ImmutableList.of(f2.getCommit(), c1.getCommit())); - PushOneCommit.Result m = mm.to("refs/for/master"); - m.assertOkStatus(); - approve(m.getChangeId()); - RevCommit stagingHead = qtStageExpectMergeOfMerge(m); - - // check that all commits are in staging ref - String gitLog = getRemoteLog("refs/staging/master").toString(); - assertThat(gitLog).contains(initialHead.getId().name()); - assertThat(gitLog).contains(c1.getCommit().getId().name()); - assertThat(gitLog).contains(f1.getCommit().getId().name()); - assertThat(gitLog).contains(f2.getCommit().getId().name()); - assertThat(gitLog).contains(m.getCommit().getId().name()); - } - - @Test - public void emptyChange_Stage() throws Exception { - RevCommit initialHead = getRemoteHead(); - PushOneCommit.Result c = pushCommit("master", "1st commit", "afile", ""); - approve(c.getChangeId()); - RevCommit stagingHead = qtStage(c); - assertApproval(c.getChangeId(), admin); - - // no changes in this commit - c = pushCommit("master", "no content", "afile", ""); - approve(c.getChangeId()); - stagingHead = qtStage(c, stagingHead); - assertApproval(c.getChangeId(), admin); - } - - @Test - public void errorStage_No_Permission() throws Exception { - deny(project, "refs/heads/master", Permission.QT_STAGE, REGISTERED_USERS); - - RevCommit initialHead = getRemoteHead(); - PushOneCommit.Result c = pushCommit("master", "commitmsg1", "file1", "content1"); - approve(c.getChangeId()); - - RestResponse response = qtStageExpectFail(c, initialHead, initialHead, HttpStatus.SC_FORBIDDEN); - assertThat(response.getEntityContent()).contains("not permitted"); - - grant(project, "refs/heads/master", Permission.QT_STAGE, false, REGISTERED_USERS); - } - - @Test - public void errorStage_Wrong_Status() throws Exception { - RevCommit initialHead = getRemoteHead(); - PushOneCommit.Result c = pushCommit("master", "commitmsg1", "file1", "content1"); - approve(c.getChangeId()); - - grant(project, "refs/heads/master", Permission.ABANDON, false, REGISTERED_USERS); - QtDefer(c); - deny(project, "refs/heads/master", Permission.ABANDON, REGISTERED_USERS); - - RestResponse response = qtStageExpectFail(c, initialHead, initialHead, HttpStatus.SC_CONFLICT); - assertThat(response.getEntityContent()).contains("Change is DEFERRED"); - } - - @Test - public void errorStage_Invalid_ChangeId() throws Exception { - PushOneCommit.Result c = pushCommit("master", "commitmsg1", "file1", "content1"); - - RestResponse response = call_REST_API_Stage("thischangeidnotfound", c.getCommit().getName()); - response.assertStatus(HttpStatus.SC_NOT_FOUND); - assertThat(response.getEntityContent()).contains("Not found: thischangeidnotfound"); - } - - @Test - public void errorStage_Invalid_RevisionId() throws Exception { - PushOneCommit.Result c = pushCommit("master", "commitmsg1", "file1", "content1"); - - RestResponse response = call_REST_API_Stage(c.getChangeId(), "thisrevisionidnotfound"); - response.assertStatus(HttpStatus.SC_NOT_FOUND); - assertThat(response.getEntityContent()).contains("Not found: thisrevisionidnotfound"); - } - - @Test - public void errorStage_Revision_Not_Current() throws Exception { - PushOneCommit.Result c1 = pushCommit("master", "commitmsg1", "file1", "content1"); - PushOneCommit.Result c2 = amendCommit(c1.getChangeId()); - - RestResponse response = call_REST_API_Stage(c1.getChangeId(), c1.getCommit().getName()); - response.assertStatus(HttpStatus.SC_CONFLICT); - assertThat(response.getEntityContent()).contains("is not current"); - } - - @Test - public void errorStage_Not_Reviewed() throws Exception { - RevCommit initialHead = getRemoteHead(); - PushOneCommit.Result c = pushCommit("master", "commitmsg1", "file1", "content1"); - - RestResponse response = qtStageExpectFail(c, initialHead, initialHead, HttpStatus.SC_CONFLICT); - assertThat(response.getEntityContent()).contains("needs Code-Review"); - } - - @Test - public void errorAmend_Status_Staged() throws Exception { - RevCommit initialHead = getRemoteHead(); - PushOneCommit.Result c1 = pushCommit("master", "commitmsg1", "file1", "content1"); - approve(c1.getChangeId()); - RevCommit stagingHead = qtStage(c1); - - PushOneCommit.Result c2 = amendCommit(c1.getChangeId()); - c2.assertErrorStatus(" closed"); - - RevCommit updatedHead = getRemoteHead(project, "refs/staging/master"); - assertThat(updatedHead.getId()).isEqualTo(stagingHead.getId()); // not updated + private final String STAGED_MSG = "Staged for CI"; + + @Before + public void SetDefaultPermissions() throws Exception { + createBranch(BranchNameKey.create(project, "feature")); + + projectOperations.project(project).forUpdate().add(TestProjectUpdate.allow(Permission.QT_STAGE).ref("refs/heads/master").group(REGISTERED_USERS)).update(); + projectOperations.project(project).forUpdate().add(TestProjectUpdate.allow(Permission.QT_STAGE).ref("refs/heads/feature").group(REGISTERED_USERS)).update(); + } + + @Test + public void singleChange_Stage() throws Exception { + RevCommit initialHead = getRemoteHead(); + PushOneCommit.Result c = pushCommit("master", "commitmsg1", "file1", "content1"); + approve(c.getChangeId()); + RevCommit stagingHead = qtStage(c); + assertApproval(c.getChangeId(), admin); + } + + @Test + public void multiChange_Stage() throws Exception { + RevCommit initialHead; + RevCommit stagingHead; + + // Push 3 independent commits + initialHead = getRemoteHead(); + PushOneCommit.Result c1 = pushCommit("master", "commitmsg1", "file1", "content1"); + testRepo.reset(initialHead); + PushOneCommit.Result c2 = pushCommit("master", "commitmsg2", "file2", "content2"); + testRepo.reset(initialHead); + PushOneCommit.Result c3 = pushCommit("master", "commitmsg3", "file3", "content3"); + + approve(c1.getChangeId()); + approve(c2.getChangeId()); + approve(c3.getChangeId()); + + stagingHead = qtStage(c1); + stagingHead = qtStage(c2, stagingHead); + stagingHead = qtStage(c3, stagingHead); + } + + @Test + public void mergeCommit_Stage() throws Exception { + RevCommit initialHead = getRemoteHead(); + + // make changes on feature branch + PushOneCommit.Result f1 = pushCommit("feature", "commitmsg1", "file1", "content1"); + PushOneCommit.Result f2 = pushCommit("feature", "commitmsg2", "file2", "content2"); + approve(f1.getChangeId()); + gApi.changes().id(f1.getChangeId()).current().submit(); + approve(f2.getChangeId()); + gApi.changes().id(f2.getChangeId()).current().submit(); + + // make a change on master branch + testRepo.reset(initialHead); + PushOneCommit.Result c1 = pushCommit("master", "commitmsg3", "file3", "content3"); + approve(c1.getChangeId()); + gApi.changes().id(c1.getChangeId()).current().submit(); + + // merge feature branch into master + PushOneCommit mm = pushFactory.create(admin.newIdent(), testRepo); + mm.setParents(ImmutableList.of(c1.getCommit(), f2.getCommit())); + PushOneCommit.Result m = mm.to("refs/for/master"); + m.assertOkStatus(); + approve(m.getChangeId()); + RevCommit stagingHead = qtStageExpectMergeFastForward(m); + + // check that all commits are in staging ref + String gitLog = getRemoteLog("refs/staging/master").toString(); + assertThat(gitLog).contains(initialHead.getId().name()); + assertThat(gitLog).contains(c1.getCommit().getId().name()); + assertThat(gitLog).contains(f1.getCommit().getId().name()); + assertThat(gitLog).contains(f2.getCommit().getId().name()); + assertThat(gitLog).contains(m.getCommit().getId().name()); + } + + @Test + public void mergeCommit_Stage_ExpectMergeOfMerge() throws Exception { + RevCommit initialHead = getRemoteHead(); + + // make changes on feature branch + PushOneCommit.Result f1 = pushCommit("feature", "commitmsg1", "file1", "content1"); + PushOneCommit.Result f2 = pushCommit("feature", "commitmsg2", "file2", "content2"); + approve(f1.getChangeId()); + gApi.changes().id(f1.getChangeId()).current().submit(); + approve(f2.getChangeId()); + gApi.changes().id(f2.getChangeId()).current().submit(); + + // make a change on master branch + testRepo.reset(initialHead); + PushOneCommit.Result c1 = pushCommit("master", "commitmsg3", "file3", "content3"); + approve(c1.getChangeId()); + gApi.changes().id(c1.getChangeId()).current().submit(); + + // merge feature branch into master + PushOneCommit mm = pushFactory.create(admin.newIdent(), testRepo); + mm.setParents(ImmutableList.of(f2.getCommit(), c1.getCommit())); + PushOneCommit.Result m = mm.to("refs/for/master"); + m.assertOkStatus(); + approve(m.getChangeId()); + RevCommit stagingHead = qtStageExpectMergeOfMerge(m); + + // check that all commits are in staging ref + String gitLog = getRemoteLog("refs/staging/master").toString(); + assertThat(gitLog).contains(initialHead.getId().name()); + assertThat(gitLog).contains(c1.getCommit().getId().name()); + assertThat(gitLog).contains(f1.getCommit().getId().name()); + assertThat(gitLog).contains(f2.getCommit().getId().name()); + assertThat(gitLog).contains(m.getCommit().getId().name()); + } + + @Test + public void emptyChange_Stage() throws Exception { + RevCommit initialHead = getRemoteHead(); + PushOneCommit.Result c = pushCommit("master", "1st commit", "afile", ""); + approve(c.getChangeId()); + RevCommit stagingHead = qtStage(c); + assertApproval(c.getChangeId(), admin); + + // no changes in this commit + c = pushCommit("master", "no content", "afile", ""); + approve(c.getChangeId()); + stagingHead = qtStage(c, stagingHead); + assertApproval(c.getChangeId(), admin); + } + + @Test + public void errorStage_No_Permission() throws Exception { + projectOperations.project(project).forUpdate().add(TestProjectUpdate.deny(Permission.QT_STAGE).ref("refs/heads/master").group(REGISTERED_USERS)).update(); + + RevCommit initialHead = getRemoteHead(); + PushOneCommit.Result c = pushCommit("master", "commitmsg1", "file1", "content1"); + approve(c.getChangeId()); + + RestResponse response = qtStageExpectFail(c, initialHead, initialHead, HttpStatus.SC_FORBIDDEN); + assertThat(response.getEntityContent()).contains("not permitted"); + + projectOperations.project(project).forUpdate().add(TestProjectUpdate.allow(Permission.QT_STAGE).ref("refs/heads/master").group(REGISTERED_USERS)).update(); + } + + @Test + public void errorStage_Wrong_Status() throws Exception { + RevCommit initialHead = getRemoteHead(); + PushOneCommit.Result c = pushCommit("master", "commitmsg1", "file1", "content1"); + approve(c.getChangeId()); + + projectOperations.project(project).forUpdate().add(TestProjectUpdate.allow(Permission.ABANDON).ref("refs/heads/master").group(REGISTERED_USERS)).update(); + QtDefer(c); + projectOperations.project(project).forUpdate().add(TestProjectUpdate.deny(Permission.ABANDON).ref("refs/heads/master").group(REGISTERED_USERS)).update(); + + RestResponse response = qtStageExpectFail(c, initialHead, initialHead, HttpStatus.SC_CONFLICT); + assertThat(response.getEntityContent()).contains("Change is DEFERRED"); + } + + @Test + public void errorStage_Invalid_ChangeId() throws Exception { + PushOneCommit.Result c = pushCommit("master", "commitmsg1", "file1", "content1"); + + RestResponse response = call_REST_API_Stage("thischangeidnotfound", c.getCommit().getName()); + response.assertStatus(HttpStatus.SC_NOT_FOUND); + assertThat(response.getEntityContent()).contains("Not found: thischangeidnotfound"); + } + + @Test + public void errorStage_Invalid_RevisionId() throws Exception { + PushOneCommit.Result c = pushCommit("master", "commitmsg1", "file1", "content1"); + + RestResponse response = call_REST_API_Stage(c.getChangeId(), "thisrevisionidnotfound"); + response.assertStatus(HttpStatus.SC_NOT_FOUND); + assertThat(response.getEntityContent()).contains("Not found: thisrevisionidnotfound"); + } + + @Test + public void errorStage_Revision_Not_Current() throws Exception { + PushOneCommit.Result c1 = pushCommit("master", "commitmsg1", "file1", "content1"); + PushOneCommit.Result c2 = amendCommit(c1.getChangeId()); + + RestResponse response = call_REST_API_Stage(c1.getChangeId(), c1.getCommit().getName()); + response.assertStatus(HttpStatus.SC_CONFLICT); + assertThat(response.getEntityContent()).contains("is not current"); + } + + @Test + public void errorStage_Not_Reviewed() throws Exception { + RevCommit initialHead = getRemoteHead(); + PushOneCommit.Result c = pushCommit("master", "commitmsg1", "file1", "content1"); + + RestResponse response = qtStageExpectFail(c, initialHead, initialHead, HttpStatus.SC_CONFLICT); + assertThat(response.getEntityContent()).contains("needs Code-Review"); + } + + @Test + public void errorStage_Parent_Not_Merged() throws Exception { + RevCommit initialHead = getRemoteHead(); + + // make a change on feature branch without submit + final PushOneCommit.Result f1 = pushCommit("feature", "f1-commitmsg", "f1-file", "f1-content"); + + // merge feature branch into master + final PushOneCommit mm = pushFactory.create(admin.newIdent(), testRepo); + mm.setParents(ImmutableList.of(f1.getCommit(), initialHead)); + final PushOneCommit.Result m = mm.to("refs/for/master"); + approve(m.getChangeId()); + + qtStageExpectFail(m, initialHead, initialHead, HttpStatus.SC_CONFLICT); + } + + @Test + public void errorAmend_Status_Staged() throws Exception { + RevCommit initialHead = getRemoteHead(); + PushOneCommit.Result c1 = pushCommit("master", "commitmsg1", "file1", "content1"); + approve(c1.getChangeId()); + RevCommit stagingHead = qtStage(c1); + + PushOneCommit.Result c2 = amendCommit(c1.getChangeId()); + c2.assertErrorStatus(" closed"); + + RevCommit updatedHead = getRemoteHead(project, "refs/staging/master"); + assertThat(updatedHead.getId()).isEqualTo(stagingHead.getId()); // not updated + } + + @Test + public void errorStage_Merge_Conlict() throws Exception { + RevCommit initialHead = getRemoteHead(); + PushOneCommit.Result c1 = pushCommit("master", "commitmsg1", "thesamefile", "content"); + approve(c1.getChangeId()); + RevCommit stagingHead1 = qtStage(c1); + + testRepo.reset(initialHead); + PushOneCommit.Result c2 = + pushCommit("master", "commitmsg2", "thesamefile", "conficting content"); + approve(c2.getChangeId()); + RestResponse response = + qtStageExpectFail(c2, initialHead, stagingHead1, HttpStatus.SC_CONFLICT); + assertThat(response.getEntityContent()).contains("merge conflict"); + + assertStatusNew(c2.getChange().change()); + } + + private RevCommit qtStage(PushOneCommit.Result c) throws Exception { + return qtStage(c, false, false, null); + } + + private RevCommit qtStage(PushOneCommit.Result c, RevCommit base) throws Exception { + return qtStage(c, false, false, base); + } + + private RevCommit qtStageExpectMergeFastForward(PushOneCommit.Result c) throws Exception { + return qtStage(c, true, true, null); + } + + private RevCommit qtStageExpectMergeOfMerge(PushOneCommit.Result c) throws Exception { + return qtStage(c, true, false, null); + } + + private RevCommit qtStage( + PushOneCommit.Result c, boolean merge, boolean fastForward, RevCommit base) throws Exception { + String branch = getBranchNameFromRef(c.getChange().change().getDest().branch()); + String stagingRef = R_STAGING + branch; + String branchRef = R_HEADS + branch; + RevCommit originalCommit = c.getCommit(); + RevCommit initialHead = getRemoteHead(project, branchRef); + RevCommit oldStagingHead = getRemoteRefHead(project, stagingRef); + if (oldStagingHead == null) oldStagingHead = initialHead; + + RestResponse response = call_REST_API_Stage(c.getChangeId(), originalCommit.getName()); + response.assertOK(); + + RevCommit branchHead = getRemoteHead(project, branchRef); + assertThat(branchHead.getId()).isEqualTo(initialHead.getId()); // master is not updated + + RevCommit stagingHead = getRemoteRefHead(project, stagingRef); + assertReviewedByFooter(stagingHead, true); + + if (fastForward) { + assertThat(stagingHead).isEqualTo(originalCommit); + } else if (merge) { + assertThat(stagingHead.getParentCount()).isEqualTo(2); + assertThat(stagingHead.getParent(1)).isEqualTo(originalCommit); + } else { + assertCherryPick(stagingHead, originalCommit, base); } + assertThat(stagingHead.getParent(0)).isEqualTo(oldStagingHead); + assertRefUpdatedEvents(stagingRef, oldStagingHead, stagingHead); + resetEvents(); - @Test - public void errorStage_Merge_Conlict() throws Exception { - RevCommit initialHead = getRemoteHead(); - PushOneCommit.Result c1 = pushCommit("master", "commitmsg1", "thesamefile", "content"); - approve(c1.getChangeId()); - RevCommit stagingHead1 = qtStage(c1); + assertStatusStaged(c.getChange().change()); - testRepo.reset(initialHead); - PushOneCommit.Result c2 = pushCommit("master", "commitmsg2", "thesamefile", "conficting content"); - approve(c2.getChangeId()); - RestResponse response = qtStageExpectFail(c2, initialHead, stagingHead1, HttpStatus.SC_CONFLICT); - assertThat(response.getEntityContent()).contains("merge conflict"); + ArrayList messages = new ArrayList(c.getChange().messages()); + assertThat(messages.get(messages.size() - 1).getMessage()) + .isEqualTo(STAGED_MSG); // check last message - assertStatusNew(c2.getChange().change()); - } + return stagingHead; + } - private RevCommit qtStage(PushOneCommit.Result c) throws Exception { - return qtStage(c, false, false, null); - } + private RestResponse qtStageExpectFail( + PushOneCommit.Result c, RevCommit initialHead, RevCommit oldStagingHead, int expectedStatus) + throws Exception { + String branch = getBranchNameFromRef(c.getChange().change().getDest().branch()); + String stagingRef = R_STAGING + branch; + String branchRef = R_HEADS + branch; - private RevCommit qtStage(PushOneCommit.Result c, RevCommit base) throws Exception { - return qtStage(c, false, false, base); - } + RestResponse response = call_REST_API_Stage(c.getChangeId(), c.getCommit().getName()); + response.assertStatus(expectedStatus); - private RevCommit qtStageExpectMergeFastForward(PushOneCommit.Result c) throws Exception { - return qtStage(c, true, true, null); - } + RevCommit branchHead = getRemoteHead(project, branchRef); + assertThat(branchHead.getId()).isEqualTo(initialHead.getId()); // master is not updated - private RevCommit qtStageExpectMergeOfMerge(PushOneCommit.Result c) throws Exception { - return qtStage(c, true, false, null); - } + RevCommit stagingHead = getRemoteRefHead(project, stagingRef); + if (stagingHead != null) + assertThat(stagingHead.getId()).isEqualTo(oldStagingHead.getId()); // staging is not updated - private RevCommit qtStage(PushOneCommit.Result c, boolean merge, boolean fastForward, RevCommit base) throws Exception { - String branch = getBranchNameFromRef(c.getChange().change().getDest().get()); - String stagingRef = R_STAGING + branch; - String branchRef = R_HEADS + branch; - RevCommit originalCommit = c.getCommit(); - RevCommit initialHead = getRemoteHead(project, branchRef); - RevCommit oldStagingHead = getRemoteHead(project, stagingRef); - if (oldStagingHead==null) oldStagingHead = initialHead; - - RestResponse response = call_REST_API_Stage(c.getChangeId(), originalCommit.getName()); - response.assertOK(); - - RevCommit branchHead = getRemoteHead(project, branchRef); - assertThat(branchHead.getId()).isEqualTo(initialHead.getId()); // master is not updated - - RevCommit stagingHead = getRemoteHead(project, stagingRef); - assertReviewedByFooter(stagingHead, true); - - if (fastForward) { - assertThat(stagingHead).isEqualTo(originalCommit); - } else if (merge) { - assertThat(stagingHead.getParentCount()).isEqualTo(2); - assertThat(stagingHead.getParent(1)).isEqualTo(originalCommit); - } else { - assertCherryPick(stagingHead, originalCommit, base); - } - assertThat(stagingHead.getParent(0)).isEqualTo(oldStagingHead); - assertRefUpdatedEvents(stagingRef, oldStagingHead, stagingHead); - resetEvents(); - - assertStatusStaged(c.getChange().change()); - - ArrayList messages = new ArrayList(c.getChange().messages()); - assertThat(messages.get(messages.size()-1).getMessage()).isEqualTo(STAGED_MSG); // check last message - - return stagingHead; - } - - private RestResponse qtStageExpectFail(PushOneCommit.Result c, - RevCommit initialHead, - RevCommit oldStagingHead, - int expectedStatus) - throws Exception { - String branch = getBranchNameFromRef(c.getChange().change().getDest().get()); - String stagingRef = R_STAGING + branch; - String branchRef = R_HEADS + branch; - - RestResponse response = call_REST_API_Stage(c.getChangeId(), c.getCommit().getName()); - response.assertStatus(expectedStatus); - - RevCommit branchHead = getRemoteHead(project, branchRef); - assertThat(branchHead.getId()).isEqualTo(initialHead.getId()); // master is not updated - - RevCommit stagingHead = getRemoteHead(project, stagingRef); - if (stagingHead != null) assertThat(stagingHead.getId()).isEqualTo(oldStagingHead.getId()); // staging is not updated - - assertRefUpdatedEvents(branchRef); // no events - assertRefUpdatedEvents(stagingRef); // no events - - return response; - } + assertRefUpdatedEvents(branchRef); // no events + assertRefUpdatedEvents(stagingRef); // no events + return response; + } } diff --git a/src/test/java/com/googlesource/gerrit/plugins/qtcodereview/QtUnStageIT.java b/src/test/java/com/googlesource/gerrit/plugins/qtcodereview/QtUnStageIT.java index 738db7a..b08b79f 100644 --- a/src/test/java/com/googlesource/gerrit/plugins/qtcodereview/QtUnStageIT.java +++ b/src/test/java/com/googlesource/gerrit/plugins/qtcodereview/QtUnStageIT.java @@ -1,456 +1,444 @@ -// Copyright (C) 2019 The Qt Company +// Copyright (C) 2019-21 The Qt Company package com.googlesource.gerrit.plugins.qtcodereview; -import static com.google.gerrit.server.group.SystemGroupBackend.REGISTERED_USERS; import static com.google.common.truth.Truth.assertThat; +import static com.google.gerrit.server.group.SystemGroupBackend.REGISTERED_USERS; import com.google.common.collect.ImmutableList; import com.google.gerrit.acceptance.PushOneCommit; import com.google.gerrit.acceptance.RestResponse; import com.google.gerrit.acceptance.TestPlugin; import com.google.gerrit.acceptance.UseSsh; - -import com.google.gerrit.common.data.Permission; -import com.google.gerrit.reviewdb.client.Branch; -import com.google.gerrit.reviewdb.client.Change; -import com.google.gerrit.reviewdb.client.ChangeMessage; - +import com.google.gerrit.acceptance.testsuite.project.TestProjectUpdate; +import com.google.gerrit.entities.Permission; +import com.google.gerrit.entities.BranchNameKey; +import com.google.gerrit.entities.ChangeMessage; +import java.util.ArrayList; import org.apache.http.HttpStatus; - import org.eclipse.jgit.revwalk.RevCommit; - -import java.util.ArrayList; - import org.junit.Before; import org.junit.Test; @TestPlugin( name = "gerrit-plugin-qt-workflow", sysModule = "com.googlesource.gerrit.plugins.qtcodereview.QtModule", - sshModule = "com.googlesource.gerrit.plugins.qtcodereview.QtSshModule" -) - + sshModule = "com.googlesource.gerrit.plugins.qtcodereview.QtSshModule") @UseSsh public class QtUnStageIT extends QtCodeReviewIT { - private final String UNSTAGED_MSG = "Unstaged"; - - @Before - public void SetDefaultPermissions() throws Exception { - createBranch(new Branch.NameKey(project, "feature")); - grant(project, "refs/heads/master", Permission.QT_STAGE, false, REGISTERED_USERS); - } - - @Test - public void singleChange_UnStage() throws Exception { - RevCommit initialHead = getRemoteHead(); - PushOneCommit.Result c = pushCommit("master", "commitmsg1", "file1", "content1"); - approve(c.getChangeId()); - QtStage(c); - - RevCommit stagingHead = qtUnStageExpectCommit(c, initialHead); - assertApproval(c.getChangeId(), admin); - } - - @Test - public void multiChange_UnStage_NoFastForwardOnStagingRefRebuild() throws Exception { - RevCommit initialHead = getRemoteHead(); - PushOneCommit.Result c1 = pushCommit("master", "commitmsg1", "file1", "content1"); - approve(c1.getChangeId()); - QtStage(c1); - - testRepo.reset(initialHead); - PushOneCommit.Result c2 = pushCommit("master", "commitmsg2", "file2", "content2"); - approve(c2.getChangeId()); - QtStage(c2); - - RevCommit stagingHead = qtUnStageExpectCherryPick(c1, c2); + private final String UNSTAGED_MSG = "Unstaged"; + + @Before + public void SetDefaultPermissions() throws Exception { + createBranch(BranchNameKey.create(project, "feature")); + projectOperations.project(project).forUpdate().add(TestProjectUpdate.allow(Permission.QT_STAGE).ref("refs/heads/master").group(REGISTERED_USERS)).update(); + } + + @Test + public void singleChange_UnStage() throws Exception { + RevCommit initialHead = getRemoteHead(); + PushOneCommit.Result c = pushCommit("master", "commitmsg1", "file1", "content1"); + approve(c.getChangeId()); + QtStage(c); + + RevCommit stagingHead = qtUnStageExpectCommit(c, initialHead); + assertApproval(c.getChangeId(), admin); + } + + @Test + public void multiChange_UnStage_NoFastForwardOnStagingRefRebuild() throws Exception { + RevCommit initialHead = getRemoteHead(); + PushOneCommit.Result c1 = pushCommit("master", "commitmsg1", "file1", "content1"); + approve(c1.getChangeId()); + QtStage(c1); + + testRepo.reset(initialHead); + PushOneCommit.Result c2 = pushCommit("master", "commitmsg2", "file2", "content2"); + approve(c2.getChangeId()); + QtStage(c2); + + RevCommit stagingHead = qtUnStageExpectCherryPick(c1, c2); + } + + @Test + public void multiChange_UnStage_First() throws Exception { + // Push 3 independent commits + RevCommit initialHead = getRemoteHead(); + PushOneCommit.Result c1 = pushCommit("master", "commitmsg1", "file1", "content1"); + testRepo.reset(initialHead); + PushOneCommit.Result c2 = pushCommit("master", "commitmsg2", "file2", "content2"); + testRepo.reset(initialHead); + PushOneCommit.Result c3 = pushCommit("master", "commitmsg3", "file3", "content3"); + + approve(c1.getChangeId()); + QtStage(c1); + approve(c2.getChangeId()); + QtStage(c2); + approve(c3.getChangeId()); + QtStage(c3); + + RevCommit stagingHead = qtUnStageExpectCherryPick(c1, c3); + assertStatusStaged(c2.getChange().change()); + assertStatusStaged(c3.getChange().change()); + } + + @Test + public void multiChange_UnStage_Middle() throws Exception { + // Push 3 independent commits + RevCommit initialHead = getRemoteHead(); + PushOneCommit.Result c1 = pushCommit("master", "commitmsg1", "file1", "content1"); + testRepo.reset(initialHead); + PushOneCommit.Result c2 = pushCommit("master", "commitmsg2", "file2", "content2"); + testRepo.reset(initialHead); + PushOneCommit.Result c3 = pushCommit("master", "commitmsg3", "file3", "content3"); + + approve(c1.getChangeId()); + QtStage(c1); + approve(c2.getChangeId()); + QtStage(c2); + approve(c3.getChangeId()); + QtStage(c3); + + RevCommit stagingHead = qtUnStageExpectCherryPick(c2, c3); + assertStatusStaged(c1.getChange().change()); + assertStatusStaged(c3.getChange().change()); + } + + @Test + public void multiChange_UnStage_Last() throws Exception { + // Push 3 independent commits + RevCommit initialHead = getRemoteHead(); + PushOneCommit.Result c1 = pushCommit("master", "commitmsg1", "file1", "content1"); + testRepo.reset(initialHead); + PushOneCommit.Result c2 = pushCommit("master", "commitmsg2", "file2", "content2"); + testRepo.reset(initialHead); + PushOneCommit.Result c3 = pushCommit("master", "commitmsg3", "file3", "content3"); + + approve(c1.getChangeId()); + QtStage(c1); + approve(c2.getChangeId()); + QtStage(c2); + RevCommit expectedFastForward = getRemoteHead(project, R_STAGING + "master"); + approve(c3.getChangeId()); + QtStage(c3); + + RevCommit stagingHead = qtUnStageExpectCommit(c3, expectedFastForward); + assertStatusStaged(c1.getChange().change()); + assertStatusStaged(c2.getChange().change()); + } + + @Test + public void multiChange_UnStage_Merge_When_First() throws Exception { + RevCommit initialHead = getRemoteHead(); + + // make changes on feature branch + PushOneCommit.Result f1 = pushCommit("feature", "commitmsg1", "file1", "content1"); + PushOneCommit.Result f2 = pushCommit("feature", "commitmsg2", "file2", "content2"); + approve(f1.getChangeId()); + gApi.changes().id(f1.getChangeId()).current().submit(); + approve(f2.getChangeId()); + gApi.changes().id(f2.getChangeId()).current().submit(); + + // make a change on master branch + testRepo.reset(initialHead); + PushOneCommit.Result c1 = pushCommit("master", "commitmsg3", "file3", "content3"); + approve(c1.getChangeId()); + gApi.changes().id(c1.getChangeId()).current().submit(); + RevCommit stagingHead = getRemoteHead(project, R_HEADS + "master"); + + // merge feature branch into master + PushOneCommit mm = pushFactory.create(admin.newIdent(), testRepo); + mm.setParents(ImmutableList.of(c1.getCommit(), f2.getCommit())); + PushOneCommit.Result m = mm.to("refs/for/master"); + m.assertOkStatus(); + approve(m.getChangeId()); + QtStage(m); + + // Stage another change + testRepo.reset(initialHead); + PushOneCommit.Result c2 = pushCommit("master", "commitmsg3", "file3", "content3"); + approve(c2.getChangeId()); + QtStage(c2); + + stagingHead = qtUnStageExpectCherryPick(m, c2, stagingHead); + String gitLog = getRemoteLog("refs/staging/master").toString(); + assertThat(gitLog).contains(initialHead.getId().name()); + assertThat(gitLog).contains(c1.getCommit().getId().name()); + assertThat(gitLog).contains(stagingHead.getId().name()); + assertThat(gitLog).doesNotContain(m.getCommit().getId().name()); + assertThat(gitLog).doesNotContain(f1.getCommit().getId().name()); + assertThat(gitLog).doesNotContain(f2.getCommit().getId().name()); + } + + @Test + public void multiChange_UnStage_Before_MergeCommit_ExpectFastForward() throws Exception { + RevCommit initialHead = getRemoteHead(); + + // make changes on feature branch + PushOneCommit.Result f1 = pushCommit("feature", "commitmsg1", "file1", "content1"); + PushOneCommit.Result f2 = pushCommit("feature", "commitmsg2", "file2", "content2"); + approve(f1.getChangeId()); + gApi.changes().id(f1.getChangeId()).current().submit(); + approve(f2.getChangeId()); + gApi.changes().id(f2.getChangeId()).current().submit(); + + // make a change on master branch + testRepo.reset(initialHead); + PushOneCommit.Result c1 = pushCommit("master", "commitmsg3", "file3", "content3"); + approve(c1.getChangeId()); + gApi.changes().id(c1.getChangeId()).current().submit(); + + // Stage a change + testRepo.reset(initialHead); + PushOneCommit.Result c2 = pushCommit("master", "commitmsg4", "file4", "content4"); + approve(c2.getChangeId()); + QtStage(c2); + + // merge feature branch and stage it on top + PushOneCommit mm = pushFactory.create(admin.newIdent(), testRepo); + mm.setParents(ImmutableList.of(c1.getCommit(), f2.getCommit())); + PushOneCommit.Result m = mm.to("refs/for/master"); + m.assertOkStatus(); + RevCommit originalMergeCommit = m.getCommit(); + approve(m.getChangeId()); + QtStage(m); + + RevCommit stagingHead = qtUnStageExpectMergeFastForward(c2, originalMergeCommit); + String gitLog = getRemoteLog("refs/staging/master").toString(); + assertThat(gitLog).contains(initialHead.getId().name()); + assertThat(gitLog).contains(c1.getCommit().getId().name()); + assertThat(gitLog).contains(stagingHead.getId().name()); + assertThat(gitLog).contains(f1.getCommit().getId().name()); + assertThat(gitLog).contains(f2.getCommit().getId().name()); + assertThat(gitLog).contains(m.getCommit().getId().name()); + assertThat(gitLog).doesNotContain(c2.getCommit().getId().name()); + } + + @Test + public void multiChange_UnStage_Before_MergeCommit_ExpectMergeOfMerge() throws Exception { + RevCommit initialHead = getRemoteHead(); + + // make changes on feature branch + PushOneCommit.Result f1 = pushCommit("feature", "commitmsg1", "file1", "content1"); + PushOneCommit.Result f2 = pushCommit("feature", "commitmsg2", "file2", "content2"); + approve(f1.getChangeId()); + gApi.changes().id(f1.getChangeId()).current().submit(); + approve(f2.getChangeId()); + gApi.changes().id(f2.getChangeId()).current().submit(); + + // make a change on master branch + testRepo.reset(initialHead); + PushOneCommit.Result c1 = pushCommit("master", "commitmsg3", "file3", "content3"); + approve(c1.getChangeId()); + gApi.changes().id(c1.getChangeId()).current().submit(); + + // Stage a change + testRepo.reset(initialHead); + PushOneCommit.Result c2 = pushCommit("master", "commitmsg4", "file4", "content4"); + approve(c2.getChangeId()); + QtStage(c2); + + // merge feature branch and stage it on top + PushOneCommit mm = pushFactory.create(admin.newIdent(), testRepo); + mm.setParents(ImmutableList.of(f2.getCommit(), c1.getCommit())); + PushOneCommit.Result m = mm.to("refs/for/master"); + m.assertOkStatus(); + approve(m.getChangeId()); + QtStage(m); + + RevCommit stagingHead = qtUnStageExpectMergeOfMerge(c2, m); + String gitLog = getRemoteLog("refs/staging/master").toString(); + assertThat(gitLog).contains(initialHead.getId().name()); + assertThat(gitLog).contains(c1.getCommit().getId().name()); + assertThat(gitLog).contains(stagingHead.getId().name()); + assertThat(gitLog).contains(f1.getCommit().getId().name()); + assertThat(gitLog).contains(f2.getCommit().getId().name()); + assertThat(gitLog).contains(m.getCommit().getId().name()); + assertThat(gitLog).doesNotContain(c2.getCommit().getId().name()); + } + + @Test + public void multiChange_UnStage_MergeConflict() throws Exception { + RevCommit initialHead = getRemoteHead(); + PushOneCommit.Result c1 = pushCommit("master", "commitmsg1", "thesamefile", "content1"); + // c2 depends on c1 + PushOneCommit.Result c2 = pushCommit("master", "commitdependingon1", "thesamefile", "conflict"); + testRepo.reset(initialHead); + PushOneCommit.Result c3 = pushCommit("master", "commitmsg3", "file3", "content3"); + + approve(c1.getChangeId()); + QtStage(c1); + approve(c2.getChangeId()); + QtStage(c2); + approve(c3.getChangeId()); + QtStage(c3); + + RevCommit stagingHead = qtUnStageExpectCommit(c1, initialHead); + assertStatusNew(c2.getChange().change()); + assertStatusNew(c3.getChange().change()); + } + + @Test + public void errorUnStage_No_Permission() throws Exception { + PushOneCommit.Result c = pushCommit("master", "commitmsg1", "file1", "content1"); + approve(c.getChangeId()); + QtStage(c); + + projectOperations.project(project).forUpdate().add(TestProjectUpdate.deny(Permission.QT_STAGE).ref("refs/heads/master").group(REGISTERED_USERS)).update(); + + RestResponse response = qtUnStageExpectFail(c, HttpStatus.SC_FORBIDDEN); + assertThat(response.getEntityContent()).contains("not permitted"); + + projectOperations.project(project).forUpdate().add(TestProjectUpdate.allow(Permission.QT_STAGE).ref("refs/heads/master").group(REGISTERED_USERS)).update(); + } + + @Test + public void errorUnStage_Wrong_Status() throws Exception { + PushOneCommit.Result c = pushCommit("master", "commitmsg1", "file1", "content1"); + approve(c.getChangeId()); + + RestResponse response = qtUnStageExpectFail(c, HttpStatus.SC_CONFLICT); + assertThat(response.getEntityContent()).isEqualTo("change is NEW"); + } + + @Test + public void errorUnStage_Invalid_ChangeId() throws Exception { + PushOneCommit.Result c = pushCommit("master", "commitmsg1", "file1", "content1"); + approve(c.getChangeId()); + QtStage(c); + + RestResponse response = call_REST_API_UnStage("thischangeidnotfound", c.getCommit().getName()); + response.assertStatus(HttpStatus.SC_NOT_FOUND); + assertThat(response.getEntityContent()).contains("Not found: thischangeidnotfound"); + } + + @Test + public void errorUnStage_Invalid_RevisionId() throws Exception { + PushOneCommit.Result c = pushCommit("master", "commitmsg1", "file1", "content1"); + approve(c.getChangeId()); + QtStage(c); + + RestResponse response = call_REST_API_UnStage(c.getChangeId(), "thisrevisionidnotfound"); + response.assertStatus(HttpStatus.SC_NOT_FOUND); + assertThat(response.getEntityContent()).contains("Not found: thisrevisionidnotfound"); + } + + @Test + public void errorUnStage_Revision_Not_Current() throws Exception { + + PushOneCommit.Result c1 = pushCommit("master", "commitmsg1", "file1", "content1"); + PushOneCommit.Result c2 = amendCommit(c1.getChangeId()); + approve(c2.getChangeId()); + QtStage(c2); + + RestResponse response = call_REST_API_UnStage(c1.getChangeId(), c1.getCommit().getName()); + response.assertStatus(HttpStatus.SC_CONFLICT); + assertThat(response.getEntityContent()).contains("is not current revision"); + } + + private RevCommit qtUnStageExpectCherryPick( + PushOneCommit.Result c, PushOneCommit.Result expectedContent) throws Exception { + return qtUnStage(c, null, expectedContent, null, false, false); + } + + private RevCommit qtUnStageExpectCherryPick( + PushOneCommit.Result c, PushOneCommit.Result expectedContent, RevCommit base) + throws Exception { + return qtUnStage(c, null, expectedContent, base, false, false); + } + + private RevCommit qtUnStageExpectCommit(PushOneCommit.Result c, RevCommit expectedStagingHead) + throws Exception { + return qtUnStage(c, expectedStagingHead, null, null, false, false); + } + + private RevCommit qtUnStageExpectMergeFastForward( + PushOneCommit.Result c, RevCommit expectedStagingHead) throws Exception { + return qtUnStage(c, expectedStagingHead, null, null, true, true); + } + + private RevCommit qtUnStageExpectMergeOfMerge( + PushOneCommit.Result c, PushOneCommit.Result expectedContent) throws Exception { + return qtUnStage(c, null, expectedContent, null, true, false); + } + + private RevCommit qtUnStage( + PushOneCommit.Result c, + RevCommit expectedStagingHead, + PushOneCommit.Result expectedContent, + RevCommit base, + boolean merge, + boolean fastForward) + throws Exception { + String branch = getBranchNameFromRef(c.getChange().change().getDest().branch()); + String stagingRef = R_STAGING + branch; + String branchRef = R_HEADS + branch; + RevCommit originalCommit = c.getCommit(); + String changeId = c.getChangeId(); + RevCommit initialHead = getRemoteHead(project, branchRef); + RevCommit oldStagingHead = getRemoteRefHead(project, stagingRef); + + RestResponse response = call_REST_API_UnStage(changeId, getCurrentPatchId(c)); + response.assertOK(); + + RevCommit masterHead = getRemoteHead(project, branchRef); + assertThat(masterHead.getId()).isEqualTo(initialHead.getId()); // master is not updated + + RevCommit stagingHead = getRemoteRefHead(project, stagingRef); + assertThat(stagingHead).isNotEqualTo(oldStagingHead); + assertReviewedByFooter(stagingHead, true); + + if (fastForward) { + assertThat(stagingHead).isEqualTo(expectedStagingHead); + } else if (merge) { + assertThat(stagingHead.getParentCount()).isEqualTo(2); + assertThat(stagingHead.getParent(1)).isEqualTo(expectedContent.getCommit()); + expectedStagingHead = stagingHead; + } else if (expectedStagingHead == null && expectedContent != null) { + assertCherryPick(stagingHead, expectedContent.getCommit(), base); + expectedStagingHead = stagingHead; + } else { + assertThat(stagingHead).isEqualTo(expectedStagingHead); // staging is updated } - @Test - public void multiChange_UnStage_First() throws Exception { - // Push 3 independent commits - RevCommit initialHead = getRemoteHead(); - PushOneCommit.Result c1 = pushCommit("master", "commitmsg1", "file1", "content1"); - testRepo.reset(initialHead); - PushOneCommit.Result c2 = pushCommit("master", "commitmsg2", "file2", "content2"); - testRepo.reset(initialHead); - PushOneCommit.Result c3 = pushCommit("master", "commitmsg3", "file3", "content3"); - - approve(c1.getChangeId()); - QtStage(c1); - approve(c2.getChangeId()); - QtStage(c2); - approve(c3.getChangeId()); - QtStage(c3); - - RevCommit stagingHead = qtUnStageExpectCherryPick(c1, c3); - assertStatusStaged(c2.getChange().change()); - assertStatusStaged(c3.getChange().change()); + if (expectedStagingHead.equals(oldStagingHead)) { + assertRefUpdatedEvents(stagingRef); // no events + } else { + assertRefUpdatedEvents(stagingRef, oldStagingHead, expectedStagingHead); + resetEvents(); } - @Test - public void multiChange_UnStage_Middle() throws Exception { - // Push 3 independent commits - RevCommit initialHead = getRemoteHead(); - PushOneCommit.Result c1 = pushCommit("master", "commitmsg1", "file1", "content1"); - testRepo.reset(initialHead); - PushOneCommit.Result c2 = pushCommit("master", "commitmsg2", "file2", "content2"); - testRepo.reset(initialHead); - PushOneCommit.Result c3 = pushCommit("master", "commitmsg3", "file3", "content3"); - - approve(c1.getChangeId()); - QtStage(c1); - approve(c2.getChangeId()); - QtStage(c2); - approve(c3.getChangeId()); - QtStage(c3); - - RevCommit stagingHead = qtUnStageExpectCherryPick(c2, c3); - assertStatusStaged(c1.getChange().change()); - assertStatusStaged(c3.getChange().change()); - } + assertStatusNew(c.getChange().change()); - @Test - public void multiChange_UnStage_Last() throws Exception { - // Push 3 independent commits - RevCommit initialHead = getRemoteHead(); - PushOneCommit.Result c1 = pushCommit("master", "commitmsg1", "file1", "content1"); - testRepo.reset(initialHead); - PushOneCommit.Result c2 = pushCommit("master", "commitmsg2", "file2", "content2"); - testRepo.reset(initialHead); - PushOneCommit.Result c3 = pushCommit("master", "commitmsg3", "file3", "content3"); - - approve(c1.getChangeId()); - QtStage(c1); - approve(c2.getChangeId()); - QtStage(c2); - RevCommit expectedFastForward = getRemoteHead(project, R_STAGING + "master"); - approve(c3.getChangeId()); - QtStage(c3); - - RevCommit stagingHead = qtUnStageExpectCommit(c3, expectedFastForward); - assertStatusStaged(c1.getChange().change()); - assertStatusStaged(c2.getChange().change()); - } + ArrayList messages = new ArrayList(c.getChange().messages()); + assertThat(messages.get(messages.size() - 1).getMessage()).isEqualTo(UNSTAGED_MSG); - @Test - public void multiChange_UnStage_Merge_When_First() throws Exception { - RevCommit initialHead = getRemoteHead(); - - // make changes on feature branch - PushOneCommit.Result f1 = pushCommit("feature", "commitmsg1", "file1", "content1"); - PushOneCommit.Result f2 = pushCommit("feature", "commitmsg2", "file2", "content2"); - approve(f1.getChangeId()); - gApi.changes().id(f1.getChangeId()).current().submit(); - approve(f2.getChangeId()); - gApi.changes().id(f2.getChangeId()).current().submit(); - - // make a change on master branch - testRepo.reset(initialHead); - PushOneCommit.Result c1 = pushCommit("master", "commitmsg3", "file3", "content3"); - approve(c1.getChangeId()); - gApi.changes().id(c1.getChangeId()).current().submit(); - RevCommit stagingHead = getRemoteHead(project, R_HEADS + "master"); - - // merge feature branch into master - PushOneCommit mm = pushFactory.create(db, admin.getIdent(), testRepo); - mm.setParents(ImmutableList.of(c1.getCommit(), f2.getCommit())); - PushOneCommit.Result m = mm.to("refs/for/master"); - m.assertOkStatus(); - approve(m.getChangeId()); - QtStage(m); - - // Stage another change - testRepo.reset(initialHead); - PushOneCommit.Result c2 = pushCommit("master", "commitmsg3", "file3", "content3"); - approve(c2.getChangeId()); - QtStage(c2); - - stagingHead = qtUnStageExpectCherryPick(m, c2, stagingHead); - String gitLog = getRemoteLog("refs/staging/master").toString(); - assertThat(gitLog).contains(initialHead.getId().name()); - assertThat(gitLog).contains(c1.getCommit().getId().name()); - assertThat(gitLog).contains(stagingHead.getId().name()); - assertThat(gitLog).doesNotContain(m.getCommit().getId().name()); - assertThat(gitLog).doesNotContain(f1.getCommit().getId().name()); - assertThat(gitLog).doesNotContain(f2.getCommit().getId().name()); - } + return stagingHead; + } - @Test - public void multiChange_UnStage_Before_MergeCommit_ExpectFastForward() throws Exception { - RevCommit initialHead = getRemoteHead(); - - // make changes on feature branch - PushOneCommit.Result f1 = pushCommit("feature", "commitmsg1", "file1", "content1"); - PushOneCommit.Result f2 = pushCommit("feature", "commitmsg2", "file2", "content2"); - approve(f1.getChangeId()); - gApi.changes().id(f1.getChangeId()).current().submit(); - approve(f2.getChangeId()); - gApi.changes().id(f2.getChangeId()).current().submit(); - - // make a change on master branch - testRepo.reset(initialHead); - PushOneCommit.Result c1 = pushCommit("master", "commitmsg3", "file3", "content3"); - approve(c1.getChangeId()); - gApi.changes().id(c1.getChangeId()).current().submit(); - - // Stage a change - testRepo.reset(initialHead); - PushOneCommit.Result c2 = pushCommit("master", "commitmsg4", "file4", "content4"); - approve(c2.getChangeId()); - QtStage(c2); - - // merge feature branch and stage it on top - PushOneCommit mm = pushFactory.create(db, admin.getIdent(), testRepo); - mm.setParents(ImmutableList.of(c1.getCommit(), f2.getCommit())); - PushOneCommit.Result m = mm.to("refs/for/master"); - m.assertOkStatus(); - RevCommit originalMergeCommit = m.getCommit(); - approve(m.getChangeId()); - QtStage(m); - - RevCommit stagingHead = qtUnStageExpectMergeFastForward(c2, originalMergeCommit); - String gitLog = getRemoteLog("refs/staging/master").toString(); - assertThat(gitLog).contains(initialHead.getId().name()); - assertThat(gitLog).contains(c1.getCommit().getId().name()); - assertThat(gitLog).contains(stagingHead.getId().name()); - assertThat(gitLog).contains(f1.getCommit().getId().name()); - assertThat(gitLog).contains(f2.getCommit().getId().name()); - assertThat(gitLog).contains(m.getCommit().getId().name()); - assertThat(gitLog).doesNotContain(c2.getCommit().getId().name()); - } + private RestResponse qtUnStageExpectFail(PushOneCommit.Result c, int expectedStatus) + throws Exception { + String branch = getBranchNameFromRef(c.getChange().change().getDest().branch()); + String stagingRef = R_STAGING + branch; + String branchRef = R_HEADS + branch; - @Test - public void multiChange_UnStage_Before_MergeCommit_ExpectMergeOfMerge() throws Exception { - RevCommit initialHead = getRemoteHead(); - - // make changes on feature branch - PushOneCommit.Result f1 = pushCommit("feature", "commitmsg1", "file1", "content1"); - PushOneCommit.Result f2 = pushCommit("feature", "commitmsg2", "file2", "content2"); - approve(f1.getChangeId()); - gApi.changes().id(f1.getChangeId()).current().submit(); - approve(f2.getChangeId()); - gApi.changes().id(f2.getChangeId()).current().submit(); - - // make a change on master branch - testRepo.reset(initialHead); - PushOneCommit.Result c1 = pushCommit("master", "commitmsg3", "file3", "content3"); - approve(c1.getChangeId()); - gApi.changes().id(c1.getChangeId()).current().submit(); - - // Stage a change - testRepo.reset(initialHead); - PushOneCommit.Result c2 = pushCommit("master", "commitmsg4", "file4", "content4"); - approve(c2.getChangeId()); - QtStage(c2); - - // merge feature branch and stage it on top - PushOneCommit mm = pushFactory.create(db, admin.getIdent(), testRepo); - mm.setParents(ImmutableList.of(f2.getCommit(),c1.getCommit())); - PushOneCommit.Result m = mm.to("refs/for/master"); - m.assertOkStatus(); - approve(m.getChangeId()); - QtStage(m); - - RevCommit stagingHead = qtUnStageExpectMergeOfMerge(c2, m); - String gitLog = getRemoteLog("refs/staging/master").toString(); - assertThat(gitLog).contains(initialHead.getId().name()); - assertThat(gitLog).contains(c1.getCommit().getId().name()); - assertThat(gitLog).contains(stagingHead.getId().name()); - assertThat(gitLog).contains(f1.getCommit().getId().name()); - assertThat(gitLog).contains(f2.getCommit().getId().name()); - assertThat(gitLog).contains(m.getCommit().getId().name()); - assertThat(gitLog).doesNotContain(c2.getCommit().getId().name()); - } + RevCommit initialHead = getRemoteHead(project, branchRef); + RevCommit oldStagingHead = getRemoteRefHead(project, stagingRef); - @Test - public void multiChange_UnStage_MergeConflict() throws Exception { - RevCommit initialHead = getRemoteHead(); - PushOneCommit.Result c1 = pushCommit("master", "commitmsg1", "thesamefile", "content1"); - // c2 depends on c1 - PushOneCommit.Result c2 = pushCommit("master", "commitdependingon1", "thesamefile", "conflict"); - testRepo.reset(initialHead); - PushOneCommit.Result c3 = pushCommit("master", "commitmsg3", "file3", "content3"); - - approve(c1.getChangeId()); - QtStage(c1); - approve(c2.getChangeId()); - QtStage(c2); - approve(c3.getChangeId()); - QtStage(c3); - - RevCommit stagingHead = qtUnStageExpectCommit(c1, initialHead); - assertStatusNew(c2.getChange().change()); - assertStatusNew(c3.getChange().change()); - } - - @Test - public void errorUnStage_No_Permission() throws Exception { - PushOneCommit.Result c = pushCommit("master", "commitmsg1", "file1", "content1"); - approve(c.getChangeId()); - QtStage(c); + RestResponse response = call_REST_API_UnStage(c.getChangeId(), getCurrentPatchId(c)); + response.assertStatus(expectedStatus); - deny(project, "refs/heads/master", Permission.QT_STAGE, REGISTERED_USERS); + RevCommit masterHead = getRemoteHead(project, branchRef); + assertThat(masterHead.getId()).isEqualTo(initialHead.getId()); // master is not updated - RestResponse response = qtUnStageExpectFail(c, HttpStatus.SC_FORBIDDEN); - assertThat(response.getEntityContent()).contains("not permitted"); - - grant(project, "refs/heads/master", Permission.QT_STAGE, false, REGISTERED_USERS); - } - - @Test - public void errorUnStage_Wrong_Status() throws Exception { - PushOneCommit.Result c = pushCommit("master", "commitmsg1", "file1", "content1"); - approve(c.getChangeId()); - - RestResponse response = qtUnStageExpectFail(c, HttpStatus.SC_CONFLICT); - assertThat(response.getEntityContent()).isEqualTo("change is NEW"); - } + RevCommit stagingHead = getRemoteRefHead(project, stagingRef); + if (stagingHead != null) + assertThat(stagingHead.getId()).isEqualTo(oldStagingHead.getId()); // staging is not updated - @Test - public void errorUnStage_Invalid_ChangeId() throws Exception { - PushOneCommit.Result c = pushCommit("master", "commitmsg1", "file1", "content1"); - approve(c.getChangeId()); - QtStage(c); - - RestResponse response = call_REST_API_UnStage("thischangeidnotfound", c.getCommit().getName()); - response.assertStatus(HttpStatus.SC_NOT_FOUND); - assertThat(response.getEntityContent()).contains("Not found: thischangeidnotfound"); - } - - @Test - public void errorUnStage_Invalid_RevisionId() throws Exception { - PushOneCommit.Result c = pushCommit("master", "commitmsg1", "file1", "content1"); - approve(c.getChangeId()); - QtStage(c); - - RestResponse response = call_REST_API_UnStage(c.getChangeId(), "thisrevisionidnotfound"); - response.assertStatus(HttpStatus.SC_NOT_FOUND); - assertThat(response.getEntityContent()).contains("Not found: thisrevisionidnotfound"); - } - - @Test - public void errorUnStage_Revision_Not_Current() throws Exception { - - PushOneCommit.Result c1 = pushCommit("master", "commitmsg1", "file1", "content1"); - PushOneCommit.Result c2 = amendCommit(c1.getChangeId()); - approve(c2.getChangeId()); - QtStage(c2); - - RestResponse response = call_REST_API_UnStage(c1.getChangeId(), c1.getCommit().getName()); - response.assertStatus(HttpStatus.SC_CONFLICT); - assertThat(response.getEntityContent()).contains("is not current revision"); - } - - private RevCommit qtUnStageExpectCherryPick(PushOneCommit.Result c, - PushOneCommit.Result expectedContent) - throws Exception { - return qtUnStage(c, null, expectedContent, null, false, false); - } - - private RevCommit qtUnStageExpectCherryPick(PushOneCommit.Result c, - PushOneCommit.Result expectedContent, - RevCommit base) - throws Exception { - return qtUnStage(c, null, expectedContent, base, false, false); - } - - private RevCommit qtUnStageExpectCommit(PushOneCommit.Result c, - RevCommit expectedStagingHead) - throws Exception { - return qtUnStage(c, expectedStagingHead, null, null, false, false); - } - - private RevCommit qtUnStageExpectMergeFastForward(PushOneCommit.Result c, - RevCommit expectedStagingHead) - throws Exception { - return qtUnStage(c, expectedStagingHead, null, null, true, true); - } - - private RevCommit qtUnStageExpectMergeOfMerge(PushOneCommit.Result c, - PushOneCommit.Result expectedContent) - throws Exception { - return qtUnStage(c, null, expectedContent, null, true, false); - } - - private RevCommit qtUnStage(PushOneCommit.Result c, - RevCommit expectedStagingHead, - PushOneCommit.Result expectedContent, - RevCommit base, - boolean merge, - boolean fastForward) - throws Exception { - String branch = getBranchNameFromRef(c.getChange().change().getDest().get()); - String stagingRef = R_STAGING + branch; - String branchRef = R_HEADS + branch; - RevCommit originalCommit = c.getCommit(); - String changeId = c.getChangeId(); - RevCommit initialHead = getRemoteHead(project, branchRef); - RevCommit oldStagingHead = getRemoteHead(project, stagingRef); - - RestResponse response = call_REST_API_UnStage(changeId, getCurrentPatchId(c)); - response.assertOK(); - - RevCommit masterHead = getRemoteHead(project, branchRef); - assertThat(masterHead.getId()).isEqualTo(initialHead.getId()); // master is not updated - - RevCommit stagingHead = getRemoteHead(project, stagingRef); - assertThat(stagingHead).isNotEqualTo(oldStagingHead); - assertReviewedByFooter(stagingHead, true); - - if (fastForward) { - assertThat(stagingHead).isEqualTo(expectedStagingHead); - } else if (merge) { - assertThat(stagingHead.getParentCount()).isEqualTo(2); - assertThat(stagingHead.getParent(1)).isEqualTo(expectedContent.getCommit()); - expectedStagingHead = stagingHead; - } else if (expectedStagingHead == null && expectedContent != null) { - assertCherryPick(stagingHead, expectedContent.getCommit(), base); - expectedStagingHead = stagingHead; - } else { - assertThat(stagingHead).isEqualTo(expectedStagingHead); // staging is updated - } - - if (expectedStagingHead.equals(oldStagingHead)) { - assertRefUpdatedEvents(stagingRef); // no events - } else { - assertRefUpdatedEvents(stagingRef, oldStagingHead, expectedStagingHead); - resetEvents(); - } - - assertStatusNew(c.getChange().change()); - - ArrayList messages = new ArrayList(c.getChange().messages()); - assertThat(messages.get(messages.size() - 1).getMessage()).isEqualTo(UNSTAGED_MSG); - - return stagingHead; - } - - private RestResponse qtUnStageExpectFail(PushOneCommit.Result c, - int expectedStatus) - throws Exception { - String branch = getBranchNameFromRef(c.getChange().change().getDest().get()); - String stagingRef = R_STAGING + branch; - String branchRef = R_HEADS + branch; - - RevCommit initialHead = getRemoteHead(project, branchRef); - RevCommit oldStagingHead = getRemoteHead(project, stagingRef); - - RestResponse response = call_REST_API_UnStage(c.getChangeId(), getCurrentPatchId(c)); - response.assertStatus(expectedStatus); - - RevCommit masterHead = getRemoteHead(project, branchRef); - assertThat(masterHead.getId()).isEqualTo(initialHead.getId()); // master is not updated - - RevCommit stagingHead = getRemoteHead(project, stagingRef); - if (stagingHead != null) assertThat(stagingHead.getId()).isEqualTo(oldStagingHead.getId()); // staging is not updated - - assertRefUpdatedEvents(branchRef); // no events - assertRefUpdatedEvents(stagingRef); // no events - - return response; - } + assertRefUpdatedEvents(branchRef); // no events + assertRefUpdatedEvents(stagingRef); // no events + return response; + } }