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