Changeset 388 for python/vendor/current/Modules/getbuildinfo.c

Timestamp:

Mar 19, 2014, 11:11:30 AM (11 years ago)

Author:

dmik

Message:

python: Update vendor to 2.7.6.

File:

• python/vendor/current/Modules/getbuildinfo.c (modified) (2 diffs)

python/vendor/current/Modules/getbuildinfo.c

@@ -29 +29 @@
 #endif
 
+/* XXX Only unix build process has been tested */
+#ifndef HGVERSION
+#define HGVERSION ""
+#endif
+#ifndef HGTAG
+#define HGTAG ""
+#endif
+#ifndef HGBRANCH
+#define HGBRANCH ""
+#endif
+
 const char *
 Py_GetBuildInfo(void)
 {
-        static char buildinfo[50];
-        const char *revision = Py_SubversionRevision();
-        const char *sep = *revision ? ":" : "";
-        const char *branch = Py_SubversionShortBranch();
-        PyOS_snprintf(buildinfo, sizeof(buildinfo),
-                      "%s%s%s, %.20s, %.9s", branch, sep, revision, 
-                      DATE, TIME);
-        return buildinfo;
+    static char buildinfo[50 + sizeof(HGVERSION) +
+                          ((sizeof(HGTAG) > sizeof(HGBRANCH)) ?
+                           sizeof(HGTAG) : sizeof(HGBRANCH))];
+    const char *revision = _Py_hgversion();
+    const char *sep = *revision ? ":" : "";
+    const char *hgid = _Py_hgidentifier();
+    if (!(*hgid))
+        hgid = "default";
+    PyOS_snprintf(buildinfo, sizeof(buildinfo),
+                  "%s%s%s, %.20s, %.9s", hgid, sep, revision,
+                  DATE, TIME);
+    return buildinfo;
 }
 
@@ -45 +60 @@
 _Py_svnversion(void)
 {
-        /* the following string can be modified by subwcrev.exe */
-        static const char svnversion[] = SVNVERSION;
-        if (svnversion[0] != '$')
-                return svnversion; /* it was interpolated, or passed on command line */
-        return "Unversioned directory";
+    /* the following string can be modified by subwcrev.exe */
+    static const char svnversion[] = SVNVERSION;
+    if (svnversion[0] != '$')
+        return svnversion; /* it was interpolated, or passed on command line */
+    return "Unversioned directory";
 }
+
+const char *
+_Py_hgversion(void)
+{
+    return HGVERSION;
+}
+
+const char *
+_Py_hgidentifier(void)
+{
+    const char *hgtag, *hgid;
+    hgtag = HGTAG;
+    if ((*hgtag) && strcmp(hgtag, "tip") != 0)
+        hgid = hgtag;
+    else
+        hgid = HGBRANCH;
+    return hgid;
+}