Branch: refs/heads/master Home: https://github.com/jenkinsci/git-plugin Commit: f426303f1bb9bb7582b6a1ab5438bee21daaa949 https://github.com/jenkinsci/git-plugin/commit/f426303f1bb9bb7582b6a1ab5438bee21daaa949 Author: Corey O'Connor <coreyocon...@gmail.com> Date: 2012-08-09 (Thu, 09 Aug 2012)
Changed paths: M pom.xml Log Message: ----------- add dependencies on multiple-scms and google guava Commit: dc0bf25d0637273c25e81d2cbe2193e0e7754d28 https://github.com/jenkinsci/git-plugin/commit/dc0bf25d0637273c25e81d2cbe2193e0e7754d28 Author: Corey O'Connor <coreyocon...@gmail.com> Date: 2012-08-09 (Thu, 09 Aug 2012) Changed paths: M src/test/java/hudson/plugins/git/AbstractGitTestCase.java M src/test/java/hudson/plugins/git/GitSCMTest.java Log Message: ----------- culprit tests should be agnostic to order Commit: 9ce0b870e699c2e31b95f279ca84809555b637aa https://github.com/jenkinsci/git-plugin/commit/9ce0b870e699c2e31b95f279ca84809555b637aa Author: Corey O'Connor <coreyocon...@gmail.com> Date: 2012-08-09 (Thu, 09 Aug 2012) Changed paths: M src/test/java/hudson/plugins/git/GitSCMTest.java Log Message: ----------- finish implementation of assertCulprits Commit: 51b711260e80004f57de42ecb39875e36a5aba4c https://github.com/jenkinsci/git-plugin/commit/51b711260e80004f57de42ecb39875e36a5aba4c Author: Corey O'Connor <coreyocon...@gmail.com> Date: 2012-08-09 (Thu, 09 Aug 2012) Changed paths: M src/test/java/hudson/plugins/git/AbstractGitTestCase.java A src/test/java/hudson/plugins/git/TestGitRepo.java Log Message: ----------- refactor out test git repo interface. Commit: adbe9ef9880c35e946c3ece3f866bfe9082e727a https://github.com/jenkinsci/git-plugin/commit/adbe9ef9880c35e946c3ece3f866bfe9082e727a Author: Corey O'Connor <co...@ooyala.com> Date: 2012-08-09 (Thu, 09 Aug 2012) Changed paths: M pom.xml Log Message: ----------- depend on SNAPSHOT version of multiple scms plugin Commit: da1ac57447c8977752c31a51ea74b93b8e26f2a1 https://github.com/jenkinsci/git-plugin/commit/da1ac57447c8977752c31a51ea74b93b8e26f2a1 Author: Corey O'Connor <coreyocon...@gmail.com> Date: 2012-08-09 (Thu, 09 Aug 2012) Changed paths: A src/test/java/hudson/plugins/git/MultipleSCMTest.java Log Message: ----------- start of test for multiple scms integration Commit: 1065845e816e71bf043e504f054d9e8e611c9c78 https://github.com/jenkinsci/git-plugin/commit/1065845e816e71bf043e504f054d9e8e611c9c78 Author: Corey O'Connor <co...@ooyala.com> Date: 2012-08-09 (Thu, 09 Aug 2012) Changed paths: M src/test/java/hudson/plugins/git/GitSCMTest.java Log Message: ----------- remove unneeded comments Commit: 16aa1fd98be90ce38d4ea59604aa91a0da80b3ff https://github.com/jenkinsci/git-plugin/commit/16aa1fd98be90ce38d4ea59604aa91a0da80b3ff Author: Corey O'Connor <co...@ooyala.com> Date: 2012-08-09 (Thu, 09 Aug 2012) Changed paths: M src/test/java/hudson/plugins/git/AbstractGitTestCase.java M src/test/java/hudson/plugins/git/MultipleSCMTest.java M src/test/java/hudson/plugins/git/TestGitRepo.java Log Message: ----------- add a basic test to the multiple scms test Commit: b3bf8fb170e95a433728cd98a78c2e71765de7c0 https://github.com/jenkinsci/git-plugin/commit/b3bf8fb170e95a433728cd98a78c2e71765de7c0 Author: Corey O'Connor <co...@ooyala.com> Date: 2012-08-09 (Thu, 09 Aug 2012) Changed paths: M src/main/java/hudson/plugins/git/GitSCM.java M src/main/java/hudson/plugins/git/util/BuildData.java Log Message: ----------- refactor GitSCM.checkout into two methods. Plus some documentation tweaks Commit: d052ac05fdce7285a5b51dd98c458653781ee432 https://github.com/jenkinsci/git-plugin/commit/d052ac05fdce7285a5b51dd98c458653781ee432 Author: Corey O'Connor <coreyocon...@gmail.com> Date: 2012-08-09 (Thu, 09 Aug 2012) Changed paths: M src/main/java/hudson/plugins/git/BranchSpec.java Log Message: ----------- Add toString to BranchSpec. Commit: 89ab845ed304f0a406978f7c86db493077c7746a https://github.com/jenkinsci/git-plugin/commit/89ab845ed304f0a406978f7c86db493077c7746a Author: Corey O'Connor <coreyocon...@gmail.com> Date: 2012-08-09 (Thu, 09 Aug 2012) Changed paths: M src/main/java/hudson/plugins/git/GitAPI.java Log Message: ----------- log git --version output Commit: 1cfb395ca103baf4b202ee1107fa24032718f3e2 https://github.com/jenkinsci/git-plugin/commit/1cfb395ca103baf4b202ee1107fa24032718f3e2 Author: Corey O'Connor <coreyocon...@gmail.com> Date: 2012-08-09 (Thu, 09 Aug 2012) Changed paths: M src/main/java/hudson/plugins/git/GitAPI.java Log Message: ----------- Clarify the logging when using multiple SCM plugin. Commit: 46ed05f629c6872e837a952139266b57896d8a3c https://github.com/jenkinsci/git-plugin/commit/46ed05f629c6872e837a952139266b57896d8a3c Author: Corey O'Connor <coreyocon...@gmail.com> Date: 2012-08-09 (Thu, 09 Aug 2012) Changed paths: M src/main/java/hudson/plugins/git/GitSCM.java M src/main/java/hudson/plugins/git/UserRemoteConfig.java M src/main/java/hudson/plugins/git/util/BuildData.java M src/test/java/hudson/plugins/git/MultipleSCMTest.java Log Message: ----------- Add to BuildData the URLs that have been used. With the URLs recorded the GitSCM can differentiate between each of the BuildDatas a GitSCM records when used via the multiple SCMs plugin. Commit: 3d859f3055ebe62f910e560de6fa65b8e3cf1b8f https://github.com/jenkinsci/git-plugin/commit/3d859f3055ebe62f910e560de6fa65b8e3cf1b8f Author: Corey O'Connor <coreyocon...@gmail.com> Date: 2012-08-09 (Thu, 09 Aug 2012) Changed paths: M src/main/java/hudson/plugins/git/util/BuildData.java M src/test/java/hudson/plugins/git/MultipleSCMTest.java Log Message: ----------- expand MultipleSCMTest basicTest. Commit: 4a8471fc7081bd878e85faf80ffcd98e350c8a11 https://github.com/jenkinsci/git-plugin/commit/4a8471fc7081bd878e85faf80ffcd98e350c8a11 Author: Corey O'Connor <co...@ooyala.com> Date: 2012-08-09 (Thu, 09 Aug 2012) Changed paths: M src/main/java/hudson/plugins/git/util/BuildData.java Log Message: ----------- assure BuildData.remoteUrls is always not-null Commit: ff12a35fe92ff500102f26cb876bbb91447f4650 https://github.com/jenkinsci/git-plugin/commit/ff12a35fe92ff500102f26cb876bbb91447f4650 Author: Corey O'Connor <co...@ooyala.com> Date: 2012-08-09 (Thu, 09 Aug 2012) Changed paths: M src/main/java/hudson/plugins/git/util/BuildData.java Log Message: ----------- make sure remoteUrls is never null Commit: 2decbbabd6657e29f8f9783e72111d1a5bfd5679 https://github.com/jenkinsci/git-plugin/commit/2decbbabd6657e29f8f9783e72111d1a5bfd5679 Author: Corey O'Connor <co...@ooyala.com> Date: 2012-08-09 (Thu, 09 Aug 2012) Changed paths: M pom.xml Log Message: ----------- up to 1.1.25-SNAPSHOT Commit: d00e3300f7ddf7b8575d170e4c5fd3cee008ba76 https://github.com/jenkinsci/git-plugin/commit/d00e3300f7ddf7b8575d170e4c5fd3cee008ba76 Author: Corey O'Connor <co...@ooyala.com> Date: 2012-08-09 (Thu, 09 Aug 2012) Changed paths: M src/main/java/hudson/plugins/git/util/BuildData.java Log Message: ----------- remove incorrect @Exported Commit: 7c08b0dcb6151d2599f81fdf5cd43060025a45d6 https://github.com/jenkinsci/git-plugin/commit/7c08b0dcb6151d2599f81fdf5cd43060025a45d6 Author: Corey O'Connor <coreyocon...@gmail.com> Date: 2012-08-13 (Mon, 13 Aug 2012) Changed paths: M pom.xml M src/main/java/hudson/plugins/git/GitStatus.java M src/main/java/hudson/plugins/git/MultipleScmResolver.java A src/main/java/hudson/plugins/git/browser/Stash.java A src/main/resources/hudson/plugins/git/browser/Stash/config.jelly A src/main/resources/hudson/plugins/git/browser/Stash/help-url.html Log Message: ----------- Merge branch 'upstream' Conflicts: pom.xml Commit: 0a692cc74a8aeceddcd84d95ec372086ee5907cb https://github.com/jenkinsci/git-plugin/commit/0a692cc74a8aeceddcd84d95ec372086ee5907cb Author: Corey O'Connor <coreyocon...@gmail.com> Date: 2012-08-13 (Mon, 13 Aug 2012) Changed paths: M pom.xml Log Message: ----------- add dependency on google guava Commit: 2baba4032d64a8df56e484d85fa93c99d825ce7f https://github.com/jenkinsci/git-plugin/commit/2baba4032d64a8df56e484d85fa93c99d825ce7f Author: Corey O'Connor <coreyocon...@gmail.com> Date: 2012-08-13 (Mon, 13 Aug 2012) Changed paths: M src/test/java/hudson/plugins/git/AbstractGitTestCase.java M src/test/java/hudson/plugins/git/GitSCMTest.java Log Message: ----------- culprit tests should be agnostic to order Commit: d2480cb9829872b82b60c454edfb2fbb2e0e679e https://github.com/jenkinsci/git-plugin/commit/d2480cb9829872b82b60c454edfb2fbb2e0e679e Author: Corey O'Connor <coreyocon...@gmail.com> Date: 2012-08-13 (Mon, 13 Aug 2012) Changed paths: M src/test/java/hudson/plugins/git/AbstractGitTestCase.java A src/test/java/hudson/plugins/git/TestGitRepo.java Log Message: ----------- refactor out test git repo interface. Commit: a4677aeee7aa5bc48acd070080090eae5838cb2c https://github.com/jenkinsci/git-plugin/commit/a4677aeee7aa5bc48acd070080090eae5838cb2c Author: Corey O'Connor <coreyocon...@gmail.com> Date: 2012-08-13 (Mon, 13 Aug 2012) Changed paths: M src/test/java/hudson/plugins/git/AbstractGitTestCase.java M src/test/java/hudson/plugins/git/GitSCMTest.java A src/test/java/hudson/plugins/git/MultipleSCMTest.java M src/test/java/hudson/plugins/git/TestGitRepo.java Log Message: ----------- add a basic integration test with the multiple scms plugin. Commit: b4354daabd99cfc98e97fa08881cd6905072b076 https://github.com/jenkinsci/git-plugin/commit/b4354daabd99cfc98e97fa08881cd6905072b076 Author: Corey O'Connor <coreyocon...@gmail.com> Date: 2012-08-13 (Mon, 13 Aug 2012) Changed paths: M src/main/java/hudson/plugins/git/BranchSpec.java M src/main/java/hudson/plugins/git/GitAPI.java M src/main/java/hudson/plugins/git/GitSCM.java M src/main/java/hudson/plugins/git/UserRemoteConfig.java M src/main/java/hudson/plugins/git/util/BuildData.java M src/test/java/hudson/plugins/git/MultipleSCMTest.java Log Message: ----------- Corrects integration with Multiple SCMs plugin. This corrects integration by adding additional information (source URL) to the BuildData that allows an instance of GitSCM to uniquely identify BuildData separate from other instances of GitSCM. I suspect this fix can be cleaned up. BuildData should be a monoid and only a single instance should be associated with each Run. Still, this fix is correct and forwards-compatible with the outlined "cleaner" fix. Commit: 5ff5f24289120ef86de74ebdfdceedbbc15e88b9 https://github.com/jenkinsci/git-plugin/commit/5ff5f24289120ef86de74ebdfdceedbbc15e88b9 Author: Nicolas De loof <nicolas.del...@gmail.com> Date: 2012-08-13 (Mon, 13 Aug 2012) Changed paths: M pom.xml M src/main/java/hudson/plugins/git/BranchSpec.java M src/main/java/hudson/plugins/git/GitAPI.java M src/main/java/hudson/plugins/git/GitSCM.java M src/main/java/hudson/plugins/git/UserRemoteConfig.java M src/main/java/hudson/plugins/git/util/BuildData.java M src/test/java/hudson/plugins/git/AbstractGitTestCase.java M src/test/java/hudson/plugins/git/GitSCMTest.java A src/test/java/hudson/plugins/git/MultipleSCMTest.java A src/test/java/hudson/plugins/git/TestGitRepo.java Log Message: ----------- Merge pull request #85 from ooyala/upstream-merge Correct integration with Multiple SCMs plugin Compare: https://github.com/jenkinsci/git-plugin/compare/181fd2fb7391...5ff5f2428912