Revert of gclient: Change the .gclient URL mismatch warning into an error.

Revert of gclient: Change the .gclient URL mismatch warning into an error. (https://codereview.chromium.org/208623004/)

Reason for revert:
Reverting under the advice of petermayo@ due to: http://build.chromium.org/p/chromium.chromiumos/builders/ChromiumOS%20%28daisy%29/builds/17434

Original issue's description:
> gclient: Change the .gclient URL mismatch warning into an error.
> 
> BUG=skia:1638
> 
> Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=259681

TBR=iannucci@chromium.org,borenet@google.com
NOTREECHECKS=true
NOTRY=true
BUG=skia:1638

[tdanderson, 2014-03-26 22:47:59]

Created Revert of gclient: Change the .gclient URL mismatch warning into an
error.

[commit-bot: I haz the power, 2014-03-26 22:48:08]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/tdanderson@chromium.org/213763002/1

[commit-bot: I haz the power, 2014-03-26 22:48:12]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-03-26 22:48:12]

Failed to apply patch for depot_tools/gclient.py:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file depot_tools/gclient.py
  Hunk #1 FAILED at 1052.
  Hunk #2 FAILED at 1063.
  Hunk #3 FAILED at 1245.
  Hunk #4 FAILED at 1322.
  4 out of 4 hunks FAILED -- saving rejects to file depot_tools/gclient.py.rej

Patch:       depot_tools/gclient.py
Index: gclient.py
diff --git depot_tools/gclient.py depot_tools/gclient.py
index
208a4319d54e50cf0b775cebdd928296e804eee5..7a13a5d525ed0572caef62ac3742aa217e21e836
100755
--- a/depot_tools/gclient.py
+++ b/depot_tools/gclient.py
@@ -1052,9 +1052,14 @@
         scm = gclient_scm.CreateSCM(dep.url, self.root_dir, dep.name)
         actual_url = scm.GetActualRemoteURL()
         if actual_url and not scm.DoesRemoteURLMatch():
-          raise gclient_utils.Error('''
+          gclient_utils.AddWarning('''
+################################################################################
+################################### WARNING!
###################################
+################################################################################
+
 Your .gclient file seems to be broken. The requested URL is different from what
-is actually checked out in %(checkout_path)s.
+is actually checked out in %(checkout_path)s. In the future this will be an
+error.
 
 Expected: %(expected_url)s (%(expected_scm)s)
 Actual:   %(actual_url)s (%(actual_scm)s)
@@ -1063,6 +1068,10 @@
 it or fix the checkout. If you're managing your own git checkout in
 %(checkout_path)s but the URL in .gclient is for an svn repository, you
probably
 want to set 'managed': False in .gclient.
+
+################################################################################
+################################################################################
+################################################################################
 '''  % {'checkout_path': os.path.join(self.root_dir, dep.name),
         'expected_url': dep.url,
         'expected_scm': gclient_scm.GetScmName(dep.url),
@@ -1245,9 +1254,6 @@
     """
     if not self.dependencies:
       raise gclient_utils.Error('No solution specified')
-
-    self._CheckConfig()
-
     revision_overrides = {}
     # It's unnecessary to check for revision overrides for 'recurse'.
     # Save a few seconds by not calling _EnforceRevisions() in that case.
@@ -1322,6 +1328,7 @@
             gclient_utils.rmtree(e_dir)
       # record the current list of entries for next time
       self._SaveEntries()
+    self._CheckConfig()
     return 0
 
   def PrintRevInfo(self):

[tdanderson, 2014-03-26 22:56:31]

On 2014/03/26 22:48:12, I haz the power (commit-bot) wrote:
> Failed to apply patch for depot_tools/gclient.py:
> While running patch -p1 --forward --force --no-backup-if-mismatch;
>   patching file depot_tools/gclient.py
>   Hunk #1 FAILED at 1052.
>   Hunk #2 FAILED at 1063.
>   Hunk #3 FAILED at 1245.
>   Hunk #4 FAILED at 1322.
>   4 out of 4 hunks FAILED -- saving rejects to file depot_tools/gclient.py.rej
> 
> Patch:       depot_tools/gclient.py
> Index: gclient.py
> diff --git depot_tools/gclient.py depot_tools/gclient.py
> index
>
208a4319d54e50cf0b775cebdd928296e804eee5..7a13a5d525ed0572caef62ac3742aa217e21e836
> 100755
> --- a/depot_tools/gclient.py
> +++ b/depot_tools/gclient.py
> @@ -1052,9 +1052,14 @@
>          scm = gclient_scm.CreateSCM(dep.url, self.root_dir, dep.name)
>          actual_url = scm.GetActualRemoteURL()
>          if actual_url and not scm.DoesRemoteURLMatch():
> -          raise gclient_utils.Error('''
> +          gclient_utils.AddWarning('''
>
+################################################################################
> +################################### WARNING!
> ###################################
>
+################################################################################
> +
>  Your .gclient file seems to be broken. The requested URL is different from
what
> -is actually checked out in %(checkout_path)s.
> +is actually checked out in %(checkout_path)s. In the future this will be an
> +error.
>  
>  Expected: %(expected_url)s (%(expected_scm)s)
>  Actual:   %(actual_url)s (%(actual_scm)s)
> @@ -1063,6 +1068,10 @@
>  it or fix the checkout. If you're managing your own git checkout in
>  %(checkout_path)s but the URL in .gclient is for an svn repository, you
> probably
>  want to set 'managed': False in .gclient.
> +
>
+################################################################################
>
+################################################################################
>
+################################################################################
>  '''  % {'checkout_path': os.path.join(self.root_dir, dep.name),
>          'expected_url': dep.url,
>          'expected_scm': gclient_scm.GetScmName(dep.url),
> @@ -1245,9 +1254,6 @@
>      """
>      if not self.dependencies:
>        raise gclient_utils.Error('No solution specified')
> -
> -    self._CheckConfig()
> -
>      revision_overrides = {}
>      # It's unnecessary to check for revision overrides for 'recurse'.
>      # Save a few seconds by not calling _EnforceRevisions() in that case.
> @@ -1322,6 +1328,7 @@
>              gclient_utils.rmtree(e_dir)
>        # record the current list of entries for next time
>        self._SaveEntries()
> +    self._CheckConfig()
>      return 0
>  
>    def PrintRevInfo(self):

Revert already performed here: https://codereview.chromium.org/213483003/.
Closing this issue.