~bzr-pqm/bzr/bzr.dev

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