← Back to branch summary

~abentley/bzrtools/bzrtools.dev

« back to all changes in this revision

Viewing changes to baz_import.py

  • Committer: Aaron Bentley
  • Date: 2006-03-02 14:41:10 UTC
  • mfrom: (321 bzrtools)
  • mto: (147.4.30 trunk)
  • mto: This revision was merged to the branch mainline in revision 324.
  • Revision ID: abentley@panoramicfeedback.com-20060302144110-ef56e37f5cb21168
Merged -p1 updates.

Show diffs side-by-side

added added

removed removed

Lines of Context:
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
17
17
import errno
18
18
 
19
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
 
                          )
 
20
from bzrlib.errors import BzrError
 
21
from bzrlib.errors import NotBranchError, BzrCommandError, NoSuchRevision
28
22
from bzrlib.branch import Branch
29
23
from bzrlib.commit import Commit, NullCommitReporter
30
24
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
 
import bzrlib.ui
35
 
import bzrlib.ui.text
 
25
from bzrlib.option import _global_option
36
26
from bzrlib.workingtree import WorkingTree
37
27
from errors import NoPyBaz
38
28
try:
56
46
import email.Utils
57
47
from progress import *
58
48
 
59
 
 
60
 
BAZ_IMPORT_ROOT = 'TREE_ROOT'
61
 
 
62
 
 
63
49
class ImportCommitReporter(NullCommitReporter):
 
50
    def __init__(self, pb):
 
51
        self.pb = pb
64
52
 
65
53
    def escaped(self, escape_count, message):
 
54
        self.pb.clear()
66
55
        bzrlib.trace.warning("replaced %d control characters in message" %
67
56
                             escape_count)
68
57
 
84
73
 
85
74
def make_archive(name, location):
86
75
    pb_location = pybaz.ArchiveLocation(location)
