« back to all changes in this revision
Viewing changes to bzrlib/builtins.py
- browse files at revision 4833
- compare with another revision
- download diff
- download tarball
- view history from revision 4833
- Committer: Canonical.com Patch Queue Manager
- Date: 2009-11-27 23:21:36 UTC
- mfrom: (4585.1.19 foreign-tests-4)
- Revision ID: pqm@pqm.ubuntu.com-20091127232136-bkm3vrye2wt4odbw
(Jelmer) Add basic tests for foreign repositories.
- 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,
44
43
reconfigure,
45
44
rename_map,
46
45
revision as _mod_revision,
47
static_tuple,
48
46
symbol_versioning,
49
47
timestamp,
50
48
transport,
54
52
)
55
53
from bzrlib.branch import Branch
56
54
from bzrlib.conflicts import ConflictList
57
from bzrlib.transport import memory
58
55
from bzrlib.revisionspec import RevisionSpec, RevisionInfo
59
56
from bzrlib.smtp_connection import SMTPConnection
60
57
from bzrlib.workingtree import WorkingTree
61
58
""")
62
59
63
from bzrlib.commands import (
64
Command,
65
builtin_command_registry,
66
display_command,
67
)
60
from bzrlib.commands import Command, display_command
68
61
from bzrlib.option import (
69
62
ListOption,
70
63
Option,
239
232
# opens the branch?)
240
233
241
234
class cmd_status(Command):
242
__doc__ = """Display status summary.
235
"""Display status summary.
243
236
244
237
This reports on versioned and unknown files, reporting them
245
238
grouped by state. Possible states are:
265
258
unknown
266
259
Not versioned and not matching an ignore pattern.
267
260
268
Additionally for directories, symlinks and files with an executable
269
bit, Bazaar indicates their type using a trailing character: '/', '@'
270
or '*' respectively.
271
272
261
To see ignored files use 'bzr ignored'. For details on the
273
262
changes to file texts, use 'bzr diff'.
274
263
332
321
333
322
334
323
class cmd_cat_revision(Command):
335
__doc__ = """Write out metadata for a revision.
324
"""Write out metadata for a revision.
336
325
337
326
The revision to print can either be specified by a specific
338
327
revision identifier, or you can use --revision.
344
333
# cat-revision is more for frontends so should be exact
345
334
encoding = 'strict'
346
335
347
def print_revision(self, revisions, revid):
348
stream = revisions.get_record_stream([(revid,)], 'unordered', True)
349
record = stream.next()
350
if record.storage_kind == 'absent':
351
raise errors.NoSuchRevision(revisions, revid)
352
revtext = record.get_bytes_as('fulltext')
353
self.outf.write(revtext.decode('utf-8'))
354
355
336
@display_command
356
337
def run(self, revision_id=None, revision=None):
357
338
if revision_id is not None and revision is not None:
362
343
' --revision or a revision_id')
363
344
b = WorkingTree.open_containing(u'.')[0].branch
364
345
365
revisions = b.repository.revisions
366
if revisions is None:
367
raise errors.BzrCommandError('Repository %r does not support '
368
'access to raw revision texts')
346
# TODO: jam 20060112 should cat-revision always output utf-8?
347
if revision_id is not None:
348
revision_id = osutils.safe_revision_id(revision_id, warn=False)
349
try:
350
self.outf.write(b.repository.get_revision_xml(revision_id).decode('utf-8'))
351
except errors.NoSuchRevision:
352
msg = "The repository %s contains no revision %s." % (b.repository.base,
353
revision_id)
354
raise errors.BzrCommandError(msg)
355
elif revision is not None:
356
for rev in revision:
357
if rev is None:
358
raise errors.BzrCommandError('You cannot specify a NULL'
359
' revision.')
360
rev_id = rev.as_revision_id(b)
361
self.outf.write(b.repository.get_revision_xml(rev_id).decode('utf-8'))
369
362
370
b.repository.lock_read()
371
try:
372
# TODO: jam 20060112 should cat-revision always output utf-8?
373
if revision_id is not None:
374
revision_id = osutils.safe_revision_id(revision_id, warn=False)
375
try:
376
self.print_revision(revisions, revision_id)
377
except errors.NoSuchRevision:
378
msg = "The repository %s contains no revision %s." % (
379
b.repository.base, revision_id)
380
raise errors.BzrCommandError(msg)
381
elif revision is not None:
382
for rev in revision:
383
if rev is None:
384
raise errors.BzrCommandError(
385
'You cannot specify a NULL revision.')
386
rev_id = rev.as_revision_id(b)
387
self.print_revision(revisions, rev_id)
388
finally:
389
b.repository.unlock()
390
391
363
392
364
class cmd_dump_btree(Command):
393
__doc__ = """Dump the contents of a btree index file to stdout.
365
"""Dump the contents of a btree index file to stdout.
394
366
395
367
PATH is a btree index file, it can be any URL. This includes things like
396
368
.bzr/repository/pack-names, or .bzr/repository/indices/a34b3a...ca4a4.iix
460
432
for node in bt.iter_all_entries():
461
433
# Node is made up of:
462
434
# (index, key, value, [references])
463
try:
464
refs = node[3]
465
except IndexError:
466
refs_as_tuples = None
467
else:
468
refs_as_tuples = static_tuple.as_tuples(refs)
435
refs_as_tuples = tuple([tuple([tuple(ref) for ref in ref_list])
436
for ref_list in node[3]])
469
437
as_tuple = (tuple(node[1]), node[2], refs_as_tuples)
470
438
self.outf.write('%s\n' % (as_tuple,))
471
439
472
440
473
441
class cmd_remove_tree(Command):
474
__doc__ = """Remove the working tree from a given branch/checkout.
442
"""Remove the working tree from a given branch/checkout.
475
443
476
444
Since a lightweight checkout is little more than a working tree
477
445
this will refuse to run against one.
479
447
To re-create the working tree, use "bzr checkout".
480
448
"""
481
449
_see_also = ['checkout', 'working-trees']
482
takes_args = ['location*']
450
takes_args = ['location?']
483
451
takes_options = [
484
452
Option('force',
485
453
help='Remove the working tree even if it has '
486
454
'uncommitted changes.'),
487
455
]
488
456
489
def run(self, location_list, force=False):
490
if not location_list:
491
location_list=['.']
492
493
for location in location_list:
494
d = bzrdir.BzrDir.open(location)
495
496
try:
497
working = d.open_workingtree()
498
except errors.NoWorkingTree:
499
raise errors.BzrCommandError("No working tree to remove")
500
except errors.NotLocalUrl:
501
raise errors.BzrCommandError("You cannot remove the working tree"
502
" of a remote path")
503
if not force:
504
if (working.has_changes()):
505
raise errors.UncommittedChanges(working)
506
507
if working.user_url != working.branch.user_url:
508
raise errors.BzrCommandError("You cannot remove the working tree"
509
" from a lightweight checkout")
510
511
d.destroy_workingtree()
457
def run(self, location='.', force=False):
458
d = bzrdir.BzrDir.open(location)
459
460
try:
461
working = d.open_workingtree()
462
except errors.NoWorkingTree:
463
raise errors.BzrCommandError("No working tree to remove")
464
except errors.NotLocalUrl:
465
raise errors.BzrCommandError("You cannot remove the working tree"
466
" of a remote path")
467
if not force:
468
if (working.has_changes()):
469
raise errors.UncommittedChanges(working)
470
471
working_path = working.bzrdir.root_transport.base
472
branch_path = working.branch.bzrdir.root_transport.base
473
if working_path != branch_path:
474
raise errors.BzrCommandError("You cannot remove the working tree"
475
" from a lightweight checkout")
476
477
d.destroy_workingtree()
512
478
513
479
514
480
class cmd_revno(Command):
515
__doc__ = """Show current revision number.
481
"""Show current revision number.
516
482
517
483
This is equal to the number of revisions on this branch.
518
484
"""
528
494
if tree:
529
495
try:
530
496
wt = WorkingTree.open_containing(location)[0]
531
self.add_cleanup(wt.lock_read().unlock)
497
wt.lock_read()
532
498
except (errors.NoWorkingTree, errors.NotLocalUrl):
533
499
raise errors.NoWorkingTree(location)
534
revid = wt.last_revision()
535
500
try:
536
revno_t = wt.branch.revision_id_to_dotted_revno(revid)
537
except errors.NoSuchRevision:
538
revno_t = ('???',)
539
revno = ".".join(str(n) for n in revno_t)
501
revid = wt.last_revision()
502
try:
503
revno_t = wt.branch.revision_id_to_dotted_revno(revid)
504
except errors.NoSuchRevision:
505
revno_t = ('???',)
506
revno = ".".join(str(n) for n in revno_t)
507
finally:
508
wt.unlock()
540
509
else:
541
510
b = Branch.open_containing(location)[0]
542
self.add_cleanup(b.lock_read().unlock)
543
revno = b.revno()
544
self.cleanup_now()
511
b.lock_read()
512
try:
513
revno = b.revno()
514
finally:
515
b.unlock()
516
545
517
self.outf.write(str(revno) + '\n')
546
518
547
519
548
520
class cmd_revision_info(Command):
549
__doc__ = """Show revision number and revision id for a given revision identifier.
521
"""Show revision number and revision id for a given revision identifier.
550
522
"""
551
523
hidden = True
552
524
takes_args = ['revision_info*']
568
540
try:
569
541
wt = WorkingTree.open_containing(directory)[0]
570
542
b = wt.branch
571
self.add_cleanup(wt.lock_read().unlock)
543
wt.lock_read()
572
544
except (errors.NoWorkingTree, errors.NotLocalUrl):
573
545
wt = None
574
546
b = Branch.open_containing(directory)[0]
575
self.add_cleanup(b.lock_read().unlock)
576
revision_ids = []
577
if revision is not None:
578
revision_ids.extend(rev.as_revision_id(b) for rev in revision)
579
if revision_info_list is not None:
580
for rev_str in revision_info_list:
581
rev_spec = RevisionSpec.from_string(rev_str)
582
revision_ids.append(rev_spec.as_revision_id(b))
583
# No arguments supplied, default to the last revision
584
if len(revision_ids) == 0:
585
if tree:
586
if wt is None:
587
raise errors.NoWorkingTree(directory)
588
revision_ids.append(wt.last_revision())
547
b.lock_read()
548
try:
549
revision_ids = []
550
if revision is not None:
551
revision_ids.extend(rev.as_revision_id(b) for rev in revision)
552
if revision_info_list is not None:
553
for rev_str in revision_info_list:
554
rev_spec = RevisionSpec.from_string(rev_str)
555
revision_ids.append(rev_spec.as_revision_id(b))
556
# No arguments supplied, default to the last revision
557
if len(revision_ids) == 0:
558
if tree:
559
if wt is None:
560
raise errors.NoWorkingTree(directory)
561
revision_ids.append(wt.last_revision())
562
else:
563
revision_ids.append(b.last_revision())
564
565
revinfos = []
566
maxlen = 0
567
for revision_id in revision_ids:
568
try:
569
dotted_revno = b.revision_id_to_dotted_revno(revision_id)
570
revno = '.'.join(str(i) for i in dotted_revno)
571
except errors.NoSuchRevision:
572
revno = '???'
573
maxlen = max(maxlen, len(revno))
574
revinfos.append([revno, revision_id])
575
finally:
576
if wt is None:
577
b.unlock()
589
578
else:
590
revision_ids.append(b.last_revision())
591
592
revinfos = []
593
maxlen = 0
594
for revision_id in revision_ids:
595
try:
596
dotted_revno = b.revision_id_to_dotted_revno(revision_id)
597
revno = '.'.join(str(i) for i in dotted_revno)
598
except errors.NoSuchRevision:
599
revno = '???'
600
maxlen = max(maxlen, len(revno))
601
revinfos.append([revno, revision_id])
602
603
self.cleanup_now()
579
wt.unlock()
580
604
581
for ri in revinfos:
605
582
self.outf.write('%*s %s\n' % (maxlen, ri[0], ri[1]))
606
583
607
584
608
585
class cmd_add(Command):
609
__doc__ = """Add specified files or directories.
586
"""Add specified files or directories.
610
587
611
588
In non-recursive mode, all the named items are added, regardless
612
589
of whether they were previously ignored. A warning is given if
677
654
should_print=(not is_quiet()))
678
655
679
656
if base_tree:
680
self.add_cleanup(base_tree.lock_read().unlock)
681
tree, file_list = tree_files_for_add(file_list)
682
added, ignored = tree.smart_add(file_list, not
683
no_recurse, action=action, save=not dry_run)
684
self.cleanup_now()
657
base_tree.lock_read()
658
try:
659
tree, file_list = tree_files_for_add(file_list)
660
added, ignored = tree.smart_add(file_list, not
661
no_recurse, action=action, save=not dry_run)
662
finally:
663
if base_tree is not None:
664
base_tree.unlock()
685
665
if len(ignored) > 0:
686
666
if verbose:
687
667
for glob in sorted(ignored.keys()):
691
671
692
672
693
673
class cmd_mkdir(Command):
694
__doc__ = """Create a new versioned directory.
674
"""Create a new versioned directory.
695
675
696
676
This is equivalent to creating the directory and then adding it.
697
677
"""
701
681
702
682
def run(self, dir_list):
703
683
for d in dir_list:
684
os.mkdir(d)
704
685
wt, dd = WorkingTree.open_containing(d)
705
base = os.path.dirname(dd)
706
id = wt.path2id(base)
707
if id != None:
708
os.mkdir(d)
709
wt.add([dd])
710
self.outf.write('added %s\n' % d)
711
else:
712
raise errors.NotVersionedError(path=base)
686
wt.add([dd])
687
self.outf.write('added %s\n' % d)
713
688
714
689
715
690
class cmd_relpath(Command):
716
__doc__ = """Show path of a file relative to root"""
691
"""Show path of a file relative to root"""
717
692
718
693
takes_args = ['filename']
719
694
hidden = True
728
703
729
704
730
705
class cmd_inventory(Command):
731
__doc__ = """Show inventory of the current working copy or a revision.
706
"""Show inventory of the current working copy or a revision.
732
707
733
708
It is possible to limit the output to a particular entry
734
709
type using the --kind option. For example: --kind file.
755
730
756
731
revision = _get_one_revision('inventory', revision)
757
732
work_tree, file_list = tree_files(file_list)
758
self.add_cleanup(work_tree.lock_read().unlock)
759
if revision is not None:
760
tree = revision.as_tree(work_tree.branch)
761
762
extra_trees = [work_tree]
763
self.add_cleanup(tree.lock_read().unlock)
764
else:
765
tree = work_tree
766
extra_trees = []
767
768
if file_list is not None:
769
file_ids = tree.paths2ids(file_list, trees=extra_trees,
770
require_versioned=True)
771
# find_ids_across_trees may include some paths that don't
772
# exist in 'tree'.
773
entries = sorted((tree.id2path(file_id), tree.inventory[file_id])
774
for file_id in file_ids if file_id in tree)
775
else:
776
entries = tree.inventory.entries()
777
778
self.cleanup_now()
733
work_tree.lock_read()
734
try:
735
if revision is not None:
736
tree = revision.as_tree(work_tree.branch)
737
738
extra_trees = [work_tree]
739
tree.lock_read()
740
else:
741
tree = work_tree
742
extra_trees = []
743
744
if file_list is not None:
745
file_ids = tree.paths2ids(file_list, trees=extra_trees,
746
require_versioned=True)
747
# find_ids_across_trees may include some paths that don't
748
# exist in 'tree'.
749
entries = sorted((tree.id2path(file_id), tree.inventory[file_id])
750
for file_id in file_ids if file_id in tree)
751
else:
752
entries = tree.inventory.entries()
753
finally:
754
tree.unlock()
755
if tree is not work_tree:
756
work_tree.unlock()
757
779
758
for path, entry in entries:
780
759
if kind and kind != entry.kind:
781
760
continue
787
766
788
767
789
768
class cmd_mv(Command):
790
__doc__ = """Move or rename a file.
769
"""Move or rename a file.
791
770
792
771
:Usage:
793
772
bzr mv OLDNAME NEWNAME
826
805
if len(names_list) < 2:
827
806
raise errors.BzrCommandError("missing file argument")
828
807
tree, rel_names = tree_files(names_list, canonicalize=False)
829
self.add_cleanup(tree.lock_tree_write().unlock)
830
self._run(tree, names_list, rel_names, after)
808
tree.lock_tree_write()
809
try:
810
self._run(tree, names_list, rel_names, after)
811
finally:
812
tree.unlock()
831
813
832
814
def run_auto(self, names_list, after, dry_run):
833
815
if names_list is not None and len(names_list) > 1:
837
819
raise errors.BzrCommandError('--after cannot be specified with'
838
820
' --auto.')
839
821
work_tree, file_list = tree_files(names_list, default_branch='.')
840
self.add_cleanup(work_tree.lock_tree_write().unlock)
841
rename_map.RenameMap.guess_renames(work_tree, dry_run)
822
work_tree.lock_tree_write()
823
try:
824
rename_map.RenameMap.guess_renames(work_tree, dry_run)
825
finally:
826
work_tree.unlock()
842
827
843
828
def _run(self, tree, names_list, rel_names, after):
844
829
into_existing = osutils.isdir(names_list[-1])
922
907
923
908
924
909
class cmd_pull(Command):
925
__doc__ = """Turn this branch into a mirror of another branch.
910
"""Turn this branch into a mirror of another branch.
926
911
927
By default, this command only works on branches that have not diverged.
928
Branches are considered diverged if the destination branch's most recent
929
commit is one that has not been merged (directly or indirectly) into the
930
parent.
912
This command only works on branches that have not diverged. Branches are
913
considered diverged if the destination branch's most recent commit is one
914
that has not been merged (directly or indirectly) into the parent.
931
915
932
916
If branches have diverged, you can use 'bzr merge' to integrate the changes
933
917
from one into the other. Once one branch has merged, the other should
934
918
be able to pull it again.
935
919
936
If you want to replace your local changes and just want your branch to
937
match the remote one, use pull --overwrite. This will work even if the two
938
branches have diverged.
920
If you want to forget your local changes and just update your branch to
921
match the remote one, use pull --overwrite.
939
922
940
923
If there is no default location set, the first pull will set it. After
941
924
that, you can omit the location to use the default. To change the
977
960
try:
978
961
tree_to = WorkingTree.open_containing(directory)[0]
979
962
branch_to = tree_to.branch
980
self.add_cleanup(tree_to.lock_write().unlock)
981
963
except errors.NoWorkingTree:
982
964
tree_to = None
983
965
branch_to = Branch.open_containing(directory)[0]
984
self.add_cleanup(branch_to.lock_write().unlock)
985
966
986
967
if local and not branch_to.get_bound_location():
987
968
raise errors.LocalRequiresBoundBranch()
988
969
1018
999
else:
1019
1000
branch_from = Branch.open(location,
1020
1001
possible_transports=possible_transports)
1021
self.add_cleanup(branch_from.lock_read().unlock)
1022
1002
1023
1003
if branch_to.get_parent() is None or remember:
1024
1004
branch_to.set_parent(branch_from.base)
1025
1005
1026
if revision is not None:
1027
revision_id = revision.as_revision_id(branch_from)
1028
1029
if tree_to is not None:
1030
view_info = _get_view_info_for_change_reporter(tree_to)
1031
change_reporter = delta._ChangeReporter(
1032
unversioned_filter=tree_to.is_ignored,
1033
view_info=view_info)
1034
result = tree_to.pull(
1035
branch_from, overwrite, revision_id, change_reporter,
1036
possible_transports=possible_transports, local=local)
1037
else:
1038
result = branch_to.pull(
1039
branch_from, overwrite, revision_id, local=local)
1040
1041
result.report(self.outf)
1042
if verbose and result.old_revid != result.new_revid:
1043
log.show_branch_change(
1044
branch_to, self.outf, result.old_revno,
1045
result.old_revid)
1006
if branch_from is not branch_to:
1007
branch_from.lock_read()
1008
try:
1009
if revision is not None:
1010
revision_id = revision.as_revision_id(branch_from)
1011
1012
branch_to.lock_write()
1013
try:
1014
if tree_to is not None:
1015
view_info = _get_view_info_for_change_reporter(tree_to)
1016
change_reporter = delta._ChangeReporter(
1017
unversioned_filter=tree_to.is_ignored,
1018
view_info=view_info)
1019
result = tree_to.pull(
1020
branch_from, overwrite, revision_id, change_reporter,
1021
possible_transports=possible_transports, local=local)
1022
else:
1023
result = branch_to.pull(
1024
branch_from, overwrite, revision_id, local=local)
1025
1026
result.report(self.outf)
1027
if verbose and result.old_revid != result.new_revid:
1028
log.show_branch_change(
1029
branch_to, self.outf, result.old_revno,
1030
result.old_revid)
1031
finally:
1032
branch_to.unlock()
1033
finally:
1034
if branch_from is not branch_to:
1035
branch_from.unlock()
1046
1036
1047
1037
1048
1038
class cmd_push(Command):
1049
__doc__ = """Update a mirror of this branch.
1039
"""Update a mirror of this branch.
1050
1040
1051
1041
The target branch will not have its working tree populated because this
1052
1042
is both expensive, and is not supported on remote file systems.
1113
1103
# Get the source branch
1114
1104
(tree, br_from,
1115
1105
_unused) = bzrdir.BzrDir.open_containing_tree_or_branch(directory)
1106
if strict is None:
1107
strict = br_from.get_config().get_user_option_as_bool('push_strict')
1108
if strict is None: strict = True # default value
1116
1109
# Get the tip's revision_id
1117
1110
revision = _get_one_revision('push', revision)
1118
1111
if revision is not None:
1119
1112
revision_id = revision.in_history(br_from).rev_id
1120
1113
else:
1121
1114
revision_id = None
1122
if tree is not None and revision_id is None:
1123
tree.check_changed_or_out_of_date(
1124
strict, 'push_strict',
1125
more_error='Use --no-strict to force the push.',
1126
more_warning='Uncommitted changes will not be pushed.')
1115
if strict and tree is not None and revision_id is None:
1116
if (tree.has_changes()):
1117
raise errors.UncommittedChanges(
1118
tree, more='Use --no-strict to force the push.')
1119
if tree.last_revision() != tree.branch.last_revision():
1120
# The tree has lost sync with its branch, there is little
1121
# chance that the user is aware of it but he can still force
1122
# the push with --no-strict
1123
raise errors.OutOfDateTree(
1124
tree, more='Use --no-strict to force the push.')
1125
1127
1126
# Get the stacked_on branch, if any
1128
1127
if stacked_on is not None:
1129
1128
stacked_on = urlutils.normalize_url(stacked_on)
1161
1160
1162
1161
1163
1162
class cmd_branch(Command):
1164
__doc__ = """Create a new branch that is a copy of an existing branch.
1163
"""Create a new branch that is a copy of an existing branch.
1165
1164
1166
1165
If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will
1167
1166
be used. In other words, "branch ../foo/bar" will attempt to create ./bar.
1194
1193
' directory exists, but does not already'
1195
1194
' have a control directory. This flag will'
1196
1195
' allow branch to proceed.'),
1197
Option('bind',
1198
help="Bind new branch to from location."),
1199
1196
]
1200
1197
aliases = ['get', 'clone']
1201
1198
1202
1199
def run(self, from_location, to_location=None, revision=None,
1203
1200
hardlink=False, stacked=False, standalone=False, no_tree=False,
1204
use_existing_dir=False, switch=False, bind=False):
1201
use_existing_dir=False, switch=False):
1205
1202
from bzrlib import switch as _mod_switch
1206
1203
from bzrlib.tag import _merge_tags_if_possible
1207
1204
accelerator_tree, br_from = bzrdir.BzrDir.open_tree_or_branch(
1208
1205
from_location)
1206
if (accelerator_tree is not None and
1207
accelerator_tree.supports_content_filtering()):
1208
accelerator_tree = None
1209
1209
revision = _get_one_revision('branch', revision)
1210
self.add_cleanup(br_from.lock_read().unlock)
1211
if revision is not None:
1212
revision_id = revision.as_revision_id(br_from)
1213
else:
1214
# FIXME - wt.last_revision, fallback to branch, fall back to
1215
# None or perhaps NULL_REVISION to mean copy nothing
1216
# RBC 20060209
1217
revision_id = br_from.last_revision()
1218
if to_location is None:
1219
to_location = urlutils.derive_to_location(from_location)
1220
to_transport = transport.get_transport(to_location)
1210
br_from.lock_read()
1221
1211
try:
1222
to_transport.mkdir('.')
1223
except errors.FileExists:
1224
if not use_existing_dir:
1225
raise errors.BzrCommandError('Target directory "%s" '
1226
'already exists.' % to_location)
1212
if revision is not None:
1213
revision_id = revision.as_revision_id(br_from)
1227
1214
else:
1228
try:
1229
bzrdir.BzrDir.open_from_transport(to_transport)
1230
except errors.NotBranchError:
1231
pass
1215
# FIXME - wt.last_revision, fallback to branch, fall back to
1216
# None or perhaps NULL_REVISION to mean copy nothing
1217
# RBC 20060209
1218
revision_id = br_from.last_revision()
1219
if to_location is None:
1220
to_location = urlutils.derive_to_location(from_location)
1221
to_transport = transport.get_transport(to_location)
1222
try:
1223
to_transport.mkdir('.')
1224
except errors.FileExists:
1225
if not use_existing_dir:
1226
raise errors.BzrCommandError('Target directory "%s" '
1227
'already exists.' % to_location)
1232
1228
else:
1233
raise errors.AlreadyBranchError(to_location)
1234
except errors.NoSuchFile:
1235
raise errors.BzrCommandError('Parent of "%s" does not exist.'
1236
% to_location)
1237
try:
1238
# preserve whatever source format we have.
1239
dir = br_from.bzrdir.sprout(to_transport.base, revision_id,
1240
possible_transports=[to_transport],
1241
accelerator_tree=accelerator_tree,
1242
hardlink=hardlink, stacked=stacked,
1243
force_new_repo=standalone,
1244
create_tree_if_local=not no_tree,
1245
source_branch=br_from)
1246
branch = dir.open_branch()
1247
except errors.NoSuchRevision:
1248
to_transport.delete_tree('.')
1249
msg = "The branch %s has no revision %s." % (from_location,
1250
revision)
1251
raise errors.BzrCommandError(msg)
1252
_merge_tags_if_possible(br_from, branch)
1253
# If the source branch is stacked, the new branch may
1254
# be stacked whether we asked for that explicitly or not.
1255
# We therefore need a try/except here and not just 'if stacked:'
1256
try:
1257
note('Created new stacked branch referring to %s.' %
1258
branch.get_stacked_on_url())
1259
except (errors.NotStacked, errors.UnstackableBranchFormat,
1260
errors.UnstackableRepositoryFormat), e:
1261
note('Branched %d revision(s).' % branch.revno())
1262
if bind:
1263
# Bind to the parent
1264
parent_branch = Branch.open(from_location)
1265
branch.bind(parent_branch)
1266
note('New branch bound to %s' % from_location)
1267
if switch:
1268
# Switch to the new branch
1269
wt, _ = WorkingTree.open_containing('.')
1270
_mod_switch.switch(wt.bzrdir, branch)
1271
note('Switched to branch: %s',
1272
urlutils.unescape_for_display(branch.base, 'utf-8'))
1229
try:
1230
bzrdir.BzrDir.open_from_transport(to_transport)
1231
except errors.NotBranchError:
1232
pass
1233
else:
1234
raise errors.AlreadyBranchError(to_location)
1235
except errors.NoSuchFile:
1236
raise errors.BzrCommandError('Parent of "%s" does not exist.'
1237
% to_location)
1238
try:
1239
# preserve whatever source format we have.
1240
dir = br_from.bzrdir.sprout(to_transport.base, revision_id,
1241
possible_transports=[to_transport],
1242
accelerator_tree=accelerator_tree,
1243
hardlink=hardlink, stacked=stacked,
1244
force_new_repo=standalone,
1245
create_tree_if_local=not no_tree,
1246
source_branch=br_from)
1247
branch = dir.open_branch()
1248
except errors.NoSuchRevision:
1249
to_transport.delete_tree('.')
1250
msg = "The branch %s has no revision %s." % (from_location,
1251
revision)
1252
raise errors.BzrCommandError(msg)
1253
_merge_tags_if_possible(br_from, branch)
1254
# If the source branch is stacked, the new branch may
1255
# be stacked whether we asked for that explicitly or not.
1256
# We therefore need a try/except here and not just 'if stacked:'
1257
try:
1258
note('Created new stacked branch referring to %s.' %
1259
branch.get_stacked_on_url())
1260
except (errors.NotStacked, errors.UnstackableBranchFormat,
1261
errors.UnstackableRepositoryFormat), e:
1262
note('Branched %d revision(s).' % branch.revno())
1263
if switch:
1264
# Switch to the new branch
1265
wt, _ = WorkingTree.open_containing('.')
1266
_mod_switch.switch(wt.bzrdir, branch)
1267
note('Switched to branch: %s',
1268
urlutils.unescape_for_display(branch.base, 'utf-8'))
1269
finally:
1270
br_from.unlock()
1273
1271
1274
1272
1275
1273
class cmd_checkout(Command):
1276
__doc__ = """Create a new checkout of an existing branch.
1274
"""Create a new checkout of an existing branch.
1277
1275
1278
1276
If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree for
1279
1277
the branch found in '.'. This is useful if you have removed the working tree
1342
1340
1343
1341
1344
1342
class cmd_renames(Command):
1345
__doc__ = """Show list of renamed files.
1343
"""Show list of renamed files.
1346
1344
"""
1347
1345
# TODO: Option to show renames between two historical versions.
1348
1346
1353
1351
@display_command
1354
1352
def run(self, dir=u'.'):
1355
1353
tree = WorkingTree.open_containing(dir)[0]
1356
self.add_cleanup(tree.lock_read().unlock)
1357
new_inv = tree.inventory
1358
old_tree = tree.basis_tree()
1359
self.add_cleanup(old_tree.lock_read().unlock)
1360
old_inv = old_tree.inventory
1361
renames = []
1362
iterator = tree.iter_changes(old_tree, include_unchanged=True)
1363
for f, paths, c, v, p, n, k, e in iterator:
1364
if paths[0] == paths[1]:
1365
continue
1366
if None in (paths):
1367
continue
1368
renames.append(paths)
1369
renames.sort()
1370
for old_name, new_name in renames:
1371
self.outf.write("%s => %s\n" % (old_name, new_name))
1354
tree.lock_read()
1355
try:
1356
new_inv = tree.inventory
1357
old_tree = tree.basis_tree()
1358
old_tree.lock_read()
1359
try:
1360
old_inv = old_tree.inventory
1361
renames = []
1362
iterator = tree.iter_changes(old_tree, include_unchanged=True)
1363
for f, paths, c, v, p, n, k, e in iterator:
1364
if paths[0] == paths[1]:
1365
continue
1366
if None in (paths):
1367
continue
1368
renames.append(paths)
1369
renames.sort()
1370
for old_name, new_name in renames:
1371
self.outf.write("%s => %s\n" % (old_name, new_name))
1372
finally:
1373
old_tree.unlock()
1374
finally:
1375
tree.unlock()
1372
1376
1373
1377
1374
1378
class cmd_update(Command):
1375
__doc__ = """Update a tree to have the latest code committed to its branch.
1379
"""Update a tree to have the latest code committed to its branch.
1376
1380
1377
1381
This will perform a merge into the working tree, and may generate
1378
1382
conflicts. If you have any local changes, you will still
1380
1384
1381
1385
If you want to discard your local changes, you can just do a
1382
1386
'bzr revert' instead of 'bzr commit' after the update.
1383
1384
If the tree's branch is bound to a master branch, it will also update
1385
the branch from the master.
1386
1387
"""
1387
1388
1388
1389
_see_also = ['pull', 'working-trees', 'status-flags']
1389
1390
takes_args = ['dir?']
1390
takes_options = ['revision']
1391
1391
aliases = ['up']
1392
1392
1393
def run(self, dir='.', revision=None):
1394
if revision is not None and len(revision) != 1:
1395
raise errors.BzrCommandError(
1396
"bzr update --revision takes exactly one revision")
1393
def run(self, dir='.'):
1397
1394
tree = WorkingTree.open_containing(dir)[0]
1398
branch = tree.branch
1399
1395
possible_transports = []
1400
master = branch.get_master_branch(
1396
master = tree.branch.get_master_branch(
1401
1397
possible_transports=possible_transports)
1402
1398
if master is not None:
1403
branch_location = master.base
1404
1399
tree.lock_write()
1405
1400
else:
1406
branch_location = tree.branch.base
1407
1401
tree.lock_tree_write()
1408
self.add_cleanup(tree.unlock)
1409
# get rid of the final '/' and be ready for display
1410
branch_location = urlutils.unescape_for_display(
1411
branch_location.rstrip('/'),
1412
self.outf.encoding)
1413
existing_pending_merges = tree.get_parent_ids()[1:]
1414
if master is None:
1415
old_tip = None
1416
else:
1417
# may need to fetch data into a heavyweight checkout
1418
# XXX: this may take some time, maybe we should display a
1419
# message
1420
old_tip = branch.update(possible_transports)
1421
if revision is not None:
1422
revision_id = revision[0].as_revision_id(branch)
1423
else:
1424
revision_id = branch.last_revision()
1425
if revision_id == _mod_revision.ensure_null(tree.last_revision()):
1426
revno = branch.revision_id_to_dotted_revno(revision_id)
1427
note("Tree is up to date at revision %s of branch %s" %
1428
('.'.join(map(str, revno)), branch_location))
1429
return 0
1430
view_info = _get_view_info_for_change_reporter(tree)
1431
change_reporter = delta._ChangeReporter(
1432
unversioned_filter=tree.is_ignored,
1433
view_info=view_info)
1434
1402
try:
1403
existing_pending_merges = tree.get_parent_ids()[1:]
1404
last_rev = _mod_revision.ensure_null(tree.last_revision())
1405
if last_rev == _mod_revision.ensure_null(
1406
tree.branch.last_revision()):
1407
# may be up to date, check master too.
1408
if master is None or last_rev == _mod_revision.ensure_null(
1409
master.last_revision()):
1410
revno = tree.branch.revision_id_to_revno(last_rev)
1411
note("Tree is up to date at revision %d." % (revno,))
1412
return 0
1413
view_info = _get_view_info_for_change_reporter(tree)
1435
1414
conflicts = tree.update(
1436
change_reporter,
1437
possible_transports=possible_transports,
1438
revision=revision_id,
1439
old_tip=old_tip)
1440
except errors.NoSuchRevision, e:
1441
raise errors.BzrCommandError(
1442
"branch has no revision %s\n"
1443
"bzr update --revision only works"
1444
" for a revision in the branch history"
1445
% (e.revision))
1446
revno = tree.branch.revision_id_to_dotted_revno(
1447
_mod_revision.ensure_null(tree.last_revision()))
1448
note('Updated to revision %s of branch %s' %
1449
('.'.join(map(str, revno)), branch_location))
1450
parent_ids = tree.get_parent_ids()
1451
if parent_ids[1:] and parent_ids[1:] != existing_pending_merges:
1452
note('Your local commits will now show as pending merges with '
1453
"'bzr status', and can be committed with 'bzr commit'.")
1454
if conflicts != 0:
1455
return 1
1456
else:
1457
return 0
1415
delta._ChangeReporter(unversioned_filter=tree.is_ignored,
1416
view_info=view_info), possible_transports=possible_transports)
1417
revno = tree.branch.revision_id_to_revno(
1418
_mod_revision.ensure_null(tree.last_revision()))
1419
note('Updated to revision %d.' % (revno,))
1420
if tree.get_parent_ids()[1:] != existing_pending_merges:
1421
note('Your local commits will now show as pending merges with '
1422
"'bzr status', and can be committed with 'bzr commit'.")
1423
if conflicts != 0:
1424
return 1
1425
else:
1426
return 0
1427
finally:
1428
tree.unlock()
1458
1429
1459
1430
1460
1431
class cmd_info(Command):
1461
__doc__ = """Show information about a working tree, branch or repository.
1432
"""Show information about a working tree, branch or repository.
1462
1433
1463
1434
This command will show all known locations and formats associated to the
1464
1435
tree, branch or repository.
1502
1473
1503
1474
1504
1475
class cmd_remove(Command):
1505
__doc__ = """Remove files or directories.
1476
"""Remove files or directories.
1506
1477
1507
1478
This makes bzr stop tracking changes to the specified files. bzr will delete
1508
1479
them if they can easily be recovered using revert. If no options or
1530
1501
if file_list is not None:
1531
1502
file_list = [f for f in file_list]
1532
1503
1533
self.add_cleanup(tree.lock_write().unlock)
1534
# Heuristics should probably all move into tree.remove_smart or
1535
# some such?
1536
if new:
1537
added = tree.changes_from(tree.basis_tree(),
1538
specific_files=file_list).added
1539
file_list = sorted([f[0] for f in added], reverse=True)
1540
if len(file_list) == 0:
1541
raise errors.BzrCommandError('No matching files.')
1542
elif file_list is None:
1543
# missing files show up in iter_changes(basis) as
1544
# versioned-with-no-kind.
1545
missing = []
1546
for change in tree.iter_changes(tree.basis_tree()):
1547
# Find paths in the working tree that have no kind:
1548
if change[1][1] is not None and change[6][1] is None:
1549
missing.append(change[1][1])
1550
file_list = sorted(missing, reverse=True)
1551
file_deletion_strategy = 'keep'
1552
tree.remove(file_list, verbose=verbose, to_file=self.outf,
1553
keep_files=file_deletion_strategy=='keep',
1554
force=file_deletion_strategy=='force')
1504
tree.lock_write()
1505
try:
1506
# Heuristics should probably all move into tree.remove_smart or
1507
# some such?
1508
if new:
1509
added = tree.changes_from(tree.basis_tree(),
1510
specific_files=file_list).added
1511
file_list = sorted([f[0] for f in added], reverse=True)
1512
if len(file_list) == 0:
1513
raise errors.BzrCommandError('No matching files.')
1514
elif file_list is None:
1515
# missing files show up in iter_changes(basis) as
1516
# versioned-with-no-kind.
1517
missing = []
1518
for change in tree.iter_changes(tree.basis_tree()):
1519
# Find paths in the working tree that have no kind:
1520
if change[1][1] is not None and change[6][1] is None:
1521
missing.append(change[1][1])
1522
file_list = sorted(missing, reverse=True)
1523
file_deletion_strategy = 'keep'
1524
tree.remove(file_list, verbose=verbose, to_file=self.outf,
1525
keep_files=file_deletion_strategy=='keep',
1526
force=file_deletion_strategy=='force')
1527
finally:
1528
tree.unlock()
1555
1529
1556
1530
1557
1531
class cmd_file_id(Command):
1558
__doc__ = """Print file_id of a particular file or directory.
1532
"""Print file_id of a particular file or directory.
1559
1533
1560
1534
The file_id is assigned when the file is first added and remains the
1561
1535
same through all revisions where the file exists, even when it is
1577
1551
1578
1552
1579
1553
class cmd_file_path(Command):
1580
__doc__ = """Print path of file_ids to a file or directory.
1554
"""Print path of file_ids to a file or directory.
1581
1555
1582
1556
This prints one line for each directory down to the target,
1583
1557
starting at the branch root.
1599
1573
1600
1574
1601
1575
class cmd_reconcile(Command):
1602
__doc__ = """Reconcile bzr metadata in a branch.
1576
"""Reconcile bzr metadata in a branch.
1603
1577
1604
1578
This can correct data mismatches that may have been caused by
1605
1579
previous ghost operations or bzr upgrades. You should only
1627
1601
1628
1602
1629
1603
class cmd_revision_history(Command):
1630
__doc__ = """Display the list of revision ids on a branch."""
1604
"""Display the list of revision ids on a branch."""
1631
1605
1632
1606
_see_also = ['log']
1633
1607
takes_args = ['location?']
1643
1617
1644
1618
1645
1619
class cmd_ancestry(Command):
1646
__doc__ = """List all revisions merged into this branch."""
1620
"""List all revisions merged into this branch."""
1647
1621
1648
1622
_see_also = ['log', 'revision-history']
1649
1623
takes_args = ['location?']
1668
1642
1669
1643
1670
1644
class cmd_init(Command):
1671
__doc__ = """Make a directory into a versioned branch.
1645
"""Make a directory into a versioned branch.
1672
1646
1673
1647
Use this to create an empty branch, or before importing an
1674
1648
existing project.
1777
1751
1778
1752
1779
1753
class cmd_init_repository(Command):
1780
__doc__ = """Create a shared repository for branches to share storage space.
1754
"""Create a shared repository to hold branches.
1781
1755
1782
1756
New branches created under the repository directory will store their
1783
revisions in the repository, not in the branch directory. For branches
1784
with shared history, this reduces the amount of storage needed and
1785
speeds up the creation of new branches.
1757
revisions in the repository, not in the branch directory.
1786
1758
1787
If the --no-trees option is given then the branches in the repository
1788
will not have working trees by default. They will still exist as
1789
directories on disk, but they will not have separate copies of the
1790
files at a certain revision. This can be useful for repositories that
1791
store branches which are interacted with through checkouts or remote
1792
branches, such as on a server.
1759
If the --no-trees option is used then the branches in the repository
1760
will not have working trees by default.
1793
1761
1794
1762
:Examples:
1795
Create a shared repository holding just branches::
1763
Create a shared repositories holding just branches::
1796
1764
1797
1765
bzr init-repo --no-trees repo
1798
1766
bzr init repo/trunk
1837
1805
1838
1806
1839
1807
class cmd_diff(Command):
1840
__doc__ = """Show differences in the working tree, between revisions or branches.
1808
"""Show differences in the working tree, between revisions or branches.
1841
1809
1842
1810
If no arguments are given, all changes for the current tree are listed.
1843
1811
If files are given, only the changes in those files are listed.
1929
1897
help='Use this command to compare files.',
1930
1898
type=unicode,
1931
1899
),
1932
RegistryOption('format',
1933
help='Diff format to use.',
1934
lazy_registry=('bzrlib.diff', 'format_registry'),
1935
value_switches=False, title='Diff format'),
1936
1900
]
1937
1901
aliases = ['di', 'dif']
1938
1902
encoding_type = 'exact'
1939
1903
1940
1904
@display_command
1941
1905
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)
1906
prefix=None, old=None, new=None, using=None):
1907
from bzrlib.diff import get_trees_and_branches_to_diff, show_diff_trees
1945
1908
1946
1909
if (prefix is None) or (prefix == '0'):
1947
1910
# diff -p0 format
1961
1924
raise errors.BzrCommandError('bzr diff --revision takes exactly'
1962
1925
' one or two revision specifiers')
1963
1926
1964
if using is not None and format is not None:
1965
raise errors.BzrCommandError('--using and --format are mutually '
1966
'exclusive.')
1967
1968
1927
(old_tree, new_tree,
1969
1928
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)
1929
specific_files, extra_trees) = get_trees_and_branches_to_diff(
1930
file_list, revision, old, new, apply_view=True)
1972
1931
return show_diff_trees(old_tree, new_tree, sys.stdout,
1973
1932
specific_files=specific_files,
1974
1933
external_diff_options=diff_options,
1975
1934
old_label=old_label, new_label=new_label,
1976
extra_trees=extra_trees, using=using,
1977
format_cls=format)
1935
extra_trees=extra_trees, using=using)
1978
1936
1979
1937
1980
1938
class cmd_deleted(Command):
1981
__doc__ = """List files deleted in the working tree.
1939
"""List files deleted in the working tree.
1982
1940
"""
1983
1941
# TODO: Show files deleted since a previous revision, or
1984
1942
# between two revisions.
1992
1950
@display_command
1993
1951
def run(self, show_ids=False):
1994
1952
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')
1953
tree.lock_read()
1954
try:
1955
old = tree.basis_tree()
1956
old.lock_read()
1957
try:
1958
for path, ie in old.inventory.iter_entries():
1959
if not tree.has_id(ie.file_id):
1960
self.outf.write(path)
1961
if show_ids:
1962
self.outf.write(' ')
1963
self.outf.write(ie.file_id)
1964
self.outf.write('\n')
1965
finally:
1966
old.unlock()
1967
finally:
1968
tree.unlock()
2005
1969
2006
1970
2007
1971
class cmd_modified(Command):
2008
__doc__ = """List files modified in working tree.
1972
"""List files modified in working tree.
2009
1973
"""
2010
1974
2011
1975
hidden = True
2028
1992
2029
1993
2030
1994
class cmd_added(Command):
2031
__doc__ = """List files added in working tree.
1995
"""List files added in working tree.
2032
1996
"""
2033
1997
2034
1998
hidden = True
2042
2006
@display_command
2043
2007
def run(self, null=False):
2044
2008
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')
2009
wt.lock_read()
2010
try:
2011
basis = wt.basis_tree()
2012
basis.lock_read()
2013
try:
2014
basis_inv = basis.inventory
2015
inv = wt.inventory
2016
for file_id in inv:
2017
if file_id in basis_inv:
2018
continue
2019
if inv.is_root(file_id) and len(basis_inv) == 0:
2020
continue
2021
path = inv.id2path(file_id)
2022
if not os.access(osutils.abspath(path), os.F_OK):
2023
continue
2024
if null:
2025
self.outf.write(path + '\0')
2026
else:
2027
self.outf.write(osutils.quotefn(path) + '\n')
2028
finally:
2029
basis.unlock()
2030
finally:
2031
wt.unlock()
2062
2032
2063
2033
2064
2034
class cmd_root(Command):
2065
__doc__ = """Show the tree root directory.
2035
"""Show the tree root directory.
2066
2036
2067
2037
The root is the nearest enclosing directory with a .bzr control
2068
2038
directory."""
2092
2062
2093
2063
2094
2064
class cmd_log(Command):
2095
__doc__ = """Show historical log for a branch or subset of a branch.
2065
"""Show historical log for a branch or subset of a branch.
2096
2066
2097
2067
log is bzr's default tool for exploring the history of a branch.
2098
2068
The branch to use is taken from the first parameter. If no parameters
2209
2179
:Tips & tricks:
2210
2180
2211
2181
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>.
2182
line tools. You may prefer qlog or glog from the QBzr and Bzr-Gtk packages
2183
respectively for example. (TortoiseBzr uses qlog for displaying logs.) See
2184
http://bazaar-vcs.org/BzrPlugins and http://bazaar-vcs.org/IDEIntegration.
2185
2186
Web interfaces are often better at exploring history than command line
2187
tools, particularly for branches on servers. You may prefer Loggerhead
2188
or one of its alternatives. See http://bazaar-vcs.org/WebInterface.
2216
2189
2217
2190
You may find it useful to add the aliases below to ``bazaar.conf``::
2218
2191
2279
2252
help='Show changes made in each revision as a patch.'),
2280
2253
Option('include-merges',
2281
2254
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
2255
]
2287
2256
encoding_type = 'replace'
2288
2257
2298
2267
message=None,
2299
2268
limit=None,
2300
2269
show_diff=False,
2301
include_merges=False,
2302
exclude_common_ancestry=False,
2303
):
2270
include_merges=False):
2304
2271
from bzrlib.log import (
2305
2272
Logger,
2306
2273
make_log_request_dict,
2307
2274
_get_info_for_log_files,
2308
2275
)
2309
2276
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
2277
if include_merges:
2315
2278
if levels is None:
2316
2279
levels = 0
2329
2292
2330
2293
file_ids = []
2331
2294
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
2295
b = None
2296
try:
2297
if file_list:
2298
# find the file ids to log and check for directory filtering
2299
b, file_info_list, rev1, rev2 = _get_info_for_log_files(
2300
revision, file_list)
2301
for relpath, file_id, kind in file_info_list:
2302
if file_id is None:
2303
raise errors.BzrCommandError(
2304
"Path unknown at end or start of revision range: %s" %
2305
relpath)
2306
# If the relpath is the top of the tree, we log everything
2307
if relpath == '':
2308
file_ids = []
2309
break
2310
else:
2311
file_ids.append(file_id)
2312
filter_by_dir = filter_by_dir or (
2313
kind in ['directory', 'tree-reference'])
2314
else:
2315
# log everything
2316
# FIXME ? log the current subdir only RBC 20060203
2317
if revision is not None \
2318
and len(revision) > 0 and revision[0].get_branch():
2319
location = revision[0].get_branch()
2345
2320
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)
2321
location = '.'
2322
dir, relpath = bzrdir.BzrDir.open_containing(location)
2323
b = dir.open_branch()
2324
b.lock_read()
2325
rev1, rev2 = _get_revision_range(revision, b, self.name())
2326
2327
# Decide on the type of delta & diff filtering to use
2328
# TODO: add an --all-files option to make this configurable & consistent
2329
if not verbose:
2330
delta_type = None
2331
else:
2332
delta_type = 'full'
2333
if not show_diff:
2334
diff_type = None
2335
elif file_ids:
2336
diff_type = 'partial'
2337
else:
2338
diff_type = 'full'
2339
2340
# Build the log formatter
2341
if log_format is None:
2342
log_format = log.log_formatter_registry.get_default(b)
2343
lf = log_format(show_ids=show_ids, to_file=self.outf,
2344
show_timezone=timezone,
2345
delta_format=get_verbosity_level(),
2346
levels=levels,
2347
show_advice=levels is None)
2348
2349
# Choose the algorithm for doing the logging. It's annoying
2350
# having multiple code paths like this but necessary until
2351
# the underlying repository format is faster at generating
2352
# deltas or can provide everything we need from the indices.
2353
# The default algorithm - match-using-deltas - works for
2354
# multiple files and directories and is faster for small
2355
# amounts of history (200 revisions say). However, it's too
2356
# slow for logging a single file in a repository with deep
2357
# history, i.e. > 10K revisions. In the spirit of "do no
2358
# evil when adding features", we continue to use the
2359
# original algorithm - per-file-graph - for the "single
2360
# file that isn't a directory without showing a delta" case.
2361
partial_history = revision and b.repository._format.supports_chks
2362
match_using_deltas = (len(file_ids) != 1 or filter_by_dir
2363
or delta_type or partial_history)
2364
2365
# Build the LogRequest and execute it
2366
if len(file_ids) == 0:
2367
file_ids = None
2368
rqst = make_log_request_dict(
2369
direction=direction, specific_fileids=file_ids,
2370
start_revision=rev1, end_revision=rev2, limit=limit,
2371
message_search=message, delta_type=delta_type,
2372
diff_type=diff_type, _match_using_deltas=match_using_deltas)
2373
Logger(b, rqst).show(lf)
2374
finally:
2375
if b is not None:
2376
b.unlock()
2414
2377
2415
2378
2416
2379
def _get_revision_range(revisionspec_list, branch, command_name):
2434
2397
raise errors.BzrCommandError(
2435
2398
"bzr %s doesn't accept two revisions in different"
2436
2399
" 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)
2400
rev1 = start_spec.in_history(branch)
2442
2401
# Avoid loading all of history when we know a missing
2443
2402
# end of range means the last revision ...
2444
2403
if end_spec.spec is None:
2473
2432
2474
2433
2475
2434
class cmd_touching_revisions(Command):
2476
__doc__ = """Return revision-ids which affected a particular file.
2435
"""Return revision-ids which affected a particular file.
2477
2436
2478
2437
A more user-friendly interface is "bzr log FILE".
2479
2438
"""
2486
2445
tree, relpath = WorkingTree.open_containing(filename)
2487
2446
file_id = tree.path2id(relpath)
2488
2447
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))
2448
b.lock_read()
2449
try:
2450
touching_revs = log.find_touching_revisions(b, file_id)
2451
for revno, revision_id, what in touching_revs:
2452
self.outf.write("%6d %s\n" % (revno, what))
2453
finally:
2454
b.unlock()
2493
2455
2494
2456
2495
2457
class cmd_ls(Command):
2496
__doc__ = """List files in a tree.
2458
"""List files in a tree.
2497
2459
"""
2498
2460
2499
2461
_see_also = ['status', 'cat']
2547
2509
if from_root:
2548
2510
if relpath:
2549
2511
prefix = relpath + '/'
2550
elif fs_path != '.' and not fs_path.endswith('/'):
2512
elif fs_path != '.':
2551
2513
prefix = fs_path + '/'
2552
2514
2553
2515
if revision is not None or tree is None:
2561
2523
view_str = views.view_display_str(view_files)
2562
2524
note("Ignoring files outside view. View is %s" % view_str)
2563
2525
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
2526
tree.lock_read()
2527
try:
2528
for fp, fc, fkind, fid, entry in tree.list_files(include_root=False,
2529
from_dir=relpath, recursive=recursive):
2530
# Apply additional masking
2531
if not all and not selection[fc]:
2532
continue
2533
if kind is not None and fkind != kind:
2534
continue
2535
if apply_view:
2536
try:
2537
if relpath:
2538
fullpath = osutils.pathjoin(relpath, fp)
2539
else:
2540
fullpath = fp
2541
views.check_path_in_view(tree, fullpath)
2542
except errors.FileOutsideView:
2543
continue
2581
2544
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:
2545
# Output the entry
2546
if prefix:
2547
fp = osutils.pathjoin(prefix, fp)
2548
kindch = entry.kind_character()
2549
outstring = fp + kindch
2550
ui.ui_factory.clear_term()
2551
if verbose:
2552
outstring = '%-8s %s' % (fc, outstring)
2553
if show_ids and fid is not None:
2554
outstring = "%-50s %s" % (outstring, fid)
2608
2555
self.outf.write(outstring + '\n')
2556
elif null:
2557
self.outf.write(fp + '\0')
2558
if show_ids:
2559
if fid is not None:
2560
self.outf.write(fid)
2561
self.outf.write('\0')
2562
self.outf.flush()
2563
else:
2564
if show_ids:
2565
if fid is not None:
2566
my_id = fid
2567
else:
2568
my_id = ''
2569
self.outf.write('%-50s %s\n' % (outstring, my_id))
2570
else:
2571
self.outf.write(outstring + '\n')
2572
finally:
2573
tree.unlock()
2609
2574
2610
2575
2611
2576
class cmd_unknowns(Command):
2612
__doc__ = """List unknown files.
2577
"""List unknown files.
2613
2578
"""
2614
2579
2615
2580
hidden = True
2622
2587
2623
2588
2624
2589
class cmd_ignore(Command):
2625
__doc__ = """Ignore specified files or patterns.
2590
"""Ignore specified files or patterns.
2626
2591
2627
2592
See ``bzr help patterns`` for details on the syntax of patterns.
2628
2593
2636
2601
After adding, editing or deleting that file either indirectly by
2637
2602
using this command or directly by using an editor, be sure to commit
2638
2603
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
2604
2653
2605
Note: ignore patterns containing shell wildcards must be quoted from
2654
2606
the shell on Unix.
2658
2610
2659
2611
bzr ignore ./Makefile
2660
2612
2661
Ignore .class files in all directories...::
2613
Ignore class files in all directories::
2662
2614
2663
2615
bzr ignore "*.class"
2664
2616
2665
...but do not ignore "special.class"::
2666
2667
bzr ignore "!special.class"
2668
2669
2617
Ignore .o files under the lib directory::
2670
2618
2671
2619
bzr ignore "lib/**/*.o"
2677
2625
Ignore everything but the "debian" toplevel directory::
2678
2626
2679
2627
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
2628
"""
2688
2629
2689
2630
_see_also = ['status', 'ignored', 'patterns']
2690
2631
takes_args = ['name_pattern*']
2691
2632
takes_options = [
2692
Option('default-rules',
2693
help='Display the default ignore rules that bzr uses.')
2633
Option('old-default-rules',
2634
help='Write out the ignore rules bzr < 0.9 always used.')
2694
2635
]
2695
2636
2696
def run(self, name_pattern_list=None, default_rules=None):
2637
def run(self, name_pattern_list=None, old_default_rules=None):
2697
2638
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)
2639
if old_default_rules is not None:
2640
# dump the rules and exit
2641
for pattern in ignores.OLD_DEFAULTS:
2642
print pattern
2702
2643
return
2703
2644
if not name_pattern_list:
2704
2645
raise errors.BzrCommandError("ignore requires at least one "
2705
"NAME_PATTERN or --default-rules.")
2646
"NAME_PATTERN or --old-default-rules")
2706
2647
name_pattern_list = [globbing.normalize_pattern(p)
2707
2648
for p in name_pattern_list]
2708
2649
for name_pattern in name_pattern_list:
2720
2661
if id is not None:
2721
2662
filename = entry[0]
2722
2663
if ignored.match(filename):
2723
matches.append(filename)
2664
matches.append(filename.encode('utf-8'))
2724
2665
tree.unlock()
2725
2666
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),))
2667
print "Warning: the following files are version controlled and" \
2668
" match your ignore pattern:\n%s" \
2669
"\nThese files will continue to be version controlled" \
2670
" unless you 'bzr remove' them." % ("\n".join(matches),)
2730
2671
2731
2672
2732
2673
class cmd_ignored(Command):
2733
__doc__ = """List ignored files and the patterns that matched them.
2674
"""List ignored files and the patterns that matched them.
2734
2675
2735
2676
List all the ignored files and the ignore pattern that caused the file to
2736
2677
be ignored.
2746
2687
@display_command
2747
2688
def run(self):
2748
2689
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))
2690
tree.lock_read()
2691
try:
2692
for path, file_class, kind, file_id, entry in tree.list_files():
2693
if file_class != 'I':
2694
continue
2695
## XXX: Slightly inefficient since this was already calculated
2696
pat = tree.is_ignored(path)
2697
self.outf.write('%-50s %s\n' % (path, pat))
2698
finally:
2699
tree.unlock()
2756
2700
2757
2701
2758
2702
class cmd_lookup_revision(Command):
2759
__doc__ = """Lookup the revision-id from a revision-number
2703
"""Lookup the revision-id from a revision-number
2760
2704
2761
2705
:Examples:
2762
2706
bzr lookup-revision 33
2769
2713
try:
2770
2714
revno = int(revno)
2771
2715
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)
2716
raise errors.BzrCommandError("not a valid revision-number: %r" % revno)
2717
2718
print WorkingTree.open_containing(u'.')[0].branch.get_rev_id(revno)
2776
2719
2777
2720
2778
2721
class cmd_export(Command):
2779
__doc__ = """Export current or past revision to a destination directory or archive.
2722
"""Export current or past revision to a destination directory or archive.
2780
2723
2781
2724
If no revision is specified this exports the last committed revision.
2782
2725
2814
2757
Option('root',
2815
2758
type=str,
2816
2759
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
2760
]
2821
2761
def run(self, dest, branch_or_subdir=None, revision=None, format=None,
2822
root=None, filters=False, per_file_timestamps=False):
2762
root=None, filters=False):
2823
2763
from bzrlib.export import export
2824
2764
2825
2765
if branch_or_subdir is None:
2832
2772
2833
2773
rev_tree = _get_one_revision_tree('export', revision, branch=b, tree=tree)
2834
2774
try:
2835
export(rev_tree, dest, format, root, subdir, filtered=filters,
2836
per_file_timestamps=per_file_timestamps)
2775
export(rev_tree, dest, format, root, subdir, filtered=filters)
2837
2776
except errors.NoSuchExportFormat, e:
2838
2777
raise errors.BzrCommandError('Unsupported export format: %s' % e.format)
2839
2778
2840
2779
2841
2780
class cmd_cat(Command):
2842
__doc__ = """Write the contents of a file as of a given revision to standard output.
2781
"""Write the contents of a file as of a given revision to standard output.
2843
2782
2844
2783
If no revision is nominated, the last revision is used.
2845
2784
2865
2804
" one revision specifier")
2866
2805
tree, branch, relpath = \
2867
2806
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)
2807
branch.lock_read()
2808
try:
2809
return self._run(tree, branch, relpath, filename, revision,
2810
name_from_revision, filters)
2811
finally:
2812
branch.unlock()
2871
2813
2872
2814
def _run(self, tree, b, relpath, filename, revision, name_from_revision,
2873
2815
filtered):
2874
2816
if tree is None:
2875
2817
tree = b.basis_tree()
2876
2818
rev_tree = _get_one_revision_tree('cat', revision, branch=b)
2877
self.add_cleanup(rev_tree.lock_read().unlock)
2878
2819
2879
2820
old_file_id = rev_tree.path2id(relpath)
2880
2821
2915
2856
chunks = content.splitlines(True)
2916
2857
content = filtered_output_bytes(chunks, filters,
2917
2858
ContentFilterContext(relpath, rev_tree))
2918
self.cleanup_now()
2919
2859
self.outf.writelines(content)
2920
2860
else:
2921
self.cleanup_now()
2922
2861
self.outf.write(content)
2923
2862
2924
2863
2925
2864
class cmd_local_time_offset(Command):
2926
__doc__ = """Show the offset in seconds from GMT to local time."""
2865
"""Show the offset in seconds from GMT to local time."""
2927
2866
hidden = True
2928
2867
@display_command
2929
2868
def run(self):
2930
self.outf.write("%s\n" % osutils.local_time_offset())
2869
print osutils.local_time_offset()
2931
2870
2932
2871
2933
2872
2934
2873
class cmd_commit(Command):
2935
__doc__ = """Commit changes into a new revision.
2874
"""Commit changes into a new revision.
2936
2875
2937
2876
An explanatory message needs to be given for each commit. This is
2938
2877
often done by using the --message option (getting the message from the
3046
2985
"the master branch until a normal commit "
3047
2986
"is performed."
3048
2987
),
3049
Option('show-diff', short_name='p',
2988
Option('show-diff',
3050
2989
help='When no message is supplied, show the diff along'
3051
2990
' with the status summary in the message editor.'),
3052
2991
]
3118
3057
if local and not tree.branch.get_bound_location():
3119
3058
raise errors.LocalRequiresBoundBranch()
3120
3059
3121
if message is not None:
3122
try:
3123
file_exists = osutils.lexists(message)
3124
except UnicodeError:
3125
# The commit message contains unicode characters that can't be
3126
# represented in the filesystem encoding, so that can't be a
3127
# file.
3128
file_exists = False
3129
if file_exists:
3130
warning_msg = (
3131
'The commit message is a file name: "%(f)s".\n'
3132
'(use --file "%(f)s" to take commit message from that file)'
3133
% { 'f': message })
3134
ui.ui_factory.show_warning(warning_msg)
3135
if '\r' in message:
3136
message = message.replace('\r\n', '\n')
3137
message = message.replace('\r', '\n')
3138
if file:
3139
raise errors.BzrCommandError(
3140
"please specify either --message or --file")
3141
3142
3060
def get_message(commit_obj):
3143
3061
"""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,
3062
my_message = message
3063
if my_message is not None and '\r' in my_message:
3064
my_message = my_message.replace('\r\n', '\n')
3065
my_message = my_message.replace('\r', '\n')
3066
if my_message is None and not file:
3067
t = make_commit_message_template_encoded(tree,
3153
3068
selected_list, diff=show_diff,
3154
3069
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
3070
start_message = generate_commit_message_template(commit_obj)
3161
my_message = edit_commit_message_encoded(text,
3071
my_message = edit_commit_message_encoded(t,
3162
3072
start_message=start_message)
3163
3073
if my_message is None:
3164
3074
raise errors.BzrCommandError("please specify a commit"
3165
3075
" message with either --message or --file")
3076
elif my_message and file:
3077
raise errors.BzrCommandError(
3078
"please specify either --message or --file")
3079
if file:
3080
my_message = codecs.open(file, 'rt',
3081
osutils.get_user_encoding()).read()
3166
3082
if my_message == "":
3167
3083
raise errors.BzrCommandError("empty commit message specified")
3168
3084
return my_message
3180
3096
timezone=offset,
3181
3097
exclude=safe_relpath_files(tree, exclude))
3182
3098
except PointlessCommit:
3099
# FIXME: This should really happen before the file is read in;
3100
# perhaps prepare the commit; get the message; then actually commit
3183
3101
raise errors.BzrCommandError("No changes to commit."
3184
3102
" Use --unchanged to commit anyhow.")
3185
3103
except ConflictsInTree:
3190
3108
raise errors.BzrCommandError("Commit refused because there are"
3191
3109
" unknown files in the working tree.")
3192
3110
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
3111
raise errors.BzrCommandError(str(e) + "\n"
3112
'To commit to master branch, run update and then commit.\n'
3113
'You can also pass --local to commit to continue working '
3114
'disconnected.')
3198
3115
3199
3116
3200
3117
class cmd_check(Command):
3201
__doc__ = """Validate working tree structure, branch consistency and repository history.
3118
"""Validate working tree structure, branch consistency and repository history.
3202
3119
3203
3120
This command checks various invariants about branch and repository storage
3204
3121
to detect data corruption or bzr bugs.
3268
3185
3269
3186
3270
3187
class cmd_upgrade(Command):
3271
__doc__ = """Upgrade branch storage to current format.
3188
"""Upgrade branch storage to current format.
3272
3189
3273
3190
The check command or bzr developers may sometimes advise you to run
3274
3191
this command. When the default format has changed you may also be warned
3292
3209
3293
3210
3294
3211
class cmd_whoami(Command):
3295
__doc__ = """Show or set bzr user id.
3212
"""Show or set bzr user id.
3296
3213
3297
3214
:Examples:
3298
3215
Show the email of the current user::
3342
3259
3343
3260
3344
3261
class cmd_nick(Command):
3345
__doc__ = """Print or set the branch nickname.
3262
"""Print or set the branch nickname.
3346
3263
3347
3264
If unset, the tree root directory name is used as the nickname.
3348
3265
To print the current nickname, execute with no argument.
3362
3279
3363
3280
@display_command
3364
3281
def printme(self, branch):
3365
self.outf.write('%s\n' % branch.nick)
3282
print branch.nick
3366
3283
3367
3284
3368
3285
class cmd_alias(Command):
3369
__doc__ = """Set/unset and display aliases.
3286
"""Set/unset and display aliases.
3370
3287
3371
3288
:Examples:
3372
3289
Show the current aliases::
3436
3353
3437
3354
3438
3355
class cmd_selftest(Command):
3439
__doc__ = """Run internal test suite.
3356
"""Run internal test suite.
3440
3357
3441
3358
If arguments are given, they are regular expressions that say which tests
3442
3359
should run. Tests matching any expression are run, and other tests are
3486
3403
def get_transport_type(typestring):
3487
3404
"""Parse and return a transport specifier."""
3488
3405
if typestring == "sftp":
3489
from bzrlib.tests import stub_sftp
3490
return stub_sftp.SFTPAbsoluteServer
3406
from bzrlib.transport.sftp import SFTPAbsoluteServer
3407
return SFTPAbsoluteServer
3491
3408
if typestring == "memory":
3492
from bzrlib.tests import test_server
3493
return memory.MemoryServer
3409
from bzrlib.transport.memory import MemoryServer
3410
return MemoryServer
3494
3411
if typestring == "fakenfs":
3495
from bzrlib.tests import test_server
3496
return test_server.FakeNFSServer
3412
from bzrlib.transport.fakenfs import FakeNFSServer
3413
return FakeNFSServer
3497
3414
msg = "No known transport type %s. Supported types are: sftp\n" %\
3498
3415
(typestring)
3499
3416
raise errors.BzrCommandError(msg)
3583
3500
raise errors.BzrCommandError("subunit not available. subunit "
3584
3501
"needs to be installed to use --subunit.")
3585
3502
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
3503
if parallel:
3592
3504
self.additional_selftest_args.setdefault(
3593
3505
'suite_decorators', []).append(parallel)
3597
3509
verbose = not is_quiet()
3598
3510
# TODO: should possibly lock the history file...
3599
3511
benchfile = open(".perf_history", "at", buffering=1)
3600
self.add_cleanup(benchfile.close)
3601
3512
else:
3602
3513
test_suite_factory = None
3603
3514
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)
3515
try:
3516
selftest_kwargs = {"verbose": verbose,
3517
"pattern": pattern,
3518
"stop_on_failure": one,
3519
"transport": transport,
3520
"test_suite_factory": test_suite_factory,
3521
"lsprof_timed": lsprof_timed,
3522
"lsprof_tests": lsprof_tests,
3523
"bench_history": benchfile,
3524
"matching_tests_first": first,
3525
"list_only": list_only,
3526
"random_seed": randomize,
3527
"exclude_pattern": exclude,
3528
"strict": strict,
3529
"load_list": load_list,
3530
"debug_flags": debugflag,
3531
"starting_with": starting_with
3532
}
3533
selftest_kwargs.update(self.additional_selftest_args)
3534
result = selftest(**selftest_kwargs)
3535
finally:
3536
if benchfile is not None:
3537
benchfile.close()
3623
3538
return int(not result)
3624
3539
3625
3540
3626
3541
class cmd_version(Command):
3627
__doc__ = """Show version of bzr."""
3542
"""Show version of bzr."""
3628
3543
3629
3544
encoding_type = 'replace'
3630
3545
takes_options = [
3641
3556
3642
3557
3643
3558
class cmd_rocks(Command):
3644
__doc__ = """Statement of optimism."""
3559
"""Statement of optimism."""
3645
3560
3646
3561
hidden = True
3647
3562
3648
3563
@display_command
3649
3564
def run(self):
3650
self.outf.write("It sure does!\n")
3565
print "It sure does!"
3651
3566
3652
3567
3653
3568
class cmd_find_merge_base(Command):
3654
__doc__ = """Find and print a base revision for merging two branches."""
3569
"""Find and print a base revision for merging two branches."""
3655
3570
# TODO: Options to specify revisions on either side, as if
3656
3571
# merging only part of the history.
3657
3572
takes_args = ['branch', 'other']
3663
3578
3664
3579
branch1 = Branch.open_containing(branch)[0]
3665
3580
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)
3581
branch1.lock_read()
3582
try:
3583
branch2.lock_read()
3584
try:
3585
last1 = ensure_null(branch1.last_revision())
3586
last2 = ensure_null(branch2.last_revision())
3587
3588
graph = branch1.repository.get_graph(branch2.repository)
3589
base_rev_id = graph.find_unique_lca(last1, last2)
3590
3591
print 'merge base is revision %s' % base_rev_id
3592
finally:
3593
branch2.unlock()
3594
finally:
3595
branch1.unlock()
3675
3596
3676
3597
3677
3598
class cmd_merge(Command):
3678
__doc__ = """Perform a three-way merge.
3599
"""Perform a three-way merge.
3679
3600
3680
3601
The source of the merge can be specified either in the form of a branch,
3681
3602
or in the form of a path to a file containing a merge directive generated
3710
3631
committed to record the result of the merge.
3711
3632
3712
3633
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.
3634
--force is given.
3719
3635
3720
3636
To select only some changes to merge, use "merge -i", which will prompt
3721
3637
you to apply each diff hunk and file change, similar to "shelve".
3736
3652
To apply a merge directive contained in /tmp/merge::
3737
3653
3738
3654
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
3655
"""
3747
3656
3748
3657
encoding_type = 'exact'
3806
3715
view_info = _get_view_info_for_change_reporter(tree)
3807
3716
change_reporter = delta._ChangeReporter(
3808
3717
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
3718
cleanups = []
3719
try:
3720
pb = ui.ui_factory.nested_progress_bar()
3721
cleanups.append(pb.finished)
3722
tree.lock_write()
3723
cleanups.append(tree.unlock)
3724
if location is not None:
3725
try:
3726
mergeable = bundle.read_mergeable_from_url(location,
3727
possible_transports=possible_transports)
3728
except errors.NotABundle:
3729
mergeable = None
3730
else:
3731
if uncommitted:
3732
raise errors.BzrCommandError('Cannot use --uncommitted'
3733
' with bundles or merge directives.')
3734
3735
if revision is not None:
3736
raise errors.BzrCommandError(
3737
'Cannot use -r with merge directives or bundles')
3738
merger, verified = _mod_merge.Merger.from_mergeable(tree,
3739
mergeable, pb)
3740
3741
if merger is None and uncommitted:
3742
if revision is not None and len(revision) > 0:
3743
raise errors.BzrCommandError('Cannot use --uncommitted and'
3744
' --revision at the same time.')
3745
merger = self.get_merger_from_uncommitted(tree, location, pb,
3746
cleanups)
3747
allow_pending = False
3748
3749
if merger is None:
3750
merger, allow_pending = self._get_merger_from_branch(tree,
3751
location, revision, remember, possible_transports, pb)
3752
3753
merger.merge_type = merge_type
3754
merger.reprocess = reprocess
3755
merger.show_base = show_base
3756
self.sanity_check_merger(merger)
3757
if (merger.base_rev_id == merger.other_rev_id and
3758
merger.other_rev_id is not None):
3759
note('Nothing to do.')
3760
return 0
3761
if pull:
3762
if merger.interesting_files is not None:
3763
raise errors.BzrCommandError('Cannot pull individual files')
3764
if (merger.base_rev_id == tree.last_revision()):
3765
result = tree.pull(merger.other_branch, False,
3766
merger.other_rev_id)
3767
result.report(self.outf)
3768
return 0
3769
if merger.this_basis is None:
3770
raise errors.BzrCommandError(
3771
"This branch has no commits."
3772
" (perhaps you would prefer 'bzr pull')")
3773
if preview:
3774
return self._do_preview(merger, cleanups)
3775
elif interactive:
3776
return self._do_interactive(merger, cleanups)
3818
3777
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):
3778
return self._do_merge(merger, change_reporter, allow_pending,
3779
verified)
3780
finally:
3781
for cleanup in reversed(cleanups):
3782
cleanup()
3783
3784
def _get_preview(self, merger, cleanups):
3869
3785
tree_merger = merger.make_merger()
3870
3786
tt = tree_merger.make_preview_transform()
3871
self.add_cleanup(tt.finalize)
3787
cleanups.append(tt.finalize)
3872
3788
result_tree = tt.get_preview_tree()
3873
3789
return result_tree
3874
3790
3875
def _do_preview(self, merger):
3791
def _do_preview(self, merger, cleanups):
3876
3792
from bzrlib.diff import show_diff_trees
3877
result_tree = self._get_preview(merger)
3793
result_tree = self._get_preview(merger, cleanups)
3878
3794
show_diff_trees(merger.this_tree, result_tree, self.outf,
3879
3795
old_label='', new_label='')
3880
3796
3890
3806
else:
3891
3807
return 0
3892
3808
3893
def _do_interactive(self, merger):
3809
def _do_interactive(self, merger, cleanups):
3894
3810
"""Perform an interactive merge.
3895
3811
3896
3812
This works by generating a preview tree of the merge, then using
3898
3814
and the preview tree.
3899
3815
"""
3900
3816
from bzrlib import shelf_ui
3901
result_tree = self._get_preview(merger)
3817
result_tree = self._get_preview(merger, cleanups)
3902
3818
writer = bzrlib.option.diff_writer_registry.get()
3903
3819
shelver = shelf_ui.Shelver(merger.this_tree, result_tree, destroy=True,
3904
3820
reporter=shelf_ui.ApplyReporter(),
3905
3821
diff_writer=writer(sys.stdout))
3906
try:
3907
shelver.run()
3908
finally:
3909
shelver.finalize()
3822
shelver.run()
3910
3823
3911
3824
def sanity_check_merger(self, merger):
3912
3825
if (merger.show_base and
3972
3885
allow_pending = True
3973
3886
return merger, allow_pending
3974
3887
3975
def get_merger_from_uncommitted(self, tree, location, pb):
3888
def get_merger_from_uncommitted(self, tree, location, pb, cleanups):
3976
3889
"""Get a merger for uncommitted changes.
3977
3890
3978
3891
:param tree: The tree the merger should apply to.
3979
3892
:param location: The location containing uncommitted changes.
3980
3893
:param pb: The progress bar to use for showing progress.
3894
:param cleanups: A list of operations to perform to clean up the
3895
temporary directories, unfinalized objects, etc.
3981
3896
"""
3982
3897
location = self._select_branch_location(tree, location)[0]
3983
3898
other_tree, other_path = WorkingTree.open_containing(location)
4035
3950
4036
3951
4037
3952
class cmd_remerge(Command):
4038
__doc__ = """Redo a merge.
3953
"""Redo a merge.
4039
3954
4040
3955
Use this if you want to try a different merge technique while resolving
4041
3956
conflicts. Some merge techniques are better than others, and remerge
4066
3981
4067
3982
def run(self, file_list=None, merge_type=None, show_base=False,
4068
3983
reprocess=False):
4069
from bzrlib.conflicts import restore
4070
3984
if merge_type is None:
4071
3985
merge_type = _mod_merge.Merge3Merger
4072
3986
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
3987
tree.lock_write()
3988
try:
3989
parents = tree.get_parent_ids()
3990
if len(parents) != 2:
3991
raise errors.BzrCommandError("Sorry, remerge only works after normal"
3992
" merges. Not cherrypicking or"
3993
" multi-merges.")
3994
repository = tree.branch.repository
3995
interesting_ids = None
3996
new_conflicts = []
3997
conflicts = tree.conflicts()
3998
if file_list is not None:
3999
interesting_ids = set()
4000
for filename in file_list:
4001
file_id = tree.path2id(filename)
4002
if file_id is None:
4003
raise errors.NotVersionedError(filename)
4004
interesting_ids.add(file_id)
4005
if tree.kind(file_id) != "directory":
4006
continue
4092
4007
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:
4008
for name, ie in tree.inventory.iter_entries(file_id):
4009
interesting_ids.add(ie.file_id)
4010
new_conflicts = conflicts.select_conflicts(tree, file_list)[0]
4011
else:
4012
# Remerge only supports resolving contents conflicts
4013
allowed_conflicts = ('text conflict', 'contents conflict')
4014
restore_files = [c.path for c in conflicts
4015
if c.typestring in allowed_conflicts]
4016
_mod_merge.transform_tree(tree, tree.basis_tree(), interesting_ids)
4017
tree.set_conflicts(ConflictList(new_conflicts))
4018
if file_list is not None:
4019
restore_files = file_list
4020
for filename in restore_files:
4021
try:
4022
restore(tree.abspath(filename))
4023
except errors.NotConflicted:
4024
pass
4025
# Disable pending merges, because the file texts we are remerging
4026
# have not had those merges performed. If we use the wrong parents
4027
# list, we imply that the working tree text has seen and rejected
4028
# all the changes from the other tree, when in fact those changes
4029
# have not yet been seen.
4030
pb = ui.ui_factory.nested_progress_bar()
4031
tree.set_parent_ids(parents[:1])
4106
4032
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()
4033
merger = _mod_merge.Merger.from_revision_ids(pb,
4034
tree, parents[1])
4035
merger.interesting_ids = interesting_ids
4036
merger.merge_type = merge_type
4037
merger.show_base = show_base
4038
merger.reprocess = reprocess
4039
conflicts = merger.do_merge()
4040
finally:
4041
tree.set_parent_ids(parents)
4042
pb.finished()
4123
4043
finally:
4124
tree.set_parent_ids(parents)
4044
tree.unlock()
4125
4045
if conflicts > 0:
4126
4046
return 1
4127
4047
else:
4129
4049
4130
4050
4131
4051
class cmd_revert(Command):
4132
__doc__ = """Revert files to a previous revision.
4052
"""Revert files to a previous revision.
4133
4053
4134
4054
Giving a list of files will revert only those files. Otherwise, all files
4135
4055
will be reverted. If the revision is not specified with '--revision', the
4154
4074
created as above. Directories containing unknown files will not be
4155
4075
deleted.
4156
4076
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
4077
The working tree contains a list of pending merged revisions, which will
4078
be included as parents in the next commit. Normally, revert clears that
4079
list as well as reverting the files. If any files are specified, revert
4080
leaves the pending merge list alone and reverts only the files. Use "bzr
4081
revert ." in the tree root to revert all files but keep the merge record,
4082
and "bzr revert --forget-merges" to clear the pending merge list without
4164
4083
reverting any files.
4165
4166
Using "bzr revert --forget-merges", it is possible to apply all of the
4167
changes from a branch in a single revision. To do this, perform the merge
4168
as desired. Then doing revert with the "--forget-merges" option will keep
4169
the content of the tree as it was, but it will clear the list of pending
4170
merges. The next commit will then contain all of the changes that are
4171
present in the other branch, but without any other parent revisions.
4172
Because this technique forgets where these changes originated, it may
4173
cause additional conflicts on later merges involving the same source and
4174
target branches.
4175
4084
"""
4176
4085
4177
4086
_see_also = ['cat', 'export']
4186
4095
def run(self, revision=None, no_backup=False, file_list=None,
4187
4096
forget_merges=None):
4188
4097
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)
4098
tree.lock_write()
4099
try:
4100
if forget_merges:
4101
tree.set_parent_ids(tree.get_parent_ids()[:1])
4102
else:
4103
self._revert_tree_to_revision(tree, revision, file_list, no_backup)
4104
finally:
4105
tree.unlock()
4194
4106
4195
4107
@staticmethod
4196
4108
def _revert_tree_to_revision(tree, revision, file_list, no_backup):
4197
4109
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)
4110
pb = ui.ui_factory.nested_progress_bar()
4111
try:
4112
tree.revert(file_list, rev_tree, not no_backup, pb,
4113
report_changes=True)
4114
finally:
4115
pb.finished()
4200
4116
4201
4117
4202
4118
class cmd_assert_fail(Command):
4203
__doc__ = """Test reporting of assertion failures"""
4119
"""Test reporting of assertion failures"""
4204
4120
# intended just for use in testing
4205
4121
4206
4122
hidden = True
4210
4126
4211
4127
4212
4128
class cmd_help(Command):
4213
__doc__ = """Show help on a command or other topic.
4129
"""Show help on a command or other topic.
4214
4130
"""
4215
4131
4216
4132
_see_also = ['topics']
4229
4145
4230
4146
4231
4147
class cmd_shell_complete(Command):
4232
__doc__ = """Show appropriate completions for context.
4148
"""Show appropriate completions for context.
4233
4149
4234
4150
For a list of all available commands, say 'bzr shell-complete'.
4235
4151
"""
4244
4160
4245
4161
4246
4162
class cmd_missing(Command):
4247
__doc__ = """Show unmerged/unpulled revisions between two branches.
4163
"""Show unmerged/unpulled revisions between two branches.
4248
4164
4249
4165
OTHER_BRANCH may be local or remote.
4250
4166
4251
4167
To filter on a range of revisions, you can use the command -r begin..end
4252
4168
-r revision requests a specific revision, -r ..end or -r begin.. are
4253
4169
also valid.
4254
4255
:Exit values:
4256
1 - some missing revisions
4257
0 - no missing revisions
4258
4170
4259
4171
:Examples:
4260
4172
4328
4240
restrict = 'remote'
4329
4241
4330
4242
local_branch = Branch.open_containing(u".")[0]
4331
self.add_cleanup(local_branch.lock_read().unlock)
4332
4333
4243
parent = local_branch.get_parent()
4334
4244
if other_branch is None:
4335
4245
other_branch = parent
4344
4254
remote_branch = Branch.open(other_branch)
4345
4255
if remote_branch.base == local_branch.base:
4346
4256
remote_branch = local_branch
4347
else:
4348
self.add_cleanup(remote_branch.lock_read().unlock)
4349
4257
4350
4258
local_revid_range = _revision_range_to_revid_range(
4351
4259
_get_revision_range(my_revision, local_branch,
4355
4263
_get_revision_range(revision,
4356
4264
remote_branch, self.name()))
4357
4265
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()
4266
local_branch.lock_read()
4267
try:
4268
remote_branch.lock_read()
4269
try:
4270
local_extra, remote_extra = find_unmerged(
4271
local_branch, remote_branch, restrict,
4272
backward=not reverse,
4273
include_merges=include_merges,
4274
local_revid_range=local_revid_range,
4275
remote_revid_range=remote_revid_range)
4276
4277
if log_format is None:
4278
registry = log.log_formatter_registry
4279
log_format = registry.get_default(local_branch)
4280
lf = log_format(to_file=self.outf,
4281
show_ids=show_ids,
4282
show_timezone='original')
4283
4284
status_code = 0
4285
if local_extra and not theirs_only:
4286
message("You have %d extra revision(s):\n" %
4287
len(local_extra))
4288
for revision in iter_log_revisions(local_extra,
4289
local_branch.repository,
4290
verbose):
4291
lf.log_revision(revision)
4292
printed_local = True
4293
status_code = 1
4294
else:
4295
printed_local = False
4296
4297
if remote_extra and not mine_only:
4298
if printed_local is True:
4299
message("\n\n\n")
4300
message("You are missing %d revision(s):\n" %
4301
len(remote_extra))
4302
for revision in iter_log_revisions(remote_extra,
4303
remote_branch.repository,
4304
verbose):
4305
lf.log_revision(revision)
4306
status_code = 1
4307
4308
if mine_only and not local_extra:
4309
# We checked local, and found nothing extra
4310
message('This branch is up to date.\n')
4311
elif theirs_only and not remote_extra:
4312
# We checked remote, and found nothing extra
4313
message('Other branch is up to date.\n')
4314
elif not (mine_only or theirs_only or local_extra or
4315
remote_extra):
4316
# We checked both branches, and neither one had extra
4317
# revisions
4318
message("Branches are up to date.\n")
4319
finally:
4320
remote_branch.unlock()
4321
finally:
4322
local_branch.unlock()
4408
4323
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)
4324
local_branch.lock_write()
4325
try:
4326
# handle race conditions - a parent might be set while we run.
4327
if local_branch.get_parent() is None:
4328
local_branch.set_parent(remote_branch.base)
4329
finally:
4330
local_branch.unlock()
4413
4331
return status_code
4414
4332
4415
4333
4416
4334
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
"""
4335
"""Compress the data within a repository."""
4434
4336
4435
4337
_see_also = ['repositories']
4436
4338
takes_args = ['branch_or_repo?']
4437
takes_options = [
4438
Option('clean-obsolete-packs', 'Delete obsolete packs to save disk space.'),
4439
]
4440
4339
4441
def run(self, branch_or_repo='.', clean_obsolete_packs=False):
4340
def run(self, branch_or_repo='.'):
4442
4341
dir = bzrdir.BzrDir.open_containing(branch_or_repo)[0]
4443
4342
try:
4444
4343
branch = dir.open_branch()
4445
4344
repository = branch.repository
4446
4345
except errors.NotBranchError:
4447
4346
repository = dir.open_repository()
4448
repository.pack(clean_obsolete_packs=clean_obsolete_packs)
4347
repository.pack()
4449
4348
4450
4349
4451
4350
class cmd_plugins(Command):
4452
__doc__ = """List the installed plugins.
4351
"""List the installed plugins.
4453
4352
4454
4353
This command displays the list of installed plugins including
4455
4354
version of plugin and a short description of each.
4462
4361
adding new commands, providing additional network transports and
4463
4362
customizing log output.
4464
4363
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.
4364
See the Bazaar web site, http://bazaar-vcs.org, for further
4365
information on plugins including where to find them and how to
4366
install them. Instructions are also provided there on how to
4367
write new plugins using the Python programming language.
4469
4368
"""
4470
4369
takes_options = ['verbose']
4471
4370
4486
4385
doc = '(no description)'
4487
4386
result.append((name_ver, doc, plugin.path()))
4488
4387
for name_ver, doc, path in sorted(result):
4489
self.outf.write("%s\n" % name_ver)
4490
self.outf.write(" %s\n" % doc)
4388
print name_ver
4389
print ' ', doc
4491
4390
if verbose:
4492
self.outf.write(" %s\n" % path)
4493
self.outf.write("\n")
4391
print ' ', path
4392
print
4494
4393
4495
4394
4496
4395
class cmd_testament(Command):
4497
__doc__ = """Show testament (signing-form) of a revision."""
4396
"""Show testament (signing-form) of a revision."""
4498
4397
takes_options = [
4499
4398
'revision',
4500
4399
Option('long', help='Produce long-format testament.'),
4512
4411
b = Branch.open_containing(branch)[0]
4513
4412
else:
4514
4413
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())
4414
b.lock_read()
4415
try:
4416
if revision is None:
4417
rev_id = b.last_revision()
4418
else:
4419
rev_id = revision[0].as_revision_id(b)
4420
t = testament_class.from_revision(b.repository, rev_id)
4421
if long:
4422
sys.stdout.writelines(t.as_text_lines())
4423
else:
4424
sys.stdout.write(t.as_short_text())
4425
finally:
4426
b.unlock()
4525
4427
4526
4428
4527
4429
class cmd_annotate(Command):
4528
__doc__ = """Show the origin of each line in a file.
4430
"""Show the origin of each line in a file.
4529
4431
4530
4432
This prints out the given file with an annotation on the left side
4531
4433
indicating which revision, author and date introduced the change.
4552
4454
wt, branch, relpath = \
4553
4455
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
4554
4456
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)
4457
wt.lock_read()
4458
else:
4459
branch.lock_read()
4460
try:
4461
tree = _get_one_revision_tree('annotate', revision, branch=branch)
4462
if wt is not None:
4463
file_id = wt.path2id(relpath)
4464
else:
4465
file_id = tree.path2id(relpath)
4466
if file_id is None:
4467
raise errors.NotVersionedError(filename)
4468
file_version = tree.inventory[file_id].revision
4469
if wt is not None and revision is None:
4470
# If there is a tree and we're not annotating historical
4471
# versions, annotate the working tree's content.
4472
annotate_file_tree(wt, file_id, self.outf, long, all,
4473
show_ids=show_ids)
4474
else:
4475
annotate_file(branch, file_version, file_id, long, all, self.outf,
4476
show_ids=show_ids)
4477
finally:
4478
if wt is not None:
4479
wt.unlock()
4480
else:
4481
branch.unlock()
4575
4482
4576
4483
4577
4484
class cmd_re_sign(Command):
4578
__doc__ = """Create a digital signature for an existing revision."""
4485
"""Create a digital signature for an existing revision."""
4579
4486
# TODO be able to replace existing ones.
4580
4487
4581
4488
hidden = True # is this right ?
4588
4495
if revision_id_list is None and revision is None:
4589
4496
raise errors.BzrCommandError('You must supply either --revision or a revision_id')
4590
4497
b = WorkingTree.open_containing(u'.')[0].branch
4591
self.add_cleanup(b.lock_write().unlock)
4592
return self._run(b, revision_id_list, revision)
4498
b.lock_write()
4499
try:
4500
return self._run(b, revision_id_list, revision)
4501
finally:
4502
b.unlock()
4593
4503
4594
4504
def _run(self, b, revision_id_list, revision):
4595
4505
import bzrlib.gpg as gpg
4640
4550
4641
4551
4642
4552
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.
4553
"""Convert the current branch into a checkout of the supplied branch.
4645
4554
4646
4555
Once converted into a checkout, commits must succeed on the master branch
4647
4556
before they will be applied to the local branch.
4665
4574
'This format does not remember old locations.')
4666
4575
else:
4667
4576
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')
4577
raise errors.BzrCommandError('No location supplied and no '
4578
'previous location known')
4673
4579
b_other = Branch.open(location)
4674
4580
try:
4675
4581
b.bind(b_other)
4681
4587
4682
4588
4683
4589
class cmd_unbind(Command):
4684
__doc__ = """Convert the current checkout into a regular branch.
4590
"""Convert the current checkout into a regular branch.
4685
4591
4686
4592
After unbinding, the local branch is considered independent and subsequent
4687
4593
commits will be local only.
4698
4604
4699
4605
4700
4606
class cmd_uncommit(Command):
4701
__doc__ = """Remove the last committed revision.
4607
"""Remove the last committed revision.
4702
4608
4703
4609
--verbose will print out what is being removed.
4704
4610
--dry-run will go through all the motions, but not actually
4744
4650
b = control.open_branch()
4745
4651
4746
4652
if tree is not None:
4747
self.add_cleanup(tree.lock_write().unlock)
4653
tree.lock_write()
4748
4654
else:
4749
self.add_cleanup(b.lock_write().unlock)
4750
return self._run(b, tree, dry_run, verbose, revision, force, local=local)
4655
b.lock_write()
4656
try:
4657
return self._run(b, tree, dry_run, verbose, revision, force,
4658
local=local)
4659
finally:
4660
if tree is not None:
4661
tree.unlock()
4662
else:
4663
b.unlock()
4751
4664
4752
4665
def _run(self, b, tree, dry_run, verbose, revision, force, local=False):
4753
4666
from bzrlib.log import log_formatter, show_log
4785
4698
end_revision=last_revno)
4786
4699
4787
4700
if dry_run:
4788
self.outf.write('Dry-run, pretending to remove'
4789
' the above revisions.\n')
4701
print 'Dry-run, pretending to remove the above revisions.'
4702
if not force:
4703
val = raw_input('Press <enter> to continue')
4790
4704
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
4705
print 'The above revision(s) will be removed.'
4706
if not force:
4707
val = raw_input('Are you sure [y/N]? ')
4708
if val.lower() not in ('y', 'yes'):
4709
print 'Canceled'
4710
return 0
4797
4711
4798
4712
mutter('Uncommitting from {%s} to {%s}',
4799
4713
last_rev_id, rev_id)
4800
4714
uncommit(b, tree=tree, dry_run=dry_run, verbose=verbose,
4801
4715
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)
4716
note('You can restore the old tip by running:\n'
4717
' bzr pull . -r revid:%s', last_rev_id)
4804
4718
4805
4719
4806
4720
class cmd_break_lock(Command):
4807
__doc__ = """Break a dead lock on a repository, branch or working directory.
4721
"""Break a dead lock on a repository, branch or working directory.
4808
4722
4809
4723
CAUTION: Locks should only be broken when you are sure that the process
4810
4724
holding the lock has been stopped.
4811
4725
4812
You can get information on what locks are open via the 'bzr info
4813
[location]' command.
4726
You can get information on what locks are open via the 'bzr info' command.
4814
4727
4815
4728
:Examples:
4816
4729
bzr break-lock
4817
bzr break-lock bzr+ssh://example.com/bzr/foo
4818
4730
"""
4819
4731
takes_args = ['location?']
4820
4732
4829
4741
4830
4742
4831
4743
class cmd_wait_until_signalled(Command):
4832
__doc__ = """Test helper for test_start_and_stop_bzr_subprocess_send_signal.
4744
"""Test helper for test_start_and_stop_bzr_subprocess_send_signal.
4833
4745
4834
4746
This just prints a line to signal when it is ready, then blocks on stdin.
4835
4747
"""
4843
4755
4844
4756
4845
4757
class cmd_serve(Command):
4846
__doc__ = """Run the bzr server."""
4758
"""Run the bzr server."""
4847
4759
4848
4760
aliases = ['server']
4849
4761
4909
4821
4910
4822
4911
4823
class cmd_join(Command):
4912
__doc__ = """Combine a tree into its containing tree.
4824
"""Combine a tree into its containing tree.
4913
4825
4914
4826
This command requires the target tree to be in a rich-root format.
4915
4827
4955
4867
4956
4868
4957
4869
class cmd_split(Command):
4958
__doc__ = """Split a subdirectory of a tree into a separate tree.
4870
"""Split a subdirectory of a tree into a separate tree.
4959
4871
4960
4872
This command will produce a target tree in a format that supports
4961
4873
rich roots, like 'rich-root' or 'rich-root-pack'. These formats cannot be
4981
4893
4982
4894
4983
4895
class cmd_merge_directive(Command):
4984
__doc__ = """Generate a merge directive for auto-merge tools.
4896
"""Generate a merge directive for auto-merge tools.
4985
4897
4986
4898
A directive requests a merge to be performed, and also provides all the
4987
4899
information necessary to do so. This means it must either include a
5080
4992
5081
4993
5082
4994
class cmd_send(Command):
5083
__doc__ = """Mail or create a merge-directive for submitting changes.
4995
"""Mail or create a merge-directive for submitting changes.
5084
4996
5085
4997
A merge directive provides many things needed for requesting merges:
5086
4998
5092
5004
directly from the merge directive, without retrieving data from a
5093
5005
branch.
5094
5006
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.
5007
If --no-bundle is specified, then public_branch is needed (and must be
5008
up-to-date), so that the receiver can perform the merge using the
5009
public_branch. The public_branch is always included if known, so that
5010
people can check it later.
5011
5012
The submit branch defaults to the parent, but can be overridden. Both
5013
submit branch and public branch will be remembered if supplied.
5014
5015
If a public_branch is known for the submit_branch, that public submit
5016
branch is used in the merge instructions. This means that a local mirror
5017
can be used as your actual submit branch, once you have set public_branch
5018
for that mirror.
5121
5019
5122
5020
Mail is sent using your preferred mail program. This should be transparent
5123
5021
on Windows (it uses MAPI). On Linux, it requires the xdg-email utility.
5143
5041
5144
5042
The merge directives created by bzr send may be applied using bzr merge or
5145
5043
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
5044
"""
5151
5045
5152
5046
encoding_type = 'exact'
5168
5062
short_name='f',
5169
5063
type=unicode),
5170
5064
Option('output', short_name='o',
5171
help='Write merge directive to this file or directory; '
5065
help='Write merge directive to this file; '
5172
5066
'use - for stdout.',
5173
5067
type=unicode),
5174
5068
Option('strict',
5197
5091
5198
5092
5199
5093
class cmd_bundle_revisions(cmd_send):
5200
__doc__ = """Create a merge-directive for submitting changes.
5094
"""Create a merge-directive for submitting changes.
5201
5095
5202
5096
A merge directive provides many things needed for requesting merges:
5203
5097
5270
5164
5271
5165
5272
5166
class cmd_tag(Command):
5273
__doc__ = """Create, remove or modify a tag naming a revision.
5167
"""Create, remove or modify a tag naming a revision.
5274
5168
5275
5169
Tags give human-meaningful names to revisions. Commands that take a -r
5276
5170
(--revision) option can be given -rtag:X, where X is any previously
5284
5178
5285
5179
To rename a tag (change the name but keep it on the same revsion), run ``bzr
5286
5180
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
5181
"""
5293
5182
5294
5183
_see_also = ['commit', 'tags']
5295
takes_args = ['tag_name?']
5184
takes_args = ['tag_name']
5296
5185
takes_options = [
5297
5186
Option('delete',
5298
5187
help='Delete this tag rather than placing it.',
5308
5197
'revision',
5309
5198
]
5310
5199
5311
def run(self, tag_name=None,
5200
def run(self, tag_name,
5312
5201
delete=None,
5313
5202
directory='.',
5314
5203
force=None,
5315
5204
revision=None,
5316
5205
):
5317
5206
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)
5207
branch.lock_write()
5208
try:
5209
if delete:
5210
branch.tags.delete_tag(tag_name)
5211
self.outf.write('Deleted tag %s.\n' % tag_name)
5331
5212
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)
5213
if revision:
5214
if len(revision) != 1:
5215
raise errors.BzrCommandError(
5216
"Tags can only be placed on a single revision, "
5217
"not on a range")
5218
revision_id = revision[0].as_revision_id(branch)
5219
else:
5220
revision_id = branch.last_revision()
5221
if (not force) and branch.tags.has_tag(tag_name):
5222
raise errors.TagAlreadyExists(tag_name)
5223
branch.tags.set_tag(tag_name, revision_id)
5224
self.outf.write('Created tag %s.\n' % tag_name)
5225
finally:
5226
branch.unlock()
5342
5227
5343
5228
5344
5229
class cmd_tags(Command):
5345
__doc__ = """List tags.
5230
"""List tags.
5346
5231
5347
5232
This command shows a table of tag names and the revisions they reference.
5348
5233
"""
5376
5261
if not tags:
5377
5262
return
5378
5263
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()
5264
branch.lock_read()
5265
try:
5266
if revision:
5267
graph = branch.repository.get_graph()
5268
rev1, rev2 = _get_revision_range(revision, branch, self.name())
5269
revid1, revid2 = rev1.rev_id, rev2.rev_id
5270
# only show revisions between revid1 and revid2 (inclusive)
5271
tags = [(tag, revid) for tag, revid in tags if
5272
graph.is_between(revid, revid1, revid2)]
5273
if sort == 'alpha':
5274
tags.sort()
5275
elif sort == 'time':
5276
timestamps = {}
5277
for tag, revid in tags:
5278
try:
5279
revobj = branch.repository.get_revision(revid)
5280
except errors.NoSuchRevision:
5281
timestamp = sys.maxint # place them at the end
5282
else:
5283
timestamp = revobj.timestamp
5284
timestamps[revid] = timestamp
5285
tags.sort(key=lambda x: timestamps[x[1]])
5286
if not show_ids:
5287
# [ (tag, revid), ... ] -> [ (tag, dotted_revno), ... ]
5288
for index, (tag, revid) in enumerate(tags):
5289
try:
5290
revno = branch.revision_id_to_dotted_revno(revid)
5291
if isinstance(revno, tuple):
5292
revno = '.'.join(map(str, revno))
5293
except errors.NoSuchRevision:
5294
# Bad tag data/merges can lead to tagged revisions
5295
# which are not in this branch. Fail gracefully ...
5296
revno = '?'
5297
tags[index] = (tag, revno)
5298
finally:
5299
branch.unlock()
5413
5300
for tag, revspec in tags:
5414
5301
self.outf.write('%-20s %s\n' % (tag, revspec))
5415
5302
5416
5303
5417
5304
class cmd_reconfigure(Command):
5418
__doc__ = """Reconfigure the type of a bzr directory.
5305
"""Reconfigure the type of a bzr directory.
5419
5306
5420
5307
A target configuration must be specified.
5421
5308
5506
5393
5507
5394
5508
5395
class cmd_switch(Command):
5509
__doc__ = """Set the branch of a checkout and update.
5396
"""Set the branch of a checkout and update.
5510
5397
5511
5398
For lightweight checkouts, this changes the branch being referenced.
5512
5399
For heavyweight checkouts, this checks that there are no local commits
5528
5415
that of the master.
5529
5416
"""
5530
5417
5531
takes_args = ['to_location?']
5418
takes_args = ['to_location']
5532
5419
takes_options = [Option('force',
5533
5420
help='Switch even if local commits will be lost.'),
5534
'revision',
5535
5421
Option('create-branch', short_name='b',
5536
5422
help='Create the target branch from this one before'
5537
5423
' switching to it.'),
5538
]
5424
]
5539
5425
5540
def run(self, to_location=None, force=False, create_branch=False,
5541
revision=None):
5426
def run(self, to_location, force=False, create_branch=False):
5542
5427
from bzrlib import switch
5543
5428
tree_location = '.'
5544
revision = _get_one_revision('switch', revision)
5545
5429
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
5430
try:
5552
5431
branch = control_dir.open_branch()
5553
5432
had_explicit_nick = branch.get_config().has_explicit_nickname()
5558
5437
if branch is None:
5559
5438
raise errors.BzrCommandError('cannot create branch without'
5560
5439
' source branch')
5561
to_location = directory_service.directories.dereference(
5562
to_location)
5563
5440
if '/' not in to_location and '\\' not in to_location:
5564
5441
# This path is meant to be relative to the existing branch
5565
5442
this_url = self._get_branch_location(control_dir)
5567
5444
to_branch = branch.bzrdir.sprout(to_location,
5568
5445
possible_transports=[branch.bzrdir.root_transport],
5569
5446
source_branch=branch).open_branch()
5447
# try:
5448
# from_branch = control_dir.open_branch()
5449
# except errors.NotBranchError:
5450
# raise BzrCommandError('Cannot create a branch from this'
5451
# ' location when we cannot open this branch')
5452
# from_branch.bzrdir.sprout(
5453
pass
5570
5454
else:
5571
5455
try:
5572
5456
to_branch = Branch.open(to_location)
5574
5458
this_url = self._get_branch_location(control_dir)
5575
5459
to_branch = Branch.open(
5576
5460
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)
5461
switch.switch(control_dir, to_branch, force)
5580
5462
if had_explicit_nick:
5581
5463
branch = control_dir.open_branch() #get the new branch!
5582
5464
branch.nick = to_branch.nick
5602
5484
5603
5485
5604
5486
class cmd_view(Command):
5605
__doc__ = """Manage filtered views.
5487
"""Manage filtered views.
5606
5488
5607
5489
Views provide a mask over the tree so that users can focus on
5608
5490
a subset of a tree when doing their work. After creating a view,
5756
5638
5757
5639
5758
5640
class cmd_hooks(Command):
5759
__doc__ = """Show hooks."""
5641
"""Show hooks."""
5760
5642
5761
5643
hidden = True
5762
5644
5775
5657
self.outf.write(" <no hooks installed>\n")
5776
5658
5777
5659
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
5660
class cmd_shelve(Command):
5804
__doc__ = """Temporarily set aside some changes from the current tree.
5661
"""Temporarily set aside some changes from the current tree.
5805
5662
5806
5663
Shelve allows you to temporarily put changes you've made "on the shelf",
5807
5664
ie. out of the way, until a later time when you can bring them back from
5860
5717
5861
5718
def run_for_list(self):
5862
5719
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
5720
tree.lock_read()
5721
try:
5722
manager = tree.get_shelf_manager()
5723
shelves = manager.active_shelves()
5724
if len(shelves) == 0:
5725
note('No shelved changes.')
5726
return 0
5727
for shelf_id in reversed(shelves):
5728
message = manager.get_metadata(shelf_id).get('message')
5729
if message is None:
5730
message = '<no message>'
5731
self.outf.write('%3d: %s\n' % (shelf_id, message))
5732
return 1
5733
finally:
5734
tree.unlock()
5875
5735
5876
5736
5877
5737
class cmd_unshelve(Command):
5878
__doc__ = """Restore shelved changes.
5738
"""Restore shelved changes.
5879
5739
5880
5740
By default, the most recently shelved changes are restored. However if you
5881
5741
specify a shelf by id those changes will be restored instead. This works
5889
5749
enum_switch=False, value_switches=True,
5890
5750
apply="Apply changes and remove from the shelf.",
5891
5751
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.",
5752
delete_only="Delete changes without applying them."
5896
5753
)
5897
5754
]
5898
5755
_see_also = ['shelve']
5907
5764
5908
5765
5909
5766
class cmd_clean_tree(Command):
5910
__doc__ = """Remove unwanted files from working tree.
5767
"""Remove unwanted files from working tree.
5911
5768
5912
5769
By default, only unknown files, not ignored files, are deleted. Versioned
5913
5770
files are never deleted.
5941
5798
5942
5799
5943
5800
class cmd_reference(Command):
5944
__doc__ = """list, view and set branch locations for nested trees.
5801
"""list, view and set branch locations for nested trees.
5945
5802
5946
5803
If no arguments are provided, lists the branch locations for nested trees.
5947
5804
If one argument is provided, display the branch location for that tree.
5987
5844
self.outf.write('%s %s\n' % (path, location))
5988
5845
5989
5846
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)
5847
# these get imported and then picked up by the scan for cmd_*
5848
# TODO: Some more consistent way to split command definitions across files;
5849
# we do need to load at least some information about them to know of
5850
# aliases. ideally we would avoid loading the implementation until the
5851
# details were needed.
5852
from bzrlib.cmd_version_info import cmd_version_info
5853
from bzrlib.conflicts import cmd_resolve, cmd_conflicts, restore
5854
from bzrlib.bundle.commands import (
5855
cmd_bundle_info,
5856
)
5857
from bzrlib.foreign import cmd_dpush
5858
from bzrlib.sign_my_commits import cmd_sign_my_commits
5859
from bzrlib.weave_commands import cmd_versionedfile_list, \
5860
cmd_weave_plan_merge, cmd_weave_merge_text
Loggerhead is a web-based interface for Breezy
Version: 2.0.1