Description: Revert use of --no-tty when GPG signing commits.
Origin: commit, revision id: jelmer@samba.org-20120626230430-eka8zo5476h8k12s
Author: Jelmer Vernooij <jelmer@samba.org>
Bug: https://launchpad.net/bugs/1014570
Last-Update: 2012-06-26
Applied-Upstream: yes
X-Bzr-Revision-Id: jelmer@samba.org-20120626230430-eka8zo5476h8k12s

=== modified file 'bzrlib/gpg.py'
--- old/bzrlib/gpg.py	2012-02-27 20:16:25 +0000
+++ new/bzrlib/gpg.py	2012-06-26 23:04:30 +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, '--no-tty']
+                '-u', key]
 
     def sign(self, content):
         if isinstance(content, unicode):

=== modified file 'bzrlib/tests/test_gpg.py'
--- old/bzrlib/tests/test_gpg.py	2012-02-26 19:21:01 +0000
+++ new/bzrlib/tests/test_gpg.py	2012-06-26 23:04:30 +0000
@@ -51,7 +51,7 @@
         self.my_gpg = gpg.GPGStrategy(FakeConfig())
 
     def test_signing_command_line(self):
-        self.assertEqual(['false',  '--clearsign', '-u', 'amy@example.com', '--no-tty'],
+        self.assertEqual(['false',  '--clearsign', '-u', 'amy@example.com'],
                          self.my_gpg._command_line())
 
     def test_signing_command_line_from_default(self):
@@ -60,7 +60,7 @@
 email=Amy <amy@example.com>
 gpg_signing_key=default
 gpg_signing_command=false'''))
-        self.assertEqual(['false',  '--clearsign', '-u', 'amy@example.com', '--no-tty'],
+        self.assertEqual(['false',  '--clearsign', '-u', 'amy@example.com'],
                          my_gpg._command_line())
 
     def test_signing_command_line_from_email(self):
@@ -68,7 +68,7 @@
         my_gpg = gpg.GPGStrategy(FakeConfig('''
 email=Amy <amy@example.com>
 gpg_signing_command=false'''))
-        self.assertEqual(['false',  '--clearsign', '-u', 'amy@example.com', '--no-tty'],
+        self.assertEqual(['false',  '--clearsign', '-u', 'amy@example.com'],
                          my_gpg._command_line())
 
     def test_checks_return_code(self):

