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 4807
- compare with another revision
- download diff
- download tarball
- view history from revision 4807
- Committer: Canonical.com Patch Queue Manager
- Date: 2009-11-18 06:18:14 UTC
- mfrom: (4634.97.5 doc-2.0)
- Revision ID: pqm@pqm.ubuntu.com-20091118061814-695imx80olc79o7l
(mbp, trivial) additional doc building fix
- files added:
- bzrlib/textui.py
- files removed:
- .testr.conf
- apport
- bzrlib/help_topics/es
- bzrlib/plugins/news_merge
- bzrlib/plugins/news_merge/tests
- bzrlib/tests/per_bzrdir_colo
- contrib/debian
- doc/en/whats-new
- files renamed:
- bzrlib/help_topics/en/conflict-types.txt => bzrlib/help_topics/en/conflicts.txt
- bzrlib/tests/test__bencode.py => bzrlib/tests/test_bencode.py
- bzrlib/help_topics/es/conflict-types.txt => doc/es/user-guide/resolving_conflicts.txt
- files modified:
- .bzrignore
added
removed
bzrlib/builtins.py
1
# Copyright (C) 2005-2010 Canonical Ltd
1
# Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
31
31
bundle,
32
32
btree_index,
33
33
bzrdir,
34
directory_service,
35
34
delta,
36
35
config,
37
36
errors,
44
43
reconfigure,
45
44
rename_map,
46
45
revision as _mod_revision,
47
static_tuple,
48
46
symbol_versioning,
49
timestamp,
50
47
transport,
51
48
ui,
52
49
urlutils,
54
51
)
55
52
from bzrlib.branch import Branch
56
53
from bzrlib.conflicts import ConflictList
57
from bzrlib.transport import memory
58
54
from bzrlib.revisionspec import RevisionSpec, RevisionInfo
59
55
from bzrlib.smtp_connection import SMTPConnection
60
56
from bzrlib.workingtree import WorkingTree
61
57
""")
62
58
63
from bzrlib.commands import (
64
Command,
65
builtin_command_registry,
66
display_command,
67
)
59
from bzrlib.commands import Command, display_command
68
60
from bzrlib.option import (
69
61
ListOption,
70
62
Option,
239
231
# opens the branch?)
240
232
241
233
class cmd_status(Command):
242
__doc__ = """Display status summary.
234
"""Display status summary.
243
235
244
236
This reports on versioned and unknown files, reporting them
245
237
grouped by state. Possible states are:
265
257
unknown
266
258
Not versioned and not matching an ignore pattern.
267
259
268
Additionally for directories, symlinks and files with an executable
269
bit, Bazaar indicates their type using a trailing character: '/', '@'
270
or '*' respectively.
271
272
260
To see ignored files use 'bzr ignored'. For details on the
273
261
changes to file texts, use 'bzr diff'.
274
262
332
320
333
321
334
322
class cmd_cat_revision(Command):
335
__doc__ = """Write out metadata for a revision.
323
"""Write out metadata for a revision.
336
324
337
325
The revision to print can either be specified by a specific
338
326
revision identifier, or you can use --revision.
344
332
# cat-revision is more for frontends so should be exact
345
333
encoding = 'strict'
346
334
347
def print_revision(self, revisions, revid):
348
stream = revisions.get_record_stream([(revid,)], 'unordered', True)
349
record = stream.next()
350
if record.storage_kind == 'absent':
351
raise errors.NoSuchRevision(revisions, revid)
352
revtext = record.get_bytes_as('fulltext')
353
self.outf.write(revtext.decode('utf-8'))
354
355
335
@display_command
356
336
def run(self, revision_id=None, revision=None):
357
337
if revision_id is not None and revision is not None:
362
342
' --revision or a revision_id')
363
343
b = WorkingTree.open_containing(u'.')[0].branch
364
344
365
revisions = b.repository.revisions
366
if revisions is None:
367
raise errors.BzrCommandError('Repository %r does not support '
368
'access to raw revision texts')
345
# TODO: jam 20060112 should cat-revision always output utf-8?
346
if revision_id is not None:
347
revision_id = osutils.safe_revision_id(revision_id, warn=False)
348
try:
349
self.outf.write(b.repository.get_revision_xml(revision_id).decode('utf-8'))
350
except errors.NoSuchRevision:
351
msg = "The repository %s contains no revision %s." % (b.repository.base,
352
revision_id)
353
raise errors.BzrCommandError(msg)
354
elif revision is not None:
355
for rev in revision:
356
if rev is None:
357
raise errors.BzrCommandError('You cannot specify a NULL'
358
' revision.')
359
rev_id = rev.as_revision_id(b)
360
self.outf.write(b.repository.get_revision_xml(rev_id).decode('utf-8'))
369
361
370
b.repository.lock_read()
371
try:
372
# TODO: jam 20060112 should cat-revision always output utf-8?
373
if revision_id is not None:
374
revision_id = osutils.safe_revision_id(revision_id, warn=False)
375
try:
376
self.print_revision(revisions, revision_id)
377
except errors.NoSuchRevision:
378
msg = "The repository %s contains no revision %s." % (
379
b.repository.base, revision_id)
380
raise errors.BzrCommandError(msg)
381
elif revision is not None:
382
for rev in revision:
383
if rev is None:
384
raise errors.BzrCommandError(
385
'You cannot specify a NULL revision.')
386
rev_id = rev.as_revision_id(b)
387
self.print_revision(revisions, rev_id)
388
finally:
389
b.repository.unlock()
390
391
362
392
363
class cmd_dump_btree(Command):
393
__doc__ = """Dump the contents of a btree index file to stdout.
364
"""Dump the contents of a btree index file to stdout.
394
365
395
366
PATH is a btree index file, it can be any URL. This includes things like
396
367
.bzr/repository/pack-names, or .bzr/repository/indices/a34b3a...ca4a4.iix
460
431
for node in bt.iter_all_entries():
461
432
# Node is made up of:
462
433
# (index, key, value, [references])
463
try:
464
refs = node[3]
465
except IndexError:
466
refs_as_tuples = None
467
else:
468
refs_as_tuples = static_tuple.as_tuples(refs)
434
refs_as_tuples = tuple([tuple([tuple(ref) for ref in ref_list])
435
for ref_list in node[3]])
469
436
as_tuple = (tuple(node[1]), node[2], refs_as_tuples)
470
437
self.outf.write('%s\n' % (as_tuple,))
471
438
472
439
473
440
class cmd_remove_tree(Command):
474
__doc__ = """Remove the working tree from a given branch/checkout.
441
"""Remove the working tree from a given branch/checkout.
475
442
476
443
Since a lightweight checkout is little more than a working tree
477
444
this will refuse to run against one.
479
446
To re-create the working tree, use "bzr checkout".
480
447
"""
481
448
_see_also = ['checkout', 'working-trees']
482
takes_args = ['location*']
449
takes_args = ['location?']
483
450
takes_options = [
484
451
Option('force',
485
452
help='Remove the working tree even if it has '
486
453
'uncommitted changes.'),
487
454
]
488
455
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()
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()
512
477
513
478
514
479
class cmd_revno(Command):
515
__doc__ = """Show current revision number.
480
"""Show current revision number.
516
481
517
482
This is equal to the number of revisions on this branch.
518
483
"""
531
496
wt.lock_read()
532
497
except (errors.NoWorkingTree, errors.NotLocalUrl):
533
498
raise errors.NoWorkingTree(location)
534
self.add_cleanup(wt.unlock)
535
revid = wt.last_revision()
536
499
try:
537
revno_t = wt.branch.revision_id_to_dotted_revno(revid)
538
except errors.NoSuchRevision:
539
revno_t = ('???',)
540
revno = ".".join(str(n) for n in revno_t)
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()
541
508
else:
542
509
b = Branch.open_containing(location)[0]
543
510
b.lock_read()
544
self.add_cleanup(b.unlock)
545
revno = b.revno()
546
self.cleanup_now()
511
try:
512
revno = b.revno()
513
finally:
514
b.unlock()
515
547
516
self.outf.write(str(revno) + '\n')
548
517
549
518
550
519
class cmd_revision_info(Command):
551
__doc__ = """Show revision number and revision id for a given revision identifier.
520
"""Show revision number and revision id for a given revision identifier.
552
521
"""
553
522
hidden = True
554
523
takes_args = ['revision_info*']
571
540
wt = WorkingTree.open_containing(directory)[0]
572
541
b = wt.branch
573
542
wt.lock_read()
574
self.add_cleanup(wt.unlock)
575
543
except (errors.NoWorkingTree, errors.NotLocalUrl):
576
544
wt = None
577
545
b = Branch.open_containing(directory)[0]
578
546
b.lock_read()
579
self.add_cleanup(b.unlock)
580
revision_ids = []
581
if revision is not None:
582
revision_ids.extend(rev.as_revision_id(b) for rev in revision)
583
if revision_info_list is not None:
584
for rev_str in revision_info_list:
585
rev_spec = RevisionSpec.from_string(rev_str)
586
revision_ids.append(rev_spec.as_revision_id(b))
587
# No arguments supplied, default to the last revision
588
if len(revision_ids) == 0:
589
if tree:
590
if wt is None:
591
raise errors.NoWorkingTree(directory)
592
revision_ids.append(wt.last_revision())
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()
593
577
else:
594
revision_ids.append(b.last_revision())
595
596
revinfos = []
597
maxlen = 0
598
for revision_id in revision_ids:
599
try:
600
dotted_revno = b.revision_id_to_dotted_revno(revision_id)
601
revno = '.'.join(str(i) for i in dotted_revno)
602
except errors.NoSuchRevision:
603
revno = '???'
604
maxlen = max(maxlen, len(revno))
605
revinfos.append([revno, revision_id])
606
607
self.cleanup_now()
578
wt.unlock()
579
608
580
for ri in revinfos:
609
581
self.outf.write('%*s %s\n' % (maxlen, ri[0], ri[1]))
610
582
611
583
612
584
class cmd_add(Command):
613
__doc__ = """Add specified files or directories.
585
"""Add specified files or directories.
614
586
615
587
In non-recursive mode, all the named items are added, regardless
616
588
of whether they were previously ignored. A warning is given if
682
654
683
655
if base_tree:
684
656
base_tree.lock_read()
685
self.add_cleanup(base_tree.unlock)
686
tree, file_list = tree_files_for_add(file_list)
687
added, ignored = tree.smart_add(file_list, not
688
no_recurse, action=action, save=not dry_run)
689
self.cleanup_now()
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()
690
664
if len(ignored) > 0:
691
665
if verbose:
692
666
for glob in sorted(ignored.keys()):
696
670
697
671
698
672
class cmd_mkdir(Command):
699
__doc__ = """Create a new versioned directory.
673
"""Create a new versioned directory.
700
674
701
675
This is equivalent to creating the directory and then adding it.
702
676
"""
706
680
707
681
def run(self, dir_list):
708
682
for d in dir_list:
683
os.mkdir(d)
709
684
wt, dd = WorkingTree.open_containing(d)
710
base = os.path.dirname(dd)
711
id = wt.path2id(base)
712
if id != None:
713
os.mkdir(d)
714
wt.add([dd])
715
self.outf.write('added %s\n' % d)
716
else:
717
raise errors.NotVersionedError(path=base)
685
wt.add([dd])
686
self.outf.write('added %s\n' % d)
718
687
719
688
720
689
class cmd_relpath(Command):
721
__doc__ = """Show path of a file relative to root"""
690
"""Show path of a file relative to root"""
722
691
723
692
takes_args = ['filename']
724
693
hidden = True
733
702
734
703
735
704
class cmd_inventory(Command):
736
__doc__ = """Show inventory of the current working copy or a revision.
705
"""Show inventory of the current working copy or a revision.
737
706
738
707
It is possible to limit the output to a particular entry
739
708
type using the --kind option. For example: --kind file.
761
730
revision = _get_one_revision('inventory', revision)
762
731
work_tree, file_list = tree_files(file_list)
763
732
work_tree.lock_read()
764
self.add_cleanup(work_tree.unlock)
765
if revision is not None:
766
tree = revision.as_tree(work_tree.branch)
767
768
extra_trees = [work_tree]
769
tree.lock_read()
770
self.add_cleanup(tree.unlock)
771
else:
772
tree = work_tree
773
extra_trees = []
774
775
if file_list is not None:
776
file_ids = tree.paths2ids(file_list, trees=extra_trees,
777
require_versioned=True)
778
# find_ids_across_trees may include some paths that don't
779
# exist in 'tree'.
780
entries = sorted((tree.id2path(file_id), tree.inventory[file_id])
781
for file_id in file_ids if file_id in tree)
782
else:
783
entries = tree.inventory.entries()
784
785
self.cleanup_now()
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
786
757
for path, entry in entries:
787
758
if kind and kind != entry.kind:
788
759
continue
794
765
795
766
796
767
class cmd_mv(Command):
797
__doc__ = """Move or rename a file.
768
"""Move or rename a file.
798
769
799
770
:Usage:
800
771
bzr mv OLDNAME NEWNAME
834
805
raise errors.BzrCommandError("missing file argument")
835
806
tree, rel_names = tree_files(names_list, canonicalize=False)
836
807
tree.lock_tree_write()
837
self.add_cleanup(tree.unlock)
838
self._run(tree, names_list, rel_names, after)
808
try:
809
self._run(tree, names_list, rel_names, after)
810
finally:
811
tree.unlock()
839
812
840
813
def run_auto(self, names_list, after, dry_run):
841
814
if names_list is not None and len(names_list) > 1:
846
819
' --auto.')
847
820
work_tree, file_list = tree_files(names_list, default_branch='.')
848
821
work_tree.lock_tree_write()
849
self.add_cleanup(work_tree.unlock)
850
rename_map.RenameMap.guess_renames(work_tree, dry_run)
822
try:
823
rename_map.RenameMap.guess_renames(work_tree, dry_run)
824
finally:
825
work_tree.unlock()
851
826
852
827
def _run(self, tree, names_list, rel_names, after):
853
828
into_existing = osutils.isdir(names_list[-1])
931
906
932
907
933
908
class cmd_pull(Command):
934
__doc__ = """Turn this branch into a mirror of another branch.
909
"""Turn this branch into a mirror of another branch.
935
910
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.
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.
940
914
941
915
If branches have diverged, you can use 'bzr merge' to integrate the changes
942
916
from one into the other. Once one branch has merged, the other should
943
917
be able to pull it again.
944
918
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.
919
If you want to forget your local changes and just update your branch to
920
match the remote one, use pull --overwrite.
948
921
949
922
If there is no default location set, the first pull will set it. After
950
923
that, you can omit the location to use the default. To change the
986
959
try:
987
960
tree_to = WorkingTree.open_containing(directory)[0]
988
961
branch_to = tree_to.branch
989
tree_to.lock_write()
990
self.add_cleanup(tree_to.unlock)
991
962
except errors.NoWorkingTree:
992
963
tree_to = None
993
964
branch_to = Branch.open_containing(directory)[0]
994
branch_to.lock_write()
995
self.add_cleanup(branch_to.unlock)
996
965
997
966
if local and not branch_to.get_bound_location():
998
967
raise errors.LocalRequiresBoundBranch()
999
968
1029
998
else:
1030
999
branch_from = Branch.open(location,
1031
1000
possible_transports=possible_transports)
1032
branch_from.lock_read()
1033
self.add_cleanup(branch_from.unlock)
1034
1001
1035
1002
if branch_to.get_parent() is None or remember:
1036
1003
branch_to.set_parent(branch_from.base)
1037
1004
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)
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()
1058
1035
1059
1036
1060
1037
class cmd_push(Command):
1061
__doc__ = """Update a mirror of this branch.
1038
"""Update a mirror of this branch.
1062
1039
1063
1040
The target branch will not have its working tree populated because this
1064
1041
is both expensive, and is not supported on remote file systems.
1125
1102
# Get the source branch
1126
1103
(tree, br_from,
1127
1104
_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
1128
1108
# Get the tip's revision_id
1129
1109
revision = _get_one_revision('push', revision)
1130
1110
if revision is not None:
1131
1111
revision_id = revision.in_history(br_from).rev_id
1132
1112
else:
1133
1113
revision_id = None
1134
if tree is not None and revision_id is None:
1135
tree.check_changed_or_out_of_date(
1136
strict, 'push_strict',
1137
more_error='Use --no-strict to force the push.',
1138
more_warning='Uncommitted changes will not be pushed.')
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
1139
1125
# Get the stacked_on branch, if any
1140
1126
if stacked_on is not None:
1141
1127
stacked_on = urlutils.normalize_url(stacked_on)
1173
1159
1174
1160
1175
1161
class cmd_branch(Command):
1176
__doc__ = """Create a new branch that is a copy of an existing branch.
1162
"""Create a new branch that is a copy of an existing branch.
1177
1163
1178
1164
If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will
1179
1165
be used. In other words, "branch ../foo/bar" will attempt to create ./bar.
1206
1192
' directory exists, but does not already'
1207
1193
' have a control directory. This flag will'
1208
1194
' allow branch to proceed.'),
1209
Option('bind',
1210
help="Bind new branch to from location."),
1211
1195
]
1212
1196
aliases = ['get', 'clone']
1213
1197
1214
1198
def run(self, from_location, to_location=None, revision=None,
1215
1199
hardlink=False, stacked=False, standalone=False, no_tree=False,
1216
use_existing_dir=False, switch=False, bind=False):
1200
use_existing_dir=False, switch=False):
1217
1201
from bzrlib import switch as _mod_switch
1218
1202
from bzrlib.tag import _merge_tags_if_possible
1219
1203
accelerator_tree, br_from = bzrdir.BzrDir.open_tree_or_branch(
1220
1204
from_location)
1205
if (accelerator_tree is not None and
1206
accelerator_tree.supports_content_filtering()):
1207
accelerator_tree = None
1221
1208
revision = _get_one_revision('branch', revision)
1222
1209
br_from.lock_read()
1223
self.add_cleanup(br_from.unlock)
1224
if revision is not None:
1225
revision_id = revision.as_revision_id(br_from)
1226
else:
1227
# FIXME - wt.last_revision, fallback to branch, fall back to
1228
# None or perhaps NULL_REVISION to mean copy nothing
1229
# RBC 20060209
1230
revision_id = br_from.last_revision()
1231
if to_location is None:
1232
to_location = urlutils.derive_to_location(from_location)
1233
to_transport = transport.get_transport(to_location)
1234
1210
try:
1235
to_transport.mkdir('.')
1236
except errors.FileExists:
1237
if not use_existing_dir:
1238
raise errors.BzrCommandError('Target directory "%s" '
1239
'already exists.' % to_location)
1211
if revision is not None:
1212
revision_id = revision.as_revision_id(br_from)
1240
1213
else:
1241
try:
1242
bzrdir.BzrDir.open_from_transport(to_transport)
1243
except errors.NotBranchError:
1244
pass
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)
1245
1227
else:
1246
raise errors.AlreadyBranchError(to_location)
1247
except errors.NoSuchFile:
1248
raise errors.BzrCommandError('Parent of "%s" does not exist.'
1249
% to_location)
1250
try:
1251
# preserve whatever source format we have.
1252
dir = br_from.bzrdir.sprout(to_transport.base, revision_id,
1253
possible_transports=[to_transport],
1254
accelerator_tree=accelerator_tree,
1255
hardlink=hardlink, stacked=stacked,
1256
force_new_repo=standalone,
1257
create_tree_if_local=not no_tree,
1258
source_branch=br_from)
1259
branch = dir.open_branch()
1260
except errors.NoSuchRevision:
1261
to_transport.delete_tree('.')
1262
msg = "The branch %s has no revision %s." % (from_location,
1263
revision)
1264
raise errors.BzrCommandError(msg)
1265
_merge_tags_if_possible(br_from, branch)
1266
# If the source branch is stacked, the new branch may
1267
# be stacked whether we asked for that explicitly or not.
1268
# We therefore need a try/except here and not just 'if stacked:'
1269
try:
1270
note('Created new stacked branch referring to %s.' %
1271
branch.get_stacked_on_url())
1272
except (errors.NotStacked, errors.UnstackableBranchFormat,
1273
errors.UnstackableRepositoryFormat), e:
1274
note('Branched %d revision(s).' % branch.revno())
1275
if bind:
1276
# Bind to the parent
1277
parent_branch = Branch.open(from_location)
1278
branch.bind(parent_branch)
1279
note('New branch bound to %s' % from_location)
1280
if switch:
1281
# Switch to the new branch
1282
wt, _ = WorkingTree.open_containing('.')
1283
_mod_switch.switch(wt.bzrdir, branch)
1284
note('Switched to branch: %s',
1285
urlutils.unescape_for_display(branch.base, 'utf-8'))
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()
1286
1270
1287
1271
1288
1272
class cmd_checkout(Command):
1289
__doc__ = """Create a new checkout of an existing branch.
1273
"""Create a new checkout of an existing branch.
1290
1274
1291
1275
If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree for
1292
1276
the branch found in '.'. This is useful if you have removed the working tree
1355
1339
1356
1340
1357
1341
class cmd_renames(Command):
1358
__doc__ = """Show list of renamed files.
1342
"""Show list of renamed files.
1359
1343
"""
1360
1344
# TODO: Option to show renames between two historical versions.
1361
1345
1367
1351
def run(self, dir=u'.'):
1368
1352
tree = WorkingTree.open_containing(dir)[0]
1369
1353
tree.lock_read()
1370
self.add_cleanup(tree.unlock)
1371
new_inv = tree.inventory
1372
old_tree = tree.basis_tree()
1373
old_tree.lock_read()
1374
self.add_cleanup(old_tree.unlock)
1375
old_inv = old_tree.inventory
1376
renames = []
1377
iterator = tree.iter_changes(old_tree, include_unchanged=True)
1378
for f, paths, c, v, p, n, k, e in iterator:
1379
if paths[0] == paths[1]:
1380
continue
1381
if None in (paths):
1382
continue
1383
renames.append(paths)
1384
renames.sort()
1385
for old_name, new_name in renames:
1386
self.outf.write("%s => %s\n" % (old_name, new_name))
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()
1387
1375
1388
1376
1389
1377
class cmd_update(Command):
1390
__doc__ = """Update a tree to have the latest code committed to its branch.
1378
"""Update a tree to have the latest code committed to its branch.
1391
1379
1392
1380
This will perform a merge into the working tree, and may generate
1393
1381
conflicts. If you have any local changes, you will still
1395
1383
1396
1384
If you want to discard your local changes, you can just do a
1397
1385
'bzr revert' instead of 'bzr commit' after the update.
1398
1399
If the tree's branch is bound to a master branch, it will also update
1400
the branch from the master.
1401
1386
"""
1402
1387
1403
1388
_see_also = ['pull', 'working-trees', 'status-flags']
1404
1389
takes_args = ['dir?']
1405
takes_options = ['revision']
1406
1390
aliases = ['up']
1407
1391
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")
1392
def run(self, dir='.'):
1412
1393
tree = WorkingTree.open_containing(dir)[0]
1413
branch = tree.branch
1414
1394
possible_transports = []
1415
master = branch.get_master_branch(
1395
master = tree.branch.get_master_branch(
1416
1396
possible_transports=possible_transports)
1417
1397
if master is not None:
1418
1398
tree.lock_write()
1419
branch_location = master.base
1420
1399
else:
1421
1400
tree.lock_tree_write()
1422
branch_location = tree.branch.base
1423
self.add_cleanup(tree.unlock)
1424
# get rid of the final '/' and be ready for display
1425
branch_location = urlutils.unescape_for_display(
1426
branch_location.rstrip('/'),
1427
self.outf.encoding)
1428
existing_pending_merges = tree.get_parent_ids()[1:]
1429
if master is None:
1430
old_tip = None
1431
else:
1432
# may need to fetch data into a heavyweight checkout
1433
# XXX: this may take some time, maybe we should display a
1434
# message
1435
old_tip = branch.update(possible_transports)
1436
if revision is not None:
1437
revision_id = revision[0].as_revision_id(branch)
1438
else:
1439
revision_id = branch.last_revision()
1440
if revision_id == _mod_revision.ensure_null(tree.last_revision()):
1441
revno = branch.revision_id_to_dotted_revno(revision_id)
1442
note("Tree is up to date at revision %s of branch %s" %
1443
('.'.join(map(str, revno)), branch_location))
1444
return 0
1445
view_info = _get_view_info_for_change_reporter(tree)
1446
change_reporter = delta._ChangeReporter(
1447
unversioned_filter=tree.is_ignored,
1448
view_info=view_info)
1449
1401
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)
1450
1413
conflicts = tree.update(
1451
change_reporter,
1452
possible_transports=possible_transports,
1453
revision=revision_id,
1454
old_tip=old_tip)
1455
except errors.NoSuchRevision, e:
1456
raise errors.BzrCommandError(
1457
"branch has no revision %s\n"
1458
"bzr update --revision only works"
1459
" for a revision in the branch history"
1460
% (e.revision))
1461
revno = tree.branch.revision_id_to_dotted_revno(
1462
_mod_revision.ensure_null(tree.last_revision()))
1463
note('Updated to revision %s of branch %s' %
1464
('.'.join(map(str, revno)), branch_location))
1465
parent_ids = tree.get_parent_ids()
1466
if parent_ids[1:] and parent_ids[1:] != existing_pending_merges:
1467
note('Your local commits will now show as pending merges with '
1468
"'bzr status', and can be committed with 'bzr commit'.")
1469
if conflicts != 0:
1470
return 1
1471
else:
1472
return 0
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()
1473
1428
1474
1429
1475
1430
class cmd_info(Command):
1476
__doc__ = """Show information about a working tree, branch or repository.
1431
"""Show information about a working tree, branch or repository.
1477
1432
1478
1433
This command will show all known locations and formats associated to the
1479
1434
tree, branch or repository.
1517
1472
1518
1473
1519
1474
class cmd_remove(Command):
1520
__doc__ = """Remove files or directories.
1475
"""Remove files or directories.
1521
1476
1522
1477
This makes bzr stop tracking changes to the specified files. bzr will delete
1523
1478
them if they can easily be recovered using revert. If no options or
1546
1501
file_list = [f for f in file_list]
1547
1502
1548
1503
tree.lock_write()
1549
self.add_cleanup(tree.unlock)
1550
# Heuristics should probably all move into tree.remove_smart or
1551
# some such?
1552
if new:
1553
added = tree.changes_from(tree.basis_tree(),
1554
specific_files=file_list).added
1555
file_list = sorted([f[0] for f in added], reverse=True)
1556
if len(file_list) == 0:
1557
raise errors.BzrCommandError('No matching files.')
1558
elif file_list is None:
1559
# missing files show up in iter_changes(basis) as
1560
# versioned-with-no-kind.
1561
missing = []
1562
for change in tree.iter_changes(tree.basis_tree()):
1563
# Find paths in the working tree that have no kind:
1564
if change[1][1] is not None and change[6][1] is None:
1565
missing.append(change[1][1])
1566
file_list = sorted(missing, reverse=True)
1567
file_deletion_strategy = 'keep'
1568
tree.remove(file_list, verbose=verbose, to_file=self.outf,
1569
keep_files=file_deletion_strategy=='keep',
1570
force=file_deletion_strategy=='force')
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()
1571
1528
1572
1529
1573
1530
class cmd_file_id(Command):
1574
__doc__ = """Print file_id of a particular file or directory.
1531
"""Print file_id of a particular file or directory.
1575
1532
1576
1533
The file_id is assigned when the file is first added and remains the
1577
1534
same through all revisions where the file exists, even when it is
1593
1550
1594
1551
1595
1552
class cmd_file_path(Command):
1596
__doc__ = """Print path of file_ids to a file or directory.
1553
"""Print path of file_ids to a file or directory.
1597
1554
1598
1555
This prints one line for each directory down to the target,
1599
1556
starting at the branch root.
1615
1572
1616
1573
1617
1574
class cmd_reconcile(Command):
1618
__doc__ = """Reconcile bzr metadata in a branch.
1575
"""Reconcile bzr metadata in a branch.
1619
1576
1620
1577
This can correct data mismatches that may have been caused by
1621
1578
previous ghost operations or bzr upgrades. You should only
1643
1600
1644
1601
1645
1602
class cmd_revision_history(Command):
1646
__doc__ = """Display the list of revision ids on a branch."""
1603
"""Display the list of revision ids on a branch."""
1647
1604
1648
1605
_see_also = ['log']
1649
1606
takes_args = ['location?']
1659
1616
1660
1617
1661
1618
class cmd_ancestry(Command):
1662
__doc__ = """List all revisions merged into this branch."""
1619
"""List all revisions merged into this branch."""
1663
1620
1664
1621
_see_also = ['log', 'revision-history']
1665
1622
takes_args = ['location?']
1684
1641
1685
1642
1686
1643
class cmd_init(Command):
1687
__doc__ = """Make a directory into a versioned branch.
1644
"""Make a directory into a versioned branch.
1688
1645
1689
1646
Use this to create an empty branch, or before importing an
1690
1647
existing project.
1793
1750
1794
1751
1795
1752
class cmd_init_repository(Command):
1796
__doc__ = """Create a shared repository for branches to share storage space.
1753
"""Create a shared repository to hold branches.
1797
1754
1798
1755
New branches created under the repository directory will store their
1799
revisions in the repository, not in the branch directory. For branches
1800
with shared history, this reduces the amount of storage needed and
1801
speeds up the creation of new branches.
1756
revisions in the repository, not in the branch directory.
1802
1757
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.
1758
If the --no-trees option is used then the branches in the repository
1759
will not have working trees by default.
1809
1760
1810
1761
:Examples:
1811
Create a shared repository holding just branches::
1762
Create a shared repositories holding just branches::
1812
1763
1813
1764
bzr init-repo --no-trees repo
1814
1765
bzr init repo/trunk
1853
1804
1854
1805
1855
1806
class cmd_diff(Command):
1856
__doc__ = """Show differences in the working tree, between revisions or branches.
1807
"""Show differences in the working tree, between revisions or branches.
1857
1808
1858
1809
If no arguments are given, all changes for the current tree are listed.
1859
1810
If files are given, only the changes in those files are listed.
1880
1831
1881
1832
bzr diff -r1
1882
1833
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
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
1904
1841
1905
1842
Show just the differences for file NEWS::
1906
1843
1945
1882
help='Use this command to compare files.',
1946
1883
type=unicode,
1947
1884
),
1948
RegistryOption('format',
1949
help='Diff format to use.',
1950
lazy_registry=('bzrlib.diff', 'format_registry'),
1951
value_switches=False, title='Diff format'),
1952
1885
]
1953
1886
aliases = ['di', 'dif']
1954
1887
encoding_type = 'exact'
1955
1888
1956
1889
@display_command
1957
1890
def run(self, revision=None, file_list=None, diff_options=None,
1958
prefix=None, old=None, new=None, using=None, format=None):
1959
from bzrlib.diff import (get_trees_and_branches_to_diff_locked,
1960
show_diff_trees)
1891
prefix=None, old=None, new=None, using=None):
1892
from bzrlib.diff import get_trees_and_branches_to_diff, show_diff_trees
1961
1893
1962
1894
if (prefix is None) or (prefix == '0'):
1963
1895
# diff -p0 format
1977
1909
raise errors.BzrCommandError('bzr diff --revision takes exactly'
1978
1910
' one or two revision specifiers')
1979
1911
1980
if using is not None and format is not None:
1981
raise errors.BzrCommandError('--using and --format are mutually '
1982
'exclusive.')
1983
1984
1912
(old_tree, new_tree,
1985
1913
old_branch, new_branch,
1986
specific_files, extra_trees) = get_trees_and_branches_to_diff_locked(
1987
file_list, revision, old, new, self.add_cleanup, apply_view=True)
1914
specific_files, extra_trees) = get_trees_and_branches_to_diff(
1915
file_list, revision, old, new, apply_view=True)
1988
1916
return show_diff_trees(old_tree, new_tree, sys.stdout,
1989
1917
specific_files=specific_files,
1990
1918
external_diff_options=diff_options,
1991
1919
old_label=old_label, new_label=new_label,
1992
extra_trees=extra_trees, using=using,
1993
format_cls=format)
1920
extra_trees=extra_trees, using=using)
1994
1921
1995
1922
1996
1923
class cmd_deleted(Command):
1997
__doc__ = """List files deleted in the working tree.
1924
"""List files deleted in the working tree.
1998
1925
"""
1999
1926
# TODO: Show files deleted since a previous revision, or
2000
1927
# between two revisions.
2009
1936
def run(self, show_ids=False):
2010
1937
tree = WorkingTree.open_containing(u'.')[0]
2011
1938
tree.lock_read()
2012
self.add_cleanup(tree.unlock)
2013
old = tree.basis_tree()
2014
old.lock_read()
2015
self.add_cleanup(old.unlock)
2016
for path, ie in old.inventory.iter_entries():
2017
if not tree.has_id(ie.file_id):
2018
self.outf.write(path)
2019
if show_ids:
2020
self.outf.write(' ')
2021
self.outf.write(ie.file_id)
2022
self.outf.write('\n')
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()
2023
1954
2024
1955
2025
1956
class cmd_modified(Command):
2026
__doc__ = """List files modified in working tree.
1957
"""List files modified in working tree.
2027
1958
"""
2028
1959
2029
1960
hidden = True
2046
1977
2047
1978
2048
1979
class cmd_added(Command):
2049
__doc__ = """List files added in working tree.
1980
"""List files added in working tree.
2050
1981
"""
2051
1982
2052
1983
hidden = True
2061
1992
def run(self, null=False):
2062
1993
wt = WorkingTree.open_containing(u'.')[0]
2063
1994
wt.lock_read()
2064
self.add_cleanup(wt.unlock)
2065
basis = wt.basis_tree()
2066
basis.lock_read()
2067
self.add_cleanup(basis.unlock)
2068
basis_inv = basis.inventory
2069
inv = wt.inventory
2070
for file_id in inv:
2071
if file_id in basis_inv:
2072
continue
2073
if inv.is_root(file_id) and len(basis_inv) == 0:
2074
continue
2075
path = inv.id2path(file_id)
2076
if not os.access(osutils.abspath(path), os.F_OK):
2077
continue
2078
if null:
2079
self.outf.write(path + '\0')
2080
else:
2081
self.outf.write(osutils.quotefn(path) + '\n')
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()
2082
2017
2083
2018
2084
2019
class cmd_root(Command):
2085
__doc__ = """Show the tree root directory.
2020
"""Show the tree root directory.
2086
2021
2087
2022
The root is the nearest enclosing directory with a .bzr control
2088
2023
directory."""
2112
2047
2113
2048
2114
2049
class cmd_log(Command):
2115
__doc__ = """Show historical log for a branch or subset of a branch.
2050
"""Show historical log for a branch or subset of a branch.
2116
2051
2117
2052
log is bzr's default tool for exploring the history of a branch.
2118
2053
The branch to use is taken from the first parameter. If no parameters
2229
2164
:Tips & tricks:
2230
2165
2231
2166
GUI tools and IDEs are often better at exploring history than command
2232
line tools: you may prefer qlog or viz from qbzr or bzr-gtk, the
2233
bzr-explorer shell, or the Loggerhead web interface. See the Plugin
2234
Guide <http://doc.bazaar.canonical.com/plugins/en/> and
2235
<http://wiki.bazaar.canonical.com/IDEIntegration>.
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.
2236
2174
2237
2175
You may find it useful to add the aliases below to ``bazaar.conf``::
2238
2176
2299
2237
help='Show changes made in each revision as a patch.'),
2300
2238
Option('include-merges',
2301
2239
help='Show merged revisions like --levels 0 does.'),
2302
Option('exclude-common-ancestry',
2303
help='Display only the revisions that are not part'
2304
' of both ancestries (require -rX..Y)'
2305
)
2306
2240
]
2307
2241
encoding_type = 'replace'
2308
2242
2318
2252
message=None,
2319
2253
limit=None,
2320
2254
show_diff=False,
2321
include_merges=False,
2322
exclude_common_ancestry=False,
2323
):
2255
include_merges=False):
2324
2256
from bzrlib.log import (
2325
2257
Logger,
2326
2258
make_log_request_dict,
2327
2259
_get_info_for_log_files,
2328
2260
)
2329
2261
direction = (forward and 'forward') or 'reverse'
2330
if (exclude_common_ancestry
2331
and (revision is None or len(revision) != 2)):
2332
raise errors.BzrCommandError(
2333
'--exclude-common-ancestry requires -r with two revisions')
2334
2262
if include_merges:
2335
2263
if levels is None:
2336
2264
levels = 0
2349
2277
2350
2278
file_ids = []
2351
2279
filter_by_dir = False
2352
if file_list:
2353
# find the file ids to log and check for directory filtering
2354
b, file_info_list, rev1, rev2 = _get_info_for_log_files(
2355
revision, file_list)
2356
self.add_cleanup(b.unlock)
2357
for relpath, file_id, kind in file_info_list:
2358
if file_id is None:
2359
raise errors.BzrCommandError(
2360
"Path unknown at end or start of revision range: %s" %
2361
relpath)
2362
# If the relpath is the top of the tree, we log everything
2363
if relpath == '':
2364
file_ids = []
2365
break
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()
2366
2305
else:
2367
file_ids.append(file_id)
2368
filter_by_dir = filter_by_dir or (
2369
kind in ['directory', 'tree-reference'])
2370
else:
2371
# log everything
2372
# FIXME ? log the current subdir only RBC 20060203
2373
if revision is not None \
2374
and len(revision) > 0 and revision[0].get_branch():
2375
location = revision[0].get_branch()
2376
else:
2377
location = '.'
2378
dir, relpath = bzrdir.BzrDir.open_containing(location)
2379
b = dir.open_branch()
2380
b.lock_read()
2381
self.add_cleanup(b.unlock)
2382
rev1, rev2 = _get_revision_range(revision, b, self.name())
2383
2384
# Decide on the type of delta & diff filtering to use
2385
# TODO: add an --all-files option to make this configurable & consistent
2386
if not verbose:
2387
delta_type = None
2388
else:
2389
delta_type = 'full'
2390
if not show_diff:
2391
diff_type = None
2392
elif file_ids:
2393
diff_type = 'partial'
2394
else:
2395
diff_type = 'full'
2396
2397
# Build the log formatter
2398
if log_format is None:
2399
log_format = log.log_formatter_registry.get_default(b)
2400
# Make a non-encoding output to include the diffs - bug 328007
2401
unencoded_output = ui.ui_factory.make_output_stream(encoding_type='exact')
2402
lf = log_format(show_ids=show_ids, to_file=self.outf,
2403
to_exact_file=unencoded_output,
2404
show_timezone=timezone,
2405
delta_format=get_verbosity_level(),
2406
levels=levels,
2407
show_advice=levels is None)
2408
2409
# Choose the algorithm for doing the logging. It's annoying
2410
# having multiple code paths like this but necessary until
2411
# the underlying repository format is faster at generating
2412
# deltas or can provide everything we need from the indices.
2413
# The default algorithm - match-using-deltas - works for
2414
# multiple files and directories and is faster for small
2415
# amounts of history (200 revisions say). However, it's too
2416
# slow for logging a single file in a repository with deep
2417
# history, i.e. > 10K revisions. In the spirit of "do no
2418
# evil when adding features", we continue to use the
2419
# original algorithm - per-file-graph - for the "single
2420
# file that isn't a directory without showing a delta" case.
2421
partial_history = revision and b.repository._format.supports_chks
2422
match_using_deltas = (len(file_ids) != 1 or filter_by_dir
2423
or delta_type or partial_history)
2424
2425
# Build the LogRequest and execute it
2426
if len(file_ids) == 0:
2427
file_ids = None
2428
rqst = make_log_request_dict(
2429
direction=direction, specific_fileids=file_ids,
2430
start_revision=rev1, end_revision=rev2, limit=limit,
2431
message_search=message, delta_type=delta_type,
2432
diff_type=diff_type, _match_using_deltas=match_using_deltas,
2433
exclude_common_ancestry=exclude_common_ancestry,
2434
)
2435
Logger(b, rqst).show(lf)
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()
2436
2362
2437
2363
2438
2364
def _get_revision_range(revisionspec_list, branch, command_name):
2456
2382
raise errors.BzrCommandError(
2457
2383
"bzr %s doesn't accept two revisions in different"
2458
2384
" branches." % command_name)
2459
if start_spec.spec is None:
2460
# Avoid loading all the history.
2461
rev1 = RevisionInfo(branch, None, None)
2462
else:
2463
rev1 = start_spec.in_history(branch)
2385
rev1 = start_spec.in_history(branch)
2464
2386
# Avoid loading all of history when we know a missing
2465
2387
# end of range means the last revision ...
2466
2388
if end_spec.spec is None:
2495
2417
2496
2418
2497
2419
class cmd_touching_revisions(Command):
2498
__doc__ = """Return revision-ids which affected a particular file.
2420
"""Return revision-ids which affected a particular file.
2499
2421
2500
2422
A more user-friendly interface is "bzr log FILE".
2501
2423
"""
2509
2431
file_id = tree.path2id(relpath)
2510
2432
b = tree.branch
2511
2433
b.lock_read()
2512
self.add_cleanup(b.unlock)
2513
touching_revs = log.find_touching_revisions(b, file_id)
2514
for revno, revision_id, what in touching_revs:
2515
self.outf.write("%6d %s\n" % (revno, what))
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()
2516
2440
2517
2441
2518
2442
class cmd_ls(Command):
2519
__doc__ = """List files in a tree.
2443
"""List files in a tree.
2520
2444
"""
2521
2445
2522
2446
_see_also = ['status', 'cat']
2570
2494
if from_root:
2571
2495
if relpath:
2572
2496
prefix = relpath + '/'
2573
elif fs_path != '.' and not fs_path.endswith('/'):
2497
elif fs_path != '.':
2574
2498
prefix = fs_path + '/'
2575
2499
2576
2500
if revision is not None or tree is None:
2585
2509
note("Ignoring files outside view. View is %s" % view_str)
2586
2510
2587
2511
tree.lock_read()
2588
self.add_cleanup(tree.unlock)
2589
for fp, fc, fkind, fid, entry in tree.list_files(include_root=False,
2590
from_dir=relpath, recursive=recursive):
2591
# Apply additional masking
2592
if not all and not selection[fc]:
2593
continue
2594
if kind is not None and fkind != kind:
2595
continue
2596
if apply_view:
2597
try:
2598
if relpath:
2599
fullpath = osutils.pathjoin(relpath, fp)
2600
else:
2601
fullpath = fp
2602
views.check_path_in_view(tree, fullpath)
2603
except errors.FileOutsideView:
2604
continue
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
2605
2529
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:
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)
2632
2540
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()
2633
2559
2634
2560
2635
2561
class cmd_unknowns(Command):
2636
__doc__ = """List unknown files.
2562
"""List unknown files.
2637
2563
"""
2638
2564
2639
2565
hidden = True
2646
2572
2647
2573
2648
2574
class cmd_ignore(Command):
2649
__doc__ = """Ignore specified files or patterns.
2575
"""Ignore specified files or patterns.
2650
2576
2651
2577
See ``bzr help patterns`` for details on the syntax of patterns.
2652
2578
2653
If a .bzrignore file does not exist, the ignore command
2654
will create one and add the specified files or patterns to the newly
2655
created file. The ignore command will also automatically add the
2656
.bzrignore file to be versioned. Creating a .bzrignore file without
2657
the use of the ignore command will require an explicit add command.
2658
2659
2579
To remove patterns from the ignore list, edit the .bzrignore file.
2660
2580
After adding, editing or deleting that file either indirectly by
2661
2581
using this command or directly by using an editor, be sure to commit
2662
2582
it.
2663
2664
Bazaar also supports a global ignore file ~/.bazaar/ignore. On Windows
2665
the global ignore file can be found in the application data directory as
2666
C:\\Documents and Settings\\<user>\\Application Data\\Bazaar\\2.0\\ignore.
2667
Global ignores are not touched by this command. The global ignore file
2668
can be edited directly using an editor.
2669
2670
Patterns prefixed with '!' are exceptions to ignore patterns and take
2671
precedence over regular ignores. Such exceptions are used to specify
2672
files that should be versioned which would otherwise be ignored.
2673
2674
Patterns prefixed with '!!' act as regular ignore patterns, but have
2675
precedence over the '!' exception patterns.
2676
2583
2677
2584
Note: ignore patterns containing shell wildcards must be quoted from
2678
2585
the shell on Unix.
2682
2589
2683
2590
bzr ignore ./Makefile
2684
2591
2685
Ignore .class files in all directories...::
2592
Ignore class files in all directories::
2686
2593
2687
2594
bzr ignore "*.class"
2688
2595
2689
...but do not ignore "special.class"::
2690
2691
bzr ignore "!special.class"
2692
2693
2596
Ignore .o files under the lib directory::
2694
2597
2695
2598
bzr ignore "lib/**/*.o"
2701
2604
Ignore everything but the "debian" toplevel directory::
2702
2605
2703
2606
bzr ignore "RE:(?!debian/).*"
2704
2705
Ignore everything except the "local" toplevel directory,
2706
but always ignore "*~" autosave files, even under local/::
2707
2708
bzr ignore "*"
2709
bzr ignore "!./local"
2710
bzr ignore "!!*~"
2711
2607
"""
2712
2608
2713
2609
_see_also = ['status', 'ignored', 'patterns']
2714
2610
takes_args = ['name_pattern*']
2715
2611
takes_options = [
2716
Option('default-rules',
2717
help='Display the default ignore rules that bzr uses.')
2612
Option('old-default-rules',
2613
help='Write out the ignore rules bzr < 0.9 always used.')
2718
2614
]
2719
2615
2720
def run(self, name_pattern_list=None, default_rules=None):
2616
def run(self, name_pattern_list=None, old_default_rules=None):
2721
2617
from bzrlib import ignores
2722
if default_rules is not None:
2723
# dump the default rules and exit
2724
for pattern in ignores.USER_DEFAULTS:
2725
self.outf.write("%s\n" % pattern)
2618
if old_default_rules is not None:
2619
# dump the rules and exit
2620
for pattern in ignores.OLD_DEFAULTS:
2621
print pattern
2726
2622
return
2727
2623
if not name_pattern_list:
2728
2624
raise errors.BzrCommandError("ignore requires at least one "
2729
"NAME_PATTERN or --default-rules.")
2625
"NAME_PATTERN or --old-default-rules")
2730
2626
name_pattern_list = [globbing.normalize_pattern(p)
2731
2627
for p in name_pattern_list]
2732
2628
for name_pattern in name_pattern_list:
2744
2640
if id is not None:
2745
2641
filename = entry[0]
2746
2642
if ignored.match(filename):
2747
matches.append(filename)
2643
matches.append(filename.encode('utf-8'))
2748
2644
tree.unlock()
2749
2645
if len(matches) > 0:
2750
self.outf.write("Warning: the following files are version controlled and"
2751
" match your ignore pattern:\n%s"
2752
"\nThese files will continue to be version controlled"
2753
" unless you 'bzr remove' them.\n" % ("\n".join(matches),))
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),)
2754
2650
2755
2651
2756
2652
class cmd_ignored(Command):
2757
__doc__ = """List ignored files and the patterns that matched them.
2653
"""List ignored files and the patterns that matched them.
2758
2654
2759
2655
List all the ignored files and the ignore pattern that caused the file to
2760
2656
be ignored.
2771
2667
def run(self):
2772
2668
tree = WorkingTree.open_containing(u'.')[0]
2773
2669
tree.lock_read()
2774
self.add_cleanup(tree.unlock)
2775
for path, file_class, kind, file_id, entry in tree.list_files():
2776
if file_class != 'I':
2777
continue
2778
## XXX: Slightly inefficient since this was already calculated
2779
pat = tree.is_ignored(path)
2780
self.outf.write('%-50s %s\n' % (path, pat))
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()
2781
2679
2782
2680
2783
2681
class cmd_lookup_revision(Command):
2784
__doc__ = """Lookup the revision-id from a revision-number
2682
"""Lookup the revision-id from a revision-number
2785
2683
2786
2684
:Examples:
2787
2685
bzr lookup-revision 33
2794
2692
try:
2795
2693
revno = int(revno)
2796
2694
except ValueError:
2797
raise errors.BzrCommandError("not a valid revision-number: %r"
2798
% revno)
2799
revid = WorkingTree.open_containing(u'.')[0].branch.get_rev_id(revno)
2800
self.outf.write("%s\n" % revid)
2695
raise errors.BzrCommandError("not a valid revision-number: %r" % revno)
2696
2697
print WorkingTree.open_containing(u'.')[0].branch.get_rev_id(revno)
2801
2698
2802
2699
2803
2700
class cmd_export(Command):
2804
__doc__ = """Export current or past revision to a destination directory or archive.
2701
"""Export current or past revision to a destination directory or archive.
2805
2702
2806
2703
If no revision is specified this exports the last committed revision.
2807
2704
2839
2736
Option('root',
2840
2737
type=str,
2841
2738
help="Name of the root directory inside the exported file."),
2842
Option('per-file-timestamps',
2843
help='Set modification time of files to that of the last '
2844
'revision in which it was changed.'),
2845
2739
]
2846
2740
def run(self, dest, branch_or_subdir=None, revision=None, format=None,
2847
root=None, filters=False, per_file_timestamps=False):
2741
root=None, filters=False):
2848
2742
from bzrlib.export import export
2849
2743
2850
2744
if branch_or_subdir is None:
2857
2751
2858
2752
rev_tree = _get_one_revision_tree('export', revision, branch=b, tree=tree)
2859
2753
try:
2860
export(rev_tree, dest, format, root, subdir, filtered=filters,
2861
per_file_timestamps=per_file_timestamps)
2754
export(rev_tree, dest, format, root, subdir, filtered=filters)
2862
2755
except errors.NoSuchExportFormat, e:
2863
2756
raise errors.BzrCommandError('Unsupported export format: %s' % e.format)
2864
2757
2865
2758
2866
2759
class cmd_cat(Command):
2867
__doc__ = """Write the contents of a file as of a given revision to standard output.
2760
"""Write the contents of a file as of a given revision to standard output.
2868
2761
2869
2762
If no revision is nominated, the last revision is used.
2870
2763
2891
2784
tree, branch, relpath = \
2892
2785
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
2893
2786
branch.lock_read()
2894
self.add_cleanup(branch.unlock)
2895
return self._run(tree, branch, relpath, filename, revision,
2896
name_from_revision, filters)
2787
try:
2788
return self._run(tree, branch, relpath, filename, revision,
2789
name_from_revision, filters)
2790
finally:
2791
branch.unlock()
2897
2792
2898
2793
def _run(self, tree, b, relpath, filename, revision, name_from_revision,
2899
2794
filtered):
2900
2795
if tree is None:
2901
2796
tree = b.basis_tree()
2902
2797
rev_tree = _get_one_revision_tree('cat', revision, branch=b)
2903
rev_tree.lock_read()
2904
self.add_cleanup(rev_tree.unlock)
2905
2798
2906
2799
old_file_id = rev_tree.path2id(relpath)
2907
2800
2942
2835
chunks = content.splitlines(True)
2943
2836
content = filtered_output_bytes(chunks, filters,
2944
2837
ContentFilterContext(relpath, rev_tree))
2945
self.cleanup_now()
2946
2838
self.outf.writelines(content)
2947
2839
else:
2948
self.cleanup_now()
2949
2840
self.outf.write(content)
2950
2841
2951
2842
2952
2843
class cmd_local_time_offset(Command):
2953
__doc__ = """Show the offset in seconds from GMT to local time."""
2844
"""Show the offset in seconds from GMT to local time."""
2954
2845
hidden = True
2955
2846
@display_command
2956
2847
def run(self):
2957
self.outf.write("%s\n" % osutils.local_time_offset())
2848
print osutils.local_time_offset()
2958
2849
2959
2850
2960
2851
2961
2852
class cmd_commit(Command):
2962
__doc__ = """Commit changes into a new revision.
2853
"""Commit changes into a new revision.
2963
2854
2964
2855
An explanatory message needs to be given for each commit. This is
2965
2856
often done by using the --message option (getting the message from the
3058
2949
Option('strict',
3059
2950
help="Refuse to commit if there are unknown "
3060
2951
"files in the working tree."),
3061
Option('commit-time', type=str,
3062
help="Manually set a commit time using commit date "
3063
"format, e.g. '2009-10-10 08:00:00 +0100'."),
3064
2952
ListOption('fixes', type=str,
3065
2953
help="Mark a bug as being fixed by this revision "
3066
2954
"(see \"bzr help bugs\")."),
3073
2961
"the master branch until a normal commit "
3074
2962
"is performed."
3075
2963
),
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.'),
2964
Option('show-diff',
2965
help='When no message is supplied, show the diff along'
2966
' with the status summary in the message editor.'),
3079
2967
]
3080
2968
aliases = ['ci', 'checkin']
3081
2969
3100
2988
3101
2989
def run(self, message=None, file=None, verbose=False, selected_list=None,
3102
2990
unchanged=False, strict=False, local=False, fixes=None,
3103
author=None, show_diff=False, exclude=None, commit_time=None):
2991
author=None, show_diff=False, exclude=None):
3104
2992
from bzrlib.errors import (
3105
2993
PointlessCommit,
3106
2994
ConflictsInTree,
3112
3000
make_commit_message_template_encoded
3113
3001
)
3114
3002
3115
commit_stamp = offset = None
3116
if commit_time is not None:
3117
try:
3118
commit_stamp, offset = timestamp.parse_patch_date(commit_time)
3119
except ValueError, e:
3120
raise errors.BzrCommandError(
3121
"Could not parse --commit-time: " + str(e))
3122
3123
3003
# TODO: Need a blackbox test for invoking the external editor; may be
3124
3004
# slightly problematic to run this cross-platform.
3125
3005
3145
3025
if local and not tree.branch.get_bound_location():
3146
3026
raise errors.LocalRequiresBoundBranch()
3147
3027
3148
if message is not None:
3149
try:
3150
file_exists = osutils.lexists(message)
3151
except UnicodeError:
3152
# The commit message contains unicode characters that can't be
3153
# represented in the filesystem encoding, so that can't be a
3154
# file.
3155
file_exists = False
3156
if file_exists:
3157
warning_msg = (
3158
'The commit message is a file name: "%(f)s".\n'
3159
'(use --file "%(f)s" to take commit message from that file)'
3160
% { 'f': message })
3161
ui.ui_factory.show_warning(warning_msg)
3162
if '\r' in message:
3163
message = message.replace('\r\n', '\n')
3164
message = message.replace('\r', '\n')
3165
if file:
3166
raise errors.BzrCommandError(
3167
"please specify either --message or --file")
3168
3169
3028
def get_message(commit_obj):
3170
3029
"""Callback to get commit message"""
3171
if file:
3172
my_message = codecs.open(
3173
file, 'rt', osutils.get_user_encoding()).read()
3174
elif message is not None:
3175
my_message = message
3176
else:
3177
# No message supplied: make one up.
3178
# text is the status of the tree
3179
text = make_commit_message_template_encoded(tree,
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,
3180
3036
selected_list, diff=show_diff,
3181
3037
output_encoding=osutils.get_user_encoding())
3182
# start_message is the template generated from hooks
3183
# XXX: Warning - looks like hooks return unicode,
3184
# make_commit_message_template_encoded returns user encoding.
3185
# We probably want to be using edit_commit_message instead to
3186
# avoid this.
3187
3038
start_message = generate_commit_message_template(commit_obj)
3188
my_message = edit_commit_message_encoded(text,
3039
my_message = edit_commit_message_encoded(t,
3189
3040
start_message=start_message)
3190
3041
if my_message is None:
3191
3042
raise errors.BzrCommandError("please specify a commit"
3192
3043
" 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()
3193
3050
if my_message == "":
3194
3051
raise errors.BzrCommandError("empty commit message specified")
3195
3052
return my_message
3203
3060
specific_files=selected_list,
3204
3061
allow_pointless=unchanged, strict=strict, local=local,
3205
3062
reporter=None, verbose=verbose, revprops=properties,
3206
authors=author, timestamp=commit_stamp,
3207
timezone=offset,
3063
authors=author,
3208
3064
exclude=safe_relpath_files(tree, exclude))
3209
3065
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
3210
3068
raise errors.BzrCommandError("No changes to commit."
3211
3069
" Use --unchanged to commit anyhow.")
3212
3070
except ConflictsInTree:
3217
3075
raise errors.BzrCommandError("Commit refused because there are"
3218
3076
" unknown files in the working tree.")
3219
3077
except errors.BoundBranchOutOfDate, e:
3220
e.extra_help = ("\n"
3221
'To commit to master branch, run update and then commit.\n'
3222
'You can also pass --local to commit to continue working '
3223
'disconnected.')
3224
raise
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.')
3225
3082
3226
3083
3227
3084
class cmd_check(Command):
3228
__doc__ = """Validate working tree structure, branch consistency and repository history.
3085
"""Validate working tree structure, branch consistency and repository history.
3229
3086
3230
3087
This command checks various invariants about branch and repository storage
3231
3088
to detect data corruption or bzr bugs.
3295
3152
3296
3153
3297
3154
class cmd_upgrade(Command):
3298
__doc__ = """Upgrade branch storage to current format.
3155
"""Upgrade branch storage to current format.
3299
3156
3300
3157
The check command or bzr developers may sometimes advise you to run
3301
3158
this command. When the default format has changed you may also be warned
3319
3176
3320
3177
3321
3178
class cmd_whoami(Command):
3322
__doc__ = """Show or set bzr user id.
3179
"""Show or set bzr user id.
3323
3180
3324
3181
:Examples:
3325
3182
Show the email of the current user::
3369
3226
3370
3227
3371
3228
class cmd_nick(Command):
3372
__doc__ = """Print or set the branch nickname.
3229
"""Print or set the branch nickname.
3373
3230
3374
3231
If unset, the tree root directory name is used as the nickname.
3375
3232
To print the current nickname, execute with no argument.
3389
3246
3390
3247
@display_command
3391
3248
def printme(self, branch):
3392
self.outf.write('%s\n' % branch.nick)
3249
print branch.nick
3393
3250
3394
3251
3395
3252
class cmd_alias(Command):
3396
__doc__ = """Set/unset and display aliases.
3253
"""Set/unset and display aliases.
3397
3254
3398
3255
:Examples:
3399
3256
Show the current aliases::
3463
3320
3464
3321
3465
3322
class cmd_selftest(Command):
3466
__doc__ = """Run internal test suite.
3323
"""Run internal test suite.
3467
3324
3468
3325
If arguments are given, they are regular expressions that say which tests
3469
3326
should run. Tests matching any expression are run, and other tests are
3513
3370
def get_transport_type(typestring):
3514
3371
"""Parse and return a transport specifier."""
3515
3372
if typestring == "sftp":
3516
from bzrlib.tests import stub_sftp
3517
return stub_sftp.SFTPAbsoluteServer
3373
from bzrlib.transport.sftp import SFTPAbsoluteServer
3374
return SFTPAbsoluteServer
3518
3375
if typestring == "memory":
3519
from bzrlib.tests import test_server
3520
return memory.MemoryServer
3376
from bzrlib.transport.memory import MemoryServer
3377
return MemoryServer
3521
3378
if typestring == "fakenfs":
3522
from bzrlib.tests import test_server
3523
return test_server.FakeNFSServer
3379
from bzrlib.transport.fakenfs import FakeNFSServer
3380
return FakeNFSServer
3524
3381
msg = "No known transport type %s. Supported types are: sftp\n" %\
3525
3382
(typestring)
3526
3383
raise errors.BzrCommandError(msg)
3610
3467
raise errors.BzrCommandError("subunit not available. subunit "
3611
3468
"needs to be installed to use --subunit.")
3612
3469
self.additional_selftest_args['runner_class'] = SubUnitBzrRunner
3613
# On Windows, disable automatic conversion of '\n' to '\r\n' in
3614
# stdout, which would corrupt the subunit stream.
3615
if sys.platform == "win32" and sys.stdout.fileno() >= 0:
3616
import msvcrt
3617
msvcrt.setmode(sys.stdout.fileno(), os.O_BINARY)
3618
3470
if parallel:
3619
3471
self.additional_selftest_args.setdefault(
3620
3472
'suite_decorators', []).append(parallel)
3624
3476
verbose = not is_quiet()
3625
3477
# TODO: should possibly lock the history file...
3626
3478
benchfile = open(".perf_history", "at", buffering=1)
3627
self.add_cleanup(benchfile.close)
3628
3479
else:
3629
3480
test_suite_factory = None
3630
3481
benchfile = None
3631
selftest_kwargs = {"verbose": verbose,
3632
"pattern": pattern,
3633
"stop_on_failure": one,
3634
"transport": transport,
3635
"test_suite_factory": test_suite_factory,
3636
"lsprof_timed": lsprof_timed,
3637
"lsprof_tests": lsprof_tests,
3638
"bench_history": benchfile,
3639
"matching_tests_first": first,
3640
"list_only": list_only,
3641
"random_seed": randomize,
3642
"exclude_pattern": exclude,
3643
"strict": strict,
3644
"load_list": load_list,
3645
"debug_flags": debugflag,
3646
"starting_with": starting_with
3647
}
3648
selftest_kwargs.update(self.additional_selftest_args)
3649
result = selftest(**selftest_kwargs)
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()
3650
3505
return int(not result)
3651
3506
3652
3507
3653
3508
class cmd_version(Command):
3654
__doc__ = """Show version of bzr."""
3509
"""Show version of bzr."""
3655
3510
3656
3511
encoding_type = 'replace'
3657
3512
takes_options = [
3668
3523
3669
3524
3670
3525
class cmd_rocks(Command):
3671
__doc__ = """Statement of optimism."""
3526
"""Statement of optimism."""
3672
3527
3673
3528
hidden = True
3674
3529
3675
3530
@display_command
3676
3531
def run(self):
3677
self.outf.write("It sure does!\n")
3532
print "It sure does!"
3678
3533
3679
3534
3680
3535
class cmd_find_merge_base(Command):
3681
__doc__ = """Find and print a base revision for merging two branches."""
3536
"""Find and print a base revision for merging two branches."""
3682
3537
# TODO: Options to specify revisions on either side, as if
3683
3538
# merging only part of the history.
3684
3539
takes_args = ['branch', 'other']
3691
3546
branch1 = Branch.open_containing(branch)[0]
3692
3547
branch2 = Branch.open_containing(other)[0]
3693
3548
branch1.lock_read()
3694
self.add_cleanup(branch1.unlock)
3695
branch2.lock_read()
3696
self.add_cleanup(branch2.unlock)
3697
last1 = ensure_null(branch1.last_revision())
3698
last2 = ensure_null(branch2.last_revision())
3699
3700
graph = branch1.repository.get_graph(branch2.repository)
3701
base_rev_id = graph.find_unique_lca(last1, last2)
3702
3703
self.outf.write('merge base is revision %s\n' % base_rev_id)
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()
3704
3563
3705
3564
3706
3565
class cmd_merge(Command):
3707
__doc__ = """Perform a three-way merge.
3566
"""Perform a three-way merge.
3708
3567
3709
3568
The source of the merge can be specified either in the form of a branch,
3710
3569
or in the form of a path to a file containing a merge directive generated
3739
3598
committed to record the result of the merge.
3740
3599
3741
3600
merge refuses to run if there are any uncommitted changes, unless
3742
--force is given. The --force option can also be used to create a
3743
merge revision which has more than two parents.
3744
3745
If one would like to merge changes from the working tree of the other
3746
branch without merging any committed revisions, the --uncommitted option
3747
can be given.
3601
--force is given.
3748
3602
3749
3603
To select only some changes to merge, use "merge -i", which will prompt
3750
3604
you to apply each diff hunk and file change, similar to "shelve".
3762
3616
3763
3617
bzr merge -r 81..82 ../bzr.dev
3764
3618
3765
To apply a merge directive contained in /tmp/merge::
3619
To apply a merge directive contained in /tmp/merge:
3766
3620
3767
3621
bzr merge /tmp/merge
3768
3769
To create a merge revision with three parents from two branches
3770
feature1a and feature1b:
3771
3772
bzr merge ../feature1a
3773
bzr merge ../feature1b --force
3774
bzr commit -m 'revision with three parents'
3775
3622
"""
3776
3623
3777
3624
encoding_type = 'exact'
3835
3682
view_info = _get_view_info_for_change_reporter(tree)
3836
3683
change_reporter = delta._ChangeReporter(
3837
3684
unversioned_filter=tree.is_ignored, view_info=view_info)
3838
pb = ui.ui_factory.nested_progress_bar()
3839
self.add_cleanup(pb.finished)
3840
tree.lock_write()
3841
self.add_cleanup(tree.unlock)
3842
if location is not None:
3843
try:
3844
mergeable = bundle.read_mergeable_from_url(location,
3845
possible_transports=possible_transports)
3846
except errors.NotABundle:
3847
mergeable = None
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.')
3727
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)
3848
3744
else:
3849
if uncommitted:
3850
raise errors.BzrCommandError('Cannot use --uncommitted'
3851
' with bundles or merge directives.')
3852
3853
if revision is not None:
3854
raise errors.BzrCommandError(
3855
'Cannot use -r with merge directives or bundles')
3856
merger, verified = _mod_merge.Merger.from_mergeable(tree,
3857
mergeable, None)
3858
3859
if merger is None and uncommitted:
3860
if revision is not None and len(revision) > 0:
3861
raise errors.BzrCommandError('Cannot use --uncommitted and'
3862
' --revision at the same time.')
3863
merger = self.get_merger_from_uncommitted(tree, location, None)
3864
allow_pending = False
3865
3866
if merger is None:
3867
merger, allow_pending = self._get_merger_from_branch(tree,
3868
location, revision, remember, possible_transports, None)
3869
3870
merger.merge_type = merge_type
3871
merger.reprocess = reprocess
3872
merger.show_base = show_base
3873
self.sanity_check_merger(merger)
3874
if (merger.base_rev_id == merger.other_rev_id and
3875
merger.other_rev_id is not None):
3876
note('Nothing to do.')
3877
return 0
3878
if pull:
3879
if merger.interesting_files is not None:
3880
raise errors.BzrCommandError('Cannot pull individual files')
3881
if (merger.base_rev_id == tree.last_revision()):
3882
result = tree.pull(merger.other_branch, False,
3883
merger.other_rev_id)
3884
result.report(self.outf)
3885
return 0
3886
if merger.this_basis is None:
3887
raise errors.BzrCommandError(
3888
"This branch has no commits."
3889
" (perhaps you would prefer 'bzr pull')")
3890
if preview:
3891
return self._do_preview(merger)
3892
elif interactive:
3893
return self._do_interactive(merger)
3894
else:
3895
return self._do_merge(merger, change_reporter, allow_pending,
3896
verified)
3897
3898
def _get_preview(self, merger):
3745
return self._do_merge(merger, change_reporter, allow_pending,
3746
verified)
3747
finally:
3748
for cleanup in reversed(cleanups):
3749
cleanup()
3750
3751
def _get_preview(self, merger, cleanups):
3899
3752
tree_merger = merger.make_merger()
3900
3753
tt = tree_merger.make_preview_transform()
3901
self.add_cleanup(tt.finalize)
3754
cleanups.append(tt.finalize)
3902
3755
result_tree = tt.get_preview_tree()
3903
3756
return result_tree
3904
3757
3905
def _do_preview(self, merger):
3758
def _do_preview(self, merger, cleanups):
3906
3759
from bzrlib.diff import show_diff_trees
3907
result_tree = self._get_preview(merger)
3760
result_tree = self._get_preview(merger, cleanups)
3908
3761
show_diff_trees(merger.this_tree, result_tree, self.outf,
3909
3762
old_label='', new_label='')
3910
3763
3920
3773
else:
3921
3774
return 0
3922
3775
3923
def _do_interactive(self, merger):
3776
def _do_interactive(self, merger, cleanups):
3924
3777
"""Perform an interactive merge.
3925
3778
3926
3779
This works by generating a preview tree of the merge, then using
3928
3781
and the preview tree.
3929
3782
"""
3930
3783
from bzrlib import shelf_ui
3931
result_tree = self._get_preview(merger)
3784
result_tree = self._get_preview(merger, cleanups)
3932
3785
writer = bzrlib.option.diff_writer_registry.get()
3933
3786
shelver = shelf_ui.Shelver(merger.this_tree, result_tree, destroy=True,
3934
3787
reporter=shelf_ui.ApplyReporter(),
3935
3788
diff_writer=writer(sys.stdout))
3936
try:
3937
shelver.run()
3938
finally:
3939
shelver.finalize()
3789
shelver.run()
3940
3790
3941
3791
def sanity_check_merger(self, merger):
3942
3792
if (merger.show_base and
4002
3852
allow_pending = True
4003
3853
return merger, allow_pending
4004
3854
4005
def get_merger_from_uncommitted(self, tree, location, pb):
3855
def get_merger_from_uncommitted(self, tree, location, pb, cleanups):
4006
3856
"""Get a merger for uncommitted changes.
4007
3857
4008
3858
:param tree: The tree the merger should apply to.
4009
3859
:param location: The location containing uncommitted changes.
4010
3860
: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.
4011
3863
"""
4012
3864
location = self._select_branch_location(tree, location)[0]
4013
3865
other_tree, other_path = WorkingTree.open_containing(location)
4065
3917
4066
3918
4067
3919
class cmd_remerge(Command):
4068
__doc__ = """Redo a merge.
3920
"""Redo a merge.
4069
3921
4070
3922
Use this if you want to try a different merge technique while resolving
4071
3923
conflicts. Some merge techniques are better than others, and remerge
4096
3948
4097
3949
def run(self, file_list=None, merge_type=None, show_base=False,
4098
3950
reprocess=False):
4099
from bzrlib.conflicts import restore
4100
3951
if merge_type is None:
4101
3952
merge_type = _mod_merge.Merge3Merger
4102
3953
tree, file_list = tree_files(file_list)
4103
3954
tree.lock_write()
4104
self.add_cleanup(tree.unlock)
4105
parents = tree.get_parent_ids()
4106
if len(parents) != 2:
4107
raise errors.BzrCommandError("Sorry, remerge only works after normal"
4108
" merges. Not cherrypicking or"
4109
" multi-merges.")
4110
repository = tree.branch.repository
4111
interesting_ids = None
4112
new_conflicts = []
4113
conflicts = tree.conflicts()
4114
if file_list is not None:
4115
interesting_ids = set()
4116
for filename in file_list:
4117
file_id = tree.path2id(filename)
4118
if file_id is None:
4119
raise errors.NotVersionedError(filename)
4120
interesting_ids.add(file_id)
4121
if tree.kind(file_id) != "directory":
4122
continue
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
4123
3974
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:
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])
4137
3999
try:
4138
restore(tree.abspath(filename))
4139
except errors.NotConflicted:
4140
pass
4141
# Disable pending merges, because the file texts we are remerging
4142
# have not had those merges performed. If we use the wrong parents
4143
# list, we imply that the working tree text has seen and rejected
4144
# all the changes from the other tree, when in fact those changes
4145
# have not yet been seen.
4146
tree.set_parent_ids(parents[:1])
4147
try:
4148
merger = _mod_merge.Merger.from_revision_ids(None, tree, parents[1])
4149
merger.interesting_ids = interesting_ids
4150
merger.merge_type = merge_type
4151
merger.show_base = show_base
4152
merger.reprocess = reprocess
4153
conflicts = merger.do_merge()
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()
4154
4010
finally:
4155
tree.set_parent_ids(parents)
4011
tree.unlock()
4156
4012
if conflicts > 0:
4157
4013
return 1
4158
4014
else:
4160
4016
4161
4017
4162
4018
class cmd_revert(Command):
4163
__doc__ = """Revert files to a previous revision.
4019
"""Revert files to a previous revision.
4164
4020
4165
4021
Giving a list of files will revert only those files. Otherwise, all files
4166
4022
will be reverted. If the revision is not specified with '--revision', the
4180
4036
name. If you name a directory, all the contents of that directory will be
4181
4037
reverted.
4182
4038
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.
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.
4187
4042
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
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
4195
4049
reverting any files.
4196
4197
Using "bzr revert --forget-merges", it is possible to apply all of the
4198
changes from a branch in a single revision. To do this, perform the merge
4199
as desired. Then doing revert with the "--forget-merges" option will keep
4200
the content of the tree as it was, but it will clear the list of pending
4201
merges. The next commit will then contain all of the changes that are
4202
present in the other branch, but without any other parent revisions.
4203
Because this technique forgets where these changes originated, it may
4204
cause additional conflicts on later merges involving the same source and
4205
target branches.
4206
4050
"""
4207
4051
4208
4052
_see_also = ['cat', 'export']
4217
4061
def run(self, revision=None, no_backup=False, file_list=None,
4218
4062
forget_merges=None):
4219
4063
tree, file_list = tree_files(file_list)
4220
tree.lock_tree_write()
4221
self.add_cleanup(tree.unlock)
4222
if forget_merges:
4223
tree.set_parent_ids(tree.get_parent_ids()[:1])
4224
else:
4225
self._revert_tree_to_revision(tree, revision, file_list, no_backup)
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()
4226
4072
4227
4073
@staticmethod
4228
4074
def _revert_tree_to_revision(tree, revision, file_list, no_backup):
4229
4075
rev_tree = _get_one_revision_tree('revert', revision, tree=tree)
4230
tree.revert(file_list, rev_tree, not no_backup, None,
4231
report_changes=True)
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()
4232
4082
4233
4083
4234
4084
class cmd_assert_fail(Command):
4235
__doc__ = """Test reporting of assertion failures"""
4085
"""Test reporting of assertion failures"""
4236
4086
# intended just for use in testing
4237
4087
4238
4088
hidden = True
4242
4092
4243
4093
4244
4094
class cmd_help(Command):
4245
__doc__ = """Show help on a command or other topic.
4095
"""Show help on a command or other topic.
4246
4096
"""
4247
4097
4248
4098
_see_also = ['topics']
4261
4111
4262
4112
4263
4113
class cmd_shell_complete(Command):
4264
__doc__ = """Show appropriate completions for context.
4114
"""Show appropriate completions for context.
4265
4115
4266
4116
For a list of all available commands, say 'bzr shell-complete'.
4267
4117
"""
4276
4126
4277
4127
4278
4128
class cmd_missing(Command):
4279
__doc__ = """Show unmerged/unpulled revisions between two branches.
4129
"""Show unmerged/unpulled revisions between two branches.
4280
4130
4281
4131
OTHER_BRANCH may be local or remote.
4282
4132
4283
4133
To filter on a range of revisions, you can use the command -r begin..end
4284
4134
-r revision requests a specific revision, -r ..end or -r begin.. are
4285
4135
also valid.
4286
4287
:Exit values:
4288
1 - some missing revisions
4289
0 - no missing revisions
4290
4136
4291
4137
:Examples:
4292
4138
4360
4206
restrict = 'remote'
4361
4207
4362
4208
local_branch = Branch.open_containing(u".")[0]
4363
local_branch.lock_read()
4364
self.add_cleanup(local_branch.unlock)
4365
4366
4209
parent = local_branch.get_parent()
4367
4210
if other_branch is None:
4368
4211
other_branch = parent
4377
4220
remote_branch = Branch.open(other_branch)
4378
4221
if remote_branch.base == local_branch.base:
4379
4222
remote_branch = local_branch
4380
else:
4381
remote_branch.lock_read()
4382
self.add_cleanup(remote_branch.unlock)
4383
4223
4384
4224
local_revid_range = _revision_range_to_revid_range(
4385
4225
_get_revision_range(my_revision, local_branch,
4389
4229
_get_revision_range(revision,
4390
4230
remote_branch, self.name()))
4391
4231
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()
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()
4442
4289
if not status_code and parent is None and other_branch is not None:
4443
4290
local_branch.lock_write()
4444
self.add_cleanup(local_branch.unlock)
4445
# handle race conditions - a parent might be set while we run.
4446
if local_branch.get_parent() is None:
4447
local_branch.set_parent(remote_branch.base)
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()
4448
4297
return status_code
4449
4298
4450
4299
4451
4300
class cmd_pack(Command):
4452
__doc__ = """Compress the data within a repository.
4453
4454
This operation compresses the data within a bazaar repository. As
4455
bazaar supports automatic packing of repository, this operation is
4456
normally not required to be done manually.
4457
4458
During the pack operation, bazaar takes a backup of existing repository
4459
data, i.e. pack files. This backup is eventually removed by bazaar
4460
automatically when it is safe to do so. To save disk space by removing
4461
the backed up pack files, the --clean-obsolete-packs option may be
4462
used.
4463
4464
Warning: If you use --clean-obsolete-packs and your machine crashes
4465
during or immediately after repacking, you may be left with a state
4466
where the deletion has been written to disk but the new packs have not
4467
been. In this case the repository may be unusable.
4468
"""
4301
"""Compress the data within a repository."""
4469
4302
4470
4303
_see_also = ['repositories']
4471
4304
takes_args = ['branch_or_repo?']
4472
takes_options = [
4473
Option('clean-obsolete-packs', 'Delete obsolete packs to save disk space.'),
4474
]
4475
4305
4476
def run(self, branch_or_repo='.', clean_obsolete_packs=False):
4306
def run(self, branch_or_repo='.'):
4477
4307
dir = bzrdir.BzrDir.open_containing(branch_or_repo)[0]
4478
4308
try:
4479
4309
branch = dir.open_branch()
4480
4310
repository = branch.repository
4481
4311
except errors.NotBranchError:
4482
4312
repository = dir.open_repository()
4483
repository.pack(clean_obsolete_packs=clean_obsolete_packs)
4313
repository.pack()
4484
4314
4485
4315
4486
4316
class cmd_plugins(Command):
4487
__doc__ = """List the installed plugins.
4317
"""List the installed plugins.
4488
4318
4489
4319
This command displays the list of installed plugins including
4490
4320
version of plugin and a short description of each.
4497
4327
adding new commands, providing additional network transports and
4498
4328
customizing log output.
4499
4329
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.
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.
4504
4334
"""
4505
4335
takes_options = ['verbose']
4506
4336
4521
4351
doc = '(no description)'
4522
4352
result.append((name_ver, doc, plugin.path()))
4523
4353
for name_ver, doc, path in sorted(result):
4524
self.outf.write("%s\n" % name_ver)
4525
self.outf.write(" %s\n" % doc)
4354
print name_ver
4355
print ' ', doc
4526
4356
if verbose:
4527
self.outf.write(" %s\n" % path)
4528
self.outf.write("\n")
4357
print ' ', path
4358
print
4529
4359
4530
4360
4531
4361
class cmd_testament(Command):
4532
__doc__ = """Show testament (signing-form) of a revision."""
4362
"""Show testament (signing-form) of a revision."""
4533
4363
takes_options = [
4534
4364
'revision',
4535
4365
Option('long', help='Produce long-format testament.'),
4548
4378
else:
4549
4379
b = Branch.open(branch)
4550
4380
b.lock_read()
4551
self.add_cleanup(b.unlock)
4552
if revision is None:
4553
rev_id = b.last_revision()
4554
else:
4555
rev_id = revision[0].as_revision_id(b)
4556
t = testament_class.from_revision(b.repository, rev_id)
4557
if long:
4558
sys.stdout.writelines(t.as_text_lines())
4559
else:
4560
sys.stdout.write(t.as_short_text())
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()
4561
4393
4562
4394
4563
4395
class cmd_annotate(Command):
4564
__doc__ = """Show the origin of each line in a file.
4396
"""Show the origin of each line in a file.
4565
4397
4566
4398
This prints out the given file with an annotation on the left side
4567
4399
indicating which revision, author and date introduced the change.
4589
4421
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
4590
4422
if wt is not None:
4591
4423
wt.lock_read()
4592
self.add_cleanup(wt.unlock)
4593
4424
else:
4594
4425
branch.lock_read()
4595
self.add_cleanup(branch.unlock)
4596
tree = _get_one_revision_tree('annotate', revision, branch=branch)
4597
tree.lock_read()
4598
self.add_cleanup(tree.unlock)
4599
if wt is not None:
4600
file_id = wt.path2id(relpath)
4601
else:
4602
file_id = tree.path2id(relpath)
4603
if file_id is None:
4604
raise errors.NotVersionedError(filename)
4605
file_version = tree.inventory[file_id].revision
4606
if wt is not None and revision is None:
4607
# If there is a tree and we're not annotating historical
4608
# versions, annotate the working tree's content.
4609
annotate_file_tree(wt, file_id, self.outf, long, all,
4610
show_ids=show_ids)
4611
else:
4612
annotate_file(branch, file_version, file_id, long, all, self.outf,
4613
show_ids=show_ids)
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()
4614
4448
4615
4449
4616
4450
class cmd_re_sign(Command):
4617
__doc__ = """Create a digital signature for an existing revision."""
4451
"""Create a digital signature for an existing revision."""
4618
4452
# TODO be able to replace existing ones.
4619
4453
4620
4454
hidden = True # is this right ?
4628
4462
raise errors.BzrCommandError('You must supply either --revision or a revision_id')
4629
4463
b = WorkingTree.open_containing(u'.')[0].branch
4630
4464
b.lock_write()
4631
self.add_cleanup(b.unlock)
4632
return self._run(b, revision_id_list, revision)
4465
try:
4466
return self._run(b, revision_id_list, revision)
4467
finally:
4468
b.unlock()
4633
4469
4634
4470
def _run(self, b, revision_id_list, revision):
4635
4471
import bzrlib.gpg as gpg
4680
4516
4681
4517
4682
4518
class cmd_bind(Command):
4683
__doc__ = """Convert the current branch into a checkout of the supplied branch.
4684
If no branch is supplied, rebind to the last bound location.
4519
"""Convert the current branch into a checkout of the supplied branch.
4685
4520
4686
4521
Once converted into a checkout, commits must succeed on the master branch
4687
4522
before they will be applied to the local branch.
4705
4540
'This format does not remember old locations.')
4706
4541
else:
4707
4542
if location is None:
4708
if b.get_bound_location() is not None:
4709
raise errors.BzrCommandError('Branch is already bound')
4710
else:
4711
raise errors.BzrCommandError('No location supplied '
4712
'and no previous location known')
4543
raise errors.BzrCommandError('No location supplied and no '
4544
'previous location known')
4713
4545
b_other = Branch.open(location)
4714
4546
try:
4715
4547
b.bind(b_other)
4721
4553
4722
4554
4723
4555
class cmd_unbind(Command):
4724
__doc__ = """Convert the current checkout into a regular branch.
4556
"""Convert the current checkout into a regular branch.
4725
4557
4726
4558
After unbinding, the local branch is considered independent and subsequent
4727
4559
commits will be local only.
4738
4570
4739
4571
4740
4572
class cmd_uncommit(Command):
4741
__doc__ = """Remove the last committed revision.
4573
"""Remove the last committed revision.
4742
4574
4743
4575
--verbose will print out what is being removed.
4744
4576
--dry-run will go through all the motions, but not actually
4785
4617
4786
4618
if tree is not None:
4787
4619
tree.lock_write()
4788
self.add_cleanup(tree.unlock)
4789
4620
else:
4790
4621
b.lock_write()
4791
self.add_cleanup(b.unlock)
4792
return self._run(b, tree, dry_run, verbose, revision, force, local=local)
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()
4793
4630
4794
4631
def _run(self, b, tree, dry_run, verbose, revision, force, local=False):
4795
4632
from bzrlib.log import log_formatter, show_log
4827
4664
end_revision=last_revno)
4828
4665
4829
4666
if dry_run:
4830
self.outf.write('Dry-run, pretending to remove'
4831
' the above revisions.\n')
4667
print 'Dry-run, pretending to remove the above revisions.'
4668
if not force:
4669
val = raw_input('Press <enter> to continue')
4832
4670
else:
4833
self.outf.write('The above revision(s) will be removed.\n')
4834
4835
if not force:
4836
if not ui.ui_factory.get_boolean('Are you sure'):
4837
self.outf.write('Canceled')
4838
return 0
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
4839
4677
4840
4678
mutter('Uncommitting from {%s} to {%s}',
4841
4679
last_rev_id, rev_id)
4842
4680
uncommit(b, tree=tree, dry_run=dry_run, verbose=verbose,
4843
4681
revno=revno, local=local)
4844
self.outf.write('You can restore the old tip by running:\n'
4845
' bzr pull . -r revid:%s\n' % last_rev_id)
4682
note('You can restore the old tip by running:\n'
4683
' bzr pull . -r revid:%s', last_rev_id)
4846
4684
4847
4685
4848
4686
class cmd_break_lock(Command):
4849
__doc__ = """Break a dead lock on a repository, branch or working directory.
4687
"""Break a dead lock on a repository, branch or working directory.
4850
4688
4851
4689
CAUTION: Locks should only be broken when you are sure that the process
4852
4690
holding the lock has been stopped.
4853
4691
4854
You can get information on what locks are open via the 'bzr info
4855
[location]' command.
4692
You can get information on what locks are open via the 'bzr info' command.
4856
4693
4857
4694
:Examples:
4858
4695
bzr break-lock
4859
bzr break-lock bzr+ssh://example.com/bzr/foo
4860
4696
"""
4861
4697
takes_args = ['location?']
4862
4698
4871
4707
4872
4708
4873
4709
class cmd_wait_until_signalled(Command):
4874
__doc__ = """Test helper for test_start_and_stop_bzr_subprocess_send_signal.
4710
"""Test helper for test_start_and_stop_bzr_subprocess_send_signal.
4875
4711
4876
4712
This just prints a line to signal when it is ready, then blocks on stdin.
4877
4713
"""
4885
4721
4886
4722
4887
4723
class cmd_serve(Command):
4888
__doc__ = """Run the bzr server."""
4724
"""Run the bzr server."""
4889
4725
4890
4726
aliases = ['server']
4891
4727
4892
4728
takes_options = [
4893
4729
Option('inet',
4894
4730
help='Serve on stdin/out for use from inetd or sshd.'),
4895
RegistryOption('protocol',
4896
help="Protocol to serve.",
4731
RegistryOption('protocol',
4732
help="Protocol to serve.",
4897
4733
lazy_registry=('bzrlib.transport', 'transport_server_registry'),
4898
4734
value_switches=True),
4899
4735
Option('port',
4908
4744
Option('allow-writes',
4909
4745
help='By default the server is a readonly server. Supplying '
4910
4746
'--allow-writes enables write access to the contents of '
4911
'the served directory and below. Note that ``bzr serve`` '
4912
'does not perform authentication, so unless some form of '
4913
'external authentication is arranged supplying this '
4914
'option leads to global uncontrolled write access to your '
4915
'file system.'
4747
'the served directory and below.'
4916
4748
),
4917
4749
]
4918
4750
4951
4783
4952
4784
4953
4785
class cmd_join(Command):
4954
__doc__ = """Combine a tree into its containing tree.
4786
"""Combine a tree into its containing tree.
4955
4787
4956
4788
This command requires the target tree to be in a rich-root format.
4957
4789
4997
4829
4998
4830
4999
4831
class cmd_split(Command):
5000
__doc__ = """Split a subdirectory of a tree into a separate tree.
4832
"""Split a subdirectory of a tree into a separate tree.
5001
4833
5002
4834
This command will produce a target tree in a format that supports
5003
4835
rich roots, like 'rich-root' or 'rich-root-pack'. These formats cannot be
5023
4855
5024
4856
5025
4857
class cmd_merge_directive(Command):
5026
__doc__ = """Generate a merge directive for auto-merge tools.
4858
"""Generate a merge directive for auto-merge tools.
5027
4859
5028
4860
A directive requests a merge to be performed, and also provides all the
5029
4861
information necessary to do so. This means it must either include a
5122
4954
5123
4955
5124
4956
class cmd_send(Command):
5125
__doc__ = """Mail or create a merge-directive for submitting changes.
4957
"""Mail or create a merge-directive for submitting changes.
5126
4958
5127
4959
A merge directive provides many things needed for requesting merges:
5128
4960
5134
4966
directly from the merge directive, without retrieving data from a
5135
4967
branch.
5136
4968
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.
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.
5163
4981
5164
4982
Mail is sent using your preferred mail program. This should be transparent
5165
4983
on Windows (it uses MAPI). On Linux, it requires the xdg-email utility.
5185
5003
5186
5004
The merge directives created by bzr send may be applied using bzr merge or
5187
5005
bzr pull by specifying a file containing a merge directive as the location.
5188
5189
bzr send makes extensive use of public locations to map local locations into
5190
URLs that can be used by other people. See `bzr help configuration` to
5191
set them, and use `bzr info` to display them.
5192
5006
"""
5193
5007
5194
5008
encoding_type = 'exact'
5210
5024
short_name='f',
5211
5025
type=unicode),
5212
5026
Option('output', short_name='o',
5213
help='Write merge directive to this file or directory; '
5027
help='Write merge directive to this file; '
5214
5028
'use - for stdout.',
5215
5029
type=unicode),
5216
5030
Option('strict',
5239
5053
5240
5054
5241
5055
class cmd_bundle_revisions(cmd_send):
5242
__doc__ = """Create a merge-directive for submitting changes.
5056
"""Create a merge-directive for submitting changes.
5243
5057
5244
5058
A merge directive provides many things needed for requesting merges:
5245
5059
5312
5126
5313
5127
5314
5128
class cmd_tag(Command):
5315
__doc__ = """Create, remove or modify a tag naming a revision.
5129
"""Create, remove or modify a tag naming a revision.
5316
5130
5317
5131
Tags give human-meaningful names to revisions. Commands that take a -r
5318
5132
(--revision) option can be given -rtag:X, where X is any previously
5326
5140
5327
5141
To rename a tag (change the name but keep it on the same revsion), run ``bzr
5328
5142
tag new-name -r tag:old-name`` and then ``bzr tag --delete oldname``.
5329
5330
If no tag name is specified it will be determined through the
5331
'automatic_tag_name' hook. This can e.g. be used to automatically tag
5332
upstream releases by reading configure.ac. See ``bzr help hooks`` for
5333
details.
5334
5143
"""
5335
5144
5336
5145
_see_also = ['commit', 'tags']
5337
takes_args = ['tag_name?']
5146
takes_args = ['tag_name']
5338
5147
takes_options = [
5339
5148
Option('delete',
5340
5149
help='Delete this tag rather than placing it.',
5350
5159
'revision',
5351
5160
]
5352
5161
5353
def run(self, tag_name=None,
5162
def run(self, tag_name,
5354
5163
delete=None,
5355
5164
directory='.',
5356
5165
force=None,
5358
5167
):
5359
5168
branch, relpath = Branch.open_containing(directory)
5360
5169
branch.lock_write()
5361
self.add_cleanup(branch.unlock)
5362
if delete:
5363
if tag_name is None:
5364
raise errors.BzrCommandError("No tag specified to delete.")
5365
branch.tags.delete_tag(tag_name)
5366
self.outf.write('Deleted tag %s.\n' % tag_name)
5367
else:
5368
if revision:
5369
if len(revision) != 1:
5370
raise errors.BzrCommandError(
5371
"Tags can only be placed on a single revision, "
5372
"not on a range")
5373
revision_id = revision[0].as_revision_id(branch)
5170
try:
5171
if delete:
5172
branch.tags.delete_tag(tag_name)
5173
self.outf.write('Deleted tag %s.\n' % tag_name)
5374
5174
else:
5375
revision_id = branch.last_revision()
5376
if tag_name is None:
5377
tag_name = branch.automatic_tag_name(revision_id)
5378
if tag_name is None:
5379
raise errors.BzrCommandError(
5380
"Please specify a tag name.")
5381
if (not force) and branch.tags.has_tag(tag_name):
5382
raise errors.TagAlreadyExists(tag_name)
5383
branch.tags.set_tag(tag_name, revision_id)
5384
self.outf.write('Created tag %s.\n' % tag_name)
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()
5385
5189
5386
5190
5387
5191
class cmd_tags(Command):
5388
__doc__ = """List tags.
5192
"""List tags.
5389
5193
5390
5194
This command shows a table of tag names and the revisions they reference.
5391
5195
"""
5420
5224
return
5421
5225
5422
5226
branch.lock_read()
5423
self.add_cleanup(branch.unlock)
5424
if revision:
5425
graph = branch.repository.get_graph()
5426
rev1, rev2 = _get_revision_range(revision, branch, self.name())
5427
revid1, revid2 = rev1.rev_id, rev2.rev_id
5428
# only show revisions between revid1 and revid2 (inclusive)
5429
tags = [(tag, revid) for tag, revid in tags if
5430
graph.is_between(revid, revid1, revid2)]
5431
if sort == 'alpha':
5432
tags.sort()
5433
elif sort == 'time':
5434
timestamps = {}
5435
for tag, revid in tags:
5436
try:
5437
revobj = branch.repository.get_revision(revid)
5438
except errors.NoSuchRevision:
5439
timestamp = sys.maxint # place them at the end
5440
else:
5441
timestamp = revobj.timestamp
5442
timestamps[revid] = timestamp
5443
tags.sort(key=lambda x: timestamps[x[1]])
5444
if not show_ids:
5445
# [ (tag, revid), ... ] -> [ (tag, dotted_revno), ... ]
5446
for index, (tag, revid) in enumerate(tags):
5447
try:
5448
revno = branch.revision_id_to_dotted_revno(revid)
5449
if isinstance(revno, tuple):
5450
revno = '.'.join(map(str, revno))
5451
except errors.NoSuchRevision:
5452
# Bad tag data/merges can lead to tagged revisions
5453
# which are not in this branch. Fail gracefully ...
5454
revno = '?'
5455
tags[index] = (tag, revno)
5456
self.cleanup_now()
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()
5457
5262
for tag, revspec in tags:
5458
5263
self.outf.write('%-20s %s\n' % (tag, revspec))
5459
5264
5460
5265
5461
5266
class cmd_reconfigure(Command):
5462
__doc__ = """Reconfigure the type of a bzr directory.
5267
"""Reconfigure the type of a bzr directory.
5463
5268
5464
5269
A target configuration must be specified.
5465
5270
5550
5355
5551
5356
5552
5357
class cmd_switch(Command):
5553
__doc__ = """Set the branch of a checkout and update.
5358
"""Set the branch of a checkout and update.
5554
5359
5555
5360
For lightweight checkouts, this changes the branch being referenced.
5556
5361
For heavyweight checkouts, this checks that there are no local commits
5572
5377
that of the master.
5573
5378
"""
5574
5379
5575
takes_args = ['to_location?']
5380
takes_args = ['to_location']
5576
5381
takes_options = [Option('force',
5577
5382
help='Switch even if local commits will be lost.'),
5578
'revision',
5579
5383
Option('create-branch', short_name='b',
5580
5384
help='Create the target branch from this one before'
5581
5385
' switching to it.'),
5582
]
5386
]
5583
5387
5584
def run(self, to_location=None, force=False, create_branch=False,
5585
revision=None):
5388
def run(self, to_location, force=False, create_branch=False):
5586
5389
from bzrlib import switch
5587
5390
tree_location = '.'
5588
revision = _get_one_revision('switch', revision)
5589
5391
control_dir = bzrdir.BzrDir.open_containing(tree_location)[0]
5590
if to_location is None:
5591
if revision is None:
5592
raise errors.BzrCommandError('You must supply either a'
5593
' revision or a location')
5594
to_location = '.'
5595
5392
try:
5596
5393
branch = control_dir.open_branch()
5597
5394
had_explicit_nick = branch.get_config().has_explicit_nickname()
5602
5399
if branch is None:
5603
5400
raise errors.BzrCommandError('cannot create branch without'
5604
5401
' source branch')
5605
to_location = directory_service.directories.dereference(
5606
to_location)
5607
5402
if '/' not in to_location and '\\' not in to_location:
5608
5403
# This path is meant to be relative to the existing branch
5609
5404
this_url = self._get_branch_location(control_dir)
5611
5406
to_branch = branch.bzrdir.sprout(to_location,
5612
5407
possible_transports=[branch.bzrdir.root_transport],
5613
5408
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
5614
5416
else:
5615
5417
try:
5616
5418
to_branch = Branch.open(to_location)
5618
5420
this_url = self._get_branch_location(control_dir)
5619
5421
to_branch = Branch.open(
5620
5422
urlutils.join(this_url, '..', to_location))
5621
if revision is not None:
5622
revision = revision.as_revision_id(to_branch)
5623
switch.switch(control_dir, to_branch, force, revision_id=revision)
5423
switch.switch(control_dir, to_branch, force)
5624
5424
if had_explicit_nick:
5625
5425
branch = control_dir.open_branch() #get the new branch!
5626
5426
branch.nick = to_branch.nick
5646
5446
5647
5447
5648
5448
class cmd_view(Command):
5649
__doc__ = """Manage filtered views.
5449
"""Manage filtered views.
5650
5450
5651
5451
Views provide a mask over the tree so that users can focus on
5652
5452
a subset of a tree when doing their work. After creating a view,
5800
5600
5801
5601
5802
5602
class cmd_hooks(Command):
5803
__doc__ = """Show hooks."""
5603
"""Show hooks."""
5804
5604
5805
5605
hidden = True
5806
5606
5819
5619
self.outf.write(" <no hooks installed>\n")
5820
5620
5821
5621
5822
class cmd_remove_branch(Command):
5823
__doc__ = """Remove a branch.
5824
5825
This will remove the branch from the specified location but
5826
will keep any working tree or repository in place.
5827
5828
:Examples:
5829
5830
Remove the branch at repo/trunk::
5831
5832
bzr remove-branch repo/trunk
5833
5834
"""
5835
5836
takes_args = ["location?"]
5837
5838
aliases = ["rmbranch"]
5839
5840
def run(self, location=None):
5841
if location is None:
5842
location = "."
5843
branch = Branch.open_containing(location)[0]
5844
branch.bzrdir.destroy_branch()
5845
5846
5847
5622
class cmd_shelve(Command):
5848
__doc__ = """Temporarily set aside some changes from the current tree.
5623
"""Temporarily set aside some changes from the current tree.
5849
5624
5850
5625
Shelve allows you to temporarily put changes you've made "on the shelf",
5851
5626
ie. out of the way, until a later time when you can bring them back from
5905
5680
def run_for_list(self):
5906
5681
tree = WorkingTree.open_containing('.')[0]
5907
5682
tree.lock_read()
5908
self.add_cleanup(tree.unlock)
5909
manager = tree.get_shelf_manager()
5910
shelves = manager.active_shelves()
5911
if len(shelves) == 0:
5912
note('No shelved changes.')
5913
return 0
5914
for shelf_id in reversed(shelves):
5915
message = manager.get_metadata(shelf_id).get('message')
5916
if message is None:
5917
message = '<no message>'
5918
self.outf.write('%3d: %s\n' % (shelf_id, message))
5919
return 1
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()
5920
5697
5921
5698
5922
5699
class cmd_unshelve(Command):
5923
__doc__ = """Restore shelved changes.
5700
"""Restore shelved changes.
5924
5701
5925
5702
By default, the most recently shelved changes are restored. However if you
5926
5703
specify a shelf by id those changes will be restored instead. This works
5934
5711
enum_switch=False, value_switches=True,
5935
5712
apply="Apply changes and remove from the shelf.",
5936
5713
dry_run="Show changes, but do not apply or remove them.",
5937
preview="Instead of unshelving the changes, show the diff that "
5938
"would result from unshelving.",
5939
delete_only="Delete changes without applying them.",
5940
keep="Apply changes but don't delete them.",
5714
delete_only="Delete changes without applying them."
5941
5715
)
5942
5716
]
5943
5717
_see_also = ['shelve']
5952
5726
5953
5727
5954
5728
class cmd_clean_tree(Command):
5955
__doc__ = """Remove unwanted files from working tree.
5729
"""Remove unwanted files from working tree.
5956
5730
5957
5731
By default, only unknown files, not ignored files, are deleted. Versioned
5958
5732
files are never deleted.
5986
5760
5987
5761
5988
5762
class cmd_reference(Command):
5989
__doc__ = """list, view and set branch locations for nested trees.
5763
"""list, view and set branch locations for nested trees.
5990
5764
5991
5765
If no arguments are provided, lists the branch locations for nested trees.
5992
5766
If one argument is provided, display the branch location for that tree.
6032
5806
self.outf.write('%s %s\n' % (path, location))
6033
5807
6034
5808
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)
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
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0