From 60e50b0a48f8ce74be94d3f3b19837fc47a99524 Mon Sep 17 00:00:00 2001 From: Ihor Sviziev Date: Wed, 31 Oct 2018 09:20:26 +0200 Subject: [PATCH 1/3] Add support of git@bitbucket.org and git@github.com repos --- composer-lock-diff | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/composer-lock-diff b/composer-lock-diff index 7660e93..c6c5de5 100755 --- a/composer-lock-diff +++ b/composer-lock-diff @@ -214,6 +214,12 @@ function makeCompareUrl($pkg, $diff) { } function getSourceRepoType($url) { + if (preg_match('/^git@bitbucket.org:(.*)\.git$/', $url)) { + return 'bitbucket'; + } + if (preg_match('/^git@github.com:(.*)\.git$/', $url)) { + return 'github'; + } if (! preg_match('/^http/i', $url)) { return 'unknown'; } @@ -236,11 +242,13 @@ function formatCompareUnknown($url, $from, $to) { } function formatCompareGithub($url, $from, $to) { + $url = preg_replace(['/\.git$/', '/^git@github.com:/'], ['', 'https://github.com/'], $url); return sprintf('%s/compare/%s...%s', preg_replace('/\.git$/', '', $url), urlencode($from), urlencode($to)); } function formatCompareBitbucket($url, $from, $to) { - return sprintf('%s/branches/compare/%s%%0D%s', preg_replace('/\.git$/', '', $url), urlencode($from), urlencode($to)); + $url = preg_replace(['/\.git$/', '/^git@bitbucket.org:/'], ['', 'https://bitbucket.org/'], $url); + return sprintf('%s/branches/compare/%s%%0D%s', $url, urlencode($from), urlencode($to)); } function formatCompareGitlab($url, $from, $to) { From 08693548c59c2de591dc8dabbee8181a7837f3e0 Mon Sep 17 00:00:00 2001 From: Ihor Sviziev Date: Wed, 31 Oct 2018 09:23:03 +0200 Subject: [PATCH 2/3] Add support of git@bitbucket.org and git@github.com repos --- composer-lock-diff | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer-lock-diff b/composer-lock-diff index c6c5de5..613ea4e 100755 --- a/composer-lock-diff +++ b/composer-lock-diff @@ -243,7 +243,7 @@ function formatCompareUnknown($url, $from, $to) { function formatCompareGithub($url, $from, $to) { $url = preg_replace(['/\.git$/', '/^git@github.com:/'], ['', 'https://github.com/'], $url); - return sprintf('%s/compare/%s...%s', preg_replace('/\.git$/', '', $url), urlencode($from), urlencode($to)); + return sprintf('%s/compare/%s...%s', $url, urlencode($from), urlencode($to)); } function formatCompareBitbucket($url, $from, $to) { From 6f4a298dfb60ed3d3ad45714281f46eeb462c12a Mon Sep 17 00:00:00 2001 From: Ihor Sviziev Date: Tue, 18 Dec 2018 13:29:12 +0200 Subject: [PATCH 3/3] Add support of git@bitbucket.org and git@github.com repos Fix compare links for bitbucket --- composer-lock-diff | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer-lock-diff b/composer-lock-diff index 613ea4e..e8cbc09 100755 --- a/composer-lock-diff +++ b/composer-lock-diff @@ -248,7 +248,7 @@ function formatCompareGithub($url, $from, $to) { function formatCompareBitbucket($url, $from, $to) { $url = preg_replace(['/\.git$/', '/^git@bitbucket.org:/'], ['', 'https://bitbucket.org/'], $url); - return sprintf('%s/branches/compare/%s%%0D%s', $url, urlencode($from), urlencode($to)); + return sprintf('%s/branches/compare/%s%%0D%s', $url, urlencode($to), urlencode($from)); } function formatCompareGitlab($url, $from, $to) {