/brz/remove-bazaar

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