← 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:11:19 UTC
  • Revision ID: abentley@panoramicfeedback.com-20060302141119-7a5ee02eb6483c50
Only use the decorated push if it's likely to work.

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
13
13
# You should have received a copy of the GNU General Public License
14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
 
 
17
 
import errno
18
 
 
19
 
from bzrlib.bzrdir import BzrDir
20
 
import bzrlib.bzrdir as bzrdir
21
 
from bzrlib.errors import (BzrError,
22
 
                           NotBranchError,
23
 
                           NoWorkingTree,
24
 
                           BzrCommandError, 
25
 
                           NoSuchRevision,
26
 
                           NoRepositoryPresent,
27
 
                          )
28
16
from bzrlib.branch import Branch
29
 
from bzrlib.commit import Commit, NullCommitReporter
30
17
from bzrlib.commands import Command
31
 
from bzrlib.option import _global_option, Option
32
 
from bzrlib.merge import merge_inner
33
 
from bzrlib.revision import NULL_REVISION
34
 
import bzrlib.ui
35
 
import bzrlib.ui.text
36
 
from bzrlib.workingtree import WorkingTree
37
18
from errors import NoPyBaz
38
19
try:
39
20
    import pybaz
40
21
    import pybaz.errors
41
 
    from pybaz import NameParser as NameParser
42
22
    from pybaz.backends.baz import null_cmd
43
23
except ImportError:
44
24
    raise NoPyBaz
45
 
from fai import iter_new_merges, direct_merges
46
25
import tempfile
47
26
import os
48
27
import os.path
49
28
import shutil
50
29
import bzrlib
 
30
from bzrlib.errors import BzrError, NotBranchError, BzrCommandError
51
31
import bzrlib.trace
52
32
import bzrlib.merge
53
33
import bzrlib.inventory
56
36
import email.Utils
57
37
from progress import *
58
38
 
59
 
 
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
39
def add_id(files, id=None):
70
40
    """Adds an explicit id to a list of files.
71
41
 
80
50
    args.extend(files)
81
51
    return null_cmd(args)
82
52
 
83
 
saved_dir = None
84
 
 
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
53
def test_environ():
91
54
    """
92
55
    >>> q = test_environ()
98
61
    >>> os.path.exists(q)
99
62
    False
100
63
    """
101
 
    global saved_dir
102
 
    saved_dir = os.getcwdu()
103
64
    tdir = tempfile.mkdtemp(prefix="testdir-")
104
65
    os.environ["HOME"] = os.path.join(tdir, "home")
105
66
    os.mkdir(os.environ["HOME"])
106
67
    arch_dir = os.path.join(tdir, "archive_dir")
107
 
    make_archive("test@example.com", arch_dir)
 
68
    pybaz.make_archive("test@example.com", arch_dir)
108
69
    work_dir = os.path.join(tdir, "work_dir")
109
70
    os.mkdir(work_dir)
110
71
    os.chdir(work_dir)
143
104
    add_id([path], id)
144
105
 
145
106
def teardown_environ(tdir):
146
 
    os.chdir(saved_dir)
 
107
    os.chdir("/")
147
108
    shutil.rmtree(tdir)
148
109
 
149
110
def timport(tree, summary):
235
196
    """
236
197
    try:
237
198
        revision = version.iter_revisions(reverse=True).next()
238
 
    except StopIteration:
239
 
        return ()
240
199
    except:
241
 
        print version
242
200
        if not version.exists():
243
201
            raise NoSuchVersion(version)
244
202
        else:
254
212
    except NotArchRevision:
255
213
        raise UserError(
256
214
            "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=[]):
 
215
            " an Arch revision (%s)" % (output_dir, last_patch))
 
216
 
 
217
 
 
218
def get_remaining_revisions(output_dir, version):
286
219
    last_patch = None
287
220
    old_revno = None
288
 
    output_exists = os.path.exists(output_dir)
289
 
    if output_exists:
 
221
    if os.path.exists(output_dir):
290
222
        # We are starting from an existing directory, figure out what
291
223
        # the current version is
292
 
        branch = Branch.open(output_dir)
293
 
        last_patch, last_encoding = get_last_revision(branch)
294
 
        assert encoding == last_encoding
 
224
        branch = find_branch(output_dir)
 
225
        last_patch = get_last_revision(branch)
295
226
        if last_patch is None:
296
 
            if branch.last_revision() != None:
