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
Sebastian Sdorra
000dab88ca
merge with default branch
2020-02-25 08:24:12 +01:00
Eduard Heimbuch
7e1e77af2b
remove enunciate since we are using openapi now
2020-02-24 13:36:34 +01:00
Florian Scholdei
56202e5266
Remove unused imports, adding missing dots in descriptions, remove last TypeHint annotation
2020-02-19 17:00:33 +01:00
Florian Scholdei
5364e8682d
Create openapi docs for hg/svn plugin
2020-02-18 17:19:35 +01:00
Sebastian Sdorra
e53629e152
remove jwt libraries from scm-hg-plugin
2020-02-18 14:40:43 +01:00
Eduard Heimbuch
b7e95f3cc4
create openapi docs for scm-git-plugin
2020-02-17 14:09:26 +01:00
Rene Pfeuffer
246e5916e5
Merge with default
2020-02-17 11:29:03 +01:00
Rene Pfeuffer
97cc0e7b9c
Use access key directly, not the jwt token
2020-02-17 11:08:08 +01:00
Rene Pfeuffer
d513ebcd83
Prepare for next development iteration
2020-02-14 13:40:39 +01:00
Rene Pfeuffer
476dcc5758
Release version 2.0.0-rc4
2020-02-14 12:28:11 +01:00
Rene Pfeuffer
db19da7b46
Set explicit committer for new commits
2020-02-14 10:42:59 +01:00
Rene Pfeuffer
defad2af5b
Remove token expiration from test
2020-02-13 11:27:25 +01:00
Rene Pfeuffer
c4dee747e3
Put default for xsrf environment key
...
Otherwise the python script scmhooks.py fails, because the environment
access with a missing key raises an error.
2020-02-13 10:34:40 +01:00
Rene Pfeuffer
6217a757e3
Add xsrf token to hg callbacks
2020-02-13 09:16:29 +01:00
Rene Pfeuffer
c84bba8ead
Add unit test for browse with lfs
2020-02-06 13:11:07 +01:00
Sebastian Sdorra
c20a50e9ec
Prepare for next development iteration
2020-02-03 13:42:29 +01:00
Rene Pfeuffer
a7ff141986
Release version 2.0.0-rc3
2020-01-31 13:02:27 +01:00
Sebastian Sdorra
646b008af3
Prepare for next development iteration
2020-01-29 16:01:25 +01:00
Sebastian Sdorra
28040d0c65
release version 2.0.0-rc2
2020-01-29 15:22:54 +01:00
Rene Pfeuffer
cb9fd3c2a4
Set author for svn modify commits
2020-01-22 16:30:30 +01:00
Sebastian Sdorra
f12b25bd1f
Merged in feature/init_new_repo (pull request #394 )
...
Feature/init new repo
2020-01-21 07:13:01 +00:00
Eduard Heimbuch
f44d17d640
create RepositoryInitializer which can be used to create new files in the initial commit on a new repository
2020-01-20 15:19:51 +01:00
Rene Pfeuffer
c93c3776ef
Use git-like commit message
2020-01-17 14:44:00 +01:00
Sebastian Sdorra
34838dc889
remove revision 0 from svn log command
2020-01-15 14:06:24 +01:00
Sebastian Sdorra
c7320bfcf6
Merged in bugfix/push_error_handling (pull request #387 )
...
Fix error handling on git push
2020-01-15 12:40:02 +00:00
Rene Pfeuffer
b4b4f29e42
Log messages from failed push result
2020-01-15 09:51:00 +01:00
Rene Pfeuffer
c5520e6b07
Fix error handling on git push
...
Failing git push does not lead to an GitAPIException. Instead we have to
check the dedicated push update results.
By the way this adds a message for the internal repository exception.
2020-01-15 08:49:14 +01:00
Sebastian Sdorra
3011b4d3e8
merge with default branch
2020-01-13 09:34:19 +01:00
Eduard Heimbuch
bdb02cdfd1
remove obsolete context props
2020-01-09 09:52:09 +01:00
Rene Pfeuffer
d6b60afeac
Merge with default
2020-01-08 11:22:47 +01:00
Eduard Heimbuch
c73e85e3d6
fix routes for sources and changesets // fix typing errors
2020-01-08 10:31:43 +01:00
Rene Pfeuffer
d1db083e9a
Use namespace and name in logging
2020-01-08 10:14:43 +01:00
Rene Pfeuffer
88fb31c47b
Add unit test for diff command
...
This new tests ensures, that changes on a feature branch will be shown
in a diff even though the integration branch has been merged into the
feature branch.
2020-01-07 15:49:35 +01:00
Rene Pfeuffer
148095ad4c
Add revisions of merged branches before merge
2019-12-19 10:30:02 +01:00
Rene Pfeuffer
f7c4894fb2
Let merges without effect throw an exception
2019-12-19 09:47:31 +01:00
Rene Pfeuffer
1d3e51ce7b
Use static create methods instead of ambiguous constructor
2019-12-19 09:27:18 +01:00
Rene Pfeuffer
fefd8b6de8
Merge with default
2019-12-19 08:46:45 +01:00
Eduard Heimbuch
39b4c59d82
add unit tests
2019-12-19 08:25:28 +01:00
Eduard Heimbuch
c5f7393116
rename helper class
2019-12-18 14:38:09 +01:00
Eduard Heimbuch
3ea788c3e3
fix unit test
2019-12-18 14:33:50 +01:00
Eduard Heimbuch
83cc1c4a6f
return revision on merge
2019-12-18 13:17:30 +01:00
Rene Pfeuffer
cf9d1edb70
Make partial file attributes explicit.
2019-12-18 11:48:17 +01:00
Eduard Heimbuch
dc6d9cc5eb
return revision on merge
2019-12-18 11:03:07 +01:00
Rene Pfeuffer
0d6dcbd6bd
Merge with default
2019-12-17 14:14:34 +01:00
Rene Pfeuffer
5e47ef0323
Compute LFS attributes on top commit
...
In the previous version, the LFS attributes were read for the latest
commit of the file. This is not the way, a git client handles LFS files.
Therefore we switch to the way, the native git client works and read the
attributes from the commit of the command.
2019-12-13 14:41:36 +01:00
Sebastian Sdorra
8410e7e679
Log duration of commit message calculation and do not synchronize over all instances
2019-12-13 13:52:08 +01:00
Rene Pfeuffer
7332f9dcb4
Merge with default
2019-12-13 08:57:16 +01:00
Rene Pfeuffer
c8a115a373
Mark files aborted recursively
2019-12-13 08:20:26 +01:00
