Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-02 19:45:51 +01:00
Code Issues Packages Projects Releases Activity
11,168 Commits 32 Branches 207 Tags
c4735e70976be2d3ddd352676d27a6c96e91a9d2
Commit Graph

876 Commits

Author SHA1 Message Date
René Pfeuffer
8d0249b708 Make timeout configurable 2019-12-10 18:22:40 +01:00
René Pfeuffer
6f4074c21c Update browser result after computation 2019-12-10 18:10:11 +01:00
Rene Pfeuffer
87904e3da8 Stop fetching commits when this takes too long 
This is a first step to create results in big repositories. Next step
should be querying the commit messages in the background and update
cached results for further requests.
 2019-12-10 15:56:56 +01:00
Rene Pfeuffer
f85ae4f7f1 Guard against empty commit 2019-12-10 15:03:05 +01:00
Rene Pfeuffer
d0f8e4ccf2 Rename utility class 2019-12-05 17:43:21 +01:00
Rene Pfeuffer
e363f057b2 Merge with bugfix/classloader_leak 2019-12-05 17:04:27 +01:00
Rene Pfeuffer
11391f2f64 Merge with default 2019-12-05 10:53:33 +01:00
Florian Scholdei
53c5f67550 Make Git Protocol Switch Button smaller 2019-11-27 16:48:11 +01:00
Rene Pfeuffer
6bf86fab8d Introduce abstraction layer for RESTeasy mock dispatcher 2019-11-25 17:04:58 +01:00
Rene Pfeuffer
75b43ef453 Merge with 2.0.0-m3 2019-11-25 14:35:47 +01:00
Sebastian Sdorra
9e9df35fdb upgrade resteasy, legman and hibernate-validator 
* resteasy from 3.6.2.Final to 4.4.1.Final
* legman from 1.5.1 to 1.6.0
* hibernate-validator from 5.3.6.Final to 6.1.0.Final
 2019-11-20 10:57:32 +01:00
Rene Pfeuffer
55b1d1331b Merge with 2.0.0-m3 2019-11-20 07:54:15 +01:00
Rene Pfeuffer
1d2888f8e6 Fix dequote error in "normal" lines 
Without this, quotes in normal lines were removed.
 2019-11-19 10:13:58 +01:00
Rene Pfeuffer
f960bbd0b9 Replace quotes in git command line, too 2019-11-18 12:51:16 +01:00
Rene Pfeuffer
cbee87fa0c Buffer output and do not create new temp array streams 2019-11-18 11:41:09 +01:00
Rene Pfeuffer
b35d407d96 Merge with 2.0.0-m3 2019-11-18 10:34:12 +01:00
Rene Pfeuffer
2f5095e76a Handle missing blobs in blob store for lfs pointers 2019-11-15 09:33:38 +01:00
Rene Pfeuffer
ecec0764f8 Invert merge to get proper file diff 2019-11-15 09:31:08 +01:00
Rene Pfeuffer
ff1abf2c1c Add conflict type 2019-11-14 15:07:49 +01:00
Rene Pfeuffer
d8d7d993e3 Merge with 2.0.0-m3 2019-11-12 08:51:28 +01: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
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
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
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
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
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
Eduard Heimbuch
9df12bc35e check if mergeStrategy is supported for mergeCommand 2019-11-04 17:34:44 +01:00
Eduard Heimbuch
4b024c650c implement squash to mergeCommand 2019-11-04 15:16:37 +01:00
Sebastian Sdorra
e4c8783c61 return null if commit was not merged into requested branch 2019-11-04 11:46:27 +01:00