~bzr-pqm/bzr/bzr.dev

4988.10.3 by John Arbash Meinel
Merge bzr.dev 5007, resolve conflict, update NEWS
1
# Copyright (C) 2008, 2009, 2010 Canonical Ltd
3830.4.1 by Jelmer Vernooij
Add base classes for foreign branches.
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
4183.7.1 by Sabin Iacob
update FSF mailing address
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 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
4347.2.1 by Jelmer Vernooij
Move dpush onto an InterBranch object.
21
from bzrlib.branch import (
22
    Branch,
23
    InterBranch,
24
    )
3830.4.1 by Jelmer Vernooij
Add base classes for foreign branches.
25
from bzrlib.commands import Command, Option
3918.2.2 by Martin Pool
Add import statement
26
from bzrlib.repository import Repository
3830.4.1 by Jelmer Vernooij
Add base classes for foreign branches.
27
from bzrlib.revision import Revision
28
from bzrlib.lazy_import import lazy_import
29
lazy_import(globals(), """
30
from bzrlib import (
31
    errors,
3878.5.1 by Jelmer Vernooij
Add a ForeignRepository base class.
32
    osutils,
3830.4.1 by Jelmer Vernooij
Add base classes for foreign branches.
33
    registry,
4285.3.1 by Aaron Bentley
Implement dpush via sexy APIs
34
    transform,
3830.4.1 by Jelmer Vernooij
Add base classes for foreign branches.
35
    )
36
""")
37
38
class VcsMapping(object):
4585.1.7 by Jelmer Vernooij
Use scenarios and adapters.
39
    """Describes the mapping between the semantics of Bazaar and a foreign VCS.
3830.4.1 by Jelmer Vernooij
Add base classes for foreign branches.
40
41
    """
42
    # Whether this is an experimental mapping that is still open to changes.
43
    experimental = False
44
45
    # Whether this mapping supports exporting and importing all bzr semantics.
46
    roundtripping = False
47
4531.2.1 by Samuel Bronson
Clarify comment about bzrlib.foreign.VcsMapping's variable revid_prefix.
48
    # Prefix used when importing revisions native to the foreign VCS (as
49
    # opposed to roundtripping bzr-native revisions) using this mapping.
3830.4.1 by Jelmer Vernooij
Add base classes for foreign branches.
50
    revid_prefix = None
51
3949.5.1 by Jelmer Vernooij
Move ForeignVcsMapping.show_foreign_revid to ForeignVcs.
52
    def __init__(self, vcs):
53
        """Create a new VcsMapping.
54
55
        :param vcs: VCS that this mapping maps to Bazaar
56
        """
57
        self.vcs = vcs
58
3830.4.1 by Jelmer Vernooij
Add base classes for foreign branches.
59
    def revision_id_bzr_to_foreign(self, bzr_revid):
60
        """Parse a bzr revision id and convert it to a foreign revid.
61
62
        :param bzr_revid: The bzr revision id (a string).
63
        :return: A foreign revision id, can be any sort of object.
64
        """
65
        raise NotImplementedError(self.revision_id_bzr_to_foreign)
66
67
    def revision_id_foreign_to_bzr(self, foreign_revid):
68
        """Parse a foreign revision id and convert it to a bzr revid.
69
70
        :param foreign_revid: Foreign revision id, can be any sort of object.
71
        :return: A bzr revision id.
72
        """
73
        raise NotImplementedError(self.revision_id_foreign_to_bzr)
74
75
76
class VcsMappingRegistry(registry.Registry):
77
    """Registry for Bazaar<->foreign VCS mappings.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
78
3830.4.1 by Jelmer Vernooij
Add base classes for foreign branches.
79
    There should be one instance of this registry for every foreign VCS.
80
    """
81
82
    def register(self, key, factory, help):
83
        """Register a mapping between Bazaar and foreign VCS semantics.
84
85
        The factory must be a callable that takes one parameter: the key.
86
        It must produce an instance of VcsMapping when called.
87
        """
88
        if ":" in key:
89
            raise ValueError("mapping name can not contain colon (:)")
