Merge branch 'master' into release/1.1

Author: mast-eu

README.md

@@ -1,31 +1,20 @@
-# GitExtensions Plugin Template
-An example/empty repository for building a GitExtensions plugin that can be installed using [GitExtensions.PluginManager](https://github.com/gitextensions/gitextensions.pluginmanager).
-
-The package is going to be published on [NuGet.org](https://www.nuget.org/packages/GitExtensions.PluginTemplate) feed.
-
-## Files to keep an eye on
- - [Plugin.cs](src/GitExtensions.PluginTemplate/Plugin.cs)
- - [GitExtensions.PluginTemplate.csproj](src/GitExtensions.PluginTemplate/GitExtensions.PluginTemplate.csproj)
- - [GitExtensions.PluginTemplate.nuspec](src/GitExtensions.PluginTemplate/GitExtensions.PluginTemplate.nuspec)
- 
-### Nuspec
- - Place all content under lib folder. Custom nested folders are supported and path is preserved.
- - Add dependency on "virtual" package GitExtensions.Extensibility and target version `[3.0,3.1)` *.
- - Real package dependencies are not supported, so everything should be packed with the plugin.
- - Keep in mind that sharing common libraries can be cumbersome as these must match across all plugins and also Git Extensions itself. So my current recommendation is not to do so.
- 
-_* This is just my own eperience. Git Extensions follow SemVer, but it's public plugin API is not so rich that sometimes you need to kind a hack it using APIs that are not ment to be public. For these reasons its better to check compatibility with every single feature update._
-
-### Csproj
-
- - I'm using powershell script to download a selected version of Git Extensions from GitHub releases. This script runs before every build and checks if Git Extensions binaries are donwloaded.
- - CSproj references selected binaries from the downloaded Git Extensions.
- - After build a newly created binaries of the plugin is copied to Git Extensions plugins directory.
- - F5 is setup to start downloaded `GitExtensions.exe` for easy debugging.
- 
- ### Plugin.cs
-  - Nothing special, but ordinary Git Extensions plugin :-)
-
-## Icons
-
-Some icons by Yusuke [Kamiyamane](http://p.yusukekamiyamane.com).
+
+# GitExtensions.GerritPlugin
+
+GitExtensions.GerritPlugin is a plugin for GitExtensions to work with a [Gerrit](https://www.gerritcodereview.com/) as Git server.
+
+## Features
+
+* Gerrit hook installation
+* Patchset publish
+* Patchset download
+
+## Usage
+
+The cloned repository requires a `.gitreview` file, which is in use for the plugin to identify the gerrit server.
+This file must be located in root foilder of the repository.
+Get more information about this file [here](https://docs.openstack.org/infra/git-review/installation.html#gitreview-file-format)
+
+## GitExtensions Plugin Template infomration
+
+The [GitExtensions Plugin Template](https://github.com/gitextensions/gitextensions.plugintemplate) gives additional information about the pluign development.

contributors.txt

@@ -112,4 +112,5 @@ YYYY/MM/DD, github id, Full name, email
 2019/12/25, dfev77, Florin Daneliuc, [email protected]
 2020/01/02, c3er, Christian Dreier, flipper.x3r(at)googlemail.com
 2020/01/04, MarkJ74, Mark Jackson, markj74(at)outlook.com
-2020/01/07, asherber, Aaron Sherber, aaron(at)sherber.com
+2020/01/07, asherber, Aaron Sherber, aaron(at)sherber.com
+2021/01/17, thimmy687, Ricardo Krause, [email protected]

src/GitExtensions.GerritPlugin/FormGerritDownload.cs

@@ -4,6 +4,7 @@
 using System.Threading.Tasks;
 using System.Windows.Forms;
 using GitCommands;
+using GitCommands.Git.Commands;
 using GitUI;
 using GitUIPluginInterfaces;
 using Newtonsoft.Json.Linq;
@@ -126,7 +127,7 @@ private async Task<bool> DownloadChangeAsync(IWin32Window owner)
                             return;
                         }
 
-                        e.IsError = false;
+                        e = new GitRemoteCommandCompletedEventArgs(e.Command, false, e.Handled);
                     }
                 }
             };
@@ -223,7 +224,7 @@ private void FormGerritDownloadLoad(object sender, EventArgs e)
 
         private void AddRemoteClick(object sender, EventArgs e)
         {
-            UICommands.StartRemotesDialog();
+            UICommands.StartRemotesDialog(this);
             _NO_TRANSLATE_Remotes.DataSource = Module.GetRemoteNames();
         }
     }

