diff options
-rwxr-xr-x | src/pyfedpkg/initial_merge.py | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/src/pyfedpkg/initial_merge.py b/src/pyfedpkg/initial_merge.py index b04a1f7..9ca0be8 100755 --- a/src/pyfedpkg/initial_merge.py +++ b/src/pyfedpkg/initial_merge.py @@ -80,14 +80,6 @@ def cmp_relbranch(a, b): return cmp(asplit,bsplit) -def cmp_Branch(a, b): - """Comparison function for sort() calls""" - if a.sha == b.sha: - return cmp_relbranch(a.localbranch,b.localbranch) - else: - return cmp(a.sha,b.sha) - - class Branch(object): """Convenience class for handling branches to initial-merge""" @@ -102,6 +94,12 @@ class Branch(object): def __repr__(self): return "%(sha)s %(origbranch)s" % self.__dict__ + def __cmp__(self, other): + if self.sha == other.sha: + return cmp_relbranch(self.localbranch, other.localbranch) + else: + return cmp(self.sha, other.sha) + class Filter(object): @@ -164,7 +162,7 @@ def handle_repo(repo, dry_run=False): log.info("######## initial-merge %s ########" % repo.working_tree_dir) _locals, remotes = pyfedpkg._list_branches(repo=repo) aa = [ Branch(repo.git.rev_parse('%s^{tree}' % b), b) for b in remotes ] - aa.sort(cmp_Branch) + aa.sort() log.info("Branches sorted by tree sha:") for x in aa: log.info(" %s" % x) |