Merge https://github.com/liujed/git-notifier

Tweaking this a bit and adding more options for specifying
configuration file via:

     - command line option "--config <path>"
     - environment variable GIT_NOTIFIER_CONFIG

Author: rsmmr

.gitignore

@@ -1,3 +1,4 @@
+.*.sw?
 test-repo.git
 *.tar.gz
 README.html

CHANGES

@@ -1,4 +1,25 @@
 
+0.6-22 | 2015-06-19 17:35:36 -0700
+
+  * Added a configuration option "gitbasedir" for specifying the base
+    directory in the file system that holds the git repository. (Jed
+    Liu)
+
+  * Support the following substitutions in user-specified
+    repositories: '%u' for username, '%h' for hostname, '%r' for repo
+    name. (Jed Liu)
+
+  * Ignore vim swap files. (Jed Liu)
+
+  * Abstracted the functionality for obtaining the repository name.
+    (Jed Liu)
+
+  * Added configuration file support. See the README for specifics.
+    (Jed Liu/Robin Sommer)
+
+  * Use email package to better ensure RFC-compliance, and to better
+    automate QP encoding of message bodies. (Jed Liu)
+
 0.6-11 | 2015-05-17 03:05:08 -0700
 
   * New option --update-only for github-notifier. This only updates

README.rst

@@ -3,7 +3,7 @@
 .. |date| date::
 
 .. Version number is filled in automatically.
-.. |version| replace:: 0.6-11
+.. |version| replace:: 0.6-22
 
 git-notifier
 ============
@@ -124,10 +124,30 @@ option below.
 Usage
 -----
 
-``git-notifier`` supports the options below. Alternatively to
-giving them on the command line, all of them can alse be set via
-``git config hooks.<option>``. For example, to set a recipient
-address, do ``git config hooks.mailinglist [email protected]``:
+``git-notifier`` supports the options below. Options can be either set
+on the command line, by editing a configuration file, or on a
+per-repository basis via ``git config hooks.<option>`` (this order
+also defines the priority when the same option appears multiple
+times). For example, to set a recipient address, do ``git config
+hooks.mailinglist [email protected]``:
+
+``git-notifier`` looks for a configuration file in three places, in
+this order:
+
+    * A configuration file can be specified on the command line
+      through ``--config <path>``.
+
+    * A configuration file can be specified by setting the environment
+      variable ``GIT_NOTIFIER_CONFIG`` to the path of the file.
+
+    * If neither of these is given, ``git-notifier`` looks for a file
+      ``git-notifier.conf`` in the same directory that the script itself
+      is located.
+
+The configuration file uses "INI-style", with an example coming with
+``git-notifier``.
+
+The options are:
 
     ``--allchanges <branches>``
         Lists branches for which *all* changes made to them should be
@@ -178,6 +198,10 @@ address, do ``git config hooks.mailinglist [email protected]``:
         option is compatible with some of other git notification
         scripts.
 
+    ``--gitbasedir"``
+        Specifies a base directory for the git repository. If not given,
+        the current directory is the default.
+
     ``--hostname <name>``
         Defines the hostname to use when building the repository
         path shown in the notification mails. Default is the

VERSION

@@ -1 +1 @@
-0.6-11
+0.6-22