Mercurial > hg
view tests/test-rebase-parameters.out @ 11948:88d4911930bf
contrib/setup3k.py: added script to build hg with py3k
This patch implements a script that inherits most of its functionality from
hg's setup.py and adds support to calling 2to3 during invocation with python3.
The motivation of having this script around is twofold:
1) It enables py3k crazies to test mercurial in py3k and, hopefully, patch it
more easily, so it can improve the py3k support to eventually run there.
2) Being separated from the main setup.py eliminates the need to make hg's
setup.py even more cluttered, and enables "independent" development until
the port is done.
Some considerations about the structure of this patch:
Mercurial already overrides the behavior of build_py, this patch tweaks it a bit
more to add support to call 2to3 with a custom fixer* location for Mercurial.
There is also a need of having the core C modules built *before* the
translation process starts, otherwise 2to3 will think those are global modules.
* A fixer is a python module that transforms python 2.x code in python 3.x
code.
author | Renato Cunha <renatoc@gmail.com> |
---|---|
date | Tue, 03 Aug 2010 13:18:16 -0300 |
parents | f118029e534c |
children |
line wrap: on
line source
% These fail % Use continue and abort abort: cannot use both abort and continue % Use continue and collapse abort: cannot use collapse with continue or abort % Use continue/abort and dest/source abort: abort and continue do not allow specifying revisions % Use source and base abort: cannot specify both a revision and a base % Rebase with no arguments - from current nothing to rebase % Rebase with no arguments - from the current branch 0 files updated, 0 files merged, 1 files removed, 0 files unresolved nothing to rebase % ---------- % These work % Rebase with no arguments (from 3 onto 7) 3 files updated, 0 files merged, 2 files removed, 0 files unresolved saved backup bundle to % Try to rollback after a rebase (fail) no rollback information available % Rebase with base == '.' => same as no arguments (from 3 onto 7) 3 files updated, 0 files merged, 3 files removed, 0 files unresolved saved backup bundle to % Rebase with dest == default => same as no arguments (from 3 onto 7) 3 files updated, 0 files merged, 3 files removed, 0 files unresolved saved backup bundle to % Specify only source (from 4 onto 7) saved backup bundle to % Specify only dest (from 3 onto 6) 3 files updated, 0 files merged, 3 files removed, 0 files unresolved saved backup bundle to % Specify only base (from 3 onto 7) saved backup bundle to % Specify source and dest (from 4 onto 6) saved backup bundle to % Specify base and dest (from 3 onto 6) saved backup bundle to