commit 71e4cea6deeccafbd3f4c16f2faa157a0a62750c
author Jonathan Nieder <jrn@google.com> Tue Aug 16 12:05:09 2016 -0700
committer Jonathan Nieder <jrn@google.com> Thu Aug 18 17:06:26 2016 -0700
tree b0e889845e7977ce1d7825d6da551b391e7151ba
parent c4c2b066d122d841258ab3efe9adc99a99dc76ea

RepoHook: do not list options twice during hash based approval

Instead of

  Do you want to allow this script to run (yes/yes-never-ask-again/NO)? (yes/always/NO)?

ask

  Do you want to allow this script to run (yes/always/NO)?

Change-Id: I5f5a2d0e88086a8d85e54fb8623a62d74a20956a
Signed-off-by: Jonathan Nieder <jrn@google.com>

project.py

diff --git a/project.py b/project.py
index 019f29d..46e06bf 100644
--- a/project.py
+++ b/project.py
@@ -522,13 +522,11 @@
     prompt = ('Repo %s run the script:\n'
               '  %s\n'
               '\n'
-              'Do you want to allow this script to run '
-              '(yes/yes-never-ask-again/NO)? ') % (self._GetMustVerb(),
-                                                   self._script_fullpath)
+              'Do you want to allow this script to run')
     return self._CheckForHookApprovalHelper(
         'approvedhash',
         self._GetHash(),
-        prompt,
+        prompt % (self._GetMustVerb(), self._script_fullpath),
         'Scripts have changed since %s was allowed.' % (self._hook_type,))
 
   def _ExecuteHook(self, **kwargs):