1
# Copyright (C) 2005 by Aaron Bentley
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
16
from bzrlib import Branch
17
from bzrlib.commands import Command
18
from errors import NoPyBaz
22
from pybaz.backends.baz import null_cmd
30
from bzrlib.errors import BzrError
33
import bzrlib.inventory
37
from progress import *
39
def add_id(files, id=None):
40
"""Adds an explicit id to a list of files.
42
:param files: the name of the file to add an id to
43
:type files: list of str
44
:param id: tag one file using the specified id, instead of generating id
49
args.extend(["--id", id])
55
>>> q = test_environ()
58
>>> os.path.exists(os.path.join(q, "home", ".arch-params"))
60
>>> teardown_environ(q)
64
tdir = tempfile.mkdtemp(prefix="testdir-")
65
os.environ["HOME"] = os.path.join(tdir, "home")
66
os.mkdir(os.environ["HOME"])
67
arch_dir = os.path.join(tdir, "archive_dir")
68
pybaz.make_archive("test@example.com", arch_dir)
69
work_dir = os.path.join(tdir, "work_dir")
72
pybaz.init_tree(work_dir, "test@example.com/test--test--0")
73
lib_dir = os.path.join(tdir, "lib_dir")
75
pybaz.register_revision_library(lib_dir)
76
pybaz.set_my_id("Test User<test@example.org>")
79
def add_file(path, text, id):
81
>>> q = test_environ()
82
>>> add_file("path with space", "text", "lalala")
83
>>> tree = pybaz.tree_root(".")
84
>>> inv = list(tree.iter_inventory_ids(source=True, both=True))
85
>>> ("x_lalala", "path with space") in inv
87
>>> teardown_environ(q)
89
file(path, "wb").write(text)
93
def add_dir(path, id):
95
>>> q = test_environ()
96
>>> add_dir("path with\(sp) space", "lalala")
97
>>> tree = pybaz.tree_root(".")
98
>>> inv = list(tree.iter_inventory_ids(source=True, both=True))
99
>>> ("x_lalala", "path with\(sp) space") in inv
101
>>> teardown_environ(q)
106
def teardown_environ(tdir):
110
def timport(tree, summary):
111
msg = tree.log_message()
112
msg["summary"] = summary
115
def commit(tree, summary):
117
>>> q = test_environ()
118
>>> tree = pybaz.tree_root(".")
119
>>> timport(tree, "import")
120
>>> commit(tree, "commit")
121
>>> logs = [str(l.revision) for l in tree.iter_logs()]
125
'test@example.com/test--test--0--base-0'
127
'test@example.com/test--test--0--patch-1'
128
>>> teardown_environ(q)
130
msg = tree.log_message()
131
msg["summary"] = summary
134
def commit_test_revisions():
136
>>> q = test_environ()
137
>>> commit_test_revisions()
138
>>> a = pybaz.Archive("test@example.com")
139
>>> revisions = list(a.iter_revisions("test--test--0"))
142
>>> str(revisions[2])
143
'test@example.com/test--test--0--base-0'
144
>>> str(revisions[1])
145
'test@example.com/test--test--0--patch-1'
146
>>> str(revisions[0])
147
'test@example.com/test--test--0--patch-2'
148
>>> teardown_environ(q)
150
tree = pybaz.tree_root(".")
151
add_file("mainfile", "void main(void){}", "mainfile by aaron")
152
timport(tree, "Created mainfile")
153
file("mainfile", "wb").write("or something like that")
154
commit(tree, "altered mainfile")
155
add_file("ofile", "this is another file", "ofile by aaron")
156
commit(tree, "altered mainfile")
159
def commit_more_test_revisions():
161
>>> q = test_environ()
162
>>> commit_test_revisions()
163
>>> commit_more_test_revisions()
164
>>> a = pybaz.Archive("test@example.com")
165
>>> revisions = list(a.iter_revisions("test--test--0"))
168
>>> str(revisions[0])
169
'test@example.com/test--test--0--patch-3'
170
>>> teardown_environ(q)
172
tree = pybaz.tree_root(".")
173
add_file("trainfile", "void train(void){}", "trainfile by aaron")
174
commit(tree, "altered trainfile")
176
class NoSuchVersion(Exception):
177
def __init__(self, version):
178
Exception.__init__(self, "The version %s does not exist." % version)
179
self.version = version
181
def version_ancestry(version):
183
>>> q = test_environ()
184
>>> commit_test_revisions()
185
>>> version = pybaz.Version("test@example.com/test--test--0")
186
>>> ancestors = version_ancestry(version)
187
>>> str(ancestors[0])
188
'test@example.com/test--test--0--base-0'
189
>>> str(ancestors[1])
190
'test@example.com/test--test--0--patch-1'
191
>>> version = pybaz.Version("test@example.com/test--test--0.5")
192
>>> ancestors = version_ancestry(version)
193
Traceback (most recent call last):
194
NoSuchVersion: The version test@example.com/test--test--0.5 does not exist.
195
>>> teardown_environ(q)
198
revision = version.iter_revisions(reverse=True).next()
200
if not version.exists():
201
raise NoSuchVersion(version)
204
ancestors = list(revision.iter_ancestors(metoo=True))
208
def get_last_revision(branch):
209
last_patch = branch.last_patch()
211
return arch_revision(last_patch)
212
except NotArchRevision:
214
"Directory \"%s\" already exists, and the last revision is not"
215
" an Arch revision (%s)" % (output_dir, last_patch))
218
def get_remaining_revisions(output_dir, version):
221
if os.path.exists(output_dir):
222
# We are starting from an existing directory, figure out what
223
# the current version is
224
branch = find_branch(output_dir)
225
last_patch = get_last_revision(branch)
227
version = last_patch.version
228
elif version is None:
229
raise UserError("No version specified, and directory does not exist.")
232
ancestors = version_ancestry(version)
233
except NoSuchVersion, e:
237
for i in range(len(ancestors)):
238
if ancestors[i] == last_patch:
241
raise UserError("Directory \"%s\" already exists, and the last "
242
"revision (%s) is not in the ancestry of %s" %
243
(output_dir, last_patch, version))
244
# Strip off all of the ancestors which are already present
245
# And get a directory starting with the latest ancestor
246
latest_ancestor = ancestors[i]
247
old_revno = find_branch(output_dir).revno()
248
ancestors = ancestors[i+1:]
249
return ancestors, old_revno
251
def import_version(output_dir, version, fancy=True, fast=False, verbose=False,
252
dry_run=False, max_count=None, skip_symlinks=False):
254
>>> q = test_environ()
255
>>> result_path = os.path.join(q, "result")
256
>>> commit_test_revisions()
257
>>> version = pybaz.Version("test@example.com/test--test--0.1")
258
>>> import_version('/', version, fancy=False, dry_run=True)
259
Traceback (most recent call last):
260
UserError: / exists, but is not a bzr branch.
261
>>> import_version(result_path, version, fancy=False, dry_run=True)
262
Traceback (most recent call last):
263
UserError: The version test@example.com/test--test--0.1 does not exist.
264
>>> version = pybaz.Version("test@example.com/test--test--0")
265
>>> import_version(result_path, version, fancy=False, dry_run=True)
268
Dry run, not modifying output_dir
270
>>> import_version(result_path, version, fancy=False)
275
>>> import_version(result_path, version, fancy=False)
276
Tree is up-to-date with test@example.com/test--test--0--patch-2
277
>>> commit_more_test_revisions()
278
>>> import_version(result_path, version, fancy=False)
283
>>> teardown_environ(q)
286
ancestors, old_revno = get_remaining_revisions(output_dir, version)
287
except NotInABranch, e:
288
raise UserError("%s exists, but is not a bzr branch." % e.path)
289
if len(ancestors) == 0:
290
last_revision = get_last_revision(find_branch(output_dir))
291
print 'Tree is up-to-date with %s' % last_revision
294
progress_bar = ProgressBar()
295
tempdir = tempfile.mkdtemp(prefix="baz2bzr-",
296
dir=os.path.dirname(output_dir))
301
for result in iter_import_version(output_dir, ancestors, tempdir,
302
fast=fast, verbose=verbose, dry_run=dry_run,
303
max_count=max_count, skip_symlinks=skip_symlinks):
305
show_progress(progress_bar, result)
307
sys.stdout.write('.')
312
sys.stdout.write('\n')
315
print 'Dry run, not modifying output_dir'
317
if os.path.exists(output_dir):
318
# Move the bzr control directory back, and update the working tree
319
tmp_bzr_dir = os.path.join(tempdir, '.bzr')
321
bzr_dir = os.path.join(output_dir, '.bzr')
322
new_bzr_dir = os.path.join(tempdir, "rd", '.bzr')
324
os.rename(bzr_dir, tmp_bzr_dir) # Move the original bzr out of the way
325
os.rename(new_bzr_dir, bzr_dir)
327
bzrlib.merge.merge((output_dir, -1), (output_dir, old_revno),
328
check_clean=False, this_dir=output_dir,
331
# If something failed, move back the original bzr directory
332
os.rename(bzr_dir, new_bzr_dir)
333
os.rename(tmp_bzr_dir, bzr_dir)
336
revdir = os.path.join(tempdir, "rd")
337
os.rename(revdir, output_dir)
341
shutil.rmtree(tempdir)
342
print "Import complete."
344
class UserError(Exception):
345
def __init__(self, message):
346
"""Exception to throw when a user makes an impossible request
347
:param message: The message to emit when printing this exception
348
:type message: string
350
Exception.__init__(self, message)
352
def revision_id(arch_revision):
354
Generate a Bzr revision id from an Arch revision id. 'x' in the id
355
designates a revision imported with an experimental algorithm. A number
356
would indicate a particular standardized version.
358
:param arch_revision: The Arch revision to generate an ID for.
360
>>> revision_id(pybaz.Revision("you@example.com/cat--br--0--base-0"))
361
'Arch-x:you@example.com%cat--br--0--base-0'
363
return "Arch-x:%s" % str(arch_revision).replace('/', '%')
365
class NotArchRevision(Exception):
366
def __init__(self, revision_id):
367
msg = "The revision id %s does not look like it came from Arch."\
369
Exception.__init__(self, msg)
371
def arch_revision(revision_id):
373
>>> str(arch_revision("Arch-x:jrandom@example.com%test--test--0"))
374
Traceback (most recent call last):
375
NotArchRevision: The revision id Arch-x:jrandom@example.com%test--test--0 does not look like it came from Arch.
376
>>> str(arch_revision("Arch-x:jrandom@example.com%test--test--0--base-5"))
377
Traceback (most recent call last):
378
NotArchRevision: The revision id Arch-x:jrandom@example.com%test--test--0--base-5 does not look like it came from Arch.
379
>>> str(arch_revision("Arch-x:jrandom@example.com%test--test--0--patch-5"))
380
'jrandom@example.com/test--test--0--patch-5'
382
if revision_id is None:
384
if revision_id[:7] != 'Arch-x:':
385
raise NotArchRevision(revision_id)
388
return pybaz.Revision(revision_id[7:].replace('%', '/'))
389
except pybaz.errors.NamespaceError, e:
390
raise NotArchRevision(revision_id)
392
def iter_import_version(output_dir, ancestors, tempdir, fast=False,
393
verbose=False, dry_run=False, max_count=None,
394
skip_symlinks=False):
397
# Uncomment this for testing, it basically just has baz2bzr only update
398
# 5 patches at a time
400
ancestors = ancestors[:max_count]
402
# Not sure if I want this output. basically it tells you ahead of time
403
# what it is going to do, but then later it tells you as it is doing it.
404
# what probably would be best would be to collapse it into ranges, so that
405
# this gives the simple view, and then later it gives the blow by blow.
407
# print 'Adding the following revisions:'
408
# for a in ancestors:
411
previous_version=None
413
for i in range(len(ancestors)):
414
revision = ancestors[i]
416
version = str(revision.version)
417
if version != previous_version:
419
print '\rOn version: %s' % version
420
yield Progress(str(revision.patchlevel), i, len(ancestors))
421
previous_version = version
423
yield Progress("revisions", i, len(ancestors))
425
revdir = os.path.join(tempdir, "rd")
426
baz_inv, log = get_revision(revdir, revision,
427
skip_symlinks=skip_symlinks)
428
if os.path.exists(output_dir):
429
bzr_dir = os.path.join(output_dir, '.bzr')
430
new_bzr_dir = os.path.join(tempdir, "rd", '.bzr')
431
# This would be much faster with a simple os.rename(), but if
432
# we fail, we have corrupted the original .bzr directory. Is
433
# that a big problem, as we can just back out the last
434
# revisions in .bzr/revision_history I don't really know
435
shutil.copytree(bzr_dir, new_bzr_dir)
436
# Now revdir should have a tree with the latest .bzr, and the
437
# next revision of the baz tree
438
branch = find_branch(revdir)
440
branch = bzrlib.Branch(revdir, init=True)
442
old = os.path.join(revdir, ".bzr")
443
new = os.path.join(tempdir, ".bzr")
445
baz_inv, log = apply_revision(revdir, revision,
446
skip_symlinks=skip_symlinks)
448
branch = find_branch(revdir)
449
timestamp = email.Utils.mktime_tz(log.date + (0,))
450
rev_id = revision_id(revision)
453
branch.set_inventory(baz_inv)
454
bzrlib.trace.silent = True
455
branch.commit(log.summary, verbose=False, committer=log.creator,
456
timestamp=timestamp, timezone=0, rev_id=rev_id)
458
bzrlib.trace.silent = False
460
yield Progress("revisions", len(ancestors), len(ancestors))
461
unlink_unversioned(branch, revdir)
463
def unlink_unversioned(branch, revdir):
464
for unversioned in branch.working_tree().extras():
465
path = os.path.join(revdir, unversioned)
466
if os.path.isdir(path):
471
def get_log(tree, revision):
472
log = tree.iter_logs(version=revision.version, reverse=True).next()
473
assert log.revision == revision
476
def get_revision(revdir, revision, skip_symlinks=False):
478
tree = pybaz.tree_root(revdir)
479
log = get_log(tree, revision)
481
return bzr_inventory_data(tree, skip_symlinks=skip_symlinks), log
482
except BadFileKind, e:
483
raise UserError("Cannot convert %s because %s is a %s" % (revision,e.path, e.kind) )
486
def apply_revision(revdir, revision, skip_symlinks=False):
487
tree = pybaz.tree_root(revdir)
489
log = get_log(tree, revision)
491
return bzr_inventory_data(tree, skip_symlinks=skip_symlinks), log
492
except BadFileKind, e:
493
raise UserError("Cannot convert %s because %s is a %s" % (revision,e.path, e.kind) )
498
class BadFileKind(Exception):
499
"""The file kind is not permitted in bzr inventories"""
500
def __init__(self, tree_root, path, kind):
501
self.tree_root = tree_root
504
Exception.__init__(self, "File %s is of forbidden type %s" %
505
(os.path.join(tree_root, path), kind))
507
def bzr_inventory_data(tree, skip_symlinks=False):
508
inv_iter = tree.iter_inventory_ids(source=True, both=True)
510
for arch_id, path in inv_iter:
511
bzr_file_id = arch_id.replace('%', '%25').replace('/', '%2f')
512
inv_map[path] = bzr_file_id
515
for path, file_id in inv_map.iteritems():
516
full_path = os.path.join(tree, path)
517
kind = bzrlib.osutils.file_kind(full_path)
518
if skip_symlinks and kind == "symlink":
520
if kind not in ("file", "directory"):
521
raise BadFileKind(tree, path, kind)
522
parent_dir = os.path.dirname(path)
524
parent_id = inv_map[parent_dir]
526
parent_id = bzrlib.inventory.ROOT_ID
527
bzr_inv.append((path, file_id, parent_id, kind))
531
class NotInABranch(Exception):
532
def __init__(self, path):
533
Exception.__init__(self, "%s is not in a branch." % path)
537
def find_branch(path):
540
Traceback (most recent call last):
541
NotInABranch: / is not in a branch.
542
>>> sb = bzrlib.ScratchBranch()
543
>>> isinstance(find_branch(sb.base), bzrlib.Branch)
547
return bzrlib.Branch(path)
549
if e.args[0].endswith("' is not in a branch"):
550
raise NotInABranch(path)
552
class cmd_baz_import(Command):
553
"""Import an Arch or Baz branch into a bzr branch"""
554
takes_args = ['to_location', 'from_branch?']
555
takes_options = ['verbose']
557
def run(self, to_location, from_branch=None, skip_symlinks=False,
558
fast=False, max_count=None, verbose=False, dry_run=False):
559
to_location = os.path.realpath(str(to_location))
560
if from_branch is not None:
562
from_branch = pybaz.Version(from_branch)
563
except pybaz.errors.NamespaceError:
564
print "%s is not a valid Arch branch." % from_branch
566
import_version(to_location, from_branch)
added
removed
baz_import.py
