Rene Pfeuffer
34b570fddf
Fix unit test
...
It looks like the system config is cached somehow from jgit 5.4.3 on,
so that putting the config in a file that is deleted after the first
test invalidates this config, which leads to the effect, that for the
test that runs second the filter is not applied.
2020-03-03 09:30:24 +01:00
Eduard Heimbuch
fbededbcaa
cleanup test
2020-02-27 10:34:48 +01:00
Rene Pfeuffer
33037385e4
Handle unexpected merge results
...
It is possible that a git work tree is dirty directly after the clone
of a repository, eg. when files are not changed correctly due to bogous
.gitattribute files (though this is just a guess). In these cases a
merge might fail due to these dirty files and not due to merge
conflicts. Without this change such results lead to null pointer
exceptions, because result.getConflicts() is null.
2020-02-27 09:56:25 +01:00
René Pfeuffer
4e7381b98f
Fix offset in recursion
2020-02-26 11:10:01 +01:00
René Pfeuffer
67192a203e
Read and sort tree first before applying limit
2020-02-26 10:54:16 +01:00
Rene Pfeuffer
c0e0ed3d17
Fix tests
2020-02-25 17:34:41 +01:00
René Pfeuffer
fe1591171d
Rename 'proceedFrom' to 'offset'
2020-02-19 09:23:23 +01:00
Rene Pfeuffer
3652a33fa0
Add truncated flag for git
2020-02-18 15:24:32 +01:00
Rene Pfeuffer
67e58209cf
Implement proceed from for git
2020-02-18 09:57:57 +01:00
René Pfeuffer
db540f5f02
Add limit parameter
2020-02-17 16:48:14 +01:00
Rene Pfeuffer
c84bba8ead
Add unit test for browse with lfs
2020-02-06 13:11:07 +01:00
Eduard Heimbuch
f44d17d640
create RepositoryInitializer which can be used to create new files in the initial commit on a new repository
2020-01-20 15:19:51 +01:00
Rene Pfeuffer
d6b60afeac
Merge with default
2020-01-08 11:22:47 +01:00
Rene Pfeuffer
88fb31c47b
Add unit test for diff command
...
This new tests ensures, that changes on a feature branch will be shown
in a diff even though the integration branch has been merged into the
feature branch.
2020-01-07 15:49:35 +01:00
Rene Pfeuffer
148095ad4c
Add revisions of merged branches before merge
2019-12-19 10:30:02 +01:00
Rene Pfeuffer
f7c4894fb2
Let merges without effect throw an exception
2019-12-19 09:47:31 +01:00
Rene Pfeuffer
fefd8b6de8
Merge with default
2019-12-19 08:46:45 +01:00
Eduard Heimbuch
39b4c59d82
add unit tests
2019-12-19 08:25:28 +01:00
Rene Pfeuffer
cf9d1edb70
Make partial file attributes explicit.
2019-12-18 11:48:17 +01:00
Rene Pfeuffer
7332f9dcb4
Merge with default
2019-12-13 08:57:16 +01:00
Rene Pfeuffer
8129f2fad0
Add 'partial' flag to files
2019-12-11 14:41:42 +01:00
Rene Pfeuffer
9caf6c0984
Update cache after each file
2019-12-11 14:01:17 +01:00
Rene Pfeuffer
093c0abb02
Add unit test for asynchronous browse
2019-12-11 13:32:05 +01:00
Rene Pfeuffer
ce15b116bd
Introduce SyncAsyncExecutor
2019-12-11 10:10:56 +01:00
René Pfeuffer
6f4074c21c
Update browser result after computation
2019-12-10 18:10:11 +01:00
Rene Pfeuffer
d0f8e4ccf2
Rename utility class
2019-12-05 17:43:21 +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
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
a1ec0b0636
Merge with 2.0.0-m3
2019-11-11 13:18:07 +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
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
52ccce1aaa
Secure test
2019-11-08 15:43:51 +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
758e4ab750
Use jgit client library for diff with conflict
2019-11-07 16:26:30 +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
7e00d22e9e
merge 2.0.0-m3
2019-11-06 07:48:35 +01:00
Eduard Heimbuch
9df12bc35e
check if mergeStrategy is supported for mergeCommand
2019-11-04 17:34:44 +01:00
