Commits

Antonio Cuni committed b74ab46

merge back the changes that have been made in trunk and pyjitpl5 since oo-jit was branched

svn merge svn+ssh://codespeak.net/svn/pypy/branch/pyjitpl5/pypy/translator/cli@64796 -r54016:64784

------------------------------------------------------------------------
r54017 | cfbolz | 2008-04-22 17:04:17 +0200 (Tue, 22 Apr 2008) | 2 lines
Changed paths:
A /pypy/branch/2.5-features (from /pypy/dist:54016)

make a branch for bruno's summer of code work

------------------------------------------------------------------------
r58378 | fijal | 2008-09-23 15:12:18 +0200 (Tue, 23 Sep 2008) | 2 lines
Changed paths:
A /pypy/branch/2.5-merge (from /pypy/branch/2.5-features:58377)

Create a new branch which is a copy of 2.5 for merging dist into it

------------------------------------------------------------------------
r58387 | fijal | 2008-09-23 16:57:10 +0200 (Tue, 23 Sep 2008) | 2 lines
Changed paths:
M /pypy/branch/2.5-merge/pypy/annotation/bookkeeper.py
M /pypy/branch/2.5-merge/pypy/annotation/description.py
M /pypy/branch/2.5-merge/pypy/annotation/listdef.py
M /pypy/branch/2.5-merge/pypy/annotation/model.py
M /pypy/branch/2.5-merge/pypy/annotation/test/autopath.py
M /pypy/branch/2.5-merge/pypy/annotation/test/test_annrpython.py
M /pypy/branch/2.5-merge/pypy/bin/autopath.py
M /pypy/branch/2.5-merge/pypy/bin/py.py
M /pypy/branch/2.5-merge/pypy/config/autopath.py
M /pypy/branch/2.5-merge/pypy/config/config.py
M /pypy/branch/2.5-merge/pypy/config/makerestdoc.py
M /pypy/branch/2.5-merge/pypy/config/pypyoption.py
M /pypy/branch/2.5-merge/pypy/config/test/test_config.py
M /pypy/branch/2.5-merge/pypy/config/test/test_pypyoption.py
M /pypy/branch/2.5-merge/pypy/config/translationoption.py
M /pypy/branch/2.5-merge/pypy/conftest.py
M /pypy/branch/2.5-merge/pypy/doc/_ref.txt
M /pypy/branch/2.5-merge/pypy/doc/config/autopath.py
M /pypy/branch/2.5-merge/pypy/doc/config/commandline.txt
M /pypy/branch/2.5-merge/pypy/doc/config/confrest.py
M /pypy/branch/2.5-merge/pypy/doc/config/index.txt
M /pypy/branch/2.5-merge/pypy/doc/config/objspace.allworkingmodules.txt
A /pypy/branch/2.5-merge/pypy/doc/config/objspace.lonepycfiles.txt (from /pypy/dist/pypy/doc/config/objspace.lonepycfiles.txt:58379)
D /pypy/branch/2.5-merge/pypy/doc/config/objspace.std.allopts.txt
A /pypy/branch/2.5-merge/pypy/doc/config/objspace.std.builtinshortcut.txt (from /pypy/dist/pypy/doc/config/objspace.std.builtinshortcut.txt:58379)
A /pypy/branch/2.5-merge/pypy/doc/config/objspace.std.getattributeshortcut.txt (from /pypy/dist/pypy/doc/config/objspace.std.getattributeshortcut.txt:58379)
A /pypy/branch/2.5-merge/pypy/doc/config/objspace.std.multimethods.txt (from /pypy/dist/pypy/doc/config/objspace.std.multimethods.txt:58379)
D /pypy/branch/2.5-merge/pypy/doc/config/objspace.std.oldstyle.txt
A /pypy/branch/2.5-merge/pypy/doc/config/objspace.std.optimized_comparison_op.txt (from /pypy/dist/pypy/doc/config/objspace.std.optimized_comparison_op.txt:58379)
A /pypy/branch/2.5-merge/pypy/doc/config/objspace.usemodules._lsprof.txt (from /pypy/dist/pypy/doc/config/objspace.usemodules._lsprof.txt:58379)
A /pypy/branch/2.5-merge/pypy/doc/config/objspace.usemodules.itertools.txt (from /pypy/dist/pypy/doc/config/objspace.usemodules.itertools.txt:58379)
M /pypy/branch/2.5-merge/pypy/doc/config/objspace.usepycfiles.txt
A /pypy/branch/2.5-merge/pypy/doc/config/opt.txt (from /pypy/dist/pypy/doc/config/opt.txt:58379)
D /pypy/branch/2.5-merge/pypy/doc/config/translation.backendopt.coalloc.txt
M /pypy/branch/2.5-merge/pypy/doc/config/translation.llvm.opt_options.txt
A /pypy/branch/2.5-merge/pypy/doc/cpython_differences.txt (from /pypy/dist/pypy/doc/cpython_differences.txt:58379)
D /pypy/branch/2.5-merge/pypy/doc/discussion/build-tool-web-frontend.txt
M /pypy/branch/2.5-merge/pypy/doc/discussion/paper-wishlist.txt
D /pypy/branch/2.5-merge/pypy/doc/discussion/standalone-howto.txt
A /pypy/branch/2.5-merge/pypy/doc/discussion/testing-zope.txt (from /pypy/dist/pypy/doc/discussion/testing-zope.txt:58379)
M /pypy/branch/2.5-merge/pypy/doc/download.txt
M /pypy/branch/2.5-merge/pypy/doc/extradoc.txt
M /pypy/branch/2.5-merge/pypy/doc/faq.txt
M /pypy/branch/2.5-merge/pypy/doc/garbage_collection.txt
M /pypy/branch/2.5-merge/pypy/doc/getting-started.txt
M /pypy/branch/2.5-merge/pypy/doc/home.txt
M /pypy/branch/2.5-merge/pypy/doc/index.txt
M /pypy/branch/2.5-merge/pypy/doc/interpreter-optimizations.txt
M /pypy/branch/2.5-merge/pypy/doc/jit/_ref.txt
M /pypy/branch/2.5-merge/pypy/doc/jit/index.txt
M /pypy/branch/2.5-merge/pypy/doc/jit/overview.txt
A /pypy/branch/2.5-merge/pypy/doc/maemo.txt (from /pypy/dist/pypy/doc/maemo.txt:58379)
M /pypy/branch/2.5-merge/pypy/doc/objspace.txt
M /pypy/branch/2.5-merge/pypy/doc/redirections
M /pypy/branch/2.5-merge/pypy/doc/rffi.txt
M /pypy/branch/2.5-merge/pypy/doc/tool/makeref.py
M /pypy/branch/2.5-merge/pypy/doc/translation.txt
M /pypy/branch/2.5-merge/pypy/interpreter/argument.py
M /pypy/branch/2.5-merge/pypy/interpreter/astcompiler/ast.py
M /pypy/branch/2.5-merge/pypy/interpreter/astcompiler/misc.py
M /pypy/branch/2.5-merge/pypy/interpreter/astcompiler/opt.py
M /pypy/branch/2.5-merge/pypy/interpreter/astcompiler/pyassem.py
M /pypy/branch/2.5-merge/pypy/interpreter/astcompiler/pycodegen.py
M /pypy/branch/2.5-merge/pypy/interpreter/astcompiler/test/test_ast.py
M /pypy/branch/2.5-merge/pypy/interpreter/baseobjspace.py
A /pypy/branch/2.5-merge/pypy/interpreter/callbench (from /pypy/dist/pypy/interpreter/callbench:58379)
R /pypy/branch/2.5-merge/pypy/interpreter/callbench/bltn04.py (from /pypy/dist/pypy/interpreter/callbench/bltn04.py:58379)
R /pypy/branch/2.5-merge/pypy/interpreter/callbench/bltn_instantiate.py (from /pypy/dist/pypy/interpreter/callbench/bltn_instantiate.py:58379)
R /pypy/branch/2.5-merge/pypy/interpreter/callbench/bltna1.py (from /pypy/dist/pypy/interpreter/callbench/bltna1.py:58379)
R /pypy/branch/2.5-merge/pypy/interpreter/callbench/bltna2.py (from /pypy/dist/pypy/interpreter/callbench/bltna2.py:58379)
R /pypy/branch/2.5-merge/pypy/interpreter/callbench/bm14.py (from /pypy/dist/pypy/interpreter/callbench/bm14.py:58379)
R /pypy/branch/2.5-merge/pypy/interpreter/callbench/bmabvararg.py (from /pypy/dist/pypy/interpreter/callbench/bmabvararg.py:58379)
R /pypy/branch/2.5-merge/pypy/interpreter/callbench/bmfilter.py (from /pypy/dist/pypy/interpreter/callbench/bmfilter.py:58379)
R /pypy/branch/2.5-merge/pypy/interpreter/callbench/bmmore.py (from /pypy/dist/pypy/interpreter/callbench/bmmore.py:58379)
R /pypy/branch/2.5-merge/pypy/interpreter/callbench/compare.py (from /pypy/dist/pypy/interpreter/callbench/compare.py:58379)
R /pypy/branch/2.5-merge/pypy/interpreter/callbench/f04.py (from /pypy/dist/pypy/interpreter/callbench/f04.py:58379)
R /pypy/branch/2.5-merge/pypy/interpreter/callbench/fabvararg.py (from /pypy/dist/pypy/interpreter/callbench/fabvararg.py:58379)
R /pypy/branch/2.5-merge/pypy/interpreter/callbench/ffilter.py (from /pypy/dist/pypy/interpreter/callbench/ffilter.py:58379)
R /pypy/branch/2.5-merge/pypy/interpreter/callbench/ffunccall.py (from /pypy/dist/pypy/interpreter/callbench/ffunccall.py:58379)
R /pypy/branch/2.5-merge/pypy/interpreter/callbench/fmore.py (from /pypy/dist/pypy/interpreter/callbench/fmore.py:58379)
R /pypy/branch/2.5-merge/pypy/interpreter/callbench/inst.py (from /pypy/dist/pypy/interpreter/callbench/inst.py:58379)
R /pypy/branch/2.5-merge/pypy/interpreter/callbench/inst_no_init.py (from /pypy/dist/pypy/interpreter/callbench/inst_no_init.py:58379)
R /pypy/branch/2.5-merge/pypy/interpreter/callbench/instcall.py (from /pypy/dist/pypy/interpreter/callbench/instcall.py:58379)
R /pypy/branch/2.5-merge/pypy/interpreter/callbench/sup.py (from /pypy/dist/pypy/interpreter/callbench/sup.py:58379)
M /pypy/branch/2.5-merge/pypy/interpreter/error.py
M /pypy/branch/2.5-merge/pypy/interpreter/eval.py
M /pypy/branch/2.5-merge/pypy/interpreter/executioncontext.py
M /pypy/branch/2.5-merge/pypy/interpreter/function.py
M /pypy/branch/2.5-merge/pypy/interpreter/gateway.py
M /pypy/branch/2.5-merge/pypy/interpreter/interactive.py
M /pypy/branch/2.5-merge/pypy/interpreter/miscutils.py
M /pypy/branch/2.5-merge/pypy/interpreter/mixedmodule.py
M /pypy/branch/2.5-merge/pypy/interpreter/module.py
M /pypy/branch/2.5-merge/pypy/interpreter/nestedscope.py
M /pypy/branch/2.5-merge/pypy/interpreter/pycode.py
M /pypy/branch/2.5-merge/pypy/interpreter/pycompiler.py
M /pypy/branch/2.5-merge/pypy/interpreter/pyframe.py
M /pypy/branch/2.5-merge/pypy/interpreter/pyopcode.py
M /pypy/branch/2.5-merge/pypy/interpreter/pyparser/astbuilder.py
M /pypy/branch/2.5-merge/pypy/interpreter/pyparser/asthelper.py
M /pypy/branch/2.5-merge/pypy/interpreter/pyparser/ebnfparse.py
M /pypy/branch/2.5-merge/pypy/interpreter/pyparser/grammar.py
M /pypy/branch/2.5-merge/pypy/interpreter/pyparser/pythonutil.py
A /pypy/branch/2.5-merge/pypy/interpreter/pyparser/test/samples/snippet_decorators_2.py (from /pypy/dist/pypy/interpreter/pyparser/test/samples/snippet_decorators_2.py:58379)
M /pypy/branch/2.5-merge/pypy/interpreter/pyparser/test/test_astbuilder.py
M /pypy/branch/2.5-merge/pypy/interpreter/pyparser/test/test_lookahead.py
M /pypy/branch/2.5-merge/pypy/interpreter/pyparser/test/test_pytokenizer.py
M /pypy/branch/2.5-merge/pypy/interpreter/pyparser/test/test_samples.py
M /pypy/branch/2.5-merge/pypy/interpreter/pyparser/tuplebuilder.py
A /pypy/branch/2.5-merge/pypy/interpreter/test/demomixedmod (from /pypy/dist/pypy/interpreter/test/demomixedmod:58379)
R /pypy/branch/2.5-merge/pypy/interpreter/test/demomixedmod/__init__.py (from /pypy/dist/pypy/interpreter/test/demomixedmod/__init__.py:58379)
R /pypy/branch/2.5-merge/pypy/interpreter/test/demomixedmod/file1.py (from /pypy/dist/pypy/interpreter/test/demomixedmod/file1.py:58379)
R /pypy/branch/2.5-merge/pypy/interpreter/test/demomixedmod/file2_app.py (from /pypy/dist/pypy/interpreter/test/demomixedmod/file2_app.py:58379)
D /pypy/branch/2.5-merge/pypy/interpreter/test/mixedmodule
M /pypy/branch/2.5-merge/pypy/interpreter/test/test_appinterp.py
M /pypy/branch/2.5-merge/pypy/interpreter/test/test_class.py
M /pypy/branch/2.5-merge/pypy/interpreter/test/test_code.py
M /pypy/branch/2.5-merge/pypy/interpreter/test/test_compiler.py
M /pypy/branch/2.5-merge/pypy/interpreter/test/test_exec.py
M /pypy/branch/2.5-merge/pypy/interpreter/test/test_executioncontext.py
M /pypy/branch/2.5-merge/pypy/interpreter/test/test_function.py
M /pypy/branch/2.5-merge/pypy/interpreter/test/test_gateway.py
M /pypy/branch/2.5-merge/pypy/interpreter/test/test_interpreter.py
M /pypy/branch/2.5-merge/pypy/interpreter/test/test_module.py
M /pypy/branch/2.5-merge/pypy/interpreter/test/test_objspace.py
M /pypy/branch/2.5-merge/pypy/interpreter/test/test_pyframe.py
M /pypy/branch/2.5-merge/pypy/interpreter/test/test_raise.py
M /pypy/branch/2.5-merge/pypy/interpreter/test/test_typedef.py
M /pypy/branch/2.5-merge/pypy/interpreter/typedef.py
D /pypy/branch/2.5-merge/pypy/jit
A /pypy/branch/2.5-merge/pypy/lang/gameboy (from /pypy/dist/pypy/lang/gameboy:58379)
R /pypy/branch/2.5-merge/pypy/lang/gameboy/__init__.py (from /pypy/dist/pypy/lang/gameboy/__init__.py:58379)
R /pypy/branch/2.5-merge/pypy/lang/gameboy/cartridge.py (from /pypy/dist/pypy/lang/gameboy/cartridge.py:58379)
R /pypy/branch/2.5-merge/pypy/lang/gameboy/constants.py (from /pypy/dist/pypy/lang/gameboy/constants.py:58379)
R /pypy/branch/2.5-merge/pypy/lang/gameboy/cpu.py (from /pypy/dist/pypy/lang/gameboy/cpu.py:58379)
R /pypy/branch/2.5-merge/pypy/lang/gameboy/debug (from /pypy/dist/pypy/lang/gameboy/debug:58379)
R /pypy/branch/2.5-merge/pypy/lang/gameboy/debug/__init__.py (from /pypy/dist/pypy/lang/gameboy/debug/__init__.py:58379)
R /pypy/branch/2.5-merge/pypy/lang/gameboy/debug/debug.py (from /pypy/dist/pypy/lang/gameboy/debug/debug.py:58379)
R /pypy/branch/2.5-merge/pypy/lang/gameboy/debug/debug_cpu.py (from /pypy/dist/pypy/lang/gameboy/debug/debug_cpu.py:58379)
R /pypy/branch/2.5-merge/pypy/lang/gameboy/debug/debug_rpc_xml_memory.py (from /pypy/dist/pypy/lang/gameboy/debug/debug_rpc_xml_memory.py:58379)
R /pypy/branch/2.5-merge/pypy/lang/gameboy/debug/debug_socket_memory.py (from /pypy/dist/pypy/lang/gameboy/debug/debug_socket_memory.py:58379)
R /pypy/branch/2.5-merge/pypy/lang/gameboy/debug/gameboy_debug_entry_point.py (from /pypy/dist/pypy/lang/gameboy/debug/gameboy_debug_entry_point.py:58379)
R /pypy/branch/2.5-merge/pypy/lang/gameboy/debug/gameboy_debug_implementation.py (from /pypy/dist/pypy/lang/gameboy/debug/gameboy_debug_implementation.py:58379)
R /pypy/branch/2.5-merge/pypy/lang/gameboy/gameboy.py (from /pypy/dist/pypy/lang/gameboy/gameboy.py:58379)
R /pypy/branch/2.5-merge/pypy/lang/gameboy/gameboy_implementation.py (from /pypy/dist/pypy/lang/gameboy/gameboy_implementation.py:58379)
R /pypy/branch/2.5-merge/pypy/lang/gameboy/interrupt.py (from /pypy/dist/pypy/lang/gameboy/interrupt.py:58379)
R /pypy/branch/2.5-merge/pypy/lang/gameboy/joypad.py (from /pypy/dist/pypy/lang/gameboy/joypad.py:58379)
R /pypy/branch/2.5-merge/pypy/lang/gameboy/profiling (from /pypy/dist/pypy/lang/gameboy/profiling:58379)
R /pypy/branch/2.5-merge/pypy/lang/gameboy/profiling/__init__.py (from /pypy/dist/pypy/lang/gameboy/profiling/__init__.py:58379)
R /pypy/branch/2.5-merge/pypy/lang/gameboy/profiling/evaluation (from /pypy/dist/pypy/lang/gameboy/profiling/evaluation:58379)
R /pypy/branch/2.5-merge/pypy/lang/gameboy/profiling/evaluation/__init__.py (from /pypy/dist/pypy/lang/gameboy/profiling/evaluation/__init__.py:58379)
R /pypy/branch/2.5-merge/pypy/lang/gameboy/profiling/evaluation/evaluation_cpu.py (from /pypy/dist/pypy/lang/gameboy/profiling/evaluation/evaluation_cpu.py:58379)
R /pypy/branch/2.5-merge/pypy/lang/gameboy/profiling/evaluation/evaluation_test_parser.py (from /pypy/dist/pypy/lang/gameboy/profiling/evaluation/evaluation_test_parser.py:58379)
R /pypy/branch/2.5-merge/pypy/lang/gameboy/profiling/evaluation/gameboy_evaluation_implementation.py (from /pypy/dist/pypy/lang/gameboy/profiling/evaluation/gameboy_evaluation_implementation.py:58379)
R /pypy/branch/2.5-merge/pypy/lang/gameboy/profiling/evaluation/gameboy_evaluation_target.py (from /pypy/dist/pypy/lang/gameboy/profiling/evaluation/gameboy_evaluation_target.py:58379)
R /pypy/branch/2.5-merge/pypy/lang/gameboy/profiling/evaluation/logs (from /pypy/dist/pypy/lang/gameboy/profiling/evaluation/logs:58379)
R /pypy/branch/2.5-merge/pypy/lang/gameboy/profiling/evaluation/run.sh (from /pypy/dist/pypy/lang/gameboy/profiling/evaluation/run.sh:58379)
R /pypy/branch/2.5-merge/pypy/lang/gameboy/profiling/gameboyTest.py (from /pypy/dist/pypy/lang/gameboy/profiling/gameboyTest.py:58379)
R /pypy/branch/2.5-merge/pypy/lang/gameboy/profiling/gameboy_profiling_implementation.py (from /pypy/dist/pypy/lang/gameboy/profiling/gameboy_profiling_implementation.py:58379)
R /pypy/branch/2.5-merge/pypy/lang/gameboy/profiling/profiling_cpu.py (from /pypy/dist/pypy/lang/gameboy/profiling/profiling_cpu.py:58379)
R /pypy/branch/2.5-merge/pypy/lang/gameboy/ram.py (from /pypy/dist/pypy/lang/gameboy/ram.py:58379)
R /pypy/branch/2.5-merge/pypy/lang/gameboy/rom (from /pypy/dist/pypy/lang/gameboy/rom:58379)
R /pypy/branch/2.5-merge/pypy/lang/gameboy/rom/rom1 (from /pypy/dist/pypy/lang/gameboy/rom/rom1:58379)
R /pypy/branch/2.5-merge/pypy/lang/gameboy/rom/rom1/readme.txt (from /pypy/dist/pypy/lang/gameboy/rom/rom1/readme.txt:58379)
R /pypy/branch/2.5-merge/pypy/lang/gameboy/rom/rom1/rom1.raw (from /pypy/dist/pypy/lang/gameboy/rom/rom1/rom1.raw:58379)
R /pypy/branch/2.5-merge/pypy/lang/gameboy/rom/rom2 (from /pypy/dist/pypy/lang/gameboy/rom/rom2:58379)
R /pypy/branch/2.5-merge/pypy/lang/gameboy/rom/rom2/make.bat (from /pypy/dist/pypy/lang/gameboy/rom/rom2/make.bat:58379)
R /pypy/branch/2.5-merge/pypy/lang/gameboy/rom/rom2/readme-1.txt (from /pypy/dist/pypy/lang/gameboy/rom/rom2/readme-1.txt:58379)
R /pypy/branch/2.5-merge/pypy/lang/gameboy/rom/rom2/rom2.raw (from /pypy/dist/pypy/lang/gameboy/rom/rom2/rom2.raw:58379)
R /pypy/branch/2.5-merge/pypy/lang/gameboy/rom/rom3 (from /pypy/dist/pypy/lang/gameboy/rom/rom3:58379)
R /pypy/branch/2.5-merge/pypy/lang/gameboy/rom/rom3/make-1.bat (from /pypy/dist/pypy/lang/gameboy/rom/rom3/make-1.bat:58379)
R /pypy/branch/2.5-merge/pypy/lang/gameboy/rom/rom3/readme-2.txt (from /pypy/dist/pypy/lang/gameboy/rom/rom3/readme-2.txt:58379)
R /pypy/branch/2.5-merge/pypy/lang/gameboy/rom/rom3/rom3.asm (from /pypy/dist/pypy/lang/gameboy/rom/rom3/rom3.asm:58379)
R /pypy/branch/2.5-merge/pypy/lang/gameboy/rom/rom3/rom3.gb (from /pypy/dist/pypy/lang/gameboy/rom/rom3/rom3.gb:58379)
R /pypy/branch/2.5-merge/pypy/lang/gameboy/rom/rom4 (from /pypy/dist/pypy/lang/gameboy/rom/rom4:58379)
R /pypy/branch/2.5-merge/pypy/lang/gameboy/rom/rom4/readme-3.txt (from /pypy/dist/pypy/lang/gameboy/rom/rom4/readme-3.txt:58379)
R /pypy/branch/2.5-merge/pypy/lang/gameboy/rom/rom4/rom4.asm (from /pypy/dist/pypy/lang/gameboy/rom/rom4/rom4.asm:58379)
R /pypy/branch/2.5-merge/pypy/lang/gameboy/rom/rom4/rom4.gb (from /pypy/dist/pypy/lang/gameboy/rom/rom4/rom4.gb:58379)
R /pypy/branch/2.5-merge/pypy/lang/gameboy/rom/rom4/rom41.gb (from /pypy/dist/pypy/lang/gameboy/rom/rom4/rom41.gb:58379)
R /pypy/branch/2.5-merge/pypy/lang/gameboy/rom/rom4/rom42.gb (from /pypy/dist/pypy/lang/gameboy/rom/rom4/rom42.gb:58379)
R /pypy/branch/2.5-merge/pypy/lang/gameboy/rom/rom5 (from /pypy/dist/pypy/lang/gameboy/rom/rom5:58379)
R /pypy/branch/2.5-merge/pypy/lang/gameboy/rom/rom5/make-2.bat (from /pypy/dist/pypy/lang/gameboy/rom/rom5/make-2.bat:58379)
R /pypy/branch/2.5-merge/pypy/lang/gameboy/rom/rom5/readme.txt (from /pypy/dist/pypy/lang/gameboy/rom/rom5/readme.txt:58379)
R /pypy/branch/2.5-merge/pypy/lang/gameboy/rom/rom5/rom5.asm (from /pypy/dist/pypy/lang/gameboy/rom/rom5/rom5.asm:58379)
R /pypy/branch/2.5-merge/pypy/lang/gameboy/rom/rom5/rom5.gb (from /pypy/dist/pypy/lang/gameboy/rom/rom5/rom5.gb:58379)
R /pypy/branch/2.5-merge/pypy/lang/gameboy/rom/rom6 (from /pypy/dist/pypy/lang/gameboy/rom/rom6:58379)
R /pypy/branch/2.5-merge/pypy/lang/gameboy/rom/rom6/make.bat (from /pypy/dist/pypy/lang/gameboy/rom/rom6/make.bat:58379)
R /pypy/branch/2.5-merge/pypy/lang/gameboy/rom/rom6/readme-1.txt (from /pypy/dist/pypy/lang/gameboy/rom/rom6/readme-1.txt:58379)
R /pypy/branch/2.5-merge/pypy/lang/gameboy/rom/rom6/rom6.asm (from /pypy/dist/pypy/lang/gameboy/rom/rom6/rom6.asm:58379)
R /pypy/branch/2.5-merge/pypy/lang/gameboy/rom/rom6/rom6.gb (from /pypy/dist/pypy/lang/gameboy/rom/rom6/rom6.gb:58379)
R /pypy/branch/2.5-merge/pypy/lang/gameboy/rom/rom7 (from /pypy/dist/pypy/lang/gameboy/rom/rom7:58379)
R /pypy/branch/2.5-merge/pypy/lang/gameboy/rom/rom7/make.bat (from /pypy/dist/pypy/lang/gameboy/rom/rom7/make.bat:58379)
R /pypy/branch/2.5-merge/pypy/lang/gameboy/rom/rom7/readme.txt (from /pypy/dist/pypy/lang/gameboy/rom/rom7/readme.txt:58379)
R /pypy/branch/2.5-merge/pypy/lang/gameboy/rom/rom7/rom7.asm (from /pypy/dist/pypy/lang/gameboy/rom/rom7/rom7.asm:58379)
R /pypy/branch/2.5-merge/pypy/lang/gameboy/rom/rom7/rom7.gb (from /pypy/dist/pypy/lang/gameboy/rom/rom7/rom7.gb:58379)
R /pypy/branch/2.5-merge/pypy/lang/gameboy/rom/rom8 (from /pypy/dist/pypy/lang/gameboy/rom/rom8:58379)
R /pypy/branch/2.5-merge/pypy/lang/gameboy/rom/rom8/make.bat (from /pypy/dist/pypy/lang/gameboy/rom/rom8/make.bat:58379)
R /pypy/branch/2.5-merge/pypy/lang/gameboy/rom/rom8/readme.txt (from /pypy/dist/pypy/lang/gameboy/rom/rom8/readme.txt:58379)
R /pypy/branch/2.5-merge/pypy/lang/gameboy/rom/rom8/rom8.asm (from /pypy/dist/pypy/lang/gameboy/rom/rom8/rom8.asm:58379)
R /pypy/branch/2.5-merge/pypy/lang/gameboy/rom/rom8/rom8.gb (from /pypy/dist/pypy/lang/gameboy/rom/rom8/rom8.gb:58379)
R /pypy/branch/2.5-merge/pypy/lang/gameboy/rom/rom9 (from /pypy/dist/pypy/lang/gameboy/rom/rom9:58379)
R /pypy/branch/2.5-merge/pypy/lang/gameboy/rom/rom9/make.bat (from /pypy/dist/pypy/lang/gameboy/rom/rom9/make.bat:58379)
R /pypy/branch/2.5-merge/pypy/lang/gameboy/rom/rom9/readme.txt (from /pypy/dist/pypy/lang/gameboy/rom/rom9/readme.txt:58379)
R /pypy/branch/2.5-merge/pypy/lang/gameboy/rom/rom9/rom9.asm (from /pypy/dist/pypy/lang/gameboy/rom/rom9/rom9.asm:58379)
R /pypy/branch/2.5-merge/pypy/lang/gameboy/rom/rom9/rom9.gb (from /pypy/dist/pypy/lang/gameboy/rom/rom9/rom9.gb:58379)
R /pypy/branch/2.5-merge/pypy/lang/gameboy/serial.py (from /pypy/dist/pypy/lang/gameboy/serial.py:58379)
R /pypy/branch/2.5-merge/pypy/lang/gameboy/sound.py (from /pypy/dist/pypy/lang/gameboy/sound.py:58379)
R /pypy/branch/2.5-merge/pypy/lang/gameboy/test (from /pypy/dist/pypy/lang/gameboy/test:58379)
R /pypy/branch/2.5-merge/pypy/lang/gameboy/test/__init__.py (from /pypy/dist/pypy/lang/gameboy/test/__init__.py:58379)
R /pypy/branch/2.5-merge/pypy/lang/gameboy/test/test_cartridge.py (from /pypy/dist/pypy/lang/gameboy/test/test_cartridge.py:58379)
R /pypy/branch/2.5-merge/pypy/lang/gameboy/test/test_cpu.py (from /pypy/dist/pypy/lang/gameboy/test/test_cpu.py:58379)
R /pypy/branch/2.5-merge/pypy/lang/gameboy/test/test_cpu_2.py (from /pypy/dist/pypy/lang/gameboy/test/test_cpu_2.py:58379)
R /pypy/branch/2.5-merge/pypy/lang/gameboy/test/test_gameboy.py (from /pypy/dist/pypy/lang/gameboy/test/test_gameboy.py:58379)
R /pypy/branch/2.5-merge/pypy/lang/gameboy/test/test_gameboy_implementaton.py (from /pypy/dist/pypy/lang/gameboy/test/test_gameboy_implementaton.py:58379)
R /pypy/branch/2.5-merge/pypy/lang/gameboy/test/test_interrupt.py (from /pypy/dist/pypy/lang/gameboy/test/test_interrupt.py:58379)
R /pypy/branch/2.5-merge/pypy/lang/gameboy/test/test_joypad.py (from /pypy/dist/pypy/lang/gameboy/test/test_joypad.py:58379)
R /pypy/branch/2.5-merge/pypy/lang/gameboy/test/test_memory_bank_controller.py (from /pypy/dist/pypy/lang/gameboy/test/test_memory_bank_controller.py:58379)
R /pypy/branch/2.5-merge/pypy/lang/gameboy/test/test_ram.py (from /pypy/dist/pypy/lang/gameboy/test/test_ram.py:58379)
R /pypy/branch/2.5-merge/pypy/lang/gameboy/test/test_register.py (from /pypy/dist/pypy/lang/gameboy/test/test_register.py:58379)
R /pypy/branch/2.5-merge/pypy/lang/gameboy/test/test_rom.py (from /pypy/dist/pypy/lang/gameboy/test/test_rom.py:58379)
R /pypy/branch/2.5-merge/pypy/lang/gameboy/test/test_serial.py (from /pypy/dist/pypy/lang/gameboy/test/test_serial.py:58379)
R /pypy/branch/2.5-merge/pypy/lang/gameboy/test/test_sound.py (from /pypy/dist/pypy/lang/gameboy/test/test_sound.py:58379)
R /pypy/branch/2.5-merge/pypy/lang/gameboy/test/test_timer.py (from /pypy/dist/pypy/lang/gameboy/test/test_timer.py:58379)
R /pypy/branch/2.5-merge/pypy/lang/gameboy/test/test_video.py (from /pypy/dist/pypy/lang/gameboy/test/test_video.py:58379)
R /pypy/branch/2.5-merge/pypy/lang/gameboy/test/test_video_registers.py (from /pypy/dist/pypy/lang/gameboy/test/test_video_registers.py:58379)
R /pypy/branch/2.5-merge/pypy/lang/gameboy/test/test_video_sprite.py (from /pypy/dist/pypy/lang/gameboy/test/test_video_sprite.py:58379)
R /pypy/branch/2.5-merge/pypy/lang/gameboy/timer.py (from /pypy/dist/pypy/lang/gameboy/timer.py:58379)
R /pypy/branch/2.5-merge/pypy/lang/gameboy/tool (from /pypy/dist/pypy/lang/gameboy/tool:58379)
R /pypy/branch/2.5-merge/pypy/lang/gameboy/tool/__init__.py (from /pypy/dist/pypy/lang/gameboy/tool/__init__.py:58379)
R /pypy/branch/2.5-merge/pypy/lang/gameboy/tool/autopath.py (from /pypy/dist/pypy/lang/gameboy/tool/autopath.py:58379)
R /pypy/branch/2.5-merge/pypy/lang/gameboy/video.py (from /pypy/dist/pypy/lang/gameboy/video.py:58379)
M /pypy/branch/2.5-merge/pypy/lang/js/autopath.py
A /pypy/branch/2.5-merge/pypy/lang/malbolge (from /pypy/dist/pypy/lang/malbolge:58379)
R /pypy/branch/2.5-merge/pypy/lang/malbolge/examples (from /pypy/dist/pypy/lang/malbolge/examples:58379)
R /pypy/branch/2.5-merge/pypy/lang/malbolge/examples/99bottles.mbs (from /pypy/dist/pypy/lang/malbolge/examples/99bottles.mbs:58379)
R /pypy/branch/2.5-merge/pypy/lang/malbolge/examples/copy.mbs (from /pypy/dist/pypy/lang/malbolge/examples/copy.mbs:58379)
R /pypy/branch/2.5-merge/pypy/lang/malbolge/examples/hello-world.mb (from /pypy/dist/pypy/lang/malbolge/examples/hello-world.mb:58379)
R /pypy/branch/2.5-merge/pypy/lang/malbolge/examples/hello-world.mbs (from /pypy/dist/pypy/lang/malbolge/examples/hello-world.mbs:58379)
R /pypy/branch/2.5-merge/pypy/lang/malbolge/malbolge.py (from /pypy/dist/pypy/lang/malbolge/malbolge.py:58379)
M /pypy/branch/2.5-merge/pypy/lang/prolog/interpreter/autopath.py
M /pypy/branch/2.5-merge/pypy/lang/prolog/interpreter/test/test_jit.py
M /pypy/branch/2.5-merge/pypy/lang/scheme/autopath.py
D /pypy/branch/2.5-merge/pypy/lang/smalltalk/classtable.py
M /pypy/branch/2.5-merge/pypy/lang/smalltalk/constants.py
M /pypy/branch/2.5-merge/pypy/lang/smalltalk/error.py
M /pypy/branch/2.5-merge/pypy/lang/smalltalk/interpreter.py
M /pypy/branch/2.5-merge/pypy/lang/smalltalk/model.py
A /pypy/branch/2.5-merge/pypy/lang/smalltalk/objspace.py (from /pypy/dist/pypy/lang/smalltalk/objspace.py:58379)
D /pypy/branch/2.5-merge/pypy/lang/smalltalk/objtable.py
M /pypy/branch/2.5-merge/pypy/lang/smalltalk/primitives.py
A /pypy/branch/2.5-merge/pypy/lang/smalltalk/running-something-mini.image (from /pypy/dist/pypy/lang/smalltalk/running-something-mini.image:58379)
M /pypy/branch/2.5-merge/pypy/lang/smalltalk/shadow.py
M /pypy/branch/2.5-merge/pypy/lang/smalltalk/squeakimage.py
D /pypy/branch/2.5-merge/pypy/lang/smalltalk/test/test_classtable.py
M /pypy/branch/2.5-merge/pypy/lang/smalltalk/test/test_interpreter.py
M /pypy/branch/2.5-merge/pypy/lang/smalltalk/test/test_miniimage.py
M /pypy/branch/2.5-merge/pypy/lang/smalltalk/test/test_model.py
A /pypy/branch/2.5-merge/pypy/lang/smalltalk/test/test_objectspace.py (from /pypy/dist/pypy/lang/smalltalk/test/test_objectspace.py:58379)
M /pypy/branch/2.5-merge/pypy/lang/smalltalk/test/test_primitives.py
M /pypy/branch/2.5-merge/pypy/lang/smalltalk/test/test_shadow.py
M /pypy/branch/2.5-merge/pypy/lang/smalltalk/test/test_squeakimage.py
A /pypy/branch/2.5-merge/pypy/lang/smalltalk/test/test_wrapper.py (from /pypy/dist/pypy/lang/smalltalk/test/test_wrapper.py:58379)
A /pypy/branch/2.5-merge/pypy/lang/smalltalk/todo.txt (from /pypy/dist/pypy/lang/smalltalk/todo.txt:58379)
M /pypy/branch/2.5-merge/pypy/lang/smalltalk/tool/analyseimage.py
M /pypy/branch/2.5-merge/pypy/lang/smalltalk/tool/autopath.py
A /pypy/branch/2.5-merge/pypy/lang/smalltalk/tool/infostats.py (from /pypy/dist/pypy/lang/smalltalk/tool/infostats.py:58379)
A /pypy/branch/2.5-merge/pypy/lang/smalltalk/tool/profile.sh (from /pypy/dist/pypy/lang/smalltalk/tool/profile.sh:58379)
D /pypy/branch/2.5-merge/pypy/lang/smalltalk/utility.py
A /pypy/branch/2.5-merge/pypy/lang/smalltalk/wrapper.py (from /pypy/dist/pypy/lang/smalltalk/wrapper.py:58379)
M /pypy/branch/2.5-merge/pypy/lib
M /pypy/branch/2.5-merge/pypy/lib/_ctypes/__init__.py
M /pypy/branch/2.5-merge/pypy/lib/_ctypes/array.py
M /pypy/branch/2.5-merge/pypy/lib/_ctypes/basics.py
M /pypy/branch/2.5-merge/pypy/lib/_ctypes/builtin.py
M /pypy/branch/2.5-merge/pypy/lib/_ctypes/dll.py
M /pypy/branch/2.5-merge/pypy/lib/_ctypes/function.py
M /pypy/branch/2.5-merge/pypy/lib/_ctypes/pointer.py
M /pypy/branch/2.5-merge/pypy/lib/_ctypes/primitive.py
D /pypy/branch/2.5-merge/pypy/lib/_fakecompiler
A /pypy/branch/2.5-merge/pypy/lib/_hashlib.py (from /pypy/dist/pypy/lib/_hashlib.py:58379)
M /pypy/branch/2.5-merge/pypy/lib/_locale.py
M /pypy/branch/2.5-merge/pypy/lib/_pypy_interact.py
A /pypy/branch/2.5-merge/pypy/lib/_pypy_irc_topic.py (from /pypy/dist/pypy/lib/_pypy_irc_topic.py:58379)
M /pypy/branch/2.5-merge/pypy/lib/_sre.py
A /pypy/branch/2.5-merge/pypy/lib/_subprocess.py (from /pypy/dist/pypy/lib/_subprocess.py:58379)
M /pypy/branch/2.5-merge/pypy/lib/app_test/ctypes_tests/_ctypes_test.c
M /pypy/branch/2.5-merge/pypy/lib/app_test/ctypes_tests/test_callback_traceback.py
M /pypy/branch/2.5-merge/pypy/lib/app_test/ctypes_tests/test_callbacks.py
M /pypy/branch/2.5-merge/pypy/lib/app_test/ctypes_tests/test_extra.py
M /pypy/branch/2.5-merge/pypy/lib/app_test/ctypes_tests/test_guess_argtypes.py
M /pypy/branch/2.5-merge/pypy/lib/app_test/test_ctypes_support.py
A /pypy/branch/2.5-merge/pypy/lib/app_test/test_datetime.py (from /pypy/dist/pypy/lib/app_test/test_datetime.py:58379)
A /pypy/branch/2.5-merge/pypy/lib/app_test/test_functools.py (from /pypy/dist/pypy/lib/app_test/test_functools.py:58379)
M /pypy/branch/2.5-merge/pypy/lib/app_test/test_imp_extra.py
A /pypy/branch/2.5-merge/pypy/lib/app_test/test_locale.py (from /pypy/dist/pypy/lib/app_test/test_locale.py:58379)
A /pypy/branch/2.5-merge/pypy/lib/app_test/test_pyexpat.py (from /pypy/dist/pypy/lib/app_test/test_pyexpat.py:58379)
M /pypy/branch/2.5-merge/pypy/lib/app_test/test_stackless.py
M /pypy/branch/2.5-merge/pypy/lib/cStringIO.py
M /pypy/branch/2.5-merge/pypy/lib/ctypes/__init__.py
M /pypy/branch/2.5-merge/pypy/lib/datetime.py
A /pypy/branch/2.5-merge/pypy/lib/dbm.py (from /pypy/dist/pypy/lib/dbm.py:58379)
M /pypy/branch/2.5-merge/pypy/lib/distributed/test/test_distributed.py
M /pypy/branch/2.5-merge/pypy/lib/distributed/test/test_socklayer.py
A /pypy/branch/2.5-merge/pypy/lib/functools.py (from /pypy/dist/pypy/lib/functools.py:58379)
A /pypy/branch/2.5-merge/pypy/lib/hashlib.py (from /pypy/dist/pypy/lib/hashlib.py:58379)
M /pypy/branch/2.5-merge/pypy/lib/imp.py
M /pypy/branch/2.5-merge/pypy/lib/itertools.py
M /pypy/branch/2.5-merge/pypy/lib/marshal.py
M /pypy/branch/2.5-merge/pypy/lib/md5.py
A /pypy/branch/2.5-merge/pypy/lib/msvcrt.py (from /pypy/dist/pypy/lib/msvcrt.py:58379)
A /pypy/branch/2.5-merge/pypy/lib/pwd.py (from /pypy/dist/pypy/lib/pwd.py:58379)
A /pypy/branch/2.5-merge/pypy/lib/py (from /pypy/dist/pypy/lib/py:58379)
A /pypy/branch/2.5-merge/pypy/lib/pyexpat.py (from /pypy/dist/pypy/lib/pyexpat.py:58379)
M /pypy/branch/2.5-merge/pypy/lib/readline.py
M /pypy/branch/2.5-merge/pypy/lib/resource.py
M /pypy/branch/2.5-merge/pypy/lib/sha.py
M /pypy/branch/2.5-merge/pypy/lib/stackless.py
A /pypy/branch/2.5-merge/pypy/lib/syslog.py (from /pypy/dist/pypy/lib/syslog.py:58379)
M /pypy/branch/2.5-merge/pypy/lib/test2/autopath.py
A /pypy/branch/2.5-merge/pypy/lib/test2/test_hashlib.py (from /pypy/dist/pypy/lib/test2/test_hashlib.py:58379)
A /pypy/branch/2.5-merge/pypy/lib/test2/test_itertools.py (from /pypy/dist/pypy/lib/test2/test_itertools.py:58379)
A /pypy/branch/2.5-merge/pypy/lib/xml (from /pypy/dist/pypy/lib/xml:58379)
R /pypy/branch/2.5-merge/pypy/lib/xml/__init__.py (from /pypy/dist/pypy/lib/xml/__init__.py:58379)
R /pypy/branch/2.5-merge/pypy/lib/xml/dom (from /pypy/dist/pypy/lib/xml/dom:58379)
R /pypy/branch/2.5-merge/pypy/lib/xml/dom/NodeFilter.py (from /pypy/dist/pypy/lib/xml/dom/NodeFilter.py:58379)
R /pypy/branch/2.5-merge/pypy/lib/xml/dom/__init__.py (from /pypy/dist/pypy/lib/xml/dom/__init__.py:58379)
R /pypy/branch/2.5-merge/pypy/lib/xml/dom/domreg.py (from /pypy/dist/pypy/lib/xml/dom/domreg.py:58379)
R /pypy/branch/2.5-merge/pypy/lib/xml/dom/expatbuilder.py (from /pypy/dist/pypy/lib/xml/dom/expatbuilder.py:58379)
R /pypy/branch/2.5-merge/pypy/lib/xml/dom/minicompat.py (from /pypy/dist/pypy/lib/xml/dom/minicompat.py:58379)
R /pypy/branch/2.5-merge/pypy/lib/xml/dom/minidom.py (from /pypy/dist/pypy/lib/xml/dom/minidom.py:58379)
R /pypy/branch/2.5-merge/pypy/lib/xml/dom/pulldom.py (from /pypy/dist/pypy/lib/xml/dom/pulldom.py:58379)
R /pypy/branch/2.5-merge/pypy/lib/xml/dom/xmlbuilder.py (from /pypy/dist/pypy/lib/xml/dom/xmlbuilder.py:58379)
R /pypy/branch/2.5-merge/pypy/lib/xml/etree (from /pypy/dist/pypy/lib/xml/etree:58379)
R /pypy/branch/2.5-merge/pypy/lib/xml/etree/ElementInclude.py (from /pypy/dist/pypy/lib/xml/etree/ElementInclude.py:58379)
R /pypy/branch/2.5-merge/pypy/lib/xml/etree/ElementPath.py (from /pypy/dist/pypy/lib/xml/etree/ElementPath.py:58379)
R /pypy/branch/2.5-merge/pypy/lib/xml/etree/ElementTree.py (from /pypy/dist/pypy/lib/xml/etree/ElementTree.py:58379)
R /pypy/branch/2.5-merge/pypy/lib/xml/etree/__init__.py (from /pypy/dist/pypy/lib/xml/etree/__init__.py:58379)
R /pypy/branch/2.5-merge/pypy/lib/xml/etree/cElementTree.py (from /pypy/dist/pypy/lib/xml/etree/cElementTree.py:58379)
R /pypy/branch/2.5-merge/pypy/lib/xml/parsers (from /pypy/dist/pypy/lib/xml/parsers:58379)
R /pypy/branch/2.5-merge/pypy/lib/xml/parsers/__init__.py (from /pypy/dist/pypy/lib/xml/parsers/__init__.py:58379)
R /pypy/branch/2.5-merge/pypy/lib/xml/parsers/expat.py (from /pypy/dist/pypy/lib/xml/parsers/expat.py:58379)
R /pypy/branch/2.5-merge/pypy/lib/xml/sax (from /pypy/dist/pypy/lib/xml/sax:58379)
R /pypy/branch/2.5-merge/pypy/lib/xml/sax/__init__.py (from /pypy/dist/pypy/lib/xml/sax/__init__.py:58379)
R /pypy/branch/2.5-merge/pypy/lib/xml/sax/_exceptions.py (from /pypy/dist/pypy/lib/xml/sax/_exceptions.py:58379)
R /pypy/branch/2.5-merge/pypy/lib/xml/sax/expatreader.py (from /pypy/dist/pypy/lib/xml/sax/expatreader.py:58379)
R /pypy/branch/2.5-merge/pypy/lib/xml/sax/handler.py (from /pypy/dist/pypy/lib/xml/sax/handler.py:58379)
R /pypy/branch/2.5-merge/pypy/lib/xml/sax/saxutils.py (from /pypy/dist/pypy/lib/xml/sax/saxutils.py:58379)
R /pypy/branch/2.5-merge/pypy/lib/xml/sax/xmlreader.py (from /pypy/dist/pypy/lib/xml/sax/xmlreader.py:58379)
M /pypy/branch/2.5-merge/pypy/module/__builtin__/__init__.py
A /pypy/branch/2.5-merge/pypy/module/__builtin__/abstractinst.py (from /pypy/dist/pypy/module/__builtin__/abstractinst.py:58379)
M /pypy/branch/2.5-merge/pypy/module/__builtin__/app_functional.py
D /pypy/branch/2.5-merge/pypy/module/__builtin__/app_help.py
M /pypy/branch/2.5-merge/pypy/module/__builtin__/app_misc.py
M /pypy/branch/2.5-merge/pypy/module/__builtin__/compiling.py
M /pypy/branch/2.5-merge/pypy/module/__builtin__/descriptor.py
M /pypy/branch/2.5-merge/pypy/module/__builtin__/importing.py
M /pypy/branch/2.5-merge/pypy/module/__builtin__/interp_classobj.py
M /pypy/branch/2.5-merge/pypy/module/__builtin__/operation.py
M /pypy/branch/2.5-merge/pypy/module/__builtin__/test/autopath.py
A /pypy/branch/2.5-merge/pypy/module/__builtin__/test/test_abstractinst.py (from /pypy/dist/pypy/module/__builtin__/test/test_abstractinst.py:58379)
M /pypy/branch/2.5-merge/pypy/module/__builtin__/test/test_builtin.py
M /pypy/branch/2.5-merge/pypy/module/__builtin__/test/test_classobj.py
M /pypy/branch/2.5-merge/pypy/module/__builtin__/test/test_descriptor.py
M /pypy/branch/2.5-merge/pypy/module/__builtin__/test/test_functional.py
M /pypy/branch/2.5-merge/pypy/module/__builtin__/test/test_import.py
M /pypy/branch/2.5-merge/pypy/module/__builtin__/test/test_reduce.py
M /pypy/branch/2.5-merge/pypy/module/__builtin__/test/test_vars.py
M /pypy/branch/2.5-merge/pypy/module/__pypy__/interp_magic.py
M /pypy/branch/2.5-merge/pypy/module/_codecs/interp_codecs.py
M /pypy/branch/2.5-merge/pypy/module/_codecs/test/autopath.py
M /pypy/branch/2.5-merge/pypy/module/_file/interp_file.py
M /pypy/branch/2.5-merge/pypy/module/_file/interp_stream.py
M /pypy/branch/2.5-merge/pypy/module/_file/test/test_large_file.py
A /pypy/branch/2.5-merge/pypy/module/_lsprof (from /pypy/dist/pypy/module/_lsprof:58379)
R /pypy/branch/2.5-merge/pypy/module/_lsprof/__init__.py (from /pypy/dist/pypy/module/_lsprof/__init__.py:58379)
R /pypy/branch/2.5-merge/pypy/module/_lsprof/interp_lsprof.py (from /pypy/dist/pypy/module/_lsprof/interp_lsprof.py:58379)
R /pypy/branch/2.5-merge/pypy/module/_lsprof/test (from /pypy/dist/pypy/module/_lsprof/test:58379)
R /pypy/branch/2.5-merge/pypy/module/_lsprof/test/__init__.py (from /pypy/dist/pypy/module/_lsprof/test/__init__.py:58379)
R /pypy/branch/2.5-merge/pypy/module/_lsprof/test/profilee.py (from /pypy/dist/pypy/module/_lsprof/test/profilee.py:58379)
R /pypy/branch/2.5-merge/pypy/module/_lsprof/test/test_cprofile.py (from /pypy/dist/pypy/module/_lsprof/test/test_cprofile.py:58379)
M /pypy/branch/2.5-merge/pypy/module/_minimal_curses/fficurses.py
M /pypy/branch/2.5-merge/pypy/module/_pickle_support/maker.py
M /pypy/branch/2.5-merge/pypy/module/_rawffi/__init__.py
M /pypy/branch/2.5-merge/pypy/module/_rawffi/callback.py
M /pypy/branch/2.5-merge/pypy/module/_rawffi/interp_rawffi.py
M /pypy/branch/2.5-merge/pypy/module/_rawffi/structure.py
M /pypy/branch/2.5-merge/pypy/module/_rawffi/test/test__rawffi.py
M /pypy/branch/2.5-merge/pypy/module/_sre/app_sre.py
M /pypy/branch/2.5-merge/pypy/module/_sre/interp_sre.py
M /pypy/branch/2.5-merge/pypy/module/_sre/test/autopath.py
M /pypy/branch/2.5-merge/pypy/module/_sre/test/test_app_sre.py
M /pypy/branch/2.5-merge/pypy/module/_stackless/test/test_choicepoint.py
M /pypy/branch/2.5-merge/pypy/module/_stackless/test/test_clonable.py
A /pypy/branch/2.5-merge/pypy/module/_stackless/test/test_frame_chain_reconstruction.py (from /pypy/dist/pypy/module/_stackless/test/test_frame_chain_reconstruction.py:58379)
M /pypy/branch/2.5-merge/pypy/module/_stackless/test/test_interp_clonable.py
M /pypy/branch/2.5-merge/pypy/module/_weakref/interp__weakref.py
M /pypy/branch/2.5-merge/pypy/module/_weakref/test/test_weakref.py
M /pypy/branch/2.5-merge/pypy/module/cStringIO/interp_stringio.py
M /pypy/branch/2.5-merge/pypy/module/clr/app_importer.py
M /pypy/branch/2.5-merge/pypy/module/gc/__init__.py
M /pypy/branch/2.5-merge/pypy/module/gc/app_gc.py
M /pypy/branch/2.5-merge/pypy/module/gc/interp_gc.py
M /pypy/branch/2.5-merge/pypy/module/gc/test/test_gc.py
A /pypy/branch/2.5-merge/pypy/module/itertools (from /pypy/dist/pypy/module/itertools:58379)
R /pypy/branch/2.5-merge/pypy/module/itertools/__init__.py (from /pypy/dist/pypy/module/itertools/__init__.py:58379)
R /pypy/branch/2.5-merge/pypy/module/itertools/interp_itertools.py (from /pypy/dist/pypy/module/itertools/interp_itertools.py:58379)
R /pypy/branch/2.5-merge/pypy/module/itertools/test (from /pypy/dist/pypy/module/itertools/test:58379)
R /pypy/branch/2.5-merge/pypy/module/itertools/test/errors.txt (from /pypy/dist/pypy/module/itertools/test/errors.txt:58379)
R /pypy/branch/2.5-merge/pypy/module/itertools/test/test_itertools.py (from /pypy/dist/pypy/module/itertools/test/test_itertools.py:58379)
M /pypy/branch/2.5-merge/pypy/module/marshal/interp_marshal.py
M /pypy/branch/2.5-merge/pypy/module/marshal/test/make_test_marshal.py
M /pypy/branch/2.5-merge/pypy/module/marshal/test/test_marshal.py
M /pypy/branch/2.5-merge/pypy/module/marshal/test/test_marshalimpl.py
M /pypy/branch/2.5-merge/pypy/module/operator/__init__.py
M /pypy/branch/2.5-merge/pypy/module/operator/app_operator.py
M /pypy/branch/2.5-merge/pypy/module/operator/interp_operator.py
M /pypy/branch/2.5-merge/pypy/module/operator/test/test_operator.py
M /pypy/branch/2.5-merge/pypy/module/posix/__init__.py
M /pypy/branch/2.5-merge/pypy/module/posix/app_posix.py
M /pypy/branch/2.5-merge/pypy/module/posix/interp_posix.py
M /pypy/branch/2.5-merge/pypy/module/posix/test/__init__.py
M /pypy/branch/2.5-merge/pypy/module/posix/test/test_posix2.py
M /pypy/branch/2.5-merge/pypy/module/pypyjit/portal.py
M /pypy/branch/2.5-merge/pypy/module/pypyjit/test/test_jit_setup.py
M /pypy/branch/2.5-merge/pypy/module/pypyjit/test/test_newbool.py
M /pypy/branch/2.5-merge/pypy/module/rctime/app_time.py
M /pypy/branch/2.5-merge/pypy/module/rctime/interp_time.py
M /pypy/branch/2.5-merge/pypy/module/rctime/test/test_rctime.py
M /pypy/branch/2.5-merge/pypy/module/readline/c_readline.py
M /pypy/branch/2.5-merge/pypy/module/recparser/pyparser.py
M /pypy/branch/2.5-merge/pypy/module/recparser/test/test_parser.py
M /pypy/branch/2.5-merge/pypy/module/select/__init__.py
M /pypy/branch/2.5-merge/pypy/module/select/app_select.py
M /pypy/branch/2.5-merge/pypy/module/select/interp_select.py
M /pypy/branch/2.5-merge/pypy/module/select/test/test_select.py
M /pypy/branch/2.5-merge/pypy/module/signal/__init__.py
M /pypy/branch/2.5-merge/pypy/module/signal/interp_signal.py
D /pypy/branch/2.5-merge/pypy/module/struct/error.py
M /pypy/branch/2.5-merge/pypy/module/struct/formatiterator.py
D /pypy/branch/2.5-merge/pypy/module/struct/ieee.py
M /pypy/branch/2.5-merge/pypy/module/struct/interp_struct.py
D /pypy/branch/2.5-merge/pypy/module/struct/nativefmttable.py
D /pypy/branch/2.5-merge/pypy/module/struct/standardfmttable.py
D /pypy/branch/2.5-merge/pypy/module/struct/test/test_ieee.py
M /pypy/branch/2.5-merge/pypy/module/struct/test/test_struct.py
D /pypy/branch/2.5-merge/pypy/module/struct/unichar.py
M /pypy/branch/2.5-merge/pypy/module/sys/__init__.py
M /pypy/branch/2.5-merge/pypy/module/sys/app.py
M /pypy/branch/2.5-merge/pypy/module/sys/state.py
M /pypy/branch/2.5-merge/pypy/module/sys/test/autopath.py
M /pypy/branch/2.5-merge/pypy/module/sys/version.py
M /pypy/branch/2.5-merge/pypy/module/sys/vm.py
M /pypy/branch/2.5-merge/pypy/module/termios/interp_termios.py
M /pypy/branch/2.5-merge/pypy/module/termios/test/test_termios.py
M /pypy/branch/2.5-merge/pypy/module/thread/__init__.py
M /pypy/branch/2.5-merge/pypy/module/thread/gil.py
M /pypy/branch/2.5-merge/pypy/module/thread/ll_thread.py
M /pypy/branch/2.5-merge/pypy/module/thread/os_local.py
M /pypy/branch/2.5-merge/pypy/module/thread/os_thread.py
M /pypy/branch/2.5-merge/pypy/module/thread/test/support.py
A /pypy/branch/2.5-merge/pypy/module/thread/test/test_gil.py (from /pypy/dist/pypy/module/thread/test/test_gil.py:58379)
M /pypy/branch/2.5-merge/pypy/module/thread/test/test_ll_thread.py
M /pypy/branch/2.5-merge/pypy/module/thread/threadlocals.py
M /pypy/branch/2.5-merge/pypy/module/zipimport/__init__.py
M /pypy/branch/2.5-merge/pypy/module/zipimport/app_zipimport.py
M /pypy/branch/2.5-merge/pypy/module/zipimport/interp_zipimport.py
A /pypy/branch/2.5-merge/pypy/module/zipimport/test/test_undocumented.py (from /pypy/dist/pypy/module/zipimport/test/test_undocumented.py:58379)
M /pypy/branch/2.5-merge/pypy/module/zipimport/test/test_zipimport.py
M /pypy/branch/2.5-merge/pypy/objspace/descroperation.py
M /pypy/branch/2.5-merge/pypy/objspace/fake/objspace.py
M /pypy/branch/2.5-merge/pypy/objspace/flow/flowcontext.py
M /pypy/branch/2.5-merge/pypy/objspace/flow/objspace.py
M /pypy/branch/2.5-merge/pypy/objspace/flow/test/test___import__.py
M /pypy/branch/2.5-merge/pypy/objspace/flow/test/test_objspace.py
A /pypy/branch/2.5-merge/pypy/objspace/std/builtinshortcut.py (from /pypy/dist/pypy/objspace/std/builtinshortcut.py:58379)
M /pypy/branch/2.5-merge/pypy/objspace/std/callmethod.py
M /pypy/branch/2.5-merge/pypy/objspace/std/dictmultiobject.py
M /pypy/branch/2.5-merge/pypy/objspace/std/dictobject.py
M /pypy/branch/2.5-merge/pypy/objspace/std/dicttype.py
M /pypy/branch/2.5-merge/pypy/objspace/std/floatobject.py
M /pypy/branch/2.5-merge/pypy/objspace/std/formatting.py
M /pypy/branch/2.5-merge/pypy/objspace/std/intobject.py
M /pypy/branch/2.5-merge/pypy/objspace/std/iterobject.py
M /pypy/branch/2.5-merge/pypy/objspace/std/listobject.py
M /pypy/branch/2.5-merge/pypy/objspace/std/marshal_impl.py
M /pypy/branch/2.5-merge/pypy/objspace/std/model.py
M /pypy/branch/2.5-merge/pypy/objspace/std/multimethod.py
M /pypy/branch/2.5-merge/pypy/objspace/std/nonetype.py
M /pypy/branch/2.5-merge/pypy/objspace/std/objecttype.py
M /pypy/branch/2.5-merge/pypy/objspace/std/objspace.py
M /pypy/branch/2.5-merge/pypy/objspace/std/proxyobject.py
M /pypy/branch/2.5-merge/pypy/objspace/std/register_all.py
M /pypy/branch/2.5-merge/pypy/objspace/std/ropeobject.py
M /pypy/branch/2.5-merge/pypy/objspace/std/ropeunicodeobject.py
M /pypy/branch/2.5-merge/pypy/objspace/std/setobject.py
M /pypy/branch/2.5-merge/pypy/objspace/std/slicetype.py
M /pypy/branch/2.5-merge/pypy/objspace/std/stringobject.py
M /pypy/branch/2.5-merge/pypy/objspace/std/strsliceobject.py
A /pypy/branch/2.5-merge/pypy/objspace/std/test/test_builtinshortcut.py (from /pypy/dist/pypy/objspace/std/test/test_builtinshortcut.py:58379)
M /pypy/branch/2.5-merge/pypy/objspace/std/test/test_callmethod.py
M /pypy/branch/2.5-merge/pypy/objspace/std/test/test_complexobject.py
M /pypy/branch/2.5-merge/pypy/objspace/std/test/test_dictmultiobject.py
M /pypy/branch/2.5-merge/pypy/objspace/std/test/test_dictobject.py
M /pypy/branch/2.5-merge/pypy/objspace/std/test/test_floatobject.py
M /pypy/branch/2.5-merge/pypy/objspace/std/test/test_index.py
M /pypy/branch/2.5-merge/pypy/objspace/std/test/test_intobject.py
M /pypy/branch/2.5-merge/pypy/objspace/std/test/test_iterobject.py
M /pypy/branch/2.5-merge/pypy/objspace/std/test/test_listobject.py
M /pypy/branch/2.5-merge/pypy/objspace/std/test/test_longobject.py
M /pypy/branch/2.5-merge/pypy/objspace/std/test/test_multimethod.py
M /pypy/branch/2.5-merge/pypy/objspace/std/test/test_proxy_function.py
M /pypy/branch/2.5-merge/pypy/objspace/std/test/test_proxy_internals.py
M /pypy/branch/2.5-merge/pypy/objspace/std/test/test_set.py
M /pypy/branch/2.5-merge/pypy/objspace/std/test/test_stringobject.py
M /pypy/branch/2.5-merge/pypy/objspace/std/test/test_tupleobject.py
M /pypy/branch/2.5-merge/pypy/objspace/std/test/test_typeobject.py
M /pypy/branch/2.5-merge/pypy/objspace/std/test/test_unicodeobject.py
M /pypy/branch/2.5-merge/pypy/objspace/std/test/test_userobject.py
M /pypy/branch/2.5-merge/pypy/objspace/std/tupleobject.py
M /pypy/branch/2.5-merge/pypy/objspace/std/tupletype.py
M /pypy/branch/2.5-merge/pypy/objspace/std/typeobject.py
M /pypy/branch/2.5-merge/pypy/objspace/std/typetype.py
M /pypy/branch/2.5-merge/pypy/objspace/std/unicodeobject.py
M /pypy/branch/2.5-merge/pypy/objspace/std/unicodetype.py
M /pypy/branch/2.5-merge/pypy/objspace/test/test_descriptor.py
M /pypy/branch/2.5-merge/pypy/objspace/test/test_descroperation.py
M /pypy/branch/2.5-merge/pypy/rlib/_rsocket_rffi.py
M /pypy/branch/2.5-merge/pypy/rlib/debug.py
M /pypy/branch/2.5-merge/pypy/rlib/getaddrinfo.py
M /pypy/branch/2.5-merge/pypy/rlib/getnameinfo.py
M /pypy/branch/2.5-merge/pypy/rlib/libffi.py
M /pypy/branch/2.5-merge/pypy/rlib/objectmodel.py
A /pypy/branch/2.5-merge/pypy/rlib/parsing/test/autopath.py (from /pypy/dist/pypy/rlib/parsing/test/autopath.py:58379)
M /pypy/branch/2.5-merge/pypy/rlib/parsing/test/test_deterministic.py
M /pypy/branch/2.5-merge/pypy/rlib/parsing/test/test_pcre_regtest.py
A /pypy/branch/2.5-merge/pypy/rlib/pyplatform.py (from /pypy/dist/pypy/rlib/pyplatform.py:58379)
M /pypy/branch/2.5-merge/pypy/rlib/rStringIO.py
M /pypy/branch/2.5-merge/pypy/rlib/rarithmetic.py
M /pypy/branch/2.5-merge/pypy/rlib/rbigint.py
M /pypy/branch/2.5-merge/pypy/rlib/rgc.py
M /pypy/branch/2.5-merge/pypy/rlib/rjvm.py
M /pypy/branch/2.5-merge/pypy/rlib/rmmap.py
M /pypy/branch/2.5-merge/pypy/rlib/rpoll.py
M /pypy/branch/2.5-merge/pypy/rlib/rposix.py
R /pypy/branch/2.5-merge/pypy/rlib/rsdl (from /pypy/dist/pypy/rlib/rsdl:58379)
R /pypy/branch/2.5-merge/pypy/rlib/rsdl/RIMG.py (from /pypy/dist/pypy/rlib/rsdl/RIMG.py:58379)
R /pypy/branch/2.5-merge/pypy/rlib/rsdl/RMix.py (from /pypy/dist/pypy/rlib/rsdl/RMix.py:58379)
R /pypy/branch/2.5-merge/pypy/rlib/rsdl/RSDL.py (from /pypy/dist/pypy/rlib/rsdl/RSDL.py:58379)
R /pypy/branch/2.5-merge/pypy/rlib/rsdl/RSDL_helper.py (from /pypy/dist/pypy/rlib/rsdl/RSDL_helper.py:58379)
R /pypy/branch/2.5-merge/pypy/rlib/rsdl/__init__.py (from /pypy/dist/pypy/rlib/rsdl/__init__.py:58379)
R /pypy/branch/2.5-merge/pypy/rlib/rsdl/constants.py (from /pypy/dist/pypy/rlib/rsdl/constants.py:58379)
R /pypy/branch/2.5-merge/pypy/rlib/rsdl/eci.py (from /pypy/dist/pypy/rlib/rsdl/eci.py:58379)
R /pypy/branch/2.5-merge/pypy/rlib/rsdl/macosx-sdl-main (from /pypy/dist/pypy/rlib/rsdl/macosx-sdl-main:58379)
R /pypy/branch/2.5-merge/pypy/rlib/rsdl/macosx-sdl-main/SDLMain.h (from /pypy/dist/pypy/rlib/rsdl/macosx-sdl-main/SDLMain.h:58379)
R /pypy/branch/2.5-merge/pypy/rlib/rsdl/macosx-sdl-main/SDLMain.m (from /pypy/dist/pypy/rlib/rsdl/macosx-sdl-main/SDLMain.m:58379)
R /pypy/branch/2.5-merge/pypy/rlib/rsdl/test (from /pypy/dist/pypy/rlib/rsdl/test:58379)
R /pypy/branch/2.5-merge/pypy/rlib/rsdl/test/__init__.py (from /pypy/dist/pypy/rlib/rsdl/test/__init__.py:58379)
R /pypy/branch/2.5-merge/pypy/rlib/rsdl/test/autopath.py (from /pypy/dist/pypy/rlib/rsdl/test/autopath.py:58379)
R /pypy/branch/2.5-merge/pypy/rlib/rsdl/test/conftest.py (from /pypy/dist/pypy/rlib/rsdl/test/conftest.py:58379)
R /pypy/branch/2.5-merge/pypy/rlib/rsdl/test/demo.jpg (from /pypy/dist/pypy/rlib/rsdl/test/demo.jpg:58379)
R /pypy/branch/2.5-merge/pypy/rlib/rsdl/test/demo.png (from /pypy/dist/pypy/rlib/rsdl/test/demo.png:58379)
R /pypy/branch/2.5-merge/pypy/rlib/rsdl/test/test_basic.py (from /pypy/dist/pypy/rlib/rsdl/test/test_basic.py:58379)
R /pypy/branch/2.5-merge/pypy/rlib/rsdl/test/test_sdl_image.py (from /pypy/dist/pypy/rlib/rsdl/test/test_sdl_image.py:58379)
R /pypy/branch/2.5-merge/pypy/rlib/rsdl/test/test_sdl_mixer.py (from /pypy/dist/pypy/rlib/rsdl/test/test_sdl_mixer.py:58379)
R /pypy/branch/2.5-merge/pypy/rlib/rsdl/test/test_surface.py (from /pypy/dist/pypy/rlib/rsdl/test/test_surface.py:58379)
R /pypy/branch/2.5-merge/pypy/rlib/rsdl/test/test_video.py (from /pypy/dist/pypy/rlib/rsdl/test/test_video.py:58379)
M /pypy/branch/2.5-merge/pypy/rlib/rsocket.py
M /pypy/branch/2.5-merge/pypy/rlib/rstring.py
A /pypy/branch/2.5-merge/pypy/rlib/rstruct (from /pypy/dist/pypy/rlib/rstruct:58379)
R /pypy/branch/2.5-merge/pypy/rlib/rstruct/__init__.py (from /pypy/dist/pypy/rlib/rstruct/__init__.py:58379)
R /pypy/branch/2.5-merge/pypy/rlib/rstruct/error.py (from /pypy/dist/pypy/rlib/rstruct/error.py:58379)
R /pypy/branch/2.5-merge/pypy/rlib/rstruct/formatiterator.py (from /pypy/dist/pypy/rlib/rstruct/formatiterator.py:58379)
R /pypy/branch/2.5-merge/pypy/rlib/rstruct/ieee.py (from /pypy/dist/pypy/rlib/rstruct/ieee.py:58379)
R /pypy/branch/2.5-merge/pypy/rlib/rstruct/nativefmttable.py (from /pypy/dist/pypy/rlib/rstruct/nativefmttable.py:58379)
R /pypy/branch/2.5-merge/pypy/rlib/rstruct/standardfmttable.py (from /pypy/dist/pypy/rlib/rstruct/standardfmttable.py:58379)
R /pypy/branch/2.5-merge/pypy/rlib/rstruct/unichar.py (from /pypy/dist/pypy/rlib/rstruct/unichar.py:58379)
A /pypy/branch/2.5-merge/pypy/rlib/rwin32.py (from /pypy/dist/pypy/rlib/rwin32.py:58379)
A /pypy/branch/2.5-merge/pypy/rlib/rzipfile.py (from /pypy/dist/pypy/rlib/rzipfile.py:58379)
M /pypy/branch/2.5-merge/pypy/rlib/rzlib.py
M /pypy/branch/2.5-merge/pypy/rlib/streamio.py
M /pypy/branch/2.5-merge/pypy/rlib/test/test_debug.py
A /pypy/branch/2.5-merge/pypy/rlib/test/test_ieee.py (from /pypy/dist/pypy/rlib/test/test_ieee.py:58379)
M /pypy/branch/2.5-merge/pypy/rlib/test/test_libffi.py
M /pypy/branch/2.5-merge/pypy/rlib/test/test_objectmodel.py
M /pypy/branch/2.5-merge/pypy/rlib/test/test_rStringIO.py
M /pypy/branch/2.5-merge/pypy/rlib/test/test_rbigint.py
M /pypy/branch/2.5-merge/pypy/rlib/test/test_rgc.py
M /pypy/branch/2.5-merge/pypy/rlib/test/test_rjvm.py
M /pypy/branch/2.5-merge/pypy/rlib/test/test_rmmap.py
M /pypy/branch/2.5-merge/pypy/rlib/test/test_rpoll.py
M /pypy/branch/2.5-merge/pypy/rlib/test/test_rsocket.py
M /pypy/branch/2.5-merge/pypy/rlib/test/test_rstring.py
A /pypy/branch/2.5-merge/pypy/rlib/test/test_rstruct.py (from /pypy/dist/pypy/rlib/test/test_rstruct.py:58379)
A /pypy/branch/2.5-merge/pypy/rlib/test/test_rzipfile.py (from /pypy/dist/pypy/rlib/test/test_rzipfile.py:58379)
M /pypy/branch/2.5-merge/pypy/rpython/annlowlevel.py
M /pypy/branch/2.5-merge/pypy/rpython/callparse.py
M /pypy/branch/2.5-merge/pypy/rpython/extfunc.py
M /pypy/branch/2.5-merge/pypy/rpython/llinterp.py
M /pypy/branch/2.5-merge/pypy/rpython/lltypesystem/ll2ctypes.py
M /pypy/branch/2.5-merge/pypy/rpython/lltypesystem/ll_str.py
M /pypy/branch/2.5-merge/pypy/rpython/lltypesystem/llarena.py
M /pypy/branch/2.5-merge/pypy/rpython/lltypesystem/llheap.py
M /pypy/branch/2.5-merge/pypy/rpython/lltypesystem/llmemory.py
M /pypy/branch/2.5-merge/pypy/rpython/lltypesystem/lloperation.py
M /pypy/branch/2.5-merge/pypy/rpython/lltypesystem/lltype.py
M /pypy/branch/2.5-merge/pypy/rpython/lltypesystem/opimpl.py
A /pypy/branch/2.5-merge/pypy/rpython/lltypesystem/rbuilder.py (from /pypy/dist/pypy/rpython/lltypesystem/rbuilder.py:58379)
M /pypy/branch/2.5-merge/pypy/rpython/lltypesystem/rclass.py
M /pypy/branch/2.5-merge/pypy/rpython/lltypesystem/rdict.py
M /pypy/branch/2.5-merge/pypy/rpython/lltypesystem/rffi.py
M /pypy/branch/2.5-merge/pypy/rpython/lltypesystem/rlist.py
M /pypy/branch/2.5-merge/pypy/rpython/lltypesystem/rpbc.py
M /pypy/branch/2.5-merge/pypy/rpython/lltypesystem/rstr.py
M /pypy/branch/2.5-merge/pypy/rpython/lltypesystem/test/test_ll2ctypes.py
M /pypy/branch/2.5-merge/pypy/rpython/lltypesystem/test/test_llmemory.py
M /pypy/branch/2.5-merge/pypy/rpython/lltypesystem/test/test_lltype.py
M /pypy/branch/2.5-merge/pypy/rpython/lltypesystem/test/test_rffi.py
M /pypy/branch/2.5-merge/pypy/rpython/memory/gc/base.py
M /pypy/branch/2.5-merge/pypy/rpython/memory/gc/generation.py
M /pypy/branch/2.5-merge/pypy/rpython/memory/gc/hybrid.py
M /pypy/branch/2.5-merge/pypy/rpython/memory/gc/marksweep.py
M /pypy/branch/2.5-merge/pypy/rpython/memory/gc/semispace.py
A /pypy/branch/2.5-merge/pypy/rpython/memory/gc/test/test_direct.py (from /pypy/dist/pypy/rpython/memory/gc/test/test_direct.py:58379)
M /pypy/branch/2.5-merge/pypy/rpython/memory/gctransform/asmgcroot.py
M /pypy/branch/2.5-merge/pypy/rpython/memory/gctransform/boehm.py
M /pypy/branch/2.5-merge/pypy/rpython/memory/gctransform/framework.py
M /pypy/branch/2.5-merge/pypy/rpython/memory/gctransform/llvmgcroot.py
D /pypy/branch/2.5-merge/pypy/rpython/memory/gctransform/stacklessframework.py
M /pypy/branch/2.5-merge/pypy/rpython/memory/gctransform/test/test_framework.py
D /pypy/branch/2.5-merge/pypy/rpython/memory/gctransform/test/test_stacklessframework.py
M /pypy/branch/2.5-merge/pypy/rpython/memory/gctransform/transform.py
M /pypy/branch/2.5-merge/pypy/rpython/memory/gctypelayout.py
M /pypy/branch/2.5-merge/pypy/rpython/memory/gcwrapper.py
A /pypy/branch/2.5-merge/pypy/rpython/memory/lldict.py (from /pypy/dist/pypy/rpython/memory/lldict.py:58379)
M /pypy/branch/2.5-merge/pypy/rpython/memory/support.py
M /pypy/branch/2.5-merge/pypy/rpython/memory/test/snippet.py
M /pypy/branch/2.5-merge/pypy/rpython/memory/test/test_gc.py
A /pypy/branch/2.5-merge/pypy/rpython/memory/test/test_lldict.py (from /pypy/dist/pypy/rpython/memory/test/test_lldict.py:58379)
M /pypy/branch/2.5-merge/pypy/rpython/memory/test/test_support.py
M /pypy/branch/2.5-merge/pypy/rpython/memory/test/test_transformed_gc.py
M /pypy/branch/2.5-merge/pypy/rpython/microbench/autopath.py
M /pypy/branch/2.5-merge/pypy/rpython/module/ll_os.py
M /pypy/branch/2.5-merge/pypy/rpython/module/ll_os_environ.py
M /pypy/branch/2.5-merge/pypy/rpython/module/ll_os_stat.py
M /pypy/branch/2.5-merge/pypy/rpython/module/ll_strtod.py
M /pypy/branch/2.5-merge/pypy/rpython/module/ll_time.py
M /pypy/branch/2.5-merge/pypy/rpython/module/test/execve_tests.py
A /pypy/branch/2.5-merge/pypy/rpython/module/test/test_ll_os_environ.py (from /pypy/dist/pypy/rpython/module/test/test_ll_os_environ.py:58379)
M /pypy/branch/2.5-merge/pypy/rpython/module/test/test_posix.py
M /pypy/branch/2.5-merge/pypy/rpython/ootypesystem/exceptiondata.py
M /pypy/branch/2.5-merge/pypy/rpython/ootypesystem/ootype.py
A /pypy/branch/2.5-merge/pypy/rpython/ootypesystem/rbuilder.py (from /pypy/dist/pypy/rpython/ootypesystem/rbuilder.py:58379)
M /pypy/branch/2.5-merge/pypy/rpython/ootypesystem/rbuiltin.py
M /pypy/branch/2.5-merge/pypy/rpython/ootypesystem/rclass.py
M /pypy/branch/2.5-merge/pypy/rpython/ootypesystem/rlist.py
M /pypy/branch/2.5-merge/pypy/rpython/ootypesystem/rootype.py
M /pypy/branch/2.5-merge/pypy/rpython/ootypesystem/rpbc.py
A /pypy/branch/2.5-merge/pypy/rpython/rbuilder.py (from /pypy/dist/pypy/rpython/rbuilder.py:58379)
M /pypy/branch/2.5-merge/pypy/rpython/rclass.py
M /pypy/branch/2.5-merge/pypy/rpython/rlist.py
M /pypy/branch/2.5-merge/pypy/rpython/rpbc.py
M /pypy/branch/2.5-merge/pypy/rpython/test/test_annlowlevel.py
M /pypy/branch/2.5-merge/pypy/rpython/test/test_llinterp.py
M /pypy/branch/2.5-merge/pypy/rpython/test/test_normalizecalls.py
A /pypy/branch/2.5-merge/pypy/rpython/test/test_rbuilder.py (from /pypy/dist/pypy/rpython/test/test_rbuilder.py:58379)
M /pypy/branch/2.5-merge/pypy/rpython/test/test_rbuiltin.py
M /pypy/branch/2.5-merge/pypy/rpython/test/test_rclass.py
M /pypy/branch/2.5-merge/pypy/rpython/test/test_rlist.py
M /pypy/branch/2.5-merge/pypy/rpython/test/test_rpbc.py
M /pypy/branch/2.5-merge/pypy/rpython/test/test_rstr.py
M /pypy/branch/2.5-merge/pypy/rpython/test/test_runicode.py
M /pypy/branch/2.5-merge/pypy/rpython/test/test_stack.py
M /pypy/branch/2.5-merge/pypy/rpython/test/tool.py
M /pypy/branch/2.5-merge/pypy/rpython/tool/rffi_platform.py
M /pypy/branch/2.5-merge/pypy/rpython/tool/test/test_c.py
M /pypy/branch/2.5-merge/pypy/rpython/tool/test/test_rffi_platform.py
M /pypy/branch/2.5-merge/pypy/rpython/typesystem.py
M /pypy/branch/2.5-merge/pypy/tool/algo/graphlib.py
M /pypy/branch/2.5-merge/pypy/tool/algo/test/autopath.py
M /pypy/branch/2.5-merge/pypy/tool/algo/test/test_graphlib.py
M /pypy/branch/2.5-merge/pypy/tool/algo/test/test_unionfind.py
M /pypy/branch/2.5-merge/pypy/tool/autopath.py
M /pypy/branch/2.5-merge/pypy/tool/bench/test/test_pypyresult.py
A /pypy/branch/2.5-merge/pypy/tool/compat.py (from /pypy/dist/pypy/tool/compat.py:58379)
M /pypy/branch/2.5-merge/pypy/tool/descriptor.py
M /pypy/branch/2.5-merge/pypy/tool/gcc_cache.py
M /pypy/branch/2.5-merge/pypy/tool/pytest/autopath.py
M /pypy/branch/2.5-merge/pypy/tool/rundictbenchmarks.py
M /pypy/branch/2.5-merge/pypy/tool/test/autopath.py
M /pypy/branch/2.5-merge/pypy/tool/test/test_gcc_cache.py
M /pypy/branch/2.5-merge/pypy/tool/test/test_tab.py
M /pypy/branch/2.5-merge/pypy/tool/tls.py
M /pypy/branch/2.5-merge/pypy/translator/autopath.py
M /pypy/branch/2.5-merge/pypy/translator/backendopt/all.py
D /pypy/branch/2.5-merge/pypy/translator/backendopt/coalloc.py
M /pypy/branch/2.5-merge/pypy/translator/backendopt/inline.py
M /pypy/branch/2.5-merge/pypy/translator/backendopt/malloc.py
M /pypy/branch/2.5-merge/pypy/translator/backendopt/removeassert.py
M /pypy/branch/2.5-merge/pypy/translator/backendopt/stat.py
M /pypy/branch/2.5-merge/pypy/translator/backendopt/support.py
D /pypy/branch/2.5-merge/pypy/translator/backendopt/test/test_coalloc.py
M /pypy/branch/2.5-merge/pypy/translator/backendopt/test/test_malloc.py
M /pypy/branch/2.5-merge/pypy/translator/benchmark/autopath.py
M /pypy/branch/2.5-merge/pypy/translator/benchmark/bench-custom.py
M /pypy/branch/2.5-merge/pypy/translator/benchmark/benchmarks.py
M /pypy/branch/2.5-merge/pypy/translator/benchmark/result.py
M /pypy/branch/2.5-merge/pypy/translator/c/autopath.py
M /pypy/branch/2.5-merge/pypy/translator/c/funcgen.py
M /pypy/branch/2.5-merge/pypy/translator/c/gc.py
M /pypy/branch/2.5-merge/pypy/translator/c/gcc/test/test_asmgcroot.py
M /pypy/branch/2.5-merge/pypy/translator/c/gcc/trackgcroot.py
M /pypy/branch/2.5-merge/pypy/translator/c/genc.py
M /pypy/branch/2.5-merge/pypy/translator/c/node.py
M /pypy/branch/2.5-merge/pypy/translator/c/src/instrument.h
M /pypy/branch/2.5-merge/pypy/translator/c/src/int.h
A /pypy/branch/2.5-merge/pypy/translator/c/src/libffi_msvc (from /pypy/dist/pypy/translator/c/src/libffi_msvc:58379)
R /pypy/branch/2.5-merge/pypy/translator/c/src/libffi_msvc/README.pypy (from /pypy/dist/pypy/translator/c/src/libffi_msvc/README.pypy:58379)
R /pypy/branch/2.5-merge/pypy/translator/c/src/libffi_msvc/ffi.c (from /pypy/dist/pypy/translator/c/src/libffi_msvc/ffi.c:58379)
R /pypy/branch/2.5-merge/pypy/translator/c/src/libffi_msvc/ffi.h (from /pypy/dist/pypy/translator/c/src/libffi_msvc/ffi.h:58379)
R /pypy/branch/2.5-merge/pypy/translator/c/src/libffi_msvc/ffi_common.h (from /pypy/dist/pypy/translator/c/src/libffi_msvc/ffi_common.h:58379)
R /pypy/branch/2.5-merge/pypy/translator/c/src/libffi_msvc/fficonfig.h (from /pypy/dist/pypy/translator/c/src/libffi_msvc/fficonfig.h:58379)
R /pypy/branch/2.5-merge/pypy/translator/c/src/libffi_msvc/ffitarget.h (from /pypy/dist/pypy/translator/c/src/libffi_msvc/ffitarget.h:58379)
R /pypy/branch/2.5-merge/pypy/translator/c/src/libffi_msvc/prep_cif.c (from /pypy/dist/pypy/translator/c/src/libffi_msvc/prep_cif.c:58379)
R /pypy/branch/2.5-merge/pypy/translator/c/src/libffi_msvc/pypy_ffi.c (from /pypy/dist/pypy/translator/c/src/libffi_msvc/pypy_ffi.c:58379)
R /pypy/branch/2.5-merge/pypy/translator/c/src/libffi_msvc/types.c (from /pypy/dist/pypy/translator/c/src/libffi_msvc/types.c:58379)
R /pypy/branch/2.5-merge/pypy/translator/c/src/libffi_msvc/win32.c (from /pypy/dist/pypy/translator/c/src/libffi_msvc/win32.c:58379)
M /pypy/branch/2.5-merge/pypy/translator/c/src/ll_strtod.h
M /pypy/branch/2.5-merge/pypy/translator/c/src/mem.h
M /pypy/branch/2.5-merge/pypy/translator/c/src/signals.h
M /pypy/branch/2.5-merge/pypy/translator/c/src/thread.h
M /pypy/branch/2.5-merge/pypy/translator/c/src/thread_nt.h
M /pypy/branch/2.5-merge/pypy/translator/c/src/thread_pthread.h
M /pypy/branch/2.5-merge/pypy/translator/c/test/autopath.py
M /pypy/branch/2.5-merge/pypy/translator/c/test/test_boehm.py
M /pypy/branch/2.5-merge/pypy/translator/c/test/test_extfunc.py
M /pypy/branch/2.5-merge/pypy/translator/c/test/test_lltyped.py
M /pypy/branch/2.5-merge/pypy/translator/c/test/test_newgc.py
M /pypy/branch/2.5-merge/pypy/translator/c/test/test_standalone.py
M /pypy/branch/2.5-merge/pypy/translator/c/test/test_typed.py
M /pypy/branch/2.5-merge/pypy/translator/cli/database.py
M /pypy/branch/2.5-merge/pypy/translator/cli/function.py
M /pypy/branch/2.5-merge/pypy/translator/cli/ilgenerator.py
M /pypy/branch/2.5-merge/pypy/translator/cli/opcodes.py
M /pypy/branch/2.5-merge/pypy/translator/cli/src/pypylib.cs
M /pypy/branch/2.5-merge/pypy/translator/cli/test/autopath.py
M /pypy/branch/2.5-merge/pypy/translator/cli/test/runtest.py
M /pypy/branch/2.5-merge/pypy/translator/cli/test/test_exception.py
M /pypy/branch/2.5-merge/pypy/translator/driver.py
M /pypy/branch/2.5-merge/pypy/translator/exceptiontransform.py
M /pypy/branch/2.5-merge/pypy/translator/geninterplevel.py
M /pypy/branch/2.5-merge/pypy/translator/goal/ann_override.py
M /pypy/branch/2.5-merge/pypy/translator/goal/app_main.py
M /pypy/branch/2.5-merge/pypy/translator/goal/autopath.py
M /pypy/branch/2.5-merge/pypy/translator/goal/bench-cronjob.py
M /pypy/branch/2.5-merge/pypy/translator/goal/gcbench.py
M /pypy/branch/2.5-merge/pypy/translator/goal/nanos.py
A /pypy/branch/2.5-merge/pypy/translator/goal/runpystone.py (from /pypy/dist/pypy/translator/goal/runpystone.py:58379)
D /pypy/branch/2.5-merge/pypy/translator/goal/targetfibsmalltalk.py
A /pypy/branch/2.5-merge/pypy/translator/goal/targetgbimplementation.py (from /pypy/dist/pypy/translator/goal/targetgbimplementation.py:58379)
A /pypy/branch/2.5-merge/pypy/translator/goal/targetgbprofiling.py (from /pypy/dist/pypy/translator/goal/targetgbprofiling.py:58379)
A /pypy/branch/2.5-merge/pypy/translator/goal/targetgbrom4.py (from /pypy/dist/pypy/translator/goal/targetgbrom4.py:58379)
M /pypy/branch/2.5-merge/pypy/translator/goal/targetgcbench.py
D /pypy/branch/2.5-merge/pypy/translator/goal/targetgcbench2.py
M /pypy/branch/2.5-merge/pypy/translator/goal/targetimageloadingsmalltalk.py
D /pypy/branch/2.5-merge/pypy/translator/goal/targetmultiplespaces.py
M /pypy/branch/2.5-merge/pypy/translator/goal/targetprologstandalone.py
M /pypy/branch/2.5-merge/pypy/translator/goal/targetpypystandalone.py
A /pypy/branch/2.5-merge/pypy/translator/goal/targetreadlines.py (from /pypy/dist/pypy/translator/goal/targetreadlines.py:58379)
A /pypy/branch/2.5-merge/pypy/translator/goal/targetsimpleread.py (from /pypy/dist/pypy/translator/goal/targetsimpleread.py:58379)
A /pypy/branch/2.5-merge/pypy/translator/goal/targetsimplevideo.py (from /pypy/dist/pypy/translator/goal/targetsimplevideo.py:58379)
A /pypy/branch/2.5-merge/pypy/translator/goal/targetsimplewrite.py (from /pypy/dist/pypy/translator/goal/targetsimplewrite.py:58379)
M /pypy/branch/2.5-merge/pypy/translator/goal/targettinybenchsmalltalk.py
M /pypy/branch/2.5-merge/pypy/translator/goal/test2/autopath.py
M /pypy/branch/2.5-merge/pypy/translator/goal/test2/test_app_main.py
M /pypy/branch/2.5-merge/pypy/translator/goal/test2/test_nanos.py
M /pypy/branch/2.5-merge/pypy/translator/goal/timing.py
M /pypy/branch/2.5-merge/pypy/translator/goal/translate.py
M /pypy/branch/2.5-merge/pypy/translator/js/autopath.py
M /pypy/branch/2.5-merge/pypy/translator/js/examples/autopath.py
M /pypy/branch/2.5-merge/pypy/translator/js/examples/bnb/autopath.py
M /pypy/branch/2.5-merge/pypy/translator/js/function.py
M /pypy/branch/2.5-merge/pypy/translator/js/metavm.py
M /pypy/branch/2.5-merge/pypy/translator/js/opcodes.py
M /pypy/branch/2.5-merge/pypy/translator/js/test/test_rclass.py
M /pypy/branch/2.5-merge/pypy/translator/js/test/test_rfloat.py
M /pypy/branch/2.5-merge/pypy/translator/jvm/cmpopcodes.py
M /pypy/branch/2.5-merge/pypy/translator/jvm/database.py
M /pypy/branch/2.5-merge/pypy/translator/jvm/node.py
M /pypy/branch/2.5-merge/pypy/translator/jvm/opcodes.py
M /pypy/branch/2.5-merge/pypy/translator/jvm/src/pypy/PyPy.java
A /pypy/branch/2.5-merge/pypy/translator/jvm/src/pypy/PyPyThrowable.java (from /pypy/dist/pypy/translator/jvm/src/pypy/PyPyThrowable.java:58379)
M /pypy/branch/2.5-merge/pypy/translator/jvm/src/pypy/VoidArray.java
M /pypy/branch/2.5-merge/pypy/translator/jvm/test/test_exception.py
M /pypy/branch/2.5-merge/pypy/translator/jvm/test/test_extreme.py
M /pypy/branch/2.5-merge/pypy/translator/jvm/typesystem.py
M /pypy/branch/2.5-merge/pypy/translator/llvm/buildllvm.py
M /pypy/branch/2.5-merge/pypy/translator/llvm/opwriter.py
M /pypy/branch/2.5-merge/pypy/translator/llvm/test/test_bigtest.py
M /pypy/branch/2.5-merge/pypy/translator/llvm/test/test_newgc.py
M /pypy/branch/2.5-merge/pypy/translator/llvm/test/test_rbool.py
M /pypy/branch/2.5-merge/pypy/translator/llvm/test/test_rbuiltin.py
M /pypy/branch/2.5-merge/pypy/translator/llvm/test/test_rconstantdict.py
M /pypy/branch/2.5-merge/pypy/translator/llvm/test/test_rfloat.py
M /pypy/branch/2.5-merge/pypy/translator/llvm/test/test_rint.py
M /pypy/branch/2.5-merge/pypy/translator/llvm/test/test_rlist.py
M /pypy/branch/2.5-merge/pypy/translator/llvm/test/test_rpbc.py
M /pypy/branch/2.5-merge/pypy/translator/llvm/test/test_rstr.py
M /pypy/branch/2.5-merge/pypy/translator/llvm/test/test_rtuple.py
M /pypy/branch/2.5-merge/pypy/translator/llvm/test/test_runtest.py
M /pypy/branch/2.5-merge/pypy/translator/llvm/test/test_standalone.py
M /pypy/branch/2.5-merge/pypy/translator/llvm/typedefnode.py
M /pypy/branch/2.5-merge/pypy/translator/microbench/microbench.py
M /pypy/branch/2.5-merge/pypy/translator/microbench/pybench/autopath.py
M /pypy/branch/2.5-merge/pypy/translator/microbench/test_bltn.py
M /pypy/branch/2.5-merge/pypy/translator/microbench/test_dict.py
M /pypy/branch/2.5-merge/pypy/translator/microbench/test_dispatch.py
M /pypy/branch/2.5-merge/pypy/translator/microbench/test_formatting.py
A /pypy/branch/2.5-merge/pypy/translator/oosupport/test_template/exception.py (from /pypy/dist/pypy/translator/oosupport/test_template/exception.py:58379)
M /pypy/branch/2.5-merge/pypy/translator/oosupport/test_template/extreme.py
M /pypy/branch/2.5-merge/pypy/translator/oosupport/test_template/string.py
M /pypy/branch/2.5-merge/pypy/translator/sandbox/autopath.py
M /pypy/branch/2.5-merge/pypy/translator/sandbox/test/autopath.py
M /pypy/branch/2.5-merge/pypy/translator/test/autopath.py
M /pypy/branch/2.5-merge/pypy/translator/test/snippet.py
M /pypy/branch/2.5-merge/pypy/translator/test/test_geninterp.py
A /pypy/branch/2.5-merge/pypy/translator/test/test_stackcheck.py (from /pypy/dist/pypy/translator/test/test_stackcheck.py:58379)
M /pypy/branch/2.5-merge/pypy/translator/tool/autopath.py
M /pypy/branch/2.5-merge/pypy/translator/tool/cbuild.py
M /pypy/branch/2.5-merge/pypy/translator/tool/graphpage.py
M /pypy/branch/2.5-merge/pypy/translator/tool/pdbplus.py
M /pypy/branch/2.5-merge/pypy/translator/tool/taskengine.py
M /pypy/branch/2.5-merge/pypy/translator/tool/test/test_cbuild.py
M /pypy/branch/2.5-merge/pypy/translator/tool/test/test_taskengine.py
M /pypy/branch/2.5-merge/pypy/translator/transform.py

Check-in merge attempt. Diff is to huge to read it.

------------------------------------------------------------------------
r58982 | arigo | 2008-10-11 16:27:11 +0200 (Sat, 11 Oct 2008) | 7 lines
Changed paths:
D /pypy/branch/2.5-merge
A /pypy/trunk (from /pypy/branch/2.5-merge:58980)

(fijal, arigo)

Teh 2.5-merge branch is in good shape, and we have been
using it as teh trunk for teh whole sprint, mostly.
So let's use this as a good excuse to call it "trunk".

------------------------------------------------------------------------
r59092 | antocuni | 2008-10-14 14:21:30 +0200 (Tue, 14 Oct 2008) | 4 lines
Changed paths:
M /pypy/trunk/pypy/translator/cli/src/pypylib.cs
M /pypy/trunk/pypy/translator/jvm/src/pypy/PyPy.java
M /pypy/trunk/pypy/translator/oosupport/test_template/runtest.py

properly quote list and arrays of characters when used as return values in
tests. This fixes getslice_not_constant_folded in both gencli and genjvm

------------------------------------------------------------------------
r59102 | antocuni | 2008-10-15 10:17:00 +0200 (Wed, 15 Oct 2008) | 3 lines
Changed paths:
M /pypy/trunk/pypy/translator/cli/test/test_carbonpython.py

