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