← 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: 2005-09-29 16:16:56 UTC
  • mto: (147.2.17)
  • mto: This revision was merged to the branch mainline in revision 324.
  • Revision ID: abentley@panoramicfeedback.com-20050929161656-0aa948c2f00f3655
Fixed import issues w/ PyBaz

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
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
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
 
                          )
 
17
from bzrlib.errors import NotBranchError
28
18
from bzrlib.branch import Branch
29
 
from bzrlib.commit import Commit, NullCommitReporter
30
19
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
36
 
from bzrlib.workingtree import WorkingTree
37
20
from errors import NoPyBaz
38
21
try:
39
22
    import pybaz
48
31
import os.path
49
32
import shutil
50
33
import bzrlib
 
34
from bzrlib.errors import BzrError
51
35
import bzrlib.trace
52
36
import bzrlib.merge
53
37
import bzrlib.inventory
56
40
import email.Utils
57
41
from progress import *
58
42
 
59
 
 
60
 
BAZ_IMPORT_ROOT = 'TREE_ROOT'
61
 
 
62
 
 
63
 
class ImportCommitReporter(NullCommitReporter):
64
 
 
65
 
    def escaped(self, escape_count, message):
66
 
        bzrlib.trace.warning("replaced %d control characters in message" %
67
 
                             escape_count)
68
 
 
69
43
def add_id(files, id=None):
70
44
    """Adds an explicit id to a list of files.
71
45
 
82
56
 
83
57
saved_dir = None
84
58
 
85
 
def make_archive(name, location):
86
 
    pb_location = pybaz.ArchiveLocation(location)
87
 
    pb_location.create_master(pybaz.Archive(name), 
88
 
                              pybaz.ArchiveLocationParams())
89
 
 
90
59
def test_environ():
91
60
    """
92
61
    >>> q = test_environ()
104
73
    os.environ["HOME"] = os.path.join(tdir, "home")
105
74
    os.mkdir(os.environ["HOME"])
106
75
    arch_dir = os.path.join(tdir, "archive_dir")
107
 
    make_archive("test@example.com", arch_dir)
 
76
    pybaz.make_archive("test@example.com", arch_dir)
108
77
    work_dir = os.path.join(tdir, "work_dir")
109
78
    os.mkdir(work_dir)
110
79
    os.chdir(work_dir)
