[Updated] D10060: build: make version from .hg_archival.txt consistent with that from .hg/

martinvonz (Martin von Zweigbergk) phabricator at mercurial-scm.org
Wed Feb 24 15:54:31 UTC 2021


Closed by commit rHG359bdd8fc60a: build: make version from .hg_archival.txt consistent with that from .hg/ (authored by martinvonz).
This revision was automatically updated to reflect the committed changes.
This revision was not accepted when it landed; it landed in state "Needs Review".

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D10060?vs=25803&id=25809

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D10060/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D10060

AFFECTED FILES
  setup.py

CHANGE DETAILS

diff --git a/setup.py b/setup.py
--- a/setup.py
+++ b/setup.py
@@ -431,12 +431,12 @@
     elif 'latesttag' in kw:
         if 'changessincelatesttag' in kw:
             version = (
-                '%(latesttag)s+.%(changessincelatesttag)s.%(node).12s' % kw
+                '%(latesttag)s+hg%(changessincelatesttag)s.%(node).12s' % kw
             )
         else:
-            version = '%(latesttag)s+.%(latesttagdistance)s.%(node).12s' % kw
+            version = '%(latesttag)s+hg%(latesttagdistance)s.%(node).12s' % kw
     else:
-        version = '0+' + kw.get('node', '')[:12]
+        version = '0+hg' + kw.get('node', '')[:12]
 
 if version:
     versionb = version



To: martinvonz, #hg-reviewers
Cc: mercurial-patches
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mercurial-scm.org/pipermail/mercurial-patches/attachments/20210224/00cad20e/attachment-0002.html>


More information about the Mercurial-patches mailing list