To get this branch, use:
bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
« back to all changes in this revision
Viewing changes to bzrlib/builtins.py
- browse files at revision 4857.4.5
- compare with another revision
- download diff
- download tarball
- view history from revision 4857.4.5
- Committer: John Arbash Meinel
- Date: 2009-12-03 19:54:38 UTC
- mto: This revision was merged to the branch mainline in revision 4877.
- Revision ID: john@arbash-meinel.com-20091203195438-1iaq16e9tmx4edc2
We don't need the utf8 option, no test actually wanted to run without it,
it was just written the 'easy' way.
it was just written the 'easy' way.
- files added:
- bzrlib/weave_commands.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,
54
53
)
55
54
from bzrlib.branch import Branch
56
55
from bzrlib.conflicts import ConflictList
57
from bzrlib.transport import memory
58
56
from bzrlib.revisionspec import RevisionSpec, RevisionInfo
59
57
from bzrlib.smtp_connection import SMTPConnection
60
58
from bzrlib.workingtree import WorkingTree
61
59
""")
62
60
63
from bzrlib.commands import (
64
Command,
65
builtin_command_registry,
66
display_command,
67
)
61
from bzrlib.commands import Command, display_command
68
62
from bzrlib.option import (
69
63
ListOption,
70
64
Option,
239
233
# opens the branch?)
240
234
241
235
class cmd_status(Command):
242
__doc__ = """Display status summary.
236
"""Display status summary.
243
237
244
238
This reports on versioned and unknown files, reporting them
245
239
grouped by state. Possible states are:
332
326
333
327
334
328
class cmd_cat_revision(Command):
335
__doc__ = """Write out metadata for a revision.
329
"""Write out metadata for a revision.
336
330
337
331
The revision to print can either be specified by a specific
338
332
revision identifier, or you can use --revision.
344
338
# cat-revision is more for frontends so should be exact
345
339
encoding = 'strict'
346
340
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
341
@display_command
356
342
def run(self, revision_id=None, revision=None):
357
343
if revision_id is not None and revision is not None:
362
348
' --revision or a revision_id')
363
349
b = WorkingTree.open_containing(u'.')[0].branch
364
350
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')
351
# TODO: jam 20060112 should cat-revision always output utf-8?
352
if revision_id is not None:
353
revision_id = osutils.safe_revision_id(revision_id, warn=False)
354
try:
355
self.outf.write(b.repository.get_revision_xml(revision_id).decode('utf-8'))
356
except errors.NoSuchRevision:
357
msg = "The repository %s contains no revision %s." % (b.repository.base,
358
revision_id)
359
raise errors.BzrCommandError(msg)
360
elif revision is not None:
361
for rev in revision:
362
if rev is None:
363
raise errors.BzrCommandError('You cannot specify a NULL'
364
' revision.')
365
rev_id = rev.as_revision_id(b)
366
self.outf.write(b.repository.get_revision_xml(rev_id).decode('utf-8'))
369
367
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
368
392
369
class cmd_dump_btree(Command):
393
__doc__ = """Dump the contents of a btree index file to stdout.
370
"""Dump the contents of a btree index file to stdout.
394
371
395
372
PATH is a btree index file, it can be any URL. This includes things like
396
373
.bzr/repository/pack-names, or .bzr/repository/indices/a34b3a...ca4a4.iix
460
437
for node in bt.iter_all_entries():
461
438
# Node is made up of:
462
439
# (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)
440
refs_as_tuples = static_tuple.as_tuples(node[3])
469
441
as_tuple = (tuple(node[1]), node[2], refs_as_tuples)
470
442
self.outf.write('%s\n' % (as_tuple,))
471
443
472
444
473
445
class cmd_remove_tree(Command):
474
__doc__ = """Remove the working tree from a given branch/checkout.
446
"""Remove the working tree from a given branch/checkout.
475
447
476
448
Since a lightweight checkout is little more than a working tree
477
449
this will refuse to run against one.
479
451
To re-create the working tree, use "bzr checkout".
480
452
"""
481
453
_see_also = ['checkout', 'working-trees']
482
takes_args = ['location*']
454
takes_args = ['location?']
483
455
takes_options = [
484
456
Option('force',
485
457
help='Remove the working tree even if it has '
486
458
'uncommitted changes.'),
487
459
]
488
460
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()
461
def run(self, location='.', force=False):
462
d = bzrdir.BzrDir.open(location)
463
464
try:
465
working = d.open_workingtree()
466
except errors.NoWorkingTree:
467
raise errors.BzrCommandError("No working tree to remove")
468
except errors.NotLocalUrl:
469
raise errors.BzrCommandError("You cannot remove the working tree"
470
" of a remote path")
471
if not force:
472
if (working.has_changes()):
473
raise errors.UncommittedChanges(working)
474
475
working_path = working.bzrdir.root_transport.base
476
branch_path = working.branch.bzrdir.root_transport.base
477
if working_path != branch_path:
478
raise errors.BzrCommandError("You cannot remove the working tree"
479
" from a lightweight checkout")
480
481
d.destroy_workingtree()
512
482
513
483
514
484
class cmd_revno(Command):
515
__doc__ = """Show current revision number.
485
"""Show current revision number.
516
486
517
487
This is equal to the number of revisions on this branch.
518
488
"""
528
498
if tree:
529
499
try:
530
500
wt = WorkingTree.open_containing(location)[0]
531
self.add_cleanup(wt.lock_read().unlock)
501
wt.lock_read()
532
502
except (errors.NoWorkingTree, errors.NotLocalUrl):
533
503
raise errors.NoWorkingTree(location)
534
revid = wt.last_revision()
535
504
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)
505
revid = wt.last_revision()
506
try:
507
revno_t = wt.branch.revision_id_to_dotted_revno(revid)
508
except errors.NoSuchRevision:
509
revno_t = ('???',)
510
revno = ".".join(str(n) for n in revno_t)
511
finally:
512
wt.unlock()
540
513
else:
541
514
b = Branch.open_containing(location)[0]
542
self.add_cleanup(b.lock_read().unlock)
543
revno = b.revno()
544
self.cleanup_now()
515
b.lock_read()
516
try:
517
revno = b.revno()
518
finally:
519
b.unlock()
520
545
521
self.outf.write(str(revno) + '\n')
546
522
547
523
548
524
class cmd_revision_info(Command):
549
__doc__ = """Show revision number and revision id for a given revision identifier.
525
"""Show revision number and revision id for a given revision identifier.
550
526
"""
551
527
hidden = True
552
528
takes_args = ['revision_info*']
568
544
try:
569
545
wt = WorkingTree.open_containing(directory)[0]
570
546
b = wt.branch
571
self.add_cleanup(wt.lock_read().unlock)
547
wt.lock_read()
572
548
except (errors.NoWorkingTree, errors.NotLocalUrl):
573
549
wt = None
574
550
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())
551
b.lock_read()
552
try:
553
revision_ids = []
554
if revision is not None:
555
revision_ids.extend(rev.as_revision_id(b) for rev in revision)
556
if revision_info_list is not None:
557
for rev_str in revision_info_list:
558
rev_spec = RevisionSpec.from_string(rev_str)
559
revision_ids.append(rev_spec.as_revision_id(b))
560
# No arguments supplied, default to the last revision
561
if len(revision_ids) == 0:
562
if tree:
563
if wt is None:
564
raise errors.NoWorkingTree(directory)
565
revision_ids.append(wt.last_revision())
566
else:
567
revision_ids.append(b.last_revision())
568
569
revinfos = []
570
maxlen = 0
571
for revision_id in revision_ids:
572
try:
573
dotted_revno = b.revision_id_to_dotted_revno(revision_id)
574
revno = '.'.join(str(i) for i in dotted_revno)
575
except errors.NoSuchRevision:
576
revno = '???'
577
maxlen = max(maxlen, len(revno))
578
revinfos.append([revno, revision_id])
579
finally:
580
if wt is None:
581
b.unlock()
589
582
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()
583
wt.unlock()
584
604
585
for ri in revinfos:
605
586
self.outf.write('%*s %s\n' % (maxlen, ri[0], ri[1]))
606
587
607
588
608
589
class cmd_add(Command):
609
__doc__ = """Add specified files or directories.
590
"""Add specified files or directories.
610
591
611
592
In non-recursive mode, all the named items are added, regardless
612
593
of whether they were previously ignored. A warning is given if
677
658
should_print=(not is_quiet()))
678
659
679
660
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()
661
base_tree.lock_read()
662
try:
663
tree, file_list = tree_files_for_add(file_list)
664
added, ignored = tree.smart_add(file_list, not
665
no_recurse, action=action, save=not dry_run)
666
finally:
667
if base_tree is not None:
668
base_tree.unlock()
685
669
if len(ignored) > 0:
686
670
if verbose:
687
671
for glob in sorted(ignored.keys()):
691
675
692
676
693
677
class cmd_mkdir(Command):
694
__doc__ = """Create a new versioned directory.
678
"""Create a new versioned directory.
695
679
696
680
This is equivalent to creating the directory and then adding it.
697
681
"""
701
685
702
686
def run(self, dir_list):
703
687
for d in dir_list:
688
os.mkdir(d)
704
689
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)
690
wt.add([dd])
691
self.outf.write('added %s\n' % d)
713
692
714
693
715
694
class cmd_relpath(Command):
716
__doc__ = """Show path of a file relative to root"""
695
"""Show path of a file relative to root"""
717
696
718
697
takes_args = ['filename']
719
698
hidden = True
728
707
729
708
730
709
class cmd_inventory(Command):
731
__doc__ = """Show inventory of the current working copy or a revision.
710
"""Show inventory of the current working copy or a revision.
732
711
733
712
It is possible to limit the output to a particular entry
734
713
type using the --kind option. For example: --kind file.
755
734
756
735
revision = _get_one_revision('inventory', revision)
757
736
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()
737
work_tree.lock_read()
738
try:
739
if revision is not None:
740
tree = revision.as_tree(work_tree.branch)
741
742
extra_trees = [work_tree]
743
tree.lock_read()
744
else:
745
tree = work_tree
746
extra_trees = []
747
748
if file_list is not None:
749
file_ids = tree.paths2ids(file_list, trees=extra_trees,
750
require_versioned=True)
751
# find_ids_across_trees may include some paths that don't
752
# exist in 'tree'.
753
entries = sorted((tree.id2path(file_id), tree.inventory[file_id])
754
for file_id in file_ids if file_id in tree)
755
else:
756
entries = tree.inventory.entries()
757
finally:
758
tree.unlock()
759
if tree is not work_tree:
760
work_tree.unlock()
761
779
762
for path, entry in entries:
780
763
if kind and kind != entry.kind:
781
764
continue
787
770
788
771
789
772
class cmd_mv(Command):
790
__doc__ = """Move or rename a file.
773
"""Move or rename a file.
791
774
792
775
:Usage:
793
776
bzr mv OLDNAME NEWNAME
826
809
if len(names_list) < 2:
827
810
raise errors.BzrCommandError("missing file argument")
828
811
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)
812
tree.lock_tree_write()
813
try:
814
self._run(tree, names_list, rel_names, after)
815
finally:
816
tree.unlock()
831
817
832
818
def run_auto(self, names_list, after, dry_run):
833
819
if names_list is not None and len(names_list) > 1:
837
823
raise errors.BzrCommandError('--after cannot be specified with'
838
824
' --auto.')
839
825
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)
826
work_tree.lock_tree_write()
827
try:
828
rename_map.RenameMap.guess_renames(work_tree, dry_run)
829
finally:
830
work_tree.unlock()
842
831
843
832
def _run(self, tree, names_list, rel_names, after):
844
833
into_existing = osutils.isdir(names_list[-1])
922
911
923
912
924
913
class cmd_pull(Command):
925
__doc__ = """Turn this branch into a mirror of another branch.
914
"""Turn this branch into a mirror of another branch.
926
915
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.
916
This command only works on branches that have not diverged. Branches are
917
considered diverged if the destination branch's most recent commit is one
918
that has not been merged (directly or indirectly) into the parent.
931
919
932
920
If branches have diverged, you can use 'bzr merge' to integrate the changes
933
921
from one into the other. Once one branch has merged, the other should
934
922
be able to pull it again.
935
923
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.
924
If you want to forget your local changes and just update your branch to
925
match the remote one, use pull --overwrite.
939
926
940
927
If there is no default location set, the first pull will set it. After
941
928
that, you can omit the location to use the default. To change the
977
964
try:
978
965
tree_to = WorkingTree.open_containing(directory)[0]
979
966
branch_to = tree_to.branch
980
self.add_cleanup(tree_to.lock_write().unlock)
981
967
except errors.NoWorkingTree:
982
968
tree_to = None
983
969
branch_to = Branch.open_containing(directory)[0]
984
self.add_cleanup(branch_to.lock_write().unlock)
985
970
986
971
if local and not branch_to.get_bound_location():
987
972
raise errors.LocalRequiresBoundBranch()
988
973
1018
1003
else:
1019
1004
branch_from = Branch.open(location,
1020
1005
possible_transports=possible_transports)
1021
self.add_cleanup(branch_from.lock_read().unlock)
1022
1006
1023
1007
if branch_to.get_parent() is None or remember:
1024
1008
branch_to.set_parent(branch_from.base)
1025
1009
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)
1010
if branch_from is not branch_to:
1011
branch_from.lock_read()
1012
try:
1013
if revision is not None:
1014
revision_id = revision.as_revision_id(branch_from)
1015
1016
branch_to.lock_write()
1017
try:
1018
if tree_to is not None:
1019
view_info = _get_view_info_for_change_reporter(tree_to)
1020
change_reporter = delta._ChangeReporter(
1021
unversioned_filter=tree_to.is_ignored,
1022
view_info=view_info)
1023
result = tree_to.pull(
1024
branch_from, overwrite, revision_id, change_reporter,
1025
possible_transports=possible_transports, local=local)
1026
else:
1027
result = branch_to.pull(
1028
branch_from, overwrite, revision_id, local=local)
1029
1030
result.report(self.outf)
1031
if verbose and result.old_revid != result.new_revid:
1032
log.show_branch_change(
1033
branch_to, self.outf, result.old_revno,
1034
result.old_revid)
1035
finally:
1036
branch_to.unlock()
1037
finally:
1038
if branch_from is not branch_to:
1039
branch_from.unlock()
1046
1040
1047
1041
1048
1042
class cmd_push(Command):
1049
__doc__ = """Update a mirror of this branch.
1043
"""Update a mirror of this branch.
1050
1044
1051
1045
The target branch will not have its working tree populated because this
1052
1046
is both expensive, and is not supported on remote file systems.
1113
1107
# Get the source branch
1114
1108
(tree, br_from,
1115
1109
_unused) = bzrdir.BzrDir.open_containing_tree_or_branch(directory)
1110
if strict is None:
1111
strict = br_from.get_config().get_user_option_as_bool('push_strict')
1112
if strict is None: strict = True # default value
1116
1113
# Get the tip's revision_id
1117
1114
revision = _get_one_revision('push', revision)
1118
1115
if revision is not None:
1119
1116
revision_id = revision.in_history(br_from).rev_id
1120
1117
else:
1121
1118
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.')
1119
if strict and tree is not None and revision_id is None:
1120
if (tree.has_changes()):
1121
raise errors.UncommittedChanges(
1122
tree, more='Use --no-strict to force the push.')
1123
if tree.last_revision() != tree.branch.last_revision():
1124
# The tree has lost sync with its branch, there is little
1125
# chance that the user is aware of it but he can still force
1126
# the push with --no-strict
1127
raise errors.OutOfDateTree(
1128
tree, more='Use --no-strict to force the push.')
1129
1127
1130
# Get the stacked_on branch, if any
1128
1131
if stacked_on is not None:
1129
1132
stacked_on = urlutils.normalize_url(stacked_on)
1161
1164
1162
1165
1163
1166
class cmd_branch(Command):
1164
__doc__ = """Create a new branch that is a copy of an existing branch.
1167
"""Create a new branch that is a copy of an existing branch.
1165
1168
1166
1169
If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will
1167
1170
be used. In other words, "branch ../foo/bar" will attempt to create ./bar.
1194
1197
' directory exists, but does not already'
1195
1198
' have a control directory. This flag will'
1196
1199
' allow branch to proceed.'),
1197
Option('bind',
1198
help="Bind new branch to from location."),
1199
1200
]
1200
1201
aliases = ['get', 'clone']
1201
1202
1202
1203
def run(self, from_location, to_location=None, revision=None,
1203
1204
hardlink=False, stacked=False, standalone=False, no_tree=False,
1204
use_existing_dir=False, switch=False, bind=False):
1205
use_existing_dir=False, switch=False):
1205
1206
from bzrlib import switch as _mod_switch
1206
1207
from bzrlib.tag import _merge_tags_if_possible
1207
1208
accelerator_tree, br_from = bzrdir.BzrDir.open_tree_or_branch(
1208
1209
from_location)
1210
if (accelerator_tree is not None and
1211
accelerator_tree.supports_content_filtering()):
1212
accelerator_tree = None
1209
1213
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)
1214
br_from.lock_read()
1221
1215
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)
1216
if revision is not None:
1217
revision_id = revision.as_revision_id(br_from)
1227
1218
else:
1228
try:
1229
bzrdir.BzrDir.open_from_transport(to_transport)
1230
except errors.NotBranchError:
1231
pass
1219
# FIXME - wt.last_revision, fallback to branch, fall back to
1220
# None or perhaps NULL_REVISION to mean copy nothing
1221
# RBC 20060209
1222
revision_id = br_from.last_revision()
1223
if to_location is None:
1224
to_location = urlutils.derive_to_location(from_location)
1225
to_transport = transport.get_transport(to_location)
1226
try:
1227
to_transport.mkdir('.')
1228
except errors.FileExists:
1229
if not use_existing_dir:
1230
raise errors.BzrCommandError('Target directory "%s" '
1231
'already exists.' % to_location)
1232
1232
else:
1233
raise errors.AlreadyBranchError(to_location)
1234
except errors.NoSuchFile:
1235
raise errors.BzrCommandError('Parent of "%s" does not exist.'
1236
% to_location)
1237
try:
1238
# preserve whatever source format we have.
1239
dir = br_from.bzrdir.sprout(to_transport.base, revision_id,
1240
possible_transports=[to_transport],
1241
accelerator_tree=accelerator_tree,
1242
hardlink=hardlink, stacked=stacked,
1243
force_new_repo=standalone,
1244
create_tree_if_local=not no_tree,
1245
source_branch=br_from)
1246
branch = dir.open_branch()
1247
except errors.NoSuchRevision:
1248
to_transport.delete_tree('.')
1249
msg = "The branch %s has no revision %s." % (from_location,
1250
revision)
1251
raise errors.BzrCommandError(msg)
1252
_merge_tags_if_possible(br_from, branch)
1253
# If the source branch is stacked, the new branch may
1254
# be stacked whether we asked for that explicitly or not.
1255
# We therefore need a try/except here and not just 'if stacked:'
1256
try:
1257
note('Created new stacked branch referring to %s.' %
1258
branch.get_stacked_on_url())
1259
except (errors.NotStacked, errors.UnstackableBranchFormat,
1260
errors.UnstackableRepositoryFormat), e:
1261
note('Branched %d revision(s).' % branch.revno())
1262
if 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'))
1233
try:
1234
bzrdir.BzrDir.open_from_transport(to_transport)
1235
except errors.NotBranchError:
1236
pass
1237
else:
1238
raise errors.AlreadyBranchError(to_location)
1239
except errors.NoSuchFile:
1240
raise errors.BzrCommandError('Parent of "%s" does not exist.'
1241
% to_location)
1242
try:
1243
# preserve whatever source format we have.
1244
dir = br_from.bzrdir.sprout(to_transport.base, revision_id,
1245
possible_transports=[to_transport],
1246
accelerator_tree=accelerator_tree,
1247
hardlink=hardlink, stacked=stacked,
1248
force_new_repo=standalone,
1249
create_tree_if_local=not no_tree,
1250
source_branch=br_from)
1251
branch = dir.open_branch()
1252
except errors.NoSuchRevision:
1253
to_transport.delete_tree('.')
1254
msg = "The branch %s has no revision %s." % (from_location,
1255
revision)
1256
raise errors.BzrCommandError(msg)
1257
_merge_tags_if_possible(br_from, branch)
1258
# If the source branch is stacked, the new branch may
1259
# be stacked whether we asked for that explicitly or not.
1260
# We therefore need a try/except here and not just 'if stacked:'
1261
try:
1262
note('Created new stacked branch referring to %s.' %
1263
branch.get_stacked_on_url())
1264
except (errors.NotStacked, errors.UnstackableBranchFormat,
1265
errors.UnstackableRepositoryFormat), e:
1266
note('Branched %d revision(s).' % branch.revno())
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'))
1273
finally:
1274
br_from.unlock()
1273
1275
1274
1276
1275
1277
class cmd_checkout(Command):
1276
__doc__ = """Create a new checkout of an existing branch.
1278
"""Create a new checkout of an existing branch.
1277
1279
1278
1280
If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree for
1279
1281
the branch found in '.'. This is useful if you have removed the working tree
1342
1344
1343
1345
1344
1346
class cmd_renames(Command):
1345
__doc__ = """Show list of renamed files.
1347
"""Show list of renamed files.
1346
1348
"""
1347
1349
# TODO: Option to show renames between two historical versions.
1348
1350
1353
1355
@display_command
1354
1356
def run(self, dir=u'.'):
1355
1357
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))
1358
tree.lock_read()
1359
try:
1360
new_inv = tree.inventory
1361
old_tree = tree.basis_tree()
1362
old_tree.lock_read()
1363
try:
1364
old_inv = old_tree.inventory
1365
renames = []
1366
iterator = tree.iter_changes(old_tree, include_unchanged=True)
1367
for f, paths, c, v, p, n, k, e in iterator:
1368
if paths[0] == paths[1]:
1369
continue
1370
if None in (paths):
1371
continue
1372
renames.append(paths)
1373
renames.sort()
1374
for old_name, new_name in renames:
1375
self.outf.write("%s => %s\n" % (old_name, new_name))
1376
finally:
1377
old_tree.unlock()
1378
finally:
1379
tree.unlock()
1372
1380
1373
1381
1374
1382
class cmd_update(Command):
1375
__doc__ = """Update a tree to have the latest code committed to its branch.
1383
"""Update a tree to have the latest code committed to its branch.
1376
1384
1377
1385
This will perform a merge into the working tree, and may generate
1378
1386
conflicts. If you have any local changes, you will still
1380
1388
1381
1389
If you want to discard your local changes, you can just do a
1382
1390
'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
1391
"""
1387
1392
1388
1393
_see_also = ['pull', 'working-trees', 'status-flags']
1389
1394
takes_args = ['dir?']
1390
takes_options = ['revision']
1391
1395
aliases = ['up']
1392
1396
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")
1397
def run(self, dir='.'):
1397
1398
tree = WorkingTree.open_containing(dir)[0]
1398
branch = tree.branch
1399
1399
possible_transports = []
1400
master = branch.get_master_branch(
1400
master = tree.branch.get_master_branch(
1401
1401
possible_transports=possible_transports)
1402
1402
if master is not None:
1403
branch_location = master.base
1404
1403
tree.lock_write()
1405
1404
else:
1406
branch_location = tree.branch.base
1407
1405
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
1406
try:
1407
existing_pending_merges = tree.get_parent_ids()[1:]
1408
last_rev = _mod_revision.ensure_null(tree.last_revision())
1409
if last_rev == _mod_revision.ensure_null(
1410
tree.branch.last_revision()):
1411
# may be up to date, check master too.
1412
if master is None or last_rev == _mod_revision.ensure_null(
1413
master.last_revision()):
1414
revno = tree.branch.revision_id_to_revno(last_rev)
1415
note("Tree is up to date at revision %d." % (revno,))
1416
return 0
1417
view_info = _get_view_info_for_change_reporter(tree)
1435
1418
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
1419
delta._ChangeReporter(unversioned_filter=tree.is_ignored,
1420
view_info=view_info), possible_transports=possible_transports)
1421
revno = tree.branch.revision_id_to_revno(
1422
_mod_revision.ensure_null(tree.last_revision()))
1423
note('Updated to revision %d.' % (revno,))
1424
if tree.get_parent_ids()[1:] != existing_pending_merges:
1425
note('Your local commits will now show as pending merges with '
1426
"'bzr status', and can be committed with 'bzr commit'.")
1427
if conflicts != 0:
1428
return 1
1429
else:
1430
return 0
1431
finally:
1432
tree.unlock()
1458
1433
1459
1434
1460
1435
class cmd_info(Command):
1461
__doc__ = """Show information about a working tree, branch or repository.
1436
"""Show information about a working tree, branch or repository.
1462
1437
1463
1438
This command will show all known locations and formats associated to the
1464
1439
tree, branch or repository.
1502
1477
1503
1478
1504
1479
class cmd_remove(Command):
1505
__doc__ = """Remove files or directories.
1480
"""Remove files or directories.
1506
1481
1507
1482
This makes bzr stop tracking changes to the specified files. bzr will delete
1508
1483
them if they can easily be recovered using revert. If no options or
1530
1505
if file_list is not None:
1531
1506
file_list = [f for f in file_list]
1532
1507
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')
1508
tree.lock_write()
1509
try:
1510
# Heuristics should probably all move into tree.remove_smart or
1511
# some such?
1512
if new:
1513
added = tree.changes_from(tree.basis_tree(),
1514
specific_files=file_list).added
1515
file_list = sorted([f[0] for f in added], reverse=True)
1516
if len(file_list) == 0:
1517
raise errors.BzrCommandError('No matching files.')
1518
elif file_list is None:
1519
# missing files show up in iter_changes(basis) as
1520
# versioned-with-no-kind.
1521
missing = []
1522
for change in tree.iter_changes(tree.basis_tree()):
1523
# Find paths in the working tree that have no kind:
1524
if change[1][1] is not None and change[6][1] is None:
1525
missing.append(change[1][1])
1526
file_list = sorted(missing, reverse=True)
1527
file_deletion_strategy = 'keep'
1528
tree.remove(file_list, verbose=verbose, to_file=self.outf,
1529
keep_files=file_deletion_strategy=='keep',
1530
force=file_deletion_strategy=='force')
1531
finally:
1532
tree.unlock()
1555
1533
1556
1534
1557
1535
class cmd_file_id(Command):
1558
__doc__ = """Print file_id of a particular file or directory.
1536
"""Print file_id of a particular file or directory.
1559
1537
1560
1538
The file_id is assigned when the file is first added and remains the
1561
1539
same through all revisions where the file exists, even when it is
1577
1555
1578
1556
1579
1557
class cmd_file_path(Command):
1580
__doc__ = """Print path of file_ids to a file or directory.
1558
"""Print path of file_ids to a file or directory.
1581
1559
1582
1560
This prints one line for each directory down to the target,
1583
1561
starting at the branch root.
1599
1577
1600
1578
1601
1579
class cmd_reconcile(Command):
1602
__doc__ = """Reconcile bzr metadata in a branch.
1580
"""Reconcile bzr metadata in a branch.
1603
1581
1604
1582
This can correct data mismatches that may have been caused by
1605
1583
previous ghost operations or bzr upgrades. You should only
1627
1605
1628
1606
1629
1607
class cmd_revision_history(Command):
1630
__doc__ = """Display the list of revision ids on a branch."""
1608
"""Display the list of revision ids on a branch."""
1631
1609
1632
1610
_see_also = ['log']
1633
1611
takes_args = ['location?']
1643
1621
1644
1622
1645
1623
class cmd_ancestry(Command):
1646
__doc__ = """List all revisions merged into this branch."""
1624
"""List all revisions merged into this branch."""
1647
1625
1648
1626
_see_also = ['log', 'revision-history']
1649
1627
takes_args = ['location?']
1668
1646
1669
1647
1670
1648
class cmd_init(Command):
1671
__doc__ = """Make a directory into a versioned branch.
1649
"""Make a directory into a versioned branch.
1672
1650
1673
1651
Use this to create an empty branch, or before importing an
1674
1652
existing project.
1777
1755
1778
1756
1779
1757
class cmd_init_repository(Command):
1780
__doc__ = """Create a shared repository for branches to share storage space.
1758
"""Create a shared repository for branches to share storage space.
1781
1759
1782
1760
New branches created under the repository directory will store their
1783
1761
revisions in the repository, not in the branch directory. For branches
1837
1815
1838
1816
1839
1817
class cmd_diff(Command):
1840
__doc__ = """Show differences in the working tree, between revisions or branches.
1818
"""Show differences in the working tree, between revisions or branches.
1841
1819
1842
1820
If no arguments are given, all changes for the current tree are listed.
1843
1821
If files are given, only the changes in those files are listed.
1929
1907
help='Use this command to compare files.',
1930
1908
type=unicode,
1931
1909
),
1932
RegistryOption('format',
1933
help='Diff format to use.',
1934
lazy_registry=('bzrlib.diff', 'format_registry'),
1935
value_switches=False, title='Diff format'),
1936
1910
]
1937
1911
aliases = ['di', 'dif']
1938
1912
encoding_type = 'exact'
1939
1913
1940
1914
@display_command
1941
1915
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)
1916
prefix=None, old=None, new=None, using=None):
1917
from bzrlib.diff import get_trees_and_branches_to_diff, show_diff_trees
1945
1918
1946
1919
if (prefix is None) or (prefix == '0'):
1947
1920
# diff -p0 format
1961
1934
raise errors.BzrCommandError('bzr diff --revision takes exactly'
1962
1935
' one or two revision specifiers')
1963
1936
1964
if using is not None and format is not None:
1965
raise errors.BzrCommandError('--using and --format are mutually '
1966
'exclusive.')
1967
1968
1937
(old_tree, new_tree,
1969
1938
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)
1939
specific_files, extra_trees) = get_trees_and_branches_to_diff(
1940
file_list, revision, old, new, apply_view=True)
1972
1941
return show_diff_trees(old_tree, new_tree, sys.stdout,
1973
1942
specific_files=specific_files,
1974
1943
external_diff_options=diff_options,
1975
1944
old_label=old_label, new_label=new_label,
1976
extra_trees=extra_trees, using=using,
1977
format_cls=format)
1945
extra_trees=extra_trees, using=using)
1978
1946
1979
1947
1980
1948
class cmd_deleted(Command):
1981
__doc__ = """List files deleted in the working tree.
1949
"""List files deleted in the working tree.
1982
1950
"""
1983
1951
# TODO: Show files deleted since a previous revision, or
1984
1952
# between two revisions.
1992
1960
@display_command
1993
1961
def run(self, show_ids=False):
1994
1962
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')
1963
tree.lock_read()
1964
try:
1965
old = tree.basis_tree()
1966
old.lock_read()
1967
try:
1968
for path, ie in old.inventory.iter_entries():
1969
if not tree.has_id(ie.file_id):
1970
self.outf.write(path)
1971
if show_ids:
1972
self.outf.write(' ')
1973
self.outf.write(ie.file_id)
1974
self.outf.write('\n')
1975
finally:
1976
old.unlock()
1977
finally:
1978
tree.unlock()
2005
1979
2006
1980
2007
1981
class cmd_modified(Command):
2008
__doc__ = """List files modified in working tree.
1982
"""List files modified in working tree.
2009
1983
"""
2010
1984
2011
1985
hidden = True
2028
2002
2029
2003
2030
2004
class cmd_added(Command):
2031
__doc__ = """List files added in working tree.
2005
"""List files added in working tree.
2032
2006
"""
2033
2007
2034
2008
hidden = True
2042
2016
@display_command
2043
2017
def run(self, null=False):
2044
2018
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')
2019
wt.lock_read()
2020
try:
2021
basis = wt.basis_tree()
2022
basis.lock_read()
2023
try:
2024
basis_inv = basis.inventory
2025
inv = wt.inventory
2026
for file_id in inv:
2027
if file_id in basis_inv:
2028
continue
2029
if inv.is_root(file_id) and len(basis_inv) == 0:
2030
continue
2031
path = inv.id2path(file_id)
2032
if not os.access(osutils.abspath(path), os.F_OK):
2033
continue
2034
if null:
2035
self.outf.write(path + '\0')
2036
else:
2037
self.outf.write(osutils.quotefn(path) + '\n')
2038
finally:
2039
basis.unlock()
2040
finally:
2041
wt.unlock()
2062
2042
2063
2043
2064
2044
class cmd_root(Command):
2065
__doc__ = """Show the tree root directory.
2045
"""Show the tree root directory.
2066
2046
2067
2047
The root is the nearest enclosing directory with a .bzr control
2068
2048
directory."""
2092
2072
2093
2073
2094
2074
class cmd_log(Command):
2095
__doc__ = """Show historical log for a branch or subset of a branch.
2075
"""Show historical log for a branch or subset of a branch.
2096
2076
2097
2077
log is bzr's default tool for exploring the history of a branch.
2098
2078
The branch to use is taken from the first parameter. If no parameters
2209
2189
:Tips & tricks:
2210
2190
2211
2191
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>.
2192
line tools. You may prefer qlog or glog from the QBzr and Bzr-Gtk packages
2193
respectively for example. (TortoiseBzr uses qlog for displaying logs.) See
2194
http://bazaar-vcs.org/BzrPlugins and http://bazaar-vcs.org/IDEIntegration.
2195
2196
Web interfaces are often better at exploring history than command line
2197
tools, particularly for branches on servers. You may prefer Loggerhead
2198
or one of its alternatives. See http://bazaar-vcs.org/WebInterface.
2216
2199
2217
2200
You may find it useful to add the aliases below to ``bazaar.conf``::
2218
2201
2279
2262
help='Show changes made in each revision as a patch.'),
2280
2263
Option('include-merges',
2281
2264
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
2265
]
2287
2266
encoding_type = 'replace'
2288
2267
2298
2277
message=None,
2299
2278
limit=None,
2300
2279
show_diff=False,
2301
include_merges=False,
2302
exclude_common_ancestry=False,
2303
):
2280
include_merges=False):
2304
2281
from bzrlib.log import (
2305
2282
Logger,
2306
2283
make_log_request_dict,
2307
2284
_get_info_for_log_files,
2308
2285
)
2309
2286
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
2287
if include_merges:
2315
2288
if levels is None:
2316
2289
levels = 0
2329
2302
2330
2303
file_ids = []
2331
2304
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
2305
b = None
2306
try:
2307
if file_list:
2308
# find the file ids to log and check for directory filtering
2309
b, file_info_list, rev1, rev2 = _get_info_for_log_files(
2310
revision, file_list)
2311
for relpath, file_id, kind in file_info_list:
2312
if file_id is None:
2313
raise errors.BzrCommandError(
2314
"Path unknown at end or start of revision range: %s" %
2315
relpath)
2316
# If the relpath is the top of the tree, we log everything
2317
if relpath == '':
2318
file_ids = []
2319
break
2320
else:
2321
file_ids.append(file_id)
2322
filter_by_dir = filter_by_dir or (
2323
kind in ['directory', 'tree-reference'])
2324
else:
2325
# log everything
2326
# FIXME ? log the current subdir only RBC 20060203
2327
if revision is not None \
2328
and len(revision) > 0 and revision[0].get_branch():
2329
location = revision[0].get_branch()
2345
2330
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)
2331
location = '.'
2332
dir, relpath = bzrdir.BzrDir.open_containing(location)
2333
b = dir.open_branch()
2334
b.lock_read()
2335
rev1, rev2 = _get_revision_range(revision, b, self.name())
2336
2337
# Decide on the type of delta & diff filtering to use
2338
# TODO: add an --all-files option to make this configurable & consistent
2339
if not verbose:
2340
delta_type = None
2341
else:
2342
delta_type = 'full'
2343
if not show_diff:
2344
diff_type = None
2345
elif file_ids:
2346
diff_type = 'partial'
2347
else:
2348
diff_type = 'full'
2349
2350
# Build the log formatter
2351
if log_format is None:
2352
log_format = log.log_formatter_registry.get_default(b)
2353
lf = log_format(show_ids=show_ids, to_file=self.outf,
2354
show_timezone=timezone,
2355
delta_format=get_verbosity_level(),
2356
levels=levels,
2357
show_advice=levels is None)
2358
2359
# Choose the algorithm for doing the logging. It's annoying
2360
# having multiple code paths like this but necessary until
2361
# the underlying repository format is faster at generating
2362
# deltas or can provide everything we need from the indices.
2363
# The default algorithm - match-using-deltas - works for
2364
# multiple files and directories and is faster for small
2365
# amounts of history (200 revisions say). However, it's too
2366
# slow for logging a single file in a repository with deep
2367
# history, i.e. > 10K revisions. In the spirit of "do no
2368
# evil when adding features", we continue to use the
2369
# original algorithm - per-file-graph - for the "single
2370
# file that isn't a directory without showing a delta" case.
2371
partial_history = revision and b.repository._format.supports_chks
2372
match_using_deltas = (len(file_ids) != 1 or filter_by_dir
2373
or delta_type or partial_history)
2374
2375
# Build the LogRequest and execute it
2376
if len(file_ids) == 0:
2377
file_ids = None
2378
rqst = make_log_request_dict(
2379
direction=direction, specific_fileids=file_ids,
2380
start_revision=rev1, end_revision=rev2, limit=limit,
2381
message_search=message, delta_type=delta_type,
2382
diff_type=diff_type, _match_using_deltas=match_using_deltas)
2383
Logger(b, rqst).show(lf)
2384
finally:
2385
if b is not None:
2386
b.unlock()
2414
2387
2415
2388
2416
2389
def _get_revision_range(revisionspec_list, branch, command_name):
2434
2407
raise errors.BzrCommandError(
2435
2408
"bzr %s doesn't accept two revisions in different"
2436
2409
" 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)
2410
rev1 = start_spec.in_history(branch)
2442
2411
# Avoid loading all of history when we know a missing
2443
2412
# end of range means the last revision ...
2444
2413
if end_spec.spec is None:
2473
2442
2474
2443
2475
2444
class cmd_touching_revisions(Command):
2476
__doc__ = """Return revision-ids which affected a particular file.
2445
"""Return revision-ids which affected a particular file.
2477
2446
2478
2447
A more user-friendly interface is "bzr log FILE".
2479
2448
"""
2486
2455
tree, relpath = WorkingTree.open_containing(filename)
2487
2456
file_id = tree.path2id(relpath)
2488
2457
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))
2458
b.lock_read()
2459
try:
2460
touching_revs = log.find_touching_revisions(b, file_id)
2461
for revno, revision_id, what in touching_revs:
2462
self.outf.write("%6d %s\n" % (revno, what))
2463
finally:
2464
b.unlock()
2493
2465
2494
2466
2495
2467
class cmd_ls(Command):
2496
__doc__ = """List files in a tree.
2468
"""List files in a tree.
2497
2469
"""
2498
2470
2499
2471
_see_also = ['status', 'cat']
2561
2533
view_str = views.view_display_str(view_files)
2562
2534
note("Ignoring files outside view. View is %s" % view_str)
2563
2535
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
2536
tree.lock_read()
2537
try:
2538
for fp, fc, fkind, fid, entry in tree.list_files(include_root=False,
2539
from_dir=relpath, recursive=recursive):
2540
# Apply additional masking
2541
if not all and not selection[fc]:
2542
continue
2543
if kind is not None and fkind != kind:
2544
continue
2545
if apply_view:
2546
try:
2547
if relpath:
2548
fullpath = osutils.pathjoin(relpath, fp)
2549
else:
2550
fullpath = fp
2551
views.check_path_in_view(tree, fullpath)
2552
except errors.FileOutsideView:
2553
continue
2581
2554
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:
2555
# Output the entry
2556
if prefix:
2557
fp = osutils.pathjoin(prefix, fp)
2558
kindch = entry.kind_character()
2559
outstring = fp + kindch
2560
ui.ui_factory.clear_term()
2561
if verbose:
2562
outstring = '%-8s %s' % (fc, outstring)
2563
if show_ids and fid is not None:
2564
outstring = "%-50s %s" % (outstring, fid)
2608
2565
self.outf.write(outstring + '\n')
2566
elif null:
2567
self.outf.write(fp + '\0')
2568
if show_ids:
2569
if fid is not None:
2570
self.outf.write(fid)
2571
self.outf.write('\0')
2572
self.outf.flush()
2573
else:
2574
if show_ids:
2575
if fid is not None:
2576
my_id = fid
2577
else:
2578
my_id = ''
2579
self.outf.write('%-50s %s\n' % (outstring, my_id))
2580
else:
2581
self.outf.write(outstring + '\n')
2582
finally:
2583
tree.unlock()
2609
2584
2610
2585
2611
2586
class cmd_unknowns(Command):
2612
__doc__ = """List unknown files.
2587
"""List unknown files.
2613
2588
"""
2614
2589
2615
2590
hidden = True
2622
2597
2623
2598
2624
2599
class cmd_ignore(Command):
2625
__doc__ = """Ignore specified files or patterns.
2600
"""Ignore specified files or patterns.
2626
2601
2627
2602
See ``bzr help patterns`` for details on the syntax of patterns.
2628
2603
2636
2611
After adding, editing or deleting that file either indirectly by
2637
2612
using this command or directly by using an editor, be sure to commit
2638
2613
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
2614
2653
2615
Note: ignore patterns containing shell wildcards must be quoted from
2654
2616
the shell on Unix.
2658
2620
2659
2621
bzr ignore ./Makefile
2660
2622
2661
Ignore .class files in all directories...::
2623
Ignore class files in all directories::
2662
2624
2663
2625
bzr ignore "*.class"
2664
2626
2665
...but do not ignore "special.class"::
2666
2667
bzr ignore "!special.class"
2668
2669
2627
Ignore .o files under the lib directory::
2670
2628
2671
2629
bzr ignore "lib/**/*.o"
2677
2635
Ignore everything but the "debian" toplevel directory::
2678
2636
2679
2637
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
2638
"""
2688
2639
2689
2640
_see_also = ['status', 'ignored', 'patterns']
2690
2641
takes_args = ['name_pattern*']
2691
2642
takes_options = [
2692
Option('default-rules',
2693
help='Display the default ignore rules that bzr uses.')
2643
Option('old-default-rules',
2644
help='Write out the ignore rules bzr < 0.9 always used.')
2694
2645
]
2695
2646
2696
def run(self, name_pattern_list=None, default_rules=None):
2647
def run(self, name_pattern_list=None, old_default_rules=None):
2697
2648
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)
2649
if old_default_rules is not None:
2650
# dump the rules and exit
2651
for pattern in ignores.OLD_DEFAULTS:
2652
print pattern
2702
2653
return
2703
2654
if not name_pattern_list:
2704
2655
raise errors.BzrCommandError("ignore requires at least one "
2705
"NAME_PATTERN or --default-rules.")
2656
"NAME_PATTERN or --old-default-rules")
2706
2657
name_pattern_list = [globbing.normalize_pattern(p)
2707
2658
for p in name_pattern_list]
2708
2659
for name_pattern in name_pattern_list:
2720
2671
if id is not None:
2721
2672
filename = entry[0]
2722
2673
if ignored.match(filename):
2723
matches.append(filename)
2674
matches.append(filename.encode('utf-8'))
2724
2675
tree.unlock()
2725
2676
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),))
2677
print "Warning: the following files are version controlled and" \
2678
" match your ignore pattern:\n%s" \
2679
"\nThese files will continue to be version controlled" \
2680
" unless you 'bzr remove' them." % ("\n".join(matches),)
2730
2681
2731
2682
2732
2683
class cmd_ignored(Command):
2733
__doc__ = """List ignored files and the patterns that matched them.
2684
"""List ignored files and the patterns that matched them.
2734
2685
2735
2686
List all the ignored files and the ignore pattern that caused the file to
2736
2687
be ignored.
2746
2697
@display_command
2747
2698
def run(self):
2748
2699
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))
2700
tree.lock_read()
2701
try:
2702
for path, file_class, kind, file_id, entry in tree.list_files():
2703
if file_class != 'I':
2704
continue
2705
## XXX: Slightly inefficient since this was already calculated
2706
pat = tree.is_ignored(path)
2707
self.outf.write('%-50s %s\n' % (path, pat))
2708
finally:
2709
tree.unlock()
2756
2710
2757
2711
2758
2712
class cmd_lookup_revision(Command):
2759
__doc__ = """Lookup the revision-id from a revision-number
2713
"""Lookup the revision-id from a revision-number
2760
2714
2761
2715
:Examples:
2762
2716
bzr lookup-revision 33
2769
2723
try:
2770
2724
revno = int(revno)
2771
2725
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)
2726
raise errors.BzrCommandError("not a valid revision-number: %r" % revno)
2727
2728
print WorkingTree.open_containing(u'.')[0].branch.get_rev_id(revno)
2776
2729
2777
2730
2778
2731
class cmd_export(Command):
2779
__doc__ = """Export current or past revision to a destination directory or archive.
2732
"""Export current or past revision to a destination directory or archive.
2780
2733
2781
2734
If no revision is specified this exports the last committed revision.
2782
2735
2814
2767
Option('root',
2815
2768
type=str,
2816
2769
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
2770
]
2821
2771
def run(self, dest, branch_or_subdir=None, revision=None, format=None,
2822
root=None, filters=False, per_file_timestamps=False):
2772
root=None, filters=False):
2823
2773
from bzrlib.export import export
2824
2774
2825
2775
if branch_or_subdir is None:
2832
2782
2833
2783
rev_tree = _get_one_revision_tree('export', revision, branch=b, tree=tree)
2834
2784
try:
2835
export(rev_tree, dest, format, root, subdir, filtered=filters,
2836
per_file_timestamps=per_file_timestamps)
2785
export(rev_tree, dest, format, root, subdir, filtered=filters)
2837
2786
except errors.NoSuchExportFormat, e:
2838
2787
raise errors.BzrCommandError('Unsupported export format: %s' % e.format)
2839
2788
2840
2789
2841
2790
class cmd_cat(Command):
2842
__doc__ = """Write the contents of a file as of a given revision to standard output.
2791
"""Write the contents of a file as of a given revision to standard output.
2843
2792
2844
2793
If no revision is nominated, the last revision is used.
2845
2794
2865
2814
" one revision specifier")
2866
2815
tree, branch, relpath = \
2867
2816
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)
2817
branch.lock_read()
2818
try:
2819
return self._run(tree, branch, relpath, filename, revision,
2820
name_from_revision, filters)
2821
finally:
2822
branch.unlock()
2871
2823
2872
2824
def _run(self, tree, b, relpath, filename, revision, name_from_revision,
2873
2825
filtered):
2874
2826
if tree is None:
2875
2827
tree = b.basis_tree()
2876
2828
rev_tree = _get_one_revision_tree('cat', revision, branch=b)
2877
self.add_cleanup(rev_tree.lock_read().unlock)
2878
2829
2879
2830
old_file_id = rev_tree.path2id(relpath)
2880
2831
2915
2866
chunks = content.splitlines(True)
2916
2867
content = filtered_output_bytes(chunks, filters,
2917
2868
ContentFilterContext(relpath, rev_tree))
2918
self.cleanup_now()
2919
2869
self.outf.writelines(content)
2920
2870
else:
2921
self.cleanup_now()
2922
2871
self.outf.write(content)
2923
2872
2924
2873
2925
2874
class cmd_local_time_offset(Command):
2926
__doc__ = """Show the offset in seconds from GMT to local time."""
2875
"""Show the offset in seconds from GMT to local time."""
2927
2876
hidden = True
2928
2877
@display_command
2929
2878
def run(self):
2930
self.outf.write("%s\n" % osutils.local_time_offset())
2879
print osutils.local_time_offset()
2931
2880
2932
2881
2933
2882
2934
2883
class cmd_commit(Command):
2935
__doc__ = """Commit changes into a new revision.
2884
"""Commit changes into a new revision.
2936
2885
2937
2886
An explanatory message needs to be given for each commit. This is
2938
2887
often done by using the --message option (getting the message from the
3046
2995
"the master branch until a normal commit "
3047
2996
"is performed."
3048
2997
),
3049
Option('show-diff', short_name='p',
2998
Option('show-diff',
3050
2999
help='When no message is supplied, show the diff along'
3051
3000
' with the status summary in the message editor.'),
3052
3001
]
3118
3067
if local and not tree.branch.get_bound_location():
3119
3068
raise errors.LocalRequiresBoundBranch()
3120
3069
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
3070
def get_message(commit_obj):
3143
3071
"""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,
3072
my_message = message
3073
if my_message is not None and '\r' in my_message:
3074
my_message = my_message.replace('\r\n', '\n')
3075
my_message = my_message.replace('\r', '\n')
3076
if my_message is None and not file:
3077
t = make_commit_message_template_encoded(tree,
3153
3078
selected_list, diff=show_diff,
3154
3079
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
3080
start_message = generate_commit_message_template(commit_obj)
3161
my_message = edit_commit_message_encoded(text,
3081
my_message = edit_commit_message_encoded(t,
3162
3082
start_message=start_message)
3163
3083
if my_message is None:
3164
3084
raise errors.BzrCommandError("please specify a commit"
3165
3085
" message with either --message or --file")
3086
elif my_message and file:
3087
raise errors.BzrCommandError(
3088
"please specify either --message or --file")
3089
if file:
3090
my_message = codecs.open(file, 'rt',
3091
osutils.get_user_encoding()).read()
3166
3092
if my_message == "":
3167
3093
raise errors.BzrCommandError("empty commit message specified")
3168
3094
return my_message
3180
3106
timezone=offset,
3181
3107
exclude=safe_relpath_files(tree, exclude))
3182
3108
except PointlessCommit:
3109
# FIXME: This should really happen before the file is read in;
3110
# perhaps prepare the commit; get the message; then actually commit
3183
3111
raise errors.BzrCommandError("No changes to commit."
3184
3112
" Use --unchanged to commit anyhow.")
3185
3113
except ConflictsInTree:
3190
3118
raise errors.BzrCommandError("Commit refused because there are"
3191
3119
" unknown files in the working tree.")
3192
3120
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
3121
raise errors.BzrCommandError(str(e) + "\n"
3122
'To commit to master branch, run update and then commit.\n'
3123
'You can also pass --local to commit to continue working '
3124
'disconnected.')
3198
3125
3199
3126
3200
3127
class cmd_check(Command):
3201
__doc__ = """Validate working tree structure, branch consistency and repository history.
3128
"""Validate working tree structure, branch consistency and repository history.
3202
3129
3203
3130
This command checks various invariants about branch and repository storage
3204
3131
to detect data corruption or bzr bugs.
3268
3195
3269
3196
3270
3197
class cmd_upgrade(Command):
3271
__doc__ = """Upgrade branch storage to current format.
3198
"""Upgrade branch storage to current format.
3272
3199
3273
3200
The check command or bzr developers may sometimes advise you to run
3274
3201
this command. When the default format has changed you may also be warned
3292
3219
3293
3220
3294
3221
class cmd_whoami(Command):
3295
__doc__ = """Show or set bzr user id.
3222
"""Show or set bzr user id.
3296
3223
3297
3224
:Examples:
3298
3225
Show the email of the current user::
3342
3269
3343
3270
3344
3271
class cmd_nick(Command):
3345
__doc__ = """Print or set the branch nickname.
3272
"""Print or set the branch nickname.
3346
3273
3347
3274
If unset, the tree root directory name is used as the nickname.
3348
3275
To print the current nickname, execute with no argument.
3362
3289
3363
3290
@display_command
3364
3291
def printme(self, branch):
3365
self.outf.write('%s\n' % branch.nick)
3292
print branch.nick
3366
3293
3367
3294
3368
3295
class cmd_alias(Command):
3369
__doc__ = """Set/unset and display aliases.
3296
"""Set/unset and display aliases.
3370
3297
3371
3298
:Examples:
3372
3299
Show the current aliases::
3436
3363
3437
3364
3438
3365
class cmd_selftest(Command):
3439
__doc__ = """Run internal test suite.
3366
"""Run internal test suite.
3440
3367
3441
3368
If arguments are given, they are regular expressions that say which tests
3442
3369
should run. Tests matching any expression are run, and other tests are
3486
3413
def get_transport_type(typestring):
3487
3414
"""Parse and return a transport specifier."""
3488
3415
if typestring == "sftp":
3489
from bzrlib.tests import stub_sftp
3490
return stub_sftp.SFTPAbsoluteServer
3416
from bzrlib.transport.sftp import SFTPAbsoluteServer
3417
return SFTPAbsoluteServer
3491
3418
if typestring == "memory":
3492
from bzrlib.tests import test_server
3493
return memory.MemoryServer
3419
from bzrlib.transport.memory import MemoryServer
3420
return MemoryServer
3494
3421
if typestring == "fakenfs":
3495
from bzrlib.tests import test_server
3496
return test_server.FakeNFSServer
3422
from bzrlib.transport.fakenfs import FakeNFSServer
3423
return FakeNFSServer
3497
3424
msg = "No known transport type %s. Supported types are: sftp\n" %\
3498
3425
(typestring)
3499
3426
raise errors.BzrCommandError(msg)
3583
3510
raise errors.BzrCommandError("subunit not available. subunit "
3584
3511
"needs to be installed to use --subunit.")
3585
3512
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
3513
if parallel:
3592
3514
self.additional_selftest_args.setdefault(
3593
3515
'suite_decorators', []).append(parallel)
3597
3519
verbose = not is_quiet()
3598
3520
# TODO: should possibly lock the history file...
3599
3521
benchfile = open(".perf_history", "at", buffering=1)
3600
self.add_cleanup(benchfile.close)
3601
3522
else:
3602
3523
test_suite_factory = None
3603
3524
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)
3525
try:
3526
selftest_kwargs = {"verbose": verbose,
3527
"pattern": pattern,
3528
"stop_on_failure": one,
3529
"transport": transport,
3530
"test_suite_factory": test_suite_factory,
3531
"lsprof_timed": lsprof_timed,
3532
"lsprof_tests": lsprof_tests,
3533
"bench_history": benchfile,
3534
"matching_tests_first": first,
3535
"list_only": list_only,
3536
"random_seed": randomize,
3537
"exclude_pattern": exclude,
3538
"strict": strict,
3539
"load_list": load_list,
3540
"debug_flags": debugflag,
3541
"starting_with": starting_with
3542
}
3543
selftest_kwargs.update(self.additional_selftest_args)
3544
result = selftest(**selftest_kwargs)
3545
finally:
3546
if benchfile is not None:
3547
benchfile.close()
3623
3548
return int(not result)
3624
3549
3625
3550
3626
3551
class cmd_version(Command):
3627
__doc__ = """Show version of bzr."""
3552
"""Show version of bzr."""
3628
3553
3629
3554
encoding_type = 'replace'
3630
3555
takes_options = [
3641
3566
3642
3567
3643
3568
class cmd_rocks(Command):
3644
__doc__ = """Statement of optimism."""
3569
"""Statement of optimism."""
3645
3570
3646
3571
hidden = True
3647
3572
3648
3573
@display_command
3649
3574
def run(self):
3650
self.outf.write("It sure does!\n")
3575
print "It sure does!"
3651
3576
3652
3577
3653
3578
class cmd_find_merge_base(Command):
3654
__doc__ = """Find and print a base revision for merging two branches."""
3579
"""Find and print a base revision for merging two branches."""
3655
3580
# TODO: Options to specify revisions on either side, as if
3656
3581
# merging only part of the history.
3657
3582
takes_args = ['branch', 'other']
3663
3588
3664
3589
branch1 = Branch.open_containing(branch)[0]
3665
3590
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)
3591
branch1.lock_read()
3592
try:
3593
branch2.lock_read()
3594
try:
3595
last1 = ensure_null(branch1.last_revision())
3596
last2 = ensure_null(branch2.last_revision())
3597
3598
graph = branch1.repository.get_graph(branch2.repository)
3599
base_rev_id = graph.find_unique_lca(last1, last2)
3600
3601
print 'merge base is revision %s' % base_rev_id
3602
finally:
3603
branch2.unlock()
3604
finally:
3605
branch1.unlock()
3675
3606
3676
3607
3677
3608
class cmd_merge(Command):
3678
__doc__ = """Perform a three-way merge.
3609
"""Perform a three-way merge.
3679
3610
3680
3611
The source of the merge can be specified either in the form of a branch,
3681
3612
or in the form of a path to a file containing a merge directive generated
3710
3641
committed to record the result of the merge.
3711
3642
3712
3643
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.
3644
--force is given.
3719
3645
3720
3646
To select only some changes to merge, use "merge -i", which will prompt
3721
3647
you to apply each diff hunk and file change, similar to "shelve".
3736
3662
To apply a merge directive contained in /tmp/merge::
3737
3663
3738
3664
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
3665
"""
3747
3666
3748
3667
encoding_type = 'exact'
3806
3725
view_info = _get_view_info_for_change_reporter(tree)
3807
3726
change_reporter = delta._ChangeReporter(
3808
3727
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
3728
cleanups = []
3729
try:
3730
pb = ui.ui_factory.nested_progress_bar()
3731
cleanups.append(pb.finished)
3732
tree.lock_write()
3733
cleanups.append(tree.unlock)
3734
if location is not None:
3735
try:
3736
mergeable = bundle.read_mergeable_from_url(location,
3737
possible_transports=possible_transports)
3738
except errors.NotABundle:
3739
mergeable = None
3740
else:
3741
if uncommitted:
3742
raise errors.BzrCommandError('Cannot use --uncommitted'
3743
' with bundles or merge directives.')
3744
3745
if revision is not None:
3746
raise errors.BzrCommandError(
3747
'Cannot use -r with merge directives or bundles')
3748
merger, verified = _mod_merge.Merger.from_mergeable(tree,
3749
mergeable, pb)
3750
3751
if merger is None and uncommitted:
3752
if revision is not None and len(revision) > 0:
3753
raise errors.BzrCommandError('Cannot use --uncommitted and'
3754
' --revision at the same time.')
3755
merger = self.get_merger_from_uncommitted(tree, location, pb,
3756
cleanups)
3757
allow_pending = False
3758
3759
if merger is None:
3760
merger, allow_pending = self._get_merger_from_branch(tree,
3761
location, revision, remember, possible_transports, pb)
3762
3763
merger.merge_type = merge_type
3764
merger.reprocess = reprocess
3765
merger.show_base = show_base
3766
self.sanity_check_merger(merger)
3767
if (merger.base_rev_id == merger.other_rev_id and
3768
merger.other_rev_id is not None):
3769
note('Nothing to do.')
3770
return 0
3771
if pull:
3772
if merger.interesting_files is not None:
3773
raise errors.BzrCommandError('Cannot pull individual files')
3774
if (merger.base_rev_id == tree.last_revision()):
3775
result = tree.pull(merger.other_branch, False,
3776
merger.other_rev_id)
3777
result.report(self.outf)
3778
return 0
3779
if merger.this_basis is None:
3780
raise errors.BzrCommandError(
3781
"This branch has no commits."
3782
" (perhaps you would prefer 'bzr pull')")
3783
if preview:
3784
return self._do_preview(merger, cleanups)
3785
elif interactive:
3786
return self._do_interactive(merger, cleanups)
3818
3787
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):
3788
return self._do_merge(merger, change_reporter, allow_pending,
3789
verified)
3790
finally:
3791
for cleanup in reversed(cleanups):
3792
cleanup()
3793
3794
def _get_preview(self, merger, cleanups):
3869
3795
tree_merger = merger.make_merger()
3870
3796
tt = tree_merger.make_preview_transform()
3871
self.add_cleanup(tt.finalize)
3797
cleanups.append(tt.finalize)
3872
3798
result_tree = tt.get_preview_tree()
3873
3799
return result_tree
3874
3800
3875
def _do_preview(self, merger):
3801
def _do_preview(self, merger, cleanups):
3876
3802
from bzrlib.diff import show_diff_trees
3877
result_tree = self._get_preview(merger)
3803
result_tree = self._get_preview(merger, cleanups)
3878
3804
show_diff_trees(merger.this_tree, result_tree, self.outf,
3879
3805
old_label='', new_label='')
3880
3806
3890
3816
else:
3891
3817
return 0
3892
3818
3893
def _do_interactive(self, merger):
3819
def _do_interactive(self, merger, cleanups):
3894
3820
"""Perform an interactive merge.
3895
3821
3896
3822
This works by generating a preview tree of the merge, then using
3898
3824
and the preview tree.
3899
3825
"""
3900
3826
from bzrlib import shelf_ui
3901
result_tree = self._get_preview(merger)
3827
result_tree = self._get_preview(merger, cleanups)
3902
3828
writer = bzrlib.option.diff_writer_registry.get()
3903
3829
shelver = shelf_ui.Shelver(merger.this_tree, result_tree, destroy=True,
3904
3830
reporter=shelf_ui.ApplyReporter(),
3905
3831
diff_writer=writer(sys.stdout))
3906
try:
3907
shelver.run()
3908
finally:
3909
shelver.finalize()
3832
shelver.run()
3910
3833
3911
3834
def sanity_check_merger(self, merger):
3912
3835
if (merger.show_base and
3972
3895
allow_pending = True
3973
3896
return merger, allow_pending
3974
3897
3975
def get_merger_from_uncommitted(self, tree, location, pb):
3898
def get_merger_from_uncommitted(self, tree, location, pb, cleanups):
3976
3899
"""Get a merger for uncommitted changes.
3977
3900
3978
3901
:param tree: The tree the merger should apply to.
3979
3902
:param location: The location containing uncommitted changes.
3980
3903
:param pb: The progress bar to use for showing progress.
3904
:param cleanups: A list of operations to perform to clean up the
3905
temporary directories, unfinalized objects, etc.
3981
3906
"""
3982
3907
location = self._select_branch_location(tree, location)[0]
3983
3908
other_tree, other_path = WorkingTree.open_containing(location)
4035
3960
4036
3961
4037
3962
class cmd_remerge(Command):
4038
__doc__ = """Redo a merge.
3963
"""Redo a merge.
4039
3964
4040
3965
Use this if you want to try a different merge technique while resolving
4041
3966
conflicts. Some merge techniques are better than others, and remerge
4066
3991
4067
3992
def run(self, file_list=None, merge_type=None, show_base=False,
4068
3993
reprocess=False):
4069
from bzrlib.conflicts import restore
4070
3994
if merge_type is None:
4071
3995
merge_type = _mod_merge.Merge3Merger
4072
3996
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
3997
tree.lock_write()
3998
try:
3999
parents = tree.get_parent_ids()
4000
if len(parents) != 2:
4001
raise errors.BzrCommandError("Sorry, remerge only works after normal"
4002
" merges. Not cherrypicking or"
4003
" multi-merges.")
4004
repository = tree.branch.repository
4005
interesting_ids = None
4006
new_conflicts = []
4007
conflicts = tree.conflicts()
4008
if file_list is not None:
4009
interesting_ids = set()
4010
for filename in file_list:
4011
file_id = tree.path2id(filename)
4012
if file_id is None:
4013
raise errors.NotVersionedError(filename)
4014
interesting_ids.add(file_id)
4015
if tree.kind(file_id) != "directory":
4016
continue
4092
4017
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:
4018
for name, ie in tree.inventory.iter_entries(file_id):
4019
interesting_ids.add(ie.file_id)
4020
new_conflicts = conflicts.select_conflicts(tree, file_list)[0]
4021
else:
4022
# Remerge only supports resolving contents conflicts
4023
allowed_conflicts = ('text conflict', 'contents conflict')
4024
restore_files = [c.path for c in conflicts
4025
if c.typestring in allowed_conflicts]
4026
_mod_merge.transform_tree(tree, tree.basis_tree(), interesting_ids)
4027
tree.set_conflicts(ConflictList(new_conflicts))
4028
if file_list is not None:
4029
restore_files = file_list
4030
for filename in restore_files:
4031
try:
4032
restore(tree.abspath(filename))
4033
except errors.NotConflicted:
4034
pass
4035
# Disable pending merges, because the file texts we are remerging
4036
# have not had those merges performed. If we use the wrong parents
4037
# list, we imply that the working tree text has seen and rejected
4038
# all the changes from the other tree, when in fact those changes
4039
# have not yet been seen.
4040
pb = ui.ui_factory.nested_progress_bar()
4041
tree.set_parent_ids(parents[:1])
4106
4042
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()
4043
merger = _mod_merge.Merger.from_revision_ids(pb,
4044
tree, parents[1])
4045
merger.interesting_ids = interesting_ids
4046
merger.merge_type = merge_type
4047
merger.show_base = show_base
4048
merger.reprocess = reprocess
4049
conflicts = merger.do_merge()
4050
finally:
4051
tree.set_parent_ids(parents)
4052
pb.finished()
4123
4053
finally:
4124
tree.set_parent_ids(parents)
4054
tree.unlock()
4125
4055
if conflicts > 0:
4126
4056
return 1
4127
4057
else:
4129
4059
4130
4060
4131
4061
class cmd_revert(Command):
4132
__doc__ = """Revert files to a previous revision.
4062
"""Revert files to a previous revision.
4133
4063
4134
4064
Giving a list of files will revert only those files. Otherwise, all files
4135
4065
will be reverted. If the revision is not specified with '--revision', the
4154
4084
created as above. Directories containing unknown files will not be
4155
4085
deleted.
4156
4086
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
4087
The working tree contains a list of pending merged revisions, which will
4088
be included as parents in the next commit. Normally, revert clears that
4089
list as well as reverting the files. If any files are specified, revert
4090
leaves the pending merge list alone and reverts only the files. Use "bzr
4091
revert ." in the tree root to revert all files but keep the merge record,
4092
and "bzr revert --forget-merges" to clear the pending merge list without
4164
4093
reverting any files.
4165
4094
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
4095
Using "bzr revert --forget-merges", it is possible to apply the changes
4096
from an arbitrary merge as a single revision. To do this, perform the
4097
merge as desired. Then doing revert with the "--forget-merges" option will
4098
keep the content of the tree as it was, but it will clear the list of
4099
pending merges. The next commit will then contain all of the changes that
4100
would have been in the merge, but without any mention of the other parent
4101
revisions. Because this technique forgets where these changes originated,
4102
it may cause additional conflicts on later merges involving the source and
4174
4103
target branches.
4175
4104
"""
4176
4105
4186
4115
def run(self, revision=None, no_backup=False, file_list=None,
4187
4116
forget_merges=None):
4188
4117
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)
4118
tree.lock_write()
4119
try:
4120
if forget_merges:
4121
tree.set_parent_ids(tree.get_parent_ids()[:1])
4122
else:
4123
self._revert_tree_to_revision(tree, revision, file_list, no_backup)
4124
finally:
4125
tree.unlock()
4194
4126
4195
4127
@staticmethod
4196
4128
def _revert_tree_to_revision(tree, revision, file_list, no_backup):
4197
4129
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)
4130
pb = ui.ui_factory.nested_progress_bar()
4131
try:
4132
tree.revert(file_list, rev_tree, not no_backup, pb,
4133
report_changes=True)
4134
finally:
4135
pb.finished()
4200
4136
4201
4137
4202
4138
class cmd_assert_fail(Command):
4203
__doc__ = """Test reporting of assertion failures"""
4139
"""Test reporting of assertion failures"""
4204
4140
# intended just for use in testing
4205
4141
4206
4142
hidden = True
4210
4146
4211
4147
4212
4148
class cmd_help(Command):
4213
__doc__ = """Show help on a command or other topic.
4149
"""Show help on a command or other topic.
4214
4150
"""
4215
4151
4216
4152
_see_also = ['topics']
4229
4165
4230
4166
4231
4167
class cmd_shell_complete(Command):
4232
__doc__ = """Show appropriate completions for context.
4168
"""Show appropriate completions for context.
4233
4169
4234
4170
For a list of all available commands, say 'bzr shell-complete'.
4235
4171
"""
4244
4180
4245
4181
4246
4182
class cmd_missing(Command):
4247
__doc__ = """Show unmerged/unpulled revisions between two branches.
4183
"""Show unmerged/unpulled revisions between two branches.
4248
4184
4249
4185
OTHER_BRANCH may be local or remote.
4250
4186
4328
4264
restrict = 'remote'
4329
4265
4330
4266
local_branch = Branch.open_containing(u".")[0]
4331
self.add_cleanup(local_branch.lock_read().unlock)
4332
4333
4267
parent = local_branch.get_parent()
4334
4268
if other_branch is None:
4335
4269
other_branch = parent
4344
4278
remote_branch = Branch.open(other_branch)
4345
4279
if remote_branch.base == local_branch.base:
4346
4280
remote_branch = local_branch
4347
else:
4348
self.add_cleanup(remote_branch.lock_read().unlock)
4349
4281
4350
4282
local_revid_range = _revision_range_to_revid_range(
4351
4283
_get_revision_range(my_revision, local_branch,
4355
4287
_get_revision_range(revision,
4356
4288
remote_branch, self.name()))
4357
4289
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()
4290
local_branch.lock_read()
4291
try:
4292
remote_branch.lock_read()
4293
try:
4294
local_extra, remote_extra = find_unmerged(
4295
local_branch, remote_branch, restrict,
4296
backward=not reverse,
4297
include_merges=include_merges,
4298
local_revid_range=local_revid_range,
4299
remote_revid_range=remote_revid_range)
4300
4301
if log_format is None:
4302
registry = log.log_formatter_registry
4303
log_format = registry.get_default(local_branch)
4304
lf = log_format(to_file=self.outf,
4305
show_ids=show_ids,
4306
show_timezone='original')
4307
4308
status_code = 0
4309
if local_extra and not theirs_only:
4310
message("You have %d extra revision(s):\n" %
4311
len(local_extra))
4312
for revision in iter_log_revisions(local_extra,
4313
local_branch.repository,
4314
verbose):
4315
lf.log_revision(revision)
4316
printed_local = True
4317
status_code = 1
4318
else:
4319
printed_local = False
4320
4321
if remote_extra and not mine_only:
4322
if printed_local is True:
4323
message("\n\n\n")
4324
message("You are missing %d revision(s):\n" %
4325
len(remote_extra))
4326
for revision in iter_log_revisions(remote_extra,
4327
remote_branch.repository,
4328
verbose):
4329
lf.log_revision(revision)
4330
status_code = 1
4331
4332
if mine_only and not local_extra:
4333
# We checked local, and found nothing extra
4334
message('This branch is up to date.\n')
4335
elif theirs_only and not remote_extra:
4336
# We checked remote, and found nothing extra
4337
message('Other branch is up to date.\n')
4338
elif not (mine_only or theirs_only or local_extra or
4339
remote_extra):
4340
# We checked both branches, and neither one had extra
4341
# revisions
4342
message("Branches are up to date.\n")
4343
finally:
4344
remote_branch.unlock()
4345
finally:
4346
local_branch.unlock()
4408
4347
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)
4348
local_branch.lock_write()
4349
try:
4350
# handle race conditions - a parent might be set while we run.
4351
if local_branch.get_parent() is None:
4352
local_branch.set_parent(remote_branch.base)
4353
finally:
4354
local_branch.unlock()
4413
4355
return status_code
4414
4356
4415
4357
4416
4358
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
"""
4359
"""Compress the data within a repository."""
4434
4360
4435
4361
_see_also = ['repositories']
4436
4362
takes_args = ['branch_or_repo?']
4437
takes_options = [
4438
Option('clean-obsolete-packs', 'Delete obsolete packs to save disk space.'),
4439
]
4440
4363
4441
def run(self, branch_or_repo='.', clean_obsolete_packs=False):
4364
def run(self, branch_or_repo='.'):
4442
4365
dir = bzrdir.BzrDir.open_containing(branch_or_repo)[0]
4443
4366
try:
4444
4367
branch = dir.open_branch()
4445
4368
repository = branch.repository
4446
4369
except errors.NotBranchError:
4447
4370
repository = dir.open_repository()
4448
repository.pack(clean_obsolete_packs=clean_obsolete_packs)
4371
repository.pack()
4449
4372
4450
4373
4451
4374
class cmd_plugins(Command):
4452
__doc__ = """List the installed plugins.
4375
"""List the installed plugins.
4453
4376
4454
4377
This command displays the list of installed plugins including
4455
4378
version of plugin and a short description of each.
4462
4385
adding new commands, providing additional network transports and
4463
4386
customizing log output.
4464
4387
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.
4388
See the Bazaar web site, http://bazaar-vcs.org, for further
4389
information on plugins including where to find them and how to
4390
install them. Instructions are also provided there on how to
4391
write new plugins using the Python programming language.
4469
4392
"""
4470
4393
takes_options = ['verbose']
4471
4394
4486
4409
doc = '(no description)'
4487
4410
result.append((name_ver, doc, plugin.path()))
4488
4411
for name_ver, doc, path in sorted(result):
4489
self.outf.write("%s\n" % name_ver)
4490
self.outf.write(" %s\n" % doc)
4412
print name_ver
4413
print ' ', doc
4491
4414
if verbose:
4492
self.outf.write(" %s\n" % path)
4493
self.outf.write("\n")
4415
print ' ', path
4416
print
4494
4417
4495
4418
4496
4419
class cmd_testament(Command):
4497
__doc__ = """Show testament (signing-form) of a revision."""
4420
"""Show testament (signing-form) of a revision."""
4498
4421
takes_options = [
4499
4422
'revision',
4500
4423
Option('long', help='Produce long-format testament.'),
4512
4435
b = Branch.open_containing(branch)[0]
4513
4436
else:
4514
4437
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())
4438
b.lock_read()
4439
try:
4440
if revision is None:
4441
rev_id = b.last_revision()
4442
else:
4443
rev_id = revision[0].as_revision_id(b)
4444
t = testament_class.from_revision(b.repository, rev_id)
4445
if long:
4446
sys.stdout.writelines(t.as_text_lines())
4447
else:
4448
sys.stdout.write(t.as_short_text())
4449
finally:
4450
b.unlock()
4525
4451
4526
4452
4527
4453
class cmd_annotate(Command):
4528
__doc__ = """Show the origin of each line in a file.
4454
"""Show the origin of each line in a file.
4529
4455
4530
4456
This prints out the given file with an annotation on the left side
4531
4457
indicating which revision, author and date introduced the change.
4552
4478
wt, branch, relpath = \
4553
4479
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
4554
4480
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)
4481
wt.lock_read()
4482
else:
4483
branch.lock_read()
4484
try:
4485
tree = _get_one_revision_tree('annotate', revision, branch=branch)
4486
if wt is not None:
4487
file_id = wt.path2id(relpath)
4488
else:
4489
file_id = tree.path2id(relpath)
4490
if file_id is None:
4491
raise errors.NotVersionedError(filename)
4492
file_version = tree.inventory[file_id].revision
4493
if wt is not None and revision is None:
4494
# If there is a tree and we're not annotating historical
4495
# versions, annotate the working tree's content.
4496
annotate_file_tree(wt, file_id, self.outf, long, all,
4497
show_ids=show_ids)
4498
else:
4499
annotate_file(branch, file_version, file_id, long, all, self.outf,
4500
show_ids=show_ids)
4501
finally:
4502
if wt is not None:
4503
wt.unlock()
4504
else:
4505
branch.unlock()
4575
4506
4576
4507
4577
4508
class cmd_re_sign(Command):
4578
__doc__ = """Create a digital signature for an existing revision."""
4509
"""Create a digital signature for an existing revision."""
4579
4510
# TODO be able to replace existing ones.
4580
4511
4581
4512
hidden = True # is this right ?
4588
4519
if revision_id_list is None and revision is None:
4589
4520
raise errors.BzrCommandError('You must supply either --revision or a revision_id')
4590
4521
b = WorkingTree.open_containing(u'.')[0].branch
4591
self.add_cleanup(b.lock_write().unlock)
4592
return self._run(b, revision_id_list, revision)
4522
b.lock_write()
4523
try:
4524
return self._run(b, revision_id_list, revision)
4525
finally:
4526
b.unlock()
4593
4527
4594
4528
def _run(self, b, revision_id_list, revision):
4595
4529
import bzrlib.gpg as gpg
4640
4574
4641
4575
4642
4576
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.
4577
"""Convert the current branch into a checkout of the supplied branch.
4645
4578
4646
4579
Once converted into a checkout, commits must succeed on the master branch
4647
4580
before they will be applied to the local branch.
4665
4598
'This format does not remember old locations.')
4666
4599
else:
4667
4600
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')
4601
raise errors.BzrCommandError('No location supplied and no '
4602
'previous location known')
4673
4603
b_other = Branch.open(location)
4674
4604
try:
4675
4605
b.bind(b_other)
4681
4611
4682
4612
4683
4613
class cmd_unbind(Command):
4684
__doc__ = """Convert the current checkout into a regular branch.
4614
"""Convert the current checkout into a regular branch.
4685
4615
4686
4616
After unbinding, the local branch is considered independent and subsequent
4687
4617
commits will be local only.
4698
4628
4699
4629
4700
4630
class cmd_uncommit(Command):
4701
__doc__ = """Remove the last committed revision.
4631
"""Remove the last committed revision.
4702
4632
4703
4633
--verbose will print out what is being removed.
4704
4634
--dry-run will go through all the motions, but not actually
4744
4674
b = control.open_branch()
4745
4675
4746
4676
if tree is not None:
4747
self.add_cleanup(tree.lock_write().unlock)
4677
tree.lock_write()
4748
4678
else:
4749
self.add_cleanup(b.lock_write().unlock)
4750
return self._run(b, tree, dry_run, verbose, revision, force, local=local)
4679
b.lock_write()
4680
try:
4681
return self._run(b, tree, dry_run, verbose, revision, force,
4682
local=local)
4683
finally:
4684
if tree is not None:
4685
tree.unlock()
4686
else:
4687
b.unlock()
4751
4688
4752
4689
def _run(self, b, tree, dry_run, verbose, revision, force, local=False):
4753
4690
from bzrlib.log import log_formatter, show_log
4785
4722
end_revision=last_revno)
4786
4723
4787
4724
if dry_run:
4788
self.outf.write('Dry-run, pretending to remove'
4789
' the above revisions.\n')
4725
print 'Dry-run, pretending to remove the above revisions.'
4726
if not force:
4727
val = raw_input('Press <enter> to continue')
4790
4728
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
4729
print 'The above revision(s) will be removed.'
4730
if not force:
4731
val = raw_input('Are you sure [y/N]? ')
4732
if val.lower() not in ('y', 'yes'):
4733
print 'Canceled'
4734
return 0
4797
4735
4798
4736
mutter('Uncommitting from {%s} to {%s}',
4799
4737
last_rev_id, rev_id)
4800
4738
uncommit(b, tree=tree, dry_run=dry_run, verbose=verbose,
4801
4739
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)
4740
note('You can restore the old tip by running:\n'
4741
' bzr pull . -r revid:%s', last_rev_id)
4804
4742
4805
4743
4806
4744
class cmd_break_lock(Command):
4807
__doc__ = """Break a dead lock on a repository, branch or working directory.
4745
"""Break a dead lock on a repository, branch or working directory.
4808
4746
4809
4747
CAUTION: Locks should only be broken when you are sure that the process
4810
4748
holding the lock has been stopped.
4811
4749
4812
You can get information on what locks are open via the 'bzr info
4813
[location]' command.
4750
You can get information on what locks are open via the 'bzr info' command.
4814
4751
4815
4752
:Examples:
4816
4753
bzr break-lock
4817
bzr break-lock bzr+ssh://example.com/bzr/foo
4818
4754
"""
4819
4755
takes_args = ['location?']
4820
4756
4829
4765
4830
4766
4831
4767
class cmd_wait_until_signalled(Command):
4832
__doc__ = """Test helper for test_start_and_stop_bzr_subprocess_send_signal.
4768
"""Test helper for test_start_and_stop_bzr_subprocess_send_signal.
4833
4769
4834
4770
This just prints a line to signal when it is ready, then blocks on stdin.
4835
4771
"""
4843
4779
4844
4780
4845
4781
class cmd_serve(Command):
4846
__doc__ = """Run the bzr server."""
4782
"""Run the bzr server."""
4847
4783
4848
4784
aliases = ['server']
4849
4785
4909
4845
4910
4846
4911
4847
class cmd_join(Command):
4912
__doc__ = """Combine a tree into its containing tree.
4848
"""Combine a tree into its containing tree.
4913
4849
4914
4850
This command requires the target tree to be in a rich-root format.
4915
4851
4955
4891
4956
4892
4957
4893
class cmd_split(Command):
4958
__doc__ = """Split a subdirectory of a tree into a separate tree.
4894
"""Split a subdirectory of a tree into a separate tree.
4959
4895
4960
4896
This command will produce a target tree in a format that supports
4961
4897
rich roots, like 'rich-root' or 'rich-root-pack'. These formats cannot be
4981
4917
4982
4918
4983
4919
class cmd_merge_directive(Command):
4984
__doc__ = """Generate a merge directive for auto-merge tools.
4920
"""Generate a merge directive for auto-merge tools.
4985
4921
4986
4922
A directive requests a merge to be performed, and also provides all the
4987
4923
information necessary to do so. This means it must either include a
5080
5016
5081
5017
5082
5018
class cmd_send(Command):
5083
__doc__ = """Mail or create a merge-directive for submitting changes.
5019
"""Mail or create a merge-directive for submitting changes.
5084
5020
5085
5021
A merge directive provides many things needed for requesting merges:
5086
5022
5092
5028
directly from the merge directive, without retrieving data from a
5093
5029
branch.
5094
5030
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.
5031
If --no-bundle is specified, then public_branch is needed (and must be
5032
up-to-date), so that the receiver can perform the merge using the
5033
public_branch. The public_branch is always included if known, so that
5034
people can check it later.
5035
5036
The submit branch defaults to the parent, but can be overridden. Both
5037
submit branch and public branch will be remembered if supplied.
5038
5039
If a public_branch is known for the submit_branch, that public submit
5040
branch is used in the merge instructions. This means that a local mirror
5041
can be used as your actual submit branch, once you have set public_branch
5042
for that mirror.
5121
5043
5122
5044
Mail is sent using your preferred mail program. This should be transparent
5123
5045
on Windows (it uses MAPI). On Linux, it requires the xdg-email utility.
5143
5065
5144
5066
The merge directives created by bzr send may be applied using bzr merge or
5145
5067
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
5068
"""
5151
5069
5152
5070
encoding_type = 'exact'
5168
5086
short_name='f',
5169
5087
type=unicode),
5170
5088
Option('output', short_name='o',
5171
help='Write merge directive to this file or directory; '
5089
help='Write merge directive to this file; '
5172
5090
'use - for stdout.',
5173
5091
type=unicode),
5174
5092
Option('strict',
5197
5115
5198
5116
5199
5117
class cmd_bundle_revisions(cmd_send):
5200
__doc__ = """Create a merge-directive for submitting changes.
5118
"""Create a merge-directive for submitting changes.
5201
5119
5202
5120
A merge directive provides many things needed for requesting merges:
5203
5121
5270
5188
5271
5189
5272
5190
class cmd_tag(Command):
5273
__doc__ = """Create, remove or modify a tag naming a revision.
5191
"""Create, remove or modify a tag naming a revision.
5274
5192
5275
5193
Tags give human-meaningful names to revisions. Commands that take a -r
5276
5194
(--revision) option can be given -rtag:X, where X is any previously
5284
5202
5285
5203
To rename a tag (change the name but keep it on the same revsion), run ``bzr
5286
5204
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
5205
"""
5293
5206
5294
5207
_see_also = ['commit', 'tags']
5295
takes_args = ['tag_name?']
5208
takes_args = ['tag_name']
5296
5209
takes_options = [
5297
5210
Option('delete',
5298
5211
help='Delete this tag rather than placing it.',
5308
5221
'revision',
5309
5222
]
5310
5223
5311
def run(self, tag_name=None,
5224
def run(self, tag_name,
5312
5225
delete=None,
5313
5226
directory='.',
5314
5227
force=None,
5315
5228
revision=None,
5316
5229
):
5317
5230
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)
5231
branch.lock_write()
5232
try:
5233
if delete:
5234
branch.tags.delete_tag(tag_name)
5235
self.outf.write('Deleted tag %s.\n' % tag_name)
5331
5236
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)
5237
if revision:
5238
if len(revision) != 1:
5239
raise errors.BzrCommandError(
5240
"Tags can only be placed on a single revision, "
5241
"not on a range")
5242
revision_id = revision[0].as_revision_id(branch)
5243
else:
5244
revision_id = branch.last_revision()
5245
if (not force) and branch.tags.has_tag(tag_name):
5246
raise errors.TagAlreadyExists(tag_name)
5247
branch.tags.set_tag(tag_name, revision_id)
5248
self.outf.write('Created tag %s.\n' % tag_name)
5249
finally:
5250
branch.unlock()
5342
5251
5343
5252
5344
5253
class cmd_tags(Command):
5345
__doc__ = """List tags.
5254
"""List tags.
5346
5255
5347
5256
This command shows a table of tag names and the revisions they reference.
5348
5257
"""
5376
5285
if not tags:
5377
5286
return
5378
5287
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()
5288
branch.lock_read()
5289
try:
5290
if revision:
5291
graph = branch.repository.get_graph()
5292
rev1, rev2 = _get_revision_range(revision, branch, self.name())
5293
revid1, revid2 = rev1.rev_id, rev2.rev_id
5294
# only show revisions between revid1 and revid2 (inclusive)
5295
tags = [(tag, revid) for tag, revid in tags if
5296
graph.is_between(revid, revid1, revid2)]
5297
if sort == 'alpha':
5298
tags.sort()
5299
elif sort == 'time':
5300
timestamps = {}
5301
for tag, revid in tags:
5302
try:
5303
revobj = branch.repository.get_revision(revid)
5304
except errors.NoSuchRevision:
5305
timestamp = sys.maxint # place them at the end
5306
else:
5307
timestamp = revobj.timestamp
5308
timestamps[revid] = timestamp
5309
tags.sort(key=lambda x: timestamps[x[1]])
5310
if not show_ids:
5311
# [ (tag, revid), ... ] -> [ (tag, dotted_revno), ... ]
5312
for index, (tag, revid) in enumerate(tags):
5313
try:
5314
revno = branch.revision_id_to_dotted_revno(revid)
5315
if isinstance(revno, tuple):
5316
revno = '.'.join(map(str, revno))
5317
except errors.NoSuchRevision:
5318
# Bad tag data/merges can lead to tagged revisions
5319
# which are not in this branch. Fail gracefully ...
5320
revno = '?'
5321
tags[index] = (tag, revno)
5322
finally:
5323
branch.unlock()
5413
5324
for tag, revspec in tags:
5414
5325
self.outf.write('%-20s %s\n' % (tag, revspec))
5415
5326
5416
5327
5417
5328
class cmd_reconfigure(Command):
5418
__doc__ = """Reconfigure the type of a bzr directory.
5329
"""Reconfigure the type of a bzr directory.
5419
5330
5420
5331
A target configuration must be specified.
5421
5332
5506
5417
5507
5418
5508
5419
class cmd_switch(Command):
5509
__doc__ = """Set the branch of a checkout and update.
5420
"""Set the branch of a checkout and update.
5510
5421
5511
5422
For lightweight checkouts, this changes the branch being referenced.
5512
5423
For heavyweight checkouts, this checks that there are no local commits
5528
5439
that of the master.
5529
5440
"""
5530
5441
5531
takes_args = ['to_location?']
5442
takes_args = ['to_location']
5532
5443
takes_options = [Option('force',
5533
5444
help='Switch even if local commits will be lost.'),
5534
'revision',
5535
5445
Option('create-branch', short_name='b',
5536
5446
help='Create the target branch from this one before'
5537
5447
' switching to it.'),
5538
]
5448
]
5539
5449
5540
def run(self, to_location=None, force=False, create_branch=False,
5541
revision=None):
5450
def run(self, to_location, force=False, create_branch=False):
5542
5451
from bzrlib import switch
5543
5452
tree_location = '.'
5544
revision = _get_one_revision('switch', revision)
5545
5453
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
5454
try:
5552
5455
branch = control_dir.open_branch()
5553
5456
had_explicit_nick = branch.get_config().has_explicit_nickname()
5558
5461
if branch is None:
5559
5462
raise errors.BzrCommandError('cannot create branch without'
5560
5463
' source branch')
5561
to_location = directory_service.directories.dereference(
5562
to_location)
5563
5464
if '/' not in to_location and '\\' not in to_location:
5564
5465
# This path is meant to be relative to the existing branch
5565
5466
this_url = self._get_branch_location(control_dir)
5567
5468
to_branch = branch.bzrdir.sprout(to_location,
5568
5469
possible_transports=[branch.bzrdir.root_transport],
5569
5470
source_branch=branch).open_branch()
5471
# try:
5472
# from_branch = control_dir.open_branch()
5473
# except errors.NotBranchError:
5474
# raise BzrCommandError('Cannot create a branch from this'
5475
# ' location when we cannot open this branch')
5476
# from_branch.bzrdir.sprout(
5477
pass
5570
5478
else:
5571
5479
try:
5572
5480
to_branch = Branch.open(to_location)
5574
5482
this_url = self._get_branch_location(control_dir)
5575
5483
to_branch = Branch.open(
5576
5484
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)
5485
switch.switch(control_dir, to_branch, force)
5580
5486
if had_explicit_nick:
5581
5487
branch = control_dir.open_branch() #get the new branch!
5582
5488
branch.nick = to_branch.nick
5602
5508
5603
5509
5604
5510
class cmd_view(Command):
5605
__doc__ = """Manage filtered views.
5511
"""Manage filtered views.
5606
5512
5607
5513
Views provide a mask over the tree so that users can focus on
5608
5514
a subset of a tree when doing their work. After creating a view,
5756
5662
5757
5663
5758
5664
class cmd_hooks(Command):
5759
__doc__ = """Show hooks."""
5665
"""Show hooks."""
5760
5666
5761
5667
hidden = True
5762
5668
5775
5681
self.outf.write(" <no hooks installed>\n")
5776
5682
5777
5683
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
5684
class cmd_shelve(Command):
5804
__doc__ = """Temporarily set aside some changes from the current tree.
5685
"""Temporarily set aside some changes from the current tree.
5805
5686
5806
5687
Shelve allows you to temporarily put changes you've made "on the shelf",
5807
5688
ie. out of the way, until a later time when you can bring them back from
5860
5741
5861
5742
def run_for_list(self):
5862
5743
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
5744
tree.lock_read()
5745
try:
5746
manager = tree.get_shelf_manager()
5747
shelves = manager.active_shelves()
5748
if len(shelves) == 0:
5749
note('No shelved changes.')
5750
return 0
5751
for shelf_id in reversed(shelves):
5752
message = manager.get_metadata(shelf_id).get('message')
5753
if message is None:
5754
message = '<no message>'
5755
self.outf.write('%3d: %s\n' % (shelf_id, message))
5756
return 1
5757
finally:
5758
tree.unlock()
5875
5759
5876
5760
5877
5761
class cmd_unshelve(Command):
5878
__doc__ = """Restore shelved changes.
5762
"""Restore shelved changes.
5879
5763
5880
5764
By default, the most recently shelved changes are restored. However if you
5881
5765
specify a shelf by id those changes will be restored instead. This works
5889
5773
enum_switch=False, value_switches=True,
5890
5774
apply="Apply changes and remove from the shelf.",
5891
5775
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.",
5776
delete_only="Delete changes without applying them."
5896
5777
)
5897
5778
]
5898
5779
_see_also = ['shelve']
5907
5788
5908
5789
5909
5790
class cmd_clean_tree(Command):
5910
__doc__ = """Remove unwanted files from working tree.
5791
"""Remove unwanted files from working tree.
5911
5792
5912
5793
By default, only unknown files, not ignored files, are deleted. Versioned
5913
5794
files are never deleted.
5941
5822
5942
5823
5943
5824
class cmd_reference(Command):
5944
__doc__ = """list, view and set branch locations for nested trees.
5825
"""list, view and set branch locations for nested trees.
5945
5826
5946
5827
If no arguments are provided, lists the branch locations for nested trees.
5947
5828
If one argument is provided, display the branch location for that tree.
5987
5868
self.outf.write('%s %s\n' % (path, location))
5988
5869
5989
5870
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)
5871
# these get imported and then picked up by the scan for cmd_*
5872
# TODO: Some more consistent way to split command definitions across files;
5873
# we do need to load at least some information about them to know of
5874
# aliases. ideally we would avoid loading the implementation until the
5875
# details were needed.
5876
from bzrlib.cmd_version_info import cmd_version_info
5877
from bzrlib.conflicts import cmd_resolve, cmd_conflicts, restore
5878
from bzrlib.bundle.commands import (
5879
cmd_bundle_info,
5880
)
5881
from bzrlib.foreign import cmd_dpush
5882
from bzrlib.sign_my_commits import cmd_sign_my_commits
5883
from bzrlib.weave_commands import cmd_versionedfile_list, \
5884
cmd_weave_plan_merge, cmd_weave_merge_text
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0