87
 
    pb_location.create_master(pybaz.Archive(name),
 
76
    pb_location.create_master(pybaz.Archive(name), 
88
77
                              pybaz.ArchiveLocationParams())
89
78
 
90
79
def test_environ():
275
264
            br_from.bzrdir.clone(to_location, revision_id)
276
265
        except NoSuchRevision:
277
266
            rmtree(to_location)
278
 
            msg = "The branch %s has no revision %s." % (from_location,
 
267
            msg = "The branch %s has no revision %s." % (from_location, 
279
268
                                                         revision_id)
280
269
            raise UserError(msg)
281
270
    finally:
282
271
        br_from.unlock()
283
272
 
284
 
def get_remaining_revisions(output_dir, version, encoding,
285
 
                            reuse_history_from=[]):
 
273
def get_remaining_revisions(output_dir, version, reuse_history_from=[]):
286
274
    last_patch = None
287
275
    old_revno = None
288
276
    output_exists = os.path.exists(output_dir)
290
278
        # We are starting from an existing directory, figure out what
291
279
        # the current version is
292
280
        branch = Branch.open(output_dir)
293
 
        last_patch, last_encoding = get_last_revision(branch)
294
 
        assert encoding == last_encoding
 
281
        last_patch = get_last_revision(branch)
295
282
        if last_patch is None:
296
 
            if branch.last_revision() != None:
297
 
                raise NotPreviousImport(branch.base)
298
 
        elif version is None:
 
283
            raise NotPreviousImport(branch.base)
 
284
        if version is None:
299
285
            version = last_patch.version
300
286
    elif version is None:
301
287
        raise UserError("No version specified, and directory does not exist.")
309
295
                    break
310
296
                # try to grab a copy of ancestor
311
297
                # note that is not optimised: we could look for namespace
312
 
                # transitions and only look for the past after the
 
298
                # transitions and only look for the past after the 
313
299
                # transition.
314
300
                for history_root in reuse_history_from:
315
301
                    possible_source = os.path.join(history_root,
316
302
                        map_namespace(ancestor.version))
317
303
                    try:
318
304
                        source = Branch.open(possible_source)
319
 
                        rev_id = revision_id(ancestor, encoding)
 
305
                        rev_id = revision_id(ancestor)
320
306
                        if rev_id in source.revision_history():
321
307
                            do_branch(source, output_dir, rev_id)
322
308
                            last_patch = ancestor
332
318
                break
333
319
        else:
334
320
            raise UserError("Directory \"%s\" already exists, and the last "
335
 
                "revision (%s) is not in the ancestry of %s" %
 
321
                "revision (%s) is not in the ancestry of %s" % 
336
322
                (output_dir, last_patch, version))
337
323
        # Strip off all of the ancestors which are already present
338
324
        # And get a directory starting with the latest ancestor
344
330
 
345
331
###class Importer(object):
346
332
###    """An importer.
347
 
###
 
333
###    
348
334
###    Currently this is used as a parameter object, though more behaviour is
349
335
###    possible later.
350
336
###    """
351
337
###
352
 
###    def __init__(self, output_dir, version, fast=False,
353
 
###                 verbose=False, dry_run=False, max_count=None,
 
338
###    def __init__(self, output_dir, version, printer, fancy=True, fast=False,
 
339
###                 verbose=False, dry_run=False, max_count=None, 
354
340
###                   reuse_history_from=[]):
355
341
###        self.output_dir = output_dir
356
342
###        self.version = version
357
343
###        self.
358
344
 
359
345
 
360
 
def import_version(output_dir, version, encoding, fast=False,
 
346
def import_version(output_dir, version, printer, fancy=True, fast=False,
361
347
                   verbose=False, dry_run=False, max_count=None,
362
 
                   reuse_history_from=[], standalone=True):
 
348
                   reuse_history_from=[]):
363
349
    """
364
350
    >>> 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
 
 
371
351
    >>> result_path = os.path.join(q, "result")
372
352
    >>> commit_test_revisions()
373
353
    >>> version = pybaz.Version("test@example.com/test--test--0.1")
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)
 
354
    >>> def printer(message): print message
 
355
    >>> import_version('/', version, printer, fancy=False, dry_run=True)
379
356
    Traceback (most recent call last):
380
357
    NotPreviousImport: / is not the location of a previous import.
381
 
    >>> import_version(result_path, version, None, dry_run=True)
 
358
    >>> import_version(result_path, version, printer, fancy=False, dry_run=True)
382
359
    Traceback (most recent call last):
383
360
    UserError: The version test@example.com/test--test--0.1 does not exist.
384
361
    >>> version = pybaz.Version("test@example.com/test--test--0")
385
 
    >>> import_version(result_path, version, None, dry_run=True) #doctest: +ELLIPSIS
386
 
    importing test@example.com/test--test--0 into ...
387
 
    ...
388
 
    revisions: ..........................................
 
362
    >>> import_version(result_path, version, printer, fancy=False, dry_run=True)
 
363
    not fancy
 
364
    ....
389
365
    Dry run, not modifying output_dir
390
366
    Cleaning up
391
 
    >>> import_version(result_path, version, None) #doctest: +ELLIPSIS
392
 
    importing test@example.com/test--test--0 into ...
393
 
    ...
394
 
    revisions: .....................................................................
 
367
    >>> import_version(result_path, version, printer, fancy=False)
 
368
    not fancy
 
369
    ....
395
370
    Cleaning up
396
371
    Import complete.
397
 
    >>> import_version(result_path, version, None) #doctest: +ELLIPSIS
 
372
    >>> import_version(result_path, version, printer, fancy=False)
398
373
    Tree is up-to-date with test@example.com/test--test--0--patch-2
399
374
    >>> commit_more_test_revisions()
400
 
    >>> import_version(result_path, version, None) #doctest: +ELLIPSIS
401
 
    importing test@example.com/test--test--0 into ...
402
 
    revisions: ....................................................
 
375
    >>> import_version(result_path, version, printer, fancy=False)
 
376
    not fancy
 
377
    ..
403
378
    Cleaning up
404
379
    Import complete.
405
 
    >>> bzrlib.ui.ui_factory = old_ui
406
 
    >>> sys.stderr = old_stderr
407
380
    >>> teardown_environ(q)
408
381
    """
409
 
    progress_bar = bzrlib.ui.ui_factory.nested_progress_bar()
410
 
    try:
411
 
        try:
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))
430
 
        try:
