Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Enable support also for older gerrit plugin versions #7200

Closed
thimmy687 opened this issue Sep 26, 2019 · 7 comments · Fixed by #7216
Closed

Enable support also for older gerrit plugin versions #7200

thimmy687 opened this issue Sep 26, 2019 · 7 comments · Fixed by #7216

Comments

@thimmy687
Copy link
Contributor

Current behaviour

After the last update it is possible to switch between shown options

image

Expected behaviour

since we not use the latest version of gerrit it would be nice to have a choice to select which version of gerrit-plugin we can use to have the possibility to use older features

Steps to reproduce

Screenshots

Did this work in previous version of GitExtensions

Environment

  • Git Extensions 3.2.1.6628
  • Build bc07663
  • Git 2.20.0.windows.1 (recommended: 2.22.0 or later)
  • Microsoft Windows NT 10.0.17763.0
  • .NET Framework 4.7.3460.0
  • DPI 96dpi (no scaling)

Diagnostics

@thimmy687 thimmy687 changed the title Enable support also for older Plugin versions Enable support also for older gerrit plugin versions Sep 26, 2019
@thimmy687
Copy link
Contributor Author

I know it is possible to just replace the plugin .dll, but it would be nice to have this as option to be able to switch easy between both

@pmiossec
Copy link
Member

As far as I know, there is no one in the GitExtensions maintainers that use Gerrit.
So we are unable to understand and do that.
The solution can only come from you, the community!

Perhaps you could have a look at #7198 and give your point of view.
And perhaps you should include @lekhmanrus in this conversation.

I know it is possible to just replace the plugin .dll

Indeed, most of the times it will work but it is, as you said, a perfect solution because that won't work if plugin api change.

since we not use the latest version of gerrit

For the discussion, it would be good that you say what is your version, what is the one supported by the plugin at the moment and what is the last version of Gerrit to see if that everything make sense (because, as I said, there is no maintainer for this plugin).

The best is also that you do the development but if you can't, tell us as much as possible what are the changes that must be done...

@RussKie
Copy link
Member

RussKie commented Sep 26, 2019

I would suggest to look into moving the current plugin out of this repo and converting it to a community plugin.
Then you will have a full control over the Gerrit integrations, multiple versions etc.

@maraf and @mast-eu have been pioneering the Plugin Manager for Git Extensions (and have done an impressive thing), and it is getting significantly easier to develop and install community plugins for Git Extensions.

Please let us know if you're interested and up for the challenge, I'm sure @maraf and @mast-eu would gladly help you in this journey.

@gerhardol
Copy link
Member

One way is to add the old version as a separate plugin.

@RussKie
Copy link
Member

RussKie commented Sep 26, 2019

One way is to add the old version as a separate plugin.

We are not doing this in this repo.

@lekhmanrus
Copy link
Contributor

I think we can do request to {gerrit_host}/config/server/version and based on version we can show different fields and process them in the needed different way.
We can read Gerrit host from .gitreview file. In this case we won't need to separate this plugin and maintain two or more different plugins.

Also it would be good improvements to read and set some default values from .gitreview (or even GitExtensions.settings), like Reviewer(s), CC, Publish Type etc. It might be useful.

@RussKie RussKie added the :neckbeard: status: pull request only Requested changes won't be implemented by the Core team, community PRs are welcome label Sep 28, 2019
lekhmanrus added a commit to lekhmanrus/gitextensions that referenced this issue Sep 29, 2019
@ghost ghost added the 🚧 status: in progress Issues which have associated PRs label Sep 29, 2019
@gerhardol
Copy link
Member

