To get this branch, use:
bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
« back to all changes in this revision
Viewing changes to bzrlib/builtins.py
- browse files at revision 4748.1.9
- compare with another revision
- download diff
- download tarball
- view history from revision 4748.1.9
- Committer: Andrew Bennetts
- Date: 2009-11-16 05:57:00 UTC
- mto: This revision was merged to the branch mainline in revision 5032.
- Revision ID: andrew.bennetts@canonical.com-20091116055700-lzlw30496263bz49
Fix bug introduced by the change to take multiple locations, and add a test for multiple locations.
- 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
- doc/ja
- doc/ja/_static
- doc/ja/_templates
- doc/ja/mini-tutorial
- doc/ja/tutorials
- doc/ja/upgrade-guide
- doc/ja/user-guide
- doc/ja/user-guide/images
- doc/ja/user-reference
- 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
timestamp,
50
47
transport,
51
48
ui,
52
49
urlutils,
54
51
)
55
52
from bzrlib.branch import Branch
56
53
from bzrlib.conflicts import ConflictList
57
from bzrlib.transport import memory
58
54
from bzrlib.revisionspec import RevisionSpec, RevisionInfo
59
55
from bzrlib.smtp_connection import SMTPConnection
60
56
from bzrlib.workingtree import WorkingTree
61
57
""")
62
58
63
from bzrlib.commands import (
64
Command,
65
builtin_command_registry,
66
display_command,
67
)
59
from bzrlib.commands import Command, display_command
68
60
from bzrlib.option import (
69
61
ListOption,
70
62
Option,
239
231
# opens the branch?)
240
232
241
233
class cmd_status(Command):
242
__doc__ = """Display status summary.
234
"""Display status summary.
243
235
244
236
This reports on versioned and unknown files, reporting them
245
237
grouped by state. Possible states are:
265
257
unknown
266
258
Not versioned and not matching an ignore pattern.
267
259
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
260
To see ignored files use 'bzr ignored'. For details on the
273
261
changes to file texts, use 'bzr diff'.
274
262
332
320
333
321
334
322
class cmd_cat_revision(Command):
335
__doc__ = """Write out metadata for a revision.
323
"""Write out metadata for a revision.
336
324
337
325
The revision to print can either be specified by a specific
338
326
revision identifier, or you can use --revision.
344
332
# cat-revision is more for frontends so should be exact
345
333
encoding = 'strict'
346
334
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
335
@display_command
356
336
def run(self, revision_id=None, revision=None):
357
337
if revision_id is not None and revision is not None:
362
342
' --revision or a revision_id')
363
343
b = WorkingTree.open_containing(u'.')[0].branch
364
344
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')
345
# TODO: jam 20060112 should cat-revision always output utf-8?
346
if revision_id is not None:
347
revision_id = osutils.safe_revision_id(revision_id, warn=False)
348
try:
349
self.outf.write(b.repository.get_revision_xml(revision_id).decode('utf-8'))
350
except errors.NoSuchRevision:
351
msg = "The repository %s contains no revision %s." % (b.repository.base,
352
revision_id)
353
raise errors.BzrCommandError(msg)
354
elif revision is not None:
355
for rev in revision:
356
if rev is None:
357
raise errors.BzrCommandError('You cannot specify a NULL'
358
' revision.')
359
rev_id = rev.as_revision_id(b)
360
self.outf.write(b.repository.get_revision_xml(rev_id).decode('utf-8'))
369
361
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
362
392
363
class cmd_dump_btree(Command):
393
__doc__ = """Dump the contents of a btree index file to stdout.
364
"""Dump the contents of a btree index file to stdout.
394
365
395
366
PATH is a btree index file, it can be any URL. This includes things like
396
367
.bzr/repository/pack-names, or .bzr/repository/indices/a34b3a...ca4a4.iix
460
431
for node in bt.iter_all_entries():
461
432
# Node is made up of:
462
433
# (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)
434
refs_as_tuples = tuple([tuple([tuple(ref) for ref in ref_list])
435
for ref_list in node[3]])
469
436
as_tuple = (tuple(node[1]), node[2], refs_as_tuples)
470
437
self.outf.write('%s\n' % (as_tuple,))
471
438
472
439
473
440
class cmd_remove_tree(Command):
474
__doc__ = """Remove the working tree from a given branch/checkout.
441
"""Remove the working tree from a given branch/checkout.
475
442
476
443
Since a lightweight checkout is little more than a working tree
477
444
this will refuse to run against one.
504
471
if (working.has_changes()):
505
472
raise errors.UncommittedChanges(working)
506
473
507
if working.user_url != working.branch.user_url:
474
working_path = working.bzrdir.root_transport.base
475
branch_path = working.branch.bzrdir.root_transport.base
476
if working_path != branch_path:
508
477
raise errors.BzrCommandError("You cannot remove the working tree"
509
478
" from a lightweight checkout")
510
479
512
481
513
482
514
483
class cmd_revno(Command):
515
__doc__ = """Show current revision number.
484
"""Show current revision number.
516
485
517
486
This is equal to the number of revisions on this branch.
518
487
"""
531
500
wt.lock_read()
532
501
except (errors.NoWorkingTree, errors.NotLocalUrl):
533
502
raise errors.NoWorkingTree(location)
534
self.add_cleanup(wt.unlock)
535
revid = wt.last_revision()
536
503
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)
504
revid = wt.last_revision()
505
try:
506
revno_t = wt.branch.revision_id_to_dotted_revno(revid)
507
except errors.NoSuchRevision:
508
revno_t = ('???',)
509
revno = ".".join(str(n) for n in revno_t)
510
finally:
511
wt.unlock()
541
512
else:
542
513
b = Branch.open_containing(location)[0]
543
514
b.lock_read()
544
self.add_cleanup(b.unlock)
545
revno = b.revno()
546
self.cleanup_now()
515
try:
516
revno = b.revno()
517
finally:
518
b.unlock()
519
547
520
self.outf.write(str(revno) + '\n')
548
521
549
522
550
523
class cmd_revision_info(Command):
551
__doc__ = """Show revision number and revision id for a given revision identifier.
524
"""Show revision number and revision id for a given revision identifier.
552
525
"""
553
526
hidden = True
554
527
takes_args = ['revision_info*']
571
544
wt = WorkingTree.open_containing(directory)[0]
572
545
b = wt.branch
573
546
wt.lock_read()
574
self.add_cleanup(wt.unlock)
575
547
except (errors.NoWorkingTree, errors.NotLocalUrl):
576
548
wt = None
577
549
b = Branch.open_containing(directory)[0]
578
550
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())
551
try:
552
revision_ids = []
553
if revision is not None:
554
revision_ids.extend(rev.as_revision_id(b) for rev in revision)
555
if revision_info_list is not None:
556
for rev_str in revision_info_list:
557
rev_spec = RevisionSpec.from_string(rev_str)
558
revision_ids.append(rev_spec.as_revision_id(b))
559
# No arguments supplied, default to the last revision
560
if len(revision_ids) == 0:
561
if tree:
562
if wt is None:
563
raise errors.NoWorkingTree(directory)
564
revision_ids.append(wt.last_revision())
565
else:
566
revision_ids.append(b.last_revision())
567
568
revinfos = []
569
maxlen = 0
570
for revision_id in revision_ids:
571
try:
572
dotted_revno = b.revision_id_to_dotted_revno(revision_id)
573
revno = '.'.join(str(i) for i in dotted_revno)
574
except errors.NoSuchRevision:
575
revno = '???'
576
maxlen = max(maxlen, len(revno))
577
revinfos.append([revno, revision_id])
578
finally:
579
if wt is None:
580
b.unlock()
593
581
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()
582
wt.unlock()
583
608
584
for ri in revinfos:
609
585
self.outf.write('%*s %s\n' % (maxlen, ri[0], ri[1]))
610
586
611
587
612
588
class cmd_add(Command):
613
__doc__ = """Add specified files or directories.
589
"""Add specified files or directories.
614
590
615
591
In non-recursive mode, all the named items are added, regardless
616
592
of whether they were previously ignored. A warning is given if
682
658
683
659
if base_tree:
684
660
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()
661
try:
662
tree, file_list = tree_files_for_add(file_list)
663
added, ignored = tree.smart_add(file_list, not
664
no_recurse, action=action, save=not dry_run)
665
finally:
666
if base_tree is not None:
667
base_tree.unlock()
690
668
if len(ignored) > 0:
691
669
if verbose:
692
670
for glob in sorted(ignored.keys()):
696
674
697
675
698
676
class cmd_mkdir(Command):
699
__doc__ = """Create a new versioned directory.
677
"""Create a new versioned directory.
700
678
701
679
This is equivalent to creating the directory and then adding it.
702
680
"""
706
684
707
685
def run(self, dir_list):
708
686
for d in dir_list:
687
os.mkdir(d)
709
688
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)
689
wt.add([dd])
690
self.outf.write('added %s\n' % d)
718
691
719
692
720
693
class cmd_relpath(Command):
721
__doc__ = """Show path of a file relative to root"""
694
"""Show path of a file relative to root"""
722
695
723
696
takes_args = ['filename']
724
697
hidden = True
733
706
734
707
735
708
class cmd_inventory(Command):
736
__doc__ = """Show inventory of the current working copy or a revision.
709
"""Show inventory of the current working copy or a revision.
737
710
738
711
It is possible to limit the output to a particular entry
739
712
type using the --kind option. For example: --kind file.
761
734
revision = _get_one_revision('inventory', revision)
762
735
work_tree, file_list = tree_files(file_list)
763
736
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()
737
try:
738
if revision is not None:
739
tree = revision.as_tree(work_tree.branch)
740
741
extra_trees = [work_tree]
742
tree.lock_read()
743
else:
744
tree = work_tree
745
extra_trees = []
746
747
if file_list is not None:
748
file_ids = tree.paths2ids(file_list, trees=extra_trees,
749
require_versioned=True)
750
# find_ids_across_trees may include some paths that don't
751
# exist in 'tree'.
752
entries = sorted((tree.id2path(file_id), tree.inventory[file_id])
753
for file_id in file_ids if file_id in tree)
754
else:
755
entries = tree.inventory.entries()
756
finally:
757
tree.unlock()
758
if tree is not work_tree:
759
work_tree.unlock()
760
786
761
for path, entry in entries:
787
762
if kind and kind != entry.kind:
788
763
continue
794
769
795
770
796
771
class cmd_mv(Command):
797
__doc__ = """Move or rename a file.
772
"""Move or rename a file.
798
773
799
774
:Usage:
800
775
bzr mv OLDNAME NEWNAME
834
809
raise errors.BzrCommandError("missing file argument")
835
810
tree, rel_names = tree_files(names_list, canonicalize=False)
836
811
tree.lock_tree_write()
837
self.add_cleanup(tree.unlock)
838
self._run(tree, names_list, rel_names, after)
812
try:
813
self._run(tree, names_list, rel_names, after)
814
finally:
815
tree.unlock()
839
816
840
817
def run_auto(self, names_list, after, dry_run):
841
818
if names_list is not None and len(names_list) > 1:
846
823
' --auto.')
847
824
work_tree, file_list = tree_files(names_list, default_branch='.')
848
825
work_tree.lock_tree_write()
849
self.add_cleanup(work_tree.unlock)
850
rename_map.RenameMap.guess_renames(work_tree, dry_run)
826
try:
827
rename_map.RenameMap.guess_renames(work_tree, dry_run)
828
finally:
829
work_tree.unlock()
851
830
852
831
def _run(self, tree, names_list, rel_names, after):
853
832
into_existing = osutils.isdir(names_list[-1])
874
853
# All entries reference existing inventory items, so fix them up
875
854
# for cicp file-systems.
876
855
rel_names = tree.get_canonical_inventory_paths(rel_names)
877
for src, dest in tree.move(rel_names[:-1], rel_names[-1], after=after):
878
if not is_quiet():
879
self.outf.write("%s => %s\n" % (src, dest))
856
for pair in tree.move(rel_names[:-1], rel_names[-1], after=after):
857
self.outf.write("%s => %s\n" % pair)
880
858
else:
881
859
if len(names_list) != 2:
882
860
raise errors.BzrCommandError('to mv multiple files the'
926
904
dest = osutils.pathjoin(dest_parent, dest_tail)
927
905
mutter("attempting to move %s => %s", src, dest)
928
906
tree.rename_one(src, dest, after=after)
929
if not is_quiet():
930
self.outf.write("%s => %s\n" % (src, dest))
907
self.outf.write("%s => %s\n" % (src, dest))
931
908
932
909
933
910
class cmd_pull(Command):
934
__doc__ = """Turn this branch into a mirror of another branch.
911
"""Turn this branch into a mirror of another branch.
935
912
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.
913
This command only works on branches that have not diverged. Branches are
914
considered diverged if the destination branch's most recent commit is one
915
that has not been merged (directly or indirectly) into the parent.
940
916
941
917
If branches have diverged, you can use 'bzr merge' to integrate the changes
942
918
from one into the other. Once one branch has merged, the other should
943
919
be able to pull it again.
944
920
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.
921
If you want to forget your local changes and just update your branch to
922
match the remote one, use pull --overwrite.
948
923
949
924
If there is no default location set, the first pull will set it. After
950
925
that, you can omit the location to use the default. To change the
986
961
try:
987
962
tree_to = WorkingTree.open_containing(directory)[0]
988
963
branch_to = tree_to.branch
989
tree_to.lock_write()
990
self.add_cleanup(tree_to.unlock)
991
964
except errors.NoWorkingTree:
992
965
tree_to = None
993
966
branch_to = Branch.open_containing(directory)[0]
994
branch_to.lock_write()
995
self.add_cleanup(branch_to.unlock)
996
967
997
968
if local and not branch_to.get_bound_location():
998
969
raise errors.LocalRequiresBoundBranch()
999
970
1029
1000
else:
1030
1001
branch_from = Branch.open(location,
1031
1002
possible_transports=possible_transports)
1032
branch_from.lock_read()
1033
self.add_cleanup(branch_from.unlock)
1034
1003
1035
1004
if branch_to.get_parent() is None or remember:
1036
1005
branch_to.set_parent(branch_from.base)
1037
1006
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)
1007
if branch_from is not branch_to:
1008
branch_from.lock_read()
1009
try:
1010
if revision is not None:
1011
revision_id = revision.as_revision_id(branch_from)
1012
1013
branch_to.lock_write()
1014
try:
1015
if tree_to is not None:
1016
view_info = _get_view_info_for_change_reporter(tree_to)
1017
change_reporter = delta._ChangeReporter(
1018
unversioned_filter=tree_to.is_ignored,
1019
view_info=view_info)
1020
result = tree_to.pull(
1021
branch_from, overwrite, revision_id, change_reporter,
1022
possible_transports=possible_transports, local=local)
1023
else:
1024
result = branch_to.pull(
1025
branch_from, overwrite, revision_id, local=local)
1026
1027
result.report(self.outf)
1028
if verbose and result.old_revid != result.new_revid:
1029
log.show_branch_change(
1030
branch_to, self.outf, result.old_revno,
1031
result.old_revid)
1032
finally:
1033
branch_to.unlock()
1034
finally:
1035
if branch_from is not branch_to:
1036
branch_from.unlock()
1058
1037
1059
1038
1060
1039
class cmd_push(Command):
1061
__doc__ = """Update a mirror of this branch.
1040
"""Update a mirror of this branch.
1062
1041
1063
1042
The target branch will not have its working tree populated because this
1064
1043
is both expensive, and is not supported on remote file systems.
1125
1104
# Get the source branch
1126
1105
(tree, br_from,
1127
1106
_unused) = bzrdir.BzrDir.open_containing_tree_or_branch(directory)
1107
if strict is None:
1108
strict = br_from.get_config().get_user_option_as_bool('push_strict')
1109
if strict is None: strict = True # default value
1128
1110
# Get the tip's revision_id
1129
1111
revision = _get_one_revision('push', revision)
1130
1112
if revision is not None:
1131
1113
revision_id = revision.in_history(br_from).rev_id
1132
1114
else:
1133
1115
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.')
1116
if strict and tree is not None and revision_id is None:
1117
if (tree.has_changes()):
1118
raise errors.UncommittedChanges(
1119
tree, more='Use --no-strict to force the push.')
1120
if tree.last_revision() != tree.branch.last_revision():
1121
# The tree has lost sync with its branch, there is little
1122
# chance that the user is aware of it but he can still force
1123
# the push with --no-strict
1124
raise errors.OutOfDateTree(
1125
tree, more='Use --no-strict to force the push.')
1126
1139
1127
# Get the stacked_on branch, if any
1140
1128
if stacked_on is not None:
1141
1129
stacked_on = urlutils.normalize_url(stacked_on)
1173
1161
1174
1162
1175
1163
class cmd_branch(Command):
1176
__doc__ = """Create a new branch that is a copy of an existing branch.
1164
"""Create a new branch that is a copy of an existing branch.
1177
1165
1178
1166
If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will
1179
1167
be used. In other words, "branch ../foo/bar" will attempt to create ./bar.
1206
1194
' directory exists, but does not already'
1207
1195
' have a control directory. This flag will'
1208
1196
' allow branch to proceed.'),
1209
Option('bind',
1210
help="Bind new branch to from location."),
1211
1197
]
1212
1198
aliases = ['get', 'clone']
1213
1199
1214
1200
def run(self, from_location, to_location=None, revision=None,
1215
1201
hardlink=False, stacked=False, standalone=False, no_tree=False,
1216
use_existing_dir=False, switch=False, bind=False):
1202
use_existing_dir=False, switch=False):
1217
1203
from bzrlib import switch as _mod_switch
1218
1204
from bzrlib.tag import _merge_tags_if_possible
1219
1205
accelerator_tree, br_from = bzrdir.BzrDir.open_tree_or_branch(
1220
1206
from_location)
1207
if (accelerator_tree is not None and
1208
accelerator_tree.supports_content_filtering()):
1209
accelerator_tree = None
1221
1210
revision = _get_one_revision('branch', revision)
1222
1211
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
1212
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)
1213
if revision is not None:
1214
revision_id = revision.as_revision_id(br_from)
1240
1215
else:
1241
try:
1242
bzrdir.BzrDir.open_from_transport(to_transport)
1243
except errors.NotBranchError:
1244
pass
1216
# FIXME - wt.last_revision, fallback to branch, fall back to
1217
# None or perhaps NULL_REVISION to mean copy nothing
1218
# RBC 20060209
1219
revision_id = br_from.last_revision()
1220
if to_location is None:
1221
to_location = urlutils.derive_to_location(from_location)
1222
to_transport = transport.get_transport(to_location)
1223
try:
1224
to_transport.mkdir('.')
1225
except errors.FileExists:
1226
if not use_existing_dir:
1227
raise errors.BzrCommandError('Target directory "%s" '
1228
'already exists.' % to_location)
1245
1229
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'))
1230
try:
1231
bzrdir.BzrDir.open_from_transport(to_transport)
1232
except errors.NotBranchError:
1233
pass
1234
else:
1235
raise errors.AlreadyBranchError(to_location)
1236
except errors.NoSuchFile:
1237
raise errors.BzrCommandError('Parent of "%s" does not exist.'
1238
% to_location)
1239
try:
1240
# preserve whatever source format we have.
1241
dir = br_from.bzrdir.sprout(to_transport.base, revision_id,
1242
possible_transports=[to_transport],
1243
accelerator_tree=accelerator_tree,
1244
hardlink=hardlink, stacked=stacked,
1245
force_new_repo=standalone,
1246
create_tree_if_local=not no_tree,
1247
source_branch=br_from)
1248
branch = dir.open_branch()
1249
except errors.NoSuchRevision:
1250
to_transport.delete_tree('.')
1251
msg = "The branch %s has no revision %s." % (from_location,
1252
revision)
1253
raise errors.BzrCommandError(msg)
1254
_merge_tags_if_possible(br_from, branch)
1255
# If the source branch is stacked, the new branch may
1256
# be stacked whether we asked for that explicitly or not.
1257
# We therefore need a try/except here and not just 'if stacked:'
1258
try:
1259
note('Created new stacked branch referring to %s.' %
1260
branch.get_stacked_on_url())
1261
except (errors.NotStacked, errors.UnstackableBranchFormat,
1262
errors.UnstackableRepositoryFormat), e:
1263
note('Branched %d revision(s).' % branch.revno())
1264
if switch:
1265
# Switch to the new branch
1266
wt, _ = WorkingTree.open_containing('.')
1267
_mod_switch.switch(wt.bzrdir, branch)
1268
note('Switched to branch: %s',
1269
urlutils.unescape_for_display(branch.base, 'utf-8'))
1270
finally:
1271
br_from.unlock()
1286
1272
1287
1273
1288
1274
class cmd_checkout(Command):
1289
__doc__ = """Create a new checkout of an existing branch.
1275
"""Create a new checkout of an existing branch.
1290
1276
1291
1277
If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree for
1292
1278
the branch found in '.'. This is useful if you have removed the working tree
1355
1341
1356
1342
1357
1343
class cmd_renames(Command):
1358
__doc__ = """Show list of renamed files.
1344
"""Show list of renamed files.
1359
1345
"""
1360
1346
# TODO: Option to show renames between two historical versions.
1361
1347
1367
1353
def run(self, dir=u'.'):
1368
1354
tree = WorkingTree.open_containing(dir)[0]
1369
1355
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))
1356
try:
1357
new_inv = tree.inventory
1358
old_tree = tree.basis_tree()
1359
old_tree.lock_read()
1360
try:
1361
old_inv = old_tree.inventory
1362
renames = []
1363
iterator = tree.iter_changes(old_tree, include_unchanged=True)
1364
for f, paths, c, v, p, n, k, e in iterator:
1365
if paths[0] == paths[1]:
1366
continue
1367
if None in (paths):
1368
continue
1369
renames.append(paths)
1370
renames.sort()
1371
for old_name, new_name in renames:
1372
self.outf.write("%s => %s\n" % (old_name, new_name))
1373
finally:
1374
old_tree.unlock()
1375
finally:
1376
tree.unlock()
1387
1377
1388
1378
1389
1379
class cmd_update(Command):
1390
__doc__ = """Update a tree to have the latest code committed to its branch.
1380
"""Update a tree to have the latest code committed to its branch.
1391
1381
1392
1382
This will perform a merge into the working tree, and may generate
1393
1383
conflicts. If you have any local changes, you will still
1395
1385
1396
1386
If you want to discard your local changes, you can just do a
1397
1387
'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
1388
"""
1402
1389
1403
1390
_see_also = ['pull', 'working-trees', 'status-flags']
1404
1391
takes_args = ['dir?']
1405
takes_options = ['revision']
1406
1392
aliases = ['up']
1407
1393
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")
1394
def run(self, dir='.'):
1412
1395
tree = WorkingTree.open_containing(dir)[0]
1413
branch = tree.branch
1414
1396
possible_transports = []
1415
master = branch.get_master_branch(
1397
master = tree.branch.get_master_branch(
1416
1398
possible_transports=possible_transports)
1417
1399
if master is not None:
1418
1400
tree.lock_write()
1419
branch_location = master.base
1420
1401
else:
1421
1402
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
1403
try:
1404
existing_pending_merges = tree.get_parent_ids()[1:]
1405
last_rev = _mod_revision.ensure_null(tree.last_revision())
1406
if last_rev == _mod_revision.ensure_null(
1407
tree.branch.last_revision()):
1408
# may be up to date, check master too.
1409
if master is None or last_rev == _mod_revision.ensure_null(
1410
master.last_revision()):
1411
revno = tree.branch.revision_id_to_revno(last_rev)
1412
note("Tree is up to date at revision %d." % (revno,))
1413
return 0
1414
view_info = _get_view_info_for_change_reporter(tree)
1450
1415
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
1416
delta._ChangeReporter(unversioned_filter=tree.is_ignored,
1417
view_info=view_info), possible_transports=possible_transports)
1418
revno = tree.branch.revision_id_to_revno(
1419
_mod_revision.ensure_null(tree.last_revision()))
1420
note('Updated to revision %d.' % (revno,))
1421
if tree.get_parent_ids()[1:] != existing_pending_merges:
1422
note('Your local commits will now show as pending merges with '
1423
"'bzr status', and can be committed with 'bzr commit'.")
1424
if conflicts != 0:
1425
return 1
1426
else:
1427
return 0
1428
finally:
1429
tree.unlock()
1473
1430
1474
1431
1475
1432
class cmd_info(Command):
1476
__doc__ = """Show information about a working tree, branch or repository.
1433
"""Show information about a working tree, branch or repository.
1477
1434
1478
1435
This command will show all known locations and formats associated to the
1479
1436
tree, branch or repository.
1517
1474
1518
1475
1519
1476
class cmd_remove(Command):
1520
__doc__ = """Remove files or directories.
1477
"""Remove files or directories.
1521
1478
1522
1479
This makes bzr stop tracking changes to the specified files. bzr will delete
1523
1480
them if they can easily be recovered using revert. If no options or
1546
1503
file_list = [f for f in file_list]
1547
1504
1548
1505
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')
1506
try:
1507
# Heuristics should probably all move into tree.remove_smart or
1508
# some such?
1509
if new:
1510
added = tree.changes_from(tree.basis_tree(),
1511
specific_files=file_list).added
1512
file_list = sorted([f[0] for f in added], reverse=True)
1513
if len(file_list) == 0:
1514
raise errors.BzrCommandError('No matching files.')
1515
elif file_list is None:
1516
# missing files show up in iter_changes(basis) as
1517
# versioned-with-no-kind.
1518
missing = []
1519
for change in tree.iter_changes(tree.basis_tree()):
1520
# Find paths in the working tree that have no kind:
1521
if change[1][1] is not None and change[6][1] is None:
1522
missing.append(change[1][1])
1523
file_list = sorted(missing, reverse=True)
1524
file_deletion_strategy = 'keep'
1525
tree.remove(file_list, verbose=verbose, to_file=self.outf,
1526
keep_files=file_deletion_strategy=='keep',
1527
force=file_deletion_strategy=='force')
1528
finally:
1529
tree.unlock()
1571
1530
1572
1531
1573
1532
class cmd_file_id(Command):
1574
__doc__ = """Print file_id of a particular file or directory.
1533
"""Print file_id of a particular file or directory.
1575
1534
1576
1535
The file_id is assigned when the file is first added and remains the
1577
1536
same through all revisions where the file exists, even when it is
1593
1552
1594
1553
1595
1554
class cmd_file_path(Command):
1596
__doc__ = """Print path of file_ids to a file or directory.
1555
"""Print path of file_ids to a file or directory.
1597
1556
1598
1557
This prints one line for each directory down to the target,
1599
1558
starting at the branch root.
1615
1574
1616
1575
1617
1576
class cmd_reconcile(Command):
1618
__doc__ = """Reconcile bzr metadata in a branch.
1577
"""Reconcile bzr metadata in a branch.
1619
1578
1620
1579
This can correct data mismatches that may have been caused by
1621
1580
previous ghost operations or bzr upgrades. You should only
1643
1602
1644
1603
1645
1604
class cmd_revision_history(Command):
1646
__doc__ = """Display the list of revision ids on a branch."""
1605
"""Display the list of revision ids on a branch."""
1647
1606
1648
1607
_see_also = ['log']
1649
1608
takes_args = ['location?']
1659
1618
1660
1619
1661
1620
class cmd_ancestry(Command):
1662
__doc__ = """List all revisions merged into this branch."""
1621
"""List all revisions merged into this branch."""
1663
1622
1664
1623
_see_also = ['log', 'revision-history']
1665
1624
takes_args = ['location?']
1684
1643
1685
1644
1686
1645
class cmd_init(Command):
1687
__doc__ = """Make a directory into a versioned branch.
1646
"""Make a directory into a versioned branch.
1688
1647
1689
1648
Use this to create an empty branch, or before importing an
1690
1649
existing project.
1793
1752
1794
1753
1795
1754
class cmd_init_repository(Command):
1796
__doc__ = """Create a shared repository for branches to share storage space.
1755
"""Create a shared repository to hold branches.
1797
1756
1798
1757
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.
1758
revisions in the repository, not in the branch directory.
1802
1759
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.
1760
If the --no-trees option is used then the branches in the repository
1761
will not have working trees by default.
1809
1762
1810
1763
:Examples:
1811
Create a shared repository holding just branches::
1764
Create a shared repositories holding just branches::
1812
1765
1813
1766
bzr init-repo --no-trees repo
1814
1767
bzr init repo/trunk
1853
1806
1854
1807
1855
1808
class cmd_diff(Command):
1856
__doc__ = """Show differences in the working tree, between revisions or branches.
1809
"""Show differences in the working tree, between revisions or branches.
1857
1810
1858
1811
If no arguments are given, all changes for the current tree are listed.
1859
1812
If files are given, only the changes in those files are listed.
1880
1833
1881
1834
bzr diff -r1
1882
1835
1883
Difference between revision 3 and revision 1::
1884
1885
bzr diff -r1..3
1886
1887
Difference between revision 3 and revision 1 for branch xxx::
1888
1889
bzr diff -r1..3 xxx
1890
1891
To see the changes introduced in revision X::
1892
1893
bzr diff -cX
1894
1895
Note that in the case of a merge, the -c option shows the changes
1896
compared to the left hand parent. To see the changes against
1897
another parent, use::
1898
1899
bzr diff -r<chosen_parent>..X
1900
1901
The changes introduced by revision 2 (equivalent to -r1..2)::
1902
1903
bzr diff -c2
1836
Difference between revision 2 and revision 1::
1837
1838
bzr diff -r1..2
1839
1840
Difference between revision 2 and revision 1 for branch xxx::
1841
1842
bzr diff -r1..2 xxx
1904
1843
1905
1844
Show just the differences for file NEWS::
1906
1845
1945
1884
help='Use this command to compare files.',
1946
1885
type=unicode,
1947
1886
),
1948
RegistryOption('format',
1949
help='Diff format to use.',
1950
lazy_registry=('bzrlib.diff', 'format_registry'),
1951
value_switches=False, title='Diff format'),
1952
1887
]
1953
1888
aliases = ['di', 'dif']
1954
1889
encoding_type = 'exact'
1955
1890
1956
1891
@display_command
1957
1892
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)
1893
prefix=None, old=None, new=None, using=None):
1894
from bzrlib.diff import get_trees_and_branches_to_diff, show_diff_trees
1961
1895
1962
1896
if (prefix is None) or (prefix == '0'):
1963
1897
# diff -p0 format
1977
1911
raise errors.BzrCommandError('bzr diff --revision takes exactly'
1978
1912
' one or two revision specifiers')
1979
1913
1980
if using is not None and format is not None:
1981
raise errors.BzrCommandError('--using and --format are mutually '
1982
'exclusive.')
1983
1984
1914
(old_tree, new_tree,
1985
1915
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)
1916
specific_files, extra_trees) = get_trees_and_branches_to_diff(
1917
file_list, revision, old, new, apply_view=True)
1988
1918
return show_diff_trees(old_tree, new_tree, sys.stdout,
1989
1919
specific_files=specific_files,
1990
1920
external_diff_options=diff_options,
1991
1921
old_label=old_label, new_label=new_label,
1992
extra_trees=extra_trees, using=using,
1993
format_cls=format)
1922
extra_trees=extra_trees, using=using)
1994
1923
1995
1924
1996
1925
class cmd_deleted(Command):
1997
__doc__ = """List files deleted in the working tree.
1926
"""List files deleted in the working tree.
1998
1927
"""
1999
1928
# TODO: Show files deleted since a previous revision, or
2000
1929
# between two revisions.
2009
1938
def run(self, show_ids=False):
2010
1939
tree = WorkingTree.open_containing(u'.')[0]
2011
1940
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')
1941
try:
1942
old = tree.basis_tree()
1943
old.lock_read()
1944
try:
1945
for path, ie in old.inventory.iter_entries():
1946
if not tree.has_id(ie.file_id):
1947
self.outf.write(path)
1948
if show_ids:
1949
self.outf.write(' ')
1950
self.outf.write(ie.file_id)
1951
self.outf.write('\n')
1952
finally:
1953
old.unlock()
1954
finally:
1955
tree.unlock()
2023
1956
2024
1957
2025
1958
class cmd_modified(Command):
2026
__doc__ = """List files modified in working tree.
1959
"""List files modified in working tree.
2027
1960
"""
2028
1961
2029
1962
hidden = True
2046
1979
2047
1980
2048
1981
class cmd_added(Command):
2049
__doc__ = """List files added in working tree.
1982
"""List files added in working tree.
2050
1983
"""
2051
1984
2052
1985
hidden = True
2061
1994
def run(self, null=False):
2062
1995
wt = WorkingTree.open_containing(u'.')[0]
2063
1996
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')
1997
try:
1998
basis = wt.basis_tree()
1999
basis.lock_read()
2000
try:
2001
basis_inv = basis.inventory
2002
inv = wt.inventory
2003
for file_id in inv:
2004
if file_id in basis_inv:
2005
continue
2006
if inv.is_root(file_id) and len(basis_inv) == 0:
2007
continue
2008
path = inv.id2path(file_id)
2009
if not os.access(osutils.abspath(path), os.F_OK):
2010
continue
2011
if null:
2012
self.outf.write(path + '\0')
2013
else:
2014
self.outf.write(osutils.quotefn(path) + '\n')
2015
finally:
2016
basis.unlock()
2017
finally:
2018
wt.unlock()
2082
2019
2083
2020
2084
2021
class cmd_root(Command):
2085
__doc__ = """Show the tree root directory.
2022
"""Show the tree root directory.
2086
2023
2087
2024
The root is the nearest enclosing directory with a .bzr control
2088
2025
directory."""
2112
2049
2113
2050
2114
2051
class cmd_log(Command):
2115
__doc__ = """Show historical log for a branch or subset of a branch.
2052
"""Show historical log for a branch or subset of a branch.
2116
2053
2117
2054
log is bzr's default tool for exploring the history of a branch.
2118
2055
The branch to use is taken from the first parameter. If no parameters
2229
2166
:Tips & tricks:
2230
2167
2231
2168
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>.
2169
line tools. You may prefer qlog or glog from the QBzr and Bzr-Gtk packages
2170
respectively for example. (TortoiseBzr uses qlog for displaying logs.) See
2171
http://bazaar-vcs.org/BzrPlugins and http://bazaar-vcs.org/IDEIntegration.
2172
2173
Web interfaces are often better at exploring history than command line
2174
tools, particularly for branches on servers. You may prefer Loggerhead
2175
or one of its alternatives. See http://bazaar-vcs.org/WebInterface.
2236
2176
2237
2177
You may find it useful to add the aliases below to ``bazaar.conf``::
2238
2178
2299
2239
help='Show changes made in each revision as a patch.'),
2300
2240
Option('include-merges',
2301
2241
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
2242
]
2307
2243
encoding_type = 'replace'
2308
2244
2318
2254
message=None,
2319
2255
limit=None,
2320
2256
show_diff=False,
2321
include_merges=False,
2322
exclude_common_ancestry=False,
2323
):
2257
include_merges=False):
2324
2258
from bzrlib.log import (
2325
2259
Logger,
2326
2260
make_log_request_dict,
2327
2261
_get_info_for_log_files,
2328
2262
)
2329
2263
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
2264
if include_merges:
2335
2265
if levels is None:
2336
2266
levels = 0
2349
2279
2350
2280
file_ids = []
2351
2281
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
2282
b = None
2283
try:
2284
if file_list:
2285
# find the file ids to log and check for directory filtering
2286
b, file_info_list, rev1, rev2 = _get_info_for_log_files(
2287
revision, file_list)
2288
for relpath, file_id, kind in file_info_list:
2289
if file_id is None:
2290
raise errors.BzrCommandError(
2291
"Path unknown at end or start of revision range: %s" %
2292
relpath)
2293
# If the relpath is the top of the tree, we log everything
2294
if relpath == '':
2295
file_ids = []
2296
break
2297
else:
2298
file_ids.append(file_id)
2299
filter_by_dir = filter_by_dir or (
2300
kind in ['directory', 'tree-reference'])
2301
else:
2302
# log everything
2303
# FIXME ? log the current subdir only RBC 20060203
2304
if revision is not None \
2305
and len(revision) > 0 and revision[0].get_branch():
2306
location = revision[0].get_branch()
2366
2307
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)
2308
location = '.'
2309
dir, relpath = bzrdir.BzrDir.open_containing(location)
2310
b = dir.open_branch()
2311
b.lock_read()
2312
rev1, rev2 = _get_revision_range(revision, b, self.name())
2313
2314
# Decide on the type of delta & diff filtering to use
2315
# TODO: add an --all-files option to make this configurable & consistent
2316
if not verbose:
2317
delta_type = None
2318
else:
2319
delta_type = 'full'
2320
if not show_diff:
2321
diff_type = None
2322
elif file_ids:
2323
diff_type = 'partial'
2324
else:
2325
diff_type = 'full'
2326
2327
# Build the log formatter
2328
if log_format is None:
2329
log_format = log.log_formatter_registry.get_default(b)
2330
lf = log_format(show_ids=show_ids, to_file=self.outf,
2331
show_timezone=timezone,
2332
delta_format=get_verbosity_level(),
2333
levels=levels,
2334
show_advice=levels is None)
2335
2336
# Choose the algorithm for doing the logging. It's annoying
2337
# having multiple code paths like this but necessary until
2338
# the underlying repository format is faster at generating
2339
# deltas or can provide everything we need from the indices.
2340
# The default algorithm - match-using-deltas - works for
2341
# multiple files and directories and is faster for small
2342
# amounts of history (200 revisions say). However, it's too
2343
# slow for logging a single file in a repository with deep
2344
# history, i.e. > 10K revisions. In the spirit of "do no
2345
# evil when adding features", we continue to use the
2346
# original algorithm - per-file-graph - for the "single
2347
# file that isn't a directory without showing a delta" case.
2348
partial_history = revision and b.repository._format.supports_chks
2349
match_using_deltas = (len(file_ids) != 1 or filter_by_dir
2350
or delta_type or partial_history)
2351
2352
# Build the LogRequest and execute it
2353
if len(file_ids) == 0:
2354
file_ids = None
2355
rqst = make_log_request_dict(
2356
direction=direction, specific_fileids=file_ids,
2357
start_revision=rev1, end_revision=rev2, limit=limit,
2358
message_search=message, delta_type=delta_type,
2359
diff_type=diff_type, _match_using_deltas=match_using_deltas)
2360
Logger(b, rqst).show(lf)
2361
finally:
2362
if b is not None:
2363
b.unlock()
2436
2364
2437
2365
2438
2366
def _get_revision_range(revisionspec_list, branch, command_name):
2456
2384
raise errors.BzrCommandError(
2457
2385
"bzr %s doesn't accept two revisions in different"
2458
2386
" 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)
2387
rev1 = start_spec.in_history(branch)
2464
2388
# Avoid loading all of history when we know a missing
2465
2389
# end of range means the last revision ...
2466
2390
if end_spec.spec is None:
2495
2419
2496
2420
2497
2421
class cmd_touching_revisions(Command):
2498
__doc__ = """Return revision-ids which affected a particular file.
2422
"""Return revision-ids which affected a particular file.
2499
2423
2500
2424
A more user-friendly interface is "bzr log FILE".
2501
2425
"""
2509
2433
file_id = tree.path2id(relpath)
2510
2434
b = tree.branch
2511
2435
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))
2436
try:
2437
touching_revs = log.find_touching_revisions(b, file_id)
2438
for revno, revision_id, what in touching_revs:
2439
self.outf.write("%6d %s\n" % (revno, what))
2440
finally:
2441
b.unlock()
2516
2442
2517
2443
2518
2444
class cmd_ls(Command):
2519
__doc__ = """List files in a tree.
2445
"""List files in a tree.
2520
2446
"""
2521
2447
2522
2448
_see_also = ['status', 'cat']
2570
2496
if from_root:
2571
2497
if relpath:
2572
2498
prefix = relpath + '/'
2573
elif fs_path != '.' and not fs_path.endswith('/'):
2499
elif fs_path != '.':
2574
2500
prefix = fs_path + '/'
2575
2501
2576
2502
if revision is not None or tree is None:
2585
2511
note("Ignoring files outside view. View is %s" % view_str)
2586
2512
2587
2513
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
2514
try:
2515
for fp, fc, fkind, fid, entry in tree.list_files(include_root=False,
2516
from_dir=relpath, recursive=recursive):
2517
# Apply additional masking
2518
if not all and not selection[fc]:
2519
continue
2520
if kind is not None and fkind != kind:
2521
continue
2522
if apply_view:
2523
try:
2524
if relpath:
2525
fullpath = osutils.pathjoin(relpath, fp)
2526
else:
2527
fullpath = fp
2528
views.check_path_in_view(tree, fullpath)
2529
except errors.FileOutsideView:
2530
continue
2605
2531
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:
2532
# Output the entry
2533
if prefix:
2534
fp = osutils.pathjoin(prefix, fp)
2535
kindch = entry.kind_character()
2536
outstring = fp + kindch
2537
ui.ui_factory.clear_term()
2538
if verbose:
2539
outstring = '%-8s %s' % (fc, outstring)
2540
if show_ids and fid is not None:
2541
outstring = "%-50s %s" % (outstring, fid)
2632
2542
self.outf.write(outstring + '\n')
2543
elif null:
2544
self.outf.write(fp + '\0')
2545
if show_ids:
2546
if fid is not None:
2547
self.outf.write(fid)
2548
self.outf.write('\0')
2549
self.outf.flush()
2550
else:
2551
if show_ids:
2552
if fid is not None:
2553
my_id = fid
2554
else:
2555
my_id = ''
2556
self.outf.write('%-50s %s\n' % (outstring, my_id))
2557
else:
2558
self.outf.write(outstring + '\n')
2559
finally:
2560
tree.unlock()
2633
2561
2634
2562
2635
2563
class cmd_unknowns(Command):
2636
__doc__ = """List unknown files.
2564
"""List unknown files.
2637
2565
"""
2638
2566
2639
2567
hidden = True
2646
2574
2647
2575
2648
2576
class cmd_ignore(Command):
2649
__doc__ = """Ignore specified files or patterns.
2577
"""Ignore specified files or patterns.
2650
2578
2651
2579
See ``bzr help patterns`` for details on the syntax of patterns.
2652
2580
2653
If a .bzrignore file does not exist, the ignore command
2654
will create one and add the specified files or patterns to the newly
2655
created file. The ignore command will also automatically add the
2656
.bzrignore file to be versioned. Creating a .bzrignore file without
2657
the use of the ignore command will require an explicit add command.
2658
2659
2581
To remove patterns from the ignore list, edit the .bzrignore file.
2660
2582
After adding, editing or deleting that file either indirectly by
2661
2583
using this command or directly by using an editor, be sure to commit
2662
2584
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
2585
2677
2586
Note: ignore patterns containing shell wildcards must be quoted from
2678
2587
the shell on Unix.
2682
2591
2683
2592
bzr ignore ./Makefile
2684
2593
2685
Ignore .class files in all directories...::
2594
Ignore class files in all directories::
2686
2595
2687
2596
bzr ignore "*.class"
2688
2597
2689
...but do not ignore "special.class"::
2690
2691
bzr ignore "!special.class"
2692
2693
2598
Ignore .o files under the lib directory::
2694
2599
2695
2600
bzr ignore "lib/**/*.o"
2701
2606
Ignore everything but the "debian" toplevel directory::
2702
2607
2703
2608
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
2609
"""
2712
2610
2713
2611
_see_also = ['status', 'ignored', 'patterns']
2714
2612
takes_args = ['name_pattern*']
2715
2613
takes_options = [
2716
Option('default-rules',
2717
help='Display the default ignore rules that bzr uses.')
2614
Option('old-default-rules',
2615
help='Write out the ignore rules bzr < 0.9 always used.')
2718
2616
]
2719
2617
2720
def run(self, name_pattern_list=None, default_rules=None):
2618
def run(self, name_pattern_list=None, old_default_rules=None):
2721
2619
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)
2620
if old_default_rules is not None:
2621
# dump the rules and exit
2622
for pattern in ignores.OLD_DEFAULTS:
2623
print pattern
2726
2624
return
2727
2625
if not name_pattern_list:
2728
2626
raise errors.BzrCommandError("ignore requires at least one "
2729
"NAME_PATTERN or --default-rules.")
2627
"NAME_PATTERN or --old-default-rules")
2730
2628
name_pattern_list = [globbing.normalize_pattern(p)
2731
2629
for p in name_pattern_list]
2732
2630
for name_pattern in name_pattern_list:
2744
2642
if id is not None:
2745
2643
filename = entry[0]
2746
2644
if ignored.match(filename):
2747
matches.append(filename)
2645
matches.append(filename.encode('utf-8'))
2748
2646
tree.unlock()
2749
2647
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),))
2648
print "Warning: the following files are version controlled and" \
2649
" match your ignore pattern:\n%s" \
2650
"\nThese files will continue to be version controlled" \
2651
" unless you 'bzr remove' them." % ("\n".join(matches),)
2754
2652
2755
2653
2756
2654
class cmd_ignored(Command):
2757
__doc__ = """List ignored files and the patterns that matched them.
2655
"""List ignored files and the patterns that matched them.
2758
2656
2759
2657
List all the ignored files and the ignore pattern that caused the file to
2760
2658
be ignored.
2771
2669
def run(self):
2772
2670
tree = WorkingTree.open_containing(u'.')[0]
2773
2671
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))
2672
try:
2673
for path, file_class, kind, file_id, entry in tree.list_files():
2674
if file_class != 'I':
2675
continue
2676
## XXX: Slightly inefficient since this was already calculated
2677
pat = tree.is_ignored(path)
2678
self.outf.write('%-50s %s\n' % (path, pat))
2679
finally:
2680
tree.unlock()
2781
2681
2782
2682
2783
2683
class cmd_lookup_revision(Command):
2784
__doc__ = """Lookup the revision-id from a revision-number
2684
"""Lookup the revision-id from a revision-number
2785
2685
2786
2686
:Examples:
2787
2687
bzr lookup-revision 33
2794
2694
try:
2795
2695
revno = int(revno)
2796
2696
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)
2697
raise errors.BzrCommandError("not a valid revision-number: %r" % revno)
2698
2699
print WorkingTree.open_containing(u'.')[0].branch.get_rev_id(revno)
2801
2700
2802
2701
2803
2702
class cmd_export(Command):
2804
__doc__ = """Export current or past revision to a destination directory or archive.
2703
"""Export current or past revision to a destination directory or archive.
2805
2704
2806
2705
If no revision is specified this exports the last committed revision.
2807
2706
2839
2738
Option('root',
2840
2739
type=str,
2841
2740
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
2741
]
2846
2742
def run(self, dest, branch_or_subdir=None, revision=None, format=None,
2847
root=None, filters=False, per_file_timestamps=False):
2743
root=None, filters=False):
2848
2744
from bzrlib.export import export
2849
2745
2850
2746
if branch_or_subdir is None:
2857
2753
2858
2754
rev_tree = _get_one_revision_tree('export', revision, branch=b, tree=tree)
2859
2755
try:
2860
export(rev_tree, dest, format, root, subdir, filtered=filters,
2861
per_file_timestamps=per_file_timestamps)
2756
export(rev_tree, dest, format, root, subdir, filtered=filters)
2862
2757
except errors.NoSuchExportFormat, e:
2863
2758
raise errors.BzrCommandError('Unsupported export format: %s' % e.format)
2864
2759
2865
2760
2866
2761
class cmd_cat(Command):
2867
__doc__ = """Write the contents of a file as of a given revision to standard output.
2762
"""Write the contents of a file as of a given revision to standard output.
2868
2763
2869
2764
If no revision is nominated, the last revision is used.
2870
2765
2891
2786
tree, branch, relpath = \
2892
2787
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
2893
2788
branch.lock_read()
2894
self.add_cleanup(branch.unlock)
2895
return self._run(tree, branch, relpath, filename, revision,
2896
name_from_revision, filters)
2789
try:
2790
return self._run(tree, branch, relpath, filename, revision,
2791
name_from_revision, filters)
2792
finally:
2793
branch.unlock()
2897
2794
2898
2795
def _run(self, tree, b, relpath, filename, revision, name_from_revision,
2899
2796
filtered):
2900
2797
if tree is None:
2901
2798
tree = b.basis_tree()
2902
2799
rev_tree = _get_one_revision_tree('cat', revision, branch=b)
2903
rev_tree.lock_read()
2904
self.add_cleanup(rev_tree.unlock)
2905
2800
2906
2801
old_file_id = rev_tree.path2id(relpath)
2907
2802
2942
2837
chunks = content.splitlines(True)
2943
2838
content = filtered_output_bytes(chunks, filters,
2944
2839
ContentFilterContext(relpath, rev_tree))
2945
self.cleanup_now()
2946
2840
self.outf.writelines(content)
2947
2841
else:
2948
self.cleanup_now()
2949
2842
self.outf.write(content)
2950
2843
2951
2844
2952
2845
class cmd_local_time_offset(Command):
2953
__doc__ = """Show the offset in seconds from GMT to local time."""
2846
"""Show the offset in seconds from GMT to local time."""
2954
2847
hidden = True
2955
2848
@display_command
2956
2849
def run(self):
2957
self.outf.write("%s\n" % osutils.local_time_offset())
2850
print osutils.local_time_offset()
2958
2851
2959
2852
2960
2853
2961
2854
class cmd_commit(Command):
2962
__doc__ = """Commit changes into a new revision.
2855
"""Commit changes into a new revision.
2963
2856
2964
2857
An explanatory message needs to be given for each commit. This is
2965
2858
often done by using the --message option (getting the message from the
3058
2951
Option('strict',
3059
2952
help="Refuse to commit if there are unknown "
3060
2953
"files in the working tree."),
3061
Option('commit-time', type=str,
3062
help="Manually set a commit time using commit date "
3063
"format, e.g. '2009-10-10 08:00:00 +0100'."),
3064
2954
ListOption('fixes', type=str,
3065
2955
help="Mark a bug as being fixed by this revision "
3066
2956
"(see \"bzr help bugs\")."),
3073
2963
"the master branch until a normal commit "
3074
2964
"is performed."
3075
2965
),
3076
Option('show-diff', short_name='p',
3077
help='When no message is supplied, show the diff along'
3078
' with the status summary in the message editor.'),
2966
Option('show-diff',
2967
help='When no message is supplied, show the diff along'
2968
' with the status summary in the message editor.'),
3079
2969
]
3080
2970
aliases = ['ci', 'checkin']
3081
2971
3100
2990
3101
2991
def run(self, message=None, file=None, verbose=False, selected_list=None,
3102
2992
unchanged=False, strict=False, local=False, fixes=None,
3103
author=None, show_diff=False, exclude=None, commit_time=None):
2993
author=None, show_diff=False, exclude=None):
3104
2994
from bzrlib.errors import (
3105
2995
PointlessCommit,
3106
2996
ConflictsInTree,
3112
3002
make_commit_message_template_encoded
3113
3003
)
3114
3004
3115
commit_stamp = offset = None
3116
if commit_time is not None:
3117
try:
3118
commit_stamp, offset = timestamp.parse_patch_date(commit_time)
3119
except ValueError, e:
3120
raise errors.BzrCommandError(
3121
"Could not parse --commit-time: " + str(e))
3122
3123
3005
# TODO: Need a blackbox test for invoking the external editor; may be
3124
3006
# slightly problematic to run this cross-platform.
3125
3007
3145
3027
if local and not tree.branch.get_bound_location():
3146
3028
raise errors.LocalRequiresBoundBranch()
3147
3029
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
3030
def get_message(commit_obj):
3170
3031
"""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,
3032
my_message = message
3033
if my_message is not None and '\r' in my_message:
3034
my_message = my_message.replace('\r\n', '\n')
3035
my_message = my_message.replace('\r', '\n')
3036
if my_message is None and not file:
3037
t = make_commit_message_template_encoded(tree,
3180
3038
selected_list, diff=show_diff,
3181
3039
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
3040
start_message = generate_commit_message_template(commit_obj)
3188
my_message = edit_commit_message_encoded(text,
3041
my_message = edit_commit_message_encoded(t,
3189
3042
start_message=start_message)
3190
3043
if my_message is None:
3191
3044
raise errors.BzrCommandError("please specify a commit"
3192
3045
" message with either --message or --file")
3046
elif my_message and file:
3047
raise errors.BzrCommandError(
3048
"please specify either --message or --file")
3049
if file:
3050
my_message = codecs.open(file, 'rt',
3051
osutils.get_user_encoding()).read()
3193
3052
if my_message == "":
3194
3053
raise errors.BzrCommandError("empty commit message specified")
3195
3054
return my_message
3203
3062
specific_files=selected_list,
3204
3063
allow_pointless=unchanged, strict=strict, local=local,
3205
3064
reporter=None, verbose=verbose, revprops=properties,
3206
authors=author, timestamp=commit_stamp,
3207
timezone=offset,
3065
authors=author,
3208
3066
exclude=safe_relpath_files(tree, exclude))
3209
3067
except PointlessCommit:
3068
# FIXME: This should really happen before the file is read in;
3069
# perhaps prepare the commit; get the message; then actually commit
3210
3070
raise errors.BzrCommandError("No changes to commit."
3211
3071
" Use --unchanged to commit anyhow.")
3212
3072
except ConflictsInTree:
3217
3077
raise errors.BzrCommandError("Commit refused because there are"
3218
3078
" unknown files in the working tree.")
3219
3079
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
3080
raise errors.BzrCommandError(str(e) + "\n"
3081
'To commit to master branch, run update and then commit.\n'
3082
'You can also pass --local to commit to continue working '
3083
'disconnected.')
3225
3084
3226
3085
3227
3086
class cmd_check(Command):
3228
__doc__ = """Validate working tree structure, branch consistency and repository history.
3087
"""Validate working tree structure, branch consistency and repository history.
3229
3088
3230
3089
This command checks various invariants about branch and repository storage
3231
3090
to detect data corruption or bzr bugs.
3295
3154
3296
3155
3297
3156
class cmd_upgrade(Command):
3298
__doc__ = """Upgrade branch storage to current format.
3157
"""Upgrade branch storage to current format.
3299
3158
3300
3159
The check command or bzr developers may sometimes advise you to run
3301
3160
this command. When the default format has changed you may also be warned
3319
3178
3320
3179
3321
3180
class cmd_whoami(Command):
3322
__doc__ = """Show or set bzr user id.
3181
"""Show or set bzr user id.
3323
3182
3324
3183
:Examples:
3325
3184
Show the email of the current user::
3369
3228
3370
3229
3371
3230
class cmd_nick(Command):
3372
__doc__ = """Print or set the branch nickname.
3231
"""Print or set the branch nickname.
3373
3232
3374
3233
If unset, the tree root directory name is used as the nickname.
3375
3234
To print the current nickname, execute with no argument.
3389
3248
3390
3249
@display_command
3391
3250
def printme(self, branch):
3392
self.outf.write('%s\n' % branch.nick)
3251
print branch.nick
3393
3252
3394
3253
3395
3254
class cmd_alias(Command):
3396
__doc__ = """Set/unset and display aliases.
3255
"""Set/unset and display aliases.
3397
3256
3398
3257
:Examples:
3399
3258
Show the current aliases::
3463
3322
3464
3323
3465
3324
class cmd_selftest(Command):
3466
__doc__ = """Run internal test suite.
3325
"""Run internal test suite.
3467
3326
3468
3327
If arguments are given, they are regular expressions that say which tests
3469
3328
should run. Tests matching any expression are run, and other tests are
3513
3372
def get_transport_type(typestring):
3514
3373
"""Parse and return a transport specifier."""
3515
3374
if typestring == "sftp":
3516
from bzrlib.tests import stub_sftp
3517
return stub_sftp.SFTPAbsoluteServer
3375
from bzrlib.transport.sftp import SFTPAbsoluteServer
3376
return SFTPAbsoluteServer
3518
3377
if typestring == "memory":
3519
from bzrlib.tests import test_server
3520
return memory.MemoryServer
3378
from bzrlib.transport.memory import MemoryServer
3379
return MemoryServer
3521
3380
if typestring == "fakenfs":
3522
from bzrlib.tests import test_server
3523
return test_server.FakeNFSServer
3381
from bzrlib.transport.fakenfs import FakeNFSServer
3382
return FakeNFSServer
3524
3383
msg = "No known transport type %s. Supported types are: sftp\n" %\
3525
3384
(typestring)
3526
3385
raise errors.BzrCommandError(msg)
3610
3469
raise errors.BzrCommandError("subunit not available. subunit "
3611
3470
"needs to be installed to use --subunit.")
3612
3471
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
3472
if parallel:
3619
3473
self.additional_selftest_args.setdefault(
3620
3474
'suite_decorators', []).append(parallel)
3624
3478
verbose = not is_quiet()
3625
3479
# TODO: should possibly lock the history file...
3626
3480
benchfile = open(".perf_history", "at", buffering=1)
3627
self.add_cleanup(benchfile.close)
3628
3481
else:
3629
3482
test_suite_factory = None
3630
3483
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)
3484
try:
3485
selftest_kwargs = {"verbose": verbose,
3486
"pattern": pattern,
3487
"stop_on_failure": one,
3488
"transport": transport,
3489
"test_suite_factory": test_suite_factory,
3490
"lsprof_timed": lsprof_timed,
3491
"lsprof_tests": lsprof_tests,
3492
"bench_history": benchfile,
3493
"matching_tests_first": first,
3494
"list_only": list_only,
3495
"random_seed": randomize,
3496
"exclude_pattern": exclude,
3497
"strict": strict,
3498
"load_list": load_list,
3499
"debug_flags": debugflag,
3500
"starting_with": starting_with
3501
}
3502
selftest_kwargs.update(self.additional_selftest_args)
3503
result = selftest(**selftest_kwargs)
3504
finally:
3505
if benchfile is not None:
3506
benchfile.close()
3650
3507
return int(not result)
3651
3508
3652
3509
3653
3510
class cmd_version(Command):
3654
__doc__ = """Show version of bzr."""
3511
"""Show version of bzr."""
3655
3512
3656
3513
encoding_type = 'replace'
3657
3514
takes_options = [
3668
3525
3669
3526
3670
3527
class cmd_rocks(Command):
3671
__doc__ = """Statement of optimism."""
3528
"""Statement of optimism."""
3672
3529
3673
3530
hidden = True
3674
3531
3675
3532
@display_command
3676
3533
def run(self):
3677
self.outf.write("It sure does!\n")
3534
print "It sure does!"
3678
3535
3679
3536
3680
3537
class cmd_find_merge_base(Command):
3681
__doc__ = """Find and print a base revision for merging two branches."""
3538
"""Find and print a base revision for merging two branches."""
3682
3539
# TODO: Options to specify revisions on either side, as if
3683
3540
# merging only part of the history.
3684
3541
takes_args = ['branch', 'other']
3691
3548
branch1 = Branch.open_containing(branch)[0]
3692
3549
branch2 = Branch.open_containing(other)[0]
3693
3550
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)
3551
try:
3552
branch2.lock_read()
3553
try:
3554
last1 = ensure_null(branch1.last_revision())
3555
last2 = ensure_null(branch2.last_revision())
3556
3557
graph = branch1.repository.get_graph(branch2.repository)
3558
base_rev_id = graph.find_unique_lca(last1, last2)
3559
3560
print 'merge base is revision %s' % base_rev_id
3561
finally:
3562
branch2.unlock()
3563
finally:
3564
branch1.unlock()
3704
3565
3705
3566
3706
3567
class cmd_merge(Command):
3707
__doc__ = """Perform a three-way merge.
3568
"""Perform a three-way merge.
3708
3569
3709
3570
The source of the merge can be specified either in the form of a branch,
3710
3571
or in the form of a path to a file containing a merge directive generated
3739
3600
committed to record the result of the merge.
3740
3601
3741
3602
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.
3603
--force is given.
3748
3604
3749
3605
To select only some changes to merge, use "merge -i", which will prompt
3750
3606
you to apply each diff hunk and file change, similar to "shelve".
3762
3618
3763
3619
bzr merge -r 81..82 ../bzr.dev
3764
3620
3765
To apply a merge directive contained in /tmp/merge::
3621
To apply a merge directive contained in /tmp/merge:
3766
3622
3767
3623
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
3624
"""
3776
3625
3777
3626
encoding_type = 'exact'
3835
3684
view_info = _get_view_info_for_change_reporter(tree)
3836
3685
change_reporter = delta._ChangeReporter(
3837
3686
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
3687
cleanups = []
3688
try:
3689
pb = ui.ui_factory.nested_progress_bar()
3690
cleanups.append(pb.finished)
3691
tree.lock_write()
3692
cleanups.append(tree.unlock)
3693
if location is not None:
3694
try:
3695
mergeable = bundle.read_mergeable_from_url(location,
3696
possible_transports=possible_transports)
3697
except errors.NotABundle:
3698
mergeable = None
3699
else:
3700
if uncommitted:
3701
raise errors.BzrCommandError('Cannot use --uncommitted'
3702
' with bundles or merge directives.')
3703
3704
if revision is not None:
3705
raise errors.BzrCommandError(
3706
'Cannot use -r with merge directives or bundles')
3707
merger, verified = _mod_merge.Merger.from_mergeable(tree,
3708
mergeable, pb)
3709
3710
if merger is None and uncommitted:
3711
if revision is not None and len(revision) > 0:
3712
raise errors.BzrCommandError('Cannot use --uncommitted and'
3713
' --revision at the same time.')
3714
merger = self.get_merger_from_uncommitted(tree, location, pb,
3715
cleanups)
3716
allow_pending = False
3717
3718
if merger is None:
3719
merger, allow_pending = self._get_merger_from_branch(tree,
3720
location, revision, remember, possible_transports, pb)
3721
3722
merger.merge_type = merge_type
3723
merger.reprocess = reprocess
3724
merger.show_base = show_base
3725
self.sanity_check_merger(merger)
3726
if (merger.base_rev_id == merger.other_rev_id and
3727
merger.other_rev_id is not None):
3728
note('Nothing to do.')
3729
return 0
3730
if pull:
3731
if merger.interesting_files is not None:
3732
raise errors.BzrCommandError('Cannot pull individual files')
3733
if (merger.base_rev_id == tree.last_revision()):
3734
result = tree.pull(merger.other_branch, False,
3735
merger.other_rev_id)
3736
result.report(self.outf)
3737
return 0
3738
if merger.this_basis is None:
3739
raise errors.BzrCommandError(
3740
"This branch has no commits."
3741
" (perhaps you would prefer 'bzr pull')")
3742
if preview:
3743
return self._do_preview(merger, cleanups)
3744
elif interactive:
3745
return self._do_interactive(merger, cleanups)
3848
3746
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):
3747
return self._do_merge(merger, change_reporter, allow_pending,
3748
verified)
3749
finally:
3750
for cleanup in reversed(cleanups):
3751
cleanup()
3752
3753
def _get_preview(self, merger, cleanups):
3899
3754
tree_merger = merger.make_merger()
3900
3755
tt = tree_merger.make_preview_transform()
3901
self.add_cleanup(tt.finalize)
3756
cleanups.append(tt.finalize)
3902
3757
result_tree = tt.get_preview_tree()
3903
3758
return result_tree
3904
3759
3905
def _do_preview(self, merger):
3760
def _do_preview(self, merger, cleanups):
3906
3761
from bzrlib.diff import show_diff_trees
3907
result_tree = self._get_preview(merger)
3762
result_tree = self._get_preview(merger, cleanups)
3908
3763
show_diff_trees(merger.this_tree, result_tree, self.outf,
3909
3764
old_label='', new_label='')
3910
3765
3920
3775
else:
3921
3776
return 0
3922
3777
3923
def _do_interactive(self, merger):
3778
def _do_interactive(self, merger, cleanups):
3924
3779
"""Perform an interactive merge.
3925
3780
3926
3781
This works by generating a preview tree of the merge, then using
3928
3783
and the preview tree.
3929
3784
"""
3930
3785
from bzrlib import shelf_ui
3931
result_tree = self._get_preview(merger)
3786
result_tree = self._get_preview(merger, cleanups)
3932
3787
writer = bzrlib.option.diff_writer_registry.get()
3933
3788
shelver = shelf_ui.Shelver(merger.this_tree, result_tree, destroy=True,
3934
3789
reporter=shelf_ui.ApplyReporter(),
3935
3790
diff_writer=writer(sys.stdout))
3936
try:
3937
shelver.run()
3938
finally:
3939
shelver.finalize()
3791
shelver.run()
3940
3792
3941
3793
def sanity_check_merger(self, merger):
3942
3794
if (merger.show_base and
4002
3854
allow_pending = True
4003
3855
return merger, allow_pending
4004
3856
4005
def get_merger_from_uncommitted(self, tree, location, pb):
3857
def get_merger_from_uncommitted(self, tree, location, pb, cleanups):
4006
3858
"""Get a merger for uncommitted changes.
4007
3859
4008
3860
:param tree: The tree the merger should apply to.
4009
3861
:param location: The location containing uncommitted changes.
4010
3862
:param pb: The progress bar to use for showing progress.
3863
:param cleanups: A list of operations to perform to clean up the
3864
temporary directories, unfinalized objects, etc.
4011
3865
"""
4012
3866
location = self._select_branch_location(tree, location)[0]
4013
3867
other_tree, other_path = WorkingTree.open_containing(location)
4065
3919
4066
3920
4067
3921
class cmd_remerge(Command):
4068
__doc__ = """Redo a merge.
3922
"""Redo a merge.
4069
3923
4070
3924
Use this if you want to try a different merge technique while resolving
4071
3925
conflicts. Some merge techniques are better than others, and remerge
4096
3950
4097
3951
def run(self, file_list=None, merge_type=None, show_base=False,
4098
3952
reprocess=False):
4099
from bzrlib.conflicts import restore
4100
3953
if merge_type is None:
4101
3954
merge_type = _mod_merge.Merge3Merger
4102
3955
tree, file_list = tree_files(file_list)
4103
3956
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
3957
try:
3958
parents = tree.get_parent_ids()
3959
if len(parents) != 2:
3960
raise errors.BzrCommandError("Sorry, remerge only works after normal"
3961
" merges. Not cherrypicking or"
3962
" multi-merges.")
3963
repository = tree.branch.repository
3964
interesting_ids = None
3965
new_conflicts = []
3966
conflicts = tree.conflicts()
3967
if file_list is not None:
3968
interesting_ids = set()
3969
for filename in file_list:
3970
file_id = tree.path2id(filename)
3971
if file_id is None:
3972
raise errors.NotVersionedError(filename)
3973
interesting_ids.add(file_id)
3974
if tree.kind(file_id) != "directory":
3975
continue
4123
3976
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:
3977
for name, ie in tree.inventory.iter_entries(file_id):
3978
interesting_ids.add(ie.file_id)
3979
new_conflicts = conflicts.select_conflicts(tree, file_list)[0]
3980
else:
3981
# Remerge only supports resolving contents conflicts
3982
allowed_conflicts = ('text conflict', 'contents conflict')
3983
restore_files = [c.path for c in conflicts
3984
if c.typestring in allowed_conflicts]
3985
_mod_merge.transform_tree(tree, tree.basis_tree(), interesting_ids)
3986
tree.set_conflicts(ConflictList(new_conflicts))
3987
if file_list is not None:
3988
restore_files = file_list
3989
for filename in restore_files:
3990
try:
3991
restore(tree.abspath(filename))
3992
except errors.NotConflicted:
3993
pass
3994
# Disable pending merges, because the file texts we are remerging
3995
# have not had those merges performed. If we use the wrong parents
3996
# list, we imply that the working tree text has seen and rejected
3997
# all the changes from the other tree, when in fact those changes
3998
# have not yet been seen.
3999
pb = ui.ui_factory.nested_progress_bar()
4000
tree.set_parent_ids(parents[:1])
4137
4001
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()
4002
merger = _mod_merge.Merger.from_revision_ids(pb,
4003
tree, parents[1])
4004
merger.interesting_ids = interesting_ids
4005
merger.merge_type = merge_type
4006
merger.show_base = show_base
4007
merger.reprocess = reprocess
4008
conflicts = merger.do_merge()
4009
finally:
4010
tree.set_parent_ids(parents)
4011
pb.finished()
4154
4012
finally:
4155
tree.set_parent_ids(parents)
4013
tree.unlock()
4156
4014
if conflicts > 0:
4157
4015
return 1
4158
4016
else:
4160
4018
4161
4019
4162
4020
class cmd_revert(Command):
4163
__doc__ = """Revert files to a previous revision.
4021
"""Revert files to a previous revision.
4164
4022
4165
4023
Giving a list of files will revert only those files. Otherwise, all files
4166
4024
will be reverted. If the revision is not specified with '--revision', the
4180
4038
name. If you name a directory, all the contents of that directory will be
4181
4039
reverted.
4182
4040
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.
4041
Any files that have been newly added since that revision will be deleted,
4042
with a backup kept if appropriate. Directories containing unknown files
4043
will not be deleted.
4187
4044
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
4045
The working tree contains a list of pending merged revisions, which will
4046
be included as parents in the next commit. Normally, revert clears that
4047
list as well as reverting the files. If any files are specified, revert
4048
leaves the pending merge list alone and reverts only the files. Use "bzr
4049
revert ." in the tree root to revert all files but keep the merge record,
4050
and "bzr revert --forget-merges" to clear the pending merge list without
4195
4051
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
4052
"""
4207
4053
4208
4054
_see_also = ['cat', 'export']
4217
4063
def run(self, revision=None, no_backup=False, file_list=None,
4218
4064
forget_merges=None):
4219
4065
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)
4066
tree.lock_write()
4067
try:
4068
if forget_merges:
4069
tree.set_parent_ids(tree.get_parent_ids()[:1])
4070
else:
4071
self._revert_tree_to_revision(tree, revision, file_list, no_backup)
4072
finally:
4073
tree.unlock()
4226
4074
4227
4075
@staticmethod
4228
4076
def _revert_tree_to_revision(tree, revision, file_list, no_backup):
4229
4077
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)
4078
pb = ui.ui_factory.nested_progress_bar()
4079
try:
4080
tree.revert(file_list, rev_tree, not no_backup, pb,
4081
report_changes=True)
4082
finally:
4083
pb.finished()
4232
4084
4233
4085
4234
4086
class cmd_assert_fail(Command):
4235
__doc__ = """Test reporting of assertion failures"""
4087
"""Test reporting of assertion failures"""
4236
4088
# intended just for use in testing
4237
4089
4238
4090
hidden = True
4242
4094
4243
4095
4244
4096
class cmd_help(Command):
4245
__doc__ = """Show help on a command or other topic.
4097
"""Show help on a command or other topic.
4246
4098
"""
4247
4099
4248
4100
_see_also = ['topics']
4261
4113
4262
4114
4263
4115
class cmd_shell_complete(Command):
4264
__doc__ = """Show appropriate completions for context.
4116
"""Show appropriate completions for context.
4265
4117
4266
4118
For a list of all available commands, say 'bzr shell-complete'.
4267
4119
"""
4276
4128
4277
4129
4278
4130
class cmd_missing(Command):
4279
__doc__ = """Show unmerged/unpulled revisions between two branches.
4131
"""Show unmerged/unpulled revisions between two branches.
4280
4132
4281
4133
OTHER_BRANCH may be local or remote.
4282
4134
4283
4135
To filter on a range of revisions, you can use the command -r begin..end
4284
4136
-r revision requests a specific revision, -r ..end or -r begin.. are
4285
4137
also valid.
4286
4287
:Exit values:
4288
1 - some missing revisions
4289
0 - no missing revisions
4290
4138
4291
4139
:Examples:
4292
4140
4360
4208
restrict = 'remote'
4361
4209
4362
4210
local_branch = Branch.open_containing(u".")[0]
4363
local_branch.lock_read()
4364
self.add_cleanup(local_branch.unlock)
4365
4366
4211
parent = local_branch.get_parent()
4367
4212
if other_branch is None:
4368
4213
other_branch = parent
4377
4222
remote_branch = Branch.open(other_branch)
4378
4223
if remote_branch.base == local_branch.base:
4379
4224
remote_branch = local_branch
4380
else:
4381
remote_branch.lock_read()
4382
self.add_cleanup(remote_branch.unlock)
4383
4225
4384
4226
local_revid_range = _revision_range_to_revid_range(
4385
4227
_get_revision_range(my_revision, local_branch,
4389
4231
_get_revision_range(revision,
4390
4232
remote_branch, self.name()))
4391
4233
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()
4234
local_branch.lock_read()
4235
try:
4236
remote_branch.lock_read()
4237
try:
4238
local_extra, remote_extra = find_unmerged(
4239
local_branch, remote_branch, restrict,
4240
backward=not reverse,
4241
include_merges=include_merges,
4242
local_revid_range=local_revid_range,
4243
remote_revid_range=remote_revid_range)
4244
4245
if log_format is None:
4246
registry = log.log_formatter_registry
4247
log_format = registry.get_default(local_branch)
4248
lf = log_format(to_file=self.outf,
4249
show_ids=show_ids,
4250
show_timezone='original')
4251
4252
status_code = 0
4253
if local_extra and not theirs_only:
4254
message("You have %d extra revision(s):\n" %
4255
len(local_extra))
4256
for revision in iter_log_revisions(local_extra,
4257
local_branch.repository,
4258
verbose):
4259
lf.log_revision(revision)
4260
printed_local = True
4261
status_code = 1
4262
else:
4263
printed_local = False
4264
4265
if remote_extra and not mine_only:
4266
if printed_local is True:
4267
message("\n\n\n")
4268
message("You are missing %d revision(s):\n" %
4269
len(remote_extra))
4270
for revision in iter_log_revisions(remote_extra,
4271
remote_branch.repository,
4272
verbose):
4273
lf.log_revision(revision)
4274
status_code = 1
4275
4276
if mine_only and not local_extra:
4277
# We checked local, and found nothing extra
4278
message('This branch is up to date.\n')
4279
elif theirs_only and not remote_extra:
4280
# We checked remote, and found nothing extra
4281
message('Other branch is up to date.\n')
4282
elif not (mine_only or theirs_only or local_extra or
4283
remote_extra):
4284
# We checked both branches, and neither one had extra
4285
# revisions
4286
message("Branches are up to date.\n")
4287
finally:
4288
remote_branch.unlock()
4289
finally:
4290
local_branch.unlock()
4442
4291
if not status_code and parent is None and other_branch is not None:
4443
4292
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)
4293
try:
4294
# handle race conditions - a parent might be set while we run.
4295
if local_branch.get_parent() is None:
4296
local_branch.set_parent(remote_branch.base)
4297
finally:
4298
local_branch.unlock()
4448
4299
return status_code
4449
4300
4450
4301
4451
4302
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
"""
4303
"""Compress the data within a repository."""
4469
4304
4470
4305
_see_also = ['repositories']
4471
4306
takes_args = ['branch_or_repo?']
4472
takes_options = [
4473
Option('clean-obsolete-packs', 'Delete obsolete packs to save disk space.'),
4474
]
4475
4307
4476
def run(self, branch_or_repo='.', clean_obsolete_packs=False):
4308
def run(self, branch_or_repo='.'):
4477
4309
dir = bzrdir.BzrDir.open_containing(branch_or_repo)[0]
4478
4310
try:
4479
4311
branch = dir.open_branch()
4480
4312
repository = branch.repository
4481
4313
except errors.NotBranchError:
4482
4314
repository = dir.open_repository()
4483
repository.pack(clean_obsolete_packs=clean_obsolete_packs)
4315
repository.pack()
4484
4316
4485
4317
4486
4318
class cmd_plugins(Command):
4487
__doc__ = """List the installed plugins.
4319
"""List the installed plugins.
4488
4320
4489
4321
This command displays the list of installed plugins including
4490
4322
version of plugin and a short description of each.
4497
4329
adding new commands, providing additional network transports and
4498
4330
customizing log output.
4499
4331
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.
4332
See the Bazaar web site, http://bazaar-vcs.org, for further
4333
information on plugins including where to find them and how to
4334
install them. Instructions are also provided there on how to
4335
write new plugins using the Python programming language.
4504
4336
"""
4505
4337
takes_options = ['verbose']
4506
4338
4521
4353
doc = '(no description)'
4522
4354
result.append((name_ver, doc, plugin.path()))
4523
4355
for name_ver, doc, path in sorted(result):
4524
self.outf.write("%s\n" % name_ver)
4525
self.outf.write(" %s\n" % doc)
4356
print name_ver
4357
print ' ', doc
4526
4358
if verbose:
4527
self.outf.write(" %s\n" % path)
4528
self.outf.write("\n")
4359
print ' ', path
4360
print
4529
4361
4530
4362
4531
4363
class cmd_testament(Command):
4532
__doc__ = """Show testament (signing-form) of a revision."""
4364
"""Show testament (signing-form) of a revision."""
4533
4365
takes_options = [
4534
4366
'revision',
4535
4367
Option('long', help='Produce long-format testament.'),
4548
4380
else:
4549
4381
b = Branch.open(branch)
4550
4382
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())
4383
try:
4384
if revision is None:
4385
rev_id = b.last_revision()
4386
else:
4387
rev_id = revision[0].as_revision_id(b)
4388
t = testament_class.from_revision(b.repository, rev_id)
4389
if long:
4390
sys.stdout.writelines(t.as_text_lines())
4391
else:
4392
sys.stdout.write(t.as_short_text())
4393
finally:
4394
b.unlock()
4561
4395
4562
4396
4563
4397
class cmd_annotate(Command):
4564
__doc__ = """Show the origin of each line in a file.
4398
"""Show the origin of each line in a file.
4565
4399
4566
4400
This prints out the given file with an annotation on the left side
4567
4401
indicating which revision, author and date introduced the change.
4589
4423
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
4590
4424
if wt is not None:
4591
4425
wt.lock_read()
4592
self.add_cleanup(wt.unlock)
4593
4426
else:
4594
4427
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)
4428
try:
4429
tree = _get_one_revision_tree('annotate', revision, branch=branch)
4430
if wt is not None:
4431
file_id = wt.path2id(relpath)
4432
else:
4433
file_id = tree.path2id(relpath)
4434
if file_id is None:
4435
raise errors.NotVersionedError(filename)
4436
file_version = tree.inventory[file_id].revision
4437
if wt is not None and revision is None:
4438
# If there is a tree and we're not annotating historical
4439
# versions, annotate the working tree's content.
4440
annotate_file_tree(wt, file_id, self.outf, long, all,
4441
show_ids=show_ids)
4442
else:
4443
annotate_file(branch, file_version, file_id, long, all, self.outf,
4444
show_ids=show_ids)
4445
finally:
4446
if wt is not None:
4447
wt.unlock()
4448
else:
4449
branch.unlock()
4614
4450
4615
4451
4616
4452
class cmd_re_sign(Command):
4617
__doc__ = """Create a digital signature for an existing revision."""
4453
"""Create a digital signature for an existing revision."""
4618
4454
# TODO be able to replace existing ones.
4619
4455
4620
4456
hidden = True # is this right ?
4628
4464
raise errors.BzrCommandError('You must supply either --revision or a revision_id')
4629
4465
b = WorkingTree.open_containing(u'.')[0].branch
4630
4466
b.lock_write()
4631
self.add_cleanup(b.unlock)
4632
return self._run(b, revision_id_list, revision)
4467
try:
4468
return self._run(b, revision_id_list, revision)
4469
finally:
4470
b.unlock()
4633
4471
4634
4472
def _run(self, b, revision_id_list, revision):
4635
4473
import bzrlib.gpg as gpg
4680
4518
4681
4519
4682
4520
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.
4521
"""Convert the current branch into a checkout of the supplied branch.
4685
4522
4686
4523
Once converted into a checkout, commits must succeed on the master branch
4687
4524
before they will be applied to the local branch.
4705
4542
'This format does not remember old locations.')
4706
4543
else:
4707
4544
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')
4545
raise errors.BzrCommandError('No location supplied and no '
4546
'previous location known')
4713
4547
b_other = Branch.open(location)
4714
4548
try:
4715
4549
b.bind(b_other)
4721
4555
4722
4556
4723
4557
class cmd_unbind(Command):
4724
__doc__ = """Convert the current checkout into a regular branch.
4558
"""Convert the current checkout into a regular branch.
4725
4559
4726
4560
After unbinding, the local branch is considered independent and subsequent
4727
4561
commits will be local only.
4738
4572
4739
4573
4740
4574
class cmd_uncommit(Command):
4741
__doc__ = """Remove the last committed revision.
4575
"""Remove the last committed revision.
4742
4576
4743
4577
--verbose will print out what is being removed.
4744
4578
--dry-run will go through all the motions, but not actually
4785
4619
4786
4620
if tree is not None:
4787
4621
tree.lock_write()
4788
self.add_cleanup(tree.unlock)
4789
4622
else:
4790
4623
b.lock_write()
4791
self.add_cleanup(b.unlock)
4792
return self._run(b, tree, dry_run, verbose, revision, force, local=local)
4624
try:
4625
return self._run(b, tree, dry_run, verbose, revision, force,
4626
local=local)
4627
finally:
4628
if tree is not None:
4629
tree.unlock()
4630
else:
4631
b.unlock()
4793
4632
4794
4633
def _run(self, b, tree, dry_run, verbose, revision, force, local=False):
4795
4634
from bzrlib.log import log_formatter, show_log
4827
4666
end_revision=last_revno)
4828
4667
4829
4668
if dry_run:
4830
self.outf.write('Dry-run, pretending to remove'
4831
' the above revisions.\n')
4669
print 'Dry-run, pretending to remove the above revisions.'
4670
if not force:
4671
val = raw_input('Press <enter> to continue')
4832
4672
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
4673
print 'The above revision(s) will be removed.'
4674
if not force:
4675
val = raw_input('Are you sure [y/N]? ')
4676
if val.lower() not in ('y', 'yes'):
4677
print 'Canceled'
4678
return 0
4839
4679
4840
4680
mutter('Uncommitting from {%s} to {%s}',
4841
4681
last_rev_id, rev_id)
4842
4682
uncommit(b, tree=tree, dry_run=dry_run, verbose=verbose,
4843
4683
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)
4684
note('You can restore the old tip by running:\n'
4685
' bzr pull . -r revid:%s', last_rev_id)
4846
4686
4847
4687
4848
4688
class cmd_break_lock(Command):
4849
__doc__ = """Break a dead lock on a repository, branch or working directory.
4689
"""Break a dead lock on a repository, branch or working directory.
4850
4690
4851
4691
CAUTION: Locks should only be broken when you are sure that the process
4852
4692
holding the lock has been stopped.
4853
4693
4854
You can get information on what locks are open via the 'bzr info
4855
[location]' command.
4694
You can get information on what locks are open via the 'bzr info' command.
4856
4695
4857
4696
:Examples:
4858
4697
bzr break-lock
4859
bzr break-lock bzr+ssh://example.com/bzr/foo
4860
4698
"""
4861
4699
takes_args = ['location?']
4862
4700
4871
4709
4872
4710
4873
4711
class cmd_wait_until_signalled(Command):
4874
__doc__ = """Test helper for test_start_and_stop_bzr_subprocess_send_signal.
4712
"""Test helper for test_start_and_stop_bzr_subprocess_send_signal.
4875
4713
4876
4714
This just prints a line to signal when it is ready, then blocks on stdin.
4877
4715
"""
4885
4723
4886
4724
4887
4725
class cmd_serve(Command):
4888
__doc__ = """Run the bzr server."""
4726
"""Run the bzr server."""
4889
4727
4890
4728
aliases = ['server']
4891
4729
4892
4730
takes_options = [
4893
4731
Option('inet',
4894
4732
help='Serve on stdin/out for use from inetd or sshd.'),
4895
RegistryOption('protocol',
4896
help="Protocol to serve.",
4733
RegistryOption('protocol',
4734
help="Protocol to serve.",
4897
4735
lazy_registry=('bzrlib.transport', 'transport_server_registry'),
4898
4736
value_switches=True),
4899
4737
Option('port',
4908
4746
Option('allow-writes',
4909
4747
help='By default the server is a readonly server. Supplying '
4910
4748
'--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.'
4749
'the served directory and below.'
4916
4750
),
4917
4751
]
4918
4752
4951
4785
4952
4786
4953
4787
class cmd_join(Command):
4954
__doc__ = """Combine a tree into its containing tree.
4788
"""Combine a tree into its containing tree.
4955
4789
4956
4790
This command requires the target tree to be in a rich-root format.
4957
4791
4997
4831
4998
4832
4999
4833
class cmd_split(Command):
5000
__doc__ = """Split a subdirectory of a tree into a separate tree.
4834
"""Split a subdirectory of a tree into a separate tree.
5001
4835
5002
4836
This command will produce a target tree in a format that supports
5003
4837
rich roots, like 'rich-root' or 'rich-root-pack'. These formats cannot be
5023
4857
5024
4858
5025
4859
class cmd_merge_directive(Command):
5026
__doc__ = """Generate a merge directive for auto-merge tools.
4860
"""Generate a merge directive for auto-merge tools.
5027
4861
5028
4862
A directive requests a merge to be performed, and also provides all the
5029
4863
information necessary to do so. This means it must either include a
5122
4956
5123
4957
5124
4958
class cmd_send(Command):
5125
__doc__ = """Mail or create a merge-directive for submitting changes.
4959
"""Mail or create a merge-directive for submitting changes.
5126
4960
5127
4961
A merge directive provides many things needed for requesting merges:
5128
4962
5134
4968
directly from the merge directive, without retrieving data from a
5135
4969
branch.
5136
4970
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.
4971
If --no-bundle is specified, then public_branch is needed (and must be
4972
up-to-date), so that the receiver can perform the merge using the
4973
public_branch. The public_branch is always included if known, so that
4974
people can check it later.
4975
4976
The submit branch defaults to the parent, but can be overridden. Both
4977
submit branch and public branch will be remembered if supplied.
4978
4979
If a public_branch is known for the submit_branch, that public submit
4980
branch is used in the merge instructions. This means that a local mirror
4981
can be used as your actual submit branch, once you have set public_branch
4982
for that mirror.
5163
4983
5164
4984
Mail is sent using your preferred mail program. This should be transparent
5165
4985
on Windows (it uses MAPI). On Linux, it requires the xdg-email utility.
5185
5005
5186
5006
The merge directives created by bzr send may be applied using bzr merge or
5187
5007
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
5008
"""
5193
5009
5194
5010
encoding_type = 'exact'
5210
5026
short_name='f',
5211
5027
type=unicode),
5212
5028
Option('output', short_name='o',
5213
help='Write merge directive to this file or directory; '
5029
help='Write merge directive to this file; '
5214
5030
'use - for stdout.',
5215
5031
type=unicode),
5216
5032
Option('strict',
5239
5055
5240
5056
5241
5057
class cmd_bundle_revisions(cmd_send):
5242
__doc__ = """Create a merge-directive for submitting changes.
5058
"""Create a merge-directive for submitting changes.
5243
5059
5244
5060
A merge directive provides many things needed for requesting merges:
5245
5061
5312
5128
5313
5129
5314
5130
class cmd_tag(Command):
5315
__doc__ = """Create, remove or modify a tag naming a revision.
5131
"""Create, remove or modify a tag naming a revision.
5316
5132
5317
5133
Tags give human-meaningful names to revisions. Commands that take a -r
5318
5134
(--revision) option can be given -rtag:X, where X is any previously
5326
5142
5327
5143
To rename a tag (change the name but keep it on the same revsion), run ``bzr
5328
5144
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
5145
"""
5335
5146
5336
5147
_see_also = ['commit', 'tags']
5337
takes_args = ['tag_name?']
5148
takes_args = ['tag_name']
5338
5149
takes_options = [
5339
5150
Option('delete',
5340
5151
help='Delete this tag rather than placing it.',
5350
5161
'revision',
5351
5162
]
5352
5163
5353
def run(self, tag_name=None,
5164
def run(self, tag_name,
5354
5165
delete=None,
5355
5166
directory='.',
5356
5167
force=None,
5358
5169
):
5359
5170
branch, relpath = Branch.open_containing(directory)
5360
5171
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)
5172
try:
5173
if delete:
5174
branch.tags.delete_tag(tag_name)
5175
self.outf.write('Deleted tag %s.\n' % tag_name)
5374
5176
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)
5177
if revision:
5178
if len(revision) != 1:
5179
raise errors.BzrCommandError(
5180
"Tags can only be placed on a single revision, "
5181
"not on a range")
5182
revision_id = revision[0].as_revision_id(branch)
5183
else:
5184
revision_id = branch.last_revision()
5185
if (not force) and branch.tags.has_tag(tag_name):
5186
raise errors.TagAlreadyExists(tag_name)
5187
branch.tags.set_tag(tag_name, revision_id)
5188
self.outf.write('Created tag %s.\n' % tag_name)
5189
finally:
5190
branch.unlock()
5385
5191
5386
5192
5387
5193
class cmd_tags(Command):
5388
__doc__ = """List tags.
5194
"""List tags.
5389
5195
5390
5196
This command shows a table of tag names and the revisions they reference.
5391
5197
"""
5420
5226
return
5421
5227
5422
5228
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()
5229
try:
5230
if revision:
5231
graph = branch.repository.get_graph()
5232
rev1, rev2 = _get_revision_range(revision, branch, self.name())
5233
revid1, revid2 = rev1.rev_id, rev2.rev_id
5234
# only show revisions between revid1 and revid2 (inclusive)
5235
tags = [(tag, revid) for tag, revid in tags if
5236
graph.is_between(revid, revid1, revid2)]
5237
if sort == 'alpha':
5238
tags.sort()
5239
elif sort == 'time':
5240
timestamps = {}
5241
for tag, revid in tags:
5242
try:
5243
revobj = branch.repository.get_revision(revid)
5244
except errors.NoSuchRevision:
5245
timestamp = sys.maxint # place them at the end
5246
else:
5247
timestamp = revobj.timestamp
5248
timestamps[revid] = timestamp
5249
tags.sort(key=lambda x: timestamps[x[1]])
5250
if not show_ids:
5251
# [ (tag, revid), ... ] -> [ (tag, dotted_revno), ... ]
5252
for index, (tag, revid) in enumerate(tags):
5253
try:
5254
revno = branch.revision_id_to_dotted_revno(revid)
5255
if isinstance(revno, tuple):
5256
revno = '.'.join(map(str, revno))
5257
except errors.NoSuchRevision:
5258
# Bad tag data/merges can lead to tagged revisions
5259
# which are not in this branch. Fail gracefully ...
5260
revno = '?'
5261
tags[index] = (tag, revno)
5262
finally:
5263
branch.unlock()
5457
5264
for tag, revspec in tags:
5458
5265
self.outf.write('%-20s %s\n' % (tag, revspec))
5459
5266
5460
5267
5461
5268
class cmd_reconfigure(Command):
5462
__doc__ = """Reconfigure the type of a bzr directory.
5269
"""Reconfigure the type of a bzr directory.
5463
5270
5464
5271
A target configuration must be specified.
5465
5272
5550
5357
5551
5358
5552
5359
class cmd_switch(Command):
5553
__doc__ = """Set the branch of a checkout and update.
5360
"""Set the branch of a checkout and update.
5554
5361
5555
5362
For lightweight checkouts, this changes the branch being referenced.
5556
5363
For heavyweight checkouts, this checks that there are no local commits
5572
5379
that of the master.
5573
5380
"""
5574
5381
5575
takes_args = ['to_location?']
5382
takes_args = ['to_location']
5576
5383
takes_options = [Option('force',
5577
5384
help='Switch even if local commits will be lost.'),
5578
'revision',
5579
5385
Option('create-branch', short_name='b',
5580
5386
help='Create the target branch from this one before'
5581
5387
' switching to it.'),
5582
]
5388
]
5583
5389
5584
def run(self, to_location=None, force=False, create_branch=False,
5585
revision=None):
5390
def run(self, to_location, force=False, create_branch=False):
5586
5391
from bzrlib import switch
5587
5392
tree_location = '.'
5588
revision = _get_one_revision('switch', revision)
5589
5393
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
5394
try:
5596
5395
branch = control_dir.open_branch()
5597
5396
had_explicit_nick = branch.get_config().has_explicit_nickname()
5602
5401
if branch is None:
5603
5402
raise errors.BzrCommandError('cannot create branch without'
5604
5403
' source branch')
5605
to_location = directory_service.directories.dereference(
5606
to_location)
5607
5404
if '/' not in to_location and '\\' not in to_location:
5608
5405
# This path is meant to be relative to the existing branch
5609
5406
this_url = self._get_branch_location(control_dir)
5611
5408
to_branch = branch.bzrdir.sprout(to_location,
5612
5409
possible_transports=[branch.bzrdir.root_transport],
5613
5410
source_branch=branch).open_branch()
5411
# try:
5412
# from_branch = control_dir.open_branch()
5413
# except errors.NotBranchError:
5414
# raise BzrCommandError('Cannot create a branch from this'
5415
# ' location when we cannot open this branch')
5416
# from_branch.bzrdir.sprout(
5417
pass
5614
5418
else:
5615
5419
try:
5616
5420
to_branch = Branch.open(to_location)
5618
5422
this_url = self._get_branch_location(control_dir)
5619
5423
to_branch = Branch.open(
5620
5424
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)
5425
switch.switch(control_dir, to_branch, force)
5624
5426
if had_explicit_nick:
5625
5427
branch = control_dir.open_branch() #get the new branch!
5626
5428
branch.nick = to_branch.nick
5646
5448
5647
5449
5648
5450
class cmd_view(Command):
5649
__doc__ = """Manage filtered views.
5451
"""Manage filtered views.
5650
5452
5651
5453
Views provide a mask over the tree so that users can focus on
5652
5454
a subset of a tree when doing their work. After creating a view,
5800
5602
5801
5603
5802
5604
class cmd_hooks(Command):
5803
__doc__ = """Show hooks."""
5605
"""Show hooks."""
5804
5606
5805
5607
hidden = True
5806
5608
5819
5621
self.outf.write(" <no hooks installed>\n")
5820
5622
5821
5623
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
5624
class cmd_shelve(Command):
5848
__doc__ = """Temporarily set aside some changes from the current tree.
5625
"""Temporarily set aside some changes from the current tree.
5849
5626
5850
5627
Shelve allows you to temporarily put changes you've made "on the shelf",
5851
5628
ie. out of the way, until a later time when you can bring them back from
5905
5682
def run_for_list(self):
5906
5683
tree = WorkingTree.open_containing('.')[0]
5907
5684
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
5685
try:
5686
manager = tree.get_shelf_manager()
5687
shelves = manager.active_shelves()
5688
if len(shelves) == 0:
5689
note('No shelved changes.')
5690
return 0
5691
for shelf_id in reversed(shelves):
5692
message = manager.get_metadata(shelf_id).get('message')
5693
if message is None:
5694
message = '<no message>'
5695
self.outf.write('%3d: %s\n' % (shelf_id, message))
5696
return 1
5697
finally:
5698
tree.unlock()
5920
5699
5921
5700
5922
5701
class cmd_unshelve(Command):
5923
__doc__ = """Restore shelved changes.
5702
"""Restore shelved changes.
5924
5703
5925
5704
By default, the most recently shelved changes are restored. However if you
5926
5705
specify a shelf by id those changes will be restored instead. This works
5934
5713
enum_switch=False, value_switches=True,
5935
5714
apply="Apply changes and remove from the shelf.",
5936
5715
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.",
5716
delete_only="Delete changes without applying them."
5941
5717
)
5942
5718
]
5943
5719
_see_also = ['shelve']
5952
5728
5953
5729
5954
5730
class cmd_clean_tree(Command):
5955
__doc__ = """Remove unwanted files from working tree.
5731
"""Remove unwanted files from working tree.
5956
5732
5957
5733
By default, only unknown files, not ignored files, are deleted. Versioned
5958
5734
files are never deleted.
5986
5762
5987
5763
5988
5764
class cmd_reference(Command):
5989
__doc__ = """list, view and set branch locations for nested trees.
5765
"""list, view and set branch locations for nested trees.
5990
5766
5991
5767
If no arguments are provided, lists the branch locations for nested trees.
5992
5768
If one argument is provided, display the branch location for that tree.
6032
5808
self.outf.write('%s %s\n' % (path, location))
6033
5809
6034
5810
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)
5811
# these get imported and then picked up by the scan for cmd_*
5812
# TODO: Some more consistent way to split command definitions across files;
5813
# we do need to load at least some information about them to know of
5814
# aliases. ideally we would avoid loading the implementation until the
5815
# details were needed.
5816
from bzrlib.cmd_version_info import cmd_version_info
5817
from bzrlib.conflicts import cmd_resolve, cmd_conflicts, restore
5818
from bzrlib.bundle.commands import (
5819
cmd_bundle_info,
5820
)
5821
from bzrlib.foreign import cmd_dpush
5822
from bzrlib.sign_my_commits import cmd_sign_my_commits
5823
from bzrlib.weave_commands import cmd_versionedfile_list, \
5824
cmd_weave_plan_merge, cmd_weave_merge_text
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0