Commits

Dan Villiom Podlaski Christiansen committed 1bdfa93

Delete applied patches.

  • Participants
  • Parent commits ce73833

Comments (0)

Files changed (3)

File hgignore.diff

-# HG changeset patch
-# User Dan Villiom Podlaski Christiansen <danchr@gmail.com>
-# Date 1291082220 -3600
-# Node ID c337b108282a4ce43804f21bb000027d31d1238c
-# Parent 06623fb276124f83c035eaf9bad2e77dc5b22def
-Add .hgignore file.
-
-diff --git a/.hgignore b/.hgignore
-new file mode 100644
---- /dev/null
-+++ b/.hgignore
-@@ -0,0 +1,53 @@
-+syntax:glob
-+*.py[co]
-+
-+testresult
-+site-packages
-+pypy/module/cpyext/src/*.o
-+pypy/bin/pypy-c
-+pypy/translator/jvm/src/pypy/*.class
-+pypy/module/_stackless/test/
-+pypy/module/cpyext/test/*.errors
-+pypy/doc/*.html
-+pypy/doc/basicblock.asc
-+pypy/doc/*.svninfo
-+pypy/translator/jvm/.project
-+pypy/translator/jvm/.classpath
-+pypy/translator/jvm/eclipse-bin
-+pypy/translator/benchmark/docutils
-+pypy/translator/benchmark/templess
-+pypy/translator/benchmark/gadfly
-+pypy/translator/benchmark/mako
-+pypy/translator/benchmark/bench-custom.benchmark_result
-+pypy/translator/benchmark/shootout_benchmarks
-+pypy/module/_stackless/
-+pypy/translator/goal/pypy-translation-snapshot
-+pypy/translator/goal/pypy-c*
-+pypy/translator/goal/*.exe
-+pypy/translator/goal/target*-c
-+pypy/_cache
-+site-packages/*.egg
-+site-packages/*.pth
-+pypy/doc/statistic/*.html
-+pypy/doc/statistic/*.eps
-+pypy/doc/statistic/*.pdf
-+pypy/translator/cli/src/pypylib.dll
-+pypy/translator/cli/src/query.exe
-+pypy/translator/cli/src/main.exe
-+lib_pypy/ctypes_config_cache/_*_cache.py
-+lib_pypy/ctypes_config_cache/_*_*_.py
-+pypy/translator/cli/query-descriptions
-+pypy/doc/discussion/*.html
-+pypy/doc/discussion/
-+include/*.h
-+include/*.inl
-+pypy/doc/config/*.html
-+pypy/doc/config/style.css
-+pypy/doc/config/
-+pypy/doc/jit/*.html
-+pypy/doc/jit/style.css
-+pypy/doc/image/lattice1.png
-+pypy/doc/image/lattice2.png
-+pypy/doc/image/lattice3.png
-+pypy/doc/image/stackless_informal.png
-+pypy/doc/image/parsing_example*.png
-sys-mercurial.diff
-hgignore.diff
 no-macports.diff
 visibility.diff
 test-kwargs.diff

File sys-mercurial.diff

-# HG changeset patch
-# Parent 0b2b2103636a54cae7ec0f2ac28f0c5aad309007
-# User Dan Villiom Podlaski Christiansen <danchr@gmail.com>
-Add sys._mercurial attribute.
-
-Based on the equivalent patch to CPython 2.7:
-<http://hg.python.org/pymigr/file/tip/build-identification/add-hg-build-id.diff>
-
-Example output:
-
-$ ./python.exe -c 'import sys; print sys.subversion; print sys._mercurial'
-('CPython', 'branches/release27-maint', '')
-('CPython', 'add-hg-build-id.diff qbase qtip tip', 'a40affe1a0c3')
-$ ./pypy-c -c 'import sys; print(sys.subversion); print(sys._mercurial)'
-('PyPy', '', '0')
-('PyPy', 'qbase qtip sys-mercurial.diff tip', '0d934b96b4d7+')
-
-The Mercurial version detection calls out to 'hg' rather than parsing
-the Mercurial dirstate directly. There are two reasons for this:
-
-1) The Mercurial dirstate is a binary file, and its format is an
-   implementation detail of Mercurial.
-2) Tags are used in the output, and the Mercurial logic for
-   determining what tags to apply is fairly complex and often extended
-   by extensions.
-
-diff --git a/pypy/module/sys/__init__.py b/pypy/module/sys/__init__.py
---- a/pypy/module/sys/__init__.py
-+++ b/pypy/module/sys/__init__.py
-@@ -59,6 +59,7 @@ class Module(MixedModule):
-         'pypy_version_info'     : 'version.get_pypy_version_info(space)',
-         'pypy_svn_url'          : 'version.get_svn_url(space)',
-         'subversion'            : 'version.get_subversion_info(space)',
-+        '_mercurial'            : 'version.get_mercurial_info(space)',
-         'hexversion'            : 'version.get_hexversion(space)',
- 
-         'displayhook'           : 'hook.displayhook', 
-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
-@@ -84,6 +84,30 @@ def get_subversion_info(space):
-                            space.wrap(svnbranch),
-                            space.wrap(str(svn_revision()))])
- 
-+def get_mercurial_info(space):
-+    '''Obtain Mercurial version information by invoking the 'hg' command.'''
-+    # TODO: support extracting from .hg_archival.txt
-+    import py
-+    from subprocess import Popen, PIPE
-+
-+    pypyroot = os.path.abspath(os.path.join(pypydir, '..'))
-+    hgexe = py.path.local.sysfind('hg')
-+
-+    if hgexe and os.path.isdir(os.path.join(pypyroot, '.hg')):
-+        env = dict(os.environ)
-+        env['HGPLAIN'] = '1'
-+        p = Popen([str(hgexe), 'id', '-i', pypyroot], stdout=PIPE, env=env)
-+        hgid = p.stdout.read().strip()
-+
-+        p = Popen([str(hgexe), 'id', '-t', pypyroot], stdout=PIPE, env=env)
-+        hgtags = p.stdout.read().strip()
-+
-+        return space.newtuple([space.wrap('PyPy'),
-+                               space.wrap(hgtags),
-+                               space.wrap(hgid)])
-+    else:
-+        return space.w_None
-+
- def tuple2hex(ver):
-     d = {'alpha':     0xA,
-          'beta':      0xB,