Collapse dual (un)applied code using an enum
In various places we have two implementations of near-identical code
where the only difference is whether they act on unapplied or applied
branches, tags or structure. Ultimately they do need to be handled
differently at some point, but most of the code in the middle of the
call graph does not need to care.
To avoid code duplication we define a PatchState enum and can then drop
half of the middling code by simply passing through the "unapplied-ness"
or "applied-ness" as a parameter.
The following functions are removed from gitubuntu.git_repository.
Instead, the unapplied previous equivalent should be used with
patch_state=PatchState.APPLIED:
applied_reimport_tag_prefix
applied_reimport_tag
applied_tag
The following methods are removed from
gitubuntu.git_repository.GitUbuntuRepository. Instead, the unapplied
previous equivalent should be used with patch_state=PatchState.APPLIED:
get_applied_reimport_tag
get_all_applied_reimport_tags
A grep suggests that the only callers are importer.py and
importer_test.py; these are refactored as part of this change, dropping
duplication where there was any.
"git ubuntu tag" is the obvious CLI command that might have been
affected, but it doesn't appear to need any of these functions or
methods. Perhaps it should, but that's a job for a future refactoring.
This change does not cover every instance of code duplication or where
refactoring to use the new enum might be appropriate; we merely fix the
code that needed touching anyway, leaving other refactoring for the
future.
This change should not result in any functional changes.
Drop pin on lazr.restfulclient
lazr.restfulclient 0.14.3 has been released, causing the self-test
error:
gitubuntu 0.9.0 has requirement lazr.restfulclient==0.14.2, but you have lazr.restfulclient 0.14.3.
There is no need to pin this, so drop the pin.
