/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to tools/win32/run_script.py

  • Committer: Vincent Ladeuil
  • Date: 2009-01-23 21:06:48 UTC
  • mto: (3966.1.1 bzr.integration)
  • mto: This revision was merged to the branch mainline in revision 3967.
  • Revision ID: v.ladeuil+lp@free.fr-20090123210648-yfb39g22yyo83d3y
Slight refactoring and test fixing.

* bzrlib/tests/test_merge.py:
(TestMergerEntriesLCAOnDisk.test_modified_symlink): Passing now.

* bzrlib/merge.py:
(Merge3Merger._lca_multi_way): Fix doc reference.
(Merge3Merger.merge_contents.contents_conflict): Try to delay
this_pair evaulation to avoid unnecessary sha1 (impyling file read
from disk) calculation. Also slightly refactor to avoid repeated
file_id in trees calculations.

Show diffs side-by-side

added added

removed removed

Lines of Context:
tools/win32/run_script.py
 
1
# A utility that executes a script from our %PYTHON%\Scripts directory.
 
2
# Example usage:
 
3
# 'python run_script.py cog.py arg1 arg2'
 
4
# which will locate %PYTHON_HOME%/Scripts/cog.py and execute it with the args.
 
5
# This is only necessary for Windows, and only when the build process is
 
6
# executed via a cygwin/*nix based make utility, which doesn't honor the
 
7
# PATHEXT environment variable.
 
8
import sys
 
9
import os
 
10
 
 
11
if __name__ == '__main__':
 
12
    # clobber me, new sys.argv[0] is the script to run.
 
13
    del sys.argv[0]
 
14
    assert not os.path.isabs(sys.argv[0]), "If you know the FQ path, just use it!"
 
15
    sys.argv[0] = os.path.join(sys.prefix, "Scripts", sys.argv[0])
 
16
    execfile(sys.argv[0])