From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 10 Sep 2008 20:56:20 +0000 (-0700)
Subject: Merge branch 'maint'
X-Git-Tag: v1.6.1-rc1~248
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/b281eea75f0ab68e3c9510323c73b78cd3e62814?ds=inline;hp=-c

Merge branch 'maint'

* maint:
Update draft release notes for 1.6.0.2
Use compatibility regex library for OSX/Darwin
git-svn: Fixes my() parameter list syntax error in pre-5.8 Perl
Git.pm: Use File::Temp->tempfile instead of ->new
t7501: always use test_cmp instead of diff

Conflicts:
Makefile
---

b281eea75f0ab68e3c9510323c73b78cd3e62814
diff --combined Makefile
index f4c31c8714,a8b3f9e3c5..cf320cd0b0
--- a/Makefile
+++ b/Makefile
@@@ -124,9 -124,6 +124,9 @@@ all:
  # Define USE_STDEV below if you want git to care about the underlying device
  # change being considered an inode change from the update-index perspective.
  #
 +# Define NO_ST_BLOCKS_IN_STRUCT_STAT if your platform does not have st_blocks
 +# field that counts the on-disk footprint in 512-byte blocks.
 +#
  # Define ASCIIDOC8 if you want to format documentation with AsciiDoc 8
  #
  # Define DOCBOOK_XSL_172 if you want to format man pages with DocBook XSL v1.72.
@@@ -296,7 -293,6 +296,7 @@@ PROGRAMS += git-pack-redundant$
  PROGRAMS += git-patch-id$X
  PROGRAMS += git-receive-pack$X
  PROGRAMS += git-send-pack$X
 +PROGRAMS += git-shell$X
  PROGRAMS += git-show-index$X
  PROGRAMS += git-unpack-file$X
  PROGRAMS += git-update-server-info$X
@@@ -358,8 -354,6 +358,8 @@@ LIB_H += git-compat-util.
  LIB_H += graph.h
  LIB_H += grep.h
  LIB_H += hash.h
 +LIB_H += help.h
 +LIB_H += levenshtein.h
  LIB_H += list-objects.h
  LIB_H += ll-merge.h
  LIB_H += log-tree.h
@@@ -436,7 -430,6 +436,7 @@@ LIB_OBJS += hash.
  LIB_OBJS += help.o
  LIB_OBJS += ident.o
  LIB_OBJS += interpolate.o
 +LIB_OBJS += levenshtein.o
  LIB_OBJS += list-objects.o
  LIB_OBJS += ll-merge.o
  LIB_OBJS += lockfile.o
@@@ -525,7 -518,6 +525,7 @@@ BUILTIN_OBJS += builtin-for-each-ref.
  BUILTIN_OBJS += builtin-fsck.o
  BUILTIN_OBJS += builtin-gc.o
  BUILTIN_OBJS += builtin-grep.o
 +BUILTIN_OBJS += builtin-help.o
  BUILTIN_OBJS += builtin-init-db.o
  BUILTIN_OBJS += builtin-log.o
  BUILTIN_OBJS += builtin-ls-files.o
@@@ -583,11 -575,9 +583,11 @@@ EXTLIBS 
  
  ifeq ($(uname_S),Linux)
  	NO_STRLCPY = YesPlease
 +	THREADED_DELTA_SEARCH = YesPlease
  endif
  ifeq ($(uname_S),GNU/kFreeBSD)
  	NO_STRLCPY = YesPlease
 +	THREADED_DELTA_SEARCH = YesPlease
  endif
  ifeq ($(uname_S),UnixWare)
  	CC = cc
