From 039f8c85559abaf1c59fdbcf098a5391eb2c0193 Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Date: Mon, 19 Nov 2012 14:17:50 +0100
Subject: remove special handling of qtwebkit
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

the svn mirror is now CI-controlled on gerrit and mirrored to gitorious
like any other qt module.

Change-Id: I05ead0a4aaa4fc5348a3e3d39d9ee7db734580f4
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Reviewed-by: Samuli Piippo <samuli.piippo@digia.com>
Reviewed-by: Simo Fält <simo.falt@digia.com>
---
 .gitmodules     |  6 +++---
 init-repository | 23 +++--------------------
 2 files changed, 6 insertions(+), 23 deletions(-)

diff --git a/.gitmodules b/.gitmodules
index 13ae4fe2..4f09c921 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -31,15 +31,15 @@
 [submodule "qtrepotools"]
 	path = qtrepotools
 	url = git://gitorious.org/qt/qtrepotools.git
+[submodule "qtwebkit"]
+	path = qtwebkit
+	url = git://gitorious.org/qt/qtwebkit.git
 [submodule "qtwebkit-examples-and-demos"]
 	path = qtwebkit-examples-and-demos
 	url = git://gitorious.org/qt/qtwebkit-examples-and-demos.git
 [submodule "qtqa"]
 	path = qtqa
 	url = git://gitorious.org/qt/qtqa.git
-[submodule "qtwebkit"]
-	path = qtwebkit
-	url = git://gitorious.org/qtwebkit/qt5-module.git
 [submodule "qtjsbackend"]
 	path = qtjsbackend
 	url = git://gitorious.org/qt/qtjsbackend.git
diff --git a/init-repository b/init-repository
index eaae77da..8cbdc80e 100755
--- a/init-repository
+++ b/init-repository
@@ -122,7 +122,7 @@ Switch to internal Nokia URLs.
 =item --berlin
 
 Switch to internal Nokia URLs and make use of the Berlin git mirrors.
-(Implies `--mirror' and `--mirror-webkit').
+(Implies `--mirror').
 
 
 =item --ssh
@@ -192,10 +192,6 @@ For example:
 The mirror is permitted to contain a subset of the submodules; any
 missing modules will fall back to the canonical URLs.
 
-=item --mirror-webkit <url>
-
-Uses <url> as the URL for the webkit git mirror.
-
 =back
 
 =cut
@@ -238,6 +234,7 @@ my %GERRIT_REPOS = map { $_ => "qt/$_" } qw(
     qttools
     qttranslations
     qtwayland
+    qtwebkit
     qtwebkit-examples-and-demos
     qtxmlpatterns
 );
@@ -248,10 +245,6 @@ my $GERRIT_SSH_BASE
 my $BER_MIRROR_URL_BASE
     = 'git://ber-git.europe.nokia.com/';
 
-my $BER_MIRROR_WEBKIT_URL
-    = 'git://ber-git.europe.nokia.com/qtwebkit/qtwebkit.git';
-
-
 sub new
 {
     my ($class, @arguments) = @_;
@@ -290,7 +283,6 @@ sub parse_arguments
         'force'               => 0 ,
         'ignore-submodules'   => 0 ,
         'mirror-url'          => "",
-        'mirror-webkit-url'   => "",
         'nokia-developer'     => 0 ,
         'protocol'            => "",
         'update'              => 1 ,
@@ -304,7 +296,6 @@ sub parse_arguments
         'copy-objects'      =>  \$self->{qw{ detach-alternates }},
         'force'             =>  \$self->{qw{ force             }},
         'ignore-submodules' =>  \$self->{qw{ ignore-submodules }},
-        'mirror-webkit=s'   =>  \$self->{qw{ mirror-webkit-url }},
         'mirror=s'          =>  \$self->{qw{ mirror-url        }},
         'nokia-developer'   =>  \$self->{qw{ nokia-developer   }},
         'quiet'             =>  \$self->{qw{ quiet             }},
@@ -320,7 +311,6 @@ sub parse_arguments
             $self->{'nokia-developer'}   = 1;
             $self->{'protocol'}          = 'internal';
             $self->{'mirror-url'}        = $BER_MIRROR_URL_BASE;
-            $self->{'mirror-webkit-url'} = $BER_MIRROR_WEBKIT_URL;
         },
 
         'nokia-developer' => sub {
@@ -431,8 +421,6 @@ sub git_set_submodule_config
         my $value = $2;
 
         if ($protocol) {
-            # WebKit is special, and has only external link.
-            if (!($key eq 'qtwebkit' && $protocol eq 'internal')) {
                 # qt-labs projects are still hosted under qt internally.
                 if ($protocol ne 'http') {
                     $value =~ s,^git://gitorious\.org/qt-labs/,${url_base_for_protocol}qt/,;
@@ -440,7 +428,6 @@ sub git_set_submodule_config
 
                 # assume all other projects hosted under gitorious publicly.
                 $value =~ s,^git://gitorious\.org/,$url_base_for_protocol,;
-            }
         }
 
         $self->exe('git', 'config', "submodule.$key.url", $value);
@@ -506,7 +493,6 @@ sub git_clone_one_submodule
 
     my $alternates            = $self->{ 'alternates'        };
     my $mirror_url            = $self->{ 'mirror-url'        };
-    my $mirror_webkit_url     = $self->{ 'mirror-webkit-url' };
     my $protocol              = $self->{ 'protocol'          };
 
     # `--reference FOO' args for the clone, if any.
@@ -523,13 +509,10 @@ sub git_clone_one_submodule
     }
 
     my $mirror;
-    if ($mirror_url && ($submodule ne 'qtwebkit')) {
+    if ($mirror_url) {
         $mirror = $mirror_url."qt/$submodule";
         $mirror .= ".git" unless (-d $mirror); # Support local disk mirror
     }
-    elsif ($mirror_webkit_url && ($submodule eq 'qtwebkit')) {
-        $mirror = $mirror_webkit_url;
-    }
 
     if ($mirror) {
         # Only use the mirror if it can be reached.
-- 
cgit v1.2.3