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