tree 53c123c371e12fa51fbda7896e36e7df1c5f1ae0
parent 17a22402dbfd244c1f3f624aabea3078c2e32e25
author Edwin Kempin <ekempin@google.com> 1614673520 +0100
committer Edwin Kempin <ekempin@google.com> 1614784775 +0100

Fix per-file import if per-file rule ignores parent code owners

If a matching per-file rule ignores parent code owners and at the same
time a matching per-file rule imports global code owners from another
OWNERS file, these imported global code owners were wrongly ignored.

The logic that resolves a code owner config for a path was doing the
following steps:
1. Drop per-file rules that do not apply to the path
2. Resolve all imports (global imports and imports of matching per-file
   rules) and merge them into the current config
3. If any matching per-file rule ignores parent code owners, drop all
   global code owners

Step 3. wrongly dropped the global code owners that were added due to
the per-file imports.

To fix this we now do:
1. Drop per-file rules that do not apply to the path
2. Resolve all global imports and merge them into the current config
3. If any matching per-file rule ignores parent code owners, drop all
   global code owners
4. Resolve all per-file imports and merge them into the current config

Signed-off-by: Edwin Kempin <ekempin@google.com>
Change-Id: If33a874a3f93818a24d2bb8ab65c83aee66facb5