/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to brzlib/foreign.py

  • Committer: Jelmer Vernooij
  • Date: 2017-05-21 12:41:27 UTC
  • mto: This revision was merged to the branch mainline in revision 6623.
  • Revision ID: jelmer@jelmer.uk-20170521124127-iv8etg0vwymyai6y
s/bzr/brz/ in apport config.

Show diffs side-by-side

added added

removed removed

Lines of Context:
brzlib/foreign.py
16
16
 
17
17
"""Foreign branch utilities."""
18
18
 
19
 
from .branch import (
 
19
from __future__ import absolute_import
 
20
 
 
21
 
 
22
from brzlib.branch import (
20
23
    Branch,
21
24
    )
22
 
from .repository import Repository
23
 
from .revision import Revision
24
 
from . import (
 
25
from brzlib.commands import Command, Option
 
26
from brzlib.repository import Repository
 
27
from brzlib.revision import Revision
 
28
from brzlib.lazy_import import lazy_import
 
29
lazy_import(globals(), """
 
30
from brzlib import (
25
31
    errors,
26
32
    registry,
 
33
    transform,
27
34
    )
28
 
 
 
35
from brzlib.i18n import gettext
 
36
""")
29
37
 
30
38
class VcsMapping(object):
31
39
    """Describes the mapping between the semantics of Bazaar and a foreign VCS.
77
85
        The factory must be a callable that takes one parameter: the key.
78
86
        It must produce an instance of VcsMapping when called.
79
87
        """
80
 
        if b":" in key:
 
88
        if ":" in key:
81
89
            raise ValueError("mapping name can not contain colon (:)")
82
90
        registry.Registry.register(self, key, factory, help)
83
91
 
104
112
    """
105
113
 
106
114
    def __init__(self, foreign_revid, mapping, *args, **kwargs):
107
 
        if "inventory_sha1" not in kwargs:
108
 
            kwargs["inventory_sha1"] = b""
 
115
        if not "inventory_sha1" in kwargs:
 
116
            kwargs["inventory_sha1"] = ""
109
117
        super(ForeignRevision, self).__init__(*args, **kwargs)
110
118
        self.foreign_revid = foreign_revid
111
119
        self.mapping = mapping
133
141
        :param foreign_revid: Foreign revision id.
134
142
        :return: Dictionary mapping string keys to string values.
135
143
        """
136
 
        return {}
 
144
        return { }
137
145
 
138
146
    def serialize_foreign_revid(self, foreign_revid):
139
147
        """Serialize a foreign revision id for this VCS.
140
148
 
141
149
        :param foreign_revid: Foreign revision id
142
 
        :return: Bytestring with serialized revid, will not contain any
 
150
        :return: Bytestring with serialized revid, will not contain any 
143
151
            newlines.
144
152
        """
145
153
        raise NotImplementedError(self.serialize_foreign_revid)
171
179
        :param revid: The bzr revision id
172
180
        :return: tuple with foreign revid and vcs mapping
173
181
        """
174
 
        if b":" not in revid or b"-" not in revid:
 
182
        if not ":" in revid or not "-" in revid:
175
183
            raise errors.InvalidRevisionId(revid, None)
176
184
        try:
177
 
            foreign_vcs = self.get(revid.split(b"-")[0].decode('ascii'))
 
185
            foreign_vcs = self.get(revid.split("-")[0])
178
186
        except KeyError:
179
187
            raise errors.InvalidRevisionId(revid, None)
180
188
        return foreign_vcs.mapping_registry.revision_id_bzr_to_foreign(revid)
224
232
    def __init__(self, mapping):
225
233
        self.mapping = mapping
226
234
        super(ForeignBranch, self).__init__()
 
235
 
 
236
 
 
237
def update_workingtree_fileids(wt, target_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
    """
 
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
 
 
261
class cmd_dpush(Command):
 
262
    __doc__ = """Push into a different VCS without any custom bzr metadata.
 
263
 
 
264
    This will afterwards rebase the local branch on the remote
 
265
    branch unless the --no-rebase option is used, in which case 
 
266
    the two branches will be out of sync after the push. 
 
267
    """
 
268
    takes_args = ['location?']
 
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
        ]
 
282
 
 
283
    def run(self, location=None, remember=False, directory=None,
 
284
            no_rebase=False, strict=None):
 
285
        from brzlib import urlutils
 
286
        from brzlib.controldir import ControlDir
 
287
        from brzlib.errors import BzrCommandError, NoWorkingTree
 
288
        from brzlib.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:
 
296
            source_branch = Branch.open(directory)
 
297
            source_wt = None
 
298
        if source_wt is not None:
 
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.')
 
303
        stored_loc = source_branch.get_push_location()
 
304
        if location is None:
 
305
            if stored_loc is None:
 
306
                raise BzrCommandError(gettext("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(
 
311
                       gettext("Using saved location: %s\n") % display_url)
 
312
                location = stored_loc
 
313
 
 
314
        controldir = ControlDir.open(location)
 
315
        target_branch = controldir.open_branch()
 
316
        target_branch.lock_write()
 
317
        try:
 
318
            try:
 
319
                push_result = source_branch.push(target_branch, lossy=True)
 
320
            except errors.LossyPushToSameVCS:
 
321
                raise BzrCommandError(gettext("{0!r} and {1!r} are in the same VCS, lossy "
 
322
                    "push not necessary. Please use regular push.").format(
 
323
                    source_branch, target_branch))
 
324
            # We successfully created the target, remember it
 
325
            if source_branch.get_push_location() is None or remember:
 
326
                # FIXME: Should be done only if we succeed ? -- vila 2012-01-18
 
327
                source_branch.set_push_location(target_branch.base)
 
328
            if not no_rebase:
 
329
                old_last_revid = source_branch.last_revision()
 
330
                source_branch.pull(target_branch, overwrite=True)
 
331
                new_last_revid = source_branch.last_revision()
 
332
                if source_wt is not None and old_last_revid != new_last_revid:
 
333
                    source_wt.lock_write()
 
334
                    try:
 
335
                        target = source_wt.branch.repository.revision_tree(
 
336
                            new_last_revid)
 
337
                        update_workingtree_fileids(source_wt, target)
 
338
                    finally:
 
339
                        source_wt.unlock()
 
340
            push_result.report(self.outf)
 
341
        finally:
 
342
            target_branch.unlock()