Merge lp:~jls-boost/bzr/bug952132 into lp:bzr

[Scanferlato]

see comments in file win32utils.py, function get_unicode_argv()

[Jelmer Vernooij (jelmer)]

review: Abstain

[Martin Packman (gz)]

Sorry for the delay reviewing this. Basically I don't think the added code complication is worth it for a corner case like this. Instead we probably want to do less magic with the commandline in the first place.

I've pulled out your typo fixes and sent them for merging separately however:

<https://code.launchpad.net/~gz/bzr/2.5_jls-boost_typo_fix/+merge/117156>

review: Disapprove

Unmerged revisions

6512. By Scanferlato on 2012-03-18

Workaround for bug #952132
(two typos also included)

=== modified file 'bzrlib/win32utils.py'
--- bzrlib/win32utils.py	2011-12-21 14:17:33 +0000
+++ bzrlib/win32utils.py	2012-03-22 12:12:20 +0000
@@ -118,6 +118,11 @@
 REG_SZ = 1
 REG_EXPAND_SZ = 2
 
+# Pythonwin related
+PYTHONWIN_EXE_NAME = 'Pythonwin.exe'
+PYTHONWIN_ERROR_MSG = 'Pythonwin started with an incorrect number \
+of command line arguments.\nPlease see details in bug #952132.'
+
 
 def debug_memory_win32api(message='', short=True):
     """Use trace.note() to dump the running memory info."""
@@ -515,21 +520,21 @@
                                   default.
     :return: A list of unicode strings.
     """
-    # First, spit the command line
+    # First, split the command line
     s = cmdline.Splitter(command_line, single_quotes_allowed=single_quotes_allowed)
-    
-    # Bug #587868 Now make sure that the length of s agrees with sys.argv 
-    # we do this by simply counting the number of arguments in each. The counts should 
-    # agree no matter what encoding sys.argv is in (AFAIK) 
-    # len(arguments) < len(sys.argv) should be an impossibility since python gets 
+
+    # Bug #587868 Now make sure that the length of s agrees with sys.argv
+    # we do this by simply counting the number of arguments in each. The counts should
+    # agree no matter what encoding sys.argv is in (AFAIK)
+    # len(arguments) < len(sys.argv) should be an impossibility since python gets
     # args from the very same PEB as does GetCommandLineW
     arguments = list(s)
-    
+
     # Now shorten the command line we get from GetCommandLineW to match sys.argv
     if len(arguments) < len(argv):
         raise AssertionError("Split command line can't be shorter than argv")
     arguments = arguments[len(arguments) - len(argv):]
-    
+
     # Carry on to process globs (metachars) in the command line
     # expand globs if necessary
     # TODO: Use 'globbing' instead of 'glob.glob', this gives us stuff like
@@ -551,10 +556,29 @@
         command_line = GetCommandLineW()
         if command_line is None:
             raise ctypes.WinError()
+
+        from bzrlib import trace
+        trace.mutter('command_line: %s', command_line)
+
+        # determine whether bzr is running under Pythonwin
+        arg_list = command_line.split()
+        if len(arg_list) > 0:
+            if arg_list[0].find(PYTHONWIN_EXE_NAME) > 0:
+                # command_line has the arguments typed on the DOS shell:
+                #   Pythonwin.exe, bzr.py, arg1, arg2, ..., argN
+                # sys.argv gets arguments from the Run Script dialog box:
+                #   bzr.py, arg1, arg2, ... , argN
+                # Although bzr uses only the arguments from command_line,
+                # in both cases the effective number of arguments (N) must
+                # be the same. The total length of these lists differ by one,
+                # because command_line has an extra item (Pythonwin.exe).
+                if (len(arg_list) - 1) != len(sys.argv):
+                    raise AssertionError(PYTHONWIN_ERROR_MSG)
+
         # Skip the first argument, since we only care about parameters
         argv = _command_line_to_argv(command_line, sys.argv)[1:]
         return argv
-    
+
 
     def get_environ_unicode(key, default=None):
         """Get `key` from environment as unicode or `default` if unset

=== modified file 'doc/en/whats-new/whats-new-in-2.5.txt'
--- doc/en/whats-new/whats-new-in-2.5.txt	2012-03-09 16:48:55 +0000
+++ doc/en/whats-new/whats-new-in-2.5.txt	2012-03-22 12:12:20 +0000
@@ -2,7 +2,7 @@
 What's New in Bazaar 2.5?
 *************************
 
-Bazaar 2.5 bas been released on the 24th of February 2012 and marks the
+Bazaar 2.5 has been released on the 24th of February 2012 and marks the
 start of a new long-term-stable series. From here, we will only make bugfix
 releases on the 2.5 series (2.5.1, etc, and support it until April 2017),
 while 2.6 will become our new development series.