« back to all changes in this revision
Viewing changes to bzrlib/builtins.py
- browse files at revision 4789.4.1
- compare with another revision
- download diff
- download tarball
- view history from revision 4789.4.1
- Committer: John Arbash Meinel
- Date: 2009-11-13 19:19:11 UTC
- mto: This revision was merged to the branch mainline in revision 4799.
- Revision ID: john@arbash-meinel.com-20091113191911-nokhxxx8mllrrl6x
Intern the various strings that are part of the CHKInventory deserialization.
file_ids and revision_ids, in particular, are quite often repeated, so try to keep
a single copy of them.
file_ids and revision_ids, in particular, are quite often repeated, so try to keep
a single copy of them.
- 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
"""
528
493
if tree:
529
494
try:
530
495
wt = WorkingTree.open_containing(location)[0]
531
self.add_cleanup(wt.lock_read().unlock)
496
wt.lock_read()
532
497
except (errors.NoWorkingTree, errors.NotLocalUrl):
533
498
raise errors.NoWorkingTree(location)
534
revid = wt.last_revision()
535
499
try:
536
revno_t = wt.branch.revision_id_to_dotted_revno(revid)
537
except errors.NoSuchRevision:
538
revno_t = ('???',)
539
revno = ".".join(str(n) for n in revno_t)
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()
540
508
else:
541
509
b = Branch.open_containing(location)[0]
542
self.add_cleanup(b.lock_read().unlock)
543
revno = b.revno()
544
self.cleanup_now()
510
b.lock_read()
511
try:
512
revno = b.revno()
513
finally:
514
b.unlock()
515
545
516
self.outf.write(str(revno) + '\n')
546
517
547
518
548
519
class cmd_revision_info(Command):
549
__doc__ = """Show revision number and revision id for a given revision identifier.
520
"""Show revision number and revision id for a given revision identifier.
550
521
"""
551
522
hidden = True
552
523
takes_args = ['revision_info*']
568
539
try:
569
540
wt = WorkingTree.open_containing(directory)[0]
570
541
b = wt.branch
571
self.add_cleanup(wt.lock_read().unlock)
542
wt.lock_read()
572
543
except (errors.NoWorkingTree, errors.NotLocalUrl):
573
544
wt = None
574
545
b = Branch.open_containing(directory)[0]
575
self.add_cleanup(b.lock_read().unlock)
576
revision_ids = []
577
if revision is not None:
578
revision_ids.extend(rev.as_revision_id(b) for rev in revision)
579
if revision_info_list is not None:
580
for rev_str in revision_info_list:
581
rev_spec = RevisionSpec.from_string(rev_str)
582
revision_ids.append(rev_spec.as_revision_id(b))
583
# No arguments supplied, default to the last revision
584
if len(revision_ids) == 0:
585
if tree:
586
if wt is None:
587
raise errors.NoWorkingTree(directory)
588
revision_ids.append(wt.last_revision())
546
b.lock_read()
547
try:
548
revision_ids = []
549
if revision is not None:
550
revision_ids.extend(rev.as_revision_id(b) for rev in revision)
551
if revision_info_list is not None:
552
for rev_str in revision_info_list:
553
rev_spec = RevisionSpec.from_string(rev_str)
554
revision_ids.append(rev_spec.as_revision_id(b))
555
# No arguments supplied, default to the last revision
556
if len(revision_ids) == 0:
557
if tree:
558
if wt is None:
559
raise errors.NoWorkingTree(directory)
560
revision_ids.append(wt.last_revision())
561
else:
562
revision_ids.append(b.last_revision())
563
564
revinfos = []
565
maxlen = 0
566
for revision_id in revision_ids:
567
try:
568
dotted_revno = b.revision_id_to_dotted_revno(revision_id)
569
revno = '.'.join(str(i) for i in dotted_revno)
570
except errors.NoSuchRevision:
571
revno = '???'
572
maxlen = max(maxlen, len(revno))
573
revinfos.append([revno, revision_id])
574
finally:
575
if wt is None:
576
b.unlock()
589
577
else:
590
revision_ids.append(b.last_revision())
591
592
revinfos = []
593
maxlen = 0
594
for revision_id in revision_ids:
595
try:
596
dotted_revno = b.revision_id_to_dotted_revno(revision_id)
597
revno = '.'.join(str(i) for i in dotted_revno)
598
except errors.NoSuchRevision:
599
revno = '???'
600
maxlen = max(maxlen, len(revno))
601
revinfos.append([revno, revision_id])
602
603
self.cleanup_now()
578
wt.unlock()
579
604
580
for ri in revinfos:
605
581
self.outf.write('%*s %s\n' % (maxlen, ri[0], ri[1]))
606
582
607
583
608
584
class cmd_add(Command):
609
__doc__ = """Add specified files or directories.
585
"""Add specified files or directories.
610
586
611
587
In non-recursive mode, all the named items are added, regardless
612
588
of whether they were previously ignored. A warning is given if
677
653
should_print=(not is_quiet()))
678
654
679
655
if base_tree:
680
self.add_cleanup(base_tree.lock_read().unlock)
681
tree, file_list = tree_files_for_add(file_list)
682
added, ignored = tree.smart_add(file_list, not
683
no_recurse, action=action, save=not dry_run)
684
self.cleanup_now()
656
base_tree.lock_read()
657
try:
658
tree, file_list = tree_files_for_add(file_list)
659
added, ignored = tree.smart_add(file_list, not
660
no_recurse, action=action, save=not dry_run)
661
finally:
662
if base_tree is not None:
663
base_tree.unlock()
685
664
if len(ignored) > 0:
686
665
if verbose:
687
666
for glob in sorted(ignored.keys()):
691
670
692
671
693
672
class cmd_mkdir(Command):
694
__doc__ = """Create a new versioned directory.
673
"""Create a new versioned directory.
695
674
696
675
This is equivalent to creating the directory and then adding it.
697
676
"""
701
680
702
681
def run(self, dir_list):
703
682
for d in dir_list:
683
os.mkdir(d)
704
684
wt, dd = WorkingTree.open_containing(d)
705
base = os.path.dirname(dd)
706
id = wt.path2id(base)
707
if id != None:
708
os.mkdir(d)
709
wt.add([dd])
710
self.outf.write('added %s\n' % d)
711
else:
712
raise errors.NotVersionedError(path=base)
685
wt.add([dd])
686
self.outf.write('added %s\n' % d)
713
687
714
688
715
689
class cmd_relpath(Command):
716
__doc__ = """Show path of a file relative to root"""
690
"""Show path of a file relative to root"""
717
691
718
692
takes_args = ['filename']
719
693
hidden = True
728
702
729
703
730
704
class cmd_inventory(Command):
731
__doc__ = """Show inventory of the current working copy or a revision.
705
"""Show inventory of the current working copy or a revision.
732
706
733
707
It is possible to limit the output to a particular entry
734
708
type using the --kind option. For example: --kind file.
755
729
756
730
revision = _get_one_revision('inventory', revision)
757
731
work_tree, file_list = tree_files(file_list)
758
self.add_cleanup(work_tree.lock_read().unlock)
759
if revision is not None:
760
tree = revision.as_tree(work_tree.branch)
761
762
extra_trees = [work_tree]
763
self.add_cleanup(tree.lock_read().unlock)
764
else:
765
tree = work_tree
766
extra_trees = []
767
768
if file_list is not None:
769
file_ids = tree.paths2ids(file_list, trees=extra_trees,
770
require_versioned=True)
771
# find_ids_across_trees may include some paths that don't
772
# exist in 'tree'.
773
entries = sorted((tree.id2path(file_id), tree.inventory[file_id])
774
for file_id in file_ids if file_id in tree)
775
else:
776
entries = tree.inventory.entries()
777
778
self.cleanup_now()
732
work_tree.lock_read()
733
try:
734
if revision is not None:
735
tree = revision.as_tree(work_tree.branch)
736
737
extra_trees = [work_tree]
738
tree.lock_read()
739
else:
740
tree = work_tree
741
extra_trees = []
742
743
if file_list is not None:
744
file_ids = tree.paths2ids(file_list, trees=extra_trees,
745
require_versioned=True)
746
# find_ids_across_trees may include some paths that don't
747
# exist in 'tree'.
748
entries = sorted((tree.id2path(file_id), tree.inventory[file_id])
749
for file_id in file_ids if file_id in tree)
750
else:
751
entries = tree.inventory.entries()
752
finally:
753
tree.unlock()
754
if tree is not work_tree:
755
work_tree.unlock()
756
779
757
for path, entry in entries:
780
758
if kind and kind != entry.kind:
781
759
continue
787
765
788
766
789
767
class cmd_mv(Command):
790
__doc__ = """Move or rename a file.
768
"""Move or rename a file.
791
769
792
770
:Usage:
793
771
bzr mv OLDNAME NEWNAME
826
804
if len(names_list) < 2:
827
805
raise errors.BzrCommandError("missing file argument")
828
806
tree, rel_names = tree_files(names_list, canonicalize=False)
829
self.add_cleanup(tree.lock_tree_write().unlock)
830
self._run(tree, names_list, rel_names, after)
807
tree.lock_tree_write()
808
try:
809
self._run(tree, names_list, rel_names, after)
810
finally:
811
tree.unlock()
831
812
832
813
def run_auto(self, names_list, after, dry_run):
833
814
if names_list is not None and len(names_list) > 1:
837
818
raise errors.BzrCommandError('--after cannot be specified with'
838
819
' --auto.')
839
820
work_tree, file_list = tree_files(names_list, default_branch='.')
840
self.add_cleanup(work_tree.lock_tree_write().unlock)
841
rename_map.RenameMap.guess_renames(work_tree, dry_run)
821
work_tree.lock_tree_write()
822
try:
823
rename_map.RenameMap.guess_renames(work_tree, dry_run)
824
finally:
825
work_tree.unlock()
842
826
843
827
def _run(self, tree, names_list, rel_names, after):
844
828
into_existing = osutils.isdir(names_list[-1])
865
849
# All entries reference existing inventory items, so fix them up
866
850
# for cicp file-systems.
867
851
rel_names = tree.get_canonical_inventory_paths(rel_names)
868
for src, dest in tree.move(rel_names[:-1], rel_names[-1], after=after):
869
if not is_quiet():
870
self.outf.write("%s => %s\n" % (src, dest))
852
for pair in tree.move(rel_names[:-1], rel_names[-1], after=after):
853
self.outf.write("%s => %s\n" % pair)
871
854
else:
872
855
if len(names_list) != 2:
873
856
raise errors.BzrCommandError('to mv multiple files the'
917
900
dest = osutils.pathjoin(dest_parent, dest_tail)
918
901
mutter("attempting to move %s => %s", src, dest)
919
902
tree.rename_one(src, dest, after=after)
920
if not is_quiet():
921
self.outf.write("%s => %s\n" % (src, dest))
903
self.outf.write("%s => %s\n" % (src, dest))
922
904
923
905
924
906
class cmd_pull(Command):
925
__doc__ = """Turn this branch into a mirror of another branch.
907
"""Turn this branch into a mirror of another branch.
926
908
927
By default, this command only works on branches that have not diverged.
928
Branches are considered diverged if the destination branch's most recent
929
commit is one that has not been merged (directly or indirectly) into the
930
parent.
909
This command only works on branches that have not diverged. Branches are
910
considered diverged if the destination branch's most recent commit is one
911
that has not been merged (directly or indirectly) into the parent.
931
912
932
913
If branches have diverged, you can use 'bzr merge' to integrate the changes
933
914
from one into the other. Once one branch has merged, the other should
934
915
be able to pull it again.
935
916
936
If you want to replace your local changes and just want your branch to
937
match the remote one, use pull --overwrite. This will work even if the two
938
branches have diverged.
917
If you want to forget your local changes and just update your branch to
918
match the remote one, use pull --overwrite.
939
919
940
920
If there is no default location set, the first pull will set it. After
941
921
that, you can omit the location to use the default. To change the
977
957
try:
978
958
tree_to = WorkingTree.open_containing(directory)[0]
979
959
branch_to = tree_to.branch
980
self.add_cleanup(tree_to.lock_write().unlock)
981
960
except errors.NoWorkingTree:
982
961
tree_to = None
983
962
branch_to = Branch.open_containing(directory)[0]
984
self.add_cleanup(branch_to.lock_write().unlock)
985
963
986
964
if local and not branch_to.get_bound_location():
987
965
raise errors.LocalRequiresBoundBranch()
988
966
1018
996
else:
1019
997
branch_from = Branch.open(location,
1020
998
possible_transports=possible_transports)
1021
self.add_cleanup(branch_from.lock_read().unlock)
1022
999
1023
1000
if branch_to.get_parent() is None or remember:
1024
1001
branch_to.set_parent(branch_from.base)
1025
1002
1026
if revision is not None:
1027
revision_id = revision.as_revision_id(branch_from)
1028
1029
if tree_to is not None:
1030
view_info = _get_view_info_for_change_reporter(tree_to)
1031
change_reporter = delta._ChangeReporter(
1032
unversioned_filter=tree_to.is_ignored,
1033
view_info=view_info)
1034
result = tree_to.pull(
1035
branch_from, overwrite, revision_id, change_reporter,
1036
possible_transports=possible_transports, local=local)
1037
else:
1038
result = branch_to.pull(
1039
branch_from, overwrite, revision_id, local=local)
1040
1041
result.report(self.outf)
1042
if verbose and result.old_revid != result.new_revid:
1043
log.show_branch_change(
1044
branch_to, self.outf, result.old_revno,
1045
result.old_revid)
1003
if branch_from is not branch_to:
1004
branch_from.lock_read()
1005
try:
1006
if revision is not None:
1007
revision_id = revision.as_revision_id(branch_from)
1008
1009
branch_to.lock_write()
1010
try:
1011
if tree_to is not None:
1012
view_info = _get_view_info_for_change_reporter(tree_to)
1013
change_reporter = delta._ChangeReporter(
1014
unversioned_filter=tree_to.is_ignored,
1015
view_info=view_info)
1016
result = tree_to.pull(
1017
branch_from, overwrite, revision_id, change_reporter,
1018
possible_transports=possible_transports, local=local)
1019
else:
1020
result = branch_to.pull(
1021
branch_from, overwrite, revision_id, local=local)
1022
1023
result.report(self.outf)
1024
if verbose and result.old_revid != result.new_revid:
1025
log.show_branch_change(
1026
branch_to, self.outf, result.old_revno,
1027
result.old_revid)
1028
finally:
1029
branch_to.unlock()
1030
finally:
1031
if branch_from is not branch_to:
1032
branch_from.unlock()
1046
1033
1047
1034
1048
1035
class cmd_push(Command):
1049
__doc__ = """Update a mirror of this branch.
1036
"""Update a mirror of this branch.
1050
1037
1051
1038
The target branch will not have its working tree populated because this
1052
1039
is both expensive, and is not supported on remote file systems.
1113
1100
# Get the source branch
1114
1101
(tree, br_from,
1115
1102
_unused) = bzrdir.BzrDir.open_containing_tree_or_branch(directory)
1103
if strict is None:
1104
strict = br_from.get_config().get_user_option_as_bool('push_strict')
1105
if strict is None: strict = True # default value
1116
1106
# Get the tip's revision_id
1117
1107
revision = _get_one_revision('push', revision)
1118
1108
if revision is not None:
1119
1109
revision_id = revision.in_history(br_from).rev_id
1120
1110
else:
1121
1111
revision_id = None
1122
if tree is not None and revision_id is None:
1123
tree.check_changed_or_out_of_date(
1124
strict, 'push_strict',
1125
more_error='Use --no-strict to force the push.',
1126
more_warning='Uncommitted changes will not be pushed.')
1112
if strict and tree is not None and revision_id is None:
1113
if (tree.has_changes()):
1114
raise errors.UncommittedChanges(
1115
tree, more='Use --no-strict to force the push.')
1116
if tree.last_revision() != tree.branch.last_revision():
1117
# The tree has lost sync with its branch, there is little
1118
# chance that the user is aware of it but he can still force
1119
# the push with --no-strict
1120
raise errors.OutOfDateTree(
1121
tree, more='Use --no-strict to force the push.')
1122
1127
1123
# Get the stacked_on branch, if any
1128
1124
if stacked_on is not None:
1129
1125
stacked_on = urlutils.normalize_url(stacked_on)
1161
1157
1162
1158
1163
1159
class cmd_branch(Command):
1164
__doc__ = """Create a new branch that is a copy of an existing branch.
1160
"""Create a new branch that is a copy of an existing branch.
1165
1161
1166
1162
If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will
1167
1163
be used. In other words, "branch ../foo/bar" will attempt to create ./bar.
1194
1190
' directory exists, but does not already'
1195
1191
' have a control directory. This flag will'
1196
1192
' allow branch to proceed.'),
1197
Option('bind',
1198
help="Bind new branch to from location."),
1199
1193
]
1200
1194
aliases = ['get', 'clone']
1201
1195
1202
1196
def run(self, from_location, to_location=None, revision=None,
1203
1197
hardlink=False, stacked=False, standalone=False, no_tree=False,
1204
use_existing_dir=False, switch=False, bind=False):
1198
use_existing_dir=False, switch=False):
1205
1199
from bzrlib import switch as _mod_switch
1206
1200
from bzrlib.tag import _merge_tags_if_possible
1207
1201
accelerator_tree, br_from = bzrdir.BzrDir.open_tree_or_branch(
1208
1202
from_location)
1203
if (accelerator_tree is not None and
1204
accelerator_tree.supports_content_filtering()):
1205
accelerator_tree = None
1209
1206
revision = _get_one_revision('branch', revision)
1210
self.add_cleanup(br_from.lock_read().unlock)
1211
if revision is not None:
1212
revision_id = revision.as_revision_id(br_from)
1213
else:
1214
# FIXME - wt.last_revision, fallback to branch, fall back to
1215
# None or perhaps NULL_REVISION to mean copy nothing
1216
# RBC 20060209
1217
revision_id = br_from.last_revision()
1218
if to_location is None:
1219
to_location = urlutils.derive_to_location(from_location)
1220
to_transport = transport.get_transport(to_location)
1207
br_from.lock_read()
1221
1208
try:
1222
to_transport.mkdir('.')
1223
except errors.FileExists:
1224
if not use_existing_dir:
1225
raise errors.BzrCommandError('Target directory "%s" '
1226
'already exists.' % to_location)
1209
if revision is not None:
1210
revision_id = revision.as_revision_id(br_from)
1227
1211
else:
1228
try:
1229
bzrdir.BzrDir.open_from_transport(to_transport)
1230
except errors.NotBranchError:
1231
pass
1212
# FIXME - wt.last_revision, fallback to branch, fall back to
1213
# None or perhaps NULL_REVISION to mean copy nothing
1214
# RBC 20060209
1215
revision_id = br_from.last_revision()
1216
if to_location is None:
1217
to_location = urlutils.derive_to_location(from_location)
1218
to_transport = transport.get_transport(to_location)
1219
try:
1220
to_transport.mkdir('.')
1221
except errors.FileExists:
1222
if not use_existing_dir:
1223
raise errors.BzrCommandError('Target directory "%s" '
1224
'already exists.' % to_location)
1232
1225
else:
1233
raise errors.AlreadyBranchError(to_location)
1234
except errors.NoSuchFile:
1235
raise errors.BzrCommandError('Parent of "%s" does not exist.'
1236
% to_location)
1237
try:
1238
# preserve whatever source format we have.
1239
dir = br_from.bzrdir.sprout(to_transport.base, revision_id,
1240
possible_transports=[to_transport],
1241
accelerator_tree=accelerator_tree,
1242
hardlink=hardlink, stacked=stacked,
1243
force_new_repo=standalone,
1244
create_tree_if_local=not no_tree,
1245
source_branch=br_from)
1246
branch = dir.open_branch()
1247
except errors.NoSuchRevision:
1248
to_transport.delete_tree('.')
1249
msg = "The branch %s has no revision %s." % (from_location,
1250
revision)
1251
raise errors.BzrCommandError(msg)
1252
_merge_tags_if_possible(br_from, branch)
1253
# If the source branch is stacked, the new branch may
1254
# be stacked whether we asked for that explicitly or not.
1255
# We therefore need a try/except here and not just 'if stacked:'
1256
try:
1257
note('Created new stacked branch referring to %s.' %
1258
branch.get_stacked_on_url())
1259
except (errors.NotStacked, errors.UnstackableBranchFormat,
1260
errors.UnstackableRepositoryFormat), e:
1261
note('Branched %d revision(s).' % branch.revno())
1262
if bind:
1263
# Bind to the parent
1264
parent_branch = Branch.open(from_location)
1265
branch.bind(parent_branch)
1266
note('New branch bound to %s' % from_location)
1267
if switch:
1268
# Switch to the new branch
1269
wt, _ = WorkingTree.open_containing('.')
1270
_mod_switch.switch(wt.bzrdir, branch)
1271
note('Switched to branch: %s',
1272
urlutils.unescape_for_display(branch.base, 'utf-8'))
1226
try:
1227
bzrdir.BzrDir.open_from_transport(to_transport)
1228
except errors.NotBranchError:
1229
pass
1230
else:
1231
raise errors.AlreadyBranchError(to_location)
1232
except errors.NoSuchFile:
1233
raise errors.BzrCommandError('Parent of "%s" does not exist.'
1234
% to_location)
1235
try:
1236
# preserve whatever source format we have.
1237
dir = br_from.bzrdir.sprout(to_transport.base, revision_id,
1238
possible_transports=[to_transport],
1239
accelerator_tree=accelerator_tree,
1240
hardlink=hardlink, stacked=stacked,
1241
force_new_repo=standalone,
1242
create_tree_if_local=not no_tree,
1243
source_branch=br_from)
1244
branch = dir.open_branch()
1245
except errors.NoSuchRevision:
1246
to_transport.delete_tree('.')
1247
msg = "The branch %s has no revision %s." % (from_location,
1248
revision)
1249
raise errors.BzrCommandError(msg)
1250
_merge_tags_if_possible(br_from, branch)
1251
# If the source branch is stacked, the new branch may
1252
# be stacked whether we asked for that explicitly or not.
1253
# We therefore need a try/except here and not just 'if stacked:'
1254
try:
1255
note('Created new stacked branch referring to %s.' %
1256
branch.get_stacked_on_url())
1257
except (errors.NotStacked, errors.UnstackableBranchFormat,
1258
errors.UnstackableRepositoryFormat), e:
1259
note('Branched %d revision(s).' % branch.revno())
1260
if switch:
1261
# Switch to the new branch
1262
wt, _ = WorkingTree.open_containing('.')
1263
_mod_switch.switch(wt.bzrdir, branch)
1264
note('Switched to branch: %s',
1265
urlutils.unescape_for_display(branch.base, 'utf-8'))
1266
finally:
1267
br_from.unlock()
1273
1268
1274
1269
1275
1270
class cmd_checkout(Command):
1276
__doc__ = """Create a new checkout of an existing branch.
1271
"""Create a new checkout of an existing branch.
1277
1272
1278
1273
If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree for
1279
1274
the branch found in '.'. This is useful if you have removed the working tree
1342
1337
1343
1338
1344
1339
class cmd_renames(Command):
1345
__doc__ = """Show list of renamed files.
1340
"""Show list of renamed files.
1346
1341
"""
1347
1342
# TODO: Option to show renames between two historical versions.
1348
1343
1353
1348
@display_command
1354
1349
def run(self, dir=u'.'):
1355
1350
tree = WorkingTree.open_containing(dir)[0]
1356
self.add_cleanup(tree.lock_read().unlock)
1357
new_inv = tree.inventory
1358
old_tree = tree.basis_tree()
1359
self.add_cleanup(old_tree.lock_read().unlock)
1360
old_inv = old_tree.inventory
1361
renames = []
1362
iterator = tree.iter_changes(old_tree, include_unchanged=True)
1363
for f, paths, c, v, p, n, k, e in iterator:
1364
if paths[0] == paths[1]:
1365
continue
1366
if None in (paths):
1367
continue
1368
renames.append(paths)
1369
renames.sort()
1370
for old_name, new_name in renames:
1371
self.outf.write("%s => %s\n" % (old_name, new_name))
1351
tree.lock_read()
1352
try:
1353
new_inv = tree.inventory
1354
old_tree = tree.basis_tree()
1355
old_tree.lock_read()
1356
try:
1357
old_inv = old_tree.inventory
1358
renames = []
1359
iterator = tree.iter_changes(old_tree, include_unchanged=True)
1360
for f, paths, c, v, p, n, k, e in iterator:
1361
if paths[0] == paths[1]:
1362
continue
1363
if None in (paths):
1364
continue
1365
renames.append(paths)
1366
renames.sort()
1367
for old_name, new_name in renames:
1368
self.outf.write("%s => %s\n" % (old_name, new_name))
1369
finally:
1370
old_tree.unlock()
1371
finally:
1372
tree.unlock()
1372
1373
1373
1374
1374
1375
class cmd_update(Command):
1375
__doc__ = """Update a tree to have the latest code committed to its branch.
1376
"""Update a tree to have the latest code committed to its branch.
1376
1377
1377
1378
This will perform a merge into the working tree, and may generate
1378
1379
conflicts. If you have any local changes, you will still
1380
1381
1381
1382
If you want to discard your local changes, you can just do a
1382
1383
'bzr revert' instead of 'bzr commit' after the update.
1383
1384
If the tree's branch is bound to a master branch, it will also update
1385
the branch from the master.
1386
1384
"""
1387
1385
1388
1386
_see_also = ['pull', 'working-trees', 'status-flags']
1389
1387
takes_args = ['dir?']
1390
takes_options = ['revision']
1391
1388
aliases = ['up']
1392
1389
1393
def run(self, dir='.', revision=None):
1394
if revision is not None and len(revision) != 1:
1395
raise errors.BzrCommandError(
1396
"bzr update --revision takes exactly one revision")
1390
def run(self, dir='.'):
1397
1391
tree = WorkingTree.open_containing(dir)[0]
1398
branch = tree.branch
1399
1392
possible_transports = []
1400
master = branch.get_master_branch(
1393
master = tree.branch.get_master_branch(
1401
1394
possible_transports=possible_transports)
1402
1395
if master is not None:
1403
branch_location = master.base
1404
1396
tree.lock_write()
1405
1397
else:
1406
branch_location = tree.branch.base
1407
1398
tree.lock_tree_write()
1408
self.add_cleanup(tree.unlock)
1409
# get rid of the final '/' and be ready for display
1410
branch_location = urlutils.unescape_for_display(
1411
branch_location.rstrip('/'),
1412
self.outf.encoding)
1413
existing_pending_merges = tree.get_parent_ids()[1:]
1414
if master is None:
1415
old_tip = None
1416
else:
1417
# may need to fetch data into a heavyweight checkout
1418
# XXX: this may take some time, maybe we should display a
1419
# message
1420
old_tip = branch.update(possible_transports)
1421
if revision is not None:
1422
revision_id = revision[0].as_revision_id(branch)
1423
else:
1424
revision_id = branch.last_revision()
1425
if revision_id == _mod_revision.ensure_null(tree.last_revision()):
1426
revno = branch.revision_id_to_dotted_revno(revision_id)
1427
note("Tree is up to date at revision %s of branch %s" %
1428
('.'.join(map(str, revno)), branch_location))
1429
return 0
1430
view_info = _get_view_info_for_change_reporter(tree)
1431
change_reporter = delta._ChangeReporter(
1432
unversioned_filter=tree.is_ignored,
1433
view_info=view_info)
1434
1399
try:
1400
existing_pending_merges = tree.get_parent_ids()[1:]
1401
last_rev = _mod_revision.ensure_null(tree.last_revision())
1402
if last_rev == _mod_revision.ensure_null(
1403
tree.branch.last_revision()):
1404
# may be up to date, check master too.
1405
if master is None or last_rev == _mod_revision.ensure_null(
1406
master.last_revision()):
1407
revno = tree.branch.revision_id_to_revno(last_rev)
1408
note("Tree is up to date at revision %d." % (revno,))
1409
return 0
1410
view_info = _get_view_info_for_change_reporter(tree)
1435
1411
conflicts = tree.update(
1436
change_reporter,
1437
possible_transports=possible_transports,
1438
revision=revision_id,
1439
old_tip=old_tip)
1440
except errors.NoSuchRevision, e:
1441
raise errors.BzrCommandError(
1442
"branch has no revision %s\n"
1443
"bzr update --revision only works"
1444
" for a revision in the branch history"
1445
% (e.revision))
1446
revno = tree.branch.revision_id_to_dotted_revno(
1447
_mod_revision.ensure_null(tree.last_revision()))
1448
note('Updated to revision %s of branch %s' %
1449
('.'.join(map(str, revno)), branch_location))
1450
parent_ids = tree.get_parent_ids()
1451
if parent_ids[1:] and parent_ids[1:] != existing_pending_merges:
1452
note('Your local commits will now show as pending merges with '
1453
"'bzr status', and can be committed with 'bzr commit'.")
1454
if conflicts != 0:
1455
return 1
1456
else:
1457
return 0
1412
delta._ChangeReporter(unversioned_filter=tree.is_ignored,
1413
view_info=view_info), possible_transports=possible_transports)
1414
revno = tree.branch.revision_id_to_revno(
1415
_mod_revision.ensure_null(tree.last_revision()))
1416
note('Updated to revision %d.' % (revno,))
1417
if tree.get_parent_ids()[1:] != existing_pending_merges:
1418
note('Your local commits will now show as pending merges with '
1419
"'bzr status', and can be committed with 'bzr commit'.")
1420
if conflicts != 0:
1421
return 1
1422
else:
1423
return 0
1424
finally:
1425
tree.unlock()
1458
1426
1459
1427
1460
1428
class cmd_info(Command):
1461
__doc__ = """Show information about a working tree, branch or repository.
1429
"""Show information about a working tree, branch or repository.
1462
1430
1463
1431
This command will show all known locations and formats associated to the
1464
1432
tree, branch or repository.
1502
1470
1503
1471
1504
1472
class cmd_remove(Command):
1505
__doc__ = """Remove files or directories.
1473
"""Remove files or directories.
1506
1474
1507
1475
This makes bzr stop tracking changes to the specified files. bzr will delete
1508
1476
them if they can easily be recovered using revert. If no options or
1530
1498
if file_list is not None:
1531
1499
file_list = [f for f in file_list]
1532
1500
1533
self.add_cleanup(tree.lock_write().unlock)
1534
# Heuristics should probably all move into tree.remove_smart or
1535
# some such?
1536
if new:
1537
added = tree.changes_from(tree.basis_tree(),
1538
specific_files=file_list).added
1539
file_list = sorted([f[0] for f in added], reverse=True)
1540
if len(file_list) == 0:
1541
raise errors.BzrCommandError('No matching files.')
1542
elif file_list is None:
1543
# missing files show up in iter_changes(basis) as
1544
# versioned-with-no-kind.
1545
missing = []
1546
for change in tree.iter_changes(tree.basis_tree()):
1547
# Find paths in the working tree that have no kind:
1548
if change[1][1] is not None and change[6][1] is None:
1549
missing.append(change[1][1])
1550
file_list = sorted(missing, reverse=True)
1551
file_deletion_strategy = 'keep'
1552
tree.remove(file_list, verbose=verbose, to_file=self.outf,
1553
keep_files=file_deletion_strategy=='keep',
1554
force=file_deletion_strategy=='force')
1501
tree.lock_write()
1502
try:
1503
# Heuristics should probably all move into tree.remove_smart or
1504
# some such?
1505
if new:
1506
added = tree.changes_from(tree.basis_tree(),
1507
specific_files=file_list).added
1508
file_list = sorted([f[0] for f in added], reverse=True)
1509
if len(file_list) == 0:
1510
raise errors.BzrCommandError('No matching files.')
1511
elif file_list is None:
1512
# missing files show up in iter_changes(basis) as
1513
# versioned-with-no-kind.
1514
missing = []
1515
for change in tree.iter_changes(tree.basis_tree()):
1516
# Find paths in the working tree that have no kind:
1517
if change[1][1] is not None and change[6][1] is None:
1518
missing.append(change[1][1])
1519
file_list = sorted(missing, reverse=True)
1520
file_deletion_strategy = 'keep'
1521
tree.remove(file_list, verbose=verbose, to_file=self.outf,
1522
keep_files=file_deletion_strategy=='keep',
1523
force=file_deletion_strategy=='force')
1524
finally:
1525
tree.unlock()
1555
1526
1556
1527
1557
1528
class cmd_file_id(Command):
1558
__doc__ = """Print file_id of a particular file or directory.
1529
"""Print file_id of a particular file or directory.
1559
1530
1560
1531
The file_id is assigned when the file is first added and remains the
1561
1532
same through all revisions where the file exists, even when it is
1577
1548
1578
1549
1579
1550
class cmd_file_path(Command):
1580
__doc__ = """Print path of file_ids to a file or directory.
1551
"""Print path of file_ids to a file or directory.
1581
1552
1582
1553
This prints one line for each directory down to the target,
1583
1554
starting at the branch root.
1599
1570
1600
1571
1601
1572
class cmd_reconcile(Command):
1602
__doc__ = """Reconcile bzr metadata in a branch.
1573
"""Reconcile bzr metadata in a branch.
1603
1574
1604
1575
This can correct data mismatches that may have been caused by
1605
1576
previous ghost operations or bzr upgrades. You should only
1627
1598
1628
1599
1629
1600
class cmd_revision_history(Command):
1630
__doc__ = """Display the list of revision ids on a branch."""
1601
"""Display the list of revision ids on a branch."""
1631
1602
1632
1603
_see_also = ['log']
1633
1604
takes_args = ['location?']
1643
1614
1644
1615
1645
1616
class cmd_ancestry(Command):
1646
__doc__ = """List all revisions merged into this branch."""
1617
"""List all revisions merged into this branch."""
1647
1618
1648
1619
_see_also = ['log', 'revision-history']
1649
1620
takes_args = ['location?']
1668
1639
1669
1640
1670
1641
class cmd_init(Command):
1671
__doc__ = """Make a directory into a versioned branch.
1642
"""Make a directory into a versioned branch.
1672
1643
1673
1644
Use this to create an empty branch, or before importing an
1674
1645
existing project.
1777
1748
1778
1749
1779
1750
class cmd_init_repository(Command):
1780
__doc__ = """Create a shared repository for branches to share storage space.
1751
"""Create a shared repository to hold branches.
1781
1752
1782
1753
New branches created under the repository directory will store their
1783
revisions in the repository, not in the branch directory. For branches
1784
with shared history, this reduces the amount of storage needed and
1785
speeds up the creation of new branches.
1754
revisions in the repository, not in the branch directory.
1786
1755
1787
If the --no-trees option is given then the branches in the repository
1788
will not have working trees by default. They will still exist as
1789
directories on disk, but they will not have separate copies of the
1790
files at a certain revision. This can be useful for repositories that
1791
store branches which are interacted with through checkouts or remote
1792
branches, such as on a server.
1756
If the --no-trees option is used then the branches in the repository
1757
will not have working trees by default.
1793
1758
1794
1759
:Examples:
1795
Create a shared repository holding just branches::
1760
Create a shared repositories holding just branches::
1796
1761
1797
1762
bzr init-repo --no-trees repo
1798
1763
bzr init repo/trunk
1837
1802
1838
1803
1839
1804
class cmd_diff(Command):
1840
__doc__ = """Show differences in the working tree, between revisions or branches.
1805
"""Show differences in the working tree, between revisions or branches.
1841
1806
1842
1807
If no arguments are given, all changes for the current tree are listed.
1843
1808
If files are given, only the changes in those files are listed.
1864
1829
1865
1830
bzr diff -r1
1866
1831
1867
Difference between revision 3 and revision 1::
1868
1869
bzr diff -r1..3
1870
1871
Difference between revision 3 and revision 1 for branch xxx::
1872
1873
bzr diff -r1..3 xxx
1874
1875
To see the changes introduced in revision X::
1876
1877
bzr diff -cX
1878
1879
Note that in the case of a merge, the -c option shows the changes
1880
compared to the left hand parent. To see the changes against
1881
another parent, use::
1882
1883
bzr diff -r<chosen_parent>..X
1884
1885
The changes introduced by revision 2 (equivalent to -r1..2)::
1886
1887
bzr diff -c2
1832
Difference between revision 2 and revision 1::
1833
1834
bzr diff -r1..2
1835
1836
Difference between revision 2 and revision 1 for branch xxx::
1837
1838
bzr diff -r1..2 xxx
1888
1839
1889
1840
Show just the differences for file NEWS::
1890
1841
1929
1880
help='Use this command to compare files.',
1930
1881
type=unicode,
1931
1882
),
1932
RegistryOption('format',
1933
help='Diff format to use.',
1934
lazy_registry=('bzrlib.diff', 'format_registry'),
1935
value_switches=False, title='Diff format'),
1936
1883
]
1937
1884
aliases = ['di', 'dif']
1938
1885
encoding_type = 'exact'
1939
1886
1940
1887
@display_command
1941
1888
def run(self, revision=None, file_list=None, diff_options=None,
1942
prefix=None, old=None, new=None, using=None, format=None):
1943
from bzrlib.diff import (get_trees_and_branches_to_diff_locked,
1944
show_diff_trees)
1889
prefix=None, old=None, new=None, using=None):
1890
from bzrlib.diff import get_trees_and_branches_to_diff, show_diff_trees
1945
1891
1946
1892
if (prefix is None) or (prefix == '0'):
1947
1893
# diff -p0 format
1961
1907
raise errors.BzrCommandError('bzr diff --revision takes exactly'
1962
1908
' one or two revision specifiers')
1963
1909
1964
if using is not None and format is not None:
1965
raise errors.BzrCommandError('--using and --format are mutually '
1966
'exclusive.')
1967
1968
1910
(old_tree, new_tree,
1969
1911
old_branch, new_branch,
1970
specific_files, extra_trees) = get_trees_and_branches_to_diff_locked(
1971
file_list, revision, old, new, self.add_cleanup, apply_view=True)
1912
specific_files, extra_trees) = get_trees_and_branches_to_diff(
1913
file_list, revision, old, new, apply_view=True)
1972
1914
return show_diff_trees(old_tree, new_tree, sys.stdout,
1973
1915
specific_files=specific_files,
1974
1916
external_diff_options=diff_options,
1975
1917
old_label=old_label, new_label=new_label,
1976
extra_trees=extra_trees, using=using,
1977
format_cls=format)
1918
extra_trees=extra_trees, using=using)
1978
1919
1979
1920
1980
1921
class cmd_deleted(Command):
1981
__doc__ = """List files deleted in the working tree.
1922
"""List files deleted in the working tree.
1982
1923
"""
1983
1924
# TODO: Show files deleted since a previous revision, or
1984
1925
# between two revisions.
1992
1933
@display_command
1993
1934
def run(self, show_ids=False):
1994
1935
tree = WorkingTree.open_containing(u'.')[0]
1995
self.add_cleanup(tree.lock_read().unlock)
1996
old = tree.basis_tree()
1997
self.add_cleanup(old.lock_read().unlock)
1998
for path, ie in old.inventory.iter_entries():
1999
if not tree.has_id(ie.file_id):
2000
self.outf.write(path)
2001
if show_ids:
2002
self.outf.write(' ')
2003
self.outf.write(ie.file_id)
2004
self.outf.write('\n')
1936
tree.lock_read()
1937
try:
1938
old = tree.basis_tree()
1939
old.lock_read()
1940
try:
1941
for path, ie in old.inventory.iter_entries():
1942
if not tree.has_id(ie.file_id):
1943
self.outf.write(path)
1944
if show_ids:
1945
self.outf.write(' ')
1946
self.outf.write(ie.file_id)
1947
self.outf.write('\n')
1948
finally:
1949
old.unlock()
1950
finally:
1951
tree.unlock()
2005
1952
2006
1953
2007
1954
class cmd_modified(Command):
2008
__doc__ = """List files modified in working tree.
1955
"""List files modified in working tree.
2009
1956
"""
2010
1957
2011
1958
hidden = True
2028
1975
2029
1976
2030
1977
class cmd_added(Command):
2031
__doc__ = """List files added in working tree.
1978
"""List files added in working tree.
2032
1979
"""
2033
1980
2034
1981
hidden = True
2042
1989
@display_command
2043
1990
def run(self, null=False):
2044
1991
wt = WorkingTree.open_containing(u'.')[0]
2045
self.add_cleanup(wt.lock_read().unlock)
2046
basis = wt.basis_tree()
2047
self.add_cleanup(basis.lock_read().unlock)
2048
basis_inv = basis.inventory
2049
inv = wt.inventory
2050
for file_id in inv:
2051
if file_id in basis_inv:
2052
continue
2053
if inv.is_root(file_id) and len(basis_inv) == 0:
2054
continue
2055
path = inv.id2path(file_id)
2056
if not os.access(osutils.abspath(path), os.F_OK):
2057
continue
2058
if null:
2059
self.outf.write(path + '\0')
2060
else:
2061
self.outf.write(osutils.quotefn(path) + '\n')
1992
wt.lock_read()
1993
try:
1994
basis = wt.basis_tree()
1995
basis.lock_read()
1996
try:
1997
basis_inv = basis.inventory
1998
inv = wt.inventory
1999
for file_id in inv:
2000
if file_id in basis_inv:
2001
continue
2002
if inv.is_root(file_id) and len(basis_inv) == 0:
2003
continue
2004
path = inv.id2path(file_id)
2005
if not os.access(osutils.abspath(path), os.F_OK):
2006
continue
2007
if null:
2008
self.outf.write(path + '\0')
2009
else:
2010
self.outf.write(osutils.quotefn(path) + '\n')
2011
finally:
2012
basis.unlock()
2013
finally:
2014
wt.unlock()
2062
2015
2063
2016
2064
2017
class cmd_root(Command):
2065
__doc__ = """Show the tree root directory.
2018
"""Show the tree root directory.
2066
2019
2067
2020
The root is the nearest enclosing directory with a .bzr control
2068
2021
directory."""
2092
2045
2093
2046
2094
2047
class cmd_log(Command):
2095
__doc__ = """Show historical log for a branch or subset of a branch.
2048
"""Show historical log for a branch or subset of a branch.
2096
2049
2097
2050
log is bzr's default tool for exploring the history of a branch.
2098
2051
The branch to use is taken from the first parameter. If no parameters
2209
2162
:Tips & tricks:
2210
2163
2211
2164
GUI tools and IDEs are often better at exploring history than command
2212
line tools: you may prefer qlog or viz from qbzr or bzr-gtk, the
2213
bzr-explorer shell, or the Loggerhead web interface. See the Plugin
2214
Guide <http://doc.bazaar.canonical.com/plugins/en/> and
2215
<http://wiki.bazaar.canonical.com/IDEIntegration>.
2165
line tools. You may prefer qlog or glog from the QBzr and Bzr-Gtk packages
2166
respectively for example. (TortoiseBzr uses qlog for displaying logs.) See
2167
http://bazaar-vcs.org/BzrPlugins and http://bazaar-vcs.org/IDEIntegration.
2168
2169
Web interfaces are often better at exploring history than command line
2170
tools, particularly for branches on servers. You may prefer Loggerhead
2171
or one of its alternatives. See http://bazaar-vcs.org/WebInterface.
2216
2172
2217
2173
You may find it useful to add the aliases below to ``bazaar.conf``::
2218
2174
2279
2235
help='Show changes made in each revision as a patch.'),
2280
2236
Option('include-merges',
2281
2237
help='Show merged revisions like --levels 0 does.'),
2282
Option('exclude-common-ancestry',
2283
help='Display only the revisions that are not part'
2284
' of both ancestries (require -rX..Y)'
2285
)
2286
2238
]
2287
2239
encoding_type = 'replace'
2288
2240
2298
2250
message=None,
2299
2251
limit=None,
2300
2252
show_diff=False,
2301
include_merges=False,
2302
exclude_common_ancestry=False,
2303
):
2253
include_merges=False):
2304
2254
from bzrlib.log import (
2305
2255
Logger,
2306
2256
make_log_request_dict,
2307
2257
_get_info_for_log_files,
2308
2258
)
2309
2259
direction = (forward and 'forward') or 'reverse'
2310
if (exclude_common_ancestry
2311
and (revision is None or len(revision) != 2)):
2312
raise errors.BzrCommandError(
2313
'--exclude-common-ancestry requires -r with two revisions')
2314
2260
if include_merges:
2315
2261
if levels is None:
2316
2262
levels = 0
2329
2275
2330
2276
file_ids = []
2331
2277
filter_by_dir = False
2332
if file_list:
2333
# find the file ids to log and check for directory filtering
2334
b, file_info_list, rev1, rev2 = _get_info_for_log_files(
2335
revision, file_list, self.add_cleanup)
2336
for relpath, file_id, kind in file_info_list:
2337
if file_id is None:
2338
raise errors.BzrCommandError(
2339
"Path unknown at end or start of revision range: %s" %
2340
relpath)
2341
# If the relpath is the top of the tree, we log everything
2342
if relpath == '':
2343
file_ids = []
2344
break
2278
b = None
2279
try:
2280
if file_list:
2281
# find the file ids to log and check for directory filtering
2282
b, file_info_list, rev1, rev2 = _get_info_for_log_files(
2283
revision, file_list)
2284
for relpath, file_id, kind in file_info_list:
2285
if file_id is None:
2286
raise errors.BzrCommandError(
2287
"Path unknown at end or start of revision range: %s" %
2288
relpath)
2289
# If the relpath is the top of the tree, we log everything
2290
if relpath == '':
2291
file_ids = []
2292
break
2293
else:
2294
file_ids.append(file_id)
2295
filter_by_dir = filter_by_dir or (
2296
kind in ['directory', 'tree-reference'])
2297
else:
2298
# log everything
2299
# FIXME ? log the current subdir only RBC 20060203
2300
if revision is not None \
2301
and len(revision) > 0 and revision[0].get_branch():
2302
location = revision[0].get_branch()
2345
2303
else:
2346
file_ids.append(file_id)
2347
filter_by_dir = filter_by_dir or (
2348
kind in ['directory', 'tree-reference'])
2349
else:
2350
# log everything
2351
# FIXME ? log the current subdir only RBC 20060203
2352
if revision is not None \
2353
and len(revision) > 0 and revision[0].get_branch():
2354
location = revision[0].get_branch()
2355
else:
2356
location = '.'
2357
dir, relpath = bzrdir.BzrDir.open_containing(location)
2358
b = dir.open_branch()
2359
self.add_cleanup(b.lock_read().unlock)
2360
rev1, rev2 = _get_revision_range(revision, b, self.name())
2361
2362
# Decide on the type of delta & diff filtering to use
2363
# TODO: add an --all-files option to make this configurable & consistent
2364
if not verbose:
2365
delta_type = None
2366
else:
2367
delta_type = 'full'
2368
if not show_diff:
2369
diff_type = None
2370
elif file_ids:
2371
diff_type = 'partial'
2372
else:
2373
diff_type = 'full'
2374
2375
# Build the log formatter
2376
if log_format is None:
2377
log_format = log.log_formatter_registry.get_default(b)
2378
# Make a non-encoding output to include the diffs - bug 328007
2379
unencoded_output = ui.ui_factory.make_output_stream(encoding_type='exact')
2380
lf = log_format(show_ids=show_ids, to_file=self.outf,
2381
to_exact_file=unencoded_output,
2382
show_timezone=timezone,
2383
delta_format=get_verbosity_level(),
2384
levels=levels,
2385
show_advice=levels is None)
2386
2387
# Choose the algorithm for doing the logging. It's annoying
2388
# having multiple code paths like this but necessary until
2389
# the underlying repository format is faster at generating
2390
# deltas or can provide everything we need from the indices.
2391
# The default algorithm - match-using-deltas - works for
2392
# multiple files and directories and is faster for small
2393
# amounts of history (200 revisions say). However, it's too
2394
# slow for logging a single file in a repository with deep
2395
# history, i.e. > 10K revisions. In the spirit of "do no
2396
# evil when adding features", we continue to use the
2397
# original algorithm - per-file-graph - for the "single
2398
# file that isn't a directory without showing a delta" case.
2399
partial_history = revision and b.repository._format.supports_chks
2400
match_using_deltas = (len(file_ids) != 1 or filter_by_dir
2401
or delta_type or partial_history)
2402
2403
# Build the LogRequest and execute it
2404
if len(file_ids) == 0:
2405
file_ids = None
2406
rqst = make_log_request_dict(
2407
direction=direction, specific_fileids=file_ids,
2408
start_revision=rev1, end_revision=rev2, limit=limit,
2409
message_search=message, delta_type=delta_type,
2410
diff_type=diff_type, _match_using_deltas=match_using_deltas,
2411
exclude_common_ancestry=exclude_common_ancestry,
2412
)
2413
Logger(b, rqst).show(lf)
2304
location = '.'
2305
dir, relpath = bzrdir.BzrDir.open_containing(location)
2306
b = dir.open_branch()
2307
b.lock_read()
2308
rev1, rev2 = _get_revision_range(revision, b, self.name())
2309
2310
# Decide on the type of delta & diff filtering to use
2311
# TODO: add an --all-files option to make this configurable & consistent
2312
if not verbose:
2313
delta_type = None
2314
else:
2315
delta_type = 'full'
2316
if not show_diff:
2317
diff_type = None
2318
elif file_ids:
2319
diff_type = 'partial'
2320
else:
2321
diff_type = 'full'
2322
2323
# Build the log formatter
2324
if log_format is None:
2325
log_format = log.log_formatter_registry.get_default(b)
2326
lf = log_format(show_ids=show_ids, to_file=self.outf,
2327
show_timezone=timezone,
2328
delta_format=get_verbosity_level(),
2329
levels=levels,
2330
show_advice=levels is None)
2331
2332
# Choose the algorithm for doing the logging. It's annoying
2333
# having multiple code paths like this but necessary until
2334
# the underlying repository format is faster at generating
2335
# deltas or can provide everything we need from the indices.
2336
# The default algorithm - match-using-deltas - works for
2337
# multiple files and directories and is faster for small
2338
# amounts of history (200 revisions say). However, it's too
2339
# slow for logging a single file in a repository with deep
2340
# history, i.e. > 10K revisions. In the spirit of "do no
2341
# evil when adding features", we continue to use the
2342
# original algorithm - per-file-graph - for the "single
2343
# file that isn't a directory without showing a delta" case.
2344
partial_history = revision and b.repository._format.supports_chks
2345
match_using_deltas = (len(file_ids) != 1 or filter_by_dir
2346
or delta_type or partial_history)
2347
2348
# Build the LogRequest and execute it
2349
if len(file_ids) == 0:
2350
file_ids = None
2351
rqst = make_log_request_dict(
2352
direction=direction, specific_fileids=file_ids,
2353
start_revision=rev1, end_revision=rev2, limit=limit,
2354
message_search=message, delta_type=delta_type,
2355
diff_type=diff_type, _match_using_deltas=match_using_deltas)
2356
Logger(b, rqst).show(lf)
2357
finally:
2358
if b is not None:
2359
b.unlock()
2414
2360
2415
2361
2416
2362
def _get_revision_range(revisionspec_list, branch, command_name):
2434
2380
raise errors.BzrCommandError(
2435
2381
"bzr %s doesn't accept two revisions in different"
2436
2382
" branches." % command_name)
2437
if start_spec.spec is None:
2438
# Avoid loading all the history.
2439
rev1 = RevisionInfo(branch, None, None)
2440
else:
2441
rev1 = start_spec.in_history(branch)
2383
rev1 = start_spec.in_history(branch)
2442
2384
# Avoid loading all of history when we know a missing
2443
2385
# end of range means the last revision ...
2444
2386
if end_spec.spec is None:
2473
2415
2474
2416
2475
2417
class cmd_touching_revisions(Command):
2476
__doc__ = """Return revision-ids which affected a particular file.
2418
"""Return revision-ids which affected a particular file.
2477
2419
2478
2420
A more user-friendly interface is "bzr log FILE".
2479
2421
"""
2486
2428
tree, relpath = WorkingTree.open_containing(filename)
2487
2429
file_id = tree.path2id(relpath)
2488
2430
b = tree.branch
2489
self.add_cleanup(b.lock_read().unlock)
2490
touching_revs = log.find_touching_revisions(b, file_id)
2491
for revno, revision_id, what in touching_revs:
2492
self.outf.write("%6d %s\n" % (revno, what))
2431
b.lock_read()
2432
try:
2433
touching_revs = log.find_touching_revisions(b, file_id)
2434
for revno, revision_id, what in touching_revs:
2435
self.outf.write("%6d %s\n" % (revno, what))
2436
finally:
2437
b.unlock()
2493
2438
2494
2439
2495
2440
class cmd_ls(Command):
2496
__doc__ = """List files in a tree.
2441
"""List files in a tree.
2497
2442
"""
2498
2443
2499
2444
_see_also = ['status', 'cat']
2547
2492
if from_root:
2548
2493
if relpath:
2549
2494
prefix = relpath + '/'
2550
elif fs_path != '.' and not fs_path.endswith('/'):
2495
elif fs_path != '.':
2551
2496
prefix = fs_path + '/'
2552
2497
2553
2498
if revision is not None or tree is None:
2561
2506
view_str = views.view_display_str(view_files)
2562
2507
note("Ignoring files outside view. View is %s" % view_str)
2563
2508
2564
self.add_cleanup(tree.lock_read().unlock)
2565
for fp, fc, fkind, fid, entry in tree.list_files(include_root=False,
2566
from_dir=relpath, recursive=recursive):
2567
# Apply additional masking
2568
if not all and not selection[fc]:
2569
continue
2570
if kind is not None and fkind != kind:
2571
continue
2572
if apply_view:
2573
try:
2574
if relpath:
2575
fullpath = osutils.pathjoin(relpath, fp)
2576
else:
2577
fullpath = fp
2578
views.check_path_in_view(tree, fullpath)
2579
except errors.FileOutsideView:
2580
continue
2509
tree.lock_read()
2510
try:
2511
for fp, fc, fkind, fid, entry in tree.list_files(include_root=False,
2512
from_dir=relpath, recursive=recursive):
2513
# Apply additional masking
2514
if not all and not selection[fc]:
2515
continue
2516
if kind is not None and fkind != kind:
2517
continue
2518
if apply_view:
2519
try:
2520
if relpath:
2521
fullpath = osutils.pathjoin(relpath, fp)
2522
else:
2523
fullpath = fp
2524
views.check_path_in_view(tree, fullpath)
2525
except errors.FileOutsideView:
2526
continue
2581
2527
2582
# Output the entry
2583
if prefix:
2584
fp = osutils.pathjoin(prefix, fp)
2585
kindch = entry.kind_character()
2586
outstring = fp + kindch
2587
ui.ui_factory.clear_term()
2588
if verbose:
2589
outstring = '%-8s %s' % (fc, outstring)
2590
if show_ids and fid is not None:
2591
outstring = "%-50s %s" % (outstring, fid)
2592
self.outf.write(outstring + '\n')
2593
elif null:
2594
self.outf.write(fp + '\0')
2595
if show_ids:
2596
if fid is not None:
2597
self.outf.write(fid)
2598
self.outf.write('\0')
2599
self.outf.flush()
2600
else:
2601
if show_ids:
2602
if fid is not None:
2603
my_id = fid
2604
else:
2605
my_id = ''
2606
self.outf.write('%-50s %s\n' % (outstring, my_id))
2607
else:
2528
# Output the entry
2529
if prefix:
2530
fp = osutils.pathjoin(prefix, fp)
2531
kindch = entry.kind_character()
2532
outstring = fp + kindch
2533
ui.ui_factory.clear_term()
2534
if verbose:
2535
outstring = '%-8s %s' % (fc, outstring)
2536
if show_ids and fid is not None:
2537
outstring = "%-50s %s" % (outstring, fid)
2608
2538
self.outf.write(outstring + '\n')
2539
elif null:
2540
self.outf.write(fp + '\0')
2541
if show_ids:
2542
if fid is not None:
2543
self.outf.write(fid)
2544
self.outf.write('\0')
2545
self.outf.flush()
2546
else:
2547
if show_ids:
2548
if fid is not None:
2549
my_id = fid
2550
else:
2551
my_id = ''
2552
self.outf.write('%-50s %s\n' % (outstring, my_id))
2553
else:
2554
self.outf.write(outstring + '\n')
2555
finally:
2556
tree.unlock()
2609
2557
2610
2558
2611
2559
class cmd_unknowns(Command):
2612
__doc__ = """List unknown files.
2560
"""List unknown files.
2613
2561
"""
2614
2562
2615
2563
hidden = True
2622
2570
2623
2571
2624
2572
class cmd_ignore(Command):
2625
__doc__ = """Ignore specified files or patterns.
2573
"""Ignore specified files or patterns.
2626
2574
2627
2575
See ``bzr help patterns`` for details on the syntax of patterns.
2628
2576
2629
If a .bzrignore file does not exist, the ignore command
2630
will create one and add the specified files or patterns to the newly
2631
created file. The ignore command will also automatically add the
2632
.bzrignore file to be versioned. Creating a .bzrignore file without
2633
the use of the ignore command will require an explicit add command.
2634
2635
2577
To remove patterns from the ignore list, edit the .bzrignore file.
2636
2578
After adding, editing or deleting that file either indirectly by
2637
2579
using this command or directly by using an editor, be sure to commit
2638
2580
it.
2639
2640
Bazaar also supports a global ignore file ~/.bazaar/ignore. On Windows
2641
the global ignore file can be found in the application data directory as
2642
C:\\Documents and Settings\\<user>\\Application Data\\Bazaar\\2.0\\ignore.
2643
Global ignores are not touched by this command. The global ignore file
2644
can be edited directly using an editor.
2645
2646
Patterns prefixed with '!' are exceptions to ignore patterns and take
2647
precedence over regular ignores. Such exceptions are used to specify
2648
files that should be versioned which would otherwise be ignored.
2649
2650
Patterns prefixed with '!!' act as regular ignore patterns, but have
2651
precedence over the '!' exception patterns.
2652
2581
2653
2582
Note: ignore patterns containing shell wildcards must be quoted from
2654
2583
the shell on Unix.
2658
2587
2659
2588
bzr ignore ./Makefile
2660
2589
2661
Ignore .class files in all directories...::
2590
Ignore class files in all directories::
2662
2591
2663
2592
bzr ignore "*.class"
2664
2593
2665
...but do not ignore "special.class"::
2666
2667
bzr ignore "!special.class"
2668
2669
2594
Ignore .o files under the lib directory::
2670
2595
2671
2596
bzr ignore "lib/**/*.o"
2677
2602
Ignore everything but the "debian" toplevel directory::
2678
2603
2679
2604
bzr ignore "RE:(?!debian/).*"
2680
2681
Ignore everything except the "local" toplevel directory,
2682
but always ignore "*~" autosave files, even under local/::
2683
2684
bzr ignore "*"
2685
bzr ignore "!./local"
2686
bzr ignore "!!*~"
2687
2605
"""
2688
2606
2689
2607
_see_also = ['status', 'ignored', 'patterns']
2690
2608
takes_args = ['name_pattern*']
2691
2609
takes_options = [
2692
Option('default-rules',
2693
help='Display the default ignore rules that bzr uses.')
2610
Option('old-default-rules',
2611
help='Write out the ignore rules bzr < 0.9 always used.')
2694
2612
]
2695
2613
2696
def run(self, name_pattern_list=None, default_rules=None):
2614
def run(self, name_pattern_list=None, old_default_rules=None):
2697
2615
from bzrlib import ignores
2698
if default_rules is not None:
2699
# dump the default rules and exit
2700
for pattern in ignores.USER_DEFAULTS:
2701
self.outf.write("%s\n" % pattern)
2616
if old_default_rules is not None:
2617
# dump the rules and exit
2618
for pattern in ignores.OLD_DEFAULTS:
2619
print pattern
2702
2620
return
2703
2621
if not name_pattern_list:
2704
2622
raise errors.BzrCommandError("ignore requires at least one "
2705
"NAME_PATTERN or --default-rules.")
2623
"NAME_PATTERN or --old-default-rules")
2706
2624
name_pattern_list = [globbing.normalize_pattern(p)
2707
2625
for p in name_pattern_list]
2708
2626
for name_pattern in name_pattern_list:
2720
2638
if id is not None:
2721
2639
filename = entry[0]
2722
2640
if ignored.match(filename):
2723
matches.append(filename)
2641
matches.append(filename.encode('utf-8'))
2724
2642
tree.unlock()
2725
2643
if len(matches) > 0:
2726
self.outf.write("Warning: the following files are version controlled and"
2727
" match your ignore pattern:\n%s"
2728
"\nThese files will continue to be version controlled"
2729
" unless you 'bzr remove' them.\n" % ("\n".join(matches),))
2644
print "Warning: the following files are version controlled and" \
2645
" match your ignore pattern:\n%s" \
2646
"\nThese files will continue to be version controlled" \
2647
" unless you 'bzr remove' them." % ("\n".join(matches),)
2730
2648
2731
2649
2732
2650
class cmd_ignored(Command):
2733
__doc__ = """List ignored files and the patterns that matched them.
2651
"""List ignored files and the patterns that matched them.
2734
2652
2735
2653
List all the ignored files and the ignore pattern that caused the file to
2736
2654
be ignored.
2746
2664
@display_command
2747
2665
def run(self):
2748
2666
tree = WorkingTree.open_containing(u'.')[0]
2749
self.add_cleanup(tree.lock_read().unlock)
2750
for path, file_class, kind, file_id, entry in tree.list_files():
2751
if file_class != 'I':
2752
continue
2753
## XXX: Slightly inefficient since this was already calculated
2754
pat = tree.is_ignored(path)
2755
self.outf.write('%-50s %s\n' % (path, pat))
2667
tree.lock_read()
2668
try:
2669
for path, file_class, kind, file_id, entry in tree.list_files():
2670
if file_class != 'I':
2671
continue
2672
## XXX: Slightly inefficient since this was already calculated
2673
pat = tree.is_ignored(path)
2674
self.outf.write('%-50s %s\n' % (path, pat))
2675
finally:
2676
tree.unlock()
2756
2677
2757
2678
2758
2679
class cmd_lookup_revision(Command):
2759
__doc__ = """Lookup the revision-id from a revision-number
2680
"""Lookup the revision-id from a revision-number
2760
2681
2761
2682
:Examples:
2762
2683
bzr lookup-revision 33
2769
2690
try:
2770
2691
revno = int(revno)
2771
2692
except ValueError:
2772
raise errors.BzrCommandError("not a valid revision-number: %r"
2773
% revno)
2774
revid = WorkingTree.open_containing(u'.')[0].branch.get_rev_id(revno)
2775
self.outf.write("%s\n" % revid)
2693
raise errors.BzrCommandError("not a valid revision-number: %r" % revno)
2694
2695
print WorkingTree.open_containing(u'.')[0].branch.get_rev_id(revno)
2776
2696
2777
2697
2778
2698
class cmd_export(Command):
2779
__doc__ = """Export current or past revision to a destination directory or archive.
2699
"""Export current or past revision to a destination directory or archive.
2780
2700
2781
2701
If no revision is specified this exports the last committed revision.
2782
2702
2814
2734
Option('root',
2815
2735
type=str,
2816
2736
help="Name of the root directory inside the exported file."),
2817
Option('per-file-timestamps',
2818
help='Set modification time of files to that of the last '
2819
'revision in which it was changed.'),
2820
2737
]
2821
2738
def run(self, dest, branch_or_subdir=None, revision=None, format=None,
2822
root=None, filters=False, per_file_timestamps=False):
2739
root=None, filters=False):
2823
2740
from bzrlib.export import export
2824
2741
2825
2742
if branch_or_subdir is None:
2832
2749
2833
2750
rev_tree = _get_one_revision_tree('export', revision, branch=b, tree=tree)
2834
2751
try:
2835
export(rev_tree, dest, format, root, subdir, filtered=filters,
2836
per_file_timestamps=per_file_timestamps)
2752
export(rev_tree, dest, format, root, subdir, filtered=filters)
2837
2753
except errors.NoSuchExportFormat, e:
2838
2754
raise errors.BzrCommandError('Unsupported export format: %s' % e.format)
2839
2755
2840
2756
2841
2757
class cmd_cat(Command):
2842
__doc__ = """Write the contents of a file as of a given revision to standard output.
2758
"""Write the contents of a file as of a given revision to standard output.
2843
2759
2844
2760
If no revision is nominated, the last revision is used.
2845
2761
2865
2781
" one revision specifier")
2866
2782
tree, branch, relpath = \
2867
2783
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
2868
self.add_cleanup(branch.lock_read().unlock)
2869
return self._run(tree, branch, relpath, filename, revision,
2870
name_from_revision, filters)
2784
branch.lock_read()
2785
try:
2786
return self._run(tree, branch, relpath, filename, revision,
2787
name_from_revision, filters)
2788
finally:
2789
branch.unlock()
2871
2790
2872
2791
def _run(self, tree, b, relpath, filename, revision, name_from_revision,
2873
2792
filtered):
2874
2793
if tree is None:
2875
2794
tree = b.basis_tree()
2876
2795
rev_tree = _get_one_revision_tree('cat', revision, branch=b)
2877
self.add_cleanup(rev_tree.lock_read().unlock)
2878
2796
2879
2797
old_file_id = rev_tree.path2id(relpath)
2880
2798
2915
2833
chunks = content.splitlines(True)
2916
2834
content = filtered_output_bytes(chunks, filters,
2917
2835
ContentFilterContext(relpath, rev_tree))
2918
self.cleanup_now()
2919
2836
self.outf.writelines(content)
2920
2837
else:
2921
self.cleanup_now()
2922
2838
self.outf.write(content)
2923
2839
2924
2840
2925
2841
class cmd_local_time_offset(Command):
2926
__doc__ = """Show the offset in seconds from GMT to local time."""
2842
"""Show the offset in seconds from GMT to local time."""
2927
2843
hidden = True
2928
2844
@display_command
2929
2845
def run(self):
2930
self.outf.write("%s\n" % osutils.local_time_offset())
2846
print osutils.local_time_offset()
2931
2847
2932
2848
2933
2849
2934
2850
class cmd_commit(Command):
2935
__doc__ = """Commit changes into a new revision.
2851
"""Commit changes into a new revision.
2936
2852
2937
2853
An explanatory message needs to be given for each commit. This is
2938
2854
often done by using the --message option (getting the message from the
3031
2947
Option('strict',
3032
2948
help="Refuse to commit if there are unknown "
3033
2949
"files in the working tree."),
3034
Option('commit-time', type=str,
3035
help="Manually set a commit time using commit date "
3036
"format, e.g. '2009-10-10 08:00:00 +0100'."),
3037
2950
ListOption('fixes', type=str,
3038
2951
help="Mark a bug as being fixed by this revision "
3039
2952
"(see \"bzr help bugs\")."),
3046
2959
"the master branch until a normal commit "
3047
2960
"is performed."
3048
2961
),
3049
Option('show-diff', short_name='p',
3050
help='When no message is supplied, show the diff along'
3051
' with the status summary in the message editor.'),
2962
Option('show-diff',
2963
help='When no message is supplied, show the diff along'
2964
' with the status summary in the message editor.'),
3052
2965
]
3053
2966
aliases = ['ci', 'checkin']
3054
2967
3073
2986
3074
2987
def run(self, message=None, file=None, verbose=False, selected_list=None,
3075
2988
unchanged=False, strict=False, local=False, fixes=None,
3076
author=None, show_diff=False, exclude=None, commit_time=None):
2989
author=None, show_diff=False, exclude=None):
3077
2990
from bzrlib.errors import (
3078
2991
PointlessCommit,
3079
2992
ConflictsInTree,
3085
2998
make_commit_message_template_encoded
3086
2999
)
3087
3000
3088
commit_stamp = offset = None
3089
if commit_time is not None:
3090
try:
3091
commit_stamp, offset = timestamp.parse_patch_date(commit_time)
3092
except ValueError, e:
3093
raise errors.BzrCommandError(
3094
"Could not parse --commit-time: " + str(e))
3095
3096
3001
# TODO: Need a blackbox test for invoking the external editor; may be
3097
3002
# slightly problematic to run this cross-platform.
3098
3003
3118
3023
if local and not tree.branch.get_bound_location():
3119
3024
raise errors.LocalRequiresBoundBranch()
3120
3025
3121
if message is not None:
3122
try:
3123
file_exists = osutils.lexists(message)
3124
except UnicodeError:
3125
# The commit message contains unicode characters that can't be
3126
# represented in the filesystem encoding, so that can't be a
3127
# file.
3128
file_exists = False
3129
if file_exists:
3130
warning_msg = (
3131
'The commit message is a file name: "%(f)s".\n'
3132
'(use --file "%(f)s" to take commit message from that file)'
3133
% { 'f': message })
3134
ui.ui_factory.show_warning(warning_msg)
3135
if '\r' in message:
3136
message = message.replace('\r\n', '\n')
3137
message = message.replace('\r', '\n')
3138
if file:
3139
raise errors.BzrCommandError(
3140
"please specify either --message or --file")
3141
3142
3026
def get_message(commit_obj):
3143
3027
"""Callback to get commit message"""
3144
if file:
3145
my_message = codecs.open(
3146
file, 'rt', osutils.get_user_encoding()).read()
3147
elif message is not None:
3148
my_message = message
3149
else:
3150
# No message supplied: make one up.
3151
# text is the status of the tree
3152
text = make_commit_message_template_encoded(tree,
3028
my_message = message
3029
if my_message is not None and '\r' in my_message:
3030
my_message = my_message.replace('\r\n', '\n')
3031
my_message = my_message.replace('\r', '\n')
3032
if my_message is None and not file:
3033
t = make_commit_message_template_encoded(tree,
3153
3034
selected_list, diff=show_diff,
3154
3035
output_encoding=osutils.get_user_encoding())
3155
# start_message is the template generated from hooks
3156
# XXX: Warning - looks like hooks return unicode,
3157
# make_commit_message_template_encoded returns user encoding.
3158
# We probably want to be using edit_commit_message instead to
3159
# avoid this.
3160
3036
start_message = generate_commit_message_template(commit_obj)
3161
my_message = edit_commit_message_encoded(text,
3037
my_message = edit_commit_message_encoded(t,
3162
3038
start_message=start_message)
3163
3039
if my_message is None:
3164
3040
raise errors.BzrCommandError("please specify a commit"
3165
3041
" message with either --message or --file")
3042
elif my_message and file:
3043
raise errors.BzrCommandError(
3044
"please specify either --message or --file")
3045
if file:
3046
my_message = codecs.open(file, 'rt',
3047
osutils.get_user_encoding()).read()
3166
3048
if my_message == "":
3167
3049
raise errors.BzrCommandError("empty commit message specified")
3168
3050
return my_message
3176
3058
specific_files=selected_list,
3177
3059
allow_pointless=unchanged, strict=strict, local=local,
3178
3060
reporter=None, verbose=verbose, revprops=properties,
3179
authors=author, timestamp=commit_stamp,
3180
timezone=offset,
3061
authors=author,
3181
3062
exclude=safe_relpath_files(tree, exclude))
3182
3063
except PointlessCommit:
3064
# FIXME: This should really happen before the file is read in;
3065
# perhaps prepare the commit; get the message; then actually commit
3183
3066
raise errors.BzrCommandError("No changes to commit."
3184
3067
" Use --unchanged to commit anyhow.")
3185
3068
except ConflictsInTree:
3190
3073
raise errors.BzrCommandError("Commit refused because there are"
3191
3074
" unknown files in the working tree.")
3192
3075
except errors.BoundBranchOutOfDate, e:
3193
e.extra_help = ("\n"
3194
'To commit to master branch, run update and then commit.\n'
3195
'You can also pass --local to commit to continue working '
3196
'disconnected.')
3197
raise
3076
raise errors.BzrCommandError(str(e) + "\n"
3077
'To commit to master branch, run update and then commit.\n'
3078
'You can also pass --local to commit to continue working '
3079
'disconnected.')
3198
3080
3199
3081
3200
3082
class cmd_check(Command):
3201
__doc__ = """Validate working tree structure, branch consistency and repository history.
3083
"""Validate working tree structure, branch consistency and repository history.
3202
3084
3203
3085
This command checks various invariants about branch and repository storage
3204
3086
to detect data corruption or bzr bugs.
3268
3150
3269
3151
3270
3152
class cmd_upgrade(Command):
3271
__doc__ = """Upgrade branch storage to current format.
3153
"""Upgrade branch storage to current format.
3272
3154
3273
3155
The check command or bzr developers may sometimes advise you to run
3274
3156
this command. When the default format has changed you may also be warned
3292
3174
3293
3175
3294
3176
class cmd_whoami(Command):
3295
__doc__ = """Show or set bzr user id.
3177
"""Show or set bzr user id.
3296
3178
3297
3179
:Examples:
3298
3180
Show the email of the current user::
3342
3224
3343
3225
3344
3226
class cmd_nick(Command):
3345
__doc__ = """Print or set the branch nickname.
3227
"""Print or set the branch nickname.
3346
3228
3347
3229
If unset, the tree root directory name is used as the nickname.
3348
3230
To print the current nickname, execute with no argument.
3362
3244
3363
3245
@display_command
3364
3246
def printme(self, branch):
3365
self.outf.write('%s\n' % branch.nick)
3247
print branch.nick
3366
3248
3367
3249
3368
3250
class cmd_alias(Command):
3369
__doc__ = """Set/unset and display aliases.
3251
"""Set/unset and display aliases.
3370
3252
3371
3253
:Examples:
3372
3254
Show the current aliases::
3436
3318
3437
3319
3438
3320
class cmd_selftest(Command):
3439
__doc__ = """Run internal test suite.
3321
"""Run internal test suite.
3440
3322
3441
3323
If arguments are given, they are regular expressions that say which tests
3442
3324
should run. Tests matching any expression are run, and other tests are
3486
3368
def get_transport_type(typestring):
3487
3369
"""Parse and return a transport specifier."""
3488
3370
if typestring == "sftp":
3489
from bzrlib.tests import stub_sftp
3490
return stub_sftp.SFTPAbsoluteServer
3371
from bzrlib.transport.sftp import SFTPAbsoluteServer
3372
return SFTPAbsoluteServer
3491
3373
if typestring == "memory":
3492
from bzrlib.tests import test_server
3493
return memory.MemoryServer
3374
from bzrlib.transport.memory import MemoryServer
3375
return MemoryServer
3494
3376
if typestring == "fakenfs":
3495
from bzrlib.tests import test_server
3496
return test_server.FakeNFSServer
3377
from bzrlib.transport.fakenfs import FakeNFSServer
3378
return FakeNFSServer
3497
3379
msg = "No known transport type %s. Supported types are: sftp\n" %\
3498
3380
(typestring)
3499
3381
raise errors.BzrCommandError(msg)
3583
3465
raise errors.BzrCommandError("subunit not available. subunit "
3584
3466
"needs to be installed to use --subunit.")
3585
3467
self.additional_selftest_args['runner_class'] = SubUnitBzrRunner
3586
# On Windows, disable automatic conversion of '\n' to '\r\n' in
3587
# stdout, which would corrupt the subunit stream.
3588
if sys.platform == "win32" and sys.stdout.fileno() >= 0:
3589
import msvcrt
3590
msvcrt.setmode(sys.stdout.fileno(), os.O_BINARY)
3591
3468
if parallel:
3592
3469
self.additional_selftest_args.setdefault(
3593
3470
'suite_decorators', []).append(parallel)
3597
3474
verbose = not is_quiet()
3598
3475
# TODO: should possibly lock the history file...
3599
3476
benchfile = open(".perf_history", "at", buffering=1)
3600
self.add_cleanup(benchfile.close)
3601
3477
else:
3602
3478
test_suite_factory = None
3603
3479
benchfile = None
3604
selftest_kwargs = {"verbose": verbose,
3605
"pattern": pattern,
3606
"stop_on_failure": one,
3607
"transport": transport,
3608
"test_suite_factory": test_suite_factory,
3609
"lsprof_timed": lsprof_timed,
3610
"lsprof_tests": lsprof_tests,
3611
"bench_history": benchfile,
3612
"matching_tests_first": first,
3613
"list_only": list_only,
3614
"random_seed": randomize,
3615
"exclude_pattern": exclude,
3616
"strict": strict,
3617
"load_list": load_list,
3618
"debug_flags": debugflag,
3619
"starting_with": starting_with
3620
}
3621
selftest_kwargs.update(self.additional_selftest_args)
3622
result = selftest(**selftest_kwargs)
3480
try:
3481
selftest_kwargs = {"verbose": verbose,
3482
"pattern": pattern,
3483
"stop_on_failure": one,
3484
"transport": transport,
3485
"test_suite_factory": test_suite_factory,
3486
"lsprof_timed": lsprof_timed,
3487
"lsprof_tests": lsprof_tests,
3488
"bench_history": benchfile,
3489
"matching_tests_first": first,
3490
"list_only": list_only,
3491
"random_seed": randomize,
3492
"exclude_pattern": exclude,
3493
"strict": strict,
3494
"load_list": load_list,
3495
"debug_flags": debugflag,
3496
"starting_with": starting_with
3497
}
3498
selftest_kwargs.update(self.additional_selftest_args)
3499
result = selftest(**selftest_kwargs)
3500
finally:
3501
if benchfile is not None:
3502
benchfile.close()
3623
3503
return int(not result)
3624
3504
3625
3505
3626
3506
class cmd_version(Command):
3627
__doc__ = """Show version of bzr."""
3507
"""Show version of bzr."""
3628
3508
3629
3509
encoding_type = 'replace'
3630
3510
takes_options = [
3641
3521
3642
3522
3643
3523
class cmd_rocks(Command):
3644
__doc__ = """Statement of optimism."""
3524
"""Statement of optimism."""
3645
3525
3646
3526
hidden = True
3647
3527
3648
3528
@display_command
3649
3529
def run(self):
3650
self.outf.write("It sure does!\n")
3530
print "It sure does!"
3651
3531
3652
3532
3653
3533
class cmd_find_merge_base(Command):
3654
__doc__ = """Find and print a base revision for merging two branches."""
3534
"""Find and print a base revision for merging two branches."""
3655
3535
# TODO: Options to specify revisions on either side, as if
3656
3536
# merging only part of the history.
3657
3537
takes_args = ['branch', 'other']
3663
3543
3664
3544
branch1 = Branch.open_containing(branch)[0]
3665
3545
branch2 = Branch.open_containing(other)[0]
3666
self.add_cleanup(branch1.lock_read().unlock)
3667
self.add_cleanup(branch2.lock_read().unlock)
3668
last1 = ensure_null(branch1.last_revision())
3669
last2 = ensure_null(branch2.last_revision())
3670
3671
graph = branch1.repository.get_graph(branch2.repository)
3672
base_rev_id = graph.find_unique_lca(last1, last2)
3673
3674
self.outf.write('merge base is revision %s\n' % base_rev_id)
3546
branch1.lock_read()
3547
try:
3548
branch2.lock_read()
3549
try:
3550
last1 = ensure_null(branch1.last_revision())
3551
last2 = ensure_null(branch2.last_revision())
3552
3553
graph = branch1.repository.get_graph(branch2.repository)
3554
base_rev_id = graph.find_unique_lca(last1, last2)
3555
3556
print 'merge base is revision %s' % base_rev_id
3557
finally:
3558
branch2.unlock()
3559
finally:
3560
branch1.unlock()
3675
3561
3676
3562
3677
3563
class cmd_merge(Command):
3678
__doc__ = """Perform a three-way merge.
3564
"""Perform a three-way merge.
3679
3565
3680
3566
The source of the merge can be specified either in the form of a branch,
3681
3567
or in the form of a path to a file containing a merge directive generated
3710
3596
committed to record the result of the merge.
3711
3597
3712
3598
merge refuses to run if there are any uncommitted changes, unless
3713
--force is given. The --force option can also be used to create a
3714
merge revision which has more than two parents.
3715
3716
If one would like to merge changes from the working tree of the other
3717
branch without merging any committed revisions, the --uncommitted option
3718
can be given.
3599
--force is given.
3719
3600
3720
3601
To select only some changes to merge, use "merge -i", which will prompt
3721
3602
you to apply each diff hunk and file change, similar to "shelve".
3733
3614
3734
3615
bzr merge -r 81..82 ../bzr.dev
3735
3616
3736
To apply a merge directive contained in /tmp/merge::
3617
To apply a merge directive contained in /tmp/merge:
3737
3618
3738
3619
bzr merge /tmp/merge
3739
3740
To create a merge revision with three parents from two branches
3741
feature1a and feature1b:
3742
3743
bzr merge ../feature1a
3744
bzr merge ../feature1b --force
3745
bzr commit -m 'revision with three parents'
3746
3620
"""
3747
3621
3748
3622
encoding_type = 'exact'
3806
3680
view_info = _get_view_info_for_change_reporter(tree)
3807
3681
change_reporter = delta._ChangeReporter(
3808
3682
unversioned_filter=tree.is_ignored, view_info=view_info)
3809
pb = ui.ui_factory.nested_progress_bar()
3810
self.add_cleanup(pb.finished)
3811
self.add_cleanup(tree.lock_write().unlock)
3812
if location is not None:
3813
try:
3814
mergeable = bundle.read_mergeable_from_url(location,
3815
possible_transports=possible_transports)
3816
except errors.NotABundle:
3817
mergeable = None
3683
cleanups = []
3684
try:
3685
pb = ui.ui_factory.nested_progress_bar()
3686
cleanups.append(pb.finished)
3687
tree.lock_write()
3688
cleanups.append(tree.unlock)
3689
if location is not None:
3690
try:
3691
mergeable = bundle.read_mergeable_from_url(location,
3692
possible_transports=possible_transports)
3693
except errors.NotABundle:
3694
mergeable = None
3695
else:
3696
if uncommitted:
3697
raise errors.BzrCommandError('Cannot use --uncommitted'
3698
' with bundles or merge directives.')
3699
3700
if revision is not None:
3701
raise errors.BzrCommandError(
3702
'Cannot use -r with merge directives or bundles')
3703
merger, verified = _mod_merge.Merger.from_mergeable(tree,
3704
mergeable, pb)
3705
3706
if merger is None and uncommitted:
3707
if revision is not None and len(revision) > 0:
3708
raise errors.BzrCommandError('Cannot use --uncommitted and'
3709
' --revision at the same time.')
3710
merger = self.get_merger_from_uncommitted(tree, location, pb,
3711
cleanups)
3712
allow_pending = False
3713
3714
if merger is None:
3715
merger, allow_pending = self._get_merger_from_branch(tree,
3716
location, revision, remember, possible_transports, pb)
3717
3718
merger.merge_type = merge_type
3719
merger.reprocess = reprocess
3720
merger.show_base = show_base
3721
self.sanity_check_merger(merger)
3722
if (merger.base_rev_id == merger.other_rev_id and
3723
merger.other_rev_id is not None):
3724
note('Nothing to do.')
3725
return 0
3726
if pull:
3727
if merger.interesting_files is not None:
3728
raise errors.BzrCommandError('Cannot pull individual files')
3729
if (merger.base_rev_id == tree.last_revision()):
3730
result = tree.pull(merger.other_branch, False,
3731
merger.other_rev_id)
3732
result.report(self.outf)
3733
return 0
3734
if merger.this_basis is None:
3735
raise errors.BzrCommandError(
3736
"This branch has no commits."
3737
" (perhaps you would prefer 'bzr pull')")
3738
if preview:
3739
return self._do_preview(merger, cleanups)
3740
elif interactive:
3741
return self._do_interactive(merger, cleanups)
3818
3742
else:
3819
if uncommitted:
3820
raise errors.BzrCommandError('Cannot use --uncommitted'
3821
' with bundles or merge directives.')
3822
3823
if revision is not None:
3824
raise errors.BzrCommandError(
3825
'Cannot use -r with merge directives or bundles')
3826
merger, verified = _mod_merge.Merger.from_mergeable(tree,
3827
mergeable, None)
3828
3829
if merger is None and uncommitted:
3830
if revision is not None and len(revision) > 0:
3831
raise errors.BzrCommandError('Cannot use --uncommitted and'
3832
' --revision at the same time.')
3833
merger = self.get_merger_from_uncommitted(tree, location, None)
3834
allow_pending = False
3835
3836
if merger is None:
3837
merger, allow_pending = self._get_merger_from_branch(tree,
3838
location, revision, remember, possible_transports, None)
3839
3840
merger.merge_type = merge_type
3841
merger.reprocess = reprocess
3842
merger.show_base = show_base
3843
self.sanity_check_merger(merger)
3844
if (merger.base_rev_id == merger.other_rev_id and
3845
merger.other_rev_id is not None):
3846
note('Nothing to do.')
3847
return 0
3848
if pull:
3849
if merger.interesting_files is not None:
3850
raise errors.BzrCommandError('Cannot pull individual files')
3851
if (merger.base_rev_id == tree.last_revision()):
3852
result = tree.pull(merger.other_branch, False,
3853
merger.other_rev_id)
3854
result.report(self.outf)
3855
return 0
3856
if merger.this_basis is None:
3857
raise errors.BzrCommandError(
3858
"This branch has no commits."
3859
" (perhaps you would prefer 'bzr pull')")
3860
if preview:
3861
return self._do_preview(merger)
3862
elif interactive:
3863
return self._do_interactive(merger)
3864
else:
3865
return self._do_merge(merger, change_reporter, allow_pending,
3866
verified)
3867
3868
def _get_preview(self, merger):
3743
return self._do_merge(merger, change_reporter, allow_pending,
3744
verified)
3745
finally:
3746
for cleanup in reversed(cleanups):
3747
cleanup()
3748
3749
def _get_preview(self, merger, cleanups):
3869
3750
tree_merger = merger.make_merger()
3870
3751
tt = tree_merger.make_preview_transform()
3871
self.add_cleanup(tt.finalize)
3752
cleanups.append(tt.finalize)
3872
3753
result_tree = tt.get_preview_tree()
3873
3754
return result_tree
3874
3755
3875
def _do_preview(self, merger):
3756
def _do_preview(self, merger, cleanups):
3876
3757
from bzrlib.diff import show_diff_trees
3877
result_tree = self._get_preview(merger)
3758
result_tree = self._get_preview(merger, cleanups)
3878
3759
show_diff_trees(merger.this_tree, result_tree, self.outf,
3879
3760
old_label='', new_label='')
3880
3761
3890
3771
else:
3891
3772
return 0
3892
3773
3893
def _do_interactive(self, merger):
3774
def _do_interactive(self, merger, cleanups):
3894
3775
"""Perform an interactive merge.
3895
3776
3896
3777
This works by generating a preview tree of the merge, then using
3898
3779
and the preview tree.
3899
3780
"""
3900
3781
from bzrlib import shelf_ui
3901
result_tree = self._get_preview(merger)
3782
result_tree = self._get_preview(merger, cleanups)
3902
3783
writer = bzrlib.option.diff_writer_registry.get()
3903
3784
shelver = shelf_ui.Shelver(merger.this_tree, result_tree, destroy=True,
3904
3785
reporter=shelf_ui.ApplyReporter(),
3905
3786
diff_writer=writer(sys.stdout))
3906
try:
3907
shelver.run()
3908
finally:
3909
shelver.finalize()
3787
shelver.run()
3910
3788
3911
3789
def sanity_check_merger(self, merger):
3912
3790
if (merger.show_base and
3972
3850
allow_pending = True
3973
3851
return merger, allow_pending
3974
3852
3975
def get_merger_from_uncommitted(self, tree, location, pb):
3853
def get_merger_from_uncommitted(self, tree, location, pb, cleanups):
3976
3854
"""Get a merger for uncommitted changes.
3977
3855
3978
3856
:param tree: The tree the merger should apply to.
3979
3857
:param location: The location containing uncommitted changes.
3980
3858
:param pb: The progress bar to use for showing progress.
3859
:param cleanups: A list of operations to perform to clean up the
3860
temporary directories, unfinalized objects, etc.
3981
3861
"""
3982
3862
location = self._select_branch_location(tree, location)[0]
3983
3863
other_tree, other_path = WorkingTree.open_containing(location)
4035
3915
4036
3916
4037
3917
class cmd_remerge(Command):
4038
__doc__ = """Redo a merge.
3918
"""Redo a merge.
4039
3919
4040
3920
Use this if you want to try a different merge technique while resolving
4041
3921
conflicts. Some merge techniques are better than others, and remerge
4066
3946
4067
3947
def run(self, file_list=None, merge_type=None, show_base=False,
4068
3948
reprocess=False):
4069
from bzrlib.conflicts import restore
4070
3949
if merge_type is None:
4071
3950
merge_type = _mod_merge.Merge3Merger
4072
3951
tree, file_list = tree_files(file_list)
4073
self.add_cleanup(tree.lock_write().unlock)
4074
parents = tree.get_parent_ids()
4075
if len(parents) != 2:
4076
raise errors.BzrCommandError("Sorry, remerge only works after normal"
4077
" merges. Not cherrypicking or"
4078
" multi-merges.")
4079
repository = tree.branch.repository
4080
interesting_ids = None
4081
new_conflicts = []
4082
conflicts = tree.conflicts()
4083
if file_list is not None:
4084
interesting_ids = set()
4085
for filename in file_list:
4086
file_id = tree.path2id(filename)
4087
if file_id is None:
4088
raise errors.NotVersionedError(filename)
4089
interesting_ids.add(file_id)
4090
if tree.kind(file_id) != "directory":
4091
continue
3952
tree.lock_write()
3953
try:
3954
parents = tree.get_parent_ids()
3955
if len(parents) != 2:
3956
raise errors.BzrCommandError("Sorry, remerge only works after normal"
3957
" merges. Not cherrypicking or"
3958
" multi-merges.")
3959
repository = tree.branch.repository
3960
interesting_ids = None
3961
new_conflicts = []
3962
conflicts = tree.conflicts()
3963
if file_list is not None:
3964
interesting_ids = set()
3965
for filename in file_list:
3966
file_id = tree.path2id(filename)
3967
if file_id is None:
3968
raise errors.NotVersionedError(filename)
3969
interesting_ids.add(file_id)
3970
if tree.kind(file_id) != "directory":
3971
continue
4092
3972
4093
for name, ie in tree.inventory.iter_entries(file_id):
4094
interesting_ids.add(ie.file_id)
4095
new_conflicts = conflicts.select_conflicts(tree, file_list)[0]
4096
else:
4097
# Remerge only supports resolving contents conflicts
4098
allowed_conflicts = ('text conflict', 'contents conflict')
4099
restore_files = [c.path for c in conflicts
4100
if c.typestring in allowed_conflicts]
4101
_mod_merge.transform_tree(tree, tree.basis_tree(), interesting_ids)
4102
tree.set_conflicts(ConflictList(new_conflicts))
4103
if file_list is not None:
4104
restore_files = file_list
4105
for filename in restore_files:
3973
for name, ie in tree.inventory.iter_entries(file_id):
3974
interesting_ids.add(ie.file_id)
3975
new_conflicts = conflicts.select_conflicts(tree, file_list)[0]
3976
else:
3977
# Remerge only supports resolving contents conflicts
3978
allowed_conflicts = ('text conflict', 'contents conflict')
3979
restore_files = [c.path for c in conflicts
3980
if c.typestring in allowed_conflicts]
3981
_mod_merge.transform_tree(tree, tree.basis_tree(), interesting_ids)
3982
tree.set_conflicts(ConflictList(new_conflicts))
3983
if file_list is not None:
3984
restore_files = file_list
3985
for filename in restore_files:
3986
try:
3987
restore(tree.abspath(filename))
3988
except errors.NotConflicted:
3989
pass
3990
# Disable pending merges, because the file texts we are remerging
3991
# have not had those merges performed. If we use the wrong parents
3992
# list, we imply that the working tree text has seen and rejected
3993
# all the changes from the other tree, when in fact those changes
3994
# have not yet been seen.
3995
pb = ui.ui_factory.nested_progress_bar()
3996
tree.set_parent_ids(parents[:1])
4106
3997
try:
4107
restore(tree.abspath(filename))
4108
except errors.NotConflicted:
4109
pass
4110
# Disable pending merges, because the file texts we are remerging
4111
# have not had those merges performed. If we use the wrong parents
4112
# list, we imply that the working tree text has seen and rejected
4113
# all the changes from the other tree, when in fact those changes
4114
# have not yet been seen.
4115
tree.set_parent_ids(parents[:1])
4116
try:
4117
merger = _mod_merge.Merger.from_revision_ids(None, tree, parents[1])
4118
merger.interesting_ids = interesting_ids
4119
merger.merge_type = merge_type
4120
merger.show_base = show_base
4121
merger.reprocess = reprocess
4122
conflicts = merger.do_merge()
3998
merger = _mod_merge.Merger.from_revision_ids(pb,
3999
tree, parents[1])
4000
merger.interesting_ids = interesting_ids
4001
merger.merge_type = merge_type
4002
merger.show_base = show_base
4003
merger.reprocess = reprocess
4004
conflicts = merger.do_merge()
4005
finally:
4006
tree.set_parent_ids(parents)
4007
pb.finished()
4123
4008
finally:
4124
tree.set_parent_ids(parents)
4009
tree.unlock()
4125
4010
if conflicts > 0:
4126
4011
return 1
4127
4012
else:
4129
4014
4130
4015
4131
4016
class cmd_revert(Command):
4132
__doc__ = """Revert files to a previous revision.
4017
"""Revert files to a previous revision.
4133
4018
4134
4019
Giving a list of files will revert only those files. Otherwise, all files
4135
4020
will be reverted. If the revision is not specified with '--revision', the
4149
4034
name. If you name a directory, all the contents of that directory will be
4150
4035
reverted.
4151
4036
4152
If you have newly added files since the target revision, they will be
4153
removed. If the files to be removed have been changed, backups will be
4154
created as above. Directories containing unknown files will not be
4155
deleted.
4037
Any files that have been newly added since that revision will be deleted,
4038
with a backup kept if appropriate. Directories containing unknown files
4039
will not be deleted.
4156
4040
4157
The working tree contains a list of revisions that have been merged but
4158
not yet committed. These revisions will be included as additional parents
4159
of the next commit. Normally, using revert clears that list as well as
4160
reverting the files. If any files are specified, revert leaves the list
4161
of uncommitted merges alone and reverts only the files. Use ``bzr revert
4162
.`` in the tree root to revert all files but keep the recorded merges,
4163
and ``bzr revert --forget-merges`` to clear the pending merge list without
4041
The working tree contains a list of pending merged revisions, which will
4042
be included as parents in the next commit. Normally, revert clears that
4043
list as well as reverting the files. If any files are specified, revert
4044
leaves the pending merge list alone and reverts only the files. Use "bzr
4045
revert ." in the tree root to revert all files but keep the merge record,
4046
and "bzr revert --forget-merges" to clear the pending merge list without
4164
4047
reverting any files.
4165
4166
Using "bzr revert --forget-merges", it is possible to apply all of the
4167
changes from a branch in a single revision. To do this, perform the merge
4168
as desired. Then doing revert with the "--forget-merges" option will keep
4169
the content of the tree as it was, but it will clear the list of pending
4170
merges. The next commit will then contain all of the changes that are
4171
present in the other branch, but without any other parent revisions.
4172
Because this technique forgets where these changes originated, it may
4173
cause additional conflicts on later merges involving the same source and
4174
target branches.
4175
4048
"""
4176
4049
4177
4050
_see_also = ['cat', 'export']
4186
4059
def run(self, revision=None, no_backup=False, file_list=None,
4187
4060
forget_merges=None):
4188
4061
tree, file_list = tree_files(file_list)
4189
self.add_cleanup(tree.lock_tree_write().unlock)
4190
if forget_merges:
4191
tree.set_parent_ids(tree.get_parent_ids()[:1])
4192
else:
4193
self._revert_tree_to_revision(tree, revision, file_list, no_backup)
4062
tree.lock_write()
4063
try:
4064
if forget_merges:
4065
tree.set_parent_ids(tree.get_parent_ids()[:1])
4066
else:
4067
self._revert_tree_to_revision(tree, revision, file_list, no_backup)
4068
finally:
4069
tree.unlock()
4194
4070
4195
4071
@staticmethod
4196
4072
def _revert_tree_to_revision(tree, revision, file_list, no_backup):
4197
4073
rev_tree = _get_one_revision_tree('revert', revision, tree=tree)
4198
tree.revert(file_list, rev_tree, not no_backup, None,
4199
report_changes=True)
4074
pb = ui.ui_factory.nested_progress_bar()
4075
try:
4076
tree.revert(file_list, rev_tree, not no_backup, pb,
4077
report_changes=True)
4078
finally:
4079
pb.finished()
4200
4080
4201
4081
4202
4082
class cmd_assert_fail(Command):
4203
__doc__ = """Test reporting of assertion failures"""
4083
"""Test reporting of assertion failures"""
4204
4084
# intended just for use in testing
4205
4085
4206
4086
hidden = True
4210
4090
4211
4091
4212
4092
class cmd_help(Command):
4213
__doc__ = """Show help on a command or other topic.
4093
"""Show help on a command or other topic.
4214
4094
"""
4215
4095
4216
4096
_see_also = ['topics']
4229
4109
4230
4110
4231
4111
class cmd_shell_complete(Command):
4232
__doc__ = """Show appropriate completions for context.
4112
"""Show appropriate completions for context.
4233
4113
4234
4114
For a list of all available commands, say 'bzr shell-complete'.
4235
4115
"""
4244
4124
4245
4125
4246
4126
class cmd_missing(Command):
4247
__doc__ = """Show unmerged/unpulled revisions between two branches.
4127
"""Show unmerged/unpulled revisions between two branches.
4248
4128
4249
4129
OTHER_BRANCH may be local or remote.
4250
4130
4251
4131
To filter on a range of revisions, you can use the command -r begin..end
4252
4132
-r revision requests a specific revision, -r ..end or -r begin.. are
4253
4133
also valid.
4254
4255
:Exit values:
4256
1 - some missing revisions
4257
0 - no missing revisions
4258
4134
4259
4135
:Examples:
4260
4136
4328
4204
restrict = 'remote'
4329
4205
4330
4206
local_branch = Branch.open_containing(u".")[0]
4331
self.add_cleanup(local_branch.lock_read().unlock)
4332
4333
4207
parent = local_branch.get_parent()
4334
4208
if other_branch is None:
4335
4209
other_branch = parent
4344
4218
remote_branch = Branch.open(other_branch)
4345
4219
if remote_branch.base == local_branch.base:
4346
4220
remote_branch = local_branch
4347
else:
4348
self.add_cleanup(remote_branch.lock_read().unlock)
4349
4221
4350
4222
local_revid_range = _revision_range_to_revid_range(
4351
4223
_get_revision_range(my_revision, local_branch,
4355
4227
_get_revision_range(revision,
4356
4228
remote_branch, self.name()))
4357
4229
4358
local_extra, remote_extra = find_unmerged(
4359
local_branch, remote_branch, restrict,
4360
backward=not reverse,
4361
include_merges=include_merges,
4362
local_revid_range=local_revid_range,
4363
remote_revid_range=remote_revid_range)
4364
4365
if log_format is None:
4366
registry = log.log_formatter_registry
4367
log_format = registry.get_default(local_branch)
4368
lf = log_format(to_file=self.outf,
4369
show_ids=show_ids,
4370
show_timezone='original')
4371
4372
status_code = 0
4373
if local_extra and not theirs_only:
4374
message("You have %d extra revision(s):\n" %
4375
len(local_extra))
4376
for revision in iter_log_revisions(local_extra,
4377
local_branch.repository,
4378
verbose):
4379
lf.log_revision(revision)
4380
printed_local = True
4381
status_code = 1
4382
else:
4383
printed_local = False
4384
4385
if remote_extra and not mine_only:
4386
if printed_local is True:
4387
message("\n\n\n")
4388
message("You are missing %d revision(s):\n" %
4389
len(remote_extra))
4390
for revision in iter_log_revisions(remote_extra,
4391
remote_branch.repository,
4392
verbose):
4393
lf.log_revision(revision)
4394
status_code = 1
4395
4396
if mine_only and not local_extra:
4397
# We checked local, and found nothing extra
4398
message('This branch is up to date.\n')
4399
elif theirs_only and not remote_extra:
4400
# We checked remote, and found nothing extra
4401
message('Other branch is up to date.\n')
4402
elif not (mine_only or theirs_only or local_extra or
4403
remote_extra):
4404
# We checked both branches, and neither one had extra
4405
# revisions
4406
message("Branches are up to date.\n")
4407
self.cleanup_now()
4230
local_branch.lock_read()
4231
try:
4232
remote_branch.lock_read()
4233
try:
4234
local_extra, remote_extra = find_unmerged(
4235
local_branch, remote_branch, restrict,
4236
backward=not reverse,
4237
include_merges=include_merges,
4238
local_revid_range=local_revid_range,
4239
remote_revid_range=remote_revid_range)
4240
4241
if log_format is None:
4242
registry = log.log_formatter_registry
4243
log_format = registry.get_default(local_branch)
4244
lf = log_format(to_file=self.outf,
4245
show_ids=show_ids,
4246
show_timezone='original')
4247
4248
status_code = 0
4249
if local_extra and not theirs_only:
4250
message("You have %d extra revision(s):\n" %
4251
len(local_extra))
4252
for revision in iter_log_revisions(local_extra,
4253
local_branch.repository,
4254
verbose):
4255
lf.log_revision(revision)
4256
printed_local = True
4257
status_code = 1
4258
else:
4259
printed_local = False
4260
4261
if remote_extra and not mine_only:
4262
if printed_local is True:
4263
message("\n\n\n")
4264
message("You are missing %d revision(s):\n" %
4265
len(remote_extra))
4266
for revision in iter_log_revisions(remote_extra,
4267
remote_branch.repository,
4268
verbose):
4269
lf.log_revision(revision)
4270
status_code = 1
4271
4272
if mine_only and not local_extra:
4273
# We checked local, and found nothing extra
4274
message('This branch is up to date.\n')
4275
elif theirs_only and not remote_extra:
4276
# We checked remote, and found nothing extra
4277
message('Other branch is up to date.\n')
4278
elif not (mine_only or theirs_only or local_extra or
4279
remote_extra):
4280
# We checked both branches, and neither one had extra
4281
# revisions
4282
message("Branches are up to date.\n")
4283
finally:
4284
remote_branch.unlock()
4285
finally:
4286
local_branch.unlock()
4408
4287
if not status_code and parent is None and other_branch is not None:
4409
self.add_cleanup(local_branch.lock_write().unlock)
4410
# handle race conditions - a parent might be set while we run.
4411
if local_branch.get_parent() is None:
4412
local_branch.set_parent(remote_branch.base)
4288
local_branch.lock_write()
4289
try:
4290
# handle race conditions - a parent might be set while we run.
4291
if local_branch.get_parent() is None:
4292
local_branch.set_parent(remote_branch.base)
4293
finally:
4294
local_branch.unlock()
4413
4295
return status_code
4414
4296
4415
4297
4416
4298
class cmd_pack(Command):
4417
__doc__ = """Compress the data within a repository.
4418
4419
This operation compresses the data within a bazaar repository. As
4420
bazaar supports automatic packing of repository, this operation is
4421
normally not required to be done manually.
4422
4423
During the pack operation, bazaar takes a backup of existing repository
4424
data, i.e. pack files. This backup is eventually removed by bazaar
4425
automatically when it is safe to do so. To save disk space by removing
4426
the backed up pack files, the --clean-obsolete-packs option may be
4427
used.
4428
4429
Warning: If you use --clean-obsolete-packs and your machine crashes
4430
during or immediately after repacking, you may be left with a state
4431
where the deletion has been written to disk but the new packs have not
4432
been. In this case the repository may be unusable.
4433
"""
4299
"""Compress the data within a repository."""
4434
4300
4435
4301
_see_also = ['repositories']
4436
4302
takes_args = ['branch_or_repo?']
4437
takes_options = [
4438
Option('clean-obsolete-packs', 'Delete obsolete packs to save disk space.'),
4439
]
4440
4303
4441
def run(self, branch_or_repo='.', clean_obsolete_packs=False):
4304
def run(self, branch_or_repo='.'):
4442
4305
dir = bzrdir.BzrDir.open_containing(branch_or_repo)[0]
4443
4306
try:
4444
4307
branch = dir.open_branch()
4445
4308
repository = branch.repository
4446
4309
except errors.NotBranchError:
4447
4310
repository = dir.open_repository()
4448
repository.pack(clean_obsolete_packs=clean_obsolete_packs)
4311
repository.pack()
4449
4312
4450
4313
4451
4314
class cmd_plugins(Command):
4452
__doc__ = """List the installed plugins.
4315
"""List the installed plugins.
4453
4316
4454
4317
This command displays the list of installed plugins including
4455
4318
version of plugin and a short description of each.
4462
4325
adding new commands, providing additional network transports and
4463
4326
customizing log output.
4464
4327
4465
See the Bazaar Plugin Guide <http://doc.bazaar.canonical.com/plugins/en/>
4466
for further information on plugins including where to find them and how to
4467
install them. Instructions are also provided there on how to write new
4468
plugins using the Python programming language.
4328
See the Bazaar web site, http://bazaar-vcs.org, for further
4329
information on plugins including where to find them and how to
4330
install them. Instructions are also provided there on how to
4331
write new plugins using the Python programming language.
4469
4332
"""
4470
4333
takes_options = ['verbose']
4471
4334
4486
4349
doc = '(no description)'
4487
4350
result.append((name_ver, doc, plugin.path()))
4488
4351
for name_ver, doc, path in sorted(result):
4489
self.outf.write("%s\n" % name_ver)
4490
self.outf.write(" %s\n" % doc)
4352
print name_ver
4353
print ' ', doc
4491
4354
if verbose:
4492
self.outf.write(" %s\n" % path)
4493
self.outf.write("\n")
4355
print ' ', path
4356
print
4494
4357
4495
4358
4496
4359
class cmd_testament(Command):
4497
__doc__ = """Show testament (signing-form) of a revision."""
4360
"""Show testament (signing-form) of a revision."""
4498
4361
takes_options = [
4499
4362
'revision',
4500
4363
Option('long', help='Produce long-format testament.'),
4512
4375
b = Branch.open_containing(branch)[0]
4513
4376
else:
4514
4377
b = Branch.open(branch)
4515
self.add_cleanup(b.lock_read().unlock)
4516
if revision is None:
4517
rev_id = b.last_revision()
4518
else:
4519
rev_id = revision[0].as_revision_id(b)
4520
t = testament_class.from_revision(b.repository, rev_id)
4521
if long:
4522
sys.stdout.writelines(t.as_text_lines())
4523
else:
4524
sys.stdout.write(t.as_short_text())
4378
b.lock_read()
4379
try:
4380
if revision is None:
4381
rev_id = b.last_revision()
4382
else:
4383
rev_id = revision[0].as_revision_id(b)
4384
t = testament_class.from_revision(b.repository, rev_id)
4385
if long:
4386
sys.stdout.writelines(t.as_text_lines())
4387
else:
4388
sys.stdout.write(t.as_short_text())
4389
finally:
4390
b.unlock()
4525
4391
4526
4392
4527
4393
class cmd_annotate(Command):
4528
__doc__ = """Show the origin of each line in a file.
4394
"""Show the origin of each line in a file.
4529
4395
4530
4396
This prints out the given file with an annotation on the left side
4531
4397
indicating which revision, author and date introduced the change.
4552
4418
wt, branch, relpath = \
4553
4419
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
4554
4420
if wt is not None:
4555
self.add_cleanup(wt.lock_read().unlock)
4556
else:
4557
self.add_cleanup(branch.lock_read().unlock)
4558
tree = _get_one_revision_tree('annotate', revision, branch=branch)
4559
self.add_cleanup(tree.lock_read().unlock)
4560
if wt is not None:
4561
file_id = wt.path2id(relpath)
4562
else:
4563
file_id = tree.path2id(relpath)
4564
if file_id is None:
4565
raise errors.NotVersionedError(filename)
4566
file_version = tree.inventory[file_id].revision
4567
if wt is not None and revision is None:
4568
# If there is a tree and we're not annotating historical
4569
# versions, annotate the working tree's content.
4570
annotate_file_tree(wt, file_id, self.outf, long, all,
4571
show_ids=show_ids)
4572
else:
4573
annotate_file(branch, file_version, file_id, long, all, self.outf,
4574
show_ids=show_ids)
4421
wt.lock_read()
4422
else:
4423
branch.lock_read()
4424
try:
4425
tree = _get_one_revision_tree('annotate', revision, branch=branch)
4426
if wt is not None:
4427
file_id = wt.path2id(relpath)
4428
else:
4429
file_id = tree.path2id(relpath)
4430
if file_id is None:
4431
raise errors.NotVersionedError(filename)
4432
file_version = tree.inventory[file_id].revision
4433
if wt is not None and revision is None:
4434
# If there is a tree and we're not annotating historical
4435
# versions, annotate the working tree's content.
4436
annotate_file_tree(wt, file_id, self.outf, long, all,
4437
show_ids=show_ids)
4438
else:
4439
annotate_file(branch, file_version, file_id, long, all, self.outf,
4440
show_ids=show_ids)
4441
finally:
4442
if wt is not None:
4443
wt.unlock()
4444
else:
4445
branch.unlock()
4575
4446
4576
4447
4577
4448
class cmd_re_sign(Command):
4578
__doc__ = """Create a digital signature for an existing revision."""
4449
"""Create a digital signature for an existing revision."""
4579
4450
# TODO be able to replace existing ones.
4580
4451
4581
4452
hidden = True # is this right ?
4588
4459
if revision_id_list is None and revision is None:
4589
4460
raise errors.BzrCommandError('You must supply either --revision or a revision_id')
4590
4461
b = WorkingTree.open_containing(u'.')[0].branch
4591
self.add_cleanup(b.lock_write().unlock)
4592
return self._run(b, revision_id_list, revision)
4462
b.lock_write()
4463
try:
4464
return self._run(b, revision_id_list, revision)
4465
finally:
4466
b.unlock()
4593
4467
4594
4468
def _run(self, b, revision_id_list, revision):
4595
4469
import bzrlib.gpg as gpg
4640
4514
4641
4515
4642
4516
class cmd_bind(Command):
4643
__doc__ = """Convert the current branch into a checkout of the supplied branch.
4644
If no branch is supplied, rebind to the last bound location.
4517
"""Convert the current branch into a checkout of the supplied branch.
4645
4518
4646
4519
Once converted into a checkout, commits must succeed on the master branch
4647
4520
before they will be applied to the local branch.
4665
4538
'This format does not remember old locations.')
4666
4539
else:
4667
4540
if location is None:
4668
if b.get_bound_location() is not None:
4669
raise errors.BzrCommandError('Branch is already bound')
4670
else:
4671
raise errors.BzrCommandError('No location supplied '
4672
'and no previous location known')
4541
raise errors.BzrCommandError('No location supplied and no '
4542
'previous location known')
4673
4543
b_other = Branch.open(location)
4674
4544
try:
4675
4545
b.bind(b_other)
4681
4551
4682
4552
4683
4553
class cmd_unbind(Command):
4684
__doc__ = """Convert the current checkout into a regular branch.
4554
"""Convert the current checkout into a regular branch.
4685
4555
4686
4556
After unbinding, the local branch is considered independent and subsequent
4687
4557
commits will be local only.
4698
4568
4699
4569
4700
4570
class cmd_uncommit(Command):
4701
__doc__ = """Remove the last committed revision.
4571
"""Remove the last committed revision.
4702
4572
4703
4573
--verbose will print out what is being removed.
4704
4574
--dry-run will go through all the motions, but not actually
4744
4614
b = control.open_branch()
4745
4615
4746
4616
if tree is not None:
4747
self.add_cleanup(tree.lock_write().unlock)
4617
tree.lock_write()
4748
4618
else:
4749
self.add_cleanup(b.lock_write().unlock)
4750
return self._run(b, tree, dry_run, verbose, revision, force, local=local)
4619
b.lock_write()
4620
try:
4621
return self._run(b, tree, dry_run, verbose, revision, force,
4622
local=local)
4623
finally:
4624
if tree is not None:
4625
tree.unlock()
4626
else:
4627
b.unlock()
4751
4628
4752
4629
def _run(self, b, tree, dry_run, verbose, revision, force, local=False):
4753
4630
from bzrlib.log import log_formatter, show_log
4785
4662
end_revision=last_revno)
4786
4663
4787
4664
if dry_run:
4788
self.outf.write('Dry-run, pretending to remove'
4789
' the above revisions.\n')
4665
print 'Dry-run, pretending to remove the above revisions.'
4666
if not force:
4667
val = raw_input('Press <enter> to continue')
4790
4668
else:
4791
self.outf.write('The above revision(s) will be removed.\n')
4792
4793
if not force:
4794
if not ui.ui_factory.get_boolean('Are you sure'):
4795
self.outf.write('Canceled')
4796
return 0
4669
print 'The above revision(s) will be removed.'
4670
if not force:
4671
val = raw_input('Are you sure [y/N]? ')
4672
if val.lower() not in ('y', 'yes'):
4673
print 'Canceled'
4674
return 0
4797
4675
4798
4676
mutter('Uncommitting from {%s} to {%s}',
4799
4677
last_rev_id, rev_id)
4800
4678
uncommit(b, tree=tree, dry_run=dry_run, verbose=verbose,
4801
4679
revno=revno, local=local)
4802
self.outf.write('You can restore the old tip by running:\n'
4803
' bzr pull . -r revid:%s\n' % last_rev_id)
4680
note('You can restore the old tip by running:\n'
4681
' bzr pull . -r revid:%s', last_rev_id)
4804
4682
4805
4683
4806
4684
class cmd_break_lock(Command):
4807
__doc__ = """Break a dead lock on a repository, branch or working directory.
4685
"""Break a dead lock on a repository, branch or working directory.
4808
4686
4809
4687
CAUTION: Locks should only be broken when you are sure that the process
4810
4688
holding the lock has been stopped.
4811
4689
4812
You can get information on what locks are open via the 'bzr info
4813
[location]' command.
4690
You can get information on what locks are open via the 'bzr info' command.
4814
4691
4815
4692
:Examples:
4816
4693
bzr break-lock
4817
bzr break-lock bzr+ssh://example.com/bzr/foo
4818
4694
"""
4819
4695
takes_args = ['location?']
4820
4696
4829
4705
4830
4706
4831
4707
class cmd_wait_until_signalled(Command):
4832
__doc__ = """Test helper for test_start_and_stop_bzr_subprocess_send_signal.
4708
"""Test helper for test_start_and_stop_bzr_subprocess_send_signal.
4833
4709
4834
4710
This just prints a line to signal when it is ready, then blocks on stdin.
4835
4711
"""
4843
4719
4844
4720
4845
4721
class cmd_serve(Command):
4846
__doc__ = """Run the bzr server."""
4722
"""Run the bzr server."""
4847
4723
4848
4724
aliases = ['server']
4849
4725
4850
4726
takes_options = [
4851
4727
Option('inet',
4852
4728
help='Serve on stdin/out for use from inetd or sshd.'),
4853
RegistryOption('protocol',
4854
help="Protocol to serve.",
4729
RegistryOption('protocol',
4730
help="Protocol to serve.",
4855
4731
lazy_registry=('bzrlib.transport', 'transport_server_registry'),
4856
4732
value_switches=True),
4857
4733
Option('port',
4866
4742
Option('allow-writes',
4867
4743
help='By default the server is a readonly server. Supplying '
4868
4744
'--allow-writes enables write access to the contents of '
4869
'the served directory and below. Note that ``bzr serve`` '
4870
'does not perform authentication, so unless some form of '
4871
'external authentication is arranged supplying this '
4872
'option leads to global uncontrolled write access to your '
4873
'file system.'
4745
'the served directory and below.'
4874
4746
),
4875
4747
]
4876
4748
4909
4781
4910
4782
4911
4783
class cmd_join(Command):
4912
__doc__ = """Combine a tree into its containing tree.
4784
"""Combine a tree into its containing tree.
4913
4785
4914
4786
This command requires the target tree to be in a rich-root format.
4915
4787
4955
4827
4956
4828
4957
4829
class cmd_split(Command):
4958
__doc__ = """Split a subdirectory of a tree into a separate tree.
4830
"""Split a subdirectory of a tree into a separate tree.
4959
4831
4960
4832
This command will produce a target tree in a format that supports
4961
4833
rich roots, like 'rich-root' or 'rich-root-pack'. These formats cannot be
4981
4853
4982
4854
4983
4855
class cmd_merge_directive(Command):
4984
__doc__ = """Generate a merge directive for auto-merge tools.
4856
"""Generate a merge directive for auto-merge tools.
4985
4857
4986
4858
A directive requests a merge to be performed, and also provides all the
4987
4859
information necessary to do so. This means it must either include a
5080
4952
5081
4953
5082
4954
class cmd_send(Command):
5083
__doc__ = """Mail or create a merge-directive for submitting changes.
4955
"""Mail or create a merge-directive for submitting changes.
5084
4956
5085
4957
A merge directive provides many things needed for requesting merges:
5086
4958
5092
4964
directly from the merge directive, without retrieving data from a
5093
4965
branch.
5094
4966
5095
`bzr send` creates a compact data set that, when applied using bzr
5096
merge, has the same effect as merging from the source branch.
5097
5098
By default the merge directive is self-contained and can be applied to any
5099
branch containing submit_branch in its ancestory without needing access to
5100
the source branch.
5101
5102
If --no-bundle is specified, then Bazaar doesn't send the contents of the
5103
revisions, but only a structured request to merge from the
5104
public_location. In that case the public_branch is needed and it must be
5105
up-to-date and accessible to the recipient. The public_branch is always
5106
included if known, so that people can check it later.
5107
5108
The submit branch defaults to the parent of the source branch, but can be
5109
overridden. Both submit branch and public branch will be remembered in
5110
branch.conf the first time they are used for a particular branch. The
5111
source branch defaults to that containing the working directory, but can
5112
be changed using --from.
5113
5114
In order to calculate those changes, bzr must analyse the submit branch.
5115
Therefore it is most efficient for the submit branch to be a local mirror.
5116
If a public location is known for the submit_branch, that location is used
5117
in the merge directive.
5118
5119
The default behaviour is to send the merge directive by mail, unless -o is
5120
given, in which case it is sent to a file.
4967
If --no-bundle is specified, then public_branch is needed (and must be
4968
up-to-date), so that the receiver can perform the merge using the
4969
public_branch. The public_branch is always included if known, so that
4970
people can check it later.
4971
4972
The submit branch defaults to the parent, but can be overridden. Both
4973
submit branch and public branch will be remembered if supplied.
4974
4975
If a public_branch is known for the submit_branch, that public submit
4976
branch is used in the merge instructions. This means that a local mirror
4977
can be used as your actual submit branch, once you have set public_branch
4978
for that mirror.
5121
4979
5122
4980
Mail is sent using your preferred mail program. This should be transparent
5123
4981
on Windows (it uses MAPI). On Linux, it requires the xdg-email utility.
5143
5001
5144
5002
The merge directives created by bzr send may be applied using bzr merge or
5145
5003
bzr pull by specifying a file containing a merge directive as the location.
5146
5147
bzr send makes extensive use of public locations to map local locations into
5148
URLs that can be used by other people. See `bzr help configuration` to
5149
set them, and use `bzr info` to display them.
5150
5004
"""
5151
5005
5152
5006
encoding_type = 'exact'
5168
5022
short_name='f',
5169
5023
type=unicode),
5170
5024
Option('output', short_name='o',
5171
help='Write merge directive to this file or directory; '
5025
help='Write merge directive to this file; '
5172
5026
'use - for stdout.',
5173
5027
type=unicode),
5174
5028
Option('strict',
5197
5051
5198
5052
5199
5053
class cmd_bundle_revisions(cmd_send):
5200
__doc__ = """Create a merge-directive for submitting changes.
5054
"""Create a merge-directive for submitting changes.
5201
5055
5202
5056
A merge directive provides many things needed for requesting merges:
5203
5057
5270
5124
5271
5125
5272
5126
class cmd_tag(Command):
5273
__doc__ = """Create, remove or modify a tag naming a revision.
5127
"""Create, remove or modify a tag naming a revision.
5274
5128
5275
5129
Tags give human-meaningful names to revisions. Commands that take a -r
5276
5130
(--revision) option can be given -rtag:X, where X is any previously
5284
5138
5285
5139
To rename a tag (change the name but keep it on the same revsion), run ``bzr
5286
5140
tag new-name -r tag:old-name`` and then ``bzr tag --delete oldname``.
5287
5288
If no tag name is specified it will be determined through the
5289
'automatic_tag_name' hook. This can e.g. be used to automatically tag
5290
upstream releases by reading configure.ac. See ``bzr help hooks`` for
5291
details.
5292
5141
"""
5293
5142
5294
5143
_see_also = ['commit', 'tags']
5295
takes_args = ['tag_name?']
5144
takes_args = ['tag_name']
5296
5145
takes_options = [
5297
5146
Option('delete',
5298
5147
help='Delete this tag rather than placing it.',
5308
5157
'revision',
5309
5158
]
5310
5159
5311
def run(self, tag_name=None,
5160
def run(self, tag_name,
5312
5161
delete=None,
5313
5162
directory='.',
5314
5163
force=None,
5315
5164
revision=None,
5316
5165
):
5317
5166
branch, relpath = Branch.open_containing(directory)
5318
self.add_cleanup(branch.lock_write().unlock)
5319
if delete:
5320
if tag_name is None:
5321
raise errors.BzrCommandError("No tag specified to delete.")
5322
branch.tags.delete_tag(tag_name)
5323
self.outf.write('Deleted tag %s.\n' % tag_name)
5324
else:
5325
if revision:
5326
if len(revision) != 1:
5327
raise errors.BzrCommandError(
5328
"Tags can only be placed on a single revision, "
5329
"not on a range")
5330
revision_id = revision[0].as_revision_id(branch)
5167
branch.lock_write()
5168
try:
5169
if delete:
5170
branch.tags.delete_tag(tag_name)
5171
self.outf.write('Deleted tag %s.\n' % tag_name)
5331
5172
else:
5332
revision_id = branch.last_revision()
5333
if tag_name is None:
5334
tag_name = branch.automatic_tag_name(revision_id)
5335
if tag_name is None:
5336
raise errors.BzrCommandError(
5337
"Please specify a tag name.")
5338
if (not force) and branch.tags.has_tag(tag_name):
5339
raise errors.TagAlreadyExists(tag_name)
5340
branch.tags.set_tag(tag_name, revision_id)
5341
self.outf.write('Created tag %s.\n' % tag_name)
5173
if revision:
5174
if len(revision) != 1:
5175
raise errors.BzrCommandError(
5176
"Tags can only be placed on a single revision, "
5177
"not on a range")
5178
revision_id = revision[0].as_revision_id(branch)
5179
else:
5180
revision_id = branch.last_revision()
5181
if (not force) and branch.tags.has_tag(tag_name):
5182
raise errors.TagAlreadyExists(tag_name)
5183
branch.tags.set_tag(tag_name, revision_id)
5184
self.outf.write('Created tag %s.\n' % tag_name)
5185
finally:
5186
branch.unlock()
5342
5187
5343
5188
5344
5189
class cmd_tags(Command):
5345
__doc__ = """List tags.
5190
"""List tags.
5346
5191
5347
5192
This command shows a table of tag names and the revisions they reference.
5348
5193
"""
5376
5221
if not tags:
5377
5222
return
5378
5223
5379
self.add_cleanup(branch.lock_read().unlock)
5380
if revision:
5381
graph = branch.repository.get_graph()
5382
rev1, rev2 = _get_revision_range(revision, branch, self.name())
5383
revid1, revid2 = rev1.rev_id, rev2.rev_id
5384
# only show revisions between revid1 and revid2 (inclusive)
5385
tags = [(tag, revid) for tag, revid in tags if
5386
graph.is_between(revid, revid1, revid2)]
5387
if sort == 'alpha':
5388
tags.sort()
5389
elif sort == 'time':
5390
timestamps = {}
5391
for tag, revid in tags:
5392
try:
5393
revobj = branch.repository.get_revision(revid)
5394
except errors.NoSuchRevision:
5395
timestamp = sys.maxint # place them at the end
5396
else:
5397
timestamp = revobj.timestamp
5398
timestamps[revid] = timestamp
5399
tags.sort(key=lambda x: timestamps[x[1]])
5400
if not show_ids:
5401
# [ (tag, revid), ... ] -> [ (tag, dotted_revno), ... ]
5402
for index, (tag, revid) in enumerate(tags):
5403
try:
5404
revno = branch.revision_id_to_dotted_revno(revid)
5405
if isinstance(revno, tuple):
5406
revno = '.'.join(map(str, revno))
5407
except errors.NoSuchRevision:
5408
# Bad tag data/merges can lead to tagged revisions
5409
# which are not in this branch. Fail gracefully ...
5410
revno = '?'
5411
tags[index] = (tag, revno)
5412
self.cleanup_now()
5224
branch.lock_read()
5225
try:
5226
if revision:
5227
graph = branch.repository.get_graph()
5228
rev1, rev2 = _get_revision_range(revision, branch, self.name())
5229
revid1, revid2 = rev1.rev_id, rev2.rev_id
5230
# only show revisions between revid1 and revid2 (inclusive)
5231
tags = [(tag, revid) for tag, revid in tags if
5232
graph.is_between(revid, revid1, revid2)]
5233
if sort == 'alpha':
5234
tags.sort()
5235
elif sort == 'time':
5236
timestamps = {}
5237
for tag, revid in tags:
5238
try:
5239
revobj = branch.repository.get_revision(revid)
5240
except errors.NoSuchRevision:
5241
timestamp = sys.maxint # place them at the end
5242
else:
5243
timestamp = revobj.timestamp
5244
timestamps[revid] = timestamp
5245
tags.sort(key=lambda x: timestamps[x[1]])
5246
if not show_ids:
5247
# [ (tag, revid), ... ] -> [ (tag, dotted_revno), ... ]
5248
for index, (tag, revid) in enumerate(tags):
5249
try:
5250
revno = branch.revision_id_to_dotted_revno(revid)
5251
if isinstance(revno, tuple):
5252
revno = '.'.join(map(str, revno))
5253
except errors.NoSuchRevision:
5254
# Bad tag data/merges can lead to tagged revisions
5255
# which are not in this branch. Fail gracefully ...
5256
revno = '?'
5257
tags[index] = (tag, revno)
5258
finally:
5259
branch.unlock()
5413
5260
for tag, revspec in tags:
5414
5261
self.outf.write('%-20s %s\n' % (tag, revspec))
5415
5262
5416
5263
5417
5264
class cmd_reconfigure(Command):
5418
__doc__ = """Reconfigure the type of a bzr directory.
5265
"""Reconfigure the type of a bzr directory.
5419
5266
5420
5267
A target configuration must be specified.
5421
5268
5506
5353
5507
5354
5508
5355
class cmd_switch(Command):
5509
__doc__ = """Set the branch of a checkout and update.
5356
"""Set the branch of a checkout and update.
5510
5357
5511
5358
For lightweight checkouts, this changes the branch being referenced.
5512
5359
For heavyweight checkouts, this checks that there are no local commits
5528
5375
that of the master.
5529
5376
"""
5530
5377
5531
takes_args = ['to_location?']
5378
takes_args = ['to_location']
5532
5379
takes_options = [Option('force',
5533
5380
help='Switch even if local commits will be lost.'),
5534
'revision',
5535
5381
Option('create-branch', short_name='b',
5536
5382
help='Create the target branch from this one before'
5537
5383
' switching to it.'),
5538
]
5384
]
5539
5385
5540
def run(self, to_location=None, force=False, create_branch=False,
5541
revision=None):
5386
def run(self, to_location, force=False, create_branch=False):
5542
5387
from bzrlib import switch
5543
5388
tree_location = '.'
5544
revision = _get_one_revision('switch', revision)
5545
5389
control_dir = bzrdir.BzrDir.open_containing(tree_location)[0]
5546
if to_location is None:
5547
if revision is None:
5548
raise errors.BzrCommandError('You must supply either a'
5549
' revision or a location')
5550
to_location = '.'
5551
5390
try:
5552
5391
branch = control_dir.open_branch()
5553
5392
had_explicit_nick = branch.get_config().has_explicit_nickname()
5558
5397
if branch is None:
5559
5398
raise errors.BzrCommandError('cannot create branch without'
5560
5399
' source branch')
5561
to_location = directory_service.directories.dereference(
5562
to_location)
5563
5400
if '/' not in to_location and '\\' not in to_location:
5564
5401
# This path is meant to be relative to the existing branch
5565
5402
this_url = self._get_branch_location(control_dir)
5567
5404
to_branch = branch.bzrdir.sprout(to_location,
5568
5405
possible_transports=[branch.bzrdir.root_transport],
5569
5406
source_branch=branch).open_branch()
5407
# try:
5408
# from_branch = control_dir.open_branch()
5409
# except errors.NotBranchError:
5410
# raise BzrCommandError('Cannot create a branch from this'
5411
# ' location when we cannot open this branch')
5412
# from_branch.bzrdir.sprout(
5413
pass
5570
5414
else:
5571
5415
try:
5572
5416
to_branch = Branch.open(to_location)
5574
5418
this_url = self._get_branch_location(control_dir)
5575
5419
to_branch = Branch.open(
5576
5420
urlutils.join(this_url, '..', to_location))
5577
if revision is not None:
5578
revision = revision.as_revision_id(to_branch)
5579
switch.switch(control_dir, to_branch, force, revision_id=revision)
5421
switch.switch(control_dir, to_branch, force)
5580
5422
if had_explicit_nick:
5581
5423
branch = control_dir.open_branch() #get the new branch!
5582
5424
branch.nick = to_branch.nick
5602
5444
5603
5445
5604
5446
class cmd_view(Command):
5605
__doc__ = """Manage filtered views.
5447
"""Manage filtered views.
5606
5448
5607
5449
Views provide a mask over the tree so that users can focus on
5608
5450
a subset of a tree when doing their work. After creating a view,
5756
5598
5757
5599
5758
5600
class cmd_hooks(Command):
5759
__doc__ = """Show hooks."""
5601
"""Show hooks."""
5760
5602
5761
5603
hidden = True
5762
5604
5775
5617
self.outf.write(" <no hooks installed>\n")
5776
5618
5777
5619
5778
class cmd_remove_branch(Command):
5779
__doc__ = """Remove a branch.
5780
5781
This will remove the branch from the specified location but
5782
will keep any working tree or repository in place.
5783
5784
:Examples:
5785
5786
Remove the branch at repo/trunk::
5787
5788
bzr remove-branch repo/trunk
5789
5790
"""
5791
5792
takes_args = ["location?"]
5793
5794
aliases = ["rmbranch"]
5795
5796
def run(self, location=None):
5797
if location is None:
5798
location = "."
5799
branch = Branch.open_containing(location)[0]
5800
branch.bzrdir.destroy_branch()
5801
5802
5803
5620
class cmd_shelve(Command):
5804
__doc__ = """Temporarily set aside some changes from the current tree.
5621
"""Temporarily set aside some changes from the current tree.
5805
5622
5806
5623
Shelve allows you to temporarily put changes you've made "on the shelf",
5807
5624
ie. out of the way, until a later time when you can bring them back from
5854
5671
try:
5855
5672
shelver.run()
5856
5673
finally:
5857
shelver.finalize()
5674
shelver.work_tree.unlock()
5858
5675
except errors.UserAbort:
5859
5676
return 0
5860
5677
5861
5678
def run_for_list(self):
5862
5679
tree = WorkingTree.open_containing('.')[0]
5863
self.add_cleanup(tree.lock_read().unlock)
5864
manager = tree.get_shelf_manager()
5865
shelves = manager.active_shelves()
5866
if len(shelves) == 0:
5867
note('No shelved changes.')
5868
return 0
5869
for shelf_id in reversed(shelves):
5870
message = manager.get_metadata(shelf_id).get('message')
5871
if message is None:
5872
message = '<no message>'
5873
self.outf.write('%3d: %s\n' % (shelf_id, message))
5874
return 1
5680
tree.lock_read()
5681
try:
5682
manager = tree.get_shelf_manager()
5683
shelves = manager.active_shelves()
5684
if len(shelves) == 0:
5685
note('No shelved changes.')
5686
return 0
5687
for shelf_id in reversed(shelves):
5688
message = manager.get_metadata(shelf_id).get('message')
5689
if message is None:
5690
message = '<no message>'
5691
self.outf.write('%3d: %s\n' % (shelf_id, message))
5692
return 1
5693
finally:
5694
tree.unlock()
5875
5695
5876
5696
5877
5697
class cmd_unshelve(Command):
5878
__doc__ = """Restore shelved changes.
5698
"""Restore shelved changes.
5879
5699
5880
5700
By default, the most recently shelved changes are restored. However if you
5881
5701
specify a shelf by id those changes will be restored instead. This works
5889
5709
enum_switch=False, value_switches=True,
5890
5710
apply="Apply changes and remove from the shelf.",
5891
5711
dry_run="Show changes, but do not apply or remove them.",
5892
preview="Instead of unshelving the changes, show the diff that "
5893
"would result from unshelving.",
5894
delete_only="Delete changes without applying them.",
5895
keep="Apply changes but don't delete them.",
5712
delete_only="Delete changes without applying them."
5896
5713
)
5897
5714
]
5898
5715
_see_also = ['shelve']
5907
5724
5908
5725
5909
5726
class cmd_clean_tree(Command):
5910
__doc__ = """Remove unwanted files from working tree.
5727
"""Remove unwanted files from working tree.
5911
5728
5912
5729
By default, only unknown files, not ignored files, are deleted. Versioned
5913
5730
files are never deleted.
5941
5758
5942
5759
5943
5760
class cmd_reference(Command):
5944
__doc__ = """list, view and set branch locations for nested trees.
5761
"""list, view and set branch locations for nested trees.
5945
5762
5946
5763
If no arguments are provided, lists the branch locations for nested trees.
5947
5764
If one argument is provided, display the branch location for that tree.
5987
5804
self.outf.write('%s %s\n' % (path, location))
5988
5805
5989
5806
5990
def _register_lazy_builtins():
5991
# register lazy builtins from other modules; called at startup and should
5992
# be only called once.
5993
for (name, aliases, module_name) in [
5994
('cmd_bundle_info', [], 'bzrlib.bundle.commands'),
5995
('cmd_dpush', [], 'bzrlib.foreign'),
5996
('cmd_version_info', [], 'bzrlib.cmd_version_info'),
5997
('cmd_resolve', ['resolved'], 'bzrlib.conflicts'),
5998
('cmd_conflicts', [], 'bzrlib.conflicts'),
5999
('cmd_sign_my_commits', [], 'bzrlib.sign_my_commits'),
6000
]:
6001
builtin_command_registry.register_lazy(name, aliases, module_name)
5807
# these get imported and then picked up by the scan for cmd_*
5808
# TODO: Some more consistent way to split command definitions across files;
5809
# we do need to load at least some information about them to know of
5810
# aliases. ideally we would avoid loading the implementation until the
5811
# details were needed.
5812
from bzrlib.cmd_version_info import cmd_version_info
5813
from bzrlib.conflicts import cmd_resolve, cmd_conflicts, restore
5814
from bzrlib.bundle.commands import (
5815
cmd_bundle_info,
5816
)
5817
from bzrlib.foreign import cmd_dpush
5818
from bzrlib.sign_my_commits import cmd_sign_my_commits
5819
from bzrlib.weave_commands import cmd_versionedfile_list, \
5820
cmd_weave_plan_merge, cmd_weave_merge_text
Loggerhead is a web-based interface for Breezy
Version: 2.0.1