Bug#489327: rmgdiff : Patch to allow rmgdiff to ignore Bzr/Git/SVN metadata files.

[Erik de Castro Lopo]

Package: mgdiff
Version: 1.0-29
Severity: wishlist
Tags: patch


Currently when using rmgdiff on directories with a .bzr/.git/.svn directory
results in mgdiff being popped up for all the files within those directories
which is a bit or a pain.

This patch makes rmgdiff ignore these directories.


-- System Information:
Debian Release: lenny/sid
  APT prefers testing
  APT policy: (500, 'testing')
Architecture: amd64 (x86_64)

Kernel: Linux 2.6.24-1-amd64 (SMP w/1 CPU core)
Locale: LANG=en_AU.UTF-8, LC_CTYPE=en_AU.UTF-8 (charmap=ANSI_X3.4-1968) 
(ignored: LC_ALL set to POSIX)
Shell: /bin/sh linked to /bin/bash

Versions of packages mgdiff depends on:
ii  debianutils                 2.28.4       Miscellaneous utilities specific t
ii  file                        4.24-2       Determines file type using "magic"
ii  lesstif2                    1:0.95.0-2.1 OSF/Motif 2.1 implementation relea
ii  libc6                       2.7-10       GNU C Library: Shared libraries
ii  libice6                     2:1.0.4-1    X11 Inter-Client Exchange library
ii  libsm6                      2:1.0.3-2    X11 Session Management library
ii  libx11-6                    2:1.1.4-2    X11 client-side library
ii  libxext6                    2:1.0.4-1    X11 miscellaneous extension librar
ii  libxt6                      1:1.0.5-3    X11 toolkit intrinsics library
ii  mawk                        1.3.3-11.1   a pattern scanning and text proces

mgdiff recommends no packages.

-- no debconf information

--- debian/rmgdiff.awk.orig     2008-07-05 10:02:03.000000000 +1000
+++ debian/rmgdiff.awk  2008-07-05 10:03:23.000000000 +1000
@@ -592,16 +592,16 @@
 
 
 
-# Find the files that differ.  Filter out the CVS entries.  Call mgdiff
+# Find the files that differ.  Filter out the VCS entries.  Call mgdiff
 # if the file is a text file.  If the file is a binary, save it for later.
 /^Files / {
   if( debug )
     print("Start Text and Binary files");
 
-  if( !use_cvs && $0 ~ /[ \/]CVS([ \/:]|$)/ )
+  if( !use_cvs && $0 ~ /[ \/](CVS|.bzr|.git|.svn)([ \/:]|$)/ )
     {
       if( debug )
-        print("Skipping CVS file.\n");
+        print("Skipping VCS file.\n");
       next;
     }
 
@@ -619,10 +619,10 @@
   if( debug )
     print("Start Binary files only");
 
-  if( !use_cvs && $0 ~ /[ \/]CVS([ \/:]|$)/ )
+  if( !use_cvs && $0 ~ /[ \/](CVS|.bzr|.git|.svn)([ \/:]|$)/ )
     {
       if( debug )
-        print("Skipping CVS file.\n");
+        print("Skipping VCS file.\n");
       next;
     }
 
@@ -634,15 +634,15 @@
 }
 
 # Find the files that are only in one of the directories.  Filter out
-# the CVS entries.  Sort into two arrays for later printing.
+# the VCS entries.  Sort into two arrays for later printing.
 /^Only in / {
   if( debug )
     print("Start Only in");
 
-  if( !use_cvs && $0 ~ /[ \/]CVS([ \/:]|$)/ )
+  if( !use_cvs && $0 ~ /[ \/](CVS|.bzr|.git|.svn)([ \/:]|$)/ )
     {
       if( debug )
-        print("Skipping CVS file.\n");
+        print("Skipping VCS file.\n");
       next;
     }