← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/merge.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/merge.py
199
199
            
200
200
def get_tree(treespec, local_branch=None):
201
201
    location, revno = treespec
202
 
    branch = Branch.open_containing(location)
 
202
    branch = Branch.open_containing(location)[0]
203
203
    if revno is None:
204
204
        revision = None
205
205
    elif revno == -1:
264
264
    try:
265
265
        if this_dir is None:
266
266
            this_dir = '.'
267
 
        this_branch = Branch.open_containing(this_dir)
 
267
        this_branch = Branch.open_containing(this_dir)[0]
268
268
        this_rev_id = this_branch.last_revision()
269
269
        if this_rev_id is None:
270
270
            raise BzrCommandError("This branch has no commits")