aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-01-07 15:38:11 -0800
committerJunio C Hamano <gitster@pobox.com>2010-01-07 15:38:11 -0800
commitaec7de4bedc0021683f729d88e21c310e0722afd (patch)
treec4ee9c967ec7c8f954f284b59a27627476f2f02e
parent693f2b1792b76c56d595e795807dc872e598db10 (diff)
parent8e4c4e7dc322bf6a2cf468152ea71eff26ebc034 (diff)
downloadgit-aec7de4bedc0021683f729d88e21c310e0722afd.tar.gz
git-aec7de4bedc0021683f729d88e21c310e0722afd.tar.xz
Merge branch 'so/cvsserver-update'
* so/cvsserver-update: cvsserver: make the output of 'update' more compatible with cvs.
-rwxr-xr-xgit-cvsserver.perl16
1 files changed, 16 insertions, 0 deletions
diff --git a/git-cvsserver.perl b/git-cvsserver.perl
index 6dc45f5d4..15da2789e 100755
--- a/git-cvsserver.perl
+++ b/git-cvsserver.perl
@@ -981,6 +981,8 @@ sub req_update
#$log->debug("update state : " . Dumper($state));
+ my $last_dirname = "///";
+
# foreach file specified on the command line ...
foreach my $filename ( @{$state->{args}} )
{
@@ -988,6 +990,20 @@ sub req_update
$log->debug("Processing file $filename");
+ unless ( $state->{globaloptions}{-Q} || $state->{globaloptions}{-q} )
+ {
+ my $cur_dirname = dirname($filename);
+ if ( $cur_dirname ne $last_dirname )
+ {
+ $last_dirname = $cur_dirname;
+ if ( $cur_dirname eq "" )
+ {
+ $cur_dirname = ".";
+ }
+ print "E cvs update: Updating $cur_dirname\n";
+ }
+ }
+
# if we have a -C we should pretend we never saw modified stuff
if ( exists ( $state->{opt}{C} ) )
{