« back to all changes in this revision
Viewing changes to bzrlib/builtins.py
- browse files at revision 4747.2.1
- compare with another revision
- download diff
- download tarball
- view history from revision 4747.2.1
- Committer: Jelmer Vernooij
- Date: 2009-10-19 00:54:12 UTC
- mto: This revision was merged to the branch mainline in revision 4759.
- Revision ID: jelmer@samba.org-20091019005412-9q5fgdh1sf2o3238
Allow specifying an abbreviation for foreign vcs'es and an optional function to serialize foreign revision ids.
- files added:
- bzrlib/textui.py
- files removed:
- .testr.conf
- apport
- bzrlib/help_topics/es
- bzrlib/plugins/news_merge
- bzrlib/plugins/news_merge/tests
- bzrlib/tests/per_bzrdir_colo
- bzrlib/tests/per_foreign_vcs
- 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 renamed:
- bzrlib/help_topics/en/conflict-types.txt => bzrlib/help_topics/en/conflicts.txt
- bzrlib/tests/test__bencode.py => bzrlib/tests/test_bencode.py
- bzrlib/help_topics/es/conflict-types.txt => doc/es/user-guide/resolving_conflicts.txt
- files modified:
- .bzrignore
added
removed
bzrlib/builtins.py
1
# Copyright (C) 2005-2010 Canonical Ltd
1
# Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
31
31
bundle,
32
32
btree_index,
33
33
bzrdir,
34
directory_service,
35
34
delta,
36
35
config,
37
36
errors,
44
43
reconfigure,
45
44
rename_map,
46
45
revision as _mod_revision,
47
static_tuple,
48
46
symbol_versioning,
49
timestamp,
50
47
transport,
51
48
ui,
52
49
urlutils,
54
51
)
55
52
from bzrlib.branch import Branch
56
53
from bzrlib.conflicts import ConflictList
57
from bzrlib.transport import memory
58
54
from bzrlib.revisionspec import RevisionSpec, RevisionInfo
59
55
from bzrlib.smtp_connection import SMTPConnection
60
56
from bzrlib.workingtree import WorkingTree
61
57
""")
62
58
63
from bzrlib.commands import (
64
Command,
65
builtin_command_registry,
66
display_command,
67
)
59
from bzrlib.commands import Command, display_command
68
60
from bzrlib.option import (
69
61
ListOption,
70
62
Option,
239
231
# opens the branch?)
240
232
241
233
class cmd_status(Command):
242
__doc__ = """Display status summary.
234
"""Display status summary.
243
235
244
236
This reports on versioned and unknown files, reporting them
245
237
grouped by state. Possible states are:
265
257
unknown
266
258
Not versioned and not matching an ignore pattern.
267
259
268
Additionally for directories, symlinks and files with an executable
269
bit, Bazaar indicates their type using a trailing character: '/', '@'
270
or '*' respectively.
271
272
260
To see ignored files use 'bzr ignored'. For details on the
273
261
changes to file texts, use 'bzr diff'.
274
262
332
320
333
321
334
322
class cmd_cat_revision(Command):
335
__doc__ = """Write out metadata for a revision.
323
"""Write out metadata for a revision.
336
324
337
325
The revision to print can either be specified by a specific
338
326
revision identifier, or you can use --revision.
344
332
# cat-revision is more for frontends so should be exact
345
333
encoding = 'strict'
346
334
347
def print_revision(self, revisions, revid):
348
stream = revisions.get_record_stream([(revid,)], 'unordered', True)
349
record = stream.next()
350
if record.storage_kind == 'absent':
351
raise errors.NoSuchRevision(revisions, revid)
352
revtext = record.get_bytes_as('fulltext')
353
self.outf.write(revtext.decode('utf-8'))
354
355
335
@display_command
356
336
def run(self, revision_id=None, revision=None):
357
337
if revision_id is not None and revision is not None:
362
342
' --revision or a revision_id')
363
343
b = WorkingTree.open_containing(u'.')[0].branch
364
344
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')
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'))
369
361
370
b.repository.lock_read()
371
try:
372
# TODO: jam 20060112 should cat-revision always output utf-8?
373
if revision_id is not None:
374
revision_id = osutils.safe_revision_id(revision_id, warn=False)
375
try:
376
self.print_revision(revisions, revision_id)
377
except errors.NoSuchRevision:
378
msg = "The repository %s contains no revision %s." % (
379
b.repository.base, revision_id)
380
raise errors.BzrCommandError(msg)
381
elif revision is not None:
382
for rev in revision:
383
if rev is None:
384
raise errors.BzrCommandError(
385
'You cannot specify a NULL revision.')
386
rev_id = rev.as_revision_id(b)
387
self.print_revision(revisions, rev_id)
388
finally:
389
b.repository.unlock()
390
391
362
392
363
class cmd_dump_btree(Command):
393
__doc__ = """Dump the contents of a btree index file to stdout.
364
"""Dump the contents of a btree index file to stdout.
394
365
395
366
PATH is a btree index file, it can be any URL. This includes things like
396
367
.bzr/repository/pack-names, or .bzr/repository/indices/a34b3a...ca4a4.iix
460
431
for node in bt.iter_all_entries():
461
432
# Node is made up of:
462
433
# (index, key, value, [references])
463
try:
464
refs = node[3]
465
except IndexError:
466
refs_as_tuples = None
467
else:
468
refs_as_tuples = static_tuple.as_tuples(refs)
469
as_tuple = (tuple(node[1]), node[2], refs_as_tuples)
470
self.outf.write('%s\n' % (as_tuple,))
434
self.outf.write('%s\n' % (node[1:],))
471
435
472
436
473
437
class cmd_remove_tree(Command):
474
__doc__ = """Remove the working tree from a given branch/checkout.
438
"""Remove the working tree from a given branch/checkout.
475
439
476
440
Since a lightweight checkout is little more than a working tree
477
441
this will refuse to run against one.
479
443
To re-create the working tree, use "bzr checkout".
480
444
"""
481
445
_see_also = ['checkout', 'working-trees']
482
takes_args = ['location*']
446
takes_args = ['location?']
483
447
takes_options = [
484
448
Option('force',
485
449
help='Remove the working tree even if it has '
486
450
'uncommitted changes.'),
487
451
]
488
452
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()
453
def run(self, location='.', force=False):
454
d = bzrdir.BzrDir.open(location)
455
456
try:
457
working = d.open_workingtree()
458
except errors.NoWorkingTree:
459
raise errors.BzrCommandError("No working tree to remove")
460
except errors.NotLocalUrl:
461
raise errors.BzrCommandError("You cannot remove the working tree"
462
" of a remote path")
463
if not force:
464
if (working.has_changes()):
465
raise errors.UncommittedChanges(working)
466
467
working_path = working.bzrdir.root_transport.base
468
branch_path = working.branch.bzrdir.root_transport.base
469
if working_path != branch_path:
470
raise errors.BzrCommandError("You cannot remove the working tree"
471
" from a lightweight checkout")
472
473
d.destroy_workingtree()
512
474
513
475
514
476
class cmd_revno(Command):
515
__doc__ = """Show current revision number.
477
"""Show current revision number.
516
478
517
479
This is equal to the number of revisions on this branch.
518
480
"""
531
493
wt.lock_read()
532
494
except (errors.NoWorkingTree, errors.NotLocalUrl):
533
495
raise errors.NoWorkingTree(location)
534
self.add_cleanup(wt.unlock)
535
revid = wt.last_revision()
536
496
try:
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)
497
revid = wt.last_revision()
498
try:
499
revno_t = wt.branch.revision_id_to_dotted_revno(revid)
500
except errors.NoSuchRevision:
501
revno_t = ('???',)
502
revno = ".".join(str(n) for n in revno_t)
503
finally:
504
wt.unlock()
541
505
else:
542
506
b = Branch.open_containing(location)[0]
543
507
b.lock_read()
544
self.add_cleanup(b.unlock)
545
revno = b.revno()
546
self.cleanup_now()
508
try:
509
revno = b.revno()
510
finally:
511
b.unlock()
512
547
513
self.outf.write(str(revno) + '\n')
548
514
549
515
550
516
class cmd_revision_info(Command):
551
__doc__ = """Show revision number and revision id for a given revision identifier.
517
"""Show revision number and revision id for a given revision identifier.
552
518
"""
553
519
hidden = True
554
520
takes_args = ['revision_info*']
571
537
wt = WorkingTree.open_containing(directory)[0]
572
538
b = wt.branch
573
539
wt.lock_read()
574
self.add_cleanup(wt.unlock)
575
540
except (errors.NoWorkingTree, errors.NotLocalUrl):
576
541
wt = None
577
542
b = Branch.open_containing(directory)[0]
578
543
b.lock_read()
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())
544
try:
545
revision_ids = []
546
if revision is not None:
547
revision_ids.extend(rev.as_revision_id(b) for rev in revision)
548
if revision_info_list is not None:
549
for rev_str in revision_info_list:
550
rev_spec = RevisionSpec.from_string(rev_str)
551
revision_ids.append(rev_spec.as_revision_id(b))
552
# No arguments supplied, default to the last revision
553
if len(revision_ids) == 0:
554
if tree:
555
if wt is None:
556
raise errors.NoWorkingTree(directory)
557
revision_ids.append(wt.last_revision())
558
else:
559
revision_ids.append(b.last_revision())
560
561
revinfos = []
562
maxlen = 0
563
for revision_id in revision_ids:
564
try:
565
dotted_revno = b.revision_id_to_dotted_revno(revision_id)
566
revno = '.'.join(str(i) for i in dotted_revno)
567
except errors.NoSuchRevision:
568
revno = '???'
569
maxlen = max(maxlen, len(revno))
570
revinfos.append([revno, revision_id])
571
finally:
572
if wt is None:
573
b.unlock()
593
574
else:
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()
575
wt.unlock()
576
608
577
for ri in revinfos:
609
578
self.outf.write('%*s %s\n' % (maxlen, ri[0], ri[1]))
610
579
611
580
612
581
class cmd_add(Command):
613
__doc__ = """Add specified files or directories.
582
"""Add specified files or directories.
614
583
615
584
In non-recursive mode, all the named items are added, regardless
616
585
of whether they were previously ignored. A warning is given if
682
651
683
652
if base_tree:
684
653
base_tree.lock_read()
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()
654
try:
655
file_list = self._maybe_expand_globs(file_list)
656
tree, file_list = tree_files_for_add(file_list)
657
added, ignored = tree.smart_add(file_list, not
658
no_recurse, action=action, save=not dry_run)
659
finally:
660
if base_tree is not None:
661
base_tree.unlock()
690
662
if len(ignored) > 0:
691
663
if verbose:
692
664
for glob in sorted(ignored.keys()):
696
668
697
669
698
670
class cmd_mkdir(Command):
699
__doc__ = """Create a new versioned directory.
671
"""Create a new versioned directory.
700
672
701
673
This is equivalent to creating the directory and then adding it.
702
674
"""
706
678
707
679
def run(self, dir_list):
708
680
for d in dir_list:
681
os.mkdir(d)
709
682
wt, dd = WorkingTree.open_containing(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)
683
wt.add([dd])
684
self.outf.write('added %s\n' % d)
718
685
719
686
720
687
class cmd_relpath(Command):
721
__doc__ = """Show path of a file relative to root"""
688
"""Show path of a file relative to root"""
722
689
723
690
takes_args = ['filename']
724
691
hidden = True
733
700
734
701
735
702
class cmd_inventory(Command):
736
__doc__ = """Show inventory of the current working copy or a revision.
703
"""Show inventory of the current working copy or a revision.
737
704
738
705
It is possible to limit the output to a particular entry
739
706
type using the --kind option. For example: --kind file.
761
728
revision = _get_one_revision('inventory', revision)
762
729
work_tree, file_list = tree_files(file_list)
763
730
work_tree.lock_read()
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()
731
try:
732
if revision is not None:
733
tree = revision.as_tree(work_tree.branch)
734
735
extra_trees = [work_tree]
736
tree.lock_read()
737
else:
738
tree = work_tree
739
extra_trees = []
740
741
if file_list is not None:
742
file_ids = tree.paths2ids(file_list, trees=extra_trees,
743
require_versioned=True)
744
# find_ids_across_trees may include some paths that don't
745
# exist in 'tree'.
746
entries = sorted((tree.id2path(file_id), tree.inventory[file_id])
747
for file_id in file_ids if file_id in tree)
748
else:
749
entries = tree.inventory.entries()
750
finally:
751
tree.unlock()
752
if tree is not work_tree:
753
work_tree.unlock()
754
786
755
for path, entry in entries:
787
756
if kind and kind != entry.kind:
788
757
continue
794
763
795
764
796
765
class cmd_mv(Command):
797
__doc__ = """Move or rename a file.
766
"""Move or rename a file.
798
767
799
768
:Usage:
800
769
bzr mv OLDNAME NEWNAME
834
803
raise errors.BzrCommandError("missing file argument")
835
804
tree, rel_names = tree_files(names_list, canonicalize=False)
836
805
tree.lock_tree_write()
837
self.add_cleanup(tree.unlock)
838
self._run(tree, names_list, rel_names, after)
806
try:
807
self._run(tree, names_list, rel_names, after)
808
finally:
809
tree.unlock()
839
810
840
811
def run_auto(self, names_list, after, dry_run):
841
812
if names_list is not None and len(names_list) > 1:
846
817
' --auto.')
847
818
work_tree, file_list = tree_files(names_list, default_branch='.')
848
819
work_tree.lock_tree_write()
849
self.add_cleanup(work_tree.unlock)
850
rename_map.RenameMap.guess_renames(work_tree, dry_run)
820
try:
821
rename_map.RenameMap.guess_renames(work_tree, dry_run)
822
finally:
823
work_tree.unlock()
851
824
852
825
def _run(self, tree, names_list, rel_names, after):
853
826
into_existing = osutils.isdir(names_list[-1])
874
847
# All entries reference existing inventory items, so fix them up
875
848
# for cicp file-systems.
876
849
rel_names = tree.get_canonical_inventory_paths(rel_names)
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))
850
for pair in tree.move(rel_names[:-1], rel_names[-1], after=after):
851
self.outf.write("%s => %s\n" % pair)
880
852
else:
881
853
if len(names_list) != 2:
882
854
raise errors.BzrCommandError('to mv multiple files the'
926
898
dest = osutils.pathjoin(dest_parent, dest_tail)
927
899
mutter("attempting to move %s => %s", src, dest)
928
900
tree.rename_one(src, dest, after=after)
929
if not is_quiet():
930
self.outf.write("%s => %s\n" % (src, dest))
901
self.outf.write("%s => %s\n" % (src, dest))
931
902
932
903
933
904
class cmd_pull(Command):
934
__doc__ = """Turn this branch into a mirror of another branch.
905
"""Turn this branch into a mirror of another branch.
935
906
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.
907
This command only works on branches that have not diverged. Branches are
908
considered diverged if the destination branch's most recent commit is one
909
that has not been merged (directly or indirectly) into the parent.
940
910
941
911
If branches have diverged, you can use 'bzr merge' to integrate the changes
942
912
from one into the other. Once one branch has merged, the other should
943
913
be able to pull it again.
944
914
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.
915
If you want to forget your local changes and just update your branch to
916
match the remote one, use pull --overwrite.
948
917
949
918
If there is no default location set, the first pull will set it. After
950
919
that, you can omit the location to use the default. To change the
986
955
try:
987
956
tree_to = WorkingTree.open_containing(directory)[0]
988
957
branch_to = tree_to.branch
989
tree_to.lock_write()
990
self.add_cleanup(tree_to.unlock)
991
958
except errors.NoWorkingTree:
992
959
tree_to = None
993
960
branch_to = Branch.open_containing(directory)[0]
994
branch_to.lock_write()
995
self.add_cleanup(branch_to.unlock)
996
961
997
962
if local and not branch_to.get_bound_location():
998
963
raise errors.LocalRequiresBoundBranch()
999
964
1029
994
else:
1030
995
branch_from = Branch.open(location,
1031
996
possible_transports=possible_transports)
1032
branch_from.lock_read()
1033
self.add_cleanup(branch_from.unlock)
1034
997
1035
998
if branch_to.get_parent() is None or remember:
1036
999
branch_to.set_parent(branch_from.base)
1037
1000
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)
1001
if branch_from is not branch_to:
1002
branch_from.lock_read()
1003
try:
1004
if revision is not None:
1005
revision_id = revision.as_revision_id(branch_from)
1006
1007
branch_to.lock_write()
1008
try:
1009
if tree_to is not None:
1010
view_info = _get_view_info_for_change_reporter(tree_to)
1011
change_reporter = delta._ChangeReporter(
1012
unversioned_filter=tree_to.is_ignored,
1013
view_info=view_info)
1014
result = tree_to.pull(
1015
branch_from, overwrite, revision_id, change_reporter,
1016
possible_transports=possible_transports, local=local)
1017
else:
1018
result = branch_to.pull(
1019
branch_from, overwrite, revision_id, local=local)
1020
1021
result.report(self.outf)
1022
if verbose and result.old_revid != result.new_revid:
1023
log.show_branch_change(
1024
branch_to, self.outf, result.old_revno,
1025
result.old_revid)
1026
finally:
1027
branch_to.unlock()
1028
finally:
1029
if branch_from is not branch_to:
1030
branch_from.unlock()
1058
1031
1059
1032
1060
1033
class cmd_push(Command):
1061
__doc__ = """Update a mirror of this branch.
1034
"""Update a mirror of this branch.
1062
1035
1063
1036
The target branch will not have its working tree populated because this
1064
1037
is both expensive, and is not supported on remote file systems.
1125
1098
# Get the source branch
1126
1099
(tree, br_from,
1127
1100
_unused) = bzrdir.BzrDir.open_containing_tree_or_branch(directory)
1101
if strict is None:
1102
strict = br_from.get_config().get_user_option_as_bool('push_strict')
1103
if strict is None: strict = True # default value
1128
1104
# Get the tip's revision_id
1129
1105
revision = _get_one_revision('push', revision)
1130
1106
if revision is not None:
1131
1107
revision_id = revision.in_history(br_from).rev_id
1132
1108
else:
1133
1109
revision_id = None
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.')
1110
if strict and tree is not None and revision_id is None:
1111
if (tree.has_changes()):
1112
raise errors.UncommittedChanges(
1113
tree, more='Use --no-strict to force the push.')
1114
if tree.last_revision() != tree.branch.last_revision():
1115
# The tree has lost sync with its branch, there is little
1116
# chance that the user is aware of it but he can still force
1117
# the push with --no-strict
1118
raise errors.OutOfDateTree(
1119
tree, more='Use --no-strict to force the push.')
1120
1139
1121
# Get the stacked_on branch, if any
1140
1122
if stacked_on is not None:
1141
1123
stacked_on = urlutils.normalize_url(stacked_on)
1173
1155
1174
1156
1175
1157
class cmd_branch(Command):
1176
__doc__ = """Create a new branch that is a copy of an existing branch.
1158
"""Create a new branch that is a copy of an existing branch.
1177
1159
1178
1160
If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will
1179
1161
be used. In other words, "branch ../foo/bar" will attempt to create ./bar.
1206
1188
' directory exists, but does not already'
1207
1189
' have a control directory. This flag will'
1208
1190
' allow branch to proceed.'),
1209
Option('bind',
1210
help="Bind new branch to from location."),
1211
1191
]
1212
1192
aliases = ['get', 'clone']
1213
1193
1214
1194
def run(self, from_location, to_location=None, revision=None,
1215
1195
hardlink=False, stacked=False, standalone=False, no_tree=False,
1216
use_existing_dir=False, switch=False, bind=False):
1196
use_existing_dir=False, switch=False):
1217
1197
from bzrlib import switch as _mod_switch
1218
1198
from bzrlib.tag import _merge_tags_if_possible
1219
1199
accelerator_tree, br_from = bzrdir.BzrDir.open_tree_or_branch(
1220
1200
from_location)
1201
if (accelerator_tree is not None and
1202
accelerator_tree.supports_content_filtering()):
1203
accelerator_tree = None
1221
1204
revision = _get_one_revision('branch', revision)
1222
1205
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)
1234
1206
try:
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)
1207
if revision is not None:
1208
revision_id = revision.as_revision_id(br_from)
1240
1209
else:
1241
try:
1242
bzrdir.BzrDir.open_from_transport(to_transport)
1243
except errors.NotBranchError:
1244
pass
1210
# FIXME - wt.last_revision, fallback to branch, fall back to
1211
# None or perhaps NULL_REVISION to mean copy nothing
1212
# RBC 20060209
1213
revision_id = br_from.last_revision()
1214
if to_location is None:
1215
to_location = urlutils.derive_to_location(from_location)
1216
to_transport = transport.get_transport(to_location)
1217
try:
1218
to_transport.mkdir('.')
1219
except errors.FileExists:
1220
if not use_existing_dir:
1221
raise errors.BzrCommandError('Target directory "%s" '
1222
'already exists.' % to_location)
1245
1223
else:
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'))
1224
try:
1225
bzrdir.BzrDir.open_from_transport(to_transport)
1226
except errors.NotBranchError:
1227
pass
1228
else:
1229
raise errors.AlreadyBranchError(to_location)
1230
except errors.NoSuchFile:
1231
raise errors.BzrCommandError('Parent of "%s" does not exist.'
1232
% to_location)
1233
try:
1234
# preserve whatever source format we have.
1235
dir = br_from.bzrdir.sprout(to_transport.base, revision_id,
1236
possible_transports=[to_transport],
1237
accelerator_tree=accelerator_tree,
1238
hardlink=hardlink, stacked=stacked,
1239
force_new_repo=standalone,
1240
create_tree_if_local=not no_tree,
1241
source_branch=br_from)
1242
branch = dir.open_branch()
1243
except errors.NoSuchRevision:
1244
to_transport.delete_tree('.')
1245
msg = "The branch %s has no revision %s." % (from_location,
1246
revision)
1247
raise errors.BzrCommandError(msg)
1248
_merge_tags_if_possible(br_from, branch)
1249
# If the source branch is stacked, the new branch may
1250
# be stacked whether we asked for that explicitly or not.
1251
# We therefore need a try/except here and not just 'if stacked:'
1252
try:
1253
note('Created new stacked branch referring to %s.' %
1254
branch.get_stacked_on_url())
1255
except (errors.NotStacked, errors.UnstackableBranchFormat,
1256
errors.UnstackableRepositoryFormat), e:
1257
note('Branched %d revision(s).' % branch.revno())
1258
if switch:
1259
# Switch to the new branch
1260
wt, _ = WorkingTree.open_containing('.')
1261
_mod_switch.switch(wt.bzrdir, branch)
1262
note('Switched to branch: %s',
1263
urlutils.unescape_for_display(branch.base, 'utf-8'))
1264
finally:
1265
br_from.unlock()
1286
1266
1287
1267
1288
1268
class cmd_checkout(Command):
1289
__doc__ = """Create a new checkout of an existing branch.
1269
"""Create a new checkout of an existing branch.
1290
1270
1291
1271
If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree for
1292
1272
the branch found in '.'. This is useful if you have removed the working tree
1355
1335
1356
1336
1357
1337
class cmd_renames(Command):
1358
__doc__ = """Show list of renamed files.
1338
"""Show list of renamed files.
1359
1339
"""
1360
1340
# TODO: Option to show renames between two historical versions.
1361
1341
1367
1347
def run(self, dir=u'.'):
1368
1348
tree = WorkingTree.open_containing(dir)[0]
1369
1349
tree.lock_read()
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))
1350
try:
1351
new_inv = tree.inventory
1352
old_tree = tree.basis_tree()
1353
old_tree.lock_read()
1354
try:
1355
old_inv = old_tree.inventory
1356
renames = []
1357
iterator = tree.iter_changes(old_tree, include_unchanged=True)
1358
for f, paths, c, v, p, n, k, e in iterator:
1359
if paths[0] == paths[1]:
1360
continue
1361
if None in (paths):
1362
continue
1363
renames.append(paths)
1364
renames.sort()
1365
for old_name, new_name in renames:
1366
self.outf.write("%s => %s\n" % (old_name, new_name))
1367
finally:
1368
old_tree.unlock()
1369
finally:
1370
tree.unlock()
1387
1371
1388
1372
1389
1373
class cmd_update(Command):
1390
__doc__ = """Update a tree to have the latest code committed to its branch.
1374
"""Update a tree to have the latest code committed to its branch.
1391
1375
1392
1376
This will perform a merge into the working tree, and may generate
1393
1377
conflicts. If you have any local changes, you will still
1395
1379
1396
1380
If you want to discard your local changes, you can just do a
1397
1381
'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.
1401
1382
"""
1402
1383
1403
1384
_see_also = ['pull', 'working-trees', 'status-flags']
1404
1385
takes_args = ['dir?']
1405
takes_options = ['revision']
1406
1386
aliases = ['up']
1407
1387
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")
1388
def run(self, dir='.'):
1412
1389
tree = WorkingTree.open_containing(dir)[0]
1413
branch = tree.branch
1414
1390
possible_transports = []
1415
master = branch.get_master_branch(
1391
master = tree.branch.get_master_branch(
1416
1392
possible_transports=possible_transports)
1417
1393
if master is not None:
1418
1394
tree.lock_write()
1419
branch_location = master.base
1420
1395
else:
1421
1396
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)
1449
1397
try:
1398
existing_pending_merges = tree.get_parent_ids()[1:]
1399
last_rev = _mod_revision.ensure_null(tree.last_revision())
1400
if last_rev == _mod_revision.ensure_null(
1401
tree.branch.last_revision()):
1402
# may be up to date, check master too.
1403
if master is None or last_rev == _mod_revision.ensure_null(
1404
master.last_revision()):
1405
revno = tree.branch.revision_id_to_revno(last_rev)
1406
note("Tree is up to date at revision %d." % (revno,))
1407
return 0
1408
view_info = _get_view_info_for_change_reporter(tree)
1450
1409
conflicts = tree.update(
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
1410
delta._ChangeReporter(unversioned_filter=tree.is_ignored,
1411
view_info=view_info), possible_transports=possible_transports)
1412
revno = tree.branch.revision_id_to_revno(
1413
_mod_revision.ensure_null(tree.last_revision()))
1414
note('Updated to revision %d.' % (revno,))
1415
if tree.get_parent_ids()[1:] != existing_pending_merges:
1416
note('Your local commits will now show as pending merges with '
1417
"'bzr status', and can be committed with 'bzr commit'.")
1418
if conflicts != 0:
1419
return 1
1420
else:
1421
return 0
1422
finally:
1423
tree.unlock()
1473
1424
1474
1425
1475
1426
class cmd_info(Command):
1476
__doc__ = """Show information about a working tree, branch or repository.
1427
"""Show information about a working tree, branch or repository.
1477
1428
1478
1429
This command will show all known locations and formats associated to the
1479
1430
tree, branch or repository.
1517
1468
1518
1469
1519
1470
class cmd_remove(Command):
1520
__doc__ = """Remove files or directories.
1471
"""Remove files or directories.
1521
1472
1522
1473
This makes bzr stop tracking changes to the specified files. bzr will delete
1523
1474
them if they can easily be recovered using revert. If no options or
1546
1497
file_list = [f for f in file_list]
1547
1498
1548
1499
tree.lock_write()
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')
1500
try:
1501
# Heuristics should probably all move into tree.remove_smart or
1502
# some such?
1503
if new:
1504
added = tree.changes_from(tree.basis_tree(),
1505
specific_files=file_list).added
1506
file_list = sorted([f[0] for f in added], reverse=True)
1507
if len(file_list) == 0:
1508
raise errors.BzrCommandError('No matching files.')
1509
elif file_list is None:
1510
# missing files show up in iter_changes(basis) as
1511
# versioned-with-no-kind.
1512
missing = []
1513
for change in tree.iter_changes(tree.basis_tree()):
1514
# Find paths in the working tree that have no kind:
1515
if change[1][1] is not None and change[6][1] is None:
1516
missing.append(change[1][1])
1517
file_list = sorted(missing, reverse=True)
1518
file_deletion_strategy = 'keep'
1519
tree.remove(file_list, verbose=verbose, to_file=self.outf,
1520
keep_files=file_deletion_strategy=='keep',
1521
force=file_deletion_strategy=='force')
1522
finally:
1523
tree.unlock()
1571
1524
1572
1525
1573
1526
class cmd_file_id(Command):
1574
__doc__ = """Print file_id of a particular file or directory.
1527
"""Print file_id of a particular file or directory.
1575
1528
1576
1529
The file_id is assigned when the file is first added and remains the
1577
1530
same through all revisions where the file exists, even when it is
1593
1546
1594
1547
1595
1548
class cmd_file_path(Command):
1596
__doc__ = """Print path of file_ids to a file or directory.
1549
"""Print path of file_ids to a file or directory.
1597
1550
1598
1551
This prints one line for each directory down to the target,
1599
1552
starting at the branch root.
1615
1568
1616
1569
1617
1570
class cmd_reconcile(Command):
1618
__doc__ = """Reconcile bzr metadata in a branch.
1571
"""Reconcile bzr metadata in a branch.
1619
1572
1620
1573
This can correct data mismatches that may have been caused by
1621
1574
previous ghost operations or bzr upgrades. You should only
1643
1596
1644
1597
1645
1598
class cmd_revision_history(Command):
1646
__doc__ = """Display the list of revision ids on a branch."""
1599
"""Display the list of revision ids on a branch."""
1647
1600
1648
1601
_see_also = ['log']
1649
1602
takes_args = ['location?']
1659
1612
1660
1613
1661
1614
class cmd_ancestry(Command):
1662
__doc__ = """List all revisions merged into this branch."""
1615
"""List all revisions merged into this branch."""
1663
1616
1664
1617
_see_also = ['log', 'revision-history']
1665
1618
takes_args = ['location?']
1684
1637
1685
1638
1686
1639
class cmd_init(Command):
1687
__doc__ = """Make a directory into a versioned branch.
1640
"""Make a directory into a versioned branch.
1688
1641
1689
1642
Use this to create an empty branch, or before importing an
1690
1643
existing project.
1793
1746
1794
1747
1795
1748
class cmd_init_repository(Command):
1796
__doc__ = """Create a shared repository for branches to share storage space.
1749
"""Create a shared repository to hold branches.
1797
1750
1798
1751
New branches created under the repository directory will store their
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.
1752
revisions in the repository, not in the branch directory.
1802
1753
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.
1754
If the --no-trees option is used then the branches in the repository
1755
will not have working trees by default.
1809
1756
1810
1757
:Examples:
1811
Create a shared repository holding just branches::
1758
Create a shared repositories holding just branches::
1812
1759
1813
1760
bzr init-repo --no-trees repo
1814
1761
bzr init repo/trunk
1853
1800
1854
1801
1855
1802
class cmd_diff(Command):
1856
__doc__ = """Show differences in the working tree, between revisions or branches.
1803
"""Show differences in the working tree, between revisions or branches.
1857
1804
1858
1805
If no arguments are given, all changes for the current tree are listed.
1859
1806
If files are given, only the changes in those files are listed.
1880
1827
1881
1828
bzr diff -r1
1882
1829
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
1830
Difference between revision 2 and revision 1::
1831
1832
bzr diff -r1..2
1833
1834
Difference between revision 2 and revision 1 for branch xxx::
1835
1836
bzr diff -r1..2 xxx
1904
1837
1905
1838
Show just the differences for file NEWS::
1906
1839
1945
1878
help='Use this command to compare files.',
1946
1879
type=unicode,
1947
1880
),
1948
RegistryOption('format',
1949
help='Diff format to use.',
1950
lazy_registry=('bzrlib.diff', 'format_registry'),
1951
value_switches=False, title='Diff format'),
1952
1881
]
1953
1882
aliases = ['di', 'dif']
1954
1883
encoding_type = 'exact'
1955
1884
1956
1885
@display_command
1957
1886
def run(self, revision=None, file_list=None, diff_options=None,
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)
1887
prefix=None, old=None, new=None, using=None):
1888
from bzrlib.diff import get_trees_and_branches_to_diff, show_diff_trees
1961
1889
1962
1890
if (prefix is None) or (prefix == '0'):
1963
1891
# diff -p0 format
1977
1905
raise errors.BzrCommandError('bzr diff --revision takes exactly'
1978
1906
' one or two revision specifiers')
1979
1907
1980
if using is not None and format is not None:
1981
raise errors.BzrCommandError('--using and --format are mutually '
1982
'exclusive.')
1983
1984
1908
(old_tree, new_tree,
1985
1909
old_branch, new_branch,
1986
specific_files, extra_trees) = get_trees_and_branches_to_diff_locked(
1987
file_list, revision, old, new, self.add_cleanup, apply_view=True)
1910
specific_files, extra_trees) = get_trees_and_branches_to_diff(
1911
file_list, revision, old, new, apply_view=True)
1988
1912
return show_diff_trees(old_tree, new_tree, sys.stdout,
1989
1913
specific_files=specific_files,
1990
1914
external_diff_options=diff_options,
1991
1915
old_label=old_label, new_label=new_label,
1992
extra_trees=extra_trees, using=using,
1993
format_cls=format)
1916
extra_trees=extra_trees, using=using)
1994
1917
1995
1918
1996
1919
class cmd_deleted(Command):
1997
__doc__ = """List files deleted in the working tree.
1920
"""List files deleted in the working tree.
1998
1921
"""
1999
1922
# TODO: Show files deleted since a previous revision, or
2000
1923
# between two revisions.
2009
1932
def run(self, show_ids=False):
2010
1933
tree = WorkingTree.open_containing(u'.')[0]
2011
1934
tree.lock_read()
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')
1935
try:
1936
old = tree.basis_tree()
1937
old.lock_read()
1938
try:
1939
for path, ie in old.inventory.iter_entries():
1940
if not tree.has_id(ie.file_id):
1941
self.outf.write(path)
1942
if show_ids:
1943
self.outf.write(' ')
1944
self.outf.write(ie.file_id)
1945
self.outf.write('\n')
1946
finally:
1947
old.unlock()
1948
finally:
1949
tree.unlock()
2023
1950
2024
1951
2025
1952
class cmd_modified(Command):
2026
__doc__ = """List files modified in working tree.
1953
"""List files modified in working tree.
2027
1954
"""
2028
1955
2029
1956
hidden = True
2046
1973
2047
1974
2048
1975
class cmd_added(Command):
2049
__doc__ = """List files added in working tree.
1976
"""List files added in working tree.
2050
1977
"""
2051
1978
2052
1979
hidden = True
2061
1988
def run(self, null=False):
2062
1989
wt = WorkingTree.open_containing(u'.')[0]
2063
1990
wt.lock_read()
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')
1991
try:
1992
basis = wt.basis_tree()
1993
basis.lock_read()
1994
try:
1995
basis_inv = basis.inventory
1996
inv = wt.inventory
1997
for file_id in inv:
1998
if file_id in basis_inv:
1999
continue
2000
if inv.is_root(file_id) and len(basis_inv) == 0:
2001
continue
2002
path = inv.id2path(file_id)
2003
if not os.access(osutils.abspath(path), os.F_OK):
2004
continue
2005
if null:
2006
self.outf.write(path + '\0')
2007
else:
2008
self.outf.write(osutils.quotefn(path) + '\n')
2009
finally:
2010
basis.unlock()
2011
finally:
2012
wt.unlock()
2082
2013
2083
2014
2084
2015
class cmd_root(Command):
2085
__doc__ = """Show the tree root directory.
2016
"""Show the tree root directory.
2086
2017
2087
2018
The root is the nearest enclosing directory with a .bzr control
2088
2019
directory."""
2112
2043
2113
2044
2114
2045
class cmd_log(Command):
2115
__doc__ = """Show historical log for a branch or subset of a branch.
2046
"""Show historical log for a branch or subset of a branch.
2116
2047
2117
2048
log is bzr's default tool for exploring the history of a branch.
2118
2049
The branch to use is taken from the first parameter. If no parameters
2229
2160
:Tips & tricks:
2230
2161
2231
2162
GUI tools and IDEs are often better at exploring history than command
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>.
2163
line tools. You may prefer qlog or glog from the QBzr and Bzr-Gtk packages
2164
respectively for example. (TortoiseBzr uses qlog for displaying logs.) See
2165
http://bazaar-vcs.org/BzrPlugins and http://bazaar-vcs.org/IDEIntegration.
2166
2167
Web interfaces are often better at exploring history than command line
2168
tools, particularly for branches on servers. You may prefer Loggerhead
2169
or one of its alternatives. See http://bazaar-vcs.org/WebInterface.
2236
2170
2237
2171
You may find it useful to add the aliases below to ``bazaar.conf``::
2238
2172
2299
2233
help='Show changes made in each revision as a patch.'),
2300
2234
Option('include-merges',
2301
2235
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
)
2306
2236
]
2307
2237
encoding_type = 'replace'
2308
2238
2318
2248
message=None,
2319
2249
limit=None,
2320
2250
show_diff=False,
2321
include_merges=False,
2322
exclude_common_ancestry=False,
2323
):
2251
include_merges=False):
2324
2252
from bzrlib.log import (
2325
2253
Logger,
2326
2254
make_log_request_dict,
2327
2255
_get_info_for_log_files,
2328
2256
)
2329
2257
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')
2334
2258
if include_merges:
2335
2259
if levels is None:
2336
2260
levels = 0
2351
2275
filter_by_dir = False
2352
2276
if file_list:
2353
2277
# find the file ids to log and check for directory filtering
2354
b, file_info_list, rev1, rev2 = _get_info_for_log_files(
2355
revision, file_list)
2356
self.add_cleanup(b.unlock)
2278
b, file_info_list, rev1, rev2 = _get_info_for_log_files(revision,
2279
file_list)
2357
2280
for relpath, file_id, kind in file_info_list:
2358
2281
if file_id is None:
2359
2282
raise errors.BzrCommandError(
2377
2300
location = '.'
2378
2301
dir, relpath = bzrdir.BzrDir.open_containing(location)
2379
2302
b = dir.open_branch()
2380
b.lock_read()
2381
self.add_cleanup(b.unlock)
2382
2303
rev1, rev2 = _get_revision_range(revision, b, self.name())
2383
2304
2384
2305
# Decide on the type of delta & diff filtering to use
2394
2315
else:
2395
2316
diff_type = 'full'
2396
2317
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)
2318
b.lock_read()
2319
try:
2320
# Build the log formatter
2321
if log_format is None:
2322
log_format = log.log_formatter_registry.get_default(b)
2323
lf = log_format(show_ids=show_ids, to_file=self.outf,
2324
show_timezone=timezone,
2325
delta_format=get_verbosity_level(),
2326
levels=levels,
2327
show_advice=levels is None)
2328
2329
# Choose the algorithm for doing the logging. It's annoying
2330
# having multiple code paths like this but necessary until
2331
# the underlying repository format is faster at generating
2332
# deltas or can provide everything we need from the indices.
2333
# The default algorithm - match-using-deltas - works for
2334
# multiple files and directories and is faster for small
2335
# amounts of history (200 revisions say). However, it's too
2336
# slow for logging a single file in a repository with deep
2337
# history, i.e. > 10K revisions. In the spirit of "do no
2338
# evil when adding features", we continue to use the
2339
# original algorithm - per-file-graph - for the "single
2340
# file that isn't a directory without showing a delta" case.
2341
partial_history = revision and b.repository._format.supports_chks
2342
match_using_deltas = (len(file_ids) != 1 or filter_by_dir
2343
or delta_type or partial_history)
2344
2345
# Build the LogRequest and execute it
2346
if len(file_ids) == 0:
2347
file_ids = None
2348
rqst = make_log_request_dict(
2349
direction=direction, specific_fileids=file_ids,
2350
start_revision=rev1, end_revision=rev2, limit=limit,
2351
message_search=message, delta_type=delta_type,
2352
diff_type=diff_type, _match_using_deltas=match_using_deltas)
2353
Logger(b, rqst).show(lf)
2354
finally:
2355
b.unlock()
2436
2356
2437
2357
2438
2358
def _get_revision_range(revisionspec_list, branch, command_name):
2456
2376
raise errors.BzrCommandError(
2457
2377
"bzr %s doesn't accept two revisions in different"
2458
2378
" branches." % command_name)
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)
2379
rev1 = start_spec.in_history(branch)
2464
2380
# Avoid loading all of history when we know a missing
2465
2381
# end of range means the last revision ...
2466
2382
if end_spec.spec is None:
2495
2411
2496
2412
2497
2413
class cmd_touching_revisions(Command):
2498
__doc__ = """Return revision-ids which affected a particular file.
2414
"""Return revision-ids which affected a particular file.
2499
2415
2500
2416
A more user-friendly interface is "bzr log FILE".
2501
2417
"""
2506
2422
@display_command
2507
2423
def run(self, filename):
2508
2424
tree, relpath = WorkingTree.open_containing(filename)
2425
b = tree.branch
2509
2426
file_id = tree.path2id(relpath)
2510
b = tree.branch
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:
2427
for revno, revision_id, what in log.find_touching_revisions(b, file_id):
2515
2428
self.outf.write("%6d %s\n" % (revno, what))
2516
2429
2517
2430
2518
2431
class cmd_ls(Command):
2519
__doc__ = """List files in a tree.
2432
"""List files in a tree.
2520
2433
"""
2521
2434
2522
2435
_see_also = ['status', 'cat']
2570
2483
if from_root:
2571
2484
if relpath:
2572
2485
prefix = relpath + '/'
2573
elif fs_path != '.' and not fs_path.endswith('/'):
2486
elif fs_path != '.':
2574
2487
prefix = fs_path + '/'
2575
2488
2576
2489
if revision is not None or tree is None:
2585
2498
note("Ignoring files outside view. View is %s" % view_str)
2586
2499
2587
2500
tree.lock_read()
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
2501
try:
2502
for fp, fc, fkind, fid, entry in tree.list_files(include_root=False,
2503
from_dir=relpath, recursive=recursive):
2504
# Apply additional masking
2505
if not all and not selection[fc]:
2506
continue
2507
if kind is not None and fkind != kind:
2508
continue
2509
if apply_view:
2510
try:
2511
if relpath:
2512
fullpath = osutils.pathjoin(relpath, fp)
2513
else:
2514
fullpath = fp
2515
views.check_path_in_view(tree, fullpath)
2516
except errors.FileOutsideView:
2517
continue
2605
2518
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:
2519
# Output the entry
2520
if prefix:
2521
fp = osutils.pathjoin(prefix, fp)
2522
kindch = entry.kind_character()
2523
outstring = fp + kindch
2524
ui.ui_factory.clear_term()
2525
if verbose:
2526
outstring = '%-8s %s' % (fc, outstring)
2527
if show_ids and fid is not None:
2528
outstring = "%-50s %s" % (outstring, fid)
2632
2529
self.outf.write(outstring + '\n')
2530
elif null:
2531
self.outf.write(fp + '\0')
2532
if show_ids:
2533
if fid is not None:
2534
self.outf.write(fid)
2535
self.outf.write('\0')
2536
self.outf.flush()
2537
else:
2538
if show_ids:
2539
if fid is not None:
2540
my_id = fid
2541
else:
2542
my_id = ''
2543
self.outf.write('%-50s %s\n' % (outstring, my_id))
2544
else:
2545
self.outf.write(outstring + '\n')
2546
finally:
2547
tree.unlock()
2633
2548
2634
2549
2635
2550
class cmd_unknowns(Command):
2636
__doc__ = """List unknown files.
2551
"""List unknown files.
2637
2552
"""
2638
2553
2639
2554
hidden = True
2646
2561
2647
2562
2648
2563
class cmd_ignore(Command):
2649
__doc__ = """Ignore specified files or patterns.
2564
"""Ignore specified files or patterns.
2650
2565
2651
2566
See ``bzr help patterns`` for details on the syntax of patterns.
2652
2567
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
2659
2568
To remove patterns from the ignore list, edit the .bzrignore file.
2660
2569
After adding, editing or deleting that file either indirectly by
2661
2570
using this command or directly by using an editor, be sure to commit
2662
2571
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.
2676
2572
2677
2573
Note: ignore patterns containing shell wildcards must be quoted from
2678
2574
the shell on Unix.
2682
2578
2683
2579
bzr ignore ./Makefile
2684
2580
2685
Ignore .class files in all directories...::
2581
Ignore class files in all directories::
2686
2582
2687
2583
bzr ignore "*.class"
2688
2584
2689
...but do not ignore "special.class"::
2690
2691
bzr ignore "!special.class"
2692
2693
2585
Ignore .o files under the lib directory::
2694
2586
2695
2587
bzr ignore "lib/**/*.o"
2701
2593
Ignore everything but the "debian" toplevel directory::
2702
2594
2703
2595
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 "!!*~"
2711
2596
"""
2712
2597
2713
2598
_see_also = ['status', 'ignored', 'patterns']
2714
2599
takes_args = ['name_pattern*']
2715
2600
takes_options = [
2716
Option('default-rules',
2717
help='Display the default ignore rules that bzr uses.')
2601
Option('old-default-rules',
2602
help='Write out the ignore rules bzr < 0.9 always used.')
2718
2603
]
2719
2604
2720
def run(self, name_pattern_list=None, default_rules=None):
2605
def run(self, name_pattern_list=None, old_default_rules=None):
2721
2606
from bzrlib import ignores
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)
2607
if old_default_rules is not None:
2608
# dump the rules and exit
2609
for pattern in ignores.OLD_DEFAULTS:
2610
print pattern
2726
2611
return
2727
2612
if not name_pattern_list:
2728
2613
raise errors.BzrCommandError("ignore requires at least one "
2729
"NAME_PATTERN or --default-rules.")
2614
"NAME_PATTERN or --old-default-rules")
2730
2615
name_pattern_list = [globbing.normalize_pattern(p)
2731
2616
for p in name_pattern_list]
2732
2617
for name_pattern in name_pattern_list:
2744
2629
if id is not None:
2745
2630
filename = entry[0]
2746
2631
if ignored.match(filename):
2747
matches.append(filename)
2632
matches.append(filename.encode('utf-8'))
2748
2633
tree.unlock()
2749
2634
if len(matches) > 0:
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),))
2635
print "Warning: the following files are version controlled and" \
2636
" match your ignore pattern:\n%s" \
2637
"\nThese files will continue to be version controlled" \
2638
" unless you 'bzr remove' them." % ("\n".join(matches),)
2754
2639
2755
2640
2756
2641
class cmd_ignored(Command):
2757
__doc__ = """List ignored files and the patterns that matched them.
2642
"""List ignored files and the patterns that matched them.
2758
2643
2759
2644
List all the ignored files and the ignore pattern that caused the file to
2760
2645
be ignored.
2771
2656
def run(self):
2772
2657
tree = WorkingTree.open_containing(u'.')[0]
2773
2658
tree.lock_read()
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))
2659
try:
2660
for path, file_class, kind, file_id, entry in tree.list_files():
2661
if file_class != 'I':
2662
continue
2663
## XXX: Slightly inefficient since this was already calculated
2664
pat = tree.is_ignored(path)
2665
self.outf.write('%-50s %s\n' % (path, pat))
2666
finally:
2667
tree.unlock()
2781
2668
2782
2669
2783
2670
class cmd_lookup_revision(Command):
2784
__doc__ = """Lookup the revision-id from a revision-number
2671
"""Lookup the revision-id from a revision-number
2785
2672
2786
2673
:Examples:
2787
2674
bzr lookup-revision 33
2794
2681
try:
2795
2682
revno = int(revno)
2796
2683
except ValueError:
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)
2684
raise errors.BzrCommandError("not a valid revision-number: %r" % revno)
2685
2686
print WorkingTree.open_containing(u'.')[0].branch.get_rev_id(revno)
2801
2687
2802
2688
2803
2689
class cmd_export(Command):
2804
__doc__ = """Export current or past revision to a destination directory or archive.
2690
"""Export current or past revision to a destination directory or archive.
2805
2691
2806
2692
If no revision is specified this exports the last committed revision.
2807
2693
2839
2725
Option('root',
2840
2726
type=str,
2841
2727
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.'),
2845
2728
]
2846
2729
def run(self, dest, branch_or_subdir=None, revision=None, format=None,
2847
root=None, filters=False, per_file_timestamps=False):
2730
root=None, filters=False):
2848
2731
from bzrlib.export import export
2849
2732
2850
2733
if branch_or_subdir is None:
2857
2740
2858
2741
rev_tree = _get_one_revision_tree('export', revision, branch=b, tree=tree)
2859
2742
try:
2860
export(rev_tree, dest, format, root, subdir, filtered=filters,
2861
per_file_timestamps=per_file_timestamps)
2743
export(rev_tree, dest, format, root, subdir, filtered=filters)
2862
2744
except errors.NoSuchExportFormat, e:
2863
2745
raise errors.BzrCommandError('Unsupported export format: %s' % e.format)
2864
2746
2865
2747
2866
2748
class cmd_cat(Command):
2867
__doc__ = """Write the contents of a file as of a given revision to standard output.
2749
"""Write the contents of a file as of a given revision to standard output.
2868
2750
2869
2751
If no revision is nominated, the last revision is used.
2870
2752
2891
2773
tree, branch, relpath = \
2892
2774
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
2893
2775
branch.lock_read()
2894
self.add_cleanup(branch.unlock)
2895
return self._run(tree, branch, relpath, filename, revision,
2896
name_from_revision, filters)
2776
try:
2777
return self._run(tree, branch, relpath, filename, revision,
2778
name_from_revision, filters)
2779
finally:
2780
branch.unlock()
2897
2781
2898
2782
def _run(self, tree, b, relpath, filename, revision, name_from_revision,
2899
2783
filtered):
2900
2784
if tree is None:
2901
2785
tree = b.basis_tree()
2902
2786
rev_tree = _get_one_revision_tree('cat', revision, branch=b)
2903
rev_tree.lock_read()
2904
self.add_cleanup(rev_tree.unlock)
2905
2787
2906
2788
old_file_id = rev_tree.path2id(relpath)
2907
2789
2942
2824
chunks = content.splitlines(True)
2943
2825
content = filtered_output_bytes(chunks, filters,
2944
2826
ContentFilterContext(relpath, rev_tree))
2945
self.cleanup_now()
2946
2827
self.outf.writelines(content)
2947
2828
else:
2948
self.cleanup_now()
2949
2829
self.outf.write(content)
2950
2830
2951
2831
2952
2832
class cmd_local_time_offset(Command):
2953
__doc__ = """Show the offset in seconds from GMT to local time."""
2833
"""Show the offset in seconds from GMT to local time."""
2954
2834
hidden = True
2955
2835
@display_command
2956
2836
def run(self):
2957
self.outf.write("%s\n" % osutils.local_time_offset())
2837
print osutils.local_time_offset()
2958
2838
2959
2839
2960
2840
2961
2841
class cmd_commit(Command):
2962
__doc__ = """Commit changes into a new revision.
2842
"""Commit changes into a new revision.
2963
2843
2964
2844
An explanatory message needs to be given for each commit. This is
2965
2845
often done by using the --message option (getting the message from the
3058
2938
Option('strict',
3059
2939
help="Refuse to commit if there are unknown "
3060
2940
"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'."),
3064
2941
ListOption('fixes', type=str,
3065
2942
help="Mark a bug as being fixed by this revision "
3066
2943
"(see \"bzr help bugs\")."),
3073
2950
"the master branch until a normal commit "
3074
2951
"is performed."
3075
2952
),
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.'),
2953
Option('show-diff',
2954
help='When no message is supplied, show the diff along'
2955
' with the status summary in the message editor.'),
3079
2956
]
3080
2957
aliases = ['ci', 'checkin']
3081
2958
3100
2977
3101
2978
def run(self, message=None, file=None, verbose=False, selected_list=None,
3102
2979
unchanged=False, strict=False, local=False, fixes=None,
3103
author=None, show_diff=False, exclude=None, commit_time=None):
2980
author=None, show_diff=False, exclude=None):
3104
2981
from bzrlib.errors import (
3105
2982
PointlessCommit,
3106
2983
ConflictsInTree,
3112
2989
make_commit_message_template_encoded
3113
2990
)
3114
2991
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
3123
2992
# TODO: Need a blackbox test for invoking the external editor; may be
3124
2993
# slightly problematic to run this cross-platform.
3125
2994
3145
3014
if local and not tree.branch.get_bound_location():
3146
3015
raise errors.LocalRequiresBoundBranch()
3147
3016
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
3169
3017
def get_message(commit_obj):
3170
3018
"""Callback to get commit message"""
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,
3019
my_message = message
3020
if my_message is None and not file:
3021
t = make_commit_message_template_encoded(tree,
3180
3022
selected_list, diff=show_diff,
3181
3023
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.
3187
3024
start_message = generate_commit_message_template(commit_obj)
3188
my_message = edit_commit_message_encoded(text,
3025
my_message = edit_commit_message_encoded(t,
3189
3026
start_message=start_message)
3190
3027
if my_message is None:
3191
3028
raise errors.BzrCommandError("please specify a commit"
3192
3029
" message with either --message or --file")
3030
elif my_message and file:
3031
raise errors.BzrCommandError(
3032
"please specify either --message or --file")
3033
if file:
3034
my_message = codecs.open(file, 'rt',
3035
osutils.get_user_encoding()).read()
3193
3036
if my_message == "":
3194
3037
raise errors.BzrCommandError("empty commit message specified")
3195
3038
return my_message
3203
3046
specific_files=selected_list,
3204
3047
allow_pointless=unchanged, strict=strict, local=local,
3205
3048
reporter=None, verbose=verbose, revprops=properties,
3206
authors=author, timestamp=commit_stamp,
3207
timezone=offset,
3049
authors=author,
3208
3050
exclude=safe_relpath_files(tree, exclude))
3209
3051
except PointlessCommit:
3052
# FIXME: This should really happen before the file is read in;
3053
# perhaps prepare the commit; get the message; then actually commit
3210
3054
raise errors.BzrCommandError("No changes to commit."
3211
3055
" Use --unchanged to commit anyhow.")
3212
3056
except ConflictsInTree:
3217
3061
raise errors.BzrCommandError("Commit refused because there are"
3218
3062
" unknown files in the working tree.")
3219
3063
except errors.BoundBranchOutOfDate, e:
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
3064
raise errors.BzrCommandError(str(e) + "\n"
3065
'To commit to master branch, run update and then commit.\n'
3066
'You can also pass --local to commit to continue working '
3067
'disconnected.')
3225
3068
3226
3069
3227
3070
class cmd_check(Command):
3228
__doc__ = """Validate working tree structure, branch consistency and repository history.
3071
"""Validate working tree structure, branch consistency and repository history.
3229
3072
3230
3073
This command checks various invariants about branch and repository storage
3231
3074
to detect data corruption or bzr bugs.
3295
3138
3296
3139
3297
3140
class cmd_upgrade(Command):
3298
__doc__ = """Upgrade branch storage to current format.
3141
"""Upgrade branch storage to current format.
3299
3142
3300
3143
The check command or bzr developers may sometimes advise you to run
3301
3144
this command. When the default format has changed you may also be warned
3319
3162
3320
3163
3321
3164
class cmd_whoami(Command):
3322
__doc__ = """Show or set bzr user id.
3165
"""Show or set bzr user id.
3323
3166
3324
3167
:Examples:
3325
3168
Show the email of the current user::
3369
3212
3370
3213
3371
3214
class cmd_nick(Command):
3372
__doc__ = """Print or set the branch nickname.
3215
"""Print or set the branch nickname.
3373
3216
3374
3217
If unset, the tree root directory name is used as the nickname.
3375
3218
To print the current nickname, execute with no argument.
3389
3232
3390
3233
@display_command
3391
3234
def printme(self, branch):
3392
self.outf.write('%s\n' % branch.nick)
3235
print branch.nick
3393
3236
3394
3237
3395
3238
class cmd_alias(Command):
3396
__doc__ = """Set/unset and display aliases.
3239
"""Set/unset and display aliases.
3397
3240
3398
3241
:Examples:
3399
3242
Show the current aliases::
3463
3306
3464
3307
3465
3308
class cmd_selftest(Command):
3466
__doc__ = """Run internal test suite.
3309
"""Run internal test suite.
3467
3310
3468
3311
If arguments are given, they are regular expressions that say which tests
3469
3312
should run. Tests matching any expression are run, and other tests are
3513
3356
def get_transport_type(typestring):
3514
3357
"""Parse and return a transport specifier."""
3515
3358
if typestring == "sftp":
3516
from bzrlib.tests import stub_sftp
3517
return stub_sftp.SFTPAbsoluteServer
3359
from bzrlib.transport.sftp import SFTPAbsoluteServer
3360
return SFTPAbsoluteServer
3518
3361
if typestring == "memory":
3519
from bzrlib.tests import test_server
3520
return memory.MemoryServer
3362
from bzrlib.transport.memory import MemoryServer
3363
return MemoryServer
3521
3364
if typestring == "fakenfs":
3522
from bzrlib.tests import test_server
3523
return test_server.FakeNFSServer
3365
from bzrlib.transport.fakenfs import FakeNFSServer
3366
return FakeNFSServer
3524
3367
msg = "No known transport type %s. Supported types are: sftp\n" %\
3525
3368
(typestring)
3526
3369
raise errors.BzrCommandError(msg)
3610
3453
raise errors.BzrCommandError("subunit not available. subunit "
3611
3454
"needs to be installed to use --subunit.")
3612
3455
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)
3618
3456
if parallel:
3619
3457
self.additional_selftest_args.setdefault(
3620
3458
'suite_decorators', []).append(parallel)
3624
3462
verbose = not is_quiet()
3625
3463
# TODO: should possibly lock the history file...
3626
3464
benchfile = open(".perf_history", "at", buffering=1)
3627
self.add_cleanup(benchfile.close)
3628
3465
else:
3629
3466
test_suite_factory = None
3630
3467
benchfile = None
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)
3468
try:
3469
selftest_kwargs = {"verbose": verbose,
3470
"pattern": pattern,
3471
"stop_on_failure": one,
3472
"transport": transport,
3473
"test_suite_factory": test_suite_factory,
3474
"lsprof_timed": lsprof_timed,
3475
"lsprof_tests": lsprof_tests,
3476
"bench_history": benchfile,
3477
"matching_tests_first": first,
3478
"list_only": list_only,
3479
"random_seed": randomize,
3480
"exclude_pattern": exclude,
3481
"strict": strict,
3482
"load_list": load_list,
3483
"debug_flags": debugflag,
3484
"starting_with": starting_with
3485
}
3486
selftest_kwargs.update(self.additional_selftest_args)
3487
result = selftest(**selftest_kwargs)
3488
finally:
3489
if benchfile is not None:
3490
benchfile.close()
3650
3491
return int(not result)
3651
3492
3652
3493
3653
3494
class cmd_version(Command):
3654
__doc__ = """Show version of bzr."""
3495
"""Show version of bzr."""
3655
3496
3656
3497
encoding_type = 'replace'
3657
3498
takes_options = [
3668
3509
3669
3510
3670
3511
class cmd_rocks(Command):
3671
__doc__ = """Statement of optimism."""
3512
"""Statement of optimism."""
3672
3513
3673
3514
hidden = True
3674
3515
3675
3516
@display_command
3676
3517
def run(self):
3677
self.outf.write("It sure does!\n")
3518
print "It sure does!"
3678
3519
3679
3520
3680
3521
class cmd_find_merge_base(Command):
3681
__doc__ = """Find and print a base revision for merging two branches."""
3522
"""Find and print a base revision for merging two branches."""
3682
3523
# TODO: Options to specify revisions on either side, as if
3683
3524
# merging only part of the history.
3684
3525
takes_args = ['branch', 'other']
3691
3532
branch1 = Branch.open_containing(branch)[0]
3692
3533
branch2 = Branch.open_containing(other)[0]
3693
3534
branch1.lock_read()
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)
3535
try:
3536
branch2.lock_read()
3537
try:
3538
last1 = ensure_null(branch1.last_revision())
3539
last2 = ensure_null(branch2.last_revision())
3540
3541
graph = branch1.repository.get_graph(branch2.repository)
3542
base_rev_id = graph.find_unique_lca(last1, last2)
3543
3544
print 'merge base is revision %s' % base_rev_id
3545
finally:
3546
branch2.unlock()
3547
finally:
3548
branch1.unlock()
3704
3549
3705
3550
3706
3551
class cmd_merge(Command):
3707
__doc__ = """Perform a three-way merge.
3552
"""Perform a three-way merge.
3708
3553
3709
3554
The source of the merge can be specified either in the form of a branch,
3710
3555
or in the form of a path to a file containing a merge directive generated
3739
3584
committed to record the result of the merge.
3740
3585
3741
3586
merge refuses to run if there are any uncommitted changes, unless
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.
3587
--force is given.
3748
3588
3749
3589
To select only some changes to merge, use "merge -i", which will prompt
3750
3590
you to apply each diff hunk and file change, similar to "shelve".
3762
3602
3763
3603
bzr merge -r 81..82 ../bzr.dev
3764
3604
3765
To apply a merge directive contained in /tmp/merge::
3605
To apply a merge directive contained in /tmp/merge:
3766
3606
3767
3607
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'
3775
3608
"""
3776
3609
3777
3610
encoding_type = 'exact'
3835
3668
view_info = _get_view_info_for_change_reporter(tree)
3836
3669
change_reporter = delta._ChangeReporter(
3837
3670
unversioned_filter=tree.is_ignored, view_info=view_info)
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
3671
cleanups = []
3672
try:
3673
pb = ui.ui_factory.nested_progress_bar()
3674
cleanups.append(pb.finished)
3675
tree.lock_write()
3676
cleanups.append(tree.unlock)
3677
if location is not None:
3678
try:
3679
mergeable = bundle.read_mergeable_from_url(location,
3680
possible_transports=possible_transports)
3681
except errors.NotABundle:
3682
mergeable = None
3683
else:
3684
if uncommitted:
3685
raise errors.BzrCommandError('Cannot use --uncommitted'
3686
' with bundles or merge directives.')
3687
3688
if revision is not None:
3689
raise errors.BzrCommandError(
3690
'Cannot use -r with merge directives or bundles')
3691
merger, verified = _mod_merge.Merger.from_mergeable(tree,
3692
mergeable, pb)
3693
3694
if merger is None and uncommitted:
3695
if revision is not None and len(revision) > 0:
3696
raise errors.BzrCommandError('Cannot use --uncommitted and'
3697
' --revision at the same time.')
3698
merger = self.get_merger_from_uncommitted(tree, location, pb,
3699
cleanups)
3700
allow_pending = False
3701
3702
if merger is None:
3703
merger, allow_pending = self._get_merger_from_branch(tree,
3704
location, revision, remember, possible_transports, pb)
3705
3706
merger.merge_type = merge_type
3707
merger.reprocess = reprocess
3708
merger.show_base = show_base
3709
self.sanity_check_merger(merger)
3710
if (merger.base_rev_id == merger.other_rev_id and
3711
merger.other_rev_id is not None):
3712
note('Nothing to do.')
3713
return 0
3714
if pull:
3715
if merger.interesting_files is not None:
3716
raise errors.BzrCommandError('Cannot pull individual files')
3717
if (merger.base_rev_id == tree.last_revision()):
3718
result = tree.pull(merger.other_branch, False,
3719
merger.other_rev_id)
3720
result.report(self.outf)
3721
return 0
3722
if merger.this_basis is None:
3723
raise errors.BzrCommandError(
3724
"This branch has no commits."
3725
" (perhaps you would prefer 'bzr pull')")
3726
if preview:
3727
return self._do_preview(merger, cleanups)
3728
elif interactive:
3729
return self._do_interactive(merger, cleanups)
3848
3730
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)
3885
return 0
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)
3897
3898
def _get_preview(self, merger):
3731
return self._do_merge(merger, change_reporter, allow_pending,
3732
verified)
3733
finally:
3734
for cleanup in reversed(cleanups):
3735
cleanup()
3736
3737
def _get_preview(self, merger, cleanups):
3899
3738
tree_merger = merger.make_merger()
3900
3739
tt = tree_merger.make_preview_transform()
3901
self.add_cleanup(tt.finalize)
3740
cleanups.append(tt.finalize)
3902
3741
result_tree = tt.get_preview_tree()
3903
3742
return result_tree
3904
3743
3905
def _do_preview(self, merger):
3744
def _do_preview(self, merger, cleanups):
3906
3745
from bzrlib.diff import show_diff_trees
3907
result_tree = self._get_preview(merger)
3746
result_tree = self._get_preview(merger, cleanups)
3908
3747
show_diff_trees(merger.this_tree, result_tree, self.outf,
3909
3748
old_label='', new_label='')
3910
3749
3920
3759
else:
3921
3760
return 0
3922
3761
3923
def _do_interactive(self, merger):
3762
def _do_interactive(self, merger, cleanups):
3924
3763
"""Perform an interactive merge.
3925
3764
3926
3765
This works by generating a preview tree of the merge, then using
3928
3767
and the preview tree.
3929
3768
"""
3930
3769
from bzrlib import shelf_ui
3931
result_tree = self._get_preview(merger)
3770
result_tree = self._get_preview(merger, cleanups)
3932
3771
writer = bzrlib.option.diff_writer_registry.get()
3933
3772
shelver = shelf_ui.Shelver(merger.this_tree, result_tree, destroy=True,
3934
3773
reporter=shelf_ui.ApplyReporter(),
3935
3774
diff_writer=writer(sys.stdout))
3936
try:
3937
shelver.run()
3938
finally:
3939
shelver.finalize()
3775
shelver.run()
3940
3776
3941
3777
def sanity_check_merger(self, merger):
3942
3778
if (merger.show_base and
4002
3838
allow_pending = True
4003
3839
return merger, allow_pending
4004
3840
4005
def get_merger_from_uncommitted(self, tree, location, pb):
3841
def get_merger_from_uncommitted(self, tree, location, pb, cleanups):
4006
3842
"""Get a merger for uncommitted changes.
4007
3843
4008
3844
:param tree: The tree the merger should apply to.
4009
3845
:param location: The location containing uncommitted changes.
4010
3846
:param pb: The progress bar to use for showing progress.
3847
:param cleanups: A list of operations to perform to clean up the
3848
temporary directories, unfinalized objects, etc.
4011
3849
"""
4012
3850
location = self._select_branch_location(tree, location)[0]
4013
3851
other_tree, other_path = WorkingTree.open_containing(location)
4065
3903
4066
3904
4067
3905
class cmd_remerge(Command):
4068
__doc__ = """Redo a merge.
3906
"""Redo a merge.
4069
3907
4070
3908
Use this if you want to try a different merge technique while resolving
4071
3909
conflicts. Some merge techniques are better than others, and remerge
4096
3934
4097
3935
def run(self, file_list=None, merge_type=None, show_base=False,
4098
3936
reprocess=False):
4099
from bzrlib.conflicts import restore
4100
3937
if merge_type is None:
4101
3938
merge_type = _mod_merge.Merge3Merger
4102
3939
tree, file_list = tree_files(file_list)
4103
3940
tree.lock_write()
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
3941
try:
3942
parents = tree.get_parent_ids()
3943
if len(parents) != 2:
3944
raise errors.BzrCommandError("Sorry, remerge only works after normal"
3945
" merges. Not cherrypicking or"
3946
" multi-merges.")
3947
repository = tree.branch.repository
3948
interesting_ids = None
3949
new_conflicts = []
3950
conflicts = tree.conflicts()
3951
if file_list is not None:
3952
interesting_ids = set()
3953
for filename in file_list:
3954
file_id = tree.path2id(filename)
3955
if file_id is None:
3956
raise errors.NotVersionedError(filename)
3957
interesting_ids.add(file_id)
3958
if tree.kind(file_id) != "directory":
3959
continue
4123
3960
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:
3961
for name, ie in tree.inventory.iter_entries(file_id):
3962
interesting_ids.add(ie.file_id)
3963
new_conflicts = conflicts.select_conflicts(tree, file_list)[0]
3964
else:
3965
# Remerge only supports resolving contents conflicts
3966
allowed_conflicts = ('text conflict', 'contents conflict')
3967
restore_files = [c.path for c in conflicts
3968
if c.typestring in allowed_conflicts]
3969
_mod_merge.transform_tree(tree, tree.basis_tree(), interesting_ids)
3970
tree.set_conflicts(ConflictList(new_conflicts))
3971
if file_list is not None:
3972
restore_files = file_list
3973
for filename in restore_files:
3974
try:
3975
restore(tree.abspath(filename))
3976
except errors.NotConflicted:
3977
pass
3978
# Disable pending merges, because the file texts we are remerging
3979
# have not had those merges performed. If we use the wrong parents
3980
# list, we imply that the working tree text has seen and rejected
3981
# all the changes from the other tree, when in fact those changes
3982
# have not yet been seen.
3983
pb = ui.ui_factory.nested_progress_bar()
3984
tree.set_parent_ids(parents[:1])
4137
3985
try:
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()
3986
merger = _mod_merge.Merger.from_revision_ids(pb,
3987
tree, parents[1])
3988
merger.interesting_ids = interesting_ids
3989
merger.merge_type = merge_type
3990
merger.show_base = show_base
3991
merger.reprocess = reprocess
3992
conflicts = merger.do_merge()
3993
finally:
3994
tree.set_parent_ids(parents)
3995
pb.finished()
4154
3996
finally:
4155
tree.set_parent_ids(parents)
3997
tree.unlock()
4156
3998
if conflicts > 0:
4157
3999
return 1
4158
4000
else:
4160
4002
4161
4003
4162
4004
class cmd_revert(Command):
4163
__doc__ = """Revert files to a previous revision.
4005
"""Revert files to a previous revision.
4164
4006
4165
4007
Giving a list of files will revert only those files. Otherwise, all files
4166
4008
will be reverted. If the revision is not specified with '--revision', the
4180
4022
name. If you name a directory, all the contents of that directory will be
4181
4023
reverted.
4182
4024
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.
4025
Any files that have been newly added since that revision will be deleted,
4026
with a backup kept if appropriate. Directories containing unknown files
4027
will not be deleted.
4187
4028
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
4029
The working tree contains a list of pending merged revisions, which will
4030
be included as parents in the next commit. Normally, revert clears that
4031
list as well as reverting the files. If any files are specified, revert
4032
leaves the pending merge list alone and reverts only the files. Use "bzr
4033
revert ." in the tree root to revert all files but keep the merge record,
4034
and "bzr revert --forget-merges" to clear the pending merge list without
4195
4035
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.
4206
4036
"""
4207
4037
4208
4038
_see_also = ['cat', 'export']
4217
4047
def run(self, revision=None, no_backup=False, file_list=None,
4218
4048
forget_merges=None):
4219
4049
tree, file_list = tree_files(file_list)
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)
4050
tree.lock_write()
4051
try:
4052
if forget_merges:
4053
tree.set_parent_ids(tree.get_parent_ids()[:1])
4054
else:
4055
self._revert_tree_to_revision(tree, revision, file_list, no_backup)
4056
finally:
4057
tree.unlock()
4226
4058
4227
4059
@staticmethod
4228
4060
def _revert_tree_to_revision(tree, revision, file_list, no_backup):
4229
4061
rev_tree = _get_one_revision_tree('revert', revision, tree=tree)
4230
tree.revert(file_list, rev_tree, not no_backup, None,
4231
report_changes=True)
4062
pb = ui.ui_factory.nested_progress_bar()
4063
try:
4064
tree.revert(file_list, rev_tree, not no_backup, pb,
4065
report_changes=True)
4066
finally:
4067
pb.finished()
4232
4068
4233
4069
4234
4070
class cmd_assert_fail(Command):
4235
__doc__ = """Test reporting of assertion failures"""
4071
"""Test reporting of assertion failures"""
4236
4072
# intended just for use in testing
4237
4073
4238
4074
hidden = True
4242
4078
4243
4079
4244
4080
class cmd_help(Command):
4245
__doc__ = """Show help on a command or other topic.
4081
"""Show help on a command or other topic.
4246
4082
"""
4247
4083
4248
4084
_see_also = ['topics']
4261
4097
4262
4098
4263
4099
class cmd_shell_complete(Command):
4264
__doc__ = """Show appropriate completions for context.
4100
"""Show appropriate completions for context.
4265
4101
4266
4102
For a list of all available commands, say 'bzr shell-complete'.
4267
4103
"""
4276
4112
4277
4113
4278
4114
class cmd_missing(Command):
4279
__doc__ = """Show unmerged/unpulled revisions between two branches.
4115
"""Show unmerged/unpulled revisions between two branches.
4280
4116
4281
4117
OTHER_BRANCH may be local or remote.
4282
4118
4283
4119
To filter on a range of revisions, you can use the command -r begin..end
4284
4120
-r revision requests a specific revision, -r ..end or -r begin.. are
4285
4121
also valid.
4286
4287
:Exit values:
4288
1 - some missing revisions
4289
0 - no missing revisions
4290
4122
4291
4123
:Examples:
4292
4124
4360
4192
restrict = 'remote'
4361
4193
4362
4194
local_branch = Branch.open_containing(u".")[0]
4363
local_branch.lock_read()
4364
self.add_cleanup(local_branch.unlock)
4365
4366
4195
parent = local_branch.get_parent()
4367
4196
if other_branch is None:
4368
4197
other_branch = parent
4377
4206
remote_branch = Branch.open(other_branch)
4378
4207
if remote_branch.base == local_branch.base:
4379
4208
remote_branch = local_branch
4380
else:
4381
remote_branch.lock_read()
4382
self.add_cleanup(remote_branch.unlock)
4383
4209
4384
4210
local_revid_range = _revision_range_to_revid_range(
4385
4211
_get_revision_range(my_revision, local_branch,
4389
4215
_get_revision_range(revision,
4390
4216
remote_branch, self.name()))
4391
4217
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()
4218
local_branch.lock_read()
4219
try:
4220
remote_branch.lock_read()
4221
try:
4222
local_extra, remote_extra = find_unmerged(
4223
local_branch, remote_branch, restrict,
4224
backward=not reverse,
4225
include_merges=include_merges,
4226
local_revid_range=local_revid_range,
4227
remote_revid_range=remote_revid_range)
4228
4229
if log_format is None:
4230
registry = log.log_formatter_registry
4231
log_format = registry.get_default(local_branch)
4232
lf = log_format(to_file=self.outf,
4233
show_ids=show_ids,
4234
show_timezone='original')
4235
4236
status_code = 0
4237
if local_extra and not theirs_only:
4238
message("You have %d extra revision(s):\n" %
4239
len(local_extra))
4240
for revision in iter_log_revisions(local_extra,
4241
local_branch.repository,
4242
verbose):
4243
lf.log_revision(revision)
4244
printed_local = True
4245
status_code = 1
4246
else:
4247
printed_local = False
4248
4249
if remote_extra and not mine_only:
4250
if printed_local is True:
4251
message("\n\n\n")
4252
message("You are missing %d revision(s):\n" %
4253
len(remote_extra))
4254
for revision in iter_log_revisions(remote_extra,
4255
remote_branch.repository,
4256
verbose):
4257
lf.log_revision(revision)
4258
status_code = 1
4259
4260
if mine_only and not local_extra:
4261
# We checked local, and found nothing extra
4262
message('This branch is up to date.\n')
4263
elif theirs_only and not remote_extra:
4264
# We checked remote, and found nothing extra
4265
message('Other branch is up to date.\n')
4266
elif not (mine_only or theirs_only or local_extra or
4267
remote_extra):
4268
# We checked both branches, and neither one had extra
4269
# revisions
4270
message("Branches are up to date.\n")
4271
finally:
4272
remote_branch.unlock()
4273
finally:
4274
local_branch.unlock()
4442
4275
if not status_code and parent is None and other_branch is not None:
4443
4276
local_branch.lock_write()
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)
4277
try:
4278
# handle race conditions - a parent might be set while we run.
4279
if local_branch.get_parent() is None:
4280
local_branch.set_parent(remote_branch.base)
4281
finally:
4282
local_branch.unlock()
4448
4283
return status_code
4449
4284
4450
4285
4451
4286
class cmd_pack(Command):
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
"""
4287
"""Compress the data within a repository."""
4469
4288
4470
4289
_see_also = ['repositories']
4471
4290
takes_args = ['branch_or_repo?']
4472
takes_options = [
4473
Option('clean-obsolete-packs', 'Delete obsolete packs to save disk space.'),
4474
]
4475
4291
4476
def run(self, branch_or_repo='.', clean_obsolete_packs=False):
4292
def run(self, branch_or_repo='.'):
4477
4293
dir = bzrdir.BzrDir.open_containing(branch_or_repo)[0]
4478
4294
try:
4479
4295
branch = dir.open_branch()
4480
4296
repository = branch.repository
4481
4297
except errors.NotBranchError:
4482
4298
repository = dir.open_repository()
4483
repository.pack(clean_obsolete_packs=clean_obsolete_packs)
4299
repository.pack()
4484
4300
4485
4301
4486
4302
class cmd_plugins(Command):
4487
__doc__ = """List the installed plugins.
4303
"""List the installed plugins.
4488
4304
4489
4305
This command displays the list of installed plugins including
4490
4306
version of plugin and a short description of each.
4497
4313
adding new commands, providing additional network transports and
4498
4314
customizing log output.
4499
4315
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.
4316
See the Bazaar web site, http://bazaar-vcs.org, for further
4317
information on plugins including where to find them and how to
4318
install them. Instructions are also provided there on how to
4319
write new plugins using the Python programming language.
4504
4320
"""
4505
4321
takes_options = ['verbose']
4506
4322
4521
4337
doc = '(no description)'
4522
4338
result.append((name_ver, doc, plugin.path()))
4523
4339
for name_ver, doc, path in sorted(result):
4524
self.outf.write("%s\n" % name_ver)
4525
self.outf.write(" %s\n" % doc)
4340
print name_ver
4341
print ' ', doc
4526
4342
if verbose:
4527
self.outf.write(" %s\n" % path)
4528
self.outf.write("\n")
4343
print ' ', path
4344
print
4529
4345
4530
4346
4531
4347
class cmd_testament(Command):
4532
__doc__ = """Show testament (signing-form) of a revision."""
4348
"""Show testament (signing-form) of a revision."""
4533
4349
takes_options = [
4534
4350
'revision',
4535
4351
Option('long', help='Produce long-format testament.'),
4548
4364
else:
4549
4365
b = Branch.open(branch)
4550
4366
b.lock_read()
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())
4367
try:
4368
if revision is None:
4369
rev_id = b.last_revision()
4370
else:
4371
rev_id = revision[0].as_revision_id(b)
4372
t = testament_class.from_revision(b.repository, rev_id)
4373
if long:
4374
sys.stdout.writelines(t.as_text_lines())
4375
else:
4376
sys.stdout.write(t.as_short_text())
4377
finally:
4378
b.unlock()
4561
4379
4562
4380
4563
4381
class cmd_annotate(Command):
4564
__doc__ = """Show the origin of each line in a file.
4382
"""Show the origin of each line in a file.
4565
4383
4566
4384
This prints out the given file with an annotation on the left side
4567
4385
indicating which revision, author and date introduced the change.
4589
4407
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
4590
4408
if wt is not None:
4591
4409
wt.lock_read()
4592
self.add_cleanup(wt.unlock)
4593
4410
else:
4594
4411
branch.lock_read()
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)
4412
try:
4413
tree = _get_one_revision_tree('annotate', revision, branch=branch)
4414
if wt is not None:
4415
file_id = wt.path2id(relpath)
4416
else:
4417
file_id = tree.path2id(relpath)
4418
if file_id is None:
4419
raise errors.NotVersionedError(filename)
4420
file_version = tree.inventory[file_id].revision
4421
if wt is not None and revision is None:
4422
# If there is a tree and we're not annotating historical
4423
# versions, annotate the working tree's content.
4424
annotate_file_tree(wt, file_id, self.outf, long, all,
4425
show_ids=show_ids)
4426
else:
4427
annotate_file(branch, file_version, file_id, long, all, self.outf,
4428
show_ids=show_ids)
4429
finally:
4430
if wt is not None:
4431
wt.unlock()
4432
else:
4433
branch.unlock()
4614
4434
4615
4435
4616
4436
class cmd_re_sign(Command):
4617
__doc__ = """Create a digital signature for an existing revision."""
4437
"""Create a digital signature for an existing revision."""
4618
4438
# TODO be able to replace existing ones.
4619
4439
4620
4440
hidden = True # is this right ?
4628
4448
raise errors.BzrCommandError('You must supply either --revision or a revision_id')
4629
4449
b = WorkingTree.open_containing(u'.')[0].branch
4630
4450
b.lock_write()
4631
self.add_cleanup(b.unlock)
4632
return self._run(b, revision_id_list, revision)
4451
try:
4452
return self._run(b, revision_id_list, revision)
4453
finally:
4454
b.unlock()
4633
4455
4634
4456
def _run(self, b, revision_id_list, revision):
4635
4457
import bzrlib.gpg as gpg
4680
4502
4681
4503
4682
4504
class cmd_bind(Command):
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.
4505
"""Convert the current branch into a checkout of the supplied branch.
4685
4506
4686
4507
Once converted into a checkout, commits must succeed on the master branch
4687
4508
before they will be applied to the local branch.
4688
4509
4689
4510
Bound branches use the nickname of its master branch unless it is set
4690
locally, in which case binding will update the local nickname to be
4511
locally, in which case binding will update the the local nickname to be
4691
4512
that of the master.
4692
4513
"""
4693
4514
4705
4526
'This format does not remember old locations.')
4706
4527
else:
4707
4528
if location is None:
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')
4529
raise errors.BzrCommandError('No location supplied and no '
4530
'previous location known')
4713
4531
b_other = Branch.open(location)
4714
4532
try:
4715
4533
b.bind(b_other)
4721
4539
4722
4540
4723
4541
class cmd_unbind(Command):
4724
__doc__ = """Convert the current checkout into a regular branch.
4542
"""Convert the current checkout into a regular branch.
4725
4543
4726
4544
After unbinding, the local branch is considered independent and subsequent
4727
4545
commits will be local only.
4738
4556
4739
4557
4740
4558
class cmd_uncommit(Command):
4741
__doc__ = """Remove the last committed revision.
4559
"""Remove the last committed revision.
4742
4560
4743
4561
--verbose will print out what is being removed.
4744
4562
--dry-run will go through all the motions, but not actually
4785
4603
4786
4604
if tree is not None:
4787
4605
tree.lock_write()
4788
self.add_cleanup(tree.unlock)
4789
4606
else:
4790
4607
b.lock_write()
4791
self.add_cleanup(b.unlock)
4792
return self._run(b, tree, dry_run, verbose, revision, force, local=local)
4608
try:
4609
return self._run(b, tree, dry_run, verbose, revision, force,
4610
local=local)
4611
finally:
4612
if tree is not None:
4613
tree.unlock()
4614
else:
4615
b.unlock()
4793
4616
4794
4617
def _run(self, b, tree, dry_run, verbose, revision, force, local=False):
4795
4618
from bzrlib.log import log_formatter, show_log
4827
4650
end_revision=last_revno)
4828
4651
4829
4652
if dry_run:
4830
self.outf.write('Dry-run, pretending to remove'
4831
' the above revisions.\n')
4653
print 'Dry-run, pretending to remove the above revisions.'
4654
if not force:
4655
val = raw_input('Press <enter> to continue')
4832
4656
else:
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
4657
print 'The above revision(s) will be removed.'
4658
if not force:
4659
val = raw_input('Are you sure [y/N]? ')
4660
if val.lower() not in ('y', 'yes'):
4661
print 'Canceled'
4662
return 0
4839
4663
4840
4664
mutter('Uncommitting from {%s} to {%s}',
4841
4665
last_rev_id, rev_id)
4842
4666
uncommit(b, tree=tree, dry_run=dry_run, verbose=verbose,
4843
4667
revno=revno, local=local)
4844
self.outf.write('You can restore the old tip by running:\n'
4845
' bzr pull . -r revid:%s\n' % last_rev_id)
4668
note('You can restore the old tip by running:\n'
4669
' bzr pull . -r revid:%s', last_rev_id)
4846
4670
4847
4671
4848
4672
class cmd_break_lock(Command):
4849
__doc__ = """Break a dead lock on a repository, branch or working directory.
4673
"""Break a dead lock on a repository, branch or working directory.
4850
4674
4851
4675
CAUTION: Locks should only be broken when you are sure that the process
4852
4676
holding the lock has been stopped.
4853
4677
4854
You can get information on what locks are open via the 'bzr info
4855
[location]' command.
4678
You can get information on what locks are open via the 'bzr info' command.
4856
4679
4857
4680
:Examples:
4858
4681
bzr break-lock
4859
bzr break-lock bzr+ssh://example.com/bzr/foo
4860
4682
"""
4861
4683
takes_args = ['location?']
4862
4684
4871
4693
4872
4694
4873
4695
class cmd_wait_until_signalled(Command):
4874
__doc__ = """Test helper for test_start_and_stop_bzr_subprocess_send_signal.
4696
"""Test helper for test_start_and_stop_bzr_subprocess_send_signal.
4875
4697
4876
4698
This just prints a line to signal when it is ready, then blocks on stdin.
4877
4699
"""
4885
4707
4886
4708
4887
4709
class cmd_serve(Command):
4888
__doc__ = """Run the bzr server."""
4710
"""Run the bzr server."""
4889
4711
4890
4712
aliases = ['server']
4891
4713
4892
4714
takes_options = [
4893
4715
Option('inet',
4894
4716
help='Serve on stdin/out for use from inetd or sshd.'),
4895
RegistryOption('protocol',
4896
help="Protocol to serve.",
4717
RegistryOption('protocol',
4718
help="Protocol to serve.",
4897
4719
lazy_registry=('bzrlib.transport', 'transport_server_registry'),
4898
4720
value_switches=True),
4899
4721
Option('port',
4908
4730
Option('allow-writes',
4909
4731
help='By default the server is a readonly server. Supplying '
4910
4732
'--allow-writes enables write access to the contents of '
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.'
4733
'the served directory and below.'
4916
4734
),
4917
4735
]
4918
4736
4951
4769
4952
4770
4953
4771
class cmd_join(Command):
4954
__doc__ = """Combine a tree into its containing tree.
4772
"""Combine a tree into its containing tree.
4955
4773
4956
4774
This command requires the target tree to be in a rich-root format.
4957
4775
4997
4815
4998
4816
4999
4817
class cmd_split(Command):
5000
__doc__ = """Split a subdirectory of a tree into a separate tree.
4818
"""Split a subdirectory of a tree into a separate tree.
5001
4819
5002
4820
This command will produce a target tree in a format that supports
5003
4821
rich roots, like 'rich-root' or 'rich-root-pack'. These formats cannot be
5023
4841
5024
4842
5025
4843
class cmd_merge_directive(Command):
5026
__doc__ = """Generate a merge directive for auto-merge tools.
4844
"""Generate a merge directive for auto-merge tools.
5027
4845
5028
4846
A directive requests a merge to be performed, and also provides all the
5029
4847
information necessary to do so. This means it must either include a
5122
4940
5123
4941
5124
4942
class cmd_send(Command):
5125
__doc__ = """Mail or create a merge-directive for submitting changes.
4943
"""Mail or create a merge-directive for submitting changes.
5126
4944
5127
4945
A merge directive provides many things needed for requesting merges:
5128
4946
5134
4952
directly from the merge directive, without retrieving data from a
5135
4953
branch.
5136
4954
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.
4955
If --no-bundle is specified, then public_branch is needed (and must be
4956
up-to-date), so that the receiver can perform the merge using the
4957
public_branch. The public_branch is always included if known, so that
4958
people can check it later.
4959
4960
The submit branch defaults to the parent, but can be overridden. Both
4961
submit branch and public branch will be remembered if supplied.
4962
4963
If a public_branch is known for the submit_branch, that public submit
4964
branch is used in the merge instructions. This means that a local mirror
4965
can be used as your actual submit branch, once you have set public_branch
4966
for that mirror.
5163
4967
5164
4968
Mail is sent using your preferred mail program. This should be transparent
5165
4969
on Windows (it uses MAPI). On Linux, it requires the xdg-email utility.
5185
4989
5186
4990
The merge directives created by bzr send may be applied using bzr merge or
5187
4991
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.
5192
4992
"""
5193
4993
5194
4994
encoding_type = 'exact'
5210
5010
short_name='f',
5211
5011
type=unicode),
5212
5012
Option('output', short_name='o',
5213
help='Write merge directive to this file or directory; '
5013
help='Write merge directive to this file; '
5214
5014
'use - for stdout.',
5215
5015
type=unicode),
5216
5016
Option('strict',
5239
5039
5240
5040
5241
5041
class cmd_bundle_revisions(cmd_send):
5242
__doc__ = """Create a merge-directive for submitting changes.
5042
"""Create a merge-directive for submitting changes.
5243
5043
5244
5044
A merge directive provides many things needed for requesting merges:
5245
5045
5312
5112
5313
5113
5314
5114
class cmd_tag(Command):
5315
__doc__ = """Create, remove or modify a tag naming a revision.
5115
"""Create, remove or modify a tag naming a revision.
5316
5116
5317
5117
Tags give human-meaningful names to revisions. Commands that take a -r
5318
5118
(--revision) option can be given -rtag:X, where X is any previously
5326
5126
5327
5127
To rename a tag (change the name but keep it on the same revsion), run ``bzr
5328
5128
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.
5334
5129
"""
5335
5130
5336
5131
_see_also = ['commit', 'tags']
5337
takes_args = ['tag_name?']
5132
takes_args = ['tag_name']
5338
5133
takes_options = [
5339
5134
Option('delete',
5340
5135
help='Delete this tag rather than placing it.',
5350
5145
'revision',
5351
5146
]
5352
5147
5353
def run(self, tag_name=None,
5148
def run(self, tag_name,
5354
5149
delete=None,
5355
5150
directory='.',
5356
5151
force=None,
5358
5153
):
5359
5154
branch, relpath = Branch.open_containing(directory)
5360
5155
branch.lock_write()
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)
5156
try:
5157
if delete:
5158
branch.tags.delete_tag(tag_name)
5159
self.outf.write('Deleted tag %s.\n' % tag_name)
5374
5160
else:
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)
5161
if revision:
5162
if len(revision) != 1:
5163
raise errors.BzrCommandError(
5164
"Tags can only be placed on a single revision, "
5165
"not on a range")
5166
revision_id = revision[0].as_revision_id(branch)
5167
else:
5168
revision_id = branch.last_revision()
5169
if (not force) and branch.tags.has_tag(tag_name):
5170
raise errors.TagAlreadyExists(tag_name)
5171
branch.tags.set_tag(tag_name, revision_id)
5172
self.outf.write('Created tag %s.\n' % tag_name)
5173
finally:
5174
branch.unlock()
5385
5175
5386
5176
5387
5177
class cmd_tags(Command):
5388
__doc__ = """List tags.
5178
"""List tags.
5389
5179
5390
5180
This command shows a table of tag names and the revisions they reference.
5391
5181
"""
5420
5210
return
5421
5211
5422
5212
branch.lock_read()
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()
5213
try:
5214
if revision:
5215
graph = branch.repository.get_graph()
5216
rev1, rev2 = _get_revision_range(revision, branch, self.name())
5217
revid1, revid2 = rev1.rev_id, rev2.rev_id
5218
# only show revisions between revid1 and revid2 (inclusive)
5219
tags = [(tag, revid) for tag, revid in tags if
5220
graph.is_between(revid, revid1, revid2)]
5221
if sort == 'alpha':
5222
tags.sort()
5223
elif sort == 'time':
5224
timestamps = {}
5225
for tag, revid in tags:
5226
try:
5227
revobj = branch.repository.get_revision(revid)
5228
except errors.NoSuchRevision:
5229
timestamp = sys.maxint # place them at the end
5230
else:
5231
timestamp = revobj.timestamp
5232
timestamps[revid] = timestamp
5233
tags.sort(key=lambda x: timestamps[x[1]])
5234
if not show_ids:
5235
# [ (tag, revid), ... ] -> [ (tag, dotted_revno), ... ]
5236
for index, (tag, revid) in enumerate(tags):
5237
try:
5238
revno = branch.revision_id_to_dotted_revno(revid)
5239
if isinstance(revno, tuple):
5240
revno = '.'.join(map(str, revno))
5241
except errors.NoSuchRevision:
5242
# Bad tag data/merges can lead to tagged revisions
5243
# which are not in this branch. Fail gracefully ...
5244
revno = '?'
5245
tags[index] = (tag, revno)
5246
finally:
5247
branch.unlock()
5457
5248
for tag, revspec in tags:
5458
5249
self.outf.write('%-20s %s\n' % (tag, revspec))
5459
5250
5460
5251
5461
5252
class cmd_reconfigure(Command):
5462
__doc__ = """Reconfigure the type of a bzr directory.
5253
"""Reconfigure the type of a bzr directory.
5463
5254
5464
5255
A target configuration must be specified.
5465
5256
5550
5341
5551
5342
5552
5343
class cmd_switch(Command):
5553
__doc__ = """Set the branch of a checkout and update.
5344
"""Set the branch of a checkout and update.
5554
5345
5555
5346
For lightweight checkouts, this changes the branch being referenced.
5556
5347
For heavyweight checkouts, this checks that there are no local commits
5568
5359
/path/to/newbranch.
5569
5360
5570
5361
Bound branches use the nickname of its master branch unless it is set
5571
locally, in which case switching will update the local nickname to be
5362
locally, in which case switching will update the the local nickname to be
5572
5363
that of the master.
5573
5364
"""
5574
5365
5575
takes_args = ['to_location?']
5366
takes_args = ['to_location']
5576
5367
takes_options = [Option('force',
5577
5368
help='Switch even if local commits will be lost.'),
5578
'revision',
5579
5369
Option('create-branch', short_name='b',
5580
5370
help='Create the target branch from this one before'
5581
5371
' switching to it.'),
5582
]
5372
]
5583
5373
5584
def run(self, to_location=None, force=False, create_branch=False,
5585
revision=None):
5374
def run(self, to_location, force=False, create_branch=False):
5586
5375
from bzrlib import switch
5587
5376
tree_location = '.'
5588
revision = _get_one_revision('switch', revision)
5589
5377
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 = '.'
5595
5378
try:
5596
5379
branch = control_dir.open_branch()
5597
5380
had_explicit_nick = branch.get_config().has_explicit_nickname()
5602
5385
if branch is None:
5603
5386
raise errors.BzrCommandError('cannot create branch without'
5604
5387
' source branch')
5605
to_location = directory_service.directories.dereference(
5606
to_location)
5607
5388
if '/' not in to_location and '\\' not in to_location:
5608
5389
# This path is meant to be relative to the existing branch
5609
5390
this_url = self._get_branch_location(control_dir)
5611
5392
to_branch = branch.bzrdir.sprout(to_location,
5612
5393
possible_transports=[branch.bzrdir.root_transport],
5613
5394
source_branch=branch).open_branch()
5395
# try:
5396
# from_branch = control_dir.open_branch()
5397
# except errors.NotBranchError:
5398
# raise BzrCommandError('Cannot create a branch from this'
5399
# ' location when we cannot open this branch')
5400
# from_branch.bzrdir.sprout(
5401
pass
5614
5402
else:
5615
5403
try:
5616
5404
to_branch = Branch.open(to_location)
5618
5406
this_url = self._get_branch_location(control_dir)
5619
5407
to_branch = Branch.open(
5620
5408
urlutils.join(this_url, '..', to_location))
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)
5409
switch.switch(control_dir, to_branch, force)
5624
5410
if had_explicit_nick:
5625
5411
branch = control_dir.open_branch() #get the new branch!
5626
5412
branch.nick = to_branch.nick
5646
5432
5647
5433
5648
5434
class cmd_view(Command):
5649
__doc__ = """Manage filtered views.
5435
"""Manage filtered views.
5650
5436
5651
5437
Views provide a mask over the tree so that users can focus on
5652
5438
a subset of a tree when doing their work. After creating a view,
5800
5586
5801
5587
5802
5588
class cmd_hooks(Command):
5803
__doc__ = """Show hooks."""
5589
"""Show hooks."""
5804
5590
5805
5591
hidden = True
5806
5592
5819
5605
self.outf.write(" <no hooks installed>\n")
5820
5606
5821
5607
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
5847
5608
class cmd_shelve(Command):
5848
__doc__ = """Temporarily set aside some changes from the current tree.
5609
"""Temporarily set aside some changes from the current tree.
5849
5610
5850
5611
Shelve allows you to temporarily put changes you've made "on the shelf",
5851
5612
ie. out of the way, until a later time when you can bring them back from
5898
5659
try:
5899
5660
shelver.run()
5900
5661
finally:
5901
shelver.finalize()
5662
shelver.work_tree.unlock()
5902
5663
except errors.UserAbort:
5903
5664
return 0
5904
5665
5905
5666
def run_for_list(self):
5906
5667
tree = WorkingTree.open_containing('.')[0]
5907
5668
tree.lock_read()
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
5669
try:
5670
manager = tree.get_shelf_manager()
5671
shelves = manager.active_shelves()
5672
if len(shelves) == 0:
5673
note('No shelved changes.')
5674
return 0
5675
for shelf_id in reversed(shelves):
5676
message = manager.get_metadata(shelf_id).get('message')
5677
if message is None:
5678
message = '<no message>'
5679
self.outf.write('%3d: %s\n' % (shelf_id, message))
5680
return 1
5681
finally:
5682
tree.unlock()
5920
5683
5921
5684
5922
5685
class cmd_unshelve(Command):
5923
__doc__ = """Restore shelved changes.
5686
"""Restore shelved changes.
5924
5687
5925
5688
By default, the most recently shelved changes are restored. However if you
5926
5689
specify a shelf by id those changes will be restored instead. This works
5934
5697
enum_switch=False, value_switches=True,
5935
5698
apply="Apply changes and remove from the shelf.",
5936
5699
dry_run="Show changes, but do not apply or remove 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.",
5700
delete_only="Delete changes without applying them."
5941
5701
)
5942
5702
]
5943
5703
_see_also = ['shelve']
5952
5712
5953
5713
5954
5714
class cmd_clean_tree(Command):
5955
__doc__ = """Remove unwanted files from working tree.
5715
"""Remove unwanted files from working tree.
5956
5716
5957
5717
By default, only unknown files, not ignored files, are deleted. Versioned
5958
5718
files are never deleted.
5986
5746
5987
5747
5988
5748
class cmd_reference(Command):
5989
__doc__ = """list, view and set branch locations for nested trees.
5749
"""list, view and set branch locations for nested trees.
5990
5750
5991
5751
If no arguments are provided, lists the branch locations for nested trees.
5992
5752
If one argument is provided, display the branch location for that tree.
6032
5792
self.outf.write('%s %s\n' % (path, location))
6033
5793
6034
5794
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)
5795
# these get imported and then picked up by the scan for cmd_*
5796
# TODO: Some more consistent way to split command definitions across files;
5797
# we do need to load at least some information about them to know of
5798
# aliases. ideally we would avoid loading the implementation until the
5799
# details were needed.
5800
from bzrlib.cmd_version_info import cmd_version_info
5801
from bzrlib.conflicts import cmd_resolve, cmd_conflicts, restore
5802
from bzrlib.bundle.commands import (
5803
cmd_bundle_info,
5804
)
5805
from bzrlib.foreign import cmd_dpush
5806
from bzrlib.sign_my_commits import cmd_sign_my_commits
5807
from bzrlib.weave_commands import cmd_versionedfile_list, \
5808
cmd_weave_plan_merge, cmd_weave_merge_text
Loggerhead is a web-based interface for Breezy
Version: 2.0.1