235
204
    """
236
205
    try:
237
206
        revision = version.iter_revisions(reverse=True).next()
238
 
    except StopIteration:
239
 
        return ()
240
207
    except:
241
208
        print version
242
209
        if not version.exists():
248
215
    return ancestors
249
216
 
250
217
def get_last_revision(branch):
251
 
    last_patch = branch.last_revision()
 
218
    last_patch = branch.last_patch()
252
219
    try:
253
220
        return arch_revision(last_patch)
254
221
    except NotArchRevision:
255
222
        raise UserError(
256
223
            "Directory \"%s\" already exists, and the last revision is not"
257
 
            " an Arch revision (%s)" % (branch.base, last_patch))
258
 
 
259
 
def do_branch(br_from, to_location, revision_id):
260
 
    """Derived from branch in builtins."""
261
 
    br_from.lock_read()
262
 
    try:
263
 
        try:
264
 
            os.mkdir(to_location)
265
 
        except OSError, e:
266
 
            if e.errno == errno.EEXIST:
267
 
                raise UserError('Target directory "%s" already'
268
 
                                      ' exists.' % to_location)
269
 
            if e.errno == errno.ENOENT:
270
 
                raise UserError('Parent of "%s" does not exist.' %
271
 
                                      to_location)
272
 
            else:
273
 
                raise
274
 
        try:
275
 
            br_from.bzrdir.clone(to_location, revision_id)
276
 
        except NoSuchRevision:
277
 
            rmtree(to_location)
278
 
            msg = "The branch %s has no revision %s." % (from_location, 
279
 
                                                         revision_id)
280
 
            raise UserError(msg)
281
 
    finally:
282
 
        br_from.unlock()
283
 
 
284
 
def get_remaining_revisions(output_dir, version, encoding, 
285
 
                            reuse_history_from=[]):
 
224
            " an Arch revision (%s)" % (output_dir, last_patch))
 
225
 
 
226
 
 
227
def get_remaining_revisions(output_dir, version):
286
228
    last_patch = None
287
229
    old_revno = None
288
 
    output_exists = os.path.exists(output_dir)
289
 
    if output_exists:
 
230
    if os.path.exists(output_dir):
290
231
        # We are starting from an existing directory, figure out what
291
232
        # the current version is
292
233
        branch = Branch.open(output_dir)
293
 
        last_patch, last_encoding = get_last_revision(branch)
294
 
        assert encoding == last_encoding
295
 
        if last_patch is None:
296
 
            if branch.last_revision() != None:
297
 
                raise NotPreviousImport(branch.base)
298
 
        elif version is None:
 
234
        last_patch = get_last_revision(branch)
 
235
        if version is None:
299
236
            version = last_patch.version
300
237
    elif version is None:
301
238
        raise UserError("No version specified, and directory does not exist.")
302
239
 
303
240
    try:
304
241
        ancestors = version_ancestry(version)
305
 
        if not output_exists and reuse_history_from != []:
306
 
            for ancestor in reversed(ancestors):
307
 
                if last_patch is not None:
308
 
                    # found something to copy
309
 
                    break
310
 
                # try to grab a copy of ancestor
311
 
                # note that is not optimised: we could look for namespace
312
 
                # transitions and only look for the past after the 
313
 
                # transition.
314
 
                for history_root in reuse_history_from:
315
 
                    possible_source = os.path.join(history_root,
316
 
                        map_namespace(ancestor.version))
317
 
                    try:
318
 
                        source = Branch.open(possible_source)
319
 
                        rev_id = revision_id(ancestor, encoding)
320
 
                        if rev_id in source.revision_history():
321
 
                            do_branch(source, output_dir, rev_id)
322
 
                            last_patch = ancestor
323
 
                            break
324
 
                    except NotBranchError:
325
 
                        pass
326
242
    except NoSuchVersion, e:
327
 
        raise UserError(str(e))
 
243
        raise UserError(e)
328
244
 
329
245
    if last_patch:
330
246
        for i in range(len(ancestors)):
341
257
        ancestors = ancestors[i+1:]
342
258
    return ancestors, old_revno
343
259
 
344
 
 
345
 
###class Importer(object):
346
 
###    """An importer.
347
 
###    
348
 
###    Currently this is used as a parameter object, though more behaviour is
349
 
###    possible later.
350
 
###    """
351
 
###
352
 
###    def __init__(self, output_dir, version, fast=False,
353
 
###                 verbose=False, dry_run=False, max_count=None, 
354
 
###                   reuse_history_from=[]):
355
 
###        self.output_dir = output_dir
356
 
###        self.version = version
357
 
###        self.
358
 
 
359
 
 
360
 
def import_version(output_dir, version, encoding, fast=False,
361
 
                   verbose=False, dry_run=False, max_count=None,
362
 
                   reuse_history_from=[], standalone=True):
 
260
def import_version(output_dir, version, printer, fancy=True, fast=False,
 
261
                   verbose=False, dry_run=False, max_count=None):
363
262
    """
364
263
    >>> 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
264
    >>> result_path = os.path.join(q, "result")
372
265
    >>> commit_test_revisions()
373
266
    >>> 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)
 
267
    >>> def printer(message): print message
 
268
    >>> import_version('/', version, printer, fancy=False, dry_run=True)
379
269
    Traceback (most recent call last):
380
 
    NotPreviousImport: / is not the location of a previous import.
381
 
    >>> import_version(result_path, version, None, dry_run=True)
 
270
    UserError: / exists, but is not a bzr branch.
 
271
    >>> import_version(result_path, version, printer, fancy=False, dry_run=True)
382
272
    Traceback (most recent call last):
383
273
    UserError: The version test@example.com/test--test--0.1 does not exist.
384
274
    >>> 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: ..........................................
 
275
    >>> import_version(result_path, version, printer, fancy=False, dry_run=True)
 
276
    not fancy
 
277
    ....
389
278
    Dry run, not modifying output_dir
390
279
    Cleaning up
391
 
    >>> import_version(result_path, version, None) #doctest: +ELLIPSIS
392
 
    importing test@example.com/test--test--0 into ...
393
 
    ...
394
 
    revisions: .....................................................................
 
280
    >>> import_version(result_path, version, printer, fancy=False)
 
281
    not fancy
 
282
    ....
395
283
    Cleaning up
396
284
    Import complete.
397
 
    >>> import_version(result_path, version, None) #doctest: +ELLIPSIS
 
285
    >>> import_version(result_path, version, printer, fancy=False)
398
286
    Tree is up-to-date with test@example.com/test--test--0--patch-2
399
287
    >>> commit_more_test_revisions()
400
 
    >>> import_version(result_path, version, None) #doctest: +ELLIPSIS
401
 
    importing test@example.com/test--test--0 into ...
402
 
    revisions: ....................................................
 
288
    >>> import_version(result_path, version, printer, fancy=False)
 
289
    not fancy
 
290
    ..
403
291
    Cleaning up
404
292
    Import complete.
405
 
    >>> bzrlib.ui.ui_factory = old_ui
406
 
    >>> sys.stderr = old_stderr
407
293
    >>> teardown_environ(q)
408
294
    """