297
 
                raise NotPreviousImport(branch.base)
298
 
        elif version is None:
 
227
            raise NotPreviousImport(branch.base)
 
228
        if version is None:
299
229
            version = last_patch.version
300
230
    elif version is None:
301
231
        raise UserError("No version specified, and directory does not exist.")
302
232
 
303
233
    try:
304
234
        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
 
235
        if len(ancestors) > 0 and not ancestors[0].archive.is_registered():
 
236
            ancestors = ancestors[1:]
326
237
    except NoSuchVersion, e:
327
 
        raise UserError(str(e))
 
238
        raise UserError(e)
328
239
 
329
240
    if last_patch:
330
241
        for i in range(len(ancestors)):
337
248
        # Strip off all of the ancestors which are already present
338
249
        # And get a directory starting with the latest ancestor
339
250
        latest_ancestor = ancestors[i]
340
 
        old_revno = Branch.open(output_dir).revno()
 
251
        old_revno = find_branch(output_dir).revno()
341
252
        ancestors = ancestors[i+1:]
342
253
    return ancestors, old_revno
343
254
 
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):
 
255
def import_version(output_dir, version, fancy=True, fast=False, verbose=False, 
 
256
                   dry_run=False, max_count=None, skip_symlinks=False):
363
257
    """
364
258
    >>> 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
259
    >>> result_path = os.path.join(q, "result")
372
260
    >>> commit_test_revisions()
373
261
    >>> 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)
 
262
    >>> import_version('/', version, fancy=False, dry_run=True)
379
263
    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)
 
264
    UserError: / exists, but is not a bzr branch.
 
265
    >>> import_version(result_path, version, fancy=False, dry_run=True)
382
266
    Traceback (most recent call last):
383
267
    UserError: The version test@example.com/test--test--0.1 does not exist.
384
268
    >>> 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: ..........................................
 
269
    >>> import_version(result_path, version, fancy=False, dry_run=True)
 
270
    not fancy
 
271
    ....
389
272
    Dry run, not modifying output_dir
390
273
    Cleaning up
391
 
    >>> import_version(result_path, version, None) #doctest: +ELLIPSIS
392
 
    importing test@example.com/test--test--0 into ...
393
 
    ...
394
 
    revisions: .....................................................................
 
274
    >>> import_version(result_path, version, fancy=False)
 
275
    not fancy
 
276
    ....
395
277
    Cleaning up
396
278
    Import complete.
397
 
    >>> import_version(result_path, version, None) #doctest: +ELLIPSIS
 
279
    >>> import_version(result_path, version, fancy=False)
398
280
    Tree is up-to-date with test@example.com/test--test--0--patch-2
399
281
    >>> commit_more_test_revisions()
400
 
    >>> import_version(result_path, version, None) #doctest: +ELLIPSIS
401
 
    importing test@example.com/test--test--0 into ...
402
 
    revisions: ....................................................
 
282
    >>> import_version(result_path, version, fancy=False)
 
283
    not fancy
 
284
    ..
403
285
    Cleaning up
404
286
    Import complete.
405
 
    >>> bzrlib.ui.ui_factory = old_ui
406
 
    >>> sys.stderr = old_stderr
407
287
    >>> teardown_environ(q)
408
288
    """
409
 
    progress_bar = bzrlib.ui.ui_factory.nested_progress_bar()
410
289
    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
 
290
        ancestors, old_revno = get_remaining_revisions(output_dir, version)
 
291
    except NotInABranch, e:
 
292
        raise NotPreviousImport(e.path)
 
293
    if len(ancestors) == 0:
 
294
        last_revision = get_last_revision(find_branch(output_dir))
 
295
        print 'Tree is up-to-date with %s' % last_revision
 
296
        return
425
297
 
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
 
298
    progress_bar = ProgressBar()
 
299
    tempdir = tempfile.mkdtemp(prefix="baz2bzr-",
 
300
                               dir=os.path.dirname(output_dir))
 
301
    try:
 
302
        if not fancy:
 
303
            print "not fancy"
434
304
        try:
435
305
            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
 
306
                    fast=fast, verbose=verbose, dry_run=dry_run, 
 
307
                    max_count=max_count, skip_symlinks=skip_symlinks):
 
308
                if fancy:
 
309
                    show_progress(progress_bar, result)
 
310
                else:
 
311
                    sys.stdout.write('.')
 
312
        finally:
 
313
            if fancy:
 
