# cvsserver bug 9 messages from 2007-04-11 to 2007-04-11. Participants: Daniel Barkalow, Frank Lichtenheld, Junio C Hamano, Martin Langhoff. Thread: https://gitlist.dev/t/7609 ## Daniel Barkalow, 2007-04-11 16:10 Subject: cvsserver bug Message-ID: URL: https://gitlist.dev/e/Pine.LNX.4.64.0704111158220.27922%40iabervon.org ``` It seems like git-cvsserver doesn't know the CVS special case that, if the client has removed the file from the working directory (but not called "cvs remove"), this means to revert it to the server's version. I think that the condition around line 843 needs to exclude this case, and it needs to get to line 892 instead, but I can't even fake perl to fix it. -Daniel *This .sig left intentionally blank* ``` ## Frank Lichtenheld, 2007-04-11 19:43 Subject: Re: cvsserver bug Message-ID: <20070411194327.GA7085@planck.djpig.de> URL: https://gitlist.dev/e/20070411194327.GA7085%40planck.djpig.de In-Reply-To: ``` On Wed, Apr 11, 2007 at 12:10:24PM -0400, Daniel Barkalow wrote: > It seems like git-cvsserver doesn't know the CVS special case that, if the > client has removed the file from the working directory (but not called > "cvs remove"), this means to revert it to the server's version. I think > that the condition around line 843 needs to exclude this case, and it > needs to get to line 892 instead, but I can't even fake perl to fix it. I can confirm the bug. Will look into it a bit and see whether I can come up with a fix. Gruesse, -- Frank Lichtenheld www: http://www.djpig.de/ ``` ## Frank Lichtenheld, 2007-04-11 20:38 Subject: [PATCH] cvsserver: Fix handling of diappeared files on update Message-ID: <11763238991005-git-send-email-frank@lichtenheld.de> URL: https://gitlist.dev/e/11763238991005-git-send-email-frank%40lichtenheld.de In-Reply-To: ``` Only send a modified response if the client sent a "Modified" entry. This fixes the case where the file was locally deleted on the client without being removed from CVS. In this case the client will only have sent the Entry for the file but nothing else. Signed-off-by: Frank Lichtenheld --- git-cvsserver.perl | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) We really, really need a test suite for cvsserver... I've tested this as good for regressions as I could think of but am still unsure about it. diff --git a/git-cvsserver.perl b/git-cvsserver.perl index 68aa752..25816c5 100755 --- a/git-cvsserver.perl +++ b/git-cvsserver.perl @@ -843,6 +843,7 @@ sub req_update if ( defined ( $wrev ) and defined($meta->{revision}) and $wrev == $meta->{revision} + and defined($state->{entries}{$filename}{modified_hash}) and not exists ( $state->{opt}{C} ) ) { $log->info("Tell the client the file is modified"); -- 1.5.1 ``` ## Junio C Hamano, 2007-04-11 21:09 Subject: Re: [PATCH] cvsserver: Fix handling of diappeared files on update Message-ID: <7v6482obxi.fsf@assigned-by-dhcp.cox.net> URL: https://gitlist.dev/e/7v6482obxi.fsf%40assigned-by-dhcp.cox.net In-Reply-To: <11763238991005-git-send-email-frank@lichtenheld.de> ``` Thanks. ``` ## Junio C Hamano, 2007-04-11 21:36 Subject: Re: [PATCH] cvsserver: Fix handling of diappeared files on update Message-ID: <7v1wiqoaph.fsf@assigned-by-dhcp.cox.net> URL: https://gitlist.dev/e/7v1wiqoaph.fsf%40assigned-by-dhcp.cox.net In-Reply-To: <11763238991005-git-send-email-frank@lichtenheld.de> ``` Frank Lichtenheld writes: > Only send a modified response if the client sent a > "Modified" entry. This fixes the case where the > file was locally deleted on the client without > being removed from CVS. In this case the client > will only have sent the Entry for the file but nothing > else. > > Signed-off-by: Frank Lichtenheld > --- > git-cvsserver.perl | 1 + > 1 files changed, 1 insertions(+), 0 deletions(-) > > We really, really need a test suite for cvsserver... > I've tested this as good for regressions as I could > think of but am still unsure about it. > > diff --git a/git-cvsserver.perl b/git-cvsserver.perl > index 68aa752..25816c5 100755 > --- a/git-cvsserver.perl > +++ b/git-cvsserver.perl > @@ -843,6 +843,7 @@ sub req_update > if ( defined ( $wrev ) > and defined($meta->{revision}) > and $wrev == $meta->{revision} > + and defined($state->{entries}{$filename}{modified_hash}) > and not exists ( $state->{opt}{C} ) ) > { > $log->info("Tell the client the file is modified"); > -- > 1.5.1 This would make the modified response go away, but would it cause a fresh re-checkout to happen? ``` ## Daniel Barkalow, 2007-04-11 21:39 Subject: Re: [PATCH] cvsserver: Fix handling of diappeared files on update Message-ID: URL: https://gitlist.dev/e/Pine.LNX.4.64.0704111737180.27922%40iabervon.org In-Reply-To: <7v1wiqoaph.fsf@assigned-by-dhcp.cox.net> ``` On Wed, 11 Apr 2007, Junio C Hamano wrote: > Frank Lichtenheld writes: > > > Only send a modified response if the client sent a > > "Modified" entry. This fixes the case where the > > file was locally deleted on the client without > > being removed from CVS. In this case the client > > will only have sent the Entry for the file but nothing > > else. > > > > Signed-off-by: Frank Lichtenheld > > --- > > git-cvsserver.perl | 1 + > > 1 files changed, 1 insertions(+), 0 deletions(-) > > > > We really, really need a test suite for cvsserver... > > I've tested this as good for regressions as I could > > think of but am still unsure about it. > > > > diff --git a/git-cvsserver.perl b/git-cvsserver.perl > > index 68aa752..25816c5 100755 > > --- a/git-cvsserver.perl > > +++ b/git-cvsserver.perl > > @@ -843,6 +843,7 @@ sub req_update > > if ( defined ( $wrev ) > > and defined($meta->{revision}) > > and $wrev == $meta->{revision} > > + and defined($state->{entries}{$filename}{modified_hash}) > > and not exists ( $state->{opt}{C} ) ) > > { > > $log->info("Tell the client the file is modified"); > > -- > > 1.5.1 > > This would make the modified response go away, but would it > cause a fresh re-checkout to happen? It falls through into the appropriate case, evidently. At least, it seems to resolve my issue. -Daniel *This .sig left intentionally blank* ``` ## Frank Lichtenheld, 2007-04-11 21:42 Subject: Re: [PATCH] cvsserver: Fix handling of diappeared files on update Message-ID: <20070411214231.GB7085@planck.djpig.de> URL: https://gitlist.dev/e/20070411214231.GB7085%40planck.djpig.de In-Reply-To: <7v1wiqoaph.fsf@assigned-by-dhcp.cox.net> ``` On Wed, Apr 11, 2007 at 02:36:10PM -0700, Junio C Hamano wrote: > This would make the modified response go away, but would it > cause a fresh re-checkout to happen? Yeah, the rest of the code handles this case correctly if it actually gets the chance to do so. Gruesse, -- Frank Lichtenheld www: http://www.djpig.de/ ``` ## Martin Langhoff, 2007-04-11 21:52 Subject: Re: [PATCH] cvsserver: Fix handling of diappeared files on update Message-ID: <461D5890.1000605@catalyst.net.nz> URL: https://gitlist.dev/e/461D5890.1000605%40catalyst.net.nz In-Reply-To: <11763238991005-git-send-email-frank@lichtenheld.de> ``` Frank Lichtenheld wrote: > Only send a modified response if the client sent a > "Modified" entry. This fixes the case where the > file was locally deleted on the client without > being removed from CVS. In this case the client > will only have sent the Entry for the file but nothing > else. > > Signed-off-by: Frank Lichtenheld Ack. With this, git-cvsserver matches cvs's behaviour. The only difference is that cvs also spits out E cvs update: warning: $path was lost cheers, martin -- ----------------------------------------------------------------------- Martin @ Catalyst .Net .NZ Ltd, PO Box 11-053, Manners St, Wellington WEB: http://catalyst.net.nz/ PHYS: Level 2, 150-154 Willis St OFFICE: +64(4)916-7224 UK: 0845 868 5733 ext 7224 MOB: +64(21)364-017 Make things as simple as possible, but no simpler - Einstein ----------------------------------------------------------------------- ``` ## Daniel Barkalow, 2007-04-11 22:02 Subject: Re: [PATCH] cvsserver: Fix handling of diappeared files on update Message-ID: URL: https://gitlist.dev/e/Pine.LNX.4.64.0704111755120.27922%40iabervon.org In-Reply-To: <461D5890.1000605@catalyst.net.nz> ``` On Thu, 12 Apr 2007, Martin Langhoff wrote: > Frank Lichtenheld wrote: > > Only send a modified response if the client sent a > > "Modified" entry. This fixes the case where the > > file was locally deleted on the client without > > being removed from CVS. In this case the client > > will only have sent the Entry for the file but nothing > > else. > > > > Signed-off-by: Frank Lichtenheld > > Ack. With this, git-cvsserver matches cvs's behaviour. The only > difference is that cvs also spits out > > E cvs update: warning: $path was lost My cvs client says: cvs update: warning: $path unexpectedly disappeared I'm not sure if something suitable is generated client-side in general, but mine seems to. -Daniel *This .sig left intentionally blank* ```