1#!/usr/bin/perl 2 3#### 4#### This application is a CVS emulation layer for git. 5#### It is intended for clients to connect over SSH. 6#### See the documentation for more details. 7#### 8#### Copyright The Open University UK - 2006. 9#### 10#### Authors: Martyn Smith <martyn@catalyst.net.nz> 11#### Martin Langhoff <martin@catalyst.net.nz> 12#### 13#### 14#### Released under the GNU Public License, version 2. 15#### 16#### 17 18use strict; 19use warnings; 20use bytes; 21 22use Fcntl; 23use File::Temp qw/tempdir tempfile/; 24use File::Basename; 25use Getopt::Long qw(:config require_order no_ignore_case); 26 27my$VERSION='@@GIT_VERSION@@'; 28 29my$log= GITCVS::log->new(); 30my$cfg; 31 32my$DATE_LIST= { 33 Jan =>"01", 34 Feb =>"02", 35 Mar =>"03", 36 Apr =>"04", 37 May =>"05", 38 Jun =>"06", 39 Jul =>"07", 40 Aug =>"08", 41 Sep =>"09", 42 Oct =>"10", 43 Nov =>"11", 44 Dec =>"12", 45}; 46 47# Enable autoflush for STDOUT (otherwise the whole thing falls apart) 48$| =1; 49 50#### Definition and mappings of functions #### 51 52my$methods= { 53'Root'=> \&req_Root, 54'Valid-responses'=> \&req_Validresponses, 55'valid-requests'=> \&req_validrequests, 56'Directory'=> \&req_Directory, 57'Entry'=> \&req_Entry, 58'Modified'=> \&req_Modified, 59'Unchanged'=> \&req_Unchanged, 60'Questionable'=> \&req_Questionable, 61'Argument'=> \&req_Argument, 62'Argumentx'=> \&req_Argument, 63'expand-modules'=> \&req_expandmodules, 64'add'=> \&req_add, 65'remove'=> \&req_remove, 66'co'=> \&req_co, 67'update'=> \&req_update, 68'ci'=> \&req_ci, 69'diff'=> \&req_diff, 70'log'=> \&req_log, 71'rlog'=> \&req_log, 72'tag'=> \&req_CATCHALL, 73'status'=> \&req_status, 74'admin'=> \&req_CATCHALL, 75'history'=> \&req_CATCHALL, 76'watchers'=> \&req_CATCHALL, 77'editors'=> \&req_CATCHALL, 78'annotate'=> \&req_annotate, 79'Global_option'=> \&req_Globaloption, 80#'annotate' => \&req_CATCHALL, 81}; 82 83############################################## 84 85 86# $state holds all the bits of information the clients sends us that could 87# potentially be useful when it comes to actually _doing_ something. 88my$state= { prependdir =>''}; 89$log->info("--------------- STARTING -----------------"); 90 91my$usage= 92"Usage: git-cvsserver [options] [pserver|server] [<directory> ...]\n". 93" --base-path <path> : Prepend to requested CVSROOT\n". 94" --strict-paths : Don't allow recursing into subdirectories\n". 95" --export-all : Don't check for gitcvs.enabled in config\n". 96" --version, -V : Print version information and exit\n". 97" --help, -h, -H : Print usage information and exit\n". 98"\n". 99"<directory> ... is a list of allowed directories. If no directories\n". 100"are given, all are allowed. This is an additional restriction, gitcvs\n". 101"access still needs to be enabled by the gitcvs.enabled config option.\n"; 102 103my@opts= ('help|h|H','version|V', 104'base-path=s','strict-paths','export-all'); 105GetOptions($state,@opts) 106or die$usage; 107 108if($state->{version}) { 109print"git-cvsserver version$VERSION\n"; 110exit; 111} 112if($state->{help}) { 113print$usage; 114exit; 115} 116 117my$TEMP_DIR= tempdir( CLEANUP =>1); 118$log->debug("Temporary directory is '$TEMP_DIR'"); 119 120$state->{method} ='ext'; 121if(@ARGV) { 122if($ARGV[0]eq'pserver') { 123$state->{method} ='pserver'; 124shift@ARGV; 125}elsif($ARGV[0]eq'server') { 126shift@ARGV; 127} 128} 129 130# everything else is a directory 131$state->{allowed_roots} = [@ARGV]; 132 133# don't export the whole system unless the users requests it 134if($state->{'export-all'} && !@{$state->{allowed_roots}}) { 135die"--export-all can only be used together with an explicit whitelist\n"; 136} 137 138# if we are called with a pserver argument, 139# deal with the authentication cat before entering the 140# main loop 141if($state->{method}eq'pserver') { 142my$line= <STDIN>;chomp$line; 143unless($line=~/^BEGIN (AUTH|VERIFICATION) REQUEST$/) { 144die"E Do not understand$line- expecting BEGIN AUTH REQUEST\n"; 145} 146my$request=$1; 147$line= <STDIN>;chomp$line; 148unless(req_Root('root',$line)) {# reuse Root 149print"E Invalid root$line\n"; 150exit1; 151} 152$line= <STDIN>;chomp$line; 153unless($lineeq'anonymous') { 154print"E Only anonymous user allowed via pserver\n"; 155print"I HATE YOU\n"; 156exit1; 157} 158$line= <STDIN>;chomp$line;# validate the password? 159$line= <STDIN>;chomp$line; 160unless($lineeq"END$requestREQUEST") { 161die"E Do not understand$line-- expecting END$requestREQUEST\n"; 162} 163print"I LOVE YOU\n"; 164exit if$requesteq'VERIFICATION';# cvs login 165# and now back to our regular programme... 166} 167 168# Keep going until the client closes the connection 169while(<STDIN>) 170{ 171chomp; 172 173# Check to see if we've seen this method, and call appropriate function. 174if(/^([\w-]+)(?:\s+(.*))?$/and defined($methods->{$1}) ) 175{ 176# use the $methods hash to call the appropriate sub for this command 177#$log->info("Method : $1"); 178&{$methods->{$1}}($1,$2); 179}else{ 180# log fatal because we don't understand this function. If this happens 181# we're fairly screwed because we don't know if the client is expecting 182# a response. If it is, the client will hang, we'll hang, and the whole 183# thing will be custard. 184$log->fatal("Don't understand command$_\n"); 185die("Unknown command$_"); 186} 187} 188 189$log->debug("Processing time : user=". (times)[0] ." system=". (times)[1]); 190$log->info("--------------- FINISH -----------------"); 191 192# Magic catchall method. 193# This is the method that will handle all commands we haven't yet 194# implemented. It simply sends a warning to the log file indicating a 195# command that hasn't been implemented has been invoked. 196sub req_CATCHALL 197{ 198my($cmd,$data) =@_; 199$log->warn("Unhandled command : req_$cmd:$data"); 200} 201 202 203# Root pathname \n 204# Response expected: no. Tell the server which CVSROOT to use. Note that 205# pathname is a local directory and not a fully qualified CVSROOT variable. 206# pathname must already exist; if creating a new root, use the init 207# request, not Root. pathname does not include the hostname of the server, 208# how to access the server, etc.; by the time the CVS protocol is in use, 209# connection, authentication, etc., are already taken care of. The Root 210# request must be sent only once, and it must be sent before any requests 211# other than Valid-responses, valid-requests, UseUnchanged, Set or init. 212sub req_Root 213{ 214my($cmd,$data) =@_; 215$log->debug("req_Root :$data"); 216 217unless($data=~ m#^/#) { 218print"error 1 Root must be an absolute pathname\n"; 219return0; 220} 221 222my$cvsroot=$state->{'base-path'} ||''; 223$cvsroot=~ s#/+$##; 224$cvsroot.=$data; 225 226if($state->{CVSROOT} 227&& ($state->{CVSROOT}ne$cvsroot)) { 228print"error 1 Conflicting roots specified\n"; 229return0; 230} 231 232$state->{CVSROOT} =$cvsroot; 233 234$ENV{GIT_DIR} =$state->{CVSROOT} ."/"; 235 236if(@{$state->{allowed_roots}}) { 237my$allowed=0; 238foreachmy$dir(@{$state->{allowed_roots}}) { 239next unless$dir=~ m#^/#; 240$dir=~ s#/+$##; 241if($state->{'strict-paths'}) { 242if($ENV{GIT_DIR} =~ m#^\Q$dir\E/?$#) { 243$allowed=1; 244last; 245} 246}elsif($ENV{GIT_DIR} =~ m#^\Q$dir\E(/?$|/)#) { 247$allowed=1; 248last; 249} 250} 251 252unless($allowed) { 253print"E$ENV{GIT_DIR} does not seem to be a valid GIT repository\n"; 254print"E\n"; 255print"error 1$ENV{GIT_DIR} is not a valid repository\n"; 256return0; 257} 258} 259 260unless(-d $ENV{GIT_DIR} && -e $ENV{GIT_DIR}.'HEAD') { 261print"E$ENV{GIT_DIR} does not seem to be a valid GIT repository\n"; 262print"E\n"; 263print"error 1$ENV{GIT_DIR} is not a valid repository\n"; 264return0; 265} 266 267my@gitvars=`git-config -l`; 268if($?) { 269print"E problems executing git-config on the server -- this is not a git repository or the PATH is not set correctly.\n"; 270print"E\n"; 271print"error 1 - problem executing git-config\n"; 272return0; 273} 274foreachmy$line(@gitvars) 275{ 276next unless($line=~/^(gitcvs)\.(?:(ext|pserver)\.)?([\w-]+)=(.*)$/); 277unless($2) { 278$cfg->{$1}{$3} =$4; 279}else{ 280$cfg->{$1}{$2}{$3} =$4; 281} 282} 283 284my$enabled= ($cfg->{gitcvs}{$state->{method}}{enabled} 285||$cfg->{gitcvs}{enabled}); 286unless($state->{'export-all'} || 287($enabled&&$enabled=~/^\s*(1|true|yes)\s*$/i)) { 288print"E GITCVS emulation needs to be enabled on this repo\n"; 289print"E the repo config file needs a [gitcvs] section added, and the parameter 'enabled' set to 1\n"; 290print"E\n"; 291print"error 1 GITCVS emulation disabled\n"; 292return0; 293} 294 295my$logfile=$cfg->{gitcvs}{$state->{method}}{logfile} ||$cfg->{gitcvs}{logfile}; 296if($logfile) 297{ 298$log->setfile($logfile); 299}else{ 300$log->nofile(); 301} 302 303return1; 304} 305 306# Global_option option \n 307# Response expected: no. Transmit one of the global options `-q', `-Q', 308# `-l', `-t', `-r', or `-n'. option must be one of those strings, no 309# variations (such as combining of options) are allowed. For graceful 310# handling of valid-requests, it is probably better to make new global 311# options separate requests, rather than trying to add them to this 312# request. 313sub req_Globaloption 314{ 315my($cmd,$data) =@_; 316$log->debug("req_Globaloption :$data"); 317$state->{globaloptions}{$data} =1; 318} 319 320# Valid-responses request-list \n 321# Response expected: no. Tell the server what responses the client will 322# accept. request-list is a space separated list of tokens. 323sub req_Validresponses 324{ 325my($cmd,$data) =@_; 326$log->debug("req_Validresponses :$data"); 327 328# TODO : re-enable this, currently it's not particularly useful 329#$state->{validresponses} = [ split /\s+/, $data ]; 330} 331 332# valid-requests \n 333# Response expected: yes. Ask the server to send back a Valid-requests 334# response. 335sub req_validrequests 336{ 337my($cmd,$data) =@_; 338 339$log->debug("req_validrequests"); 340 341$log->debug("SEND : Valid-requests ".join(" ",keys%$methods)); 342$log->debug("SEND : ok"); 343 344print"Valid-requests ".join(" ",keys%$methods) ."\n"; 345print"ok\n"; 346} 347 348# Directory local-directory \n 349# Additional data: repository \n. Response expected: no. Tell the server 350# what directory to use. The repository should be a directory name from a 351# previous server response. Note that this both gives a default for Entry 352# and Modified and also for ci and the other commands; normal usage is to 353# send Directory for each directory in which there will be an Entry or 354# Modified, and then a final Directory for the original directory, then the 355# command. The local-directory is relative to the top level at which the 356# command is occurring (i.e. the last Directory which is sent before the 357# command); to indicate that top level, `.' should be sent for 358# local-directory. 359sub req_Directory 360{ 361my($cmd,$data) =@_; 362 363my$repository= <STDIN>; 364chomp$repository; 365 366 367$state->{localdir} =$data; 368$state->{repository} =$repository; 369$state->{path} =$repository; 370$state->{path} =~s/^$state->{CVSROOT}\///; 371$state->{module} =$1if($state->{path} =~s/^(.*?)(\/|$)//); 372$state->{path} .="/"if($state->{path} =~ /\S/ ); 373 374$state->{directory} =$state->{localdir}; 375$state->{directory} =""if($state->{directory}eq"."); 376$state->{directory} .="/"if($state->{directory} =~ /\S/ ); 377 378if( (not defined($state->{prependdir})or$state->{prependdir}eq'')and$state->{localdir}eq"."and$state->{path} =~/\S/) 379{ 380$log->info("Setting prepend to '$state->{path}'"); 381$state->{prependdir} =$state->{path}; 382foreachmy$entry(keys%{$state->{entries}} ) 383{ 384$state->{entries}{$state->{prependdir} .$entry} =$state->{entries}{$entry}; 385delete$state->{entries}{$entry}; 386} 387} 388 389if(defined($state->{prependdir} ) ) 390{ 391$log->debug("Prepending '$state->{prependdir}' to state|directory"); 392$state->{directory} =$state->{prependdir} .$state->{directory} 393} 394$log->debug("req_Directory : localdir=$datarepository=$repositorypath=$state->{path} directory=$state->{directory} module=$state->{module}"); 395} 396 397# Entry entry-line \n 398# Response expected: no. Tell the server what version of a file is on the 399# local machine. The name in entry-line is a name relative to the directory 400# most recently specified with Directory. If the user is operating on only 401# some files in a directory, Entry requests for only those files need be 402# included. If an Entry request is sent without Modified, Is-modified, or 403# Unchanged, it means the file is lost (does not exist in the working 404# directory). If both Entry and one of Modified, Is-modified, or Unchanged 405# are sent for the same file, Entry must be sent first. For a given file, 406# one can send Modified, Is-modified, or Unchanged, but not more than one 407# of these three. 408sub req_Entry 409{ 410my($cmd,$data) =@_; 411 412#$log->debug("req_Entry : $data"); 413 414my@data=split(/\//,$data); 415 416$state->{entries}{$state->{directory}.$data[1]} = { 417 revision =>$data[2], 418 conflict =>$data[3], 419 options =>$data[4], 420 tag_or_date =>$data[5], 421}; 422 423$log->info("Received entry line '$data' => '".$state->{directory} .$data[1] ."'"); 424} 425 426# Questionable filename \n 427# Response expected: no. Additional data: no. Tell the server to check 428# whether filename should be ignored, and if not, next time the server 429# sends responses, send (in a M response) `?' followed by the directory and 430# filename. filename must not contain `/'; it needs to be a file in the 431# directory named by the most recent Directory request. 432sub req_Questionable 433{ 434my($cmd,$data) =@_; 435 436$log->debug("req_Questionable :$data"); 437$state->{entries}{$state->{directory}.$data}{questionable} =1; 438} 439 440# add \n 441# Response expected: yes. Add a file or directory. This uses any previous 442# Argument, Directory, Entry, or Modified requests, if they have been sent. 443# The last Directory sent specifies the working directory at the time of 444# the operation. To add a directory, send the directory to be added using 445# Directory and Argument requests. 446sub req_add 447{ 448my($cmd,$data) =@_; 449 450 argsplit("add"); 451 452my$updater= GITCVS::updater->new($state->{CVSROOT},$state->{module},$log); 453$updater->update(); 454 455 argsfromdir($updater); 456 457my$addcount=0; 458 459foreachmy$filename( @{$state->{args}} ) 460{ 461$filename= filecleanup($filename); 462 463my$meta=$updater->getmeta($filename); 464my$wrev= revparse($filename); 465 466if($wrev&&$meta&& ($wrev<0)) 467{ 468# previously removed file, add back 469$log->info("added file$filenamewas previously removed, send 1.$meta->{revision}"); 470 471print"MT +updated\n"; 472print"MT text U\n"; 473print"MT fname$filename\n"; 474print"MT newline\n"; 475print"MT -updated\n"; 476 477unless($state->{globaloptions}{-n} ) 478{ 479my($filepart,$dirpart) = filenamesplit($filename,1); 480 481print"Created$dirpart\n"; 482print$state->{CVSROOT} ."/$state->{module}/$filename\n"; 483 484# this is an "entries" line 485my$kopts= kopts_from_path($filepart); 486$log->debug("/$filepart/1.$meta->{revision}//$kopts/"); 487print"/$filepart/1.$meta->{revision}//$kopts/\n"; 488# permissions 489$log->debug("SEND : u=$meta->{mode},g=$meta->{mode},o=$meta->{mode}"); 490print"u=$meta->{mode},g=$meta->{mode},o=$meta->{mode}\n"; 491# transmit file 492 transmitfile($meta->{filehash}); 493} 494 495next; 496} 497 498unless(defined($state->{entries}{$filename}{modified_filename} ) ) 499{ 500print"E cvs add: nothing known about `$filename'\n"; 501next; 502} 503# TODO : check we're not squashing an already existing file 504if(defined($state->{entries}{$filename}{revision} ) ) 505{ 506print"E cvs add: `$filename' has already been entered\n"; 507next; 508} 509 510my($filepart,$dirpart) = filenamesplit($filename,1); 511 512print"E cvs add: scheduling file `$filename' for addition\n"; 513 514print"Checked-in$dirpart\n"; 515print"$filename\n"; 516my$kopts= kopts_from_path($filepart); 517print"/$filepart/0//$kopts/\n"; 518 519$addcount++; 520} 521 522if($addcount==1) 523{ 524print"E cvs add: use `cvs commit' to add this file permanently\n"; 525} 526elsif($addcount>1) 527{ 528print"E cvs add: use `cvs commit' to add these files permanently\n"; 529} 530 531print"ok\n"; 532} 533 534# remove \n 535# Response expected: yes. Remove a file. This uses any previous Argument, 536# Directory, Entry, or Modified requests, if they have been sent. The last 537# Directory sent specifies the working directory at the time of the 538# operation. Note that this request does not actually do anything to the 539# repository; the only effect of a successful remove request is to supply 540# the client with a new entries line containing `-' to indicate a removed 541# file. In fact, the client probably could perform this operation without 542# contacting the server, although using remove may cause the server to 543# perform a few more checks. The client sends a subsequent ci request to 544# actually record the removal in the repository. 545sub req_remove 546{ 547my($cmd,$data) =@_; 548 549 argsplit("remove"); 550 551# Grab a handle to the SQLite db and do any necessary updates 552my$updater= GITCVS::updater->new($state->{CVSROOT},$state->{module},$log); 553$updater->update(); 554 555#$log->debug("add state : " . Dumper($state)); 556 557my$rmcount=0; 558 559foreachmy$filename( @{$state->{args}} ) 560{ 561$filename= filecleanup($filename); 562 563if(defined($state->{entries}{$filename}{unchanged} )or defined($state->{entries}{$filename}{modified_filename} ) ) 564{ 565print"E cvs remove: file `$filename' still in working directory\n"; 566next; 567} 568 569my$meta=$updater->getmeta($filename); 570my$wrev= revparse($filename); 571 572unless(defined($wrev) ) 573{ 574print"E cvs remove: nothing known about `$filename'\n"; 575next; 576} 577 578if(defined($wrev)and$wrev<0) 579{ 580print"E cvs remove: file `$filename' already scheduled for removal\n"; 581next; 582} 583 584unless($wrev==$meta->{revision} ) 585{ 586# TODO : not sure if the format of this message is quite correct. 587print"E cvs remove: Up to date check failed for `$filename'\n"; 588next; 589} 590 591 592my($filepart,$dirpart) = filenamesplit($filename,1); 593 594print"E cvs remove: scheduling `$filename' for removal\n"; 595 596print"Checked-in$dirpart\n"; 597print"$filename\n"; 598my$kopts= kopts_from_path($filepart); 599print"/$filepart/-1.$wrev//$kopts/\n"; 600 601$rmcount++; 602} 603 604if($rmcount==1) 605{ 606print"E cvs remove: use `cvs commit' to remove this file permanently\n"; 607} 608elsif($rmcount>1) 609{ 610print"E cvs remove: use `cvs commit' to remove these files permanently\n"; 611} 612 613print"ok\n"; 614} 615 616# Modified filename \n 617# Response expected: no. Additional data: mode, \n, file transmission. Send 618# the server a copy of one locally modified file. filename is a file within 619# the most recent directory sent with Directory; it must not contain `/'. 620# If the user is operating on only some files in a directory, only those 621# files need to be included. This can also be sent without Entry, if there 622# is no entry for the file. 623sub req_Modified 624{ 625my($cmd,$data) =@_; 626 627my$mode= <STDIN>; 628defined$mode 629or(print"E end of file reading mode for$data\n"),return; 630chomp$mode; 631my$size= <STDIN>; 632defined$size 633or(print"E end of file reading size of$data\n"),return; 634chomp$size; 635 636# Grab config information 637my$blocksize=8192; 638my$bytesleft=$size; 639my$tmp; 640 641# Get a filehandle/name to write it to 642my($fh,$filename) = tempfile( DIR =>$TEMP_DIR); 643 644# Loop over file data writing out to temporary file. 645while($bytesleft) 646{ 647$blocksize=$bytesleftif($bytesleft<$blocksize); 648read STDIN,$tmp,$blocksize; 649print$fh $tmp; 650$bytesleft-=$blocksize; 651} 652 653close$fh 654or(print"E failed to write temporary,$filename:$!\n"),return; 655 656# Ensure we have something sensible for the file mode 657if($mode=~/u=(\w+)/) 658{ 659$mode=$1; 660}else{ 661$mode="rw"; 662} 663 664# Save the file data in $state 665$state->{entries}{$state->{directory}.$data}{modified_filename} =$filename; 666$state->{entries}{$state->{directory}.$data}{modified_mode} =$mode; 667$state->{entries}{$state->{directory}.$data}{modified_hash} =`git-hash-object$filename`; 668$state->{entries}{$state->{directory}.$data}{modified_hash} =~ s/\s.*$//s; 669 670 #$log->debug("req_Modified : file=$datamode=$modesize=$size"); 671} 672 673# Unchanged filename\n 674# Response expected: no. Tell the server that filename has not been 675# modified in the checked out directory. The filename is a file within the 676# most recent directory sent with Directory; it must not contain `/'. 677sub req_Unchanged 678{ 679 my ($cmd,$data) =@_; 680 681$state->{entries}{$state->{directory}.$data}{unchanged} = 1; 682 683 #$log->debug("req_Unchanged :$data"); 684} 685 686# Argument text\n 687# Response expected: no. Save argument for use in a subsequent command. 688# Arguments accumulate until an argument-using command is given, at which 689# point they are forgotten. 690# Argumentx text\n 691# Response expected: no. Append\nfollowed by text to the current argument 692# being saved. 693sub req_Argument 694{ 695 my ($cmd,$data) =@_; 696 697 # Argumentx means: append to last Argument (with a newline in front) 698 699$log->debug("$cmd:$data"); 700 701 if ($cmdeq 'Argumentx') { 702 ${$state->{arguments}}[$#{$state->{arguments}}] .= "\n" .$data; 703 } else { 704 push @{$state->{arguments}},$data; 705 } 706} 707 708# expand-modules\n 709# Response expected: yes. Expand the modules which are specified in the 710# arguments. Returns the data in Module-expansion responses. Note that the 711# server can assume that this is checkout or export, not rtag or rdiff; the 712# latter do not access the working directory and thus have no need to 713# expand modules on the client side. Expand may not be the best word for 714# what this request does. It does not necessarily tell you all the files 715# contained in a module, for example. Basically it is a way of telling you 716# which working directories the server needs to know about in order to 717# handle a checkout of the specified modules. For example, suppose that the 718# server has a module defined by 719# aliasmodule -a 1dir 720# That is, one can check out aliasmodule and it will take 1dir in the 721# repository and check it out to 1dir in the working directory. Now suppose 722# the client already has this module checked out and is planning on using 723# the co request to update it. Without using expand-modules, the client 724# would have two bad choices: it could either send information about all 725# working directories under the current directory, which could be 726# unnecessarily slow, or it could be ignorant of the fact that aliasmodule 727# stands for 1dir, and neglect to send information for 1dir, which would 728# lead to incorrect operation. With expand-modules, the client would first 729# ask for the module to be expanded: 730sub req_expandmodules 731{ 732 my ($cmd,$data) =@_; 733 734 argsplit(); 735 736$log->debug("req_expandmodules : " . ( defined($data) ?$data: "[NULL]" ) ); 737 738 unless ( ref$state->{arguments} eq "ARRAY" ) 739 { 740 print "ok\n"; 741 return; 742 } 743 744 foreach my$module( @{$state->{arguments}} ) 745 { 746$log->debug("SEND : Module-expansion$module"); 747 print "Module-expansion$module\n"; 748 } 749 750 print "ok\n"; 751 statecleanup(); 752} 753 754# co\n 755# Response expected: yes. Get files from the repository. This uses any 756# previous Argument, Directory, Entry, or Modified requests, if they have 757# been sent. Arguments to this command are module names; the client cannot 758# know what directories they correspond to except by (1) just sending the 759# co request, and then seeing what directory names the server sends back in 760# its responses, and (2) the expand-modules request. 761sub req_co 762{ 763 my ($cmd,$data) =@_; 764 765 argsplit("co"); 766 767 my$module=$state->{args}[0]; 768 my$checkout_path=$module; 769 770 # use the user specified directory if we're given it 771$checkout_path=$state->{opt}{d}if(exists($state->{opt}{d} ) ); 772 773$log->debug("req_co : ". (defined($data) ?$data:"[NULL]") ); 774 775$log->info("Checking out module '$module' ($state->{CVSROOT}) to '$checkout_path'"); 776 777$ENV{GIT_DIR} =$state->{CVSROOT} ."/"; 778 779# Grab a handle to the SQLite db and do any necessary updates 780my$updater= GITCVS::updater->new($state->{CVSROOT},$module,$log); 781$updater->update(); 782 783$checkout_path=~ s|/$||;# get rid of trailing slashes 784 785# Eclipse seems to need the Clear-sticky command 786# to prepare the 'Entries' file for the new directory. 787print"Clear-sticky$checkout_path/\n"; 788print$state->{CVSROOT} ."/$module/\n"; 789print"Clear-static-directory$checkout_path/\n"; 790print$state->{CVSROOT} ."/$module/\n"; 791print"Clear-sticky$checkout_path/\n";# yes, twice 792print$state->{CVSROOT} ."/$module/\n"; 793print"Template$checkout_path/\n"; 794print$state->{CVSROOT} ."/$module/\n"; 795print"0\n"; 796 797# instruct the client that we're checking out to $checkout_path 798print"E cvs checkout: Updating$checkout_path\n"; 799 800my%seendirs= (); 801my$lastdir=''; 802 803# recursive 804sub prepdir { 805my($dir,$repodir,$remotedir,$seendirs) =@_; 806my$parent= dirname($dir); 807$dir=~ s|/+$||; 808$repodir=~ s|/+$||; 809$remotedir=~ s|/+$||; 810$parent=~ s|/+$||; 811$log->debug("announcedir$dir,$repodir,$remotedir"); 812 813if($parenteq'.'||$parenteq'./') { 814$parent=''; 815} 816# recurse to announce unseen parents first 817if(length($parent) && !exists($seendirs->{$parent})) { 818 prepdir($parent,$repodir,$remotedir,$seendirs); 819} 820# Announce that we are going to modify at the parent level 821if($parent) { 822print"E cvs checkout: Updating$remotedir/$parent\n"; 823}else{ 824print"E cvs checkout: Updating$remotedir\n"; 825} 826print"Clear-sticky$remotedir/$parent/\n"; 827print"$repodir/$parent/\n"; 828 829print"Clear-static-directory$remotedir/$dir/\n"; 830print"$repodir/$dir/\n"; 831print"Clear-sticky$remotedir/$parent/\n";# yes, twice 832print"$repodir/$parent/\n"; 833print"Template$remotedir/$dir/\n"; 834print"$repodir/$dir/\n"; 835print"0\n"; 836 837$seendirs->{$dir} =1; 838} 839 840foreachmy$git( @{$updater->gethead} ) 841{ 842# Don't want to check out deleted files 843next if($git->{filehash}eq"deleted"); 844 845($git->{name},$git->{dir} ) = filenamesplit($git->{name}); 846 847if(length($git->{dir}) &&$git->{dir}ne'./' 848&&$git->{dir}ne$lastdir) { 849unless(exists($seendirs{$git->{dir}})) { 850 prepdir($git->{dir},$state->{CVSROOT} ."/$module/", 851$checkout_path, \%seendirs); 852$lastdir=$git->{dir}; 853$seendirs{$git->{dir}} =1; 854} 855print"E cvs checkout: Updating /$checkout_path/$git->{dir}\n"; 856} 857 858# modification time of this file 859print"Mod-time$git->{modified}\n"; 860 861# print some information to the client 862if(defined($git->{dir} )and$git->{dir}ne"./") 863{ 864print"M U$checkout_path/$git->{dir}$git->{name}\n"; 865}else{ 866print"M U$checkout_path/$git->{name}\n"; 867} 868 869# instruct client we're sending a file to put in this path 870print"Created$checkout_path/". (defined($git->{dir} )and$git->{dir}ne"./"?$git->{dir} ."/":"") ."\n"; 871 872print$state->{CVSROOT} ."/$module/". (defined($git->{dir} )and$git->{dir}ne"./"?$git->{dir} ."/":"") ."$git->{name}\n"; 873 874# this is an "entries" line 875my$kopts= kopts_from_path($git->{name}); 876print"/$git->{name}/1.$git->{revision}//$kopts/\n"; 877# permissions 878print"u=$git->{mode},g=$git->{mode},o=$git->{mode}\n"; 879 880# transmit file 881 transmitfile($git->{filehash}); 882} 883 884print"ok\n"; 885 886 statecleanup(); 887} 888 889# update \n 890# Response expected: yes. Actually do a cvs update command. This uses any 891# previous Argument, Directory, Entry, or Modified requests, if they have 892# been sent. The last Directory sent specifies the working directory at the 893# time of the operation. The -I option is not used--files which the client 894# can decide whether to ignore are not mentioned and the client sends the 895# Questionable request for others. 896sub req_update 897{ 898my($cmd,$data) =@_; 899 900$log->debug("req_update : ". (defined($data) ?$data:"[NULL]")); 901 902 argsplit("update"); 903 904# 905# It may just be a client exploring the available heads/modules 906# in that case, list them as top level directories and leave it 907# at that. Eclipse uses this technique to offer you a list of 908# projects (heads in this case) to checkout. 909# 910if($state->{module}eq'') { 911my$heads_dir=$state->{CVSROOT} .'/refs/heads'; 912if(!opendir HEADS,$heads_dir) { 913print"E [server aborted]: Failed to open directory, " 914."$heads_dir:$!\nerror\n"; 915return0; 916} 917print"E cvs update: Updating .\n"; 918while(my$head=readdir(HEADS)) { 919if(-f $state->{CVSROOT} .'/refs/heads/'.$head) { 920print"E cvs update: New directory `$head'\n"; 921} 922} 923closedir HEADS; 924print"ok\n"; 925return1; 926} 927 928 929# Grab a handle to the SQLite db and do any necessary updates 930my$updater= GITCVS::updater->new($state->{CVSROOT},$state->{module},$log); 931 932$updater->update(); 933 934 argsfromdir($updater); 935 936#$log->debug("update state : " . Dumper($state)); 937 938# foreach file specified on the command line ... 939foreachmy$filename( @{$state->{args}} ) 940{ 941$filename= filecleanup($filename); 942 943$log->debug("Processing file$filename"); 944 945# if we have a -C we should pretend we never saw modified stuff 946if(exists($state->{opt}{C} ) ) 947{ 948delete$state->{entries}{$filename}{modified_hash}; 949delete$state->{entries}{$filename}{modified_filename}; 950$state->{entries}{$filename}{unchanged} =1; 951} 952 953my$meta; 954if(defined($state->{opt}{r})and$state->{opt}{r} =~/^1\.(\d+)/) 955{ 956$meta=$updater->getmeta($filename,$1); 957}else{ 958$meta=$updater->getmeta($filename); 959} 960 961if( !defined$meta) 962{ 963$meta= { 964 name =>$filename, 965 revision =>0, 966 filehash =>'added' 967}; 968} 969 970my$oldmeta=$meta; 971 972my$wrev= revparse($filename); 973 974# If the working copy is an old revision, lets get that version too for comparison. 975if(defined($wrev)and$wrev!=$meta->{revision} ) 976{ 977$oldmeta=$updater->getmeta($filename,$wrev); 978} 979 980#$log->debug("Target revision is $meta->{revision}, current working revision is $wrev"); 981 982# Files are up to date if the working copy and repo copy have the same revision, 983# and the working copy is unmodified _and_ the user hasn't specified -C 984next if(defined($wrev) 985and defined($meta->{revision}) 986and$wrev==$meta->{revision} 987and$state->{entries}{$filename}{unchanged} 988and not exists($state->{opt}{C} ) ); 989 990# If the working copy and repo copy have the same revision, 991# but the working copy is modified, tell the client it's modified 992if(defined($wrev) 993and defined($meta->{revision}) 994and$wrev==$meta->{revision} 995and defined($state->{entries}{$filename}{modified_hash}) 996and not exists($state->{opt}{C} ) ) 997{ 998$log->info("Tell the client the file is modified"); 999print"MT text M\n";1000print"MT fname$filename\n";1001print"MT newline\n";1002next;1003}10041005if($meta->{filehash}eq"deleted")1006{1007my($filepart,$dirpart) = filenamesplit($filename,1);10081009$log->info("Removing '$filename' from working copy (no longer in the repo)");10101011print"E cvs update: `$filename' is no longer in the repository\n";1012# Don't want to actually _DO_ the update if -n specified1013unless($state->{globaloptions}{-n} ) {1014print"Removed$dirpart\n";1015print"$filepart\n";1016}1017}1018elsif(not defined($state->{entries}{$filename}{modified_hash} )1019or$state->{entries}{$filename}{modified_hash}eq$oldmeta->{filehash}1020or$meta->{filehash}eq'added')1021{1022# normal update, just send the new revision (either U=Update,1023# or A=Add, or R=Remove)1024if(defined($wrev) &&$wrev<0)1025{1026$log->info("Tell the client the file is scheduled for removal");1027print"MT text R\n";1028print"MT fname$filename\n";1029print"MT newline\n";1030next;1031}1032elsif( (!defined($wrev) ||$wrev==0) && (!defined($meta->{revision}) ||$meta->{revision} ==0) )1033{1034$log->info("Tell the client the file is scheduled for addition");1035print"MT text A\n";1036print"MT fname$filename\n";1037print"MT newline\n";1038next;10391040}1041else{1042$log->info("Updating '$filename' to ".$meta->{revision});1043print"MT +updated\n";1044print"MT text U\n";1045print"MT fname$filename\n";1046print"MT newline\n";1047print"MT -updated\n";1048}10491050my($filepart,$dirpart) = filenamesplit($filename,1);10511052# Don't want to actually _DO_ the update if -n specified1053unless($state->{globaloptions}{-n} )1054{1055if(defined($wrev) )1056{1057# instruct client we're sending a file to put in this path as a replacement1058print"Update-existing$dirpart\n";1059$log->debug("Updating existing file 'Update-existing$dirpart'");1060}else{1061# instruct client we're sending a file to put in this path as a new file1062print"Clear-static-directory$dirpart\n";1063print$state->{CVSROOT} ."/$state->{module}/$dirpart\n";1064print"Clear-sticky$dirpart\n";1065print$state->{CVSROOT} ."/$state->{module}/$dirpart\n";10661067$log->debug("Creating new file 'Created$dirpart'");1068print"Created$dirpart\n";1069}1070print$state->{CVSROOT} ."/$state->{module}/$filename\n";10711072# this is an "entries" line1073my$kopts= kopts_from_path($filepart);1074$log->debug("/$filepart/1.$meta->{revision}//$kopts/");1075print"/$filepart/1.$meta->{revision}//$kopts/\n";10761077# permissions1078$log->debug("SEND : u=$meta->{mode},g=$meta->{mode},o=$meta->{mode}");1079print"u=$meta->{mode},g=$meta->{mode},o=$meta->{mode}\n";10801081# transmit file1082 transmitfile($meta->{filehash});1083}1084}else{1085$log->info("Updating '$filename'");1086my($filepart,$dirpart) = filenamesplit($meta->{name},1);10871088my$dir= tempdir( DIR =>$TEMP_DIR, CLEANUP =>1) ."/";10891090chdir$dir;1091my$file_local=$filepart.".mine";1092system("ln","-s",$state->{entries}{$filename}{modified_filename},$file_local);1093my$file_old=$filepart.".".$oldmeta->{revision};1094 transmitfile($oldmeta->{filehash},$file_old);1095my$file_new=$filepart.".".$meta->{revision};1096 transmitfile($meta->{filehash},$file_new);10971098# we need to merge with the local changes ( M=successful merge, C=conflict merge )1099$log->info("Merging$file_local,$file_old,$file_new");1100print"M Merging differences between 1.$oldmeta->{revision} and 1.$meta->{revision} into$filename\n";11011102$log->debug("Temporary directory for merge is$dir");11031104my$return=system("git","merge-file",$file_local,$file_old,$file_new);1105$return>>=8;11061107if($return==0)1108{1109$log->info("Merged successfully");1110print"M M$filename\n";1111$log->debug("Merged$dirpart");11121113# Don't want to actually _DO_ the update if -n specified1114unless($state->{globaloptions}{-n} )1115{1116print"Merged$dirpart\n";1117$log->debug($state->{CVSROOT} ."/$state->{module}/$filename");1118print$state->{CVSROOT} ."/$state->{module}/$filename\n";1119my$kopts= kopts_from_path($filepart);1120$log->debug("/$filepart/1.$meta->{revision}//$kopts/");1121print"/$filepart/1.$meta->{revision}//$kopts/\n";1122}1123}1124elsif($return==1)1125{1126$log->info("Merged with conflicts");1127print"E cvs update: conflicts found in$filename\n";1128print"M C$filename\n";11291130# Don't want to actually _DO_ the update if -n specified1131unless($state->{globaloptions}{-n} )1132{1133print"Merged$dirpart\n";1134print$state->{CVSROOT} ."/$state->{module}/$filename\n";1135my$kopts= kopts_from_path($filepart);1136print"/$filepart/1.$meta->{revision}/+/$kopts/\n";1137}1138}1139else1140{1141$log->warn("Merge failed");1142next;1143}11441145# Don't want to actually _DO_ the update if -n specified1146unless($state->{globaloptions}{-n} )1147{1148# permissions1149$log->debug("SEND : u=$meta->{mode},g=$meta->{mode},o=$meta->{mode}");1150print"u=$meta->{mode},g=$meta->{mode},o=$meta->{mode}\n";11511152# transmit file, format is single integer on a line by itself (file1153# size) followed by the file contents1154# TODO : we should copy files in blocks1155my$data=`cat$file_local`;1156$log->debug("File size : " . length($data));1157 print length($data) . "\n";1158 print$data;1159 }11601161 chdir "/";1162 }11631164 }11651166 print "ok\n";1167}11681169sub req_ci1170{1171 my ($cmd,$data) =@_;11721173 argsplit("ci");11741175 #$log->debug("State : " . Dumper($state));11761177$log->info("req_ci : " . ( defined($data) ?$data: "[NULL]" ));11781179 if ($state->{method} eq 'pserver')1180 {1181 print "error 1 pserver access cannot commit\n";1182 exit;1183 }11841185 if ( -e$state->{CVSROOT} . "/index" )1186 {1187$log->warn("file 'index' already exists in the git repository");1188 print "error 1 Index already exists in git repo\n";1189 exit;1190 }11911192 # Grab a handle to the SQLite db and do any necessary updates1193 my$updater= GITCVS::updater->new($state->{CVSROOT},$state->{module},$log);1194$updater->update();11951196 my$tmpdir= tempdir ( DIR =>$TEMP_DIR);1197 my ( undef,$file_index) = tempfile ( DIR =>$TEMP_DIR, OPEN => 0 );1198$log->info("Lockless commit start, basing commit on '$tmpdir', index file is '$file_index'");11991200$ENV{GIT_DIR} =$state->{CVSROOT} . "/";1201$ENV{GIT_WORK_TREE} = ".";1202$ENV{GIT_INDEX_FILE} =$file_index;12031204 # Remember where the head was at the beginning.1205 my$parenthash= `git show-ref -s refs/heads/$state->{module}`;1206 chomp$parenthash;1207 if ($parenthash!~ /^[0-9a-f]{40}$/) {1208 print "error 1 pserver cannot find the current HEAD of module";1209 exit;1210 }12111212 chdir$tmpdir;12131214 # populate the temporary index based1215 system("git-read-tree",$parenthash);1216 unless ($?== 0)1217 {1218 die "Error running git-read-tree$state->{module}$file_index$!";1219 }1220$log->info("Created index '$file_index' with for head$state->{module} - exit status$?");12211222 my@committedfiles= ();1223 my%oldmeta;12241225 # foreach file specified on the command line ...1226 foreach my$filename( @{$state->{args}} )1227 {1228 my$committedfile=$filename;1229$filename= filecleanup($filename);12301231 next unless ( exists$state->{entries}{$filename}{modified_filename} or not$state->{entries}{$filename}{unchanged} );12321233 my$meta=$updater->getmeta($filename);1234$oldmeta{$filename} =$meta;12351236 my$wrev= revparse($filename);12371238 my ($filepart,$dirpart) = filenamesplit($filename);12391240 # do a checkout of the file if it part of this tree1241 if ($wrev) {1242 system('git-checkout-index', '-f', '-u',$filename);1243 unless ($?== 0) {1244 die "Error running git-checkout-index -f -u$filename:$!";1245 }1246 }12471248 my$addflag= 0;1249 my$rmflag= 0;1250$rmflag= 1 if ( defined($wrev) and$wrev< 0 );1251$addflag= 1 unless ( -e$filename);12521253 # Do up to date checking1254 unless ($addflagor$wrev==$meta->{revision} or ($rmflagand -$wrev==$meta->{revision} ) )1255 {1256 # fail everything if an up to date check fails1257 print "error 1 Up to date check failed for$filename\n";1258 chdir "/";1259 exit;1260 }12611262 push@committedfiles,$committedfile;1263$log->info("Committing$filename");12641265 system("mkdir","-p",$dirpart) unless ( -d$dirpart);12661267 unless ($rmflag)1268 {1269$log->debug("rename$state->{entries}{$filename}{modified_filename}$filename");1270 rename$state->{entries}{$filename}{modified_filename},$filename;12711272 # Calculate modes to remove1273 my$invmode= "";1274 foreach ( qw (r w x) ) {$invmode.=$_unless ($state->{entries}{$filename}{modified_mode} =~ /$_/); }12751276$log->debug("chmod u+" .$state->{entries}{$filename}{modified_mode} . "-" .$invmode. "$filename");1277 system("chmod","u+" .$state->{entries}{$filename}{modified_mode} . "-" .$invmode,$filename);1278 }12791280 if ($rmflag)1281 {1282$log->info("Removing file '$filename'");1283 unlink($filename);1284 system("git-update-index", "--remove",$filename);1285 }1286 elsif ($addflag)1287 {1288$log->info("Adding file '$filename'");1289 system("git-update-index", "--add",$filename);1290 } else {1291$log->info("Updating file '$filename'");1292 system("git-update-index",$filename);1293 }1294 }12951296 unless ( scalar(@committedfiles) > 0 )1297 {1298 print "E No files to commit\n";1299 print "ok\n";1300 chdir "/";1301 return;1302 }13031304 my$treehash= `git-write-tree`;1305 chomp$treehash;13061307$log->debug("Treehash :$treehash, Parenthash :$parenthash");13081309 # write our commit message out if we have one ...1310 my ($msg_fh,$msg_filename) = tempfile( DIR =>$TEMP_DIR);1311 print$msg_fh$state->{opt}{m};# if ( exists ($state->{opt}{m} ) );1312 print$msg_fh"\n\nvia git-CVS emulator\n";1313 close$msg_fh;13141315 my$commithash= `git-commit-tree $treehash-p $parenthash<$msg_filename`;1316chomp($commithash);1317$log->info("Commit hash :$commithash");13181319unless($commithash=~/[a-zA-Z0-9]{40}/)1320{1321$log->warn("Commit failed (Invalid commit hash)");1322print"error 1 Commit failed (unknown reason)\n";1323chdir"/";1324exit;1325}13261327# Check that this is allowed, just as we would with a receive-pack1328my@cmd= ($ENV{GIT_DIR}.'hooks/update',"refs/heads/$state->{module}",1329$parenthash,$commithash);1330if( -x $cmd[0] ) {1331unless(system(@cmd) ==0)1332{1333$log->warn("Commit failed (update hook declined to update ref)");1334print"error 1 Commit failed (update hook declined)\n";1335chdir"/";1336exit;1337}1338}13391340if(system(qw(git update-ref -m),"cvsserver ci",1341"refs/heads/$state->{module}",$commithash,$parenthash)) {1342$log->warn("update-ref for$state->{module} failed.");1343print"error 1 Cannot commit -- update first\n";1344exit;1345}13461347$updater->update();13481349# foreach file specified on the command line ...1350foreachmy$filename(@committedfiles)1351{1352$filename= filecleanup($filename);13531354my$meta=$updater->getmeta($filename);1355unless(defined$meta->{revision}) {1356$meta->{revision} =1;1357}13581359my($filepart,$dirpart) = filenamesplit($filename,1);13601361$log->debug("Checked-in$dirpart:$filename");13621363print"M$state->{CVSROOT}/$state->{module}/$filename,v <--$dirpart$filepart\n";1364if(defined$meta->{filehash} &&$meta->{filehash}eq"deleted")1365{1366print"M new revision: delete; previous revision: 1.$oldmeta{$filename}{revision}\n";1367print"Remove-entry$dirpart\n";1368print"$filename\n";1369}else{1370if($meta->{revision} ==1) {1371print"M initial revision: 1.1\n";1372}else{1373print"M new revision: 1.$meta->{revision}; previous revision: 1.$oldmeta{$filename}{revision}\n";1374}1375print"Checked-in$dirpart\n";1376print"$filename\n";1377my$kopts= kopts_from_path($filepart);1378print"/$filepart/1.$meta->{revision}//$kopts/\n";1379}1380}13811382chdir"/";1383print"ok\n";1384}13851386sub req_status1387{1388my($cmd,$data) =@_;13891390 argsplit("status");13911392$log->info("req_status : ". (defined($data) ?$data:"[NULL]"));1393#$log->debug("status state : " . Dumper($state));13941395# Grab a handle to the SQLite db and do any necessary updates1396my$updater= GITCVS::updater->new($state->{CVSROOT},$state->{module},$log);1397$updater->update();13981399# if no files were specified, we need to work out what files we should be providing status on ...1400 argsfromdir($updater);14011402# foreach file specified on the command line ...1403foreachmy$filename( @{$state->{args}} )1404{1405$filename= filecleanup($filename);14061407my$meta=$updater->getmeta($filename);1408my$oldmeta=$meta;14091410my$wrev= revparse($filename);14111412# If the working copy is an old revision, lets get that version too for comparison.1413if(defined($wrev)and$wrev!=$meta->{revision} )1414{1415$oldmeta=$updater->getmeta($filename,$wrev);1416}14171418# TODO : All possible statuses aren't yet implemented1419my$status;1420# Files are up to date if the working copy and repo copy have the same revision, and the working copy is unmodified1421$status="Up-to-date"if(defined($wrev)and defined($meta->{revision})and$wrev==$meta->{revision}1422and1423( ($state->{entries}{$filename}{unchanged}and(not defined($state->{entries}{$filename}{conflict} )or$state->{entries}{$filename}{conflict} !~/^\+=/) )1424or(defined($state->{entries}{$filename}{modified_hash})and$state->{entries}{$filename}{modified_hash}eq$meta->{filehash} ) )1425);14261427# Need checkout if the working copy has an older revision than the repo copy, and the working copy is unmodified1428$status||="Needs Checkout"if(defined($wrev)and defined($meta->{revision} )and$meta->{revision} >$wrev1429and1430($state->{entries}{$filename}{unchanged}1431or(defined($state->{entries}{$filename}{modified_hash})and$state->{entries}{$filename}{modified_hash}eq$oldmeta->{filehash} ) )1432);14331434# Need checkout if it exists in the repo but doesn't have a working copy1435$status||="Needs Checkout"if(not defined($wrev)and defined($meta->{revision} ) );14361437# Locally modified if working copy and repo copy have the same revision but there are local changes1438$status||="Locally Modified"if(defined($wrev)and defined($meta->{revision})and$wrev==$meta->{revision}and$state->{entries}{$filename}{modified_filename} );14391440# Needs Merge if working copy revision is less than repo copy and there are local changes1441$status||="Needs Merge"if(defined($wrev)and defined($meta->{revision} )and$meta->{revision} >$wrevand$state->{entries}{$filename}{modified_filename} );14421443$status||="Locally Added"if(defined($state->{entries}{$filename}{revision} )and not defined($meta->{revision} ) );1444$status||="Locally Removed"if(defined($wrev)and defined($meta->{revision} )and-$wrev==$meta->{revision} );1445$status||="Unresolved Conflict"if(defined($state->{entries}{$filename}{conflict} )and$state->{entries}{$filename}{conflict} =~/^\+=/);1446$status||="File had conflicts on merge"if(0);14471448$status||="Unknown";14491450print"M ===================================================================\n";1451print"M File:$filename\tStatus:$status\n";1452if(defined($state->{entries}{$filename}{revision}) )1453{1454print"M Working revision:\t".$state->{entries}{$filename}{revision} ."\n";1455}else{1456print"M Working revision:\tNo entry for$filename\n";1457}1458if(defined($meta->{revision}) )1459{1460print"M Repository revision:\t1.".$meta->{revision} ."\t$state->{CVSROOT}/$state->{module}/$filename,v\n";1461print"M Sticky Tag:\t\t(none)\n";1462print"M Sticky Date:\t\t(none)\n";1463print"M Sticky Options:\t\t(none)\n";1464}else{1465print"M Repository revision:\tNo revision control file\n";1466}1467print"M\n";1468}14691470print"ok\n";1471}14721473sub req_diff1474{1475my($cmd,$data) =@_;14761477 argsplit("diff");14781479$log->debug("req_diff : ". (defined($data) ?$data:"[NULL]"));1480#$log->debug("status state : " . Dumper($state));14811482my($revision1,$revision2);1483if(defined($state->{opt}{r} )and ref$state->{opt}{r}eq"ARRAY")1484{1485$revision1=$state->{opt}{r}[0];1486$revision2=$state->{opt}{r}[1];1487}else{1488$revision1=$state->{opt}{r};1489}14901491$revision1=~s/^1\.//if(defined($revision1) );1492$revision2=~s/^1\.//if(defined($revision2) );14931494$log->debug("Diffing revisions ". (defined($revision1) ?$revision1:"[NULL]") ." and ". (defined($revision2) ?$revision2:"[NULL]") );14951496# Grab a handle to the SQLite db and do any necessary updates1497my$updater= GITCVS::updater->new($state->{CVSROOT},$state->{module},$log);1498$updater->update();14991500# if no files were specified, we need to work out what files we should be providing status on ...1501 argsfromdir($updater);15021503# foreach file specified on the command line ...1504foreachmy$filename( @{$state->{args}} )1505{1506$filename= filecleanup($filename);15071508my($fh,$file1,$file2,$meta1,$meta2,$filediff);15091510my$wrev= revparse($filename);15111512# We need _something_ to diff against1513next unless(defined($wrev) );15141515# if we have a -r switch, use it1516if(defined($revision1) )1517{1518(undef,$file1) = tempfile( DIR =>$TEMP_DIR, OPEN =>0);1519$meta1=$updater->getmeta($filename,$revision1);1520unless(defined($meta1)and$meta1->{filehash}ne"deleted")1521{1522print"E File$filenameat revision 1.$revision1doesn't exist\n";1523next;1524}1525 transmitfile($meta1->{filehash},$file1);1526}1527# otherwise we just use the working copy revision1528else1529{1530(undef,$file1) = tempfile( DIR =>$TEMP_DIR, OPEN =>0);1531$meta1=$updater->getmeta($filename,$wrev);1532 transmitfile($meta1->{filehash},$file1);1533}15341535# if we have a second -r switch, use it too1536if(defined($revision2) )1537{1538(undef,$file2) = tempfile( DIR =>$TEMP_DIR, OPEN =>0);1539$meta2=$updater->getmeta($filename,$revision2);15401541unless(defined($meta2)and$meta2->{filehash}ne"deleted")1542{1543print"E File$filenameat revision 1.$revision2doesn't exist\n";1544next;1545}15461547 transmitfile($meta2->{filehash},$file2);1548}1549# otherwise we just use the working copy1550else1551{1552$file2=$state->{entries}{$filename}{modified_filename};1553}15541555# if we have been given -r, and we don't have a $file2 yet, lets get one1556if(defined($revision1)and not defined($file2) )1557{1558(undef,$file2) = tempfile( DIR =>$TEMP_DIR, OPEN =>0);1559$meta2=$updater->getmeta($filename,$wrev);1560 transmitfile($meta2->{filehash},$file2);1561}15621563# We need to have retrieved something useful1564next unless(defined($meta1) );15651566# Files to date if the working copy and repo copy have the same revision, and the working copy is unmodified1567next if(not defined($meta2)and$wrev==$meta1->{revision}1568and1569( ($state->{entries}{$filename}{unchanged}and(not defined($state->{entries}{$filename}{conflict} )or$state->{entries}{$filename}{conflict} !~/^\+=/) )1570or(defined($state->{entries}{$filename}{modified_hash})and$state->{entries}{$filename}{modified_hash}eq$meta1->{filehash} ) )1571);15721573# Apparently we only show diffs for locally modified files1574next unless(defined($meta2)or defined($state->{entries}{$filename}{modified_filename} ) );15751576print"M Index:$filename\n";1577print"M ===================================================================\n";1578print"M RCS file:$state->{CVSROOT}/$state->{module}/$filename,v\n";1579print"M retrieving revision 1.$meta1->{revision}\n"if(defined($meta1) );1580print"M retrieving revision 1.$meta2->{revision}\n"if(defined($meta2) );1581print"M diff ";1582foreachmy$opt(keys%{$state->{opt}} )1583{1584if(ref$state->{opt}{$opt}eq"ARRAY")1585{1586foreachmy$value( @{$state->{opt}{$opt}} )1587{1588print"-$opt$value";1589}1590}else{1591print"-$opt";1592print"$state->{opt}{$opt} "if(defined($state->{opt}{$opt} ) );1593}1594}1595print"$filename\n";15961597$log->info("Diffing$filename-r$meta1->{revision} -r ". ($meta2->{revision}or"workingcopy"));15981599($fh,$filediff) = tempfile ( DIR =>$TEMP_DIR);16001601if(exists$state->{opt}{u} )1602{1603system("diff -u -L '$filenamerevision 1.$meta1->{revision}' -L '$filename". (defined($meta2->{revision}) ?"revision 1.$meta2->{revision}":"working copy") ."'$file1$file2>$filediff");1604}else{1605system("diff$file1$file2>$filediff");1606}16071608while( <$fh> )1609{1610print"M$_";1611}1612close$fh;1613}16141615print"ok\n";1616}16171618sub req_log1619{1620my($cmd,$data) =@_;16211622 argsplit("log");16231624$log->debug("req_log : ". (defined($data) ?$data:"[NULL]"));1625#$log->debug("log state : " . Dumper($state));16261627my($minrev,$maxrev);1628if(defined($state->{opt}{r} )and$state->{opt}{r} =~/([\d.]+)?(::?)([\d.]+)?/)1629{1630my$control=$2;1631$minrev=$1;1632$maxrev=$3;1633$minrev=~s/^1\.//if(defined($minrev) );1634$maxrev=~s/^1\.//if(defined($maxrev) );1635$minrev++if(defined($minrev)and$controleq"::");1636}16371638# Grab a handle to the SQLite db and do any necessary updates1639my$updater= GITCVS::updater->new($state->{CVSROOT},$state->{module},$log);1640$updater->update();16411642# if no files were specified, we need to work out what files we should be providing status on ...1643 argsfromdir($updater);16441645# foreach file specified on the command line ...1646foreachmy$filename( @{$state->{args}} )1647{1648$filename= filecleanup($filename);16491650my$headmeta=$updater->getmeta($filename);16511652my$revisions=$updater->getlog($filename);1653my$totalrevisions=scalar(@$revisions);16541655if(defined($minrev) )1656{1657$log->debug("Removing revisions less than$minrev");1658while(scalar(@$revisions) >0and$revisions->[-1]{revision} <$minrev)1659{1660pop@$revisions;1661}1662}1663if(defined($maxrev) )1664{1665$log->debug("Removing revisions greater than$maxrev");1666while(scalar(@$revisions) >0and$revisions->[0]{revision} >$maxrev)1667{1668shift@$revisions;1669}1670}16711672next unless(scalar(@$revisions) );16731674print"M\n";1675print"M RCS file:$state->{CVSROOT}/$state->{module}/$filename,v\n";1676print"M Working file:$filename\n";1677print"M head: 1.$headmeta->{revision}\n";1678print"M branch:\n";1679print"M locks: strict\n";1680print"M access list:\n";1681print"M symbolic names:\n";1682print"M keyword substitution: kv\n";1683print"M total revisions:$totalrevisions;\tselected revisions: ".scalar(@$revisions) ."\n";1684print"M description:\n";16851686foreachmy$revision(@$revisions)1687{1688print"M ----------------------------\n";1689print"M revision 1.$revision->{revision}\n";1690# reformat the date for log output1691$revision->{modified} =sprintf('%04d/%02d/%02d%s',$3,$DATE_LIST->{$2},$1,$4)if($revision->{modified} =~/(\d+)\s+(\w+)\s+(\d+)\s+(\S+)/and defined($DATE_LIST->{$2}) );1692$revision->{author} =~s/\s+.*//;1693$revision->{author} =~s/^(.{8}).*/$1/;1694print"M date:$revision->{modified}; author:$revision->{author}; state: ". ($revision->{filehash}eq"deleted"?"dead":"Exp") ."; lines: +2 -3\n";1695my$commitmessage=$updater->commitmessage($revision->{commithash});1696$commitmessage=~s/^/M /mg;1697print$commitmessage."\n";1698}1699print"M =============================================================================\n";1700}17011702print"ok\n";1703}17041705sub req_annotate1706{1707my($cmd,$data) =@_;17081709 argsplit("annotate");17101711$log->info("req_annotate : ". (defined($data) ?$data:"[NULL]"));1712#$log->debug("status state : " . Dumper($state));17131714# Grab a handle to the SQLite db and do any necessary updates1715my$updater= GITCVS::updater->new($state->{CVSROOT},$state->{module},$log);1716$updater->update();17171718# if no files were specified, we need to work out what files we should be providing annotate on ...1719 argsfromdir($updater);17201721# we'll need a temporary checkout dir1722my$tmpdir= tempdir ( DIR =>$TEMP_DIR);1723my(undef,$file_index) = tempfile ( DIR =>$TEMP_DIR, OPEN =>0);1724$log->info("Temp checkoutdir creation successful, basing annotate session work on '$tmpdir', index file is '$file_index'");17251726$ENV{GIT_DIR} =$state->{CVSROOT} ."/";1727$ENV{GIT_WORK_TREE} =".";1728$ENV{GIT_INDEX_FILE} =$file_index;17291730chdir$tmpdir;17311732# foreach file specified on the command line ...1733foreachmy$filename( @{$state->{args}} )1734{1735$filename= filecleanup($filename);17361737my$meta=$updater->getmeta($filename);17381739next unless($meta->{revision} );17401741# get all the commits that this file was in1742# in dense format -- aka skip dead revisions1743my$revisions=$updater->gethistorydense($filename);1744my$lastseenin=$revisions->[0][2];17451746# populate the temporary index based on the latest commit were we saw1747# the file -- but do it cheaply without checking out any files1748# TODO: if we got a revision from the client, use that instead1749# to look up the commithash in sqlite (still good to default to1750# the current head as we do now)1751system("git-read-tree",$lastseenin);1752unless($?==0)1753{1754print"E error running git-read-tree$lastseenin$file_index$!\n";1755return;1756}1757$log->info("Created index '$file_index' with commit$lastseenin- exit status$?");17581759# do a checkout of the file1760system('git-checkout-index','-f','-u',$filename);1761unless($?==0) {1762print"E error running git-checkout-index -f -u$filename:$!\n";1763return;1764}17651766$log->info("Annotate$filename");17671768# Prepare a file with the commits from the linearized1769# history that annotate should know about. This prevents1770# git-jsannotate telling us about commits we are hiding1771# from the client.17721773my$a_hints="$tmpdir/.annotate_hints";1774if(!open(ANNOTATEHINTS,'>',$a_hints)) {1775print"E failed to open '$a_hints' for writing:$!\n";1776return;1777}1778for(my$i=0;$i<@$revisions;$i++)1779{1780print ANNOTATEHINTS $revisions->[$i][2];1781if($i+1<@$revisions) {# have we got a parent?1782print ANNOTATEHINTS ' '.$revisions->[$i+1][2];1783}1784print ANNOTATEHINTS "\n";1785}17861787print ANNOTATEHINTS "\n";1788close ANNOTATEHINTS1789or(print"E failed to write$a_hints:$!\n"),return;17901791my@cmd= (qw(git-annotate -l -S),$a_hints,$filename);1792if(!open(ANNOTATE,"-|",@cmd)) {1793print"E error invoking ".join(' ',@cmd) .":$!\n";1794return;1795}1796my$metadata= {};1797print"E Annotations for$filename\n";1798print"E ***************\n";1799while( <ANNOTATE> )1800{1801if(m/^([a-zA-Z0-9]{40})\t\([^\)]*\)(.*)$/i)1802{1803my$commithash=$1;1804my$data=$2;1805unless(defined($metadata->{$commithash} ) )1806{1807$metadata->{$commithash} =$updater->getmeta($filename,$commithash);1808$metadata->{$commithash}{author} =~s/\s+.*//;1809$metadata->{$commithash}{author} =~s/^(.{8}).*/$1/;1810$metadata->{$commithash}{modified} =sprintf("%02d-%s-%02d",$1,$2,$3)if($metadata->{$commithash}{modified} =~/^(\d+)\s(\w+)\s\d\d(\d\d)/);1811}1812printf("M 1.%-5d (%-8s%10s):%s\n",1813$metadata->{$commithash}{revision},1814$metadata->{$commithash}{author},1815$metadata->{$commithash}{modified},1816$data1817);1818}else{1819$log->warn("Error in annotate output! LINE:$_");1820print"E Annotate error\n";1821next;1822}1823}1824close ANNOTATE;1825}18261827# done; get out of the tempdir1828chdir"/";18291830print"ok\n";18311832}18331834# This method takes the state->{arguments} array and produces two new arrays.1835# The first is $state->{args} which is everything before the '--' argument, and1836# the second is $state->{files} which is everything after it.1837sub argsplit1838{1839$state->{args} = [];1840$state->{files} = [];1841$state->{opt} = {};18421843return unless(defined($state->{arguments})and ref$state->{arguments}eq"ARRAY");18441845my$type=shift;18461847if(defined($type) )1848{1849my$opt= {};1850$opt= { A =>0, N =>0, P =>0, R =>0, c =>0, f =>0, l =>0, n =>0, p =>0, s =>0, r =>1, D =>1, d =>1, k =>1, j =>1, }if($typeeq"co");1851$opt= { v =>0, l =>0, R =>0}if($typeeq"status");1852$opt= { A =>0, P =>0, C =>0, d =>0, f =>0, l =>0, R =>0, p =>0, k =>1, r =>1, D =>1, j =>1, I =>1, W =>1}if($typeeq"update");1853$opt= { l =>0, R =>0, k =>1, D =>1, D =>1, r =>2}if($typeeq"diff");1854$opt= { c =>0, R =>0, l =>0, f =>0, F =>1, m =>1, r =>1}if($typeeq"ci");1855$opt= { k =>1, m =>1}if($typeeq"add");1856$opt= { f =>0, l =>0, R =>0}if($typeeq"remove");1857$opt= { l =>0, b =>0, h =>0, R =>0, t =>0, N =>0, S =>0, r =>1, d =>1, s =>1, w =>1}if($typeeq"log");185818591860while(scalar( @{$state->{arguments}} ) >0)1861{1862my$arg=shift@{$state->{arguments}};18631864next if($argeq"--");1865next unless($arg=~/\S/);18661867# if the argument looks like a switch1868if($arg=~/^-(\w)(.*)/)1869{1870# if it's a switch that takes an argument1871if($opt->{$1} )1872{1873# If this switch has already been provided1874if($opt->{$1} >1and exists($state->{opt}{$1} ) )1875{1876$state->{opt}{$1} = [$state->{opt}{$1} ];1877if(length($2) >0)1878{1879push@{$state->{opt}{$1}},$2;1880}else{1881push@{$state->{opt}{$1}},shift@{$state->{arguments}};1882}1883}else{1884# if there's extra data in the arg, use that as the argument for the switch1885if(length($2) >0)1886{1887$state->{opt}{$1} =$2;1888}else{1889$state->{opt}{$1} =shift@{$state->{arguments}};1890}1891}1892}else{1893$state->{opt}{$1} =undef;1894}1895}1896else1897{1898push@{$state->{args}},$arg;1899}1900}1901}1902else1903{1904my$mode=0;19051906foreachmy$value( @{$state->{arguments}} )1907{1908if($valueeq"--")1909{1910$mode++;1911next;1912}1913push@{$state->{args}},$valueif($mode==0);1914push@{$state->{files}},$valueif($mode==1);1915}1916}1917}19181919# This method uses $state->{directory} to populate $state->{args} with a list of filenames1920sub argsfromdir1921{1922my$updater=shift;19231924$state->{args} = []if(scalar(@{$state->{args}}) ==1and$state->{args}[0]eq".");19251926return if(scalar( @{$state->{args}} ) >1);19271928my@gethead= @{$updater->gethead};19291930# push added files1931foreachmy$file(keys%{$state->{entries}}) {1932if(exists$state->{entries}{$file}{revision} &&1933$state->{entries}{$file}{revision} ==0)1934{1935push@gethead, { name =>$file, filehash =>'added'};1936}1937}19381939if(scalar(@{$state->{args}}) ==1)1940{1941my$arg=$state->{args}[0];1942$arg.=$state->{prependdir}if(defined($state->{prependdir} ) );19431944$log->info("Only one arg specified, checking for directory expansion on '$arg'");19451946foreachmy$file(@gethead)1947{1948next if($file->{filehash}eq"deleted"and not defined($state->{entries}{$file->{name}} ) );1949next unless($file->{name} =~/^$arg\//or$file->{name}eq$arg);1950push@{$state->{args}},$file->{name};1951}19521953shift@{$state->{args}}if(scalar(@{$state->{args}}) >1);1954}else{1955$log->info("Only one arg specified, populating file list automatically");19561957$state->{args} = [];19581959foreachmy$file(@gethead)1960{1961next if($file->{filehash}eq"deleted"and not defined($state->{entries}{$file->{name}} ) );1962next unless($file->{name} =~s/^$state->{prependdir}//);1963push@{$state->{args}},$file->{name};1964}1965}1966}19671968# This method cleans up the $state variable after a command that uses arguments has run1969sub statecleanup1970{1971$state->{files} = [];1972$state->{args} = [];1973$state->{arguments} = [];1974$state->{entries} = {};1975}19761977sub revparse1978{1979my$filename=shift;19801981returnundefunless(defined($state->{entries}{$filename}{revision} ) );19821983return$1if($state->{entries}{$filename}{revision} =~/^1\.(\d+)/);1984return-$1if($state->{entries}{$filename}{revision} =~/^-1\.(\d+)/);19851986returnundef;1987}19881989# This method takes a file hash and does a CVS "file transfer" which transmits the1990# size of the file, and then the file contents.1991# If a second argument $targetfile is given, the file is instead written out to1992# a file by the name of $targetfile1993sub transmitfile1994{1995my$filehash=shift;1996my$targetfile=shift;19971998if(defined($filehash)and$filehasheq"deleted")1999{2000$log->warn("filehash is 'deleted'");2001return;2002}20032004die"Need filehash"unless(defined($filehash)and$filehash=~/^[a-zA-Z0-9]{40}$/);20052006my$type=`git-cat-file -t$filehash`;2007 chomp$type;20082009 die ( "Invalid type '$type' (expected 'blob')" ) unless ( defined ($type) and$typeeq "blob" );20102011 my$size= `git-cat-file -s $filehash`;2012chomp$size;20132014$log->debug("transmitfile($filehash) size=$size, type=$type");20152016if(open my$fh,'-|',"git-cat-file","blob",$filehash)2017{2018if(defined($targetfile) )2019{2020open NEWFILE,">",$targetfileor die("Couldn't open '$targetfile' for writing :$!");2021print NEWFILE $_while( <$fh> );2022close NEWFILE or die("Failed to write '$targetfile':$!");2023}else{2024print"$size\n";2025printwhile( <$fh> );2026}2027close$fhor die("Couldn't close filehandle for transmitfile():$!");2028}else{2029die("Couldn't execute git-cat-file");2030}2031}20322033# This method takes a file name, and returns ( $dirpart, $filepart ) which2034# refers to the directory portion and the file portion of the filename2035# respectively2036sub filenamesplit2037{2038my$filename=shift;2039my$fixforlocaldir=shift;20402041my($filepart,$dirpart) = ($filename,".");2042($filepart,$dirpart) = ($2,$1)if($filename=~/(.*)\/(.*)/ );2043$dirpart.="/";20442045if($fixforlocaldir)2046{2047$dirpart=~s/^$state->{prependdir}//;2048}20492050return($filepart,$dirpart);2051}20522053sub filecleanup2054{2055my$filename=shift;20562057returnundefunless(defined($filename));2058if($filename=~/^\// )2059{2060print"E absolute filenames '$filename' not supported by server\n";2061returnundef;2062}20632064$filename=~s/^\.\///g;2065$filename=$state->{prependdir} .$filename;2066return$filename;2067}20682069# Given a path, this function returns a string containing the kopts2070# that should go into that path's Entries line. For example, a binary2071# file should get -kb.2072sub kopts_from_path2073{2074my($path) =@_;20752076# Once it exists, the git attributes system should be used to look up2077# what attributes apply to this path.20782079# Until then, take the setting from the config file2080unless(defined($cfg->{gitcvs}{allbinary} )and$cfg->{gitcvs}{allbinary} =~/^\s*(1|true|yes)\s*$/i)2081{2082# Return "" to give no special treatment to any path2083return"";2084}else{2085# Alternatively, to have all files treated as if they are binary (which2086# is more like git itself), always return the "-kb" option2087return"-kb";2088}2089}20902091package GITCVS::log;20922093####2094#### Copyright The Open University UK - 2006.2095####2096#### Authors: Martyn Smith <martyn@catalyst.net.nz>2097#### Martin Langhoff <martin@catalyst.net.nz>2098####2099####21002101use strict;2102use warnings;21032104=head1 NAME21052106GITCVS::log21072108=head1 DESCRIPTION21092110This module provides very crude logging with a similar interface to2111Log::Log4perl21122113=head1 METHODS21142115=cut21162117=head2 new21182119Creates a new log object, optionally you can specify a filename here to2120indicate the file to log to. If no log file is specified, you can specify one2121later with method setfile, or indicate you no longer want logging with method2122nofile.21232124Until one of these methods is called, all log calls will buffer messages ready2125to write out.21262127=cut2128sub new2129{2130my$class=shift;2131my$filename=shift;21322133my$self= {};21342135bless$self,$class;21362137if(defined($filename) )2138{2139open$self->{fh},">>",$filenameor die("Couldn't open '$filename' for writing :$!");2140}21412142return$self;2143}21442145=head2 setfile21462147This methods takes a filename, and attempts to open that file as the log file.2148If successful, all buffered data is written out to the file, and any further2149logging is written directly to the file.21502151=cut2152sub setfile2153{2154my$self=shift;2155my$filename=shift;21562157if(defined($filename) )2158{2159open$self->{fh},">>",$filenameor die("Couldn't open '$filename' for writing :$!");2160}21612162return unless(defined($self->{buffer} )and ref$self->{buffer}eq"ARRAY");21632164while(my$line=shift@{$self->{buffer}} )2165{2166print{$self->{fh}}$line;2167}2168}21692170=head2 nofile21712172This method indicates no logging is going to be used. It flushes any entries in2173the internal buffer, and sets a flag to ensure no further data is put there.21742175=cut2176sub nofile2177{2178my$self=shift;21792180$self->{nolog} =1;21812182return unless(defined($self->{buffer} )and ref$self->{buffer}eq"ARRAY");21832184$self->{buffer} = [];2185}21862187=head2 _logopen21882189Internal method. Returns true if the log file is open, false otherwise.21902191=cut2192sub _logopen2193{2194my$self=shift;21952196return1if(defined($self->{fh} )and ref$self->{fh}eq"GLOB");2197return0;2198}21992200=head2 debug info warn fatal22012202These four methods are wrappers to _log. They provide the actual interface for2203logging data.22042205=cut2206sub debug {my$self=shift;$self->_log("debug",@_); }2207sub info {my$self=shift;$self->_log("info",@_); }2208subwarn{my$self=shift;$self->_log("warn",@_); }2209sub fatal {my$self=shift;$self->_log("fatal",@_); }22102211=head2 _log22122213This is an internal method called by the logging functions. It generates a2214timestamp and pushes the logged line either to file, or internal buffer.22152216=cut2217sub _log2218{2219my$self=shift;2220my$level=shift;22212222return if($self->{nolog} );22232224my@time=localtime;2225my$timestring=sprintf("%4d-%02d-%02d%02d:%02d:%02d: %-5s",2226$time[5] +1900,2227$time[4] +1,2228$time[3],2229$time[2],2230$time[1],2231$time[0],2232uc$level,2233);22342235if($self->_logopen)2236{2237print{$self->{fh}}$timestring." - ".join(" ",@_) ."\n";2238}else{2239push@{$self->{buffer}},$timestring." - ".join(" ",@_) ."\n";2240}2241}22422243=head2 DESTROY22442245This method simply closes the file handle if one is open22462247=cut2248sub DESTROY2249{2250my$self=shift;22512252if($self->_logopen)2253{2254close$self->{fh};2255}2256}22572258package GITCVS::updater;22592260####2261#### Copyright The Open University UK - 2006.2262####2263#### Authors: Martyn Smith <martyn@catalyst.net.nz>2264#### Martin Langhoff <martin@catalyst.net.nz>2265####2266####22672268use strict;2269use warnings;2270use DBI;22712272=head1 METHODS22732274=cut22752276=head2 new22772278=cut2279sub new2280{2281my$class=shift;2282my$config=shift;2283my$module=shift;2284my$log=shift;22852286die"Need to specify a git repository"unless(defined($config)and-d $config);2287die"Need to specify a module"unless(defined($module) );22882289$class=ref($class) ||$class;22902291my$self= {};22922293bless$self,$class;22942295$self->{module} =$module;2296$self->{git_path} =$config."/";22972298$self->{log} =$log;22992300die"Git repo '$self->{git_path}' doesn't exist"unless( -d $self->{git_path} );23012302$self->{dbdriver} =$cfg->{gitcvs}{$state->{method}}{dbdriver} ||2303$cfg->{gitcvs}{dbdriver} ||"SQLite";2304$self->{dbname} =$cfg->{gitcvs}{$state->{method}}{dbname} ||2305$cfg->{gitcvs}{dbname} ||"%Ggitcvs.%m.sqlite";2306$self->{dbuser} =$cfg->{gitcvs}{$state->{method}}{dbuser} ||2307$cfg->{gitcvs}{dbuser} ||"";2308$self->{dbpass} =$cfg->{gitcvs}{$state->{method}}{dbpass} ||2309$cfg->{gitcvs}{dbpass} ||"";2310my%mapping= ( m =>$module,2311 a =>$state->{method},2312 u =>getlogin||getpwuid($<) || $<,2313 G =>$self->{git_path},2314 g => mangle_dirname($self->{git_path}),2315);2316$self->{dbname} =~s/%([mauGg])/$mapping{$1}/eg;2317$self->{dbuser} =~s/%([mauGg])/$mapping{$1}/eg;23182319die"Invalid char ':' in dbdriver"if$self->{dbdriver} =~/:/;2320die"Invalid char ';' in dbname"if$self->{dbname} =~/;/;2321$self->{dbh} = DBI->connect("dbi:$self->{dbdriver}:dbname=$self->{dbname}",2322$self->{dbuser},2323$self->{dbpass});2324die"Error connecting to database\n"unlessdefined$self->{dbh};23252326$self->{tables} = {};2327foreachmy$table(keys%{$self->{dbh}->table_info(undef,undef,undef,'TABLE')->fetchall_hashref('TABLE_NAME')} )2328{2329$self->{tables}{$table} =1;2330}23312332# Construct the revision table if required2333unless($self->{tables}{revision} )2334{2335$self->{dbh}->do("2336 CREATE TABLE revision (2337 name TEXT NOT NULL,2338 revision INTEGER NOT NULL,2339 filehash TEXT NOT NULL,2340 commithash TEXT NOT NULL,2341 author TEXT NOT NULL,2342 modified TEXT NOT NULL,2343 mode TEXT NOT NULL2344 )2345 ");2346$self->{dbh}->do("2347 CREATE INDEX revision_ix12348 ON revision (name,revision)2349 ");2350$self->{dbh}->do("2351 CREATE INDEX revision_ix22352 ON revision (name,commithash)2353 ");2354}23552356# Construct the head table if required2357unless($self->{tables}{head} )2358{2359$self->{dbh}->do("2360 CREATE TABLE head (2361 name TEXT NOT NULL,2362 revision INTEGER NOT NULL,2363 filehash TEXT NOT NULL,2364 commithash TEXT NOT NULL,2365 author TEXT NOT NULL,2366 modified TEXT NOT NULL,2367 mode TEXT NOT NULL2368 )2369 ");2370$self->{dbh}->do("2371 CREATE INDEX head_ix12372 ON head (name)2373 ");2374}23752376# Construct the properties table if required2377unless($self->{tables}{properties} )2378{2379$self->{dbh}->do("2380 CREATE TABLE properties (2381 key TEXT NOT NULL PRIMARY KEY,2382 value TEXT2383 )2384 ");2385}23862387# Construct the commitmsgs table if required2388unless($self->{tables}{commitmsgs} )2389{2390$self->{dbh}->do("2391 CREATE TABLE commitmsgs (2392 key TEXT NOT NULL PRIMARY KEY,2393 value TEXT2394 )2395 ");2396}23972398return$self;2399}24002401=head2 update24022403=cut2404sub update2405{2406my$self=shift;24072408# first lets get the commit list2409$ENV{GIT_DIR} =$self->{git_path};24102411my$commitsha1=`git rev-parse$self->{module}`;2412chomp$commitsha1;24132414my$commitinfo=`git cat-file commit$self->{module} 2>&1`;2415unless($commitinfo=~/tree\s+[a-zA-Z0-9]{40}/)2416{2417die("Invalid module '$self->{module}'");2418}241924202421my$git_log;2422my$lastcommit=$self->_get_prop("last_commit");24232424if(defined$lastcommit&&$lastcommiteq$commitsha1) {# up-to-date2425return1;2426}24272428# Start exclusive lock here...2429$self->{dbh}->begin_work()or die"Cannot lock database for BEGIN";24302431# TODO: log processing is memory bound2432# if we can parse into a 2nd file that is in reverse order2433# we can probably do something really efficient2434my@git_log_params= ('--pretty','--parents','--topo-order');24352436if(defined$lastcommit) {2437push@git_log_params,"$lastcommit..$self->{module}";2438}else{2439push@git_log_params,$self->{module};2440}2441# git-rev-list is the backend / plumbing version of git-log2442open(GITLOG,'-|','git-rev-list',@git_log_params)or die"Cannot call git-rev-list:$!";24432444my@commits;24452446my%commit= ();24472448while( <GITLOG> )2449{2450chomp;2451if(m/^commit\s+(.*)$/) {2452# on ^commit lines put the just seen commit in the stack2453# and prime things for the next one2454if(keys%commit) {2455my%copy=%commit;2456unshift@commits, \%copy;2457%commit= ();2458}2459my@parents=split(m/\s+/,$1);2460$commit{hash} =shift@parents;2461$commit{parents} = \@parents;2462}elsif(m/^(\w+?):\s+(.*)$/&& !exists($commit{message})) {2463# on rfc822-like lines seen before we see any message,2464# lowercase the entry and put it in the hash as key-value2465$commit{lc($1)} =$2;2466}else{2467# message lines - skip initial empty line2468# and trim whitespace2469if(!exists($commit{message}) &&m/^\s*$/) {2470# define it to mark the end of headers2471$commit{message} ='';2472next;2473}2474s/^\s+//;s/\s+$//;# trim ws2475$commit{message} .=$_."\n";2476}2477}2478close GITLOG;24792480unshift@commits, \%commitif(keys%commit);24812482# Now all the commits are in the @commits bucket2483# ordered by time DESC. for each commit that needs processing,2484# determine whether it's following the last head we've seen or if2485# it's on its own branch, grab a file list, and add whatever's changed2486# NOTE: $lastcommit refers to the last commit from previous run2487# $lastpicked is the last commit we picked in this run2488my$lastpicked;2489my$head= {};2490if(defined$lastcommit) {2491$lastpicked=$lastcommit;2492}24932494my$committotal=scalar(@commits);2495my$commitcount=0;24962497# Load the head table into $head (for cached lookups during the update process)2498foreachmy$file( @{$self->gethead()} )2499{2500$head->{$file->{name}} =$file;2501}25022503foreachmy$commit(@commits)2504{2505$self->{log}->debug("GITCVS::updater - Processing commit$commit->{hash} (". (++$commitcount) ." of$committotal)");2506if(defined$lastpicked)2507{2508if(!in_array($lastpicked, @{$commit->{parents}}))2509{2510# skip, we'll see this delta2511# as part of a merge later2512# warn "skipping off-track $commit->{hash}\n";2513next;2514}elsif(@{$commit->{parents}} >1) {2515# it is a merge commit, for each parent that is2516# not $lastpicked, see if we can get a log2517# from the merge-base to that parent to put it2518# in the message as a merge summary.2519my@parents= @{$commit->{parents}};2520foreachmy$parent(@parents) {2521# git-merge-base can potentially (but rarely) throw2522# several candidate merge bases. let's assume2523# that the first one is the best one.2524if($parenteq$lastpicked) {2525next;2526}2527my$base= safe_pipe_capture('git-merge-base',2528$lastpicked,$parent);2529chomp$base;2530if($base) {2531my@merged;2532# print "want to log between $base $parent \n";2533open(GITLOG,'-|','git-log',"$base..$parent")2534or die"Cannot call git-log:$!";2535my$mergedhash;2536while(<GITLOG>) {2537chomp;2538if(!defined$mergedhash) {2539if(m/^commit\s+(.+)$/) {2540$mergedhash=$1;2541}else{2542next;2543}2544}else{2545# grab the first line that looks non-rfc8222546# aka has content after leading space2547if(m/^\s+(\S.*)$/) {2548my$title=$1;2549$title=substr($title,0,100);# truncate2550unshift@merged,"$mergedhash$title";2551undef$mergedhash;2552}2553}2554}2555close GITLOG;2556if(@merged) {2557$commit->{mergemsg} =$commit->{message};2558$commit->{mergemsg} .="\nSummary of merged commits:\n\n";2559foreachmy$summary(@merged) {2560$commit->{mergemsg} .="\t$summary\n";2561}2562$commit->{mergemsg} .="\n\n";2563# print "Message for $commit->{hash} \n$commit->{mergemsg}";2564}2565}2566}2567}2568}25692570# convert the date to CVS-happy format2571$commit->{date} ="$2$1$4$3$5"if($commit->{date} =~/^\w+\s+(\w+)\s+(\d+)\s+(\d+:\d+:\d+)\s+(\d+)\s+([+-]\d+)$/);25722573if(defined($lastpicked) )2574{2575my$filepipe=open(FILELIST,'-|','git-diff-tree','-z','-r',$lastpicked,$commit->{hash})or die("Cannot call git-diff-tree :$!");2576local($/) ="\0";2577while( <FILELIST> )2578{2579chomp;2580unless(/^:\d{6}\s+\d{3}(\d)\d{2}\s+[a-zA-Z0-9]{40}\s+([a-zA-Z0-9]{40})\s+(\w)$/o)2581{2582die("Couldn't process git-diff-tree line :$_");2583}2584my($mode,$hash,$change) = ($1,$2,$3);2585my$name= <FILELIST>;2586chomp($name);25872588# $log->debug("File mode=$mode, hash=$hash, change=$change, name=$name");25892590my$git_perms="";2591$git_perms.="r"if($mode&4);2592$git_perms.="w"if($mode&2);2593$git_perms.="x"if($mode&1);2594$git_perms="rw"if($git_permseq"");25952596if($changeeq"D")2597{2598#$log->debug("DELETE $name");2599$head->{$name} = {2600 name =>$name,2601 revision =>$head->{$name}{revision} +1,2602 filehash =>"deleted",2603 commithash =>$commit->{hash},2604 modified =>$commit->{date},2605 author =>$commit->{author},2606 mode =>$git_perms,2607};2608$self->insert_rev($name,$head->{$name}{revision},$hash,$commit->{hash},$commit->{date},$commit->{author},$git_perms);2609}2610elsif($changeeq"M")2611{2612#$log->debug("MODIFIED $name");2613$head->{$name} = {2614 name =>$name,2615 revision =>$head->{$name}{revision} +1,2616 filehash =>$hash,2617 commithash =>$commit->{hash},2618 modified =>$commit->{date},2619 author =>$commit->{author},2620 mode =>$git_perms,2621};2622$self->insert_rev($name,$head->{$name}{revision},$hash,$commit->{hash},$commit->{date},$commit->{author},$git_perms);2623}2624elsif($changeeq"A")2625{2626#$log->debug("ADDED $name");2627$head->{$name} = {2628 name =>$name,2629 revision =>$head->{$name}{revision} ?$head->{$name}{revision}+1:1,2630 filehash =>$hash,2631 commithash =>$commit->{hash},2632 modified =>$commit->{date},2633 author =>$commit->{author},2634 mode =>$git_perms,2635};2636$self->insert_rev($name,$head->{$name}{revision},$hash,$commit->{hash},$commit->{date},$commit->{author},$git_perms);2637}2638else2639{2640$log->warn("UNKNOWN FILE CHANGE mode=$mode, hash=$hash, change=$change, name=$name");2641die;2642}2643}2644close FILELIST;2645}else{2646# this is used to detect files removed from the repo2647my$seen_files= {};26482649my$filepipe=open(FILELIST,'-|','git-ls-tree','-z','-r',$commit->{hash})or die("Cannot call git-ls-tree :$!");2650local$/="\0";2651while( <FILELIST> )2652{2653chomp;2654unless(/^(\d+)\s+(\w+)\s+([a-zA-Z0-9]+)\t(.*)$/o)2655{2656die("Couldn't process git-ls-tree line :$_");2657}26582659my($git_perms,$git_type,$git_hash,$git_filename) = ($1,$2,$3,$4);26602661$seen_files->{$git_filename} =1;26622663my($oldhash,$oldrevision,$oldmode) = (2664$head->{$git_filename}{filehash},2665$head->{$git_filename}{revision},2666$head->{$git_filename}{mode}2667);26682669if($git_perms=~/^\d\d\d(\d)\d\d/o)2670{2671$git_perms="";2672$git_perms.="r"if($1&4);2673$git_perms.="w"if($1&2);2674$git_perms.="x"if($1&1);2675}else{2676$git_perms="rw";2677}26782679# unless the file exists with the same hash, we need to update it ...2680unless(defined($oldhash)and$oldhasheq$git_hashand defined($oldmode)and$oldmodeeq$git_perms)2681{2682my$newrevision= ($oldrevisionor0) +1;26832684$head->{$git_filename} = {2685 name =>$git_filename,2686 revision =>$newrevision,2687 filehash =>$git_hash,2688 commithash =>$commit->{hash},2689 modified =>$commit->{date},2690 author =>$commit->{author},2691 mode =>$git_perms,2692};269326942695$self->insert_rev($git_filename,$newrevision,$git_hash,$commit->{hash},$commit->{date},$commit->{author},$git_perms);2696}2697}2698close FILELIST;26992700# Detect deleted files2701foreachmy$file(keys%$head)2702{2703unless(exists$seen_files->{$file}or$head->{$file}{filehash}eq"deleted")2704{2705$head->{$file}{revision}++;2706$head->{$file}{filehash} ="deleted";2707$head->{$file}{commithash} =$commit->{hash};2708$head->{$file}{modified} =$commit->{date};2709$head->{$file}{author} =$commit->{author};27102711$self->insert_rev($file,$head->{$file}{revision},$head->{$file}{filehash},$commit->{hash},$commit->{date},$commit->{author},$head->{$file}{mode});2712}2713}2714# END : "Detect deleted files"2715}271627172718if(exists$commit->{mergemsg})2719{2720$self->insert_mergelog($commit->{hash},$commit->{mergemsg});2721}27222723$lastpicked=$commit->{hash};27242725$self->_set_prop("last_commit",$commit->{hash});2726}27272728$self->delete_head();2729foreachmy$file(keys%$head)2730{2731$self->insert_head(2732$file,2733$head->{$file}{revision},2734$head->{$file}{filehash},2735$head->{$file}{commithash},2736$head->{$file}{modified},2737$head->{$file}{author},2738$head->{$file}{mode},2739);2740}2741# invalidate the gethead cache2742$self->{gethead_cache} =undef;274327442745# Ending exclusive lock here2746$self->{dbh}->commit()or die"Failed to commit changes to SQLite";2747}27482749sub insert_rev2750{2751my$self=shift;2752my$name=shift;2753my$revision=shift;2754my$filehash=shift;2755my$commithash=shift;2756my$modified=shift;2757my$author=shift;2758my$mode=shift;27592760my$insert_rev=$self->{dbh}->prepare_cached("INSERT INTO revision (name, revision, filehash, commithash, modified, author, mode) VALUES (?,?,?,?,?,?,?)",{},1);2761$insert_rev->execute($name,$revision,$filehash,$commithash,$modified,$author,$mode);2762}27632764sub insert_mergelog2765{2766my$self=shift;2767my$key=shift;2768my$value=shift;27692770my$insert_mergelog=$self->{dbh}->prepare_cached("INSERT INTO commitmsgs (key, value) VALUES (?,?)",{},1);2771$insert_mergelog->execute($key,$value);2772}27732774sub delete_head2775{2776my$self=shift;27772778my$delete_head=$self->{dbh}->prepare_cached("DELETE FROM head",{},1);2779$delete_head->execute();2780}27812782sub insert_head2783{2784my$self=shift;2785my$name=shift;2786my$revision=shift;2787my$filehash=shift;2788my$commithash=shift;2789my$modified=shift;2790my$author=shift;2791my$mode=shift;27922793my$insert_head=$self->{dbh}->prepare_cached("INSERT INTO head (name, revision, filehash, commithash, modified, author, mode) VALUES (?,?,?,?,?,?,?)",{},1);2794$insert_head->execute($name,$revision,$filehash,$commithash,$modified,$author,$mode);2795}27962797sub _headrev2798{2799my$self=shift;2800my$filename=shift;28012802my$db_query=$self->{dbh}->prepare_cached("SELECT filehash, revision, mode FROM head WHERE name=?",{},1);2803$db_query->execute($filename);2804my($hash,$revision,$mode) =$db_query->fetchrow_array;28052806return($hash,$revision,$mode);2807}28082809sub _get_prop2810{2811my$self=shift;2812my$key=shift;28132814my$db_query=$self->{dbh}->prepare_cached("SELECT value FROM properties WHERE key=?",{},1);2815$db_query->execute($key);2816my($value) =$db_query->fetchrow_array;28172818return$value;2819}28202821sub _set_prop2822{2823my$self=shift;2824my$key=shift;2825my$value=shift;28262827my$db_query=$self->{dbh}->prepare_cached("UPDATE properties SET value=? WHERE key=?",{},1);2828$db_query->execute($value,$key);28292830unless($db_query->rows)2831{2832$db_query=$self->{dbh}->prepare_cached("INSERT INTO properties (key, value) VALUES (?,?)",{},1);2833$db_query->execute($key,$value);2834}28352836return$value;2837}28382839=head2 gethead28402841=cut28422843sub gethead2844{2845my$self=shift;28462847return$self->{gethead_cache}if(defined($self->{gethead_cache} ) );28482849my$db_query=$self->{dbh}->prepare_cached("SELECT name, filehash, mode, revision, modified, commithash, author FROM head ORDER BY name ASC",{},1);2850$db_query->execute();28512852my$tree= [];2853while(my$file=$db_query->fetchrow_hashref)2854{2855push@$tree,$file;2856}28572858$self->{gethead_cache} =$tree;28592860return$tree;2861}28622863=head2 getlog28642865=cut28662867sub getlog2868{2869my$self=shift;2870my$filename=shift;28712872my$db_query=$self->{dbh}->prepare_cached("SELECT name, filehash, author, mode, revision, modified, commithash FROM revision WHERE name=? ORDER BY revision DESC",{},1);2873$db_query->execute($filename);28742875my$tree= [];2876while(my$file=$db_query->fetchrow_hashref)2877{2878push@$tree,$file;2879}28802881return$tree;2882}28832884=head2 getmeta28852886This function takes a filename (with path) argument and returns a hashref of2887metadata for that file.28882889=cut28902891sub getmeta2892{2893my$self=shift;2894my$filename=shift;2895my$revision=shift;28962897my$db_query;2898if(defined($revision)and$revision=~/^\d+$/)2899{2900$db_query=$self->{dbh}->prepare_cached("SELECT * FROM revision WHERE name=? AND revision=?",{},1);2901$db_query->execute($filename,$revision);2902}2903elsif(defined($revision)and$revision=~/^[a-zA-Z0-9]{40}$/)2904{2905$db_query=$self->{dbh}->prepare_cached("SELECT * FROM revision WHERE name=? AND commithash=?",{},1);2906$db_query->execute($filename,$revision);2907}else{2908$db_query=$self->{dbh}->prepare_cached("SELECT * FROM head WHERE name=?",{},1);2909$db_query->execute($filename);2910}29112912return$db_query->fetchrow_hashref;2913}29142915=head2 commitmessage29162917this function takes a commithash and returns the commit message for that commit29182919=cut2920sub commitmessage2921{2922my$self=shift;2923my$commithash=shift;29242925die("Need commithash")unless(defined($commithash)and$commithash=~/^[a-zA-Z0-9]{40}$/);29262927my$db_query;2928$db_query=$self->{dbh}->prepare_cached("SELECT value FROM commitmsgs WHERE key=?",{},1);2929$db_query->execute($commithash);29302931my($message) =$db_query->fetchrow_array;29322933if(defined($message) )2934{2935$message.=" "if($message=~/\n$/);2936return$message;2937}29382939my@lines= safe_pipe_capture("git-cat-file","commit",$commithash);2940shift@lineswhile($lines[0] =~/\S/);2941$message=join("",@lines);2942$message.=" "if($message=~/\n$/);2943return$message;2944}29452946=head2 gethistory29472948This function takes a filename (with path) argument and returns an arrayofarrays2949containing revision,filehash,commithash ordered by revision descending29502951=cut2952sub gethistory2953{2954my$self=shift;2955my$filename=shift;29562957my$db_query;2958$db_query=$self->{dbh}->prepare_cached("SELECT revision, filehash, commithash FROM revision WHERE name=? ORDER BY revision DESC",{},1);2959$db_query->execute($filename);29602961return$db_query->fetchall_arrayref;2962}29632964=head2 gethistorydense29652966This function takes a filename (with path) argument and returns an arrayofarrays2967containing revision,filehash,commithash ordered by revision descending.29682969This version of gethistory skips deleted entries -- so it is useful for annotate.2970The 'dense' part is a reference to a '--dense' option available for git-rev-list2971and other git tools that depend on it.29722973=cut2974sub gethistorydense2975{2976my$self=shift;2977my$filename=shift;29782979my$db_query;2980$db_query=$self->{dbh}->prepare_cached("SELECT revision, filehash, commithash FROM revision WHERE name=? AND filehash!='deleted' ORDER BY revision DESC",{},1);2981$db_query->execute($filename);29822983return$db_query->fetchall_arrayref;2984}29852986=head2 in_array()29872988from Array::PAT - mimics the in_array() function2989found in PHP. Yuck but works for small arrays.29902991=cut2992sub in_array2993{2994my($check,@array) =@_;2995my$retval=0;2996foreachmy$test(@array){2997if($checkeq$test){2998$retval=1;2999}3000}3001return$retval;3002}30033004=head2 safe_pipe_capture30053006an alternative to `command` that allows input to be passed as an array3007to work around shell problems with weird characters in arguments30083009=cut3010sub safe_pipe_capture {30113012my@output;30133014if(my$pid=open my$child,'-|') {3015@output= (<$child>);3016close$childor die join(' ',@_).":$!$?";3017}else{3018exec(@_)or die"$!$?";# exec() can fail the executable can't be found3019}3020returnwantarray?@output:join('',@output);3021}30223023=head2 mangle_dirname30243025create a string from a directory name that is suitable to use as3026part of a filename, mainly by converting all chars except \w.- to _30273028=cut3029sub mangle_dirname {3030my$dirname=shift;3031return unlessdefined$dirname;30323033$dirname=~s/[^\w.-]/_/g;30343035return$dirname;3036}303730381;