Branch: refs/heads/refactoring
Home: https://github.com/jenkinsci/git-plugin
Commit: badbee12fa47d83bf97d08577d0f14855b833d50
https://github.com/jenkinsci/git-plugin/commit/badbee12fa47d83bf97d08577d0f14855b833d50
Author: Kohsuke Kawaguchi <k...@kohsuke.org>
Date: 2013-06-16 (Sun, 16 Jun 2013)
Changed paths:
M src/main/java/hudson/plugins/git/GitSCM.java
Log Message:
-----------
Removed useless warnings.
I consider this warning useless for multiple reasons.
1. It is not actionable. If the merge is configured, then this can happen
legitimately, and there's nothing the user can do about it.
2. it is reporting a problem in a wrong place. I assume the reason this was
reported is because when the commit we build is pointed by multiple branches
and all their changelogs show up in a single list, the user can't easily tell
which commit belongs to which branch. But that confusion happens when someone
is looking at the change list page, not when someone is looking at the console.
If grouping commits into branches they belong to is useful, then the right
thing to do is to fix the GitChangeLogSet so that it can do it.
Commit: 50ae100fa84f6dec54fbe99db2a231c791883ee1
https://github.com/jenkinsci/git-plugin/commit/50ae100fa84f6dec54fbe99db2a231c791883ee1
Author: Kohsuke Kawaguchi <k...@kohsuke.org>
Date: 2013-06-16 (Sun, 16 Jun 2013)
Changed paths:
M src/main/java/hudson/plugins/git/GitChangeSet.java
M src/main/java/hudson/plugins/git/GitSCM.java
M src/main/java/hudson/plugins/git/extensions/GitSCMExtension.java
M src/main/resources/hudson/plugins/git/GitChangeSetList/index.jelly
Log Message:
-----------
Unified the changelog computation.
As a step toward extracting out the merge setting to an GitSCMExtension,
eliminating the special handling for the changelog computation for a merge
commit.
As I left in the comment of the computeChangeLog method, the changelog
computation in the case of merge probably needs more work
Commit: e9b8b395fa36d4f73f4ba136a1f6146b84b52bec
https://github.com/jenkinsci/git-plugin/commit/e9b8b395fa36d4f73f4ba136a1f6146b84b52bec
Author: Kohsuke Kawaguchi <k...@kohsuke.org>
Date: 2013-06-16 (Sun, 16 Jun 2013)
Changed paths:
M src/main/java/hudson/plugins/git/GitSCM.java
M src/main/java/hudson/plugins/git/extensions/impl/SubmoduleOption.java
Log Message:
-----------
Moved out the submodule stuff into SubmoduleOptions
Commit: 2b8eae454bbc2b668a0d06ef6dc28b506832ba4c
https://github.com/jenkinsci/git-plugin/commit/2b8eae454bbc2b668a0d06ef6dc28b506832ba4c
Author: Kohsuke Kawaguchi <k...@kohsuke.org>
Date: 2013-06-16 (Sun, 16 Jun 2013)
Changed paths:
M src/main/java/hudson/plugins/git/GitSCM.java
M src/main/java/hudson/plugins/git/extensions/impl/SubmoduleOption.java
M src/main/java/hudson/plugins/git/util/BuildData.java
Log Message:
-----------
Simplification
it is unlikely that the caller doesn't statically know whether it wants to copy
or get
Commit: 0fcff171166c795812675b967450b1df58be7a27
https://github.com/jenkinsci/git-plugin/commit/0fcff171166c795812675b967450b1df58be7a27
Author: Kohsuke Kawaguchi <k...@kohsuke.org>
Date: 2013-06-16 (Sun, 16 Jun 2013)
Changed paths:
M src/main/java/hudson/plugins/git/util/Build.java
Log Message:
-----------
doc improvement
Commit: ed00156c7490868d72910e3217f87e150c99171f
https://github.com/jenkinsci/git-plugin/commit/ed00156c7490868d72910e3217f87e150c99171f
Author: Kohsuke Kawaguchi <k...@kohsuke.org>
Date: 2013-06-16 (Sun, 16 Jun 2013)
Changed paths:
M src/main/java/hudson/plugins/git/GitSCM.java
Log Message:
-----------
GitSCM checkout message is way too verbose.
Commit: f1dd5eac4978fb8b7c85e8459feddf5a43c0b802
https://github.com/jenkinsci/git-plugin/commit/f1dd5eac4978fb8b7c85e8459feddf5a43c0b802
Author: Kohsuke Kawaguchi <k...@kohsuke.org>
Date: 2013-06-16 (Sun, 16 Jun 2013)
Changed paths:
M src/main/java/hudson/plugins/git/GitSCM.java
R src/main/java/hudson/plugins/git/util/MergeBuild.java
A src/main/java/hudson/plugins/git/util/MergeRecord.java
Log Message:
-----------
Got rid of MergeBuild.
Build object is created by GitSCM, and every AbstractBuild gets exactly one, so
if we are to move the merge support to GitSCMExtension, then MergeBuild that
tries to take over the Build object doesn't work --- it's just not composable.
Commit: 471307575e7f6608668925322351124d427ee18d
https://github.com/jenkinsci/git-plugin/commit/471307575e7f6608668925322351124d427ee18d
Author: Kohsuke Kawaguchi <k...@kohsuke.org>
Date: 2013-06-17 (Mon, 17 Jun 2013)
Changed paths:
M src/main/java/hudson/plugins/git/GitSCM.java
M src/main/java/hudson/plugins/git/util/MergeRecord.java
Log Message:
-----------
further simplification
Commit: 4b9b4c02cd50bfb17fee7a995d8de99d07217dd6
https://github.com/jenkinsci/git-plugin/commit/4b9b4c02cd50bfb17fee7a995d8de99d07217dd6
Author: Kohsuke Kawaguchi <k...@kohsuke.org>
Date: 2013-06-17 (Mon, 17 Jun 2013)
Changed paths:
M src/main/java/hudson/plugins/git/GitSCM.java
Log Message:
-----------
clean is executing twice
Commit: b5c3350e81b520a75a8828e1ee35badf02d4a3d2
https://github.com/jenkinsci/git-plugin/commit/b5c3350e81b520a75a8828e1ee35badf02d4a3d2
Author: Kohsuke Kawaguchi <k...@kohsuke.org>
Date: 2013-06-17 (Mon, 17 Jun 2013)
Changed paths:
M src/main/java/hudson/plugins/git/GitSCM.java
Log Message:
-----------
more simplification
Commit: 90e29a6be4447dff8ef2984ece9a62ba21ad5343
https://github.com/jenkinsci/git-plugin/commit/90e29a6be4447dff8ef2984ece9a62ba21ad5343
Author: Kohsuke Kawaguchi <k...@kohsuke.org>
Date: 2013-06-17 (Mon, 17 Jun 2013)
Changed paths:
M src/main/java/hudson/plugins/git/GitSCM.java
Log Message:
-----------
Separated "retrieveChanges" from "determineRevisionToBuild"
Commit: 9accf4657f1b044f728f8efc9a0a861aaf448cd5
https://github.com/jenkinsci/git-plugin/commit/9accf4657f1b044f728f8efc9a0a861aaf448cd5
Author: Kohsuke Kawaguchi <k...@kohsuke.org>
Date: 2013-06-17 (Mon, 17 Jun 2013)
Changed paths:
M src/main/java/hudson/plugins/git/GitSCM.java
M src/main/java/hudson/plugins/git/extensions/GitSCMExtension.java
M src/main/java/hudson/plugins/git/extensions/impl/PerBuildTag.java
M src/main/java/hudson/plugins/git/extensions/impl/PruneStaleBranch.java
M src/main/java/hudson/plugins/git/extensions/impl/SubmoduleOption.java
Log Message:
-----------
Added a hook to decorate the selected commit.
This is for turning the merge support into an extension point
Commit: b3c44b6d28147e77496dfec3e38c4774ae53fe0a
https://github.com/jenkinsci/git-plugin/commit/b3c44b6d28147e77496dfec3e38c4774ae53fe0a
Author: Kohsuke Kawaguchi <k...@kohsuke.org>
Date: 2013-06-17 (Mon, 17 Jun 2013)
Changed paths:
M src/main/java/hudson/plugins/git/GitPublisher.java
M src/main/java/hudson/plugins/git/GitSCM.java
M src/main/java/hudson/plugins/git/GitSCMBackwardCompatibility.java
M src/main/java/hudson/plugins/git/UserMergeOptions.java
M src/main/java/hudson/plugins/git/extensions/GitSCMExtension.java
A src/main/java/hudson/plugins/git/extensions/impl/PreBuildMerge.java
M src/main/resources/hudson/plugins/git/GitSCM/config.jelly
R src/main/resources/hudson/plugins/git/GitSCM/help-userMergeOptions.html
A
src/main/resources/hudson/plugins/git/extensions/impl/PreBuildMerge/config.groovy
A
src/main/resources/hudson/plugins/git/extensions/impl/PreBuildMerge/help.html
M src/test/java/hudson/plugins/git/AbstractGitTestCase.java
M src/test/java/hudson/plugins/git/GitPublisherTest.java
M src/test/java/hudson/plugins/git/GitSCMTest.java
M src/test/java/hudson/plugins/git/GitStatusTest.java
M src/test/java/hudson/plugins/git/MultipleSCMTest.java
Log Message:
-----------
Pulled out the pre-build merge support into a separate extension point
Commit: 2f01ec91359468e11653e5d222b4a652cf032f55
https://github.com/jenkinsci/git-plugin/commit/2f01ec91359468e11653e5d222b4a652cf032f55
Author: Kohsuke Kawaguchi <k...@kohsuke.org>
Date: 2013-06-17 (Mon, 17 Jun 2013)
Changed paths:
M src/main/resources/hudson/plugins/git/GitSCM/config.jelly
R src/main/resources/hudson/plugins/git/GitSCM/help-pruneBranches.html
Log Message:
-----------
fixup for PruneStaleBranch
Compare:
https://github.com/jenkinsci/git-plugin/compare/4608d82d8cca...2f01ec913594
--
You received this message because you are subscribed to the Google Groups
"Jenkins Commits" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to jenkinsci-commits+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/groups/opt_out.
