To get this branch, use:
bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
« back to all changes in this revision
Viewing changes to bzrlib/builtins.py
- browse files at revision 5200.3.2
- compare with another revision
- download diff
- download tarball
- view history from revision 5200.3.2
- Committer: Robert Collins
- Date: 2010-05-06 11:08:10 UTC
- mto: This revision was merged to the branch mainline in revision 5223.
- Revision ID: robertc@robertcollins.net-20100506110810-h3j07fh5gmw54s25
Cleaner matcher matching revised unlocking protocol.
- files added:
- .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
- doc/ja
- doc/ja/_static
- doc/ja/_templates
- doc/ja/mini-tutorial
- doc/ja/tutorials
- doc/ja/upgrade-guide
- doc/ja/user-guide
- doc/ja/user-guide/images
- doc/ja/user-reference
- files removed:
- bzrlib/textui.py
- files renamed:
- bzrlib/help_topics/en/conflicts.txt => bzrlib/help_topics/en/conflict-types.txt
- doc/es/user-guide/resolving_conflicts.txt => bzrlib/help_topics/es/conflict-types.txt
- bzrlib/tests/test_bencode.py => bzrlib/tests/test__bencode.py
- files modified:
- .bzrignore
added
removed
bzrlib/builtins.py
1
# Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Canonical Ltd
1
# Copyright (C) 2005-2010 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,
34
35
delta,
35
36
config,
36
37
errors,
43
44
reconfigure,
44
45
rename_map,
45
46
revision as _mod_revision,
47
static_tuple,
46
48
symbol_versioning,
49
timestamp,
47
50
transport,
48
51
ui,
49
52
urlutils,
51
54
)
52
55
from bzrlib.branch import Branch
53
56
from bzrlib.conflicts import ConflictList
57
from bzrlib.transport import memory
54
58
from bzrlib.revisionspec import RevisionSpec, RevisionInfo
55
59
from bzrlib.smtp_connection import SMTPConnection
56
60
from bzrlib.workingtree import WorkingTree
57
61
""")
58
62
59
from bzrlib.commands import Command, display_command
63
from bzrlib.commands import (
64
Command,
65
builtin_command_registry,
66
display_command,
67
)
60
68
from bzrlib.option import (
61
69
ListOption,
62
70
Option,
231
239
# opens the branch?)
232
240
233
241
class cmd_status(Command):
234
"""Display status summary.
242
__doc__ = """Display status summary.
235
243
236
244
This reports on versioned and unknown files, reporting them
237
245
grouped by state. Possible states are:
257
265
unknown
258
266
Not versioned and not matching an ignore pattern.
259
267
268
Additionally for directories, symlinks and files with an executable
269
bit, Bazaar indicates their type using a trailing character: '/', '@'
270
or '*' respectively.
271
260
272
To see ignored files use 'bzr ignored'. For details on the
261
273
changes to file texts, use 'bzr diff'.
262
274
320
332
321
333
322
334
class cmd_cat_revision(Command):
323
"""Write out metadata for a revision.
335
__doc__ = """Write out metadata for a revision.
324
336
325
337
The revision to print can either be specified by a specific
326
338
revision identifier, or you can use --revision.
332
344
# cat-revision is more for frontends so should be exact
333
345
encoding = 'strict'
334
346
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
335
355
@display_command
336
356
def run(self, revision_id=None, revision=None):
337
357
if revision_id is not None and revision is not None:
342
362
' --revision or a revision_id')
343
363
b = WorkingTree.open_containing(u'.')[0].branch
344
364
345
# TODO: jam 20060112 should cat-revision always output utf-8?
346
if revision_id is not None:
347
revision_id = osutils.safe_revision_id(revision_id, warn=False)
348
try:
349
self.outf.write(b.repository.get_revision_xml(revision_id).decode('utf-8'))
350
except errors.NoSuchRevision:
351
msg = "The repository %s contains no revision %s." % (b.repository.base,
352
revision_id)
353
raise errors.BzrCommandError(msg)
354
elif revision is not None:
355
for rev in revision:
356
if rev is None:
357
raise errors.BzrCommandError('You cannot specify a NULL'
358
' revision.')
359
rev_id = rev.as_revision_id(b)
360
self.outf.write(b.repository.get_revision_xml(rev_id).decode('utf-8'))
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')
361
369
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
362
391
363
392
class cmd_dump_btree(Command):
364
"""Dump the contents of a btree index file to stdout.
393
__doc__ = """Dump the contents of a btree index file to stdout.
365
394
366
395
PATH is a btree index file, it can be any URL. This includes things like
367
396
.bzr/repository/pack-names, or .bzr/repository/indices/a34b3a...ca4a4.iix
431
460
for node in bt.iter_all_entries():
432
461
# Node is made up of:
433
462
# (index, key, value, [references])
434
refs_as_tuples = tuple([tuple([tuple(ref) for ref in ref_list])
435
for ref_list in node[3]])
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)
436
469
as_tuple = (tuple(node[1]), node[2], refs_as_tuples)
437
470
self.outf.write('%s\n' % (as_tuple,))
438
471
439
472
440
473
class cmd_remove_tree(Command):
441
"""Remove the working tree from a given branch/checkout.
474
__doc__ = """Remove the working tree from a given branch/checkout.
442
475
443
476
Since a lightweight checkout is little more than a working tree
444
477
this will refuse to run against one.
446
479
To re-create the working tree, use "bzr checkout".
447
480
"""
448
481
_see_also = ['checkout', 'working-trees']
449
takes_args = ['location?']
482
takes_args = ['location*']
450
483
takes_options = [
451
484
Option('force',
452
485
help='Remove the working tree even if it has '
453
486
'uncommitted changes.'),
454
487
]
455
488
456
def run(self, location='.', force=False):
457
d = bzrdir.BzrDir.open(location)
458
459
try:
460
working = d.open_workingtree()
461
except errors.NoWorkingTree:
462
raise errors.BzrCommandError("No working tree to remove")
463
except errors.NotLocalUrl:
464
raise errors.BzrCommandError("You cannot remove the working tree"
465
" of a remote path")
466
if not force:
467
if (working.has_changes()):
468
raise errors.UncommittedChanges(working)
469
470
working_path = working.bzrdir.root_transport.base
471
branch_path = working.branch.bzrdir.root_transport.base
472
if working_path != branch_path:
473
raise errors.BzrCommandError("You cannot remove the working tree"
474
" from a lightweight checkout")
475
476
d.destroy_workingtree()
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()
477
512
478
513
479
514
class cmd_revno(Command):
480
"""Show current revision number.
515
__doc__ = """Show current revision number.
481
516
482
517
This is equal to the number of revisions on this branch.
483
518
"""
496
531
wt.lock_read()
497
532
except (errors.NoWorkingTree, errors.NotLocalUrl):
498
533
raise errors.NoWorkingTree(location)
534
self.add_cleanup(wt.unlock)
535
revid = wt.last_revision()
499
536
try:
500
revid = wt.last_revision()
501
try:
502
revno_t = wt.branch.revision_id_to_dotted_revno(revid)
503
except errors.NoSuchRevision:
504
revno_t = ('???',)
505
revno = ".".join(str(n) for n in revno_t)
506
finally:
507
wt.unlock()
537
revno_t = wt.branch.revision_id_to_dotted_revno(revid)
538
except errors.NoSuchRevision:
539
revno_t = ('???',)
540
revno = ".".join(str(n) for n in revno_t)
508
541
else:
509
542
b = Branch.open_containing(location)[0]
510
543
b.lock_read()
511
try:
512
revno = b.revno()
513
finally:
514
b.unlock()
515
544
self.add_cleanup(b.unlock)
545
revno = b.revno()
546
self.cleanup_now()
516
547
self.outf.write(str(revno) + '\n')
517
548
518
549
519
550
class cmd_revision_info(Command):
520
"""Show revision number and revision id for a given revision identifier.
551
__doc__ = """Show revision number and revision id for a given revision identifier.
521
552
"""
522
553
hidden = True
523
554
takes_args = ['revision_info*']
540
571
wt = WorkingTree.open_containing(directory)[0]
541
572
b = wt.branch
542
573
wt.lock_read()
574
self.add_cleanup(wt.unlock)
543
575
except (errors.NoWorkingTree, errors.NotLocalUrl):
544
576
wt = None
545
577
b = Branch.open_containing(directory)[0]
546
578
b.lock_read()
547
try:
548
revision_ids = []
549
if revision is not None:
550
revision_ids.extend(rev.as_revision_id(b) for rev in revision)
551
if revision_info_list is not None:
552
for rev_str in revision_info_list:
553
rev_spec = RevisionSpec.from_string(rev_str)
554
revision_ids.append(rev_spec.as_revision_id(b))
555
# No arguments supplied, default to the last revision
556
if len(revision_ids) == 0:
557
if tree:
558
if wt is None:
559
raise errors.NoWorkingTree(directory)
560
revision_ids.append(wt.last_revision())
561
else:
562
revision_ids.append(b.last_revision())
563
564
revinfos = []
565
maxlen = 0
566
for revision_id in revision_ids:
567
try:
568
dotted_revno = b.revision_id_to_dotted_revno(revision_id)
569
revno = '.'.join(str(i) for i in dotted_revno)
570
except errors.NoSuchRevision:
571
revno = '???'
572
maxlen = max(maxlen, len(revno))
573
revinfos.append([revno, revision_id])
574
finally:
575
if wt is None:
576
b.unlock()
579
self.add_cleanup(b.unlock)
580
revision_ids = []
581
if revision is not None:
582
revision_ids.extend(rev.as_revision_id(b) for rev in revision)
583
if revision_info_list is not None:
584
for rev_str in revision_info_list:
585
rev_spec = RevisionSpec.from_string(rev_str)
586
revision_ids.append(rev_spec.as_revision_id(b))
587
# No arguments supplied, default to the last revision
588
if len(revision_ids) == 0:
589
if tree:
590
if wt is None:
591
raise errors.NoWorkingTree(directory)
592
revision_ids.append(wt.last_revision())
577
593
else:
578
wt.unlock()
579
594
revision_ids.append(b.last_revision())
595
596
revinfos = []
597
maxlen = 0
598
for revision_id in revision_ids:
599
try:
600
dotted_revno = b.revision_id_to_dotted_revno(revision_id)
601
revno = '.'.join(str(i) for i in dotted_revno)
602
except errors.NoSuchRevision:
603
revno = '???'
604
maxlen = max(maxlen, len(revno))
605
revinfos.append([revno, revision_id])
606
607
self.cleanup_now()
580
608
for ri in revinfos:
581
609
self.outf.write('%*s %s\n' % (maxlen, ri[0], ri[1]))
582
610
583
611
584
612
class cmd_add(Command):
585
"""Add specified files or directories.
613
__doc__ = """Add specified files or directories.
586
614
587
615
In non-recursive mode, all the named items are added, regardless
588
616
of whether they were previously ignored. A warning is given if
654
682
655
683
if base_tree:
656
684
base_tree.lock_read()
657
try:
658
file_list = self._maybe_expand_globs(file_list)
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
self.add_cleanup(base_tree.unlock)
686
tree, file_list = tree_files_for_add(file_list)
687
added, ignored = tree.smart_add(file_list, not
688
no_recurse, action=action, save=not dry_run)
689
self.cleanup_now()
665
690
if len(ignored) > 0:
666
691
if verbose:
667
692
for glob in sorted(ignored.keys()):
671
696
672
697
673
698
class cmd_mkdir(Command):
674
"""Create a new versioned directory.
699
__doc__ = """Create a new versioned directory.
675
700
676
701
This is equivalent to creating the directory and then adding it.
677
702
"""
681
706
682
707
def run(self, dir_list):
683
708
for d in dir_list:
684
os.mkdir(d)
685
709
wt, dd = WorkingTree.open_containing(d)
686
wt.add([dd])
687
self.outf.write('added %s\n' % d)
710
base = os.path.dirname(dd)
711
id = wt.path2id(base)
712
if id != None:
713
os.mkdir(d)
714
wt.add([dd])
715
self.outf.write('added %s\n' % d)
716
else:
717
raise errors.NotVersionedError(path=base)
688
718
689
719
690
720
class cmd_relpath(Command):
691
"""Show path of a file relative to root"""
721
__doc__ = """Show path of a file relative to root"""
692
722
693
723
takes_args = ['filename']
694
724
hidden = True
703
733
704
734
705
735
class cmd_inventory(Command):
706
"""Show inventory of the current working copy or a revision.
736
__doc__ = """Show inventory of the current working copy or a revision.
707
737
708
738
It is possible to limit the output to a particular entry
709
739
type using the --kind option. For example: --kind file.
731
761
revision = _get_one_revision('inventory', revision)
732
762
work_tree, file_list = tree_files(file_list)
733
763
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
764
self.add_cleanup(work_tree.unlock)
765
if revision is not None:
766
tree = revision.as_tree(work_tree.branch)
767
768
extra_trees = [work_tree]
769
tree.lock_read()
770
self.add_cleanup(tree.unlock)
771
else:
772
tree = work_tree
773
extra_trees = []
774
775
if file_list is not None:
776
file_ids = tree.paths2ids(file_list, trees=extra_trees,
777
require_versioned=True)
778
# find_ids_across_trees may include some paths that don't
779
# exist in 'tree'.
780
entries = sorted((tree.id2path(file_id), tree.inventory[file_id])
781
for file_id in file_ids if file_id in tree)
782
else:
783
entries = tree.inventory.entries()
784
785
self.cleanup_now()
758
786
for path, entry in entries:
759
787
if kind and kind != entry.kind:
760
788
continue
766
794
767
795
768
796
class cmd_mv(Command):
769
"""Move or rename a file.
797
__doc__ = """Move or rename a file.
770
798
771
799
:Usage:
772
800
bzr mv OLDNAME NEWNAME
806
834
raise errors.BzrCommandError("missing file argument")
807
835
tree, rel_names = tree_files(names_list, canonicalize=False)
808
836
tree.lock_tree_write()
809
try:
810
self._run(tree, names_list, rel_names, after)
811
finally:
812
tree.unlock()
837
self.add_cleanup(tree.unlock)
838
self._run(tree, names_list, rel_names, after)
813
839
814
840
def run_auto(self, names_list, after, dry_run):
815
841
if names_list is not None and len(names_list) > 1:
820
846
' --auto.')
821
847
work_tree, file_list = tree_files(names_list, default_branch='.')
822
848
work_tree.lock_tree_write()
823
try:
824
rename_map.RenameMap.guess_renames(work_tree, dry_run)
825
finally:
826
work_tree.unlock()
849
self.add_cleanup(work_tree.unlock)
850
rename_map.RenameMap.guess_renames(work_tree, dry_run)
827
851
828
852
def _run(self, tree, names_list, rel_names, after):
829
853
into_existing = osutils.isdir(names_list[-1])
850
874
# All entries reference existing inventory items, so fix them up
851
875
# for cicp file-systems.
852
876
rel_names = tree.get_canonical_inventory_paths(rel_names)
853
for pair in tree.move(rel_names[:-1], rel_names[-1], after=after):
854
self.outf.write("%s => %s\n" % pair)
877
for src, dest in tree.move(rel_names[:-1], rel_names[-1], after=after):
878
if not is_quiet():
879
self.outf.write("%s => %s\n" % (src, dest))
855
880
else:
856
881
if len(names_list) != 2:
857
882
raise errors.BzrCommandError('to mv multiple files the'
901
926
dest = osutils.pathjoin(dest_parent, dest_tail)
902
927
mutter("attempting to move %s => %s", src, dest)
903
928
tree.rename_one(src, dest, after=after)
904
self.outf.write("%s => %s\n" % (src, dest))
929
if not is_quiet():
930
self.outf.write("%s => %s\n" % (src, dest))
905
931
906
932
907
933
class cmd_pull(Command):
908
"""Turn this branch into a mirror of another branch.
934
__doc__ = """Turn this branch into a mirror of another branch.
909
935
910
This command only works on branches that have not diverged. Branches are
911
considered diverged if the destination branch's most recent commit is one
912
that has not been merged (directly or indirectly) into the parent.
936
By default, this command only works on branches that have not diverged.
937
Branches are considered diverged if the destination branch's most recent
938
commit is one that has not been merged (directly or indirectly) into the
939
parent.
913
940
914
941
If branches have diverged, you can use 'bzr merge' to integrate the changes
915
942
from one into the other. Once one branch has merged, the other should
916
943
be able to pull it again.
917
944
918
If you want to forget your local changes and just update your branch to
919
match the remote one, use pull --overwrite.
945
If you want to replace your local changes and just want your branch to
946
match the remote one, use pull --overwrite. This will work even if the two
947
branches have diverged.
920
948
921
949
If there is no default location set, the first pull will set it. After
922
950
that, you can omit the location to use the default. To change the
958
986
try:
959
987
tree_to = WorkingTree.open_containing(directory)[0]
960
988
branch_to = tree_to.branch
989
tree_to.lock_write()
990
self.add_cleanup(tree_to.unlock)
961
991
except errors.NoWorkingTree:
962
992
tree_to = None
963
993
branch_to = Branch.open_containing(directory)[0]
964
994
branch_to.lock_write()
995
self.add_cleanup(branch_to.unlock)
996
965
997
if local and not branch_to.get_bound_location():
966
998
raise errors.LocalRequiresBoundBranch()
967
999
997
1029
else:
998
1030
branch_from = Branch.open(location,
999
1031
possible_transports=possible_transports)
1032
branch_from.lock_read()
1033
self.add_cleanup(branch_from.unlock)
1000
1034
1001
1035
if branch_to.get_parent() is None or remember:
1002
1036
branch_to.set_parent(branch_from.base)
1003
1037
1004
if branch_from is not branch_to:
1005
branch_from.lock_read()
1006
try:
1007
if revision is not None:
1008
revision_id = revision.as_revision_id(branch_from)
1009
1010
branch_to.lock_write()
1011
try:
1012
if tree_to is not None:
1013
view_info = _get_view_info_for_change_reporter(tree_to)
1014
change_reporter = delta._ChangeReporter(
1015
unversioned_filter=tree_to.is_ignored,
1016
view_info=view_info)
1017
result = tree_to.pull(
1018
branch_from, overwrite, revision_id, change_reporter,
1019
possible_transports=possible_transports, local=local)
1020
else:
1021
result = branch_to.pull(
1022
branch_from, overwrite, revision_id, local=local)
1023
1024
result.report(self.outf)
1025
if verbose and result.old_revid != result.new_revid:
1026
log.show_branch_change(
1027
branch_to, self.outf, result.old_revno,
1028
result.old_revid)
1029
finally:
1030
branch_to.unlock()
1031
finally:
1032
if branch_from is not branch_to:
1033
branch_from.unlock()
1038
if revision is not None:
1039
revision_id = revision.as_revision_id(branch_from)
1040
1041
if tree_to is not None:
1042
view_info = _get_view_info_for_change_reporter(tree_to)
1043
change_reporter = delta._ChangeReporter(
1044
unversioned_filter=tree_to.is_ignored,
1045
view_info=view_info)
1046
result = tree_to.pull(
1047
branch_from, overwrite, revision_id, change_reporter,
1048
possible_transports=possible_transports, local=local)
1049
else:
1050
result = branch_to.pull(
1051
branch_from, overwrite, revision_id, local=local)
1052
1053
result.report(self.outf)
1054
if verbose and result.old_revid != result.new_revid:
1055
log.show_branch_change(
1056
branch_to, self.outf, result.old_revno,
1057
result.old_revid)
1034
1058
1035
1059
1036
1060
class cmd_push(Command):
1037
"""Update a mirror of this branch.
1061
__doc__ = """Update a mirror of this branch.
1038
1062
1039
1063
The target branch will not have its working tree populated because this
1040
1064
is both expensive, and is not supported on remote file systems.
1101
1125
# Get the source branch
1102
1126
(tree, br_from,
1103
1127
_unused) = bzrdir.BzrDir.open_containing_tree_or_branch(directory)
1104
if strict is None:
1105
strict = br_from.get_config().get_user_option_as_bool('push_strict')
1106
if strict is None: strict = True # default value
1107
1128
# Get the tip's revision_id
1108
1129
revision = _get_one_revision('push', revision)
1109
1130
if revision is not None:
1110
1131
revision_id = revision.in_history(br_from).rev_id
1111
1132
else:
1112
1133
revision_id = None
1113
if strict and tree is not None and revision_id is None:
1114
if (tree.has_changes()):
1115
raise errors.UncommittedChanges(
1116
tree, more='Use --no-strict to force the push.')
1117
if tree.last_revision() != tree.branch.last_revision():
1118
# The tree has lost sync with its branch, there is little
1119
# chance that the user is aware of it but he can still force
1120
# the push with --no-strict
1121
raise errors.OutOfDateTree(
1122
tree, more='Use --no-strict to force the push.')
1123
1134
if tree is not None and revision_id is None:
1135
tree.check_changed_or_out_of_date(
1136
strict, 'push_strict',
1137
more_error='Use --no-strict to force the push.',
1138
more_warning='Uncommitted changes will not be pushed.')
1124
1139
# Get the stacked_on branch, if any
1125
1140
if stacked_on is not None:
1126
1141
stacked_on = urlutils.normalize_url(stacked_on)
1158
1173
1159
1174
1160
1175
class cmd_branch(Command):
1161
"""Create a new branch that is a copy of an existing branch.
1176
__doc__ = """Create a new branch that is a copy of an existing branch.
1162
1177
1163
1178
If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will
1164
1179
be used. In other words, "branch ../foo/bar" will attempt to create ./bar.
1191
1206
' directory exists, but does not already'
1192
1207
' have a control directory. This flag will'
1193
1208
' allow branch to proceed.'),
1209
Option('bind',
1210
help="Bind new branch to from location."),
1194
1211
]
1195
1212
aliases = ['get', 'clone']
1196
1213
1197
1214
def run(self, from_location, to_location=None, revision=None,
1198
1215
hardlink=False, stacked=False, standalone=False, no_tree=False,
1199
use_existing_dir=False, switch=False):
1216
use_existing_dir=False, switch=False, bind=False):
1200
1217
from bzrlib import switch as _mod_switch
1201
1218
from bzrlib.tag import _merge_tags_if_possible
1202
1219
accelerator_tree, br_from = bzrdir.BzrDir.open_tree_or_branch(
1203
1220
from_location)
1204
if (accelerator_tree is not None and
1205
accelerator_tree.supports_content_filtering()):
1206
accelerator_tree = None
1207
1221
revision = _get_one_revision('branch', revision)
1208
1222
br_from.lock_read()
1223
self.add_cleanup(br_from.unlock)
1224
if revision is not None:
1225
revision_id = revision.as_revision_id(br_from)
1226
else:
1227
# FIXME - wt.last_revision, fallback to branch, fall back to
1228
# None or perhaps NULL_REVISION to mean copy nothing
1229
# RBC 20060209
1230
revision_id = br_from.last_revision()
1231
if to_location is None:
1232
to_location = urlutils.derive_to_location(from_location)
1233
to_transport = transport.get_transport(to_location)
1209
1234
try:
1210
if revision is not None:
1211
revision_id = revision.as_revision_id(br_from)
1235
to_transport.mkdir('.')
1236
except errors.FileExists:
1237
if not use_existing_dir:
1238
raise errors.BzrCommandError('Target directory "%s" '
1239
'already exists.' % to_location)
1212
1240
else:
1213
# FIXME - wt.last_revision, fallback to branch, fall back to
1214
# None or perhaps NULL_REVISION to mean copy nothing
1215
# RBC 20060209
1216
revision_id = br_from.last_revision()
1217
if to_location is None:
1218
to_location = urlutils.derive_to_location(from_location)
1219
to_transport = transport.get_transport(to_location)
1220
try:
1221
to_transport.mkdir('.')
1222
except errors.FileExists:
1223
if not use_existing_dir:
1224
raise errors.BzrCommandError('Target directory "%s" '
1225
'already exists.' % to_location)
1241
try:
1242
bzrdir.BzrDir.open_from_transport(to_transport)
1243
except errors.NotBranchError:
1244
pass
1226
1245
else:
1227
try:
1228
bzrdir.BzrDir.open_from_transport(to_transport)
1229
except errors.NotBranchError:
1230
pass
1231
else:
1232
raise errors.AlreadyBranchError(to_location)
1233
except errors.NoSuchFile:
1234
raise errors.BzrCommandError('Parent of "%s" does not exist.'
1235
% to_location)
1236
try:
1237
# preserve whatever source format we have.
1238
dir = br_from.bzrdir.sprout(to_transport.base, revision_id,
1239
possible_transports=[to_transport],
1240
accelerator_tree=accelerator_tree,
1241
hardlink=hardlink, stacked=stacked,
1242
force_new_repo=standalone,
1243
create_tree_if_local=not no_tree,
1244
source_branch=br_from)
1245
branch = dir.open_branch()
1246
except errors.NoSuchRevision:
1247
to_transport.delete_tree('.')
1248
msg = "The branch %s has no revision %s." % (from_location,
1249
revision)
1250
raise errors.BzrCommandError(msg)
1251
_merge_tags_if_possible(br_from, branch)
1252
# If the source branch is stacked, the new branch may
1253
# be stacked whether we asked for that explicitly or not.
1254
# We therefore need a try/except here and not just 'if stacked:'
1255
try:
1256
note('Created new stacked branch referring to %s.' %
1257
branch.get_stacked_on_url())
1258
except (errors.NotStacked, errors.UnstackableBranchFormat,
1259
errors.UnstackableRepositoryFormat), e:
1260
note('Branched %d revision(s).' % branch.revno())
1261
if switch:
1262
# Switch to the new branch
1263
wt, _ = WorkingTree.open_containing('.')
1264
_mod_switch.switch(wt.bzrdir, branch)
1265
note('Switched to branch: %s',
1266
urlutils.unescape_for_display(branch.base, 'utf-8'))
1267
finally:
1268
br_from.unlock()
1246
raise errors.AlreadyBranchError(to_location)
1247
except errors.NoSuchFile:
1248
raise errors.BzrCommandError('Parent of "%s" does not exist.'
1249
% to_location)
1250
try:
1251
# preserve whatever source format we have.
1252
dir = br_from.bzrdir.sprout(to_transport.base, revision_id,
1253
possible_transports=[to_transport],
1254
accelerator_tree=accelerator_tree,
1255
hardlink=hardlink, stacked=stacked,
1256
force_new_repo=standalone,
1257
create_tree_if_local=not no_tree,
1258
source_branch=br_from)
1259
branch = dir.open_branch()
1260
except errors.NoSuchRevision:
1261
to_transport.delete_tree('.')
1262
msg = "The branch %s has no revision %s." % (from_location,
1263
revision)
1264
raise errors.BzrCommandError(msg)
1265
_merge_tags_if_possible(br_from, branch)
1266
# If the source branch is stacked, the new branch may
1267
# be stacked whether we asked for that explicitly or not.
1268
# We therefore need a try/except here and not just 'if stacked:'
1269
try:
1270
note('Created new stacked branch referring to %s.' %
1271
branch.get_stacked_on_url())
1272
except (errors.NotStacked, errors.UnstackableBranchFormat,
1273
errors.UnstackableRepositoryFormat), e:
1274
note('Branched %d revision(s).' % branch.revno())
1275
if bind:
1276
# Bind to the parent
1277
parent_branch = Branch.open(from_location)
1278
branch.bind(parent_branch)
1279
note('New branch bound to %s' % from_location)
1280
if switch:
1281
# Switch to the new branch
1282
wt, _ = WorkingTree.open_containing('.')
1283
_mod_switch.switch(wt.bzrdir, branch)
1284
note('Switched to branch: %s',
1285
urlutils.unescape_for_display(branch.base, 'utf-8'))
1269
1286
1270
1287
1271
1288
class cmd_checkout(Command):
1272
"""Create a new checkout of an existing branch.
1289
__doc__ = """Create a new checkout of an existing branch.
1273
1290
1274
1291
If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree for
1275
1292
the branch found in '.'. This is useful if you have removed the working tree
1338
1355
1339
1356
1340
1357
class cmd_renames(Command):
1341
"""Show list of renamed files.
1358
__doc__ = """Show list of renamed files.
1342
1359
"""
1343
1360
# TODO: Option to show renames between two historical versions.
1344
1361
1350
1367
def run(self, dir=u'.'):
1351
1368
tree = WorkingTree.open_containing(dir)[0]
1352
1369
tree.lock_read()
1353
try:
1354
new_inv = tree.inventory
1355
old_tree = tree.basis_tree()
1356
old_tree.lock_read()
1357
try:
1358
old_inv = old_tree.inventory
1359
renames = []
1360
iterator = tree.iter_changes(old_tree, include_unchanged=True)
1361
for f, paths, c, v, p, n, k, e in iterator:
1362
if paths[0] == paths[1]:
1363
continue
1364
if None in (paths):
1365
continue
1366
renames.append(paths)
1367
renames.sort()
1368
for old_name, new_name in renames:
1369
self.outf.write("%s => %s\n" % (old_name, new_name))
1370
finally:
1371
old_tree.unlock()
1372
finally:
1373
tree.unlock()
1370
self.add_cleanup(tree.unlock)
1371
new_inv = tree.inventory
1372
old_tree = tree.basis_tree()
1373
old_tree.lock_read()
1374
self.add_cleanup(old_tree.unlock)
1375
old_inv = old_tree.inventory
1376
renames = []
1377
iterator = tree.iter_changes(old_tree, include_unchanged=True)
1378
for f, paths, c, v, p, n, k, e in iterator:
1379
if paths[0] == paths[1]:
1380
continue
1381
if None in (paths):
1382
continue
1383
renames.append(paths)
1384
renames.sort()
1385
for old_name, new_name in renames:
1386
self.outf.write("%s => %s\n" % (old_name, new_name))
1374
1387
1375
1388
1376
1389
class cmd_update(Command):
1377
"""Update a tree to have the latest code committed to its branch.
1390
__doc__ = """Update a tree to have the latest code committed to its branch.
1378
1391
1379
1392
This will perform a merge into the working tree, and may generate
1380
1393
conflicts. If you have any local changes, you will still
1382
1395
1383
1396
If you want to discard your local changes, you can just do a
1384
1397
'bzr revert' instead of 'bzr commit' after the update.
1398
1399
If the tree's branch is bound to a master branch, it will also update
1400
the branch from the master.
1385
1401
"""
1386
1402
1387
1403
_see_also = ['pull', 'working-trees', 'status-flags']
1388
1404
takes_args = ['dir?']
1405
takes_options = ['revision']
1389
1406
aliases = ['up']
1390
1407
1391
def run(self, dir='.'):
1408
def run(self, dir='.', revision=None):
1409
if revision is not None and len(revision) != 1:
1410
raise errors.BzrCommandError(
1411
"bzr update --revision takes exactly one revision")
1392
1412
tree = WorkingTree.open_containing(dir)[0]
1413
branch = tree.branch
1393
1414
possible_transports = []
1394
master = tree.branch.get_master_branch(
1415
master = branch.get_master_branch(
1395
1416
possible_transports=possible_transports)
1396
1417
if master is not None:
1397
1418
tree.lock_write()
1419
branch_location = master.base
1398
1420
else:
1399
1421
tree.lock_tree_write()
1422
branch_location = tree.branch.base
1423
self.add_cleanup(tree.unlock)
1424
# get rid of the final '/' and be ready for display
1425
branch_location = urlutils.unescape_for_display(
1426
branch_location.rstrip('/'),
1427
self.outf.encoding)
1428
existing_pending_merges = tree.get_parent_ids()[1:]
1429
if master is None:
1430
old_tip = None
1431
else:
1432
# may need to fetch data into a heavyweight checkout
1433
# XXX: this may take some time, maybe we should display a
1434
# message
1435
old_tip = branch.update(possible_transports)
1436
if revision is not None:
1437
revision_id = revision[0].as_revision_id(branch)
1438
else:
1439
revision_id = branch.last_revision()
1440
if revision_id == _mod_revision.ensure_null(tree.last_revision()):
1441
revno = branch.revision_id_to_dotted_revno(revision_id)
1442
note("Tree is up to date at revision %s of branch %s" %
1443
('.'.join(map(str, revno)), branch_location))
1444
return 0
1445
view_info = _get_view_info_for_change_reporter(tree)
1446
change_reporter = delta._ChangeReporter(
1447
unversioned_filter=tree.is_ignored,
1448
view_info=view_info)
1400
1449
try:
1401
existing_pending_merges = tree.get_parent_ids()[1:]
1402
last_rev = _mod_revision.ensure_null(tree.last_revision())
1403
if last_rev == _mod_revision.ensure_null(
1404
tree.branch.last_revision()):
1405
# may be up to date, check master too.
1406
if master is None or last_rev == _mod_revision.ensure_null(
1407
master.last_revision()):
1408
revno = tree.branch.revision_id_to_revno(last_rev)
1409
note("Tree is up to date at revision %d." % (revno,))
1410
return 0
1411
view_info = _get_view_info_for_change_reporter(tree)
1412
1450
conflicts = tree.update(
1413
delta._ChangeReporter(unversioned_filter=tree.is_ignored,
1414
view_info=view_info), possible_transports=possible_transports)
1415
revno = tree.branch.revision_id_to_revno(
1416
_mod_revision.ensure_null(tree.last_revision()))
1417
note('Updated to revision %d.' % (revno,))
1418
if tree.get_parent_ids()[1:] != existing_pending_merges:
1419
note('Your local commits will now show as pending merges with '
1420
"'bzr status', and can be committed with 'bzr commit'.")
1421
if conflicts != 0:
1422
return 1
1423
else:
1424
return 0
1425
finally:
1426
tree.unlock()
1451
change_reporter,
1452
possible_transports=possible_transports,
1453
revision=revision_id,
1454
old_tip=old_tip)
1455
except errors.NoSuchRevision, e:
1456
raise errors.BzrCommandError(
1457
"branch has no revision %s\n"
1458
"bzr update --revision only works"
1459
" for a revision in the branch history"
1460
% (e.revision))
1461
revno = tree.branch.revision_id_to_dotted_revno(
1462
_mod_revision.ensure_null(tree.last_revision()))
1463
note('Updated to revision %s of branch %s' %
1464
('.'.join(map(str, revno)), branch_location))
1465
parent_ids = tree.get_parent_ids()
1466
if parent_ids[1:] and parent_ids[1:] != existing_pending_merges:
1467
note('Your local commits will now show as pending merges with '
1468
"'bzr status', and can be committed with 'bzr commit'.")
1469
if conflicts != 0:
1470
return 1
1471
else:
1472
return 0
1427
1473
1428
1474
1429
1475
class cmd_info(Command):
1430
"""Show information about a working tree, branch or repository.
1476
__doc__ = """Show information about a working tree, branch or repository.
1431
1477
1432
1478
This command will show all known locations and formats associated to the
1433
1479
tree, branch or repository.
1471
1517
1472
1518
1473
1519
class cmd_remove(Command):
1474
"""Remove files or directories.
1520
__doc__ = """Remove files or directories.
1475
1521
1476
1522
This makes bzr stop tracking changes to the specified files. bzr will delete
1477
1523
them if they can easily be recovered using revert. If no options or
1500
1546
file_list = [f for f in file_list]
1501
1547
1502
1548
tree.lock_write()
1503
try:
1504
# Heuristics should probably all move into tree.remove_smart or
1505
# some such?
1506
if new:
1507
added = tree.changes_from(tree.basis_tree(),
1508
specific_files=file_list).added
1509
file_list = sorted([f[0] for f in added], reverse=True)
1510
if len(file_list) == 0:
1511
raise errors.BzrCommandError('No matching files.')
1512
elif file_list is None:
1513
# missing files show up in iter_changes(basis) as
1514
# versioned-with-no-kind.
1515
missing = []
1516
for change in tree.iter_changes(tree.basis_tree()):
1517
# Find paths in the working tree that have no kind:
1518
if change[1][1] is not None and change[6][1] is None:
1519
missing.append(change[1][1])
1520
file_list = sorted(missing, reverse=True)
1521
file_deletion_strategy = 'keep'
1522
tree.remove(file_list, verbose=verbose, to_file=self.outf,
1523
keep_files=file_deletion_strategy=='keep',
1524
force=file_deletion_strategy=='force')
1525
finally:
1526
tree.unlock()
1549
self.add_cleanup(tree.unlock)
1550
# Heuristics should probably all move into tree.remove_smart or
1551
# some such?
1552
if new:
1553
added = tree.changes_from(tree.basis_tree(),
1554
specific_files=file_list).added
1555
file_list = sorted([f[0] for f in added], reverse=True)
1556
if len(file_list) == 0:
1557
raise errors.BzrCommandError('No matching files.')
1558
elif file_list is None:
1559
# missing files show up in iter_changes(basis) as
1560
# versioned-with-no-kind.
1561
missing = []
1562
for change in tree.iter_changes(tree.basis_tree()):
1563
# Find paths in the working tree that have no kind:
1564
if change[1][1] is not None and change[6][1] is None:
1565
missing.append(change[1][1])
1566
file_list = sorted(missing, reverse=True)
1567
file_deletion_strategy = 'keep'
1568
tree.remove(file_list, verbose=verbose, to_file=self.outf,
1569
keep_files=file_deletion_strategy=='keep',
1570
force=file_deletion_strategy=='force')
1527
1571
1528
1572
1529
1573
class cmd_file_id(Command):
1530
"""Print file_id of a particular file or directory.
1574
__doc__ = """Print file_id of a particular file or directory.
1531
1575
1532
1576
The file_id is assigned when the file is first added and remains the
1533
1577
same through all revisions where the file exists, even when it is
1549
1593
1550
1594
1551
1595
class cmd_file_path(Command):
1552
"""Print path of file_ids to a file or directory.
1596
__doc__ = """Print path of file_ids to a file or directory.
1553
1597
1554
1598
This prints one line for each directory down to the target,
1555
1599
starting at the branch root.
1571
1615
1572
1616
1573
1617
class cmd_reconcile(Command):
1574
"""Reconcile bzr metadata in a branch.
1618
__doc__ = """Reconcile bzr metadata in a branch.
1575
1619
1576
1620
This can correct data mismatches that may have been caused by
1577
1621
previous ghost operations or bzr upgrades. You should only
1599
1643
1600
1644
1601
1645
class cmd_revision_history(Command):
1602
"""Display the list of revision ids on a branch."""
1646
__doc__ = """Display the list of revision ids on a branch."""
1603
1647
1604
1648
_see_also = ['log']
1605
1649
takes_args = ['location?']
1615
1659
1616
1660
1617
1661
class cmd_ancestry(Command):
1618
"""List all revisions merged into this branch."""
1662
__doc__ = """List all revisions merged into this branch."""
1619
1663
1620
1664
_see_also = ['log', 'revision-history']
1621
1665
takes_args = ['location?']
1640
1684
1641
1685
1642
1686
class cmd_init(Command):
1643
"""Make a directory into a versioned branch.
1687
__doc__ = """Make a directory into a versioned branch.
1644
1688
1645
1689
Use this to create an empty branch, or before importing an
1646
1690
existing project.
1749
1793
1750
1794
1751
1795
class cmd_init_repository(Command):
1752
"""Create a shared repository to hold branches.
1796
__doc__ = """Create a shared repository for branches to share storage space.
1753
1797
1754
1798
New branches created under the repository directory will store their
1755
revisions in the repository, not in the branch directory.
1799
revisions in the repository, not in the branch directory. For branches
1800
with shared history, this reduces the amount of storage needed and
1801
speeds up the creation of new branches.
1756
1802
1757
If the --no-trees option is used then the branches in the repository
1758
will not have working trees by default.
1803
If the --no-trees option is given then the branches in the repository
1804
will not have working trees by default. They will still exist as
1805
directories on disk, but they will not have separate copies of the
1806
files at a certain revision. This can be useful for repositories that
1807
store branches which are interacted with through checkouts or remote
1808
branches, such as on a server.
1759
1809
1760
1810
:Examples:
1761
Create a shared repositories holding just branches::
1811
Create a shared repository holding just branches::
1762
1812
1763
1813
bzr init-repo --no-trees repo
1764
1814
bzr init repo/trunk
1803
1853
1804
1854
1805
1855
class cmd_diff(Command):
1806
"""Show differences in the working tree, between revisions or branches.
1856
__doc__ = """Show differences in the working tree, between revisions or branches.
1807
1857
1808
1858
If no arguments are given, all changes for the current tree are listed.
1809
1859
If files are given, only the changes in those files are listed.
1830
1880
1831
1881
bzr diff -r1
1832
1882
1833
Difference between revision 2 and revision 1::
1834
1835
bzr diff -r1..2
1836
1837
Difference between revision 2 and revision 1 for branch xxx::
1838
1839
bzr diff -r1..2 xxx
1883
Difference between revision 3 and revision 1::
1884
1885
bzr diff -r1..3
1886
1887
Difference between revision 3 and revision 1 for branch xxx::
1888
1889
bzr diff -r1..3 xxx
1890
1891
To see the changes introduced in revision X::
1892
1893
bzr diff -cX
1894
1895
Note that in the case of a merge, the -c option shows the changes
1896
compared to the left hand parent. To see the changes against
1897
another parent, use::
1898
1899
bzr diff -r<chosen_parent>..X
1900
1901
The changes introduced by revision 2 (equivalent to -r1..2)::
1902
1903
bzr diff -c2
1840
1904
1841
1905
Show just the differences for file NEWS::
1842
1906
1881
1945
help='Use this command to compare files.',
1882
1946
type=unicode,
1883
1947
),
1948
RegistryOption('format',
1949
help='Diff format to use.',
1950
lazy_registry=('bzrlib.diff', 'format_registry'),
1951
value_switches=False, title='Diff format'),
1884
1952
]
1885
1953
aliases = ['di', 'dif']
1886
1954
encoding_type = 'exact'
1887
1955
1888
1956
@display_command
1889
1957
def run(self, revision=None, file_list=None, diff_options=None,
1890
prefix=None, old=None, new=None, using=None):
1891
from bzrlib.diff import get_trees_and_branches_to_diff, show_diff_trees
1958
prefix=None, old=None, new=None, using=None, format=None):
1959
from bzrlib.diff import (get_trees_and_branches_to_diff_locked,
1960
show_diff_trees)
1892
1961
1893
1962
if (prefix is None) or (prefix == '0'):
1894
1963
# diff -p0 format
1908
1977
raise errors.BzrCommandError('bzr diff --revision takes exactly'
1909
1978
' one or two revision specifiers')
1910
1979
1980
if using is not None and format is not None:
1981
raise errors.BzrCommandError('--using and --format are mutually '
1982
'exclusive.')
1983
1911
1984
(old_tree, new_tree,
1912
1985
old_branch, new_branch,
1913
specific_files, extra_trees) = get_trees_and_branches_to_diff(
1914
file_list, revision, old, new, apply_view=True)
1986
specific_files, extra_trees) = get_trees_and_branches_to_diff_locked(
1987
file_list, revision, old, new, self.add_cleanup, apply_view=True)
1915
1988
return show_diff_trees(old_tree, new_tree, sys.stdout,
1916
1989
specific_files=specific_files,
1917
1990
external_diff_options=diff_options,
1918
1991
old_label=old_label, new_label=new_label,
1919
extra_trees=extra_trees, using=using)
1992
extra_trees=extra_trees, using=using,
1993
format_cls=format)
1920
1994
1921
1995
1922
1996
class cmd_deleted(Command):
1923
"""List files deleted in the working tree.
1997
__doc__ = """List files deleted in the working tree.
1924
1998
"""
1925
1999
# TODO: Show files deleted since a previous revision, or
1926
2000
# between two revisions.
1935
2009
def run(self, show_ids=False):
1936
2010
tree = WorkingTree.open_containing(u'.')[0]
1937
2011
tree.lock_read()
1938
try:
1939
old = tree.basis_tree()
1940
old.lock_read()
1941
try:
1942
for path, ie in old.inventory.iter_entries():
1943
if not tree.has_id(ie.file_id):
1944
self.outf.write(path)
1945
if show_ids:
1946
self.outf.write(' ')
1947
self.outf.write(ie.file_id)
1948
self.outf.write('\n')
1949
finally:
1950
old.unlock()
1951
finally:
1952
tree.unlock()
2012
self.add_cleanup(tree.unlock)
2013
old = tree.basis_tree()
2014
old.lock_read()
2015
self.add_cleanup(old.unlock)
2016
for path, ie in old.inventory.iter_entries():
2017
if not tree.has_id(ie.file_id):
2018
self.outf.write(path)
2019
if show_ids:
2020
self.outf.write(' ')
2021
self.outf.write(ie.file_id)
2022
self.outf.write('\n')
1953
2023
1954
2024
1955
2025
class cmd_modified(Command):
1956
"""List files modified in working tree.
2026
__doc__ = """List files modified in working tree.
1957
2027
"""
1958
2028
1959
2029
hidden = True
1976
2046
1977
2047
1978
2048
class cmd_added(Command):
1979
"""List files added in working tree.
2049
__doc__ = """List files added in working tree.
1980
2050
"""
1981
2051
1982
2052
hidden = True
1991
2061
def run(self, null=False):
1992
2062
wt = WorkingTree.open_containing(u'.')[0]
1993
2063
wt.lock_read()
1994
try:
1995
basis = wt.basis_tree()
1996
basis.lock_read()
1997
try:
1998
basis_inv = basis.inventory
1999
inv = wt.inventory
2000
for file_id in inv:
2001
if file_id in basis_inv:
2002
continue
2003
if inv.is_root(file_id) and len(basis_inv) == 0:
2004
continue
2005
path = inv.id2path(file_id)
2006
if not os.access(osutils.abspath(path), os.F_OK):
2007
continue
2008
if null:
2009
self.outf.write(path + '\0')
2010
else:
2011
self.outf.write(osutils.quotefn(path) + '\n')
2012
finally:
2013
basis.unlock()
2014
finally:
2015
wt.unlock()
2064
self.add_cleanup(wt.unlock)
2065
basis = wt.basis_tree()
2066
basis.lock_read()
2067
self.add_cleanup(basis.unlock)
2068
basis_inv = basis.inventory
2069
inv = wt.inventory
2070
for file_id in inv:
2071
if file_id in basis_inv:
2072
continue
2073
if inv.is_root(file_id) and len(basis_inv) == 0:
2074
continue
2075
path = inv.id2path(file_id)
2076
if not os.access(osutils.abspath(path), os.F_OK):
2077
continue
2078
if null:
2079
self.outf.write(path + '\0')
2080
else:
2081
self.outf.write(osutils.quotefn(path) + '\n')
2016
2082
2017
2083
2018
2084
class cmd_root(Command):
2019
"""Show the tree root directory.
2085
__doc__ = """Show the tree root directory.
2020
2086
2021
2087
The root is the nearest enclosing directory with a .bzr control
2022
2088
directory."""
2046
2112
2047
2113
2048
2114
class cmd_log(Command):
2049
"""Show historical log for a branch or subset of a branch.
2115
__doc__ = """Show historical log for a branch or subset of a branch.
2050
2116
2051
2117
log is bzr's default tool for exploring the history of a branch.
2052
2118
The branch to use is taken from the first parameter. If no parameters
2163
2229
:Tips & tricks:
2164
2230
2165
2231
GUI tools and IDEs are often better at exploring history than command
2166
line tools. You may prefer qlog or glog from the QBzr and Bzr-Gtk packages
2167
respectively for example. (TortoiseBzr uses qlog for displaying logs.) See
2168
http://bazaar-vcs.org/BzrPlugins and http://bazaar-vcs.org/IDEIntegration.
2169
2170
Web interfaces are often better at exploring history than command line
2171
tools, particularly for branches on servers. You may prefer Loggerhead
2172
or one of its alternatives. See http://bazaar-vcs.org/WebInterface.
2232
line tools: you may prefer qlog or viz from qbzr or bzr-gtk, the
2233
bzr-explorer shell, or the Loggerhead web interface. See the Plugin
2234
Guide <http://doc.bazaar.canonical.com/plugins/en/> and
2235
<http://wiki.bazaar.canonical.com/IDEIntegration>.
2173
2236
2174
2237
You may find it useful to add the aliases below to ``bazaar.conf``::
2175
2238
2236
2299
help='Show changes made in each revision as a patch.'),
2237
2300
Option('include-merges',
2238
2301
help='Show merged revisions like --levels 0 does.'),
2302
Option('exclude-common-ancestry',
2303
help='Display only the revisions that are not part'
2304
' of both ancestries (require -rX..Y)'
2305
)
2239
2306
]
2240
2307
encoding_type = 'replace'
2241
2308
2251
2318
message=None,
2252
2319
limit=None,
2253
2320
show_diff=False,
2254
include_merges=False):
2321
include_merges=False,
2322
exclude_common_ancestry=False,
2323
):
2255
2324
from bzrlib.log import (
2256
2325
Logger,
2257
2326
make_log_request_dict,
2258
2327
_get_info_for_log_files,
2259
2328
)
2260
2329
direction = (forward and 'forward') or 'reverse'
2330
if (exclude_common_ancestry
2331
and (revision is None or len(revision) != 2)):
2332
raise errors.BzrCommandError(
2333
'--exclude-common-ancestry requires -r with two revisions')
2261
2334
if include_merges:
2262
2335
if levels is None:
2263
2336
levels = 0
2278
2351
filter_by_dir = False
2279
2352
if file_list:
2280
2353
# find the file ids to log and check for directory filtering
2281
b, file_info_list, rev1, rev2 = _get_info_for_log_files(revision,
2282
file_list)
2354
b, file_info_list, rev1, rev2 = _get_info_for_log_files(
2355
revision, file_list)
2356
self.add_cleanup(b.unlock)
2283
2357
for relpath, file_id, kind in file_info_list:
2284
2358
if file_id is None:
2285
2359
raise errors.BzrCommandError(
2303
2377
location = '.'
2304
2378
dir, relpath = bzrdir.BzrDir.open_containing(location)
2305
2379
b = dir.open_branch()
2380
b.lock_read()
2381
self.add_cleanup(b.unlock)
2306
2382
rev1, rev2 = _get_revision_range(revision, b, self.name())
2307
2383
2308
2384
# Decide on the type of delta & diff filtering to use
2318
2394
else:
2319
2395
diff_type = 'full'
2320
2396
2321
b.lock_read()
2322
try:
2323
# Build the log formatter
2324
if log_format is None:
2325
log_format = log.log_formatter_registry.get_default(b)
2326
lf = log_format(show_ids=show_ids, to_file=self.outf,
2327
show_timezone=timezone,
2328
delta_format=get_verbosity_level(),
2329
levels=levels,
2330
show_advice=levels is None)
2331
2332
# Choose the algorithm for doing the logging. It's annoying
2333
# having multiple code paths like this but necessary until
2334
# the underlying repository format is faster at generating
2335
# deltas or can provide everything we need from the indices.
2336
# The default algorithm - match-using-deltas - works for
2337
# multiple files and directories and is faster for small
2338
# amounts of history (200 revisions say). However, it's too
2339
# slow for logging a single file in a repository with deep
2340
# history, i.e. > 10K revisions. In the spirit of "do no
2341
# evil when adding features", we continue to use the
2342
# original algorithm - per-file-graph - for the "single
2343
# file that isn't a directory without showing a delta" case.
2344
partial_history = revision and b.repository._format.supports_chks
2345
match_using_deltas = (len(file_ids) != 1 or filter_by_dir
2346
or delta_type or partial_history)
2347
2348
# Build the LogRequest and execute it
2349
if len(file_ids) == 0:
2350
file_ids = None
2351
rqst = make_log_request_dict(
2352
direction=direction, specific_fileids=file_ids,
2353
start_revision=rev1, end_revision=rev2, limit=limit,
2354
message_search=message, delta_type=delta_type,
2355
diff_type=diff_type, _match_using_deltas=match_using_deltas)
2356
Logger(b, rqst).show(lf)
2357
finally:
2358
b.unlock()
2397
# Build the log formatter
2398
if log_format is None:
2399
log_format = log.log_formatter_registry.get_default(b)
2400
# Make a non-encoding output to include the diffs - bug 328007
2401
unencoded_output = ui.ui_factory.make_output_stream(encoding_type='exact')
2402
lf = log_format(show_ids=show_ids, to_file=self.outf,
2403
to_exact_file=unencoded_output,
2404
show_timezone=timezone,
2405
delta_format=get_verbosity_level(),
2406
levels=levels,
2407
show_advice=levels is None)
2408
2409
# Choose the algorithm for doing the logging. It's annoying
2410
# having multiple code paths like this but necessary until
2411
# the underlying repository format is faster at generating
2412
# deltas or can provide everything we need from the indices.
2413
# The default algorithm - match-using-deltas - works for
2414
# multiple files and directories and is faster for small
2415
# amounts of history (200 revisions say). However, it's too
2416
# slow for logging a single file in a repository with deep
2417
# history, i.e. > 10K revisions. In the spirit of "do no
2418
# evil when adding features", we continue to use the
2419
# original algorithm - per-file-graph - for the "single
2420
# file that isn't a directory without showing a delta" case.
2421
partial_history = revision and b.repository._format.supports_chks
2422
match_using_deltas = (len(file_ids) != 1 or filter_by_dir
2423
or delta_type or partial_history)
2424
2425
# Build the LogRequest and execute it
2426
if len(file_ids) == 0:
2427
file_ids = None
2428
rqst = make_log_request_dict(
2429
direction=direction, specific_fileids=file_ids,
2430
start_revision=rev1, end_revision=rev2, limit=limit,
2431
message_search=message, delta_type=delta_type,
2432
diff_type=diff_type, _match_using_deltas=match_using_deltas,
2433
exclude_common_ancestry=exclude_common_ancestry,
2434
)
2435
Logger(b, rqst).show(lf)
2359
2436
2360
2437
2361
2438
def _get_revision_range(revisionspec_list, branch, command_name):
2379
2456
raise errors.BzrCommandError(
2380
2457
"bzr %s doesn't accept two revisions in different"
2381
2458
" branches." % command_name)
2382
rev1 = start_spec.in_history(branch)
2459
if start_spec.spec is None:
2460
# Avoid loading all the history.
2461
rev1 = RevisionInfo(branch, None, None)
2462
else:
2463
rev1 = start_spec.in_history(branch)
2383
2464
# Avoid loading all of history when we know a missing
2384
2465
# end of range means the last revision ...
2385
2466
if end_spec.spec is None:
2414
2495
2415
2496
2416
2497
class cmd_touching_revisions(Command):
2417
"""Return revision-ids which affected a particular file.
2498
__doc__ = """Return revision-ids which affected a particular file.
2418
2499
2419
2500
A more user-friendly interface is "bzr log FILE".
2420
2501
"""
2425
2506
@display_command
2426
2507
def run(self, filename):
2427
2508
tree, relpath = WorkingTree.open_containing(filename)
2509
file_id = tree.path2id(relpath)
2428
2510
b = tree.branch
2429
file_id = tree.path2id(relpath)
2430
for revno, revision_id, what in log.find_touching_revisions(b, file_id):
2511
b.lock_read()
2512
self.add_cleanup(b.unlock)
2513
touching_revs = log.find_touching_revisions(b, file_id)
2514
for revno, revision_id, what in touching_revs:
2431
2515
self.outf.write("%6d %s\n" % (revno, what))
2432
2516
2433
2517
2434
2518
class cmd_ls(Command):
2435
"""List files in a tree.
2519
__doc__ = """List files in a tree.
2436
2520
"""
2437
2521
2438
2522
_see_also = ['status', 'cat']
2486
2570
if from_root:
2487
2571
if relpath:
2488
2572
prefix = relpath + '/'
2489
elif fs_path != '.':
2573
elif fs_path != '.' and not fs_path.endswith('/'):
2490
2574
prefix = fs_path + '/'
2491
2575
2492
2576
if revision is not None or tree is None:
2501
2585
note("Ignoring files outside view. View is %s" % view_str)
2502
2586
2503
2587
tree.lock_read()
2504
try:
2505
for fp, fc, fkind, fid, entry in tree.list_files(include_root=False,
2506
from_dir=relpath, recursive=recursive):
2507
# Apply additional masking
2508
if not all and not selection[fc]:
2509
continue
2510
if kind is not None and fkind != kind:
2511
continue
2512
if apply_view:
2513
try:
2514
if relpath:
2515
fullpath = osutils.pathjoin(relpath, fp)
2516
else:
2517
fullpath = fp
2518
views.check_path_in_view(tree, fullpath)
2519
except errors.FileOutsideView:
2520
continue
2588
self.add_cleanup(tree.unlock)
2589
for fp, fc, fkind, fid, entry in tree.list_files(include_root=False,
2590
from_dir=relpath, recursive=recursive):
2591
# Apply additional masking
2592
if not all and not selection[fc]:
2593
continue
2594
if kind is not None and fkind != kind:
2595
continue
2596
if apply_view:
2597
try:
2598
if relpath:
2599
fullpath = osutils.pathjoin(relpath, fp)
2600
else:
2601
fullpath = fp
2602
views.check_path_in_view(tree, fullpath)
2603
except errors.FileOutsideView:
2604
continue
2521
2605
2522
# Output the entry
2523
if prefix:
2524
fp = osutils.pathjoin(prefix, fp)
2525
kindch = entry.kind_character()
2526
outstring = fp + kindch
2527
ui.ui_factory.clear_term()
2528
if verbose:
2529
outstring = '%-8s %s' % (fc, outstring)
2530
if show_ids and fid is not None:
2531
outstring = "%-50s %s" % (outstring, fid)
2606
# Output the entry
2607
if prefix:
2608
fp = osutils.pathjoin(prefix, fp)
2609
kindch = entry.kind_character()
2610
outstring = fp + kindch
2611
ui.ui_factory.clear_term()
2612
if verbose:
2613
outstring = '%-8s %s' % (fc, outstring)
2614
if show_ids and fid is not None:
2615
outstring = "%-50s %s" % (outstring, fid)
2616
self.outf.write(outstring + '\n')
2617
elif null:
2618
self.outf.write(fp + '\0')
2619
if show_ids:
2620
if fid is not None:
2621
self.outf.write(fid)
2622
self.outf.write('\0')
2623
self.outf.flush()
2624
else:
2625
if show_ids:
2626
if fid is not None:
2627
my_id = fid
2628
else:
2629
my_id = ''
2630
self.outf.write('%-50s %s\n' % (outstring, my_id))
2631
else:
2532
2632
self.outf.write(outstring + '\n')
2533
elif null:
2534
self.outf.write(fp + '\0')
2535
if show_ids:
2536
if fid is not None:
2537
self.outf.write(fid)
2538
self.outf.write('\0')
2539
self.outf.flush()
2540
else:
2541
if show_ids:
2542
if fid is not None:
2543
my_id = fid
2544
else:
2545
my_id = ''
2546
self.outf.write('%-50s %s\n' % (outstring, my_id))
2547
else:
2548
self.outf.write(outstring + '\n')
2549
finally:
2550
tree.unlock()
2551
2633
2552
2634
2553
2635
class cmd_unknowns(Command):
2554
"""List unknown files.
2636
__doc__ = """List unknown files.
2555
2637
"""
2556
2638
2557
2639
hidden = True
2564
2646
2565
2647
2566
2648
class cmd_ignore(Command):
2567
"""Ignore specified files or patterns.
2649
__doc__ = """Ignore specified files or patterns.
2568
2650
2569
2651
See ``bzr help patterns`` for details on the syntax of patterns.
2570
2652
2653
If a .bzrignore file does not exist, the ignore command
2654
will create one and add the specified files or patterns to the newly
2655
created file. The ignore command will also automatically add the
2656
.bzrignore file to be versioned. Creating a .bzrignore file without
2657
the use of the ignore command will require an explicit add command.
2658
2571
2659
To remove patterns from the ignore list, edit the .bzrignore file.
2572
2660
After adding, editing or deleting that file either indirectly by
2573
2661
using this command or directly by using an editor, be sure to commit
2574
2662
it.
2663
2664
Bazaar also supports a global ignore file ~/.bazaar/ignore. On Windows
2665
the global ignore file can be found in the application data directory as
2666
C:\\Documents and Settings\\<user>\\Application Data\\Bazaar\\2.0\\ignore.
2667
Global ignores are not touched by this command. The global ignore file
2668
can be edited directly using an editor.
2669
2670
Patterns prefixed with '!' are exceptions to ignore patterns and take
2671
precedence over regular ignores. Such exceptions are used to specify
2672
files that should be versioned which would otherwise be ignored.
2673
2674
Patterns prefixed with '!!' act as regular ignore patterns, but have
2675
precedence over the '!' exception patterns.
2575
2676
2576
2677
Note: ignore patterns containing shell wildcards must be quoted from
2577
2678
the shell on Unix.
2581
2682
2582
2683
bzr ignore ./Makefile
2583
2684
2584
Ignore class files in all directories::
2685
Ignore .class files in all directories...::
2585
2686
2586
2687
bzr ignore "*.class"
2587
2688
2689
...but do not ignore "special.class"::
2690
2691
bzr ignore "!special.class"
2692
2588
2693
Ignore .o files under the lib directory::
2589
2694
2590
2695
bzr ignore "lib/**/*.o"
2596
2701
Ignore everything but the "debian" toplevel directory::
2597
2702
2598
2703
bzr ignore "RE:(?!debian/).*"
2704
2705
Ignore everything except the "local" toplevel directory,
2706
but always ignore "*~" autosave files, even under local/::
2707
2708
bzr ignore "*"
2709
bzr ignore "!./local"
2710
bzr ignore "!!*~"
2599
2711
"""
2600
2712
2601
2713
_see_also = ['status', 'ignored', 'patterns']
2602
2714
takes_args = ['name_pattern*']
2603
2715
takes_options = [
2604
Option('old-default-rules',
2605
help='Write out the ignore rules bzr < 0.9 always used.')
2716
Option('default-rules',
2717
help='Display the default ignore rules that bzr uses.')
2606
2718
]
2607
2719
2608
def run(self, name_pattern_list=None, old_default_rules=None):
2720
def run(self, name_pattern_list=None, default_rules=None):
2609
2721
from bzrlib import ignores
2610
if old_default_rules is not None:
2611
# dump the rules and exit
2612
for pattern in ignores.OLD_DEFAULTS:
2613
print pattern
2722
if default_rules is not None:
2723
# dump the default rules and exit
2724
for pattern in ignores.USER_DEFAULTS:
2725
self.outf.write("%s\n" % pattern)
2614
2726
return
2615
2727
if not name_pattern_list:
2616
2728
raise errors.BzrCommandError("ignore requires at least one "
2617
"NAME_PATTERN or --old-default-rules")
2729
"NAME_PATTERN or --default-rules.")
2618
2730
name_pattern_list = [globbing.normalize_pattern(p)
2619
2731
for p in name_pattern_list]
2620
2732
for name_pattern in name_pattern_list:
2632
2744
if id is not None:
2633
2745
filename = entry[0]
2634
2746
if ignored.match(filename):
2635
matches.append(filename.encode('utf-8'))
2747
matches.append(filename)
2636
2748
tree.unlock()
2637
2749
if len(matches) > 0:
2638
print "Warning: the following files are version controlled and" \
2639
" match your ignore pattern:\n%s" \
2640
"\nThese files will continue to be version controlled" \
2641
" unless you 'bzr remove' them." % ("\n".join(matches),)
2750
self.outf.write("Warning: the following files are version controlled and"
2751
" match your ignore pattern:\n%s"
2752
"\nThese files will continue to be version controlled"
2753
" unless you 'bzr remove' them.\n" % ("\n".join(matches),))
2642
2754
2643
2755
2644
2756
class cmd_ignored(Command):
2645
"""List ignored files and the patterns that matched them.
2757
__doc__ = """List ignored files and the patterns that matched them.
2646
2758
2647
2759
List all the ignored files and the ignore pattern that caused the file to
2648
2760
be ignored.
2659
2771
def run(self):
2660
2772
tree = WorkingTree.open_containing(u'.')[0]
2661
2773
tree.lock_read()
2662
try:
2663
for path, file_class, kind, file_id, entry in tree.list_files():
2664
if file_class != 'I':
2665
continue
2666
## XXX: Slightly inefficient since this was already calculated
2667
pat = tree.is_ignored(path)
2668
self.outf.write('%-50s %s\n' % (path, pat))
2669
finally:
2670
tree.unlock()
2774
self.add_cleanup(tree.unlock)
2775
for path, file_class, kind, file_id, entry in tree.list_files():
2776
if file_class != 'I':
2777
continue
2778
## XXX: Slightly inefficient since this was already calculated
2779
pat = tree.is_ignored(path)
2780
self.outf.write('%-50s %s\n' % (path, pat))
2671
2781
2672
2782
2673
2783
class cmd_lookup_revision(Command):
2674
"""Lookup the revision-id from a revision-number
2784
__doc__ = """Lookup the revision-id from a revision-number
2675
2785
2676
2786
:Examples:
2677
2787
bzr lookup-revision 33
2684
2794
try:
2685
2795
revno = int(revno)
2686
2796
except ValueError:
2687
raise errors.BzrCommandError("not a valid revision-number: %r" % revno)
2688
2689
print WorkingTree.open_containing(u'.')[0].branch.get_rev_id(revno)
2797
raise errors.BzrCommandError("not a valid revision-number: %r"
2798
% revno)
2799
revid = WorkingTree.open_containing(u'.')[0].branch.get_rev_id(revno)
2800
self.outf.write("%s\n" % revid)
2690
2801
2691
2802
2692
2803
class cmd_export(Command):
2693
"""Export current or past revision to a destination directory or archive.
2804
__doc__ = """Export current or past revision to a destination directory or archive.
2694
2805
2695
2806
If no revision is specified this exports the last committed revision.
2696
2807
2728
2839
Option('root',
2729
2840
type=str,
2730
2841
help="Name of the root directory inside the exported file."),
2842
Option('per-file-timestamps',
2843
help='Set modification time of files to that of the last '
2844
'revision in which it was changed.'),
2731
2845
]
2732
2846
def run(self, dest, branch_or_subdir=None, revision=None, format=None,
2733
root=None, filters=False):
2847
root=None, filters=False, per_file_timestamps=False):
2734
2848
from bzrlib.export import export
2735
2849
2736
2850
if branch_or_subdir is None:
2743
2857
2744
2858
rev_tree = _get_one_revision_tree('export', revision, branch=b, tree=tree)
2745
2859
try:
2746
export(rev_tree, dest, format, root, subdir, filtered=filters)
2860
export(rev_tree, dest, format, root, subdir, filtered=filters,
2861
per_file_timestamps=per_file_timestamps)
2747
2862
except errors.NoSuchExportFormat, e:
2748
2863
raise errors.BzrCommandError('Unsupported export format: %s' % e.format)
2749
2864
2750
2865
2751
2866
class cmd_cat(Command):
2752
"""Write the contents of a file as of a given revision to standard output.
2867
__doc__ = """Write the contents of a file as of a given revision to standard output.
2753
2868
2754
2869
If no revision is nominated, the last revision is used.
2755
2870
2776
2891
tree, branch, relpath = \
2777
2892
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
2778
2893
branch.lock_read()
2779
try:
2780
return self._run(tree, branch, relpath, filename, revision,
2781
name_from_revision, filters)
2782
finally:
2783
branch.unlock()
2894
self.add_cleanup(branch.unlock)
2895
return self._run(tree, branch, relpath, filename, revision,
2896
name_from_revision, filters)
2784
2897
2785
2898
def _run(self, tree, b, relpath, filename, revision, name_from_revision,
2786
2899
filtered):
2787
2900
if tree is None:
2788
2901
tree = b.basis_tree()
2789
2902
rev_tree = _get_one_revision_tree('cat', revision, branch=b)
2903
rev_tree.lock_read()
2904
self.add_cleanup(rev_tree.unlock)
2790
2905
2791
2906
old_file_id = rev_tree.path2id(relpath)
2792
2907
2827
2942
chunks = content.splitlines(True)
2828
2943
content = filtered_output_bytes(chunks, filters,
2829
2944
ContentFilterContext(relpath, rev_tree))
2945
self.cleanup_now()
2830
2946
self.outf.writelines(content)
2831
2947
else:
2948
self.cleanup_now()
2832
2949
self.outf.write(content)
2833
2950
2834
2951
2835
2952
class cmd_local_time_offset(Command):
2836
"""Show the offset in seconds from GMT to local time."""
2953
__doc__ = """Show the offset in seconds from GMT to local time."""
2837
2954
hidden = True
2838
2955
@display_command
2839
2956
def run(self):
2840
print osutils.local_time_offset()
2957
self.outf.write("%s\n" % osutils.local_time_offset())
2841
2958
2842
2959
2843
2960
2844
2961
class cmd_commit(Command):
2845
"""Commit changes into a new revision.
2962
__doc__ = """Commit changes into a new revision.
2846
2963
2847
2964
An explanatory message needs to be given for each commit. This is
2848
2965
often done by using the --message option (getting the message from the
2941
3058
Option('strict',
2942
3059
help="Refuse to commit if there are unknown "
2943
3060
"files in the working tree."),
3061
Option('commit-time', type=str,
3062
help="Manually set a commit time using commit date "
3063
"format, e.g. '2009-10-10 08:00:00 +0100'."),
2944
3064
ListOption('fixes', type=str,
2945
3065
help="Mark a bug as being fixed by this revision "
2946
3066
"(see \"bzr help bugs\")."),
2953
3073
"the master branch until a normal commit "
2954
3074
"is performed."
2955
3075
),
2956
Option('show-diff',
2957
help='When no message is supplied, show the diff along'
2958
' with the status summary in the message editor.'),
3076
Option('show-diff', short_name='p',
3077
help='When no message is supplied, show the diff along'
3078
' with the status summary in the message editor.'),
2959
3079
]
2960
3080
aliases = ['ci', 'checkin']
2961
3081
2980
3100
2981
3101
def run(self, message=None, file=None, verbose=False, selected_list=None,
2982
3102
unchanged=False, strict=False, local=False, fixes=None,
2983
author=None, show_diff=False, exclude=None):
3103
author=None, show_diff=False, exclude=None, commit_time=None):
2984
3104
from bzrlib.errors import (
2985
3105
PointlessCommit,
2986
3106
ConflictsInTree,
2992
3112
make_commit_message_template_encoded
2993
3113
)
2994
3114
3115
commit_stamp = offset = None
3116
if commit_time is not None:
3117
try:
3118
commit_stamp, offset = timestamp.parse_patch_date(commit_time)
3119
except ValueError, e:
3120
raise errors.BzrCommandError(
3121
"Could not parse --commit-time: " + str(e))
3122
2995
3123
# TODO: Need a blackbox test for invoking the external editor; may be
2996
3124
# slightly problematic to run this cross-platform.
2997
3125
3017
3145
if local and not tree.branch.get_bound_location():
3018
3146
raise errors.LocalRequiresBoundBranch()
3019
3147
3148
if message is not None:
3149
try:
3150
file_exists = osutils.lexists(message)
3151
except UnicodeError:
3152
# The commit message contains unicode characters that can't be
3153
# represented in the filesystem encoding, so that can't be a
3154
# file.
3155
file_exists = False
3156
if file_exists:
3157
warning_msg = (
3158
'The commit message is a file name: "%(f)s".\n'
3159
'(use --file "%(f)s" to take commit message from that file)'
3160
% { 'f': message })
3161
ui.ui_factory.show_warning(warning_msg)
3162
if '\r' in message:
3163
message = message.replace('\r\n', '\n')
3164
message = message.replace('\r', '\n')
3165
if file:
3166
raise errors.BzrCommandError(
3167
"please specify either --message or --file")
3168
3020
3169
def get_message(commit_obj):
3021
3170
"""Callback to get commit message"""
3022
my_message = message
3023
if my_message is None and not file:
3024
t = make_commit_message_template_encoded(tree,
3171
if file:
3172
my_message = codecs.open(
3173
file, 'rt', osutils.get_user_encoding()).read()
3174
elif message is not None:
3175
my_message = message
3176
else:
3177
# No message supplied: make one up.
3178
# text is the status of the tree
3179
text = make_commit_message_template_encoded(tree,
3025
3180
selected_list, diff=show_diff,
3026
3181
output_encoding=osutils.get_user_encoding())
3182
# start_message is the template generated from hooks
3183
# XXX: Warning - looks like hooks return unicode,
3184
# make_commit_message_template_encoded returns user encoding.
3185
# We probably want to be using edit_commit_message instead to
3186
# avoid this.
3027
3187
start_message = generate_commit_message_template(commit_obj)
3028
my_message = edit_commit_message_encoded(t,
3188
my_message = edit_commit_message_encoded(text,
3029
3189
start_message=start_message)
3030
3190
if my_message is None:
3031
3191
raise errors.BzrCommandError("please specify a commit"
3032
3192
" message with either --message or --file")
3033
elif my_message and file:
3034
raise errors.BzrCommandError(
3035
"please specify either --message or --file")
3036
if file:
3037
my_message = codecs.open(file, 'rt',
3038
osutils.get_user_encoding()).read()
3039
3193
if my_message == "":
3040
3194
raise errors.BzrCommandError("empty commit message specified")
3041
3195
return my_message
3049
3203
specific_files=selected_list,
3050
3204
allow_pointless=unchanged, strict=strict, local=local,
3051
3205
reporter=None, verbose=verbose, revprops=properties,
3052
authors=author,
3206
authors=author, timestamp=commit_stamp,
3207
timezone=offset,
3053
3208
exclude=safe_relpath_files(tree, exclude))
3054
3209
except PointlessCommit:
3055
# FIXME: This should really happen before the file is read in;
3056
# perhaps prepare the commit; get the message; then actually commit
3057
3210
raise errors.BzrCommandError("No changes to commit."
3058
3211
" Use --unchanged to commit anyhow.")
3059
3212
except ConflictsInTree:
3064
3217
raise errors.BzrCommandError("Commit refused because there are"
3065
3218
" unknown files in the working tree.")
3066
3219
except errors.BoundBranchOutOfDate, e:
3067
raise errors.BzrCommandError(str(e) + "\n"
3068
'To commit to master branch, run update and then commit.\n'
3069
'You can also pass --local to commit to continue working '
3070
'disconnected.')
3220
e.extra_help = ("\n"
3221
'To commit to master branch, run update and then commit.\n'
3222
'You can also pass --local to commit to continue working '
3223
'disconnected.')
3224
raise
3071
3225
3072
3226
3073
3227
class cmd_check(Command):
3074
"""Validate working tree structure, branch consistency and repository history.
3228
__doc__ = """Validate working tree structure, branch consistency and repository history.
3075
3229
3076
3230
This command checks various invariants about branch and repository storage
3077
3231
to detect data corruption or bzr bugs.
3141
3295
3142
3296
3143
3297
class cmd_upgrade(Command):
3144
"""Upgrade branch storage to current format.
3298
__doc__ = """Upgrade branch storage to current format.
3145
3299
3146
3300
The check command or bzr developers may sometimes advise you to run
3147
3301
this command. When the default format has changed you may also be warned
3165
3319
3166
3320
3167
3321
class cmd_whoami(Command):
3168
"""Show or set bzr user id.
3322
__doc__ = """Show or set bzr user id.
3169
3323
3170
3324
:Examples:
3171
3325
Show the email of the current user::
3215
3369
3216
3370
3217
3371
class cmd_nick(Command):
3218
"""Print or set the branch nickname.
3372
__doc__ = """Print or set the branch nickname.
3219
3373
3220
3374
If unset, the tree root directory name is used as the nickname.
3221
3375
To print the current nickname, execute with no argument.
3235
3389
3236
3390
@display_command
3237
3391
def printme(self, branch):
3238
print branch.nick
3392
self.outf.write('%s\n' % branch.nick)
3239
3393
3240
3394
3241
3395
class cmd_alias(Command):
3242
"""Set/unset and display aliases.
3396
__doc__ = """Set/unset and display aliases.
3243
3397
3244
3398
:Examples:
3245
3399
Show the current aliases::
3309
3463
3310
3464
3311
3465
class cmd_selftest(Command):
3312
"""Run internal test suite.
3466
__doc__ = """Run internal test suite.
3313
3467
3314
3468
If arguments are given, they are regular expressions that say which tests
3315
3469
should run. Tests matching any expression are run, and other tests are
3359
3513
def get_transport_type(typestring):
3360
3514
"""Parse and return a transport specifier."""
3361
3515
if typestring == "sftp":
3362
from bzrlib.transport.sftp import SFTPAbsoluteServer
3363
return SFTPAbsoluteServer
3516
from bzrlib.tests import stub_sftp
3517
return stub_sftp.SFTPAbsoluteServer
3364
3518
if typestring == "memory":
3365
from bzrlib.transport.memory import MemoryServer
3366
return MemoryServer
3519
from bzrlib.tests import test_server
3520
return memory.MemoryServer
3367
3521
if typestring == "fakenfs":
3368
from bzrlib.transport.fakenfs import FakeNFSServer
3369
return FakeNFSServer
3522
from bzrlib.tests import test_server
3523
return test_server.FakeNFSServer
3370
3524
msg = "No known transport type %s. Supported types are: sftp\n" %\
3371
3525
(typestring)
3372
3526
raise errors.BzrCommandError(msg)
3456
3610
raise errors.BzrCommandError("subunit not available. subunit "
3457
3611
"needs to be installed to use --subunit.")
3458
3612
self.additional_selftest_args['runner_class'] = SubUnitBzrRunner
3613
# On Windows, disable automatic conversion of '\n' to '\r\n' in
3614
# stdout, which would corrupt the subunit stream.
3615
if sys.platform == "win32" and sys.stdout.fileno() >= 0:
3616
import msvcrt
3617
msvcrt.setmode(sys.stdout.fileno(), os.O_BINARY)
3459
3618
if parallel:
3460
3619
self.additional_selftest_args.setdefault(
3461
3620
'suite_decorators', []).append(parallel)
3465
3624
verbose = not is_quiet()
3466
3625
# TODO: should possibly lock the history file...
3467
3626
benchfile = open(".perf_history", "at", buffering=1)
3627
self.add_cleanup(benchfile.close)
3468
3628
else:
3469
3629
test_suite_factory = None
3470
3630
benchfile = None
3471
try:
3472
selftest_kwargs = {"verbose": verbose,
3473
"pattern": pattern,
3474
"stop_on_failure": one,
3475
"transport": transport,
3476
"test_suite_factory": test_suite_factory,
3477
"lsprof_timed": lsprof_timed,
3478
"lsprof_tests": lsprof_tests,
3479
"bench_history": benchfile,
3480
"matching_tests_first": first,
3481
"list_only": list_only,
3482
"random_seed": randomize,
3483
"exclude_pattern": exclude,
3484
"strict": strict,
3485
"load_list": load_list,
3486
"debug_flags": debugflag,
3487
"starting_with": starting_with
3488
}
3489
selftest_kwargs.update(self.additional_selftest_args)
3490
result = selftest(**selftest_kwargs)
3491
finally:
3492
if benchfile is not None:
3493
benchfile.close()
3631
selftest_kwargs = {"verbose": verbose,
3632
"pattern": pattern,
3633
"stop_on_failure": one,
3634
"transport": transport,
3635
"test_suite_factory": test_suite_factory,
3636
"lsprof_timed": lsprof_timed,
3637
"lsprof_tests": lsprof_tests,
3638
"bench_history": benchfile,
3639
"matching_tests_first": first,
3640
"list_only": list_only,
3641
"random_seed": randomize,
3642
"exclude_pattern": exclude,
3643
"strict": strict,
3644
"load_list": load_list,
3645
"debug_flags": debugflag,
3646
"starting_with": starting_with
3647
}
3648
selftest_kwargs.update(self.additional_selftest_args)
3649
result = selftest(**selftest_kwargs)
3494
3650
return int(not result)
3495
3651
3496
3652
3497
3653
class cmd_version(Command):
3498
"""Show version of bzr."""
3654
__doc__ = """Show version of bzr."""
3499
3655
3500
3656
encoding_type = 'replace'
3501
3657
takes_options = [
3512
3668
3513
3669
3514
3670
class cmd_rocks(Command):
3515
"""Statement of optimism."""
3671
__doc__ = """Statement of optimism."""
3516
3672
3517
3673
hidden = True
3518
3674
3519
3675
@display_command
3520
3676
def run(self):
3521
print "It sure does!"
3677
self.outf.write("It sure does!\n")
3522
3678
3523
3679
3524
3680
class cmd_find_merge_base(Command):
3525
"""Find and print a base revision for merging two branches."""
3681
__doc__ = """Find and print a base revision for merging two branches."""
3526
3682
# TODO: Options to specify revisions on either side, as if
3527
3683
# merging only part of the history.
3528
3684
takes_args = ['branch', 'other']
3535
3691
branch1 = Branch.open_containing(branch)[0]
3536
3692
branch2 = Branch.open_containing(other)[0]
3537
3693
branch1.lock_read()
3538
try:
3539
branch2.lock_read()
3540
try:
3541
last1 = ensure_null(branch1.last_revision())
3542
last2 = ensure_null(branch2.last_revision())
3543
3544
graph = branch1.repository.get_graph(branch2.repository)
3545
base_rev_id = graph.find_unique_lca(last1, last2)
3546
3547
print 'merge base is revision %s' % base_rev_id
3548
finally:
3549
branch2.unlock()
3550
finally:
3551
branch1.unlock()
3694
self.add_cleanup(branch1.unlock)
3695
branch2.lock_read()
3696
self.add_cleanup(branch2.unlock)
3697
last1 = ensure_null(branch1.last_revision())
3698
last2 = ensure_null(branch2.last_revision())
3699
3700
graph = branch1.repository.get_graph(branch2.repository)
3701
base_rev_id = graph.find_unique_lca(last1, last2)
3702
3703
self.outf.write('merge base is revision %s\n' % base_rev_id)
3552
3704
3553
3705
3554
3706
class cmd_merge(Command):
3555
"""Perform a three-way merge.
3707
__doc__ = """Perform a three-way merge.
3556
3708
3557
3709
The source of the merge can be specified either in the form of a branch,
3558
3710
or in the form of a path to a file containing a merge directive generated
3587
3739
committed to record the result of the merge.
3588
3740
3589
3741
merge refuses to run if there are any uncommitted changes, unless
3590
--force is given.
3742
--force is given. The --force option can also be used to create a
3743
merge revision which has more than two parents.
3744
3745
If one would like to merge changes from the working tree of the other
3746
branch without merging any committed revisions, the --uncommitted option
3747
can be given.
3591
3748
3592
3749
To select only some changes to merge, use "merge -i", which will prompt
3593
3750
you to apply each diff hunk and file change, similar to "shelve".
3605
3762
3606
3763
bzr merge -r 81..82 ../bzr.dev
3607
3764
3608
To apply a merge directive contained in /tmp/merge:
3765
To apply a merge directive contained in /tmp/merge::
3609
3766
3610
3767
bzr merge /tmp/merge
3768
3769
To create a merge revision with three parents from two branches
3770
feature1a and feature1b:
3771
3772
bzr merge ../feature1a
3773
bzr merge ../feature1b --force
3774
bzr commit -m 'revision with three parents'
3611
3775
"""
3612
3776
3613
3777
encoding_type = 'exact'
3671
3835
view_info = _get_view_info_for_change_reporter(tree)
3672
3836
change_reporter = delta._ChangeReporter(
3673
3837
unversioned_filter=tree.is_ignored, view_info=view_info)
3674
cleanups = []
3675
try:
3676
pb = ui.ui_factory.nested_progress_bar()
3677
cleanups.append(pb.finished)
3678
tree.lock_write()
3679
cleanups.append(tree.unlock)
3680
if location is not None:
3681
try:
3682
mergeable = bundle.read_mergeable_from_url(location,
3683
possible_transports=possible_transports)
3684
except errors.NotABundle:
3685
mergeable = None
3686
else:
3687
if uncommitted:
3688
raise errors.BzrCommandError('Cannot use --uncommitted'
3689
' with bundles or merge directives.')
3690
3691
if revision is not None:
3692
raise errors.BzrCommandError(
3693
'Cannot use -r with merge directives or bundles')
3694
merger, verified = _mod_merge.Merger.from_mergeable(tree,
3695
mergeable, pb)
3696
3697
if merger is None and uncommitted:
3698
if revision is not None and len(revision) > 0:
3699
raise errors.BzrCommandError('Cannot use --uncommitted and'
3700
' --revision at the same time.')
3701
merger = self.get_merger_from_uncommitted(tree, location, pb,
3702
cleanups)
3703
allow_pending = False
3704
3705
if merger is None:
3706
merger, allow_pending = self._get_merger_from_branch(tree,
3707
location, revision, remember, possible_transports, pb)
3708
3709
merger.merge_type = merge_type
3710
merger.reprocess = reprocess
3711
merger.show_base = show_base
3712
self.sanity_check_merger(merger)
3713
if (merger.base_rev_id == merger.other_rev_id and
3714
merger.other_rev_id is not None):
3715
note('Nothing to do.')
3838
pb = ui.ui_factory.nested_progress_bar()
3839
self.add_cleanup(pb.finished)
3840
tree.lock_write()
3841
self.add_cleanup(tree.unlock)
3842
if location is not None:
3843
try:
3844
mergeable = bundle.read_mergeable_from_url(location,
3845
possible_transports=possible_transports)
3846
except errors.NotABundle:
3847
mergeable = None
3848
else:
3849
if uncommitted:
3850
raise errors.BzrCommandError('Cannot use --uncommitted'
3851
' with bundles or merge directives.')
3852
3853
if revision is not None:
3854
raise errors.BzrCommandError(
3855
'Cannot use -r with merge directives or bundles')
3856
merger, verified = _mod_merge.Merger.from_mergeable(tree,
3857
mergeable, None)
3858
3859
if merger is None and uncommitted:
3860
if revision is not None and len(revision) > 0:
3861
raise errors.BzrCommandError('Cannot use --uncommitted and'
3862
' --revision at the same time.')
3863
merger = self.get_merger_from_uncommitted(tree, location, None)
3864
allow_pending = False
3865
3866
if merger is None:
3867
merger, allow_pending = self._get_merger_from_branch(tree,
3868
location, revision, remember, possible_transports, None)
3869
3870
merger.merge_type = merge_type
3871
merger.reprocess = reprocess
3872
merger.show_base = show_base
3873
self.sanity_check_merger(merger)
3874
if (merger.base_rev_id == merger.other_rev_id and
3875
merger.other_rev_id is not None):
3876
note('Nothing to do.')
3877
return 0
3878
if pull:
3879
if merger.interesting_files is not None:
3880
raise errors.BzrCommandError('Cannot pull individual files')
3881
if (merger.base_rev_id == tree.last_revision()):
3882
result = tree.pull(merger.other_branch, False,
3883
merger.other_rev_id)
3884
result.report(self.outf)
3716
3885
return 0
3717
if pull:
3718
if merger.interesting_files is not None:
3719
raise errors.BzrCommandError('Cannot pull individual files')
3720
if (merger.base_rev_id == tree.last_revision()):
3721
result = tree.pull(merger.other_branch, False,
3722
merger.other_rev_id)
3723
result.report(self.outf)
3724
return 0
3725
if merger.this_basis is None:
3726
raise errors.BzrCommandError(
3727
"This branch has no commits."
3728
" (perhaps you would prefer 'bzr pull')")
3729
if preview:
3730
return self._do_preview(merger, cleanups)
3731
elif interactive:
3732
return self._do_interactive(merger, cleanups)
3733
else:
3734
return self._do_merge(merger, change_reporter, allow_pending,
3735
verified)
3736
finally:
3737
for cleanup in reversed(cleanups):
3738
cleanup()
3886
if merger.this_basis is None:
3887
raise errors.BzrCommandError(
3888
"This branch has no commits."
3889
" (perhaps you would prefer 'bzr pull')")
3890
if preview:
3891
return self._do_preview(merger)
3892
elif interactive:
3893
return self._do_interactive(merger)
3894
else:
3895
return self._do_merge(merger, change_reporter, allow_pending,
3896
verified)
3739
3897
3740
def _get_preview(self, merger, cleanups):
3898
def _get_preview(self, merger):
3741
3899
tree_merger = merger.make_merger()
3742
3900
tt = tree_merger.make_preview_transform()
3743
cleanups.append(tt.finalize)
3901
self.add_cleanup(tt.finalize)
3744
3902
result_tree = tt.get_preview_tree()
3745
3903
return result_tree
3746
3904
3747
def _do_preview(self, merger, cleanups):
3905
def _do_preview(self, merger):
3748
3906
from bzrlib.diff import show_diff_trees
3749
result_tree = self._get_preview(merger, cleanups)
3907
result_tree = self._get_preview(merger)
3750
3908
show_diff_trees(merger.this_tree, result_tree, self.outf,
3751
3909
old_label='', new_label='')
3752
3910
3762
3920
else:
3763
3921
return 0
3764
3922
3765
def _do_interactive(self, merger, cleanups):
3923
def _do_interactive(self, merger):
3766
3924
"""Perform an interactive merge.
3767
3925
3768
3926
This works by generating a preview tree of the merge, then using
3770
3928
and the preview tree.
3771
3929
"""
3772
3930
from bzrlib import shelf_ui
3773
result_tree = self._get_preview(merger, cleanups)
3931
result_tree = self._get_preview(merger)
3774
3932
writer = bzrlib.option.diff_writer_registry.get()
3775
3933
shelver = shelf_ui.Shelver(merger.this_tree, result_tree, destroy=True,
3776
3934
reporter=shelf_ui.ApplyReporter(),
3777
3935
diff_writer=writer(sys.stdout))
3778
shelver.run()
3936
try:
3937
shelver.run()
3938
finally:
3939
shelver.finalize()
3779
3940
3780
3941
def sanity_check_merger(self, merger):
3781
3942
if (merger.show_base and
3841
4002
allow_pending = True
3842
4003
return merger, allow_pending
3843
4004
3844
def get_merger_from_uncommitted(self, tree, location, pb, cleanups):
4005
def get_merger_from_uncommitted(self, tree, location, pb):
3845
4006
"""Get a merger for uncommitted changes.
3846
4007
3847
4008
:param tree: The tree the merger should apply to.
3848
4009
:param location: The location containing uncommitted changes.
3849
4010
:param pb: The progress bar to use for showing progress.
3850
:param cleanups: A list of operations to perform to clean up the
3851
temporary directories, unfinalized objects, etc.
3852
4011
"""
3853
4012
location = self._select_branch_location(tree, location)[0]
3854
4013
other_tree, other_path = WorkingTree.open_containing(location)
3906
4065
3907
4066
3908
4067
class cmd_remerge(Command):
3909
"""Redo a merge.
4068
__doc__ = """Redo a merge.
3910
4069
3911
4070
Use this if you want to try a different merge technique while resolving
3912
4071
conflicts. Some merge techniques are better than others, and remerge
3937
4096
3938
4097
def run(self, file_list=None, merge_type=None, show_base=False,
3939
4098
reprocess=False):
4099
from bzrlib.conflicts import restore
3940
4100
if merge_type is None:
3941
4101
merge_type = _mod_merge.Merge3Merger
3942
4102
tree, file_list = tree_files(file_list)
3943
4103
tree.lock_write()
3944
try:
3945
parents = tree.get_parent_ids()
3946
if len(parents) != 2:
3947
raise errors.BzrCommandError("Sorry, remerge only works after normal"
3948
" merges. Not cherrypicking or"
3949
" multi-merges.")
3950
repository = tree.branch.repository
3951
interesting_ids = None
3952
new_conflicts = []
3953
conflicts = tree.conflicts()
3954
if file_list is not None:
3955
interesting_ids = set()
3956
for filename in file_list:
3957
file_id = tree.path2id(filename)
3958
if file_id is None:
3959
raise errors.NotVersionedError(filename)
3960
interesting_ids.add(file_id)
3961
if tree.kind(file_id) != "directory":
3962
continue
4104
self.add_cleanup(tree.unlock)
4105
parents = tree.get_parent_ids()
4106
if len(parents) != 2:
4107
raise errors.BzrCommandError("Sorry, remerge only works after normal"
4108
" merges. Not cherrypicking or"
4109
" multi-merges.")
4110
repository = tree.branch.repository
4111
interesting_ids = None
4112
new_conflicts = []
4113
conflicts = tree.conflicts()
4114
if file_list is not None:
4115
interesting_ids = set()
4116
for filename in file_list:
4117
file_id = tree.path2id(filename)
4118
if file_id is None:
4119
raise errors.NotVersionedError(filename)
4120
interesting_ids.add(file_id)
4121
if tree.kind(file_id) != "directory":
4122
continue
3963
4123
3964
for name, ie in tree.inventory.iter_entries(file_id):
3965
interesting_ids.add(ie.file_id)
3966
new_conflicts = conflicts.select_conflicts(tree, file_list)[0]
3967
else:
3968
# Remerge only supports resolving contents conflicts
3969
allowed_conflicts = ('text conflict', 'contents conflict')
3970
restore_files = [c.path for c in conflicts
3971
if c.typestring in allowed_conflicts]
3972
_mod_merge.transform_tree(tree, tree.basis_tree(), interesting_ids)
3973
tree.set_conflicts(ConflictList(new_conflicts))
3974
if file_list is not None:
3975
restore_files = file_list
3976
for filename in restore_files:
3977
try:
3978
restore(tree.abspath(filename))
3979
except errors.NotConflicted:
3980
pass
3981
# Disable pending merges, because the file texts we are remerging
3982
# have not had those merges performed. If we use the wrong parents
3983
# list, we imply that the working tree text has seen and rejected
3984
# all the changes from the other tree, when in fact those changes
3985
# have not yet been seen.
3986
pb = ui.ui_factory.nested_progress_bar()
3987
tree.set_parent_ids(parents[:1])
4124
for name, ie in tree.inventory.iter_entries(file_id):
4125
interesting_ids.add(ie.file_id)
4126
new_conflicts = conflicts.select_conflicts(tree, file_list)[0]
4127
else:
4128
# Remerge only supports resolving contents conflicts
4129
allowed_conflicts = ('text conflict', 'contents conflict')
4130
restore_files = [c.path for c in conflicts
4131
if c.typestring in allowed_conflicts]
4132
_mod_merge.transform_tree(tree, tree.basis_tree(), interesting_ids)
4133
tree.set_conflicts(ConflictList(new_conflicts))
4134
if file_list is not None:
4135
restore_files = file_list
4136
for filename in restore_files:
3988
4137
try:
3989
merger = _mod_merge.Merger.from_revision_ids(pb,
3990
tree, parents[1])
3991
merger.interesting_ids = interesting_ids
3992
merger.merge_type = merge_type
3993
merger.show_base = show_base
3994
merger.reprocess = reprocess
3995
conflicts = merger.do_merge()
3996
finally:
3997
tree.set_parent_ids(parents)
3998
pb.finished()
4138
restore(tree.abspath(filename))
4139
except errors.NotConflicted:
4140
pass
4141
# Disable pending merges, because the file texts we are remerging
4142
# have not had those merges performed. If we use the wrong parents
4143
# list, we imply that the working tree text has seen and rejected
4144
# all the changes from the other tree, when in fact those changes
4145
# have not yet been seen.
4146
tree.set_parent_ids(parents[:1])
4147
try:
4148
merger = _mod_merge.Merger.from_revision_ids(None, tree, parents[1])
4149
merger.interesting_ids = interesting_ids
4150
merger.merge_type = merge_type
4151
merger.show_base = show_base
4152
merger.reprocess = reprocess
4153
conflicts = merger.do_merge()
3999
4154
finally:
4000
tree.unlock()
4155
tree.set_parent_ids(parents)
4001
4156
if conflicts > 0:
4002
4157
return 1
4003
4158
else:
4005
4160
4006
4161
4007
4162
class cmd_revert(Command):
4008
"""Revert files to a previous revision.
4163
__doc__ = """Revert files to a previous revision.
4009
4164
4010
4165
Giving a list of files will revert only those files. Otherwise, all files
4011
4166
will be reverted. If the revision is not specified with '--revision', the
4025
4180
name. If you name a directory, all the contents of that directory will be
4026
4181
reverted.
4027
4182
4028
Any files that have been newly added since that revision will be deleted,
4029
with a backup kept if appropriate. Directories containing unknown files
4030
will not be deleted.
4183
If you have newly added files since the target revision, they will be
4184
removed. If the files to be removed have been changed, backups will be
4185
created as above. Directories containing unknown files will not be
4186
deleted.
4031
4187
4032
The working tree contains a list of pending merged revisions, which will
4033
be included as parents in the next commit. Normally, revert clears that
4034
list as well as reverting the files. If any files are specified, revert
4035
leaves the pending merge list alone and reverts only the files. Use "bzr
4036
revert ." in the tree root to revert all files but keep the merge record,
4037
and "bzr revert --forget-merges" to clear the pending merge list without
4188
The working tree contains a list of revisions that have been merged but
4189
not yet committed. These revisions will be included as additional parents
4190
of the next commit. Normally, using revert clears that list as well as
4191
reverting the files. If any files are specified, revert leaves the list
4192
of uncommitted merges alone and reverts only the files. Use ``bzr revert
4193
.`` in the tree root to revert all files but keep the recorded merges,
4194
and ``bzr revert --forget-merges`` to clear the pending merge list without
4038
4195
reverting any files.
4196
4197
Using "bzr revert --forget-merges", it is possible to apply all of the
4198
changes from a branch in a single revision. To do this, perform the merge
4199
as desired. Then doing revert with the "--forget-merges" option will keep
4200
the content of the tree as it was, but it will clear the list of pending
4201
merges. The next commit will then contain all of the changes that are
4202
present in the other branch, but without any other parent revisions.
4203
Because this technique forgets where these changes originated, it may
4204
cause additional conflicts on later merges involving the same source and
4205
target branches.
4039
4206
"""
4040
4207
4041
4208
_see_also = ['cat', 'export']
4050
4217
def run(self, revision=None, no_backup=False, file_list=None,
4051
4218
forget_merges=None):
4052
4219
tree, file_list = tree_files(file_list)
4053
tree.lock_write()
4054
try:
4055
if forget_merges:
4056
tree.set_parent_ids(tree.get_parent_ids()[:1])
4057
else:
4058
self._revert_tree_to_revision(tree, revision, file_list, no_backup)
4059
finally:
4060
tree.unlock()
4220
tree.lock_tree_write()
4221
self.add_cleanup(tree.unlock)
4222
if forget_merges:
4223
tree.set_parent_ids(tree.get_parent_ids()[:1])
4224
else:
4225
self._revert_tree_to_revision(tree, revision, file_list, no_backup)
4061
4226
4062
4227
@staticmethod
4063
4228
def _revert_tree_to_revision(tree, revision, file_list, no_backup):
4064
4229
rev_tree = _get_one_revision_tree('revert', revision, tree=tree)
4065
pb = ui.ui_factory.nested_progress_bar()
4066
try:
4067
tree.revert(file_list, rev_tree, not no_backup, pb,
4068
report_changes=True)
4069
finally:
4070
pb.finished()
4230
tree.revert(file_list, rev_tree, not no_backup, None,
4231
report_changes=True)
4071
4232
4072
4233
4073
4234
class cmd_assert_fail(Command):
4074
"""Test reporting of assertion failures"""
4235
__doc__ = """Test reporting of assertion failures"""
4075
4236
# intended just for use in testing
4076
4237
4077
4238
hidden = True
4081
4242
4082
4243
4083
4244
class cmd_help(Command):
4084
"""Show help on a command or other topic.
4245
__doc__ = """Show help on a command or other topic.
4085
4246
"""
4086
4247
4087
4248
_see_also = ['topics']
4100
4261
4101
4262
4102
4263
class cmd_shell_complete(Command):
4103
"""Show appropriate completions for context.
4264
__doc__ = """Show appropriate completions for context.
4104
4265
4105
4266
For a list of all available commands, say 'bzr shell-complete'.
4106
4267
"""
4115
4276
4116
4277
4117
4278
class cmd_missing(Command):
4118
"""Show unmerged/unpulled revisions between two branches.
4279
__doc__ = """Show unmerged/unpulled revisions between two branches.
4119
4280
4120
4281
OTHER_BRANCH may be local or remote.
4121
4282
4122
4283
To filter on a range of revisions, you can use the command -r begin..end
4123
4284
-r revision requests a specific revision, -r ..end or -r begin.. are
4124
4285
also valid.
4286
4287
:Exit values:
4288
1 - some missing revisions
4289
0 - no missing revisions
4125
4290
4126
4291
:Examples:
4127
4292
4195
4360
restrict = 'remote'
4196
4361
4197
4362
local_branch = Branch.open_containing(u".")[0]
4363
local_branch.lock_read()
4364
self.add_cleanup(local_branch.unlock)
4365
4198
4366
parent = local_branch.get_parent()
4199
4367
if other_branch is None:
4200
4368
other_branch = parent
4209
4377
remote_branch = Branch.open(other_branch)
4210
4378
if remote_branch.base == local_branch.base:
4211
4379
remote_branch = local_branch
4380
else:
4381
remote_branch.lock_read()
4382
self.add_cleanup(remote_branch.unlock)
4212
4383
4213
4384
local_revid_range = _revision_range_to_revid_range(
4214
4385
_get_revision_range(my_revision, local_branch,
4218
4389
_get_revision_range(revision,
4219
4390
remote_branch, self.name()))
4220
4391
4221
local_branch.lock_read()
4222
try:
4223
remote_branch.lock_read()
4224
try:
4225
local_extra, remote_extra = find_unmerged(
4226
local_branch, remote_branch, restrict,
4227
backward=not reverse,
4228
include_merges=include_merges,
4229
local_revid_range=local_revid_range,
4230
remote_revid_range=remote_revid_range)
4231
4232
if log_format is None:
4233
registry = log.log_formatter_registry
4234
log_format = registry.get_default(local_branch)
4235
lf = log_format(to_file=self.outf,
4236
show_ids=show_ids,
4237
show_timezone='original')
4238
4239
status_code = 0
4240
if local_extra and not theirs_only:
4241
message("You have %d extra revision(s):\n" %
4242
len(local_extra))
4243
for revision in iter_log_revisions(local_extra,
4244
local_branch.repository,
4245
verbose):
4246
lf.log_revision(revision)
4247
printed_local = True
4248
status_code = 1
4249
else:
4250
printed_local = False
4251
4252
if remote_extra and not mine_only:
4253
if printed_local is True:
4254
message("\n\n\n")
4255
message("You are missing %d revision(s):\n" %
4256
len(remote_extra))
4257
for revision in iter_log_revisions(remote_extra,
4258
remote_branch.repository,
4259
verbose):
4260
lf.log_revision(revision)
4261
status_code = 1
4262
4263
if mine_only and not local_extra:
4264
# We checked local, and found nothing extra
4265
message('This branch is up to date.\n')
4266
elif theirs_only and not remote_extra:
4267
# We checked remote, and found nothing extra
4268
message('Other branch is up to date.\n')
4269
elif not (mine_only or theirs_only or local_extra or
4270
remote_extra):
4271
# We checked both branches, and neither one had extra
4272
# revisions
4273
message("Branches are up to date.\n")
4274
finally:
4275
remote_branch.unlock()
4276
finally:
4277
local_branch.unlock()
4392
local_extra, remote_extra = find_unmerged(
4393
local_branch, remote_branch, restrict,
4394
backward=not reverse,
4395
include_merges=include_merges,
4396
local_revid_range=local_revid_range,
4397
remote_revid_range=remote_revid_range)
4398
4399
if log_format is None:
4400
registry = log.log_formatter_registry
4401
log_format = registry.get_default(local_branch)
4402
lf = log_format(to_file=self.outf,
4403
show_ids=show_ids,
4404
show_timezone='original')
4405
4406
status_code = 0
4407
if local_extra and not theirs_only:
4408
message("You have %d extra revision(s):\n" %
4409
len(local_extra))
4410
for revision in iter_log_revisions(local_extra,
4411
local_branch.repository,
4412
verbose):
4413
lf.log_revision(revision)
4414
printed_local = True
4415
status_code = 1
4416
else:
4417
printed_local = False
4418
4419
if remote_extra and not mine_only:
4420
if printed_local is True:
4421
message("\n\n\n")
4422
message("You are missing %d revision(s):\n" %
4423
len(remote_extra))
4424
for revision in iter_log_revisions(remote_extra,
4425
remote_branch.repository,
4426
verbose):
4427
lf.log_revision(revision)
4428
status_code = 1
4429
4430
if mine_only and not local_extra:
4431
# We checked local, and found nothing extra
4432
message('This branch is up to date.\n')
4433
elif theirs_only and not remote_extra:
4434
# We checked remote, and found nothing extra
4435
message('Other branch is up to date.\n')
4436
elif not (mine_only or theirs_only or local_extra or
4437
remote_extra):
4438
# We checked both branches, and neither one had extra
4439
# revisions
4440
message("Branches are up to date.\n")
4441
self.cleanup_now()
4278
4442
if not status_code and parent is None and other_branch is not None:
4279
4443
local_branch.lock_write()
4280
try:
4281
# handle race conditions - a parent might be set while we run.
4282
if local_branch.get_parent() is None:
4283
local_branch.set_parent(remote_branch.base)
4284
finally:
4285
local_branch.unlock()
4444
self.add_cleanup(local_branch.unlock)
4445
# handle race conditions - a parent might be set while we run.
4446
if local_branch.get_parent() is None:
4447
local_branch.set_parent(remote_branch.base)
4286
4448
return status_code
4287
4449
4288
4450
4289
4451
class cmd_pack(Command):
4290
"""Compress the data within a repository."""
4452
__doc__ = """Compress the data within a repository.
4453
4454
This operation compresses the data within a bazaar repository. As
4455
bazaar supports automatic packing of repository, this operation is
4456
normally not required to be done manually.
4457
4458
During the pack operation, bazaar takes a backup of existing repository
4459
data, i.e. pack files. This backup is eventually removed by bazaar
4460
automatically when it is safe to do so. To save disk space by removing
4461
the backed up pack files, the --clean-obsolete-packs option may be
4462
used.
4463
4464
Warning: If you use --clean-obsolete-packs and your machine crashes
4465
during or immediately after repacking, you may be left with a state
4466
where the deletion has been written to disk but the new packs have not
4467
been. In this case the repository may be unusable.
4468
"""
4291
4469
4292
4470
_see_also = ['repositories']
4293
4471
takes_args = ['branch_or_repo?']
4472
takes_options = [
4473
Option('clean-obsolete-packs', 'Delete obsolete packs to save disk space.'),
4474
]
4294
4475
4295
def run(self, branch_or_repo='.'):
4476
def run(self, branch_or_repo='.', clean_obsolete_packs=False):
4296
4477
dir = bzrdir.BzrDir.open_containing(branch_or_repo)[0]
4297
4478
try:
4298
4479
branch = dir.open_branch()
4299
4480
repository = branch.repository
4300
4481
except errors.NotBranchError:
4301
4482
repository = dir.open_repository()
4302
repository.pack()
4483
repository.pack(clean_obsolete_packs=clean_obsolete_packs)
4303
4484
4304
4485
4305
4486
class cmd_plugins(Command):
4306
"""List the installed plugins.
4487
__doc__ = """List the installed plugins.
4307
4488
4308
4489
This command displays the list of installed plugins including
4309
4490
version of plugin and a short description of each.
4316
4497
adding new commands, providing additional network transports and
4317
4498
customizing log output.
4318
4499
4319
See the Bazaar web site, http://bazaar-vcs.org, for further
4320
information on plugins including where to find them and how to
4321
install them. Instructions are also provided there on how to
4322
write new plugins using the Python programming language.
4500
See the Bazaar Plugin Guide <http://doc.bazaar.canonical.com/plugins/en/>
4501
for further information on plugins including where to find them and how to
4502
install them. Instructions are also provided there on how to write new
4503
plugins using the Python programming language.
4323
4504
"""
4324
4505
takes_options = ['verbose']
4325
4506
4340
4521
doc = '(no description)'
4341
4522
result.append((name_ver, doc, plugin.path()))
4342
4523
for name_ver, doc, path in sorted(result):
4343
print name_ver
4344
print ' ', doc
4524
self.outf.write("%s\n" % name_ver)
4525
self.outf.write(" %s\n" % doc)
4345
4526
if verbose:
4346
print ' ', path
4347
print
4527
self.outf.write(" %s\n" % path)
4528
self.outf.write("\n")
4348
4529
4349
4530
4350
4531
class cmd_testament(Command):
4351
"""Show testament (signing-form) of a revision."""
4532
__doc__ = """Show testament (signing-form) of a revision."""
4352
4533
takes_options = [
4353
4534
'revision',
4354
4535
Option('long', help='Produce long-format testament.'),
4367
4548
else:
4368
4549
b = Branch.open(branch)
4369
4550
b.lock_read()
4370
try:
4371
if revision is None:
4372
rev_id = b.last_revision()
4373
else:
4374
rev_id = revision[0].as_revision_id(b)
4375
t = testament_class.from_revision(b.repository, rev_id)
4376
if long:
4377
sys.stdout.writelines(t.as_text_lines())
4378
else:
4379
sys.stdout.write(t.as_short_text())
4380
finally:
4381
b.unlock()
4551
self.add_cleanup(b.unlock)
4552
if revision is None:
4553
rev_id = b.last_revision()
4554
else:
4555
rev_id = revision[0].as_revision_id(b)
4556
t = testament_class.from_revision(b.repository, rev_id)
4557
if long:
4558
sys.stdout.writelines(t.as_text_lines())
4559
else:
4560
sys.stdout.write(t.as_short_text())
4382
4561
4383
4562
4384
4563
class cmd_annotate(Command):
4385
"""Show the origin of each line in a file.
4564
__doc__ = """Show the origin of each line in a file.
4386
4565
4387
4566
This prints out the given file with an annotation on the left side
4388
4567
indicating which revision, author and date introduced the change.
4410
4589
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
4411
4590
if wt is not None:
4412
4591
wt.lock_read()
4592
self.add_cleanup(wt.unlock)
4413
4593
else:
4414
4594
branch.lock_read()
4415
try:
4416
tree = _get_one_revision_tree('annotate', revision, branch=branch)
4417
if wt is not None:
4418
file_id = wt.path2id(relpath)
4419
else:
4420
file_id = tree.path2id(relpath)
4421
if file_id is None:
4422
raise errors.NotVersionedError(filename)
4423
file_version = tree.inventory[file_id].revision
4424
if wt is not None and revision is None:
4425
# If there is a tree and we're not annotating historical
4426
# versions, annotate the working tree's content.
4427
annotate_file_tree(wt, file_id, self.outf, long, all,
4428
show_ids=show_ids)
4429
else:
4430
annotate_file(branch, file_version, file_id, long, all, self.outf,
4431
show_ids=show_ids)
4432
finally:
4433
if wt is not None:
4434
wt.unlock()
4435
else:
4436
branch.unlock()
4595
self.add_cleanup(branch.unlock)
4596
tree = _get_one_revision_tree('annotate', revision, branch=branch)
4597
tree.lock_read()
4598
self.add_cleanup(tree.unlock)
4599
if wt is not None:
4600
file_id = wt.path2id(relpath)
4601
else:
4602
file_id = tree.path2id(relpath)
4603
if file_id is None:
4604
raise errors.NotVersionedError(filename)
4605
file_version = tree.inventory[file_id].revision
4606
if wt is not None and revision is None:
4607
# If there is a tree and we're not annotating historical
4608
# versions, annotate the working tree's content.
4609
annotate_file_tree(wt, file_id, self.outf, long, all,
4610
show_ids=show_ids)
4611
else:
4612
annotate_file(branch, file_version, file_id, long, all, self.outf,
4613
show_ids=show_ids)
4437
4614
4438
4615
4439
4616
class cmd_re_sign(Command):
4440
"""Create a digital signature for an existing revision."""
4617
__doc__ = """Create a digital signature for an existing revision."""
4441
4618
# TODO be able to replace existing ones.
4442
4619
4443
4620
hidden = True # is this right ?
4451
4628
raise errors.BzrCommandError('You must supply either --revision or a revision_id')
4452
4629
b = WorkingTree.open_containing(u'.')[0].branch
4453
4630
b.lock_write()
4454
try:
4455
return self._run(b, revision_id_list, revision)
4456
finally:
4457
b.unlock()
4631
self.add_cleanup(b.unlock)
4632
return self._run(b, revision_id_list, revision)
4458
4633
4459
4634
def _run(self, b, revision_id_list, revision):
4460
4635
import bzrlib.gpg as gpg
4505
4680
4506
4681
4507
4682
class cmd_bind(Command):
4508
"""Convert the current branch into a checkout of the supplied branch.
4683
__doc__ = """Convert the current branch into a checkout of the supplied branch.
4684
If no branch is supplied, rebind to the last bound location.
4509
4685
4510
4686
Once converted into a checkout, commits must succeed on the master branch
4511
4687
before they will be applied to the local branch.
4529
4705
'This format does not remember old locations.')
4530
4706
else:
4531
4707
if location is None:
4532
raise errors.BzrCommandError('No location supplied and no '
4533
'previous location known')
4708
if b.get_bound_location() is not None:
4709
raise errors.BzrCommandError('Branch is already bound')
4710
else:
4711
raise errors.BzrCommandError('No location supplied '
4712
'and no previous location known')
4534
4713
b_other = Branch.open(location)
4535
4714
try:
4536
4715
b.bind(b_other)
4542
4721
4543
4722
4544
4723
class cmd_unbind(Command):
4545
"""Convert the current checkout into a regular branch.
4724
__doc__ = """Convert the current checkout into a regular branch.
4546
4725
4547
4726
After unbinding, the local branch is considered independent and subsequent
4548
4727
commits will be local only.
4559
4738
4560
4739
4561
4740
class cmd_uncommit(Command):
4562
"""Remove the last committed revision.
4741
__doc__ = """Remove the last committed revision.
4563
4742
4564
4743
--verbose will print out what is being removed.
4565
4744
--dry-run will go through all the motions, but not actually
4606
4785
4607
4786
if tree is not None:
4608
4787
tree.lock_write()
4788
self.add_cleanup(tree.unlock)
4609
4789
else:
4610
4790
b.lock_write()
4611
try:
4612
return self._run(b, tree, dry_run, verbose, revision, force,
4613
local=local)
4614
finally:
4615
if tree is not None:
4616
tree.unlock()
4617
else:
4618
b.unlock()
4791
self.add_cleanup(b.unlock)
4792
return self._run(b, tree, dry_run, verbose, revision, force, local=local)
4619
4793
4620
4794
def _run(self, b, tree, dry_run, verbose, revision, force, local=False):
4621
4795
from bzrlib.log import log_formatter, show_log
4653
4827
end_revision=last_revno)
4654
4828
4655
4829
if dry_run:
4656
print 'Dry-run, pretending to remove the above revisions.'
4657
if not force:
4658
val = raw_input('Press <enter> to continue')
4830
self.outf.write('Dry-run, pretending to remove'
4831
' the above revisions.\n')
4659
4832
else:
4660
print 'The above revision(s) will be removed.'
4661
if not force:
4662
val = raw_input('Are you sure [y/N]? ')
4663
if val.lower() not in ('y', 'yes'):
4664
print 'Canceled'
4665
return 0
4833
self.outf.write('The above revision(s) will be removed.\n')
4834
4835
if not force:
4836
if not ui.ui_factory.get_boolean('Are you sure'):
4837
self.outf.write('Canceled')
4838
return 0
4666
4839
4667
4840
mutter('Uncommitting from {%s} to {%s}',
4668
4841
last_rev_id, rev_id)
4669
4842
uncommit(b, tree=tree, dry_run=dry_run, verbose=verbose,
4670
4843
revno=revno, local=local)
4671
note('You can restore the old tip by running:\n'
4672
' bzr pull . -r revid:%s', last_rev_id)
4844
self.outf.write('You can restore the old tip by running:\n'
4845
' bzr pull . -r revid:%s\n' % last_rev_id)
4673
4846
4674
4847
4675
4848
class cmd_break_lock(Command):
4676
"""Break a dead lock on a repository, branch or working directory.
4849
__doc__ = """Break a dead lock on a repository, branch or working directory.
4677
4850
4678
4851
CAUTION: Locks should only be broken when you are sure that the process
4679
4852
holding the lock has been stopped.
4680
4853
4681
You can get information on what locks are open via the 'bzr info' command.
4854
You can get information on what locks are open via the 'bzr info
4855
[location]' command.
4682
4856
4683
4857
:Examples:
4684
4858
bzr break-lock
4859
bzr break-lock bzr+ssh://example.com/bzr/foo
4685
4860
"""
4686
4861
takes_args = ['location?']
4687
4862
4696
4871
4697
4872
4698
4873
class cmd_wait_until_signalled(Command):
4699
"""Test helper for test_start_and_stop_bzr_subprocess_send_signal.
4874
__doc__ = """Test helper for test_start_and_stop_bzr_subprocess_send_signal.
4700
4875
4701
4876
This just prints a line to signal when it is ready, then blocks on stdin.
4702
4877
"""
4710
4885
4711
4886
4712
4887
class cmd_serve(Command):
4713
"""Run the bzr server."""
4888
__doc__ = """Run the bzr server."""
4714
4889
4715
4890
aliases = ['server']
4716
4891
4717
4892
takes_options = [
4718
4893
Option('inet',
4719
4894
help='Serve on stdin/out for use from inetd or sshd.'),
4720
RegistryOption('protocol',
4721
help="Protocol to serve.",
4895
RegistryOption('protocol',
4896
help="Protocol to serve.",
4722
4897
lazy_registry=('bzrlib.transport', 'transport_server_registry'),
4723
4898
value_switches=True),
4724
4899
Option('port',
4733
4908
Option('allow-writes',
4734
4909
help='By default the server is a readonly server. Supplying '
4735
4910
'--allow-writes enables write access to the contents of '
4736
'the served directory and below.'
4911
'the served directory and below. Note that ``bzr serve`` '
4912
'does not perform authentication, so unless some form of '
4913
'external authentication is arranged supplying this '
4914
'option leads to global uncontrolled write access to your '
4915
'file system.'
4737
4916
),
4738
4917
]
4739
4918
4772
4951
4773
4952
4774
4953
class cmd_join(Command):
4775
"""Combine a tree into its containing tree.
4954
__doc__ = """Combine a tree into its containing tree.
4776
4955
4777
4956
This command requires the target tree to be in a rich-root format.
4778
4957
4818
4997
4819
4998
4820
4999
class cmd_split(Command):
4821
"""Split a subdirectory of a tree into a separate tree.
5000
__doc__ = """Split a subdirectory of a tree into a separate tree.
4822
5001
4823
5002
This command will produce a target tree in a format that supports
4824
5003
rich roots, like 'rich-root' or 'rich-root-pack'. These formats cannot be
4844
5023
4845
5024
4846
5025
class cmd_merge_directive(Command):
4847
"""Generate a merge directive for auto-merge tools.
5026
__doc__ = """Generate a merge directive for auto-merge tools.
4848
5027
4849
5028
A directive requests a merge to be performed, and also provides all the
4850
5029
information necessary to do so. This means it must either include a
4943
5122
4944
5123
4945
5124
class cmd_send(Command):
4946
"""Mail or create a merge-directive for submitting changes.
5125
__doc__ = """Mail or create a merge-directive for submitting changes.
4947
5126
4948
5127
A merge directive provides many things needed for requesting merges:
4949
5128
4955
5134
directly from the merge directive, without retrieving data from a
4956
5135
branch.
4957
5136
4958
If --no-bundle is specified, then public_branch is needed (and must be
4959
up-to-date), so that the receiver can perform the merge using the
4960
public_branch. The public_branch is always included if known, so that
4961
people can check it later.
4962
4963
The submit branch defaults to the parent, but can be overridden. Both
4964
submit branch and public branch will be remembered if supplied.
4965
4966
If a public_branch is known for the submit_branch, that public submit
4967
branch is used in the merge instructions. This means that a local mirror
4968
can be used as your actual submit branch, once you have set public_branch
4969
for that mirror.
5137
`bzr send` creates a compact data set that, when applied using bzr
5138
merge, has the same effect as merging from the source branch.
5139
5140
By default the merge directive is self-contained and can be applied to any
5141
branch containing submit_branch in its ancestory without needing access to
5142
the source branch.
5143
5144
If --no-bundle is specified, then Bazaar doesn't send the contents of the
5145
revisions, but only a structured request to merge from the
5146
public_location. In that case the public_branch is needed and it must be
5147
up-to-date and accessible to the recipient. The public_branch is always
5148
included if known, so that people can check it later.
5149
5150
The submit branch defaults to the parent of the source branch, but can be
5151
overridden. Both submit branch and public branch will be remembered in
5152
branch.conf the first time they are used for a particular branch. The
5153
source branch defaults to that containing the working directory, but can
5154
be changed using --from.
5155
5156
In order to calculate those changes, bzr must analyse the submit branch.
5157
Therefore it is most efficient for the submit branch to be a local mirror.
5158
If a public location is known for the submit_branch, that location is used
5159
in the merge directive.
5160
5161
The default behaviour is to send the merge directive by mail, unless -o is
5162
given, in which case it is sent to a file.
4970
5163
4971
5164
Mail is sent using your preferred mail program. This should be transparent
4972
5165
on Windows (it uses MAPI). On Linux, it requires the xdg-email utility.
4992
5185
4993
5186
The merge directives created by bzr send may be applied using bzr merge or
4994
5187
bzr pull by specifying a file containing a merge directive as the location.
5188
5189
bzr send makes extensive use of public locations to map local locations into
5190
URLs that can be used by other people. See `bzr help configuration` to
5191
set them, and use `bzr info` to display them.
4995
5192
"""
4996
5193
4997
5194
encoding_type = 'exact'
5013
5210
short_name='f',
5014
5211
type=unicode),
5015
5212
Option('output', short_name='o',
5016
help='Write merge directive to this file; '
5213
help='Write merge directive to this file or directory; '
5017
5214
'use - for stdout.',
5018
5215
type=unicode),
5019
5216
Option('strict',
5042
5239
5043
5240
5044
5241
class cmd_bundle_revisions(cmd_send):
5045
"""Create a merge-directive for submitting changes.
5242
__doc__ = """Create a merge-directive for submitting changes.
5046
5243
5047
5244
A merge directive provides many things needed for requesting merges:
5048
5245
5115
5312
5116
5313
5117
5314
class cmd_tag(Command):
5118
"""Create, remove or modify a tag naming a revision.
5315
__doc__ = """Create, remove or modify a tag naming a revision.
5119
5316
5120
5317
Tags give human-meaningful names to revisions. Commands that take a -r
5121
5318
(--revision) option can be given -rtag:X, where X is any previously
5129
5326
5130
5327
To rename a tag (change the name but keep it on the same revsion), run ``bzr
5131
5328
tag new-name -r tag:old-name`` and then ``bzr tag --delete oldname``.
5329
5330
If no tag name is specified it will be determined through the
5331
'automatic_tag_name' hook. This can e.g. be used to automatically tag
5332
upstream releases by reading configure.ac. See ``bzr help hooks`` for
5333
details.
5132
5334
"""
5133
5335
5134
5336
_see_also = ['commit', 'tags']
5135
takes_args = ['tag_name']
5337
takes_args = ['tag_name?']
5136
5338
takes_options = [
5137
5339
Option('delete',
5138
5340
help='Delete this tag rather than placing it.',
5148
5350
'revision',
5149
5351
]
5150
5352
5151
def run(self, tag_name,
5353
def run(self, tag_name=None,
5152
5354
delete=None,
5153
5355
directory='.',
5154
5356
force=None,
5156
5358
):
5157
5359
branch, relpath = Branch.open_containing(directory)
5158
5360
branch.lock_write()
5159
try:
5160
if delete:
5161
branch.tags.delete_tag(tag_name)
5162
self.outf.write('Deleted tag %s.\n' % tag_name)
5361
self.add_cleanup(branch.unlock)
5362
if delete:
5363
if tag_name is None:
5364
raise errors.BzrCommandError("No tag specified to delete.")
5365
branch.tags.delete_tag(tag_name)
5366
self.outf.write('Deleted tag %s.\n' % tag_name)
5367
else:
5368
if revision:
5369
if len(revision) != 1:
5370
raise errors.BzrCommandError(
5371
"Tags can only be placed on a single revision, "
5372
"not on a range")
5373
revision_id = revision[0].as_revision_id(branch)
5163
5374
else:
5164
if revision:
5165
if len(revision) != 1:
5166
raise errors.BzrCommandError(
5167
"Tags can only be placed on a single revision, "
5168
"not on a range")
5169
revision_id = revision[0].as_revision_id(branch)
5170
else:
5171
revision_id = branch.last_revision()
5172
if (not force) and branch.tags.has_tag(tag_name):
5173
raise errors.TagAlreadyExists(tag_name)
5174
branch.tags.set_tag(tag_name, revision_id)
5175
self.outf.write('Created tag %s.\n' % tag_name)
5176
finally:
5177
branch.unlock()
5375
revision_id = branch.last_revision()
5376
if tag_name is None:
5377
tag_name = branch.automatic_tag_name(revision_id)
5378
if tag_name is None:
5379
raise errors.BzrCommandError(
5380
"Please specify a tag name.")
5381
if (not force) and branch.tags.has_tag(tag_name):
5382
raise errors.TagAlreadyExists(tag_name)
5383
branch.tags.set_tag(tag_name, revision_id)
5384
self.outf.write('Created tag %s.\n' % tag_name)
5178
5385
5179
5386
5180
5387
class cmd_tags(Command):
5181
"""List tags.
5388
__doc__ = """List tags.
5182
5389
5183
5390
This command shows a table of tag names and the revisions they reference.
5184
5391
"""
5213
5420
return
5214
5421
5215
5422
branch.lock_read()
5216
try:
5217
if revision:
5218
graph = branch.repository.get_graph()
5219
rev1, rev2 = _get_revision_range(revision, branch, self.name())
5220
revid1, revid2 = rev1.rev_id, rev2.rev_id
5221
# only show revisions between revid1 and revid2 (inclusive)
5222
tags = [(tag, revid) for tag, revid in tags if
5223
graph.is_between(revid, revid1, revid2)]
5224
if sort == 'alpha':
5225
tags.sort()
5226
elif sort == 'time':
5227
timestamps = {}
5228
for tag, revid in tags:
5229
try:
5230
revobj = branch.repository.get_revision(revid)
5231
except errors.NoSuchRevision:
5232
timestamp = sys.maxint # place them at the end
5233
else:
5234
timestamp = revobj.timestamp
5235
timestamps[revid] = timestamp
5236
tags.sort(key=lambda x: timestamps[x[1]])
5237
if not show_ids:
5238
# [ (tag, revid), ... ] -> [ (tag, dotted_revno), ... ]
5239
for index, (tag, revid) in enumerate(tags):
5240
try:
5241
revno = branch.revision_id_to_dotted_revno(revid)
5242
if isinstance(revno, tuple):
5243
revno = '.'.join(map(str, revno))
5244
except errors.NoSuchRevision:
5245
# Bad tag data/merges can lead to tagged revisions
5246
# which are not in this branch. Fail gracefully ...
5247
revno = '?'
5248
tags[index] = (tag, revno)
5249
finally:
5250
branch.unlock()
5423
self.add_cleanup(branch.unlock)
5424
if revision:
5425
graph = branch.repository.get_graph()
5426
rev1, rev2 = _get_revision_range(revision, branch, self.name())
5427
revid1, revid2 = rev1.rev_id, rev2.rev_id
5428
# only show revisions between revid1 and revid2 (inclusive)
5429
tags = [(tag, revid) for tag, revid in tags if
5430
graph.is_between(revid, revid1, revid2)]
5431
if sort == 'alpha':
5432
tags.sort()
5433
elif sort == 'time':
5434
timestamps = {}
5435
for tag, revid in tags:
5436
try:
5437
revobj = branch.repository.get_revision(revid)
5438
except errors.NoSuchRevision:
5439
timestamp = sys.maxint # place them at the end
5440
else:
5441
timestamp = revobj.timestamp
5442
timestamps[revid] = timestamp
5443
tags.sort(key=lambda x: timestamps[x[1]])
5444
if not show_ids:
5445
# [ (tag, revid), ... ] -> [ (tag, dotted_revno), ... ]
5446
for index, (tag, revid) in enumerate(tags):
5447
try:
5448
revno = branch.revision_id_to_dotted_revno(revid)
5449
if isinstance(revno, tuple):
5450
revno = '.'.join(map(str, revno))
5451
except errors.NoSuchRevision:
5452
# Bad tag data/merges can lead to tagged revisions
5453
# which are not in this branch. Fail gracefully ...
5454
revno = '?'
5455
tags[index] = (tag, revno)
5456
self.cleanup_now()
5251
5457
for tag, revspec in tags:
5252
5458
self.outf.write('%-20s %s\n' % (tag, revspec))
5253
5459
5254
5460
5255
5461
class cmd_reconfigure(Command):
5256
"""Reconfigure the type of a bzr directory.
5462
__doc__ = """Reconfigure the type of a bzr directory.
5257
5463
5258
5464
A target configuration must be specified.
5259
5465
5344
5550
5345
5551
5346
5552
class cmd_switch(Command):
5347
"""Set the branch of a checkout and update.
5553
__doc__ = """Set the branch of a checkout and update.
5348
5554
5349
5555
For lightweight checkouts, this changes the branch being referenced.
5350
5556
For heavyweight checkouts, this checks that there are no local commits
5366
5572
that of the master.
5367
5573
"""
5368
5574
5369
takes_args = ['to_location']
5575
takes_args = ['to_location?']
5370
5576
takes_options = [Option('force',
5371
5577
help='Switch even if local commits will be lost.'),
5578
'revision',
5372
5579
Option('create-branch', short_name='b',
5373
5580
help='Create the target branch from this one before'
5374
5581
' switching to it.'),
5375
]
5582
]
5376
5583
5377
def run(self, to_location, force=False, create_branch=False):
5584
def run(self, to_location=None, force=False, create_branch=False,
5585
revision=None):
5378
5586
from bzrlib import switch
5379
5587
tree_location = '.'
5588
revision = _get_one_revision('switch', revision)
5380
5589
control_dir = bzrdir.BzrDir.open_containing(tree_location)[0]
5590
if to_location is None:
5591
if revision is None:
5592
raise errors.BzrCommandError('You must supply either a'
5593
' revision or a location')
5594
to_location = '.'
5381
5595
try:
5382
5596
branch = control_dir.open_branch()
5383
5597
had_explicit_nick = branch.get_config().has_explicit_nickname()
5388
5602
if branch is None:
5389
5603
raise errors.BzrCommandError('cannot create branch without'
5390
5604
' source branch')
5605
to_location = directory_service.directories.dereference(
5606
to_location)
5391
5607
if '/' not in to_location and '\\' not in to_location:
5392
5608
# This path is meant to be relative to the existing branch
5393
5609
this_url = self._get_branch_location(control_dir)
5395
5611
to_branch = branch.bzrdir.sprout(to_location,
5396
5612
possible_transports=[branch.bzrdir.root_transport],
5397
5613
source_branch=branch).open_branch()
5398
# try:
5399
# from_branch = control_dir.open_branch()
5400
# except errors.NotBranchError:
5401
# raise BzrCommandError('Cannot create a branch from this'
5402
# ' location when we cannot open this branch')
5403
# from_branch.bzrdir.sprout(
5404
pass
5405
5614
else:
5406
5615
try:
5407
5616
to_branch = Branch.open(to_location)
5409
5618
this_url = self._get_branch_location(control_dir)
5410
5619
to_branch = Branch.open(
5411
5620
urlutils.join(this_url, '..', to_location))
5412
switch.switch(control_dir, to_branch, force)
5621
if revision is not None:
5622
revision = revision.as_revision_id(to_branch)
5623
switch.switch(control_dir, to_branch, force, revision_id=revision)
5413
5624
if had_explicit_nick:
5414
5625
branch = control_dir.open_branch() #get the new branch!
5415
5626
branch.nick = to_branch.nick
5435
5646
5436
5647
5437
5648
class cmd_view(Command):
5438
"""Manage filtered views.
5649
__doc__ = """Manage filtered views.
5439
5650
5440
5651
Views provide a mask over the tree so that users can focus on
5441
5652
a subset of a tree when doing their work. After creating a view,
5589
5800
5590
5801
5591
5802
class cmd_hooks(Command):
5592
"""Show hooks."""
5803
__doc__ = """Show hooks."""
5593
5804
5594
5805
hidden = True
5595
5806
5608
5819
self.outf.write(" <no hooks installed>\n")
5609
5820
5610
5821
5822
class cmd_remove_branch(Command):
5823
__doc__ = """Remove a branch.
5824
5825
This will remove the branch from the specified location but
5826
will keep any working tree or repository in place.
5827
5828
:Examples:
5829
5830
Remove the branch at repo/trunk::
5831
5832
bzr remove-branch repo/trunk
5833
5834
"""
5835
5836
takes_args = ["location?"]
5837
5838
aliases = ["rmbranch"]
5839
5840
def run(self, location=None):
5841
if location is None:
5842
location = "."
5843
branch = Branch.open_containing(location)[0]
5844
branch.bzrdir.destroy_branch()
5845
5846
5611
5847
class cmd_shelve(Command):
5612
"""Temporarily set aside some changes from the current tree.
5848
__doc__ = """Temporarily set aside some changes from the current tree.
5613
5849
5614
5850
Shelve allows you to temporarily put changes you've made "on the shelf",
5615
5851
ie. out of the way, until a later time when you can bring them back from
5662
5898
try:
5663
5899
shelver.run()
5664
5900
finally:
5665
shelver.work_tree.unlock()
5901
shelver.finalize()
5666
5902
except errors.UserAbort:
5667
5903
return 0
5668
5904
5669
5905
def run_for_list(self):
5670
5906
tree = WorkingTree.open_containing('.')[0]
5671
5907
tree.lock_read()
5672
try:
5673
manager = tree.get_shelf_manager()
5674
shelves = manager.active_shelves()
5675
if len(shelves) == 0:
5676
note('No shelved changes.')
5677
return 0
5678
for shelf_id in reversed(shelves):
5679
message = manager.get_metadata(shelf_id).get('message')
5680
if message is None:
5681
message = '<no message>'
5682
self.outf.write('%3d: %s\n' % (shelf_id, message))
5683
return 1
5684
finally:
5685
tree.unlock()
5908
self.add_cleanup(tree.unlock)
5909
manager = tree.get_shelf_manager()
5910
shelves = manager.active_shelves()
5911
if len(shelves) == 0:
5912
note('No shelved changes.')
5913
return 0
5914
for shelf_id in reversed(shelves):
5915
message = manager.get_metadata(shelf_id).get('message')
5916
if message is None:
5917
message = '<no message>'
5918
self.outf.write('%3d: %s\n' % (shelf_id, message))
5919
return 1
5686
5920
5687
5921
5688
5922
class cmd_unshelve(Command):
5689
"""Restore shelved changes.
5923
__doc__ = """Restore shelved changes.
5690
5924
5691
5925
By default, the most recently shelved changes are restored. However if you
5692
5926
specify a shelf by id those changes will be restored instead. This works
5700
5934
enum_switch=False, value_switches=True,
5701
5935
apply="Apply changes and remove from the shelf.",
5702
5936
dry_run="Show changes, but do not apply or remove them.",
5703
delete_only="Delete changes without applying them."
5937
preview="Instead of unshelving the changes, show the diff that "
5938
"would result from unshelving.",
5939
delete_only="Delete changes without applying them.",
5940
keep="Apply changes but don't delete them.",
5704
5941
)
5705
5942
]
5706
5943
_see_also = ['shelve']
5715
5952
5716
5953
5717
5954
class cmd_clean_tree(Command):
5718
"""Remove unwanted files from working tree.
5955
__doc__ = """Remove unwanted files from working tree.
5719
5956
5720
5957
By default, only unknown files, not ignored files, are deleted. Versioned
5721
5958
files are never deleted.
5749
5986
5750
5987
5751
5988
class cmd_reference(Command):
5752
"""list, view and set branch locations for nested trees.
5989
__doc__ = """list, view and set branch locations for nested trees.
5753
5990
5754
5991
If no arguments are provided, lists the branch locations for nested trees.
5755
5992
If one argument is provided, display the branch location for that tree.
5795
6032
self.outf.write('%s %s\n' % (path, location))
5796
6033
5797
6034
5798
# these get imported and then picked up by the scan for cmd_*
5799
# TODO: Some more consistent way to split command definitions across files;
5800
# we do need to load at least some information about them to know of
5801
# aliases. ideally we would avoid loading the implementation until the
5802
# details were needed.
5803
from bzrlib.cmd_version_info import cmd_version_info
5804
from bzrlib.conflicts import cmd_resolve, cmd_conflicts, restore
5805
from bzrlib.bundle.commands import (
5806
cmd_bundle_info,
5807
)
5808
from bzrlib.foreign import cmd_dpush
5809
from bzrlib.sign_my_commits import cmd_sign_my_commits
5810
from bzrlib.weave_commands import cmd_versionedfile_list, \
5811
cmd_weave_plan_merge, cmd_weave_merge_text
6035
def _register_lazy_builtins():
6036
# register lazy builtins from other modules; called at startup and should
6037
# be only called once.
6038
for (name, aliases, module_name) in [
6039
('cmd_bundle_info', [], 'bzrlib.bundle.commands'),
6040
('cmd_dpush', [], 'bzrlib.foreign'),
6041
('cmd_version_info', [], 'bzrlib.cmd_version_info'),
6042
('cmd_resolve', ['resolved'], 'bzrlib.conflicts'),
6043
('cmd_conflicts', [], 'bzrlib.conflicts'),
6044
('cmd_sign_my_commits', [], 'bzrlib.sign_my_commits'),
6045
]:
6046
builtin_command_registry.register_lazy(name, aliases, module_name)
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0