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 4871.1.1
- compare with another revision
- download diff
- download tarball
- view history from revision 4871.1.1
- Committer: Neil Martinsen-Burrell
- Date: 2009-12-07 18:12:21 UTC
- mto: (4873.1.1 integration) (4924.1.1 doc) (4892.1.1 integration)
- mto: This revision was merged to the branch mainline in revision 4874.
- Revision ID: nmb@wartburg.edu-20091207181221-ohm721dgo968r2oo
Put in place a structure for the admin-guide
- files added:
- bzrlib/weave_commands.py
- files removed:
- .testr.conf
- apport
- bzrlib/help_topics/es
- bzrlib/plugins/bash_completion
- bzrlib/plugins/bash_completion/tests
- 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
1341
1343
1342
1344
1343
1345
class cmd_renames(Command):
1344
__doc__ = """Show list of renamed files.
1346
"""Show list of renamed files.
1345
1347
"""
1346
1348
# TODO: Option to show renames between two historical versions.
1347
1349
1352
1354
@display_command
1353
1355
def run(self, dir=u'.'):
1354
1356
tree = WorkingTree.open_containing(dir)[0]
1355
self.add_cleanup(tree.lock_read().unlock)
1356
new_inv = tree.inventory
1357
old_tree = tree.basis_tree()
1358
self.add_cleanup(old_tree.lock_read().unlock)
1359
old_inv = old_tree.inventory
1360
renames = []
1361
iterator = tree.iter_changes(old_tree, include_unchanged=True)
1362
for f, paths, c, v, p, n, k, e in iterator:
1363
if paths[0] == paths[1]:
1364
continue
1365
if None in (paths):
1366
continue
1367
renames.append(paths)
1368
renames.sort()
1369
for old_name, new_name in renames:
1370
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()
1371
1379
1372
1380
1373
1381
class cmd_update(Command):
1374
__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.
1375
1383
1376
1384
This will perform a merge into the working tree, and may generate
1377
1385
conflicts. If you have any local changes, you will still
1379
1387
1380
1388
If you want to discard your local changes, you can just do a
1381
1389
'bzr revert' instead of 'bzr commit' after the update.
1382
1383
If the tree's branch is bound to a master branch, it will also update
1384
the branch from the master.
1385
1390
"""
1386
1391
1387
1392
_see_also = ['pull', 'working-trees', 'status-flags']
1388
1393
takes_args = ['dir?']
1389
takes_options = ['revision']
1390
1394
aliases = ['up']
1391
1395
1392
def run(self, dir='.', revision=None):
1393
if revision is not None and len(revision) != 1:
1394
raise errors.BzrCommandError(
1395
"bzr update --revision takes exactly one revision")
1396
def run(self, dir='.'):
1396
1397
tree = WorkingTree.open_containing(dir)[0]
1397
branch = tree.branch
1398
1398
possible_transports = []
1399
master = branch.get_master_branch(
1399
master = tree.branch.get_master_branch(
1400
1400
possible_transports=possible_transports)
1401
1401
if master is not None:
1402
branch_location = master.base
1403
1402
tree.lock_write()
1404
1403
else:
1405
branch_location = tree.branch.base
1406
1404
tree.lock_tree_write()
1407
self.add_cleanup(tree.unlock)
1408
# get rid of the final '/' and be ready for display
1409
branch_location = urlutils.unescape_for_display(
1410
branch_location.rstrip('/'),
1411
self.outf.encoding)
1412
existing_pending_merges = tree.get_parent_ids()[1:]
1413
if master is None:
1414
old_tip = None
1415
else:
1416
# may need to fetch data into a heavyweight checkout
1417
# XXX: this may take some time, maybe we should display a
1418
# message
1419
old_tip = branch.update(possible_transports)
1420
if revision is not None:
1421
revision_id = revision[0].as_revision_id(branch)
1422
else:
1423
revision_id = branch.last_revision()
1424
if revision_id == _mod_revision.ensure_null(tree.last_revision()):
1425
revno = branch.revision_id_to_dotted_revno(revision_id)
1426
note("Tree is up to date at revision %s of branch %s" %
1427
('.'.join(map(str, revno)), branch_location))
1428
return 0
1429
view_info = _get_view_info_for_change_reporter(tree)
1430
change_reporter = delta._ChangeReporter(
1431
unversioned_filter=tree.is_ignored,
1432
view_info=view_info)
1433
1405
try:
1406
existing_pending_merges = tree.get_parent_ids()[1:]
1407
last_rev = _mod_revision.ensure_null(tree.last_revision())
1408
if last_rev == _mod_revision.ensure_null(
1409
tree.branch.last_revision()):
1410
# may be up to date, check master too.
1411
if master is None or last_rev == _mod_revision.ensure_null(
1412
master.last_revision()):
1413
revno = tree.branch.revision_id_to_revno(last_rev)
1414
note("Tree is up to date at revision %d." % (revno,))
1415
return 0
1416
view_info = _get_view_info_for_change_reporter(tree)
1434
1417
conflicts = tree.update(
1435
change_reporter,
1436
possible_transports=possible_transports,
1437
revision=revision_id,
1438
old_tip=old_tip)
1439
except errors.NoSuchRevision, e:
1440
raise errors.BzrCommandError(
1441
"branch has no revision %s\n"
1442
"bzr update --revision only works"
1443
" for a revision in the branch history"
1444
% (e.revision))
1445
revno = tree.branch.revision_id_to_dotted_revno(
1446
_mod_revision.ensure_null(tree.last_revision()))
1447
note('Updated to revision %s of branch %s' %
1448
('.'.join(map(str, revno)), branch_location))
1449
parent_ids = tree.get_parent_ids()
1450
if parent_ids[1:] and parent_ids[1:] != existing_pending_merges:
1451
note('Your local commits will now show as pending merges with '
1452
"'bzr status', and can be committed with 'bzr commit'.")
1453
if conflicts != 0:
1454
return 1
1455
else:
1456
return 0
1418
delta._ChangeReporter(unversioned_filter=tree.is_ignored,
1419
view_info=view_info), possible_transports=possible_transports)
1420
revno = tree.branch.revision_id_to_revno(
1421
_mod_revision.ensure_null(tree.last_revision()))
1422
note('Updated to revision %d.' % (revno,))
1423
if tree.get_parent_ids()[1:] != existing_pending_merges:
1424
note('Your local commits will now show as pending merges with '
1425
"'bzr status', and can be committed with 'bzr commit'.")
1426
if conflicts != 0:
1427
return 1
1428
else:
1429
return 0
1430
finally:
1431
tree.unlock()
1457
1432
1458
1433
1459
1434
class cmd_info(Command):
1460
__doc__ = """Show information about a working tree, branch or repository.
1435
"""Show information about a working tree, branch or repository.
1461
1436
1462
1437
This command will show all known locations and formats associated to the
1463
1438
tree, branch or repository.
1501
1476
1502
1477
1503
1478
class cmd_remove(Command):
1504
__doc__ = """Remove files or directories.
1479
"""Remove files or directories.
1505
1480
1506
1481
This makes bzr stop tracking changes to the specified files. bzr will delete
1507
1482
them if they can easily be recovered using revert. If no options or
1529
1504
if file_list is not None:
1530
1505
file_list = [f for f in file_list]
1531
1506
1532
self.add_cleanup(tree.lock_write().unlock)
1533
# Heuristics should probably all move into tree.remove_smart or
1534
# some such?
1535
if new:
1536
added = tree.changes_from(tree.basis_tree(),
1537
specific_files=file_list).added
1538
file_list = sorted([f[0] for f in added], reverse=True)
1539
if len(file_list) == 0:
1540
raise errors.BzrCommandError('No matching files.')
1541
elif file_list is None:
1542
# missing files show up in iter_changes(basis) as
1543
# versioned-with-no-kind.
1544
missing = []
1545
for change in tree.iter_changes(tree.basis_tree()):
1546
# Find paths in the working tree that have no kind:
1547
if change[1][1] is not None and change[6][1] is None:
1548
missing.append(change[1][1])
1549
file_list = sorted(missing, reverse=True)
1550
file_deletion_strategy = 'keep'
1551
tree.remove(file_list, verbose=verbose, to_file=self.outf,
1552
keep_files=file_deletion_strategy=='keep',
1553
force=file_deletion_strategy=='force')
1507
tree.lock_write()
1508
try:
1509
# Heuristics should probably all move into tree.remove_smart or
1510
# some such?
1511
if new:
1512
added = tree.changes_from(tree.basis_tree(),
1513
specific_files=file_list).added
1514
file_list = sorted([f[0] for f in added], reverse=True)
1515
if len(file_list) == 0:
1516
raise errors.BzrCommandError('No matching files.')
1517
elif file_list is None:
1518
# missing files show up in iter_changes(basis) as
1519
# versioned-with-no-kind.
1520
missing = []
1521
for change in tree.iter_changes(tree.basis_tree()):
1522
# Find paths in the working tree that have no kind:
1523
if change[1][1] is not None and change[6][1] is None:
1524
missing.append(change[1][1])
1525
file_list = sorted(missing, reverse=True)
1526
file_deletion_strategy = 'keep'
1527
tree.remove(file_list, verbose=verbose, to_file=self.outf,
1528
keep_files=file_deletion_strategy=='keep',
1529
force=file_deletion_strategy=='force')
1530
finally:
1531
tree.unlock()
1554
1532
1555
1533
1556
1534
class cmd_file_id(Command):
1557
__doc__ = """Print file_id of a particular file or directory.
1535
"""Print file_id of a particular file or directory.
1558
1536
1559
1537
The file_id is assigned when the file is first added and remains the
1560
1538
same through all revisions where the file exists, even when it is
1576
1554
1577
1555
1578
1556
class cmd_file_path(Command):
1579
__doc__ = """Print path of file_ids to a file or directory.
1557
"""Print path of file_ids to a file or directory.
1580
1558
1581
1559
This prints one line for each directory down to the target,
1582
1560
starting at the branch root.
1598
1576
1599
1577
1600
1578
class cmd_reconcile(Command):
1601
__doc__ = """Reconcile bzr metadata in a branch.
1579
"""Reconcile bzr metadata in a branch.
1602
1580
1603
1581
This can correct data mismatches that may have been caused by
1604
1582
previous ghost operations or bzr upgrades. You should only
1626
1604
1627
1605
1628
1606
class cmd_revision_history(Command):
1629
__doc__ = """Display the list of revision ids on a branch."""
1607
"""Display the list of revision ids on a branch."""
1630
1608
1631
1609
_see_also = ['log']
1632
1610
takes_args = ['location?']
1642
1620
1643
1621
1644
1622
class cmd_ancestry(Command):
1645
__doc__ = """List all revisions merged into this branch."""
1623
"""List all revisions merged into this branch."""
1646
1624
1647
1625
_see_also = ['log', 'revision-history']
1648
1626
takes_args = ['location?']
1667
1645
1668
1646
1669
1647
class cmd_init(Command):
1670
__doc__ = """Make a directory into a versioned branch.
1648
"""Make a directory into a versioned branch.
1671
1649
1672
1650
Use this to create an empty branch, or before importing an
1673
1651
existing project.
1776
1754
1777
1755
1778
1756
class cmd_init_repository(Command):
1779
__doc__ = """Create a shared repository for branches to share storage space.
1757
"""Create a shared repository for branches to share storage space.
1780
1758
1781
1759
New branches created under the repository directory will store their
1782
1760
revisions in the repository, not in the branch directory. For branches
1836
1814
1837
1815
1838
1816
class cmd_diff(Command):
1839
__doc__ = """Show differences in the working tree, between revisions or branches.
1817
"""Show differences in the working tree, between revisions or branches.
1840
1818
1841
1819
If no arguments are given, all changes for the current tree are listed.
1842
1820
If files are given, only the changes in those files are listed.
1928
1906
help='Use this command to compare files.',
1929
1907
type=unicode,
1930
1908
),
1931
RegistryOption('format',
1932
help='Diff format to use.',
1933
lazy_registry=('bzrlib.diff', 'format_registry'),
1934
value_switches=False, title='Diff format'),
1935
1909
]
1936
1910
aliases = ['di', 'dif']
1937
1911
encoding_type = 'exact'
1938
1912
1939
1913
@display_command
1940
1914
def run(self, revision=None, file_list=None, diff_options=None,
1941
prefix=None, old=None, new=None, using=None, format=None):
1942
from bzrlib.diff import (get_trees_and_branches_to_diff_locked,
1943
show_diff_trees)
1915
prefix=None, old=None, new=None, using=None):
1916
from bzrlib.diff import get_trees_and_branches_to_diff, show_diff_trees
1944
1917
1945
1918
if (prefix is None) or (prefix == '0'):
1946
1919
# diff -p0 format
1960
1933
raise errors.BzrCommandError('bzr diff --revision takes exactly'
1961
1934
' one or two revision specifiers')
1962
1935
1963
if using is not None and format is not None:
1964
raise errors.BzrCommandError('--using and --format are mutually '
1965
'exclusive.')
1966
1967
1936
(old_tree, new_tree,
1968
1937
old_branch, new_branch,
1969
specific_files, extra_trees) = get_trees_and_branches_to_diff_locked(
1970
file_list, revision, old, new, self.add_cleanup, apply_view=True)
1938
specific_files, extra_trees) = get_trees_and_branches_to_diff(
1939
file_list, revision, old, new, apply_view=True)
1971
1940
return show_diff_trees(old_tree, new_tree, sys.stdout,
1972
1941
specific_files=specific_files,
1973
1942
external_diff_options=diff_options,
1974
1943
old_label=old_label, new_label=new_label,
1975
extra_trees=extra_trees, using=using,
1976
format_cls=format)
1944
extra_trees=extra_trees, using=using)
1977
1945
1978
1946
1979
1947
class cmd_deleted(Command):
1980
__doc__ = """List files deleted in the working tree.
1948
"""List files deleted in the working tree.
1981
1949
"""
1982
1950
# TODO: Show files deleted since a previous revision, or
1983
1951
# between two revisions.
1986
1954
# level of effort but possibly much less IO. (Or possibly not,
1987
1955
# if the directories are very large...)
1988
1956
_see_also = ['status', 'ls']
1989
takes_options = ['directory', 'show-ids']
1957
takes_options = ['show-ids']
1990
1958
1991
1959
@display_command
1992
def run(self, show_ids=False, directory=u'.'):
1993
tree = WorkingTree.open_containing(directory)[0]
1994
self.add_cleanup(tree.lock_read().unlock)
1995
old = tree.basis_tree()
1996
self.add_cleanup(old.lock_read().unlock)
1997
for path, ie in old.inventory.iter_entries():
1998
if not tree.has_id(ie.file_id):
1999
self.outf.write(path)
2000
if show_ids:
2001
self.outf.write(' ')
2002
self.outf.write(ie.file_id)
2003
self.outf.write('\n')
1960
def run(self, show_ids=False):
1961
tree = WorkingTree.open_containing(u'.')[0]
1962
tree.lock_read()
1963
try:
1964
old = tree.basis_tree()
1965
old.lock_read()
1966
try:
1967
for path, ie in old.inventory.iter_entries():
1968
if not tree.has_id(ie.file_id):
1969
self.outf.write(path)
1970
if show_ids:
1971
self.outf.write(' ')
1972
self.outf.write(ie.file_id)
1973
self.outf.write('\n')
1974
finally:
1975
old.unlock()
1976
finally:
1977
tree.unlock()
2004
1978
2005
1979
2006
1980
class cmd_modified(Command):
2007
__doc__ = """List files modified in working tree.
1981
"""List files modified in working tree.
2008
1982
"""
2009
1983
2010
1984
hidden = True
2011
1985
_see_also = ['status', 'ls']
2012
takes_options = ['directory', 'null']
1986
takes_options = [
1987
Option('null',
1988
help='Write an ascii NUL (\\0) separator '
1989
'between files rather than a newline.')
1990
]
2013
1991
2014
1992
@display_command
2015
def run(self, null=False, directory=u'.'):
2016
tree = WorkingTree.open_containing(directory)[0]
1993
def run(self, null=False):
1994
tree = WorkingTree.open_containing(u'.')[0]
2017
1995
td = tree.changes_from(tree.basis_tree())
2018
1996
for path, id, kind, text_modified, meta_modified in td.modified:
2019
1997
if null:
2023
2001
2024
2002
2025
2003
class cmd_added(Command):
2026
__doc__ = """List files added in working tree.
2004
"""List files added in working tree.
2027
2005
"""
2028
2006
2029
2007
hidden = True
2030
2008
_see_also = ['status', 'ls']
2031
takes_options = ['directory', 'null']
2009
takes_options = [
2010
Option('null',
2011
help='Write an ascii NUL (\\0) separator '
2012
'between files rather than a newline.')
2013
]
2032
2014
2033
2015
@display_command
2034
def run(self, null=False, directory=u'.'):
2035
wt = WorkingTree.open_containing(directory)[0]
2036
self.add_cleanup(wt.lock_read().unlock)
2037
basis = wt.basis_tree()
2038
self.add_cleanup(basis.lock_read().unlock)
2039
basis_inv = basis.inventory
2040
inv = wt.inventory
2041
for file_id in inv:
2042
if file_id in basis_inv:
2043
continue
2044
if inv.is_root(file_id) and len(basis_inv) == 0:
2045
continue
2046
path = inv.id2path(file_id)
2047
if not os.access(osutils.pathjoin(wt.basedir, path), os.F_OK):
2048
continue
2049
if null:
2050
self.outf.write(path + '\0')
2051
else:
2052
self.outf.write(osutils.quotefn(path) + '\n')
2016
def run(self, null=False):
2017
wt = WorkingTree.open_containing(u'.')[0]
2018
wt.lock_read()
2019
try:
2020
basis = wt.basis_tree()
2021
basis.lock_read()
2022
try:
2023
basis_inv = basis.inventory
2024
inv = wt.inventory
2025
for file_id in inv:
2026
if file_id in basis_inv:
2027
continue
2028
if inv.is_root(file_id) and len(basis_inv) == 0:
2029
continue
2030
path = inv.id2path(file_id)
2031
if not os.access(osutils.abspath(path), os.F_OK):
2032
continue
2033
if null:
2034
self.outf.write(path + '\0')
2035
else:
2036
self.outf.write(osutils.quotefn(path) + '\n')
2037
finally:
2038
basis.unlock()
2039
finally:
2040
wt.unlock()
2053
2041
2054
2042
2055
2043
class cmd_root(Command):
2056
__doc__ = """Show the tree root directory.
2044
"""Show the tree root directory.
2057
2045
2058
2046
The root is the nearest enclosing directory with a .bzr control
2059
2047
directory."""
2083
2071
2084
2072
2085
2073
class cmd_log(Command):
2086
__doc__ = """Show historical log for a branch or subset of a branch.
2074
"""Show historical log for a branch or subset of a branch.
2087
2075
2088
2076
log is bzr's default tool for exploring the history of a branch.
2089
2077
The branch to use is taken from the first parameter. If no parameters
2200
2188
:Tips & tricks:
2201
2189
2202
2190
GUI tools and IDEs are often better at exploring history than command
2203
line tools: you may prefer qlog or viz from qbzr or bzr-gtk, the
2204
bzr-explorer shell, or the Loggerhead web interface. See the Plugin
2205
Guide <http://doc.bazaar.canonical.com/plugins/en/> and
2206
<http://wiki.bazaar.canonical.com/IDEIntegration>.
2191
line tools. You may prefer qlog or glog from the QBzr and Bzr-Gtk packages
2192
respectively for example. (TortoiseBzr uses qlog for displaying logs.) See
2193
http://bazaar-vcs.org/BzrPlugins and http://bazaar-vcs.org/IDEIntegration.
2194
2195
Web interfaces are often better at exploring history than command line
2196
tools, particularly for branches on servers. You may prefer Loggerhead
2197
or one of its alternatives. See http://bazaar-vcs.org/WebInterface.
2207
2198
2208
2199
You may find it useful to add the aliases below to ``bazaar.conf``::
2209
2200
2250
2241
help='Show just the specified revision.'
2251
2242
' See also "help revisionspec".'),
2252
2243
'log-format',
2253
RegistryOption('authors',
2254
'What names to list as authors - first, all or committer.',
2255
title='Authors',
2256
lazy_registry=('bzrlib.log', 'author_list_registry'),
2257
),
2258
2244
Option('levels',
2259
2245
short_name='n',
2260
2246
help='Number of levels to display - 0 for all, 1 for flat.',
2275
2261
help='Show changes made in each revision as a patch.'),
2276
2262
Option('include-merges',
2277
2263
help='Show merged revisions like --levels 0 does.'),
2278
Option('exclude-common-ancestry',
2279
help='Display only the revisions that are not part'
2280
' of both ancestries (require -rX..Y)'
2281
)
2282
2264
]
2283
2265
encoding_type = 'replace'
2284
2266
2294
2276
message=None,
2295
2277
limit=None,
2296
2278
show_diff=False,
2297
include_merges=False,
2298
authors=None,
2299
exclude_common_ancestry=False,
2300
):
2279
include_merges=False):
2301
2280
from bzrlib.log import (
2302
2281
Logger,
2303
2282
make_log_request_dict,
2304
2283
_get_info_for_log_files,
2305
2284
)
2306
2285
direction = (forward and 'forward') or 'reverse'
2307
if (exclude_common_ancestry
2308
and (revision is None or len(revision) != 2)):
2309
raise errors.BzrCommandError(
2310
'--exclude-common-ancestry requires -r with two revisions')
2311
2286
if include_merges:
2312
2287
if levels is None:
2313
2288
levels = 0
2326
2301
2327
2302
file_ids = []
2328
2303
filter_by_dir = False
2329
if file_list:
2330
# find the file ids to log and check for directory filtering
2331
b, file_info_list, rev1, rev2 = _get_info_for_log_files(
2332
revision, file_list, self.add_cleanup)
2333
for relpath, file_id, kind in file_info_list:
2334
if file_id is None:
2335
raise errors.BzrCommandError(
2336
"Path unknown at end or start of revision range: %s" %
2337
relpath)
2338
# If the relpath is the top of the tree, we log everything
2339
if relpath == '':
2340
file_ids = []
2341
break
2304
b = None
2305
try:
2306
if file_list:
2307
# find the file ids to log and check for directory filtering
2308
b, file_info_list, rev1, rev2 = _get_info_for_log_files(
2309
revision, file_list)
2310
for relpath, file_id, kind in file_info_list:
2311
if file_id is None:
2312
raise errors.BzrCommandError(
2313
"Path unknown at end or start of revision range: %s" %
2314
relpath)
2315
# If the relpath is the top of the tree, we log everything
2316
if relpath == '':
2317
file_ids = []
2318
break
2319
else:
2320
file_ids.append(file_id)
2321
filter_by_dir = filter_by_dir or (
2322
kind in ['directory', 'tree-reference'])
2323
else:
2324
# log everything
2325
# FIXME ? log the current subdir only RBC 20060203
2326
if revision is not None \
2327
and len(revision) > 0 and revision[0].get_branch():
2328
location = revision[0].get_branch()
2342
2329
else:
2343
file_ids.append(file_id)
2344
filter_by_dir = filter_by_dir or (
2345
kind in ['directory', 'tree-reference'])
2346
else:
2347
# log everything
2348
# FIXME ? log the current subdir only RBC 20060203
2349
if revision is not None \
2350
and len(revision) > 0 and revision[0].get_branch():
2351
location = revision[0].get_branch()
2352
else:
2353
location = '.'
2354
dir, relpath = bzrdir.BzrDir.open_containing(location)
2355
b = dir.open_branch()
2356
self.add_cleanup(b.lock_read().unlock)
2357
rev1, rev2 = _get_revision_range(revision, b, self.name())
2358
2359
# Decide on the type of delta & diff filtering to use
2360
# TODO: add an --all-files option to make this configurable & consistent
2361
if not verbose:
2362
delta_type = None
2363
else:
2364
delta_type = 'full'
2365
if not show_diff:
2366
diff_type = None
2367
elif file_ids:
2368
diff_type = 'partial'
2369
else:
2370
diff_type = 'full'
2371
2372
# Build the log formatter
2373
if log_format is None:
2374
log_format = log.log_formatter_registry.get_default(b)
2375
# Make a non-encoding output to include the diffs - bug 328007
2376
unencoded_output = ui.ui_factory.make_output_stream(encoding_type='exact')
2377
lf = log_format(show_ids=show_ids, to_file=self.outf,
2378
to_exact_file=unencoded_output,
2379
show_timezone=timezone,
2380
delta_format=get_verbosity_level(),
2381
levels=levels,
2382
show_advice=levels is None,
2383
author_list_handler=authors)
2384
2385
# Choose the algorithm for doing the logging. It's annoying
2386
# having multiple code paths like this but necessary until
2387
# the underlying repository format is faster at generating
2388
# deltas or can provide everything we need from the indices.
2389
# The default algorithm - match-using-deltas - works for
2390
# multiple files and directories and is faster for small
2391
# amounts of history (200 revisions say). However, it's too
2392
# slow for logging a single file in a repository with deep
2393
# history, i.e. > 10K revisions. In the spirit of "do no
2394
# evil when adding features", we continue to use the
2395
# original algorithm - per-file-graph - for the "single
2396
# file that isn't a directory without showing a delta" case.
2397
partial_history = revision and b.repository._format.supports_chks
2398
match_using_deltas = (len(file_ids) != 1 or filter_by_dir
2399
or delta_type or partial_history)
2400
2401
# Build the LogRequest and execute it
2402
if len(file_ids) == 0:
2403
file_ids = None
2404
rqst = make_log_request_dict(
2405
direction=direction, specific_fileids=file_ids,
2406
start_revision=rev1, end_revision=rev2, limit=limit,
2407
message_search=message, delta_type=delta_type,
2408
diff_type=diff_type, _match_using_deltas=match_using_deltas,
2409
exclude_common_ancestry=exclude_common_ancestry,
2410
)
2411
Logger(b, rqst).show(lf)
2330
location = '.'
2331
dir, relpath = bzrdir.BzrDir.open_containing(location)
2332
b = dir.open_branch()
2333
b.lock_read()
2334
rev1, rev2 = _get_revision_range(revision, b, self.name())
2335
2336
# Decide on the type of delta & diff filtering to use
2337
# TODO: add an --all-files option to make this configurable & consistent
2338
if not verbose:
2339
delta_type = None
2340
else:
2341
delta_type = 'full'
2342
if not show_diff:
2343
diff_type = None
2344
elif file_ids:
2345
diff_type = 'partial'
2346
else:
2347
diff_type = 'full'
2348
2349
# Build the log formatter
2350
if log_format is None:
2351
log_format = log.log_formatter_registry.get_default(b)
2352
lf = log_format(show_ids=show_ids, to_file=self.outf,
2353
show_timezone=timezone,
2354
delta_format=get_verbosity_level(),
2355
levels=levels,
2356
show_advice=levels is None)
2357
2358
# Choose the algorithm for doing the logging. It's annoying
2359
# having multiple code paths like this but necessary until
2360
# the underlying repository format is faster at generating
2361
# deltas or can provide everything we need from the indices.
2362
# The default algorithm - match-using-deltas - works for
2363
# multiple files and directories and is faster for small
2364
# amounts of history (200 revisions say). However, it's too
2365
# slow for logging a single file in a repository with deep
2366
# history, i.e. > 10K revisions. In the spirit of "do no
2367
# evil when adding features", we continue to use the
2368
# original algorithm - per-file-graph - for the "single
2369
# file that isn't a directory without showing a delta" case.
2370
partial_history = revision and b.repository._format.supports_chks
2371
match_using_deltas = (len(file_ids) != 1 or filter_by_dir
2372
or delta_type or partial_history)
2373
2374
# Build the LogRequest and execute it
2375
if len(file_ids) == 0:
2376
file_ids = None
2377
rqst = make_log_request_dict(
2378
direction=direction, specific_fileids=file_ids,
2379
start_revision=rev1, end_revision=rev2, limit=limit,
2380
message_search=message, delta_type=delta_type,
2381
diff_type=diff_type, _match_using_deltas=match_using_deltas)
2382
Logger(b, rqst).show(lf)
2383
finally:
2384
if b is not None:
2385
b.unlock()
2412
2386
2413
2387
2414
2388
def _get_revision_range(revisionspec_list, branch, command_name):
2432
2406
raise errors.BzrCommandError(
2433
2407
"bzr %s doesn't accept two revisions in different"
2434
2408
" branches." % command_name)
2435
if start_spec.spec is None:
2436
# Avoid loading all the history.
2437
rev1 = RevisionInfo(branch, None, None)
2438
else:
2439
rev1 = start_spec.in_history(branch)
2409
rev1 = start_spec.in_history(branch)
2440
2410
# Avoid loading all of history when we know a missing
2441
2411
# end of range means the last revision ...
2442
2412
if end_spec.spec is None:
2471
2441
2472
2442
2473
2443
class cmd_touching_revisions(Command):
2474
__doc__ = """Return revision-ids which affected a particular file.
2444
"""Return revision-ids which affected a particular file.
2475
2445
2476
2446
A more user-friendly interface is "bzr log FILE".
2477
2447
"""
2484
2454
tree, relpath = WorkingTree.open_containing(filename)
2485
2455
file_id = tree.path2id(relpath)
2486
2456
b = tree.branch
2487
self.add_cleanup(b.lock_read().unlock)
2488
touching_revs = log.find_touching_revisions(b, file_id)
2489
for revno, revision_id, what in touching_revs:
2490
self.outf.write("%6d %s\n" % (revno, what))
2457
b.lock_read()
2458
try:
2459
touching_revs = log.find_touching_revisions(b, file_id)
2460
for revno, revision_id, what in touching_revs:
2461
self.outf.write("%6d %s\n" % (revno, what))
2462
finally:
2463
b.unlock()
2491
2464
2492
2465
2493
2466
class cmd_ls(Command):
2494
__doc__ = """List files in a tree.
2467
"""List files in a tree.
2495
2468
"""
2496
2469
2497
2470
_see_also = ['status', 'cat']
2503
2476
help='Recurse into subdirectories.'),
2504
2477
Option('from-root',
2505
2478
help='Print paths relative to the root of the branch.'),
2506
Option('unknown', short_name='u',
2507
help='Print unknown files.'),
2479
Option('unknown', help='Print unknown files.'),
2508
2480
Option('versioned', help='Print versioned files.',
2509
2481
short_name='V'),
2510
Option('ignored', short_name='i',
2511
help='Print ignored files.'),
2512
Option('kind', short_name='k',
2482
Option('ignored', help='Print ignored files.'),
2483
Option('null',
2484
help='Write an ascii NUL (\\0) separator '
2485
'between files rather than a newline.'),
2486
Option('kind',
2513
2487
help='List entries of a particular kind: file, directory, symlink.',
2514
2488
type=unicode),
2515
'null',
2516
2489
'show-ids',
2517
'directory',
2518
2490
]
2519
2491
@display_command
2520
2492
def run(self, revision=None, verbose=False,
2521
2493
recursive=False, from_root=False,
2522
2494
unknown=False, versioned=False, ignored=False,
2523
null=False, kind=None, show_ids=False, path=None, directory=None):
2495
null=False, kind=None, show_ids=False, path=None):
2524
2496
2525
2497
if kind and kind not in ('file', 'directory', 'symlink'):
2526
2498
raise errors.BzrCommandError('invalid kind specified')
2538
2510
raise errors.BzrCommandError('cannot specify both --from-root'
2539
2511
' and PATH')
2540
2512
fs_path = path
2541
tree, branch, relpath = \
2542
_open_directory_or_containing_tree_or_branch(fs_path, directory)
2513
tree, branch, relpath = bzrdir.BzrDir.open_containing_tree_or_branch(
2514
fs_path)
2543
2515
2544
2516
# Calculate the prefix to use
2545
2517
prefix = None
2560
2532
view_str = views.view_display_str(view_files)
2561
2533
note("Ignoring files outside view. View is %s" % view_str)
2562
2534
2563
self.add_cleanup(tree.lock_read().unlock)
2564
for fp, fc, fkind, fid, entry in tree.list_files(include_root=False,
2565
from_dir=relpath, recursive=recursive):
2566
# Apply additional masking
2567
if not all and not selection[fc]:
2568
continue
2569
if kind is not None and fkind != kind:
2570
continue
2571
if apply_view:
2572
try:
2573
if relpath:
2574
fullpath = osutils.pathjoin(relpath, fp)
2575
else:
2576
fullpath = fp
2577
views.check_path_in_view(tree, fullpath)
2578
except errors.FileOutsideView:
2579
continue
2535
tree.lock_read()
2536
try:
2537
for fp, fc, fkind, fid, entry in tree.list_files(include_root=False,
2538
from_dir=relpath, recursive=recursive):
2539
# Apply additional masking
2540
if not all and not selection[fc]:
2541
continue
2542
if kind is not None and fkind != kind:
2543
continue
2544
if apply_view:
2545
try:
2546
if relpath:
2547
fullpath = osutils.pathjoin(relpath, fp)
2548
else:
2549
fullpath = fp
2550
views.check_path_in_view(tree, fullpath)
2551
except errors.FileOutsideView:
2552
continue
2580
2553
2581
# Output the entry
2582
if prefix:
2583
fp = osutils.pathjoin(prefix, fp)
2584
kindch = entry.kind_character()
2585
outstring = fp + kindch
2586
ui.ui_factory.clear_term()
2587
if verbose:
2588
outstring = '%-8s %s' % (fc, outstring)
2589
if show_ids and fid is not None:
2590
outstring = "%-50s %s" % (outstring, fid)
2591
self.outf.write(outstring + '\n')
2592
elif null:
2593
self.outf.write(fp + '\0')
2594
if show_ids:
2595
if fid is not None:
2596
self.outf.write(fid)
2597
self.outf.write('\0')
2598
self.outf.flush()
2599
else:
2600
if show_ids:
2601
if fid is not None:
2602
my_id = fid
2603
else:
2604
my_id = ''
2605
self.outf.write('%-50s %s\n' % (outstring, my_id))
2606
else:
2554
# Output the entry
2555
if prefix:
2556
fp = osutils.pathjoin(prefix, fp)
2557
kindch = entry.kind_character()
2558
outstring = fp + kindch
2559
ui.ui_factory.clear_term()
2560
if verbose:
2561
outstring = '%-8s %s' % (fc, outstring)
2562
if show_ids and fid is not None:
2563
outstring = "%-50s %s" % (outstring, fid)
2607
2564
self.outf.write(outstring + '\n')
2565
elif null:
2566
self.outf.write(fp + '\0')
2567
if show_ids:
2568
if fid is not None:
2569
self.outf.write(fid)
2570
self.outf.write('\0')
2571
self.outf.flush()
2572
else:
2573
if show_ids:
2574
if fid is not None:
2575
my_id = fid
2576
else:
2577
my_id = ''
2578
self.outf.write('%-50s %s\n' % (outstring, my_id))
2579
else:
2580
self.outf.write(outstring + '\n')
2581
finally:
2582
tree.unlock()
2608
2583
2609
2584
2610
2585
class cmd_unknowns(Command):
2611
__doc__ = """List unknown files.
2586
"""List unknown files.
2612
2587
"""
2613
2588
2614
2589
hidden = True
2615
2590
_see_also = ['ls']
2616
takes_options = ['directory']
2617
2591
2618
2592
@display_command
2619
def run(self, directory=u'.'):
2620
for f in WorkingTree.open_containing(directory)[0].unknowns():
2593
def run(self):
2594
for f in WorkingTree.open_containing(u'.')[0].unknowns():
2621
2595
self.outf.write(osutils.quotefn(f) + '\n')
2622
2596
2623
2597
2624
2598
class cmd_ignore(Command):
2625
__doc__ = """Ignore specified files or patterns.
2599
"""Ignore specified files or patterns.
2626
2600
2627
2601
See ``bzr help patterns`` for details on the syntax of patterns.
2628
2602
2636
2610
After adding, editing or deleting that file either indirectly by
2637
2611
using this command or directly by using an editor, be sure to commit
2638
2612
it.
2639
2640
Bazaar also supports a global ignore file ~/.bazaar/ignore. On Windows
2641
the global ignore file can be found in the application data directory as
2642
C:\\Documents and Settings\\<user>\\Application Data\\Bazaar\\2.0\\ignore.
2643
Global ignores are not touched by this command. The global ignore file
2644
can be edited directly using an editor.
2645
2646
Patterns prefixed with '!' are exceptions to ignore patterns and take
2647
precedence over regular ignores. Such exceptions are used to specify
2648
files that should be versioned which would otherwise be ignored.
2649
2650
Patterns prefixed with '!!' act as regular ignore patterns, but have
2651
precedence over the '!' exception patterns.
2652
2613
2653
2614
Note: ignore patterns containing shell wildcards must be quoted from
2654
2615
the shell on Unix.
2658
2619
2659
2620
bzr ignore ./Makefile
2660
2621
2661
Ignore .class files in all directories...::
2622
Ignore class files in all directories::
2662
2623
2663
2624
bzr ignore "*.class"
2664
2625
2665
...but do not ignore "special.class"::
2666
2667
bzr ignore "!special.class"
2668
2669
2626
Ignore .o files under the lib directory::
2670
2627
2671
2628
bzr ignore "lib/**/*.o"
2677
2634
Ignore everything but the "debian" toplevel directory::
2678
2635
2679
2636
bzr ignore "RE:(?!debian/).*"
2680
2681
Ignore everything except the "local" toplevel directory,
2682
but always ignore "*~" autosave files, even under local/::
2683
2684
bzr ignore "*"
2685
bzr ignore "!./local"
2686
bzr ignore "!!*~"
2687
2637
"""
2688
2638
2689
2639
_see_also = ['status', 'ignored', 'patterns']
2690
2640
takes_args = ['name_pattern*']
2691
takes_options = ['directory',
2692
Option('default-rules',
2693
help='Display the default ignore rules that bzr uses.')
2641
takes_options = [
2642
Option('old-default-rules',
2643
help='Write out the ignore rules bzr < 0.9 always used.')
2694
2644
]
2695
2645
2696
def run(self, name_pattern_list=None, default_rules=None,
2697
directory=u'.'):
2646
def run(self, name_pattern_list=None, old_default_rules=None):
2698
2647
from bzrlib import ignores
2699
if default_rules is not None:
2700
# dump the default rules and exit
2701
for pattern in ignores.USER_DEFAULTS:
2702
self.outf.write("%s\n" % pattern)
2648
if old_default_rules is not None:
2649
# dump the rules and exit
2650
for pattern in ignores.OLD_DEFAULTS:
2651
print pattern
2703
2652
return
2704
2653
if not name_pattern_list:
2705
2654
raise errors.BzrCommandError("ignore requires at least one "
2706
"NAME_PATTERN or --default-rules.")
2655
"NAME_PATTERN or --old-default-rules")
2707
2656
name_pattern_list = [globbing.normalize_pattern(p)
2708
2657
for p in name_pattern_list]
2709
2658
for name_pattern in name_pattern_list:
2711
2660
(len(name_pattern) > 1 and name_pattern[1] == ':')):
2712
2661
raise errors.BzrCommandError(
2713
2662
"NAME_PATTERN should not be an absolute path")
2714
tree, relpath = WorkingTree.open_containing(directory)
2663
tree, relpath = WorkingTree.open_containing(u'.')
2715
2664
ignores.tree_ignores_add_patterns(tree, name_pattern_list)
2716
2665
ignored = globbing.Globster(name_pattern_list)
2717
2666
matches = []
2721
2670
if id is not None:
2722
2671
filename = entry[0]
2723
2672
if ignored.match(filename):
2724
matches.append(filename)
2673
matches.append(filename.encode('utf-8'))
2725
2674
tree.unlock()
2726
2675
if len(matches) > 0:
2727
self.outf.write("Warning: the following files are version controlled and"
2728
" match your ignore pattern:\n%s"
2729
"\nThese files will continue to be version controlled"
2730
" unless you 'bzr remove' them.\n" % ("\n".join(matches),))
2676
print "Warning: the following files are version controlled and" \
2677
" match your ignore pattern:\n%s" \
2678
"\nThese files will continue to be version controlled" \
2679
" unless you 'bzr remove' them." % ("\n".join(matches),)
2731
2680
2732
2681
2733
2682
class cmd_ignored(Command):
2734
__doc__ = """List ignored files and the patterns that matched them.
2683
"""List ignored files and the patterns that matched them.
2735
2684
2736
2685
List all the ignored files and the ignore pattern that caused the file to
2737
2686
be ignored.
2743
2692
2744
2693
encoding_type = 'replace'
2745
2694
_see_also = ['ignore', 'ls']
2746
takes_options = ['directory']
2747
2695
2748
2696
@display_command
2749
def run(self, directory=u'.'):
2750
tree = WorkingTree.open_containing(directory)[0]
2751
self.add_cleanup(tree.lock_read().unlock)
2752
for path, file_class, kind, file_id, entry in tree.list_files():
2753
if file_class != 'I':
2754
continue
2755
## XXX: Slightly inefficient since this was already calculated
2756
pat = tree.is_ignored(path)
2757
self.outf.write('%-50s %s\n' % (path, pat))
2697
def run(self):
2698
tree = WorkingTree.open_containing(u'.')[0]
2699
tree.lock_read()
2700
try:
2701
for path, file_class, kind, file_id, entry in tree.list_files():
2702
if file_class != 'I':
2703
continue
2704
## XXX: Slightly inefficient since this was already calculated
2705
pat = tree.is_ignored(path)
2706
self.outf.write('%-50s %s\n' % (path, pat))
2707
finally:
2708
tree.unlock()
2758
2709
2759
2710
2760
2711
class cmd_lookup_revision(Command):
2761
__doc__ = """Lookup the revision-id from a revision-number
2712
"""Lookup the revision-id from a revision-number
2762
2713
2763
2714
:Examples:
2764
2715
bzr lookup-revision 33
2765
2716
"""
2766
2717
hidden = True
2767
2718
takes_args = ['revno']
2768
takes_options = ['directory']
2769
2719
2770
2720
@display_command
2771
def run(self, revno, directory=u'.'):
2721
def run(self, revno):
2772
2722
try:
2773
2723
revno = int(revno)
2774
2724
except ValueError:
2775
raise errors.BzrCommandError("not a valid revision-number: %r"
2776
% revno)
2777
revid = WorkingTree.open_containing(directory)[0].branch.get_rev_id(revno)
2778
self.outf.write("%s\n" % revid)
2725
raise errors.BzrCommandError("not a valid revision-number: %r" % revno)
2726
2727
print WorkingTree.open_containing(u'.')[0].branch.get_rev_id(revno)
2779
2728
2780
2729
2781
2730
class cmd_export(Command):
2782
__doc__ = """Export current or past revision to a destination directory or archive.
2731
"""Export current or past revision to a destination directory or archive.
2783
2732
2784
2733
If no revision is specified this exports the last committed revision.
2785
2734
2807
2756
================= =========================
2808
2757
"""
2809
2758
takes_args = ['dest', 'branch_or_subdir?']
2810
takes_options = ['directory',
2759
takes_options = [
2811
2760
Option('format',
2812
2761
help="Type of file to export to.",
2813
2762
type=unicode),
2817
2766
Option('root',
2818
2767
type=str,
2819
2768
help="Name of the root directory inside the exported file."),
2820
Option('per-file-timestamps',
2821
help='Set modification time of files to that of the last '
2822
'revision in which it was changed.'),
2823
2769
]
2824
2770
def run(self, dest, branch_or_subdir=None, revision=None, format=None,
2825
root=None, filters=False, per_file_timestamps=False, directory=u'.'):
2771
root=None, filters=False):
2826
2772
from bzrlib.export import export
2827
2773
2828
2774
if branch_or_subdir is None:
2829
tree = WorkingTree.open_containing(directory)[0]
2775
tree = WorkingTree.open_containing(u'.')[0]
2830
2776
b = tree.branch
2831
2777
subdir = None
2832
2778
else:
2835
2781
2836
2782
rev_tree = _get_one_revision_tree('export', revision, branch=b, tree=tree)
2837
2783
try:
2838
export(rev_tree, dest, format, root, subdir, filtered=filters,
2839
per_file_timestamps=per_file_timestamps)
2784
export(rev_tree, dest, format, root, subdir, filtered=filters)
2840
2785
except errors.NoSuchExportFormat, e:
2841
2786
raise errors.BzrCommandError('Unsupported export format: %s' % e.format)
2842
2787
2843
2788
2844
2789
class cmd_cat(Command):
2845
__doc__ = """Write the contents of a file as of a given revision to standard output.
2790
"""Write the contents of a file as of a given revision to standard output.
2846
2791
2847
2792
If no revision is nominated, the last revision is used.
2848
2793
2851
2796
"""
2852
2797
2853
2798
_see_also = ['ls']
2854
takes_options = ['directory',
2799
takes_options = [
2855
2800
Option('name-from-revision', help='The path name in the old tree.'),
2856
2801
Option('filters', help='Apply content filters to display the '
2857
2802
'convenience form.'),
2862
2807
2863
2808
@display_command
2864
2809
def run(self, filename, revision=None, name_from_revision=False,
2865
filters=False, directory=None):
2810
filters=False):
2866
2811
if revision is not None and len(revision) != 1:
2867
2812
raise errors.BzrCommandError("bzr cat --revision takes exactly"
2868
2813
" one revision specifier")
2869
2814
tree, branch, relpath = \
2870
_open_directory_or_containing_tree_or_branch(filename, directory)
2871
self.add_cleanup(branch.lock_read().unlock)
2872
return self._run(tree, branch, relpath, filename, revision,
2873
name_from_revision, filters)
2815
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
2816
branch.lock_read()
2817
try:
2818
return self._run(tree, branch, relpath, filename, revision,
2819
name_from_revision, filters)
2820
finally:
2821
branch.unlock()
2874
2822
2875
2823
def _run(self, tree, b, relpath, filename, revision, name_from_revision,
2876
2824
filtered):
2877
2825
if tree is None:
2878
2826
tree = b.basis_tree()
2879
2827
rev_tree = _get_one_revision_tree('cat', revision, branch=b)
2880
self.add_cleanup(rev_tree.lock_read().unlock)
2881
2828
2882
2829
old_file_id = rev_tree.path2id(relpath)
2883
2830
2918
2865
chunks = content.splitlines(True)
2919
2866
content = filtered_output_bytes(chunks, filters,
2920
2867
ContentFilterContext(relpath, rev_tree))
2921
self.cleanup_now()
2922
2868
self.outf.writelines(content)
2923
2869
else:
2924
self.cleanup_now()
2925
2870
self.outf.write(content)
2926
2871
2927
2872
2928
2873
class cmd_local_time_offset(Command):
2929
__doc__ = """Show the offset in seconds from GMT to local time."""
2874
"""Show the offset in seconds from GMT to local time."""
2930
2875
hidden = True
2931
2876
@display_command
2932
2877
def run(self):
2933
self.outf.write("%s\n" % osutils.local_time_offset())
2878
print osutils.local_time_offset()
2934
2879
2935
2880
2936
2881
2937
2882
class cmd_commit(Command):
2938
__doc__ = """Commit changes into a new revision.
2883
"""Commit changes into a new revision.
2939
2884
2940
2885
An explanatory message needs to be given for each commit. This is
2941
2886
often done by using the --message option (getting the message from the
3049
2994
"the master branch until a normal commit "
3050
2995
"is performed."
3051
2996
),
3052
Option('show-diff', short_name='p',
2997
Option('show-diff',
3053
2998
help='When no message is supplied, show the diff along'
3054
2999
' with the status summary in the message editor.'),
3055
3000
]
3122
3067
raise errors.LocalRequiresBoundBranch()
3123
3068
3124
3069
if message is not None:
3125
try:
3126
file_exists = osutils.lexists(message)
3127
except UnicodeError:
3128
# The commit message contains unicode characters that can't be
3129
# represented in the filesystem encoding, so that can't be a
3130
# file.
3131
file_exists = False
3132
if file_exists:
3133
warning_msg = (
3134
'The commit message is a file name: "%(f)s".\n'
3135
'(use --file "%(f)s" to take commit message from that file)'
3136
% { 'f': message })
3070
if osutils.lexists(message):
3071
warning_msg = ("The commit message is a file"
3072
" name: \"%(filename)s\".\n"
3073
"(use --file \"%(filename)s\" to take commit message from"
3074
" that file)" % { 'filename': message })
3137
3075
ui.ui_factory.show_warning(warning_msg)
3138
if '\r' in message:
3139
message = message.replace('\r\n', '\n')
3140
message = message.replace('\r', '\n')
3141
if file:
3142
raise errors.BzrCommandError(
3143
"please specify either --message or --file")
3144
3076
3145
3077
def get_message(commit_obj):
3146
3078
"""Callback to get commit message"""
3147
if file:
3148
f = codecs.open(file, 'rt', osutils.get_user_encoding())
3149
try:
3150
my_message = f.read()
3151
finally:
3152
f.close()
3153
elif message is not None:
3154
my_message = message
3155
else:
3156
# No message supplied: make one up.
3157
# text is the status of the tree
3158
text = make_commit_message_template_encoded(tree,
3079
my_message = message
3080
if my_message is not None and '\r' in my_message:
3081
my_message = my_message.replace('\r\n', '\n')
3082
my_message = my_message.replace('\r', '\n')
3083
if my_message is None and not file:
3084
t = make_commit_message_template_encoded(tree,
3159
3085
selected_list, diff=show_diff,
3160
3086
output_encoding=osutils.get_user_encoding())
3161
# start_message is the template generated from hooks
3162
# XXX: Warning - looks like hooks return unicode,
3163
# make_commit_message_template_encoded returns user encoding.
3164
# We probably want to be using edit_commit_message instead to
3165
# avoid this.
3166
3087
start_message = generate_commit_message_template(commit_obj)
3167
my_message = edit_commit_message_encoded(text,
3088
my_message = edit_commit_message_encoded(t,
3168
3089
start_message=start_message)
3169
3090
if my_message is None:
3170
3091
raise errors.BzrCommandError("please specify a commit"
3171
3092
" message with either --message or --file")
3093
elif my_message and file:
3094
raise errors.BzrCommandError(
3095
"please specify either --message or --file")
3096
if file:
3097
my_message = codecs.open(file, 'rt',
3098
osutils.get_user_encoding()).read()
3172
3099
if my_message == "":
3173
3100
raise errors.BzrCommandError("empty commit message specified")
3174
3101
return my_message
3186
3113
timezone=offset,
3187
3114
exclude=safe_relpath_files(tree, exclude))
3188
3115
except PointlessCommit:
3116
# FIXME: This should really happen before the file is read in;
3117
# perhaps prepare the commit; get the message; then actually commit
3189
3118
raise errors.BzrCommandError("No changes to commit."
3190
3119
" Use --unchanged to commit anyhow.")
3191
3120
except ConflictsInTree:
3196
3125
raise errors.BzrCommandError("Commit refused because there are"
3197
3126
" unknown files in the working tree.")
3198
3127
except errors.BoundBranchOutOfDate, e:
3199
e.extra_help = ("\n"
3200
'To commit to master branch, run update and then commit.\n'
3201
'You can also pass --local to commit to continue working '
3202
'disconnected.')
3203
raise
3128
raise errors.BzrCommandError(str(e) + "\n"
3129
'To commit to master branch, run update and then commit.\n'
3130
'You can also pass --local to commit to continue working '
3131
'disconnected.')
3204
3132
3205
3133
3206
3134
class cmd_check(Command):
3207
__doc__ = """Validate working tree structure, branch consistency and repository history.
3135
"""Validate working tree structure, branch consistency and repository history.
3208
3136
3209
3137
This command checks various invariants about branch and repository storage
3210
3138
to detect data corruption or bzr bugs.
3274
3202
3275
3203
3276
3204
class cmd_upgrade(Command):
3277
__doc__ = """Upgrade branch storage to current format.
3205
"""Upgrade branch storage to current format.
3278
3206
3279
3207
The check command or bzr developers may sometimes advise you to run
3280
3208
this command. When the default format has changed you may also be warned
3298
3226
3299
3227
3300
3228
class cmd_whoami(Command):
3301
__doc__ = """Show or set bzr user id.
3229
"""Show or set bzr user id.
3302
3230
3303
3231
:Examples:
3304
3232
Show the email of the current user::
3348
3276
3349
3277
3350
3278
class cmd_nick(Command):
3351
__doc__ = """Print or set the branch nickname.
3279
"""Print or set the branch nickname.
3352
3280
3353
3281
If unset, the tree root directory name is used as the nickname.
3354
3282
To print the current nickname, execute with no argument.
3359
3287
3360
3288
_see_also = ['info']
3361
3289
takes_args = ['nickname?']
3362
takes_options = ['directory']
3363
def run(self, nickname=None, directory=u'.'):
3364
branch = Branch.open_containing(directory)[0]
3290
def run(self, nickname=None):
3291
branch = Branch.open_containing(u'.')[0]
3365
3292
if nickname is None:
3366
3293
self.printme(branch)
3367
3294
else:
3369
3296
3370
3297
@display_command
3371
3298
def printme(self, branch):
3372
self.outf.write('%s\n' % branch.nick)
3299
print branch.nick
3373
3300
3374
3301
3375
3302
class cmd_alias(Command):
3376
__doc__ = """Set/unset and display aliases.
3303
"""Set/unset and display aliases.
3377
3304
3378
3305
:Examples:
3379
3306
Show the current aliases::
3443
3370
3444
3371
3445
3372
class cmd_selftest(Command):
3446
__doc__ = """Run internal test suite.
3373
"""Run internal test suite.
3447
3374
3448
3375
If arguments are given, they are regular expressions that say which tests
3449
3376
should run. Tests matching any expression are run, and other tests are
3493
3420
def get_transport_type(typestring):
3494
3421
"""Parse and return a transport specifier."""
3495
3422
if typestring == "sftp":
3496
from bzrlib.tests import stub_sftp
3497
return stub_sftp.SFTPAbsoluteServer
3423
from bzrlib.transport.sftp import SFTPAbsoluteServer
3424
return SFTPAbsoluteServer
3498
3425
if typestring == "memory":
3499
from bzrlib.tests import test_server
3500
return memory.MemoryServer
3426
from bzrlib.transport.memory import MemoryServer
3427
return MemoryServer
3501
3428
if typestring == "fakenfs":
3502
from bzrlib.tests import test_server
3503
return test_server.FakeNFSServer
3429
from bzrlib.transport.fakenfs import FakeNFSServer
3430
return FakeNFSServer
3504
3431
msg = "No known transport type %s. Supported types are: sftp\n" %\
3505
3432
(typestring)
3506
3433
raise errors.BzrCommandError(msg)
3590
3517
raise errors.BzrCommandError("subunit not available. subunit "
3591
3518
"needs to be installed to use --subunit.")
3592
3519
self.additional_selftest_args['runner_class'] = SubUnitBzrRunner
3593
# On Windows, disable automatic conversion of '\n' to '\r\n' in
3594
# stdout, which would corrupt the subunit stream.
3595
# FIXME: This has been fixed in subunit trunk (>0.0.5) so the
3596
# following code can be deleted when it's sufficiently deployed
3597
# -- vila/mgz 20100514
3598
if (sys.platform == "win32"
3599
and getattr(sys.stdout, 'fileno', None) is not None):
3600
import msvcrt
3601
msvcrt.setmode(sys.stdout.fileno(), os.O_BINARY)
3602
3520
if parallel:
3603
3521
self.additional_selftest_args.setdefault(
3604
3522
'suite_decorators', []).append(parallel)
3608
3526
verbose = not is_quiet()
3609
3527
# TODO: should possibly lock the history file...
3610
3528
benchfile = open(".perf_history", "at", buffering=1)
3611
self.add_cleanup(benchfile.close)
3612
3529
else:
3613
3530
test_suite_factory = None
3614
3531
benchfile = None
3615
selftest_kwargs = {"verbose": verbose,
3616
"pattern": pattern,
3617
"stop_on_failure": one,
3618
"transport": transport,
3619
"test_suite_factory": test_suite_factory,
3620
"lsprof_timed": lsprof_timed,
3621
"lsprof_tests": lsprof_tests,
3622
"bench_history": benchfile,
3623
"matching_tests_first": first,
3624
"list_only": list_only,
3625
"random_seed": randomize,
3626
"exclude_pattern": exclude,
3627
"strict": strict,
3628
"load_list": load_list,
3629
"debug_flags": debugflag,
3630
"starting_with": starting_with
3631
}
3632
selftest_kwargs.update(self.additional_selftest_args)
3633
result = selftest(**selftest_kwargs)
3532
try:
3533
selftest_kwargs = {"verbose": verbose,
3534
"pattern": pattern,
3535
"stop_on_failure": one,
3536
"transport": transport,
3537
"test_suite_factory": test_suite_factory,
3538
"lsprof_timed": lsprof_timed,
3539
"lsprof_tests": lsprof_tests,
3540
"bench_history": benchfile,
3541
"matching_tests_first": first,
3542
"list_only": list_only,
3543
"random_seed": randomize,
3544
"exclude_pattern": exclude,
3545
"strict": strict,
3546
"load_list": load_list,
3547
"debug_flags": debugflag,
3548
"starting_with": starting_with
3549
}
3550
selftest_kwargs.update(self.additional_selftest_args)
3551
result = selftest(**selftest_kwargs)
3552
finally:
3553
if benchfile is not None:
3554
benchfile.close()
3634
3555
return int(not result)
3635
3556
3636
3557
3637
3558
class cmd_version(Command):
3638
__doc__ = """Show version of bzr."""
3559
"""Show version of bzr."""
3639
3560
3640
3561
encoding_type = 'replace'
3641
3562
takes_options = [
3652
3573
3653
3574
3654
3575
class cmd_rocks(Command):
3655
__doc__ = """Statement of optimism."""
3576
"""Statement of optimism."""
3656
3577
3657
3578
hidden = True
3658
3579
3659
3580
@display_command
3660
3581
def run(self):
3661
self.outf.write("It sure does!\n")
3582
print "It sure does!"
3662
3583
3663
3584
3664
3585
class cmd_find_merge_base(Command):
3665
__doc__ = """Find and print a base revision for merging two branches."""
3586
"""Find and print a base revision for merging two branches."""
3666
3587
# TODO: Options to specify revisions on either side, as if
3667
3588
# merging only part of the history.
3668
3589
takes_args = ['branch', 'other']
3674
3595
3675
3596
branch1 = Branch.open_containing(branch)[0]
3676
3597
branch2 = Branch.open_containing(other)[0]
3677
self.add_cleanup(branch1.lock_read().unlock)
3678
self.add_cleanup(branch2.lock_read().unlock)
3679
last1 = ensure_null(branch1.last_revision())
3680
last2 = ensure_null(branch2.last_revision())
3681
3682
graph = branch1.repository.get_graph(branch2.repository)
3683
base_rev_id = graph.find_unique_lca(last1, last2)
3684
3685
self.outf.write('merge base is revision %s\n' % base_rev_id)
3598
branch1.lock_read()
3599
try:
3600
branch2.lock_read()
3601
try:
3602
last1 = ensure_null(branch1.last_revision())
3603
last2 = ensure_null(branch2.last_revision())
3604
3605
graph = branch1.repository.get_graph(branch2.repository)
3606
base_rev_id = graph.find_unique_lca(last1, last2)
3607
3608
print 'merge base is revision %s' % base_rev_id
3609
finally:
3610
branch2.unlock()
3611
finally:
3612
branch1.unlock()
3686
3613
3687
3614
3688
3615
class cmd_merge(Command):
3689
__doc__ = """Perform a three-way merge.
3616
"""Perform a three-way merge.
3690
3617
3691
3618
The source of the merge can be specified either in the form of a branch,
3692
3619
or in the form of a path to a file containing a merge directive generated
3721
3648
committed to record the result of the merge.
3722
3649
3723
3650
merge refuses to run if there are any uncommitted changes, unless
3724
--force is given. The --force option can also be used to create a
3725
merge revision which has more than two parents.
3726
3727
If one would like to merge changes from the working tree of the other
3728
branch without merging any committed revisions, the --uncommitted option
3729
can be given.
3651
--force is given.
3730
3652
3731
3653
To select only some changes to merge, use "merge -i", which will prompt
3732
3654
you to apply each diff hunk and file change, similar to "shelve".
3747
3669
To apply a merge directive contained in /tmp/merge::
3748
3670
3749
3671
bzr merge /tmp/merge
3750
3751
To create a merge revision with three parents from two branches
3752
feature1a and feature1b:
3753
3754
bzr merge ../feature1a
3755
bzr merge ../feature1b --force
3756
bzr commit -m 'revision with three parents'
3757
3672
"""
3758
3673
3759
3674
encoding_type = 'exact'
3775
3690
' completely merged into the source, pull from the'
3776
3691
' source rather than merging. When this happens,'
3777
3692
' you do not need to commit the result.'),
3778
custom_help('directory',
3693
Option('directory',
3779
3694
help='Branch to merge into, '
3780
'rather than the one containing the working directory.'),
3695
'rather than the one containing the working directory.',
3696
short_name='d',
3697
type=unicode,
3698
),
3781
3699
Option('preview', help='Instead of merging, show a diff of the'
3782
3700
' merge.'),
3783
3701
Option('interactive', help='Select changes interactively.',
3814
3732
view_info = _get_view_info_for_change_reporter(tree)
3815
3733
change_reporter = delta._ChangeReporter(
3816
3734
unversioned_filter=tree.is_ignored, view_info=view_info)
3817
pb = ui.ui_factory.nested_progress_bar()
3818
self.add_cleanup(pb.finished)
3819
self.add_cleanup(tree.lock_write().unlock)
3820
if location is not None:
3821
try:
3822
mergeable = bundle.read_mergeable_from_url(location,
3823
possible_transports=possible_transports)
3824
except errors.NotABundle:
3825
mergeable = None
3735
cleanups = []
3736
try:
3737
pb = ui.ui_factory.nested_progress_bar()
3738
cleanups.append(pb.finished)
3739
tree.lock_write()
3740
cleanups.append(tree.unlock)
3741
if location is not None:
3742
try:
3743
mergeable = bundle.read_mergeable_from_url(location,
3744
possible_transports=possible_transports)
3745
except errors.NotABundle:
3746
mergeable = None
3747
else:
3748
if uncommitted:
3749
raise errors.BzrCommandError('Cannot use --uncommitted'
3750
' with bundles or merge directives.')
3751
3752
if revision is not None:
3753
raise errors.BzrCommandError(
3754
'Cannot use -r with merge directives or bundles')
3755
merger, verified = _mod_merge.Merger.from_mergeable(tree,
3756
mergeable, pb)
3757
3758
if merger is None and uncommitted:
3759
if revision is not None and len(revision) > 0:
3760
raise errors.BzrCommandError('Cannot use --uncommitted and'
3761
' --revision at the same time.')
3762
merger = self.get_merger_from_uncommitted(tree, location, pb,
3763
cleanups)
3764
allow_pending = False
3765
3766
if merger is None:
3767
merger, allow_pending = self._get_merger_from_branch(tree,
3768
location, revision, remember, possible_transports, pb)
3769
3770
merger.merge_type = merge_type
3771
merger.reprocess = reprocess
3772
merger.show_base = show_base
3773
self.sanity_check_merger(merger)
3774
if (merger.base_rev_id == merger.other_rev_id and
3775
merger.other_rev_id is not None):
3776
note('Nothing to do.')
3777
return 0
3778
if pull:
3779
if merger.interesting_files is not None:
3780
raise errors.BzrCommandError('Cannot pull individual files')
3781
if (merger.base_rev_id == tree.last_revision()):
3782
result = tree.pull(merger.other_branch, False,
3783
merger.other_rev_id)
3784
result.report(self.outf)
3785
return 0
3786
if merger.this_basis is None:
3787
raise errors.BzrCommandError(
3788
"This branch has no commits."
3789
" (perhaps you would prefer 'bzr pull')")
3790
if preview:
3791
return self._do_preview(merger, cleanups)
3792
elif interactive:
3793
return self._do_interactive(merger, cleanups)
3826
3794
else:
3827
if uncommitted:
3828
raise errors.BzrCommandError('Cannot use --uncommitted'
3829
' with bundles or merge directives.')
3830
3831
if revision is not None:
3832
raise errors.BzrCommandError(
3833
'Cannot use -r with merge directives or bundles')
3834
merger, verified = _mod_merge.Merger.from_mergeable(tree,
3835
mergeable, None)
3836
3837
if merger is None and uncommitted:
3838
if revision is not None and len(revision) > 0:
3839
raise errors.BzrCommandError('Cannot use --uncommitted and'
3840
' --revision at the same time.')
3841
merger = self.get_merger_from_uncommitted(tree, location, None)
3842
allow_pending = False
3843
3844
if merger is None:
3845
merger, allow_pending = self._get_merger_from_branch(tree,
3846
location, revision, remember, possible_transports, None)
3847
3848
merger.merge_type = merge_type
3849
merger.reprocess = reprocess
3850
merger.show_base = show_base
3851
self.sanity_check_merger(merger)
3852
if (merger.base_rev_id == merger.other_rev_id and
3853
merger.other_rev_id is not None):
3854
note('Nothing to do.')
3855
return 0
3856
if pull:
3857
if merger.interesting_files is not None:
3858
raise errors.BzrCommandError('Cannot pull individual files')
3859
if (merger.base_rev_id == tree.last_revision()):
3860
result = tree.pull(merger.other_branch, False,
3861
merger.other_rev_id)
3862
result.report(self.outf)
3863
return 0
3864
if merger.this_basis is None:
3865
raise errors.BzrCommandError(
3866
"This branch has no commits."
3867
" (perhaps you would prefer 'bzr pull')")
3868
if preview:
3869
return self._do_preview(merger)
3870
elif interactive:
3871
return self._do_interactive(merger)
3872
else:
3873
return self._do_merge(merger, change_reporter, allow_pending,
3874
verified)
3875
3876
def _get_preview(self, merger):
3795
return self._do_merge(merger, change_reporter, allow_pending,
3796
verified)
3797
finally:
3798
for cleanup in reversed(cleanups):
3799
cleanup()
3800
3801
def _get_preview(self, merger, cleanups):
3877
3802
tree_merger = merger.make_merger()
3878
3803
tt = tree_merger.make_preview_transform()
3879
self.add_cleanup(tt.finalize)
3804
cleanups.append(tt.finalize)
3880
3805
result_tree = tt.get_preview_tree()
3881
3806
return result_tree
3882
3807
3883
def _do_preview(self, merger):
3808
def _do_preview(self, merger, cleanups):
3884
3809
from bzrlib.diff import show_diff_trees
3885
result_tree = self._get_preview(merger)
3810
result_tree = self._get_preview(merger, cleanups)
3886
3811
show_diff_trees(merger.this_tree, result_tree, self.outf,
3887
3812
old_label='', new_label='')
3888
3813
3898
3823
else:
3899
3824
return 0
3900
3825
3901
def _do_interactive(self, merger):
3826
def _do_interactive(self, merger, cleanups):
3902
3827
"""Perform an interactive merge.
3903
3828
3904
3829
This works by generating a preview tree of the merge, then using
3906
3831
and the preview tree.
3907
3832
"""
3908
3833
from bzrlib import shelf_ui
3909
result_tree = self._get_preview(merger)
3834
result_tree = self._get_preview(merger, cleanups)
3910
3835
writer = bzrlib.option.diff_writer_registry.get()
3911
3836
shelver = shelf_ui.Shelver(merger.this_tree, result_tree, destroy=True,
3912
3837
reporter=shelf_ui.ApplyReporter(),
3913
3838
diff_writer=writer(sys.stdout))
3914
try:
3915
shelver.run()
3916
finally:
3917
shelver.finalize()
3839
shelver.run()
3918
3840
3919
3841
def sanity_check_merger(self, merger):
3920
3842
if (merger.show_base and
3980
3902
allow_pending = True
3981
3903
return merger, allow_pending
3982
3904
3983
def get_merger_from_uncommitted(self, tree, location, pb):
3905
def get_merger_from_uncommitted(self, tree, location, pb, cleanups):
3984
3906
"""Get a merger for uncommitted changes.
3985
3907
3986
3908
:param tree: The tree the merger should apply to.
3987
3909
:param location: The location containing uncommitted changes.
3988
3910
:param pb: The progress bar to use for showing progress.
3911
:param cleanups: A list of operations to perform to clean up the
3912
temporary directories, unfinalized objects, etc.
3989
3913
"""
3990
3914
location = self._select_branch_location(tree, location)[0]
3991
3915
other_tree, other_path = WorkingTree.open_containing(location)
4043
3967
4044
3968
4045
3969
class cmd_remerge(Command):
4046
__doc__ = """Redo a merge.
3970
"""Redo a merge.
4047
3971
4048
3972
Use this if you want to try a different merge technique while resolving
4049
3973
conflicts. Some merge techniques are better than others, and remerge
4074
3998
4075
3999
def run(self, file_list=None, merge_type=None, show_base=False,
4076
4000
reprocess=False):
4077
from bzrlib.conflicts import restore
4078
4001
if merge_type is None:
4079
4002
merge_type = _mod_merge.Merge3Merger
4080
4003
tree, file_list = tree_files(file_list)
4081
self.add_cleanup(tree.lock_write().unlock)
4082
parents = tree.get_parent_ids()
4083
if len(parents) != 2:
4084
raise errors.BzrCommandError("Sorry, remerge only works after normal"
4085
" merges. Not cherrypicking or"
4086
" multi-merges.")
4087
repository = tree.branch.repository
4088
interesting_ids = None
4089
new_conflicts = []
4090
conflicts = tree.conflicts()
4091
if file_list is not None:
4092
interesting_ids = set()
4093
for filename in file_list:
4094
file_id = tree.path2id(filename)
4095
if file_id is None:
4096
raise errors.NotVersionedError(filename)
4097
interesting_ids.add(file_id)
4098
if tree.kind(file_id) != "directory":
4099
continue
4004
tree.lock_write()
4005
try:
4006
parents = tree.get_parent_ids()
4007
if len(parents) != 2:
4008
raise errors.BzrCommandError("Sorry, remerge only works after normal"
4009
" merges. Not cherrypicking or"
4010
" multi-merges.")
4011
repository = tree.branch.repository
4012
interesting_ids = None
4013
new_conflicts = []
4014
conflicts = tree.conflicts()
4015
if file_list is not None:
4016
interesting_ids = set()
4017
for filename in file_list:
4018
file_id = tree.path2id(filename)
4019
if file_id is None:
4020
raise errors.NotVersionedError(filename)
4021
interesting_ids.add(file_id)
4022
if tree.kind(file_id) != "directory":
4023
continue
4100
4024
4101
for name, ie in tree.inventory.iter_entries(file_id):
4102
interesting_ids.add(ie.file_id)
4103
new_conflicts = conflicts.select_conflicts(tree, file_list)[0]
4104
else:
4105
# Remerge only supports resolving contents conflicts
4106
allowed_conflicts = ('text conflict', 'contents conflict')
4107
restore_files = [c.path for c in conflicts
4108
if c.typestring in allowed_conflicts]
4109
_mod_merge.transform_tree(tree, tree.basis_tree(), interesting_ids)
4110
tree.set_conflicts(ConflictList(new_conflicts))
4111
if file_list is not None:
4112
restore_files = file_list
4113
for filename in restore_files:
4025
for name, ie in tree.inventory.iter_entries(file_id):
4026
interesting_ids.add(ie.file_id)
4027
new_conflicts = conflicts.select_conflicts(tree, file_list)[0]
4028
else:
4029
# Remerge only supports resolving contents conflicts
4030
allowed_conflicts = ('text conflict', 'contents conflict')
4031
restore_files = [c.path for c in conflicts
4032
if c.typestring in allowed_conflicts]
4033
_mod_merge.transform_tree(tree, tree.basis_tree(), interesting_ids)
4034
tree.set_conflicts(ConflictList(new_conflicts))
4035
if file_list is not None:
4036
restore_files = file_list
4037
for filename in restore_files:
4038
try:
4039
restore(tree.abspath(filename))
4040
except errors.NotConflicted:
4041
pass
4042
# Disable pending merges, because the file texts we are remerging
4043
# have not had those merges performed. If we use the wrong parents
4044
# list, we imply that the working tree text has seen and rejected
4045
# all the changes from the other tree, when in fact those changes
4046
# have not yet been seen.
4047
pb = ui.ui_factory.nested_progress_bar()
4048
tree.set_parent_ids(parents[:1])
4114
4049
try:
4115
restore(tree.abspath(filename))
4116
except errors.NotConflicted:
4117
pass
4118
# Disable pending merges, because the file texts we are remerging
4119
# have not had those merges performed. If we use the wrong parents
4120
# list, we imply that the working tree text has seen and rejected
4121
# all the changes from the other tree, when in fact those changes
4122
# have not yet been seen.
4123
tree.set_parent_ids(parents[:1])
4124
try:
4125
merger = _mod_merge.Merger.from_revision_ids(None, tree, parents[1])
4126
merger.interesting_ids = interesting_ids
4127
merger.merge_type = merge_type
4128
merger.show_base = show_base
4129
merger.reprocess = reprocess
4130
conflicts = merger.do_merge()
4050
merger = _mod_merge.Merger.from_revision_ids(pb,
4051
tree, parents[1])
4052
merger.interesting_ids = interesting_ids
4053
merger.merge_type = merge_type
4054
merger.show_base = show_base
4055
merger.reprocess = reprocess
4056
conflicts = merger.do_merge()
4057
finally:
4058
tree.set_parent_ids(parents)
4059
pb.finished()
4131
4060
finally:
4132
tree.set_parent_ids(parents)
4061
tree.unlock()
4133
4062
if conflicts > 0:
4134
4063
return 1
4135
4064
else:
4137
4066
4138
4067
4139
4068
class cmd_revert(Command):
4140
__doc__ = """Revert files to a previous revision.
4069
"""Revert files to a previous revision.
4141
4070
4142
4071
Giving a list of files will revert only those files. Otherwise, all files
4143
4072
will be reverted. If the revision is not specified with '--revision', the
4162
4091
created as above. Directories containing unknown files will not be
4163
4092
deleted.
4164
4093
4165
The working tree contains a list of revisions that have been merged but
4166
not yet committed. These revisions will be included as additional parents
4167
of the next commit. Normally, using revert clears that list as well as
4168
reverting the files. If any files are specified, revert leaves the list
4169
of uncommitted merges alone and reverts only the files. Use ``bzr revert
4170
.`` in the tree root to revert all files but keep the recorded merges,
4171
and ``bzr revert --forget-merges`` to clear the pending merge list without
4094
The working tree contains a list of pending merged revisions, which will
4095
be included as parents in the next commit. Normally, revert clears that
4096
list as well as reverting the files. If any files are specified, revert
4097
leaves the pending merge list alone and reverts only the files. Use "bzr
4098
revert ." in the tree root to revert all files but keep the merge record,
4099
and "bzr revert --forget-merges" to clear the pending merge list without
4172
4100
reverting any files.
4173
4101
4174
Using "bzr revert --forget-merges", it is possible to apply all of the
4175
changes from a branch in a single revision. To do this, perform the merge
4176
as desired. Then doing revert with the "--forget-merges" option will keep
4177
the content of the tree as it was, but it will clear the list of pending
4178
merges. The next commit will then contain all of the changes that are
4179
present in the other branch, but without any other parent revisions.
4180
Because this technique forgets where these changes originated, it may
4181
cause additional conflicts on later merges involving the same source and
4102
Using "bzr revert --forget-merges", it is possible to apply the changes
4103
from an arbitrary merge as a single revision. To do this, perform the
4104
merge as desired. Then doing revert with the "--forget-merges" option will
4105
keep the content of the tree as it was, but it will clear the list of
4106
pending merges. The next commit will then contain all of the changes that
4107
would have been in the merge, but without any mention of the other parent
4108
revisions. Because this technique forgets where these changes originated,
4109
it may cause additional conflicts on later merges involving the source and
4182
4110
target branches.
4183
4111
"""
4184
4112
4194
4122
def run(self, revision=None, no_backup=False, file_list=None,
4195
4123
forget_merges=None):
4196
4124
tree, file_list = tree_files(file_list)
4197
self.add_cleanup(tree.lock_tree_write().unlock)
4198
if forget_merges:
4199
tree.set_parent_ids(tree.get_parent_ids()[:1])
4200
else:
4201
self._revert_tree_to_revision(tree, revision, file_list, no_backup)
4125
tree.lock_write()
4126
try:
4127
if forget_merges:
4128
tree.set_parent_ids(tree.get_parent_ids()[:1])
4129
else:
4130
self._revert_tree_to_revision(tree, revision, file_list, no_backup)
4131
finally:
4132
tree.unlock()
4202
4133
4203
4134
@staticmethod
4204
4135
def _revert_tree_to_revision(tree, revision, file_list, no_backup):
4205
4136
rev_tree = _get_one_revision_tree('revert', revision, tree=tree)
4206
tree.revert(file_list, rev_tree, not no_backup, None,
4207
report_changes=True)
4137
pb = ui.ui_factory.nested_progress_bar()
4138
try:
4139
tree.revert(file_list, rev_tree, not no_backup, pb,
4140
report_changes=True)
4141
finally:
4142
pb.finished()
4208
4143
4209
4144
4210
4145
class cmd_assert_fail(Command):
4211
__doc__ = """Test reporting of assertion failures"""
4146
"""Test reporting of assertion failures"""
4212
4147
# intended just for use in testing
4213
4148
4214
4149
hidden = True
4218
4153
4219
4154
4220
4155
class cmd_help(Command):
4221
__doc__ = """Show help on a command or other topic.
4156
"""Show help on a command or other topic.
4222
4157
"""
4223
4158
4224
4159
_see_also = ['topics']
4237
4172
4238
4173
4239
4174
class cmd_shell_complete(Command):
4240
__doc__ = """Show appropriate completions for context.
4175
"""Show appropriate completions for context.
4241
4176
4242
4177
For a list of all available commands, say 'bzr shell-complete'.
4243
4178
"""
4252
4187
4253
4188
4254
4189
class cmd_missing(Command):
4255
__doc__ = """Show unmerged/unpulled revisions between two branches.
4190
"""Show unmerged/unpulled revisions between two branches.
4256
4191
4257
4192
OTHER_BRANCH may be local or remote.
4258
4193
4336
4271
restrict = 'remote'
4337
4272
4338
4273
local_branch = Branch.open_containing(u".")[0]
4339
self.add_cleanup(local_branch.lock_read().unlock)
4340
4341
4274
parent = local_branch.get_parent()
4342
4275
if other_branch is None:
4343
4276
other_branch = parent
4352
4285
remote_branch = Branch.open(other_branch)
4353
4286
if remote_branch.base == local_branch.base:
4354
4287
remote_branch = local_branch
4355
else:
4356
self.add_cleanup(remote_branch.lock_read().unlock)
4357
4288
4358
4289
local_revid_range = _revision_range_to_revid_range(
4359
4290
_get_revision_range(my_revision, local_branch,
4363
4294
_get_revision_range(revision,
4364
4295
remote_branch, self.name()))
4365
4296
4366
local_extra, remote_extra = find_unmerged(
4367
local_branch, remote_branch, restrict,
4368
backward=not reverse,
4369
include_merges=include_merges,
4370
local_revid_range=local_revid_range,
4371
remote_revid_range=remote_revid_range)
4372
4373
if log_format is None:
4374
registry = log.log_formatter_registry
4375
log_format = registry.get_default(local_branch)
4376
lf = log_format(to_file=self.outf,
4377
show_ids=show_ids,
4378
show_timezone='original')
4379
4380
status_code = 0
4381
if local_extra and not theirs_only:
4382
message("You have %d extra revision(s):\n" %
4383
len(local_extra))
4384
for revision in iter_log_revisions(local_extra,
4385
local_branch.repository,
4386
verbose):
4387
lf.log_revision(revision)
4388
printed_local = True
4389
status_code = 1
4390
else:
4391
printed_local = False
4392
4393
if remote_extra and not mine_only:
4394
if printed_local is True:
4395
message("\n\n\n")
4396
message("You are missing %d revision(s):\n" %
4397
len(remote_extra))
4398
for revision in iter_log_revisions(remote_extra,
4399
remote_branch.repository,
4400
verbose):
4401
lf.log_revision(revision)
4402
status_code = 1
4403
4404
if mine_only and not local_extra:
4405
# We checked local, and found nothing extra
4406
message('This branch is up to date.\n')
4407
elif theirs_only and not remote_extra:
4408
# We checked remote, and found nothing extra
4409
message('Other branch is up to date.\n')
4410
elif not (mine_only or theirs_only or local_extra or
4411
remote_extra):
4412
# We checked both branches, and neither one had extra
4413
# revisions
4414
message("Branches are up to date.\n")
4415
self.cleanup_now()
4297
local_branch.lock_read()
4298
try:
4299
remote_branch.lock_read()
4300
try:
4301
local_extra, remote_extra = find_unmerged(
4302
local_branch, remote_branch, restrict,
4303
backward=not reverse,
4304
include_merges=include_merges,
4305
local_revid_range=local_revid_range,
4306
remote_revid_range=remote_revid_range)
4307
4308
if log_format is None:
4309
registry = log.log_formatter_registry
4310
log_format = registry.get_default(local_branch)
4311
lf = log_format(to_file=self.outf,
4312
show_ids=show_ids,
4313
show_timezone='original')
4314
4315
status_code = 0
4316
if local_extra and not theirs_only:
4317
message("You have %d extra revision(s):\n" %
4318
len(local_extra))
4319
for revision in iter_log_revisions(local_extra,
4320
local_branch.repository,
4321
verbose):
4322
lf.log_revision(revision)
4323
printed_local = True
4324
status_code = 1
4325
else:
4326
printed_local = False
4327
4328
if remote_extra and not mine_only:
4329
if printed_local is True:
4330
message("\n\n\n")
4331
message("You are missing %d revision(s):\n" %
4332
len(remote_extra))
4333
for revision in iter_log_revisions(remote_extra,
4334
remote_branch.repository,
4335
verbose):
4336
lf.log_revision(revision)
4337
status_code = 1
4338
4339
if mine_only and not local_extra:
4340
# We checked local, and found nothing extra
4341
message('This branch is up to date.\n')
4342
elif theirs_only and not remote_extra:
4343
# We checked remote, and found nothing extra
4344
message('Other branch is up to date.\n')
4345
elif not (mine_only or theirs_only or local_extra or
4346
remote_extra):
4347
# We checked both branches, and neither one had extra
4348
# revisions
4349
message("Branches are up to date.\n")
4350
finally:
4351
remote_branch.unlock()
4352
finally:
4353
local_branch.unlock()
4416
4354
if not status_code and parent is None and other_branch is not None:
4417
self.add_cleanup(local_branch.lock_write().unlock)
4418
# handle race conditions - a parent might be set while we run.
4419
if local_branch.get_parent() is None:
4420
local_branch.set_parent(remote_branch.base)
4355
local_branch.lock_write()
4356
try:
4357
# handle race conditions - a parent might be set while we run.
4358
if local_branch.get_parent() is None:
4359
local_branch.set_parent(remote_branch.base)
4360
finally:
4361
local_branch.unlock()
4421
4362
return status_code
4422
4363
4423
4364
4424
4365
class cmd_pack(Command):
4425
__doc__ = """Compress the data within a repository.
4426
4427
This operation compresses the data within a bazaar repository. As
4428
bazaar supports automatic packing of repository, this operation is
4429
normally not required to be done manually.
4430
4431
During the pack operation, bazaar takes a backup of existing repository
4432
data, i.e. pack files. This backup is eventually removed by bazaar
4433
automatically when it is safe to do so. To save disk space by removing
4434
the backed up pack files, the --clean-obsolete-packs option may be
4435
used.
4436
4437
Warning: If you use --clean-obsolete-packs and your machine crashes
4438
during or immediately after repacking, you may be left with a state
4439
where the deletion has been written to disk but the new packs have not
4440
been. In this case the repository may be unusable.
4441
"""
4366
"""Compress the data within a repository."""
4442
4367
4443
4368
_see_also = ['repositories']
4444
4369
takes_args = ['branch_or_repo?']
4445
takes_options = [
4446
Option('clean-obsolete-packs', 'Delete obsolete packs to save disk space.'),
4447
]
4448
4370
4449
def run(self, branch_or_repo='.', clean_obsolete_packs=False):
4371
def run(self, branch_or_repo='.'):
4450
4372
dir = bzrdir.BzrDir.open_containing(branch_or_repo)[0]
4451
4373
try:
4452
4374
branch = dir.open_branch()
4453
4375
repository = branch.repository
4454
4376
except errors.NotBranchError:
4455
4377
repository = dir.open_repository()
4456
repository.pack(clean_obsolete_packs=clean_obsolete_packs)
4378
repository.pack()
4457
4379
4458
4380
4459
4381
class cmd_plugins(Command):
4460
__doc__ = """List the installed plugins.
4382
"""List the installed plugins.
4461
4383
4462
4384
This command displays the list of installed plugins including
4463
4385
version of plugin and a short description of each.
4470
4392
adding new commands, providing additional network transports and
4471
4393
customizing log output.
4472
4394
4473
See the Bazaar Plugin Guide <http://doc.bazaar.canonical.com/plugins/en/>
4474
for further information on plugins including where to find them and how to
4475
install them. Instructions are also provided there on how to write new
4476
plugins using the Python programming language.
4395
See the Bazaar web site, http://bazaar-vcs.org, for further
4396
information on plugins including where to find them and how to
4397
install them. Instructions are also provided there on how to
4398
write new plugins using the Python programming language.
4477
4399
"""
4478
4400
takes_options = ['verbose']
4479
4401
4494
4416
doc = '(no description)'
4495
4417
result.append((name_ver, doc, plugin.path()))
4496
4418
for name_ver, doc, path in sorted(result):
4497
self.outf.write("%s\n" % name_ver)
4498
self.outf.write(" %s\n" % doc)
4419
print name_ver
4420
print ' ', doc
4499
4421
if verbose:
4500
self.outf.write(" %s\n" % path)
4501
self.outf.write("\n")
4422
print ' ', path
4423
print
4502
4424
4503
4425
4504
4426
class cmd_testament(Command):
4505
__doc__ = """Show testament (signing-form) of a revision."""
4427
"""Show testament (signing-form) of a revision."""
4506
4428
takes_options = [
4507
4429
'revision',
4508
4430
Option('long', help='Produce long-format testament.'),
4520
4442
b = Branch.open_containing(branch)[0]
4521
4443
else:
4522
4444
b = Branch.open(branch)
4523
self.add_cleanup(b.lock_read().unlock)
4524
if revision is None:
4525
rev_id = b.last_revision()
4526
else:
4527
rev_id = revision[0].as_revision_id(b)
4528
t = testament_class.from_revision(b.repository, rev_id)
4529
if long:
4530
sys.stdout.writelines(t.as_text_lines())
4531
else:
4532
sys.stdout.write(t.as_short_text())
4445
b.lock_read()
4446
try:
4447
if revision is None:
4448
rev_id = b.last_revision()
4449
else:
4450
rev_id = revision[0].as_revision_id(b)
4451
t = testament_class.from_revision(b.repository, rev_id)
4452
if long:
4453
sys.stdout.writelines(t.as_text_lines())
4454
else:
4455
sys.stdout.write(t.as_short_text())
4456
finally:
4457
b.unlock()
4533
4458
4534
4459
4535
4460
class cmd_annotate(Command):
4536
__doc__ = """Show the origin of each line in a file.
4461
"""Show the origin of each line in a file.
4537
4462
4538
4463
This prints out the given file with an annotation on the left side
4539
4464
indicating which revision, author and date introduced the change.
4550
4475
Option('long', help='Show commit date in annotations.'),
4551
4476
'revision',
4552
4477
'show-ids',
4553
'directory',
4554
4478
]
4555
4479
encoding_type = 'exact'
4556
4480
4557
4481
@display_command
4558
4482
def run(self, filename, all=False, long=False, revision=None,
4559
show_ids=False, directory=None):
4483
show_ids=False):
4560
4484
from bzrlib.annotate import annotate_file, annotate_file_tree
4561
4485
wt, branch, relpath = \
4562
_open_directory_or_containing_tree_or_branch(filename, directory)
4563
if wt is not None:
4564
self.add_cleanup(wt.lock_read().unlock)
4565
else:
4566
self.add_cleanup(branch.lock_read().unlock)
4567
tree = _get_one_revision_tree('annotate', revision, branch=branch)
4568
self.add_cleanup(tree.lock_read().unlock)
4569
if wt is not None:
4570
file_id = wt.path2id(relpath)
4571
else:
4572
file_id = tree.path2id(relpath)
4573
if file_id is None:
4574
raise errors.NotVersionedError(filename)
4575
file_version = tree.inventory[file_id].revision
4576
if wt is not None and revision is None:
4577
# If there is a tree and we're not annotating historical
4578
# versions, annotate the working tree's content.
4579
annotate_file_tree(wt, file_id, self.outf, long, all,
4580
show_ids=show_ids)
4581
else:
4582
annotate_file(branch, file_version, file_id, long, all, self.outf,
4583
show_ids=show_ids)
4486
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
4487
if wt is not None:
4488
wt.lock_read()
4489
else:
4490
branch.lock_read()
4491
try:
4492
tree = _get_one_revision_tree('annotate', revision, branch=branch)
4493
if wt is not None:
4494
file_id = wt.path2id(relpath)
4495
else:
4496
file_id = tree.path2id(relpath)
4497
if file_id is None:
4498
raise errors.NotVersionedError(filename)
4499
file_version = tree.inventory[file_id].revision
4500
if wt is not None and revision is None:
4501
# If there is a tree and we're not annotating historical
4502
# versions, annotate the working tree's content.
4503
annotate_file_tree(wt, file_id, self.outf, long, all,
4504
show_ids=show_ids)
4505
else:
4506
annotate_file(branch, file_version, file_id, long, all, self.outf,
4507
show_ids=show_ids)
4508
finally:
4509
if wt is not None:
4510
wt.unlock()
4511
else:
4512
branch.unlock()
4584
4513
4585
4514
4586
4515
class cmd_re_sign(Command):
4587
__doc__ = """Create a digital signature for an existing revision."""
4516
"""Create a digital signature for an existing revision."""
4588
4517
# TODO be able to replace existing ones.
4589
4518
4590
4519
hidden = True # is this right ?
4591
4520
takes_args = ['revision_id*']
4592
takes_options = ['directory', 'revision']
4521
takes_options = ['revision']
4593
4522
4594
def run(self, revision_id_list=None, revision=None, directory=u'.'):
4523
def run(self, revision_id_list=None, revision=None):
4595
4524
if revision_id_list is not None and revision is not None:
4596
4525
raise errors.BzrCommandError('You can only supply one of revision_id or --revision')
4597
4526
if revision_id_list is None and revision is None:
4598
4527
raise errors.BzrCommandError('You must supply either --revision or a revision_id')
4599
b = WorkingTree.open_containing(directory)[0].branch
4600
self.add_cleanup(b.lock_write().unlock)
4601
return self._run(b, revision_id_list, revision)
4528
b = WorkingTree.open_containing(u'.')[0].branch
4529
b.lock_write()
4530
try:
4531
return self._run(b, revision_id_list, revision)
4532
finally:
4533
b.unlock()
4602
4534
4603
4535
def _run(self, b, revision_id_list, revision):
4604
4536
import bzrlib.gpg as gpg
4649
4581
4650
4582
4651
4583
class cmd_bind(Command):
4652
__doc__ = """Convert the current branch into a checkout of the supplied branch.
4653
If no branch is supplied, rebind to the last bound location.
4584
"""Convert the current branch into a checkout of the supplied branch.
4654
4585
4655
4586
Once converted into a checkout, commits must succeed on the master branch
4656
4587
before they will be applied to the local branch.
4662
4593
4663
4594
_see_also = ['checkouts', 'unbind']
4664
4595
takes_args = ['location?']
4665
takes_options = ['directory']
4596
takes_options = []
4666
4597
4667
def run(self, location=None, directory=u'.'):
4668
b, relpath = Branch.open_containing(directory)
4598
def run(self, location=None):
4599
b, relpath = Branch.open_containing(u'.')
4669
4600
if location is None:
4670
4601
try:
4671
4602
location = b.get_old_bound_location()
4674
4605
'This format does not remember old locations.')
4675
4606
else:
4676
4607
if location is None:
4677
if b.get_bound_location() is not None:
4678
raise errors.BzrCommandError('Branch is already bound')
4679
else:
4680
raise errors.BzrCommandError('No location supplied '
4681
'and no previous location known')
4608
raise errors.BzrCommandError('No location supplied and no '
4609
'previous location known')
4682
4610
b_other = Branch.open(location)
4683
4611
try:
4684
4612
b.bind(b_other)
4690
4618
4691
4619
4692
4620
class cmd_unbind(Command):
4693
__doc__ = """Convert the current checkout into a regular branch.
4621
"""Convert the current checkout into a regular branch.
4694
4622
4695
4623
After unbinding, the local branch is considered independent and subsequent
4696
4624
commits will be local only.
4698
4626
4699
4627
_see_also = ['checkouts', 'bind']
4700
4628
takes_args = []
4701
takes_options = ['directory']
4629
takes_options = []
4702
4630
4703
def run(self, directory=u'.'):
4704
b, relpath = Branch.open_containing(directory)
4631
def run(self):
4632
b, relpath = Branch.open_containing(u'.')
4705
4633
if not b.unbind():
4706
4634
raise errors.BzrCommandError('Local branch is not bound')
4707
4635
4708
4636
4709
4637
class cmd_uncommit(Command):
4710
__doc__ = """Remove the last committed revision.
4638
"""Remove the last committed revision.
4711
4639
4712
4640
--verbose will print out what is being removed.
4713
4641
--dry-run will go through all the motions, but not actually
4753
4681
b = control.open_branch()
4754
4682
4755
4683
if tree is not None:
4756
self.add_cleanup(tree.lock_write().unlock)
4684
tree.lock_write()
4757
4685
else:
4758
self.add_cleanup(b.lock_write().unlock)
4759
return self._run(b, tree, dry_run, verbose, revision, force, local=local)
4686
b.lock_write()
4687
try:
4688
return self._run(b, tree, dry_run, verbose, revision, force,
4689
local=local)
4690
finally:
4691
if tree is not None:
4692
tree.unlock()
4693
else:
4694
b.unlock()
4760
4695
4761
4696
def _run(self, b, tree, dry_run, verbose, revision, force, local=False):
4762
4697
from bzrlib.log import log_formatter, show_log
4794
4729
end_revision=last_revno)
4795
4730
4796
4731
if dry_run:
4797
self.outf.write('Dry-run, pretending to remove'
4798
' the above revisions.\n')
4732
print 'Dry-run, pretending to remove the above revisions.'
4733
if not force:
4734
val = raw_input('Press <enter> to continue')
4799
4735
else:
4800
self.outf.write('The above revision(s) will be removed.\n')
4801
4802
if not force:
4803
if not ui.ui_factory.get_boolean('Are you sure'):
4804
self.outf.write('Canceled')
4805
return 0
4736
print 'The above revision(s) will be removed.'
4737
if not force:
4738
val = raw_input('Are you sure [y/N]? ')
4739
if val.lower() not in ('y', 'yes'):
4740
print 'Canceled'
4741
return 0
4806
4742
4807
4743
mutter('Uncommitting from {%s} to {%s}',
4808
4744
last_rev_id, rev_id)
4809
4745
uncommit(b, tree=tree, dry_run=dry_run, verbose=verbose,
4810
4746
revno=revno, local=local)
4811
self.outf.write('You can restore the old tip by running:\n'
4812
' bzr pull . -r revid:%s\n' % last_rev_id)
4747
note('You can restore the old tip by running:\n'
4748
' bzr pull . -r revid:%s', last_rev_id)
4813
4749
4814
4750
4815
4751
class cmd_break_lock(Command):
4816
__doc__ = """Break a dead lock on a repository, branch or working directory.
4752
"""Break a dead lock on a repository, branch or working directory.
4817
4753
4818
4754
CAUTION: Locks should only be broken when you are sure that the process
4819
4755
holding the lock has been stopped.
4820
4756
4821
You can get information on what locks are open via the 'bzr info
4822
[location]' command.
4757
You can get information on what locks are open via the 'bzr info' command.
4823
4758
4824
4759
:Examples:
4825
4760
bzr break-lock
4826
bzr break-lock bzr+ssh://example.com/bzr/foo
4827
4761
"""
4828
4762
takes_args = ['location?']
4829
4763
4838
4772
4839
4773
4840
4774
class cmd_wait_until_signalled(Command):
4841
__doc__ = """Test helper for test_start_and_stop_bzr_subprocess_send_signal.
4775
"""Test helper for test_start_and_stop_bzr_subprocess_send_signal.
4842
4776
4843
4777
This just prints a line to signal when it is ready, then blocks on stdin.
4844
4778
"""
4852
4786
4853
4787
4854
4788
class cmd_serve(Command):
4855
__doc__ = """Run the bzr server."""
4789
"""Run the bzr server."""
4856
4790
4857
4791
aliases = ['server']
4858
4792
4869
4803
'result in a dynamically allocated port. The default port '
4870
4804
'depends on the protocol.',
4871
4805
type=str),
4872
custom_help('directory',
4873
help='Serve contents of this directory.'),
4806
Option('directory',
4807
help='Serve contents of this directory.',
4808
type=unicode),
4874
4809
Option('allow-writes',
4875
4810
help='By default the server is a readonly server. Supplying '
4876
4811
'--allow-writes enables write access to the contents of '
4917
4852
4918
4853
4919
4854
class cmd_join(Command):
4920
__doc__ = """Combine a tree into its containing tree.
4855
"""Combine a tree into its containing tree.
4921
4856
4922
4857
This command requires the target tree to be in a rich-root format.
4923
4858
4963
4898
4964
4899
4965
4900
class cmd_split(Command):
4966
__doc__ = """Split a subdirectory of a tree into a separate tree.
4901
"""Split a subdirectory of a tree into a separate tree.
4967
4902
4968
4903
This command will produce a target tree in a format that supports
4969
4904
rich roots, like 'rich-root' or 'rich-root-pack'. These formats cannot be
4989
4924
4990
4925
4991
4926
class cmd_merge_directive(Command):
4992
__doc__ = """Generate a merge directive for auto-merge tools.
4927
"""Generate a merge directive for auto-merge tools.
4993
4928
4994
4929
A directive requests a merge to be performed, and also provides all the
4995
4930
information necessary to do so. This means it must either include a
5088
5023
5089
5024
5090
5025
class cmd_send(Command):
5091
__doc__ = """Mail or create a merge-directive for submitting changes.
5026
"""Mail or create a merge-directive for submitting changes.
5092
5027
5093
5028
A merge directive provides many things needed for requesting merges:
5094
5029
5100
5035
directly from the merge directive, without retrieving data from a
5101
5036
branch.
5102
5037
5103
`bzr send` creates a compact data set that, when applied using bzr
5104
merge, has the same effect as merging from the source branch.
5105
5106
By default the merge directive is self-contained and can be applied to any
5107
branch containing submit_branch in its ancestory without needing access to
5108
the source branch.
5109
5110
If --no-bundle is specified, then Bazaar doesn't send the contents of the
5111
revisions, but only a structured request to merge from the
5112
public_location. In that case the public_branch is needed and it must be
5113
up-to-date and accessible to the recipient. The public_branch is always
5114
included if known, so that people can check it later.
5115
5116
The submit branch defaults to the parent of the source branch, but can be
5117
overridden. Both submit branch and public branch will be remembered in
5118
branch.conf the first time they are used for a particular branch. The
5119
source branch defaults to that containing the working directory, but can
5120
be changed using --from.
5121
5122
In order to calculate those changes, bzr must analyse the submit branch.
5123
Therefore it is most efficient for the submit branch to be a local mirror.
5124
If a public location is known for the submit_branch, that location is used
5125
in the merge directive.
5126
5127
The default behaviour is to send the merge directive by mail, unless -o is
5128
given, in which case it is sent to a file.
5038
If --no-bundle is specified, then public_branch is needed (and must be
5039
up-to-date), so that the receiver can perform the merge using the
5040
public_branch. The public_branch is always included if known, so that
5041
people can check it later.
5042
5043
The submit branch defaults to the parent, but can be overridden. Both
5044
submit branch and public branch will be remembered if supplied.
5045
5046
If a public_branch is known for the submit_branch, that public submit
5047
branch is used in the merge instructions. This means that a local mirror
5048
can be used as your actual submit branch, once you have set public_branch
5049
for that mirror.
5129
5050
5130
5051
Mail is sent using your preferred mail program. This should be transparent
5131
on Windows (it uses MAPI). On Unix, it requires the xdg-email utility.
5052
on Windows (it uses MAPI). On Linux, it requires the xdg-email utility.
5132
5053
If the preferred client can't be found (or used), your editor will be used.
5133
5054
5134
5055
To use a specific mail program, set the mail_client configuration option.
5151
5072
5152
5073
The merge directives created by bzr send may be applied using bzr merge or
5153
5074
bzr pull by specifying a file containing a merge directive as the location.
5154
5155
bzr send makes extensive use of public locations to map local locations into
5156
URLs that can be used by other people. See `bzr help configuration` to
5157
set them, and use `bzr info` to display them.
5158
5075
"""
5159
5076
5160
5077
encoding_type = 'exact'
5176
5093
short_name='f',
5177
5094
type=unicode),
5178
5095
Option('output', short_name='o',
5179
help='Write merge directive to this file or directory; '
5096
help='Write merge directive to this file; '
5180
5097
'use - for stdout.',
5181
5098
type=unicode),
5182
5099
Option('strict',
5205
5122
5206
5123
5207
5124
class cmd_bundle_revisions(cmd_send):
5208
__doc__ = """Create a merge-directive for submitting changes.
5125
"""Create a merge-directive for submitting changes.
5209
5126
5210
5127
A merge directive provides many things needed for requesting merges:
5211
5128
5278
5195
5279
5196
5280
5197
class cmd_tag(Command):
5281
__doc__ = """Create, remove or modify a tag naming a revision.
5198
"""Create, remove or modify a tag naming a revision.
5282
5199
5283
5200
Tags give human-meaningful names to revisions. Commands that take a -r
5284
5201
(--revision) option can be given -rtag:X, where X is any previously
5292
5209
5293
5210
To rename a tag (change the name but keep it on the same revsion), run ``bzr
5294
5211
tag new-name -r tag:old-name`` and then ``bzr tag --delete oldname``.
5295
5296
If no tag name is specified it will be determined through the
5297
'automatic_tag_name' hook. This can e.g. be used to automatically tag
5298
upstream releases by reading configure.ac. See ``bzr help hooks`` for
5299
details.
5300
5212
"""
5301
5213
5302
5214
_see_also = ['commit', 'tags']
5303
takes_args = ['tag_name?']
5215
takes_args = ['tag_name']
5304
5216
takes_options = [
5305
5217
Option('delete',
5306
5218
help='Delete this tag rather than placing it.',
5307
5219
),
5308
custom_help('directory',
5309
help='Branch in which to place the tag.'),
5220
Option('directory',
5221
help='Branch in which to place the tag.',
5222
short_name='d',
5223
type=unicode,
5224
),
5310
5225
Option('force',
5311
5226
help='Replace existing tags.',
5312
5227
),
5313
5228
'revision',
5314
5229
]
5315
5230
5316
def run(self, tag_name=None,
5231
def run(self, tag_name,
5317
5232
delete=None,
5318
5233
directory='.',
5319
5234
force=None,
5320
5235
revision=None,
5321
5236
):
5322
5237
branch, relpath = Branch.open_containing(directory)
5323
self.add_cleanup(branch.lock_write().unlock)
5324
if delete:
5325
if tag_name is None:
5326
raise errors.BzrCommandError("No tag specified to delete.")
5327
branch.tags.delete_tag(tag_name)
5328
self.outf.write('Deleted tag %s.\n' % tag_name)
5329
else:
5330
if revision:
5331
if len(revision) != 1:
5332
raise errors.BzrCommandError(
5333
"Tags can only be placed on a single revision, "
5334
"not on a range")
5335
revision_id = revision[0].as_revision_id(branch)
5238
branch.lock_write()
5239
try:
5240
if delete:
5241
branch.tags.delete_tag(tag_name)
5242
self.outf.write('Deleted tag %s.\n' % tag_name)
5336
5243
else:
5337
revision_id = branch.last_revision()
5338
if tag_name is None:
5339
tag_name = branch.automatic_tag_name(revision_id)
5340
if tag_name is None:
5341
raise errors.BzrCommandError(
5342
"Please specify a tag name.")
5343
if (not force) and branch.tags.has_tag(tag_name):
5344
raise errors.TagAlreadyExists(tag_name)
5345
branch.tags.set_tag(tag_name, revision_id)
5346
self.outf.write('Created tag %s.\n' % tag_name)
5244
if revision:
5245
if len(revision) != 1:
5246
raise errors.BzrCommandError(
5247
"Tags can only be placed on a single revision, "
5248
"not on a range")
5249
revision_id = revision[0].as_revision_id(branch)
5250
else:
5251
revision_id = branch.last_revision()
5252
if (not force) and branch.tags.has_tag(tag_name):
5253
raise errors.TagAlreadyExists(tag_name)
5254
branch.tags.set_tag(tag_name, revision_id)
5255
self.outf.write('Created tag %s.\n' % tag_name)
5256
finally:
5257
branch.unlock()
5347
5258
5348
5259
5349
5260
class cmd_tags(Command):
5350
__doc__ = """List tags.
5261
"""List tags.
5351
5262
5352
5263
This command shows a table of tag names and the revisions they reference.
5353
5264
"""
5354
5265
5355
5266
_see_also = ['tag']
5356
5267
takes_options = [
5357
custom_help('directory',
5358
help='Branch whose tags should be displayed.'),
5268
Option('directory',
5269
help='Branch whose tags should be displayed.',
5270
short_name='d',
5271
type=unicode,
5272
),
5359
5273
RegistryOption.from_kwargs('sort',
5360
5274
'Sort tags by different criteria.', title='Sorting',
5361
5275
alpha='Sort tags lexicographically (default).',
5378
5292
if not tags:
5379
5293
return
5380
5294
5381
self.add_cleanup(branch.lock_read().unlock)
5382
if revision:
5383
graph = branch.repository.get_graph()
5384
rev1, rev2 = _get_revision_range(revision, branch, self.name())
5385
revid1, revid2 = rev1.rev_id, rev2.rev_id
5386
# only show revisions between revid1 and revid2 (inclusive)
5387
tags = [(tag, revid) for tag, revid in tags if
5388
graph.is_between(revid, revid1, revid2)]
5389
if sort == 'alpha':
5390
tags.sort()
5391
elif sort == 'time':
5392
timestamps = {}
5393
for tag, revid in tags:
5394
try:
5395
revobj = branch.repository.get_revision(revid)
5396
except errors.NoSuchRevision:
5397
timestamp = sys.maxint # place them at the end
5398
else:
5399
timestamp = revobj.timestamp
5400
timestamps[revid] = timestamp
5401
tags.sort(key=lambda x: timestamps[x[1]])
5402
if not show_ids:
5403
# [ (tag, revid), ... ] -> [ (tag, dotted_revno), ... ]
5404
for index, (tag, revid) in enumerate(tags):
5405
try:
5406
revno = branch.revision_id_to_dotted_revno(revid)
5407
if isinstance(revno, tuple):
5408
revno = '.'.join(map(str, revno))
5409
except errors.NoSuchRevision:
5410
# Bad tag data/merges can lead to tagged revisions
5411
# which are not in this branch. Fail gracefully ...
5412
revno = '?'
5413
tags[index] = (tag, revno)
5414
self.cleanup_now()
5295
branch.lock_read()
5296
try:
5297
if revision:
5298
graph = branch.repository.get_graph()
5299
rev1, rev2 = _get_revision_range(revision, branch, self.name())
5300
revid1, revid2 = rev1.rev_id, rev2.rev_id
5301
# only show revisions between revid1 and revid2 (inclusive)
5302
tags = [(tag, revid) for tag, revid in tags if
5303
graph.is_between(revid, revid1, revid2)]
5304
if sort == 'alpha':
5305
tags.sort()
5306
elif sort == 'time':
5307
timestamps = {}
5308
for tag, revid in tags:
5309
try:
5310
revobj = branch.repository.get_revision(revid)
5311
except errors.NoSuchRevision:
5312
timestamp = sys.maxint # place them at the end
5313
else:
5314
timestamp = revobj.timestamp
5315
timestamps[revid] = timestamp
5316
tags.sort(key=lambda x: timestamps[x[1]])
5317
if not show_ids:
5318
# [ (tag, revid), ... ] -> [ (tag, dotted_revno), ... ]
5319
for index, (tag, revid) in enumerate(tags):
5320
try:
5321
revno = branch.revision_id_to_dotted_revno(revid)
5322
if isinstance(revno, tuple):
5323
revno = '.'.join(map(str, revno))
5324
except errors.NoSuchRevision:
5325
# Bad tag data/merges can lead to tagged revisions
5326
# which are not in this branch. Fail gracefully ...
5327
revno = '?'
5328
tags[index] = (tag, revno)
5329
finally:
5330
branch.unlock()
5415
5331
for tag, revspec in tags:
5416
5332
self.outf.write('%-20s %s\n' % (tag, revspec))
5417
5333
5418
5334
5419
5335
class cmd_reconfigure(Command):
5420
__doc__ = """Reconfigure the type of a bzr directory.
5336
"""Reconfigure the type of a bzr directory.
5421
5337
5422
5338
A target configuration must be specified.
5423
5339
5508
5424
5509
5425
5510
5426
class cmd_switch(Command):
5511
__doc__ = """Set the branch of a checkout and update.
5427
"""Set the branch of a checkout and update.
5512
5428
5513
5429
For lightweight checkouts, this changes the branch being referenced.
5514
5430
For heavyweight checkouts, this checks that there are no local commits
5530
5446
that of the master.
5531
5447
"""
5532
5448
5533
takes_args = ['to_location?']
5449
takes_args = ['to_location']
5534
5450
takes_options = [Option('force',
5535
5451
help='Switch even if local commits will be lost.'),
5536
'revision',
5537
5452
Option('create-branch', short_name='b',
5538
5453
help='Create the target branch from this one before'
5539
5454
' switching to it.'),
5540
]
5455
]
5541
5456
5542
def run(self, to_location=None, force=False, create_branch=False,
5543
revision=None):
5457
def run(self, to_location, force=False, create_branch=False):
5544
5458
from bzrlib import switch
5545
5459
tree_location = '.'
5546
revision = _get_one_revision('switch', revision)
5547
5460
control_dir = bzrdir.BzrDir.open_containing(tree_location)[0]
5548
if to_location is None:
5549
if revision is None:
5550
raise errors.BzrCommandError('You must supply either a'
5551
' revision or a location')
5552
to_location = '.'
5553
5461
try:
5554
5462
branch = control_dir.open_branch()
5555
5463
had_explicit_nick = branch.get_config().has_explicit_nickname()
5560
5468
if branch is None:
5561
5469
raise errors.BzrCommandError('cannot create branch without'
5562
5470
' source branch')
5563
to_location = directory_service.directories.dereference(
5564
to_location)
5565
5471
if '/' not in to_location and '\\' not in to_location:
5566
5472
# This path is meant to be relative to the existing branch
5567
5473
this_url = self._get_branch_location(control_dir)
5569
5475
to_branch = branch.bzrdir.sprout(to_location,
5570
5476
possible_transports=[branch.bzrdir.root_transport],
5571
5477
source_branch=branch).open_branch()
5478
# try:
5479
# from_branch = control_dir.open_branch()
5480
# except errors.NotBranchError:
5481
# raise BzrCommandError('Cannot create a branch from this'
5482
# ' location when we cannot open this branch')
5483
# from_branch.bzrdir.sprout(
5484
pass
5572
5485
else:
5573
5486
try:
5574
5487
to_branch = Branch.open(to_location)
5576
5489
this_url = self._get_branch_location(control_dir)
5577
5490
to_branch = Branch.open(
5578
5491
urlutils.join(this_url, '..', to_location))
5579
if revision is not None:
5580
revision = revision.as_revision_id(to_branch)
5581
switch.switch(control_dir, to_branch, force, revision_id=revision)
5492
switch.switch(control_dir, to_branch, force)
5582
5493
if had_explicit_nick:
5583
5494
branch = control_dir.open_branch() #get the new branch!
5584
5495
branch.nick = to_branch.nick
5604
5515
5605
5516
5606
5517
class cmd_view(Command):
5607
__doc__ = """Manage filtered views.
5518
"""Manage filtered views.
5608
5519
5609
5520
Views provide a mask over the tree so that users can focus on
5610
5521
a subset of a tree when doing their work. After creating a view,
5758
5669
5759
5670
5760
5671
class cmd_hooks(Command):
5761
__doc__ = """Show hooks."""
5672
"""Show hooks."""
5762
5673
5763
5674
hidden = True
5764
5675
5777
5688
self.outf.write(" <no hooks installed>\n")
5778
5689
5779
5690
5780
class cmd_remove_branch(Command):
5781
__doc__ = """Remove a branch.
5782
5783
This will remove the branch from the specified location but
5784
will keep any working tree or repository in place.
5785
5786
:Examples:
5787
5788
Remove the branch at repo/trunk::
5789
5790
bzr remove-branch repo/trunk
5791
5792
"""
5793
5794
takes_args = ["location?"]
5795
5796
aliases = ["rmbranch"]
5797
5798
def run(self, location=None):
5799
if location is None:
5800
location = "."
5801
branch = Branch.open_containing(location)[0]
5802
branch.bzrdir.destroy_branch()
5803
5804
5805
5691
class cmd_shelve(Command):
5806
__doc__ = """Temporarily set aside some changes from the current tree.
5692
"""Temporarily set aside some changes from the current tree.
5807
5693
5808
5694
Shelve allows you to temporarily put changes you've made "on the shelf",
5809
5695
ie. out of the way, until a later time when you can bring them back from
5862
5748
5863
5749
def run_for_list(self):
5864
5750
tree = WorkingTree.open_containing('.')[0]
5865
self.add_cleanup(tree.lock_read().unlock)
5866
manager = tree.get_shelf_manager()
5867
shelves = manager.active_shelves()
5868
if len(shelves) == 0:
5869
note('No shelved changes.')
5870
return 0
5871
for shelf_id in reversed(shelves):
5872
message = manager.get_metadata(shelf_id).get('message')
5873
if message is None:
5874
message = '<no message>'
5875
self.outf.write('%3d: %s\n' % (shelf_id, message))
5876
return 1
5751
tree.lock_read()
5752
try:
5753
manager = tree.get_shelf_manager()
5754
shelves = manager.active_shelves()
5755
if len(shelves) == 0:
5756
note('No shelved changes.')
5757
return 0
5758
for shelf_id in reversed(shelves):
5759
message = manager.get_metadata(shelf_id).get('message')
5760
if message is None:
5761
message = '<no message>'
5762
self.outf.write('%3d: %s\n' % (shelf_id, message))
5763
return 1
5764
finally:
5765
tree.unlock()
5877
5766
5878
5767
5879
5768
class cmd_unshelve(Command):
5880
__doc__ = """Restore shelved changes.
5769
"""Restore shelved changes.
5881
5770
5882
5771
By default, the most recently shelved changes are restored. However if you
5883
5772
specify a shelf by id those changes will be restored instead. This works
5891
5780
enum_switch=False, value_switches=True,
5892
5781
apply="Apply changes and remove from the shelf.",
5893
5782
dry_run="Show changes, but do not apply or remove them.",
5894
preview="Instead of unshelving the changes, show the diff that "
5895
"would result from unshelving.",
5896
delete_only="Delete changes without applying them.",
5897
keep="Apply changes but don't delete them.",
5783
delete_only="Delete changes without applying them."
5898
5784
)
5899
5785
]
5900
5786
_see_also = ['shelve']
5909
5795
5910
5796
5911
5797
class cmd_clean_tree(Command):
5912
__doc__ = """Remove unwanted files from working tree.
5798
"""Remove unwanted files from working tree.
5913
5799
5914
5800
By default, only unknown files, not ignored files, are deleted. Versioned
5915
5801
files are never deleted.
5923
5809
5924
5810
To check what clean-tree will do, use --dry-run.
5925
5811
"""
5926
takes_options = ['directory',
5927
Option('ignored', help='Delete all ignored files.'),
5812
takes_options = [Option('ignored', help='Delete all ignored files.'),
5928
5813
Option('detritus', help='Delete conflict files, merge'
5929
5814
' backups, and failed selftest dirs.'),
5930
5815
Option('unknown',
5933
5818
' deleting them.'),
5934
5819
Option('force', help='Do not prompt before deleting.')]
5935
5820
def run(self, unknown=False, ignored=False, detritus=False, dry_run=False,
5936
force=False, directory=u'.'):
5821
force=False):
5937
5822
from bzrlib.clean_tree import clean_tree
5938
5823
if not (unknown or ignored or detritus):
5939
5824
unknown = True
5940
5825
if dry_run:
5941
5826
force = True
5942
clean_tree(directory, unknown=unknown, ignored=ignored,
5943
detritus=detritus, dry_run=dry_run, no_prompt=force)
5827
clean_tree('.', unknown=unknown, ignored=ignored, detritus=detritus,
5828
dry_run=dry_run, no_prompt=force)
5944
5829
5945
5830
5946
5831
class cmd_reference(Command):
5947
__doc__ = """list, view and set branch locations for nested trees.
5832
"""list, view and set branch locations for nested trees.
5948
5833
5949
5834
If no arguments are provided, lists the branch locations for nested trees.
5950
5835
If one argument is provided, display the branch location for that tree.
5990
5875
self.outf.write('%s %s\n' % (path, location))
5991
5876
5992
5877
5993
def _register_lazy_builtins():
5994
# register lazy builtins from other modules; called at startup and should
5995
# be only called once.
5996
for (name, aliases, module_name) in [
5997
('cmd_bundle_info', [], 'bzrlib.bundle.commands'),
5998
('cmd_dpush', [], 'bzrlib.foreign'),
5999
('cmd_version_info', [], 'bzrlib.cmd_version_info'),
6000
('cmd_resolve', ['resolved'], 'bzrlib.conflicts'),
6001
('cmd_conflicts', [], 'bzrlib.conflicts'),
6002
('cmd_sign_my_commits', [], 'bzrlib.sign_my_commits'),
6003
]:
6004
builtin_command_registry.register_lazy(name, aliases, module_name)
5878
# these get imported and then picked up by the scan for cmd_*
5879
# TODO: Some more consistent way to split command definitions across files;
5880
# we do need to load at least some information about them to know of
5881
# aliases. ideally we would avoid loading the implementation until the
5882
# details were needed.
5883
from bzrlib.cmd_version_info import cmd_version_info
5884
from bzrlib.conflicts import cmd_resolve, cmd_conflicts, restore
5885
from bzrlib.bundle.commands import (
5886
cmd_bundle_info,
5887
)
5888
from bzrlib.foreign import cmd_dpush
5889
from bzrlib.sign_my_commits import cmd_sign_my_commits
5890
from bzrlib.weave_commands import cmd_versionedfile_list, \
5891
cmd_weave_plan_merge, cmd_weave_merge_text
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0