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