add instructions to checkout tags

This commit is contained in:
Eduard Heimbuch
2020-09-16 14:11:27 +02:00
parent f9b3d14541
commit 909f5ebec9
13 changed files with 193 additions and 8 deletions

View File

@@ -0,0 +1,52 @@
/*
* MIT License
*
* Copyright (c) 2020-present Cloudogu GmbH and Contributors
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in all
* copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/
import React, { FC } from "react";
import { Tag } from "@scm-manager/ui-types";
import { useTranslation } from "react-i18next";
type Props = {
tag: Tag;
};
const GitTagInformation: FC<Props> = ({ tag }) => {
const [t] = useTranslation("plugins");
if (!tag) {
return null;
}
return (
<>
<h4>{t("scm-git-plugin.information.checkoutTag")}</h4>
<pre>
<code>
git checkout tags/{tag?.name} -b branch/{tag?.name}
</code>
</pre>
</>
);
};
export default GitTagInformation;

View File

@@ -32,6 +32,7 @@ import GitGlobalConfiguration from "./GitGlobalConfiguration";
import GitBranchInformation from "./GitBranchInformation";
import GitMergeInformation from "./GitMergeInformation";
import RepositoryConfig from "./RepositoryConfig";
import GitTagInformation from "./GitTagInformation";
// repository
@@ -42,6 +43,7 @@ export const gitPredicate = (props: any) => {
binder.bind("repos.repository-details.information", ProtocolInformation, gitPredicate);
binder.bind("repos.branch-details.information", GitBranchInformation, gitPredicate);
binder.bind("repos.tag-details.information", GitTagInformation, gitPredicate);
binder.bind("repos.repository-merge.information", GitMergeInformation, gitPredicate);
binder.bind("repos.repository-avatar", GitAvatar, gitPredicate);

View File

@@ -6,6 +6,7 @@
"replace": "Ein bestehendes Repository aktualisieren",
"fetch": "Remote-Änderungen herunterladen",
"checkout": "Branch wechseln",
"checkoutTag": "Tag als neuen Branch auschecken",
"merge": {
"heading": "Merge des Source Branch in den Target Branch",
"checkout": "1. Sicherstellen, dass der Workspace aufgeräumt ist und der Target Branch ausgecheckt wurde.",

View File

@@ -6,6 +6,7 @@
"replace": "Push an existing repository",
"fetch": "Get remote changes",
"checkout": "Switch branch",
"checkoutTag": "Checkout tag as new branch",
"merge": {
"heading": "How to merge source branch into target branch",
"checkout": "1. Make sure your workspace is clean and checkout target branch",

View File

@@ -0,0 +1,50 @@
/*
* MIT License
*
* Copyright (c) 2020-present Cloudogu GmbH and Contributors
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in all
* copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/
import React, { FC } from "react";
import { useTranslation } from "react-i18next";
import { Tag } from "@scm-manager/ui-types";
type Props = {
tag?: Tag;
};
const HgTagInformation: FC<Props> = ({ tag }) => {
const [t] = useTranslation("plugins");
if (!tag) {
return null;
}
return (
<>
<h4>{t("scm-hg-plugin.information.checkoutTag")}</h4>
<pre>
<code>hg update {tag?.name}</code>
</pre>
</>
);
};
export default HgTagInformation;

View File

@@ -28,6 +28,7 @@ import HgAvatar from "./HgAvatar";
import { ConfigurationBinder as cfgBinder } from "@scm-manager/ui-components";
import HgGlobalConfiguration from "./HgGlobalConfiguration";
import HgBranchInformation from "./HgBranchInformation";
import HgTagInformation from "./HgTagInformation";
const hgPredicate = (props: any) => {
return props.repository && props.repository.type === "hg";
@@ -35,6 +36,7 @@ const hgPredicate = (props: any) => {
binder.bind("repos.repository-details.information", ProtocolInformation, hgPredicate);
binder.bind("repos.branch-details.information", HgBranchInformation, hgPredicate);
binder.bind("repos.tag-details.information", HgTagInformation, hgPredicate);
binder.bind("repos.repository-avatar", HgAvatar, hgPredicate);
// bind global configuration

View File

@@ -5,7 +5,8 @@
"create" : "Neues Repository erstellen",
"replace" : "Ein bestehendes Repository aktualisieren",
"fetch": "Remote-Änderungen herunterladen",
"checkout": "Branch wechseln"
"checkout": "Branch wechseln",
"checkoutTag": "Tag auschecken"
},
"config": {
"link": "Mercurial",

View File

@@ -5,7 +5,8 @@
"create" : "Create a new repository",
"replace" : "Push an existing repository",
"fetch": "Get remote changes",
"checkout": "Switch branch"
"checkout": "Switch branch",
"checkoutTag": "Checkout tag"
},
"config": {
"link": "Mercurial",

View File

@@ -83,7 +83,9 @@
}
},
"tag": {
"name": "Name:"
"name": "Tag-Name",
"commit": "Commit",
"sources": "Sources"
},
"code": {
"sources": "Sources",

View File

@@ -83,7 +83,9 @@
}
},
"tag": {
"name": "Name:"
"name": "Tag-Name",
"commit": "Commit",
"sources": "Sources"
},
"code": {
"sources": "Sources",

View File

@@ -0,0 +1,53 @@
/*
* MIT License
*
* Copyright (c) 2020-present Cloudogu GmbH and Contributors
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in all
* copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/
import React, { FC } from "react";
import { Tag, Repository } from "@scm-manager/ui-types";
import { Button, ButtonAddons } from "@scm-manager/ui-components";
import { useTranslation } from "react-i18next";
type Props = {
repository: Repository;
tag: Tag;
};
const TagButtonGroup: FC<Props> = ({ repository, tag }) => {
const [t] = useTranslation("repos");
const changesetLink = `/repo/${repository.namespace}/${repository.name}/code/changeset/${encodeURIComponent(
tag.revision
)}`;
const sourcesLink = `/repo/${repository.namespace}/${repository.name}/sources/${encodeURIComponent(tag.revision)}/`;
return (
<>
<ButtonAddons>
<Button link={changesetLink} icon="exchange-alt" label={t("tag.commit")} reducedMobile={true} />
<Button link={sourcesLink} icon="code" label={t("tag.sources")} reducedMobile={true} />
</ButtonAddons>
</>
);
};
export default TagButtonGroup;

View File

@@ -24,13 +24,25 @@
import React, { FC } from "react";
import { useTranslation } from "react-i18next";
import { Tag } from "@scm-manager/ui-types";
import { Repository, Tag } from "@scm-manager/ui-types";
import { DateFromNow } from "@scm-manager/ui-components";
import styled from "styled-components";
import TagButtonGroup from "./TagButtonGroup";
type Props = {
repository: Repository;
tag?: Tag;
};
const TagDetail: FC<Props> = ({ tag }) => {
const Created = styled.div`
margin-top: 0.5rem;
`;
const Date = styled(DateFromNow)`
font-size: 1rem;
`;
const TagDetail: FC<Props> = ({ tag, repository }) => {
const [t] = useTranslation("repos");
if (!tag) {
@@ -40,7 +52,13 @@ const TagDetail: FC<Props> = ({ tag }) => {
return (
<div className="media">
<div className="media-content subtitle">
<strong>{t("tag.name")}</strong> {tag?.name}
<strong>{t("tag.name") + ":"}</strong> {tag?.name}
<Created className="is-ellipsis-overflow">
<strong>{t("tags.overview.created") + ":"}</strong> <Date date={tag.date} className="has-text-grey" />
</Created>
</div>
<div className="media-right">
<TagButtonGroup repository={repository} tag={tag} />
</div>
</div>
);

View File

@@ -35,7 +35,7 @@ type Props = {
const TagView: FC<Props> = ({ repository, tag }) => {
return (
<div>
<TagDetail tag={tag} />
<TagDetail tag={tag} repository={repository} />
<hr />
<div className="content">
<ExtensionPoint