1
# Copyright (C) 2008 Canonical Ltd
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.
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.
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
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
18
"""Foreign branch utilities."""
21
from bzrlib.branch import (
25
from bzrlib.commands import Command, Option
26
from bzrlib.repository import Repository
27
from bzrlib.revision import Revision
28
from bzrlib.lazy_import import lazy_import
29
lazy_import(globals(), """
38
class VcsMapping(object):
39
"""Describes the mapping between the semantics of Bazaar and a foreign VCS.
42
# Whether this is an experimental mapping that is still open to changes.
45
# Whether this mapping supports exporting and importing all bzr semantics.
48
# Prefix used when importing revisions native to the foreign VCS (as
49
# opposed to roundtripping bzr-native revisions) using this mapping.
52
def __init__(self, vcs):
53
"""Create a new VcsMapping.
55
:param vcs: VCS that this mapping maps to Bazaar
59
def revision_id_bzr_to_foreign(self, bzr_revid):
60
"""Parse a bzr revision id and convert it to a foreign revid.
62
:param bzr_revid: The bzr revision id (a string).
63
:return: A foreign revision id, can be any sort of object.
65
raise NotImplementedError(self.revision_id_bzr_to_foreign)
67
def revision_id_foreign_to_bzr(self, foreign_revid):
68
"""Parse a foreign revision id and convert it to a bzr revid.
70
:param foreign_revid: Foreign revision id, can be any sort of object.
71
:return: A bzr revision id.
73
raise NotImplementedError(self.revision_id_foreign_to_bzr)
76
class VcsMappingRegistry(registry.Registry):
77
"""Registry for Bazaar<->foreign VCS mappings.
79
There should be one instance of this registry for every foreign VCS.
82
def register(self, key, factory, help):
83
"""Register a mapping between Bazaar and foreign VCS semantics.
85
The factory must be a callable that takes one parameter: the key.
86
It must produce an instance of VcsMapping when called.
89
raise ValueError("mapping name can not contain colon (:)")
90
registry.Registry.register(self, key, factory, help)
92
def set_default(self, key):
93
"""Set the 'default' key to be a clone of the supplied key.
95
This method must be called once and only once.
97
self._set_default_key(key)
99
def get_default(self):
100
"""Convenience function for obtaining the default mapping to use."""
101
return self.get(self._get_default_key())
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)
108
class ForeignRevision(Revision):
109
"""A Revision from a Foreign repository. Remembers
110
information about foreign revision id and mapping.
114
def __init__(self, foreign_revid, mapping, *args, **kwargs):
115
if not "inventory_sha1" in kwargs:
116
kwargs["inventory_sha1"] = ""
117
super(ForeignRevision, self).__init__(*args, **kwargs)
118
self.foreign_revid = foreign_revid
119
self.mapping = mapping
122
class ForeignVcs(object):
123
"""A foreign version control system."""
127
def __init__(self, mapping_registry, abbreviation=None):
128
"""Create a new foreign vcs instance.
130
:param mapping_registry: Registry with mappings for this VCS.
131
:param abbreviation: Optional abbreviation ('bzr', 'svn', 'git', etc)
133
self.abbreviation = abbreviation
134
self.mapping_registry = mapping_registry
136
def show_foreign_revid(self, foreign_revid):
137
"""Prepare a foreign revision id for formatting using bzr log.
139
:param foreign_revid: Foreign revision id.
140
:return: Dictionary mapping string keys to string values.
144
def serialize_foreign_revid(self, foreign_revid):
145
"""Serialize a foreign revision id for this VCS.
147
:param foreign_revid: Foreign revision id
148
:return: Bytestring with serialized revid, will not contain any
151
raise NotImplementedError(self.serialize_foreign_revid)
154
class ForeignVcsRegistry(registry.Registry):
155
"""Registry for Foreign VCSes.
157
There should be one entry per foreign VCS. Example entries would be
158
"git", "svn", "hg", "darcs", etc.
162
def register(self, key, foreign_vcs, help):
163
"""Register a foreign VCS.
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
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)
173
def parse_revision_id(self, revid):
174
"""Parse a bzr revision and return the matching mapping and foreign
177
:param revid: The bzr revision id
178
:return: tuple with foreign revid and vcs mapping
180
if not ":" in revid or not "-" in revid:
181
raise errors.InvalidRevisionId(revid, None)
183
foreign_vcs = self.get(revid.split("-")[0])
185
raise errors.InvalidRevisionId(revid, None)
186
return foreign_vcs.mapping_registry.revision_id_bzr_to_foreign(revid)
189
foreign_vcs_registry = ForeignVcsRegistry()
192
class ForeignRepository(Repository):
193
"""A Repository that exists in a foreign version control system.
195
The data in this repository can not be represented natively using
196
Bazaars internal datastructures, but have to converted using a VcsMapping.
199
# This repository's native version control system
202
def has_foreign_revision(self, foreign_revid):
203
"""Check whether the specified foreign revision is present.
205
:param foreign_revid: A foreign revision id, in the format used
206
by this Repository's VCS.
208
raise NotImplementedError(self.has_foreign_revision)
210
def lookup_bzr_revision_id(self, revid):
211
"""Lookup a mapped or roundtripped revision by revision id.
213
:param revid: Bazaar revision id
214
:return: Tuple with foreign revision id and mapping.
216
raise NotImplementedError(self.lookup_revision_id)
218
def all_revision_ids(self, mapping=None):
219
"""See Repository.all_revision_ids()."""
220
raise NotImplementedError(self.all_revision_ids)
222
def get_default_mapping(self):
223
"""Get the default mapping for this repository."""
224
raise NotImplementedError(self.get_default_mapping)
226
def get_inventory_xml(self, revision_id):
227
"""See Repository.get_inventory_xml()."""
228
return self.serialise_inventory(self.get_inventory(revision_id))
230
def get_inventory_sha1(self, revision_id):
231
"""Get the sha1 for the XML representation of an inventory.
233
:param revision_id: Revision id of the inventory for which to return
238
return osutils.sha_string(self.get_inventory_xml(revision_id))
240
def get_revision_xml(self, revision_id):
241
"""Return the XML representation of a revision.
243
:param revision_id: Revision for which to return the XML.
246
return self._serializer.write_revision_to_string(
247
self.get_revision(revision_id))
250
class ForeignBranch(Branch):
251
"""Branch that exists in a foreign version control system."""
253
def __init__(self, mapping):
254
self.mapping = mapping
255
super(ForeignBranch, self).__init__()
258
def update_workingtree_fileids(wt, target_tree):
259
"""Update the file ids in a working tree based on another tree.
261
:param wt: Working tree in which to update file ids
262
:param target_tree: Tree to retrieve new file ids from, based on path
264
tt = transform.TreeTransform(wt)
266
for f, p, c, v, d, n, k, e in target_tree.iter_changes(wt):
267
if v == (True, False):
268
trans_id = tt.trans_id_tree_path(p[0])
269
tt.unversion_file(trans_id)
270
elif v == (False, True):
271
trans_id = tt.trans_id_tree_path(p[1])
272
tt.version_file(f, trans_id)
276
if len(wt.get_parent_ids()) == 1:
277
wt.set_parent_trees([(target_tree.get_revision_id(), target_tree)])
279
wt.set_last_revision(target_tree.get_revision_id())
282
class cmd_dpush(Command):
283
"""Push into a different VCS without any custom bzr metadata.
285
This will afterwards rebase the local branch on the remote
286
branch unless the --no-rebase option is used, in which case
287
the two branches will be out of sync after the push.
290
takes_args = ['location?']
294
help='Branch to push from, '
295
'rather than the one containing the working directory.',
299
Option('no-rebase', help="Do not rebase after push."),
301
help='Refuse to push if there are uncommitted changes in'
302
' the working tree, --no-strict disables the check.'),
305
def run(self, location=None, remember=False, directory=None,
306
no_rebase=False, strict=None):
307
from bzrlib import urlutils
308
from bzrlib.bzrdir import BzrDir
309
from bzrlib.errors import BzrCommandError, NoWorkingTree
310
from bzrlib.workingtree import WorkingTree
312
if directory is None:
315
source_wt = WorkingTree.open_containing(directory)[0]
316
source_branch = source_wt.branch
317
except NoWorkingTree:
318
source_branch = Branch.open(directory)
321
strict = source_branch.get_config(
322
).get_user_option_as_bool('dpush_strict')
323
if strict is None: strict = True # default value
324
if strict and source_wt is not None:
325
if (source_wt.has_changes()):
326
raise errors.UncommittedChanges(
327
source_wt, more='Use --no-strict to force the push.')
328
if source_wt.last_revision() != source_wt.branch.last_revision():
329
# The tree has lost sync with its branch, there is little
330
# chance that the user is aware of it but he can still force
331
# the push with --no-strict
332
raise errors.OutOfDateTree(
333
source_wt, more='Use --no-strict to force the push.')
334
stored_loc = source_branch.get_push_location()
336
if stored_loc is None:
337
raise BzrCommandError("No push location known or specified.")
339
display_url = urlutils.unescape_for_display(stored_loc,
341
self.outf.write("Using saved location: %s\n" % display_url)
342
location = stored_loc
344
bzrdir = BzrDir.open(location)
345
target_branch = bzrdir.open_branch()
346
target_branch.lock_write()
349
push_result = source_branch.lossy_push(target_branch)
350
except errors.LossyPushToSameVCS:
351
raise BzrCommandError("%r and %r are in the same VCS, lossy "
352
"push not necessary. Please use regular push." %
353
(source_branch, target_branch))
354
# We successfully created the target, remember it
355
if source_branch.get_push_location() is None or remember:
356
source_branch.set_push_location(target_branch.base)
358
old_last_revid = source_branch.last_revision()
359
source_branch.pull(target_branch, overwrite=True)
360
new_last_revid = source_branch.last_revision()
361
if source_wt is not None and old_last_revid != new_last_revid:
362
source_wt.lock_write()
364
target = source_wt.branch.repository.revision_tree(
366
update_workingtree_fileids(source_wt, target)
369
push_result.report(self.outf)
371
target_branch.unlock()
374
class InterToForeignBranch(InterBranch):
376
def lossy_push(self, stop_revision=None):
377
"""Push deltas into another branch.
379
:note: This does not, like push, retain the revision ids from
380
the source branch and will, rather than adding bzr-specific
381
metadata, push only those semantics of the revision that can be
382
natively represented by this branch' VCS.
384
:param target: Target branch
385
:param stop_revision: Revision to push, defaults to last revision.
386
:return: BranchPushResult with an extra member revidmap:
387
A dictionary mapping revision ids from the target branch
388
to new revision ids in the target branch, for each
389
revision that was pushed.
391
raise NotImplementedError(self.lossy_push)
added
removed
bzrlib/foreign.py
