Commits

Alexander Hesse  committed 64f878f

Moved pypy.tool.version to rpython; reverted udir

  • Participants
  • Parent commits dd27a63

Comments (0)

Files changed (6)

File pypy/module/sys/version.py

 import pypy
 pypydir = os.path.dirname(os.path.abspath(pypy.__file__))
 del pypy
-from pypy.tool.version import get_repo_version_info
+from rpython.tool.version import get_repo_version_info
 
 import time as t
 gmtime = t.gmtime()

File pypy/tool/test/test_version.py

-import os, sys
-import py
-from pypy.tool.version import get_repo_version_info, _get_hg_archive_version
-
-def test_hg_archival_version(tmpdir):
-    def version_for(name, **kw):
-        path = tmpdir.join(name)
-        path.write('\n'.join('%s: %s' % x for x in kw.items()))
-        return _get_hg_archive_version(str(path))
-
-    assert version_for('release',
-                       tag='release-123',
-                       node='000',
-                      ) == ('PyPy', 'release-123', '000')
-    assert version_for('somebranch',
-                       node='000',
-                       branch='something',
-                      ) == ('PyPy', 'something', '000')
-
-
-def test_get_repo_version_info():
-    assert get_repo_version_info(None)
-    assert get_repo_version_info(os.devnull) == ('PyPy', '?', '?')
-    assert get_repo_version_info(sys.executable) == ('PyPy', '?', '?')

File pypy/tool/version.py

-import py
-import os
-from subprocess import Popen, PIPE
-import pypy
-pypydir = os.path.dirname(os.path.abspath(pypy.__file__))
-pypyroot = os.path.dirname(pypydir)
-default_retval = 'PyPy', '?', '?'
-
-def maywarn(err, repo_type='Mercurial'):
-    if not err:
-        return
-
-    from rpython.tool.ansi_print import ansi_log
-    log = py.log.Producer("version")
-    py.log.setconsumer("version", ansi_log)
-    log.WARNING('Errors getting %s information: %s' % (repo_type, err))
-
-def get_repo_version_info(hgexe=None):
-    '''Obtain version information by invoking the 'hg' or 'git' commands.'''
-
-    # 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(pypyroot, '.git')):
-            return _get_git_version()
-
-    # Fallback to trying Mercurial.
-    if hgexe is None:
-        hgexe = py.path.local.sysfind('hg')
-
-    if os.path.isfile(os.path.join(pypyroot, '.hg_archival.txt')):
-        return _get_hg_archive_version(os.path.join(pypyroot, '.hg_archival.txt'))
-    elif not os.path.isdir(os.path.join(pypyroot, '.hg')):
-        maywarn('Not running from a Mercurial repository!')
-        return default_retval
-    elif not hgexe:
-        maywarn('Cannot find Mercurial command!')
-        return default_retval
-    else:
-        return _get_hg_version(hgexe)
-
-
-def _get_hg_version(hgexe):
-    env = dict(os.environ)
-    # get Mercurial into scripting mode
-    env['HGPLAIN'] = '1'
-    # disable user configuration, extensions, etc.
-    env['HGRCPATH'] = os.devnull
-
-    try:
-        p = Popen([str(hgexe), 'version', '-q'],
-                  stdout=PIPE, stderr=PIPE, env=env)
-    except OSError, e:
-        maywarn(e)
-        return default_retval
-
-    if not p.stdout.read().startswith('Mercurial Distributed SCM'):
-        maywarn('command does not identify itself as Mercurial')
-        return default_retval
-
-    p = Popen([str(hgexe), 'id', '-i', pypyroot],
-              stdout=PIPE, stderr=PIPE, env=env)
-    hgid = p.stdout.read().strip()
-    maywarn(p.stderr.read())
-    if p.wait() != 0:
-        hgid = '?'
-
-    p = Popen([str(hgexe), 'id', '-t', pypyroot],
-              stdout=PIPE, stderr=PIPE, env=env)
-    hgtags = [t for t in p.stdout.read().strip().split() if t != 'tip']
-    maywarn(p.stderr.read())
-    if p.wait() != 0:
-        hgtags = ['?']
-
-    if hgtags:
-        return 'PyPy', hgtags[0], hgid
-    else:
-        # use the branch instead
-        p = Popen([str(hgexe), 'id', '-b', pypyroot],
-                  stdout=PIPE, stderr=PIPE, env=env)
-        hgbranch = p.stdout.read().strip()
-        maywarn(p.stderr.read())
-
-        return 'PyPy', hgbranch, hgid
-
-
-def _get_hg_archive_version(path):
-    fp = open(path)
-    try:
-        data = dict(x.split(': ', 1) for x in fp.read().splitlines())
-    finally:
-        fp.close()
-    if 'tag' in data:
-        return 'PyPy', data['tag'], data['node']
-    else:
-        return 'PyPy', data['branch'], data['node']
-
-
-def _get_git_version():
-    #XXX: this function is a untested hack,
-    #     so the git mirror tav made will work
-    gitexe = py.path.local.sysfind('git')
-    if not gitexe:
-        return default_retval
-
-    try:
-        p = Popen(
-            [str(gitexe), 'rev-parse', 'HEAD'],
-            stdout=PIPE, stderr=PIPE, cwd=pypyroot
-            )
-    except OSError, e:
-        maywarn(e, 'Git')
-        return default_retval
-    if p.wait() != 0:
-        maywarn(p.stderr.read(), 'Git')
-        return default_retval
-    revision_id = p.stdout.read().strip()[:12]
-    p = Popen(
-        [str(gitexe), 'describe', '--tags', '--exact-match'],
-        stdout=PIPE, stderr=PIPE, cwd=pypyroot
-        )
-    if p.wait() != 0:
-        p = Popen(
-            [str(gitexe), 'branch'], stdout=PIPE, stderr=PIPE,
-            cwd=pypyroot
-            )
-        if p.wait() != 0:
-            maywarn(p.stderr.read(), 'Git')
-            return 'PyPy', '?', revision_id
-        branch = '?'
-        for line in p.stdout.read().strip().split('\n'):
-            if line.startswith('* '):
-                branch = line[1:].strip()
-                if branch == '(no branch)':
-                    branch = '?'
-                break
-        return 'PyPy', branch, revision_id
-    return 'PyPy', p.stdout.read().strip(), revision_id
-
-
-if __name__ == '__main__':
-    print get_repo_version_info()

File rpython/tool/test/test_version.py

+import os, sys
+import py
+from rpython.tool.version import get_repo_version_info, _get_hg_archive_version
+
+def test_hg_archival_version(tmpdir):
+    def version_for(name, **kw):
+        path = tmpdir.join(name)
+        path.write('\n'.join('%s: %s' % x for x in kw.items()))
+        return _get_hg_archive_version(str(path))
+
+    assert version_for('release',
+                       tag='release-123',
+                       node='000',
+                      ) == ('RPython', 'release-123', '000')
+    assert version_for('somebranch',
+                       node='000',
+                       branch='something',
+                      ) == ('RPython', 'something', '000')
+
+
+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', '?', '?')

File rpython/tool/udir.py

 import os, sys
 import py
 
+from rpython.tool.version import get_repo_version_info
 from py.path import local 
 
 PYPY_KEEP = int(os.environ.get('PYPY_USESSION_KEEP', '3'))
     if dir is not None:
         dir = local(dir)
     if basename is None:
-        basename = ''
+        info = get_repo_version_info()
+        if info:
+            project, hgtag, hgid = info
+            basename = hgtag
+            if basename == '?':
+                basename = 'unknown' # directories with ? are not fun
+                # especially on windows
+            if isinstance(basename, unicode):
+                basename = basename.encode(sys.getdefaultencoding())
+        else:
+            basename = ''
     basename = basename.replace('/', '--')
     if not basename.startswith('-'):
         basename = '-' + basename

File rpython/tool/version.py

