Merge pull request #111 from petrem/master

more sophisticated ignoring of tagging commits on mercurial

Author: RonnyPfannschmidt

setuptools_scm/hg.py

@@ -8,13 +8,18 @@
 def _hg_tagdist_normalize_tagcommit(root, tag, dist, node):
     dirty = node.endswith('+')
     node = node.strip('+')
-    st = do('hg st --no-status --change %s' % str(node), root)
-
-    trace('normalize', locals())
-    if int(dist) == 1 and st == '.hgtags' and not dirty:
-        return meta(tag)
+    revset = ("(branch(.) and tag({tag!r})::. and file('re:^(?!\.hgtags).*$')"
+              " - tag({tag!r}))").format(tag=tag)
+    if tag != '0.0':
+        commits = do(['hg', 'log', '-r', revset, '--template', '{node|short}'],
+                     root)
     else:
+        commits = True
+    trace('normalize', locals())
+    if commits or dirty:
         return meta(tag, distance=dist, node=node, dirty=dirty)
+    else:
+        return meta(tag)
 
 
 def parse(root):
@@ -36,7 +41,9 @@ def parse(root):
     out = do(cmd, root)
     try:
         # in merge state we assume parent 1 is fine
-        tag, dist = out.splitlines()[0].split()
+        tags, dist = out.splitlines()[0].split()
+        # pick latest tag from tag list
+        tag = tags.split(':')[-1]
         if tag == 'null':
             tag = '0.0'
             dist = int(dist) + 1

testing/test_mercurial.py

@@ -65,6 +65,12 @@ def test_version_from_hg_id(wd):
     wd.commit_testfile()
     assert wd.version.startswith('0.2.dev1+')
 
+    # several tags
+    wd('hg up')
+    wd('hg tag v0.2 -u test -d "0 0"')
+    wd('hg tag v0.3 -u test -d "0 0" -r v0.2')
+    assert wd.version == '0.3'
+
 
 def test_version_from_archival(wd):
     # entrypoints are unordered,