gclient sync with branch-heads/54 failed

[灰机]

I want to use history branch. so I need checkout branch-heads/54

below is what I have done:

1.  fetch --nohooks webrtc_ios  (successful)

2.  git checkout branch-heads/54 (successful)

3.  gclient sync (failed)

log:

Syncing projects: 100% (2/2), done.

________ running '/usr/local/Cellar/python/2.7.12/Frameworks/Python.framework/Versions/2.7/Resources/Python.app/Contents/MacOS/Python -c import os,sys;script = os.path.join("trunk","check_root_dir.py");_ = os.system("%s %s" % (sys.executable,script)) if os.path.exists(script) else 0' in '/Users/starcwl/Documents/Study/webrtc/ios_webrtc_branch56'

________ running '/usr/local/Cellar/python/2.7.12/Frameworks/Python.framework/Versions/2.7/Resources/Python.app/Contents/MacOS/Python -u src/sync_chromium.py --target-revision e3860bd297e465778059f3d845280634b4074e19' in '/Users/starcwl/Documents/Study/webrtc/ios_webrtc_branch56'

+---------------------------------------------------------------------+

| NOTICE: This sync of Chromium will take a long time as several      |

|         gigabytes of data are downloaded. If this is your initial   |

|         sync and it's interrupted, try running 'gclient sync' again.|

|         If that fails, wipe everything clean and start over again.  |

+---------------------------------------------------------------------+

Running "gclient sync --force --revision src@e3860bd297e465778059f3d845280634b4074e19 -v --gclientfile .gclient.tmp --delete_unversioned_trees --reset --upstream --deps=mac,ios,mac" in /Users/starcwl/Documents/Study/webrtc/ios_webrtc_branch56/src/chromium

Looking for .gclient.tmp starting from /Users/starcwl/Documents/Study/webrtc/ios_webrtc_branch56/src/chromium

Loaded .gclient config in /Users/starcwl/Documents/Study/webrtc/ios_webrtc_branch56/src/chromium:

solutions = [{

  'name': 'src',

  'url': 'https://chromium.googlesource.com/chromium/src.git',

  'deps_file': '.DEPS.git',

  'managed': False,

  'custom_deps': {

    # Skip syncing some large dependencies WebRTC will never need.

    'src/chrome/tools/test/reference_build/chrome_linux': None,

    'src/chrome/tools/test/reference_build/chrome_mac': None,

    'src/chrome/tools/test/reference_build/chrome_win': None,

    'src/native_client': None,

    'src/third_party/cld_2/src': None,

    'src/third_party/hunspell_dictionaries': None,

    'src/third_party/liblouis/src': None,

    'src/third_party/pdfium': None,

    'src/third_party/skia': None,

    'src/third_party/trace-viewer': None,

    'src/third_party/webrtc': None,

  },

  'safesync_url': ''

}]

cache_dir = None

src (ERROR)

----------------------------------------

[0:00:00] Started.

_____ src at e3860bd297e465778059f3d845280634b4074e19

________ running 'git -c core.deltaBaseCacheLimit=2g fetch origin --prune --verbose' in '/Users/starcwl/Documents/Study/webrtc/ios_webrtc_branch56/src/chromium/src'

[0:00:05] POST git-upload-pack (959 bytes)

[0:00:08] From https://chromium.googlesource.com/chromium/src

[0:00:08]  = [up to date]      ignore/bar -> origin/ignore/bar

[0:00:08]  = [up to date]      ignore/foo -> origin/ignore/foo

[0:00:08]  = [up to date]      infra/config -> origin/infra/config

[0:00:08]  = [up to date]      lkcr       -> origin/lkcr

[0:00:08]  = [up to date]      lkgr       -> origin/lkgr

[0:00:08]    88e247a..fec56ab  master     -> origin/master

________ running 'git reset --hard HEAD' in '/Users/starcwl/Documents/Study/webrtc/ios_webrtc_branch56/src/chromium/src'

[0:00:22] HEAD is now at 316b880 Make ChromePasswordManagerClient::BindCredentialManager handle missing client gracefully

Checked out revision e3860bd297e465778059f3d845280634b4074e19

[0:00:42] _____ removing unversioned directory ios/third_party/material_text_accessibility_ios/

----------------------------------------

src

----------------------------------------

[0:00:00] Started.

_____ src at e3860bd297e465778059f3d845280634b4074e19

________ running 'git -c core.deltaBaseCacheLimit=2g fetch origin --prune --verbose' in '/Users/starcwl/Documents/Study/webrtc/ios_webrtc_branch56/src/chromium/src'

[0:00:05] POST git-upload-pack (959 bytes)

