Adds a flag to the clean after checkout and clean before checkout adv… by roguishmountain · Pull Request #449 · jenkinsci/git-plugin

roguishmountain · 2016-11-17T19:22:24Z

…anced options

See bug report https://issues.jenkins-ci.org/browse/JENKINS-26660 for more details

roguishmountain · 2016-11-17T19:23:15Z

Depends on jenkinsci/git-client-plugin#222

leandro-lucarella-sociomantic

Same comments as with jenkinsci/git-client-plugin#222

MarkEWaite · 2017-12-16T04:50:22Z

I uploaded a build of required git client plugin build and the git plugin build.

The git client is based on the latest master branch. The git plugin is the latest master branch plus a browser guesser enhancement and a fix for a performance problem due to excessive calls to rev-parse.

MarkEWaite

Changes look good in my interactive testing. Looking for further testing from @leandro-lucarella-sociomantic

MarkEWaite · 2018-05-28T13:23:14Z

This pull request works well for Freestyle jobs.

It needs more work on the Pipeline portion of the implementation before it can be merged. The Pipeline syntax suggestions are not as tidy as they should be when submodule cleaning is enabled.

leandro-lucarella-sociomantic · 2018-05-28T16:54:42Z

For what is worth (and sorry for the delay), the tests also were well on our side, but we didn't test with pipelines.

akoeplinger · 2018-10-18T21:02:52Z

What's the current status of this PR?

akoeplinger · 2018-11-12T23:04:28Z

@MarkEWaite is the Pipeline work the only remaining issue before this PR can be merged?

MarkEWaite · 2018-11-13T01:47:52Z

@akoeplinger the pipeline improvements are needed and further testing is needed.

If you'd like to test the pull request, you can use https://ci.jenkins.io/job/Plugins/job/git-plugin/job/PR-449/107/artifact/org/jenkins-ci/plugins/git/4.0.0-rc2925.b198443241fc/git-4.0.0-rc2925.b198443241fc.hpi as the git plugin for testing along with https://ci.jenkins.io/job/Plugins/job/git-client-plugin/job/master/258/artifact/org/jenkins-ci/plugins/git-client/3.0.0-beta6-rc1827.ac5f9c819272/git-client-3.0.0-beta6-rc1827.ac5f9c819272.hpi as the git client plugin

…anced options See bug report https://issues.jenkins-ci.org/browse/JENKINS-26660 for more details

roguishmountain · 2018-11-28T17:00:42Z

@MarkEWaite the most recent commit fixes the pipeline syntax suggestions.

darxriggs · 2018-12-18T16:55:25Z

src/main/resources/hudson/plugins/git/extensions/impl/CleanBeforeCheckout/config.groovy

+
+f.entry(title:_("Clean submodules (Add additional -f flag)"), field:"cleanSubmodule") {
+    f.checkbox()
+}


A newline should be added here.

darxriggs · 2018-12-18T17:29:29Z

src/main/resources/hudson/plugins/git/extensions/impl/CleanBeforeCheckout/config.groovy

