← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/remote.py

  • Committer: Jelmer Vernooij
  • Date: 2009-10-27 21:54:26 UTC
  • mfrom: (4771 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4833.
  • Revision ID: jelmer@samba.org-20091027215426-72164bkd4mq9dsd4
merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/remote.py
154
154
        Used before calls to self._real_bzrdir.
155
155
        """
156
156
        if not self._real_bzrdir:
157
 
            if 'hpssvfs' in debug.debug_flags:
158
 
                import traceback
159
 
                warning('VFS BzrDir access triggered\n%s',
160
 
                    ''.join(traceback.format_stack()))
161
157
            self._real_bzrdir = BzrDir.open_from_transport(
162
158
                self.root_transport, _server_formats=False)
163
159
            self._format._network_name = \
601
597
        return self._custom_format._fetch_reconcile
602
598
 
603
599
    def get_format_description(self):
604
 
        self._ensure_real()
605
 
        return 'Remote: ' + self._custom_format.get_format_description()
 
600
        return 'bzr remote repository'
606
601
 
607
602
    def __eq__(self, other):
608
603
        return self.__class__ is other.__class__
951
946
    def is_write_locked(self):
952
947
        return self._lock_mode == 'w'
953
948
 
954
 
    def _warn_if_deprecated(self, branch=None):
955
 
        # If we have a real repository, the check will be done there, if we
956
 
        # don't the check will be done remotely.
957
 
        pass
958
 
 
959
949
    def lock_read(self):
960
950
        # wrong eventually - want a local lock cache context
961
951
        if not self._lock_mode:
2005
1995
                self._network_name)
2006
1996
 
2007
1997
    def get_format_description(self):
2008
 
        self._ensure_real()
2009
 
        return 'Remote: ' + self._custom_format.get_format_description()
 
1998
        return 'Remote BZR Branch'
2010
1999
 
2011
2000
    def network_name(self):
2012
2001
        return self._network_name