90
        registry.Registry.register(self, key, factory, help)
91
92
    def set_default(self, key):
93
        """Set the 'default' key to be a clone of the supplied key.
94
95
        This method must be called once and only once.
96
        """
97
        self._set_default_key(key)
98
99
    def get_default(self):
100
        """Convenience function for obtaining the default mapping to use."""
101
        return self.get(self._get_default_key())
102
103
    def revision_id_bzr_to_foreign(self, revid):
104
        """Convert a bzr revision id to a foreign revid."""
105
        raise NotImplementedError(self.revision_id_bzr_to_foreign)
106
107
108
class ForeignRevision(Revision):
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
109
    """A Revision from a Foreign repository. Remembers
3830.4.1 by Jelmer Vernooij
Add base classes for foreign branches.
110
    information about foreign revision id and mapping.
111
112
    """
113
114
    def __init__(self, foreign_revid, mapping, *args, **kwargs):
3830.4.4 by Jelmer Vernooij
make inventory_sha1 default to an empty string.
115
        if not "inventory_sha1" in kwargs:
116
            kwargs["inventory_sha1"] = ""
3830.4.1 by Jelmer Vernooij
Add base classes for foreign branches.
117
        super(ForeignRevision, self).__init__(*args, **kwargs)
118
        self.foreign_revid = foreign_revid
119
        self.mapping = mapping
120
121
122
class ForeignVcs(object):
123
    """A foreign version control system."""
124
4585.1.10 by Jelmer Vernooij
Store only a single branch format per foreign VCS (for now).
125
    branch_format = None
4585.1.8 by Jelmer Vernooij
Make branch formats provide a factory for particular situations.
126
4585.1.11 by Jelmer Vernooij
Add tests for foreign repository formats.
127
    repository_format = None
128
4747.2.1 by Jelmer Vernooij
Allow specifying an abbreviation for foreign vcs'es and an optional function to serialize foreign revision ids.
129
    def __init__(self, mapping_registry, abbreviation=None):
130
        """Create a new foreign vcs instance.
131
132
        :param mapping_registry: Registry with mappings for this VCS.
133
        :param abbreviation: Optional abbreviation ('bzr', 'svn', 'git', etc)
134
        """
135
        self.abbreviation = abbreviation
3830.4.1 by Jelmer Vernooij
Add base classes for foreign branches.
136
        self.mapping_registry = mapping_registry
137
3949.5.1 by Jelmer Vernooij
Move ForeignVcsMapping.show_foreign_revid to ForeignVcs.
138
    def show_foreign_revid(self, foreign_revid):
139
        """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.
140
3949.5.1 by Jelmer Vernooij
Move ForeignVcsMapping.show_foreign_revid to ForeignVcs.
141
        :param foreign_revid: Foreign revision id.
142
        :return: Dictionary mapping string keys to string values.
143
        """
144
        return { }
145
4747.2.1 by Jelmer Vernooij
Allow specifying an abbreviation for foreign vcs'es and an optional function to serialize foreign revision ids.
146
    def serialize_foreign_revid(self, foreign_revid):
147
        """Serialize a foreign revision id for this VCS.
148
149
        :param foreign_revid: Foreign revision id
150
        :return: Bytestring with serialized revid, will not contain any 
151
            newlines.
152
        """
153
        raise NotImplementedError(self.serialize_foreign_revid)
154
3830.4.1 by Jelmer Vernooij
Add base classes for foreign branches.
155
156
class ForeignVcsRegistry(registry.Registry):
157
    """Registry for Foreign VCSes.
158
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
159
    There should be one entry per foreign VCS. Example entries would be
3830.4.1 by Jelmer Vernooij
Add base classes for foreign branches.
160
    "git", "svn", "hg", "darcs", etc.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
161
3830.4.1 by Jelmer Vernooij
Add base classes for foreign branches.
162
    """
163
164
    def register(self, key, foreign_vcs, help):
165
        """Register a foreign VCS.
166
167
        :param key: Prefix of the foreign VCS in revision ids
168
        :param foreign_vcs: ForeignVCS instance
169
        :param help: Description of the foreign VCS
170
        """
