To get this branch, use:
bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
« back to all changes in this revision
Viewing changes to bzrlib/builtins.py
- browse files at revision 4523.1.4
- compare with another revision
- download diff
- download tarball
- view history from revision 4523.1.4
- Committer: Martin Pool
- Date: 2009-07-10 07:14:02 UTC
- mto: (4525.1.1 integration)
- mto: This revision was merged to the branch mainline in revision 4526.
- Revision ID: mbp@sourcefrog.net-20090710071402-dga5lhvdup5jeere
Rename remaining *_implementations tests
- files added:
- bzrlib/textui.py
- doc/en/developer-guide
- doc/es/developer-guide
- doc/es/release-notes
- doc/es/user-reference
- files removed:
- .testr.conf
- apport
- bzrlib/help_topics/es
- bzrlib/plugins/news_merge
- bzrlib/plugins/news_merge/tests
- bzrlib/tests/per_bzrdir_colo
- bzrlib/tests/per_foreign_vcs
- bzrlib/tests/per_uifactory
- contrib/debian
- doc/developers/_static
- doc/developers/_templates
- doc/en/_static
- doc/en/_static/en
- doc/en/_templates
- doc/en/upgrade-guide
- doc/en/whats-new
- doc/es/_static
- doc/es/_static/es
- doc/es/_templates
- doc/ja
- doc/ja/_static
- doc/ja/_templates
- doc/ja/mini-tutorial
- doc/ja/tutorials
- doc/ja/upgrade-guide
- doc/ja/user-guide
- doc/ja/user-guide/images
- doc/ja/user-reference
- doc/ru/_static
- doc/ru/_static/ru
- doc/ru/_templates
- tools/win32/buildout-templates
- tools/win32/buildout-templates/bin
- files renamed:
- bzrlib/help_topics/en/conflict-types.txt => bzrlib/help_topics/en/conflicts.txt
- bzrlib/tests/test__bencode.py => bzrlib/tests/test_bencode.py
- bzrlib/tests/per_pack_repository.py => bzrlib/tests/test_pack_repository.py
- bzrlib/tests/per_versionedfile.py => bzrlib/tests/test_versionedfile.py
- doc/developers/HACKING.txt => doc/en/developer-guide/HACKING.txt
- doc/en/_static/en/Makefile => doc/en/quick-reference/Makefile
- doc/en/_static/en/bzr-en-quick-reference.pdf => doc/en/quick-reference/quick-start-summary.pdf
- doc/en/_static/en/bzr-en-quick-reference.png => doc/en/quick-reference/quick-start-summary.png
- doc/en/_static/en/bzr-en-quick-reference.svg => doc/en/quick-reference/quick-start-summary.svg
- doc/es/_static/es/Makefile => doc/es/quick-reference/Makefile
- doc/es/_static/es/bzr-es-quick-reference.pdf => doc/es/quick-reference/quick-start-summary.pdf
- doc/es/_static/es/bzr-es-quick-reference.png => doc/es/quick-reference/quick-start-summary.png
- doc/es/_static/es/bzr-es-quick-reference.svg => doc/es/quick-reference/quick-start-summary.svg
- bzrlib/help_topics/es/conflict-types.txt => doc/es/user-guide/resolving_conflicts.txt
- doc/es/index.txt => doc/index.es.txt
- doc/ru/index.txt => doc/index.ru.txt
- doc/ru/_static/ru/Makefile => doc/ru/quick-reference/Makefile
- doc/ru/_static/ru/bzr-ru-quick-reference.pdf => doc/ru/quick-reference/quick-start-summary.pdf
- doc/ru/_static/ru/bzr-ru-quick-reference.png => doc/ru/quick-reference/quick-start-summary.png
- doc/ru/_static/ru/bzr-ru-quick-reference.svg => doc/ru/quick-reference/quick-start-summary.svg
- files modified:
- .bzrignore
added
removed
bzrlib/builtins.py
1
# Copyright (C) 2005-2010 Canonical Ltd
1
# Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Canonical Ltd
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
31
31
bundle,
32
32
btree_index,
33
33
bzrdir,
34
directory_service,
35
34
delta,
36
35
config,
37
36
errors,
44
43
reconfigure,
45
44
rename_map,
46
45
revision as _mod_revision,
47
static_tuple,
48
46
symbol_versioning,
49
timestamp,
50
47
transport,
51
48
ui,
52
49
urlutils,
54
51
)
55
52
from bzrlib.branch import Branch
56
53
from bzrlib.conflicts import ConflictList
57
from bzrlib.transport import memory
58
54
from bzrlib.revisionspec import RevisionSpec, RevisionInfo
59
55
from bzrlib.smtp_connection import SMTPConnection
60
56
from bzrlib.workingtree import WorkingTree
61
57
""")
62
58
63
from bzrlib.commands import (
64
Command,
65
builtin_command_registry,
66
display_command,
67
)
59
from bzrlib.commands import Command, display_command
68
60
from bzrlib.option import (
69
61
ListOption,
70
62
Option,
128
120
129
121
130
122
def _get_one_revision_tree(command_name, revisions, branch=None, tree=None):
131
"""Get a revision tree. Not suitable for commands that change the tree.
132
133
Specifically, the basis tree in dirstate trees is coupled to the dirstate
134
and doing a commit/uncommit/pull will at best fail due to changing the
135
basis revision data.
136
137
If tree is passed in, it should be already locked, for lifetime management
138
of the trees internal cached state.
139
"""
140
123
if branch is None:
141
124
branch = tree.branch
142
125
if revisions is None:
232
215
return view_info
233
216
234
217
235
def _open_directory_or_containing_tree_or_branch(filename, directory):
236
"""Open the tree or branch containing the specified file, unless
237
the --directory option is used to specify a different branch."""
238
if directory is not None:
239
return (None, Branch.open(directory), filename)
240
return bzrdir.BzrDir.open_containing_tree_or_branch(filename)
241
242
243
218
# TODO: Make sure no commands unconditionally use the working directory as a
244
219
# branch. If a filename argument is used, the first of them should be used to
245
220
# specify the branch. (Perhaps this can be factored out into some kind of
247
222
# opens the branch?)
248
223
249
224
class cmd_status(Command):
250
__doc__ = """Display status summary.
225
"""Display status summary.
251
226
252
227
This reports on versioned and unknown files, reporting them
253
228
grouped by state. Possible states are:
273
248
unknown
274
249
Not versioned and not matching an ignore pattern.
275
250
276
Additionally for directories, symlinks and files with an executable
277
bit, Bazaar indicates their type using a trailing character: '/', '@'
278
or '*' respectively.
279
280
251
To see ignored files use 'bzr ignored'. For details on the
281
252
changes to file texts, use 'bzr diff'.
282
253
340
311
341
312
342
313
class cmd_cat_revision(Command):
343
__doc__ = """Write out metadata for a revision.
314
"""Write out metadata for a revision.
344
315
345
316
The revision to print can either be specified by a specific
346
317
revision identifier, or you can use --revision.
348
319
349
320
hidden = True
350
321
takes_args = ['revision_id?']
351
takes_options = ['directory', 'revision']
322
takes_options = ['revision']
352
323
# cat-revision is more for frontends so should be exact
353
324
encoding = 'strict'
354
325
355
def print_revision(self, revisions, revid):
356
stream = revisions.get_record_stream([(revid,)], 'unordered', True)
357
record = stream.next()
358
if record.storage_kind == 'absent':
359
raise errors.NoSuchRevision(revisions, revid)
360
revtext = record.get_bytes_as('fulltext')
361
self.outf.write(revtext.decode('utf-8'))
362
363
326
@display_command
364
def run(self, revision_id=None, revision=None, directory=u'.'):
327
def run(self, revision_id=None, revision=None):
365
328
if revision_id is not None and revision is not None:
366
329
raise errors.BzrCommandError('You can only supply one of'
367
330
' revision_id or --revision')
368
331
if revision_id is None and revision is None:
369
332
raise errors.BzrCommandError('You must supply either'
370
333
' --revision or a revision_id')
371
b = WorkingTree.open_containing(directory)[0].branch
372
373
revisions = b.repository.revisions
374
if revisions is None:
375
raise errors.BzrCommandError('Repository %r does not support '
376
'access to raw revision texts')
377
378
b.repository.lock_read()
379
try:
380
# TODO: jam 20060112 should cat-revision always output utf-8?
381
if revision_id is not None:
382
revision_id = osutils.safe_revision_id(revision_id, warn=False)
383
try:
384
self.print_revision(revisions, revision_id)
385
except errors.NoSuchRevision:
386
msg = "The repository %s contains no revision %s." % (
387
b.repository.base, revision_id)
388
raise errors.BzrCommandError(msg)
389
elif revision is not None:
390
for rev in revision:
391
if rev is None:
392
raise errors.BzrCommandError(
393
'You cannot specify a NULL revision.')
394
rev_id = rev.as_revision_id(b)
395
self.print_revision(revisions, rev_id)
396
finally:
397
b.repository.unlock()
398
334
b = WorkingTree.open_containing(u'.')[0].branch
335
336
# TODO: jam 20060112 should cat-revision always output utf-8?
337
if revision_id is not None:
338
revision_id = osutils.safe_revision_id(revision_id, warn=False)
339
try:
340
self.outf.write(b.repository.get_revision_xml(revision_id).decode('utf-8'))
341
except errors.NoSuchRevision:
342
msg = "The repository %s contains no revision %s." % (b.repository.base,
343
revision_id)
344
raise errors.BzrCommandError(msg)
345
elif revision is not None:
346
for rev in revision:
347
if rev is None:
348
raise errors.BzrCommandError('You cannot specify a NULL'
349
' revision.')
350
rev_id = rev.as_revision_id(b)
351
self.outf.write(b.repository.get_revision_xml(rev_id).decode('utf-8'))
352
399
353
400
354
class cmd_dump_btree(Command):
401
__doc__ = """Dump the contents of a btree index file to stdout.
355
"""Dump the contents of a btree index file to stdout.
402
356
403
357
PATH is a btree index file, it can be any URL. This includes things like
404
358
.bzr/repository/pack-names, or .bzr/repository/indices/a34b3a...ca4a4.iix
468
422
for node in bt.iter_all_entries():
469
423
# Node is made up of:
470
424
# (index, key, value, [references])
471
try:
472
refs = node[3]
473
except IndexError:
474
refs_as_tuples = None
475
else:
476
refs_as_tuples = static_tuple.as_tuples(refs)
477
as_tuple = (tuple(node[1]), node[2], refs_as_tuples)
478
self.outf.write('%s\n' % (as_tuple,))
425
self.outf.write('%s\n' % (node[1:],))
479
426
480
427
481
428
class cmd_remove_tree(Command):
482
__doc__ = """Remove the working tree from a given branch/checkout.
429
"""Remove the working tree from a given branch/checkout.
483
430
484
431
Since a lightweight checkout is little more than a working tree
485
432
this will refuse to run against one.
487
434
To re-create the working tree, use "bzr checkout".
488
435
"""
489
436
_see_also = ['checkout', 'working-trees']
490
takes_args = ['location*']
437
takes_args = ['location?']
491
438
takes_options = [
492
439
Option('force',
493
440
help='Remove the working tree even if it has '
494
441
'uncommitted changes.'),
495
442
]
496
443
497
def run(self, location_list, force=False):
498
if not location_list:
499
location_list=['.']
500
501
for location in location_list:
502
d = bzrdir.BzrDir.open(location)
503
504
try:
505
working = d.open_workingtree()
506
except errors.NoWorkingTree:
507
raise errors.BzrCommandError("No working tree to remove")
508
except errors.NotLocalUrl:
509
raise errors.BzrCommandError("You cannot remove the working tree"
510
" of a remote path")
511
if not force:
512
if (working.has_changes()):
513
raise errors.UncommittedChanges(working)
514
515
if working.user_url != working.branch.user_url:
516
raise errors.BzrCommandError("You cannot remove the working tree"
517
" from a lightweight checkout")
518
519
d.destroy_workingtree()
444
def run(self, location='.', force=False):
445
d = bzrdir.BzrDir.open(location)
446
447
try:
448
working = d.open_workingtree()
449
except errors.NoWorkingTree:
450
raise errors.BzrCommandError("No working tree to remove")
451
except errors.NotLocalUrl:
452
raise errors.BzrCommandError("You cannot remove the working tree of a "
453
"remote path")
454
if not force:
455
changes = working.changes_from(working.basis_tree())
456
if changes.has_changed():
457
raise errors.UncommittedChanges(working)
458
459
working_path = working.bzrdir.root_transport.base
460
branch_path = working.branch.bzrdir.root_transport.base
461
if working_path != branch_path:
462
raise errors.BzrCommandError("You cannot remove the working tree from "
463
"a lightweight checkout")
464
465
d.destroy_workingtree()
520
466
521
467
522
468
class cmd_revno(Command):
523
__doc__ = """Show current revision number.
469
"""Show current revision number.
524
470
525
471
This is equal to the number of revisions on this branch.
526
472
"""
536
482
if tree:
537
483
try:
538
484
wt = WorkingTree.open_containing(location)[0]
539
self.add_cleanup(wt.lock_read().unlock)
485
wt.lock_read()
540
486
except (errors.NoWorkingTree, errors.NotLocalUrl):
541
487
raise errors.NoWorkingTree(location)
542
revid = wt.last_revision()
543
488
try:
544
revno_t = wt.branch.revision_id_to_dotted_revno(revid)
545
except errors.NoSuchRevision:
546
revno_t = ('???',)
547
revno = ".".join(str(n) for n in revno_t)
489
revid = wt.last_revision()
490
try:
491
revno_t = wt.branch.revision_id_to_dotted_revno(revid)
492
except errors.NoSuchRevision:
493
revno_t = ('???',)
494
revno = ".".join(str(n) for n in revno_t)
495
finally:
496
wt.unlock()
548
497
else:
549
498
b = Branch.open_containing(location)[0]
550
self.add_cleanup(b.lock_read().unlock)
551
revno = b.revno()
552
self.cleanup_now()
499
b.lock_read()
500
try:
501
revno = b.revno()
502
finally:
503
b.unlock()
504
553
505
self.outf.write(str(revno) + '\n')
554
506
555
507
556
508
class cmd_revision_info(Command):
557
__doc__ = """Show revision number and revision id for a given revision identifier.
509
"""Show revision number and revision id for a given revision identifier.
558
510
"""
559
511
hidden = True
560
512
takes_args = ['revision_info*']
561
513
takes_options = [
562
514
'revision',
563
custom_help('directory',
515
Option('directory',
564
516
help='Branch to examine, '
565
'rather than the one containing the working directory.'),
517
'rather than the one containing the working directory.',
518
short_name='d',
519
type=unicode,
520
),
566
521
Option('tree', help='Show revno of working tree'),
567
522
]
568
523
573
528
try:
574
529
wt = WorkingTree.open_containing(directory)[0]
575
530
b = wt.branch
576
self.add_cleanup(wt.lock_read().unlock)
531
wt.lock_read()
577
532
except (errors.NoWorkingTree, errors.NotLocalUrl):
578
533
wt = None
579
534
b = Branch.open_containing(directory)[0]
580
self.add_cleanup(b.lock_read().unlock)
581
revision_ids = []
582
if revision is not None:
583
revision_ids.extend(rev.as_revision_id(b) for rev in revision)
584
if revision_info_list is not None:
585
for rev_str in revision_info_list:
586
rev_spec = RevisionSpec.from_string(rev_str)
587
revision_ids.append(rev_spec.as_revision_id(b))
588
# No arguments supplied, default to the last revision
589
if len(revision_ids) == 0:
590
if tree:
591
if wt is None:
592
raise errors.NoWorkingTree(directory)
593
revision_ids.append(wt.last_revision())
535
b.lock_read()
536
try:
537
revision_ids = []
538
if revision is not None:
539
revision_ids.extend(rev.as_revision_id(b) for rev in revision)
540
if revision_info_list is not None:
541
for rev_str in revision_info_list:
542
rev_spec = RevisionSpec.from_string(rev_str)
543
revision_ids.append(rev_spec.as_revision_id(b))
544
# No arguments supplied, default to the last revision
545
if len(revision_ids) == 0:
546
if tree:
547
if wt is None:
548
raise errors.NoWorkingTree(directory)
549
revision_ids.append(wt.last_revision())
550
else:
551
revision_ids.append(b.last_revision())
552
553
revinfos = []
554
maxlen = 0
555
for revision_id in revision_ids:
556
try:
557
dotted_revno = b.revision_id_to_dotted_revno(revision_id)
558
revno = '.'.join(str(i) for i in dotted_revno)
559
except errors.NoSuchRevision:
560
revno = '???'
561
maxlen = max(maxlen, len(revno))
562
revinfos.append([revno, revision_id])
563
finally:
564
if wt is None:
565
b.unlock()
594
566
else:
595
revision_ids.append(b.last_revision())
596
597
revinfos = []
598
maxlen = 0
599
for revision_id in revision_ids:
600
try:
601
dotted_revno = b.revision_id_to_dotted_revno(revision_id)
602
revno = '.'.join(str(i) for i in dotted_revno)
603
except errors.NoSuchRevision:
604
revno = '???'
605
maxlen = max(maxlen, len(revno))
606
revinfos.append([revno, revision_id])
607
608
self.cleanup_now()
567
wt.unlock()
568
609
569
for ri in revinfos:
610
570
self.outf.write('%*s %s\n' % (maxlen, ri[0], ri[1]))
611
571
612
572
613
573
class cmd_add(Command):
614
__doc__ = """Add specified files or directories.
574
"""Add specified files or directories.
615
575
616
576
In non-recursive mode, all the named items are added, regardless
617
577
of whether they were previously ignored. A warning is given if
643
603
branches that will be merged later (without showing the two different
644
604
adds as a conflict). It is also useful when merging another project
645
605
into a subdirectory of this one.
646
647
Any files matching patterns in the ignore list will not be added
648
unless they are explicitly mentioned.
649
606
"""
650
607
takes_args = ['file*']
651
608
takes_options = [
659
616
help='Lookup file ids from this tree.'),
660
617
]
661
618
encoding_type = 'replace'
662
_see_also = ['remove', 'ignore']
619
_see_also = ['remove']
663
620
664
621
def run(self, file_list, no_recurse=False, dry_run=False, verbose=False,
665
622
file_ids_from=None):
682
639
should_print=(not is_quiet()))
683
640
684
641
if base_tree:
685
self.add_cleanup(base_tree.lock_read().unlock)
686
tree, file_list = tree_files_for_add(file_list)
687
added, ignored = tree.smart_add(file_list, not
688
no_recurse, action=action, save=not dry_run)
689
self.cleanup_now()
642
base_tree.lock_read()
643
try:
644
file_list = self._maybe_expand_globs(file_list)
645
tree, file_list = tree_files_for_add(file_list)
646
added, ignored = tree.smart_add(file_list, not
647
no_recurse, action=action, save=not dry_run)
648
finally:
649
if base_tree is not None:
650
base_tree.unlock()
690
651
if len(ignored) > 0:
691
652
if verbose:
692
653
for glob in sorted(ignored.keys()):
693
654
for path in ignored[glob]:
694
655
self.outf.write("ignored %s matching \"%s\"\n"
695
656
% (path, glob))
657
else:
658
match_len = 0
659
for glob, paths in ignored.items():
660
match_len += len(paths)
661
self.outf.write("ignored %d file(s).\n" % match_len)
662
self.outf.write("If you wish to add ignored files, "
663
"please add them explicitly by name. "
664
"(\"bzr ignored\" gives a list)\n")
696
665
697
666
698
667
class cmd_mkdir(Command):
699
__doc__ = """Create a new versioned directory.
668
"""Create a new versioned directory.
700
669
701
670
This is equivalent to creating the directory and then adding it.
702
671
"""
706
675
707
676
def run(self, dir_list):
708
677
for d in dir_list:
678
os.mkdir(d)
709
679
wt, dd = WorkingTree.open_containing(d)
710
base = os.path.dirname(dd)
711
id = wt.path2id(base)
712
if id != None:
713
os.mkdir(d)
714
wt.add([dd])
715
self.outf.write('added %s\n' % d)
716
else:
717
raise errors.NotVersionedError(path=base)
680
wt.add([dd])
681
self.outf.write('added %s\n' % d)
718
682
719
683
720
684
class cmd_relpath(Command):
721
__doc__ = """Show path of a file relative to root"""
685
"""Show path of a file relative to root"""
722
686
723
687
takes_args = ['filename']
724
688
hidden = True
733
697
734
698
735
699
class cmd_inventory(Command):
736
__doc__ = """Show inventory of the current working copy or a revision.
700
"""Show inventory of the current working copy or a revision.
737
701
738
702
It is possible to limit the output to a particular entry
739
703
type using the --kind option. For example: --kind file.
760
724
761
725
revision = _get_one_revision('inventory', revision)
762
726
work_tree, file_list = tree_files(file_list)
763
self.add_cleanup(work_tree.lock_read().unlock)
764
if revision is not None:
765
tree = revision.as_tree(work_tree.branch)
766
767
extra_trees = [work_tree]
768
self.add_cleanup(tree.lock_read().unlock)
769
else:
770
tree = work_tree
771
extra_trees = []
772
773
if file_list is not None:
774
file_ids = tree.paths2ids(file_list, trees=extra_trees,
775
require_versioned=True)
776
# find_ids_across_trees may include some paths that don't
777
# exist in 'tree'.
778
entries = sorted((tree.id2path(file_id), tree.inventory[file_id])
779
for file_id in file_ids if file_id in tree)
780
else:
781
entries = tree.inventory.entries()
782
783
self.cleanup_now()
727
work_tree.lock_read()
728
try:
729
if revision is not None:
730
tree = revision.as_tree(work_tree.branch)
731
732
extra_trees = [work_tree]
733
tree.lock_read()
734
else:
735
tree = work_tree
736
extra_trees = []
737
738
if file_list is not None:
739
file_ids = tree.paths2ids(file_list, trees=extra_trees,
740
require_versioned=True)
741
# find_ids_across_trees may include some paths that don't
742
# exist in 'tree'.
743
entries = sorted((tree.id2path(file_id), tree.inventory[file_id])
744
for file_id in file_ids if file_id in tree)
745
else:
746
entries = tree.inventory.entries()
747
finally:
748
tree.unlock()
749
if tree is not work_tree:
750
work_tree.unlock()
751
784
752
for path, entry in entries:
785
753
if kind and kind != entry.kind:
786
754
continue
792
760
793
761
794
762
class cmd_mv(Command):
795
__doc__ = """Move or rename a file.
763
"""Move or rename a file.
796
764
797
765
:Usage:
798
766
bzr mv OLDNAME NEWNAME
831
799
if len(names_list) < 2:
832
800
raise errors.BzrCommandError("missing file argument")
833
801
tree, rel_names = tree_files(names_list, canonicalize=False)
834
self.add_cleanup(tree.lock_tree_write().unlock)
835
self._run(tree, names_list, rel_names, after)
802
tree.lock_write()
803
try:
804
self._run(tree, names_list, rel_names, after)
805
finally:
806
tree.unlock()
836
807
837
808
def run_auto(self, names_list, after, dry_run):
838
809
if names_list is not None and len(names_list) > 1:
842
813
raise errors.BzrCommandError('--after cannot be specified with'
843
814
' --auto.')
844
815
work_tree, file_list = tree_files(names_list, default_branch='.')
845
self.add_cleanup(work_tree.lock_tree_write().unlock)
846
rename_map.RenameMap.guess_renames(work_tree, dry_run)
816
work_tree.lock_write()
817
try:
818
rename_map.RenameMap.guess_renames(work_tree, dry_run)
819
finally:
820
work_tree.unlock()
847
821
848
822
def _run(self, tree, names_list, rel_names, after):
849
823
into_existing = osutils.isdir(names_list[-1])
870
844
# All entries reference existing inventory items, so fix them up
871
845
# for cicp file-systems.
872
846
rel_names = tree.get_canonical_inventory_paths(rel_names)
873
for src, dest in tree.move(rel_names[:-1], rel_names[-1], after=after):
874
if not is_quiet():
875
self.outf.write("%s => %s\n" % (src, dest))
847
for pair in tree.move(rel_names[:-1], rel_names[-1], after=after):
848
self.outf.write("%s => %s\n" % pair)
876
849
else:
877
850
if len(names_list) != 2:
878
851
raise errors.BzrCommandError('to mv multiple files the'
922
895
dest = osutils.pathjoin(dest_parent, dest_tail)
923
896
mutter("attempting to move %s => %s", src, dest)
924
897
tree.rename_one(src, dest, after=after)
925
if not is_quiet():
926
self.outf.write("%s => %s\n" % (src, dest))
898
self.outf.write("%s => %s\n" % (src, dest))
927
899
928
900
929
901
class cmd_pull(Command):
930
__doc__ = """Turn this branch into a mirror of another branch.
902
"""Turn this branch into a mirror of another branch.
931
903
932
By default, this command only works on branches that have not diverged.
933
Branches are considered diverged if the destination branch's most recent
934
commit is one that has not been merged (directly or indirectly) into the
935
parent.
904
This command only works on branches that have not diverged. Branches are
905
considered diverged if the destination branch's most recent commit is one
906
that has not been merged (directly or indirectly) into the parent.
936
907
937
908
If branches have diverged, you can use 'bzr merge' to integrate the changes
938
909
from one into the other. Once one branch has merged, the other should
939
910
be able to pull it again.
940
911
941
If you want to replace your local changes and just want your branch to
942
match the remote one, use pull --overwrite. This will work even if the two
943
branches have diverged.
912
If you want to forget your local changes and just update your branch to
913
match the remote one, use pull --overwrite.
944
914
945
915
If there is no default location set, the first pull will set it. After
946
916
that, you can omit the location to use the default. To change the
956
926
takes_options = ['remember', 'overwrite', 'revision',
957
927
custom_help('verbose',
958
928
help='Show logs of pulled revisions.'),
959
custom_help('directory',
929
Option('directory',
960
930
help='Branch to pull into, '
961
'rather than the one containing the working directory.'),
931
'rather than the one containing the working directory.',
932
short_name='d',
933
type=unicode,
934
),
962
935
Option('local',
963
936
help="Perform a local pull in a bound "
964
937
"branch. Local pulls are not applied to "
979
952
try:
980
953
tree_to = WorkingTree.open_containing(directory)[0]
981
954
branch_to = tree_to.branch
982
self.add_cleanup(tree_to.lock_write().unlock)
983
955
except errors.NoWorkingTree:
984
956
tree_to = None
985
957
branch_to = Branch.open_containing(directory)[0]
986
self.add_cleanup(branch_to.lock_write().unlock)
987
958
988
959
if local and not branch_to.get_bound_location():
989
960
raise errors.LocalRequiresBoundBranch()
990
961
1020
991
else:
1021
992
branch_from = Branch.open(location,
1022
993
possible_transports=possible_transports)
1023
self.add_cleanup(branch_from.lock_read().unlock)
1024
994
1025
995
if branch_to.get_parent() is None or remember:
1026
996
branch_to.set_parent(branch_from.base)
1027
997
1028
if revision is not None:
1029
revision_id = revision.as_revision_id(branch_from)
1030
1031
if tree_to is not None:
1032
view_info = _get_view_info_for_change_reporter(tree_to)
1033
change_reporter = delta._ChangeReporter(
1034
unversioned_filter=tree_to.is_ignored,
1035
view_info=view_info)
1036
result = tree_to.pull(
1037
branch_from, overwrite, revision_id, change_reporter,
1038
possible_transports=possible_transports, local=local)
1039
else:
1040
result = branch_to.pull(
1041
branch_from, overwrite, revision_id, local=local)
1042
1043
result.report(self.outf)
1044
if verbose and result.old_revid != result.new_revid:
1045
log.show_branch_change(
1046
branch_to, self.outf, result.old_revno,
1047
result.old_revid)
998
if branch_from is not branch_to:
999
branch_from.lock_read()
1000
try:
1001
if revision is not None:
1002
revision_id = revision.as_revision_id(branch_from)
1003
1004
branch_to.lock_write()
1005
try:
1006
if tree_to is not None:
1007
view_info = _get_view_info_for_change_reporter(tree_to)
1008
change_reporter = delta._ChangeReporter(
1009
unversioned_filter=tree_to.is_ignored,
1010
view_info=view_info)
1011
result = tree_to.pull(
1012
branch_from, overwrite, revision_id, change_reporter,
1013
possible_transports=possible_transports, local=local)
1014
else:
1015
result = branch_to.pull(
1016
branch_from, overwrite, revision_id, local=local)
1017
1018
result.report(self.outf)
1019
if verbose and result.old_revid != result.new_revid:
1020
log.show_branch_change(
1021
branch_to, self.outf, result.old_revno,
1022
result.old_revid)
1023
finally:
1024
branch_to.unlock()
1025
finally:
1026
if branch_from is not branch_to:
1027
branch_from.unlock()
1048
1028
1049
1029
1050
1030
class cmd_push(Command):
1051
__doc__ = """Update a mirror of this branch.
1031
"""Update a mirror of this branch.
1052
1032
1053
1033
The target branch will not have its working tree populated because this
1054
1034
is both expensive, and is not supported on remote file systems.
1078
1058
Option('create-prefix',
1079
1059
help='Create the path leading up to the branch '
1080
1060
'if it does not already exist.'),
1081
custom_help('directory',
1061
Option('directory',
1082
1062
help='Branch to push from, '
1083
'rather than the one containing the working directory.'),
1063
'rather than the one containing the working directory.',
1064
short_name='d',
1065
type=unicode,
1066
),
1084
1067
Option('use-existing-dir',
1085
1068
help='By default push will fail if the target'
1086
1069
' directory exists, but does not already'
1112
1095
# Get the source branch
1113
1096
(tree, br_from,
1114
1097
_unused) = bzrdir.BzrDir.open_containing_tree_or_branch(directory)
1098
if strict is None:
1099
strict = br_from.get_config().get_user_option('push_strict')
1100
if strict is not None:
1101
# FIXME: This should be better supported by config
1102
# -- vila 20090611
1103
bools = dict(yes=True, no=False, on=True, off=False,
1104
true=True, false=False)
1105
try:
1106
strict = bools[strict.lower()]
1107
except KeyError:
1108
strict = None
1115
1109
# Get the tip's revision_id
1116
1110
revision = _get_one_revision('push', revision)
1117
1111
if revision is not None:
1118
1112
revision_id = revision.in_history(br_from).rev_id
1119
1113
else:
1120
1114
revision_id = None
1121
if tree is not None and revision_id is None:
1122
tree.check_changed_or_out_of_date(
1123
strict, 'push_strict',
1124
more_error='Use --no-strict to force the push.',
1125
more_warning='Uncommitted changes will not be pushed.')
1115
if (tree is not None and revision_id is None
1116
and (strict is None or strict)): # Default to True:
1117
changes = tree.changes_from(tree.basis_tree())
1118
if changes.has_changed() or len(tree.get_parent_ids()) > 1:
1119
raise errors.UncommittedChanges(
1120
tree, more='Use --no-strict to force the push.')
1121
if tree.last_revision() != tree.branch.last_revision():
1122
# The tree has lost sync with its branch, there is little
1123
# chance that the user is aware of it but he can still force
1124
# the push with --no-strict
1125
raise errors.OutOfDateTree(
1126
tree, more='Use --no-strict to force the push.')
1127
1126
1128
# Get the stacked_on branch, if any
1127
1129
if stacked_on is not None:
1128
1130
stacked_on = urlutils.normalize_url(stacked_on)
1160
1162
1161
1163
1162
1164
class cmd_branch(Command):
1163
__doc__ = """Create a new branch that is a copy of an existing branch.
1165
"""Create a new branch that is a copy of an existing branch.
1164
1166
1165
1167
If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will
1166
1168
be used. In other words, "branch ../foo/bar" will attempt to create ./bar.
1179
1181
help='Hard-link working tree files where possible.'),
1180
1182
Option('no-tree',
1181
1183
help="Create a branch without a working-tree."),
1182
Option('switch',
1183
help="Switch the checkout in the current directory "
1184
"to the new branch."),
1185
1184
Option('stacked',
1186
1185
help='Create a stacked branch referring to the source branch. '
1187
1186
'The new branch will depend on the availability of the source '
1193
1192
' directory exists, but does not already'
1194
1193
' have a control directory. This flag will'
1195
1194
' allow branch to proceed.'),
1196
Option('bind',
1197
help="Bind new branch to from location."),
1198
1195
]
1199
1196
aliases = ['get', 'clone']
1200
1197
1201
1198
def run(self, from_location, to_location=None, revision=None,
1202
1199
hardlink=False, stacked=False, standalone=False, no_tree=False,
1203
use_existing_dir=False, switch=False, bind=False):
1204
from bzrlib import switch as _mod_switch
1200
use_existing_dir=False):
1205
1201
from bzrlib.tag import _merge_tags_if_possible
1202
1206
1203
accelerator_tree, br_from = bzrdir.BzrDir.open_tree_or_branch(
1207
1204
from_location)
1205
if (accelerator_tree is not None and
1206
accelerator_tree.supports_content_filtering()):
1207
accelerator_tree = None
1208
1208
revision = _get_one_revision('branch', revision)
1209
self.add_cleanup(br_from.lock_read().unlock)
1210
if revision is not None:
1211
revision_id = revision.as_revision_id(br_from)
1212
else:
1213
# FIXME - wt.last_revision, fallback to branch, fall back to
1214
# None or perhaps NULL_REVISION to mean copy nothing
1215
# RBC 20060209
1216
revision_id = br_from.last_revision()
1217
if to_location is None:
1218
to_location = urlutils.derive_to_location(from_location)
1219
to_transport = transport.get_transport(to_location)
1209
br_from.lock_read()
1220
1210
try:
1221
to_transport.mkdir('.')
1222
except errors.FileExists:
1223
if not use_existing_dir:
1224
raise errors.BzrCommandError('Target directory "%s" '
1225
'already exists.' % to_location)
1211
if revision is not None:
1212
revision_id = revision.as_revision_id(br_from)
1226
1213
else:
1227
try:
1228
bzrdir.BzrDir.open_from_transport(to_transport)
1229
except errors.NotBranchError:
1230
pass
1214
# FIXME - wt.last_revision, fallback to branch, fall back to
1215
# None or perhaps NULL_REVISION to mean copy nothing
1216
# RBC 20060209
1217
revision_id = br_from.last_revision()
1218
if to_location is None:
1219
to_location = urlutils.derive_to_location(from_location)
1220
to_transport = transport.get_transport(to_location)
1221
try:
1222
to_transport.mkdir('.')
1223
except errors.FileExists:
1224
if not use_existing_dir:
1225
raise errors.BzrCommandError('Target directory "%s" '
1226
'already exists.' % to_location)
1231
1227
else:
1232
raise errors.AlreadyBranchError(to_location)
1233
except errors.NoSuchFile:
1234
raise errors.BzrCommandError('Parent of "%s" does not exist.'
1235
% to_location)
1236
try:
1237
# preserve whatever source format we have.
1238
dir = br_from.bzrdir.sprout(to_transport.base, revision_id,
1239
possible_transports=[to_transport],
1240
accelerator_tree=accelerator_tree,
1241
hardlink=hardlink, stacked=stacked,
1242
force_new_repo=standalone,
1243
create_tree_if_local=not no_tree,
1244
source_branch=br_from)
1245
branch = dir.open_branch()
1246
except errors.NoSuchRevision:
1247
to_transport.delete_tree('.')
1248
msg = "The branch %s has no revision %s." % (from_location,
1249
revision)
1250
raise errors.BzrCommandError(msg)
1251
_merge_tags_if_possible(br_from, branch)
1252
# If the source branch is stacked, the new branch may
1253
# be stacked whether we asked for that explicitly or not.
1254
# We therefore need a try/except here and not just 'if stacked:'
1255
try:
1256
note('Created new stacked branch referring to %s.' %
1257
branch.get_stacked_on_url())
1258
except (errors.NotStacked, errors.UnstackableBranchFormat,
1259
errors.UnstackableRepositoryFormat), e:
1260
note('Branched %d revision(s).' % branch.revno())
1261
if bind:
1262
# Bind to the parent
1263
parent_branch = Branch.open(from_location)
1264
branch.bind(parent_branch)
1265
note('New branch bound to %s' % from_location)
1266
if switch:
1267
# Switch to the new branch
1268
wt, _ = WorkingTree.open_containing('.')
1269
_mod_switch.switch(wt.bzrdir, branch)
1270
note('Switched to branch: %s',
1271
urlutils.unescape_for_display(branch.base, 'utf-8'))
1228
try:
1229
bzrdir.BzrDir.open_from_transport(to_transport)
1230
except errors.NotBranchError:
1231
pass
1232
else:
1233
raise errors.AlreadyBranchError(to_location)
1234
except errors.NoSuchFile:
1235
raise errors.BzrCommandError('Parent of "%s" does not exist.'
1236
% to_location)
1237
try:
1238
# preserve whatever source format we have.
1239
dir = br_from.bzrdir.sprout(to_transport.base, revision_id,
1240
possible_transports=[to_transport],
1241
accelerator_tree=accelerator_tree,
1242
hardlink=hardlink, stacked=stacked,
1243
force_new_repo=standalone,
1244
create_tree_if_local=not no_tree,
1245
source_branch=br_from)
1246
branch = dir.open_branch()
1247
except errors.NoSuchRevision:
1248
to_transport.delete_tree('.')
1249
msg = "The branch %s has no revision %s." % (from_location,
1250
revision)
1251
raise errors.BzrCommandError(msg)
1252
_merge_tags_if_possible(br_from, branch)
1253
# If the source branch is stacked, the new branch may
1254
# be stacked whether we asked for that explicitly or not.
1255
# We therefore need a try/except here and not just 'if stacked:'
1256
try:
1257
note('Created new stacked branch referring to %s.' %
1258
branch.get_stacked_on_url())
1259
except (errors.NotStacked, errors.UnstackableBranchFormat,
1260
errors.UnstackableRepositoryFormat), e:
1261
note('Branched %d revision(s).' % branch.revno())
1262
finally:
1263
br_from.unlock()
1272
1264
1273
1265
1274
1266
class cmd_checkout(Command):
1275
__doc__ = """Create a new checkout of an existing branch.
1267
"""Create a new checkout of an existing branch.
1276
1268
1277
1269
If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree for
1278
1270
the branch found in '.'. This is useful if you have removed the working tree
1336
1328
except errors.NoWorkingTree:
1337
1329
source.bzrdir.create_workingtree(revision_id)
1338
1330
return
1339
1340
if not lightweight:
1341
message = ('Copying history to "%s". '
1342
'To checkout without local history use --lightweight.' % to_location)
1343
ui.ui_factory.show_message(message)
1344
1331
source.create_checkout(to_location, revision_id, lightweight,
1345
1332
accelerator_tree, hardlink)
1346
1333
1347
1334
1348
1335
class cmd_renames(Command):
1349
__doc__ = """Show list of renamed files.
1336
"""Show list of renamed files.
1350
1337
"""
1351
1338
# TODO: Option to show renames between two historical versions.
1352
1339
1357
1344
@display_command
1358
1345
def run(self, dir=u'.'):
1359
1346
tree = WorkingTree.open_containing(dir)[0]
1360
self.add_cleanup(tree.lock_read().unlock)
1361
new_inv = tree.inventory
1362
old_tree = tree.basis_tree()
1363
self.add_cleanup(old_tree.lock_read().unlock)
1364
old_inv = old_tree.inventory
1365
renames = []
1366
iterator = tree.iter_changes(old_tree, include_unchanged=True)
1367
for f, paths, c, v, p, n, k, e in iterator:
1368
if paths[0] == paths[1]:
1369
continue
1370
if None in (paths):
1371
continue
1372
renames.append(paths)
1373
renames.sort()
1374
for old_name, new_name in renames:
1375
self.outf.write("%s => %s\n" % (old_name, new_name))
1347
tree.lock_read()
1348
try:
1349
new_inv = tree.inventory
1350
old_tree = tree.basis_tree()
1351
old_tree.lock_read()
1352
try:
1353
old_inv = old_tree.inventory
1354
renames = []
1355
iterator = tree.iter_changes(old_tree, include_unchanged=True)
1356
for f, paths, c, v, p, n, k, e in iterator:
1357
if paths[0] == paths[1]:
1358
continue
1359
if None in (paths):
1360
continue
1361
renames.append(paths)
1362
renames.sort()
1363
for old_name, new_name in renames:
1364
self.outf.write("%s => %s\n" % (old_name, new_name))
1365
finally:
1366
old_tree.unlock()
1367
finally:
1368
tree.unlock()
1376
1369
1377
1370
1378
1371
class cmd_update(Command):
1379
__doc__ = """Update a tree to have the latest code committed to its branch.
1372
"""Update a tree to have the latest code committed to its branch.
1380
1373
1381
1374
This will perform a merge into the working tree, and may generate
1382
1375
conflicts. If you have any local changes, you will still
1384
1377
1385
1378
If you want to discard your local changes, you can just do a
1386
1379
'bzr revert' instead of 'bzr commit' after the update.
1387
1388
If the tree's branch is bound to a master branch, it will also update
1389
the branch from the master.
1390
1380
"""
1391
1381
1392
1382
_see_also = ['pull', 'working-trees', 'status-flags']
1393
1383
takes_args = ['dir?']
1394
takes_options = ['revision']
1395
1384
aliases = ['up']
1396
1385
1397
def run(self, dir='.', revision=None):
1398
if revision is not None and len(revision) != 1:
1399
raise errors.BzrCommandError(
1400
"bzr update --revision takes exactly one revision")
1386
def run(self, dir='.'):
1401
1387
tree = WorkingTree.open_containing(dir)[0]
1402
branch = tree.branch
1403
1388
possible_transports = []
1404
master = branch.get_master_branch(
1389
master = tree.branch.get_master_branch(
1405
1390
possible_transports=possible_transports)
1406
1391
if master is not None:
1407
branch_location = master.base
1408
1392
tree.lock_write()
1409
1393
else:
1410
branch_location = tree.branch.base
1411
1394
tree.lock_tree_write()
1412
self.add_cleanup(tree.unlock)
1413
# get rid of the final '/' and be ready for display
1414
branch_location = urlutils.unescape_for_display(
1415
branch_location.rstrip('/'),
1416
self.outf.encoding)
1417
existing_pending_merges = tree.get_parent_ids()[1:]
1418
if master is None:
1419
old_tip = None
1420
else:
1421
# may need to fetch data into a heavyweight checkout
1422
# XXX: this may take some time, maybe we should display a
1423
# message
1424
old_tip = branch.update(possible_transports)
1425
if revision is not None:
1426
revision_id = revision[0].as_revision_id(branch)
1427
else:
1428
revision_id = branch.last_revision()
1429
if revision_id == _mod_revision.ensure_null(tree.last_revision()):
1430
revno = branch.revision_id_to_dotted_revno(revision_id)
1431
note("Tree is up to date at revision %s of branch %s" %
1432
('.'.join(map(str, revno)), branch_location))
1433
return 0
1434
view_info = _get_view_info_for_change_reporter(tree)
1435
change_reporter = delta._ChangeReporter(
1436
unversioned_filter=tree.is_ignored,
1437
view_info=view_info)
1438
1395
try:
1396
existing_pending_merges = tree.get_parent_ids()[1:]
1397
last_rev = _mod_revision.ensure_null(tree.last_revision())
1398
if last_rev == _mod_revision.ensure_null(
1399
tree.branch.last_revision()):
1400
# may be up to date, check master too.
1401
if master is None or last_rev == _mod_revision.ensure_null(
1402
master.last_revision()):
1403
revno = tree.branch.revision_id_to_revno(last_rev)
1404
note("Tree is up to date at revision %d." % (revno,))
1405
return 0
1406
view_info = _get_view_info_for_change_reporter(tree)
1439
1407
conflicts = tree.update(
1440
change_reporter,
1441
possible_transports=possible_transports,
1442
revision=revision_id,
1443
old_tip=old_tip)
1444
except errors.NoSuchRevision, e:
1445
raise errors.BzrCommandError(
1446
"branch has no revision %s\n"
1447
"bzr update --revision only works"
1448
" for a revision in the branch history"
1449
% (e.revision))
1450
revno = tree.branch.revision_id_to_dotted_revno(
1451
_mod_revision.ensure_null(tree.last_revision()))
1452
note('Updated to revision %s of branch %s' %
1453
('.'.join(map(str, revno)), branch_location))
1454
parent_ids = tree.get_parent_ids()
1455
if parent_ids[1:] and parent_ids[1:] != existing_pending_merges:
1456
note('Your local commits will now show as pending merges with '
1457
"'bzr status', and can be committed with 'bzr commit'.")
1458
if conflicts != 0:
1459
return 1
1460
else:
1461
return 0
1408
delta._ChangeReporter(unversioned_filter=tree.is_ignored,
1409
view_info=view_info), possible_transports=possible_transports)
1410
revno = tree.branch.revision_id_to_revno(
1411
_mod_revision.ensure_null(tree.last_revision()))
1412
note('Updated to revision %d.' % (revno,))
1413
if tree.get_parent_ids()[1:] != existing_pending_merges:
1414
note('Your local commits will now show as pending merges with '
1415
"'bzr status', and can be committed with 'bzr commit'.")
1416
if conflicts != 0:
1417
return 1
1418
else:
1419
return 0
1420
finally:
1421
tree.unlock()
1462
1422
1463
1423
1464
1424
class cmd_info(Command):
1465
__doc__ = """Show information about a working tree, branch or repository.
1425
"""Show information about a working tree, branch or repository.
1466
1426
1467
1427
This command will show all known locations and formats associated to the
1468
1428
tree, branch or repository.
1506
1466
1507
1467
1508
1468
class cmd_remove(Command):
1509
__doc__ = """Remove files or directories.
1469
"""Remove files or directories.
1510
1470
1511
1471
This makes bzr stop tracking changes to the specified files. bzr will delete
1512
1472
them if they can easily be recovered using revert. If no options or
1521
1481
title='Deletion Strategy', value_switches=True, enum_switch=False,
1522
1482
safe='Only delete files if they can be'
1523
1483
' safely recovered (default).',
1524
keep='Delete from bzr but leave the working copy.',
1484
keep="Don't delete any files.",
1525
1485
force='Delete all the specified files, even if they can not be '
1526
1486
'recovered and even if they are non-empty directories.')]
1527
1487
aliases = ['rm', 'del']
1534
1494
if file_list is not None:
1535
1495
file_list = [f for f in file_list]
1536
1496
1537
self.add_cleanup(tree.lock_write().unlock)
1538
# Heuristics should probably all move into tree.remove_smart or
1539
# some such?
1540
if new:
1541
added = tree.changes_from(tree.basis_tree(),
1542
specific_files=file_list).added
1543
file_list = sorted([f[0] for f in added], reverse=True)
1544
if len(file_list) == 0:
1545
raise errors.BzrCommandError('No matching files.')
1546
elif file_list is None:
1547
# missing files show up in iter_changes(basis) as
1548
# versioned-with-no-kind.
1549
missing = []
1550
for change in tree.iter_changes(tree.basis_tree()):
1551
# Find paths in the working tree that have no kind:
1552
if change[1][1] is not None and change[6][1] is None:
1553
missing.append(change[1][1])
1554
file_list = sorted(missing, reverse=True)
1555
file_deletion_strategy = 'keep'
1556
tree.remove(file_list, verbose=verbose, to_file=self.outf,
1557
keep_files=file_deletion_strategy=='keep',
1558
force=file_deletion_strategy=='force')
1497
tree.lock_write()
1498
try:
1499
# Heuristics should probably all move into tree.remove_smart or
1500
# some such?
1501
if new:
1502
added = tree.changes_from(tree.basis_tree(),
1503
specific_files=file_list).added
1504
file_list = sorted([f[0] for f in added], reverse=True)
1505
if len(file_list) == 0:
1506
raise errors.BzrCommandError('No matching files.')
1507
elif file_list is None:
1508
# missing files show up in iter_changes(basis) as
1509
# versioned-with-no-kind.
1510
missing = []
1511
for change in tree.iter_changes(tree.basis_tree()):
1512
# Find paths in the working tree that have no kind:
1513
if change[1][1] is not None and change[6][1] is None:
1514
missing.append(change[1][1])
1515
file_list = sorted(missing, reverse=True)
1516
file_deletion_strategy = 'keep'
1517
tree.remove(file_list, verbose=verbose, to_file=self.outf,
1518
keep_files=file_deletion_strategy=='keep',
1519
force=file_deletion_strategy=='force')
1520
finally:
1521
tree.unlock()
1559
1522
1560
1523
1561
1524
class cmd_file_id(Command):
1562
__doc__ = """Print file_id of a particular file or directory.
1525
"""Print file_id of a particular file or directory.
1563
1526
1564
1527
The file_id is assigned when the file is first added and remains the
1565
1528
same through all revisions where the file exists, even when it is
1581
1544
1582
1545
1583
1546
class cmd_file_path(Command):
1584
__doc__ = """Print path of file_ids to a file or directory.
1547
"""Print path of file_ids to a file or directory.
1585
1548
1586
1549
This prints one line for each directory down to the target,
1587
1550
starting at the branch root.
1603
1566
1604
1567
1605
1568
class cmd_reconcile(Command):
1606
__doc__ = """Reconcile bzr metadata in a branch.
1569
"""Reconcile bzr metadata in a branch.
1607
1570
1608
1571
This can correct data mismatches that may have been caused by
1609
1572
previous ghost operations or bzr upgrades. You should only
1631
1594
1632
1595
1633
1596
class cmd_revision_history(Command):
1634
__doc__ = """Display the list of revision ids on a branch."""
1597
"""Display the list of revision ids on a branch."""
1635
1598
1636
1599
_see_also = ['log']
1637
1600
takes_args = ['location?']
1647
1610
1648
1611
1649
1612
class cmd_ancestry(Command):
1650
__doc__ = """List all revisions merged into this branch."""
1613
"""List all revisions merged into this branch."""
1651
1614
1652
1615
_see_also = ['log', 'revision-history']
1653
1616
takes_args = ['location?']
1672
1635
1673
1636
1674
1637
class cmd_init(Command):
1675
__doc__ = """Make a directory into a versioned branch.
1638
"""Make a directory into a versioned branch.
1676
1639
1677
1640
Use this to create an empty branch, or before importing an
1678
1641
existing project.
1706
1669
lazy_registry=('bzrlib.bzrdir', 'format_registry'),
1707
1670
converter=lambda name: bzrdir.format_registry.make_bzrdir(name),
1708
1671
value_switches=True,
1709
title="Branch format",
1672
title="Branch Format",
1710
1673
),
1711
1674
Option('append-revisions-only',
1712
1675
help='Never change revnos or the existing log.'
1781
1744
1782
1745
1783
1746
class cmd_init_repository(Command):
1784
__doc__ = """Create a shared repository for branches to share storage space.
1747
"""Create a shared repository to hold branches.
1785
1748
1786
1749
New branches created under the repository directory will store their
1787
revisions in the repository, not in the branch directory. For branches
1788
with shared history, this reduces the amount of storage needed and
1789
speeds up the creation of new branches.
1750
revisions in the repository, not in the branch directory.
1790
1751
1791
If the --no-trees option is given then the branches in the repository
1792
will not have working trees by default. They will still exist as
1793
directories on disk, but they will not have separate copies of the
1794
files at a certain revision. This can be useful for repositories that
1795
store branches which are interacted with through checkouts or remote
1796
branches, such as on a server.
1752
If the --no-trees option is used then the branches in the repository
1753
will not have working trees by default.
1797
1754
1798
1755
:Examples:
1799
Create a shared repository holding just branches::
1756
Create a shared repositories holding just branches::
1800
1757
1801
1758
bzr init-repo --no-trees repo
1802
1759
bzr init repo/trunk
1841
1798
1842
1799
1843
1800
class cmd_diff(Command):
1844
__doc__ = """Show differences in the working tree, between revisions or branches.
1801
"""Show differences in the working tree, between revisions or branches.
1845
1802
1846
1803
If no arguments are given, all changes for the current tree are listed.
1847
1804
If files are given, only the changes in those files are listed.
1868
1825
1869
1826
bzr diff -r1
1870
1827
1871
Difference between revision 3 and revision 1::
1872
1873
bzr diff -r1..3
1874
1875
Difference between revision 3 and revision 1 for branch xxx::
1876
1877
bzr diff -r1..3 xxx
1878
1879
To see the changes introduced in revision X::
1880
1881
bzr diff -cX
1882
1883
Note that in the case of a merge, the -c option shows the changes
1884
compared to the left hand parent. To see the changes against
1885
another parent, use::
1886
1887
bzr diff -r<chosen_parent>..X
1888
1889
The changes introduced by revision 2 (equivalent to -r1..2)::
1890
1891
bzr diff -c2
1828
Difference between revision 2 and revision 1::
1829
1830
bzr diff -r1..2
1831
1832
Difference between revision 2 and revision 1 for branch xxx::
1833
1834
bzr diff -r1..2 xxx
1892
1835
1893
1836
Show just the differences for file NEWS::
1894
1837
1933
1876
help='Use this command to compare files.',
1934
1877
type=unicode,
1935
1878
),
1936
RegistryOption('format',
1937
help='Diff format to use.',
1938
lazy_registry=('bzrlib.diff', 'format_registry'),
1939
value_switches=False, title='Diff format'),
1940
1879
]
1941
1880
aliases = ['di', 'dif']
1942
1881
encoding_type = 'exact'
1943
1882
1944
1883
@display_command
1945
1884
def run(self, revision=None, file_list=None, diff_options=None,
1946
prefix=None, old=None, new=None, using=None, format=None):
1947
from bzrlib.diff import (get_trees_and_branches_to_diff_locked,
1948
show_diff_trees)
1885
prefix=None, old=None, new=None, using=None):
1886
from bzrlib.diff import _get_trees_to_diff, show_diff_trees
1949
1887
1950
1888
if (prefix is None) or (prefix == '0'):
1951
1889
# diff -p0 format
1965
1903
raise errors.BzrCommandError('bzr diff --revision takes exactly'
1966
1904
' one or two revision specifiers')
1967
1905
1968
if using is not None and format is not None:
1969
raise errors.BzrCommandError('--using and --format are mutually '
1970
'exclusive.')
1971
1972
(old_tree, new_tree,
1973
old_branch, new_branch,
1974
specific_files, extra_trees) = get_trees_and_branches_to_diff_locked(
1975
file_list, revision, old, new, self.add_cleanup, apply_view=True)
1906
old_tree, new_tree, specific_files, extra_trees = \
1907
_get_trees_to_diff(file_list, revision, old, new,
1908
apply_view=True)
1976
1909
return show_diff_trees(old_tree, new_tree, sys.stdout,
1977
1910
specific_files=specific_files,
1978
1911
external_diff_options=diff_options,
1979
1912
old_label=old_label, new_label=new_label,
1980
extra_trees=extra_trees, using=using,
1981
format_cls=format)
1913
extra_trees=extra_trees, using=using)
1982
1914
1983
1915
1984
1916
class cmd_deleted(Command):
1985
__doc__ = """List files deleted in the working tree.
1917
"""List files deleted in the working tree.
1986
1918
"""
1987
1919
# TODO: Show files deleted since a previous revision, or
1988
1920
# between two revisions.
1991
1923
# level of effort but possibly much less IO. (Or possibly not,
1992
1924
# if the directories are very large...)
1993
1925
_see_also = ['status', 'ls']
1994
takes_options = ['directory', 'show-ids']
1926
takes_options = ['show-ids']
1995
1927
1996
1928
@display_command
1997
def run(self, show_ids=False, directory=u'.'):
1998
tree = WorkingTree.open_containing(directory)[0]
1999
self.add_cleanup(tree.lock_read().unlock)
2000
old = tree.basis_tree()
2001
self.add_cleanup(old.lock_read().unlock)
2002
for path, ie in old.inventory.iter_entries():
2003
if not tree.has_id(ie.file_id):
2004
self.outf.write(path)
2005
if show_ids:
2006
self.outf.write(' ')
2007
self.outf.write(ie.file_id)
2008
self.outf.write('\n')
1929
def run(self, show_ids=False):
1930
tree = WorkingTree.open_containing(u'.')[0]
1931
tree.lock_read()
1932
try:
1933
old = tree.basis_tree()
1934
old.lock_read()
1935
try:
1936
for path, ie in old.inventory.iter_entries():
1937
if not tree.has_id(ie.file_id):
1938
self.outf.write(path)
1939
if show_ids:
1940
self.outf.write(' ')
1941
self.outf.write(ie.file_id)
1942
self.outf.write('\n')
1943
finally:
1944
old.unlock()
1945
finally:
1946
tree.unlock()
2009
1947
2010
1948
2011
1949
class cmd_modified(Command):
2012
__doc__ = """List files modified in working tree.
1950
"""List files modified in working tree.
2013
1951
"""
2014
1952
2015
1953
hidden = True
2016
1954
_see_also = ['status', 'ls']
2017
takes_options = ['directory', 'null']
1955
takes_options = [
1956
Option('null',
1957
help='Write an ascii NUL (\\0) separator '
1958
'between files rather than a newline.')
1959
]
2018
1960
2019
1961
@display_command
2020
def run(self, null=False, directory=u'.'):
2021
tree = WorkingTree.open_containing(directory)[0]
1962
def run(self, null=False):
1963
tree = WorkingTree.open_containing(u'.')[0]
2022
1964
td = tree.changes_from(tree.basis_tree())
2023
1965
for path, id, kind, text_modified, meta_modified in td.modified:
2024
1966
if null:
2028
1970
2029
1971
2030
1972
class cmd_added(Command):
2031
__doc__ = """List files added in working tree.
1973
"""List files added in working tree.
2032
1974
"""
2033
1975
2034
1976
hidden = True
2035
1977
_see_also = ['status', 'ls']
2036
takes_options = ['directory', 'null']
1978
takes_options = [
1979
Option('null',
1980
help='Write an ascii NUL (\\0) separator '
1981
'between files rather than a newline.')
1982
]
2037
1983
2038
1984
@display_command
2039
def run(self, null=False, directory=u'.'):
2040
wt = WorkingTree.open_containing(directory)[0]
2041
self.add_cleanup(wt.lock_read().unlock)
2042
basis = wt.basis_tree()
2043
self.add_cleanup(basis.lock_read().unlock)
2044
basis_inv = basis.inventory
2045
inv = wt.inventory
2046
for file_id in inv:
2047
if file_id in basis_inv:
2048
continue
2049
if inv.is_root(file_id) and len(basis_inv) == 0:
2050
continue
2051
path = inv.id2path(file_id)
2052
if not os.access(osutils.pathjoin(wt.basedir, path), os.F_OK):
2053
continue
2054
if null:
2055
self.outf.write(path + '\0')
2056
else:
2057
self.outf.write(osutils.quotefn(path) + '\n')
1985
def run(self, null=False):
1986
wt = WorkingTree.open_containing(u'.')[0]
1987
wt.lock_read()
1988
try:
1989
basis = wt.basis_tree()
1990
basis.lock_read()
1991
try:
1992
basis_inv = basis.inventory
1993
inv = wt.inventory
1994
for file_id in inv:
1995
if file_id in basis_inv:
1996
continue
1997
if inv.is_root(file_id) and len(basis_inv) == 0:
1998
continue
1999
path = inv.id2path(file_id)
2000
if not os.access(osutils.abspath(path), os.F_OK):
2001
continue
2002
if null:
2003
self.outf.write(path + '\0')
2004
else:
2005
self.outf.write(osutils.quotefn(path) + '\n')
2006
finally:
2007
basis.unlock()
2008
finally:
2009
wt.unlock()
2058
2010
2059
2011
2060
2012
class cmd_root(Command):
2061
__doc__ = """Show the tree root directory.
2013
"""Show the tree root directory.
2062
2014
2063
2015
The root is the nearest enclosing directory with a .bzr control
2064
2016
directory."""
2088
2040
2089
2041
2090
2042
class cmd_log(Command):
2091
__doc__ = """Show historical log for a branch or subset of a branch.
2043
"""Show historical log for a branch or subset of a branch.
2092
2044
2093
2045
log is bzr's default tool for exploring the history of a branch.
2094
2046
The branch to use is taken from the first parameter. If no parameters
2205
2157
:Tips & tricks:
2206
2158
2207
2159
GUI tools and IDEs are often better at exploring history than command
2208
line tools: you may prefer qlog or viz from qbzr or bzr-gtk, the
2209
bzr-explorer shell, or the Loggerhead web interface. See the Plugin
2210
Guide <http://doc.bazaar.canonical.com/plugins/en/> and
2211
<http://wiki.bazaar.canonical.com/IDEIntegration>.
2160
line tools. You may prefer qlog or glog from the QBzr and Bzr-Gtk packages
2161
respectively for example. (TortoiseBzr uses qlog for displaying logs.) See
2162
http://bazaar-vcs.org/BzrPlugins and http://bazaar-vcs.org/IDEIntegration.
2163
2164
Web interfaces are often better at exploring history than command line
2165
tools, particularly for branches on servers. You may prefer Loggerhead
2166
or one of its alternatives. See http://bazaar-vcs.org/WebInterface.
2212
2167
2213
2168
You may find it useful to add the aliases below to ``bazaar.conf``::
2214
2169
2255
2210
help='Show just the specified revision.'
2256
2211
' See also "help revisionspec".'),
2257
2212
'log-format',
2258
RegistryOption('authors',
2259
'What names to list as authors - first, all or committer.',
2260
title='Authors',
2261
lazy_registry=('bzrlib.log', 'author_list_registry'),
2262
),
2263
2213
Option('levels',
2264
2214
short_name='n',
2265
2215
help='Number of levels to display - 0 for all, 1 for flat.',
2280
2230
help='Show changes made in each revision as a patch.'),
2281
2231
Option('include-merges',
2282
2232
help='Show merged revisions like --levels 0 does.'),
2283
Option('exclude-common-ancestry',
2284
help='Display only the revisions that are not part'
2285
' of both ancestries (require -rX..Y)'
2286
)
2287
2233
]
2288
2234
encoding_type = 'replace'
2289
2235
2299
2245
message=None,
2300
2246
limit=None,
2301
2247
show_diff=False,
2302
include_merges=False,
2303
authors=None,
2304
exclude_common_ancestry=False,
2305
):
2248
include_merges=False):
2306
2249
from bzrlib.log import (
2307
2250
Logger,
2308
2251
make_log_request_dict,
2309
2252
_get_info_for_log_files,
2310
2253
)
2311
2254
direction = (forward and 'forward') or 'reverse'
2312
if (exclude_common_ancestry
2313
and (revision is None or len(revision) != 2)):
2314
raise errors.BzrCommandError(
2315
'--exclude-common-ancestry requires -r with two revisions')
2316
2255
if include_merges:
2317
2256
if levels is None:
2318
2257
levels = 0
2333
2272
filter_by_dir = False
2334
2273
if file_list:
2335
2274
# find the file ids to log and check for directory filtering
2336
b, file_info_list, rev1, rev2 = _get_info_for_log_files(
2337
revision, file_list, self.add_cleanup)
2275
b, file_info_list, rev1, rev2 = _get_info_for_log_files(revision,
2276
file_list)
2338
2277
for relpath, file_id, kind in file_info_list:
2339
2278
if file_id is None:
2340
2279
raise errors.BzrCommandError(
2358
2297
location = '.'
2359
2298
dir, relpath = bzrdir.BzrDir.open_containing(location)
2360
2299
b = dir.open_branch()
2361
self.add_cleanup(b.lock_read().unlock)
2362
2300
rev1, rev2 = _get_revision_range(revision, b, self.name())
2363
2301
2364
2302
# Decide on the type of delta & diff filtering to use
2374
2312
else:
2375
2313
diff_type = 'full'
2376
2314
2377
# Build the log formatter
2378
if log_format is None:
2379
log_format = log.log_formatter_registry.get_default(b)
2380
# Make a non-encoding output to include the diffs - bug 328007
2381
unencoded_output = ui.ui_factory.make_output_stream(encoding_type='exact')
2382
lf = log_format(show_ids=show_ids, to_file=self.outf,
2383
to_exact_file=unencoded_output,
2384
show_timezone=timezone,
2385
delta_format=get_verbosity_level(),
2386
levels=levels,
2387
show_advice=levels is None,
2388
author_list_handler=authors)
2389
2390
# Choose the algorithm for doing the logging. It's annoying
2391
# having multiple code paths like this but necessary until
2392
# the underlying repository format is faster at generating
2393
# deltas or can provide everything we need from the indices.
2394
# The default algorithm - match-using-deltas - works for
2395
# multiple files and directories and is faster for small
2396
# amounts of history (200 revisions say). However, it's too
2397
# slow for logging a single file in a repository with deep
2398
# history, i.e. > 10K revisions. In the spirit of "do no
2399
# evil when adding features", we continue to use the
2400
# original algorithm - per-file-graph - for the "single
2401
# file that isn't a directory without showing a delta" case.
2402
partial_history = revision and b.repository._format.supports_chks
2403
match_using_deltas = (len(file_ids) != 1 or filter_by_dir
2404
or delta_type or partial_history)
2405
2406
# Build the LogRequest and execute it
2407
if len(file_ids) == 0:
2408
file_ids = None
2409
rqst = make_log_request_dict(
2410
direction=direction, specific_fileids=file_ids,
2411
start_revision=rev1, end_revision=rev2, limit=limit,
2412
message_search=message, delta_type=delta_type,
2413
diff_type=diff_type, _match_using_deltas=match_using_deltas,
2414
exclude_common_ancestry=exclude_common_ancestry,
2415
)
2416
Logger(b, rqst).show(lf)
2315
b.lock_read()
2316
try:
2317
# Build the log formatter
2318
if log_format is None:
2319
log_format = log.log_formatter_registry.get_default(b)
2320
lf = log_format(show_ids=show_ids, to_file=self.outf,
2321
show_timezone=timezone,
2322
delta_format=get_verbosity_level(),
2323
levels=levels,
2324
show_advice=levels is None)
2325
2326
# Choose the algorithm for doing the logging. It's annoying
2327
# having multiple code paths like this but necessary until
2328
# the underlying repository format is faster at generating
2329
# deltas or can provide everything we need from the indices.
2330
# The default algorithm - match-using-deltas - works for
2331
# multiple files and directories and is faster for small
2332
# amounts of history (200 revisions say). However, it's too
2333
# slow for logging a single file in a repository with deep
2334
# history, i.e. > 10K revisions. In the spirit of "do no
2335
# evil when adding features", we continue to use the
2336
# original algorithm - per-file-graph - for the "single
2337
# file that isn't a directory without showing a delta" case.
2338
partial_history = revision and b.repository._format.supports_chks
2339
match_using_deltas = (len(file_ids) != 1 or filter_by_dir
2340
or delta_type or partial_history)
2341
2342
# Build the LogRequest and execute it
2343
if len(file_ids) == 0:
2344
file_ids = None
2345
rqst = make_log_request_dict(
2346
direction=direction, specific_fileids=file_ids,
2347
start_revision=rev1, end_revision=rev2, limit=limit,
2348
message_search=message, delta_type=delta_type,
2349
diff_type=diff_type, _match_using_deltas=match_using_deltas)
2350
Logger(b, rqst).show(lf)
2351
finally:
2352
b.unlock()
2417
2353
2418
2354
2419
2355
def _get_revision_range(revisionspec_list, branch, command_name):
2437
2373
raise errors.BzrCommandError(
2438
2374
"bzr %s doesn't accept two revisions in different"
2439
2375
" branches." % command_name)
2440
if start_spec.spec is None:
2441
# Avoid loading all the history.
2442
rev1 = RevisionInfo(branch, None, None)
2443
else:
2444
rev1 = start_spec.in_history(branch)
2376
rev1 = start_spec.in_history(branch)
2445
2377
# Avoid loading all of history when we know a missing
2446
2378
# end of range means the last revision ...
2447
2379
if end_spec.spec is None:
2476
2408
2477
2409
2478
2410
class cmd_touching_revisions(Command):
2479
__doc__ = """Return revision-ids which affected a particular file.
2411
"""Return revision-ids which affected a particular file.
2480
2412
2481
2413
A more user-friendly interface is "bzr log FILE".
2482
2414
"""
2487
2419
@display_command
2488
2420
def run(self, filename):
2489
2421
tree, relpath = WorkingTree.open_containing(filename)
2422
b = tree.branch
2490
2423
file_id = tree.path2id(relpath)
2491
b = tree.branch
2492
self.add_cleanup(b.lock_read().unlock)
2493
touching_revs = log.find_touching_revisions(b, file_id)
2494
for revno, revision_id, what in touching_revs:
2424
for revno, revision_id, what in log.find_touching_revisions(b, file_id):
2495
2425
self.outf.write("%6d %s\n" % (revno, what))
2496
2426
2497
2427
2498
2428
class cmd_ls(Command):
2499
__doc__ = """List files in a tree.
2429
"""List files in a tree.
2500
2430
"""
2501
2431
2502
2432
_see_also = ['status', 'cat']
2508
2438
help='Recurse into subdirectories.'),
2509
2439
Option('from-root',
2510
2440
help='Print paths relative to the root of the branch.'),
2511
Option('unknown', short_name='u',
2512
help='Print unknown files.'),
2441
Option('unknown', help='Print unknown files.'),
2513
2442
Option('versioned', help='Print versioned files.',
2514
2443
short_name='V'),
2515
Option('ignored', short_name='i',
2516
help='Print ignored files.'),
2517
Option('kind', short_name='k',
2444
Option('ignored', help='Print ignored files.'),
2445
Option('null',
2446
help='Write an ascii NUL (\\0) separator '
2447
'between files rather than a newline.'),
2448
Option('kind',
2518
2449
help='List entries of a particular kind: file, directory, symlink.',
2519
2450
type=unicode),
2520
'null',
2521
2451
'show-ids',
2522
'directory',
2523
2452
]
2524
2453
@display_command
2525
2454
def run(self, revision=None, verbose=False,
2526
2455
recursive=False, from_root=False,
2527
2456
unknown=False, versioned=False, ignored=False,
2528
null=False, kind=None, show_ids=False, path=None, directory=None):
2457
null=False, kind=None, show_ids=False, path=None):
2529
2458
2530
2459
if kind and kind not in ('file', 'directory', 'symlink'):
2531
2460
raise errors.BzrCommandError('invalid kind specified')
2543
2472
raise errors.BzrCommandError('cannot specify both --from-root'
2544
2473
' and PATH')
2545
2474
fs_path = path
2546
tree, branch, relpath = \
2547
_open_directory_or_containing_tree_or_branch(fs_path, directory)
2475
tree, branch, relpath = bzrdir.BzrDir.open_containing_tree_or_branch(
2476
fs_path)
2548
2477
2549
2478
# Calculate the prefix to use
2550
2479
prefix = None
2551
2480
if from_root:
2552
2481
if relpath:
2553
2482
prefix = relpath + '/'
2554
elif fs_path != '.' and not fs_path.endswith('/'):
2483
elif fs_path != '.':
2555
2484
prefix = fs_path + '/'
2556
2485
2557
2486
if revision is not None or tree is None:
2565
2494
view_str = views.view_display_str(view_files)
2566
2495
note("Ignoring files outside view. View is %s" % view_str)
2567
2496
2568
self.add_cleanup(tree.lock_read().unlock)
2569
for fp, fc, fkind, fid, entry in tree.list_files(include_root=False,
2570
from_dir=relpath, recursive=recursive):
2571
# Apply additional masking
2572
if not all and not selection[fc]:
2573
continue
2574
if kind is not None and fkind != kind:
2575
continue
2576
if apply_view:
2577
try:
2578
if relpath:
2579
fullpath = osutils.pathjoin(relpath, fp)
2580
else:
2581
fullpath = fp
2582
views.check_path_in_view(tree, fullpath)
2583
except errors.FileOutsideView:
2584
continue
2497
tree.lock_read()
2498
try:
2499
for fp, fc, fkind, fid, entry in tree.list_files(include_root=False,
2500
from_dir=relpath, recursive=recursive):
2501
# Apply additional masking
2502
if not all and not selection[fc]:
2503
continue
2504
if kind is not None and fkind != kind:
2505
continue
2506
if apply_view:
2507
try:
2508
if relpath:
2509
fullpath = osutils.pathjoin(relpath, fp)
2510
else:
2511
fullpath = fp
2512
views.check_path_in_view(tree, fullpath)
2513
except errors.FileOutsideView:
2514
continue
2585
2515
2586
# Output the entry
2587
if prefix:
2588
fp = osutils.pathjoin(prefix, fp)
2589
kindch = entry.kind_character()
2590
outstring = fp + kindch
2591
ui.ui_factory.clear_term()
2592
if verbose:
2593
outstring = '%-8s %s' % (fc, outstring)
2594
if show_ids and fid is not None:
2595
outstring = "%-50s %s" % (outstring, fid)
2596
self.outf.write(outstring + '\n')
2597
elif null:
2598
self.outf.write(fp + '\0')
2599
if show_ids:
2600
if fid is not None:
2601
self.outf.write(fid)
2602
self.outf.write('\0')
2603
self.outf.flush()
2604
else:
2605
if show_ids:
2606
if fid is not None:
2607
my_id = fid
2608
else:
2609
my_id = ''
2610
self.outf.write('%-50s %s\n' % (outstring, my_id))
2611
else:
2516
# Output the entry
2517
if prefix:
2518
fp = osutils.pathjoin(prefix, fp)
2519
kindch = entry.kind_character()
2520
outstring = fp + kindch
2521
ui.ui_factory.clear_term()
2522
if verbose:
2523
outstring = '%-8s %s' % (fc, outstring)
2524
if show_ids and fid is not None:
2525
outstring = "%-50s %s" % (outstring, fid)
2612
2526
self.outf.write(outstring + '\n')
2527
elif null:
2528
self.outf.write(fp + '\0')
2529
if show_ids:
2530
if fid is not None:
2531
self.outf.write(fid)
2532
self.outf.write('\0')
2533
self.outf.flush()
2534
else:
2535
if show_ids:
2536
if fid is not None:
2537
my_id = fid
2538
else:
2539
my_id = ''
2540
self.outf.write('%-50s %s\n' % (outstring, my_id))
2541
else:
2542
self.outf.write(outstring + '\n')
2543
finally:
2544
tree.unlock()
2613
2545
2614
2546
2615
2547
class cmd_unknowns(Command):
2616
__doc__ = """List unknown files.
2548
"""List unknown files.
2617
2549
"""
2618
2550
2619
2551
hidden = True
2620
2552
_see_also = ['ls']
2621
takes_options = ['directory']
2622
2553
2623
2554
@display_command
2624
def run(self, directory=u'.'):
2625
for f in WorkingTree.open_containing(directory)[0].unknowns():
2555
def run(self):
2556
for f in WorkingTree.open_containing(u'.')[0].unknowns():
2626
2557
self.outf.write(osutils.quotefn(f) + '\n')
2627
2558
2628
2559
2629
2560
class cmd_ignore(Command):
2630
__doc__ = """Ignore specified files or patterns.
2561
"""Ignore specified files or patterns.
2631
2562
2632
2563
See ``bzr help patterns`` for details on the syntax of patterns.
2633
2564
2634
If a .bzrignore file does not exist, the ignore command
2635
will create one and add the specified files or patterns to the newly
2636
created file. The ignore command will also automatically add the
2637
.bzrignore file to be versioned. Creating a .bzrignore file without
2638
the use of the ignore command will require an explicit add command.
2639
2640
2565
To remove patterns from the ignore list, edit the .bzrignore file.
2641
2566
After adding, editing or deleting that file either indirectly by
2642
2567
using this command or directly by using an editor, be sure to commit
2643
2568
it.
2644
2645
Bazaar also supports a global ignore file ~/.bazaar/ignore. On Windows
2646
the global ignore file can be found in the application data directory as
2647
C:\\Documents and Settings\\<user>\\Application Data\\Bazaar\\2.0\\ignore.
2648
Global ignores are not touched by this command. The global ignore file
2649
can be edited directly using an editor.
2650
2651
Patterns prefixed with '!' are exceptions to ignore patterns and take
2652
precedence over regular ignores. Such exceptions are used to specify
2653
files that should be versioned which would otherwise be ignored.
2654
2655
Patterns prefixed with '!!' act as regular ignore patterns, but have
2656
precedence over the '!' exception patterns.
2657
2569
2658
2570
Note: ignore patterns containing shell wildcards must be quoted from
2659
2571
the shell on Unix.
2663
2575
2664
2576
bzr ignore ./Makefile
2665
2577
2666
Ignore .class files in all directories...::
2578
Ignore class files in all directories::
2667
2579
2668
2580
bzr ignore "*.class"
2669
2581
2670
...but do not ignore "special.class"::
2671
2672
bzr ignore "!special.class"
2673
2674
2582
Ignore .o files under the lib directory::
2675
2583
2676
2584
bzr ignore "lib/**/*.o"
2682
2590
Ignore everything but the "debian" toplevel directory::
2683
2591
2684
2592
bzr ignore "RE:(?!debian/).*"
2685
2686
Ignore everything except the "local" toplevel directory,
2687
but always ignore "*~" autosave files, even under local/::
2688
2689
bzr ignore "*"
2690
bzr ignore "!./local"
2691
bzr ignore "!!*~"
2692
2593
"""
2693
2594
2694
2595
_see_also = ['status', 'ignored', 'patterns']
2695
2596
takes_args = ['name_pattern*']
2696
takes_options = ['directory',
2697
Option('default-rules',
2698
help='Display the default ignore rules that bzr uses.')
2597
takes_options = [
2598
Option('old-default-rules',
2599
help='Write out the ignore rules bzr < 0.9 always used.')
2699
2600
]
2700
2601
2701
def run(self, name_pattern_list=None, default_rules=None,
2702
directory=u'.'):
2602
def run(self, name_pattern_list=None, old_default_rules=None):
2703
2603
from bzrlib import ignores
2704
if default_rules is not None:
2705
# dump the default rules and exit
2706
for pattern in ignores.USER_DEFAULTS:
2707
self.outf.write("%s\n" % pattern)
2604
if old_default_rules is not None:
2605
# dump the rules and exit
2606
for pattern in ignores.OLD_DEFAULTS:
2607
print pattern
2708
2608
return
2709
2609
if not name_pattern_list:
2710
2610
raise errors.BzrCommandError("ignore requires at least one "
2711
"NAME_PATTERN or --default-rules.")
2611
"NAME_PATTERN or --old-default-rules")
2712
2612
name_pattern_list = [globbing.normalize_pattern(p)
2713
2613
for p in name_pattern_list]
2714
2614
for name_pattern in name_pattern_list:
2716
2616
(len(name_pattern) > 1 and name_pattern[1] == ':')):
2717
2617
raise errors.BzrCommandError(
2718
2618
"NAME_PATTERN should not be an absolute path")
2719
tree, relpath = WorkingTree.open_containing(directory)
2619
tree, relpath = WorkingTree.open_containing(u'.')
2720
2620
ignores.tree_ignores_add_patterns(tree, name_pattern_list)
2721
2621
ignored = globbing.Globster(name_pattern_list)
2722
2622
matches = []
2726
2626
if id is not None:
2727
2627
filename = entry[0]
2728
2628
if ignored.match(filename):
2729
matches.append(filename)
2629
matches.append(filename.encode('utf-8'))
2730
2630
tree.unlock()
2731
2631
if len(matches) > 0:
2732
self.outf.write("Warning: the following files are version controlled and"
2733
" match your ignore pattern:\n%s"
2734
"\nThese files will continue to be version controlled"
2735
" unless you 'bzr remove' them.\n" % ("\n".join(matches),))
2632
print "Warning: the following files are version controlled and" \
2633
" match your ignore pattern:\n%s" \
2634
"\nThese files will continue to be version controlled" \
2635
" unless you 'bzr remove' them." % ("\n".join(matches),)
2736
2636
2737
2637
2738
2638
class cmd_ignored(Command):
2739
__doc__ = """List ignored files and the patterns that matched them.
2639
"""List ignored files and the patterns that matched them.
2740
2640
2741
2641
List all the ignored files and the ignore pattern that caused the file to
2742
2642
be ignored.
2748
2648
2749
2649
encoding_type = 'replace'
2750
2650
_see_also = ['ignore', 'ls']
2751
takes_options = ['directory']
2752
2651
2753
2652
@display_command
2754
def run(self, directory=u'.'):
2755
tree = WorkingTree.open_containing(directory)[0]
2756
self.add_cleanup(tree.lock_read().unlock)
2757
for path, file_class, kind, file_id, entry in tree.list_files():
2758
if file_class != 'I':
2759
continue
2760
## XXX: Slightly inefficient since this was already calculated
2761
pat = tree.is_ignored(path)
2762
self.outf.write('%-50s %s\n' % (path, pat))
2653
def run(self):
2654
tree = WorkingTree.open_containing(u'.')[0]
2655
tree.lock_read()
2656
try:
2657
for path, file_class, kind, file_id, entry in tree.list_files():
2658
if file_class != 'I':
2659
continue
2660
## XXX: Slightly inefficient since this was already calculated
2661
pat = tree.is_ignored(path)
2662
self.outf.write('%-50s %s\n' % (path, pat))
2663
finally:
2664
tree.unlock()
2763
2665
2764
2666
2765
2667
class cmd_lookup_revision(Command):
2766
__doc__ = """Lookup the revision-id from a revision-number
2668
"""Lookup the revision-id from a revision-number
2767
2669
2768
2670
:Examples:
2769
2671
bzr lookup-revision 33
2770
2672
"""
2771
2673
hidden = True
2772
2674
takes_args = ['revno']
2773
takes_options = ['directory']
2774
2675
2775
2676
@display_command
2776
def run(self, revno, directory=u'.'):
2677
def run(self, revno):
2777
2678
try:
2778
2679
revno = int(revno)
2779
2680
except ValueError:
2780
raise errors.BzrCommandError("not a valid revision-number: %r"
2781
% revno)
2782
revid = WorkingTree.open_containing(directory)[0].branch.get_rev_id(revno)
2783
self.outf.write("%s\n" % revid)
2681
raise errors.BzrCommandError("not a valid revision-number: %r" % revno)
2682
2683
print WorkingTree.open_containing(u'.')[0].branch.get_rev_id(revno)
2784
2684
2785
2685
2786
2686
class cmd_export(Command):
2787
__doc__ = """Export current or past revision to a destination directory or archive.
2687
"""Export current or past revision to a destination directory or archive.
2788
2688
2789
2689
If no revision is specified this exports the last committed revision.
2790
2690
2812
2712
================= =========================
2813
2713
"""
2814
2714
takes_args = ['dest', 'branch_or_subdir?']
2815
takes_options = ['directory',
2715
takes_options = [
2816
2716
Option('format',
2817
2717
help="Type of file to export to.",
2818
2718
type=unicode),
2822
2722
Option('root',
2823
2723
type=str,
2824
2724
help="Name of the root directory inside the exported file."),
2825
Option('per-file-timestamps',
2826
help='Set modification time of files to that of the last '
2827
'revision in which it was changed.'),
2828
2725
]
2829
2726
def run(self, dest, branch_or_subdir=None, revision=None, format=None,
2830
root=None, filters=False, per_file_timestamps=False, directory=u'.'):
2727
root=None, filters=False):
2831
2728
from bzrlib.export import export
2832
2729
2833
2730
if branch_or_subdir is None:
2834
tree = WorkingTree.open_containing(directory)[0]
2731
tree = WorkingTree.open_containing(u'.')[0]
2835
2732
b = tree.branch
2836
2733
subdir = None
2837
2734
else:
2840
2737
2841
2738
rev_tree = _get_one_revision_tree('export', revision, branch=b, tree=tree)
2842
2739
try:
2843
export(rev_tree, dest, format, root, subdir, filtered=filters,
2844
per_file_timestamps=per_file_timestamps)
2740
export(rev_tree, dest, format, root, subdir, filtered=filters)
2845
2741
except errors.NoSuchExportFormat, e:
2846
2742
raise errors.BzrCommandError('Unsupported export format: %s' % e.format)
2847
2743
2848
2744
2849
2745
class cmd_cat(Command):
2850
__doc__ = """Write the contents of a file as of a given revision to standard output.
2746
"""Write the contents of a file as of a given revision to standard output.
2851
2747
2852
2748
If no revision is nominated, the last revision is used.
2853
2749
2856
2752
"""
2857
2753
2858
2754
_see_also = ['ls']
2859
takes_options = ['directory',
2755
takes_options = [
2860
2756
Option('name-from-revision', help='The path name in the old tree.'),
2861
2757
Option('filters', help='Apply content filters to display the '
2862
2758
'convenience form.'),
2867
2763
2868
2764
@display_command
2869
2765
def run(self, filename, revision=None, name_from_revision=False,
2870
filters=False, directory=None):
2766
filters=False):
2871
2767
if revision is not None and len(revision) != 1:
2872
2768
raise errors.BzrCommandError("bzr cat --revision takes exactly"
2873
2769
" one revision specifier")
2874
2770
tree, branch, relpath = \
2875
_open_directory_or_containing_tree_or_branch(filename, directory)
2876
self.add_cleanup(branch.lock_read().unlock)
2877
return self._run(tree, branch, relpath, filename, revision,
2878
name_from_revision, filters)
2771
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
2772
branch.lock_read()
2773
try:
2774
return self._run(tree, branch, relpath, filename, revision,
2775
name_from_revision, filters)
2776
finally:
2777
branch.unlock()
2879
2778
2880
2779
def _run(self, tree, b, relpath, filename, revision, name_from_revision,
2881
2780
filtered):
2882
2781
if tree is None:
2883
2782
tree = b.basis_tree()
2884
2783
rev_tree = _get_one_revision_tree('cat', revision, branch=b)
2885
self.add_cleanup(rev_tree.lock_read().unlock)
2886
2784
2887
2785
old_file_id = rev_tree.path2id(relpath)
2888
2786
2923
2821
chunks = content.splitlines(True)
2924
2822
content = filtered_output_bytes(chunks, filters,
2925
2823
ContentFilterContext(relpath, rev_tree))
2926
self.cleanup_now()
2927
2824
self.outf.writelines(content)
2928
2825
else:
2929
self.cleanup_now()
2930
2826
self.outf.write(content)
2931
2827
2932
2828
2933
2829
class cmd_local_time_offset(Command):
2934
__doc__ = """Show the offset in seconds from GMT to local time."""
2830
"""Show the offset in seconds from GMT to local time."""
2935
2831
hidden = True
2936
2832
@display_command
2937
2833
def run(self):
2938
self.outf.write("%s\n" % osutils.local_time_offset())
2834
print osutils.local_time_offset()
2939
2835
2940
2836
2941
2837
2942
2838
class cmd_commit(Command):
2943
__doc__ = """Commit changes into a new revision.
2839
"""Commit changes into a new revision.
2944
2840
2945
2841
An explanatory message needs to be given for each commit. This is
2946
2842
often done by using the --message option (getting the message from the
3039
2935
Option('strict',
3040
2936
help="Refuse to commit if there are unknown "
3041
2937
"files in the working tree."),
3042
Option('commit-time', type=str,
3043
help="Manually set a commit time using commit date "
3044
"format, e.g. '2009-10-10 08:00:00 +0100'."),
3045
2938
ListOption('fixes', type=str,
3046
2939
help="Mark a bug as being fixed by this revision "
3047
2940
"(see \"bzr help bugs\")."),
3054
2947
"the master branch until a normal commit "
3055
2948
"is performed."
3056
2949
),
3057
Option('show-diff', short_name='p',
3058
help='When no message is supplied, show the diff along'
3059
' with the status summary in the message editor.'),
2950
Option('show-diff',
2951
help='When no message is supplied, show the diff along'
2952
' with the status summary in the message editor.'),
3060
2953
]
3061
2954
aliases = ['ci', 'checkin']
3062
2955
3081
2974
3082
2975
def run(self, message=None, file=None, verbose=False, selected_list=None,
3083
2976
unchanged=False, strict=False, local=False, fixes=None,
3084
author=None, show_diff=False, exclude=None, commit_time=None):
2977
author=None, show_diff=False, exclude=None):
3085
2978
from bzrlib.errors import (
3086
2979
PointlessCommit,
3087
2980
ConflictsInTree,
3093
2986
make_commit_message_template_encoded
3094
2987
)
3095
2988
3096
commit_stamp = offset = None
3097
if commit_time is not None:
3098
try:
3099
commit_stamp, offset = timestamp.parse_patch_date(commit_time)
3100
except ValueError, e:
3101
raise errors.BzrCommandError(
3102
"Could not parse --commit-time: " + str(e))
3103
3104
2989
# TODO: Need a blackbox test for invoking the external editor; may be
3105
2990
# slightly problematic to run this cross-platform.
3106
2991
3126
3011
if local and not tree.branch.get_bound_location():
3127
3012
raise errors.LocalRequiresBoundBranch()
3128
3013
3129
if message is not None:
3130
try:
3131
file_exists = osutils.lexists(message)
3132
except UnicodeError:
3133
# The commit message contains unicode characters that can't be
3134
# represented in the filesystem encoding, so that can't be a
3135
# file.
3136
file_exists = False
3137
if file_exists:
3138
warning_msg = (
3139
'The commit message is a file name: "%(f)s".\n'
3140
'(use --file "%(f)s" to take commit message from that file)'
3141
% { 'f': message })
3142
ui.ui_factory.show_warning(warning_msg)
3143
if '\r' in message:
3144
message = message.replace('\r\n', '\n')
3145
message = message.replace('\r', '\n')
3146
if file:
3147
raise errors.BzrCommandError(
3148
"please specify either --message or --file")
3149
3150
3014
def get_message(commit_obj):
3151
3015
"""Callback to get commit message"""
3152
if file:
3153
my_message = codecs.open(
3154
file, 'rt', osutils.get_user_encoding()).read()
3155
elif message is not None:
3156
my_message = message
3157
else:
3158
# No message supplied: make one up.
3159
# text is the status of the tree
3160
text = make_commit_message_template_encoded(tree,
3016
my_message = message
3017
if my_message is None and not file:
3018
t = make_commit_message_template_encoded(tree,
3161
3019
selected_list, diff=show_diff,
3162
3020
output_encoding=osutils.get_user_encoding())
3163
# start_message is the template generated from hooks
3164
# XXX: Warning - looks like hooks return unicode,
3165
# make_commit_message_template_encoded returns user encoding.
3166
# We probably want to be using edit_commit_message instead to
3167
# avoid this.
3168
3021
start_message = generate_commit_message_template(commit_obj)
3169
my_message = edit_commit_message_encoded(text,
3022
my_message = edit_commit_message_encoded(t,
3170
3023
start_message=start_message)
3171
3024
if my_message is None:
3172
3025
raise errors.BzrCommandError("please specify a commit"
3173
3026
" message with either --message or --file")
3027
elif my_message and file:
3028
raise errors.BzrCommandError(
3029
"please specify either --message or --file")
3030
if file:
3031
my_message = codecs.open(file, 'rt',
3032
osutils.get_user_encoding()).read()
3174
3033
if my_message == "":
3175
3034
raise errors.BzrCommandError("empty commit message specified")
3176
3035
return my_message
3177
3036
3178
# The API permits a commit with a filter of [] to mean 'select nothing'
3179
# but the command line should not do that.
3180
if not selected_list:
3181
selected_list = None
3182
3037
try:
3183
3038
tree.commit(message_callback=get_message,
3184
3039
specific_files=selected_list,
3185
3040
allow_pointless=unchanged, strict=strict, local=local,
3186
3041
reporter=None, verbose=verbose, revprops=properties,
3187
authors=author, timestamp=commit_stamp,
3188
timezone=offset,
3042
authors=author,
3189
3043
exclude=safe_relpath_files(tree, exclude))
3190
3044
except PointlessCommit:
3045
# FIXME: This should really happen before the file is read in;
3046
# perhaps prepare the commit; get the message; then actually commit
3191
3047
raise errors.BzrCommandError("No changes to commit."
3192
3048
" Use --unchanged to commit anyhow.")
3193
3049
except ConflictsInTree:
3198
3054
raise errors.BzrCommandError("Commit refused because there are"
3199
3055
" unknown files in the working tree.")
3200
3056
except errors.BoundBranchOutOfDate, e:
3201
e.extra_help = ("\n"
3202
'To commit to master branch, run update and then commit.\n'
3203
'You can also pass --local to commit to continue working '
3204
'disconnected.')
3205
raise
3057
raise errors.BzrCommandError(str(e) + "\n"
3058
'To commit to master branch, run update and then commit.\n'
3059
'You can also pass --local to commit to continue working '
3060
'disconnected.')
3206
3061
3207
3062
3208
3063
class cmd_check(Command):
3209
__doc__ = """Validate working tree structure, branch consistency and repository history.
3064
"""Validate working tree structure, branch consistency and repository history.
3210
3065
3211
3066
This command checks various invariants about branch and repository storage
3212
3067
to detect data corruption or bzr bugs.
3276
3131
3277
3132
3278
3133
class cmd_upgrade(Command):
3279
__doc__ = """Upgrade branch storage to current format.
3134
"""Upgrade branch storage to current format.
3280
3135
3281
3136
The check command or bzr developers may sometimes advise you to run
3282
3137
this command. When the default format has changed you may also be warned
3300
3155
3301
3156
3302
3157
class cmd_whoami(Command):
3303
__doc__ = """Show or set bzr user id.
3158
"""Show or set bzr user id.
3304
3159
3305
3160
:Examples:
3306
3161
Show the email of the current user::
3350
3205
3351
3206
3352
3207
class cmd_nick(Command):
3353
__doc__ = """Print or set the branch nickname.
3208
"""Print or set the branch nickname.
3354
3209
3355
3210
If unset, the tree root directory name is used as the nickname.
3356
3211
To print the current nickname, execute with no argument.
3361
3216
3362
3217
_see_also = ['info']
3363
3218
takes_args = ['nickname?']
3364
takes_options = ['directory']
3365
def run(self, nickname=None, directory=u'.'):
3366
branch = Branch.open_containing(directory)[0]
3219
def run(self, nickname=None):
3220
branch = Branch.open_containing(u'.')[0]
3367
3221
if nickname is None:
3368
3222
self.printme(branch)
3369
3223
else:
3371
3225
3372
3226
@display_command
3373
3227
def printme(self, branch):
3374
self.outf.write('%s\n' % branch.nick)
3228
print branch.nick
3375
3229
3376
3230
3377
3231
class cmd_alias(Command):
3378
__doc__ = """Set/unset and display aliases.
3232
"""Set/unset and display aliases.
3379
3233
3380
3234
:Examples:
3381
3235
Show the current aliases::
3445
3299
3446
3300
3447
3301
class cmd_selftest(Command):
3448
__doc__ = """Run internal test suite.
3302
"""Run internal test suite.
3449
3303
3450
3304
If arguments are given, they are regular expressions that say which tests
3451
3305
should run. Tests matching any expression are run, and other tests are
3478
3332
Tests that need working space on disk use a common temporary directory,
3479
3333
typically inside $TMPDIR or /tmp.
3480
3334
3481
If you set BZR_TEST_PDB=1 when running selftest, failing tests will drop
3482
into a pdb postmortem session.
3483
3484
3335
:Examples:
3485
3336
Run only tests relating to 'ignore'::
3486
3337
3495
3346
def get_transport_type(typestring):
3496
3347
"""Parse and return a transport specifier."""
3497
3348
if typestring == "sftp":
3498
from bzrlib.tests import stub_sftp
3499
return stub_sftp.SFTPAbsoluteServer
3349
from bzrlib.transport.sftp import SFTPAbsoluteServer
3350
return SFTPAbsoluteServer
3500
3351
if typestring == "memory":
3501
from bzrlib.tests import test_server
3502
return memory.MemoryServer
3352
from bzrlib.transport.memory import MemoryServer
3353
return MemoryServer
3503
3354
if typestring == "fakenfs":
3504
from bzrlib.tests import test_server
3505
return test_server.FakeNFSServer
3355
from bzrlib.transport.fakenfs import FakeNFSServer
3356
return FakeNFSServer
3506
3357
msg = "No known transport type %s. Supported types are: sftp\n" %\
3507
3358
(typestring)
3508
3359
raise errors.BzrCommandError(msg)
3523
3374
Option('lsprof-timed',
3524
3375
help='Generate lsprof output for benchmarked'
3525
3376
' sections of code.'),
3526
Option('lsprof-tests',
3527
help='Generate lsprof output for each test.'),
3528
3377
Option('cache-dir', type=str,
3529
3378
help='Cache intermediate benchmark output in this '
3530
3379
'directory.'),
3571
3420
first=False, list_only=False,
3572
3421
randomize=None, exclude=None, strict=False,
3573
3422
load_list=None, debugflag=None, starting_with=None, subunit=False,
3574
parallel=None, lsprof_tests=False):
3423
parallel=None):
3575
3424
from bzrlib.tests import selftest
3576
3425
import bzrlib.benchmarks as benchmarks
3577
3426
from bzrlib.benchmarks import tree_creator
3592
3441
raise errors.BzrCommandError("subunit not available. subunit "
3593
3442
"needs to be installed to use --subunit.")
3594
3443
self.additional_selftest_args['runner_class'] = SubUnitBzrRunner
3595
# On Windows, disable automatic conversion of '\n' to '\r\n' in
3596
# stdout, which would corrupt the subunit stream.
3597
if sys.platform == "win32" and sys.stdout.fileno() >= 0:
3598
import msvcrt
3599
msvcrt.setmode(sys.stdout.fileno(), os.O_BINARY)
3600
3444
if parallel:
3601
3445
self.additional_selftest_args.setdefault(
3602
3446
'suite_decorators', []).append(parallel)
3606
3450
verbose = not is_quiet()
3607
3451
# TODO: should possibly lock the history file...
3608
3452
benchfile = open(".perf_history", "at", buffering=1)
3609
self.add_cleanup(benchfile.close)
3610
3453
else:
3611
3454
test_suite_factory = None
3612
3455
benchfile = None
3613
selftest_kwargs = {"verbose": verbose,
3614
"pattern": pattern,
3615
"stop_on_failure": one,
3616
"transport": transport,
3617
"test_suite_factory": test_suite_factory,
3618
"lsprof_timed": lsprof_timed,
3619
"lsprof_tests": lsprof_tests,
3620
"bench_history": benchfile,
3621
"matching_tests_first": first,
3622
"list_only": list_only,
3623
"random_seed": randomize,
3624
"exclude_pattern": exclude,
3625
"strict": strict,
3626
"load_list": load_list,
3627
"debug_flags": debugflag,
3628
"starting_with": starting_with
3629
}
3630
selftest_kwargs.update(self.additional_selftest_args)
3631
result = selftest(**selftest_kwargs)
3456
try:
3457
selftest_kwargs = {"verbose": verbose,
3458
"pattern": pattern,
3459
"stop_on_failure": one,
3460
"transport": transport,
3461
"test_suite_factory": test_suite_factory,
3462
"lsprof_timed": lsprof_timed,
3463
"bench_history": benchfile,
3464
"matching_tests_first": first,
3465
"list_only": list_only,
3466
"random_seed": randomize,
3467
"exclude_pattern": exclude,
3468
"strict": strict,
3469
"load_list": load_list,
3470
"debug_flags": debugflag,
3471
"starting_with": starting_with
3472
}
3473
selftest_kwargs.update(self.additional_selftest_args)
3474
result = selftest(**selftest_kwargs)
3475
finally:
3476
if benchfile is not None:
3477
benchfile.close()
3632
3478
return int(not result)
3633
3479
3634
3480
3635
3481
class cmd_version(Command):
3636
__doc__ = """Show version of bzr."""
3482
"""Show version of bzr."""
3637
3483
3638
3484
encoding_type = 'replace'
3639
3485
takes_options = [
3650
3496
3651
3497
3652
3498
class cmd_rocks(Command):
3653
__doc__ = """Statement of optimism."""
3499
"""Statement of optimism."""
3654
3500
3655
3501
hidden = True
3656
3502
3657
3503
@display_command
3658
3504
def run(self):
3659
self.outf.write("It sure does!\n")
3505
print "It sure does!"
3660
3506
3661
3507
3662
3508
class cmd_find_merge_base(Command):
3663
__doc__ = """Find and print a base revision for merging two branches."""
3509
"""Find and print a base revision for merging two branches."""
3664
3510
# TODO: Options to specify revisions on either side, as if
3665
3511
# merging only part of the history.
3666
3512
takes_args = ['branch', 'other']
3672
3518
3673
3519
branch1 = Branch.open_containing(branch)[0]
3674
3520
branch2 = Branch.open_containing(other)[0]
3675
self.add_cleanup(branch1.lock_read().unlock)
3676
self.add_cleanup(branch2.lock_read().unlock)
3677
last1 = ensure_null(branch1.last_revision())
3678
last2 = ensure_null(branch2.last_revision())
3679
3680
graph = branch1.repository.get_graph(branch2.repository)
3681
base_rev_id = graph.find_unique_lca(last1, last2)
3682
3683
self.outf.write('merge base is revision %s\n' % base_rev_id)
3521
branch1.lock_read()
3522
try:
3523
branch2.lock_read()
3524
try:
3525
last1 = ensure_null(branch1.last_revision())
3526
last2 = ensure_null(branch2.last_revision())
3527
3528
graph = branch1.repository.get_graph(branch2.repository)
3529
base_rev_id = graph.find_unique_lca(last1, last2)
3530
3531
print 'merge base is revision %s' % base_rev_id
3532
finally:
3533
branch2.unlock()
3534
finally:
3535
branch1.unlock()
3684
3536
3685
3537
3686
3538
class cmd_merge(Command):
3687
__doc__ = """Perform a three-way merge.
3539
"""Perform a three-way merge.
3688
3540
3689
3541
The source of the merge can be specified either in the form of a branch,
3690
3542
or in the form of a path to a file containing a merge directive generated
3719
3571
committed to record the result of the merge.
3720
3572
3721
3573
merge refuses to run if there are any uncommitted changes, unless
3722
--force is given. The --force option can also be used to create a
3723
merge revision which has more than two parents.
3724
3725
If one would like to merge changes from the working tree of the other
3726
branch without merging any committed revisions, the --uncommitted option
3727
can be given.
3728
3729
To select only some changes to merge, use "merge -i", which will prompt
3730
you to apply each diff hunk and file change, similar to "shelve".
3574
--force is given.
3731
3575
3732
3576
:Examples:
3733
3577
To merge the latest revision from bzr.dev::
3742
3586
3743
3587
bzr merge -r 81..82 ../bzr.dev
3744
3588
3745
To apply a merge directive contained in /tmp/merge::
3589
To apply a merge directive contained in /tmp/merge:
3746
3590
3747
3591
bzr merge /tmp/merge
3748
3749
To create a merge revision with three parents from two branches
3750
feature1a and feature1b:
3751
3752
bzr merge ../feature1a
3753
bzr merge ../feature1b --force
3754
bzr commit -m 'revision with three parents'
3755
3592
"""
3756
3593
3757
3594
encoding_type = 'exact'
3773
3610
' completely merged into the source, pull from the'
3774
3611
' source rather than merging. When this happens,'
3775
3612
' you do not need to commit the result.'),
3776
custom_help('directory',
3613
Option('directory',
3777
3614
help='Branch to merge into, '
3778
'rather than the one containing the working directory.'),
3779
Option('preview', help='Instead of merging, show a diff of the'
3780
' merge.'),
3781
Option('interactive', help='Select changes interactively.',
3782
short_name='i')
3615
'rather than the one containing the working directory.',
3616
short_name='d',
3617
type=unicode,
3618
),
3619
Option('preview', help='Instead of merging, show a diff of the merge.')
3783
3620
]
3784
3621
3785
3622
def run(self, location=None, revision=None, force=False,
3787
3624
uncommitted=False, pull=False,
3788
3625
directory=None,
3789
3626
preview=False,
3790
interactive=False,
3791
3627
):
3792
3628
if merge_type is None:
3793
3629
merge_type = _mod_merge.Merge3Merger
3799
3635
verified = 'inapplicable'
3800
3636
tree = WorkingTree.open_containing(directory)[0]
3801
3637
3638
# die as quickly as possible if there are uncommitted changes
3802
3639
try:
3803
3640
basis_tree = tree.revision_tree(tree.last_revision())
3804
3641
except errors.NoSuchRevision:
3805
3642
basis_tree = tree.basis_tree()
3806
3807
# die as quickly as possible if there are uncommitted changes
3808
3643
if not force:
3809
if tree.has_changes():
3644
changes = tree.changes_from(basis_tree)
3645
if changes.has_changed():
3810
3646
raise errors.UncommittedChanges(tree)
3811
3647
3812
3648
view_info = _get_view_info_for_change_reporter(tree)
3813
3649
change_reporter = delta._ChangeReporter(
3814
3650
unversioned_filter=tree.is_ignored, view_info=view_info)
3815
pb = ui.ui_factory.nested_progress_bar()
3816
self.add_cleanup(pb.finished)
3817
self.add_cleanup(tree.lock_write().unlock)
3818
if location is not None:
3819
try:
3820
mergeable = bundle.read_mergeable_from_url(location,
3821
possible_transports=possible_transports)
3822
except errors.NotABundle:
3823
mergeable = None
3651
cleanups = []
3652
try:
3653
pb = ui.ui_factory.nested_progress_bar()
3654
cleanups.append(pb.finished)
3655
tree.lock_write()
3656
cleanups.append(tree.unlock)
3657
if location is not None:
3658
try:
3659
mergeable = bundle.read_mergeable_from_url(location,
3660
possible_transports=possible_transports)
3661
except errors.NotABundle:
3662
mergeable = None
3663
else:
3664
if uncommitted:
3665
raise errors.BzrCommandError('Cannot use --uncommitted'
3666
' with bundles or merge directives.')
3667
3668
if revision is not None:
3669
raise errors.BzrCommandError(
3670
'Cannot use -r with merge directives or bundles')
3671
merger, verified = _mod_merge.Merger.from_mergeable(tree,
3672
mergeable, pb)
3673
3674
if merger is None and uncommitted:
3675
if revision is not None and len(revision) > 0:
3676
raise errors.BzrCommandError('Cannot use --uncommitted and'
3677
' --revision at the same time.')
3678
merger = self.get_merger_from_uncommitted(tree, location, pb,
3679
cleanups)
3680
allow_pending = False
3681
3682
if merger is None:
3683
merger, allow_pending = self._get_merger_from_branch(tree,
3684
location, revision, remember, possible_transports, pb)
3685
3686
merger.merge_type = merge_type
3687
merger.reprocess = reprocess
3688
merger.show_base = show_base
3689
self.sanity_check_merger(merger)
3690
if (merger.base_rev_id == merger.other_rev_id and
3691
merger.other_rev_id is not None):
3692
note('Nothing to do.')
3693
return 0
3694
if pull:
3695
if merger.interesting_files is not None:
3696
raise errors.BzrCommandError('Cannot pull individual files')
3697
if (merger.base_rev_id == tree.last_revision()):
3698
result = tree.pull(merger.other_branch, False,
3699
merger.other_rev_id)
3700
result.report(self.outf)
3701
return 0
3702
merger.check_basis(False)
3703
if preview:
3704
return self._do_preview(merger)
3824
3705
else:
3825
if uncommitted:
3826
raise errors.BzrCommandError('Cannot use --uncommitted'
3827
' with bundles or merge directives.')
3828
3829
if revision is not None:
3830
raise errors.BzrCommandError(
3831
'Cannot use -r with merge directives or bundles')
3832
merger, verified = _mod_merge.Merger.from_mergeable(tree,
3833
mergeable, None)
3834
3835
if merger is None and uncommitted:
3836
if revision is not None and len(revision) > 0:
3837
raise errors.BzrCommandError('Cannot use --uncommitted and'
3838
' --revision at the same time.')
3839
merger = self.get_merger_from_uncommitted(tree, location, None)
3840
allow_pending = False
3841
3842
if merger is None:
3843
merger, allow_pending = self._get_merger_from_branch(tree,
3844
location, revision, remember, possible_transports, None)
3845
3846
merger.merge_type = merge_type
3847
merger.reprocess = reprocess
3848
merger.show_base = show_base
3849
self.sanity_check_merger(merger)
3850
if (merger.base_rev_id == merger.other_rev_id and
3851
merger.other_rev_id is not None):
3852
note('Nothing to do.')
3853
return 0
3854
if pull:
3855
if merger.interesting_files is not None:
3856
raise errors.BzrCommandError('Cannot pull individual files')
3857
if (merger.base_rev_id == tree.last_revision()):
3858
result = tree.pull(merger.other_branch, False,
3859
merger.other_rev_id)
3860
result.report(self.outf)
3861
return 0
3862
if merger.this_basis is None:
3863
raise errors.BzrCommandError(
3864
"This branch has no commits."
3865
" (perhaps you would prefer 'bzr pull')")
3866
if preview:
3867
return self._do_preview(merger)
3868
elif interactive:
3869
return self._do_interactive(merger)
3870
else:
3871
return self._do_merge(merger, change_reporter, allow_pending,
3872
verified)
3873
3874
def _get_preview(self, merger):
3706
return self._do_merge(merger, change_reporter, allow_pending,
3707
verified)
3708
finally:
3709
for cleanup in reversed(cleanups):
3710
cleanup()
3711
3712
def _do_preview(self, merger):
3713
from bzrlib.diff import show_diff_trees
3875
3714
tree_merger = merger.make_merger()
3876
3715
tt = tree_merger.make_preview_transform()
3877
self.add_cleanup(tt.finalize)
3878
result_tree = tt.get_preview_tree()
3879
return result_tree
3880
3881
def _do_preview(self, merger):
3882
from bzrlib.diff import show_diff_trees
3883
result_tree = self._get_preview(merger)
3884
show_diff_trees(merger.this_tree, result_tree, self.outf,
3885
old_label='', new_label='')
3716
try:
3717
result_tree = tt.get_preview_tree()
3718
show_diff_trees(merger.this_tree, result_tree, self.outf,
3719
old_label='', new_label='')
3720
finally:
3721
tt.finalize()
3886
3722
3887
3723
def _do_merge(self, merger, change_reporter, allow_pending, verified):
3888
3724
merger.change_reporter = change_reporter
3896
3732
else:
3897
3733
return 0
3898
3734
3899
def _do_interactive(self, merger):
3900
"""Perform an interactive merge.
3901
3902
This works by generating a preview tree of the merge, then using
3903
Shelver to selectively remove the differences between the working tree
3904
and the preview tree.
3905
"""
3906
from bzrlib import shelf_ui
3907
result_tree = self._get_preview(merger)
3908
writer = bzrlib.option.diff_writer_registry.get()
3909
shelver = shelf_ui.Shelver(merger.this_tree, result_tree, destroy=True,
3910
reporter=shelf_ui.ApplyReporter(),
3911
diff_writer=writer(sys.stdout))
3912
try:
3913
shelver.run()
3914
finally:
3915
shelver.finalize()
3916
3917
3735
def sanity_check_merger(self, merger):
3918
3736
if (merger.show_base and
3919
3737
not merger.merge_type is _mod_merge.Merge3Merger):
3954
3772
base_branch, base_path = Branch.open_containing(base_loc,
3955
3773
possible_transports)
3956
3774
# Find the revision ids
3957
other_revision_id = None
3958
base_revision_id = None
3959
if revision is not None:
3960
if len(revision) >= 1:
3961
other_revision_id = revision[-1].as_revision_id(other_branch)
3962
if len(revision) == 2:
3963
base_revision_id = revision[0].as_revision_id(base_branch)
3964
if other_revision_id is None:
3775
if revision is None or len(revision) < 1 or revision[-1] is None:
3965
3776
other_revision_id = _mod_revision.ensure_null(
3966
3777
other_branch.last_revision())
3778
else:
3779
other_revision_id = revision[-1].as_revision_id(other_branch)
3780
if (revision is not None and len(revision) == 2
3781
and revision[0] is not None):
3782
base_revision_id = revision[0].as_revision_id(base_branch)
3783
else:
3784
base_revision_id = None
3967
3785
# Remember where we merge from
3968
3786
if ((remember or tree.branch.get_submit_branch() is None) and
3969
3787
user_location is not None):
3978
3796
allow_pending = True
3979
3797
return merger, allow_pending
3980
3798
3981
def get_merger_from_uncommitted(self, tree, location, pb):
3799
def get_merger_from_uncommitted(self, tree, location, pb, cleanups):
3982
3800
"""Get a merger for uncommitted changes.
3983
3801
3984
3802
:param tree: The tree the merger should apply to.
3985
3803
:param location: The location containing uncommitted changes.
3986
3804
:param pb: The progress bar to use for showing progress.
3805
:param cleanups: A list of operations to perform to clean up the
3806
temporary directories, unfinalized objects, etc.
3987
3807
"""
3988
3808
location = self._select_branch_location(tree, location)[0]
3989
3809
other_tree, other_path = WorkingTree.open_containing(location)
4041
3861
4042
3862
4043
3863
class cmd_remerge(Command):
4044
__doc__ = """Redo a merge.
3864
"""Redo a merge.
4045
3865
4046
3866
Use this if you want to try a different merge technique while resolving
4047
3867
conflicts. Some merge techniques are better than others, and remerge
4072
3892
4073
3893
def run(self, file_list=None, merge_type=None, show_base=False,
4074
3894
reprocess=False):
4075
from bzrlib.conflicts import restore
4076
3895
if merge_type is None:
4077
3896
merge_type = _mod_merge.Merge3Merger
4078
3897
tree, file_list = tree_files(file_list)
4079
self.add_cleanup(tree.lock_write().unlock)
4080
parents = tree.get_parent_ids()
4081
if len(parents) != 2:
4082
raise errors.BzrCommandError("Sorry, remerge only works after normal"
4083
" merges. Not cherrypicking or"
4084
" multi-merges.")
4085
repository = tree.branch.repository
4086
interesting_ids = None
4087
new_conflicts = []
4088
conflicts = tree.conflicts()
4089
if file_list is not None:
4090
interesting_ids = set()
4091
for filename in file_list:
4092
file_id = tree.path2id(filename)
4093
if file_id is None:
4094
raise errors.NotVersionedError(filename)
4095
interesting_ids.add(file_id)
4096
if tree.kind(file_id) != "directory":
4097
continue
3898
tree.lock_write()
3899
try:
3900
parents = tree.get_parent_ids()
3901
if len(parents) != 2:
3902
raise errors.BzrCommandError("Sorry, remerge only works after normal"
3903
" merges. Not cherrypicking or"
3904
" multi-merges.")
3905
repository = tree.branch.repository
3906
interesting_ids = None
3907
new_conflicts = []
3908
conflicts = tree.conflicts()
3909
if file_list is not None:
3910
interesting_ids = set()
3911
for filename in file_list:
3912
file_id = tree.path2id(filename)
3913
if file_id is None:
3914
raise errors.NotVersionedError(filename)
3915
interesting_ids.add(file_id)
3916
if tree.kind(file_id) != "directory":
3917
continue
4098
3918
4099
for name, ie in tree.inventory.iter_entries(file_id):
4100
interesting_ids.add(ie.file_id)
4101
new_conflicts = conflicts.select_conflicts(tree, file_list)[0]
4102
else:
4103
# Remerge only supports resolving contents conflicts
4104
allowed_conflicts = ('text conflict', 'contents conflict')
4105
restore_files = [c.path for c in conflicts
4106
if c.typestring in allowed_conflicts]
4107
_mod_merge.transform_tree(tree, tree.basis_tree(), interesting_ids)
4108
tree.set_conflicts(ConflictList(new_conflicts))
4109
if file_list is not None:
4110
restore_files = file_list
4111
for filename in restore_files:
3919
for name, ie in tree.inventory.iter_entries(file_id):
3920
interesting_ids.add(ie.file_id)
3921
new_conflicts = conflicts.select_conflicts(tree, file_list)[0]
3922
else:
3923
# Remerge only supports resolving contents conflicts
3924
allowed_conflicts = ('text conflict', 'contents conflict')
3925
restore_files = [c.path for c in conflicts
3926
if c.typestring in allowed_conflicts]
3927
_mod_merge.transform_tree(tree, tree.basis_tree(), interesting_ids)
3928
tree.set_conflicts(ConflictList(new_conflicts))
3929
if file_list is not None:
3930
restore_files = file_list
3931
for filename in restore_files:
3932
try:
3933
restore(tree.abspath(filename))
3934
except errors.NotConflicted:
3935
pass
3936
# Disable pending merges, because the file texts we are remerging
3937
# have not had those merges performed. If we use the wrong parents
3938
# list, we imply that the working tree text has seen and rejected
3939
# all the changes from the other tree, when in fact those changes
3940
# have not yet been seen.
3941
pb = ui.ui_factory.nested_progress_bar()
3942
tree.set_parent_ids(parents[:1])
4112
3943
try:
4113
restore(tree.abspath(filename))
4114
except errors.NotConflicted:
4115
pass
4116
# Disable pending merges, because the file texts we are remerging
4117
# have not had those merges performed. If we use the wrong parents
4118
# list, we imply that the working tree text has seen and rejected
4119
# all the changes from the other tree, when in fact those changes
4120
# have not yet been seen.
4121
tree.set_parent_ids(parents[:1])
4122
try:
4123
merger = _mod_merge.Merger.from_revision_ids(None, tree, parents[1])
4124
merger.interesting_ids = interesting_ids
4125
merger.merge_type = merge_type
4126
merger.show_base = show_base
4127
merger.reprocess = reprocess
4128
conflicts = merger.do_merge()
3944
merger = _mod_merge.Merger.from_revision_ids(pb,
3945
tree, parents[1])
3946
merger.interesting_ids = interesting_ids
3947
merger.merge_type = merge_type
3948
merger.show_base = show_base
3949
merger.reprocess = reprocess
3950
conflicts = merger.do_merge()
3951
finally:
3952
tree.set_parent_ids(parents)
3953
pb.finished()
4129
3954
finally:
4130
tree.set_parent_ids(parents)
3955
tree.unlock()
4131
3956
if conflicts > 0:
4132
3957
return 1
4133
3958
else:
4135
3960
4136
3961
4137
3962
class cmd_revert(Command):
4138
__doc__ = """Revert files to a previous revision.
3963
"""Revert files to a previous revision.
4139
3964
4140
3965
Giving a list of files will revert only those files. Otherwise, all files
4141
3966
will be reverted. If the revision is not specified with '--revision', the
4155
3980
name. If you name a directory, all the contents of that directory will be
4156
3981
reverted.
4157
3982
4158
If you have newly added files since the target revision, they will be
4159
removed. If the files to be removed have been changed, backups will be
4160
created as above. Directories containing unknown files will not be
4161
deleted.
3983
Any files that have been newly added since that revision will be deleted,
3984
with a backup kept if appropriate. Directories containing unknown files
3985
will not be deleted.
4162
3986
4163
The working tree contains a list of revisions that have been merged but
4164
not yet committed. These revisions will be included as additional parents
4165
of the next commit. Normally, using revert clears that list as well as
4166
reverting the files. If any files are specified, revert leaves the list
4167
of uncommitted merges alone and reverts only the files. Use ``bzr revert
4168
.`` in the tree root to revert all files but keep the recorded merges,
4169
and ``bzr revert --forget-merges`` to clear the pending merge list without
3987
The working tree contains a list of pending merged revisions, which will
3988
be included as parents in the next commit. Normally, revert clears that
3989
list as well as reverting the files. If any files are specified, revert
3990
leaves the pending merge list alone and reverts only the files. Use "bzr
3991
revert ." in the tree root to revert all files but keep the merge record,
3992
and "bzr revert --forget-merges" to clear the pending merge list without
4170
3993
reverting any files.
4171
4172
Using "bzr revert --forget-merges", it is possible to apply all of the
4173
changes from a branch in a single revision. To do this, perform the merge
4174
as desired. Then doing revert with the "--forget-merges" option will keep
4175
the content of the tree as it was, but it will clear the list of pending
4176
merges. The next commit will then contain all of the changes that are
4177
present in the other branch, but without any other parent revisions.
4178
Because this technique forgets where these changes originated, it may
4179
cause additional conflicts on later merges involving the same source and
4180
target branches.
4181
3994
"""
4182
3995
4183
3996
_see_also = ['cat', 'export']
4192
4005
def run(self, revision=None, no_backup=False, file_list=None,
4193
4006
forget_merges=None):
4194
4007
tree, file_list = tree_files(file_list)
4195
self.add_cleanup(tree.lock_tree_write().unlock)
4196
if forget_merges:
4197
tree.set_parent_ids(tree.get_parent_ids()[:1])
4198
else:
4199
self._revert_tree_to_revision(tree, revision, file_list, no_backup)
4008
tree.lock_write()
4009
try:
4010
if forget_merges:
4011
tree.set_parent_ids(tree.get_parent_ids()[:1])
4012
else:
4013
self._revert_tree_to_revision(tree, revision, file_list, no_backup)
4014
finally:
4015
tree.unlock()
4200
4016
4201
4017
@staticmethod
4202
4018
def _revert_tree_to_revision(tree, revision, file_list, no_backup):
4203
4019
rev_tree = _get_one_revision_tree('revert', revision, tree=tree)
4204
tree.revert(file_list, rev_tree, not no_backup, None,
4205
report_changes=True)
4020
pb = ui.ui_factory.nested_progress_bar()
4021
try:
4022
tree.revert(file_list, rev_tree, not no_backup, pb,
4023
report_changes=True)
4024
finally:
4025
pb.finished()
4206
4026
4207
4027
4208
4028
class cmd_assert_fail(Command):
4209
__doc__ = """Test reporting of assertion failures"""
4029
"""Test reporting of assertion failures"""
4210
4030
# intended just for use in testing
4211
4031
4212
4032
hidden = True
4216
4036
4217
4037
4218
4038
class cmd_help(Command):
4219
__doc__ = """Show help on a command or other topic.
4039
"""Show help on a command or other topic.
4220
4040
"""
4221
4041
4222
4042
_see_also = ['topics']
4235
4055
4236
4056
4237
4057
class cmd_shell_complete(Command):
4238
__doc__ = """Show appropriate completions for context.
4058
"""Show appropriate completions for context.
4239
4059
4240
4060
For a list of all available commands, say 'bzr shell-complete'.
4241
4061
"""
4250
4070
4251
4071
4252
4072
class cmd_missing(Command):
4253
__doc__ = """Show unmerged/unpulled revisions between two branches.
4073
"""Show unmerged/unpulled revisions between two branches.
4254
4074
4255
4075
OTHER_BRANCH may be local or remote.
4256
4076
4257
4077
To filter on a range of revisions, you can use the command -r begin..end
4258
4078
-r revision requests a specific revision, -r ..end or -r begin.. are
4259
4079
also valid.
4260
4261
:Exit values:
4262
1 - some missing revisions
4263
0 - no missing revisions
4264
4080
4265
4081
:Examples:
4266
4082
4334
4150
restrict = 'remote'
4335
4151
4336
4152
local_branch = Branch.open_containing(u".")[0]
4337
self.add_cleanup(local_branch.lock_read().unlock)
4338
4339
4153
parent = local_branch.get_parent()
4340
4154
if other_branch is None:
4341
4155
other_branch = parent
4350
4164
remote_branch = Branch.open(other_branch)
4351
4165
if remote_branch.base == local_branch.base:
4352
4166
remote_branch = local_branch
4353
else:
4354
self.add_cleanup(remote_branch.lock_read().unlock)
4355
4167
4356
4168
local_revid_range = _revision_range_to_revid_range(
4357
4169
_get_revision_range(my_revision, local_branch,
4361
4173
_get_revision_range(revision,
4362
4174
remote_branch, self.name()))
4363
4175
4364
local_extra, remote_extra = find_unmerged(
4365
local_branch, remote_branch, restrict,
4366
backward=not reverse,
4367
include_merges=include_merges,
4368
local_revid_range=local_revid_range,
4369
remote_revid_range=remote_revid_range)
4370
4371
if log_format is None:
4372
registry = log.log_formatter_registry
4373
log_format = registry.get_default(local_branch)
4374
lf = log_format(to_file=self.outf,
4375
show_ids=show_ids,
4376
show_timezone='original')
4377
4378
status_code = 0
4379
if local_extra and not theirs_only:
4380
message("You have %d extra revision(s):\n" %
4381
len(local_extra))
4382
for revision in iter_log_revisions(local_extra,
4383
local_branch.repository,
4384
verbose):
4385
lf.log_revision(revision)
4386
printed_local = True
4387
status_code = 1
4388
else:
4389
printed_local = False
4390
4391
if remote_extra and not mine_only:
4392
if printed_local is True:
4393
message("\n\n\n")
4394
message("You are missing %d revision(s):\n" %
4395
len(remote_extra))
4396
for revision in iter_log_revisions(remote_extra,
4397
remote_branch.repository,
4398
verbose):
4399
lf.log_revision(revision)
4400
status_code = 1
4401
4402
if mine_only and not local_extra:
4403
# We checked local, and found nothing extra
4404
message('This branch is up to date.\n')
4405
elif theirs_only and not remote_extra:
4406
# We checked remote, and found nothing extra
4407
message('Other branch is up to date.\n')
4408
elif not (mine_only or theirs_only or local_extra or
4409
remote_extra):
4410
# We checked both branches, and neither one had extra
4411
# revisions
4412
message("Branches are up to date.\n")
4413
self.cleanup_now()
4176
local_branch.lock_read()
4177
try:
4178
remote_branch.lock_read()
4179
try:
4180
local_extra, remote_extra = find_unmerged(
4181
local_branch, remote_branch, restrict,
4182
backward=not reverse,
4183
include_merges=include_merges,
4184
local_revid_range=local_revid_range,
4185
remote_revid_range=remote_revid_range)
4186
4187
if log_format is None:
4188
registry = log.log_formatter_registry
4189
log_format = registry.get_default(local_branch)
4190
lf = log_format(to_file=self.outf,
4191
show_ids=show_ids,
4192
show_timezone='original')
4193
4194
status_code = 0
4195
if local_extra and not theirs_only:
4196
message("You have %d extra revision(s):\n" %
4197
len(local_extra))
4198
for revision in iter_log_revisions(local_extra,
4199
local_branch.repository,
4200
verbose):
4201
lf.log_revision(revision)
4202
printed_local = True
4203
status_code = 1
4204
else:
4205
printed_local = False
4206
4207
if remote_extra and not mine_only:
4208
if printed_local is True:
4209
message("\n\n\n")
4210
message("You are missing %d revision(s):\n" %
4211
len(remote_extra))
4212
for revision in iter_log_revisions(remote_extra,
4213
remote_branch.repository,
4214
verbose):
4215
lf.log_revision(revision)
4216
status_code = 1
4217
4218
if mine_only and not local_extra:
4219
# We checked local, and found nothing extra
4220
message('This branch is up to date.\n')
4221
elif theirs_only and not remote_extra:
4222
# We checked remote, and found nothing extra
4223
message('Other branch is up to date.\n')
4224
elif not (mine_only or theirs_only or local_extra or
4225
remote_extra):
4226
# We checked both branches, and neither one had extra
4227
# revisions
4228
message("Branches are up to date.\n")
4229
finally:
4230
remote_branch.unlock()
4231
finally:
4232
local_branch.unlock()
4414
4233
if not status_code and parent is None and other_branch is not None:
4415
self.add_cleanup(local_branch.lock_write().unlock)
4416
# handle race conditions - a parent might be set while we run.
4417
if local_branch.get_parent() is None:
4418
local_branch.set_parent(remote_branch.base)
4234
local_branch.lock_write()
4235
try:
4236
# handle race conditions - a parent might be set while we run.
4237
if local_branch.get_parent() is None:
4238
local_branch.set_parent(remote_branch.base)
4239
finally:
4240
local_branch.unlock()
4419
4241
return status_code
4420
4242
4421
4243
4422
4244
class cmd_pack(Command):
4423
__doc__ = """Compress the data within a repository.
4424
4425
This operation compresses the data within a bazaar repository. As
4426
bazaar supports automatic packing of repository, this operation is
4427
normally not required to be done manually.
4428
4429
During the pack operation, bazaar takes a backup of existing repository
4430
data, i.e. pack files. This backup is eventually removed by bazaar
4431
automatically when it is safe to do so. To save disk space by removing
4432
the backed up pack files, the --clean-obsolete-packs option may be
4433
used.
4434
4435
Warning: If you use --clean-obsolete-packs and your machine crashes
4436
during or immediately after repacking, you may be left with a state
4437
where the deletion has been written to disk but the new packs have not
4438
been. In this case the repository may be unusable.
4439
"""
4245
"""Compress the data within a repository."""
4440
4246
4441
4247
_see_also = ['repositories']
4442
4248
takes_args = ['branch_or_repo?']
4443
takes_options = [
4444
Option('clean-obsolete-packs', 'Delete obsolete packs to save disk space.'),
4445
]
4446
4249
4447
def run(self, branch_or_repo='.', clean_obsolete_packs=False):
4250
def run(self, branch_or_repo='.'):
4448
4251
dir = bzrdir.BzrDir.open_containing(branch_or_repo)[0]
4449
4252
try:
4450
4253
branch = dir.open_branch()
4451
4254
repository = branch.repository
4452
4255
except errors.NotBranchError:
4453
4256
repository = dir.open_repository()
4454
repository.pack(clean_obsolete_packs=clean_obsolete_packs)
4257
repository.pack()
4455
4258
4456
4259
4457
4260
class cmd_plugins(Command):
4458
__doc__ = """List the installed plugins.
4261
"""List the installed plugins.
4459
4262
4460
4263
This command displays the list of installed plugins including
4461
4264
version of plugin and a short description of each.
4468
4271
adding new commands, providing additional network transports and
4469
4272
customizing log output.
4470
4273
4471
See the Bazaar Plugin Guide <http://doc.bazaar.canonical.com/plugins/en/>
4472
for further information on plugins including where to find them and how to
4473
install them. Instructions are also provided there on how to write new
4474
plugins using the Python programming language.
4274
See the Bazaar web site, http://bazaar-vcs.org, for further
4275
information on plugins including where to find them and how to
4276
install them. Instructions are also provided there on how to
4277
write new plugins using the Python programming language.
4475
4278
"""
4476
4279
takes_options = ['verbose']
4477
4280
4492
4295
doc = '(no description)'
4493
4296
result.append((name_ver, doc, plugin.path()))
4494
4297
for name_ver, doc, path in sorted(result):
4495
self.outf.write("%s\n" % name_ver)
4496
self.outf.write(" %s\n" % doc)
4298
print name_ver
4299
print ' ', doc
4497
4300
if verbose:
4498
self.outf.write(" %s\n" % path)
4499
self.outf.write("\n")
4301
print ' ', path
4302
print
4500
4303
4501
4304
4502
4305
class cmd_testament(Command):
4503
__doc__ = """Show testament (signing-form) of a revision."""
4306
"""Show testament (signing-form) of a revision."""
4504
4307
takes_options = [
4505
4308
'revision',
4506
4309
Option('long', help='Produce long-format testament.'),
4518
4321
b = Branch.open_containing(branch)[0]
4519
4322
else:
4520
4323
b = Branch.open(branch)
4521
self.add_cleanup(b.lock_read().unlock)
4522
if revision is None:
4523
rev_id = b.last_revision()
4524
else:
4525
rev_id = revision[0].as_revision_id(b)
4526
t = testament_class.from_revision(b.repository, rev_id)
4527
if long:
4528
sys.stdout.writelines(t.as_text_lines())
4529
else:
4530
sys.stdout.write(t.as_short_text())
4324
b.lock_read()
4325
try:
4326
if revision is None:
4327
rev_id = b.last_revision()
4328
else:
4329
rev_id = revision[0].as_revision_id(b)
4330
t = testament_class.from_revision(b.repository, rev_id)
4331
if long:
4332
sys.stdout.writelines(t.as_text_lines())
4333
else:
4334
sys.stdout.write(t.as_short_text())
4335
finally:
4336
b.unlock()
4531
4337
4532
4338
4533
4339
class cmd_annotate(Command):
4534
__doc__ = """Show the origin of each line in a file.
4340
"""Show the origin of each line in a file.
4535
4341
4536
4342
This prints out the given file with an annotation on the left side
4537
4343
indicating which revision, author and date introduced the change.
4548
4354
Option('long', help='Show commit date in annotations.'),
4549
4355
'revision',
4550
4356
'show-ids',
4551
'directory',
4552
4357
]
4553
4358
encoding_type = 'exact'
4554
4359
4555
4360
@display_command
4556
4361
def run(self, filename, all=False, long=False, revision=None,
4557
show_ids=False, directory=None):
4362
show_ids=False):
4558
4363
from bzrlib.annotate import annotate_file, annotate_file_tree
4559
4364
wt, branch, relpath = \
4560
_open_directory_or_containing_tree_or_branch(filename, directory)
4561
if wt is not None:
4562
self.add_cleanup(wt.lock_read().unlock)
4563
else:
4564
self.add_cleanup(branch.lock_read().unlock)
4565
tree = _get_one_revision_tree('annotate', revision, branch=branch)
4566
self.add_cleanup(tree.lock_read().unlock)
4567
if wt is not None:
4568
file_id = wt.path2id(relpath)
4569
else:
4570
file_id = tree.path2id(relpath)
4571
if file_id is None:
4572
raise errors.NotVersionedError(filename)
4573
file_version = tree.inventory[file_id].revision
4574
if wt is not None and revision is None:
4575
# If there is a tree and we're not annotating historical
4576
# versions, annotate the working tree's content.
4577
annotate_file_tree(wt, file_id, self.outf, long, all,
4578
show_ids=show_ids)
4579
else:
4580
annotate_file(branch, file_version, file_id, long, all, self.outf,
4581
show_ids=show_ids)
4365
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
4366
if wt is not None:
4367
wt.lock_read()
4368
else:
4369
branch.lock_read()
4370
try:
4371
tree = _get_one_revision_tree('annotate', revision, branch=branch)
4372
if wt is not None:
4373
file_id = wt.path2id(relpath)
4374
else:
4375
file_id = tree.path2id(relpath)
4376
if file_id is None:
4377
raise errors.NotVersionedError(filename)
4378
file_version = tree.inventory[file_id].revision
4379
if wt is not None and revision is None:
4380
# If there is a tree and we're not annotating historical
4381
# versions, annotate the working tree's content.
4382
annotate_file_tree(wt, file_id, self.outf, long, all,
4383
show_ids=show_ids)
4384
else:
4385
annotate_file(branch, file_version, file_id, long, all, self.outf,
4386
show_ids=show_ids)
4387
finally:
4388
if wt is not None:
4389
wt.unlock()
4390
else:
4391
branch.unlock()
4582
4392
4583
4393
4584
4394
class cmd_re_sign(Command):
4585
__doc__ = """Create a digital signature for an existing revision."""
4395
"""Create a digital signature for an existing revision."""
4586
4396
# TODO be able to replace existing ones.
4587
4397
4588
4398
hidden = True # is this right ?
4589
4399
takes_args = ['revision_id*']
4590
takes_options = ['directory', 'revision']
4400
takes_options = ['revision']
4591
4401
4592
def run(self, revision_id_list=None, revision=None, directory=u'.'):
4402
def run(self, revision_id_list=None, revision=None):
4593
4403
if revision_id_list is not None and revision is not None:
4594
4404
raise errors.BzrCommandError('You can only supply one of revision_id or --revision')
4595
4405
if revision_id_list is None and revision is None:
4596
4406
raise errors.BzrCommandError('You must supply either --revision or a revision_id')
4597
b = WorkingTree.open_containing(directory)[0].branch
4598
self.add_cleanup(b.lock_write().unlock)
4599
return self._run(b, revision_id_list, revision)
4407
b = WorkingTree.open_containing(u'.')[0].branch
4408
b.lock_write()
4409
try:
4410
return self._run(b, revision_id_list, revision)
4411
finally:
4412
b.unlock()
4600
4413
4601
4414
def _run(self, b, revision_id_list, revision):
4602
4415
import bzrlib.gpg as gpg
4647
4460
4648
4461
4649
4462
class cmd_bind(Command):
4650
__doc__ = """Convert the current branch into a checkout of the supplied branch.
4651
If no branch is supplied, rebind to the last bound location.
4463
"""Convert the current branch into a checkout of the supplied branch.
4652
4464
4653
4465
Once converted into a checkout, commits must succeed on the master branch
4654
4466
before they will be applied to the local branch.
4655
4467
4656
4468
Bound branches use the nickname of its master branch unless it is set
4657
locally, in which case binding will update the local nickname to be
4469
locally, in which case binding will update the the local nickname to be
4658
4470
that of the master.
4659
4471
"""
4660
4472
4661
4473
_see_also = ['checkouts', 'unbind']
4662
4474
takes_args = ['location?']
4663
takes_options = ['directory']
4475
takes_options = []
4664
4476
4665
def run(self, location=None, directory=u'.'):
4666
b, relpath = Branch.open_containing(directory)
4477
def run(self, location=None):
4478
b, relpath = Branch.open_containing(u'.')
4667
4479
if location is None:
4668
4480
try:
4669
4481
location = b.get_old_bound_location()
4672
4484
'This format does not remember old locations.')
4673
4485
else:
4674
4486
if location is None:
4675
if b.get_bound_location() is not None:
4676
raise errors.BzrCommandError('Branch is already bound')
4677
else:
4678
raise errors.BzrCommandError('No location supplied '
4679
'and no previous location known')
4487
raise errors.BzrCommandError('No location supplied and no '
4488
'previous location known')
4680
4489
b_other = Branch.open(location)
4681
4490
try:
4682
4491
b.bind(b_other)
4688
4497
4689
4498
4690
4499
class cmd_unbind(Command):
4691
__doc__ = """Convert the current checkout into a regular branch.
4500
"""Convert the current checkout into a regular branch.
4692
4501
4693
4502
After unbinding, the local branch is considered independent and subsequent
4694
4503
commits will be local only.
4696
4505
4697
4506
_see_also = ['checkouts', 'bind']
4698
4507
takes_args = []
4699
takes_options = ['directory']
4508
takes_options = []
4700
4509
4701
def run(self, directory=u'.'):
4702
b, relpath = Branch.open_containing(directory)
4510
def run(self):
4511
b, relpath = Branch.open_containing(u'.')
4703
4512
if not b.unbind():
4704
4513
raise errors.BzrCommandError('Local branch is not bound')
4705
4514
4706
4515
4707
4516
class cmd_uncommit(Command):
4708
__doc__ = """Remove the last committed revision.
4517
"""Remove the last committed revision.
4709
4518
4710
4519
--verbose will print out what is being removed.
4711
4520
--dry-run will go through all the motions, but not actually
4751
4560
b = control.open_branch()
4752
4561
4753
4562
if tree is not None:
4754
self.add_cleanup(tree.lock_write().unlock)
4563
tree.lock_write()
4755
4564
else:
4756
self.add_cleanup(b.lock_write().unlock)
4757
return self._run(b, tree, dry_run, verbose, revision, force, local=local)
4565
b.lock_write()
4566
try:
4567
return self._run(b, tree, dry_run, verbose, revision, force,
4568
local=local)
4569
finally:
4570
if tree is not None:
4571
tree.unlock()
4572
else:
4573
b.unlock()
4758
4574
4759
4575
def _run(self, b, tree, dry_run, verbose, revision, force, local=False):
4760
4576
from bzrlib.log import log_formatter, show_log
4792
4608
end_revision=last_revno)
4793
4609
4794
4610
if dry_run:
4795
self.outf.write('Dry-run, pretending to remove'
4796
' the above revisions.\n')
4611
print 'Dry-run, pretending to remove the above revisions.'
4612
if not force:
4613
val = raw_input('Press <enter> to continue')
4797
4614
else:
4798
self.outf.write('The above revision(s) will be removed.\n')
4799
4800
if not force:
4801
if not ui.ui_factory.get_boolean('Are you sure'):
4802
self.outf.write('Canceled')
4803
return 0
4615
print 'The above revision(s) will be removed.'
4616
if not force:
4617
val = raw_input('Are you sure [y/N]? ')
4618
if val.lower() not in ('y', 'yes'):
4619
print 'Canceled'
4620
return 0
4804
4621
4805
4622
mutter('Uncommitting from {%s} to {%s}',
4806
4623
last_rev_id, rev_id)
4807
4624
uncommit(b, tree=tree, dry_run=dry_run, verbose=verbose,
4808
4625
revno=revno, local=local)
4809
self.outf.write('You can restore the old tip by running:\n'
4810
' bzr pull . -r revid:%s\n' % last_rev_id)
4626
note('You can restore the old tip by running:\n'
4627
' bzr pull . -r revid:%s', last_rev_id)
4811
4628
4812
4629
4813
4630
class cmd_break_lock(Command):
4814
__doc__ = """Break a dead lock on a repository, branch or working directory.
4631
"""Break a dead lock on a repository, branch or working directory.
4815
4632
4816
4633
CAUTION: Locks should only be broken when you are sure that the process
4817
4634
holding the lock has been stopped.
4818
4635
4819
You can get information on what locks are open via the 'bzr info
4820
[location]' command.
4636
You can get information on what locks are open via the 'bzr info' command.
4821
4637
4822
4638
:Examples:
4823
4639
bzr break-lock
4824
bzr break-lock bzr+ssh://example.com/bzr/foo
4825
4640
"""
4826
4641
takes_args = ['location?']
4827
4642
4836
4651
4837
4652
4838
4653
class cmd_wait_until_signalled(Command):
4839
__doc__ = """Test helper for test_start_and_stop_bzr_subprocess_send_signal.
4654
"""Test helper for test_start_and_stop_bzr_subprocess_send_signal.
4840
4655
4841
4656
This just prints a line to signal when it is ready, then blocks on stdin.
4842
4657
"""
4850
4665
4851
4666
4852
4667
class cmd_serve(Command):
4853
__doc__ = """Run the bzr server."""
4668
"""Run the bzr server."""
4854
4669
4855
4670
aliases = ['server']
4856
4671
4857
4672
takes_options = [
4858
4673
Option('inet',
4859
4674
help='Serve on stdin/out for use from inetd or sshd.'),
4860
RegistryOption('protocol',
4861
help="Protocol to serve.",
4675
RegistryOption('protocol',
4676
help="Protocol to serve.",
4862
4677
lazy_registry=('bzrlib.transport', 'transport_server_registry'),
4863
4678
value_switches=True),
4864
4679
Option('port',
4867
4682
'result in a dynamically allocated port. The default port '
4868
4683
'depends on the protocol.',
4869
4684
type=str),
4870
custom_help('directory',
4871
help='Serve contents of this directory.'),
4685
Option('directory',
4686
help='Serve contents of this directory.',
4687
type=unicode),
4872
4688
Option('allow-writes',
4873
4689
help='By default the server is a readonly server. Supplying '
4874
4690
'--allow-writes enables write access to the contents of '
4875
'the served directory and below. Note that ``bzr serve`` '
4876
'does not perform authentication, so unless some form of '
4877
'external authentication is arranged supplying this '
4878
'option leads to global uncontrolled write access to your '
4879
'file system.'
4691
'the served directory and below.'
4880
4692
),
4881
4693
]
4882
4694
4915
4727
4916
4728
4917
4729
class cmd_join(Command):
4918
__doc__ = """Combine a tree into its containing tree.
4730
"""Combine a tree into its containing tree.
4919
4731
4920
4732
This command requires the target tree to be in a rich-root format.
4921
4733
4961
4773
4962
4774
4963
4775
class cmd_split(Command):
4964
__doc__ = """Split a subdirectory of a tree into a separate tree.
4776
"""Split a subdirectory of a tree into a separate tree.
4965
4777
4966
4778
This command will produce a target tree in a format that supports
4967
4779
rich roots, like 'rich-root' or 'rich-root-pack'. These formats cannot be
4987
4799
4988
4800
4989
4801
class cmd_merge_directive(Command):
4990
__doc__ = """Generate a merge directive for auto-merge tools.
4802
"""Generate a merge directive for auto-merge tools.
4991
4803
4992
4804
A directive requests a merge to be performed, and also provides all the
4993
4805
information necessary to do so. This means it must either include a
5086
4898
5087
4899
5088
4900
class cmd_send(Command):
5089
__doc__ = """Mail or create a merge-directive for submitting changes.
4901
"""Mail or create a merge-directive for submitting changes.
5090
4902
5091
4903
A merge directive provides many things needed for requesting merges:
5092
4904
5098
4910
directly from the merge directive, without retrieving data from a
5099
4911
branch.
5100
4912
5101
`bzr send` creates a compact data set that, when applied using bzr
5102
merge, has the same effect as merging from the source branch.
5103
5104
By default the merge directive is self-contained and can be applied to any
5105
branch containing submit_branch in its ancestory without needing access to
5106
the source branch.
5107
5108
If --no-bundle is specified, then Bazaar doesn't send the contents of the
5109
revisions, but only a structured request to merge from the
5110
public_location. In that case the public_branch is needed and it must be
5111
up-to-date and accessible to the recipient. The public_branch is always
5112
included if known, so that people can check it later.
5113
5114
The submit branch defaults to the parent of the source branch, but can be
5115
overridden. Both submit branch and public branch will be remembered in
5116
branch.conf the first time they are used for a particular branch. The
5117
source branch defaults to that containing the working directory, but can
5118
be changed using --from.
5119
5120
In order to calculate those changes, bzr must analyse the submit branch.
5121
Therefore it is most efficient for the submit branch to be a local mirror.
5122
If a public location is known for the submit_branch, that location is used
5123
in the merge directive.
5124
5125
The default behaviour is to send the merge directive by mail, unless -o is
5126
given, in which case it is sent to a file.
4913
If --no-bundle is specified, then public_branch is needed (and must be
4914
up-to-date), so that the receiver can perform the merge using the
4915
public_branch. The public_branch is always included if known, so that
4916
people can check it later.
4917
4918
The submit branch defaults to the parent, but can be overridden. Both
4919
submit branch and public branch will be remembered if supplied.
4920
4921
If a public_branch is known for the submit_branch, that public submit
4922
branch is used in the merge instructions. This means that a local mirror
4923
can be used as your actual submit branch, once you have set public_branch
4924
for that mirror.
5127
4925
5128
4926
Mail is sent using your preferred mail program. This should be transparent
5129
4927
on Windows (it uses MAPI). On Linux, it requires the xdg-email utility.
5131
4929
5132
4930
To use a specific mail program, set the mail_client configuration option.
5133
4931
(For Thunderbird 1.5, this works around some bugs.) Supported values for
5134
specific clients are "claws", "evolution", "kmail", "mail.app" (MacOS X's
5135
Mail.app), "mutt", and "thunderbird"; generic options are "default",
5136
"editor", "emacsclient", "mapi", and "xdg-email". Plugins may also add
5137
supported clients.
4932
specific clients are "claws", "evolution", "kmail", "mutt", and
4933
"thunderbird"; generic options are "default", "editor", "emacsclient",
4934
"mapi", and "xdg-email". Plugins may also add supported clients.
5138
4935
5139
4936
If mail is being sent, a to address is required. This can be supplied
5140
4937
either on the commandline, by setting the submit_to configuration
5149
4946
5150
4947
The merge directives created by bzr send may be applied using bzr merge or
5151
4948
bzr pull by specifying a file containing a merge directive as the location.
5152
5153
bzr send makes extensive use of public locations to map local locations into
5154
URLs that can be used by other people. See `bzr help configuration` to
5155
set them, and use `bzr info` to display them.
5156
4949
"""
5157
4950
5158
4951
encoding_type = 'exact'
5174
4967
short_name='f',
5175
4968
type=unicode),
5176
4969
Option('output', short_name='o',
5177
help='Write merge directive to this file or directory; '
4970
help='Write merge directive to this file; '
5178
4971
'use - for stdout.',
5179
4972
type=unicode),
5180
4973
Option('strict',
5203
4996
5204
4997
5205
4998
class cmd_bundle_revisions(cmd_send):
5206
__doc__ = """Create a merge-directive for submitting changes.
4999
"""Create a merge-directive for submitting changes.
5207
5000
5208
5001
A merge directive provides many things needed for requesting merges:
5209
5002
5276
5069
5277
5070
5278
5071
class cmd_tag(Command):
5279
__doc__ = """Create, remove or modify a tag naming a revision.
5072
"""Create, remove or modify a tag naming a revision.
5280
5073
5281
5074
Tags give human-meaningful names to revisions. Commands that take a -r
5282
5075
(--revision) option can be given -rtag:X, where X is any previously
5290
5083
5291
5084
To rename a tag (change the name but keep it on the same revsion), run ``bzr
5292
5085
tag new-name -r tag:old-name`` and then ``bzr tag --delete oldname``.
5293
5294
If no tag name is specified it will be determined through the
5295
'automatic_tag_name' hook. This can e.g. be used to automatically tag
5296
upstream releases by reading configure.ac. See ``bzr help hooks`` for
5297
details.
5298
5086
"""
5299
5087
5300
5088
_see_also = ['commit', 'tags']
5301
takes_args = ['tag_name?']
5089
takes_args = ['tag_name']
5302
5090
takes_options = [
5303
5091
Option('delete',
5304
5092
help='Delete this tag rather than placing it.',
5305
5093
),
5306
custom_help('directory',
5307
help='Branch in which to place the tag.'),
5094
Option('directory',
5095
help='Branch in which to place the tag.',
5096
short_name='d',
5097
type=unicode,
5098
),
5308
5099
Option('force',
5309
5100
help='Replace existing tags.',
5310
5101
),
5311
5102
'revision',
5312
5103
]
5313
5104
5314
def run(self, tag_name=None,
5105
def run(self, tag_name,
5315
5106
delete=None,
5316
5107
directory='.',
5317
5108
force=None,
5318
5109
revision=None,
5319
5110
):
5320
5111
branch, relpath = Branch.open_containing(directory)
5321
self.add_cleanup(branch.lock_write().unlock)
5322
if delete:
5323
if tag_name is None:
5324
raise errors.BzrCommandError("No tag specified to delete.")
5325
branch.tags.delete_tag(tag_name)
5326
self.outf.write('Deleted tag %s.\n' % tag_name)
5327
else:
5328
if revision:
5329
if len(revision) != 1:
5330
raise errors.BzrCommandError(
5331
"Tags can only be placed on a single revision, "
5332
"not on a range")
5333
revision_id = revision[0].as_revision_id(branch)
5112
branch.lock_write()
5113
try:
5114
if delete:
5115
branch.tags.delete_tag(tag_name)
5116
self.outf.write('Deleted tag %s.\n' % tag_name)
5334
5117
else:
5335
revision_id = branch.last_revision()
5336
if tag_name is None:
5337
tag_name = branch.automatic_tag_name(revision_id)
5338
if tag_name is None:
5339
raise errors.BzrCommandError(
5340
"Please specify a tag name.")
5341
if (not force) and branch.tags.has_tag(tag_name):
5342
raise errors.TagAlreadyExists(tag_name)
5343
branch.tags.set_tag(tag_name, revision_id)
5344
self.outf.write('Created tag %s.\n' % tag_name)
5118
if revision:
5119
if len(revision) != 1:
5120
raise errors.BzrCommandError(
5121
"Tags can only be placed on a single revision, "
5122
"not on a range")
5123
revision_id = revision[0].as_revision_id(branch)
5124
else:
5125
revision_id = branch.last_revision()
5126
if (not force) and branch.tags.has_tag(tag_name):
5127
raise errors.TagAlreadyExists(tag_name)
5128
branch.tags.set_tag(tag_name, revision_id)
5129
self.outf.write('Created tag %s.\n' % tag_name)
5130
finally:
5131
branch.unlock()
5345
5132
5346
5133
5347
5134
class cmd_tags(Command):
5348
__doc__ = """List tags.
5135
"""List tags.
5349
5136
5350
5137
This command shows a table of tag names and the revisions they reference.
5351
5138
"""
5352
5139
5353
5140
_see_also = ['tag']
5354
5141
takes_options = [
5355
custom_help('directory',
5356
help='Branch whose tags should be displayed.'),
5142
Option('directory',
5143
help='Branch whose tags should be displayed.',
5144
short_name='d',
5145
type=unicode,
5146
),
5357
5147
RegistryOption.from_kwargs('sort',
5358
5148
'Sort tags by different criteria.', title='Sorting',
5359
5149
alpha='Sort tags lexicographically (default).',
5376
5166
if not tags:
5377
5167
return
5378
5168
5379
self.add_cleanup(branch.lock_read().unlock)
5380
if revision:
5381
graph = branch.repository.get_graph()
5382
rev1, rev2 = _get_revision_range(revision, branch, self.name())
5383
revid1, revid2 = rev1.rev_id, rev2.rev_id
5384
# only show revisions between revid1 and revid2 (inclusive)
5385
tags = [(tag, revid) for tag, revid in tags if
5386
graph.is_between(revid, revid1, revid2)]
5387
if sort == 'alpha':
5388
tags.sort()
5389
elif sort == 'time':
5390
timestamps = {}
5391
for tag, revid in tags:
5392
try:
5393
revobj = branch.repository.get_revision(revid)
5394
except errors.NoSuchRevision:
5395
timestamp = sys.maxint # place them at the end
5396
else:
5397
timestamp = revobj.timestamp
5398
timestamps[revid] = timestamp
5399
tags.sort(key=lambda x: timestamps[x[1]])
5400
if not show_ids:
5401
# [ (tag, revid), ... ] -> [ (tag, dotted_revno), ... ]
5402
for index, (tag, revid) in enumerate(tags):
5403
try:
5404
revno = branch.revision_id_to_dotted_revno(revid)
5405
if isinstance(revno, tuple):
5406
revno = '.'.join(map(str, revno))
5407
except errors.NoSuchRevision:
5408
# Bad tag data/merges can lead to tagged revisions
5409
# which are not in this branch. Fail gracefully ...
5410
revno = '?'
5411
tags[index] = (tag, revno)
5412
self.cleanup_now()
5169
branch.lock_read()
5170
try:
5171
if revision:
5172
graph = branch.repository.get_graph()
5173
rev1, rev2 = _get_revision_range(revision, branch, self.name())
5174
revid1, revid2 = rev1.rev_id, rev2.rev_id
5175
# only show revisions between revid1 and revid2 (inclusive)
5176
tags = [(tag, revid) for tag, revid in tags if
5177
graph.is_between(revid, revid1, revid2)]
5178
if sort == 'alpha':
5179
tags.sort()
5180
elif sort == 'time':
5181
timestamps = {}
5182
for tag, revid in tags:
5183
try:
5184
revobj = branch.repository.get_revision(revid)
5185
except errors.NoSuchRevision:
5186
timestamp = sys.maxint # place them at the end
5187
else:
5188
timestamp = revobj.timestamp
5189
timestamps[revid] = timestamp
5190
tags.sort(key=lambda x: timestamps[x[1]])
5191
if not show_ids:
5192
# [ (tag, revid), ... ] -> [ (tag, dotted_revno), ... ]
5193
for index, (tag, revid) in enumerate(tags):
5194
try:
5195
revno = branch.revision_id_to_dotted_revno(revid)
5196
if isinstance(revno, tuple):
5197
revno = '.'.join(map(str, revno))
5198
except errors.NoSuchRevision:
5199
# Bad tag data/merges can lead to tagged revisions
5200
# which are not in this branch. Fail gracefully ...
5201
revno = '?'
5202
tags[index] = (tag, revno)
5203
finally:
5204
branch.unlock()
5413
5205
for tag, revspec in tags:
5414
5206
self.outf.write('%-20s %s\n' % (tag, revspec))
5415
5207
5416
5208
5417
5209
class cmd_reconfigure(Command):
5418
__doc__ = """Reconfigure the type of a bzr directory.
5210
"""Reconfigure the type of a bzr directory.
5419
5211
5420
5212
A target configuration must be specified.
5421
5213
5451
5243
),
5452
5244
Option('bind-to', help='Branch to bind checkout to.', type=str),
5453
5245
Option('force',
5454
help='Perform reconfiguration even if local changes'
5455
' will be lost.'),
5456
Option('stacked-on',
5457
help='Reconfigure a branch to be stacked on another branch.',
5458
type=unicode,
5459
),
5460
Option('unstacked',
5461
help='Reconfigure a branch to be unstacked. This '
5462
'may require copying substantial data into it.',
5463
),
5246
help='Perform reconfiguration even if local changes'
5247
' will be lost.')
5464
5248
]
5465
5249
5466
def run(self, location=None, target_type=None, bind_to=None, force=False,
5467
stacked_on=None,
5468
unstacked=None):
5250
def run(self, location=None, target_type=None, bind_to=None, force=False):
5469
5251
directory = bzrdir.BzrDir.open(location)
5470
if stacked_on and unstacked:
5471
raise BzrCommandError("Can't use both --stacked-on and --unstacked")
5472
elif stacked_on is not None:
5473
reconfigure.ReconfigureStackedOn().apply(directory, stacked_on)
5474
elif unstacked:
5475
reconfigure.ReconfigureUnstacked().apply(directory)
5476
# At the moment you can use --stacked-on and a different
5477
# reconfiguration shape at the same time; there seems no good reason
5478
# to ban it.
5479
5252
if target_type is None:
5480
if stacked_on or unstacked:
5481
return
5482
else:
5483
raise errors.BzrCommandError('No target configuration '
5484
'specified')
5253
raise errors.BzrCommandError('No target configuration specified')
5485
5254
elif target_type == 'branch':
5486
5255
reconfiguration = reconfigure.Reconfigure.to_branch(directory)
5487
5256
elif target_type == 'tree':
5506
5275
5507
5276
5508
5277
class cmd_switch(Command):
5509
__doc__ = """Set the branch of a checkout and update.
5278
"""Set the branch of a checkout and update.
5510
5279
5511
5280
For lightweight checkouts, this changes the branch being referenced.
5512
5281
For heavyweight checkouts, this checks that there are no local commits
5524
5293
/path/to/newbranch.
5525
5294
5526
5295
Bound branches use the nickname of its master branch unless it is set
5527
locally, in which case switching will update the local nickname to be
5296
locally, in which case switching will update the the local nickname to be
5528
5297
that of the master.
5529
5298
"""
5530
5299
5531
takes_args = ['to_location?']
5300
takes_args = ['to_location']
5532
5301
takes_options = [Option('force',
5533
help='Switch even if local commits will be lost.'),
5534
'revision',
5535
Option('create-branch', short_name='b',
5536
help='Create the target branch from this one before'
5537
' switching to it.'),
5538
]
5302
help='Switch even if local commits will be lost.')
5303
]
5539
5304
5540
def run(self, to_location=None, force=False, create_branch=False,
5541
revision=None):
5305
def run(self, to_location, force=False):
5542
5306
from bzrlib import switch
5543
5307
tree_location = '.'
5544
revision = _get_one_revision('switch', revision)
5545
5308
control_dir = bzrdir.BzrDir.open_containing(tree_location)[0]
5546
if to_location is None:
5547
if revision is None:
5548
raise errors.BzrCommandError('You must supply either a'
5549
' revision or a location')
5550
to_location = '.'
5551
5309
try:
5552
5310
branch = control_dir.open_branch()
5553
5311
had_explicit_nick = branch.get_config().has_explicit_nickname()
5554
5312
except errors.NotBranchError:
5555
branch = None
5556
5313
had_explicit_nick = False
5557
if create_branch:
5558
if branch is None:
5559
raise errors.BzrCommandError('cannot create branch without'
5560
' source branch')
5561
to_location = directory_service.directories.dereference(
5562
to_location)
5563
if '/' not in to_location and '\\' not in to_location:
5564
# This path is meant to be relative to the existing branch
5565
this_url = self._get_branch_location(control_dir)
5566
to_location = urlutils.join(this_url, '..', to_location)
5567
to_branch = branch.bzrdir.sprout(to_location,
5568
possible_transports=[branch.bzrdir.root_transport],
5569
source_branch=branch).open_branch()
5570
else:
5571
try:
5572
to_branch = Branch.open(to_location)
5573
except errors.NotBranchError:
5574
this_url = self._get_branch_location(control_dir)
5575
to_branch = Branch.open(
5576
urlutils.join(this_url, '..', to_location))
5577
if revision is not None:
5578
revision = revision.as_revision_id(to_branch)
5579
switch.switch(control_dir, to_branch, force, revision_id=revision)
5314
try:
5315
to_branch = Branch.open(to_location)
5316
except errors.NotBranchError:
5317
this_url = self._get_branch_location(control_dir)
5318
to_branch = Branch.open(
5319
urlutils.join(this_url, '..', to_location))
5320
switch.switch(control_dir, to_branch, force)
5580
5321
if had_explicit_nick:
5581
5322
branch = control_dir.open_branch() #get the new branch!
5582
5323
branch.nick = to_branch.nick
5602
5343
5603
5344
5604
5345
class cmd_view(Command):
5605
__doc__ = """Manage filtered views.
5346
"""Manage filtered views.
5606
5347
5607
5348
Views provide a mask over the tree so that users can focus on
5608
5349
a subset of a tree when doing their work. After creating a view,
5756
5497
5757
5498
5758
5499
class cmd_hooks(Command):
5759
__doc__ = """Show hooks."""
5500
"""Show hooks."""
5760
5501
5761
5502
hidden = True
5762
5503
5775
5516
self.outf.write(" <no hooks installed>\n")
5776
5517
5777
5518
5778
class cmd_remove_branch(Command):
5779
__doc__ = """Remove a branch.
5780
5781
This will remove the branch from the specified location but
5782
will keep any working tree or repository in place.
5783
5784
:Examples:
5785
5786
Remove the branch at repo/trunk::
5787
5788
bzr remove-branch repo/trunk
5789
5790
"""
5791
5792
takes_args = ["location?"]
5793
5794
aliases = ["rmbranch"]
5795
5796
def run(self, location=None):
5797
if location is None:
5798
location = "."
5799
branch = Branch.open_containing(location)[0]
5800
branch.bzrdir.destroy_branch()
5801
5802
5803
5519
class cmd_shelve(Command):
5804
__doc__ = """Temporarily set aside some changes from the current tree.
5520
"""Temporarily set aside some changes from the current tree.
5805
5521
5806
5522
Shelve allows you to temporarily put changes you've made "on the shelf",
5807
5523
ie. out of the way, until a later time when you can bring them back from
5849
5565
if writer is None:
5850
5566
writer = bzrlib.option.diff_writer_registry.get()
5851
5567
try:
5852
shelver = Shelver.from_args(writer(sys.stdout), revision, all,
5853
file_list, message, destroy=destroy)
5854
try:
5855
shelver.run()
5856
finally:
5857
shelver.finalize()
5568
Shelver.from_args(writer(sys.stdout), revision, all, file_list,
5569
message, destroy=destroy).run()
5858
5570
except errors.UserAbort:
5859
5571
return 0
5860
5572
5861
5573
def run_for_list(self):
5862
5574
tree = WorkingTree.open_containing('.')[0]
5863
self.add_cleanup(tree.lock_read().unlock)
5864
manager = tree.get_shelf_manager()
5865
shelves = manager.active_shelves()
5866
if len(shelves) == 0:
5867
note('No shelved changes.')
5868
return 0
5869
for shelf_id in reversed(shelves):
5870
message = manager.get_metadata(shelf_id).get('message')
5871
if message is None:
5872
message = '<no message>'
5873
self.outf.write('%3d: %s\n' % (shelf_id, message))
5874
return 1
5575
tree.lock_read()
5576
try:
5577
manager = tree.get_shelf_manager()
5578
shelves = manager.active_shelves()
5579
if len(shelves) == 0:
5580
note('No shelved changes.')
5581
return 0
5582
for shelf_id in reversed(shelves):
5583
message = manager.get_metadata(shelf_id).get('message')
5584
if message is None:
5585
message = '<no message>'
5586
self.outf.write('%3d: %s\n' % (shelf_id, message))
5587
return 1
5588
finally:
5589
tree.unlock()
5875
5590
5876
5591
5877
5592
class cmd_unshelve(Command):
5878
__doc__ = """Restore shelved changes.
5593
"""Restore shelved changes.
5879
5594
5880
5595
By default, the most recently shelved changes are restored. However if you
5881
5596
specify a shelf by id those changes will be restored instead. This works
5889
5604
enum_switch=False, value_switches=True,
5890
5605
apply="Apply changes and remove from the shelf.",
5891
5606
dry_run="Show changes, but do not apply or remove them.",
5892
preview="Instead of unshelving the changes, show the diff that "
5893
"would result from unshelving.",
5894
delete_only="Delete changes without applying them.",
5895
keep="Apply changes but don't delete them.",
5607
delete_only="Delete changes without applying them."
5896
5608
)
5897
5609
]
5898
5610
_see_also = ['shelve']
5899
5611
5900
5612
def run(self, shelf_id=None, action='apply'):
5901
5613
from bzrlib.shelf_ui import Unshelver
5902
unshelver = Unshelver.from_args(shelf_id, action)
5903
try:
5904
unshelver.run()
5905
finally:
5906
unshelver.tree.unlock()
5614
Unshelver.from_args(shelf_id, action).run()
5907
5615
5908
5616
5909
5617
class cmd_clean_tree(Command):
5910
__doc__ = """Remove unwanted files from working tree.
5618
"""Remove unwanted files from working tree.
5911
5619
5912
5620
By default, only unknown files, not ignored files, are deleted. Versioned
5913
5621
files are never deleted.
5921
5629
5922
5630
To check what clean-tree will do, use --dry-run.
5923
5631
"""
5924
takes_options = ['directory',
5925
Option('ignored', help='Delete all ignored files.'),
5632
takes_options = [Option('ignored', help='Delete all ignored files.'),
5926
5633
Option('detritus', help='Delete conflict files, merge'
5927
5634
' backups, and failed selftest dirs.'),
5928
5635
Option('unknown',
5931
5638
' deleting them.'),
5932
5639
Option('force', help='Do not prompt before deleting.')]
5933
5640
def run(self, unknown=False, ignored=False, detritus=False, dry_run=False,
5934
force=False, directory=u'.'):
5641
force=False):
5935
5642
from bzrlib.clean_tree import clean_tree
5936
5643
if not (unknown or ignored or detritus):
5937
5644
unknown = True
5938
5645
if dry_run:
5939
5646
force = True
5940
clean_tree(directory, unknown=unknown, ignored=ignored,
5941
detritus=detritus, dry_run=dry_run, no_prompt=force)
5647
clean_tree('.', unknown=unknown, ignored=ignored, detritus=detritus,
5648
dry_run=dry_run, no_prompt=force)
5942
5649
5943
5650
5944
5651
class cmd_reference(Command):
5945
__doc__ = """list, view and set branch locations for nested trees.
5652
"""list, view and set branch locations for nested trees.
5946
5653
5947
5654
If no arguments are provided, lists the branch locations for nested trees.
5948
5655
If one argument is provided, display the branch location for that tree.
5988
5695
self.outf.write('%s %s\n' % (path, location))
5989
5696
5990
5697
5991
def _register_lazy_builtins():
5992
# register lazy builtins from other modules; called at startup and should
5993
# be only called once.
5994
for (name, aliases, module_name) in [
5995
('cmd_bundle_info', [], 'bzrlib.bundle.commands'),
5996
('cmd_dpush', [], 'bzrlib.foreign'),
5997
('cmd_version_info', [], 'bzrlib.cmd_version_info'),
5998
('cmd_resolve', ['resolved'], 'bzrlib.conflicts'),
5999
('cmd_conflicts', [], 'bzrlib.conflicts'),
6000
('cmd_sign_my_commits', [], 'bzrlib.sign_my_commits'),
6001
]:
6002
builtin_command_registry.register_lazy(name, aliases, module_name)
5698
# these get imported and then picked up by the scan for cmd_*
5699
# TODO: Some more consistent way to split command definitions across files;
5700
# we do need to load at least some information about them to know of
5701
# aliases. ideally we would avoid loading the implementation until the
5702
# details were needed.
5703
from bzrlib.cmd_version_info import cmd_version_info
5704
from bzrlib.conflicts import cmd_resolve, cmd_conflicts, restore
5705
from bzrlib.bundle.commands import (
5706
cmd_bundle_info,
5707
)
5708
from bzrlib.foreign import cmd_dpush
5709
from bzrlib.sign_my_commits import cmd_sign_my_commits
5710
from bzrlib.weave_commands import cmd_versionedfile_list, \
5711
cmd_weave_plan_merge, cmd_weave_merge_text
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0