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