~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tsort.py

  • Committer: Robert Collins
  • Date: 2010-05-06 23:41:35 UTC
  • mto: This revision was merged to the branch mainline in revision 5223.
  • Revision ID: robertc@robertcollins.net-20100506234135-yivbzczw1sejxnxc
Lock methods on ``Tree``, ``Branch`` and ``Repository`` are now
expected to return an object which can be used to unlock them. This reduces
duplicate code when using cleanups. The previous 'tokens's returned by
``Branch.lock_write`` and ``Repository.lock_write`` are now attributes
on the result of the lock_write. ``repository.RepositoryWriteLockResult``
and ``branch.BranchWriteLockResult`` document this. (Robert Collins)

``log._get_info_for_log_files`` now takes an add_cleanup callable.
(Robert Collins)

Show diffs side-by-side

added added

removed removed

Lines of Context:
177
177
        revision number sequences in the output. See the output description of
178
178
        the MergeSorter docstring for details.
179
179
    :result: See the MergeSorter docstring for details.
180
 
 
181
 
    Node identifiers can be any hashable object, and are typically strings.
 
180
    node identifiers can be any hashable object, and are typically strings.
182
181
    """
183
182
    return MergeSorter(graph, branch_tip, mainline_revisions,
184
183
        generate_revno).sorted()