From 32ec176a3aa38a9b7890f2fa18031be91944b7e0 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Zden=C4=9Bk=20=C5=A0ustr?= Date: Tue, 7 Jun 2011 10:06:55 +0000 Subject: [PATCH] Backport improvements in ChangeLog construction --- org.glite.lb/etics-tag.pl | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/org.glite.lb/etics-tag.pl b/org.glite.lb/etics-tag.pl index 40b4b61..167180f 100755 --- a/org.glite.lb/etics-tag.pl +++ b/org.glite.lb/etics-tag.pl @@ -221,19 +221,21 @@ usage: $0 [-i maj|min|rev|age|none|] [-g] [-c > $tmpChangeLog");} - if ($increment eq "a") {system("echo \"- Module rebuilt\" >> $tmpChangeLog"); system("echo \"\" >> $tmpChangeLog");} - $ChangeLogRet=system("vim $tmpChangeLog"); + unless ($increment eq "n") {system("echo $major.$minor.$revision-$age >> $tmpChangeLog"); - printf("Modified ChangeLog ready, ret code: $ChangeLogRet\n"); + $editline=`cat $tmpChangeLog | wc -l`; + chomp($editline); - if (defined $opt_m) {$commit_message=$opt_m;} - else {$commit_message="Appended the description of changes regarding version $major.$minor.$revision-$age";} + if ($increment eq "a") {system("echo \"- Module rebuilt\" >> $tmpChangeLog"); system("echo \"\" >> $tmpChangeLog");} + else { system("cvs log -S -N -r" . "$current_tag" . ":: $module | egrep -v \"^locks:|^access list:|^keyword substitution:|^total revisions:|^branch:|^description:|^head:|^RCS file:|^date:|^---|^===|^revision \" >> $tmpChangeLog"); } - printf(EXEC "#Update and commit the ChangeLog\ncp $tmpChangeLog $module/project/ChangeLog\ncvs commit -m \"$commit_message\" $module/project/ChangeLog\n\n"); + $ChangeLogRet=system("vim +$editline -c \"norm z.\" $tmpChangeLog"); + } + printf("Modified ChangeLog ready, ret code: $ChangeLogRet\n"); - } + printf(EXEC "#Update the ChangeLog\ncp $tmpChangeLog $module/project/ChangeLog\n\n"); + } unless ($increment eq "n") { # ********************************** -- 1.8.2.3