« back to all changes in this revision
Viewing changes to bzrlib/builtins.py
- browse files at revision 4792.4.1
- compare with another revision
- download diff
- download tarball
- view history from revision 4792.4.1
- Committer: Gordon Tyler
- Date: 2009-11-11 21:38:02 UTC
- mto: This revision was merged to the branch mainline in revision 4801.
- Revision ID: gordon@doxxx.net-20091111213802-wj8d2fgirjd7saqn
Fixed globbing.normalize_pattern to not strip '/' down to '' and normalize multiple slashes.
- 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
- 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)
434
refs_as_tuples = tuple([tuple([tuple(ref) for ref in ref_list])
435
for ref_list in node[3]])
469
436
as_tuple = (tuple(node[1]), node[2], refs_as_tuples)
470
437
self.outf.write('%s\n' % (as_tuple,))
471
438
472
439
473
440
class cmd_remove_tree(Command):
474
__doc__ = """Remove the working tree from a given branch/checkout.
441
"""Remove the working tree from a given branch/checkout.
475
442
476
443
Since a lightweight checkout is little more than a working tree
477
444
this will refuse to run against one.
479
446
To re-create the working tree, use "bzr checkout".
480
447
"""
481
448
_see_also = ['checkout', 'working-trees']
482
takes_args = ['location*']
449
takes_args = ['location?']
483
450
takes_options = [
484
451
Option('force',
485
452
help='Remove the working tree even if it has '
486
453
'uncommitted changes.'),
487
454
]
488
455
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()
456
def run(self, location='.', force=False):
457
d = bzrdir.BzrDir.open(location)
458
459
try:
460
working = d.open_workingtree()
461
except errors.NoWorkingTree:
462
raise errors.BzrCommandError("No working tree to remove")
463
except errors.NotLocalUrl:
464
raise errors.BzrCommandError("You cannot remove the working tree"
465
" of a remote path")
466
if not force:
467
if (working.has_changes()):
468
raise errors.UncommittedChanges(working)
469
470
working_path = working.bzrdir.root_transport.base
471
branch_path = working.branch.bzrdir.root_transport.base
472
if working_path != branch_path:
473
raise errors.BzrCommandError("You cannot remove the working tree"
474
" from a lightweight checkout")
475
476
d.destroy_workingtree()
512
477
513
478
514
479
class cmd_revno(Command):
515
__doc__ = """Show current revision number.
480
"""Show current revision number.
516
481
517
482
This is equal to the number of revisions on this branch.
518
483
"""
531
496
wt.lock_read()
532
497
except (errors.NoWorkingTree, errors.NotLocalUrl):
533
498
raise errors.NoWorkingTree(location)
534
self.add_cleanup(wt.unlock)
535
revid = wt.last_revision()
536
499
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)
500
revid = wt.last_revision()
501
try:
502
revno_t = wt.branch.revision_id_to_dotted_revno(revid)
503
except errors.NoSuchRevision:
504
revno_t = ('???',)
505
revno = ".".join(str(n) for n in revno_t)
506
finally:
507
wt.unlock()
541
508
else:
542
509
b = Branch.open_containing(location)[0]
543
510
b.lock_read()
544
self.add_cleanup(b.unlock)
545
revno = b.revno()
546
self.cleanup_now()
511
try:
512
revno = b.revno()
513
finally:
514
b.unlock()
515
547
516
self.outf.write(str(revno) + '\n')
548
517
549
518
550
519
class cmd_revision_info(Command):
551
__doc__ = """Show revision number and revision id for a given revision identifier.
520
"""Show revision number and revision id for a given revision identifier.
552
521
"""
553
522
hidden = True
554
523
takes_args = ['revision_info*']
571
540
wt = WorkingTree.open_containing(directory)[0]
572
541
b = wt.branch
573
542
wt.lock_read()
574
self.add_cleanup(wt.unlock)
575
543
except (errors.NoWorkingTree, errors.NotLocalUrl):
576
544
wt = None
577
545
b = Branch.open_containing(directory)[0]
578
546
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())
547
try:
548
revision_ids = []
549
if revision is not None:
550
revision_ids.extend(rev.as_revision_id(b) for rev in revision)
551
if revision_info_list is not None:
552
for rev_str in revision_info_list:
553
rev_spec = RevisionSpec.from_string(rev_str)
554
revision_ids.append(rev_spec.as_revision_id(b))
555
# No arguments supplied, default to the last revision
556
if len(revision_ids) == 0:
557
if tree:
558
if wt is None:
559
raise errors.NoWorkingTree(directory)
560
revision_ids.append(wt.last_revision())
561
else:
562
revision_ids.append(b.last_revision())
563
564
revinfos = []
565
maxlen = 0
566
for revision_id in revision_ids:
567
try:
568
dotted_revno = b.revision_id_to_dotted_revno(revision_id)
569
revno = '.'.join(str(i) for i in dotted_revno)
570
except errors.NoSuchRevision:
571
revno = '???'
572
maxlen = max(maxlen, len(revno))
573
revinfos.append([revno, revision_id])
574
finally:
575
if wt is None:
576
b.unlock()
593
577
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()
578
wt.unlock()
579
608
580
for ri in revinfos:
609
581
self.outf.write('%*s %s\n' % (maxlen, ri[0], ri[1]))
610
582
611
583
612
584
class cmd_add(Command):
613
__doc__ = """Add specified files or directories.
585
"""Add specified files or directories.
614
586
615
587
In non-recursive mode, all the named items are added, regardless
616
588
of whether they were previously ignored. A warning is given if
682
654
683
655
if base_tree:
684
656
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()
657
try:
658
tree, file_list = tree_files_for_add(file_list)
659
added, ignored = tree.smart_add(file_list, not
660
no_recurse, action=action, save=not dry_run)
661
finally:
662
if base_tree is not None:
663
base_tree.unlock()
690
664
if len(ignored) > 0:
691
665
if verbose:
692
666
for glob in sorted(ignored.keys()):
696
670
697
671
698
672
class cmd_mkdir(Command):
699
__doc__ = """Create a new versioned directory.
673
"""Create a new versioned directory.
700
674
701
675
This is equivalent to creating the directory and then adding it.
702
676
"""
706
680
707
681
def run(self, dir_list):
708
682
for d in dir_list:
683
os.mkdir(d)
709
684
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)
685
wt.add([dd])
686
self.outf.write('added %s\n' % d)
718
687
719
688
720
689
class cmd_relpath(Command):
721
__doc__ = """Show path of a file relative to root"""
690
"""Show path of a file relative to root"""
722
691
723
692
takes_args = ['filename']
724
693
hidden = True
733
702
734
703
735
704
class cmd_inventory(Command):
736
__doc__ = """Show inventory of the current working copy or a revision.
705
"""Show inventory of the current working copy or a revision.
737
706
738
707
It is possible to limit the output to a particular entry
739
708
type using the --kind option. For example: --kind file.
761
730
revision = _get_one_revision('inventory', revision)
762
731
work_tree, file_list = tree_files(file_list)
763
732
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()
733
try:
734
if revision is not None:
735
tree = revision.as_tree(work_tree.branch)
736
737
extra_trees = [work_tree]
738
tree.lock_read()
739
else:
740
tree = work_tree
741
extra_trees = []
742
743
if file_list is not None:
744
file_ids = tree.paths2ids(file_list, trees=extra_trees,
745
require_versioned=True)
746
# find_ids_across_trees may include some paths that don't
747
# exist in 'tree'.
748
entries = sorted((tree.id2path(file_id), tree.inventory[file_id])
749
for file_id in file_ids if file_id in tree)
750
else:
751
entries = tree.inventory.entries()
752
finally:
753
tree.unlock()
754
if tree is not work_tree:
755
work_tree.unlock()
756
786
757
for path, entry in entries:
787
758
if kind and kind != entry.kind:
788
759
continue
794
765
795
766
796
767
class cmd_mv(Command):
797
__doc__ = """Move or rename a file.
768
"""Move or rename a file.
798
769
799
770
:Usage:
800
771
bzr mv OLDNAME NEWNAME
834
805
raise errors.BzrCommandError("missing file argument")
835
806
tree, rel_names = tree_files(names_list, canonicalize=False)
836
807
tree.lock_tree_write()
837
self.add_cleanup(tree.unlock)
838
self._run(tree, names_list, rel_names, after)
808
try:
809
self._run(tree, names_list, rel_names, after)
810
finally:
811
tree.unlock()
839
812
840
813
def run_auto(self, names_list, after, dry_run):
841
814
if names_list is not None and len(names_list) > 1:
846
819
' --auto.')
847
820
work_tree, file_list = tree_files(names_list, default_branch='.')
848
821
work_tree.lock_tree_write()
849
self.add_cleanup(work_tree.unlock)
850
rename_map.RenameMap.guess_renames(work_tree, dry_run)
822
try:
823
rename_map.RenameMap.guess_renames(work_tree, dry_run)
824
finally:
825
work_tree.unlock()
851
826
852
827
def _run(self, tree, names_list, rel_names, after):
853
828
into_existing = osutils.isdir(names_list[-1])
874
849
# All entries reference existing inventory items, so fix them up
875
850
# for cicp file-systems.
876
851
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))
852
for pair in tree.move(rel_names[:-1], rel_names[-1], after=after):
853
self.outf.write("%s => %s\n" % pair)
880
854
else:
881
855
if len(names_list) != 2:
882
856
raise errors.BzrCommandError('to mv multiple files the'
926
900
dest = osutils.pathjoin(dest_parent, dest_tail)
927
901
mutter("attempting to move %s => %s", src, dest)
928
902
tree.rename_one(src, dest, after=after)
929
if not is_quiet():
930
self.outf.write("%s => %s\n" % (src, dest))
903
self.outf.write("%s => %s\n" % (src, dest))
931
904
932
905
933
906
class cmd_pull(Command):
934
__doc__ = """Turn this branch into a mirror of another branch.
907
"""Turn this branch into a mirror of another branch.
935
908
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.
909
This command only works on branches that have not diverged. Branches are
910
considered diverged if the destination branch's most recent commit is one
911
that has not been merged (directly or indirectly) into the parent.
940
912
941
913
If branches have diverged, you can use 'bzr merge' to integrate the changes
942
914
from one into the other. Once one branch has merged, the other should
943
915
be able to pull it again.
944
916
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.
917
If you want to forget your local changes and just update your branch to
918
match the remote one, use pull --overwrite.
948
919
949
920
If there is no default location set, the first pull will set it. After
950
921
that, you can omit the location to use the default. To change the
986
957
try:
987
958
tree_to = WorkingTree.open_containing(directory)[0]
988
959
branch_to = tree_to.branch
989
tree_to.lock_write()
990
self.add_cleanup(tree_to.unlock)
991
960
except errors.NoWorkingTree:
992
961
tree_to = None
993
962
branch_to = Branch.open_containing(directory)[0]
994
branch_to.lock_write()
995
self.add_cleanup(branch_to.unlock)
996
963
997
964
if local and not branch_to.get_bound_location():
998
965
raise errors.LocalRequiresBoundBranch()
999
966
1029
996
else:
1030
997
branch_from = Branch.open(location,
1031
998
possible_transports=possible_transports)
1032
branch_from.lock_read()
1033
self.add_cleanup(branch_from.unlock)
1034
999
1035
1000
if branch_to.get_parent() is None or remember:
1036
1001
branch_to.set_parent(branch_from.base)
1037
1002
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)
1003
if branch_from is not branch_to:
1004
branch_from.lock_read()
1005
try:
1006
if revision is not None:
1007
revision_id = revision.as_revision_id(branch_from)
1008
1009
branch_to.lock_write()
1010
try:
1011
if tree_to is not None:
1012
view_info = _get_view_info_for_change_reporter(tree_to)
1013
change_reporter = delta._ChangeReporter(
1014
unversioned_filter=tree_to.is_ignored,
1015
view_info=view_info)
1016
result = tree_to.pull(
1017
branch_from, overwrite, revision_id, change_reporter,
1018
possible_transports=possible_transports, local=local)
1019
else:
1020
result = branch_to.pull(
1021
branch_from, overwrite, revision_id, local=local)
1022
1023
result.report(self.outf)
1024
if verbose and result.old_revid != result.new_revid:
1025
log.show_branch_change(
1026
branch_to, self.outf, result.old_revno,
1027
result.old_revid)
1028
finally:
1029
branch_to.unlock()
1030
finally:
1031
if branch_from is not branch_to:
1032
branch_from.unlock()
1058
1033
1059
1034
1060
1035
class cmd_push(Command):
1061
__doc__ = """Update a mirror of this branch.
1036
"""Update a mirror of this branch.
1062
1037
1063
1038
The target branch will not have its working tree populated because this
1064
1039
is both expensive, and is not supported on remote file systems.
1125
1100
# Get the source branch
1126
1101
(tree, br_from,
1127
1102
_unused) = bzrdir.BzrDir.open_containing_tree_or_branch(directory)
1103
if strict is None:
1104
strict = br_from.get_config().get_user_option_as_bool('push_strict')
1105
if strict is None: strict = True # default value
1128
1106
# Get the tip's revision_id
1129
1107
revision = _get_one_revision('push', revision)
1130
1108
if revision is not None:
1131
1109
revision_id = revision.in_history(br_from).rev_id
1132
1110
else:
1133
1111
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.')
1112
if strict and tree is not None and revision_id is None:
1113
if (tree.has_changes()):
1114
raise errors.UncommittedChanges(
1115
tree, more='Use --no-strict to force the push.')
1116
if tree.last_revision() != tree.branch.last_revision():
1117
# The tree has lost sync with its branch, there is little
1118
# chance that the user is aware of it but he can still force
1119
# the push with --no-strict
1120
raise errors.OutOfDateTree(
1121
tree, more='Use --no-strict to force the push.')
1122
1139
1123
# Get the stacked_on branch, if any
1140
1124
if stacked_on is not None:
1141
1125
stacked_on = urlutils.normalize_url(stacked_on)
1173
1157
1174
1158
1175
1159
class cmd_branch(Command):
1176
__doc__ = """Create a new branch that is a copy of an existing branch.
1160
"""Create a new branch that is a copy of an existing branch.
1177
1161
1178
1162
If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will
1179
1163
be used. In other words, "branch ../foo/bar" will attempt to create ./bar.
1206
1190
' directory exists, but does not already'
1207
1191
' have a control directory. This flag will'
1208
1192
' allow branch to proceed.'),
1209
Option('bind',
1210
help="Bind new branch to from location."),
1211
1193
]
1212
1194
aliases = ['get', 'clone']
1213
1195
1214
1196
def run(self, from_location, to_location=None, revision=None,
1215
1197
hardlink=False, stacked=False, standalone=False, no_tree=False,
1216
use_existing_dir=False, switch=False, bind=False):
1198
use_existing_dir=False, switch=False):
1217
1199
from bzrlib import switch as _mod_switch
1218
1200
from bzrlib.tag import _merge_tags_if_possible
1219
1201
accelerator_tree, br_from = bzrdir.BzrDir.open_tree_or_branch(
1220
1202
from_location)
1203
if (accelerator_tree is not None and
1204
accelerator_tree.supports_content_filtering()):
1205
accelerator_tree = None
1221
1206
revision = _get_one_revision('branch', revision)
1222
1207
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
1208
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)
1209
if revision is not None:
1210
revision_id = revision.as_revision_id(br_from)
1240
1211
else:
1241
try:
1242
bzrdir.BzrDir.open_from_transport(to_transport)
1243
except errors.NotBranchError:
1244
pass
1212
# FIXME - wt.last_revision, fallback to branch, fall back to
1213
# None or perhaps NULL_REVISION to mean copy nothing
1214
# RBC 20060209
1215
revision_id = br_from.last_revision()
1216
if to_location is None:
1217
to_location = urlutils.derive_to_location(from_location)
1218
to_transport = transport.get_transport(to_location)
1219
try:
1220
to_transport.mkdir('.')
1221
except errors.FileExists:
1222
if not use_existing_dir:
1223
raise errors.BzrCommandError('Target directory "%s" '
1224
'already exists.' % to_location)
1245
1225
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'))
1226
try:
1227
bzrdir.BzrDir.open_from_transport(to_transport)
1228
except errors.NotBranchError:
1229
pass
1230
else:
1231
raise errors.AlreadyBranchError(to_location)
1232
except errors.NoSuchFile:
1233
raise errors.BzrCommandError('Parent of "%s" does not exist.'
1234
% to_location)
1235
try:
1236
# preserve whatever source format we have.
1237
dir = br_from.bzrdir.sprout(to_transport.base, revision_id,
1238
possible_transports=[to_transport],
1239
accelerator_tree=accelerator_tree,
1240
hardlink=hardlink, stacked=stacked,
1241
force_new_repo=standalone,
1242
create_tree_if_local=not no_tree,
1243
source_branch=br_from)
1244
branch = dir.open_branch()
1245
except errors.NoSuchRevision:
1246
to_transport.delete_tree('.')
1247
msg = "The branch %s has no revision %s." % (from_location,
1248
revision)
1249
raise errors.BzrCommandError(msg)
1250
_merge_tags_if_possible(br_from, branch)
1251
# If the source branch is stacked, the new branch may
1252
# be stacked whether we asked for that explicitly or not.
1253
# We therefore need a try/except here and not just 'if stacked:'
1254
try:
1255
note('Created new stacked branch referring to %s.' %
1256
branch.get_stacked_on_url())
1257
except (errors.NotStacked, errors.UnstackableBranchFormat,
1258
errors.UnstackableRepositoryFormat), e:
1259
note('Branched %d revision(s).' % branch.revno())
1260
if switch:
1261
# Switch to the new branch
1262
wt, _ = WorkingTree.open_containing('.')
1263
_mod_switch.switch(wt.bzrdir, branch)
1264
note('Switched to branch: %s',
1265
urlutils.unescape_for_display(branch.base, 'utf-8'))
1266
finally:
1267
br_from.unlock()
1286
1268
1287
1269
1288
1270
class cmd_checkout(Command):
1289
__doc__ = """Create a new checkout of an existing branch.
1271
"""Create a new checkout of an existing branch.
1290
1272
1291
1273
If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree for
1292
1274
the branch found in '.'. This is useful if you have removed the working tree
1355
1337
1356
1338
1357
1339
class cmd_renames(Command):
1358
__doc__ = """Show list of renamed files.
1340
"""Show list of renamed files.
1359
1341
"""
1360
1342
# TODO: Option to show renames between two historical versions.
1361
1343
1367
1349
def run(self, dir=u'.'):
1368
1350
tree = WorkingTree.open_containing(dir)[0]
1369
1351
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))
1352
try:
1353
new_inv = tree.inventory
1354
old_tree = tree.basis_tree()
1355
old_tree.lock_read()
1356
try:
1357
old_inv = old_tree.inventory
1358
renames = []
1359
iterator = tree.iter_changes(old_tree, include_unchanged=True)
1360
for f, paths, c, v, p, n, k, e in iterator:
1361
if paths[0] == paths[1]:
1362
continue
1363
if None in (paths):
1364
continue
1365
renames.append(paths)
1366
renames.sort()
1367
for old_name, new_name in renames:
1368
self.outf.write("%s => %s\n" % (old_name, new_name))
1369
finally:
1370
old_tree.unlock()
1371
finally:
1372
tree.unlock()
1387
1373
1388
1374
1389
1375
class cmd_update(Command):
1390
__doc__ = """Update a tree to have the latest code committed to its branch.
1376
"""Update a tree to have the latest code committed to its branch.
1391
1377
1392
1378
This will perform a merge into the working tree, and may generate
1393
1379
conflicts. If you have any local changes, you will still
1395
1381
1396
1382
If you want to discard your local changes, you can just do a
1397
1383
'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
1384
"""
1402
1385
1403
1386
_see_also = ['pull', 'working-trees', 'status-flags']
1404
1387
takes_args = ['dir?']
1405
takes_options = ['revision']
1406
1388
aliases = ['up']
1407
1389
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")
1390
def run(self, dir='.'):
1412
1391
tree = WorkingTree.open_containing(dir)[0]
1413
branch = tree.branch
1414
1392
possible_transports = []
1415
master = branch.get_master_branch(
1393
master = tree.branch.get_master_branch(
1416
1394
possible_transports=possible_transports)
1417
1395
if master is not None:
1418
1396
tree.lock_write()
1419
branch_location = master.base
1420
1397
else:
1421
1398
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
1399
try:
1400
existing_pending_merges = tree.get_parent_ids()[1:]
1401
last_rev = _mod_revision.ensure_null(tree.last_revision())
1402
if last_rev == _mod_revision.ensure_null(
1403
tree.branch.last_revision()):
1404
# may be up to date, check master too.
1405
if master is None or last_rev == _mod_revision.ensure_null(
1406
master.last_revision()):
1407
revno = tree.branch.revision_id_to_revno(last_rev)
1408
note("Tree is up to date at revision %d." % (revno,))
1409
return 0
1410
view_info = _get_view_info_for_change_reporter(tree)
1450
1411
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
1412
delta._ChangeReporter(unversioned_filter=tree.is_ignored,
1413
view_info=view_info), possible_transports=possible_transports)
1414
revno = tree.branch.revision_id_to_revno(
1415
_mod_revision.ensure_null(tree.last_revision()))
1416
note('Updated to revision %d.' % (revno,))
1417
if tree.get_parent_ids()[1:] != existing_pending_merges:
1418
note('Your local commits will now show as pending merges with '
1419
"'bzr status', and can be committed with 'bzr commit'.")
1420
if conflicts != 0:
1421
return 1
1422
else:
1423
return 0
1424
finally:
1425
tree.unlock()
1473
1426
1474
1427
1475
1428
class cmd_info(Command):
1476
__doc__ = """Show information about a working tree, branch or repository.
1429
"""Show information about a working tree, branch or repository.
1477
1430
1478
1431
This command will show all known locations and formats associated to the
1479
1432
tree, branch or repository.
1517
1470
1518
1471
1519
1472
class cmd_remove(Command):
1520
__doc__ = """Remove files or directories.
1473
"""Remove files or directories.
1521
1474
1522
1475
This makes bzr stop tracking changes to the specified files. bzr will delete
1523
1476
them if they can easily be recovered using revert. If no options or
1546
1499
file_list = [f for f in file_list]
1547
1500
1548
1501
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')
1502
try:
1503
# Heuristics should probably all move into tree.remove_smart or
1504
# some such?
1505
if new:
1506
added = tree.changes_from(tree.basis_tree(),
1507
specific_files=file_list).added
1508
file_list = sorted([f[0] for f in added], reverse=True)
1509
if len(file_list) == 0:
1510
raise errors.BzrCommandError('No matching files.')
1511
elif file_list is None:
1512
# missing files show up in iter_changes(basis) as
1513
# versioned-with-no-kind.
1514
missing = []
1515
for change in tree.iter_changes(tree.basis_tree()):
1516
# Find paths in the working tree that have no kind:
1517
if change[1][1] is not None and change[6][1] is None:
1518
missing.append(change[1][1])
1519
file_list = sorted(missing, reverse=True)
1520
file_deletion_strategy = 'keep'
1521
tree.remove(file_list, verbose=verbose, to_file=self.outf,
1522
keep_files=file_deletion_strategy=='keep',
1523
force=file_deletion_strategy=='force')
1524
finally:
1525
tree.unlock()
1571
1526
1572
1527
1573
1528
class cmd_file_id(Command):
1574
__doc__ = """Print file_id of a particular file or directory.
1529
"""Print file_id of a particular file or directory.
1575
1530
1576
1531
The file_id is assigned when the file is first added and remains the
1577
1532
same through all revisions where the file exists, even when it is
1593
1548
1594
1549
1595
1550
class cmd_file_path(Command):
1596
__doc__ = """Print path of file_ids to a file or directory.
1551
"""Print path of file_ids to a file or directory.
1597
1552
1598
1553
This prints one line for each directory down to the target,
1599
1554
starting at the branch root.
1615
1570
1616
1571
1617
1572
class cmd_reconcile(Command):
1618
__doc__ = """Reconcile bzr metadata in a branch.
1573
"""Reconcile bzr metadata in a branch.
1619
1574
1620
1575
This can correct data mismatches that may have been caused by
1621
1576
previous ghost operations or bzr upgrades. You should only
1643
1598
1644
1599
1645
1600
class cmd_revision_history(Command):
1646
__doc__ = """Display the list of revision ids on a branch."""
1601
"""Display the list of revision ids on a branch."""
1647
1602
1648
1603
_see_also = ['log']
1649
1604
takes_args = ['location?']
1659
1614
1660
1615
1661
1616
class cmd_ancestry(Command):
1662
__doc__ = """List all revisions merged into this branch."""
1617
"""List all revisions merged into this branch."""
1663
1618
1664
1619
_see_also = ['log', 'revision-history']
1665
1620
takes_args = ['location?']
1684
1639
1685
1640
1686
1641
class cmd_init(Command):
1687
__doc__ = """Make a directory into a versioned branch.
1642
"""Make a directory into a versioned branch.
1688
1643
1689
1644
Use this to create an empty branch, or before importing an
1690
1645
existing project.
1793
1748
1794
1749
1795
1750
class cmd_init_repository(Command):
1796
__doc__ = """Create a shared repository for branches to share storage space.
1751
"""Create a shared repository to hold branches.
1797
1752
1798
1753
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.
1754
revisions in the repository, not in the branch directory.
1802
1755
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.
1756
If the --no-trees option is used then the branches in the repository
1757
will not have working trees by default.
1809
1758
1810
1759
:Examples:
1811
Create a shared repository holding just branches::
1760
Create a shared repositories holding just branches::
1812
1761
1813
1762
bzr init-repo --no-trees repo
1814
1763
bzr init repo/trunk
1853
1802
1854
1803
1855
1804
class cmd_diff(Command):
1856
__doc__ = """Show differences in the working tree, between revisions or branches.
1805
"""Show differences in the working tree, between revisions or branches.
1857
1806
1858
1807
If no arguments are given, all changes for the current tree are listed.
1859
1808
If files are given, only the changes in those files are listed.
1880
1829
1881
1830
bzr diff -r1
1882
1831
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
1832
Difference between revision 2 and revision 1::
1833
1834
bzr diff -r1..2
1835
1836
Difference between revision 2 and revision 1 for branch xxx::
1837
1838
bzr diff -r1..2 xxx
1904
1839
1905
1840
Show just the differences for file NEWS::
1906
1841
1945
1880
help='Use this command to compare files.',
1946
1881
type=unicode,
1947
1882
),
1948
RegistryOption('format',
1949
help='Diff format to use.',
1950
lazy_registry=('bzrlib.diff', 'format_registry'),
1951
value_switches=False, title='Diff format'),
1952
1883
]
1953
1884
aliases = ['di', 'dif']
1954
1885
encoding_type = 'exact'
1955
1886
1956
1887
@display_command
1957
1888
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)
1889
prefix=None, old=None, new=None, using=None):
1890
from bzrlib.diff import get_trees_and_branches_to_diff, show_diff_trees
1961
1891
1962
1892
if (prefix is None) or (prefix == '0'):
1963
1893
# diff -p0 format
1977
1907
raise errors.BzrCommandError('bzr diff --revision takes exactly'
1978
1908
' one or two revision specifiers')
1979
1909
1980
if using is not None and format is not None:
1981
raise errors.BzrCommandError('--using and --format are mutually '
1982
'exclusive.')
1983
1984
1910
(old_tree, new_tree,
1985
1911
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)
1912
specific_files, extra_trees) = get_trees_and_branches_to_diff(
1913
file_list, revision, old, new, apply_view=True)
1988
1914
return show_diff_trees(old_tree, new_tree, sys.stdout,
1989
1915
specific_files=specific_files,
1990
1916
external_diff_options=diff_options,
1991
1917
old_label=old_label, new_label=new_label,
1992
extra_trees=extra_trees, using=using,
1993
format_cls=format)
1918
extra_trees=extra_trees, using=using)
1994
1919
1995
1920
1996
1921
class cmd_deleted(Command):
1997
__doc__ = """List files deleted in the working tree.
1922
"""List files deleted in the working tree.
1998
1923
"""
1999
1924
# TODO: Show files deleted since a previous revision, or
2000
1925
# between two revisions.
2009
1934
def run(self, show_ids=False):
2010
1935
tree = WorkingTree.open_containing(u'.')[0]
2011
1936
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')
1937
try:
1938
old = tree.basis_tree()
1939
old.lock_read()
1940
try:
1941
for path, ie in old.inventory.iter_entries():
1942
if not tree.has_id(ie.file_id):
1943
self.outf.write(path)
1944
if show_ids:
1945
self.outf.write(' ')
1946
self.outf.write(ie.file_id)
1947
self.outf.write('\n')
1948
finally:
1949
old.unlock()
1950
finally:
1951
tree.unlock()
2023
1952
2024
1953
2025
1954
class cmd_modified(Command):
2026
__doc__ = """List files modified in working tree.
1955
"""List files modified in working tree.
2027
1956
"""
2028
1957
2029
1958
hidden = True
2046
1975
2047
1976
2048
1977
class cmd_added(Command):
2049
__doc__ = """List files added in working tree.
1978
"""List files added in working tree.
2050
1979
"""
2051
1980
2052
1981
hidden = True
2061
1990
def run(self, null=False):
2062
1991
wt = WorkingTree.open_containing(u'.')[0]
2063
1992
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')
1993
try:
1994
basis = wt.basis_tree()
1995
basis.lock_read()
1996
try:
1997
basis_inv = basis.inventory
1998
inv = wt.inventory
1999
for file_id in inv:
2000
if file_id in basis_inv:
2001
continue
2002
if inv.is_root(file_id) and len(basis_inv) == 0:
2003
continue
2004
path = inv.id2path(file_id)
2005
if not os.access(osutils.abspath(path), os.F_OK):
2006
continue
2007
if null:
2008
self.outf.write(path + '\0')
2009
else:
2010
self.outf.write(osutils.quotefn(path) + '\n')
2011
finally:
2012
basis.unlock()
2013
finally:
2014
wt.unlock()
2082
2015
2083
2016
2084
2017
class cmd_root(Command):
2085
__doc__ = """Show the tree root directory.
2018
"""Show the tree root directory.
2086
2019
2087
2020
The root is the nearest enclosing directory with a .bzr control
2088
2021
directory."""
2112
2045
2113
2046
2114
2047
class cmd_log(Command):
2115
__doc__ = """Show historical log for a branch or subset of a branch.
2048
"""Show historical log for a branch or subset of a branch.
2116
2049
2117
2050
log is bzr's default tool for exploring the history of a branch.
2118
2051
The branch to use is taken from the first parameter. If no parameters
2229
2162
:Tips & tricks:
2230
2163
2231
2164
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>.
2165
line tools. You may prefer qlog or glog from the QBzr and Bzr-Gtk packages
2166
respectively for example. (TortoiseBzr uses qlog for displaying logs.) See
2167
http://bazaar-vcs.org/BzrPlugins and http://bazaar-vcs.org/IDEIntegration.
2168
2169
Web interfaces are often better at exploring history than command line
2170
tools, particularly for branches on servers. You may prefer Loggerhead
2171
or one of its alternatives. See http://bazaar-vcs.org/WebInterface.
2236
2172
2237
2173
You may find it useful to add the aliases below to ``bazaar.conf``::
2238
2174
2299
2235
help='Show changes made in each revision as a patch.'),
2300
2236
Option('include-merges',
2301
2237
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
2238
]
2307
2239
encoding_type = 'replace'
2308
2240
2318
2250
message=None,
2319
2251
limit=None,
2320
2252
show_diff=False,
2321
include_merges=False,
2322
exclude_common_ancestry=False,
2323
):
2253
include_merges=False):
2324
2254
from bzrlib.log import (
2325
2255
Logger,
2326
2256
make_log_request_dict,
2327
2257
_get_info_for_log_files,
2328
2258
)
2329
2259
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
2260
if include_merges:
2335
2261
if levels is None:
2336
2262
levels = 0
2349
2275
2350
2276
file_ids = []
2351
2277
filter_by_dir = False
2352
if file_list:
2353
# 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)
2357
for relpath, file_id, kind in file_info_list:
2358
if file_id is None:
2359
raise errors.BzrCommandError(
2360
"Path unknown at end or start of revision range: %s" %
2361
relpath)
2362
# If the relpath is the top of the tree, we log everything
2363
if relpath == '':
2364
file_ids = []
2365
break
2278
b = None
2279
try:
2280
if file_list:
2281
# find the file ids to log and check for directory filtering
2282
b, file_info_list, rev1, rev2 = _get_info_for_log_files(
2283
revision, file_list)
2284
for relpath, file_id, kind in file_info_list:
2285
if file_id is None:
2286
raise errors.BzrCommandError(
2287
"Path unknown at end or start of revision range: %s" %
2288
relpath)
2289
# If the relpath is the top of the tree, we log everything
2290
if relpath == '':
2291
file_ids = []
2292
break
2293
else:
2294
file_ids.append(file_id)
2295
filter_by_dir = filter_by_dir or (
2296
kind in ['directory', 'tree-reference'])
2297
else:
2298
# log everything
2299
# FIXME ? log the current subdir only RBC 20060203
2300
if revision is not None \
2301
and len(revision) > 0 and revision[0].get_branch():
2302
location = revision[0].get_branch()
2366
2303
else:
2367
file_ids.append(file_id)
2368
filter_by_dir = filter_by_dir or (
2369
kind in ['directory', 'tree-reference'])
2370
else:
2371
# log everything
2372
# FIXME ? log the current subdir only RBC 20060203
2373
if revision is not None \
2374
and len(revision) > 0 and revision[0].get_branch():
2375
location = revision[0].get_branch()
2376
else:
2377
location = '.'
2378
dir, relpath = bzrdir.BzrDir.open_containing(location)
2379
b = dir.open_branch()
2380
b.lock_read()
2381
self.add_cleanup(b.unlock)
2382
rev1, rev2 = _get_revision_range(revision, b, self.name())
2383
2384
# Decide on the type of delta & diff filtering to use
2385
# TODO: add an --all-files option to make this configurable & consistent
2386
if not verbose:
2387
delta_type = None
2388
else:
2389
delta_type = 'full'
2390
if not show_diff:
2391
diff_type = None
2392
elif file_ids:
2393
diff_type = 'partial'
2394
else:
2395
diff_type = 'full'
2396
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)
2304
location = '.'
2305
dir, relpath = bzrdir.BzrDir.open_containing(location)
2306
b = dir.open_branch()
2307
b.lock_read()
2308
rev1, rev2 = _get_revision_range(revision, b, self.name())
2309
2310
# Decide on the type of delta & diff filtering to use
2311
# TODO: add an --all-files option to make this configurable & consistent
2312
if not verbose:
2313
delta_type = None
2314
else:
2315
delta_type = 'full'
2316
if not show_diff:
2317
diff_type = None
2318
elif file_ids:
2319
diff_type = 'partial'
2320
else:
2321
diff_type = 'full'
2322
2323
# Build the log formatter
2324
if log_format is None:
2325
log_format = log.log_formatter_registry.get_default(b)
2326
lf = log_format(show_ids=show_ids, to_file=self.outf,
2327
show_timezone=timezone,
2328
delta_format=get_verbosity_level(),
2329
levels=levels,
2330
show_advice=levels is None)
2331
2332
# Choose the algorithm for doing the logging. It's annoying
2333
# having multiple code paths like this but necessary until
2334
# the underlying repository format is faster at generating
2335
# deltas or can provide everything we need from the indices.
2336
# The default algorithm - match-using-deltas - works for
2337
# multiple files and directories and is faster for small
2338
# amounts of history (200 revisions say). However, it's too
2339
# slow for logging a single file in a repository with deep
2340
# history, i.e. > 10K revisions. In the spirit of "do no
2341
# evil when adding features", we continue to use the
2342
# original algorithm - per-file-graph - for the "single
2343
# file that isn't a directory without showing a delta" case.
2344
partial_history = revision and b.repository._format.supports_chks
2345
match_using_deltas = (len(file_ids) != 1 or filter_by_dir
2346
or delta_type or partial_history)
2347
2348
# Build the LogRequest and execute it
2349
if len(file_ids) == 0:
2350
file_ids = None
2351
rqst = make_log_request_dict(
2352
direction=direction, specific_fileids=file_ids,
2353
start_revision=rev1, end_revision=rev2, limit=limit,
2354
message_search=message, delta_type=delta_type,
2355
diff_type=diff_type, _match_using_deltas=match_using_deltas)
2356
Logger(b, rqst).show(lf)
2357
finally:
2358
if b is not None:
2359
b.unlock()
2436
2360
2437
2361
2438
2362
def _get_revision_range(revisionspec_list, branch, command_name):
2456
2380
raise errors.BzrCommandError(
2457
2381
"bzr %s doesn't accept two revisions in different"
2458
2382
" 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)
2383
rev1 = start_spec.in_history(branch)
2464
2384
# Avoid loading all of history when we know a missing
2465
2385
# end of range means the last revision ...
2466
2386
if end_spec.spec is None:
2495
2415
2496
2416
2497
2417
class cmd_touching_revisions(Command):
2498
__doc__ = """Return revision-ids which affected a particular file.
2418
"""Return revision-ids which affected a particular file.
2499
2419
2500
2420
A more user-friendly interface is "bzr log FILE".
2501
2421
"""
2509
2429
file_id = tree.path2id(relpath)
2510
2430
b = tree.branch
2511
2431
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:
2515
self.outf.write("%6d %s\n" % (revno, what))
2432
try:
2433
touching_revs = log.find_touching_revisions(b, file_id)
2434
for revno, revision_id, what in touching_revs:
2435
self.outf.write("%6d %s\n" % (revno, what))
2436
finally:
2437
b.unlock()
2516
2438
2517
2439
2518
2440
class cmd_ls(Command):
2519
__doc__ = """List files in a tree.
2441
"""List files in a tree.
2520
2442
"""
2521
2443
2522
2444
_see_also = ['status', 'cat']
2570
2492
if from_root:
2571
2493
if relpath:
2572
2494
prefix = relpath + '/'
2573
elif fs_path != '.' and not fs_path.endswith('/'):
2495
elif fs_path != '.':
2574
2496
prefix = fs_path + '/'
2575
2497
2576
2498
if revision is not None or tree is None:
2585
2507
note("Ignoring files outside view. View is %s" % view_str)
2586
2508
2587
2509
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
2510
try:
2511
for fp, fc, fkind, fid, entry in tree.list_files(include_root=False,
2512
from_dir=relpath, recursive=recursive):
2513
# Apply additional masking
2514
if not all and not selection[fc]:
2515
continue
2516
if kind is not None and fkind != kind:
2517
continue
2518
if apply_view:
2519
try:
2520
if relpath:
2521
fullpath = osutils.pathjoin(relpath, fp)
2522
else:
2523
fullpath = fp
2524
views.check_path_in_view(tree, fullpath)
2525
except errors.FileOutsideView:
2526
continue
2605
2527
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:
2528
# Output the entry
2529
if prefix:
2530
fp = osutils.pathjoin(prefix, fp)
2531
kindch = entry.kind_character()
2532
outstring = fp + kindch
2533
ui.ui_factory.clear_term()
2534
if verbose:
2535
outstring = '%-8s %s' % (fc, outstring)
2536
if show_ids and fid is not None:
2537
outstring = "%-50s %s" % (outstring, fid)
2632
2538
self.outf.write(outstring + '\n')
2539
elif null:
2540
self.outf.write(fp + '\0')
2541
if show_ids:
2542
if fid is not None:
2543
self.outf.write(fid)
2544
self.outf.write('\0')
2545
self.outf.flush()
2546
else:
2547
if show_ids:
2548
if fid is not None:
2549
my_id = fid
2550
else:
2551
my_id = ''
2552
self.outf.write('%-50s %s\n' % (outstring, my_id))
2553
else:
2554
self.outf.write(outstring + '\n')
2555
finally:
2556
tree.unlock()
2633
2557
2634
2558
2635
2559
class cmd_unknowns(Command):
2636
__doc__ = """List unknown files.
2560
"""List unknown files.
2637
2561
"""
2638
2562
2639
2563
hidden = True
2646
2570
2647
2571
2648
2572
class cmd_ignore(Command):
2649
__doc__ = """Ignore specified files or patterns.
2573
"""Ignore specified files or patterns.
2650
2574
2651
2575
See ``bzr help patterns`` for details on the syntax of patterns.
2652
2576
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
2577
To remove patterns from the ignore list, edit the .bzrignore file.
2660
2578
After adding, editing or deleting that file either indirectly by
2661
2579
using this command or directly by using an editor, be sure to commit
2662
2580
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
2581
2677
2582
Note: ignore patterns containing shell wildcards must be quoted from
2678
2583
the shell on Unix.
2682
2587
2683
2588
bzr ignore ./Makefile
2684
2589
2685
Ignore .class files in all directories...::
2590
Ignore class files in all directories::
2686
2591
2687
2592
bzr ignore "*.class"
2688
2593
2689
...but do not ignore "special.class"::
2690
2691
bzr ignore "!special.class"
2692
2693
2594
Ignore .o files under the lib directory::
2694
2595
2695
2596
bzr ignore "lib/**/*.o"
2701
2602
Ignore everything but the "debian" toplevel directory::
2702
2603
2703
2604
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
2605
"""
2712
2606
2713
2607
_see_also = ['status', 'ignored', 'patterns']
2714
2608
takes_args = ['name_pattern*']
2715
2609
takes_options = [
2716
Option('default-rules',
2717
help='Display the default ignore rules that bzr uses.')
2610
Option('old-default-rules',
2611
help='Write out the ignore rules bzr < 0.9 always used.')
2718
2612
]
2719
2613
2720
def run(self, name_pattern_list=None, default_rules=None):
2614
def run(self, name_pattern_list=None, old_default_rules=None):
2721
2615
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)
2616
if old_default_rules is not None:
2617
# dump the rules and exit
2618
for pattern in ignores.OLD_DEFAULTS:
2619
print pattern
2726
2620
return
2727
2621
if not name_pattern_list:
2728
2622
raise errors.BzrCommandError("ignore requires at least one "
2729
"NAME_PATTERN or --default-rules.")
2623
"NAME_PATTERN or --old-default-rules")
2730
2624
name_pattern_list = [globbing.normalize_pattern(p)
2731
2625
for p in name_pattern_list]
2732
2626
for name_pattern in name_pattern_list:
2744
2638
if id is not None:
2745
2639
filename = entry[0]
2746
2640
if ignored.match(filename):
2747
matches.append(filename)
2641
matches.append(filename.encode('utf-8'))
2748
2642
tree.unlock()
2749
2643
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),))
2644
print "Warning: the following files are version controlled and" \
2645
" match your ignore pattern:\n%s" \
2646
"\nThese files will continue to be version controlled" \
2647
" unless you 'bzr remove' them." % ("\n".join(matches),)
2754
2648
2755
2649
2756
2650
class cmd_ignored(Command):
2757
__doc__ = """List ignored files and the patterns that matched them.
2651
"""List ignored files and the patterns that matched them.
2758
2652
2759
2653
List all the ignored files and the ignore pattern that caused the file to
2760
2654
be ignored.
2771
2665
def run(self):
2772
2666
tree = WorkingTree.open_containing(u'.')[0]
2773
2667
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))
2668
try:
2669
for path, file_class, kind, file_id, entry in tree.list_files():
2670
if file_class != 'I':
2671
continue
2672
## XXX: Slightly inefficient since this was already calculated
2673
pat = tree.is_ignored(path)
2674
self.outf.write('%-50s %s\n' % (path, pat))
2675
finally:
2676
tree.unlock()
2781
2677
2782
2678
2783
2679
class cmd_lookup_revision(Command):
2784
__doc__ = """Lookup the revision-id from a revision-number
2680
"""Lookup the revision-id from a revision-number
2785
2681
2786
2682
:Examples:
2787
2683
bzr lookup-revision 33
2794
2690
try:
2795
2691
revno = int(revno)
2796
2692
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)
2693
raise errors.BzrCommandError("not a valid revision-number: %r" % revno)
2694
2695
print WorkingTree.open_containing(u'.')[0].branch.get_rev_id(revno)
2801
2696
2802
2697
2803
2698
class cmd_export(Command):
2804
__doc__ = """Export current or past revision to a destination directory or archive.
2699
"""Export current or past revision to a destination directory or archive.
2805
2700
2806
2701
If no revision is specified this exports the last committed revision.
2807
2702
2839
2734
Option('root',
2840
2735
type=str,
2841
2736
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
2737
]
2846
2738
def run(self, dest, branch_or_subdir=None, revision=None, format=None,
2847
root=None, filters=False, per_file_timestamps=False):
2739
root=None, filters=False):
2848
2740
from bzrlib.export import export
2849
2741
2850
2742
if branch_or_subdir is None:
2857
2749
2858
2750
rev_tree = _get_one_revision_tree('export', revision, branch=b, tree=tree)
2859
2751
try:
2860
export(rev_tree, dest, format, root, subdir, filtered=filters,
2861
per_file_timestamps=per_file_timestamps)
2752
export(rev_tree, dest, format, root, subdir, filtered=filters)
2862
2753
except errors.NoSuchExportFormat, e:
2863
2754
raise errors.BzrCommandError('Unsupported export format: %s' % e.format)
2864
2755
2865
2756
2866
2757
class cmd_cat(Command):
2867
__doc__ = """Write the contents of a file as of a given revision to standard output.
2758
"""Write the contents of a file as of a given revision to standard output.
2868
2759
2869
2760
If no revision is nominated, the last revision is used.
2870
2761
2891
2782
tree, branch, relpath = \
2892
2783
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
2893
2784
branch.lock_read()
2894
self.add_cleanup(branch.unlock)
2895
return self._run(tree, branch, relpath, filename, revision,
2896
name_from_revision, filters)
2785
try:
2786
return self._run(tree, branch, relpath, filename, revision,
2787
name_from_revision, filters)
2788
finally:
2789
branch.unlock()
2897
2790
2898
2791
def _run(self, tree, b, relpath, filename, revision, name_from_revision,
2899
2792
filtered):
2900
2793
if tree is None:
2901
2794
tree = b.basis_tree()
2902
2795
rev_tree = _get_one_revision_tree('cat', revision, branch=b)
2903
rev_tree.lock_read()
2904
self.add_cleanup(rev_tree.unlock)
2905
2796
2906
2797
old_file_id = rev_tree.path2id(relpath)
2907
2798
2942
2833
chunks = content.splitlines(True)
2943
2834
content = filtered_output_bytes(chunks, filters,
2944
2835
ContentFilterContext(relpath, rev_tree))
2945
self.cleanup_now()
2946
2836
self.outf.writelines(content)
2947
2837
else:
2948
self.cleanup_now()
2949
2838
self.outf.write(content)
2950
2839
2951
2840
2952
2841
class cmd_local_time_offset(Command):
2953
__doc__ = """Show the offset in seconds from GMT to local time."""
2842
"""Show the offset in seconds from GMT to local time."""
2954
2843
hidden = True
2955
2844
@display_command
2956
2845
def run(self):
2957
self.outf.write("%s\n" % osutils.local_time_offset())
2846
print osutils.local_time_offset()
2958
2847
2959
2848
2960
2849
2961
2850
class cmd_commit(Command):
2962
__doc__ = """Commit changes into a new revision.
2851
"""Commit changes into a new revision.
2963
2852
2964
2853
An explanatory message needs to be given for each commit. This is
2965
2854
often done by using the --message option (getting the message from the
3058
2947
Option('strict',
3059
2948
help="Refuse to commit if there are unknown "
3060
2949
"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
2950
ListOption('fixes', type=str,
3065
2951
help="Mark a bug as being fixed by this revision "
3066
2952
"(see \"bzr help bugs\")."),
3073
2959
"the master branch until a normal commit "
3074
2960
"is performed."
3075
2961
),
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.'),
2962
Option('show-diff',
2963
help='When no message is supplied, show the diff along'
2964
' with the status summary in the message editor.'),
3079
2965
]
3080
2966
aliases = ['ci', 'checkin']
3081
2967
3100
2986
3101
2987
def run(self, message=None, file=None, verbose=False, selected_list=None,
3102
2988
unchanged=False, strict=False, local=False, fixes=None,
3103
author=None, show_diff=False, exclude=None, commit_time=None):
2989
author=None, show_diff=False, exclude=None):
3104
2990
from bzrlib.errors import (
3105
2991
PointlessCommit,
3106
2992
ConflictsInTree,
3112
2998
make_commit_message_template_encoded
3113
2999
)
3114
3000
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
3001
# TODO: Need a blackbox test for invoking the external editor; may be
3124
3002
# slightly problematic to run this cross-platform.
3125
3003
3145
3023
if local and not tree.branch.get_bound_location():
3146
3024
raise errors.LocalRequiresBoundBranch()
3147
3025
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
3026
def get_message(commit_obj):
3170
3027
"""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,
3028
my_message = message
3029
if my_message is not None and '\r' in my_message:
3030
my_message = my_message.replace('\r\n', '\n')
3031
my_message = my_message.replace('\r', '\n')
3032
if my_message is None and not file:
3033
t = make_commit_message_template_encoded(tree,
3180
3034
selected_list, diff=show_diff,
3181
3035
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
3036
start_message = generate_commit_message_template(commit_obj)
3188
my_message = edit_commit_message_encoded(text,
3037
my_message = edit_commit_message_encoded(t,
3189
3038
start_message=start_message)
3190
3039
if my_message is None:
3191
3040
raise errors.BzrCommandError("please specify a commit"
3192
3041
" message with either --message or --file")
3042
elif my_message and file:
3043
raise errors.BzrCommandError(
3044
"please specify either --message or --file")
3045
if file:
3046
my_message = codecs.open(file, 'rt',
3047
osutils.get_user_encoding()).read()
3193
3048
if my_message == "":
3194
3049
raise errors.BzrCommandError("empty commit message specified")
3195
3050
return my_message
3203
3058
specific_files=selected_list,
3204
3059
allow_pointless=unchanged, strict=strict, local=local,
3205
3060
reporter=None, verbose=verbose, revprops=properties,
3206
authors=author, timestamp=commit_stamp,
3207
timezone=offset,
3061
authors=author,
3208
3062
exclude=safe_relpath_files(tree, exclude))
3209
3063
except PointlessCommit:
3064
# FIXME: This should really happen before the file is read in;
3065
# perhaps prepare the commit; get the message; then actually commit
3210
3066
raise errors.BzrCommandError("No changes to commit."
3211
3067
" Use --unchanged to commit anyhow.")
3212
3068
except ConflictsInTree:
3217
3073
raise errors.BzrCommandError("Commit refused because there are"
3218
3074
" unknown files in the working tree.")
3219
3075
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
3076
raise errors.BzrCommandError(str(e) + "\n"
3077
'To commit to master branch, run update and then commit.\n'
3078
'You can also pass --local to commit to continue working '
3079
'disconnected.')
3225
3080
3226
3081
3227
3082
class cmd_check(Command):
3228
__doc__ = """Validate working tree structure, branch consistency and repository history.
3083
"""Validate working tree structure, branch consistency and repository history.
3229
3084
3230
3085
This command checks various invariants about branch and repository storage
3231
3086
to detect data corruption or bzr bugs.
3295
3150
3296
3151
3297
3152
class cmd_upgrade(Command):
3298
__doc__ = """Upgrade branch storage to current format.
3153
"""Upgrade branch storage to current format.
3299
3154
3300
3155
The check command or bzr developers may sometimes advise you to run
3301
3156
this command. When the default format has changed you may also be warned
3319
3174
3320
3175
3321
3176
class cmd_whoami(Command):
3322
__doc__ = """Show or set bzr user id.
3177
"""Show or set bzr user id.
3323
3178
3324
3179
:Examples:
3325
3180
Show the email of the current user::
3369
3224
3370
3225
3371
3226
class cmd_nick(Command):
3372
__doc__ = """Print or set the branch nickname.
3227
"""Print or set the branch nickname.
3373
3228
3374
3229
If unset, the tree root directory name is used as the nickname.
3375
3230
To print the current nickname, execute with no argument.
3389
3244
3390
3245
@display_command
3391
3246
def printme(self, branch):
3392
self.outf.write('%s\n' % branch.nick)
3247
print branch.nick
3393
3248
3394
3249
3395
3250
class cmd_alias(Command):
3396
__doc__ = """Set/unset and display aliases.
3251
"""Set/unset and display aliases.
3397
3252
3398
3253
:Examples:
3399
3254
Show the current aliases::
3463
3318
3464
3319
3465
3320
class cmd_selftest(Command):
3466
__doc__ = """Run internal test suite.
3321
"""Run internal test suite.
3467
3322
3468
3323
If arguments are given, they are regular expressions that say which tests
3469
3324
should run. Tests matching any expression are run, and other tests are
3513
3368
def get_transport_type(typestring):
3514
3369
"""Parse and return a transport specifier."""
3515
3370
if typestring == "sftp":
3516
from bzrlib.tests import stub_sftp
3517
return stub_sftp.SFTPAbsoluteServer
3371
from bzrlib.transport.sftp import SFTPAbsoluteServer
3372
return SFTPAbsoluteServer
3518
3373
if typestring == "memory":
3519
from bzrlib.tests import test_server
3520
return memory.MemoryServer
3374
from bzrlib.transport.memory import MemoryServer
3375
return MemoryServer
3521
3376
if typestring == "fakenfs":
3522
from bzrlib.tests import test_server
3523
return test_server.FakeNFSServer
3377
from bzrlib.transport.fakenfs import FakeNFSServer
3378
return FakeNFSServer
3524
3379
msg = "No known transport type %s. Supported types are: sftp\n" %\
3525
3380
(typestring)
3526
3381
raise errors.BzrCommandError(msg)
3610
3465
raise errors.BzrCommandError("subunit not available. subunit "
3611
3466
"needs to be installed to use --subunit.")
3612
3467
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
3468
if parallel:
3619
3469
self.additional_selftest_args.setdefault(
3620
3470
'suite_decorators', []).append(parallel)
3624
3474
verbose = not is_quiet()
3625
3475
# TODO: should possibly lock the history file...
3626
3476
benchfile = open(".perf_history", "at", buffering=1)
3627
self.add_cleanup(benchfile.close)
3628
3477
else:
3629
3478
test_suite_factory = None
3630
3479
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)
3480
try:
3481
selftest_kwargs = {"verbose": verbose,
3482
"pattern": pattern,
3483
"stop_on_failure": one,
3484
"transport": transport,
3485
"test_suite_factory": test_suite_factory,
3486
"lsprof_timed": lsprof_timed,
3487
"lsprof_tests": lsprof_tests,
3488
"bench_history": benchfile,
3489
"matching_tests_first": first,
3490
"list_only": list_only,
3491
"random_seed": randomize,
3492
"exclude_pattern": exclude,
3493
"strict": strict,
3494
"load_list": load_list,
3495
"debug_flags": debugflag,
3496
"starting_with": starting_with
3497
}
3498
selftest_kwargs.update(self.additional_selftest_args)
3499
result = selftest(**selftest_kwargs)
3500
finally:
3501
if benchfile is not None:
3502
benchfile.close()
3650
3503
return int(not result)
3651
3504
3652
3505
3653
3506
class cmd_version(Command):
3654
__doc__ = """Show version of bzr."""
3507
"""Show version of bzr."""
3655
3508
3656
3509
encoding_type = 'replace'
3657
3510
takes_options = [
3668
3521
3669
3522
3670
3523
class cmd_rocks(Command):
3671
__doc__ = """Statement of optimism."""
3524
"""Statement of optimism."""
3672
3525
3673
3526
hidden = True
3674
3527
3675
3528
@display_command
3676
3529
def run(self):
3677
self.outf.write("It sure does!\n")
3530
print "It sure does!"
3678
3531
3679
3532
3680
3533
class cmd_find_merge_base(Command):
3681
__doc__ = """Find and print a base revision for merging two branches."""
3534
"""Find and print a base revision for merging two branches."""
3682
3535
# TODO: Options to specify revisions on either side, as if
3683
3536
# merging only part of the history.
3684
3537
takes_args = ['branch', 'other']
3691
3544
branch1 = Branch.open_containing(branch)[0]
3692
3545
branch2 = Branch.open_containing(other)[0]
3693
3546
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)
3547
try:
3548
branch2.lock_read()
3549
try:
3550
last1 = ensure_null(branch1.last_revision())
3551
last2 = ensure_null(branch2.last_revision())
3552
3553
graph = branch1.repository.get_graph(branch2.repository)
3554
base_rev_id = graph.find_unique_lca(last1, last2)
3555
3556
print 'merge base is revision %s' % base_rev_id
3557
finally:
3558
branch2.unlock()
3559
finally:
3560
branch1.unlock()
3704
3561
3705
3562
3706
3563
class cmd_merge(Command):
3707
__doc__ = """Perform a three-way merge.
3564
"""Perform a three-way merge.
3708
3565
3709
3566
The source of the merge can be specified either in the form of a branch,
3710
3567
or in the form of a path to a file containing a merge directive generated
3739
3596
committed to record the result of the merge.
3740
3597
3741
3598
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.
3599
--force is given.
3748
3600
3749
3601
To select only some changes to merge, use "merge -i", which will prompt
3750
3602
you to apply each diff hunk and file change, similar to "shelve".
3762
3614
3763
3615
bzr merge -r 81..82 ../bzr.dev
3764
3616
3765
To apply a merge directive contained in /tmp/merge::
3617
To apply a merge directive contained in /tmp/merge:
3766
3618
3767
3619
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
3620
"""
3776
3621
3777
3622
encoding_type = 'exact'
3835
3680
view_info = _get_view_info_for_change_reporter(tree)
3836
3681
change_reporter = delta._ChangeReporter(
3837
3682
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
3683
cleanups = []
3684
try:
3685
pb = ui.ui_factory.nested_progress_bar()
3686
cleanups.append(pb.finished)
3687
tree.lock_write()
3688
cleanups.append(tree.unlock)
3689
if location is not None:
3690
try:
3691
mergeable = bundle.read_mergeable_from_url(location,
3692
possible_transports=possible_transports)
3693
except errors.NotABundle:
3694
mergeable = None
3695
else:
3696
if uncommitted:
3697
raise errors.BzrCommandError('Cannot use --uncommitted'
3698
' with bundles or merge directives.')
3699
3700
if revision is not None:
3701
raise errors.BzrCommandError(
3702
'Cannot use -r with merge directives or bundles')
3703
merger, verified = _mod_merge.Merger.from_mergeable(tree,
3704
mergeable, pb)
3705
3706
if merger is None and uncommitted:
3707
if revision is not None and len(revision) > 0:
3708
raise errors.BzrCommandError('Cannot use --uncommitted and'
3709
' --revision at the same time.')
3710
merger = self.get_merger_from_uncommitted(tree, location, pb,
3711
cleanups)
3712
allow_pending = False
3713
3714
if merger is None:
3715
merger, allow_pending = self._get_merger_from_branch(tree,
3716
location, revision, remember, possible_transports, pb)
3717
3718
merger.merge_type = merge_type
3719
merger.reprocess = reprocess
3720
merger.show_base = show_base
3721
self.sanity_check_merger(merger)
3722
if (merger.base_rev_id == merger.other_rev_id and
3723
merger.other_rev_id is not None):
3724
note('Nothing to do.')
3725
return 0
3726
if pull:
3727
if merger.interesting_files is not None:
3728
raise errors.BzrCommandError('Cannot pull individual files')
3729
if (merger.base_rev_id == tree.last_revision()):
3730
result = tree.pull(merger.other_branch, False,
3731
merger.other_rev_id)
3732
result.report(self.outf)
3733
return 0
3734
if merger.this_basis is None:
3735
raise errors.BzrCommandError(
3736
"This branch has no commits."
3737
" (perhaps you would prefer 'bzr pull')")
3738
if preview:
3739
return self._do_preview(merger, cleanups)
3740
elif interactive:
3741
return self._do_interactive(merger, cleanups)
3848
3742
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):
3743
return self._do_merge(merger, change_reporter, allow_pending,
3744
verified)
3745
finally:
3746
for cleanup in reversed(cleanups):
3747
cleanup()
3748
3749
def _get_preview(self, merger, cleanups):
3899
3750
tree_merger = merger.make_merger()
3900
3751
tt = tree_merger.make_preview_transform()
3901
self.add_cleanup(tt.finalize)
3752
cleanups.append(tt.finalize)
3902
3753
result_tree = tt.get_preview_tree()
3903
3754
return result_tree
3904
3755
3905
def _do_preview(self, merger):
3756
def _do_preview(self, merger, cleanups):
3906
3757
from bzrlib.diff import show_diff_trees
3907
result_tree = self._get_preview(merger)
3758
result_tree = self._get_preview(merger, cleanups)
3908
3759
show_diff_trees(merger.this_tree, result_tree, self.outf,
3909
3760
old_label='', new_label='')
3910
3761
3920
3771
else:
3921
3772
return 0
3922
3773
3923
def _do_interactive(self, merger):
3774
def _do_interactive(self, merger, cleanups):
3924
3775
"""Perform an interactive merge.
3925
3776
3926
3777
This works by generating a preview tree of the merge, then using
3928
3779
and the preview tree.
3929
3780
"""
3930
3781
from bzrlib import shelf_ui
3931
result_tree = self._get_preview(merger)
3782
result_tree = self._get_preview(merger, cleanups)
3932
3783
writer = bzrlib.option.diff_writer_registry.get()
3933
3784
shelver = shelf_ui.Shelver(merger.this_tree, result_tree, destroy=True,
3934
3785
reporter=shelf_ui.ApplyReporter(),
3935
3786
diff_writer=writer(sys.stdout))
3936
try:
3937
shelver.run()
3938
finally:
3939
shelver.finalize()
3787
shelver.run()
3940
3788
3941
3789
def sanity_check_merger(self, merger):
3942
3790
if (merger.show_base and
4002
3850
allow_pending = True
4003
3851
return merger, allow_pending
4004
3852
4005
def get_merger_from_uncommitted(self, tree, location, pb):
3853
def get_merger_from_uncommitted(self, tree, location, pb, cleanups):
4006
3854
"""Get a merger for uncommitted changes.
4007
3855
4008
3856
:param tree: The tree the merger should apply to.
4009
3857
:param location: The location containing uncommitted changes.
4010
3858
:param pb: The progress bar to use for showing progress.
3859
:param cleanups: A list of operations to perform to clean up the
3860
temporary directories, unfinalized objects, etc.
4011
3861
"""
4012
3862
location = self._select_branch_location(tree, location)[0]
4013
3863
other_tree, other_path = WorkingTree.open_containing(location)
4065
3915
4066
3916
4067
3917
class cmd_remerge(Command):
4068
__doc__ = """Redo a merge.
3918
"""Redo a merge.
4069
3919
4070
3920
Use this if you want to try a different merge technique while resolving
4071
3921
conflicts. Some merge techniques are better than others, and remerge
4096
3946
4097
3947
def run(self, file_list=None, merge_type=None, show_base=False,
4098
3948
reprocess=False):
4099
from bzrlib.conflicts import restore
4100
3949
if merge_type is None:
4101
3950
merge_type = _mod_merge.Merge3Merger
4102
3951
tree, file_list = tree_files(file_list)
4103
3952
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
3953
try:
3954
parents = tree.get_parent_ids()
3955
if len(parents) != 2:
3956
raise errors.BzrCommandError("Sorry, remerge only works after normal"
3957
" merges. Not cherrypicking or"
3958
" multi-merges.")
3959
repository = tree.branch.repository
3960
interesting_ids = None
3961
new_conflicts = []
3962
conflicts = tree.conflicts()
3963
if file_list is not None:
3964
interesting_ids = set()
3965
for filename in file_list:
3966
file_id = tree.path2id(filename)
3967
if file_id is None:
3968
raise errors.NotVersionedError(filename)
3969
interesting_ids.add(file_id)
3970
if tree.kind(file_id) != "directory":
3971
continue
4123
3972
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:
3973
for name, ie in tree.inventory.iter_entries(file_id):
3974
interesting_ids.add(ie.file_id)
3975
new_conflicts = conflicts.select_conflicts(tree, file_list)[0]
3976
else:
3977
# Remerge only supports resolving contents conflicts
3978
allowed_conflicts = ('text conflict', 'contents conflict')
3979
restore_files = [c.path for c in conflicts
3980
if c.typestring in allowed_conflicts]
3981
_mod_merge.transform_tree(tree, tree.basis_tree(), interesting_ids)
3982
tree.set_conflicts(ConflictList(new_conflicts))
3983
if file_list is not None:
3984
restore_files = file_list
3985
for filename in restore_files:
3986
try:
3987
restore(tree.abspath(filename))
3988
except errors.NotConflicted:
3989
pass
3990
# Disable pending merges, because the file texts we are remerging
3991
# have not had those merges performed. If we use the wrong parents
3992
# list, we imply that the working tree text has seen and rejected
3993
# all the changes from the other tree, when in fact those changes
3994
# have not yet been seen.
3995
pb = ui.ui_factory.nested_progress_bar()
3996
tree.set_parent_ids(parents[:1])
4137
3997
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()
3998
merger = _mod_merge.Merger.from_revision_ids(pb,
3999
tree, parents[1])
4000
merger.interesting_ids = interesting_ids
4001
merger.merge_type = merge_type
4002
merger.show_base = show_base
4003
merger.reprocess = reprocess
4004
conflicts = merger.do_merge()
4005
finally:
4006
tree.set_parent_ids(parents)
4007
pb.finished()
4154
4008
finally:
4155
tree.set_parent_ids(parents)
4009
tree.unlock()
4156
4010
if conflicts > 0:
4157
4011
return 1
4158
4012
else:
4160
4014
4161
4015
4162
4016
class cmd_revert(Command):
4163
__doc__ = """Revert files to a previous revision.
4017
"""Revert files to a previous revision.
4164
4018
4165
4019
Giving a list of files will revert only those files. Otherwise, all files
4166
4020
will be reverted. If the revision is not specified with '--revision', the
4180
4034
name. If you name a directory, all the contents of that directory will be
4181
4035
reverted.
4182
4036
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.
4037
Any files that have been newly added since that revision will be deleted,
4038
with a backup kept if appropriate. Directories containing unknown files
4039
will not be deleted.
4187
4040
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
4041
The working tree contains a list of pending merged revisions, which will
4042
be included as parents in the next commit. Normally, revert clears that
4043
list as well as reverting the files. If any files are specified, revert
4044
leaves the pending merge list alone and reverts only the files. Use "bzr
4045
revert ." in the tree root to revert all files but keep the merge record,
4046
and "bzr revert --forget-merges" to clear the pending merge list without
4195
4047
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
4048
"""
4207
4049
4208
4050
_see_also = ['cat', 'export']
4217
4059
def run(self, revision=None, no_backup=False, file_list=None,
4218
4060
forget_merges=None):
4219
4061
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)
4062
tree.lock_write()
4063
try:
4064
if forget_merges:
4065
tree.set_parent_ids(tree.get_parent_ids()[:1])
4066
else:
4067
self._revert_tree_to_revision(tree, revision, file_list, no_backup)
4068
finally:
4069
tree.unlock()
4226
4070
4227
4071
@staticmethod
4228
4072
def _revert_tree_to_revision(tree, revision, file_list, no_backup):
4229
4073
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)
4074
pb = ui.ui_factory.nested_progress_bar()
4075
try:
4076
tree.revert(file_list, rev_tree, not no_backup, pb,
4077
report_changes=True)
4078
finally:
4079
pb.finished()
4232
4080
4233
4081
4234
4082
class cmd_assert_fail(Command):
4235
__doc__ = """Test reporting of assertion failures"""
4083
"""Test reporting of assertion failures"""
4236
4084
# intended just for use in testing
4237
4085
4238
4086
hidden = True
4242
4090
4243
4091
4244
4092
class cmd_help(Command):
4245
__doc__ = """Show help on a command or other topic.
4093
"""Show help on a command or other topic.
4246
4094
"""
4247
4095
4248
4096
_see_also = ['topics']
4261
4109
4262
4110
4263
4111
class cmd_shell_complete(Command):
4264
__doc__ = """Show appropriate completions for context.
4112
"""Show appropriate completions for context.
4265
4113
4266
4114
For a list of all available commands, say 'bzr shell-complete'.
4267
4115
"""
4276
4124
4277
4125
4278
4126
class cmd_missing(Command):
4279
__doc__ = """Show unmerged/unpulled revisions between two branches.
4127
"""Show unmerged/unpulled revisions between two branches.
4280
4128
4281
4129
OTHER_BRANCH may be local or remote.
4282
4130
4283
4131
To filter on a range of revisions, you can use the command -r begin..end
4284
4132
-r revision requests a specific revision, -r ..end or -r begin.. are
4285
4133
also valid.
4286
4287
:Exit values:
4288
1 - some missing revisions
4289
0 - no missing revisions
4290
4134
4291
4135
:Examples:
4292
4136
4360
4204
restrict = 'remote'
4361
4205
4362
4206
local_branch = Branch.open_containing(u".")[0]
4363
local_branch.lock_read()
4364
self.add_cleanup(local_branch.unlock)
4365
4366
4207
parent = local_branch.get_parent()
4367
4208
if other_branch is None:
4368
4209
other_branch = parent
4377
4218
remote_branch = Branch.open(other_branch)
4378
4219
if remote_branch.base == local_branch.base:
4379
4220
remote_branch = local_branch
4380
else:
4381
remote_branch.lock_read()
4382
self.add_cleanup(remote_branch.unlock)
4383
4221
4384
4222
local_revid_range = _revision_range_to_revid_range(
4385
4223
_get_revision_range(my_revision, local_branch,
4389
4227
_get_revision_range(revision,
4390
4228
remote_branch, self.name()))
4391
4229
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()
4230
local_branch.lock_read()
4231
try:
4232
remote_branch.lock_read()
4233
try:
4234
local_extra, remote_extra = find_unmerged(
4235
local_branch, remote_branch, restrict,
4236
backward=not reverse,
4237
include_merges=include_merges,
4238
local_revid_range=local_revid_range,
4239
remote_revid_range=remote_revid_range)
4240
4241
if log_format is None:
4242
registry = log.log_formatter_registry
4243
log_format = registry.get_default(local_branch)
4244
lf = log_format(to_file=self.outf,
4245
show_ids=show_ids,
4246
show_timezone='original')
4247
4248
status_code = 0
4249
if local_extra and not theirs_only:
4250
message("You have %d extra revision(s):\n" %
4251
len(local_extra))
4252
for revision in iter_log_revisions(local_extra,
4253
local_branch.repository,
4254
verbose):
4255
lf.log_revision(revision)
4256
printed_local = True
4257
status_code = 1
4258
else:
4259
printed_local = False
4260
4261
if remote_extra and not mine_only:
4262
if printed_local is True:
4263
message("\n\n\n")
4264
message("You are missing %d revision(s):\n" %
4265
len(remote_extra))
4266
for revision in iter_log_revisions(remote_extra,
4267
remote_branch.repository,
4268
verbose):
4269
lf.log_revision(revision)
4270
status_code = 1
4271
4272
if mine_only and not local_extra:
4273
# We checked local, and found nothing extra
4274
message('This branch is up to date.\n')
4275
elif theirs_only and not remote_extra:
4276
# We checked remote, and found nothing extra
4277
message('Other branch is up to date.\n')
4278
elif not (mine_only or theirs_only or local_extra or
4279
remote_extra):
4280
# We checked both branches, and neither one had extra
4281
# revisions
4282
message("Branches are up to date.\n")
4283
finally:
4284
remote_branch.unlock()
4285
finally:
4286
local_branch.unlock()
4442
4287
if not status_code and parent is None and other_branch is not None:
4443
4288
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)
4289
try:
4290
# handle race conditions - a parent might be set while we run.
4291
if local_branch.get_parent() is None:
4292
local_branch.set_parent(remote_branch.base)
4293
finally:
4294
local_branch.unlock()
4448
4295
return status_code
4449
4296
4450
4297
4451
4298
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
"""
4299
"""Compress the data within a repository."""
4469
4300
4470
4301
_see_also = ['repositories']
4471
4302
takes_args = ['branch_or_repo?']
4472
takes_options = [
4473
Option('clean-obsolete-packs', 'Delete obsolete packs to save disk space.'),
4474
]
4475
4303
4476
def run(self, branch_or_repo='.', clean_obsolete_packs=False):
4304
def run(self, branch_or_repo='.'):
4477
4305
dir = bzrdir.BzrDir.open_containing(branch_or_repo)[0]
4478
4306
try:
4479
4307
branch = dir.open_branch()
4480
4308
repository = branch.repository
4481
4309
except errors.NotBranchError:
4482
4310
repository = dir.open_repository()
4483
repository.pack(clean_obsolete_packs=clean_obsolete_packs)
4311
repository.pack()
4484
4312
4485
4313
4486
4314
class cmd_plugins(Command):
4487
__doc__ = """List the installed plugins.
4315
"""List the installed plugins.
4488
4316
4489
4317
This command displays the list of installed plugins including
4490
4318
version of plugin and a short description of each.
4497
4325
adding new commands, providing additional network transports and
4498
4326
customizing log output.
4499
4327
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.
4328
See the Bazaar web site, http://bazaar-vcs.org, for further
4329
information on plugins including where to find them and how to
4330
install them. Instructions are also provided there on how to
4331
write new plugins using the Python programming language.
4504
4332
"""
4505
4333
takes_options = ['verbose']
4506
4334
4521
4349
doc = '(no description)'
4522
4350
result.append((name_ver, doc, plugin.path()))
4523
4351
for name_ver, doc, path in sorted(result):
4524
self.outf.write("%s\n" % name_ver)
4525
self.outf.write(" %s\n" % doc)
4352
print name_ver
4353
print ' ', doc
4526
4354
if verbose:
4527
self.outf.write(" %s\n" % path)
4528
self.outf.write("\n")
4355
print ' ', path
4356
print
4529
4357
4530
4358
4531
4359
class cmd_testament(Command):
4532
__doc__ = """Show testament (signing-form) of a revision."""
4360
"""Show testament (signing-form) of a revision."""
4533
4361
takes_options = [
4534
4362
'revision',
4535
4363
Option('long', help='Produce long-format testament.'),
4548
4376
else:
4549
4377
b = Branch.open(branch)
4550
4378
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())
4379
try:
4380
if revision is None:
4381
rev_id = b.last_revision()
4382
else:
4383
rev_id = revision[0].as_revision_id(b)
4384
t = testament_class.from_revision(b.repository, rev_id)
4385
if long:
4386
sys.stdout.writelines(t.as_text_lines())
4387
else:
4388
sys.stdout.write(t.as_short_text())
4389
finally:
4390
b.unlock()
4561
4391
4562
4392
4563
4393
class cmd_annotate(Command):
4564
__doc__ = """Show the origin of each line in a file.
4394
"""Show the origin of each line in a file.
4565
4395
4566
4396
This prints out the given file with an annotation on the left side
4567
4397
indicating which revision, author and date introduced the change.
4589
4419
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
4590
4420
if wt is not None:
4591
4421
wt.lock_read()
4592
self.add_cleanup(wt.unlock)
4593
4422
else:
4594
4423
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)
4424
try:
4425
tree = _get_one_revision_tree('annotate', revision, branch=branch)
4426
if wt is not None:
4427
file_id = wt.path2id(relpath)
4428
else:
4429
file_id = tree.path2id(relpath)
4430
if file_id is None:
4431
raise errors.NotVersionedError(filename)
4432
file_version = tree.inventory[file_id].revision
4433
if wt is not None and revision is None:
4434
# If there is a tree and we're not annotating historical
4435
# versions, annotate the working tree's content.
4436
annotate_file_tree(wt, file_id, self.outf, long, all,
4437
show_ids=show_ids)
4438
else:
4439
annotate_file(branch, file_version, file_id, long, all, self.outf,
4440
show_ids=show_ids)
4441
finally:
4442
if wt is not None:
4443
wt.unlock()
4444
else:
4445
branch.unlock()
4614
4446
4615
4447
4616
4448
class cmd_re_sign(Command):
4617
__doc__ = """Create a digital signature for an existing revision."""
4449
"""Create a digital signature for an existing revision."""
4618
4450
# TODO be able to replace existing ones.
4619
4451
4620
4452
hidden = True # is this right ?
4628
4460
raise errors.BzrCommandError('You must supply either --revision or a revision_id')
4629
4461
b = WorkingTree.open_containing(u'.')[0].branch
4630
4462
b.lock_write()
4631
self.add_cleanup(b.unlock)
4632
return self._run(b, revision_id_list, revision)
4463
try:
4464
return self._run(b, revision_id_list, revision)
4465
finally:
4466
b.unlock()
4633
4467
4634
4468
def _run(self, b, revision_id_list, revision):
4635
4469
import bzrlib.gpg as gpg
4680
4514
4681
4515
4682
4516
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.
4517
"""Convert the current branch into a checkout of the supplied branch.
4685
4518
4686
4519
Once converted into a checkout, commits must succeed on the master branch
4687
4520
before they will be applied to the local branch.
4705
4538
'This format does not remember old locations.')
4706
4539
else:
4707
4540
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')
4541
raise errors.BzrCommandError('No location supplied and no '
4542
'previous location known')
4713
4543
b_other = Branch.open(location)
4714
4544
try:
4715
4545
b.bind(b_other)
4721
4551
4722
4552
4723
4553
class cmd_unbind(Command):
4724
__doc__ = """Convert the current checkout into a regular branch.
4554
"""Convert the current checkout into a regular branch.
4725
4555
4726
4556
After unbinding, the local branch is considered independent and subsequent
4727
4557
commits will be local only.
4738
4568
4739
4569
4740
4570
class cmd_uncommit(Command):
4741
__doc__ = """Remove the last committed revision.
4571
"""Remove the last committed revision.
4742
4572
4743
4573
--verbose will print out what is being removed.
4744
4574
--dry-run will go through all the motions, but not actually
4785
4615
4786
4616
if tree is not None:
4787
4617
tree.lock_write()
4788
self.add_cleanup(tree.unlock)
4789
4618
else:
4790
4619
b.lock_write()
4791
self.add_cleanup(b.unlock)
4792
return self._run(b, tree, dry_run, verbose, revision, force, local=local)
4620
try:
4621
return self._run(b, tree, dry_run, verbose, revision, force,
4622
local=local)
4623
finally:
4624
if tree is not None:
4625
tree.unlock()
4626
else:
4627
b.unlock()
4793
4628
4794
4629
def _run(self, b, tree, dry_run, verbose, revision, force, local=False):
4795
4630
from bzrlib.log import log_formatter, show_log
4827
4662
end_revision=last_revno)
4828
4663
4829
4664
if dry_run:
4830
self.outf.write('Dry-run, pretending to remove'
4831
' the above revisions.\n')
4665
print 'Dry-run, pretending to remove the above revisions.'
4666
if not force:
4667
val = raw_input('Press <enter> to continue')
4832
4668
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
4669
print 'The above revision(s) will be removed.'
4670
if not force:
4671
val = raw_input('Are you sure [y/N]? ')
4672
if val.lower() not in ('y', 'yes'):
4673
print 'Canceled'
4674
return 0
4839
4675
4840
4676
mutter('Uncommitting from {%s} to {%s}',
4841
4677
last_rev_id, rev_id)
4842
4678
uncommit(b, tree=tree, dry_run=dry_run, verbose=verbose,
4843
4679
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)
4680
note('You can restore the old tip by running:\n'
4681
' bzr pull . -r revid:%s', last_rev_id)
4846
4682
4847
4683
4848
4684
class cmd_break_lock(Command):
4849
__doc__ = """Break a dead lock on a repository, branch or working directory.
4685
"""Break a dead lock on a repository, branch or working directory.
4850
4686
4851
4687
CAUTION: Locks should only be broken when you are sure that the process
4852
4688
holding the lock has been stopped.
4853
4689
4854
You can get information on what locks are open via the 'bzr info
4855
[location]' command.
4690
You can get information on what locks are open via the 'bzr info' command.
4856
4691
4857
4692
:Examples:
4858
4693
bzr break-lock
4859
bzr break-lock bzr+ssh://example.com/bzr/foo
4860
4694
"""
4861
4695
takes_args = ['location?']
4862
4696
4871
4705
4872
4706
4873
4707
class cmd_wait_until_signalled(Command):
4874
__doc__ = """Test helper for test_start_and_stop_bzr_subprocess_send_signal.
4708
"""Test helper for test_start_and_stop_bzr_subprocess_send_signal.
4875
4709
4876
4710
This just prints a line to signal when it is ready, then blocks on stdin.
4877
4711
"""
4885
4719
4886
4720
4887
4721
class cmd_serve(Command):
4888
__doc__ = """Run the bzr server."""
4722
"""Run the bzr server."""
4889
4723
4890
4724
aliases = ['server']
4891
4725
4892
4726
takes_options = [
4893
4727
Option('inet',
4894
4728
help='Serve on stdin/out for use from inetd or sshd.'),
4895
RegistryOption('protocol',
4896
help="Protocol to serve.",
4729
RegistryOption('protocol',
4730
help="Protocol to serve.",
4897
4731
lazy_registry=('bzrlib.transport', 'transport_server_registry'),
4898
4732
value_switches=True),
4899
4733
Option('port',
4908
4742
Option('allow-writes',
4909
4743
help='By default the server is a readonly server. Supplying '
4910
4744
'--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.'
4745
'the served directory and below.'
4916
4746
),
4917
4747
]
4918
4748
4951
4781
4952
4782
4953
4783
class cmd_join(Command):
4954
__doc__ = """Combine a tree into its containing tree.
4784
"""Combine a tree into its containing tree.
4955
4785
4956
4786
This command requires the target tree to be in a rich-root format.
4957
4787
4997
4827
4998
4828
4999
4829
class cmd_split(Command):
5000
__doc__ = """Split a subdirectory of a tree into a separate tree.
4830
"""Split a subdirectory of a tree into a separate tree.
5001
4831
5002
4832
This command will produce a target tree in a format that supports
5003
4833
rich roots, like 'rich-root' or 'rich-root-pack'. These formats cannot be
5023
4853
5024
4854
5025
4855
class cmd_merge_directive(Command):
5026
__doc__ = """Generate a merge directive for auto-merge tools.
4856
"""Generate a merge directive for auto-merge tools.
5027
4857
5028
4858
A directive requests a merge to be performed, and also provides all the
5029
4859
information necessary to do so. This means it must either include a
5122
4952
5123
4953
5124
4954
class cmd_send(Command):
5125
__doc__ = """Mail or create a merge-directive for submitting changes.
4955
"""Mail or create a merge-directive for submitting changes.
5126
4956
5127
4957
A merge directive provides many things needed for requesting merges:
5128
4958
5134
4964
directly from the merge directive, without retrieving data from a
5135
4965
branch.
5136
4966
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.
4967
If --no-bundle is specified, then public_branch is needed (and must be
4968
up-to-date), so that the receiver can perform the merge using the
4969
public_branch. The public_branch is always included if known, so that
4970
people can check it later.
4971
4972
The submit branch defaults to the parent, but can be overridden. Both
4973
submit branch and public branch will be remembered if supplied.
4974
4975
If a public_branch is known for the submit_branch, that public submit
4976
branch is used in the merge instructions. This means that a local mirror
4977
can be used as your actual submit branch, once you have set public_branch
4978
for that mirror.
5163
4979
5164
4980
Mail is sent using your preferred mail program. This should be transparent
5165
4981
on Windows (it uses MAPI). On Linux, it requires the xdg-email utility.
5185
5001
5186
5002
The merge directives created by bzr send may be applied using bzr merge or
5187
5003
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
5004
"""
5193
5005
5194
5006
encoding_type = 'exact'
5210
5022
short_name='f',
5211
5023
type=unicode),
5212
5024
Option('output', short_name='o',
5213
help='Write merge directive to this file or directory; '
5025
help='Write merge directive to this file; '
5214
5026
'use - for stdout.',
5215
5027
type=unicode),
5216
5028
Option('strict',
5239
5051
5240
5052
5241
5053
class cmd_bundle_revisions(cmd_send):
5242
__doc__ = """Create a merge-directive for submitting changes.
5054
"""Create a merge-directive for submitting changes.
5243
5055
5244
5056
A merge directive provides many things needed for requesting merges:
5245
5057
5312
5124
5313
5125
5314
5126
class cmd_tag(Command):
5315
__doc__ = """Create, remove or modify a tag naming a revision.
5127
"""Create, remove or modify a tag naming a revision.
5316
5128
5317
5129
Tags give human-meaningful names to revisions. Commands that take a -r
5318
5130
(--revision) option can be given -rtag:X, where X is any previously
5326
5138
5327
5139
To rename a tag (change the name but keep it on the same revsion), run ``bzr
5328
5140
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
5141
"""
5335
5142
5336
5143
_see_also = ['commit', 'tags']
5337
takes_args = ['tag_name?']
5144
takes_args = ['tag_name']
5338
5145
takes_options = [
5339
5146
Option('delete',
5340
5147
help='Delete this tag rather than placing it.',
5350
5157
'revision',
5351
5158
]
5352
5159
5353
def run(self, tag_name=None,
5160
def run(self, tag_name,
5354
5161
delete=None,
5355
5162
directory='.',
5356
5163
force=None,
5358
5165
):
5359
5166
branch, relpath = Branch.open_containing(directory)
5360
5167
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)
5168
try:
5169
if delete:
5170
branch.tags.delete_tag(tag_name)
5171
self.outf.write('Deleted tag %s.\n' % tag_name)
5374
5172
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)
5173
if revision:
5174
if len(revision) != 1:
5175
raise errors.BzrCommandError(
5176
"Tags can only be placed on a single revision, "
5177
"not on a range")
5178
revision_id = revision[0].as_revision_id(branch)
5179
else:
5180
revision_id = branch.last_revision()
5181
if (not force) and branch.tags.has_tag(tag_name):
5182
raise errors.TagAlreadyExists(tag_name)
5183
branch.tags.set_tag(tag_name, revision_id)
5184
self.outf.write('Created tag %s.\n' % tag_name)
5185
finally:
5186
branch.unlock()
5385
5187
5386
5188
5387
5189
class cmd_tags(Command):
5388
__doc__ = """List tags.
5190
"""List tags.
5389
5191
5390
5192
This command shows a table of tag names and the revisions they reference.
5391
5193
"""
5420
5222
return
5421
5223
5422
5224
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()
5225
try:
5226
if revision:
5227
graph = branch.repository.get_graph()
5228
rev1, rev2 = _get_revision_range(revision, branch, self.name())
5229
revid1, revid2 = rev1.rev_id, rev2.rev_id
5230
# only show revisions between revid1 and revid2 (inclusive)
5231
tags = [(tag, revid) for tag, revid in tags if
5232
graph.is_between(revid, revid1, revid2)]
5233
if sort == 'alpha':
5234
tags.sort()
5235
elif sort == 'time':
5236
timestamps = {}
5237
for tag, revid in tags:
5238
try:
5239
revobj = branch.repository.get_revision(revid)
5240
except errors.NoSuchRevision:
5241
timestamp = sys.maxint # place them at the end
5242
else:
5243
timestamp = revobj.timestamp
5244
timestamps[revid] = timestamp
5245
tags.sort(key=lambda x: timestamps[x[1]])
5246
if not show_ids:
5247
# [ (tag, revid), ... ] -> [ (tag, dotted_revno), ... ]
5248
for index, (tag, revid) in enumerate(tags):
5249
try:
5250
revno = branch.revision_id_to_dotted_revno(revid)
5251
if isinstance(revno, tuple):
5252
revno = '.'.join(map(str, revno))
5253
except errors.NoSuchRevision:
5254
# Bad tag data/merges can lead to tagged revisions
5255
# which are not in this branch. Fail gracefully ...
5256
revno = '?'
5257
tags[index] = (tag, revno)
5258
finally:
5259
branch.unlock()
5457
5260
for tag, revspec in tags:
5458
5261
self.outf.write('%-20s %s\n' % (tag, revspec))
5459
5262
5460
5263
5461
5264
class cmd_reconfigure(Command):
5462
__doc__ = """Reconfigure the type of a bzr directory.
5265
"""Reconfigure the type of a bzr directory.
5463
5266
5464
5267
A target configuration must be specified.
5465
5268
5550
5353
5551
5354
5552
5355
class cmd_switch(Command):
5553
__doc__ = """Set the branch of a checkout and update.
5356
"""Set the branch of a checkout and update.
5554
5357
5555
5358
For lightweight checkouts, this changes the branch being referenced.
5556
5359
For heavyweight checkouts, this checks that there are no local commits
5572
5375
that of the master.
5573
5376
"""
5574
5377
5575
takes_args = ['to_location?']
5378
takes_args = ['to_location']
5576
5379
takes_options = [Option('force',
5577
5380
help='Switch even if local commits will be lost.'),
5578
'revision',
5579
5381
Option('create-branch', short_name='b',
5580
5382
help='Create the target branch from this one before'
5581
5383
' switching to it.'),
5582
]
5384
]
5583
5385
5584
def run(self, to_location=None, force=False, create_branch=False,
5585
revision=None):
5386
def run(self, to_location, force=False, create_branch=False):
5586
5387
from bzrlib import switch
5587
5388
tree_location = '.'
5588
revision = _get_one_revision('switch', revision)
5589
5389
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
5390
try:
5596
5391
branch = control_dir.open_branch()
5597
5392
had_explicit_nick = branch.get_config().has_explicit_nickname()
5602
5397
if branch is None:
5603
5398
raise errors.BzrCommandError('cannot create branch without'
5604
5399
' source branch')
5605
to_location = directory_service.directories.dereference(
5606
to_location)
5607
5400
if '/' not in to_location and '\\' not in to_location:
5608
5401
# This path is meant to be relative to the existing branch
5609
5402
this_url = self._get_branch_location(control_dir)
5611
5404
to_branch = branch.bzrdir.sprout(to_location,
5612
5405
possible_transports=[branch.bzrdir.root_transport],
5613
5406
source_branch=branch).open_branch()
5407
# try:
5408
# from_branch = control_dir.open_branch()
5409
# except errors.NotBranchError:
5410
# raise BzrCommandError('Cannot create a branch from this'
5411
# ' location when we cannot open this branch')
5412
# from_branch.bzrdir.sprout(
5413
pass
5614
5414
else:
5615
5415
try:
5616
5416
to_branch = Branch.open(to_location)
5618
5418
this_url = self._get_branch_location(control_dir)
5619
5419
to_branch = Branch.open(
5620
5420
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)
5421
switch.switch(control_dir, to_branch, force)
5624
5422
if had_explicit_nick:
5625
5423
branch = control_dir.open_branch() #get the new branch!
5626
5424
branch.nick = to_branch.nick
5646
5444
5647
5445
5648
5446
class cmd_view(Command):
5649
__doc__ = """Manage filtered views.
5447
"""Manage filtered views.
5650
5448
5651
5449
Views provide a mask over the tree so that users can focus on
5652
5450
a subset of a tree when doing their work. After creating a view,
5800
5598
5801
5599
5802
5600
class cmd_hooks(Command):
5803
__doc__ = """Show hooks."""
5601
"""Show hooks."""
5804
5602
5805
5603
hidden = True
5806
5604
5819
5617
self.outf.write(" <no hooks installed>\n")
5820
5618
5821
5619
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
5620
class cmd_shelve(Command):
5848
__doc__ = """Temporarily set aside some changes from the current tree.
5621
"""Temporarily set aside some changes from the current tree.
5849
5622
5850
5623
Shelve allows you to temporarily put changes you've made "on the shelf",
5851
5624
ie. out of the way, until a later time when you can bring them back from
5898
5671
try:
5899
5672
shelver.run()
5900
5673
finally:
5901
shelver.finalize()
5674
shelver.work_tree.unlock()
5902
5675
except errors.UserAbort:
5903
5676
return 0
5904
5677
5905
5678
def run_for_list(self):
5906
5679
tree = WorkingTree.open_containing('.')[0]
5907
5680
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
5681
try:
5682
manager = tree.get_shelf_manager()
5683
shelves = manager.active_shelves()
5684
if len(shelves) == 0:
5685
note('No shelved changes.')
5686
return 0
5687
for shelf_id in reversed(shelves):
5688
message = manager.get_metadata(shelf_id).get('message')
5689
if message is None:
5690
message = '<no message>'
5691
self.outf.write('%3d: %s\n' % (shelf_id, message))
5692
return 1
5693
finally:
5694
tree.unlock()
5920
5695
5921
5696
5922
5697
class cmd_unshelve(Command):
5923
__doc__ = """Restore shelved changes.
5698
"""Restore shelved changes.
5924
5699
5925
5700
By default, the most recently shelved changes are restored. However if you
5926
5701
specify a shelf by id those changes will be restored instead. This works
5934
5709
enum_switch=False, value_switches=True,
5935
5710
apply="Apply changes and remove from the shelf.",
5936
5711
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.",
5712
delete_only="Delete changes without applying them."
5941
5713
)
5942
5714
]
5943
5715
_see_also = ['shelve']
5952
5724
5953
5725
5954
5726
class cmd_clean_tree(Command):
5955
__doc__ = """Remove unwanted files from working tree.
5727
"""Remove unwanted files from working tree.
5956
5728
5957
5729
By default, only unknown files, not ignored files, are deleted. Versioned
5958
5730
files are never deleted.
5986
5758
5987
5759
5988
5760
class cmd_reference(Command):
5989
__doc__ = """list, view and set branch locations for nested trees.
5761
"""list, view and set branch locations for nested trees.
5990
5762
5991
5763
If no arguments are provided, lists the branch locations for nested trees.
5992
5764
If one argument is provided, display the branch location for that tree.
6032
5804
self.outf.write('%s %s\n' % (path, location))
6033
5805
6034
5806
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)
5807
# these get imported and then picked up by the scan for cmd_*
5808
# TODO: Some more consistent way to split command definitions across files;
5809
# we do need to load at least some information about them to know of
5810
# aliases. ideally we would avoid loading the implementation until the
5811
# details were needed.
5812
from bzrlib.cmd_version_info import cmd_version_info
5813
from bzrlib.conflicts import cmd_resolve, cmd_conflicts, restore
5814
from bzrlib.bundle.commands import (
5815
cmd_bundle_info,
5816
)
5817
from bzrlib.foreign import cmd_dpush
5818
from bzrlib.sign_my_commits import cmd_sign_my_commits
5819
from bzrlib.weave_commands import cmd_versionedfile_list, \
5820
cmd_weave_plan_merge, cmd_weave_merge_text
Loggerhead is a web-based interface for Breezy
Version: 2.0.1