From mboxrd@z Thu Jan 1 00:00:00 1970 From: Andy Whitcroft Subject: [PATCH 2/2] cvsimport move over to using git for each ref to read refs V2 Date: Wed, 20 Sep 2006 11:31:34 +0100 Message-ID: <20060920103134.GA30253@shadowen.org> References: <4511173D.7020702@shadowen.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-From: git-owner@vger.kernel.org Wed Sep 20 12:32:11 2006 Return-path: Envelope-to: gcvg-git@gmane.org Received: from vger.kernel.org ([209.132.176.167]) by ciao.gmane.org with esmtp (Exim 4.43) id 1GPzN7-0006FC-EF for gcvg-git@gmane.org; Wed, 20 Sep 2006 12:32:05 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750917AbWITKb6 (ORCPT ); Wed, 20 Sep 2006 06:31:58 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1750908AbWITKb6 (ORCPT ); Wed, 20 Sep 2006 06:31:58 -0400 Received: from 85-210-218-110.dsl.pipex.com ([85.210.218.110]:1195 "EHLO localhost.localdomain") by vger.kernel.org with ESMTP id S1750917AbWITKb5 (ORCPT ); Wed, 20 Sep 2006 06:31:57 -0400 Received: from apw by localhost.localdomain with local (Exim 4.63) (envelope-from ) id 1GPzMc-0007s2-Ll; Wed, 20 Sep 2006 11:31:34 +0100 To: git@vger.kernel.org Content-Disposition: inline InReply-To: <4511173D.7020702@shadowen.org> User-Agent: Mutt/1.5.13 (2006-08-11) Sender: git-owner@vger.kernel.org Precedence: bulk X-Mailing-List: git@vger.kernel.org Archived-At: cvsimport: move over to using git-for-each-ref to read refs V2 cvsimport opens all of the files in $GIT_DIR/refs/heads and reads out the sha1's in order to work out what time the last commit on that branch was made (in CVS) thus allowing incremental updates. However, this takes no account of hierachical refs naming producing the following error for each directory in $GIT_DIR/refs: Use of uninitialized value in chomp at /usr/bin/git-cvsimport line 503. Use of uninitialized value in concatenation (.) or string at /usr/bin/git-cvsimport line 505. usage: git-cat-file [-t|-s|-e|-p|] Take advantage of the new packed refs work to use the new for-each-ref iterator to get this information. Use the format specifier to ensure we are neutral to changes in default. [Junio: although although for-each-ref offers a --perl quoting mode this patch does not use it as it seems only to make parsing the output harder in perl. If there is a neat trick for handling this 'perl' form please educate me. Here, rely on sha1's and refnames to contain no spaces.] Signed-off-by: Andy Whitcroft --- diff --git a/git-cvsimport.perl b/git-cvsimport.perl index e5a00a1..5b13c23 100755 --- a/git-cvsimport.perl +++ b/git-cvsimport.perl @@ -495,22 +495,17 @@ unless(-d $git_dir) { $tip_at_start = `git-rev-parse --verify HEAD`; # Get the last import timestamps - opendir(D,"$git_dir/refs/heads"); - while(defined(my $head = readdir(D))) { - next if $head =~ /^\./; - open(F,"$git_dir/refs/heads/$head") - or die "Bad head branch: $head: $!\n"; - chomp(my $ftag = ); - close(F); - open(F,"git-cat-file commit $ftag |"); - while() { - next unless /^author\s.*\s(\d+)\s[-+]\d{4}$/; - $branch_date{$head} = $1; - last; - } - close(F); + open(H, "git-for-each-ref --format='%(objectname) %(refname) %(authorstamp)'|") or + die "Cannot run git-for-each-ref: $!\n"; + while(defined(my $entry = )) { + chomp($entry); + my ($ftag, $name, $stamp, $zone) = split(/ /, $entry, 4); + next if ($name !~ m@^refs/heads/(.*)$@); + my ($head) = ($1); + + $branch_date{$head} = $stamp; } - closedir(D); + close(H); } -d $git_dir