Merge lp:~markgrandi/bzr/gpg_devttynotfound_fix into lp:bzr/2.5

[Mark Grandi]

Pass --no-tty to gpg when running it from a subprocess in bzr

fixed problem with gpg complaining about not having a tty when using this with bazaar explorer on ubuntu

[Martin Pool (mbp)]

I think the patch is fine, based on the comments in the bug.

My only concern is whether this could cause cross-platform problems or environment-dependent problems for 2.5 with no more betas before final release. But, given that Mark says signing from the gui is broken on unix without it, perhaps it's better off merged

[tweak] There are some merge conflicts and it needs a news entry. Could you handle them, Mark?

review: Needs Fixing

[Mark Grandi (markgrandi)]

I added a news entry, I was trying to ask around on how to get the complete diff as I couldn't figure out what was conflicting from the diff that launchpad gives below, but someone on irc says it merges fine locally

<LarstiQ> mgrandi: merge already looks fine to me, so just add an entry to that file
<mgrandi> isn't the merge conflicted?
<mgrandi> thats what it says to me on launchpad
<LarstiQ> mgrandi: locally it was fine, that beats what launchpad says

so I pushed the update with the news entry.

[Wouter van Heyst (larstiq)]

I based that comment on the output of `bzr diff -r ancestor:../2.5`. When merging into 2.5 there is a little bit more going on, I will fix this up later today.

[Jelmer Vernooij (jelmer)]

This change in general seems fine, but it would indeed be nice to fix up that conflict. :)

review: Approve

[Martin Packman (gz)]

From earlier testing, this should be safe to land on the 2.5 branch. Thanks for working on this Mark, and feel free to poke either me (or Wouter, as he volunteered) if you want to have a go at sorting out the conflict yourself.

review: Approve

[Martin Packman (gz)]

sent to pqm by email

[Martin Packman (gz)]

Failed on PQM:

 ...
 File "/home/pqm/pqm-workdir/srv/2.5/bzrlib/gpg.py", line 193
     '-u', key '--no-tty']
                        ^
SyntaxError: invalid syntax

Wants a comma after key there.

review: Needs Fixing

[Mark Grandi (markgrandi)]

well that was embarassing, fixed, and i created and signed a commit so i believe it all compiles now.

[Martin Pool (mbp)]

sent to pqm by email

=== modified file 'bzrlib/gpg.py'
--- bzrlib/gpg.py	2011-12-19 13:23:58 +0000
+++ bzrlib/gpg.py	2012-02-27 20:20:37 +0000
@@ -190,7 +190,7 @@
             # use the user email address
             key = config.extract_email_address(self._config_stack.get('email'))
         return [self._config_stack.get('gpg_signing_command'), '--clearsign',
-                '-u', key]
+                '-u', key, '--no-tty']
 
     def sign(self, content):
         if isinstance(content, unicode):

=== modified file 'bzrlib/tests/test_gpg.py'
--- bzrlib/tests/test_gpg.py	2011-12-21 14:25:26 +0000
+++ bzrlib/tests/test_gpg.py	2012-02-27 20:20:37 +0000
@@ -51,7 +51,7 @@
         self.my_gpg = gpg.GPGStrategy(FakeConfig())
 
     def test_signing_command_line(self):
-        self.assertEqual(['false',  '--clearsign', '-u', '[e-mail]'],
+        self.assertEqual(['false',  '--clearsign', '-u', '[e-mail]', '--no-tty'],
                          self.my_gpg._command_line())
 
     def test_signing_command_line_from_default(self):
@@ -60,7 +60,7 @@
 email=Amy <[e-mail]>
 gpg_signing_key=default
 gpg_signing_command=false'''))
-        self.assertEqual(['false',  '--clearsign', '-u', '[e-mail]'],
+        self.assertEqual(['false',  '--clearsign', '-u', '[e-mail]', '--no-tty'],
                          my_gpg._command_line())
 
     def test_signing_command_line_from_email(self):
@@ -68,7 +68,7 @@
         my_gpg = gpg.GPGStrategy(FakeConfig('''
 email=Amy <[e-mail]>
 gpg_signing_command=false'''))
-        self.assertEqual(['false',  '--clearsign', '-u', '[e-mail]'],
+        self.assertEqual(['false',  '--clearsign', '-u', '[e-mail]', '--no-tty'],
                          my_gpg._command_line())
 
     def test_checks_return_code(self):

=== modified file 'doc/en/release-notes/bzr-2.5.txt'
--- doc/en/release-notes/bzr-2.5.txt	2012-02-24 12:15:02 +0000
+++ doc/en/release-notes/bzr-2.5.txt	2012-02-27 20:20:37 +0000
@@ -1072,6 +1072,9 @@
   operations that use it, like merge, can now create trees without a root.
   (Aaron Bentley)
 
+* Fixed problem with getting errors about failing to open /dev/tty when using
+  Bazaar Explorer to sign commits. (Mark Grandi, #847388)
+
 Documentation
 *************