To get this branch, use:
bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
« back to all changes in this revision
Viewing changes to bzrlib/builtins.py
- browse files at revision 4941.1.3
- compare with another revision
- download diff
- download tarball
- view history from revision 4941.1.3
- Committer: Martin Pool
- Date: 2010-01-08 00:44:26 UTC
- mto: This revision was merged to the branch mainline in revision 4942.
- Revision ID: mbp@sourcefrog.net-20100108004426-a0fewwjqe7a9m2bb
Review notes for stable branch
- files added:
- bzrlib/help_topics/es
- files removed:
- .testr.conf
- apport
- bzrlib/help_topics/es
- bzrlib/plugins/news_merge
- bzrlib/plugins/news_merge/tests
- bzrlib/tests/per_bzrdir_colo
- doc/en/whats-new
- files renamed:
- bzrlib/help_topics/en/conflict-types.txt => bzrlib/help_topics/en/conflicts.txt
- bzrlib/help_topics/es/conflict-types.txt => bzrlib/help_topics/es/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
1400
1408
master = branch.get_master_branch(
1401
1409
possible_transports=possible_transports)
1402
1410
if master is not None:
1411
tree.lock_write()
1403
1412
branch_location = master.base
1404
tree.lock_write()
1405
1413
else:
1414
tree.lock_tree_write()
1406
1415
branch_location = tree.branch.base
1407
tree.lock_tree_write()
1408
self.add_cleanup(tree.unlock)
1409
1416
# 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)
1417
branch_location = urlutils.unescape_for_display(branch_location[:-1],
1418
self.outf.encoding)
1434
1419
try:
1435
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
1420
existing_pending_merges = tree.get_parent_ids()[1:]
1421
if master is None:
1422
old_tip = None
1423
else:
1424
# may need to fetch data into a heavyweight checkout
1425
# XXX: this may take some time, maybe we should display a
1426
# message
1427
old_tip = branch.update(possible_transports)
1428
if revision is not None:
1429
revision_id = revision[0].as_revision_id(branch)
1430
else:
1431
revision_id = branch.last_revision()
1432
if revision_id == _mod_revision.ensure_null(tree.last_revision()):
1433
revno = branch.revision_id_to_revno(revision_id)
1434
note("Tree is up to date at revision %d of branch %s" %
1435
(revno, branch_location))
1436
return 0
1437
view_info = _get_view_info_for_change_reporter(tree)
1438
change_reporter = delta._ChangeReporter(
1439
unversioned_filter=tree.is_ignored,
1440
view_info=view_info)
1441
try:
1442
conflicts = tree.update(
1443
change_reporter,
1444
possible_transports=possible_transports,
1445
revision=revision_id,
1446
old_tip=old_tip)
1447
except errors.NoSuchRevision, e:
1448
raise errors.BzrCommandError(
1449
"branch has no revision %s\n"
1450
"bzr update --revision only works"
1451
" for a revision in the branch history"
1452
% (e.revision))
1453
revno = tree.branch.revision_id_to_revno(
1454
_mod_revision.ensure_null(tree.last_revision()))
1455
note('Updated to revision %d of branch %s' %
1456
(revno, branch_location))
1457
if tree.get_parent_ids()[1:] != existing_pending_merges:
1458
note('Your local commits will now show as pending merges with '
1459
"'bzr status', and can be committed with 'bzr commit'.")
1460
if conflicts != 0:
1461
return 1
1462
else:
1463
return 0
1464
finally:
1465
tree.unlock()
1458
1466
1459
1467
1460
1468
class cmd_info(Command):
1461
__doc__ = """Show information about a working tree, branch or repository.
1469
"""Show information about a working tree, branch or repository.
1462
1470
1463
1471
This command will show all known locations and formats associated to the
1464
1472
tree, branch or repository.
1502
1510
1503
1511
1504
1512
class cmd_remove(Command):
1505
__doc__ = """Remove files or directories.
1513
"""Remove files or directories.
1506
1514
1507
1515
This makes bzr stop tracking changes to the specified files. bzr will delete
1508
1516
them if they can easily be recovered using revert. If no options or
1530
1538
if file_list is not None:
1531
1539
file_list = [f for f in file_list]
1532
1540
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')
1541
tree.lock_write()
1542
try:
1543
# Heuristics should probably all move into tree.remove_smart or
1544
# some such?
1545
if new:
1546
added = tree.changes_from(tree.basis_tree(),
1547
specific_files=file_list).added
1548
file_list = sorted([f[0] for f in added], reverse=True)
1549
if len(file_list) == 0:
1550
raise errors.BzrCommandError('No matching files.')
1551
elif file_list is None:
1552
# missing files show up in iter_changes(basis) as
1553
# versioned-with-no-kind.
1554
missing = []
1555
for change in tree.iter_changes(tree.basis_tree()):
1556
# Find paths in the working tree that have no kind:
1557
if change[1][1] is not None and change[6][1] is None:
1558
missing.append(change[1][1])
1559
file_list = sorted(missing, reverse=True)
1560
file_deletion_strategy = 'keep'
1561
tree.remove(file_list, verbose=verbose, to_file=self.outf,
1562
keep_files=file_deletion_strategy=='keep',
1563
force=file_deletion_strategy=='force')
1564
finally:
1565
tree.unlock()
1555
1566
1556
1567
1557
1568
class cmd_file_id(Command):
1558
__doc__ = """Print file_id of a particular file or directory.
1569
"""Print file_id of a particular file or directory.
1559
1570
1560
1571
The file_id is assigned when the file is first added and remains the
1561
1572
same through all revisions where the file exists, even when it is
1577
1588
1578
1589
1579
1590
class cmd_file_path(Command):
1580
__doc__ = """Print path of file_ids to a file or directory.
1591
"""Print path of file_ids to a file or directory.
1581
1592
1582
1593
This prints one line for each directory down to the target,
1583
1594
starting at the branch root.
1599
1610
1600
1611
1601
1612
class cmd_reconcile(Command):
1602
__doc__ = """Reconcile bzr metadata in a branch.
1613
"""Reconcile bzr metadata in a branch.
1603
1614
1604
1615
This can correct data mismatches that may have been caused by
1605
1616
previous ghost operations or bzr upgrades. You should only
1627
1638
1628
1639
1629
1640
class cmd_revision_history(Command):
1630
__doc__ = """Display the list of revision ids on a branch."""
1641
"""Display the list of revision ids on a branch."""
1631
1642
1632
1643
_see_also = ['log']
1633
1644
takes_args = ['location?']
1643
1654
1644
1655
1645
1656
class cmd_ancestry(Command):
1646
__doc__ = """List all revisions merged into this branch."""
1657
"""List all revisions merged into this branch."""
1647
1658
1648
1659
_see_also = ['log', 'revision-history']
1649
1660
takes_args = ['location?']
1668
1679
1669
1680
1670
1681
class cmd_init(Command):
1671
__doc__ = """Make a directory into a versioned branch.
1682
"""Make a directory into a versioned branch.
1672
1683
1673
1684
Use this to create an empty branch, or before importing an
1674
1685
existing project.
1777
1788
1778
1789
1779
1790
class cmd_init_repository(Command):
1780
__doc__ = """Create a shared repository for branches to share storage space.
1791
"""Create a shared repository for branches to share storage space.
1781
1792
1782
1793
New branches created under the repository directory will store their
1783
1794
revisions in the repository, not in the branch directory. For branches
1837
1848
1838
1849
1839
1850
class cmd_diff(Command):
1840
__doc__ = """Show differences in the working tree, between revisions or branches.
1851
"""Show differences in the working tree, between revisions or branches.
1841
1852
1842
1853
If no arguments are given, all changes for the current tree are listed.
1843
1854
If files are given, only the changes in those files are listed.
1929
1940
help='Use this command to compare files.',
1930
1941
type=unicode,
1931
1942
),
1932
RegistryOption('format',
1933
help='Diff format to use.',
1934
lazy_registry=('bzrlib.diff', 'format_registry'),
1935
value_switches=False, title='Diff format'),
1936
1943
]
1937
1944
aliases = ['di', 'dif']
1938
1945
encoding_type = 'exact'
1939
1946
1940
1947
@display_command
1941
1948
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)
1949
prefix=None, old=None, new=None, using=None):
1950
from bzrlib.diff import get_trees_and_branches_to_diff, show_diff_trees
1945
1951
1946
1952
if (prefix is None) or (prefix == '0'):
1947
1953
# diff -p0 format
1961
1967
raise errors.BzrCommandError('bzr diff --revision takes exactly'
1962
1968
' one or two revision specifiers')
1963
1969
1964
if using is not None and format is not None:
1965
raise errors.BzrCommandError('--using and --format are mutually '
1966
'exclusive.')
1967
1968
1970
(old_tree, new_tree,
1969
1971
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)
1972
specific_files, extra_trees) = get_trees_and_branches_to_diff(
1973
file_list, revision, old, new, apply_view=True)
1972
1974
return show_diff_trees(old_tree, new_tree, sys.stdout,
1973
1975
specific_files=specific_files,
1974
1976
external_diff_options=diff_options,
1975
1977
old_label=old_label, new_label=new_label,
1976
extra_trees=extra_trees, using=using,
1977
format_cls=format)
1978
extra_trees=extra_trees, using=using)
1978
1979
1979
1980
1980
1981
class cmd_deleted(Command):
1981
__doc__ = """List files deleted in the working tree.
1982
"""List files deleted in the working tree.
1982
1983
"""
1983
1984
# TODO: Show files deleted since a previous revision, or
1984
1985
# between two revisions.
1992
1993
@display_command
1993
1994
def run(self, show_ids=False):
1994
1995
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')
1996
tree.lock_read()
1997
try:
1998
old = tree.basis_tree()
1999
old.lock_read()
2000
try:
2001
for path, ie in old.inventory.iter_entries():
2002
if not tree.has_id(ie.file_id):
2003
self.outf.write(path)
2004
if show_ids:
2005
self.outf.write(' ')
2006
self.outf.write(ie.file_id)
2007
self.outf.write('\n')
2008
finally:
2009
old.unlock()
2010
finally:
2011
tree.unlock()
2005
2012
2006
2013
2007
2014
class cmd_modified(Command):
2008
__doc__ = """List files modified in working tree.
2015
"""List files modified in working tree.
2009
2016
"""
2010
2017
2011
2018
hidden = True
2028
2035
2029
2036
2030
2037
class cmd_added(Command):
2031
__doc__ = """List files added in working tree.
2038
"""List files added in working tree.
2032
2039
"""
2033
2040
2034
2041
hidden = True
2042
2049
@display_command
2043
2050
def run(self, null=False):
2044
2051
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')
2052
wt.lock_read()
2053
try:
2054
basis = wt.basis_tree()
2055
basis.lock_read()
2056
try:
2057
basis_inv = basis.inventory
2058
inv = wt.inventory
2059
for file_id in inv:
2060
if file_id in basis_inv:
2061
continue
2062
if inv.is_root(file_id) and len(basis_inv) == 0:
2063
continue
2064
path = inv.id2path(file_id)
2065
if not os.access(osutils.abspath(path), os.F_OK):
2066
continue
2067
if null:
2068
self.outf.write(path + '\0')
2069
else:
2070
self.outf.write(osutils.quotefn(path) + '\n')
2071
finally:
2072
basis.unlock()
2073
finally:
2074
wt.unlock()
2062
2075
2063
2076
2064
2077
class cmd_root(Command):
2065
__doc__ = """Show the tree root directory.
2078
"""Show the tree root directory.
2066
2079
2067
2080
The root is the nearest enclosing directory with a .bzr control
2068
2081
directory."""
2092
2105
2093
2106
2094
2107
class cmd_log(Command):
2095
__doc__ = """Show historical log for a branch or subset of a branch.
2108
"""Show historical log for a branch or subset of a branch.
2096
2109
2097
2110
log is bzr's default tool for exploring the history of a branch.
2098
2111
The branch to use is taken from the first parameter. If no parameters
2209
2222
:Tips & tricks:
2210
2223
2211
2224
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>.
2225
line tools. You may prefer qlog or glog from the QBzr and Bzr-Gtk packages
2226
respectively for example. (TortoiseBzr uses qlog for displaying logs.) See
2227
http://bazaar-vcs.org/BzrPlugins and http://bazaar-vcs.org/IDEIntegration.
2228
2229
Web interfaces are often better at exploring history than command line
2230
tools, particularly for branches on servers. You may prefer Loggerhead
2231
or one of its alternatives. See http://bazaar-vcs.org/WebInterface.
2216
2232
2217
2233
You may find it useful to add the aliases below to ``bazaar.conf``::
2218
2234
2279
2295
help='Show changes made in each revision as a patch.'),
2280
2296
Option('include-merges',
2281
2297
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
2298
]
2287
2299
encoding_type = 'replace'
2288
2300
2298
2310
message=None,
2299
2311
limit=None,
2300
2312
show_diff=False,
2301
include_merges=False,
2302
exclude_common_ancestry=False,
2303
):
2313
include_merges=False):
2304
2314
from bzrlib.log import (
2305
2315
Logger,
2306
2316
make_log_request_dict,
2307
2317
_get_info_for_log_files,
2308
2318
)
2309
2319
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
2320
if include_merges:
2315
2321
if levels is None:
2316
2322
levels = 0
2329
2335
2330
2336
file_ids = []
2331
2337
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
2338
b = None
2339
try:
2340
if file_list:
2341
# find the file ids to log and check for directory filtering
2342
b, file_info_list, rev1, rev2 = _get_info_for_log_files(
2343
revision, file_list)
2344
for relpath, file_id, kind in file_info_list:
2345
if file_id is None:
2346
raise errors.BzrCommandError(
2347
"Path unknown at end or start of revision range: %s" %
2348
relpath)
2349
# If the relpath is the top of the tree, we log everything
2350
if relpath == '':
2351
file_ids = []
2352
break
2353
else:
2354
file_ids.append(file_id)
2355
filter_by_dir = filter_by_dir or (
2356
kind in ['directory', 'tree-reference'])
2357
else:
2358
# log everything
2359
# FIXME ? log the current subdir only RBC 20060203
2360
if revision is not None \
2361
and len(revision) > 0 and revision[0].get_branch():
2362
location = revision[0].get_branch()
2345
2363
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)
2364
location = '.'
2365
dir, relpath = bzrdir.BzrDir.open_containing(location)
2366
b = dir.open_branch()
2367
b.lock_read()
2368
rev1, rev2 = _get_revision_range(revision, b, self.name())
2369
2370
# Decide on the type of delta & diff filtering to use
2371
# TODO: add an --all-files option to make this configurable & consistent
2372
if not verbose:
2373
delta_type = None
2374
else:
2375
delta_type = 'full'
2376
if not show_diff:
2377
diff_type = None
2378
elif file_ids:
2379
diff_type = 'partial'
2380
else:
2381
diff_type = 'full'
2382
2383
# Build the log formatter
2384
if log_format is None:
2385
log_format = log.log_formatter_registry.get_default(b)
2386
# Make a non-encoding output to include the diffs - bug 328007
2387
unencoded_output = ui.ui_factory.make_output_stream(encoding_type='exact')
2388
lf = log_format(show_ids=show_ids, to_file=self.outf,
2389
to_exact_file=unencoded_output,
2390
show_timezone=timezone,
2391
delta_format=get_verbosity_level(),
2392
levels=levels,
2393
show_advice=levels is None)
2394
2395
# Choose the algorithm for doing the logging. It's annoying
2396
# having multiple code paths like this but necessary until
2397
# the underlying repository format is faster at generating
2398
# deltas or can provide everything we need from the indices.
2399
# The default algorithm - match-using-deltas - works for
2400
# multiple files and directories and is faster for small
2401
# amounts of history (200 revisions say). However, it's too
2402
# slow for logging a single file in a repository with deep
2403
# history, i.e. > 10K revisions. In the spirit of "do no
2404
# evil when adding features", we continue to use the
2405
# original algorithm - per-file-graph - for the "single
2406
# file that isn't a directory without showing a delta" case.
2407
partial_history = revision and b.repository._format.supports_chks
2408
match_using_deltas = (len(file_ids) != 1 or filter_by_dir
2409
or delta_type or partial_history)
2410
2411
# Build the LogRequest and execute it
2412
if len(file_ids) == 0:
2413
file_ids = None
2414
rqst = make_log_request_dict(
2415
direction=direction, specific_fileids=file_ids,
2416
start_revision=rev1, end_revision=rev2, limit=limit,
2417
message_search=message, delta_type=delta_type,
2418
diff_type=diff_type, _match_using_deltas=match_using_deltas)
2419
Logger(b, rqst).show(lf)
2420
finally:
2421
if b is not None:
2422
b.unlock()
2414
2423
2415
2424
2416
2425
def _get_revision_range(revisionspec_list, branch, command_name):
2434
2443
raise errors.BzrCommandError(
2435
2444
"bzr %s doesn't accept two revisions in different"
2436
2445
" 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)
2446
rev1 = start_spec.in_history(branch)
2442
2447
# Avoid loading all of history when we know a missing
2443
2448
# end of range means the last revision ...
2444
2449
if end_spec.spec is None:
2473
2478
2474
2479
2475
2480
class cmd_touching_revisions(Command):
2476
__doc__ = """Return revision-ids which affected a particular file.
2481
"""Return revision-ids which affected a particular file.
2477
2482
2478
2483
A more user-friendly interface is "bzr log FILE".
2479
2484
"""
2486
2491
tree, relpath = WorkingTree.open_containing(filename)
2487
2492
file_id = tree.path2id(relpath)
2488
2493
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))
2494
b.lock_read()
2495
try:
2496
touching_revs = log.find_touching_revisions(b, file_id)
2497
for revno, revision_id, what in touching_revs:
2498
self.outf.write("%6d %s\n" % (revno, what))
2499
finally:
2500
b.unlock()
2493
2501
2494
2502
2495
2503
class cmd_ls(Command):
2496
__doc__ = """List files in a tree.
2504
"""List files in a tree.
2497
2505
"""
2498
2506
2499
2507
_see_also = ['status', 'cat']
2561
2569
view_str = views.view_display_str(view_files)
2562
2570
note("Ignoring files outside view. View is %s" % view_str)
2563
2571
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
2572
tree.lock_read()
2573
try:
2574
for fp, fc, fkind, fid, entry in tree.list_files(include_root=False,
2575
from_dir=relpath, recursive=recursive):
2576
# Apply additional masking
2577
if not all and not selection[fc]:
2578
continue
2579
if kind is not None and fkind != kind:
2580
continue
2581
if apply_view:
2582
try:
2583
if relpath:
2584
fullpath = osutils.pathjoin(relpath, fp)
2585
else:
2586
fullpath = fp
2587
views.check_path_in_view(tree, fullpath)
2588
except errors.FileOutsideView:
2589
continue
2581
2590
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:
2591
# Output the entry
2592
if prefix:
2593
fp = osutils.pathjoin(prefix, fp)
2594
kindch = entry.kind_character()
2595
outstring = fp + kindch
2596
ui.ui_factory.clear_term()
2597
if verbose:
2598
outstring = '%-8s %s' % (fc, outstring)
2599
if show_ids and fid is not None:
2600
outstring = "%-50s %s" % (outstring, fid)
2608
2601
self.outf.write(outstring + '\n')
2602
elif null:
2603
self.outf.write(fp + '\0')
2604
if show_ids:
2605
if fid is not None:
2606
self.outf.write(fid)
2607
self.outf.write('\0')
2608
self.outf.flush()
2609
else:
2610
if show_ids:
2611
if fid is not None:
2612
my_id = fid
2613
else:
2614
my_id = ''
2615
self.outf.write('%-50s %s\n' % (outstring, my_id))
2616
else:
2617
self.outf.write(outstring + '\n')
2618
finally:
2619
tree.unlock()
2609
2620
2610
2621
2611
2622
class cmd_unknowns(Command):
2612
__doc__ = """List unknown files.
2623
"""List unknown files.
2613
2624
"""
2614
2625
2615
2626
hidden = True
2622
2633
2623
2634
2624
2635
class cmd_ignore(Command):
2625
__doc__ = """Ignore specified files or patterns.
2636
"""Ignore specified files or patterns.
2626
2637
2627
2638
See ``bzr help patterns`` for details on the syntax of patterns.
2628
2639
2636
2647
After adding, editing or deleting that file either indirectly by
2637
2648
using this command or directly by using an editor, be sure to commit
2638
2649
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
2650
2653
2651
Note: ignore patterns containing shell wildcards must be quoted from
2654
2652
the shell on Unix.
2658
2656
2659
2657
bzr ignore ./Makefile
2660
2658
2661
Ignore .class files in all directories...::
2659
Ignore class files in all directories::
2662
2660
2663
2661
bzr ignore "*.class"
2664
2662
2665
...but do not ignore "special.class"::
2666
2667
bzr ignore "!special.class"
2668
2669
2663
Ignore .o files under the lib directory::
2670
2664
2671
2665
bzr ignore "lib/**/*.o"
2677
2671
Ignore everything but the "debian" toplevel directory::
2678
2672
2679
2673
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
2674
"""
2688
2675
2689
2676
_see_also = ['status', 'ignored', 'patterns']
2690
2677
takes_args = ['name_pattern*']
2691
2678
takes_options = [
2692
Option('default-rules',
2693
help='Display the default ignore rules that bzr uses.')
2679
Option('old-default-rules',
2680
help='Write out the ignore rules bzr < 0.9 always used.')
2694
2681
]
2695
2682
2696
def run(self, name_pattern_list=None, default_rules=None):
2683
def run(self, name_pattern_list=None, old_default_rules=None):
2697
2684
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)
2685
if old_default_rules is not None:
2686
# dump the rules and exit
2687
for pattern in ignores.OLD_DEFAULTS:
2688
print pattern
2702
2689
return
2703
2690
if not name_pattern_list:
2704
2691
raise errors.BzrCommandError("ignore requires at least one "
2705
"NAME_PATTERN or --default-rules.")
2692
"NAME_PATTERN or --old-default-rules")
2706
2693
name_pattern_list = [globbing.normalize_pattern(p)
2707
2694
for p in name_pattern_list]
2708
2695
for name_pattern in name_pattern_list:
2720
2707
if id is not None:
2721
2708
filename = entry[0]
2722
2709
if ignored.match(filename):
2723
matches.append(filename)
2710
matches.append(filename.encode('utf-8'))
2724
2711
tree.unlock()
2725
2712
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),))
2713
print "Warning: the following files are version controlled and" \
2714
" match your ignore pattern:\n%s" \
2715
"\nThese files will continue to be version controlled" \
2716
" unless you 'bzr remove' them." % ("\n".join(matches),)
2730
2717
2731
2718
2732
2719
class cmd_ignored(Command):
2733
__doc__ = """List ignored files and the patterns that matched them.
2720
"""List ignored files and the patterns that matched them.
2734
2721
2735
2722
List all the ignored files and the ignore pattern that caused the file to
2736
2723
be ignored.
2746
2733
@display_command
2747
2734
def run(self):
2748
2735
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))
2736
tree.lock_read()
2737
try:
2738
for path, file_class, kind, file_id, entry in tree.list_files():
2739
if file_class != 'I':
2740
continue
2741
## XXX: Slightly inefficient since this was already calculated
2742
pat = tree.is_ignored(path)
2743
self.outf.write('%-50s %s\n' % (path, pat))
2744
finally:
2745
tree.unlock()
2756
2746
2757
2747
2758
2748
class cmd_lookup_revision(Command):
2759
__doc__ = """Lookup the revision-id from a revision-number
2749
"""Lookup the revision-id from a revision-number
2760
2750
2761
2751
:Examples:
2762
2752
bzr lookup-revision 33
2769
2759
try:
2770
2760
revno = int(revno)
2771
2761
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)
2762
raise errors.BzrCommandError("not a valid revision-number: %r" % revno)
2763
2764
print WorkingTree.open_containing(u'.')[0].branch.get_rev_id(revno)
2776
2765
2777
2766
2778
2767
class cmd_export(Command):
2779
__doc__ = """Export current or past revision to a destination directory or archive.
2768
"""Export current or past revision to a destination directory or archive.
2780
2769
2781
2770
If no revision is specified this exports the last committed revision.
2782
2771
2814
2803
Option('root',
2815
2804
type=str,
2816
2805
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
2806
]
2821
2807
def run(self, dest, branch_or_subdir=None, revision=None, format=None,
2822
root=None, filters=False, per_file_timestamps=False):
2808
root=None, filters=False):
2823
2809
from bzrlib.export import export
2824
2810
2825
2811
if branch_or_subdir is None:
2832
2818
2833
2819
rev_tree = _get_one_revision_tree('export', revision, branch=b, tree=tree)
2834
2820
try:
2835
export(rev_tree, dest, format, root, subdir, filtered=filters,
2836
per_file_timestamps=per_file_timestamps)
2821
export(rev_tree, dest, format, root, subdir, filtered=filters)
2837
2822
except errors.NoSuchExportFormat, e:
2838
2823
raise errors.BzrCommandError('Unsupported export format: %s' % e.format)
2839
2824
2840
2825
2841
2826
class cmd_cat(Command):
2842
__doc__ = """Write the contents of a file as of a given revision to standard output.
2827
"""Write the contents of a file as of a given revision to standard output.
2843
2828
2844
2829
If no revision is nominated, the last revision is used.
2845
2830
2865
2850
" one revision specifier")
2866
2851
tree, branch, relpath = \
2867
2852
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)
2853
branch.lock_read()
2854
try:
2855
return self._run(tree, branch, relpath, filename, revision,
2856
name_from_revision, filters)
2857
finally:
2858
branch.unlock()
2871
2859
2872
2860
def _run(self, tree, b, relpath, filename, revision, name_from_revision,
2873
2861
filtered):
2874
2862
if tree is None:
2875
2863
tree = b.basis_tree()
2876
2864
rev_tree = _get_one_revision_tree('cat', revision, branch=b)
2877
self.add_cleanup(rev_tree.lock_read().unlock)
2878
2865
2879
2866
old_file_id = rev_tree.path2id(relpath)
2880
2867
2915
2902
chunks = content.splitlines(True)
2916
2903
content = filtered_output_bytes(chunks, filters,
2917
2904
ContentFilterContext(relpath, rev_tree))
2918
self.cleanup_now()
2919
2905
self.outf.writelines(content)
2920
2906
else:
2921
self.cleanup_now()
2922
2907
self.outf.write(content)
2923
2908
2924
2909
2925
2910
class cmd_local_time_offset(Command):
2926
__doc__ = """Show the offset in seconds from GMT to local time."""
2911
"""Show the offset in seconds from GMT to local time."""
2927
2912
hidden = True
2928
2913
@display_command
2929
2914
def run(self):
2930
self.outf.write("%s\n" % osutils.local_time_offset())
2915
print osutils.local_time_offset()
2931
2916
2932
2917
2933
2918
2934
2919
class cmd_commit(Command):
2935
__doc__ = """Commit changes into a new revision.
2920
"""Commit changes into a new revision.
2936
2921
2937
2922
An explanatory message needs to be given for each commit. This is
2938
2923
often done by using the --message option (getting the message from the
3046
3031
"the master branch until a normal commit "
3047
3032
"is performed."
3048
3033
),
3049
Option('show-diff', short_name='p',
3034
Option('show-diff',
3050
3035
help='When no message is supplied, show the diff along'
3051
3036
' with the status summary in the message editor.'),
3052
3037
]
3132
3117
'(use --file "%(f)s" to take commit message from that file)'
3133
3118
% { 'f': message })
3134
3119
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
3120
3142
3121
def get_message(commit_obj):
3143
3122
"""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,
3123
my_message = message
3124
if my_message is not None and '\r' in my_message:
3125
my_message = my_message.replace('\r\n', '\n')
3126
my_message = my_message.replace('\r', '\n')
3127
if my_message is None and not file:
3128
t = make_commit_message_template_encoded(tree,
3153
3129
selected_list, diff=show_diff,
3154
3130
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
3131
start_message = generate_commit_message_template(commit_obj)
3161
my_message = edit_commit_message_encoded(text,
3132
my_message = edit_commit_message_encoded(t,
3162
3133
start_message=start_message)
3163
3134
if my_message is None:
3164
3135
raise errors.BzrCommandError("please specify a commit"
3165
3136
" message with either --message or --file")
3137
elif my_message and file:
3138
raise errors.BzrCommandError(
3139
"please specify either --message or --file")
3140
if file:
3141
my_message = codecs.open(file, 'rt',
3142
osutils.get_user_encoding()).read()
3166
3143
if my_message == "":
3167
3144
raise errors.BzrCommandError("empty commit message specified")
3168
3145
return my_message
3180
3157
timezone=offset,
3181
3158
exclude=safe_relpath_files(tree, exclude))
3182
3159
except PointlessCommit:
3160
# FIXME: This should really happen before the file is read in;
3161
# perhaps prepare the commit; get the message; then actually commit
3183
3162
raise errors.BzrCommandError("No changes to commit."
3184
3163
" Use --unchanged to commit anyhow.")
3185
3164
except ConflictsInTree:
3190
3169
raise errors.BzrCommandError("Commit refused because there are"
3191
3170
" unknown files in the working tree.")
3192
3171
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
3172
raise errors.BzrCommandError(str(e) + "\n"
3173
'To commit to master branch, run update and then commit.\n'
3174
'You can also pass --local to commit to continue working '
3175
'disconnected.')
3198
3176
3199
3177
3200
3178
class cmd_check(Command):
3201
__doc__ = """Validate working tree structure, branch consistency and repository history.
3179
"""Validate working tree structure, branch consistency and repository history.
3202
3180
3203
3181
This command checks various invariants about branch and repository storage
3204
3182
to detect data corruption or bzr bugs.
3268
3246
3269
3247
3270
3248
class cmd_upgrade(Command):
3271
__doc__ = """Upgrade branch storage to current format.
3249
"""Upgrade branch storage to current format.
3272
3250
3273
3251
The check command or bzr developers may sometimes advise you to run
3274
3252
this command. When the default format has changed you may also be warned
3292
3270
3293
3271
3294
3272
class cmd_whoami(Command):
3295
__doc__ = """Show or set bzr user id.
3273
"""Show or set bzr user id.
3296
3274
3297
3275
:Examples:
3298
3276
Show the email of the current user::
3342
3320
3343
3321
3344
3322
class cmd_nick(Command):
3345
__doc__ = """Print or set the branch nickname.
3323
"""Print or set the branch nickname.
3346
3324
3347
3325
If unset, the tree root directory name is used as the nickname.
3348
3326
To print the current nickname, execute with no argument.
3362
3340
3363
3341
@display_command
3364
3342
def printme(self, branch):
3365
self.outf.write('%s\n' % branch.nick)
3343
print branch.nick
3366
3344
3367
3345
3368
3346
class cmd_alias(Command):
3369
__doc__ = """Set/unset and display aliases.
3347
"""Set/unset and display aliases.
3370
3348
3371
3349
:Examples:
3372
3350
Show the current aliases::
3436
3414
3437
3415
3438
3416
class cmd_selftest(Command):
3439
__doc__ = """Run internal test suite.
3417
"""Run internal test suite.
3440
3418
3441
3419
If arguments are given, they are regular expressions that say which tests
3442
3420
should run. Tests matching any expression are run, and other tests are
3486
3464
def get_transport_type(typestring):
3487
3465
"""Parse and return a transport specifier."""
3488
3466
if typestring == "sftp":
3489
from bzrlib.tests import stub_sftp
3490
return stub_sftp.SFTPAbsoluteServer
3467
from bzrlib.transport.sftp import SFTPAbsoluteServer
3468
return SFTPAbsoluteServer
3491
3469
if typestring == "memory":
3492
from bzrlib.tests import test_server
3493
return memory.MemoryServer
3470
from bzrlib.transport.memory import MemoryServer
3471
return MemoryServer
3494
3472
if typestring == "fakenfs":
3495
from bzrlib.tests import test_server
3496
return test_server.FakeNFSServer
3473
from bzrlib.transport.fakenfs import FakeNFSServer
3474
return FakeNFSServer
3497
3475
msg = "No known transport type %s. Supported types are: sftp\n" %\
3498
3476
(typestring)
3499
3477
raise errors.BzrCommandError(msg)
3583
3561
raise errors.BzrCommandError("subunit not available. subunit "
3584
3562
"needs to be installed to use --subunit.")
3585
3563
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
3564
if parallel:
3592
3565
self.additional_selftest_args.setdefault(
3593
3566
'suite_decorators', []).append(parallel)
3597
3570
verbose = not is_quiet()
3598
3571
# TODO: should possibly lock the history file...
3599
3572
benchfile = open(".perf_history", "at", buffering=1)
3600
self.add_cleanup(benchfile.close)
3601
3573
else:
3602
3574
test_suite_factory = None
3603
3575
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)
3576
try:
3577
selftest_kwargs = {"verbose": verbose,
3578
"pattern": pattern,
3579
"stop_on_failure": one,
3580
"transport": transport,
3581
"test_suite_factory": test_suite_factory,
3582
"lsprof_timed": lsprof_timed,
3583
"lsprof_tests": lsprof_tests,
3584
"bench_history": benchfile,
3585
"matching_tests_first": first,
3586
"list_only": list_only,
3587
"random_seed": randomize,
3588
"exclude_pattern": exclude,
3589
"strict": strict,
3590
"load_list": load_list,
3591
"debug_flags": debugflag,
3592
"starting_with": starting_with
3593
}
3594
selftest_kwargs.update(self.additional_selftest_args)
3595
result = selftest(**selftest_kwargs)
3596
finally:
3597
if benchfile is not None:
3598
benchfile.close()
3623
3599
return int(not result)
3624
3600
3625
3601
3626
3602
class cmd_version(Command):
3627
__doc__ = """Show version of bzr."""
3603
"""Show version of bzr."""
3628
3604
3629
3605
encoding_type = 'replace'
3630
3606
takes_options = [
3641
3617
3642
3618
3643
3619
class cmd_rocks(Command):
3644
__doc__ = """Statement of optimism."""
3620
"""Statement of optimism."""
3645
3621
3646
3622
hidden = True
3647
3623
3648
3624
@display_command
3649
3625
def run(self):
3650
self.outf.write("It sure does!\n")
3626
print "It sure does!"
3651
3627
3652
3628
3653
3629
class cmd_find_merge_base(Command):
3654
__doc__ = """Find and print a base revision for merging two branches."""
3630
"""Find and print a base revision for merging two branches."""
3655
3631
# TODO: Options to specify revisions on either side, as if
3656
3632
# merging only part of the history.
3657
3633
takes_args = ['branch', 'other']
3663
3639
3664
3640
branch1 = Branch.open_containing(branch)[0]
3665
3641
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)
3642
branch1.lock_read()
3643
try:
3644
branch2.lock_read()
3645
try:
3646
last1 = ensure_null(branch1.last_revision())
3647
last2 = ensure_null(branch2.last_revision())
3648
3649
graph = branch1.repository.get_graph(branch2.repository)
3650
base_rev_id = graph.find_unique_lca(last1, last2)
3651
3652
print 'merge base is revision %s' % base_rev_id
3653
finally:
3654
branch2.unlock()
3655
finally:
3656
branch1.unlock()
3675
3657
3676
3658
3677
3659
class cmd_merge(Command):
3678
__doc__ = """Perform a three-way merge.
3660
"""Perform a three-way merge.
3679
3661
3680
3662
The source of the merge can be specified either in the form of a branch,
3681
3663
or in the form of a path to a file containing a merge directive generated
3710
3692
committed to record the result of the merge.
3711
3693
3712
3694
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.
3695
--force is given.
3719
3696
3720
3697
To select only some changes to merge, use "merge -i", which will prompt
3721
3698
you to apply each diff hunk and file change, similar to "shelve".
3736
3713
To apply a merge directive contained in /tmp/merge::
3737
3714
3738
3715
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
3716
"""
3747
3717
3748
3718
encoding_type = 'exact'
3806
3776
view_info = _get_view_info_for_change_reporter(tree)
3807
3777
change_reporter = delta._ChangeReporter(
3808
3778
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
3779
cleanups = []
3780
try:
3781
pb = ui.ui_factory.nested_progress_bar()
3782
cleanups.append(pb.finished)
3783
tree.lock_write()
3784
cleanups.append(tree.unlock)
3785
if location is not None:
3786
try:
3787
mergeable = bundle.read_mergeable_from_url(location,
3788
possible_transports=possible_transports)
3789
except errors.NotABundle:
3790
mergeable = None
3791
else:
3792
if uncommitted:
3793
raise errors.BzrCommandError('Cannot use --uncommitted'
3794
' with bundles or merge directives.')
3795
3796
if revision is not None:
3797
raise errors.BzrCommandError(
3798
'Cannot use -r with merge directives or bundles')
3799
merger, verified = _mod_merge.Merger.from_mergeable(tree,
3800
mergeable, pb)
3801
3802
if merger is None and uncommitted:
3803
if revision is not None and len(revision) > 0:
3804
raise errors.BzrCommandError('Cannot use --uncommitted and'
3805
' --revision at the same time.')
3806
merger = self.get_merger_from_uncommitted(tree, location, pb,
3807
cleanups)
3808
allow_pending = False
3809
3810
if merger is None:
3811
merger, allow_pending = self._get_merger_from_branch(tree,
3812
location, revision, remember, possible_transports, pb)
3813
3814
merger.merge_type = merge_type
3815
merger.reprocess = reprocess
3816
merger.show_base = show_base
3817
self.sanity_check_merger(merger)
3818
if (merger.base_rev_id == merger.other_rev_id and
3819
merger.other_rev_id is not None):
3820
note('Nothing to do.')
3821
return 0
3822
if pull:
3823
if merger.interesting_files is not None:
3824
raise errors.BzrCommandError('Cannot pull individual files')
3825
if (merger.base_rev_id == tree.last_revision()):
3826
result = tree.pull(merger.other_branch, False,
3827
merger.other_rev_id)
3828
result.report(self.outf)
3829
return 0
3830
if merger.this_basis is None:
3831
raise errors.BzrCommandError(
3832
"This branch has no commits."
3833
" (perhaps you would prefer 'bzr pull')")
3834
if preview:
3835
return self._do_preview(merger, cleanups)
3836
elif interactive:
3837
return self._do_interactive(merger, cleanups)
3818
3838
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):
3839
return self._do_merge(merger, change_reporter, allow_pending,
3840
verified)
3841
finally:
3842
for cleanup in reversed(cleanups):
3843
cleanup()
3844
3845
def _get_preview(self, merger, cleanups):
3869
3846
tree_merger = merger.make_merger()
3870
3847
tt = tree_merger.make_preview_transform()
3871
self.add_cleanup(tt.finalize)
3848
cleanups.append(tt.finalize)
3872
3849
result_tree = tt.get_preview_tree()
3873
3850
return result_tree
3874
3851
3875
def _do_preview(self, merger):
3852
def _do_preview(self, merger, cleanups):
3876
3853
from bzrlib.diff import show_diff_trees
3877
result_tree = self._get_preview(merger)
3854
result_tree = self._get_preview(merger, cleanups)
3878
3855
show_diff_trees(merger.this_tree, result_tree, self.outf,
3879
3856
old_label='', new_label='')
3880
3857
3890
3867
else:
3891
3868
return 0
3892
3869
3893
def _do_interactive(self, merger):
3870
def _do_interactive(self, merger, cleanups):
3894
3871
"""Perform an interactive merge.
3895
3872
3896
3873
This works by generating a preview tree of the merge, then using
3898
3875
and the preview tree.
3899
3876
"""
3900
3877
from bzrlib import shelf_ui
3901
result_tree = self._get_preview(merger)
3878
result_tree = self._get_preview(merger, cleanups)
3902
3879
writer = bzrlib.option.diff_writer_registry.get()
3903
3880
shelver = shelf_ui.Shelver(merger.this_tree, result_tree, destroy=True,
3904
3881
reporter=shelf_ui.ApplyReporter(),
3972
3949
allow_pending = True
3973
3950
return merger, allow_pending
3974
3951
3975
def get_merger_from_uncommitted(self, tree, location, pb):
3952
def get_merger_from_uncommitted(self, tree, location, pb, cleanups):
3976
3953
"""Get a merger for uncommitted changes.
3977
3954
3978
3955
:param tree: The tree the merger should apply to.
3979
3956
:param location: The location containing uncommitted changes.
3980
3957
:param pb: The progress bar to use for showing progress.
3958
:param cleanups: A list of operations to perform to clean up the
3959
temporary directories, unfinalized objects, etc.
3981
3960
"""
3982
3961
location = self._select_branch_location(tree, location)[0]
3983
3962
other_tree, other_path = WorkingTree.open_containing(location)
4035
4014
4036
4015
4037
4016
class cmd_remerge(Command):
4038
__doc__ = """Redo a merge.
4017
"""Redo a merge.
4039
4018
4040
4019
Use this if you want to try a different merge technique while resolving
4041
4020
conflicts. Some merge techniques are better than others, and remerge
4066
4045
4067
4046
def run(self, file_list=None, merge_type=None, show_base=False,
4068
4047
reprocess=False):
4069
from bzrlib.conflicts import restore
4070
4048
if merge_type is None:
4071
4049
merge_type = _mod_merge.Merge3Merger
4072
4050
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
4051
tree.lock_write()
4052
try:
4053
parents = tree.get_parent_ids()
4054
if len(parents) != 2:
4055
raise errors.BzrCommandError("Sorry, remerge only works after normal"
4056
" merges. Not cherrypicking or"
4057
" multi-merges.")
4058
repository = tree.branch.repository
4059
interesting_ids = None
4060
new_conflicts = []
4061
conflicts = tree.conflicts()
4062
if file_list is not None:
4063
interesting_ids = set()
4064
for filename in file_list:
4065
file_id = tree.path2id(filename)
4066
if file_id is None:
4067
raise errors.NotVersionedError(filename)
4068
interesting_ids.add(file_id)
4069
if tree.kind(file_id) != "directory":
4070
continue
4092
4071
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:
4072
for name, ie in tree.inventory.iter_entries(file_id):
4073
interesting_ids.add(ie.file_id)
4074
new_conflicts = conflicts.select_conflicts(tree, file_list)[0]
4075
else:
4076
# Remerge only supports resolving contents conflicts
4077
allowed_conflicts = ('text conflict', 'contents conflict')
4078
restore_files = [c.path for c in conflicts
4079
if c.typestring in allowed_conflicts]
4080
_mod_merge.transform_tree(tree, tree.basis_tree(), interesting_ids)
4081
tree.set_conflicts(ConflictList(new_conflicts))
4082
if file_list is not None:
4083
restore_files = file_list
4084
for filename in restore_files:
4085
try:
4086
restore(tree.abspath(filename))
4087
except errors.NotConflicted:
4088
pass
4089
# Disable pending merges, because the file texts we are remerging
4090
# have not had those merges performed. If we use the wrong parents
4091
# list, we imply that the working tree text has seen and rejected
4092
# all the changes from the other tree, when in fact those changes
4093
# have not yet been seen.
4094
pb = ui.ui_factory.nested_progress_bar()
4095
tree.set_parent_ids(parents[:1])
4106
4096
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()
4097
merger = _mod_merge.Merger.from_revision_ids(pb,
4098
tree, parents[1])
4099
merger.interesting_ids = interesting_ids
4100
merger.merge_type = merge_type
4101
merger.show_base = show_base
4102
merger.reprocess = reprocess
4103
conflicts = merger.do_merge()
4104
finally:
4105
tree.set_parent_ids(parents)
4106
pb.finished()
4123
4107
finally:
4124
tree.set_parent_ids(parents)
4108
tree.unlock()
4125
4109
if conflicts > 0:
4126
4110
return 1
4127
4111
else:
4129
4113
4130
4114
4131
4115
class cmd_revert(Command):
4132
__doc__ = """Revert files to a previous revision.
4116
"""Revert files to a previous revision.
4133
4117
4134
4118
Giving a list of files will revert only those files. Otherwise, all files
4135
4119
will be reverted. If the revision is not specified with '--revision', the
4154
4138
created as above. Directories containing unknown files will not be
4155
4139
deleted.
4156
4140
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
4141
The working tree contains a list of pending merged revisions, which will
4142
be included as parents in the next commit. Normally, revert clears that
4143
list as well as reverting the files. If any files are specified, revert
4144
leaves the pending merge list alone and reverts only the files. Use "bzr
4145
revert ." in the tree root to revert all files but keep the merge record,
4146
and "bzr revert --forget-merges" to clear the pending merge list without
4164
4147
reverting any files.
4165
4148
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
4149
Using "bzr revert --forget-merges", it is possible to apply the changes
4150
from an arbitrary merge as a single revision. To do this, perform the
4151
merge as desired. Then doing revert with the "--forget-merges" option will
4152
keep the content of the tree as it was, but it will clear the list of
4153
pending merges. The next commit will then contain all of the changes that
4154
would have been in the merge, but without any mention of the other parent
4155
revisions. Because this technique forgets where these changes originated,
4156
it may cause additional conflicts on later merges involving the source and
4174
4157
target branches.
4175
4158
"""
4176
4159
4186
4169
def run(self, revision=None, no_backup=False, file_list=None,
4187
4170
forget_merges=None):
4188
4171
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)
4172
tree.lock_write()
4173
try:
4174
if forget_merges:
4175
tree.set_parent_ids(tree.get_parent_ids()[:1])
4176
else:
4177
self._revert_tree_to_revision(tree, revision, file_list, no_backup)
4178
finally:
4179
tree.unlock()
4194
4180
4195
4181
@staticmethod
4196
4182
def _revert_tree_to_revision(tree, revision, file_list, no_backup):
4197
4183
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)
4184
pb = ui.ui_factory.nested_progress_bar()
4185
try:
4186
tree.revert(file_list, rev_tree, not no_backup, pb,
4187
report_changes=True)
4188
finally:
4189
pb.finished()
4200
4190
4201
4191
4202
4192
class cmd_assert_fail(Command):
4203
__doc__ = """Test reporting of assertion failures"""
4193
"""Test reporting of assertion failures"""
4204
4194
# intended just for use in testing
4205
4195
4206
4196
hidden = True
4210
4200
4211
4201
4212
4202
class cmd_help(Command):
4213
__doc__ = """Show help on a command or other topic.
4203
"""Show help on a command or other topic.
4214
4204
"""
4215
4205
4216
4206
_see_also = ['topics']
4229
4219
4230
4220
4231
4221
class cmd_shell_complete(Command):
4232
__doc__ = """Show appropriate completions for context.
4222
"""Show appropriate completions for context.
4233
4223
4234
4224
For a list of all available commands, say 'bzr shell-complete'.
4235
4225
"""
4244
4234
4245
4235
4246
4236
class cmd_missing(Command):
4247
__doc__ = """Show unmerged/unpulled revisions between two branches.
4237
"""Show unmerged/unpulled revisions between two branches.
4248
4238
4249
4239
OTHER_BRANCH may be local or remote.
4250
4240
4328
4318
restrict = 'remote'
4329
4319
4330
4320
local_branch = Branch.open_containing(u".")[0]
4331
self.add_cleanup(local_branch.lock_read().unlock)
4332
4333
4321
parent = local_branch.get_parent()
4334
4322
if other_branch is None:
4335
4323
other_branch = parent
4344
4332
remote_branch = Branch.open(other_branch)
4345
4333
if remote_branch.base == local_branch.base:
4346
4334
remote_branch = local_branch
4347
else:
4348
self.add_cleanup(remote_branch.lock_read().unlock)
4349
4335
4350
4336
local_revid_range = _revision_range_to_revid_range(
4351
4337
_get_revision_range(my_revision, local_branch,
4355
4341
_get_revision_range(revision,
4356
4342
remote_branch, self.name()))
4357
4343
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()
4344
local_branch.lock_read()
4345
try:
4346
remote_branch.lock_read()
4347
try:
4348
local_extra, remote_extra = find_unmerged(
4349
local_branch, remote_branch, restrict,
4350
backward=not reverse,
4351
include_merges=include_merges,
4352
local_revid_range=local_revid_range,
4353
remote_revid_range=remote_revid_range)
4354
4355
if log_format is None:
4356
registry = log.log_formatter_registry
4357
log_format = registry.get_default(local_branch)
4358
lf = log_format(to_file=self.outf,
4359
show_ids=show_ids,
4360
show_timezone='original')
4361
4362
status_code = 0
4363
if local_extra and not theirs_only:
4364
message("You have %d extra revision(s):\n" %
4365
len(local_extra))
4366
for revision in iter_log_revisions(local_extra,
4367
local_branch.repository,
4368
verbose):
4369
lf.log_revision(revision)
4370
printed_local = True
4371
status_code = 1
4372
else:
4373
printed_local = False
4374
4375
if remote_extra and not mine_only:
4376
if printed_local is True:
4377
message("\n\n\n")
4378
message("You are missing %d revision(s):\n" %
4379
len(remote_extra))
4380
for revision in iter_log_revisions(remote_extra,
4381
remote_branch.repository,
4382
verbose):
4383
lf.log_revision(revision)
4384
status_code = 1
4385
4386
if mine_only and not local_extra:
4387
# We checked local, and found nothing extra
4388
message('This branch is up to date.\n')
4389
elif theirs_only and not remote_extra:
4390
# We checked remote, and found nothing extra
4391
message('Other branch is up to date.\n')
4392
elif not (mine_only or theirs_only or local_extra or
4393
remote_extra):
4394
# We checked both branches, and neither one had extra
4395
# revisions
4396
message("Branches are up to date.\n")
4397
finally:
4398
remote_branch.unlock()
4399
finally:
4400
local_branch.unlock()
4408
4401
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)
4402
local_branch.lock_write()
4403
try:
4404
# handle race conditions - a parent might be set while we run.
4405
if local_branch.get_parent() is None:
4406
local_branch.set_parent(remote_branch.base)
4407
finally:
4408
local_branch.unlock()
4413
4409
return status_code
4414
4410
4415
4411
4416
4412
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
"""
4413
"""Compress the data within a repository."""
4434
4414
4435
4415
_see_also = ['repositories']
4436
4416
takes_args = ['branch_or_repo?']
4437
takes_options = [
4438
Option('clean-obsolete-packs', 'Delete obsolete packs to save disk space.'),
4439
]
4440
4417
4441
def run(self, branch_or_repo='.', clean_obsolete_packs=False):
4418
def run(self, branch_or_repo='.'):
4442
4419
dir = bzrdir.BzrDir.open_containing(branch_or_repo)[0]
4443
4420
try:
4444
4421
branch = dir.open_branch()
4445
4422
repository = branch.repository
4446
4423
except errors.NotBranchError:
4447
4424
repository = dir.open_repository()
4448
repository.pack(clean_obsolete_packs=clean_obsolete_packs)
4425
repository.pack()
4449
4426
4450
4427
4451
4428
class cmd_plugins(Command):
4452
__doc__ = """List the installed plugins.
4429
"""List the installed plugins.
4453
4430
4454
4431
This command displays the list of installed plugins including
4455
4432
version of plugin and a short description of each.
4462
4439
adding new commands, providing additional network transports and
4463
4440
customizing log output.
4464
4441
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.
4442
See the Bazaar web site, http://bazaar-vcs.org, for further
4443
information on plugins including where to find them and how to
4444
install them. Instructions are also provided there on how to
4445
write new plugins using the Python programming language.
4469
4446
"""
4470
4447
takes_options = ['verbose']
4471
4448
4486
4463
doc = '(no description)'
4487
4464
result.append((name_ver, doc, plugin.path()))
4488
4465
for name_ver, doc, path in sorted(result):
4489
self.outf.write("%s\n" % name_ver)
4490
self.outf.write(" %s\n" % doc)
4466
print name_ver
4467
print ' ', doc
4491
4468
if verbose:
4492
self.outf.write(" %s\n" % path)
4493
self.outf.write("\n")
4469
print ' ', path
4470
print
4494
4471
4495
4472
4496
4473
class cmd_testament(Command):
4497
__doc__ = """Show testament (signing-form) of a revision."""
4474
"""Show testament (signing-form) of a revision."""
4498
4475
takes_options = [
4499
4476
'revision',
4500
4477
Option('long', help='Produce long-format testament.'),
4512
4489
b = Branch.open_containing(branch)[0]
4513
4490
else:
4514
4491
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())
4492
b.lock_read()
4493
try:
4494
if revision is None:
4495
rev_id = b.last_revision()
4496
else:
4497
rev_id = revision[0].as_revision_id(b)
4498
t = testament_class.from_revision(b.repository, rev_id)
4499
if long:
4500
sys.stdout.writelines(t.as_text_lines())
4501
else:
4502
sys.stdout.write(t.as_short_text())
4503
finally:
4504
b.unlock()
4525
4505
4526
4506
4527
4507
class cmd_annotate(Command):
4528
__doc__ = """Show the origin of each line in a file.
4508
"""Show the origin of each line in a file.
4529
4509
4530
4510
This prints out the given file with an annotation on the left side
4531
4511
indicating which revision, author and date introduced the change.
4552
4532
wt, branch, relpath = \
4553
4533
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
4554
4534
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)
4535
wt.lock_read()
4536
else:
4537
branch.lock_read()
4538
try:
4539
tree = _get_one_revision_tree('annotate', revision, branch=branch)
4540
if wt is not None:
4541
file_id = wt.path2id(relpath)
4542
else:
4543
file_id = tree.path2id(relpath)
4544
if file_id is None:
4545
raise errors.NotVersionedError(filename)
4546
file_version = tree.inventory[file_id].revision
4547
if wt is not None and revision is None:
4548
# If there is a tree and we're not annotating historical
4549
# versions, annotate the working tree's content.
4550
annotate_file_tree(wt, file_id, self.outf, long, all,
4551
show_ids=show_ids)
4552
else:
4553
annotate_file(branch, file_version, file_id, long, all, self.outf,
4554
show_ids=show_ids)
4555
finally:
4556
if wt is not None:
4557
wt.unlock()
4558
else:
4559
branch.unlock()
4575
4560
4576
4561
4577
4562
class cmd_re_sign(Command):
4578
__doc__ = """Create a digital signature for an existing revision."""
4563
"""Create a digital signature for an existing revision."""
4579
4564
# TODO be able to replace existing ones.
4580
4565
4581
4566
hidden = True # is this right ?
4588
4573
if revision_id_list is None and revision is None:
4589
4574
raise errors.BzrCommandError('You must supply either --revision or a revision_id')
4590
4575
b = WorkingTree.open_containing(u'.')[0].branch
4591
self.add_cleanup(b.lock_write().unlock)
4592
return self._run(b, revision_id_list, revision)
4576
b.lock_write()
4577
try:
4578
return self._run(b, revision_id_list, revision)
4579
finally:
4580
b.unlock()
4593
4581
4594
4582
def _run(self, b, revision_id_list, revision):
4595
4583
import bzrlib.gpg as gpg
4640
4628
4641
4629
4642
4630
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.
4631
"""Convert the current branch into a checkout of the supplied branch.
4645
4632
4646
4633
Once converted into a checkout, commits must succeed on the master branch
4647
4634
before they will be applied to the local branch.
4665
4652
'This format does not remember old locations.')
4666
4653
else:
4667
4654
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')
4655
raise errors.BzrCommandError('No location supplied and no '
4656
'previous location known')
4673
4657
b_other = Branch.open(location)
4674
4658
try:
4675
4659
b.bind(b_other)
4681
4665
4682
4666
4683
4667
class cmd_unbind(Command):
4684
__doc__ = """Convert the current checkout into a regular branch.
4668
"""Convert the current checkout into a regular branch.
4685
4669
4686
4670
After unbinding, the local branch is considered independent and subsequent
4687
4671
commits will be local only.
4698
4682
4699
4683
4700
4684
class cmd_uncommit(Command):
4701
__doc__ = """Remove the last committed revision.
4685
"""Remove the last committed revision.
4702
4686
4703
4687
--verbose will print out what is being removed.
4704
4688
--dry-run will go through all the motions, but not actually
4744
4728
b = control.open_branch()
4745
4729
4746
4730
if tree is not None:
4747
self.add_cleanup(tree.lock_write().unlock)
4731
tree.lock_write()
4748
4732
else:
4749
self.add_cleanup(b.lock_write().unlock)
4750
return self._run(b, tree, dry_run, verbose, revision, force, local=local)
4733
b.lock_write()
4734
try:
4735
return self._run(b, tree, dry_run, verbose, revision, force,
4736
local=local)
4737
finally:
4738
if tree is not None:
4739
tree.unlock()
4740
else:
4741
b.unlock()
4751
4742
4752
4743
def _run(self, b, tree, dry_run, verbose, revision, force, local=False):
4753
4744
from bzrlib.log import log_formatter, show_log
4785
4776
end_revision=last_revno)
4786
4777
4787
4778
if dry_run:
4788
self.outf.write('Dry-run, pretending to remove'
4789
' the above revisions.\n')
4779
print 'Dry-run, pretending to remove the above revisions.'
4780
if not force:
4781
val = raw_input('Press <enter> to continue')
4790
4782
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
4783
print 'The above revision(s) will be removed.'
4784
if not force:
4785
val = raw_input('Are you sure [y/N]? ')
4786
if val.lower() not in ('y', 'yes'):
4787
print 'Canceled'
4788
return 0
4797
4789
4798
4790
mutter('Uncommitting from {%s} to {%s}',
4799
4791
last_rev_id, rev_id)
4800
4792
uncommit(b, tree=tree, dry_run=dry_run, verbose=verbose,
4801
4793
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)
4794
note('You can restore the old tip by running:\n'
4795
' bzr pull . -r revid:%s', last_rev_id)
4804
4796
4805
4797
4806
4798
class cmd_break_lock(Command):
4807
__doc__ = """Break a dead lock on a repository, branch or working directory.
4799
"""Break a dead lock on a repository, branch or working directory.
4808
4800
4809
4801
CAUTION: Locks should only be broken when you are sure that the process
4810
4802
holding the lock has been stopped.
4811
4803
4812
You can get information on what locks are open via the 'bzr info
4813
[location]' command.
4804
You can get information on what locks are open via the 'bzr info' command.
4814
4805
4815
4806
:Examples:
4816
4807
bzr break-lock
4817
bzr break-lock bzr+ssh://example.com/bzr/foo
4818
4808
"""
4819
4809
takes_args = ['location?']
4820
4810
4829
4819
4830
4820
4831
4821
class cmd_wait_until_signalled(Command):
4832
__doc__ = """Test helper for test_start_and_stop_bzr_subprocess_send_signal.
4822
"""Test helper for test_start_and_stop_bzr_subprocess_send_signal.
4833
4823
4834
4824
This just prints a line to signal when it is ready, then blocks on stdin.
4835
4825
"""
4843
4833
4844
4834
4845
4835
class cmd_serve(Command):
4846
__doc__ = """Run the bzr server."""
4836
"""Run the bzr server."""
4847
4837
4848
4838
aliases = ['server']
4849
4839
4909
4899
4910
4900
4911
4901
class cmd_join(Command):
4912
__doc__ = """Combine a tree into its containing tree.
4902
"""Combine a tree into its containing tree.
4913
4903
4914
4904
This command requires the target tree to be in a rich-root format.
4915
4905
4955
4945
4956
4946
4957
4947
class cmd_split(Command):
4958
__doc__ = """Split a subdirectory of a tree into a separate tree.
4948
"""Split a subdirectory of a tree into a separate tree.
4959
4949
4960
4950
This command will produce a target tree in a format that supports
4961
4951
rich roots, like 'rich-root' or 'rich-root-pack'. These formats cannot be
4981
4971
4982
4972
4983
4973
class cmd_merge_directive(Command):
4984
__doc__ = """Generate a merge directive for auto-merge tools.
4974
"""Generate a merge directive for auto-merge tools.
4985
4975
4986
4976
A directive requests a merge to be performed, and also provides all the
4987
4977
information necessary to do so. This means it must either include a
5080
5070
5081
5071
5082
5072
class cmd_send(Command):
5083
__doc__ = """Mail or create a merge-directive for submitting changes.
5073
"""Mail or create a merge-directive for submitting changes.
5084
5074
5085
5075
A merge directive provides many things needed for requesting merges:
5086
5076
5092
5082
directly from the merge directive, without retrieving data from a
5093
5083
branch.
5094
5084
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.
5085
If --no-bundle is specified, then public_branch is needed (and must be
5086
up-to-date), so that the receiver can perform the merge using the
5087
public_branch. The public_branch is always included if known, so that
5088
people can check it later.
5089
5090
The submit branch defaults to the parent, but can be overridden. Both
5091
submit branch and public branch will be remembered if supplied.
5092
5093
If a public_branch is known for the submit_branch, that public submit
5094
branch is used in the merge instructions. This means that a local mirror
5095
can be used as your actual submit branch, once you have set public_branch
5096
for that mirror.
5121
5097
5122
5098
Mail is sent using your preferred mail program. This should be transparent
5123
5099
on Windows (it uses MAPI). On Linux, it requires the xdg-email utility.
5143
5119
5144
5120
The merge directives created by bzr send may be applied using bzr merge or
5145
5121
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
5122
"""
5151
5123
5152
5124
encoding_type = 'exact'
5168
5140
short_name='f',
5169
5141
type=unicode),
5170
5142
Option('output', short_name='o',
5171
help='Write merge directive to this file or directory; '
5143
help='Write merge directive to this file; '
5172
5144
'use - for stdout.',
5173
5145
type=unicode),
5174
5146
Option('strict',
5197
5169
5198
5170
5199
5171
class cmd_bundle_revisions(cmd_send):
5200
__doc__ = """Create a merge-directive for submitting changes.
5172
"""Create a merge-directive for submitting changes.
5201
5173
5202
5174
A merge directive provides many things needed for requesting merges:
5203
5175
5270
5242
5271
5243
5272
5244
class cmd_tag(Command):
5273
__doc__ = """Create, remove or modify a tag naming a revision.
5245
"""Create, remove or modify a tag naming a revision.
5274
5246
5275
5247
Tags give human-meaningful names to revisions. Commands that take a -r
5276
5248
(--revision) option can be given -rtag:X, where X is any previously
5284
5256
5285
5257
To rename a tag (change the name but keep it on the same revsion), run ``bzr
5286
5258
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
5259
"""
5293
5260
5294
5261
_see_also = ['commit', 'tags']
5295
takes_args = ['tag_name?']
5262
takes_args = ['tag_name']
5296
5263
takes_options = [
5297
5264
Option('delete',
5298
5265
help='Delete this tag rather than placing it.',
5308
5275
'revision',
5309
5276
]
5310
5277
5311
def run(self, tag_name=None,
5278
def run(self, tag_name,
5312
5279
delete=None,
5313
5280
directory='.',
5314
5281
force=None,
5315
5282
revision=None,
5316
5283
):
5317
5284
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)
5285
branch.lock_write()
5286
try:
5287
if delete:
5288
branch.tags.delete_tag(tag_name)
5289
self.outf.write('Deleted tag %s.\n' % tag_name)
5331
5290
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)
5291
if revision:
5292
if len(revision) != 1:
5293
raise errors.BzrCommandError(
5294
"Tags can only be placed on a single revision, "
5295
"not on a range")
5296
revision_id = revision[0].as_revision_id(branch)
5297
else:
5298
revision_id = branch.last_revision()
5299
if (not force) and branch.tags.has_tag(tag_name):
5300
raise errors.TagAlreadyExists(tag_name)
5301
branch.tags.set_tag(tag_name, revision_id)
5302
self.outf.write('Created tag %s.\n' % tag_name)
5303
finally:
5304
branch.unlock()
5342
5305
5343
5306
5344
5307
class cmd_tags(Command):
5345
__doc__ = """List tags.
5308
"""List tags.
5346
5309
5347
5310
This command shows a table of tag names and the revisions they reference.
5348
5311
"""
5376
5339
if not tags:
5377
5340
return
5378
5341
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()
5342
branch.lock_read()
5343
try:
5344
if revision:
5345
graph = branch.repository.get_graph()
5346
rev1, rev2 = _get_revision_range(revision, branch, self.name())
5347
revid1, revid2 = rev1.rev_id, rev2.rev_id
5348
# only show revisions between revid1 and revid2 (inclusive)
5349
tags = [(tag, revid) for tag, revid in tags if
5350
graph.is_between(revid, revid1, revid2)]
5351
if sort == 'alpha':
5352
tags.sort()
5353
elif sort == 'time':
5354
timestamps = {}
5355
for tag, revid in tags:
5356
try:
5357
revobj = branch.repository.get_revision(revid)
5358
except errors.NoSuchRevision:
5359
timestamp = sys.maxint # place them at the end
5360
else:
5361
timestamp = revobj.timestamp
5362
timestamps[revid] = timestamp
5363
tags.sort(key=lambda x: timestamps[x[1]])
5364
if not show_ids:
5365
# [ (tag, revid), ... ] -> [ (tag, dotted_revno), ... ]
5366
for index, (tag, revid) in enumerate(tags):
5367
try:
5368
revno = branch.revision_id_to_dotted_revno(revid)
5369
if isinstance(revno, tuple):
5370
revno = '.'.join(map(str, revno))
5371
except errors.NoSuchRevision:
5372
# Bad tag data/merges can lead to tagged revisions
5373
# which are not in this branch. Fail gracefully ...
5374
revno = '?'
5375
tags[index] = (tag, revno)
5376
finally:
5377
branch.unlock()
5413
5378
for tag, revspec in tags:
5414
5379
self.outf.write('%-20s %s\n' % (tag, revspec))
5415
5380
5416
5381
5417
5382
class cmd_reconfigure(Command):
5418
__doc__ = """Reconfigure the type of a bzr directory.
5383
"""Reconfigure the type of a bzr directory.
5419
5384
5420
5385
A target configuration must be specified.
5421
5386
5506
5471
5507
5472
5508
5473
class cmd_switch(Command):
5509
__doc__ = """Set the branch of a checkout and update.
5474
"""Set the branch of a checkout and update.
5510
5475
5511
5476
For lightweight checkouts, this changes the branch being referenced.
5512
5477
For heavyweight checkouts, this checks that there are no local commits
5528
5493
that of the master.
5529
5494
"""
5530
5495
5531
takes_args = ['to_location?']
5496
takes_args = ['to_location']
5532
5497
takes_options = [Option('force',
5533
5498
help='Switch even if local commits will be lost.'),
5534
'revision',
5535
5499
Option('create-branch', short_name='b',
5536
5500
help='Create the target branch from this one before'
5537
5501
' switching to it.'),
5538
]
5502
]
5539
5503
5540
def run(self, to_location=None, force=False, create_branch=False,
5541
revision=None):
5504
def run(self, to_location, force=False, create_branch=False):
5542
5505
from bzrlib import switch
5543
5506
tree_location = '.'
5544
revision = _get_one_revision('switch', revision)
5545
5507
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
5508
try:
5552
5509
branch = control_dir.open_branch()
5553
5510
had_explicit_nick = branch.get_config().has_explicit_nickname()
5567
5524
to_branch = branch.bzrdir.sprout(to_location,
5568
5525
possible_transports=[branch.bzrdir.root_transport],
5569
5526
source_branch=branch).open_branch()
5527
# try:
5528
# from_branch = control_dir.open_branch()
5529
# except errors.NotBranchError:
5530
# raise BzrCommandError('Cannot create a branch from this'
5531
# ' location when we cannot open this branch')
5532
# from_branch.bzrdir.sprout(
5533
pass
5570
5534
else:
5571
5535
try:
5572
5536
to_branch = Branch.open(to_location)
5574
5538
this_url = self._get_branch_location(control_dir)
5575
5539
to_branch = Branch.open(
5576
5540
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)
5541
switch.switch(control_dir, to_branch, force)
5580
5542
if had_explicit_nick:
5581
5543
branch = control_dir.open_branch() #get the new branch!
5582
5544
branch.nick = to_branch.nick
5602
5564
5603
5565
5604
5566
class cmd_view(Command):
5605
__doc__ = """Manage filtered views.
5567
"""Manage filtered views.
5606
5568
5607
5569
Views provide a mask over the tree so that users can focus on
5608
5570
a subset of a tree when doing their work. After creating a view,
5756
5718
5757
5719
5758
5720
class cmd_hooks(Command):
5759
__doc__ = """Show hooks."""
5721
"""Show hooks."""
5760
5722
5761
5723
hidden = True
5762
5724
5775
5737
self.outf.write(" <no hooks installed>\n")
5776
5738
5777
5739
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
5740
class cmd_shelve(Command):
5804
__doc__ = """Temporarily set aside some changes from the current tree.
5741
"""Temporarily set aside some changes from the current tree.
5805
5742
5806
5743
Shelve allows you to temporarily put changes you've made "on the shelf",
5807
5744
ie. out of the way, until a later time when you can bring them back from
5860
5797
5861
5798
def run_for_list(self):
5862
5799
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
5800
tree.lock_read()
5801
try:
5802
manager = tree.get_shelf_manager()
5803
shelves = manager.active_shelves()
5804
if len(shelves) == 0:
5805
note('No shelved changes.')
5806
return 0
5807
for shelf_id in reversed(shelves):
5808
message = manager.get_metadata(shelf_id).get('message')
5809
if message is None:
5810
message = '<no message>'
5811
self.outf.write('%3d: %s\n' % (shelf_id, message))
5812
return 1
5813
finally:
5814
tree.unlock()
5875
5815
5876
5816
5877
5817
class cmd_unshelve(Command):
5878
__doc__ = """Restore shelved changes.
5818
"""Restore shelved changes.
5879
5819
5880
5820
By default, the most recently shelved changes are restored. However if you
5881
5821
specify a shelf by id those changes will be restored instead. This works
5889
5829
enum_switch=False, value_switches=True,
5890
5830
apply="Apply changes and remove from the shelf.",
5891
5831
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
5832
delete_only="Delete changes without applying them.",
5895
5833
keep="Apply changes but don't delete them.",
5896
5834
)
5907
5845
5908
5846
5909
5847
class cmd_clean_tree(Command):
5910
__doc__ = """Remove unwanted files from working tree.
5848
"""Remove unwanted files from working tree.
5911
5849
5912
5850
By default, only unknown files, not ignored files, are deleted. Versioned
5913
5851
files are never deleted.
5941
5879
5942
5880
5943
5881
class cmd_reference(Command):
5944
__doc__ = """list, view and set branch locations for nested trees.
5882
"""list, view and set branch locations for nested trees.
5945
5883
5946
5884
If no arguments are provided, lists the branch locations for nested trees.
5947
5885
If one argument is provided, display the branch location for that tree.
5987
5925
self.outf.write('%s %s\n' % (path, location))
5988
5926
5989
5927
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)
5928
# these get imported and then picked up by the scan for cmd_*
5929
# TODO: Some more consistent way to split command definitions across files;
5930
# we do need to load at least some information about them to know of
5931
# aliases. ideally we would avoid loading the implementation until the
5932
# details were needed.
5933
from bzrlib.cmd_version_info import cmd_version_info
5934
from bzrlib.conflicts import cmd_resolve, cmd_conflicts, restore
5935
from bzrlib.bundle.commands import (
5936
cmd_bundle_info,
5937
)
5938
from bzrlib.foreign import cmd_dpush
5939
from bzrlib.sign_my_commits import cmd_sign_my_commits
5940
from bzrlib.weave_commands import cmd_versionedfile_list, \
5941
cmd_weave_plan_merge, cmd_weave_merge_text
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0