« back to all changes in this revision
Viewing changes to baz_import.py
- browse files at revision 465
- compare with another revision
- download diff
- download tarball
- view history from revision 465
- Committer: Aaron Bentley
- Date: 2006-11-23 00:05:45 UTC
- mfrom: (0.8.7 show_paths)
- Revision ID: aaron.bentley@utoronto.ca-20061123000545-vk3id8fxuzzclvsh
Add show-paths command from Alexander Belchenko
- files added:
- .be/bugs/9312b4cf-379e-490b-bfb5-dfb81357ee25
- .be/bugs/9312b4cf-379e-490b-bfb5-dfb81357ee25/comments
- .be/bugs/9312b4cf-379e-490b-bfb5-dfb81357ee25/comments/906938f4-be68-4d65-9b75-def07743b043
- .be/bugs/bad9a00f-50f5-4782-9da6-722fb0a58c93
- .be/bugs/c59acbbf-25f4-450a-9a8f-7a6a45b3985e
- .be/bugs/dbd10145-51f8-4bda-96d9-06b5d3ef80b8
- .be/bugs/fdc2b62a-9622-4f08-ac78-bd2603a4e0af
- .be/bugs/fdc2b62a-9622-4f08-ac78-bd2603a4e0af/comments
- .be/bugs/fdc2b62a-9622-4f08-ac78-bd2603a4e0af/comments/f13e3358-1a65-4a45-9472-781548bc3fc3
- files removed:
- debian
- testdata
- files renamed:
- push.py => rspush.py
- files modified:
- .be/bugs/1e6d3356-5668-47f3-b451-5285bcc0ec3b/values
added
removed
baz_import.py
31
31
from bzrlib.option import _global_option, Option
32
32
from bzrlib.merge import merge_inner
33
33
from bzrlib.revision import NULL_REVISION
34
from bzrlib.tree import EmptyTree
35
34
import bzrlib.ui
35
import bzrlib.ui.text
36
36
from bzrlib.workingtree import WorkingTree
37
37
from errors import NoPyBaz
38
38
try:
56
56
import email.Utils
57
57
from progress import *
58
58
59
60
BAZ_IMPORT_ROOT = 'TREE_ROOT'
61
62
59
63
class ImportCommitReporter(NullCommitReporter):
60
def __init__(self, pb):
61
self.pb = pb
62
64
63
65
def escaped(self, escape_count, message):
64
self.pb.clear()
65
66
bzrlib.trace.warning("replaced %d control characters in message" %
66
67
escape_count)
67
68
280
281
finally:
281
282
br_from.unlock()
282
283
283
def get_remaining_revisions(output_dir, version, reuse_history_from=[]):
284
def get_remaining_revisions(output_dir, version, encoding,
285
reuse_history_from=[]):
284
286
last_patch = None
285
287
old_revno = None
286
288
output_exists = os.path.exists(output_dir)
288
290
# We are starting from an existing directory, figure out what
289
291
# the current version is
290
292
branch = Branch.open(output_dir)
291
last_patch = get_last_revision(branch)
293
last_patch, last_encoding = get_last_revision(branch)
294
assert encoding == last_encoding
292
295
if last_patch is None:
293
raise NotPreviousImport(branch.base)
294
if version is None:
296
if branch.last_revision() != None:
297
raise NotPreviousImport(branch.base)
298
elif version is None:
295
299
version = last_patch.version
296
300
elif version is None:
297
301
raise UserError("No version specified, and directory does not exist.")
312
316
map_namespace(ancestor.version))
313
317
try:
314
318
source = Branch.open(possible_source)
315
rev_id = revision_id(ancestor)
319
rev_id = revision_id(ancestor, encoding)
316
320
if rev_id in source.revision_history():
317
321
do_branch(source, output_dir, rev_id)
318
322
last_patch = ancestor
345
349
### possible later.
346
350
### """
347
351
###
348
### def __init__(self, output_dir, version, printer, fancy=True, fast=False,
352
### def __init__(self, output_dir, version, fast=False,
349
353
### verbose=False, dry_run=False, max_count=None,
350
354
### reuse_history_from=[]):
351
355
### self.output_dir = output_dir
353
357
### self.
354
358
355
359
356
def import_version(output_dir, version, printer, fancy=True, fast=False,
360
def import_version(output_dir, version, encoding, fast=False,
357
361
verbose=False, dry_run=False, max_count=None,
358
362
reuse_history_from=[], standalone=True):
359
363
"""
360
364
>>> q = test_environ()
365
366
Progress bars output to stderr, but doctest does not capture that.
367
368
>>> old_stderr = sys.stderr
369
>>> sys.stderr = sys.stdout
370
361
371
>>> result_path = os.path.join(q, "result")
362
372
>>> commit_test_revisions()
363
373
>>> 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)
374
>>> old_ui = bzrlib.ui.ui_factory
375
>>> bzrlib.ui.ui_factory = bzrlib.ui.text.TextUIFactory(
376
... bar_type=bzrlib.progress.DotsProgressBar)
377
378
>>> import_version('/', version, None, dry_run=True)
366
379
Traceback (most recent call last):
367
380
NotPreviousImport: / is not the location of a previous import.
368
>>> import_version(result_path, version, printer, fancy=False, dry_run=True)
381
>>> import_version(result_path, version, None, dry_run=True)
369
382
Traceback (most recent call last):
370
383
UserError: The version test@example.com/test--test--0.1 does not exist.
371
384
>>> version = pybaz.Version("test@example.com/test--test--0")
372
>>> import_version(result_path, version, printer, fancy=False, dry_run=True)
373
not fancy
374
....
385
>>> import_version(result_path, version, None, dry_run=True) #doctest: +ELLIPSIS
386
importing test@example.com/test--test--0 into ...
387
...
388
revisions: ..........................................
375
389
Dry run, not modifying output_dir
376
390
Cleaning up
377
>>> import_version(result_path, version, printer, fancy=False)
378
not fancy
379
....
391
>>> import_version(result_path, version, None) #doctest: +ELLIPSIS
392
importing test@example.com/test--test--0 into ...
393
...
394
revisions: .....................................................................
380
395
Cleaning up
381
396
Import complete.
382
>>> import_version(result_path, version, printer, fancy=False)
397
>>> import_version(result_path, version, None) #doctest: +ELLIPSIS
383
398
Tree is up-to-date with test@example.com/test--test--0--patch-2
384
399
>>> commit_more_test_revisions()
385
>>> import_version(result_path, version, printer, fancy=False)
386
not fancy
387
..
400
>>> import_version(result_path, version, None) #doctest: +ELLIPSIS
401
importing test@example.com/test--test--0 into ...
402
revisions: ....................................................
388
403
Cleaning up
389
404
Import complete.
405
>>> bzrlib.ui.ui_factory = old_ui
406
>>> sys.stderr = old_stderr
390
407
>>> teardown_environ(q)
391
408
"""
392
try:
393
ancestors, old_revno = get_remaining_revisions(output_dir, version,
394
reuse_history_from)
395
except NotBranchError, e:
396
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
if len(ancestors) == 0:
401
last_revision = get_last_revision(Branch.open(output_dir))
402
print 'Tree is up-to-date with %s' % last_revision
403
return
404
405
409
progress_bar = bzrlib.ui.ui_factory.nested_progress_bar()
406
tempdir = tempfile.mkdtemp(prefix="baz2bzr-",
407
dir=os.path.dirname(output_dir))
408
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
if not fancy:
418
print "not fancy"
410
try:
419
411
try:
420
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):
423
if fancy:
424
show_progress(progress_bar, result)
425
else:
426
sys.stdout.write('.')
427
finally:
428
if fancy:
429
progress_bar.finished()
430
else:
431
sys.stdout.write('\n')
432
433
if dry_run:
434
print 'Dry run, not modifying output_dir'
435
return
436
437
# Update the working tree of the branch
412
ancestors, old_revno = get_remaining_revisions(output_dir, version,
413
encoding,
414
reuse_history_from)
415
except NotBranchError, e:
416
raise NotPreviousImport(e.path)
417
if old_revno is None and len(ancestors) == 0:
418
progress_bar.note('Version %s has no revisions.' % version)
419
return
420
if len(ancestors) == 0:
421
last_revision, last_encoding = \
422
get_last_revision(Branch.open(output_dir))
423
progress_bar.note('Tree is up-to-date with %s' % last_revision)
424
return
425
426
progress_bar.note("importing %s into %s" % (version, output_dir))
427
428
tempdir = tempfile.mkdtemp(prefix="baz2bzr-",
429
dir=os.path.dirname(output_dir))
438
430
try:
439
431
wt = WorkingTree.open(output_dir)
440
except NoWorkingTree:
432
except (NotBranchError, NoWorkingTree):
441
433
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([])
447
434
try:
435
for result in iter_import_version(output_dir, ancestors, tempdir,
436
pb=progress_bar, encoding=encoding, fast=fast,
437
verbose=verbose, dry_run=dry_run, max_count=max_count,
438
standalone=standalone):
439
show_progress(progress_bar, result)
440
if dry_run:
441
progress_bar.note('Dry run, not modifying output_dir')
442
return
443
444
# Update the working tree of the branch
445
try:
446
wt = WorkingTree.open(output_dir)
447
except NoWorkingTree:
448
wt = None
449
if wt is not None:
450
wt.set_last_revision(wt.branch.last_revision())
451
wt.set_root_id(BAZ_IMPORT_ROOT)
452
wt.revert([])
453
454
finally:
455
456
progress_bar.note('Cleaning up')
457
shutil.rmtree(tempdir)
458
progress_bar.note("Import complete.")
448
459
finally:
449
printer('Cleaning up')
450
shutil.rmtree(tempdir)
451
printer("Import complete.")
460
progress_bar.finished()
452
461
453
462
class UserError(BzrCommandError):
454
463
def __init__(self, message):
464
473
% path)
465
474
466
475
467
def revision_id(arch_revision):
476
def revision_id(arch_revision, encoding):
468
477
"""
469
478
Generate a Bzr revision id from an Arch revision id. 'x' in the id
470
479
designates a revision imported with an experimental algorithm. A number
472
481
473
482
:param arch_revision: The Arch revision to generate an ID for.
474
483
475
>>> revision_id(pybaz.Revision("you@example.com/cat--br--0--base-0"))
484
>>> revision_id(pybaz.Revision("you@example.com/cat--br--0--base-0"), None)
476
485
'Arch-1:you@example.com%cat--br--0--base-0'
486
>>> revision_id(pybaz.Revision("you@example.com/cat--br--0--base-0"), 'utf-8')
487
'Arch-1-utf-8:you@example.com%cat--br--0--base-0'
477
488
"""
478
return "Arch-1:%s" % str(arch_revision).replace('/', '%')
489
if encoding is None:
490
encoding = ''
491
else:
492
encoding = '-' + encoding
493
return "Arch-1%s:%s" % (encoding, str(arch_revision).replace('/', '%'))
479
494
480
495
class NotArchRevision(Exception):
481
496
def __init__(self, revision_id):
491
506
>>> str(arch_revision("Arch-1:jrandom@example.com%test--test--0--base-5"))
492
507
Traceback (most recent call last):
493
508
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"))
495
'jrandom@example.com/test--test--0--patch-5'
509
>>> str(arch_revision("Arch-1:jrandom@example.com%test--test--0--patch-5")[0])
510
'jrandom@example.com/test--test--0--patch-5'
511
>>> str(arch_revision("Arch-1:jrandom@example.com%test--test--0--patch-5")[0])
512
'jrandom@example.com/test--test--0--patch-5'
513
>>> str(arch_revision("Arch-1:jrandom@example.com%test--test--0--patch-5")[1])
514
'None'
515
>>> str(arch_revision("Arch-1-utf-8:jrandom@example.com%test--test--0--patch-5")[1])
516
'utf-8'
496
517
"""
497
518
if revision_id is None:
498
return None
499
if revision_id[:7] != 'Arch-1:':
519
return None, None
520
if revision_id[:7] not in ('Arch-1:', 'Arch-1-'):
500
521
raise NotArchRevision(revision_id)
501
522
else:
502
523
try:
503
return pybaz.Revision(revision_id[7:].replace('%', '/'))
524
encoding, arch_name = revision_id[6:].split(':', 1)
525
arch_name = arch_name.replace('%', '/')
526
if encoding == '':
527
encoding = None
528
else:
529
encoding = encoding[1:]
530
return pybaz.Revision(arch_name), encoding
504
531
except pybaz.errors.NamespaceError, e:
505
532
raise NotArchRevision(revision_id)
506
533
526
553
revision_id = source.last_revision()
527
554
wt = create_checkout(source, to_location, NULL_REVISION)
528
555
wt.set_last_revision(revision_id)
529
wt._write_inventory(wt.basis_tree().inventory)
556
if revision_id not in (NULL_REVISION, None):
557
wt._write_inventory(wt.basis_tree().inventory)
530
558
return wt
531
559
532
560
533
def iter_import_version(output_dir, ancestors, tempdir, pb, fast=False,
534
verbose=False, dry_run=False, max_count=None,
535
standalone=False):
561
def iter_import_version(output_dir, ancestors, tempdir, pb, encoding,
562
fast=False, verbose=False, dry_run=False,
563
max_count=None, standalone=False):
536
564
revdir = None
565
log_encoding = 'ascii'
566
if encoding is not None:
567
log_encoding = encoding
537
568
538
569
# Uncomment this for testing, it basically just has baz2bzr only update
539
570
# 5 patches at a time
568
599
569
600
for i in range(len(ancestors)):
570
601
revision = ancestors[i]
571
rev_id = revision_id(revision)
602
rev_id = revision_id(revision, encoding)
572
603
direct_merges = []
573
604
if verbose:
574
605
version = str(revision.version)
575
606
if version != previous_version:
576
clear_progress_bar()
577
print '\rOn version: %s' % version
607
pb.note('On version: %s' % version)
578
608
yield Progress(str(revision.patchlevel), i, len(ancestors))
579
609
previous_version = version
580
610
else:
592
622
raise
593
623
missing_ancestor = revision
594
624
revdir = None
595
print ("unable to access ancestor %s, making into a merge."
625
pb.note("unable to access ancestor %s, making into a merge."
596
626
% missing_ancestor)
597
627
continue
598
628
target_tree = create_checkout_metadata(target_branch, revdir)
626
656
try:
627
657
if missing_ancestor:
628
658
# if we want it to be in revision-history, do that here.
629
target_tree.add_pending_merge(revision_id(missing_ancestor))
659
target_tree.set_parent_ids(
660
[revision_id(missing_ancestor, encoding)],
661
allow_leftmost_as_ghost=True)
630
662
missing_ancestor = None
631
663
for merged_rev in direct_merges:
632
target_tree.add_pending_merge(revision_id(merged_rev))
664
target_tree.add_pending_merge(revision_id(merged_rev,
665
encoding))
666
target_tree.set_root_id(BAZ_IMPORT_ROOT)
633
667
target_tree.set_inventory(baz_inv)
634
commitobj = Commit(reporter=ImportCommitReporter(pb))
668
commitobj = Commit(reporter=ImportCommitReporter())
635
669
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={})
670
message=log_message.decode(log_encoding, 'replace'),
671
verbose=False, committer=log_creator, timestamp=timestamp,
672
timezone=0, rev_id=rev_id, revprops={})
640
673
finally:
641
674
target_tree.unlock()
642
675
branch.unlock()
722
755
bzr_inv.sort()
723
756
return bzr_inv
724
757
725
_global_option('max-count', type = int)
726
class cmd_baz_import_branch(Command):
727
"""Import an Arch or Baz branch into a bzr branch. <BZRTOOLS>"""
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=[]):
736
to_location = os.path.realpath(str(to_location))
737
if from_branch is not None:
738
try:
739
from_branch = pybaz.Version(from_branch)
740
except pybaz.errors.NamespaceError:
741
print "%s is not a valid Arch branch." % from_branch
742
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)
758
759
def baz_import_branch(to_location, from_branch, fast, max_count, verbose,
760
encoding, dry_run, reuse_history_list):
761
to_location = os.path.realpath(str(to_location))
762
if from_branch is not None:
763
try:
764
from_branch = pybaz.Version(from_branch)
765
except pybaz.errors.NamespaceError:
766
print "%s is not a valid Arch branch." % from_branch
767
return 1
768
if reuse_history_list is None:
769
reuse_history_list = []
770
import_version(to_location, from_branch, encoding, max_count=max_count,
771
reuse_history_from=reuse_history_list)
748
772
749
773
750
774
class NotInABranch(Exception):
753
777
self.path = path
754
778
755
779
756
class cmd_baz_import(Command):
757
"""Import an Arch or Baz archive into bzr branches. <BZRTOOLS>
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,
780
781
def baz_import(to_root_dir, from_archive, encoding, 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, encoding,
791
reuse_history_list, prefixes=prefixes)
792
793
794
def import_archive(to_root, from_archive, verbose,
795
encoding, reuse_history_from=[], standalone=False,
796
796
prefixes=None):
797
797
def selected(version):
798
798
if prefixes is None:
813
813
except NoRepositoryPresent:
814
814
raise BzrCommandError("Can't create repository at existing branch.")
815
815
versions = list(pybaz.Archive(str(from_archive)).iter_versions())
816
# progress_bar = bzrlib.ui.ui_factory.nested_progress_bar()
816
progress_bar = bzrlib.ui.ui_factory.nested_progress_bar()
817
817
try:
818
818
for num, version in enumerate(versions):
819
# progress_bar.update("Branch", num, len(versions))
819
progress_bar.update("Branch", num, len(versions))
820
820
if not selected(version):
821
821
print "Skipping %s" % version
822
822
continue
823
823
target = os.path.join(to_root, map_namespace(version))
824
printer("importing %s into %s" % (version, target))
825
824
if not os.path.exists(os.path.dirname(target)):
826
825
os.makedirs(os.path.dirname(target))
827
826
try:
828
import_version(target, version, printer,
827
import_version(target, version, encoding,
829
828
reuse_history_from=reuse_history_from,
830
829
standalone=standalone)
831
830
except pybaz.errors.ExecProblem,e:
832
831
if str(e).find('The requested revision cannot be built.') != -1:
833
printer("Skipping version %s as it cannot be built due"
834
" to a missing parent archive." % version)
832
progress_bar.note(
833
"Skipping version %s as it cannot be built due"
834
" to a missing parent archive." % version)
835
835
else:
836
836
raise
837
837
except UserError, e:
838
838
if str(e).find('already exists, and the last revision ') != -1:
839
printer("Skipping version %s as it has had commits made"
840
" since it was converted to bzr." % version)
839
progress_bar.note(
840
"Skipping version %s as it has had commits made"
841
" since it was converted to bzr." % version)
841
842
else:
842
843
raise
843
844
finally:
844
pass
845
# progress_bar.finished()
845
progress_bar.finished()
846
846
847
847
848
def map_namespace(a_version):
848
849
a_version = pybaz.Version("%s" % a_version)
856
857
return "%s/%s" % (category, branch)
857
858
return "%s/%s/%s" % (category, version, branch)
858
859
860
859
861
def map_file_id(file_id):
860
862
"""Convert a baz file id to a bzr one."""
861
863
return file_id.replace('%', '%25').replace('/', '%2f')
Loggerhead is a web-based interface for Breezy
Version: 2.0.1