Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-09 15:05:44 +01:00
Code Issues Packages Projects Releases Activity
12,446 Commits 32 Branches 207 Tags
b0b2375f788bcdf0a34bc5de3aea63b0400fe344
Commit Graph

997 Commits

Author SHA1 Message Date
Sebastian Sdorra
e7535903f7 Fix unit test on platforms which are not using UTF-8 as default 2020-08-10 09:22:29 +02:00
Sebastian Sdorra
3ea55c3422 Fix small SonarQube findings 2020-08-10 08:53:49 +02:00
Konstantin Schaper
30aa592d73 Merge branch 'develop' into feature/create_gpg_signatures 
# Conflicts:
#	CHANGELOG.md
#	yarn.lock
 2020-08-07 15:13:29 +02:00
René Pfeuffer
a3a26c057e Cleanup 2020-08-07 10:53:08 +02:00
René Pfeuffer
2433c50d64 Add test for "real" merge commits 2020-08-07 08:01:13 +02:00
René Pfeuffer
6f20781812 Add first integration tests for merge detection 2020-08-06 17:12:14 +02:00
René Pfeuffer
072d8f15c9 Detect merges where branch has been deleted, too 2020-08-06 07:58:22 +02:00
René Pfeuffer
ac983d6067 Remove redundant code 2020-08-05 18:43:08 +02:00
René Pfeuffer
6bfefb3348 Introduce merge detection for receive hooks 
Here we add a merge detection provider for pre and post receive hooks
and implement this new provider for git.
 2020-08-05 17:57:50 +02:00
Konstantin Schaper
7072761ba1 implementation and unit tests 2020-08-05 13:02:02 +02:00
Konstantin Schaper
08a025ba81 wip 2020-08-03 16:09:37 +02:00
Sebastian Sdorra
030ef30ffb uses parent constructor with RootURL 2020-08-03 14:01:44 +02:00
Eduard Heimbuch
b22ead23de show signature key on changeset 2020-07-29 15:43:14 +02:00
Eduard Heimbuch
ebb6a1fdb8 Merge branch 'develop' into feature/verify_gpg_signatures 2020-07-28 12:36:15 +02:00
Eduard Heimbuch
5e10f6b730 Invalidate branches cache synchronously on create new branch 2020-07-22 10:20:37 +02:00
Sebastian Sdorra
64da676348 revisit gpg api and use it with from git plugin 2020-07-22 08:22:04 +02:00
Sebastian Sdorra
7cb349242c introduces GitChangesetConverterFactory 
This change introduces a GitChangesetConverterFactory to allow injections for the GitChangesetConverter.
 2020-07-21 07:34:14 +02:00
Sebastian Sdorra
6e27051ed9 use child injector pattern for git commands 
We are using a Google Guice child injector to reduce the amount of injection dependencies for the GitRepositoryServiceResolver and the GitRepositoryServiceProvider.
 2020-07-20 16:18:00 +02:00
René Pfeuffer
086a471161 Fix migration of non-bare git repositories 
During the migration of git repositories from v1 to v2, we have to
create an "scmm" config section with the repository id of the current
repository. If this does not happen, further write requests to this
repository will fail, because the hooks cannot determine the id.

However, the migration failed to write this configuration for non-bare
repositories. Therefore this fix checks beforehand, whether a '.git'
folder exists in the date directory. If this is the case, we assume that
this is a non-bare repository and write the config file inside this
folder.
 2020-06-23 11:47:52 +02:00
René Pfeuffer
3e5ee53dc2 Adapt test to change from 52a09a9 2020-06-17 11:16:04 +02:00
René Pfeuffer
bd4fc86db1 Only use LF for line breaks in diffs 
Git uses LF for line breaks in diffs, not CR or other delimiters. When
we are using other delimiters for diving diff output into lines, too,
we can get errors because diff lines can contain CRs. When we try to
split such lines, we get exceptions because these lines cannot be parsed
 2020-06-15 17:05:46 +02:00
