Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNicholas Folk2015-01-21 19:25:06 +0000
committerSam Davis2015-01-22 21:43:07 +0000
commit45462fb49ff763dc604eccfb22b79dec75070726 (patch)
treeec8dbdda0933cdcfba75e6ed8527fe98c8362262 /org.eclipse.mylyn.gerrit.ui
parenta77d15f6db542c7c4d1cf9599e5f630a408199b6 (diff)
downloadorg.eclipse.mylyn.reviews-45462fb49ff763dc604eccfb22b79dec75070726.tar.gz
org.eclipse.mylyn.reviews-45462fb49ff763dc604eccfb22b79dec75070726.tar.xz
org.eclipse.mylyn.reviews-45462fb49ff763dc604eccfb22b79dec75070726.zip
393788: show parent commit of each patch set in review editor
Change-Id: I375bce95079c4eae6fbb21e26bc83dcd01fb85bf Task-Url: https://bugs.eclipse.org/bugs/show_bug.cgi?id=393788 Signed-off-by: Nicholas Folk <Nicholas.folk@tasktop.com>
Diffstat (limited to 'org.eclipse.mylyn.gerrit.ui')
-rw-r--r--org.eclipse.mylyn.gerrit.ui/src/org/eclipse/mylyn/internal/gerrit/ui/factories/OpenParentCommitUiFactory.java104
-rw-r--r--org.eclipse.mylyn.gerrit.ui/src/org/eclipse/mylyn/internal/gerrit/ui/factories/PatchSetUiFactoryProvider.java6
2 files changed, 110 insertions, 0 deletions
diff --git a/org.eclipse.mylyn.gerrit.ui/src/org/eclipse/mylyn/internal/gerrit/ui/factories/OpenParentCommitUiFactory.java b/org.eclipse.mylyn.gerrit.ui/src/org/eclipse/mylyn/internal/gerrit/ui/factories/OpenParentCommitUiFactory.java
new file mode 100644
index 000000000..825ea6d56
--- /dev/null
+++ b/org.eclipse.mylyn.gerrit.ui/src/org/eclipse/mylyn/internal/gerrit/ui/factories/OpenParentCommitUiFactory.java
@@ -0,0 +1,104 @@
+/*******************************************************************************
+ * Copyright (c) 2015 Tasktop Technologies and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Tasktop Technologies - initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.mylyn.internal.gerrit.ui.factories;
+
+import java.io.IOException;
+
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.core.runtime.jobs.IJobChangeEvent;
+import org.eclipse.core.runtime.jobs.Job;
+import org.eclipse.core.runtime.jobs.JobChangeAdapter;
+import org.eclipse.egit.ui.internal.commit.CommitEditor;
+import org.eclipse.egit.ui.internal.commit.RepositoryCommit;
+import org.eclipse.jgit.errors.AmbiguousObjectException;
+import org.eclipse.jgit.lib.ObjectId;
+import org.eclipse.jgit.lib.Repository;
+import org.eclipse.jgit.revwalk.RevCommit;
+import org.eclipse.jgit.revwalk.RevWalk;
+import org.eclipse.mylyn.internal.gerrit.core.egit.GerritToGitMapping;
+import org.eclipse.mylyn.internal.gerrit.ui.GerritUiPlugin;
+import org.eclipse.mylyn.reviews.core.model.IReviewItemSet;
+import org.eclipse.mylyn.reviews.ui.spi.factories.IUiContext;
+import org.eclipse.swt.widgets.Display;
+
+public class OpenParentCommitUiFactory extends OpenCommitUiFactory {
+
+ private final String commitId;
+
+ public OpenParentCommitUiFactory(IUiContext context, IReviewItemSet set, String commitId) {
+ super(context, set);
+ this.commitId = commitId;
+ }
+
+ @Override
+ public void execute() {
+ GerritToGitMapping mapping = getGitRepository(true);
+ if (mapping != null) {
+ final ParentCommitJob job = new ParentCommitJob(Messages.OpenCommitUiFactory_Opening_Commit_Viewer,
+ mapping.getRepository(), commitId);
+ job.schedule();
+ job.addJobChangeListener(new JobChangeAdapter() {
+ @Override
+ public void done(IJobChangeEvent event) {
+ Display.getDefault().asyncExec(new Runnable() {
+ @Override
+ public void run() {
+ CommitEditor.openQuiet(job.getCommit());
+ }
+ });
+ }
+ });
+ }
+
+ }
+
+ public static class ParentCommitJob extends Job {
+
+ private final Repository repository;
+
+ private RepositoryCommit commit;
+
+ private final String commitId;
+
+ public ParentCommitJob(String name, Repository repository, String commitId) {
+ super(name);
+ this.repository = repository;
+ this.commitId = commitId;
+ }
+
+ @Override
+ protected IStatus run(IProgressMonitor monitor) {
+ try {
+ RevCommit revCommit = getRevCommit();
+ commit = new RepositoryCommit(repository, revCommit);
+ } catch (Exception e) {
+ return new Status(IStatus.ERROR, GerritUiPlugin.PLUGIN_ID, "Patch set retrieval failed", e); //$NON-NLS-1$
+ }
+ return Status.OK_STATUS;
+ }
+
+ public RepositoryCommit getCommit() {
+ return commit;
+ }
+
+ private RevCommit getRevCommit() throws AmbiguousObjectException, IOException {
+ ObjectId ref = repository.resolve(commitId);
+ RevWalk walker = new RevWalk(repository);
+ RevCommit targetCommit = walker.parseCommit(ref);
+ return targetCommit;
+
+ }
+
+ }
+}
diff --git a/org.eclipse.mylyn.gerrit.ui/src/org/eclipse/mylyn/internal/gerrit/ui/factories/PatchSetUiFactoryProvider.java b/org.eclipse.mylyn.gerrit.ui/src/org/eclipse/mylyn/internal/gerrit/ui/factories/PatchSetUiFactoryProvider.java
index 94ca7597b..5c418a34e 100644
--- a/org.eclipse.mylyn.gerrit.ui/src/org/eclipse/mylyn/internal/gerrit/ui/factories/PatchSetUiFactoryProvider.java
+++ b/org.eclipse.mylyn.gerrit.ui/src/org/eclipse/mylyn/internal/gerrit/ui/factories/PatchSetUiFactoryProvider.java
@@ -45,6 +45,12 @@ public class PatchSetUiFactoryProvider extends AbstractReviewItemSetUiFactoryPro
}
@Override
+ public AbstractUiFactory<IReviewItemSet> getOpenParentCommitFactory(IUiContext context, IReviewItemSet set,
+ String commitId) {
+ return new OpenParentCommitUiFactory(context, set, commitId);
+ }
+
+ @Override
public AbstractUiFactory<IReviewItemSet> getOpenFileFactory(IUiContext context, IReviewItemSet set, IFileItem item) {
return new OpenFileUiFactory(context, set, item);
}

Back to the top