You cannot select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
6215dd0365
Changes:
- _UploadAllPrecheck() returns a list of cls to upload that skips any empty commits in the stack.
- If the current branch is empty, we throw an error.
- UploadAllSquashed() now computes the parent to use for the squashed and cherry-pick flow.
- for cherry-pick it uses the gerrit_squash_hash of the next cl in `cls`. This means it could be the gerrit_squash_hash of the direct ancestor OR the closest non-empty ancestor branch.
- for multiple squashed commits, the first parent passed in is either:
- the closest ancestor with a gerrit_squash_hash OR the common ancestor shared with the root of the tree.
- PrepareSquashedCommit() and PrepareCherryPick() now both require a parent passed in.
Bug:1411878, b/265929888
Change-Id: I7dba289defb40ed0464eabdb7e90810353ef155f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/4220412
Reviewed-by: Josip Sokcevic <sokcevic@chromium.org>
Commit-Queue: Joanna Wang <jojwang@chromium.org>
Reviewed-by: Gavin Mak <gavinmak@google.com>
|
3 years ago | |
|---|---|---|
| .. | ||
| gstools | ||
| OWNERS | 3 years ago | |
| PRESUBMIT.py | 3 years ago | |
| auth_test.py | ||
| autoninja_test.py | 3 years ago | |
| bot_update_coverage_test.py | 3 years ago | |
| cipd_bootstrap_test.py | ||
| detect_host_arch_test.py | 3 years ago | |
| download_from_google_storage_unittest.py | 4 years ago | |
| fetch_test.py | 3 years ago | |
| fix_encoding_test.py | 4 years ago | |
| gclient_cipd_smoketest.py | 3 years ago | |
| gclient_eval_unittest.py | ||
| gclient_git_mutates_smoketest.py | ||
| gclient_git_smoketest.py | 3 years ago | |
| gclient_no_sync_smoketest.py | 3 years ago | |
| gclient_paths_test.py | ||
| gclient_scm_test.py | 3 years ago | |
| gclient_smoketest.py | ||
| gclient_smoketest_base.py | 4 years ago | |
| gclient_test.py | 3 years ago | |
| gclient_transitions_smoketest.py | ||
| gclient_utils_test.py | 3 years ago | |
| gerrit_client_test.py | 4 years ago | |
| gerrit_util_test.py | 3 years ago | |
| git_cache_test.py | ||
| git_cl_creds_check_report.txt | 3 years ago | |
| git_cl_test.py | 3 years ago | |
| git_common_test.py | 4 years ago | |
| git_dates_test.py | ||
| git_find_releases_test.py | 4 years ago | |
| git_footers_test.py | ||
| git_hyper_blame_test.py | ||
| git_map_test.py | ||
| git_migrate_default_branch_test.py | 4 years ago | |
| git_number_test.py | ||
| git_rebase_update_test.py | 3 years ago | |
| gsutil_test.py | 4 years ago | |
| lockfile_test.py | ||
| metrics_test.py | 3 years ago | |
| my_activity_test.py | 4 years ago | |
| ninja_reclient_test.py | 3 years ago | |
| ninjalog_uploader_test.py | 4 years ago | |
| owners_client_test.py | 3 years ago | |
| owners_finder_test.py | ||
| presubmit_canned_checks_test.py | 3 years ago | |
| presubmit_unittest.py | 3 years ago | |
| rdb_wrapper_test.py | 3 years ago | |
| recipes_test.py | 4 years ago | |
| roll_dep_test.py | 3 years ago | |
| scm_unittest.py | 3 years ago | |
| split_cl_test.py | ||
| subcommand_test.py | 3 years ago | |
| subprocess2_test.py | 4 years ago | |
| upload_to_google_storage_unittest.py | 4 years ago | |
| utils_test.py | 4 years ago | |
| watchlists_unittest.py | ||