/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
3830.4.1 by Jelmer Vernooij
Add base classes for foreign branches.
1
# Copyright (C) 2008 Canonical Ltd
2
#
3
# This program is free software; you can redistribute it and/or modify
4
# it under the terms of the GNU General Public License as published by
5
# the Free Software Foundation; either version 2 of the License, or
6
# (at your option) any later version.
7
#
8
# This program is distributed in the hope that it will be useful,
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
11
# GNU General Public License for more details.
12
#
13
# You should have received a copy of the GNU General Public License
14
# along with this program; if not, write to the Free Software
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
3918.2.2 by Martin Pool
Add import statement
16
17
3830.4.1 by Jelmer Vernooij
Add base classes for foreign branches.
18
"""Foreign branch utilities."""
19
3918.2.2 by Martin Pool
Add import statement
20
3830.4.1 by Jelmer Vernooij
Add base classes for foreign branches.
21
from bzrlib.branch import Branch
22
from bzrlib.commands import Command, Option
3918.2.2 by Martin Pool
Add import statement
23
from bzrlib.repository import Repository
3830.4.1 by Jelmer Vernooij
Add base classes for foreign branches.
24
from bzrlib.revision import Revision
25
from bzrlib.lazy_import import lazy_import
26
lazy_import(globals(), """
27
from bzrlib import (
28
    errors,
3878.5.1 by Jelmer Vernooij
Add a ForeignRepository base class.
29
    osutils,
3830.4.1 by Jelmer Vernooij
Add base classes for foreign branches.
30
    registry,
31
    )
32
""")
33
34
class VcsMapping(object):
35
    """Describes the mapping between the semantics of Bazaar and a foreign vcs.
36
37
    """
38
    # Whether this is an experimental mapping that is still open to changes.
39
    experimental = False
40
41
    # Whether this mapping supports exporting and importing all bzr semantics.
42
    roundtripping = False
43
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
44
    # Prefix used when importing native foreign revisions (not roundtripped)
3830.4.1 by Jelmer Vernooij
Add base classes for foreign branches.
45
    # using this mapping.
46
    revid_prefix = None
47
3949.5.1 by Jelmer Vernooij
Move ForeignVcsMapping.show_foreign_revid to ForeignVcs.
48
    def __init__(self, vcs):
49
        """Create a new VcsMapping.
50
51
        :param vcs: VCS that this mapping maps to Bazaar
52
        """
53
        self.vcs = vcs
54
3830.4.1 by Jelmer Vernooij
Add base classes for foreign branches.
55
    def revision_id_bzr_to_foreign(self, bzr_revid):
56
        """Parse a bzr revision id and convert it to a foreign revid.
57
58
        :param bzr_revid: The bzr revision id (a string).
59
        :return: A foreign revision id, can be any sort of object.
60
        """
61
        raise NotImplementedError(self.revision_id_bzr_to_foreign)
62
63
    def revision_id_foreign_to_bzr(self, foreign_revid):
64
        """Parse a foreign revision id and convert it to a bzr revid.
65
66
        :param foreign_revid: Foreign revision id, can be any sort of object.
67
        :return: A bzr revision id.
68
        """
69
        raise NotImplementedError(self.revision_id_foreign_to_bzr)
70
71
72
class VcsMappingRegistry(registry.Registry):
73
    """Registry for Bazaar<->foreign VCS mappings.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
74
3830.4.1 by Jelmer Vernooij
Add base classes for foreign branches.
75
    There should be one instance of this registry for every foreign VCS.
76
    """
77
78
    def register(self, key, factory, help):
79
        """Register a mapping between Bazaar and foreign VCS semantics.
80
81
        The factory must be a callable that takes one parameter: the key.
82
        It must produce an instance of VcsMapping when called.
83
        """
84
        if ":" in key:
85
            raise ValueError("mapping name can not contain colon (:)")
86
        registry.Registry.register(self, key, factory, help)
87
88
    def set_default(self, key):
89
        """Set the 'default' key to be a clone of the supplied key.
90
91
        This method must be called once and only once.
92
        """
93
        self._set_default_key(key)
94
95
    def get_default(self):
96
        """Convenience function for obtaining the default mapping to use."""
97
        return self.get(self._get_default_key())
98
99
    def revision_id_bzr_to_foreign(self, revid):
100
        """Convert a bzr revision id to a foreign revid."""
101
        raise NotImplementedError(self.revision_id_bzr_to_foreign)
102
103
104
class ForeignRevision(Revision):
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
105
    """A Revision from a Foreign repository. Remembers
3830.4.1 by Jelmer Vernooij
Add base classes for foreign branches.
106
    information about foreign revision id and mapping.
107
108
    """
109
110
    def __init__(self, foreign_revid, mapping, *args, **kwargs):
