« back to all changes in this revision
Viewing changes to bzrlib/builtins.py
- browse files at revision 4913.5.14
- compare with another revision
- download diff
- download tarball
- view history from revision 4913.5.14
- Committer: Gordon Tyler
- Date: 2010-01-14 15:24:04 UTC
- mto: (5037.3.1 integration)
- mto: This revision was merged to the branch mainline in revision 5046.
- Revision ID: gordon@doxxx.net-20100114152404-d64ik2afl96lcml0
Reverted changes to test_rules since the original should work now.
- files added:
- bzrlib/weave_commands.py
- files removed:
- .testr.conf
- apport
- bzrlib/help_topics/es
- bzrlib/plugins/news_merge
- bzrlib/plugins/news_merge/tests
- bzrlib/tests/per_bzrdir_colo
- doc/en/whats-new
- files renamed:
- bzrlib/help_topics/en/conflict-types.txt => bzrlib/help_topics/en/conflicts.txt
- bzrlib/tests/test__bencode.py => bzrlib/tests/test_bencode.py
- bzrlib/help_topics/es/conflict-types.txt => doc/es/user-guide/resolving_conflicts.txt
- files modified:
- .bzrignore
added
removed
bzrlib/builtins.py
1
# Copyright (C) 2005-2010 Canonical Ltd
1
# Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
54
54
)
55
55
from bzrlib.branch import Branch
56
56
from bzrlib.conflicts import ConflictList
57
from bzrlib.transport import memory
58
57
from bzrlib.revisionspec import RevisionSpec, RevisionInfo
59
58
from bzrlib.smtp_connection import SMTPConnection
60
59
from bzrlib.workingtree import WorkingTree
61
60
""")
62
61
63
from bzrlib.commands import (
64
Command,
65
builtin_command_registry,
66
display_command,
67
)
62
from bzrlib.commands import Command, display_command
68
63
from bzrlib.option import (
69
64
ListOption,
70
65
Option,
239
234
# opens the branch?)
240
235
241
236
class cmd_status(Command):
242
__doc__ = """Display status summary.
237
"""Display status summary.
243
238
244
239
This reports on versioned and unknown files, reporting them
245
240
grouped by state. Possible states are:
332
327
333
328
334
329
class cmd_cat_revision(Command):
335
__doc__ = """Write out metadata for a revision.
330
"""Write out metadata for a revision.
336
331
337
332
The revision to print can either be specified by a specific
338
333
revision identifier, or you can use --revision.
344
339
# cat-revision is more for frontends so should be exact
345
340
encoding = 'strict'
346
341
347
def print_revision(self, revisions, revid):
348
stream = revisions.get_record_stream([(revid,)], 'unordered', True)
349
record = stream.next()
350
if record.storage_kind == 'absent':
351
raise errors.NoSuchRevision(revisions, revid)
352
revtext = record.get_bytes_as('fulltext')
353
self.outf.write(revtext.decode('utf-8'))
354
355
342
@display_command
356
343
def run(self, revision_id=None, revision=None):
357
344
if revision_id is not None and revision is not None:
362
349
' --revision or a revision_id')
363
350
b = WorkingTree.open_containing(u'.')[0].branch
364
351
365
revisions = b.repository.revisions
366
if revisions is None:
367
raise errors.BzrCommandError('Repository %r does not support '
368
'access to raw revision texts')
352
# TODO: jam 20060112 should cat-revision always output utf-8?
353
if revision_id is not None:
354
revision_id = osutils.safe_revision_id(revision_id, warn=False)
355
try:
356
self.outf.write(b.repository.get_revision_xml(revision_id).decode('utf-8'))
357
except errors.NoSuchRevision:
358
msg = "The repository %s contains no revision %s." % (b.repository.base,
359
revision_id)
360
raise errors.BzrCommandError(msg)
361
elif revision is not None:
362
for rev in revision:
363
if rev is None:
364
raise errors.BzrCommandError('You cannot specify a NULL'
365
' revision.')
366
rev_id = rev.as_revision_id(b)
367
self.outf.write(b.repository.get_revision_xml(rev_id).decode('utf-8'))
369
368
370
b.repository.lock_read()
371
try:
372
# TODO: jam 20060112 should cat-revision always output utf-8?
373
if revision_id is not None:
374
revision_id = osutils.safe_revision_id(revision_id, warn=False)
375
try:
376
self.print_revision(revisions, revision_id)
377
except errors.NoSuchRevision:
378
msg = "The repository %s contains no revision %s." % (
379
b.repository.base, revision_id)
380
raise errors.BzrCommandError(msg)
381
elif revision is not None:
382
for rev in revision:
383
if rev is None:
384
raise errors.BzrCommandError(
385
'You cannot specify a NULL revision.')
386
rev_id = rev.as_revision_id(b)
387
self.print_revision(revisions, rev_id)
388
finally:
389
b.repository.unlock()
390
391
369
392
370
class cmd_dump_btree(Command):
393
__doc__ = """Dump the contents of a btree index file to stdout.
371
"""Dump the contents of a btree index file to stdout.
394
372
395
373
PATH is a btree index file, it can be any URL. This includes things like
396
374
.bzr/repository/pack-names, or .bzr/repository/indices/a34b3a...ca4a4.iix
460
438
for node in bt.iter_all_entries():
461
439
# Node is made up of:
462
440
# (index, key, value, [references])
463
try:
464
refs = node[3]
465
except IndexError:
466
refs_as_tuples = None
467
else:
468
refs_as_tuples = static_tuple.as_tuples(refs)
441
refs_as_tuples = static_tuple.as_tuples(node[3])
469
442
as_tuple = (tuple(node[1]), node[2], refs_as_tuples)
470
443
self.outf.write('%s\n' % (as_tuple,))
471
444
472
445
473
446
class cmd_remove_tree(Command):
474
__doc__ = """Remove the working tree from a given branch/checkout.
447
"""Remove the working tree from a given branch/checkout.
475
448
476
449
Since a lightweight checkout is little more than a working tree
477
450
this will refuse to run against one.
479
452
To re-create the working tree, use "bzr checkout".
480
453
"""
481
454
_see_also = ['checkout', 'working-trees']
482
takes_args = ['location*']
455
takes_args = ['location?']
483
456
takes_options = [
484
457
Option('force',
485
458
help='Remove the working tree even if it has '
486
459
'uncommitted changes.'),
487
460
]
488
461
489
def run(self, location_list, force=False):
490
if not location_list:
491
location_list=['.']
492
493
for location in location_list:
494
d = bzrdir.BzrDir.open(location)
495
496
try:
497
working = d.open_workingtree()
498
except errors.NoWorkingTree:
499
raise errors.BzrCommandError("No working tree to remove")
500
except errors.NotLocalUrl:
501
raise errors.BzrCommandError("You cannot remove the working tree"
502
" of a remote path")
503
if not force:
504
if (working.has_changes()):
505
raise errors.UncommittedChanges(working)
506
507
if working.user_url != working.branch.user_url:
508
raise errors.BzrCommandError("You cannot remove the working tree"
509
" from a lightweight checkout")
510
511
d.destroy_workingtree()
462
def run(self, location='.', force=False):
463
d = bzrdir.BzrDir.open(location)
464
465
try:
466
working = d.open_workingtree()
467
except errors.NoWorkingTree:
468
raise errors.BzrCommandError("No working tree to remove")
469
except errors.NotLocalUrl:
470
raise errors.BzrCommandError("You cannot remove the working tree"
471
" of a remote path")
472
if not force:
473
if (working.has_changes()):
474
raise errors.UncommittedChanges(working)
475
476
working_path = working.bzrdir.root_transport.base
477
branch_path = working.branch.bzrdir.root_transport.base
478
if working_path != branch_path:
479
raise errors.BzrCommandError("You cannot remove the working tree"
480
" from a lightweight checkout")
481
482
d.destroy_workingtree()
512
483
513
484
514
485
class cmd_revno(Command):
515
__doc__ = """Show current revision number.
486
"""Show current revision number.
516
487
517
488
This is equal to the number of revisions on this branch.
518
489
"""
528
499
if tree:
529
500
try:
530
501
wt = WorkingTree.open_containing(location)[0]
531
self.add_cleanup(wt.lock_read().unlock)
502
wt.lock_read()
532
503
except (errors.NoWorkingTree, errors.NotLocalUrl):
533
504
raise errors.NoWorkingTree(location)
534
revid = wt.last_revision()
535
505
try:
536
revno_t = wt.branch.revision_id_to_dotted_revno(revid)
537
except errors.NoSuchRevision:
538
revno_t = ('???',)
539
revno = ".".join(str(n) for n in revno_t)
506
revid = wt.last_revision()
507
try:
508
revno_t = wt.branch.revision_id_to_dotted_revno(revid)
509
except errors.NoSuchRevision:
510
revno_t = ('???',)
511
revno = ".".join(str(n) for n in revno_t)
512
finally:
513
wt.unlock()
540
514
else:
541
515
b = Branch.open_containing(location)[0]
542
self.add_cleanup(b.lock_read().unlock)
543
revno = b.revno()
544
self.cleanup_now()
516
b.lock_read()
517
try:
518
revno = b.revno()
519
finally:
520
b.unlock()
521
545
522
self.outf.write(str(revno) + '\n')
546
523
547
524
548
525
class cmd_revision_info(Command):
549
__doc__ = """Show revision number and revision id for a given revision identifier.
526
"""Show revision number and revision id for a given revision identifier.
550
527
"""
551
528
hidden = True
552
529
takes_args = ['revision_info*']
568
545
try:
569
546
wt = WorkingTree.open_containing(directory)[0]
570
547
b = wt.branch
571
self.add_cleanup(wt.lock_read().unlock)
548
wt.lock_read()
572
549
except (errors.NoWorkingTree, errors.NotLocalUrl):
573
550
wt = None
574
551
b = Branch.open_containing(directory)[0]
575
self.add_cleanup(b.lock_read().unlock)
576
revision_ids = []
577
if revision is not None:
578
revision_ids.extend(rev.as_revision_id(b) for rev in revision)
579
if revision_info_list is not None:
580
for rev_str in revision_info_list:
581
rev_spec = RevisionSpec.from_string(rev_str)
582
revision_ids.append(rev_spec.as_revision_id(b))
583
# No arguments supplied, default to the last revision
584
if len(revision_ids) == 0:
585
if tree:
586
if wt is None:
587
raise errors.NoWorkingTree(directory)
588
revision_ids.append(wt.last_revision())
552
b.lock_read()
553
try:
554
revision_ids = []
555
if revision is not None:
556
revision_ids.extend(rev.as_revision_id(b) for rev in revision)
557
if revision_info_list is not None:
558
for rev_str in revision_info_list:
559
rev_spec = RevisionSpec.from_string(rev_str)
560
revision_ids.append(rev_spec.as_revision_id(b))
561
# No arguments supplied, default to the last revision
562
if len(revision_ids) == 0:
563
if tree:
564
if wt is None:
565
raise errors.NoWorkingTree(directory)
566
revision_ids.append(wt.last_revision())
567
else:
568
revision_ids.append(b.last_revision())
569
570
revinfos = []
571
maxlen = 0
572
for revision_id in revision_ids:
573
try:
574
dotted_revno = b.revision_id_to_dotted_revno(revision_id)
575
revno = '.'.join(str(i) for i in dotted_revno)
576
except errors.NoSuchRevision:
577
revno = '???'
578
maxlen = max(maxlen, len(revno))
579
revinfos.append([revno, revision_id])
580
finally:
581
if wt is None:
582
b.unlock()
589
583
else:
590
revision_ids.append(b.last_revision())
591
592
revinfos = []
593
maxlen = 0
594
for revision_id in revision_ids:
595
try:
596
dotted_revno = b.revision_id_to_dotted_revno(revision_id)
597
revno = '.'.join(str(i) for i in dotted_revno)
598
except errors.NoSuchRevision:
599
revno = '???'
600
maxlen = max(maxlen, len(revno))
601
revinfos.append([revno, revision_id])
602
603
self.cleanup_now()
584
wt.unlock()
585
604
586
for ri in revinfos:
605
587
self.outf.write('%*s %s\n' % (maxlen, ri[0], ri[1]))
606
588
607
589
608
590
class cmd_add(Command):
609
__doc__ = """Add specified files or directories.
591
"""Add specified files or directories.
610
592
611
593
In non-recursive mode, all the named items are added, regardless
612
594
of whether they were previously ignored. A warning is given if
677
659
should_print=(not is_quiet()))
678
660
679
661
if base_tree:
680
self.add_cleanup(base_tree.lock_read().unlock)
681
tree, file_list = tree_files_for_add(file_list)
682
added, ignored = tree.smart_add(file_list, not
683
no_recurse, action=action, save=not dry_run)
684
self.cleanup_now()
662
base_tree.lock_read()
663
try:
664
tree, file_list = tree_files_for_add(file_list)
665
added, ignored = tree.smart_add(file_list, not
666
no_recurse, action=action, save=not dry_run)
667
finally:
668
if base_tree is not None:
669
base_tree.unlock()
685
670
if len(ignored) > 0:
686
671
if verbose:
687
672
for glob in sorted(ignored.keys()):
691
676
692
677
693
678
class cmd_mkdir(Command):
694
__doc__ = """Create a new versioned directory.
679
"""Create a new versioned directory.
695
680
696
681
This is equivalent to creating the directory and then adding it.
697
682
"""
701
686
702
687
def run(self, dir_list):
703
688
for d in dir_list:
689
os.mkdir(d)
704
690
wt, dd = WorkingTree.open_containing(d)
705
base = os.path.dirname(dd)
706
id = wt.path2id(base)
707
if id != None:
708
os.mkdir(d)
709
wt.add([dd])
710
self.outf.write('added %s\n' % d)
711
else:
712
raise errors.NotVersionedError(path=base)
691
wt.add([dd])
692
self.outf.write('added %s\n' % d)
713
693
714
694
715
695
class cmd_relpath(Command):
716
__doc__ = """Show path of a file relative to root"""
696
"""Show path of a file relative to root"""
717
697
718
698
takes_args = ['filename']
719
699
hidden = True
728
708
729
709
730
710
class cmd_inventory(Command):
731
__doc__ = """Show inventory of the current working copy or a revision.
711
"""Show inventory of the current working copy or a revision.
732
712
733
713
It is possible to limit the output to a particular entry
734
714
type using the --kind option. For example: --kind file.
755
735
756
736
revision = _get_one_revision('inventory', revision)
757
737
work_tree, file_list = tree_files(file_list)
758
self.add_cleanup(work_tree.lock_read().unlock)
759
if revision is not None:
760
tree = revision.as_tree(work_tree.branch)
761
762
extra_trees = [work_tree]
763
self.add_cleanup(tree.lock_read().unlock)
764
else:
765
tree = work_tree
766
extra_trees = []
767
768
if file_list is not None:
769
file_ids = tree.paths2ids(file_list, trees=extra_trees,
770
require_versioned=True)
771
# find_ids_across_trees may include some paths that don't
772
# exist in 'tree'.
773
entries = sorted((tree.id2path(file_id), tree.inventory[file_id])
774
for file_id in file_ids if file_id in tree)
775
else:
776
entries = tree.inventory.entries()
777
778
self.cleanup_now()
738
work_tree.lock_read()
739
try:
740
if revision is not None:
741
tree = revision.as_tree(work_tree.branch)
742
743
extra_trees = [work_tree]
744
tree.lock_read()
745
else:
746
tree = work_tree
747
extra_trees = []
748
749
if file_list is not None:
750
file_ids = tree.paths2ids(file_list, trees=extra_trees,
751
require_versioned=True)
752
# find_ids_across_trees may include some paths that don't
753
# exist in 'tree'.
754
entries = sorted((tree.id2path(file_id), tree.inventory[file_id])
755
for file_id in file_ids if file_id in tree)
756
else:
757
entries = tree.inventory.entries()
758
finally:
759
tree.unlock()
760
if tree is not work_tree:
761
work_tree.unlock()
762
779
763
for path, entry in entries:
780
764
if kind and kind != entry.kind:
781
765
continue
787
771
788
772
789
773
class cmd_mv(Command):
790
__doc__ = """Move or rename a file.
774
"""Move or rename a file.
791
775
792
776
:Usage:
793
777
bzr mv OLDNAME NEWNAME
826
810
if len(names_list) < 2:
827
811
raise errors.BzrCommandError("missing file argument")
828
812
tree, rel_names = tree_files(names_list, canonicalize=False)
829
self.add_cleanup(tree.lock_tree_write().unlock)
830
self._run(tree, names_list, rel_names, after)
813
tree.lock_tree_write()
814
try:
815
self._run(tree, names_list, rel_names, after)
816
finally:
817
tree.unlock()
831
818
832
819
def run_auto(self, names_list, after, dry_run):
833
820
if names_list is not None and len(names_list) > 1:
837
824
raise errors.BzrCommandError('--after cannot be specified with'
838
825
' --auto.')
839
826
work_tree, file_list = tree_files(names_list, default_branch='.')
840
self.add_cleanup(work_tree.lock_tree_write().unlock)
841
rename_map.RenameMap.guess_renames(work_tree, dry_run)
827
work_tree.lock_tree_write()
828
try:
829
rename_map.RenameMap.guess_renames(work_tree, dry_run)
830
finally:
831
work_tree.unlock()
842
832
843
833
def _run(self, tree, names_list, rel_names, after):
844
834
into_existing = osutils.isdir(names_list[-1])
922
912
923
913
924
914
class cmd_pull(Command):
925
__doc__ = """Turn this branch into a mirror of another branch.
915
"""Turn this branch into a mirror of another branch.
926
916
927
917
By default, this command only works on branches that have not diverged.
928
918
Branches are considered diverged if the destination branch's most recent
977
967
try:
978
968
tree_to = WorkingTree.open_containing(directory)[0]
979
969
branch_to = tree_to.branch
980
self.add_cleanup(tree_to.lock_write().unlock)
981
970
except errors.NoWorkingTree:
982
971
tree_to = None
983
972
branch_to = Branch.open_containing(directory)[0]
984
self.add_cleanup(branch_to.lock_write().unlock)
985
973
986
974
if local and not branch_to.get_bound_location():
987
975
raise errors.LocalRequiresBoundBranch()
988
976
1018
1006
else:
1019
1007
branch_from = Branch.open(location,
1020
1008
possible_transports=possible_transports)
1021
self.add_cleanup(branch_from.lock_read().unlock)
1022
1009
1023
1010
if branch_to.get_parent() is None or remember:
1024
1011
branch_to.set_parent(branch_from.base)
1025
1012
1026
if revision is not None:
1027
revision_id = revision.as_revision_id(branch_from)
1028
1029
if tree_to is not None:
1030
view_info = _get_view_info_for_change_reporter(tree_to)
1031
change_reporter = delta._ChangeReporter(
1032
unversioned_filter=tree_to.is_ignored,
1033
view_info=view_info)
1034
result = tree_to.pull(
1035
branch_from, overwrite, revision_id, change_reporter,
1036
possible_transports=possible_transports, local=local)
1037
else:
1038
result = branch_to.pull(
1039
branch_from, overwrite, revision_id, local=local)
1040
1041
result.report(self.outf)
1042
if verbose and result.old_revid != result.new_revid:
1043
log.show_branch_change(
1044
branch_to, self.outf, result.old_revno,
1045
result.old_revid)
1013
if branch_from is not branch_to:
1014
branch_from.lock_read()
1015
try:
1016
if revision is not None:
1017
revision_id = revision.as_revision_id(branch_from)
1018
1019
branch_to.lock_write()
1020
try:
1021
if tree_to is not None:
1022
view_info = _get_view_info_for_change_reporter(tree_to)
1023
change_reporter = delta._ChangeReporter(
1024
unversioned_filter=tree_to.is_ignored,
1025
view_info=view_info)
1026
result = tree_to.pull(
1027
branch_from, overwrite, revision_id, change_reporter,
1028
possible_transports=possible_transports, local=local)
1029
else:
1030
result = branch_to.pull(
1031
branch_from, overwrite, revision_id, local=local)
1032
1033
result.report(self.outf)
1034
if verbose and result.old_revid != result.new_revid:
1035
log.show_branch_change(
1036
branch_to, self.outf, result.old_revno,
1037
result.old_revid)
1038
finally:
1039
branch_to.unlock()
1040
finally:
1041
if branch_from is not branch_to:
1042
branch_from.unlock()
1046
1043
1047
1044
1048
1045
class cmd_push(Command):
1049
__doc__ = """Update a mirror of this branch.
1046
"""Update a mirror of this branch.
1050
1047
1051
1048
The target branch will not have its working tree populated because this
1052
1049
is both expensive, and is not supported on remote file systems.
1113
1110
# Get the source branch
1114
1111
(tree, br_from,
1115
1112
_unused) = bzrdir.BzrDir.open_containing_tree_or_branch(directory)
1113
if strict is None:
1114
strict = br_from.get_config().get_user_option_as_bool('push_strict')
1115
if strict is None: strict = True # default value
1116
1116
# Get the tip's revision_id
1117
1117
revision = _get_one_revision('push', revision)
1118
1118
if revision is not None:
1119
1119
revision_id = revision.in_history(br_from).rev_id
1120
1120
else:
1121
1121
revision_id = None
1122
if tree is not None and revision_id is None:
1123
tree.check_changed_or_out_of_date(
1124
strict, 'push_strict',
1125
more_error='Use --no-strict to force the push.',
1126
more_warning='Uncommitted changes will not be pushed.')
1122
if strict and tree is not None and revision_id is None:
1123
if (tree.has_changes()):
1124
raise errors.UncommittedChanges(
1125
tree, more='Use --no-strict to force the push.')
1126
if tree.last_revision() != tree.branch.last_revision():
1127
# The tree has lost sync with its branch, there is little
1128
# chance that the user is aware of it but he can still force
1129
# the push with --no-strict
1130
raise errors.OutOfDateTree(
1131
tree, more='Use --no-strict to force the push.')
1132
1127
1133
# Get the stacked_on branch, if any
1128
1134
if stacked_on is not None:
1129
1135
stacked_on = urlutils.normalize_url(stacked_on)
1161
1167
1162
1168
1163
1169
class cmd_branch(Command):
1164
__doc__ = """Create a new branch that is a copy of an existing branch.
1170
"""Create a new branch that is a copy of an existing branch.
1165
1171
1166
1172
If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will
1167
1173
be used. In other words, "branch ../foo/bar" will attempt to create ./bar.
1194
1200
' directory exists, but does not already'
1195
1201
' have a control directory. This flag will'
1196
1202
' allow branch to proceed.'),
1197
Option('bind',
1198
help="Bind new branch to from location."),
1199
1203
]
1200
1204
aliases = ['get', 'clone']
1201
1205
1202
1206
def run(self, from_location, to_location=None, revision=None,
1203
1207
hardlink=False, stacked=False, standalone=False, no_tree=False,
1204
use_existing_dir=False, switch=False, bind=False):
1208
use_existing_dir=False, switch=False):
1205
1209
from bzrlib import switch as _mod_switch
1206
1210
from bzrlib.tag import _merge_tags_if_possible
1207
1211
accelerator_tree, br_from = bzrdir.BzrDir.open_tree_or_branch(
1208
1212
from_location)
1209
1213
revision = _get_one_revision('branch', revision)
1210
self.add_cleanup(br_from.lock_read().unlock)
1211
if revision is not None:
1212
revision_id = revision.as_revision_id(br_from)
1213
else:
1214
# FIXME - wt.last_revision, fallback to branch, fall back to
1215
# None or perhaps NULL_REVISION to mean copy nothing
1216
# RBC 20060209
1217
revision_id = br_from.last_revision()
1218
if to_location is None:
1219
to_location = urlutils.derive_to_location(from_location)
1220
to_transport = transport.get_transport(to_location)
1214
br_from.lock_read()
1221
1215
try:
1222
to_transport.mkdir('.')
1223
except errors.FileExists:
1224
if not use_existing_dir:
1225
raise errors.BzrCommandError('Target directory "%s" '
1226
'already exists.' % to_location)
1216
if revision is not None:
1217
revision_id = revision.as_revision_id(br_from)
1227
1218
else:
1228
try:
1229
bzrdir.BzrDir.open_from_transport(to_transport)
1230
except errors.NotBranchError:
1231
pass
1219
# FIXME - wt.last_revision, fallback to branch, fall back to
1220
# None or perhaps NULL_REVISION to mean copy nothing
1221
# RBC 20060209
1222
revision_id = br_from.last_revision()
1223
if to_location is None:
1224
to_location = urlutils.derive_to_location(from_location)
1225
to_transport = transport.get_transport(to_location)
1226
try:
1227
to_transport.mkdir('.')
1228
except errors.FileExists:
1229
if not use_existing_dir:
1230
raise errors.BzrCommandError('Target directory "%s" '
1231
'already exists.' % to_location)
1232
1232
else:
1233
raise errors.AlreadyBranchError(to_location)
1234
except errors.NoSuchFile:
1235
raise errors.BzrCommandError('Parent of "%s" does not exist.'
1236
% to_location)
1237
try:
1238
# preserve whatever source format we have.
1239
dir = br_from.bzrdir.sprout(to_transport.base, revision_id,
1240
possible_transports=[to_transport],
1241
accelerator_tree=accelerator_tree,
1242
hardlink=hardlink, stacked=stacked,
1243
force_new_repo=standalone,
1244
create_tree_if_local=not no_tree,
1245
source_branch=br_from)
1246
branch = dir.open_branch()
1247
except errors.NoSuchRevision:
1248
to_transport.delete_tree('.')
1249
msg = "The branch %s has no revision %s." % (from_location,
1250
revision)
1251
raise errors.BzrCommandError(msg)
1252
_merge_tags_if_possible(br_from, branch)
1253
# If the source branch is stacked, the new branch may
1254
# be stacked whether we asked for that explicitly or not.
1255
# We therefore need a try/except here and not just 'if stacked:'
1256
try:
1257
note('Created new stacked branch referring to %s.' %
1258
branch.get_stacked_on_url())
1259
except (errors.NotStacked, errors.UnstackableBranchFormat,
1260
errors.UnstackableRepositoryFormat), e:
1261
note('Branched %d revision(s).' % branch.revno())
1262
if bind:
1263
# Bind to the parent
1264
parent_branch = Branch.open(from_location)
1265
branch.bind(parent_branch)
1266
note('New branch bound to %s' % from_location)
1267
if switch:
1268
# Switch to the new branch
1269
wt, _ = WorkingTree.open_containing('.')
1270
_mod_switch.switch(wt.bzrdir, branch)
1271
note('Switched to branch: %s',
1272
urlutils.unescape_for_display(branch.base, 'utf-8'))
1233
try:
1234
bzrdir.BzrDir.open_from_transport(to_transport)
1235
except errors.NotBranchError:
1236
pass
1237
else:
1238
raise errors.AlreadyBranchError(to_location)
1239
except errors.NoSuchFile:
1240
raise errors.BzrCommandError('Parent of "%s" does not exist.'
1241
% to_location)
1242
try:
1243
# preserve whatever source format we have.
1244
dir = br_from.bzrdir.sprout(to_transport.base, revision_id,
1245
possible_transports=[to_transport],
1246
accelerator_tree=accelerator_tree,
1247
hardlink=hardlink, stacked=stacked,
1248
force_new_repo=standalone,
1249
create_tree_if_local=not no_tree,
1250
source_branch=br_from)
1251
branch = dir.open_branch()
1252
except errors.NoSuchRevision:
1253
to_transport.delete_tree('.')
1254
msg = "The branch %s has no revision %s." % (from_location,
1255
revision)
1256
raise errors.BzrCommandError(msg)
1257
_merge_tags_if_possible(br_from, branch)
1258
# If the source branch is stacked, the new branch may
1259
# be stacked whether we asked for that explicitly or not.
1260
# We therefore need a try/except here and not just 'if stacked:'
1261
try:
1262
note('Created new stacked branch referring to %s.' %
1263
branch.get_stacked_on_url())
1264
except (errors.NotStacked, errors.UnstackableBranchFormat,
1265
errors.UnstackableRepositoryFormat), e:
1266
note('Branched %d revision(s).' % branch.revno())
1267
if switch:
1268
# Switch to the new branch
1269
wt, _ = WorkingTree.open_containing('.')
1270
_mod_switch.switch(wt.bzrdir, branch)
1271
note('Switched to branch: %s',
1272
urlutils.unescape_for_display(branch.base, 'utf-8'))
1273
finally:
1274
br_from.unlock()
1273
1275
1274
1276
1275
1277
class cmd_checkout(Command):
1276
__doc__ = """Create a new checkout of an existing branch.
1278
"""Create a new checkout of an existing branch.
1277
1279
1278
1280
If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree for
1279
1281
the branch found in '.'. This is useful if you have removed the working tree
1342
1344
1343
1345
1344
1346
class cmd_renames(Command):
1345
__doc__ = """Show list of renamed files.
1347
"""Show list of renamed files.
1346
1348
"""
1347
1349
# TODO: Option to show renames between two historical versions.
1348
1350
1353
1355
@display_command
1354
1356
def run(self, dir=u'.'):
1355
1357
tree = WorkingTree.open_containing(dir)[0]
1356
self.add_cleanup(tree.lock_read().unlock)
1357
new_inv = tree.inventory
1358
old_tree = tree.basis_tree()
1359
self.add_cleanup(old_tree.lock_read().unlock)
1360
old_inv = old_tree.inventory
1361
renames = []
1362
iterator = tree.iter_changes(old_tree, include_unchanged=True)
1363
for f, paths, c, v, p, n, k, e in iterator:
1364
if paths[0] == paths[1]:
1365
continue
1366
if None in (paths):
1367
continue
1368
renames.append(paths)
1369
renames.sort()
1370
for old_name, new_name in renames:
1371
self.outf.write("%s => %s\n" % (old_name, new_name))
1358
tree.lock_read()
1359
try:
1360
new_inv = tree.inventory
1361
old_tree = tree.basis_tree()
1362
old_tree.lock_read()
1363
try:
1364
old_inv = old_tree.inventory
1365
renames = []
1366
iterator = tree.iter_changes(old_tree, include_unchanged=True)
1367
for f, paths, c, v, p, n, k, e in iterator:
1368
if paths[0] == paths[1]:
1369
continue
1370
if None in (paths):
1371
continue
1372
renames.append(paths)
1373
renames.sort()
1374
for old_name, new_name in renames:
1375
self.outf.write("%s => %s\n" % (old_name, new_name))
1376
finally:
1377
old_tree.unlock()
1378
finally:
1379
tree.unlock()
1372
1380
1373
1381
1374
1382
class cmd_update(Command):
1375
__doc__ = """Update a tree to have the latest code committed to its branch.
1383
"""Update a tree to have the latest code committed to its branch.
1376
1384
1377
1385
This will perform a merge into the working tree, and may generate
1378
1386
conflicts. If you have any local changes, you will still
1380
1388
1381
1389
If you want to discard your local changes, you can just do a
1382
1390
'bzr revert' instead of 'bzr commit' after the update.
1383
1384
If the tree's branch is bound to a master branch, it will also update
1385
the branch from the master.
1386
1391
"""
1387
1392
1388
1393
_see_also = ['pull', 'working-trees', 'status-flags']
1389
1394
takes_args = ['dir?']
1390
takes_options = ['revision']
1391
1395
aliases = ['up']
1392
1396
1393
def run(self, dir='.', revision=None):
1394
if revision is not None and len(revision) != 1:
1395
raise errors.BzrCommandError(
1396
"bzr update --revision takes exactly one revision")
1397
def run(self, dir='.'):
1397
1398
tree = WorkingTree.open_containing(dir)[0]
1398
branch = tree.branch
1399
1399
possible_transports = []
1400
master = branch.get_master_branch(
1400
master = tree.branch.get_master_branch(
1401
1401
possible_transports=possible_transports)
1402
1402
if master is not None:
1403
tree.lock_write()
1403
1404
branch_location = master.base
1404
tree.lock_write()
1405
1405
else:
1406
tree.lock_tree_write()
1406
1407
branch_location = tree.branch.base
1407
tree.lock_tree_write()
1408
self.add_cleanup(tree.unlock)
1409
1408
# get rid of the final '/' and be ready for display
1410
branch_location = urlutils.unescape_for_display(
1411
branch_location.rstrip('/'),
1412
self.outf.encoding)
1413
existing_pending_merges = tree.get_parent_ids()[1:]
1414
if master is None:
1415
old_tip = None
1416
else:
1417
# may need to fetch data into a heavyweight checkout
1418
# XXX: this may take some time, maybe we should display a
1419
# message
1420
old_tip = branch.update(possible_transports)
1421
if revision is not None:
1422
revision_id = revision[0].as_revision_id(branch)
1423
else:
1424
revision_id = branch.last_revision()
1425
if revision_id == _mod_revision.ensure_null(tree.last_revision()):
1426
revno = branch.revision_id_to_dotted_revno(revision_id)
1427
note("Tree is up to date at revision %s of branch %s" %
1428
('.'.join(map(str, revno)), branch_location))
1429
return 0
1430
view_info = _get_view_info_for_change_reporter(tree)
1431
change_reporter = delta._ChangeReporter(
1432
unversioned_filter=tree.is_ignored,
1433
view_info=view_info)
1409
branch_location = urlutils.unescape_for_display(branch_location[:-1],
1410
self.outf.encoding)
1434
1411
try:
1412
existing_pending_merges = tree.get_parent_ids()[1:]
1413
last_rev = _mod_revision.ensure_null(tree.last_revision())
1414
if last_rev == _mod_revision.ensure_null(
1415
tree.branch.last_revision()):
1416
# may be up to date, check master too.
1417
if master is None or last_rev == _mod_revision.ensure_null(
1418
master.last_revision()):
1419
revno = tree.branch.revision_id_to_revno(last_rev)
1420
note('Tree is up to date at revision %d of branch %s'
1421
% (revno, branch_location))
1422
return 0
1423
view_info = _get_view_info_for_change_reporter(tree)
1435
1424
conflicts = tree.update(
1436
change_reporter,
1437
possible_transports=possible_transports,
1438
revision=revision_id,
1439
old_tip=old_tip)
1440
except errors.NoSuchRevision, e:
1441
raise errors.BzrCommandError(
1442
"branch has no revision %s\n"
1443
"bzr update --revision only works"
1444
" for a revision in the branch history"
1445
% (e.revision))
1446
revno = tree.branch.revision_id_to_dotted_revno(
1447
_mod_revision.ensure_null(tree.last_revision()))
1448
note('Updated to revision %s of branch %s' %
1449
('.'.join(map(str, revno)), branch_location))
1450
parent_ids = tree.get_parent_ids()
1451
if parent_ids[1:] and parent_ids[1:] != existing_pending_merges:
1452
note('Your local commits will now show as pending merges with '
1453
"'bzr status', and can be committed with 'bzr commit'.")
1454
if conflicts != 0:
1455
return 1
1456
else:
1457
return 0
1425
delta._ChangeReporter(unversioned_filter=tree.is_ignored,
1426
view_info=view_info), possible_transports=possible_transports)
1427
revno = tree.branch.revision_id_to_revno(
1428
_mod_revision.ensure_null(tree.last_revision()))
1429
note('Updated to revision %d of branch %s' %
1430
(revno, branch_location))
1431
if tree.get_parent_ids()[1:] != existing_pending_merges:
1432
note('Your local commits will now show as pending merges with '
1433
"'bzr status', and can be committed with 'bzr commit'.")
1434
if conflicts != 0:
1435
return 1
1436
else:
1437
return 0
1438
finally:
1439
tree.unlock()
1458
1440
1459
1441
1460
1442
class cmd_info(Command):
1461
__doc__ = """Show information about a working tree, branch or repository.
1443
"""Show information about a working tree, branch or repository.
1462
1444
1463
1445
This command will show all known locations and formats associated to the
1464
1446
tree, branch or repository.
1502
1484
1503
1485
1504
1486
class cmd_remove(Command):
1505
__doc__ = """Remove files or directories.
1487
"""Remove files or directories.
1506
1488
1507
1489
This makes bzr stop tracking changes to the specified files. bzr will delete
1508
1490
them if they can easily be recovered using revert. If no options or
1530
1512
if file_list is not None:
1531
1513
file_list = [f for f in file_list]
1532
1514
1533
self.add_cleanup(tree.lock_write().unlock)
1534
# Heuristics should probably all move into tree.remove_smart or
1535
# some such?
1536
if new:
1537
added = tree.changes_from(tree.basis_tree(),
1538
specific_files=file_list).added
1539
file_list = sorted([f[0] for f in added], reverse=True)
1540
if len(file_list) == 0:
1541
raise errors.BzrCommandError('No matching files.')
1542
elif file_list is None:
1543
# missing files show up in iter_changes(basis) as
1544
# versioned-with-no-kind.
1545
missing = []
1546
for change in tree.iter_changes(tree.basis_tree()):
1547
# Find paths in the working tree that have no kind:
1548
if change[1][1] is not None and change[6][1] is None:
1549
missing.append(change[1][1])
1550
file_list = sorted(missing, reverse=True)
1551
file_deletion_strategy = 'keep'
1552
tree.remove(file_list, verbose=verbose, to_file=self.outf,
1553
keep_files=file_deletion_strategy=='keep',
1554
force=file_deletion_strategy=='force')
1515
tree.lock_write()
1516
try:
1517
# Heuristics should probably all move into tree.remove_smart or
1518
# some such?
1519
if new:
1520
added = tree.changes_from(tree.basis_tree(),
1521
specific_files=file_list).added
1522
file_list = sorted([f[0] for f in added], reverse=True)
1523
if len(file_list) == 0:
1524
raise errors.BzrCommandError('No matching files.')
1525
elif file_list is None:
1526
# missing files show up in iter_changes(basis) as
1527
# versioned-with-no-kind.
1528
missing = []
1529
for change in tree.iter_changes(tree.basis_tree()):
1530
# Find paths in the working tree that have no kind:
1531
if change[1][1] is not None and change[6][1] is None:
1532
missing.append(change[1][1])
1533
file_list = sorted(missing, reverse=True)
1534
file_deletion_strategy = 'keep'
1535
tree.remove(file_list, verbose=verbose, to_file=self.outf,
1536
keep_files=file_deletion_strategy=='keep',
1537
force=file_deletion_strategy=='force')
1538
finally:
1539
tree.unlock()
1555
1540
1556
1541
1557
1542
class cmd_file_id(Command):
1558
__doc__ = """Print file_id of a particular file or directory.
1543
"""Print file_id of a particular file or directory.
1559
1544
1560
1545
The file_id is assigned when the file is first added and remains the
1561
1546
same through all revisions where the file exists, even when it is
1577
1562
1578
1563
1579
1564
class cmd_file_path(Command):
1580
__doc__ = """Print path of file_ids to a file or directory.
1565
"""Print path of file_ids to a file or directory.
1581
1566
1582
1567
This prints one line for each directory down to the target,
1583
1568
starting at the branch root.
1599
1584
1600
1585
1601
1586
class cmd_reconcile(Command):
1602
__doc__ = """Reconcile bzr metadata in a branch.
1587
"""Reconcile bzr metadata in a branch.
1603
1588
1604
1589
This can correct data mismatches that may have been caused by
1605
1590
previous ghost operations or bzr upgrades. You should only
1627
1612
1628
1613
1629
1614
class cmd_revision_history(Command):
1630
__doc__ = """Display the list of revision ids on a branch."""
1615
"""Display the list of revision ids on a branch."""
1631
1616
1632
1617
_see_also = ['log']
1633
1618
takes_args = ['location?']
1643
1628
1644
1629
1645
1630
class cmd_ancestry(Command):
1646
__doc__ = """List all revisions merged into this branch."""
1631
"""List all revisions merged into this branch."""
1647
1632
1648
1633
_see_also = ['log', 'revision-history']
1649
1634
takes_args = ['location?']
1668
1653
1669
1654
1670
1655
class cmd_init(Command):
1671
__doc__ = """Make a directory into a versioned branch.
1656
"""Make a directory into a versioned branch.
1672
1657
1673
1658
Use this to create an empty branch, or before importing an
1674
1659
existing project.
1777
1762
1778
1763
1779
1764
class cmd_init_repository(Command):
1780
__doc__ = """Create a shared repository for branches to share storage space.
1765
"""Create a shared repository for branches to share storage space.
1781
1766
1782
1767
New branches created under the repository directory will store their
1783
1768
revisions in the repository, not in the branch directory. For branches
1837
1822
1838
1823
1839
1824
class cmd_diff(Command):
1840
__doc__ = """Show differences in the working tree, between revisions or branches.
1825
"""Show differences in the working tree, between revisions or branches.
1841
1826
1842
1827
If no arguments are given, all changes for the current tree are listed.
1843
1828
If files are given, only the changes in those files are listed.
1929
1914
help='Use this command to compare files.',
1930
1915
type=unicode,
1931
1916
),
1932
RegistryOption('format',
1933
help='Diff format to use.',
1934
lazy_registry=('bzrlib.diff', 'format_registry'),
1935
value_switches=False, title='Diff format'),
1936
1917
]
1937
1918
aliases = ['di', 'dif']
1938
1919
encoding_type = 'exact'
1939
1920
1940
1921
@display_command
1941
1922
def run(self, revision=None, file_list=None, diff_options=None,
1942
prefix=None, old=None, new=None, using=None, format=None):
1943
from bzrlib.diff import (get_trees_and_branches_to_diff_locked,
1944
show_diff_trees)
1923
prefix=None, old=None, new=None, using=None):
1924
from bzrlib.diff import get_trees_and_branches_to_diff, show_diff_trees
1945
1925
1946
1926
if (prefix is None) or (prefix == '0'):
1947
1927
# diff -p0 format
1961
1941
raise errors.BzrCommandError('bzr diff --revision takes exactly'
1962
1942
' one or two revision specifiers')
1963
1943
1964
if using is not None and format is not None:
1965
raise errors.BzrCommandError('--using and --format are mutually '
1966
'exclusive.')
1967
1968
1944
(old_tree, new_tree,
1969
1945
old_branch, new_branch,
1970
specific_files, extra_trees) = get_trees_and_branches_to_diff_locked(
1971
file_list, revision, old, new, self.add_cleanup, apply_view=True)
1946
specific_files, extra_trees) = get_trees_and_branches_to_diff(
1947
file_list, revision, old, new, apply_view=True)
1972
1948
return show_diff_trees(old_tree, new_tree, sys.stdout,
1973
1949
specific_files=specific_files,
1974
1950
external_diff_options=diff_options,
1975
1951
old_label=old_label, new_label=new_label,
1976
extra_trees=extra_trees, using=using,
1977
format_cls=format)
1952
extra_trees=extra_trees, using=using)
1978
1953
1979
1954
1980
1955
class cmd_deleted(Command):
1981
__doc__ = """List files deleted in the working tree.
1956
"""List files deleted in the working tree.
1982
1957
"""
1983
1958
# TODO: Show files deleted since a previous revision, or
1984
1959
# between two revisions.
1992
1967
@display_command
1993
1968
def run(self, show_ids=False):
1994
1969
tree = WorkingTree.open_containing(u'.')[0]
1995
self.add_cleanup(tree.lock_read().unlock)
1996
old = tree.basis_tree()
1997
self.add_cleanup(old.lock_read().unlock)
1998
for path, ie in old.inventory.iter_entries():
1999
if not tree.has_id(ie.file_id):
2000
self.outf.write(path)
2001
if show_ids:
2002
self.outf.write(' ')
2003
self.outf.write(ie.file_id)
2004
self.outf.write('\n')
1970
tree.lock_read()
1971
try:
1972
old = tree.basis_tree()
1973
old.lock_read()
1974
try:
1975
for path, ie in old.inventory.iter_entries():
1976
if not tree.has_id(ie.file_id):
1977
self.outf.write(path)
1978
if show_ids:
1979
self.outf.write(' ')
1980
self.outf.write(ie.file_id)
1981
self.outf.write('\n')
1982
finally:
1983
old.unlock()
1984
finally:
1985
tree.unlock()
2005
1986
2006
1987
2007
1988
class cmd_modified(Command):
2008
__doc__ = """List files modified in working tree.
1989
"""List files modified in working tree.
2009
1990
"""
2010
1991
2011
1992
hidden = True
2028
2009
2029
2010
2030
2011
class cmd_added(Command):
2031
__doc__ = """List files added in working tree.
2012
"""List files added in working tree.
2032
2013
"""
2033
2014
2034
2015
hidden = True
2042
2023
@display_command
2043
2024
def run(self, null=False):
2044
2025
wt = WorkingTree.open_containing(u'.')[0]
2045
self.add_cleanup(wt.lock_read().unlock)
2046
basis = wt.basis_tree()
2047
self.add_cleanup(basis.lock_read().unlock)
2048
basis_inv = basis.inventory
2049
inv = wt.inventory
2050
for file_id in inv:
2051
if file_id in basis_inv:
2052
continue
2053
if inv.is_root(file_id) and len(basis_inv) == 0:
2054
continue
2055
path = inv.id2path(file_id)
2056
if not os.access(osutils.abspath(path), os.F_OK):
2057
continue
2058
if null:
2059
self.outf.write(path + '\0')
2060
else:
2061
self.outf.write(osutils.quotefn(path) + '\n')
2026
wt.lock_read()
2027
try:
2028
basis = wt.basis_tree()
2029
basis.lock_read()
2030
try:
2031
basis_inv = basis.inventory
2032
inv = wt.inventory
2033
for file_id in inv:
2034
if file_id in basis_inv:
2035
continue
2036
if inv.is_root(file_id) and len(basis_inv) == 0:
2037
continue
2038
path = inv.id2path(file_id)
2039
if not os.access(osutils.abspath(path), os.F_OK):
2040
continue
2041
if null:
2042
self.outf.write(path + '\0')
2043
else:
2044
self.outf.write(osutils.quotefn(path) + '\n')
2045
finally:
2046
basis.unlock()
2047
finally:
2048
wt.unlock()
2062
2049
2063
2050
2064
2051
class cmd_root(Command):
2065
__doc__ = """Show the tree root directory.
2052
"""Show the tree root directory.
2066
2053
2067
2054
The root is the nearest enclosing directory with a .bzr control
2068
2055
directory."""
2092
2079
2093
2080
2094
2081
class cmd_log(Command):
2095
__doc__ = """Show historical log for a branch or subset of a branch.
2082
"""Show historical log for a branch or subset of a branch.
2096
2083
2097
2084
log is bzr's default tool for exploring the history of a branch.
2098
2085
The branch to use is taken from the first parameter. If no parameters
2209
2196
:Tips & tricks:
2210
2197
2211
2198
GUI tools and IDEs are often better at exploring history than command
2212
line tools: you may prefer qlog or viz from qbzr or bzr-gtk, the
2213
bzr-explorer shell, or the Loggerhead web interface. See the Plugin
2214
Guide <http://doc.bazaar.canonical.com/plugins/en/> and
2215
<http://wiki.bazaar.canonical.com/IDEIntegration>.
2199
line tools. You may prefer qlog or glog from the QBzr and Bzr-Gtk packages
2200
respectively for example. (TortoiseBzr uses qlog for displaying logs.) See
2201
http://bazaar-vcs.org/BzrPlugins and http://bazaar-vcs.org/IDEIntegration.
2202
2203
Web interfaces are often better at exploring history than command line
2204
tools, particularly for branches on servers. You may prefer Loggerhead
2205
or one of its alternatives. See http://bazaar-vcs.org/WebInterface.
2216
2206
2217
2207
You may find it useful to add the aliases below to ``bazaar.conf``::
2218
2208
2279
2269
help='Show changes made in each revision as a patch.'),
2280
2270
Option('include-merges',
2281
2271
help='Show merged revisions like --levels 0 does.'),
2282
Option('exclude-common-ancestry',
2283
help='Display only the revisions that are not part'
2284
' of both ancestries (require -rX..Y)'
2285
)
2286
2272
]
2287
2273
encoding_type = 'replace'
2288
2274
2298
2284
message=None,
2299
2285
limit=None,
2300
2286
show_diff=False,
2301
include_merges=False,
2302
exclude_common_ancestry=False,
2303
):
2287
include_merges=False):
2304
2288
from bzrlib.log import (
2305
2289
Logger,
2306
2290
make_log_request_dict,
2307
2291
_get_info_for_log_files,
2308
2292
)
2309
2293
direction = (forward and 'forward') or 'reverse'
2310
if (exclude_common_ancestry
2311
and (revision is None or len(revision) != 2)):
2312
raise errors.BzrCommandError(
2313
'--exclude-common-ancestry requires -r with two revisions')
2314
2294
if include_merges:
2315
2295
if levels is None:
2316
2296
levels = 0
2329
2309
2330
2310
file_ids = []
2331
2311
filter_by_dir = False
2332
if file_list:
2333
# find the file ids to log and check for directory filtering
2334
b, file_info_list, rev1, rev2 = _get_info_for_log_files(
2335
revision, file_list, self.add_cleanup)
2336
for relpath, file_id, kind in file_info_list:
2337
if file_id is None:
2338
raise errors.BzrCommandError(
2339
"Path unknown at end or start of revision range: %s" %
2340
relpath)
2341
# If the relpath is the top of the tree, we log everything
2342
if relpath == '':
2343
file_ids = []
2344
break
2312
b = None
2313
try:
2314
if file_list:
2315
# find the file ids to log and check for directory filtering
2316
b, file_info_list, rev1, rev2 = _get_info_for_log_files(
2317
revision, file_list)
2318
for relpath, file_id, kind in file_info_list:
2319
if file_id is None:
2320
raise errors.BzrCommandError(
2321
"Path unknown at end or start of revision range: %s" %
2322
relpath)
2323
# If the relpath is the top of the tree, we log everything
2324
if relpath == '':
2325
file_ids = []
2326
break
2327
else:
2328
file_ids.append(file_id)
2329
filter_by_dir = filter_by_dir or (
2330
kind in ['directory', 'tree-reference'])
2331
else:
2332
# log everything
2333
# FIXME ? log the current subdir only RBC 20060203
2334
if revision is not None \
2335
and len(revision) > 0 and revision[0].get_branch():
2336
location = revision[0].get_branch()
2345
2337
else:
2346
file_ids.append(file_id)
2347
filter_by_dir = filter_by_dir or (
2348
kind in ['directory', 'tree-reference'])
2349
else:
2350
# log everything
2351
# FIXME ? log the current subdir only RBC 20060203
2352
if revision is not None \
2353
and len(revision) > 0 and revision[0].get_branch():
2354
location = revision[0].get_branch()
2355
else:
2356
location = '.'
2357
dir, relpath = bzrdir.BzrDir.open_containing(location)
2358
b = dir.open_branch()
2359
self.add_cleanup(b.lock_read().unlock)
2360
rev1, rev2 = _get_revision_range(revision, b, self.name())
2361
2362
# Decide on the type of delta & diff filtering to use
2363
# TODO: add an --all-files option to make this configurable & consistent
2364
if not verbose:
2365
delta_type = None
2366
else:
2367
delta_type = 'full'
2368
if not show_diff:
2369
diff_type = None
2370
elif file_ids:
2371
diff_type = 'partial'
2372
else:
2373
diff_type = 'full'
2374
2375
# Build the log formatter
2376
if log_format is None:
2377
log_format = log.log_formatter_registry.get_default(b)
2378
# Make a non-encoding output to include the diffs - bug 328007
2379
unencoded_output = ui.ui_factory.make_output_stream(encoding_type='exact')
2380
lf = log_format(show_ids=show_ids, to_file=self.outf,
2381
to_exact_file=unencoded_output,
2382
show_timezone=timezone,
2383
delta_format=get_verbosity_level(),
2384
levels=levels,
2385
show_advice=levels is None)
2386
2387
# Choose the algorithm for doing the logging. It's annoying
2388
# having multiple code paths like this but necessary until
2389
# the underlying repository format is faster at generating
2390
# deltas or can provide everything we need from the indices.
2391
# The default algorithm - match-using-deltas - works for
2392
# multiple files and directories and is faster for small
2393
# amounts of history (200 revisions say). However, it's too
2394
# slow for logging a single file in a repository with deep
2395
# history, i.e. > 10K revisions. In the spirit of "do no
2396
# evil when adding features", we continue to use the
2397
# original algorithm - per-file-graph - for the "single
2398
# file that isn't a directory without showing a delta" case.
2399
partial_history = revision and b.repository._format.supports_chks
2400
match_using_deltas = (len(file_ids) != 1 or filter_by_dir
2401
or delta_type or partial_history)
2402
2403
# Build the LogRequest and execute it
2404
if len(file_ids) == 0:
2405
file_ids = None
2406
rqst = make_log_request_dict(
2407
direction=direction, specific_fileids=file_ids,
2408
start_revision=rev1, end_revision=rev2, limit=limit,
2409
message_search=message, delta_type=delta_type,
2410
diff_type=diff_type, _match_using_deltas=match_using_deltas,
2411
exclude_common_ancestry=exclude_common_ancestry,
2412
)
2413
Logger(b, rqst).show(lf)
2338
location = '.'
2339
dir, relpath = bzrdir.BzrDir.open_containing(location)
2340
b = dir.open_branch()
2341
b.lock_read()
2342
rev1, rev2 = _get_revision_range(revision, b, self.name())
2343
2344
# Decide on the type of delta & diff filtering to use
2345
# TODO: add an --all-files option to make this configurable & consistent
2346
if not verbose:
2347
delta_type = None
2348
else:
2349
delta_type = 'full'
2350
if not show_diff:
2351
diff_type = None
2352
elif file_ids:
2353
diff_type = 'partial'
2354
else:
2355
diff_type = 'full'
2356
2357
# Build the log formatter
2358
if log_format is None:
2359
log_format = log.log_formatter_registry.get_default(b)
2360
# Make a non-encoding output to include the diffs - bug 328007
2361
unencoded_output = ui.ui_factory.make_output_stream(encoding_type='exact')
2362
lf = log_format(show_ids=show_ids, to_file=self.outf,
2363
to_exact_file=unencoded_output,
2364
show_timezone=timezone,
2365
delta_format=get_verbosity_level(),
2366
levels=levels,
2367
show_advice=levels is None)
2368
2369
# Choose the algorithm for doing the logging. It's annoying
2370
# having multiple code paths like this but necessary until
2371
# the underlying repository format is faster at generating
2372
# deltas or can provide everything we need from the indices.
2373
# The default algorithm - match-using-deltas - works for
2374
# multiple files and directories and is faster for small
2375
# amounts of history (200 revisions say). However, it's too
2376
# slow for logging a single file in a repository with deep
2377
# history, i.e. > 10K revisions. In the spirit of "do no
2378
# evil when adding features", we continue to use the
2379
# original algorithm - per-file-graph - for the "single
2380
# file that isn't a directory without showing a delta" case.
2381
partial_history = revision and b.repository._format.supports_chks
2382
match_using_deltas = (len(file_ids) != 1 or filter_by_dir
2383
or delta_type or partial_history)
2384
2385
# Build the LogRequest and execute it
2386
if len(file_ids) == 0:
2387
file_ids = None
2388
rqst = make_log_request_dict(
2389
direction=direction, specific_fileids=file_ids,
2390
start_revision=rev1, end_revision=rev2, limit=limit,
2391
message_search=message, delta_type=delta_type,
2392
diff_type=diff_type, _match_using_deltas=match_using_deltas)
2393
Logger(b, rqst).show(lf)
2394
finally:
2395
if b is not None:
2396
b.unlock()
2414
2397
2415
2398
2416
2399
def _get_revision_range(revisionspec_list, branch, command_name):
2434
2417
raise errors.BzrCommandError(
2435
2418
"bzr %s doesn't accept two revisions in different"
2436
2419
" branches." % command_name)
2437
if start_spec.spec is None:
2438
# Avoid loading all the history.
2439
rev1 = RevisionInfo(branch, None, None)
2440
else:
2441
rev1 = start_spec.in_history(branch)
2420
rev1 = start_spec.in_history(branch)
2442
2421
# Avoid loading all of history when we know a missing
2443
2422
# end of range means the last revision ...
2444
2423
if end_spec.spec is None:
2473
2452
2474
2453
2475
2454
class cmd_touching_revisions(Command):
2476
__doc__ = """Return revision-ids which affected a particular file.
2455
"""Return revision-ids which affected a particular file.
2477
2456
2478
2457
A more user-friendly interface is "bzr log FILE".
2479
2458
"""
2486
2465
tree, relpath = WorkingTree.open_containing(filename)
2487
2466
file_id = tree.path2id(relpath)
2488
2467
b = tree.branch
2489
self.add_cleanup(b.lock_read().unlock)
2490
touching_revs = log.find_touching_revisions(b, file_id)
2491
for revno, revision_id, what in touching_revs:
2492
self.outf.write("%6d %s\n" % (revno, what))
2468
b.lock_read()
2469
try:
2470
touching_revs = log.find_touching_revisions(b, file_id)
2471
for revno, revision_id, what in touching_revs:
2472
self.outf.write("%6d %s\n" % (revno, what))
2473
finally:
2474
b.unlock()
2493
2475
2494
2476
2495
2477
class cmd_ls(Command):
2496
__doc__ = """List files in a tree.
2478
"""List files in a tree.
2497
2479
"""
2498
2480
2499
2481
_see_also = ['status', 'cat']
2561
2543
view_str = views.view_display_str(view_files)
2562
2544
note("Ignoring files outside view. View is %s" % view_str)
2563
2545
2564
self.add_cleanup(tree.lock_read().unlock)
2565
for fp, fc, fkind, fid, entry in tree.list_files(include_root=False,
2566
from_dir=relpath, recursive=recursive):
2567
# Apply additional masking
2568
if not all and not selection[fc]:
2569
continue
2570
if kind is not None and fkind != kind:
2571
continue
2572
if apply_view:
2573
try:
2574
if relpath:
2575
fullpath = osutils.pathjoin(relpath, fp)
2576
else:
2577
fullpath = fp
2578
views.check_path_in_view(tree, fullpath)
2579
except errors.FileOutsideView:
2580
continue
2546
tree.lock_read()
2547
try:
2548
for fp, fc, fkind, fid, entry in tree.list_files(include_root=False,
2549
from_dir=relpath, recursive=recursive):
2550
# Apply additional masking
2551
if not all and not selection[fc]:
2552
continue
2553
if kind is not None and fkind != kind:
2554
continue
2555
if apply_view:
2556
try:
2557
if relpath:
2558
fullpath = osutils.pathjoin(relpath, fp)
2559
else:
2560
fullpath = fp
2561
views.check_path_in_view(tree, fullpath)
2562
except errors.FileOutsideView:
2563
continue
2581
2564
2582
# Output the entry
2583
if prefix:
2584
fp = osutils.pathjoin(prefix, fp)
2585
kindch = entry.kind_character()
2586
outstring = fp + kindch
2587
ui.ui_factory.clear_term()
2588
if verbose:
2589
outstring = '%-8s %s' % (fc, outstring)
2590
if show_ids and fid is not None:
2591
outstring = "%-50s %s" % (outstring, fid)
2592
self.outf.write(outstring + '\n')
2593
elif null:
2594
self.outf.write(fp + '\0')
2595
if show_ids:
2596
if fid is not None:
2597
self.outf.write(fid)
2598
self.outf.write('\0')
2599
self.outf.flush()
2600
else:
2601
if show_ids:
2602
if fid is not None:
2603
my_id = fid
2604
else:
2605
my_id = ''
2606
self.outf.write('%-50s %s\n' % (outstring, my_id))
2607
else:
2565
# Output the entry
2566
if prefix:
2567
fp = osutils.pathjoin(prefix, fp)
2568
kindch = entry.kind_character()
2569
outstring = fp + kindch
2570
ui.ui_factory.clear_term()
2571
if verbose:
2572
outstring = '%-8s %s' % (fc, outstring)
2573
if show_ids and fid is not None:
2574
outstring = "%-50s %s" % (outstring, fid)
2608
2575
self.outf.write(outstring + '\n')
2576
elif null:
2577
self.outf.write(fp + '\0')
2578
if show_ids:
2579
if fid is not None:
2580
self.outf.write(fid)
2581
self.outf.write('\0')
2582
self.outf.flush()
2583
else:
2584
if show_ids:
2585
if fid is not None:
2586
my_id = fid
2587
else:
2588
my_id = ''
2589
self.outf.write('%-50s %s\n' % (outstring, my_id))
2590
else:
2591
self.outf.write(outstring + '\n')
2592
finally:
2593
tree.unlock()
2609
2594
2610
2595
2611
2596
class cmd_unknowns(Command):
2612
__doc__ = """List unknown files.
2597
"""List unknown files.
2613
2598
"""
2614
2599
2615
2600
hidden = True
2622
2607
2623
2608
2624
2609
class cmd_ignore(Command):
2625
__doc__ = """Ignore specified files or patterns.
2610
"""Ignore specified files or patterns.
2626
2611
2627
2612
See ``bzr help patterns`` for details on the syntax of patterns.
2628
2613
2636
2621
After adding, editing or deleting that file either indirectly by
2637
2622
using this command or directly by using an editor, be sure to commit
2638
2623
it.
2639
2640
Bazaar also supports a global ignore file ~/.bazaar/ignore. On Windows
2641
the global ignore file can be found in the application data directory as
2642
C:\\Documents and Settings\\<user>\\Application Data\\Bazaar\\2.0\\ignore.
2643
Global ignores are not touched by this command. The global ignore file
2644
can be edited directly using an editor.
2645
2646
Patterns prefixed with '!' are exceptions to ignore patterns and take
2647
precedence over regular ignores. Such exceptions are used to specify
2648
files that should be versioned which would otherwise be ignored.
2649
2650
Patterns prefixed with '!!' act as regular ignore patterns, but have
2651
precedence over the '!' exception patterns.
2652
2624
2653
2625
Note: ignore patterns containing shell wildcards must be quoted from
2654
2626
the shell on Unix.
2658
2630
2659
2631
bzr ignore ./Makefile
2660
2632
2661
Ignore .class files in all directories...::
2633
Ignore class files in all directories::
2662
2634
2663
2635
bzr ignore "*.class"
2664
2636
2665
...but do not ignore "special.class"::
2666
2667
bzr ignore "!special.class"
2668
2669
2637
Ignore .o files under the lib directory::
2670
2638
2671
2639
bzr ignore "lib/**/*.o"
2677
2645
Ignore everything but the "debian" toplevel directory::
2678
2646
2679
2647
bzr ignore "RE:(?!debian/).*"
2680
2681
Ignore everything except the "local" toplevel directory,
2682
but always ignore "*~" autosave files, even under local/::
2683
2684
bzr ignore "*"
2685
bzr ignore "!./local"
2686
bzr ignore "!!*~"
2687
2648
"""
2688
2649
2689
2650
_see_also = ['status', 'ignored', 'patterns']
2690
2651
takes_args = ['name_pattern*']
2691
2652
takes_options = [
2692
Option('default-rules',
2693
help='Display the default ignore rules that bzr uses.')
2653
Option('old-default-rules',
2654
help='Write out the ignore rules bzr < 0.9 always used.')
2694
2655
]
2695
2656
2696
def run(self, name_pattern_list=None, default_rules=None):
2657
def run(self, name_pattern_list=None, old_default_rules=None):
2697
2658
from bzrlib import ignores
2698
if default_rules is not None:
2699
# dump the default rules and exit
2700
for pattern in ignores.USER_DEFAULTS:
2701
self.outf.write("%s\n" % pattern)
2659
if old_default_rules is not None:
2660
# dump the rules and exit
2661
for pattern in ignores.OLD_DEFAULTS:
2662
print pattern
2702
2663
return
2703
2664
if not name_pattern_list:
2704
2665
raise errors.BzrCommandError("ignore requires at least one "
2705
"NAME_PATTERN or --default-rules.")
2666
"NAME_PATTERN or --old-default-rules")
2706
2667
name_pattern_list = [globbing.normalize_pattern(p)
2707
2668
for p in name_pattern_list]
2708
2669
for name_pattern in name_pattern_list:
2720
2681
if id is not None:
2721
2682
filename = entry[0]
2722
2683
if ignored.match(filename):
2723
matches.append(filename)
2684
matches.append(filename.encode('utf-8'))
2724
2685
tree.unlock()
2725
2686
if len(matches) > 0:
2726
self.outf.write("Warning: the following files are version controlled and"
2727
" match your ignore pattern:\n%s"
2728
"\nThese files will continue to be version controlled"
2729
" unless you 'bzr remove' them.\n" % ("\n".join(matches),))
2687
print "Warning: the following files are version controlled and" \
2688
" match your ignore pattern:\n%s" \
2689
"\nThese files will continue to be version controlled" \
2690
" unless you 'bzr remove' them." % ("\n".join(matches),)
2730
2691
2731
2692
2732
2693
class cmd_ignored(Command):
2733
__doc__ = """List ignored files and the patterns that matched them.
2694
"""List ignored files and the patterns that matched them.
2734
2695
2735
2696
List all the ignored files and the ignore pattern that caused the file to
2736
2697
be ignored.
2746
2707
@display_command
2747
2708
def run(self):
2748
2709
tree = WorkingTree.open_containing(u'.')[0]
2749
self.add_cleanup(tree.lock_read().unlock)
2750
for path, file_class, kind, file_id, entry in tree.list_files():
2751
if file_class != 'I':
2752
continue
2753
## XXX: Slightly inefficient since this was already calculated
2754
pat = tree.is_ignored(path)
2755
self.outf.write('%-50s %s\n' % (path, pat))
2710
tree.lock_read()
2711
try:
2712
for path, file_class, kind, file_id, entry in tree.list_files():
2713
if file_class != 'I':
2714
continue
2715
## XXX: Slightly inefficient since this was already calculated
2716
pat = tree.is_ignored(path)
2717
self.outf.write('%-50s %s\n' % (path, pat))
2718
finally:
2719
tree.unlock()
2756
2720
2757
2721
2758
2722
class cmd_lookup_revision(Command):
2759
__doc__ = """Lookup the revision-id from a revision-number
2723
"""Lookup the revision-id from a revision-number
2760
2724
2761
2725
:Examples:
2762
2726
bzr lookup-revision 33
2769
2733
try:
2770
2734
revno = int(revno)
2771
2735
except ValueError:
2772
raise errors.BzrCommandError("not a valid revision-number: %r"
2773
% revno)
2774
revid = WorkingTree.open_containing(u'.')[0].branch.get_rev_id(revno)
2775
self.outf.write("%s\n" % revid)
2736
raise errors.BzrCommandError("not a valid revision-number: %r" % revno)
2737
2738
print WorkingTree.open_containing(u'.')[0].branch.get_rev_id(revno)
2776
2739
2777
2740
2778
2741
class cmd_export(Command):
2779
__doc__ = """Export current or past revision to a destination directory or archive.
2742
"""Export current or past revision to a destination directory or archive.
2780
2743
2781
2744
If no revision is specified this exports the last committed revision.
2782
2745
2814
2777
Option('root',
2815
2778
type=str,
2816
2779
help="Name of the root directory inside the exported file."),
2817
Option('per-file-timestamps',
2818
help='Set modification time of files to that of the last '
2819
'revision in which it was changed.'),
2820
2780
]
2821
2781
def run(self, dest, branch_or_subdir=None, revision=None, format=None,
2822
root=None, filters=False, per_file_timestamps=False):
2782
root=None, filters=False):
2823
2783
from bzrlib.export import export
2824
2784
2825
2785
if branch_or_subdir is None:
2832
2792
2833
2793
rev_tree = _get_one_revision_tree('export', revision, branch=b, tree=tree)
2834
2794
try:
2835
export(rev_tree, dest, format, root, subdir, filtered=filters,
2836
per_file_timestamps=per_file_timestamps)
2795
export(rev_tree, dest, format, root, subdir, filtered=filters)
2837
2796
except errors.NoSuchExportFormat, e:
2838
2797
raise errors.BzrCommandError('Unsupported export format: %s' % e.format)
2839
2798
2840
2799
2841
2800
class cmd_cat(Command):
2842
__doc__ = """Write the contents of a file as of a given revision to standard output.
2801
"""Write the contents of a file as of a given revision to standard output.
2843
2802
2844
2803
If no revision is nominated, the last revision is used.
2845
2804
2865
2824
" one revision specifier")
2866
2825
tree, branch, relpath = \
2867
2826
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
2868
self.add_cleanup(branch.lock_read().unlock)
2869
return self._run(tree, branch, relpath, filename, revision,
2870
name_from_revision, filters)
2827
branch.lock_read()
2828
try:
2829
return self._run(tree, branch, relpath, filename, revision,
2830
name_from_revision, filters)
2831
finally:
2832
branch.unlock()
2871
2833
2872
2834
def _run(self, tree, b, relpath, filename, revision, name_from_revision,
2873
2835
filtered):
2874
2836
if tree is None:
2875
2837
tree = b.basis_tree()
2876
2838
rev_tree = _get_one_revision_tree('cat', revision, branch=b)
2877
self.add_cleanup(rev_tree.lock_read().unlock)
2878
2839
2879
2840
old_file_id = rev_tree.path2id(relpath)
2880
2841
2915
2876
chunks = content.splitlines(True)
2916
2877
content = filtered_output_bytes(chunks, filters,
2917
2878
ContentFilterContext(relpath, rev_tree))
2918
self.cleanup_now()
2919
2879
self.outf.writelines(content)
2920
2880
else:
2921
self.cleanup_now()
2922
2881
self.outf.write(content)
2923
2882
2924
2883
2925
2884
class cmd_local_time_offset(Command):
2926
__doc__ = """Show the offset in seconds from GMT to local time."""
2885
"""Show the offset in seconds from GMT to local time."""
2927
2886
hidden = True
2928
2887
@display_command
2929
2888
def run(self):
2930
self.outf.write("%s\n" % osutils.local_time_offset())
2889
print osutils.local_time_offset()
2931
2890
2932
2891
2933
2892
2934
2893
class cmd_commit(Command):
2935
__doc__ = """Commit changes into a new revision.
2894
"""Commit changes into a new revision.
2936
2895
2937
2896
An explanatory message needs to be given for each commit. This is
2938
2897
often done by using the --message option (getting the message from the
3046
3005
"the master branch until a normal commit "
3047
3006
"is performed."
3048
3007
),
3049
Option('show-diff', short_name='p',
3008
Option('show-diff',
3050
3009
help='When no message is supplied, show the diff along'
3051
3010
' with the status summary in the message editor.'),
3052
3011
]
3132
3091
'(use --file "%(f)s" to take commit message from that file)'
3133
3092
% { 'f': message })
3134
3093
ui.ui_factory.show_warning(warning_msg)
3135
if '\r' in message:
3136
message = message.replace('\r\n', '\n')
3137
message = message.replace('\r', '\n')
3138
if file:
3139
raise errors.BzrCommandError(
3140
"please specify either --message or --file")
3141
3094
3142
3095
def get_message(commit_obj):
3143
3096
"""Callback to get commit message"""
3144
if file:
3145
my_message = codecs.open(
3146
file, 'rt', osutils.get_user_encoding()).read()
3147
elif message is not None:
3148
my_message = message
3149
else:
3150
# No message supplied: make one up.
3151
# text is the status of the tree
3152
text = make_commit_message_template_encoded(tree,
3097
my_message = message
3098
if my_message is not None and '\r' in my_message:
3099
my_message = my_message.replace('\r\n', '\n')
3100
my_message = my_message.replace('\r', '\n')
3101
if my_message is None and not file:
3102
t = make_commit_message_template_encoded(tree,
3153
3103
selected_list, diff=show_diff,
3154
3104
output_encoding=osutils.get_user_encoding())
3155
# start_message is the template generated from hooks
3156
# XXX: Warning - looks like hooks return unicode,
3157
# make_commit_message_template_encoded returns user encoding.
3158
# We probably want to be using edit_commit_message instead to
3159
# avoid this.
3160
3105
start_message = generate_commit_message_template(commit_obj)
3161
my_message = edit_commit_message_encoded(text,
3106
my_message = edit_commit_message_encoded(t,
3162
3107
start_message=start_message)
3163
3108
if my_message is None:
3164
3109
raise errors.BzrCommandError("please specify a commit"
3165
3110
" message with either --message or --file")
3111
elif my_message and file:
3112
raise errors.BzrCommandError(
3113
"please specify either --message or --file")
3114
if file:
3115
my_message = codecs.open(file, 'rt',
3116
osutils.get_user_encoding()).read()
3166
3117
if my_message == "":
3167
3118
raise errors.BzrCommandError("empty commit message specified")
3168
3119
return my_message
3180
3131
timezone=offset,
3181
3132
exclude=safe_relpath_files(tree, exclude))
3182
3133
except PointlessCommit:
3134
# FIXME: This should really happen before the file is read in;
3135
# perhaps prepare the commit; get the message; then actually commit
3183
3136
raise errors.BzrCommandError("No changes to commit."
3184
3137
" Use --unchanged to commit anyhow.")
3185
3138
except ConflictsInTree:
3190
3143
raise errors.BzrCommandError("Commit refused because there are"
3191
3144
" unknown files in the working tree.")
3192
3145
except errors.BoundBranchOutOfDate, e:
3193
e.extra_help = ("\n"
3194
'To commit to master branch, run update and then commit.\n'
3195
'You can also pass --local to commit to continue working '
3196
'disconnected.')
3197
raise
3146
raise errors.BzrCommandError(str(e) + "\n"
3147
'To commit to master branch, run update and then commit.\n'
3148
'You can also pass --local to commit to continue working '
3149
'disconnected.')
3198
3150
3199
3151
3200
3152
class cmd_check(Command):
3201
__doc__ = """Validate working tree structure, branch consistency and repository history.
3153
"""Validate working tree structure, branch consistency and repository history.
3202
3154
3203
3155
This command checks various invariants about branch and repository storage
3204
3156
to detect data corruption or bzr bugs.
3268
3220
3269
3221
3270
3222
class cmd_upgrade(Command):
3271
__doc__ = """Upgrade branch storage to current format.
3223
"""Upgrade branch storage to current format.
3272
3224
3273
3225
The check command or bzr developers may sometimes advise you to run
3274
3226
this command. When the default format has changed you may also be warned
3292
3244
3293
3245
3294
3246
class cmd_whoami(Command):
3295
__doc__ = """Show or set bzr user id.
3247
"""Show or set bzr user id.
3296
3248
3297
3249
:Examples:
3298
3250
Show the email of the current user::
3342
3294
3343
3295
3344
3296
class cmd_nick(Command):
3345
__doc__ = """Print or set the branch nickname.
3297
"""Print or set the branch nickname.
3346
3298
3347
3299
If unset, the tree root directory name is used as the nickname.
3348
3300
To print the current nickname, execute with no argument.
3362
3314
3363
3315
@display_command
3364
3316
def printme(self, branch):
3365
self.outf.write('%s\n' % branch.nick)
3317
print branch.nick
3366
3318
3367
3319
3368
3320
class cmd_alias(Command):
3369
__doc__ = """Set/unset and display aliases.
3321
"""Set/unset and display aliases.
3370
3322
3371
3323
:Examples:
3372
3324
Show the current aliases::
3436
3388
3437
3389
3438
3390
class cmd_selftest(Command):
3439
__doc__ = """Run internal test suite.
3391
"""Run internal test suite.
3440
3392
3441
3393
If arguments are given, they are regular expressions that say which tests
3442
3394
should run. Tests matching any expression are run, and other tests are
3486
3438
def get_transport_type(typestring):
3487
3439
"""Parse and return a transport specifier."""
3488
3440
if typestring == "sftp":
3489
from bzrlib.tests import stub_sftp
3490
return stub_sftp.SFTPAbsoluteServer
3441
from bzrlib.transport.sftp import SFTPAbsoluteServer
3442
return SFTPAbsoluteServer
3491
3443
if typestring == "memory":
3492
from bzrlib.tests import test_server
3493
return memory.MemoryServer
3444
from bzrlib.transport.memory import MemoryServer
3445
return MemoryServer
3494
3446
if typestring == "fakenfs":
3495
from bzrlib.tests import test_server
3496
return test_server.FakeNFSServer
3447
from bzrlib.transport.fakenfs import FakeNFSServer
3448
return FakeNFSServer
3497
3449
msg = "No known transport type %s. Supported types are: sftp\n" %\
3498
3450
(typestring)
3499
3451
raise errors.BzrCommandError(msg)
3583
3535
raise errors.BzrCommandError("subunit not available. subunit "
3584
3536
"needs to be installed to use --subunit.")
3585
3537
self.additional_selftest_args['runner_class'] = SubUnitBzrRunner
3586
# On Windows, disable automatic conversion of '\n' to '\r\n' in
3587
# stdout, which would corrupt the subunit stream.
3588
if sys.platform == "win32" and sys.stdout.fileno() >= 0:
3589
import msvcrt
3590
msvcrt.setmode(sys.stdout.fileno(), os.O_BINARY)
3591
3538
if parallel:
3592
3539
self.additional_selftest_args.setdefault(
3593
3540
'suite_decorators', []).append(parallel)
3597
3544
verbose = not is_quiet()
3598
3545
# TODO: should possibly lock the history file...
3599
3546
benchfile = open(".perf_history", "at", buffering=1)
3600
self.add_cleanup(benchfile.close)
3601
3547
else:
3602
3548
test_suite_factory = None
3603
3549
benchfile = None
3604
selftest_kwargs = {"verbose": verbose,
3605
"pattern": pattern,
3606
"stop_on_failure": one,
3607
"transport": transport,
3608
"test_suite_factory": test_suite_factory,
3609
"lsprof_timed": lsprof_timed,
3610
"lsprof_tests": lsprof_tests,
3611
"bench_history": benchfile,
3612
"matching_tests_first": first,
3613
"list_only": list_only,
3614
"random_seed": randomize,
3615
"exclude_pattern": exclude,
3616
"strict": strict,
3617
"load_list": load_list,
3618
"debug_flags": debugflag,
3619
"starting_with": starting_with
3620
}
3621
selftest_kwargs.update(self.additional_selftest_args)
3622
result = selftest(**selftest_kwargs)
3550
try:
3551
selftest_kwargs = {"verbose": verbose,
3552
"pattern": pattern,
3553
"stop_on_failure": one,
3554
"transport": transport,
3555
"test_suite_factory": test_suite_factory,
3556
"lsprof_timed": lsprof_timed,
3557
"lsprof_tests": lsprof_tests,
3558
"bench_history": benchfile,
3559
"matching_tests_first": first,
3560
"list_only": list_only,
3561
"random_seed": randomize,
3562
"exclude_pattern": exclude,
3563
"strict": strict,
3564
"load_list": load_list,
3565
"debug_flags": debugflag,
3566
"starting_with": starting_with
3567
}
3568
selftest_kwargs.update(self.additional_selftest_args)
3569
result = selftest(**selftest_kwargs)
3570
finally:
3571
if benchfile is not None:
3572
benchfile.close()
3623
3573
return int(not result)
3624
3574
3625
3575
3626
3576
class cmd_version(Command):
3627
__doc__ = """Show version of bzr."""
3577
"""Show version of bzr."""
3628
3578
3629
3579
encoding_type = 'replace'
3630
3580
takes_options = [
3641
3591
3642
3592
3643
3593
class cmd_rocks(Command):
3644
__doc__ = """Statement of optimism."""
3594
"""Statement of optimism."""
3645
3595
3646
3596
hidden = True
3647
3597
3648
3598
@display_command
3649
3599
def run(self):
3650
self.outf.write("It sure does!\n")
3600
print "It sure does!"
3651
3601
3652
3602
3653
3603
class cmd_find_merge_base(Command):
3654
__doc__ = """Find and print a base revision for merging two branches."""
3604
"""Find and print a base revision for merging two branches."""
3655
3605
# TODO: Options to specify revisions on either side, as if
3656
3606
# merging only part of the history.
3657
3607
takes_args = ['branch', 'other']
3663
3613
3664
3614
branch1 = Branch.open_containing(branch)[0]
3665
3615
branch2 = Branch.open_containing(other)[0]
3666
self.add_cleanup(branch1.lock_read().unlock)
3667
self.add_cleanup(branch2.lock_read().unlock)
3668
last1 = ensure_null(branch1.last_revision())
3669
last2 = ensure_null(branch2.last_revision())
3670
3671
graph = branch1.repository.get_graph(branch2.repository)
3672
base_rev_id = graph.find_unique_lca(last1, last2)
3673
3674
self.outf.write('merge base is revision %s\n' % base_rev_id)
3616
branch1.lock_read()
3617
try:
3618
branch2.lock_read()
3619
try:
3620
last1 = ensure_null(branch1.last_revision())
3621
last2 = ensure_null(branch2.last_revision())
3622
3623
graph = branch1.repository.get_graph(branch2.repository)
3624
base_rev_id = graph.find_unique_lca(last1, last2)
3625
3626
print 'merge base is revision %s' % base_rev_id
3627
finally:
3628
branch2.unlock()
3629
finally:
3630
branch1.unlock()
3675
3631
3676
3632
3677
3633
class cmd_merge(Command):
3678
__doc__ = """Perform a three-way merge.
3634
"""Perform a three-way merge.
3679
3635
3680
3636
The source of the merge can be specified either in the form of a branch,
3681
3637
or in the form of a path to a file containing a merge directive generated
3710
3666
committed to record the result of the merge.
3711
3667
3712
3668
merge refuses to run if there are any uncommitted changes, unless
3713
--force is given. The --force option can also be used to create a
3714
merge revision which has more than two parents.
3715
3716
If one would like to merge changes from the working tree of the other
3717
branch without merging any committed revisions, the --uncommitted option
3718
can be given.
3669
--force is given.
3719
3670
3720
3671
To select only some changes to merge, use "merge -i", which will prompt
3721
3672
you to apply each diff hunk and file change, similar to "shelve".
3736
3687
To apply a merge directive contained in /tmp/merge::
3737
3688
3738
3689
bzr merge /tmp/merge
3739
3740
To create a merge revision with three parents from two branches
3741
feature1a and feature1b:
3742
3743
bzr merge ../feature1a
3744
bzr merge ../feature1b --force
3745
bzr commit -m 'revision with three parents'
3746
3690
"""
3747
3691
3748
3692
encoding_type = 'exact'
3806
3750
view_info = _get_view_info_for_change_reporter(tree)
3807
3751
change_reporter = delta._ChangeReporter(
3808
3752
unversioned_filter=tree.is_ignored, view_info=view_info)
3809
pb = ui.ui_factory.nested_progress_bar()
3810
self.add_cleanup(pb.finished)
3811
self.add_cleanup(tree.lock_write().unlock)
3812
if location is not None:
3813
try:
3814
mergeable = bundle.read_mergeable_from_url(location,
3815
possible_transports=possible_transports)
3816
except errors.NotABundle:
3817
mergeable = None
3753
cleanups = []
3754
try:
3755
pb = ui.ui_factory.nested_progress_bar()
3756
cleanups.append(pb.finished)
3757
tree.lock_write()
3758
cleanups.append(tree.unlock)
3759
if location is not None:
3760
try:
3761
mergeable = bundle.read_mergeable_from_url(location,
3762
possible_transports=possible_transports)
3763
except errors.NotABundle:
3764
mergeable = None
3765
else:
3766
if uncommitted:
3767
raise errors.BzrCommandError('Cannot use --uncommitted'
3768
' with bundles or merge directives.')
3769
3770
if revision is not None:
3771
raise errors.BzrCommandError(
3772
'Cannot use -r with merge directives or bundles')
3773
merger, verified = _mod_merge.Merger.from_mergeable(tree,
3774
mergeable, pb)
3775
3776
if merger is None and uncommitted:
3777
if revision is not None and len(revision) > 0:
3778
raise errors.BzrCommandError('Cannot use --uncommitted and'
3779
' --revision at the same time.')
3780
merger = self.get_merger_from_uncommitted(tree, location, pb,
3781
cleanups)
3782
allow_pending = False
3783
3784
if merger is None:
3785
merger, allow_pending = self._get_merger_from_branch(tree,
3786
location, revision, remember, possible_transports, pb)
3787
3788
merger.merge_type = merge_type
3789
merger.reprocess = reprocess
3790
merger.show_base = show_base
3791
self.sanity_check_merger(merger)
3792
if (merger.base_rev_id == merger.other_rev_id and
3793
merger.other_rev_id is not None):
3794
note('Nothing to do.')
3795
return 0
3796
if pull:
3797
if merger.interesting_files is not None:
3798
raise errors.BzrCommandError('Cannot pull individual files')
3799
if (merger.base_rev_id == tree.last_revision()):
3800
result = tree.pull(merger.other_branch, False,
3801
merger.other_rev_id)
3802
result.report(self.outf)
3803
return 0
3804
if merger.this_basis is None:
3805
raise errors.BzrCommandError(
3806
"This branch has no commits."
3807
" (perhaps you would prefer 'bzr pull')")
3808
if preview:
3809
return self._do_preview(merger, cleanups)
3810
elif interactive:
3811
return self._do_interactive(merger, cleanups)
3818
3812
else:
3819
if uncommitted:
3820
raise errors.BzrCommandError('Cannot use --uncommitted'
3821
' with bundles or merge directives.')
3822
3823
if revision is not None:
3824
raise errors.BzrCommandError(
3825
'Cannot use -r with merge directives or bundles')
3826
merger, verified = _mod_merge.Merger.from_mergeable(tree,
3827
mergeable, None)
3828
3829
if merger is None and uncommitted:
3830
if revision is not None and len(revision) > 0:
3831
raise errors.BzrCommandError('Cannot use --uncommitted and'
3832
' --revision at the same time.')
3833
merger = self.get_merger_from_uncommitted(tree, location, None)
3834
allow_pending = False
3835
3836
if merger is None:
3837
merger, allow_pending = self._get_merger_from_branch(tree,
3838
location, revision, remember, possible_transports, None)
3839
3840
merger.merge_type = merge_type
3841
merger.reprocess = reprocess
3842
merger.show_base = show_base
3843
self.sanity_check_merger(merger)
3844
if (merger.base_rev_id == merger.other_rev_id and
3845
merger.other_rev_id is not None):
3846
note('Nothing to do.')
3847
return 0
3848
if pull:
3849
if merger.interesting_files is not None:
3850
raise errors.BzrCommandError('Cannot pull individual files')
3851
if (merger.base_rev_id == tree.last_revision()):
3852
result = tree.pull(merger.other_branch, False,
3853
merger.other_rev_id)
3854
result.report(self.outf)
3855
return 0
3856
if merger.this_basis is None:
3857
raise errors.BzrCommandError(
3858
"This branch has no commits."
3859
" (perhaps you would prefer 'bzr pull')")
3860
if preview:
3861
return self._do_preview(merger)
3862
elif interactive:
3863
return self._do_interactive(merger)
3864
else:
3865
return self._do_merge(merger, change_reporter, allow_pending,
3866
verified)
3867
3868
def _get_preview(self, merger):
3813
return self._do_merge(merger, change_reporter, allow_pending,
3814
verified)
3815
finally:
3816
for cleanup in reversed(cleanups):
3817
cleanup()
3818
3819
def _get_preview(self, merger, cleanups):
3869
3820
tree_merger = merger.make_merger()
3870
3821
tt = tree_merger.make_preview_transform()
3871
self.add_cleanup(tt.finalize)
3822
cleanups.append(tt.finalize)
3872
3823
result_tree = tt.get_preview_tree()
3873
3824
return result_tree
3874
3825
3875
def _do_preview(self, merger):
3826
def _do_preview(self, merger, cleanups):
3876
3827
from bzrlib.diff import show_diff_trees
3877
result_tree = self._get_preview(merger)
3828
result_tree = self._get_preview(merger, cleanups)
3878
3829
show_diff_trees(merger.this_tree, result_tree, self.outf,
3879
3830
old_label='', new_label='')
3880
3831
3890
3841
else:
3891
3842
return 0
3892
3843
3893
def _do_interactive(self, merger):
3844
def _do_interactive(self, merger, cleanups):
3894
3845
"""Perform an interactive merge.
3895
3846
3896
3847
This works by generating a preview tree of the merge, then using
3898
3849
and the preview tree.
3899
3850
"""
3900
3851
from bzrlib import shelf_ui
3901
result_tree = self._get_preview(merger)
3852
result_tree = self._get_preview(merger, cleanups)
3902
3853
writer = bzrlib.option.diff_writer_registry.get()
3903
3854
shelver = shelf_ui.Shelver(merger.this_tree, result_tree, destroy=True,
3904
3855
reporter=shelf_ui.ApplyReporter(),
3972
3923
allow_pending = True
3973
3924
return merger, allow_pending
3974
3925
3975
def get_merger_from_uncommitted(self, tree, location, pb):
3926
def get_merger_from_uncommitted(self, tree, location, pb, cleanups):
3976
3927
"""Get a merger for uncommitted changes.
3977
3928
3978
3929
:param tree: The tree the merger should apply to.
3979
3930
:param location: The location containing uncommitted changes.
3980
3931
:param pb: The progress bar to use for showing progress.
3932
:param cleanups: A list of operations to perform to clean up the
3933
temporary directories, unfinalized objects, etc.
3981
3934
"""
3982
3935
location = self._select_branch_location(tree, location)[0]
3983
3936
other_tree, other_path = WorkingTree.open_containing(location)
4035
3988
4036
3989
4037
3990
class cmd_remerge(Command):
4038
__doc__ = """Redo a merge.
3991
"""Redo a merge.
4039
3992
4040
3993
Use this if you want to try a different merge technique while resolving
4041
3994
conflicts. Some merge techniques are better than others, and remerge
4066
4019
4067
4020
def run(self, file_list=None, merge_type=None, show_base=False,
4068
4021
reprocess=False):
4069
from bzrlib.conflicts import restore
4070
4022
if merge_type is None:
4071
4023
merge_type = _mod_merge.Merge3Merger
4072
4024
tree, file_list = tree_files(file_list)
4073
self.add_cleanup(tree.lock_write().unlock)
4074
parents = tree.get_parent_ids()
4075
if len(parents) != 2:
4076
raise errors.BzrCommandError("Sorry, remerge only works after normal"
4077
" merges. Not cherrypicking or"
4078
" multi-merges.")
4079
repository = tree.branch.repository
4080
interesting_ids = None
4081
new_conflicts = []
4082
conflicts = tree.conflicts()
4083
if file_list is not None:
4084
interesting_ids = set()
4085
for filename in file_list:
4086
file_id = tree.path2id(filename)
4087
if file_id is None:
4088
raise errors.NotVersionedError(filename)
4089
interesting_ids.add(file_id)
4090
if tree.kind(file_id) != "directory":
4091
continue
4025
tree.lock_write()
4026
try:
4027
parents = tree.get_parent_ids()
4028
if len(parents) != 2:
4029
raise errors.BzrCommandError("Sorry, remerge only works after normal"
4030
" merges. Not cherrypicking or"
4031
" multi-merges.")
4032
repository = tree.branch.repository
4033
interesting_ids = None
4034
new_conflicts = []
4035
conflicts = tree.conflicts()
4036
if file_list is not None:
4037
interesting_ids = set()
4038
for filename in file_list:
4039
file_id = tree.path2id(filename)
4040
if file_id is None:
4041
raise errors.NotVersionedError(filename)
4042
interesting_ids.add(file_id)
4043
if tree.kind(file_id) != "directory":
4044
continue
4092
4045
4093
for name, ie in tree.inventory.iter_entries(file_id):
4094
interesting_ids.add(ie.file_id)
4095
new_conflicts = conflicts.select_conflicts(tree, file_list)[0]
4096
else:
4097
# Remerge only supports resolving contents conflicts
4098
allowed_conflicts = ('text conflict', 'contents conflict')
4099
restore_files = [c.path for c in conflicts
4100
if c.typestring in allowed_conflicts]
4101
_mod_merge.transform_tree(tree, tree.basis_tree(), interesting_ids)
4102
tree.set_conflicts(ConflictList(new_conflicts))
4103
if file_list is not None:
4104
restore_files = file_list
4105
for filename in restore_files:
4046
for name, ie in tree.inventory.iter_entries(file_id):
4047
interesting_ids.add(ie.file_id)
4048
new_conflicts = conflicts.select_conflicts(tree, file_list)[0]
4049
else:
4050
# Remerge only supports resolving contents conflicts
4051
allowed_conflicts = ('text conflict', 'contents conflict')
4052
restore_files = [c.path for c in conflicts
4053
if c.typestring in allowed_conflicts]
4054
_mod_merge.transform_tree(tree, tree.basis_tree(), interesting_ids)
4055
tree.set_conflicts(ConflictList(new_conflicts))
4056
if file_list is not None:
4057
restore_files = file_list
4058
for filename in restore_files:
4059
try:
4060
restore(tree.abspath(filename))
4061
except errors.NotConflicted:
4062
pass
4063
# Disable pending merges, because the file texts we are remerging
4064
# have not had those merges performed. If we use the wrong parents
4065
# list, we imply that the working tree text has seen and rejected
4066
# all the changes from the other tree, when in fact those changes
4067
# have not yet been seen.
4068
pb = ui.ui_factory.nested_progress_bar()
4069
tree.set_parent_ids(parents[:1])
4106
4070
try:
4107
restore(tree.abspath(filename))
4108
except errors.NotConflicted:
4109
pass
4110
# Disable pending merges, because the file texts we are remerging
4111
# have not had those merges performed. If we use the wrong parents
4112
# list, we imply that the working tree text has seen and rejected
4113
# all the changes from the other tree, when in fact those changes
4114
# have not yet been seen.
4115
tree.set_parent_ids(parents[:1])
4116
try:
4117
merger = _mod_merge.Merger.from_revision_ids(None, tree, parents[1])
4118
merger.interesting_ids = interesting_ids
4119
merger.merge_type = merge_type
4120
merger.show_base = show_base
4121
merger.reprocess = reprocess
4122
conflicts = merger.do_merge()
4071
merger = _mod_merge.Merger.from_revision_ids(pb,
4072
tree, parents[1])
4073
merger.interesting_ids = interesting_ids
4074
merger.merge_type = merge_type
4075
merger.show_base = show_base
4076
merger.reprocess = reprocess
4077
conflicts = merger.do_merge()
4078
finally:
4079
tree.set_parent_ids(parents)
4080
pb.finished()
4123
4081
finally:
4124
tree.set_parent_ids(parents)
4082
tree.unlock()
4125
4083
if conflicts > 0:
4126
4084
return 1
4127
4085
else:
4129
4087
4130
4088
4131
4089
class cmd_revert(Command):
4132
__doc__ = """Revert files to a previous revision.
4090
"""Revert files to a previous revision.
4133
4091
4134
4092
Giving a list of files will revert only those files. Otherwise, all files
4135
4093
will be reverted. If the revision is not specified with '--revision', the
4154
4112
created as above. Directories containing unknown files will not be
4155
4113
deleted.
4156
4114
4157
The working tree contains a list of revisions that have been merged but
4158
not yet committed. These revisions will be included as additional parents
4159
of the next commit. Normally, using revert clears that list as well as
4160
reverting the files. If any files are specified, revert leaves the list
4161
of uncommitted merges alone and reverts only the files. Use ``bzr revert
4162
.`` in the tree root to revert all files but keep the recorded merges,
4163
and ``bzr revert --forget-merges`` to clear the pending merge list without
4115
The working tree contains a list of pending merged revisions, which will
4116
be included as parents in the next commit. Normally, revert clears that
4117
list as well as reverting the files. If any files are specified, revert
4118
leaves the pending merge list alone and reverts only the files. Use "bzr
4119
revert ." in the tree root to revert all files but keep the merge record,
4120
and "bzr revert --forget-merges" to clear the pending merge list without
4164
4121
reverting any files.
4165
4122
4166
Using "bzr revert --forget-merges", it is possible to apply all of the
4167
changes from a branch in a single revision. To do this, perform the merge
4168
as desired. Then doing revert with the "--forget-merges" option will keep
4169
the content of the tree as it was, but it will clear the list of pending
4170
merges. The next commit will then contain all of the changes that are
4171
present in the other branch, but without any other parent revisions.
4172
Because this technique forgets where these changes originated, it may
4173
cause additional conflicts on later merges involving the same source and
4123
Using "bzr revert --forget-merges", it is possible to apply the changes
4124
from an arbitrary merge as a single revision. To do this, perform the
4125
merge as desired. Then doing revert with the "--forget-merges" option will
4126
keep the content of the tree as it was, but it will clear the list of
4127
pending merges. The next commit will then contain all of the changes that
4128
would have been in the merge, but without any mention of the other parent
4129
revisions. Because this technique forgets where these changes originated,
4130
it may cause additional conflicts on later merges involving the source and
4174
4131
target branches.
4175
4132
"""
4176
4133
4186
4143
def run(self, revision=None, no_backup=False, file_list=None,
4187
4144
forget_merges=None):
4188
4145
tree, file_list = tree_files(file_list)
4189
self.add_cleanup(tree.lock_tree_write().unlock)
4190
if forget_merges:
4191
tree.set_parent_ids(tree.get_parent_ids()[:1])
4192
else:
4193
self._revert_tree_to_revision(tree, revision, file_list, no_backup)
4146
tree.lock_write()
4147
try:
4148
if forget_merges:
4149
tree.set_parent_ids(tree.get_parent_ids()[:1])
4150
else:
4151
self._revert_tree_to_revision(tree, revision, file_list, no_backup)
4152
finally:
4153
tree.unlock()
4194
4154
4195
4155
@staticmethod
4196
4156
def _revert_tree_to_revision(tree, revision, file_list, no_backup):
4197
4157
rev_tree = _get_one_revision_tree('revert', revision, tree=tree)
4198
tree.revert(file_list, rev_tree, not no_backup, None,
4199
report_changes=True)
4158
pb = ui.ui_factory.nested_progress_bar()
4159
try:
4160
tree.revert(file_list, rev_tree, not no_backup, pb,
4161
report_changes=True)
4162
finally:
4163
pb.finished()
4200
4164
4201
4165
4202
4166
class cmd_assert_fail(Command):
4203
__doc__ = """Test reporting of assertion failures"""
4167
"""Test reporting of assertion failures"""
4204
4168
# intended just for use in testing
4205
4169
4206
4170
hidden = True
4210
4174
4211
4175
4212
4176
class cmd_help(Command):
4213
__doc__ = """Show help on a command or other topic.
4177
"""Show help on a command or other topic.
4214
4178
"""
4215
4179
4216
4180
_see_also = ['topics']
4229
4193
4230
4194
4231
4195
class cmd_shell_complete(Command):
4232
__doc__ = """Show appropriate completions for context.
4196
"""Show appropriate completions for context.
4233
4197
4234
4198
For a list of all available commands, say 'bzr shell-complete'.
4235
4199
"""
4244
4208
4245
4209
4246
4210
class cmd_missing(Command):
4247
__doc__ = """Show unmerged/unpulled revisions between two branches.
4211
"""Show unmerged/unpulled revisions between two branches.
4248
4212
4249
4213
OTHER_BRANCH may be local or remote.
4250
4214
4328
4292
restrict = 'remote'
4329
4293
4330
4294
local_branch = Branch.open_containing(u".")[0]
4331
self.add_cleanup(local_branch.lock_read().unlock)
4332
4333
4295
parent = local_branch.get_parent()
4334
4296
if other_branch is None:
4335
4297
other_branch = parent
4344
4306
remote_branch = Branch.open(other_branch)
4345
4307
if remote_branch.base == local_branch.base:
4346
4308
remote_branch = local_branch
4347
else:
4348
self.add_cleanup(remote_branch.lock_read().unlock)
4349
4309
4350
4310
local_revid_range = _revision_range_to_revid_range(
4351
4311
_get_revision_range(my_revision, local_branch,
4355
4315
_get_revision_range(revision,
4356
4316
remote_branch, self.name()))
4357
4317
4358
local_extra, remote_extra = find_unmerged(
4359
local_branch, remote_branch, restrict,
4360
backward=not reverse,
4361
include_merges=include_merges,
4362
local_revid_range=local_revid_range,
4363
remote_revid_range=remote_revid_range)
4364
4365
if log_format is None:
4366
registry = log.log_formatter_registry
4367
log_format = registry.get_default(local_branch)
4368
lf = log_format(to_file=self.outf,
4369
show_ids=show_ids,
4370
show_timezone='original')
4371
4372
status_code = 0
4373
if local_extra and not theirs_only:
4374
message("You have %d extra revision(s):\n" %
4375
len(local_extra))
4376
for revision in iter_log_revisions(local_extra,
4377
local_branch.repository,
4378
verbose):
4379
lf.log_revision(revision)
4380
printed_local = True
4381
status_code = 1
4382
else:
4383
printed_local = False
4384
4385
if remote_extra and not mine_only:
4386
if printed_local is True:
4387
message("\n\n\n")
4388
message("You are missing %d revision(s):\n" %
4389
len(remote_extra))
4390
for revision in iter_log_revisions(remote_extra,
4391
remote_branch.repository,
4392
verbose):
4393
lf.log_revision(revision)
4394
status_code = 1
4395
4396
if mine_only and not local_extra:
4397
# We checked local, and found nothing extra
4398
message('This branch is up to date.\n')
4399
elif theirs_only and not remote_extra:
4400
# We checked remote, and found nothing extra
4401
message('Other branch is up to date.\n')
4402
elif not (mine_only or theirs_only or local_extra or
4403
remote_extra):
4404
# We checked both branches, and neither one had extra
4405
# revisions
4406
message("Branches are up to date.\n")
4407
self.cleanup_now()
4318
local_branch.lock_read()
4319
try:
4320
remote_branch.lock_read()
4321
try:
4322
local_extra, remote_extra = find_unmerged(
4323
local_branch, remote_branch, restrict,
4324
backward=not reverse,
4325
include_merges=include_merges,
4326
local_revid_range=local_revid_range,
4327
remote_revid_range=remote_revid_range)
4328
4329
if log_format is None:
4330
registry = log.log_formatter_registry
4331
log_format = registry.get_default(local_branch)
4332
lf = log_format(to_file=self.outf,
4333
show_ids=show_ids,
4334
show_timezone='original')
4335
4336
status_code = 0
4337
if local_extra and not theirs_only:
4338
message("You have %d extra revision(s):\n" %
4339
len(local_extra))
4340
for revision in iter_log_revisions(local_extra,
4341
local_branch.repository,
4342
verbose):
4343
lf.log_revision(revision)
4344
printed_local = True
4345
status_code = 1
4346
else:
4347
printed_local = False
4348
4349
if remote_extra and not mine_only:
4350
if printed_local is True:
4351
message("\n\n\n")
4352
message("You are missing %d revision(s):\n" %
4353
len(remote_extra))
4354
for revision in iter_log_revisions(remote_extra,
4355
remote_branch.repository,
4356
verbose):
4357
lf.log_revision(revision)
4358
status_code = 1
4359
4360
if mine_only and not local_extra:
4361
# We checked local, and found nothing extra
4362
message('This branch is up to date.\n')
4363
elif theirs_only and not remote_extra:
4364
# We checked remote, and found nothing extra
4365
message('Other branch is up to date.\n')
4366
elif not (mine_only or theirs_only or local_extra or
4367
remote_extra):
4368
# We checked both branches, and neither one had extra
4369
# revisions
4370
message("Branches are up to date.\n")
4371
finally:
4372
remote_branch.unlock()
4373
finally:
4374
local_branch.unlock()
4408
4375
if not status_code and parent is None and other_branch is not None:
4409
self.add_cleanup(local_branch.lock_write().unlock)
4410
# handle race conditions - a parent might be set while we run.
4411
if local_branch.get_parent() is None:
4412
local_branch.set_parent(remote_branch.base)
4376
local_branch.lock_write()
4377
try:
4378
# handle race conditions - a parent might be set while we run.
4379
if local_branch.get_parent() is None:
4380
local_branch.set_parent(remote_branch.base)
4381
finally:
4382
local_branch.unlock()
4413
4383
return status_code
4414
4384
4415
4385
4416
4386
class cmd_pack(Command):
4417
__doc__ = """Compress the data within a repository.
4418
4419
This operation compresses the data within a bazaar repository. As
4420
bazaar supports automatic packing of repository, this operation is
4421
normally not required to be done manually.
4422
4423
During the pack operation, bazaar takes a backup of existing repository
4424
data, i.e. pack files. This backup is eventually removed by bazaar
4425
automatically when it is safe to do so. To save disk space by removing
4426
the backed up pack files, the --clean-obsolete-packs option may be
4427
used.
4428
4429
Warning: If you use --clean-obsolete-packs and your machine crashes
4430
during or immediately after repacking, you may be left with a state
4431
where the deletion has been written to disk but the new packs have not
4432
been. In this case the repository may be unusable.
4433
"""
4387
"""Compress the data within a repository."""
4434
4388
4435
4389
_see_also = ['repositories']
4436
4390
takes_args = ['branch_or_repo?']
4437
takes_options = [
4438
Option('clean-obsolete-packs', 'Delete obsolete packs to save disk space.'),
4439
]
4440
4391
4441
def run(self, branch_or_repo='.', clean_obsolete_packs=False):
4392
def run(self, branch_or_repo='.'):
4442
4393
dir = bzrdir.BzrDir.open_containing(branch_or_repo)[0]
4443
4394
try:
4444
4395
branch = dir.open_branch()
4445
4396
repository = branch.repository
4446
4397
except errors.NotBranchError:
4447
4398
repository = dir.open_repository()
4448
repository.pack(clean_obsolete_packs=clean_obsolete_packs)
4399
repository.pack()
4449
4400
4450
4401
4451
4402
class cmd_plugins(Command):
4452
__doc__ = """List the installed plugins.
4403
"""List the installed plugins.
4453
4404
4454
4405
This command displays the list of installed plugins including
4455
4406
version of plugin and a short description of each.
4462
4413
adding new commands, providing additional network transports and
4463
4414
customizing log output.
4464
4415
4465
See the Bazaar Plugin Guide <http://doc.bazaar.canonical.com/plugins/en/>
4466
for further information on plugins including where to find them and how to
4467
install them. Instructions are also provided there on how to write new
4468
plugins using the Python programming language.
4416
See the Bazaar web site, http://bazaar-vcs.org, for further
4417
information on plugins including where to find them and how to
4418
install them. Instructions are also provided there on how to
4419
write new plugins using the Python programming language.
4469
4420
"""
4470
4421
takes_options = ['verbose']
4471
4422
4486
4437
doc = '(no description)'
4487
4438
result.append((name_ver, doc, plugin.path()))
4488
4439
for name_ver, doc, path in sorted(result):
4489
self.outf.write("%s\n" % name_ver)
4490
self.outf.write(" %s\n" % doc)
4440
print name_ver
4441
print ' ', doc
4491
4442
if verbose:
4492
self.outf.write(" %s\n" % path)
4493
self.outf.write("\n")
4443
print ' ', path
4444
print
4494
4445
4495
4446
4496
4447
class cmd_testament(Command):
4497
__doc__ = """Show testament (signing-form) of a revision."""
4448
"""Show testament (signing-form) of a revision."""
4498
4449
takes_options = [
4499
4450
'revision',
4500
4451
Option('long', help='Produce long-format testament.'),
4512
4463
b = Branch.open_containing(branch)[0]
4513
4464
else:
4514
4465
b = Branch.open(branch)
4515
self.add_cleanup(b.lock_read().unlock)
4516
if revision is None:
4517
rev_id = b.last_revision()
4518
else:
4519
rev_id = revision[0].as_revision_id(b)
4520
t = testament_class.from_revision(b.repository, rev_id)
4521
if long:
4522
sys.stdout.writelines(t.as_text_lines())
4523
else:
4524
sys.stdout.write(t.as_short_text())
4466
b.lock_read()
4467
try:
4468
if revision is None:
4469
rev_id = b.last_revision()
4470
else:
4471
rev_id = revision[0].as_revision_id(b)
4472
t = testament_class.from_revision(b.repository, rev_id)
4473
if long:
4474
sys.stdout.writelines(t.as_text_lines())
4475
else:
4476
sys.stdout.write(t.as_short_text())
4477
finally:
4478
b.unlock()
4525
4479
4526
4480
4527
4481
class cmd_annotate(Command):
4528
__doc__ = """Show the origin of each line in a file.
4482
"""Show the origin of each line in a file.
4529
4483
4530
4484
This prints out the given file with an annotation on the left side
4531
4485
indicating which revision, author and date introduced the change.
4552
4506
wt, branch, relpath = \
4553
4507
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
4554
4508
if wt is not None:
4555
self.add_cleanup(wt.lock_read().unlock)
4556
else:
4557
self.add_cleanup(branch.lock_read().unlock)
4558
tree = _get_one_revision_tree('annotate', revision, branch=branch)
4559
self.add_cleanup(tree.lock_read().unlock)
4560
if wt is not None:
4561
file_id = wt.path2id(relpath)
4562
else:
4563
file_id = tree.path2id(relpath)
4564
if file_id is None:
4565
raise errors.NotVersionedError(filename)
4566
file_version = tree.inventory[file_id].revision
4567
if wt is not None and revision is None:
4568
# If there is a tree and we're not annotating historical
4569
# versions, annotate the working tree's content.
4570
annotate_file_tree(wt, file_id, self.outf, long, all,
4571
show_ids=show_ids)
4572
else:
4573
annotate_file(branch, file_version, file_id, long, all, self.outf,
4574
show_ids=show_ids)
4509
wt.lock_read()
4510
else:
4511
branch.lock_read()
4512
try:
4513
tree = _get_one_revision_tree('annotate', revision, branch=branch)
4514
if wt is not None:
4515
file_id = wt.path2id(relpath)
4516
else:
4517
file_id = tree.path2id(relpath)
4518
if file_id is None:
4519
raise errors.NotVersionedError(filename)
4520
file_version = tree.inventory[file_id].revision
4521
if wt is not None and revision is None:
4522
# If there is a tree and we're not annotating historical
4523
# versions, annotate the working tree's content.
4524
annotate_file_tree(wt, file_id, self.outf, long, all,
4525
show_ids=show_ids)
4526
else:
4527
annotate_file(branch, file_version, file_id, long, all, self.outf,
4528
show_ids=show_ids)
4529
finally:
4530
if wt is not None:
4531
wt.unlock()
4532
else:
4533
branch.unlock()
4575
4534
4576
4535
4577
4536
class cmd_re_sign(Command):
4578
__doc__ = """Create a digital signature for an existing revision."""
4537
"""Create a digital signature for an existing revision."""
4579
4538
# TODO be able to replace existing ones.
4580
4539
4581
4540
hidden = True # is this right ?
4588
4547
if revision_id_list is None and revision is None:
4589
4548
raise errors.BzrCommandError('You must supply either --revision or a revision_id')
4590
4549
b = WorkingTree.open_containing(u'.')[0].branch
4591
self.add_cleanup(b.lock_write().unlock)
4592
return self._run(b, revision_id_list, revision)
4550
b.lock_write()
4551
try:
4552
return self._run(b, revision_id_list, revision)
4553
finally:
4554
b.unlock()
4593
4555
4594
4556
def _run(self, b, revision_id_list, revision):
4595
4557
import bzrlib.gpg as gpg
4640
4602
4641
4603
4642
4604
class cmd_bind(Command):
4643
__doc__ = """Convert the current branch into a checkout of the supplied branch.
4644
If no branch is supplied, rebind to the last bound location.
4605
"""Convert the current branch into a checkout of the supplied branch.
4645
4606
4646
4607
Once converted into a checkout, commits must succeed on the master branch
4647
4608
before they will be applied to the local branch.
4665
4626
'This format does not remember old locations.')
4666
4627
else:
4667
4628
if location is None:
4668
if b.get_bound_location() is not None:
4669
raise errors.BzrCommandError('Branch is already bound')
4670
else:
4671
raise errors.BzrCommandError('No location supplied '
4672
'and no previous location known')
4629
raise errors.BzrCommandError('No location supplied and no '
4630
'previous location known')
4673
4631
b_other = Branch.open(location)
4674
4632
try:
4675
4633
b.bind(b_other)
4681
4639
4682
4640
4683
4641
class cmd_unbind(Command):
4684
__doc__ = """Convert the current checkout into a regular branch.
4642
"""Convert the current checkout into a regular branch.
4685
4643
4686
4644
After unbinding, the local branch is considered independent and subsequent
4687
4645
commits will be local only.
4698
4656
4699
4657
4700
4658
class cmd_uncommit(Command):
4701
__doc__ = """Remove the last committed revision.
4659
"""Remove the last committed revision.
4702
4660
4703
4661
--verbose will print out what is being removed.
4704
4662
--dry-run will go through all the motions, but not actually
4744
4702
b = control.open_branch()
4745
4703
4746
4704
if tree is not None:
4747
self.add_cleanup(tree.lock_write().unlock)
4705
tree.lock_write()
4748
4706
else:
4749
self.add_cleanup(b.lock_write().unlock)
4750
return self._run(b, tree, dry_run, verbose, revision, force, local=local)
4707
b.lock_write()
4708
try:
4709
return self._run(b, tree, dry_run, verbose, revision, force,
4710
local=local)
4711
finally:
4712
if tree is not None:
4713
tree.unlock()
4714
else:
4715
b.unlock()
4751
4716
4752
4717
def _run(self, b, tree, dry_run, verbose, revision, force, local=False):
4753
4718
from bzrlib.log import log_formatter, show_log
4785
4750
end_revision=last_revno)
4786
4751
4787
4752
if dry_run:
4788
self.outf.write('Dry-run, pretending to remove'
4789
' the above revisions.\n')
4753
print 'Dry-run, pretending to remove the above revisions.'
4754
if not force:
4755
val = raw_input('Press <enter> to continue')
4790
4756
else:
4791
self.outf.write('The above revision(s) will be removed.\n')
4792
4793
if not force:
4794
if not ui.ui_factory.get_boolean('Are you sure'):
4795
self.outf.write('Canceled')
4796
return 0
4757
print 'The above revision(s) will be removed.'
4758
if not force:
4759
val = raw_input('Are you sure [y/N]? ')
4760
if val.lower() not in ('y', 'yes'):
4761
print 'Canceled'
4762
return 0
4797
4763
4798
4764
mutter('Uncommitting from {%s} to {%s}',
4799
4765
last_rev_id, rev_id)
4800
4766
uncommit(b, tree=tree, dry_run=dry_run, verbose=verbose,
4801
4767
revno=revno, local=local)
4802
self.outf.write('You can restore the old tip by running:\n'
4803
' bzr pull . -r revid:%s\n' % last_rev_id)
4768
note('You can restore the old tip by running:\n'
4769
' bzr pull . -r revid:%s', last_rev_id)
4804
4770
4805
4771
4806
4772
class cmd_break_lock(Command):
4807
__doc__ = """Break a dead lock on a repository, branch or working directory.
4773
"""Break a dead lock on a repository, branch or working directory.
4808
4774
4809
4775
CAUTION: Locks should only be broken when you are sure that the process
4810
4776
holding the lock has been stopped.
4811
4777
4812
You can get information on what locks are open via the 'bzr info
4813
[location]' command.
4778
You can get information on what locks are open via the 'bzr info' command.
4814
4779
4815
4780
:Examples:
4816
4781
bzr break-lock
4817
bzr break-lock bzr+ssh://example.com/bzr/foo
4818
4782
"""
4819
4783
takes_args = ['location?']
4820
4784
4829
4793
4830
4794
4831
4795
class cmd_wait_until_signalled(Command):
4832
__doc__ = """Test helper for test_start_and_stop_bzr_subprocess_send_signal.
4796
"""Test helper for test_start_and_stop_bzr_subprocess_send_signal.
4833
4797
4834
4798
This just prints a line to signal when it is ready, then blocks on stdin.
4835
4799
"""
4843
4807
4844
4808
4845
4809
class cmd_serve(Command):
4846
__doc__ = """Run the bzr server."""
4810
"""Run the bzr server."""
4847
4811
4848
4812
aliases = ['server']
4849
4813
4909
4873
4910
4874
4911
4875
class cmd_join(Command):
4912
__doc__ = """Combine a tree into its containing tree.
4876
"""Combine a tree into its containing tree.
4913
4877
4914
4878
This command requires the target tree to be in a rich-root format.
4915
4879
4955
4919
4956
4920
4957
4921
class cmd_split(Command):
4958
__doc__ = """Split a subdirectory of a tree into a separate tree.
4922
"""Split a subdirectory of a tree into a separate tree.
4959
4923
4960
4924
This command will produce a target tree in a format that supports
4961
4925
rich roots, like 'rich-root' or 'rich-root-pack'. These formats cannot be
4981
4945
4982
4946
4983
4947
class cmd_merge_directive(Command):
4984
__doc__ = """Generate a merge directive for auto-merge tools.
4948
"""Generate a merge directive for auto-merge tools.
4985
4949
4986
4950
A directive requests a merge to be performed, and also provides all the
4987
4951
information necessary to do so. This means it must either include a
5080
5044
5081
5045
5082
5046
class cmd_send(Command):
5083
__doc__ = """Mail or create a merge-directive for submitting changes.
5047
"""Mail or create a merge-directive for submitting changes.
5084
5048
5085
5049
A merge directive provides many things needed for requesting merges:
5086
5050
5092
5056
directly from the merge directive, without retrieving data from a
5093
5057
branch.
5094
5058
5095
`bzr send` creates a compact data set that, when applied using bzr
5096
merge, has the same effect as merging from the source branch.
5097
5098
By default the merge directive is self-contained and can be applied to any
5099
branch containing submit_branch in its ancestory without needing access to
5100
the source branch.
5101
5102
If --no-bundle is specified, then Bazaar doesn't send the contents of the
5103
revisions, but only a structured request to merge from the
5104
public_location. In that case the public_branch is needed and it must be
5105
up-to-date and accessible to the recipient. The public_branch is always
5106
included if known, so that people can check it later.
5107
5108
The submit branch defaults to the parent of the source branch, but can be
5109
overridden. Both submit branch and public branch will be remembered in
5110
branch.conf the first time they are used for a particular branch. The
5111
source branch defaults to that containing the working directory, but can
5112
be changed using --from.
5113
5114
In order to calculate those changes, bzr must analyse the submit branch.
5115
Therefore it is most efficient for the submit branch to be a local mirror.
5116
If a public location is known for the submit_branch, that location is used
5117
in the merge directive.
5118
5119
The default behaviour is to send the merge directive by mail, unless -o is
5120
given, in which case it is sent to a file.
5059
If --no-bundle is specified, then public_branch is needed (and must be
5060
up-to-date), so that the receiver can perform the merge using the
5061
public_branch. The public_branch is always included if known, so that
5062
people can check it later.
5063
5064
The submit branch defaults to the parent, but can be overridden. Both
5065
submit branch and public branch will be remembered if supplied.
5066
5067
If a public_branch is known for the submit_branch, that public submit
5068
branch is used in the merge instructions. This means that a local mirror
5069
can be used as your actual submit branch, once you have set public_branch
5070
for that mirror.
5121
5071
5122
5072
Mail is sent using your preferred mail program. This should be transparent
5123
5073
on Windows (it uses MAPI). On Linux, it requires the xdg-email utility.
5143
5093
5144
5094
The merge directives created by bzr send may be applied using bzr merge or
5145
5095
bzr pull by specifying a file containing a merge directive as the location.
5146
5147
bzr send makes extensive use of public locations to map local locations into
5148
URLs that can be used by other people. See `bzr help configuration` to
5149
set them, and use `bzr info` to display them.
5150
5096
"""
5151
5097
5152
5098
encoding_type = 'exact'
5168
5114
short_name='f',
5169
5115
type=unicode),
5170
5116
Option('output', short_name='o',
5171
help='Write merge directive to this file or directory; '
5117
help='Write merge directive to this file; '
5172
5118
'use - for stdout.',
5173
5119
type=unicode),
5174
5120
Option('strict',
5197
5143
5198
5144
5199
5145
class cmd_bundle_revisions(cmd_send):
5200
__doc__ = """Create a merge-directive for submitting changes.
5146
"""Create a merge-directive for submitting changes.
5201
5147
5202
5148
A merge directive provides many things needed for requesting merges:
5203
5149
5270
5216
5271
5217
5272
5218
class cmd_tag(Command):
5273
__doc__ = """Create, remove or modify a tag naming a revision.
5219
"""Create, remove or modify a tag naming a revision.
5274
5220
5275
5221
Tags give human-meaningful names to revisions. Commands that take a -r
5276
5222
(--revision) option can be given -rtag:X, where X is any previously
5284
5230
5285
5231
To rename a tag (change the name but keep it on the same revsion), run ``bzr
5286
5232
tag new-name -r tag:old-name`` and then ``bzr tag --delete oldname``.
5287
5288
If no tag name is specified it will be determined through the
5289
'automatic_tag_name' hook. This can e.g. be used to automatically tag
5290
upstream releases by reading configure.ac. See ``bzr help hooks`` for
5291
details.
5292
5233
"""
5293
5234
5294
5235
_see_also = ['commit', 'tags']
5295
takes_args = ['tag_name?']
5236
takes_args = ['tag_name']
5296
5237
takes_options = [
5297
5238
Option('delete',
5298
5239
help='Delete this tag rather than placing it.',
5308
5249
'revision',
5309
5250
]
5310
5251
5311
def run(self, tag_name=None,
5252
def run(self, tag_name,
5312
5253
delete=None,
5313
5254
directory='.',
5314
5255
force=None,
5315
5256
revision=None,
5316
5257
):
5317
5258
branch, relpath = Branch.open_containing(directory)
5318
self.add_cleanup(branch.lock_write().unlock)
5319
if delete:
5320
if tag_name is None:
5321
raise errors.BzrCommandError("No tag specified to delete.")
5322
branch.tags.delete_tag(tag_name)
5323
self.outf.write('Deleted tag %s.\n' % tag_name)
5324
else:
5325
if revision:
5326
if len(revision) != 1:
5327
raise errors.BzrCommandError(
5328
"Tags can only be placed on a single revision, "
5329
"not on a range")
5330
revision_id = revision[0].as_revision_id(branch)
5259
branch.lock_write()
5260
try:
5261
if delete:
5262
branch.tags.delete_tag(tag_name)
5263
self.outf.write('Deleted tag %s.\n' % tag_name)
5331
5264
else:
5332
revision_id = branch.last_revision()
5333
if tag_name is None:
5334
tag_name = branch.automatic_tag_name(revision_id)
5335
if tag_name is None:
5336
raise errors.BzrCommandError(
5337
"Please specify a tag name.")
5338
if (not force) and branch.tags.has_tag(tag_name):
5339
raise errors.TagAlreadyExists(tag_name)
5340
branch.tags.set_tag(tag_name, revision_id)
5341
self.outf.write('Created tag %s.\n' % tag_name)
5265
if revision:
5266
if len(revision) != 1:
5267
raise errors.BzrCommandError(
5268
"Tags can only be placed on a single revision, "
5269
"not on a range")
5270
revision_id = revision[0].as_revision_id(branch)
5271
else:
5272
revision_id = branch.last_revision()
5273
if (not force) and branch.tags.has_tag(tag_name):
5274
raise errors.TagAlreadyExists(tag_name)
5275
branch.tags.set_tag(tag_name, revision_id)
5276
self.outf.write('Created tag %s.\n' % tag_name)
5277
finally:
5278
branch.unlock()
5342
5279
5343
5280
5344
5281
class cmd_tags(Command):
5345
__doc__ = """List tags.
5282
"""List tags.
5346
5283
5347
5284
This command shows a table of tag names and the revisions they reference.
5348
5285
"""
5376
5313
if not tags:
5377
5314
return
5378
5315
5379
self.add_cleanup(branch.lock_read().unlock)
5380
if revision:
5381
graph = branch.repository.get_graph()
5382
rev1, rev2 = _get_revision_range(revision, branch, self.name())
5383
revid1, revid2 = rev1.rev_id, rev2.rev_id
5384
# only show revisions between revid1 and revid2 (inclusive)
5385
tags = [(tag, revid) for tag, revid in tags if
5386
graph.is_between(revid, revid1, revid2)]
5387
if sort == 'alpha':
5388
tags.sort()
5389
elif sort == 'time':
5390
timestamps = {}
5391
for tag, revid in tags:
5392
try:
5393
revobj = branch.repository.get_revision(revid)
5394
except errors.NoSuchRevision:
5395
timestamp = sys.maxint # place them at the end
5396
else:
5397
timestamp = revobj.timestamp
5398
timestamps[revid] = timestamp
5399
tags.sort(key=lambda x: timestamps[x[1]])
5400
if not show_ids:
5401
# [ (tag, revid), ... ] -> [ (tag, dotted_revno), ... ]
5402
for index, (tag, revid) in enumerate(tags):
5403
try:
5404
revno = branch.revision_id_to_dotted_revno(revid)
5405
if isinstance(revno, tuple):
5406
revno = '.'.join(map(str, revno))
5407
except errors.NoSuchRevision:
5408
# Bad tag data/merges can lead to tagged revisions
5409
# which are not in this branch. Fail gracefully ...
5410
revno = '?'
5411
tags[index] = (tag, revno)
5412
self.cleanup_now()
5316
branch.lock_read()
5317
try:
5318
if revision:
5319
graph = branch.repository.get_graph()
5320
rev1, rev2 = _get_revision_range(revision, branch, self.name())
5321
revid1, revid2 = rev1.rev_id, rev2.rev_id
5322
# only show revisions between revid1 and revid2 (inclusive)
5323
tags = [(tag, revid) for tag, revid in tags if
5324
graph.is_between(revid, revid1, revid2)]
5325
if sort == 'alpha':
5326
tags.sort()
5327
elif sort == 'time':
5328
timestamps = {}
5329
for tag, revid in tags:
5330
try:
5331
revobj = branch.repository.get_revision(revid)
5332
except errors.NoSuchRevision:
5333
timestamp = sys.maxint # place them at the end
5334
else:
5335
timestamp = revobj.timestamp
5336
timestamps[revid] = timestamp
5337
tags.sort(key=lambda x: timestamps[x[1]])
5338
if not show_ids:
5339
# [ (tag, revid), ... ] -> [ (tag, dotted_revno), ... ]
5340
for index, (tag, revid) in enumerate(tags):
5341
try:
5342
revno = branch.revision_id_to_dotted_revno(revid)
5343
if isinstance(revno, tuple):
5344
revno = '.'.join(map(str, revno))
5345
except errors.NoSuchRevision:
5346
# Bad tag data/merges can lead to tagged revisions
5347
# which are not in this branch. Fail gracefully ...
5348
revno = '?'
5349
tags[index] = (tag, revno)
5350
finally:
5351
branch.unlock()
5413
5352
for tag, revspec in tags:
5414
5353
self.outf.write('%-20s %s\n' % (tag, revspec))
5415
5354
5416
5355
5417
5356
class cmd_reconfigure(Command):
5418
__doc__ = """Reconfigure the type of a bzr directory.
5357
"""Reconfigure the type of a bzr directory.
5419
5358
5420
5359
A target configuration must be specified.
5421
5360
5506
5445
5507
5446
5508
5447
class cmd_switch(Command):
5509
__doc__ = """Set the branch of a checkout and update.
5448
"""Set the branch of a checkout and update.
5510
5449
5511
5450
For lightweight checkouts, this changes the branch being referenced.
5512
5451
For heavyweight checkouts, this checks that there are no local commits
5528
5467
that of the master.
5529
5468
"""
5530
5469
5531
takes_args = ['to_location?']
5470
takes_args = ['to_location']
5532
5471
takes_options = [Option('force',
5533
5472
help='Switch even if local commits will be lost.'),
5534
'revision',
5535
5473
Option('create-branch', short_name='b',
5536
5474
help='Create the target branch from this one before'
5537
5475
' switching to it.'),
5538
]
5476
]
5539
5477
5540
def run(self, to_location=None, force=False, create_branch=False,
5541
revision=None):
5478
def run(self, to_location, force=False, create_branch=False):
5542
5479
from bzrlib import switch
5543
5480
tree_location = '.'
5544
revision = _get_one_revision('switch', revision)
5545
5481
control_dir = bzrdir.BzrDir.open_containing(tree_location)[0]
5546
if to_location is None:
5547
if revision is None:
5548
raise errors.BzrCommandError('You must supply either a'
5549
' revision or a location')
5550
to_location = '.'
5551
5482
try:
5552
5483
branch = control_dir.open_branch()
5553
5484
had_explicit_nick = branch.get_config().has_explicit_nickname()
5567
5498
to_branch = branch.bzrdir.sprout(to_location,
5568
5499
possible_transports=[branch.bzrdir.root_transport],
5569
5500
source_branch=branch).open_branch()
5501
# try:
5502
# from_branch = control_dir.open_branch()
5503
# except errors.NotBranchError:
5504
# raise BzrCommandError('Cannot create a branch from this'
5505
# ' location when we cannot open this branch')
5506
# from_branch.bzrdir.sprout(
5507
pass
5570
5508
else:
5571
5509
try:
5572
5510
to_branch = Branch.open(to_location)
5574
5512
this_url = self._get_branch_location(control_dir)
5575
5513
to_branch = Branch.open(
5576
5514
urlutils.join(this_url, '..', to_location))
5577
if revision is not None:
5578
revision = revision.as_revision_id(to_branch)
5579
switch.switch(control_dir, to_branch, force, revision_id=revision)
5515
switch.switch(control_dir, to_branch, force)
5580
5516
if had_explicit_nick:
5581
5517
branch = control_dir.open_branch() #get the new branch!
5582
5518
branch.nick = to_branch.nick
5602
5538
5603
5539
5604
5540
class cmd_view(Command):
5605
__doc__ = """Manage filtered views.
5541
"""Manage filtered views.
5606
5542
5607
5543
Views provide a mask over the tree so that users can focus on
5608
5544
a subset of a tree when doing their work. After creating a view,
5756
5692
5757
5693
5758
5694
class cmd_hooks(Command):
5759
__doc__ = """Show hooks."""
5695
"""Show hooks."""
5760
5696
5761
5697
hidden = True
5762
5698
5775
5711
self.outf.write(" <no hooks installed>\n")
5776
5712
5777
5713
5778
class cmd_remove_branch(Command):
5779
__doc__ = """Remove a branch.
5780
5781
This will remove the branch from the specified location but
5782
will keep any working tree or repository in place.
5783
5784
:Examples:
5785
5786
Remove the branch at repo/trunk::
5787
5788
bzr remove-branch repo/trunk
5789
5790
"""
5791
5792
takes_args = ["location?"]
5793
5794
aliases = ["rmbranch"]
5795
5796
def run(self, location=None):
5797
if location is None:
5798
location = "."
5799
branch = Branch.open_containing(location)[0]
5800
branch.bzrdir.destroy_branch()
5801
5802
5803
5714
class cmd_shelve(Command):
5804
__doc__ = """Temporarily set aside some changes from the current tree.
5715
"""Temporarily set aside some changes from the current tree.
5805
5716
5806
5717
Shelve allows you to temporarily put changes you've made "on the shelf",
5807
5718
ie. out of the way, until a later time when you can bring them back from
5860
5771
5861
5772
def run_for_list(self):
5862
5773
tree = WorkingTree.open_containing('.')[0]
5863
self.add_cleanup(tree.lock_read().unlock)
5864
manager = tree.get_shelf_manager()
5865
shelves = manager.active_shelves()
5866
if len(shelves) == 0:
5867
note('No shelved changes.')
5868
return 0
5869
for shelf_id in reversed(shelves):
5870
message = manager.get_metadata(shelf_id).get('message')
5871
if message is None:
5872
message = '<no message>'
5873
self.outf.write('%3d: %s\n' % (shelf_id, message))
5874
return 1
5774
tree.lock_read()
5775
try:
5776
manager = tree.get_shelf_manager()
5777
shelves = manager.active_shelves()
5778
if len(shelves) == 0:
5779
note('No shelved changes.')
5780
return 0
5781
for shelf_id in reversed(shelves):
5782
message = manager.get_metadata(shelf_id).get('message')
5783
if message is None:
5784
message = '<no message>'
5785
self.outf.write('%3d: %s\n' % (shelf_id, message))
5786
return 1
5787
finally:
5788
tree.unlock()
5875
5789
5876
5790
5877
5791
class cmd_unshelve(Command):
5878
__doc__ = """Restore shelved changes.
5792
"""Restore shelved changes.
5879
5793
5880
5794
By default, the most recently shelved changes are restored. However if you
5881
5795
specify a shelf by id those changes will be restored instead. This works
5889
5803
enum_switch=False, value_switches=True,
5890
5804
apply="Apply changes and remove from the shelf.",
5891
5805
dry_run="Show changes, but do not apply or remove them.",
5892
preview="Instead of unshelving the changes, show the diff that "
5893
"would result from unshelving.",
5894
5806
delete_only="Delete changes without applying them.",
5895
5807
keep="Apply changes but don't delete them.",
5896
5808
)
5907
5819
5908
5820
5909
5821
class cmd_clean_tree(Command):
5910
__doc__ = """Remove unwanted files from working tree.
5822
"""Remove unwanted files from working tree.
5911
5823
5912
5824
By default, only unknown files, not ignored files, are deleted. Versioned
5913
5825
files are never deleted.
5941
5853
5942
5854
5943
5855
class cmd_reference(Command):
5944
__doc__ = """list, view and set branch locations for nested trees.
5856
"""list, view and set branch locations for nested trees.
5945
5857
5946
5858
If no arguments are provided, lists the branch locations for nested trees.
5947
5859
If one argument is provided, display the branch location for that tree.
5987
5899
self.outf.write('%s %s\n' % (path, location))
5988
5900
5989
5901
5990
def _register_lazy_builtins():
5991
# register lazy builtins from other modules; called at startup and should
5992
# be only called once.
5993
for (name, aliases, module_name) in [
5994
('cmd_bundle_info', [], 'bzrlib.bundle.commands'),
5995
('cmd_dpush', [], 'bzrlib.foreign'),
5996
('cmd_version_info', [], 'bzrlib.cmd_version_info'),
5997
('cmd_resolve', ['resolved'], 'bzrlib.conflicts'),
5998
('cmd_conflicts', [], 'bzrlib.conflicts'),
5999
('cmd_sign_my_commits', [], 'bzrlib.sign_my_commits'),
6000
]:
6001
builtin_command_registry.register_lazy(name, aliases, module_name)
5902
# these get imported and then picked up by the scan for cmd_*
5903
# TODO: Some more consistent way to split command definitions across files;
5904
# we do need to load at least some information about them to know of
5905
# aliases. ideally we would avoid loading the implementation until the
5906
# details were needed.
5907
from bzrlib.cmd_version_info import cmd_version_info
5908
from bzrlib.conflicts import cmd_resolve, cmd_conflicts, restore
5909
from bzrlib.bundle.commands import (
5910
cmd_bundle_info,
5911
)
5912
from bzrlib.foreign import cmd_dpush
5913
from bzrlib.sign_my_commits import cmd_sign_my_commits
5914
from bzrlib.weave_commands import cmd_versionedfile_list, \
5915
cmd_weave_plan_merge, cmd_weave_merge_text
Loggerhead is a web-based interface for Breezy
Version: 2.0.1