Merge tags for VCS'?

2008-02-09 Thread Frank Lichtenheld
While taking a look at #464837 (which is about source packages) I
noticed that checks for mercurial files are also missing for binary
packages. Before I add yet another tag I wanted to ask whether it
wouldn't be better to merge the tags for the different VCS', like so

Index: checks/files
===
--- checks/files(Revision 1197)
+++ checks/files(Arbeitskopie)
@@ -595,16 +595,11 @@
tag nfs-temporary-file-in-package, $file;
}
 
-   #  cvsignore files
-   if ($file =~ m/\.cvsignore$/) {
-   tag cvsignore-file-in-package, $file;
+   #  ignore files
+   if ($file =~ m/\.(cvs|git|hg)ignore$/) {
+   tag vcs-ignore-file-in-package, $file;
}
 
-   #  .gitignore files
-   if ($file =~ m/\.gitignore$/) {
-   tag gitignore-file-in-package, $file;
-   }
-
#  arch-inventory files
if ($file =~ m/\.arch-inventory$/) {
tag arch-inventory-file-in-package, $file;
@@ -737,21 +732,15 @@
sprintf(%04o != 0755, $operm);
}
if ($file =~ m,/CVS/?$,) {
-   tag package-contains-CVS-dir, $file;
+   tag package-contains-vcs-control-dir, $file;
}
-   if ($file =~ m,/\.svn/?$,) {
-   tag package-contains-svn-control-dir, $file;
+   if ($file =~ m,/\.(svn|bzr|git|hg)/?$,) {
+   tag package-contains-vcs-control-dir, $file;
}
-   if ($file =~ m,/\.bzr/?$,) {
-   tag package-contains-bzr-control-dir, $file;
-   }
if (($file =~ m,/\.arch-ids/?$,)
|| ($file =~ m,/\{arch\}/?$,)) {
-   tag package-contains-arch-control-dir, $file;
+   tag package-contains-vcs-control-dir, $file;
}
-   if ($file =~ m,/\.git/?$,) {
-   tag package-contains-git-control-dir, $file;
-   }
if ($file =~ m,/.xvpics/?$,) {
tag package-contains-xvpics-dir, $file;
}
Index: checks/files.desc
===
--- checks/files.desc   (Revision 1197)
+++ checks/files.desc   (Arbeitskopie)
@@ -568,54 +568,24 @@
  .
  A better solution might be using symlinks here.
 
-Tag: package-contains-CVS-dir
+Tag: package-contains-vcs-control-dir
 Type: warning
-Info: Package contains a CVS directory. It was most likely installed by
- accident, since transient CVS data usually doesn't belong in packages.
+Info: Package contains a control directory for a version control system.
+ It was most likely installed by accident, since version control directories
+ usually don't belong in packages.
 
-Tag: package-contains-svn-control-dir
-Type: warning
-Info: Package contains a .svn directory. It was most likely installed by
- accident, since Subversion version control directories usually don't belong
- in packages.
-
-Tag: package-contains-bzr-control-dir
-Type: warning
-Info: Package contains a .bzr directory. It was most likely installed by
- accident, since bazaar-ng version control directories usually don't belong
- in packages.
-
-Tag: package-contains-arch-control-dir
-Type: warning
-Info: Package contains a {arch} or .arch-ids directory. It was most likely
- installed by accident, since Arch version control directories usually don't
- belong in packages.
-
-Tag: package-contains-git-control-dir
-Type: warning
-Info: Package contains a .git directory.  It was most likely included by
- accident, since GIT version control directories usually don't belong in
- packages.
-
 Tag: package-contains-xvpics-dir
 Type: error
 Info: Package contains a .xvpics directory. It was most likely installed by
  accident, since thumbnails usually don't belong in packages.
 
-Tag: cvsignore-file-in-package
+Tag: vcs-ignore-file-in-package
 Type: warning
-Info: Package contains a .cvsignore file.  This file is used by the CVS
- revision control system to specify untracked files that it should ignore.
+Info: Package contains a .(cvs|git|hg)ignore file.  This file is used by
+ the revision control system to specify untracked files that it should ignore.
  This file is generally useless in an installed package and was probably
  installed by accident.
 
-Tag: gitignore-file-in-package
-Type: error
-Info: Package contains a .gitignore file. This file is used by the Git
- revision control system to specify untracked files that it should ignore.
- This file is generally useless in an installed package and was probably
- installed by accident.
-
 Tag: arch-inventory-file-in-package
 Type: warning
 Info: Package contains a '.arch-inventory' file.  It may have been

Opinions and comments welcome.

Gruesse,
-- 
Frank Lichtenheld [EMAIL PROTECTED]
www: http://www.djpig.de/


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]



Re: Merge tags for VCS'?

2008-02-09 Thread Russ Allbery
Frank Lichtenheld [EMAIL PROTECTED] writes:

 While taking a look at #464837 (which is about source packages) I
 noticed that checks for mercurial files are also missing for binary
 packages. Before I add yet another tag I wanted to ask whether it
 wouldn't be better to merge the tags for the different VCS', like so

Yeah, that looks good to me.  They're broken out for source packages since
they offer some useful advice in a few cases, but in binary packages the
text of all the tags is identical.

Actually, now that I look at it, the diff-contains-* tags could also be
merged (but the source-contains-* tags are a bit different).  May not be
worth the effort, though.

-- 
Russ Allbery ([EMAIL PROTECTED])   http://www.eyrie.org/~eagle/


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]