Merge changes from topic 'pylint-pep8-cleanup'
* changes:
command.py: Cleaned up pylint/pep8 violations
project.py: Cleaned up pylint/pep8 violations
diff --git a/git_command.py b/git_command.py
index 63b7b6f..9f7d293 100644
--- a/git_command.py
+++ b/git_command.py
@@ -170,7 +170,7 @@
_setenv(env, 'GIT_CONFIG_PARAMETERS', s)
if 'GIT_ALLOW_PROTOCOL' not in env:
_setenv(env, 'GIT_ALLOW_PROTOCOL',
- 'file:git:http:https:ssh:persistent-http:persistent-https:sso')
+ 'file:git:http:https:ssh:persistent-http:persistent-https:sso:rpc')
if project:
if not cwd:
diff --git a/hooks/commit-msg b/hooks/commit-msg
index d8f009b..40ac237 100755
--- a/hooks/commit-msg
+++ b/hooks/commit-msg
@@ -1,6 +1,7 @@
#!/bin/sh
+# From Gerrit Code Review 2.12.1
#
-# Part of Gerrit Code Review (http://code.google.com/p/gerrit/)
+# Part of Gerrit Code Review (https://www.gerritcodereview.com/)
#
# Copyright (C) 2009 The Android Open Source Project
#
@@ -19,7 +20,7 @@
unset GREP_OPTIONS
-CHANGE_ID_AFTER="Bug|Issue"
+CHANGE_ID_AFTER="Bug|Issue|Test"
MSG="$1"
# Check for, and add if missing, a unique Change-Id
@@ -38,6 +39,12 @@
return
fi
+ # Do not add Change-Id to temp commits
+ if echo "$clean_message" | head -1 | grep -q '^\(fixup\|squash\)!'
+ then
+ return
+ fi
+
if test "false" = "`git config --bool --get gerrit.createChangeId`"
then
return
@@ -57,6 +64,10 @@
AWK=/usr/xpg4/bin/awk
fi
+ # Get core.commentChar from git config or use default symbol
+ commentChar=`git config --get core.commentChar`
+ commentChar=${commentChar:-#}
+
# How this works:
# - parse the commit message as (textLine+ blankLine*)*
# - assume textLine+ to be a footer until proven otherwise
@@ -75,8 +86,8 @@
blankLines = 0
}
- # Skip lines starting with "#" without any spaces before it.
- /^#/ { next }
+ # Skip lines starting with commentChar without any spaces before it.
+ /^'"$commentChar"'/ { next }
# Skip the line starting with the diff command and everything after it,
# up to the end of the file, assuming it is only patch data.
diff --git a/project.py b/project.py
index 6e8dcbe..e3c3bd5 100644
--- a/project.py
+++ b/project.py
@@ -496,7 +496,7 @@
# Exec, storing global context in the context dict. We catch exceptions
# and convert to a HookError w/ just the failing traceback.
- context = {}
+ context = {'__file__': self._script_fullpath}
try:
exec(compile(open(self._script_fullpath).read(),
self._script_fullpath, 'exec'), context)
