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