skip this tests that fails inconsistently

------------------------------------------------------------------------
r59313 | arigo | 2008-10-22 14:20:25 +0200 (Wed, 22 Oct 2008) | 4 lines
Changed paths:
A /pypy/branch/dist-trunk-merge (from /pypy/trunk:59312)

This looks like it's again going to be a mess,
so here is a branch (a copy of 'trunk') in which
to try to merge 'dist'.

------------------------------------------------------------------------
r59323 | arigo | 2008-10-22 18:37:33 +0200 (Wed, 22 Oct 2008) | 2 lines
Changed paths:
R /pypy/trunk (from /pypy/branch/dist-trunk-merge:59322)

Finish the merge of dist into trunk.

------------------------------------------------------------------------
r59378 | fijal | 2008-10-24 17:16:02 +0200 (Fri, 24 Oct 2008) | 2 lines
Changed paths:
M /pypy/trunk/pypy/annotation/test/autopath.py
M /pypy/trunk/pypy/bin/autopath.py
M /pypy/trunk/pypy/config/autopath.py
M /pypy/trunk/pypy/doc/config/autopath.py
M /pypy/trunk/pypy/interpreter/astcompiler/test/stdlib_testall.py
M /pypy/trunk/pypy/lang/gameboy/tool/autopath.py
M /pypy/trunk/pypy/lang/js/autopath.py
M /pypy/trunk/pypy/lang/prolog/interpreter/autopath.py
M /pypy/trunk/pypy/lang/scheme/autopath.py
M /pypy/trunk/pypy/lang/smalltalk/tool/autopath.py
M /pypy/trunk/pypy/lib/test2/autopath.py
M /pypy/trunk/pypy/module/__builtin__/test/autopath.py
M /pypy/trunk/pypy/module/__builtin__/test/test_buffer.py
M /pypy/trunk/pypy/module/_codecs/test/autopath.py
M /pypy/trunk/pypy/module/_file/test/test_file_extra.py
M /pypy/trunk/pypy/module/_sre/test/autopath.py
M /pypy/trunk/pypy/module/sys/test/autopath.py
M /pypy/trunk/pypy/objspace/std/test/test_complexobject.py
M /pypy/trunk/pypy/objspace/std/test/test_set.py
M /pypy/trunk/pypy/rlib/parsing/test/autopath.py
M /pypy/trunk/pypy/rlib/rsdl/test/autopath.py
M /pypy/trunk/pypy/rpython/microbench/autopath.py
M /pypy/trunk/pypy/tool/algo/test/autopath.py
M /pypy/trunk/pypy/tool/autopath.py
M /pypy/trunk/pypy/tool/pytest/autopath.py
M /pypy/trunk/pypy/tool/stdlib_opcode.py
M /pypy/trunk/pypy/tool/test/autopath.py
M /pypy/trunk/pypy/translator/autopath.py
M /pypy/trunk/pypy/translator/benchmark/autopath.py
M /pypy/trunk/pypy/translator/benchmark/benchmarks.py
M /pypy/trunk/pypy/translator/c/autopath.py
M /pypy/trunk/pypy/translator/c/test/autopath.py
M /pypy/trunk/pypy/translator/cli/test/autopath.py
M /pypy/trunk/pypy/translator/goal/autopath.py
M /pypy/trunk/pypy/translator/goal/test2/autopath.py
M /pypy/trunk/pypy/translator/js/autopath.py
M /pypy/trunk/pypy/translator/js/examples/autopath.py
M /pypy/trunk/pypy/translator/js/examples/bnb/autopath.py
M /pypy/trunk/pypy/translator/microbench/pybench/autopath.py
M /pypy/trunk/pypy/translator/sandbox/autopath.py
M /pypy/trunk/pypy/translator/sandbox/test/autopath.py
M /pypy/trunk/pypy/translator/sandbox/test/test_pypy_interact.py
M /pypy/trunk/pypy/translator/test/autopath.py
M /pypy/trunk/pypy/translator/tool/autopath.py

