Rev 6579: Merge the fix landed on trunk instead of 2.5 in http://bazaar.launchpad.net/~vila/bzr/integration/

[Vincent Ladeuil]

At http://bazaar.launchpad.net/~vila/bzr/integration/

------------------------------------------------------------
revno: 6579 [merge]
revision-id: v.ladeuil+lp at free.fr-20130527095738-gxucs86mssyhgnke
parent: v.ladeuil+lp at free.fr-20130527091355-bulwqai7imn79cap
parent: pqm at pqm.ubuntu.com-20130527091931-66xb7te57wyzrukt
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: trunk
timestamp: Mon 2013-05-27 11:57:38 +0200
message:
  Merge the fix landed on trunk instead of 2.5
modified:
  bzrlib/cmdline.py              bzrlibcmdline.py-20100202043522-83yorxx3tcigi7ap-1
  bzrlib/tests/test_cmdline.py   bzrlibteststest_cmdl-20100202043522-83yorxx3tcigi7ap-2
  doc/en/release-notes/bzr-2.5.txt bzr2.5.txt-20110708125756-587p0hpw7oke4h05-1
-------------- next part --------------
=== modified file 'bzrlib/cmdline.py'
--- a/bzrlib/cmdline.py	2011-12-19 13:23:58 +0000
+++ b/bzrlib/cmdline.py	2013-05-25 17:12:43 +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'
--- a/bzrlib/tests/test_cmdline.py	2010-12-06 14:01:44 +0000
+++ b/bzrlib/tests/test_cmdline.py	2013-05-25 17:12:43 +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')],

=== modified file 'doc/en/release-notes/bzr-2.5.txt'
--- a/doc/en/release-notes/bzr-2.5.txt	2013-05-23 10:04:17 +0000
+++ b/doc/en/release-notes/bzr-2.5.txt	2013-05-27 09:19:31 +0000
@@ -35,6 +35,9 @@
 * ``bzr config`` properly handles aliases and references in the
   ``--directory`` parameter (Vincent Ladeuil, Wouter van Heyst, #947049)
 
+* Empty arguments in EDITOR are now properly preserved.
+  (Ross Lagerwall, #1089792)
+
 * Fix a traceback when trying to checkout a tree that also has an entry
   with file-id `TREE_ROOT` somewhere other than at the root directory.
   (John Arbash Meinel, #830947)