← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/remote.py

  • Committer: Alexander Belchenko
  • Date: 2007-11-19 22:54:30 UTC
  • mfrom: (3006 +trunk)
  • mto: This revision was merged to the branch mainline in revision 3008.
  • Revision ID: bialix@ukr.net-20071119225430-x0ewosrsagis0yno
merge bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/remote.py
24
24
    errors,
25
25
    lockdir,
26
26
    repository,
 
27
    revision,
27
28
)
28
29
from bzrlib.branch import Branch, BranchReferenceFormat
29
30
from bzrlib.bzrdir import BzrDir, RemoteBzrDirFormat
32
33
from bzrlib.errors import NoSuchRevision
33
34
from bzrlib.lockable_files import LockableFiles
34
35
from bzrlib.pack import ContainerReader
35
 
from bzrlib.revision import NULL_REVISION
36
36
from bzrlib.smart import client, vfs
37
37
from bzrlib.symbol_versioning import (
38
38
    deprecated_method,
95
95
        self._ensure_real()
96
96
        self._real_bzrdir.destroy_branch()
97
97
 
98
 
    def create_workingtree(self, revision_id=None):
 
98
    def create_workingtree(self, revision_id=None, from_branch=None):
99
99
        raise errors.NotLocalUrl(self.transport.base)
100
100
 
101
101
    def find_branch_format(self):
309
309
        """See Repository.get_revision_graph()."""
310
310
        if revision_id is None:
311
311
            revision_id = ''
312
 
        elif revision_id == NULL_REVISION:
 
312
        elif revision.is_null(revision_id):
313
313
            return {}
314
314
 
315
315
        path = self.bzrdir._path_for_remote_call(self._client)
357
357
    def gather_stats(self, revid=None, committers=None):
358
358
        """See Repository.gather_stats()."""
359
359
        path = self.bzrdir._path_for_remote_call(self._client)
360
 
        if revid in (None, NULL_REVISION):
 
360
        # revid can be None to indicate no revisions, not just NULL_REVISION
 
361
        if revid is None or revision.is_null(revid):
361
362
            fmt_revid = ''
362
363
        else:
363
364
            fmt_revid = revid
626
627
            # check that last_revision is in 'from' and then return a
627
628
            # no-operation.
628
629
            if (revision_id is not None and
629
 
                not _mod_revision.is_null(revision_id)):
 
630
                not revision.is_null(revision_id)):
630
631
                self.get_revision(revision_id)
631
632
            return 0, []
632
633
        self._ensure_real()
933
934
        # We intentionally don't call the parent class's __init__, because it
934
935
        # will try to assign to self.tags, which is a property in this subclass.
935
936
        # And the parent's __init__ doesn't do much anyway.
 
937
        self._revision_id_to_revno_cache = None
936
938
        self._revision_history_cache = None
937
939
        self.bzrdir = remote_bzrdir
938
940
        if _client is not None: