Merge "Adjust the URL.getPath() not to be null when building a url for the Gerrit repository."
diff --git a/org.eclipse.egerrit.ui/src/org/eclipse/egerrit/extensionpoint/definition/HandleExternalFileSelection.java b/org.eclipse.egerrit.ui/src/org/eclipse/egerrit/extensionpoint/definition/HandleExternalFileSelection.java
index 79a90b0..69ee9c7 100644
--- a/org.eclipse.egerrit.ui/src/org/eclipse/egerrit/extensionpoint/definition/HandleExternalFileSelection.java
+++ b/org.eclipse.egerrit.ui/src/org/eclipse/egerrit/extensionpoint/definition/HandleExternalFileSelection.java
@@ -100,12 +100,12 @@
ExternalInfo.workspacePath = workspaceFile.getLocationURI().getRawPath();
ExternalInfo.filePath = fileInfo.getPath();
ExternalInfo.project = fileInfo.getRevision().getChangeInfo().getProject();
+ ExternalInfo.branch = fileInfo.getRevision().getChangeInfo().getBranch();
ExternalInfo.serverName = this.fGerritClient.getRepository().getHostname();
ExternalInfo.reviewCommit = fileInfo.getRevision().getId();
ExternalInfo.patchSet = fileInfo.getRevision().getRef();
ExternalInfo.serverPath = this.fGerritClient.getRepository().getServerInfo().getServerURI();
ExternalInfo.listCommitFiles = this.listCommitFiles();
-
}
/**
diff --git a/org.eclipse.egerrit.ui/src/org/eclipse/egerrit/ui/extension/IExternalCmd.java b/org.eclipse.egerrit.ui/src/org/eclipse/egerrit/ui/extension/IExternalCmd.java
index 2900038..3af4b65 100644
--- a/org.eclipse.egerrit.ui/src/org/eclipse/egerrit/ui/extension/IExternalCmd.java
+++ b/org.eclipse.egerrit.ui/src/org/eclipse/egerrit/ui/extension/IExternalCmd.java
@@ -25,6 +25,8 @@
public static String project;
+ public static String branch;
+
public static String serverPath;
public static String serverName;
@@ -53,6 +55,10 @@
return ExternalInfo.project;
};
+ public default String getBranch() {
+ return ExternalInfo.branch;
+ };
+
public default String getServerPath() {
return ExternalInfo.serverPath;
};
