← Back to branch summary

~abentley/bzrtools/bzrtools.dev

« back to all changes in this revision

Viewing changes to __init__.py

  • Committer: Aaron Bentley
  • Date: 2005-09-22 17:50:29 UTC
  • Revision ID: abentley@panoramicfeedback.com-20050922175029-10670eb4d37ded38
Switched from clusters to forced ranking

Show diffs side-by-side

added added

removed removed

Lines of Context:
__init__.py
32
32
 
33
33
bzrlib.commands.OPTIONS['no-collapse'] = None
34
34
bzrlib.commands.OPTIONS['no-antialias'] = None
 
35
bzrlib.commands.OPTIONS['cluster'] = None
35
36
bzrlib.commands.OPTIONS['merge-branch'] = str
36
37
 
37
38
class cmd_graph_ancestry(bzrlib.commands.Command):
53
54
    with --no-antialias.
54
55
    """
55
56
    takes_args = ['branch', 'file']
56
 
    takes_options = ['no-collapse', 'no-antialias', 'merge-branch']
 
57
    takes_options = ['no-collapse', 'no-antialias', 'merge-branch', 'cluster']
57
58
    def run(self, branch, file, no_collapse=False, no_antialias=False,
58
 
        merge_branch=None):
 
59
        merge_branch=None, cluster=False):
59
60
        import graph
 
61
        if cluster:
 
62
            ranking = "cluster"
 
63
        else:
 
64
            ranking = "forced"
60
65
        graph.write_ancestry_file(branch, file, not no_collapse, 
61
 
                                  not no_antialias, merge_branch)
 
66
                                  not no_antialias, merge_branch, ranking)
62
67
 
63
68
class cmd_fetch_missing(bzrlib.commands.Command):
64
69
    """Attempt to retrieve missing ancestors from another branch.