Adding upstream version 1:2.11.upstream/1%2.11

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

3 files changed, 105 insertions, 0 deletions

diff --git a/extra/git-post-commit.sh b/extra/git-post-commit.sh
new file mode 100755
index 0000000..e74c294
--- /dev/null
+++ b/extra/git-post-commit.sh
@@ -0,0 +1,23 @@
+#!/bin/sh -e
+
+# Post-commit hook for triggering bash-completion Docker Hub test image
+# builds at https://hub.docker.com/r/vskytta/bash-completion/
+#
+# To enable: ln -s ../../extra/git-post-commit.sh .git/hooks/post-commit
+#
+# The bash-completion.docker-hub-trigger-url config option must be set to
+# the full Docker Hub build trigger URL to hit.
+
+url=$(git config bash-completion.docker-hub-trigger-url)
+
+test "$(git symbolic-ref --short HEAD 2>/dev/null)" = master
+
+git diff-tree -r --name-only --no-commit-id HEAD |
+    grep -qxE 'test/test-cmd-list\.txt'
+
+curl \
+    --silent --show-error \
+    --max-time 30 \
+    --header Content-Type:application/json \
+    --data '{"build":true}' \
+    $url >/dev/null
diff --git a/extra/git-pre-push.sh b/extra/git-pre-push.sh
new file mode 100755
index 0000000..52d990e
--- /dev/null
+++ b/extra/git-pre-push.sh
@@ -0,0 +1,44 @@
+#!/bin/sh -e
+
+# Pre-push hook for triggering bash-completion Docker Hub test image
+# builds at https://hub.docker.com/r/vskytta/bash-completion/
+#
+# To enable: ln -s ../../extra/git-pre-push.sh .git/hooks/pre-push
+#
+# The bash-completion.docker-hub-trigger-url config option must be set to
+# the full Docker Hub build trigger URL to hit.
+
+url=$(git config bash-completion.docker-hub-trigger-url) || exit 0
+
+branch=master
+files="test/test-cmd-list\.txt"
+
+trigger=false
+z40=0000000000000000000000000000000000000000
+
+while read local_ref local_sha remote_ref remote_sha; do
+    case $remote_ref in */$branch) ;; *) continue ;; esac
+    [ $local_sha != $z40 ] || continue # delete not handled (yet?)
+    if [ $remote_sha = $z40 ]; then
+        list_files="git ls-tree -r --name-only $local_sha"
+    else
+        list_files="git diff --name-only $remote_sha..$local_sha"
+    fi
+    ! $list_files | grep -qEx $files || {
+        trigger=true
+        break
+    }
+done
+
+if $trigger; then
+    cat <<EOF | at -M now
+        sleep 15
+        curl \
+             --silent --show-error \
+             --max-time 30 \
+             --header Content-Type:application/json \
+             --data '{"build":true}' \
+             $url 2>&1 \
+        | logger -e --tag bash-completion-pre-push
+EOF
+fi
diff --git a/extra/make-changelog.py b/extra/make-changelog.py
new file mode 100755
index 0000000..c66b704
--- /dev/null
+++ b/extra/make-changelog.py
@@ -0,0 +1,38 @@
+#!/usr/bin/python3
+
+import sys
+from collections import defaultdict
+from email.utils import formatdate
+from textwrap import wrap
+from typing import Dict, List
+
+import git
+
+repo = git.Repo(".")
+changelog = defaultdict(list)  # type: Dict[str, List[str]]
+
+if len(sys.argv) != 2:
+    print("Usage: %s SINCE-TAG" % __file__, file=sys.stderr)
+    sys.exit(2)
+
+for id in repo.iter_commits("%s..HEAD" % sys.argv[1]):
+    commit = repo.commit(id)
+    if not commit.summary.startswith("Merge pull request "):
+        changelog[commit.author.name].append(commit.summary)
+
+print("bash-completion (X.Y)")
+print("")
+
+for author in sorted(changelog.keys()):
+    print("  [ %s ]" % author)
+    for log in changelog[author]:
+        print(
+            "\n".join(
+                wrap(log, initial_indent="  * ", subsequent_indent="    ")
+            )
+        )
+    print("")
+
+print(
+    " -- Ville Skyttä <ville.skytta@iki.fi>  %s" % formatdate(localtime=True)
+)