From f3b6d25226d94867216e97c77fdd21a0c6b9d72e Mon Sep 17 00:00:00 2001 From: "derat@chromium.org" Date: Tue, 20 Jul 2010 17:20:20 +0000 Subject: [PATCH] gclient: Revert r52941's changes to gclient_scm.py. This looks like it broke syncing from git repos: File "/home/derat/local/depot_tools/gclient.py", line 1208, in sys.exit(Main(sys.argv[1:])) File "/home/derat/local/depot_tools/gclient.py", line 1198, in Main return command(parser, argv[1:]) File "/home/derat/local/depot_tools/gclient.py", line 1035, in CMDsync return client.RunOnDeps('update', args) File "/home/derat/local/depot_tools/gclient.py", line 621, in RunOnDeps scm.RunCommand(command, self._options, args, file_list) File "/home/derat/local/depot_tools/gclient_scm.py", line 115, in RunCommand return getattr(self, command)(options, args, file_list) File "/home/derat/local/depot_tools/gclient_scm.py", line 264, in update print_error=False) File "/home/derat/local/depot_tools/scm.py", line 84, in Capture return gclient_utils.CheckCall(c, in_directory, print_error) File "/home/derat/local/depot_tools/gclient_utils.py", line 58, in CheckCall raise CheckCallError(command, cwd, process.returncode, std_out, std_err) gclient_utils.CheckCallError: (['git', 'fetch', 'origin', 'cc1c63d'], '/usr/local/google/home/derat/chrome/src/third_party/cros', 128, '', "fatal: Couldn't find remote ref cc1c63d\nfatal: The remote end hung up unexpectedly\n") BUG=none TEST=works again after the revert Review URL: http://codereview.chromium.org/2888023 git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@53056 0039d316-1c4b-4281-b951-d872f2087c98 --- gclient_scm.py | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/gclient_scm.py b/gclient_scm.py index 902b449d8..a76d2d0c2 100644 --- a/gclient_scm.py +++ b/gclient_scm.py @@ -257,13 +257,7 @@ class GitWrapper(SCMWrapper): # Update the remotes first so we have all the refs. for _ in range(10): try: - if current_type == "branch": - remote_output, remote_err = scm.GIT.Capture( - ['fetch'] + verbose + ['origin', revision], - self.checkout_path, - print_error=False) - else: - remote_output, remote_err = scm.GIT.Capture( + remote_output, remote_err = scm.GIT.Capture( ['remote'] + verbose + ['update'], self.checkout_path, print_error=False)