InTheForest/chromium_depot_tools
1
0
Fork 0
mirror of https://chromium.googlesource.com/chromium/tools/depot_tools.git synced 2026-01-11 18:51:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't delete dormant branches, even if empty.

Browse Source 
1) The current behavior feels contrary to the documentation; which says
"If true, will cause rebase-update to skip all processing on the branch."

2) The new behavior allows a workflow where 'master' is empty and
marked dormant, but kept up to date as the parent for all other
branches.

Change-Id: Ic7440706a69753f796846dd84ecbf8bcf172ba4c
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/2128675
Auto-Submit: Dale Curtis <dalecurtis@chromium.org>
Commit-Queue: Edward Lesmes <ehmaldonado@chromium.org>
Reviewed-by: Edward Lesmes <ehmaldonado@chromium.org>
This commit is contained in:
Dale Curtis
2020-03-30 23:01:43 +00:00
committed by LUCI CQ
parent df70c81527
commit 0610193326
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
git_rebase_update.py
View File

@@ -92,6 +92,9 @@ def remove_empty_branches(branch_tree):
reparents = {} reparents = {}
downstreams = collections.defaultdict(list) downstreams = collections.defaultdict(list)
for branch, parent in git.topo_iter(branch_tree, top_down=False): for branch, parent in git.topo_iter(branch_tree, top_down=False):
if git.is_dormant(branch):
continue
downstreams[parent].append(branch) downstreams[parent].append(branch)
# If branch and parent have the same tree, then branch has to be marked # If branch and parent have the same tree, then branch has to be marked