431
 
            wt = WorkingTree.open(output_dir)
432
 
        except (NotBranchError, NoWorkingTree):
433
 
            wt = None
 
382
    try:
 
383
        ancestors, old_revno = get_remaining_revisions(output_dir, version,
 
384
                                                       reuse_history_from)
 
385
    except NotBranchError, e:
 
386
        raise NotPreviousImport(e.path)
 
387
    if old_revno is None and len(ancestors) == 0:
 
388
        print 'Version %s has no revisions.' % version
 
389
        return
 
390
    if len(ancestors) == 0:
 
391
        last_revision = get_last_revision(Branch.open(output_dir))
 
392
        print 'Tree is up-to-date with %s' % last_revision
 
393
        return
 
394
 
 
395
    progress_bar = ProgressBar()
 
396
    tempdir = tempfile.mkdtemp(prefix="baz2bzr-",
 
397
                               dir=os.path.dirname(output_dir))
 
398
    try:
 
399
        if not fancy:
 
400
            print "not fancy"
434
401
        try:
435
402
            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
 
 
 
403
                    progress_bar, fast=fast, verbose=verbose, dry_run=dry_run,
 
404
                    max_count=max_count):
 
405
                if fancy:
 
406
                    show_progress(progress_bar, result)
 
407
                else:
 
408
                    sys.stdout.write('.')
454
409
        finally:
455
 
 
456
 
            progress_bar.note('Cleaning up')
457
 
            shutil.rmtree(tempdir)
458
 
        progress_bar.note("Import complete.")
 
410
            if fancy:
 
411
                progress_bar.clear()
 
412
            else:
 
413
                sys.stdout.write('\n')
 
414
 
 
415
        if dry_run:
 
416
            print 'Dry run, not modifying output_dir'
 
417
            return
 
418
        if os.path.exists(output_dir):
 
419
            # Move the bzr control directory back, and update the working tree
 
420
            revdir = os.path.join(tempdir, "rd")
 
421
            if os.path.exists(revdir):
 
422
                # actual imports were done
 
423
                tmp_bzr_dir = os.path.join(tempdir, '.bzr')
 
424
                
 
425
                bzr_dir = os.path.join(output_dir, '.bzr')
 
426
                new_bzr_dir = os.path.join(tempdir, "rd", '.bzr')
 
427
                
 
428
                # Move the original bzr out of the way    
 
429
                os.rename(bzr_dir, tmp_bzr_dir) 
 
430
                os.rename(new_bzr_dir, bzr_dir)
 
431
                try:
 
432
                    WorkingTree.open_containing(output_dir)[0].revert([])
 
433
                except:
 
434
                    # If something failed, move back the original bzr directory
 
435
                    os.rename(bzr_dir, new_bzr_dir)
 
436
                    os.rename(tmp_bzr_dir, bzr_dir)
 
437
                    raise
 
438
            else:
 
439
                # no imports - perhaps just append_revisions
 
440
                # should not fail:
 
441
                WorkingTree.open_containing(output_dir)[0].revert([])
 
442
        else:
 
443
            revdir = os.path.join(tempdir, "rd")
 
444
            os.rename(revdir, output_dir)
 
445
 
459
446
    finally:
460
 
        progress_bar.finished()
461
 
 
 
447
        printer('Cleaning up')
 