+import py
+import os
+from subprocess import Popen, PIPE
+import rpython
+rpythondir = os.path.dirname(os.path.abspath(rpython.__file__))
+rpythonroot = os.path.dirname(rpythondir)
+default_retval = 'RPython', '?', '?'
+
+def maywarn(err, repo_type='Mercurial'):
+    if not err:
+        return
+
+    from rpython.tool.ansi_print import ansi_log
+    log = py.log.Producer("version")
+    py.log.setconsumer("version", ansi_log)
+    log.WARNING('Errors getting %s information: %s' % (repo_type, err))
+
+def get_repo_version_info(hgexe=None):
+    '''Obtain version information by invoking the 'hg' or 'git' commands.'''
+
+    # 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(rpythonroot, '.git')):
+            return _get_git_version()
+
+    # Fallback to trying Mercurial.
+    if hgexe is None:
+        hgexe = py.path.local.sysfind('hg')
+
+    if os.path.isfile(os.path.join(rpythonroot, '.hg_archival.txt')):
+        return _get_hg_archive_version(os.path.join(rpythonroot, '.hg_archival.txt'))
+    elif not os.path.isdir(os.path.join(rpythonroot, '.hg')):
+        maywarn('Not running from a Mercurial repository!')
+        return default_retval
+    elif not hgexe:
+        maywarn('Cannot find Mercurial command!')
+        return default_retval
+    else:
+        return _get_hg_version(hgexe)
+
+
+def _get_hg_version(hgexe):
+    env = dict(os.environ)
+    # get Mercurial into scripting mode
+    env['HGPLAIN'] = '1'
+    # disable user configuration, extensions, etc.
+    env['HGRCPATH'] = os.devnull
+
+    try:
+        p = Popen([str(hgexe), 'version', '-q'],
+                  stdout=PIPE, stderr=PIPE, env=env)
+    except OSError, e:
+        maywarn(e)
+        return default_retval
+
+    if not p.stdout.read().startswith('Mercurial Distributed SCM'):
+        maywarn('command does not identify itself as Mercurial')
+        return default_retval
+
+    p = Popen([str(hgexe), 'id', '-i', rpythonroot],
+              stdout=PIPE, stderr=PIPE, env=env)
+    hgid = p.stdout.read().strip()
+    maywarn(p.stderr.read())
+    if p.wait() != 0:
+        hgid = '?'
+
+    p = Popen([str(hgexe), 'id', '-t', rpythonroot],
+              stdout=PIPE, stderr=PIPE, env=env)
+    hgtags = [t for t in p.stdout.read().strip().split() if t != 'tip']
+    maywarn(p.stderr.read())
+    if p.wait() != 0:
+        hgtags = ['?']
+
+    if hgtags:
+        return 'RPython', hgtags[0], hgid
+    else:
+        # use the branch instead
+        p = Popen([str(hgexe), 'id', '-b', rpythonroot],
+                  stdout=PIPE, stderr=PIPE, env=env)
+        hgbranch = p.stdout.read().strip()
+        maywarn(p.stderr.read())
+
+        return 'RPython', hgbranch, hgid
+
+
+def _get_hg_archive_version(path):
+    fp = open(path)
+    try:
+        data = dict(x.split(': ', 1) for x in fp.read().splitlines())
+    finally:
+        fp.close()
+    if 'tag' in data:
+        return 'RPython', data['tag'], data['node']
+    else:
+        return 'RPython', data['branch'], data['node']
+
+
+def _get_git_version():
+    #XXX: this function is a untested hack,
+    #     so the git mirror tav made will work
+    gitexe = py.path.local.sysfind('git')
+    if not gitexe:
+        return default_retval
+
+    try:
+        p = Popen(
+            [str(gitexe), 'rev-parse', 'HEAD'],
+            stdout=PIPE, stderr=PIPE, cwd=rpythonroot
+            )
+    except OSError, e:
+        maywarn(e, 'Git')
+        return default_retval
+    if p.wait() != 0:
+        maywarn(p.stderr.read(), 'Git')
+        return default_retval
+    revision_id = p.stdout.read().strip()[:12]
+    p = Popen(
+        [str(gitexe), 'describe', '--tags', '--exact-match'],
+        stdout=PIPE, stderr=PIPE, cwd=rpythonroot
+        )
+    if p.wait() != 0:
+        p = Popen(
+            [str(gitexe), 'branch'], stdout=PIPE, stderr=PIPE,
+            cwd=rpythonroot
+            )
+        if p.wait() != 0:
+            maywarn(p.stderr.read(), 'Git')
+            return 'RPython', '?', revision_id
+        branch = '?'
+        for line in p.stdout.read().strip().split('\n'):
+            if line.startswith('* '):
+                branch = line[1:].strip()
+                if branch == '(no branch)':
+                    branch = '?'
+                break
+        return 'RPython', branch, revision_id
+    return 'RPython', p.stdout.read().strip(), revision_id
+
+
+if __name__ == '__main__':
+    print get_repo_version_info()