Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(274)

Issue 164053003: Re-re-land gclient deletion of mismatching checkouts again (Closed)

Created:
6 years, 10 months ago by borenet
Modified:
6 years, 9 months ago
CC:
chromium-reviews, Dirk Pranke, cmp-cc_chromium.org, M-A Ruel, iannucci+depot_tools_chromium.org, ilevy-cc_chromium.org
Visibility:
Public.

Description

Re-re-land gclient deletion of mismatching checkouts again Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=253616

Patch Set 1 : Re-land #

Patch Set 2 : Move the deletion logic to gclient_scm #

Patch Set 3 : Some fixes #

Patch Set 4 : Move deletion logic into gclient_scm #

Patch Set 5 : Fix typo #

Total comments: 9

Patch Set 6 : Address comments #

Patch Set 7 : Put the deletion behind a guard to run on a few bots #

Patch Set 8 : Guard, pt2 #

Total comments: 15

Patch Set 9 : isdir('.git') -> exists('.git') #

Patch Set 10 : Address comments #

Total comments: 4

Patch Set 11 : Switch the remote URL if gclient-auto-fix-url is unset or "true" #

Patch Set 12 : Another attempt of gclient: delete mismatching checkouts #

Unified diffs Side-by-side diffs Delta from patch set Stats (+321 lines, -167 lines) Patch
M gclient_scm.py View 1 2 3 4 5 6 7 8 9 10 11 7 chunks +125 lines, -114 lines 0 comments Download
M gclient_utils.py View 1 2 3 4 5 6 7 8 9 10 11 2 chunks +15 lines, -0 lines 0 comments Download
M scm.py View 1 2 3 4 5 6 7 8 2 chunks +6 lines, -3 lines 0 comments Download
M tests/gclient_scm_test.py View 1 2 3 13 chunks +25 lines, -42 lines 0 comments Download
M tests/gclient_smoketest.py View 1 2 3 4 5 6 7 5 chunks +132 lines, -6 lines 0 comments Download
M tests/gclient_utils_test.py View 1 2 3 4 5 6 7 8 9 10 11 2 chunks +6 lines, -2 lines 0 comments Download
M tests/scm_unittest.py View 1 chunk +12 lines, -0 lines 0 comments Download

Messages

Total messages: 23 (0 generated)
borenet
Trying this again. Patch set 1 is the patch as it landed last, with buildslave ...
6 years, 10 months ago (2014-02-18 21:56:58 UTC) #1
borenet
On 2014/02/18 21:56:58, borenet wrote: > Trying this again. Patch set 1 is the patch ...
6 years, 10 months ago (2014-02-18 21:57:55 UTC) #2
iannucci
https://codereview.chromium.org/164053003/diff/70001/gclient_scm.py File gclient_scm.py (right): https://codereview.chromium.org/164053003/diff/70001/gclient_scm.py#newcode391 gclient_scm.py:391: not os.path.exists(os.path.join(self.checkout_path, '.git')))): I think this logic is more ...
6 years, 10 months ago (2014-02-21 02:17:00 UTC) #3
borenet
https://codereview.chromium.org/164053003/diff/70001/gclient_scm.py File gclient_scm.py (right): https://codereview.chromium.org/164053003/diff/70001/gclient_scm.py#newcode391 gclient_scm.py:391: not os.path.exists(os.path.join(self.checkout_path, '.git')))): On 2014/02/21 02:17:00, iannucci wrote: > ...
6 years, 10 months ago (2014-02-21 13:38:17 UTC) #4
iannucci
lgtm.... Pawel (cc'd) is trooper today https://codereview.chromium.org/164053003/diff/70001/gclient_scm.py File gclient_scm.py (right): https://codereview.chromium.org/164053003/diff/70001/gclient_scm.py#newcode1199 gclient_scm.py:1199: return # TODO(borenet): ...
6 years, 10 months ago (2014-02-24 21:18:19 UTC) #5
borenet
As discussed, put the deletion logic behind a guard. Added an exception for deleting unversioned ...
6 years, 10 months ago (2014-02-25 20:11:55 UTC) #6
iannucci
lgtm Looks as good to me as any of the other attempts :/
6 years, 10 months ago (2014-02-25 22:32:03 UTC) #7
szager1
https://codereview.chromium.org/164053003/diff/240001/gclient_scm.py File gclient_scm.py (right): https://codereview.chromium.org/164053003/diff/240001/gclient_scm.py#newcode366 gclient_scm.py:366: if subprocess2.capture( self._Capture ? https://codereview.chromium.org/164053003/diff/240001/gclient_scm.py#newcode368 gclient_scm.py:368: cwd=self.checkout_path).strip() != 'False': ...
6 years, 10 months ago (2014-02-25 23:32:55 UTC) #8
iannucci
On 2014/02/25 23:32:55, szager1 wrote: > https://codereview.chromium.org/164053003/diff/240001/gclient_scm.py > File gclient_scm.py (right): > > https://codereview.chromium.org/164053003/diff/240001/gclient_scm.py#newcode366 > ...
6 years, 10 months ago (2014-02-25 23:42:11 UTC) #9
borenet
https://codereview.chromium.org/164053003/diff/240001/gclient_scm.py File gclient_scm.py (right): https://codereview.chromium.org/164053003/diff/240001/gclient_scm.py#newcode366 gclient_scm.py:366: if subprocess2.capture( On 2014/02/25 23:32:56, szager1 wrote: > self._Capture ...
6 years, 10 months ago (2014-02-26 14:26:35 UTC) #10
szager1
https://codereview.chromium.org/164053003/diff/240001/gclient_scm.py File gclient_scm.py (right): https://codereview.chromium.org/164053003/diff/240001/gclient_scm.py#newcode366 gclient_scm.py:366: if subprocess2.capture( On 2014/02/26 14:26:35, borenet wrote: > On ...
6 years, 10 months ago (2014-02-26 20:33:14 UTC) #11
borenet
Uploaded patch set 10. https://codereview.chromium.org/164053003/diff/240001/gclient_scm.py File gclient_scm.py (right): https://codereview.chromium.org/164053003/diff/240001/gclient_scm.py#newcode366 gclient_scm.py:366: if subprocess2.capture( On 2014/02/26 20:33:15, ...
6 years, 10 months ago (2014-02-26 21:18:19 UTC) #12
szager1
https://codereview.chromium.org/164053003/diff/280001/gclient_scm.py File gclient_scm.py (right): https://codereview.chromium.org/164053003/diff/280001/gclient_scm.py#newcode365 gclient_scm.py:365: auto_fix = False Shouldn't this be: auto_fix = 'true' ...
6 years, 10 months ago (2014-02-26 21:34:07 UTC) #13
borenet
https://codereview.chromium.org/164053003/diff/280001/gclient_scm.py File gclient_scm.py (right): https://codereview.chromium.org/164053003/diff/280001/gclient_scm.py#newcode365 gclient_scm.py:365: auto_fix = False On 2014/02/26 21:34:07, szager1 wrote: > ...
6 years, 10 months ago (2014-02-26 21:52:18 UTC) #14
szager1
https://codereview.chromium.org/164053003/diff/280001/gclient_scm.py File gclient_scm.py (right): https://codereview.chromium.org/164053003/diff/280001/gclient_scm.py#newcode365 gclient_scm.py:365: auto_fix = False On 2014/02/26 21:52:18, borenet wrote: > ...
6 years, 10 months ago (2014-02-26 22:16:52 UTC) #15
borenet
https://codereview.chromium.org/164053003/diff/280001/gclient_scm.py File gclient_scm.py (right): https://codereview.chromium.org/164053003/diff/280001/gclient_scm.py#newcode365 gclient_scm.py:365: auto_fix = False On 2014/02/26 22:16:53, szager1 wrote: > ...
6 years, 10 months ago (2014-02-26 22:49:52 UTC) #16
szager1
lgtm, thanks! You may fire when ready.
6 years, 10 months ago (2014-02-26 22:53:32 UTC) #17
borenet
On 2014/02/26 22:53:32, szager1 wrote: > lgtm, thanks! You may fire when ready. Thanks for ...
6 years, 10 months ago (2014-02-26 23:07:40 UTC) #18
borenet
The CQ bit was checked by borenet@google.com
6 years, 10 months ago (2014-02-26 23:07:46 UTC) #19
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/borenet@google.com/164053003/300001
6 years, 10 months ago (2014-02-26 23:07:53 UTC) #20
commit-bot: I haz the power
Change committed as 253616
6 years, 10 months ago (2014-02-26 23:09:35 UTC) #21
mattm
On 2014/02/26 23:09:35, I haz the power (commit-bot) wrote: > Change committed as 253616 This ...
6 years, 10 months ago (2014-02-26 23:54:43 UTC) #22
szager1
6 years, 10 months ago (2014-02-26 23:57:42 UTC) #23
Thanks for the heads up, I reverted the change.

Stefan

On Wed, Feb 26, 2014 at 3:54 PM,  <mattm@chromium.org> wrote:
> On 2014/02/26 23:09:35, I haz the power (commit-bot) wrote:
>>
>> Change committed as 253616
>
>
> This change broke fetching a new checkout:
>
> mmueller2 15:48:34 /y/src/chrome$ fetch --nohooks chromium
> Running: svn ls --non-interactive svn://svn.chromium.org/chrome
> PRESUBMIT.py
> branches/
> codereview.settings
> releases/
> trunk/
> Running: git config --global core.deltaBaseCacheLimit 1G
> Running: gclient config --spec 'solutions = [{u'"'"'managed'"'"': False,
> u'"'"'name'"'"': u'"'"'src'"'"', u'"'"'url'"'"':
> u'"'"'https://chromium.googlesource.com/chromium/src.git'"'"',
> u'"'"'custom_deps'"'"': {}, u'"'"'deps_file'"'"': u'"'"'.DEPS.git'"'"',
> u'"'"'safesync_url'"'"': u'"'"''"'"'}]'
> Running: gclient sync --nohooks
> Traceback (most recent call last):
>   File "/y/src/depot_tools/gclient.py", line 1926, in <module>
>     sys.exit(Main(sys.argv[1:]))
>   File "/y/src/depot_tools/gclient.py", line 1916, in Main
>     return dispatcher.execute(OptionParser(), argv)
>   File "/y/src/depot_tools/subcommand.py", line 245, in execute
>     return command(parser, args[1:])
>   File "/y/src/depot_tools/gclient.py", line 1697, in CMDsync
>     ret = client.RunOnDeps('update', args)
>   File "/y/src/depot_tools/gclient.py", line 1239, in RunOnDeps
>     work_queue.flush(revision_overrides, command, args,
> options=self._options)
>   File "/y/src/depot_tools/gclient_utils.py", line 843, in run
>     self.item.run(*self.args, **self.kwargs)
>   File "/y/src/depot_tools/gclient.py", line 672, in run
>     file_list)
>   File "/y/src/depot_tools/gclient_scm.py", line 142, in RunCommand
>     return getattr(self, command)(options, args, file_list)
>   File "/y/src/depot_tools/gclient_scm.py", line 307, in update
>     self.UpdateSubmoduleConfig()
>   File "/y/src/depot_tools/gclient_scm.py", line 218, in
> UpdateSubmoduleConfig
>     gclient_utils.CheckCallAndFilter(cmd, **kwargs)
>   File "/y/src/depot_tools/gclient_utils.py", line 453, in
> CheckCallAndFilter
>     **kwargs)
>   File "/y/src/depot_tools/subprocess2.py", line 237, in __init__
>     super(Popen, self).__init__(args, **kwargs)
>   File "/usr/lib/python2.7/subprocess.py", line 679, in __init__
>     errread, errwrite)
>   File "/usr/lib/python2.7/subprocess.py", line 1249, in _execute_child
>     raise child_exception
> OSError: [Errno 2] No such file or directory: '/y/src/chrome/src'
> Sending crash report ...
>   args: ['/y/src/depot_tools/gclient.py', 'sync', '--nohooks']
>   cwd: /y/src/chrome
>   exception: [Errno 2] No such file or directory: '/y/src/chrom
>   host: mmueller2.mtv.corp.google.com
>   stack:   File "/y/src/depot_tools/gclient.py", line 1926,
>   user: mattm
>   version: 2.7.3 (default, Sep 26 2013, 20:03:06)
> [GCC 4.6.3
> A stack trace has been sent to the maintainers.
> Traceback (most recent call last):
>   File "/y/src/depot_tools/fetch.py", line 299, in <module>
>     sys.exit(main())
>   File "/y/src/depot_tools/fetch.py", line 295, in main
>     return run(options, spec, root)
>   File "/y/src/depot_tools/fetch.py", line 289, in run
>     return checkout.init()
>   File "/y/src/depot_tools/fetch.py", line 152, in init
>     super(GclientGitSvnCheckout, self).init()
>   File "/y/src/depot_tools/fetch.py", line 118, in init
>     self.run_gclient('sync', '--nohooks')
>   File "/y/src/depot_tools/fetch.py", line 75, in run_gclient
>     return self.run(cmd_prefix + cmd, **kwargs)
>   File "/y/src/depot_tools/fetch.py", line 65, in run
>     return subprocess.check_call(cmd, **kwargs)
>   File "/usr/lib/python2.7/subprocess.py", line 511, in check_call
>     raise CalledProcessError(retcode, cmd)
> subprocess.CalledProcessError: Command '('gclient', 'sync', '--nohooks')'
> returned non-zero exit status 1
>
>
>
> I reverted it in my depot_tools checkout and now am fetching successfully.
>
>
> https://codereview.chromium.org/164053003/

To unsubscribe from this group and stop receiving emails from it, send an email
to chromium-reviews+unsubscribe@chromium.org.

Powered by Google App Engine
This is Rietveld 408576698