Show More
@@ -223,9 +223,9 b' def runhooks(ui, repo, name, hooks, thro' | |||||
223 | if cmd is _fromuntrusted: |
|
223 | if cmd is _fromuntrusted: | |
224 | if throw: |
|
224 | if throw: | |
225 | raise error.HookAbort( |
|
225 | raise error.HookAbort( | |
226 | _('untrusted hook %s not executed') % name, |
|
226 | _('untrusted hook %s not executed') % hname, | |
227 | hint = _("see 'hg help config.trusted'")) |
|
227 | hint = _("see 'hg help config.trusted'")) | |
228 | ui.warn(_('warning: untrusted hook %s not executed\n') % name) |
|
228 | ui.warn(_('warning: untrusted hook %s not executed\n') % hname) | |
229 | r = 1 |
|
229 | r = 1 | |
230 | raised = False |
|
230 | raised = False | |
231 | elif callable(cmd): |
|
231 | elif callable(cmd): |
@@ -904,7 +904,7 b' Non-blocking hook' | |||||
904 | > txnclose.testing=echo txnclose hook called |
|
904 | > txnclose.testing=echo txnclose hook called | |
905 | > EOF |
|
905 | > EOF | |
906 | $ touch a && hg commit -Aqm a |
|
906 | $ touch a && hg commit -Aqm a | |
907 | warning: untrusted hook txnclose not executed |
|
907 | warning: untrusted hook txnclose.testing not executed | |
908 | $ hg log |
|
908 | $ hg log | |
909 | changeset: 0:3903775176ed |
|
909 | changeset: 0:3903775176ed | |
910 | tag: tip |
|
910 | tag: tip | |
@@ -923,7 +923,7 b' Non-blocking hook' | |||||
923 | $ touch b && hg commit -Aqm a |
|
923 | $ touch b && hg commit -Aqm a | |
924 | transaction abort! |
|
924 | transaction abort! | |
925 | rollback completed |
|
925 | rollback completed | |
926 | abort: untrusted hook pretxnclose not executed |
|
926 | abort: untrusted hook pretxnclose.testing not executed | |
927 | (see 'hg help config.trusted') |
|
927 | (see 'hg help config.trusted') | |
928 | [255] |
|
928 | [255] | |
929 | $ hg log |
|
929 | $ hg log |
General Comments 0
You need to be logged in to leave comments.
Login now