Merge lp:~rosslagerwall/bzr/cmdline-empty-quotes into lp:bzr

[Ross Lagerwall]

This branch fixes up parsing of command lines like EDITOR='emacsclient -a "" -t' which are currently handled incorrectly.

[Richard Wilbur (richard-wilbur)]

Looks good. Is this written up as a bug? If so please add a reference to the bug number.
+1

review: Approve

[Ross Lagerwall (rosslagerwall)]

No, I didn't open a bug for it (I haven't searched for one though).

[Richard Wilbur (richard-wilbur)]

I looked for bugs with "empty string", "empty quotes" and didn't find this problem. Would you like to open a bug for it? I don't know your context in order to fill in the bug info.

[Ross Lagerwall (rosslagerwall)]

Ok, I wrote a bug and linked it to this branch.

[Vincent Ladeuil (vila)]

Landing with an added news entry on both 2.5 and trunk

=== modified file 'bzrlib/cmdline.py'
--- bzrlib/cmdline.py	2011-12-19 13:23:58 +0000
+++ bzrlib/cmdline.py	2012-12-10 14:57:21 +0000
@@ -72,6 +72,7 @@
         if next_char == u'\\':
             return _Backslash(self)
         elif next_char == self.quote_char:
+            context.token.append(u'')
             return self.exit_state
         else:
             context.token.append(next_char)

=== modified file 'bzrlib/tests/test_cmdline.py'
--- bzrlib/tests/test_cmdline.py	2010-12-06 14:01:44 +0000
+++ bzrlib/tests/test_cmdline.py	2012-12-10 14:57:21 +0000
@@ -66,6 +66,10 @@
         self.assertAsTokens([(True, '')], u'""')
         self.assertAsTokens([(False, u"''")], u"''")
         self.assertAsTokens([(True, '')], u"''", single_quotes_allowed=True)
+        self.assertAsTokens([(False, u'a'), (True, u''), (False, u'c')],
+                            u'a "" c')
+        self.assertAsTokens([(False, u'a'), (True, u''), (False, u'c')],
+                            u"a '' c", single_quotes_allowed=True)
 
     def test_unicode_chars(self):
         self.assertAsTokens([(False, u'f\xb5\xee'), (False, u'\u1234\u3456')],