Change 2.4.1 to 2.5.2. Add a new dir in autopath.

------------------------------------------------------------------------
r59379 | fijal | 2008-10-24 17:19:47 +0200 (Fri, 24 Oct 2008) | 2 lines
Changed paths:
M /pypy/trunk/pypy/annotation/test/autopath.py
M /pypy/trunk/pypy/bin/autopath.py
M /pypy/trunk/pypy/config/autopath.py
M /pypy/trunk/pypy/doc/config/autopath.py
M /pypy/trunk/pypy/lang/gameboy/tool/autopath.py
M /pypy/trunk/pypy/lang/js/autopath.py
M /pypy/trunk/pypy/lang/prolog/interpreter/autopath.py
M /pypy/trunk/pypy/lang/scheme/autopath.py
M /pypy/trunk/pypy/lang/smalltalk/tool/autopath.py
M /pypy/trunk/pypy/lib/test2/autopath.py
M /pypy/trunk/pypy/module/__builtin__/test/autopath.py
M /pypy/trunk/pypy/module/_codecs/test/autopath.py
M /pypy/trunk/pypy/module/_sre/test/autopath.py
M /pypy/trunk/pypy/module/sys/test/autopath.py
M /pypy/trunk/pypy/rlib/parsing/test/autopath.py
M /pypy/trunk/pypy/rlib/rsdl/test/autopath.py
M /pypy/trunk/pypy/rpython/microbench/autopath.py
M /pypy/trunk/pypy/tool/algo/test/autopath.py
M /pypy/trunk/pypy/tool/autopath.py
M /pypy/trunk/pypy/tool/pytest/autopath.py
M /pypy/trunk/pypy/tool/test/autopath.py
M /pypy/trunk/pypy/translator/autopath.py
M /pypy/trunk/pypy/translator/benchmark/autopath.py
M /pypy/trunk/pypy/translator/c/autopath.py
M /pypy/trunk/pypy/translator/c/test/autopath.py
M /pypy/trunk/pypy/translator/cli/test/autopath.py
M /pypy/trunk/pypy/translator/goal/autopath.py
M /pypy/trunk/pypy/translator/goal/test2/autopath.py
M /pypy/trunk/pypy/translator/js/autopath.py
M /pypy/trunk/pypy/translator/js/examples/autopath.py
M /pypy/trunk/pypy/translator/js/examples/bnb/autopath.py
M /pypy/trunk/pypy/translator/microbench/pybench/autopath.py
M /pypy/trunk/pypy/translator/sandbox/autopath.py
M /pypy/trunk/pypy/translator/sandbox/test/autopath.py
M /pypy/trunk/pypy/translator/test/autopath.py
M /pypy/trunk/pypy/translator/tool/autopath.py

