From: agriffis <agriffis@gentoo.org>
Date: Thu, 4 Nov 2004 00:17:22 +0000 (-0000)
Subject: Abort when there are unresolved files (files that aren't under revision control)... 
X-Git-Tag: gentoolkit-0.2.4.3~336
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=3a4b57fb71d24ee04649831054364f0394b20f73;p=gentoolkit.git

Abort when there are unresolved files (files that aren't under revision control), just like repoman.  Auto-add to cvs when a new ChangeLog is created.

svn path=/; revision=166
---

diff --git a/trunk/src/echangelog/ChangeLog b/trunk/src/echangelog/ChangeLog
index 8d64da2..b98080a 100644
--- a/trunk/src/echangelog/ChangeLog
+++ b/trunk/src/echangelog/ChangeLog
@@ -1,3 +1,8 @@
+03 Nov 2004 Aron Griffis <agriffis@gentoo.org>
+	* abort when there are unresolved files (files that aren't under
+	  revision control) just like repoman
+	* auto-add to cvs when a new ChangeLog is created
+
 15 Sep 2004 Aron Griffis <agriffis@gentoo.org>
 	* fix the wrapping to fit in 80 columns properly.  It was
 	  previously possible to get lines with 81 chars.  Thanks to
diff --git a/trunk/src/echangelog/README b/trunk/src/echangelog/README
index 7db8869..77a7930 100644
--- a/trunk/src/echangelog/README
+++ b/trunk/src/echangelog/README
@@ -1,20 +1,11 @@
-Package : echangelog
-Version : 0.2.0
-Author  : See AUTHORS
+Most of the documentation is contained in the man-page, which you can
+read directly (using GNU man) by doing
 
-MOTIVATION
+	man ./echangelog.1
 
-Update the ChangeLog for an ebuild. 
+To rebuild the man-page from pod source, do
 
-MECHANICS
+	pod2man --name=echangelog --center='Gentoolkit' \
+		echangelog.pod echangelog.1
 
-N/A
-
-IMPROVEMENTS
-
-- Should rewrite to Python, and use Portage directly to select candidate
-  ebuild catalogs.
-- Should check the well-formedness of the current ChangeLog.
-
-For improvements, send a mail to agriffis@gentoo.org or make out a bug at 
-bugs.gentoo.org.
+03 Nov 2004 agriffis
diff --git a/trunk/src/echangelog/echangelog b/trunk/src/echangelog/echangelog
index 9c37285..cbe6f36 100644
--- a/trunk/src/echangelog/echangelog
+++ b/trunk/src/echangelog/echangelog
@@ -21,6 +21,7 @@ $Text::Wrap::unexpand = 0;
 # Global variables
 my (@files) = ();
 my (@ebuilds) = ();
+my (@unknown) = ();
 my ($input, $editor, $entry, $user, $date, $text, $version, $year);
 my (%versions) = ();
 my (%actions) = ();
@@ -45,7 +46,9 @@ if (-f 'ChangeLog') {
         $text =~ s/<CATEGORY>/$category/;
         $text =~ s/<PACKAGE_NAME>/$package_name/;
         # Okay, now we have a starter ChangeLog to work with.
-        # The entry will be added just like with any other ChangeLog.
+        # The text will be added just like with any other ChangeLog below.  
+        # Add the new ChangeLog to cvs before continuing.
+        system("cvs add ChangeLog");
     } else {
         die "This should be run in a directory with ebuilds...\n";
     }
@@ -55,10 +58,19 @@ if (-f 'ChangeLog') {
 open C, 'cvs -n up 2>&1 |' or die "Can't run cvs -n up: $!\n";
 while (<C>) {
     /ChangeLog/ and next;
+    /^\? (\S+)/ and push @unknown, $1;
     /^([ARMC]) (\S+)/ or next;
     push @files, $2;
     ($actions{$2} = $1) =~ tr/ARMC/+-/d;
 }
+if (@unknown) {
+    print STDERR <<EOT;
+Cvs reports the following unknown files.  Please use "cvs add" before
+running echangelog, or remove the files in question.
+EOT
+    print STDERR "? ", join("\n ?", @unknown), "\n";
+    exit 1;
+}
 
 # Forget ebuilds that only have changed copyrights, unless that's all
 # the changed files we have