« back to all changes in this revision
Viewing changes to bzrlib/builtins.py
- browse files at revision 4913.3.1
- compare with another revision
- download diff
- download tarball
- view history from revision 4913.3.1
- Committer: John Arbash Meinel
- Date: 2009-12-22 16:28:47 UTC
- mto: This revision was merged to the branch mainline in revision 4922.
- Revision ID: john@arbash-meinel.com-20091222162847-tvnsc69to4l4uf5r
Implement a permute_for_extension helper.
Use it for all of the 'simple' extension permutations.
It basically permutes all tests in the current module, by setting TestCase.module.
Which works well for most of our extension tests. Some had more advanced
handling of permutations (extra permutations, custom vars, etc.)
Use it for all of the 'simple' extension permutations.
It basically permutes all tests in the current module, by setting TestCase.module.
Which works well for most of our extension tests. Some had more advanced
handling of permutations (extra permutations, custom vars, etc.)
- 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
- 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
916
By default, this command only works on branches that have not diverged.
928
917
Branches are considered diverged if the destination branch's most recent
977
966
try:
978
967
tree_to = WorkingTree.open_containing(directory)[0]
979
968
branch_to = tree_to.branch
980
self.add_cleanup(tree_to.lock_write().unlock)
981
969
except errors.NoWorkingTree:
982
970
tree_to = None
983
971
branch_to = Branch.open_containing(directory)[0]
984
self.add_cleanup(branch_to.lock_write().unlock)
985
972
986
973
if local and not branch_to.get_bound_location():
987
974
raise errors.LocalRequiresBoundBranch()
988
975
1018
1005
else:
1019
1006
branch_from = Branch.open(location,
1020
1007
possible_transports=possible_transports)
1021
self.add_cleanup(branch_from.lock_read().unlock)
1022
1008
1023
1009
if branch_to.get_parent() is None or remember:
1024
1010
branch_to.set_parent(branch_from.base)
1025
1011
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)
1012
if branch_from is not branch_to:
1013
branch_from.lock_read()
1014
try:
1015
if revision is not None:
1016
revision_id = revision.as_revision_id(branch_from)
1017
1018
branch_to.lock_write()
1019
try:
1020
if tree_to is not None:
1021
view_info = _get_view_info_for_change_reporter(tree_to)
1022
change_reporter = delta._ChangeReporter(
1023
unversioned_filter=tree_to.is_ignored,
1024
view_info=view_info)
1025
result = tree_to.pull(
1026
branch_from, overwrite, revision_id, change_reporter,
1027
possible_transports=possible_transports, local=local)
1028
else:
1029
result = branch_to.pull(
1030
branch_from, overwrite, revision_id, local=local)
1031
1032
result.report(self.outf)
1033
if verbose and result.old_revid != result.new_revid:
1034
log.show_branch_change(
1035
branch_to, self.outf, result.old_revno,
1036
result.old_revid)
1037
finally:
1038
branch_to.unlock()
1039
finally:
1040
if branch_from is not branch_to:
1041
branch_from.unlock()
1046
1042
1047
1043
1048
1044
class cmd_push(Command):
1049
__doc__ = """Update a mirror of this branch.
1045
"""Update a mirror of this branch.
1050
1046
1051
1047
The target branch will not have its working tree populated because this
1052
1048
is both expensive, and is not supported on remote file systems.
1113
1109
# Get the source branch
1114
1110
(tree, br_from,
1115
1111
_unused) = bzrdir.BzrDir.open_containing_tree_or_branch(directory)
1112
if strict is None:
1113
strict = br_from.get_config().get_user_option_as_bool('push_strict')
1114
if strict is None: strict = True # default value
1116
1115
# Get the tip's revision_id
1117
1116
revision = _get_one_revision('push', revision)
1118
1117
if revision is not None:
1119
1118
revision_id = revision.in_history(br_from).rev_id
1120
1119
else:
1121
1120
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.')
1121
if strict and tree is not None and revision_id is None:
1122
if (tree.has_changes()):
1123
raise errors.UncommittedChanges(
1124
tree, more='Use --no-strict to force the push.')
1125
if tree.last_revision() != tree.branch.last_revision():
1126
# The tree has lost sync with its branch, there is little
1127
# chance that the user is aware of it but he can still force
1128
# the push with --no-strict
1129
raise errors.OutOfDateTree(
1130
tree, more='Use --no-strict to force the push.')
1131
1127
1132
# Get the stacked_on branch, if any
1128
1133
if stacked_on is not None:
1129
1134
stacked_on = urlutils.normalize_url(stacked_on)
1161
1166
1162
1167
1163
1168
class cmd_branch(Command):
1164
__doc__ = """Create a new branch that is a copy of an existing branch.
1169
"""Create a new branch that is a copy of an existing branch.
1165
1170
1166
1171
If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will
1167
1172
be used. In other words, "branch ../foo/bar" will attempt to create ./bar.
1194
1199
' directory exists, but does not already'
1195
1200
' have a control directory. This flag will'
1196
1201
' allow branch to proceed.'),
1197
Option('bind',
1198
help="Bind new branch to from location."),
1199
1202
]
1200
1203
aliases = ['get', 'clone']
1201
1204
1202
1205
def run(self, from_location, to_location=None, revision=None,
1203
1206
hardlink=False, stacked=False, standalone=False, no_tree=False,
1204
use_existing_dir=False, switch=False, bind=False):
1207
use_existing_dir=False, switch=False):
1205
1208
from bzrlib import switch as _mod_switch
1206
1209
from bzrlib.tag import _merge_tags_if_possible
1207
1210
accelerator_tree, br_from = bzrdir.BzrDir.open_tree_or_branch(
1208
1211
from_location)
1209
1212
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)
1213
br_from.lock_read()
1221
1214
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)
1215
if revision is not None:
1216
revision_id = revision.as_revision_id(br_from)
1227
1217
else:
1228
try:
1229
bzrdir.BzrDir.open_from_transport(to_transport)
1230
except errors.NotBranchError:
1231
pass
1218
# FIXME - wt.last_revision, fallback to branch, fall back to
1219
# None or perhaps NULL_REVISION to mean copy nothing
1220
# RBC 20060209
1221
revision_id = br_from.last_revision()
1222
if to_location is None:
1223
to_location = urlutils.derive_to_location(from_location)
1224
to_transport = transport.get_transport(to_location)
1225
try:
1226
to_transport.mkdir('.')
1227
except errors.FileExists:
1228
if not use_existing_dir:
1229
raise errors.BzrCommandError('Target directory "%s" '
1230
'already exists.' % to_location)
1232
1231
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'))
1232
try:
1233
bzrdir.BzrDir.open_from_transport(to_transport)
1234
except errors.NotBranchError:
1235
pass
1236
else:
1237
raise errors.AlreadyBranchError(to_location)
1238
except errors.NoSuchFile:
1239
raise errors.BzrCommandError('Parent of "%s" does not exist.'
1240
% to_location)
1241
try:
1242
# preserve whatever source format we have.
1243
dir = br_from.bzrdir.sprout(to_transport.base, revision_id,
1244
possible_transports=[to_transport],
1245
accelerator_tree=accelerator_tree,
1246
hardlink=hardlink, stacked=stacked,
1247
force_new_repo=standalone,
1248
create_tree_if_local=not no_tree,
1249
source_branch=br_from)
1250
branch = dir.open_branch()
1251
except errors.NoSuchRevision:
1252
to_transport.delete_tree('.')
1253
msg = "The branch %s has no revision %s." % (from_location,
1254
revision)
1255
raise errors.BzrCommandError(msg)
1256
_merge_tags_if_possible(br_from, branch)
1257
# If the source branch is stacked, the new branch may
1258
# be stacked whether we asked for that explicitly or not.
1259
# We therefore need a try/except here and not just 'if stacked:'
1260
try:
1261
note('Created new stacked branch referring to %s.' %
1262
branch.get_stacked_on_url())
1263
except (errors.NotStacked, errors.UnstackableBranchFormat,
1264
errors.UnstackableRepositoryFormat), e:
1265
note('Branched %d revision(s).' % branch.revno())
1266
if switch:
1267
# Switch to the new branch
1268
wt, _ = WorkingTree.open_containing('.')
1269
_mod_switch.switch(wt.bzrdir, branch)
1270
note('Switched to branch: %s',
1271
urlutils.unescape_for_display(branch.base, 'utf-8'))
1272
finally:
1273
br_from.unlock()
1273
1274
1274
1275
1275
1276
class cmd_checkout(Command):
1276
__doc__ = """Create a new checkout of an existing branch.
1277
"""Create a new checkout of an existing branch.
1277
1278
1278
1279
If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree for
1279
1280
the branch found in '.'. This is useful if you have removed the working tree
1342
1343
1343
1344
1344
1345
class cmd_renames(Command):
1345
__doc__ = """Show list of renamed files.
1346
"""Show list of renamed files.
1346
1347
"""
1347
1348
# TODO: Option to show renames between two historical versions.
1348
1349
1353
1354
@display_command
1354
1355
def run(self, dir=u'.'):
1355
1356
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))
1357
tree.lock_read()
1358
try:
1359
new_inv = tree.inventory
1360
old_tree = tree.basis_tree()
1361
old_tree.lock_read()
1362
try:
1363
old_inv = old_tree.inventory
1364
renames = []
1365
iterator = tree.iter_changes(old_tree, include_unchanged=True)
1366
for f, paths, c, v, p, n, k, e in iterator:
1367
if paths[0] == paths[1]:
1368
continue
1369
if None in (paths):
1370
continue
1371
renames.append(paths)
1372
renames.sort()
1373
for old_name, new_name in renames:
1374
self.outf.write("%s => %s\n" % (old_name, new_name))
1375
finally:
1376
old_tree.unlock()
1377
finally:
1378
tree.unlock()
1372
1379
1373
1380
1374
1381
class cmd_update(Command):
1375
__doc__ = """Update a tree to have the latest code committed to its branch.
1382
"""Update a tree to have the latest code committed to its branch.
1376
1383
1377
1384
This will perform a merge into the working tree, and may generate
1378
1385
conflicts. If you have any local changes, you will still
1380
1387
1381
1388
If you want to discard your local changes, you can just do a
1382
1389
'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
1390
"""
1387
1391
1388
1392
_see_also = ['pull', 'working-trees', 'status-flags']
1389
1393
takes_args = ['dir?']
1390
takes_options = ['revision']
1391
1394
aliases = ['up']
1392
1395
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")
1396
def run(self, dir='.'):
1397
1397
tree = WorkingTree.open_containing(dir)[0]
1398
branch = tree.branch
1399
1398
possible_transports = []
1400
master = branch.get_master_branch(
1399
master = tree.branch.get_master_branch(
1401
1400
possible_transports=possible_transports)
1402
1401
if master is not None:
1402
tree.lock_write()
1403
1403
branch_location = master.base
1404
tree.lock_write()
1405
1404
else:
1405
tree.lock_tree_write()
1406
1406
branch_location = tree.branch.base
1407
tree.lock_tree_write()
1408
self.add_cleanup(tree.unlock)
1409
1407
# 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)
1408
branch_location = urlutils.unescape_for_display(branch_location[:-1],
1409
self.outf.encoding)
1434
1410
try:
1411
existing_pending_merges = tree.get_parent_ids()[1:]
1412
last_rev = _mod_revision.ensure_null(tree.last_revision())
1413
if last_rev == _mod_revision.ensure_null(
1414
tree.branch.last_revision()):
1415
# may be up to date, check master too.
1416
if master is None or last_rev == _mod_revision.ensure_null(
1417
master.last_revision()):
1418
revno = tree.branch.revision_id_to_revno(last_rev)
1419
note('Tree is up to date at revision %d of branch %s'
1420
% (revno, branch_location))
1421
return 0
1422
view_info = _get_view_info_for_change_reporter(tree)
1435
1423
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
1424
delta._ChangeReporter(unversioned_filter=tree.is_ignored,
1425
view_info=view_info), possible_transports=possible_transports)
1426
revno = tree.branch.revision_id_to_revno(
1427
_mod_revision.ensure_null(tree.last_revision()))
1428
note('Updated to revision %d of branch %s' %
1429
(revno, branch_location))
1430
if tree.get_parent_ids()[1:] != existing_pending_merges:
1431
note('Your local commits will now show as pending merges with '
1432
"'bzr status', and can be committed with 'bzr commit'.")
1433
if conflicts != 0:
1434
return 1
1435
else:
1436
return 0
1437
finally:
1438
tree.unlock()
1458
1439
1459
1440
1460
1441
class cmd_info(Command):
1461
__doc__ = """Show information about a working tree, branch or repository.
1442
"""Show information about a working tree, branch or repository.
1462
1443
1463
1444
This command will show all known locations and formats associated to the
1464
1445
tree, branch or repository.
1502
1483
1503
1484
1504
1485
class cmd_remove(Command):
1505
__doc__ = """Remove files or directories.
1486
"""Remove files or directories.
1506
1487
1507
1488
This makes bzr stop tracking changes to the specified files. bzr will delete
1508
1489
them if they can easily be recovered using revert. If no options or
1530
1511
if file_list is not None:
1531
1512
file_list = [f for f in file_list]
1532
1513
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')
1514
tree.lock_write()
1515
try:
1516
# Heuristics should probably all move into tree.remove_smart or
1517
# some such?
1518
if new:
1519
added = tree.changes_from(tree.basis_tree(),
1520
specific_files=file_list).added
1521
file_list = sorted([f[0] for f in added], reverse=True)
1522
if len(file_list) == 0:
1523
raise errors.BzrCommandError('No matching files.')
1524
elif file_list is None:
1525
# missing files show up in iter_changes(basis) as
1526
# versioned-with-no-kind.
1527
missing = []
1528
for change in tree.iter_changes(tree.basis_tree()):
1529
# Find paths in the working tree that have no kind:
1530
if change[1][1] is not None and change[6][1] is None:
1531
missing.append(change[1][1])
1532
file_list = sorted(missing, reverse=True)
1533
file_deletion_strategy = 'keep'
1534
tree.remove(file_list, verbose=verbose, to_file=self.outf,
1535
keep_files=file_deletion_strategy=='keep',
1536
force=file_deletion_strategy=='force')
1537
finally:
1538
tree.unlock()
1555
1539
1556
1540
1557
1541
class cmd_file_id(Command):
1558
__doc__ = """Print file_id of a particular file or directory.
1542
"""Print file_id of a particular file or directory.
1559
1543
1560
1544
The file_id is assigned when the file is first added and remains the
1561
1545
same through all revisions where the file exists, even when it is
1577
1561
1578
1562
1579
1563
class cmd_file_path(Command):
1580
__doc__ = """Print path of file_ids to a file or directory.
1564
"""Print path of file_ids to a file or directory.
1581
1565
1582
1566
This prints one line for each directory down to the target,
1583
1567
starting at the branch root.
1599
1583
1600
1584
1601
1585
class cmd_reconcile(Command):
1602
__doc__ = """Reconcile bzr metadata in a branch.
1586
"""Reconcile bzr metadata in a branch.
1603
1587
1604
1588
This can correct data mismatches that may have been caused by
1605
1589
previous ghost operations or bzr upgrades. You should only
1627
1611
1628
1612
1629
1613
class cmd_revision_history(Command):
1630
__doc__ = """Display the list of revision ids on a branch."""
1614
"""Display the list of revision ids on a branch."""
1631
1615
1632
1616
_see_also = ['log']
1633
1617
takes_args = ['location?']
1643
1627
1644
1628
1645
1629
class cmd_ancestry(Command):
1646
__doc__ = """List all revisions merged into this branch."""
1630
"""List all revisions merged into this branch."""
1647
1631
1648
1632
_see_also = ['log', 'revision-history']
1649
1633
takes_args = ['location?']
1668
1652
1669
1653
1670
1654
class cmd_init(Command):
1671
__doc__ = """Make a directory into a versioned branch.
1655
"""Make a directory into a versioned branch.
1672
1656
1673
1657
Use this to create an empty branch, or before importing an
1674
1658
existing project.
1777
1761
1778
1762
1779
1763
class cmd_init_repository(Command):
1780
__doc__ = """Create a shared repository for branches to share storage space.
1764
"""Create a shared repository for branches to share storage space.
1781
1765
1782
1766
New branches created under the repository directory will store their
1783
1767
revisions in the repository, not in the branch directory. For branches
1837
1821
1838
1822
1839
1823
class cmd_diff(Command):
1840
__doc__ = """Show differences in the working tree, between revisions or branches.
1824
"""Show differences in the working tree, between revisions or branches.
1841
1825
1842
1826
If no arguments are given, all changes for the current tree are listed.
1843
1827
If files are given, only the changes in those files are listed.
1929
1913
help='Use this command to compare files.',
1930
1914
type=unicode,
1931
1915
),
1932
RegistryOption('format',
1933
help='Diff format to use.',
1934
lazy_registry=('bzrlib.diff', 'format_registry'),
1935
value_switches=False, title='Diff format'),
1936
1916
]
1937
1917
aliases = ['di', 'dif']
1938
1918
encoding_type = 'exact'
1939
1919
1940
1920
@display_command
1941
1921
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)
1922
prefix=None, old=None, new=None, using=None):
1923
from bzrlib.diff import get_trees_and_branches_to_diff, show_diff_trees
1945
1924
1946
1925
if (prefix is None) or (prefix == '0'):
1947
1926
# diff -p0 format
1961
1940
raise errors.BzrCommandError('bzr diff --revision takes exactly'
1962
1941
' one or two revision specifiers')
1963
1942
1964
if using is not None and format is not None:
1965
raise errors.BzrCommandError('--using and --format are mutually '
1966
'exclusive.')
1967
1968
1943
(old_tree, new_tree,
1969
1944
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)
1945
specific_files, extra_trees) = get_trees_and_branches_to_diff(
1946
file_list, revision, old, new, apply_view=True)
1972
1947
return show_diff_trees(old_tree, new_tree, sys.stdout,
1973
1948
specific_files=specific_files,
1974
1949
external_diff_options=diff_options,
1975
1950
old_label=old_label, new_label=new_label,
1976
extra_trees=extra_trees, using=using,
1977
format_cls=format)
1951
extra_trees=extra_trees, using=using)
1978
1952
1979
1953
1980
1954
class cmd_deleted(Command):
1981
__doc__ = """List files deleted in the working tree.
1955
"""List files deleted in the working tree.
1982
1956
"""
1983
1957
# TODO: Show files deleted since a previous revision, or
1984
1958
# between two revisions.
1992
1966
@display_command
1993
1967
def run(self, show_ids=False):
1994
1968
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')
1969
tree.lock_read()
1970
try:
1971
old = tree.basis_tree()
1972
old.lock_read()
1973
try:
1974
for path, ie in old.inventory.iter_entries():
1975
if not tree.has_id(ie.file_id):
1976
self.outf.write(path)
1977
if show_ids:
1978
self.outf.write(' ')
1979
self.outf.write(ie.file_id)
1980
self.outf.write('\n')
1981
finally:
1982
old.unlock()
1983
finally:
1984
tree.unlock()
2005
1985
2006
1986
2007
1987
class cmd_modified(Command):
2008
__doc__ = """List files modified in working tree.
1988
"""List files modified in working tree.
2009
1989
"""
2010
1990
2011
1991
hidden = True
2028
2008
2029
2009
2030
2010
class cmd_added(Command):
2031
__doc__ = """List files added in working tree.
2011
"""List files added in working tree.
2032
2012
"""
2033
2013
2034
2014
hidden = True
2042
2022
@display_command
2043
2023
def run(self, null=False):
2044
2024
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')
2025
wt.lock_read()
2026
try:
2027
basis = wt.basis_tree()
2028
basis.lock_read()
2029
try:
2030
basis_inv = basis.inventory
2031
inv = wt.inventory
2032
for file_id in inv:
2033
if file_id in basis_inv:
2034
continue
2035
if inv.is_root(file_id) and len(basis_inv) == 0:
2036
continue
2037
path = inv.id2path(file_id)
2038
if not os.access(osutils.abspath(path), os.F_OK):
2039
continue
2040
if null:
2041
self.outf.write(path + '\0')
2042
else:
2043
self.outf.write(osutils.quotefn(path) + '\n')
2044
finally:
2045
basis.unlock()
2046
finally:
2047
wt.unlock()
2062
2048
2063
2049
2064
2050
class cmd_root(Command):
2065
__doc__ = """Show the tree root directory.
2051
"""Show the tree root directory.
2066
2052
2067
2053
The root is the nearest enclosing directory with a .bzr control
2068
2054
directory."""
2092
2078
2093
2079
2094
2080
class cmd_log(Command):
2095
__doc__ = """Show historical log for a branch or subset of a branch.
2081
"""Show historical log for a branch or subset of a branch.
2096
2082
2097
2083
log is bzr's default tool for exploring the history of a branch.
2098
2084
The branch to use is taken from the first parameter. If no parameters
2209
2195
:Tips & tricks:
2210
2196
2211
2197
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>.
2198
line tools. You may prefer qlog or glog from the QBzr and Bzr-Gtk packages
2199
respectively for example. (TortoiseBzr uses qlog for displaying logs.) See
2200
http://bazaar-vcs.org/BzrPlugins and http://bazaar-vcs.org/IDEIntegration.
2201
2202
Web interfaces are often better at exploring history than command line
2203
tools, particularly for branches on servers. You may prefer Loggerhead
2204
or one of its alternatives. See http://bazaar-vcs.org/WebInterface.
2216
2205
2217
2206
You may find it useful to add the aliases below to ``bazaar.conf``::
2218
2207
2279
2268
help='Show changes made in each revision as a patch.'),
2280
2269
Option('include-merges',
2281
2270
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
2271
]
2287
2272
encoding_type = 'replace'
2288
2273
2298
2283
message=None,
2299
2284
limit=None,
2300
2285
show_diff=False,
2301
include_merges=False,
2302
exclude_common_ancestry=False,
2303
):
2286
include_merges=False):
2304
2287
from bzrlib.log import (
2305
2288
Logger,
2306
2289
make_log_request_dict,
2307
2290
_get_info_for_log_files,
2308
2291
)
2309
2292
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
2293
if include_merges:
2315
2294
if levels is None:
2316
2295
levels = 0
2329
2308
2330
2309
file_ids = []
2331
2310
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
2311
b = None
2312
try:
2313
if file_list:
2314
# find the file ids to log and check for directory filtering
2315
b, file_info_list, rev1, rev2 = _get_info_for_log_files(
2316
revision, file_list)
2317
for relpath, file_id, kind in file_info_list:
2318
if file_id is None:
2319
raise errors.BzrCommandError(
2320
"Path unknown at end or start of revision range: %s" %
2321
relpath)
2322
# If the relpath is the top of the tree, we log everything
2323
if relpath == '':
2324
file_ids = []
2325
break
2326
else:
2327
file_ids.append(file_id)
2328
filter_by_dir = filter_by_dir or (
2329
kind in ['directory', 'tree-reference'])
2330
else:
2331
# log everything
2332
# FIXME ? log the current subdir only RBC 20060203
2333
if revision is not None \
2334
and len(revision) > 0 and revision[0].get_branch():
2335
location = revision[0].get_branch()
2345
2336
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)
2337
location = '.'
2338
dir, relpath = bzrdir.BzrDir.open_containing(location)
2339
b = dir.open_branch()
2340
b.lock_read()
2341
rev1, rev2 = _get_revision_range(revision, b, self.name())
2342
2343
# Decide on the type of delta & diff filtering to use
2344
# TODO: add an --all-files option to make this configurable & consistent
2345
if not verbose:
2346
delta_type = None
2347
else:
2348
delta_type = 'full'
2349
if not show_diff:
2350
diff_type = None
2351
elif file_ids:
2352
diff_type = 'partial'
2353
else:
2354
diff_type = 'full'
2355
2356
# Build the log formatter
2357
if log_format is None:
2358
log_format = log.log_formatter_registry.get_default(b)
2359
# Make a non-encoding output to include the diffs - bug 328007
2360
unencoded_output = ui.ui_factory.make_output_stream(encoding_type='exact')
2361
lf = log_format(show_ids=show_ids, to_file=self.outf,
2362
to_exact_file=unencoded_output,
2363
show_timezone=timezone,
2364
delta_format=get_verbosity_level(),
2365
levels=levels,
2366
show_advice=levels is None)
2367
2368
# Choose the algorithm for doing the logging. It's annoying
2369
# having multiple code paths like this but necessary until
2370
# the underlying repository format is faster at generating
2371
# deltas or can provide everything we need from the indices.
2372
# The default algorithm - match-using-deltas - works for
2373
# multiple files and directories and is faster for small
2374
# amounts of history (200 revisions say). However, it's too
2375
# slow for logging a single file in a repository with deep
2376
# history, i.e. > 10K revisions. In the spirit of "do no
2377
# evil when adding features", we continue to use the
2378
# original algorithm - per-file-graph - for the "single
2379
# file that isn't a directory without showing a delta" case.
2380
partial_history = revision and b.repository._format.supports_chks
2381
match_using_deltas = (len(file_ids) != 1 or filter_by_dir
2382
or delta_type or partial_history)
2383
2384
# Build the LogRequest and execute it
2385
if len(file_ids) == 0:
2386
file_ids = None
2387
rqst = make_log_request_dict(
2388
direction=direction, specific_fileids=file_ids,
2389
start_revision=rev1, end_revision=rev2, limit=limit,
2390
message_search=message, delta_type=delta_type,
2391
diff_type=diff_type, _match_using_deltas=match_using_deltas)
2392
Logger(b, rqst).show(lf)
2393
finally:
2394
if b is not None:
2395
b.unlock()
2414
2396
2415
2397
2416
2398
def _get_revision_range(revisionspec_list, branch, command_name):
2434
2416
raise errors.BzrCommandError(
2435
2417
"bzr %s doesn't accept two revisions in different"
2436
2418
" 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)
2419
rev1 = start_spec.in_history(branch)
2442
2420
# Avoid loading all of history when we know a missing
2443
2421
# end of range means the last revision ...
2444
2422
if end_spec.spec is None:
2473
2451
2474
2452
2475
2453
class cmd_touching_revisions(Command):
2476
__doc__ = """Return revision-ids which affected a particular file.
2454
"""Return revision-ids which affected a particular file.
2477
2455
2478
2456
A more user-friendly interface is "bzr log FILE".
2479
2457
"""
2486
2464
tree, relpath = WorkingTree.open_containing(filename)
2487
2465
file_id = tree.path2id(relpath)
2488
2466
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))
2467
b.lock_read()
2468
try:
2469
touching_revs = log.find_touching_revisions(b, file_id)
2470
for revno, revision_id, what in touching_revs:
2471
self.outf.write("%6d %s\n" % (revno, what))
2472
finally:
2473
b.unlock()
2493
2474
2494
2475
2495
2476
class cmd_ls(Command):
2496
__doc__ = """List files in a tree.
2477
"""List files in a tree.
2497
2478
"""
2498
2479
2499
2480
_see_also = ['status', 'cat']
2561
2542
view_str = views.view_display_str(view_files)
2562
2543
note("Ignoring files outside view. View is %s" % view_str)
2563
2544
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
2545
tree.lock_read()
2546
try:
2547
for fp, fc, fkind, fid, entry in tree.list_files(include_root=False,
2548
from_dir=relpath, recursive=recursive):
2549
# Apply additional masking
2550
if not all and not selection[fc]:
2551
continue
2552
if kind is not None and fkind != kind:
2553
continue
2554
if apply_view:
2555
try:
2556
if relpath:
2557
fullpath = osutils.pathjoin(relpath, fp)
2558
else:
2559
fullpath = fp
2560
views.check_path_in_view(tree, fullpath)
2561
except errors.FileOutsideView:
2562
continue
2581
2563
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:
2564
# Output the entry
2565
if prefix:
2566
fp = osutils.pathjoin(prefix, fp)
2567
kindch = entry.kind_character()
2568
outstring = fp + kindch
2569
ui.ui_factory.clear_term()
2570
if verbose:
2571
outstring = '%-8s %s' % (fc, outstring)
2572
if show_ids and fid is not None:
2573
outstring = "%-50s %s" % (outstring, fid)
2608
2574
self.outf.write(outstring + '\n')
2575
elif null:
2576
self.outf.write(fp + '\0')
2577
if show_ids:
2578
if fid is not None:
2579
self.outf.write(fid)
2580
self.outf.write('\0')
2581
self.outf.flush()
2582
else:
2583
if show_ids:
2584
if fid is not None:
2585
my_id = fid
2586
else:
2587
my_id = ''
2588
self.outf.write('%-50s %s\n' % (outstring, my_id))
2589
else:
2590
self.outf.write(outstring + '\n')
2591
finally:
2592
tree.unlock()
2609
2593
2610
2594
2611
2595
class cmd_unknowns(Command):
2612
__doc__ = """List unknown files.
2596
"""List unknown files.
2613
2597
"""
2614
2598
2615
2599
hidden = True
2622
2606
2623
2607
2624
2608
class cmd_ignore(Command):
2625
__doc__ = """Ignore specified files or patterns.
2609
"""Ignore specified files or patterns.
2626
2610
2627
2611
See ``bzr help patterns`` for details on the syntax of patterns.
2628
2612
2636
2620
After adding, editing or deleting that file either indirectly by
2637
2621
using this command or directly by using an editor, be sure to commit
2638
2622
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
2623
2653
2624
Note: ignore patterns containing shell wildcards must be quoted from
2654
2625
the shell on Unix.
2658
2629
2659
2630
bzr ignore ./Makefile
2660
2631
2661
Ignore .class files in all directories...::
2632
Ignore class files in all directories::
2662
2633
2663
2634
bzr ignore "*.class"
2664
2635
2665
...but do not ignore "special.class"::
2666
2667
bzr ignore "!special.class"
2668
2669
2636
Ignore .o files under the lib directory::
2670
2637
2671
2638
bzr ignore "lib/**/*.o"
2677
2644
Ignore everything but the "debian" toplevel directory::
2678
2645
2679
2646
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
2647
"""
2688
2648
2689
2649
_see_also = ['status', 'ignored', 'patterns']
2690
2650
takes_args = ['name_pattern*']
2691
2651
takes_options = [
2692
Option('default-rules',
2693
help='Display the default ignore rules that bzr uses.')
2652
Option('old-default-rules',
2653
help='Write out the ignore rules bzr < 0.9 always used.')
2694
2654
]
2695
2655
2696
def run(self, name_pattern_list=None, default_rules=None):
2656
def run(self, name_pattern_list=None, old_default_rules=None):
2697
2657
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)
2658
if old_default_rules is not None:
2659
# dump the rules and exit
2660
for pattern in ignores.OLD_DEFAULTS:
2661
print pattern
2702
2662
return
2703
2663
if not name_pattern_list:
2704
2664
raise errors.BzrCommandError("ignore requires at least one "
2705
"NAME_PATTERN or --default-rules.")
2665
"NAME_PATTERN or --old-default-rules")
2706
2666
name_pattern_list = [globbing.normalize_pattern(p)
2707
2667
for p in name_pattern_list]
2708
2668
for name_pattern in name_pattern_list:
2720
2680
if id is not None:
2721
2681
filename = entry[0]
2722
2682
if ignored.match(filename):
2723
matches.append(filename)
2683
matches.append(filename.encode('utf-8'))
2724
2684
tree.unlock()
2725
2685
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),))
2686
print "Warning: the following files are version controlled and" \
2687
" match your ignore pattern:\n%s" \
2688
"\nThese files will continue to be version controlled" \
2689
" unless you 'bzr remove' them." % ("\n".join(matches),)
2730
2690
2731
2691
2732
2692
class cmd_ignored(Command):
2733
__doc__ = """List ignored files and the patterns that matched them.
2693
"""List ignored files and the patterns that matched them.
2734
2694
2735
2695
List all the ignored files and the ignore pattern that caused the file to
2736
2696
be ignored.
2746
2706
@display_command
2747
2707
def run(self):
2748
2708
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))
2709
tree.lock_read()
2710
try:
2711
for path, file_class, kind, file_id, entry in tree.list_files():
2712
if file_class != 'I':
2713
continue
2714
## XXX: Slightly inefficient since this was already calculated
2715
pat = tree.is_ignored(path)
2716
self.outf.write('%-50s %s\n' % (path, pat))
2717
finally:
2718
tree.unlock()
2756
2719
2757
2720
2758
2721
class cmd_lookup_revision(Command):
2759
__doc__ = """Lookup the revision-id from a revision-number
2722
"""Lookup the revision-id from a revision-number
2760
2723
2761
2724
:Examples:
2762
2725
bzr lookup-revision 33
2769
2732
try:
2770
2733
revno = int(revno)
2771
2734
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)
2735
raise errors.BzrCommandError("not a valid revision-number: %r" % revno)
2736
2737
print WorkingTree.open_containing(u'.')[0].branch.get_rev_id(revno)
2776
2738
2777
2739
2778
2740
class cmd_export(Command):
2779
__doc__ = """Export current or past revision to a destination directory or archive.
2741
"""Export current or past revision to a destination directory or archive.
2780
2742
2781
2743
If no revision is specified this exports the last committed revision.
2782
2744
2814
2776
Option('root',
2815
2777
type=str,
2816
2778
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
2779
]
2821
2780
def run(self, dest, branch_or_subdir=None, revision=None, format=None,
2822
root=None, filters=False, per_file_timestamps=False):
2781
root=None, filters=False):
2823
2782
from bzrlib.export import export
2824
2783
2825
2784
if branch_or_subdir is None:
2832
2791
2833
2792
rev_tree = _get_one_revision_tree('export', revision, branch=b, tree=tree)
2834
2793
try:
2835
export(rev_tree, dest, format, root, subdir, filtered=filters,
2836
per_file_timestamps=per_file_timestamps)
2794
export(rev_tree, dest, format, root, subdir, filtered=filters)
2837
2795
except errors.NoSuchExportFormat, e:
2838
2796
raise errors.BzrCommandError('Unsupported export format: %s' % e.format)
2839
2797
2840
2798
2841
2799
class cmd_cat(Command):
2842
__doc__ = """Write the contents of a file as of a given revision to standard output.
2800
"""Write the contents of a file as of a given revision to standard output.
2843
2801
2844
2802
If no revision is nominated, the last revision is used.
2845
2803
2865
2823
" one revision specifier")
2866
2824
tree, branch, relpath = \
2867
2825
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)
2826
branch.lock_read()
2827
try:
2828
return self._run(tree, branch, relpath, filename, revision,
2829
name_from_revision, filters)
2830
finally:
2831
branch.unlock()
2871
2832
2872
2833
def _run(self, tree, b, relpath, filename, revision, name_from_revision,
2873
2834
filtered):
2874
2835
if tree is None:
2875
2836
tree = b.basis_tree()
2876
2837
rev_tree = _get_one_revision_tree('cat', revision, branch=b)
2877
self.add_cleanup(rev_tree.lock_read().unlock)
2878
2838
2879
2839
old_file_id = rev_tree.path2id(relpath)
2880
2840
2915
2875
chunks = content.splitlines(True)
2916
2876
content = filtered_output_bytes(chunks, filters,
2917
2877
ContentFilterContext(relpath, rev_tree))
2918
self.cleanup_now()
2919
2878
self.outf.writelines(content)
2920
2879
else:
2921
self.cleanup_now()
2922
2880
self.outf.write(content)
2923
2881
2924
2882
2925
2883
class cmd_local_time_offset(Command):
2926
__doc__ = """Show the offset in seconds from GMT to local time."""
2884
"""Show the offset in seconds from GMT to local time."""
2927
2885
hidden = True
2928
2886
@display_command
2929
2887
def run(self):
2930
self.outf.write("%s\n" % osutils.local_time_offset())
2888
print osutils.local_time_offset()
2931
2889
2932
2890
2933
2891
2934
2892
class cmd_commit(Command):
2935
__doc__ = """Commit changes into a new revision.
2893
"""Commit changes into a new revision.
2936
2894
2937
2895
An explanatory message needs to be given for each commit. This is
2938
2896
often done by using the --message option (getting the message from the
3046
3004
"the master branch until a normal commit "
3047
3005
"is performed."
3048
3006
),
3049
Option('show-diff', short_name='p',
3007
Option('show-diff',
3050
3008
help='When no message is supplied, show the diff along'
3051
3009
' with the status summary in the message editor.'),
3052
3010
]
3132
3090
'(use --file "%(f)s" to take commit message from that file)'
3133
3091
% { 'f': message })
3134
3092
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
3093
3142
3094
def get_message(commit_obj):
3143
3095
"""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,
3096
my_message = message
3097
if my_message is not None and '\r' in my_message:
3098
my_message = my_message.replace('\r\n', '\n')
3099
my_message = my_message.replace('\r', '\n')
3100
if my_message is None and not file:
3101
t = make_commit_message_template_encoded(tree,
3153
3102
selected_list, diff=show_diff,
3154
3103
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
3104
start_message = generate_commit_message_template(commit_obj)
3161
my_message = edit_commit_message_encoded(text,
3105
my_message = edit_commit_message_encoded(t,
3162
3106
start_message=start_message)
3163
3107
if my_message is None:
3164
3108
raise errors.BzrCommandError("please specify a commit"
3165
3109
" message with either --message or --file")
3110
elif my_message and file:
3111
raise errors.BzrCommandError(
3112
"please specify either --message or --file")
3113
if file:
3114
my_message = codecs.open(file, 'rt',
3115
osutils.get_user_encoding()).read()
3166
3116
if my_message == "":
3167
3117
raise errors.BzrCommandError("empty commit message specified")
3168
3118
return my_message
3180
3130
timezone=offset,
3181
3131
exclude=safe_relpath_files(tree, exclude))
3182
3132
except PointlessCommit:
3133
# FIXME: This should really happen before the file is read in;
3134
# perhaps prepare the commit; get the message; then actually commit
3183
3135
raise errors.BzrCommandError("No changes to commit."
3184
3136
" Use --unchanged to commit anyhow.")
3185
3137
except ConflictsInTree:
3190
3142
raise errors.BzrCommandError("Commit refused because there are"
3191
3143
" unknown files in the working tree.")
3192
3144
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
3145
raise errors.BzrCommandError(str(e) + "\n"
3146
'To commit to master branch, run update and then commit.\n'
3147
'You can also pass --local to commit to continue working '
3148
'disconnected.')
3198
3149
3199
3150
3200
3151
class cmd_check(Command):
3201
__doc__ = """Validate working tree structure, branch consistency and repository history.
3152
"""Validate working tree structure, branch consistency and repository history.
3202
3153
3203
3154
This command checks various invariants about branch and repository storage
3204
3155
to detect data corruption or bzr bugs.
3268
3219
3269
3220
3270
3221
class cmd_upgrade(Command):
3271
__doc__ = """Upgrade branch storage to current format.
3222
"""Upgrade branch storage to current format.
3272
3223
3273
3224
The check command or bzr developers may sometimes advise you to run
3274
3225
this command. When the default format has changed you may also be warned
3292
3243
3293
3244
3294
3245
class cmd_whoami(Command):
3295
__doc__ = """Show or set bzr user id.
3246
"""Show or set bzr user id.
3296
3247
3297
3248
:Examples:
3298
3249
Show the email of the current user::
3342
3293
3343
3294
3344
3295
class cmd_nick(Command):
3345
__doc__ = """Print or set the branch nickname.
3296
"""Print or set the branch nickname.
3346
3297
3347
3298
If unset, the tree root directory name is used as the nickname.
3348
3299
To print the current nickname, execute with no argument.
3362
3313
3363
3314
@display_command
3364
3315
def printme(self, branch):
3365
self.outf.write('%s\n' % branch.nick)
3316
print branch.nick
3366
3317
3367
3318
3368
3319
class cmd_alias(Command):
3369
__doc__ = """Set/unset and display aliases.
3320
"""Set/unset and display aliases.
3370
3321
3371
3322
:Examples:
3372
3323
Show the current aliases::
3436
3387
3437
3388
3438
3389
class cmd_selftest(Command):
3439
__doc__ = """Run internal test suite.
3390
"""Run internal test suite.
3440
3391
3441
3392
If arguments are given, they are regular expressions that say which tests
3442
3393
should run. Tests matching any expression are run, and other tests are
3486
3437
def get_transport_type(typestring):
3487
3438
"""Parse and return a transport specifier."""
3488
3439
if typestring == "sftp":
3489
from bzrlib.tests import stub_sftp
3490
return stub_sftp.SFTPAbsoluteServer
3440
from bzrlib.transport.sftp import SFTPAbsoluteServer
3441
return SFTPAbsoluteServer
3491
3442
if typestring == "memory":
3492
from bzrlib.tests import test_server
3493
return memory.MemoryServer
3443
from bzrlib.transport.memory import MemoryServer
3444
return MemoryServer
3494
3445
if typestring == "fakenfs":
3495
from bzrlib.tests import test_server
3496
return test_server.FakeNFSServer
3446
from bzrlib.transport.fakenfs import FakeNFSServer
3447
return FakeNFSServer
3497
3448
msg = "No known transport type %s. Supported types are: sftp\n" %\
3498
3449
(typestring)
3499
3450
raise errors.BzrCommandError(msg)
3583
3534
raise errors.BzrCommandError("subunit not available. subunit "
3584
3535
"needs to be installed to use --subunit.")
3585
3536
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
3537
if parallel:
3592
3538
self.additional_selftest_args.setdefault(
3593
3539
'suite_decorators', []).append(parallel)
3597
3543
verbose = not is_quiet()
3598
3544
# TODO: should possibly lock the history file...
3599
3545
benchfile = open(".perf_history", "at", buffering=1)
3600
self.add_cleanup(benchfile.close)
3601
3546
else:
3602
3547
test_suite_factory = None
3603
3548
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)
3549
try:
3550
selftest_kwargs = {"verbose": verbose,
3551
"pattern": pattern,
3552
"stop_on_failure": one,
3553
"transport": transport,
3554
"test_suite_factory": test_suite_factory,
3555
"lsprof_timed": lsprof_timed,
3556
"lsprof_tests": lsprof_tests,
3557
"bench_history": benchfile,
3558
"matching_tests_first": first,
3559
"list_only": list_only,
3560
"random_seed": randomize,
3561
"exclude_pattern": exclude,
3562
"strict": strict,
3563
"load_list": load_list,
3564
"debug_flags": debugflag,
3565
"starting_with": starting_with
3566
}
3567
selftest_kwargs.update(self.additional_selftest_args)
3568
result = selftest(**selftest_kwargs)
3569
finally:
3570
if benchfile is not None:
3571
benchfile.close()
3623
3572
return int(not result)
3624
3573
3625
3574
3626
3575
class cmd_version(Command):
3627
__doc__ = """Show version of bzr."""
3576
"""Show version of bzr."""
3628
3577
3629
3578
encoding_type = 'replace'
3630
3579
takes_options = [
3641
3590
3642
3591
3643
3592
class cmd_rocks(Command):
3644
__doc__ = """Statement of optimism."""
3593
"""Statement of optimism."""
3645
3594
3646
3595
hidden = True
3647
3596
3648
3597
@display_command
3649
3598
def run(self):
3650
self.outf.write("It sure does!\n")
3599
print "It sure does!"
3651
3600
3652
3601
3653
3602
class cmd_find_merge_base(Command):
3654
__doc__ = """Find and print a base revision for merging two branches."""
3603
"""Find and print a base revision for merging two branches."""
3655
3604
# TODO: Options to specify revisions on either side, as if
3656
3605
# merging only part of the history.
3657
3606
takes_args = ['branch', 'other']
3663
3612
3664
3613
branch1 = Branch.open_containing(branch)[0]
3665
3614
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)
3615
branch1.lock_read()
3616
try:
3617
branch2.lock_read()
3618
try:
3619
last1 = ensure_null(branch1.last_revision())
3620
last2 = ensure_null(branch2.last_revision())
3621
3622
graph = branch1.repository.get_graph(branch2.repository)
3623
base_rev_id = graph.find_unique_lca(last1, last2)
3624
3625
print 'merge base is revision %s' % base_rev_id
3626
finally:
3627
branch2.unlock()
3628
finally:
3629
branch1.unlock()
3675
3630
3676
3631
3677
3632
class cmd_merge(Command):
3678
__doc__ = """Perform a three-way merge.
3633
"""Perform a three-way merge.
3679
3634
3680
3635
The source of the merge can be specified either in the form of a branch,
3681
3636
or in the form of a path to a file containing a merge directive generated
3710
3665
committed to record the result of the merge.
3711
3666
3712
3667
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.
3668
--force is given.
3719
3669
3720
3670
To select only some changes to merge, use "merge -i", which will prompt
3721
3671
you to apply each diff hunk and file change, similar to "shelve".
3736
3686
To apply a merge directive contained in /tmp/merge::
3737
3687
3738
3688
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
3689
"""
3747
3690
3748
3691
encoding_type = 'exact'
3806
3749
view_info = _get_view_info_for_change_reporter(tree)
3807
3750
change_reporter = delta._ChangeReporter(
3808
3751
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
3752
cleanups = []
3753
try:
3754
pb = ui.ui_factory.nested_progress_bar()
3755
cleanups.append(pb.finished)
3756
tree.lock_write()
3757
cleanups.append(tree.unlock)
3758
if location is not None:
3759
try:
3760
mergeable = bundle.read_mergeable_from_url(location,
3761
possible_transports=possible_transports)
3762
except errors.NotABundle:
3763
mergeable = None
3764
else:
3765
if uncommitted:
3766
raise errors.BzrCommandError('Cannot use --uncommitted'
3767
' with bundles or merge directives.')
3768
3769
if revision is not None:
3770
raise errors.BzrCommandError(
3771
'Cannot use -r with merge directives or bundles')
3772
merger, verified = _mod_merge.Merger.from_mergeable(tree,
3773
mergeable, pb)
3774
3775
if merger is None and uncommitted:
3776
if revision is not None and len(revision) > 0:
3777
raise errors.BzrCommandError('Cannot use --uncommitted and'
3778
' --revision at the same time.')
3779
merger = self.get_merger_from_uncommitted(tree, location, pb,
3780
cleanups)
3781
allow_pending = False
3782
3783
if merger is None:
3784
merger, allow_pending = self._get_merger_from_branch(tree,
3785
location, revision, remember, possible_transports, pb)
3786
3787
merger.merge_type = merge_type
3788
merger.reprocess = reprocess
3789
merger.show_base = show_base
3790
self.sanity_check_merger(merger)
3791
if (merger.base_rev_id == merger.other_rev_id and
3792
merger.other_rev_id is not None):
3793
note('Nothing to do.')
3794
return 0
3795
if pull:
3796
if merger.interesting_files is not None:
3797
raise errors.BzrCommandError('Cannot pull individual files')
3798
if (merger.base_rev_id == tree.last_revision()):
3799
result = tree.pull(merger.other_branch, False,
3800
merger.other_rev_id)
3801
result.report(self.outf)
3802
return 0
3803
if merger.this_basis is None:
3804
raise errors.BzrCommandError(
3805
"This branch has no commits."
3806
" (perhaps you would prefer 'bzr pull')")
3807
if preview:
3808
return self._do_preview(merger, cleanups)
3809
elif interactive:
3810
return self._do_interactive(merger, cleanups)
3818
3811
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):
3812
return self._do_merge(merger, change_reporter, allow_pending,
3813
verified)
3814
finally:
3815
for cleanup in reversed(cleanups):
3816
cleanup()
3817
3818
def _get_preview(self, merger, cleanups):
3869
3819
tree_merger = merger.make_merger()
3870
3820
tt = tree_merger.make_preview_transform()
3871
self.add_cleanup(tt.finalize)
3821
cleanups.append(tt.finalize)
3872
3822
result_tree = tt.get_preview_tree()
3873
3823
return result_tree
3874
3824
3875
def _do_preview(self, merger):
3825
def _do_preview(self, merger, cleanups):
3876
3826
from bzrlib.diff import show_diff_trees
3877
result_tree = self._get_preview(merger)
3827
result_tree = self._get_preview(merger, cleanups)
3878
3828
show_diff_trees(merger.this_tree, result_tree, self.outf,
3879
3829
old_label='', new_label='')
3880
3830
3890
3840
else:
3891
3841
return 0
3892
3842
3893
def _do_interactive(self, merger):
3843
def _do_interactive(self, merger, cleanups):
3894
3844
"""Perform an interactive merge.
3895
3845
3896
3846
This works by generating a preview tree of the merge, then using
3898
3848
and the preview tree.
3899
3849
"""
3900
3850
from bzrlib import shelf_ui
3901
result_tree = self._get_preview(merger)
3851
result_tree = self._get_preview(merger, cleanups)
3902
3852
writer = bzrlib.option.diff_writer_registry.get()
3903
3853
shelver = shelf_ui.Shelver(merger.this_tree, result_tree, destroy=True,
3904
3854
reporter=shelf_ui.ApplyReporter(),
3972
3922
allow_pending = True
3973
3923
return merger, allow_pending
3974
3924
3975
def get_merger_from_uncommitted(self, tree, location, pb):
3925
def get_merger_from_uncommitted(self, tree, location, pb, cleanups):
3976
3926
"""Get a merger for uncommitted changes.
3977
3927
3978
3928
:param tree: The tree the merger should apply to.
3979
3929
:param location: The location containing uncommitted changes.
3980
3930
:param pb: The progress bar to use for showing progress.
3931
:param cleanups: A list of operations to perform to clean up the
3932
temporary directories, unfinalized objects, etc.
3981
3933
"""
3982
3934
location = self._select_branch_location(tree, location)[0]
3983
3935
other_tree, other_path = WorkingTree.open_containing(location)
4035
3987
4036
3988
4037
3989
class cmd_remerge(Command):
4038
__doc__ = """Redo a merge.
3990
"""Redo a merge.
4039
3991
4040
3992
Use this if you want to try a different merge technique while resolving
4041
3993
conflicts. Some merge techniques are better than others, and remerge
4066
4018
4067
4019
def run(self, file_list=None, merge_type=None, show_base=False,
4068
4020
reprocess=False):
4069
from bzrlib.conflicts import restore
4070
4021
if merge_type is None:
4071
4022
merge_type = _mod_merge.Merge3Merger
4072
4023
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
4024
tree.lock_write()
4025
try:
4026
parents = tree.get_parent_ids()
4027
if len(parents) != 2:
4028
raise errors.BzrCommandError("Sorry, remerge only works after normal"
4029
" merges. Not cherrypicking or"
4030
" multi-merges.")
4031
repository = tree.branch.repository
4032
interesting_ids = None
4033
new_conflicts = []
4034
conflicts = tree.conflicts()
4035
if file_list is not None:
4036
interesting_ids = set()
4037
for filename in file_list:
4038
file_id = tree.path2id(filename)
4039
if file_id is None:
4040
raise errors.NotVersionedError(filename)
4041
interesting_ids.add(file_id)
4042
if tree.kind(file_id) != "directory":
4043
continue
4092
4044
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:
4045
for name, ie in tree.inventory.iter_entries(file_id):
4046
interesting_ids.add(ie.file_id)
4047
new_conflicts = conflicts.select_conflicts(tree, file_list)[0]
4048
else:
4049
# Remerge only supports resolving contents conflicts
4050
allowed_conflicts = ('text conflict', 'contents conflict')
4051
restore_files = [c.path for c in conflicts
4052
if c.typestring in allowed_conflicts]
4053
_mod_merge.transform_tree(tree, tree.basis_tree(), interesting_ids)
4054
tree.set_conflicts(ConflictList(new_conflicts))
4055
if file_list is not None:
4056
restore_files = file_list
4057
for filename in restore_files:
4058
try:
4059
restore(tree.abspath(filename))
4060
except errors.NotConflicted:
4061
pass
4062
# Disable pending merges, because the file texts we are remerging
4063
# have not had those merges performed. If we use the wrong parents
4064
# list, we imply that the working tree text has seen and rejected
4065
# all the changes from the other tree, when in fact those changes
4066
# have not yet been seen.
4067
pb = ui.ui_factory.nested_progress_bar()
4068
tree.set_parent_ids(parents[:1])
4106
4069
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()
4070
merger = _mod_merge.Merger.from_revision_ids(pb,
4071
tree, parents[1])
4072
merger.interesting_ids = interesting_ids
4073
merger.merge_type = merge_type
4074
merger.show_base = show_base
4075
merger.reprocess = reprocess
4076
conflicts = merger.do_merge()
4077
finally:
4078
tree.set_parent_ids(parents)
4079
pb.finished()
4123
4080
finally:
4124
tree.set_parent_ids(parents)
4081
tree.unlock()
4125
4082
if conflicts > 0:
4126
4083
return 1
4127
4084
else:
4129
4086
4130
4087
4131
4088
class cmd_revert(Command):
4132
__doc__ = """Revert files to a previous revision.
4089
"""Revert files to a previous revision.
4133
4090
4134
4091
Giving a list of files will revert only those files. Otherwise, all files
4135
4092
will be reverted. If the revision is not specified with '--revision', the
4154
4111
created as above. Directories containing unknown files will not be
4155
4112
deleted.
4156
4113
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
4114
The working tree contains a list of pending merged revisions, which will
4115
be included as parents in the next commit. Normally, revert clears that
4116
list as well as reverting the files. If any files are specified, revert
4117
leaves the pending merge list alone and reverts only the files. Use "bzr
4118
revert ." in the tree root to revert all files but keep the merge record,
4119
and "bzr revert --forget-merges" to clear the pending merge list without
4164
4120
reverting any files.
4165
4121
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
4122
Using "bzr revert --forget-merges", it is possible to apply the changes
4123
from an arbitrary merge as a single revision. To do this, perform the
4124
merge as desired. Then doing revert with the "--forget-merges" option will
4125
keep the content of the tree as it was, but it will clear the list of
4126
pending merges. The next commit will then contain all of the changes that
4127
would have been in the merge, but without any mention of the other parent
4128
revisions. Because this technique forgets where these changes originated,
4129
it may cause additional conflicts on later merges involving the source and
4174
4130
target branches.
4175
4131
"""
4176
4132
4186
4142
def run(self, revision=None, no_backup=False, file_list=None,
4187
4143
forget_merges=None):
4188
4144
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)
4145
tree.lock_write()
4146
try:
4147
if forget_merges:
4148
tree.set_parent_ids(tree.get_parent_ids()[:1])
4149
else:
4150
self._revert_tree_to_revision(tree, revision, file_list, no_backup)
4151
finally:
4152
tree.unlock()
4194
4153
4195
4154
@staticmethod
4196
4155
def _revert_tree_to_revision(tree, revision, file_list, no_backup):
4197
4156
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)
4157
pb = ui.ui_factory.nested_progress_bar()
4158
try:
4159
tree.revert(file_list, rev_tree, not no_backup, pb,
4160
report_changes=True)
4161
finally:
4162
pb.finished()
4200
4163
4201
4164
4202
4165
class cmd_assert_fail(Command):
4203
__doc__ = """Test reporting of assertion failures"""
4166
"""Test reporting of assertion failures"""
4204
4167
# intended just for use in testing
4205
4168
4206
4169
hidden = True
4210
4173
4211
4174
4212
4175
class cmd_help(Command):
4213
__doc__ = """Show help on a command or other topic.
4176
"""Show help on a command or other topic.
4214
4177
"""
4215
4178
4216
4179
_see_also = ['topics']
4229
4192
4230
4193
4231
4194
class cmd_shell_complete(Command):
4232
__doc__ = """Show appropriate completions for context.
4195
"""Show appropriate completions for context.
4233
4196
4234
4197
For a list of all available commands, say 'bzr shell-complete'.
4235
4198
"""
4244
4207
4245
4208
4246
4209
class cmd_missing(Command):
4247
__doc__ = """Show unmerged/unpulled revisions between two branches.
4210
"""Show unmerged/unpulled revisions between two branches.
4248
4211
4249
4212
OTHER_BRANCH may be local or remote.
4250
4213
4328
4291
restrict = 'remote'
4329
4292
4330
4293
local_branch = Branch.open_containing(u".")[0]
4331
self.add_cleanup(local_branch.lock_read().unlock)
4332
4333
4294
parent = local_branch.get_parent()
4334
4295
if other_branch is None:
4335
4296
other_branch = parent
4344
4305
remote_branch = Branch.open(other_branch)
4345
4306
if remote_branch.base == local_branch.base:
4346
4307
remote_branch = local_branch
4347
else:
4348
self.add_cleanup(remote_branch.lock_read().unlock)
4349
4308
4350
4309
local_revid_range = _revision_range_to_revid_range(
4351
4310
_get_revision_range(my_revision, local_branch,
4355
4314
_get_revision_range(revision,
4356
4315
remote_branch, self.name()))
4357
4316
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()
4317
local_branch.lock_read()
4318
try:
4319
remote_branch.lock_read()
4320
try:
4321
local_extra, remote_extra = find_unmerged(
4322
local_branch, remote_branch, restrict,
4323
backward=not reverse,
4324
include_merges=include_merges,
4325
local_revid_range=local_revid_range,
4326
remote_revid_range=remote_revid_range)
4327
4328
if log_format is None:
4329
registry = log.log_formatter_registry
4330
log_format = registry.get_default(local_branch)
4331
lf = log_format(to_file=self.outf,
4332
show_ids=show_ids,
4333
show_timezone='original')
4334
4335
status_code = 0
4336
if local_extra and not theirs_only:
4337
message("You have %d extra revision(s):\n" %
4338
len(local_extra))
4339
for revision in iter_log_revisions(local_extra,
4340
local_branch.repository,
4341
verbose):
4342
lf.log_revision(revision)
4343
printed_local = True
4344
status_code = 1
4345
else:
4346
printed_local = False
4347
4348
if remote_extra and not mine_only:
4349
if printed_local is True:
4350
message("\n\n\n")
4351
message("You are missing %d revision(s):\n" %
4352
len(remote_extra))
4353
for revision in iter_log_revisions(remote_extra,
4354
remote_branch.repository,
4355
verbose):
4356
lf.log_revision(revision)
4357
status_code = 1
4358
4359
if mine_only and not local_extra:
4360
# We checked local, and found nothing extra
4361
message('This branch is up to date.\n')
4362
elif theirs_only and not remote_extra:
4363
# We checked remote, and found nothing extra
4364
message('Other branch is up to date.\n')
4365
elif not (mine_only or theirs_only or local_extra or
4366
remote_extra):
4367
# We checked both branches, and neither one had extra
4368
# revisions
4369
message("Branches are up to date.\n")
4370
finally:
4371
remote_branch.unlock()
4372
finally:
4373
local_branch.unlock()
4408
4374
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)
4375
local_branch.lock_write()
4376
try:
4377
# handle race conditions - a parent might be set while we run.
4378
if local_branch.get_parent() is None:
4379
local_branch.set_parent(remote_branch.base)
4380
finally:
4381
local_branch.unlock()
4413
4382
return status_code
4414
4383
4415
4384
4416
4385
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
"""
4386
"""Compress the data within a repository."""
4434
4387
4435
4388
_see_also = ['repositories']
4436
4389
takes_args = ['branch_or_repo?']
4437
takes_options = [
4438
Option('clean-obsolete-packs', 'Delete obsolete packs to save disk space.'),
4439
]
4440
4390
4441
def run(self, branch_or_repo='.', clean_obsolete_packs=False):
4391
def run(self, branch_or_repo='.'):
4442
4392
dir = bzrdir.BzrDir.open_containing(branch_or_repo)[0]
4443
4393
try:
4444
4394
branch = dir.open_branch()
4445
4395
repository = branch.repository
4446
4396
except errors.NotBranchError:
4447
4397
repository = dir.open_repository()
4448
repository.pack(clean_obsolete_packs=clean_obsolete_packs)
4398
repository.pack()
4449
4399
4450
4400
4451
4401
class cmd_plugins(Command):
4452
__doc__ = """List the installed plugins.
4402
"""List the installed plugins.
4453
4403
4454
4404
This command displays the list of installed plugins including
4455
4405
version of plugin and a short description of each.
4462
4412
adding new commands, providing additional network transports and
4463
4413
customizing log output.
4464
4414
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.
4415
See the Bazaar web site, http://bazaar-vcs.org, for further
4416
information on plugins including where to find them and how to
4417
install them. Instructions are also provided there on how to
4418
write new plugins using the Python programming language.
4469
4419
"""
4470
4420
takes_options = ['verbose']
4471
4421
4486
4436
doc = '(no description)'
4487
4437
result.append((name_ver, doc, plugin.path()))
4488
4438
for name_ver, doc, path in sorted(result):
4489
self.outf.write("%s\n" % name_ver)
4490
self.outf.write(" %s\n" % doc)
4439
print name_ver
4440
print ' ', doc
4491
4441
if verbose:
4492
self.outf.write(" %s\n" % path)
4493
self.outf.write("\n")
4442
print ' ', path
4443
print
4494
4444
4495
4445
4496
4446
class cmd_testament(Command):
4497
__doc__ = """Show testament (signing-form) of a revision."""
4447
"""Show testament (signing-form) of a revision."""
4498
4448
takes_options = [
4499
4449
'revision',
4500
4450
Option('long', help='Produce long-format testament.'),
4512
4462
b = Branch.open_containing(branch)[0]
4513
4463
else:
4514
4464
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())
4465
b.lock_read()
4466
try:
4467
if revision is None:
4468
rev_id = b.last_revision()
4469
else:
4470
rev_id = revision[0].as_revision_id(b)
4471
t = testament_class.from_revision(b.repository, rev_id)
4472
if long:
4473
sys.stdout.writelines(t.as_text_lines())
4474
else:
4475
sys.stdout.write(t.as_short_text())
4476
finally:
4477
b.unlock()
4525
4478
4526
4479
4527
4480
class cmd_annotate(Command):
4528
__doc__ = """Show the origin of each line in a file.
4481
"""Show the origin of each line in a file.
4529
4482
4530
4483
This prints out the given file with an annotation on the left side
4531
4484
indicating which revision, author and date introduced the change.
4552
4505
wt, branch, relpath = \
4553
4506
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
4554
4507
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)
4508
wt.lock_read()
4509
else:
4510
branch.lock_read()
4511
try:
4512
tree = _get_one_revision_tree('annotate', revision, branch=branch)
4513
if wt is not None:
4514
file_id = wt.path2id(relpath)
4515
else:
4516
file_id = tree.path2id(relpath)
4517
if file_id is None:
4518
raise errors.NotVersionedError(filename)
4519
file_version = tree.inventory[file_id].revision
4520
if wt is not None and revision is None:
4521
# If there is a tree and we're not annotating historical
4522
# versions, annotate the working tree's content.
4523
annotate_file_tree(wt, file_id, self.outf, long, all,
4524
show_ids=show_ids)
4525
else:
4526
annotate_file(branch, file_version, file_id, long, all, self.outf,
4527
show_ids=show_ids)
4528
finally:
4529
if wt is not None:
4530
wt.unlock()
4531
else:
4532
branch.unlock()
4575
4533
4576
4534
4577
4535
class cmd_re_sign(Command):
4578
__doc__ = """Create a digital signature for an existing revision."""
4536
"""Create a digital signature for an existing revision."""
4579
4537
# TODO be able to replace existing ones.
4580
4538
4581
4539
hidden = True # is this right ?
4588
4546
if revision_id_list is None and revision is None:
4589
4547
raise errors.BzrCommandError('You must supply either --revision or a revision_id')
4590
4548
b = WorkingTree.open_containing(u'.')[0].branch
4591
self.add_cleanup(b.lock_write().unlock)
4592
return self._run(b, revision_id_list, revision)
4549
b.lock_write()
4550
try:
4551
return self._run(b, revision_id_list, revision)
4552
finally:
4553
b.unlock()
4593
4554
4594
4555
def _run(self, b, revision_id_list, revision):
4595
4556
import bzrlib.gpg as gpg
4640
4601
4641
4602
4642
4603
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.
4604
"""Convert the current branch into a checkout of the supplied branch.
4645
4605
4646
4606
Once converted into a checkout, commits must succeed on the master branch
4647
4607
before they will be applied to the local branch.
4665
4625
'This format does not remember old locations.')
4666
4626
else:
4667
4627
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')
4628
raise errors.BzrCommandError('No location supplied and no '
4629
'previous location known')
4673
4630
b_other = Branch.open(location)
4674
4631
try:
4675
4632
b.bind(b_other)
4681
4638
4682
4639
4683
4640
class cmd_unbind(Command):
4684
__doc__ = """Convert the current checkout into a regular branch.
4641
"""Convert the current checkout into a regular branch.
4685
4642
4686
4643
After unbinding, the local branch is considered independent and subsequent
4687
4644
commits will be local only.
4698
4655
4699
4656
4700
4657
class cmd_uncommit(Command):
4701
__doc__ = """Remove the last committed revision.
4658
"""Remove the last committed revision.
4702
4659
4703
4660
--verbose will print out what is being removed.
4704
4661
--dry-run will go through all the motions, but not actually
4744
4701
b = control.open_branch()
4745
4702
4746
4703
if tree is not None:
4747
self.add_cleanup(tree.lock_write().unlock)
4704
tree.lock_write()
4748
4705
else:
4749
self.add_cleanup(b.lock_write().unlock)
4750
return self._run(b, tree, dry_run, verbose, revision, force, local=local)
4706
b.lock_write()
4707
try:
4708
return self._run(b, tree, dry_run, verbose, revision, force,
4709
local=local)
4710
finally:
4711
if tree is not None:
4712
tree.unlock()
4713
else:
4714
b.unlock()
4751
4715
4752
4716
def _run(self, b, tree, dry_run, verbose, revision, force, local=False):
4753
4717
from bzrlib.log import log_formatter, show_log
4785
4749
end_revision=last_revno)
4786
4750
4787
4751
if dry_run:
4788
self.outf.write('Dry-run, pretending to remove'
4789
' the above revisions.\n')
4752
print 'Dry-run, pretending to remove the above revisions.'
4753
if not force:
4754
val = raw_input('Press <enter> to continue')
4790
4755
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
4756
print 'The above revision(s) will be removed.'
4757
if not force:
4758
val = raw_input('Are you sure [y/N]? ')
4759
if val.lower() not in ('y', 'yes'):
4760
print 'Canceled'
4761
return 0
4797
4762
4798
4763
mutter('Uncommitting from {%s} to {%s}',
4799
4764
last_rev_id, rev_id)
4800
4765
uncommit(b, tree=tree, dry_run=dry_run, verbose=verbose,
4801
4766
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)
4767
note('You can restore the old tip by running:\n'
4768
' bzr pull . -r revid:%s', last_rev_id)
4804
4769
4805
4770
4806
4771
class cmd_break_lock(Command):
4807
__doc__ = """Break a dead lock on a repository, branch or working directory.
4772
"""Break a dead lock on a repository, branch or working directory.
4808
4773
4809
4774
CAUTION: Locks should only be broken when you are sure that the process
4810
4775
holding the lock has been stopped.
4811
4776
4812
You can get information on what locks are open via the 'bzr info
4813
[location]' command.
4777
You can get information on what locks are open via the 'bzr info' command.
4814
4778
4815
4779
:Examples:
4816
4780
bzr break-lock
4817
bzr break-lock bzr+ssh://example.com/bzr/foo
4818
4781
"""
4819
4782
takes_args = ['location?']
4820
4783
4829
4792
4830
4793
4831
4794
class cmd_wait_until_signalled(Command):
4832
__doc__ = """Test helper for test_start_and_stop_bzr_subprocess_send_signal.
4795
"""Test helper for test_start_and_stop_bzr_subprocess_send_signal.
4833
4796
4834
4797
This just prints a line to signal when it is ready, then blocks on stdin.
4835
4798
"""
4843
4806
4844
4807
4845
4808
class cmd_serve(Command):
4846
__doc__ = """Run the bzr server."""
4809
"""Run the bzr server."""
4847
4810
4848
4811
aliases = ['server']
4849
4812
4909
4872
4910
4873
4911
4874
class cmd_join(Command):
4912
__doc__ = """Combine a tree into its containing tree.
4875
"""Combine a tree into its containing tree.
4913
4876
4914
4877
This command requires the target tree to be in a rich-root format.
4915
4878
4955
4918
4956
4919
4957
4920
class cmd_split(Command):
4958
__doc__ = """Split a subdirectory of a tree into a separate tree.
4921
"""Split a subdirectory of a tree into a separate tree.
4959
4922
4960
4923
This command will produce a target tree in a format that supports
4961
4924
rich roots, like 'rich-root' or 'rich-root-pack'. These formats cannot be
4981
4944
4982
4945
4983
4946
class cmd_merge_directive(Command):
4984
__doc__ = """Generate a merge directive for auto-merge tools.
4947
"""Generate a merge directive for auto-merge tools.
4985
4948
4986
4949
A directive requests a merge to be performed, and also provides all the
4987
4950
information necessary to do so. This means it must either include a
5080
5043
5081
5044
5082
5045
class cmd_send(Command):
5083
__doc__ = """Mail or create a merge-directive for submitting changes.
5046
"""Mail or create a merge-directive for submitting changes.
5084
5047
5085
5048
A merge directive provides many things needed for requesting merges:
5086
5049
5092
5055
directly from the merge directive, without retrieving data from a
5093
5056
branch.
5094
5057
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.
5058
If --no-bundle is specified, then public_branch is needed (and must be
5059
up-to-date), so that the receiver can perform the merge using the
5060
public_branch. The public_branch is always included if known, so that
5061
people can check it later.
5062
5063
The submit branch defaults to the parent, but can be overridden. Both
5064
submit branch and public branch will be remembered if supplied.
5065
5066
If a public_branch is known for the submit_branch, that public submit
5067
branch is used in the merge instructions. This means that a local mirror
5068
can be used as your actual submit branch, once you have set public_branch
5069
for that mirror.
5121
5070
5122
5071
Mail is sent using your preferred mail program. This should be transparent
5123
5072
on Windows (it uses MAPI). On Linux, it requires the xdg-email utility.
5143
5092
5144
5093
The merge directives created by bzr send may be applied using bzr merge or
5145
5094
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
5095
"""
5151
5096
5152
5097
encoding_type = 'exact'
5168
5113
short_name='f',
5169
5114
type=unicode),
5170
5115
Option('output', short_name='o',
5171
help='Write merge directive to this file or directory; '
5116
help='Write merge directive to this file; '
5172
5117
'use - for stdout.',
5173
5118
type=unicode),
5174
5119
Option('strict',
5197
5142
5198
5143
5199
5144
class cmd_bundle_revisions(cmd_send):
5200
__doc__ = """Create a merge-directive for submitting changes.
5145
"""Create a merge-directive for submitting changes.
5201
5146
5202
5147
A merge directive provides many things needed for requesting merges:
5203
5148
5270
5215
5271
5216
5272
5217
class cmd_tag(Command):
5273
__doc__ = """Create, remove or modify a tag naming a revision.
5218
"""Create, remove or modify a tag naming a revision.
5274
5219
5275
5220
Tags give human-meaningful names to revisions. Commands that take a -r
5276
5221
(--revision) option can be given -rtag:X, where X is any previously
5284
5229
5285
5230
To rename a tag (change the name but keep it on the same revsion), run ``bzr
5286
5231
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
5232
"""
5293
5233
5294
5234
_see_also = ['commit', 'tags']
5295
takes_args = ['tag_name?']
5235
takes_args = ['tag_name']
5296
5236
takes_options = [
5297
5237
Option('delete',
5298
5238
help='Delete this tag rather than placing it.',
5308
5248
'revision',
5309
5249
]
5310
5250
5311
def run(self, tag_name=None,
5251
def run(self, tag_name,
5312
5252
delete=None,
5313
5253
directory='.',
5314
5254
force=None,
5315
5255
revision=None,
5316
5256
):
5317
5257
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)
5258
branch.lock_write()
5259
try:
5260
if delete:
5261
branch.tags.delete_tag(tag_name)
5262
self.outf.write('Deleted tag %s.\n' % tag_name)
5331
5263
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)
5264
if revision:
5265
if len(revision) != 1:
5266
raise errors.BzrCommandError(
5267
"Tags can only be placed on a single revision, "
5268
"not on a range")
5269
revision_id = revision[0].as_revision_id(branch)
5270
else:
5271
revision_id = branch.last_revision()
5272
if (not force) and branch.tags.has_tag(tag_name):
5273
raise errors.TagAlreadyExists(tag_name)
5274
branch.tags.set_tag(tag_name, revision_id)
5275
self.outf.write('Created tag %s.\n' % tag_name)
5276
finally:
5277
branch.unlock()
5342
5278
5343
5279
5344
5280
class cmd_tags(Command):
5345
__doc__ = """List tags.
5281
"""List tags.
5346
5282
5347
5283
This command shows a table of tag names and the revisions they reference.
5348
5284
"""
5376
5312
if not tags:
5377
5313
return
5378
5314
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()
5315
branch.lock_read()
5316
try:
5317
if revision:
5318
graph = branch.repository.get_graph()
5319
rev1, rev2 = _get_revision_range(revision, branch, self.name())
5320
revid1, revid2 = rev1.rev_id, rev2.rev_id
5321
# only show revisions between revid1 and revid2 (inclusive)
5322
tags = [(tag, revid) for tag, revid in tags if
5323
graph.is_between(revid, revid1, revid2)]
5324
if sort == 'alpha':
5325
tags.sort()
5326
elif sort == 'time':
5327
timestamps = {}
5328
for tag, revid in tags:
5329
try:
5330
revobj = branch.repository.get_revision(revid)
5331
except errors.NoSuchRevision:
5332
timestamp = sys.maxint # place them at the end
5333
else:
5334
timestamp = revobj.timestamp
5335
timestamps[revid] = timestamp
5336
tags.sort(key=lambda x: timestamps[x[1]])
5337
if not show_ids:
5338
# [ (tag, revid), ... ] -> [ (tag, dotted_revno), ... ]
5339
for index, (tag, revid) in enumerate(tags):
5340
try:
5341
revno = branch.revision_id_to_dotted_revno(revid)
5342
if isinstance(revno, tuple):
5343
revno = '.'.join(map(str, revno))
5344
except errors.NoSuchRevision:
5345
# Bad tag data/merges can lead to tagged revisions
5346
# which are not in this branch. Fail gracefully ...
5347
revno = '?'
5348
tags[index] = (tag, revno)
5349
finally:
5350
branch.unlock()
5413
5351
for tag, revspec in tags:
5414
5352
self.outf.write('%-20s %s\n' % (tag, revspec))
5415
5353
5416
5354
5417
5355
class cmd_reconfigure(Command):
5418
__doc__ = """Reconfigure the type of a bzr directory.
5356
"""Reconfigure the type of a bzr directory.
5419
5357
5420
5358
A target configuration must be specified.
5421
5359
5506
5444
5507
5445
5508
5446
class cmd_switch(Command):
5509
__doc__ = """Set the branch of a checkout and update.
5447
"""Set the branch of a checkout and update.
5510
5448
5511
5449
For lightweight checkouts, this changes the branch being referenced.
5512
5450
For heavyweight checkouts, this checks that there are no local commits
5528
5466
that of the master.
5529
5467
"""
5530
5468
5531
takes_args = ['to_location?']
5469
takes_args = ['to_location']
5532
5470
takes_options = [Option('force',
5533
5471
help='Switch even if local commits will be lost.'),
5534
'revision',
5535
5472
Option('create-branch', short_name='b',
5536
5473
help='Create the target branch from this one before'
5537
5474
' switching to it.'),
5538
]
5475
]
5539
5476
5540
def run(self, to_location=None, force=False, create_branch=False,
5541
revision=None):
5477
def run(self, to_location, force=False, create_branch=False):
5542
5478
from bzrlib import switch
5543
5479
tree_location = '.'
5544
revision = _get_one_revision('switch', revision)
5545
5480
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
5481
try:
5552
5482
branch = control_dir.open_branch()
5553
5483
had_explicit_nick = branch.get_config().has_explicit_nickname()
5558
5488
if branch is None:
5559
5489
raise errors.BzrCommandError('cannot create branch without'
5560
5490
' source branch')
5561
to_location = directory_service.directories.dereference(
5562
to_location)
5563
5491
if '/' not in to_location and '\\' not in to_location:
5564
5492
# This path is meant to be relative to the existing branch
5565
5493
this_url = self._get_branch_location(control_dir)
5567
5495
to_branch = branch.bzrdir.sprout(to_location,
5568
5496
possible_transports=[branch.bzrdir.root_transport],
5569
5497
source_branch=branch).open_branch()
5498
# try:
5499
# from_branch = control_dir.open_branch()
5500
# except errors.NotBranchError:
5501
# raise BzrCommandError('Cannot create a branch from this'
5502
# ' location when we cannot open this branch')
5503
# from_branch.bzrdir.sprout(
5504
pass
5570
5505
else:
5571
5506
try:
5572
5507
to_branch = Branch.open(to_location)
5574
5509
this_url = self._get_branch_location(control_dir)
5575
5510
to_branch = Branch.open(
5576
5511
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)
5512
switch.switch(control_dir, to_branch, force)
5580
5513
if had_explicit_nick:
5581
5514
branch = control_dir.open_branch() #get the new branch!
5582
5515
branch.nick = to_branch.nick
5602
5535
5603
5536
5604
5537
class cmd_view(Command):
5605
__doc__ = """Manage filtered views.
5538
"""Manage filtered views.
5606
5539
5607
5540
Views provide a mask over the tree so that users can focus on
5608
5541
a subset of a tree when doing their work. After creating a view,
5756
5689
5757
5690
5758
5691
class cmd_hooks(Command):
5759
__doc__ = """Show hooks."""
5692
"""Show hooks."""
5760
5693
5761
5694
hidden = True
5762
5695
5775
5708
self.outf.write(" <no hooks installed>\n")
5776
5709
5777
5710
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
5711
class cmd_shelve(Command):
5804
__doc__ = """Temporarily set aside some changes from the current tree.
5712
"""Temporarily set aside some changes from the current tree.
5805
5713
5806
5714
Shelve allows you to temporarily put changes you've made "on the shelf",
5807
5715
ie. out of the way, until a later time when you can bring them back from
5860
5768
5861
5769
def run_for_list(self):
5862
5770
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
5771
tree.lock_read()
5772
try:
5773
manager = tree.get_shelf_manager()
5774
shelves = manager.active_shelves()
5775
if len(shelves) == 0:
5776
note('No shelved changes.')
5777
return 0
5778
for shelf_id in reversed(shelves):
5779
message = manager.get_metadata(shelf_id).get('message')
5780
if message is None:
5781
message = '<no message>'
5782
self.outf.write('%3d: %s\n' % (shelf_id, message))
5783
return 1
5784
finally:
5785
tree.unlock()
5875
5786
5876
5787
5877
5788
class cmd_unshelve(Command):
5878
__doc__ = """Restore shelved changes.
5789
"""Restore shelved changes.
5879
5790
5880
5791
By default, the most recently shelved changes are restored. However if you
5881
5792
specify a shelf by id those changes will be restored instead. This works
5889
5800
enum_switch=False, value_switches=True,
5890
5801
apply="Apply changes and remove from the shelf.",
5891
5802
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
5803
delete_only="Delete changes without applying them.",
5895
5804
keep="Apply changes but don't delete them.",
5896
5805
)
5907
5816
5908
5817
5909
5818
class cmd_clean_tree(Command):
5910
__doc__ = """Remove unwanted files from working tree.
5819
"""Remove unwanted files from working tree.
5911
5820
5912
5821
By default, only unknown files, not ignored files, are deleted. Versioned
5913
5822
files are never deleted.
5941
5850
5942
5851
5943
5852
class cmd_reference(Command):
5944
__doc__ = """list, view and set branch locations for nested trees.
5853
"""list, view and set branch locations for nested trees.
5945
5854
5946
5855
If no arguments are provided, lists the branch locations for nested trees.
5947
5856
If one argument is provided, display the branch location for that tree.
5987
5896
self.outf.write('%s %s\n' % (path, location))
5988
5897
5989
5898
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)
5899
# these get imported and then picked up by the scan for cmd_*
5900
# TODO: Some more consistent way to split command definitions across files;
5901
# we do need to load at least some information about them to know of
5902
# aliases. ideally we would avoid loading the implementation until the
5903
# details were needed.
5904
from bzrlib.cmd_version_info import cmd_version_info
5905
from bzrlib.conflicts import cmd_resolve, cmd_conflicts, restore
5906
from bzrlib.bundle.commands import (
5907
cmd_bundle_info,
5908
)
5909
from bzrlib.foreign import cmd_dpush
5910
from bzrlib.sign_my_commits import cmd_sign_my_commits
5911
from bzrlib.weave_commands import cmd_versionedfile_list, \
5912
cmd_weave_plan_merge, cmd_weave_merge_text
Loggerhead is a web-based interface for Breezy
Version: 2.0.1