diff options
Diffstat (limited to 'morphlib/plugins/diff_plugin.py')
| -rw-r--r-- | morphlib/plugins/diff_plugin.py | 69 |
1 files changed, 59 insertions, 10 deletions
diff --git a/morphlib/plugins/diff_plugin.py b/morphlib/plugins/diff_plugin.py index 4763ba40..1f587082 100644 --- a/morphlib/plugins/diff_plugin.py +++ b/morphlib/plugins/diff_plugin.py @@ -14,11 +14,15 @@ # with this program. If not, see <http://www.gnu.org/licenses/>. +from collections import defaultdict + import cliapp -from morphlib.cmdline_parse_utils import parse_cmdline_system_lists +from morphlib.buildcommand import BuildCommand +from morphlib.cmdline_parse_utils import parse_definition_lists from morphlib.morphologyfinder import MorphologyFinder from morphlib.morphloader import MorphologyLoader +from morphlib.morphset import MorphologySet from morphlib.util import new_repo_caches @@ -57,19 +61,64 @@ class DiffPlugin(cliapp.Plugin): definition_list_name_list=('from', 'to'), args=args) - lrc, rrc = new_repo_caches(self.app) - ml = MorphologyLoader() - + bc = BuildCommand(self.app) - def load_morphset((reponame, ref, definitions)): - repo = lrc.get_updated_repo(reponame, ref=ref) + def get_systems((reponame, ref, definitions)): + 'Convert a definition path list into a list of systems' + ml = MorphologyLoader() + repo = bc.lrc.get_updated_repo(reponame, ref=ref) mf = MorphologyFinder(gitdir=repo.gitdir, ref=ref) + # We may have been given an empty set of definitions as input, in + # which case we instead use every we find. if not definitions: definitions = mf.list_morphologies() - ms = MorphologySet() + system_paths = set() for definition in definitions: m = ml.parse_morphology_text(mf.read_morphology(definition), definition) - ms.add_morphology(m) - from_morphset = load_morphset(from_spec) - to_morphset = load_morphset(to_spec) + if m.get('kind') == 'system' or 'strata' in m: + system_paths.add(definition) + return reponame, ref, system_paths + from_repo, from_ref, from_paths = get_systems(from_spec) + to_repo, to_ref, to_paths = get_systems(to_spec) + + # This abuses Sources because they conflate the ideas of "logical + # structure of the input of what we want to build" and the structure of + # what the output of that would be. + # If we were to pass the produced source pools to the artifact graphing + # code then they would become an invalid structure of the output, + # because the graphing code cannot handle multiple systems. + from_sp = bc.create_source_pool(repo_name=from_repo, ref=from_ref, + filenames=from_paths) + to_sp = bc.create_source_pool(repo_name=to_repo, ref=to_ref, + filenames=to_paths) + + from_by_name = defaultdict(set) + to_by_name = defaultdict(set) + for from_source in from_sp: + from_by_name[from_source.morphology['name']].add(from_source) + for to_source in to_sp: + to_by_name[to_source.morphology['name']].add(to_source) + + for name, from_sources in from_by_name.iteritems(): + from_source = iter(from_sources).next() + to_sources = to_by_name[name] + if not to_sources: + print('{} was removed'.format(name)) + continue + # We don't actually care that multiple sources match that + # lookup because of artifact splitting, so we'll take the + # first. + to_source = iter(to_sources).next() + if from_source.repo_name != to_source.repo_name: + print('{} repo changed from {} to {}'.format( + name, from_source.repo_name, to_source.repo_name)) + if from_source.original_ref != to_source.original_ref: + from_repo, to_repo = (bc.lrc.get_updated_repo(s.repo_name, + ref=s.sha1) + for s in (from_source, to_source)) + from_desc = from_repo.gitdir.version_guess(from_source.sha1) + to_desc = to_repo.gitdir.version_guess(to_source.sha1) + print('{} ref changed from {} to {}'.format( + from_source.morphology['name'], from_desc, to_desc)) + |