view admin/revdiff @ 49919:249621b2dae5

Merge changes from CPerl-5.0. (toplevel): Require man. (condition-case): Don't autoload tmm-prompt (it's in loaddefs.el). (cperl-electric-backspace-untabify): New var. (cperl-electric-backspace): Use it. (cperl-vc-header-alist): Extract numeric version from the Id. (cperl-build-manpage): New fun. (cperl-menu): Use it. Add toggle-autohelp. (cperl-mode) <defun-prompt_regexp>: Understand prototypes. (cperl-electric-brace): Use `cperl-after-block-p' for detection. (cperl-electric-keyword): Make $if (etc: "$@%&*") non-electric. '(' after keyword would insert a doubled paren. (cperl-calculate-indent): Update syntaxification before checks. Fix wrong indent of blocks starting with POD. (cperl-find-pods-heres): If no end of HERE-doc found, mark to the end of buffer. This enables recognition of end of HERE-doc "as one types". Require "\n" after trailing tag of HERE-doc. \( made non-quoting outside of string/comment (gdj-contributed). Likewise for \$. Remove `here-doc-group' text property at start (makes this property reliable). Text property `first-format-line' ==> t. Do not recognize $opt_s and $opt::s as s///. (cperl-after-block-p): Optional arg pre-block to check for a pre-block Recognize `continue' blocks too. (cperl-after-expr-p): Update syntaxification before checks. Work after here-docs, formats, and PODs too (affects many electric constructs). (cperl-fix-line-spacing): Allow "_" in $vars of foreach etc. (cperl-perldoc): Use case-sensitive search.
author Stefan Monnier <monnier@iro.umontreal.ca>
date Sun, 23 Feb 2003 02:19:02 +0000
parents 23a1cea22d13
children 695cf19ef79e d7ddb3e565de
line wrap: on
line source

#! /usr/bin/perl

# Copyright (C) 2001 Free Software Foundation, Inc.
#
# This file is part of GNU Emacs.
#
# GNU Emacs is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2, or (at your option)
# any later version.
#
# GNU Emacs is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with GNU Emacs; see the file COPYING.  If not, write to the
# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
# Boston, MA 02111-1307, USA.

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.

If OLD is `-' use FILE's current revision for OLD.  If OLD is
`-<number>', use the Nth revision before the current one for OLD.

If NEW is +<number> or -<number>, build diffs between revisions OLD
and OLD +/- <number>.

Examples:

revdiff FILE - -1      get the latest change of FILE
revdiff FILE -1 +1     also gets the latest change of FILE
revdiff FILE 1.500 +2  get diffs 1.500-1.501 and 1.501-1.502.

USAGE
  exit 1;
}

$file = shift @ARGV;
$old  = shift @ARGV;

sub diffit
{
  my ($old, $new) = @_;
  print "cvs diff -r$old -r$new $file >$file-$old-$new.diff\n";
  system "cvs diff -r$old -r$new $file >$file-$old-$new.diff";
}

sub current_revision ($)
{
  my ($file) = @_;
  my $dir = dirname ($file);
  my $base = basename ($file);
  my $entries = "$dir/CVS/Entries";
  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;
	}
    }
  die "Cannot determine current revision of $file" unless $rev;
  close (IN);
  return $rev;
}

if ($old eq "-")
  {
    $old = current_revision ($file);
  }
elsif ($old =~ /^-(\d+)$/)
  {
    my $offset = $1;
    $old = current_revision ($file);
    die "Internal error" unless $old =~ /(.*)\.(\d+)$/;
    my $minor = $2 - $offset;
    $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";
	      }
	    my $j = $2 + 1;
	    $new = "$1.$j";
	    diffit ($old, $new);
	    $old = $new;
	  }
      }
    elsif ($new =~ /^[-]\d+$/)
      {
	my $n = - $new;
	for ($i = 0; $i < $n; ++$i)
	  {
	    unless ($old =~ /(.*)\.(\d+)$/)
	      {
		die "Internal error";
	      }
	    my $j = $2 - 1;
	    $new = "$1.$j";
	    diffit ($new, $old);
	    $old = $new;
	  }
      }
    else
      {
	diffit ($old, $new);
	$old = $new;
      }
  }

# Local Variables:
# mode: cperl
# End: