New option to skip updates that a remote already knows.

    ``--ignoreremotes``
        If given, ``git-notifier`` will not report any commits that
        are already known by any configured remote repository.

In addition, github-notifier now also updates all remotes when it runs.

Author: rsmmr

.update-changes.cfg

@@ -5,5 +5,5 @@ function new_version_hook
     version=$1
     replace_version_in_script git-notifier $version
     replace_version_in_script github-notifier $version
-    replace_version_in_rst README $version
+    replace_version_in_rst README.rst $version
 }

CHANGES

@@ -1,4 +1,16 @@
 
+0.5 | 2014-01-27 07:42:48 -0800
+
+  * New option to skip updates that a remote already knows.
+
+        ``--ignoreremotes``
+            If given, ``git-notifier`` will not report any commits tha
+            are already known by any configured remote repository.
+
+    In addition, github-notifier now also updates all remotes when it runs. (Robin Sommer)
+
+  * README updates. (Robin Sommer)
+
 0.42-4 | 2013-09-25 22:15:07 -0700
 
   * Updating README for github-notifier. (Robin Sommer)

README.rst

@@ -3,7 +3,7 @@
 .. |date| date::
 
 .. Version number is filled in automatically.
-.. |version| replace:: 0.42-4
+.. |version| replace:: 0.5
 
 git-notifier
 ============
@@ -89,8 +89,8 @@ mail will be send for that change.
 Download
 --------
 
-The current release is `git-notifier 0.42
-<http://www.icir.org/robin/git-notifier/git-notifier-0.42.tar.gz>`_
+The current release is `git-notifier 0.5
+<http://www.icir.org/robin/git-notifier/git-notifier-0.5.tar.gz>`_
 
 Not surprisingly, ``git-notifier`` is maintained in a git repository
 that you clone::
@@ -131,7 +131,6 @@ giving them on the command line, all of them can alse be set via
 address, do ``git config hooks.mailinglist [email protected]``:
 
     ``--allchanges <branches>``
-
         Lists branches for which *all* changes made to them should be
         mailed out as straight diffs to their previous state,
         independent of whether the corresponding commit has already
@@ -177,6 +176,10 @@ address, do ``git config hooks.mailinglist [email protected]``:
         path shown in the notification mails. Default is the
         canonical name of the system the script is running on.
 
+    ``--ignoreremotes``
+        If given, ``git-notifier`` will not report any commits that
+        are already known by any configured remote repository. 
+
     ``--link <url>``
         Specifies a URL that will be included into notification mails
         for locating a changeset online. The URL can contain a "%s"
@@ -268,10 +271,6 @@ address, do ``git config hooks.mailinglist [email protected]``:
 Monitoring GitHub
 -----------------
 
-.. note::
-
-    This is still experimental.
-
 The ``git-notifier`` distribution comes with a companion script,
 ``github-notifier``, that watches GitHub repositories for changes. The
 script maintains a local mirror of repositories you want to watch and
@@ -300,13 +299,10 @@ subsequent executions, the script will update the clone and spawn
 ``git-notifier`` to email out notifications. For now, the best way to
 automate this is to run ``github-notifier`` from ``cron``.
 
-.. note::
-
-    In the future we might add a daemon mode to ``github-notifier``
-    that keeps it running in the background, polling for updates
-    regularly. Potentially it could even be triggered by a `GitHub web
-    hook <https://help.github.com/articles/post-receive-hooks>`_
-
+Note: In the future we might add a daemon mode to ``github-notifier``
+that keeps it running in the background, polling for updates
+regularly. Potentially it could even be triggered by a `GitHub web
+hook <https://help.github.com/articles/post-receive-hooks>`_
 
 In the following we discuss more details of the configuration file.
 

VERSION

@@ -1 +1 @@
-0.42-4
+0.5

git-notifier

@@ -10,7 +10,7 @@ import sys
 import tempfile
 import time
 
-VERSION   = "0.42-4"  # Filled in automatically.
+VERSION   = "0.5"  # Filled in automatically.
 
 Name      = "git-notifier"
 CacheFile = ".%s.dat" % Name
@@ -47,6 +47,7 @@ Options = [
     ("users", True, None, "location of a user-to-email mapping file"),
     ("replyto", True, None, "email address for reply-to header"),
     ("mergediffs", True, set(), "branches for which complete merge diffs are to be included"),
+    ("ignoreremotes", False, False, "don't report commits that a remote already knows"),
     ]
 
 class State:
@@ -430,6 +431,14 @@ def commit(current, rev, force=False, subject_head=None):
         log("Flagged revision %s for notification, but already reported this time" % rev)
         return
 
+    if Config.ignoreremotes:
+        branches = [line.split()[-1] for line in git("branch -a --contains=%s" % rev)]
+
+        for b in branches:
+            if b.startswith("remotes/"):
+                log("Flagged revision %s for notification, but already known by remote" % rev)
+                return
+
     log("New revision %s" % rev)
     current.reported.add(rev)
 

github-notifier

@@ -11,7 +11,7 @@ import subprocess
 import sys
 import github
 
-VERSION   = "0.42-4"  # Filled in automatically.
+VERSION   = "0.5"  # Filled in automatically.
 
 Name       = "github-notifier"
 ConfigFile = "./%s.cfg" % Name
@@ -81,6 +81,7 @@ def gitUpdate(repo):
     runCommand("git --bare init --quiet")
     runCommand("git --bare fetch --quiet %s +refs/heads/*:refs/heads/*" % repo.url(True))
     runCommand("git --bare fetch --quiet %s +refs/tags/*:refs/tags/*" % repo.url(True))
+    runCommand("git remote update >/dev/null")
     popDirectory()
 
 def runNotifier(repo):