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