1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-24 20:13:22 +01:00

70 Commits

Author SHA1 Message Date
Andreas Fischer
f2f97dd5e0 [ticket/11513] Update all CLI calls to phpunit to use vendor/bin.
PHPBB3-11513
2013-05-09 19:21:40 +02:00
Oleg Pudeyev
aceca2566b [ticket/10767] Clarify what happens at the end of the hook.
If there are problems and fatal is true, print that the commit
is aborted.

If there are problems and fatal is false, print instructions
for fixing the commit.

PHPBB3-10767
2012-04-17 06:05:33 -04:00
Oleg Pudeyev
45b910f9b4 [ticket/10767] Use warning/error language as appropriate.
When commit-msg hook is fatal, label the message as an error.

When it is not fatal, label the message as a warning.

"Syntax error" is still always an error, not sure if this
should be changed.

PHPBB3-10767
2012-04-17 06:05:32 -04:00
Oleg Pudeyev
1ce8a1d7ee [ticket/10767] Default to non-fatal behavior.
PHPBB3-10767
2012-04-17 06:05:32 -04:00
Oleg Pudeyev
bdf21e45ca [ticket/10767] Revert unconditional unfatality in commit-msg hook.
Revert "[ticket/10093] Make commit-msg always not fatal by nuking all fatal logic."

This reverts commit 88cad5523e7cdac6826dd8581e27e22a65afda26.

PHPBB3-10093
PHPBB3-10767
2012-04-16 03:05:42 -04:00
Oleg Pudeyev
dc63db1860 [ticket/10760] Fix numbering in php fun facts.
PHPBB3-10760
2012-04-04 11:43:59 -04:00
Oleg Pudeyev
efdd1e623e [ticket/10760] Value must be quoted as it might be two words.
PHPBB3-10760
2012-04-04 11:41:14 -04:00
Oleg Pudeyev
6536a36208 [ticket/10760] PHP is great. This commit is the proof.
PHPBB3-10760
2012-04-04 00:27:06 -04:00
Oleg Pudeyev
f2967b6669 [ticket/10760] Catch both versions of parse error output in php.
PHPBB3-10760
2012-04-04 00:01:08 -04:00
Oleg Pudeyev
a0da2408e7 [ticket/10760] Account for display_errors=stderr in pre-commit hook.
With that php.ini value set errors are printed to stderr, therefore
by redirecting stderr to /dev/null we also throw out the errors.

Instead merge stderr into stdout.

PHPBB3-10760
2012-04-03 23:18:33 -04:00
Oleg Pudeyev
b803fc4351 [ticket/10760] Quote PHP_BIN when using it.
This should make a difference on windows where paths may include spaces.

PHPBB3-10760
2012-04-03 23:14:44 -04:00
Oleg Pudeyev
786fcbf212 [ticket/10760] Use echo -e only if echo understands -e.
/bin/echo on freebsd and dash's builtin echo do not understand -e,
therefore -e is printed with the other messages in such cases.

Test if echo understands -e, if not do not use it.

PHPBB3-10760
2012-04-03 23:06:50 -04:00
Oleg Pudeyev
57209a1e68 [ticket/10760] Use externally specified PHP_BIN if any.
We have a PHP_BIN variable but we always set it unconditionally,
therefore in order to use a different php binary one had to
modify the hook script.

Instead set PHP_BIN if it is not set.

Now one can set PHP_BIN in their environment to use a non-default
php binary.

PHPBB3-10760
2012-04-03 23:05:15 -04:00
Unknown
5e52734c24 [ticket/9916] Changing header in non-distributed files
PHPBB3-9916
2012-01-02 16:20:30 +00:00
Oleg Pudeyev
8e59699424 [ticket/10093] Use correct ANSI code for clearing color.
PHPBB3-10093
2011-12-03 16:43:13 -05:00
Oleg Pudeyev
88cad5523e [ticket/10093] Make commit-msg always not fatal by nuking all fatal logic.
PHPBB3-10093
2011-12-03 16:41:31 -05:00
Oleg Pudeyev
92cdf08d48 [ticket/10093] Use color in commit-msg hook warning/error messages.
By default color is used if the message is printed to a tty,
phpbb.hooks.commit-msg.color configuration setting can override this.

