[PATCH] Add support for renaming multiple items at once, and for the destination to be a directory.

[Ryan Anderson <ryan@michonline.com>]

Signed-off-by: Ryan Anderson <ryan@michonline.com>

---

> *1* It strikes me that git rename *could* be friendlier by emulating
> how "mv" treats the paths parameters (current implementation insists
> two parameters $src and $dst).  What do you think, Ryan?

How does this look?

 Documentation/git-rename.txt |    1 +
 git-rename.perl              |   69 +++++++++++++++++++++++++++---------------
 2 files changed, 46 insertions(+), 24 deletions(-)

applies-to: 0146495a383d5af298e9c9ef33e1c5d506c63afc
172761431e16af8650f973fc16fae6e74935b422
diff --git a/Documentation/git-rename.txt b/Documentation/git-rename.txt
index 583cb03..17ca558 100644
--- a/Documentation/git-rename.txt
+++ b/Documentation/git-rename.txt
@@ -9,6 +9,7 @@ git-rename - Script used to rename a fil
 SYNOPSIS
 --------
 'git-rename' <source> <destination>
+'git-rename' <source> [source ... ] <destination directory>
 
 DESCRIPTION
 -----------
diff --git a/git-rename.perl b/git-rename.perl
index 3b1127b..51dec91 100755
--- a/git-rename.perl
+++ b/git-rename.perl
@@ -8,6 +8,9 @@
 
 use warnings;
 use strict;
+require 5.008;
+
+use File::Basename qw(basename);
 
 sub usage($);
 
@@ -19,40 +22,58 @@ unless ( -d $GIT_DIR && -d $GIT_DIR . "/
 	usage("Git repository not found.");
 }
 
-usage("") if scalar @ARGV != 2;
+usage("") if scalar @ARGV < 2;
 
-my ($src,$dst) = @ARGV;
+my $dst = pop @ARGV;
+my @src = @ARGV;
 
-unless (-f $src || -l $src || -d $src) {
-	usage("git rename: bad source '$src'");
+foreach my $src (@src) {
+	unless (-f $src || -l $src || -d $src) {
+		usage("git rename: bad source '$src'");
+	}
 }
 
-if (-e $dst) {
-	usage("git rename: destinations '$dst' already exists");
+if (-e $dst && !-d $dst) {
+	usage("git rename: destination '$dst' already exists");
 }
 
-my (@allfiles,@srcfiles,@dstfiles);
-
-$/ = "\0";
-open(F,"-|","git-ls-files","-z")
-	or die "Failed to open pipe from git-ls-files: " . $!;
+# Append a "/" if one doesn't exist on the end of $dst, and $dst is
+# a directory.
+$dst .= "/" if -d $dst && $dst !~ m#/$#;
+
+foreach my $src (@src) {
+	my (@allfiles,@srcfiles,@dstfiles);
+	my $actualdst = $dst;
+
+	$/ = "\0";
+	open(F,"-|","git-ls-files","-z")
+		or die "Failed to open pipe from git-ls-files: " . $!;
+
+	@allfiles = map { chomp; $_; } <F>;
+	close(F);
+
+	if (-d $src) {
+		# Remove a trailing / if any
+		$src =~ s#/$##;
+		my $tsrc = basename $src;
+		$actualdst = $dst . $tsrc;
+	}
+
+	my $safesrc = quotemeta($src);
+	@srcfiles = grep /^$safesrc/, @allfiles;
+	@dstfiles = @srcfiles;
+	s#^$safesrc(/|$)#$actualdst$1# for @dstfiles;
 
-@allfiles = map { chomp; $_; } <F>;
-close(F);
 
-my $safesrc = quotemeta($src);
-@srcfiles = grep /^$safesrc/, @allfiles;
-@dstfiles = @srcfiles;
-s#^$safesrc(/|$)#$dst$1# for @dstfiles;
+	rename($src,$actualdst)
+		or die "rename($src,$actualdst) failed: $!";
 
-rename($src,$dst)
-	or die "rename failed: $!";
+	my $rc = system("git-update-index","--add","--",@dstfiles);
+	die "git-update-index failed to add new name (related to $src and $dst) with code $?\n" if $rc;
 
-my $rc = system("git-update-index","--add","--",@dstfiles);
-die "git-update-index failed to add new name with code $?\n" if $rc;
-
-$rc = system("git-update-index","--remove","--",@srcfiles);
-die "git-update-index failed to remove old name with code $?\n" if $rc;
+	$rc = system("git-update-index","--remove","--",@srcfiles);
+	die "git-update-index failed to remove old name (related to $src) with code $?\n" if $rc;
+}
 
 
 sub usage($) {
---
0.99.9.GIT