409
 
    progress_bar = bzrlib.ui.ui_factory.nested_progress_bar()
410
295
    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
 
296
        ancestors, old_revno = get_remaining_revisions(output_dir, version)
 
297
    except NotBranchError, e:
 
298
        raise UserError("%s exists, but is not a bzr branch." % output_dir)
 
299
    if len(ancestors) == 0:
 
300
        last_revision = get_last_revision(Branch.open(output_dir))
 
301
        print 'Tree is up-to-date with %s' % last_revision
 
302
        return
425
303
 
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
 
304
    progress_bar = ProgressBar()
 
305
    tempdir = tempfile.mkdtemp(prefix="baz2bzr-",
 
306
                               dir=os.path.dirname(output_dir))
 
307
    try:
 
308
        if not fancy:
 
309
            print "not fancy"
434
310
        try:
435
311
            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
 
312
                    fast=fast, verbose=verbose, dry_run=dry_run, 
 
313
                    max_count=max_count):
 
314
                if fancy:
 
315
                    show_progress(progress_bar, result)
 
316
                else:
 
317
                    sys.stdout.write('.')
 
318
        finally:
 
319
            if fancy:
 
320
                progress_bar.clear()
 
321
            else:
 
322
                sys.stdout.write('\n')
 
323
 
 
324
        if dry_run:
 
325
            print 'Dry run, not modifying output_dir'
 
326
            return
 
327
        if os.path.exists(output_dir):
 
328
            # Move the bzr control directory back, and update the working tree
 
329
            tmp_bzr_dir = os.path.join(tempdir, '.bzr')
 
330
            
 
331
            bzr_dir = os.path.join(output_dir, '.bzr')
 
332
            new_bzr_dir = os.path.join(tempdir, "rd", '.bzr')
 
333
 
 
334
            os.rename(bzr_dir, tmp_bzr_dir) # Move the original bzr out of the way
 
335
            os.rename(new_bzr_dir, bzr_dir)
445
336
            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.")
 
337
                bzrlib.merge.merge((output_dir, -1), (output_dir, None), # old_revno), 
 
338
                                   check_clean=False, this_dir=output_dir, 
 
339
                                   ignore_zero=True)
 
340
            except:
 
341
                # If something failed, move back the original bzr directory
 
342
                os.rename(bzr_dir, new_bzr_dir)
 
343
                os.rename(tmp_bzr_dir, bzr_dir)
 
344
                raise
 
345
        else:
 
346
            revdir = os.path.join(tempdir, "rd")
 
347
            os.rename(revdir, output_dir)
 
348
 
459
349
    finally:
460
 
        progress_bar.finished()
 
350
        printer('Cleaning up')
 
351
        shutil.rmtree(tempdir)
 
352
    printer("Import complete.")
461
353
            
462
 
class UserError(BzrCommandError):
 
354
class UserError(Exception):
463
355
    def __init__(self, message):
464
356
        """Exception to throw when a user makes an impossible request
465
357
        :param message: The message to emit when printing this exception
466
358
        :type message: string
467
359
        """
468
 
        BzrCommandError.__init__(self, message)
469
 
 
470
 
class NotPreviousImport(UserError):
471
 
    def __init__(self, path):