+
+def f = namespace(lib.FormTagLib);
+
+f.entry(title:_("Clean submodules (Add additional -f flag)"), field:"cleanSubmodule") {


There is a "cligit" and "jgit" implementation. This comment about the -f flag is more or less only valid for the "cligit" implementation. But I am not sure what's the common way to deal with the implementation differences regarding user facing documentation in this plugin. @MarkEWaite what's your opinion?

darxriggs · 2018-12-18T17:40:02Z

src/main/java/hudson/plugins/git/extensions/impl/CleanBeforeCheckout.java

+
+    private boolean cleanSubmodule;
    @DataBoundConstructor
+    public CleanBeforeCheckout(final boolean cleanSubmodule) {


Please have a look at https://jenkins.io/doc/developer/plugin-development/pipeline-integration/#constructor-vs-setters. I suggest to not add another constructor (this procedure is hard to maintain when more and more parameters are added) but to use a setter method annotated with @DataBoundSetter.

@roguishmountain did you have some time to look at this?

darxriggs · 2018-12-18T17:44:40Z

src/main/resources/hudson/plugins/git/extensions/impl/CleanBeforeCheckout/config.groovy

@@ -0,0 +1,8 @@
+package hudson.plugins.git.extensions.impl.CleanBeforeCheckout;


Semicolons are optional in Groovy and it is common to not use them.

leandro-lucarella-sociomantic · 2019-04-11T13:54:36Z

Was this resolved or abandoned?

MarkEWaite · 2019-04-11T14:27:02Z

Neither resolved nor abandoned. I've assigned it to the milestone "Later" and closed the pull request for now. My priorities for development on the git plugin are:

Resolve open blocking issues in the 4.0 milestone
Complete git plugin 4.0 testing and release
Resolve BuildData bloat - JENKINS-19022 as described in BuildData label
Release git plugin version with BuildData bloat fix
Improve notifyCommit handling as described in notifyCommit label
Release git plugin version with notifyCommit improvements
Improve submodule handling as described in submodules label
Release git plugin version with submodule handling improvements
Improve repository caching in the plugin as described in the caching label
Release git plugin version with caching improvements
Improve changelog handling based on pull requests in changelog label
Release git plugin version with changelog improvements

Unless something else changes, I won't do further review on this change for a long time.

darxriggs · 2019-11-02T18:48:50Z

src/main/java/hudson/plugins/git/extensions/impl/CleanCheckout.java

+
+    private boolean cleanSubmodule;
    @DataBoundConstructor
+    public CleanCheckout(final boolean cleanSubmodule) {


See the comment on CleanBeforeCheckout.

darxriggs · 2019-11-18T21:08:34Z

@roguishmountain can you have a look at the review comments and reopen this pull request?

slonopotamus · 2019-11-21T12:31:54Z

See #792

MarkEWaite · 2019-12-20T21:37:30Z

Merged into master as #792 . Planned for release in git plugin 4.1.0

roguishmountain mentioned this pull request Nov 17, 2016

Clean takes a flag that will add a --force flag to clean. jenkinsci/git-client-plugin#222

Merged

leandro-lucarella-sociomantic approved these changes Dec 1, 2017

View reviewed changes

MarkEWaite approved these changes Dec 16, 2017

View reviewed changes

roguishmountain added 4 commits November 26, 2018 16:06

Adds a flag to the clean after checkout and clean before checkout adv…

c3e66ef

…anced options See bug report https://issues.jenkins-ci.org/browse/JENKINS-26660 for more details

Make original API available

d7da4fc

Remove duplication

860d181

Add getter for cleansubmodule. Also fixes pipeline issue.

f894f8d

roguishmountain force-pushed the submodule_clean branch from 007c189 to f894f8d Compare November 27, 2018 19:21

MarkEWaite added the Submodules Submodule handling label Dec 10, 2018

MarkEWaite added this to the 4.0 milestone Dec 11, 2018

darxriggs reviewed Dec 18, 2018

View reviewed changes

MarkEWaite modified the milestones: 4.0, Later Jan 4, 2019

MarkEWaite modified the milestone: Later Mar 9, 2019

MarkEWaite closed this Mar 9, 2019

darxriggs reviewed Nov 2, 2019

View reviewed changes

slonopotamus mentioned this pull request Nov 21, 2019

[JENKINS-26660] Expose 'cleanSubmodules' functionality to Jenkins UI #792

Merged

10 tasks

MarkEWaite removed this from the Later milestone Dec 20, 2019

MarkEWaite removed the Submodules Submodule handling label Dec 20, 2019


		def f = namespace(lib.FormTagLib);

		f.entry(title:_("Clean submodules (Add additional -f flag)"), field:"cleanSubmodule") {

		@@ -0,0 +1,8 @@
		package hudson.plugins.git.extensions.impl.CleanBeforeCheckout;

Conversation

roguishmountain commented Nov 17, 2016

Uh oh!

roguishmountain commented Nov 17, 2016

Uh oh!

leandro-lucarella-sociomantic left a comment

Choose a reason for hiding this comment

Uh oh!

MarkEWaite commented Dec 16, 2017

Uh oh!

MarkEWaite left a comment

Choose a reason for hiding this comment

Uh oh!

MarkEWaite commented May 28, 2018

Uh oh!

leandro-lucarella-sociomantic commented May 28, 2018

Uh oh!

akoeplinger commented Oct 18, 2018

Uh oh!

akoeplinger commented Nov 12, 2018

Uh oh!

MarkEWaite commented Nov 13, 2018

Uh oh!

roguishmountain commented Nov 28, 2018

Uh oh!

darxriggs Dec 18, 2018

Choose a reason for hiding this comment

Uh oh!

darxriggs Dec 18, 2018

Choose a reason for hiding this comment

Uh oh!

darxriggs Dec 18, 2018 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

darxriggs Nov 2, 2019

Choose a reason for hiding this comment

Uh oh!

darxriggs Dec 18, 2018

Choose a reason for hiding this comment

Uh oh!

leandro-lucarella-sociomantic commented Apr 11, 2019

Uh oh!

MarkEWaite commented Apr 11, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

darxriggs Nov 2, 2019

Choose a reason for hiding this comment

Uh oh!

darxriggs commented Nov 18, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

slonopotamus commented Nov 21, 2019

Uh oh!

MarkEWaite commented Dec 20, 2019

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

darxriggs Dec 18, 2018 •

edited

Loading

MarkEWaite commented Apr 11, 2019 •

edited

Loading

darxriggs commented Nov 18, 2019 •

edited

Loading