To get this branch, use:
bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
« back to all changes in this revision
Viewing changes to bzrlib/builtins.py
- browse files at revision 4890
- compare with another revision
- download diff
- download tarball
- view history from revision 4890
- Committer: Canonical.com Patch Queue Manager
- Date: 2009-12-14 06:05:30 UTC
- mfrom: (4880.2.1 progress)
- Revision ID: pqm@pqm.ubuntu.com-20091214060530-uk93cdya34wzxb0s
(mbp) turn off progress bar; just show a spinner
- files added:
- bzrlib/weave_commands.py
- files removed:
- .testr.conf
- apport
- bzrlib/help_topics/es
- bzrlib/plugins/news_merge
- bzrlib/plugins/news_merge/tests
- bzrlib/tests/per_bzrdir_colo
- contrib/debian
- doc/en/whats-new
- files renamed:
- bzrlib/help_topics/en/conflict-types.txt => bzrlib/help_topics/en/conflicts.txt
- bzrlib/tests/test__bencode.py => bzrlib/tests/test_bencode.py
- bzrlib/help_topics/es/conflict-types.txt => doc/es/user-guide/resolving_conflicts.txt
- files modified:
- .bzrignore
added
removed
bzrlib/builtins.py
1
# Copyright (C) 2005-2010 Canonical Ltd
1
# Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
31
31
bundle,
32
32
btree_index,
33
33
bzrdir,
34
directory_service,
35
34
delta,
36
35
config,
37
36
errors,
54
53
)
55
54
from bzrlib.branch import Branch
56
55
from bzrlib.conflicts import ConflictList
57
from bzrlib.transport import memory
58
56
from bzrlib.revisionspec import RevisionSpec, RevisionInfo
59
57
from bzrlib.smtp_connection import SMTPConnection
60
58
from bzrlib.workingtree import WorkingTree
61
59
""")
62
60
63
from bzrlib.commands import (
64
Command,
65
builtin_command_registry,
66
display_command,
67
)
61
from bzrlib.commands import Command, display_command
68
62
from bzrlib.option import (
69
63
ListOption,
70
64
Option,
239
233
# opens the branch?)
240
234
241
235
class cmd_status(Command):
242
__doc__ = """Display status summary.
236
"""Display status summary.
243
237
244
238
This reports on versioned and unknown files, reporting them
245
239
grouped by state. Possible states are:
332
326
333
327
334
328
class cmd_cat_revision(Command):
335
__doc__ = """Write out metadata for a revision.
329
"""Write out metadata for a revision.
336
330
337
331
The revision to print can either be specified by a specific
338
332
revision identifier, or you can use --revision.
344
338
# cat-revision is more for frontends so should be exact
345
339
encoding = 'strict'
346
340
347
def print_revision(self, revisions, revid):
348
stream = revisions.get_record_stream([(revid,)], 'unordered', True)
349
record = stream.next()
350
if record.storage_kind == 'absent':
351
raise errors.NoSuchRevision(revisions, revid)
352
revtext = record.get_bytes_as('fulltext')
353
self.outf.write(revtext.decode('utf-8'))
354
355
341
@display_command
356
342
def run(self, revision_id=None, revision=None):
357
343
if revision_id is not None and revision is not None:
362
348
' --revision or a revision_id')
363
349
b = WorkingTree.open_containing(u'.')[0].branch
364
350
365
revisions = b.repository.revisions
366
if revisions is None:
367
raise errors.BzrCommandError('Repository %r does not support '
368
'access to raw revision texts')
351
# TODO: jam 20060112 should cat-revision always output utf-8?
352
if revision_id is not None:
353
revision_id = osutils.safe_revision_id(revision_id, warn=False)
354
try:
355
self.outf.write(b.repository.get_revision_xml(revision_id).decode('utf-8'))
356
except errors.NoSuchRevision:
357
msg = "The repository %s contains no revision %s." % (b.repository.base,
358
revision_id)
359
raise errors.BzrCommandError(msg)
360
elif revision is not None:
361
for rev in revision:
362
if rev is None:
363
raise errors.BzrCommandError('You cannot specify a NULL'
364
' revision.')
365
rev_id = rev.as_revision_id(b)
366
self.outf.write(b.repository.get_revision_xml(rev_id).decode('utf-8'))
369
367
370
b.repository.lock_read()
371
try:
372
# TODO: jam 20060112 should cat-revision always output utf-8?
373
if revision_id is not None:
374
revision_id = osutils.safe_revision_id(revision_id, warn=False)
375
try:
376
self.print_revision(revisions, revision_id)
377
except errors.NoSuchRevision:
378
msg = "The repository %s contains no revision %s." % (
379
b.repository.base, revision_id)
380
raise errors.BzrCommandError(msg)
381
elif revision is not None:
382
for rev in revision:
383
if rev is None:
384
raise errors.BzrCommandError(
385
'You cannot specify a NULL revision.')
386
rev_id = rev.as_revision_id(b)
387
self.print_revision(revisions, rev_id)
388
finally:
389
b.repository.unlock()
390
391
368
392
369
class cmd_dump_btree(Command):
393
__doc__ = """Dump the contents of a btree index file to stdout.
370
"""Dump the contents of a btree index file to stdout.
394
371
395
372
PATH is a btree index file, it can be any URL. This includes things like
396
373
.bzr/repository/pack-names, or .bzr/repository/indices/a34b3a...ca4a4.iix
460
437
for node in bt.iter_all_entries():
461
438
# Node is made up of:
462
439
# (index, key, value, [references])
463
try:
464
refs = node[3]
465
except IndexError:
466
refs_as_tuples = None
467
else:
468
refs_as_tuples = static_tuple.as_tuples(refs)
440
refs_as_tuples = static_tuple.as_tuples(node[3])
469
441
as_tuple = (tuple(node[1]), node[2], refs_as_tuples)
470
442
self.outf.write('%s\n' % (as_tuple,))
471
443
472
444
473
445
class cmd_remove_tree(Command):
474
__doc__ = """Remove the working tree from a given branch/checkout.
446
"""Remove the working tree from a given branch/checkout.
475
447
476
448
Since a lightweight checkout is little more than a working tree
477
449
this will refuse to run against one.
479
451
To re-create the working tree, use "bzr checkout".
480
452
"""
481
453
_see_also = ['checkout', 'working-trees']
482
takes_args = ['location*']
454
takes_args = ['location?']
483
455
takes_options = [
484
456
Option('force',
485
457
help='Remove the working tree even if it has '
486
458
'uncommitted changes.'),
487
459
]
488
460
489
def run(self, location_list, force=False):
490
if not location_list:
491
location_list=['.']
492
493
for location in location_list:
494
d = bzrdir.BzrDir.open(location)
495
496
try:
497
working = d.open_workingtree()
498
except errors.NoWorkingTree:
499
raise errors.BzrCommandError("No working tree to remove")
500
except errors.NotLocalUrl:
501
raise errors.BzrCommandError("You cannot remove the working tree"
502
" of a remote path")
503
if not force:
504
if (working.has_changes()):
505
raise errors.UncommittedChanges(working)
506
507
if working.user_url != working.branch.user_url:
508
raise errors.BzrCommandError("You cannot remove the working tree"
509
" from a lightweight checkout")
510
511
d.destroy_workingtree()
461
def run(self, location='.', force=False):
462
d = bzrdir.BzrDir.open(location)
463
464
try:
465
working = d.open_workingtree()
466
except errors.NoWorkingTree:
467
raise errors.BzrCommandError("No working tree to remove")
468
except errors.NotLocalUrl:
469
raise errors.BzrCommandError("You cannot remove the working tree"
470
" of a remote path")
471
if not force:
472
if (working.has_changes()):
473
raise errors.UncommittedChanges(working)
474
475
working_path = working.bzrdir.root_transport.base
476
branch_path = working.branch.bzrdir.root_transport.base
477
if working_path != branch_path:
478
raise errors.BzrCommandError("You cannot remove the working tree"
479
" from a lightweight checkout")
480
481
d.destroy_workingtree()
512
482
513
483
514
484
class cmd_revno(Command):
515
__doc__ = """Show current revision number.
485
"""Show current revision number.
516
486
517
487
This is equal to the number of revisions on this branch.
518
488
"""
528
498
if tree:
529
499
try:
530
500
wt = WorkingTree.open_containing(location)[0]
531
self.add_cleanup(wt.lock_read().unlock)
501
wt.lock_read()
532
502
except (errors.NoWorkingTree, errors.NotLocalUrl):
533
503
raise errors.NoWorkingTree(location)
534
revid = wt.last_revision()
535
504
try:
536
revno_t = wt.branch.revision_id_to_dotted_revno(revid)
537
except errors.NoSuchRevision:
538
revno_t = ('???',)
539
revno = ".".join(str(n) for n in revno_t)
505
revid = wt.last_revision()
506
try:
507
revno_t = wt.branch.revision_id_to_dotted_revno(revid)
508
except errors.NoSuchRevision:
509
revno_t = ('???',)
510
revno = ".".join(str(n) for n in revno_t)
511
finally:
512
wt.unlock()
540
513
else:
541
514
b = Branch.open_containing(location)[0]
542
self.add_cleanup(b.lock_read().unlock)
543
revno = b.revno()
544
self.cleanup_now()
515
b.lock_read()
516
try:
517
revno = b.revno()
518
finally:
519
b.unlock()
520
545
521
self.outf.write(str(revno) + '\n')
546
522
547
523
548
524
class cmd_revision_info(Command):
549
__doc__ = """Show revision number and revision id for a given revision identifier.
525
"""Show revision number and revision id for a given revision identifier.
550
526
"""
551
527
hidden = True
552
528
takes_args = ['revision_info*']
568
544
try:
569
545
wt = WorkingTree.open_containing(directory)[0]
570
546
b = wt.branch
571
self.add_cleanup(wt.lock_read().unlock)
547
wt.lock_read()
572
548
except (errors.NoWorkingTree, errors.NotLocalUrl):
573
549
wt = None
574
550
b = Branch.open_containing(directory)[0]
575
self.add_cleanup(b.lock_read().unlock)
576
revision_ids = []
577
if revision is not None:
578
revision_ids.extend(rev.as_revision_id(b) for rev in revision)
579
if revision_info_list is not None:
580
for rev_str in revision_info_list:
581
rev_spec = RevisionSpec.from_string(rev_str)
582
revision_ids.append(rev_spec.as_revision_id(b))
583
# No arguments supplied, default to the last revision
584
if len(revision_ids) == 0:
585
if tree:
586
if wt is None:
587
raise errors.NoWorkingTree(directory)
588
revision_ids.append(wt.last_revision())
551
b.lock_read()
552
try:
553
revision_ids = []
554
if revision is not None:
555
revision_ids.extend(rev.as_revision_id(b) for rev in revision)
556
if revision_info_list is not None:
557
for rev_str in revision_info_list:
558
rev_spec = RevisionSpec.from_string(rev_str)
559
revision_ids.append(rev_spec.as_revision_id(b))
560
# No arguments supplied, default to the last revision
561
if len(revision_ids) == 0:
562
if tree:
563
if wt is None:
564
raise errors.NoWorkingTree(directory)
565
revision_ids.append(wt.last_revision())
566
else:
567
revision_ids.append(b.last_revision())
568
569
revinfos = []
570
maxlen = 0
571
for revision_id in revision_ids:
572
try:
573
dotted_revno = b.revision_id_to_dotted_revno(revision_id)
574
revno = '.'.join(str(i) for i in dotted_revno)
575
except errors.NoSuchRevision:
576
revno = '???'
577
maxlen = max(maxlen, len(revno))
578
revinfos.append([revno, revision_id])
579
finally:
580
if wt is None:
581
b.unlock()
589
582
else:
590
revision_ids.append(b.last_revision())
591
592
revinfos = []
593
maxlen = 0
594
for revision_id in revision_ids:
595
try:
596
dotted_revno = b.revision_id_to_dotted_revno(revision_id)
597
revno = '.'.join(str(i) for i in dotted_revno)
598
except errors.NoSuchRevision:
599
revno = '???'
600
maxlen = max(maxlen, len(revno))
601
revinfos.append([revno, revision_id])
602
603
self.cleanup_now()
583
wt.unlock()
584
604
585
for ri in revinfos:
605
586
self.outf.write('%*s %s\n' % (maxlen, ri[0], ri[1]))
606
587
607
588
608
589
class cmd_add(Command):
609
__doc__ = """Add specified files or directories.
590
"""Add specified files or directories.
610
591
611
592
In non-recursive mode, all the named items are added, regardless
612
593
of whether they were previously ignored. A warning is given if
677
658
should_print=(not is_quiet()))
678
659
679
660
if base_tree:
680
self.add_cleanup(base_tree.lock_read().unlock)
681
tree, file_list = tree_files_for_add(file_list)
682
added, ignored = tree.smart_add(file_list, not
683
no_recurse, action=action, save=not dry_run)
684
self.cleanup_now()
661
base_tree.lock_read()
662
try:
663
tree, file_list = tree_files_for_add(file_list)
664
added, ignored = tree.smart_add(file_list, not
665
no_recurse, action=action, save=not dry_run)
666
finally:
667
if base_tree is not None:
668
base_tree.unlock()
685
669
if len(ignored) > 0:
686
670
if verbose:
687
671
for glob in sorted(ignored.keys()):
691
675
692
676
693
677
class cmd_mkdir(Command):
694
__doc__ = """Create a new versioned directory.
678
"""Create a new versioned directory.
695
679
696
680
This is equivalent to creating the directory and then adding it.
697
681
"""
701
685
702
686
def run(self, dir_list):
703
687
for d in dir_list:
688
os.mkdir(d)
704
689
wt, dd = WorkingTree.open_containing(d)
705
base = os.path.dirname(dd)
706
id = wt.path2id(base)
707
if id != None:
708
os.mkdir(d)
709
wt.add([dd])
710
self.outf.write('added %s\n' % d)
711
else:
712
raise errors.NotVersionedError(path=base)
690
wt.add([dd])
691
self.outf.write('added %s\n' % d)
713
692
714
693
715
694
class cmd_relpath(Command):
716
__doc__ = """Show path of a file relative to root"""
695
"""Show path of a file relative to root"""
717
696
718
697
takes_args = ['filename']
719
698
hidden = True
728
707
729
708
730
709
class cmd_inventory(Command):
731
__doc__ = """Show inventory of the current working copy or a revision.
710
"""Show inventory of the current working copy or a revision.
732
711
733
712
It is possible to limit the output to a particular entry
734
713
type using the --kind option. For example: --kind file.
755
734
756
735
revision = _get_one_revision('inventory', revision)
757
736
work_tree, file_list = tree_files(file_list)
758
self.add_cleanup(work_tree.lock_read().unlock)
759
if revision is not None:
760
tree = revision.as_tree(work_tree.branch)
761
762
extra_trees = [work_tree]
763
self.add_cleanup(tree.lock_read().unlock)
764
else:
765
tree = work_tree
766
extra_trees = []
767
768
if file_list is not None:
769
file_ids = tree.paths2ids(file_list, trees=extra_trees,
770
require_versioned=True)
771
# find_ids_across_trees may include some paths that don't
772
# exist in 'tree'.
773
entries = sorted((tree.id2path(file_id), tree.inventory[file_id])
774
for file_id in file_ids if file_id in tree)
775
else:
776
entries = tree.inventory.entries()
777
778
self.cleanup_now()
737
work_tree.lock_read()
738
try:
739
if revision is not None:
740
tree = revision.as_tree(work_tree.branch)
741
742
extra_trees = [work_tree]
743
tree.lock_read()
744
else:
745
tree = work_tree
746
extra_trees = []
747
748
if file_list is not None:
749
file_ids = tree.paths2ids(file_list, trees=extra_trees,
750
require_versioned=True)
751
# find_ids_across_trees may include some paths that don't
752
# exist in 'tree'.
753
entries = sorted((tree.id2path(file_id), tree.inventory[file_id])
754
for file_id in file_ids if file_id in tree)
755
else:
756
entries = tree.inventory.entries()
757
finally:
758
tree.unlock()
759
if tree is not work_tree:
760
work_tree.unlock()
761
779
762
for path, entry in entries:
780
763
if kind and kind != entry.kind:
781
764
continue
787
770
788
771
789
772
class cmd_mv(Command):
790
__doc__ = """Move or rename a file.
773
"""Move or rename a file.
791
774
792
775
:Usage:
793
776
bzr mv OLDNAME NEWNAME
826
809
if len(names_list) < 2:
827
810
raise errors.BzrCommandError("missing file argument")
828
811
tree, rel_names = tree_files(names_list, canonicalize=False)
829
self.add_cleanup(tree.lock_tree_write().unlock)
830
self._run(tree, names_list, rel_names, after)
812
tree.lock_tree_write()
813
try:
814
self._run(tree, names_list, rel_names, after)
815
finally:
816
tree.unlock()
831
817
832
818
def run_auto(self, names_list, after, dry_run):
833
819
if names_list is not None and len(names_list) > 1:
837
823
raise errors.BzrCommandError('--after cannot be specified with'
838
824
' --auto.')
839
825
work_tree, file_list = tree_files(names_list, default_branch='.')
840
self.add_cleanup(work_tree.lock_tree_write().unlock)
841
rename_map.RenameMap.guess_renames(work_tree, dry_run)
826
work_tree.lock_tree_write()
827
try:
828
rename_map.RenameMap.guess_renames(work_tree, dry_run)
829
finally:
830
work_tree.unlock()
842
831
843
832
def _run(self, tree, names_list, rel_names, after):
844
833
into_existing = osutils.isdir(names_list[-1])
922
911
923
912
924
913
class cmd_pull(Command):
925
__doc__ = """Turn this branch into a mirror of another branch.
914
"""Turn this branch into a mirror of another branch.
926
915
927
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:
1403
branch_location = master.base
1404
1402
tree.lock_write()
1405
1403
else:
1406
branch_location = tree.branch.base
1407
1404
tree.lock_tree_write()
1408
self.add_cleanup(tree.unlock)
1409
# get rid of the final '/' and be ready for display
1410
branch_location = urlutils.unescape_for_display(
1411
branch_location.rstrip('/'),
1412
self.outf.encoding)
1413
existing_pending_merges = tree.get_parent_ids()[1:]
1414
if master is None:
1415
old_tip = None
1416
else:
1417
# may need to fetch data into a heavyweight checkout
1418
# XXX: this may take some time, maybe we should display a
1419
# message
1420
old_tip = branch.update(possible_transports)
1421
if revision is not None:
1422
revision_id = revision[0].as_revision_id(branch)
1423
else:
1424
revision_id = branch.last_revision()
1425
if revision_id == _mod_revision.ensure_null(tree.last_revision()):
1426
revno = branch.revision_id_to_dotted_revno(revision_id)
1427
note("Tree is up to date at revision %s of branch %s" %
1428
('.'.join(map(str, revno)), branch_location))
1429
return 0
1430
view_info = _get_view_info_for_change_reporter(tree)
1431
change_reporter = delta._ChangeReporter(
1432
unversioned_filter=tree.is_ignored,
1433
view_info=view_info)
1434
1405
try:
1406
existing_pending_merges = tree.get_parent_ids()[1:]
1407
last_rev = _mod_revision.ensure_null(tree.last_revision())
1408
if last_rev == _mod_revision.ensure_null(
1409
tree.branch.last_revision()):
1410
# may be up to date, check master too.
1411
if master is None or last_rev == _mod_revision.ensure_null(
1412
master.last_revision()):
1413
revno = tree.branch.revision_id_to_revno(last_rev)
1414
note("Tree is up to date at revision %d." % (revno,))
1415
return 0
1416
view_info = _get_view_info_for_change_reporter(tree)
1435
1417
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
1418
delta._ChangeReporter(unversioned_filter=tree.is_ignored,
1419
view_info=view_info), possible_transports=possible_transports)
1420
revno = tree.branch.revision_id_to_revno(
1421
_mod_revision.ensure_null(tree.last_revision()))
1422
note('Updated to revision %d.' % (revno,))
1423
if tree.get_parent_ids()[1:] != existing_pending_merges:
1424
note('Your local commits will now show as pending merges with '
1425
"'bzr status', and can be committed with 'bzr commit'.")
1426
if conflicts != 0:
1427
return 1
1428
else:
1429
return 0
1430
finally:
1431
tree.unlock()
1458
1432
1459
1433
1460
1434
class cmd_info(Command):
1461
__doc__ = """Show information about a working tree, branch or repository.
1435
"""Show information about a working tree, branch or repository.
1462
1436
1463
1437
This command will show all known locations and formats associated to the
1464
1438
tree, branch or repository.
1502
1476
1503
1477
1504
1478
class cmd_remove(Command):
1505
__doc__ = """Remove files or directories.
1479
"""Remove files or directories.
1506
1480
1507
1481
This makes bzr stop tracking changes to the specified files. bzr will delete
1508
1482
them if they can easily be recovered using revert. If no options or
1530
1504
if file_list is not None:
1531
1505
file_list = [f for f in file_list]
1532
1506
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')
1507
tree.lock_write()
1508
try:
1509
# Heuristics should probably all move into tree.remove_smart or
1510
# some such?
1511
if new:
1512
added = tree.changes_from(tree.basis_tree(),
1513
specific_files=file_list).added
1514
file_list = sorted([f[0] for f in added], reverse=True)
1515
if len(file_list) == 0:
1516
raise errors.BzrCommandError('No matching files.')
1517
elif file_list is None:
1518
# missing files show up in iter_changes(basis) as
1519
# versioned-with-no-kind.
1520
missing = []
1521
for change in tree.iter_changes(tree.basis_tree()):
1522
# Find paths in the working tree that have no kind:
1523
if change[1][1] is not None and change[6][1] is None:
1524
missing.append(change[1][1])
1525
file_list = sorted(missing, reverse=True)
1526
file_deletion_strategy = 'keep'
1527
tree.remove(file_list, verbose=verbose, to_file=self.outf,
1528
keep_files=file_deletion_strategy=='keep',
1529
force=file_deletion_strategy=='force')
1530
finally:
1531
tree.unlock()
1555
1532
1556
1533
1557
1534
class cmd_file_id(Command):
1558
__doc__ = """Print file_id of a particular file or directory.
1535
"""Print file_id of a particular file or directory.
1559
1536
1560
1537
The file_id is assigned when the file is first added and remains the
1561
1538
same through all revisions where the file exists, even when it is
1577
1554
1578
1555
1579
1556
class cmd_file_path(Command):
1580
__doc__ = """Print path of file_ids to a file or directory.
1557
"""Print path of file_ids to a file or directory.
1581
1558
1582
1559
This prints one line for each directory down to the target,
1583
1560
starting at the branch root.
1599
1576
1600
1577
1601
1578
class cmd_reconcile(Command):
1602
__doc__ = """Reconcile bzr metadata in a branch.
1579
"""Reconcile bzr metadata in a branch.
1603
1580
1604
1581
This can correct data mismatches that may have been caused by
1605
1582
previous ghost operations or bzr upgrades. You should only
1627
1604
1628
1605
1629
1606
class cmd_revision_history(Command):
1630
__doc__ = """Display the list of revision ids on a branch."""
1607
"""Display the list of revision ids on a branch."""
1631
1608
1632
1609
_see_also = ['log']
1633
1610
takes_args = ['location?']
1643
1620
1644
1621
1645
1622
class cmd_ancestry(Command):
1646
__doc__ = """List all revisions merged into this branch."""
1623
"""List all revisions merged into this branch."""
1647
1624
1648
1625
_see_also = ['log', 'revision-history']
1649
1626
takes_args = ['location?']
1668
1645
1669
1646
1670
1647
class cmd_init(Command):
1671
__doc__ = """Make a directory into a versioned branch.
1648
"""Make a directory into a versioned branch.
1672
1649
1673
1650
Use this to create an empty branch, or before importing an
1674
1651
existing project.
1777
1754
1778
1755
1779
1756
class cmd_init_repository(Command):
1780
__doc__ = """Create a shared repository for branches to share storage space.
1757
"""Create a shared repository for branches to share storage space.
1781
1758
1782
1759
New branches created under the repository directory will store their
1783
1760
revisions in the repository, not in the branch directory. For branches
1837
1814
1838
1815
1839
1816
class cmd_diff(Command):
1840
__doc__ = """Show differences in the working tree, between revisions or branches.
1817
"""Show differences in the working tree, between revisions or branches.
1841
1818
1842
1819
If no arguments are given, all changes for the current tree are listed.
1843
1820
If files are given, only the changes in those files are listed.
1929
1906
help='Use this command to compare files.',
1930
1907
type=unicode,
1931
1908
),
1932
RegistryOption('format',
1933
help='Diff format to use.',
1934
lazy_registry=('bzrlib.diff', 'format_registry'),
1935
value_switches=False, title='Diff format'),
1936
1909
]
1937
1910
aliases = ['di', 'dif']
1938
1911
encoding_type = 'exact'
1939
1912
1940
1913
@display_command
1941
1914
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)
1915
prefix=None, old=None, new=None, using=None):
1916
from bzrlib.diff import get_trees_and_branches_to_diff, show_diff_trees
1945
1917
1946
1918
if (prefix is None) or (prefix == '0'):
1947
1919
# diff -p0 format
1961
1933
raise errors.BzrCommandError('bzr diff --revision takes exactly'
1962
1934
' one or two revision specifiers')
1963
1935
1964
if using is not None and format is not None:
1965
raise errors.BzrCommandError('--using and --format are mutually '
1966
'exclusive.')
1967
1968
1936
(old_tree, new_tree,
1969
1937
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)
1938
specific_files, extra_trees) = get_trees_and_branches_to_diff(
1939
file_list, revision, old, new, apply_view=True)
1972
1940
return show_diff_trees(old_tree, new_tree, sys.stdout,
1973
1941
specific_files=specific_files,
1974
1942
external_diff_options=diff_options,
1975
1943
old_label=old_label, new_label=new_label,
1976
extra_trees=extra_trees, using=using,
1977
format_cls=format)
1944
extra_trees=extra_trees, using=using)
1978
1945
1979
1946
1980
1947
class cmd_deleted(Command):
1981
__doc__ = """List files deleted in the working tree.
1948
"""List files deleted in the working tree.
1982
1949
"""
1983
1950
# TODO: Show files deleted since a previous revision, or
1984
1951
# between two revisions.
1992
1959
@display_command
1993
1960
def run(self, show_ids=False):
1994
1961
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')
1962
tree.lock_read()
1963
try:
1964
old = tree.basis_tree()
1965
old.lock_read()
1966
try:
1967
for path, ie in old.inventory.iter_entries():
1968
if not tree.has_id(ie.file_id):
1969
self.outf.write(path)
1970
if show_ids:
1971
self.outf.write(' ')
1972
self.outf.write(ie.file_id)
1973
self.outf.write('\n')
1974
finally:
1975
old.unlock()
1976
finally:
1977
tree.unlock()
2005
1978
2006
1979
2007
1980
class cmd_modified(Command):
2008
__doc__ = """List files modified in working tree.
1981
"""List files modified in working tree.
2009
1982
"""
2010
1983
2011
1984
hidden = True
2028
2001
2029
2002
2030
2003
class cmd_added(Command):
2031
__doc__ = """List files added in working tree.
2004
"""List files added in working tree.
2032
2005
"""
2033
2006
2034
2007
hidden = True
2042
2015
@display_command
2043
2016
def run(self, null=False):
2044
2017
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')
2018
wt.lock_read()
2019
try:
2020
basis = wt.basis_tree()
2021
basis.lock_read()
2022
try:
2023
basis_inv = basis.inventory
2024
inv = wt.inventory
2025
for file_id in inv:
2026
if file_id in basis_inv:
2027
continue
2028
if inv.is_root(file_id) and len(basis_inv) == 0:
2029
continue
2030
path = inv.id2path(file_id)
2031
if not os.access(osutils.abspath(path), os.F_OK):
2032
continue
2033
if null:
2034
self.outf.write(path + '\0')
2035
else:
2036
self.outf.write(osutils.quotefn(path) + '\n')
2037
finally:
2038
basis.unlock()
2039
finally:
2040
wt.unlock()
2062
2041
2063
2042
2064
2043
class cmd_root(Command):
2065
__doc__ = """Show the tree root directory.
2044
"""Show the tree root directory.
2066
2045
2067
2046
The root is the nearest enclosing directory with a .bzr control
2068
2047
directory."""
2092
2071
2093
2072
2094
2073
class cmd_log(Command):
2095
__doc__ = """Show historical log for a branch or subset of a branch.
2074
"""Show historical log for a branch or subset of a branch.
2096
2075
2097
2076
log is bzr's default tool for exploring the history of a branch.
2098
2077
The branch to use is taken from the first parameter. If no parameters
2209
2188
:Tips & tricks:
2210
2189
2211
2190
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>.
2191
line tools. You may prefer qlog or glog from the QBzr and Bzr-Gtk packages
2192
respectively for example. (TortoiseBzr uses qlog for displaying logs.) See
2193
http://bazaar-vcs.org/BzrPlugins and http://bazaar-vcs.org/IDEIntegration.
2194
2195
Web interfaces are often better at exploring history than command line
2196
tools, particularly for branches on servers. You may prefer Loggerhead
2197
or one of its alternatives. See http://bazaar-vcs.org/WebInterface.
2216
2198
2217
2199
You may find it useful to add the aliases below to ``bazaar.conf``::
2218
2200
2279
2261
help='Show changes made in each revision as a patch.'),
2280
2262
Option('include-merges',
2281
2263
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
2264
]
2287
2265
encoding_type = 'replace'
2288
2266
2298
2276
message=None,
2299
2277
limit=None,
2300
2278
show_diff=False,
2301
include_merges=False,
2302
exclude_common_ancestry=False,
2303
):
2279
include_merges=False):
2304
2280
from bzrlib.log import (
2305
2281
Logger,
2306
2282
make_log_request_dict,
2307
2283
_get_info_for_log_files,
2308
2284
)
2309
2285
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
2286
if include_merges:
2315
2287
if levels is None:
2316
2288
levels = 0
2329
2301
2330
2302
file_ids = []
2331
2303
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
2304
b = None
2305
try:
2306
if file_list:
2307
# find the file ids to log and check for directory filtering
2308
b, file_info_list, rev1, rev2 = _get_info_for_log_files(
2309
revision, file_list)
2310
for relpath, file_id, kind in file_info_list:
2311
if file_id is None:
2312
raise errors.BzrCommandError(
2313
"Path unknown at end or start of revision range: %s" %
2314
relpath)
2315
# If the relpath is the top of the tree, we log everything
2316
if relpath == '':
2317
file_ids = []
2318
break
2319
else:
2320
file_ids.append(file_id)
2321
filter_by_dir = filter_by_dir or (
2322
kind in ['directory', 'tree-reference'])
2323
else:
2324
# log everything
2325
# FIXME ? log the current subdir only RBC 20060203
2326
if revision is not None \
2327
and len(revision) > 0 and revision[0].get_branch():
2328
location = revision[0].get_branch()
2345
2329
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)
2330
location = '.'
2331
dir, relpath = bzrdir.BzrDir.open_containing(location)
2332
b = dir.open_branch()
2333
b.lock_read()
2334
rev1, rev2 = _get_revision_range(revision, b, self.name())
2335
2336
# Decide on the type of delta & diff filtering to use
2337
# TODO: add an --all-files option to make this configurable & consistent
2338
if not verbose:
2339
delta_type = None
2340
else:
2341
delta_type = 'full'
2342
if not show_diff:
2343
diff_type = None
2344
elif file_ids:
2345
diff_type = 'partial'
2346
else:
2347
diff_type = 'full'
2348
2349
# Build the log formatter
2350
if log_format is None:
2351
log_format = log.log_formatter_registry.get_default(b)
2352
# Make a non-encoding output to include the diffs - bug 328007
2353
unencoded_output = ui.ui_factory.make_output_stream(encoding_type='exact')
2354
lf = log_format(show_ids=show_ids, to_file=self.outf,
2355
to_exact_file=unencoded_output,
2356
show_timezone=timezone,
2357
delta_format=get_verbosity_level(),
2358
levels=levels,
2359
show_advice=levels is None)
2360
2361
# Choose the algorithm for doing the logging. It's annoying
2362
# having multiple code paths like this but necessary until
2363
# the underlying repository format is faster at generating
2364
# deltas or can provide everything we need from the indices.
2365
# The default algorithm - match-using-deltas - works for
2366
# multiple files and directories and is faster for small
2367
# amounts of history (200 revisions say). However, it's too
2368
# slow for logging a single file in a repository with deep
2369
# history, i.e. > 10K revisions. In the spirit of "do no
2370
# evil when adding features", we continue to use the
2371
# original algorithm - per-file-graph - for the "single
2372
# file that isn't a directory without showing a delta" case.
2373
partial_history = revision and b.repository._format.supports_chks
2374
match_using_deltas = (len(file_ids) != 1 or filter_by_dir
2375
or delta_type or partial_history)
2376
2377
# Build the LogRequest and execute it
2378
if len(file_ids) == 0:
2379
file_ids = None
2380
rqst = make_log_request_dict(
2381
direction=direction, specific_fileids=file_ids,
2382
start_revision=rev1, end_revision=rev2, limit=limit,
2383
message_search=message, delta_type=delta_type,
2384
diff_type=diff_type, _match_using_deltas=match_using_deltas)
2385
Logger(b, rqst).show(lf)
2386
finally:
2387
if b is not None:
2388
b.unlock()
2414
2389
2415
2390
2416
2391
def _get_revision_range(revisionspec_list, branch, command_name):
2434
2409
raise errors.BzrCommandError(
2435
2410
"bzr %s doesn't accept two revisions in different"
2436
2411
" 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)
2412
rev1 = start_spec.in_history(branch)
2442
2413
# Avoid loading all of history when we know a missing
2443
2414
# end of range means the last revision ...
2444
2415
if end_spec.spec is None:
2473
2444
2474
2445
2475
2446
class cmd_touching_revisions(Command):
2476
__doc__ = """Return revision-ids which affected a particular file.
2447
"""Return revision-ids which affected a particular file.
2477
2448
2478
2449
A more user-friendly interface is "bzr log FILE".
2479
2450
"""
2486
2457
tree, relpath = WorkingTree.open_containing(filename)
2487
2458
file_id = tree.path2id(relpath)
2488
2459
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))
2460
b.lock_read()
2461
try:
2462
touching_revs = log.find_touching_revisions(b, file_id)
2463
for revno, revision_id, what in touching_revs:
2464
self.outf.write("%6d %s\n" % (revno, what))
2465
finally:
2466
b.unlock()
2493
2467
2494
2468
2495
2469
class cmd_ls(Command):
2496
__doc__ = """List files in a tree.
2470
"""List files in a tree.
2497
2471
"""
2498
2472
2499
2473
_see_also = ['status', 'cat']
2561
2535
view_str = views.view_display_str(view_files)
2562
2536
note("Ignoring files outside view. View is %s" % view_str)
2563
2537
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
2538
tree.lock_read()
2539
try:
2540
for fp, fc, fkind, fid, entry in tree.list_files(include_root=False,
2541
from_dir=relpath, recursive=recursive):
2542
# Apply additional masking
2543
if not all and not selection[fc]:
2544
continue
2545
if kind is not None and fkind != kind:
2546
continue
2547
if apply_view:
2548
try:
2549
if relpath:
2550
fullpath = osutils.pathjoin(relpath, fp)
2551
else:
2552
fullpath = fp
2553
views.check_path_in_view(tree, fullpath)
2554
except errors.FileOutsideView:
2555
continue
2581
2556
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:
2557
# Output the entry
2558
if prefix:
2559
fp = osutils.pathjoin(prefix, fp)
2560
kindch = entry.kind_character()
2561
outstring = fp + kindch
2562
ui.ui_factory.clear_term()
2563
if verbose:
2564
outstring = '%-8s %s' % (fc, outstring)
2565
if show_ids and fid is not None:
2566
outstring = "%-50s %s" % (outstring, fid)
2608
2567
self.outf.write(outstring + '\n')
2568
elif null:
2569
self.outf.write(fp + '\0')
2570
if show_ids:
2571
if fid is not None:
2572
self.outf.write(fid)
2573
self.outf.write('\0')
2574
self.outf.flush()
2575
else:
2576
if show_ids:
2577
if fid is not None:
2578
my_id = fid
2579
else:
2580
my_id = ''
2581
self.outf.write('%-50s %s\n' % (outstring, my_id))
2582
else:
2583
self.outf.write(outstring + '\n')
2584
finally:
2585
tree.unlock()
2609
2586
2610
2587
2611
2588
class cmd_unknowns(Command):
2612
__doc__ = """List unknown files.
2589
"""List unknown files.
2613
2590
"""
2614
2591
2615
2592
hidden = True
2622
2599
2623
2600
2624
2601
class cmd_ignore(Command):
2625
__doc__ = """Ignore specified files or patterns.
2602
"""Ignore specified files or patterns.
2626
2603
2627
2604
See ``bzr help patterns`` for details on the syntax of patterns.
2628
2605
2636
2613
After adding, editing or deleting that file either indirectly by
2637
2614
using this command or directly by using an editor, be sure to commit
2638
2615
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
2616
2653
2617
Note: ignore patterns containing shell wildcards must be quoted from
2654
2618
the shell on Unix.
2658
2622
2659
2623
bzr ignore ./Makefile
2660
2624
2661
Ignore .class files in all directories...::
2625
Ignore class files in all directories::
2662
2626
2663
2627
bzr ignore "*.class"
2664
2628
2665
...but do not ignore "special.class"::
2666
2667
bzr ignore "!special.class"
2668
2669
2629
Ignore .o files under the lib directory::
2670
2630
2671
2631
bzr ignore "lib/**/*.o"
2677
2637
Ignore everything but the "debian" toplevel directory::
2678
2638
2679
2639
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
2640
"""
2688
2641
2689
2642
_see_also = ['status', 'ignored', 'patterns']
2690
2643
takes_args = ['name_pattern*']
2691
2644
takes_options = [
2692
Option('default-rules',
2693
help='Display the default ignore rules that bzr uses.')
2645
Option('old-default-rules',
2646
help='Write out the ignore rules bzr < 0.9 always used.')
2694
2647
]
2695
2648
2696
def run(self, name_pattern_list=None, default_rules=None):
2649
def run(self, name_pattern_list=None, old_default_rules=None):
2697
2650
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)
2651
if old_default_rules is not None:
2652
# dump the rules and exit
2653
for pattern in ignores.OLD_DEFAULTS:
2654
print pattern
2702
2655
return
2703
2656
if not name_pattern_list:
2704
2657
raise errors.BzrCommandError("ignore requires at least one "
2705
"NAME_PATTERN or --default-rules.")
2658
"NAME_PATTERN or --old-default-rules")
2706
2659
name_pattern_list = [globbing.normalize_pattern(p)
2707
2660
for p in name_pattern_list]
2708
2661
for name_pattern in name_pattern_list:
2720
2673
if id is not None:
2721
2674
filename = entry[0]
2722
2675
if ignored.match(filename):
2723
matches.append(filename)
2676
matches.append(filename.encode('utf-8'))
2724
2677
tree.unlock()
2725
2678
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),))
2679
print "Warning: the following files are version controlled and" \
2680
" match your ignore pattern:\n%s" \
2681
"\nThese files will continue to be version controlled" \
2682
" unless you 'bzr remove' them." % ("\n".join(matches),)
2730
2683
2731
2684
2732
2685
class cmd_ignored(Command):
2733
__doc__ = """List ignored files and the patterns that matched them.
2686
"""List ignored files and the patterns that matched them.
2734
2687
2735
2688
List all the ignored files and the ignore pattern that caused the file to
2736
2689
be ignored.
2746
2699
@display_command
2747
2700
def run(self):
2748
2701
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))
2702
tree.lock_read()
2703
try:
2704
for path, file_class, kind, file_id, entry in tree.list_files():
2705
if file_class != 'I':
2706
continue
2707
## XXX: Slightly inefficient since this was already calculated
2708
pat = tree.is_ignored(path)
2709
self.outf.write('%-50s %s\n' % (path, pat))
2710
finally:
2711
tree.unlock()
2756
2712
2757
2713
2758
2714
class cmd_lookup_revision(Command):
2759
__doc__ = """Lookup the revision-id from a revision-number
2715
"""Lookup the revision-id from a revision-number
2760
2716
2761
2717
:Examples:
2762
2718
bzr lookup-revision 33
2769
2725
try:
2770
2726
revno = int(revno)
2771
2727
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)
2728
raise errors.BzrCommandError("not a valid revision-number: %r" % revno)
2729
2730
print WorkingTree.open_containing(u'.')[0].branch.get_rev_id(revno)
2776
2731
2777
2732
2778
2733
class cmd_export(Command):
2779
__doc__ = """Export current or past revision to a destination directory or archive.
2734
"""Export current or past revision to a destination directory or archive.
2780
2735
2781
2736
If no revision is specified this exports the last committed revision.
2782
2737
2814
2769
Option('root',
2815
2770
type=str,
2816
2771
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
2772
]
2821
2773
def run(self, dest, branch_or_subdir=None, revision=None, format=None,
2822
root=None, filters=False, per_file_timestamps=False):
2774
root=None, filters=False):
2823
2775
from bzrlib.export import export
2824
2776
2825
2777
if branch_or_subdir is None:
2832
2784
2833
2785
rev_tree = _get_one_revision_tree('export', revision, branch=b, tree=tree)
2834
2786
try:
2835
export(rev_tree, dest, format, root, subdir, filtered=filters,
2836
per_file_timestamps=per_file_timestamps)
2787
export(rev_tree, dest, format, root, subdir, filtered=filters)
2837
2788
except errors.NoSuchExportFormat, e:
2838
2789
raise errors.BzrCommandError('Unsupported export format: %s' % e.format)
2839
2790
2840
2791
2841
2792
class cmd_cat(Command):
2842
__doc__ = """Write the contents of a file as of a given revision to standard output.
2793
"""Write the contents of a file as of a given revision to standard output.
2843
2794
2844
2795
If no revision is nominated, the last revision is used.
2845
2796
2865
2816
" one revision specifier")
2866
2817
tree, branch, relpath = \
2867
2818
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)
2819
branch.lock_read()
2820
try:
2821
return self._run(tree, branch, relpath, filename, revision,
2822
name_from_revision, filters)
2823
finally:
2824
branch.unlock()
2871
2825
2872
2826
def _run(self, tree, b, relpath, filename, revision, name_from_revision,
2873
2827
filtered):
2874
2828
if tree is None:
2875
2829
tree = b.basis_tree()
2876
2830
rev_tree = _get_one_revision_tree('cat', revision, branch=b)
2877
self.add_cleanup(rev_tree.lock_read().unlock)
2878
2831
2879
2832
old_file_id = rev_tree.path2id(relpath)
2880
2833
2915
2868
chunks = content.splitlines(True)
2916
2869
content = filtered_output_bytes(chunks, filters,
2917
2870
ContentFilterContext(relpath, rev_tree))
2918
self.cleanup_now()
2919
2871
self.outf.writelines(content)
2920
2872
else:
2921
self.cleanup_now()
2922
2873
self.outf.write(content)
2923
2874
2924
2875
2925
2876
class cmd_local_time_offset(Command):
2926
__doc__ = """Show the offset in seconds from GMT to local time."""
2877
"""Show the offset in seconds from GMT to local time."""
2927
2878
hidden = True
2928
2879
@display_command
2929
2880
def run(self):
2930
self.outf.write("%s\n" % osutils.local_time_offset())
2881
print osutils.local_time_offset()
2931
2882
2932
2883
2933
2884
2934
2885
class cmd_commit(Command):
2935
__doc__ = """Commit changes into a new revision.
2886
"""Commit changes into a new revision.
2936
2887
2937
2888
An explanatory message needs to be given for each commit. This is
2938
2889
often done by using the --message option (getting the message from the
3046
2997
"the master branch until a normal commit "
3047
2998
"is performed."
3048
2999
),
3049
Option('show-diff', short_name='p',
3000
Option('show-diff',
3050
3001
help='When no message is supplied, show the diff along'
3051
3002
' with the status summary in the message editor.'),
3052
3003
]
3132
3083
'(use --file "%(f)s" to take commit message from that file)'
3133
3084
% { 'f': message })
3134
3085
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
3086
3142
3087
def get_message(commit_obj):
3143
3088
"""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,
3089
my_message = message
3090
if my_message is not None and '\r' in my_message:
3091
my_message = my_message.replace('\r\n', '\n')
3092
my_message = my_message.replace('\r', '\n')
3093
if my_message is None and not file:
3094
t = make_commit_message_template_encoded(tree,
3153
3095
selected_list, diff=show_diff,
3154
3096
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
3097
start_message = generate_commit_message_template(commit_obj)
3161
my_message = edit_commit_message_encoded(text,
3098
my_message = edit_commit_message_encoded(t,
3162
3099
start_message=start_message)
3163
3100
if my_message is None:
3164
3101
raise errors.BzrCommandError("please specify a commit"
3165
3102
" message with either --message or --file")
3103
elif my_message and file:
3104
raise errors.BzrCommandError(
3105
"please specify either --message or --file")
3106
if file:
3107
my_message = codecs.open(file, 'rt',
3108
osutils.get_user_encoding()).read()
3166
3109
if my_message == "":
3167
3110
raise errors.BzrCommandError("empty commit message specified")
3168
3111
return my_message
3180
3123
timezone=offset,
3181
3124
exclude=safe_relpath_files(tree, exclude))
3182
3125
except PointlessCommit:
3126
# FIXME: This should really happen before the file is read in;
3127
# perhaps prepare the commit; get the message; then actually commit
3183
3128
raise errors.BzrCommandError("No changes to commit."
3184
3129
" Use --unchanged to commit anyhow.")
3185
3130
except ConflictsInTree:
3190
3135
raise errors.BzrCommandError("Commit refused because there are"
3191
3136
" unknown files in the working tree.")
3192
3137
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
3138
raise errors.BzrCommandError(str(e) + "\n"
3139
'To commit to master branch, run update and then commit.\n'
3140
'You can also pass --local to commit to continue working '
3141
'disconnected.')
3198
3142
3199
3143
3200
3144
class cmd_check(Command):
3201
__doc__ = """Validate working tree structure, branch consistency and repository history.
3145
"""Validate working tree structure, branch consistency and repository history.
3202
3146
3203
3147
This command checks various invariants about branch and repository storage
3204
3148
to detect data corruption or bzr bugs.
3268
3212
3269
3213
3270
3214
class cmd_upgrade(Command):
3271
__doc__ = """Upgrade branch storage to current format.
3215
"""Upgrade branch storage to current format.
3272
3216
3273
3217
The check command or bzr developers may sometimes advise you to run
3274
3218
this command. When the default format has changed you may also be warned
3292
3236
3293
3237
3294
3238
class cmd_whoami(Command):
3295
__doc__ = """Show or set bzr user id.
3239
"""Show or set bzr user id.
3296
3240
3297
3241
:Examples:
3298
3242
Show the email of the current user::
3342
3286
3343
3287
3344
3288
class cmd_nick(Command):
3345
__doc__ = """Print or set the branch nickname.
3289
"""Print or set the branch nickname.
3346
3290
3347
3291
If unset, the tree root directory name is used as the nickname.
3348
3292
To print the current nickname, execute with no argument.
3362
3306
3363
3307
@display_command
3364
3308
def printme(self, branch):
3365
self.outf.write('%s\n' % branch.nick)
3309
print branch.nick
3366
3310
3367
3311
3368
3312
class cmd_alias(Command):
3369
__doc__ = """Set/unset and display aliases.
3313
"""Set/unset and display aliases.
3370
3314
3371
3315
:Examples:
3372
3316
Show the current aliases::
3436
3380
3437
3381
3438
3382
class cmd_selftest(Command):
3439
__doc__ = """Run internal test suite.
3383
"""Run internal test suite.
3440
3384
3441
3385
If arguments are given, they are regular expressions that say which tests
3442
3386
should run. Tests matching any expression are run, and other tests are
3486
3430
def get_transport_type(typestring):
3487
3431
"""Parse and return a transport specifier."""
3488
3432
if typestring == "sftp":
3489
from bzrlib.tests import stub_sftp
3490
return stub_sftp.SFTPAbsoluteServer
3433
from bzrlib.transport.sftp import SFTPAbsoluteServer
3434
return SFTPAbsoluteServer
3491
3435
if typestring == "memory":
3492
from bzrlib.tests import test_server
3493
return memory.MemoryServer
3436
from bzrlib.transport.memory import MemoryServer
3437
return MemoryServer
3494
3438
if typestring == "fakenfs":
3495
from bzrlib.tests import test_server
3496
return test_server.FakeNFSServer
3439
from bzrlib.transport.fakenfs import FakeNFSServer
3440
return FakeNFSServer
3497
3441
msg = "No known transport type %s. Supported types are: sftp\n" %\
3498
3442
(typestring)
3499
3443
raise errors.BzrCommandError(msg)
3583
3527
raise errors.BzrCommandError("subunit not available. subunit "
3584
3528
"needs to be installed to use --subunit.")
3585
3529
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
3530
if parallel:
3592
3531
self.additional_selftest_args.setdefault(
3593
3532
'suite_decorators', []).append(parallel)
3597
3536
verbose = not is_quiet()
3598
3537
# TODO: should possibly lock the history file...
3599
3538
benchfile = open(".perf_history", "at", buffering=1)
3600
self.add_cleanup(benchfile.close)
3601
3539
else:
3602
3540
test_suite_factory = None
3603
3541
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)
3542
try:
3543
selftest_kwargs = {"verbose": verbose,
3544
"pattern": pattern,
3545
"stop_on_failure": one,
3546
"transport": transport,
3547
"test_suite_factory": test_suite_factory,
3548
"lsprof_timed": lsprof_timed,
3549
"lsprof_tests": lsprof_tests,
3550
"bench_history": benchfile,
3551
"matching_tests_first": first,
3552
"list_only": list_only,
3553
"random_seed": randomize,
3554
"exclude_pattern": exclude,
3555
"strict": strict,
3556
"load_list": load_list,
3557
"debug_flags": debugflag,
3558
"starting_with": starting_with
3559
}
3560
selftest_kwargs.update(self.additional_selftest_args)
3561
result = selftest(**selftest_kwargs)
3562
finally:
3563
if benchfile is not None:
3564
benchfile.close()
3623
3565
return int(not result)
3624
3566
3625
3567
3626
3568
class cmd_version(Command):
3627
__doc__ = """Show version of bzr."""
3569
"""Show version of bzr."""
3628
3570
3629
3571
encoding_type = 'replace'
3630
3572
takes_options = [
3641
3583
3642
3584
3643
3585
class cmd_rocks(Command):
3644
__doc__ = """Statement of optimism."""
3586
"""Statement of optimism."""
3645
3587
3646
3588
hidden = True
3647
3589
3648
3590
@display_command
3649
3591
def run(self):
3650
self.outf.write("It sure does!\n")
3592
print "It sure does!"
3651
3593
3652
3594
3653
3595
class cmd_find_merge_base(Command):
3654
__doc__ = """Find and print a base revision for merging two branches."""
3596
"""Find and print a base revision for merging two branches."""
3655
3597
# TODO: Options to specify revisions on either side, as if
3656
3598
# merging only part of the history.
3657
3599
takes_args = ['branch', 'other']
3663
3605
3664
3606
branch1 = Branch.open_containing(branch)[0]
3665
3607
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)
3608
branch1.lock_read()
3609
try:
3610
branch2.lock_read()
3611
try:
3612
last1 = ensure_null(branch1.last_revision())
3613
last2 = ensure_null(branch2.last_revision())
3614
3615
graph = branch1.repository.get_graph(branch2.repository)
3616
base_rev_id = graph.find_unique_lca(last1, last2)
3617
3618
print 'merge base is revision %s' % base_rev_id
3619
finally:
3620
branch2.unlock()
3621
finally:
3622
branch1.unlock()
3675
3623
3676
3624
3677
3625
class cmd_merge(Command):
3678
__doc__ = """Perform a three-way merge.
3626
"""Perform a three-way merge.
3679
3627
3680
3628
The source of the merge can be specified either in the form of a branch,
3681
3629
or in the form of a path to a file containing a merge directive generated
3710
3658
committed to record the result of the merge.
3711
3659
3712
3660
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.
3661
--force is given.
3719
3662
3720
3663
To select only some changes to merge, use "merge -i", which will prompt
3721
3664
you to apply each diff hunk and file change, similar to "shelve".
3736
3679
To apply a merge directive contained in /tmp/merge::
3737
3680
3738
3681
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
3682
"""
3747
3683
3748
3684
encoding_type = 'exact'
3806
3742
view_info = _get_view_info_for_change_reporter(tree)
3807
3743
change_reporter = delta._ChangeReporter(
3808
3744
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
3745
cleanups = []
3746
try:
3747
pb = ui.ui_factory.nested_progress_bar()
3748
cleanups.append(pb.finished)
3749
tree.lock_write()
3750
cleanups.append(tree.unlock)
3751
if location is not None:
3752
try:
3753
mergeable = bundle.read_mergeable_from_url(location,
3754
possible_transports=possible_transports)
3755
except errors.NotABundle:
3756
mergeable = None
3757
else:
3758
if uncommitted:
3759
raise errors.BzrCommandError('Cannot use --uncommitted'
3760
' with bundles or merge directives.')
3761
3762
if revision is not None:
3763
raise errors.BzrCommandError(
3764
'Cannot use -r with merge directives or bundles')
3765
merger, verified = _mod_merge.Merger.from_mergeable(tree,
3766
mergeable, pb)
3767
3768
if merger is None and uncommitted:
3769
if revision is not None and len(revision) > 0:
3770
raise errors.BzrCommandError('Cannot use --uncommitted and'
3771
' --revision at the same time.')
3772
merger = self.get_merger_from_uncommitted(tree, location, pb,
3773
cleanups)
3774
allow_pending = False
3775
3776
if merger is None:
3777
merger, allow_pending = self._get_merger_from_branch(tree,
3778
location, revision, remember, possible_transports, pb)
3779
3780
merger.merge_type = merge_type
3781
merger.reprocess = reprocess
3782
merger.show_base = show_base
3783
self.sanity_check_merger(merger)
3784
if (merger.base_rev_id == merger.other_rev_id and
3785
merger.other_rev_id is not None):
3786
note('Nothing to do.')
3787
return 0
3788
if pull:
3789
if merger.interesting_files is not None:
3790
raise errors.BzrCommandError('Cannot pull individual files')
3791
if (merger.base_rev_id == tree.last_revision()):
3792
result = tree.pull(merger.other_branch, False,
3793
merger.other_rev_id)
3794
result.report(self.outf)
3795
return 0
3796
if merger.this_basis is None:
3797
raise errors.BzrCommandError(
3798
"This branch has no commits."
3799
" (perhaps you would prefer 'bzr pull')")
3800
if preview:
3801
return self._do_preview(merger, cleanups)
3802
elif interactive:
3803
return self._do_interactive(merger, cleanups)
3818
3804
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):
3805
return self._do_merge(merger, change_reporter, allow_pending,
3806
verified)
3807
finally:
3808
for cleanup in reversed(cleanups):
3809
cleanup()
3810
3811
def _get_preview(self, merger, cleanups):
3869
3812
tree_merger = merger.make_merger()
3870
3813
tt = tree_merger.make_preview_transform()
3871
self.add_cleanup(tt.finalize)
3814
cleanups.append(tt.finalize)
3872
3815
result_tree = tt.get_preview_tree()
3873
3816
return result_tree
3874
3817
3875
def _do_preview(self, merger):
3818
def _do_preview(self, merger, cleanups):
3876
3819
from bzrlib.diff import show_diff_trees
3877
result_tree = self._get_preview(merger)
3820
result_tree = self._get_preview(merger, cleanups)
3878
3821
show_diff_trees(merger.this_tree, result_tree, self.outf,
3879
3822
old_label='', new_label='')
3880
3823
3890
3833
else:
3891
3834
return 0
3892
3835
3893
def _do_interactive(self, merger):
3836
def _do_interactive(self, merger, cleanups):
3894
3837
"""Perform an interactive merge.
3895
3838
3896
3839
This works by generating a preview tree of the merge, then using
3898
3841
and the preview tree.
3899
3842
"""
3900
3843
from bzrlib import shelf_ui
3901
result_tree = self._get_preview(merger)
3844
result_tree = self._get_preview(merger, cleanups)
3902
3845
writer = bzrlib.option.diff_writer_registry.get()
3903
3846
shelver = shelf_ui.Shelver(merger.this_tree, result_tree, destroy=True,
3904
3847
reporter=shelf_ui.ApplyReporter(),
3972
3915
allow_pending = True
3973
3916
return merger, allow_pending
3974
3917
3975
def get_merger_from_uncommitted(self, tree, location, pb):
3918
def get_merger_from_uncommitted(self, tree, location, pb, cleanups):
3976
3919
"""Get a merger for uncommitted changes.
3977
3920
3978
3921
:param tree: The tree the merger should apply to.
3979
3922
:param location: The location containing uncommitted changes.
3980
3923
:param pb: The progress bar to use for showing progress.
3924
:param cleanups: A list of operations to perform to clean up the
3925
temporary directories, unfinalized objects, etc.
3981
3926
"""
3982
3927
location = self._select_branch_location(tree, location)[0]
3983
3928
other_tree, other_path = WorkingTree.open_containing(location)
4035
3980
4036
3981
4037
3982
class cmd_remerge(Command):
4038
__doc__ = """Redo a merge.
3983
"""Redo a merge.
4039
3984
4040
3985
Use this if you want to try a different merge technique while resolving
4041
3986
conflicts. Some merge techniques are better than others, and remerge
4066
4011
4067
4012
def run(self, file_list=None, merge_type=None, show_base=False,
4068
4013
reprocess=False):
4069
from bzrlib.conflicts import restore
4070
4014
if merge_type is None:
4071
4015
merge_type = _mod_merge.Merge3Merger
4072
4016
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
4017
tree.lock_write()
4018
try:
4019
parents = tree.get_parent_ids()
4020
if len(parents) != 2:
4021
raise errors.BzrCommandError("Sorry, remerge only works after normal"
4022
" merges. Not cherrypicking or"
4023
" multi-merges.")
4024
repository = tree.branch.repository
4025
interesting_ids = None
4026
new_conflicts = []
4027
conflicts = tree.conflicts()
4028
if file_list is not None:
4029
interesting_ids = set()
4030
for filename in file_list:
4031
file_id = tree.path2id(filename)
4032
if file_id is None:
4033
raise errors.NotVersionedError(filename)
4034
interesting_ids.add(file_id)
4035
if tree.kind(file_id) != "directory":
4036
continue
4092
4037
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:
4038
for name, ie in tree.inventory.iter_entries(file_id):
4039
interesting_ids.add(ie.file_id)
4040
new_conflicts = conflicts.select_conflicts(tree, file_list)[0]
4041
else:
4042
# Remerge only supports resolving contents conflicts
4043
allowed_conflicts = ('text conflict', 'contents conflict')
4044
restore_files = [c.path for c in conflicts
4045
if c.typestring in allowed_conflicts]
4046
_mod_merge.transform_tree(tree, tree.basis_tree(), interesting_ids)
4047
tree.set_conflicts(ConflictList(new_conflicts))
4048
if file_list is not None:
4049
restore_files = file_list
4050
for filename in restore_files:
4051
try:
4052
restore(tree.abspath(filename))
4053
except errors.NotConflicted:
4054
pass
4055
# Disable pending merges, because the file texts we are remerging
4056
# have not had those merges performed. If we use the wrong parents
4057
# list, we imply that the working tree text has seen and rejected
4058
# all the changes from the other tree, when in fact those changes
4059
# have not yet been seen.
4060
pb = ui.ui_factory.nested_progress_bar()
4061
tree.set_parent_ids(parents[:1])
4106
4062
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()
4063
merger = _mod_merge.Merger.from_revision_ids(pb,
4064
tree, parents[1])
4065
merger.interesting_ids = interesting_ids
4066
merger.merge_type = merge_type
4067
merger.show_base = show_base
4068
merger.reprocess = reprocess
4069
conflicts = merger.do_merge()
4070
finally:
4071
tree.set_parent_ids(parents)
4072
pb.finished()
4123
4073
finally:
4124
tree.set_parent_ids(parents)
4074
tree.unlock()
4125
4075
if conflicts > 0:
4126
4076
return 1
4127
4077
else:
4129
4079
4130
4080
4131
4081
class cmd_revert(Command):
4132
__doc__ = """Revert files to a previous revision.
4082
"""Revert files to a previous revision.
4133
4083
4134
4084
Giving a list of files will revert only those files. Otherwise, all files
4135
4085
will be reverted. If the revision is not specified with '--revision', the
4154
4104
created as above. Directories containing unknown files will not be
4155
4105
deleted.
4156
4106
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
4107
The working tree contains a list of pending merged revisions, which will
4108
be included as parents in the next commit. Normally, revert clears that
4109
list as well as reverting the files. If any files are specified, revert
4110
leaves the pending merge list alone and reverts only the files. Use "bzr
4111
revert ." in the tree root to revert all files but keep the merge record,
4112
and "bzr revert --forget-merges" to clear the pending merge list without
4164
4113
reverting any files.
4165
4114
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
4115
Using "bzr revert --forget-merges", it is possible to apply the changes
4116
from an arbitrary merge as a single revision. To do this, perform the
4117
merge as desired. Then doing revert with the "--forget-merges" option will
4118
keep the content of the tree as it was, but it will clear the list of
4119
pending merges. The next commit will then contain all of the changes that
4120
would have been in the merge, but without any mention of the other parent
4121
revisions. Because this technique forgets where these changes originated,
4122
it may cause additional conflicts on later merges involving the source and
4174
4123
target branches.
4175
4124
"""
4176
4125
4186
4135
def run(self, revision=None, no_backup=False, file_list=None,
4187
4136
forget_merges=None):
4188
4137
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)
4138
tree.lock_write()
4139
try:
4140
if forget_merges:
4141
tree.set_parent_ids(tree.get_parent_ids()[:1])
4142
else:
4143
self._revert_tree_to_revision(tree, revision, file_list, no_backup)
4144
finally:
4145
tree.unlock()
4194
4146
4195
4147
@staticmethod
4196
4148
def _revert_tree_to_revision(tree, revision, file_list, no_backup):
4197
4149
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)
4150
pb = ui.ui_factory.nested_progress_bar()
4151
try:
4152
tree.revert(file_list, rev_tree, not no_backup, pb,
4153
report_changes=True)
4154
finally:
4155
pb.finished()
4200
4156
4201
4157
4202
4158
class cmd_assert_fail(Command):
4203
__doc__ = """Test reporting of assertion failures"""
4159
"""Test reporting of assertion failures"""
4204
4160
# intended just for use in testing
4205
4161
4206
4162
hidden = True
4210
4166
4211
4167
4212
4168
class cmd_help(Command):
4213
__doc__ = """Show help on a command or other topic.
4169
"""Show help on a command or other topic.
4214
4170
"""
4215
4171
4216
4172
_see_also = ['topics']
4229
4185
4230
4186
4231
4187
class cmd_shell_complete(Command):
4232
__doc__ = """Show appropriate completions for context.
4188
"""Show appropriate completions for context.
4233
4189
4234
4190
For a list of all available commands, say 'bzr shell-complete'.
4235
4191
"""
4244
4200
4245
4201
4246
4202
class cmd_missing(Command):
4247
__doc__ = """Show unmerged/unpulled revisions between two branches.
4203
"""Show unmerged/unpulled revisions between two branches.
4248
4204
4249
4205
OTHER_BRANCH may be local or remote.
4250
4206
4328
4284
restrict = 'remote'
4329
4285
4330
4286
local_branch = Branch.open_containing(u".")[0]
4331
self.add_cleanup(local_branch.lock_read().unlock)
4332
4333
4287
parent = local_branch.get_parent()
4334
4288
if other_branch is None:
4335
4289
other_branch = parent
4344
4298
remote_branch = Branch.open(other_branch)
4345
4299
if remote_branch.base == local_branch.base:
4346
4300
remote_branch = local_branch
4347
else:
4348
self.add_cleanup(remote_branch.lock_read().unlock)
4349
4301
4350
4302
local_revid_range = _revision_range_to_revid_range(
4351
4303
_get_revision_range(my_revision, local_branch,
4355
4307
_get_revision_range(revision,
4356
4308
remote_branch, self.name()))
4357
4309
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()
4310
local_branch.lock_read()
4311
try:
4312
remote_branch.lock_read()
4313
try:
4314
local_extra, remote_extra = find_unmerged(
4315
local_branch, remote_branch, restrict,
4316
backward=not reverse,
4317
include_merges=include_merges,
4318
local_revid_range=local_revid_range,
4319
remote_revid_range=remote_revid_range)
4320
4321
if log_format is None:
4322
registry = log.log_formatter_registry
4323
log_format = registry.get_default(local_branch)
4324
lf = log_format(to_file=self.outf,
4325
show_ids=show_ids,
4326
show_timezone='original')
4327
4328
status_code = 0
4329
if local_extra and not theirs_only:
4330
message("You have %d extra revision(s):\n" %
4331
len(local_extra))
4332
for revision in iter_log_revisions(local_extra,
4333
local_branch.repository,
4334
verbose):
4335
lf.log_revision(revision)
4336
printed_local = True
4337
status_code = 1
4338
else:
4339
printed_local = False
4340
4341
if remote_extra and not mine_only:
4342
if printed_local is True:
4343
message("\n\n\n")
4344
message("You are missing %d revision(s):\n" %
4345
len(remote_extra))
4346
for revision in iter_log_revisions(remote_extra,
4347
remote_branch.repository,
4348
verbose):
4349
lf.log_revision(revision)
4350
status_code = 1
4351
4352
if mine_only and not local_extra:
4353
# We checked local, and found nothing extra
4354
message('This branch is up to date.\n')
4355
elif theirs_only and not remote_extra:
4356
# We checked remote, and found nothing extra
4357
message('Other branch is up to date.\n')
4358
elif not (mine_only or theirs_only or local_extra or
4359
remote_extra):
4360
# We checked both branches, and neither one had extra
4361
# revisions
4362
message("Branches are up to date.\n")
4363
finally:
4364
remote_branch.unlock()
4365
finally:
4366
local_branch.unlock()
4408
4367
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)
4368
local_branch.lock_write()
4369
try:
4370
# handle race conditions - a parent might be set while we run.
4371
if local_branch.get_parent() is None:
4372
local_branch.set_parent(remote_branch.base)
4373
finally:
4374
local_branch.unlock()
4413
4375
return status_code
4414
4376
4415
4377
4416
4378
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
"""
4379
"""Compress the data within a repository."""
4434
4380
4435
4381
_see_also = ['repositories']
4436
4382
takes_args = ['branch_or_repo?']
4437
takes_options = [
4438
Option('clean-obsolete-packs', 'Delete obsolete packs to save disk space.'),
4439
]
4440
4383
4441
def run(self, branch_or_repo='.', clean_obsolete_packs=False):
4384
def run(self, branch_or_repo='.'):
4442
4385
dir = bzrdir.BzrDir.open_containing(branch_or_repo)[0]
4443
4386
try:
4444
4387
branch = dir.open_branch()
4445
4388
repository = branch.repository
4446
4389
except errors.NotBranchError:
4447
4390
repository = dir.open_repository()
4448
repository.pack(clean_obsolete_packs=clean_obsolete_packs)
4391
repository.pack()
4449
4392
4450
4393
4451
4394
class cmd_plugins(Command):
4452
__doc__ = """List the installed plugins.
4395
"""List the installed plugins.
4453
4396
4454
4397
This command displays the list of installed plugins including
4455
4398
version of plugin and a short description of each.
4462
4405
adding new commands, providing additional network transports and
4463
4406
customizing log output.
4464
4407
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.
4408
See the Bazaar web site, http://bazaar-vcs.org, for further
4409
information on plugins including where to find them and how to
4410
install them. Instructions are also provided there on how to
4411
write new plugins using the Python programming language.
4469
4412
"""
4470
4413
takes_options = ['verbose']
4471
4414
4486
4429
doc = '(no description)'
4487
4430
result.append((name_ver, doc, plugin.path()))
4488
4431
for name_ver, doc, path in sorted(result):
4489
self.outf.write("%s\n" % name_ver)
4490
self.outf.write(" %s\n" % doc)
4432
print name_ver
4433
print ' ', doc
4491
4434
if verbose:
4492
self.outf.write(" %s\n" % path)
4493
self.outf.write("\n")
4435
print ' ', path
4436
print
4494
4437
4495
4438
4496
4439
class cmd_testament(Command):
4497
__doc__ = """Show testament (signing-form) of a revision."""
4440
"""Show testament (signing-form) of a revision."""
4498
4441
takes_options = [
4499
4442
'revision',
4500
4443
Option('long', help='Produce long-format testament.'),
4512
4455
b = Branch.open_containing(branch)[0]
4513
4456
else:
4514
4457
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())
4458
b.lock_read()
4459
try:
4460
if revision is None:
4461
rev_id = b.last_revision()
4462
else:
4463
rev_id = revision[0].as_revision_id(b)
4464
t = testament_class.from_revision(b.repository, rev_id)
4465
if long:
4466
sys.stdout.writelines(t.as_text_lines())
4467
else:
4468
sys.stdout.write(t.as_short_text())
4469
finally:
4470
b.unlock()
4525
4471
4526
4472
4527
4473
class cmd_annotate(Command):
4528
__doc__ = """Show the origin of each line in a file.
4474
"""Show the origin of each line in a file.
4529
4475
4530
4476
This prints out the given file with an annotation on the left side
4531
4477
indicating which revision, author and date introduced the change.
4552
4498
wt, branch, relpath = \
4553
4499
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
4554
4500
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)
4501
wt.lock_read()
4502
else:
4503
branch.lock_read()
4504
try:
4505
tree = _get_one_revision_tree('annotate', revision, branch=branch)
4506
if wt is not None:
4507
file_id = wt.path2id(relpath)
4508
else:
4509
file_id = tree.path2id(relpath)
4510
if file_id is None:
4511
raise errors.NotVersionedError(filename)
4512
file_version = tree.inventory[file_id].revision
4513
if wt is not None and revision is None:
4514
# If there is a tree and we're not annotating historical
4515
# versions, annotate the working tree's content.
4516
annotate_file_tree(wt, file_id, self.outf, long, all,
4517
show_ids=show_ids)
4518
else:
4519
annotate_file(branch, file_version, file_id, long, all, self.outf,
4520
show_ids=show_ids)
4521
finally:
4522
if wt is not None:
4523
wt.unlock()
4524
else:
4525
branch.unlock()
4575
4526
4576
4527
4577
4528
class cmd_re_sign(Command):
4578
__doc__ = """Create a digital signature for an existing revision."""
4529
"""Create a digital signature for an existing revision."""
4579
4530
# TODO be able to replace existing ones.
4580
4531
4581
4532
hidden = True # is this right ?
4588
4539
if revision_id_list is None and revision is None:
4589
4540
raise errors.BzrCommandError('You must supply either --revision or a revision_id')
4590
4541
b = WorkingTree.open_containing(u'.')[0].branch
4591
self.add_cleanup(b.lock_write().unlock)
4592
return self._run(b, revision_id_list, revision)
4542
b.lock_write()
4543
try:
4544
return self._run(b, revision_id_list, revision)
4545
finally:
4546
b.unlock()
4593
4547
4594
4548
def _run(self, b, revision_id_list, revision):
4595
4549
import bzrlib.gpg as gpg
4640
4594
4641
4595
4642
4596
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.
4597
"""Convert the current branch into a checkout of the supplied branch.
4645
4598
4646
4599
Once converted into a checkout, commits must succeed on the master branch
4647
4600
before they will be applied to the local branch.
4665
4618
'This format does not remember old locations.')
4666
4619
else:
4667
4620
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')
4621
raise errors.BzrCommandError('No location supplied and no '
4622
'previous location known')
4673
4623
b_other = Branch.open(location)
4674
4624
try:
4675
4625
b.bind(b_other)
4681
4631
4682
4632
4683
4633
class cmd_unbind(Command):
4684
__doc__ = """Convert the current checkout into a regular branch.
4634
"""Convert the current checkout into a regular branch.
4685
4635
4686
4636
After unbinding, the local branch is considered independent and subsequent
4687
4637
commits will be local only.
4698
4648
4699
4649
4700
4650
class cmd_uncommit(Command):
4701
__doc__ = """Remove the last committed revision.
4651
"""Remove the last committed revision.
4702
4652
4703
4653
--verbose will print out what is being removed.
4704
4654
--dry-run will go through all the motions, but not actually
4744
4694
b = control.open_branch()
4745
4695
4746
4696
if tree is not None:
4747
self.add_cleanup(tree.lock_write().unlock)
4697
tree.lock_write()
4748
4698
else:
4749
self.add_cleanup(b.lock_write().unlock)
4750
return self._run(b, tree, dry_run, verbose, revision, force, local=local)
4699
b.lock_write()
4700
try:
4701
return self._run(b, tree, dry_run, verbose, revision, force,
4702
local=local)
4703
finally:
4704
if tree is not None:
4705
tree.unlock()
4706
else:
4707
b.unlock()
4751
4708
4752
4709
def _run(self, b, tree, dry_run, verbose, revision, force, local=False):
4753
4710
from bzrlib.log import log_formatter, show_log
4785
4742
end_revision=last_revno)
4786
4743
4787
4744
if dry_run:
4788
self.outf.write('Dry-run, pretending to remove'
4789
' the above revisions.\n')
4745
print 'Dry-run, pretending to remove the above revisions.'
4746
if not force:
4747
val = raw_input('Press <enter> to continue')
4790
4748
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
4749
print 'The above revision(s) will be removed.'
4750
if not force:
4751
val = raw_input('Are you sure [y/N]? ')
4752
if val.lower() not in ('y', 'yes'):
4753
print 'Canceled'
4754
return 0
4797
4755
4798
4756
mutter('Uncommitting from {%s} to {%s}',
4799
4757
last_rev_id, rev_id)
4800
4758
uncommit(b, tree=tree, dry_run=dry_run, verbose=verbose,
4801
4759
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)
4760
note('You can restore the old tip by running:\n'
4761
' bzr pull . -r revid:%s', last_rev_id)
4804
4762
4805
4763
4806
4764
class cmd_break_lock(Command):
4807
__doc__ = """Break a dead lock on a repository, branch or working directory.
4765
"""Break a dead lock on a repository, branch or working directory.
4808
4766
4809
4767
CAUTION: Locks should only be broken when you are sure that the process
4810
4768
holding the lock has been stopped.
4811
4769
4812
You can get information on what locks are open via the 'bzr info
4813
[location]' command.
4770
You can get information on what locks are open via the 'bzr info' command.
4814
4771
4815
4772
:Examples:
4816
4773
bzr break-lock
4817
bzr break-lock bzr+ssh://example.com/bzr/foo
4818
4774
"""
4819
4775
takes_args = ['location?']
4820
4776
4829
4785
4830
4786
4831
4787
class cmd_wait_until_signalled(Command):
4832
__doc__ = """Test helper for test_start_and_stop_bzr_subprocess_send_signal.
4788
"""Test helper for test_start_and_stop_bzr_subprocess_send_signal.
4833
4789
4834
4790
This just prints a line to signal when it is ready, then blocks on stdin.
4835
4791
"""
4843
4799
4844
4800
4845
4801
class cmd_serve(Command):
4846
__doc__ = """Run the bzr server."""
4802
"""Run the bzr server."""
4847
4803
4848
4804
aliases = ['server']
4849
4805
4909
4865
4910
4866
4911
4867
class cmd_join(Command):
4912
__doc__ = """Combine a tree into its containing tree.
4868
"""Combine a tree into its containing tree.
4913
4869
4914
4870
This command requires the target tree to be in a rich-root format.
4915
4871
4955
4911
4956
4912
4957
4913
class cmd_split(Command):
4958
__doc__ = """Split a subdirectory of a tree into a separate tree.
4914
"""Split a subdirectory of a tree into a separate tree.
4959
4915
4960
4916
This command will produce a target tree in a format that supports
4961
4917
rich roots, like 'rich-root' or 'rich-root-pack'. These formats cannot be
4981
4937
4982
4938
4983
4939
class cmd_merge_directive(Command):
4984
__doc__ = """Generate a merge directive for auto-merge tools.
4940
"""Generate a merge directive for auto-merge tools.
4985
4941
4986
4942
A directive requests a merge to be performed, and also provides all the
4987
4943
information necessary to do so. This means it must either include a
5080
5036
5081
5037
5082
5038
class cmd_send(Command):
5083
__doc__ = """Mail or create a merge-directive for submitting changes.
5039
"""Mail or create a merge-directive for submitting changes.
5084
5040
5085
5041
A merge directive provides many things needed for requesting merges:
5086
5042
5092
5048
directly from the merge directive, without retrieving data from a
5093
5049
branch.
5094
5050
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.
5051
If --no-bundle is specified, then public_branch is needed (and must be
5052
up-to-date), so that the receiver can perform the merge using the
5053
public_branch. The public_branch is always included if known, so that
5054
people can check it later.
5055
5056
The submit branch defaults to the parent, but can be overridden. Both
5057
submit branch and public branch will be remembered if supplied.
5058
5059
If a public_branch is known for the submit_branch, that public submit
5060
branch is used in the merge instructions. This means that a local mirror
5061
can be used as your actual submit branch, once you have set public_branch
5062
for that mirror.
5121
5063
5122
5064
Mail is sent using your preferred mail program. This should be transparent
5123
5065
on Windows (it uses MAPI). On Linux, it requires the xdg-email utility.
5143
5085
5144
5086
The merge directives created by bzr send may be applied using bzr merge or
5145
5087
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
5088
"""
5151
5089
5152
5090
encoding_type = 'exact'
5168
5106
short_name='f',
5169
5107
type=unicode),
5170
5108
Option('output', short_name='o',
5171
help='Write merge directive to this file or directory; '
5109
help='Write merge directive to this file; '
5172
5110
'use - for stdout.',
5173
5111
type=unicode),
5174
5112
Option('strict',
5197
5135
5198
5136
5199
5137
class cmd_bundle_revisions(cmd_send):
5200
__doc__ = """Create a merge-directive for submitting changes.
5138
"""Create a merge-directive for submitting changes.
5201
5139
5202
5140
A merge directive provides many things needed for requesting merges:
5203
5141
5270
5208
5271
5209
5272
5210
class cmd_tag(Command):
5273
__doc__ = """Create, remove or modify a tag naming a revision.
5211
"""Create, remove or modify a tag naming a revision.
5274
5212
5275
5213
Tags give human-meaningful names to revisions. Commands that take a -r
5276
5214
(--revision) option can be given -rtag:X, where X is any previously
5284
5222
5285
5223
To rename a tag (change the name but keep it on the same revsion), run ``bzr
5286
5224
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
5225
"""
5293
5226
5294
5227
_see_also = ['commit', 'tags']
5295
takes_args = ['tag_name?']
5228
takes_args = ['tag_name']
5296
5229
takes_options = [
5297
5230
Option('delete',
5298
5231
help='Delete this tag rather than placing it.',
5308
5241
'revision',
5309
5242
]
5310
5243
5311
def run(self, tag_name=None,
5244
def run(self, tag_name,
5312
5245
delete=None,
5313
5246
directory='.',
5314
5247
force=None,
5315
5248
revision=None,
5316
5249
):
5317
5250
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)
5251
branch.lock_write()
5252
try:
5253
if delete:
5254
branch.tags.delete_tag(tag_name)
5255
self.outf.write('Deleted tag %s.\n' % tag_name)
5331
5256
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)
5257
if revision:
5258
if len(revision) != 1:
5259
raise errors.BzrCommandError(
5260
"Tags can only be placed on a single revision, "
5261
"not on a range")
5262
revision_id = revision[0].as_revision_id(branch)
5263
else:
5264
revision_id = branch.last_revision()
5265
if (not force) and branch.tags.has_tag(tag_name):
5266
raise errors.TagAlreadyExists(tag_name)
5267
branch.tags.set_tag(tag_name, revision_id)
5268
self.outf.write('Created tag %s.\n' % tag_name)
5269
finally:
5270
branch.unlock()
5342
5271
5343
5272
5344
5273
class cmd_tags(Command):
5345
__doc__ = """List tags.
5274
"""List tags.
5346
5275
5347
5276
This command shows a table of tag names and the revisions they reference.
5348
5277
"""
5376
5305
if not tags:
5377
5306
return
5378
5307
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()
5308
branch.lock_read()
5309
try:
5310
if revision:
5311
graph = branch.repository.get_graph()
5312
rev1, rev2 = _get_revision_range(revision, branch, self.name())
5313
revid1, revid2 = rev1.rev_id, rev2.rev_id
5314
# only show revisions between revid1 and revid2 (inclusive)
5315
tags = [(tag, revid) for tag, revid in tags if
5316
graph.is_between(revid, revid1, revid2)]
5317
if sort == 'alpha':
5318
tags.sort()
5319
elif sort == 'time':
5320
timestamps = {}
5321
for tag, revid in tags:
5322
try:
5323
revobj = branch.repository.get_revision(revid)
5324
except errors.NoSuchRevision:
5325
timestamp = sys.maxint # place them at the end
5326
else:
5327
timestamp = revobj.timestamp
5328
timestamps[revid] = timestamp
5329
tags.sort(key=lambda x: timestamps[x[1]])
5330
if not show_ids:
5331
# [ (tag, revid), ... ] -> [ (tag, dotted_revno), ... ]
5332
for index, (tag, revid) in enumerate(tags):
5333
try:
5334
revno = branch.revision_id_to_dotted_revno(revid)
5335
if isinstance(revno, tuple):
5336
revno = '.'.join(map(str, revno))
5337
except errors.NoSuchRevision:
5338
# Bad tag data/merges can lead to tagged revisions
5339
# which are not in this branch. Fail gracefully ...
5340
revno = '?'
5341
tags[index] = (tag, revno)
5342
finally:
5343
branch.unlock()
5413
5344
for tag, revspec in tags:
5414
5345
self.outf.write('%-20s %s\n' % (tag, revspec))
5415
5346
5416
5347
5417
5348
class cmd_reconfigure(Command):
5418
__doc__ = """Reconfigure the type of a bzr directory.
5349
"""Reconfigure the type of a bzr directory.
5419
5350
5420
5351
A target configuration must be specified.
5421
5352
5506
5437
5507
5438
5508
5439
class cmd_switch(Command):
5509
__doc__ = """Set the branch of a checkout and update.
5440
"""Set the branch of a checkout and update.
5510
5441
5511
5442
For lightweight checkouts, this changes the branch being referenced.
5512
5443
For heavyweight checkouts, this checks that there are no local commits
5528
5459
that of the master.
5529
5460
"""
5530
5461
5531
takes_args = ['to_location?']
5462
takes_args = ['to_location']
5532
5463
takes_options = [Option('force',
5533
5464
help='Switch even if local commits will be lost.'),
5534
'revision',
5535
5465
Option('create-branch', short_name='b',
5536
5466
help='Create the target branch from this one before'
5537
5467
' switching to it.'),
5538
]
5468
]
5539
5469
5540
def run(self, to_location=None, force=False, create_branch=False,
5541
revision=None):
5470
def run(self, to_location, force=False, create_branch=False):
5542
5471
from bzrlib import switch
5543
5472
tree_location = '.'
5544
revision = _get_one_revision('switch', revision)
5545
5473
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
5474
try:
5552
5475
branch = control_dir.open_branch()
5553
5476
had_explicit_nick = branch.get_config().has_explicit_nickname()
5558
5481
if branch is None:
5559
5482
raise errors.BzrCommandError('cannot create branch without'
5560
5483
' source branch')
5561
to_location = directory_service.directories.dereference(
5562
to_location)
5563
5484
if '/' not in to_location and '\\' not in to_location:
5564
5485
# This path is meant to be relative to the existing branch
5565
5486
this_url = self._get_branch_location(control_dir)
5567
5488
to_branch = branch.bzrdir.sprout(to_location,
5568
5489
possible_transports=[branch.bzrdir.root_transport],
5569
5490
source_branch=branch).open_branch()
5491
# try:
5492
# from_branch = control_dir.open_branch()
5493
# except errors.NotBranchError:
5494
# raise BzrCommandError('Cannot create a branch from this'
5495
# ' location when we cannot open this branch')
5496
# from_branch.bzrdir.sprout(
5497
pass
5570
5498
else:
5571
5499
try:
5572
5500
to_branch = Branch.open(to_location)
5574
5502
this_url = self._get_branch_location(control_dir)
5575
5503
to_branch = Branch.open(
5576
5504
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)
5505
switch.switch(control_dir, to_branch, force)
5580
5506
if had_explicit_nick:
5581
5507
branch = control_dir.open_branch() #get the new branch!
5582
5508
branch.nick = to_branch.nick
5602
5528
5603
5529
5604
5530
class cmd_view(Command):
5605
__doc__ = """Manage filtered views.
5531
"""Manage filtered views.
5606
5532
5607
5533
Views provide a mask over the tree so that users can focus on
5608
5534
a subset of a tree when doing their work. After creating a view,
5756
5682
5757
5683
5758
5684
class cmd_hooks(Command):
5759
__doc__ = """Show hooks."""
5685
"""Show hooks."""
5760
5686
5761
5687
hidden = True
5762
5688
5775
5701
self.outf.write(" <no hooks installed>\n")
5776
5702
5777
5703
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
5704
class cmd_shelve(Command):
5804
__doc__ = """Temporarily set aside some changes from the current tree.
5705
"""Temporarily set aside some changes from the current tree.
5805
5706
5806
5707
Shelve allows you to temporarily put changes you've made "on the shelf",
5807
5708
ie. out of the way, until a later time when you can bring them back from
5860
5761
5861
5762
def run_for_list(self):
5862
5763
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
5764
tree.lock_read()
5765
try:
5766
manager = tree.get_shelf_manager()
5767
shelves = manager.active_shelves()
5768
if len(shelves) == 0:
5769
note('No shelved changes.')
5770
return 0
5771
for shelf_id in reversed(shelves):
5772
message = manager.get_metadata(shelf_id).get('message')
5773
if message is None:
5774
message = '<no message>'
5775
self.outf.write('%3d: %s\n' % (shelf_id, message))
5776
return 1
5777
finally:
5778
tree.unlock()
5875
5779
5876
5780
5877
5781
class cmd_unshelve(Command):
5878
__doc__ = """Restore shelved changes.
5782
"""Restore shelved changes.
5879
5783
5880
5784
By default, the most recently shelved changes are restored. However if you
5881
5785
specify a shelf by id those changes will be restored instead. This works
5889
5793
enum_switch=False, value_switches=True,
5890
5794
apply="Apply changes and remove from the shelf.",
5891
5795
dry_run="Show changes, but do not apply or remove them.",
5892
preview="Instead of unshelving the changes, show the diff that "
5893
"would result from unshelving.",
5894
delete_only="Delete changes without applying them.",
5895
keep="Apply changes but don't delete them.",
5796
delete_only="Delete changes without applying them."
5896
5797
)
5897
5798
]
5898
5799
_see_also = ['shelve']
5907
5808
5908
5809
5909
5810
class cmd_clean_tree(Command):
5910
__doc__ = """Remove unwanted files from working tree.
5811
"""Remove unwanted files from working tree.
5911
5812
5912
5813
By default, only unknown files, not ignored files, are deleted. Versioned
5913
5814
files are never deleted.
5941
5842
5942
5843
5943
5844
class cmd_reference(Command):
5944
__doc__ = """list, view and set branch locations for nested trees.
5845
"""list, view and set branch locations for nested trees.
5945
5846
5946
5847
If no arguments are provided, lists the branch locations for nested trees.
5947
5848
If one argument is provided, display the branch location for that tree.
5987
5888
self.outf.write('%s %s\n' % (path, location))
5988
5889
5989
5890
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)
5891
# these get imported and then picked up by the scan for cmd_*
5892
# TODO: Some more consistent way to split command definitions across files;
5893
# we do need to load at least some information about them to know of
5894
# aliases. ideally we would avoid loading the implementation until the
5895
# details were needed.
5896
from bzrlib.cmd_version_info import cmd_version_info
5897
from bzrlib.conflicts import cmd_resolve, cmd_conflicts, restore
5898
from bzrlib.bundle.commands import (
5899
cmd_bundle_info,
5900
)
5901
from bzrlib.foreign import cmd_dpush
5902
from bzrlib.sign_my_commits import cmd_sign_my_commits
5903
from bzrlib.weave_commands import cmd_versionedfile_list, \
5904
cmd_weave_plan_merge, cmd_weave_merge_text
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0