3830.4.4 by Jelmer Vernooij
make inventory_sha1 default to an empty string.
111
        if not "inventory_sha1" in kwargs:
112
            kwargs["inventory_sha1"] = ""
3830.4.1 by Jelmer Vernooij
Add base classes for foreign branches.
113
        super(ForeignRevision, self).__init__(*args, **kwargs)
114
        self.foreign_revid = foreign_revid
115
        self.mapping = mapping
116
117
118
def show_foreign_properties(rev):
119
    """Custom log displayer for foreign revision identifiers.
120
121
    :param rev: Revision object.
122
    """
123
    # Revision comes directly from a foreign repository
124
    if isinstance(rev, ForeignRevision):
3949.5.1 by Jelmer Vernooij
Move ForeignVcsMapping.show_foreign_revid to ForeignVcs.
125
        return rev.mapping.vcs.show_foreign_revid(rev.foreign_revid)
3830.4.1 by Jelmer Vernooij
Add base classes for foreign branches.
126
127
    # Revision was once imported from a foreign repository
128
    try:
129
        foreign_revid, mapping = \
130
            foreign_vcs_registry.parse_revision_id(rev.revision_id)
131
    except errors.InvalidRevisionId:
132
        return {}
133
3949.5.1 by Jelmer Vernooij
Move ForeignVcsMapping.show_foreign_revid to ForeignVcs.
134
    return mapping.vcs.show_foreign_revid(foreign_revid)
3830.4.1 by Jelmer Vernooij
Add base classes for foreign branches.
135
136
137
class ForeignVcs(object):
138
    """A foreign version control system."""
139
140
    def __init__(self, mapping_registry):
141
        self.mapping_registry = mapping_registry
142
3949.5.1 by Jelmer Vernooij
Move ForeignVcsMapping.show_foreign_revid to ForeignVcs.
143
    def show_foreign_revid(self, foreign_revid):
144
        """Prepare a foreign revision id for formatting using bzr log.
4032.1.1 by John Arbash Meinel
Merge the removal of all trailing whitespace, and resolve conflicts.
145
3949.5.1 by Jelmer Vernooij
Move ForeignVcsMapping.show_foreign_revid to ForeignVcs.
146
        :param foreign_revid: Foreign revision id.
147
        :return: Dictionary mapping string keys to string values.
148
        """
149
        return { }
150
3830.4.1 by Jelmer Vernooij
Add base classes for foreign branches.
151
152
class ForeignVcsRegistry(registry.Registry):
153
    """Registry for Foreign VCSes.
154
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
155
    There should be one entry per foreign VCS. Example entries would be
3830.4.1 by Jelmer Vernooij
Add base classes for foreign branches.
156
    "git", "svn", "hg", "darcs", etc.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
157
3830.4.1 by Jelmer Vernooij
Add base classes for foreign branches.
158
    """
159
160
    def register(self, key, foreign_vcs, help):
161
        """Register a foreign VCS.
162
163
        :param key: Prefix of the foreign VCS in revision ids
164
        :param foreign_vcs: ForeignVCS instance
165
        :param help: Description of the foreign VCS
166
        """
167
        if ":" in key or "-" in key:
168
            raise ValueError("vcs name can not contain : or -")
169
        registry.Registry.register(self, key, foreign_vcs, help)
170
171
    def parse_revision_id(self, revid):
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
172
        """Parse a bzr revision and return the matching mapping and foreign
3830.4.1 by Jelmer Vernooij
Add base classes for foreign branches.
173
        revid.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
174
3830.4.1 by Jelmer Vernooij
Add base classes for foreign branches.
175
        :param revid: The bzr revision id
176
        :return: tuple with foreign revid and vcs mapping
177
        """
178
        if not "-" in revid:
179
            raise errors.InvalidRevisionId(revid, None)
180
        try:
181
            foreign_vcs = self.get(revid.split("-")[0])
182
        except KeyError:
183
            raise errors.InvalidRevisionId(revid, None)
184
        return foreign_vcs.mapping_registry.revision_id_bzr_to_foreign(revid)
185
186
187
foreign_vcs_registry = ForeignVcsRegistry()
3878.5.1 by Jelmer Vernooij
Add a ForeignRepository base class.
188
189
190
class ForeignRepository(Repository):
191
    """A Repository that exists in a foreign version control system.
192
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
193
    The data in this repository can not be represented natively using
3878.5.1 by Jelmer Vernooij
Add a ForeignRepository base class.
194
    Bazaars internal datastructures, but have to converted using a VcsMapping.
195
    """
196
197
    # This repository's native version control system
198
    vcs = None
199
200
    def has_foreign_revision(self, foreign_revid):