314
                progress_bar.clear()
 
315
            else:
 
316
                sys.stdout.write('\n')
 
317
 
 
318
        if dry_run:
 
319
            print 'Dry run, not modifying output_dir'
 
320
            return
 
321
        if os.path.exists(output_dir):
 
322
            # Move the bzr control directory back, and update the working tree
 
323
            tmp_bzr_dir = os.path.join(tempdir, '.bzr')
 
324
            
 
325
            bzr_dir = os.path.join(output_dir, '.bzr')
 
326
            new_bzr_dir = os.path.join(tempdir, "rd", '.bzr')
 
327
 
 
328
            os.rename(bzr_dir, tmp_bzr_dir) # Move the original bzr out of the way
 
329
            os.rename(new_bzr_dir, bzr_dir)
445
330
            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.")
 
331
                bzrlib.merge.merge((output_dir, -1), (output_dir, old_revno), 
 
332
                                   check_clean=False, this_dir=output_dir, 
 
333
                                   ignore_zero=True)
 
334
            except:
 
335
                # If something failed, move back the original bzr directory
 
336
                os.rename(bzr_dir, new_bzr_dir)
 
337
                os.rename(tmp_bzr_dir, bzr_dir)
 
338
                raise
 
339
        else:
 
340
            revdir = os.path.join(tempdir, "rd")
 
341
            os.rename(revdir, output_dir)
 
342
 
459
343
    finally:
460
 
        progress_bar.finished()
 
344
        print 'Cleaning up'
 
345
        shutil.rmtree(tempdir)
 
346
    print "Import complete."
461
347
            
462
348
class UserError(BzrCommandError):
463
349
    def __init__(self, message):
473
359
                           % path)
474
360
 
475
361
 
476
 
def revision_id(arch_revision, encoding):
 
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)
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'
 
370
    >>> revision_id(pybaz.Revision("you@example.com/cat--br--0--base-0"))
 
371
    'Arch-x: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-x:%s" % str(arch_revision).replace('/', '%')
494
374
 
495
375
class NotArchRevision(Exception):
496
376
    def __init__(self, revision_id):
500
380
 