Sebastian Sdorra
acc3306450 rename trailer to contributor 2020-06-10 11:08:11 +02:00
René Pfeuffer
fdf6991b16 Simplify API 2020-06-08 13:10:36 +02:00
René Pfeuffer
cf02192315 Extract committer as trailer in git 2020-06-08 12:21:17 +02:00
René Pfeuffer
a32bd01c45 Fix peer review issues 2020-06-02 21:32:06 +02:00
René Pfeuffer
77d6784386 Remove unnecessary interfaces 2020-06-02 21:31:44 +02:00
René Pfeuffer
7e945afc43 Keep ParentAndClone inside working copy factories 2020-06-02 21:31:44 +02:00
René Pfeuffer
d6b618f0ec Remove superfluous exception class 2020-06-02 21:31:44 +02:00
René Pfeuffer
3c808bf171 Use existing RepositoryProvider 2020-06-02 21:31:44 +02:00
René Pfeuffer
b40861534c Extract classes 2020-06-02 21:31:44 +02:00
René Pfeuffer
4c73f27389 Make reclaimer and initializer top level classes 2020-06-02 21:31:44 +02:00
René Pfeuffer
62a47d016f Document SimpleGitWorkingCopyFactory 2020-06-02 21:31:44 +02:00
René Pfeuffer
f74b7626eb New package for working copy related classes 2020-06-02 21:31:44 +02:00
René Pfeuffer
e968aa17ef Cleanup 2020-06-02 21:31:44 +02:00
René Pfeuffer
8bd17a03d7 Use better names 
The name 'workdir' is now only used for a concrete directory, where a
clone can be created in. The new name 'working copy' is used for a
concrete instance of such a directory, where a clone has been created in
for a repository stored in SCM-Manager. Such a working copy can be
cached and reused for further changes.
 2020-06-02 21:31:43 +02:00
René Pfeuffer
e5f4ad72d6 Add test for git reclaim of workdir 2020-06-02 21:31:43 +02:00
René Pfeuffer
7e89a0c1c0 Update repositories in reclaim 2020-06-02 21:31:43 +02:00
René Pfeuffer
5b034f8d02 Introduce cache layer for workdirs 2020-06-02 21:31:43 +02:00
Eduard Heimbuch
97cac87563 merge with develop 2020-05-20 12:13:47 +02:00
René Pfeuffer
054f320455 Make change types explicit 
Without explicit change types, we cannot tell copy and rename apart.
 2020-05-19 23:09:28 +02:00
René Pfeuffer
2b1ba7e4f3 Update servlet version 2020-05-19 16:29:40 +02:00
René Pfeuffer
c722565109 Hide getEffectedPaths for other packages 2020-05-19 09:56:24 +02:00
René Pfeuffer
35ffc5c4e2 Introduce new API for modifications 
New modifications includes list of 'renames'. Therefore we introduce
a new base class Modification.
 2020-05-19 09:56:24 +02:00
René Pfeuffer
76354aa839 Close diff formatter 2020-05-19 09:56:24 +02:00
René Pfeuffer
4d352efef0 Remove wrong test 
The GitHunkParser has nothing to do with renames, so this test does not
make any sense.
 2020-05-19 09:56:24 +02:00
René Pfeuffer
fba34b3bab Add unit tests 2020-05-19 09:56:24 +02:00
René Pfeuffer
dbc58784e4 Fix path handling 2020-05-19 09:56:24 +02:00
René Pfeuffer
ae51a583fd POC for rename detection in diffs 2020-05-19 09:56:24 +02:00
René Pfeuffer
3a92aae21c Escape > in html 2020-05-19 09:54:05 +02:00
René Pfeuffer
d5d9690389 Remove redundant constructor parameter 
The repository can be retrieved from the context and does not have to be
passed through by every constructor
 2020-05-12 15:45:58 +02:00