From d2b212fe547ef90abce02b9c4c88d0b3683beb33 Mon Sep 17 00:00:00 2001
From: Fabien Tassin <fta@ubuntu.com>
Date: Wed, 26 Nov 2008 15:44:53 +0100
Subject: * [mozclient] fix hg incorrectly requesting branches   - update
 src/mozclient/lib/MozClient/Mercurial.pm

---
 src/mozclient/lib/MozClient/Mercurial.pm | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'src/mozclient/lib')

diff --git a/src/mozclient/lib/MozClient/Mercurial.pm b/src/mozclient/lib/MozClient/Mercurial.pm
index 45fcbbc..40f2879 100644
--- a/src/mozclient/lib/MozClient/Mercurial.pm
+++ b/src/mozclient/lib/MozClient/Mercurial.pm
@@ -78,10 +78,14 @@ sub checkout {
 	$self->{'MOZCLIENT_PROJECT'}, $module);
     }
   }
-  my $cmd = sprintf "hg clone %s %s %s %s", $self->{'mozclient_date'},
-    $self->{'co_tag'}, join(" ", @$modules), $self->{'MOZCLIENT_MOZDIRNAME'};
+  my $cmd = sprintf "hg clone %s %s", join(" ", @$modules),
+    $self->{'MOZCLIENT_MOZDIRNAME'};
   $self->run_system($cmd);
-  $self->chdir("..");
+  $self->chdir($self->{'MOZCLIENT_MOZDIRNAME'});
+  my $rev =  $self->{'mozclient_date'} ?  $self->{'mozclient_date'} : $self->{'co_tag'};
+  $cmd = sprintf "hg update %s", $rev;
+  $self->run_system($cmd);
+  $self->chdir("../..");
 }
 
 sub tar_exclude {
-- 
cgit v1.2.3