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