/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/branch.py

  • Committer: Marius Kruger
  • Date: 2010-08-15 04:52:51 UTC
  • mfrom: (5376 +trunk)
  • mto: (5384.1.1 integration)
  • mto: This revision was merged to the branch mainline in revision 5385.
  • Revision ID: marius.kruger@enerweb.co.za-20100815045251-izmea8nn05thhrok
merge with bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/branch.py
246
246
        if not local and not config.has_explicit_nickname():
247
247
            try:
248
248
                master = self.get_master_branch(possible_transports)
 
249
                if master and self.user_url == master.user_url:
 
250
                    raise errors.RecursiveBind(self.user_url)
249
251
                if master is not None:
250
252
                    # return the master branch value
251
253
                    return master.nick
 
254
            except errors.RecursiveBind, e:
 
255
                raise e
252
256
            except errors.BzrError, e:
253
257
                # Silently fall back to local implicit nick if the master is
254
258
                # unavailable
3309
3313
        """
3310
3314
        raise NotImplementedError(self.push)
3311
3315
 
 
3316
    @needs_write_lock
 
3317
    def copy_content_into(self, revision_id=None):
 
3318
        """Copy the content of source into target
 
3319
 
 
3320
        revision_id: if not None, the revision history in the new branch will
 
3321
                     be truncated to end with revision_id.
 
3322
        """
 
3323
        raise NotImplementedError(self.copy_content_into)
 
3324
 
3312
3325
 
3313
3326
class GenericInterBranch(InterBranch):
3314
3327
    """InterBranch implementation that uses public Branch functions."""