Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-10 07:25:44 +01:00
Code Issues Packages Projects Releases Activity
8,590 Commits 32 Branches 207 Tags
4f17bc6b1cbe27341e7777b9b99a7935ea7fa07e
Commit Graph

244 Commits

Author SHA1 Message Date
Sebastian Sdorra
dd39c6b535 fixed missing checkout call for GitBranchCommand 2019-04-17 13:51:13 +02:00
René Pfeuffer
e649a66423 Fix unit test 2019-04-11 13:52:23 +02:00
René Pfeuffer
9833bfd34d Merge with 2.0.0-m3 2019-03-29 11:54:17 +01:00
René Pfeuffer
2a19313df5 Remove unknown val 2019-03-29 11:06:10 +01:00
René Pfeuffer
1162536e21 Simplify workdir factory 2019-03-29 10:02:38 +01:00
René Pfeuffer
93cec3d282 Add parameter for parent of new branch 2019-03-28 16:15:31 +01:00
René Pfeuffer
df9e16c485 Clean up generics 2019-03-28 14:10:43 +01:00
René Pfeuffer
b65e84249d Use clone and push to create branches 
Generalize workdir creation for git and hg and create branches in
clones instead of the scm repository, so that hooks will be fired
correctly once the changes are pushed back.

Missing:

- Evaluation of the git response from the push command
- configuration of the hg environment and the authentication, so that
  the scmhooks.py script can be triggeret correctly and can callback
  the scm manager
 2019-03-27 10:08:20 +01:00
René Pfeuffer
3c7930d1a9 Add "production" branch command 
There already was a branch command for test purposes. This was adapted
for production use with git and hg.
 2019-03-26 09:16:33 +01:00
René Pfeuffer
b14eadb13d Add missing mockito config file 2019-03-25 16:44:05 +01:00
René Pfeuffer
39ae41327a Add missing mockito config file 2019-03-25 16:44:05 +01:00
René Pfeuffer
b36f1ca3e4 Mark default branch for git 2019-03-25 12:08:44 +01:00
René Pfeuffer
4ec7006108 Enhance branch object with default flag 2019-03-25 11:28:29 +01:00
René Pfeuffer
cf7e44c04f Merge with 2.0.0-m3 2019-03-11 16:52:14 +01:00
René Pfeuffer
d82f38e0f9 Fix unit test 2019-03-11 16:00:16 +01:00
René Pfeuffer
28d7467e18 Throw not found exceptions for log between branches 2019-03-11 14:17:03 +01:00
René Pfeuffer
ec2aff6aa9 Fix NPE in dry run for missing branches 2019-03-11 09:07:57 +01:00
René Pfeuffer
13695a8671 Keep protocol in variable 
We encountered many test failures in Jenkins due to git saying that it
cannot handle scm://. This is a try and error approach.
 2019-03-07 17:19:08 +01:00
René Pfeuffer
7adbc4df51 Add some unit test 2019-03-06 16:01:15 +01:00
René Pfeuffer
ebb21ee308 Modify test to test base, not specific class 
This was necessary after extracting base class.
 2019-03-05 13:47:46 +01:00
René Pfeuffer
9244a72110 Fix unit test 2019-02-21 12:16:39 +01:00
Mohamed Karray
d4a79ee140 Merged in bugfix/read_vcs_versions (pull request #178) 
Fix class loader for creation of vcs version string
 2019-02-06 09:04:04 +00:00
René Pfeuffer
accd20538e Fix class loader for creation of vcs version string 
Use UberClassLoader in
AbstractSimpleRepositoryHandler#getStringFromResource

Therefore pass through plugin loader
 2019-02-04 14:35:51 +01:00
Sebastian Sdorra
8bf82213b8 remove unused imports 2019-01-30 14:48:37 +01:00
Sebastian Sdorra
f8f5237ad0 fix usage of deprecated mockito classes 2019-01-30 14:44:38 +01:00
Sebastian Sdorra
69dda6403d update resteasy to v3.6.2.Final in order to fix CVE-2017-7561 and CVE-2016-6347 2019-01-30 13:21:11 +01:00
Sebastian Sdorra
c42028433f map nonFastForwardDisallowed field from GitConfig and added ui 2019-01-29 10:26:11 +01:00
Sebastian Sdorra
b231499cd0 merge with branch 1.x 2019-01-29 09:42:03 +01:00
René Pfeuffer
3b33b3b0a4 Merge with 2.0.0-m3 2018-12-20 10:55:40 +01:00
René Pfeuffer
ffa013de68 Merge with 2.0.0-m3 2018-12-20 10:44:44 +01:00
René Pfeuffer
547947a1b3 Add zip for test 2018-12-19 14:38:29 +01:00
René Pfeuffer
a9300df7f4 Fix incoming diff with merges from target branch. 
Taking the git history example below, the previous version only computed
commits 'b3' upward for log of 'b' with ancestor 'master' and missed
commits 'b1', 'b2' and the first merge.

* 86e9ca0 (HEAD -> b) b5
*   d69edb3 Merge branch 'master' into b
|\
| * 946a8db (master) f
| * b19b9cc e
* | 3d6109c b4
* | 6330653 b3
* |   a49a28e Merge branch 'master' into b
|\ \
| |/
| * 0235584 d
| * 20251c5 c
* | 5023b85 b2
* | 201ecc1 b1
|/
* 36b19e4 b
* c2190a9 a
 2018-12-19 13:33:57 +01:00
René Pfeuffer
c2d872bd59 Modify git HEAD on default branch change 2018-12-13 18:32:20 +01:00
René Pfeuffer
9e963b6aeb Enrich repository collection, too 2018-12-13 10:00:03 +01:00
René Pfeuffer
dbbe467479 Remove old property for default branch 2018-12-12 17:30:23 +01:00
René Pfeuffer
b4081aaa99 Add endpoint to set default branch 2018-12-12 15:04:56 +01:00
René Pfeuffer
bc8c776821 Introduce config rest endpoint for default git branch 2018-12-12 14:12:55 +01:00
René Pfeuffer
0e333002db Create local branch for target during merge 2018-12-10 11:43:27 +01:00
René Pfeuffer
438339ae49 Unbind scm protocol after test 2018-12-07 13:33:58 +01:00
René Pfeuffer
8b97e00b36 Fix unit test 2018-12-07 13:28:21 +01:00
René Pfeuffer
540a525bc3 Use SCM protocol for internal merge command 2018-12-07 08:19:14 +01:00
René Pfeuffer
35f73cdc18 Do not commit empty merges 2018-12-05 16:09:38 +01:00
René Pfeuffer
9a3b8c26fb Fix unit test 2018-12-05 16:01:34 +01:00
René Pfeuffer
3021bea65a Multiply floating store factories for type safety 2018-12-04 08:56:39 +01:00
René Pfeuffer
33f3216164 Make type optional 2018-12-03 16:30:19 +01:00
René Pfeuffer
44d99f55f2 Do no longer expose StoreParameters 2018-12-03 12:28:35 +01:00
Mohamed Karray
37f4a2b669 merge 2018-11-29 16:01:43 +01:00
Sebastian Sdorra
e9401624a7 re implement XmlRepositoryDAO 2018-11-28 19:49:55 +01:00
Mohamed Karray
fb79cbfd02 merge + refactor getStoreDirectory 2018-11-28 15:14:49 +01:00
René Pfeuffer
d4db39755f Harmonize repository resolution 2018-11-27 15:31:57 +01:00