[0:00:08] From https://chromium.googlesource.com/chromium/src

[0:00:08]  = [up to date]      ignore/bar -> origin/ignore/bar

[0:00:08]  = [up to date]      ignore/foo -> origin/ignore/foo

[0:00:08]  = [up to date]      infra/config -> origin/infra/config

[0:00:08]  = [up to date]      lkcr       -> origin/lkcr

[0:00:08]  = [up to date]      lkgr       -> origin/lkgr

[0:00:08]    88e247a..fec56ab  master     -> origin/master

________ running 'git reset --hard HEAD' in '/Users/starcwl/Documents/Study/webrtc/ios_webrtc_branch56/src/chromium/src'

[0:00:22] HEAD is now at 316b880 Make ChromePasswordManagerClient::BindCredentialManager handle missing client gracefully

Checked out revision e3860bd297e465778059f3d845280634b4074e19

[0:00:42] _____ removing unversioned directory ios/third_party/material_text_accessibility_ios/

----------------------------------------

Traceback (most recent call last):

  File "/opt/depot_tools/gclient.py", line 2523, in <module>

    sys.exit(main(sys.argv[1:]))

  File "/opt/depot_tools/gclient.py", line 2509, in main

    return dispatcher.execute(OptionParser(), argv)

  File "/opt/depot_tools/subcommand.py", line 252, in execute

    return command(parser, args[1:])

  File "/opt/depot_tools/gclient.py", line 2270, in CMDsync

    ret = client.RunOnDeps('update', args)

  File "/opt/depot_tools/gclient.py", line 1464, in RunOnDeps

    work_queue.flush(revision_overrides, command, args, options=self._options)

  File "/opt/depot_tools/gclient_utils.py", line 1050, in run

    self.item.run(*self.args, **self.kwargs)

  File "/opt/depot_tools/gclient.py", line 902, in run

    self.ParseDepsFile()

  File "/opt/depot_tools/gclient.py", line 700, in ParseDepsFile

    gclient_eval.Exec(deps_content, global_scope, local_scope, filepath)

  File "/opt/depot_tools/gclient_eval.py", line 209, in Exec

    _visit_in_module(stmt)

  File "/opt/depot_tools/gclient_eval.py", line 198, in _visit_in_module

    target.id, filename, getattr(node, 'lineno', '<unknown>')))

ValueError: invalid assignment: overrides var 'recursedeps' (file '/Users/starcwl/Documents/Study/webrtc/ios_webrtc_branch56/src/chromium/src/DEPS', line 1010)

Error: Command '/usr/local/Cellar/python/2.7.12/Frameworks/Python.framework/Versions/2.7/Resources/Python.app/Contents/MacOS/Python -u src/sync_chromium.py --target-revision e3860bd297e465778059f3d845280634b4074e19' returned non-zero exit status 1 in /Users/starcwl/Documents/Study/webrtc/ios_webrtc_branch56

Hook '/usr/local/Cellar/python/2.7.12/Frameworks/Python.framework/Versions/2.7/Resources/Python.app/Contents/MacOS/Python -u src/sync_chromium.py --target-revision e3860bd297e465778059f3d845280634b4074e19' took 44.85 secs

additional information:

if I use branch-heads/51 or branch-heas/54,  gclient sync  works successful.

[Elshad Mustafayev]

Hi,

I am not sure if you are still having the same issue. I am having the same exact issue. I tried modifying depot tools. And here is the patch for the file gclient_eval.py

diff --git a/gclient_eval.py b/gclient_eval.py

index c1dee2a..b7b6d96 100644

--- a/gclient_eval.py

+++ b/gclient_eval.py

@@ -192,12 +192,12 @@ def Exec(content, global_scope, local_scope, filename='<unknown>'):

                 filename, getattr(node, 'lineno', '<unknown>')))

       value = _gclient_eval(node.value, global_scope, filename=filename)

 

-      if target.id in local_scope:

-        raise ValueError(

-            'invalid assignment: overrides var %r (file %r, line %s)' % (

-                target.id, filename, getattr(node, 'lineno', '<unknown>')))

-

-      local_scope[target.id] = value

+#      if target.id in local_scope:

+#        raise ValueError(

+#            'invalid assignment: overrides var %r (file %r, line %s)' % (

+#                target.id, filename, getattr(node, 'lineno', '<unknown>')))

+      if target.id not in local_scope:

+        local_scope[target.id] = value

     else:

       raise ValueError(

           'unexpected AST node: %s %s (file %r, line %s)' % (

So what I do is add target.id to local_scope if it does not exist already. I tried this and gclient sync worked for me. Haven't tried compiling yet. But give it a try and see if it helps.

Elshad.