999 Commits

Author	SHA1	Message	Date
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
Eduard Heimbuch	4f17bc6b1c	refactor backend for modifyCommand / add sourceExtension for plugins	2019-10-30 12:59:54 +01:00
Eduard Heimbuch	531259bec0	check if request branch contains revision	2019-10-28 11:45:42 +01: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
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
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