171
        if ":" in key or "-" in key:
172
            raise ValueError("vcs name can not contain : or -")
173
        registry.Registry.register(self, key, foreign_vcs, help)
174
175
    def parse_revision_id(self, revid):
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
176
        """Parse a bzr revision and return the matching mapping and foreign
3830.4.1 by Jelmer Vernooij
Add base classes for foreign branches.
177
        revid.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
178
3830.4.1 by Jelmer Vernooij
Add base classes for foreign branches.
179
        :param revid: The bzr revision id
180
        :return: tuple with foreign revid and vcs mapping
181
        """
4393.1.1 by Jelmer Vernooij
Check for : in foreign revids early.
182
        if not ":" in revid or not "-" in revid:
3830.4.1 by Jelmer Vernooij
Add base classes for foreign branches.
183
            raise errors.InvalidRevisionId(revid, None)
184
        try:
185
            foreign_vcs = self.get(revid.split("-")[0])
186
        except KeyError:
187
            raise errors.InvalidRevisionId(revid, None)
188
        return foreign_vcs.mapping_registry.revision_id_bzr_to_foreign(revid)
189
190
191
foreign_vcs_registry = ForeignVcsRegistry()
3878.5.1 by Jelmer Vernooij
Add a ForeignRepository base class.
192
193
194
class ForeignRepository(Repository):
195
    """A Repository that exists in a foreign version control system.
196
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
197
    The data in this repository can not be represented natively using
3878.5.1 by Jelmer Vernooij
Add a ForeignRepository base class.
198
    Bazaars internal datastructures, but have to converted using a VcsMapping.
199
    """
200
201
    # This repository's native version control system
202
    vcs = None
203
204
    def has_foreign_revision(self, foreign_revid):
205
        """Check whether the specified foreign revision is present.
206
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
207
        :param foreign_revid: A foreign revision id, in the format used
3878.5.1 by Jelmer Vernooij
Add a ForeignRepository base class.
208
                              by this Repository's VCS.
209
        """
210
        raise NotImplementedError(self.has_foreign_revision)
211
212
    def lookup_bzr_revision_id(self, revid):
213
        """Lookup a mapped or roundtripped revision by revision id.
214
215
        :param revid: Bazaar revision id
216
        :return: Tuple with foreign revision id and mapping.
217
        """
218
        raise NotImplementedError(self.lookup_revision_id)
219
220
    def all_revision_ids(self, mapping=None):
221
        """See Repository.all_revision_ids()."""
222
        raise NotImplementedError(self.all_revision_ids)
223
224
    def get_default_mapping(self):
225
        """Get the default mapping for this repository."""
226
        raise NotImplementedError(self.get_default_mapping)
227
228
3920.2.1 by Jelmer Vernooij
Add ForeignBranch class.
229
class ForeignBranch(Branch):
230
    """Branch that exists in a foreign version control system."""
231
232
    def __init__(self, mapping):
233
        self.mapping = mapping
234
        super(ForeignBranch, self).__init__()
235
3920.2.2 by Jelmer Vernooij
Import dpush command.
236
4285.3.1 by Aaron Bentley
Implement dpush via sexy APIs
237
def update_workingtree_fileids(wt, target_tree):
4285.3.2 by Jelmer Vernooij
Remove unused functions for updating the file ids of a tree.
238
    """Update the file ids in a working tree based on another tree.
239
240
    :param wt: Working tree in which to update file ids
241
    :param target_tree: Tree to retrieve new file ids from, based on path
242
    """
4285.3.1 by Aaron Bentley
Implement dpush via sexy APIs
243
    tt = transform.TreeTransform(wt)
244
    try:
245
        for f, p, c, v, d, n, k, e in target_tree.iter_changes(wt):
246
            if v == (True, False):
247
                trans_id = tt.trans_id_tree_path(p[0])
248
                tt.unversion_file(trans_id)
249
            elif v == (False, True):
250
                trans_id = tt.trans_id_tree_path(p[1])
251
                tt.version_file(f, trans_id)
