Remove init-repository assumption of repo url “…/qt/<repo>”
authorJason Erb <erb@suitabletech.com>
Tue, 7 Mar 2017 23:08:11 +0000 (18:08 -0500)
committerJason Erb (Suitable Technologies) <erb@suitabletech.com>
Mon, 13 Mar 2017 15:18:47 +0000 (15:18 +0000)
Task-number: QTBUG-59355
Change-Id: I7bc2c94f13c6cf43bd9d4472f18b3b769e75954b
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
init-repository

index 7a97c19..570e124 100755 (executable)
@@ -144,7 +144,7 @@ Options:
 
         For example:
 
-          --mirror user\@machine:/foo/bar/
+          --mirror user\@machine:/foo/bar/qt/
 
         ...will use the following as a mirror for qtbase:
 
@@ -167,13 +167,13 @@ my $script_path = abs_path($0);
 $script_path =~ s,[/\\][^/\\]+$,,;
 
 my $GERRIT_SSH_BASE
-    = 'ssh://@USER@codereview.qt-project.org@PORT@/';
+    = 'ssh://@USER@codereview.qt-project.org@PORT@/qt/';
 
 my $BER_MIRROR_URL_BASE
-    = 'git://hegel/';
+    = 'git://hegel/qt/';
 
 my $OSLO_MIRROR_URL_BASE
-    = 'git://qilin/';
+    = 'git://qilin/qt/';
 
 sub new
 {
@@ -638,12 +638,12 @@ sub run
     chomp(my $url = `git config remote.origin.url`);
     die("Have no origin remote.\n") if (!$url);
     $url =~ s,\.git$,,;
-    $url =~ s,qt/qt5$,,;
+    $url =~ s/qt5$//;
     $self->{'base-url'} = $url;
 
-    $self->git_clone_all_submodules('qt/qt5', $self->{branch}, @{$self->{'module-subset'}});
+    $self->git_clone_all_submodules('qt5', $self->{branch}, @{$self->{'module-subset'}});
 
-    $self->git_add_remotes('qt/qt5');
+    $self->git_add_remotes('qt5');
 
     $self->git_install_hooks;