Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2026-01-19 05:52:11 +01:00
Code Issues Packages Projects Releases Activity
8,687 Commits 38 Branches 210 Tags
47da28717848751dbcdfd5f8ed009926008cccea
Commit Graph

8687 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Rene Pfeuffer
47da287178 Merge with 2.0.0-m3 2019-11-13 13:06:39 +01:00
Rene Pfeuffer
d1747557b3 Make conflict exception accessible with complex context 2019-11-13 10:48:36 +01:00
Rene Pfeuffer
d8d7d993e3 Merge with 2.0.0-m3 2019-11-12 08:51:28 +01:00
Rene Pfeuffer
f0f134daeb Merged in feature/delete_source_branch (pull request #350) 
Feature/delete source branch
 2019-11-12 07:50:07 +00:00
Rene Pfeuffer
875b33d5c8 Close branch feature/delete_source_branch 2019-11-12 07:50:07 +00:00
Eduard Heimbuch
cc03af197f Merged in bugfix/merge_with_conflict (pull request #348) 
Remove unused mapper
 2019-11-12 07:48:20 +00:00
Eduard Heimbuch
b14fb1d852 Close branch bugfix/merge_with_conflict 2019-11-12 07:48:20 +00:00
Rene Pfeuffer
8ed874c103 Use dedicated exception for default branch deletion 2019-11-11 16:51:46 +01:00
Rene Pfeuffer
f7e42db850 Rename method 2019-11-11 16:50:39 +01:00
Rene Pfeuffer
8e4606cff1 Merge with 2.0.0-m3 2019-11-11 16:33:40 +01:00
Rene Pfeuffer
6b9aabd3ff Fix merge direction 2019-11-11 16:15:59 +01:00
Rene Pfeuffer
cc7ef47153 Fix access across jars 2019-11-11 16:15:45 +01:00
Sebastian Sdorra
0168234534 Merged in feature/create_branch_without_clone (pull request #349) 
Create new branches without clone of git repository
 2019-11-11 15:08:27 +00:00
Sebastian Sdorra
6a2bf9d32a Close branch feature/create_branch_without_clone 2019-11-11 15:08:27 +00:00
Rene Pfeuffer
3be74fbed6 Add api call for conflicts 2019-11-11 14:01:03 +01:00
Rene Pfeuffer
5cff9f8c16 Cleanup worker 2019-11-11 13:35:13 +01:00
Rene Pfeuffer
21d930cbbe Revert changes to abstract class 2019-11-11 13:24:47 +01:00
Rene Pfeuffer
a1ec0b0636 Merge with 2.0.0-m3 2019-11-11 13:18:07 +01:00
Rene Pfeuffer
0f0e7437fd Revert changes to diff command components 2019-11-11 13:08:40 +01:00
Rene Pfeuffer
913e5289e6 Move conflict computation to merge command 
Therefore revert changes to diff command and introduce new
MergeConflictResult instead of streaming result.
 2019-11-11 13:06:07 +01:00
Eduard Heimbuch
73efd244ab add BranchCommand to git + hg repositoryServiceProvider 2019-11-11 11:53:28 +01:00
Eduard Heimbuch
782b201e55 cleanup 2019-11-11 11:21:51 +01:00
Eduard Heimbuch
39d41a56c5 implement deleteBranchCommand for hg 2019-11-11 11:16:33 +01:00
Eduard Heimbuch
7cd2cb4ccb implement deleteBranchCommand for git 2019-11-11 11:15:56 +01:00
Rene Pfeuffer
1695d13a98 Create new branches without clone of git repository 2019-11-11 10:30:11 +01:00
Rene Pfeuffer
c2e30a582f Remove unused mapper 2019-11-08 16:44:04 +01:00
Rene Pfeuffer
73cdab4ddc Merged in feature/merge_with_squash (pull request #347) 
Feature/merge with squash
 2019-11-08 15:41:45 +00:00
Rene Pfeuffer
520c0d6ecf Close branch feature/merge_with_squash 2019-11-08 15:41:45 +00:00
Rene Pfeuffer
ae32b6f797 Use dedicated exception for unsupported merge strategies 2019-11-08 15:44:37 +01:00
Rene Pfeuffer
52ccce1aaa Secure test 2019-11-08 15:43:51 +01:00
Rene Pfeuffer
8e0026962d Fix typo 2019-11-08 14:10:27 +01:00
Eduard Heimbuch
313ec7fe5d fix dependencies after removing mergeResource 2019-11-08 13:10:31 +01:00
Eduard Heimbuch
b1216a898b remove mergeResource and move dryRun to review-plugin 2019-11-08 11:46:13 +01:00
Eduard Heimbuch
a41f490871 refactor after review 2019-11-08 08:36:00 +01:00
Rene Pfeuffer
c65ac7f61d Close working copy 2019-11-07 16:34:14 +01:00
Rene Pfeuffer
758e4ab750 Use jgit client library for diff with conflict 2019-11-07 16:26:30 +01:00
Eduard Heimbuch
e736ae6c50 cleanup 2019-11-07 13:42:45 +01:00
Eduard Heimbuch
ec6b4493c8 use strategy pattern for mergeStrategies 2019-11-07 11:50:28 +01:00
Eduard Heimbuch
de09097203 cleanup 2019-11-07 08:14:15 +01:00
Rene Pfeuffer
df144e298c Add POC for diff against temporary merge result 
This fails for files with merge conflicts, because results for these
files are not added to git and therefore there is no blob the diff
formatter can use to render. This has somehow to be fixed by making
jgit use the version from the file system. Taking a look at the
implementation of Git.clone() might help here.
 2019-11-06 17:30:02 +01:00
Eduard Heimbuch
cf90654e24 implement fast forward if possible 2019-11-06 15:26:20 +01:00
Eduard Heimbuch
b4f1e8874a change mergeStrategy order 2019-11-06 09:54:17 +01:00
Sebastian Sdorra
c51118f575 Merged in feature/remove_redundant_logging (pull request #346) 
Remove redundant logging
 2019-11-06 08:06:26 +00:00
Sebastian Sdorra
2826273719 Close branch feature/remove_redundant_logging 2019-11-06 08:06:26 +00:00
Rene Pfeuffer
b47cc56a86 Remove redundant logging 2019-11-06 08:32:00 +01:00
Eduard Heimbuch
7e00d22e9e merge 2.0.0-m3 2019-11-06 07:48:35 +01:00
Eduard Heimbuch
bc5948f823 add new MergeStrategies 2019-11-06 07:47:23 +01:00
Sebastian Sdorra
4e053b1aa0 Merged in feature/modify_for_svn (pull request #342) 
Feature/modify for svn
 2019-11-05 13:30:25 +00:00
Sebastian Sdorra
c18c64c15a Close branch feature/modify_for_svn 2019-11-05 13:30:25 +00:00
Eduard Heimbuch
db46441adf move mergeResultDto + mapper to scm-core 2019-11-05 09:51:58 +01:00