Args parsing and few fixes.

diff --git a/rediff-patches.py b/rediff-patches.py
index 6b2f760adfdde7b52d23404e79c2724d1975a6d5..ae73c8e96564b5b1cf1e92c9291ffb9ab8e2e655 100755 (executable)
--- a/rediff-patches.py
+++ b/rediff-patches.py
@@ -5,9 +5,11 @@
 # TODO:
 # - handle rediff of last patch (need some way to terminate build just after that patch is applied)
 # - or maybe apply patches on our own instead of using rpmbuild for that
-# - argparse fro arguments
 # - cleanup
 
+import argparse
+import collections
+import logging
 import os
 import re
 import rpm
@@ -23,7 +25,9 @@ def unpack(spec, builddir, until_patch=None):
     if until_patch is not None:
         cmd += [ '--define', '%%patch%d exit; #' % until_patch ]
     cmd += [ spec ]
-    subprocess.check_call(cmd, stdout=sys.stderr, stderr=sys.stderr, timeout=600)
+    logging.debug("running %s" % repr(cmd))
+    subprocess.check_call(cmd, stdout=sys.stderr, stderr=sys.stderr,
+                          env={'LC_ALL': 'C.UTF-8'}, timeout=600)
 
 def diff(diffdir_org, diffdir, builddir, output):
     diffdir_org = os.path.basename(diffdir_org)
@@ -31,14 +35,34 @@ def diff(diffdir_org, diffdir, builddir, output):
 
     with open(output, 'wt') as f:
         cmd = [ 'diff', '-urNp', '-x', '*.orig', diffdir_org, diffdir ]
+        logging.debug("running %s" % repr(cmd))
         try:
-            subprocess.check_call(cmd, cwd=builddir, stdout=f, stderr=sys.stderr, timeout=600)
+            subprocess.check_call(cmd, cwd=builddir, stdout=f, stderr=sys.stderr,
+                                  env={'LC_ALL': 'C.UTF-8'}, timeout=600)
         except subprocess.CalledProcessError as err:
             if err.returncode != 1:
                 raise
+    logging.info("rediff generated as %s" % output)
+
 
 def main():
-    specfile = sys.argv[1]
+    parser = parser = argparse.ArgumentParser(description='rediff patches to avoid fuzzy hunks')
+    parser.add_argument('spec', type=str, help='spec file name')
+    parser.add_argument('-p', '--patches', type=str, help='comma separated list of patch numbers to rediff')
+    parser.add_argument('-v', '--verbose', help='increase output verbosity', action='store_true')
+    args = parser.parse_args()
+
+    logging.basicConfig(level=logging.INFO)
+    rpm.setVerbosity(rpm.RPMLOG_ERR)
+
+    if args.verbose:
+            logging.basicConfig(level=logging.DEBUG)
+            rpm.setVerbosity(rpm.RPMLOG_DEBUG)
+
+    if args.patches:
+        args.patches = [int(x) for x in args.patches.split(',')]
+
+    specfile = args.spec
 
     tempdir = tempfile.TemporaryDirectory(dir="/dev/shm")
     topdir = tempdir.name
@@ -54,7 +78,7 @@ def main():
         if flags & RPMBUILD_ISPATCH:
             patches[nr] = name
 
-    applied_patches = {}
+    applied_patches = collections.OrderedDict()
     re_patch = re.compile(r'^%patch(?P<patch_number>\d+)\w*(?P<patch_args>.*)')
     for line in r.parsed.split('\n'):
         m = re_patch.match(line)
@@ -67,13 +91,17 @@ def main():
     appsourcedir = rpm.expandMacro("%{_sourcedir}")
     appbuilddir = rpm.expandMacro("%{_builddir}/%{?buildsubdir}")
 
-    for (patch_nr, patch_name) in sorted(patches.items()):
-        if patch_nr not in applied_patches:
+    for patch_nr, patch_nr_next in zip(applied_patches.keys(), list(applied_patches.keys())[1:] + [None]):
+        if args.patches and patch_nr not in args.patches:
             continue
-        print("*** patch %d: %s" % (patch_nr, patch_name), file=sys.stderr)
+        if patch_nr_next is None:
+            logging.warning("can't rediff last patch, see TODO")
+            break
+        patch_name = patches[patch_nr]
+        logging.info("*** patch %d: %s" % (patch_nr, patch_name))
         unpack(specfile, builddir, patch_nr)
         os.rename(appbuilddir, appbuilddir + ".org")
-        unpack(specfile, builddir, patch_nr + 1)
+        unpack(specfile, builddir, patch_nr_next)
         diff(appbuilddir + ".org", appbuilddir, builddir, os.path.join(topdir, os.path.join(appsourcedir, patch_name + ".rediff")))
         shutil.rmtree(builddir)
     tempdir.cleanup()