# HG changeset patch
# User Chetan Kapoor <chetank@symbian.org>
# Date 1265805387 0
# Node ID d50cda9d0682aeed2cd373f5f22739388da58404
# Parent  27cf0a88d449338f0df3bab12026d51d27e7aa30# Parent  0df3a90af03089c5c34bd4e1d2635a6bf297bd26
Catchup Merge

diff -r 0df3a90af030 -r d50cda9d0682 code_churn/churn_core.pl
--- a/code_churn/churn_core.pl	Tue Feb 09 17:40:51 2010 +0000
+++ b/code_churn/churn_core.pl	Wed Feb 10 12:36:27 2010 +0000
@@ -42,7 +42,8 @@
     die("$Logs_Dir does not exist \n");
 }
 
-$dir_left =~ m/^(\w+)\.[0-9a-fA-F]+/;
+#$dir_left =~ m/^(\w+)\.[0-9a-fA-F]+/;
+$dir_right =~ m/^(\w+)\.[0-9a-fA-F]+/;
 my $package_name = $1;
 
 $dir_left =~ m/^\w+\.([0-9a-fA-F]+)/;
diff -r 0df3a90af030 -r d50cda9d0682 code_churn/fbf_churn.pl
--- a/code_churn/fbf_churn.pl	Tue Feb 09 17:40:51 2010 +0000
+++ b/code_churn/fbf_churn.pl	Wed Feb 10 12:36:27 2010 +0000
@@ -96,6 +96,7 @@
 my $licence = "";
 my $packagelist = "";
 my $verbose = 0;
+my $mirror = 0;
 my $help = 0;
 
 sub do_system
@@ -142,12 +143,15 @@
 my @verboseopt = ();
 @verboseopt = "-v" if ($verbose);
 
+my @mirroropt = ();
+@mirroropt = "-mirror" if ($mirror);
+
 my $new_rev = $new;
 $new_rev = "%REV%" if ($new_rev eq "");
 
 #TO_DO: Locate clone_all_packages relative to the location of this script.
 #TO_DO: Remove references to absolute paths, change to relative paths.
-do_system($clone_packages,@verboseopt,"-mirror","-filter","$licence.*$codeline.*$filter",@packagelistopts,"-exec","--",
+do_system($clone_packages,@verboseopt,@mirroropt,"-filter","$licence.*$codeline.*$filter",@packagelistopts,"-exec","--",
    "hg","--config","\"extensions.hgext.extdiff=\"","extdiff","-p",$churn_core,"-o",$churn_output_temp,
    "-r","$old","-r","$new_rev");