LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Update behavior of commits not upstreamed to include pure deletions" am: 97bd347fcf

Browse Source 
am: 64a6611cd4

Change-Id: I95b4ed47ab4f671a05803e398bc234d1bf9d6b9e
This commit is contained in:
Scott Lobdell
2018-04-19 14:06:14 -07:00
committed by android-build-merger
parent 8b99889543 64a6611cd4
commit 85a2507932
1 changed files with 2 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
tools/repo_diff/git_commits_not_upstreamed.py
View File

@@ -100,26 +100,11 @@ def find(upstream, downstream, working_dir):
A set of downstream commits missing upstream. A set of downstream commits missing upstream.
""" """
commits_not_upstreamed = set()
revlist_output = git(['-C', working_dir, 'rev-list', '--no-merges', revlist_output = git(['-C', working_dir, 'rev-list', '--no-merges',
'%s..%s' % (upstream, downstream)]) '%s..%s' % (upstream, downstream)])
downstream_only_commits = set(revlist_output.splitlines()) downstream_only_commits = set(revlist_output.splitlines())
insertion_commits = set() # TODO(slobdell b/78283222) resolve commits not upstreamed that are purely reverts
return downstream_only_commits
# If there are no downstream-only commits there's no point in
# futher filtering
if downstream_only_commits:
insertion_commits = find_insertion_commits(upstream, downstream,
working_dir)
# The commits that are only downstream and are visible in 'git blame' are the
# ones that insert lines in the diff between upstream and downstream.
commits_not_upstreamed.update(
downstream_only_commits.intersection(insertion_commits))
# TODO(diegowilson) add commits that deleted lines
return commits_not_upstreamed
def main(): def main():