[Pkg-ocaml-maint-commits] r5916 - /trunk/tools/svn2git/glondu_svn2git.py

[glondu-guest at users.alioth.debian.org]

Author: glondu-guest
Date: Sat Aug  9 13:34:31 2008
New Revision: 5916

URL: http://svn.debian.org/wsvn/?sc=1&rev=5916
Log:
Remove a few warnings

Modified:
    trunk/tools/svn2git/glondu_svn2git.py

Modified: trunk/tools/svn2git/glondu_svn2git.py
URL: http://svn.debian.org/wsvn/trunk/tools/svn2git/glondu_svn2git.py?rev=5916&op=diff
==============================================================================
--- trunk/tools/svn2git/glondu_svn2git.py (original)
+++ trunk/tools/svn2git/glondu_svn2git.py Sat Aug  9 13:34:31 2008
@@ -55,6 +55,11 @@
 }
 
 
+# SVN revision touching several packages known to be harmless
+# (used to remove warnings)
+harmless_svn_revs = set((3052, 3055, 3158, 3216, 3577, 4560, 4565, 4753, 4997, 5001, 5637))
+
+
 def run_command(name, cmd):
     s, o = getstatusoutput(cmd)
     if s:
@@ -144,7 +149,8 @@
                 if working_dir:
                     if (file+"/").startswith(working_dir):
                         nb_files += 1
-                    else:
+                    elif self.rev not in harmless_svn_revs and \
+                            not (file.endswith(".tar.gz") or file.endswith(".tar.bz2")):
                         print "# unrecognized file (%s) %s (will probably be skipped)" % (action, file)
                 else:
                     m = svnwdir_re.match(file)
@@ -152,7 +158,7 @@
                         working_dir = m.group(1) + "/"
                         local_wdir = m.group(2) or m.group(3)
                         nb_files += 1
-                    else:
+                    elif self.rev not in harmless_svn_revs:
                         print "# cannot recognize working dir in (%s) %s" % (action, file)
                 if file.endswith(".tar.gz") or file.endswith(".tar.bz2"):
                     m = svntgz_re.match(file)
@@ -168,6 +174,7 @@
             print "git add -u"
         else:
             print "# unable to guess working directory for revision %s" % self.rev
+            nb_files = 0
         if nb_files:
             cmd = "git commit -m " + escape_for_shell(self.msg)
         else: