Merge lp:~garyvdm/tortoisebzr/bug641557-b into lp:~tortoisebzr-developers/tortoisebzr/trunk-2a

[Gary van der Merwe]

This removes the code to adjust the sys.executable/sys.argv[0]. This should rather be handled by qbzr subprocess launching.
This merge goes together with lp:~garyvdm/qbzr/bug641557-b , which adds code to handle running from tbzrcommand, and other scripts.

A test installer build with both these branches is available here:
 http://dl.dropbox.com/u/4494367/bzr-2.2.1%7Ec-setup.exe

[methane (songofacandy)]

I'm happy to remove this code.
BTW, qbzr works well without this fix?
Should I make new release today for bzr-2.2.1?

review: Approve

[Gary van der Merwe (garyvdm)]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On 21/09/2010 10:08, INADA Naoki wrote:
> Should I make new release today for bzr-2.2.1?

Yes please.

I'll also release qbzr 0.19.2

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.10 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iEYEARECAAYFAkyYaIMACgkQd/3EdwGKOh3wFACaAidempECoVMQdKDZmwnMRBmy
2x8AoMUfkpq5qMiHUaD42IndOyaekL5O
=naK/
-----END PGP SIGNATURE-----

[methane (songofacandy)]

I've merged this and find Bazaar Explorer doesn't works when it is launchded from TortoiseBZR.
I want to replace sys.executable and sys.argv[0] to bzr.exe when frozen or python.exe/bzr when not frozen.
Is it OK?

=== modified file 'scripts/tbzrcommand.py'
--- scripts/tbzrcommand.py	2010-09-20 06:23:49 +0000
+++ scripts/tbzrcommand.py	2010-09-21 07:21:04 +0000
@@ -294,39 +294,12 @@
         if getattr(opt, 'name', None) == 'ui-mode':
             kw['ui_mode'] = True
             break
-    # We need to hack up sys.argv for qbzr, so when it spawns a
-    # sub-process it does the right-thing.
-    old_argv = sys.argv[:]
-    old_exe = sys.executable
+    
     try:
-        # If we are frozen, qbzr assumes sys.argv[0] is bzr.exe
-        if getattr(sys, "frozen", None) is not None:
-            basedir = os.path.abspath(os.path.dirname(sys.argv[0]))
-            bzr_exe = os.path.join(basedir, "bzrw.exe")
-            if not os.path.isfile(bzr_exe):
-                bzr_exe = os.path.join(basedir, "bzr.exe")
-                if not os.path.isfile(bzr_exe):
-                    raise RuntimeError("Where is bzr.exe?")
-            argv0 = exe = bzr_exe
-        else:
-            # otherwise it is 'bzr' itself.
-            import bzrlib
-            # are we running directly from a bzr directory?
-            argv0 = os.path.join(bzrlib.__path__[0], "..", "bzr")
-            if not os.path.isfile(argv0):
-                # maybe from an installed bzr?
-                argv0 = os.path.join(sys.prefix, "scripts", "bzr")
-            if not os.path.isfile(argv0):
-                raise RuntimeError("Can't find a bzr to execute.")
-            exe = old_exe
-        sys.argv[0] = argv0
-        sys.executable = exe
         # finally get down to business...        
         instance = klass()
         invoker(instance, arg_name, filenames, directory, kw)
     finally:
-        sys.argv = old_argv
-        sys.executable = old_exe
         if need_refresh:
             refresh_cache(filenames, directory)