Apply suggestions from code review

Co-authored-by: Erik Sundell <[email protected]>

Author: minrk

README.md

@@ -33,16 +33,13 @@ information.
       before its set as Helm 3 requires Helm chart versions to be SemVer2
       compliant.
 1. The latest commit modifying content in a _relevant path_ since `tag`.
-   1. `n`: The number of commits since the tagged commit, as an integer.
-   1. `h`: The latest commit's abbreviated hash. which is often 7-8 characters,
+   1. `n`: The number of commits since the latest tagged commit on the branch, as an integer.
+   1. `hash`: The latest commit's abbreviated hash, which is often 7-8 characters,
       prefixed with `h`.
-1. If `tag` (like `0.10.0` or `0.10.0-beta.1`) contains `-`,
-   indicating that it is a prerelease,
-   the chartpress suffix will be added to the prerelease fields,
-   e.g. `0.10.0-beta.1.git.5.habc123`
-   format will be used instead of a `tag-0.dev.git.n.h` format to be SemVer 2 compliant.
+1. If `tag` (like `0.10.0` or `0.10.0-beta.1`) contains a `-`, a `tag.git.n.hash`
+   format will be used, and otherwise a `tag-0.dev.git.n.hash` format will be used.
 1. If `--long` is specified or not. If `--long` is specified, tagged commits
-   will always be written out with the `n.h` part appended to it, looking something
+   will always be written out with the `.git.n.hash` part appended to it, looking something
    like `1.0.0-0.dev.git.0.habcd123`
 
 When producing a development version (with `.git.n.hash` on the end),

chartpress.py

@@ -787,8 +787,10 @@ def build_chart(
     Update Chart.yaml's version, using specified version or by constructing one.
 
     Chart versions are constructed using:
-        a) a base version, derived from either Chart.yaml or the latest tag
-        b) the latest commit that modified provided paths
+        a) a base version, derived from either Chart.yaml's version field or the latest git tag on branch
+        b) the latest commit that was tagged on the current branch (n)
+        c) the latest commit that modified provided paths (hash)
+        
 
     Example versions constructed:
         - 0.9.0-0.dev.git.2.hdfgh3456
@@ -1117,7 +1119,6 @@ def main(args=None):
     #   - push chart (--publish-chart, --extra-message)
     for chart in config["charts"]:
         forced_version = None
-        # TODO: maybe warn and switch default in the future?
         use_chart_version = chart.get("useChartVersion", False)
 
         if args.tag:
@@ -1126,7 +1127,7 @@ def main(args=None):
         elif args.reset and not use_chart_version:
             # resetting, get version from chartpress.yaml,
             # ignoring current version in Chart.yaml
-            forced_version = chart.get("resetVersion", "0.0.1-0.dev")
+            forced_version = chart.get("resetVersion", "0.0.1-set.by.chartpress")
 
         if not args.list_images:
             # update Chart.yaml with a version