@@@ -636,6 -626,8 +636,8 @@@ ifeq ($(uname_S),Darwin
  	endif
  	NO_STRLCPY = YesPlease
  	NO_MEMMEM = YesPlease
+ 	COMPAT_CFLAGS += -Icompat/regex
+ 	COMPAT_OBJS += compat/regex/regex.o
  endif
  ifeq ($(uname_S),SunOS)
  	NEEDS_SOCKET = YesPlease
@@@ -685,7 -677,6 +687,7 @@@ ifeq ($(uname_S),FreeBSD
  	BASIC_CFLAGS += -I/usr/local/include
  	BASIC_LDFLAGS += -L/usr/local/lib
  	DIR_HAS_BSD_GROUP_SEMANTICS = YesPlease
 +	THREADED_DELTA_SEARCH = YesPlease
  endif
  ifeq ($(uname_S),OpenBSD)
  	NO_STRCASESTR = YesPlease
@@@ -693,15 -684,14 +695,15 @@@
  	NEEDS_LIBICONV = YesPlease
  	BASIC_CFLAGS += -I/usr/local/include
  	BASIC_LDFLAGS += -L/usr/local/lib
 +	THREADED_DELTA_SEARCH = YesPlease
  endif
  ifeq ($(uname_S),NetBSD)
  	ifeq ($(shell expr "$(uname_R)" : '[01]\.'),2)
  		NEEDS_LIBICONV = YesPlease
  	endif
  	BASIC_CFLAGS += -I/usr/pkg/include
 -	BASIC_LDFLAGS += -L/usr/pkg/lib
 -	ALL_LDFLAGS += -Wl,-rpath,/usr/pkg/lib
 +	BASIC_LDFLAGS += -L/usr/pkg/lib $(CC_LD_DYNPATH)/usr/pkg/lib
 +	THREADED_DELTA_SEARCH = YesPlease
  endif
  ifeq ($(uname_S),AIX)
  	NO_STRCASESTR=YesPlease
@@@ -762,11 -752,10 +764,11 @@@ ifneq (,$(findstring MINGW,$(uname_S))
  	NO_SVN_TESTS = YesPlease
  	NO_PERL_MAKEMAKER = YesPlease
  	NO_POSIX_ONLY_PROGRAMS = YesPlease
 +	NO_ST_BLOCKS_IN_STRUCT_STAT = YesPlease
- 	COMPAT_CFLAGS += -D__USE_MINGW_ACCESS -DNOGDI -Icompat
+ 	COMPAT_CFLAGS += -D__USE_MINGW_ACCESS -DNOGDI -Icompat -Icompat/regex -Icompat/fnmatch
  	COMPAT_CFLAGS += -DSNPRINTF_SIZE_CORR=1
  	COMPAT_CFLAGS += -DSTRIP_EXTENSION=\".exe\"
- 	COMPAT_OBJS += compat/mingw.o compat/fnmatch.o compat/regex.o compat/winansi.o
+ 	COMPAT_OBJS += compat/mingw.o compat/fnmatch/fnmatch.o compat/regex/regex.o compat/winansi.o
  	EXTLIBS += -lws2_32
  	X = .exe
  	gitexecdir = ../libexec/git-core
@@@ -795,14 -784,12 +797,14 @@@ ifeq ($(uname_S),Darwin
  	endif
  endif
  
 -ifdef NO_R_TO_GCC_LINKER
 -	# Some gcc does not accept and pass -R to the linker to specify
 -	# the runtime dynamic library path.
 -	CC_LD_DYNPATH = -Wl,-rpath=
 -else
 -	CC_LD_DYNPATH = -R
 +ifndef CC_LD_DYNPATH
 +	ifdef NO_R_TO_GCC_LINKER
 +		# Some gcc does not accept and pass -R to the linker to specify
 +		# the runtime dynamic library path.
 +		CC_LD_DYNPATH = -Wl,-rpath,
 +	else
 +		CC_LD_DYNPATH = -R
 +	endif
  endif
  
  ifdef NO_CURL
@@@ -838,6 -825,7 +840,6 @@@ EXTLIBS += -l
  ifndef NO_POSIX_ONLY_PROGRAMS
  	PROGRAMS += git-daemon$X
  	PROGRAMS += git-imap-send$X
 -	PROGRAMS += git-shell$X
  endif
  ifndef NO_OPENSSL
  	OPENSSL_LIBSSL = -lssl
@@@ -878,9 -866,6 +880,9 @@@ endi
  ifdef NO_D_INO_IN_DIRENT
  	BASIC_CFLAGS += -DNO_D_INO_IN_DIRENT
  endif
 +ifdef NO_ST_BLOCKS_IN_STRUCT_STAT
 +	BASIC_CFLAGS += -DNO_ST_BLOCKS_IN_STRUCT_STAT
 +endif
  ifdef NO_C99_FORMAT
  	BASIC_CFLAGS += -DNO_C99_FORMAT
  endif
@@@ -1109,7 -1094,7 +1111,7 @@@ git$X: git.o $(BUILTIN_OBJS) $(GITLIBS
  	$(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ git.o \
  		$(BUILTIN_OBJS) $(ALL_LDFLAGS) $(LIBS)
  
 -help.o: help.c common-cmds.h GIT-CFLAGS
 +builtin-help.o: builtin-help.c common-cmds.h GIT-CFLAGS
  	$(QUIET_CC)$(CC) -o $*.o -c $(ALL_CFLAGS) \
  		'-DGIT_HTML_PATH="$(htmldir_SQ)"' \
  		'-DGIT_MAN_PATH="$(mandir_SQ)"' \
@@@ -1236,9 -1221,7 +1238,9 @@@ endi
  git-%$X: %.o $(GITLIBS)
  	$(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) $(LIBS)
  
 -git-imap-send$X: imap-send.o $(LIB_FILE)
 +git-imap-send$X: imap-send.o $(GITLIBS)
 +	$(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) \
 +		$(LIBS) $(OPENSSL_LINK) $(OPENSSL_LIBSSL)
  
  http.o http-walker.o http-push.o transport.o: http.h
  
@@@ -1368,7 -1351,7 +1370,7 @@@ install: al
  	$(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(bindir_SQ)'
  	$(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(gitexec_instdir_SQ)'
  	$(INSTALL) $(ALL_PROGRAMS) '$(DESTDIR_SQ)$(gitexec_instdir_SQ)'
 -	$(INSTALL) git$X git-upload-pack$X git-receive-pack$X git-upload-archive$X '$(DESTDIR_SQ)$(bindir_SQ)'
 +	$(INSTALL) git$X git-upload-pack$X git-receive-pack$X git-upload-archive$X git-shell$X '$(DESTDIR_SQ)$(bindir_SQ)'
  	$(MAKE) -C templates DESTDIR='$(DESTDIR_SQ)' install
  	$(MAKE) -C perl prefix='$(prefix_SQ)' DESTDIR='$(DESTDIR_SQ)' install
  ifndef NO_TCLTK
diff --combined git-svn.perl
index ecacf74c22,237895c236..88066c9a75
--- a/git-svn.perl
+++ b/git-svn.perl
@@@ -421,15 -421,15 +421,15 @@@ sub cmd_dcommit 
  	$head ||= 'HEAD';
  	my @refs;
  	my ($url, $rev, $uuid, $gs) = working_head_info($head, \@refs);
 +	unless ($gs) {
 +		die "Unable to determine upstream SVN information from ",
 +		    "$head history.\nPerhaps the repository is empty.";
 +	}
  	$url = defined $_commit_url ? $_commit_url : $gs->full_url;
  	my $last_rev = $_revision if defined $_revision;
  	if ($url) {
  		print "Committing to $url ...\n";
  	}
 -	unless ($gs) {
 -		die "Unable to determine upstream SVN information from ",
 -		    "$head history.\nPerhaps the repository is empty.";
 -	}
  	my ($linear_refs, $parents) = linearize_history($gs, \@refs);
  	if ($_no_rebase && scalar(@$linear_refs) > 1) {
  		warn "Attempting to commit more than one change while ",
@@@ -803,28 -803,8 +803,28 @@@ sub cmd_commit_diff 
  	}
  }
  
 +sub escape_uri_only {
 +	my ($uri) = @_;
 +	my @tmp;
 +	foreach (split m{/}, $uri) {
 +		s/([^\w.%+-]|%(?![a-fA-F0-9]{2}))/sprintf("%%%02X",ord($1))/eg;
 +		push @tmp, $_;
 +	}
 +	join('/', @tmp);
 +}
 +
 +sub escape_url {
 +	my ($url) = @_;
 +	if ($url =~ m#^([^:]+)://([^/]*)(.*)$#) {
 +		my ($scheme, $domain, $uri) = ($1, $2, escape_uri_only($3));
 +		$url = "$scheme://$domain$uri";
 +	}
 +	$url;
 +}
 +
  sub cmd_info {
  	my $path = canonicalize_path(defined($_[0]) ? $_[0] : ".");
 +	my $fullpath = canonicalize_path($cmd_dir_prefix . $path);
  	if (exists $_[1]) {
  		die "Too many arguments specified\n";
  	}
@@@ -832,8 -812,8 +832,8 @@@
  	my ($file_type, $diff_status) = find_file_type_and_diff_status($path);
  
  	if (!$file_type && !$diff_status) {
 -		print STDERR "$path:  (Not a versioned resource)\n\n";
 -		return;
 +		print STDERR "svn: '$path' is not under version control\n";
 +		exit 1;
  	}
  
  	my ($url, $rev, $uuid, $gs) = working_head_info('HEAD');
@@@ -845,21 -825,21 +845,21 @@@
  	# canonicalize_path() will return "" to make libsvn 1.5.x happy,
  	$path = "." if $path eq "";
  
 -	my $full_url = $url . ($path eq "." ? "" : "/$path");
 +	my $full_url = $url . ($fullpath eq "" ? "" : "/$fullpath");
  
  	if ($_url) {
 -		print $full_url, "\n";
 +		print escape_url($full_url), "\n";
  		return;
  	}
  
  	my $result = "Path: $path\n";
  	$result .= "Name: " . basename($path) . "\n" if $file_type ne "dir";
 -	$result .= "URL: " . $full_url . "\n";
 +	$result .= "URL: " . escape_url($full_url) . "\n";
  
  	eval {
  		my $repos_root = $gs->repos_root;
  		Git::SVN::remove_username($repos_root);
 -		$result .= "Repository Root: $repos_root\n";
 +		$result .= "Repository Root: " . escape_url($repos_root) . "\n";
  	};
  	if ($@) {
  		$result .= "Repository Root: (offline)\n";
@@@ -881,7 -861,7 +881,7 @@@
  	}
  
  	my ($lc_author, $lc_rev, $lc_date_utc);
 -	my @args = Git::SVN::Log::git_svn_log_cmd($rev, $rev, "--", $path);
 +	my @args = Git::SVN::Log::git_svn_log_cmd($rev, $rev, "--", $fullpath);
  	my $log = command_output_pipe(@args);
  	my $esc_color = qr/(?:\033\[(?:(?:\d+;)*\d*)?m)*/;
  	while (<$log>) {
@@@ -3304,7 -3284,7 +3304,7 @@@ sub close_file 
  					my $out = syswrite($tmp_fh, $str, $res);
  					defined($out) && $out == $res
  						or croak("write ",
- 							$tmp_fh->filename,
+ 							Git::temp_path($tmp_fh),
  							": $!\n");
  				}
  				defined $res or croak $!;
@@@ -3315,7 -3295,7 +3315,7 @@@
  		}
  
  		$hash = $::_repository->hash_and_insert_object(
- 				$fh->filename);
+ 				Git::temp_path($fh));
  		$hash =~ /^[a-f\d]{40}$/ or die "not a sha1: $hash\n";
  
  		Git::temp_release($fb->{base}, 1);
@@@ -3400,12 -3380,11 +3400,12 @@@ sub generate_diff 
  	while (<$diff_fh>) {
  		chomp $_; # this gets rid of the trailing "\0"
  		if ($state eq 'meta' && /^:(\d{6})\s(\d{6})\s
 -					$::sha1\s($::sha1)\s
 +					($::sha1)\s($::sha1)\s
  					([MTCRAD])\d*$/xo) {
  			push @mods, {	mode_a => $1, mode_b => $2,
 -					sha1_b => $3, chg => $4 };
 -			if ($4 =~ /^(?:C|R)$/) {
 +					sha1_a => $3, sha1_b => $4,
 +					chg => $5 };
 +			if ($5 =~ /^(?:C|R)$/) {
  				$state = 'file_a';
  			} else {
  				$state = 'file_b';
@@@ -3657,7 -3636,6 +3657,7 @@@ sub R 
  	my $fbat = $self->add_file($self->repo_path($m->{file_b}), $pbat,
  				$self->url_path($m->{file_a}), $self->{r});
  	print "\tR\t$m->{file_a} => $m->{file_b}\n" unless $::_q;
 +	$self->apply_autoprops($file, $fbat);
  	$self->chg_file($fbat, $m);
  	$self->close_file($fbat,undef,$self->{pool});
  
@@@ -3684,52 -3662,33 +3684,52 @@@ sub change_file_prop 
  	$self->SUPER::change_file_prop($fbat, $pname, $pval, $self->{pool});
  }
  
 -sub chg_file {
 -	my ($self, $fbat, $m) = @_;
 -	if ($m->{mode_b} =~ /755$/ && $m->{mode_a} !~ /755$/) {
 -		$self->change_file_prop($fbat,'svn:executable','*');
 -	} elsif ($m->{mode_b} !~ /755$/ && $m->{mode_a} =~ /755$/) {
 -		$self->change_file_prop($fbat,'svn:executable',undef);
 -	}
 -	my $fh = Git::temp_acquire('git_blob');
 -	if ($m->{mode_b} =~ /^120/) {
 +sub _chg_file_get_blob ($$$$) {
 +	my ($self, $fbat, $m, $which) = @_;
 +	my $fh = Git::temp_acquire("git_blob_$which");
 +	if ($m->{"mode_$which"} =~ /^120/) {
  		print $fh 'link ' or croak $!;
  		$self->change_file_prop($fbat,'svn:special','*');
 -	} elsif ($m->{mode_a} =~ /^120/ && $m->{mode_b} !~ /^120/) {
 +	} elsif ($m->{mode_a} =~ /^120/ && $m->{"mode_$which"} !~ /^120/) {
  		$self->change_file_prop($fbat,'svn:special',undef);
  	}
 -	my $size = $::_repository->cat_blob($m->{sha1_b}, $fh);
 -	croak "Failed to read object $m->{sha1_b}" if ($size < 0);
 +	my $blob = $m->{"sha1_$which"};
 +	return ($fh,) if ($blob =~ /^0{40}$/);
 +	my $size = $::_repository->cat_blob($blob, $fh);
 +	croak "Failed to read object $blob" if ($size < 0);
  	$fh->flush == 0 or croak $!;
  	seek $fh, 0, 0 or croak $!;
  
  	my $exp = ::md5sum($fh);
  	seek $fh, 0, 0 or croak $!;
 +	return ($fh, $exp);
 +}
  
 +sub chg_file {
 +	my ($self, $fbat, $m) = @_;
 +	if ($m->{mode_b} =~ /755$/ && $m->{mode_a} !~ /755$/) {
 +		$self->change_file_prop($fbat,'svn:executable','*');
 +	} elsif ($m->{mode_b} !~ /755$/ && $m->{mode_a} =~ /755$/) {
 +		$self->change_file_prop($fbat,'svn:executable',undef);
 +	}
 +	my ($fh_a, $exp_a) = _chg_file_get_blob $self, $fbat, $m, 'a';
 +	my ($fh_b, $exp_b) = _chg_file_get_blob $self, $fbat, $m, 'b';
  	my $pool = SVN::Pool->new;
 -	my $atd = $self->apply_textdelta($fbat, undef, $pool);
 -	my $got = SVN::TxDelta::send_stream($fh, @$atd, $pool);
 -	die "Checksum mismatch\nexpected: $exp\ngot: $got\n" if ($got ne $exp);
 -	Git::temp_release($fh, 1);
 +	my $atd = $self->apply_textdelta($fbat, $exp_a, $pool);
 +	if (-s $fh_a) {
 +		my $txstream = SVN::TxDelta::new ($fh_a, $fh_b, $pool);
 +		my $res = SVN::TxDelta::send_txstream($txstream, @$atd, $pool);
 +		if (defined $res) {
 +			die "Unexpected result from send_txstream: $res\n",
 +			    "(SVN::Core::VERSION: $SVN::Core::VERSION)\n";
 +		}
 +	} else {
 +		my $got = SVN::TxDelta::send_stream($fh_b, @$atd, $pool);
 +		die "Checksum mismatch\nexpected: $exp_b\ngot: $got\n"
 +		    if ($got ne $exp_b);
 +	}
 +	Git::temp_release($fh_b, 1);
 +	Git::temp_release($fh_a, 1);
  	$pool->clear;
  }
  
@@@ -4025,7 -3984,6 +4025,7 @@@ sub gs_do_switch 
  		}
  	}
  	$ra ||= $self;
 +	$url_b = escape_url($url_b);
  	my $reporter = $ra->do_switch($rev_b, '', 1, $url_b, $editor, $pool);
  	my @lock = $SVN::Core::VERSION ge '1.2.0' ? (undef) : ();
  	$reporter->set_path('', $rev_a, 0, @lock, $pool);
@@@ -4425,7 -4383,7 +4425,7 @@@ sub config_pager 
  
  sub run_pager {
  	return unless -t *STDOUT && defined $pager;
- 	pipe my $rfd, my $wfd or return;
+ 	pipe my ($rfd, $wfd) or return;
  	defined(my $pid = fork) or ::fatal "Can't fork: $!";
  	if (!$pid) {
  		open STDOUT, '>&', $wfd or