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
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
Mohamed Karray
7a1de0f67b
add the interface StoreFactory and refactor storeFactories
2018-11-27 11:35:02 +01:00
René Pfeuffer
00ab764dab
Store repository id in native config file
...
Hooks can read this repository type dependant config file and handle
the changes for the correct repository id
2018-11-26 17:22:17 +01:00
René Pfeuffer
0f7e49d20f
Bring constant home
2018-11-23 15:52:21 +01:00
René Pfeuffer
3d671caada
Let dao create repository base directory before native creation
2018-11-23 15:04:59 +01:00
René Pfeuffer
e8558e07ec
Use repository dao to find repository for given directory in hooks
2018-11-23 10:13:47 +01:00
René Pfeuffer
20f5e7be1f
Cleanup usage of InitialRepositoryLocationResolver and RepositoryLocationResolver
2018-11-22 17:06:29 +01:00
Mohamed Karray
bb1c84ba24
modify metadata.xml only if needed
...
introduce a defaultRepositoryDirectory in the XmlRepositoryDatabase
Bugfix: modify repository with changed location
2018-11-21 12:01:13 +01:00
Mohamed Karray
39e5c19251
merge
2018-11-15 11:28:33 +01:00
Mohamed Karray
f8ae7cedf7
Refactor the repository store implementation in order to store repositories in specific paths.
2018-11-15 10:04:16 +01:00
René Pfeuffer
232e4fc072
Delete wrong throws JavaDoc declarations
2018-11-08 17:01:57 +01:00
René Pfeuffer
78da8c743f
Put repository in git context to create proper exceptions
2018-11-08 16:42:45 +01:00
Sebastian Sdorra
cf519a7545
Merged in feature/merge_api (pull request #106 )
...
Feature merge api
2018-11-08 15:08:07 +00:00
René Pfeuffer
6bddf9951f
Make commit message configurable
2018-11-08 14:59:00 +01:00
René Pfeuffer
97d158ab35
Naming
2018-11-08 14:39:30 +01:00
René Pfeuffer
42f0632a23
Add check for merged file to unit test
2018-11-08 14:03:09 +01:00
René Pfeuffer
720862296e
Use logged in user for author as default
2018-11-08 13:30:05 +01:00
Sebastian Sdorra
2201f2436e
Merged in feature/errorhandling (pull request #99 )
...
Feature Error Handling
2018-11-08 09:36:18 +00:00
René Pfeuffer
1037d8d266
Merge with 2.0.0-m3
2018-11-08 09:21:41 +01:00
Sebastian Sdorra
c59ba9e149
Merged in feature/log_two_revisions (pull request #104 )
...
Feature log two revisions
2018-11-07 14:07:50 +00:00
René Pfeuffer
8771f68081
Set author for merge
2018-11-07 14:02:02 +01:00
René Pfeuffer
2d04e6c2f0
Specify not mergeable files in merge result
2018-11-07 13:34:35 +01:00
René Pfeuffer
e377ce5988
Implement first steps for actual merge
2018-11-07 11:52:49 +01:00
René Pfeuffer
04c5d6f84a
Fix deletion of temporary clone directory
2018-11-07 11:13:21 +01:00
René Pfeuffer
33642352ea
Start with a simple factory instead of a complex pool
2018-11-07 10:28:27 +01:00
René Pfeuffer
fc3e08d612
Include dry run in merge command
2018-11-07 08:32:27 +01:00
