[pypy-commit] pypy fix-version-tool: remove hardcoded project from get_repo_version_info()

[bdkearns]

Author: Brian Kearns <bdkearns at gmail.com>
Branch: fix-version-tool
Changeset: r60563:d28498b4b051
Date: 2013-01-27 16:53 -0500
http://bitbucket.org/pypy/pypy/changeset/d28498b4b051/

Log:	remove hardcoded project from get_repo_version_info()

diff --git a/pypy/module/sys/version.py b/pypy/module/sys/version.py
--- a/pypy/module/sys/version.py
+++ b/pypy/module/sys/version.py
@@ -69,7 +69,7 @@
         CPYTHON_VERSION[0],
         CPYTHON_VERSION[1],
         CPYTHON_VERSION[2],
-        get_repo_version_info(root=pypyroot)[2],
+        get_repo_version_info(root=pypyroot)[1],
         date,
         time,
         ver,
@@ -94,7 +94,7 @@
 def get_repo_info(space):
     info = get_repo_version_info(root=pypyroot)
     if info:
-        project, repo_tag, repo_version = info
+        repo_tag, repo_version = info
         return space.newtuple([space.wrap('PyPy'),
                                space.wrap(repo_tag),
                                space.wrap(repo_version)])
diff --git a/rpython/tool/test/test_version.py b/rpython/tool/test/test_version.py
--- a/rpython/tool/test/test_version.py
+++ b/rpython/tool/test/test_version.py
@@ -19,5 +19,5 @@
 
 def test_get_repo_version_info():
     assert get_repo_version_info(None)
-    assert get_repo_version_info(os.devnull) == ('RPython', '?', '?')
-    assert get_repo_version_info(sys.executable) == ('RPython', '?', '?')
+    assert get_repo_version_info(os.devnull) == ('?', '?')
+    assert get_repo_version_info(sys.executable) == ('?', '?')
diff --git a/rpython/tool/udir.py b/rpython/tool/udir.py
--- a/rpython/tool/udir.py
+++ b/rpython/tool/udir.py
@@ -31,7 +31,7 @@
     if basename is None:
         info = get_repo_version_info()
         if info:
-            project, hgtag, hgid = info
+            hgtag, hgid = info
             basename = hgtag
             if basename == '?':
                 basename = 'unknown' # directories with ? are not fun
diff --git a/rpython/tool/version.py b/rpython/tool/version.py
--- a/rpython/tool/version.py
+++ b/rpython/tool/version.py
@@ -18,30 +18,25 @@
 def get_repo_version_info(hgexe=None, root=rpythonroot):
     '''Obtain version information by invoking the 'hg' or 'git' commands.'''
 
-    if root == rpythonroot:
-        project = ("RPython",)
-    else:
-        project = ('?',)
-
     # Try to see if we can get info from Git if hgexe is not specified.
     if not hgexe:
         if os.path.isdir(os.path.join(root, '.git')):
-            return project + _get_git_version(root)
+            return _get_git_version(root)
 
     # Fallback to trying Mercurial.
     if hgexe is None:
         hgexe = py.path.local.sysfind('hg')
 
     if os.path.isfile(os.path.join(root, '.hg_archival.txt')):
-        return project + _get_hg_archive_version(os.path.join(root, '.hg_archival.txt'))
+        return _get_hg_archive_version(os.path.join(root, '.hg_archival.txt'))
     elif not os.path.isdir(os.path.join(root, '.hg')):
         maywarn('Not running from a Mercurial repository!')
-        return project + default_retval
+        return default_retval
     elif not hgexe:
         maywarn('Cannot find Mercurial command!')
-        return project + default_retval
+        return default_retval
     else:
-        return project + _get_hg_version(hgexe, root)
+        return _get_hg_version(hgexe, root)
 
 
 def _get_hg_version(hgexe, root):