git-tide 0.1.3__tar.gz → 0.1.4__tar.gz

{git_tide-0.1.3 → git_tide-0.1.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: git-tide
-Version: 0.1.3
+Version: 0.1.4
 Summary: CLI for automated gitflow-style branching
 Author: Chad Dombrova
 Classifier: Programming Language :: Python :: 2

{git_tide-0.1.3 → git_tide-0.1.4}/pyproject.toml

@@ -6,7 +6,7 @@ name = "git-tide"
 packages = [
     { include = "tide", from = "src" },
 ]
-version = "0.1.3"
+version = "0.1.4"
 description = "CLI for automated gitflow-style branching"
 authors = ["Chad Dombrova", "Matt Collie"]
 readme = "README.md"
@@ -41,6 +41,7 @@ markers = [
 ]
 
 [tool.tide]
+tag_format = "$version"
 branches.beta = "develop"
 branches.rc = "staging"
 branches.stable = "master"

{git_tide-0.1.3 → git_tide-0.1.4}/src/tide/cli.py

@@ -8,8 +8,8 @@ from pathlib import Path
 
 from .core import (
     is_url,
-    cz,
-    get_tag_for_branch,
+    get_next_tag,
+    get_current_tag,
     get_modified_projects,
     get_projects,
     load_config,
@@ -180,9 +180,7 @@ def autotag(annotation: str, base_rev: str | None) -> None:
     if projects:
         for project_folder, project_name in projects:
             # Auto-tag
-            tag = get_tag_for_branch(
-                CONFIG, remote, branch, project_name, project_folder
-            )
+            tag = get_next_tag(CONFIG, remote, branch, project_name, project_folder)
 
             # NOTE: this delay is necessary to create stable sorting of tags
             # because git's time resolution is 1s (same as unix timestamp).
@@ -314,22 +312,25 @@ def get_tag(path: str, branch: str | None, remote: str, next: bool) -> None:
     """
     Get the next tag.
     """
+    projects = dict(get_projects())
+    folder = Path(path)
+    try:
+        project_name = projects[folder]
+    except KeyError:
+        raise click.ClickException(
+            f"There is not a project at path={folder}. "
+            "Ensure there is a pyproject.toml file with a [tool.tide] section "
+            "and a `project` entry"
+        )
+
     if next:
         if branch is None:
             runtime = get_runtime()
             branch = runtime.current_branch()
-        projects = dict(get_projects())
-        folder = Path(path)
-        try:
-            project_name = projects[folder]
-        except KeyError:
-            raise click.ClickException(
-                f"There is not a project at path={folder}. "
-                "Ensure there is a pyproject.toml file with a [tool.tide] section and a `project` entry"
-            )
-        click.echo(get_tag_for_branch(CONFIG, remote, branch, project_name, folder))
+
+        click.echo(get_next_tag(CONFIG, remote, branch, project_name, folder))
     else:
-        click.echo(cz("version", "--project", folder=path))
+        click.echo(get_current_tag(CONFIG, project_name, folder))
 
 
 def main() -> None:

{git_tide-0.1.3 → git_tide-0.1.4}/src/tide/core.py

@@ -23,6 +23,7 @@ from .gitutils import git, checkout, get_tags, branch_exists, join, current_rev,
 if TYPE_CHECKING:
     import gitlab.v4.objects
     import commitizen.providers
+    import commitizen.config
 
 
 TOOL_NAME = "tide"
@@ -83,6 +84,12 @@ def load_config(path: str | None = None, verbose: bool = False) -> Config:
         )
 
     config = Config(verbose=verbose)
+
+    try:
+        config.tag_format = settings["tag_format"]
+    except KeyError:
+        pass
+
     # Loop through branches once and extract all needed information
     for release_id in ReleaseID:
         branch_name = branches.get(release_id.value)
@@ -109,6 +116,7 @@ class Config:
     # branch name to pre-release name (alpha, beta, rc). None for stable.
     branch_to_release_id: dict[str, ReleaseID] = field(default_factory=dict)
     verbose: bool = False
+    tag_format: str = "$version"
 
     def get_upstream_branch(self, branch: str) -> str | None:
         """
@@ -505,18 +513,13 @@ def is_pending_bump(
             click.echo("No promote marker found", err=True)
         return True
 
-    cwd = os.getcwd()
-    os.chdir(folder)
-    try:
-        matcher = provider._tag_format_matcher()
-        if config.verbose:
-            click.echo(f"Found promotion base rev: {promotion_rev}")
-        # List any tags for this project folder between this branch and the promotion note
-        all_tags = get_tags(end_rev=promotion_rev)
-        tags = [t for t in all_tags if matcher(t)]
-        return not tags
-    finally:
-        os.chdir(cwd)
+    matcher = provider._tag_format_matcher()
+    if config.verbose:
+        click.echo(f"Found promotion base rev: {promotion_rev}")
+    # List any tags for this project folder between this branch and the promotion note
+    all_tags = get_tags(end_rev=promotion_rev)
+    tags = [t for t in all_tags if matcher(t)]
+    return not tags
 
 
 def get_promotion_marker(remote: str) -> str | None:
@@ -544,7 +547,7 @@ def set_promotion_marker(remote: str, branch: str) -> None:
     """
     Store a state for whether the given project on the given branch needs to have a minor bump.
 
-    If it is true for a given branch, then get_tag_for_branch() will return a minor increment.
+    If it is true for a given branch, then get_next_tag() will return a minor increment.
     After this, autotag() will set the pending state to False until.
 
     This pending state is reset to True after each promotion event.
@@ -559,7 +562,43 @@ def set_promotion_marker(remote: str, branch: str) -> None:
     git("push", remote, "refs/notes/*")
 
 
-def get_tag_for_branch(
+def _get_cz_config(config: Config, project_name: str) -> commitizen.config.BaseConfig:
+    from commitizen.config.base_config import BaseConfig
+    from commitizen.defaults import Settings
+
+    cz_config = BaseConfig()
+    cz_config.update(
+        Settings(
+            name="cz_conventional_commits",
+            tag_format=config.tag_format.replace("$project", project_name),
+            version_scheme="pep440",
+            version_provider="scm",
+            major_version_zero=False,
+        )
+    )
+    return cz_config
+
+
+def get_current_tag(config: Config, project_name: str, folder: Path) -> str:
+    from commitizen.providers import ScmProvider
+    from commitizen.version_schemes import get_version_scheme
+    from commitizen import bump
+
+    cz_config = _get_cz_config(config, project_name)
+    provider = ScmProvider(cz_config)
+    scheme = get_version_scheme(cz_config)
+    current_version = provider.get_version()
+
+    tag_version = bump.normalize_tag(
+        current_version,
+        tag_format=cz_config.settings["tag_format"],
+        scheme=scheme,
+    )
+
+    return tag_version
+
+
+def get_next_tag(
     config: Config, remote: str, branch: str, project_name: str, folder: Path
 ) -> str:
     """
@@ -581,22 +620,8 @@ def get_tag_for_branch(
     """
     from commitizen.providers import ScmProvider
     from commitizen.version_schemes import get_version_scheme, Increment
-    from commitizen.config.base_config import BaseConfig
-    from commitizen.defaults import Settings
     from commitizen import bump
 
-    tag_format = f"{project_name}-$version"
-    cz_config = BaseConfig()
-    cz_config.update(
-        Settings(
-            name="cz_conventional_commits",
-            tag_format=tag_format,
-            version_scheme="pep440",
-            version_provider="scm",
-            major_version_zero=False,
-        )
-    )
-
     try:
         release_id = config.branch_to_release_id[branch]
     except KeyError:
@@ -605,6 +630,8 @@ def get_tag_for_branch(
             f"Must be one of {', '.join(config.branches)}"
         )
 
+    cz_config = _get_cz_config(config, project_name)
+
     provider = ScmProvider(cz_config)
     scheme = get_version_scheme(cz_config)
     current_version = scheme(provider.get_version())
@@ -630,7 +657,7 @@ def get_tag_for_branch(
 
     new_tag_version = bump.normalize_tag(
         new_version,
-        tag_format=tag_format,
+        tag_format=cz_config.settings["tag_format"],
         scheme=scheme,
     )