PHPBB3-10093
2011-11-26 18:06:38 -05:00
Oleg Pudeyev
6a3ee0996e [ticket/10093] Refactor complaining in commit-msg hook for color support.
PHPBB3-10093
2011-11-26 17:41:25 -05:00
Oleg Pudeyev
26d01d4408 [ticket/10093] Respect phpbb.hooks.commit-msg.fatal on syntax errors.
PHPBB3-10093
2011-11-26 17:35:35 -05:00
Oleg Pudeyev
0cb83f99ab [ticket/10093] Document phpbb.hooks.commit-msg.fatal setting.
PHPBB3-10093
2011-11-26 17:32:40 -05:00
Igor Wiedler
cd9355e4dd Merge remote branch 'igorw/ticket/9806' into develop-olympus
* igorw/ticket/9806:
  [ticket/9806] Script for merging pull requests
2011-03-20 22:31:14 +01:00
Andreas Fischer
4f1056ad72 Merge branch 'ticket/p/10092' into develop-olympus
* ticket/p/10092:
  [ticket/10092] Ignore overlength comment lines in commit-msg hook.
2011-03-14 13:58:19 +01:00
Igor Wiedler
1d2634f0ee [ticket/9806] Script for merging pull requests
PHPBB3-9806
2011-03-13 16:15:24 +01:00
Oleg Pudeyev
94e09ac041 [ticket/10078] Avoid \n in strings given to echo for portability.
Also preserve whitespace (including newlines) when printing the
lines that exceed 80 character limit.

PHPBB3-10078
2011-03-11 19:30:40 -05:00
Oleg Pudeyev
7cf134c73d [ticket/10092] Ignore overlength comment lines in commit-msg hook.
PHPBB3-10092
2011-03-11 19:26:07 -05:00
Oleg Pudeyev
e552287128 [ticket/9824] Accept commit messages with less than perfect headings.
Some commit messages exist only temporarily, because they are given
on commits that are intended to be squashed. Accept such commit
messages with a warning.

PHPBB3-9824
2011-03-01 20:59:04 -05:00
Oleg Pudeyev
d7a38fd7ef [ticket/9824] Allow empty lines after ticket reference.
PHPBB3-9824
2011-03-01 20:59:04 -05:00
Oleg Pudeyev
b90e01392c [ticket/9824] Use printf instead of echo to render \n.
On FreeBSD `echo "\n"` prints \n verbatim. Use printf instead.

PHPBB3-9824
2011-03-01 20:59:04 -05:00
Oleg Pudeyev
c489b189df [ticket/9824] Handle empty commit messages in commit-msg hook.
Git already handles the case of commit message being empty by
aborting the commit and displaying a reasonably helpful message.
If there is no commit message, the hook will exit with success
exit code to let git do its thing.

