Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2026-01-03 22:29:52 +01:00
Code Issues Packages Projects Releases Activity
7,290 Commits 34 Branches 209 Tags
dd39c6b535727b6834a7f198e1a072254b224265
Commit Graph

421 Commits

Author SHA1 Message Date
Sebastian Sdorra
dd39c6b535 fixed missing checkout call for GitBranchCommand 2019-04-17 13:51:13 +02:00
René Pfeuffer
fbdbe4956f Fix permissions for repository git configuration 2019-04-11 12:09:06 +02:00
René Pfeuffer
f8a59a4d0f Use new IntegrateChangesFromWorkdirException in merge command 2019-03-29 16:13:29 +01:00
René Pfeuffer
2e93a9efec Implement peer review comments 2019-03-29 15:39:44 +01:00
René Pfeuffer
89de300137 Add minimal error handling 2019-03-29 13:39:55 +01:00
René Pfeuffer
9833bfd34d Merge with 2.0.0-m3 2019-03-29 11:54:17 +01:00
René Pfeuffer
00b27b5488 Close repositories after usage 2019-03-29 11:47:44 +01:00
René Pfeuffer
2a19313df5 Remove unknown val 2019-03-29 11:06:10 +01:00
René Pfeuffer
ee219f2d59 Remove unnecessary interface 2019-03-29 10:36:55 +01:00
René Pfeuffer
1162536e21 Simplify workdir factory 2019-03-29 10:02:38 +01:00
René Pfeuffer
93cec3d282 Add parameter for parent of new branch 2019-03-28 16:15:31 +01:00
René Pfeuffer
cc4bd6ddd1 Use bearer tokens to authenticate hg hook callbacks 2019-03-28 08:40:56 +01:00
René Pfeuffer
b65e84249d Use clone and push to create branches 
Generalize workdir creation for git and hg and create branches in
clones instead of the scm repository, so that hooks will be fired
correctly once the changes are pushed back.

Missing:

- Evaluation of the git response from the push command
- configuration of the hg environment and the authentication, so that
  the scmhooks.py script can be triggeret correctly and can callback
  the scm manager
 2019-03-27 10:08:20 +01:00
René Pfeuffer
3c7930d1a9 Add "production" branch command 
There already was a branch command for test purposes. This was adapted
for production use with git and hg.
 2019-03-26 09:16:33 +01:00
René Pfeuffer
b36f1ca3e4 Mark default branch for git 2019-03-25 12:08:44 +01:00
René Pfeuffer
4ec7006108 Enhance branch object with default flag 2019-03-25 11:28:29 +01:00
René Pfeuffer
451b25a95f Merge with 2.0.0-m3 2019-03-14 10:48:57 +01:00
René Pfeuffer
be83f87b14 Remove dead code 2019-03-12 15:10:59 +01:00
René Pfeuffer
6ebbfa97a3 Start entity types with a capital char 2019-03-12 15:10:43 +01:00
Mohamed Karray
77fb869ce4 fix there is no error on missing revision 2019-03-11 18:42:10 +01:00
René Pfeuffer
cf7e44c04f Merge with 2.0.0-m3 2019-03-11 16:52:14 +01:00
René Pfeuffer
83baac3b18 Check permissions for git repository configuration 2019-03-11 15:05:31 +01:00
René Pfeuffer
28d7467e18 Throw not found exceptions for log between branches 2019-03-11 14:17:03 +01:00
René Pfeuffer
ec2aff6aa9 Fix NPE in dry run for missing branches 2019-03-11 09:07:57 +01:00
Sebastian Sdorra
77d79610d2 moves more git specific classes from ssh-plugin to git-plugin 2019-03-07 10:34:13 +01:00
René Pfeuffer
e6894490e5 Remove ssh from class names 
The classes do not have anything to do with ssh.
 2019-03-06 15:34:51 +01:00
René Pfeuffer
a16bb0d0af Wrap parser and handler into interpreter 2019-03-05 15:01:57 +01:00
René Pfeuffer
dd71fb4c3b Expose ScmCommandProtocol as extension point 
This is necessary so that multiple providers (git, hg, ...) can
implement this. The using class has to find the matching implementation.
 2019-03-05 14:20:31 +01:00
René Pfeuffer
ebb21ee308 Modify test to test base, not specific class 
This was necessary after extracting base class.
 2019-03-05 13:47:46 +01:00
René Pfeuffer
0c46d639da Extract base class for ReceivePackFactory implementations 2019-03-05 13:29:57 +01:00
René Pfeuffer
adcfb3ee5a Do not map not found exception manually 2019-03-04 14:27:07 +01:00
René Pfeuffer
b1633aee97 Use constant 2019-03-01 10:22:37 +01:00
René Pfeuffer
3007004b8b Fix permission check for plugins 2019-02-21 11:25:03 +01:00
Mohamed Karray
d4a79ee140 Merged in bugfix/read_vcs_versions (pull request #178) 
Fix class loader for creation of vcs version string
 2019-02-06 09:04:04 +00:00
René Pfeuffer
accd20538e Fix class loader for creation of vcs version string 
Use UberClassLoader in
AbstractSimpleRepositoryHandler#getStringFromResource

Therefore pass through plugin loader
 2019-02-04 14:35:51 +01:00
Sebastian Sdorra
8bf82213b8 remove unused imports 2019-01-30 14:48:37 +01:00
Sebastian Sdorra
c42028433f map nonFastForwardDisallowed field from GitConfig and added ui 2019-01-29 10:26:11 +01:00
Sebastian Sdorra
b231499cd0 merge with branch 1.x 2019-01-29 09:42:03 +01:00
René Pfeuffer
3b33b3b0a4 Merge with 2.0.0-m3 2018-12-20 10:55:40 +01:00
René Pfeuffer
d9bfddce2d Add documentation about status codes 2018-12-20 10:47:24 +01:00
René Pfeuffer
a9300df7f4 Fix incoming diff with merges from target branch. 
Taking the git history example below, the previous version only computed
commits 'b3' upward for log of 'b' with ancestor 'master' and missed
commits 'b1', 'b2' and the first merge.

* 86e9ca0 (HEAD -> b) b5
*   d69edb3 Merge branch 'master' into b
|\
| * 946a8db (master) f
| * b19b9cc e
* | 3d6109c b4
* | 6330653 b3
* |   a49a28e Merge branch 'master' into b
|\ \
| |/
| * 0235584 d
| * 20251c5 c
* | 5023b85 b2
* | 201ecc1 b1
|/
* 36b19e4 b
* c2190a9 a
 2018-12-19 13:33:57 +01:00
René Pfeuffer
5cb1a2e0cd Use abstract base class for json enrichment 2018-12-14 17:25:42 +01:00
René Pfeuffer
c2d872bd59 Modify git HEAD on default branch change 2018-12-13 18:32:20 +01:00
René Pfeuffer
360cba6c50 Use constant 2018-12-13 11:32:44 +01:00
René Pfeuffer
9e963b6aeb Enrich repository collection, too 2018-12-13 10:00:03 +01:00
René Pfeuffer
24cd9c3f8c Introduce repository config change event to clear caches 2018-12-13 09:22:10 +01:00
René Pfeuffer
db092e57e7 Move cache event to central position 2018-12-12 18:49:38 +01:00
René Pfeuffer
dbbe467479 Remove old property for default branch 2018-12-12 17:30:23 +01:00
René Pfeuffer
b4081aaa99 Add endpoint to set default branch 2018-12-12 15:04:56 +01:00
René Pfeuffer
bc8c776821 Introduce config rest endpoint for default git branch 2018-12-12 14:12:55 +01:00