Bommels05/Mozilla
Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

call GetDiffFileList as a normal function, and use cvs -q

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@236769 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
rhelmer%mozilla.com 2007-09-27 17:17:27 +00:00
parent 08a053e6d3
commit 89f40114d2
4 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mozilla/tools/release/Bootstrap/Step/Tag.pm
View File

@ -8,7 +8,7 @@ use File::Copy qw(move);
use POSIX qw(strftime);
use MozBuild::Util qw(MkdirWithPath RunShellCommand);
use Bootstrap::Util qw(CvsCatfile GetDiffFileList);
use Bootstrap::Util qw(CvsCatfile);
use Bootstrap::Step;
use Bootstrap::Step::Tag::Bump;

10
mozilla/tools/release/Bootstrap/Step/Tag/Mozilla.pm
View File

@ -7,6 +7,7 @@ use File::Copy qw(move);
use File::Spec::Functions;
use MozBuild::Util qw(MkdirWithPath);
use Bootstrap::Util qw(GetDiffFileList);
use Bootstrap::Config;
use Bootstrap::Step::Tag;
@ -47,11 +48,10 @@ sub Execute {
if ($rc > 1) {
my $previousRcTag = $productTag . '_RC' . ($rc - 1);
my $diffFileList = $this->GetDiffFileList(cvsDir =>
catfile($cvsrootTagDir,
'mozilla'),
prevTag => $previousRcTag,
newTag => $rcTag);
my $diffFileList = GetDiffFileList(cvsDir => catfile($cvsrootTagDir,
'mozilla'),
prevTag => $previousRcTag,
newTag => $rcTag);
if (scalar(@{$diffFileList}) > 0) {
$this->CvsTag(

10
mozilla/tools/release/Bootstrap/Step/Tag/l10n.pm
View File

@ -12,7 +12,7 @@ use MozBuild::Util qw(MkdirWithPath);
use Bootstrap::Step;
use Bootstrap::Config;
use Bootstrap::Step::Tag;
use Bootstrap::Util qw(CvsCatfile);
use Bootstrap::Util qw(CvsCatfile GetDiffFileList);
use strict;
@ -119,10 +119,10 @@ sub Execute {
# If we're retagging rc(N > 1), we need to tag -F
if ($rc > 1) {
my $previousRcTag = $productTag . '_RC' . ($rc - 1);
my $diffFileList = $this->GetDiffFileList(cvsDir => catfile($l10nTagDir,
'l10n'),
prevTag => $previousRcTag,
newTag => $rcTag);
my $diffFileList = GetDiffFileList(cvsDir => catfile($l10nTagDir,
'l10n'),
prevTag => $previousRcTag,
newTag => $rcTag);
if (scalar(@{$diffFileList}) > 0) {
$releaseTagArgs{'force'} = 1;

2
mozilla/tools/release/Bootstrap/Util.pm
View File

@ -237,7 +237,7 @@ sub GetDiffFileList {
my $newTag = $args{'newTag'};
my $rv = RunShellCommand(command => 'cvs',
args => ['diff', '-uN',
args => ['-q', 'diff', '-uN',
'-r', $firstTag,
'-r', $newTag],
dir => $cvsDir,