501
381
def arch_revision(revision_id):
502
382
    """
503
 
    >>> str(arch_revision("Arch-1:jrandom@example.com%test--test--0"))
504
 
    Traceback (most recent call last):
505
 
    NotArchRevision: The revision id Arch-1:jrandom@example.com%test--test--0 does not look like it came from Arch.
506
 
    >>> str(arch_revision("Arch-1:jrandom@example.com%test--test--0--base-5"))
507
 
    Traceback (most recent call last):
508
 
    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'
 
383
    >>> str(arch_revision("Arch-x:jrandom@example.com%test--test--0"))
 
384
    Traceback (most recent call last):
 
385
    NotArchRevision: The revision id Arch-x:jrandom@example.com%test--test--0 does not look like it came from Arch.
 
386
    >>> str(arch_revision("Arch-x:jrandom@example.com%test--test--0--base-5"))
 
387
    Traceback (most recent call last):
 
388
    NotArchRevision: The revision id Arch-x:jrandom@example.com%test--test--0--base-5 does not look like it came from Arch.
 
389
    >>> str(arch_revision("Arch-x:jrandom@example.com%test--test--0--patch-5"))
 
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-x:':
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,
 
404
                        skip_symlinks=False):
564
405
    revdir = None
565
 
    log_encoding = 'ascii'
566
 
    if encoding is not None:
567
 
        log_encoding = encoding
568
406
 
569
407
    # Uncomment this for testing, it basically just has baz2bzr only update
570
408
    # 5 patches at a time
581
419
    #        print '\t%s' % a
582
420
 
583
421
    previous_version=None
584
 
    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
 
        direct_merges = []
604
425
        if verbose:
605
426
            version = str(revision.version)
606
427
            if version != previous_version:
607
 
                pb.note('On version: %s' % version)
 
428
                clear_progress_bar()
 
429
                print '\rOn version: %s' % version
608
430
            yield Progress(str(revision.patchlevel), i, len(ancestors))
609
431
            previous_version = version
610
432
        else:
611
433
            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
434
        if revdir is None:
617
435
            revdir = os.path.join(tempdir, "rd")
618
 
            try:
619
 
                tree, baz_inv, log = get_revision(revdir, revision)
620
 
            except pybaz.errors.ExecProblem, e:
621
 
                if ("%s" % e.args).find('could not connect') == -1:
622
 
                    raise
623
 
                missing_ancestor = revision
624
 
                revdir = None
625
 
                pb.note("unable to access ancestor %s, making into a merge."
626
 
                       % missing_ancestor)
627
 
                continue
628
 
            target_tree = create_checkout_metadata(target_branch, revdir)
629
 
            branch = target_tree.branch
 
436
            baz_inv, log = get_revision(revdir, revision, 
 
437
                                        skip_symlinks=skip_symlinks)
 
438
            if os.path.exists(output_dir):
 
439
                bzr_dir = os.path.join(output_dir, '.bzr')
 
440
                new_bzr_dir = os.path.join(tempdir, "rd", '.bzr')
 
441
                # This would be much faster with a simple os.rename(), but if
 
442
                # we fail, we have corrupted the original .bzr directory.  Is
 
443
                # that a big problem, as we can just back out the last
 
444
                # revisions in .bzr/revision_history I don't really know
 
445
                shutil.copytree(bzr_dir, new_bzr_dir)
 
446
                # Now revdir should have a tree with the latest .bzr, and the
 
447
                # next revision of the baz tree
 
448
                branch = find_branch(revdir)
 
449
            else:
 
450
                branch = Branch.initialize(revdir)
630
451
        else:
631
452
            old = os.path.join(revdir, ".bzr")
632
453
            new = os.path.join(tempdir, ".bzr")
633
454
            os.rename(old, new)
634
 
            baz_inv, log = apply_revision(tree, revision)
 
455
            baz_inv, log = apply_revision(revdir, revision, 
 
456
                                          skip_symlinks=skip_symlinks)
635
457
            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
 
 
646
 
        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()
 
458
            branch = find_branch(revdir)
 
459
        timestamp = email.Utils.mktime_tz(log.date + (0,))
 
460
        rev_id = revision_id(revision)
655
461
        branch.lock_write()
656
462
        try:
657
 
            if missing_ancestor:
658
 
                # 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)
662
 
                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={})
 
463
            branch.working_tree().set_inventory(baz_inv)
 
464
            bzrlib.trace.silent = True
 
465
            wt = branch.working_tree()
 
466
            wt.commit(log.summary, verbose=False, committer=log.creator,
 
467
                      timestamp=timestamp, timezone=0, rev_id=rev_id)
673
468
        finally:
674
 
            target_tree.unlock()
 
469
            bzrlib.trace.silent = False   
675
470
            branch.unlock()
676
471
    yield Progress("revisions", len(ancestors), len(ancestors))
677
 
 
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)
683
 
    log_path = "%s/{arch}/%s/%s/%s/%s/patch-log/%s" % (revdir, 
684
 
        revision.category.nonarch, revision.branch.nonarch, 
685
 
        revision.version.nonarch, revision.archive, revision.patchlevel)
686
 
    temp_path = tempfile.mktemp(dir=os.path.dirname(revdir))
687
 
    os.rename(log_path, temp_path)
688
 
    merges = list(iter_new_merges(revdir, revision.version))
689
 
    direct = direct_merges(merges, [continuation])
690
 
    os.rename(temp_path, log_path)
691
 
    return direct
692
 
 
693
 
def unlink_unversioned(wt):
694
 
    for unversioned in wt.extras():
695
 
        path = wt.abspath(unversioned)
 
472
    unlink_unversioned(branch, revdir)
 
473
 
 
474
def unlink_unversioned(branch, revdir):
 
475
    for unversioned in branch.working_tree().extras():
 
476
        path = os.path.join(revdir, unversioned)
696
477
        if os.path.isdir(path):
697
478
            shutil.rmtree(path)
698
479
        else:
699
480
            os.unlink(path)
700
481
 
701
482
def get_log(tree, revision):
702
 
    log = pybaz.Patchlog(revision, tree=tree)
 
483
    log = tree.iter_logs(version=revision.version, reverse=True).next()
703
484
    assert str(log.revision) == str(revision), (log.revision, revision)
704
485
    return log
705
486
 
706
 
def get_revision(revdir, revision):
707
 
    tree = revision.get(revdir)
 
487
def get_revision(revdir, revision, skip_symlinks=False):
 
488
    revision.get(revdir)
 
489
    tree = pybaz.tree_root(revdir)
708
490
    log = get_log(tree, revision)
709
491
    try:
710
 
        return tree, bzr_inventory_data(tree), log 
 
492
        return bzr_inventory_data(tree, skip_symlinks=skip_symlinks), log 
711
493
    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):
 
494
        raise UserError("Cannot convert %s because %s is a %s" % (revision,e.path, e.kind) )
 
495
 
 
496
 
 
497
def apply_revision(revdir, revision, skip_symlinks=False):
 
498
    tree = pybaz.tree_root(revdir)
717
499
    revision.apply(tree)
718
500
    log = get_log(tree, revision)
719
501
    try:
720
 
        return bzr_inventory_data(tree), log
 
502
        return bzr_inventory_data(tree, skip_symlinks=skip_symlinks), log
721
503
    except BadFileKind, e:
722
 
        raise UserError("Cannot convert %s because %s is a %s" % 
723
 
                        (revision,e.path, e.kind))
 
504
        raise UserError("Cannot convert %s because %s is a %s" % (revision,e.path, e.kind) )
 
505
 
 
506
 
724
507
 
725
508
 
726
509
class BadFileKind(Exception):
732
515
        Exception.__init__(self, "File %s is of forbidden type %s" %
733
516
                           (os.path.join(tree_root, path), kind))
734
517
 
735
 
 
736
 
def bzr_inventory_data(tree):
 
518
def bzr_inventory_data(tree, skip_symlinks=False):
737
519
    inv_iter = tree.iter_inventory_ids(source=True, both=True)
738
520
    inv_map = {}
739
521
    for arch_id, path in inv_iter:
740
 
        bzr_file_id = map_file_id(arch_id)
 
522
        bzr_file_id = arch_id.replace('%', '%25').replace('/', '%2f')
741
523
        inv_map[path] = bzr_file_id 
742
524
 
743
525
    bzr_inv = []
744
526
    for path, file_id in inv_map.iteritems():
745
527
        full_path = os.path.join(tree, path)
746
528
        kind = bzrlib.osutils.file_kind(full_path)
747
 
        if kind not in ("file", "directory", "symlink"):
 
529
        if skip_symlinks and kind == "symlink":
 
530
            continue
 
531
        if kind not in ("file", "directory"):
748
532
            raise BadFileKind(tree, path, kind)
749
533
        parent_dir = os.path.dirname(path)
750
534
        if parent_dir != "":
755
539
    bzr_inv.sort()
756
540
    return bzr_inv
757
541
 
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)
772
 
 
773
 
 
774
542
class NotInABranch(Exception):
775
543
    def __init__(self, path):
776
544
        Exception.__init__(self, "%s is not in a branch." % path)
777
545
        self.path = path
778
546
 
779
547
 
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()
 
548
def find_branch(path):
 
549
    """
 
