« back to all changes in this revision
Viewing changes to bzrlib/builtins.py
- browse files at revision 4815.2.6
- compare with another revision
- download diff
- download tarball
- view history from revision 4815.2.6
- Committer: Michael Hudson
- Date: 2009-11-24 02:25:23 UTC
- mto: This revision was merged to the branch mainline in revision 4822.
- Revision ID: michael.hudson@canonical.com-20091124022523-0pism3bgkg0ip73t
final tweak
- 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.
1898
1850
1899
1851
bzr diff -r<chosen_parent>..X
1900
1852
1901
The changes introduced by revision 2 (equivalent to -r1..2)::
1902
1903
bzr diff -c2
1904
1905
1853
Show just the differences for file NEWS::
1906
1854
1907
1855
bzr diff NEWS
1945
1893
help='Use this command to compare files.',
1946
1894
type=unicode,
1947
1895
),
1948
RegistryOption('format',
1949
help='Diff format to use.',
1950
lazy_registry=('bzrlib.diff', 'format_registry'),
1951
value_switches=False, title='Diff format'),
1952
1896
]
1953
1897
aliases = ['di', 'dif']
1954
1898
encoding_type = 'exact'
1955
1899
1956
1900
@display_command
1957
1901
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)
1902
prefix=None, old=None, new=None, using=None):
1903
from bzrlib.diff import get_trees_and_branches_to_diff, show_diff_trees
1961
1904
1962
1905
if (prefix is None) or (prefix == '0'):
1963
1906
# diff -p0 format
1977
1920
raise errors.BzrCommandError('bzr diff --revision takes exactly'
1978
1921
' one or two revision specifiers')
1979
1922
1980
if using is not None and format is not None:
1981
raise errors.BzrCommandError('--using and --format are mutually '
1982
'exclusive.')
1983
1984
1923
(old_tree, new_tree,
1985
1924
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)
1925
specific_files, extra_trees) = get_trees_and_branches_to_diff(
1926
file_list, revision, old, new, apply_view=True)
1988
1927
return show_diff_trees(old_tree, new_tree, sys.stdout,
1989
1928
specific_files=specific_files,
1990
1929
external_diff_options=diff_options,
1991
1930
old_label=old_label, new_label=new_label,
1992
extra_trees=extra_trees, using=using,
1993
format_cls=format)
1931
extra_trees=extra_trees, using=using)
1994
1932
1995
1933
1996
1934
class cmd_deleted(Command):
1997
__doc__ = """List files deleted in the working tree.
1935
"""List files deleted in the working tree.
1998
1936
"""
1999
1937
# TODO: Show files deleted since a previous revision, or
2000
1938
# between two revisions.
2009
1947
def run(self, show_ids=False):
2010
1948
tree = WorkingTree.open_containing(u'.')[0]
2011
1949
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')
1950
try:
1951
old = tree.basis_tree()
1952
old.lock_read()
1953
try:
1954
for path, ie in old.inventory.iter_entries():
1955
if not tree.has_id(ie.file_id):
1956
self.outf.write(path)
1957
if show_ids:
1958
self.outf.write(' ')
1959
self.outf.write(ie.file_id)
1960
self.outf.write('\n')
1961
finally:
1962
old.unlock()
1963
finally:
1964
tree.unlock()
2023
1965
2024
1966
2025
1967
class cmd_modified(Command):
2026
__doc__ = """List files modified in working tree.
1968
"""List files modified in working tree.
2027
1969
"""
2028
1970
2029
1971
hidden = True
2046
1988
2047
1989
2048
1990
class cmd_added(Command):
2049
__doc__ = """List files added in working tree.
1991
"""List files added in working tree.
2050
1992
"""
2051
1993
2052
1994
hidden = True
2061
2003
def run(self, null=False):
2062
2004
wt = WorkingTree.open_containing(u'.')[0]
2063
2005
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')
2006
try:
2007
basis = wt.basis_tree()
2008
basis.lock_read()
2009
try:
2010
basis_inv = basis.inventory
2011
inv = wt.inventory
2012
for file_id in inv:
2013
if file_id in basis_inv:
2014
continue
2015
if inv.is_root(file_id) and len(basis_inv) == 0:
2016
continue
2017
path = inv.id2path(file_id)
2018
if not os.access(osutils.abspath(path), os.F_OK):
2019
continue
2020
if null:
2021
self.outf.write(path + '\0')
2022
else:
2023
self.outf.write(osutils.quotefn(path) + '\n')
2024
finally:
2025
basis.unlock()
2026
finally:
2027
wt.unlock()
2082
2028
2083
2029
2084
2030
class cmd_root(Command):
2085
__doc__ = """Show the tree root directory.
2031
"""Show the tree root directory.
2086
2032
2087
2033
The root is the nearest enclosing directory with a .bzr control
2088
2034
directory."""
2112
2058
2113
2059
2114
2060
class cmd_log(Command):
2115
__doc__ = """Show historical log for a branch or subset of a branch.
2061
"""Show historical log for a branch or subset of a branch.
2116
2062
2117
2063
log is bzr's default tool for exploring the history of a branch.
2118
2064
The branch to use is taken from the first parameter. If no parameters
2229
2175
:Tips & tricks:
2230
2176
2231
2177
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>.
2178
line tools. You may prefer qlog or glog from the QBzr and Bzr-Gtk packages
2179
respectively for example. (TortoiseBzr uses qlog for displaying logs.) See
2180
http://bazaar-vcs.org/BzrPlugins and http://bazaar-vcs.org/IDEIntegration.
2181
2182
Web interfaces are often better at exploring history than command line
2183
tools, particularly for branches on servers. You may prefer Loggerhead
2184
or one of its alternatives. See http://bazaar-vcs.org/WebInterface.
2236
2185
2237
2186
You may find it useful to add the aliases below to ``bazaar.conf``::
2238
2187
2299
2248
help='Show changes made in each revision as a patch.'),
2300
2249
Option('include-merges',
2301
2250
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
2251
]
2307
2252
encoding_type = 'replace'
2308
2253
2318
2263
message=None,
2319
2264
limit=None,
2320
2265
show_diff=False,
2321
include_merges=False,
2322
exclude_common_ancestry=False,
2323
):
2266
include_merges=False):
2324
2267
from bzrlib.log import (
2325
2268
Logger,
2326
2269
make_log_request_dict,
2327
2270
_get_info_for_log_files,
2328
2271
)
2329
2272
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
2273
if include_merges:
2335
2274
if levels is None:
2336
2275
levels = 0
2349
2288
2350
2289
file_ids = []
2351
2290
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
2291
b = None
2292
try:
2293
if file_list:
2294
# find the file ids to log and check for directory filtering
2295
b, file_info_list, rev1, rev2 = _get_info_for_log_files(
2296
revision, file_list)
2297
for relpath, file_id, kind in file_info_list:
2298
if file_id is None:
2299
raise errors.BzrCommandError(
2300
"Path unknown at end or start of revision range: %s" %
2301
relpath)
2302
# If the relpath is the top of the tree, we log everything
2303
if relpath == '':
2304
file_ids = []
2305
break
2306
else:
2307
file_ids.append(file_id)
2308
filter_by_dir = filter_by_dir or (
2309
kind in ['directory', 'tree-reference'])
2310
else:
2311
# log everything
2312
# FIXME ? log the current subdir only RBC 20060203
2313
if revision is not None \
2314
and len(revision) > 0 and revision[0].get_branch():
2315
location = revision[0].get_branch()
2366
2316
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)
2317
location = '.'
2318
dir, relpath = bzrdir.BzrDir.open_containing(location)
2319
b = dir.open_branch()
2320
b.lock_read()
2321
rev1, rev2 = _get_revision_range(revision, b, self.name())
2322
2323
# Decide on the type of delta & diff filtering to use
2324
# TODO: add an --all-files option to make this configurable & consistent
2325
if not verbose:
2326
delta_type = None
2327
else:
2328
delta_type = 'full'
2329
if not show_diff:
2330
diff_type = None
2331
elif file_ids:
2332
diff_type = 'partial'
2333
else:
2334
diff_type = 'full'
2335
2336
# Build the log formatter
2337
if log_format is None:
2338
log_format = log.log_formatter_registry.get_default(b)
2339
lf = log_format(show_ids=show_ids, to_file=self.outf,
2340
show_timezone=timezone,
2341
delta_format=get_verbosity_level(),
2342
levels=levels,
2343
show_advice=levels is None)
2344
2345
# Choose the algorithm for doing the logging. It's annoying
2346
# having multiple code paths like this but necessary until
2347
# the underlying repository format is faster at generating
2348
# deltas or can provide everything we need from the indices.
2349
# The default algorithm - match-using-deltas - works for
2350
# multiple files and directories and is faster for small
2351
# amounts of history (200 revisions say). However, it's too
2352
# slow for logging a single file in a repository with deep
2353
# history, i.e. > 10K revisions. In the spirit of "do no
2354
# evil when adding features", we continue to use the
2355
# original algorithm - per-file-graph - for the "single
2356
# file that isn't a directory without showing a delta" case.
2357
partial_history = revision and b.repository._format.supports_chks
2358
match_using_deltas = (len(file_ids) != 1 or filter_by_dir
2359
or delta_type or partial_history)
2360
2361
# Build the LogRequest and execute it
2362
if len(file_ids) == 0:
2363
file_ids = None
2364
rqst = make_log_request_dict(
2365
direction=direction, specific_fileids=file_ids,
2366
start_revision=rev1, end_revision=rev2, limit=limit,
2367
message_search=message, delta_type=delta_type,
2368
diff_type=diff_type, _match_using_deltas=match_using_deltas)
2369
Logger(b, rqst).show(lf)
2370
finally:
2371
if b is not None:
2372
b.unlock()
2436
2373
2437
2374
2438
2375
def _get_revision_range(revisionspec_list, branch, command_name):
2456
2393
raise errors.BzrCommandError(
2457
2394
"bzr %s doesn't accept two revisions in different"
2458
2395
" 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)
2396
rev1 = start_spec.in_history(branch)
2464
2397
# Avoid loading all of history when we know a missing
2465
2398
# end of range means the last revision ...
2466
2399
if end_spec.spec is None:
2495
2428
2496
2429
2497
2430
class cmd_touching_revisions(Command):
2498
__doc__ = """Return revision-ids which affected a particular file.
2431
"""Return revision-ids which affected a particular file.
2499
2432
2500
2433
A more user-friendly interface is "bzr log FILE".
2501
2434
"""
2509
2442
file_id = tree.path2id(relpath)
2510
2443
b = tree.branch
2511
2444
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))
2445
try:
2446
touching_revs = log.find_touching_revisions(b, file_id)
2447
for revno, revision_id, what in touching_revs:
2448
self.outf.write("%6d %s\n" % (revno, what))
2449
finally:
2450
b.unlock()
2516
2451
2517
2452
2518
2453
class cmd_ls(Command):
2519
__doc__ = """List files in a tree.
2454
"""List files in a tree.
2520
2455
"""
2521
2456
2522
2457
_see_also = ['status', 'cat']
2570
2505
if from_root:
2571
2506
if relpath:
2572
2507
prefix = relpath + '/'
2573
elif fs_path != '.' and not fs_path.endswith('/'):
2508
elif fs_path != '.':
2574
2509
prefix = fs_path + '/'
2575
2510
2576
2511
if revision is not None or tree is None:
2585
2520
note("Ignoring files outside view. View is %s" % view_str)
2586
2521
2587
2522
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
2523
try:
2524
for fp, fc, fkind, fid, entry in tree.list_files(include_root=False,
2525
from_dir=relpath, recursive=recursive):
2526
# Apply additional masking
2527
if not all and not selection[fc]:
2528
continue
2529
if kind is not None and fkind != kind:
2530
continue
2531
if apply_view:
2532
try:
2533
if relpath:
2534
fullpath = osutils.pathjoin(relpath, fp)
2535
else:
2536
fullpath = fp
2537
views.check_path_in_view(tree, fullpath)
2538
except errors.FileOutsideView:
2539
continue
2605
2540
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:
2541
# Output the entry
2542
if prefix:
2543
fp = osutils.pathjoin(prefix, fp)
2544
kindch = entry.kind_character()
2545
outstring = fp + kindch
2546
ui.ui_factory.clear_term()
2547
if verbose:
2548
outstring = '%-8s %s' % (fc, outstring)
2549
if show_ids and fid is not None:
2550
outstring = "%-50s %s" % (outstring, fid)
2632
2551
self.outf.write(outstring + '\n')
2552
elif null:
2553
self.outf.write(fp + '\0')
2554
if show_ids:
2555
if fid is not None:
2556
self.outf.write(fid)
2557
self.outf.write('\0')
2558
self.outf.flush()
2559
else:
2560
if show_ids:
2561
if fid is not None:
2562
my_id = fid
2563
else:
2564
my_id = ''
2565
self.outf.write('%-50s %s\n' % (outstring, my_id))
2566
else:
2567
self.outf.write(outstring + '\n')
2568
finally:
2569
tree.unlock()
2633
2570
2634
2571
2635
2572
class cmd_unknowns(Command):
2636
__doc__ = """List unknown files.
2573
"""List unknown files.
2637
2574
"""
2638
2575
2639
2576
hidden = True
2646
2583
2647
2584
2648
2585
class cmd_ignore(Command):
2649
__doc__ = """Ignore specified files or patterns.
2586
"""Ignore specified files or patterns.
2650
2587
2651
2588
See ``bzr help patterns`` for details on the syntax of patterns.
2652
2589
2660
2597
After adding, editing or deleting that file either indirectly by
2661
2598
using this command or directly by using an editor, be sure to commit
2662
2599
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
2600
2677
2601
Note: ignore patterns containing shell wildcards must be quoted from
2678
2602
the shell on Unix.
2682
2606
2683
2607
bzr ignore ./Makefile
2684
2608
2685
Ignore .class files in all directories...::
2609
Ignore class files in all directories::
2686
2610
2687
2611
bzr ignore "*.class"
2688
2612
2689
...but do not ignore "special.class"::
2690
2691
bzr ignore "!special.class"
2692
2693
2613
Ignore .o files under the lib directory::
2694
2614
2695
2615
bzr ignore "lib/**/*.o"
2701
2621
Ignore everything but the "debian" toplevel directory::
2702
2622
2703
2623
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
2624
"""
2712
2625
2713
2626
_see_also = ['status', 'ignored', 'patterns']
2714
2627
takes_args = ['name_pattern*']
2715
2628
takes_options = [
2716
Option('default-rules',
2717
help='Display the default ignore rules that bzr uses.')
2629
Option('old-default-rules',
2630
help='Write out the ignore rules bzr < 0.9 always used.')
2718
2631
]
2719
2632
2720
def run(self, name_pattern_list=None, default_rules=None):
2633
def run(self, name_pattern_list=None, old_default_rules=None):
2721
2634
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)
2635
if old_default_rules is not None:
2636
# dump the rules and exit
2637
for pattern in ignores.OLD_DEFAULTS:
2638
print pattern
2726
2639
return
2727
2640
if not name_pattern_list:
2728
2641
raise errors.BzrCommandError("ignore requires at least one "
2729
"NAME_PATTERN or --default-rules.")
2642
"NAME_PATTERN or --old-default-rules")
2730
2643
name_pattern_list = [globbing.normalize_pattern(p)
2731
2644
for p in name_pattern_list]
2732
2645
for name_pattern in name_pattern_list:
2744
2657
if id is not None:
2745
2658
filename = entry[0]
2746
2659
if ignored.match(filename):
2747
matches.append(filename)
2660
matches.append(filename.encode('utf-8'))
2748
2661
tree.unlock()
2749
2662
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),))
2663
print "Warning: the following files are version controlled and" \
2664
" match your ignore pattern:\n%s" \
2665
"\nThese files will continue to be version controlled" \
2666
" unless you 'bzr remove' them." % ("\n".join(matches),)
2754
2667
2755
2668
2756
2669
class cmd_ignored(Command):
2757
__doc__ = """List ignored files and the patterns that matched them.
2670
"""List ignored files and the patterns that matched them.
2758
2671
2759
2672
List all the ignored files and the ignore pattern that caused the file to
2760
2673
be ignored.
2771
2684
def run(self):
2772
2685
tree = WorkingTree.open_containing(u'.')[0]
2773
2686
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))
2687
try:
2688
for path, file_class, kind, file_id, entry in tree.list_files():
2689
if file_class != 'I':
2690
continue
2691
## XXX: Slightly inefficient since this was already calculated
2692
pat = tree.is_ignored(path)
2693
self.outf.write('%-50s %s\n' % (path, pat))
2694
finally:
2695
tree.unlock()
2781
2696
2782
2697
2783
2698
class cmd_lookup_revision(Command):
2784
__doc__ = """Lookup the revision-id from a revision-number
2699
"""Lookup the revision-id from a revision-number
2785
2700
2786
2701
:Examples:
2787
2702
bzr lookup-revision 33
2794
2709
try:
2795
2710
revno = int(revno)
2796
2711
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)
2712
raise errors.BzrCommandError("not a valid revision-number: %r" % revno)
2713
2714
print WorkingTree.open_containing(u'.')[0].branch.get_rev_id(revno)
2801
2715
2802
2716
2803
2717
class cmd_export(Command):
2804
__doc__ = """Export current or past revision to a destination directory or archive.
2718
"""Export current or past revision to a destination directory or archive.
2805
2719
2806
2720
If no revision is specified this exports the last committed revision.
2807
2721
2839
2753
Option('root',
2840
2754
type=str,
2841
2755
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
2756
]
2846
2757
def run(self, dest, branch_or_subdir=None, revision=None, format=None,
2847
root=None, filters=False, per_file_timestamps=False):
2758
root=None, filters=False):
2848
2759
from bzrlib.export import export
2849
2760
2850
2761
if branch_or_subdir is None:
2857
2768
2858
2769
rev_tree = _get_one_revision_tree('export', revision, branch=b, tree=tree)
2859
2770
try:
2860
export(rev_tree, dest, format, root, subdir, filtered=filters,
2861
per_file_timestamps=per_file_timestamps)
2771
export(rev_tree, dest, format, root, subdir, filtered=filters)
2862
2772
except errors.NoSuchExportFormat, e:
2863
2773
raise errors.BzrCommandError('Unsupported export format: %s' % e.format)
2864
2774
2865
2775
2866
2776
class cmd_cat(Command):
2867
__doc__ = """Write the contents of a file as of a given revision to standard output.
2777
"""Write the contents of a file as of a given revision to standard output.
2868
2778
2869
2779
If no revision is nominated, the last revision is used.
2870
2780
2891
2801
tree, branch, relpath = \
2892
2802
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
2893
2803
branch.lock_read()
2894
self.add_cleanup(branch.unlock)
2895
return self._run(tree, branch, relpath, filename, revision,
2896
name_from_revision, filters)
2804
try:
2805
return self._run(tree, branch, relpath, filename, revision,
2806
name_from_revision, filters)
2807
finally:
2808
branch.unlock()
2897
2809
2898
2810
def _run(self, tree, b, relpath, filename, revision, name_from_revision,
2899
2811
filtered):
2900
2812
if tree is None:
2901
2813
tree = b.basis_tree()
2902
2814
rev_tree = _get_one_revision_tree('cat', revision, branch=b)
2903
rev_tree.lock_read()
2904
self.add_cleanup(rev_tree.unlock)
2905
2815
2906
2816
old_file_id = rev_tree.path2id(relpath)
2907
2817
2942
2852
chunks = content.splitlines(True)
2943
2853
content = filtered_output_bytes(chunks, filters,
2944
2854
ContentFilterContext(relpath, rev_tree))
2945
self.cleanup_now()
2946
2855
self.outf.writelines(content)
2947
2856
else:
2948
self.cleanup_now()
2949
2857
self.outf.write(content)
2950
2858
2951
2859
2952
2860
class cmd_local_time_offset(Command):
2953
__doc__ = """Show the offset in seconds from GMT to local time."""
2861
"""Show the offset in seconds from GMT to local time."""
2954
2862
hidden = True
2955
2863
@display_command
2956
2864
def run(self):
2957
self.outf.write("%s\n" % osutils.local_time_offset())
2865
print osutils.local_time_offset()
2958
2866
2959
2867
2960
2868
2961
2869
class cmd_commit(Command):
2962
__doc__ = """Commit changes into a new revision.
2870
"""Commit changes into a new revision.
2963
2871
2964
2872
An explanatory message needs to be given for each commit. This is
2965
2873
often done by using the --message option (getting the message from the
3073
2981
"the master branch until a normal commit "
3074
2982
"is performed."
3075
2983
),
3076
Option('show-diff', short_name='p',
2984
Option('show-diff',
3077
2985
help='When no message is supplied, show the diff along'
3078
2986
' with the status summary in the message editor.'),
3079
2987
]
3145
3053
if local and not tree.branch.get_bound_location():
3146
3054
raise errors.LocalRequiresBoundBranch()
3147
3055
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
3056
def get_message(commit_obj):
3170
3057
"""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,
3058
my_message = message
3059
if my_message is not None and '\r' in my_message:
3060
my_message = my_message.replace('\r\n', '\n')
3061
my_message = my_message.replace('\r', '\n')
3062
if my_message is None and not file:
3063
t = make_commit_message_template_encoded(tree,
3180
3064
selected_list, diff=show_diff,
3181
3065
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
3066
start_message = generate_commit_message_template(commit_obj)
3188
my_message = edit_commit_message_encoded(text,
3067
my_message = edit_commit_message_encoded(t,
3189
3068
start_message=start_message)
3190
3069
if my_message is None:
3191
3070
raise errors.BzrCommandError("please specify a commit"
3192
3071
" message with either --message or --file")
3072
elif my_message and file:
3073
raise errors.BzrCommandError(
3074
"please specify either --message or --file")
3075
if file:
3076
my_message = codecs.open(file, 'rt',
3077
osutils.get_user_encoding()).read()
3193
3078
if my_message == "":
3194
3079
raise errors.BzrCommandError("empty commit message specified")
3195
3080
return my_message
3207
3092
timezone=offset,
3208
3093
exclude=safe_relpath_files(tree, exclude))
3209
3094
except PointlessCommit:
3095
# FIXME: This should really happen before the file is read in;
3096
# perhaps prepare the commit; get the message; then actually commit
3210
3097
raise errors.BzrCommandError("No changes to commit."
3211
3098
" Use --unchanged to commit anyhow.")
3212
3099
except ConflictsInTree:
3217
3104
raise errors.BzrCommandError("Commit refused because there are"
3218
3105
" unknown files in the working tree.")
3219
3106
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
3107
raise errors.BzrCommandError(str(e) + "\n"
3108
'To commit to master branch, run update and then commit.\n'
3109
'You can also pass --local to commit to continue working '
3110
'disconnected.')
3225
3111
3226
3112
3227
3113
class cmd_check(Command):
3228
__doc__ = """Validate working tree structure, branch consistency and repository history.
3114
"""Validate working tree structure, branch consistency and repository history.
3229
3115
3230
3116
This command checks various invariants about branch and repository storage
3231
3117
to detect data corruption or bzr bugs.
3295
3181
3296
3182
3297
3183
class cmd_upgrade(Command):
3298
__doc__ = """Upgrade branch storage to current format.
3184
"""Upgrade branch storage to current format.
3299
3185
3300
3186
The check command or bzr developers may sometimes advise you to run
3301
3187
this command. When the default format has changed you may also be warned
3319
3205
3320
3206
3321
3207
class cmd_whoami(Command):
3322
__doc__ = """Show or set bzr user id.
3208
"""Show or set bzr user id.
3323
3209
3324
3210
:Examples:
3325
3211
Show the email of the current user::
3369
3255
3370
3256
3371
3257
class cmd_nick(Command):
3372
__doc__ = """Print or set the branch nickname.
3258
"""Print or set the branch nickname.
3373
3259
3374
3260
If unset, the tree root directory name is used as the nickname.
3375
3261
To print the current nickname, execute with no argument.
3389
3275
3390
3276
@display_command
3391
3277
def printme(self, branch):
3392
self.outf.write('%s\n' % branch.nick)
3278
print branch.nick
3393
3279
3394
3280
3395
3281
class cmd_alias(Command):
3396
__doc__ = """Set/unset and display aliases.
3282
"""Set/unset and display aliases.
3397
3283
3398
3284
:Examples:
3399
3285
Show the current aliases::
3463
3349
3464
3350
3465
3351
class cmd_selftest(Command):
3466
__doc__ = """Run internal test suite.
3352
"""Run internal test suite.
3467
3353
3468
3354
If arguments are given, they are regular expressions that say which tests
3469
3355
should run. Tests matching any expression are run, and other tests are
3513
3399
def get_transport_type(typestring):
3514
3400
"""Parse and return a transport specifier."""
3515
3401
if typestring == "sftp":
3516
from bzrlib.tests import stub_sftp
3517
return stub_sftp.SFTPAbsoluteServer
3402
from bzrlib.transport.sftp import SFTPAbsoluteServer
3403
return SFTPAbsoluteServer
3518
3404
if typestring == "memory":
3519
from bzrlib.tests import test_server
3520
return memory.MemoryServer
3405
from bzrlib.transport.memory import MemoryServer
3406
return MemoryServer
3521
3407
if typestring == "fakenfs":
3522
from bzrlib.tests import test_server
3523
return test_server.FakeNFSServer
3408
from bzrlib.transport.fakenfs import FakeNFSServer
3409
return FakeNFSServer
3524
3410
msg = "No known transport type %s. Supported types are: sftp\n" %\
3525
3411
(typestring)
3526
3412
raise errors.BzrCommandError(msg)
3610
3496
raise errors.BzrCommandError("subunit not available. subunit "
3611
3497
"needs to be installed to use --subunit.")
3612
3498
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
3499
if parallel:
3619
3500
self.additional_selftest_args.setdefault(
3620
3501
'suite_decorators', []).append(parallel)
3624
3505
verbose = not is_quiet()
3625
3506
# TODO: should possibly lock the history file...
3626
3507
benchfile = open(".perf_history", "at", buffering=1)
3627
self.add_cleanup(benchfile.close)
3628
3508
else:
3629
3509
test_suite_factory = None
3630
3510
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)
3511
try:
3512
selftest_kwargs = {"verbose": verbose,
3513
"pattern": pattern,
3514
"stop_on_failure": one,
3515
"transport": transport,
3516
"test_suite_factory": test_suite_factory,
3517
"lsprof_timed": lsprof_timed,
3518
"lsprof_tests": lsprof_tests,
3519
"bench_history": benchfile,
3520
"matching_tests_first": first,
3521
"list_only": list_only,
3522
"random_seed": randomize,
3523
"exclude_pattern": exclude,
3524
"strict": strict,
3525
"load_list": load_list,
3526
"debug_flags": debugflag,
3527
"starting_with": starting_with
3528
}
3529
selftest_kwargs.update(self.additional_selftest_args)
3530
result = selftest(**selftest_kwargs)
3531
finally:
3532
if benchfile is not None:
3533
benchfile.close()
3650
3534
return int(not result)
3651
3535
3652
3536
3653
3537
class cmd_version(Command):
3654
__doc__ = """Show version of bzr."""
3538
"""Show version of bzr."""
3655
3539
3656
3540
encoding_type = 'replace'
3657
3541
takes_options = [
3668
3552
3669
3553
3670
3554
class cmd_rocks(Command):
3671
__doc__ = """Statement of optimism."""
3555
"""Statement of optimism."""
3672
3556
3673
3557
hidden = True
3674
3558
3675
3559
@display_command
3676
3560
def run(self):
3677
self.outf.write("It sure does!\n")
3561
print "It sure does!"
3678
3562
3679
3563
3680
3564
class cmd_find_merge_base(Command):
3681
__doc__ = """Find and print a base revision for merging two branches."""
3565
"""Find and print a base revision for merging two branches."""
3682
3566
# TODO: Options to specify revisions on either side, as if
3683
3567
# merging only part of the history.
3684
3568
takes_args = ['branch', 'other']
3691
3575
branch1 = Branch.open_containing(branch)[0]
3692
3576
branch2 = Branch.open_containing(other)[0]
3693
3577
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)
3578
try:
3579
branch2.lock_read()
3580
try:
3581
last1 = ensure_null(branch1.last_revision())
3582
last2 = ensure_null(branch2.last_revision())
3583
3584
graph = branch1.repository.get_graph(branch2.repository)
3585
base_rev_id = graph.find_unique_lca(last1, last2)
3586
3587
print 'merge base is revision %s' % base_rev_id
3588
finally:
3589
branch2.unlock()
3590
finally:
3591
branch1.unlock()
3704
3592
3705
3593
3706
3594
class cmd_merge(Command):
3707
__doc__ = """Perform a three-way merge.
3595
"""Perform a three-way merge.
3708
3596
3709
3597
The source of the merge can be specified either in the form of a branch,
3710
3598
or in the form of a path to a file containing a merge directive generated
3739
3627
committed to record the result of the merge.
3740
3628
3741
3629
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.
3630
--force is given.
3748
3631
3749
3632
To select only some changes to merge, use "merge -i", which will prompt
3750
3633
you to apply each diff hunk and file change, similar to "shelve".
3765
3648
To apply a merge directive contained in /tmp/merge::
3766
3649
3767
3650
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
3651
"""
3776
3652
3777
3653
encoding_type = 'exact'
3835
3711
view_info = _get_view_info_for_change_reporter(tree)
3836
3712
change_reporter = delta._ChangeReporter(
3837
3713
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
3714
cleanups = []
3715
try:
3716
pb = ui.ui_factory.nested_progress_bar()
3717
cleanups.append(pb.finished)
3718
tree.lock_write()
3719
cleanups.append(tree.unlock)
3720
if location is not None:
3721
try:
3722
mergeable = bundle.read_mergeable_from_url(location,
3723
possible_transports=possible_transports)
3724
except errors.NotABundle:
3725
mergeable = None
3726
else:
3727
if uncommitted:
3728
raise errors.BzrCommandError('Cannot use --uncommitted'
3729
' with bundles or merge directives.')
3730
3731
if revision is not None:
3732
raise errors.BzrCommandError(
3733
'Cannot use -r with merge directives or bundles')
3734
merger, verified = _mod_merge.Merger.from_mergeable(tree,
3735
mergeable, pb)
3736
3737
if merger is None and uncommitted:
3738
if revision is not None and len(revision) > 0:
3739
raise errors.BzrCommandError('Cannot use --uncommitted and'
3740
' --revision at the same time.')
3741
merger = self.get_merger_from_uncommitted(tree, location, pb,
3742
cleanups)
3743
allow_pending = False
3744
3745
if merger is None:
3746
merger, allow_pending = self._get_merger_from_branch(tree,
3747
location, revision, remember, possible_transports, pb)
3748
3749
merger.merge_type = merge_type
3750
merger.reprocess = reprocess
3751
merger.show_base = show_base
3752
self.sanity_check_merger(merger)
3753
if (merger.base_rev_id == merger.other_rev_id and
3754
merger.other_rev_id is not None):
3755
note('Nothing to do.')
3756
return 0
3757
if pull:
3758
if merger.interesting_files is not None:
3759
raise errors.BzrCommandError('Cannot pull individual files')
3760
if (merger.base_rev_id == tree.last_revision()):
3761
result = tree.pull(merger.other_branch, False,
3762
merger.other_rev_id)
3763
result.report(self.outf)
3764
return 0
3765
if merger.this_basis is None:
3766
raise errors.BzrCommandError(
3767
"This branch has no commits."
3768
" (perhaps you would prefer 'bzr pull')")
3769
if preview:
3770
return self._do_preview(merger, cleanups)
3771
elif interactive:
3772
return self._do_interactive(merger, cleanups)
3848
3773
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):
3774
return self._do_merge(merger, change_reporter, allow_pending,
3775
verified)
3776
finally:
3777
for cleanup in reversed(cleanups):
3778
cleanup()
3779
3780
def _get_preview(self, merger, cleanups):
3899
3781
tree_merger = merger.make_merger()
3900
3782
tt = tree_merger.make_preview_transform()
3901
self.add_cleanup(tt.finalize)
3783
cleanups.append(tt.finalize)
3902
3784
result_tree = tt.get_preview_tree()
3903
3785
return result_tree
3904
3786
3905
def _do_preview(self, merger):
3787
def _do_preview(self, merger, cleanups):
3906
3788
from bzrlib.diff import show_diff_trees
3907
result_tree = self._get_preview(merger)
3789
result_tree = self._get_preview(merger, cleanups)
3908
3790
show_diff_trees(merger.this_tree, result_tree, self.outf,
3909
3791
old_label='', new_label='')
3910
3792
3920
3802
else:
3921
3803
return 0
3922
3804
3923
def _do_interactive(self, merger):
3805
def _do_interactive(self, merger, cleanups):
3924
3806
"""Perform an interactive merge.
3925
3807
3926
3808
This works by generating a preview tree of the merge, then using
3928
3810
and the preview tree.
3929
3811
"""
3930
3812
from bzrlib import shelf_ui
3931
result_tree = self._get_preview(merger)
3813
result_tree = self._get_preview(merger, cleanups)
3932
3814
writer = bzrlib.option.diff_writer_registry.get()
3933
3815
shelver = shelf_ui.Shelver(merger.this_tree, result_tree, destroy=True,
3934
3816
reporter=shelf_ui.ApplyReporter(),
3935
3817
diff_writer=writer(sys.stdout))
3936
try:
3937
shelver.run()
3938
finally:
3939
shelver.finalize()
3818
shelver.run()
3940
3819
3941
3820
def sanity_check_merger(self, merger):
3942
3821
if (merger.show_base and
4002
3881
allow_pending = True
4003
3882
return merger, allow_pending
4004
3883
4005
def get_merger_from_uncommitted(self, tree, location, pb):
3884
def get_merger_from_uncommitted(self, tree, location, pb, cleanups):
4006
3885
"""Get a merger for uncommitted changes.
4007
3886
4008
3887
:param tree: The tree the merger should apply to.
4009
3888
:param location: The location containing uncommitted changes.
4010
3889
:param pb: The progress bar to use for showing progress.
3890
:param cleanups: A list of operations to perform to clean up the
3891
temporary directories, unfinalized objects, etc.
4011
3892
"""
4012
3893
location = self._select_branch_location(tree, location)[0]
4013
3894
other_tree, other_path = WorkingTree.open_containing(location)
4065
3946
4066
3947
4067
3948
class cmd_remerge(Command):
4068
__doc__ = """Redo a merge.
3949
"""Redo a merge.
4069
3950
4070
3951
Use this if you want to try a different merge technique while resolving
4071
3952
conflicts. Some merge techniques are better than others, and remerge
4096
3977
4097
3978
def run(self, file_list=None, merge_type=None, show_base=False,
4098
3979
reprocess=False):
4099
from bzrlib.conflicts import restore
4100
3980
if merge_type is None:
4101
3981
merge_type = _mod_merge.Merge3Merger
4102
3982
tree, file_list = tree_files(file_list)
4103
3983
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
3984
try:
3985
parents = tree.get_parent_ids()
3986
if len(parents) != 2:
3987
raise errors.BzrCommandError("Sorry, remerge only works after normal"
3988
" merges. Not cherrypicking or"
3989
" multi-merges.")
3990
repository = tree.branch.repository
3991
interesting_ids = None
3992
new_conflicts = []
3993
conflicts = tree.conflicts()
3994
if file_list is not None:
3995
interesting_ids = set()
3996
for filename in file_list:
3997
file_id = tree.path2id(filename)
3998
if file_id is None:
3999
raise errors.NotVersionedError(filename)
4000
interesting_ids.add(file_id)
4001
if tree.kind(file_id) != "directory":
4002
continue
4123
4003
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:
4004
for name, ie in tree.inventory.iter_entries(file_id):
4005
interesting_ids.add(ie.file_id)
4006
new_conflicts = conflicts.select_conflicts(tree, file_list)[0]
4007
else:
4008
# Remerge only supports resolving contents conflicts
4009
allowed_conflicts = ('text conflict', 'contents conflict')
4010
restore_files = [c.path for c in conflicts
4011
if c.typestring in allowed_conflicts]
4012
_mod_merge.transform_tree(tree, tree.basis_tree(), interesting_ids)
4013
tree.set_conflicts(ConflictList(new_conflicts))
4014
if file_list is not None:
4015
restore_files = file_list
4016
for filename in restore_files:
4017
try:
4018
restore(tree.abspath(filename))
4019
except errors.NotConflicted:
4020
pass
4021
# Disable pending merges, because the file texts we are remerging
4022
# have not had those merges performed. If we use the wrong parents
4023
# list, we imply that the working tree text has seen and rejected
4024
# all the changes from the other tree, when in fact those changes
4025
# have not yet been seen.
4026
pb = ui.ui_factory.nested_progress_bar()
4027
tree.set_parent_ids(parents[:1])
4137
4028
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()
4029
merger = _mod_merge.Merger.from_revision_ids(pb,
4030
tree, parents[1])
4031
merger.interesting_ids = interesting_ids
4032
merger.merge_type = merge_type
4033
merger.show_base = show_base
4034
merger.reprocess = reprocess
4035
conflicts = merger.do_merge()
4036
finally:
4037
tree.set_parent_ids(parents)
4038
pb.finished()
4154
4039
finally:
4155
tree.set_parent_ids(parents)
4040
tree.unlock()
4156
4041
if conflicts > 0:
4157
4042
return 1
4158
4043
else:
4160
4045
4161
4046
4162
4047
class cmd_revert(Command):
4163
__doc__ = """Revert files to a previous revision.
4048
"""Revert files to a previous revision.
4164
4049
4165
4050
Giving a list of files will revert only those files. Otherwise, all files
4166
4051
will be reverted. If the revision is not specified with '--revision', the
4180
4065
name. If you name a directory, all the contents of that directory will be
4181
4066
reverted.
4182
4067
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.
4068
Any files that have been newly added since that revision will be deleted,
4069
with a backup kept if appropriate. Directories containing unknown files
4070
will not be deleted.
4187
4071
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
4072
The working tree contains a list of pending merged revisions, which will
4073
be included as parents in the next commit. Normally, revert clears that
4074
list as well as reverting the files. If any files are specified, revert
4075
leaves the pending merge list alone and reverts only the files. Use "bzr
4076
revert ." in the tree root to revert all files but keep the merge record,
4077
and "bzr revert --forget-merges" to clear the pending merge list without
4195
4078
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
4079
"""
4207
4080
4208
4081
_see_also = ['cat', 'export']
4217
4090
def run(self, revision=None, no_backup=False, file_list=None,
4218
4091
forget_merges=None):
4219
4092
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)
4093
tree.lock_write()
4094
try:
4095
if forget_merges:
4096
tree.set_parent_ids(tree.get_parent_ids()[:1])
4097
else:
4098
self._revert_tree_to_revision(tree, revision, file_list, no_backup)
4099
finally:
4100
tree.unlock()
4226
4101
4227
4102
@staticmethod
4228
4103
def _revert_tree_to_revision(tree, revision, file_list, no_backup):
4229
4104
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)
4105
pb = ui.ui_factory.nested_progress_bar()
4106
try:
4107
tree.revert(file_list, rev_tree, not no_backup, pb,
4108
report_changes=True)
4109
finally:
4110
pb.finished()
4232
4111
4233
4112
4234
4113
class cmd_assert_fail(Command):
4235
__doc__ = """Test reporting of assertion failures"""
4114
"""Test reporting of assertion failures"""
4236
4115
# intended just for use in testing
4237
4116
4238
4117
hidden = True
4242
4121
4243
4122
4244
4123
class cmd_help(Command):
4245
__doc__ = """Show help on a command or other topic.
4124
"""Show help on a command or other topic.
4246
4125
"""
4247
4126
4248
4127
_see_also = ['topics']
4261
4140
4262
4141
4263
4142
class cmd_shell_complete(Command):
4264
__doc__ = """Show appropriate completions for context.
4143
"""Show appropriate completions for context.
4265
4144
4266
4145
For a list of all available commands, say 'bzr shell-complete'.
4267
4146
"""
4276
4155
4277
4156
4278
4157
class cmd_missing(Command):
4279
__doc__ = """Show unmerged/unpulled revisions between two branches.
4158
"""Show unmerged/unpulled revisions between two branches.
4280
4159
4281
4160
OTHER_BRANCH may be local or remote.
4282
4161
4283
4162
To filter on a range of revisions, you can use the command -r begin..end
4284
4163
-r revision requests a specific revision, -r ..end or -r begin.. are
4285
4164
also valid.
4286
4287
:Exit values:
4288
1 - some missing revisions
4289
0 - no missing revisions
4290
4165
4291
4166
:Examples:
4292
4167
4360
4235
restrict = 'remote'
4361
4236
4362
4237
local_branch = Branch.open_containing(u".")[0]
4363
local_branch.lock_read()
4364
self.add_cleanup(local_branch.unlock)
4365
4366
4238
parent = local_branch.get_parent()
4367
4239
if other_branch is None:
4368
4240
other_branch = parent
4377
4249
remote_branch = Branch.open(other_branch)
4378
4250
if remote_branch.base == local_branch.base:
4379
4251
remote_branch = local_branch
4380
else:
4381
remote_branch.lock_read()
4382
self.add_cleanup(remote_branch.unlock)
4383
4252
4384
4253
local_revid_range = _revision_range_to_revid_range(
4385
4254
_get_revision_range(my_revision, local_branch,
4389
4258
_get_revision_range(revision,
4390
4259
remote_branch, self.name()))
4391
4260
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()
4261
local_branch.lock_read()
4262
try:
4263
remote_branch.lock_read()
4264
try:
4265
local_extra, remote_extra = find_unmerged(
4266
local_branch, remote_branch, restrict,
4267
backward=not reverse,
4268
include_merges=include_merges,
4269
local_revid_range=local_revid_range,
4270
remote_revid_range=remote_revid_range)
4271
4272
if log_format is None:
4273
registry = log.log_formatter_registry
4274
log_format = registry.get_default(local_branch)
4275
lf = log_format(to_file=self.outf,
4276
show_ids=show_ids,
4277
show_timezone='original')
4278
4279
status_code = 0
4280
if local_extra and not theirs_only:
4281
message("You have %d extra revision(s):\n" %
4282
len(local_extra))
4283
for revision in iter_log_revisions(local_extra,
4284
local_branch.repository,
4285
verbose):
4286
lf.log_revision(revision)
4287
printed_local = True
4288
status_code = 1
4289
else:
4290
printed_local = False
4291
4292
if remote_extra and not mine_only:
4293
if printed_local is True:
4294
message("\n\n\n")
4295
message("You are missing %d revision(s):\n" %
4296
len(remote_extra))
4297
for revision in iter_log_revisions(remote_extra,
4298
remote_branch.repository,
4299
verbose):
4300
lf.log_revision(revision)
4301
status_code = 1
4302
4303
if mine_only and not local_extra:
4304
# We checked local, and found nothing extra
4305
message('This branch is up to date.\n')
4306
elif theirs_only and not remote_extra:
4307
# We checked remote, and found nothing extra
4308
message('Other branch is up to date.\n')
4309
elif not (mine_only or theirs_only or local_extra or
4310
remote_extra):
4311
# We checked both branches, and neither one had extra
4312
# revisions
4313
message("Branches are up to date.\n")
4314
finally:
4315
remote_branch.unlock()
4316
finally:
4317
local_branch.unlock()
4442
4318
if not status_code and parent is None and other_branch is not None:
4443
4319
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)
4320
try:
4321
# handle race conditions - a parent might be set while we run.
4322
if local_branch.get_parent() is None:
4323
local_branch.set_parent(remote_branch.base)
4324
finally:
4325
local_branch.unlock()
4448
4326
return status_code
4449
4327
4450
4328
4451
4329
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
"""
4330
"""Compress the data within a repository."""
4469
4331
4470
4332
_see_also = ['repositories']
4471
4333
takes_args = ['branch_or_repo?']
4472
takes_options = [
4473
Option('clean-obsolete-packs', 'Delete obsolete packs to save disk space.'),
4474
]
4475
4334
4476
def run(self, branch_or_repo='.', clean_obsolete_packs=False):
4335
def run(self, branch_or_repo='.'):
4477
4336
dir = bzrdir.BzrDir.open_containing(branch_or_repo)[0]
4478
4337
try:
4479
4338
branch = dir.open_branch()
4480
4339
repository = branch.repository
4481
4340
except errors.NotBranchError:
4482
4341
repository = dir.open_repository()
4483
repository.pack(clean_obsolete_packs=clean_obsolete_packs)
4342
repository.pack()
4484
4343
4485
4344
4486
4345
class cmd_plugins(Command):
4487
__doc__ = """List the installed plugins.
4346
"""List the installed plugins.
4488
4347
4489
4348
This command displays the list of installed plugins including
4490
4349
version of plugin and a short description of each.
4497
4356
adding new commands, providing additional network transports and
4498
4357
customizing log output.
4499
4358
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.
4359
See the Bazaar web site, http://bazaar-vcs.org, for further
4360
information on plugins including where to find them and how to
4361
install them. Instructions are also provided there on how to
4362
write new plugins using the Python programming language.
4504
4363
"""
4505
4364
takes_options = ['verbose']
4506
4365
4521
4380
doc = '(no description)'
4522
4381
result.append((name_ver, doc, plugin.path()))
4523
4382
for name_ver, doc, path in sorted(result):
4524
self.outf.write("%s\n" % name_ver)
4525
self.outf.write(" %s\n" % doc)
4383
print name_ver
4384
print ' ', doc
4526
4385
if verbose:
4527
self.outf.write(" %s\n" % path)
4528
self.outf.write("\n")
4386
print ' ', path
4387
print
4529
4388
4530
4389
4531
4390
class cmd_testament(Command):
4532
__doc__ = """Show testament (signing-form) of a revision."""
4391
"""Show testament (signing-form) of a revision."""
4533
4392
takes_options = [
4534
4393
'revision',
4535
4394
Option('long', help='Produce long-format testament.'),
4548
4407
else:
4549
4408
b = Branch.open(branch)
4550
4409
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())
4410
try:
4411
if revision is None:
4412
rev_id = b.last_revision()
4413
else:
4414
rev_id = revision[0].as_revision_id(b)
4415
t = testament_class.from_revision(b.repository, rev_id)
4416
if long:
4417
sys.stdout.writelines(t.as_text_lines())
4418
else:
4419
sys.stdout.write(t.as_short_text())
4420
finally:
4421
b.unlock()
4561
4422
4562
4423
4563
4424
class cmd_annotate(Command):
4564
__doc__ = """Show the origin of each line in a file.
4425
"""Show the origin of each line in a file.
4565
4426
4566
4427
This prints out the given file with an annotation on the left side
4567
4428
indicating which revision, author and date introduced the change.
4589
4450
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
4590
4451
if wt is not None:
4591
4452
wt.lock_read()
4592
self.add_cleanup(wt.unlock)
4593
4453
else:
4594
4454
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)
4455
try:
4456
tree = _get_one_revision_tree('annotate', revision, branch=branch)
4457
if wt is not None:
4458
file_id = wt.path2id(relpath)
4459
else:
4460
file_id = tree.path2id(relpath)
4461
if file_id is None:
4462
raise errors.NotVersionedError(filename)
4463
file_version = tree.inventory[file_id].revision
4464
if wt is not None and revision is None:
4465
# If there is a tree and we're not annotating historical
4466
# versions, annotate the working tree's content.
4467
annotate_file_tree(wt, file_id, self.outf, long, all,
4468
show_ids=show_ids)
4469
else:
4470
annotate_file(branch, file_version, file_id, long, all, self.outf,
4471
show_ids=show_ids)
4472
finally:
4473
if wt is not None:
4474
wt.unlock()
4475
else:
4476
branch.unlock()
4614
4477
4615
4478
4616
4479
class cmd_re_sign(Command):
4617
__doc__ = """Create a digital signature for an existing revision."""
4480
"""Create a digital signature for an existing revision."""
4618
4481
# TODO be able to replace existing ones.
4619
4482
4620
4483
hidden = True # is this right ?
4628
4491
raise errors.BzrCommandError('You must supply either --revision or a revision_id')
4629
4492
b = WorkingTree.open_containing(u'.')[0].branch
4630
4493
b.lock_write()
4631
self.add_cleanup(b.unlock)
4632
return self._run(b, revision_id_list, revision)
4494
try:
4495
return self._run(b, revision_id_list, revision)
4496
finally:
4497
b.unlock()
4633
4498
4634
4499
def _run(self, b, revision_id_list, revision):
4635
4500
import bzrlib.gpg as gpg
4680
4545
4681
4546
4682
4547
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.
4548
"""Convert the current branch into a checkout of the supplied branch.
4685
4549
4686
4550
Once converted into a checkout, commits must succeed on the master branch
4687
4551
before they will be applied to the local branch.
4705
4569
'This format does not remember old locations.')
4706
4570
else:
4707
4571
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')
4572
raise errors.BzrCommandError('No location supplied and no '
4573
'previous location known')
4713
4574
b_other = Branch.open(location)
4714
4575
try:
4715
4576
b.bind(b_other)
4721
4582
4722
4583
4723
4584
class cmd_unbind(Command):
4724
__doc__ = """Convert the current checkout into a regular branch.
4585
"""Convert the current checkout into a regular branch.
4725
4586
4726
4587
After unbinding, the local branch is considered independent and subsequent
4727
4588
commits will be local only.
4738
4599
4739
4600
4740
4601
class cmd_uncommit(Command):
4741
__doc__ = """Remove the last committed revision.
4602
"""Remove the last committed revision.
4742
4603
4743
4604
--verbose will print out what is being removed.
4744
4605
--dry-run will go through all the motions, but not actually
4785
4646
4786
4647
if tree is not None:
4787
4648
tree.lock_write()
4788
self.add_cleanup(tree.unlock)
4789
4649
else:
4790
4650
b.lock_write()
4791
self.add_cleanup(b.unlock)
4792
return self._run(b, tree, dry_run, verbose, revision, force, local=local)
4651
try:
4652
return self._run(b, tree, dry_run, verbose, revision, force,
4653
local=local)
4654
finally:
4655
if tree is not None:
4656
tree.unlock()
4657
else:
4658
b.unlock()
4793
4659
4794
4660
def _run(self, b, tree, dry_run, verbose, revision, force, local=False):
4795
4661
from bzrlib.log import log_formatter, show_log
4827
4693
end_revision=last_revno)
4828
4694
4829
4695
if dry_run:
4830
self.outf.write('Dry-run, pretending to remove'
4831
' the above revisions.\n')
4696
print 'Dry-run, pretending to remove the above revisions.'
4697
if not force:
4698
val = raw_input('Press <enter> to continue')
4832
4699
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
4700
print 'The above revision(s) will be removed.'
4701
if not force:
4702
val = raw_input('Are you sure [y/N]? ')
4703
if val.lower() not in ('y', 'yes'):
4704
print 'Canceled'
4705
return 0
4839
4706
4840
4707
mutter('Uncommitting from {%s} to {%s}',
4841
4708
last_rev_id, rev_id)
4842
4709
uncommit(b, tree=tree, dry_run=dry_run, verbose=verbose,
4843
4710
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)
4711
note('You can restore the old tip by running:\n'
4712
' bzr pull . -r revid:%s', last_rev_id)
4846
4713
4847
4714
4848
4715
class cmd_break_lock(Command):
4849
__doc__ = """Break a dead lock on a repository, branch or working directory.
4716
"""Break a dead lock on a repository, branch or working directory.
4850
4717
4851
4718
CAUTION: Locks should only be broken when you are sure that the process
4852
4719
holding the lock has been stopped.
4853
4720
4854
You can get information on what locks are open via the 'bzr info
4855
[location]' command.
4721
You can get information on what locks are open via the 'bzr info' command.
4856
4722
4857
4723
:Examples:
4858
4724
bzr break-lock
4859
bzr break-lock bzr+ssh://example.com/bzr/foo
4860
4725
"""
4861
4726
takes_args = ['location?']
4862
4727
4871
4736
4872
4737
4873
4738
class cmd_wait_until_signalled(Command):
4874
__doc__ = """Test helper for test_start_and_stop_bzr_subprocess_send_signal.
4739
"""Test helper for test_start_and_stop_bzr_subprocess_send_signal.
4875
4740
4876
4741
This just prints a line to signal when it is ready, then blocks on stdin.
4877
4742
"""
4885
4750
4886
4751
4887
4752
class cmd_serve(Command):
4888
__doc__ = """Run the bzr server."""
4753
"""Run the bzr server."""
4889
4754
4890
4755
aliases = ['server']
4891
4756
4892
4757
takes_options = [
4893
4758
Option('inet',
4894
4759
help='Serve on stdin/out for use from inetd or sshd.'),
4895
RegistryOption('protocol',
4896
help="Protocol to serve.",
4760
RegistryOption('protocol',
4761
help="Protocol to serve.",
4897
4762
lazy_registry=('bzrlib.transport', 'transport_server_registry'),
4898
4763
value_switches=True),
4899
4764
Option('port',
4908
4773
Option('allow-writes',
4909
4774
help='By default the server is a readonly server. Supplying '
4910
4775
'--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.'
4776
'the served directory and below.'
4916
4777
),
4917
4778
]
4918
4779
4951
4812
4952
4813
4953
4814
class cmd_join(Command):
4954
__doc__ = """Combine a tree into its containing tree.
4815
"""Combine a tree into its containing tree.
4955
4816
4956
4817
This command requires the target tree to be in a rich-root format.
4957
4818
4997
4858
4998
4859
4999
4860
class cmd_split(Command):
5000
__doc__ = """Split a subdirectory of a tree into a separate tree.
4861
"""Split a subdirectory of a tree into a separate tree.
5001
4862
5002
4863
This command will produce a target tree in a format that supports
5003
4864
rich roots, like 'rich-root' or 'rich-root-pack'. These formats cannot be
5023
4884
5024
4885
5025
4886
class cmd_merge_directive(Command):
5026
__doc__ = """Generate a merge directive for auto-merge tools.
4887
"""Generate a merge directive for auto-merge tools.
5027
4888
5028
4889
A directive requests a merge to be performed, and also provides all the
5029
4890
information necessary to do so. This means it must either include a
5122
4983
5123
4984
5124
4985
class cmd_send(Command):
5125
__doc__ = """Mail or create a merge-directive for submitting changes.
4986
"""Mail or create a merge-directive for submitting changes.
5126
4987
5127
4988
A merge directive provides many things needed for requesting merges:
5128
4989
5134
4995
directly from the merge directive, without retrieving data from a
5135
4996
branch.
5136
4997
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.
4998
If --no-bundle is specified, then public_branch is needed (and must be
4999
up-to-date), so that the receiver can perform the merge using the
5000
public_branch. The public_branch is always included if known, so that
5001
people can check it later.
5002
5003
The submit branch defaults to the parent, but can be overridden. Both
5004
submit branch and public branch will be remembered if supplied.
5005
5006
If a public_branch is known for the submit_branch, that public submit
5007
branch is used in the merge instructions. This means that a local mirror
5008
can be used as your actual submit branch, once you have set public_branch
5009
for that mirror.
5163
5010
5164
5011
Mail is sent using your preferred mail program. This should be transparent
5165
5012
on Windows (it uses MAPI). On Linux, it requires the xdg-email utility.
5185
5032
5186
5033
The merge directives created by bzr send may be applied using bzr merge or
5187
5034
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
5035
"""
5193
5036
5194
5037
encoding_type = 'exact'
5210
5053
short_name='f',
5211
5054
type=unicode),
5212
5055
Option('output', short_name='o',
5213
help='Write merge directive to this file or directory; '
5056
help='Write merge directive to this file; '
5214
5057
'use - for stdout.',
5215
5058
type=unicode),
5216
5059
Option('strict',
5239
5082
5240
5083
5241
5084
class cmd_bundle_revisions(cmd_send):
5242
__doc__ = """Create a merge-directive for submitting changes.
5085
"""Create a merge-directive for submitting changes.
5243
5086
5244
5087
A merge directive provides many things needed for requesting merges:
5245
5088
5312
5155
5313
5156
5314
5157
class cmd_tag(Command):
5315
__doc__ = """Create, remove or modify a tag naming a revision.
5158
"""Create, remove or modify a tag naming a revision.
5316
5159
5317
5160
Tags give human-meaningful names to revisions. Commands that take a -r
5318
5161
(--revision) option can be given -rtag:X, where X is any previously
5326
5169
5327
5170
To rename a tag (change the name but keep it on the same revsion), run ``bzr
5328
5171
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
5172
"""
5335
5173
5336
5174
_see_also = ['commit', 'tags']
5337
takes_args = ['tag_name?']
5175
takes_args = ['tag_name']
5338
5176
takes_options = [
5339
5177
Option('delete',
5340
5178
help='Delete this tag rather than placing it.',
5350
5188
'revision',
5351
5189
]
5352
5190
5353
def run(self, tag_name=None,
5191
def run(self, tag_name,
5354
5192
delete=None,
5355
5193
directory='.',
5356
5194
force=None,
5358
5196
):
5359
5197
branch, relpath = Branch.open_containing(directory)
5360
5198
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)
5199
try:
5200
if delete:
5201
branch.tags.delete_tag(tag_name)
5202
self.outf.write('Deleted tag %s.\n' % tag_name)
5374
5203
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)
5204
if revision:
5205
if len(revision) != 1:
5206
raise errors.BzrCommandError(
5207
"Tags can only be placed on a single revision, "
5208
"not on a range")
5209
revision_id = revision[0].as_revision_id(branch)
5210
else:
5211
revision_id = branch.last_revision()
5212
if (not force) and branch.tags.has_tag(tag_name):
5213
raise errors.TagAlreadyExists(tag_name)
5214
branch.tags.set_tag(tag_name, revision_id)
5215
self.outf.write('Created tag %s.\n' % tag_name)
5216
finally:
5217
branch.unlock()
5385
5218
5386
5219
5387
5220
class cmd_tags(Command):
5388
__doc__ = """List tags.
5221
"""List tags.
5389
5222
5390
5223
This command shows a table of tag names and the revisions they reference.
5391
5224
"""
5420
5253
return
5421
5254
5422
5255
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()
5256
try:
5257
if revision:
5258
graph = branch.repository.get_graph()
5259
rev1, rev2 = _get_revision_range(revision, branch, self.name())
5260
revid1, revid2 = rev1.rev_id, rev2.rev_id
5261
# only show revisions between revid1 and revid2 (inclusive)
5262
tags = [(tag, revid) for tag, revid in tags if
5263
graph.is_between(revid, revid1, revid2)]
5264
if sort == 'alpha':
5265
tags.sort()
5266
elif sort == 'time':
5267
timestamps = {}
5268
for tag, revid in tags:
5269
try:
5270
revobj = branch.repository.get_revision(revid)
5271
except errors.NoSuchRevision:
5272
timestamp = sys.maxint # place them at the end
5273
else:
5274
timestamp = revobj.timestamp
5275
timestamps[revid] = timestamp
5276
tags.sort(key=lambda x: timestamps[x[1]])
5277
if not show_ids:
5278
# [ (tag, revid), ... ] -> [ (tag, dotted_revno), ... ]
5279
for index, (tag, revid) in enumerate(tags):
5280
try:
5281
revno = branch.revision_id_to_dotted_revno(revid)
5282
if isinstance(revno, tuple):
5283
revno = '.'.join(map(str, revno))
5284
except errors.NoSuchRevision:
5285
# Bad tag data/merges can lead to tagged revisions
5286
# which are not in this branch. Fail gracefully ...
5287
revno = '?'
5288
tags[index] = (tag, revno)
5289
finally:
5290
branch.unlock()
5457
5291
for tag, revspec in tags:
5458
5292
self.outf.write('%-20s %s\n' % (tag, revspec))
5459
5293
5460
5294
5461
5295
class cmd_reconfigure(Command):
5462
__doc__ = """Reconfigure the type of a bzr directory.
5296
"""Reconfigure the type of a bzr directory.
5463
5297
5464
5298
A target configuration must be specified.
5465
5299
5550
5384
5551
5385
5552
5386
class cmd_switch(Command):
5553
__doc__ = """Set the branch of a checkout and update.
5387
"""Set the branch of a checkout and update.
5554
5388
5555
5389
For lightweight checkouts, this changes the branch being referenced.
5556
5390
For heavyweight checkouts, this checks that there are no local commits
5572
5406
that of the master.
5573
5407
"""
5574
5408
5575
takes_args = ['to_location?']
5409
takes_args = ['to_location']
5576
5410
takes_options = [Option('force',
5577
5411
help='Switch even if local commits will be lost.'),
5578
'revision',
5579
5412
Option('create-branch', short_name='b',
5580
5413
help='Create the target branch from this one before'
5581
5414
' switching to it.'),
5582
]
5415
]
5583
5416
5584
def run(self, to_location=None, force=False, create_branch=False,
5585
revision=None):
5417
def run(self, to_location, force=False, create_branch=False):
5586
5418
from bzrlib import switch
5587
5419
tree_location = '.'
5588
revision = _get_one_revision('switch', revision)
5589
5420
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
5421
try:
5596
5422
branch = control_dir.open_branch()
5597
5423
had_explicit_nick = branch.get_config().has_explicit_nickname()
5602
5428
if branch is None:
5603
5429
raise errors.BzrCommandError('cannot create branch without'
5604
5430
' source branch')
5605
to_location = directory_service.directories.dereference(
5606
to_location)
5607
5431
if '/' not in to_location and '\\' not in to_location:
5608
5432
# This path is meant to be relative to the existing branch
5609
5433
this_url = self._get_branch_location(control_dir)
5611
5435
to_branch = branch.bzrdir.sprout(to_location,
5612
5436
possible_transports=[branch.bzrdir.root_transport],
5613
5437
source_branch=branch).open_branch()
5438
# try:
5439
# from_branch = control_dir.open_branch()
5440
# except errors.NotBranchError:
5441
# raise BzrCommandError('Cannot create a branch from this'
5442
# ' location when we cannot open this branch')
5443
# from_branch.bzrdir.sprout(
5444
pass
5614
5445
else:
5615
5446
try:
5616
5447
to_branch = Branch.open(to_location)
5618
5449
this_url = self._get_branch_location(control_dir)
5619
5450
to_branch = Branch.open(
5620
5451
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)
5452
switch.switch(control_dir, to_branch, force)
5624
5453
if had_explicit_nick:
5625
5454
branch = control_dir.open_branch() #get the new branch!
5626
5455
branch.nick = to_branch.nick
5646
5475
5647
5476
5648
5477
class cmd_view(Command):
5649
__doc__ = """Manage filtered views.
5478
"""Manage filtered views.
5650
5479
5651
5480
Views provide a mask over the tree so that users can focus on
5652
5481
a subset of a tree when doing their work. After creating a view,
5800
5629
5801
5630
5802
5631
class cmd_hooks(Command):
5803
__doc__ = """Show hooks."""
5632
"""Show hooks."""
5804
5633
5805
5634
hidden = True
5806
5635
5819
5648
self.outf.write(" <no hooks installed>\n")
5820
5649
5821
5650
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
5651
class cmd_shelve(Command):
5848
__doc__ = """Temporarily set aside some changes from the current tree.
5652
"""Temporarily set aside some changes from the current tree.
5849
5653
5850
5654
Shelve allows you to temporarily put changes you've made "on the shelf",
5851
5655
ie. out of the way, until a later time when you can bring them back from
5905
5709
def run_for_list(self):
5906
5710
tree = WorkingTree.open_containing('.')[0]
5907
5711
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
5712
try:
5713
manager = tree.get_shelf_manager()
5714
shelves = manager.active_shelves()
5715
if len(shelves) == 0:
5716
note('No shelved changes.')
5717
return 0
5718
for shelf_id in reversed(shelves):
5719
message = manager.get_metadata(shelf_id).get('message')
5720
if message is None:
5721
message = '<no message>'
5722
self.outf.write('%3d: %s\n' % (shelf_id, message))
5723
return 1
5724
finally:
5725
tree.unlock()
5920
5726
5921
5727
5922
5728
class cmd_unshelve(Command):
5923
__doc__ = """Restore shelved changes.
5729
"""Restore shelved changes.
5924
5730
5925
5731
By default, the most recently shelved changes are restored. However if you
5926
5732
specify a shelf by id those changes will be restored instead. This works
5934
5740
enum_switch=False, value_switches=True,
5935
5741
apply="Apply changes and remove from the shelf.",
5936
5742
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.",
5743
delete_only="Delete changes without applying them."
5941
5744
)
5942
5745
]
5943
5746
_see_also = ['shelve']
5952
5755
5953
5756
5954
5757
class cmd_clean_tree(Command):
5955
__doc__ = """Remove unwanted files from working tree.
5758
"""Remove unwanted files from working tree.
5956
5759
5957
5760
By default, only unknown files, not ignored files, are deleted. Versioned
5958
5761
files are never deleted.
5986
5789
5987
5790
5988
5791
class cmd_reference(Command):
5989
__doc__ = """list, view and set branch locations for nested trees.
5792
"""list, view and set branch locations for nested trees.
5990
5793
5991
5794
If no arguments are provided, lists the branch locations for nested trees.
5992
5795
If one argument is provided, display the branch location for that tree.
6032
5835
self.outf.write('%s %s\n' % (path, location))
6033
5836
6034
5837
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)
5838
# these get imported and then picked up by the scan for cmd_*
5839
# TODO: Some more consistent way to split command definitions across files;
5840
# we do need to load at least some information about them to know of
5841
# aliases. ideally we would avoid loading the implementation until the
5842
# details were needed.
5843
from bzrlib.cmd_version_info import cmd_version_info
5844
from bzrlib.conflicts import cmd_resolve, cmd_conflicts, restore
5845
from bzrlib.bundle.commands import (
5846
cmd_bundle_info,
5847
)
5848
from bzrlib.foreign import cmd_dpush
5849
from bzrlib.sign_my_commits import cmd_sign_my_commits
5850
from bzrlib.weave_commands import cmd_versionedfile_list, \
5851
cmd_weave_plan_merge, cmd_weave_merge_text
Loggerhead is a web-based interface for Breezy
Version: 2.0.1