| d7b0b1b361c4cc745274a6e754b0ef2d57c73c4b |
|
25-Sep-2014 |
Primiano Tucci <primiano@google.com> |
Merge scripts: rename merge_to_master.py -> merge_to_android.py
- Add an extra check to merge_from_chromium.py to ascertain that the
remote branch exists locally.
- Rename merge_to_master.py -> merge_to_android.py: the former name is
confusing when we merge to M* branches. The new name is also more
consistent with merge_from_chromium.py
- Warn if the GYP_DEFINES env var is set.
Change-Id: I180f9c27a106f31a7e472b14bfcacb2a7444d534
/frameworks/webview/chromium/tools/merge_from_chromium.py
|
| f2e9853ae82a5b792ddf1af7c7d8924e9cb8c9b4 |
|
10-Sep-2014 |
Primiano Tucci <primiano@google.com> |
Fix LASTCHANGE in merge_from_chromium.py when merging a release.
The previous changes to merge_from_chromium caused the script to
crash when generating LASTCHANGE for a release.
This fixes the crash by using the SHA1 of the upstream merge
parent to generate LASTCHANGE.
Change-Id: I34ff309400135bb09a91e7e32a9eb1aea1e8c310
/frameworks/webview/chromium/tools/merge_from_chromium.py
|
| 70e496d940c22bf07cd2c5634e1819276ddac416 |
|
01-Sep-2014 |
Primiano Tucci <primiano@google.com> |
Update the merge_to_master.py script for Git.
Changes the merge_to_master.py script to deal with the Chromium's
switch to Git.
Furhermore, this change introduces pedantic checks when merging a given
master-chromium snapshot (using a repo.prop file), verifying that the
projects SHAs in the archive match the SHAs in the repo.prop.
Shouldn't this happen, it analyzes the history of the mismatching
projects and prints out a detailed error message. In case of a mismatch,
the merge can be forced using the --force option.
Change-Id: I8909d064709921220afbed1cc55cbcc7c48ececa
(cherry picked from commit 18e8e49dbb79d50be03314b30f997cfa8561c347)
/frameworks/webview/chromium/tools/merge_from_chromium.py
|
| 753233e1666d4a8f69a4fae4345f9590f19589ef |
|
25-Aug-2014 |
Primiano Tucci <primiano@google.com> |
Update merge_from_chromium.py after Chromium Git migration.
Chromium has switched to Git. SVN is not the source of truth anymore.
The following change removes --svn support from merge_from_chromium.py
and makes it understand git.
Also, this is removing the --lkgr option, as LKGR is being deprecated
in chromium.
Change-Id: I879e9cda2cee313f1e2409a1a85b173db59efd8c
/frameworks/webview/chromium/tools/merge_from_chromium.py
|
| 462a80eeb54228445a3601b6aef6a3484cbf2615 |
|
13-Aug-2014 |
Bo Liu <boliu@google.com> |
Fix merge_from_chromium.py script to work with new buildspec repo
New repo at
https://chrome-internal.googlesource.com/chrome/tools/buildspec
The updated script will work with 37.0.2062.70 in the 37.0.2062 branch.
Change-Id: I298f66e15bbf98ea9d83fc7e4b67efb9b19e0d4c
(cherry picked from commit 37b38e94b68b98cc79e412f53e38efe69bfaca27)
/frameworks/webview/chromium/tools/merge_from_chromium.py
|
| 2abf9f022d36e29c63c6d0f529449de85596fc48 |
|
19-Jun-2014 |
Torne (Richard Coles) <torne@google.com> |
Remove libaddressinput hook.
This hook has been deleted upstream and isn't needed any more.
Change-Id: Ide487739c6111ff38b09353781097b4c315dc162
/frameworks/webview/chromium/tools/merge_from_chromium.py
|
| 89eebfea3003dda71c0e8be246d7e5f529e3436b |
|
16-Jun-2014 |
Torne (Richard Coles) <torne@google.com> |
Merge scripts: fix hook.
There's no 'src' directory in our checkout, so the hook wasn't found.
Fix it.
Change-Id: Ibc6b4ba1e6849bfd1bf67acc91fed75bdb06bc47
/frameworks/webview/chromium/tools/merge_from_chromium.py
|
| 1a5c76109b5840dc84815fcc91b27148e6df11cc |
|
16-Jun-2014 |
Torne (Richard Coles) <torne@google.com> |
Merge scripts: run the libaddressinput hook.
The libaddressinput hook from DEPS needs to be run to make our build
work; copy it to the merge script for now as we still haven't got a
better way to deal with hooks. Remove the old hook that downloaded gn
from google storage as this is not necessary at present and is unlikely
to be needed in future either.
Change-Id: I04facd61fba554fcfc0093ef8bc907474d6c1d07
/frameworks/webview/chromium/tools/merge_from_chromium.py
|
| 3cc50c8a8aa48850211f6724bba1d788c9f08180 |
|
16-May-2014 |
Torne (Richard Coles) <torne@google.com> |
automerger: always fetch the SHA1.
Some projects in chromium are now tracking branches other than master
even in trunk, so the default "git fetch" doesn't work for them. Always
fetch the specific SHA1. This requires git 1.8 or greater.
Change-Id: Ief417d4e61e06b26d491f09a384f86662e168803
/frameworks/webview/chromium/tools/merge_from_chromium.py
|
| eb2c435c4034e15805f81caf4c70389fa11afd26 |
|
07-Apr-2014 |
Torne (Richard Coles) <torne@google.com> |
Revert "Merge scripts: duplicate arm makefile for arm64."
We no longer need to duplicate the arm makefiles for arm64, as we
include the arm makefile from the top-level Android.mk as well to
support multilib builds.
This reverts commit 4a4e55409b32f638e45fd8ab1ba8de512400c4f9.
/frameworks/webview/chromium/tools/merge_from_chromium.py
|
| 4a4e55409b32f638e45fd8ab1ba8de512400c4f9 |
|
30-Jan-2014 |
Torne (Richard Coles) <torne@google.com> |
Merge scripts: duplicate arm makefile for arm64.
To support multiarch arm/arm64 builds, copy the top-level makefile so
that the same makefiles will be used for arm64 as are currently used for
arm.
Change-Id: I79bff65dd57e6528ab543b090203553849c665e4
/frameworks/webview/chromium/tools/merge_from_chromium.py
|
| d7fe98f16c652eb648ff5668a2d81858458c18f6 |
|
18-Dec-2013 |
Richard Coles <torne@google.com> |
Reland "automerger: download gn before generating makefiles."
This relands the original commit c673dbdbfa853ed101dfc9193a34c14b5134cc78. The gn binary build process has been fixed upstream so that it generates Debian-compatible binaries.
Change-Id: I58a418b7ca2c6ed976367d116d06f65b851fbe79
/frameworks/webview/chromium/tools/merge_from_chromium.py
|
| 36797b2162e38e606e48ac5cabec6feae6f078d1 |
|
11-Dec-2013 |
Richard Coles <torne@google.com> |
Revert "automerger: download gn before generating makefiles."
This reverts commit c673dbdbfa853ed101dfc9193a34c14b5134cc78. The downloaded gn is not compatible with the automerger's version of libc; don't attempt to download it.
Change-Id: Ice705f9dc344b7662535f37810701b19e7b08f72
/frameworks/webview/chromium/tools/merge_from_chromium.py
|
| c673dbdbfa853ed101dfc9193a34c14b5134cc78 |
|
05-Dec-2013 |
Torne (Richard Coles) <torne@google.com> |
automerger: download gn before generating makefiles.
The gyp process now needs to run gn to generate some of the gyp files as
part of the gyp->gn transition. Normally this is downloaded by runhooks,
but we don't run hooks during the merge. Just copy the download command
from DEPS for now.
Change-Id: Ide64ccd156b6eb5a0dee6c8732a7ab7ab88dea50
/frameworks/webview/chromium/tools/merge_from_chromium.py
|
| f533bc666f11273be2d7a211be4cda18d53bf0a3 |
|
10-Sep-2013 |
Torne (Richard Coles) <torne@google.com> |
Merge scripts: fix force pushing to temp branch.
In the refactoring of the script to suport branch merges I accidentally
lost the '+' to force-push to the temporary branch, resulting in merges
failing once the temporary branch wasn't in the right state any more.
Fixed.
Change-Id: I05d779a524c09ac6122e66b3cc3772b125c36e30
/frameworks/webview/chromium/tools/merge_from_chromium.py
|
| 816f8b55f5a0143dd4106d12c54915c3cf05625d |
|
09-Sep-2013 |
Torne (Richard Coles) <torne@google.com> |
Merge scripts: fix merging trunk.
The automerger has an older version of git that doesn't support passing
a SHA1 to "git fetch". Go back to using the old method when merging
trunk, since it's not necessary to fetch a specific SHA1 in this case.
Change-Id: I4e0b7f4e671f63135c829afa0ebff320ad202b8b
/frameworks/webview/chromium/tools/merge_from_chromium.py
|
| f81a1ea8129a3a620d677d6eeab99d2727367c88 |
|
23-Aug-2013 |
Torne (Richard Coles) <torne@google.com> |
Merge scripts: support merging from Chromium releases.
Add support for merging from Chromium releases as well as from trunk.
Bug: 10152587
Change-Id: I34ed760d005c7e8c60d46a1ce36fa0167ae0c2fe
(cherry picked from commit 94addffe055d2df297d4cf6c981d13a6e0a62bbc)
/frameworks/webview/chromium/tools/merge_from_chromium.py
|
| 3ec6f231ebe47f01e8fada97209d1b888d757615 |
|
05-Aug-2013 |
Torne (Richard Coles) <torne@google.com> |
Automerger: generate makefiles before checking licenses.
When an upstream third_party directory is removed, it may still exist in
our downstream checkout because of previously generated makefiles,
breaking the license checks. Fix this by splitting the license check
into a separate step, and doing it after makefile regeneration.
Change-Id: I871c22eda5954cdb643cac5b35783192ed61d3a7
/frameworks/webview/chromium/tools/merge_from_chromium.py
|
| d52d6a84a5dc0ba5264915b2e1524f65d1841b3b |
|
31-May-2013 |
Torne (Richard Coles) <torne@google.com> |
Merge scripts: add LASTCHANGE.blink.
Create build/util/LASTCHANGE.blink when merging, containing the last
version of Blink merged into third_party/WebKit. This is used to
generate version header files.
Change-Id: I3ddf5be9081d06541c48713db88a47ca0d37b33e
/frameworks/webview/chromium/tools/merge_from_chromium.py
|
| 3b1480d1d7d07cb989630cd5767f439dd3f5fabd |
|
02-May-2013 |
Torne (Richard Coles) <torne@google.com> |
automerger: push archived revisions and fix a bug.
When we push a merge successfully, also push a new ref under
refs/archive/chromium-* with the revision number. This allows specific
past merge points to be checked out across all chromium_org/* projects
correctly. We were also incorrectly using git push -f even for pushing
to master-chromium, which could cause downstream changes to be lost;
instead of using -f just specify the + prefix on the refs we want to
allow non-fast-forward updates.
Change-Id: Ide846f2213228b721f90db544f33be268f47759b
/frameworks/webview/chromium/tools/merge_from_chromium.py
|
| 1f39fd6f96da9ebacdf3462306f3aef6dec2ec0b |
|
30-Apr-2013 |
Torne (Richard Coles) <torne@google.com> |
Merge tool: pass "all" to gyp_webview.
In preparation for changing gyp_webview to only generate makefiles for
one platform by default, pass it "all" from the merge script to tell it
to generate all of them. It currently doesn't use its arguments so this
is safe.
Change-Id: I6d6b020fc009dbcd78e353fde9ca0ae3cc4c5945
/frameworks/webview/chromium/tools/merge_from_chromium.py
|
| c6fd5b4baea9c6c5bbf28635152ce7f9a5ef89ef |
|
19-Apr-2013 |
Torne (Richard Coles) <torne@google.com> |
Merge script: fix function reference.
Need to refer to GetCommandStdout with a qualified name now that the
calls are not in merge_common.
Change-Id: Icf613d263a81338b656738fb679526dc78e577fd
/frameworks/webview/chromium/tools/merge_from_chromium.py
|
| 09ead754abd2cfcffea54040b1c9ac98db8af834 |
|
19-Apr-2013 |
Torne (Richard Coles) <torne@google.com> |
Merge tool: update merge_to_master for new projects.
merge_to_master needs just one trivial change to actually do the merge
correctly. To make pushing work, we stop sharing the implementation of
PushToServer between the two scripts as they are increasingly different
and the sharing is just making it harder to understand.
Change-Id: Ib04d6e2f6621c98a72ad157ba7ed6238d542bf5a
/frameworks/webview/chromium/tools/merge_from_chromium.py
|
| 4465da421aa5ee3d2f6a016b961c301040f0fa23 |
|
16-Apr-2013 |
Torne (Richard Coles) <torne@google.com> |
Update merge script to use new local-mirrored repos.
We have local mirror branches of chromium and webkit now; use these in
the merge script instead of fetching directly from upstream, and push
the full history specifically to the history projects.
Change-Id: I6a222cbf1a305408efe8096c2a8b7d7ea2f889dc
/frameworks/webview/chromium/tools/merge_from_chromium.py
|
| 3977434d5c3aafc00eaae0d2e78fa8ddd72536f3 |
|
09-Feb-2013 |
Bo Liu <boliu@google.com> |
Add --sha1 option to merge_from_chromium.py
The tot bot polls one of the Chromium git branches and can provide the
exact sha1 to the merge script to match up information such as
blamelists. This is the first step to making making this happen.
Change-Id: I85a768198902ba7961b60382a00ff59b9226d137
/frameworks/webview/chromium/tools/merge_from_chromium.py
|
| cb12295daa313fcefcfff1681c30f3fe935e762e |
|
19-Feb-2013 |
Torne (Richard Coles) <torne@google.com> |
Merge tool: change commit message.
When removing directories according to the known_issues list, change the
commit message to refer to them as "unwanted" instead of "incompatible"
as we are now going to use this list to also prune code/headers that we
don't want to depend on inadvertantly.
Change-Id: I67feda171350f545b17d5023f48a9ff888c60731
/frameworks/webview/chromium/tools/merge_from_chromium.py
|
| a611c7e365068e2130b6de87b2b14e3b75ae1d4e |
|
01-Feb-2013 |
Bo Liu <boliu@google.com> |
Add option to get the svn HEAD revision
Not directly querying the svn server using svn info because we are
tracking the git-svn mirror which may be minutes behind.
Instead use existing parsing logic to get the svn revision from git.
Need to add a quiet option since it was printing out a log message.
Change-Id: Ib4e556916e75f3c2fab8b645b430f306d1268733
/frameworks/webview/chromium/tools/merge_from_chromium.py
|
| 4098e8316ddaa5b20fd8f97438fd063a5468db0e |
|
08-Jan-2013 |
Torne (Richard Coles) <torne@google.com> |
Merge scripts: add missing log message.
The message about generating makefiles got lost at some point, so
failures at this stage look like they are caused by the generation of
LASTCHANGE (the previous message). Restore the message to make this
clearer.
Change-Id: Id152c3f4850b9d8a19ae797548326423bfe72e4a
/frameworks/webview/chromium/tools/merge_from_chromium.py
|
| d2a42d0b062f4c9bb4c3fefc80cde98350b5974e |
|
08-Jan-2013 |
Torne (Richard Coles) <torne@google.com> |
Merge scripts: detect no changes to merge case.
Add a new option to merge_from_chromium to use in a script, which
specifies an exit code to use when there were no changes to merge.
Defaults to 0 (success) as that's the current behaviour.
Change-Id: I9a155b5f03beef4cd343f1fd9d0d74f6322ed98c
/frameworks/webview/chromium/tools/merge_from_chromium.py
|
| 9fb672be51066b51a372885377cc0eff78e1a34c |
|
07-Jan-2013 |
Torne (Richard Coles) <torne@google.com> |
Merge script: add an option to just retrieve LKGR.
Add a command line option that just prints the current LKGR, for scripts
to use.
Change-Id: I5b38bf10b88f65e81f2995fccb8375d4b9cccb78
/frameworks/webview/chromium/tools/merge_from_chromium.py
|
| 72724a6d44b1f9ebc7e122045a72f3502185844d |
|
18-Dec-2012 |
Torne (Richard Coles) <torne@google.com> |
Merge scripts: fix stringification error.
The exception needs to be explicitly converted to a string before it can
be concatenated.
Change-Id: Ie18a55480e5c16233fc9967f4000039ca21cc422
/frameworks/webview/chromium/tools/merge_from_chromium.py
|
| 2735b74c930c17d39cb6510c0c2c0a43df1d181a |
|
14-Dec-2012 |
Torne (Richard Coles) <torne@google.com> |
Merge scripts: preserve the gyp errors.
We were accidentally throwing away the gyp output when converting the
exception into a TemporaryMergeError; copy the output into the new
exception.
Change-Id: I1e9361000ec14fdeec9c831393655474e97d0d14
/frameworks/webview/chromium/tools/merge_from_chromium.py
|
| 862edb04ee66c65ce977d9b14b8809aad40749ac |
|
12-Dec-2012 |
Torne (Richard Coles) <torne@google.com> |
Merge scripts: allow automation to be smarter.
1) Use a branch with the revision number in the name, so that if
something goes wrong we can try again at a later revision without
overwriting the previous branch, in case someone wants to look at it.
2) Split out the code to retrieve LKGR into a separate function that can
be reused, so we don't have to try and do the merge before discovering
there is nothing new.
3) Introduce a new exception, TemporaryMergeError, which specifically
identifies problems that may be fixable by just retrying the merge with
a later revision. Use git reset --hard to clean up broken states when we
are going to raise this.
Change-Id: Ib32a4c211447abeb3daefa5fcc61360e13f704fc
/frameworks/webview/chromium/tools/merge_from_chromium.py
|
| 9536a5e5660bc0745d1f5f2f6a6468fa53ffa639 |
|
04-Dec-2012 |
Bo Liu <boliu@google.com> |
Add --svn_revision=HEAD to merge from tip of tree
Change-Id: Ieed83a3be148cb5725d25dd668398cedca27200c
/frameworks/webview/chromium/tools/merge_from_chromium.py
|
| bda7cff5dd92725ba000fe95d9434f81a7af486e |
|
29-Nov-2012 |
Torne (Richard Coles) <torne@google.com> |
Merge scripts: support pushing via a temporary branch.
Push to a temporary branch first in order that the server has already
got a copy of all our objects when we push to the real branch, in an
effort to reduce skew between repositories. Move Push into a seperate
function also, so that it can be called from other scripts without
needing to duplicate the branch configuration.
Change-Id: I8eec01db5d0e1439e391b185b7250bbc23c3e3e3
/frameworks/webview/chromium/tools/merge_from_chromium.py
|
| 5d65b76f6747f51bb623d00205aca85581ad4d91 |
|
29-Nov-2012 |
Torne (Richard Coles) <torne@google.com> |
Merge scripts: use logging instead of print.
To make it easier to reuse the merge functionality, output using logging
instead of printing to stdout, and configure logging to behave the same
as print normally would by default.
Change-Id: I780675c2fa01640f45e001535158587090f4dff3
/frameworks/webview/chromium/tools/merge_from_chromium.py
|
| 2efbabe43f012ff9c06c78fc19fae49421a4d356 |
|
23-Nov-2012 |
Torne (Richard Coles) <torne@google.com> |
Merge scripts: merge from LKGR by default.
Fetch the last known good revision from the Chromium waterfall and use
it as the default revision to merge to. Fix the svn->git revision
conversion to use the earliest match, not the latest, as this is almost
always correct.
Also, rename Snapshot without an underscore as we're going to reuse it.
Change-Id: Idd0c9db40ca6b7212c6bbcca6046bf7b09ff3259
/frameworks/webview/chromium/tools/merge_from_chromium.py
|
| b4b2d8eafdf00e50598aa9305317bd691bd471ad |
|
23-Nov-2012 |
Torne (Richard Coles) <torne@google.com> |
Merge scripts: remove url/branch parameters.
If the URL or branch changes it's likely the script will need to be
modified anyway; hardcode it instead of taking it as a parameter. This
makes it easier to reuse the functions in this script from another
script.
Change-Id: If77aca9120ed9f925a67677e232d41684308fa1c
/frameworks/webview/chromium/tools/merge_from_chromium.py
|
| 14ac2c8d49fa1f5f12e6a80af93f1c50312d80a8 |
|
23-Nov-2012 |
Torne (Richard Coles) <torne@google.com> |
Merge scripts: implement an unattended mode.
Split pushing into a separate step instead of prompting to do it
immediately, and replace --autopush with an --unattended mode switch
that removes all prompts for user interaction.
Change-Id: Id32789eb36232afce99945e97e83ff772bc1b9cd
/frameworks/webview/chromium/tools/merge_from_chromium.py
|
| 82c98161b9cd8e8f94e00d89b6fd56540473b3d4 |
|
22-Nov-2012 |
Torne (Richard Coles) <torne@google.com> |
Merge scripts: clean up and refactor.
Fix many lint errors, and generally tidy up the scripts and make them
easier to follow.
Change-Id: Ice94798218c6765eb86faea80d787036470efafd
/frameworks/webview/chromium/tools/merge_from_chromium.py
|
| 5568eda06be15d573395eaba779d62c09f6f96f1 |
|
19-Nov-2012 |
Torne (Richard Coles) <torne@google.com> |
Update merge script for multi-arch.
We're going to have different makefiles for different target
architectures. Update the merge script to reflect this. Invoke the
existing gyp_webview script rather than duplicating its logic here.
Change-Id: I5451c6df16d1180f37f76b4c1d779e2c64a72e45
/frameworks/webview/chromium/tools/merge_from_chromium.py
|
| cadf645507c329e0f5d7fbb67d9311cfa26ac638 |
|
16-Nov-2012 |
Torne (Richard Coles) <torne@google.com> |
Update merge with new repos/license info.
1) Add smhasher repository back to the merge list as it's used by the
latest version of ANGLE.
2) Known-incompatible license list has moved to "known_issues" module.
Change-Id: I3c955d1f93244cc8e7ca636a270eb8c4c91a6c5b
/frameworks/webview/chromium/tools/merge_from_chromium.py
|
| 1c263f2b522bcb9159547d14f9f57abac46967c7 |
|
30-Oct-2012 |
Torne (Richard Coles) <torne@google.com> |
Merge tool: refactor reusable code.
The merge-to-master tool will need to reuse some of the code in the
merge-from-chromium tool. Refactor it into a separate module. No
functional changes.
The tool has also been renamed to merge_from_chromium as underscores are
the convention for python module names.
Change-Id: I87a4b4def579364c51b3b03ad993a66d33fdd7ea
/frameworks/webview/chromium/tools/merge_from_chromium.py
|