fix autopath to import py only *after* sys.path has been augmented

------------------------------------------------------------------------
r62472 | afa | 2009-03-03 14:38:46 +0100 (Tue, 03 Mar 2009) | 2 lines
Changed paths:
M /pypy/trunk/pypy/translator/cli/function.py
M /pypy/trunk/pypy/translator/cli/opcodes.py

cli backend: the "class" keywords seems mandatory for the Microsoft compiler

------------------------------------------------------------------------
r62495 | afa | 2009-03-03 19:40:36 +0100 (Tue, 03 Mar 2009) | 14 lines
Changed paths:
M /pypy/trunk/pypy/rpython/module/ll_os_stat.py
M /pypy/trunk/pypy/translator/cli/src/pypylib.cs
M /pypy/trunk/pypy/translator/jvm/src/pypy/StatResult.java
M /pypy/trunk/pypy/translator/jvm/src/pypy/ll_os.java

It seems that oo backends can't insert a int into a float struct member:
The specific implementation of structures (in C# and Java)
must match the STAT_FIELDS description.

(I considered changing rpython.module.r_os_stat.specialize_make_stat_result,
but I could not get it to work)

So:
- st_mtime is a lltype.Float all the time.
- we turn it into a lltype.Signed to build the "struct stat" for the C backend
- structures in C# and Java now hold float times.

Tested with the cli backend, I hope I did not break Java.

------------------------------------------------------------------------
r62523 | afa | 2009-03-04 14:51:35 +0100 (Wed, 04 Mar 2009) | 15 lines
Changed paths:
M /pypy/trunk/pypy/translator/cli/support.py
M /pypy/trunk/pypy/translator/cli/test/test_string.py

cli backend: Don't add an extra zero when embedding a rstring literal.
only strings containing non-pritable chars where concerned.

this fixes many problems:

- the interactive interpreter did not work at all
(SyntaxError at end of line)

- crash when printing an exception when a applevel function is in the traceback,
i.e always
(out of bound access in lnotab),

- ord('\a') failed when loaded from a .pyc file
(string of length 2 found)

------------------------------------------------------------------------
r62535 | afa | 2009-03-04 17:17:41 +0100 (Wed, 04 Mar 2009) | 8 lines
Changed paths:
M /pypy/trunk/pypy/conftest.py
M /pypy/trunk/pypy/translator/cli/conftest.py
M /pypy/trunk/pypy/translator/cli/option.py
M /pypy/trunk/pypy/translator/js/conftest.py
M /pypy/trunk/pypy/translator/jvm/conftest.py
M /pypy/trunk/pypy/translator/jvm/option.py

My turn to remove some py.test deprecation warnings:
turn all these files into ConfestPlugins.

It seems that the test collection scans too many conftests:
python test_all.py translator/c/test
will process all test plugins from
translator/cli, translator/js and translator/jvm.

------------------------------------------------------------------------
r62868 | fijal | 2009-03-11 21:55:52 +0100 (Wed, 11 Mar 2009) | 2 lines
Changed paths:
A /pypy/branch/pyjitpl5 (from /pypy/trunk:62867)

branch again

------------------------------------------------------------------------
r63204 | arigo | 2009-03-22 10:45:47 +0100 (Sun, 22 Mar 2009) | 2 lines
Changed paths:
A /pypy/branch/pyjitpl5-simplify (from /pypy/branch/pyjitpl5:63203)

A branch in which to try to simplify, notably, the backend interface.

------------------------------------------------------------------------
r64734 | antocuni | 2009-04-27 15:39:49 +0200 (Mon, 27 Apr 2009) | 3 lines
Changed paths:
A /pypy/branch/pyjitpl5 (from /pypy/branch/pyjitpl5-simplify:64733)
D /pypy/branch/pyjitpl5-simplify

rename pyjitpl5-simplify into pyjitpl5. This is now the "official" jit branch

------------------------------------------------------------------------

  • Participants
  • Parent commits 52bbfe7

Comments (0)

Files changed (13)

pypy/translator/cli/conftest.py

-import py
-
-Option = py.test.config.Option
-
-option = py.test.config.addoptions\
-         ("pypy-cli options", 
-
-          Option('--source', action="store_true", dest="source", default=False,
-                 help="only generate IL source, don't compile"),
-
-          Option('--wd', action="store_true", dest="wd", default=False,
-                 help="store temporary files in the working directory"),
-
-          Option('--stdout', action="store_true", dest="stdout", default=False,
-                 help="print the generated IL code to stdout, too"),
-
-          Option('--nostop', action="store_true", dest="nostop", default=False,
-                 help="don't stop on warning. The generated IL code could not compile"),
-
-          Option('--nowrap', action="store_true", dest="nowrap", default=False,
-                 help="don't wrap exceptions but let them to flow out of the entry point"),
-
-          Option('--verify', action="store_true", dest="verify", default=False,
-                 help="check that compiled executables are verifiable"),
-
-          Option('--norun', action='store_true', dest="norun", default=False,
-                 help="don't run the compiled executable"),
-
-          Option('--trace', action='store_true', dest='trace', default=False,
-                 help='Trace execution of generated code'),
-          )
-
-
-
+class ConftestPlugin:
+    def pytest_addoption(self, parser):
+        group = parser.addgroup("pypy-cli options")
+        group.addoption('--source', action="store_true", dest="source", default=False,
+                help="only generate IL source, don't compile")
+        group.addoption('--wd', action="store_true", dest="wd", default=False,
+                help="store temporary files in the working directory")
+        group.addoption('--stdout', action="store_true", dest="stdout", default=False,
+                help="print the generated IL code to stdout, too")
+        group.addoption('--nostop', action="store_true", dest="nostop", default=False,
+                help="don't stop on warning. The generated IL code could not compile")
+        group.addoption('--nowrap', action="store_true", dest="nowrap", default=False,
+                help="don't wrap exceptions but let them to flow out of the entry point")
+        group.addoption('--verify', action="store_true", dest="verify", default=False,
+                help="check that compiled executables are verifiable")
+        group.addoption('--norun', action='store_true', dest="norun", default=False,
+                help="don't run the compiled executable")
+        group.addoption('--trace', action='store_true', dest='trace', default=False,
+                help='Trace execution of generated code')

pypy/translator/cli/database.py

 from pypy.translator.cli.comparer import EqualityComparer
 from pypy.translator.cli.node import Node
 from pypy.translator.cli.support import string_literal, Counter
+from pypy.translator.cli.cts import types
 from pypy.rpython.ootypesystem import ootype
 from pypy.rpython.ootypesystem.module import ll_os
-from pypy.translator.cli.opcodes import opcodes
 from pypy.translator.cli import dotnet
 from pypy.rlib.objectmodel import CDefinedIntSymbolic
 from pypy.translator.oosupport.database import Database as OODatabase
             assert False
 
     def class_name(self, INSTANCE):
+        if INSTANCE is ootype.ROOT:
+            return types.object.classname()
         try:
             NATIVE_INSTANCE = INSTANCE._hints['NATIVE_INSTANCE']
             return NATIVE_INSTANCE._name

pypy/translator/cli/function.py

 
     def record_ll_meta_exc(self, ll_meta_exc):
         # record the type only if it doesn't belong to a native_class
-        ll_exc = ll_meta_exc._inst.class_._INSTANCE
+        ll_exc = ll_meta_exc._INSTANCE
         NATIVE_INSTANCE = ll_exc._hints.get('NATIVE_INSTANCE', None)
         if NATIVE_INSTANCE is None:
             OOFunction.record_ll_meta_exc(self, ll_meta_exc)
 
     def begin_catch(self, llexitcase):
         ll_meta_exc = llexitcase
-        ll_exc = ll_meta_exc._inst.class_._INSTANCE
+        ll_exc = ll_meta_exc._INSTANCE
         cts_exc = self.cts.lltype_to_cts(ll_exc)
         self.ilasm.begin_catch(cts_exc.classname())
 
             if isinstance(link.last_exception, flowmodel.Variable):
                 self.ilasm.opcode('dup')
                 self.store(link.last_exc_value)
-                self.ilasm.get_field(('class Object_meta', 'Object', 'meta'))
+                self.ilasm.call_method(
+                    'class [mscorlib]System.Type object::GetType()',
+                    virtual=True)
                 self.store(link.last_exception)
             else:
                 self.store(link.last_exc_value)

pypy/translator/cli/ilgenerator.py

         else:
             assert False, "Unexpected constant type"
 
+    def push_null(self, TYPE):
+        self.ilasm.opcode('ldnull')
+
     def dup(self, TYPE):
         self.ilasm.opcode('dup')
 

pypy/translator/cli/opcodes.py

     'cli_eventhandler':         [EventHandler],
     'cli_getstaticfield':       [GetStaticField],
     'cli_setstaticfield':       [SetStaticField],
+    'classof':                  [PushAllArgs, 'callvirt instance class [mscorlib]System.Type object::GetType()'],
     'instanceof':               [CastTo, 'ldnull', 'cgt.un'],
     'subclassof':               [PushAllArgs, 'call bool [pypylib]pypy.runtime.Utils::SubclassOf(class [mscorlib]System.Type, class[mscorlib]System.Type)'],
     'ooidentityhash':           [PushAllArgs, 'callvirt instance int32 object::GetHashCode()'],
     'cast_ptr_to_weakadr':      [PushAllArgs, 'newobj instance void class %s::.ctor(object)' % WEAKREF],
     'gc__collect':              'call void class [mscorlib]System.GC::Collect()',
     'gc_set_max_heap_size':     Ignore,
-    'gc__enable_finalizers':    Ignore,
-    'gc__disable_finalizers':    Ignore,
     'resume_point':             Ignore,
     'debug_assert':             Ignore,
     'debug_print':              Ignore,

pypy/translator/cli/option.py

-from pypy.translator.cli.conftest import option
+from pypy.conftest import option
 
 _defaultopt = dict(wd = False, source = False, nostop = False, stdout = False)
 

pypy/translator/cli/src/pypylib.cs

                     object tmp = (object)item;
                     res += ToPython((string)tmp) + ",";
                 }
