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

Reoncile InterGitRepository objects.

Show diffs side-by-side

added added

removed removed

Lines of Context:
remote.py
25
25
 
26
26
from bzrlib.plugins.git import git
27
27
from bzrlib.plugins.git.branch import GitBranch
28
 
from bzrlib.plugins.git.errors import NoSuchRef
29
 
from bzrlib.plugins.git.dir import GitDir
30
28
from bzrlib.plugins.git.foreign import ForeignBranch
31
29
from bzrlib.plugins.git.repository import GitFormat, GitRepository
32
30
 
33
 
import os
34
 
import tempfile
35
31
import urllib
36
32
import urlparse
37
33
 
38
 
from dulwich.pack import PackData, Pack
 
34
from dulwich.pack import PackData
39
35
 
40
36
 
41
37
class GitSmartTransport(Transport):
46
42
        assert scheme == "git"
47
43
        hostport, self._path = urllib.splithost(loc)
48
44
        (self._host, self._port) = urllib.splitnport(hostport, git.protocol.TCP_GIT_PORT)
49
 
        self._client = _client
50
 
 
51
 
    def _get_client(self):
52
 
        if self._client is not None:
53
 
            ret = self._client
54
 
            self._client = None
55
 
            return ret
56
 
        return git.client.TCPGitClient(self._host, self._port)
 
45
        if _client is not None:
 
46
            self._client = _client
 
47
        else:
 
48
            self._client = git.client.TCPGitClient(self._host, self._port)
57
49
 
58
50
    def fetch_pack(self, determine_wants, graph_walker, pack_data, progress=None):
59
51
        if progress is None:
60
52
            def progress(text):
61
53
                info("git: %s" % text)
62
 
        self._get_client().fetch_pack(self._path, determine_wants, 
63
 
            graph_walker, pack_data, progress)
 
54
        self._client.fetch_pack(self._path, determine_wants, graph_walker, 
 
55
                pack_data, progress)
 
56
 
 
57
    def fetch_objects(self, determine_wants, graph_walker, progress=None):
 
58
        fd, path = tempfile.mkstemp(dir=self.pack_dir(), suffix=".pack")
 
59
        self.fetch_pack(determine_wants, graph_walker, lambda x: os.write(fd, x), progress)
 
60
        os.close(fd)
 
61
        try:
 
62
            p = PackData(path)
 
63
            for o in p.iterobjects():
 
64
                yield o
 
65
        finally:
 
66
            os.remove(path)
64
67
 
65
68
    def get(self, path):
66
69
        raise NoSuchFile(path)
67
70
 
68
 
    def abspath(self, relpath):
69
 
        return urlutils.join(self.base, relpath)
70
 
 
71
71
    def clone(self, offset=None):
72
72
        """See Transport.clone()."""
73
73
        if offset is None:
78
78
        return GitSmartTransport(newurl, self._client)
79
79
 
80
80
 
81
 
class RemoteGitDir(GitDir):
 
81
class RemoteGitDir(BzrDir):
82
82
 
83
83
    def __init__(self, transport, lockfiles, format):
84
84
        self._format = format
86
86
        self.transport = transport
87
87
        self._lockfiles = lockfiles
88
88
 
 
89
    def is_supported(self):
 
90
        return True
 
91
 
89
92
    def open_repository(self):
90
93
        return RemoteGitRepository(self, self._lockfiles)
91
94
 
97
100
    def open_workingtree(self):
98
101
        raise NotLocalUrl(self.transport.base)
99
102
 
 
103
    def cloning_metadir(self, stacked=False):
 
104
        """Produce a metadir suitable for cloning with."""
 
105
        if stacked:
 
106
            return bzrlib.bzrdir.format_registry.make_bzrdir("1.6.1-rich-root")
 
107
        else:
 
108
            return bzrlib.bzrdir.format_registry.make_bzrdir("rich-root-pack")
 
109
 
100
110
 
101
111
class RemoteGitRepository(GitRepository):
102
112
 
103
113
    def __init__(self, gitdir, lockfiles):
104
114
        GitRepository.__init__(self, gitdir, lockfiles)
105
115
 
106
 
    def fetch_pack(self, determine_wants, graph_walker, pack_data, 
107
 
                   progress=None):
108
 
        self._transport.fetch_pack(determine_wants, graph_walker, pack_data, 
109
 
            progress)
110
 
 
111
 
    def fetch_objects(self, determine_wants, graph_walker, progress=None):
112
 
        fd, path = tempfile.mkstemp(suffix=".pack")
113
 
        self.fetch_pack(determine_wants, graph_walker, lambda x: os.write(fd, x), progress)
114
 
        os.close(fd)
115
 
        try:
116
 
            basename = path[:-len(".pack")]
117
 
            p = PackData(path)
118
 
            p.create_index_v2(basename+".idx")
119
 
            for o in Pack(basename).iterobjects():
120
 
                yield o
121
 
        finally:
122
 
            os.remove(path)
 
116
    def fetch_pack(self, determine_wants, graph_walker, pack_data, progress=None):
 
117
        self._transport.fetch_pack(determine_wants, graph_walker, pack_data, progress)
123
118
 
124
119
 
125
120
class RemoteGitBranch(GitBranch):
126
121
 
127
122
    def __init__(self, bzrdir, repository, name, lockfiles):
128
123
        def determine_wants(heads):
129
 
            if not name in heads:
130
 
                raise NoSuchRef(name)
131
124
            self._ref = heads[name]
132
125
        bzrdir.root_transport.fetch_pack(determine_wants, None, lambda x: None, 
133
126
                             lambda x: mutter("git: %s" % x))
136
129
    def last_revision(self):
137
130
        return self.mapping.revision_id_foreign_to_bzr(self._ref)
138
131
 
139
 
    def _synchronize_history(self, destination, revision_id):
140
 
        """See Branch._synchronize_history()."""
141
 
        destination.generate_revision_history(self.last_revision())
142
 
 
 
132
 
 
133