self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2024-12-24 10:27:10 +02:00
Code Issues Releases Activity

Plugin Repo: Fix git compare url

Browse Source
This commit is contained in:
Laurent Cozic 2022-11-28 17:54:29 +01:00
parent 43618c774a
commit fab2271c9f
2 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
packages/plugin-repo-cli/lib/gitCompareUrl.test.ts
View File

@ -15,6 +15,17 @@ describe('gitCompareUrl', () => {
},
'https://github.com/JackGruber/joplin-plugin-copytags/compare/b52b01f6d3b709a811ac214253636a7c207c87dd..9ec4a476a54440ac43422c34e179dcabfca1e5a0',
],
[
{
repository_url: 'https://github.com/JackGruber/joplin-plugin-copytags.git',
_publish_commit: 'master:9ec4a476a54440ac43422c34e179dcabfca1e5a0',
},
{
repository_url: 'https://github.com/JackGruber/joplin-plugin-copytags.git',
_publish_commit: 'master:b52b01f6d3b709a811ac214253636a7c207c87dd',
},
'https://github.com/JackGruber/joplin-plugin-copytags/compare/b52b01f6d3b709a811ac214253636a7c207c87dd..9ec4a476a54440ac43422c34e179dcabfca1e5a0',
],
[
{
repository_url: 'https://github.com/JackGruber/joplin-plugin-copytags',

8
packages/plugin-repo-cli/lib/gitCompareUrl.ts
View File

@ -11,13 +11,19 @@ function removeBranch(commit: string): string {
return commit;
}
const formatRepoUrl = (url: string): string => {
if (!url) return url;
if (url.endsWith('.git')) return url.substring(0, url.length - 4);
return url;
};
export default function(manifest: any, previousManifest: any = null): string {
// "repository_url": "https://github.com/JackGruber/joplin-plugin-copytags",
// "_publish_commit": "master:b52b01f6d3b709a811ac214253636a7c207c87dd",
// https://github.com/JackGruber/joplin-plugin-copytags/compare/9ec4a476a54440ac43422c34e179dcabfca1e5a0..b52b01f6d3b709a811ac214253636a7c207c87dd
const repoUrl: string = manifest.repository_url;
const repoUrl: string = formatRepoUrl(manifest.repository_url);
const commit: string = removeBranch(manifest._publish_commit);
const previousCommit: string = previousManifest ? removeBranch(previousManifest._publish_commit) : '';