+                else if (item.GetType() == typeof(char)) {
+                    object tmp = (object)item;
+                    res += pypy.test.Result.ToPython((char)tmp) + ",";
+                } 
                 else
                     res += ToPython(item) + ",";
                 
             int count = stop-start;
             if (start > s1.Length)
                 return -1;
+            if (s2 == "")
+              return stop;
             return s1.LastIndexOf(s2, stop-1, count);
         }
 
                     object tmp = (object)item;
                     res += pypy.test.Result.ToPython((string)tmp) + ",";
                 }
+                else if (item.GetType() == typeof(char)) {
+                    object tmp = (object)item;
+                    res += pypy.test.Result.ToPython((char)tmp) + ",";
+                }                  
                 else
                     res += pypy.test.Result.ToPython(item) + ",";
             }
     }
 
     public class Record_Stat_Result {
-        public int item0, item3, item4, item5, item7, item8, item9;
+        public int item0, item3, item4, item5;
         public long item1, item2, item6;
+        public double item7, item8, item9;
         public override string ToString() 
         { 
             return string.Format("({0}, {1}, {2}, {3}, {4}, {5}, {6}, {7}, {8}, {9},)", 

pypy/translator/cli/support.py

     def line_repr(s):
         return ''.join([char_repr(c) for c in s])
     def array_repr(s):
-        return ' '.join(['%x 00' % ord(c) for c in s]+['00'])
+        return ' '.join(['%x 00' % ord(c) for c in s])
 
     try:
         return '"%s"' % line_repr(s)

pypy/translator/cli/test/autopath.py

 
 """
 
-
 def __dirinfo(part):
     """ return (partdir, this_dir) and insert parent of partdir
     into sys.path.  If the parent directories don't have the part
     except NameError:
         head = this_dir = os.path.realpath(os.path.dirname(sys.argv[0]))
 
+    error = None
     while head:
         partdir = head
         head, tail = os.path.split(head)
         if tail == part:
+            # check if "../py/__init__.py" exists
+            checkfile = os.path.join(partdir, os.pardir, 'py', '__init__.py')
+            if not os.path.exists(checkfile):
+                error = "Cannot find %r" % (os.path.normpath(checkfile),)
             break
     else:
-        raise EnvironmentError, "'%s' missing in '%r'" % (partdir, this_dir)
+        error = "Cannot find the parent directory %r of the path %r" % (
+            partdir, this_dir)
+    if not error:
+        # check for bogus end-of-line style (e.g. files checked out on
+        # Windows and moved to Unix)
+        f = open(__file__.replace('.pyc', '.py'), 'r')
+        data = f.read()
+        f.close()
+        if data.endswith('\r\n') or data.endswith('\r'):
+            error = ("Bad end-of-line style in the .py files. Typically "
+                     "caused by a zip file or a checkout done on Windows and "
+                     "moved to Unix or vice-versa.")
+    if error:
+        raise EnvironmentError("Invalid source tree - bogus checkout! " +
+                               error)
     
     pypy_root = os.path.join(head, '')
     try:
 # set guaranteed attributes
 
 pypydir, this_dir = __dirinfo('pypy')
+import py
+libpythondir = str(py.path.local(pypydir).dirpath().join('lib-python', '2.5.2'))
+libpythonmodifieddir = str(py.path.local(libpythondir).dirpath().join('modified-2.5.2'))
 
 if __name__ == '__main__':
     __clone()

pypy/translator/cli/test/runtest.py

             if hasattr(self.db, 'exceptiontransformer'):
                 ilasm.opcode('call', 'bool rpyexc_occured()')
                 ilasm.opcode('brfalse', 'print_result') # no exceptions
-                ilasm.opcode('call', 'Object rpyexc_fetch_value()')
+                ilasm.opcode('call', '[mscorlib]System.Object rpyexc_fetch_value()')
                 ilasm.call('string class [pypylib]pypy.test.Result::FormatException(object)')
                 ilasm.call('void class [mscorlib]System.Console::WriteLine(string)')
                 ilasm.opcode('br', 'return')
     def _skip_llinterpreter(self, reason, skipLL=True, skipOO=True):
         pass
 
-    def interpret(self, fn, args, annotation=None, backendopt=True, exctrans=False):
+    def _get_backendopt(self, backendopt):
+        if backendopt is None:
+            backendopt = getattr(self, 'backendopt', True) # enable it by default
+        return backendopt
+    
+    def interpret(self, fn, args, annotation=None, backendopt=None, exctrans=False):
+        backendopt = self._get_backendopt(backendopt)
         f = self._compile(fn, args, annotation, backendopt=backendopt, exctrans=exctrans)
         res = f(*args)
         if isinstance(res, ExceptionWrapper):
             raise res
         return res
 
-    def interpret_raises(self, exception, fn, args, backendopt=True, exctrans=False):
+    def interpret_raises(self, exception, fn, args, backendopt=None, exctrans=False):
         import exceptions # needed by eval
+        backendopt = self._get_backendopt(backendopt)
         try:
             self.interpret(fn, args, backendopt=backendopt, exctrans=exctrans)
         except ExceptionWrapper, ex:

pypy/translator/cli/test/test_carbonpython.py

         assert res == 42
 
     def test_export_cliclass(self):
+        py.test.skip('it fails every other day on builbot, no clue why')
         from pypy.translator.cli.dotnet import CLR
         
         @export(CLR.System.Collections.ArrayList, int)

pypy/translator/cli/test/test_exception.py

 import py
 from pypy.translator.cli.test.runtest import CliTest
-from pypy.rpython.test.test_exception import BaseTestException
+from pypy.translator.oosupport.test_template.exception import BaseTestException
 
 class TestCliException(CliTest, BaseTestException):
     use_exception_transformer = False
+    backendopt = False
 
     def interpret(self, *args, **kwds):
         kwds['exctrans'] = self.use_exception_transformer
         return CliTest.interpret(self, *args, **kwds)
 
-    def test_nested_try(self):
-        def helper(x):
-            if x == 0:
-                raise ValueError
-        def dummy():
-            pass        
-        def fn(x):
-            try:
-                try:
-                    helper(x)
-                finally:
-                    dummy()
-            except ValueError, e:
-                 raise
-        
-        self.interpret_raises(ValueError, fn, [0])
-
-    def test_exception_not_last(self):
-        def helper(x):
-            if x == 0:
-                raise ValueError
-        def fn(x):
-            helper(x)
-            try:
-                helper(1)
-            finally:
-                return -1
-            return x
-        self.interpret_raises(ValueError, fn, [0])
-
     def test_raise_and_catch_other(self):
         pass
 
     def test_raise_prebuilt_and_catch_other(self):
         pass
 
-    def test_missing_return_block(self):
-        class Base:
-            def foo(self):
-                raise ValueError
-
-        class Derived(Base):
-            def foo(self):
-                return 42
-
-        def fn(x):
-            if x:
-                obj = Base()
-            else:
-                obj = Derived()
-            return obj.foo()
-        assert self.interpret(fn, [0]) == 42
-
-    def test_missing_handler(self):
-        def foo(x):
-            if x:
-                raise ValueError
-        
-        def fn(x):
-            try:
-                foo(x)
-            except ValueError:
-                raise
-            return 42
-        assert self.interpret(fn, [0], backendopt=False) == 42
-        self.interpret_raises(ValueError, fn, [1], backendopt=False)
-
 
 class TestCliExceptionTransformer(TestCliException):
     use_exception_transformer = True
+    backendopt = False

pypy/translator/cli/test/test_string.py

         def fn(i, j):
             return strings[i] < strings[j]
         assert self.interpret(fn, [0, 1], backendopt=False) == fn(0, 1)
+
+    def test_literal_length(self):
+        strings = ['aa', 'a\x01', 'a\x00']
+        def fn():
+            for s in strings:
+                assert len(s) == 2
+        self.interpret(fn, [], backendopt=False)