448
        shutil.rmtree(tempdir)
 
449
    printer("Import complete.")
 
450
            
462
451
class UserError(BzrCommandError):
463
452
    def __init__(self, message):
464
453
        """Exception to throw when a user makes an impossible request
473
462
                           % path)
474
463
 
475
464
 
476
 
def revision_id(arch_revision, encoding):
 
465
def revision_id(arch_revision):
477
466
    """
478
467
    Generate a Bzr revision id from an Arch revision id.  'x' in the id
479
468
    designates a revision imported with an experimental algorithm.  A number
481
470
 
482
471
    :param arch_revision: The Arch revision to generate an ID for.
483
472
 
484
 
    >>> revision_id(pybaz.Revision("you@example.com/cat--br--0--base-0"), None)
 
473
    >>> revision_id(pybaz.Revision("you@example.com/cat--br--0--base-0"))
485
474
    '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'
488
475
    """
489
 
    if encoding is None:
490
 
        encoding = ''
491
 
    else:
492
 
        encoding = '-' + encoding
493
 
    return "Arch-1%s:%s" % (encoding, str(arch_revision).replace('/', '%'))
 
476
    return "Arch-1:%s" % str(arch_revision).replace('/', '%')
494
477
 
495
478
class NotArchRevision(Exception):
496
479
    def __init__(self, revision_id):
506
489
    >>> str(arch_revision("Arch-1:jrandom@example.com%test--test--0--base-5"))
507
490
    Traceback (most recent call last):
508
491
    NotArchRevision: The revision id Arch-1:jrandom@example.com%test--test--0--base-5 does not look like it came from Arch.
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'
 
492
    >>> str(arch_revision("Arch-1:jrandom@example.com%test--test--0--patch-5"))
 
493
    'jrandom@example.com/test--test--0--patch-5'
517
494
    """
518
495
    if revision_id is None:
519
 
        return None, None
520
 
    if revision_id[:7] not in ('Arch-1:', 'Arch-1-'):
 
496
        return None
 
497
    if revision_id[:7] != 'Arch-1:':
521
498
        raise NotArchRevision(revision_id)
522
499
    else:
523
500
        try:
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
 
501
            return pybaz.Revision(revision_id[7:].replace('%', '/'))
531
502
        except pybaz.errors.NamespaceError, e:
532
503
            raise NotArchRevision(revision_id)
533
 
 
534
 
 
535
 
def create_shared_repository(output_dir):
536
 
    bd = bzrdir.BzrDirMetaFormat1().initialize(output_dir)
537
 
    bd.create_repository(shared=True)
538
 
 
539
 
def create_branch(output_dir):
540
 
    os.mkdir(output_dir)
541
 
    bd = bzrdir.BzrDirMetaFormat1().initialize(output_dir)
542
 
    return bd.create_branch()
543
 
 
544
 
 
545
 
def create_checkout(source, to_location, revision_id=None):
546
 
    checkout = bzrdir.BzrDirMetaFormat1().initialize(to_location)
547
 
    bzrlib.branch.BranchReferenceFormat().initialize(checkout, source)
548
 
    return checkout.create_workingtree(revision_id)
549
 
 
550
 
 
551
 
def create_checkout_metadata(source, to_location, revision_id=None):
552
 
    if revision_id is None:
553
 
        revision_id = source.last_revision()
554
 
    wt = create_checkout(source, to_location, NULL_REVISION)
555
 
    wt.lock_write()
556
 
    try:
557
 
        wt.set_last_revision(revision_id)
558
 
        wt.flush()
559
 
        if revision_id not in (NULL_REVISION, None):
560
 
            basis = wt.basis_tree()
561
 
            basis.lock_read()
562
 
            try:
563
 
                wt._write_inventory(basis.inventory)
564
 
            finally:
565
 
                basis.unlock()
566
 
    finally:
567
 
        wt.unlock()
568
 
    return wt
569
 
 
570
 
 
571
 
def iter_import_version(output_dir, ancestors, tempdir, pb, encoding,
572
 
                        fast=False, verbose=False, dry_run=False,
573
 
                        max_count=None, standalone=False):
 
504
            
 
505
def iter_import_version(output_dir, ancestors, tempdir, pb, fast=False,
 
506
                        verbose=False, dry_run=False, max_count=None):
574
507
    revdir = None
575
 
    log_encoding = 'ascii'
576
 
    if encoding is not None:
577
 
        log_encoding = encoding
578
508
 
579
509
    # Uncomment this for testing, it basically just has baz2bzr only update
580
510
    # 5 patches at a time
592
522
 
593
523
    previous_version=None
594
524
    missing_ancestor = None
595
 
    if dry_run:
596
 
        dry_output_dir = os.path.join(tempdir, 'od')
597
 
        if os.path.exists(output_dir):
598
 
            shutil.copytree(output_dir, dry_output_dir)
599
 
        output_dir = dry_output_dir
600
 
 
601
 
    if os.path.exists(output_dir):
602
 
        target_branch = Branch.open(output_dir)
603
 
    else:
604
 
        if standalone:
605
 
            wt = BzrDir.create_standalone_workingtree(output_dir)
606
 
            target_branch = wt.branch
607
 
        else:
608
 
            target_branch = create_branch(output_dir)
609
525
 
610
526
    for i in range(len(ancestors)):
611
527
        revision = ancestors[i]
612
 
        rev_id = revision_id(revision, encoding)
 
528
        rev_id = revision_id(revision)
613
529
        direct_merges = []
614
530
        if verbose:
615
531
            version = str(revision.version)
616
532
            if version != previous_version:
617
 
                pb.note('On version: %s' % version)
 
533
                clear_progress_bar()
 
534
                print '\rOn version: %s' % version
618
535
            yield Progress(str(revision.patchlevel), i, len(ancestors))
619
536
            previous_version = version
620
537
        else:
621
538
            yield Progress("revisions", i, len(ancestors))
622
 
 
623
 
        if target_branch.repository.has_revision(rev_id):
624
 
            target_branch.append_revision(rev_id)
625
 
            continue
 
539
        if revdir is None and os.path.exists(output_dir):
 
540
            # check for imported revisions and if present just append
 
541
            # immediately
 
542
            target_tree = WorkingTree.open(output_dir)
 
543
            branch = target_tree.branch
 
544
            if branch.repository.has_revision(rev_id):
 
545
                branch.append_revision(rev_id)
 
546
                continue
626
547
        if revdir is None:
627
548
            revdir = os.path.join(tempdir, "rd")
628
549
            try:
632
553
                    raise
633
554
                missing_ancestor = revision
634
555
                revdir = None
