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