src/GitExtensions.GerritPlugin/FormGerritPublish.cs

@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Diagnostics;
 using System.Linq;
 using System.Windows.Forms;
 using GitExtensions.GerritPlugin.Server;
@@ -194,7 +193,7 @@ private void FormGerritPublishLoad(object sender, EventArgs e)
 
         private void AddRemoteClick(object sender, EventArgs e)
         {
-            UICommands.StartRemotesDialog();
+            UICommands.StartRemotesDialog(this);
             _NO_TRANSLATE_Remotes.DataSource = Module.GetRemoteNames();
         }
     }

src/GitExtensions.GerritPlugin/FormGitReview.Designer.cs

@@ -26,6 +26,16 @@ public sealed partial class FormGitReview : GitExtensionsForm, IGitUICommandsSou
         private readonly TranslationString _saveFileQuestionCaption =
             new TranslationString("Save changes?");
 
+        private readonly TranslationString _description = new TranslationString(@$"Example configuration
+
+[gerrit]
+host=review.example.com
+port=29418
+project=department/project.git
+defaultbranch=master
+defaultremote=review
+defaultrebase=0");
+
         private string _originalGitReviewFileContent = string.Empty;
         private IGitModule Module => UICommands.GitModule;
 
@@ -47,6 +57,7 @@ public FormGitReview(IGitUICommands uiCommands)
             : base(true)
         {
             InitializeComponent();
+            label1.Text = _description.Text;
             InitializeComplete();
 
             UICommands = (GitUICommands)uiCommands;
@@ -158,4 +169,4 @@ private void lnkGitReviewPatterns_LinkClicked(object sender, LinkLabelLinkClicke
             Process.Start(@"https://github.com/openstack-infra/git-review#git-review");
         }
     }
-}
+}

src/GitExtensions.GerritPlugin/FormGitReview.cs

@@ -52,7 +52,8 @@ public class GerritPlugin : GitPluginBase, IGitPluginForRepository
         // public only because of FormTranslate
         public GerritPlugin() : base(true)
         {
-            SetNameAndDescription("Gerrit Code Review");
+            Id = new Guid("98AC833D-21F0-4FD7-8A0F-5616E093FC59");
+            Name = "Gerrit Code Review";
             Translate();
             Icon = Resources.IconGerrit;
         }
@@ -154,8 +155,8 @@ private void Initialize(Form form)
 
             // Find the controls we're going to extend.
 
-            var menuStrip = form.FindDescendantOfType<MenuStrip>(p => p.Name == "menuStrip1");
-            var toolStrip = form.FindDescendantOfType<ToolStrip>(p => p.Name == "ToolStrip");
+            var menuStrip = form.FindDescendantOfType<MenuStrip>(p => p.Name == "mainMenuStrip");
+            var toolStrip = form.FindDescendantOfType<ToolStrip>(p => p.Name == "ToolStripMain");
 
             if (menuStrip == null)
             {

src/GitExtensions.GerritPlugin/GerritPlugin.cs

@@ -68,7 +68,7 @@ public static async Task<string> RunGerritCommandAsync([NotNull] IWin32Window ow
 
             StartAgent(owner, module, remote);
 
-            var sshCmd = GitCommandHelpers.Plink()
+            var sshCmd = GitSshHelpers.Plink()
                 ? AppSettings.Plink
                 : SshPathLocatorInstance.Find(AppSettings.GitBinDir);
 
@@ -79,7 +79,7 @@ public static async Task<string> RunGerritCommandAsync([NotNull] IWin32Window ow
 
             string hostname = fetchUrl.Host;
             string username = fetchUrl.UserInfo;
-            string portFlag = GitCommandHelpers.Plink() ? " -P " : " -p ";
+            string portFlag = GitSshHelpers.Plink() ? " -P " : " -p ";
             int port = fetchUrl.Port;
 
             if (port == -1 && fetchUrl.Scheme == "ssh")
@@ -127,7 +127,7 @@ public static void StartAgent([NotNull] IWin32Window owner, [NotNull] IGitModule
                 throw new ArgumentNullException(nameof(remote));
             }
 
-            if (GitCommandHelpers.Plink())
+            if (GitSshHelpers.Plink())
             {
                 if (!File.Exists(AppSettings.Pageant))
                 {