635
 
                pb.note("unable to access ancestor %s, making into a merge."
 
556
                print ("unable to access ancestor %s, making into a merge."
636
557
                       % missing_ancestor)
637
558
                continue
638
 
            target_tree = create_checkout_metadata(target_branch, revdir)
639
 
            branch = target_tree.branch
 
559
            if os.path.exists(output_dir):
 
560
                bzr_dir = os.path.join(output_dir, '.bzr')
 
561
                new_bzr_dir = os.path.join(tempdir, "rd", '.bzr')
 
562
                # This would be much faster with a simple os.rename(), but if
 
563
                # we fail, we have corrupted the original .bzr directory.  Is
 
564
                # that a big problem, as we can just back out the last
 
565
                # revisions in .bzr/revision_history I don't really know
 
566
                # RBC20051024 - yes, it would be a problem as we could not then
 
567
                # apply the corrupted revision.
 
568
                shutil.copytree(bzr_dir, new_bzr_dir)
 
569
                # Now revdir should have a tree with the latest .bzr, and the
 
570
                # next revision of the baz tree
 
571
                target_tree = WorkingTree.open(revdir)
 
572
                branch = target_tree.branch
 
573
            else:
 
574
                target_tree = BzrDir.create_standalone_workingtree(revdir)
 
575
                branch = target_tree.branch
640
576
        else:
641
577
            old = os.path.join(revdir, ".bzr")
642
578
            new = os.path.join(tempdir, ".bzr")
666
602
        try:
667
603
            if missing_ancestor:
668
604
                # if we want it to be in revision-history, do that here.
669
 
                target_tree.set_parent_ids(
670
 
                    [revision_id(missing_ancestor, encoding)],
671
 
                    allow_leftmost_as_ghost=True)
 
605
                target_tree.add_pending_merge(revision_id(missing_ancestor))
672
606
                missing_ancestor = None
673
607
            for merged_rev in direct_merges:
674
 
                target_tree.add_pending_merge(revision_id(merged_rev,
675
 
                                                          encoding))
676
 
            target_tree.set_root_id(BAZ_IMPORT_ROOT)
677
 
            target_tree.flush()
 
608
                target_tree.add_pending_merge(revision_id(merged_rev))
678
609
            target_tree.set_inventory(baz_inv)
679
 
            commitobj = Commit(reporter=ImportCommitReporter())
 
610
            commitobj = Commit(reporter=ImportCommitReporter(pb))
680
611
            commitobj.commit(working_tree=target_tree,
681
 
                message=log_message.decode(log_encoding, 'replace'),
682
 
                verbose=False, committer=log_creator, timestamp=timestamp,
683
 
                timezone=0, rev_id=rev_id, revprops={})
 
612
                             message=log_message.decode('ascii', 'replace'), 
 
613
                             verbose=False, committer=log_creator,
 
614
                             timestamp=timestamp, timezone=0, rev_id=rev_id)
684
615
        finally:
685
616
            target_tree.unlock()
686
617
            branch.unlock()
687
618
    yield Progress("revisions", len(ancestors), len(ancestors))
 
619
    unlink_unversioned(target_tree)
688
620
 
689
621
def get_direct_merges(revdir, revision, log):
690
622
    continuation = log.continuation_of
691
623
    previous_version = revision.version
692
624
    if pybaz.WorkingTree(revdir).tree_version != previous_version:
693
625
        pybaz.WorkingTree(revdir).set_tree_version(previous_version)