PHPBB3-9824
2011-03-01 20:59:04 -05:00
Andreas Fischer
9bed2b119c [ticket/9824] Add space after [ticket/12345] in prepared commit message.
PHPBB3-9824
2011-03-02 00:24:34 +01:00
Andreas Fischer
16a46e6a24 [ticket/9824] Remove space after PHPBB3-12345 in prepared commit message.
PHPBB3-9824
2011-03-02 00:04:45 +01:00
Oleg Pudeyev
5af3cfe9ca [ticket/10044] Updated invocation documentation.
PHPBB3-10044
2011-02-16 21:13:35 -05:00
Oleg Pudeyev
ed53cef0aa [ticket/10044] Stop when failed to retrieve network/collaborators.
PHPBB3-10044
2011-02-15 05:20:30 -05:00
Oleg Pudeyev
bf137b7005 [ticket/10044] Added -h to setup_github_network.php.
PHPBB3-10044
2011-02-15 05:20:30 -05:00
Oleg Pudeyev
30c46a6e0c [ticket/10044] Error handling for remote requests in setup_github_network.php
PHPBB3-10044
2011-02-15 05:20:30 -05:00
Oleg Pudeyev
0f3378ca28 [ticket/10044] Made setup_github_network.php runnable as a script
PHPBB3-10044
2011-02-15 04:45:54 -05:00
Andreas Fischer
50bdb5da89 [ticket/9805] Setup security repository for developers.
PHPBB3-9805
2011-02-03 11:12:48 +01:00
Andreas Fischer
67fe441f7e [ticket/9805] Move check lower down.
PHPBB3-9805
2011-02-03 11:12:48 +01:00
Andreas Fischer
e1ae8c6a71 [ticket/9805] Better support for already existing repositories.
PHPBB3-9805
2011-02-03 11:12:48 +01:00
Andreas Fischer
8eee36dc0f [ticket/9805] Add dry-run option.
PHPBB3-9805
2011-02-03 11:12:48 +01:00
Andreas Fischer
57bd0c74e5 [ticket/9805] Use getopt(), add a few options, extend show_usage().
PHPBB3-9805
2011-02-03 11:12:41 +01:00
Andreas Fischer
be3a0b269a [ticket/9805] Script for easily cloning a whole github network.
PHPBB3-9805
2011-01-15 16:53:34 +01:00
Igor Wiedler
2e891c5eba Merge branch 'task/cs278/git-tools' into develop-olympus
* task/cs278/git-tools:
  [task/git-tools] Change the GNU --lines argument to the POSIX -l
  [task/git-tools] Solve dependency on the GNU wc --max-line-length option
2010-09-09 00:20:38 +02:00
Chris Smith
e08e1e0d9a [task/git-tools] Change the GNU --lines argument to the POSIX -l
Changed to awk which handles the formatting differences between the
two versions of wc -- BSD version prefixes the output with spaces,
the GNU version does not.

PHPBB3-9808
2010-09-08 22:53:37 +01:00
Chris Smith
8ce2f63d73 [task/git-tools] Solve dependency on the GNU wc --max-line-length option
PHPBB3-9808
2010-09-07 23:35:47 +01:00
Oleg Pudeyev
90d8fc7e86 [ticket/9777] Print error message in pre-commit hook when php is not installed.
PHPBB3-9777
2010-08-19 17:44:54 +02:00
Chris Smith
e17ffa01e6 [task/git-tools] Ignore git commit message comments
Git commit message comments can be contained anywhere in the message and
this change ignores where they appear.

PHPBB3-9768
2010-08-10 14:48:46 +01:00
Chris Smith
a9046e5608 [task/git-tools] Adjust the hook to enforce that a ticket is always mentioned
PHPBB3-9768
2010-08-10 14:48:46 +01:00
Chris Smith
db13dc2d43 [task/git-tools] Vastly expanded commit-msg hook.
This updated hook supports validates each line of the commit message
confirms to the phpBB standards [1], there are two git config options
which adjust the behaviour of the hook. They are:

* phpbb.hooks.commit-msg.fatal: Set to false for the hook to allow
	commits with malformed structure, useful if you'll be squashing
	or editing the commits later. True is the default value.
* phpbb.hooks.commit-msg.debug: Any integer value greater than 0 will
	increase the debugging verbosity of the hook, the default value is 0.

[1] http://wiki.phpbb.com/display/DEV/Git

PHPBB3-9768
2010-08-10 14:48:46 +01:00
Chris Smith
66e58234ec [task/git-tools] Beginnings of a syntax checking hook.
Currently this hook checks line length is less than or equal to 80 characters.

PHPBB3-9768
2010-08-10 14:48:45 +01:00