Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2026-01-01 21:29:47 +01:00
Code Issues Packages Projects Releases Activity
6,338 Commits 34 Branches 209 Tags
d9bfddce2df4fa18c8f6242622b07cd90df46be2
Commit Graph

377 Commits

Author SHA1 Message Date
René Pfeuffer
1037d8d266 Merge with 2.0.0-m3 2018-11-08 09:21:41 +01:00
Sebastian Sdorra
c59ba9e149 Merged in feature/log_two_revisions (pull request #104) 
Feature log two revisions
 2018-11-07 14:07:50 +00:00
Sebastian Sdorra
73c402890c Merged in feature/diff_two_revisions (pull request #101) 
Feature diff between two revisions
 2018-11-07 13:54:23 +00:00
René Pfeuffer
2f91531d05 Assert existence of pool directory 2018-11-07 14:04:00 +01:00
René Pfeuffer
8771f68081 Set author for merge 2018-11-07 14:02:02 +01:00
René Pfeuffer
2d04e6c2f0 Specify not mergeable files in merge result 2018-11-07 13:34:35 +01:00
René Pfeuffer
26d5e6e062 Set merge message 2018-11-07 13:17:21 +01:00
René Pfeuffer
d5da106038 Implement merge using api of class Git 2018-11-07 12:52:40 +01:00
René Pfeuffer
e377ce5988 Implement first steps for actual merge 2018-11-07 11:52:49 +01:00
René Pfeuffer
04c5d6f84a Fix deletion of temporary clone directory 2018-11-07 11:13:21 +01:00
René Pfeuffer
e2766d494a Register SimpleGitWorkdirFactory in guice context 2018-11-07 10:38:01 +01:00
René Pfeuffer
62c20b071b Fix reminders of dry run 2018-11-07 10:33:47 +01:00
René Pfeuffer
33642352ea Start with a simple factory instead of a complex pool 2018-11-07 10:28:27 +01:00
René Pfeuffer
fc3e08d612 Include dry run in merge command 2018-11-07 08:32:27 +01:00
René Pfeuffer
6863337faf Implement first steps for merge 2018-11-06 17:14:27 +01:00
René Pfeuffer
e0cc99a3d8 Implement simple merge dry run 2018-11-06 14:40:55 +01:00
René Pfeuffer
8be8c19a26 Implement diff between two changesets for git 2018-11-06 12:04:33 +01:00
René Pfeuffer
cf05235dfa Add context to InternalRepositoryException 2018-11-06 09:14:20 +01:00
Sebastian Sdorra
dd95c9c306 implemented git repository type configuration 2018-11-06 07:59:34 +01:00
René Pfeuffer
2508a1b9b7 Implement log between two changesets for git 2018-11-05 16:42:20 +01:00
René Pfeuffer
6eb3c38655 Create error response for already existing entities 2018-10-25 15:31:42 +02:00
René Pfeuffer
f041b4ecb6 Merge with 2.0.0-m3 2018-10-25 10:15:32 +02:00
René Pfeuffer
b74fb814b8 Introduce default error object with context for not found exceptions 2018-10-18 13:12:16 +02:00
René Pfeuffer
8c46a7f714 Name things 2018-10-17 08:05:29 +02:00
René Pfeuffer
e296812457 Remove pseudo error handling 2018-10-10 18:54:15 +02:00
René Pfeuffer
fa0f66caf1 Iterate into correct subdirectory for git browse command 2018-10-10 13:27:57 +02:00
René Pfeuffer
63669b67f0 Detect browse command for root dir correctly in git 2018-10-10 11:49:49 +02:00
René Pfeuffer
0bd9ccd3d5 Do not filter for path '/' 
Otherwise jgit's PathFilter will fail.
 2018-10-10 09:30:52 +02:00
René Pfeuffer
83640b9d44 Merge with 2.0.0-m3 2018-10-10 08:54:23 +02:00
Sebastian Sdorra
e71e875e4d Merged in feature/harmonize_branches_in_changesets (pull request #81) 
Add branch to changeset collections
 2018-10-09 09:10:20 +00:00
Sebastian Sdorra
768309cea4 use develop branch instead of default 2018-10-09 08:52:33 +02:00
Sebastian Sdorra
8de89928b3 remove unused imports 2018-10-09 08:50:20 +02:00
Sebastian Sdorra
ed9f5fc69e implement new browse api for git 2018-10-08 14:39:11 +02:00
René Pfeuffer
de6b94fa4c Remove code duplication 2018-10-02 13:44:22 +02:00
René Pfeuffer
5a1f15b8c8 Fix usage of default branch 2018-10-02 13:41:20 +02:00
René Pfeuffer
4b7940ac50 Cleanup computation of default branch 2018-10-02 13:20:52 +02:00
René Pfeuffer
8f139c8d4a Reduce code duplication for json object modification 2018-09-28 16:53:09 +02:00
René Pfeuffer
0356af9ced Fix head ref computation 2018-09-28 16:19:41 +02:00
René Pfeuffer
3dd632888b Fix optional mapping 2018-09-28 16:09:09 +02:00
René Pfeuffer
6361ae35c1 Add config links for git, hg and svn 2018-09-28 14:17:48 +02:00
René Pfeuffer
6819d6a0fe Remove unnecessary HEAD resolving 2018-09-28 13:17:42 +02:00
René Pfeuffer
964f2eab2e Remove duplication 2018-09-28 11:18:36 +02:00
René Pfeuffer
e35ec519cb Add method to retrieve branch name from repository 2018-09-28 10:14:04 +02:00
René Pfeuffer
9f80840c43 Add branch to changeset collections 
Branch information is added to a changeset collection and therefore
removed from single changesets for git repositories. Mercurial
repositories now also set the default branch in changesets.
 2018-09-26 13:19:38 +02:00
René Pfeuffer
2eb685c5d0 Delete EscapeUtil and dependencies 2018-09-19 10:47:26 +02:00
René Pfeuffer
88506b0633 Remove unnecessary annotations 2018-09-18 08:58:03 +02:00
René Pfeuffer
a5dcc8cf8a Merge with 2.0.0-m3 2018-09-14 17:47:45 +02:00
René Pfeuffer
4d60ebd54e Use constants for repository types 2018-09-14 10:31:16 +02:00
René Pfeuffer
e88639ab81 Implement permission filters as decorator for servlets 2018-09-14 10:21:00 +02:00
René Pfeuffer
7de9f69061 Add servlet decorators for hg and svn 2018-09-14 09:36:56 +02:00