694
 
    log_path = "%s/{arch}/%s/%s/%s/%s/patch-log/%s" % (revdir,
695
 
        revision.category.nonarch, revision.branch.nonarch,
 
626
    log_path = "%s/{arch}/%s/%s/%s/%s/patch-log/%s" % (revdir, 
 
627
        revision.category.nonarch, revision.branch.nonarch, 
696
628
        revision.version.nonarch, revision.archive, revision.patchlevel)
697
629
    temp_path = tempfile.mktemp(dir=os.path.dirname(revdir))
698
630
    os.rename(log_path, temp_path)
718
650
    tree = revision.get(revdir)
719
651
    log = get_log(tree, revision)
720
652
    try:
721
 
        return tree, bzr_inventory_data(tree), log
 
653
        return tree, bzr_inventory_data(tree), log 
722
654
    except BadFileKind, e:
723
 
        raise UserError("Cannot convert %s because %s is a %s" %
 
655
        raise UserError("Cannot convert %s because %s is a %s" % 
724
656
                        (revision,e.path, e.kind))
725
657
 
726
658
 
730
662
    try:
731
663
        return bzr_inventory_data(tree), log
732
664
    except BadFileKind, e:
733
 
        raise UserError("Cannot convert %s because %s is a %s" %
 
665
        raise UserError("Cannot convert %s because %s is a %s" % 
734
666
                        (revision,e.path, e.kind))
735
667
 
736
668
 
749
681
    inv_map = {}
750
682
    for arch_id, path in inv_iter:
751
683
        bzr_file_id = map_file_id(arch_id)
752
 
        inv_map[path] = bzr_file_id
 
684
        inv_map[path] = bzr_file_id 
753
685
 
754
686
    bzr_inv = []
755
687
    for path, file_id in inv_map.iteritems():
766
698
    bzr_inv.sort()
767
699
    return bzr_inv
768
700
 
769
 
 
770
 
def baz_import_branch(to_location, from_branch, fast, max_count, verbose,
771
 
                      encoding, dry_run, reuse_history_list):
772
 
    to_location = os.path.realpath(str(to_location))
773
 
    if from_branch is not None:
774
 
        try:
775
 
            from_branch = pybaz.Version(from_branch)
776
 
        except pybaz.errors.NamespaceError:
777
 
            print "%s is not a valid Arch branch." % from_branch
778
 
            return 1
779
 
    if reuse_history_list is None:
780
 
        reuse_history_list = []
781
 
    import_version(to_location, from_branch, encoding, max_count=max_count,
782
 
                   reuse_history_from=reuse_history_list)
 
701
_global_option('max-count', type = int)
 
702
class cmd_baz_import_branch(Command):
 
703
    """Import an Arch or Baz branch into a bzr branch"""
 
704
    takes_args = ['to_location', 'from_branch?', 'reuse_history*']
 
705
    takes_options = ['verbose', 'max-count']
 
706
 
 
707
    def printer(self, name):
 
708
        print name
 
709
 
 
710
    def run(self, to_location, from_branch=None, fast=False, max_count=None,
 
711
            verbose=False, dry_run=False, reuse_history_list=[]):
 
712
        to_location = os.path.realpath(str(to_location))
 
713
        if from_branch is not None:
 
714
            try:
 
715
                from_branch = pybaz.Version(from_branch)
 
716
            except pybaz.errors.NamespaceError:
 
717
                print "%s is not a valid Arch branch." % from_branch
 
718
                return 1
 
719
        if reuse_history_list is None:
 
720
            reuse_history_list = []
 
721
        import_version(to_location, from_branch, self.printer, 
 
722
                       max_count=max_count, 
 
723
                       reuse_history_from=reuse_history_list)
783
724
 
784
725
 
785
726
class NotInABranch(Exception):
788
729
        self.path = path
789
730
 
790
731
 
791
 
 
792
 
def baz_import(to_root_dir, from_archive, encoding, verbose=False,
793
 
               reuse_history_list=[], prefixes=None):
794
 
    if reuse_history_list is None:
795
 
        reuse_history_list = []
796
 
    to_root = str(os.path.realpath(to_root_dir))
797
 
    if not os.path.exists(to_root):
798
 
        os.mkdir(to_root)
799
 
    if prefixes is not None:
800
 
        prefixes = prefixes.split(':')
801
 
    import_archive(to_root, from_archive, verbose, encoding,
802
 
                   reuse_history_list, prefixes=prefixes)
803
 
 
804
 
 
805
 
def import_archive(to_root, from_archive, verbose,
806
 
                   encoding, reuse_history_from=[], standalone=False,
807
 
                   prefixes=None):
808
 
    def selected(version):
809
 
        if prefixes is None:
810
 
            return True
811
 
        else:
812
 
            for prefix in prefixes:
813
 
                if version.nonarch.startswith(prefix):
814
 
                    return True
815
 
            return False
 
732
class cmd_baz_import(Command):
 
733
    """Import an Arch or Baz archive into bzr branches.
 
734
    
 
735
    reuse_history allows you to specify any previous imports you 
 
736
    have done of different archives, which this archive has branches
 
737
    tagged from. This will dramatically reduce the time to convert 
 
738
    the archive as it will not have to convert the history already
 
739
    converted in that other branch.
 
740
    """
 
741
    takes_args = ['to_root_dir', 'from_archive', 'reuse_history*']
 
742
    takes_options = ['verbose']
 
743
 
 
744
    def printer(self, name):
 
745
        print name
 
746
 
 
747
    def run(self, to_root_dir, from_archive, verbose=False,
 
748
            reuse_history_list=[]):
 
749
        if reuse_history_list is None:
 
750
            reuse_history_list = []
 
751
        to_root = str(os.path.realpath(to_root_dir))
 
752
        if not os.path.exists(to_root):
 
753
            os.mkdir(to_root)
 
754
        import_archive(to_root, from_archive, verbose, self.printer, 
 
755
                       reuse_history_list)
 
756
 
 
757
 
 
758
def import_archive(to_root, from_archive, verbose, printer,
 
759
                   reuse_history_from=[]):
816
760
    real_to = os.path.realpath(to_root)
817
761
    history_locations = [real_to] + reuse_history_from
818
 
    if standalone is False:
 
762
    for version in pybaz.Archive(str(from_archive)).iter_versions():
 
763
        target = os.path.join(to_root, map_namespace(version))
 
764
        printer("importing %s into %s" % (version, target))
 
765
        if not os.path.exists(os.path.dirname(target)):
 
766
            os.makedirs(os.path.dirname(target))
819
767
        try:
820
 
            bd = BzrDir.open(to_root)
821
 
            bd.find_repository()
822
 
        except NotBranchError:
823
 
            create_shared_repository(to_root)
824
 
        except NoRepositoryPresent:
825
 
            raise BzrCommandError("Can't create repository at existing branch.")
826
 
    versions = list(pybaz.Archive(str(from_archive)).iter_versions())
827
 
    progress_bar = bzrlib.ui.ui_factory.nested_progress_bar()
828
 
    try:
829
 
        for num, version in enumerate(versions):
830
 
            progress_bar.update("Branch", num, len(versions))
831
 
            if not selected(version):
832
 
                print "Skipping %s" % version
833
 
                continue
834
 
            target = os.path.join(to_root, map_namespace(version))
835
 
            if not os.path.exists(os.path.dirname(target)):
836
 
                os.makedirs(os.path.dirname(target))
837
 
            try:
838
 
                import_version(target, version, encoding,
839
 
                               reuse_history_from=reuse_history_from,
840
 
                               standalone=standalone)
841
 
            except pybaz.errors.ExecProblem,e:
842
 
                if str(e).find('The requested revision cannot be built.') != -1:
843
 
                    progress_bar.note(
844
 
                        "Skipping version %s as it cannot be built due"
 
768
            import_version(target, version, printer,
 
769
                           reuse_history_from=reuse_history_from)
 
770
        except pybaz.errors.ExecProblem,e:
 
771
            if str(e).find('The requested revision cannot be built.') != -1:
 
772
                printer("Skipping version %s as it cannot be built due"
845
773
                        " to a missing parent archive." % version)
846
 
                else:
847
 
                    raise
848
 
            except UserError, e:
849
 
                if str(e).find('already exists, and the last revision ') != -1:
850
 
                    progress_bar.note(
851
 
                        "Skipping version %s as it has had commits made"
 
774
            else:
 
775
                raise
 
776
        except UserError, e:
 
777
            if str(e).find('already exists, and the last revision ') != -1:
 
778
                printer("Skipping version %s as it has had commits made"
852
779
                        " since it was converted to bzr." % version)
853
 
                else:
854
 
                    raise
855
 
    finally:
856
 
        progress_bar.finished()
 
780
            else:
 
781
                raise
857
782
 
858
783
 
859
784
def map_namespace(a_version):
868
793
        return "%s/%s" % (category, branch)
869
794
    return "%s/%s/%s" % (category, version, branch)
870
795
 
871
 
 
872
796
def map_file_id(file_id):
873
797
    """Convert a baz file id to a bzr one."""
874
798
    return file_id.replace('%', '%25').replace('/', '%2f')