13
13
# You should have received a copy of the GNU General Public License
14
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
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
18
16
"""Foreign branch utilities."""
21
from bzrlib.branch import (
18
from bzrlib.branch import Branch
25
19
from bzrlib.commands import Command, Option
26
from bzrlib.repository import Repository
27
20
from bzrlib.revision import Revision
28
21
from bzrlib.lazy_import import lazy_import
29
22
lazy_import(globals(), """
30
23
from bzrlib import (
38
29
class VcsMapping(object):
39
"""Describes the mapping between the semantics of Bazaar and a foreign VCS.
30
"""Describes the mapping between the semantics of Bazaar and a foreign vcs.
42
33
# Whether this is an experimental mapping that is still open to changes.
119
112
self.mapping = mapping
115
def show_foreign_properties(rev):
116
"""Custom log displayer for foreign revision identifiers.
118
:param rev: Revision object.
120
# Revision comes directly from a foreign repository
121
if isinstance(rev, ForeignRevision):
122
return rev.mapping.show_foreign_revid(rev.foreign_revid)
124
# Revision was once imported from a foreign repository
126
foreign_revid, mapping = \
127
foreign_vcs_registry.parse_revision_id(rev.revision_id)
128
except errors.InvalidRevisionId:
131
return mapping.show_foreign_revid(foreign_revid)
122
134
class ForeignVcs(object):
123
135
"""A foreign version control system."""
127
repository_format = None
129
def __init__(self, mapping_registry, abbreviation=None):
130
"""Create a new foreign vcs instance.
132
:param mapping_registry: Registry with mappings for this VCS.
133
:param abbreviation: Optional abbreviation ('bzr', 'svn', 'git', etc)
135
self.abbreviation = abbreviation
137
def __init__(self, mapping_registry):
136
138
self.mapping_registry = mapping_registry
138
def show_foreign_revid(self, foreign_revid):
139
"""Prepare a foreign revision id for formatting using bzr log.
141
:param foreign_revid: Foreign revision id.
142
:return: Dictionary mapping string keys to string values.
146
def serialize_foreign_revid(self, foreign_revid):
147
"""Serialize a foreign revision id for this VCS.
149
:param foreign_revid: Foreign revision id
150
:return: Bytestring with serialized revid, will not contain any
153
raise NotImplementedError(self.serialize_foreign_revid)
156
141
class ForeignVcsRegistry(registry.Registry):
157
142
"""Registry for Foreign VCSes.
159
There should be one entry per foreign VCS. Example entries would be
144
There should be one entry per foreign VCS. Example entries would be
160
145
"git", "svn", "hg", "darcs", etc.
164
149
def register(self, key, foreign_vcs, help):
191
176
foreign_vcs_registry = ForeignVcsRegistry()
194
class ForeignRepository(Repository):
195
"""A Repository that exists in a foreign version control system.
197
The data in this repository can not be represented natively using
198
Bazaars internal datastructures, but have to converted using a VcsMapping.
201
# This repository's native version control system
204
def has_foreign_revision(self, foreign_revid):
205
"""Check whether the specified foreign revision is present.
207
:param foreign_revid: A foreign revision id, in the format used
208
by this Repository's VCS.
210
raise NotImplementedError(self.has_foreign_revision)
212
def lookup_bzr_revision_id(self, revid):
213
"""Lookup a mapped or roundtripped revision by revision id.
215
:param revid: Bazaar revision id
216
:return: Tuple with foreign revision id and mapping.
218
raise NotImplementedError(self.lookup_revision_id)
220
def all_revision_ids(self, mapping=None):
221
"""See Repository.all_revision_ids()."""
222
raise NotImplementedError(self.all_revision_ids)
224
def get_default_mapping(self):
225
"""Get the default mapping for this repository."""
226
raise NotImplementedError(self.get_default_mapping)
229
class ForeignBranch(Branch):
230
"""Branch that exists in a foreign version control system."""
232
def __init__(self, mapping):
233
self.mapping = mapping
234
super(ForeignBranch, self).__init__()
237
def update_workingtree_fileids(wt, target_tree):
238
"""Update the file ids in a working tree based on another tree.
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
243
tt = transform.TreeTransform(wt)
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)
255
if len(wt.get_parent_ids()) == 1:
256
wt.set_parent_trees([(target_tree.get_revision_id(), target_tree)])
258
wt.set_last_revision(target_tree.get_revision_id())
261
class cmd_dpush(Command):
262
__doc__ = """Push into a different VCS without any custom bzr metadata.
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.
269
takes_args = ['location?']
273
help='Branch to push from, '
274
'rather than the one containing the working directory.',
278
Option('no-rebase', help="Do not rebase after push."),
280
help='Refuse to push if there are uncommitted changes in'
281
' the working tree, --no-strict disables the check.'),
284
def run(self, location=None, remember=False, directory=None,
285
no_rebase=False, strict=None):
286
from bzrlib import urlutils
287
from bzrlib.bzrdir import BzrDir
288
from bzrlib.errors import BzrCommandError, NoWorkingTree
289
from bzrlib.workingtree import WorkingTree
291
if directory is None:
294
source_wt = WorkingTree.open_containing(directory)[0]
295
source_branch = source_wt.branch
296
except NoWorkingTree:
297
source_branch = Branch.open(directory)
299
if source_wt is not None:
300
source_wt.check_changed_or_out_of_date(
301
strict, 'dpush_strict',
302
more_error='Use --no-strict to force the push.',
303
more_warning='Uncommitted changes will not be pushed.')
304
stored_loc = source_branch.get_push_location()
306
if stored_loc is None:
307
raise BzrCommandError("No push location known or specified.")
309
display_url = urlutils.unescape_for_display(stored_loc,
311
self.outf.write("Using saved location: %s\n" % display_url)
312
location = stored_loc
314
bzrdir = BzrDir.open(location)
315
target_branch = bzrdir.open_branch()
316
target_branch.lock_write()
319
push_result = source_branch.lossy_push(target_branch)
320
except errors.LossyPushToSameVCS:
321
raise BzrCommandError("%r and %r are in the same VCS, lossy "
322
"push not necessary. Please use regular push." %
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
source_branch.set_push_location(target_branch.base)
328
old_last_revid = source_branch.last_revision()
329
source_branch.pull(target_branch, overwrite=True)
330
new_last_revid = source_branch.last_revision()
331
if source_wt is not None and old_last_revid != new_last_revid:
332
source_wt.lock_write()
334
target = source_wt.branch.repository.revision_tree(
336
update_workingtree_fileids(source_wt, target)
339
push_result.report(self.outf)
341
target_branch.unlock()
344
class InterToForeignBranch(InterBranch):
346
def lossy_push(self, stop_revision=None):
347
"""Push deltas into another branch.
349
:note: This does not, like push, retain the revision ids from
350
the source branch and will, rather than adding bzr-specific
351
metadata, push only those semantics of the revision that can be
352
natively represented by this branch' VCS.
354
:param target: Target branch
355
:param stop_revision: Revision to push, defaults to last revision.
356
:return: BranchPushResult with an extra member revidmap:
357
A dictionary mapping revision ids from the target branch
358
to new revision ids in the target branch, for each
359
revision that was pushed.
361
raise NotImplementedError(self.lossy_push)
added
removed
bzrlib/foreign.py
