« back to all changes in this revision
Viewing changes to bzrlib/builtins.py
- browse files at revision 4819.2.3
- compare with another revision
- download diff
- download tarball
- view history from revision 4819.2.3
- Committer: John Arbash Meinel
- Date: 2009-11-30 03:16:22 UTC
- mto: This revision was merged to the branch mainline in revision 4835.
- Revision ID: john@arbash-meinel.com-20091130031622-qqr6g04iv5g8zl5n
Add a GraphThunkIdsToKeys as a tested class.
- files added:
- bzrlib/textui.py
- files removed:
- .testr.conf
- apport
- bzrlib/help_topics/es
- bzrlib/plugins/news_merge
- bzrlib/plugins/news_merge/tests
- bzrlib/tests/per_bzrdir_colo
- contrib/debian
- doc/en/whats-new
- files renamed:
- bzrlib/help_topics/en/conflict-types.txt => bzrlib/help_topics/en/conflicts.txt
- bzrlib/tests/test__bencode.py => bzrlib/tests/test_bencode.py
- bzrlib/help_topics/es/conflict-types.txt => doc/es/user-guide/resolving_conflicts.txt
- files modified:
- .bzrignore
added
removed
bzrlib/builtins.py
1
# Copyright (C) 2005-2010 Canonical Ltd
1
# Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
31
31
bundle,
32
32
btree_index,
33
33
bzrdir,
34
directory_service,
35
34
delta,
36
35
config,
37
36
errors,
44
43
reconfigure,
45
44
rename_map,
46
45
revision as _mod_revision,
47
static_tuple,
48
46
symbol_versioning,
49
47
timestamp,
50
48
transport,
54
52
)
55
53
from bzrlib.branch import Branch
56
54
from bzrlib.conflicts import ConflictList
57
from bzrlib.transport import memory
58
55
from bzrlib.revisionspec import RevisionSpec, RevisionInfo
59
56
from bzrlib.smtp_connection import SMTPConnection
60
57
from bzrlib.workingtree import WorkingTree
61
58
""")
62
59
63
from bzrlib.commands import (
64
Command,
65
builtin_command_registry,
66
display_command,
67
)
60
from bzrlib.commands import Command, display_command
68
61
from bzrlib.option import (
69
62
ListOption,
70
63
Option,
239
232
# opens the branch?)
240
233
241
234
class cmd_status(Command):
242
__doc__ = """Display status summary.
235
"""Display status summary.
243
236
244
237
This reports on versioned and unknown files, reporting them
245
238
grouped by state. Possible states are:
265
258
unknown
266
259
Not versioned and not matching an ignore pattern.
267
260
268
Additionally for directories, symlinks and files with an executable
269
bit, Bazaar indicates their type using a trailing character: '/', '@'
270
or '*' respectively.
271
272
261
To see ignored files use 'bzr ignored'. For details on the
273
262
changes to file texts, use 'bzr diff'.
274
263
332
321
333
322
334
323
class cmd_cat_revision(Command):
335
__doc__ = """Write out metadata for a revision.
324
"""Write out metadata for a revision.
336
325
337
326
The revision to print can either be specified by a specific
338
327
revision identifier, or you can use --revision.
344
333
# cat-revision is more for frontends so should be exact
345
334
encoding = 'strict'
346
335
347
def print_revision(self, revisions, revid):
348
stream = revisions.get_record_stream([(revid,)], 'unordered', True)
349
record = stream.next()
350
if record.storage_kind == 'absent':
351
raise errors.NoSuchRevision(revisions, revid)
352
revtext = record.get_bytes_as('fulltext')
353
self.outf.write(revtext.decode('utf-8'))
354
355
336
@display_command
356
337
def run(self, revision_id=None, revision=None):
357
338
if revision_id is not None and revision is not None:
362
343
' --revision or a revision_id')
363
344
b = WorkingTree.open_containing(u'.')[0].branch
364
345
365
revisions = b.repository.revisions
366
if revisions is None:
367
raise errors.BzrCommandError('Repository %r does not support '
368
'access to raw revision texts')
346
# TODO: jam 20060112 should cat-revision always output utf-8?
347
if revision_id is not None:
348
revision_id = osutils.safe_revision_id(revision_id, warn=False)
349
try:
350
self.outf.write(b.repository.get_revision_xml(revision_id).decode('utf-8'))
351
except errors.NoSuchRevision:
352
msg = "The repository %s contains no revision %s." % (b.repository.base,
353
revision_id)
354
raise errors.BzrCommandError(msg)
355
elif revision is not None:
356
for rev in revision:
357
if rev is None:
358
raise errors.BzrCommandError('You cannot specify a NULL'
359
' revision.')
360
rev_id = rev.as_revision_id(b)
361
self.outf.write(b.repository.get_revision_xml(rev_id).decode('utf-8'))
369
362
370
b.repository.lock_read()
371
try:
372
# TODO: jam 20060112 should cat-revision always output utf-8?
373
if revision_id is not None:
374
revision_id = osutils.safe_revision_id(revision_id, warn=False)
375
try:
376
self.print_revision(revisions, revision_id)
377
except errors.NoSuchRevision:
378
msg = "The repository %s contains no revision %s." % (
379
b.repository.base, revision_id)
380
raise errors.BzrCommandError(msg)
381
elif revision is not None:
382
for rev in revision:
383
if rev is None:
384
raise errors.BzrCommandError(
385
'You cannot specify a NULL revision.')
386
rev_id = rev.as_revision_id(b)
387
self.print_revision(revisions, rev_id)
388
finally:
389
b.repository.unlock()
390
391
363
392
364
class cmd_dump_btree(Command):
393
__doc__ = """Dump the contents of a btree index file to stdout.
365
"""Dump the contents of a btree index file to stdout.
394
366
395
367
PATH is a btree index file, it can be any URL. This includes things like
396
368
.bzr/repository/pack-names, or .bzr/repository/indices/a34b3a...ca4a4.iix
460
432
for node in bt.iter_all_entries():
461
433
# Node is made up of:
462
434
# (index, key, value, [references])
463
try:
464
refs = node[3]
465
except IndexError:
466
refs_as_tuples = None
467
else:
468
refs_as_tuples = static_tuple.as_tuples(refs)
435
refs_as_tuples = tuple([tuple([tuple(ref) for ref in ref_list])
436
for ref_list in node[3]])
469
437
as_tuple = (tuple(node[1]), node[2], refs_as_tuples)
470
438
self.outf.write('%s\n' % (as_tuple,))
471
439
472
440
473
441
class cmd_remove_tree(Command):
474
__doc__ = """Remove the working tree from a given branch/checkout.
442
"""Remove the working tree from a given branch/checkout.
475
443
476
444
Since a lightweight checkout is little more than a working tree
477
445
this will refuse to run against one.
479
447
To re-create the working tree, use "bzr checkout".
480
448
"""
481
449
_see_also = ['checkout', 'working-trees']
482
takes_args = ['location*']
450
takes_args = ['location?']
483
451
takes_options = [
484
452
Option('force',
485
453
help='Remove the working tree even if it has '
486
454
'uncommitted changes.'),
487
455
]
488
456
489
def run(self, location_list, force=False):
490
if not location_list:
491
location_list=['.']
492
493
for location in location_list:
494
d = bzrdir.BzrDir.open(location)
495
496
try:
497
working = d.open_workingtree()
498
except errors.NoWorkingTree:
499
raise errors.BzrCommandError("No working tree to remove")
500
except errors.NotLocalUrl:
501
raise errors.BzrCommandError("You cannot remove the working tree"
502
" of a remote path")
503
if not force:
504
if (working.has_changes()):
505
raise errors.UncommittedChanges(working)
506
507
if working.user_url != working.branch.user_url:
508
raise errors.BzrCommandError("You cannot remove the working tree"
509
" from a lightweight checkout")
510
511
d.destroy_workingtree()
457
def run(self, location='.', force=False):
458
d = bzrdir.BzrDir.open(location)
459
460
try:
461
working = d.open_workingtree()
462
except errors.NoWorkingTree:
463
raise errors.BzrCommandError("No working tree to remove")
464
except errors.NotLocalUrl:
465
raise errors.BzrCommandError("You cannot remove the working tree"
466
" of a remote path")
467
if not force:
468
if (working.has_changes()):
469
raise errors.UncommittedChanges(working)
470
471
working_path = working.bzrdir.root_transport.base
472
branch_path = working.branch.bzrdir.root_transport.base
473
if working_path != branch_path:
474
raise errors.BzrCommandError("You cannot remove the working tree"
475
" from a lightweight checkout")
476
477
d.destroy_workingtree()
512
478
513
479
514
480
class cmd_revno(Command):
515
__doc__ = """Show current revision number.
481
"""Show current revision number.
516
482
517
483
This is equal to the number of revisions on this branch.
518
484
"""
528
494
if tree:
529
495
try:
530
496
wt = WorkingTree.open_containing(location)[0]
531
self.add_cleanup(wt.lock_read().unlock)
497
wt.lock_read()
532
498
except (errors.NoWorkingTree, errors.NotLocalUrl):
533
499
raise errors.NoWorkingTree(location)
534
revid = wt.last_revision()
535
500
try:
536
revno_t = wt.branch.revision_id_to_dotted_revno(revid)
537
except errors.NoSuchRevision:
538
revno_t = ('???',)
539
revno = ".".join(str(n) for n in revno_t)
501
revid = wt.last_revision()
502
try:
503
revno_t = wt.branch.revision_id_to_dotted_revno(revid)
504
except errors.NoSuchRevision:
505
revno_t = ('???',)
506
revno = ".".join(str(n) for n in revno_t)
507
finally:
508
wt.unlock()
540
509
else:
541
510
b = Branch.open_containing(location)[0]
542
self.add_cleanup(b.lock_read().unlock)
543
revno = b.revno()
544
self.cleanup_now()
511
b.lock_read()
512
try:
513
revno = b.revno()
514
finally:
515
b.unlock()
516
545
517
self.outf.write(str(revno) + '\n')
546
518
547
519
548
520
class cmd_revision_info(Command):
549
__doc__ = """Show revision number and revision id for a given revision identifier.
521
"""Show revision number and revision id for a given revision identifier.
550
522
"""
551
523
hidden = True
552
524
takes_args = ['revision_info*']
568
540
try:
569
541
wt = WorkingTree.open_containing(directory)[0]
570
542
b = wt.branch
571
self.add_cleanup(wt.lock_read().unlock)
543
wt.lock_read()
572
544
except (errors.NoWorkingTree, errors.NotLocalUrl):
573
545
wt = None
574
546
b = Branch.open_containing(directory)[0]
575
self.add_cleanup(b.lock_read().unlock)
576
revision_ids = []
577
if revision is not None:
578
revision_ids.extend(rev.as_revision_id(b) for rev in revision)
579
if revision_info_list is not None:
580
for rev_str in revision_info_list:
581
rev_spec = RevisionSpec.from_string(rev_str)
582
revision_ids.append(rev_spec.as_revision_id(b))
583
# No arguments supplied, default to the last revision
584
if len(revision_ids) == 0:
585
if tree:
586
if wt is None:
587
raise errors.NoWorkingTree(directory)
588
revision_ids.append(wt.last_revision())
547
b.lock_read()
548
try:
549
revision_ids = []
550
if revision is not None:
551
revision_ids.extend(rev.as_revision_id(b) for rev in revision)
552
if revision_info_list is not None:
553
for rev_str in revision_info_list:
554
rev_spec = RevisionSpec.from_string(rev_str)
555
revision_ids.append(rev_spec.as_revision_id(b))
556
# No arguments supplied, default to the last revision
557
if len(revision_ids) == 0:
558
if tree:
559
if wt is None:
560
raise errors.NoWorkingTree(directory)
561
revision_ids.append(wt.last_revision())
562
else:
563
revision_ids.append(b.last_revision())
564
565
revinfos = []
566
maxlen = 0
567
for revision_id in revision_ids:
568
try:
569
dotted_revno = b.revision_id_to_dotted_revno(revision_id)
570
revno = '.'.join(str(i) for i in dotted_revno)
571
except errors.NoSuchRevision:
572
revno = '???'
573
maxlen = max(maxlen, len(revno))
574
revinfos.append([revno, revision_id])
575
finally:
576
if wt is None:
577
b.unlock()
589
578
else:
590
revision_ids.append(b.last_revision())
591
592
revinfos = []
593
maxlen = 0
594
for revision_id in revision_ids:
595
try:
596
dotted_revno = b.revision_id_to_dotted_revno(revision_id)
597
revno = '.'.join(str(i) for i in dotted_revno)
598
except errors.NoSuchRevision:
599
revno = '???'
600
maxlen = max(maxlen, len(revno))
601
revinfos.append([revno, revision_id])
602
603
self.cleanup_now()
579
wt.unlock()
580
604
581
for ri in revinfos:
605
582
self.outf.write('%*s %s\n' % (maxlen, ri[0], ri[1]))
606
583
607
584
608
585
class cmd_add(Command):
609
__doc__ = """Add specified files or directories.
586
"""Add specified files or directories.
610
587
611
588
In non-recursive mode, all the named items are added, regardless
612
589
of whether they were previously ignored. A warning is given if
677
654
should_print=(not is_quiet()))
678
655
679
656
if base_tree:
680
self.add_cleanup(base_tree.lock_read().unlock)
681
tree, file_list = tree_files_for_add(file_list)
682
added, ignored = tree.smart_add(file_list, not
683
no_recurse, action=action, save=not dry_run)
684
self.cleanup_now()
657
base_tree.lock_read()
658
try:
659
tree, file_list = tree_files_for_add(file_list)
660
added, ignored = tree.smart_add(file_list, not
661
no_recurse, action=action, save=not dry_run)
662
finally:
663
if base_tree is not None:
664
base_tree.unlock()
685
665
if len(ignored) > 0:
686
666
if verbose:
687
667
for glob in sorted(ignored.keys()):
691
671
692
672
693
673
class cmd_mkdir(Command):
694
__doc__ = """Create a new versioned directory.
674
"""Create a new versioned directory.
695
675
696
676
This is equivalent to creating the directory and then adding it.
697
677
"""
701
681
702
682
def run(self, dir_list):
703
683
for d in dir_list:
684
os.mkdir(d)
704
685
wt, dd = WorkingTree.open_containing(d)
705
base = os.path.dirname(dd)
706
id = wt.path2id(base)
707
if id != None:
708
os.mkdir(d)
709
wt.add([dd])
710
self.outf.write('added %s\n' % d)
711
else:
712
raise errors.NotVersionedError(path=base)
686
wt.add([dd])
687
self.outf.write('added %s\n' % d)
713
688
714
689
715
690
class cmd_relpath(Command):
716
__doc__ = """Show path of a file relative to root"""
691
"""Show path of a file relative to root"""
717
692
718
693
takes_args = ['filename']
719
694
hidden = True
728
703
729
704
730
705
class cmd_inventory(Command):
731
__doc__ = """Show inventory of the current working copy or a revision.
706
"""Show inventory of the current working copy or a revision.
732
707
733
708
It is possible to limit the output to a particular entry
734
709
type using the --kind option. For example: --kind file.
755
730
756
731
revision = _get_one_revision('inventory', revision)
757
732
work_tree, file_list = tree_files(file_list)
758
self.add_cleanup(work_tree.lock_read().unlock)
759
if revision is not None:
760
tree = revision.as_tree(work_tree.branch)
761
762
extra_trees = [work_tree]
763
self.add_cleanup(tree.lock_read().unlock)
764
else:
765
tree = work_tree
766
extra_trees = []
767
768
if file_list is not None:
769
file_ids = tree.paths2ids(file_list, trees=extra_trees,
770
require_versioned=True)
771
# find_ids_across_trees may include some paths that don't
772
# exist in 'tree'.
773
entries = sorted((tree.id2path(file_id), tree.inventory[file_id])
774
for file_id in file_ids if file_id in tree)
775
else:
776
entries = tree.inventory.entries()
777
778
self.cleanup_now()
733
work_tree.lock_read()
734
try:
735
if revision is not None:
736
tree = revision.as_tree(work_tree.branch)
737
738
extra_trees = [work_tree]
739
tree.lock_read()
740
else:
741
tree = work_tree
742
extra_trees = []
743
744
if file_list is not None:
745
file_ids = tree.paths2ids(file_list, trees=extra_trees,
746
require_versioned=True)
747
# find_ids_across_trees may include some paths that don't
748
# exist in 'tree'.
749
entries = sorted((tree.id2path(file_id), tree.inventory[file_id])
750
for file_id in file_ids if file_id in tree)
751
else:
752
entries = tree.inventory.entries()
753
finally:
754
tree.unlock()
755
if tree is not work_tree:
756
work_tree.unlock()
757
779
758
for path, entry in entries:
780
759
if kind and kind != entry.kind:
781
760
continue
787
766
788
767
789
768
class cmd_mv(Command):
790
__doc__ = """Move or rename a file.
769
"""Move or rename a file.
791
770
792
771
:Usage:
793
772
bzr mv OLDNAME NEWNAME
826
805
if len(names_list) < 2:
827
806
raise errors.BzrCommandError("missing file argument")
828
807
tree, rel_names = tree_files(names_list, canonicalize=False)
829
self.add_cleanup(tree.lock_tree_write().unlock)
830
self._run(tree, names_list, rel_names, after)
808
tree.lock_tree_write()
809
try:
810
self._run(tree, names_list, rel_names, after)
811
finally:
812
tree.unlock()
831
813
832
814
def run_auto(self, names_list, after, dry_run):
833
815
if names_list is not None and len(names_list) > 1:
837
819
raise errors.BzrCommandError('--after cannot be specified with'
838
820
' --auto.')
839
821
work_tree, file_list = tree_files(names_list, default_branch='.')
840
self.add_cleanup(work_tree.lock_tree_write().unlock)
841
rename_map.RenameMap.guess_renames(work_tree, dry_run)
822
work_tree.lock_tree_write()
823
try:
824
rename_map.RenameMap.guess_renames(work_tree, dry_run)
825
finally:
826
work_tree.unlock()
842
827
843
828
def _run(self, tree, names_list, rel_names, after):
844
829
into_existing = osutils.isdir(names_list[-1])
922
907
923
908
924
909
class cmd_pull(Command):
925
__doc__ = """Turn this branch into a mirror of another branch.
910
"""Turn this branch into a mirror of another branch.
926
911
927
By default, this command only works on branches that have not diverged.
928
Branches are considered diverged if the destination branch's most recent
929
commit is one that has not been merged (directly or indirectly) into the
930
parent.
912
This command only works on branches that have not diverged. Branches are
913
considered diverged if the destination branch's most recent commit is one
914
that has not been merged (directly or indirectly) into the parent.
931
915
932
916
If branches have diverged, you can use 'bzr merge' to integrate the changes
933
917
from one into the other. Once one branch has merged, the other should
934
918
be able to pull it again.
935
919
936
If you want to replace your local changes and just want your branch to
937
match the remote one, use pull --overwrite. This will work even if the two
938
branches have diverged.
920
If you want to forget your local changes and just update your branch to
921
match the remote one, use pull --overwrite.
939
922
940
923
If there is no default location set, the first pull will set it. After
941
924
that, you can omit the location to use the default. To change the
977
960
try:
978
961
tree_to = WorkingTree.open_containing(directory)[0]
979
962
branch_to = tree_to.branch
980
self.add_cleanup(tree_to.lock_write().unlock)
981
963
except errors.NoWorkingTree:
982
964
tree_to = None
983
965
branch_to = Branch.open_containing(directory)[0]
984
self.add_cleanup(branch_to.lock_write().unlock)
985
966
986
967
if local and not branch_to.get_bound_location():
987
968
raise errors.LocalRequiresBoundBranch()
988
969
1018
999
else:
1019
1000
branch_from = Branch.open(location,
1020
1001
possible_transports=possible_transports)
1021
self.add_cleanup(branch_from.lock_read().unlock)
1022
1002
1023
1003
if branch_to.get_parent() is None or remember:
1024
1004
branch_to.set_parent(branch_from.base)
1025
1005
1026
if revision is not None:
1027
revision_id = revision.as_revision_id(branch_from)
1028
1029
if tree_to is not None:
1030
view_info = _get_view_info_for_change_reporter(tree_to)
1031
change_reporter = delta._ChangeReporter(
1032
unversioned_filter=tree_to.is_ignored,
1033
view_info=view_info)
1034
result = tree_to.pull(
1035
branch_from, overwrite, revision_id, change_reporter,
1036
possible_transports=possible_transports, local=local)
1037
else:
1038
result = branch_to.pull(
1039
branch_from, overwrite, revision_id, local=local)
1040
1041
result.report(self.outf)
1042
if verbose and result.old_revid != result.new_revid:
1043
log.show_branch_change(
1044
branch_to, self.outf, result.old_revno,
1045
result.old_revid)
1006
if branch_from is not branch_to:
1007
branch_from.lock_read()
1008
try:
1009
if revision is not None:
1010
revision_id = revision.as_revision_id(branch_from)
1011
1012
branch_to.lock_write()
1013
try:
1014
if tree_to is not None:
1015
view_info = _get_view_info_for_change_reporter(tree_to)
1016
change_reporter = delta._ChangeReporter(
1017
unversioned_filter=tree_to.is_ignored,
1018
view_info=view_info)
1019
result = tree_to.pull(
1020
branch_from, overwrite, revision_id, change_reporter,
1021
possible_transports=possible_transports, local=local)
1022
else:
1023
result = branch_to.pull(
1024
branch_from, overwrite, revision_id, local=local)
1025
1026
result.report(self.outf)
1027
if verbose and result.old_revid != result.new_revid:
1028
log.show_branch_change(
1029
branch_to, self.outf, result.old_revno,
1030
result.old_revid)
1031
finally:
1032
branch_to.unlock()
1033
finally:
1034
if branch_from is not branch_to:
1035
branch_from.unlock()
1046
1036
1047
1037
1048
1038
class cmd_push(Command):
1049
__doc__ = """Update a mirror of this branch.
1039
"""Update a mirror of this branch.
1050
1040
1051
1041
The target branch will not have its working tree populated because this
1052
1042
is both expensive, and is not supported on remote file systems.
1113
1103
# Get the source branch
1114
1104
(tree, br_from,
1115
1105
_unused) = bzrdir.BzrDir.open_containing_tree_or_branch(directory)
1106
if strict is None:
1107
strict = br_from.get_config().get_user_option_as_bool('push_strict')
1108
if strict is None: strict = True # default value
1116
1109
# Get the tip's revision_id
1117
1110
revision = _get_one_revision('push', revision)
1118
1111
if revision is not None:
1119
1112
revision_id = revision.in_history(br_from).rev_id
1120
1113
else:
1121
1114
revision_id = None
1122
if tree is not None and revision_id is None:
1123
tree.check_changed_or_out_of_date(
1124
strict, 'push_strict',
1125
more_error='Use --no-strict to force the push.',
1126
more_warning='Uncommitted changes will not be pushed.')
1115
if strict and tree is not None and revision_id is None:
1116
if (tree.has_changes()):
1117
raise errors.UncommittedChanges(
1118
tree, more='Use --no-strict to force the push.')
1119
if tree.last_revision() != tree.branch.last_revision():
1120
# The tree has lost sync with its branch, there is little
1121
# chance that the user is aware of it but he can still force
1122
# the push with --no-strict
1123
raise errors.OutOfDateTree(
1124
tree, more='Use --no-strict to force the push.')
1125
1127
1126
# Get the stacked_on branch, if any
1128
1127
if stacked_on is not None:
1129
1128
stacked_on = urlutils.normalize_url(stacked_on)
1161
1160
1162
1161
1163
1162
class cmd_branch(Command):
1164
__doc__ = """Create a new branch that is a copy of an existing branch.
1163
"""Create a new branch that is a copy of an existing branch.
1165
1164
1166
1165
If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will
1167
1166
be used. In other words, "branch ../foo/bar" will attempt to create ./bar.
1194
1193
' directory exists, but does not already'
1195
1194
' have a control directory. This flag will'
1196
1195
' allow branch to proceed.'),
1197
Option('bind',
1198
help="Bind new branch to from location."),
1199
1196
]
1200
1197
aliases = ['get', 'clone']
1201
1198
1202
1199
def run(self, from_location, to_location=None, revision=None,
1203
1200
hardlink=False, stacked=False, standalone=False, no_tree=False,
1204
use_existing_dir=False, switch=False, bind=False):
1201
use_existing_dir=False, switch=False):
1205
1202
from bzrlib import switch as _mod_switch
1206
1203
from bzrlib.tag import _merge_tags_if_possible
1207
1204
accelerator_tree, br_from = bzrdir.BzrDir.open_tree_or_branch(
1208
1205
from_location)
1206
if (accelerator_tree is not None and
1207
accelerator_tree.supports_content_filtering()):
1208
accelerator_tree = None
1209
1209
revision = _get_one_revision('branch', revision)
1210
self.add_cleanup(br_from.lock_read().unlock)
1211
if revision is not None:
1212
revision_id = revision.as_revision_id(br_from)
1213
else:
1214
# FIXME - wt.last_revision, fallback to branch, fall back to
1215
# None or perhaps NULL_REVISION to mean copy nothing
1216
# RBC 20060209
1217
revision_id = br_from.last_revision()
1218
if to_location is None:
1219
to_location = urlutils.derive_to_location(from_location)
1220
to_transport = transport.get_transport(to_location)
1210
br_from.lock_read()
1221
1211
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)
1212
if revision is not None:
1213
revision_id = revision.as_revision_id(br_from)
1227
1214
else:
1228
try:
1229
bzrdir.BzrDir.open_from_transport(to_transport)
1230
except errors.NotBranchError:
1231
pass
1215
# FIXME - wt.last_revision, fallback to branch, fall back to
1216
# None or perhaps NULL_REVISION to mean copy nothing
1217
# RBC 20060209
1218
revision_id = br_from.last_revision()
1219
if to_location is None:
1220
to_location = urlutils.derive_to_location(from_location)
1221
to_transport = transport.get_transport(to_location)
1222
try:
1223
to_transport.mkdir('.')
1224
except errors.FileExists:
1225
if not use_existing_dir:
1226
raise errors.BzrCommandError('Target directory "%s" '
1227
'already exists.' % to_location)
1232
1228
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 bind:
1263
# Bind to the parent
1264
parent_branch = Branch.open(from_location)
1265
branch.bind(parent_branch)
1266
note('New branch bound to %s' % from_location)
1267
if switch:
1268
# Switch to the new branch
1269
wt, _ = WorkingTree.open_containing('.')
1270
_mod_switch.switch(wt.bzrdir, branch)
1271
note('Switched to branch: %s',
1272
urlutils.unescape_for_display(branch.base, 'utf-8'))
1229
try:
1230
bzrdir.BzrDir.open_from_transport(to_transport)
1231
except errors.NotBranchError:
1232
pass
1233
else:
1234
raise errors.AlreadyBranchError(to_location)
1235
except errors.NoSuchFile:
1236
raise errors.BzrCommandError('Parent of "%s" does not exist.'
1237
% to_location)
1238
try:
1239
# preserve whatever source format we have.
1240
dir = br_from.bzrdir.sprout(to_transport.base, revision_id,
1241
possible_transports=[to_transport],
1242
accelerator_tree=accelerator_tree,
1243
hardlink=hardlink, stacked=stacked,
1244
force_new_repo=standalone,
1245
create_tree_if_local=not no_tree,
1246
source_branch=br_from)
1247
branch = dir.open_branch()
1248
except errors.NoSuchRevision:
1249
to_transport.delete_tree('.')
1250
msg = "The branch %s has no revision %s." % (from_location,
1251
revision)
1252
raise errors.BzrCommandError(msg)
1253
_merge_tags_if_possible(br_from, branch)
1254
# If the source branch is stacked, the new branch may
1255
# be stacked whether we asked for that explicitly or not.
1256
# We therefore need a try/except here and not just 'if stacked:'
1257
try:
1258
note('Created new stacked branch referring to %s.' %
1259
branch.get_stacked_on_url())
1260
except (errors.NotStacked, errors.UnstackableBranchFormat,
1261
errors.UnstackableRepositoryFormat), e:
1262
note('Branched %d revision(s).' % branch.revno())
1263
if switch:
1264
# Switch to the new branch
1265
wt, _ = WorkingTree.open_containing('.')
1266
_mod_switch.switch(wt.bzrdir, branch)
1267
note('Switched to branch: %s',
1268
urlutils.unescape_for_display(branch.base, 'utf-8'))
1269
finally:
1270
br_from.unlock()
1273
1271
1274
1272
1275
1273
class cmd_checkout(Command):
1276
__doc__ = """Create a new checkout of an existing branch.
1274
"""Create a new checkout of an existing branch.
1277
1275
1278
1276
If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree for
1279
1277
the branch found in '.'. This is useful if you have removed the working tree
1342
1340
1343
1341
1344
1342
class cmd_renames(Command):
1345
__doc__ = """Show list of renamed files.
1343
"""Show list of renamed files.
1346
1344
"""
1347
1345
# TODO: Option to show renames between two historical versions.
1348
1346
1353
1351
@display_command
1354
1352
def run(self, dir=u'.'):
1355
1353
tree = WorkingTree.open_containing(dir)[0]
1356
self.add_cleanup(tree.lock_read().unlock)
1357
new_inv = tree.inventory
1358
old_tree = tree.basis_tree()
1359
self.add_cleanup(old_tree.lock_read().unlock)
1360
old_inv = old_tree.inventory
1361
renames = []
1362
iterator = tree.iter_changes(old_tree, include_unchanged=True)
1363
for f, paths, c, v, p, n, k, e in iterator:
1364
if paths[0] == paths[1]:
1365
continue
1366
if None in (paths):
1367
continue
1368
renames.append(paths)
1369
renames.sort()
1370
for old_name, new_name in renames:
1371
self.outf.write("%s => %s\n" % (old_name, new_name))
1354
tree.lock_read()
1355
try:
1356
new_inv = tree.inventory
1357
old_tree = tree.basis_tree()
1358
old_tree.lock_read()
1359
try:
1360
old_inv = old_tree.inventory
1361
renames = []
1362
iterator = tree.iter_changes(old_tree, include_unchanged=True)
1363
for f, paths, c, v, p, n, k, e in iterator:
1364
if paths[0] == paths[1]:
1365
continue
1366
if None in (paths):
1367
continue
1368
renames.append(paths)
1369
renames.sort()
1370
for old_name, new_name in renames:
1371
self.outf.write("%s => %s\n" % (old_name, new_name))
1372
finally:
1373
old_tree.unlock()
1374
finally:
1375
tree.unlock()
1372
1376
1373
1377
1374
1378
class cmd_update(Command):
1375
__doc__ = """Update a tree to have the latest code committed to its branch.
1379
"""Update a tree to have the latest code committed to its branch.
1376
1380
1377
1381
This will perform a merge into the working tree, and may generate
1378
1382
conflicts. If you have any local changes, you will still
1380
1384
1381
1385
If you want to discard your local changes, you can just do a
1382
1386
'bzr revert' instead of 'bzr commit' after the update.
1383
1384
If the tree's branch is bound to a master branch, it will also update
1385
the branch from the master.
1386
1387
"""
1387
1388
1388
1389
_see_also = ['pull', 'working-trees', 'status-flags']
1389
1390
takes_args = ['dir?']
1390
takes_options = ['revision']
1391
1391
aliases = ['up']
1392
1392
1393
def run(self, dir='.', revision=None):
1394
if revision is not None and len(revision) != 1:
1395
raise errors.BzrCommandError(
1396
"bzr update --revision takes exactly one revision")
1393
def run(self, dir='.'):
1397
1394
tree = WorkingTree.open_containing(dir)[0]
1398
branch = tree.branch
1399
1395
possible_transports = []
1400
master = branch.get_master_branch(
1396
master = tree.branch.get_master_branch(
1401
1397
possible_transports=possible_transports)
1402
1398
if master is not None:
1403
branch_location = master.base
1404
1399
tree.lock_write()
1405
1400
else:
1406
branch_location = tree.branch.base
1407
1401
tree.lock_tree_write()
1408
self.add_cleanup(tree.unlock)
1409
# get rid of the final '/' and be ready for display
1410
branch_location = urlutils.unescape_for_display(
1411
branch_location.rstrip('/'),
1412
self.outf.encoding)
1413
existing_pending_merges = tree.get_parent_ids()[1:]
1414
if master is None:
1415
old_tip = None
1416
else:
1417
# may need to fetch data into a heavyweight checkout
1418
# XXX: this may take some time, maybe we should display a
1419
# message
1420
old_tip = branch.update(possible_transports)
1421
if revision is not None:
1422
revision_id = revision[0].as_revision_id(branch)
1423
else:
1424
revision_id = branch.last_revision()
1425
if revision_id == _mod_revision.ensure_null(tree.last_revision()):
1426
revno = branch.revision_id_to_dotted_revno(revision_id)
1427
note("Tree is up to date at revision %s of branch %s" %
1428
('.'.join(map(str, revno)), branch_location))
1429
return 0
1430
view_info = _get_view_info_for_change_reporter(tree)
1431
change_reporter = delta._ChangeReporter(
1432
unversioned_filter=tree.is_ignored,
1433
view_info=view_info)
1434
1402
try:
1403
existing_pending_merges = tree.get_parent_ids()[1:]
1404
last_rev = _mod_revision.ensure_null(tree.last_revision())
1405
if last_rev == _mod_revision.ensure_null(
1406
tree.branch.last_revision()):
1407
# may be up to date, check master too.
1408
if master is None or last_rev == _mod_revision.ensure_null(
1409
master.last_revision()):
1410
revno = tree.branch.revision_id_to_revno(last_rev)
1411
note("Tree is up to date at revision %d." % (revno,))
1412
return 0
1413
view_info = _get_view_info_for_change_reporter(tree)
1435
1414
conflicts = tree.update(
1436
change_reporter,
1437
possible_transports=possible_transports,
1438
revision=revision_id,
1439
old_tip=old_tip)
1440
except errors.NoSuchRevision, e:
1441
raise errors.BzrCommandError(
1442
"branch has no revision %s\n"
1443
"bzr update --revision only works"
1444
" for a revision in the branch history"
1445
% (e.revision))
1446
revno = tree.branch.revision_id_to_dotted_revno(
1447
_mod_revision.ensure_null(tree.last_revision()))
1448
note('Updated to revision %s of branch %s' %
1449
('.'.join(map(str, revno)), branch_location))
1450
parent_ids = tree.get_parent_ids()
1451
if parent_ids[1:] and parent_ids[1:] != existing_pending_merges:
1452
note('Your local commits will now show as pending merges with '
1453
"'bzr status', and can be committed with 'bzr commit'.")
1454
if conflicts != 0:
1455
return 1
1456
else:
1457
return 0
1415
delta._ChangeReporter(unversioned_filter=tree.is_ignored,
1416
view_info=view_info), possible_transports=possible_transports)
1417
revno = tree.branch.revision_id_to_revno(
1418
_mod_revision.ensure_null(tree.last_revision()))
1419
note('Updated to revision %d.' % (revno,))
1420
if tree.get_parent_ids()[1:] != existing_pending_merges:
1421
note('Your local commits will now show as pending merges with '
1422
"'bzr status', and can be committed with 'bzr commit'.")
1423
if conflicts != 0:
1424
return 1
1425
else:
1426
return 0
1427
finally:
1428
tree.unlock()
1458
1429
1459
1430
1460
1431
class cmd_info(Command):
1461
__doc__ = """Show information about a working tree, branch or repository.
1432
"""Show information about a working tree, branch or repository.
1462
1433
1463
1434
This command will show all known locations and formats associated to the
1464
1435
tree, branch or repository.
1502
1473
1503
1474
1504
1475
class cmd_remove(Command):
1505
__doc__ = """Remove files or directories.
1476
"""Remove files or directories.
1506
1477
1507
1478
This makes bzr stop tracking changes to the specified files. bzr will delete
1508
1479
them if they can easily be recovered using revert. If no options or
1530
1501
if file_list is not None:
1531
1502
file_list = [f for f in file_list]
1532
1503
1533
self.add_cleanup(tree.lock_write().unlock)
1534
# Heuristics should probably all move into tree.remove_smart or
1535
# some such?
1536
if new:
1537
added = tree.changes_from(tree.basis_tree(),
1538
specific_files=file_list).added
1539
file_list = sorted([f[0] for f in added], reverse=True)
1540
if len(file_list) == 0:
1541
raise errors.BzrCommandError('No matching files.')
1542
elif file_list is None:
1543
# missing files show up in iter_changes(basis) as
1544
# versioned-with-no-kind.
1545
missing = []
1546
for change in tree.iter_changes(tree.basis_tree()):
1547
# Find paths in the working tree that have no kind:
1548
if change[1][1] is not None and change[6][1] is None:
1549
missing.append(change[1][1])
1550
file_list = sorted(missing, reverse=True)
1551
file_deletion_strategy = 'keep'
1552
tree.remove(file_list, verbose=verbose, to_file=self.outf,
1553
keep_files=file_deletion_strategy=='keep',
1554
force=file_deletion_strategy=='force')
1504
tree.lock_write()
1505
try:
1506
# Heuristics should probably all move into tree.remove_smart or
1507
# some such?
1508
if new:
1509
added = tree.changes_from(tree.basis_tree(),
1510
specific_files=file_list).added
1511
file_list = sorted([f[0] for f in added], reverse=True)
1512
if len(file_list) == 0:
1513
raise errors.BzrCommandError('No matching files.')
1514
elif file_list is None:
1515
# missing files show up in iter_changes(basis) as
1516
# versioned-with-no-kind.
1517
missing = []
1518
for change in tree.iter_changes(tree.basis_tree()):
1519
# Find paths in the working tree that have no kind:
1520
if change[1][1] is not None and change[6][1] is None:
1521
missing.append(change[1][1])
1522
file_list = sorted(missing, reverse=True)
1523
file_deletion_strategy = 'keep'
1524
tree.remove(file_list, verbose=verbose, to_file=self.outf,
1525
keep_files=file_deletion_strategy=='keep',
1526
force=file_deletion_strategy=='force')
1527
finally:
1528
tree.unlock()
1555
1529
1556
1530
1557
1531
class cmd_file_id(Command):
1558
__doc__ = """Print file_id of a particular file or directory.
1532
"""Print file_id of a particular file or directory.
1559
1533
1560
1534
The file_id is assigned when the file is first added and remains the
1561
1535
same through all revisions where the file exists, even when it is
1577
1551
1578
1552
1579
1553
class cmd_file_path(Command):
1580
__doc__ = """Print path of file_ids to a file or directory.
1554
"""Print path of file_ids to a file or directory.
1581
1555
1582
1556
This prints one line for each directory down to the target,
1583
1557
starting at the branch root.
1599
1573
1600
1574
1601
1575
class cmd_reconcile(Command):
1602
__doc__ = """Reconcile bzr metadata in a branch.
1576
"""Reconcile bzr metadata in a branch.
1603
1577
1604
1578
This can correct data mismatches that may have been caused by
1605
1579
previous ghost operations or bzr upgrades. You should only
1627
1601
1628
1602
1629
1603
class cmd_revision_history(Command):
1630
__doc__ = """Display the list of revision ids on a branch."""
1604
"""Display the list of revision ids on a branch."""
1631
1605
1632
1606
_see_also = ['log']
1633
1607
takes_args = ['location?']
1643
1617
1644
1618
1645
1619
class cmd_ancestry(Command):
1646
__doc__ = """List all revisions merged into this branch."""
1620
"""List all revisions merged into this branch."""
1647
1621
1648
1622
_see_also = ['log', 'revision-history']
1649
1623
takes_args = ['location?']
1668
1642
1669
1643
1670
1644
class cmd_init(Command):
1671
__doc__ = """Make a directory into a versioned branch.
1645
"""Make a directory into a versioned branch.
1672
1646
1673
1647
Use this to create an empty branch, or before importing an
1674
1648
existing project.
1777
1751
1778
1752
1779
1753
class cmd_init_repository(Command):
1780
__doc__ = """Create a shared repository for branches to share storage space.
1754
"""Create a shared repository to hold branches.
1781
1755
1782
1756
New branches created under the repository directory will store their
1783
revisions in the repository, not in the branch directory. For branches
1784
with shared history, this reduces the amount of storage needed and
1785
speeds up the creation of new branches.
1757
revisions in the repository, not in the branch directory.
1786
1758
1787
If the --no-trees option is given then the branches in the repository
1788
will not have working trees by default. They will still exist as
1789
directories on disk, but they will not have separate copies of the
1790
files at a certain revision. This can be useful for repositories that
1791
store branches which are interacted with through checkouts or remote
1792
branches, such as on a server.
1759
If the --no-trees option is used then the branches in the repository
1760
will not have working trees by default.
1793
1761
1794
1762
:Examples:
1795
Create a shared repository holding just branches::
1763
Create a shared repositories holding just branches::
1796
1764
1797
1765
bzr init-repo --no-trees repo
1798
1766
bzr init repo/trunk
1837
1805
1838
1806
1839
1807
class cmd_diff(Command):
1840
__doc__ = """Show differences in the working tree, between revisions or branches.
1808
"""Show differences in the working tree, between revisions or branches.
1841
1809
1842
1810
If no arguments are given, all changes for the current tree are listed.
1843
1811
If files are given, only the changes in those files are listed.
1864
1832
1865
1833
bzr diff -r1
1866
1834
1867
Difference between revision 3 and revision 1::
1868
1869
bzr diff -r1..3
1870
1871
Difference between revision 3 and revision 1 for branch xxx::
1872
1873
bzr diff -r1..3 xxx
1874
1875
To see the changes introduced in revision X::
1876
1877
bzr diff -cX
1878
1879
Note that in the case of a merge, the -c option shows the changes
1880
compared to the left hand parent. To see the changes against
1881
another parent, use::
1882
1883
bzr diff -r<chosen_parent>..X
1884
1885
The changes introduced by revision 2 (equivalent to -r1..2)::
1886
1887
bzr diff -c2
1835
Difference between revision 2 and revision 1::
1836
1837
bzr diff -r1..2
1838
1839
Difference between revision 2 and revision 1 for branch xxx::
1840
1841
bzr diff -r1..2 xxx
1888
1842
1889
1843
Show just the differences for file NEWS::
1890
1844
1929
1883
help='Use this command to compare files.',
1930
1884
type=unicode,
1931
1885
),
1932
RegistryOption('format',
1933
help='Diff format to use.',
1934
lazy_registry=('bzrlib.diff', 'format_registry'),
1935
value_switches=False, title='Diff format'),
1936
1886
]
1937
1887
aliases = ['di', 'dif']
1938
1888
encoding_type = 'exact'
1939
1889
1940
1890
@display_command
1941
1891
def run(self, revision=None, file_list=None, diff_options=None,
1942
prefix=None, old=None, new=None, using=None, format=None):
1943
from bzrlib.diff import (get_trees_and_branches_to_diff_locked,
1944
show_diff_trees)
1892
prefix=None, old=None, new=None, using=None):
1893
from bzrlib.diff import get_trees_and_branches_to_diff, show_diff_trees
1945
1894
1946
1895
if (prefix is None) or (prefix == '0'):
1947
1896
# diff -p0 format
1961
1910
raise errors.BzrCommandError('bzr diff --revision takes exactly'
1962
1911
' one or two revision specifiers')
1963
1912
1964
if using is not None and format is not None:
1965
raise errors.BzrCommandError('--using and --format are mutually '
1966
'exclusive.')
1967
1968
1913
(old_tree, new_tree,
1969
1914
old_branch, new_branch,
1970
specific_files, extra_trees) = get_trees_and_branches_to_diff_locked(
1971
file_list, revision, old, new, self.add_cleanup, apply_view=True)
1915
specific_files, extra_trees) = get_trees_and_branches_to_diff(
1916
file_list, revision, old, new, apply_view=True)
1972
1917
return show_diff_trees(old_tree, new_tree, sys.stdout,
1973
1918
specific_files=specific_files,
1974
1919
external_diff_options=diff_options,
1975
1920
old_label=old_label, new_label=new_label,
1976
extra_trees=extra_trees, using=using,
1977
format_cls=format)
1921
extra_trees=extra_trees, using=using)
1978
1922
1979
1923
1980
1924
class cmd_deleted(Command):
1981
__doc__ = """List files deleted in the working tree.
1925
"""List files deleted in the working tree.
1982
1926
"""
1983
1927
# TODO: Show files deleted since a previous revision, or
1984
1928
# between two revisions.
1992
1936
@display_command
1993
1937
def run(self, show_ids=False):
1994
1938
tree = WorkingTree.open_containing(u'.')[0]
1995
self.add_cleanup(tree.lock_read().unlock)
1996
old = tree.basis_tree()
1997
self.add_cleanup(old.lock_read().unlock)
1998
for path, ie in old.inventory.iter_entries():
1999
if not tree.has_id(ie.file_id):
2000
self.outf.write(path)
2001
if show_ids:
2002
self.outf.write(' ')
2003
self.outf.write(ie.file_id)
2004
self.outf.write('\n')
1939
tree.lock_read()
1940
try:
1941
old = tree.basis_tree()
1942
old.lock_read()
1943
try:
1944
for path, ie in old.inventory.iter_entries():
1945
if not tree.has_id(ie.file_id):
1946
self.outf.write(path)
1947
if show_ids:
1948
self.outf.write(' ')
1949
self.outf.write(ie.file_id)
1950
self.outf.write('\n')
1951
finally:
1952
old.unlock()
1953
finally:
1954
tree.unlock()
2005
1955
2006
1956
2007
1957
class cmd_modified(Command):
2008
__doc__ = """List files modified in working tree.
1958
"""List files modified in working tree.
2009
1959
"""
2010
1960
2011
1961
hidden = True
2028
1978
2029
1979
2030
1980
class cmd_added(Command):
2031
__doc__ = """List files added in working tree.
1981
"""List files added in working tree.
2032
1982
"""
2033
1983
2034
1984
hidden = True
2042
1992
@display_command
2043
1993
def run(self, null=False):
2044
1994
wt = WorkingTree.open_containing(u'.')[0]
2045
self.add_cleanup(wt.lock_read().unlock)
2046
basis = wt.basis_tree()
2047
self.add_cleanup(basis.lock_read().unlock)
2048
basis_inv = basis.inventory
2049
inv = wt.inventory
2050
for file_id in inv:
2051
if file_id in basis_inv:
2052
continue
2053
if inv.is_root(file_id) and len(basis_inv) == 0:
2054
continue
2055
path = inv.id2path(file_id)
2056
if not os.access(osutils.abspath(path), os.F_OK):
2057
continue
2058
if null:
2059
self.outf.write(path + '\0')
2060
else:
2061
self.outf.write(osutils.quotefn(path) + '\n')
1995
wt.lock_read()
1996
try:
1997
basis = wt.basis_tree()
1998
basis.lock_read()
1999
try:
2000
basis_inv = basis.inventory
2001
inv = wt.inventory
2002
for file_id in inv:
2003
if file_id in basis_inv:
2004
continue
2005
if inv.is_root(file_id) and len(basis_inv) == 0:
2006
continue
2007
path = inv.id2path(file_id)
2008
if not os.access(osutils.abspath(path), os.F_OK):
2009
continue
2010
if null:
2011
self.outf.write(path + '\0')
2012
else:
2013
self.outf.write(osutils.quotefn(path) + '\n')
2014
finally:
2015
basis.unlock()
2016
finally:
2017
wt.unlock()
2062
2018
2063
2019
2064
2020
class cmd_root(Command):
2065
__doc__ = """Show the tree root directory.
2021
"""Show the tree root directory.
2066
2022
2067
2023
The root is the nearest enclosing directory with a .bzr control
2068
2024
directory."""
2092
2048
2093
2049
2094
2050
class cmd_log(Command):
2095
__doc__ = """Show historical log for a branch or subset of a branch.
2051
"""Show historical log for a branch or subset of a branch.
2096
2052
2097
2053
log is bzr's default tool for exploring the history of a branch.
2098
2054
The branch to use is taken from the first parameter. If no parameters
2209
2165
:Tips & tricks:
2210
2166
2211
2167
GUI tools and IDEs are often better at exploring history than command
2212
line tools: you may prefer qlog or viz from qbzr or bzr-gtk, the
2213
bzr-explorer shell, or the Loggerhead web interface. See the Plugin
2214
Guide <http://doc.bazaar.canonical.com/plugins/en/> and
2215
<http://wiki.bazaar.canonical.com/IDEIntegration>.
2168
line tools. You may prefer qlog or glog from the QBzr and Bzr-Gtk packages
2169
respectively for example. (TortoiseBzr uses qlog for displaying logs.) See
2170
http://bazaar-vcs.org/BzrPlugins and http://bazaar-vcs.org/IDEIntegration.
2171
2172
Web interfaces are often better at exploring history than command line
2173
tools, particularly for branches on servers. You may prefer Loggerhead
2174
or one of its alternatives. See http://bazaar-vcs.org/WebInterface.
2216
2175
2217
2176
You may find it useful to add the aliases below to ``bazaar.conf``::
2218
2177
2279
2238
help='Show changes made in each revision as a patch.'),
2280
2239
Option('include-merges',
2281
2240
help='Show merged revisions like --levels 0 does.'),
2282
Option('exclude-common-ancestry',
2283
help='Display only the revisions that are not part'
2284
' of both ancestries (require -rX..Y)'
2285
)
2286
2241
]
2287
2242
encoding_type = 'replace'
2288
2243
2298
2253
message=None,
2299
2254
limit=None,
2300
2255
show_diff=False,
2301
include_merges=False,
2302
exclude_common_ancestry=False,
2303
):
2256
include_merges=False):
2304
2257
from bzrlib.log import (
2305
2258
Logger,
2306
2259
make_log_request_dict,
2307
2260
_get_info_for_log_files,
2308
2261
)
2309
2262
direction = (forward and 'forward') or 'reverse'
2310
if (exclude_common_ancestry
2311
and (revision is None or len(revision) != 2)):
2312
raise errors.BzrCommandError(
2313
'--exclude-common-ancestry requires -r with two revisions')
2314
2263
if include_merges:
2315
2264
if levels is None:
2316
2265
levels = 0
2329
2278
2330
2279
file_ids = []
2331
2280
filter_by_dir = False
2332
if file_list:
2333
# find the file ids to log and check for directory filtering
2334
b, file_info_list, rev1, rev2 = _get_info_for_log_files(
2335
revision, file_list, self.add_cleanup)
2336
for relpath, file_id, kind in file_info_list:
2337
if file_id is None:
2338
raise errors.BzrCommandError(
2339
"Path unknown at end or start of revision range: %s" %
2340
relpath)
2341
# If the relpath is the top of the tree, we log everything
2342
if relpath == '':
2343
file_ids = []
2344
break
2281
b = None
2282
try:
2283
if file_list:
2284
# find the file ids to log and check for directory filtering
2285
b, file_info_list, rev1, rev2 = _get_info_for_log_files(
2286
revision, file_list)
2287
for relpath, file_id, kind in file_info_list:
2288
if file_id is None:
2289
raise errors.BzrCommandError(
2290
"Path unknown at end or start of revision range: %s" %
2291
relpath)
2292
# If the relpath is the top of the tree, we log everything
2293
if relpath == '':
2294
file_ids = []
2295
break
2296
else:
2297
file_ids.append(file_id)
2298
filter_by_dir = filter_by_dir or (
2299
kind in ['directory', 'tree-reference'])
2300
else:
2301
# log everything
2302
# FIXME ? log the current subdir only RBC 20060203
2303
if revision is not None \
2304
and len(revision) > 0 and revision[0].get_branch():
2305
location = revision[0].get_branch()
2345
2306
else:
2346
file_ids.append(file_id)
2347
filter_by_dir = filter_by_dir or (
2348
kind in ['directory', 'tree-reference'])
2349
else:
2350
# log everything
2351
# FIXME ? log the current subdir only RBC 20060203
2352
if revision is not None \
2353
and len(revision) > 0 and revision[0].get_branch():
2354
location = revision[0].get_branch()
2355
else:
2356
location = '.'
2357
dir, relpath = bzrdir.BzrDir.open_containing(location)
2358
b = dir.open_branch()
2359
self.add_cleanup(b.lock_read().unlock)
2360
rev1, rev2 = _get_revision_range(revision, b, self.name())
2361
2362
# Decide on the type of delta & diff filtering to use
2363
# TODO: add an --all-files option to make this configurable & consistent
2364
if not verbose:
2365
delta_type = None
2366
else:
2367
delta_type = 'full'
2368
if not show_diff:
2369
diff_type = None
2370
elif file_ids:
2371
diff_type = 'partial'
2372
else:
2373
diff_type = 'full'
2374
2375
# Build the log formatter
2376
if log_format is None:
2377
log_format = log.log_formatter_registry.get_default(b)
2378
# Make a non-encoding output to include the diffs - bug 328007
2379
unencoded_output = ui.ui_factory.make_output_stream(encoding_type='exact')
2380
lf = log_format(show_ids=show_ids, to_file=self.outf,
2381
to_exact_file=unencoded_output,
2382
show_timezone=timezone,
2383
delta_format=get_verbosity_level(),
2384
levels=levels,
2385
show_advice=levels is None)
2386
2387
# Choose the algorithm for doing the logging. It's annoying
2388
# having multiple code paths like this but necessary until
2389
# the underlying repository format is faster at generating
2390
# deltas or can provide everything we need from the indices.
2391
# The default algorithm - match-using-deltas - works for
2392
# multiple files and directories and is faster for small
2393
# amounts of history (200 revisions say). However, it's too
2394
# slow for logging a single file in a repository with deep
2395
# history, i.e. > 10K revisions. In the spirit of "do no
2396
# evil when adding features", we continue to use the
2397
# original algorithm - per-file-graph - for the "single
2398
# file that isn't a directory without showing a delta" case.
2399
partial_history = revision and b.repository._format.supports_chks
2400
match_using_deltas = (len(file_ids) != 1 or filter_by_dir
2401
or delta_type or partial_history)
2402
2403
# Build the LogRequest and execute it
2404
if len(file_ids) == 0:
2405
file_ids = None
2406
rqst = make_log_request_dict(
2407
direction=direction, specific_fileids=file_ids,
2408
start_revision=rev1, end_revision=rev2, limit=limit,
2409
message_search=message, delta_type=delta_type,
2410
diff_type=diff_type, _match_using_deltas=match_using_deltas,
2411
exclude_common_ancestry=exclude_common_ancestry,
2412
)
2413
Logger(b, rqst).show(lf)
2307
location = '.'
2308
dir, relpath = bzrdir.BzrDir.open_containing(location)
2309
b = dir.open_branch()
2310
b.lock_read()
2311
rev1, rev2 = _get_revision_range(revision, b, self.name())
2312
2313
# Decide on the type of delta & diff filtering to use
2314
# TODO: add an --all-files option to make this configurable & consistent
2315
if not verbose:
2316
delta_type = None
2317
else:
2318
delta_type = 'full'
2319
if not show_diff:
2320
diff_type = None
2321
elif file_ids:
2322
diff_type = 'partial'
2323
else:
2324
diff_type = 'full'
2325
2326
# Build the log formatter
2327
if log_format is None:
2328
log_format = log.log_formatter_registry.get_default(b)
2329
lf = log_format(show_ids=show_ids, to_file=self.outf,
2330
show_timezone=timezone,
2331
delta_format=get_verbosity_level(),
2332
levels=levels,
2333
show_advice=levels is None)
2334
2335
# Choose the algorithm for doing the logging. It's annoying
2336
# having multiple code paths like this but necessary until
2337
# the underlying repository format is faster at generating
2338
# deltas or can provide everything we need from the indices.
2339
# The default algorithm - match-using-deltas - works for
2340
# multiple files and directories and is faster for small
2341
# amounts of history (200 revisions say). However, it's too
2342
# slow for logging a single file in a repository with deep
2343
# history, i.e. > 10K revisions. In the spirit of "do no
2344
# evil when adding features", we continue to use the
2345
# original algorithm - per-file-graph - for the "single
2346
# file that isn't a directory without showing a delta" case.
2347
partial_history = revision and b.repository._format.supports_chks
2348
match_using_deltas = (len(file_ids) != 1 or filter_by_dir
2349
or delta_type or partial_history)
2350
2351
# Build the LogRequest and execute it
2352
if len(file_ids) == 0:
2353
file_ids = None
2354
rqst = make_log_request_dict(
2355
direction=direction, specific_fileids=file_ids,
2356
start_revision=rev1, end_revision=rev2, limit=limit,
2357
message_search=message, delta_type=delta_type,
2358
diff_type=diff_type, _match_using_deltas=match_using_deltas)
2359
Logger(b, rqst).show(lf)
2360
finally:
2361
if b is not None:
2362
b.unlock()
2414
2363
2415
2364
2416
2365
def _get_revision_range(revisionspec_list, branch, command_name):
2434
2383
raise errors.BzrCommandError(
2435
2384
"bzr %s doesn't accept two revisions in different"
2436
2385
" branches." % command_name)
2437
if start_spec.spec is None:
2438
# Avoid loading all the history.
2439
rev1 = RevisionInfo(branch, None, None)
2440
else:
2441
rev1 = start_spec.in_history(branch)
2386
rev1 = start_spec.in_history(branch)
2442
2387
# Avoid loading all of history when we know a missing
2443
2388
# end of range means the last revision ...
2444
2389
if end_spec.spec is None:
2473
2418
2474
2419
2475
2420
class cmd_touching_revisions(Command):
2476
__doc__ = """Return revision-ids which affected a particular file.
2421
"""Return revision-ids which affected a particular file.
2477
2422
2478
2423
A more user-friendly interface is "bzr log FILE".
2479
2424
"""
2486
2431
tree, relpath = WorkingTree.open_containing(filename)
2487
2432
file_id = tree.path2id(relpath)
2488
2433
b = tree.branch
2489
self.add_cleanup(b.lock_read().unlock)
2490
touching_revs = log.find_touching_revisions(b, file_id)
2491
for revno, revision_id, what in touching_revs:
2492
self.outf.write("%6d %s\n" % (revno, what))
2434
b.lock_read()
2435
try:
2436
touching_revs = log.find_touching_revisions(b, file_id)
2437
for revno, revision_id, what in touching_revs:
2438
self.outf.write("%6d %s\n" % (revno, what))
2439
finally:
2440
b.unlock()
2493
2441
2494
2442
2495
2443
class cmd_ls(Command):
2496
__doc__ = """List files in a tree.
2444
"""List files in a tree.
2497
2445
"""
2498
2446
2499
2447
_see_also = ['status', 'cat']
2547
2495
if from_root:
2548
2496
if relpath:
2549
2497
prefix = relpath + '/'
2550
elif fs_path != '.' and not fs_path.endswith('/'):
2498
elif fs_path != '.':
2551
2499
prefix = fs_path + '/'
2552
2500
2553
2501
if revision is not None or tree is None:
2561
2509
view_str = views.view_display_str(view_files)
2562
2510
note("Ignoring files outside view. View is %s" % view_str)
2563
2511
2564
self.add_cleanup(tree.lock_read().unlock)
2565
for fp, fc, fkind, fid, entry in tree.list_files(include_root=False,
2566
from_dir=relpath, recursive=recursive):
2567
# Apply additional masking
2568
if not all and not selection[fc]:
2569
continue
2570
if kind is not None and fkind != kind:
2571
continue
2572
if apply_view:
2573
try:
2574
if relpath:
2575
fullpath = osutils.pathjoin(relpath, fp)
2576
else:
2577
fullpath = fp
2578
views.check_path_in_view(tree, fullpath)
2579
except errors.FileOutsideView:
2580
continue
2512
tree.lock_read()
2513
try:
2514
for fp, fc, fkind, fid, entry in tree.list_files(include_root=False,
2515
from_dir=relpath, recursive=recursive):
2516
# Apply additional masking
2517
if not all and not selection[fc]:
2518
continue
2519
if kind is not None and fkind != kind:
2520
continue
2521
if apply_view:
2522
try:
2523
if relpath:
2524
fullpath = osutils.pathjoin(relpath, fp)
2525
else:
2526
fullpath = fp
2527
views.check_path_in_view(tree, fullpath)
2528
except errors.FileOutsideView:
2529
continue
2581
2530
2582
# Output the entry
2583
if prefix:
2584
fp = osutils.pathjoin(prefix, fp)
2585
kindch = entry.kind_character()
2586
outstring = fp + kindch
2587
ui.ui_factory.clear_term()
2588
if verbose:
2589
outstring = '%-8s %s' % (fc, outstring)
2590
if show_ids and fid is not None:
2591
outstring = "%-50s %s" % (outstring, fid)
2592
self.outf.write(outstring + '\n')
2593
elif null:
2594
self.outf.write(fp + '\0')
2595
if show_ids:
2596
if fid is not None:
2597
self.outf.write(fid)
2598
self.outf.write('\0')
2599
self.outf.flush()
2600
else:
2601
if show_ids:
2602
if fid is not None:
2603
my_id = fid
2604
else:
2605
my_id = ''
2606
self.outf.write('%-50s %s\n' % (outstring, my_id))
2607
else:
2531
# Output the entry
2532
if prefix:
2533
fp = osutils.pathjoin(prefix, fp)
2534
kindch = entry.kind_character()
2535
outstring = fp + kindch
2536
ui.ui_factory.clear_term()
2537
if verbose:
2538
outstring = '%-8s %s' % (fc, outstring)
2539
if show_ids and fid is not None:
2540
outstring = "%-50s %s" % (outstring, fid)
2608
2541
self.outf.write(outstring + '\n')
2542
elif null:
2543
self.outf.write(fp + '\0')
2544
if show_ids:
2545
if fid is not None:
2546
self.outf.write(fid)
2547
self.outf.write('\0')
2548
self.outf.flush()
2549
else:
2550
if show_ids:
2551
if fid is not None:
2552
my_id = fid
2553
else:
2554
my_id = ''
2555
self.outf.write('%-50s %s\n' % (outstring, my_id))
2556
else:
2557
self.outf.write(outstring + '\n')
2558
finally:
2559
tree.unlock()
2609
2560
2610
2561
2611
2562
class cmd_unknowns(Command):
2612
__doc__ = """List unknown files.
2563
"""List unknown files.
2613
2564
"""
2614
2565
2615
2566
hidden = True
2622
2573
2623
2574
2624
2575
class cmd_ignore(Command):
2625
__doc__ = """Ignore specified files or patterns.
2576
"""Ignore specified files or patterns.
2626
2577
2627
2578
See ``bzr help patterns`` for details on the syntax of patterns.
2628
2579
2636
2587
After adding, editing or deleting that file either indirectly by
2637
2588
using this command or directly by using an editor, be sure to commit
2638
2589
it.
2639
2640
Bazaar also supports a global ignore file ~/.bazaar/ignore. On Windows
2641
the global ignore file can be found in the application data directory as
2642
C:\\Documents and Settings\\<user>\\Application Data\\Bazaar\\2.0\\ignore.
2643
Global ignores are not touched by this command. The global ignore file
2644
can be edited directly using an editor.
2645
2646
Patterns prefixed with '!' are exceptions to ignore patterns and take
2647
precedence over regular ignores. Such exceptions are used to specify
2648
files that should be versioned which would otherwise be ignored.
2649
2650
Patterns prefixed with '!!' act as regular ignore patterns, but have
2651
precedence over the '!' exception patterns.
2652
2590
2653
2591
Note: ignore patterns containing shell wildcards must be quoted from
2654
2592
the shell on Unix.
2658
2596
2659
2597
bzr ignore ./Makefile
2660
2598
2661
Ignore .class files in all directories...::
2599
Ignore class files in all directories::
2662
2600
2663
2601
bzr ignore "*.class"
2664
2602
2665
...but do not ignore "special.class"::
2666
2667
bzr ignore "!special.class"
2668
2669
2603
Ignore .o files under the lib directory::
2670
2604
2671
2605
bzr ignore "lib/**/*.o"
2677
2611
Ignore everything but the "debian" toplevel directory::
2678
2612
2679
2613
bzr ignore "RE:(?!debian/).*"
2680
2681
Ignore everything except the "local" toplevel directory,
2682
but always ignore "*~" autosave files, even under local/::
2683
2684
bzr ignore "*"
2685
bzr ignore "!./local"
2686
bzr ignore "!!*~"
2687
2614
"""
2688
2615
2689
2616
_see_also = ['status', 'ignored', 'patterns']
2690
2617
takes_args = ['name_pattern*']
2691
2618
takes_options = [
2692
Option('default-rules',
2693
help='Display the default ignore rules that bzr uses.')
2619
Option('old-default-rules',
2620
help='Write out the ignore rules bzr < 0.9 always used.')
2694
2621
]
2695
2622
2696
def run(self, name_pattern_list=None, default_rules=None):
2623
def run(self, name_pattern_list=None, old_default_rules=None):
2697
2624
from bzrlib import ignores
2698
if default_rules is not None:
2699
# dump the default rules and exit
2700
for pattern in ignores.USER_DEFAULTS:
2701
self.outf.write("%s\n" % pattern)
2625
if old_default_rules is not None:
2626
# dump the rules and exit
2627
for pattern in ignores.OLD_DEFAULTS:
2628
print pattern
2702
2629
return
2703
2630
if not name_pattern_list:
2704
2631
raise errors.BzrCommandError("ignore requires at least one "
2705
"NAME_PATTERN or --default-rules.")
2632
"NAME_PATTERN or --old-default-rules")
2706
2633
name_pattern_list = [globbing.normalize_pattern(p)
2707
2634
for p in name_pattern_list]
2708
2635
for name_pattern in name_pattern_list:
2720
2647
if id is not None:
2721
2648
filename = entry[0]
2722
2649
if ignored.match(filename):
2723
matches.append(filename)
2650
matches.append(filename.encode('utf-8'))
2724
2651
tree.unlock()
2725
2652
if len(matches) > 0:
2726
self.outf.write("Warning: the following files are version controlled and"
2727
" match your ignore pattern:\n%s"
2728
"\nThese files will continue to be version controlled"
2729
" unless you 'bzr remove' them.\n" % ("\n".join(matches),))
2653
print "Warning: the following files are version controlled and" \
2654
" match your ignore pattern:\n%s" \
2655
"\nThese files will continue to be version controlled" \
2656
" unless you 'bzr remove' them." % ("\n".join(matches),)
2730
2657
2731
2658
2732
2659
class cmd_ignored(Command):
2733
__doc__ = """List ignored files and the patterns that matched them.
2660
"""List ignored files and the patterns that matched them.
2734
2661
2735
2662
List all the ignored files and the ignore pattern that caused the file to
2736
2663
be ignored.
2746
2673
@display_command
2747
2674
def run(self):
2748
2675
tree = WorkingTree.open_containing(u'.')[0]
2749
self.add_cleanup(tree.lock_read().unlock)
2750
for path, file_class, kind, file_id, entry in tree.list_files():
2751
if file_class != 'I':
2752
continue
2753
## XXX: Slightly inefficient since this was already calculated
2754
pat = tree.is_ignored(path)
2755
self.outf.write('%-50s %s\n' % (path, pat))
2676
tree.lock_read()
2677
try:
2678
for path, file_class, kind, file_id, entry in tree.list_files():
2679
if file_class != 'I':
2680
continue
2681
## XXX: Slightly inefficient since this was already calculated
2682
pat = tree.is_ignored(path)
2683
self.outf.write('%-50s %s\n' % (path, pat))
2684
finally:
2685
tree.unlock()
2756
2686
2757
2687
2758
2688
class cmd_lookup_revision(Command):
2759
__doc__ = """Lookup the revision-id from a revision-number
2689
"""Lookup the revision-id from a revision-number
2760
2690
2761
2691
:Examples:
2762
2692
bzr lookup-revision 33
2769
2699
try:
2770
2700
revno = int(revno)
2771
2701
except ValueError:
2772
raise errors.BzrCommandError("not a valid revision-number: %r"
2773
% revno)
2774
revid = WorkingTree.open_containing(u'.')[0].branch.get_rev_id(revno)
2775
self.outf.write("%s\n" % revid)
2702
raise errors.BzrCommandError("not a valid revision-number: %r" % revno)
2703
2704
print WorkingTree.open_containing(u'.')[0].branch.get_rev_id(revno)
2776
2705
2777
2706
2778
2707
class cmd_export(Command):
2779
__doc__ = """Export current or past revision to a destination directory or archive.
2708
"""Export current or past revision to a destination directory or archive.
2780
2709
2781
2710
If no revision is specified this exports the last committed revision.
2782
2711
2814
2743
Option('root',
2815
2744
type=str,
2816
2745
help="Name of the root directory inside the exported file."),
2817
Option('per-file-timestamps',
2818
help='Set modification time of files to that of the last '
2819
'revision in which it was changed.'),
2820
2746
]
2821
2747
def run(self, dest, branch_or_subdir=None, revision=None, format=None,
2822
root=None, filters=False, per_file_timestamps=False):
2748
root=None, filters=False):
2823
2749
from bzrlib.export import export
2824
2750
2825
2751
if branch_or_subdir is None:
2832
2758
2833
2759
rev_tree = _get_one_revision_tree('export', revision, branch=b, tree=tree)
2834
2760
try:
2835
export(rev_tree, dest, format, root, subdir, filtered=filters,
2836
per_file_timestamps=per_file_timestamps)
2761
export(rev_tree, dest, format, root, subdir, filtered=filters)
2837
2762
except errors.NoSuchExportFormat, e:
2838
2763
raise errors.BzrCommandError('Unsupported export format: %s' % e.format)
2839
2764
2840
2765
2841
2766
class cmd_cat(Command):
2842
__doc__ = """Write the contents of a file as of a given revision to standard output.
2767
"""Write the contents of a file as of a given revision to standard output.
2843
2768
2844
2769
If no revision is nominated, the last revision is used.
2845
2770
2865
2790
" one revision specifier")
2866
2791
tree, branch, relpath = \
2867
2792
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
2868
self.add_cleanup(branch.lock_read().unlock)
2869
return self._run(tree, branch, relpath, filename, revision,
2870
name_from_revision, filters)
2793
branch.lock_read()
2794
try:
2795
return self._run(tree, branch, relpath, filename, revision,
2796
name_from_revision, filters)
2797
finally:
2798
branch.unlock()
2871
2799
2872
2800
def _run(self, tree, b, relpath, filename, revision, name_from_revision,
2873
2801
filtered):
2874
2802
if tree is None:
2875
2803
tree = b.basis_tree()
2876
2804
rev_tree = _get_one_revision_tree('cat', revision, branch=b)
2877
self.add_cleanup(rev_tree.lock_read().unlock)
2878
2805
2879
2806
old_file_id = rev_tree.path2id(relpath)
2880
2807
2915
2842
chunks = content.splitlines(True)
2916
2843
content = filtered_output_bytes(chunks, filters,
2917
2844
ContentFilterContext(relpath, rev_tree))
2918
self.cleanup_now()
2919
2845
self.outf.writelines(content)
2920
2846
else:
2921
self.cleanup_now()
2922
2847
self.outf.write(content)
2923
2848
2924
2849
2925
2850
class cmd_local_time_offset(Command):
2926
__doc__ = """Show the offset in seconds from GMT to local time."""
2851
"""Show the offset in seconds from GMT to local time."""
2927
2852
hidden = True
2928
2853
@display_command
2929
2854
def run(self):
2930
self.outf.write("%s\n" % osutils.local_time_offset())
2855
print osutils.local_time_offset()
2931
2856
2932
2857
2933
2858
2934
2859
class cmd_commit(Command):
2935
__doc__ = """Commit changes into a new revision.
2860
"""Commit changes into a new revision.
2936
2861
2937
2862
An explanatory message needs to be given for each commit. This is
2938
2863
often done by using the --message option (getting the message from the
3046
2971
"the master branch until a normal commit "
3047
2972
"is performed."
3048
2973
),
3049
Option('show-diff', short_name='p',
2974
Option('show-diff',
3050
2975
help='When no message is supplied, show the diff along'
3051
2976
' with the status summary in the message editor.'),
3052
2977
]
3118
3043
if local and not tree.branch.get_bound_location():
3119
3044
raise errors.LocalRequiresBoundBranch()
3120
3045
3121
if message is not None:
3122
try:
3123
file_exists = osutils.lexists(message)
3124
except UnicodeError:
3125
# The commit message contains unicode characters that can't be
3126
# represented in the filesystem encoding, so that can't be a
3127
# file.
3128
file_exists = False
3129
if file_exists:
3130
warning_msg = (
3131
'The commit message is a file name: "%(f)s".\n'
3132
'(use --file "%(f)s" to take commit message from that file)'
3133
% { 'f': message })
3134
ui.ui_factory.show_warning(warning_msg)
3135
if '\r' in message:
3136
message = message.replace('\r\n', '\n')
3137
message = message.replace('\r', '\n')
3138
if file:
3139
raise errors.BzrCommandError(
3140
"please specify either --message or --file")
3141
3142
3046
def get_message(commit_obj):
3143
3047
"""Callback to get commit message"""
3144
if file:
3145
my_message = codecs.open(
3146
file, 'rt', osutils.get_user_encoding()).read()
3147
elif message is not None:
3148
my_message = message
3149
else:
3150
# No message supplied: make one up.
3151
# text is the status of the tree
3152
text = make_commit_message_template_encoded(tree,
3048
my_message = message
3049
if my_message is not None and '\r' in my_message:
3050
my_message = my_message.replace('\r\n', '\n')
3051
my_message = my_message.replace('\r', '\n')
3052
if my_message is None and not file:
3053
t = make_commit_message_template_encoded(tree,
3153
3054
selected_list, diff=show_diff,
3154
3055
output_encoding=osutils.get_user_encoding())
3155
# start_message is the template generated from hooks
3156
# XXX: Warning - looks like hooks return unicode,
3157
# make_commit_message_template_encoded returns user encoding.
3158
# We probably want to be using edit_commit_message instead to
3159
# avoid this.
3160
3056
start_message = generate_commit_message_template(commit_obj)
3161
my_message = edit_commit_message_encoded(text,
3057
my_message = edit_commit_message_encoded(t,
3162
3058
start_message=start_message)
3163
3059
if my_message is None:
3164
3060
raise errors.BzrCommandError("please specify a commit"
3165
3061
" message with either --message or --file")
3062
elif my_message and file:
3063
raise errors.BzrCommandError(
3064
"please specify either --message or --file")
3065
if file:
3066
my_message = codecs.open(file, 'rt',
3067
osutils.get_user_encoding()).read()
3166
3068
if my_message == "":
3167
3069
raise errors.BzrCommandError("empty commit message specified")
3168
3070
return my_message
3180
3082
timezone=offset,
3181
3083
exclude=safe_relpath_files(tree, exclude))
3182
3084
except PointlessCommit:
3085
# FIXME: This should really happen before the file is read in;
3086
# perhaps prepare the commit; get the message; then actually commit
3183
3087
raise errors.BzrCommandError("No changes to commit."
3184
3088
" Use --unchanged to commit anyhow.")
3185
3089
except ConflictsInTree:
3190
3094
raise errors.BzrCommandError("Commit refused because there are"
3191
3095
" unknown files in the working tree.")
3192
3096
except errors.BoundBranchOutOfDate, e:
3193
e.extra_help = ("\n"
3194
'To commit to master branch, run update and then commit.\n'
3195
'You can also pass --local to commit to continue working '
3196
'disconnected.')
3197
raise
3097
raise errors.BzrCommandError(str(e) + "\n"
3098
'To commit to master branch, run update and then commit.\n'
3099
'You can also pass --local to commit to continue working '
3100
'disconnected.')
3198
3101
3199
3102
3200
3103
class cmd_check(Command):
3201
__doc__ = """Validate working tree structure, branch consistency and repository history.
3104
"""Validate working tree structure, branch consistency and repository history.
3202
3105
3203
3106
This command checks various invariants about branch and repository storage
3204
3107
to detect data corruption or bzr bugs.
3268
3171
3269
3172
3270
3173
class cmd_upgrade(Command):
3271
__doc__ = """Upgrade branch storage to current format.
3174
"""Upgrade branch storage to current format.
3272
3175
3273
3176
The check command or bzr developers may sometimes advise you to run
3274
3177
this command. When the default format has changed you may also be warned
3292
3195
3293
3196
3294
3197
class cmd_whoami(Command):
3295
__doc__ = """Show or set bzr user id.
3198
"""Show or set bzr user id.
3296
3199
3297
3200
:Examples:
3298
3201
Show the email of the current user::
3342
3245
3343
3246
3344
3247
class cmd_nick(Command):
3345
__doc__ = """Print or set the branch nickname.
3248
"""Print or set the branch nickname.
3346
3249
3347
3250
If unset, the tree root directory name is used as the nickname.
3348
3251
To print the current nickname, execute with no argument.
3362
3265
3363
3266
@display_command
3364
3267
def printme(self, branch):
3365
self.outf.write('%s\n' % branch.nick)
3268
print branch.nick
3366
3269
3367
3270
3368
3271
class cmd_alias(Command):
3369
__doc__ = """Set/unset and display aliases.
3272
"""Set/unset and display aliases.
3370
3273
3371
3274
:Examples:
3372
3275
Show the current aliases::
3436
3339
3437
3340
3438
3341
class cmd_selftest(Command):
3439
__doc__ = """Run internal test suite.
3342
"""Run internal test suite.
3440
3343
3441
3344
If arguments are given, they are regular expressions that say which tests
3442
3345
should run. Tests matching any expression are run, and other tests are
3486
3389
def get_transport_type(typestring):
3487
3390
"""Parse and return a transport specifier."""
3488
3391
if typestring == "sftp":
3489
from bzrlib.tests import stub_sftp
3490
return stub_sftp.SFTPAbsoluteServer
3392
from bzrlib.transport.sftp import SFTPAbsoluteServer
3393
return SFTPAbsoluteServer
3491
3394
if typestring == "memory":
3492
from bzrlib.tests import test_server
3493
return memory.MemoryServer
3395
from bzrlib.transport.memory import MemoryServer
3396
return MemoryServer
3494
3397
if typestring == "fakenfs":
3495
from bzrlib.tests import test_server
3496
return test_server.FakeNFSServer
3398
from bzrlib.transport.fakenfs import FakeNFSServer
3399
return FakeNFSServer
3497
3400
msg = "No known transport type %s. Supported types are: sftp\n" %\
3498
3401
(typestring)
3499
3402
raise errors.BzrCommandError(msg)
3583
3486
raise errors.BzrCommandError("subunit not available. subunit "
3584
3487
"needs to be installed to use --subunit.")
3585
3488
self.additional_selftest_args['runner_class'] = SubUnitBzrRunner
3586
# On Windows, disable automatic conversion of '\n' to '\r\n' in
3587
# stdout, which would corrupt the subunit stream.
3588
if sys.platform == "win32" and sys.stdout.fileno() >= 0:
3589
import msvcrt
3590
msvcrt.setmode(sys.stdout.fileno(), os.O_BINARY)
3591
3489
if parallel:
3592
3490
self.additional_selftest_args.setdefault(
3593
3491
'suite_decorators', []).append(parallel)
3597
3495
verbose = not is_quiet()
3598
3496
# TODO: should possibly lock the history file...
3599
3497
benchfile = open(".perf_history", "at", buffering=1)
3600
self.add_cleanup(benchfile.close)
3601
3498
else:
3602
3499
test_suite_factory = None
3603
3500
benchfile = None
3604
selftest_kwargs = {"verbose": verbose,
3605
"pattern": pattern,
3606
"stop_on_failure": one,
3607
"transport": transport,
3608
"test_suite_factory": test_suite_factory,
3609
"lsprof_timed": lsprof_timed,
3610
"lsprof_tests": lsprof_tests,
3611
"bench_history": benchfile,
3612
"matching_tests_first": first,
3613
"list_only": list_only,
3614
"random_seed": randomize,
3615
"exclude_pattern": exclude,
3616
"strict": strict,
3617
"load_list": load_list,
3618
"debug_flags": debugflag,
3619
"starting_with": starting_with
3620
}
3621
selftest_kwargs.update(self.additional_selftest_args)
3622
result = selftest(**selftest_kwargs)
3501
try:
3502
selftest_kwargs = {"verbose": verbose,
3503
"pattern": pattern,
3504
"stop_on_failure": one,
3505
"transport": transport,
3506
"test_suite_factory": test_suite_factory,
3507
"lsprof_timed": lsprof_timed,
3508
"lsprof_tests": lsprof_tests,
3509
"bench_history": benchfile,
3510
"matching_tests_first": first,
3511
"list_only": list_only,
3512
"random_seed": randomize,
3513
"exclude_pattern": exclude,
3514
"strict": strict,
3515
"load_list": load_list,
3516
"debug_flags": debugflag,
3517
"starting_with": starting_with
3518
}
3519
selftest_kwargs.update(self.additional_selftest_args)
3520
result = selftest(**selftest_kwargs)
3521
finally:
3522
if benchfile is not None:
3523
benchfile.close()
3623
3524
return int(not result)
3624
3525
3625
3526
3626
3527
class cmd_version(Command):
3627
__doc__ = """Show version of bzr."""
3528
"""Show version of bzr."""
3628
3529
3629
3530
encoding_type = 'replace'
3630
3531
takes_options = [
3641
3542
3642
3543
3643
3544
class cmd_rocks(Command):
3644
__doc__ = """Statement of optimism."""
3545
"""Statement of optimism."""
3645
3546
3646
3547
hidden = True
3647
3548
3648
3549
@display_command
3649
3550
def run(self):
3650
self.outf.write("It sure does!\n")
3551
print "It sure does!"
3651
3552
3652
3553
3653
3554
class cmd_find_merge_base(Command):
3654
__doc__ = """Find and print a base revision for merging two branches."""
3555
"""Find and print a base revision for merging two branches."""
3655
3556
# TODO: Options to specify revisions on either side, as if
3656
3557
# merging only part of the history.
3657
3558
takes_args = ['branch', 'other']
3663
3564
3664
3565
branch1 = Branch.open_containing(branch)[0]
3665
3566
branch2 = Branch.open_containing(other)[0]
3666
self.add_cleanup(branch1.lock_read().unlock)
3667
self.add_cleanup(branch2.lock_read().unlock)
3668
last1 = ensure_null(branch1.last_revision())
3669
last2 = ensure_null(branch2.last_revision())
3670
3671
graph = branch1.repository.get_graph(branch2.repository)
3672
base_rev_id = graph.find_unique_lca(last1, last2)
3673
3674
self.outf.write('merge base is revision %s\n' % base_rev_id)
3567
branch1.lock_read()
3568
try:
3569
branch2.lock_read()
3570
try:
3571
last1 = ensure_null(branch1.last_revision())
3572
last2 = ensure_null(branch2.last_revision())
3573
3574
graph = branch1.repository.get_graph(branch2.repository)
3575
base_rev_id = graph.find_unique_lca(last1, last2)
3576
3577
print 'merge base is revision %s' % base_rev_id
3578
finally:
3579
branch2.unlock()
3580
finally:
3581
branch1.unlock()
3675
3582
3676
3583
3677
3584
class cmd_merge(Command):
3678
__doc__ = """Perform a three-way merge.
3585
"""Perform a three-way merge.
3679
3586
3680
3587
The source of the merge can be specified either in the form of a branch,
3681
3588
or in the form of a path to a file containing a merge directive generated
3710
3617
committed to record the result of the merge.
3711
3618
3712
3619
merge refuses to run if there are any uncommitted changes, unless
3713
--force is given. The --force option can also be used to create a
3714
merge revision which has more than two parents.
3715
3716
If one would like to merge changes from the working tree of the other
3717
branch without merging any committed revisions, the --uncommitted option
3718
can be given.
3620
--force is given.
3719
3621
3720
3622
To select only some changes to merge, use "merge -i", which will prompt
3721
3623
you to apply each diff hunk and file change, similar to "shelve".
3736
3638
To apply a merge directive contained in /tmp/merge::
3737
3639
3738
3640
bzr merge /tmp/merge
3739
3740
To create a merge revision with three parents from two branches
3741
feature1a and feature1b:
3742
3743
bzr merge ../feature1a
3744
bzr merge ../feature1b --force
3745
bzr commit -m 'revision with three parents'
3746
3641
"""
3747
3642
3748
3643
encoding_type = 'exact'
3806
3701
view_info = _get_view_info_for_change_reporter(tree)
3807
3702
change_reporter = delta._ChangeReporter(
3808
3703
unversioned_filter=tree.is_ignored, view_info=view_info)
3809
pb = ui.ui_factory.nested_progress_bar()
3810
self.add_cleanup(pb.finished)
3811
self.add_cleanup(tree.lock_write().unlock)
3812
if location is not None:
3813
try:
3814
mergeable = bundle.read_mergeable_from_url(location,
3815
possible_transports=possible_transports)
3816
except errors.NotABundle:
3817
mergeable = None
3704
cleanups = []
3705
try:
3706
pb = ui.ui_factory.nested_progress_bar()
3707
cleanups.append(pb.finished)
3708
tree.lock_write()
3709
cleanups.append(tree.unlock)
3710
if location is not None:
3711
try:
3712
mergeable = bundle.read_mergeable_from_url(location,
3713
possible_transports=possible_transports)
3714
except errors.NotABundle:
3715
mergeable = None
3716
else:
3717
if uncommitted:
3718
raise errors.BzrCommandError('Cannot use --uncommitted'
3719
' with bundles or merge directives.')
3720
3721
if revision is not None:
3722
raise errors.BzrCommandError(
3723
'Cannot use -r with merge directives or bundles')
3724
merger, verified = _mod_merge.Merger.from_mergeable(tree,
3725
mergeable, pb)
3726
3727
if merger is None and uncommitted:
3728
if revision is not None and len(revision) > 0:
3729
raise errors.BzrCommandError('Cannot use --uncommitted and'
3730
' --revision at the same time.')
3731
merger = self.get_merger_from_uncommitted(tree, location, pb,
3732
cleanups)
3733
allow_pending = False
3734
3735
if merger is None:
3736
merger, allow_pending = self._get_merger_from_branch(tree,
3737
location, revision, remember, possible_transports, pb)
3738
3739
merger.merge_type = merge_type
3740
merger.reprocess = reprocess
3741
merger.show_base = show_base
3742
self.sanity_check_merger(merger)
3743
if (merger.base_rev_id == merger.other_rev_id and
3744
merger.other_rev_id is not None):
3745
note('Nothing to do.')
3746
return 0
3747
if pull:
3748
if merger.interesting_files is not None:
3749
raise errors.BzrCommandError('Cannot pull individual files')
3750
if (merger.base_rev_id == tree.last_revision()):
3751
result = tree.pull(merger.other_branch, False,
3752
merger.other_rev_id)
3753
result.report(self.outf)
3754
return 0
3755
if merger.this_basis is None:
3756
raise errors.BzrCommandError(
3757
"This branch has no commits."
3758
" (perhaps you would prefer 'bzr pull')")
3759
if preview:
3760
return self._do_preview(merger, cleanups)
3761
elif interactive:
3762
return self._do_interactive(merger, cleanups)
3818
3763
else:
3819
if uncommitted:
3820
raise errors.BzrCommandError('Cannot use --uncommitted'
3821
' with bundles or merge directives.')
3822
3823
if revision is not None:
3824
raise errors.BzrCommandError(
3825
'Cannot use -r with merge directives or bundles')
3826
merger, verified = _mod_merge.Merger.from_mergeable(tree,
3827
mergeable, None)
3828
3829
if merger is None and uncommitted:
3830
if revision is not None and len(revision) > 0:
3831
raise errors.BzrCommandError('Cannot use --uncommitted and'
3832
' --revision at the same time.')
3833
merger = self.get_merger_from_uncommitted(tree, location, None)
3834
allow_pending = False
3835
3836
if merger is None:
3837
merger, allow_pending = self._get_merger_from_branch(tree,
3838
location, revision, remember, possible_transports, None)
3839
3840
merger.merge_type = merge_type
3841
merger.reprocess = reprocess
3842
merger.show_base = show_base
3843
self.sanity_check_merger(merger)
3844
if (merger.base_rev_id == merger.other_rev_id and
3845
merger.other_rev_id is not None):
3846
note('Nothing to do.')
3847
return 0
3848
if pull:
3849
if merger.interesting_files is not None:
3850
raise errors.BzrCommandError('Cannot pull individual files')
3851
if (merger.base_rev_id == tree.last_revision()):
3852
result = tree.pull(merger.other_branch, False,
3853
merger.other_rev_id)
3854
result.report(self.outf)
3855
return 0
3856
if merger.this_basis is None:
3857
raise errors.BzrCommandError(
3858
"This branch has no commits."
3859
" (perhaps you would prefer 'bzr pull')")
3860
if preview:
3861
return self._do_preview(merger)
3862
elif interactive:
3863
return self._do_interactive(merger)
3864
else:
3865
return self._do_merge(merger, change_reporter, allow_pending,
3866
verified)
3867
3868
def _get_preview(self, merger):
3764
return self._do_merge(merger, change_reporter, allow_pending,
3765
verified)
3766
finally:
3767
for cleanup in reversed(cleanups):
3768
cleanup()
3769
3770
def _get_preview(self, merger, cleanups):
3869
3771
tree_merger = merger.make_merger()
3870
3772
tt = tree_merger.make_preview_transform()
3871
self.add_cleanup(tt.finalize)
3773
cleanups.append(tt.finalize)
3872
3774
result_tree = tt.get_preview_tree()
3873
3775
return result_tree
3874
3776
3875
def _do_preview(self, merger):
3777
def _do_preview(self, merger, cleanups):
3876
3778
from bzrlib.diff import show_diff_trees
3877
result_tree = self._get_preview(merger)
3779
result_tree = self._get_preview(merger, cleanups)
3878
3780
show_diff_trees(merger.this_tree, result_tree, self.outf,
3879
3781
old_label='', new_label='')
3880
3782
3890
3792
else:
3891
3793
return 0
3892
3794
3893
def _do_interactive(self, merger):
3795
def _do_interactive(self, merger, cleanups):
3894
3796
"""Perform an interactive merge.
3895
3797
3896
3798
This works by generating a preview tree of the merge, then using
3898
3800
and the preview tree.
3899
3801
"""
3900
3802
from bzrlib import shelf_ui
3901
result_tree = self._get_preview(merger)
3803
result_tree = self._get_preview(merger, cleanups)
3902
3804
writer = bzrlib.option.diff_writer_registry.get()
3903
3805
shelver = shelf_ui.Shelver(merger.this_tree, result_tree, destroy=True,
3904
3806
reporter=shelf_ui.ApplyReporter(),
3905
3807
diff_writer=writer(sys.stdout))
3906
try:
3907
shelver.run()
3908
finally:
3909
shelver.finalize()
3808
shelver.run()
3910
3809
3911
3810
def sanity_check_merger(self, merger):
3912
3811
if (merger.show_base and
3972
3871
allow_pending = True
3973
3872
return merger, allow_pending
3974
3873
3975
def get_merger_from_uncommitted(self, tree, location, pb):
3874
def get_merger_from_uncommitted(self, tree, location, pb, cleanups):
3976
3875
"""Get a merger for uncommitted changes.
3977
3876
3978
3877
:param tree: The tree the merger should apply to.
3979
3878
:param location: The location containing uncommitted changes.
3980
3879
:param pb: The progress bar to use for showing progress.
3880
:param cleanups: A list of operations to perform to clean up the
3881
temporary directories, unfinalized objects, etc.
3981
3882
"""
3982
3883
location = self._select_branch_location(tree, location)[0]
3983
3884
other_tree, other_path = WorkingTree.open_containing(location)
4035
3936
4036
3937
4037
3938
class cmd_remerge(Command):
4038
__doc__ = """Redo a merge.
3939
"""Redo a merge.
4039
3940
4040
3941
Use this if you want to try a different merge technique while resolving
4041
3942
conflicts. Some merge techniques are better than others, and remerge
4066
3967
4067
3968
def run(self, file_list=None, merge_type=None, show_base=False,
4068
3969
reprocess=False):
4069
from bzrlib.conflicts import restore
4070
3970
if merge_type is None:
4071
3971
merge_type = _mod_merge.Merge3Merger
4072
3972
tree, file_list = tree_files(file_list)
4073
self.add_cleanup(tree.lock_write().unlock)
4074
parents = tree.get_parent_ids()
4075
if len(parents) != 2:
4076
raise errors.BzrCommandError("Sorry, remerge only works after normal"
4077
" merges. Not cherrypicking or"
4078
" multi-merges.")
4079
repository = tree.branch.repository
4080
interesting_ids = None
4081
new_conflicts = []
4082
conflicts = tree.conflicts()
4083
if file_list is not None:
4084
interesting_ids = set()
4085
for filename in file_list:
4086
file_id = tree.path2id(filename)
4087
if file_id is None:
4088
raise errors.NotVersionedError(filename)
4089
interesting_ids.add(file_id)
4090
if tree.kind(file_id) != "directory":
4091
continue
3973
tree.lock_write()
3974
try:
3975
parents = tree.get_parent_ids()
3976
if len(parents) != 2:
3977
raise errors.BzrCommandError("Sorry, remerge only works after normal"
3978
" merges. Not cherrypicking or"
3979
" multi-merges.")
3980
repository = tree.branch.repository
3981
interesting_ids = None
3982
new_conflicts = []
3983
conflicts = tree.conflicts()
3984
if file_list is not None:
3985
interesting_ids = set()
3986
for filename in file_list:
3987
file_id = tree.path2id(filename)
3988
if file_id is None:
3989
raise errors.NotVersionedError(filename)
3990
interesting_ids.add(file_id)
3991
if tree.kind(file_id) != "directory":
3992
continue
4092
3993
4093
for name, ie in tree.inventory.iter_entries(file_id):
4094
interesting_ids.add(ie.file_id)
4095
new_conflicts = conflicts.select_conflicts(tree, file_list)[0]
4096
else:
4097
# Remerge only supports resolving contents conflicts
4098
allowed_conflicts = ('text conflict', 'contents conflict')
4099
restore_files = [c.path for c in conflicts
4100
if c.typestring in allowed_conflicts]
4101
_mod_merge.transform_tree(tree, tree.basis_tree(), interesting_ids)
4102
tree.set_conflicts(ConflictList(new_conflicts))
4103
if file_list is not None:
4104
restore_files = file_list
4105
for filename in restore_files:
3994
for name, ie in tree.inventory.iter_entries(file_id):
3995
interesting_ids.add(ie.file_id)
3996
new_conflicts = conflicts.select_conflicts(tree, file_list)[0]
3997
else:
3998
# Remerge only supports resolving contents conflicts
3999
allowed_conflicts = ('text conflict', 'contents conflict')
4000
restore_files = [c.path for c in conflicts
4001
if c.typestring in allowed_conflicts]
4002
_mod_merge.transform_tree(tree, tree.basis_tree(), interesting_ids)
4003
tree.set_conflicts(ConflictList(new_conflicts))
4004
if file_list is not None:
4005
restore_files = file_list
4006
for filename in restore_files:
4007
try:
4008
restore(tree.abspath(filename))
4009
except errors.NotConflicted:
4010
pass
4011
# Disable pending merges, because the file texts we are remerging
4012
# have not had those merges performed. If we use the wrong parents
4013
# list, we imply that the working tree text has seen and rejected
4014
# all the changes from the other tree, when in fact those changes
4015
# have not yet been seen.
4016
pb = ui.ui_factory.nested_progress_bar()
4017
tree.set_parent_ids(parents[:1])
4106
4018
try:
4107
restore(tree.abspath(filename))
4108
except errors.NotConflicted:
4109
pass
4110
# Disable pending merges, because the file texts we are remerging
4111
# have not had those merges performed. If we use the wrong parents
4112
# list, we imply that the working tree text has seen and rejected
4113
# all the changes from the other tree, when in fact those changes
4114
# have not yet been seen.
4115
tree.set_parent_ids(parents[:1])
4116
try:
4117
merger = _mod_merge.Merger.from_revision_ids(None, tree, parents[1])
4118
merger.interesting_ids = interesting_ids
4119
merger.merge_type = merge_type
4120
merger.show_base = show_base
4121
merger.reprocess = reprocess
4122
conflicts = merger.do_merge()
4019
merger = _mod_merge.Merger.from_revision_ids(pb,
4020
tree, parents[1])
4021
merger.interesting_ids = interesting_ids
4022
merger.merge_type = merge_type
4023
merger.show_base = show_base
4024
merger.reprocess = reprocess
4025
conflicts = merger.do_merge()
4026
finally:
4027
tree.set_parent_ids(parents)
4028
pb.finished()
4123
4029
finally:
4124
tree.set_parent_ids(parents)
4030
tree.unlock()
4125
4031
if conflicts > 0:
4126
4032
return 1
4127
4033
else:
4129
4035
4130
4036
4131
4037
class cmd_revert(Command):
4132
__doc__ = """Revert files to a previous revision.
4038
"""Revert files to a previous revision.
4133
4039
4134
4040
Giving a list of files will revert only those files. Otherwise, all files
4135
4041
will be reverted. If the revision is not specified with '--revision', the
4149
4055
name. If you name a directory, all the contents of that directory will be
4150
4056
reverted.
4151
4057
4152
If you have newly added files since the target revision, they will be
4153
removed. If the files to be removed have been changed, backups will be
4154
created as above. Directories containing unknown files will not be
4155
deleted.
4058
Any files that have been newly added since that revision will be deleted,
4059
with a backup kept if appropriate. Directories containing unknown files
4060
will not be deleted.
4156
4061
4157
The working tree contains a list of revisions that have been merged but
4158
not yet committed. These revisions will be included as additional parents
4159
of the next commit. Normally, using revert clears that list as well as
4160
reverting the files. If any files are specified, revert leaves the list
4161
of uncommitted merges alone and reverts only the files. Use ``bzr revert
4162
.`` in the tree root to revert all files but keep the recorded merges,
4163
and ``bzr revert --forget-merges`` to clear the pending merge list without
4062
The working tree contains a list of pending merged revisions, which will
4063
be included as parents in the next commit. Normally, revert clears that
4064
list as well as reverting the files. If any files are specified, revert
4065
leaves the pending merge list alone and reverts only the files. Use "bzr
4066
revert ." in the tree root to revert all files but keep the merge record,
4067
and "bzr revert --forget-merges" to clear the pending merge list without
4164
4068
reverting any files.
4165
4166
Using "bzr revert --forget-merges", it is possible to apply all of the
4167
changes from a branch in a single revision. To do this, perform the merge
4168
as desired. Then doing revert with the "--forget-merges" option will keep
4169
the content of the tree as it was, but it will clear the list of pending
4170
merges. The next commit will then contain all of the changes that are
4171
present in the other branch, but without any other parent revisions.
4172
Because this technique forgets where these changes originated, it may
4173
cause additional conflicts on later merges involving the same source and
4174
target branches.
4175
4069
"""
4176
4070
4177
4071
_see_also = ['cat', 'export']
4186
4080
def run(self, revision=None, no_backup=False, file_list=None,
4187
4081
forget_merges=None):
4188
4082
tree, file_list = tree_files(file_list)
4189
self.add_cleanup(tree.lock_tree_write().unlock)
4190
if forget_merges:
4191
tree.set_parent_ids(tree.get_parent_ids()[:1])
4192
else:
4193
self._revert_tree_to_revision(tree, revision, file_list, no_backup)
4083
tree.lock_write()
4084
try:
4085
if forget_merges:
4086
tree.set_parent_ids(tree.get_parent_ids()[:1])
4087
else:
4088
self._revert_tree_to_revision(tree, revision, file_list, no_backup)
4089
finally:
4090
tree.unlock()
4194
4091
4195
4092
@staticmethod
4196
4093
def _revert_tree_to_revision(tree, revision, file_list, no_backup):
4197
4094
rev_tree = _get_one_revision_tree('revert', revision, tree=tree)
4198
tree.revert(file_list, rev_tree, not no_backup, None,
4199
report_changes=True)
4095
pb = ui.ui_factory.nested_progress_bar()
4096
try:
4097
tree.revert(file_list, rev_tree, not no_backup, pb,
4098
report_changes=True)
4099
finally:
4100
pb.finished()
4200
4101
4201
4102
4202
4103
class cmd_assert_fail(Command):
4203
__doc__ = """Test reporting of assertion failures"""
4104
"""Test reporting of assertion failures"""
4204
4105
# intended just for use in testing
4205
4106
4206
4107
hidden = True
4210
4111
4211
4112
4212
4113
class cmd_help(Command):
4213
__doc__ = """Show help on a command or other topic.
4114
"""Show help on a command or other topic.
4214
4115
"""
4215
4116
4216
4117
_see_also = ['topics']
4229
4130
4230
4131
4231
4132
class cmd_shell_complete(Command):
4232
__doc__ = """Show appropriate completions for context.
4133
"""Show appropriate completions for context.
4233
4134
4234
4135
For a list of all available commands, say 'bzr shell-complete'.
4235
4136
"""
4244
4145
4245
4146
4246
4147
class cmd_missing(Command):
4247
__doc__ = """Show unmerged/unpulled revisions between two branches.
4148
"""Show unmerged/unpulled revisions between two branches.
4248
4149
4249
4150
OTHER_BRANCH may be local or remote.
4250
4151
4251
4152
To filter on a range of revisions, you can use the command -r begin..end
4252
4153
-r revision requests a specific revision, -r ..end or -r begin.. are
4253
4154
also valid.
4254
4255
:Exit values:
4256
1 - some missing revisions
4257
0 - no missing revisions
4258
4155
4259
4156
:Examples:
4260
4157
4328
4225
restrict = 'remote'
4329
4226
4330
4227
local_branch = Branch.open_containing(u".")[0]
4331
self.add_cleanup(local_branch.lock_read().unlock)
4332
4333
4228
parent = local_branch.get_parent()
4334
4229
if other_branch is None:
4335
4230
other_branch = parent
4344
4239
remote_branch = Branch.open(other_branch)
4345
4240
if remote_branch.base == local_branch.base:
4346
4241
remote_branch = local_branch
4347
else:
4348
self.add_cleanup(remote_branch.lock_read().unlock)
4349
4242
4350
4243
local_revid_range = _revision_range_to_revid_range(
4351
4244
_get_revision_range(my_revision, local_branch,
4355
4248
_get_revision_range(revision,
4356
4249
remote_branch, self.name()))
4357
4250
4358
local_extra, remote_extra = find_unmerged(
4359
local_branch, remote_branch, restrict,
4360
backward=not reverse,
4361
include_merges=include_merges,
4362
local_revid_range=local_revid_range,
4363
remote_revid_range=remote_revid_range)
4364
4365
if log_format is None:
4366
registry = log.log_formatter_registry
4367
log_format = registry.get_default(local_branch)
4368
lf = log_format(to_file=self.outf,
4369
show_ids=show_ids,
4370
show_timezone='original')
4371
4372
status_code = 0
4373
if local_extra and not theirs_only:
4374
message("You have %d extra revision(s):\n" %
4375
len(local_extra))
4376
for revision in iter_log_revisions(local_extra,
4377
local_branch.repository,
4378
verbose):
4379
lf.log_revision(revision)
4380
printed_local = True
4381
status_code = 1
4382
else:
4383
printed_local = False
4384
4385
if remote_extra and not mine_only:
4386
if printed_local is True:
4387
message("\n\n\n")
4388
message("You are missing %d revision(s):\n" %
4389
len(remote_extra))
4390
for revision in iter_log_revisions(remote_extra,
4391
remote_branch.repository,
4392
verbose):
4393
lf.log_revision(revision)
4394
status_code = 1
4395
4396
if mine_only and not local_extra:
4397
# We checked local, and found nothing extra
4398
message('This branch is up to date.\n')
4399
elif theirs_only and not remote_extra:
4400
# We checked remote, and found nothing extra
4401
message('Other branch is up to date.\n')
4402
elif not (mine_only or theirs_only or local_extra or
4403
remote_extra):
4404
# We checked both branches, and neither one had extra
4405
# revisions
4406
message("Branches are up to date.\n")
4407
self.cleanup_now()
4251
local_branch.lock_read()
4252
try:
4253
remote_branch.lock_read()
4254
try:
4255
local_extra, remote_extra = find_unmerged(
4256
local_branch, remote_branch, restrict,
4257
backward=not reverse,
4258
include_merges=include_merges,
4259
local_revid_range=local_revid_range,
4260
remote_revid_range=remote_revid_range)
4261
4262
if log_format is None:
4263
registry = log.log_formatter_registry
4264
log_format = registry.get_default(local_branch)
4265
lf = log_format(to_file=self.outf,
4266
show_ids=show_ids,
4267
show_timezone='original')
4268
4269
status_code = 0
4270
if local_extra and not theirs_only:
4271
message("You have %d extra revision(s):\n" %
4272
len(local_extra))
4273
for revision in iter_log_revisions(local_extra,
4274
local_branch.repository,
4275
verbose):
4276
lf.log_revision(revision)
4277
printed_local = True
4278
status_code = 1
4279
else:
4280
printed_local = False
4281
4282
if remote_extra and not mine_only:
4283
if printed_local is True:
4284
message("\n\n\n")
4285
message("You are missing %d revision(s):\n" %
4286
len(remote_extra))
4287
for revision in iter_log_revisions(remote_extra,
4288
remote_branch.repository,
4289
verbose):
4290
lf.log_revision(revision)
4291
status_code = 1
4292
4293
if mine_only and not local_extra:
4294
# We checked local, and found nothing extra
4295
message('This branch is up to date.\n')
4296
elif theirs_only and not remote_extra:
4297
# We checked remote, and found nothing extra
4298
message('Other branch is up to date.\n')
4299
elif not (mine_only or theirs_only or local_extra or
4300
remote_extra):
4301
# We checked both branches, and neither one had extra
4302
# revisions
4303
message("Branches are up to date.\n")
4304
finally:
4305
remote_branch.unlock()
4306
finally:
4307
local_branch.unlock()
4408
4308
if not status_code and parent is None and other_branch is not None:
4409
self.add_cleanup(local_branch.lock_write().unlock)
4410
# handle race conditions - a parent might be set while we run.
4411
if local_branch.get_parent() is None:
4412
local_branch.set_parent(remote_branch.base)
4309
local_branch.lock_write()
4310
try:
4311
# handle race conditions - a parent might be set while we run.
4312
if local_branch.get_parent() is None:
4313
local_branch.set_parent(remote_branch.base)
4314
finally:
4315
local_branch.unlock()
4413
4316
return status_code
4414
4317
4415
4318
4416
4319
class cmd_pack(Command):
4417
__doc__ = """Compress the data within a repository.
4418
4419
This operation compresses the data within a bazaar repository. As
4420
bazaar supports automatic packing of repository, this operation is
4421
normally not required to be done manually.
4422
4423
During the pack operation, bazaar takes a backup of existing repository
4424
data, i.e. pack files. This backup is eventually removed by bazaar
4425
automatically when it is safe to do so. To save disk space by removing
4426
the backed up pack files, the --clean-obsolete-packs option may be
4427
used.
4428
4429
Warning: If you use --clean-obsolete-packs and your machine crashes
4430
during or immediately after repacking, you may be left with a state
4431
where the deletion has been written to disk but the new packs have not
4432
been. In this case the repository may be unusable.
4433
"""
4320
"""Compress the data within a repository."""
4434
4321
4435
4322
_see_also = ['repositories']
4436
4323
takes_args = ['branch_or_repo?']
4437
takes_options = [
4438
Option('clean-obsolete-packs', 'Delete obsolete packs to save disk space.'),
4439
]
4440
4324
4441
def run(self, branch_or_repo='.', clean_obsolete_packs=False):
4325
def run(self, branch_or_repo='.'):
4442
4326
dir = bzrdir.BzrDir.open_containing(branch_or_repo)[0]
4443
4327
try:
4444
4328
branch = dir.open_branch()
4445
4329
repository = branch.repository
4446
4330
except errors.NotBranchError:
4447
4331
repository = dir.open_repository()
4448
repository.pack(clean_obsolete_packs=clean_obsolete_packs)
4332
repository.pack()
4449
4333
4450
4334
4451
4335
class cmd_plugins(Command):
4452
__doc__ = """List the installed plugins.
4336
"""List the installed plugins.
4453
4337
4454
4338
This command displays the list of installed plugins including
4455
4339
version of plugin and a short description of each.
4462
4346
adding new commands, providing additional network transports and
4463
4347
customizing log output.
4464
4348
4465
See the Bazaar Plugin Guide <http://doc.bazaar.canonical.com/plugins/en/>
4466
for further information on plugins including where to find them and how to
4467
install them. Instructions are also provided there on how to write new
4468
plugins using the Python programming language.
4349
See the Bazaar web site, http://bazaar-vcs.org, for further
4350
information on plugins including where to find them and how to
4351
install them. Instructions are also provided there on how to
4352
write new plugins using the Python programming language.
4469
4353
"""
4470
4354
takes_options = ['verbose']
4471
4355
4486
4370
doc = '(no description)'
4487
4371
result.append((name_ver, doc, plugin.path()))
4488
4372
for name_ver, doc, path in sorted(result):
4489
self.outf.write("%s\n" % name_ver)
4490
self.outf.write(" %s\n" % doc)
4373
print name_ver
4374
print ' ', doc
4491
4375
if verbose:
4492
self.outf.write(" %s\n" % path)
4493
self.outf.write("\n")
4376
print ' ', path
4377
print
4494
4378
4495
4379
4496
4380
class cmd_testament(Command):
4497
__doc__ = """Show testament (signing-form) of a revision."""
4381
"""Show testament (signing-form) of a revision."""
4498
4382
takes_options = [
4499
4383
'revision',
4500
4384
Option('long', help='Produce long-format testament.'),
4512
4396
b = Branch.open_containing(branch)[0]
4513
4397
else:
4514
4398
b = Branch.open(branch)
4515
self.add_cleanup(b.lock_read().unlock)
4516
if revision is None:
4517
rev_id = b.last_revision()
4518
else:
4519
rev_id = revision[0].as_revision_id(b)
4520
t = testament_class.from_revision(b.repository, rev_id)
4521
if long:
4522
sys.stdout.writelines(t.as_text_lines())
4523
else:
4524
sys.stdout.write(t.as_short_text())
4399
b.lock_read()
4400
try:
4401
if revision is None:
4402
rev_id = b.last_revision()
4403
else:
4404
rev_id = revision[0].as_revision_id(b)
4405
t = testament_class.from_revision(b.repository, rev_id)
4406
if long:
4407
sys.stdout.writelines(t.as_text_lines())
4408
else:
4409
sys.stdout.write(t.as_short_text())
4410
finally:
4411
b.unlock()
4525
4412
4526
4413
4527
4414
class cmd_annotate(Command):
4528
__doc__ = """Show the origin of each line in a file.
4415
"""Show the origin of each line in a file.
4529
4416
4530
4417
This prints out the given file with an annotation on the left side
4531
4418
indicating which revision, author and date introduced the change.
4552
4439
wt, branch, relpath = \
4553
4440
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
4554
4441
if wt is not None:
4555
self.add_cleanup(wt.lock_read().unlock)
4556
else:
4557
self.add_cleanup(branch.lock_read().unlock)
4558
tree = _get_one_revision_tree('annotate', revision, branch=branch)
4559
self.add_cleanup(tree.lock_read().unlock)
4560
if wt is not None:
4561
file_id = wt.path2id(relpath)
4562
else:
4563
file_id = tree.path2id(relpath)
4564
if file_id is None:
4565
raise errors.NotVersionedError(filename)
4566
file_version = tree.inventory[file_id].revision
4567
if wt is not None and revision is None:
4568
# If there is a tree and we're not annotating historical
4569
# versions, annotate the working tree's content.
4570
annotate_file_tree(wt, file_id, self.outf, long, all,
4571
show_ids=show_ids)
4572
else:
4573
annotate_file(branch, file_version, file_id, long, all, self.outf,
4574
show_ids=show_ids)
4442
wt.lock_read()
4443
else:
4444
branch.lock_read()
4445
try:
4446
tree = _get_one_revision_tree('annotate', revision, branch=branch)
4447
if wt is not None:
4448
file_id = wt.path2id(relpath)
4449
else:
4450
file_id = tree.path2id(relpath)
4451
if file_id is None:
4452
raise errors.NotVersionedError(filename)
4453
file_version = tree.inventory[file_id].revision
4454
if wt is not None and revision is None:
4455
# If there is a tree and we're not annotating historical
4456
# versions, annotate the working tree's content.
4457
annotate_file_tree(wt, file_id, self.outf, long, all,
4458
show_ids=show_ids)
4459
else:
4460
annotate_file(branch, file_version, file_id, long, all, self.outf,
4461
show_ids=show_ids)
4462
finally:
4463
if wt is not None:
4464
wt.unlock()
4465
else:
4466
branch.unlock()
4575
4467
4576
4468
4577
4469
class cmd_re_sign(Command):
4578
__doc__ = """Create a digital signature for an existing revision."""
4470
"""Create a digital signature for an existing revision."""
4579
4471
# TODO be able to replace existing ones.
4580
4472
4581
4473
hidden = True # is this right ?
4588
4480
if revision_id_list is None and revision is None:
4589
4481
raise errors.BzrCommandError('You must supply either --revision or a revision_id')
4590
4482
b = WorkingTree.open_containing(u'.')[0].branch
4591
self.add_cleanup(b.lock_write().unlock)
4592
return self._run(b, revision_id_list, revision)
4483
b.lock_write()
4484
try:
4485
return self._run(b, revision_id_list, revision)
4486
finally:
4487
b.unlock()
4593
4488
4594
4489
def _run(self, b, revision_id_list, revision):
4595
4490
import bzrlib.gpg as gpg
4640
4535
4641
4536
4642
4537
class cmd_bind(Command):
4643
__doc__ = """Convert the current branch into a checkout of the supplied branch.
4644
If no branch is supplied, rebind to the last bound location.
4538
"""Convert the current branch into a checkout of the supplied branch.
4645
4539
4646
4540
Once converted into a checkout, commits must succeed on the master branch
4647
4541
before they will be applied to the local branch.
4665
4559
'This format does not remember old locations.')
4666
4560
else:
4667
4561
if location is None:
4668
if b.get_bound_location() is not None:
4669
raise errors.BzrCommandError('Branch is already bound')
4670
else:
4671
raise errors.BzrCommandError('No location supplied '
4672
'and no previous location known')
4562
raise errors.BzrCommandError('No location supplied and no '
4563
'previous location known')
4673
4564
b_other = Branch.open(location)
4674
4565
try:
4675
4566
b.bind(b_other)
4681
4572
4682
4573
4683
4574
class cmd_unbind(Command):
4684
__doc__ = """Convert the current checkout into a regular branch.
4575
"""Convert the current checkout into a regular branch.
4685
4576
4686
4577
After unbinding, the local branch is considered independent and subsequent
4687
4578
commits will be local only.
4698
4589
4699
4590
4700
4591
class cmd_uncommit(Command):
4701
__doc__ = """Remove the last committed revision.
4592
"""Remove the last committed revision.
4702
4593
4703
4594
--verbose will print out what is being removed.
4704
4595
--dry-run will go through all the motions, but not actually
4744
4635
b = control.open_branch()
4745
4636
4746
4637
if tree is not None:
4747
self.add_cleanup(tree.lock_write().unlock)
4638
tree.lock_write()
4748
4639
else:
4749
self.add_cleanup(b.lock_write().unlock)
4750
return self._run(b, tree, dry_run, verbose, revision, force, local=local)
4640
b.lock_write()
4641
try:
4642
return self._run(b, tree, dry_run, verbose, revision, force,
4643
local=local)
4644
finally:
4645
if tree is not None:
4646
tree.unlock()
4647
else:
4648
b.unlock()
4751
4649
4752
4650
def _run(self, b, tree, dry_run, verbose, revision, force, local=False):
4753
4651
from bzrlib.log import log_formatter, show_log
4785
4683
end_revision=last_revno)
4786
4684
4787
4685
if dry_run:
4788
self.outf.write('Dry-run, pretending to remove'
4789
' the above revisions.\n')
4686
print 'Dry-run, pretending to remove the above revisions.'
4687
if not force:
4688
val = raw_input('Press <enter> to continue')
4790
4689
else:
4791
self.outf.write('The above revision(s) will be removed.\n')
4792
4793
if not force:
4794
if not ui.ui_factory.get_boolean('Are you sure'):
4795
self.outf.write('Canceled')
4796
return 0
4690
print 'The above revision(s) will be removed.'
4691
if not force:
4692
val = raw_input('Are you sure [y/N]? ')
4693
if val.lower() not in ('y', 'yes'):
4694
print 'Canceled'
4695
return 0
4797
4696
4798
4697
mutter('Uncommitting from {%s} to {%s}',
4799
4698
last_rev_id, rev_id)
4800
4699
uncommit(b, tree=tree, dry_run=dry_run, verbose=verbose,
4801
4700
revno=revno, local=local)
4802
self.outf.write('You can restore the old tip by running:\n'
4803
' bzr pull . -r revid:%s\n' % last_rev_id)
4701
note('You can restore the old tip by running:\n'
4702
' bzr pull . -r revid:%s', last_rev_id)
4804
4703
4805
4704
4806
4705
class cmd_break_lock(Command):
4807
__doc__ = """Break a dead lock on a repository, branch or working directory.
4706
"""Break a dead lock on a repository, branch or working directory.
4808
4707
4809
4708
CAUTION: Locks should only be broken when you are sure that the process
4810
4709
holding the lock has been stopped.
4811
4710
4812
You can get information on what locks are open via the 'bzr info
4813
[location]' command.
4711
You can get information on what locks are open via the 'bzr info' command.
4814
4712
4815
4713
:Examples:
4816
4714
bzr break-lock
4817
bzr break-lock bzr+ssh://example.com/bzr/foo
4818
4715
"""
4819
4716
takes_args = ['location?']
4820
4717
4829
4726
4830
4727
4831
4728
class cmd_wait_until_signalled(Command):
4832
__doc__ = """Test helper for test_start_and_stop_bzr_subprocess_send_signal.
4729
"""Test helper for test_start_and_stop_bzr_subprocess_send_signal.
4833
4730
4834
4731
This just prints a line to signal when it is ready, then blocks on stdin.
4835
4732
"""
4843
4740
4844
4741
4845
4742
class cmd_serve(Command):
4846
__doc__ = """Run the bzr server."""
4743
"""Run the bzr server."""
4847
4744
4848
4745
aliases = ['server']
4849
4746
4850
4747
takes_options = [
4851
4748
Option('inet',
4852
4749
help='Serve on stdin/out for use from inetd or sshd.'),
4853
RegistryOption('protocol',
4854
help="Protocol to serve.",
4750
RegistryOption('protocol',
4751
help="Protocol to serve.",
4855
4752
lazy_registry=('bzrlib.transport', 'transport_server_registry'),
4856
4753
value_switches=True),
4857
4754
Option('port',
4866
4763
Option('allow-writes',
4867
4764
help='By default the server is a readonly server. Supplying '
4868
4765
'--allow-writes enables write access to the contents of '
4869
'the served directory and below. Note that ``bzr serve`` '
4870
'does not perform authentication, so unless some form of '
4871
'external authentication is arranged supplying this '
4872
'option leads to global uncontrolled write access to your '
4873
'file system.'
4766
'the served directory and below.'
4874
4767
),
4875
4768
]
4876
4769
4909
4802
4910
4803
4911
4804
class cmd_join(Command):
4912
__doc__ = """Combine a tree into its containing tree.
4805
"""Combine a tree into its containing tree.
4913
4806
4914
4807
This command requires the target tree to be in a rich-root format.
4915
4808
4955
4848
4956
4849
4957
4850
class cmd_split(Command):
4958
__doc__ = """Split a subdirectory of a tree into a separate tree.
4851
"""Split a subdirectory of a tree into a separate tree.
4959
4852
4960
4853
This command will produce a target tree in a format that supports
4961
4854
rich roots, like 'rich-root' or 'rich-root-pack'. These formats cannot be
4981
4874
4982
4875
4983
4876
class cmd_merge_directive(Command):
4984
__doc__ = """Generate a merge directive for auto-merge tools.
4877
"""Generate a merge directive for auto-merge tools.
4985
4878
4986
4879
A directive requests a merge to be performed, and also provides all the
4987
4880
information necessary to do so. This means it must either include a
5080
4973
5081
4974
5082
4975
class cmd_send(Command):
5083
__doc__ = """Mail or create a merge-directive for submitting changes.
4976
"""Mail or create a merge-directive for submitting changes.
5084
4977
5085
4978
A merge directive provides many things needed for requesting merges:
5086
4979
5092
4985
directly from the merge directive, without retrieving data from a
5093
4986
branch.
5094
4987
5095
`bzr send` creates a compact data set that, when applied using bzr
5096
merge, has the same effect as merging from the source branch.
5097
5098
By default the merge directive is self-contained and can be applied to any
5099
branch containing submit_branch in its ancestory without needing access to
5100
the source branch.
5101
5102
If --no-bundle is specified, then Bazaar doesn't send the contents of the
5103
revisions, but only a structured request to merge from the
5104
public_location. In that case the public_branch is needed and it must be
5105
up-to-date and accessible to the recipient. The public_branch is always
5106
included if known, so that people can check it later.
5107
5108
The submit branch defaults to the parent of the source branch, but can be
5109
overridden. Both submit branch and public branch will be remembered in
5110
branch.conf the first time they are used for a particular branch. The
5111
source branch defaults to that containing the working directory, but can
5112
be changed using --from.
5113
5114
In order to calculate those changes, bzr must analyse the submit branch.
5115
Therefore it is most efficient for the submit branch to be a local mirror.
5116
If a public location is known for the submit_branch, that location is used
5117
in the merge directive.
5118
5119
The default behaviour is to send the merge directive by mail, unless -o is
5120
given, in which case it is sent to a file.
4988
If --no-bundle is specified, then public_branch is needed (and must be
4989
up-to-date), so that the receiver can perform the merge using the
4990
public_branch. The public_branch is always included if known, so that
4991
people can check it later.
4992
4993
The submit branch defaults to the parent, but can be overridden. Both
4994
submit branch and public branch will be remembered if supplied.
4995
4996
If a public_branch is known for the submit_branch, that public submit
4997
branch is used in the merge instructions. This means that a local mirror
4998
can be used as your actual submit branch, once you have set public_branch
4999
for that mirror.
5121
5000
5122
5001
Mail is sent using your preferred mail program. This should be transparent
5123
5002
on Windows (it uses MAPI). On Linux, it requires the xdg-email utility.
5143
5022
5144
5023
The merge directives created by bzr send may be applied using bzr merge or
5145
5024
bzr pull by specifying a file containing a merge directive as the location.
5146
5147
bzr send makes extensive use of public locations to map local locations into
5148
URLs that can be used by other people. See `bzr help configuration` to
5149
set them, and use `bzr info` to display them.
5150
5025
"""
5151
5026
5152
5027
encoding_type = 'exact'
5168
5043
short_name='f',
5169
5044
type=unicode),
5170
5045
Option('output', short_name='o',
5171
help='Write merge directive to this file or directory; '
5046
help='Write merge directive to this file; '
5172
5047
'use - for stdout.',
5173
5048
type=unicode),
5174
5049
Option('strict',
5197
5072
5198
5073
5199
5074
class cmd_bundle_revisions(cmd_send):
5200
__doc__ = """Create a merge-directive for submitting changes.
5075
"""Create a merge-directive for submitting changes.
5201
5076
5202
5077
A merge directive provides many things needed for requesting merges:
5203
5078
5270
5145
5271
5146
5272
5147
class cmd_tag(Command):
5273
__doc__ = """Create, remove or modify a tag naming a revision.
5148
"""Create, remove or modify a tag naming a revision.
5274
5149
5275
5150
Tags give human-meaningful names to revisions. Commands that take a -r
5276
5151
(--revision) option can be given -rtag:X, where X is any previously
5284
5159
5285
5160
To rename a tag (change the name but keep it on the same revsion), run ``bzr
5286
5161
tag new-name -r tag:old-name`` and then ``bzr tag --delete oldname``.
5287
5288
If no tag name is specified it will be determined through the
5289
'automatic_tag_name' hook. This can e.g. be used to automatically tag
5290
upstream releases by reading configure.ac. See ``bzr help hooks`` for
5291
details.
5292
5162
"""
5293
5163
5294
5164
_see_also = ['commit', 'tags']
5295
takes_args = ['tag_name?']
5165
takes_args = ['tag_name']
5296
5166
takes_options = [
5297
5167
Option('delete',
5298
5168
help='Delete this tag rather than placing it.',
5308
5178
'revision',
5309
5179
]
5310
5180
5311
def run(self, tag_name=None,
5181
def run(self, tag_name,
5312
5182
delete=None,
5313
5183
directory='.',
5314
5184
force=None,
5315
5185
revision=None,
5316
5186
):
5317
5187
branch, relpath = Branch.open_containing(directory)
5318
self.add_cleanup(branch.lock_write().unlock)
5319
if delete:
5320
if tag_name is None:
5321
raise errors.BzrCommandError("No tag specified to delete.")
5322
branch.tags.delete_tag(tag_name)
5323
self.outf.write('Deleted tag %s.\n' % tag_name)
5324
else:
5325
if revision:
5326
if len(revision) != 1:
5327
raise errors.BzrCommandError(
5328
"Tags can only be placed on a single revision, "
5329
"not on a range")
5330
revision_id = revision[0].as_revision_id(branch)
5188
branch.lock_write()
5189
try:
5190
if delete:
5191
branch.tags.delete_tag(tag_name)
5192
self.outf.write('Deleted tag %s.\n' % tag_name)
5331
5193
else:
5332
revision_id = branch.last_revision()
5333
if tag_name is None:
5334
tag_name = branch.automatic_tag_name(revision_id)
5335
if tag_name is None:
5336
raise errors.BzrCommandError(
5337
"Please specify a tag name.")
5338
if (not force) and branch.tags.has_tag(tag_name):
5339
raise errors.TagAlreadyExists(tag_name)
5340
branch.tags.set_tag(tag_name, revision_id)
5341
self.outf.write('Created tag %s.\n' % tag_name)
5194
if revision:
5195
if len(revision) != 1:
5196
raise errors.BzrCommandError(
5197
"Tags can only be placed on a single revision, "
5198
"not on a range")
5199
revision_id = revision[0].as_revision_id(branch)
5200
else:
5201
revision_id = branch.last_revision()
5202
if (not force) and branch.tags.has_tag(tag_name):
5203
raise errors.TagAlreadyExists(tag_name)
5204
branch.tags.set_tag(tag_name, revision_id)
5205
self.outf.write('Created tag %s.\n' % tag_name)
5206
finally:
5207
branch.unlock()
5342
5208
5343
5209
5344
5210
class cmd_tags(Command):
5345
__doc__ = """List tags.
5211
"""List tags.
5346
5212
5347
5213
This command shows a table of tag names and the revisions they reference.
5348
5214
"""
5376
5242
if not tags:
5377
5243
return
5378
5244
5379
self.add_cleanup(branch.lock_read().unlock)
5380
if revision:
5381
graph = branch.repository.get_graph()
5382
rev1, rev2 = _get_revision_range(revision, branch, self.name())
5383
revid1, revid2 = rev1.rev_id, rev2.rev_id
5384
# only show revisions between revid1 and revid2 (inclusive)
5385
tags = [(tag, revid) for tag, revid in tags if
5386
graph.is_between(revid, revid1, revid2)]
5387
if sort == 'alpha':
5388
tags.sort()
5389
elif sort == 'time':
5390
timestamps = {}
5391
for tag, revid in tags:
5392
try:
5393
revobj = branch.repository.get_revision(revid)
5394
except errors.NoSuchRevision:
5395
timestamp = sys.maxint # place them at the end
5396
else:
5397
timestamp = revobj.timestamp
5398
timestamps[revid] = timestamp
5399
tags.sort(key=lambda x: timestamps[x[1]])
5400
if not show_ids:
5401
# [ (tag, revid), ... ] -> [ (tag, dotted_revno), ... ]
5402
for index, (tag, revid) in enumerate(tags):
5403
try:
5404
revno = branch.revision_id_to_dotted_revno(revid)
5405
if isinstance(revno, tuple):
5406
revno = '.'.join(map(str, revno))
5407
except errors.NoSuchRevision:
5408
# Bad tag data/merges can lead to tagged revisions
5409
# which are not in this branch. Fail gracefully ...
5410
revno = '?'
5411
tags[index] = (tag, revno)
5412
self.cleanup_now()
5245
branch.lock_read()
5246
try:
5247
if revision:
5248
graph = branch.repository.get_graph()
5249
rev1, rev2 = _get_revision_range(revision, branch, self.name())
5250
revid1, revid2 = rev1.rev_id, rev2.rev_id
5251
# only show revisions between revid1 and revid2 (inclusive)
5252
tags = [(tag, revid) for tag, revid in tags if
5253
graph.is_between(revid, revid1, revid2)]
5254
if sort == 'alpha':
5255
tags.sort()
5256
elif sort == 'time':
5257
timestamps = {}
5258
for tag, revid in tags:
5259
try:
5260
revobj = branch.repository.get_revision(revid)
5261
except errors.NoSuchRevision:
5262
timestamp = sys.maxint # place them at the end
5263
else:
5264
timestamp = revobj.timestamp
5265
timestamps[revid] = timestamp
5266
tags.sort(key=lambda x: timestamps[x[1]])
5267
if not show_ids:
5268
# [ (tag, revid), ... ] -> [ (tag, dotted_revno), ... ]
5269
for index, (tag, revid) in enumerate(tags):
5270
try:
5271
revno = branch.revision_id_to_dotted_revno(revid)
5272
if isinstance(revno, tuple):
5273
revno = '.'.join(map(str, revno))
5274
except errors.NoSuchRevision:
5275
# Bad tag data/merges can lead to tagged revisions
5276
# which are not in this branch. Fail gracefully ...
5277
revno = '?'
5278
tags[index] = (tag, revno)
5279
finally:
5280
branch.unlock()
5413
5281
for tag, revspec in tags:
5414
5282
self.outf.write('%-20s %s\n' % (tag, revspec))
5415
5283
5416
5284
5417
5285
class cmd_reconfigure(Command):
5418
__doc__ = """Reconfigure the type of a bzr directory.
5286
"""Reconfigure the type of a bzr directory.
5419
5287
5420
5288
A target configuration must be specified.
5421
5289
5506
5374
5507
5375
5508
5376
class cmd_switch(Command):
5509
__doc__ = """Set the branch of a checkout and update.
5377
"""Set the branch of a checkout and update.
5510
5378
5511
5379
For lightweight checkouts, this changes the branch being referenced.
5512
5380
For heavyweight checkouts, this checks that there are no local commits
5528
5396
that of the master.
5529
5397
"""
5530
5398
5531
takes_args = ['to_location?']
5399
takes_args = ['to_location']
5532
5400
takes_options = [Option('force',
5533
5401
help='Switch even if local commits will be lost.'),
5534
'revision',
5535
5402
Option('create-branch', short_name='b',
5536
5403
help='Create the target branch from this one before'
5537
5404
' switching to it.'),
5538
]
5405
]
5539
5406
5540
def run(self, to_location=None, force=False, create_branch=False,
5541
revision=None):
5407
def run(self, to_location, force=False, create_branch=False):
5542
5408
from bzrlib import switch
5543
5409
tree_location = '.'
5544
revision = _get_one_revision('switch', revision)
5545
5410
control_dir = bzrdir.BzrDir.open_containing(tree_location)[0]
5546
if to_location is None:
5547
if revision is None:
5548
raise errors.BzrCommandError('You must supply either a'
5549
' revision or a location')
5550
to_location = '.'
5551
5411
try:
5552
5412
branch = control_dir.open_branch()
5553
5413
had_explicit_nick = branch.get_config().has_explicit_nickname()
5558
5418
if branch is None:
5559
5419
raise errors.BzrCommandError('cannot create branch without'
5560
5420
' source branch')
5561
to_location = directory_service.directories.dereference(
5562
to_location)
5563
5421
if '/' not in to_location and '\\' not in to_location:
5564
5422
# This path is meant to be relative to the existing branch
5565
5423
this_url = self._get_branch_location(control_dir)
5567
5425
to_branch = branch.bzrdir.sprout(to_location,
5568
5426
possible_transports=[branch.bzrdir.root_transport],
5569
5427
source_branch=branch).open_branch()
5428
# try:
5429
# from_branch = control_dir.open_branch()
5430
# except errors.NotBranchError:
5431
# raise BzrCommandError('Cannot create a branch from this'
5432
# ' location when we cannot open this branch')
5433
# from_branch.bzrdir.sprout(
5434
pass
5570
5435
else:
5571
5436
try:
5572
5437
to_branch = Branch.open(to_location)
5574
5439
this_url = self._get_branch_location(control_dir)
5575
5440
to_branch = Branch.open(
5576
5441
urlutils.join(this_url, '..', to_location))
5577
if revision is not None:
5578
revision = revision.as_revision_id(to_branch)
5579
switch.switch(control_dir, to_branch, force, revision_id=revision)
5442
switch.switch(control_dir, to_branch, force)
5580
5443
if had_explicit_nick:
5581
5444
branch = control_dir.open_branch() #get the new branch!
5582
5445
branch.nick = to_branch.nick
5602
5465
5603
5466
5604
5467
class cmd_view(Command):
5605
__doc__ = """Manage filtered views.
5468
"""Manage filtered views.
5606
5469
5607
5470
Views provide a mask over the tree so that users can focus on
5608
5471
a subset of a tree when doing their work. After creating a view,
5756
5619
5757
5620
5758
5621
class cmd_hooks(Command):
5759
__doc__ = """Show hooks."""
5622
"""Show hooks."""
5760
5623
5761
5624
hidden = True
5762
5625
5775
5638
self.outf.write(" <no hooks installed>\n")
5776
5639
5777
5640
5778
class cmd_remove_branch(Command):
5779
__doc__ = """Remove a branch.
5780
5781
This will remove the branch from the specified location but
5782
will keep any working tree or repository in place.
5783
5784
:Examples:
5785
5786
Remove the branch at repo/trunk::
5787
5788
bzr remove-branch repo/trunk
5789
5790
"""
5791
5792
takes_args = ["location?"]
5793
5794
aliases = ["rmbranch"]
5795
5796
def run(self, location=None):
5797
if location is None:
5798
location = "."
5799
branch = Branch.open_containing(location)[0]
5800
branch.bzrdir.destroy_branch()
5801
5802
5803
5641
class cmd_shelve(Command):
5804
__doc__ = """Temporarily set aside some changes from the current tree.
5642
"""Temporarily set aside some changes from the current tree.
5805
5643
5806
5644
Shelve allows you to temporarily put changes you've made "on the shelf",
5807
5645
ie. out of the way, until a later time when you can bring them back from
5860
5698
5861
5699
def run_for_list(self):
5862
5700
tree = WorkingTree.open_containing('.')[0]
5863
self.add_cleanup(tree.lock_read().unlock)
5864
manager = tree.get_shelf_manager()
5865
shelves = manager.active_shelves()
5866
if len(shelves) == 0:
5867
note('No shelved changes.')
5868
return 0
5869
for shelf_id in reversed(shelves):
5870
message = manager.get_metadata(shelf_id).get('message')
5871
if message is None:
5872
message = '<no message>'
5873
self.outf.write('%3d: %s\n' % (shelf_id, message))
5874
return 1
5701
tree.lock_read()
5702
try:
5703
manager = tree.get_shelf_manager()
5704
shelves = manager.active_shelves()
5705
if len(shelves) == 0:
5706
note('No shelved changes.')
5707
return 0
5708
for shelf_id in reversed(shelves):
5709
message = manager.get_metadata(shelf_id).get('message')
5710
if message is None:
5711
message = '<no message>'
5712
self.outf.write('%3d: %s\n' % (shelf_id, message))
5713
return 1
5714
finally:
5715
tree.unlock()
5875
5716
5876
5717
5877
5718
class cmd_unshelve(Command):
5878
__doc__ = """Restore shelved changes.
5719
"""Restore shelved changes.
5879
5720
5880
5721
By default, the most recently shelved changes are restored. However if you
5881
5722
specify a shelf by id those changes will be restored instead. This works
5889
5730
enum_switch=False, value_switches=True,
5890
5731
apply="Apply changes and remove from the shelf.",
5891
5732
dry_run="Show changes, but do not apply or remove them.",
5892
preview="Instead of unshelving the changes, show the diff that "
5893
"would result from unshelving.",
5894
delete_only="Delete changes without applying them.",
5895
keep="Apply changes but don't delete them.",
5733
delete_only="Delete changes without applying them."
5896
5734
)
5897
5735
]
5898
5736
_see_also = ['shelve']
5907
5745
5908
5746
5909
5747
class cmd_clean_tree(Command):
5910
__doc__ = """Remove unwanted files from working tree.
5748
"""Remove unwanted files from working tree.
5911
5749
5912
5750
By default, only unknown files, not ignored files, are deleted. Versioned
5913
5751
files are never deleted.
5941
5779
5942
5780
5943
5781
class cmd_reference(Command):
5944
__doc__ = """list, view and set branch locations for nested trees.
5782
"""list, view and set branch locations for nested trees.
5945
5783
5946
5784
If no arguments are provided, lists the branch locations for nested trees.
5947
5785
If one argument is provided, display the branch location for that tree.
5987
5825
self.outf.write('%s %s\n' % (path, location))
5988
5826
5989
5827
5990
def _register_lazy_builtins():
5991
# register lazy builtins from other modules; called at startup and should
5992
# be only called once.
5993
for (name, aliases, module_name) in [
5994
('cmd_bundle_info', [], 'bzrlib.bundle.commands'),
5995
('cmd_dpush', [], 'bzrlib.foreign'),
5996
('cmd_version_info', [], 'bzrlib.cmd_version_info'),
5997
('cmd_resolve', ['resolved'], 'bzrlib.conflicts'),
5998
('cmd_conflicts', [], 'bzrlib.conflicts'),
5999
('cmd_sign_my_commits', [], 'bzrlib.sign_my_commits'),
6000
]:
6001
builtin_command_registry.register_lazy(name, aliases, module_name)
5828
# these get imported and then picked up by the scan for cmd_*
5829
# TODO: Some more consistent way to split command definitions across files;
5830
# we do need to load at least some information about them to know of
5831
# aliases. ideally we would avoid loading the implementation until the
5832
# details were needed.
5833
from bzrlib.cmd_version_info import cmd_version_info
5834
from bzrlib.conflicts import cmd_resolve, cmd_conflicts, restore
5835
from bzrlib.bundle.commands import (
5836
cmd_bundle_info,
5837
)
5838
from bzrlib.foreign import cmd_dpush
5839
from bzrlib.sign_my_commits import cmd_sign_my_commits
5840
from bzrlib.weave_commands import cmd_versionedfile_list, \
5841
cmd_weave_plan_merge, cmd_weave_merge_text
Loggerhead is a web-based interface for Breezy
Version: 2.0.1