« back to all changes in this revision
Viewing changes to baz_import.py
- browse files at revision 316
- compare with another revision
- download diff
- download tarball
- view history from revision 316
- Committer: Aaron Bentley
- Date: 2006-02-21 05:51:15 UTC
- Revision ID: aaron.bentley@utoronto.ca-20060221055115-d1a74f28c9016983
Fixed the push command
- files removed:
- .be/bugs/aa3f38e8-8544-498f-893e-dec21b1b8f13
- .be/bugs/aa3f38e8-8544-498f-893e-dec21b1b8f13/comments
- .be/bugs/aa3f38e8-8544-498f-893e-dec21b1b8f13/comments/e53c2ce1-5b28-4e48-8453-bad891786713
- external
- tests
- files modified:
- .bzrignore
added
removed
baz_import.py
1
# Copyright (C) 2005, 2006 by Aaron Bentley
1
# Copyright (C) 2005 by Aaron Bentley
2
2
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
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
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
16
17
import errno
18
19
from bzrlib.bzrdir import BzrDir
20
import bzrlib.bzrdir as bzrdir
21
from bzrlib.errors import (BzrError,
22
NotBranchError,
23
NoWorkingTree,
24
BzrCommandError,
25
NoSuchRevision,
26
NoRepositoryPresent,
27
)
28
16
from bzrlib.branch import Branch
29
from bzrlib.commit import Commit, NullCommitReporter
30
17
from bzrlib.commands import Command
31
from bzrlib.option import _global_option, Option
32
from bzrlib.merge import merge_inner
33
from bzrlib.revision import NULL_REVISION
34
from bzrlib.tree import EmptyTree
35
import bzrlib.ui
36
from bzrlib.workingtree import WorkingTree
37
18
from errors import NoPyBaz
38
19
try:
39
20
import pybaz
40
21
import pybaz.errors
41
from pybaz import NameParser as NameParser
42
22
from pybaz.backends.baz import null_cmd
43
23
except ImportError:
44
24
raise NoPyBaz
45
from fai import iter_new_merges, direct_merges
46
25
import tempfile
47
26
import os
48
27
import os.path
49
28
import shutil
50
29
import bzrlib
30
from bzrlib.errors import BzrError, NotBranchError, BzrCommandError
51
31
import bzrlib.trace
52
32
import bzrlib.merge
53
33
import bzrlib.inventory
56
36
import email.Utils
57
37
from progress import *
58
38
59
class ImportCommitReporter(NullCommitReporter):
60
def __init__(self, pb):
61
self.pb = pb
62
63
def escaped(self, escape_count, message):
64
self.pb.clear()
65
bzrlib.trace.warning("replaced %d control characters in message" %
66
escape_count)
67
68
39
def add_id(files, id=None):
69
40
"""Adds an explicit id to a list of files.
70
41
79
50
args.extend(files)
80
51
return null_cmd(args)
81
52
82
saved_dir = None
83
84
def make_archive(name, location):
85
pb_location = pybaz.ArchiveLocation(location)
86
pb_location.create_master(pybaz.Archive(name),
87
pybaz.ArchiveLocationParams())
88
89
53
def test_environ():
90
54
"""
91
55
>>> q = test_environ()
97
61
>>> os.path.exists(q)
98
62
False
99
63
"""
100
global saved_dir
101
saved_dir = os.getcwdu()
102
64
tdir = tempfile.mkdtemp(prefix="testdir-")
103
65
os.environ["HOME"] = os.path.join(tdir, "home")
104
66
os.mkdir(os.environ["HOME"])
105
67
arch_dir = os.path.join(tdir, "archive_dir")
106
make_archive("test@example.com", arch_dir)
68
pybaz.make_archive("test@example.com", arch_dir)
107
69
work_dir = os.path.join(tdir, "work_dir")
108
70
os.mkdir(work_dir)
109
71
os.chdir(work_dir)
142
104
add_id([path], id)
143
105
144
106
def teardown_environ(tdir):
145
os.chdir(saved_dir)
107
os.chdir("/")
146
108
shutil.rmtree(tdir)
147
109
148
110
def timport(tree, summary):
234
196
"""
235
197
try:
236
198
revision = version.iter_revisions(reverse=True).next()
237
except StopIteration:
238
return ()
239
199
except:
240
print version
241
200
if not version.exists():
242
201
raise NoSuchVersion(version)
243
202
else:
253
212
except NotArchRevision:
254
213
raise UserError(
255
214
"Directory \"%s\" already exists, and the last revision is not"
256
" an Arch revision (%s)" % (branch.base, last_patch))
257
258
def do_branch(br_from, to_location, revision_id):
259
"""Derived from branch in builtins."""
260
br_from.lock_read()
261
try:
262
try:
263
os.mkdir(to_location)
264
except OSError, e:
265
if e.errno == errno.EEXIST:
266
raise UserError('Target directory "%s" already'
267
' exists.' % to_location)
268
if e.errno == errno.ENOENT:
269
raise UserError('Parent of "%s" does not exist.' %
270
to_location)
271
else:
272
raise
273
try:
274
br_from.bzrdir.clone(to_location, revision_id)
275
except NoSuchRevision:
276
rmtree(to_location)
277
msg = "The branch %s has no revision %s." % (from_location,
278
revision_id)
279
raise UserError(msg)
280
finally:
281
br_from.unlock()
282
283
def get_remaining_revisions(output_dir, version, reuse_history_from=[]):
215
" an Arch revision (%s)" % (output_dir, last_patch))
216
217
218
def get_remaining_revisions(output_dir, version):
284
219
last_patch = None
285
220
old_revno = None
286
output_exists = os.path.exists(output_dir)
287
if output_exists:
221
if os.path.exists(output_dir):
288
222
# We are starting from an existing directory, figure out what
289
223
# the current version is
290
branch = Branch.open(output_dir)
224
branch = find_branch(output_dir)
291
225
last_patch = get_last_revision(branch)
292
226
if last_patch is None:
293
227
raise NotPreviousImport(branch.base)
298
232
299
233
try:
300
234
ancestors = version_ancestry(version)
301
if not output_exists and reuse_history_from != []:
302
for ancestor in reversed(ancestors):
303
if last_patch is not None:
304
# found something to copy
305
break
306
# try to grab a copy of ancestor
307
# note that is not optimised: we could look for namespace
308
# transitions and only look for the past after the
309
# transition.
310
for history_root in reuse_history_from:
311
possible_source = os.path.join(history_root,
312
map_namespace(ancestor.version))
313
try:
314
source = Branch.open(possible_source)
315
rev_id = revision_id(ancestor)
316
if rev_id in source.revision_history():
317
do_branch(source, output_dir, rev_id)
318
last_patch = ancestor
319
break
320
except NotBranchError:
321
pass
235
if len(ancestors) > 0 and not ancestors[0].archive.is_registered():
236
ancestors = ancestors[1:]
322
237
except NoSuchVersion, e:
323
raise UserError(str(e))
238
raise UserError(e)
324
239
325
240
if last_patch:
326
241
for i in range(len(ancestors)):
333
248
# Strip off all of the ancestors which are already present
334
249
# And get a directory starting with the latest ancestor
335
250
latest_ancestor = ancestors[i]
336
old_revno = Branch.open(output_dir).revno()
251
old_revno = find_branch(output_dir).revno()
337
252
ancestors = ancestors[i+1:]
338
253
return ancestors, old_revno
339
254
340
341
###class Importer(object):
342
### """An importer.
343
###
344
### Currently this is used as a parameter object, though more behaviour is
345
### possible later.
346
### """
347
###
348
### def __init__(self, output_dir, version, printer, fancy=True, fast=False,
349
### verbose=False, dry_run=False, max_count=None,
350
### reuse_history_from=[]):
351
### self.output_dir = output_dir
352
### self.version = version
353
### self.
354
355
356
def import_version(output_dir, version, printer, fancy=True, fast=False,
357
verbose=False, dry_run=False, max_count=None,
358
reuse_history_from=[], standalone=True):
255
def import_version(output_dir, version, fancy=True, fast=False, verbose=False,
256
dry_run=False, max_count=None, skip_symlinks=False):
359
257
"""
360
258
>>> q = test_environ()
361
259
>>> result_path = os.path.join(q, "result")
362
260
>>> commit_test_revisions()
363
261
>>> version = pybaz.Version("test@example.com/test--test--0.1")
364
>>> def printer(message): print message
365
>>> import_version('/', version, printer, fancy=False, dry_run=True)
262
>>> import_version('/', version, fancy=False, dry_run=True)
366
263
Traceback (most recent call last):
367
NotPreviousImport: / is not the location of a previous import.
368
>>> import_version(result_path, version, printer, fancy=False, dry_run=True)
264
UserError: / exists, but is not a bzr branch.
265
>>> import_version(result_path, version, fancy=False, dry_run=True)
369
266
Traceback (most recent call last):
370
267
UserError: The version test@example.com/test--test--0.1 does not exist.
371
268
>>> version = pybaz.Version("test@example.com/test--test--0")
372
>>> import_version(result_path, version, printer, fancy=False, dry_run=True)
269
>>> import_version(result_path, version, fancy=False, dry_run=True)
373
270
not fancy
374
271
....
375
272
Dry run, not modifying output_dir
376
273
Cleaning up
377
>>> import_version(result_path, version, printer, fancy=False)
274
>>> import_version(result_path, version, fancy=False)
378
275
not fancy
379
276
....
380
277
Cleaning up
381
278
Import complete.
382
>>> import_version(result_path, version, printer, fancy=False)
279
>>> import_version(result_path, version, fancy=False)
383
280
Tree is up-to-date with test@example.com/test--test--0--patch-2
384
281
>>> commit_more_test_revisions()
385
>>> import_version(result_path, version, printer, fancy=False)
282
>>> import_version(result_path, version, fancy=False)
386
283
not fancy
387
284
..
388
285
Cleaning up
390
287
>>> teardown_environ(q)
391
288
"""
392
289
try:
393
ancestors, old_revno = get_remaining_revisions(output_dir, version,
394
reuse_history_from)
395
except NotBranchError, e:
290
ancestors, old_revno = get_remaining_revisions(output_dir, version)
291
except NotInABranch, e:
396
292
raise NotPreviousImport(e.path)
397
if old_revno is None and len(ancestors) == 0:
398
print 'Version %s has no revisions.' % version
399
return
400
293
if len(ancestors) == 0:
401
last_revision = get_last_revision(Branch.open(output_dir))
294
last_revision = get_last_revision(find_branch(output_dir))
402
295
print 'Tree is up-to-date with %s' % last_revision
403
296
return
404
297
405
progress_bar = bzrlib.ui.ui_factory.progress_bar()
298
progress_bar = ProgressBar()
406
299
tempdir = tempfile.mkdtemp(prefix="baz2bzr-",
407
300
dir=os.path.dirname(output_dir))
408
301
try:
409
wt = WorkingTree.open(output_dir)
410
except (NotBranchError, NoWorkingTree):
411
wt = None
412
if wt is None:
413
old_basis = EmptyTree()
414
else:
415
old_basis = wt.basis_tree()
416
try:
417
302
if not fancy:
418
303
print "not fancy"
419
304
try:
420
305
for result in iter_import_version(output_dir, ancestors, tempdir,
421
progress_bar, fast=fast, verbose=verbose, dry_run=dry_run,
422
max_count=max_count, standalone=standalone):
306
fast=fast, verbose=verbose, dry_run=dry_run,
307
max_count=max_count, skip_symlinks=skip_symlinks):
423
308
if fancy:
424
309
show_progress(progress_bar, result)
425
310
else:
433
318
if dry_run:
434
319
print 'Dry run, not modifying output_dir'
435
320
return
321
if os.path.exists(output_dir):
322
# Move the bzr control directory back, and update the working tree
323
tmp_bzr_dir = os.path.join(tempdir, '.bzr')
324
325
bzr_dir = os.path.join(output_dir, '.bzr')
326
new_bzr_dir = os.path.join(tempdir, "rd", '.bzr')
436
327
437
# Update the working tree of the branch
438
try:
439
wt = WorkingTree.open(output_dir)
440
except NoWorkingTree:
441
wt = None
442
if wt is not None:
443
wt.set_last_revision(wt.branch.last_revision())
444
merge_inner(wt.branch, wt.basis_tree(), old_basis,
445
ignore_zero=True, this_tree=wt)
446
wt.revert([])
328
os.rename(bzr_dir, tmp_bzr_dir) # Move the original bzr out of the way
329
os.rename(new_bzr_dir, bzr_dir)
330
try:
331
bzrlib.merge.merge((output_dir, -1), (output_dir, old_revno),
332
check_clean=False, this_dir=output_dir,
333
ignore_zero=True)
334
except:
335
# If something failed, move back the original bzr directory
336
os.rename(bzr_dir, new_bzr_dir)
337
os.rename(tmp_bzr_dir, bzr_dir)
338
raise
339
else:
340
revdir = os.path.join(tempdir, "rd")
341
os.rename(revdir, output_dir)
447
342
448
343
finally:
449
printer('Cleaning up')
344
print 'Cleaning up'
450
345
shutil.rmtree(tempdir)
451
printer("Import complete.")
346
print "Import complete."
452
347
453
348
class UserError(BzrCommandError):
454
349
def __init__(self, message):
473
368
:param arch_revision: The Arch revision to generate an ID for.
474
369
475
370
>>> revision_id(pybaz.Revision("you@example.com/cat--br--0--base-0"))
476
'Arch-1:you@example.com%cat--br--0--base-0'
371
'Arch-x:you@example.com%cat--br--0--base-0'
477
372
"""
478
return "Arch-1:%s" % str(arch_revision).replace('/', '%')
373
return "Arch-x:%s" % str(arch_revision).replace('/', '%')
479
374
480
375
class NotArchRevision(Exception):
481
376
def __init__(self, revision_id):
485
380
486
381
def arch_revision(revision_id):
487
382
"""
488
>>> str(arch_revision("Arch-1:jrandom@example.com%test--test--0"))
489
Traceback (most recent call last):
490
NotArchRevision: The revision id Arch-1:jrandom@example.com%test--test--0 does not look like it came from Arch.
491
>>> str(arch_revision("Arch-1:jrandom@example.com%test--test--0--base-5"))
492
Traceback (most recent call last):
493
NotArchRevision: The revision id Arch-1:jrandom@example.com%test--test--0--base-5 does not look like it came from Arch.
494
>>> str(arch_revision("Arch-1:jrandom@example.com%test--test--0--patch-5"))
383
>>> str(arch_revision("Arch-x:jrandom@example.com%test--test--0"))
384
Traceback (most recent call last):
385
NotArchRevision: The revision id Arch-x:jrandom@example.com%test--test--0 does not look like it came from Arch.
386
>>> str(arch_revision("Arch-x:jrandom@example.com%test--test--0--base-5"))
387
Traceback (most recent call last):
388
NotArchRevision: The revision id Arch-x:jrandom@example.com%test--test--0--base-5 does not look like it came from Arch.
389
>>> str(arch_revision("Arch-x:jrandom@example.com%test--test--0--patch-5"))
495
390
'jrandom@example.com/test--test--0--patch-5'
496
391
"""
497
392
if revision_id is None:
498
393
return None
499
if revision_id[:7] != 'Arch-1:':
394
if revision_id[:7] != 'Arch-x:':
500
395
raise NotArchRevision(revision_id)
501
396
else:
502
397
try:
503
398
return pybaz.Revision(revision_id[7:].replace('%', '/'))
504
399
except pybaz.errors.NamespaceError, e:
505
400
raise NotArchRevision(revision_id)
506
507
508
def create_shared_repository(output_dir):
509
bd = bzrdir.BzrDirMetaFormat1().initialize(output_dir)
510
bd.create_repository(shared=True)
511
512
def create_branch(output_dir):
513
os.mkdir(output_dir)
514
bd = bzrdir.BzrDirMetaFormat1().initialize(output_dir)
515
return bd.create_branch()
516
517
518
def create_checkout(source, to_location, revision_id=None):
519
checkout = bzrdir.BzrDirMetaFormat1().initialize(to_location)
520
bzrlib.branch.BranchReferenceFormat().initialize(checkout, source)
521
return checkout.create_workingtree(revision_id)
522
523
524
def create_checkout_metadata(source, to_location, revision_id=None):
525
if revision_id is None:
526
revision_id = source.last_revision()
527
wt = create_checkout(source, to_location, NULL_REVISION)
528
wt.set_last_revision(revision_id)
529
wt._write_inventory(wt.basis_tree().inventory)
530
return wt
531
532
533
def iter_import_version(output_dir, ancestors, tempdir, pb, fast=False,
401
402
def iter_import_version(output_dir, ancestors, tempdir, fast=False,
534
403
verbose=False, dry_run=False, max_count=None,
535
standalone=False):
404
skip_symlinks=False):
536
405
revdir = None
537
406
538
407
# Uncomment this for testing, it basically just has baz2bzr only update
550
419
# print '\t%s' % a
551
420
552
421
previous_version=None
553
missing_ancestor = None
554
if dry_run:
555
dry_output_dir = os.path.join(tempdir, 'od')
556
if os.path.exists(output_dir):
557
shutil.copytree(output_dir, dry_output_dir)
558
output_dir = dry_output_dir
559
560
if os.path.exists(output_dir):
561
target_branch = Branch.open(output_dir)
562
else:
563
if standalone:
564
wt = BzrDir.create_standalone_workingtree(output_dir)
565
target_branch = wt.branch
566
else:
567
target_branch = create_branch(output_dir)
568
422
569
423
for i in range(len(ancestors)):
570
424
revision = ancestors[i]
571
rev_id = revision_id(revision)
572
direct_merges = []
573
425
if verbose:
574
426
version = str(revision.version)
575
427
if version != previous_version:
579
431
previous_version = version
580
432
else:
581
433
yield Progress("revisions", i, len(ancestors))
582
583
if target_branch.repository.has_revision(rev_id):
584
target_branch.append_revision(rev_id)
585
continue
586
434
if revdir is None:
587
435
revdir = os.path.join(tempdir, "rd")
588
try:
589
tree, baz_inv, log = get_revision(revdir, revision)
590
except pybaz.errors.ExecProblem, e:
591
if ("%s" % e.args).find('could not connect') == -1:
592
raise
593
missing_ancestor = revision
594
revdir = None
595
print ("unable to access ancestor %s, making into a merge."
596
% missing_ancestor)
597
continue
598
target_tree = create_checkout_metadata(target_branch, revdir)
599
branch = target_tree.branch
436
baz_inv, log = get_revision(revdir, revision,
437
skip_symlinks=skip_symlinks)
438
if os.path.exists(output_dir):
439
bzr_dir = os.path.join(output_dir, '.bzr')
440
new_bzr_dir = os.path.join(tempdir, "rd", '.bzr')
441
# This would be much faster with a simple os.rename(), but if
442
# we fail, we have corrupted the original .bzr directory. Is
443
# that a big problem, as we can just back out the last
444
# revisions in .bzr/revision_history I don't really know
445
shutil.copytree(bzr_dir, new_bzr_dir)
446
# Now revdir should have a tree with the latest .bzr, and the
447
# next revision of the baz tree
448
branch = find_branch(revdir)
449
else:
450
branch = Branch.initialize(revdir)
600
451
else:
601
452
old = os.path.join(revdir, ".bzr")
602
453
new = os.path.join(tempdir, ".bzr")
603
454
os.rename(old, new)
604
baz_inv, log = apply_revision(tree, revision)
455
baz_inv, log = apply_revision(revdir, revision,
456
skip_symlinks=skip_symlinks)
605
457
os.rename(new, old)
606
target_tree = WorkingTree.open(revdir)
607
branch = target_tree.branch
608
# cached so we can delete the log
609
log_date = log.date
610
log_summary = log.summary
611
log_description = log.description
612
is_continuation = log.continuation_of is not None
613
log_creator = log.creator
614
direct_merges = get_direct_merges(revdir, revision, log)
615
616
timestamp = email.Utils.mktime_tz(log_date + (0,))
617
if log_summary is None:
618
log_summary = ""
619
# log_descriptions of None and "" are ignored.
620
if not is_continuation and log_description:
621
log_message = "\n".join((log_summary, log_description))
622
else:
623
log_message = log_summary
624
target_tree.lock_write()
458
branch = find_branch(revdir)
459
timestamp = email.Utils.mktime_tz(log.date + (0,))
460
rev_id = revision_id(revision)
625
461
branch.lock_write()
626
462
try:
627
if missing_ancestor:
628
# if we want it to be in revision-history, do that here.
629
target_tree.add_pending_merge(revision_id(missing_ancestor))
630
missing_ancestor = None
631
for merged_rev in direct_merges:
632
target_tree.add_pending_merge(revision_id(merged_rev))
633
target_tree.set_inventory(baz_inv)
634
commitobj = Commit(reporter=ImportCommitReporter(pb))
635
commitobj.commit(working_tree=target_tree,
636
message=log_message.decode('ascii', 'replace'),
637
verbose=False, committer=log_creator,
638
timestamp=timestamp, timezone=0, rev_id=rev_id,
639
revprops={})
463
branch.working_tree().set_inventory(baz_inv)
464
bzrlib.trace.silent = True
465
wt = branch.working_tree()
466
wt.commit(log.summary, verbose=False, committer=log.creator,
467
timestamp=timestamp, timezone=0, rev_id=rev_id)
640
468
finally:
641
target_tree.unlock()
469
bzrlib.trace.silent = False
642
470
branch.unlock()
643
471
yield Progress("revisions", len(ancestors), len(ancestors))
644
645
def get_direct_merges(revdir, revision, log):
646
continuation = log.continuation_of
647
previous_version = revision.version
648
if pybaz.WorkingTree(revdir).tree_version != previous_version:
649
pybaz.WorkingTree(revdir).set_tree_version(previous_version)
650
log_path = "%s/{arch}/%s/%s/%s/%s/patch-log/%s" % (revdir,
651
revision.category.nonarch, revision.branch.nonarch,
652
revision.version.nonarch, revision.archive, revision.patchlevel)
653
temp_path = tempfile.mktemp(dir=os.path.dirname(revdir))
654
os.rename(log_path, temp_path)
655
merges = list(iter_new_merges(revdir, revision.version))
656
direct = direct_merges(merges, [continuation])
657
os.rename(temp_path, log_path)
658
return direct
659
660
def unlink_unversioned(wt):
661
for unversioned in wt.extras():
662
path = wt.abspath(unversioned)
472
unlink_unversioned(branch, revdir)
473
474
def unlink_unversioned(branch, revdir):
475
for unversioned in branch.working_tree().extras():
476
path = os.path.join(revdir, unversioned)
663
477
if os.path.isdir(path):
664
478
shutil.rmtree(path)
665
479
else:
666
480
os.unlink(path)
667
481
668
482
def get_log(tree, revision):
669
log = pybaz.Patchlog(revision, tree=tree)
483
log = tree.iter_logs(version=revision.version, reverse=True).next()
670
484
assert str(log.revision) == str(revision), (log.revision, revision)
671
485
return log
672
486
673
def get_revision(revdir, revision):
674
tree = revision.get(revdir)
487
def get_revision(revdir, revision, skip_symlinks=False):
488
revision.get(revdir)
489
tree = pybaz.tree_root(revdir)
675
490
log = get_log(tree, revision)
676
491
try:
677
return tree, bzr_inventory_data(tree), log
492
return bzr_inventory_data(tree, skip_symlinks=skip_symlinks), log
678
493
except BadFileKind, e:
679
raise UserError("Cannot convert %s because %s is a %s" %
680
(revision,e.path, e.kind))
681
682
683
def apply_revision(tree, revision):
494
raise UserError("Cannot convert %s because %s is a %s" % (revision,e.path, e.kind) )
495
496
497
def apply_revision(revdir, revision, skip_symlinks=False):
498
tree = pybaz.tree_root(revdir)
684
499
revision.apply(tree)
685
500
log = get_log(tree, revision)
686
501
try:
687
return bzr_inventory_data(tree), log
502
return bzr_inventory_data(tree, skip_symlinks=skip_symlinks), log
688
503
except BadFileKind, e:
689
raise UserError("Cannot convert %s because %s is a %s" %
690
(revision,e.path, e.kind))
504
raise UserError("Cannot convert %s because %s is a %s" % (revision,e.path, e.kind) )
505
506
691
507
692
508
693
509
class BadFileKind(Exception):
699
515
Exception.__init__(self, "File %s is of forbidden type %s" %
700
516
(os.path.join(tree_root, path), kind))
701
517
702
703
def bzr_inventory_data(tree):
518
def bzr_inventory_data(tree, skip_symlinks=False):
704
519
inv_iter = tree.iter_inventory_ids(source=True, both=True)
705
520
inv_map = {}
706
521
for arch_id, path in inv_iter:
707
bzr_file_id = map_file_id(arch_id)
522
bzr_file_id = arch_id.replace('%', '%25').replace('/', '%2f')
708
523
inv_map[path] = bzr_file_id
709
524
710
525
bzr_inv = []
711
526
for path, file_id in inv_map.iteritems():
712
527
full_path = os.path.join(tree, path)
713
528
kind = bzrlib.osutils.file_kind(full_path)
714
if kind not in ("file", "directory", "symlink"):
529
if skip_symlinks and kind == "symlink":
530
continue
531
if kind not in ("file", "directory"):
715
532
raise BadFileKind(tree, path, kind)
716
533
parent_dir = os.path.dirname(path)
717
534
if parent_dir != "":
722
539
bzr_inv.sort()
723
540
return bzr_inv
724
541
725
_global_option('max-count', type = int)
726
class cmd_baz_import_branch(Command):
542
class NotInABranch(Exception):
543
def __init__(self, path):
544
Exception.__init__(self, "%s is not in a branch." % path)
545
self.path = path
546
547
548
def find_branch(path):
549
"""
550
>>> find_branch('/')
551
Traceback (most recent call last):
552
NotInABranch: / is not in a branch.
553
>>> sb = bzrlib.ScratchBranch()
554
>>> isinstance(find_branch(sb.base), Branch)
555
True
556
"""
557
try:
558
return Branch.open(path)
559
except NotBranchError, e:
560
raise NotInABranch(path)
561
562
class cmd_baz_import(Command):
727
563
"""Import an Arch or Baz branch into a bzr branch"""
728
takes_args = ['to_location', 'from_branch?', 'reuse_history*']
729
takes_options = ['verbose', 'max-count']
730
731
def printer(self, name):
732
print name
733
734
def run(self, to_location, from_branch=None, fast=False, max_count=None,
735
verbose=False, dry_run=False, reuse_history_list=[]):
564
takes_args = ['to_location', 'from_branch?']
565
takes_options = ['verbose']
566
567
def run(self, to_location, from_branch=None, skip_symlinks=False,
568
fast=False, max_count=None, verbose=False, dry_run=False):
736
569
to_location = os.path.realpath(str(to_location))
737
570
if from_branch is not None:
738
571
try:
740
573
except pybaz.errors.NamespaceError:
741
574
print "%s is not a valid Arch branch." % from_branch
742
575
return 1
743
if reuse_history_list is None:
744
reuse_history_list = []
745
import_version(to_location, from_branch, self.printer,
746
max_count=max_count,
747
reuse_history_from=reuse_history_list)
748
749
750
class NotInABranch(Exception):
751
def __init__(self, path):
752
Exception.__init__(self, "%s is not in a branch." % path)
753
self.path = path
754
755
756
class cmd_baz_import(Command):
757
"""Import an Arch or Baz archive into bzr branches.
758
759
This command should be used on local archives (or mirrors) only. It is
760
quite slow on remote archives.
761
762
reuse_history allows you to specify any previous imports you
763
have done of different archives, which this archive has branches
764
tagged from. This will dramatically reduce the time to convert
765
the archive as it will not have to convert the history already
766
converted in that other branch.
767
768
If you specify prefixes, only branches whose names start with that prefix
769
will be imported. Skipped branches will be listed, so you can import any
770
branches you missed by accident. Here's an example of doing a partial
771
import from thelove@canonical.com:
772
bzr baz-import thelove thelove@canonical.com --prefixes dists:talloc-except
773
"""
774
takes_args = ['to_root_dir', 'from_archive', 'reuse_history*']
775
takes_options = ['verbose', Option('prefixes', type=str,
776
help="Prefixes of branches to import, colon-separated")]
777
778
def printer(self, name):
779
print name
780
781
def run(self, to_root_dir, from_archive, verbose=False,
782
reuse_history_list=[], prefixes=None):
783
if reuse_history_list is None:
784
reuse_history_list = []
785
to_root = str(os.path.realpath(to_root_dir))
786
if not os.path.exists(to_root):
787
os.mkdir(to_root)
788
if prefixes is not None:
789
prefixes = prefixes.split(':')
790
import_archive(to_root, from_archive, verbose, self.printer,
791
reuse_history_list, prefixes=prefixes)
792
793
794
def import_archive(to_root, from_archive, verbose, printer,
795
reuse_history_from=[], standalone=False,
796
prefixes=None):
797
def selected(version):
798
if prefixes is None:
799
return True
800
else:
801
for prefix in prefixes:
802
if version.nonarch.startswith(prefix):
803
return True
804
return False
805
real_to = os.path.realpath(to_root)
806
history_locations = [real_to] + reuse_history_from
807
if standalone is False:
808
try:
809
bd = BzrDir.open(to_root)
810
bd.find_repository()
811
except NotBranchError:
812
create_shared_repository(to_root)
813
except NoRepositoryPresent:
814
raise BzrCommandError("Can't create repository at existing branch.")
815
for version in pybaz.Archive(str(from_archive)).iter_versions():
816
if not selected(version):
817
print "Skipping %s" % version
818
continue
819
target = os.path.join(to_root, map_namespace(version))
820
printer("importing %s into %s" % (version, target))
821
if not os.path.exists(os.path.dirname(target)):
822
os.makedirs(os.path.dirname(target))
823
try:
824
import_version(target, version, printer,
825
reuse_history_from=reuse_history_from,
826
standalone=standalone)
827
except pybaz.errors.ExecProblem,e:
828
if str(e).find('The requested revision cannot be built.') != -1:
829
printer("Skipping version %s as it cannot be built due"
830
" to a missing parent archive." % version)
831
else:
832
raise
833
except UserError, e:
834
if str(e).find('already exists, and the last revision ') != -1:
835
printer("Skipping version %s as it has had commits made"
836
" since it was converted to bzr." % version)
837
else:
838
raise
839
840
841
def map_namespace(a_version):
842
a_version = pybaz.Version("%s" % a_version)
843
parser = NameParser(a_version)
844
version = parser.get_version()
845
branch = parser.get_branch()
846
category = parser.get_category()
847
if branch is None or branch == '':
848
branch = "+trunk"
849
if version == '0':
850
return "%s/%s" % (category, branch)
851
return "%s/%s/%s" % (category, version, branch)
852
853
def map_file_id(file_id):
854
"""Convert a baz file id to a bzr one."""
855
return file_id.replace('%', '%25').replace('/', '%2f')
576
import_version(to_location, from_branch)
Loggerhead is a web-based interface for Breezy
Version: 2.0.1