201
        """Check whether the specified foreign revision is present.
202
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
203
        :param foreign_revid: A foreign revision id, in the format used
3878.5.1 by Jelmer Vernooij
Add a ForeignRepository base class.
204
                              by this Repository's VCS.
205
        """
206
        raise NotImplementedError(self.has_foreign_revision)
207
208
    def lookup_bzr_revision_id(self, revid):
209
        """Lookup a mapped or roundtripped revision by revision id.
210
211
        :param revid: Bazaar revision id
212
        :return: Tuple with foreign revision id and mapping.
213
        """
214
        raise NotImplementedError(self.lookup_revision_id)
215
216
    def all_revision_ids(self, mapping=None):
217
        """See Repository.all_revision_ids()."""
218
        raise NotImplementedError(self.all_revision_ids)
219
220
    def get_default_mapping(self):
221
        """Get the default mapping for this repository."""
222
        raise NotImplementedError(self.get_default_mapping)
223
224
    def get_inventory_xml(self, revision_id):
225
        """See Repository.get_inventory_xml()."""
226
        return self.serialise_inventory(self.get_inventory(revision_id))
227
228
    def get_inventory_sha1(self, revision_id):
229
        """Get the sha1 for the XML representation of an inventory.
230
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
231
        :param revision_id: Revision id of the inventory for which to return
3878.5.1 by Jelmer Vernooij
Add a ForeignRepository base class.
232
         the SHA1.
233
        :return: XML string
234
        """
235
236
        return osutils.sha_string(self.get_inventory_xml(revision_id))
237
238
    def get_revision_xml(self, revision_id):
239
        """Return the XML representation of a revision.
240
241
        :param revision_id: Revision for which to return the XML.
242
        :return: XML string
243
        """
244
        return self._serializer.write_revision_to_string(
245
            self.get_revision(revision_id))
246
247
3920.2.1 by Jelmer Vernooij
Add ForeignBranch class.
248
class ForeignBranch(Branch):
249
    """Branch that exists in a foreign version control system."""
250
251
    def __init__(self, mapping):
252
        self.mapping = mapping
253
        super(ForeignBranch, self).__init__()
254
255
    def dpull(self, source, stop_revision=None):
256
        """Pull deltas from another branch.
257
258
        :note: This does not, like pull, retain the revision ids from 
259
            the source branch and will, rather than adding bzr-specific 
260
            metadata, push only those semantics of the revision that can be 
261
            natively represented by this branch' VCS.
262
263
        :param source: Source branch
264
        :param stop_revision: Revision to pull, defaults to last revision.
265
        """
266
        raise NotImplementedError(self.dpull)
3920.2.2 by Jelmer Vernooij
Import dpush command.
267
268
3920.2.3 by Jelmer Vernooij
Make determine_fileid_renames() return a dictionary.
269
def determine_fileid_renames(old_inv, new_inv):
270
    """Determine the file ids based on a old and a new inventory that 
271
    are equal in content.
272
273
    :param old_inv: Old inventory
274
    :param new_inv: New inventory
275
    :return: Dictionary a (old_id, new_id) tuple for each path in the 
276
        inventories.
277
    """
278
    ret = {}
279
    if len(old_inv) != len(new_inv):
280
        raise AssertionError("Inventories are not of the same size")
281
    for old_file_id in old_inv:
282
        new_file_id = new_inv.path2id(old_inv.id2path(old_file_id))
283
        if new_file_id is None:
284
            raise AssertionError(
285
                "Unable to find %s in new inventory" % old_file_id)
3920.2.21 by Jelmer Vernooij
Just update all files ids rather than worrying about unchanged children of changed directories.
286
        ret[new_inv.id2path(new_file_id)] = (old_file_id, new_file_id)
3920.2.3 by Jelmer Vernooij
Make determine_fileid_renames() return a dictionary.
287
    return ret
288
289
290
def update_workinginv_fileids(wt, old_inv, new_inv):
3920.2.2 by Jelmer Vernooij
Import dpush command.
291
    """Update all file ids in wt according to old_tree/new_tree. 
292
293
    old_tree and new_tree should be two RevisionTree's that differ only
294
    in file ids.
295
    """
3920.2.4 by Jelmer Vernooij
Add tests for update_workinginv_fileids.
296
    fileid_renames = determine_fileid_renames(old_inv, new_inv)
3920.2.2 by Jelmer Vernooij
Import dpush command.
297
    old_fileids = []
298
    new_fileids = []
299
    new_root_id = None
300
    # Adjust file ids in working tree
3920.2.3 by Jelmer Vernooij
Make determine_fileid_renames() return a dictionary.
301
    # Sorted, so we process parents before children
3920.2.21 by Jelmer Vernooij
Just update all files ids rather than worrying about unchanged children of changed directories.
302
    for path in sorted(fileid_renames.keys()):
