2f62486149
The diff between two patch sets contains hunks which weren't introduced by either patch set if a rebase occurred between those patch sets. Previous optimizations for this case simply omitted all files which aren't touched by either of the patch sets. This change goes one step further: All hunks which can clearly be identified as being introduced by a rebase are marked. In case of doubt (e.g. they overlap with a regular hunk), they aren't marked. To be consistent with the previous behavior, we exclude all files from the result which only contain hunks due to rebase. In some cases (e.g. a patch set touches 'fileA' but all identified hunks were introduced by the rebase), this rule can be stricter than the previously mentioned (as the previous rule would still show file 'fileA' but we exclude it now). Hunks which are introduced by a rebase are identified by computing the diff between the parents of the two patch sets and transforming the result to differences in terms of treeA of patch set A and treeB of patch set B. This follows a suggestion which was posted as a comment (https://gerrit-review.googlesource.com/c/33091/5//COMMIT_MSG#7) in change I63d3a21ad4f. As we always determine which hunks are introduced by a rebase when two commits are explicitly specified which don't share a common parent, we will determine those hunks even when we compute the diff between the parents of the patch sets provided that those parents fulfill the condition of being separated by a rebase. Those situations should be rare and hence we refrain from adding optimizations for this case for the moment. Bug: Issue 217 Change-Id: If06381d506d360f0e3d24d078dcb54692698e766 |
||
|---|---|---|
| .. | ||
| src/main/java/com/google/gerrit | ||
| BUCK | ||
| BUILD | ||