@thimmy687 (as well as other Gerrit users
Please review and test the build in #7216

@gerhardol gerhardol added this to the 3.3 milestone Sep 29, 2019
@ghost ghost removed the 🚧 status: in progress Issues which have associated PRs label Oct 1, 2019
Fabman08 added a commit to Fabman08/gitextensions that referenced this issue Oct 7, 2019
* Path must be well formatted for Path.GetDirectoryName()

* Update namespace

* Fix i8n strings in GitUICommands

* GitHubHostedRemote: the underneath repository should be initialized with the GitProtocol already used

* Fix Clone Url when using https for parent repository

like what have been done in gitextensions#6515 (07acef9)

* Add menu entry to add the GitHub "upstream" remote

and fetch from it once added

* refactor: remove `IGitModule` from `IRepositoryHostPlugin`

to have a consistent api.
Following comment: gitextensions#6328 (review)

* Update translations

* Move UI-only strings to GitUI project

* Remove obsolete UI from TranslationApp

* Add script options c/sRemoteBranchName and RepoName

* Restore title of AppearanceSettingsPage

* Check for empty language selection

* Update/cleanup appveyor.yml

* Enforce update to translations as part of a PR

* stage *.xlf files - this way we ignore EOL issues,
* check if there are any xlf files are modified, and if so:
    - capture and publish the diff for the xlf files as git-diff-xlf.txt
    - break the build with a meaningful error

* Update translations

* Deprecate and remove InvokeAsyncDoNotUseInNewCode

Rewrite the callsite to use `InvokeAsync` instead, that switches
the execution context to the UI thread.

Closes gitextensions#6799

* RevisionLinks: Add templates for GitHub and AzureDevOps

+ Creation of GitHubRemoteParser & AzureDevOpsRemoteParser

* Check that directory (still) exists

before renabling the the FileWatcher for GitStatusMonitor

* Show changed images in all diff tabs

Previously, images were displayed as binary diffs, except some in
FormCommit:  .png and new worktree images

Other:
* FormCommit always show the worktree commit for index .png
* Show all images in FormCommit
(i.e. show index images and changed other than .png)
* Regression from a94a30a (ObjectId)
where blob guid were ignored and diff not shown
* Combined guid should never be used to get file blob guid
* openWithDiffTool action were not called from stash and RevisionDiff

* StatusMonitor: CancelToken to limit multiple commands

* Use CheckBox.Text instead of separate Label

in order to indicate focus and to make hotkey work directly

* Centralise the common logic

* fix: Ensure configured merge tool is present

KDiff3 was unbundled few versions ago, and some users no longer
have a diff/merge tool installed.

Until now the "resolve conflicts" dialog did not check whether a configured tool
physically existed in the system.

An error dialog is shown to the user if the tool is absent.

Closes gitextensions#6687

* Enhance error messages

* Rename to EnsureCommitMessageSecondLineEmpty

* Do not skip empty lines

fix regression introduced by commit template handling

* Factor out method and add tests

* Reposition buttons and add tooltips

* Update the layout for scaling

* Require repro steps before submission

Ask a user to provide more information before a report can be submitted.

Closes gitextensions#6607

* Update translations

* SettingsCache: Tempfile in temp dir

* Hide Watermark, too, if FilterComboBox invisible

make appearance the same as "There are no unstaged changes"

* refactor: Move email settings from General to Detailed

* Fix TryParseAsciiHex bytes bounds check

* Fix "Blame to previous revision"

to select the first commit before the revision selected (so the previous, no!?!)

Partly fix gitextensions#6605

* Blame: Add a context menu item to blame selected revision

to make explicit what could be done by double-clicking

* Refactoring & fixes following reviews...

* feature: Add setup telemetry dialog

Add a dialog to the setup that asks user's permission to capture telemetry information.

The setup will execute a script that will update user's configuration that is stored in
C:\Users\<user>\AppData\Roaming\GitExtensions\GitExtensions\GitExtensions.setting
with the user's selection.

* Disable blame menu items if revision is not in the revision grid

* feature: Add ApplicationInsights telemetry

Relates to gitextensions#6021

* Capture (selected) application telemetry information
* Prompt user to allow telemetry upon start up, if it isn't configured
* Allow telemetry information capture be toggled via a About menu
* Allow telemetry information capture be toggled via the settings dialog

The following information is captured:

Application-Level includes:
* Exception information
* Version number (e.g. 2.0.x.x)
* Is portable version
* Build type (whether the application is an official release build or not)
* Selected layout settings (such as visibility of the left panel, commit info position etc)
* Change of selected layout settings
* Git version (e.g. 2.19.0)
* SSH client (e.g. OpenSSH or PuTTY)

Operating System-Level includes:
* Version (e.g. Windows 10.0.17763.0)
* Machine Name (e.g. MyFastPC)
* .NET CLR version (e.g. 4.0.30319.42000)
* .NET SDK version (e.g. dotnet:2.10.0-24102)
* Current culture
* Current UI culture
* Number of monitors
* Resolution of all monitors
* Primary monitor DPI / scale factor

* feature: Add ApplicationInsights telemetry

Relates to gitextensions#6021

* Capture (selected) application telemetry information
* Prompt user to allow telemetry upon start up, if it isn't configured
* Allow telemetry information capture be toggled via a About menu
* Allow telemetry information capture be toggled via the settings dialog

The following information is captured:

Application-Level includes:
* Exception information
* Version number (e.g. 2.0.x.x)
* Is portable version
* Build type (whether the application is an official release build or not)
* Selected layout settings (such as visibility of the left panel, commit info position etc)
* Change of selected layout settings
* Git version (e.g. 2.19.0)
* SSH client (e.g. OpenSSH or PuTTY)

Operating System-Level includes:
* Version (e.g. Windows 10.0.17763.0)
* Machine Name (e.g. MyFastPC)
* .NET CLR version (e.g. 4.0.30319.42000)
* .NET SDK version (e.g. dotnet:2.10.0-24102)
* Current culture
* Current UI culture
* Number of monitors
* Resolution of all monitors
* Primary monitor DPI / scale factor

* Fix gitextensions#5944 by fixing --follow and revision reading

a306eb6 by mistake removed the "--follow" option when getting the git
log for history. This is reverted by this commit.
1f6b0ca by mistake removed parsing of the file name data into
GitRevision.Name. This is also reverted by this commit.
Together, these should fix rename tracking in the file history.

* Set recommended Git version to 2.22.0

* Fix FileHistory/Blame for files not existing in the working directory

The bad behavior comes from the fact that `TryGetExactPath()`
changes the path to the file system path (if not existing, the path is cleared)

Alternative for gitextensions#6893

* Redesign form "Commit template Settings"

* Commit designer changes due to /noscale
* Better menu item label in form commit
* Commit validation: better use of space for RegEx field
* Use a tab control to split "template" & "Validation"
* Left align controls

* Improve test readability on `TryGetExactPathName()`

* Stash: Add cherry pick of the currently selected file changes

Fixes gitextensions#6902

* fix: Commit message incorrect height at 150% scale factor

Closes gitextensions#6898

* Add support for "--rebase-merges" for newest version of git

now that we recommend v2.22 (gitextensions#6769) that deprecate "--preserve-merges"

See:
* for option deprection: git/git@fa1b86e#diff-c7361e406139e8cd3a300b80b8f8cc8dR1220
* for some doc: https://stackoverflow.com/questions/15915430/what-exactly-does-gits-rebase-preserve-merges-do-and-why/50555740#50555740

* fixup! fix: Commit message incorrect height at 150% scale factor

* Fix: Build error due to duplicate NSubstitue entry in csproj

it's already in the proj as a package reference

* Sign contributors.txt

* signed contributors.txt

* ReleaseNotesGenerator plugin To field defaults to "HEAD" (gitextensions#4444)

* fix Delete tag not working

Fixes gitextensions#6281

* improved validation on create new repository dialog (fixes gitextensions#6955)

* Add an option to sort commits by author date in the revision graph.

* Adding myself to contributors.txt

* fix: Illegal characters in path

Do not crash the app if a repository contains illegal characters.

Closes gitextensions#6982

* fix tests

* fix: Remote Repositories List Empty

Restore saving a successfully cloned repository to the list of recent remotes.

Fixes gitextensions#6983

* Add option for default pull action in setting page

This change adds a dropdown for choosing default pull action
on the general tab in main setting dialog.

* Delete obsolete branches plugin - fix gitextensions#6813

* Add codescene.io analysis results (gitextensions#6272)

Codescene.io doesn't require any build programming, just a free account and an integration button click at codescene.io.
This may be a perfect fit for codecov analysis already in place.

* Replace git-diff patience with histogram

* Fix: Commit Dialog Spell Checker

* TortoiseGitMerge.exe old default name

* Adding myself to contributors.txt

* Fix: Proper spacing (gitextensions#7002)

Fix: Proper spacing

* Updated changed github id

* Fix: Keep push dialog open on failure (gitextensions#6367)

* The GroupBox items contained in the form need to… (gitextensions#7021)

* Fix for issue gitextensions#7020. The GroupBox items contained in the form need to have their AutoSize properties set to true, so they can resize when their contained controls do.

* Added my name to the contributors

* Settings: Display label to the top to make UI more readable on multiline controls

* should fix: [NBug] Sequence contains no elements gitextensions#7011

* fix: Crash when suggest merge/diff tool paths

If merge/diff tool paths enclosed in quotes, clicking on "Suggest" button
would crash the app.

Strip quotes from paths before attempting to suggest.

Fixes gitextensions#7000

* Display icons in commit templates menu items

* Fix potential bad end of line replacement

If the value contains a `\r\n`, the result will contain `\r\r\n`
which duplicate blank lines at the loading and each time a settings is changed and saved...

* JiraCommitHintPlugin: fix bad condition

* JiraCommitHintPlugin: Open the settings when not enabled

* Add scripts for BeforeFetch and AfterFetch (gitextensions#7026)

Additional scripts that should be executed before/after fetch can be added.

Fixes gitextensions#4909

* Fix: Add "Force push with lease" to the push dialog (gitextensions#3934)

* Generate GitHub OAuth token with github api

* Settings: Ensure that `CustomControl` is set

if we let the Setting(s) classes create the controls.
Otherwise, it could will trow a NRE if we access it to get the current value

* Add me (KvanTTT) to contributors.txt

* fix: Overflow error in Commit Dialog

DiffViewerLineNumberControl did not handle when MaxLineNumber was 0. Either an empty file can cause this (in this case _diffLines is empty so no problem) or a file where diff hunks were lost due to encoding errors.

Fixes gitextensions#7023

* Add a `PseudoSetting` to display controls that are not settings

i.e. that don't save a value in the settings files.
It is used to easily display a control that is not a setting (linklabel, text,...)

PS: Solve problem linklabels truncated horizontally of vertically if the good size is not set
(because the size no more have to be set)

* JiraCommitHintPlugin: Simplify settings definition by using`PseudoSetting`

Solve LinkLabel slightly truncated vertically

* Plugins: Being able to change CredentialsControl labels

to specify other things than the currently "User name" / "Password".

For example: "email" / "Token"

* Add me (palver123) to contributors.txt

* Update the GitExtensionsDoc submodule to 3.2

* Allow multi-select of files in FormStash

* Clarify Settings-Stash label

* File suffix incorrectly detected

If the file has no extension but the directory path has a period

* Ignore difftool for CombinedDiff

* fix installer for Win7

* Fix scrolling for committers label in statistics plugin (gitextensions#7092)

* Fix scrolling for committers label in statistics plugin

* Fix opencover not submiting reports

Looks like a regression on Appveyor side after they updated the VS2017
image.
The opencover now needs to be run as admin (?)

* Reintegration of PluginManager.

* Fix duplicate ignored tests

* Remove test assuming local file paths

* correctly call hMSBuild batch file

* Update version

* Add dummy item for the menu entry to appear expandable (7046)

Add dummy item for the menu entry to appear expandable (7046)

* JiraPlugin: Fix way to define TranslationString that prevent translation

+ remove TranslationString redundant with settings caption
(which is translated when defined in a private field!)

* Remove KDiff3 hardcoding

* Update README.md

* Update ChangeLog.md

* Update README.md

* Set repo workingdir from env only if cmd line arguments

This will allow starting with the dashboard in the debugger

* Set recommended Git version to 2.23.0

* PathUtil.GetDirectoryName did not accept root dirs

* Avoid exception when starting from commandline with rooted dir

* fix incorrect user-agent

Fixes gitextensions#7157

* Add hotkeys for middle of rebase etc.

* exename not set for tortoisemerge

* Consider the end-of-body marker everywhere

in the detection of single-line commit messages
(completes 53ebf95)

* Add more test cases for empty lines in commit msgs

addendum to PR gitextensions#6877

* Allow 'Amend Commit' for any CommitKind

reverts 82f125d partially

* Improve some mnemonics of commit dialog

* ConEmu 19.7.14

* Refactor: argument always null; positive logic

* correctly detect script options starting with "s"

resolves regression from commit 1b8bb93

* FormBrowse: provide RevisionGrid to ScriptRunner

* Add NUnit tests for ScriptRunner; handle nulls

* Settings: Prevent the multiple creation of controls

because `GetSettings()` (where controls are created) is call 3 times
that ends with that the controls displayed are not the one
that are the ones set in `CustomControl` property.

And that can cause problems if we manipulate `CustomControl`in the setting page
to get (until the setting is saved) or set a value.

We **must** keep the strategy that `GetSettings()` return every time new controls
because the previous instances of the controls are disposed when the settings form is closed.

These changes ensure that the `GetSettings()` method is called only **1** time.

The 2 other times (use of `.Any()`) has been replaced by a `HasSettings` property.

* Add modifyCommitMessageButton

* GitStatusMonitor: Timer wraps after 25 days

 * Always compare timer diff (to handle timer wraparound after 25 days)
 to avoid missing updates while command is running
 * Increase min update time 3s -> 5s at changes in the file system
 * Use locks consistently
 * Start interactive update only once to avoid race where two commands started

* Gerrit Plugin fixes/improvements

Fix syntax for gerrit push command
Fix Gerrit Publish dialog layout
Add CC and Hashtag to Gerrit Push
See: https://gerrit-review.googlesource.com/Documentation/user-upload.html#_git_push

* Try fix gitextensions#7205, gitextensions#7193

* Branch list could contain '+'

Seen in CommitInfo
Added test

* Popup when error staring mergetool

* Catch ConEmu exception for Done()

* Support older Gerrit API

Close gitextensions#7200

* Update contributors.txt (gitextensions#7220)

* Update contributors.txt

* Blame: Fix missing commit metadata on some commits

due to "orphan" filename lines that has for effect to overwrite good commit data
by incomplete ones when "Detect move and copy in all files" is enabled.

For example, command:

`git blame --porcelain -M -C -w -l "18fcca6d89c2d38ac1830697b5da3f78630b226e" -- "GitUI/Translation/English.Plugins.xlf"`

returns (part of the file):

`8f8393c283e7ad60c02805182d6778e5fc0c8b28 180 13
	      <trans-unit id="MsBuildEnabled.Caption">
b1d567e 7506 14 3
filename GitUI/Translation/English.xlf       <= orphan line that breaks the blame
	        <source>Enabled</source>
b1d567e 7507 15
	        <target />
b1d567e 7508 16
	      </trans-unit>
8f8393c 184 17 12
	      <trans-unit id="MsBuildPath.Caption">`

* Update contributors.txt

Fix emails

* Update readme

* Exclude "fixup!" and "squash!" prefixes from commit message RegEx validation

That prevent a boring question to be asked to the user
because the commit message doesn't follow the regex when
"fixup!" or "squash!" prefixes are used.

* Dont confirm switch worktree option (gitextensions#6864)

Dont confirm switch worktree option (gitextensions#6864)

Dont confirm switch worktree option (gitextensions#6864)

* GitIndexWatcher: check that directory exists before enabling

* Settings: Regenerate the Controls when previous instance was disposed

because we don't control the controls lifecycle
and the settings controls are disposed when settings are closed.

It depends on how the settings control is defined but could prevent exceptions
(and make plugins easier to write)

* Ordering of options

Ordering of options

* Add support for command line commit message when committing

close gitextensions#7219

* sort fields

* Add tests for `ArgumentBuilder`
@RussKie RussKie removed this from the 3.3 milestone Nov 16, 2019
@RussKie RussKie removed the :neckbeard: status: pull request only Requested changes won't be implemented by the Core team, community PRs are welcome label Nov 16, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging a pull request may close this issue.

5 participants