threads / patch / 21848

patchcvsserver: make the output of 'update' more compatible with cvs.

Subject: [PATCH] cvsserver: make the output of 'update' more compatible with cvs.

## tl;dr

8 messages between Dec 3, 2009 and Dec 31, 2009. Diffs are folded; open one to read it.

replies: 7people: 5as markdown or json

Sergei Organov· Dec 3, 2009, 20:12 UTC · lore
Native cvs update outputs the string "cvs update: Updating <DIR>" for
every directory it processes (to stderr). This is used, e.g., by emacs
pcl-cvs to split files by directory. This commit implements this
feature in cvsserver.
---
 git-cvsserver.perl |   12 ++++++++++++
 1 files changed, 12 insertions(+), 0 deletions(-)
Show changes to git-cvsserver.perl +12 −0
diff --git a/git-cvsserver.perl b/git-cvsserver.perl
index 6dc45f5..5994951 100755
--- a/git-cvsserver.perl
+++ b/git-cvsserver.perl
@@ -981,10 +981,22 @@ sub req_update
 
     #$log->debug("update state : " . Dumper($state));
 
+    my $last_dirname = "///";
+    
     # foreach file specified on the command line ...
     foreach my $filename ( @{$state->{args}} )
     {
         $filename = filecleanup($filename);
+        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";
+        }
 
         $log->debug("Processing file $filename");
 

-- 
1.6.6.rc0.67.g68b144.dirty
mmogilvi_git@miniinfo.net· Dec 5, 2009, 23:48 UTC · re: Sergei Organov · lore

Re: [PATCH] cvsserver: make the output of 'update' more compatible with cvs.

On Thu, Dec 03, 2009 at 11:12:47PM +0300, Sergei Organov wrote:
Show 19 quoted lines
>  
> +    my $last_dirname = "///";
> +    
>      # foreach file specified on the command line ...
>      foreach my $filename ( @{$state->{args}} )
>      {
>          $filename = filecleanup($filename);
> +        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";
> +        }
>  
>          $log->debug("Processing file $filename");

This should probably be conditional on the absense of the global "cvs -q update" and "cvs -Q update" options, in case other CVS clients depend on quiet operation when they specify those options.

-- Matthew Ogilvie [mmogilvi_git@miniinfo.net]

Sergei Organov· Dec 7, 2009, 08:27 UTC · re: mmogilvi_git@miniinfo.net · lore

Re: [PATCH] cvsserver: make the output of 'update' more compatible with cvs.

mmogilvi_git@miniinfo.net writes:
Show 25 quoted lines
> On Thu, Dec 03, 2009 at 11:12:47PM +0300, Sergei Organov wrote:
>>  
>> +    my $last_dirname = "///";
>> +    
>>      # foreach file specified on the command line ...
>>      foreach my $filename ( @{$state->{args}} )
>>      {
>>          $filename = filecleanup($filename);
>> +        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";
>> +        }
>>  
>>          $log->debug("Processing file $filename");
>
> This should probably be conditional on the absense of the
> global "cvs -q update" and "cvs -Q update" options, in case
> other CVS clients depend on quiet operation when they specify
> those options.
Good catch, thanks! I'll redo the patch.
-- Sergei.
Sergei Organov· Dec 7, 2009, 11:11 UTC · re: Sergei Organov · lore

[PATCH v2] cvsserver: make the output of 'update' more compatible with cvs.

Native cvs update outputs the string "cvs update: Updating <DIR>" for every directory it processes (to stderr) unless -q or -Q is given on comman-line. This is used, e.g., by emacs pcl-cvs to split files by directory. This commit implements this feature in cvsserver.

Signed-off-by: Sergei Organov <osv@javad.com>
---
 git-cvsserver.perl |   16 ++++++++++++++++
 1 files changed, 16 insertions(+), 0 deletions(-)
Show changes to git-cvsserver.perl +16 −0
diff --git a/git-cvsserver.perl b/git-cvsserver.perl
index 6dc45f5..f4c75bb 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} ) )
         {

-- 
1.6.6.rc0.67.gc0456.dirty
Junio C Hamano· Dec 31, 2009, 06:47 UTC · re: Nanako Shiraishi · lore

Re: [PATCH v2] cvsserver: make the output of 'update' more compatible with cvs.

Nanako Shiraishi <nanako3@lavabit.com> writes:
> Junio, could you tell us what happened to this thread?

Well, since I don't use cvsserver myself, but this v2 was done with improvements based on some review suggestions, I was waiting for a response or two from people who know better and care more about cvs server emulation than me, which unfortunately didn't happen.

Thanks for reminding; I can queue it to 'pu' or perhaps 'next' and see if anybody screams by getting hit by an unintended side effects.

Martin Langhoff· Dec 31, 2009, 15:20 UTC · re: Junio C Hamano · lore

Re: [PATCH v2] cvsserver: make the output of 'update' more compatible with cvs.

On Thu, Dec 31, 2009 at 7:47 AM, Junio C Hamano <gitster@pobox.com> wrote:
> Well, since I don't use cvsserver myself, but this v2 was done with
> improvements based on some review suggestions, I was waiting for a
> response or two from people who know better and care more about cvs server
> emulation than me, which unfortunately didn't happen.

Looks good to me -- good to get it into pu. While I continue to use git extensively, I don't use cvsserver anymore, nor work with people that do. Might have reason to revisit cvsserver in the near future though, to help Moodle transition to git.

That transition will bring a few top-posters and Eclipse lovers to the list. Looking past such details, they are fine people who may need a little bit of git-newbie help ;-)

happy new year,
m
-- 
 martin.langhoff@gmail.com
 martin@laptop.org -- School Server Architect
 - ask interesting questions
 - don't get distracted with shiny stuff  - working code first
 - http://wiki.laptop.org/go/User:Martinlanghoff
Junio C Hamano· Dec 31, 2009, 20:14 UTC · re: Martin Langhoff · lore

Re: [PATCH v2] cvsserver: make the output of 'update' more compatible with cvs.

Martin Langhoff <martin.langhoff@gmail.com> writes:
Show 16 quoted lines
> On Thu, Dec 31, 2009 at 7:47 AM, Junio C Hamano <gitster@pobox.com> wrote:
>> Well, since I don't use cvsserver myself, but this v2 was done with
>> improvements based on some review suggestions, I was waiting for a
>> response or two from people who know better and care more about cvs server
>> emulation than me, which unfortunately didn't happen.
>
> Looks good to me -- good to get it into pu. While I continue to use
> git extensively, I don't use cvsserver anymore, nor work with people
> that do. Might have reason to revisit cvsserver in the near future
> though, to help Moodle transition to git.
>
> That transition will bring a few top-posters and Eclipse lovers to the
> list. Looking past such details, they are fine people who may need a
> little bit of git-newbie help ;-)
>
> happy new year,
Happy new year to you, Nana and Sergei, but not yet in my timezone ;-)
Thanks; I'll forge/add your "Acked-by:" when I queue it.

← back to recent threads