550
    >>> find_branch('/')
 
551
    Traceback (most recent call last):
 
552
    NotInABranch: / is not in a branch.
 
553
    >>> sb = bzrlib.ScratchBranch()
 
554
    >>> isinstance(find_branch(sb.base), Branch)
 
555
    True
 
556
    """
817
557
    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))
 
558
        return Branch.open(path)
 
559
    except NotBranchError, e:
 
560
        raise NotInABranch(path)
 
561
 
 
562
class cmd_baz_import(Command):
 
563
    """Import an Arch or Baz branch into a bzr branch"""
 
564
    takes_args = ['to_location', 'from_branch?']
 
565
    takes_options = ['verbose']
 
566
 
 
567
    def run(self, to_location, from_branch=None, skip_symlinks=False, 
 
568
            fast=False, max_count=None, verbose=False, dry_run=False):
 
569
        to_location = os.path.realpath(str(to_location))
 
570
        if from_branch is not None:
826
571
            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()
846
 
 
847
 
 
848
 
def map_namespace(a_version):
849
 
    a_version = pybaz.Version("%s" % a_version)
850
 
    parser = NameParser(a_version)
851
 
    version = parser.get_version()
852
 
    branch = parser.get_branch()
853
 
    category = parser.get_category()
854
 
    if branch is None or branch == '':
855
 
        branch = "+trunk"
856
 
    if version == '0':
857
 
        return "%s/%s" % (category, branch)
858
 
    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')
 
572
                from_branch = pybaz.Version(from_branch)
 
573
            except pybaz.errors.NamespaceError:
 
574
                print "%s is not a valid Arch branch." % from_branch
 
575
                return 1
 
576
        import_version(to_location, from_branch)