3920.2.2 by Jelmer Vernooij
Import dpush command.
303
        if path != "":
304
            old_fileids.append(fileid_renames[path][0])
305
            new_fileids.append((path, fileid_renames[path][1]))
306
        else:
307
            new_root_id = fileid_renames[path][1]
308
    new_fileids.reverse()
309
    wt.unversion(old_fileids)
310
    if new_root_id is not None:
311
        wt.set_root_id(new_root_id)
312
    wt.add([x[0] for x in new_fileids], [x[1] for x in new_fileids])
3920.2.4 by Jelmer Vernooij
Add tests for update_workinginv_fileids.
313
    wt.set_last_revision(new_inv.revision_id)
3920.2.2 by Jelmer Vernooij
Import dpush command.
314
315
316
class cmd_dpush(Command):
317
    """Push diffs into a foreign version control system without any 
318
    Bazaar-specific metadata.
319
320
    This will afterwards rebase the local Bazaar branch on the remote
321
    branch unless the --no-rebase option is used, in which case 
322
    the two branches will be out of sync. 
323
    """
324
    takes_args = ['location?']
325
    takes_options = ['remember', Option('directory',
326
            help='Branch to push from, '
327
                 'rather than the one containing the working directory.',
328
            short_name='d',
329
            type=unicode,
330
            ),
3920.2.14 by Jelmer Vernooij
Fix formatting of dpush help.
331
            Option('no-rebase', help="Do not rebase after push.")]
3920.2.2 by Jelmer Vernooij
Import dpush command.
332
333
    def run(self, location=None, remember=False, directory=None, 
334
            no_rebase=False):
335
        from bzrlib import urlutils
336
        from bzrlib.bzrdir import BzrDir
337
        from bzrlib.errors import BzrCommandError, NoWorkingTree
338
        from bzrlib.trace import info
339
        from bzrlib.workingtree import WorkingTree
340
341
        if directory is None:
342
            directory = "."
343
        try:
344
            source_wt = WorkingTree.open_containing(directory)[0]
345
            source_branch = source_wt.branch
346
        except NoWorkingTree:
347
            source_branch = Branch.open_containing(directory)[0]
348
            source_wt = None
349
        stored_loc = source_branch.get_push_location()
350
        if location is None:
351
            if stored_loc is None:
352
                raise BzrCommandError("No push location known or specified.")
353
            else:
354
                display_url = urlutils.unescape_for_display(stored_loc,
355
                        self.outf.encoding)
356
                self.outf.write("Using saved location: %s\n" % display_url)
357
                location = stored_loc
358
359
        bzrdir = BzrDir.open(location)
360
        target_branch = bzrdir.open_branch()
3920.2.18 by Jelmer Vernooij
make sure dpush between native branches fails.
361
        if not isinstance(target_branch, ForeignBranch):
362
            raise BzrCommandError("%r is not a foreign branch, use "
363
                                  "regular push." % target_branch)
3920.2.2 by Jelmer Vernooij
Import dpush command.
364
        target_branch.lock_write()
365
        try:
3920.2.18 by Jelmer Vernooij
make sure dpush between native branches fails.
366
            revid_map = target_branch.dpull(source_branch)
3920.2.2 by Jelmer Vernooij
Import dpush command.
367
            # We successfully created the target, remember it
368
            if source_branch.get_push_location() is None or remember:
369
                source_branch.set_push_location(target_branch.base)
370
            if not no_rebase:
371
                _, old_last_revid = source_branch.last_revision_info()
372
                new_last_revid = revid_map[old_last_revid]
373
                if source_wt is not None:
374
                    source_wt.pull(target_branch, overwrite=True, 
375
                                   stop_revision=new_last_revid)
376
                    source_wt.lock_write()
377
                    try:
3920.2.10 by Jelmer Vernooij
More work trying to implement a dummy version control system.
378
                        update_workinginv_fileids(source_wt, 
3920.2.20 by Jelmer Vernooij
Fix dpush tests.
379
                            source_wt.branch.repository.get_inventory(
3920.2.18 by Jelmer Vernooij
make sure dpush between native branches fails.
380
                                old_last_revid),
3920.2.20 by Jelmer Vernooij
Fix dpush tests.
381
                            source_wt.branch.repository.get_inventory(
3920.2.18 by Jelmer Vernooij
make sure dpush between native branches fails.
382
                                new_last_revid))
3920.2.2 by Jelmer Vernooij
Import dpush command.
383
                    finally:
384
                        source_wt.unlock()
385
                else:
386
                    source_branch.pull(target_branch, overwrite=True, 
387
                                       stop_revision=new_last_revid)
388
        finally:
389
            target_branch.unlock()
390
391