| 94addffe055d2df297d4cf6c981d13a6e0a62bbc |
|
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
/frameworks/webview/chromium/tools/merge_to_master.py
|
| 6adc8a2e72d90b3a5c1cf7cf7ec7be2f6c974851 |
|
07-Aug-2013 |
Torne (Richard Coles) <torne@google.com> |
Merge scripts: allow merging to non-master branches.
Add a --target parameter to merge_to_master.py to allow merging code
from master-chromium to any target branch which was branched from
master (such as a -dev branch).
Change-Id: I4d318d1d9650489b2abe2faf7076675fd01a90d8
/frameworks/webview/chromium/tools/merge_to_master.py
|
| 7fd1d813e7f206ff7a25ee8fca36c4cbe860b361 |
|
05-Aug-2013 |
Torne (Richard Coles) <torne@google.com> |
Merge scripts: actually print the generated review details.
The push in frameworks/webview outputs the review URL from Rietveld;
spit this output out as "info" so that it's actually displayed; debug
logging is invisible by default.
Change-Id: I6024797f35ead734c2ad8f24724603ffb27c7cbf
/frameworks/webview/chromium/tools/merge_to_master.py
|
| 58324375a4ba319e7b114f3afece23a98de3f373 |
|
31-Jul-2013 |
Torne (Richard Coles) <torne@google.com> |
Merge scripts: automate more of merge_to_master.
Allow merge_to_master.py to be given the path to a repo.prop file (from
the build system). This will be used to detect the revision of chromium
to merge automatically, and will also be used to create and upload a
merge CL for review for frameworks/webview. Also, update all the remotes
explictly when running the script to remove the need to sync both master
and master-chromium first; you can now just run the script on a
master-chromium checkout.
Change-Id: Ie812bac3f23864dde64ceebedb443e7afbe0571f
/frameworks/webview/chromium/tools/merge_to_master.py
|
| e1a149c76208a84c7595203a465ae1218ded9d34 |
|
09-May-2013 |
Torne (Richard Coles) <torne@google.com> |
Merge scripts: update merge_to_master.
Update merge_to_master.py to work with the new separate history
projects; also add support for merging a specific chromium revision
using the archived revisions on the server.
Change-Id: Ifaf3aefe0b88936e98c9a7db2605417e89accbe9
/frameworks/webview/chromium/tools/merge_to_master.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_to_master.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_to_master.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_to_master.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_to_master.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_to_master.py
|
| 33e5c69dc781743cc2560bef57763170b61bae3f |
|
06-Nov-2012 |
Torne (Richard Coles) <torne@google.com> |
Implement merge-to-master tool.
Create a tool that can merge from master-chromium to master, flattening
the history of chromium and webkit in the process (and removing layout
tests). The merge parents are recorded in a file in order that they can
be grafted back in for future merges.
Change-Id: I4a2df3de3a017794b7a25f5703cb1343a488b021
/frameworks/webview/chromium/tools/merge_to_master.py
|