« back to all changes in this revision
Viewing changes to bzrlib/builtins.py
- browse files at revision 4922
- compare with another revision
- download diff
- download tarball
- view history from revision 4922
- Committer: Canonical.com Patch Queue Manager
- Date: 2009-12-23 05:04:12 UTC
- mfrom: (4913.3.8 2.1.0rc1-permute-for-extension)
- Revision ID: pqm@pqm.ubuntu.com-20091223050412-z05afly8exkncg8b
(jam) Add bzrlib.tests.permute_for_extension to simplify extension
testing.
testing.
- files added:
- bzrlib/weave_commands.py
- files removed:
- .testr.conf
- apport
- bzrlib/help_topics/es
- bzrlib/plugins/news_merge
- bzrlib/plugins/news_merge/tests
- bzrlib/tests/per_bzrdir_colo
- doc/en/whats-new
- files renamed:
- bzrlib/help_topics/en/conflict-types.txt => bzrlib/help_topics/en/conflicts.txt
- bzrlib/help_topics/es/conflict-types.txt => doc/es/user-guide/resolving_conflicts.txt
- files modified:
- .bzrignore
added
removed
bzrlib/builtins.py
1
# Copyright (C) 2005-2010 Canonical Ltd
1
# Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
54
54
)
55
55
from bzrlib.branch import Branch
56
56
from bzrlib.conflicts import ConflictList
57
from bzrlib.transport import memory
58
57
from bzrlib.revisionspec import RevisionSpec, RevisionInfo
59
58
from bzrlib.smtp_connection import SMTPConnection
60
59
from bzrlib.workingtree import WorkingTree
61
60
""")
62
61
63
from bzrlib.commands import (
64
Command,
65
builtin_command_registry,
66
display_command,
67
)
62
from bzrlib.commands import Command, display_command
68
63
from bzrlib.option import (
69
64
ListOption,
70
65
Option,
239
234
# opens the branch?)
240
235
241
236
class cmd_status(Command):
242
__doc__ = """Display status summary.
237
"""Display status summary.
243
238
244
239
This reports on versioned and unknown files, reporting them
245
240
grouped by state. Possible states are:
332
327
333
328
334
329
class cmd_cat_revision(Command):
335
__doc__ = """Write out metadata for a revision.
330
"""Write out metadata for a revision.
336
331
337
332
The revision to print can either be specified by a specific
338
333
revision identifier, or you can use --revision.
344
339
# cat-revision is more for frontends so should be exact
345
340
encoding = 'strict'
346
341
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
355
342
@display_command
356
343
def run(self, revision_id=None, revision=None):
357
344
if revision_id is not None and revision is not None:
362
349
' --revision or a revision_id')
363
350
b = WorkingTree.open_containing(u'.')[0].branch
364
351
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')
352
# TODO: jam 20060112 should cat-revision always output utf-8?
353
if revision_id is not None:
354
revision_id = osutils.safe_revision_id(revision_id, warn=False)
355
try:
356
self.outf.write(b.repository.get_revision_xml(revision_id).decode('utf-8'))
357
except errors.NoSuchRevision:
358
msg = "The repository %s contains no revision %s." % (b.repository.base,
359
revision_id)
360
raise errors.BzrCommandError(msg)
361
elif revision is not None:
362
for rev in revision:
363
if rev is None:
364
raise errors.BzrCommandError('You cannot specify a NULL'
365
' revision.')
366
rev_id = rev.as_revision_id(b)
367
self.outf.write(b.repository.get_revision_xml(rev_id).decode('utf-8'))
369
368
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
391
369
392
370
class cmd_dump_btree(Command):
393
__doc__ = """Dump the contents of a btree index file to stdout.
371
"""Dump the contents of a btree index file to stdout.
394
372
395
373
PATH is a btree index file, it can be any URL. This includes things like
396
374
.bzr/repository/pack-names, or .bzr/repository/indices/a34b3a...ca4a4.iix
460
438
for node in bt.iter_all_entries():
461
439
# Node is made up of:
462
440
# (index, key, value, [references])
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
refs_as_tuples = static_tuple.as_tuples(node[3])
469
442
as_tuple = (tuple(node[1]), node[2], refs_as_tuples)
470
443
self.outf.write('%s\n' % (as_tuple,))
471
444
472
445
473
446
class cmd_remove_tree(Command):
474
__doc__ = """Remove the working tree from a given branch/checkout.
447
"""Remove the working tree from a given branch/checkout.
475
448
476
449
Since a lightweight checkout is little more than a working tree
477
450
this will refuse to run against one.
479
452
To re-create the working tree, use "bzr checkout".
480
453
"""
481
454
_see_also = ['checkout', 'working-trees']
482
takes_args = ['location*']
455
takes_args = ['location?']
483
456
takes_options = [
484
457
Option('force',
485
458
help='Remove the working tree even if it has '
486
459
'uncommitted changes.'),
487
460
]
488
461
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()
462
def run(self, location='.', force=False):
463
d = bzrdir.BzrDir.open(location)
464
465
try:
466
working = d.open_workingtree()
467
except errors.NoWorkingTree:
468
raise errors.BzrCommandError("No working tree to remove")
469
except errors.NotLocalUrl:
470
raise errors.BzrCommandError("You cannot remove the working tree"
471
" of a remote path")
472
if not force:
473
if (working.has_changes()):
474
raise errors.UncommittedChanges(working)
475
476
working_path = working.bzrdir.root_transport.base
477
branch_path = working.branch.bzrdir.root_transport.base
478
if working_path != branch_path:
479
raise errors.BzrCommandError("You cannot remove the working tree"
480
" from a lightweight checkout")
481
482
d.destroy_workingtree()
512
483
513
484
514
485
class cmd_revno(Command):
515
__doc__ = """Show current revision number.
486
"""Show current revision number.
516
487
517
488
This is equal to the number of revisions on this branch.
518
489
"""
531
502
wt.lock_read()
532
503
except (errors.NoWorkingTree, errors.NotLocalUrl):
533
504
raise errors.NoWorkingTree(location)
534
self.add_cleanup(wt.unlock)
535
revid = wt.last_revision()
536
505
try:
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)
506
revid = wt.last_revision()
507
try:
508
revno_t = wt.branch.revision_id_to_dotted_revno(revid)
509
except errors.NoSuchRevision:
510
revno_t = ('???',)
511
revno = ".".join(str(n) for n in revno_t)
512
finally:
513
wt.unlock()
541
514
else:
542
515
b = Branch.open_containing(location)[0]
543
516
b.lock_read()
544
self.add_cleanup(b.unlock)
545
revno = b.revno()
546
self.cleanup_now()
517
try:
518
revno = b.revno()
519
finally:
520
b.unlock()
521
547
522
self.outf.write(str(revno) + '\n')
548
523
549
524
550
525
class cmd_revision_info(Command):
551
__doc__ = """Show revision number and revision id for a given revision identifier.
526
"""Show revision number and revision id for a given revision identifier.
552
527
"""
553
528
hidden = True
554
529
takes_args = ['revision_info*']
571
546
wt = WorkingTree.open_containing(directory)[0]
572
547
b = wt.branch
573
548
wt.lock_read()
574
self.add_cleanup(wt.unlock)
575
549
except (errors.NoWorkingTree, errors.NotLocalUrl):
576
550
wt = None
577
551
b = Branch.open_containing(directory)[0]
578
552
b.lock_read()
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())
553
try:
554
revision_ids = []
555
if revision is not None:
556
revision_ids.extend(rev.as_revision_id(b) for rev in revision)
557
if revision_info_list is not None:
558
for rev_str in revision_info_list:
559
rev_spec = RevisionSpec.from_string(rev_str)
560
revision_ids.append(rev_spec.as_revision_id(b))
561
# No arguments supplied, default to the last revision
562
if len(revision_ids) == 0:
563
if tree:
564
if wt is None:
565
raise errors.NoWorkingTree(directory)
566
revision_ids.append(wt.last_revision())
567
else:
568
revision_ids.append(b.last_revision())
569
570
revinfos = []
571
maxlen = 0
572
for revision_id in revision_ids:
573
try:
574
dotted_revno = b.revision_id_to_dotted_revno(revision_id)
575
revno = '.'.join(str(i) for i in dotted_revno)
576
except errors.NoSuchRevision:
577
revno = '???'
578
maxlen = max(maxlen, len(revno))
579
revinfos.append([revno, revision_id])
580
finally:
581
if wt is None:
582
b.unlock()
593
583
else:
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()
584
wt.unlock()
585
608
586
for ri in revinfos:
609
587
self.outf.write('%*s %s\n' % (maxlen, ri[0], ri[1]))
610
588
611
589
612
590
class cmd_add(Command):
613
__doc__ = """Add specified files or directories.
591
"""Add specified files or directories.
614
592
615
593
In non-recursive mode, all the named items are added, regardless
616
594
of whether they were previously ignored. A warning is given if
682
660
683
661
if base_tree:
684
662
base_tree.lock_read()
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()
663
try:
664
tree, file_list = tree_files_for_add(file_list)
665
added, ignored = tree.smart_add(file_list, not
666
no_recurse, action=action, save=not dry_run)
667
finally:
668
if base_tree is not None:
669
base_tree.unlock()
690
670
if len(ignored) > 0:
691
671
if verbose:
692
672
for glob in sorted(ignored.keys()):
696
676
697
677
698
678
class cmd_mkdir(Command):
699
__doc__ = """Create a new versioned directory.
679
"""Create a new versioned directory.
700
680
701
681
This is equivalent to creating the directory and then adding it.
702
682
"""
706
686
707
687
def run(self, dir_list):
708
688
for d in dir_list:
689
os.mkdir(d)
709
690
wt, dd = WorkingTree.open_containing(d)
710
base = os.path.dirname(dd)
711
id = wt.path2id(base)
712
if id != None:
713
os.mkdir(d)
714
wt.add([dd])
715
self.outf.write('added %s\n' % d)
716
else:
717
raise errors.NotVersionedError(path=base)
691
wt.add([dd])
692
self.outf.write('added %s\n' % d)
718
693
719
694
720
695
class cmd_relpath(Command):
721
__doc__ = """Show path of a file relative to root"""
696
"""Show path of a file relative to root"""
722
697
723
698
takes_args = ['filename']
724
699
hidden = True
733
708
734
709
735
710
class cmd_inventory(Command):
736
__doc__ = """Show inventory of the current working copy or a revision.
711
"""Show inventory of the current working copy or a revision.
737
712
738
713
It is possible to limit the output to a particular entry
739
714
type using the --kind option. For example: --kind file.
761
736
revision = _get_one_revision('inventory', revision)
762
737
work_tree, file_list = tree_files(file_list)
763
738
work_tree.lock_read()
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()
739
try:
740
if revision is not None:
741
tree = revision.as_tree(work_tree.branch)
742
743
extra_trees = [work_tree]
744
tree.lock_read()
745
else:
746
tree = work_tree
747
extra_trees = []
748
749
if file_list is not None:
750
file_ids = tree.paths2ids(file_list, trees=extra_trees,
751
require_versioned=True)
752
# find_ids_across_trees may include some paths that don't
753
# exist in 'tree'.
754
entries = sorted((tree.id2path(file_id), tree.inventory[file_id])
755
for file_id in file_ids if file_id in tree)
756
else:
757
entries = tree.inventory.entries()
758
finally:
759
tree.unlock()
760
if tree is not work_tree:
761
work_tree.unlock()
762
786
763
for path, entry in entries:
787
764
if kind and kind != entry.kind:
788
765
continue
794
771
795
772
796
773
class cmd_mv(Command):
797
__doc__ = """Move or rename a file.
774
"""Move or rename a file.
798
775
799
776
:Usage:
800
777
bzr mv OLDNAME NEWNAME
834
811
raise errors.BzrCommandError("missing file argument")
835
812
tree, rel_names = tree_files(names_list, canonicalize=False)
836
813
tree.lock_tree_write()
837
self.add_cleanup(tree.unlock)
838
self._run(tree, names_list, rel_names, after)
814
try:
815
self._run(tree, names_list, rel_names, after)
816
finally:
817
tree.unlock()
839
818
840
819
def run_auto(self, names_list, after, dry_run):
841
820
if names_list is not None and len(names_list) > 1:
846
825
' --auto.')
847
826
work_tree, file_list = tree_files(names_list, default_branch='.')
848
827
work_tree.lock_tree_write()
849
self.add_cleanup(work_tree.unlock)
850
rename_map.RenameMap.guess_renames(work_tree, dry_run)
828
try:
829
rename_map.RenameMap.guess_renames(work_tree, dry_run)
830
finally:
831
work_tree.unlock()
851
832
852
833
def _run(self, tree, names_list, rel_names, after):
853
834
into_existing = osutils.isdir(names_list[-1])
931
912
932
913
933
914
class cmd_pull(Command):
934
__doc__ = """Turn this branch into a mirror of another branch.
915
"""Turn this branch into a mirror of another branch.
935
916
936
917
By default, this command only works on branches that have not diverged.
937
918
Branches are considered diverged if the destination branch's most recent
986
967
try:
987
968
tree_to = WorkingTree.open_containing(directory)[0]
988
969
branch_to = tree_to.branch
989
tree_to.lock_write()
990
self.add_cleanup(tree_to.unlock)
991
970
except errors.NoWorkingTree:
992
971
tree_to = None
993
972
branch_to = Branch.open_containing(directory)[0]
994
branch_to.lock_write()
995
self.add_cleanup(branch_to.unlock)
996
973
997
974
if local and not branch_to.get_bound_location():
998
975
raise errors.LocalRequiresBoundBranch()
999
976
1029
1006
else:
1030
1007
branch_from = Branch.open(location,
1031
1008
possible_transports=possible_transports)
1032
branch_from.lock_read()
1033
self.add_cleanup(branch_from.unlock)
1034
1009
1035
1010
if branch_to.get_parent() is None or remember:
1036
1011
branch_to.set_parent(branch_from.base)
1037
1012
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)
1013
if branch_from is not branch_to:
1014
branch_from.lock_read()
1015
try:
1016
if revision is not None:
1017
revision_id = revision.as_revision_id(branch_from)
1018
1019
branch_to.lock_write()
1020
try:
1021
if tree_to is not None:
1022
view_info = _get_view_info_for_change_reporter(tree_to)
1023
change_reporter = delta._ChangeReporter(
1024
unversioned_filter=tree_to.is_ignored,
1025
view_info=view_info)
1026
result = tree_to.pull(
1027
branch_from, overwrite, revision_id, change_reporter,
1028
possible_transports=possible_transports, local=local)
1029
else:
1030
result = branch_to.pull(
1031
branch_from, overwrite, revision_id, local=local)
1032
1033
result.report(self.outf)
1034
if verbose and result.old_revid != result.new_revid:
1035
log.show_branch_change(
1036
branch_to, self.outf, result.old_revno,
1037
result.old_revid)
1038
finally:
1039
branch_to.unlock()
1040
finally:
1041
if branch_from is not branch_to:
1042
branch_from.unlock()
1058
1043
1059
1044
1060
1045
class cmd_push(Command):
1061
__doc__ = """Update a mirror of this branch.
1046
"""Update a mirror of this branch.
1062
1047
1063
1048
The target branch will not have its working tree populated because this
1064
1049
is both expensive, and is not supported on remote file systems.
1125
1110
# Get the source branch
1126
1111
(tree, br_from,
1127
1112
_unused) = bzrdir.BzrDir.open_containing_tree_or_branch(directory)
1113
if strict is None:
1114
strict = br_from.get_config().get_user_option_as_bool('push_strict')
1115
if strict is None: strict = True # default value
1128
1116
# Get the tip's revision_id
1129
1117
revision = _get_one_revision('push', revision)
1130
1118
if revision is not None:
1131
1119
revision_id = revision.in_history(br_from).rev_id
1132
1120
else:
1133
1121
revision_id = None
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.')
1122
if strict and tree is not None and revision_id is None:
1123
if (tree.has_changes()):
1124
raise errors.UncommittedChanges(
1125
tree, more='Use --no-strict to force the push.')
1126
if tree.last_revision() != tree.branch.last_revision():
1127
# The tree has lost sync with its branch, there is little
1128
# chance that the user is aware of it but he can still force
1129
# the push with --no-strict
1130
raise errors.OutOfDateTree(
1131
tree, more='Use --no-strict to force the push.')
1132
1139
1133
# Get the stacked_on branch, if any
1140
1134
if stacked_on is not None:
1141
1135
stacked_on = urlutils.normalize_url(stacked_on)
1173
1167
1174
1168
1175
1169
class cmd_branch(Command):
1176
__doc__ = """Create a new branch that is a copy of an existing branch.
1170
"""Create a new branch that is a copy of an existing branch.
1177
1171
1178
1172
If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will
1179
1173
be used. In other words, "branch ../foo/bar" will attempt to create ./bar.
1206
1200
' directory exists, but does not already'
1207
1201
' have a control directory. This flag will'
1208
1202
' allow branch to proceed.'),
1209
Option('bind',
1210
help="Bind new branch to from location."),
1211
1203
]
1212
1204
aliases = ['get', 'clone']
1213
1205
1214
1206
def run(self, from_location, to_location=None, revision=None,
1215
1207
hardlink=False, stacked=False, standalone=False, no_tree=False,
1216
use_existing_dir=False, switch=False, bind=False):
1208
use_existing_dir=False, switch=False):
1217
1209
from bzrlib import switch as _mod_switch
1218
1210
from bzrlib.tag import _merge_tags_if_possible
1219
1211
accelerator_tree, br_from = bzrdir.BzrDir.open_tree_or_branch(
1220
1212
from_location)
1221
1213
revision = _get_one_revision('branch', revision)
1222
1214
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)
1234
1215
try:
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)
1216
if revision is not None:
1217
revision_id = revision.as_revision_id(br_from)
1240
1218
else:
1241
try:
1242
bzrdir.BzrDir.open_from_transport(to_transport)
1243
except errors.NotBranchError:
1244
pass
1219
# FIXME - wt.last_revision, fallback to branch, fall back to
1220
# None or perhaps NULL_REVISION to mean copy nothing
1221
# RBC 20060209
1222
revision_id = br_from.last_revision()
1223
if to_location is None:
1224
to_location = urlutils.derive_to_location(from_location)
1225
to_transport = transport.get_transport(to_location)
1226
try:
1227
to_transport.mkdir('.')
1228
except errors.FileExists:
1229
if not use_existing_dir:
1230
raise errors.BzrCommandError('Target directory "%s" '
1231
'already exists.' % to_location)
1245
1232
else:
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'))
1233
try:
1234
bzrdir.BzrDir.open_from_transport(to_transport)
1235
except errors.NotBranchError:
1236
pass
1237
else:
1238
raise errors.AlreadyBranchError(to_location)
1239
except errors.NoSuchFile:
1240
raise errors.BzrCommandError('Parent of "%s" does not exist.'
1241
% to_location)
1242
try:
1243
# preserve whatever source format we have.
1244
dir = br_from.bzrdir.sprout(to_transport.base, revision_id,
1245
possible_transports=[to_transport],
1246
accelerator_tree=accelerator_tree,
1247
hardlink=hardlink, stacked=stacked,
1248
force_new_repo=standalone,
1249
create_tree_if_local=not no_tree,
1250
source_branch=br_from)
1251
branch = dir.open_branch()
1252
except errors.NoSuchRevision:
1253
to_transport.delete_tree('.')
1254
msg = "The branch %s has no revision %s." % (from_location,
1255
revision)
1256
raise errors.BzrCommandError(msg)
1257
_merge_tags_if_possible(br_from, branch)
1258
# If the source branch is stacked, the new branch may
1259
# be stacked whether we asked for that explicitly or not.
1260
# We therefore need a try/except here and not just 'if stacked:'
1261
try:
1262
note('Created new stacked branch referring to %s.' %
1263
branch.get_stacked_on_url())
1264
except (errors.NotStacked, errors.UnstackableBranchFormat,
1265
errors.UnstackableRepositoryFormat), e:
1266
note('Branched %d revision(s).' % branch.revno())
1267
if switch:
1268
# Switch to the new branch
1269
wt, _ = WorkingTree.open_containing('.')
1270
_mod_switch.switch(wt.bzrdir, branch)
1271
note('Switched to branch: %s',
1272
urlutils.unescape_for_display(branch.base, 'utf-8'))
1273
finally:
1274
br_from.unlock()
1286
1275
1287
1276
1288
1277
class cmd_checkout(Command):
1289
__doc__ = """Create a new checkout of an existing branch.
1278
"""Create a new checkout of an existing branch.
1290
1279
1291
1280
If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree for
1292
1281
the branch found in '.'. This is useful if you have removed the working tree
1355
1344
1356
1345
1357
1346
class cmd_renames(Command):
1358
__doc__ = """Show list of renamed files.
1347
"""Show list of renamed files.
1359
1348
"""
1360
1349
# TODO: Option to show renames between two historical versions.
1361
1350
1367
1356
def run(self, dir=u'.'):
1368
1357
tree = WorkingTree.open_containing(dir)[0]
1369
1358
tree.lock_read()
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))
1359
try:
1360
new_inv = tree.inventory
1361
old_tree = tree.basis_tree()
1362
old_tree.lock_read()
1363
try:
1364
old_inv = old_tree.inventory
1365
renames = []
1366
iterator = tree.iter_changes(old_tree, include_unchanged=True)
1367
for f, paths, c, v, p, n, k, e in iterator:
1368
if paths[0] == paths[1]:
1369
continue
1370
if None in (paths):
1371
continue
1372
renames.append(paths)
1373
renames.sort()
1374
for old_name, new_name in renames:
1375
self.outf.write("%s => %s\n" % (old_name, new_name))
1376
finally:
1377
old_tree.unlock()
1378
finally:
1379
tree.unlock()
1387
1380
1388
1381
1389
1382
class cmd_update(Command):
1390
__doc__ = """Update a tree to have the latest code committed to its branch.
1383
"""Update a tree to have the latest code committed to its branch.
1391
1384
1392
1385
This will perform a merge into the working tree, and may generate
1393
1386
conflicts. If you have any local changes, you will still
1395
1388
1396
1389
If you want to discard your local changes, you can just do a
1397
1390
'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.
1401
1391
"""
1402
1392
1403
1393
_see_also = ['pull', 'working-trees', 'status-flags']
1404
1394
takes_args = ['dir?']
1405
takes_options = ['revision']
1406
1395
aliases = ['up']
1407
1396
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")
1397
def run(self, dir='.'):
1412
1398
tree = WorkingTree.open_containing(dir)[0]
1413
branch = tree.branch
1414
1399
possible_transports = []
1415
master = branch.get_master_branch(
1400
master = tree.branch.get_master_branch(
1416
1401
possible_transports=possible_transports)
1417
1402
if master is not None:
1418
1403
tree.lock_write()
1420
1405
else:
1421
1406
tree.lock_tree_write()
1422
1407
branch_location = tree.branch.base
1423
self.add_cleanup(tree.unlock)
1424
1408
# 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)
1409
branch_location = urlutils.unescape_for_display(branch_location[:-1],
1410
self.outf.encoding)
1449
1411
try:
1412
existing_pending_merges = tree.get_parent_ids()[1:]
1413
last_rev = _mod_revision.ensure_null(tree.last_revision())
1414
if last_rev == _mod_revision.ensure_null(
1415
tree.branch.last_revision()):
1416
# may be up to date, check master too.
1417
if master is None or last_rev == _mod_revision.ensure_null(
1418
master.last_revision()):
1419
revno = tree.branch.revision_id_to_revno(last_rev)
1420
note('Tree is up to date at revision %d of branch %s'
1421
% (revno, branch_location))
1422
return 0
1423
view_info = _get_view_info_for_change_reporter(tree)
1450
1424
conflicts = tree.update(
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
1425
delta._ChangeReporter(unversioned_filter=tree.is_ignored,
1426
view_info=view_info), possible_transports=possible_transports)
1427
revno = tree.branch.revision_id_to_revno(
1428
_mod_revision.ensure_null(tree.last_revision()))
1429
note('Updated to revision %d of branch %s' %
1430
(revno, branch_location))
1431
if tree.get_parent_ids()[1:] != existing_pending_merges:
1432
note('Your local commits will now show as pending merges with '
1433
"'bzr status', and can be committed with 'bzr commit'.")
1434
if conflicts != 0:
1435
return 1
1436
else:
1437
return 0
1438
finally:
1439
tree.unlock()
1473
1440
1474
1441
1475
1442
class cmd_info(Command):
1476
__doc__ = """Show information about a working tree, branch or repository.
1443
"""Show information about a working tree, branch or repository.
1477
1444
1478
1445
This command will show all known locations and formats associated to the
1479
1446
tree, branch or repository.
1517
1484
1518
1485
1519
1486
class cmd_remove(Command):
1520
__doc__ = """Remove files or directories.
1487
"""Remove files or directories.
1521
1488
1522
1489
This makes bzr stop tracking changes to the specified files. bzr will delete
1523
1490
them if they can easily be recovered using revert. If no options or
1546
1513
file_list = [f for f in file_list]
1547
1514
1548
1515
tree.lock_write()
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')
1516
try:
1517
# Heuristics should probably all move into tree.remove_smart or
1518
# some such?
1519
if new:
1520
added = tree.changes_from(tree.basis_tree(),
1521
specific_files=file_list).added
1522
file_list = sorted([f[0] for f in added], reverse=True)
1523
if len(file_list) == 0:
1524
raise errors.BzrCommandError('No matching files.')
1525
elif file_list is None:
1526
# missing files show up in iter_changes(basis) as
1527
# versioned-with-no-kind.
1528
missing = []
1529
for change in tree.iter_changes(tree.basis_tree()):
1530
# Find paths in the working tree that have no kind:
1531
if change[1][1] is not None and change[6][1] is None:
1532
missing.append(change[1][1])
1533
file_list = sorted(missing, reverse=True)
1534
file_deletion_strategy = 'keep'
1535
tree.remove(file_list, verbose=verbose, to_file=self.outf,
1536
keep_files=file_deletion_strategy=='keep',
1537
force=file_deletion_strategy=='force')
1538
finally:
1539
tree.unlock()
1571
1540
1572
1541
1573
1542
class cmd_file_id(Command):
1574
__doc__ = """Print file_id of a particular file or directory.
1543
"""Print file_id of a particular file or directory.
1575
1544
1576
1545
The file_id is assigned when the file is first added and remains the
1577
1546
same through all revisions where the file exists, even when it is
1593
1562
1594
1563
1595
1564
class cmd_file_path(Command):
1596
__doc__ = """Print path of file_ids to a file or directory.
1565
"""Print path of file_ids to a file or directory.
1597
1566
1598
1567
This prints one line for each directory down to the target,
1599
1568
starting at the branch root.
1615
1584
1616
1585
1617
1586
class cmd_reconcile(Command):
1618
__doc__ = """Reconcile bzr metadata in a branch.
1587
"""Reconcile bzr metadata in a branch.
1619
1588
1620
1589
This can correct data mismatches that may have been caused by
1621
1590
previous ghost operations or bzr upgrades. You should only
1643
1612
1644
1613
1645
1614
class cmd_revision_history(Command):
1646
__doc__ = """Display the list of revision ids on a branch."""
1615
"""Display the list of revision ids on a branch."""
1647
1616
1648
1617
_see_also = ['log']
1649
1618
takes_args = ['location?']
1659
1628
1660
1629
1661
1630
class cmd_ancestry(Command):
1662
__doc__ = """List all revisions merged into this branch."""
1631
"""List all revisions merged into this branch."""
1663
1632
1664
1633
_see_also = ['log', 'revision-history']
1665
1634
takes_args = ['location?']
1684
1653
1685
1654
1686
1655
class cmd_init(Command):
1687
__doc__ = """Make a directory into a versioned branch.
1656
"""Make a directory into a versioned branch.
1688
1657
1689
1658
Use this to create an empty branch, or before importing an
1690
1659
existing project.
1793
1762
1794
1763
1795
1764
class cmd_init_repository(Command):
1796
__doc__ = """Create a shared repository for branches to share storage space.
1765
"""Create a shared repository for branches to share storage space.
1797
1766
1798
1767
New branches created under the repository directory will store their
1799
1768
revisions in the repository, not in the branch directory. For branches
1853
1822
1854
1823
1855
1824
class cmd_diff(Command):
1856
__doc__ = """Show differences in the working tree, between revisions or branches.
1825
"""Show differences in the working tree, between revisions or branches.
1857
1826
1858
1827
If no arguments are given, all changes for the current tree are listed.
1859
1828
If files are given, only the changes in those files are listed.
1945
1914
help='Use this command to compare files.',
1946
1915
type=unicode,
1947
1916
),
1948
RegistryOption('format',
1949
help='Diff format to use.',
1950
lazy_registry=('bzrlib.diff', 'format_registry'),
1951
value_switches=False, title='Diff format'),
1952
1917
]
1953
1918
aliases = ['di', 'dif']
1954
1919
encoding_type = 'exact'
1955
1920
1956
1921
@display_command
1957
1922
def run(self, revision=None, file_list=None, diff_options=None,
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)
1923
prefix=None, old=None, new=None, using=None):
1924
from bzrlib.diff import get_trees_and_branches_to_diff, show_diff_trees
1961
1925
1962
1926
if (prefix is None) or (prefix == '0'):
1963
1927
# diff -p0 format
1977
1941
raise errors.BzrCommandError('bzr diff --revision takes exactly'
1978
1942
' one or two revision specifiers')
1979
1943
1980
if using is not None and format is not None:
1981
raise errors.BzrCommandError('--using and --format are mutually '
1982
'exclusive.')
1983
1984
1944
(old_tree, new_tree,
1985
1945
old_branch, new_branch,
1986
specific_files, extra_trees) = get_trees_and_branches_to_diff_locked(
1987
file_list, revision, old, new, self.add_cleanup, apply_view=True)
1946
specific_files, extra_trees) = get_trees_and_branches_to_diff(
1947
file_list, revision, old, new, apply_view=True)
1988
1948
return show_diff_trees(old_tree, new_tree, sys.stdout,
1989
1949
specific_files=specific_files,
1990
1950
external_diff_options=diff_options,
1991
1951
old_label=old_label, new_label=new_label,
1992
extra_trees=extra_trees, using=using,
1993
format_cls=format)
1952
extra_trees=extra_trees, using=using)
1994
1953
1995
1954
1996
1955
class cmd_deleted(Command):
1997
__doc__ = """List files deleted in the working tree.
1956
"""List files deleted in the working tree.
1998
1957
"""
1999
1958
# TODO: Show files deleted since a previous revision, or
2000
1959
# between two revisions.
2009
1968
def run(self, show_ids=False):
2010
1969
tree = WorkingTree.open_containing(u'.')[0]
2011
1970
tree.lock_read()
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')
1971
try:
1972
old = tree.basis_tree()
1973
old.lock_read()
1974
try:
1975
for path, ie in old.inventory.iter_entries():
1976
if not tree.has_id(ie.file_id):
1977
self.outf.write(path)
1978
if show_ids:
1979
self.outf.write(' ')
1980
self.outf.write(ie.file_id)
1981
self.outf.write('\n')
1982
finally:
1983
old.unlock()
1984
finally:
1985
tree.unlock()
2023
1986
2024
1987
2025
1988
class cmd_modified(Command):
2026
__doc__ = """List files modified in working tree.
1989
"""List files modified in working tree.
2027
1990
"""
2028
1991
2029
1992
hidden = True
2046
2009
2047
2010
2048
2011
class cmd_added(Command):
2049
__doc__ = """List files added in working tree.
2012
"""List files added in working tree.
2050
2013
"""
2051
2014
2052
2015
hidden = True
2061
2024
def run(self, null=False):
2062
2025
wt = WorkingTree.open_containing(u'.')[0]
2063
2026
wt.lock_read()
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')
2027
try:
2028
basis = wt.basis_tree()
2029
basis.lock_read()
2030
try:
2031
basis_inv = basis.inventory
2032
inv = wt.inventory
2033
for file_id in inv:
2034
if file_id in basis_inv:
2035
continue
2036
if inv.is_root(file_id) and len(basis_inv) == 0:
2037
continue
2038
path = inv.id2path(file_id)
2039
if not os.access(osutils.abspath(path), os.F_OK):
2040
continue
2041
if null:
2042
self.outf.write(path + '\0')
2043
else:
2044
self.outf.write(osutils.quotefn(path) + '\n')
2045
finally:
2046
basis.unlock()
2047
finally:
2048
wt.unlock()
2082
2049
2083
2050
2084
2051
class cmd_root(Command):
2085
__doc__ = """Show the tree root directory.
2052
"""Show the tree root directory.
2086
2053
2087
2054
The root is the nearest enclosing directory with a .bzr control
2088
2055
directory."""
2112
2079
2113
2080
2114
2081
class cmd_log(Command):
2115
__doc__ = """Show historical log for a branch or subset of a branch.
2082
"""Show historical log for a branch or subset of a branch.
2116
2083
2117
2084
log is bzr's default tool for exploring the history of a branch.
2118
2085
The branch to use is taken from the first parameter. If no parameters
2229
2196
:Tips & tricks:
2230
2197
2231
2198
GUI tools and IDEs are often better at exploring history than command
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>.
2199
line tools. You may prefer qlog or glog from the QBzr and Bzr-Gtk packages
2200
respectively for example. (TortoiseBzr uses qlog for displaying logs.) See
2201
http://bazaar-vcs.org/BzrPlugins and http://bazaar-vcs.org/IDEIntegration.
2202
2203
Web interfaces are often better at exploring history than command line
2204
tools, particularly for branches on servers. You may prefer Loggerhead
2205
or one of its alternatives. See http://bazaar-vcs.org/WebInterface.
2236
2206
2237
2207
You may find it useful to add the aliases below to ``bazaar.conf``::
2238
2208
2299
2269
help='Show changes made in each revision as a patch.'),
2300
2270
Option('include-merges',
2301
2271
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
)
2306
2272
]
2307
2273
encoding_type = 'replace'
2308
2274
2318
2284
message=None,
2319
2285
limit=None,
2320
2286
show_diff=False,
2321
include_merges=False,
2322
exclude_common_ancestry=False,
2323
):
2287
include_merges=False):
2324
2288
from bzrlib.log import (
2325
2289
Logger,
2326
2290
make_log_request_dict,
2327
2291
_get_info_for_log_files,
2328
2292
)
2329
2293
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')
2334
2294
if include_merges:
2335
2295
if levels is None:
2336
2296
levels = 0
2349
2309
2350
2310
file_ids = []
2351
2311
filter_by_dir = False
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
2312
b = None
2313
try:
2314
if file_list:
2315
# find the file ids to log and check for directory filtering
2316
b, file_info_list, rev1, rev2 = _get_info_for_log_files(
2317
revision, file_list)
2318
for relpath, file_id, kind in file_info_list:
2319
if file_id is None:
2320
raise errors.BzrCommandError(
2321
"Path unknown at end or start of revision range: %s" %
2322
relpath)
2323
# If the relpath is the top of the tree, we log everything
2324
if relpath == '':
2325
file_ids = []
2326
break
2327
else:
2328
file_ids.append(file_id)
2329
filter_by_dir = filter_by_dir or (
2330
kind in ['directory', 'tree-reference'])
2331
else:
2332
# log everything
2333
# FIXME ? log the current subdir only RBC 20060203
2334
if revision is not None \
2335
and len(revision) > 0 and revision[0].get_branch():
2336
location = revision[0].get_branch()
2366
2337
else:
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)
2338
location = '.'
2339
dir, relpath = bzrdir.BzrDir.open_containing(location)
2340
b = dir.open_branch()
2341
b.lock_read()
2342
rev1, rev2 = _get_revision_range(revision, b, self.name())
2343
2344
# Decide on the type of delta & diff filtering to use
2345
# TODO: add an --all-files option to make this configurable & consistent
2346
if not verbose:
2347
delta_type = None
2348
else:
2349
delta_type = 'full'
2350
if not show_diff:
2351
diff_type = None
2352
elif file_ids:
2353
diff_type = 'partial'
2354
else:
2355
diff_type = 'full'
2356
2357
# Build the log formatter
2358
if log_format is None:
2359
log_format = log.log_formatter_registry.get_default(b)
2360
# Make a non-encoding output to include the diffs - bug 328007
2361
unencoded_output = ui.ui_factory.make_output_stream(encoding_type='exact')
2362
lf = log_format(show_ids=show_ids, to_file=self.outf,
2363
to_exact_file=unencoded_output,
2364
show_timezone=timezone,
2365
delta_format=get_verbosity_level(),
2366
levels=levels,
2367
show_advice=levels is None)
2368
2369
# Choose the algorithm for doing the logging. It's annoying
2370
# having multiple code paths like this but necessary until
2371
# the underlying repository format is faster at generating
2372
# deltas or can provide everything we need from the indices.
2373
# The default algorithm - match-using-deltas - works for
2374
# multiple files and directories and is faster for small
2375
# amounts of history (200 revisions say). However, it's too
2376
# slow for logging a single file in a repository with deep
2377
# history, i.e. > 10K revisions. In the spirit of "do no
2378
# evil when adding features", we continue to use the
2379
# original algorithm - per-file-graph - for the "single
2380
# file that isn't a directory without showing a delta" case.
2381
partial_history = revision and b.repository._format.supports_chks
2382
match_using_deltas = (len(file_ids) != 1 or filter_by_dir
2383
or delta_type or partial_history)
2384
2385
# Build the LogRequest and execute it
2386
if len(file_ids) == 0:
2387
file_ids = None
2388
rqst = make_log_request_dict(
2389
direction=direction, specific_fileids=file_ids,
2390
start_revision=rev1, end_revision=rev2, limit=limit,
2391
message_search=message, delta_type=delta_type,
2392
diff_type=diff_type, _match_using_deltas=match_using_deltas)
2393
Logger(b, rqst).show(lf)
2394
finally:
2395
if b is not None:
2396
b.unlock()
2436
2397
2437
2398
2438
2399
def _get_revision_range(revisionspec_list, branch, command_name):
2456
2417
raise errors.BzrCommandError(
2457
2418
"bzr %s doesn't accept two revisions in different"
2458
2419
" branches." % command_name)
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)
2420
rev1 = start_spec.in_history(branch)
2464
2421
# Avoid loading all of history when we know a missing
2465
2422
# end of range means the last revision ...
2466
2423
if end_spec.spec is None:
2495
2452
2496
2453
2497
2454
class cmd_touching_revisions(Command):
2498
__doc__ = """Return revision-ids which affected a particular file.
2455
"""Return revision-ids which affected a particular file.
2499
2456
2500
2457
A more user-friendly interface is "bzr log FILE".
2501
2458
"""
2509
2466
file_id = tree.path2id(relpath)
2510
2467
b = tree.branch
2511
2468
b.lock_read()
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))
2469
try:
2470
touching_revs = log.find_touching_revisions(b, file_id)
2471
for revno, revision_id, what in touching_revs:
2472
self.outf.write("%6d %s\n" % (revno, what))
2473
finally:
2474
b.unlock()
2516
2475
2517
2476
2518
2477
class cmd_ls(Command):
2519
__doc__ = """List files in a tree.
2478
"""List files in a tree.
2520
2479
"""
2521
2480
2522
2481
_see_also = ['status', 'cat']
2585
2544
note("Ignoring files outside view. View is %s" % view_str)
2586
2545
2587
2546
tree.lock_read()
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
2547
try:
2548
for fp, fc, fkind, fid, entry in tree.list_files(include_root=False,
2549
from_dir=relpath, recursive=recursive):
2550
# Apply additional masking
2551
if not all and not selection[fc]:
2552
continue
2553
if kind is not None and fkind != kind:
2554
continue
2555
if apply_view:
2556
try:
2557
if relpath:
2558
fullpath = osutils.pathjoin(relpath, fp)
2559
else:
2560
fullpath = fp
2561
views.check_path_in_view(tree, fullpath)
2562
except errors.FileOutsideView:
2563
continue
2605
2564
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:
2565
# Output the entry
2566
if prefix:
2567
fp = osutils.pathjoin(prefix, fp)
2568
kindch = entry.kind_character()
2569
outstring = fp + kindch
2570
ui.ui_factory.clear_term()
2571
if verbose:
2572
outstring = '%-8s %s' % (fc, outstring)
2573
if show_ids and fid is not None:
2574
outstring = "%-50s %s" % (outstring, fid)
2632
2575
self.outf.write(outstring + '\n')
2576
elif null:
2577
self.outf.write(fp + '\0')
2578
if show_ids:
2579
if fid is not None:
2580
self.outf.write(fid)
2581
self.outf.write('\0')
2582
self.outf.flush()
2583
else:
2584
if show_ids:
2585
if fid is not None:
2586
my_id = fid
2587
else:
2588
my_id = ''
2589
self.outf.write('%-50s %s\n' % (outstring, my_id))
2590
else:
2591
self.outf.write(outstring + '\n')
2592
finally:
2593
tree.unlock()
2633
2594
2634
2595
2635
2596
class cmd_unknowns(Command):
2636
__doc__ = """List unknown files.
2597
"""List unknown files.
2637
2598
"""
2638
2599
2639
2600
hidden = True
2646
2607
2647
2608
2648
2609
class cmd_ignore(Command):
2649
__doc__ = """Ignore specified files or patterns.
2610
"""Ignore specified files or patterns.
2650
2611
2651
2612
See ``bzr help patterns`` for details on the syntax of patterns.
2652
2613
2660
2621
After adding, editing or deleting that file either indirectly by
2661
2622
using this command or directly by using an editor, be sure to commit
2662
2623
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.
2676
2624
2677
2625
Note: ignore patterns containing shell wildcards must be quoted from
2678
2626
the shell on Unix.
2682
2630
2683
2631
bzr ignore ./Makefile
2684
2632
2685
Ignore .class files in all directories...::
2633
Ignore class files in all directories::
2686
2634
2687
2635
bzr ignore "*.class"
2688
2636
2689
...but do not ignore "special.class"::
2690
2691
bzr ignore "!special.class"
2692
2693
2637
Ignore .o files under the lib directory::
2694
2638
2695
2639
bzr ignore "lib/**/*.o"
2701
2645
Ignore everything but the "debian" toplevel directory::
2702
2646
2703
2647
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 "!!*~"
2711
2648
"""
2712
2649
2713
2650
_see_also = ['status', 'ignored', 'patterns']
2714
2651
takes_args = ['name_pattern*']
2715
2652
takes_options = [
2716
Option('default-rules',
2717
help='Display the default ignore rules that bzr uses.')
2653
Option('old-default-rules',
2654
help='Write out the ignore rules bzr < 0.9 always used.')
2718
2655
]
2719
2656
2720
def run(self, name_pattern_list=None, default_rules=None):
2657
def run(self, name_pattern_list=None, old_default_rules=None):
2721
2658
from bzrlib import ignores
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)
2659
if old_default_rules is not None:
2660
# dump the rules and exit
2661
for pattern in ignores.OLD_DEFAULTS:
2662
print pattern
2726
2663
return
2727
2664
if not name_pattern_list:
2728
2665
raise errors.BzrCommandError("ignore requires at least one "
2729
"NAME_PATTERN or --default-rules.")
2666
"NAME_PATTERN or --old-default-rules")
2730
2667
name_pattern_list = [globbing.normalize_pattern(p)
2731
2668
for p in name_pattern_list]
2732
2669
for name_pattern in name_pattern_list:
2744
2681
if id is not None:
2745
2682
filename = entry[0]
2746
2683
if ignored.match(filename):
2747
matches.append(filename)
2684
matches.append(filename.encode('utf-8'))
2748
2685
tree.unlock()
2749
2686
if len(matches) > 0:
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),))
2687
print "Warning: the following files are version controlled and" \
2688
" match your ignore pattern:\n%s" \
2689
"\nThese files will continue to be version controlled" \
2690
" unless you 'bzr remove' them." % ("\n".join(matches),)
2754
2691
2755
2692
2756
2693
class cmd_ignored(Command):
2757
__doc__ = """List ignored files and the patterns that matched them.
2694
"""List ignored files and the patterns that matched them.
2758
2695
2759
2696
List all the ignored files and the ignore pattern that caused the file to
2760
2697
be ignored.
2771
2708
def run(self):
2772
2709
tree = WorkingTree.open_containing(u'.')[0]
2773
2710
tree.lock_read()
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))
2711
try:
2712
for path, file_class, kind, file_id, entry in tree.list_files():
2713
if file_class != 'I':
2714
continue
2715
## XXX: Slightly inefficient since this was already calculated
2716
pat = tree.is_ignored(path)
2717
self.outf.write('%-50s %s\n' % (path, pat))
2718
finally:
2719
tree.unlock()
2781
2720
2782
2721
2783
2722
class cmd_lookup_revision(Command):
2784
__doc__ = """Lookup the revision-id from a revision-number
2723
"""Lookup the revision-id from a revision-number
2785
2724
2786
2725
:Examples:
2787
2726
bzr lookup-revision 33
2794
2733
try:
2795
2734
revno = int(revno)
2796
2735
except ValueError:
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)
2736
raise errors.BzrCommandError("not a valid revision-number: %r" % revno)
2737
2738
print WorkingTree.open_containing(u'.')[0].branch.get_rev_id(revno)
2801
2739
2802
2740
2803
2741
class cmd_export(Command):
2804
__doc__ = """Export current or past revision to a destination directory or archive.
2742
"""Export current or past revision to a destination directory or archive.
2805
2743
2806
2744
If no revision is specified this exports the last committed revision.
2807
2745
2839
2777
Option('root',
2840
2778
type=str,
2841
2779
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.'),
2845
2780
]
2846
2781
def run(self, dest, branch_or_subdir=None, revision=None, format=None,
2847
root=None, filters=False, per_file_timestamps=False):
2782
root=None, filters=False):
2848
2783
from bzrlib.export import export
2849
2784
2850
2785
if branch_or_subdir is None:
2857
2792
2858
2793
rev_tree = _get_one_revision_tree('export', revision, branch=b, tree=tree)
2859
2794
try:
2860
export(rev_tree, dest, format, root, subdir, filtered=filters,
2861
per_file_timestamps=per_file_timestamps)
2795
export(rev_tree, dest, format, root, subdir, filtered=filters)
2862
2796
except errors.NoSuchExportFormat, e:
2863
2797
raise errors.BzrCommandError('Unsupported export format: %s' % e.format)
2864
2798
2865
2799
2866
2800
class cmd_cat(Command):
2867
__doc__ = """Write the contents of a file as of a given revision to standard output.
2801
"""Write the contents of a file as of a given revision to standard output.
2868
2802
2869
2803
If no revision is nominated, the last revision is used.
2870
2804
2891
2825
tree, branch, relpath = \
2892
2826
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
2893
2827
branch.lock_read()
2894
self.add_cleanup(branch.unlock)
2895
return self._run(tree, branch, relpath, filename, revision,
2896
name_from_revision, filters)
2828
try:
2829
return self._run(tree, branch, relpath, filename, revision,
2830
name_from_revision, filters)
2831
finally:
2832
branch.unlock()
2897
2833
2898
2834
def _run(self, tree, b, relpath, filename, revision, name_from_revision,
2899
2835
filtered):
2900
2836
if tree is None:
2901
2837
tree = b.basis_tree()
2902
2838
rev_tree = _get_one_revision_tree('cat', revision, branch=b)
2903
rev_tree.lock_read()
2904
self.add_cleanup(rev_tree.unlock)
2905
2839
2906
2840
old_file_id = rev_tree.path2id(relpath)
2907
2841
2942
2876
chunks = content.splitlines(True)
2943
2877
content = filtered_output_bytes(chunks, filters,
2944
2878
ContentFilterContext(relpath, rev_tree))
2945
self.cleanup_now()
2946
2879
self.outf.writelines(content)
2947
2880
else:
2948
self.cleanup_now()
2949
2881
self.outf.write(content)
2950
2882
2951
2883
2952
2884
class cmd_local_time_offset(Command):
2953
__doc__ = """Show the offset in seconds from GMT to local time."""
2885
"""Show the offset in seconds from GMT to local time."""
2954
2886
hidden = True
2955
2887
@display_command
2956
2888
def run(self):
2957
self.outf.write("%s\n" % osutils.local_time_offset())
2889
print osutils.local_time_offset()
2958
2890
2959
2891
2960
2892
2961
2893
class cmd_commit(Command):
2962
__doc__ = """Commit changes into a new revision.
2894
"""Commit changes into a new revision.
2963
2895
2964
2896
An explanatory message needs to be given for each commit. This is
2965
2897
often done by using the --message option (getting the message from the
3073
3005
"the master branch until a normal commit "
3074
3006
"is performed."
3075
3007
),
3076
Option('show-diff', short_name='p',
3008
Option('show-diff',
3077
3009
help='When no message is supplied, show the diff along'
3078
3010
' with the status summary in the message editor.'),
3079
3011
]
3159
3091
'(use --file "%(f)s" to take commit message from that file)'
3160
3092
% { 'f': message })
3161
3093
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
3094
3169
3095
def get_message(commit_obj):
3170
3096
"""Callback to get commit message"""
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,
3097
my_message = message
3098
if my_message is not None and '\r' in my_message:
3099
my_message = my_message.replace('\r\n', '\n')
3100
my_message = my_message.replace('\r', '\n')
3101
if my_message is None and not file:
3102
t = make_commit_message_template_encoded(tree,
3180
3103
selected_list, diff=show_diff,
3181
3104
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.
3187
3105
start_message = generate_commit_message_template(commit_obj)
3188
my_message = edit_commit_message_encoded(text,
3106
my_message = edit_commit_message_encoded(t,
3189
3107
start_message=start_message)
3190
3108
if my_message is None:
3191
3109
raise errors.BzrCommandError("please specify a commit"
3192
3110
" message with either --message or --file")
3111
elif my_message and file:
3112
raise errors.BzrCommandError(
3113
"please specify either --message or --file")
3114
if file:
3115
my_message = codecs.open(file, 'rt',
3116
osutils.get_user_encoding()).read()
3193
3117
if my_message == "":
3194
3118
raise errors.BzrCommandError("empty commit message specified")
3195
3119
return my_message
3207
3131
timezone=offset,
3208
3132
exclude=safe_relpath_files(tree, exclude))
3209
3133
except PointlessCommit:
3134
# FIXME: This should really happen before the file is read in;
3135
# perhaps prepare the commit; get the message; then actually commit
3210
3136
raise errors.BzrCommandError("No changes to commit."
3211
3137
" Use --unchanged to commit anyhow.")
3212
3138
except ConflictsInTree:
3217
3143
raise errors.BzrCommandError("Commit refused because there are"
3218
3144
" unknown files in the working tree.")
3219
3145
except errors.BoundBranchOutOfDate, e:
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
3146
raise errors.BzrCommandError(str(e) + "\n"
3147
'To commit to master branch, run update and then commit.\n'
3148
'You can also pass --local to commit to continue working '
3149
'disconnected.')
3225
3150
3226
3151
3227
3152
class cmd_check(Command):
3228
__doc__ = """Validate working tree structure, branch consistency and repository history.
3153
"""Validate working tree structure, branch consistency and repository history.
3229
3154
3230
3155
This command checks various invariants about branch and repository storage
3231
3156
to detect data corruption or bzr bugs.
3295
3220
3296
3221
3297
3222
class cmd_upgrade(Command):
3298
__doc__ = """Upgrade branch storage to current format.
3223
"""Upgrade branch storage to current format.
3299
3224
3300
3225
The check command or bzr developers may sometimes advise you to run
3301
3226
this command. When the default format has changed you may also be warned
3319
3244
3320
3245
3321
3246
class cmd_whoami(Command):
3322
__doc__ = """Show or set bzr user id.
3247
"""Show or set bzr user id.
3323
3248
3324
3249
:Examples:
3325
3250
Show the email of the current user::
3369
3294
3370
3295
3371
3296
class cmd_nick(Command):
3372
__doc__ = """Print or set the branch nickname.
3297
"""Print or set the branch nickname.
3373
3298
3374
3299
If unset, the tree root directory name is used as the nickname.
3375
3300
To print the current nickname, execute with no argument.
3389
3314
3390
3315
@display_command
3391
3316
def printme(self, branch):
3392
self.outf.write('%s\n' % branch.nick)
3317
print branch.nick
3393
3318
3394
3319
3395
3320
class cmd_alias(Command):
3396
__doc__ = """Set/unset and display aliases.
3321
"""Set/unset and display aliases.
3397
3322
3398
3323
:Examples:
3399
3324
Show the current aliases::
3463
3388
3464
3389
3465
3390
class cmd_selftest(Command):
3466
__doc__ = """Run internal test suite.
3391
"""Run internal test suite.
3467
3392
3468
3393
If arguments are given, they are regular expressions that say which tests
3469
3394
should run. Tests matching any expression are run, and other tests are
3513
3438
def get_transport_type(typestring):
3514
3439
"""Parse and return a transport specifier."""
3515
3440
if typestring == "sftp":
3516
from bzrlib.tests import stub_sftp
3517
return stub_sftp.SFTPAbsoluteServer
3441
from bzrlib.transport.sftp import SFTPAbsoluteServer
3442
return SFTPAbsoluteServer
3518
3443
if typestring == "memory":
3519
from bzrlib.tests import test_server
3520
return memory.MemoryServer
3444
from bzrlib.transport.memory import MemoryServer
3445
return MemoryServer
3521
3446
if typestring == "fakenfs":
3522
from bzrlib.tests import test_server
3523
return test_server.FakeNFSServer
3447
from bzrlib.transport.fakenfs import FakeNFSServer
3448
return FakeNFSServer
3524
3449
msg = "No known transport type %s. Supported types are: sftp\n" %\
3525
3450
(typestring)
3526
3451
raise errors.BzrCommandError(msg)
3610
3535
raise errors.BzrCommandError("subunit not available. subunit "
3611
3536
"needs to be installed to use --subunit.")
3612
3537
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)
3618
3538
if parallel:
3619
3539
self.additional_selftest_args.setdefault(
3620
3540
'suite_decorators', []).append(parallel)
3624
3544
verbose = not is_quiet()
3625
3545
# TODO: should possibly lock the history file...
3626
3546
benchfile = open(".perf_history", "at", buffering=1)
3627
self.add_cleanup(benchfile.close)
3628
3547
else:
3629
3548
test_suite_factory = None
3630
3549
benchfile = None
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)
3550
try:
3551
selftest_kwargs = {"verbose": verbose,
3552
"pattern": pattern,
3553
"stop_on_failure": one,
3554
"transport": transport,
3555
"test_suite_factory": test_suite_factory,
3556
"lsprof_timed": lsprof_timed,
3557
"lsprof_tests": lsprof_tests,
3558
"bench_history": benchfile,
3559
"matching_tests_first": first,
3560
"list_only": list_only,
3561
"random_seed": randomize,
3562
"exclude_pattern": exclude,
3563
"strict": strict,
3564
"load_list": load_list,
3565
"debug_flags": debugflag,
3566
"starting_with": starting_with
3567
}
3568
selftest_kwargs.update(self.additional_selftest_args)
3569
result = selftest(**selftest_kwargs)
3570
finally:
3571
if benchfile is not None:
3572
benchfile.close()
3650
3573
return int(not result)
3651
3574
3652
3575
3653
3576
class cmd_version(Command):
3654
__doc__ = """Show version of bzr."""
3577
"""Show version of bzr."""
3655
3578
3656
3579
encoding_type = 'replace'
3657
3580
takes_options = [
3668
3591
3669
3592
3670
3593
class cmd_rocks(Command):
3671
__doc__ = """Statement of optimism."""
3594
"""Statement of optimism."""
3672
3595
3673
3596
hidden = True
3674
3597
3675
3598
@display_command
3676
3599
def run(self):
3677
self.outf.write("It sure does!\n")
3600
print "It sure does!"
3678
3601
3679
3602
3680
3603
class cmd_find_merge_base(Command):
3681
__doc__ = """Find and print a base revision for merging two branches."""
3604
"""Find and print a base revision for merging two branches."""
3682
3605
# TODO: Options to specify revisions on either side, as if
3683
3606
# merging only part of the history.
3684
3607
takes_args = ['branch', 'other']
3691
3614
branch1 = Branch.open_containing(branch)[0]
3692
3615
branch2 = Branch.open_containing(other)[0]
3693
3616
branch1.lock_read()
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)
3617
try:
3618
branch2.lock_read()
3619
try:
3620
last1 = ensure_null(branch1.last_revision())
3621
last2 = ensure_null(branch2.last_revision())
3622
3623
graph = branch1.repository.get_graph(branch2.repository)
3624
base_rev_id = graph.find_unique_lca(last1, last2)
3625
3626
print 'merge base is revision %s' % base_rev_id
3627
finally:
3628
branch2.unlock()
3629
finally:
3630
branch1.unlock()
3704
3631
3705
3632
3706
3633
class cmd_merge(Command):
3707
__doc__ = """Perform a three-way merge.
3634
"""Perform a three-way merge.
3708
3635
3709
3636
The source of the merge can be specified either in the form of a branch,
3710
3637
or in the form of a path to a file containing a merge directive generated
3739
3666
committed to record the result of the merge.
3740
3667
3741
3668
merge refuses to run if there are any uncommitted changes, unless
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.
3669
--force is given.
3748
3670
3749
3671
To select only some changes to merge, use "merge -i", which will prompt
3750
3672
you to apply each diff hunk and file change, similar to "shelve".
3765
3687
To apply a merge directive contained in /tmp/merge::
3766
3688
3767
3689
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'
3775
3690
"""
3776
3691
3777
3692
encoding_type = 'exact'
3835
3750
view_info = _get_view_info_for_change_reporter(tree)
3836
3751
change_reporter = delta._ChangeReporter(
3837
3752
unversioned_filter=tree.is_ignored, view_info=view_info)
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
3753
cleanups = []
3754
try:
3755
pb = ui.ui_factory.nested_progress_bar()
3756
cleanups.append(pb.finished)
3757
tree.lock_write()
3758
cleanups.append(tree.unlock)
3759
if location is not None:
3760
try:
3761
mergeable = bundle.read_mergeable_from_url(location,
3762
possible_transports=possible_transports)
3763
except errors.NotABundle:
3764
mergeable = None
3765
else:
3766
if uncommitted:
3767
raise errors.BzrCommandError('Cannot use --uncommitted'
3768
' with bundles or merge directives.')
3769
3770
if revision is not None:
3771
raise errors.BzrCommandError(
3772
'Cannot use -r with merge directives or bundles')
3773
merger, verified = _mod_merge.Merger.from_mergeable(tree,
3774
mergeable, pb)
3775
3776
if merger is None and uncommitted:
3777
if revision is not None and len(revision) > 0:
3778
raise errors.BzrCommandError('Cannot use --uncommitted and'
3779
' --revision at the same time.')
3780
merger = self.get_merger_from_uncommitted(tree, location, pb,
3781
cleanups)
3782
allow_pending = False
3783
3784
if merger is None:
3785
merger, allow_pending = self._get_merger_from_branch(tree,
3786
location, revision, remember, possible_transports, pb)
3787
3788
merger.merge_type = merge_type
3789
merger.reprocess = reprocess
3790
merger.show_base = show_base
3791
self.sanity_check_merger(merger)
3792
if (merger.base_rev_id == merger.other_rev_id and
3793
merger.other_rev_id is not None):
3794
note('Nothing to do.')
3795
return 0
3796
if pull:
3797
if merger.interesting_files is not None:
3798
raise errors.BzrCommandError('Cannot pull individual files')
3799
if (merger.base_rev_id == tree.last_revision()):
3800
result = tree.pull(merger.other_branch, False,
3801
merger.other_rev_id)
3802
result.report(self.outf)
3803
return 0
3804
if merger.this_basis is None:
3805
raise errors.BzrCommandError(
3806
"This branch has no commits."
3807
" (perhaps you would prefer 'bzr pull')")
3808
if preview:
3809
return self._do_preview(merger, cleanups)
3810
elif interactive:
3811
return self._do_interactive(merger, cleanups)
3848
3812
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)
3885
return 0
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)
3897
3898
def _get_preview(self, merger):
3813
return self._do_merge(merger, change_reporter, allow_pending,
3814
verified)
3815
finally:
3816
for cleanup in reversed(cleanups):
3817
cleanup()
3818
3819
def _get_preview(self, merger, cleanups):
3899
3820
tree_merger = merger.make_merger()
3900
3821
tt = tree_merger.make_preview_transform()
3901
self.add_cleanup(tt.finalize)
3822
cleanups.append(tt.finalize)
3902
3823
result_tree = tt.get_preview_tree()
3903
3824
return result_tree
3904
3825
3905
def _do_preview(self, merger):
3826
def _do_preview(self, merger, cleanups):
3906
3827
from bzrlib.diff import show_diff_trees
3907
result_tree = self._get_preview(merger)
3828
result_tree = self._get_preview(merger, cleanups)
3908
3829
show_diff_trees(merger.this_tree, result_tree, self.outf,
3909
3830
old_label='', new_label='')
3910
3831
3920
3841
else:
3921
3842
return 0
3922
3843
3923
def _do_interactive(self, merger):
3844
def _do_interactive(self, merger, cleanups):
3924
3845
"""Perform an interactive merge.
3925
3846
3926
3847
This works by generating a preview tree of the merge, then using
3928
3849
and the preview tree.
3929
3850
"""
3930
3851
from bzrlib import shelf_ui
3931
result_tree = self._get_preview(merger)
3852
result_tree = self._get_preview(merger, cleanups)
3932
3853
writer = bzrlib.option.diff_writer_registry.get()
3933
3854
shelver = shelf_ui.Shelver(merger.this_tree, result_tree, destroy=True,
3934
3855
reporter=shelf_ui.ApplyReporter(),
4002
3923
allow_pending = True
4003
3924
return merger, allow_pending
4004
3925
4005
def get_merger_from_uncommitted(self, tree, location, pb):
3926
def get_merger_from_uncommitted(self, tree, location, pb, cleanups):
4006
3927
"""Get a merger for uncommitted changes.
4007
3928
4008
3929
:param tree: The tree the merger should apply to.
4009
3930
:param location: The location containing uncommitted changes.
4010
3931
:param pb: The progress bar to use for showing progress.
3932
:param cleanups: A list of operations to perform to clean up the
3933
temporary directories, unfinalized objects, etc.
4011
3934
"""
4012
3935
location = self._select_branch_location(tree, location)[0]
4013
3936
other_tree, other_path = WorkingTree.open_containing(location)
4065
3988
4066
3989
4067
3990
class cmd_remerge(Command):
4068
__doc__ = """Redo a merge.
3991
"""Redo a merge.
4069
3992
4070
3993
Use this if you want to try a different merge technique while resolving
4071
3994
conflicts. Some merge techniques are better than others, and remerge
4096
4019
4097
4020
def run(self, file_list=None, merge_type=None, show_base=False,
4098
4021
reprocess=False):
4099
from bzrlib.conflicts import restore
4100
4022
if merge_type is None:
4101
4023
merge_type = _mod_merge.Merge3Merger
4102
4024
tree, file_list = tree_files(file_list)
4103
4025
tree.lock_write()
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
4026
try:
4027
parents = tree.get_parent_ids()
4028
if len(parents) != 2:
4029
raise errors.BzrCommandError("Sorry, remerge only works after normal"
4030
" merges. Not cherrypicking or"
4031
" multi-merges.")
4032
repository = tree.branch.repository
4033
interesting_ids = None
4034
new_conflicts = []
4035
conflicts = tree.conflicts()
4036
if file_list is not None:
4037
interesting_ids = set()
4038
for filename in file_list:
4039
file_id = tree.path2id(filename)
4040
if file_id is None:
4041
raise errors.NotVersionedError(filename)
4042
interesting_ids.add(file_id)
4043
if tree.kind(file_id) != "directory":
4044
continue
4123
4045
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:
4046
for name, ie in tree.inventory.iter_entries(file_id):
4047
interesting_ids.add(ie.file_id)
4048
new_conflicts = conflicts.select_conflicts(tree, file_list)[0]
4049
else:
4050
# Remerge only supports resolving contents conflicts
4051
allowed_conflicts = ('text conflict', 'contents conflict')
4052
restore_files = [c.path for c in conflicts
4053
if c.typestring in allowed_conflicts]
4054
_mod_merge.transform_tree(tree, tree.basis_tree(), interesting_ids)
4055
tree.set_conflicts(ConflictList(new_conflicts))
4056
if file_list is not None:
4057
restore_files = file_list
4058
for filename in restore_files:
4059
try:
4060
restore(tree.abspath(filename))
4061
except errors.NotConflicted:
4062
pass
4063
# Disable pending merges, because the file texts we are remerging
4064
# have not had those merges performed. If we use the wrong parents
4065
# list, we imply that the working tree text has seen and rejected
4066
# all the changes from the other tree, when in fact those changes
4067
# have not yet been seen.
4068
pb = ui.ui_factory.nested_progress_bar()
4069
tree.set_parent_ids(parents[:1])
4137
4070
try:
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()
4071
merger = _mod_merge.Merger.from_revision_ids(pb,
4072
tree, parents[1])
4073
merger.interesting_ids = interesting_ids
4074
merger.merge_type = merge_type
4075
merger.show_base = show_base
4076
merger.reprocess = reprocess
4077
conflicts = merger.do_merge()
4078
finally:
4079
tree.set_parent_ids(parents)
4080
pb.finished()
4154
4081
finally:
4155
tree.set_parent_ids(parents)
4082
tree.unlock()
4156
4083
if conflicts > 0:
4157
4084
return 1
4158
4085
else:
4160
4087
4161
4088
4162
4089
class cmd_revert(Command):
4163
__doc__ = """Revert files to a previous revision.
4090
"""Revert files to a previous revision.
4164
4091
4165
4092
Giving a list of files will revert only those files. Otherwise, all files
4166
4093
will be reverted. If the revision is not specified with '--revision', the
4185
4112
created as above. Directories containing unknown files will not be
4186
4113
deleted.
4187
4114
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
4115
The working tree contains a list of pending merged revisions, which will
4116
be included as parents in the next commit. Normally, revert clears that
4117
list as well as reverting the files. If any files are specified, revert
4118
leaves the pending merge list alone and reverts only the files. Use "bzr
4119
revert ." in the tree root to revert all files but keep the merge record,
4120
and "bzr revert --forget-merges" to clear the pending merge list without
4195
4121
reverting any files.
4196
4122
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
4123
Using "bzr revert --forget-merges", it is possible to apply the changes
4124
from an arbitrary merge as a single revision. To do this, perform the
4125
merge as desired. Then doing revert with the "--forget-merges" option will
4126
keep the content of the tree as it was, but it will clear the list of
4127
pending merges. The next commit will then contain all of the changes that
4128
would have been in the merge, but without any mention of the other parent
4129
revisions. Because this technique forgets where these changes originated,
4130
it may cause additional conflicts on later merges involving the source and
4205
4131
target branches.
4206
4132
"""
4207
4133
4217
4143
def run(self, revision=None, no_backup=False, file_list=None,
4218
4144
forget_merges=None):
4219
4145
tree, file_list = tree_files(file_list)
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)
4146
tree.lock_write()
4147
try:
4148
if forget_merges:
4149
tree.set_parent_ids(tree.get_parent_ids()[:1])
4150
else:
4151
self._revert_tree_to_revision(tree, revision, file_list, no_backup)
4152
finally:
4153
tree.unlock()
4226
4154
4227
4155
@staticmethod
4228
4156
def _revert_tree_to_revision(tree, revision, file_list, no_backup):
4229
4157
rev_tree = _get_one_revision_tree('revert', revision, tree=tree)
4230
tree.revert(file_list, rev_tree, not no_backup, None,
4231
report_changes=True)
4158
pb = ui.ui_factory.nested_progress_bar()
4159
try:
4160
tree.revert(file_list, rev_tree, not no_backup, pb,
4161
report_changes=True)
4162
finally:
4163
pb.finished()
4232
4164
4233
4165
4234
4166
class cmd_assert_fail(Command):
4235
__doc__ = """Test reporting of assertion failures"""
4167
"""Test reporting of assertion failures"""
4236
4168
# intended just for use in testing
4237
4169
4238
4170
hidden = True
4242
4174
4243
4175
4244
4176
class cmd_help(Command):
4245
__doc__ = """Show help on a command or other topic.
4177
"""Show help on a command or other topic.
4246
4178
"""
4247
4179
4248
4180
_see_also = ['topics']
4261
4193
4262
4194
4263
4195
class cmd_shell_complete(Command):
4264
__doc__ = """Show appropriate completions for context.
4196
"""Show appropriate completions for context.
4265
4197
4266
4198
For a list of all available commands, say 'bzr shell-complete'.
4267
4199
"""
4276
4208
4277
4209
4278
4210
class cmd_missing(Command):
4279
__doc__ = """Show unmerged/unpulled revisions between two branches.
4211
"""Show unmerged/unpulled revisions between two branches.
4280
4212
4281
4213
OTHER_BRANCH may be local or remote.
4282
4214
4360
4292
restrict = 'remote'
4361
4293
4362
4294
local_branch = Branch.open_containing(u".")[0]
4363
local_branch.lock_read()
4364
self.add_cleanup(local_branch.unlock)
4365
4366
4295
parent = local_branch.get_parent()
4367
4296
if other_branch is None:
4368
4297
other_branch = parent
4377
4306
remote_branch = Branch.open(other_branch)
4378
4307
if remote_branch.base == local_branch.base:
4379
4308
remote_branch = local_branch
4380
else:
4381
remote_branch.lock_read()
4382
self.add_cleanup(remote_branch.unlock)
4383
4309
4384
4310
local_revid_range = _revision_range_to_revid_range(
4385
4311
_get_revision_range(my_revision, local_branch,
4389
4315
_get_revision_range(revision,
4390
4316
remote_branch, self.name()))
4391
4317
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()
4318
local_branch.lock_read()
4319
try:
4320
remote_branch.lock_read()
4321
try:
4322
local_extra, remote_extra = find_unmerged(
4323
local_branch, remote_branch, restrict,
4324
backward=not reverse,
4325
include_merges=include_merges,
4326
local_revid_range=local_revid_range,
4327
remote_revid_range=remote_revid_range)
4328
4329
if log_format is None:
4330
registry = log.log_formatter_registry
4331
log_format = registry.get_default(local_branch)
4332
lf = log_format(to_file=self.outf,
4333
show_ids=show_ids,
4334
show_timezone='original')
4335
4336
status_code = 0
4337
if local_extra and not theirs_only:
4338
message("You have %d extra revision(s):\n" %
4339
len(local_extra))
4340
for revision in iter_log_revisions(local_extra,
4341
local_branch.repository,
4342
verbose):
4343
lf.log_revision(revision)
4344
printed_local = True
4345
status_code = 1
4346
else:
4347
printed_local = False
4348
4349
if remote_extra and not mine_only:
4350
if printed_local is True:
4351
message("\n\n\n")
4352
message("You are missing %d revision(s):\n" %
4353
len(remote_extra))
4354
for revision in iter_log_revisions(remote_extra,
4355
remote_branch.repository,
4356
verbose):
4357
lf.log_revision(revision)
4358
status_code = 1
4359
4360
if mine_only and not local_extra:
4361
# We checked local, and found nothing extra
4362
message('This branch is up to date.\n')
4363
elif theirs_only and not remote_extra:
4364
# We checked remote, and found nothing extra
4365
message('Other branch is up to date.\n')
4366
elif not (mine_only or theirs_only or local_extra or
4367
remote_extra):
4368
# We checked both branches, and neither one had extra
4369
# revisions
4370
message("Branches are up to date.\n")
4371
finally:
4372
remote_branch.unlock()
4373
finally:
4374
local_branch.unlock()
4442
4375
if not status_code and parent is None and other_branch is not None:
4443
4376
local_branch.lock_write()
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)
4377
try:
4378
# handle race conditions - a parent might be set while we run.
4379
if local_branch.get_parent() is None:
4380
local_branch.set_parent(remote_branch.base)
4381
finally:
4382
local_branch.unlock()
4448
4383
return status_code
4449
4384
4450
4385
4451
4386
class cmd_pack(Command):
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
"""
4387
"""Compress the data within a repository."""
4469
4388
4470
4389
_see_also = ['repositories']
4471
4390
takes_args = ['branch_or_repo?']
4472
takes_options = [
4473
Option('clean-obsolete-packs', 'Delete obsolete packs to save disk space.'),
4474
]
4475
4391
4476
def run(self, branch_or_repo='.', clean_obsolete_packs=False):
4392
def run(self, branch_or_repo='.'):
4477
4393
dir = bzrdir.BzrDir.open_containing(branch_or_repo)[0]
4478
4394
try:
4479
4395
branch = dir.open_branch()
4480
4396
repository = branch.repository
4481
4397
except errors.NotBranchError:
4482
4398
repository = dir.open_repository()
4483
repository.pack(clean_obsolete_packs=clean_obsolete_packs)
4399
repository.pack()
4484
4400
4485
4401
4486
4402
class cmd_plugins(Command):
4487
__doc__ = """List the installed plugins.
4403
"""List the installed plugins.
4488
4404
4489
4405
This command displays the list of installed plugins including
4490
4406
version of plugin and a short description of each.
4497
4413
adding new commands, providing additional network transports and
4498
4414
customizing log output.
4499
4415
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.
4416
See the Bazaar web site, http://bazaar-vcs.org, for further
4417
information on plugins including where to find them and how to
4418
install them. Instructions are also provided there on how to
4419
write new plugins using the Python programming language.
4504
4420
"""
4505
4421
takes_options = ['verbose']
4506
4422
4521
4437
doc = '(no description)'
4522
4438
result.append((name_ver, doc, plugin.path()))
4523
4439
for name_ver, doc, path in sorted(result):
4524
self.outf.write("%s\n" % name_ver)
4525
self.outf.write(" %s\n" % doc)
4440
print name_ver
4441
print ' ', doc
4526
4442
if verbose:
4527
self.outf.write(" %s\n" % path)
4528
self.outf.write("\n")
4443
print ' ', path
4444
print
4529
4445
4530
4446
4531
4447
class cmd_testament(Command):
4532
__doc__ = """Show testament (signing-form) of a revision."""
4448
"""Show testament (signing-form) of a revision."""
4533
4449
takes_options = [
4534
4450
'revision',
4535
4451
Option('long', help='Produce long-format testament.'),
4548
4464
else:
4549
4465
b = Branch.open(branch)
4550
4466
b.lock_read()
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())
4467
try:
4468
if revision is None:
4469
rev_id = b.last_revision()
4470
else:
4471
rev_id = revision[0].as_revision_id(b)
4472
t = testament_class.from_revision(b.repository, rev_id)
4473
if long:
4474
sys.stdout.writelines(t.as_text_lines())
4475
else:
4476
sys.stdout.write(t.as_short_text())
4477
finally:
4478
b.unlock()
4561
4479
4562
4480
4563
4481
class cmd_annotate(Command):
4564
__doc__ = """Show the origin of each line in a file.
4482
"""Show the origin of each line in a file.
4565
4483
4566
4484
This prints out the given file with an annotation on the left side
4567
4485
indicating which revision, author and date introduced the change.
4589
4507
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
4590
4508
if wt is not None:
4591
4509
wt.lock_read()
4592
self.add_cleanup(wt.unlock)
4593
4510
else:
4594
4511
branch.lock_read()
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)
4512
try:
4513
tree = _get_one_revision_tree('annotate', revision, branch=branch)
4514
if wt is not None:
4515
file_id = wt.path2id(relpath)
4516
else:
4517
file_id = tree.path2id(relpath)
4518
if file_id is None:
4519
raise errors.NotVersionedError(filename)
4520
file_version = tree.inventory[file_id].revision
4521
if wt is not None and revision is None:
4522
# If there is a tree and we're not annotating historical
4523
# versions, annotate the working tree's content.
4524
annotate_file_tree(wt, file_id, self.outf, long, all,
4525
show_ids=show_ids)
4526
else:
4527
annotate_file(branch, file_version, file_id, long, all, self.outf,
4528
show_ids=show_ids)
4529
finally:
4530
if wt is not None:
4531
wt.unlock()
4532
else:
4533
branch.unlock()
4614
4534
4615
4535
4616
4536
class cmd_re_sign(Command):
4617
__doc__ = """Create a digital signature for an existing revision."""
4537
"""Create a digital signature for an existing revision."""
4618
4538
# TODO be able to replace existing ones.
4619
4539
4620
4540
hidden = True # is this right ?
4628
4548
raise errors.BzrCommandError('You must supply either --revision or a revision_id')
4629
4549
b = WorkingTree.open_containing(u'.')[0].branch
4630
4550
b.lock_write()
4631
self.add_cleanup(b.unlock)
4632
return self._run(b, revision_id_list, revision)
4551
try:
4552
return self._run(b, revision_id_list, revision)
4553
finally:
4554
b.unlock()
4633
4555
4634
4556
def _run(self, b, revision_id_list, revision):
4635
4557
import bzrlib.gpg as gpg
4680
4602
4681
4603
4682
4604
class cmd_bind(Command):
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.
4605
"""Convert the current branch into a checkout of the supplied branch.
4685
4606
4686
4607
Once converted into a checkout, commits must succeed on the master branch
4687
4608
before they will be applied to the local branch.
4705
4626
'This format does not remember old locations.')
4706
4627
else:
4707
4628
if location is None:
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')
4629
raise errors.BzrCommandError('No location supplied and no '
4630
'previous location known')
4713
4631
b_other = Branch.open(location)
4714
4632
try:
4715
4633
b.bind(b_other)
4721
4639
4722
4640
4723
4641
class cmd_unbind(Command):
4724
__doc__ = """Convert the current checkout into a regular branch.
4642
"""Convert the current checkout into a regular branch.
4725
4643
4726
4644
After unbinding, the local branch is considered independent and subsequent
4727
4645
commits will be local only.
4738
4656
4739
4657
4740
4658
class cmd_uncommit(Command):
4741
__doc__ = """Remove the last committed revision.
4659
"""Remove the last committed revision.
4742
4660
4743
4661
--verbose will print out what is being removed.
4744
4662
--dry-run will go through all the motions, but not actually
4785
4703
4786
4704
if tree is not None:
4787
4705
tree.lock_write()
4788
self.add_cleanup(tree.unlock)
4789
4706
else:
4790
4707
b.lock_write()
4791
self.add_cleanup(b.unlock)
4792
return self._run(b, tree, dry_run, verbose, revision, force, local=local)
4708
try:
4709
return self._run(b, tree, dry_run, verbose, revision, force,
4710
local=local)
4711
finally:
4712
if tree is not None:
4713
tree.unlock()
4714
else:
4715
b.unlock()
4793
4716
4794
4717
def _run(self, b, tree, dry_run, verbose, revision, force, local=False):
4795
4718
from bzrlib.log import log_formatter, show_log
4827
4750
end_revision=last_revno)
4828
4751
4829
4752
if dry_run:
4830
self.outf.write('Dry-run, pretending to remove'
4831
' the above revisions.\n')
4753
print 'Dry-run, pretending to remove the above revisions.'
4754
if not force:
4755
val = raw_input('Press <enter> to continue')
4832
4756
else:
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
4757
print 'The above revision(s) will be removed.'
4758
if not force:
4759
val = raw_input('Are you sure [y/N]? ')
4760
if val.lower() not in ('y', 'yes'):
4761
print 'Canceled'
4762
return 0
4839
4763
4840
4764
mutter('Uncommitting from {%s} to {%s}',
4841
4765
last_rev_id, rev_id)
4842
4766
uncommit(b, tree=tree, dry_run=dry_run, verbose=verbose,
4843
4767
revno=revno, local=local)
4844
self.outf.write('You can restore the old tip by running:\n'
4845
' bzr pull . -r revid:%s\n' % last_rev_id)
4768
note('You can restore the old tip by running:\n'
4769
' bzr pull . -r revid:%s', last_rev_id)
4846
4770
4847
4771
4848
4772
class cmd_break_lock(Command):
4849
__doc__ = """Break a dead lock on a repository, branch or working directory.
4773
"""Break a dead lock on a repository, branch or working directory.
4850
4774
4851
4775
CAUTION: Locks should only be broken when you are sure that the process
4852
4776
holding the lock has been stopped.
4853
4777
4854
You can get information on what locks are open via the 'bzr info
4855
[location]' command.
4778
You can get information on what locks are open via the 'bzr info' command.
4856
4779
4857
4780
:Examples:
4858
4781
bzr break-lock
4859
bzr break-lock bzr+ssh://example.com/bzr/foo
4860
4782
"""
4861
4783
takes_args = ['location?']
4862
4784
4871
4793
4872
4794
4873
4795
class cmd_wait_until_signalled(Command):
4874
__doc__ = """Test helper for test_start_and_stop_bzr_subprocess_send_signal.
4796
"""Test helper for test_start_and_stop_bzr_subprocess_send_signal.
4875
4797
4876
4798
This just prints a line to signal when it is ready, then blocks on stdin.
4877
4799
"""
4885
4807
4886
4808
4887
4809
class cmd_serve(Command):
4888
__doc__ = """Run the bzr server."""
4810
"""Run the bzr server."""
4889
4811
4890
4812
aliases = ['server']
4891
4813
4951
4873
4952
4874
4953
4875
class cmd_join(Command):
4954
__doc__ = """Combine a tree into its containing tree.
4876
"""Combine a tree into its containing tree.
4955
4877
4956
4878
This command requires the target tree to be in a rich-root format.
4957
4879
4997
4919
4998
4920
4999
4921
class cmd_split(Command):
5000
__doc__ = """Split a subdirectory of a tree into a separate tree.
4922
"""Split a subdirectory of a tree into a separate tree.
5001
4923
5002
4924
This command will produce a target tree in a format that supports
5003
4925
rich roots, like 'rich-root' or 'rich-root-pack'. These formats cannot be
5023
4945
5024
4946
5025
4947
class cmd_merge_directive(Command):
5026
__doc__ = """Generate a merge directive for auto-merge tools.
4948
"""Generate a merge directive for auto-merge tools.
5027
4949
5028
4950
A directive requests a merge to be performed, and also provides all the
5029
4951
information necessary to do so. This means it must either include a
5122
5044
5123
5045
5124
5046
class cmd_send(Command):
5125
__doc__ = """Mail or create a merge-directive for submitting changes.
5047
"""Mail or create a merge-directive for submitting changes.
5126
5048
5127
5049
A merge directive provides many things needed for requesting merges:
5128
5050
5134
5056
directly from the merge directive, without retrieving data from a
5135
5057
branch.
5136
5058
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.
5059
If --no-bundle is specified, then public_branch is needed (and must be
5060
up-to-date), so that the receiver can perform the merge using the
5061
public_branch. The public_branch is always included if known, so that
5062
people can check it later.
5063
5064
The submit branch defaults to the parent, but can be overridden. Both
5065
submit branch and public branch will be remembered if supplied.
5066
5067
If a public_branch is known for the submit_branch, that public submit
5068
branch is used in the merge instructions. This means that a local mirror
5069
can be used as your actual submit branch, once you have set public_branch
5070
for that mirror.
5163
5071
5164
5072
Mail is sent using your preferred mail program. This should be transparent
5165
5073
on Windows (it uses MAPI). On Linux, it requires the xdg-email utility.
5185
5093
5186
5094
The merge directives created by bzr send may be applied using bzr merge or
5187
5095
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.
5192
5096
"""
5193
5097
5194
5098
encoding_type = 'exact'
5210
5114
short_name='f',
5211
5115
type=unicode),
5212
5116
Option('output', short_name='o',
5213
help='Write merge directive to this file or directory; '
5117
help='Write merge directive to this file; '
5214
5118
'use - for stdout.',
5215
5119
type=unicode),
5216
5120
Option('strict',
5239
5143
5240
5144
5241
5145
class cmd_bundle_revisions(cmd_send):
5242
__doc__ = """Create a merge-directive for submitting changes.
5146
"""Create a merge-directive for submitting changes.
5243
5147
5244
5148
A merge directive provides many things needed for requesting merges:
5245
5149
5312
5216
5313
5217
5314
5218
class cmd_tag(Command):
5315
__doc__ = """Create, remove or modify a tag naming a revision.
5219
"""Create, remove or modify a tag naming a revision.
5316
5220
5317
5221
Tags give human-meaningful names to revisions. Commands that take a -r
5318
5222
(--revision) option can be given -rtag:X, where X is any previously
5326
5230
5327
5231
To rename a tag (change the name but keep it on the same revsion), run ``bzr
5328
5232
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.
5334
5233
"""
5335
5234
5336
5235
_see_also = ['commit', 'tags']
5337
takes_args = ['tag_name?']
5236
takes_args = ['tag_name']
5338
5237
takes_options = [
5339
5238
Option('delete',
5340
5239
help='Delete this tag rather than placing it.',
5350
5249
'revision',
5351
5250
]
5352
5251
5353
def run(self, tag_name=None,
5252
def run(self, tag_name,
5354
5253
delete=None,
5355
5254
directory='.',
5356
5255
force=None,
5358
5257
):
5359
5258
branch, relpath = Branch.open_containing(directory)
5360
5259
branch.lock_write()
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)
5260
try:
5261
if delete:
5262
branch.tags.delete_tag(tag_name)
5263
self.outf.write('Deleted tag %s.\n' % tag_name)
5374
5264
else:
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)
5265
if revision:
5266
if len(revision) != 1:
5267
raise errors.BzrCommandError(
5268
"Tags can only be placed on a single revision, "
5269
"not on a range")
5270
revision_id = revision[0].as_revision_id(branch)
5271
else:
5272
revision_id = branch.last_revision()
5273
if (not force) and branch.tags.has_tag(tag_name):
5274
raise errors.TagAlreadyExists(tag_name)
5275
branch.tags.set_tag(tag_name, revision_id)
5276
self.outf.write('Created tag %s.\n' % tag_name)
5277
finally:
5278
branch.unlock()
5385
5279
5386
5280
5387
5281
class cmd_tags(Command):
5388
__doc__ = """List tags.
5282
"""List tags.
5389
5283
5390
5284
This command shows a table of tag names and the revisions they reference.
5391
5285
"""
5420
5314
return
5421
5315
5422
5316
branch.lock_read()
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()
5317
try:
5318
if revision:
5319
graph = branch.repository.get_graph()
5320
rev1, rev2 = _get_revision_range(revision, branch, self.name())
5321
revid1, revid2 = rev1.rev_id, rev2.rev_id
5322
# only show revisions between revid1 and revid2 (inclusive)
5323
tags = [(tag, revid) for tag, revid in tags if
5324
graph.is_between(revid, revid1, revid2)]
5325
if sort == 'alpha':
5326
tags.sort()
5327
elif sort == 'time':
5328
timestamps = {}
5329
for tag, revid in tags:
5330
try:
5331
revobj = branch.repository.get_revision(revid)
5332
except errors.NoSuchRevision:
5333
timestamp = sys.maxint # place them at the end
5334
else:
5335
timestamp = revobj.timestamp
5336
timestamps[revid] = timestamp
5337
tags.sort(key=lambda x: timestamps[x[1]])
5338
if not show_ids:
5339
# [ (tag, revid), ... ] -> [ (tag, dotted_revno), ... ]
5340
for index, (tag, revid) in enumerate(tags):
5341
try:
5342
revno = branch.revision_id_to_dotted_revno(revid)
5343
if isinstance(revno, tuple):
5344
revno = '.'.join(map(str, revno))
5345
except errors.NoSuchRevision:
5346
# Bad tag data/merges can lead to tagged revisions
5347
# which are not in this branch. Fail gracefully ...
5348
revno = '?'
5349
tags[index] = (tag, revno)
5350
finally:
5351
branch.unlock()
5457
5352
for tag, revspec in tags:
5458
5353
self.outf.write('%-20s %s\n' % (tag, revspec))
5459
5354
5460
5355
5461
5356
class cmd_reconfigure(Command):
5462
__doc__ = """Reconfigure the type of a bzr directory.
5357
"""Reconfigure the type of a bzr directory.
5463
5358
5464
5359
A target configuration must be specified.
5465
5360
5550
5445
5551
5446
5552
5447
class cmd_switch(Command):
5553
__doc__ = """Set the branch of a checkout and update.
5448
"""Set the branch of a checkout and update.
5554
5449
5555
5450
For lightweight checkouts, this changes the branch being referenced.
5556
5451
For heavyweight checkouts, this checks that there are no local commits
5572
5467
that of the master.
5573
5468
"""
5574
5469
5575
takes_args = ['to_location?']
5470
takes_args = ['to_location']
5576
5471
takes_options = [Option('force',
5577
5472
help='Switch even if local commits will be lost.'),
5578
'revision',
5579
5473
Option('create-branch', short_name='b',
5580
5474
help='Create the target branch from this one before'
5581
5475
' switching to it.'),
5582
]
5476
]
5583
5477
5584
def run(self, to_location=None, force=False, create_branch=False,
5585
revision=None):
5478
def run(self, to_location, force=False, create_branch=False):
5586
5479
from bzrlib import switch
5587
5480
tree_location = '.'
5588
revision = _get_one_revision('switch', revision)
5589
5481
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 = '.'
5595
5482
try:
5596
5483
branch = control_dir.open_branch()
5597
5484
had_explicit_nick = branch.get_config().has_explicit_nickname()
5611
5498
to_branch = branch.bzrdir.sprout(to_location,
5612
5499
possible_transports=[branch.bzrdir.root_transport],
5613
5500
source_branch=branch).open_branch()
5501
# try:
5502
# from_branch = control_dir.open_branch()
5503
# except errors.NotBranchError:
5504
# raise BzrCommandError('Cannot create a branch from this'
5505
# ' location when we cannot open this branch')
5506
# from_branch.bzrdir.sprout(
5507
pass
5614
5508
else:
5615
5509
try:
5616
5510
to_branch = Branch.open(to_location)
5618
5512
this_url = self._get_branch_location(control_dir)
5619
5513
to_branch = Branch.open(
5620
5514
urlutils.join(this_url, '..', to_location))
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)
5515
switch.switch(control_dir, to_branch, force)
5624
5516
if had_explicit_nick:
5625
5517
branch = control_dir.open_branch() #get the new branch!
5626
5518
branch.nick = to_branch.nick
5646
5538
5647
5539
5648
5540
class cmd_view(Command):
5649
__doc__ = """Manage filtered views.
5541
"""Manage filtered views.
5650
5542
5651
5543
Views provide a mask over the tree so that users can focus on
5652
5544
a subset of a tree when doing their work. After creating a view,
5800
5692
5801
5693
5802
5694
class cmd_hooks(Command):
5803
__doc__ = """Show hooks."""
5695
"""Show hooks."""
5804
5696
5805
5697
hidden = True
5806
5698
5819
5711
self.outf.write(" <no hooks installed>\n")
5820
5712
5821
5713
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
5847
5714
class cmd_shelve(Command):
5848
__doc__ = """Temporarily set aside some changes from the current tree.
5715
"""Temporarily set aside some changes from the current tree.
5849
5716
5850
5717
Shelve allows you to temporarily put changes you've made "on the shelf",
5851
5718
ie. out of the way, until a later time when you can bring them back from
5905
5772
def run_for_list(self):
5906
5773
tree = WorkingTree.open_containing('.')[0]
5907
5774
tree.lock_read()
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
5775
try:
5776
manager = tree.get_shelf_manager()
5777
shelves = manager.active_shelves()
5778
if len(shelves) == 0:
5779
note('No shelved changes.')
5780
return 0
5781
for shelf_id in reversed(shelves):
5782
message = manager.get_metadata(shelf_id).get('message')
5783
if message is None:
5784
message = '<no message>'
5785
self.outf.write('%3d: %s\n' % (shelf_id, message))
5786
return 1
5787
finally:
5788
tree.unlock()
5920
5789
5921
5790
5922
5791
class cmd_unshelve(Command):
5923
__doc__ = """Restore shelved changes.
5792
"""Restore shelved changes.
5924
5793
5925
5794
By default, the most recently shelved changes are restored. However if you
5926
5795
specify a shelf by id those changes will be restored instead. This works
5934
5803
enum_switch=False, value_switches=True,
5935
5804
apply="Apply changes and remove from the shelf.",
5936
5805
dry_run="Show changes, but do not apply or remove them.",
5937
preview="Instead of unshelving the changes, show the diff that "
5938
"would result from unshelving.",
5939
5806
delete_only="Delete changes without applying them.",
5940
5807
keep="Apply changes but don't delete them.",
5941
5808
)
5952
5819
5953
5820
5954
5821
class cmd_clean_tree(Command):
5955
__doc__ = """Remove unwanted files from working tree.
5822
"""Remove unwanted files from working tree.
5956
5823
5957
5824
By default, only unknown files, not ignored files, are deleted. Versioned
5958
5825
files are never deleted.
5986
5853
5987
5854
5988
5855
class cmd_reference(Command):
5989
__doc__ = """list, view and set branch locations for nested trees.
5856
"""list, view and set branch locations for nested trees.
5990
5857
5991
5858
If no arguments are provided, lists the branch locations for nested trees.
5992
5859
If one argument is provided, display the branch location for that tree.
6032
5899
self.outf.write('%s %s\n' % (path, location))
6033
5900
6034
5901
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)
5902
# these get imported and then picked up by the scan for cmd_*
5903
# TODO: Some more consistent way to split command definitions across files;
5904
# we do need to load at least some information about them to know of
5905
# aliases. ideally we would avoid loading the implementation until the
5906
# details were needed.
5907
from bzrlib.cmd_version_info import cmd_version_info
5908
from bzrlib.conflicts import cmd_resolve, cmd_conflicts, restore
5909
from bzrlib.bundle.commands import (
5910
cmd_bundle_info,
5911
)
5912
from bzrlib.foreign import cmd_dpush
5913
from bzrlib.sign_my_commits import cmd_sign_my_commits
5914
from bzrlib.weave_commands import cmd_versionedfile_list, \
5915
cmd_weave_plan_merge, cmd_weave_merge_text
Loggerhead is a web-based interface for Breezy
Version: 2.0.1