Skip to content

Commit

Permalink
git-p4: add p4-pre-submit exit text
Browse files Browse the repository at this point in the history
When the p4-pre-submit exits with a non-zero exit code, the application
will abort the process with no additional information presented to the
user. This can be confusing for new users as it may not be clear that
the p4-pre-submit action caused the error.

Add text to explain why the program aborted the submit action.

Signed-off-by: Ben Keene <seraphire@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
seraphire authored and gitster committed Feb 11, 2020
1 parent 9f59ca4 commit aa8b766
Showing 1 changed file with 9 additions and 1 deletion.
10 changes: 9 additions & 1 deletion git-p4.py
Expand Up @@ -2405,7 +2405,15 @@ def run(self, args):
sys.exit("number of commits (%d) must match number of shelved changelist (%d)" %
(len(commits), num_shelves))

if not run_git_hook("p4-pre-submit"):
try:
if not run_git_hook("p4-pre-submit"):
print("\nThe p4-pre-submit hook failed, aborting the submit.\n\nYou can skip " \
"this pre-submission check by adding\nthe command line option '--no-verify', " \
"however,\nthis will also skip the p4-changelist hook as well.")
sys.exit(1)
except Exception as e:
print("\nThe p4-pre-submit hook failed, aborting the submit.\n\nThe hook failed "\
"with the error '{0}'".format(e.message) )
sys.exit(1)

#
Expand Down

0 comments on commit aa8b766

Please sign in to comment.