Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2026-02-08 15:46:54 +01:00
Code Issues Packages Projects Releases Activity
13,402 Commits 41 Branches 210 Tags
develop
Commit Graph

2357 Commits

Author SHA1 Message Date
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
a532426958 refactor SvnModifyCommand to be more readable 2019-11-04 12:16:22 +01:00
Sebastian Sdorra
3aea20370a fixed returning null for getScmRepository from SimpleSvnWorkDirFactory 2019-11-04 12:03:19 +01:00
Sebastian Sdorra
e4c8783c61 return null if commit was not merged into requested branch 2019-11-04 11:46:27 +01:00
Eduard Heimbuch
4f17bc6b1c refactor backend for modifyCommand / add sourceExtension for plugins 2019-10-30 12:59:54 +01:00
Eduard Heimbuch
7fd3d08540 add requestedRevision to BrowseCommandResult 2019-10-29 13:04:29 +01:00
Eduard Heimbuch
a13d129eff add Test / HgBrowseCommand shouldResolveBranchForRevision 2019-10-29 10:49:38 +01:00
Eduard Heimbuch
730646f4a8 hgBrowseCommand resolves Branches as Revision for BrowseResult 2019-10-29 10:40:10 +01:00
Eduard Heimbuch
531259bec0 check if request branch contains revision 2019-10-28 11:45:42 +01:00
Eduard Heimbuch
7190259813 cleanup 2019-10-26 19:29:17 +02:00
Eduard Heimbuch
a3d5e9669e add test for gitLogCommand 2019-10-26 17:59:37 +02:00
Eduard Heimbuch
949a8fe4f1 merge 2.0.0-m3 2019-10-25 12:33:16 +02:00
Eduard Heimbuch
a938fd8682 enhance logcommand 2019-10-25 12:31:18 +02:00
Eduard Heimbuch
5c7bd90f7a return changesetId for git & hg 2019-10-24 11:57:16 +02:00
Eduard Heimbuch
fb0eb329e5 return branch for git & hg for correct redirect 2019-10-24 09:11:17 +02:00
Florian Scholdei
6b21f609f4 Migrate react-i18next translate components in scm-plugins 2019-10-23 16:09:28 +02:00
Eduard Heimbuch
1d7d854ea8 implement svnModifyCommand 2019-10-23 14:42:19 +02:00
Sebastian Sdorra
8a6f862d3d Merged in feature/lfs_over_ssh (pull request #336) 
Feature LFS over ssh
 2019-10-22 12:01:38 +00:00
Sebastian Sdorra
52f471b5dd fix lfs authentication via ssh command and enabled xsrf protection 2019-10-22 10:50:49 +02:00
Sebastian Sdorra
e885d130be add push permissions to read access token 
This is required because the read access token is used to obtain the write access token.
 2019-10-22 10:13:46 +02:00
Eduard Heimbuch
5c47a266cb implement SvnWorkDirFactory 
(grafted from 7c6f871d771d61c6835d052e2380af49368fe6f5)
 2019-10-22 09:33:14 +02:00
Rene Pfeuffer
7209702643 Rearrange ifs 2019-10-21 16:30:57 +02:00
Rene Pfeuffer
4885a0cb80 Filter git diff stream to decode file names 2019-10-21 16:25:57 +02:00
Sebastian Sdorra
bdb4bb73ac fix plugin frontend build 2019-10-21 14:52:08 +02:00
Rene Pfeuffer
a93380b867 Differentiate types for central and cloned repository 2019-10-21 14:10:50 +02:00
Sebastian Sdorra
f7b7e0321e added shared tsconfig package 2019-10-21 14:10:48 +02:00
Rene Pfeuffer
5185a68eeb Formatter is not thread safe 2019-10-21 13:10:48 +02:00
Sebastian Sdorra
0703f1e2bd migrate core plugins from flow to typescript 2019-10-21 12:13:08 +02:00
Rene Pfeuffer
36d2723c50 Add unit test 2019-10-21 11:11:44 +02:00
Rene Pfeuffer
287ee9efe1 Simplify stream 2019-10-21 10:40:16 +02:00
Rene Pfeuffer
647464618a Fix time format 2019-10-21 10:24:53 +02:00
Rene Pfeuffer
2a501a9dbb Simplify test 2019-10-19 16:31:54 +02:00
Rene Pfeuffer
f9ecae129e Add unit test 2019-10-19 15:55:07 +02:00
Rene Pfeuffer
9f6674cce4 Add permission checks 2019-10-19 13:54:27 +02:00