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

876 Commits

Author SHA1 Message Date
René Pfeuffer
c4735e7097 Show configured branch in case of error with competing modifications 2020-10-30 14:12:56 +01:00
Florian Scholdei
196ea227d2 Add new default branch option with 'main' as default 2020-10-30 14:12:56 +01:00
René Pfeuffer
c5f8d975a3 Remove unnecessary null check 
The function RevWalk#parseAny indeed never returns null. This check only
was there to satisfy the (therefore wrong) unit test.
 2020-10-12 19:02:28 +02:00
Eduard Heimbuch
3d8dc0ed05 Revert "Fix sonar issue" 
This reverts commit 0b0df4ed
 2020-10-12 14:24:11 +02:00
René Pfeuffer
0b0df4ed5f Fix sonar issue 2020-10-12 08:28:39 +02:00
René Pfeuffer
805f0894fb Fix sonar finding 2020-10-08 09:24:59 +02:00
René Pfeuffer
e8506ff14d Fix recursive iteration 
Due to the api of TreeWalk we have no real change to iterate this
recursively, so we get back to good old loops.
 2020-10-08 09:24:56 +02:00
Eduard Heimbuch
a39abcdbe9 enhance mergeCommandBuilder API with setMessage to avoid templating commit messages 2020-09-25 10:30:45 +02:00
Eduard Heimbuch
f0db57faed update CHANGELOG.md 2020-09-25 10:05:33 +02:00
Eduard Heimbuch
f5060f9d16 fix message templating 2020-09-25 09:46:52 +02:00
René Pfeuffer
cd9da7e658 Determine correct revision for tags in hooks 
The former code only resolved the object id of the tags, when those were
annotated tags (for "simple" tags the code worked fine). Now we even can
handle nested tags (tags that reference other tags).
 2020-09-24 08:28:52 +02:00
Eduard Heimbuch
1cad9c3fbc Merge branch 'develop' into feature/rebase 2020-09-21 14:01:34 +02:00
Konstantin Schaper
48419aa656 Merge pull request #1331 from scm-manager/feature/tag_overview 
Feature/tag overview
 2020-09-18 11:16:55 +02:00
Eduard Heimbuch
b2a204dda0 fix review findings 2020-09-18 10:12:56 +02:00
Konstantin Schaper
3e96d89480 implement requested review changes 2020-09-18 08:47:04 +02:00
Sebastian Sdorra
ec19291393 Fire missing BranchCreatedEvent for mercurial 
The event is now fired in the builder instead of command implementation
 2020-09-17 11:03:13 +02:00
Konstantin Schaper
2d024fe210 update head of scm-git-spi-test.zip back to master 2020-09-17 09:15:53 +02:00
Eduard Heimbuch
909f5ebec9 add instructions to checkout tags 2020-09-16 14:11:27 +02:00
Konstantin Schaper
b30a97948e implement git rebase 2020-09-15 15:48:22 +02:00
René Pfeuffer
a4bd251f90 Accept git change type 'copy', too 
This one was not expected to exist, though praxis proves otherwise.
So we simply accept this one here, too.
 2020-09-10 08:21:15 +02:00
René Pfeuffer
96d16fe4cc "Unpeel" annotated tags to get correct changeset 
If we just parse the object id of the reference for annotated tags, we
get the annotated tag object and not the reference the tag refers to.
 2020-08-27 11:15:13 +02:00
René Pfeuffer
565ec3ff3c Cleanup 2020-08-27 10:48:54 +02:00
Konstantin Schaper
15fac8ba2c remove ref usage and directly use objectId 2020-08-26 15:06:00 +02:00
Konstantin Schaper
ecfc70eb77 wip refactoring 2020-08-26 10:01:51 +02:00
Konstantin Schaper
36231d077a cleanup and update tests 2020-08-25 18:08:31 +02:00
Konstantin Schaper
6d409c65c0 initial implementation 2020-08-25 14:45:48 +02:00
Konstantin Schaper
5a5289f381 fix merge issues 2020-08-11 15:04:52 +02:00
Konstantin Schaper
8576b66559 Merge branch 'develop' into feature/create_gpg_signatures 
# Conflicts:
#	CHANGELOG.md
#	scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitHookContextProvider.java
#	scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitLogCommand.java
#	scm-plugins/scm-git-plugin/src/main/java/sonia/scm/web/GitReceiveHook.java
 2020-08-11 13:33:21 +02:00
Konstantin Schaper
0601770262 resolve review findings 2020-08-11 13:28:16 +02:00
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