472
 
        UserError.__init__(self, "%s is not the location of a previous import."
473
 
                           % path)
474
 
 
475
 
 
476
 
def revision_id(arch_revision, encoding):
 
360
        Exception.__init__(self, message)
 
361
 
 
362
def revision_id(arch_revision):
477
363
    """
478
364
    Generate a Bzr revision id from an Arch revision id.  'x' in the id
479
365
    designates a revision imported with an experimental algorithm.  A number
481
367
 
482
368
    :param arch_revision: The Arch revision to generate an ID for.
483
369
 
484
 
    >>> revision_id(pybaz.Revision("you@example.com/cat--br--0--base-0"), None)
 
370
    >>> revision_id(pybaz.Revision("you@example.com/cat--br--0--base-0"))
485
371
    '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
372
    """
489
 
    if encoding is None:
490
 
        encoding = ''
491
 
    else:
492
 
        encoding = '-' + encoding
493
 
    return "Arch-1%s:%s" % (encoding, str(arch_revision).replace('/', '%'))
 
373
    return "Arch-1:%s" % str(arch_revision).replace('/', '%')
494
374
 
495
375
class NotArchRevision(Exception):
496
376
    def __init__(self, revision_id):
506
386
    >>> str(arch_revision("Arch-1:jrandom@example.com%test--test--0--base-5"))
507
387
    Traceback (most recent call last):
508
388
    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'
 
389
    >>> str(arch_revision("Arch-1:jrandom@example.com%test--test--0--patch-5"))
 
390
    'jrandom@example.com/test--test--0--patch-5'
