threads / patch / 6291

patchcvsserver: detect early of we are up to date and avoid costly rev-list

Subject: [PATCH] cvsserver: detect early of we are up to date and avoid costly rev-list

## tl;dr

3 messages between Jan 9, 2007 and Jan 9, 2007. Diffs are folded; open one to read it.

replies: 2people: 3as markdown or json

Martin Langhoff· Jan 9, 2007, 02:10 UTC · lore

if the SHA1 of our head matches the last SHA1 seen in the DB, avoid further processing.

Signed-off-by: Martin Langhoff <martin@catalyst.net.nz>
---
 git-cvsserver.perl |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)

Show changes to git-cvsserver.perl +8 −1

diff --git a/git-cvsserver.perl b/git-cvsserver.perl
index df39512..0b75f9c 100755
--- a/git-cvsserver.perl
+++ b/git-cvsserver.perl
@@ -2184,7 +2184,10 @@ sub update
     # first lets get the commit list
     $ENV{GIT_DIR} = $self->{git_path};
 
-    my $commitinfo = `git-cat-file commit $self->{module} 2>&1`;
+    my $commitsha1 = `git rev-parse $self->{module}`;
+    chomp $commitsha1;
+
+    my $commitinfo = `git cat-file commit $self->{module} 2>&1`;
     unless ( $commitinfo =~ /tree\s+[a-zA-Z0-9]{40}/ )
     {
         die("Invalid module '$self->{module}'");
@@ -2194,6 +2197,10 @@ sub update
     my $git_log;
     my $lastcommit = $self->_get_prop("last_commit");
 
+    if ($lastcommit eq $commitsha1) { # up-to-date
+         return 1;
+    }
+
     # Start exclusive lock here...
     $self->{dbh}->begin_work() or die "Cannot lock database for BEGIN";

-- 
1.5.0.rc0.g4017-dirty

Martin Langhoff· Jan 9, 2007, 02:39 UTC · re: Martin Langhoff · lore

Re: [PATCH] cvsserver: detect early of we are up to date and avoid costly rev-list

On 1/9/07, Martin Langhoff <martin@catalyst.net.nz> wrote:

Show 10 quoted lines

> @@ -2194,6 +2197,10 @@ sub update
>      my $git_log;
>      my $lastcommit = $self->_get_prop("last_commit");
>
> +    if ($lastcommit eq $commitsha1) { # up-to-date
> +         return 1;
> +    }
> +
>      # Start exclusive lock here...
>      $self->{dbh}->begin_work() or die "Cannot lock database for BEGIN";

Actually, that generates a warning on the initial checkout. The fix is to run the if as

  if (defined $lastcommit && $lastcommit eq $commitsha1) { # up-to-date

Junio -- is it easy for you to fixup when you apply the patch? Otherwise, I'll be happy to repost it patch.

cheers

Junio C Hamano· Jan 9, 2007, 05:44 UTC · re: Martin Langhoff · lore

Re: [PATCH] cvsserver: detect early of we are up to date and avoid costly rev-list

"Martin Langhoff" <martin.langhoff@gmail.com> writes:

Show 19 quoted lines

> On 1/9/07, Martin Langhoff <martin@catalyst.net.nz> wrote:
>> @@ -2194,6 +2197,10 @@ sub update
>>      my $git_log;
>>      my $lastcommit = $self->_get_prop("last_commit");
>>
>> +    if ($lastcommit eq $commitsha1) { # up-to-date
>> +         return 1;
>> +    }
>> +
>>      # Start exclusive lock here...
>>      $self->{dbh}->begin_work() or die "Cannot lock database for BEGIN";
>
> Actually, that generates a warning on the initial checkout. The fix is
> to run the if as
>
>  if (defined $lastcommit && $lastcommit eq $commitsha1) { # up-to-date
>
> Junio -- is it easy for you to fixup  when you apply the patch?
> Otherwise, I'll be happy to repost it patch.

Thanks but no need.  "git commit --amend" is our friend ;-).