1
# Copyright (C) 2008-2009 Jelmer Vernooij <jelmer@samba.org>
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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
17
"""Foreign branch utilities."""
22
from bzrlib.branch import (
25
from bzrlib.commands import (
31
class ForeignBranch(Branch):
32
"""Branch that exists in a foreign version control system."""
34
def __init__(self, mapping):
35
self.mapping = mapping
36
super(ForeignBranch, self).__init__()
38
def dpull(self, source, stop_revision=None):
39
"""Pull deltas from another branch.
41
:note: This does not, like pull, retain the revision ids from
42
the source branch and will, rather than adding bzr-specific
43
metadata, push only those semantics of the revision that can be
44
natively represented in this branch.
46
:param source: Source branch
47
:param stop_revision: Revision to pull, defaults to last revision.
48
:return: Revision id map and file id map
50
raise NotImplementedError(self.dpull)
53
class FakeControlFiles(object):
54
"""Dummy implementation of ControlFiles.
56
This is required as some code relies on controlfiles being
58
def get_utf8(self, name):
59
raise errors.NoSuchFile(name)
62
raise errors.NoSuchFile(name)
68
class cmd_dpush(Command):
69
"""Push diffs into a foreign branch without any bzr-specific metadata.
71
This will afterwards rebase the local Bazaar branch on the remote
72
branch unless the --no-rebase option is used, in which case
73
the two branches will be out of sync.
75
takes_args = ['location?']
76
takes_options = ['remember', Option('directory',
77
help='Branch to push from, '
78
'rather than the one containing the working directory.',
82
Option("idmap-file", help="Write map with old and new revision ids.", type=str),
83
Option('no-rebase', help="Don't rebase after push")]
85
def run(self, location=None, remember=False, directory=None,
86
no_rebase=False, idmap_file=None):
87
from bzrlib import urlutils
88
from bzrlib.bzrdir import BzrDir
89
from bzrlib.errors import BzrCommandError, NoWorkingTree
90
from bzrlib.inventory import Inventory
91
from bzrlib.revision import NULL_REVISION
92
from bzrlib.trace import info
93
from bzrlib.workingtree import WorkingTree
94
from upgrade import update_workinginv_fileids
96
def get_inv(wt, revid):
97
if revid == NULL_REVISION:
100
return wt.branch.repository.get_inventory(revid)
102
if directory is None:
105
source_wt = WorkingTree.open_containing(directory)[0]
106
source_branch = source_wt.branch
107
except NoWorkingTree:
108
source_branch = Branch.open_containing(directory)[0]
110
stored_loc = source_branch.get_push_location()
112
if stored_loc is None:
113
raise BzrCommandError("No push location known or specified.")
115
display_url = urlutils.unescape_for_display(stored_loc,
117
self.outf.write("Using saved location: %s\n" % display_url)
118
location = stored_loc
120
bzrdir = BzrDir.open(location)
121
target_branch = bzrdir.open_branch()
122
target_branch.lock_write()
124
if getattr(target_branch, "dpull", None) is None:
125
info("target branch is not a foreign branch, using regular push.")
126
target_branch.pull(source_branch)
129
revid_map = target_branch.dpull(source_branch)
131
f = open(idmap_file, "w")
133
f.write("".join(["%s\t%s\n" % item for item in revid_map.iteritems()]))
136
# We successfully created the target, remember it
137
if source_branch.get_push_location() is None or remember:
138
source_branch.set_push_location(target_branch.base)
140
_, old_last_revid = source_branch.last_revision_info()
141
new_last_revid = revid_map[old_last_revid]
142
if source_wt is not None:
143
source_wt.pull(target_branch, overwrite=True,
144
stop_revision=new_last_revid)
145
source_wt.lock_write()
147
update_workinginv_fileids(source_wt,
148
get_inv(source_wt, old_last_revid),
149
get_inv(source_wt, new_last_revid))
153
source_branch.pull(target_branch, overwrite=True,
154
stop_revision=new_last_revid)
156
target_branch.unlock()
159
class cmd_foreign_mapping_upgrade(Command):
160
"""Upgrade revisions mapped from a foreign version control system.
162
This will change the identity of revisions whose parents
163
were mapped from revisions in the other version control system.
165
You are recommended to run "bzr check" in the local repository
166
after running this command.
168
aliases = ['svn-upgrade']
169
takes_args = ['from_repository?']
170
takes_options = ['verbose',
171
Option("idmap-file", help="Write map with old and new revision ids.", type=str)]
173
def run(self, from_repository=None, verbose=False, idmap_file=None):
174
from upgrade import upgrade_branch, upgrade_workingtree
175
from bzrlib.branch import Branch
176
from bzrlib.errors import NoWorkingTree, BzrCommandError
177
from bzrlib.repository import Repository
178
from bzrlib.trace import info
179
from bzrlib.workingtree import WorkingTree
181
wt_to = WorkingTree.open(".")
182
branch_to = wt_to.branch
183
except NoWorkingTree:
185
branch_to = Branch.open(".")
187
stored_loc = branch_to.get_parent()
188
if from_repository is None:
189
if stored_loc is None:
190
raise BzrCommandError("No pull location known or"
193
import bzrlib.urlutils as urlutils
194
display_url = urlutils.unescape_for_display(stored_loc,
196
self.outf.write("Using saved location: %s\n" % display_url)
197
from_repository = Branch.open(stored_loc).repository
199
from_repository = Repository.open(from_repository)
201
vcs = getattr(from_repository, "vcs", None)
203
raise BzrCommandError("Repository at %s is not a foreign repository.a" % from_repository.base)
205
new_mapping = from_repository.get_mapping()
207
if wt_to is not None:
208
renames = upgrade_workingtree(wt_to, from_repository,
209
new_mapping=new_mapping,
210
allow_changes=True, verbose=verbose)
212
renames = upgrade_branch(branch_to, from_repository,
213
new_mapping=new_mapping,
214
allow_changes=True, verbose=verbose)
217
info("Nothing to do.")
219
if idmap_file is not None:
220
f = open(idmap_file, 'w')
222
for oldid, newid in renames.iteritems():
223
f.write("%s\t%s\n" % (oldid, newid))
227
if wt_to is not None:
228
wt_to.set_last_revision(branch_to.last_revision())
232
from unittest import TestSuite
233
from bzrlib.tests import TestUtil
234
loader = TestUtil.TestLoader()
236
testmod_names = ['test_versionedfiles', ]
237
suite.addTest(loader.loadTestsFromModuleNames(testmod_names))
241
def escape_commit_message(message):
242
"""Replace xml-incompatible control characters."""
246
# FIXME: RBC 20060419 this should be done by the revision
247
# serialiser not by commit. Then we can also add an unescaper
248
# in the deserializer and start roundtripping revision messages
249
# precisely. See repository_implementations/test_repository.py
251
# Python strings can include characters that can't be
252
# represented in well-formed XML; escape characters that
253
# aren't listed in the XML specification
254
# (http://www.w3.org/TR/REC-xml/#NT-Char).
255
message, _ = re.subn(
256
u'[^\x09\x0A\x0D\u0020-\uD7FF\uE000-\uFFFD]+',
257
lambda match: match.group(0).encode('unicode_escape'),
added
removed
__init__.py