517
391
    """
518
392
    if revision_id is None:
519
 
        return None, None
520
 
    if revision_id[:7] not in ('Arch-1:', 'Arch-1-'):
 
393
        return None
 
394
    if revision_id[:7] != 'Arch-1:':
521
395
        raise NotArchRevision(revision_id)
522
396
    else:
523
397
        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
 
398
            return pybaz.Revision(revision_id[7:].replace('%', '/'))
531
399
        except pybaz.errors.NamespaceError, e:
532
400
            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.set_last_revision(revision_id)
556
 
    if revision_id not in (NULL_REVISION, None):
557
 
        wt._write_inventory(wt.basis_tree().inventory)
558
 
    return wt
559
 
 
560
 
 
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):
 
401
            
 
402
def iter_import_version(output_dir, ancestors, tempdir, fast=False,
 
403
                        verbose=False, dry_run=False, max_count=None):
564
404
    revdir = None
565
 
    log_encoding = 'ascii'
566
 
    if encoding is not None:
567
 
        log_encoding = encoding
568
405
 
569
406
    # Uncomment this for testing, it basically just has baz2bzr only update
570
407
    # 5 patches at a time
582
419
 
583
420
    previous_version=None
584
421
    missing_ancestor = None
585
 
    if dry_run:
586
 
        dry_output_dir = os.path.join(tempdir, 'od')
587
 
        if os.path.exists(output_dir):
588
 
            shutil.copytree(output_dir, dry_output_dir)
589
 
        output_dir = dry_output_dir
590
 
 
591
 
    if os.path.exists(output_dir):
592
 
        target_branch = Branch.open(output_dir)
593
 
    else:
594
 
        if standalone:
595
 
            wt = BzrDir.create_standalone_workingtree(output_dir)
596
 
            target_branch = wt.branch
597
 
        else:
598
 
            target_branch = create_branch(output_dir)
599
422
 
600
423
    for i in range(len(ancestors)):
601
424
        revision = ancestors[i]
602
 
        rev_id = revision_id(revision, encoding)
603
425
        direct_merges = []
604
426
        if verbose:
605
427
            version = str(revision.version)
606
428
            if version != previous_version:
607
 
                pb.note('On version: %s' % version)
 
429
                clear_progress_bar()
 
430
                print '\rOn version: %s' % version
608
431
            yield Progress(str(revision.patchlevel), i, len(ancestors))
609
432
            previous_version = version
610
433
        else:
611
434
            yield Progress("revisions", i, len(ancestors))
612
 
 
613
 
        if target_branch.repository.has_revision(rev_id):
614
 
            target_branch.append_revision(rev_id)
615
 
            continue
616
435
        if revdir is None:
617
436
            revdir = os.path.join(tempdir, "rd")
618
437
            try:
619
 
                tree, baz_inv, log = get_revision(revdir, revision)
 
438
                baz_inv, log = get_revision(revdir, revision)
620
439
            except pybaz.errors.ExecProblem, e:
621
440
                if ("%s" % e.args).find('could not connect') == -1:
622
441
                    raise
623
442
                missing_ancestor = revision
624
443
                revdir = None
625
 
                pb.note("unable to access ancestor %s, making into a merge."
 
444
                print ("unable to access ancestor %s, making into a merge."
626
445
                       % missing_ancestor)
627
446
                continue
628
 
            target_tree = create_checkout_metadata(target_branch, revdir)
629
 
            branch = target_tree.branch
 
447
            # cached so we can delete the log
 
448
            log_date = log.date
 
449
            log_summary = log.summary
 
450
            log_creator = log.creator
 
451
            if os.path.exists(output_dir):
 
452
                bzr_dir = os.path.join(output_dir, '.bzr')
 
453
                new_bzr_dir = os.path.join(tempdir, "rd", '.bzr')
 
454
                # This would be much faster with a simple os.rename(), but if
 
455
                # we fail, we have corrupted the original .bzr directory.  Is
 
456
                # that a big problem, as we can just back out the last
 
457
                # revisions in .bzr/revision_history I don't really know
 
458
                shutil.copytree(bzr_dir, new_bzr_dir)
 
459
                # Now revdir should have a tree with the latest .bzr, and the
 
460
                # next revision of the baz tree
 
461
                branch = Branch.open(revdir)
 
462
            else:
 
463
                branch = Branch.initialize(revdir)
630
464
        else:
631
465
            old = os.path.join(revdir, ".bzr")
632
466
            new = os.path.join(tempdir, ".bzr")
633
467
            os.rename(old, new)
634
 
            baz_inv, log = apply_revision(tree, revision)
 
468
            baz_inv, log = apply_revision(revdir, revision)
 
469
            log_date = log.date
 
470
            log_summary = log.summary
 
471
            log_creator = log.creator
 
472
            direct_merges = get_direct_merges(revdir, revision)
635
473
            os.rename(new, old)
636
 
            target_tree = WorkingTree.open(revdir)
637
 
            branch = target_tree.branch
638
 
        # cached so we can delete the log
639
 
        log_date = log.date
640
 
        log_summary = log.summary
641
 
        log_description = log.description
642
 
        is_continuation = log.continuation_of is not None
643
 
        log_creator = log.creator
644
 
        direct_merges = get_direct_merges(revdir, revision, log)
645
 
 
 
474
            branch = Branch.open(revdir)
646
475
        timestamp = email.Utils.mktime_tz(log_date + (0,))
647
 
        if log_summary is None:
648
 
            log_summary = ""
649
 
        # log_descriptions of None and "" are ignored.
650
 
        if not is_continuation and log_description:
651
 
            log_message = "\n".join((log_summary, log_description))
652
 
        else:
653
 
            log_message = log_summary
654
 
        target_tree.lock_write()
 
476
        rev_id = revision_id(revision)
655
477
        branch.lock_write()
656
478
        try:
657
479
            if missing_ancestor:
658
480
                # if we want it to be in revision-history, do that here.
659
 
                target_tree.set_parent_ids(
660
 
                    [revision_id(missing_ancestor, encoding)],
661
 
                    allow_leftmost_as_ghost=True)
 
481
                branch.add_pending_merge(revision_id(missing_ancestor))
662
482
                missing_ancestor = None
663
 
            for merged_rev in direct_merges:
664
 
                target_tree.add_pending_merge(revision_id(merged_rev, 
665
 
                                                          encoding))
666
 
            target_tree.set_root_id(BAZ_IMPORT_ROOT)
667
 
            target_tree.set_inventory(baz_inv)
668
 
            commitobj = Commit(reporter=ImportCommitReporter())
669
 
            commitobj.commit(working_tree=target_tree,
670
 
                message=log_message.decode(log_encoding, 'replace'),
671
 
                verbose=False, committer=log_creator, timestamp=timestamp,
672
 
                timezone=0, rev_id=rev_id, revprops={})
 
483
            for merge in direct_merges:
 
484
                branch.add_pending_merge(revision_id(merge.revision))
 
485
            branch.set_inventory(baz_inv)
 
486
            bzrlib.trace.silent = True
 
487
            branch.commit(log_summary, verbose=False, committer=log_creator,
 
488
                          timestamp=timestamp, timezone=0, rev_id=rev_id)
673
489
        finally:
674
 
            target_tree.unlock()
 
490
            bzrlib.trace.silent = False   
675
491
            branch.unlock()
676
492
    yield Progress("revisions", len(ancestors), len(ancestors))
 
493
    unlink_unversioned(branch, revdir)
677
494
 
678
 
def get_direct_merges(revdir, revision, log):
679
 
    continuation = log.continuation_of
680
 
    previous_version = revision.version
681
 
    if pybaz.WorkingTree(revdir).tree_version != previous_version:
682
 
        pybaz.WorkingTree(revdir).set_tree_version(previous_version)
 
495
def get_direct_merges(revdir, revision):
 
496
    if pybaz.WorkingTree(revdir).tree_version != revision.version:
 
497
        pybaz.WorkingTree(revdir).set_tree_version(revision.version)
683
498
    log_path = "%s/{arch}/%s/%s/%s/%s/patch-log/%s" % (revdir, 
684
499
        revision.category.nonarch, revision.branch.nonarch, 
685
500
        revision.version.nonarch, revision.archive, revision.patchlevel)
686
 
    temp_path = tempfile.mktemp(dir=os.path.dirname(revdir))
 
501
    temp_path = tempfile.mktemp()
687
502
    os.rename(log_path, temp_path)
688
503
    merges = list(iter_new_merges(revdir, revision.version))
689
 
    direct = direct_merges(merges, [continuation])
 
504
    direct = direct_merges (merges)
690
505
    os.rename(temp_path, log_path)
691
506
    return direct
692
507
 
693
 
def unlink_unversioned(wt):
694
 
    for unversioned in wt.extras():
695
 
        path = wt.abspath(unversioned)
 
508
def unlink_unversioned(branch, revdir):
 
509
    for unversioned in branch.working_tree().extras():
 
510
        path = os.path.join(revdir, unversioned)
696
511
        if os.path.isdir(path):
697
512
            shutil.rmtree(path)
698
513
        else:
699
514
            os.unlink(path)
700
515
 
701
516
def get_log(tree, revision):
702
 
    log = pybaz.Patchlog(revision, tree=tree)
 
517
    log = tree.iter_logs(version=revision.version, reverse=True).next()
703
518
    assert str(log.revision) == str(revision), (log.revision, revision)
704
519
    return log
705
520
 
706
521
def get_revision(revdir, revision):
707
 
    tree = revision.get(revdir)
 
522
    revision.get(revdir)
 
523
    tree = pybaz.tree_root(revdir)
708
524
    log = get_log(tree, revision)
709
525
    try:
710
 
        return tree, bzr_inventory_data(tree), log 
 
526
        return bzr_inventory_data(tree), log 
711
527
    except BadFileKind, e:
712
 
        raise UserError("Cannot convert %s because %s is a %s" % 
713
 
                        (revision,e.path, e.kind))
714
 
 
715
 
 
716
 
def apply_revision(tree, revision):
 
528
        raise UserError("Cannot convert %s because %s is a %s" % (revision,e.path, e.kind) )
 
529
 
 
530
 
 
531
def apply_revision(revdir, revision):
 
532
    tree = pybaz.tree_root(revdir)
717
533
    revision.apply(tree)
718
534
    log = get_log(tree, revision)
719
535
    try:
720
536
        return bzr_inventory_data(tree), log
721
537
    except BadFileKind, e:
722
 
        raise UserError("Cannot convert %s because %s is a %s" % 
723
 
                        (revision,e.path, e.kind))
 
538
        raise UserError("Cannot convert %s because %s is a %s" % (revision,e.path, e.kind) )
724
539
 
725
540
 
726
541
class BadFileKind(Exception):
737
552
    inv_iter = tree.iter_inventory_ids(source=True, both=True)
738
553
    inv_map = {}
739
554
    for arch_id, path in inv_iter:
740
 
        bzr_file_id = map_file_id(arch_id)
 
555
        bzr_file_id = arch_id.replace('%', '%25').replace('/', '%2f')
741
556
        inv_map[path] = bzr_file_id 
742
557
 
743
558
    bzr_inv = []
756
571
    return bzr_inv
757
572
 
758
573
 
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)
772
 
 
773
 
 
774
 
class NotInABranch(Exception):
775
 
    def __init__(self, path):
776
 
        Exception.__init__(self, "%s is not in a branch." % path)
777
 
        self.path = path
778
 
 
779
 
 
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
 
                   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
 
    versions = list(pybaz.Archive(str(from_archive)).iter_versions())
816
 
    progress_bar = bzrlib.ui.ui_factory.nested_progress_bar()
817
 
    try:
818
 
        for num, version in enumerate(versions):
819
 
            progress_bar.update("Branch", num, len(versions))
820
 
            if not selected(version):
821
 
                print "Skipping %s" % version
822
 
                continue
823
 
            target = os.path.join(to_root, map_namespace(version))
824
 
            if not os.path.exists(os.path.dirname(target)):
825
 
                os.makedirs(os.path.dirname(target))
 
574
class cmd_baz_import_branch(Command):
 
575
    """Import an Arch or Baz branch into a bzr branch"""
 
576
    takes_args = ['to_location', 'from_branch?']
 
577
    takes_options = ['verbose']
 
578
 
 
579
    def printer(self, name):
 
580
        print name
 
581
 
 
582
    def run(self, to_location, from_branch=None, fast=False, max_count=None,
 
583
            verbose=False, dry_run=False):
 
584
        to_location = os.path.realpath(str(to_location))
 
585
        if from_branch is not None:
826
586
            try:
827
 
                import_version(target, version, encoding,
828
 
                               reuse_history_from=reuse_history_from, 
829
 
                               standalone=standalone)
830
 
            except pybaz.errors.ExecProblem,e:
831
 
                if str(e).find('The requested revision cannot be built.') != -1:
832
 
                    progress_bar.note(
833
 
                        "Skipping version %s as it cannot be built due"
834
 
                        " to a missing parent archive." % version)
835
 
                else:
836
 
                    raise
837
 
            except UserError, e:
838
 
                if str(e).find('already exists, and the last revision ') != -1:
839
 
                    progress_bar.note(
840
 
                        "Skipping version %s as it has had commits made"
841
 
                        " since it was converted to bzr." % version)
842
 
                else:
843
 
                    raise
844
 
    finally:
845
 
        progress_bar.finished()
 
587
                from_branch = pybaz.Version(from_branch)
 
588
            except pybaz.errors.NamespaceError:
 
589
                print "%s is not a valid Arch branch." % from_branch
 
590
                return 1
 
591
        import_version(to_location, from_branch, self.printer)
 
592
 
 
593
 
 
594
class cmd_baz_import(Command):
 
595
    """Import an Arch or Baz archive into bzr branches."""
 
596
    takes_args = ['to_root_dir', 'from_archive']
 
597
    takes_options = ['verbose']
 
598
 
 
599
    def printer(self, name):
 
600
        print name
 
601
 
 
602
    def run(self, to_root_dir, from_archive, verbose=False):
 
603
        to_root = str(os.path.realpath(to_root_dir))
 
604
        if not os.path.exists(to_root):
 
605
            os.mkdir(to_root)
 
606
        import_archive(to_root, from_archive, verbose, self.printer)
 
607
 
 
608
 
 
609
def import_archive(to_root, from_archive, verbose, printer):
 
610
    for version in pybaz.Archive(str(from_archive)).iter_versions():
 
611
        target = os.path.join(to_root, map_namespace(version))
 
612
        printer("importing %s into %s" % (version, target))
 
613
        if not os.path.exists(os.path.dirname(target)):
 
614
            os.makedirs(os.path.dirname(target))
 
615
        import_version(target, version, printer)
846
616
 
847
617
 
848
618
def map_namespace(a_version):
856
626
    if version == '0':
857
627
        return "%s/%s" % (category, branch)
858
628
    return "%s/%s/%s" % (category, version, branch)
859
 
 
860
 
 
861
 
def map_file_id(file_id):
862
 
    """Convert a baz file id to a bzr one."""
863
 
    return file_id.replace('%', '%25').replace('/', '%2f')