← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/conflicts.py

  • Committer: Robert Collins
  • Date: 2005-10-17 23:35:18 UTC
  • mfrom: (1442.1.65)
  • Revision ID: robertc@robertcollins.net-20051017233518-6746654be564edde
Merge in more GPG work, and more Branch-api-shrinkage.

* Branch.remove has been moved to WorkingTree, which has also gained
  lock_read, lock_write and unlock methods for convenience. (Robert
  Collins)

* Two decorators, needs_read_lock and needs_write_lock have been added
  to the branch module. Use these to cause a function to run in a
  read or write lock respectively. (Robert Collins)

* Branch.open_containing now returns a tuple (Branch, relative-path),
  which allows direct access to the common case of 'get me this file
  from its branch'. (Robert Collins)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/conflicts.py
37
37
    files.)
38
38
    """
39
39
    def run(self):
40
 
        for path in Branch.open_containing('.').working_tree().iter_conflicts():
 
40
        for path in Branch.open_containing('.')[0].working_tree().iter_conflicts():
41
41
            print path
42
42
 
43
43
class cmd_resolve(bzrlib.commands.Command):
50
50
            if not all:
51
51
                raise BzrCommandError(
52
52
                    "command 'resolve' needs one or more FILE, or --all")
53
 
            tree = Branch.open_containing('.').working_tree()
 
53
            tree = Branch.open_containing('.')[0].working_tree()
54
54
            file_list = list(tree.abspath(f) for f in tree.iter_conflicts())
55
55
        else:
56
56
            if all: