Really the inner function should do computation only and leave it to the
caller to report warnings etc. This will prevent noise when under test.
This changes the API of internal function _devel_branch_updates. It may
now return None for commit hashes, in which case the intention is that
the caller will suppress setting those refs but will be able to note
which refs are not being set. This is useful to maintain reporting.
The debug and warning messages are now slightly changed since less
information is available one level up the stack. It should still be
sufficient for debugging or warning purposes.
Move the core functionality into _devel_branch_updates, making
update_devel_branches a thin wrapper to it. This should introduce no
functional changes. _devel_branch_updates now has no dependencies so
should be easier to test.
After discussion with Robie on IRC, we decided that 0f3c943054ab
("import: drop publishing parent functionality") and 5aa33fa08078 ("Also
reset devel heads") introduced a regression in the semantics of the
devel pointers.
Before those changes, the devel pointers were merged up so as to be
fast-forwarding, as we imported publication entries, if the publication
entry was newer than the current devel pointer. In other words, the
devel pointers were part of the commit graph itself.
After those changes, the devel pointers are more like symbolic
references, describing meta-state about the commit graph, rather than
integral to the graph itself:
A given series devel branch, after a successful import, points to the
latest publication record in a given series.
The ubuntu/devel branch, after a successful import, points to the latest
series devel branch.
Given these 'rules', we can stop updating the devel pointers in the main
import loop and just do so after we are done importing. All series
branch pointers are updated, which is unnecessary but will generally be
a no-op. This allows the method to not be aware of reimporting or not.