diff --git a/setup.py b/setup.py index 9641643fac7177ec960121e2c87408b3f45a1271_c2V0dXAucHk=..eb55e09202c82b8e26d19d1b04ed1fdadadff60f_c2V0dXAucHk= 100644 --- a/setup.py +++ b/setup.py @@ -196,9 +196,13 @@ if hgid.endswith('+'): # propagate the dirty status to the tag version += '+' else: # no tag found - cmd = [sys.executable, 'hg', 'parents', '--template', - '{latesttag}+{latesttagdistance}-'] - version = runhg(cmd, env) + hgid + ltagcmd = [sys.executable, 'hg', 'parents', '--template', + '{latesttag}'] + ltag = runhg(ltagcmd, env) + changessincecmd = [sys.executable, 'hg', 'log', '-T', 'x\n', '-r', + "only(.,'%s')" % ltag] + changessince = len(runhg(changessincecmd, env).splitlines()) + version = '%s+%s-%s' % (ltag, changessince, hgid) if version.endswith('+'): version += time.strftime('%Y%m%d') elif os.path.exists('.hg_archival.txt'):