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 4819.2.5
- compare with another revision
- download diff
- download tarball
- view history from revision 4819.2.5
- Committer: John Arbash Meinel
- Date: 2009-11-30 03:34:09 UTC
- mto: This revision was merged to the branch mainline in revision 4835.
- Revision ID: john@arbash-meinel.com-20091130033409-h1xi7sxfb58u6j1u
Some small typo fixes.
- files added:
- bzrlib/textui.py
- files removed:
- .testr.conf
- apport
- bzrlib/help_topics/es
- bzrlib/plugins/news_merge
- bzrlib/plugins/news_merge/tests
- bzrlib/tests/per_bzrdir_colo
- contrib/debian
- doc/en/whats-new
- files renamed:
- bzrlib/help_topics/en/conflict-types.txt => bzrlib/help_topics/en/conflicts.txt
- bzrlib/tests/test__bencode.py => bzrlib/tests/test_bencode.py
- bzrlib/help_topics/es/conflict-types.txt => doc/es/user-guide/resolving_conflicts.txt
- files modified:
- .bzrignore
added
removed
bzrlib/builtins.py
1
# Copyright (C) 2005-2010 Canonical Ltd
1
# Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
31
31
bundle,
32
32
btree_index,
33
33
bzrdir,
34
directory_service,
35
34
delta,
36
35
config,
37
36
errors,
44
43
reconfigure,
45
44
rename_map,
46
45
revision as _mod_revision,
47
static_tuple,
48
46
symbol_versioning,
49
47
timestamp,
50
48
transport,
54
52
)
55
53
from bzrlib.branch import Branch
56
54
from bzrlib.conflicts import ConflictList
57
from bzrlib.transport import memory
58
55
from bzrlib.revisionspec import RevisionSpec, RevisionInfo
59
56
from bzrlib.smtp_connection import SMTPConnection
60
57
from bzrlib.workingtree import WorkingTree
61
58
""")
62
59
63
from bzrlib.commands import (
64
Command,
65
builtin_command_registry,
66
display_command,
67
)
60
from bzrlib.commands import Command, display_command
68
61
from bzrlib.option import (
69
62
ListOption,
70
63
Option,
239
232
# opens the branch?)
240
233
241
234
class cmd_status(Command):
242
__doc__ = """Display status summary.
235
"""Display status summary.
243
236
244
237
This reports on versioned and unknown files, reporting them
245
238
grouped by state. Possible states are:
265
258
unknown
266
259
Not versioned and not matching an ignore pattern.
267
260
268
Additionally for directories, symlinks and files with an executable
269
bit, Bazaar indicates their type using a trailing character: '/', '@'
270
or '*' respectively.
271
272
261
To see ignored files use 'bzr ignored'. For details on the
273
262
changes to file texts, use 'bzr diff'.
274
263
332
321
333
322
334
323
class cmd_cat_revision(Command):
335
__doc__ = """Write out metadata for a revision.
324
"""Write out metadata for a revision.
336
325
337
326
The revision to print can either be specified by a specific
338
327
revision identifier, or you can use --revision.
344
333
# cat-revision is more for frontends so should be exact
345
334
encoding = 'strict'
346
335
347
def print_revision(self, revisions, revid):
348
stream = revisions.get_record_stream([(revid,)], 'unordered', True)
349
record = stream.next()
350
if record.storage_kind == 'absent':
351
raise errors.NoSuchRevision(revisions, revid)
352
revtext = record.get_bytes_as('fulltext')
353
self.outf.write(revtext.decode('utf-8'))
354
355
336
@display_command
356
337
def run(self, revision_id=None, revision=None):
357
338
if revision_id is not None and revision is not None:
362
343
' --revision or a revision_id')
363
344
b = WorkingTree.open_containing(u'.')[0].branch
364
345
365
revisions = b.repository.revisions
366
if revisions is None:
367
raise errors.BzrCommandError('Repository %r does not support '
368
'access to raw revision texts')
346
# TODO: jam 20060112 should cat-revision always output utf-8?
347
if revision_id is not None:
348
revision_id = osutils.safe_revision_id(revision_id, warn=False)
349
try:
350
self.outf.write(b.repository.get_revision_xml(revision_id).decode('utf-8'))
351
except errors.NoSuchRevision:
352
msg = "The repository %s contains no revision %s." % (b.repository.base,
353
revision_id)
354
raise errors.BzrCommandError(msg)
355
elif revision is not None:
356
for rev in revision:
357
if rev is None:
358
raise errors.BzrCommandError('You cannot specify a NULL'
359
' revision.')
360
rev_id = rev.as_revision_id(b)
361
self.outf.write(b.repository.get_revision_xml(rev_id).decode('utf-8'))
369
362
370
b.repository.lock_read()
371
try:
372
# TODO: jam 20060112 should cat-revision always output utf-8?
373
if revision_id is not None:
374
revision_id = osutils.safe_revision_id(revision_id, warn=False)
375
try:
376
self.print_revision(revisions, revision_id)
377
except errors.NoSuchRevision:
378
msg = "The repository %s contains no revision %s." % (
379
b.repository.base, revision_id)
380
raise errors.BzrCommandError(msg)
381
elif revision is not None:
382
for rev in revision:
383
if rev is None:
384
raise errors.BzrCommandError(
385
'You cannot specify a NULL revision.')
386
rev_id = rev.as_revision_id(b)
387
self.print_revision(revisions, rev_id)
388
finally:
389
b.repository.unlock()
390
391
363
392
364
class cmd_dump_btree(Command):
393
__doc__ = """Dump the contents of a btree index file to stdout.
365
"""Dump the contents of a btree index file to stdout.
394
366
395
367
PATH is a btree index file, it can be any URL. This includes things like
396
368
.bzr/repository/pack-names, or .bzr/repository/indices/a34b3a...ca4a4.iix
460
432
for node in bt.iter_all_entries():
461
433
# Node is made up of:
462
434
# (index, key, value, [references])
463
try:
464
refs = node[3]
465
except IndexError:
466
refs_as_tuples = None
467
else:
468
refs_as_tuples = static_tuple.as_tuples(refs)
435
refs_as_tuples = tuple([tuple([tuple(ref) for ref in ref_list])
436
for ref_list in node[3]])
469
437
as_tuple = (tuple(node[1]), node[2], refs_as_tuples)
470
438
self.outf.write('%s\n' % (as_tuple,))
471
439
472
440
473
441
class cmd_remove_tree(Command):
474
__doc__ = """Remove the working tree from a given branch/checkout.
442
"""Remove the working tree from a given branch/checkout.
475
443
476
444
Since a lightweight checkout is little more than a working tree
477
445
this will refuse to run against one.
479
447
To re-create the working tree, use "bzr checkout".
480
448
"""
481
449
_see_also = ['checkout', 'working-trees']
482
takes_args = ['location*']
450
takes_args = ['location?']
483
451
takes_options = [
484
452
Option('force',
485
453
help='Remove the working tree even if it has '
486
454
'uncommitted changes.'),
487
455
]
488
456
489
def run(self, location_list, force=False):
490
if not location_list:
491
location_list=['.']
492
493
for location in location_list:
494
d = bzrdir.BzrDir.open(location)
495
496
try:
497
working = d.open_workingtree()
498
except errors.NoWorkingTree:
499
raise errors.BzrCommandError("No working tree to remove")
500
except errors.NotLocalUrl:
501
raise errors.BzrCommandError("You cannot remove the working tree"
502
" of a remote path")
503
if not force:
504
if (working.has_changes()):
505
raise errors.UncommittedChanges(working)
506
507
if working.user_url != working.branch.user_url:
508
raise errors.BzrCommandError("You cannot remove the working tree"
509
" from a lightweight checkout")
510
511
d.destroy_workingtree()
457
def run(self, location='.', force=False):
458
d = bzrdir.BzrDir.open(location)
459
460
try:
461
working = d.open_workingtree()
462
except errors.NoWorkingTree:
463
raise errors.BzrCommandError("No working tree to remove")
464
except errors.NotLocalUrl:
465
raise errors.BzrCommandError("You cannot remove the working tree"
466
" of a remote path")
467
if not force:
468
if (working.has_changes()):
469
raise errors.UncommittedChanges(working)
470
471
working_path = working.bzrdir.root_transport.base
472
branch_path = working.branch.bzrdir.root_transport.base
473
if working_path != branch_path:
474
raise errors.BzrCommandError("You cannot remove the working tree"
475
" from a lightweight checkout")
476
477
d.destroy_workingtree()
512
478
513
479
514
480
class cmd_revno(Command):
515
__doc__ = """Show current revision number.
481
"""Show current revision number.
516
482
517
483
This is equal to the number of revisions on this branch.
518
484
"""
531
497
wt.lock_read()
532
498
except (errors.NoWorkingTree, errors.NotLocalUrl):
533
499
raise errors.NoWorkingTree(location)
534
self.add_cleanup(wt.unlock)
535
revid = wt.last_revision()
536
500
try:
537
revno_t = wt.branch.revision_id_to_dotted_revno(revid)
538
except errors.NoSuchRevision:
539
revno_t = ('???',)
540
revno = ".".join(str(n) for n in revno_t)
501
revid = wt.last_revision()
502
try:
503
revno_t = wt.branch.revision_id_to_dotted_revno(revid)
504
except errors.NoSuchRevision:
505
revno_t = ('???',)
506
revno = ".".join(str(n) for n in revno_t)
507
finally:
508
wt.unlock()
541
509
else:
542
510
b = Branch.open_containing(location)[0]
543
511
b.lock_read()
544
self.add_cleanup(b.unlock)
545
revno = b.revno()
546
self.cleanup_now()
512
try:
513
revno = b.revno()
514
finally:
515
b.unlock()
516
547
517
self.outf.write(str(revno) + '\n')
548
518
549
519
550
520
class cmd_revision_info(Command):
551
__doc__ = """Show revision number and revision id for a given revision identifier.
521
"""Show revision number and revision id for a given revision identifier.
552
522
"""
553
523
hidden = True
554
524
takes_args = ['revision_info*']
571
541
wt = WorkingTree.open_containing(directory)[0]
572
542
b = wt.branch
573
543
wt.lock_read()
574
self.add_cleanup(wt.unlock)
575
544
except (errors.NoWorkingTree, errors.NotLocalUrl):
576
545
wt = None
577
546
b = Branch.open_containing(directory)[0]
578
547
b.lock_read()
579
self.add_cleanup(b.unlock)
580
revision_ids = []
581
if revision is not None:
582
revision_ids.extend(rev.as_revision_id(b) for rev in revision)
583
if revision_info_list is not None:
584
for rev_str in revision_info_list:
585
rev_spec = RevisionSpec.from_string(rev_str)
586
revision_ids.append(rev_spec.as_revision_id(b))
587
# No arguments supplied, default to the last revision
588
if len(revision_ids) == 0:
589
if tree:
590
if wt is None:
591
raise errors.NoWorkingTree(directory)
592
revision_ids.append(wt.last_revision())
548
try:
549
revision_ids = []
550
if revision is not None:
551
revision_ids.extend(rev.as_revision_id(b) for rev in revision)
552
if revision_info_list is not None:
553
for rev_str in revision_info_list:
554
rev_spec = RevisionSpec.from_string(rev_str)
555
revision_ids.append(rev_spec.as_revision_id(b))
556
# No arguments supplied, default to the last revision
557
if len(revision_ids) == 0:
558
if tree:
559
if wt is None:
560
raise errors.NoWorkingTree(directory)
561
revision_ids.append(wt.last_revision())
562
else:
563
revision_ids.append(b.last_revision())
564
565
revinfos = []
566
maxlen = 0
567
for revision_id in revision_ids:
568
try:
569
dotted_revno = b.revision_id_to_dotted_revno(revision_id)
570
revno = '.'.join(str(i) for i in dotted_revno)
571
except errors.NoSuchRevision:
572
revno = '???'
573
maxlen = max(maxlen, len(revno))
574
revinfos.append([revno, revision_id])
575
finally:
576
if wt is None:
577
b.unlock()
593
578
else:
594
revision_ids.append(b.last_revision())
595
596
revinfos = []
597
maxlen = 0
598
for revision_id in revision_ids:
599
try:
600
dotted_revno = b.revision_id_to_dotted_revno(revision_id)
601
revno = '.'.join(str(i) for i in dotted_revno)
602
except errors.NoSuchRevision:
603
revno = '???'
604
maxlen = max(maxlen, len(revno))
605
revinfos.append([revno, revision_id])
606
607
self.cleanup_now()
579
wt.unlock()
580
608
581
for ri in revinfos:
609
582
self.outf.write('%*s %s\n' % (maxlen, ri[0], ri[1]))
610
583
611
584
612
585
class cmd_add(Command):
613
__doc__ = """Add specified files or directories.
586
"""Add specified files or directories.
614
587
615
588
In non-recursive mode, all the named items are added, regardless
616
589
of whether they were previously ignored. A warning is given if
682
655
683
656
if base_tree:
684
657
base_tree.lock_read()
685
self.add_cleanup(base_tree.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()
658
try:
659
tree, file_list = tree_files_for_add(file_list)
660
added, ignored = tree.smart_add(file_list, not
661
no_recurse, action=action, save=not dry_run)
662
finally:
663
if base_tree is not None:
664
base_tree.unlock()
690
665
if len(ignored) > 0:
691
666
if verbose:
692
667
for glob in sorted(ignored.keys()):
696
671
697
672
698
673
class cmd_mkdir(Command):
699
__doc__ = """Create a new versioned directory.
674
"""Create a new versioned directory.
700
675
701
676
This is equivalent to creating the directory and then adding it.
702
677
"""
706
681
707
682
def run(self, dir_list):
708
683
for d in dir_list:
684
os.mkdir(d)
709
685
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)
686
wt.add([dd])
687
self.outf.write('added %s\n' % d)
718
688
719
689
720
690
class cmd_relpath(Command):
721
__doc__ = """Show path of a file relative to root"""
691
"""Show path of a file relative to root"""
722
692
723
693
takes_args = ['filename']
724
694
hidden = True
733
703
734
704
735
705
class cmd_inventory(Command):
736
__doc__ = """Show inventory of the current working copy or a revision.
706
"""Show inventory of the current working copy or a revision.
737
707
738
708
It is possible to limit the output to a particular entry
739
709
type using the --kind option. For example: --kind file.
761
731
revision = _get_one_revision('inventory', revision)
762
732
work_tree, file_list = tree_files(file_list)
763
733
work_tree.lock_read()
764
self.add_cleanup(work_tree.unlock)
765
if revision is not None:
766
tree = revision.as_tree(work_tree.branch)
767
768
extra_trees = [work_tree]
769
tree.lock_read()
770
self.add_cleanup(tree.unlock)
771
else:
772
tree = work_tree
773
extra_trees = []
774
775
if file_list is not None:
776
file_ids = tree.paths2ids(file_list, trees=extra_trees,
777
require_versioned=True)
778
# find_ids_across_trees may include some paths that don't
779
# exist in 'tree'.
780
entries = sorted((tree.id2path(file_id), tree.inventory[file_id])
781
for file_id in file_ids if file_id in tree)
782
else:
783
entries = tree.inventory.entries()
784
785
self.cleanup_now()
734
try:
735
if revision is not None:
736
tree = revision.as_tree(work_tree.branch)
737
738
extra_trees = [work_tree]
739
tree.lock_read()
740
else:
741
tree = work_tree
742
extra_trees = []
743
744
if file_list is not None:
745
file_ids = tree.paths2ids(file_list, trees=extra_trees,
746
require_versioned=True)
747
# find_ids_across_trees may include some paths that don't
748
# exist in 'tree'.
749
entries = sorted((tree.id2path(file_id), tree.inventory[file_id])
750
for file_id in file_ids if file_id in tree)
751
else:
752
entries = tree.inventory.entries()
753
finally:
754
tree.unlock()
755
if tree is not work_tree:
756
work_tree.unlock()
757
786
758
for path, entry in entries:
787
759
if kind and kind != entry.kind:
788
760
continue
794
766
795
767
796
768
class cmd_mv(Command):
797
__doc__ = """Move or rename a file.
769
"""Move or rename a file.
798
770
799
771
:Usage:
800
772
bzr mv OLDNAME NEWNAME
834
806
raise errors.BzrCommandError("missing file argument")
835
807
tree, rel_names = tree_files(names_list, canonicalize=False)
836
808
tree.lock_tree_write()
837
self.add_cleanup(tree.unlock)
838
self._run(tree, names_list, rel_names, after)
809
try:
810
self._run(tree, names_list, rel_names, after)
811
finally:
812
tree.unlock()
839
813
840
814
def run_auto(self, names_list, after, dry_run):
841
815
if names_list is not None and len(names_list) > 1:
846
820
' --auto.')
847
821
work_tree, file_list = tree_files(names_list, default_branch='.')
848
822
work_tree.lock_tree_write()
849
self.add_cleanup(work_tree.unlock)
850
rename_map.RenameMap.guess_renames(work_tree, dry_run)
823
try:
824
rename_map.RenameMap.guess_renames(work_tree, dry_run)
825
finally:
826
work_tree.unlock()
851
827
852
828
def _run(self, tree, names_list, rel_names, after):
853
829
into_existing = osutils.isdir(names_list[-1])
931
907
932
908
933
909
class cmd_pull(Command):
934
__doc__ = """Turn this branch into a mirror of another branch.
910
"""Turn this branch into a mirror of another branch.
935
911
936
By default, this command only works on branches that have not diverged.
937
Branches are considered diverged if the destination branch's most recent
938
commit is one that has not been merged (directly or indirectly) into the
939
parent.
912
This command only works on branches that have not diverged. Branches are
913
considered diverged if the destination branch's most recent commit is one
914
that has not been merged (directly or indirectly) into the parent.
940
915
941
916
If branches have diverged, you can use 'bzr merge' to integrate the changes
942
917
from one into the other. Once one branch has merged, the other should
943
918
be able to pull it again.
944
919
945
If you want to replace your local changes and just want your branch to
946
match the remote one, use pull --overwrite. This will work even if the two
947
branches have diverged.
920
If you want to forget your local changes and just update your branch to
921
match the remote one, use pull --overwrite.
948
922
949
923
If there is no default location set, the first pull will set it. After
950
924
that, you can omit the location to use the default. To change the
986
960
try:
987
961
tree_to = WorkingTree.open_containing(directory)[0]
988
962
branch_to = tree_to.branch
989
tree_to.lock_write()
990
self.add_cleanup(tree_to.unlock)
991
963
except errors.NoWorkingTree:
992
964
tree_to = None
993
965
branch_to = Branch.open_containing(directory)[0]
994
branch_to.lock_write()
995
self.add_cleanup(branch_to.unlock)
996
966
997
967
if local and not branch_to.get_bound_location():
998
968
raise errors.LocalRequiresBoundBranch()
999
969
1029
999
else:
1030
1000
branch_from = Branch.open(location,
1031
1001
possible_transports=possible_transports)
1032
branch_from.lock_read()
1033
self.add_cleanup(branch_from.unlock)
1034
1002
1035
1003
if branch_to.get_parent() is None or remember:
1036
1004
branch_to.set_parent(branch_from.base)
1037
1005
1038
if revision is not None:
1039
revision_id = revision.as_revision_id(branch_from)
1040
1041
if tree_to is not None:
1042
view_info = _get_view_info_for_change_reporter(tree_to)
1043
change_reporter = delta._ChangeReporter(
1044
unversioned_filter=tree_to.is_ignored,
1045
view_info=view_info)
1046
result = tree_to.pull(
1047
branch_from, overwrite, revision_id, change_reporter,
1048
possible_transports=possible_transports, local=local)
1049
else:
1050
result = branch_to.pull(
1051
branch_from, overwrite, revision_id, local=local)
1052
1053
result.report(self.outf)
1054
if verbose and result.old_revid != result.new_revid:
1055
log.show_branch_change(
1056
branch_to, self.outf, result.old_revno,
1057
result.old_revid)
1006
if branch_from is not branch_to:
1007
branch_from.lock_read()
1008
try:
1009
if revision is not None:
1010
revision_id = revision.as_revision_id(branch_from)
1011
1012
branch_to.lock_write()
1013
try:
1014
if tree_to is not None:
1015
view_info = _get_view_info_for_change_reporter(tree_to)
1016
change_reporter = delta._ChangeReporter(
1017
unversioned_filter=tree_to.is_ignored,
1018
view_info=view_info)
1019
result = tree_to.pull(
1020
branch_from, overwrite, revision_id, change_reporter,
1021
possible_transports=possible_transports, local=local)
1022
else:
1023
result = branch_to.pull(
1024
branch_from, overwrite, revision_id, local=local)
1025
1026
result.report(self.outf)
1027
if verbose and result.old_revid != result.new_revid:
1028
log.show_branch_change(
1029
branch_to, self.outf, result.old_revno,
1030
result.old_revid)
1031
finally:
1032
branch_to.unlock()
1033
finally:
1034
if branch_from is not branch_to:
1035
branch_from.unlock()
1058
1036
1059
1037
1060
1038
class cmd_push(Command):
1061
__doc__ = """Update a mirror of this branch.
1039
"""Update a mirror of this branch.
1062
1040
1063
1041
The target branch will not have its working tree populated because this
1064
1042
is both expensive, and is not supported on remote file systems.
1125
1103
# Get the source branch
1126
1104
(tree, br_from,
1127
1105
_unused) = bzrdir.BzrDir.open_containing_tree_or_branch(directory)
1106
if strict is None:
1107
strict = br_from.get_config().get_user_option_as_bool('push_strict')
1108
if strict is None: strict = True # default value
1128
1109
# Get the tip's revision_id
1129
1110
revision = _get_one_revision('push', revision)
1130
1111
if revision is not None:
1131
1112
revision_id = revision.in_history(br_from).rev_id
1132
1113
else:
1133
1114
revision_id = None
1134
if tree is not None and revision_id is None:
1135
tree.check_changed_or_out_of_date(
1136
strict, 'push_strict',
1137
more_error='Use --no-strict to force the push.',
1138
more_warning='Uncommitted changes will not be pushed.')
1115
if strict and tree is not None and revision_id is None:
1116
if (tree.has_changes()):
1117
raise errors.UncommittedChanges(
1118
tree, more='Use --no-strict to force the push.')
1119
if tree.last_revision() != tree.branch.last_revision():
1120
# The tree has lost sync with its branch, there is little
1121
# chance that the user is aware of it but he can still force
1122
# the push with --no-strict
1123
raise errors.OutOfDateTree(
1124
tree, more='Use --no-strict to force the push.')
1125
1139
1126
# Get the stacked_on branch, if any
1140
1127
if stacked_on is not None:
1141
1128
stacked_on = urlutils.normalize_url(stacked_on)
1173
1160
1174
1161
1175
1162
class cmd_branch(Command):
1176
__doc__ = """Create a new branch that is a copy of an existing branch.
1163
"""Create a new branch that is a copy of an existing branch.
1177
1164
1178
1165
If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will
1179
1166
be used. In other words, "branch ../foo/bar" will attempt to create ./bar.
1206
1193
' directory exists, but does not already'
1207
1194
' have a control directory. This flag will'
1208
1195
' allow branch to proceed.'),
1209
Option('bind',
1210
help="Bind new branch to from location."),
1211
1196
]
1212
1197
aliases = ['get', 'clone']
1213
1198
1214
1199
def run(self, from_location, to_location=None, revision=None,
1215
1200
hardlink=False, stacked=False, standalone=False, no_tree=False,
1216
use_existing_dir=False, switch=False, bind=False):
1201
use_existing_dir=False, switch=False):
1217
1202
from bzrlib import switch as _mod_switch
1218
1203
from bzrlib.tag import _merge_tags_if_possible
1219
1204
accelerator_tree, br_from = bzrdir.BzrDir.open_tree_or_branch(
1220
1205
from_location)
1206
if (accelerator_tree is not None and
1207
accelerator_tree.supports_content_filtering()):
1208
accelerator_tree = None
1221
1209
revision = _get_one_revision('branch', revision)
1222
1210
br_from.lock_read()
1223
self.add_cleanup(br_from.unlock)
1224
if revision is not None:
1225
revision_id = revision.as_revision_id(br_from)
1226
else:
1227
# FIXME - wt.last_revision, fallback to branch, fall back to
1228
# None or perhaps NULL_REVISION to mean copy nothing
1229
# RBC 20060209
1230
revision_id = br_from.last_revision()
1231
if to_location is None:
1232
to_location = urlutils.derive_to_location(from_location)
1233
to_transport = transport.get_transport(to_location)
1234
1211
try:
1235
to_transport.mkdir('.')
1236
except errors.FileExists:
1237
if not use_existing_dir:
1238
raise errors.BzrCommandError('Target directory "%s" '
1239
'already exists.' % to_location)
1212
if revision is not None:
1213
revision_id = revision.as_revision_id(br_from)
1240
1214
else:
1241
try:
1242
bzrdir.BzrDir.open_from_transport(to_transport)
1243
except errors.NotBranchError:
1244
pass
1215
# FIXME - wt.last_revision, fallback to branch, fall back to
1216
# None or perhaps NULL_REVISION to mean copy nothing
1217
# RBC 20060209
1218
revision_id = br_from.last_revision()
1219
if to_location is None:
1220
to_location = urlutils.derive_to_location(from_location)
1221
to_transport = transport.get_transport(to_location)
1222
try:
1223
to_transport.mkdir('.')
1224
except errors.FileExists:
1225
if not use_existing_dir:
1226
raise errors.BzrCommandError('Target directory "%s" '
1227
'already exists.' % to_location)
1245
1228
else:
1246
raise errors.AlreadyBranchError(to_location)
1247
except errors.NoSuchFile:
1248
raise errors.BzrCommandError('Parent of "%s" does not exist.'
1249
% to_location)
1250
try:
1251
# preserve whatever source format we have.
1252
dir = br_from.bzrdir.sprout(to_transport.base, revision_id,
1253
possible_transports=[to_transport],
1254
accelerator_tree=accelerator_tree,
1255
hardlink=hardlink, stacked=stacked,
1256
force_new_repo=standalone,
1257
create_tree_if_local=not no_tree,
1258
source_branch=br_from)
1259
branch = dir.open_branch()
1260
except errors.NoSuchRevision:
1261
to_transport.delete_tree('.')
1262
msg = "The branch %s has no revision %s." % (from_location,
1263
revision)
1264
raise errors.BzrCommandError(msg)
1265
_merge_tags_if_possible(br_from, branch)
1266
# If the source branch is stacked, the new branch may
1267
# be stacked whether we asked for that explicitly or not.
1268
# We therefore need a try/except here and not just 'if stacked:'
1269
try:
1270
note('Created new stacked branch referring to %s.' %
1271
branch.get_stacked_on_url())
1272
except (errors.NotStacked, errors.UnstackableBranchFormat,
1273
errors.UnstackableRepositoryFormat), e:
1274
note('Branched %d revision(s).' % branch.revno())
1275
if bind:
1276
# Bind to the parent
1277
parent_branch = Branch.open(from_location)
1278
branch.bind(parent_branch)
1279
note('New branch bound to %s' % from_location)
1280
if switch:
1281
# Switch to the new branch
1282
wt, _ = WorkingTree.open_containing('.')
1283
_mod_switch.switch(wt.bzrdir, branch)
1284
note('Switched to branch: %s',
1285
urlutils.unescape_for_display(branch.base, 'utf-8'))
1229
try:
1230
bzrdir.BzrDir.open_from_transport(to_transport)
1231
except errors.NotBranchError:
1232
pass
1233
else:
1234
raise errors.AlreadyBranchError(to_location)
1235
except errors.NoSuchFile:
1236
raise errors.BzrCommandError('Parent of "%s" does not exist.'
1237
% to_location)
1238
try:
1239
# preserve whatever source format we have.
1240
dir = br_from.bzrdir.sprout(to_transport.base, revision_id,
1241
possible_transports=[to_transport],
1242
accelerator_tree=accelerator_tree,
1243
hardlink=hardlink, stacked=stacked,
1244
force_new_repo=standalone,
1245
create_tree_if_local=not no_tree,
1246
source_branch=br_from)
1247
branch = dir.open_branch()
1248
except errors.NoSuchRevision:
1249
to_transport.delete_tree('.')
1250
msg = "The branch %s has no revision %s." % (from_location,
1251
revision)
1252
raise errors.BzrCommandError(msg)
1253
_merge_tags_if_possible(br_from, branch)
1254
# If the source branch is stacked, the new branch may
1255
# be stacked whether we asked for that explicitly or not.
1256
# We therefore need a try/except here and not just 'if stacked:'
1257
try:
1258
note('Created new stacked branch referring to %s.' %
1259
branch.get_stacked_on_url())
1260
except (errors.NotStacked, errors.UnstackableBranchFormat,
1261
errors.UnstackableRepositoryFormat), e:
1262
note('Branched %d revision(s).' % branch.revno())
1263
if switch:
1264
# Switch to the new branch
1265
wt, _ = WorkingTree.open_containing('.')
1266
_mod_switch.switch(wt.bzrdir, branch)
1267
note('Switched to branch: %s',
1268
urlutils.unescape_for_display(branch.base, 'utf-8'))
1269
finally:
1270
br_from.unlock()
1286
1271
1287
1272
1288
1273
class cmd_checkout(Command):
1289
__doc__ = """Create a new checkout of an existing branch.
1274
"""Create a new checkout of an existing branch.
1290
1275
1291
1276
If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree for
1292
1277
the branch found in '.'. This is useful if you have removed the working tree
1355
1340
1356
1341
1357
1342
class cmd_renames(Command):
1358
__doc__ = """Show list of renamed files.
1343
"""Show list of renamed files.
1359
1344
"""
1360
1345
# TODO: Option to show renames between two historical versions.
1361
1346
1367
1352
def run(self, dir=u'.'):
1368
1353
tree = WorkingTree.open_containing(dir)[0]
1369
1354
tree.lock_read()
1370
self.add_cleanup(tree.unlock)
1371
new_inv = tree.inventory
1372
old_tree = tree.basis_tree()
1373
old_tree.lock_read()
1374
self.add_cleanup(old_tree.unlock)
1375
old_inv = old_tree.inventory
1376
renames = []
1377
iterator = tree.iter_changes(old_tree, include_unchanged=True)
1378
for f, paths, c, v, p, n, k, e in iterator:
1379
if paths[0] == paths[1]:
1380
continue
1381
if None in (paths):
1382
continue
1383
renames.append(paths)
1384
renames.sort()
1385
for old_name, new_name in renames:
1386
self.outf.write("%s => %s\n" % (old_name, new_name))
1355
try:
1356
new_inv = tree.inventory
1357
old_tree = tree.basis_tree()
1358
old_tree.lock_read()
1359
try:
1360
old_inv = old_tree.inventory
1361
renames = []
1362
iterator = tree.iter_changes(old_tree, include_unchanged=True)
1363
for f, paths, c, v, p, n, k, e in iterator:
1364
if paths[0] == paths[1]:
1365
continue
1366
if None in (paths):
1367
continue
1368
renames.append(paths)
1369
renames.sort()
1370
for old_name, new_name in renames:
1371
self.outf.write("%s => %s\n" % (old_name, new_name))
1372
finally:
1373
old_tree.unlock()
1374
finally:
1375
tree.unlock()
1387
1376
1388
1377
1389
1378
class cmd_update(Command):
1390
__doc__ = """Update a tree to have the latest code committed to its branch.
1379
"""Update a tree to have the latest code committed to its branch.
1391
1380
1392
1381
This will perform a merge into the working tree, and may generate
1393
1382
conflicts. If you have any local changes, you will still
1395
1384
1396
1385
If you want to discard your local changes, you can just do a
1397
1386
'bzr revert' instead of 'bzr commit' after the update.
1398
1399
If the tree's branch is bound to a master branch, it will also update
1400
the branch from the master.
1401
1387
"""
1402
1388
1403
1389
_see_also = ['pull', 'working-trees', 'status-flags']
1404
1390
takes_args = ['dir?']
1405
takes_options = ['revision']
1406
1391
aliases = ['up']
1407
1392
1408
def run(self, dir='.', revision=None):
1409
if revision is not None and len(revision) != 1:
1410
raise errors.BzrCommandError(
1411
"bzr update --revision takes exactly one revision")
1393
def run(self, dir='.'):
1412
1394
tree = WorkingTree.open_containing(dir)[0]
1413
branch = tree.branch
1414
1395
possible_transports = []
1415
master = branch.get_master_branch(
1396
master = tree.branch.get_master_branch(
1416
1397
possible_transports=possible_transports)
1417
1398
if master is not None:
1418
1399
tree.lock_write()
1419
branch_location = master.base
1420
1400
else:
1421
1401
tree.lock_tree_write()
1422
branch_location = tree.branch.base
1423
self.add_cleanup(tree.unlock)
1424
# get rid of the final '/' and be ready for display
1425
branch_location = urlutils.unescape_for_display(
1426
branch_location.rstrip('/'),
1427
self.outf.encoding)
1428
existing_pending_merges = tree.get_parent_ids()[1:]
1429
if master is None:
1430
old_tip = None
1431
else:
1432
# may need to fetch data into a heavyweight checkout
1433
# XXX: this may take some time, maybe we should display a
1434
# message
1435
old_tip = branch.update(possible_transports)
1436
if revision is not None:
1437
revision_id = revision[0].as_revision_id(branch)
1438
else:
1439
revision_id = branch.last_revision()
1440
if revision_id == _mod_revision.ensure_null(tree.last_revision()):
1441
revno = branch.revision_id_to_dotted_revno(revision_id)
1442
note("Tree is up to date at revision %s of branch %s" %
1443
('.'.join(map(str, revno)), branch_location))
1444
return 0
1445
view_info = _get_view_info_for_change_reporter(tree)
1446
change_reporter = delta._ChangeReporter(
1447
unversioned_filter=tree.is_ignored,
1448
view_info=view_info)
1449
1402
try:
1403
existing_pending_merges = tree.get_parent_ids()[1:]
1404
last_rev = _mod_revision.ensure_null(tree.last_revision())
1405
if last_rev == _mod_revision.ensure_null(
1406
tree.branch.last_revision()):
1407
# may be up to date, check master too.
1408
if master is None or last_rev == _mod_revision.ensure_null(
1409
master.last_revision()):
1410
revno = tree.branch.revision_id_to_revno(last_rev)
1411
note("Tree is up to date at revision %d." % (revno,))
1412
return 0
1413
view_info = _get_view_info_for_change_reporter(tree)
1450
1414
conflicts = tree.update(
1451
change_reporter,
1452
possible_transports=possible_transports,
1453
revision=revision_id,
1454
old_tip=old_tip)
1455
except errors.NoSuchRevision, e:
1456
raise errors.BzrCommandError(
1457
"branch has no revision %s\n"
1458
"bzr update --revision only works"
1459
" for a revision in the branch history"
1460
% (e.revision))
1461
revno = tree.branch.revision_id_to_dotted_revno(
1462
_mod_revision.ensure_null(tree.last_revision()))
1463
note('Updated to revision %s of branch %s' %
1464
('.'.join(map(str, revno)), branch_location))
1465
parent_ids = tree.get_parent_ids()
1466
if parent_ids[1:] and parent_ids[1:] != existing_pending_merges:
1467
note('Your local commits will now show as pending merges with '
1468
"'bzr status', and can be committed with 'bzr commit'.")
1469
if conflicts != 0:
1470
return 1
1471
else:
1472
return 0
1415
delta._ChangeReporter(unversioned_filter=tree.is_ignored,
1416
view_info=view_info), possible_transports=possible_transports)
1417
revno = tree.branch.revision_id_to_revno(
1418
_mod_revision.ensure_null(tree.last_revision()))
1419
note('Updated to revision %d.' % (revno,))
1420
if tree.get_parent_ids()[1:] != existing_pending_merges:
1421
note('Your local commits will now show as pending merges with '
1422
"'bzr status', and can be committed with 'bzr commit'.")
1423
if conflicts != 0:
1424
return 1
1425
else:
1426
return 0
1427
finally:
1428
tree.unlock()
1473
1429
1474
1430
1475
1431
class cmd_info(Command):
1476
__doc__ = """Show information about a working tree, branch or repository.
1432
"""Show information about a working tree, branch or repository.
1477
1433
1478
1434
This command will show all known locations and formats associated to the
1479
1435
tree, branch or repository.
1517
1473
1518
1474
1519
1475
class cmd_remove(Command):
1520
__doc__ = """Remove files or directories.
1476
"""Remove files or directories.
1521
1477
1522
1478
This makes bzr stop tracking changes to the specified files. bzr will delete
1523
1479
them if they can easily be recovered using revert. If no options or
1546
1502
file_list = [f for f in file_list]
1547
1503
1548
1504
tree.lock_write()
1549
self.add_cleanup(tree.unlock)
1550
# Heuristics should probably all move into tree.remove_smart or
1551
# some such?
1552
if new:
1553
added = tree.changes_from(tree.basis_tree(),
1554
specific_files=file_list).added
1555
file_list = sorted([f[0] for f in added], reverse=True)
1556
if len(file_list) == 0:
1557
raise errors.BzrCommandError('No matching files.')
1558
elif file_list is None:
1559
# missing files show up in iter_changes(basis) as
1560
# versioned-with-no-kind.
1561
missing = []
1562
for change in tree.iter_changes(tree.basis_tree()):
1563
# Find paths in the working tree that have no kind:
1564
if change[1][1] is not None and change[6][1] is None:
1565
missing.append(change[1][1])
1566
file_list = sorted(missing, reverse=True)
1567
file_deletion_strategy = 'keep'
1568
tree.remove(file_list, verbose=verbose, to_file=self.outf,
1569
keep_files=file_deletion_strategy=='keep',
1570
force=file_deletion_strategy=='force')
1505
try:
1506
# Heuristics should probably all move into tree.remove_smart or
1507
# some such?
1508
if new:
1509
added = tree.changes_from(tree.basis_tree(),
1510
specific_files=file_list).added
1511
file_list = sorted([f[0] for f in added], reverse=True)
1512
if len(file_list) == 0:
1513
raise errors.BzrCommandError('No matching files.')
1514
elif file_list is None:
1515
# missing files show up in iter_changes(basis) as
1516
# versioned-with-no-kind.
1517
missing = []
1518
for change in tree.iter_changes(tree.basis_tree()):
1519
# Find paths in the working tree that have no kind:
1520
if change[1][1] is not None and change[6][1] is None:
1521
missing.append(change[1][1])
1522
file_list = sorted(missing, reverse=True)
1523
file_deletion_strategy = 'keep'
1524
tree.remove(file_list, verbose=verbose, to_file=self.outf,
1525
keep_files=file_deletion_strategy=='keep',
1526
force=file_deletion_strategy=='force')
1527
finally:
1528
tree.unlock()
1571
1529
1572
1530
1573
1531
class cmd_file_id(Command):
1574
__doc__ = """Print file_id of a particular file or directory.
1532
"""Print file_id of a particular file or directory.
1575
1533
1576
1534
The file_id is assigned when the file is first added and remains the
1577
1535
same through all revisions where the file exists, even when it is
1593
1551
1594
1552
1595
1553
class cmd_file_path(Command):
1596
__doc__ = """Print path of file_ids to a file or directory.
1554
"""Print path of file_ids to a file or directory.
1597
1555
1598
1556
This prints one line for each directory down to the target,
1599
1557
starting at the branch root.
1615
1573
1616
1574
1617
1575
class cmd_reconcile(Command):
1618
__doc__ = """Reconcile bzr metadata in a branch.
1576
"""Reconcile bzr metadata in a branch.
1619
1577
1620
1578
This can correct data mismatches that may have been caused by
1621
1579
previous ghost operations or bzr upgrades. You should only
1643
1601
1644
1602
1645
1603
class cmd_revision_history(Command):
1646
__doc__ = """Display the list of revision ids on a branch."""
1604
"""Display the list of revision ids on a branch."""
1647
1605
1648
1606
_see_also = ['log']
1649
1607
takes_args = ['location?']
1659
1617
1660
1618
1661
1619
class cmd_ancestry(Command):
1662
__doc__ = """List all revisions merged into this branch."""
1620
"""List all revisions merged into this branch."""
1663
1621
1664
1622
_see_also = ['log', 'revision-history']
1665
1623
takes_args = ['location?']
1684
1642
1685
1643
1686
1644
class cmd_init(Command):
1687
__doc__ = """Make a directory into a versioned branch.
1645
"""Make a directory into a versioned branch.
1688
1646
1689
1647
Use this to create an empty branch, or before importing an
1690
1648
existing project.
1793
1751
1794
1752
1795
1753
class cmd_init_repository(Command):
1796
__doc__ = """Create a shared repository for branches to share storage space.
1754
"""Create a shared repository to hold branches.
1797
1755
1798
1756
New branches created under the repository directory will store their
1799
revisions in the repository, not in the branch directory. For branches
1800
with shared history, this reduces the amount of storage needed and
1801
speeds up the creation of new branches.
1757
revisions in the repository, not in the branch directory.
1802
1758
1803
If the --no-trees option is given then the branches in the repository
1804
will not have working trees by default. They will still exist as
1805
directories on disk, but they will not have separate copies of the
1806
files at a certain revision. This can be useful for repositories that
1807
store branches which are interacted with through checkouts or remote
1808
branches, such as on a server.
1759
If the --no-trees option is used then the branches in the repository
1760
will not have working trees by default.
1809
1761
1810
1762
:Examples:
1811
Create a shared repository holding just branches::
1763
Create a shared repositories holding just branches::
1812
1764
1813
1765
bzr init-repo --no-trees repo
1814
1766
bzr init repo/trunk
1853
1805
1854
1806
1855
1807
class cmd_diff(Command):
1856
__doc__ = """Show differences in the working tree, between revisions or branches.
1808
"""Show differences in the working tree, between revisions or branches.
1857
1809
1858
1810
If no arguments are given, all changes for the current tree are listed.
1859
1811
If files are given, only the changes in those files are listed.
1880
1832
1881
1833
bzr diff -r1
1882
1834
1883
Difference between revision 3 and revision 1::
1884
1885
bzr diff -r1..3
1886
1887
Difference between revision 3 and revision 1 for branch xxx::
1888
1889
bzr diff -r1..3 xxx
1890
1891
To see the changes introduced in revision X::
1892
1893
bzr diff -cX
1894
1895
Note that in the case of a merge, the -c option shows the changes
1896
compared to the left hand parent. To see the changes against
1897
another parent, use::
1898
1899
bzr diff -r<chosen_parent>..X
1900
1901
The changes introduced by revision 2 (equivalent to -r1..2)::
1902
1903
bzr diff -c2
1835
Difference between revision 2 and revision 1::
1836
1837
bzr diff -r1..2
1838
1839
Difference between revision 2 and revision 1 for branch xxx::
1840
1841
bzr diff -r1..2 xxx
1904
1842
1905
1843
Show just the differences for file NEWS::
1906
1844
1945
1883
help='Use this command to compare files.',
1946
1884
type=unicode,
1947
1885
),
1948
RegistryOption('format',
1949
help='Diff format to use.',
1950
lazy_registry=('bzrlib.diff', 'format_registry'),
1951
value_switches=False, title='Diff format'),
1952
1886
]
1953
1887
aliases = ['di', 'dif']
1954
1888
encoding_type = 'exact'
1955
1889
1956
1890
@display_command
1957
1891
def run(self, revision=None, file_list=None, diff_options=None,
1958
prefix=None, old=None, new=None, using=None, format=None):
1959
from bzrlib.diff import (get_trees_and_branches_to_diff_locked,
1960
show_diff_trees)
1892
prefix=None, old=None, new=None, using=None):
1893
from bzrlib.diff import get_trees_and_branches_to_diff, show_diff_trees
1961
1894
1962
1895
if (prefix is None) or (prefix == '0'):
1963
1896
# diff -p0 format
1977
1910
raise errors.BzrCommandError('bzr diff --revision takes exactly'
1978
1911
' one or two revision specifiers')
1979
1912
1980
if using is not None and format is not None:
1981
raise errors.BzrCommandError('--using and --format are mutually '
1982
'exclusive.')
1983
1984
1913
(old_tree, new_tree,
1985
1914
old_branch, new_branch,
1986
specific_files, extra_trees) = get_trees_and_branches_to_diff_locked(
1987
file_list, revision, old, new, self.add_cleanup, apply_view=True)
1915
specific_files, extra_trees) = get_trees_and_branches_to_diff(
1916
file_list, revision, old, new, apply_view=True)
1988
1917
return show_diff_trees(old_tree, new_tree, sys.stdout,
1989
1918
specific_files=specific_files,
1990
1919
external_diff_options=diff_options,
1991
1920
old_label=old_label, new_label=new_label,
1992
extra_trees=extra_trees, using=using,
1993
format_cls=format)
1921
extra_trees=extra_trees, using=using)
1994
1922
1995
1923
1996
1924
class cmd_deleted(Command):
1997
__doc__ = """List files deleted in the working tree.
1925
"""List files deleted in the working tree.
1998
1926
"""
1999
1927
# TODO: Show files deleted since a previous revision, or
2000
1928
# between two revisions.
2009
1937
def run(self, show_ids=False):
2010
1938
tree = WorkingTree.open_containing(u'.')[0]
2011
1939
tree.lock_read()
2012
self.add_cleanup(tree.unlock)
2013
old = tree.basis_tree()
2014
old.lock_read()
2015
self.add_cleanup(old.unlock)
2016
for path, ie in old.inventory.iter_entries():
2017
if not tree.has_id(ie.file_id):
2018
self.outf.write(path)
2019
if show_ids:
2020
self.outf.write(' ')
2021
self.outf.write(ie.file_id)
2022
self.outf.write('\n')
1940
try:
1941
old = tree.basis_tree()
1942
old.lock_read()
1943
try:
1944
for path, ie in old.inventory.iter_entries():
1945
if not tree.has_id(ie.file_id):
1946
self.outf.write(path)
1947
if show_ids:
1948
self.outf.write(' ')
1949
self.outf.write(ie.file_id)
1950
self.outf.write('\n')
1951
finally:
1952
old.unlock()
1953
finally:
1954
tree.unlock()
2023
1955
2024
1956
2025
1957
class cmd_modified(Command):
2026
__doc__ = """List files modified in working tree.
1958
"""List files modified in working tree.
2027
1959
"""
2028
1960
2029
1961
hidden = True
2046
1978
2047
1979
2048
1980
class cmd_added(Command):
2049
__doc__ = """List files added in working tree.
1981
"""List files added in working tree.
2050
1982
"""
2051
1983
2052
1984
hidden = True
2061
1993
def run(self, null=False):
2062
1994
wt = WorkingTree.open_containing(u'.')[0]
2063
1995
wt.lock_read()
2064
self.add_cleanup(wt.unlock)
2065
basis = wt.basis_tree()
2066
basis.lock_read()
2067
self.add_cleanup(basis.unlock)
2068
basis_inv = basis.inventory
2069
inv = wt.inventory
2070
for file_id in inv:
2071
if file_id in basis_inv:
2072
continue
2073
if inv.is_root(file_id) and len(basis_inv) == 0:
2074
continue
2075
path = inv.id2path(file_id)
2076
if not os.access(osutils.abspath(path), os.F_OK):
2077
continue
2078
if null:
2079
self.outf.write(path + '\0')
2080
else:
2081
self.outf.write(osutils.quotefn(path) + '\n')
1996
try:
1997
basis = wt.basis_tree()
1998
basis.lock_read()
1999
try:
2000
basis_inv = basis.inventory
2001
inv = wt.inventory
2002
for file_id in inv:
2003
if file_id in basis_inv:
2004
continue
2005
if inv.is_root(file_id) and len(basis_inv) == 0:
2006
continue
2007
path = inv.id2path(file_id)
2008
if not os.access(osutils.abspath(path), os.F_OK):
2009
continue
2010
if null:
2011
self.outf.write(path + '\0')
2012
else:
2013
self.outf.write(osutils.quotefn(path) + '\n')
2014
finally:
2015
basis.unlock()
2016
finally:
2017
wt.unlock()
2082
2018
2083
2019
2084
2020
class cmd_root(Command):
2085
__doc__ = """Show the tree root directory.
2021
"""Show the tree root directory.
2086
2022
2087
2023
The root is the nearest enclosing directory with a .bzr control
2088
2024
directory."""
2112
2048
2113
2049
2114
2050
class cmd_log(Command):
2115
__doc__ = """Show historical log for a branch or subset of a branch.
2051
"""Show historical log for a branch or subset of a branch.
2116
2052
2117
2053
log is bzr's default tool for exploring the history of a branch.
2118
2054
The branch to use is taken from the first parameter. If no parameters
2229
2165
:Tips & tricks:
2230
2166
2231
2167
GUI tools and IDEs are often better at exploring history than command
2232
line tools: you may prefer qlog or viz from qbzr or bzr-gtk, the
2233
bzr-explorer shell, or the Loggerhead web interface. See the Plugin
2234
Guide <http://doc.bazaar.canonical.com/plugins/en/> and
2235
<http://wiki.bazaar.canonical.com/IDEIntegration>.
2168
line tools. You may prefer qlog or glog from the QBzr and Bzr-Gtk packages
2169
respectively for example. (TortoiseBzr uses qlog for displaying logs.) See
2170
http://bazaar-vcs.org/BzrPlugins and http://bazaar-vcs.org/IDEIntegration.
2171
2172
Web interfaces are often better at exploring history than command line
2173
tools, particularly for branches on servers. You may prefer Loggerhead
2174
or one of its alternatives. See http://bazaar-vcs.org/WebInterface.
2236
2175
2237
2176
You may find it useful to add the aliases below to ``bazaar.conf``::
2238
2177
2299
2238
help='Show changes made in each revision as a patch.'),
2300
2239
Option('include-merges',
2301
2240
help='Show merged revisions like --levels 0 does.'),
2302
Option('exclude-common-ancestry',
2303
help='Display only the revisions that are not part'
2304
' of both ancestries (require -rX..Y)'
2305
)
2306
2241
]
2307
2242
encoding_type = 'replace'
2308
2243
2318
2253
message=None,
2319
2254
limit=None,
2320
2255
show_diff=False,
2321
include_merges=False,
2322
exclude_common_ancestry=False,
2323
):
2256
include_merges=False):
2324
2257
from bzrlib.log import (
2325
2258
Logger,
2326
2259
make_log_request_dict,
2327
2260
_get_info_for_log_files,
2328
2261
)
2329
2262
direction = (forward and 'forward') or 'reverse'
2330
if (exclude_common_ancestry
2331
and (revision is None or len(revision) != 2)):
2332
raise errors.BzrCommandError(
2333
'--exclude-common-ancestry requires -r with two revisions')
2334
2263
if include_merges:
2335
2264
if levels is None:
2336
2265
levels = 0
2349
2278
2350
2279
file_ids = []
2351
2280
filter_by_dir = False
2352
if file_list:
2353
# find the file ids to log and check for directory filtering
2354
b, file_info_list, rev1, rev2 = _get_info_for_log_files(
2355
revision, file_list)
2356
self.add_cleanup(b.unlock)
2357
for relpath, file_id, kind in file_info_list:
2358
if file_id is None:
2359
raise errors.BzrCommandError(
2360
"Path unknown at end or start of revision range: %s" %
2361
relpath)
2362
# If the relpath is the top of the tree, we log everything
2363
if relpath == '':
2364
file_ids = []
2365
break
2281
b = None
2282
try:
2283
if file_list:
2284
# find the file ids to log and check for directory filtering
2285
b, file_info_list, rev1, rev2 = _get_info_for_log_files(
2286
revision, file_list)
2287
for relpath, file_id, kind in file_info_list:
2288
if file_id is None:
2289
raise errors.BzrCommandError(
2290
"Path unknown at end or start of revision range: %s" %
2291
relpath)
2292
# If the relpath is the top of the tree, we log everything
2293
if relpath == '':
2294
file_ids = []
2295
break
2296
else:
2297
file_ids.append(file_id)
2298
filter_by_dir = filter_by_dir or (
2299
kind in ['directory', 'tree-reference'])
2300
else:
2301
# log everything
2302
# FIXME ? log the current subdir only RBC 20060203
2303
if revision is not None \
2304
and len(revision) > 0 and revision[0].get_branch():
2305
location = revision[0].get_branch()
2366
2306
else:
2367
file_ids.append(file_id)
2368
filter_by_dir = filter_by_dir or (
2369
kind in ['directory', 'tree-reference'])
2370
else:
2371
# log everything
2372
# FIXME ? log the current subdir only RBC 20060203
2373
if revision is not None \
2374
and len(revision) > 0 and revision[0].get_branch():
2375
location = revision[0].get_branch()
2376
else:
2377
location = '.'
2378
dir, relpath = bzrdir.BzrDir.open_containing(location)
2379
b = dir.open_branch()
2380
b.lock_read()
2381
self.add_cleanup(b.unlock)
2382
rev1, rev2 = _get_revision_range(revision, b, self.name())
2383
2384
# Decide on the type of delta & diff filtering to use
2385
# TODO: add an --all-files option to make this configurable & consistent
2386
if not verbose:
2387
delta_type = None
2388
else:
2389
delta_type = 'full'
2390
if not show_diff:
2391
diff_type = None
2392
elif file_ids:
2393
diff_type = 'partial'
2394
else:
2395
diff_type = 'full'
2396
2397
# Build the log formatter
2398
if log_format is None:
2399
log_format = log.log_formatter_registry.get_default(b)
2400
# Make a non-encoding output to include the diffs - bug 328007
2401
unencoded_output = ui.ui_factory.make_output_stream(encoding_type='exact')
2402
lf = log_format(show_ids=show_ids, to_file=self.outf,
2403
to_exact_file=unencoded_output,
2404
show_timezone=timezone,
2405
delta_format=get_verbosity_level(),
2406
levels=levels,
2407
show_advice=levels is None)
2408
2409
# Choose the algorithm for doing the logging. It's annoying
2410
# having multiple code paths like this but necessary until
2411
# the underlying repository format is faster at generating
2412
# deltas or can provide everything we need from the indices.
2413
# The default algorithm - match-using-deltas - works for
2414
# multiple files and directories and is faster for small
2415
# amounts of history (200 revisions say). However, it's too
2416
# slow for logging a single file in a repository with deep
2417
# history, i.e. > 10K revisions. In the spirit of "do no
2418
# evil when adding features", we continue to use the
2419
# original algorithm - per-file-graph - for the "single
2420
# file that isn't a directory without showing a delta" case.
2421
partial_history = revision and b.repository._format.supports_chks
2422
match_using_deltas = (len(file_ids) != 1 or filter_by_dir
2423
or delta_type or partial_history)
2424
2425
# Build the LogRequest and execute it
2426
if len(file_ids) == 0:
2427
file_ids = None
2428
rqst = make_log_request_dict(
2429
direction=direction, specific_fileids=file_ids,
2430
start_revision=rev1, end_revision=rev2, limit=limit,
2431
message_search=message, delta_type=delta_type,
2432
diff_type=diff_type, _match_using_deltas=match_using_deltas,
2433
exclude_common_ancestry=exclude_common_ancestry,
2434
)
2435
Logger(b, rqst).show(lf)
2307
location = '.'
2308
dir, relpath = bzrdir.BzrDir.open_containing(location)
2309
b = dir.open_branch()
2310
b.lock_read()
2311
rev1, rev2 = _get_revision_range(revision, b, self.name())
2312
2313
# Decide on the type of delta & diff filtering to use
2314
# TODO: add an --all-files option to make this configurable & consistent
2315
if not verbose:
2316
delta_type = None
2317
else:
2318
delta_type = 'full'
2319
if not show_diff:
2320
diff_type = None
2321
elif file_ids:
2322
diff_type = 'partial'
2323
else:
2324
diff_type = 'full'
2325
2326
# Build the log formatter
2327
if log_format is None:
2328
log_format = log.log_formatter_registry.get_default(b)
2329
lf = log_format(show_ids=show_ids, to_file=self.outf,
2330
show_timezone=timezone,
2331
delta_format=get_verbosity_level(),
2332
levels=levels,
2333
show_advice=levels is None)
2334
2335
# Choose the algorithm for doing the logging. It's annoying
2336
# having multiple code paths like this but necessary until
2337
# the underlying repository format is faster at generating
2338
# deltas or can provide everything we need from the indices.
2339
# The default algorithm - match-using-deltas - works for
2340
# multiple files and directories and is faster for small
2341
# amounts of history (200 revisions say). However, it's too
2342
# slow for logging a single file in a repository with deep
2343
# history, i.e. > 10K revisions. In the spirit of "do no
2344
# evil when adding features", we continue to use the
2345
# original algorithm - per-file-graph - for the "single
2346
# file that isn't a directory without showing a delta" case.
2347
partial_history = revision and b.repository._format.supports_chks
2348
match_using_deltas = (len(file_ids) != 1 or filter_by_dir
2349
or delta_type or partial_history)
2350
2351
# Build the LogRequest and execute it
2352
if len(file_ids) == 0:
2353
file_ids = None
2354
rqst = make_log_request_dict(
2355
direction=direction, specific_fileids=file_ids,
2356
start_revision=rev1, end_revision=rev2, limit=limit,
2357
message_search=message, delta_type=delta_type,
2358
diff_type=diff_type, _match_using_deltas=match_using_deltas)
2359
Logger(b, rqst).show(lf)
2360
finally:
2361
if b is not None:
2362
b.unlock()
2436
2363
2437
2364
2438
2365
def _get_revision_range(revisionspec_list, branch, command_name):
2456
2383
raise errors.BzrCommandError(
2457
2384
"bzr %s doesn't accept two revisions in different"
2458
2385
" branches." % command_name)
2459
if start_spec.spec is None:
2460
# Avoid loading all the history.
2461
rev1 = RevisionInfo(branch, None, None)
2462
else:
2463
rev1 = start_spec.in_history(branch)
2386
rev1 = start_spec.in_history(branch)
2464
2387
# Avoid loading all of history when we know a missing
2465
2388
# end of range means the last revision ...
2466
2389
if end_spec.spec is None:
2495
2418
2496
2419
2497
2420
class cmd_touching_revisions(Command):
2498
__doc__ = """Return revision-ids which affected a particular file.
2421
"""Return revision-ids which affected a particular file.
2499
2422
2500
2423
A more user-friendly interface is "bzr log FILE".
2501
2424
"""
2509
2432
file_id = tree.path2id(relpath)
2510
2433
b = tree.branch
2511
2434
b.lock_read()
2512
self.add_cleanup(b.unlock)
2513
touching_revs = log.find_touching_revisions(b, file_id)
2514
for revno, revision_id, what in touching_revs:
2515
self.outf.write("%6d %s\n" % (revno, what))
2435
try:
2436
touching_revs = log.find_touching_revisions(b, file_id)
2437
for revno, revision_id, what in touching_revs:
2438
self.outf.write("%6d %s\n" % (revno, what))
2439
finally:
2440
b.unlock()
2516
2441
2517
2442
2518
2443
class cmd_ls(Command):
2519
__doc__ = """List files in a tree.
2444
"""List files in a tree.
2520
2445
"""
2521
2446
2522
2447
_see_also = ['status', 'cat']
2570
2495
if from_root:
2571
2496
if relpath:
2572
2497
prefix = relpath + '/'
2573
elif fs_path != '.' and not fs_path.endswith('/'):
2498
elif fs_path != '.':
2574
2499
prefix = fs_path + '/'
2575
2500
2576
2501
if revision is not None or tree is None:
2585
2510
note("Ignoring files outside view. View is %s" % view_str)
2586
2511
2587
2512
tree.lock_read()
2588
self.add_cleanup(tree.unlock)
2589
for fp, fc, fkind, fid, entry in tree.list_files(include_root=False,
2590
from_dir=relpath, recursive=recursive):
2591
# Apply additional masking
2592
if not all and not selection[fc]:
2593
continue
2594
if kind is not None and fkind != kind:
2595
continue
2596
if apply_view:
2597
try:
2598
if relpath:
2599
fullpath = osutils.pathjoin(relpath, fp)
2600
else:
2601
fullpath = fp
2602
views.check_path_in_view(tree, fullpath)
2603
except errors.FileOutsideView:
2604
continue
2513
try:
2514
for fp, fc, fkind, fid, entry in tree.list_files(include_root=False,
2515
from_dir=relpath, recursive=recursive):
2516
# Apply additional masking
2517
if not all and not selection[fc]:
2518
continue
2519
if kind is not None and fkind != kind:
2520
continue
2521
if apply_view:
2522
try:
2523
if relpath:
2524
fullpath = osutils.pathjoin(relpath, fp)
2525
else:
2526
fullpath = fp
2527
views.check_path_in_view(tree, fullpath)
2528
except errors.FileOutsideView:
2529
continue
2605
2530
2606
# Output the entry
2607
if prefix:
2608
fp = osutils.pathjoin(prefix, fp)
2609
kindch = entry.kind_character()
2610
outstring = fp + kindch
2611
ui.ui_factory.clear_term()
2612
if verbose:
2613
outstring = '%-8s %s' % (fc, outstring)
2614
if show_ids and fid is not None:
2615
outstring = "%-50s %s" % (outstring, fid)
2616
self.outf.write(outstring + '\n')
2617
elif null:
2618
self.outf.write(fp + '\0')
2619
if show_ids:
2620
if fid is not None:
2621
self.outf.write(fid)
2622
self.outf.write('\0')
2623
self.outf.flush()
2624
else:
2625
if show_ids:
2626
if fid is not None:
2627
my_id = fid
2628
else:
2629
my_id = ''
2630
self.outf.write('%-50s %s\n' % (outstring, my_id))
2631
else:
2531
# Output the entry
2532
if prefix:
2533
fp = osutils.pathjoin(prefix, fp)
2534
kindch = entry.kind_character()
2535
outstring = fp + kindch
2536
ui.ui_factory.clear_term()
2537
if verbose:
2538
outstring = '%-8s %s' % (fc, outstring)
2539
if show_ids and fid is not None:
2540
outstring = "%-50s %s" % (outstring, fid)
2632
2541
self.outf.write(outstring + '\n')
2542
elif null:
2543
self.outf.write(fp + '\0')
2544
if show_ids:
2545
if fid is not None:
2546
self.outf.write(fid)
2547
self.outf.write('\0')
2548
self.outf.flush()
2549
else:
2550
if show_ids:
2551
if fid is not None:
2552
my_id = fid
2553
else:
2554
my_id = ''
2555
self.outf.write('%-50s %s\n' % (outstring, my_id))
2556
else:
2557
self.outf.write(outstring + '\n')
2558
finally:
2559
tree.unlock()
2633
2560
2634
2561
2635
2562
class cmd_unknowns(Command):
2636
__doc__ = """List unknown files.
2563
"""List unknown files.
2637
2564
"""
2638
2565
2639
2566
hidden = True
2646
2573
2647
2574
2648
2575
class cmd_ignore(Command):
2649
__doc__ = """Ignore specified files or patterns.
2576
"""Ignore specified files or patterns.
2650
2577
2651
2578
See ``bzr help patterns`` for details on the syntax of patterns.
2652
2579
2660
2587
After adding, editing or deleting that file either indirectly by
2661
2588
using this command or directly by using an editor, be sure to commit
2662
2589
it.
2663
2664
Bazaar also supports a global ignore file ~/.bazaar/ignore. On Windows
2665
the global ignore file can be found in the application data directory as
2666
C:\\Documents and Settings\\<user>\\Application Data\\Bazaar\\2.0\\ignore.
2667
Global ignores are not touched by this command. The global ignore file
2668
can be edited directly using an editor.
2669
2670
Patterns prefixed with '!' are exceptions to ignore patterns and take
2671
precedence over regular ignores. Such exceptions are used to specify
2672
files that should be versioned which would otherwise be ignored.
2673
2674
Patterns prefixed with '!!' act as regular ignore patterns, but have
2675
precedence over the '!' exception patterns.
2676
2590
2677
2591
Note: ignore patterns containing shell wildcards must be quoted from
2678
2592
the shell on Unix.
2682
2596
2683
2597
bzr ignore ./Makefile
2684
2598
2685
Ignore .class files in all directories...::
2599
Ignore class files in all directories::
2686
2600
2687
2601
bzr ignore "*.class"
2688
2602
2689
...but do not ignore "special.class"::
2690
2691
bzr ignore "!special.class"
2692
2693
2603
Ignore .o files under the lib directory::
2694
2604
2695
2605
bzr ignore "lib/**/*.o"
2701
2611
Ignore everything but the "debian" toplevel directory::
2702
2612
2703
2613
bzr ignore "RE:(?!debian/).*"
2704
2705
Ignore everything except the "local" toplevel directory,
2706
but always ignore "*~" autosave files, even under local/::
2707
2708
bzr ignore "*"
2709
bzr ignore "!./local"
2710
bzr ignore "!!*~"
2711
2614
"""
2712
2615
2713
2616
_see_also = ['status', 'ignored', 'patterns']
2714
2617
takes_args = ['name_pattern*']
2715
2618
takes_options = [
2716
Option('default-rules',
2717
help='Display the default ignore rules that bzr uses.')
2619
Option('old-default-rules',
2620
help='Write out the ignore rules bzr < 0.9 always used.')
2718
2621
]
2719
2622
2720
def run(self, name_pattern_list=None, default_rules=None):
2623
def run(self, name_pattern_list=None, old_default_rules=None):
2721
2624
from bzrlib import ignores
2722
if default_rules is not None:
2723
# dump the default rules and exit
2724
for pattern in ignores.USER_DEFAULTS:
2725
self.outf.write("%s\n" % pattern)
2625
if old_default_rules is not None:
2626
# dump the rules and exit
2627
for pattern in ignores.OLD_DEFAULTS:
2628
print pattern
2726
2629
return
2727
2630
if not name_pattern_list:
2728
2631
raise errors.BzrCommandError("ignore requires at least one "
2729
"NAME_PATTERN or --default-rules.")
2632
"NAME_PATTERN or --old-default-rules")
2730
2633
name_pattern_list = [globbing.normalize_pattern(p)
2731
2634
for p in name_pattern_list]
2732
2635
for name_pattern in name_pattern_list:
2744
2647
if id is not None:
2745
2648
filename = entry[0]
2746
2649
if ignored.match(filename):
2747
matches.append(filename)
2650
matches.append(filename.encode('utf-8'))
2748
2651
tree.unlock()
2749
2652
if len(matches) > 0:
2750
self.outf.write("Warning: the following files are version controlled and"
2751
" match your ignore pattern:\n%s"
2752
"\nThese files will continue to be version controlled"
2753
" unless you 'bzr remove' them.\n" % ("\n".join(matches),))
2653
print "Warning: the following files are version controlled and" \
2654
" match your ignore pattern:\n%s" \
2655
"\nThese files will continue to be version controlled" \
2656
" unless you 'bzr remove' them." % ("\n".join(matches),)
2754
2657
2755
2658
2756
2659
class cmd_ignored(Command):
2757
__doc__ = """List ignored files and the patterns that matched them.
2660
"""List ignored files and the patterns that matched them.
2758
2661
2759
2662
List all the ignored files and the ignore pattern that caused the file to
2760
2663
be ignored.
2771
2674
def run(self):
2772
2675
tree = WorkingTree.open_containing(u'.')[0]
2773
2676
tree.lock_read()
2774
self.add_cleanup(tree.unlock)
2775
for path, file_class, kind, file_id, entry in tree.list_files():
2776
if file_class != 'I':
2777
continue
2778
## XXX: Slightly inefficient since this was already calculated
2779
pat = tree.is_ignored(path)
2780
self.outf.write('%-50s %s\n' % (path, pat))
2677
try:
2678
for path, file_class, kind, file_id, entry in tree.list_files():
2679
if file_class != 'I':
2680
continue
2681
## XXX: Slightly inefficient since this was already calculated
2682
pat = tree.is_ignored(path)
2683
self.outf.write('%-50s %s\n' % (path, pat))
2684
finally:
2685
tree.unlock()
2781
2686
2782
2687
2783
2688
class cmd_lookup_revision(Command):
2784
__doc__ = """Lookup the revision-id from a revision-number
2689
"""Lookup the revision-id from a revision-number
2785
2690
2786
2691
:Examples:
2787
2692
bzr lookup-revision 33
2794
2699
try:
2795
2700
revno = int(revno)
2796
2701
except ValueError:
2797
raise errors.BzrCommandError("not a valid revision-number: %r"
2798
% revno)
2799
revid = WorkingTree.open_containing(u'.')[0].branch.get_rev_id(revno)
2800
self.outf.write("%s\n" % revid)
2702
raise errors.BzrCommandError("not a valid revision-number: %r" % revno)
2703
2704
print WorkingTree.open_containing(u'.')[0].branch.get_rev_id(revno)
2801
2705
2802
2706
2803
2707
class cmd_export(Command):
2804
__doc__ = """Export current or past revision to a destination directory or archive.
2708
"""Export current or past revision to a destination directory or archive.
2805
2709
2806
2710
If no revision is specified this exports the last committed revision.
2807
2711
2839
2743
Option('root',
2840
2744
type=str,
2841
2745
help="Name of the root directory inside the exported file."),
2842
Option('per-file-timestamps',
2843
help='Set modification time of files to that of the last '
2844
'revision in which it was changed.'),
2845
2746
]
2846
2747
def run(self, dest, branch_or_subdir=None, revision=None, format=None,
2847
root=None, filters=False, per_file_timestamps=False):
2748
root=None, filters=False):
2848
2749
from bzrlib.export import export
2849
2750
2850
2751
if branch_or_subdir is None:
2857
2758
2858
2759
rev_tree = _get_one_revision_tree('export', revision, branch=b, tree=tree)
2859
2760
try:
2860
export(rev_tree, dest, format, root, subdir, filtered=filters,
2861
per_file_timestamps=per_file_timestamps)
2761
export(rev_tree, dest, format, root, subdir, filtered=filters)
2862
2762
except errors.NoSuchExportFormat, e:
2863
2763
raise errors.BzrCommandError('Unsupported export format: %s' % e.format)
2864
2764
2865
2765
2866
2766
class cmd_cat(Command):
2867
__doc__ = """Write the contents of a file as of a given revision to standard output.
2767
"""Write the contents of a file as of a given revision to standard output.
2868
2768
2869
2769
If no revision is nominated, the last revision is used.
2870
2770
2891
2791
tree, branch, relpath = \
2892
2792
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
2893
2793
branch.lock_read()
2894
self.add_cleanup(branch.unlock)
2895
return self._run(tree, branch, relpath, filename, revision,
2896
name_from_revision, filters)
2794
try:
2795
return self._run(tree, branch, relpath, filename, revision,
2796
name_from_revision, filters)
2797
finally:
2798
branch.unlock()
2897
2799
2898
2800
def _run(self, tree, b, relpath, filename, revision, name_from_revision,
2899
2801
filtered):
2900
2802
if tree is None:
2901
2803
tree = b.basis_tree()
2902
2804
rev_tree = _get_one_revision_tree('cat', revision, branch=b)
2903
rev_tree.lock_read()
2904
self.add_cleanup(rev_tree.unlock)
2905
2805
2906
2806
old_file_id = rev_tree.path2id(relpath)
2907
2807
2942
2842
chunks = content.splitlines(True)
2943
2843
content = filtered_output_bytes(chunks, filters,
2944
2844
ContentFilterContext(relpath, rev_tree))
2945
self.cleanup_now()
2946
2845
self.outf.writelines(content)
2947
2846
else:
2948
self.cleanup_now()
2949
2847
self.outf.write(content)
2950
2848
2951
2849
2952
2850
class cmd_local_time_offset(Command):
2953
__doc__ = """Show the offset in seconds from GMT to local time."""
2851
"""Show the offset in seconds from GMT to local time."""
2954
2852
hidden = True
2955
2853
@display_command
2956
2854
def run(self):
2957
self.outf.write("%s\n" % osutils.local_time_offset())
2855
print osutils.local_time_offset()
2958
2856
2959
2857
2960
2858
2961
2859
class cmd_commit(Command):
2962
__doc__ = """Commit changes into a new revision.
2860
"""Commit changes into a new revision.
2963
2861
2964
2862
An explanatory message needs to be given for each commit. This is
2965
2863
often done by using the --message option (getting the message from the
3073
2971
"the master branch until a normal commit "
3074
2972
"is performed."
3075
2973
),
3076
Option('show-diff', short_name='p',
2974
Option('show-diff',
3077
2975
help='When no message is supplied, show the diff along'
3078
2976
' with the status summary in the message editor.'),
3079
2977
]
3145
3043
if local and not tree.branch.get_bound_location():
3146
3044
raise errors.LocalRequiresBoundBranch()
3147
3045
3148
if message is not None:
3149
try:
3150
file_exists = osutils.lexists(message)
3151
except UnicodeError:
3152
# The commit message contains unicode characters that can't be
3153
# represented in the filesystem encoding, so that can't be a
3154
# file.
3155
file_exists = False
3156
if file_exists:
3157
warning_msg = (
3158
'The commit message is a file name: "%(f)s".\n'
3159
'(use --file "%(f)s" to take commit message from that file)'
3160
% { 'f': message })
3161
ui.ui_factory.show_warning(warning_msg)
3162
if '\r' in message:
3163
message = message.replace('\r\n', '\n')
3164
message = message.replace('\r', '\n')
3165
if file:
3166
raise errors.BzrCommandError(
3167
"please specify either --message or --file")
3168
3169
3046
def get_message(commit_obj):
3170
3047
"""Callback to get commit message"""
3171
if file:
3172
my_message = codecs.open(
3173
file, 'rt', osutils.get_user_encoding()).read()
3174
elif message is not None:
3175
my_message = message
3176
else:
3177
# No message supplied: make one up.
3178
# text is the status of the tree
3179
text = make_commit_message_template_encoded(tree,
3048
my_message = message
3049
if my_message is not None and '\r' in my_message:
3050
my_message = my_message.replace('\r\n', '\n')
3051
my_message = my_message.replace('\r', '\n')
3052
if my_message is None and not file:
3053
t = make_commit_message_template_encoded(tree,
3180
3054
selected_list, diff=show_diff,
3181
3055
output_encoding=osutils.get_user_encoding())
3182
# start_message is the template generated from hooks
3183
# XXX: Warning - looks like hooks return unicode,
3184
# make_commit_message_template_encoded returns user encoding.
3185
# We probably want to be using edit_commit_message instead to
3186
# avoid this.
3187
3056
start_message = generate_commit_message_template(commit_obj)
3188
my_message = edit_commit_message_encoded(text,
3057
my_message = edit_commit_message_encoded(t,
3189
3058
start_message=start_message)
3190
3059
if my_message is None:
3191
3060
raise errors.BzrCommandError("please specify a commit"
3192
3061
" message with either --message or --file")
3062
elif my_message and file:
3063
raise errors.BzrCommandError(
3064
"please specify either --message or --file")
3065
if file:
3066
my_message = codecs.open(file, 'rt',
3067
osutils.get_user_encoding()).read()
3193
3068
if my_message == "":
3194
3069
raise errors.BzrCommandError("empty commit message specified")
3195
3070
return my_message
3207
3082
timezone=offset,
3208
3083
exclude=safe_relpath_files(tree, exclude))
3209
3084
except PointlessCommit:
3085
# FIXME: This should really happen before the file is read in;
3086
# perhaps prepare the commit; get the message; then actually commit
3210
3087
raise errors.BzrCommandError("No changes to commit."
3211
3088
" Use --unchanged to commit anyhow.")
3212
3089
except ConflictsInTree:
3217
3094
raise errors.BzrCommandError("Commit refused because there are"
3218
3095
" unknown files in the working tree.")
3219
3096
except errors.BoundBranchOutOfDate, e:
3220
e.extra_help = ("\n"
3221
'To commit to master branch, run update and then commit.\n'
3222
'You can also pass --local to commit to continue working '
3223
'disconnected.')
3224
raise
3097
raise errors.BzrCommandError(str(e) + "\n"
3098
'To commit to master branch, run update and then commit.\n'
3099
'You can also pass --local to commit to continue working '
3100
'disconnected.')
3225
3101
3226
3102
3227
3103
class cmd_check(Command):
3228
__doc__ = """Validate working tree structure, branch consistency and repository history.
3104
"""Validate working tree structure, branch consistency and repository history.
3229
3105
3230
3106
This command checks various invariants about branch and repository storage
3231
3107
to detect data corruption or bzr bugs.
3295
3171
3296
3172
3297
3173
class cmd_upgrade(Command):
3298
__doc__ = """Upgrade branch storage to current format.
3174
"""Upgrade branch storage to current format.
3299
3175
3300
3176
The check command or bzr developers may sometimes advise you to run
3301
3177
this command. When the default format has changed you may also be warned
3319
3195
3320
3196
3321
3197
class cmd_whoami(Command):
3322
__doc__ = """Show or set bzr user id.
3198
"""Show or set bzr user id.
3323
3199
3324
3200
:Examples:
3325
3201
Show the email of the current user::
3369
3245
3370
3246
3371
3247
class cmd_nick(Command):
3372
__doc__ = """Print or set the branch nickname.
3248
"""Print or set the branch nickname.
3373
3249
3374
3250
If unset, the tree root directory name is used as the nickname.
3375
3251
To print the current nickname, execute with no argument.
3389
3265
3390
3266
@display_command
3391
3267
def printme(self, branch):
3392
self.outf.write('%s\n' % branch.nick)
3268
print branch.nick
3393
3269
3394
3270
3395
3271
class cmd_alias(Command):
3396
__doc__ = """Set/unset and display aliases.
3272
"""Set/unset and display aliases.
3397
3273
3398
3274
:Examples:
3399
3275
Show the current aliases::
3463
3339
3464
3340
3465
3341
class cmd_selftest(Command):
3466
__doc__ = """Run internal test suite.
3342
"""Run internal test suite.
3467
3343
3468
3344
If arguments are given, they are regular expressions that say which tests
3469
3345
should run. Tests matching any expression are run, and other tests are
3513
3389
def get_transport_type(typestring):
3514
3390
"""Parse and return a transport specifier."""
3515
3391
if typestring == "sftp":
3516
from bzrlib.tests import stub_sftp
3517
return stub_sftp.SFTPAbsoluteServer
3392
from bzrlib.transport.sftp import SFTPAbsoluteServer
3393
return SFTPAbsoluteServer
3518
3394
if typestring == "memory":
3519
from bzrlib.tests import test_server
3520
return memory.MemoryServer
3395
from bzrlib.transport.memory import MemoryServer
3396
return MemoryServer
3521
3397
if typestring == "fakenfs":
3522
from bzrlib.tests import test_server
3523
return test_server.FakeNFSServer
3398
from bzrlib.transport.fakenfs import FakeNFSServer
3399
return FakeNFSServer
3524
3400
msg = "No known transport type %s. Supported types are: sftp\n" %\
3525
3401
(typestring)
3526
3402
raise errors.BzrCommandError(msg)
3610
3486
raise errors.BzrCommandError("subunit not available. subunit "
3611
3487
"needs to be installed to use --subunit.")
3612
3488
self.additional_selftest_args['runner_class'] = SubUnitBzrRunner
3613
# On Windows, disable automatic conversion of '\n' to '\r\n' in
3614
# stdout, which would corrupt the subunit stream.
3615
if sys.platform == "win32" and sys.stdout.fileno() >= 0:
3616
import msvcrt
3617
msvcrt.setmode(sys.stdout.fileno(), os.O_BINARY)
3618
3489
if parallel:
3619
3490
self.additional_selftest_args.setdefault(
3620
3491
'suite_decorators', []).append(parallel)
3624
3495
verbose = not is_quiet()
3625
3496
# TODO: should possibly lock the history file...
3626
3497
benchfile = open(".perf_history", "at", buffering=1)
3627
self.add_cleanup(benchfile.close)
3628
3498
else:
3629
3499
test_suite_factory = None
3630
3500
benchfile = None
3631
selftest_kwargs = {"verbose": verbose,
3632
"pattern": pattern,
3633
"stop_on_failure": one,
3634
"transport": transport,
3635
"test_suite_factory": test_suite_factory,
3636
"lsprof_timed": lsprof_timed,
3637
"lsprof_tests": lsprof_tests,
3638
"bench_history": benchfile,
3639
"matching_tests_first": first,
3640
"list_only": list_only,
3641
"random_seed": randomize,
3642
"exclude_pattern": exclude,
3643
"strict": strict,
3644
"load_list": load_list,
3645
"debug_flags": debugflag,
3646
"starting_with": starting_with
3647
}
3648
selftest_kwargs.update(self.additional_selftest_args)
3649
result = selftest(**selftest_kwargs)
3501
try:
3502
selftest_kwargs = {"verbose": verbose,
3503
"pattern": pattern,
3504
"stop_on_failure": one,
3505
"transport": transport,
3506
"test_suite_factory": test_suite_factory,
3507
"lsprof_timed": lsprof_timed,
3508
"lsprof_tests": lsprof_tests,
3509
"bench_history": benchfile,
3510
"matching_tests_first": first,
3511
"list_only": list_only,
3512
"random_seed": randomize,
3513
"exclude_pattern": exclude,
3514
"strict": strict,
3515
"load_list": load_list,
3516
"debug_flags": debugflag,
3517
"starting_with": starting_with
3518
}
3519
selftest_kwargs.update(self.additional_selftest_args)
3520
result = selftest(**selftest_kwargs)
3521
finally:
3522
if benchfile is not None:
3523
benchfile.close()
3650
3524
return int(not result)
3651
3525
3652
3526
3653
3527
class cmd_version(Command):
3654
__doc__ = """Show version of bzr."""
3528
"""Show version of bzr."""
3655
3529
3656
3530
encoding_type = 'replace'
3657
3531
takes_options = [
3668
3542
3669
3543
3670
3544
class cmd_rocks(Command):
3671
__doc__ = """Statement of optimism."""
3545
"""Statement of optimism."""
3672
3546
3673
3547
hidden = True
3674
3548
3675
3549
@display_command
3676
3550
def run(self):
3677
self.outf.write("It sure does!\n")
3551
print "It sure does!"
3678
3552
3679
3553
3680
3554
class cmd_find_merge_base(Command):
3681
__doc__ = """Find and print a base revision for merging two branches."""
3555
"""Find and print a base revision for merging two branches."""
3682
3556
# TODO: Options to specify revisions on either side, as if
3683
3557
# merging only part of the history.
3684
3558
takes_args = ['branch', 'other']
3691
3565
branch1 = Branch.open_containing(branch)[0]
3692
3566
branch2 = Branch.open_containing(other)[0]
3693
3567
branch1.lock_read()
3694
self.add_cleanup(branch1.unlock)
3695
branch2.lock_read()
3696
self.add_cleanup(branch2.unlock)
3697
last1 = ensure_null(branch1.last_revision())
3698
last2 = ensure_null(branch2.last_revision())
3699
3700
graph = branch1.repository.get_graph(branch2.repository)
3701
base_rev_id = graph.find_unique_lca(last1, last2)
3702
3703
self.outf.write('merge base is revision %s\n' % base_rev_id)
3568
try:
3569
branch2.lock_read()
3570
try:
3571
last1 = ensure_null(branch1.last_revision())
3572
last2 = ensure_null(branch2.last_revision())
3573
3574
graph = branch1.repository.get_graph(branch2.repository)
3575
base_rev_id = graph.find_unique_lca(last1, last2)
3576
3577
print 'merge base is revision %s' % base_rev_id
3578
finally:
3579
branch2.unlock()
3580
finally:
3581
branch1.unlock()
3704
3582
3705
3583
3706
3584
class cmd_merge(Command):
3707
__doc__ = """Perform a three-way merge.
3585
"""Perform a three-way merge.
3708
3586
3709
3587
The source of the merge can be specified either in the form of a branch,
3710
3588
or in the form of a path to a file containing a merge directive generated
3739
3617
committed to record the result of the merge.
3740
3618
3741
3619
merge refuses to run if there are any uncommitted changes, unless
3742
--force is given. The --force option can also be used to create a
3743
merge revision which has more than two parents.
3744
3745
If one would like to merge changes from the working tree of the other
3746
branch without merging any committed revisions, the --uncommitted option
3747
can be given.
3620
--force is given.
3748
3621
3749
3622
To select only some changes to merge, use "merge -i", which will prompt
3750
3623
you to apply each diff hunk and file change, similar to "shelve".
3765
3638
To apply a merge directive contained in /tmp/merge::
3766
3639
3767
3640
bzr merge /tmp/merge
3768
3769
To create a merge revision with three parents from two branches
3770
feature1a and feature1b:
3771
3772
bzr merge ../feature1a
3773
bzr merge ../feature1b --force
3774
bzr commit -m 'revision with three parents'
3775
3641
"""
3776
3642
3777
3643
encoding_type = 'exact'
3835
3701
view_info = _get_view_info_for_change_reporter(tree)
3836
3702
change_reporter = delta._ChangeReporter(
3837
3703
unversioned_filter=tree.is_ignored, view_info=view_info)
3838
pb = ui.ui_factory.nested_progress_bar()
3839
self.add_cleanup(pb.finished)
3840
tree.lock_write()
3841
self.add_cleanup(tree.unlock)
3842
if location is not None:
3843
try:
3844
mergeable = bundle.read_mergeable_from_url(location,
3845
possible_transports=possible_transports)
3846
except errors.NotABundle:
3847
mergeable = None
3704
cleanups = []
3705
try:
3706
pb = ui.ui_factory.nested_progress_bar()
3707
cleanups.append(pb.finished)
3708
tree.lock_write()
3709
cleanups.append(tree.unlock)
3710
if location is not None:
3711
try:
3712
mergeable = bundle.read_mergeable_from_url(location,
3713
possible_transports=possible_transports)
3714
except errors.NotABundle:
3715
mergeable = None
3716
else:
3717
if uncommitted:
3718
raise errors.BzrCommandError('Cannot use --uncommitted'
3719
' with bundles or merge directives.')
3720
3721
if revision is not None:
3722
raise errors.BzrCommandError(
3723
'Cannot use -r with merge directives or bundles')
3724
merger, verified = _mod_merge.Merger.from_mergeable(tree,
3725
mergeable, pb)
3726
3727
if merger is None and uncommitted:
3728
if revision is not None and len(revision) > 0:
3729
raise errors.BzrCommandError('Cannot use --uncommitted and'
3730
' --revision at the same time.')
3731
merger = self.get_merger_from_uncommitted(tree, location, pb,
3732
cleanups)
3733
allow_pending = False
3734
3735
if merger is None:
3736
merger, allow_pending = self._get_merger_from_branch(tree,
3737
location, revision, remember, possible_transports, pb)
3738
3739
merger.merge_type = merge_type
3740
merger.reprocess = reprocess
3741
merger.show_base = show_base
3742
self.sanity_check_merger(merger)
3743
if (merger.base_rev_id == merger.other_rev_id and
3744
merger.other_rev_id is not None):
3745
note('Nothing to do.')
3746
return 0
3747
if pull:
3748
if merger.interesting_files is not None:
3749
raise errors.BzrCommandError('Cannot pull individual files')
3750
if (merger.base_rev_id == tree.last_revision()):
3751
result = tree.pull(merger.other_branch, False,
3752
merger.other_rev_id)
3753
result.report(self.outf)
3754
return 0
3755
if merger.this_basis is None:
3756
raise errors.BzrCommandError(
3757
"This branch has no commits."
3758
" (perhaps you would prefer 'bzr pull')")
3759
if preview:
3760
return self._do_preview(merger, cleanups)
3761
elif interactive:
3762
return self._do_interactive(merger, cleanups)
3848
3763
else:
3849
if uncommitted:
3850
raise errors.BzrCommandError('Cannot use --uncommitted'
3851
' with bundles or merge directives.')
3852
3853
if revision is not None:
3854
raise errors.BzrCommandError(
3855
'Cannot use -r with merge directives or bundles')
3856
merger, verified = _mod_merge.Merger.from_mergeable(tree,
3857
mergeable, None)
3858
3859
if merger is None and uncommitted:
3860
if revision is not None and len(revision) > 0:
3861
raise errors.BzrCommandError('Cannot use --uncommitted and'
3862
' --revision at the same time.')
3863
merger = self.get_merger_from_uncommitted(tree, location, None)
3864
allow_pending = False
3865
3866
if merger is None:
3867
merger, allow_pending = self._get_merger_from_branch(tree,
3868
location, revision, remember, possible_transports, None)
3869
3870
merger.merge_type = merge_type
3871
merger.reprocess = reprocess
3872
merger.show_base = show_base
3873
self.sanity_check_merger(merger)
3874
if (merger.base_rev_id == merger.other_rev_id and
3875
merger.other_rev_id is not None):
3876
note('Nothing to do.')
3877
return 0
3878
if pull:
3879
if merger.interesting_files is not None:
3880
raise errors.BzrCommandError('Cannot pull individual files')
3881
if (merger.base_rev_id == tree.last_revision()):
3882
result = tree.pull(merger.other_branch, False,
3883
merger.other_rev_id)
3884
result.report(self.outf)
3885
return 0
3886
if merger.this_basis is None:
3887
raise errors.BzrCommandError(
3888
"This branch has no commits."
3889
" (perhaps you would prefer 'bzr pull')")
3890
if preview:
3891
return self._do_preview(merger)
3892
elif interactive:
3893
return self._do_interactive(merger)
3894
else:
3895
return self._do_merge(merger, change_reporter, allow_pending,
3896
verified)
3897
3898
def _get_preview(self, merger):
3764
return self._do_merge(merger, change_reporter, allow_pending,
3765
verified)
3766
finally:
3767
for cleanup in reversed(cleanups):
3768
cleanup()
3769
3770
def _get_preview(self, merger, cleanups):
3899
3771
tree_merger = merger.make_merger()
3900
3772
tt = tree_merger.make_preview_transform()
3901
self.add_cleanup(tt.finalize)
3773
cleanups.append(tt.finalize)
3902
3774
result_tree = tt.get_preview_tree()
3903
3775
return result_tree
3904
3776
3905
def _do_preview(self, merger):
3777
def _do_preview(self, merger, cleanups):
3906
3778
from bzrlib.diff import show_diff_trees
3907
result_tree = self._get_preview(merger)
3779
result_tree = self._get_preview(merger, cleanups)
3908
3780
show_diff_trees(merger.this_tree, result_tree, self.outf,
3909
3781
old_label='', new_label='')
3910
3782
3920
3792
else:
3921
3793
return 0
3922
3794
3923
def _do_interactive(self, merger):
3795
def _do_interactive(self, merger, cleanups):
3924
3796
"""Perform an interactive merge.
3925
3797
3926
3798
This works by generating a preview tree of the merge, then using
3928
3800
and the preview tree.
3929
3801
"""
3930
3802
from bzrlib import shelf_ui
3931
result_tree = self._get_preview(merger)
3803
result_tree = self._get_preview(merger, cleanups)
3932
3804
writer = bzrlib.option.diff_writer_registry.get()
3933
3805
shelver = shelf_ui.Shelver(merger.this_tree, result_tree, destroy=True,
3934
3806
reporter=shelf_ui.ApplyReporter(),
3935
3807
diff_writer=writer(sys.stdout))
3936
try:
3937
shelver.run()
3938
finally:
3939
shelver.finalize()
3808
shelver.run()
3940
3809
3941
3810
def sanity_check_merger(self, merger):
3942
3811
if (merger.show_base and
4002
3871
allow_pending = True
4003
3872
return merger, allow_pending
4004
3873
4005
def get_merger_from_uncommitted(self, tree, location, pb):
3874
def get_merger_from_uncommitted(self, tree, location, pb, cleanups):
4006
3875
"""Get a merger for uncommitted changes.
4007
3876
4008
3877
:param tree: The tree the merger should apply to.
4009
3878
:param location: The location containing uncommitted changes.
4010
3879
:param pb: The progress bar to use for showing progress.
3880
:param cleanups: A list of operations to perform to clean up the
3881
temporary directories, unfinalized objects, etc.
4011
3882
"""
4012
3883
location = self._select_branch_location(tree, location)[0]
4013
3884
other_tree, other_path = WorkingTree.open_containing(location)
4065
3936
4066
3937
4067
3938
class cmd_remerge(Command):
4068
__doc__ = """Redo a merge.
3939
"""Redo a merge.
4069
3940
4070
3941
Use this if you want to try a different merge technique while resolving
4071
3942
conflicts. Some merge techniques are better than others, and remerge
4096
3967
4097
3968
def run(self, file_list=None, merge_type=None, show_base=False,
4098
3969
reprocess=False):
4099
from bzrlib.conflicts import restore
4100
3970
if merge_type is None:
4101
3971
merge_type = _mod_merge.Merge3Merger
4102
3972
tree, file_list = tree_files(file_list)
4103
3973
tree.lock_write()
4104
self.add_cleanup(tree.unlock)
4105
parents = tree.get_parent_ids()
4106
if len(parents) != 2:
4107
raise errors.BzrCommandError("Sorry, remerge only works after normal"
4108
" merges. Not cherrypicking or"
4109
" multi-merges.")
4110
repository = tree.branch.repository
4111
interesting_ids = None
4112
new_conflicts = []
4113
conflicts = tree.conflicts()
4114
if file_list is not None:
4115
interesting_ids = set()
4116
for filename in file_list:
4117
file_id = tree.path2id(filename)
4118
if file_id is None:
4119
raise errors.NotVersionedError(filename)
4120
interesting_ids.add(file_id)
4121
if tree.kind(file_id) != "directory":
4122
continue
3974
try:
3975
parents = tree.get_parent_ids()
3976
if len(parents) != 2:
3977
raise errors.BzrCommandError("Sorry, remerge only works after normal"
3978
" merges. Not cherrypicking or"
3979
" multi-merges.")
3980
repository = tree.branch.repository
3981
interesting_ids = None
3982
new_conflicts = []
3983
conflicts = tree.conflicts()
3984
if file_list is not None:
3985
interesting_ids = set()
3986
for filename in file_list:
3987
file_id = tree.path2id(filename)
3988
if file_id is None:
3989
raise errors.NotVersionedError(filename)
3990
interesting_ids.add(file_id)
3991
if tree.kind(file_id) != "directory":
3992
continue
4123
3993
4124
for name, ie in tree.inventory.iter_entries(file_id):
4125
interesting_ids.add(ie.file_id)
4126
new_conflicts = conflicts.select_conflicts(tree, file_list)[0]
4127
else:
4128
# Remerge only supports resolving contents conflicts
4129
allowed_conflicts = ('text conflict', 'contents conflict')
4130
restore_files = [c.path for c in conflicts
4131
if c.typestring in allowed_conflicts]
4132
_mod_merge.transform_tree(tree, tree.basis_tree(), interesting_ids)
4133
tree.set_conflicts(ConflictList(new_conflicts))
4134
if file_list is not None:
4135
restore_files = file_list
4136
for filename in restore_files:
3994
for name, ie in tree.inventory.iter_entries(file_id):
3995
interesting_ids.add(ie.file_id)
3996
new_conflicts = conflicts.select_conflicts(tree, file_list)[0]
3997
else:
3998
# Remerge only supports resolving contents conflicts
3999
allowed_conflicts = ('text conflict', 'contents conflict')
4000
restore_files = [c.path for c in conflicts
4001
if c.typestring in allowed_conflicts]
4002
_mod_merge.transform_tree(tree, tree.basis_tree(), interesting_ids)
4003
tree.set_conflicts(ConflictList(new_conflicts))
4004
if file_list is not None:
4005
restore_files = file_list
4006
for filename in restore_files:
4007
try:
4008
restore(tree.abspath(filename))
4009
except errors.NotConflicted:
4010
pass
4011
# Disable pending merges, because the file texts we are remerging
4012
# have not had those merges performed. If we use the wrong parents
4013
# list, we imply that the working tree text has seen and rejected
4014
# all the changes from the other tree, when in fact those changes
4015
# have not yet been seen.
4016
pb = ui.ui_factory.nested_progress_bar()
4017
tree.set_parent_ids(parents[:1])
4137
4018
try:
4138
restore(tree.abspath(filename))
4139
except errors.NotConflicted:
4140
pass
4141
# Disable pending merges, because the file texts we are remerging
4142
# have not had those merges performed. If we use the wrong parents
4143
# list, we imply that the working tree text has seen and rejected
4144
# all the changes from the other tree, when in fact those changes
4145
# have not yet been seen.
4146
tree.set_parent_ids(parents[:1])
4147
try:
4148
merger = _mod_merge.Merger.from_revision_ids(None, tree, parents[1])
4149
merger.interesting_ids = interesting_ids
4150
merger.merge_type = merge_type
4151
merger.show_base = show_base
4152
merger.reprocess = reprocess
4153
conflicts = merger.do_merge()
4019
merger = _mod_merge.Merger.from_revision_ids(pb,
4020
tree, parents[1])
4021
merger.interesting_ids = interesting_ids
4022
merger.merge_type = merge_type
4023
merger.show_base = show_base
4024
merger.reprocess = reprocess
4025
conflicts = merger.do_merge()
4026
finally:
4027
tree.set_parent_ids(parents)
4028
pb.finished()
4154
4029
finally:
4155
tree.set_parent_ids(parents)
4030
tree.unlock()
4156
4031
if conflicts > 0:
4157
4032
return 1
4158
4033
else:
4160
4035
4161
4036
4162
4037
class cmd_revert(Command):
4163
__doc__ = """Revert files to a previous revision.
4038
"""Revert files to a previous revision.
4164
4039
4165
4040
Giving a list of files will revert only those files. Otherwise, all files
4166
4041
will be reverted. If the revision is not specified with '--revision', the
4180
4055
name. If you name a directory, all the contents of that directory will be
4181
4056
reverted.
4182
4057
4183
If you have newly added files since the target revision, they will be
4184
removed. If the files to be removed have been changed, backups will be
4185
created as above. Directories containing unknown files will not be
4186
deleted.
4058
Any files that have been newly added since that revision will be deleted,
4059
with a backup kept if appropriate. Directories containing unknown files
4060
will not be deleted.
4187
4061
4188
The working tree contains a list of revisions that have been merged but
4189
not yet committed. These revisions will be included as additional parents
4190
of the next commit. Normally, using revert clears that list as well as
4191
reverting the files. If any files are specified, revert leaves the list
4192
of uncommitted merges alone and reverts only the files. Use ``bzr revert
4193
.`` in the tree root to revert all files but keep the recorded merges,
4194
and ``bzr revert --forget-merges`` to clear the pending merge list without
4062
The working tree contains a list of pending merged revisions, which will
4063
be included as parents in the next commit. Normally, revert clears that
4064
list as well as reverting the files. If any files are specified, revert
4065
leaves the pending merge list alone and reverts only the files. Use "bzr
4066
revert ." in the tree root to revert all files but keep the merge record,
4067
and "bzr revert --forget-merges" to clear the pending merge list without
4195
4068
reverting any files.
4196
4197
Using "bzr revert --forget-merges", it is possible to apply all of the
4198
changes from a branch in a single revision. To do this, perform the merge
4199
as desired. Then doing revert with the "--forget-merges" option will keep
4200
the content of the tree as it was, but it will clear the list of pending
4201
merges. The next commit will then contain all of the changes that are
4202
present in the other branch, but without any other parent revisions.
4203
Because this technique forgets where these changes originated, it may
4204
cause additional conflicts on later merges involving the same source and
4205
target branches.
4206
4069
"""
4207
4070
4208
4071
_see_also = ['cat', 'export']
4217
4080
def run(self, revision=None, no_backup=False, file_list=None,
4218
4081
forget_merges=None):
4219
4082
tree, file_list = tree_files(file_list)
4220
tree.lock_tree_write()
4221
self.add_cleanup(tree.unlock)
4222
if forget_merges:
4223
tree.set_parent_ids(tree.get_parent_ids()[:1])
4224
else:
4225
self._revert_tree_to_revision(tree, revision, file_list, no_backup)
4083
tree.lock_write()
4084
try:
4085
if forget_merges:
4086
tree.set_parent_ids(tree.get_parent_ids()[:1])
4087
else:
4088
self._revert_tree_to_revision(tree, revision, file_list, no_backup)
4089
finally:
4090
tree.unlock()
4226
4091
4227
4092
@staticmethod
4228
4093
def _revert_tree_to_revision(tree, revision, file_list, no_backup):
4229
4094
rev_tree = _get_one_revision_tree('revert', revision, tree=tree)
4230
tree.revert(file_list, rev_tree, not no_backup, None,
4231
report_changes=True)
4095
pb = ui.ui_factory.nested_progress_bar()
4096
try:
4097
tree.revert(file_list, rev_tree, not no_backup, pb,
4098
report_changes=True)
4099
finally:
4100
pb.finished()
4232
4101
4233
4102
4234
4103
class cmd_assert_fail(Command):
4235
__doc__ = """Test reporting of assertion failures"""
4104
"""Test reporting of assertion failures"""
4236
4105
# intended just for use in testing
4237
4106
4238
4107
hidden = True
4242
4111
4243
4112
4244
4113
class cmd_help(Command):
4245
__doc__ = """Show help on a command or other topic.
4114
"""Show help on a command or other topic.
4246
4115
"""
4247
4116
4248
4117
_see_also = ['topics']
4261
4130
4262
4131
4263
4132
class cmd_shell_complete(Command):
4264
__doc__ = """Show appropriate completions for context.
4133
"""Show appropriate completions for context.
4265
4134
4266
4135
For a list of all available commands, say 'bzr shell-complete'.
4267
4136
"""
4276
4145
4277
4146
4278
4147
class cmd_missing(Command):
4279
__doc__ = """Show unmerged/unpulled revisions between two branches.
4148
"""Show unmerged/unpulled revisions between two branches.
4280
4149
4281
4150
OTHER_BRANCH may be local or remote.
4282
4151
4283
4152
To filter on a range of revisions, you can use the command -r begin..end
4284
4153
-r revision requests a specific revision, -r ..end or -r begin.. are
4285
4154
also valid.
4286
4287
:Exit values:
4288
1 - some missing revisions
4289
0 - no missing revisions
4290
4155
4291
4156
:Examples:
4292
4157
4360
4225
restrict = 'remote'
4361
4226
4362
4227
local_branch = Branch.open_containing(u".")[0]
4363
local_branch.lock_read()
4364
self.add_cleanup(local_branch.unlock)
4365
4366
4228
parent = local_branch.get_parent()
4367
4229
if other_branch is None:
4368
4230
other_branch = parent
4377
4239
remote_branch = Branch.open(other_branch)
4378
4240
if remote_branch.base == local_branch.base:
4379
4241
remote_branch = local_branch
4380
else:
4381
remote_branch.lock_read()
4382
self.add_cleanup(remote_branch.unlock)
4383
4242
4384
4243
local_revid_range = _revision_range_to_revid_range(
4385
4244
_get_revision_range(my_revision, local_branch,
4389
4248
_get_revision_range(revision,
4390
4249
remote_branch, self.name()))
4391
4250
4392
local_extra, remote_extra = find_unmerged(
4393
local_branch, remote_branch, restrict,
4394
backward=not reverse,
4395
include_merges=include_merges,
4396
local_revid_range=local_revid_range,
4397
remote_revid_range=remote_revid_range)
4398
4399
if log_format is None:
4400
registry = log.log_formatter_registry
4401
log_format = registry.get_default(local_branch)
4402
lf = log_format(to_file=self.outf,
4403
show_ids=show_ids,
4404
show_timezone='original')
4405
4406
status_code = 0
4407
if local_extra and not theirs_only:
4408
message("You have %d extra revision(s):\n" %
4409
len(local_extra))
4410
for revision in iter_log_revisions(local_extra,
4411
local_branch.repository,
4412
verbose):
4413
lf.log_revision(revision)
4414
printed_local = True
4415
status_code = 1
4416
else:
4417
printed_local = False
4418
4419
if remote_extra and not mine_only:
4420
if printed_local is True:
4421
message("\n\n\n")
4422
message("You are missing %d revision(s):\n" %
4423
len(remote_extra))
4424
for revision in iter_log_revisions(remote_extra,
4425
remote_branch.repository,
4426
verbose):
4427
lf.log_revision(revision)
4428
status_code = 1
4429
4430
if mine_only and not local_extra:
4431
# We checked local, and found nothing extra
4432
message('This branch is up to date.\n')
4433
elif theirs_only and not remote_extra:
4434
# We checked remote, and found nothing extra
4435
message('Other branch is up to date.\n')
4436
elif not (mine_only or theirs_only or local_extra or
4437
remote_extra):
4438
# We checked both branches, and neither one had extra
4439
# revisions
4440
message("Branches are up to date.\n")
4441
self.cleanup_now()
4251
local_branch.lock_read()
4252
try:
4253
remote_branch.lock_read()
4254
try:
4255
local_extra, remote_extra = find_unmerged(
4256
local_branch, remote_branch, restrict,
4257
backward=not reverse,
4258
include_merges=include_merges,
4259
local_revid_range=local_revid_range,
4260
remote_revid_range=remote_revid_range)
4261
4262
if log_format is None:
4263
registry = log.log_formatter_registry
4264
log_format = registry.get_default(local_branch)
4265
lf = log_format(to_file=self.outf,
4266
show_ids=show_ids,
4267
show_timezone='original')
4268
4269
status_code = 0
4270
if local_extra and not theirs_only:
4271
message("You have %d extra revision(s):\n" %
4272
len(local_extra))
4273
for revision in iter_log_revisions(local_extra,
4274
local_branch.repository,
4275
verbose):
4276
lf.log_revision(revision)
4277
printed_local = True
4278
status_code = 1
4279
else:
4280
printed_local = False
4281
4282
if remote_extra and not mine_only:
4283
if printed_local is True:
4284
message("\n\n\n")
4285
message("You are missing %d revision(s):\n" %
4286
len(remote_extra))
4287
for revision in iter_log_revisions(remote_extra,
4288
remote_branch.repository,
4289
verbose):
4290
lf.log_revision(revision)
4291
status_code = 1
4292
4293
if mine_only and not local_extra:
4294
# We checked local, and found nothing extra
4295
message('This branch is up to date.\n')
4296
elif theirs_only and not remote_extra:
4297
# We checked remote, and found nothing extra
4298
message('Other branch is up to date.\n')
4299
elif not (mine_only or theirs_only or local_extra or
4300
remote_extra):
4301
# We checked both branches, and neither one had extra
4302
# revisions
4303
message("Branches are up to date.\n")
4304
finally:
4305
remote_branch.unlock()
4306
finally:
4307
local_branch.unlock()
4442
4308
if not status_code and parent is None and other_branch is not None:
4443
4309
local_branch.lock_write()
4444
self.add_cleanup(local_branch.unlock)
4445
# handle race conditions - a parent might be set while we run.
4446
if local_branch.get_parent() is None:
4447
local_branch.set_parent(remote_branch.base)
4310
try:
4311
# handle race conditions - a parent might be set while we run.
4312
if local_branch.get_parent() is None:
4313
local_branch.set_parent(remote_branch.base)
4314
finally:
4315
local_branch.unlock()
4448
4316
return status_code
4449
4317
4450
4318
4451
4319
class cmd_pack(Command):
4452
__doc__ = """Compress the data within a repository.
4453
4454
This operation compresses the data within a bazaar repository. As
4455
bazaar supports automatic packing of repository, this operation is
4456
normally not required to be done manually.
4457
4458
During the pack operation, bazaar takes a backup of existing repository
4459
data, i.e. pack files. This backup is eventually removed by bazaar
4460
automatically when it is safe to do so. To save disk space by removing
4461
the backed up pack files, the --clean-obsolete-packs option may be
4462
used.
4463
4464
Warning: If you use --clean-obsolete-packs and your machine crashes
4465
during or immediately after repacking, you may be left with a state
4466
where the deletion has been written to disk but the new packs have not
4467
been. In this case the repository may be unusable.
4468
"""
4320
"""Compress the data within a repository."""
4469
4321
4470
4322
_see_also = ['repositories']
4471
4323
takes_args = ['branch_or_repo?']
4472
takes_options = [
4473
Option('clean-obsolete-packs', 'Delete obsolete packs to save disk space.'),
4474
]
4475
4324
4476
def run(self, branch_or_repo='.', clean_obsolete_packs=False):
4325
def run(self, branch_or_repo='.'):
4477
4326
dir = bzrdir.BzrDir.open_containing(branch_or_repo)[0]
4478
4327
try:
4479
4328
branch = dir.open_branch()
4480
4329
repository = branch.repository
4481
4330
except errors.NotBranchError:
4482
4331
repository = dir.open_repository()
4483
repository.pack(clean_obsolete_packs=clean_obsolete_packs)
4332
repository.pack()
4484
4333
4485
4334
4486
4335
class cmd_plugins(Command):
4487
__doc__ = """List the installed plugins.
4336
"""List the installed plugins.
4488
4337
4489
4338
This command displays the list of installed plugins including
4490
4339
version of plugin and a short description of each.
4497
4346
adding new commands, providing additional network transports and
4498
4347
customizing log output.
4499
4348
4500
See the Bazaar Plugin Guide <http://doc.bazaar.canonical.com/plugins/en/>
4501
for further information on plugins including where to find them and how to
4502
install them. Instructions are also provided there on how to write new
4503
plugins using the Python programming language.
4349
See the Bazaar web site, http://bazaar-vcs.org, for further
4350
information on plugins including where to find them and how to
4351
install them. Instructions are also provided there on how to
4352
write new plugins using the Python programming language.
4504
4353
"""
4505
4354
takes_options = ['verbose']
4506
4355
4521
4370
doc = '(no description)'
4522
4371
result.append((name_ver, doc, plugin.path()))
4523
4372
for name_ver, doc, path in sorted(result):
4524
self.outf.write("%s\n" % name_ver)
4525
self.outf.write(" %s\n" % doc)
4373
print name_ver
4374
print ' ', doc
4526
4375
if verbose:
4527
self.outf.write(" %s\n" % path)
4528
self.outf.write("\n")
4376
print ' ', path
4377
print
4529
4378
4530
4379
4531
4380
class cmd_testament(Command):
4532
__doc__ = """Show testament (signing-form) of a revision."""
4381
"""Show testament (signing-form) of a revision."""
4533
4382
takes_options = [
4534
4383
'revision',
4535
4384
Option('long', help='Produce long-format testament.'),
4548
4397
else:
4549
4398
b = Branch.open(branch)
4550
4399
b.lock_read()
4551
self.add_cleanup(b.unlock)
4552
if revision is None:
4553
rev_id = b.last_revision()
4554
else:
4555
rev_id = revision[0].as_revision_id(b)
4556
t = testament_class.from_revision(b.repository, rev_id)
4557
if long:
4558
sys.stdout.writelines(t.as_text_lines())
4559
else:
4560
sys.stdout.write(t.as_short_text())
4400
try:
4401
if revision is None:
4402
rev_id = b.last_revision()
4403
else:
4404
rev_id = revision[0].as_revision_id(b)
4405
t = testament_class.from_revision(b.repository, rev_id)
4406
if long:
4407
sys.stdout.writelines(t.as_text_lines())
4408
else:
4409
sys.stdout.write(t.as_short_text())
4410
finally:
4411
b.unlock()
4561
4412
4562
4413
4563
4414
class cmd_annotate(Command):
4564
__doc__ = """Show the origin of each line in a file.
4415
"""Show the origin of each line in a file.
4565
4416
4566
4417
This prints out the given file with an annotation on the left side
4567
4418
indicating which revision, author and date introduced the change.
4589
4440
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
4590
4441
if wt is not None:
4591
4442
wt.lock_read()
4592
self.add_cleanup(wt.unlock)
4593
4443
else:
4594
4444
branch.lock_read()
4595
self.add_cleanup(branch.unlock)
4596
tree = _get_one_revision_tree('annotate', revision, branch=branch)
4597
tree.lock_read()
4598
self.add_cleanup(tree.unlock)
4599
if wt is not None:
4600
file_id = wt.path2id(relpath)
4601
else:
4602
file_id = tree.path2id(relpath)
4603
if file_id is None:
4604
raise errors.NotVersionedError(filename)
4605
file_version = tree.inventory[file_id].revision
4606
if wt is not None and revision is None:
4607
# If there is a tree and we're not annotating historical
4608
# versions, annotate the working tree's content.
4609
annotate_file_tree(wt, file_id, self.outf, long, all,
4610
show_ids=show_ids)
4611
else:
4612
annotate_file(branch, file_version, file_id, long, all, self.outf,
4613
show_ids=show_ids)
4445
try:
4446
tree = _get_one_revision_tree('annotate', revision, branch=branch)
4447
if wt is not None:
4448
file_id = wt.path2id(relpath)
4449
else:
4450
file_id = tree.path2id(relpath)
4451
if file_id is None:
4452
raise errors.NotVersionedError(filename)
4453
file_version = tree.inventory[file_id].revision
4454
if wt is not None and revision is None:
4455
# If there is a tree and we're not annotating historical
4456
# versions, annotate the working tree's content.
4457
annotate_file_tree(wt, file_id, self.outf, long, all,
4458
show_ids=show_ids)
4459
else:
4460
annotate_file(branch, file_version, file_id, long, all, self.outf,
4461
show_ids=show_ids)
4462
finally:
4463
if wt is not None:
4464
wt.unlock()
4465
else:
4466
branch.unlock()
4614
4467
4615
4468
4616
4469
class cmd_re_sign(Command):
4617
__doc__ = """Create a digital signature for an existing revision."""
4470
"""Create a digital signature for an existing revision."""
4618
4471
# TODO be able to replace existing ones.
4619
4472
4620
4473
hidden = True # is this right ?
4628
4481
raise errors.BzrCommandError('You must supply either --revision or a revision_id')
4629
4482
b = WorkingTree.open_containing(u'.')[0].branch
4630
4483
b.lock_write()
4631
self.add_cleanup(b.unlock)
4632
return self._run(b, revision_id_list, revision)
4484
try:
4485
return self._run(b, revision_id_list, revision)
4486
finally:
4487
b.unlock()
4633
4488
4634
4489
def _run(self, b, revision_id_list, revision):
4635
4490
import bzrlib.gpg as gpg
4680
4535
4681
4536
4682
4537
class cmd_bind(Command):
4683
__doc__ = """Convert the current branch into a checkout of the supplied branch.
4684
If no branch is supplied, rebind to the last bound location.
4538
"""Convert the current branch into a checkout of the supplied branch.
4685
4539
4686
4540
Once converted into a checkout, commits must succeed on the master branch
4687
4541
before they will be applied to the local branch.
4705
4559
'This format does not remember old locations.')
4706
4560
else:
4707
4561
if location is None:
4708
if b.get_bound_location() is not None:
4709
raise errors.BzrCommandError('Branch is already bound')
4710
else:
4711
raise errors.BzrCommandError('No location supplied '
4712
'and no previous location known')
4562
raise errors.BzrCommandError('No location supplied and no '
4563
'previous location known')
4713
4564
b_other = Branch.open(location)
4714
4565
try:
4715
4566
b.bind(b_other)
4721
4572
4722
4573
4723
4574
class cmd_unbind(Command):
4724
__doc__ = """Convert the current checkout into a regular branch.
4575
"""Convert the current checkout into a regular branch.
4725
4576
4726
4577
After unbinding, the local branch is considered independent and subsequent
4727
4578
commits will be local only.
4738
4589
4739
4590
4740
4591
class cmd_uncommit(Command):
4741
__doc__ = """Remove the last committed revision.
4592
"""Remove the last committed revision.
4742
4593
4743
4594
--verbose will print out what is being removed.
4744
4595
--dry-run will go through all the motions, but not actually
4785
4636
4786
4637
if tree is not None:
4787
4638
tree.lock_write()
4788
self.add_cleanup(tree.unlock)
4789
4639
else:
4790
4640
b.lock_write()
4791
self.add_cleanup(b.unlock)
4792
return self._run(b, tree, dry_run, verbose, revision, force, local=local)
4641
try:
4642
return self._run(b, tree, dry_run, verbose, revision, force,
4643
local=local)
4644
finally:
4645
if tree is not None:
4646
tree.unlock()
4647
else:
4648
b.unlock()
4793
4649
4794
4650
def _run(self, b, tree, dry_run, verbose, revision, force, local=False):
4795
4651
from bzrlib.log import log_formatter, show_log
4827
4683
end_revision=last_revno)
4828
4684
4829
4685
if dry_run:
4830
self.outf.write('Dry-run, pretending to remove'
4831
' the above revisions.\n')
4686
print 'Dry-run, pretending to remove the above revisions.'
4687
if not force:
4688
val = raw_input('Press <enter> to continue')
4832
4689
else:
4833
self.outf.write('The above revision(s) will be removed.\n')
4834
4835
if not force:
4836
if not ui.ui_factory.get_boolean('Are you sure'):
4837
self.outf.write('Canceled')
4838
return 0
4690
print 'The above revision(s) will be removed.'
4691
if not force:
4692
val = raw_input('Are you sure [y/N]? ')
4693
if val.lower() not in ('y', 'yes'):
4694
print 'Canceled'
4695
return 0
4839
4696
4840
4697
mutter('Uncommitting from {%s} to {%s}',
4841
4698
last_rev_id, rev_id)
4842
4699
uncommit(b, tree=tree, dry_run=dry_run, verbose=verbose,
4843
4700
revno=revno, local=local)
4844
self.outf.write('You can restore the old tip by running:\n'
4845
' bzr pull . -r revid:%s\n' % last_rev_id)
4701
note('You can restore the old tip by running:\n'
4702
' bzr pull . -r revid:%s', last_rev_id)
4846
4703
4847
4704
4848
4705
class cmd_break_lock(Command):
4849
__doc__ = """Break a dead lock on a repository, branch or working directory.
4706
"""Break a dead lock on a repository, branch or working directory.
4850
4707
4851
4708
CAUTION: Locks should only be broken when you are sure that the process
4852
4709
holding the lock has been stopped.
4853
4710
4854
You can get information on what locks are open via the 'bzr info
4855
[location]' command.
4711
You can get information on what locks are open via the 'bzr info' command.
4856
4712
4857
4713
:Examples:
4858
4714
bzr break-lock
4859
bzr break-lock bzr+ssh://example.com/bzr/foo
4860
4715
"""
4861
4716
takes_args = ['location?']
4862
4717
4871
4726
4872
4727
4873
4728
class cmd_wait_until_signalled(Command):
4874
__doc__ = """Test helper for test_start_and_stop_bzr_subprocess_send_signal.
4729
"""Test helper for test_start_and_stop_bzr_subprocess_send_signal.
4875
4730
4876
4731
This just prints a line to signal when it is ready, then blocks on stdin.
4877
4732
"""
4885
4740
4886
4741
4887
4742
class cmd_serve(Command):
4888
__doc__ = """Run the bzr server."""
4743
"""Run the bzr server."""
4889
4744
4890
4745
aliases = ['server']
4891
4746
4892
4747
takes_options = [
4893
4748
Option('inet',
4894
4749
help='Serve on stdin/out for use from inetd or sshd.'),
4895
RegistryOption('protocol',
4896
help="Protocol to serve.",
4750
RegistryOption('protocol',
4751
help="Protocol to serve.",
4897
4752
lazy_registry=('bzrlib.transport', 'transport_server_registry'),
4898
4753
value_switches=True),
4899
4754
Option('port',
4908
4763
Option('allow-writes',
4909
4764
help='By default the server is a readonly server. Supplying '
4910
4765
'--allow-writes enables write access to the contents of '
4911
'the served directory and below. Note that ``bzr serve`` '
4912
'does not perform authentication, so unless some form of '
4913
'external authentication is arranged supplying this '
4914
'option leads to global uncontrolled write access to your '
4915
'file system.'
4766
'the served directory and below.'
4916
4767
),
4917
4768
]
4918
4769
4951
4802
4952
4803
4953
4804
class cmd_join(Command):
4954
__doc__ = """Combine a tree into its containing tree.
4805
"""Combine a tree into its containing tree.
4955
4806
4956
4807
This command requires the target tree to be in a rich-root format.
4957
4808
4997
4848
4998
4849
4999
4850
class cmd_split(Command):
5000
__doc__ = """Split a subdirectory of a tree into a separate tree.
4851
"""Split a subdirectory of a tree into a separate tree.
5001
4852
5002
4853
This command will produce a target tree in a format that supports
5003
4854
rich roots, like 'rich-root' or 'rich-root-pack'. These formats cannot be
5023
4874
5024
4875
5025
4876
class cmd_merge_directive(Command):
5026
__doc__ = """Generate a merge directive for auto-merge tools.
4877
"""Generate a merge directive for auto-merge tools.
5027
4878
5028
4879
A directive requests a merge to be performed, and also provides all the
5029
4880
information necessary to do so. This means it must either include a
5122
4973
5123
4974
5124
4975
class cmd_send(Command):
5125
__doc__ = """Mail or create a merge-directive for submitting changes.
4976
"""Mail or create a merge-directive for submitting changes.
5126
4977
5127
4978
A merge directive provides many things needed for requesting merges:
5128
4979
5134
4985
directly from the merge directive, without retrieving data from a
5135
4986
branch.
5136
4987
5137
`bzr send` creates a compact data set that, when applied using bzr
5138
merge, has the same effect as merging from the source branch.
5139
5140
By default the merge directive is self-contained and can be applied to any
5141
branch containing submit_branch in its ancestory without needing access to
5142
the source branch.
5143
5144
If --no-bundle is specified, then Bazaar doesn't send the contents of the
5145
revisions, but only a structured request to merge from the
5146
public_location. In that case the public_branch is needed and it must be
5147
up-to-date and accessible to the recipient. The public_branch is always
5148
included if known, so that people can check it later.
5149
5150
The submit branch defaults to the parent of the source branch, but can be
5151
overridden. Both submit branch and public branch will be remembered in
5152
branch.conf the first time they are used for a particular branch. The
5153
source branch defaults to that containing the working directory, but can
5154
be changed using --from.
5155
5156
In order to calculate those changes, bzr must analyse the submit branch.
5157
Therefore it is most efficient for the submit branch to be a local mirror.
5158
If a public location is known for the submit_branch, that location is used
5159
in the merge directive.
5160
5161
The default behaviour is to send the merge directive by mail, unless -o is
5162
given, in which case it is sent to a file.
4988
If --no-bundle is specified, then public_branch is needed (and must be
4989
up-to-date), so that the receiver can perform the merge using the
4990
public_branch. The public_branch is always included if known, so that
4991
people can check it later.
4992
4993
The submit branch defaults to the parent, but can be overridden. Both
4994
submit branch and public branch will be remembered if supplied.
4995
4996
If a public_branch is known for the submit_branch, that public submit
4997
branch is used in the merge instructions. This means that a local mirror
4998
can be used as your actual submit branch, once you have set public_branch
4999
for that mirror.
5163
5000
5164
5001
Mail is sent using your preferred mail program. This should be transparent
5165
5002
on Windows (it uses MAPI). On Linux, it requires the xdg-email utility.
5185
5022
5186
5023
The merge directives created by bzr send may be applied using bzr merge or
5187
5024
bzr pull by specifying a file containing a merge directive as the location.
5188
5189
bzr send makes extensive use of public locations to map local locations into
5190
URLs that can be used by other people. See `bzr help configuration` to
5191
set them, and use `bzr info` to display them.
5192
5025
"""
5193
5026
5194
5027
encoding_type = 'exact'
5210
5043
short_name='f',
5211
5044
type=unicode),
5212
5045
Option('output', short_name='o',
5213
help='Write merge directive to this file or directory; '
5046
help='Write merge directive to this file; '
5214
5047
'use - for stdout.',
5215
5048
type=unicode),
5216
5049
Option('strict',
5239
5072
5240
5073
5241
5074
class cmd_bundle_revisions(cmd_send):
5242
__doc__ = """Create a merge-directive for submitting changes.
5075
"""Create a merge-directive for submitting changes.
5243
5076
5244
5077
A merge directive provides many things needed for requesting merges:
5245
5078
5312
5145
5313
5146
5314
5147
class cmd_tag(Command):
5315
__doc__ = """Create, remove or modify a tag naming a revision.
5148
"""Create, remove or modify a tag naming a revision.
5316
5149
5317
5150
Tags give human-meaningful names to revisions. Commands that take a -r
5318
5151
(--revision) option can be given -rtag:X, where X is any previously
5326
5159
5327
5160
To rename a tag (change the name but keep it on the same revsion), run ``bzr
5328
5161
tag new-name -r tag:old-name`` and then ``bzr tag --delete oldname``.
5329
5330
If no tag name is specified it will be determined through the
5331
'automatic_tag_name' hook. This can e.g. be used to automatically tag
5332
upstream releases by reading configure.ac. See ``bzr help hooks`` for
5333
details.
5334
5162
"""
5335
5163
5336
5164
_see_also = ['commit', 'tags']
5337
takes_args = ['tag_name?']
5165
takes_args = ['tag_name']
5338
5166
takes_options = [
5339
5167
Option('delete',
5340
5168
help='Delete this tag rather than placing it.',
5350
5178
'revision',
5351
5179
]
5352
5180
5353
def run(self, tag_name=None,
5181
def run(self, tag_name,
5354
5182
delete=None,
5355
5183
directory='.',
5356
5184
force=None,
5358
5186
):
5359
5187
branch, relpath = Branch.open_containing(directory)
5360
5188
branch.lock_write()
5361
self.add_cleanup(branch.unlock)
5362
if delete:
5363
if tag_name is None:
5364
raise errors.BzrCommandError("No tag specified to delete.")
5365
branch.tags.delete_tag(tag_name)
5366
self.outf.write('Deleted tag %s.\n' % tag_name)
5367
else:
5368
if revision:
5369
if len(revision) != 1:
5370
raise errors.BzrCommandError(
5371
"Tags can only be placed on a single revision, "
5372
"not on a range")
5373
revision_id = revision[0].as_revision_id(branch)
5189
try:
5190
if delete:
5191
branch.tags.delete_tag(tag_name)
5192
self.outf.write('Deleted tag %s.\n' % tag_name)
5374
5193
else:
5375
revision_id = branch.last_revision()
5376
if tag_name is None:
5377
tag_name = branch.automatic_tag_name(revision_id)
5378
if tag_name is None:
5379
raise errors.BzrCommandError(
5380
"Please specify a tag name.")
5381
if (not force) and branch.tags.has_tag(tag_name):
5382
raise errors.TagAlreadyExists(tag_name)
5383
branch.tags.set_tag(tag_name, revision_id)
5384
self.outf.write('Created tag %s.\n' % tag_name)
5194
if revision:
5195
if len(revision) != 1:
5196
raise errors.BzrCommandError(
5197
"Tags can only be placed on a single revision, "
5198
"not on a range")
5199
revision_id = revision[0].as_revision_id(branch)
5200
else:
5201
revision_id = branch.last_revision()
5202
if (not force) and branch.tags.has_tag(tag_name):
5203
raise errors.TagAlreadyExists(tag_name)
5204
branch.tags.set_tag(tag_name, revision_id)
5205
self.outf.write('Created tag %s.\n' % tag_name)
5206
finally:
5207
branch.unlock()
5385
5208
5386
5209
5387
5210
class cmd_tags(Command):
5388
__doc__ = """List tags.
5211
"""List tags.
5389
5212
5390
5213
This command shows a table of tag names and the revisions they reference.
5391
5214
"""
5420
5243
return
5421
5244
5422
5245
branch.lock_read()
5423
self.add_cleanup(branch.unlock)
5424
if revision:
5425
graph = branch.repository.get_graph()
5426
rev1, rev2 = _get_revision_range(revision, branch, self.name())
5427
revid1, revid2 = rev1.rev_id, rev2.rev_id
5428
# only show revisions between revid1 and revid2 (inclusive)
5429
tags = [(tag, revid) for tag, revid in tags if
5430
graph.is_between(revid, revid1, revid2)]
5431
if sort == 'alpha':
5432
tags.sort()
5433
elif sort == 'time':
5434
timestamps = {}
5435
for tag, revid in tags:
5436
try:
5437
revobj = branch.repository.get_revision(revid)
5438
except errors.NoSuchRevision:
5439
timestamp = sys.maxint # place them at the end
5440
else:
5441
timestamp = revobj.timestamp
5442
timestamps[revid] = timestamp
5443
tags.sort(key=lambda x: timestamps[x[1]])
5444
if not show_ids:
5445
# [ (tag, revid), ... ] -> [ (tag, dotted_revno), ... ]
5446
for index, (tag, revid) in enumerate(tags):
5447
try:
5448
revno = branch.revision_id_to_dotted_revno(revid)
5449
if isinstance(revno, tuple):
5450
revno = '.'.join(map(str, revno))
5451
except errors.NoSuchRevision:
5452
# Bad tag data/merges can lead to tagged revisions
5453
# which are not in this branch. Fail gracefully ...
5454
revno = '?'
5455
tags[index] = (tag, revno)
5456
self.cleanup_now()
5246
try:
5247
if revision:
5248
graph = branch.repository.get_graph()
5249
rev1, rev2 = _get_revision_range(revision, branch, self.name())
5250
revid1, revid2 = rev1.rev_id, rev2.rev_id
5251
# only show revisions between revid1 and revid2 (inclusive)
5252
tags = [(tag, revid) for tag, revid in tags if
5253
graph.is_between(revid, revid1, revid2)]
5254
if sort == 'alpha':
5255
tags.sort()
5256
elif sort == 'time':
5257
timestamps = {}
5258
for tag, revid in tags:
5259
try:
5260
revobj = branch.repository.get_revision(revid)
5261
except errors.NoSuchRevision:
5262
timestamp = sys.maxint # place them at the end
5263
else:
5264
timestamp = revobj.timestamp
5265
timestamps[revid] = timestamp
5266
tags.sort(key=lambda x: timestamps[x[1]])
5267
if not show_ids:
5268
# [ (tag, revid), ... ] -> [ (tag, dotted_revno), ... ]
5269
for index, (tag, revid) in enumerate(tags):
5270
try:
5271
revno = branch.revision_id_to_dotted_revno(revid)
5272
if isinstance(revno, tuple):
5273
revno = '.'.join(map(str, revno))
5274
except errors.NoSuchRevision:
5275
# Bad tag data/merges can lead to tagged revisions
5276
# which are not in this branch. Fail gracefully ...
5277
revno = '?'
5278
tags[index] = (tag, revno)
5279
finally:
5280
branch.unlock()
5457
5281
for tag, revspec in tags:
5458
5282
self.outf.write('%-20s %s\n' % (tag, revspec))
5459
5283
5460
5284
5461
5285
class cmd_reconfigure(Command):
5462
__doc__ = """Reconfigure the type of a bzr directory.
5286
"""Reconfigure the type of a bzr directory.
5463
5287
5464
5288
A target configuration must be specified.
5465
5289
5550
5374
5551
5375
5552
5376
class cmd_switch(Command):
5553
__doc__ = """Set the branch of a checkout and update.
5377
"""Set the branch of a checkout and update.
5554
5378
5555
5379
For lightweight checkouts, this changes the branch being referenced.
5556
5380
For heavyweight checkouts, this checks that there are no local commits
5572
5396
that of the master.
5573
5397
"""
5574
5398
5575
takes_args = ['to_location?']
5399
takes_args = ['to_location']
5576
5400
takes_options = [Option('force',
5577
5401
help='Switch even if local commits will be lost.'),
5578
'revision',
5579
5402
Option('create-branch', short_name='b',
5580
5403
help='Create the target branch from this one before'
5581
5404
' switching to it.'),
5582
]
5405
]
5583
5406
5584
def run(self, to_location=None, force=False, create_branch=False,
5585
revision=None):
5407
def run(self, to_location, force=False, create_branch=False):
5586
5408
from bzrlib import switch
5587
5409
tree_location = '.'
5588
revision = _get_one_revision('switch', revision)
5589
5410
control_dir = bzrdir.BzrDir.open_containing(tree_location)[0]
5590
if to_location is None:
5591
if revision is None:
5592
raise errors.BzrCommandError('You must supply either a'
5593
' revision or a location')
5594
to_location = '.'
5595
5411
try:
5596
5412
branch = control_dir.open_branch()
5597
5413
had_explicit_nick = branch.get_config().has_explicit_nickname()
5602
5418
if branch is None:
5603
5419
raise errors.BzrCommandError('cannot create branch without'
5604
5420
' source branch')
5605
to_location = directory_service.directories.dereference(
5606
to_location)
5607
5421
if '/' not in to_location and '\\' not in to_location:
5608
5422
# This path is meant to be relative to the existing branch
5609
5423
this_url = self._get_branch_location(control_dir)
5611
5425
to_branch = branch.bzrdir.sprout(to_location,
5612
5426
possible_transports=[branch.bzrdir.root_transport],
5613
5427
source_branch=branch).open_branch()
5428
# try:
5429
# from_branch = control_dir.open_branch()
5430
# except errors.NotBranchError:
5431
# raise BzrCommandError('Cannot create a branch from this'
5432
# ' location when we cannot open this branch')
5433
# from_branch.bzrdir.sprout(
5434
pass
5614
5435
else:
5615
5436
try:
5616
5437
to_branch = Branch.open(to_location)
5618
5439
this_url = self._get_branch_location(control_dir)
5619
5440
to_branch = Branch.open(
5620
5441
urlutils.join(this_url, '..', to_location))
5621
if revision is not None:
5622
revision = revision.as_revision_id(to_branch)
5623
switch.switch(control_dir, to_branch, force, revision_id=revision)
5442
switch.switch(control_dir, to_branch, force)
5624
5443
if had_explicit_nick:
5625
5444
branch = control_dir.open_branch() #get the new branch!
5626
5445
branch.nick = to_branch.nick
5646
5465
5647
5466
5648
5467
class cmd_view(Command):
5649
__doc__ = """Manage filtered views.
5468
"""Manage filtered views.
5650
5469
5651
5470
Views provide a mask over the tree so that users can focus on
5652
5471
a subset of a tree when doing their work. After creating a view,
5800
5619
5801
5620
5802
5621
class cmd_hooks(Command):
5803
__doc__ = """Show hooks."""
5622
"""Show hooks."""
5804
5623
5805
5624
hidden = True
5806
5625
5819
5638
self.outf.write(" <no hooks installed>\n")
5820
5639
5821
5640
5822
class cmd_remove_branch(Command):
5823
__doc__ = """Remove a branch.
5824
5825
This will remove the branch from the specified location but
5826
will keep any working tree or repository in place.
5827
5828
:Examples:
5829
5830
Remove the branch at repo/trunk::
5831
5832
bzr remove-branch repo/trunk
5833
5834
"""
5835
5836
takes_args = ["location?"]
5837
5838
aliases = ["rmbranch"]
5839
5840
def run(self, location=None):
5841
if location is None:
5842
location = "."
5843
branch = Branch.open_containing(location)[0]
5844
branch.bzrdir.destroy_branch()
5845
5846
5847
5641
class cmd_shelve(Command):
5848
__doc__ = """Temporarily set aside some changes from the current tree.
5642
"""Temporarily set aside some changes from the current tree.
5849
5643
5850
5644
Shelve allows you to temporarily put changes you've made "on the shelf",
5851
5645
ie. out of the way, until a later time when you can bring them back from
5905
5699
def run_for_list(self):
5906
5700
tree = WorkingTree.open_containing('.')[0]
5907
5701
tree.lock_read()
5908
self.add_cleanup(tree.unlock)
5909
manager = tree.get_shelf_manager()
5910
shelves = manager.active_shelves()
5911
if len(shelves) == 0:
5912
note('No shelved changes.')
5913
return 0
5914
for shelf_id in reversed(shelves):
5915
message = manager.get_metadata(shelf_id).get('message')
5916
if message is None:
5917
message = '<no message>'
5918
self.outf.write('%3d: %s\n' % (shelf_id, message))
5919
return 1
5702
try:
5703
manager = tree.get_shelf_manager()
5704
shelves = manager.active_shelves()
5705
if len(shelves) == 0:
5706
note('No shelved changes.')
5707
return 0
5708
for shelf_id in reversed(shelves):
5709
message = manager.get_metadata(shelf_id).get('message')
5710
if message is None:
5711
message = '<no message>'
5712
self.outf.write('%3d: %s\n' % (shelf_id, message))
5713
return 1
5714
finally:
5715
tree.unlock()
5920
5716
5921
5717
5922
5718
class cmd_unshelve(Command):
5923
__doc__ = """Restore shelved changes.
5719
"""Restore shelved changes.
5924
5720
5925
5721
By default, the most recently shelved changes are restored. However if you
5926
5722
specify a shelf by id those changes will be restored instead. This works
5934
5730
enum_switch=False, value_switches=True,
5935
5731
apply="Apply changes and remove from the shelf.",
5936
5732
dry_run="Show changes, but do not apply or remove them.",
5937
preview="Instead of unshelving the changes, show the diff that "
5938
"would result from unshelving.",
5939
delete_only="Delete changes without applying them.",
5940
keep="Apply changes but don't delete them.",
5733
delete_only="Delete changes without applying them."
5941
5734
)
5942
5735
]
5943
5736
_see_also = ['shelve']
5952
5745
5953
5746
5954
5747
class cmd_clean_tree(Command):
5955
__doc__ = """Remove unwanted files from working tree.
5748
"""Remove unwanted files from working tree.
5956
5749
5957
5750
By default, only unknown files, not ignored files, are deleted. Versioned
5958
5751
files are never deleted.
5986
5779
5987
5780
5988
5781
class cmd_reference(Command):
5989
__doc__ = """list, view and set branch locations for nested trees.
5782
"""list, view and set branch locations for nested trees.
5990
5783
5991
5784
If no arguments are provided, lists the branch locations for nested trees.
5992
5785
If one argument is provided, display the branch location for that tree.
6032
5825
self.outf.write('%s %s\n' % (path, location))
6033
5826
6034
5827
6035
def _register_lazy_builtins():
6036
# register lazy builtins from other modules; called at startup and should
6037
# be only called once.
6038
for (name, aliases, module_name) in [
6039
('cmd_bundle_info', [], 'bzrlib.bundle.commands'),
6040
('cmd_dpush', [], 'bzrlib.foreign'),
6041
('cmd_version_info', [], 'bzrlib.cmd_version_info'),
6042
('cmd_resolve', ['resolved'], 'bzrlib.conflicts'),
6043
('cmd_conflicts', [], 'bzrlib.conflicts'),
6044
('cmd_sign_my_commits', [], 'bzrlib.sign_my_commits'),
6045
]:
6046
builtin_command_registry.register_lazy(name, aliases, module_name)
5828
# these get imported and then picked up by the scan for cmd_*
5829
# TODO: Some more consistent way to split command definitions across files;
5830
# we do need to load at least some information about them to know of
5831
# aliases. ideally we would avoid loading the implementation until the
5832
# details were needed.
5833
from bzrlib.cmd_version_info import cmd_version_info
5834
from bzrlib.conflicts import cmd_resolve, cmd_conflicts, restore
5835
from bzrlib.bundle.commands import (
5836
cmd_bundle_info,
5837
)
5838
from bzrlib.foreign import cmd_dpush
5839
from bzrlib.sign_my_commits import cmd_sign_my_commits
5840
from bzrlib.weave_commands import cmd_versionedfile_list, \
5841
cmd_weave_plan_merge, cmd_weave_merge_text
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0