/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: Vincent Ladeuil
  • Date: 2011-11-18 07:29:20 UTC
  • mfrom: (6277 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6278.
  • Revision ID: v.ladeuil+lp@free.fr-20111118072920-76q1ho772bkmnno2
Merge trunk to resolve news conflict

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/branch.py
1606
1606
        """Return the format for the branch object in controldir."""
1607
1607
        try:
1608
1608
            transport = controldir.get_branch_transport(None, name=name)
 
1609
        except errors.NoSuchFile:
 
1610
            raise errors.NotBranchError(path=name, bzrdir=controldir)
 
1611
        try:
1609
1612
            format_string = transport.get_bytes("format")
1610
1613
            return format_registry.get(format_string)
1611
1614
        except errors.NoSuchFile:
2297
2300
            raise errors.IncompatibleFormat(self, a_bzrdir._format)
2298
2301
        branch_transport = a_bzrdir.get_branch_transport(self, name=name)
2299
2302
        branch_transport.put_bytes('location',
2300
 
            target_branch.bzrdir.user_url)
 
2303
            target_branch.user_url)
2301
2304
        branch_transport.put_bytes('format', self.get_format_string())
2302
2305
        branch = self.open(
2303
2306
            a_bzrdir, name, _found=True,
2435
2438
            raise ValueError('a_bzrdir must be supplied')
2436
2439
        else:
2437
2440
            self.bzrdir = a_bzrdir
2438
 
        self._base = self.bzrdir.transport.clone('..').base
 
2441
        self._user_transport = self.bzrdir.transport.clone('..')
 
2442
        if name is not None:
 
2443
            self._user_transport.set_segment_parameter(
 
2444
                "branch", urlutils.escape(name))
 
2445
        self._base = self._user_transport.base
2439
2446
        self.name = name
2440
 
        # XXX: We should be able to just do
2441
 
        #   self.base = self.bzrdir.root_transport.base
2442
 
        # but this does not quite work yet -- mbp 20080522
2443
2447
        self._format = _format
2444
2448
        if _control_files is None:
2445
2449
            raise ValueError('BzrBranch _control_files is None')
2449
2453
        Branch.__init__(self)
2450
2454
 
2451
2455
    def __str__(self):
2452
 
        if self.name is None:
2453
 
            return '%s(%s)' % (self.__class__.__name__, self.user_url)
2454
 
        else:
2455
 
            return '%s(%s,%s)' % (self.__class__.__name__, self.user_url,
2456
 
                self.name)
 
2456
        return '%s(%s)' % (self.__class__.__name__, self.user_url)
2457
2457
 
2458
2458
    __repr__ = __str__
2459
2459
 
2463
2463
 
2464
2464
    base = property(_get_base, doc="The URL for the root of this branch.")
2465
2465
 
 
2466
    @property
 
2467
    def user_transport(self):
 
2468
        return self._user_transport
 
2469
 
2466
2470
    def _get_config(self):
2467
2471
        return _mod_config.TransportConfig(self._transport, 'branch.conf')
2468
2472
 
3030
3034
            except errors.RevisionNotPresent, e:
3031
3035
                raise errors.GhostRevisionsHaveNoRevno(revision_id, e.revision_id)
3032
3036
            index = len(self._partial_revision_history_cache) - 1
 
3037
            if index < 0:
 
3038
                raise errors.NoSuchRevision(self, revision_id)
3033
3039
            if self._partial_revision_history_cache[index] != revision_id:
3034
3040
                raise errors.NoSuchRevision(self, revision_id)
3035
3041
        return self.revno() - index