[ELPA-diffs] ELPA branch, master, updated. 3d071d4d8be0c094dec0b2c16cb18956c0292b6f

[Stefan Monnier]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "ELPA".

The branch, master has been updated
       via  3d071d4d8be0c094dec0b2c16cb18956c0292b6f (commit)
      from  bab59120703102088bdcb56141430b5dc97788da (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 3d071d4d8be0c094dec0b2c16cb18956c0292b6f
Author: Stefan Monnier <address@hidden>
Date:   Thu Aug 22 14:55:58 2013 -0400

    * forward-diffs.py: Tweak for new Git format

diff --git a/admin/forward-diffs.py b/admin/forward-diffs.py
index 67c7d8a..b4372fb 100755
--- a/admin/forward-diffs.py
+++ b/admin/forward-diffs.py
@@ -1,7 +1,7 @@
 #!/usr/bin/python
 ### forward-diffs.py --- forward emacs-diffs mails to maintainers
 
-## Copyright (C) 2012 Free Software Foundation, Inc.
+## Copyright (C) 2012, 2013 Free Software Foundation, Inc.
 
 ## Author: Glenn Morris <address@hidden>
 
@@ -181,7 +181,7 @@ parser.add_option( "-s", dest="sender", default=None,
                    help="sender address for forwards")
 parser.add_option( "--create", dest="create", default=False,
                    action="store_true", help="create maintfile")
-parser.add_option( "--no-scan", dest="noscan", default=False,
+parser.add_option( "--no-scan", dest="noscan", default=True,
                    action="store_true",
                    help="don't scan for maintainers; implies --no-update")
 parser.add_option( "--no-update", dest="noupdate", default=False,
@@ -217,12 +217,6 @@ if not opts.create:
         parser.error('No sender specified')
 
 
-## Create the maintfile.
-if opts.create:
-    scan_dir( opts.packagedir, opts.maintfile )
-    sys.exit()
-
-
 try:
     lfile = open( opts.logfile, 'a' )
 except Exception as err:
@@ -236,6 +230,12 @@ except Exception as err:
     lfile.write('Error opening maintfile: %s\n' % str(err))
     sys.exit(1)
 
+## Create the maintfile.
+if opts.create:
+    scan_dir( opts.packagedir, opts.maintfile )
+    sys.exit()
+
+
 ## Each element is package/file: maint1, maint2, ...
 maints = {}
 
@@ -289,7 +289,14 @@ maints_seen = []
 
 for line in text.splitlines():
 
-    if re.match( 'modified:$', line ):
+    # Look for and process things that look like (Git):
+    #
+    # Summary of changes:
+    #  packages/vlf/vlf.el |    2 +-
+    #  1 files changed, 1 insertions(+), 1 deletions(-)
+
+    #BZR: if re.match( 'modified:$', line ):
+    if re.match( 'Summary of changes:$', line ):
         start = True
         continue
 
@@ -297,11 +304,17 @@ for line in text.splitlines():
 
     ## An empty line or a line with non-empty first character.
     if re.match( '( *$|[^ ])', line ): break
-
+    # Any line that doesn't match the diffstat format (Git).
+    if not re.match( ' [^ ]+ +\| ', line ):
+        lfile.write('Stop scanning at: %s\n' % line)
+        break
 
     if opts.prefix:
-        reg = re.match( '%s([^ ]+)' % opts.prefix, line.strip() )
-        if not reg: continue
+        #BZR: reg = re.match( '%s([^ ]+)' % opts.prefix, line.strip() )
+        reg = re.match( ' %s([^ ]+)' % opts.prefix, line )
+        if not reg:
+            lfile.write('Skip: %s\n' % line)
+            continue
         pfile = reg.group(1)
     else:
         pfile = line.strip()
@@ -326,7 +339,7 @@ for line in text.splitlines():
             lfile.write('Scanning file...\n')
             thismaint = []
             thisfile = os.path.join( opts.packagedir, pfile )
-            scan_file( thisfile, thismaint )
+            # scan_file( thisfile, thismaint )
 
             if thismaint:
                 maints[pfile] = thismaint

-----------------------------------------------------------------------

Summary of changes:
 admin/forward-diffs.py |   39 ++++++++++++++++++++++++++-------------
 1 files changed, 26 insertions(+), 13 deletions(-)


hooks/post-receive
-- 
ELPA