« back to all changes in this revision
Viewing changes to baz_import.py
- browse files at revision 785
- compare with another revision
- download diff
- download tarball
- view history from revision 785
- Committer: Aaron Bentley
- Date: 2012-01-20 02:07:15 UTC
- Revision ID: aaron@aaronbentley.com-20120120020715-ar6jbqnrjcuebggz
Tags: release-2.5
Update for 2.5 release.
- files added:
- .be/bugs/0fc1fb5e-c545-453c-999d-5fc5ef852ca5
- .be/bugs/1804f828-abfe-4433-b287-7560ff9ea354
- .be/bugs/1804f828-abfe-4433-b287-7560ff9ea354/comments
- .be/bugs/1804f828-abfe-4433-b287-7560ff9ea354/comments/a68c4dc0-c796-4747-b7a1-60bee9fb2c86
- .be/bugs/1804f828-abfe-4433-b287-7560ff9ea354/comments/aa6140d3-b4a7-46c3-abae-4c7b8a3523ce
- .be/bugs/55bd43ce-953b-4233-83d2-2034ea63a805
- .be/bugs/5be3aa64-4585-49e4-8479-172c67afcc1b
- .be/bugs/5be3aa64-4585-49e4-8479-172c67afcc1b/comments
- .be/bugs/5be3aa64-4585-49e4-8479-172c67afcc1b/comments/298847ed-8d6a-416f-a3aa-4fd6d3f3417b
- .be/bugs/83031098-bd41-4159-852d-eec95740ab19
- .be/bugs/83031098-bd41-4159-852d-eec95740ab19/comments
- .be/bugs/83031098-bd41-4159-852d-eec95740ab19/comments/5aa94e9e-8a61-4bb1-aa74-b50428b8324c
- .be/bugs/945dc3f8-75e1-4312-b56d-9ecb02310783
- .be/bugs/945dc3f8-75e1-4312-b56d-9ecb02310783/comments
- .be/bugs/945dc3f8-75e1-4312-b56d-9ecb02310783/comments/5c42de60-2f51-48a0-9756-dcef5f6955ab
- .be/bugs/b394a88a-3ecc-4058-8e29-4ebdbf96c95f
- .be/bugs/b394a88a-3ecc-4058-8e29-4ebdbf96c95f/comments
- .be/bugs/b394a88a-3ecc-4058-8e29-4ebdbf96c95f/comments/0978c6a8-194e-4437-b3fc-2c99adf96499
- .be/bugs/b47ef4d6-6a96-44ad-9694-6dd2c855d9c3
- .be/bugs/b47ef4d6-6a96-44ad-9694-6dd2c855d9c3/comments
- .be/bugs/b47ef4d6-6a96-44ad-9694-6dd2c855d9c3/comments/4946aca8-392b-4d95-ae22-65c1a38d842c
- .be/bugs/be87c595-f555-4bce-a12a-9eeefc7349ab
- .be/bugs/be87c595-f555-4bce-a12a-9eeefc7349ab/comments
- .be/bugs/be87c595-f555-4bce-a12a-9eeefc7349ab/comments/3448c47d-def5-4d03-9b8c-f0968e0c787c
- .be/bugs/c4664fbc-3b6a-48a6-bc09-9e96fa250592
- .be/bugs/c4664fbc-3b6a-48a6-bc09-9e96fa250592/comments
- .be/bugs/c4664fbc-3b6a-48a6-bc09-9e96fa250592/comments/f752631b-5590-4b6f-86d9-57aadca441ce
- .the_kraken
- files removed:
- baz_import.py
- external
- obsolete
- files renamed:
- release.py => check-release.py
- __init__.py => command_classes.py
- files modified:
- .be/bugs/dbd10145-51f8-4bda-96d9-06b5d3ef80b8/values
added
removed
baz_import.py
1
# Copyright (C) 2005, 2006 by Aaron Bentley
2
3
# This program is free software; you can redistribute it and/or modify
4
# it under the terms of the GNU General Public License as published by
5
# the Free Software Foundation; either version 2 of the License, or
6
# (at your option) any later version.
7
8
# This program is distributed in the hope that it will be useful,
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11
# GNU General Public License for more details.
12
13
# You should have received a copy of the GNU General Public License
14
# along with this program; if not, write to the Free Software
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
from bzrlib.branch import Branch
29
from bzrlib.commit import Commit, NullCommitReporter
30
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
from errors import NoPyBaz
38
try:
39
import pybaz
40
import pybaz.errors
41
from pybaz import NameParser as NameParser
42
from pybaz.backends.baz import null_cmd
43
except ImportError:
44
raise NoPyBaz
45
from fai import iter_new_merges, direct_merges
46
import tempfile
47
import os
48
import os.path
49
import shutil
50
import bzrlib
51
import bzrlib.trace
52
import bzrlib.merge
53
import bzrlib.inventory
54
import bzrlib.osutils
55
import sys
56
import email.Utils
57
from progress import *
58
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
def add_id(files, id=None):
70
"""Adds an explicit id to a list of files.
71
72
:param files: the name of the file to add an id to
73
:type files: list of str
74
:param id: tag one file using the specified id, instead of generating id
75
:type id: str
76
"""
77
args = ["add-id"]
78
if id is not None:
79
args.extend(["--id", id])
80
args.extend(files)
81
return null_cmd(args)
82
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
def test_environ():
91
"""
92
>>> q = test_environ()
93
>>> os.path.exists(q)
94
True
95
>>> os.path.exists(os.path.join(q, "home", ".arch-params"))
96
True
97
>>> teardown_environ(q)
98
>>> os.path.exists(q)
99
False
100
"""
101
global saved_dir
102
saved_dir = os.getcwdu()
103
tdir = tempfile.mkdtemp(prefix="testdir-")
104
os.environ["HOME"] = os.path.join(tdir, "home")
105
os.mkdir(os.environ["HOME"])
106
arch_dir = os.path.join(tdir, "archive_dir")
107
make_archive("test@example.com", arch_dir)
108
work_dir = os.path.join(tdir, "work_dir")
109
os.mkdir(work_dir)
110
os.chdir(work_dir)
111
pybaz.init_tree(work_dir, "test@example.com/test--test--0")
112
lib_dir = os.path.join(tdir, "lib_dir")
113
os.mkdir(lib_dir)
114
pybaz.register_revision_library(lib_dir)
115
pybaz.set_my_id("Test User<test@example.org>")
116
return tdir
117
118
def add_file(path, text, id):
119
"""
120
>>> q = test_environ()
121
>>> add_file("path with space", "text", "lalala")
122
>>> tree = pybaz.tree_root(".")
123
>>> inv = list(tree.iter_inventory_ids(source=True, both=True))
124
>>> ("x_lalala", "path with space") in inv
125
True
126
>>> teardown_environ(q)
127
"""
128
file(path, "wb").write(text)
129
add_id([path], id)
130
131
132
def add_dir(path, id):
133
"""
134
>>> q = test_environ()
135
>>> add_dir("path with\(sp) space", "lalala")
136
>>> tree = pybaz.tree_root(".")
137
>>> inv = list(tree.iter_inventory_ids(source=True, both=True))
138
>>> ("x_lalala", "path with\(sp) space") in inv
139
True
140
>>> teardown_environ(q)
141
"""
142
os.mkdir(path)
143
add_id([path], id)
144
145
def teardown_environ(tdir):
146
os.chdir(saved_dir)
147
shutil.rmtree(tdir)
148
149
def timport(tree, summary):
150
msg = tree.log_message()
151
msg["summary"] = summary
152
tree.import_(msg)
153
154
def commit(tree, summary):
155
"""
156
>>> q = test_environ()
157
>>> tree = pybaz.tree_root(".")
158
>>> timport(tree, "import")
159
>>> commit(tree, "commit")
160
>>> logs = [str(l.revision) for l in tree.iter_logs()]
161
>>> len(logs)
162
2
163
>>> logs[0]
164
'test@example.com/test--test--0--base-0'
165
>>> logs[1]
166
'test@example.com/test--test--0--patch-1'
167
>>> teardown_environ(q)
168
"""
169
msg = tree.log_message()
170
msg["summary"] = summary
171
tree.commit(msg)
172
173
def commit_test_revisions():
174
"""
175
>>> q = test_environ()
176
>>> commit_test_revisions()
177
>>> a = pybaz.Archive("test@example.com")
178
>>> revisions = list(a.iter_revisions("test--test--0"))
179
>>> len(revisions)
180
3
181
>>> str(revisions[2])
182
'test@example.com/test--test--0--base-0'
183
>>> str(revisions[1])
184
'test@example.com/test--test--0--patch-1'
185
>>> str(revisions[0])
186
'test@example.com/test--test--0--patch-2'
187
>>> teardown_environ(q)
188
"""
189
tree = pybaz.tree_root(".")
190
add_file("mainfile", "void main(void){}", "mainfile by aaron")
191
timport(tree, "Created mainfile")
192
file("mainfile", "wb").write("or something like that")
193
commit(tree, "altered mainfile")
194
add_file("ofile", "this is another file", "ofile by aaron")
195
commit(tree, "altered mainfile")
196
197
198
def commit_more_test_revisions():
199
"""
200
>>> q = test_environ()
201
>>> commit_test_revisions()
202
>>> commit_more_test_revisions()
203
>>> a = pybaz.Archive("test@example.com")
204
>>> revisions = list(a.iter_revisions("test--test--0"))
205
>>> len(revisions)
206
4
207
>>> str(revisions[0])
208
'test@example.com/test--test--0--patch-3'
209
>>> teardown_environ(q)
210
"""
211
tree = pybaz.tree_root(".")
212
add_file("trainfile", "void train(void){}", "trainfile by aaron")
213
commit(tree, "altered trainfile")
214
215
class NoSuchVersion(Exception):
216
def __init__(self, version):
217
Exception.__init__(self, "The version %s does not exist." % version)
218
self.version = version
219
220
def version_ancestry(version):
221
"""
222
>>> q = test_environ()
223
>>> commit_test_revisions()
224
>>> version = pybaz.Version("test@example.com/test--test--0")
225
>>> ancestors = version_ancestry(version)
226
>>> str(ancestors[0])
227
'test@example.com/test--test--0--base-0'
228
>>> str(ancestors[1])
229
'test@example.com/test--test--0--patch-1'
230
>>> version = pybaz.Version("test@example.com/test--test--0.5")
231
>>> ancestors = version_ancestry(version)
232
Traceback (most recent call last):
233
NoSuchVersion: The version test@example.com/test--test--0.5 does not exist.
234
>>> teardown_environ(q)
235
"""
236
try:
237
revision = version.iter_revisions(reverse=True).next()
238
except StopIteration:
239
return ()
240
except:
241
print version
242
if not version.exists():
243
raise NoSuchVersion(version)
244
else:
245
raise
246
ancestors = list(revision.iter_ancestors(metoo=True))
247
ancestors.reverse()
248
return ancestors
249
250
def get_last_revision(branch):
251
last_patch = branch.last_revision()
252
try:
253
return arch_revision(last_patch)
254
except NotArchRevision:
255
raise UserError(
256
"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=[]):
286
last_patch = None
287
old_revno = None
288
output_exists = os.path.exists(output_dir)
289
if output_exists:
290
# We are starting from an existing directory, figure out what
291
# the current version is
292
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:
299
version = last_patch.version
300
elif version is None:
301
raise UserError("No version specified, and directory does not exist.")
302
303
try:
304
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
except NoSuchVersion, e:
327
raise UserError(str(e))
328
329
if last_patch:
330
for i in range(len(ancestors)):
331
if ancestors[i] == last_patch:
332
break
333
else:
334
raise UserError("Directory \"%s\" already exists, and the last "
335
"revision (%s) is not in the ancestry of %s" %
336
(output_dir, last_patch, version))
337
# Strip off all of the ancestors which are already present
338
# And get a directory starting with the latest ancestor
339
latest_ancestor = ancestors[i]
340
old_revno = Branch.open(output_dir).revno()
341
ancestors = ancestors[i+1:]
342
return ancestors, old_revno
343
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):
363
"""
364
>>> q = test_environ()
365
366
Progress bars output to stderr, but doctest does not capture that.
367
368
>>> old_stderr = sys.stderr
369
>>> sys.stderr = sys.stdout
370
371
>>> result_path = os.path.join(q, "result")
372
>>> commit_test_revisions()
373
>>> 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)
379
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)
382
Traceback (most recent call last):
383
UserError: The version test@example.com/test--test--0.1 does not exist.
384
>>> 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: ..........................................
389
Dry run, not modifying output_dir
390
Cleaning up
391
>>> import_version(result_path, version, None) #doctest: +ELLIPSIS
392
importing test@example.com/test--test--0 into ...
393
...
394
revisions: .....................................................................
395
Cleaning up
396
Import complete.
397
>>> import_version(result_path, version, None) #doctest: +ELLIPSIS
398
Tree is up-to-date with test@example.com/test--test--0--patch-2
399
>>> commit_more_test_revisions()
400
>>> import_version(result_path, version, None) #doctest: +ELLIPSIS
401
importing test@example.com/test--test--0 into ...
402
revisions: ....................................................
403
Cleaning up
404
Import complete.
405
>>> bzrlib.ui.ui_factory = old_ui
406
>>> sys.stderr = old_stderr
407
>>> teardown_environ(q)
408
"""
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
434
try:
435
for result in iter_import_version(output_dir, ancestors, tempdir,
436
pb=progress_bar, encoding=encoding, fast=fast,
437
verbose=verbose, dry_run=dry_run, max_count=max_count,
438
standalone=standalone):
439
show_progress(progress_bar, result)
440
if dry_run:
441
progress_bar.note('Dry run, not modifying output_dir')
442
return
443
444
# Update the working tree of the branch
445
try:
446
wt = WorkingTree.open(output_dir)
447
except NoWorkingTree:
448
wt = None
449
if wt is not None:
450
wt.set_last_revision(wt.branch.last_revision())
451
wt.set_root_id(BAZ_IMPORT_ROOT)
452
wt.revert([])
453
454
finally:
455
456
progress_bar.note('Cleaning up')
457
shutil.rmtree(tempdir)
458
progress_bar.note("Import complete.")
459
finally:
460
progress_bar.finished()
461
462
class UserError(BzrCommandError):
463
def __init__(self, message):
464
"""Exception to throw when a user makes an impossible request
465
:param message: The message to emit when printing this exception
466
:type message: string
467
"""
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):
477
"""
478
Generate a Bzr revision id from an Arch revision id. 'x' in the id
479
designates a revision imported with an experimental algorithm. A number
480
would indicate a particular standardized version.
481
482
:param arch_revision: The Arch revision to generate an ID for.
483
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'
488
"""
489
if encoding is None:
490
encoding = ''
491
else:
492
encoding = '-' + encoding
493
return "Arch-1%s:%s" % (encoding, str(arch_revision).replace('/', '%'))
494
495
class NotArchRevision(Exception):
496
def __init__(self, revision_id):
497
msg = "The revision id %s does not look like it came from Arch."\
498
% revision_id
499
Exception.__init__(self, msg)
500
501
def arch_revision(revision_id):
502
"""
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'
517
"""
518
if revision_id is None:
519
return None, None
520
if revision_id[:7] not in ('Arch-1:', 'Arch-1-'):
521
raise NotArchRevision(revision_id)
522
else:
523
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
531
except pybaz.errors.NamespaceError, e:
532
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):
564
revdir = None
565
log_encoding = 'ascii'
566
if encoding is not None:
567
log_encoding = encoding
568
569
# Uncomment this for testing, it basically just has baz2bzr only update
570
# 5 patches at a time
571
if max_count:
572
ancestors = ancestors[:max_count]
573
574
# Not sure if I want this output. basically it tells you ahead of time
575
# what it is going to do, but then later it tells you as it is doing it.
576
# what probably would be best would be to collapse it into ranges, so that
577
# this gives the simple view, and then later it gives the blow by blow.
578
#if verbose:
579
# print 'Adding the following revisions:'
580
# for a in ancestors:
581
# print '\t%s' % a
582
583
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
600
for i in range(len(ancestors)):
601
revision = ancestors[i]
602
rev_id = revision_id(revision, encoding)
603
direct_merges = []
604
if verbose:
605
version = str(revision.version)
606
if version != previous_version:
607
pb.note('On version: %s' % version)
608
yield Progress(str(revision.patchlevel), i, len(ancestors))
609
previous_version = version
610
else:
611
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
if revdir is None:
617
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
630
else:
631
old = os.path.join(revdir, ".bzr")
632
new = os.path.join(tempdir, ".bzr")
633
os.rename(old, new)
634
baz_inv, log = apply_revision(tree, revision)
635
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()
655
branch.lock_write()
656
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={})
673
finally:
674
target_tree.unlock()
675
branch.unlock()
676
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)
696
if os.path.isdir(path):
697
shutil.rmtree(path)
698
else:
699
os.unlink(path)
700
701
def get_log(tree, revision):
702
log = pybaz.Patchlog(revision, tree=tree)
703
assert str(log.revision) == str(revision), (log.revision, revision)
704
return log
705
706
def get_revision(revdir, revision):
707
tree = revision.get(revdir)
708
log = get_log(tree, revision)
709
try:
710
return tree, bzr_inventory_data(tree), log
711
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):
717
revision.apply(tree)
718
log = get_log(tree, revision)
719
try:
720
return bzr_inventory_data(tree), log
721
except BadFileKind, e:
722
raise UserError("Cannot convert %s because %s is a %s" %
723
(revision,e.path, e.kind))
724
725
726
class BadFileKind(Exception):
727
"""The file kind is not permitted in bzr inventories"""
728
def __init__(self, tree_root, path, kind):
729
self.tree_root = tree_root
730
self.path = path
731
self.kind = kind
732
Exception.__init__(self, "File %s is of forbidden type %s" %
733
(os.path.join(tree_root, path), kind))
734
735
736
def bzr_inventory_data(tree):
737
inv_iter = tree.iter_inventory_ids(source=True, both=True)
738
inv_map = {}
739
for arch_id, path in inv_iter:
740
bzr_file_id = map_file_id(arch_id)
741
inv_map[path] = bzr_file_id
742
743
bzr_inv = []
744
for path, file_id in inv_map.iteritems():
745
full_path = os.path.join(tree, path)
746
kind = bzrlib.osutils.file_kind(full_path)
747
if kind not in ("file", "directory", "symlink"):
748
raise BadFileKind(tree, path, kind)
749
parent_dir = os.path.dirname(path)
750
if parent_dir != "":
751
parent_id = inv_map[parent_dir]
752
else:
753
parent_id = bzrlib.inventory.ROOT_ID
754
bzr_inv.append((path, file_id, parent_id, kind))
755
bzr_inv.sort()
756
return bzr_inv
757
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
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))
826
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')
Loggerhead is a web-based interface for Breezy
Version: 2.0.1