252
        tt.apply()
253
    finally:
254
        tt.finalize()
255
    if len(wt.get_parent_ids()) == 1:
256
        wt.set_parent_trees([(target_tree.get_revision_id(), target_tree)])
257
    else:
258
        wt.set_last_revision(target_tree.get_revision_id())
259
260
3920.2.2 by Jelmer Vernooij
Import dpush command.
261
class cmd_dpush(Command):
4368.2.1 by Jelmer Vernooij
make dpush help and output reflect that dpush is not possible between branches
262
    """Push into a different VCS without any custom bzr metadata.
3920.2.2 by Jelmer Vernooij
Import dpush command.
263
4368.2.1 by Jelmer Vernooij
make dpush help and output reflect that dpush is not possible between branches
264
    This will afterwards rebase the local branch on the remote
3920.2.2 by Jelmer Vernooij
Import dpush command.
265
    branch unless the --no-rebase option is used, in which case 
4347.2.4 by Jelmer Vernooij
Fix one-line summary for dpush.
266
    the two branches will be out of sync after the push. 
3920.2.2 by Jelmer Vernooij
Import dpush command.
267
    """
3920.2.30 by Jelmer Vernooij
Review from John.
268
    hidden = True
3920.2.2 by Jelmer Vernooij
Import dpush command.
269
    takes_args = ['location?']
4721.2.2 by Vincent Ladeuil
Start testing and implementing --strict for dpush.
270
    takes_options = [
271
        'remember',
272
        Option('directory',
273
               help='Branch to push from, '
274
               'rather than the one containing the working directory.',
275
               short_name='d',
276
               type=unicode,
277
               ),
278
        Option('no-rebase', help="Do not rebase after push."),
279
        Option('strict',
280
               help='Refuse to push if there are uncommitted changes in'
281
               ' the working tree, --no-strict disables the check.'),
282
        ]
3920.2.2 by Jelmer Vernooij
Import dpush command.
283
4721.2.2 by Vincent Ladeuil
Start testing and implementing --strict for dpush.
284
    def run(self, location=None, remember=False, directory=None,
285
            no_rebase=False, strict=None):
3920.2.2 by Jelmer Vernooij
Import dpush command.
286
        from bzrlib import urlutils
287
        from bzrlib.bzrdir import BzrDir
288
        from bzrlib.errors import BzrCommandError, NoWorkingTree
289
        from bzrlib.workingtree import WorkingTree
290
291
        if directory is None:
292
            directory = "."
293
        try:
294
            source_wt = WorkingTree.open_containing(directory)[0]
295
            source_branch = source_wt.branch
296
        except NoWorkingTree:
3920.2.30 by Jelmer Vernooij
Review from John.
297
            source_branch = Branch.open(directory)
3920.2.2 by Jelmer Vernooij
Import dpush command.
298
            source_wt = None
4721.2.3 by Vincent Ladeuil
Make all test pass by implement --strict for dpush.
299
        if strict is None:
300
            strict = source_branch.get_config(
301
                ).get_user_option_as_bool('dpush_strict')
302
        if strict is None: strict = True # default value
303
        if strict and source_wt is not None:
4721.3.2 by Vincent Ladeuil
Simplify mutable_tree.has_changes() and update call sites.
304
            if (source_wt.has_changes()):
4721.2.3 by Vincent Ladeuil
Make all test pass by implement --strict for dpush.
305
                raise errors.UncommittedChanges(
306
                    source_wt, more='Use --no-strict to force the push.')
307
            if source_wt.last_revision() != source_wt.branch.last_revision():
308
                # The tree has lost sync with its branch, there is little
309
                # chance that the user is aware of it but he can still force
310
                # the push with --no-strict
311
                raise errors.OutOfDateTree(
312
                    source_wt, more='Use --no-strict to force the push.')
3920.2.2 by Jelmer Vernooij
Import dpush command.
313
        stored_loc = source_branch.get_push_location()
314
        if location is None:
315
            if stored_loc is None:
316
                raise BzrCommandError("No push location known or specified.")
317
            else:
