Matthias Urlichs | a57a949 | 2005-06-28 16:48:40 +0200 | [diff] [blame] | 1 | #!/usr/bin/perl -w |
Tommy M. McGuire | 9718a00 | 2005-06-10 01:38:32 -0500 | [diff] [blame] | 2 | |
Matthias Urlichs | a57a949 | 2005-06-28 16:48:40 +0200 | [diff] [blame] | 3 | # This tool is copyright (c) 2005, Matthias Urlichs. |
| 4 | # It is released under the Gnu Public License, version 2. |
| 5 | # |
| 6 | # The basic idea is to aggregate CVS check-ins into related changes. |
| 7 | # Fortunately, "cvsps" does that for us; all we have to do is to parse |
| 8 | # its output. |
| 9 | # |
| 10 | # Checking out the files is done by a single long-running CVS connection |
| 11 | # / server process. |
| 12 | # |
| 13 | # The head revision is on branch "origin" by default. |
| 14 | # You can change that with the '-o' option. |
| 15 | |
| 16 | use strict; |
| 17 | use warnings; |
Philippe Bruhat (BooK | bc434e8 | 2008-02-28 11:18:22 +0100 | [diff] [blame] | 18 | use Getopt::Long; |
Sven Verdoolaege | 79ee456 | 2005-07-04 13:36:59 +0200 | [diff] [blame] | 19 | use File::Spec; |
Martin Langhoff | 7ccd900 | 2006-06-24 23:13:08 +1200 | [diff] [blame] | 20 | use File::Temp qw(tempfile tmpnam); |
Matthias Urlichs | a57a949 | 2005-06-28 16:48:40 +0200 | [diff] [blame] | 21 | use File::Path qw(mkpath); |
| 22 | use File::Basename qw(basename dirname); |
| 23 | use Time::Local; |
Matthias Urlichs | 2a3e1a8 | 2005-06-28 19:49:19 +0200 | [diff] [blame] | 24 | use IO::Socket; |
| 25 | use IO::Pipe; |
Jeff King | e49289d | 2006-05-24 09:58:28 -0400 | [diff] [blame] | 26 | use POSIX qw(strftime dup2 ENOENT); |
H. Peter Anvin | 0d821d4 | 2005-09-06 10:36:01 -0700 | [diff] [blame] | 27 | use IPC::Open2; |
Matthias Urlichs | a57a949 | 2005-06-28 16:48:40 +0200 | [diff] [blame] | 28 | |
| 29 | $SIG{'PIPE'}="IGNORE"; |
| 30 | $ENV{'TZ'}="UTC"; |
| 31 | |
Aaron Crane | 0455ec0 | 2010-02-06 18:26:24 +0000 | [diff] [blame] | 32 | our ($opt_h,$opt_o,$opt_v,$opt_k,$opt_u,$opt_d,$opt_p,$opt_C,$opt_z,$opt_i,$opt_P, $opt_s,$opt_m,@opt_M,$opt_A,$opt_S,$opt_L, $opt_a, $opt_r, $opt_R); |
Andreas Ericsson | ffd97f3 | 2006-01-13 00:38:59 +0100 | [diff] [blame] | 33 | my (%conv_author_name, %conv_author_email); |
Matthias Urlichs | a57a949 | 2005-06-28 16:48:40 +0200 | [diff] [blame] | 34 | |
Frank Lichtenheld | 7bf7764 | 2007-04-06 23:52:41 +0200 | [diff] [blame] | 35 | sub usage(;$) { |
| 36 | my $msg = shift; |
| 37 | print(STDERR "Error: $msg\n") if $msg; |
Matthias Urlichs | a57a949 | 2005-06-28 16:48:40 +0200 | [diff] [blame] | 38 | print STDERR <<END; |
Stephan Beyer | 1b1dd23 | 2008-07-13 15:36:15 +0200 | [diff] [blame] | 39 | Usage: git cvsimport # fetch/update GIT from CVS |
Andreas Ericsson | ffd97f3 | 2006-01-13 00:38:59 +0100 | [diff] [blame] | 40 | [-o branch-for-HEAD] [-h] [-v] [-d CVSROOT] [-A author-conv-file] |
Frank Lichtenheld | edbe446 | 2007-04-06 23:52:39 +0200 | [diff] [blame] | 41 | [-p opts-for-cvsps] [-P file] [-C GIT_repository] [-z fuzz] [-i] [-k] |
| 42 | [-u] [-s subst] [-a] [-m] [-M regex] [-S regex] [-L commitlimit] |
Aaron Crane | 0455ec0 | 2010-02-06 18:26:24 +0000 | [diff] [blame] | 43 | [-r remote] [-R] [CVS_module] |
Matthias Urlichs | a57a949 | 2005-06-28 16:48:40 +0200 | [diff] [blame] | 44 | END |
| 45 | exit(1); |
Tommy M. McGuire | 9718a00 | 2005-06-10 01:38:32 -0500 | [diff] [blame] | 46 | } |
| 47 | |
Andreas Ericsson | ffd97f3 | 2006-01-13 00:38:59 +0100 | [diff] [blame] | 48 | sub read_author_info($) { |
| 49 | my ($file) = @_; |
| 50 | my $user; |
| 51 | open my $f, '<', "$file" or die("Failed to open $file: $!\n"); |
| 52 | |
| 53 | while (<$f>) { |
Junio C Hamano | 8cd1621 | 2006-01-15 03:30:30 -0800 | [diff] [blame] | 54 | # Expected format is this: |
Andreas Ericsson | ffd97f3 | 2006-01-13 00:38:59 +0100 | [diff] [blame] | 55 | # exon=Andreas Ericsson <ae@op5.se> |
Junio C Hamano | 8cd1621 | 2006-01-15 03:30:30 -0800 | [diff] [blame] | 56 | if (m/^(\S+?)\s*=\s*(.+?)\s*<(.+)>\s*$/) { |
Andreas Ericsson | ffd97f3 | 2006-01-13 00:38:59 +0100 | [diff] [blame] | 57 | $user = $1; |
Junio C Hamano | 8cd1621 | 2006-01-15 03:30:30 -0800 | [diff] [blame] | 58 | $conv_author_name{$user} = $2; |
| 59 | $conv_author_email{$user} = $3; |
Andreas Ericsson | ffd97f3 | 2006-01-13 00:38:59 +0100 | [diff] [blame] | 60 | } |
Junio C Hamano | 8cd1621 | 2006-01-15 03:30:30 -0800 | [diff] [blame] | 61 | # However, we also read from CVSROOT/users format |
| 62 | # to ease migration. |
| 63 | elsif (/^(\w+):(['"]?)(.+?)\2\s*$/) { |
| 64 | my $mapped; |
| 65 | ($user, $mapped) = ($1, $3); |
| 66 | if ($mapped =~ /^\s*(.*?)\s*<(.*)>\s*$/) { |
| 67 | $conv_author_name{$user} = $1; |
| 68 | $conv_author_email{$user} = $2; |
| 69 | } |
| 70 | elsif ($mapped =~ /^<?(.*)>?$/) { |
| 71 | $conv_author_name{$user} = $user; |
| 72 | $conv_author_email{$user} = $1; |
| 73 | } |
| 74 | } |
| 75 | # NEEDSWORK: Maybe warn on unrecognized lines? |
Andreas Ericsson | ffd97f3 | 2006-01-13 00:38:59 +0100 | [diff] [blame] | 76 | } |
| 77 | close ($f); |
| 78 | } |
| 79 | |
| 80 | sub write_author_info($) { |
| 81 | my ($file) = @_; |
| 82 | open my $f, '>', $file or |
| 83 | die("Failed to open $file for writing: $!"); |
| 84 | |
| 85 | foreach (keys %conv_author_name) { |
Junio C Hamano | 8cd1621 | 2006-01-15 03:30:30 -0800 | [diff] [blame] | 86 | print $f "$_=$conv_author_name{$_} <$conv_author_email{$_}>\n"; |
Andreas Ericsson | ffd97f3 | 2006-01-13 00:38:59 +0100 | [diff] [blame] | 87 | } |
| 88 | close ($f); |
| 89 | } |
| 90 | |
Dan McGee | cfc44a1 | 2008-01-13 22:51:10 -0600 | [diff] [blame] | 91 | # convert getopts specs for use by git config |
James Bowes | ed35dec | 2007-02-07 17:57:43 -0500 | [diff] [blame] | 92 | sub read_repo_config { |
| 93 | # Split the string between characters, unless there is a ':' |
| 94 | # So "abc:de" becomes ["a", "b", "c:", "d", "e"] |
| 95 | my @opts = split(/ *(?!:)/, shift); |
| 96 | foreach my $o (@opts) { |
| 97 | my $key = $o; |
| 98 | $key =~ s/://g; |
Dan McGee | cfc44a1 | 2008-01-13 22:51:10 -0600 | [diff] [blame] | 99 | my $arg = 'git config'; |
James Bowes | ed35dec | 2007-02-07 17:57:43 -0500 | [diff] [blame] | 100 | $arg .= ' --bool' if ($o !~ /:$/); |
| 101 | |
| 102 | chomp(my $tmp = `$arg --get cvsimport.$key`); |
| 103 | if ($tmp && !($arg =~ /--bool/ && $tmp eq 'false')) { |
| 104 | no strict 'refs'; |
| 105 | my $opt_name = "opt_" . $key; |
| 106 | if (!$$opt_name) { |
| 107 | $$opt_name = $tmp; |
| 108 | } |
| 109 | } |
| 110 | } |
James Bowes | ed35dec | 2007-02-07 17:57:43 -0500 | [diff] [blame] | 111 | } |
| 112 | |
Aaron Crane | 0455ec0 | 2010-02-06 18:26:24 +0000 | [diff] [blame] | 113 | my $opts = "haivmkuo:d:p:r:C:z:s:M:P:A:S:L:R"; |
James Bowes | ed35dec | 2007-02-07 17:57:43 -0500 | [diff] [blame] | 114 | read_repo_config($opts); |
Philippe Bruhat (BooK | bc434e8 | 2008-02-28 11:18:22 +0100 | [diff] [blame] | 115 | Getopt::Long::Configure( 'no_ignore_case', 'bundling' ); |
| 116 | |
| 117 | # turn the Getopt::Std specification in a Getopt::Long one, |
| 118 | # with support for multiple -M options |
| 119 | GetOptions( map { s/:/=s/; /M/ ? "$_\@" : $_ } split( /(?!:)/, $opts ) ) |
| 120 | or usage(); |
Matthias Urlichs | a57a949 | 2005-06-28 16:48:40 +0200 | [diff] [blame] | 121 | usage if $opt_h; |
Linus Torvalds | d4f8b39 | 2005-06-07 15:11:28 -0700 | [diff] [blame] | 122 | |
Jeff King | 67d2324 | 2007-11-30 17:22:12 -0500 | [diff] [blame] | 123 | if (@ARGV == 0) { |
Dan McGee | cfc44a1 | 2008-01-13 22:51:10 -0600 | [diff] [blame] | 124 | chomp(my $module = `git config --get cvsimport.module`); |
Jeff King | 67d2324 | 2007-11-30 17:22:12 -0500 | [diff] [blame] | 125 | push(@ARGV, $module) if $? == 0; |
| 126 | } |
Frank Lichtenheld | 7bf7764 | 2007-04-06 23:52:41 +0200 | [diff] [blame] | 127 | @ARGV <= 1 or usage("You can't specify more than one CVS module"); |
Matthias Urlichs | a57a949 | 2005-06-28 16:48:40 +0200 | [diff] [blame] | 128 | |
Junio C Hamano | 86d11cf | 2006-11-27 14:21:30 -0800 | [diff] [blame] | 129 | if ($opt_d) { |
Matthias Urlichs | 2a3e1a8 | 2005-06-28 19:49:19 +0200 | [diff] [blame] | 130 | $ENV{"CVSROOT"} = $opt_d; |
Junio C Hamano | 86d11cf | 2006-11-27 14:21:30 -0800 | [diff] [blame] | 131 | } elsif (-f 'CVS/Root') { |
Sven Verdoolaege | f9714a4 | 2005-07-03 11:34:59 +0200 | [diff] [blame] | 132 | open my $f, '<', 'CVS/Root' or die 'Failed to open CVS/Root'; |
| 133 | $opt_d = <$f>; |
| 134 | chomp $opt_d; |
| 135 | close $f; |
| 136 | $ENV{"CVSROOT"} = $opt_d; |
Junio C Hamano | 86d11cf | 2006-11-27 14:21:30 -0800 | [diff] [blame] | 137 | } elsif ($ENV{"CVSROOT"}) { |
Matthias Urlichs | 2a3e1a8 | 2005-06-28 19:49:19 +0200 | [diff] [blame] | 138 | $opt_d = $ENV{"CVSROOT"}; |
| 139 | } else { |
Frank Lichtenheld | 7bf7764 | 2007-04-06 23:52:41 +0200 | [diff] [blame] | 140 | usage("CVSROOT needs to be set"); |
Matthias Urlichs | 2a3e1a8 | 2005-06-28 19:49:19 +0200 | [diff] [blame] | 141 | } |
Johannes Schindelin | fbfd60d | 2005-08-17 11:19:20 +0200 | [diff] [blame] | 142 | $opt_s ||= "-"; |
Martin Langhoff | ded9f40 | 2007-01-08 19:43:39 +1300 | [diff] [blame] | 143 | $opt_a ||= 0; |
| 144 | |
Sven Verdoolaege | f9714a4 | 2005-07-03 11:34:59 +0200 | [diff] [blame] | 145 | my $git_tree = $opt_C; |
Matthias Urlichs | 2a3e1a8 | 2005-06-28 19:49:19 +0200 | [diff] [blame] | 146 | $git_tree ||= "."; |
| 147 | |
Andy Whitcroft | 8b7f5fc | 2007-05-30 01:56:41 +0100 | [diff] [blame] | 148 | my $remote; |
| 149 | if (defined $opt_r) { |
| 150 | $remote = 'refs/remotes/' . $opt_r; |
| 151 | $opt_o ||= "master"; |
| 152 | } else { |
| 153 | $opt_o ||= "origin"; |
| 154 | $remote = 'refs/heads'; |
| 155 | } |
| 156 | |
Sven Verdoolaege | f9714a4 | 2005-07-03 11:34:59 +0200 | [diff] [blame] | 157 | my $cvs_tree; |
| 158 | if ($#ARGV == 0) { |
| 159 | $cvs_tree = $ARGV[0]; |
| 160 | } elsif (-f 'CVS/Repository') { |
Junio C Hamano | a6080a0 | 2007-06-07 00:04:01 -0700 | [diff] [blame] | 161 | open my $f, '<', 'CVS/Repository' or |
Sven Verdoolaege | f9714a4 | 2005-07-03 11:34:59 +0200 | [diff] [blame] | 162 | die 'Failed to open CVS/Repository'; |
| 163 | $cvs_tree = <$f>; |
| 164 | chomp $cvs_tree; |
Martin Langhoff | db4b658 | 2005-08-16 22:35:27 +1200 | [diff] [blame] | 165 | close $f; |
Sven Verdoolaege | f9714a4 | 2005-07-03 11:34:59 +0200 | [diff] [blame] | 166 | } else { |
Frank Lichtenheld | 7bf7764 | 2007-04-06 23:52:41 +0200 | [diff] [blame] | 167 | usage("CVS module has to be specified"); |
Sven Verdoolaege | f9714a4 | 2005-07-03 11:34:59 +0200 | [diff] [blame] | 168 | } |
| 169 | |
Martin Langhoff | db4b658 | 2005-08-16 22:35:27 +1200 | [diff] [blame] | 170 | our @mergerx = (); |
| 171 | if ($opt_m) { |
Philippe Bruhat (BooK | fbbbc36 | 2008-02-28 11:18:21 +0100 | [diff] [blame] | 172 | @mergerx = ( qr/\b(?:from|of|merge|merging|merged) ([-\w]+)/i ); |
Martin Langhoff | db4b658 | 2005-08-16 22:35:27 +1200 | [diff] [blame] | 173 | } |
Philippe Bruhat (BooK | bc434e8 | 2008-02-28 11:18:22 +0100 | [diff] [blame] | 174 | if (@opt_M) { |
| 175 | push (@mergerx, map { qr/$_/ } @opt_M); |
Martin Langhoff | db4b658 | 2005-08-16 22:35:27 +1200 | [diff] [blame] | 176 | } |
| 177 | |
Martin Langhoff | 6211988 | 2007-01-08 14:11:23 +1300 | [diff] [blame] | 178 | # Remember UTC of our starting time |
| 179 | # we'll want to avoid importing commits |
| 180 | # that are too recent |
| 181 | our $starttime = time(); |
| 182 | |
Matthias Urlichs | a57a949 | 2005-06-28 16:48:40 +0200 | [diff] [blame] | 183 | select(STDERR); $|=1; select(STDOUT); |
| 184 | |
| 185 | |
| 186 | package CVSconn; |
| 187 | # Basic CVS dialog. |
Matthias Urlichs | 2a3e1a8 | 2005-06-28 19:49:19 +0200 | [diff] [blame] | 188 | # We're only interested in connecting and downloading, so ... |
Matthias Urlichs | a57a949 | 2005-06-28 16:48:40 +0200 | [diff] [blame] | 189 | |
Sven Verdoolaege | 2eb6d82 | 2005-07-04 00:43:26 +0200 | [diff] [blame] | 190 | use File::Spec; |
| 191 | use File::Temp qw(tempfile); |
Matthias Urlichs | f65ae60 | 2005-06-28 19:58:40 +0200 | [diff] [blame] | 192 | use POSIX qw(strftime dup2); |
| 193 | |
Matthias Urlichs | a57a949 | 2005-06-28 16:48:40 +0200 | [diff] [blame] | 194 | sub new { |
Junio C Hamano | 86d11cf | 2006-11-27 14:21:30 -0800 | [diff] [blame] | 195 | my ($what,$repo,$subdir) = @_; |
Matthias Urlichs | a57a949 | 2005-06-28 16:48:40 +0200 | [diff] [blame] | 196 | $what=ref($what) if ref($what); |
| 197 | |
| 198 | my $self = {}; |
| 199 | $self->{'buffer'} = ""; |
| 200 | bless($self,$what); |
| 201 | |
| 202 | $repo =~ s#/+$##; |
| 203 | $self->{'fullrep'} = $repo; |
| 204 | $self->conn(); |
| 205 | |
| 206 | $self->{'subdir'} = $subdir; |
| 207 | $self->{'lines'} = undef; |
| 208 | |
| 209 | return $self; |
Linus Torvalds | d4f8b39 | 2005-06-07 15:11:28 -0700 | [diff] [blame] | 210 | } |
| 211 | |
Matthias Urlichs | a57a949 | 2005-06-28 16:48:40 +0200 | [diff] [blame] | 212 | sub conn { |
| 213 | my $self = shift; |
| 214 | my $repo = $self->{'fullrep'}; |
Junio C Hamano | 86d11cf | 2006-11-27 14:21:30 -0800 | [diff] [blame] | 215 | if ($repo =~ s/^:pserver(?:([^:]*)):(?:(.*?)(?::(.*?))?@)?([^:\/]*)(?::(\d*))?//) { |
| 216 | my ($param,$user,$pass,$serv,$port) = ($1,$2,$3,$4,$5); |
Iñaki Arenaza | 73bcf53 | 2006-11-22 23:26:57 +0100 | [diff] [blame] | 217 | |
Junio C Hamano | 86d11cf | 2006-11-27 14:21:30 -0800 | [diff] [blame] | 218 | my ($proxyhost,$proxyport); |
| 219 | if ($param && ($param =~ m/proxy=([^;]+)/)) { |
Iñaki Arenaza | 73bcf53 | 2006-11-22 23:26:57 +0100 | [diff] [blame] | 220 | $proxyhost = $1; |
| 221 | # Default proxyport, if not specified, is 8080. |
| 222 | $proxyport = 8080; |
Junio C Hamano | 86d11cf | 2006-11-27 14:21:30 -0800 | [diff] [blame] | 223 | if ($ENV{"CVS_PROXY_PORT"}) { |
Iñaki Arenaza | 73bcf53 | 2006-11-22 23:26:57 +0100 | [diff] [blame] | 224 | $proxyport = $ENV{"CVS_PROXY_PORT"}; |
| 225 | } |
Junio C Hamano | 86d11cf | 2006-11-27 14:21:30 -0800 | [diff] [blame] | 226 | if ($param =~ m/proxyport=([^;]+)/) { |
Iñaki Arenaza | 73bcf53 | 2006-11-22 23:26:57 +0100 | [diff] [blame] | 227 | $proxyport = $1; |
| 228 | } |
| 229 | } |
Philippe Bruhat (BooK) | 8c372fb | 2008-06-10 14:32:06 +0200 | [diff] [blame] | 230 | $repo ||= '/'; |
Iñaki Arenaza | 73bcf53 | 2006-11-22 23:26:57 +0100 | [diff] [blame] | 231 | |
Gordon Hopper | 2e458e0 | 2007-11-08 13:15:20 -0700 | [diff] [blame] | 232 | # if username is not explicit in CVSROOT, then use current user, as cvs would |
| 233 | $user=(getlogin() || $ENV{'LOGNAME'} || $ENV{'USER'} || "anonymous") unless $user; |
Matthias Urlichs | 2a3e1a8 | 2005-06-28 19:49:19 +0200 | [diff] [blame] | 234 | my $rr2 = "-"; |
Junio C Hamano | 86d11cf | 2006-11-27 14:21:30 -0800 | [diff] [blame] | 235 | unless ($port) { |
Matthias Urlichs | a57a949 | 2005-06-28 16:48:40 +0200 | [diff] [blame] | 236 | $rr2 = ":pserver:$user\@$serv:$repo"; |
| 237 | $port=2401; |
| 238 | } |
| 239 | my $rr = ":pserver:$user\@$serv:$port$repo"; |
Linus Torvalds | d4f8b39 | 2005-06-07 15:11:28 -0700 | [diff] [blame] | 240 | |
Pascal Obry | 3fb9d58 | 2009-09-04 13:58:32 +0200 | [diff] [blame] | 241 | if ($pass) { |
| 242 | $pass = $self->_scramble($pass); |
| 243 | } else { |
Matthias Urlichs | a57a949 | 2005-06-28 16:48:40 +0200 | [diff] [blame] | 244 | open(H,$ENV{'HOME'}."/.cvspass") and do { |
| 245 | # :pserver:cvs@mea.tmt.tele.fi:/cvsroot/zmailer Ah<Z |
Junio C Hamano | 86d11cf | 2006-11-27 14:21:30 -0800 | [diff] [blame] | 246 | while (<H>) { |
Matthias Urlichs | a57a949 | 2005-06-28 16:48:40 +0200 | [diff] [blame] | 247 | chomp; |
| 248 | s/^\/\d+\s+//; |
| 249 | my ($w,$p) = split(/\s/,$_,2); |
Junio C Hamano | 86d11cf | 2006-11-27 14:21:30 -0800 | [diff] [blame] | 250 | if ($w eq $rr or $w eq $rr2) { |
Matthias Urlichs | a57a949 | 2005-06-28 16:48:40 +0200 | [diff] [blame] | 251 | $pass = $p; |
| 252 | last; |
| 253 | } |
| 254 | } |
| 255 | }; |
Clemens Buchacher | e481b1d | 2009-09-17 09:21:02 +0200 | [diff] [blame] | 256 | $pass = "A" unless $pass; |
Matthias Urlichs | a57a949 | 2005-06-28 16:48:40 +0200 | [diff] [blame] | 257 | } |
Dirk Hoerner | b2139db | 2009-08-14 08:58:31 +0200 | [diff] [blame] | 258 | |
Iñaki Arenaza | 73bcf53 | 2006-11-22 23:26:57 +0100 | [diff] [blame] | 259 | my ($s, $rep); |
Junio C Hamano | 86d11cf | 2006-11-27 14:21:30 -0800 | [diff] [blame] | 260 | if ($proxyhost) { |
Iñaki Arenaza | 73bcf53 | 2006-11-22 23:26:57 +0100 | [diff] [blame] | 261 | |
| 262 | # Use a HTTP Proxy. Only works for HTTP proxies that |
| 263 | # don't require user authentication |
| 264 | # |
| 265 | # See: http://www.ietf.org/rfc/rfc2817.txt |
| 266 | |
| 267 | $s = IO::Socket::INET->new(PeerHost => $proxyhost, PeerPort => $proxyport); |
| 268 | die "Socket to $proxyhost: $!\n" unless defined $s; |
| 269 | $s->write("CONNECT $serv:$port HTTP/1.1\r\nHost: $serv:$port\r\n\r\n") |
| 270 | or die "Write to $proxyhost: $!\n"; |
| 271 | $s->flush(); |
| 272 | |
| 273 | $rep = <$s>; |
| 274 | |
| 275 | # The answer should look like 'HTTP/1.x 2yy ....' |
Junio C Hamano | 86d11cf | 2006-11-27 14:21:30 -0800 | [diff] [blame] | 276 | if (!($rep =~ m#^HTTP/1\.. 2[0-9][0-9]#)) { |
Iñaki Arenaza | 73bcf53 | 2006-11-22 23:26:57 +0100 | [diff] [blame] | 277 | die "Proxy connect: $rep\n"; |
| 278 | } |
| 279 | # Skip up to the empty line of the proxy server output |
| 280 | # including the response headers. |
| 281 | while ($rep = <$s>) { |
| 282 | last if (!defined $rep || |
| 283 | $rep eq "\n" || |
| 284 | $rep eq "\r\n"); |
| 285 | } |
| 286 | } else { |
| 287 | $s = IO::Socket::INET->new(PeerHost => $serv, PeerPort => $port); |
| 288 | die "Socket to $serv: $!\n" unless defined $s; |
| 289 | } |
| 290 | |
Matthias Urlichs | a57a949 | 2005-06-28 16:48:40 +0200 | [diff] [blame] | 291 | $s->write("BEGIN AUTH REQUEST\n$repo\n$user\n$pass\nEND AUTH REQUEST\n") |
| 292 | or die "Write to $serv: $!\n"; |
| 293 | $s->flush(); |
| 294 | |
Iñaki Arenaza | 73bcf53 | 2006-11-22 23:26:57 +0100 | [diff] [blame] | 295 | $rep = <$s>; |
Matthias Urlichs | a57a949 | 2005-06-28 16:48:40 +0200 | [diff] [blame] | 296 | |
Junio C Hamano | 86d11cf | 2006-11-27 14:21:30 -0800 | [diff] [blame] | 297 | if ($rep ne "I LOVE YOU\n") { |
Matthias Urlichs | a57a949 | 2005-06-28 16:48:40 +0200 | [diff] [blame] | 298 | $rep="<unknown>" unless $rep; |
| 299 | die "AuthReply: $rep\n"; |
| 300 | } |
| 301 | $self->{'socketo'} = $s; |
| 302 | $self->{'socketi'} = $s; |
Sven Verdoolaege | 3415539 | 2005-07-03 13:02:06 +0200 | [diff] [blame] | 303 | } else { # local or ext: Fork off our own cvs server. |
Matthias Urlichs | a57a949 | 2005-06-28 16:48:40 +0200 | [diff] [blame] | 304 | my $pr = IO::Pipe->new(); |
| 305 | my $pw = IO::Pipe->new(); |
| 306 | my $pid = fork(); |
| 307 | die "Fork: $!\n" unless defined $pid; |
Sven Verdoolaege | 8d0ea31 | 2005-07-03 12:26:51 +0200 | [diff] [blame] | 308 | my $cvs = 'cvs'; |
| 309 | $cvs = $ENV{CVS_SERVER} if exists $ENV{CVS_SERVER}; |
Sven Verdoolaege | 3415539 | 2005-07-03 13:02:06 +0200 | [diff] [blame] | 310 | my $rsh = 'rsh'; |
| 311 | $rsh = $ENV{CVS_RSH} if exists $ENV{CVS_RSH}; |
| 312 | |
| 313 | my @cvs = ($cvs, 'server'); |
| 314 | my ($local, $user, $host); |
| 315 | $local = $repo =~ s/:local://; |
| 316 | if (!$local) { |
| 317 | $repo =~ s/:ext://; |
| 318 | $local = !($repo =~ s/^(?:([^\@:]+)\@)?([^:]+)://); |
| 319 | ($user, $host) = ($1, $2); |
| 320 | } |
| 321 | if (!$local) { |
| 322 | if ($user) { |
| 323 | unshift @cvs, $rsh, '-l', $user, $host; |
| 324 | } else { |
| 325 | unshift @cvs, $rsh, $host; |
| 326 | } |
| 327 | } |
| 328 | |
Junio C Hamano | 86d11cf | 2006-11-27 14:21:30 -0800 | [diff] [blame] | 329 | unless ($pid) { |
Matthias Urlichs | a57a949 | 2005-06-28 16:48:40 +0200 | [diff] [blame] | 330 | $pr->writer(); |
| 331 | $pw->reader(); |
Matthias Urlichs | a57a949 | 2005-06-28 16:48:40 +0200 | [diff] [blame] | 332 | dup2($pw->fileno(),0); |
| 333 | dup2($pr->fileno(),1); |
| 334 | $pr->close(); |
| 335 | $pw->close(); |
Sven Verdoolaege | 3415539 | 2005-07-03 13:02:06 +0200 | [diff] [blame] | 336 | exec(@cvs); |
Matthias Urlichs | a57a949 | 2005-06-28 16:48:40 +0200 | [diff] [blame] | 337 | } |
| 338 | $pw->writer(); |
| 339 | $pr->reader(); |
| 340 | $self->{'socketo'} = $pw; |
| 341 | $self->{'socketi'} = $pr; |
| 342 | } |
| 343 | $self->{'socketo'}->write("Root $repo\n"); |
| 344 | |
| 345 | # Trial and error says that this probably is the minimum set |
iso-8859-1?Q?David_K=E5gedal | b092133 | 2005-08-15 20:18:25 +0200 | [diff] [blame] | 346 | $self->{'socketo'}->write("Valid-responses ok error Valid-requests Mode M Mbinary E Checked-in Created Updated Merged Removed\n"); |
Matthias Urlichs | a57a949 | 2005-06-28 16:48:40 +0200 | [diff] [blame] | 347 | |
| 348 | $self->{'socketo'}->write("valid-requests\n"); |
| 349 | $self->{'socketo'}->flush(); |
| 350 | |
| 351 | chomp(my $rep=$self->readline()); |
Junio C Hamano | 86d11cf | 2006-11-27 14:21:30 -0800 | [diff] [blame] | 352 | if ($rep !~ s/^Valid-requests\s*//) { |
Matthias Urlichs | a57a949 | 2005-06-28 16:48:40 +0200 | [diff] [blame] | 353 | $rep="<unknown>" unless $rep; |
| 354 | die "Expected Valid-requests from server, but got: $rep\n"; |
| 355 | } |
| 356 | chomp(my $res=$self->readline()); |
| 357 | die "validReply: $res\n" if $res ne "ok"; |
| 358 | |
| 359 | $self->{'socketo'}->write("UseUnchanged\n") if $rep =~ /\bUseUnchanged\b/; |
| 360 | $self->{'repo'} = $repo; |
| 361 | } |
| 362 | |
| 363 | sub readline { |
Junio C Hamano | 86d11cf | 2006-11-27 14:21:30 -0800 | [diff] [blame] | 364 | my ($self) = @_; |
Matthias Urlichs | a57a949 | 2005-06-28 16:48:40 +0200 | [diff] [blame] | 365 | return $self->{'socketi'}->getline(); |
| 366 | } |
| 367 | |
| 368 | sub _file { |
| 369 | # Request a file with a given revision. |
| 370 | # Trial and error says this is a good way to do it. :-/ |
Junio C Hamano | 86d11cf | 2006-11-27 14:21:30 -0800 | [diff] [blame] | 371 | my ($self,$fn,$rev) = @_; |
Matthias Urlichs | a57a949 | 2005-06-28 16:48:40 +0200 | [diff] [blame] | 372 | $self->{'socketo'}->write("Argument -N\n") or return undef; |
| 373 | $self->{'socketo'}->write("Argument -P\n") or return undef; |
Martin Langhoff | abe0582 | 2005-08-16 17:39:29 +1200 | [diff] [blame] | 374 | # -kk: Linus' version doesn't use it - defaults to off |
| 375 | if ($opt_k) { |
| 376 | $self->{'socketo'}->write("Argument -kk\n") or return undef; |
| 377 | } |
Matthias Urlichs | a57a949 | 2005-06-28 16:48:40 +0200 | [diff] [blame] | 378 | $self->{'socketo'}->write("Argument -r\n") or return undef; |
| 379 | $self->{'socketo'}->write("Argument $rev\n") or return undef; |
| 380 | $self->{'socketo'}->write("Argument --\n") or return undef; |
| 381 | $self->{'socketo'}->write("Argument $self->{'subdir'}/$fn\n") or return undef; |
| 382 | $self->{'socketo'}->write("Directory .\n") or return undef; |
| 383 | $self->{'socketo'}->write("$self->{'repo'}\n") or return undef; |
Matthias Urlichs | 4f7c0ca | 2005-06-30 12:19:48 +0200 | [diff] [blame] | 384 | # $self->{'socketo'}->write("Sticky T1.0\n") or return undef; |
Matthias Urlichs | a57a949 | 2005-06-28 16:48:40 +0200 | [diff] [blame] | 385 | $self->{'socketo'}->write("co\n") or return undef; |
| 386 | $self->{'socketo'}->flush() or return undef; |
| 387 | $self->{'lines'} = 0; |
| 388 | return 1; |
| 389 | } |
| 390 | sub _line { |
| 391 | # Read a line from the server. |
| 392 | # ... except that 'line' may be an entire file. ;-) |
Junio C Hamano | 86d11cf | 2006-11-27 14:21:30 -0800 | [diff] [blame] | 393 | my ($self, $fh) = @_; |
Matthias Urlichs | a57a949 | 2005-06-28 16:48:40 +0200 | [diff] [blame] | 394 | die "Not in lines" unless defined $self->{'lines'}; |
| 395 | |
| 396 | my $line; |
Sven Verdoolaege | 2eb6d82 | 2005-07-04 00:43:26 +0200 | [diff] [blame] | 397 | my $res=0; |
Junio C Hamano | 86d11cf | 2006-11-27 14:21:30 -0800 | [diff] [blame] | 398 | while (defined($line = $self->readline())) { |
Matthias Urlichs | a57a949 | 2005-06-28 16:48:40 +0200 | [diff] [blame] | 399 | # M U gnupg-cvs-rep/AUTHORS |
| 400 | # Updated gnupg-cvs-rep/ |
| 401 | # /daten/src/rsync/gnupg-cvs-rep/AUTHORS |
| 402 | # /AUTHORS/1.1///T1.1 |
| 403 | # u=rw,g=rw,o=rw |
| 404 | # 0 |
| 405 | # ok |
| 406 | |
Junio C Hamano | 86d11cf | 2006-11-27 14:21:30 -0800 | [diff] [blame] | 407 | if ($line =~ s/^(?:Created|Updated) //) { |
Matthias Urlichs | a57a949 | 2005-06-28 16:48:40 +0200 | [diff] [blame] | 408 | $line = $self->readline(); # path |
| 409 | $line = $self->readline(); # Entries line |
| 410 | my $mode = $self->readline(); chomp $mode; |
| 411 | $self->{'mode'} = $mode; |
| 412 | defined (my $cnt = $self->readline()) |
| 413 | or die "EOF from server after 'Changed'\n"; |
| 414 | chomp $cnt; |
| 415 | die "Duh: Filesize $cnt" if $cnt !~ /^\d+$/; |
| 416 | $line=""; |
Martin Langhoff | 55cad84 | 2006-05-23 20:08:58 +1200 | [diff] [blame] | 417 | $res = $self->_fetchfile($fh, $cnt); |
Junio C Hamano | 86d11cf | 2006-11-27 14:21:30 -0800 | [diff] [blame] | 418 | } elsif ($line =~ s/^ //) { |
Sven Verdoolaege | 2eb6d82 | 2005-07-04 00:43:26 +0200 | [diff] [blame] | 419 | print $fh $line; |
| 420 | $res += length($line); |
Junio C Hamano | 86d11cf | 2006-11-27 14:21:30 -0800 | [diff] [blame] | 421 | } elsif ($line =~ /^M\b/) { |
Matthias Urlichs | a57a949 | 2005-06-28 16:48:40 +0200 | [diff] [blame] | 422 | # output, do nothing |
Junio C Hamano | 86d11cf | 2006-11-27 14:21:30 -0800 | [diff] [blame] | 423 | } elsif ($line =~ /^Mbinary\b/) { |
Matthias Urlichs | a57a949 | 2005-06-28 16:48:40 +0200 | [diff] [blame] | 424 | my $cnt; |
| 425 | die "EOF from server after 'Mbinary'" unless defined ($cnt = $self->readline()); |
| 426 | chomp $cnt; |
| 427 | die "Duh: Mbinary $cnt" if $cnt !~ /^\d+$/ or $cnt<1; |
| 428 | $line=""; |
Martin Langhoff | 55cad84 | 2006-05-23 20:08:58 +1200 | [diff] [blame] | 429 | $res += $self->_fetchfile($fh, $cnt); |
Matthias Urlichs | a57a949 | 2005-06-28 16:48:40 +0200 | [diff] [blame] | 430 | } else { |
| 431 | chomp $line; |
Junio C Hamano | 86d11cf | 2006-11-27 14:21:30 -0800 | [diff] [blame] | 432 | if ($line eq "ok") { |
Matthias Urlichs | a57a949 | 2005-06-28 16:48:40 +0200 | [diff] [blame] | 433 | # print STDERR "S: ok (".length($res).")\n"; |
| 434 | return $res; |
Junio C Hamano | 86d11cf | 2006-11-27 14:21:30 -0800 | [diff] [blame] | 435 | } elsif ($line =~ s/^E //) { |
Matthias Urlichs | a57a949 | 2005-06-28 16:48:40 +0200 | [diff] [blame] | 436 | # print STDERR "S: $line\n"; |
Junio C Hamano | 86d11cf | 2006-11-27 14:21:30 -0800 | [diff] [blame] | 437 | } elsif ($line =~ /^(Remove-entry|Removed) /i) { |
Matthias Urlichs | 8b8840e | 2005-08-15 11:28:19 +0200 | [diff] [blame] | 438 | $line = $self->readline(); # filename |
| 439 | $line = $self->readline(); # OK |
| 440 | chomp $line; |
| 441 | die "Unknown: $line" if $line ne "ok"; |
| 442 | return -1; |
Matthias Urlichs | a57a949 | 2005-06-28 16:48:40 +0200 | [diff] [blame] | 443 | } else { |
| 444 | die "Unknown: $line\n"; |
| 445 | } |
| 446 | } |
| 447 | } |
Martin Mares | 39ba7d5 | 2006-02-18 21:44:20 +0100 | [diff] [blame] | 448 | return undef; |
Matthias Urlichs | a57a949 | 2005-06-28 16:48:40 +0200 | [diff] [blame] | 449 | } |
| 450 | sub file { |
Junio C Hamano | 86d11cf | 2006-11-27 14:21:30 -0800 | [diff] [blame] | 451 | my ($self,$fn,$rev) = @_; |
Matthias Urlichs | a57a949 | 2005-06-28 16:48:40 +0200 | [diff] [blame] | 452 | my $res; |
| 453 | |
Junio C Hamano | a6080a0 | 2007-06-07 00:04:01 -0700 | [diff] [blame] | 454 | my ($fh, $name) = tempfile('gitcvs.XXXXXX', |
Sven Verdoolaege | 2eb6d82 | 2005-07-04 00:43:26 +0200 | [diff] [blame] | 455 | DIR => File::Spec->tmpdir(), UNLINK => 1); |
| 456 | |
| 457 | $self->_file($fn,$rev) and $res = $self->_line($fh); |
| 458 | |
| 459 | if (!defined $res) { |
Martin Mares | 39ba7d5 | 2006-02-18 21:44:20 +0100 | [diff] [blame] | 460 | print STDERR "Server has gone away while fetching $fn $rev, retrying...\n"; |
| 461 | truncate $fh, 0; |
Sven Verdoolaege | 2eb6d82 | 2005-07-04 00:43:26 +0200 | [diff] [blame] | 462 | $self->conn(); |
Martin Mares | 39ba7d5 | 2006-02-18 21:44:20 +0100 | [diff] [blame] | 463 | $self->_file($fn,$rev) or die "No file command send"; |
Sven Verdoolaege | 2eb6d82 | 2005-07-04 00:43:26 +0200 | [diff] [blame] | 464 | $res = $self->_line($fh); |
Martin Mares | 39ba7d5 | 2006-02-18 21:44:20 +0100 | [diff] [blame] | 465 | die "Retry failed" unless defined $res; |
Matthias Urlichs | a57a949 | 2005-06-28 16:48:40 +0200 | [diff] [blame] | 466 | } |
Sven Verdoolaege | c619ad5 | 2005-07-06 08:37:12 +0200 | [diff] [blame] | 467 | close ($fh); |
Matthias Urlichs | a57a949 | 2005-06-28 16:48:40 +0200 | [diff] [blame] | 468 | |
Sven Verdoolaege | 2eb6d82 | 2005-07-04 00:43:26 +0200 | [diff] [blame] | 469 | return ($name, $res); |
Matthias Urlichs | a57a949 | 2005-06-28 16:48:40 +0200 | [diff] [blame] | 470 | } |
Martin Langhoff | 55cad84 | 2006-05-23 20:08:58 +1200 | [diff] [blame] | 471 | sub _fetchfile { |
| 472 | my ($self, $fh, $cnt) = @_; |
Junio C Hamano | 61efa5e | 2006-05-23 16:30:39 -0700 | [diff] [blame] | 473 | my $res = 0; |
Martin Langhoff | 55cad84 | 2006-05-23 20:08:58 +1200 | [diff] [blame] | 474 | my $bufsize = 1024 * 1024; |
Junio C Hamano | 86d11cf | 2006-11-27 14:21:30 -0800 | [diff] [blame] | 475 | while ($cnt) { |
Martin Langhoff | 55cad84 | 2006-05-23 20:08:58 +1200 | [diff] [blame] | 476 | if ($bufsize > $cnt) { |
| 477 | $bufsize = $cnt; |
| 478 | } |
| 479 | my $buf; |
| 480 | my $num = $self->{'socketi'}->read($buf,$bufsize); |
| 481 | die "Server: Filesize $cnt: $num: $!\n" if not defined $num or $num<=0; |
| 482 | print $fh $buf; |
| 483 | $res += $num; |
| 484 | $cnt -= $num; |
| 485 | } |
| 486 | return $res; |
| 487 | } |
Matthias Urlichs | a57a949 | 2005-06-28 16:48:40 +0200 | [diff] [blame] | 488 | |
Dirk Hoerner | b2139db | 2009-08-14 08:58:31 +0200 | [diff] [blame] | 489 | sub _scramble { |
| 490 | my ($self, $pass) = @_; |
| 491 | my $scrambled = "A"; |
| 492 | |
| 493 | return $scrambled unless $pass; |
| 494 | |
| 495 | my $pass_len = length($pass); |
| 496 | my @pass_arr = split("", $pass); |
| 497 | my $i; |
| 498 | |
| 499 | # from cvs/src/scramble.c |
| 500 | my @shifts = ( |
| 501 | 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, |
| 502 | 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, |
| 503 | 114,120, 53, 79, 96,109, 72,108, 70, 64, 76, 67,116, 74, 68, 87, |
| 504 | 111, 52, 75,119, 49, 34, 82, 81, 95, 65,112, 86,118,110,122,105, |
| 505 | 41, 57, 83, 43, 46,102, 40, 89, 38,103, 45, 50, 42,123, 91, 35, |
| 506 | 125, 55, 54, 66,124,126, 59, 47, 92, 71,115, 78, 88,107,106, 56, |
| 507 | 36,121,117,104,101,100, 69, 73, 99, 63, 94, 93, 39, 37, 61, 48, |
| 508 | 58,113, 32, 90, 44, 98, 60, 51, 33, 97, 62, 77, 84, 80, 85,223, |
| 509 | 225,216,187,166,229,189,222,188,141,249,148,200,184,136,248,190, |
| 510 | 199,170,181,204,138,232,218,183,255,234,220,247,213,203,226,193, |
| 511 | 174,172,228,252,217,201,131,230,197,211,145,238,161,179,160,212, |
| 512 | 207,221,254,173,202,146,224,151,140,196,205,130,135,133,143,246, |
| 513 | 192,159,244,239,185,168,215,144,139,165,180,157,147,186,214,176, |
| 514 | 227,231,219,169,175,156,206,198,129,164,150,210,154,177,134,127, |
| 515 | 182,128,158,208,162,132,167,209,149,241,153,251,237,236,171,195, |
| 516 | 243,233,253,240,194,250,191,155,142,137,245,235,163,242,178,152 |
| 517 | ); |
| 518 | |
| 519 | for ($i = 0; $i < $pass_len; $i++) { |
| 520 | $scrambled .= pack("C", $shifts[ord($pass_arr[$i])]); |
| 521 | } |
| 522 | |
| 523 | return $scrambled; |
| 524 | } |
Matthias Urlichs | a57a949 | 2005-06-28 16:48:40 +0200 | [diff] [blame] | 525 | |
| 526 | package main; |
| 527 | |
Matthias Urlichs | 2a3e1a8 | 2005-06-28 19:49:19 +0200 | [diff] [blame] | 528 | my $cvs = CVSconn->new($opt_d, $cvs_tree); |
Matthias Urlichs | a57a949 | 2005-06-28 16:48:40 +0200 | [diff] [blame] | 529 | |
| 530 | |
| 531 | sub pdate($) { |
Junio C Hamano | 86d11cf | 2006-11-27 14:21:30 -0800 | [diff] [blame] | 532 | my ($d) = @_; |
Matthias Urlichs | a57a949 | 2005-06-28 16:48:40 +0200 | [diff] [blame] | 533 | m#(\d{2,4})/(\d\d)/(\d\d)\s(\d\d):(\d\d)(?::(\d\d))?# |
| 534 | or die "Unparseable date: $d\n"; |
| 535 | my $y=$1; $y-=1900 if $y>1900; |
| 536 | return timegm($6||0,$5,$4,$3,$2-1,$y); |
| 537 | } |
| 538 | |
| 539 | sub pmode($) { |
Junio C Hamano | 86d11cf | 2006-11-27 14:21:30 -0800 | [diff] [blame] | 540 | my ($mode) = @_; |
Matthias Urlichs | a57a949 | 2005-06-28 16:48:40 +0200 | [diff] [blame] | 541 | my $m = 0; |
| 542 | my $mm = 0; |
| 543 | my $um = 0; |
| 544 | for my $x(split(//,$mode)) { |
Junio C Hamano | 86d11cf | 2006-11-27 14:21:30 -0800 | [diff] [blame] | 545 | if ($x eq ",") { |
Matthias Urlichs | a57a949 | 2005-06-28 16:48:40 +0200 | [diff] [blame] | 546 | $m |= $mm&$um; |
| 547 | $mm = 0; |
| 548 | $um = 0; |
Junio C Hamano | 86d11cf | 2006-11-27 14:21:30 -0800 | [diff] [blame] | 549 | } elsif ($x eq "u") { $um |= 0700; |
| 550 | } elsif ($x eq "g") { $um |= 0070; |
| 551 | } elsif ($x eq "o") { $um |= 0007; |
| 552 | } elsif ($x eq "r") { $mm |= 0444; |
| 553 | } elsif ($x eq "w") { $mm |= 0222; |
| 554 | } elsif ($x eq "x") { $mm |= 0111; |
| 555 | } elsif ($x eq "=") { # do nothing |
Matthias Urlichs | a57a949 | 2005-06-28 16:48:40 +0200 | [diff] [blame] | 556 | } else { die "Unknown mode: $mode\n"; |
| 557 | } |
| 558 | } |
| 559 | $m |= $mm&$um; |
| 560 | return $m; |
| 561 | } |
| 562 | |
Matthias Urlichs | a57a949 | 2005-06-28 16:48:40 +0200 | [diff] [blame] | 563 | sub getwd() { |
| 564 | my $pwd = `pwd`; |
| 565 | chomp $pwd; |
| 566 | return $pwd; |
| 567 | } |
| 568 | |
Jeff King | e73aefe | 2006-05-23 03:27:46 -0400 | [diff] [blame] | 569 | sub is_sha1 { |
| 570 | my $s = shift; |
| 571 | return $s =~ /^[a-f0-9]{40}$/; |
Martin Langhoff | db4b658 | 2005-08-16 22:35:27 +1200 | [diff] [blame] | 572 | } |
| 573 | |
Jeff King | 9da0dab | 2007-11-28 13:56:11 -0500 | [diff] [blame] | 574 | sub get_headref ($) { |
| 575 | my $name = shift; |
| 576 | my $r = `git rev-parse --verify '$name' 2>/dev/null`; |
| 577 | return undef unless $? == 0; |
| 578 | chomp $r; |
| 579 | return $r; |
Jeff King | e73aefe | 2006-05-23 03:27:46 -0400 | [diff] [blame] | 580 | } |
Martin Langhoff | db4b658 | 2005-08-16 22:35:27 +1200 | [diff] [blame] | 581 | |
Jeff King | f6fdbb6 | 2009-10-19 02:49:55 -0400 | [diff] [blame] | 582 | my $user_filename_prepend = ''; |
| 583 | sub munge_user_filename { |
| 584 | my $name = shift; |
| 585 | return File::Spec->file_name_is_absolute($name) ? |
| 586 | $name : |
| 587 | $user_filename_prepend . $name; |
| 588 | } |
| 589 | |
Matthias Urlichs | a57a949 | 2005-06-28 16:48:40 +0200 | [diff] [blame] | 590 | -d $git_tree |
| 591 | or mkdir($git_tree,0777) |
| 592 | or die "Could not create $git_tree: $!"; |
Jeff King | f6fdbb6 | 2009-10-19 02:49:55 -0400 | [diff] [blame] | 593 | if ($git_tree ne '.') { |
| 594 | $user_filename_prepend = getwd() . '/'; |
| 595 | chdir($git_tree); |
| 596 | } |
Matthias Urlichs | a57a949 | 2005-06-28 16:48:40 +0200 | [diff] [blame] | 597 | |
| 598 | my $last_branch = ""; |
Matthias Urlichs | 4654166 | 2005-06-28 21:08:15 +0200 | [diff] [blame] | 599 | my $orig_branch = ""; |
Matthias Urlichs | a57a949 | 2005-06-28 16:48:40 +0200 | [diff] [blame] | 600 | my %branch_date; |
Junio C Hamano | 8a5f2ea | 2006-03-17 14:08:39 -0800 | [diff] [blame] | 601 | my $tip_at_start = undef; |
Matthias Urlichs | a57a949 | 2005-06-28 16:48:40 +0200 | [diff] [blame] | 602 | |
| 603 | my $git_dir = $ENV{"GIT_DIR"} || ".git"; |
| 604 | $git_dir = getwd()."/".$git_dir unless $git_dir =~ m#^/#; |
| 605 | $ENV{"GIT_DIR"} = $git_dir; |
Sven Verdoolaege | 79ee456 | 2005-07-04 13:36:59 +0200 | [diff] [blame] | 606 | my $orig_git_index; |
| 607 | $orig_git_index = $ENV{GIT_INDEX_FILE} if exists $ENV{GIT_INDEX_FILE}; |
Martin Langhoff | 8f73264 | 2006-06-12 23:50:49 +1200 | [diff] [blame] | 608 | |
| 609 | my %index; # holds filenames of one index per branch |
Johannes Schindelin | 061303f | 2006-06-24 21:42:20 +0200 | [diff] [blame] | 610 | |
Junio C Hamano | 86d11cf | 2006-11-27 14:21:30 -0800 | [diff] [blame] | 611 | unless (-d $git_dir) { |
Ben Walton | 91fe732 | 2010-01-19 14:03:10 -0500 | [diff] [blame] | 612 | system(qw(git init)); |
Matthias Urlichs | a57a949 | 2005-06-28 16:48:40 +0200 | [diff] [blame] | 613 | die "Cannot init the GIT db at $git_tree: $?\n" if $?; |
Ben Walton | 91fe732 | 2010-01-19 14:03:10 -0500 | [diff] [blame] | 614 | system(qw(git read-tree)); |
Matthias Urlichs | a57a949 | 2005-06-28 16:48:40 +0200 | [diff] [blame] | 615 | die "Cannot init an empty tree: $?\n" if $?; |
| 616 | |
| 617 | $last_branch = $opt_o; |
Matthias Urlichs | 4654166 | 2005-06-28 21:08:15 +0200 | [diff] [blame] | 618 | $orig_branch = ""; |
Matthias Urlichs | a57a949 | 2005-06-28 16:48:40 +0200 | [diff] [blame] | 619 | } else { |
Ben Walton | a12477d | 2010-01-19 14:03:09 -0500 | [diff] [blame] | 620 | open(F, "-|", qw(git symbolic-ref HEAD)) or |
Ben Walton | 640d9d0 | 2010-01-19 14:03:08 -0500 | [diff] [blame] | 621 | die "Cannot run git symbolic-ref: $!\n"; |
Pavel Roskin | 8366a10 | 2005-11-16 13:27:28 -0500 | [diff] [blame] | 622 | chomp ($last_branch = <F>); |
| 623 | $last_branch = basename($last_branch); |
| 624 | close(F); |
Junio C Hamano | 86d11cf | 2006-11-27 14:21:30 -0800 | [diff] [blame] | 625 | unless ($last_branch) { |
Matthias Urlichs | 4654166 | 2005-06-28 21:08:15 +0200 | [diff] [blame] | 626 | warn "Cannot read the last branch name: $! -- assuming 'master'\n"; |
| 627 | $last_branch = "master"; |
| 628 | } |
| 629 | $orig_branch = $last_branch; |
Ben Walton | 640d9d0 | 2010-01-19 14:03:08 -0500 | [diff] [blame] | 630 | $tip_at_start = `git rev-parse --verify HEAD`; |
Matthias Urlichs | a57a949 | 2005-06-28 16:48:40 +0200 | [diff] [blame] | 631 | |
| 632 | # Get the last import timestamps |
Andy Whitcroft | 1f24c58 | 2006-09-20 17:37:04 +0100 | [diff] [blame] | 633 | my $fmt = '($ref, $author) = (%(refname), %(author));'; |
Ben Walton | a12477d | 2010-01-19 14:03:09 -0500 | [diff] [blame] | 634 | my @cmd = ('git', 'for-each-ref', '--perl', "--format=$fmt", $remote); |
| 635 | open(H, "-|", @cmd) or die "Cannot run git for-each-ref: $!\n"; |
Junio C Hamano | 86d11cf | 2006-11-27 14:21:30 -0800 | [diff] [blame] | 636 | while (defined(my $entry = <H>)) { |
Andy Whitcroft | 1f24c58 | 2006-09-20 17:37:04 +0100 | [diff] [blame] | 637 | my ($ref, $author); |
| 638 | eval($entry) || die "cannot eval refs list: $@"; |
Andy Whitcroft | 8b7f5fc | 2007-05-30 01:56:41 +0100 | [diff] [blame] | 639 | my ($head) = ($ref =~ m|^$remote/(.*)|); |
Andy Whitcroft | 1f24c58 | 2006-09-20 17:37:04 +0100 | [diff] [blame] | 640 | $author =~ /^.*\s(\d+)\s[-+]\d{4}$/; |
| 641 | $branch_date{$head} = $1; |
Matthias Urlichs | a57a949 | 2005-06-28 16:48:40 +0200 | [diff] [blame] | 642 | } |
Andy Whitcroft | 1f24c58 | 2006-09-20 17:37:04 +0100 | [diff] [blame] | 643 | close(H); |
Stephan Springl | 7ca055f | 2007-05-23 12:13:21 +0100 | [diff] [blame] | 644 | if (!exists $branch_date{$opt_o}) { |
| 645 | die "Branch '$opt_o' does not exist.\n". |
| 646 | "Either use the correct '-o branch' option,\n". |
| 647 | "or import to a new repository.\n"; |
| 648 | } |
Matthias Urlichs | a57a949 | 2005-06-28 16:48:40 +0200 | [diff] [blame] | 649 | } |
| 650 | |
| 651 | -d $git_dir |
| 652 | or die "Could not create git subdir ($git_dir).\n"; |
| 653 | |
Andreas Ericsson | ffd97f3 | 2006-01-13 00:38:59 +0100 | [diff] [blame] | 654 | # now we read (and possibly save) author-info as well |
| 655 | -f "$git_dir/cvs-authors" and |
| 656 | read_author_info("$git_dir/cvs-authors"); |
| 657 | if ($opt_A) { |
Jeff King | f6fdbb6 | 2009-10-19 02:49:55 -0400 | [diff] [blame] | 658 | read_author_info(munge_user_filename($opt_A)); |
Andreas Ericsson | ffd97f3 | 2006-01-13 00:38:59 +0100 | [diff] [blame] | 659 | write_author_info("$git_dir/cvs-authors"); |
| 660 | } |
| 661 | |
Aaron Crane | 0455ec0 | 2010-02-06 18:26:24 +0000 | [diff] [blame] | 662 | # open .git/cvs-revisions, if requested |
| 663 | open my $revision_map, '>>', "$git_dir/cvs-revisions" |
| 664 | or die "Can't open $git_dir/cvs-revisions for appending: $!\n" |
| 665 | if defined $opt_R; |
| 666 | |
Martin Langhoff | 2f57c69 | 2006-06-11 20:12:20 +1200 | [diff] [blame] | 667 | |
| 668 | # |
| 669 | # run cvsps into a file unless we are getting |
| 670 | # it passed as a file via $opt_P |
| 671 | # |
Martin Langhoff | 4083c2f | 2007-01-08 21:08:46 +1300 | [diff] [blame] | 672 | my $cvspsfile; |
Martin Langhoff | 2f57c69 | 2006-06-11 20:12:20 +1200 | [diff] [blame] | 673 | unless ($opt_P) { |
| 674 | print "Running cvsps...\n" if $opt_v; |
| 675 | my $pid = open(CVSPS,"-|"); |
Martin Langhoff | 4083c2f | 2007-01-08 21:08:46 +1300 | [diff] [blame] | 676 | my $cvspsfh; |
Martin Langhoff | 2f57c69 | 2006-06-11 20:12:20 +1200 | [diff] [blame] | 677 | die "Cannot fork: $!\n" unless defined $pid; |
Junio C Hamano | 86d11cf | 2006-11-27 14:21:30 -0800 | [diff] [blame] | 678 | unless ($pid) { |
Martin Langhoff | 2f57c69 | 2006-06-11 20:12:20 +1200 | [diff] [blame] | 679 | my @opt; |
| 680 | @opt = split(/,/,$opt_p) if defined $opt_p; |
| 681 | unshift @opt, '-z', $opt_z if defined $opt_z; |
| 682 | unshift @opt, '-q' unless defined $opt_v; |
| 683 | unless (defined($opt_p) && $opt_p =~ m/--no-cvs-direct/) { |
| 684 | push @opt, '--cvs-direct'; |
| 685 | } |
| 686 | exec("cvsps","--norc",@opt,"-u","-A",'--root',$opt_d,$cvs_tree); |
| 687 | die "Could not start cvsps: $!\n"; |
Martin Langhoff | df73e9c | 2005-10-11 21:57:04 -0700 | [diff] [blame] | 688 | } |
Martin Langhoff | 4083c2f | 2007-01-08 21:08:46 +1300 | [diff] [blame] | 689 | ($cvspsfh, $cvspsfile) = tempfile('gitXXXXXX', SUFFIX => '.cvsps', |
| 690 | DIR => File::Spec->tmpdir()); |
Martin Langhoff | 2f57c69 | 2006-06-11 20:12:20 +1200 | [diff] [blame] | 691 | while (<CVSPS>) { |
| 692 | print $cvspsfh $_; |
Martin Langhoff | 211dcac | 2005-11-02 13:48:47 +1300 | [diff] [blame] | 693 | } |
Martin Langhoff | 2f57c69 | 2006-06-11 20:12:20 +1200 | [diff] [blame] | 694 | close CVSPS; |
Ben Walton | 640d9d0 | 2010-01-19 14:03:08 -0500 | [diff] [blame] | 695 | $? == 0 or die "git cvsimport: fatal: cvsps reported error\n"; |
Martin Langhoff | 2f57c69 | 2006-06-11 20:12:20 +1200 | [diff] [blame] | 696 | close $cvspsfh; |
Martin Langhoff | 4083c2f | 2007-01-08 21:08:46 +1300 | [diff] [blame] | 697 | } else { |
Jeff King | f6fdbb6 | 2009-10-19 02:49:55 -0400 | [diff] [blame] | 698 | $cvspsfile = munge_user_filename($opt_P); |
Matthias Urlichs | a57a949 | 2005-06-28 16:48:40 +0200 | [diff] [blame] | 699 | } |
| 700 | |
Martin Langhoff | 4083c2f | 2007-01-08 21:08:46 +1300 | [diff] [blame] | 701 | open(CVS, "<$cvspsfile") or die $!; |
Martin Langhoff | 2f57c69 | 2006-06-11 20:12:20 +1200 | [diff] [blame] | 702 | |
Matthias Urlichs | a57a949 | 2005-06-28 16:48:40 +0200 | [diff] [blame] | 703 | ## cvsps output: |
| 704 | #--------------------- |
| 705 | #PatchSet 314 |
| 706 | #Date: 1999/09/18 13:03:59 |
| 707 | #Author: wkoch |
| 708 | #Branch: STABLE-BRANCH-1-0 |
| 709 | #Ancestor branch: HEAD |
| 710 | #Tag: (none) |
| 711 | #Log: |
| 712 | # See ChangeLog: Sat Sep 18 13:03:28 CEST 1999 Werner Koch |
| 713 | #Members: |
| 714 | # README:1.57->1.57.2.1 |
| 715 | # VERSION:1.96->1.96.2.1 |
| 716 | # |
| 717 | #--------------------- |
| 718 | |
| 719 | my $state = 0; |
| 720 | |
Jeff King | e73aefe | 2006-05-23 03:27:46 -0400 | [diff] [blame] | 721 | sub update_index (\@\@) { |
| 722 | my $old = shift; |
| 723 | my $new = shift; |
Ben Walton | 640d9d0 | 2010-01-19 14:03:08 -0500 | [diff] [blame] | 724 | open(my $fh, '|-', qw(git update-index -z --index-info)) |
| 725 | or die "unable to open git update-index: $!"; |
Jeff King | 6a1871e | 2006-05-23 03:27:45 -0400 | [diff] [blame] | 726 | print $fh |
| 727 | (map { "0 0000000000000000000000000000000000000000\t$_\0" } |
Jeff King | e73aefe | 2006-05-23 03:27:46 -0400 | [diff] [blame] | 728 | @$old), |
Jeff King | 6a1871e | 2006-05-23 03:27:45 -0400 | [diff] [blame] | 729 | (map { '100' . sprintf('%o', $_->[0]) . " $_->[1]\t$_->[2]\0" } |
Jeff King | e73aefe | 2006-05-23 03:27:46 -0400 | [diff] [blame] | 730 | @$new) |
Ben Walton | 640d9d0 | 2010-01-19 14:03:08 -0500 | [diff] [blame] | 731 | or die "unable to write to git update-index: $!"; |
Jeff King | 6a1871e | 2006-05-23 03:27:45 -0400 | [diff] [blame] | 732 | close $fh |
Ben Walton | 640d9d0 | 2010-01-19 14:03:08 -0500 | [diff] [blame] | 733 | or die "unable to write to git update-index: $!"; |
| 734 | $? and die "git update-index reported error: $?"; |
Jeff King | e73aefe | 2006-05-23 03:27:46 -0400 | [diff] [blame] | 735 | } |
Matthias Urlichs | a57a949 | 2005-06-28 16:48:40 +0200 | [diff] [blame] | 736 | |
Jeff King | e73aefe | 2006-05-23 03:27:46 -0400 | [diff] [blame] | 737 | sub write_tree () { |
Ben Walton | a12477d | 2010-01-19 14:03:09 -0500 | [diff] [blame] | 738 | open(my $fh, '-|', qw(git write-tree)) |
Ben Walton | 640d9d0 | 2010-01-19 14:03:08 -0500 | [diff] [blame] | 739 | or die "unable to open git write-tree: $!"; |
Jeff King | e73aefe | 2006-05-23 03:27:46 -0400 | [diff] [blame] | 740 | chomp(my $tree = <$fh>); |
| 741 | is_sha1($tree) |
| 742 | or die "Cannot get tree id ($tree): $!"; |
| 743 | close($fh) |
Ben Walton | 640d9d0 | 2010-01-19 14:03:08 -0500 | [diff] [blame] | 744 | or die "Error running git write-tree: $?\n"; |
Matthias Urlichs | a57a949 | 2005-06-28 16:48:40 +0200 | [diff] [blame] | 745 | print "Tree ID $tree\n" if $opt_v; |
Jeff King | e73aefe | 2006-05-23 03:27:46 -0400 | [diff] [blame] | 746 | return $tree; |
| 747 | } |
Matthias Urlichs | a57a949 | 2005-06-28 16:48:40 +0200 | [diff] [blame] | 748 | |
Junio C Hamano | 86d11cf | 2006-11-27 14:21:30 -0800 | [diff] [blame] | 749 | my ($patchset,$date,$author_name,$author_email,$branch,$ancestor,$tag,$logmsg); |
Aaron Crane | 0455ec0 | 2010-02-06 18:26:24 +0000 | [diff] [blame] | 750 | my (@old,@new,@skipped,%ignorebranch,@commit_revisions); |
Martin Langhoff | 71b0814 | 2006-06-11 20:12:09 +1200 | [diff] [blame] | 751 | |
| 752 | # commits that cvsps cannot place anywhere... |
| 753 | $ignorebranch{'#CVSPS_NO_BRANCH'} = 1; |
| 754 | |
Jeff King | e73aefe | 2006-05-23 03:27:46 -0400 | [diff] [blame] | 755 | sub commit { |
Jeff King | 9da0dab | 2007-11-28 13:56:11 -0500 | [diff] [blame] | 756 | if ($branch eq $opt_o && !$index{branch} && |
| 757 | !get_headref("$remote/$branch")) { |
Martin Langhoff | c5f448b | 2006-06-28 22:13:23 +1200 | [diff] [blame] | 758 | # looks like an initial commit |
Ben Walton | 640d9d0 | 2010-01-19 14:03:08 -0500 | [diff] [blame] | 759 | # use the index primed by git init |
Michael Milligan | 23fcdc7 | 2007-06-05 00:06:30 -0600 | [diff] [blame] | 760 | $ENV{GIT_INDEX_FILE} = "$git_dir/index"; |
| 761 | $index{$branch} = "$git_dir/index"; |
Martin Langhoff | c5f448b | 2006-06-28 22:13:23 +1200 | [diff] [blame] | 762 | } else { |
| 763 | # use an index per branch to speed up |
| 764 | # imports of projects with many branches |
| 765 | unless ($index{$branch}) { |
| 766 | $index{$branch} = tmpnam(); |
| 767 | $ENV{GIT_INDEX_FILE} = $index{$branch}; |
| 768 | if ($ancestor) { |
Ben Walton | 640d9d0 | 2010-01-19 14:03:08 -0500 | [diff] [blame] | 769 | system("git", "read-tree", "$remote/$ancestor"); |
Martin Langhoff | c5f448b | 2006-06-28 22:13:23 +1200 | [diff] [blame] | 770 | } else { |
Ben Walton | 640d9d0 | 2010-01-19 14:03:08 -0500 | [diff] [blame] | 771 | system("git", "read-tree", "$remote/$branch"); |
Martin Langhoff | c5f448b | 2006-06-28 22:13:23 +1200 | [diff] [blame] | 772 | } |
| 773 | die "read-tree failed: $?\n" if $?; |
| 774 | } |
| 775 | } |
| 776 | $ENV{GIT_INDEX_FILE} = $index{$branch}; |
| 777 | |
Jeff King | e73aefe | 2006-05-23 03:27:46 -0400 | [diff] [blame] | 778 | update_index(@old, @new); |
| 779 | @old = @new = (); |
| 780 | my $tree = write_tree(); |
Jeff King | 9da0dab | 2007-11-28 13:56:11 -0500 | [diff] [blame] | 781 | my $parent = get_headref("$remote/$last_branch"); |
Jeff King | e73aefe | 2006-05-23 03:27:46 -0400 | [diff] [blame] | 782 | print "Parent ID " . ($parent ? $parent : "(empty)") . "\n" if $opt_v; |
Matthias Urlichs | a57a949 | 2005-06-28 16:48:40 +0200 | [diff] [blame] | 783 | |
Jeff King | e73aefe | 2006-05-23 03:27:46 -0400 | [diff] [blame] | 784 | my @commit_args; |
| 785 | push @commit_args, ("-p", $parent) if $parent; |
Matthias Urlichs | 2a3e1a8 | 2005-06-28 19:49:19 +0200 | [diff] [blame] | 786 | |
Jeff King | e73aefe | 2006-05-23 03:27:46 -0400 | [diff] [blame] | 787 | # loose detection of merges |
| 788 | # based on the commit msg |
| 789 | foreach my $rx (@mergerx) { |
| 790 | next unless $logmsg =~ $rx && $1; |
| 791 | my $mparent = $1 eq 'HEAD' ? $opt_o : $1; |
Jeff King | 9da0dab | 2007-11-28 13:56:11 -0500 | [diff] [blame] | 792 | if (my $sha1 = get_headref("$remote/$mparent")) { |
Marc-Andre Lureau | c36c5b8 | 2008-03-12 21:54:21 +0200 | [diff] [blame] | 793 | push @commit_args, '-p', "$remote/$mparent"; |
Jeff King | e73aefe | 2006-05-23 03:27:46 -0400 | [diff] [blame] | 794 | print "Merge parent branch: $mparent\n" if $opt_v; |
Martin Langhoff | db4b658 | 2005-08-16 22:35:27 +1200 | [diff] [blame] | 795 | } |
Matthias Urlichs | a57a949 | 2005-06-28 16:48:40 +0200 | [diff] [blame] | 796 | } |
Jeff King | e73aefe | 2006-05-23 03:27:46 -0400 | [diff] [blame] | 797 | |
| 798 | my $commit_date = strftime("+0000 %Y-%m-%d %H:%M:%S",gmtime($date)); |
Jeff King | 62bf0d9 | 2006-05-23 16:59:44 -0400 | [diff] [blame] | 799 | $ENV{GIT_AUTHOR_NAME} = $author_name; |
| 800 | $ENV{GIT_AUTHOR_EMAIL} = $author_email; |
| 801 | $ENV{GIT_AUTHOR_DATE} = $commit_date; |
| 802 | $ENV{GIT_COMMITTER_NAME} = $author_name; |
| 803 | $ENV{GIT_COMMITTER_EMAIL} = $author_email; |
| 804 | $ENV{GIT_COMMITTER_DATE} = $commit_date; |
Jeff King | e73aefe | 2006-05-23 03:27:46 -0400 | [diff] [blame] | 805 | my $pid = open2(my $commit_read, my $commit_write, |
Ben Walton | 640d9d0 | 2010-01-19 14:03:08 -0500 | [diff] [blame] | 806 | 'git', 'commit-tree', $tree, @commit_args); |
Matthias Urlichs | e371046 | 2005-06-30 22:09:42 +0200 | [diff] [blame] | 807 | |
| 808 | # compatibility with git2cvs |
| 809 | substr($logmsg,32767) = "" if length($logmsg) > 32767; |
| 810 | $logmsg =~ s/[\s\n]+\z//; |
| 811 | |
Martin Langhoff | 5179c8a | 2006-01-30 19:12:41 +1300 | [diff] [blame] | 812 | if (@skipped) { |
| 813 | $logmsg .= "\n\n\nSKIPPED:\n\t"; |
| 814 | $logmsg .= join("\n\t", @skipped) . "\n"; |
Martin Langhoff | f396f01 | 2006-05-23 00:45:47 +1200 | [diff] [blame] | 815 | @skipped = (); |
Martin Langhoff | 5179c8a | 2006-01-30 19:12:41 +1300 | [diff] [blame] | 816 | } |
| 817 | |
Jeff King | e73aefe | 2006-05-23 03:27:46 -0400 | [diff] [blame] | 818 | print($commit_write "$logmsg\n") && close($commit_write) |
Ben Walton | 640d9d0 | 2010-01-19 14:03:08 -0500 | [diff] [blame] | 819 | or die "Error writing to git commit-tree: $!\n"; |
Matthias Urlichs | 2a3e1a8 | 2005-06-28 19:49:19 +0200 | [diff] [blame] | 820 | |
Jeff King | e73aefe | 2006-05-23 03:27:46 -0400 | [diff] [blame] | 821 | print "Committed patch $patchset ($branch $commit_date)\n" if $opt_v; |
| 822 | chomp(my $cid = <$commit_read>); |
| 823 | is_sha1($cid) or die "Cannot get commit id ($cid): $!\n"; |
Matthias Urlichs | a57a949 | 2005-06-28 16:48:40 +0200 | [diff] [blame] | 824 | print "Commit ID $cid\n" if $opt_v; |
Jeff King | e73aefe | 2006-05-23 03:27:46 -0400 | [diff] [blame] | 825 | close($commit_read); |
Matthias Urlichs | 2a3e1a8 | 2005-06-28 19:49:19 +0200 | [diff] [blame] | 826 | |
| 827 | waitpid($pid,0); |
Ben Walton | 640d9d0 | 2010-01-19 14:03:08 -0500 | [diff] [blame] | 828 | die "Error running git commit-tree: $?\n" if $?; |
Matthias Urlichs | a57a949 | 2005-06-28 16:48:40 +0200 | [diff] [blame] | 829 | |
Ben Walton | 640d9d0 | 2010-01-19 14:03:08 -0500 | [diff] [blame] | 830 | system('git' , 'update-ref', "$remote/$branch", $cid) == 0 |
Matthias Urlichs | a57a949 | 2005-06-28 16:48:40 +0200 | [diff] [blame] | 831 | or die "Cannot write branch $branch for update: $!\n"; |
| 832 | |
Aaron Crane | 0455ec0 | 2010-02-06 18:26:24 +0000 | [diff] [blame] | 833 | if ($revision_map) { |
| 834 | print $revision_map "@$_ $cid\n" for @commit_revisions; |
| 835 | } |
| 836 | @commit_revisions = (); |
| 837 | |
Junio C Hamano | 86d11cf | 2006-11-27 14:21:30 -0800 | [diff] [blame] | 838 | if ($tag) { |
Junio C Hamano | 86d11cf | 2006-11-27 14:21:30 -0800 | [diff] [blame] | 839 | my ($xtag) = $tag; |
H. Peter Anvin | 0d821d4 | 2005-09-06 10:36:01 -0700 | [diff] [blame] | 840 | $xtag =~ s/\s+\*\*.*$//; # Remove stuff like ** INVALID ** and ** FUNKY ** |
| 841 | $xtag =~ tr/_/\./ if ( $opt_u ); |
Joe English | 34c99da | 2006-01-06 12:52:27 -0800 | [diff] [blame] | 842 | $xtag =~ s/[\/]/$opt_s/g; |
Paul Oliver | 509792b | 2008-05-23 19:29:22 +0100 | [diff] [blame] | 843 | $xtag =~ s/\[//g; |
Junio C Hamano | a6080a0 | 2007-06-07 00:04:01 -0700 | [diff] [blame] | 844 | |
Ben Walton | 640d9d0 | 2010-01-19 14:03:08 -0500 | [diff] [blame] | 845 | system('git' , 'tag', '-f', $xtag, $cid) == 0 |
H. Peter Anvin | 0d821d4 | 2005-09-06 10:36:01 -0700 | [diff] [blame] | 846 | or die "Cannot create tag $xtag: $!\n"; |
H. Peter Anvin | 0d821d4 | 2005-09-06 10:36:01 -0700 | [diff] [blame] | 847 | |
| 848 | print "Created tag '$xtag' on '$branch'\n" if $opt_v; |
Matthias Urlichs | a57a949 | 2005-06-28 16:48:40 +0200 | [diff] [blame] | 849 | } |
Matthias Urlichs | a57a949 | 2005-06-28 16:48:40 +0200 | [diff] [blame] | 850 | }; |
| 851 | |
Martin Langhoff | 0691834 | 2006-05-22 23:38:08 +1200 | [diff] [blame] | 852 | my $commitcount = 1; |
Junio C Hamano | 86d11cf | 2006-11-27 14:21:30 -0800 | [diff] [blame] | 853 | while (<CVS>) { |
Matthias Urlichs | a57a949 | 2005-06-28 16:48:40 +0200 | [diff] [blame] | 854 | chomp; |
Junio C Hamano | 86d11cf | 2006-11-27 14:21:30 -0800 | [diff] [blame] | 855 | if ($state == 0 and /^-+$/) { |
Matthias Urlichs | a57a949 | 2005-06-28 16:48:40 +0200 | [diff] [blame] | 856 | $state = 1; |
Junio C Hamano | 86d11cf | 2006-11-27 14:21:30 -0800 | [diff] [blame] | 857 | } elsif ($state == 0) { |
Matthias Urlichs | a57a949 | 2005-06-28 16:48:40 +0200 | [diff] [blame] | 858 | $state = 1; |
| 859 | redo; |
Junio C Hamano | 86d11cf | 2006-11-27 14:21:30 -0800 | [diff] [blame] | 860 | } elsif (($state==0 or $state==1) and s/^PatchSet\s+//) { |
Matthias Urlichs | a57a949 | 2005-06-28 16:48:40 +0200 | [diff] [blame] | 861 | $patchset = 0+$_; |
| 862 | $state=2; |
Junio C Hamano | 86d11cf | 2006-11-27 14:21:30 -0800 | [diff] [blame] | 863 | } elsif ($state == 2 and s/^Date:\s+//) { |
Matthias Urlichs | a57a949 | 2005-06-28 16:48:40 +0200 | [diff] [blame] | 864 | $date = pdate($_); |
Junio C Hamano | 86d11cf | 2006-11-27 14:21:30 -0800 | [diff] [blame] | 865 | unless ($date) { |
Matthias Urlichs | a57a949 | 2005-06-28 16:48:40 +0200 | [diff] [blame] | 866 | print STDERR "Could not parse date: $_\n"; |
| 867 | $state=0; |
| 868 | next; |
| 869 | } |
| 870 | $state=3; |
Junio C Hamano | 86d11cf | 2006-11-27 14:21:30 -0800 | [diff] [blame] | 871 | } elsif ($state == 3 and s/^Author:\s+//) { |
Matthias Urlichs | a57a949 | 2005-06-28 16:48:40 +0200 | [diff] [blame] | 872 | s/\s+$//; |
Junio C Hamano | 94c2334 | 2005-09-30 01:48:57 -0700 | [diff] [blame] | 873 | if (/^(.*?)\s+<(.*)>/) { |
| 874 | ($author_name, $author_email) = ($1, $2); |
Andreas Ericsson | ffd97f3 | 2006-01-13 00:38:59 +0100 | [diff] [blame] | 875 | } elsif ($conv_author_name{$_}) { |
| 876 | $author_name = $conv_author_name{$_}; |
| 877 | $author_email = $conv_author_email{$_}; |
Junio C Hamano | 94c2334 | 2005-09-30 01:48:57 -0700 | [diff] [blame] | 878 | } else { |
| 879 | $author_name = $author_email = $_; |
| 880 | } |
Matthias Urlichs | a57a949 | 2005-06-28 16:48:40 +0200 | [diff] [blame] | 881 | $state = 4; |
Junio C Hamano | 86d11cf | 2006-11-27 14:21:30 -0800 | [diff] [blame] | 882 | } elsif ($state == 4 and s/^Branch:\s+//) { |
Matthias Urlichs | a57a949 | 2005-06-28 16:48:40 +0200 | [diff] [blame] | 883 | s/\s+$//; |
Gerrit Pape | a055422 | 2007-11-03 11:55:02 +0000 | [diff] [blame] | 884 | tr/_/\./ if ( $opt_u ); |
Johannes Schindelin | fbfd60d | 2005-08-17 11:19:20 +0200 | [diff] [blame] | 885 | s/[\/]/$opt_s/g; |
Matthias Urlichs | a57a949 | 2005-06-28 16:48:40 +0200 | [diff] [blame] | 886 | $branch = $_; |
| 887 | $state = 5; |
Junio C Hamano | 86d11cf | 2006-11-27 14:21:30 -0800 | [diff] [blame] | 888 | } elsif ($state == 5 and s/^Ancestor branch:\s+//) { |
Matthias Urlichs | a57a949 | 2005-06-28 16:48:40 +0200 | [diff] [blame] | 889 | s/\s+$//; |
| 890 | $ancestor = $_; |
Sven Verdoolaege | 0fa2824 | 2005-06-30 17:23:22 +0200 | [diff] [blame] | 891 | $ancestor = $opt_o if $ancestor eq "HEAD"; |
Matthias Urlichs | a57a949 | 2005-06-28 16:48:40 +0200 | [diff] [blame] | 892 | $state = 6; |
Junio C Hamano | 86d11cf | 2006-11-27 14:21:30 -0800 | [diff] [blame] | 893 | } elsif ($state == 5) { |
Matthias Urlichs | a57a949 | 2005-06-28 16:48:40 +0200 | [diff] [blame] | 894 | $ancestor = undef; |
| 895 | $state = 6; |
| 896 | redo; |
Junio C Hamano | 86d11cf | 2006-11-27 14:21:30 -0800 | [diff] [blame] | 897 | } elsif ($state == 6 and s/^Tag:\s+//) { |
Matthias Urlichs | a57a949 | 2005-06-28 16:48:40 +0200 | [diff] [blame] | 898 | s/\s+$//; |
Junio C Hamano | 86d11cf | 2006-11-27 14:21:30 -0800 | [diff] [blame] | 899 | if ($_ eq "(none)") { |
Matthias Urlichs | a57a949 | 2005-06-28 16:48:40 +0200 | [diff] [blame] | 900 | $tag = undef; |
| 901 | } else { |
| 902 | $tag = $_; |
| 903 | } |
| 904 | $state = 7; |
Junio C Hamano | 86d11cf | 2006-11-27 14:21:30 -0800 | [diff] [blame] | 905 | } elsif ($state == 7 and /^Log:/) { |
Matthias Urlichs | a57a949 | 2005-06-28 16:48:40 +0200 | [diff] [blame] | 906 | $logmsg = ""; |
| 907 | $state = 8; |
Junio C Hamano | 86d11cf | 2006-11-27 14:21:30 -0800 | [diff] [blame] | 908 | } elsif ($state == 8 and /^Members:/) { |
Matthias Urlichs | a57a949 | 2005-06-28 16:48:40 +0200 | [diff] [blame] | 909 | $branch = $opt_o if $branch eq "HEAD"; |
Junio C Hamano | 86d11cf | 2006-11-27 14:21:30 -0800 | [diff] [blame] | 910 | if (defined $branch_date{$branch} and $branch_date{$branch} >= $date) { |
Matthias Urlichs | a57a949 | 2005-06-28 16:48:40 +0200 | [diff] [blame] | 911 | # skip |
Matthias Urlichs | 9da07f3 | 2005-07-03 19:03:30 +0200 | [diff] [blame] | 912 | print "skip patchset $patchset: $date before $branch_date{$branch}\n" if $opt_v; |
Matthias Urlichs | a57a949 | 2005-06-28 16:48:40 +0200 | [diff] [blame] | 913 | $state = 11; |
| 914 | next; |
| 915 | } |
Martin Langhoff | ded9f40 | 2007-01-08 19:43:39 +1300 | [diff] [blame] | 916 | if (!$opt_a && $starttime - 300 - (defined $opt_z ? $opt_z : 300) <= $date) { |
Martin Langhoff | 6211988 | 2007-01-08 14:11:23 +1300 | [diff] [blame] | 917 | # skip if the commit is too recent |
Stefan Sperling | 77190eb | 2007-12-21 16:57:26 +0100 | [diff] [blame] | 918 | # given that the cvsps default fuzz is 300s, we give ourselves another |
Martin Langhoff | 6211988 | 2007-01-08 14:11:23 +1300 | [diff] [blame] | 919 | # 300s just in case -- this also prevents skipping commits |
| 920 | # due to server clock drift |
| 921 | print "skip patchset $patchset: $date too recent\n" if $opt_v; |
| 922 | $state = 11; |
| 923 | next; |
| 924 | } |
Martin Langhoff | 71b0814 | 2006-06-11 20:12:09 +1200 | [diff] [blame] | 925 | if (exists $ignorebranch{$branch}) { |
| 926 | print STDERR "Skipping $branch\n"; |
| 927 | $state = 11; |
| 928 | next; |
| 929 | } |
Junio C Hamano | 86d11cf | 2006-11-27 14:21:30 -0800 | [diff] [blame] | 930 | if ($ancestor) { |
| 931 | if ($ancestor eq $branch) { |
Martin Langhoff | 71b0814 | 2006-06-11 20:12:09 +1200 | [diff] [blame] | 932 | print STDERR "Branch $branch erroneously stems from itself -- changed ancestor to $opt_o\n"; |
| 933 | $ancestor = $opt_o; |
| 934 | } |
Jeff King | 0750d75 | 2007-11-28 13:56:28 -0500 | [diff] [blame] | 935 | if (defined get_headref("$remote/$branch")) { |
Matthias Urlichs | a57a949 | 2005-06-28 16:48:40 +0200 | [diff] [blame] | 936 | print STDERR "Branch $branch already exists!\n"; |
| 937 | $state=11; |
| 938 | next; |
| 939 | } |
Jeff King | 0750d75 | 2007-11-28 13:56:28 -0500 | [diff] [blame] | 940 | my $id = get_headref("$remote/$ancestor"); |
| 941 | if (!$id) { |
Matthias Urlichs | a57a949 | 2005-06-28 16:48:40 +0200 | [diff] [blame] | 942 | print STDERR "Branch $ancestor does not exist!\n"; |
Martin Langhoff | 71b0814 | 2006-06-11 20:12:09 +1200 | [diff] [blame] | 943 | $ignorebranch{$branch} = 1; |
Matthias Urlichs | a57a949 | 2005-06-28 16:48:40 +0200 | [diff] [blame] | 944 | $state=11; |
| 945 | next; |
| 946 | } |
Jeff King | 0750d75 | 2007-11-28 13:56:28 -0500 | [diff] [blame] | 947 | |
| 948 | system(qw(git update-ref -m cvsimport), |
| 949 | "$remote/$branch", $id); |
| 950 | if($? != 0) { |
| 951 | print STDERR "Could not create branch $branch\n"; |
Martin Langhoff | 71b0814 | 2006-06-11 20:12:09 +1200 | [diff] [blame] | 952 | $ignorebranch{$branch} = 1; |
Matthias Urlichs | a57a949 | 2005-06-28 16:48:40 +0200 | [diff] [blame] | 953 | $state=11; |
| 954 | next; |
| 955 | } |
Matthias Urlichs | a57a949 | 2005-06-28 16:48:40 +0200 | [diff] [blame] | 956 | } |
Sven Verdoolaege | 46e63ef | 2005-07-04 15:28:36 +0200 | [diff] [blame] | 957 | $last_branch = $branch if $branch ne $last_branch; |
Matthias Urlichs | a57a949 | 2005-06-28 16:48:40 +0200 | [diff] [blame] | 958 | $state = 9; |
Junio C Hamano | 86d11cf | 2006-11-27 14:21:30 -0800 | [diff] [blame] | 959 | } elsif ($state == 8) { |
Matthias Urlichs | a57a949 | 2005-06-28 16:48:40 +0200 | [diff] [blame] | 960 | $logmsg .= "$_\n"; |
Junio C Hamano | 86d11cf | 2006-11-27 14:21:30 -0800 | [diff] [blame] | 961 | } elsif ($state == 9 and /^\s+(.+?):(INITIAL|\d+(?:\.\d+)+)->(\d+(?:\.\d+)+)\s*$/) { |
Matthias Urlichs | a57a949 | 2005-06-28 16:48:40 +0200 | [diff] [blame] | 962 | # VERSION:1.96->1.96.2.1 |
Matthias Urlichs | 2a3e1a8 | 2005-06-28 19:49:19 +0200 | [diff] [blame] | 963 | my $init = ($2 eq "INITIAL"); |
Matthias Urlichs | a57a949 | 2005-06-28 16:48:40 +0200 | [diff] [blame] | 964 | my $fn = $1; |
Matthias Urlichs | f65ae60 | 2005-06-28 19:58:40 +0200 | [diff] [blame] | 965 | my $rev = $3; |
| 966 | $fn =~ s#^/+##; |
Martin Langhoff | 5179c8a | 2006-01-30 19:12:41 +1300 | [diff] [blame] | 967 | if ($opt_S && $fn =~ m/$opt_S/) { |
| 968 | print "SKIPPING $fn v $rev\n"; |
| 969 | push(@skipped, $fn); |
| 970 | next; |
| 971 | } |
Aaron Crane | 0455ec0 | 2010-02-06 18:26:24 +0000 | [diff] [blame] | 972 | push @commit_revisions, [$fn, $rev]; |
Martin Langhoff | 5179c8a | 2006-01-30 19:12:41 +1300 | [diff] [blame] | 973 | print "Fetching $fn v $rev\n" if $opt_v; |
Sven Verdoolaege | 2eb6d82 | 2005-07-04 00:43:26 +0200 | [diff] [blame] | 974 | my ($tmpname, $size) = $cvs->file($fn,$rev); |
Junio C Hamano | 86d11cf | 2006-11-27 14:21:30 -0800 | [diff] [blame] | 975 | if ($size == -1) { |
Matthias Urlichs | 8b8840e | 2005-08-15 11:28:19 +0200 | [diff] [blame] | 976 | push(@old,$fn); |
| 977 | print "Drop $fn\n" if $opt_v; |
| 978 | } else { |
| 979 | print "".($init ? "New" : "Update")." $fn: $size bytes\n" if $opt_v; |
Junio C Hamano | dd27478 | 2006-02-20 14:17:28 -0800 | [diff] [blame] | 980 | my $pid = open(my $F, '-|'); |
| 981 | die $! unless defined $pid; |
| 982 | if (!$pid) { |
Ben Walton | 640d9d0 | 2010-01-19 14:03:08 -0500 | [diff] [blame] | 983 | exec("git", "hash-object", "-w", $tmpname) |
Matthias Urlichs | 8b8840e | 2005-08-15 11:28:19 +0200 | [diff] [blame] | 984 | or die "Cannot create object: $!\n"; |
Junio C Hamano | dd27478 | 2006-02-20 14:17:28 -0800 | [diff] [blame] | 985 | } |
Matthias Urlichs | 8b8840e | 2005-08-15 11:28:19 +0200 | [diff] [blame] | 986 | my $sha = <$F>; |
| 987 | chomp $sha; |
| 988 | close $F; |
| 989 | my $mode = pmode($cvs->{'mode'}); |
| 990 | push(@new,[$mode, $sha, $fn]); # may be resurrected! |
| 991 | } |
Sven Verdoolaege | 2eb6d82 | 2005-07-04 00:43:26 +0200 | [diff] [blame] | 992 | unlink($tmpname); |
Junio C Hamano | 86d11cf | 2006-11-27 14:21:30 -0800 | [diff] [blame] | 993 | } elsif ($state == 9 and /^\s+(.+?):\d+(?:\.\d+)+->(\d+(?:\.\d+)+)\(DEAD\)\s*$/) { |
Matthias Urlichs | f65ae60 | 2005-06-28 19:58:40 +0200 | [diff] [blame] | 994 | my $fn = $1; |
Aaron Crane | 0455ec0 | 2010-02-06 18:26:24 +0000 | [diff] [blame] | 995 | my $rev = $2; |
Matthias Urlichs | f65ae60 | 2005-06-28 19:58:40 +0200 | [diff] [blame] | 996 | $fn =~ s#^/+##; |
Aaron Crane | 0455ec0 | 2010-02-06 18:26:24 +0000 | [diff] [blame] | 997 | push @commit_revisions, [$fn, $rev]; |
Matthias Urlichs | f65ae60 | 2005-06-28 19:58:40 +0200 | [diff] [blame] | 998 | push(@old,$fn); |
Matthias Urlichs | 8b8840e | 2005-08-15 11:28:19 +0200 | [diff] [blame] | 999 | print "Delete $fn\n" if $opt_v; |
Junio C Hamano | 86d11cf | 2006-11-27 14:21:30 -0800 | [diff] [blame] | 1000 | } elsif ($state == 9 and /^\s*$/) { |
Matthias Urlichs | a57a949 | 2005-06-28 16:48:40 +0200 | [diff] [blame] | 1001 | $state = 10; |
Junio C Hamano | 86d11cf | 2006-11-27 14:21:30 -0800 | [diff] [blame] | 1002 | } elsif (($state == 9 or $state == 10) and /^-+$/) { |
Linus Torvalds | 4adcea9 | 2006-05-22 19:28:37 -0700 | [diff] [blame] | 1003 | $commitcount++; |
| 1004 | if ($opt_L && $commitcount > $opt_L) { |
Martin Langhoff | 0691834 | 2006-05-22 23:38:08 +1200 | [diff] [blame] | 1005 | last; |
| 1006 | } |
Martin Langhoff | c4b16f8 | 2006-05-23 00:45:39 +1200 | [diff] [blame] | 1007 | commit(); |
Linus Torvalds | 4adcea9 | 2006-05-22 19:28:37 -0700 | [diff] [blame] | 1008 | if (($commitcount & 1023) == 0) { |
Ben Walton | 91fe732 | 2010-01-19 14:03:10 -0500 | [diff] [blame] | 1009 | system(qw(git repack -a -d)); |
Linus Torvalds | 4adcea9 | 2006-05-22 19:28:37 -0700 | [diff] [blame] | 1010 | } |
Matthias Urlichs | a57a949 | 2005-06-28 16:48:40 +0200 | [diff] [blame] | 1011 | $state = 1; |
Junio C Hamano | 86d11cf | 2006-11-27 14:21:30 -0800 | [diff] [blame] | 1012 | } elsif ($state == 11 and /^-+$/) { |
Matthias Urlichs | a57a949 | 2005-06-28 16:48:40 +0200 | [diff] [blame] | 1013 | $state = 1; |
Junio C Hamano | 86d11cf | 2006-11-27 14:21:30 -0800 | [diff] [blame] | 1014 | } elsif (/^-+$/) { # end of unknown-line processing |
Matthias Urlichs | a57a949 | 2005-06-28 16:48:40 +0200 | [diff] [blame] | 1015 | $state = 1; |
Junio C Hamano | 86d11cf | 2006-11-27 14:21:30 -0800 | [diff] [blame] | 1016 | } elsif ($state != 11) { # ignore stuff when skipping |
Jim Meyering | 3be3999 | 2008-08-05 16:54:42 +0200 | [diff] [blame] | 1017 | print STDERR "* UNKNOWN LINE * $_\n"; |
Matthias Urlichs | a57a949 | 2005-06-28 16:48:40 +0200 | [diff] [blame] | 1018 | } |
| 1019 | } |
Martin Langhoff | c4b16f8 | 2006-05-23 00:45:39 +1200 | [diff] [blame] | 1020 | commit() if $branch and $state != 11; |
Matthias Urlichs | a57a949 | 2005-06-28 16:48:40 +0200 | [diff] [blame] | 1021 | |
Martin Langhoff | 4083c2f | 2007-01-08 21:08:46 +1300 | [diff] [blame] | 1022 | unless ($opt_P) { |
| 1023 | unlink($cvspsfile); |
| 1024 | } |
| 1025 | |
Jim Meyering | efe4abd | 2006-11-15 21:15:44 +0100 | [diff] [blame] | 1026 | # The heuristic of repacking every 1024 commits can leave a |
| 1027 | # lot of unpacked data. If there is more than 1MB worth of |
| 1028 | # not-packed objects, repack once more. |
Ben Walton | 640d9d0 | 2010-01-19 14:03:08 -0500 | [diff] [blame] | 1029 | my $line = `git count-objects`; |
Jim Meyering | efe4abd | 2006-11-15 21:15:44 +0100 | [diff] [blame] | 1030 | if ($line =~ /^(\d+) objects, (\d+) kilobytes$/) { |
| 1031 | my ($n_objects, $kb) = ($1, $2); |
| 1032 | 1024 < $kb |
Ben Walton | 91fe732 | 2010-01-19 14:03:10 -0500 | [diff] [blame] | 1033 | and system(qw(git repack -a -d)); |
Jim Meyering | efe4abd | 2006-11-15 21:15:44 +0100 | [diff] [blame] | 1034 | } |
| 1035 | |
Martin Langhoff | 8f73264 | 2006-06-12 23:50:49 +1200 | [diff] [blame] | 1036 | foreach my $git_index (values %index) { |
Michael Milligan | 23fcdc7 | 2007-06-05 00:06:30 -0600 | [diff] [blame] | 1037 | if ($git_index ne "$git_dir/index") { |
Martin Langhoff | c5f448b | 2006-06-28 22:13:23 +1200 | [diff] [blame] | 1038 | unlink($git_index); |
| 1039 | } |
Martin Langhoff | 8f73264 | 2006-06-12 23:50:49 +1200 | [diff] [blame] | 1040 | } |
Sven Verdoolaege | 79ee456 | 2005-07-04 13:36:59 +0200 | [diff] [blame] | 1041 | |
Sven Verdoolaege | 210569f | 2005-07-05 13:19:59 +0200 | [diff] [blame] | 1042 | if (defined $orig_git_index) { |
| 1043 | $ENV{GIT_INDEX_FILE} = $orig_git_index; |
| 1044 | } else { |
| 1045 | delete $ENV{GIT_INDEX_FILE}; |
| 1046 | } |
| 1047 | |
Matthias Urlichs | 4654166 | 2005-06-28 21:08:15 +0200 | [diff] [blame] | 1048 | # Now switch back to the branch we were in before all of this happened |
Junio C Hamano | 86d11cf | 2006-11-27 14:21:30 -0800 | [diff] [blame] | 1049 | if ($orig_branch) { |
Junio C Hamano | 8a5f2ea | 2006-03-17 14:08:39 -0800 | [diff] [blame] | 1050 | print "DONE.\n" if $opt_v; |
| 1051 | if ($opt_i) { |
| 1052 | exit 0; |
| 1053 | } |
Ben Walton | 640d9d0 | 2010-01-19 14:03:08 -0500 | [diff] [blame] | 1054 | my $tip_at_end = `git rev-parse --verify HEAD`; |
Junio C Hamano | 8a5f2ea | 2006-03-17 14:08:39 -0800 | [diff] [blame] | 1055 | if ($tip_at_start ne $tip_at_end) { |
Junio C Hamano | cb9594e | 2006-03-18 02:05:02 -0800 | [diff] [blame] | 1056 | for ($tip_at_start, $tip_at_end) { chomp; } |
Junio C Hamano | 8a5f2ea | 2006-03-17 14:08:39 -0800 | [diff] [blame] | 1057 | print "Fetched into the current branch.\n" if $opt_v; |
Ben Walton | 640d9d0 | 2010-01-19 14:03:08 -0500 | [diff] [blame] | 1058 | system(qw(git read-tree -u -m), |
Junio C Hamano | 8a5f2ea | 2006-03-17 14:08:39 -0800 | [diff] [blame] | 1059 | $tip_at_start, $tip_at_end); |
| 1060 | die "Fast-forward update failed: $?\n" if $?; |
| 1061 | } |
| 1062 | else { |
Ben Walton | 640d9d0 | 2010-01-19 14:03:08 -0500 | [diff] [blame] | 1063 | system(qw(git merge cvsimport HEAD), "$remote/$opt_o"); |
Junio C Hamano | 8a5f2ea | 2006-03-17 14:08:39 -0800 | [diff] [blame] | 1064 | die "Could not merge $opt_o into the current branch.\n" if $?; |
| 1065 | } |
Matthias Urlichs | 4654166 | 2005-06-28 21:08:15 +0200 | [diff] [blame] | 1066 | } else { |
| 1067 | $orig_branch = "master"; |
| 1068 | print "DONE; creating $orig_branch branch\n" if $opt_v; |
Ben Walton | 640d9d0 | 2010-01-19 14:03:08 -0500 | [diff] [blame] | 1069 | system("git", "update-ref", "refs/heads/master", "$remote/$opt_o") |
Jeff King | 0750d75 | 2007-11-28 13:56:28 -0500 | [diff] [blame] | 1070 | unless defined get_headref('refs/heads/master'); |
Ben Walton | 640d9d0 | 2010-01-19 14:03:08 -0500 | [diff] [blame] | 1071 | system("git", "symbolic-ref", "$remote/HEAD", "$remote/$opt_o") |
Andy Whitcroft | 06baffd | 2007-06-04 10:01:49 +0100 | [diff] [blame] | 1072 | if ($opt_r && $opt_o ne 'HEAD'); |
Ben Walton | 640d9d0 | 2010-01-19 14:03:08 -0500 | [diff] [blame] | 1073 | system('git', 'update-ref', 'HEAD', "$orig_branch"); |
Sven Verdoolaege | c1c774e | 2005-07-11 16:57:49 +0200 | [diff] [blame] | 1074 | unless ($opt_i) { |
Ben Walton | 91fe732 | 2010-01-19 14:03:10 -0500 | [diff] [blame] | 1075 | system(qw(git checkout -f)); |
Sven Verdoolaege | c1c774e | 2005-07-11 16:57:49 +0200 | [diff] [blame] | 1076 | die "checkout failed: $?\n" if $?; |
| 1077 | } |
Matthias Urlichs | 4654166 | 2005-06-28 21:08:15 +0200 | [diff] [blame] | 1078 | } |