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 5200.2.1
- compare with another revision
- download diff
- download tarball
- view history from revision 5200.2.1
- Committer: Robert Collins
- Date: 2010-05-04 06:22:51 UTC
- mto: This revision was merged to the branch mainline in revision 5206.
- Revision ID: robertc@robertcollins.net-20100504062251-1ocjhrl53mum9ehw
Minor local_abspath docstring improvement.
- files added:
- .testr.conf
- apport
- bzrlib/help_topics/es
- bzrlib/plugins/news_merge
- bzrlib/plugins/news_merge/tests
- bzrlib/tests/per_bzrdir_colo
- contrib/debian
- doc/en/whats-new
- files removed:
- bzrlib/weave_commands.py
- files renamed:
- bzrlib/help_topics/en/conflicts.txt => bzrlib/help_topics/en/conflict-types.txt
- doc/es/user-guide/resolving_conflicts.txt => bzrlib/help_topics/es/conflict-types.txt
- bzrlib/tests/test_bencode.py => bzrlib/tests/test__bencode.py
- files modified:
- .bzrignore
added
removed
bzrlib/builtins.py
1
# Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Canonical Ltd
1
# Copyright (C) 2005-2010 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,
34
35
delta,
35
36
config,
36
37
errors,
53
54
)
54
55
from bzrlib.branch import Branch
55
56
from bzrlib.conflicts import ConflictList
57
from bzrlib.transport import memory
56
58
from bzrlib.revisionspec import RevisionSpec, RevisionInfo
57
59
from bzrlib.smtp_connection import SMTPConnection
58
60
from bzrlib.workingtree import WorkingTree
59
61
""")
60
62
61
from bzrlib.commands import Command, display_command
63
from bzrlib.commands import (
64
Command,
65
builtin_command_registry,
66
display_command,
67
)
62
68
from bzrlib.option import (
63
69
ListOption,
64
70
Option,
233
239
# opens the branch?)
234
240
235
241
class cmd_status(Command):
236
"""Display status summary.
242
__doc__ = """Display status summary.
237
243
238
244
This reports on versioned and unknown files, reporting them
239
245
grouped by state. Possible states are:
326
332
327
333
328
334
class cmd_cat_revision(Command):
329
"""Write out metadata for a revision.
335
__doc__ = """Write out metadata for a revision.
330
336
331
337
The revision to print can either be specified by a specific
332
338
revision identifier, or you can use --revision.
338
344
# cat-revision is more for frontends so should be exact
339
345
encoding = 'strict'
340
346
347
def print_revision(self, revisions, revid):
348
stream = revisions.get_record_stream([(revid,)], 'unordered', True)
349
record = stream.next()
350
if record.storage_kind == 'absent':
351
raise errors.NoSuchRevision(revisions, revid)
352
revtext = record.get_bytes_as('fulltext')
353
self.outf.write(revtext.decode('utf-8'))
354
341
355
@display_command
342
356
def run(self, revision_id=None, revision=None):
343
357
if revision_id is not None and revision is not None:
348
362
' --revision or a revision_id')
349
363
b = WorkingTree.open_containing(u'.')[0].branch
350
364
351
# TODO: jam 20060112 should cat-revision always output utf-8?
352
if revision_id is not None:
353
revision_id = osutils.safe_revision_id(revision_id, warn=False)
354
try:
355
self.outf.write(b.repository.get_revision_xml(revision_id).decode('utf-8'))
356
except errors.NoSuchRevision:
357
msg = "The repository %s contains no revision %s." % (b.repository.base,
358
revision_id)
359
raise errors.BzrCommandError(msg)
360
elif revision is not None:
361
for rev in revision:
362
if rev is None:
363
raise errors.BzrCommandError('You cannot specify a NULL'
364
' revision.')
365
rev_id = rev.as_revision_id(b)
366
self.outf.write(b.repository.get_revision_xml(rev_id).decode('utf-8'))
365
revisions = b.repository.revisions
366
if revisions is None:
367
raise errors.BzrCommandError('Repository %r does not support '
368
'access to raw revision texts')
367
369
370
b.repository.lock_read()
371
try:
372
# TODO: jam 20060112 should cat-revision always output utf-8?
373
if revision_id is not None:
374
revision_id = osutils.safe_revision_id(revision_id, warn=False)
375
try:
376
self.print_revision(revisions, revision_id)
377
except errors.NoSuchRevision:
378
msg = "The repository %s contains no revision %s." % (
379
b.repository.base, revision_id)
380
raise errors.BzrCommandError(msg)
381
elif revision is not None:
382
for rev in revision:
383
if rev is None:
384
raise errors.BzrCommandError(
385
'You cannot specify a NULL revision.')
386
rev_id = rev.as_revision_id(b)
387
self.print_revision(revisions, rev_id)
388
finally:
389
b.repository.unlock()
390
368
391
369
392
class cmd_dump_btree(Command):
370
"""Dump the contents of a btree index file to stdout.
393
__doc__ = """Dump the contents of a btree index file to stdout.
371
394
372
395
PATH is a btree index file, it can be any URL. This includes things like
373
396
.bzr/repository/pack-names, or .bzr/repository/indices/a34b3a...ca4a4.iix
437
460
for node in bt.iter_all_entries():
438
461
# Node is made up of:
439
462
# (index, key, value, [references])
440
refs_as_tuples = static_tuple.as_tuples(node[3])
463
try:
464
refs = node[3]
465
except IndexError:
466
refs_as_tuples = None
467
else:
468
refs_as_tuples = static_tuple.as_tuples(refs)
441
469
as_tuple = (tuple(node[1]), node[2], refs_as_tuples)
442
470
self.outf.write('%s\n' % (as_tuple,))
443
471
444
472
445
473
class cmd_remove_tree(Command):
446
"""Remove the working tree from a given branch/checkout.
474
__doc__ = """Remove the working tree from a given branch/checkout.
447
475
448
476
Since a lightweight checkout is little more than a working tree
449
477
this will refuse to run against one.
451
479
To re-create the working tree, use "bzr checkout".
452
480
"""
453
481
_see_also = ['checkout', 'working-trees']
454
takes_args = ['location?']
482
takes_args = ['location*']
455
483
takes_options = [
456
484
Option('force',
457
485
help='Remove the working tree even if it has '
458
486
'uncommitted changes.'),
459
487
]
460
488
461
def run(self, location='.', force=False):
462
d = bzrdir.BzrDir.open(location)
463
464
try:
465
working = d.open_workingtree()
466
except errors.NoWorkingTree:
467
raise errors.BzrCommandError("No working tree to remove")
468
except errors.NotLocalUrl:
469
raise errors.BzrCommandError("You cannot remove the working tree"
470
" of a remote path")
471
if not force:
472
if (working.has_changes()):
473
raise errors.UncommittedChanges(working)
474
475
working_path = working.bzrdir.root_transport.base
476
branch_path = working.branch.bzrdir.root_transport.base
477
if working_path != branch_path:
478
raise errors.BzrCommandError("You cannot remove the working tree"
479
" from a lightweight checkout")
480
481
d.destroy_workingtree()
489
def run(self, location_list, force=False):
490
if not location_list:
491
location_list=['.']
492
493
for location in location_list:
494
d = bzrdir.BzrDir.open(location)
495
496
try:
497
working = d.open_workingtree()
498
except errors.NoWorkingTree:
499
raise errors.BzrCommandError("No working tree to remove")
500
except errors.NotLocalUrl:
501
raise errors.BzrCommandError("You cannot remove the working tree"
502
" of a remote path")
503
if not force:
504
if (working.has_changes()):
505
raise errors.UncommittedChanges(working)
506
507
if working.user_url != working.branch.user_url:
508
raise errors.BzrCommandError("You cannot remove the working tree"
509
" from a lightweight checkout")
510
511
d.destroy_workingtree()
482
512
483
513
484
514
class cmd_revno(Command):
485
"""Show current revision number.
515
__doc__ = """Show current revision number.
486
516
487
517
This is equal to the number of revisions on this branch.
488
518
"""
501
531
wt.lock_read()
502
532
except (errors.NoWorkingTree, errors.NotLocalUrl):
503
533
raise errors.NoWorkingTree(location)
534
self.add_cleanup(wt.unlock)
535
revid = wt.last_revision()
504
536
try:
505
revid = wt.last_revision()
506
try:
507
revno_t = wt.branch.revision_id_to_dotted_revno(revid)
508
except errors.NoSuchRevision:
509
revno_t = ('???',)
510
revno = ".".join(str(n) for n in revno_t)
511
finally:
512
wt.unlock()
537
revno_t = wt.branch.revision_id_to_dotted_revno(revid)
538
except errors.NoSuchRevision:
539
revno_t = ('???',)
540
revno = ".".join(str(n) for n in revno_t)
513
541
else:
514
542
b = Branch.open_containing(location)[0]
515
543
b.lock_read()
516
try:
517
revno = b.revno()
518
finally:
519
b.unlock()
520
544
self.add_cleanup(b.unlock)
545
revno = b.revno()
546
self.cleanup_now()
521
547
self.outf.write(str(revno) + '\n')
522
548
523
549
524
550
class cmd_revision_info(Command):
525
"""Show revision number and revision id for a given revision identifier.
551
__doc__ = """Show revision number and revision id for a given revision identifier.
526
552
"""
527
553
hidden = True
528
554
takes_args = ['revision_info*']
545
571
wt = WorkingTree.open_containing(directory)[0]
546
572
b = wt.branch
547
573
wt.lock_read()
574
self.add_cleanup(wt.unlock)
548
575
except (errors.NoWorkingTree, errors.NotLocalUrl):
549
576
wt = None
550
577
b = Branch.open_containing(directory)[0]
551
578
b.lock_read()
552
try:
553
revision_ids = []
554
if revision is not None:
555
revision_ids.extend(rev.as_revision_id(b) for rev in revision)
556
if revision_info_list is not None:
557
for rev_str in revision_info_list:
558
rev_spec = RevisionSpec.from_string(rev_str)
559
revision_ids.append(rev_spec.as_revision_id(b))
560
# No arguments supplied, default to the last revision
561
if len(revision_ids) == 0:
562
if tree:
563
if wt is None:
564
raise errors.NoWorkingTree(directory)
565
revision_ids.append(wt.last_revision())
566
else:
567
revision_ids.append(b.last_revision())
568
569
revinfos = []
570
maxlen = 0
571
for revision_id in revision_ids:
572
try:
573
dotted_revno = b.revision_id_to_dotted_revno(revision_id)
574
revno = '.'.join(str(i) for i in dotted_revno)
575
except errors.NoSuchRevision:
576
revno = '???'
577
maxlen = max(maxlen, len(revno))
578
revinfos.append([revno, revision_id])
579
finally:
580
if wt is None:
581
b.unlock()
579
self.add_cleanup(b.unlock)
580
revision_ids = []
581
if revision is not None:
582
revision_ids.extend(rev.as_revision_id(b) for rev in revision)
583
if revision_info_list is not None:
584
for rev_str in revision_info_list:
585
rev_spec = RevisionSpec.from_string(rev_str)
586
revision_ids.append(rev_spec.as_revision_id(b))
587
# No arguments supplied, default to the last revision
588
if len(revision_ids) == 0:
589
if tree:
590
if wt is None:
591
raise errors.NoWorkingTree(directory)
592
revision_ids.append(wt.last_revision())
582
593
else:
583
wt.unlock()
584
594
revision_ids.append(b.last_revision())
595
596
revinfos = []
597
maxlen = 0
598
for revision_id in revision_ids:
599
try:
600
dotted_revno = b.revision_id_to_dotted_revno(revision_id)
601
revno = '.'.join(str(i) for i in dotted_revno)
602
except errors.NoSuchRevision:
603
revno = '???'
604
maxlen = max(maxlen, len(revno))
605
revinfos.append([revno, revision_id])
606
607
self.cleanup_now()
585
608
for ri in revinfos:
586
609
self.outf.write('%*s %s\n' % (maxlen, ri[0], ri[1]))
587
610
588
611
589
612
class cmd_add(Command):
590
"""Add specified files or directories.
613
__doc__ = """Add specified files or directories.
591
614
592
615
In non-recursive mode, all the named items are added, regardless
593
616
of whether they were previously ignored. A warning is given if
659
682
660
683
if base_tree:
661
684
base_tree.lock_read()
662
try:
663
tree, file_list = tree_files_for_add(file_list)
664
added, ignored = tree.smart_add(file_list, not
665
no_recurse, action=action, save=not dry_run)
666
finally:
667
if base_tree is not None:
668
base_tree.unlock()
685
self.add_cleanup(base_tree.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()
669
690
if len(ignored) > 0:
670
691
if verbose:
671
692
for glob in sorted(ignored.keys()):
675
696
676
697
677
698
class cmd_mkdir(Command):
678
"""Create a new versioned directory.
699
__doc__ = """Create a new versioned directory.
679
700
680
701
This is equivalent to creating the directory and then adding it.
681
702
"""
685
706
686
707
def run(self, dir_list):
687
708
for d in dir_list:
688
os.mkdir(d)
689
709
wt, dd = WorkingTree.open_containing(d)
690
wt.add([dd])
691
self.outf.write('added %s\n' % 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)
692
718
693
719
694
720
class cmd_relpath(Command):
695
"""Show path of a file relative to root"""
721
__doc__ = """Show path of a file relative to root"""
696
722
697
723
takes_args = ['filename']
698
724
hidden = True
707
733
708
734
709
735
class cmd_inventory(Command):
710
"""Show inventory of the current working copy or a revision.
736
__doc__ = """Show inventory of the current working copy or a revision.
711
737
712
738
It is possible to limit the output to a particular entry
713
739
type using the --kind option. For example: --kind file.
735
761
revision = _get_one_revision('inventory', revision)
736
762
work_tree, file_list = tree_files(file_list)
737
763
work_tree.lock_read()
738
try:
739
if revision is not None:
740
tree = revision.as_tree(work_tree.branch)
741
742
extra_trees = [work_tree]
743
tree.lock_read()
744
else:
745
tree = work_tree
746
extra_trees = []
747
748
if file_list is not None:
749
file_ids = tree.paths2ids(file_list, trees=extra_trees,
750
require_versioned=True)
751
# find_ids_across_trees may include some paths that don't
752
# exist in 'tree'.
753
entries = sorted((tree.id2path(file_id), tree.inventory[file_id])
754
for file_id in file_ids if file_id in tree)
755
else:
756
entries = tree.inventory.entries()
757
finally:
758
tree.unlock()
759
if tree is not work_tree:
760
work_tree.unlock()
761
764
self.add_cleanup(work_tree.unlock)
765
if revision is not None:
766
tree = revision.as_tree(work_tree.branch)
767
768
extra_trees = [work_tree]
769
tree.lock_read()
770
self.add_cleanup(tree.unlock)
771
else:
772
tree = work_tree
773
extra_trees = []
774
775
if file_list is not None:
776
file_ids = tree.paths2ids(file_list, trees=extra_trees,
777
require_versioned=True)
778
# find_ids_across_trees may include some paths that don't
779
# exist in 'tree'.
780
entries = sorted((tree.id2path(file_id), tree.inventory[file_id])
781
for file_id in file_ids if file_id in tree)
782
else:
783
entries = tree.inventory.entries()
784
785
self.cleanup_now()
762
786
for path, entry in entries:
763
787
if kind and kind != entry.kind:
764
788
continue
770
794
771
795
772
796
class cmd_mv(Command):
773
"""Move or rename a file.
797
__doc__ = """Move or rename a file.
774
798
775
799
:Usage:
776
800
bzr mv OLDNAME NEWNAME
810
834
raise errors.BzrCommandError("missing file argument")
811
835
tree, rel_names = tree_files(names_list, canonicalize=False)
812
836
tree.lock_tree_write()
813
try:
814
self._run(tree, names_list, rel_names, after)
815
finally:
816
tree.unlock()
837
self.add_cleanup(tree.unlock)
838
self._run(tree, names_list, rel_names, after)
817
839
818
840
def run_auto(self, names_list, after, dry_run):
819
841
if names_list is not None and len(names_list) > 1:
824
846
' --auto.')
825
847
work_tree, file_list = tree_files(names_list, default_branch='.')
826
848
work_tree.lock_tree_write()
827
try:
828
rename_map.RenameMap.guess_renames(work_tree, dry_run)
829
finally:
830
work_tree.unlock()
849
self.add_cleanup(work_tree.unlock)
850
rename_map.RenameMap.guess_renames(work_tree, dry_run)
831
851
832
852
def _run(self, tree, names_list, rel_names, after):
833
853
into_existing = osutils.isdir(names_list[-1])
911
931
912
932
913
933
class cmd_pull(Command):
914
"""Turn this branch into a mirror of another branch.
934
__doc__ = """Turn this branch into a mirror of another branch.
915
935
916
This command only works on branches that have not diverged. Branches are
917
considered diverged if the destination branch's most recent commit is one
918
that has not been merged (directly or indirectly) into the parent.
936
By default, this command only works on branches that have not diverged.
937
Branches are considered diverged if the destination branch's most recent
938
commit is one that has not been merged (directly or indirectly) into the
939
parent.
919
940
920
941
If branches have diverged, you can use 'bzr merge' to integrate the changes
921
942
from one into the other. Once one branch has merged, the other should
922
943
be able to pull it again.
923
944
924
If you want to forget your local changes and just update your branch to
925
match the remote one, use pull --overwrite.
945
If you want to replace your local changes and just want your branch to
946
match the remote one, use pull --overwrite. This will work even if the two
947
branches have diverged.
926
948
927
949
If there is no default location set, the first pull will set it. After
928
950
that, you can omit the location to use the default. To change the
964
986
try:
965
987
tree_to = WorkingTree.open_containing(directory)[0]
966
988
branch_to = tree_to.branch
989
tree_to.lock_write()
990
self.add_cleanup(tree_to.unlock)
967
991
except errors.NoWorkingTree:
968
992
tree_to = None
969
993
branch_to = Branch.open_containing(directory)[0]
970
994
branch_to.lock_write()
995
self.add_cleanup(branch_to.unlock)
996
971
997
if local and not branch_to.get_bound_location():
972
998
raise errors.LocalRequiresBoundBranch()
973
999
1003
1029
else:
1004
1030
branch_from = Branch.open(location,
1005
1031
possible_transports=possible_transports)
1032
branch_from.lock_read()
1033
self.add_cleanup(branch_from.unlock)
1006
1034
1007
1035
if branch_to.get_parent() is None or remember:
1008
1036
branch_to.set_parent(branch_from.base)
1009
1037
1010
if branch_from is not branch_to:
1011
branch_from.lock_read()
1012
try:
1013
if revision is not None:
1014
revision_id = revision.as_revision_id(branch_from)
1015
1016
branch_to.lock_write()
1017
try:
1018
if tree_to is not None:
1019
view_info = _get_view_info_for_change_reporter(tree_to)
1020
change_reporter = delta._ChangeReporter(
1021
unversioned_filter=tree_to.is_ignored,
1022
view_info=view_info)
1023
result = tree_to.pull(
1024
branch_from, overwrite, revision_id, change_reporter,
1025
possible_transports=possible_transports, local=local)
1026
else:
1027
result = branch_to.pull(
1028
branch_from, overwrite, revision_id, local=local)
1029
1030
result.report(self.outf)
1031
if verbose and result.old_revid != result.new_revid:
1032
log.show_branch_change(
1033
branch_to, self.outf, result.old_revno,
1034
result.old_revid)
1035
finally:
1036
branch_to.unlock()
1037
finally:
1038
if branch_from is not branch_to:
1039
branch_from.unlock()
1038
if revision is not None:
1039
revision_id = revision.as_revision_id(branch_from)
1040
1041
if tree_to is not None:
1042
view_info = _get_view_info_for_change_reporter(tree_to)
1043
change_reporter = delta._ChangeReporter(
1044
unversioned_filter=tree_to.is_ignored,
1045
view_info=view_info)
1046
result = tree_to.pull(
1047
branch_from, overwrite, revision_id, change_reporter,
1048
possible_transports=possible_transports, local=local)
1049
else:
1050
result = branch_to.pull(
1051
branch_from, overwrite, revision_id, local=local)
1052
1053
result.report(self.outf)
1054
if verbose and result.old_revid != result.new_revid:
1055
log.show_branch_change(
1056
branch_to, self.outf, result.old_revno,
1057
result.old_revid)
1040
1058
1041
1059
1042
1060
class cmd_push(Command):
1043
"""Update a mirror of this branch.
1061
__doc__ = """Update a mirror of this branch.
1044
1062
1045
1063
The target branch will not have its working tree populated because this
1046
1064
is both expensive, and is not supported on remote file systems.
1107
1125
# Get the source branch
1108
1126
(tree, br_from,
1109
1127
_unused) = bzrdir.BzrDir.open_containing_tree_or_branch(directory)
1110
if strict is None:
1111
strict = br_from.get_config().get_user_option_as_bool('push_strict')
1112
if strict is None: strict = True # default value
1113
1128
# Get the tip's revision_id
1114
1129
revision = _get_one_revision('push', revision)
1115
1130
if revision is not None:
1116
1131
revision_id = revision.in_history(br_from).rev_id
1117
1132
else:
1118
1133
revision_id = None
1119
if strict and tree is not None and revision_id is None:
1120
if (tree.has_changes()):
1121
raise errors.UncommittedChanges(
1122
tree, more='Use --no-strict to force the push.')
1123
if tree.last_revision() != tree.branch.last_revision():
1124
# The tree has lost sync with its branch, there is little
1125
# chance that the user is aware of it but he can still force
1126
# the push with --no-strict
1127
raise errors.OutOfDateTree(
1128
tree, more='Use --no-strict to force the push.')
1129
1134
if tree is not None and revision_id is None:
1135
tree.check_changed_or_out_of_date(
1136
strict, 'push_strict',
1137
more_error='Use --no-strict to force the push.',
1138
more_warning='Uncommitted changes will not be pushed.')
1130
1139
# Get the stacked_on branch, if any
1131
1140
if stacked_on is not None:
1132
1141
stacked_on = urlutils.normalize_url(stacked_on)
1164
1173
1165
1174
1166
1175
class cmd_branch(Command):
1167
"""Create a new branch that is a copy of an existing branch.
1176
__doc__ = """Create a new branch that is a copy of an existing branch.
1168
1177
1169
1178
If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will
1170
1179
be used. In other words, "branch ../foo/bar" will attempt to create ./bar.
1197
1206
' directory exists, but does not already'
1198
1207
' have a control directory. This flag will'
1199
1208
' allow branch to proceed.'),
1209
Option('bind',
1210
help="Bind new branch to from location."),
1200
1211
]
1201
1212
aliases = ['get', 'clone']
1202
1213
1203
1214
def run(self, from_location, to_location=None, revision=None,
1204
1215
hardlink=False, stacked=False, standalone=False, no_tree=False,
1205
use_existing_dir=False, switch=False):
1216
use_existing_dir=False, switch=False, bind=False):
1206
1217
from bzrlib import switch as _mod_switch
1207
1218
from bzrlib.tag import _merge_tags_if_possible
1208
1219
accelerator_tree, br_from = bzrdir.BzrDir.open_tree_or_branch(
1209
1220
from_location)
1210
1221
revision = _get_one_revision('branch', revision)
1211
1222
br_from.lock_read()
1223
self.add_cleanup(br_from.unlock)
1224
if revision is not None:
1225
revision_id = revision.as_revision_id(br_from)
1226
else:
1227
# FIXME - wt.last_revision, fallback to branch, fall back to
1228
# None or perhaps NULL_REVISION to mean copy nothing
1229
# RBC 20060209
1230
revision_id = br_from.last_revision()
1231
if to_location is None:
1232
to_location = urlutils.derive_to_location(from_location)
1233
to_transport = transport.get_transport(to_location)
1212
1234
try:
1213
if revision is not None:
1214
revision_id = revision.as_revision_id(br_from)
1235
to_transport.mkdir('.')
1236
except errors.FileExists:
1237
if not use_existing_dir:
1238
raise errors.BzrCommandError('Target directory "%s" '
1239
'already exists.' % to_location)
1215
1240
else:
1216
# FIXME - wt.last_revision, fallback to branch, fall back to
1217
# None or perhaps NULL_REVISION to mean copy nothing
1218
# RBC 20060209
1219
revision_id = br_from.last_revision()
1220
if to_location is None:
1221
to_location = urlutils.derive_to_location(from_location)
1222
to_transport = transport.get_transport(to_location)
1223
try:
1224
to_transport.mkdir('.')
1225
except errors.FileExists:
1226
if not use_existing_dir:
1227
raise errors.BzrCommandError('Target directory "%s" '
1228
'already exists.' % to_location)
1241
try:
1242
bzrdir.BzrDir.open_from_transport(to_transport)
1243
except errors.NotBranchError:
1244
pass
1229
1245
else:
1230
try:
1231
bzrdir.BzrDir.open_from_transport(to_transport)
1232
except errors.NotBranchError:
1233
pass
1234
else:
1235
raise errors.AlreadyBranchError(to_location)
1236
except errors.NoSuchFile:
1237
raise errors.BzrCommandError('Parent of "%s" does not exist.'
1238
% to_location)
1239
try:
1240
# preserve whatever source format we have.
1241
dir = br_from.bzrdir.sprout(to_transport.base, revision_id,
1242
possible_transports=[to_transport],
1243
accelerator_tree=accelerator_tree,
1244
hardlink=hardlink, stacked=stacked,
1245
force_new_repo=standalone,
1246
create_tree_if_local=not no_tree,
1247
source_branch=br_from)
1248
branch = dir.open_branch()
1249
except errors.NoSuchRevision:
1250
to_transport.delete_tree('.')
1251
msg = "The branch %s has no revision %s." % (from_location,
1252
revision)
1253
raise errors.BzrCommandError(msg)
1254
_merge_tags_if_possible(br_from, branch)
1255
# If the source branch is stacked, the new branch may
1256
# be stacked whether we asked for that explicitly or not.
1257
# We therefore need a try/except here and not just 'if stacked:'
1258
try:
1259
note('Created new stacked branch referring to %s.' %
1260
branch.get_stacked_on_url())
1261
except (errors.NotStacked, errors.UnstackableBranchFormat,
1262
errors.UnstackableRepositoryFormat), e:
1263
note('Branched %d revision(s).' % branch.revno())
1264
if switch:
1265
# Switch to the new branch
1266
wt, _ = WorkingTree.open_containing('.')
1267
_mod_switch.switch(wt.bzrdir, branch)
1268
note('Switched to branch: %s',
1269
urlutils.unescape_for_display(branch.base, 'utf-8'))
1270
finally:
1271
br_from.unlock()
1246
raise errors.AlreadyBranchError(to_location)
1247
except errors.NoSuchFile:
1248
raise errors.BzrCommandError('Parent of "%s" does not exist.'
1249
% to_location)
1250
try:
1251
# preserve whatever source format we have.
1252
dir = br_from.bzrdir.sprout(to_transport.base, revision_id,
1253
possible_transports=[to_transport],
1254
accelerator_tree=accelerator_tree,
1255
hardlink=hardlink, stacked=stacked,
1256
force_new_repo=standalone,
1257
create_tree_if_local=not no_tree,
1258
source_branch=br_from)
1259
branch = dir.open_branch()
1260
except errors.NoSuchRevision:
1261
to_transport.delete_tree('.')
1262
msg = "The branch %s has no revision %s." % (from_location,
1263
revision)
1264
raise errors.BzrCommandError(msg)
1265
_merge_tags_if_possible(br_from, branch)
1266
# If the source branch is stacked, the new branch may
1267
# be stacked whether we asked for that explicitly or not.
1268
# We therefore need a try/except here and not just 'if stacked:'
1269
try:
1270
note('Created new stacked branch referring to %s.' %
1271
branch.get_stacked_on_url())
1272
except (errors.NotStacked, errors.UnstackableBranchFormat,
1273
errors.UnstackableRepositoryFormat), e:
1274
note('Branched %d revision(s).' % branch.revno())
1275
if bind:
1276
# Bind to the parent
1277
parent_branch = Branch.open(from_location)
1278
branch.bind(parent_branch)
1279
note('New branch bound to %s' % from_location)
1280
if switch:
1281
# Switch to the new branch
1282
wt, _ = WorkingTree.open_containing('.')
1283
_mod_switch.switch(wt.bzrdir, branch)
1284
note('Switched to branch: %s',
1285
urlutils.unescape_for_display(branch.base, 'utf-8'))
1272
1286
1273
1287
1274
1288
class cmd_checkout(Command):
1275
"""Create a new checkout of an existing branch.
1289
__doc__ = """Create a new checkout of an existing branch.
1276
1290
1277
1291
If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree for
1278
1292
the branch found in '.'. This is useful if you have removed the working tree
1341
1355
1342
1356
1343
1357
class cmd_renames(Command):
1344
"""Show list of renamed files.
1358
__doc__ = """Show list of renamed files.
1345
1359
"""
1346
1360
# TODO: Option to show renames between two historical versions.
1347
1361
1353
1367
def run(self, dir=u'.'):
1354
1368
tree = WorkingTree.open_containing(dir)[0]
1355
1369
tree.lock_read()
1356
try:
1357
new_inv = tree.inventory
1358
old_tree = tree.basis_tree()
1359
old_tree.lock_read()
1360
try:
1361
old_inv = old_tree.inventory
1362
renames = []
1363
iterator = tree.iter_changes(old_tree, include_unchanged=True)
1364
for f, paths, c, v, p, n, k, e in iterator:
1365
if paths[0] == paths[1]:
1366
continue
1367
if None in (paths):
1368
continue
1369
renames.append(paths)
1370
renames.sort()
1371
for old_name, new_name in renames:
1372
self.outf.write("%s => %s\n" % (old_name, new_name))
1373
finally:
1374
old_tree.unlock()
1375
finally:
1376
tree.unlock()
1370
self.add_cleanup(tree.unlock)
1371
new_inv = tree.inventory
1372
old_tree = tree.basis_tree()
1373
old_tree.lock_read()
1374
self.add_cleanup(old_tree.unlock)
1375
old_inv = old_tree.inventory
1376
renames = []
1377
iterator = tree.iter_changes(old_tree, include_unchanged=True)
1378
for f, paths, c, v, p, n, k, e in iterator:
1379
if paths[0] == paths[1]:
1380
continue
1381
if None in (paths):
1382
continue
1383
renames.append(paths)
1384
renames.sort()
1385
for old_name, new_name in renames:
1386
self.outf.write("%s => %s\n" % (old_name, new_name))
1377
1387
1378
1388
1379
1389
class cmd_update(Command):
1380
"""Update a tree to have the latest code committed to its branch.
1390
__doc__ = """Update a tree to have the latest code committed to its branch.
1381
1391
1382
1392
This will perform a merge into the working tree, and may generate
1383
1393
conflicts. If you have any local changes, you will still
1385
1395
1386
1396
If you want to discard your local changes, you can just do a
1387
1397
'bzr revert' instead of 'bzr commit' after the update.
1398
1399
If the tree's branch is bound to a master branch, it will also update
1400
the branch from the master.
1388
1401
"""
1389
1402
1390
1403
_see_also = ['pull', 'working-trees', 'status-flags']
1391
1404
takes_args = ['dir?']
1405
takes_options = ['revision']
1392
1406
aliases = ['up']
1393
1407
1394
def run(self, dir='.'):
1408
def run(self, dir='.', revision=None):
1409
if revision is not None and len(revision) != 1:
1410
raise errors.BzrCommandError(
1411
"bzr update --revision takes exactly one revision")
1395
1412
tree = WorkingTree.open_containing(dir)[0]
1413
branch = tree.branch
1396
1414
possible_transports = []
1397
master = tree.branch.get_master_branch(
1415
master = branch.get_master_branch(
1398
1416
possible_transports=possible_transports)
1399
1417
if master is not None:
1400
1418
tree.lock_write()
1419
branch_location = master.base
1401
1420
else:
1402
1421
tree.lock_tree_write()
1422
branch_location = tree.branch.base
1423
self.add_cleanup(tree.unlock)
1424
# get rid of the final '/' and be ready for display
1425
branch_location = urlutils.unescape_for_display(
1426
branch_location.rstrip('/'),
1427
self.outf.encoding)
1428
existing_pending_merges = tree.get_parent_ids()[1:]
1429
if master is None:
1430
old_tip = None
1431
else:
1432
# may need to fetch data into a heavyweight checkout
1433
# XXX: this may take some time, maybe we should display a
1434
# message
1435
old_tip = branch.update(possible_transports)
1436
if revision is not None:
1437
revision_id = revision[0].as_revision_id(branch)
1438
else:
1439
revision_id = branch.last_revision()
1440
if revision_id == _mod_revision.ensure_null(tree.last_revision()):
1441
revno = branch.revision_id_to_dotted_revno(revision_id)
1442
note("Tree is up to date at revision %s of branch %s" %
1443
('.'.join(map(str, revno)), branch_location))
1444
return 0
1445
view_info = _get_view_info_for_change_reporter(tree)
1446
change_reporter = delta._ChangeReporter(
1447
unversioned_filter=tree.is_ignored,
1448
view_info=view_info)
1403
1449
try:
1404
existing_pending_merges = tree.get_parent_ids()[1:]
1405
last_rev = _mod_revision.ensure_null(tree.last_revision())
1406
if last_rev == _mod_revision.ensure_null(
1407
tree.branch.last_revision()):
1408
# may be up to date, check master too.
1409
if master is None or last_rev == _mod_revision.ensure_null(
1410
master.last_revision()):
1411
revno = tree.branch.revision_id_to_revno(last_rev)
1412
note("Tree is up to date at revision %d." % (revno,))
1413
return 0
1414
view_info = _get_view_info_for_change_reporter(tree)
1415
1450
conflicts = tree.update(
1416
delta._ChangeReporter(unversioned_filter=tree.is_ignored,
1417
view_info=view_info), possible_transports=possible_transports)
1418
revno = tree.branch.revision_id_to_revno(
1419
_mod_revision.ensure_null(tree.last_revision()))
1420
note('Updated to revision %d.' % (revno,))
1421
if tree.get_parent_ids()[1:] != existing_pending_merges:
1422
note('Your local commits will now show as pending merges with '
1423
"'bzr status', and can be committed with 'bzr commit'.")
1424
if conflicts != 0:
1425
return 1
1426
else:
1427
return 0
1428
finally:
1429
tree.unlock()
1451
change_reporter,
1452
possible_transports=possible_transports,
1453
revision=revision_id,
1454
old_tip=old_tip)
1455
except errors.NoSuchRevision, e:
1456
raise errors.BzrCommandError(
1457
"branch has no revision %s\n"
1458
"bzr update --revision only works"
1459
" for a revision in the branch history"
1460
% (e.revision))
1461
revno = tree.branch.revision_id_to_dotted_revno(
1462
_mod_revision.ensure_null(tree.last_revision()))
1463
note('Updated to revision %s of branch %s' %
1464
('.'.join(map(str, revno)), branch_location))
1465
parent_ids = tree.get_parent_ids()
1466
if parent_ids[1:] and parent_ids[1:] != existing_pending_merges:
1467
note('Your local commits will now show as pending merges with '
1468
"'bzr status', and can be committed with 'bzr commit'.")
1469
if conflicts != 0:
1470
return 1
1471
else:
1472
return 0
1430
1473
1431
1474
1432
1475
class cmd_info(Command):
1433
"""Show information about a working tree, branch or repository.
1476
__doc__ = """Show information about a working tree, branch or repository.
1434
1477
1435
1478
This command will show all known locations and formats associated to the
1436
1479
tree, branch or repository.
1474
1517
1475
1518
1476
1519
class cmd_remove(Command):
1477
"""Remove files or directories.
1520
__doc__ = """Remove files or directories.
1478
1521
1479
1522
This makes bzr stop tracking changes to the specified files. bzr will delete
1480
1523
them if they can easily be recovered using revert. If no options or
1503
1546
file_list = [f for f in file_list]
1504
1547
1505
1548
tree.lock_write()
1506
try:
1507
# Heuristics should probably all move into tree.remove_smart or
1508
# some such?
1509
if new:
1510
added = tree.changes_from(tree.basis_tree(),
1511
specific_files=file_list).added
1512
file_list = sorted([f[0] for f in added], reverse=True)
1513
if len(file_list) == 0:
1514
raise errors.BzrCommandError('No matching files.')
1515
elif file_list is None:
1516
# missing files show up in iter_changes(basis) as
1517
# versioned-with-no-kind.
1518
missing = []
1519
for change in tree.iter_changes(tree.basis_tree()):
1520
# Find paths in the working tree that have no kind:
1521
if change[1][1] is not None and change[6][1] is None:
1522
missing.append(change[1][1])
1523
file_list = sorted(missing, reverse=True)
1524
file_deletion_strategy = 'keep'
1525
tree.remove(file_list, verbose=verbose, to_file=self.outf,
1526
keep_files=file_deletion_strategy=='keep',
1527
force=file_deletion_strategy=='force')
1528
finally:
1529
tree.unlock()
1549
self.add_cleanup(tree.unlock)
1550
# Heuristics should probably all move into tree.remove_smart or
1551
# some such?
1552
if new:
1553
added = tree.changes_from(tree.basis_tree(),
1554
specific_files=file_list).added
1555
file_list = sorted([f[0] for f in added], reverse=True)
1556
if len(file_list) == 0:
1557
raise errors.BzrCommandError('No matching files.')
1558
elif file_list is None:
1559
# missing files show up in iter_changes(basis) as
1560
# versioned-with-no-kind.
1561
missing = []
1562
for change in tree.iter_changes(tree.basis_tree()):
1563
# Find paths in the working tree that have no kind:
1564
if change[1][1] is not None and change[6][1] is None:
1565
missing.append(change[1][1])
1566
file_list = sorted(missing, reverse=True)
1567
file_deletion_strategy = 'keep'
1568
tree.remove(file_list, verbose=verbose, to_file=self.outf,
1569
keep_files=file_deletion_strategy=='keep',
1570
force=file_deletion_strategy=='force')
1530
1571
1531
1572
1532
1573
class cmd_file_id(Command):
1533
"""Print file_id of a particular file or directory.
1574
__doc__ = """Print file_id of a particular file or directory.
1534
1575
1535
1576
The file_id is assigned when the file is first added and remains the
1536
1577
same through all revisions where the file exists, even when it is
1552
1593
1553
1594
1554
1595
class cmd_file_path(Command):
1555
"""Print path of file_ids to a file or directory.
1596
__doc__ = """Print path of file_ids to a file or directory.
1556
1597
1557
1598
This prints one line for each directory down to the target,
1558
1599
starting at the branch root.
1574
1615
1575
1616
1576
1617
class cmd_reconcile(Command):
1577
"""Reconcile bzr metadata in a branch.
1618
__doc__ = """Reconcile bzr metadata in a branch.
1578
1619
1579
1620
This can correct data mismatches that may have been caused by
1580
1621
previous ghost operations or bzr upgrades. You should only
1602
1643
1603
1644
1604
1645
class cmd_revision_history(Command):
1605
"""Display the list of revision ids on a branch."""
1646
__doc__ = """Display the list of revision ids on a branch."""
1606
1647
1607
1648
_see_also = ['log']
1608
1649
takes_args = ['location?']
1618
1659
1619
1660
1620
1661
class cmd_ancestry(Command):
1621
"""List all revisions merged into this branch."""
1662
__doc__ = """List all revisions merged into this branch."""
1622
1663
1623
1664
_see_also = ['log', 'revision-history']
1624
1665
takes_args = ['location?']
1643
1684
1644
1685
1645
1686
class cmd_init(Command):
1646
"""Make a directory into a versioned branch.
1687
__doc__ = """Make a directory into a versioned branch.
1647
1688
1648
1689
Use this to create an empty branch, or before importing an
1649
1690
existing project.
1752
1793
1753
1794
1754
1795
class cmd_init_repository(Command):
1755
"""Create a shared repository for branches to share storage space.
1796
__doc__ = """Create a shared repository for branches to share storage space.
1756
1797
1757
1798
New branches created under the repository directory will store their
1758
1799
revisions in the repository, not in the branch directory. For branches
1812
1853
1813
1854
1814
1855
class cmd_diff(Command):
1815
"""Show differences in the working tree, between revisions or branches.
1856
__doc__ = """Show differences in the working tree, between revisions or branches.
1816
1857
1817
1858
If no arguments are given, all changes for the current tree are listed.
1818
1859
If files are given, only the changes in those files are listed.
1904
1945
help='Use this command to compare files.',
1905
1946
type=unicode,
1906
1947
),
1948
RegistryOption('format',
1949
help='Diff format to use.',
1950
lazy_registry=('bzrlib.diff', 'format_registry'),
1951
value_switches=False, title='Diff format'),
1907
1952
]
1908
1953
aliases = ['di', 'dif']
1909
1954
encoding_type = 'exact'
1910
1955
1911
1956
@display_command
1912
1957
def run(self, revision=None, file_list=None, diff_options=None,
1913
prefix=None, old=None, new=None, using=None):
1914
from bzrlib.diff import get_trees_and_branches_to_diff, show_diff_trees
1958
prefix=None, old=None, new=None, using=None, format=None):
1959
from bzrlib.diff import (get_trees_and_branches_to_diff_locked,
1960
show_diff_trees)
1915
1961
1916
1962
if (prefix is None) or (prefix == '0'):
1917
1963
# diff -p0 format
1931
1977
raise errors.BzrCommandError('bzr diff --revision takes exactly'
1932
1978
' one or two revision specifiers')
1933
1979
1980
if using is not None and format is not None:
1981
raise errors.BzrCommandError('--using and --format are mutually '
1982
'exclusive.')
1983
1934
1984
(old_tree, new_tree,
1935
1985
old_branch, new_branch,
1936
specific_files, extra_trees) = get_trees_and_branches_to_diff(
1937
file_list, revision, old, new, apply_view=True)
1986
specific_files, extra_trees) = get_trees_and_branches_to_diff_locked(
1987
file_list, revision, old, new, self.add_cleanup, apply_view=True)
1938
1988
return show_diff_trees(old_tree, new_tree, sys.stdout,
1939
1989
specific_files=specific_files,
1940
1990
external_diff_options=diff_options,
1941
1991
old_label=old_label, new_label=new_label,
1942
extra_trees=extra_trees, using=using)
1992
extra_trees=extra_trees, using=using,
1993
format_cls=format)
1943
1994
1944
1995
1945
1996
class cmd_deleted(Command):
1946
"""List files deleted in the working tree.
1997
__doc__ = """List files deleted in the working tree.
1947
1998
"""
1948
1999
# TODO: Show files deleted since a previous revision, or
1949
2000
# between two revisions.
1958
2009
def run(self, show_ids=False):
1959
2010
tree = WorkingTree.open_containing(u'.')[0]
1960
2011
tree.lock_read()
1961
try:
1962
old = tree.basis_tree()
1963
old.lock_read()
1964
try:
1965
for path, ie in old.inventory.iter_entries():
1966
if not tree.has_id(ie.file_id):
1967
self.outf.write(path)
1968
if show_ids:
1969
self.outf.write(' ')
1970
self.outf.write(ie.file_id)
1971
self.outf.write('\n')
1972
finally:
1973
old.unlock()
1974
finally:
1975
tree.unlock()
2012
self.add_cleanup(tree.unlock)
2013
old = tree.basis_tree()
2014
old.lock_read()
2015
self.add_cleanup(old.unlock)
2016
for path, ie in old.inventory.iter_entries():
2017
if not tree.has_id(ie.file_id):
2018
self.outf.write(path)
2019
if show_ids:
2020
self.outf.write(' ')
2021
self.outf.write(ie.file_id)
2022
self.outf.write('\n')
1976
2023
1977
2024
1978
2025
class cmd_modified(Command):
1979
"""List files modified in working tree.
2026
__doc__ = """List files modified in working tree.
1980
2027
"""
1981
2028
1982
2029
hidden = True
1999
2046
2000
2047
2001
2048
class cmd_added(Command):
2002
"""List files added in working tree.
2049
__doc__ = """List files added in working tree.
2003
2050
"""
2004
2051
2005
2052
hidden = True
2014
2061
def run(self, null=False):
2015
2062
wt = WorkingTree.open_containing(u'.')[0]
2016
2063
wt.lock_read()
2017
try:
2018
basis = wt.basis_tree()
2019
basis.lock_read()
2020
try:
2021
basis_inv = basis.inventory
2022
inv = wt.inventory
2023
for file_id in inv:
2024
if file_id in basis_inv:
2025
continue
2026
if inv.is_root(file_id) and len(basis_inv) == 0:
2027
continue
2028
path = inv.id2path(file_id)
2029
if not os.access(osutils.abspath(path), os.F_OK):
2030
continue
2031
if null:
2032
self.outf.write(path + '\0')
2033
else:
2034
self.outf.write(osutils.quotefn(path) + '\n')
2035
finally:
2036
basis.unlock()
2037
finally:
2038
wt.unlock()
2064
self.add_cleanup(wt.unlock)
2065
basis = wt.basis_tree()
2066
basis.lock_read()
2067
self.add_cleanup(basis.unlock)
2068
basis_inv = basis.inventory
2069
inv = wt.inventory
2070
for file_id in inv:
2071
if file_id in basis_inv:
2072
continue
2073
if inv.is_root(file_id) and len(basis_inv) == 0:
2074
continue
2075
path = inv.id2path(file_id)
2076
if not os.access(osutils.abspath(path), os.F_OK):
2077
continue
2078
if null:
2079
self.outf.write(path + '\0')
2080
else:
2081
self.outf.write(osutils.quotefn(path) + '\n')
2039
2082
2040
2083
2041
2084
class cmd_root(Command):
2042
"""Show the tree root directory.
2085
__doc__ = """Show the tree root directory.
2043
2086
2044
2087
The root is the nearest enclosing directory with a .bzr control
2045
2088
directory."""
2069
2112
2070
2113
2071
2114
class cmd_log(Command):
2072
"""Show historical log for a branch or subset of a branch.
2115
__doc__ = """Show historical log for a branch or subset of a branch.
2073
2116
2074
2117
log is bzr's default tool for exploring the history of a branch.
2075
2118
The branch to use is taken from the first parameter. If no parameters
2186
2229
:Tips & tricks:
2187
2230
2188
2231
GUI tools and IDEs are often better at exploring history than command
2189
line tools. You may prefer qlog or glog from the QBzr and Bzr-Gtk packages
2190
respectively for example. (TortoiseBzr uses qlog for displaying logs.) See
2191
http://bazaar-vcs.org/BzrPlugins and http://bazaar-vcs.org/IDEIntegration.
2192
2193
Web interfaces are often better at exploring history than command line
2194
tools, particularly for branches on servers. You may prefer Loggerhead
2195
or one of its alternatives. See http://bazaar-vcs.org/WebInterface.
2232
line tools: you may prefer qlog or viz from qbzr or bzr-gtk, the
2233
bzr-explorer shell, or the Loggerhead web interface. See the Plugin
2234
Guide <http://doc.bazaar.canonical.com/plugins/en/> and
2235
<http://wiki.bazaar.canonical.com/IDEIntegration>.
2196
2236
2197
2237
You may find it useful to add the aliases below to ``bazaar.conf``::
2198
2238
2259
2299
help='Show changes made in each revision as a patch.'),
2260
2300
Option('include-merges',
2261
2301
help='Show merged revisions like --levels 0 does.'),
2302
Option('exclude-common-ancestry',
2303
help='Display only the revisions that are not part'
2304
' of both ancestries (require -rX..Y)'
2305
)
2262
2306
]
2263
2307
encoding_type = 'replace'
2264
2308
2274
2318
message=None,
2275
2319
limit=None,
2276
2320
show_diff=False,
2277
include_merges=False):
2321
include_merges=False,
2322
exclude_common_ancestry=False,
2323
):
2278
2324
from bzrlib.log import (
2279
2325
Logger,
2280
2326
make_log_request_dict,
2281
2327
_get_info_for_log_files,
2282
2328
)
2283
2329
direction = (forward and 'forward') or 'reverse'
2330
if (exclude_common_ancestry
2331
and (revision is None or len(revision) != 2)):
2332
raise errors.BzrCommandError(
2333
'--exclude-common-ancestry requires -r with two revisions')
2284
2334
if include_merges:
2285
2335
if levels is None:
2286
2336
levels = 0
2299
2349
2300
2350
file_ids = []
2301
2351
filter_by_dir = False
2302
b = None
2303
try:
2304
if file_list:
2305
# find the file ids to log and check for directory filtering
2306
b, file_info_list, rev1, rev2 = _get_info_for_log_files(
2307
revision, file_list)
2308
for relpath, file_id, kind in file_info_list:
2309
if file_id is None:
2310
raise errors.BzrCommandError(
2311
"Path unknown at end or start of revision range: %s" %
2312
relpath)
2313
# If the relpath is the top of the tree, we log everything
2314
if relpath == '':
2315
file_ids = []
2316
break
2317
else:
2318
file_ids.append(file_id)
2319
filter_by_dir = filter_by_dir or (
2320
kind in ['directory', 'tree-reference'])
2321
else:
2322
# log everything
2323
# FIXME ? log the current subdir only RBC 20060203
2324
if revision is not None \
2325
and len(revision) > 0 and revision[0].get_branch():
2326
location = revision[0].get_branch()
2352
if file_list:
2353
# find the file ids to log and check for directory filtering
2354
b, file_info_list, rev1, rev2 = _get_info_for_log_files(
2355
revision, file_list)
2356
self.add_cleanup(b.unlock)
2357
for relpath, file_id, kind in file_info_list:
2358
if file_id is None:
2359
raise errors.BzrCommandError(
2360
"Path unknown at end or start of revision range: %s" %
2361
relpath)
2362
# If the relpath is the top of the tree, we log everything
2363
if relpath == '':
2364
file_ids = []
2365
break
2327
2366
else:
2328
location = '.'
2329
dir, relpath = bzrdir.BzrDir.open_containing(location)
2330
b = dir.open_branch()
2331
b.lock_read()
2332
rev1, rev2 = _get_revision_range(revision, b, self.name())
2333
2334
# Decide on the type of delta & diff filtering to use
2335
# TODO: add an --all-files option to make this configurable & consistent
2336
if not verbose:
2337
delta_type = None
2338
else:
2339
delta_type = 'full'
2340
if not show_diff:
2341
diff_type = None
2342
elif file_ids:
2343
diff_type = 'partial'
2344
else:
2345
diff_type = 'full'
2346
2347
# Build the log formatter
2348
if log_format is None:
2349
log_format = log.log_formatter_registry.get_default(b)
2350
lf = log_format(show_ids=show_ids, to_file=self.outf,
2351
show_timezone=timezone,
2352
delta_format=get_verbosity_level(),
2353
levels=levels,
2354
show_advice=levels is None)
2355
2356
# Choose the algorithm for doing the logging. It's annoying
2357
# having multiple code paths like this but necessary until
2358
# the underlying repository format is faster at generating
2359
# deltas or can provide everything we need from the indices.
2360
# The default algorithm - match-using-deltas - works for
2361
# multiple files and directories and is faster for small
2362
# amounts of history (200 revisions say). However, it's too
2363
# slow for logging a single file in a repository with deep
2364
# history, i.e. > 10K revisions. In the spirit of "do no
2365
# evil when adding features", we continue to use the
2366
# original algorithm - per-file-graph - for the "single
2367
# file that isn't a directory without showing a delta" case.
2368
partial_history = revision and b.repository._format.supports_chks
2369
match_using_deltas = (len(file_ids) != 1 or filter_by_dir
2370
or delta_type or partial_history)
2371
2372
# Build the LogRequest and execute it
2373
if len(file_ids) == 0:
2374
file_ids = None
2375
rqst = make_log_request_dict(
2376
direction=direction, specific_fileids=file_ids,
2377
start_revision=rev1, end_revision=rev2, limit=limit,
2378
message_search=message, delta_type=delta_type,
2379
diff_type=diff_type, _match_using_deltas=match_using_deltas)
2380
Logger(b, rqst).show(lf)
2381
finally:
2382
if b is not None:
2383
b.unlock()
2367
file_ids.append(file_id)
2368
filter_by_dir = filter_by_dir or (
2369
kind in ['directory', 'tree-reference'])
2370
else:
2371
# log everything
2372
# FIXME ? log the current subdir only RBC 20060203
2373
if revision is not None \
2374
and len(revision) > 0 and revision[0].get_branch():
2375
location = revision[0].get_branch()
2376
else:
2377
location = '.'
2378
dir, relpath = bzrdir.BzrDir.open_containing(location)
2379
b = dir.open_branch()
2380
b.lock_read()
2381
self.add_cleanup(b.unlock)
2382
rev1, rev2 = _get_revision_range(revision, b, self.name())
2383
2384
# Decide on the type of delta & diff filtering to use
2385
# TODO: add an --all-files option to make this configurable & consistent
2386
if not verbose:
2387
delta_type = None
2388
else:
2389
delta_type = 'full'
2390
if not show_diff:
2391
diff_type = None
2392
elif file_ids:
2393
diff_type = 'partial'
2394
else:
2395
diff_type = 'full'
2396
2397
# Build the log formatter
2398
if log_format is None:
2399
log_format = log.log_formatter_registry.get_default(b)
2400
# Make a non-encoding output to include the diffs - bug 328007
2401
unencoded_output = ui.ui_factory.make_output_stream(encoding_type='exact')
2402
lf = log_format(show_ids=show_ids, to_file=self.outf,
2403
to_exact_file=unencoded_output,
2404
show_timezone=timezone,
2405
delta_format=get_verbosity_level(),
2406
levels=levels,
2407
show_advice=levels is None)
2408
2409
# Choose the algorithm for doing the logging. It's annoying
2410
# having multiple code paths like this but necessary until
2411
# the underlying repository format is faster at generating
2412
# deltas or can provide everything we need from the indices.
2413
# The default algorithm - match-using-deltas - works for
2414
# multiple files and directories and is faster for small
2415
# amounts of history (200 revisions say). However, it's too
2416
# slow for logging a single file in a repository with deep
2417
# history, i.e. > 10K revisions. In the spirit of "do no
2418
# evil when adding features", we continue to use the
2419
# original algorithm - per-file-graph - for the "single
2420
# file that isn't a directory without showing a delta" case.
2421
partial_history = revision and b.repository._format.supports_chks
2422
match_using_deltas = (len(file_ids) != 1 or filter_by_dir
2423
or delta_type or partial_history)
2424
2425
# Build the LogRequest and execute it
2426
if len(file_ids) == 0:
2427
file_ids = None
2428
rqst = make_log_request_dict(
2429
direction=direction, specific_fileids=file_ids,
2430
start_revision=rev1, end_revision=rev2, limit=limit,
2431
message_search=message, delta_type=delta_type,
2432
diff_type=diff_type, _match_using_deltas=match_using_deltas,
2433
exclude_common_ancestry=exclude_common_ancestry,
2434
)
2435
Logger(b, rqst).show(lf)
2384
2436
2385
2437
2386
2438
def _get_revision_range(revisionspec_list, branch, command_name):
2404
2456
raise errors.BzrCommandError(
2405
2457
"bzr %s doesn't accept two revisions in different"
2406
2458
" branches." % command_name)
2407
rev1 = start_spec.in_history(branch)
2459
if start_spec.spec is None:
2460
# Avoid loading all the history.
2461
rev1 = RevisionInfo(branch, None, None)
2462
else:
2463
rev1 = start_spec.in_history(branch)
2408
2464
# Avoid loading all of history when we know a missing
2409
2465
# end of range means the last revision ...
2410
2466
if end_spec.spec is None:
2439
2495
2440
2496
2441
2497
class cmd_touching_revisions(Command):
2442
"""Return revision-ids which affected a particular file.
2498
__doc__ = """Return revision-ids which affected a particular file.
2443
2499
2444
2500
A more user-friendly interface is "bzr log FILE".
2445
2501
"""
2453
2509
file_id = tree.path2id(relpath)
2454
2510
b = tree.branch
2455
2511
b.lock_read()
2456
try:
2457
touching_revs = log.find_touching_revisions(b, file_id)
2458
for revno, revision_id, what in touching_revs:
2459
self.outf.write("%6d %s\n" % (revno, what))
2460
finally:
2461
b.unlock()
2512
self.add_cleanup(b.unlock)
2513
touching_revs = log.find_touching_revisions(b, file_id)
2514
for revno, revision_id, what in touching_revs:
2515
self.outf.write("%6d %s\n" % (revno, what))
2462
2516
2463
2517
2464
2518
class cmd_ls(Command):
2465
"""List files in a tree.
2519
__doc__ = """List files in a tree.
2466
2520
"""
2467
2521
2468
2522
_see_also = ['status', 'cat']
2531
2585
note("Ignoring files outside view. View is %s" % view_str)
2532
2586
2533
2587
tree.lock_read()
2534
try:
2535
for fp, fc, fkind, fid, entry in tree.list_files(include_root=False,
2536
from_dir=relpath, recursive=recursive):
2537
# Apply additional masking
2538
if not all and not selection[fc]:
2539
continue
2540
if kind is not None and fkind != kind:
2541
continue
2542
if apply_view:
2543
try:
2544
if relpath:
2545
fullpath = osutils.pathjoin(relpath, fp)
2546
else:
2547
fullpath = fp
2548
views.check_path_in_view(tree, fullpath)
2549
except errors.FileOutsideView:
2550
continue
2588
self.add_cleanup(tree.unlock)
2589
for fp, fc, fkind, fid, entry in tree.list_files(include_root=False,
2590
from_dir=relpath, recursive=recursive):
2591
# Apply additional masking
2592
if not all and not selection[fc]:
2593
continue
2594
if kind is not None and fkind != kind:
2595
continue
2596
if apply_view:
2597
try:
2598
if relpath:
2599
fullpath = osutils.pathjoin(relpath, fp)
2600
else:
2601
fullpath = fp
2602
views.check_path_in_view(tree, fullpath)
2603
except errors.FileOutsideView:
2604
continue
2551
2605
2552
# Output the entry
2553
if prefix:
2554
fp = osutils.pathjoin(prefix, fp)
2555
kindch = entry.kind_character()
2556
outstring = fp + kindch
2557
ui.ui_factory.clear_term()
2558
if verbose:
2559
outstring = '%-8s %s' % (fc, outstring)
2560
if show_ids and fid is not None:
2561
outstring = "%-50s %s" % (outstring, fid)
2606
# Output the entry
2607
if prefix:
2608
fp = osutils.pathjoin(prefix, fp)
2609
kindch = entry.kind_character()
2610
outstring = fp + kindch
2611
ui.ui_factory.clear_term()
2612
if verbose:
2613
outstring = '%-8s %s' % (fc, outstring)
2614
if show_ids and fid is not None:
2615
outstring = "%-50s %s" % (outstring, fid)
2616
self.outf.write(outstring + '\n')
2617
elif null:
2618
self.outf.write(fp + '\0')
2619
if show_ids:
2620
if fid is not None:
2621
self.outf.write(fid)
2622
self.outf.write('\0')
2623
self.outf.flush()
2624
else:
2625
if show_ids:
2626
if fid is not None:
2627
my_id = fid
2628
else:
2629
my_id = ''
2630
self.outf.write('%-50s %s\n' % (outstring, my_id))
2631
else:
2562
2632
self.outf.write(outstring + '\n')
2563
elif null:
2564
self.outf.write(fp + '\0')
2565
if show_ids:
2566
if fid is not None:
2567
self.outf.write(fid)
2568
self.outf.write('\0')
2569
self.outf.flush()
2570
else:
2571
if show_ids:
2572
if fid is not None:
2573
my_id = fid
2574
else:
2575
my_id = ''
2576
self.outf.write('%-50s %s\n' % (outstring, my_id))
2577
else:
2578
self.outf.write(outstring + '\n')
2579
finally:
2580
tree.unlock()
2581
2633
2582
2634
2583
2635
class cmd_unknowns(Command):
2584
"""List unknown files.
2636
__doc__ = """List unknown files.
2585
2637
"""
2586
2638
2587
2639
hidden = True
2594
2646
2595
2647
2596
2648
class cmd_ignore(Command):
2597
"""Ignore specified files or patterns.
2649
__doc__ = """Ignore specified files or patterns.
2598
2650
2599
2651
See ``bzr help patterns`` for details on the syntax of patterns.
2600
2652
2608
2660
After adding, editing or deleting that file either indirectly by
2609
2661
using this command or directly by using an editor, be sure to commit
2610
2662
it.
2663
2664
Bazaar also supports a global ignore file ~/.bazaar/ignore. On Windows
2665
the global ignore file can be found in the application data directory as
2666
C:\\Documents and Settings\\<user>\\Application Data\\Bazaar\\2.0\\ignore.
2667
Global ignores are not touched by this command. The global ignore file
2668
can be edited directly using an editor.
2669
2670
Patterns prefixed with '!' are exceptions to ignore patterns and take
2671
precedence over regular ignores. Such exceptions are used to specify
2672
files that should be versioned which would otherwise be ignored.
2673
2674
Patterns prefixed with '!!' act as regular ignore patterns, but have
2675
precedence over the '!' exception patterns.
2611
2676
2612
2677
Note: ignore patterns containing shell wildcards must be quoted from
2613
2678
the shell on Unix.
2617
2682
2618
2683
bzr ignore ./Makefile
2619
2684
2620
Ignore class files in all directories::
2685
Ignore .class files in all directories...::
2621
2686
2622
2687
bzr ignore "*.class"
2623
2688
2689
...but do not ignore "special.class"::
2690
2691
bzr ignore "!special.class"
2692
2624
2693
Ignore .o files under the lib directory::
2625
2694
2626
2695
bzr ignore "lib/**/*.o"
2632
2701
Ignore everything but the "debian" toplevel directory::
2633
2702
2634
2703
bzr ignore "RE:(?!debian/).*"
2704
2705
Ignore everything except the "local" toplevel directory,
2706
but always ignore "*~" autosave files, even under local/::
2707
2708
bzr ignore "*"
2709
bzr ignore "!./local"
2710
bzr ignore "!!*~"
2635
2711
"""
2636
2712
2637
2713
_see_also = ['status', 'ignored', 'patterns']
2638
2714
takes_args = ['name_pattern*']
2639
2715
takes_options = [
2640
Option('old-default-rules',
2641
help='Write out the ignore rules bzr < 0.9 always used.')
2716
Option('default-rules',
2717
help='Display the default ignore rules that bzr uses.')
2642
2718
]
2643
2719
2644
def run(self, name_pattern_list=None, old_default_rules=None):
2720
def run(self, name_pattern_list=None, default_rules=None):
2645
2721
from bzrlib import ignores
2646
if old_default_rules is not None:
2647
# dump the rules and exit
2648
for pattern in ignores.OLD_DEFAULTS:
2649
print pattern
2722
if default_rules is not None:
2723
# dump the default rules and exit
2724
for pattern in ignores.USER_DEFAULTS:
2725
self.outf.write("%s\n" % pattern)
2650
2726
return
2651
2727
if not name_pattern_list:
2652
2728
raise errors.BzrCommandError("ignore requires at least one "
2653
"NAME_PATTERN or --old-default-rules")
2729
"NAME_PATTERN or --default-rules.")
2654
2730
name_pattern_list = [globbing.normalize_pattern(p)
2655
2731
for p in name_pattern_list]
2656
2732
for name_pattern in name_pattern_list:
2668
2744
if id is not None:
2669
2745
filename = entry[0]
2670
2746
if ignored.match(filename):
2671
matches.append(filename.encode('utf-8'))
2747
matches.append(filename)
2672
2748
tree.unlock()
2673
2749
if len(matches) > 0:
2674
print "Warning: the following files are version controlled and" \
2675
" match your ignore pattern:\n%s" \
2676
"\nThese files will continue to be version controlled" \
2677
" unless you 'bzr remove' them." % ("\n".join(matches),)
2750
self.outf.write("Warning: the following files are version controlled and"
2751
" match your ignore pattern:\n%s"
2752
"\nThese files will continue to be version controlled"
2753
" unless you 'bzr remove' them.\n" % ("\n".join(matches),))
2678
2754
2679
2755
2680
2756
class cmd_ignored(Command):
2681
"""List ignored files and the patterns that matched them.
2757
__doc__ = """List ignored files and the patterns that matched them.
2682
2758
2683
2759
List all the ignored files and the ignore pattern that caused the file to
2684
2760
be ignored.
2695
2771
def run(self):
2696
2772
tree = WorkingTree.open_containing(u'.')[0]
2697
2773
tree.lock_read()
2698
try:
2699
for path, file_class, kind, file_id, entry in tree.list_files():
2700
if file_class != 'I':
2701
continue
2702
## XXX: Slightly inefficient since this was already calculated
2703
pat = tree.is_ignored(path)
2704
self.outf.write('%-50s %s\n' % (path, pat))
2705
finally:
2706
tree.unlock()
2774
self.add_cleanup(tree.unlock)
2775
for path, file_class, kind, file_id, entry in tree.list_files():
2776
if file_class != 'I':
2777
continue
2778
## XXX: Slightly inefficient since this was already calculated
2779
pat = tree.is_ignored(path)
2780
self.outf.write('%-50s %s\n' % (path, pat))
2707
2781
2708
2782
2709
2783
class cmd_lookup_revision(Command):
2710
"""Lookup the revision-id from a revision-number
2784
__doc__ = """Lookup the revision-id from a revision-number
2711
2785
2712
2786
:Examples:
2713
2787
bzr lookup-revision 33
2720
2794
try:
2721
2795
revno = int(revno)
2722
2796
except ValueError:
2723
raise errors.BzrCommandError("not a valid revision-number: %r" % revno)
2724
2725
print WorkingTree.open_containing(u'.')[0].branch.get_rev_id(revno)
2797
raise errors.BzrCommandError("not a valid revision-number: %r"
2798
% revno)
2799
revid = WorkingTree.open_containing(u'.')[0].branch.get_rev_id(revno)
2800
self.outf.write("%s\n" % revid)
2726
2801
2727
2802
2728
2803
class cmd_export(Command):
2729
"""Export current or past revision to a destination directory or archive.
2804
__doc__ = """Export current or past revision to a destination directory or archive.
2730
2805
2731
2806
If no revision is specified this exports the last committed revision.
2732
2807
2764
2839
Option('root',
2765
2840
type=str,
2766
2841
help="Name of the root directory inside the exported file."),
2842
Option('per-file-timestamps',
2843
help='Set modification time of files to that of the last '
2844
'revision in which it was changed.'),
2767
2845
]
2768
2846
def run(self, dest, branch_or_subdir=None, revision=None, format=None,
2769
root=None, filters=False):
2847
root=None, filters=False, per_file_timestamps=False):
2770
2848
from bzrlib.export import export
2771
2849
2772
2850
if branch_or_subdir is None:
2779
2857
2780
2858
rev_tree = _get_one_revision_tree('export', revision, branch=b, tree=tree)
2781
2859
try:
2782
export(rev_tree, dest, format, root, subdir, filtered=filters)
2860
export(rev_tree, dest, format, root, subdir, filtered=filters,
2861
per_file_timestamps=per_file_timestamps)
2783
2862
except errors.NoSuchExportFormat, e:
2784
2863
raise errors.BzrCommandError('Unsupported export format: %s' % e.format)
2785
2864
2786
2865
2787
2866
class cmd_cat(Command):
2788
"""Write the contents of a file as of a given revision to standard output.
2867
__doc__ = """Write the contents of a file as of a given revision to standard output.
2789
2868
2790
2869
If no revision is nominated, the last revision is used.
2791
2870
2812
2891
tree, branch, relpath = \
2813
2892
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
2814
2893
branch.lock_read()
2815
try:
2816
return self._run(tree, branch, relpath, filename, revision,
2817
name_from_revision, filters)
2818
finally:
2819
branch.unlock()
2894
self.add_cleanup(branch.unlock)
2895
return self._run(tree, branch, relpath, filename, revision,
2896
name_from_revision, filters)
2820
2897
2821
2898
def _run(self, tree, b, relpath, filename, revision, name_from_revision,
2822
2899
filtered):
2823
2900
if tree is None:
2824
2901
tree = b.basis_tree()
2825
2902
rev_tree = _get_one_revision_tree('cat', revision, branch=b)
2903
rev_tree.lock_read()
2904
self.add_cleanup(rev_tree.unlock)
2826
2905
2827
2906
old_file_id = rev_tree.path2id(relpath)
2828
2907
2863
2942
chunks = content.splitlines(True)
2864
2943
content = filtered_output_bytes(chunks, filters,
2865
2944
ContentFilterContext(relpath, rev_tree))
2945
self.cleanup_now()
2866
2946
self.outf.writelines(content)
2867
2947
else:
2948
self.cleanup_now()
2868
2949
self.outf.write(content)
2869
2950
2870
2951
2871
2952
class cmd_local_time_offset(Command):
2872
"""Show the offset in seconds from GMT to local time."""
2953
__doc__ = """Show the offset in seconds from GMT to local time."""
2873
2954
hidden = True
2874
2955
@display_command
2875
2956
def run(self):
2876
print osutils.local_time_offset()
2957
self.outf.write("%s\n" % osutils.local_time_offset())
2877
2958
2878
2959
2879
2960
2880
2961
class cmd_commit(Command):
2881
"""Commit changes into a new revision.
2962
__doc__ = """Commit changes into a new revision.
2882
2963
2883
2964
An explanatory message needs to be given for each commit. This is
2884
2965
often done by using the --message option (getting the message from the
2992
3073
"the master branch until a normal commit "
2993
3074
"is performed."
2994
3075
),
2995
Option('show-diff',
3076
Option('show-diff', short_name='p',
2996
3077
help='When no message is supplied, show the diff along'
2997
3078
' with the status summary in the message editor.'),
2998
3079
]
3064
3145
if local and not tree.branch.get_bound_location():
3065
3146
raise errors.LocalRequiresBoundBranch()
3066
3147
3148
if message is not None:
3149
try:
3150
file_exists = osutils.lexists(message)
3151
except UnicodeError:
3152
# The commit message contains unicode characters that can't be
3153
# represented in the filesystem encoding, so that can't be a
3154
# file.
3155
file_exists = False
3156
if file_exists:
3157
warning_msg = (
3158
'The commit message is a file name: "%(f)s".\n'
3159
'(use --file "%(f)s" to take commit message from that file)'
3160
% { 'f': message })
3161
ui.ui_factory.show_warning(warning_msg)
3162
if '\r' in message:
3163
message = message.replace('\r\n', '\n')
3164
message = message.replace('\r', '\n')
3165
if file:
3166
raise errors.BzrCommandError(
3167
"please specify either --message or --file")
3168
3067
3169
def get_message(commit_obj):
3068
3170
"""Callback to get commit message"""
3069
my_message = message
3070
if my_message is not None and '\r' in my_message:
3071
my_message = my_message.replace('\r\n', '\n')
3072
my_message = my_message.replace('\r', '\n')
3073
if my_message is None and not file:
3074
t = make_commit_message_template_encoded(tree,
3171
if file:
3172
my_message = codecs.open(
3173
file, 'rt', osutils.get_user_encoding()).read()
3174
elif message is not None:
3175
my_message = message
3176
else:
3177
# No message supplied: make one up.
3178
# text is the status of the tree
3179
text = make_commit_message_template_encoded(tree,
3075
3180
selected_list, diff=show_diff,
3076
3181
output_encoding=osutils.get_user_encoding())
3182
# start_message is the template generated from hooks
3183
# XXX: Warning - looks like hooks return unicode,
3184
# make_commit_message_template_encoded returns user encoding.
3185
# We probably want to be using edit_commit_message instead to
3186
# avoid this.
3077
3187
start_message = generate_commit_message_template(commit_obj)
3078
my_message = edit_commit_message_encoded(t,
3188
my_message = edit_commit_message_encoded(text,
3079
3189
start_message=start_message)
3080
3190
if my_message is None:
3081
3191
raise errors.BzrCommandError("please specify a commit"
3082
3192
" message with either --message or --file")
3083
elif my_message and file:
3084
raise errors.BzrCommandError(
3085
"please specify either --message or --file")
3086
if file:
3087
my_message = codecs.open(file, 'rt',
3088
osutils.get_user_encoding()).read()
3089
3193
if my_message == "":
3090
3194
raise errors.BzrCommandError("empty commit message specified")
3091
3195
return my_message
3103
3207
timezone=offset,
3104
3208
exclude=safe_relpath_files(tree, exclude))
3105
3209
except PointlessCommit:
3106
# FIXME: This should really happen before the file is read in;
3107
# perhaps prepare the commit; get the message; then actually commit
3108
3210
raise errors.BzrCommandError("No changes to commit."
3109
3211
" Use --unchanged to commit anyhow.")
3110
3212
except ConflictsInTree:
3115
3217
raise errors.BzrCommandError("Commit refused because there are"
3116
3218
" unknown files in the working tree.")
3117
3219
except errors.BoundBranchOutOfDate, e:
3118
raise errors.BzrCommandError(str(e) + "\n"
3119
'To commit to master branch, run update and then commit.\n'
3120
'You can also pass --local to commit to continue working '
3121
'disconnected.')
3220
e.extra_help = ("\n"
3221
'To commit to master branch, run update and then commit.\n'
3222
'You can also pass --local to commit to continue working '
3223
'disconnected.')
3224
raise
3122
3225
3123
3226
3124
3227
class cmd_check(Command):
3125
"""Validate working tree structure, branch consistency and repository history.
3228
__doc__ = """Validate working tree structure, branch consistency and repository history.
3126
3229
3127
3230
This command checks various invariants about branch and repository storage
3128
3231
to detect data corruption or bzr bugs.
3192
3295
3193
3296
3194
3297
class cmd_upgrade(Command):
3195
"""Upgrade branch storage to current format.
3298
__doc__ = """Upgrade branch storage to current format.
3196
3299
3197
3300
The check command or bzr developers may sometimes advise you to run
3198
3301
this command. When the default format has changed you may also be warned
3216
3319
3217
3320
3218
3321
class cmd_whoami(Command):
3219
"""Show or set bzr user id.
3322
__doc__ = """Show or set bzr user id.
3220
3323
3221
3324
:Examples:
3222
3325
Show the email of the current user::
3266
3369
3267
3370
3268
3371
class cmd_nick(Command):
3269
"""Print or set the branch nickname.
3372
__doc__ = """Print or set the branch nickname.
3270
3373
3271
3374
If unset, the tree root directory name is used as the nickname.
3272
3375
To print the current nickname, execute with no argument.
3286
3389
3287
3390
@display_command
3288
3391
def printme(self, branch):
3289
print branch.nick
3392
self.outf.write('%s\n' % branch.nick)
3290
3393
3291
3394
3292
3395
class cmd_alias(Command):
3293
"""Set/unset and display aliases.
3396
__doc__ = """Set/unset and display aliases.
3294
3397
3295
3398
:Examples:
3296
3399
Show the current aliases::
3360
3463
3361
3464
3362
3465
class cmd_selftest(Command):
3363
"""Run internal test suite.
3466
__doc__ = """Run internal test suite.
3364
3467
3365
3468
If arguments are given, they are regular expressions that say which tests
3366
3469
should run. Tests matching any expression are run, and other tests are
3410
3513
def get_transport_type(typestring):
3411
3514
"""Parse and return a transport specifier."""
3412
3515
if typestring == "sftp":
3413
from bzrlib.transport.sftp import SFTPAbsoluteServer
3414
return SFTPAbsoluteServer
3516
from bzrlib.tests import stub_sftp
3517
return stub_sftp.SFTPAbsoluteServer
3415
3518
if typestring == "memory":
3416
from bzrlib.transport.memory import MemoryServer
3417
return MemoryServer
3519
from bzrlib.tests import test_server
3520
return memory.MemoryServer
3418
3521
if typestring == "fakenfs":
3419
from bzrlib.transport.fakenfs import FakeNFSServer
3420
return FakeNFSServer
3522
from bzrlib.tests import test_server
3523
return test_server.FakeNFSServer
3421
3524
msg = "No known transport type %s. Supported types are: sftp\n" %\
3422
3525
(typestring)
3423
3526
raise errors.BzrCommandError(msg)
3507
3610
raise errors.BzrCommandError("subunit not available. subunit "
3508
3611
"needs to be installed to use --subunit.")
3509
3612
self.additional_selftest_args['runner_class'] = SubUnitBzrRunner
3613
# On Windows, disable automatic conversion of '\n' to '\r\n' in
3614
# stdout, which would corrupt the subunit stream.
3615
if sys.platform == "win32" and sys.stdout.fileno() >= 0:
3616
import msvcrt
3617
msvcrt.setmode(sys.stdout.fileno(), os.O_BINARY)
3510
3618
if parallel:
3511
3619
self.additional_selftest_args.setdefault(
3512
3620
'suite_decorators', []).append(parallel)
3516
3624
verbose = not is_quiet()
3517
3625
# TODO: should possibly lock the history file...
3518
3626
benchfile = open(".perf_history", "at", buffering=1)
3627
self.add_cleanup(benchfile.close)
3519
3628
else:
3520
3629
test_suite_factory = None
3521
3630
benchfile = None
3522
try:
3523
selftest_kwargs = {"verbose": verbose,
3524
"pattern": pattern,
3525
"stop_on_failure": one,
3526
"transport": transport,
3527
"test_suite_factory": test_suite_factory,
3528
"lsprof_timed": lsprof_timed,
3529
"lsprof_tests": lsprof_tests,
3530
"bench_history": benchfile,
3531
"matching_tests_first": first,
3532
"list_only": list_only,
3533
"random_seed": randomize,
3534
"exclude_pattern": exclude,
3535
"strict": strict,
3536
"load_list": load_list,
3537
"debug_flags": debugflag,
3538
"starting_with": starting_with
3539
}
3540
selftest_kwargs.update(self.additional_selftest_args)
3541
result = selftest(**selftest_kwargs)
3542
finally:
3543
if benchfile is not None:
3544
benchfile.close()
3631
selftest_kwargs = {"verbose": verbose,
3632
"pattern": pattern,
3633
"stop_on_failure": one,
3634
"transport": transport,
3635
"test_suite_factory": test_suite_factory,
3636
"lsprof_timed": lsprof_timed,
3637
"lsprof_tests": lsprof_tests,
3638
"bench_history": benchfile,
3639
"matching_tests_first": first,
3640
"list_only": list_only,
3641
"random_seed": randomize,
3642
"exclude_pattern": exclude,
3643
"strict": strict,
3644
"load_list": load_list,
3645
"debug_flags": debugflag,
3646
"starting_with": starting_with
3647
}
3648
selftest_kwargs.update(self.additional_selftest_args)
3649
result = selftest(**selftest_kwargs)
3545
3650
return int(not result)
3546
3651
3547
3652
3548
3653
class cmd_version(Command):
3549
"""Show version of bzr."""
3654
__doc__ = """Show version of bzr."""
3550
3655
3551
3656
encoding_type = 'replace'
3552
3657
takes_options = [
3563
3668
3564
3669
3565
3670
class cmd_rocks(Command):
3566
"""Statement of optimism."""
3671
__doc__ = """Statement of optimism."""
3567
3672
3568
3673
hidden = True
3569
3674
3570
3675
@display_command
3571
3676
def run(self):
3572
print "It sure does!"
3677
self.outf.write("It sure does!\n")
3573
3678
3574
3679
3575
3680
class cmd_find_merge_base(Command):
3576
"""Find and print a base revision for merging two branches."""
3681
__doc__ = """Find and print a base revision for merging two branches."""
3577
3682
# TODO: Options to specify revisions on either side, as if
3578
3683
# merging only part of the history.
3579
3684
takes_args = ['branch', 'other']
3586
3691
branch1 = Branch.open_containing(branch)[0]
3587
3692
branch2 = Branch.open_containing(other)[0]
3588
3693
branch1.lock_read()
3589
try:
3590
branch2.lock_read()
3591
try:
3592
last1 = ensure_null(branch1.last_revision())
3593
last2 = ensure_null(branch2.last_revision())
3594
3595
graph = branch1.repository.get_graph(branch2.repository)
3596
base_rev_id = graph.find_unique_lca(last1, last2)
3597
3598
print 'merge base is revision %s' % base_rev_id
3599
finally:
3600
branch2.unlock()
3601
finally:
3602
branch1.unlock()
3694
self.add_cleanup(branch1.unlock)
3695
branch2.lock_read()
3696
self.add_cleanup(branch2.unlock)
3697
last1 = ensure_null(branch1.last_revision())
3698
last2 = ensure_null(branch2.last_revision())
3699
3700
graph = branch1.repository.get_graph(branch2.repository)
3701
base_rev_id = graph.find_unique_lca(last1, last2)
3702
3703
self.outf.write('merge base is revision %s\n' % base_rev_id)
3603
3704
3604
3705
3605
3706
class cmd_merge(Command):
3606
"""Perform a three-way merge.
3707
__doc__ = """Perform a three-way merge.
3607
3708
3608
3709
The source of the merge can be specified either in the form of a branch,
3609
3710
or in the form of a path to a file containing a merge directive generated
3638
3739
committed to record the result of the merge.
3639
3740
3640
3741
merge refuses to run if there are any uncommitted changes, unless
3641
--force is given.
3742
--force is given. The --force option can also be used to create a
3743
merge revision which has more than two parents.
3744
3745
If one would like to merge changes from the working tree of the other
3746
branch without merging any committed revisions, the --uncommitted option
3747
can be given.
3642
3748
3643
3749
To select only some changes to merge, use "merge -i", which will prompt
3644
3750
you to apply each diff hunk and file change, similar to "shelve".
3659
3765
To apply a merge directive contained in /tmp/merge::
3660
3766
3661
3767
bzr merge /tmp/merge
3768
3769
To create a merge revision with three parents from two branches
3770
feature1a and feature1b:
3771
3772
bzr merge ../feature1a
3773
bzr merge ../feature1b --force
3774
bzr commit -m 'revision with three parents'
3662
3775
"""
3663
3776
3664
3777
encoding_type = 'exact'
3722
3835
view_info = _get_view_info_for_change_reporter(tree)
3723
3836
change_reporter = delta._ChangeReporter(
3724
3837
unversioned_filter=tree.is_ignored, view_info=view_info)
3725
cleanups = []
3726
try:
3727
pb = ui.ui_factory.nested_progress_bar()
3728
cleanups.append(pb.finished)
3729
tree.lock_write()
3730
cleanups.append(tree.unlock)
3731
if location is not None:
3732
try:
3733
mergeable = bundle.read_mergeable_from_url(location,
3734
possible_transports=possible_transports)
3735
except errors.NotABundle:
3736
mergeable = None
3737
else:
3738
if uncommitted:
3739
raise errors.BzrCommandError('Cannot use --uncommitted'
3740
' with bundles or merge directives.')
3741
3742
if revision is not None:
3743
raise errors.BzrCommandError(
3744
'Cannot use -r with merge directives or bundles')
3745
merger, verified = _mod_merge.Merger.from_mergeable(tree,
3746
mergeable, pb)
3747
3748
if merger is None and uncommitted:
3749
if revision is not None and len(revision) > 0:
3750
raise errors.BzrCommandError('Cannot use --uncommitted and'
3751
' --revision at the same time.')
3752
merger = self.get_merger_from_uncommitted(tree, location, pb,
3753
cleanups)
3754
allow_pending = False
3755
3756
if merger is None:
3757
merger, allow_pending = self._get_merger_from_branch(tree,
3758
location, revision, remember, possible_transports, pb)
3759
3760
merger.merge_type = merge_type
3761
merger.reprocess = reprocess
3762
merger.show_base = show_base
3763
self.sanity_check_merger(merger)
3764
if (merger.base_rev_id == merger.other_rev_id and
3765
merger.other_rev_id is not None):
3766
note('Nothing to do.')
3838
pb = ui.ui_factory.nested_progress_bar()
3839
self.add_cleanup(pb.finished)
3840
tree.lock_write()
3841
self.add_cleanup(tree.unlock)
3842
if location is not None:
3843
try:
3844
mergeable = bundle.read_mergeable_from_url(location,
3845
possible_transports=possible_transports)
3846
except errors.NotABundle:
3847
mergeable = None
3848
else:
3849
if uncommitted:
3850
raise errors.BzrCommandError('Cannot use --uncommitted'
3851
' with bundles or merge directives.')
3852
3853
if revision is not None:
3854
raise errors.BzrCommandError(
3855
'Cannot use -r with merge directives or bundles')
3856
merger, verified = _mod_merge.Merger.from_mergeable(tree,
3857
mergeable, None)
3858
3859
if merger is None and uncommitted:
3860
if revision is not None and len(revision) > 0:
3861
raise errors.BzrCommandError('Cannot use --uncommitted and'
3862
' --revision at the same time.')
3863
merger = self.get_merger_from_uncommitted(tree, location, None)
3864
allow_pending = False
3865
3866
if merger is None:
3867
merger, allow_pending = self._get_merger_from_branch(tree,
3868
location, revision, remember, possible_transports, None)
3869
3870
merger.merge_type = merge_type
3871
merger.reprocess = reprocess
3872
merger.show_base = show_base
3873
self.sanity_check_merger(merger)
3874
if (merger.base_rev_id == merger.other_rev_id and
3875
merger.other_rev_id is not None):
3876
note('Nothing to do.')
3877
return 0
3878
if pull:
3879
if merger.interesting_files is not None:
3880
raise errors.BzrCommandError('Cannot pull individual files')
3881
if (merger.base_rev_id == tree.last_revision()):
3882
result = tree.pull(merger.other_branch, False,
3883
merger.other_rev_id)
3884
result.report(self.outf)
3767
3885
return 0
3768
if pull:
3769
if merger.interesting_files is not None:
3770
raise errors.BzrCommandError('Cannot pull individual files')
3771
if (merger.base_rev_id == tree.last_revision()):
3772
result = tree.pull(merger.other_branch, False,
3773
merger.other_rev_id)
3774
result.report(self.outf)
3775
return 0
3776
if merger.this_basis is None:
3777
raise errors.BzrCommandError(
3778
"This branch has no commits."
3779
" (perhaps you would prefer 'bzr pull')")
3780
if preview:
3781
return self._do_preview(merger, cleanups)
3782
elif interactive:
3783
return self._do_interactive(merger, cleanups)
3784
else:
3785
return self._do_merge(merger, change_reporter, allow_pending,
3786
verified)
3787
finally:
3788
for cleanup in reversed(cleanups):
3789
cleanup()
3886
if merger.this_basis is None:
3887
raise errors.BzrCommandError(
3888
"This branch has no commits."
3889
" (perhaps you would prefer 'bzr pull')")
3890
if preview:
3891
return self._do_preview(merger)
3892
elif interactive:
3893
return self._do_interactive(merger)
3894
else:
3895
return self._do_merge(merger, change_reporter, allow_pending,
3896
verified)
3790
3897
3791
def _get_preview(self, merger, cleanups):
3898
def _get_preview(self, merger):
3792
3899
tree_merger = merger.make_merger()
3793
3900
tt = tree_merger.make_preview_transform()
3794
cleanups.append(tt.finalize)
3901
self.add_cleanup(tt.finalize)
3795
3902
result_tree = tt.get_preview_tree()
3796
3903
return result_tree
3797
3904
3798
def _do_preview(self, merger, cleanups):
3905
def _do_preview(self, merger):
3799
3906
from bzrlib.diff import show_diff_trees
3800
result_tree = self._get_preview(merger, cleanups)
3907
result_tree = self._get_preview(merger)
3801
3908
show_diff_trees(merger.this_tree, result_tree, self.outf,
3802
3909
old_label='', new_label='')
3803
3910
3813
3920
else:
3814
3921
return 0
3815
3922
3816
def _do_interactive(self, merger, cleanups):
3923
def _do_interactive(self, merger):
3817
3924
"""Perform an interactive merge.
3818
3925
3819
3926
This works by generating a preview tree of the merge, then using
3821
3928
and the preview tree.
3822
3929
"""
3823
3930
from bzrlib import shelf_ui
3824
result_tree = self._get_preview(merger, cleanups)
3931
result_tree = self._get_preview(merger)
3825
3932
writer = bzrlib.option.diff_writer_registry.get()
3826
3933
shelver = shelf_ui.Shelver(merger.this_tree, result_tree, destroy=True,
3827
3934
reporter=shelf_ui.ApplyReporter(),
3828
3935
diff_writer=writer(sys.stdout))
3829
shelver.run()
3936
try:
3937
shelver.run()
3938
finally:
3939
shelver.finalize()
3830
3940
3831
3941
def sanity_check_merger(self, merger):
3832
3942
if (merger.show_base and
3892
4002
allow_pending = True
3893
4003
return merger, allow_pending
3894
4004
3895
def get_merger_from_uncommitted(self, tree, location, pb, cleanups):
4005
def get_merger_from_uncommitted(self, tree, location, pb):
3896
4006
"""Get a merger for uncommitted changes.
3897
4007
3898
4008
:param tree: The tree the merger should apply to.
3899
4009
:param location: The location containing uncommitted changes.
3900
4010
:param pb: The progress bar to use for showing progress.
3901
:param cleanups: A list of operations to perform to clean up the
3902
temporary directories, unfinalized objects, etc.
3903
4011
"""
3904
4012
location = self._select_branch_location(tree, location)[0]
3905
4013
other_tree, other_path = WorkingTree.open_containing(location)
3957
4065
3958
4066
3959
4067
class cmd_remerge(Command):
3960
"""Redo a merge.
4068
__doc__ = """Redo a merge.
3961
4069
3962
4070
Use this if you want to try a different merge technique while resolving
3963
4071
conflicts. Some merge techniques are better than others, and remerge
3988
4096
3989
4097
def run(self, file_list=None, merge_type=None, show_base=False,
3990
4098
reprocess=False):
4099
from bzrlib.conflicts import restore
3991
4100
if merge_type is None:
3992
4101
merge_type = _mod_merge.Merge3Merger
3993
4102
tree, file_list = tree_files(file_list)
3994
4103
tree.lock_write()
3995
try:
3996
parents = tree.get_parent_ids()
3997
if len(parents) != 2:
3998
raise errors.BzrCommandError("Sorry, remerge only works after normal"
3999
" merges. Not cherrypicking or"
4000
" multi-merges.")
4001
repository = tree.branch.repository
4002
interesting_ids = None
4003
new_conflicts = []
4004
conflicts = tree.conflicts()
4005
if file_list is not None:
4006
interesting_ids = set()
4007
for filename in file_list:
4008
file_id = tree.path2id(filename)
4009
if file_id is None:
4010
raise errors.NotVersionedError(filename)
4011
interesting_ids.add(file_id)
4012
if tree.kind(file_id) != "directory":
4013
continue
4104
self.add_cleanup(tree.unlock)
4105
parents = tree.get_parent_ids()
4106
if len(parents) != 2:
4107
raise errors.BzrCommandError("Sorry, remerge only works after normal"
4108
" merges. Not cherrypicking or"
4109
" multi-merges.")
4110
repository = tree.branch.repository
4111
interesting_ids = None
4112
new_conflicts = []
4113
conflicts = tree.conflicts()
4114
if file_list is not None:
4115
interesting_ids = set()
4116
for filename in file_list:
4117
file_id = tree.path2id(filename)
4118
if file_id is None:
4119
raise errors.NotVersionedError(filename)
4120
interesting_ids.add(file_id)
4121
if tree.kind(file_id) != "directory":
4122
continue
4014
4123
4015
for name, ie in tree.inventory.iter_entries(file_id):
4016
interesting_ids.add(ie.file_id)
4017
new_conflicts = conflicts.select_conflicts(tree, file_list)[0]
4018
else:
4019
# Remerge only supports resolving contents conflicts
4020
allowed_conflicts = ('text conflict', 'contents conflict')
4021
restore_files = [c.path for c in conflicts
4022
if c.typestring in allowed_conflicts]
4023
_mod_merge.transform_tree(tree, tree.basis_tree(), interesting_ids)
4024
tree.set_conflicts(ConflictList(new_conflicts))
4025
if file_list is not None:
4026
restore_files = file_list
4027
for filename in restore_files:
4028
try:
4029
restore(tree.abspath(filename))
4030
except errors.NotConflicted:
4031
pass
4032
# Disable pending merges, because the file texts we are remerging
4033
# have not had those merges performed. If we use the wrong parents
4034
# list, we imply that the working tree text has seen and rejected
4035
# all the changes from the other tree, when in fact those changes
4036
# have not yet been seen.
4037
pb = ui.ui_factory.nested_progress_bar()
4038
tree.set_parent_ids(parents[:1])
4124
for name, ie in tree.inventory.iter_entries(file_id):
4125
interesting_ids.add(ie.file_id)
4126
new_conflicts = conflicts.select_conflicts(tree, file_list)[0]
4127
else:
4128
# Remerge only supports resolving contents conflicts
4129
allowed_conflicts = ('text conflict', 'contents conflict')
4130
restore_files = [c.path for c in conflicts
4131
if c.typestring in allowed_conflicts]
4132
_mod_merge.transform_tree(tree, tree.basis_tree(), interesting_ids)
4133
tree.set_conflicts(ConflictList(new_conflicts))
4134
if file_list is not None:
4135
restore_files = file_list
4136
for filename in restore_files:
4039
4137
try:
4040
merger = _mod_merge.Merger.from_revision_ids(pb,
4041
tree, parents[1])
4042
merger.interesting_ids = interesting_ids
4043
merger.merge_type = merge_type
4044
merger.show_base = show_base
4045
merger.reprocess = reprocess
4046
conflicts = merger.do_merge()
4047
finally:
4048
tree.set_parent_ids(parents)
4049
pb.finished()
4138
restore(tree.abspath(filename))
4139
except errors.NotConflicted:
4140
pass
4141
# Disable pending merges, because the file texts we are remerging
4142
# have not had those merges performed. If we use the wrong parents
4143
# list, we imply that the working tree text has seen and rejected
4144
# all the changes from the other tree, when in fact those changes
4145
# have not yet been seen.
4146
tree.set_parent_ids(parents[:1])
4147
try:
4148
merger = _mod_merge.Merger.from_revision_ids(None, tree, parents[1])
4149
merger.interesting_ids = interesting_ids
4150
merger.merge_type = merge_type
4151
merger.show_base = show_base
4152
merger.reprocess = reprocess
4153
conflicts = merger.do_merge()
4050
4154
finally:
4051
tree.unlock()
4155
tree.set_parent_ids(parents)
4052
4156
if conflicts > 0:
4053
4157
return 1
4054
4158
else:
4056
4160
4057
4161
4058
4162
class cmd_revert(Command):
4059
"""Revert files to a previous revision.
4163
__doc__ = """Revert files to a previous revision.
4060
4164
4061
4165
Giving a list of files will revert only those files. Otherwise, all files
4062
4166
will be reverted. If the revision is not specified with '--revision', the
4081
4185
created as above. Directories containing unknown files will not be
4082
4186
deleted.
4083
4187
4084
The working tree contains a list of pending merged revisions, which will
4085
be included as parents in the next commit. Normally, revert clears that
4086
list as well as reverting the files. If any files are specified, revert
4087
leaves the pending merge list alone and reverts only the files. Use "bzr
4088
revert ." in the tree root to revert all files but keep the merge record,
4089
and "bzr revert --forget-merges" to clear the pending merge list without
4188
The working tree contains a list of revisions that have been merged but
4189
not yet committed. These revisions will be included as additional parents
4190
of the next commit. Normally, using revert clears that list as well as
4191
reverting the files. If any files are specified, revert leaves the list
4192
of uncommitted merges alone and reverts only the files. Use ``bzr revert
4193
.`` in the tree root to revert all files but keep the recorded merges,
4194
and ``bzr revert --forget-merges`` to clear the pending merge list without
4090
4195
reverting any files.
4091
4196
4092
Using "bzr revert --forget-merges", it is possible to apply the changes
4093
from an arbitrary merge as a single revision. To do this, perform the
4094
merge as desired. Then doing revert with the "--forget-merges" option will
4095
keep the content of the tree as it was, but it will clear the list of
4096
pending merges. The next commit will then contain all of the changes that
4097
would have been in the merge, but without any mention of the other parent
4098
revisions. Because this technique forgets where these changes originated,
4099
it may cause additional conflicts on later merges involving the source and
4197
Using "bzr revert --forget-merges", it is possible to apply all of the
4198
changes from a branch in a single revision. To do this, perform the merge
4199
as desired. Then doing revert with the "--forget-merges" option will keep
4200
the content of the tree as it was, but it will clear the list of pending
4201
merges. The next commit will then contain all of the changes that are
4202
present in the other branch, but without any other parent revisions.
4203
Because this technique forgets where these changes originated, it may
4204
cause additional conflicts on later merges involving the same source and
4100
4205
target branches.
4101
4206
"""
4102
4207
4112
4217
def run(self, revision=None, no_backup=False, file_list=None,
4113
4218
forget_merges=None):
4114
4219
tree, file_list = tree_files(file_list)
4115
tree.lock_write()
4116
try:
4117
if forget_merges:
4118
tree.set_parent_ids(tree.get_parent_ids()[:1])
4119
else:
4120
self._revert_tree_to_revision(tree, revision, file_list, no_backup)
4121
finally:
4122
tree.unlock()
4220
tree.lock_tree_write()
4221
self.add_cleanup(tree.unlock)
4222
if forget_merges:
4223
tree.set_parent_ids(tree.get_parent_ids()[:1])
4224
else:
4225
self._revert_tree_to_revision(tree, revision, file_list, no_backup)
4123
4226
4124
4227
@staticmethod
4125
4228
def _revert_tree_to_revision(tree, revision, file_list, no_backup):
4126
4229
rev_tree = _get_one_revision_tree('revert', revision, tree=tree)
4127
pb = ui.ui_factory.nested_progress_bar()
4128
try:
4129
tree.revert(file_list, rev_tree, not no_backup, pb,
4130
report_changes=True)
4131
finally:
4132
pb.finished()
4230
tree.revert(file_list, rev_tree, not no_backup, None,
4231
report_changes=True)
4133
4232
4134
4233
4135
4234
class cmd_assert_fail(Command):
4136
"""Test reporting of assertion failures"""
4235
__doc__ = """Test reporting of assertion failures"""
4137
4236
# intended just for use in testing
4138
4237
4139
4238
hidden = True
4143
4242
4144
4243
4145
4244
class cmd_help(Command):
4146
"""Show help on a command or other topic.
4245
__doc__ = """Show help on a command or other topic.
4147
4246
"""
4148
4247
4149
4248
_see_also = ['topics']
4162
4261
4163
4262
4164
4263
class cmd_shell_complete(Command):
4165
"""Show appropriate completions for context.
4264
__doc__ = """Show appropriate completions for context.
4166
4265
4167
4266
For a list of all available commands, say 'bzr shell-complete'.
4168
4267
"""
4177
4276
4178
4277
4179
4278
class cmd_missing(Command):
4180
"""Show unmerged/unpulled revisions between two branches.
4279
__doc__ = """Show unmerged/unpulled revisions between two branches.
4181
4280
4182
4281
OTHER_BRANCH may be local or remote.
4183
4282
4261
4360
restrict = 'remote'
4262
4361
4263
4362
local_branch = Branch.open_containing(u".")[0]
4363
local_branch.lock_read()
4364
self.add_cleanup(local_branch.unlock)
4365
4264
4366
parent = local_branch.get_parent()
4265
4367
if other_branch is None:
4266
4368
other_branch = parent
4275
4377
remote_branch = Branch.open(other_branch)
4276
4378
if remote_branch.base == local_branch.base:
4277
4379
remote_branch = local_branch
4380
else:
4381
remote_branch.lock_read()
4382
self.add_cleanup(remote_branch.unlock)
4278
4383
4279
4384
local_revid_range = _revision_range_to_revid_range(
4280
4385
_get_revision_range(my_revision, local_branch,
4284
4389
_get_revision_range(revision,
4285
4390
remote_branch, self.name()))
4286
4391
4287
local_branch.lock_read()
4288
try:
4289
remote_branch.lock_read()
4290
try:
4291
local_extra, remote_extra = find_unmerged(
4292
local_branch, remote_branch, restrict,
4293
backward=not reverse,
4294
include_merges=include_merges,
4295
local_revid_range=local_revid_range,
4296
remote_revid_range=remote_revid_range)
4297
4298
if log_format is None:
4299
registry = log.log_formatter_registry
4300
log_format = registry.get_default(local_branch)
4301
lf = log_format(to_file=self.outf,
4302
show_ids=show_ids,
4303
show_timezone='original')
4304
4305
status_code = 0
4306
if local_extra and not theirs_only:
4307
message("You have %d extra revision(s):\n" %
4308
len(local_extra))
4309
for revision in iter_log_revisions(local_extra,
4310
local_branch.repository,
4311
verbose):
4312
lf.log_revision(revision)
4313
printed_local = True
4314
status_code = 1
4315
else:
4316
printed_local = False
4317
4318
if remote_extra and not mine_only:
4319
if printed_local is True:
4320
message("\n\n\n")
4321
message("You are missing %d revision(s):\n" %
4322
len(remote_extra))
4323
for revision in iter_log_revisions(remote_extra,
4324
remote_branch.repository,
4325
verbose):
4326
lf.log_revision(revision)
4327
status_code = 1
4328
4329
if mine_only and not local_extra:
4330
# We checked local, and found nothing extra
4331
message('This branch is up to date.\n')
4332
elif theirs_only and not remote_extra:
4333
# We checked remote, and found nothing extra
4334
message('Other branch is up to date.\n')
4335
elif not (mine_only or theirs_only or local_extra or
4336
remote_extra):
4337
# We checked both branches, and neither one had extra
4338
# revisions
4339
message("Branches are up to date.\n")
4340
finally:
4341
remote_branch.unlock()
4342
finally:
4343
local_branch.unlock()
4392
local_extra, remote_extra = find_unmerged(
4393
local_branch, remote_branch, restrict,
4394
backward=not reverse,
4395
include_merges=include_merges,
4396
local_revid_range=local_revid_range,
4397
remote_revid_range=remote_revid_range)
4398
4399
if log_format is None:
4400
registry = log.log_formatter_registry
4401
log_format = registry.get_default(local_branch)
4402
lf = log_format(to_file=self.outf,
4403
show_ids=show_ids,
4404
show_timezone='original')
4405
4406
status_code = 0
4407
if local_extra and not theirs_only:
4408
message("You have %d extra revision(s):\n" %
4409
len(local_extra))
4410
for revision in iter_log_revisions(local_extra,
4411
local_branch.repository,
4412
verbose):
4413
lf.log_revision(revision)
4414
printed_local = True
4415
status_code = 1
4416
else:
4417
printed_local = False
4418
4419
if remote_extra and not mine_only:
4420
if printed_local is True:
4421
message("\n\n\n")
4422
message("You are missing %d revision(s):\n" %
4423
len(remote_extra))
4424
for revision in iter_log_revisions(remote_extra,
4425
remote_branch.repository,
4426
verbose):
4427
lf.log_revision(revision)
4428
status_code = 1
4429
4430
if mine_only and not local_extra:
4431
# We checked local, and found nothing extra
4432
message('This branch is up to date.\n')
4433
elif theirs_only and not remote_extra:
4434
# We checked remote, and found nothing extra
4435
message('Other branch is up to date.\n')
4436
elif not (mine_only or theirs_only or local_extra or
4437
remote_extra):
4438
# We checked both branches, and neither one had extra
4439
# revisions
4440
message("Branches are up to date.\n")
4441
self.cleanup_now()
4344
4442
if not status_code and parent is None and other_branch is not None:
4345
4443
local_branch.lock_write()
4346
try:
4347
# handle race conditions - a parent might be set while we run.
4348
if local_branch.get_parent() is None:
4349
local_branch.set_parent(remote_branch.base)
4350
finally:
4351
local_branch.unlock()
4444
self.add_cleanup(local_branch.unlock)
4445
# handle race conditions - a parent might be set while we run.
4446
if local_branch.get_parent() is None:
4447
local_branch.set_parent(remote_branch.base)
4352
4448
return status_code
4353
4449
4354
4450
4355
4451
class cmd_pack(Command):
4356
"""Compress the data within a repository."""
4452
__doc__ = """Compress the data within a repository.
4453
4454
This operation compresses the data within a bazaar repository. As
4455
bazaar supports automatic packing of repository, this operation is
4456
normally not required to be done manually.
4457
4458
During the pack operation, bazaar takes a backup of existing repository
4459
data, i.e. pack files. This backup is eventually removed by bazaar
4460
automatically when it is safe to do so. To save disk space by removing
4461
the backed up pack files, the --clean-obsolete-packs option may be
4462
used.
4463
4464
Warning: If you use --clean-obsolete-packs and your machine crashes
4465
during or immediately after repacking, you may be left with a state
4466
where the deletion has been written to disk but the new packs have not
4467
been. In this case the repository may be unusable.
4468
"""
4357
4469
4358
4470
_see_also = ['repositories']
4359
4471
takes_args = ['branch_or_repo?']
4472
takes_options = [
4473
Option('clean-obsolete-packs', 'Delete obsolete packs to save disk space.'),
4474
]
4360
4475
4361
def run(self, branch_or_repo='.'):
4476
def run(self, branch_or_repo='.', clean_obsolete_packs=False):
4362
4477
dir = bzrdir.BzrDir.open_containing(branch_or_repo)[0]
4363
4478
try:
4364
4479
branch = dir.open_branch()
4365
4480
repository = branch.repository
4366
4481
except errors.NotBranchError:
4367
4482
repository = dir.open_repository()
4368
repository.pack()
4483
repository.pack(clean_obsolete_packs=clean_obsolete_packs)
4369
4484
4370
4485
4371
4486
class cmd_plugins(Command):
4372
"""List the installed plugins.
4487
__doc__ = """List the installed plugins.
4373
4488
4374
4489
This command displays the list of installed plugins including
4375
4490
version of plugin and a short description of each.
4382
4497
adding new commands, providing additional network transports and
4383
4498
customizing log output.
4384
4499
4385
See the Bazaar web site, http://bazaar-vcs.org, for further
4386
information on plugins including where to find them and how to
4387
install them. Instructions are also provided there on how to
4388
write new plugins using the Python programming language.
4500
See the Bazaar Plugin Guide <http://doc.bazaar.canonical.com/plugins/en/>
4501
for further information on plugins including where to find them and how to
4502
install them. Instructions are also provided there on how to write new
4503
plugins using the Python programming language.
4389
4504
"""
4390
4505
takes_options = ['verbose']
4391
4506
4406
4521
doc = '(no description)'
4407
4522
result.append((name_ver, doc, plugin.path()))
4408
4523
for name_ver, doc, path in sorted(result):
4409
print name_ver
4410
print ' ', doc
4524
self.outf.write("%s\n" % name_ver)
4525
self.outf.write(" %s\n" % doc)
4411
4526
if verbose:
4412
print ' ', path
4413
print
4527
self.outf.write(" %s\n" % path)
4528
self.outf.write("\n")
4414
4529
4415
4530
4416
4531
class cmd_testament(Command):
4417
"""Show testament (signing-form) of a revision."""
4532
__doc__ = """Show testament (signing-form) of a revision."""
4418
4533
takes_options = [
4419
4534
'revision',
4420
4535
Option('long', help='Produce long-format testament.'),
4433
4548
else:
4434
4549
b = Branch.open(branch)
4435
4550
b.lock_read()
4436
try:
4437
if revision is None:
4438
rev_id = b.last_revision()
4439
else:
4440
rev_id = revision[0].as_revision_id(b)
4441
t = testament_class.from_revision(b.repository, rev_id)
4442
if long:
4443
sys.stdout.writelines(t.as_text_lines())
4444
else:
4445
sys.stdout.write(t.as_short_text())
4446
finally:
4447
b.unlock()
4551
self.add_cleanup(b.unlock)
4552
if revision is None:
4553
rev_id = b.last_revision()
4554
else:
4555
rev_id = revision[0].as_revision_id(b)
4556
t = testament_class.from_revision(b.repository, rev_id)
4557
if long:
4558
sys.stdout.writelines(t.as_text_lines())
4559
else:
4560
sys.stdout.write(t.as_short_text())
4448
4561
4449
4562
4450
4563
class cmd_annotate(Command):
4451
"""Show the origin of each line in a file.
4564
__doc__ = """Show the origin of each line in a file.
4452
4565
4453
4566
This prints out the given file with an annotation on the left side
4454
4567
indicating which revision, author and date introduced the change.
4476
4589
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
4477
4590
if wt is not None:
4478
4591
wt.lock_read()
4592
self.add_cleanup(wt.unlock)
4479
4593
else:
4480
4594
branch.lock_read()
4481
try:
4482
tree = _get_one_revision_tree('annotate', revision, branch=branch)
4483
if wt is not None:
4484
file_id = wt.path2id(relpath)
4485
else:
4486
file_id = tree.path2id(relpath)
4487
if file_id is None:
4488
raise errors.NotVersionedError(filename)
4489
file_version = tree.inventory[file_id].revision
4490
if wt is not None and revision is None:
4491
# If there is a tree and we're not annotating historical
4492
# versions, annotate the working tree's content.
4493
annotate_file_tree(wt, file_id, self.outf, long, all,
4494
show_ids=show_ids)
4495
else:
4496
annotate_file(branch, file_version, file_id, long, all, self.outf,
4497
show_ids=show_ids)
4498
finally:
4499
if wt is not None:
4500
wt.unlock()
4501
else:
4502
branch.unlock()
4595
self.add_cleanup(branch.unlock)
4596
tree = _get_one_revision_tree('annotate', revision, branch=branch)
4597
tree.lock_read()
4598
self.add_cleanup(tree.unlock)
4599
if wt is not None:
4600
file_id = wt.path2id(relpath)
4601
else:
4602
file_id = tree.path2id(relpath)
4603
if file_id is None:
4604
raise errors.NotVersionedError(filename)
4605
file_version = tree.inventory[file_id].revision
4606
if wt is not None and revision is None:
4607
# If there is a tree and we're not annotating historical
4608
# versions, annotate the working tree's content.
4609
annotate_file_tree(wt, file_id, self.outf, long, all,
4610
show_ids=show_ids)
4611
else:
4612
annotate_file(branch, file_version, file_id, long, all, self.outf,
4613
show_ids=show_ids)
4503
4614
4504
4615
4505
4616
class cmd_re_sign(Command):
4506
"""Create a digital signature for an existing revision."""
4617
__doc__ = """Create a digital signature for an existing revision."""
4507
4618
# TODO be able to replace existing ones.
4508
4619
4509
4620
hidden = True # is this right ?
4517
4628
raise errors.BzrCommandError('You must supply either --revision or a revision_id')
4518
4629
b = WorkingTree.open_containing(u'.')[0].branch
4519
4630
b.lock_write()
4520
try:
4521
return self._run(b, revision_id_list, revision)
4522
finally:
4523
b.unlock()
4631
self.add_cleanup(b.unlock)
4632
return self._run(b, revision_id_list, revision)
4524
4633
4525
4634
def _run(self, b, revision_id_list, revision):
4526
4635
import bzrlib.gpg as gpg
4571
4680
4572
4681
4573
4682
class cmd_bind(Command):
4574
"""Convert the current branch into a checkout of the supplied branch.
4683
__doc__ = """Convert the current branch into a checkout of the supplied branch.
4684
If no branch is supplied, rebind to the last bound location.
4575
4685
4576
4686
Once converted into a checkout, commits must succeed on the master branch
4577
4687
before they will be applied to the local branch.
4595
4705
'This format does not remember old locations.')
4596
4706
else:
4597
4707
if location is None:
4598
raise errors.BzrCommandError('No location supplied and no '
4599
'previous location known')
4708
if b.get_bound_location() is not None:
4709
raise errors.BzrCommandError('Branch is already bound')
4710
else:
4711
raise errors.BzrCommandError('No location supplied '
4712
'and no previous location known')
4600
4713
b_other = Branch.open(location)
4601
4714
try:
4602
4715
b.bind(b_other)
4608
4721
4609
4722
4610
4723
class cmd_unbind(Command):
4611
"""Convert the current checkout into a regular branch.
4724
__doc__ = """Convert the current checkout into a regular branch.
4612
4725
4613
4726
After unbinding, the local branch is considered independent and subsequent
4614
4727
commits will be local only.
4625
4738
4626
4739
4627
4740
class cmd_uncommit(Command):
4628
"""Remove the last committed revision.
4741
__doc__ = """Remove the last committed revision.
4629
4742
4630
4743
--verbose will print out what is being removed.
4631
4744
--dry-run will go through all the motions, but not actually
4672
4785
4673
4786
if tree is not None:
4674
4787
tree.lock_write()
4788
self.add_cleanup(tree.unlock)
4675
4789
else:
4676
4790
b.lock_write()
4677
try:
4678
return self._run(b, tree, dry_run, verbose, revision, force,
4679
local=local)
4680
finally:
4681
if tree is not None:
4682
tree.unlock()
4683
else:
4684
b.unlock()
4791
self.add_cleanup(b.unlock)
4792
return self._run(b, tree, dry_run, verbose, revision, force, local=local)
4685
4793
4686
4794
def _run(self, b, tree, dry_run, verbose, revision, force, local=False):
4687
4795
from bzrlib.log import log_formatter, show_log
4719
4827
end_revision=last_revno)
4720
4828
4721
4829
if dry_run:
4722
print 'Dry-run, pretending to remove the above revisions.'
4723
if not force:
4724
val = raw_input('Press <enter> to continue')
4830
self.outf.write('Dry-run, pretending to remove'
4831
' the above revisions.\n')
4725
4832
else:
4726
print 'The above revision(s) will be removed.'
4727
if not force:
4728
val = raw_input('Are you sure [y/N]? ')
4729
if val.lower() not in ('y', 'yes'):
4730
print 'Canceled'
4731
return 0
4833
self.outf.write('The above revision(s) will be removed.\n')
4834
4835
if not force:
4836
if not ui.ui_factory.get_boolean('Are you sure'):
4837
self.outf.write('Canceled')
4838
return 0
4732
4839
4733
4840
mutter('Uncommitting from {%s} to {%s}',
4734
4841
last_rev_id, rev_id)
4735
4842
uncommit(b, tree=tree, dry_run=dry_run, verbose=verbose,
4736
4843
revno=revno, local=local)
4737
note('You can restore the old tip by running:\n'
4738
' bzr pull . -r revid:%s', last_rev_id)
4844
self.outf.write('You can restore the old tip by running:\n'
4845
' bzr pull . -r revid:%s\n' % last_rev_id)
4739
4846
4740
4847
4741
4848
class cmd_break_lock(Command):
4742
"""Break a dead lock on a repository, branch or working directory.
4849
__doc__ = """Break a dead lock on a repository, branch or working directory.
4743
4850
4744
4851
CAUTION: Locks should only be broken when you are sure that the process
4745
4852
holding the lock has been stopped.
4746
4853
4747
You can get information on what locks are open via the 'bzr info' command.
4854
You can get information on what locks are open via the 'bzr info
4855
[location]' command.
4748
4856
4749
4857
:Examples:
4750
4858
bzr break-lock
4859
bzr break-lock bzr+ssh://example.com/bzr/foo
4751
4860
"""
4752
4861
takes_args = ['location?']
4753
4862
4762
4871
4763
4872
4764
4873
class cmd_wait_until_signalled(Command):
4765
"""Test helper for test_start_and_stop_bzr_subprocess_send_signal.
4874
__doc__ = """Test helper for test_start_and_stop_bzr_subprocess_send_signal.
4766
4875
4767
4876
This just prints a line to signal when it is ready, then blocks on stdin.
4768
4877
"""
4776
4885
4777
4886
4778
4887
class cmd_serve(Command):
4779
"""Run the bzr server."""
4888
__doc__ = """Run the bzr server."""
4780
4889
4781
4890
aliases = ['server']
4782
4891
4842
4951
4843
4952
4844
4953
class cmd_join(Command):
4845
"""Combine a tree into its containing tree.
4954
__doc__ = """Combine a tree into its containing tree.
4846
4955
4847
4956
This command requires the target tree to be in a rich-root format.
4848
4957
4888
4997
4889
4998
4890
4999
class cmd_split(Command):
4891
"""Split a subdirectory of a tree into a separate tree.
5000
__doc__ = """Split a subdirectory of a tree into a separate tree.
4892
5001
4893
5002
This command will produce a target tree in a format that supports
4894
5003
rich roots, like 'rich-root' or 'rich-root-pack'. These formats cannot be
4914
5023
4915
5024
4916
5025
class cmd_merge_directive(Command):
4917
"""Generate a merge directive for auto-merge tools.
5026
__doc__ = """Generate a merge directive for auto-merge tools.
4918
5027
4919
5028
A directive requests a merge to be performed, and also provides all the
4920
5029
information necessary to do so. This means it must either include a
5013
5122
5014
5123
5015
5124
class cmd_send(Command):
5016
"""Mail or create a merge-directive for submitting changes.
5125
__doc__ = """Mail or create a merge-directive for submitting changes.
5017
5126
5018
5127
A merge directive provides many things needed for requesting merges:
5019
5128
5025
5134
directly from the merge directive, without retrieving data from a
5026
5135
branch.
5027
5136
5028
If --no-bundle is specified, then public_branch is needed (and must be
5029
up-to-date), so that the receiver can perform the merge using the
5030
public_branch. The public_branch is always included if known, so that
5031
people can check it later.
5032
5033
The submit branch defaults to the parent, but can be overridden. Both
5034
submit branch and public branch will be remembered if supplied.
5035
5036
If a public_branch is known for the submit_branch, that public submit
5037
branch is used in the merge instructions. This means that a local mirror
5038
can be used as your actual submit branch, once you have set public_branch
5039
for that mirror.
5137
`bzr send` creates a compact data set that, when applied using bzr
5138
merge, has the same effect as merging from the source branch.
5139
5140
By default the merge directive is self-contained and can be applied to any
5141
branch containing submit_branch in its ancestory without needing access to
5142
the source branch.
5143
5144
If --no-bundle is specified, then Bazaar doesn't send the contents of the
5145
revisions, but only a structured request to merge from the
5146
public_location. In that case the public_branch is needed and it must be
5147
up-to-date and accessible to the recipient. The public_branch is always
5148
included if known, so that people can check it later.
5149
5150
The submit branch defaults to the parent of the source branch, but can be
5151
overridden. Both submit branch and public branch will be remembered in
5152
branch.conf the first time they are used for a particular branch. The
5153
source branch defaults to that containing the working directory, but can
5154
be changed using --from.
5155
5156
In order to calculate those changes, bzr must analyse the submit branch.
5157
Therefore it is most efficient for the submit branch to be a local mirror.
5158
If a public location is known for the submit_branch, that location is used
5159
in the merge directive.
5160
5161
The default behaviour is to send the merge directive by mail, unless -o is
5162
given, in which case it is sent to a file.
5040
5163
5041
5164
Mail is sent using your preferred mail program. This should be transparent
5042
5165
on Windows (it uses MAPI). On Linux, it requires the xdg-email utility.
5062
5185
5063
5186
The merge directives created by bzr send may be applied using bzr merge or
5064
5187
bzr pull by specifying a file containing a merge directive as the location.
5188
5189
bzr send makes extensive use of public locations to map local locations into
5190
URLs that can be used by other people. See `bzr help configuration` to
5191
set them, and use `bzr info` to display them.
5065
5192
"""
5066
5193
5067
5194
encoding_type = 'exact'
5083
5210
short_name='f',
5084
5211
type=unicode),
5085
5212
Option('output', short_name='o',
5086
help='Write merge directive to this file; '
5213
help='Write merge directive to this file or directory; '
5087
5214
'use - for stdout.',
5088
5215
type=unicode),
5089
5216
Option('strict',
5112
5239
5113
5240
5114
5241
class cmd_bundle_revisions(cmd_send):
5115
"""Create a merge-directive for submitting changes.
5242
__doc__ = """Create a merge-directive for submitting changes.
5116
5243
5117
5244
A merge directive provides many things needed for requesting merges:
5118
5245
5185
5312
5186
5313
5187
5314
class cmd_tag(Command):
5188
"""Create, remove or modify a tag naming a revision.
5315
__doc__ = """Create, remove or modify a tag naming a revision.
5189
5316
5190
5317
Tags give human-meaningful names to revisions. Commands that take a -r
5191
5318
(--revision) option can be given -rtag:X, where X is any previously
5199
5326
5200
5327
To rename a tag (change the name but keep it on the same revsion), run ``bzr
5201
5328
tag new-name -r tag:old-name`` and then ``bzr tag --delete oldname``.
5329
5330
If no tag name is specified it will be determined through the
5331
'automatic_tag_name' hook. This can e.g. be used to automatically tag
5332
upstream releases by reading configure.ac. See ``bzr help hooks`` for
5333
details.
5202
5334
"""
5203
5335
5204
5336
_see_also = ['commit', 'tags']
5205
takes_args = ['tag_name']
5337
takes_args = ['tag_name?']
5206
5338
takes_options = [
5207
5339
Option('delete',
5208
5340
help='Delete this tag rather than placing it.',
5218
5350
'revision',
5219
5351
]
5220
5352
5221
def run(self, tag_name,
5353
def run(self, tag_name=None,
5222
5354
delete=None,
5223
5355
directory='.',
5224
5356
force=None,
5226
5358
):
5227
5359
branch, relpath = Branch.open_containing(directory)
5228
5360
branch.lock_write()
5229
try:
5230
if delete:
5231
branch.tags.delete_tag(tag_name)
5232
self.outf.write('Deleted tag %s.\n' % tag_name)
5361
self.add_cleanup(branch.unlock)
5362
if delete:
5363
if tag_name is None:
5364
raise errors.BzrCommandError("No tag specified to delete.")
5365
branch.tags.delete_tag(tag_name)
5366
self.outf.write('Deleted tag %s.\n' % tag_name)
5367
else:
5368
if revision:
5369
if len(revision) != 1:
5370
raise errors.BzrCommandError(
5371
"Tags can only be placed on a single revision, "
5372
"not on a range")
5373
revision_id = revision[0].as_revision_id(branch)
5233
5374
else:
5234
if revision:
5235
if len(revision) != 1:
5236
raise errors.BzrCommandError(
5237
"Tags can only be placed on a single revision, "
5238
"not on a range")
5239
revision_id = revision[0].as_revision_id(branch)
5240
else:
5241
revision_id = branch.last_revision()
5242
if (not force) and branch.tags.has_tag(tag_name):
5243
raise errors.TagAlreadyExists(tag_name)
5244
branch.tags.set_tag(tag_name, revision_id)
5245
self.outf.write('Created tag %s.\n' % tag_name)
5246
finally:
5247
branch.unlock()
5375
revision_id = branch.last_revision()
5376
if tag_name is None:
5377
tag_name = branch.automatic_tag_name(revision_id)
5378
if tag_name is None:
5379
raise errors.BzrCommandError(
5380
"Please specify a tag name.")
5381
if (not force) and branch.tags.has_tag(tag_name):
5382
raise errors.TagAlreadyExists(tag_name)
5383
branch.tags.set_tag(tag_name, revision_id)
5384
self.outf.write('Created tag %s.\n' % tag_name)
5248
5385
5249
5386
5250
5387
class cmd_tags(Command):
5251
"""List tags.
5388
__doc__ = """List tags.
5252
5389
5253
5390
This command shows a table of tag names and the revisions they reference.
5254
5391
"""
5283
5420
return
5284
5421
5285
5422
branch.lock_read()
5286
try:
5287
if revision:
5288
graph = branch.repository.get_graph()
5289
rev1, rev2 = _get_revision_range(revision, branch, self.name())
5290
revid1, revid2 = rev1.rev_id, rev2.rev_id
5291
# only show revisions between revid1 and revid2 (inclusive)
5292
tags = [(tag, revid) for tag, revid in tags if
5293
graph.is_between(revid, revid1, revid2)]
5294
if sort == 'alpha':
5295
tags.sort()
5296
elif sort == 'time':
5297
timestamps = {}
5298
for tag, revid in tags:
5299
try:
5300
revobj = branch.repository.get_revision(revid)
5301
except errors.NoSuchRevision:
5302
timestamp = sys.maxint # place them at the end
5303
else:
5304
timestamp = revobj.timestamp
5305
timestamps[revid] = timestamp
5306
tags.sort(key=lambda x: timestamps[x[1]])
5307
if not show_ids:
5308
# [ (tag, revid), ... ] -> [ (tag, dotted_revno), ... ]
5309
for index, (tag, revid) in enumerate(tags):
5310
try:
5311
revno = branch.revision_id_to_dotted_revno(revid)
5312
if isinstance(revno, tuple):
5313
revno = '.'.join(map(str, revno))
5314
except errors.NoSuchRevision:
5315
# Bad tag data/merges can lead to tagged revisions
5316
# which are not in this branch. Fail gracefully ...
5317
revno = '?'
5318
tags[index] = (tag, revno)
5319
finally:
5320
branch.unlock()
5423
self.add_cleanup(branch.unlock)
5424
if revision:
5425
graph = branch.repository.get_graph()
5426
rev1, rev2 = _get_revision_range(revision, branch, self.name())
5427
revid1, revid2 = rev1.rev_id, rev2.rev_id
5428
# only show revisions between revid1 and revid2 (inclusive)
5429
tags = [(tag, revid) for tag, revid in tags if
5430
graph.is_between(revid, revid1, revid2)]
5431
if sort == 'alpha':
5432
tags.sort()
5433
elif sort == 'time':
5434
timestamps = {}
5435
for tag, revid in tags:
5436
try:
5437
revobj = branch.repository.get_revision(revid)
5438
except errors.NoSuchRevision:
5439
timestamp = sys.maxint # place them at the end
5440
else:
5441
timestamp = revobj.timestamp
5442
timestamps[revid] = timestamp
5443
tags.sort(key=lambda x: timestamps[x[1]])
5444
if not show_ids:
5445
# [ (tag, revid), ... ] -> [ (tag, dotted_revno), ... ]
5446
for index, (tag, revid) in enumerate(tags):
5447
try:
5448
revno = branch.revision_id_to_dotted_revno(revid)
5449
if isinstance(revno, tuple):
5450
revno = '.'.join(map(str, revno))
5451
except errors.NoSuchRevision:
5452
# Bad tag data/merges can lead to tagged revisions
5453
# which are not in this branch. Fail gracefully ...
5454
revno = '?'
5455
tags[index] = (tag, revno)
5456
self.cleanup_now()
5321
5457
for tag, revspec in tags:
5322
5458
self.outf.write('%-20s %s\n' % (tag, revspec))
5323
5459
5324
5460
5325
5461
class cmd_reconfigure(Command):
5326
"""Reconfigure the type of a bzr directory.
5462
__doc__ = """Reconfigure the type of a bzr directory.
5327
5463
5328
5464
A target configuration must be specified.
5329
5465
5414
5550
5415
5551
5416
5552
class cmd_switch(Command):
5417
"""Set the branch of a checkout and update.
5553
__doc__ = """Set the branch of a checkout and update.
5418
5554
5419
5555
For lightweight checkouts, this changes the branch being referenced.
5420
5556
For heavyweight checkouts, this checks that there are no local commits
5436
5572
that of the master.
5437
5573
"""
5438
5574
5439
takes_args = ['to_location']
5575
takes_args = ['to_location?']
5440
5576
takes_options = [Option('force',
5441
5577
help='Switch even if local commits will be lost.'),
5578
'revision',
5442
5579
Option('create-branch', short_name='b',
5443
5580
help='Create the target branch from this one before'
5444
5581
' switching to it.'),
5445
]
5582
]
5446
5583
5447
def run(self, to_location, force=False, create_branch=False):
5584
def run(self, to_location=None, force=False, create_branch=False,
5585
revision=None):
5448
5586
from bzrlib import switch
5449
5587
tree_location = '.'
5588
revision = _get_one_revision('switch', revision)
5450
5589
control_dir = bzrdir.BzrDir.open_containing(tree_location)[0]
5590
if to_location is None:
5591
if revision is None:
5592
raise errors.BzrCommandError('You must supply either a'
5593
' revision or a location')
5594
to_location = '.'
5451
5595
try:
5452
5596
branch = control_dir.open_branch()
5453
5597
had_explicit_nick = branch.get_config().has_explicit_nickname()
5458
5602
if branch is None:
5459
5603
raise errors.BzrCommandError('cannot create branch without'
5460
5604
' source branch')
5605
to_location = directory_service.directories.dereference(
5606
to_location)
5461
5607
if '/' not in to_location and '\\' not in to_location:
5462
5608
# This path is meant to be relative to the existing branch
5463
5609
this_url = self._get_branch_location(control_dir)
5465
5611
to_branch = branch.bzrdir.sprout(to_location,
5466
5612
possible_transports=[branch.bzrdir.root_transport],
5467
5613
source_branch=branch).open_branch()
5468
# try:
5469
# from_branch = control_dir.open_branch()
5470
# except errors.NotBranchError:
5471
# raise BzrCommandError('Cannot create a branch from this'
5472
# ' location when we cannot open this branch')
5473
# from_branch.bzrdir.sprout(
5474
pass
5475
5614
else:
5476
5615
try:
5477
5616
to_branch = Branch.open(to_location)
5479
5618
this_url = self._get_branch_location(control_dir)
5480
5619
to_branch = Branch.open(
5481
5620
urlutils.join(this_url, '..', to_location))
5482
switch.switch(control_dir, to_branch, force)
5621
if revision is not None:
5622
revision = revision.as_revision_id(to_branch)
5623
switch.switch(control_dir, to_branch, force, revision_id=revision)
5483
5624
if had_explicit_nick:
5484
5625
branch = control_dir.open_branch() #get the new branch!
5485
5626
branch.nick = to_branch.nick
5505
5646
5506
5647
5507
5648
class cmd_view(Command):
5508
"""Manage filtered views.
5649
__doc__ = """Manage filtered views.
5509
5650
5510
5651
Views provide a mask over the tree so that users can focus on
5511
5652
a subset of a tree when doing their work. After creating a view,
5659
5800
5660
5801
5661
5802
class cmd_hooks(Command):
5662
"""Show hooks."""
5803
__doc__ = """Show hooks."""
5663
5804
5664
5805
hidden = True
5665
5806
5678
5819
self.outf.write(" <no hooks installed>\n")
5679
5820
5680
5821
5822
class cmd_remove_branch(Command):
5823
__doc__ = """Remove a branch.
5824
5825
This will remove the branch from the specified location but
5826
will keep any working tree or repository in place.
5827
5828
:Examples:
5829
5830
Remove the branch at repo/trunk::
5831
5832
bzr remove-branch repo/trunk
5833
5834
"""
5835
5836
takes_args = ["location?"]
5837
5838
aliases = ["rmbranch"]
5839
5840
def run(self, location=None):
5841
if location is None:
5842
location = "."
5843
branch = Branch.open_containing(location)[0]
5844
branch.bzrdir.destroy_branch()
5845
5846
5681
5847
class cmd_shelve(Command):
5682
"""Temporarily set aside some changes from the current tree.
5848
__doc__ = """Temporarily set aside some changes from the current tree.
5683
5849
5684
5850
Shelve allows you to temporarily put changes you've made "on the shelf",
5685
5851
ie. out of the way, until a later time when you can bring them back from
5739
5905
def run_for_list(self):
5740
5906
tree = WorkingTree.open_containing('.')[0]
5741
5907
tree.lock_read()
5742
try:
5743
manager = tree.get_shelf_manager()
5744
shelves = manager.active_shelves()
5745
if len(shelves) == 0:
5746
note('No shelved changes.')
5747
return 0
5748
for shelf_id in reversed(shelves):
5749
message = manager.get_metadata(shelf_id).get('message')
5750
if message is None:
5751
message = '<no message>'
5752
self.outf.write('%3d: %s\n' % (shelf_id, message))
5753
return 1
5754
finally:
5755
tree.unlock()
5908
self.add_cleanup(tree.unlock)
5909
manager = tree.get_shelf_manager()
5910
shelves = manager.active_shelves()
5911
if len(shelves) == 0:
5912
note('No shelved changes.')
5913
return 0
5914
for shelf_id in reversed(shelves):
5915
message = manager.get_metadata(shelf_id).get('message')
5916
if message is None:
5917
message = '<no message>'
5918
self.outf.write('%3d: %s\n' % (shelf_id, message))
5919
return 1
5756
5920
5757
5921
5758
5922
class cmd_unshelve(Command):
5759
"""Restore shelved changes.
5923
__doc__ = """Restore shelved changes.
5760
5924
5761
5925
By default, the most recently shelved changes are restored. However if you
5762
5926
specify a shelf by id those changes will be restored instead. This works
5770
5934
enum_switch=False, value_switches=True,
5771
5935
apply="Apply changes and remove from the shelf.",
5772
5936
dry_run="Show changes, but do not apply or remove them.",
5773
delete_only="Delete changes without applying them."
5937
preview="Instead of unshelving the changes, show the diff that "
5938
"would result from unshelving.",
5939
delete_only="Delete changes without applying them.",
5940
keep="Apply changes but don't delete them.",
5774
5941
)
5775
5942
]
5776
5943
_see_also = ['shelve']
5785
5952
5786
5953
5787
5954
class cmd_clean_tree(Command):
5788
"""Remove unwanted files from working tree.
5955
__doc__ = """Remove unwanted files from working tree.
5789
5956
5790
5957
By default, only unknown files, not ignored files, are deleted. Versioned
5791
5958
files are never deleted.
5819
5986
5820
5987
5821
5988
class cmd_reference(Command):
5822
"""list, view and set branch locations for nested trees.
5989
__doc__ = """list, view and set branch locations for nested trees.
5823
5990
5824
5991
If no arguments are provided, lists the branch locations for nested trees.
5825
5992
If one argument is provided, display the branch location for that tree.
5865
6032
self.outf.write('%s %s\n' % (path, location))
5866
6033
5867
6034
5868
# these get imported and then picked up by the scan for cmd_*
5869
# TODO: Some more consistent way to split command definitions across files;
5870
# we do need to load at least some information about them to know of
5871
# aliases. ideally we would avoid loading the implementation until the
5872
# details were needed.
5873
from bzrlib.cmd_version_info import cmd_version_info
5874
from bzrlib.conflicts import cmd_resolve, cmd_conflicts, restore
5875
from bzrlib.bundle.commands import (
5876
cmd_bundle_info,
5877
)
5878
from bzrlib.foreign import cmd_dpush
5879
from bzrlib.sign_my_commits import cmd_sign_my_commits
5880
from bzrlib.weave_commands import cmd_versionedfile_list, \
5881
cmd_weave_plan_merge, cmd_weave_merge_text
6035
def _register_lazy_builtins():
6036
# register lazy builtins from other modules; called at startup and should
6037
# be only called once.
6038
for (name, aliases, module_name) in [
6039
('cmd_bundle_info', [], 'bzrlib.bundle.commands'),
6040
('cmd_dpush', [], 'bzrlib.foreign'),
6041
('cmd_version_info', [], 'bzrlib.cmd_version_info'),
6042
('cmd_resolve', ['resolved'], 'bzrlib.conflicts'),
6043
('cmd_conflicts', [], 'bzrlib.conflicts'),
6044
('cmd_sign_my_commits', [], 'bzrlib.sign_my_commits'),
6045
]:
6046
builtin_command_registry.register_lazy(name, aliases, module_name)
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0