Commit Graph

684 Commits

Author SHA1 Message Date
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
bf84037019 Minimal cleanup 2019-03-29 13:25:22 +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
81e493ddf0 Fetch error when creating token without request 2019-03-28 15:10:39 +01:00
René Pfeuffer
79be188777 Clean up dependencies 2019-03-28 13:30:04 +01:00
René Pfeuffer
cc4bd6ddd1 Use bearer tokens to authenticate hg hook callbacks 2019-03-28 08:40:56 +01:00
René Pfeuffer
daaa50f08c Move environment preparations to new class 2019-03-27 10:57:09 +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
56e61ab966 Mark default branch for hg 2019-03-25 14:20:23 +01:00
René Pfeuffer
4ec7006108 Enhance branch object with default flag 2019-03-25 11:28:29 +01:00
René Pfeuffer
1ad2ea61f5 Remove not implemented config options 2019-03-14 13:42:13 +01:00
René Pfeuffer
dbc20f3560 Merge with 2.0.0-m3 2019-03-12 15:20:03 +01:00
René Pfeuffer
6ebbfa97a3 Start entity types with a capital char 2019-03-12 15:10:43 +01:00
Sebastian Sdorra
a5da481593 fix german locale for DateFromNow 2019-03-12 10:44:58 +01:00
Sebastian Sdorra
3ac47b0977 replace diff2html with react-diff-view 2019-02-26 15:00:05 +01:00
Sebastian Sdorra
fddb3ddc1f removed debugging log file from mercurial hooks 2019-02-25 11:33:40 +01:00
René Pfeuffer
9244a72110 Fix unit test 2019-02-21 12:16:39 +01:00
René Pfeuffer
3007004b8b Fix permission check for plugins 2019-02-21 11:25:03 +01:00
Philipp Czora
17c496222d Merged in feature/consolidate_permissions (pull request #196)
Feature consolidate permissions
2019-02-20 14:20:03 +00:00
René Pfeuffer
8c674c6fdb Merged in bugflix/mercurial_pending_changesets (pull request #195)
fixed injection of HgContext, if no request scope is available
2019-02-20 12:14:50 +00:00
Sebastian Sdorra
13adf4b234 fixed PreReceiveRepositoryHooks for newer versions of mercurial 2019-02-20 11:56:10 +01:00
René Pfeuffer
242e0b3972 Fix case 2019-02-19 13:16:22 +01:00
René Pfeuffer
849d818f3a Adapt to new permissions 2019-02-18 15:05:33 +01:00
Sebastian Sdorra
173e51096b fixed injection of HgContext, if no request scope is available 2019-02-18 12:01:34 +01:00
René Pfeuffer
5a5cafaee0 Add comment from previous commit 2019-02-14 11:22:58 +01:00
Sebastian Sdorra
49e9671fa7 added some javadoc 2019-02-13 12:42:07 +01:00
Sebastian Sdorra
352bfe7f5a fixed mercurial PreReceiveRepositoryHooks
The problem seems to be that guice had multiple options for injecting
HgContext. HgContextProvider bound via Module and HgContext bound void
RequestScoped annotation. It looks like that Guice 4 injects randomly
the one or the other, in SCMv1 (Guice 3) everything works as expected.

To fix the problem we have created a new class annotated with
RequestScoped, which holds an instance of HgContext. This way only the
HgContextProvider is used for injection.
2019-02-13 12:30:40 +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
Sebastian Sdorra
ad4277ba41 merge with 2.0.0-m3 2019-02-05 16:50:14 +01:00
Mohamed Karray
75b5e88a90 merge 2019-02-05 15:18:52 +01: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
Iwan Schindler
0319bdf8f0 i18n for core plugins 2019-02-01 11:45:44 +01:00
Sebastian Sdorra
8bf82213b8 remove unused imports 2019-01-30 14:48:37 +01:00
Sebastian Sdorra
f8f5237ad0 fix usage of deprecated mockito classes 2019-01-30 14:44:38 +01:00
Sebastian Sdorra
69dda6403d update resteasy to v3.6.2.Final in order to fix CVE-2017-7561 and CVE-2016-6347 2019-01-30 13:21:11 +01:00
Sebastian Sdorra
4f72f1d304 remove unused repositories to speedup build 2019-01-30 10:32:29 +01:00
Sebastian Sdorra
d820605186 fixed integration of mercurial config changes of 1.x 2019-01-29 14:00:11 +01:00
Sebastian Sdorra
b231499cd0 merge with branch 1.x 2019-01-29 09:42:03 +01:00
Sebastian Sdorra
02c3698aaf merge with branch feature/bugfix_issuetracker 2019-01-25 12:35:58 +01:00
Sebastian Sdorra
78b2874a19 Merged in matt_harbison/scm-manager/1.x (pull request #43)
Load global Mercurial configuration in 4.1+ and minor hook tweaks
2019-01-24 20:35:42 +00:00
Matt Harbison
628973ed7d #1001 support Mercurial 4.7 through 4.9
The command fallback is per the documented example[1], and the date fallback is
adapted from hg-evolve.

[1] https://www.mercurial-scm.org/repo/hg/rev/86f6b441adea
2019-01-23 11:49:57 -05:00
Philipp Czora
5c4d2764ad Renamed logger constant 2019-01-22 14:20:54 +01:00
Philipp Czora
13fa846d6a Fixed bug caused by an unclosed InputStream 2019-01-22 13:43:49 +01:00
Philipp Czora
bb6682ac0e Fixed a bug causing problems with rev numbers > 999 2019-01-22 13:43:22 +01:00
René Pfeuffer
760a37409b Specify global permissions 2019-01-21 09:17:43 +01:00
Philipp Czora
4875ef9639 Use recent ui-extensions version b/c of a required bugfix 2019-01-18 11:25:59 +01:00