Commit Graph

1615 Commits

Author SHA1 Message Date
René Pfeuffer
2b970f6592 Add hint to future self 2020-04-21 07:19:14 +02:00
René Pfeuffer
e778d5f4d4 Let plugin.xml be written by smp maven plugin 2020-04-20 16:25:04 +02:00
René Pfeuffer
b953b1258b Remove arbitrary apache exception 2020-04-11 22:21:41 +02:00
René Pfeuffer
c4fc0615b5 Set version back to 2.0.0-SNAPSHOT 2020-04-09 21:08:58 +02:00
CES Marvin
d5847e7965 prepare for next development iteration 2020-04-09 19:03:13 +00:00
CES Marvin
3cf675f30d release version 2.0.0-rc7 2020-04-09 18:37:13 +00:00
René Pfeuffer
19603b6777 Fix detection of sub repositories (aka submodules)
Without this on creation of a tree entry we try to read the object
for the given object id, but in case of a submodule this is not the
id of an object (the constructor of TreeEntry calls
repo.open(objectId)). Therefore the lookup creates an exception. With
this fix we check, whether the given path is a submodule beforehand.
2020-04-06 13:34:06 +02:00
Florian Scholdei
ac66e6097e Fix old Bitbucket Wikilinks to Github docs 2020-03-26 10:57:31 +01:00
Florian Scholdei
f1b34eb502 Changeover to MIT license (#1066)
* prepare license-maven-plugin for license migration
* added license mapping for tsx files and added some more excludes
* Changeover to MIT license
* Fix build problems
* Delete old remaining licenses
* Add more exclude path for license checker
* Rename included netbeans license, add exclude .m2/repository/
* Specify .m2 exclude because not only repository/, also wrapper/ must match
* Add .cache/ exclude for license check
* Modify formatting of license in java classes to comply with convention and IDE
* Add IntelliJ documentation for license configuration
* Update CHANGELOG.md
* Exclude tmp/workspace/ dir for license check
* Edit README.md

Co-authored-by: Sebastian Sdorra <sebastian.sdorra@cloudogu.com>
2020-03-23 15:35:58 +01:00
René Pfeuffer
f5cfd0ca68 Adapt unit test to new mockito api 2020-03-20 11:44:28 +01:00
René Pfeuffer
70149865a8 Fix unnecessary stubbing 2020-03-19 08:19:12 +01:00
Sebastian Sdorra
7f24fc8c9c prepare for next development iteration 2020-03-13 07:32:02 +01:00
CES Marvin
cabefa72fb release version 2.0.0-rc5 2020-03-12 21:11:54 +00:00
René Pfeuffer
ca34ddf40a Harmonize limit default 2020-03-12 10:46:47 +01:00
René Pfeuffer
f39a676044 Remove unused function 2020-03-12 10:45:52 +01:00
René Pfeuffer
55ef3f8c8c Merge remote-tracking branch 'origin/develop' into feature/browse_commit_with_limit
# Conflicts:
#	CHANGELOG.md
2020-03-10 09:43:31 +01:00
René Pfeuffer
2d117648ba Add possibility to set jgit nfs related config
It may be necessary for users to configure jgit behaviour related to
file handling. This commit makes the following two configurations
available (among others):

- core.trustfolderstat
- core.supportsatomicfilecreation
2020-03-09 16:44:42 +01:00
René Pfeuffer
df1cc365ed Cleanup test 2020-03-09 09:23:53 +01:00
René Pfeuffer
845a3ea72f Check order of files in test 2020-03-09 09:20:08 +01:00
René Pfeuffer
b8ab729c45 Merge branch 'develop' into feature/browse_commit_with_limit 2020-03-09 08:40:29 +01:00
Sebastian Sdorra
abb6a41946 migrate from bitbucket to github 2020-03-09 08:01:36 +01:00
Rene Pfeuffer
cae398d945 Merge with upstream 2020-03-06 16:19:35 +01:00
Rene Pfeuffer
4ddfbcd86e Sort directories correctly 2020-03-06 16:17:47 +01:00
René Pfeuffer
a6b45ce556 Fig python tests 2020-03-04 14:39:36 +01:00
René Pfeuffer
c7b466f3c6 Fix offset calculation for hg 2020-03-04 14:01:53 +01:00
René Pfeuffer
8b4dd26425 Implement more complex implicit directories 2020-03-04 12:03:58 +01:00
René Pfeuffer
7aa91bf846 Implement simple implicit directories 2020-03-04 11:47:30 +01:00
René Pfeuffer
cb1d9334bb Remove unnecessary check 2020-03-04 10:54:35 +01:00
Sebastian Sdorra
7785ea2d68 Merged in bugfix/openapi_errors (pull request #417)
prevent using same classloader multiple times
2020-03-04 08:31:08 +00:00
René Pfeuffer
f2ce14294d Extract parsing of fileview stream and bootstrap tests 2020-03-04 09:30:25 +01:00
René Pfeuffer
5fb338fbd2 Adapt test for new limit/offset rule for hg 2020-03-04 07:15:03 +01:00
Rene Pfeuffer
cf43e3bc84 Implement new limit/offset rule for git and svn
Directories shall no longer be taken into account for limit/offset
calculations.
2020-03-03 17:06:55 +01:00
Rene Pfeuffer
e0b02ea1a3 Use api to set system config for lfs
Could be so simple if this works :-)
2020-03-03 16:13:17 +01:00
Eduard Heimbuch
5897863f7e fix several openapi errors 2020-03-03 14:49:35 +01:00
Rene Pfeuffer
fa80c83109 Implement new limit/offset rule for git
Directories shall no longer be taken into account for limit/offset
calculations.
2020-03-03 11:59:20 +01:00
Rene Pfeuffer
80bfc37d0f Merge with default 2020-03-03 09:35:01 +01:00
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
Sebastian Sdorra
b4441ae1c8 make File_Printer testable 2020-03-02 14:48:17 +01:00
Sebastian Sdorra
f74db39a4c fix unittests for file order 2020-03-02 13:28:45 +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
1567cd8765 Add tests for recursive request 2020-02-26 17:36:41 +01:00
René Pfeuffer
7710088865 Fix offset in recursion 2020-02-26 13:24:31 +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
Rene Pfeuffer
e33d65b097 Merge with default 2020-02-25 16:37:17 +01:00
René Pfeuffer
76665b4dbe Sort hg files 2020-02-25 08:25:25 +01:00
Sebastian Sdorra
000dab88ca merge with default branch 2020-02-25 08:24:12 +01:00
Sebastian Sdorra
24de6c89a5 update jgit to version 5.6.1.202002131546-r-scm1 2020-02-24 16:27:42 +01:00