diff options
| author | Adam Spiers <git@adamspiers.org> | 2018-09-09 22:24:22 +0100 |
|---|---|---|
| committer | Adam Spiers <git@adamspiers.org> | 2018-09-09 22:24:22 +0100 |
| commit | eb4c292e29cdfbb3216c15ab614e2dac1740483d (patch) | |
| tree | 86435ab2d17291c176ed4ce9a809bf20632607af /git_deps | |
| parent | 404170854547f796b862416dbd4a666b338000a8 (diff) | |
| download | git-deps-eb4c292e29cdfbb3216c15ab614e2dac1740483d.tar.gz | |
extract record_dependency_source() method
Diffstat (limited to 'git_deps')
| -rw-r--r-- | git_deps/detector.py | 45 |
1 files changed, 26 insertions, 19 deletions
diff --git a/git_deps/detector.py b/git_deps/detector.py index ec607c4..afda3fa 100644 --- a/git_deps/detector.py +++ b/git_deps/detector.py @@ -192,25 +192,9 @@ class DependencyDetector(object): dependency, dependency_sha1, path, line_num) - dep_sources = self.dependencies[dependent_sha1][dependency_sha1] - - if path not in dep_sources: - dep_sources[path] = {} - self.notify_listeners('new_path', - dependent, dependency, path, line_num) - - if line_num in dep_sources[path]: - abort("line %d already found when blaming %s:%s\n" - "old:\n %s\n" - "new:\n %s" % - (line_num, parent.hex[:8], path, - dep_sources[path][line_num], line)) - - dep_sources[path][line_num] = line - self.logger.debug(" New line for %s -> %s: %s" % - (dependent_sha1[:8], dependency_sha1[:8], line)) - self.notify_listeners('new_line', - dependent, dependency, path, line_num) + self.record_dependency_source(dependent, dependent_sha1, + dependency, dependency_sha1, + path, line_num, line) diff_format = ' |%8.8s %5s %s%s' hunk_header = '@@ %s %s @@' % (line_range_before, line_range_after) @@ -285,6 +269,29 @@ class DependencyDetector(object): self.logger.debug(" + Added %s to TODO" % dependency.hex[:8]) + def record_dependency_source(self, dependent, dependent_sha1, + dependency, dependency_sha1, + path, line_num, line): + dep_sources = self.dependencies[dependent_sha1][dependency_sha1] + + if path not in dep_sources: + dep_sources[path] = {} + self.notify_listeners('new_path', + dependent, dependency, path, line_num) + + if line_num in dep_sources[path]: + abort("line %d already found when blaming %s:%s\n" + "old:\n %s\n" + "new:\n %s" % + (line_num, parent.hex[:8], path, + dep_sources[path][line_num], line)) + + dep_sources[path][line_num] = line + self.logger.debug(" New line for %s -> %s: %s" % + (dependent_sha1[:8], dependency_sha1[:8], line)) + self.notify_listeners('new_line', + dependent, dependency, path, line_num) + def branch_contains(self, commit, branch): sha1 = commit.hex branch_commit = self.get_commit(branch) |