[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/admin/revdiff
From: |
Juanma Barranquero |
Subject: |
[Emacs-diffs] Changes to emacs/admin/revdiff |
Date: |
Tue, 04 Feb 2003 09:23:41 -0500 |
Index: emacs/admin/revdiff
diff -c emacs/admin/revdiff:1.2 emacs/admin/revdiff:1.3
*** emacs/admin/revdiff:1.2 Wed Sep 5 04:02:18 2001
--- emacs/admin/revdiff Tue Feb 4 09:23:37 2003
***************
*** 21,31 ****
use File::Basename;
! if (@ARGV < 3)
{
print <<USAGE;
revdiff FILE OLD NEW
!
Get a diff of FILE between revisions OLD and NEW. Store the
diff in a file named FILE-OLD-NEW.diff.
--- 21,31 ----
use File::Basename;
! if (@ARGV < 3)
{
print <<USAGE;
revdiff FILE OLD NEW
!
Get a diff of FILE between revisions OLD and NEW. Store the
diff in a file named FILE-OLD-NEW.diff.
***************
*** 48,54 ****
$file = shift @ARGV;
$old = shift @ARGV;
! sub diffit
{
my ($old, $new) = @_;
print "cvs diff -r$old -r$new $file >$file-$old-$new.diff\n";
--- 48,54 ----
$file = shift @ARGV;
$old = shift @ARGV;
! sub diffit
{
my ($old, $new) = @_;
print "cvs diff -r$old -r$new $file >$file-$old-$new.diff\n";
***************
*** 64,72 ****
die "Can't find $entries" unless -f $entries;
open (IN, "<$entries") or die "Cannot open $entries";
my $rev;
! while ($line = <IN>)
{
! if ($line =~ m,/$base/([^/]+),)
{
$rev = $1;
break;
--- 64,72 ----
die "Can't find $entries" unless -f $entries;
open (IN, "<$entries") or die "Cannot open $entries";
my $rev;
! while ($line = <IN>)
{
! if ($line =~ m,/$base/([^/]+),)
{
$rev = $1;
break;
***************
*** 81,87 ****
{
$old = current_revision ($file);
}
! elsif ($old =~ /^-(\d+)$/)
{
my $offset = $1;
$old = current_revision ($file);
--- 81,87 ----
{
$old = current_revision ($file);
}
! elsif ($old =~ /^-(\d+)$/)
{
my $offset = $1;
$old = current_revision ($file);
***************
*** 90,104 ****
$old = sprintf ("%d.%d", $1, $minor);
}
! while (@ARGV)
{
my $new = shift @ARGV;
if ($new =~ /^[+]\d+$/)
{
my $n = $new;
! for ($i = 0; $i < $n; ++$i)
{
! unless ($old =~ /(.*)\.(\d+)$/)
{
die "Internal error";
}
--- 90,104 ----
$old = sprintf ("%d.%d", $1, $minor);
}
! while (@ARGV)
{
my $new = shift @ARGV;
if ($new =~ /^[+]\d+$/)
{
my $n = $new;
! for ($i = 0; $i < $n; ++$i)
{
! unless ($old =~ /(.*)\.(\d+)$/)
{
die "Internal error";
}
***************
*** 107,119 ****
diffit ($old, $new);
$old = $new;
}
! }
! elsif ($new =~ /^[-]\d+$/)
{
my $n = - $new;
! for ($i = 0; $i < $n; ++$i)
{
! unless ($old =~ /(.*)\.(\d+)$/)
{
die "Internal error";
}
--- 107,119 ----
diffit ($old, $new);
$old = $new;
}
! }
! elsif ($new =~ /^[-]\d+$/)
{
my $n = - $new;
! for ($i = 0; $i < $n; ++$i)
{
! unless ($old =~ /(.*)\.(\d+)$/)
{
die "Internal error";
}
***************
*** 123,129 ****
$old = $new;
}
}
! else
{
diffit ($old, $new);
$old = $new;
--- 123,129 ----
$old = $new;
}
}
! else
{
diffit ($old, $new);
$old = $new;
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] Changes to emacs/admin/revdiff,
Juanma Barranquero <=