|
|
DescriptionReplace repeated git hashes with DEPS variables.
BUG=263848
R=thakis@chromium.org
Committed: https://crrev.com/29407ebf00aafc3ea643d680d98327b79da0e7fa
Cr-Commit-Position: refs/heads/master@{#291894}
Patch Set 1 #
Total comments: 4
Patch Set 2 : #
Total comments: 4
Patch Set 3 : #
Total comments: 10
Patch Set 4 : #
Total comments: 1
Patch Set 5 : #Patch Set 6 : rebase #Messages
Total messages: 19 (0 generated)
wtc@chromium.org changed reviewers: + wtc@chromium.org
Review comments on patch set 1: Thank you for writing the patch. https://codereview.chromium.org/506743002/diff/1/DEPS File DEPS (right): https://codereview.chromium.org/506743002/diff/1/DEPS#newcode23 DEPS:23: 'nss_revision': 'e2e35dbd9b41c0e5cb8485f13831cd61eb484196', The comment before this line describes the googlecode_url variable, so we should not add nss_revision here. https://codereview.chromium.org/506743002/diff/1/DEPS#newcode79 DEPS:79: 'boringssl_revision': '5213df4e9ed9ca130c40f142893cb91f2e18eee1', Please add nss_revision here, with the three lines of comment to avoid patching conflicts.
https://codereview.chromium.org/506743002/diff/1/DEPS File DEPS (right): https://codereview.chromium.org/506743002/diff/1/DEPS#newcode23 DEPS:23: 'nss_revision': 'e2e35dbd9b41c0e5cb8485f13831cd61eb484196', On 2014/08/25 22:17:23, wtc wrote: > > The comment before this line describes the googlecode_url variable, so we should > not add nss_revision here. Done. https://codereview.chromium.org/506743002/diff/1/DEPS#newcode79 DEPS:79: 'boringssl_revision': '5213df4e9ed9ca130c40f142893cb91f2e18eee1', On 2014/08/25 22:17:23, wtc wrote: > > Please add nss_revision here, with the three lines of comment to avoid patching > conflicts. Done.
Patch set 2 LGTM. Please make the following change before committing. https://codereview.chromium.org/506743002/diff/20001/DEPS File DEPS (right): https://codereview.chromium.org/506743002/diff/20001/DEPS#newcode75 DEPS:75: 'boringssl_revision': '5213df4e9ed9ca130c40f142893cb91f2e18eee1', IMPORTANT: please add back these three comment lines: # Three lines of non-changing comments so that # the commit queue can handle CLs rolling BoringSSL # and whatever else without interference from each other.
Thanks. I've marked the other hashes that are now mentioned multiple times. https://codereview.chromium.org/506743002/diff/20001/DEPS File DEPS (right): https://codereview.chromium.org/506743002/diff/20001/DEPS#newcode401 DEPS:401: Var('chromium_git') + '/external/google-toolbox-for-mac.git' + '@' + '704fb56df6a9a0884801045a158e021945d9d991', this https://codereview.chromium.org/506743002/diff/20001/DEPS#newcode407 DEPS:407: Var('chromium_git') + '/chromium/deps/lighttpd.git' + '@' + '9dfa55d15937a688a92cbf2b7a8621b0927d06eb', this https://codereview.chromium.org/506743002/diff/20001/DEPS#newcode431 DEPS:431: Var('chromium_git') + '/external/linux-syscall-support/lss.git' + '@' + '952107fa7cea0daaabead28c0e92d579bee517eb', this
Fixed all the ones pointed out by Nico; PTAL.
Thanks! https://codereview.chromium.org/506743002/diff/40001/DEPS File DEPS (right): https://codereview.chromium.org/506743002/diff/40001/DEPS#newcode78 DEPS:78: # and whatever else without interference from each other. This 3-line block should be above boringssl_revision https://codereview.chromium.org/506743002/diff/40001/DEPS#newcode82 DEPS:82: # and whatever else without interference from each other. Should be above nss https://codereview.chromium.org/506743002/diff/40001/DEPS#newcode86 DEPS:86: # and whatever else without interference from each other. should be above google_toolbox_for_mac_revision https://codereview.chromium.org/506743002/diff/40001/DEPS#newcode90 DEPS:90: # and whatever else without interference from each other. should be above lighttpd_revision https://codereview.chromium.org/506743002/diff/40001/DEPS#newcode91 DEPS:91: 'lss_revision': '952107fa7cea0daaabead28c0e92d579bee517eb', Needs a comment block once all the other blocks have moved up
The CQ is such a delicate flower. https://codereview.chromium.org/506743002/diff/40001/DEPS File DEPS (right): https://codereview.chromium.org/506743002/diff/40001/DEPS#newcode78 DEPS:78: # and whatever else without interference from each other. On 2014/08/25 22:59:53, Nico (hiding) wrote: > This 3-line block should be above boringssl_revision Done. https://codereview.chromium.org/506743002/diff/40001/DEPS#newcode82 DEPS:82: # and whatever else without interference from each other. On 2014/08/25 22:59:53, Nico (hiding) wrote: > Should be above nss Done. https://codereview.chromium.org/506743002/diff/40001/DEPS#newcode86 DEPS:86: # and whatever else without interference from each other. On 2014/08/25 22:59:53, Nico (hiding) wrote: > should be above google_toolbox_for_mac_revision Done. https://codereview.chromium.org/506743002/diff/40001/DEPS#newcode90 DEPS:90: # and whatever else without interference from each other. On 2014/08/25 22:59:53, Nico (hiding) wrote: > should be above lighttpd_revision Done. https://codereview.chromium.org/506743002/diff/40001/DEPS#newcode91 DEPS:91: 'lss_revision': '952107fa7cea0daaabead28c0e92d579bee517eb', On 2014/08/25 22:59:53, Nico (hiding) wrote: > Needs a comment block once all the other blocks have moved up Done.
lgtm https://codereview.chromium.org/506743002/diff/60001/DEPS File DEPS (right): https://codereview.chromium.org/506743002/diff/60001/DEPS#newcode76 DEPS:76: # the commit queue can handle CLs rolling BoringSSL nit: don't add a trailing space here (generally, I like to take a look at the diffs I'm about to send out myself, to find things like this)
The CQ bit was checked by szager@chromium.org
CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/szager@chromium.org/506743002/80001
The CQ bit was unchecked by commit-bot@chromium.org
Failed to commit the patch.
The CQ bit was checked by szager@chromium.org
CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/szager@chromium.org/506743002/90001
FYI, CQ is re-trying this CL (attempt #1). The failing builders are: win_chromium_x64_rel_swarming on tryserver.chromium.win (http://build.chromium.org/p/tryserver.chromium.win/builders/win_chromium_x64_...)
Message was sent while issue was closed.
Committed patchset #6 (90001) as f944d5fedf4839bb06ca560ff2fd0dd91de3da8c
Message was sent while issue was closed.
Patchset 6 (id:??) landed as https://crrev.com/29407ebf00aafc3ea643d680d98327b79da0e7fa Cr-Commit-Position: refs/heads/master@{#291894} |