318
                display_url = urlutils.unescape_for_display(stored_loc,
319
                        self.outf.encoding)
320
                self.outf.write("Using saved location: %s\n" % display_url)
321
                location = stored_loc
322
323
        bzrdir = BzrDir.open(location)
324
        target_branch = bzrdir.open_branch()
325
        target_branch.lock_write()
326
        try:
4347.2.3 by Jelmer Vernooij
Clarify name for LossyPushToSameVCS exception.
327
            try:
4347.3.1 by Jelmer Vernooij
Return BranchPushResult instance from lossy_push() and make dpush print
328
                push_result = source_branch.lossy_push(target_branch)
4347.2.3 by Jelmer Vernooij
Clarify name for LossyPushToSameVCS exception.
329
            except errors.LossyPushToSameVCS:
4368.2.1 by Jelmer Vernooij
make dpush help and output reflect that dpush is not possible between branches
330
                raise BzrCommandError("%r and %r are in the same VCS, lossy "
4368.2.2 by Jelmer Vernooij
s/not possible/not necessary/.
331
                    "push not necessary. Please use regular push." %
4368.2.1 by Jelmer Vernooij
make dpush help and output reflect that dpush is not possible between branches
332
                    (source_branch, target_branch))
3920.2.2 by Jelmer Vernooij
Import dpush command.
333
            # We successfully created the target, remember it
334
            if source_branch.get_push_location() is None or remember:
335
                source_branch.set_push_location(target_branch.base)
336
            if not no_rebase:
3920.2.36 by Jelmer Vernooij
Fix tests after CommitBuilder changes.
337
                old_last_revid = source_branch.last_revision()
3920.2.30 by Jelmer Vernooij
Review from John.
338
                source_branch.pull(target_branch, overwrite=True)
3920.2.36 by Jelmer Vernooij
Fix tests after CommitBuilder changes.
339
                new_last_revid = source_branch.last_revision()
3920.3.1 by Jelmer Vernooij
Skip tree changing if nothing changed.
340
                if source_wt is not None and old_last_revid != new_last_revid:
3920.2.2 by Jelmer Vernooij
Import dpush command.
341
                    source_wt.lock_write()
342
                    try:
4285.3.1 by Aaron Bentley
Implement dpush via sexy APIs
343
                        target = source_wt.branch.repository.revision_tree(
344
                            new_last_revid)
345
                        update_workingtree_fileids(source_wt, target)
3920.2.2 by Jelmer Vernooij
Import dpush command.
346
                    finally:
347
                        source_wt.unlock()
4347.3.1 by Jelmer Vernooij
Return BranchPushResult instance from lossy_push() and make dpush print
348
            push_result.report(self.outf)
3920.2.2 by Jelmer Vernooij
Import dpush command.
349
        finally:
350
            target_branch.unlock()
4347.2.1 by Jelmer Vernooij
Move dpush onto an InterBranch object.
351
352
353
class InterToForeignBranch(InterBranch):
354
4347.2.2 by Jelmer Vernooij
Rename dpush to lossy_push.
355
    def lossy_push(self, stop_revision=None):
356
        """Push deltas into another branch.
4347.2.1 by Jelmer Vernooij
Move dpush onto an InterBranch object.
357
358
        :note: This does not, like push, retain the revision ids from 
359
            the source branch and will, rather than adding bzr-specific 
360
            metadata, push only those semantics of the revision that can be 
361
            natively represented by this branch' VCS.
362
363
        :param target: Target branch
364
        :param stop_revision: Revision to push, defaults to last revision.
4347.3.1 by Jelmer Vernooij
Return BranchPushResult instance from lossy_push() and make dpush print
365
        :return: BranchPushResult with an extra member revidmap: 
366
            A dictionary mapping revision ids from the target branch 
4347.2.1 by Jelmer Vernooij
Move dpush onto an InterBranch object.
367
            to new revision ids in the target branch, for each 
368
            revision that was pushed.
369
        """
4347.2.2 by Jelmer Vernooij
Rename dpush to lossy_push.
370
        raise NotImplementedError(self.lossy_push)