/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/knit.py

  • Committer: John Arbash Meinel
  • Date: 2009-11-28 21:54:08 UTC
  • mto: This revision was merged to the branch mainline in revision 4842.
  • Revision ID: john@arbash-meinel.com-20091128215408-d9jtxbxyiklmiurh
Add a static_tuple.as_tuples() helper.

It will pass over an iterable, and ensure that it and all children
are simple tuples. Useful for formatting.
Also fix a small bug in the reference checking code that assumes
the values passed in are the same type, but sometimes they are a
list rather than a tuple.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/knit.py
1
 
# Copyright (C) 2006-2010 Canonical Ltd
 
1
# Copyright (C) 2005, 2006, 2007, 2008 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
73
73
    trace,
74
74
    tsort,
75
75
    tuned_gzip,
76
 
    ui,
77
76
    )
78
77
""")
79
78
from bzrlib import (
1756
1755
        :return: An iterator over (line, key).
1757
1756
        """
1758
1757
        if pb is None:
1759
 
            pb = ui.ui_factory.nested_progress_bar()
 
1758
            pb = progress.DummyProgress()
1760
1759
        keys = set(keys)
1761
1760
        total = len(keys)
1762
1761
        done = False
2949
2948
                parents = node_refs[:1]
2950
2949
                # Sometimes these are passed as a list rather than a tuple
2951
2950
                passed = static_tuple.as_tuples(keys[key])
2952
 
                passed_parents = passed[1][:1]
 
2951
                passed_parents = passed([1][:1])
2953
2952
                if (value[0] != keys[key][0][0] or
2954
2953
                    parents != passed_parents):
2955
2954
                    node_refs = static_tuple.as_tuples(node_refs)