To get this branch, use:
bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
« back to all changes in this revision
Viewing changes to bzrlib/builtins.py
- browse files at revision 4711.1.2
- compare with another revision
- download diff
- download tarball
- view history from revision 4711.1.2
- Committer: Martin Pool
- Date: 2009-09-23 04:54:41 UTC
- mto: This revision was merged to the branch mainline in revision 4745.
- Revision ID: mbp@sourcefrog.net-20090923045441-80j9qcur76c9xjor
Start adding tests.per_uifactory
- files added:
- bzrlib/textui.py
- files removed:
- .testr.conf
- apport
- bzrlib/help_topics/es
- bzrlib/plugins/news_merge
- bzrlib/plugins/news_merge/tests
- bzrlib/tests/per_bzrdir_colo
- bzrlib/tests/per_foreign_vcs
- contrib/debian
- doc/en/whats-new
- doc/ja
- doc/ja/_static
- doc/ja/_templates
- doc/ja/mini-tutorial
- doc/ja/tutorials
- doc/ja/upgrade-guide
- doc/ja/user-guide
- doc/ja/user-guide/images
- doc/ja/user-reference
- files renamed:
- bzrlib/help_topics/en/conflict-types.txt => bzrlib/help_topics/en/conflicts.txt
- bzrlib/tests/test__bencode.py => bzrlib/tests/test_bencode.py
- bzrlib/help_topics/es/conflict-types.txt => doc/es/user-guide/resolving_conflicts.txt
- files modified:
- .bzrignore
added
removed
bzrlib/builtins.py
1
# Copyright (C) 2005-2010 Canonical Ltd
1
# Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
31
31
bundle,
32
32
btree_index,
33
33
bzrdir,
34
directory_service,
35
34
delta,
36
35
config,
37
36
errors,
44
43
reconfigure,
45
44
rename_map,
46
45
revision as _mod_revision,
47
static_tuple,
48
46
symbol_versioning,
49
timestamp,
50
47
transport,
51
48
ui,
52
49
urlutils,
54
51
)
55
52
from bzrlib.branch import Branch
56
53
from bzrlib.conflicts import ConflictList
57
from bzrlib.transport import memory
58
54
from bzrlib.revisionspec import RevisionSpec, RevisionInfo
59
55
from bzrlib.smtp_connection import SMTPConnection
60
56
from bzrlib.workingtree import WorkingTree
61
57
""")
62
58
63
from bzrlib.commands import (
64
Command,
65
builtin_command_registry,
66
display_command,
67
)
59
from bzrlib.commands import Command, display_command
68
60
from bzrlib.option import (
69
61
ListOption,
70
62
Option,
239
231
# opens the branch?)
240
232
241
233
class cmd_status(Command):
242
__doc__ = """Display status summary.
234
"""Display status summary.
243
235
244
236
This reports on versioned and unknown files, reporting them
245
237
grouped by state. Possible states are:
265
257
unknown
266
258
Not versioned and not matching an ignore pattern.
267
259
268
Additionally for directories, symlinks and files with an executable
269
bit, Bazaar indicates their type using a trailing character: '/', '@'
270
or '*' respectively.
271
272
260
To see ignored files use 'bzr ignored'. For details on the
273
261
changes to file texts, use 'bzr diff'.
274
262
332
320
333
321
334
322
class cmd_cat_revision(Command):
335
__doc__ = """Write out metadata for a revision.
323
"""Write out metadata for a revision.
336
324
337
325
The revision to print can either be specified by a specific
338
326
revision identifier, or you can use --revision.
344
332
# cat-revision is more for frontends so should be exact
345
333
encoding = 'strict'
346
334
347
def print_revision(self, revisions, revid):
348
stream = revisions.get_record_stream([(revid,)], 'unordered', True)
349
record = stream.next()
350
if record.storage_kind == 'absent':
351
raise errors.NoSuchRevision(revisions, revid)
352
revtext = record.get_bytes_as('fulltext')
353
self.outf.write(revtext.decode('utf-8'))
354
355
335
@display_command
356
336
def run(self, revision_id=None, revision=None):
357
337
if revision_id is not None and revision is not None:
362
342
' --revision or a revision_id')
363
343
b = WorkingTree.open_containing(u'.')[0].branch
364
344
365
revisions = b.repository.revisions
366
if revisions is None:
367
raise errors.BzrCommandError('Repository %r does not support '
368
'access to raw revision texts')
345
# TODO: jam 20060112 should cat-revision always output utf-8?
346
if revision_id is not None:
347
revision_id = osutils.safe_revision_id(revision_id, warn=False)
348
try:
349
self.outf.write(b.repository.get_revision_xml(revision_id).decode('utf-8'))
350
except errors.NoSuchRevision:
351
msg = "The repository %s contains no revision %s." % (b.repository.base,
352
revision_id)
353
raise errors.BzrCommandError(msg)
354
elif revision is not None:
355
for rev in revision:
356
if rev is None:
357
raise errors.BzrCommandError('You cannot specify a NULL'
358
' revision.')
359
rev_id = rev.as_revision_id(b)
360
self.outf.write(b.repository.get_revision_xml(rev_id).decode('utf-8'))
369
361
370
b.repository.lock_read()
371
try:
372
# TODO: jam 20060112 should cat-revision always output utf-8?
373
if revision_id is not None:
374
revision_id = osutils.safe_revision_id(revision_id, warn=False)
375
try:
376
self.print_revision(revisions, revision_id)
377
except errors.NoSuchRevision:
378
msg = "The repository %s contains no revision %s." % (
379
b.repository.base, revision_id)
380
raise errors.BzrCommandError(msg)
381
elif revision is not None:
382
for rev in revision:
383
if rev is None:
384
raise errors.BzrCommandError(
385
'You cannot specify a NULL revision.')
386
rev_id = rev.as_revision_id(b)
387
self.print_revision(revisions, rev_id)
388
finally:
389
b.repository.unlock()
390
391
362
392
363
class cmd_dump_btree(Command):
393
__doc__ = """Dump the contents of a btree index file to stdout.
364
"""Dump the contents of a btree index file to stdout.
394
365
395
366
PATH is a btree index file, it can be any URL. This includes things like
396
367
.bzr/repository/pack-names, or .bzr/repository/indices/a34b3a...ca4a4.iix
460
431
for node in bt.iter_all_entries():
461
432
# Node is made up of:
462
433
# (index, key, value, [references])
463
try:
464
refs = node[3]
465
except IndexError:
466
refs_as_tuples = None
467
else:
468
refs_as_tuples = static_tuple.as_tuples(refs)
469
as_tuple = (tuple(node[1]), node[2], refs_as_tuples)
470
self.outf.write('%s\n' % (as_tuple,))
434
self.outf.write('%s\n' % (node[1:],))
471
435
472
436
473
437
class cmd_remove_tree(Command):
474
__doc__ = """Remove the working tree from a given branch/checkout.
438
"""Remove the working tree from a given branch/checkout.
475
439
476
440
Since a lightweight checkout is little more than a working tree
477
441
this will refuse to run against one.
479
443
To re-create the working tree, use "bzr checkout".
480
444
"""
481
445
_see_also = ['checkout', 'working-trees']
482
takes_args = ['location*']
446
takes_args = ['location?']
483
447
takes_options = [
484
448
Option('force',
485
449
help='Remove the working tree even if it has '
486
450
'uncommitted changes.'),
487
451
]
488
452
489
def run(self, location_list, force=False):
490
if not location_list:
491
location_list=['.']
492
493
for location in location_list:
494
d = bzrdir.BzrDir.open(location)
495
496
try:
497
working = d.open_workingtree()
498
except errors.NoWorkingTree:
499
raise errors.BzrCommandError("No working tree to remove")
500
except errors.NotLocalUrl:
501
raise errors.BzrCommandError("You cannot remove the working tree"
502
" of a remote path")
503
if not force:
504
if (working.has_changes()):
505
raise errors.UncommittedChanges(working)
506
507
if working.user_url != working.branch.user_url:
508
raise errors.BzrCommandError("You cannot remove the working tree"
509
" from a lightweight checkout")
510
511
d.destroy_workingtree()
453
def run(self, location='.', force=False):
454
d = bzrdir.BzrDir.open(location)
455
456
try:
457
working = d.open_workingtree()
458
except errors.NoWorkingTree:
459
raise errors.BzrCommandError("No working tree to remove")
460
except errors.NotLocalUrl:
461
raise errors.BzrCommandError("You cannot remove the working tree"
462
" of a remote path")
463
if not force:
464
if (working.has_changes(working.basis_tree())
465
or len(working.get_parent_ids()) > 1):
466
raise errors.UncommittedChanges(working)
467
468
working_path = working.bzrdir.root_transport.base
469
branch_path = working.branch.bzrdir.root_transport.base
470
if working_path != branch_path:
471
raise errors.BzrCommandError("You cannot remove the working tree"
472
" from a lightweight checkout")
473
474
d.destroy_workingtree()
512
475
513
476
514
477
class cmd_revno(Command):
515
__doc__ = """Show current revision number.
478
"""Show current revision number.
516
479
517
480
This is equal to the number of revisions on this branch.
518
481
"""
528
491
if tree:
529
492
try:
530
493
wt = WorkingTree.open_containing(location)[0]
531
self.add_cleanup(wt.lock_read().unlock)
494
wt.lock_read()
532
495
except (errors.NoWorkingTree, errors.NotLocalUrl):
533
496
raise errors.NoWorkingTree(location)
534
revid = wt.last_revision()
535
497
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)
498
revid = wt.last_revision()
499
try:
500
revno_t = wt.branch.revision_id_to_dotted_revno(revid)
501
except errors.NoSuchRevision:
502
revno_t = ('???',)
503
revno = ".".join(str(n) for n in revno_t)
504
finally:
505
wt.unlock()
540
506
else:
541
507
b = Branch.open_containing(location)[0]
542
self.add_cleanup(b.lock_read().unlock)
543
revno = b.revno()
544
self.cleanup_now()
508
b.lock_read()
509
try:
510
revno = b.revno()
511
finally:
512
b.unlock()
513
545
514
self.outf.write(str(revno) + '\n')
546
515
547
516
548
517
class cmd_revision_info(Command):
549
__doc__ = """Show revision number and revision id for a given revision identifier.
518
"""Show revision number and revision id for a given revision identifier.
550
519
"""
551
520
hidden = True
552
521
takes_args = ['revision_info*']
568
537
try:
569
538
wt = WorkingTree.open_containing(directory)[0]
570
539
b = wt.branch
571
self.add_cleanup(wt.lock_read().unlock)
540
wt.lock_read()
572
541
except (errors.NoWorkingTree, errors.NotLocalUrl):
573
542
wt = None
574
543
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())
544
b.lock_read()
545
try:
546
revision_ids = []
547
if revision is not None:
548
revision_ids.extend(rev.as_revision_id(b) for rev in revision)
549
if revision_info_list is not None:
550
for rev_str in revision_info_list:
551
rev_spec = RevisionSpec.from_string(rev_str)
552
revision_ids.append(rev_spec.as_revision_id(b))
553
# No arguments supplied, default to the last revision
554
if len(revision_ids) == 0:
555
if tree:
556
if wt is None:
557
raise errors.NoWorkingTree(directory)
558
revision_ids.append(wt.last_revision())
559
else:
560
revision_ids.append(b.last_revision())
561
562
revinfos = []
563
maxlen = 0
564
for revision_id in revision_ids:
565
try:
566
dotted_revno = b.revision_id_to_dotted_revno(revision_id)
567
revno = '.'.join(str(i) for i in dotted_revno)
568
except errors.NoSuchRevision:
569
revno = '???'
570
maxlen = max(maxlen, len(revno))
571
revinfos.append([revno, revision_id])
572
finally:
573
if wt is None:
574
b.unlock()
589
575
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()
576
wt.unlock()
577
604
578
for ri in revinfos:
605
579
self.outf.write('%*s %s\n' % (maxlen, ri[0], ri[1]))
606
580
607
581
608
582
class cmd_add(Command):
609
__doc__ = """Add specified files or directories.
583
"""Add specified files or directories.
610
584
611
585
In non-recursive mode, all the named items are added, regardless
612
586
of whether they were previously ignored. A warning is given if
677
651
should_print=(not is_quiet()))
678
652
679
653
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()
654
base_tree.lock_read()
655
try:
656
file_list = self._maybe_expand_globs(file_list)
657
tree, file_list = tree_files_for_add(file_list)
658
added, ignored = tree.smart_add(file_list, not
659
no_recurse, action=action, save=not dry_run)
660
finally:
661
if base_tree is not None:
662
base_tree.unlock()
685
663
if len(ignored) > 0:
686
664
if verbose:
687
665
for glob in sorted(ignored.keys()):
691
669
692
670
693
671
class cmd_mkdir(Command):
694
__doc__ = """Create a new versioned directory.
672
"""Create a new versioned directory.
695
673
696
674
This is equivalent to creating the directory and then adding it.
697
675
"""
701
679
702
680
def run(self, dir_list):
703
681
for d in dir_list:
682
os.mkdir(d)
704
683
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)
684
wt.add([dd])
685
self.outf.write('added %s\n' % d)
713
686
714
687
715
688
class cmd_relpath(Command):
716
__doc__ = """Show path of a file relative to root"""
689
"""Show path of a file relative to root"""
717
690
718
691
takes_args = ['filename']
719
692
hidden = True
728
701
729
702
730
703
class cmd_inventory(Command):
731
__doc__ = """Show inventory of the current working copy or a revision.
704
"""Show inventory of the current working copy or a revision.
732
705
733
706
It is possible to limit the output to a particular entry
734
707
type using the --kind option. For example: --kind file.
755
728
756
729
revision = _get_one_revision('inventory', revision)
757
730
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()
731
work_tree.lock_read()
732
try:
733
if revision is not None:
734
tree = revision.as_tree(work_tree.branch)
735
736
extra_trees = [work_tree]
737
tree.lock_read()
738
else:
739
tree = work_tree
740
extra_trees = []
741
742
if file_list is not None:
743
file_ids = tree.paths2ids(file_list, trees=extra_trees,
744
require_versioned=True)
745
# find_ids_across_trees may include some paths that don't
746
# exist in 'tree'.
747
entries = sorted((tree.id2path(file_id), tree.inventory[file_id])
748
for file_id in file_ids if file_id in tree)
749
else:
750
entries = tree.inventory.entries()
751
finally:
752
tree.unlock()
753
if tree is not work_tree:
754
work_tree.unlock()
755
779
756
for path, entry in entries:
780
757
if kind and kind != entry.kind:
781
758
continue
787
764
788
765
789
766
class cmd_mv(Command):
790
__doc__ = """Move or rename a file.
767
"""Move or rename a file.
791
768
792
769
:Usage:
793
770
bzr mv OLDNAME NEWNAME
826
803
if len(names_list) < 2:
827
804
raise errors.BzrCommandError("missing file argument")
828
805
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)
806
tree.lock_tree_write()
807
try:
808
self._run(tree, names_list, rel_names, after)
809
finally:
810
tree.unlock()
831
811
832
812
def run_auto(self, names_list, after, dry_run):
833
813
if names_list is not None and len(names_list) > 1:
837
817
raise errors.BzrCommandError('--after cannot be specified with'
838
818
' --auto.')
839
819
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)
820
work_tree.lock_tree_write()
821
try:
822
rename_map.RenameMap.guess_renames(work_tree, dry_run)
823
finally:
824
work_tree.unlock()
842
825
843
826
def _run(self, tree, names_list, rel_names, after):
844
827
into_existing = osutils.isdir(names_list[-1])
865
848
# All entries reference existing inventory items, so fix them up
866
849
# for cicp file-systems.
867
850
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))
851
for pair in tree.move(rel_names[:-1], rel_names[-1], after=after):
852
self.outf.write("%s => %s\n" % pair)
871
853
else:
872
854
if len(names_list) != 2:
873
855
raise errors.BzrCommandError('to mv multiple files the'
917
899
dest = osutils.pathjoin(dest_parent, dest_tail)
918
900
mutter("attempting to move %s => %s", src, dest)
919
901
tree.rename_one(src, dest, after=after)
920
if not is_quiet():
921
self.outf.write("%s => %s\n" % (src, dest))
902
self.outf.write("%s => %s\n" % (src, dest))
922
903
923
904
924
905
class cmd_pull(Command):
925
__doc__ = """Turn this branch into a mirror of another branch.
906
"""Turn this branch into a mirror of another branch.
926
907
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.
908
This command only works on branches that have not diverged. Branches are
909
considered diverged if the destination branch's most recent commit is one
910
that has not been merged (directly or indirectly) into the parent.
931
911
932
912
If branches have diverged, you can use 'bzr merge' to integrate the changes
933
913
from one into the other. Once one branch has merged, the other should
934
914
be able to pull it again.
935
915
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.
916
If you want to forget your local changes and just update your branch to
917
match the remote one, use pull --overwrite.
939
918
940
919
If there is no default location set, the first pull will set it. After
941
920
that, you can omit the location to use the default. To change the
977
956
try:
978
957
tree_to = WorkingTree.open_containing(directory)[0]
979
958
branch_to = tree_to.branch
980
self.add_cleanup(tree_to.lock_write().unlock)
981
959
except errors.NoWorkingTree:
982
960
tree_to = None
983
961
branch_to = Branch.open_containing(directory)[0]
984
self.add_cleanup(branch_to.lock_write().unlock)
985
962
986
963
if local and not branch_to.get_bound_location():
987
964
raise errors.LocalRequiresBoundBranch()
988
965
1018
995
else:
1019
996
branch_from = Branch.open(location,
1020
997
possible_transports=possible_transports)
1021
self.add_cleanup(branch_from.lock_read().unlock)
1022
998
1023
999
if branch_to.get_parent() is None or remember:
1024
1000
branch_to.set_parent(branch_from.base)
1025
1001
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)
1002
if branch_from is not branch_to:
1003
branch_from.lock_read()
1004
try:
1005
if revision is not None:
1006
revision_id = revision.as_revision_id(branch_from)
1007
1008
branch_to.lock_write()
1009
try:
1010
if tree_to is not None:
1011
view_info = _get_view_info_for_change_reporter(tree_to)
1012
change_reporter = delta._ChangeReporter(
1013
unversioned_filter=tree_to.is_ignored,
1014
view_info=view_info)
1015
result = tree_to.pull(
1016
branch_from, overwrite, revision_id, change_reporter,
1017
possible_transports=possible_transports, local=local)
1018
else:
1019
result = branch_to.pull(
1020
branch_from, overwrite, revision_id, local=local)
1021
1022
result.report(self.outf)
1023
if verbose and result.old_revid != result.new_revid:
1024
log.show_branch_change(
1025
branch_to, self.outf, result.old_revno,
1026
result.old_revid)
1027
finally:
1028
branch_to.unlock()
1029
finally:
1030
if branch_from is not branch_to:
1031
branch_from.unlock()
1046
1032
1047
1033
1048
1034
class cmd_push(Command):
1049
__doc__ = """Update a mirror of this branch.
1035
"""Update a mirror of this branch.
1050
1036
1051
1037
The target branch will not have its working tree populated because this
1052
1038
is both expensive, and is not supported on remote file systems.
1113
1099
# Get the source branch
1114
1100
(tree, br_from,
1115
1101
_unused) = bzrdir.BzrDir.open_containing_tree_or_branch(directory)
1102
if strict is None:
1103
strict = br_from.get_config().get_user_option_as_bool('push_strict')
1104
if strict is None: strict = True # default value
1116
1105
# Get the tip's revision_id
1117
1106
revision = _get_one_revision('push', revision)
1118
1107
if revision is not None:
1119
1108
revision_id = revision.in_history(br_from).rev_id
1120
1109
else:
1121
1110
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.')
1111
if strict and tree is not None and revision_id is None:
1112
if (tree.has_changes(tree.basis_tree())
1113
or len(tree.get_parent_ids()) > 1):
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_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
(old_tree, new_tree,
1969
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)
1910
old_tree, new_tree, specific_files, extra_trees = \
1911
_get_trees_to_diff(file_list, revision, old, new,
1912
apply_view=True)
1972
1913
return show_diff_trees(old_tree, new_tree, sys.stdout,
1973
1914
specific_files=specific_files,
1974
1915
external_diff_options=diff_options,
1975
1916
old_label=old_label, new_label=new_label,
1976
extra_trees=extra_trees, using=using,
1977
format_cls=format)
1917
extra_trees=extra_trees, using=using)
1978
1918
1979
1919
1980
1920
class cmd_deleted(Command):
1981
__doc__ = """List files deleted in the working tree.
1921
"""List files deleted in the working tree.
1982
1922
"""
1983
1923
# TODO: Show files deleted since a previous revision, or
1984
1924
# between two revisions.
1992
1932
@display_command
1993
1933
def run(self, show_ids=False):
1994
1934
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')
1935
tree.lock_read()
1936
try:
1937
old = tree.basis_tree()
1938
old.lock_read()
1939
try:
1940
for path, ie in old.inventory.iter_entries():
1941
if not tree.has_id(ie.file_id):
1942
self.outf.write(path)
1943
if show_ids:
1944
self.outf.write(' ')
1945
self.outf.write(ie.file_id)
1946
self.outf.write('\n')
1947
finally:
1948
old.unlock()
1949
finally:
1950
tree.unlock()
2005
1951
2006
1952
2007
1953
class cmd_modified(Command):
2008
__doc__ = """List files modified in working tree.
1954
"""List files modified in working tree.
2009
1955
"""
2010
1956
2011
1957
hidden = True
2028
1974
2029
1975
2030
1976
class cmd_added(Command):
2031
__doc__ = """List files added in working tree.
1977
"""List files added in working tree.
2032
1978
"""
2033
1979
2034
1980
hidden = True
2042
1988
@display_command
2043
1989
def run(self, null=False):
2044
1990
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')
1991
wt.lock_read()
1992
try:
1993
basis = wt.basis_tree()
1994
basis.lock_read()
1995
try:
1996
basis_inv = basis.inventory
1997
inv = wt.inventory
1998
for file_id in inv:
1999
if file_id in basis_inv:
2000
continue
2001
if inv.is_root(file_id) and len(basis_inv) == 0:
2002
continue
2003
path = inv.id2path(file_id)
2004
if not os.access(osutils.abspath(path), os.F_OK):
2005
continue
2006
if null:
2007
self.outf.write(path + '\0')
2008
else:
2009
self.outf.write(osutils.quotefn(path) + '\n')
2010
finally:
2011
basis.unlock()
2012
finally:
2013
wt.unlock()
2062
2014
2063
2015
2064
2016
class cmd_root(Command):
2065
__doc__ = """Show the tree root directory.
2017
"""Show the tree root directory.
2066
2018
2067
2019
The root is the nearest enclosing directory with a .bzr control
2068
2020
directory."""
2092
2044
2093
2045
2094
2046
class cmd_log(Command):
2095
__doc__ = """Show historical log for a branch or subset of a branch.
2047
"""Show historical log for a branch or subset of a branch.
2096
2048
2097
2049
log is bzr's default tool for exploring the history of a branch.
2098
2050
The branch to use is taken from the first parameter. If no parameters
2209
2161
:Tips & tricks:
2210
2162
2211
2163
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>.
2164
line tools. You may prefer qlog or glog from the QBzr and Bzr-Gtk packages
2165
respectively for example. (TortoiseBzr uses qlog for displaying logs.) See
2166
http://bazaar-vcs.org/BzrPlugins and http://bazaar-vcs.org/IDEIntegration.
2167
2168
Web interfaces are often better at exploring history than command line
2169
tools, particularly for branches on servers. You may prefer Loggerhead
2170
or one of its alternatives. See http://bazaar-vcs.org/WebInterface.
2216
2171
2217
2172
You may find it useful to add the aliases below to ``bazaar.conf``::
2218
2173
2279
2234
help='Show changes made in each revision as a patch.'),
2280
2235
Option('include-merges',
2281
2236
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
2237
]
2287
2238
encoding_type = 'replace'
2288
2239
2298
2249
message=None,
2299
2250
limit=None,
2300
2251
show_diff=False,
2301
include_merges=False,
2302
exclude_common_ancestry=False,
2303
):
2252
include_merges=False):
2304
2253
from bzrlib.log import (
2305
2254
Logger,
2306
2255
make_log_request_dict,
2307
2256
_get_info_for_log_files,
2308
2257
)
2309
2258
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
2259
if include_merges:
2315
2260
if levels is None:
2316
2261
levels = 0
2331
2276
filter_by_dir = False
2332
2277
if file_list:
2333
2278
# 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)
2279
b, file_info_list, rev1, rev2 = _get_info_for_log_files(revision,
2280
file_list)
2336
2281
for relpath, file_id, kind in file_info_list:
2337
2282
if file_id is None:
2338
2283
raise errors.BzrCommandError(
2356
2301
location = '.'
2357
2302
dir, relpath = bzrdir.BzrDir.open_containing(location)
2358
2303
b = dir.open_branch()
2359
self.add_cleanup(b.lock_read().unlock)
2360
2304
rev1, rev2 = _get_revision_range(revision, b, self.name())
2361
2305
2362
2306
# Decide on the type of delta & diff filtering to use
2372
2316
else:
2373
2317
diff_type = 'full'
2374
2318
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)
2319
b.lock_read()
2320
try:
2321
# Build the log formatter
2322
if log_format is None:
2323
log_format = log.log_formatter_registry.get_default(b)
2324
lf = log_format(show_ids=show_ids, to_file=self.outf,
2325
show_timezone=timezone,
2326
delta_format=get_verbosity_level(),
2327
levels=levels,
2328
show_advice=levels is None)
2329
2330
# Choose the algorithm for doing the logging. It's annoying
2331
# having multiple code paths like this but necessary until
2332
# the underlying repository format is faster at generating
2333
# deltas or can provide everything we need from the indices.
2334
# The default algorithm - match-using-deltas - works for
2335
# multiple files and directories and is faster for small
2336
# amounts of history (200 revisions say). However, it's too
2337
# slow for logging a single file in a repository with deep
2338
# history, i.e. > 10K revisions. In the spirit of "do no
2339
# evil when adding features", we continue to use the
2340
# original algorithm - per-file-graph - for the "single
2341
# file that isn't a directory without showing a delta" case.
2342
partial_history = revision and b.repository._format.supports_chks
2343
match_using_deltas = (len(file_ids) != 1 or filter_by_dir
2344
or delta_type or partial_history)
2345
2346
# Build the LogRequest and execute it
2347
if len(file_ids) == 0:
2348
file_ids = None
2349
rqst = make_log_request_dict(
2350
direction=direction, specific_fileids=file_ids,
2351
start_revision=rev1, end_revision=rev2, limit=limit,
2352
message_search=message, delta_type=delta_type,
2353
diff_type=diff_type, _match_using_deltas=match_using_deltas)
2354
Logger(b, rqst).show(lf)
2355
finally:
2356
b.unlock()
2414
2357
2415
2358
2416
2359
def _get_revision_range(revisionspec_list, branch, command_name):
2434
2377
raise errors.BzrCommandError(
2435
2378
"bzr %s doesn't accept two revisions in different"
2436
2379
" 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)
2380
rev1 = start_spec.in_history(branch)
2442
2381
# Avoid loading all of history when we know a missing
2443
2382
# end of range means the last revision ...
2444
2383
if end_spec.spec is None:
2473
2412
2474
2413
2475
2414
class cmd_touching_revisions(Command):
2476
__doc__ = """Return revision-ids which affected a particular file.
2415
"""Return revision-ids which affected a particular file.
2477
2416
2478
2417
A more user-friendly interface is "bzr log FILE".
2479
2418
"""
2484
2423
@display_command
2485
2424
def run(self, filename):
2486
2425
tree, relpath = WorkingTree.open_containing(filename)
2426
b = tree.branch
2487
2427
file_id = tree.path2id(relpath)
2488
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:
2428
for revno, revision_id, what in log.find_touching_revisions(b, file_id):
2492
2429
self.outf.write("%6d %s\n" % (revno, what))
2493
2430
2494
2431
2495
2432
class cmd_ls(Command):
2496
__doc__ = """List files in a tree.
2433
"""List files in a tree.
2497
2434
"""
2498
2435
2499
2436
_see_also = ['status', 'cat']
2547
2484
if from_root:
2548
2485
if relpath:
2549
2486
prefix = relpath + '/'
2550
elif fs_path != '.' and not fs_path.endswith('/'):
2487
elif fs_path != '.':
2551
2488
prefix = fs_path + '/'
2552
2489
2553
2490
if revision is not None or tree is None:
2561
2498
view_str = views.view_display_str(view_files)
2562
2499
note("Ignoring files outside view. View is %s" % view_str)
2563
2500
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
2501
tree.lock_read()
2502
try:
2503
for fp, fc, fkind, fid, entry in tree.list_files(include_root=False,
2504
from_dir=relpath, recursive=recursive):
2505
# Apply additional masking
2506
if not all and not selection[fc]:
2507
continue
2508
if kind is not None and fkind != kind:
2509
continue
2510
if apply_view:
2511
try:
2512
if relpath:
2513
fullpath = osutils.pathjoin(relpath, fp)
2514
else:
2515
fullpath = fp
2516
views.check_path_in_view(tree, fullpath)
2517
except errors.FileOutsideView:
2518
continue
2581
2519
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:
2520
# Output the entry
2521
if prefix:
2522
fp = osutils.pathjoin(prefix, fp)
2523
kindch = entry.kind_character()
2524
outstring = fp + kindch
2525
ui.ui_factory.clear_term()
2526
if verbose:
2527
outstring = '%-8s %s' % (fc, outstring)
2528
if show_ids and fid is not None:
2529
outstring = "%-50s %s" % (outstring, fid)
2608
2530
self.outf.write(outstring + '\n')
2531
elif null:
2532
self.outf.write(fp + '\0')
2533
if show_ids:
2534
if fid is not None:
2535
self.outf.write(fid)
2536
self.outf.write('\0')
2537
self.outf.flush()
2538
else:
2539
if show_ids:
2540
if fid is not None:
2541
my_id = fid
2542
else:
2543
my_id = ''
2544
self.outf.write('%-50s %s\n' % (outstring, my_id))
2545
else:
2546
self.outf.write(outstring + '\n')
2547
finally:
2548
tree.unlock()
2609
2549
2610
2550
2611
2551
class cmd_unknowns(Command):
2612
__doc__ = """List unknown files.
2552
"""List unknown files.
2613
2553
"""
2614
2554
2615
2555
hidden = True
2622
2562
2623
2563
2624
2564
class cmd_ignore(Command):
2625
__doc__ = """Ignore specified files or patterns.
2565
"""Ignore specified files or patterns.
2626
2566
2627
2567
See ``bzr help patterns`` for details on the syntax of patterns.
2628
2568
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
2569
To remove patterns from the ignore list, edit the .bzrignore file.
2636
2570
After adding, editing or deleting that file either indirectly by
2637
2571
using this command or directly by using an editor, be sure to commit
2638
2572
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
2573
2653
2574
Note: ignore patterns containing shell wildcards must be quoted from
2654
2575
the shell on Unix.
2658
2579
2659
2580
bzr ignore ./Makefile
2660
2581
2661
Ignore .class files in all directories...::
2582
Ignore class files in all directories::
2662
2583
2663
2584
bzr ignore "*.class"
2664
2585
2665
...but do not ignore "special.class"::
2666
2667
bzr ignore "!special.class"
2668
2669
2586
Ignore .o files under the lib directory::
2670
2587
2671
2588
bzr ignore "lib/**/*.o"
2677
2594
Ignore everything but the "debian" toplevel directory::
2678
2595
2679
2596
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
2597
"""
2688
2598
2689
2599
_see_also = ['status', 'ignored', 'patterns']
2690
2600
takes_args = ['name_pattern*']
2691
2601
takes_options = [
2692
Option('default-rules',
2693
help='Display the default ignore rules that bzr uses.')
2602
Option('old-default-rules',
2603
help='Write out the ignore rules bzr < 0.9 always used.')
2694
2604
]
2695
2605
2696
def run(self, name_pattern_list=None, default_rules=None):
2606
def run(self, name_pattern_list=None, old_default_rules=None):
2697
2607
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)
2608
if old_default_rules is not None:
2609
# dump the rules and exit
2610
for pattern in ignores.OLD_DEFAULTS:
2611
print pattern
2702
2612
return
2703
2613
if not name_pattern_list:
2704
2614
raise errors.BzrCommandError("ignore requires at least one "
2705
"NAME_PATTERN or --default-rules.")
2615
"NAME_PATTERN or --old-default-rules")
2706
2616
name_pattern_list = [globbing.normalize_pattern(p)
2707
2617
for p in name_pattern_list]
2708
2618
for name_pattern in name_pattern_list:
2720
2630
if id is not None:
2721
2631
filename = entry[0]
2722
2632
if ignored.match(filename):
2723
matches.append(filename)
2633
matches.append(filename.encode('utf-8'))
2724
2634
tree.unlock()
2725
2635
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),))
2636
print "Warning: the following files are version controlled and" \
2637
" match your ignore pattern:\n%s" \
2638
"\nThese files will continue to be version controlled" \
2639
" unless you 'bzr remove' them." % ("\n".join(matches),)
2730
2640
2731
2641
2732
2642
class cmd_ignored(Command):
2733
__doc__ = """List ignored files and the patterns that matched them.
2643
"""List ignored files and the patterns that matched them.
2734
2644
2735
2645
List all the ignored files and the ignore pattern that caused the file to
2736
2646
be ignored.
2746
2656
@display_command
2747
2657
def run(self):
2748
2658
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))
2659
tree.lock_read()
2660
try:
2661
for path, file_class, kind, file_id, entry in tree.list_files():
2662
if file_class != 'I':
2663
continue
2664
## XXX: Slightly inefficient since this was already calculated
2665
pat = tree.is_ignored(path)
2666
self.outf.write('%-50s %s\n' % (path, pat))
2667
finally:
2668
tree.unlock()
2756
2669
2757
2670
2758
2671
class cmd_lookup_revision(Command):
2759
__doc__ = """Lookup the revision-id from a revision-number
2672
"""Lookup the revision-id from a revision-number
2760
2673
2761
2674
:Examples:
2762
2675
bzr lookup-revision 33
2769
2682
try:
2770
2683
revno = int(revno)
2771
2684
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)
2685
raise errors.BzrCommandError("not a valid revision-number: %r" % revno)
2686
2687
print WorkingTree.open_containing(u'.')[0].branch.get_rev_id(revno)
2776
2688
2777
2689
2778
2690
class cmd_export(Command):
2779
__doc__ = """Export current or past revision to a destination directory or archive.
2691
"""Export current or past revision to a destination directory or archive.
2780
2692
2781
2693
If no revision is specified this exports the last committed revision.
2782
2694
2814
2726
Option('root',
2815
2727
type=str,
2816
2728
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
2729
]
2821
2730
def run(self, dest, branch_or_subdir=None, revision=None, format=None,
2822
root=None, filters=False, per_file_timestamps=False):
2731
root=None, filters=False):
2823
2732
from bzrlib.export import export
2824
2733
2825
2734
if branch_or_subdir is None:
2832
2741
2833
2742
rev_tree = _get_one_revision_tree('export', revision, branch=b, tree=tree)
2834
2743
try:
2835
export(rev_tree, dest, format, root, subdir, filtered=filters,
2836
per_file_timestamps=per_file_timestamps)
2744
export(rev_tree, dest, format, root, subdir, filtered=filters)
2837
2745
except errors.NoSuchExportFormat, e:
2838
2746
raise errors.BzrCommandError('Unsupported export format: %s' % e.format)
2839
2747
2840
2748
2841
2749
class cmd_cat(Command):
2842
__doc__ = """Write the contents of a file as of a given revision to standard output.
2750
"""Write the contents of a file as of a given revision to standard output.
2843
2751
2844
2752
If no revision is nominated, the last revision is used.
2845
2753
2865
2773
" one revision specifier")
2866
2774
tree, branch, relpath = \
2867
2775
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)
2776
branch.lock_read()
2777
try:
2778
return self._run(tree, branch, relpath, filename, revision,
2779
name_from_revision, filters)
2780
finally:
2781
branch.unlock()
2871
2782
2872
2783
def _run(self, tree, b, relpath, filename, revision, name_from_revision,
2873
2784
filtered):
2874
2785
if tree is None:
2875
2786
tree = b.basis_tree()
2876
2787
rev_tree = _get_one_revision_tree('cat', revision, branch=b)
2877
self.add_cleanup(rev_tree.lock_read().unlock)
2878
2788
2879
2789
old_file_id = rev_tree.path2id(relpath)
2880
2790
2915
2825
chunks = content.splitlines(True)
2916
2826
content = filtered_output_bytes(chunks, filters,
2917
2827
ContentFilterContext(relpath, rev_tree))
2918
self.cleanup_now()
2919
2828
self.outf.writelines(content)
2920
2829
else:
2921
self.cleanup_now()
2922
2830
self.outf.write(content)
2923
2831
2924
2832
2925
2833
class cmd_local_time_offset(Command):
2926
__doc__ = """Show the offset in seconds from GMT to local time."""
2834
"""Show the offset in seconds from GMT to local time."""
2927
2835
hidden = True
2928
2836
@display_command
2929
2837
def run(self):
2930
self.outf.write("%s\n" % osutils.local_time_offset())
2838
print osutils.local_time_offset()
2931
2839
2932
2840
2933
2841
2934
2842
class cmd_commit(Command):
2935
__doc__ = """Commit changes into a new revision.
2843
"""Commit changes into a new revision.
2936
2844
2937
2845
An explanatory message needs to be given for each commit. This is
2938
2846
often done by using the --message option (getting the message from the
3031
2939
Option('strict',
3032
2940
help="Refuse to commit if there are unknown "
3033
2941
"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
2942
ListOption('fixes', type=str,
3038
2943
help="Mark a bug as being fixed by this revision "
3039
2944
"(see \"bzr help bugs\")."),
3046
2951
"the master branch until a normal commit "
3047
2952
"is performed."
3048
2953
),
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.'),
2954
Option('show-diff',
2955
help='When no message is supplied, show the diff along'
2956
' with the status summary in the message editor.'),
3052
2957
]
3053
2958
aliases = ['ci', 'checkin']
3054
2959
3073
2978
3074
2979
def run(self, message=None, file=None, verbose=False, selected_list=None,
3075
2980
unchanged=False, strict=False, local=False, fixes=None,
3076
author=None, show_diff=False, exclude=None, commit_time=None):
2981
author=None, show_diff=False, exclude=None):
3077
2982
from bzrlib.errors import (
3078
2983
PointlessCommit,
3079
2984
ConflictsInTree,
3085
2990
make_commit_message_template_encoded
3086
2991
)
3087
2992
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
2993
# TODO: Need a blackbox test for invoking the external editor; may be
3097
2994
# slightly problematic to run this cross-platform.
3098
2995
3118
3015
if local and not tree.branch.get_bound_location():
3119
3016
raise errors.LocalRequiresBoundBranch()
3120
3017
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
3018
def get_message(commit_obj):
3143
3019
"""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,
3020
my_message = message
3021
if my_message is None and not file:
3022
t = make_commit_message_template_encoded(tree,
3153
3023
selected_list, diff=show_diff,
3154
3024
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
3025
start_message = generate_commit_message_template(commit_obj)
3161
my_message = edit_commit_message_encoded(text,
3026
my_message = edit_commit_message_encoded(t,
3162
3027
start_message=start_message)
3163
3028
if my_message is None:
3164
3029
raise errors.BzrCommandError("please specify a commit"
3165
3030
" message with either --message or --file")
3031
elif my_message and file:
3032
raise errors.BzrCommandError(
3033
"please specify either --message or --file")
3034
if file:
3035
my_message = codecs.open(file, 'rt',
3036
osutils.get_user_encoding()).read()
3166
3037
if my_message == "":
3167
3038
raise errors.BzrCommandError("empty commit message specified")
3168
3039
return my_message
3176
3047
specific_files=selected_list,
3177
3048
allow_pointless=unchanged, strict=strict, local=local,
3178
3049
reporter=None, verbose=verbose, revprops=properties,
3179
authors=author, timestamp=commit_stamp,
3180
timezone=offset,
3050
authors=author,
3181
3051
exclude=safe_relpath_files(tree, exclude))
3182
3052
except PointlessCommit:
3053
# FIXME: This should really happen before the file is read in;
3054
# perhaps prepare the commit; get the message; then actually commit
3183
3055
raise errors.BzrCommandError("No changes to commit."
3184
3056
" Use --unchanged to commit anyhow.")
3185
3057
except ConflictsInTree:
3190
3062
raise errors.BzrCommandError("Commit refused because there are"
3191
3063
" unknown files in the working tree.")
3192
3064
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
3065
raise errors.BzrCommandError(str(e) + "\n"
3066
'To commit to master branch, run update and then commit.\n'
3067
'You can also pass --local to commit to continue working '
3068
'disconnected.')
3198
3069
3199
3070
3200
3071
class cmd_check(Command):
3201
__doc__ = """Validate working tree structure, branch consistency and repository history.
3072
"""Validate working tree structure, branch consistency and repository history.
3202
3073
3203
3074
This command checks various invariants about branch and repository storage
3204
3075
to detect data corruption or bzr bugs.
3268
3139
3269
3140
3270
3141
class cmd_upgrade(Command):
3271
__doc__ = """Upgrade branch storage to current format.
3142
"""Upgrade branch storage to current format.
3272
3143
3273
3144
The check command or bzr developers may sometimes advise you to run
3274
3145
this command. When the default format has changed you may also be warned
3292
3163
3293
3164
3294
3165
class cmd_whoami(Command):
3295
__doc__ = """Show or set bzr user id.
3166
"""Show or set bzr user id.
3296
3167
3297
3168
:Examples:
3298
3169
Show the email of the current user::
3342
3213
3343
3214
3344
3215
class cmd_nick(Command):
3345
__doc__ = """Print or set the branch nickname.
3216
"""Print or set the branch nickname.
3346
3217
3347
3218
If unset, the tree root directory name is used as the nickname.
3348
3219
To print the current nickname, execute with no argument.
3362
3233
3363
3234
@display_command
3364
3235
def printme(self, branch):
3365
self.outf.write('%s\n' % branch.nick)
3236
print branch.nick
3366
3237
3367
3238
3368
3239
class cmd_alias(Command):
3369
__doc__ = """Set/unset and display aliases.
3240
"""Set/unset and display aliases.
3370
3241
3371
3242
:Examples:
3372
3243
Show the current aliases::
3436
3307
3437
3308
3438
3309
class cmd_selftest(Command):
3439
__doc__ = """Run internal test suite.
3310
"""Run internal test suite.
3440
3311
3441
3312
If arguments are given, they are regular expressions that say which tests
3442
3313
should run. Tests matching any expression are run, and other tests are
3486
3357
def get_transport_type(typestring):
3487
3358
"""Parse and return a transport specifier."""
3488
3359
if typestring == "sftp":
3489
from bzrlib.tests import stub_sftp
3490
return stub_sftp.SFTPAbsoluteServer
3360
from bzrlib.transport.sftp import SFTPAbsoluteServer
3361
return SFTPAbsoluteServer
3491
3362
if typestring == "memory":
3492
from bzrlib.tests import test_server
3493
return memory.MemoryServer
3363
from bzrlib.transport.memory import MemoryServer
3364
return MemoryServer
3494
3365
if typestring == "fakenfs":
3495
from bzrlib.tests import test_server
3496
return test_server.FakeNFSServer
3366
from bzrlib.transport.fakenfs import FakeNFSServer
3367
return FakeNFSServer
3497
3368
msg = "No known transport type %s. Supported types are: sftp\n" %\
3498
3369
(typestring)
3499
3370
raise errors.BzrCommandError(msg)
3583
3454
raise errors.BzrCommandError("subunit not available. subunit "
3584
3455
"needs to be installed to use --subunit.")
3585
3456
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
3457
if parallel:
3592
3458
self.additional_selftest_args.setdefault(
3593
3459
'suite_decorators', []).append(parallel)
3597
3463
verbose = not is_quiet()
3598
3464
# TODO: should possibly lock the history file...
3599
3465
benchfile = open(".perf_history", "at", buffering=1)
3600
self.add_cleanup(benchfile.close)
3601
3466
else:
3602
3467
test_suite_factory = None
3603
3468
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)
3469
try:
3470
selftest_kwargs = {"verbose": verbose,
3471
"pattern": pattern,
3472
"stop_on_failure": one,
3473
"transport": transport,
3474
"test_suite_factory": test_suite_factory,
3475
"lsprof_timed": lsprof_timed,
3476
"lsprof_tests": lsprof_tests,
3477
"bench_history": benchfile,
3478
"matching_tests_first": first,
3479
"list_only": list_only,
3480
"random_seed": randomize,
3481
"exclude_pattern": exclude,
3482
"strict": strict,
3483
"load_list": load_list,
3484
"debug_flags": debugflag,
3485
"starting_with": starting_with
3486
}
3487
selftest_kwargs.update(self.additional_selftest_args)
3488
result = selftest(**selftest_kwargs)
3489
finally:
3490
if benchfile is not None:
3491
benchfile.close()
3623
3492
return int(not result)
3624
3493
3625
3494
3626
3495
class cmd_version(Command):
3627
__doc__ = """Show version of bzr."""
3496
"""Show version of bzr."""
3628
3497
3629
3498
encoding_type = 'replace'
3630
3499
takes_options = [
3641
3510
3642
3511
3643
3512
class cmd_rocks(Command):
3644
__doc__ = """Statement of optimism."""
3513
"""Statement of optimism."""
3645
3514
3646
3515
hidden = True
3647
3516
3648
3517
@display_command
3649
3518
def run(self):
3650
self.outf.write("It sure does!\n")
3519
print "It sure does!"
3651
3520
3652
3521
3653
3522
class cmd_find_merge_base(Command):
3654
__doc__ = """Find and print a base revision for merging two branches."""
3523
"""Find and print a base revision for merging two branches."""
3655
3524
# TODO: Options to specify revisions on either side, as if
3656
3525
# merging only part of the history.
3657
3526
takes_args = ['branch', 'other']
3663
3532
3664
3533
branch1 = Branch.open_containing(branch)[0]
3665
3534
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)
3535
branch1.lock_read()
3536
try:
3537
branch2.lock_read()
3538
try:
3539
last1 = ensure_null(branch1.last_revision())
3540
last2 = ensure_null(branch2.last_revision())
3541
3542
graph = branch1.repository.get_graph(branch2.repository)
3543
base_rev_id = graph.find_unique_lca(last1, last2)
3544
3545
print 'merge base is revision %s' % base_rev_id
3546
finally:
3547
branch2.unlock()
3548
finally:
3549
branch1.unlock()
3675
3550
3676
3551
3677
3552
class cmd_merge(Command):
3678
__doc__ = """Perform a three-way merge.
3553
"""Perform a three-way merge.
3679
3554
3680
3555
The source of the merge can be specified either in the form of a branch,
3681
3556
or in the form of a path to a file containing a merge directive generated
3710
3585
committed to record the result of the merge.
3711
3586
3712
3587
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.
3588
--force is given.
3719
3589
3720
3590
To select only some changes to merge, use "merge -i", which will prompt
3721
3591
you to apply each diff hunk and file change, similar to "shelve".
3733
3603
3734
3604
bzr merge -r 81..82 ../bzr.dev
3735
3605
3736
To apply a merge directive contained in /tmp/merge::
3606
To apply a merge directive contained in /tmp/merge:
3737
3607
3738
3608
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
3609
"""
3747
3610
3748
3611
encoding_type = 'exact'
3800
3663
3801
3664
# die as quickly as possible if there are uncommitted changes
3802
3665
if not force:
3803
if tree.has_changes():
3666
if tree.has_changes(basis_tree) or len(tree.get_parent_ids()) > 1:
3804
3667
raise errors.UncommittedChanges(tree)
3805
3668
3806
3669
view_info = _get_view_info_for_change_reporter(tree)
3807
3670
change_reporter = delta._ChangeReporter(
3808
3671
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
3672
cleanups = []
3673
try:
3674
pb = ui.ui_factory.nested_progress_bar()
3675
cleanups.append(pb.finished)
3676
tree.lock_write()
3677
cleanups.append(tree.unlock)
3678
if location is not None:
3679
try:
3680
mergeable = bundle.read_mergeable_from_url(location,
3681
possible_transports=possible_transports)
3682
except errors.NotABundle:
3683
mergeable = None
3684
else:
3685
if uncommitted:
3686
raise errors.BzrCommandError('Cannot use --uncommitted'
3687
' with bundles or merge directives.')
3688
3689
if revision is not None:
3690
raise errors.BzrCommandError(
3691
'Cannot use -r with merge directives or bundles')
3692
merger, verified = _mod_merge.Merger.from_mergeable(tree,
3693
mergeable, pb)
3694
3695
if merger is None and uncommitted:
3696
if revision is not None and len(revision) > 0:
3697
raise errors.BzrCommandError('Cannot use --uncommitted and'
3698
' --revision at the same time.')
3699
merger = self.get_merger_from_uncommitted(tree, location, pb,
3700
cleanups)
3701
allow_pending = False
3702
3703
if merger is None:
3704
merger, allow_pending = self._get_merger_from_branch(tree,
3705
location, revision, remember, possible_transports, pb)
3706
3707
merger.merge_type = merge_type
3708
merger.reprocess = reprocess
3709
merger.show_base = show_base
3710
self.sanity_check_merger(merger)
3711
if (merger.base_rev_id == merger.other_rev_id and
3712
merger.other_rev_id is not None):
3713
note('Nothing to do.')
3714
return 0
3715
if pull:
3716
if merger.interesting_files is not None:
3717
raise errors.BzrCommandError('Cannot pull individual files')
3718
if (merger.base_rev_id == tree.last_revision()):
3719
result = tree.pull(merger.other_branch, False,
3720
merger.other_rev_id)
3721
result.report(self.outf)
3722
return 0
3723
merger.check_basis(False)
3724
if preview:
3725
return self._do_preview(merger, cleanups)
3726
elif interactive:
3727
return self._do_interactive(merger, cleanups)
3818
3728
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):
3729
return self._do_merge(merger, change_reporter, allow_pending,
3730
verified)
3731
finally:
3732
for cleanup in reversed(cleanups):
3733
cleanup()
3734
3735
def _get_preview(self, merger, cleanups):
3869
3736
tree_merger = merger.make_merger()
3870
3737
tt = tree_merger.make_preview_transform()
3871
self.add_cleanup(tt.finalize)
3738
cleanups.append(tt.finalize)
3872
3739
result_tree = tt.get_preview_tree()
3873
3740
return result_tree
3874
3741
3875
def _do_preview(self, merger):
3742
def _do_preview(self, merger, cleanups):
3876
3743
from bzrlib.diff import show_diff_trees
3877
result_tree = self._get_preview(merger)
3744
result_tree = self._get_preview(merger, cleanups)
3878
3745
show_diff_trees(merger.this_tree, result_tree, self.outf,
3879
3746
old_label='', new_label='')
3880
3747
3890
3757
else:
3891
3758
return 0
3892
3759
3893
def _do_interactive(self, merger):
3760
def _do_interactive(self, merger, cleanups):
3894
3761
"""Perform an interactive merge.
3895
3762
3896
3763
This works by generating a preview tree of the merge, then using
3898
3765
and the preview tree.
3899
3766
"""
3900
3767
from bzrlib import shelf_ui
3901
result_tree = self._get_preview(merger)
3768
result_tree = self._get_preview(merger, cleanups)
3902
3769
writer = bzrlib.option.diff_writer_registry.get()
3903
3770
shelver = shelf_ui.Shelver(merger.this_tree, result_tree, destroy=True,
3904
3771
reporter=shelf_ui.ApplyReporter(),
3905
3772
diff_writer=writer(sys.stdout))
3906
try:
3907
shelver.run()
3908
finally:
3909
shelver.finalize()
3773
shelver.run()
3910
3774
3911
3775
def sanity_check_merger(self, merger):
3912
3776
if (merger.show_base and
3972
3836
allow_pending = True
3973
3837
return merger, allow_pending
3974
3838
3975
def get_merger_from_uncommitted(self, tree, location, pb):
3839
def get_merger_from_uncommitted(self, tree, location, pb, cleanups):
3976
3840
"""Get a merger for uncommitted changes.
3977
3841
3978
3842
:param tree: The tree the merger should apply to.
3979
3843
:param location: The location containing uncommitted changes.
3980
3844
:param pb: The progress bar to use for showing progress.
3845
:param cleanups: A list of operations to perform to clean up the
3846
temporary directories, unfinalized objects, etc.
3981
3847
"""
3982
3848
location = self._select_branch_location(tree, location)[0]
3983
3849
other_tree, other_path = WorkingTree.open_containing(location)
4035
3901
4036
3902
4037
3903
class cmd_remerge(Command):
4038
__doc__ = """Redo a merge.
3904
"""Redo a merge.
4039
3905
4040
3906
Use this if you want to try a different merge technique while resolving
4041
3907
conflicts. Some merge techniques are better than others, and remerge
4066
3932
4067
3933
def run(self, file_list=None, merge_type=None, show_base=False,
4068
3934
reprocess=False):
4069
from bzrlib.conflicts import restore
4070
3935
if merge_type is None:
4071
3936
merge_type = _mod_merge.Merge3Merger
4072
3937
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
3938
tree.lock_write()
3939
try:
3940
parents = tree.get_parent_ids()
3941
if len(parents) != 2:
3942
raise errors.BzrCommandError("Sorry, remerge only works after normal"
3943
" merges. Not cherrypicking or"
3944
" multi-merges.")
3945
repository = tree.branch.repository
3946
interesting_ids = None
3947
new_conflicts = []
3948
conflicts = tree.conflicts()
3949
if file_list is not None:
3950
interesting_ids = set()
3951
for filename in file_list:
3952
file_id = tree.path2id(filename)
3953
if file_id is None:
3954
raise errors.NotVersionedError(filename)
3955
interesting_ids.add(file_id)
3956
if tree.kind(file_id) != "directory":
3957
continue
4092
3958
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:
3959
for name, ie in tree.inventory.iter_entries(file_id):
3960
interesting_ids.add(ie.file_id)
3961
new_conflicts = conflicts.select_conflicts(tree, file_list)[0]
3962
else:
3963
# Remerge only supports resolving contents conflicts
3964
allowed_conflicts = ('text conflict', 'contents conflict')
3965
restore_files = [c.path for c in conflicts
3966
if c.typestring in allowed_conflicts]
3967
_mod_merge.transform_tree(tree, tree.basis_tree(), interesting_ids)
3968
tree.set_conflicts(ConflictList(new_conflicts))
3969
if file_list is not None:
3970
restore_files = file_list
3971
for filename in restore_files:
3972
try:
3973
restore(tree.abspath(filename))
3974
except errors.NotConflicted:
3975
pass
3976
# Disable pending merges, because the file texts we are remerging
3977
# have not had those merges performed. If we use the wrong parents
3978
# list, we imply that the working tree text has seen and rejected
3979
# all the changes from the other tree, when in fact those changes
3980
# have not yet been seen.
3981
pb = ui.ui_factory.nested_progress_bar()
3982
tree.set_parent_ids(parents[:1])
4106
3983
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()
3984
merger = _mod_merge.Merger.from_revision_ids(pb,
3985
tree, parents[1])
3986
merger.interesting_ids = interesting_ids
3987
merger.merge_type = merge_type
3988
merger.show_base = show_base
3989
merger.reprocess = reprocess
3990
conflicts = merger.do_merge()
3991
finally:
3992
tree.set_parent_ids(parents)
3993
pb.finished()
4123
3994
finally:
4124
tree.set_parent_ids(parents)
3995
tree.unlock()
4125
3996
if conflicts > 0:
4126
3997
return 1
4127
3998
else:
4129
4000
4130
4001
4131
4002
class cmd_revert(Command):
4132
__doc__ = """Revert files to a previous revision.
4003
"""Revert files to a previous revision.
4133
4004
4134
4005
Giving a list of files will revert only those files. Otherwise, all files
4135
4006
will be reverted. If the revision is not specified with '--revision', the
4149
4020
name. If you name a directory, all the contents of that directory will be
4150
4021
reverted.
4151
4022
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.
4023
Any files that have been newly added since that revision will be deleted,
4024
with a backup kept if appropriate. Directories containing unknown files
4025
will not be deleted.
4156
4026
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
4027
The working tree contains a list of pending merged revisions, which will
4028
be included as parents in the next commit. Normally, revert clears that
4029
list as well as reverting the files. If any files are specified, revert
4030
leaves the pending merge list alone and reverts only the files. Use "bzr
4031
revert ." in the tree root to revert all files but keep the merge record,
4032
and "bzr revert --forget-merges" to clear the pending merge list without
4164
4033
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
4034
"""
4176
4035
4177
4036
_see_also = ['cat', 'export']
4186
4045
def run(self, revision=None, no_backup=False, file_list=None,
4187
4046
forget_merges=None):
4188
4047
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)
4048
tree.lock_write()
4049
try:
4050
if forget_merges:
4051
tree.set_parent_ids(tree.get_parent_ids()[:1])
4052
else:
4053
self._revert_tree_to_revision(tree, revision, file_list, no_backup)
4054
finally:
4055
tree.unlock()
4194
4056
4195
4057
@staticmethod
4196
4058
def _revert_tree_to_revision(tree, revision, file_list, no_backup):
4197
4059
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)
4060
pb = ui.ui_factory.nested_progress_bar()
4061
try:
4062
tree.revert(file_list, rev_tree, not no_backup, pb,
4063
report_changes=True)
4064
finally:
4065
pb.finished()
4200
4066
4201
4067
4202
4068
class cmd_assert_fail(Command):
4203
__doc__ = """Test reporting of assertion failures"""
4069
"""Test reporting of assertion failures"""
4204
4070
# intended just for use in testing
4205
4071
4206
4072
hidden = True
4210
4076
4211
4077
4212
4078
class cmd_help(Command):
4213
__doc__ = """Show help on a command or other topic.
4079
"""Show help on a command or other topic.
4214
4080
"""
4215
4081
4216
4082
_see_also = ['topics']
4229
4095
4230
4096
4231
4097
class cmd_shell_complete(Command):
4232
__doc__ = """Show appropriate completions for context.
4098
"""Show appropriate completions for context.
4233
4099
4234
4100
For a list of all available commands, say 'bzr shell-complete'.
4235
4101
"""
4244
4110
4245
4111
4246
4112
class cmd_missing(Command):
4247
__doc__ = """Show unmerged/unpulled revisions between two branches.
4113
"""Show unmerged/unpulled revisions between two branches.
4248
4114
4249
4115
OTHER_BRANCH may be local or remote.
4250
4116
4251
4117
To filter on a range of revisions, you can use the command -r begin..end
4252
4118
-r revision requests a specific revision, -r ..end or -r begin.. are
4253
4119
also valid.
4254
4255
:Exit values:
4256
1 - some missing revisions
4257
0 - no missing revisions
4258
4120
4259
4121
:Examples:
4260
4122
4328
4190
restrict = 'remote'
4329
4191
4330
4192
local_branch = Branch.open_containing(u".")[0]
4331
self.add_cleanup(local_branch.lock_read().unlock)
4332
4333
4193
parent = local_branch.get_parent()
4334
4194
if other_branch is None:
4335
4195
other_branch = parent
4344
4204
remote_branch = Branch.open(other_branch)
4345
4205
if remote_branch.base == local_branch.base:
4346
4206
remote_branch = local_branch
4347
else:
4348
self.add_cleanup(remote_branch.lock_read().unlock)
4349
4207
4350
4208
local_revid_range = _revision_range_to_revid_range(
4351
4209
_get_revision_range(my_revision, local_branch,
4355
4213
_get_revision_range(revision,
4356
4214
remote_branch, self.name()))
4357
4215
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()
4216
local_branch.lock_read()
4217
try:
4218
remote_branch.lock_read()
4219
try:
4220
local_extra, remote_extra = find_unmerged(
4221
local_branch, remote_branch, restrict,
4222
backward=not reverse,
4223
include_merges=include_merges,
4224
local_revid_range=local_revid_range,
4225
remote_revid_range=remote_revid_range)
4226
4227
if log_format is None:
4228
registry = log.log_formatter_registry
4229
log_format = registry.get_default(local_branch)
4230
lf = log_format(to_file=self.outf,
4231
show_ids=show_ids,
4232
show_timezone='original')
4233
4234
status_code = 0
4235
if local_extra and not theirs_only:
4236
message("You have %d extra revision(s):\n" %
4237
len(local_extra))
4238
for revision in iter_log_revisions(local_extra,
4239
local_branch.repository,
4240
verbose):
4241
lf.log_revision(revision)
4242
printed_local = True
4243
status_code = 1
4244
else:
4245
printed_local = False
4246
4247
if remote_extra and not mine_only:
4248
if printed_local is True:
4249
message("\n\n\n")
4250
message("You are missing %d revision(s):\n" %
4251
len(remote_extra))
4252
for revision in iter_log_revisions(remote_extra,
4253
remote_branch.repository,
4254
verbose):
4255
lf.log_revision(revision)
4256
status_code = 1
4257
4258
if mine_only and not local_extra:
4259
# We checked local, and found nothing extra
4260
message('This branch is up to date.\n')
4261
elif theirs_only and not remote_extra:
4262
# We checked remote, and found nothing extra
4263
message('Other branch is up to date.\n')
4264
elif not (mine_only or theirs_only or local_extra or
4265
remote_extra):
4266
# We checked both branches, and neither one had extra
4267
# revisions
4268
message("Branches are up to date.\n")
4269
finally:
4270
remote_branch.unlock()
4271
finally:
4272
local_branch.unlock()
4408
4273
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)
4274
local_branch.lock_write()
4275
try:
4276
# handle race conditions - a parent might be set while we run.
4277
if local_branch.get_parent() is None:
4278
local_branch.set_parent(remote_branch.base)
4279
finally:
4280
local_branch.unlock()
4413
4281
return status_code
4414
4282
4415
4283
4416
4284
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
"""
4285
"""Compress the data within a repository."""
4434
4286
4435
4287
_see_also = ['repositories']
4436
4288
takes_args = ['branch_or_repo?']
4437
takes_options = [
4438
Option('clean-obsolete-packs', 'Delete obsolete packs to save disk space.'),
4439
]
4440
4289
4441
def run(self, branch_or_repo='.', clean_obsolete_packs=False):
4290
def run(self, branch_or_repo='.'):
4442
4291
dir = bzrdir.BzrDir.open_containing(branch_or_repo)[0]
4443
4292
try:
4444
4293
branch = dir.open_branch()
4445
4294
repository = branch.repository
4446
4295
except errors.NotBranchError:
4447
4296
repository = dir.open_repository()
4448
repository.pack(clean_obsolete_packs=clean_obsolete_packs)
4297
repository.pack()
4449
4298
4450
4299
4451
4300
class cmd_plugins(Command):
4452
__doc__ = """List the installed plugins.
4301
"""List the installed plugins.
4453
4302
4454
4303
This command displays the list of installed plugins including
4455
4304
version of plugin and a short description of each.
4462
4311
adding new commands, providing additional network transports and
4463
4312
customizing log output.
4464
4313
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.
4314
See the Bazaar web site, http://bazaar-vcs.org, for further
4315
information on plugins including where to find them and how to
4316
install them. Instructions are also provided there on how to
4317
write new plugins using the Python programming language.
4469
4318
"""
4470
4319
takes_options = ['verbose']
4471
4320
4486
4335
doc = '(no description)'
4487
4336
result.append((name_ver, doc, plugin.path()))
4488
4337
for name_ver, doc, path in sorted(result):
4489
self.outf.write("%s\n" % name_ver)
4490
self.outf.write(" %s\n" % doc)
4338
print name_ver
4339
print ' ', doc
4491
4340
if verbose:
4492
self.outf.write(" %s\n" % path)
4493
self.outf.write("\n")
4341
print ' ', path
4342
print
4494
4343
4495
4344
4496
4345
class cmd_testament(Command):
4497
__doc__ = """Show testament (signing-form) of a revision."""
4346
"""Show testament (signing-form) of a revision."""
4498
4347
takes_options = [
4499
4348
'revision',
4500
4349
Option('long', help='Produce long-format testament.'),
4512
4361
b = Branch.open_containing(branch)[0]
4513
4362
else:
4514
4363
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())
4364
b.lock_read()
4365
try:
4366
if revision is None:
4367
rev_id = b.last_revision()
4368
else:
4369
rev_id = revision[0].as_revision_id(b)
4370
t = testament_class.from_revision(b.repository, rev_id)
4371
if long:
4372
sys.stdout.writelines(t.as_text_lines())
4373
else:
4374
sys.stdout.write(t.as_short_text())
4375
finally:
4376
b.unlock()
4525
4377
4526
4378
4527
4379
class cmd_annotate(Command):
4528
__doc__ = """Show the origin of each line in a file.
4380
"""Show the origin of each line in a file.
4529
4381
4530
4382
This prints out the given file with an annotation on the left side
4531
4383
indicating which revision, author and date introduced the change.
4552
4404
wt, branch, relpath = \
4553
4405
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
4554
4406
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)
4407
wt.lock_read()
4408
else:
4409
branch.lock_read()
4410
try:
4411
tree = _get_one_revision_tree('annotate', revision, branch=branch)
4412
if wt is not None:
4413
file_id = wt.path2id(relpath)
4414
else:
4415
file_id = tree.path2id(relpath)
4416
if file_id is None:
4417
raise errors.NotVersionedError(filename)
4418
file_version = tree.inventory[file_id].revision
4419
if wt is not None and revision is None:
4420
# If there is a tree and we're not annotating historical
4421
# versions, annotate the working tree's content.
4422
annotate_file_tree(wt, file_id, self.outf, long, all,
4423
show_ids=show_ids)
4424
else:
4425
annotate_file(branch, file_version, file_id, long, all, self.outf,
4426
show_ids=show_ids)
4427
finally:
4428
if wt is not None:
4429
wt.unlock()
4430
else:
4431
branch.unlock()
4575
4432
4576
4433
4577
4434
class cmd_re_sign(Command):
4578
__doc__ = """Create a digital signature for an existing revision."""
4435
"""Create a digital signature for an existing revision."""
4579
4436
# TODO be able to replace existing ones.
4580
4437
4581
4438
hidden = True # is this right ?
4588
4445
if revision_id_list is None and revision is None:
4589
4446
raise errors.BzrCommandError('You must supply either --revision or a revision_id')
4590
4447
b = WorkingTree.open_containing(u'.')[0].branch
4591
self.add_cleanup(b.lock_write().unlock)
4592
return self._run(b, revision_id_list, revision)
4448
b.lock_write()
4449
try:
4450
return self._run(b, revision_id_list, revision)
4451
finally:
4452
b.unlock()
4593
4453
4594
4454
def _run(self, b, revision_id_list, revision):
4595
4455
import bzrlib.gpg as gpg
4640
4500
4641
4501
4642
4502
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.
4503
"""Convert the current branch into a checkout of the supplied branch.
4645
4504
4646
4505
Once converted into a checkout, commits must succeed on the master branch
4647
4506
before they will be applied to the local branch.
4648
4507
4649
4508
Bound branches use the nickname of its master branch unless it is set
4650
locally, in which case binding will update the local nickname to be
4509
locally, in which case binding will update the the local nickname to be
4651
4510
that of the master.
4652
4511
"""
4653
4512
4665
4524
'This format does not remember old locations.')
4666
4525
else:
4667
4526
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')
4527
raise errors.BzrCommandError('No location supplied and no '
4528
'previous location known')
4673
4529
b_other = Branch.open(location)
4674
4530
try:
4675
4531
b.bind(b_other)
4681
4537
4682
4538
4683
4539
class cmd_unbind(Command):
4684
__doc__ = """Convert the current checkout into a regular branch.
4540
"""Convert the current checkout into a regular branch.
4685
4541
4686
4542
After unbinding, the local branch is considered independent and subsequent
4687
4543
commits will be local only.
4698
4554
4699
4555
4700
4556
class cmd_uncommit(Command):
4701
__doc__ = """Remove the last committed revision.
4557
"""Remove the last committed revision.
4702
4558
4703
4559
--verbose will print out what is being removed.
4704
4560
--dry-run will go through all the motions, but not actually
4744
4600
b = control.open_branch()
4745
4601
4746
4602
if tree is not None:
4747
self.add_cleanup(tree.lock_write().unlock)
4603
tree.lock_write()
4748
4604
else:
4749
self.add_cleanup(b.lock_write().unlock)
4750
return self._run(b, tree, dry_run, verbose, revision, force, local=local)
4605
b.lock_write()
4606
try:
4607
return self._run(b, tree, dry_run, verbose, revision, force,
4608
local=local)
4609
finally:
4610
if tree is not None:
4611
tree.unlock()
4612
else:
4613
b.unlock()
4751
4614
4752
4615
def _run(self, b, tree, dry_run, verbose, revision, force, local=False):
4753
4616
from bzrlib.log import log_formatter, show_log
4785
4648
end_revision=last_revno)
4786
4649
4787
4650
if dry_run:
4788
self.outf.write('Dry-run, pretending to remove'
4789
' the above revisions.\n')
4651
print 'Dry-run, pretending to remove the above revisions.'
4652
if not force:
4653
val = raw_input('Press <enter> to continue')
4790
4654
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
4655
print 'The above revision(s) will be removed.'
4656
if not force:
4657
val = raw_input('Are you sure [y/N]? ')
4658
if val.lower() not in ('y', 'yes'):
4659
print 'Canceled'
4660
return 0
4797
4661
4798
4662
mutter('Uncommitting from {%s} to {%s}',
4799
4663
last_rev_id, rev_id)
4800
4664
uncommit(b, tree=tree, dry_run=dry_run, verbose=verbose,
4801
4665
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)
4666
note('You can restore the old tip by running:\n'
4667
' bzr pull . -r revid:%s', last_rev_id)
4804
4668
4805
4669
4806
4670
class cmd_break_lock(Command):
4807
__doc__ = """Break a dead lock on a repository, branch or working directory.
4671
"""Break a dead lock on a repository, branch or working directory.
4808
4672
4809
4673
CAUTION: Locks should only be broken when you are sure that the process
4810
4674
holding the lock has been stopped.
4811
4675
4812
You can get information on what locks are open via the 'bzr info
4813
[location]' command.
4676
You can get information on what locks are open via the 'bzr info' command.
4814
4677
4815
4678
:Examples:
4816
4679
bzr break-lock
4817
bzr break-lock bzr+ssh://example.com/bzr/foo
4818
4680
"""
4819
4681
takes_args = ['location?']
4820
4682
4829
4691
4830
4692
4831
4693
class cmd_wait_until_signalled(Command):
4832
__doc__ = """Test helper for test_start_and_stop_bzr_subprocess_send_signal.
4694
"""Test helper for test_start_and_stop_bzr_subprocess_send_signal.
4833
4695
4834
4696
This just prints a line to signal when it is ready, then blocks on stdin.
4835
4697
"""
4843
4705
4844
4706
4845
4707
class cmd_serve(Command):
4846
__doc__ = """Run the bzr server."""
4708
"""Run the bzr server."""
4847
4709
4848
4710
aliases = ['server']
4849
4711
4850
4712
takes_options = [
4851
4713
Option('inet',
4852
4714
help='Serve on stdin/out for use from inetd or sshd.'),
4853
RegistryOption('protocol',
4854
help="Protocol to serve.",
4715
RegistryOption('protocol',
4716
help="Protocol to serve.",
4855
4717
lazy_registry=('bzrlib.transport', 'transport_server_registry'),
4856
4718
value_switches=True),
4857
4719
Option('port',
4866
4728
Option('allow-writes',
4867
4729
help='By default the server is a readonly server. Supplying '
4868
4730
'--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.'
4731
'the served directory and below.'
4874
4732
),
4875
4733
]
4876
4734
4909
4767
4910
4768
4911
4769
class cmd_join(Command):
4912
__doc__ = """Combine a tree into its containing tree.
4770
"""Combine a tree into its containing tree.
4913
4771
4914
4772
This command requires the target tree to be in a rich-root format.
4915
4773
4955
4813
4956
4814
4957
4815
class cmd_split(Command):
4958
__doc__ = """Split a subdirectory of a tree into a separate tree.
4816
"""Split a subdirectory of a tree into a separate tree.
4959
4817
4960
4818
This command will produce a target tree in a format that supports
4961
4819
rich roots, like 'rich-root' or 'rich-root-pack'. These formats cannot be
4981
4839
4982
4840
4983
4841
class cmd_merge_directive(Command):
4984
__doc__ = """Generate a merge directive for auto-merge tools.
4842
"""Generate a merge directive for auto-merge tools.
4985
4843
4986
4844
A directive requests a merge to be performed, and also provides all the
4987
4845
information necessary to do so. This means it must either include a
5080
4938
5081
4939
5082
4940
class cmd_send(Command):
5083
__doc__ = """Mail or create a merge-directive for submitting changes.
4941
"""Mail or create a merge-directive for submitting changes.
5084
4942
5085
4943
A merge directive provides many things needed for requesting merges:
5086
4944
5092
4950
directly from the merge directive, without retrieving data from a
5093
4951
branch.
5094
4952
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.
4953
If --no-bundle is specified, then public_branch is needed (and must be
4954
up-to-date), so that the receiver can perform the merge using the
4955
public_branch. The public_branch is always included if known, so that
4956
people can check it later.
4957
4958
The submit branch defaults to the parent, but can be overridden. Both
4959
submit branch and public branch will be remembered if supplied.
4960
4961
If a public_branch is known for the submit_branch, that public submit
4962
branch is used in the merge instructions. This means that a local mirror
4963
can be used as your actual submit branch, once you have set public_branch
4964
for that mirror.
5121
4965
5122
4966
Mail is sent using your preferred mail program. This should be transparent
5123
4967
on Windows (it uses MAPI). On Linux, it requires the xdg-email utility.
5125
4969
5126
4970
To use a specific mail program, set the mail_client configuration option.
5127
4971
(For Thunderbird 1.5, this works around some bugs.) Supported values for
5128
specific clients are "claws", "evolution", "kmail", "mail.app" (MacOS X's
5129
Mail.app), "mutt", and "thunderbird"; generic options are "default",
5130
"editor", "emacsclient", "mapi", and "xdg-email". Plugins may also add
5131
supported clients.
4972
specific clients are "claws", "evolution", "kmail", "mutt", and
4973
"thunderbird"; generic options are "default", "editor", "emacsclient",
4974
"mapi", and "xdg-email". Plugins may also add supported clients.
5132
4975
5133
4976
If mail is being sent, a to address is required. This can be supplied
5134
4977
either on the commandline, by setting the submit_to configuration
5143
4986
5144
4987
The merge directives created by bzr send may be applied using bzr merge or
5145
4988
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
4989
"""
5151
4990
5152
4991
encoding_type = 'exact'
5168
5007
short_name='f',
5169
5008
type=unicode),
5170
5009
Option('output', short_name='o',
5171
help='Write merge directive to this file or directory; '
5010
help='Write merge directive to this file; '
5172
5011
'use - for stdout.',
5173
5012
type=unicode),
5174
5013
Option('strict',
5197
5036
5198
5037
5199
5038
class cmd_bundle_revisions(cmd_send):
5200
__doc__ = """Create a merge-directive for submitting changes.
5039
"""Create a merge-directive for submitting changes.
5201
5040
5202
5041
A merge directive provides many things needed for requesting merges:
5203
5042
5270
5109
5271
5110
5272
5111
class cmd_tag(Command):
5273
__doc__ = """Create, remove or modify a tag naming a revision.
5112
"""Create, remove or modify a tag naming a revision.
5274
5113
5275
5114
Tags give human-meaningful names to revisions. Commands that take a -r
5276
5115
(--revision) option can be given -rtag:X, where X is any previously
5284
5123
5285
5124
To rename a tag (change the name but keep it on the same revsion), run ``bzr
5286
5125
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
5126
"""
5293
5127
5294
5128
_see_also = ['commit', 'tags']
5295
takes_args = ['tag_name?']
5129
takes_args = ['tag_name']
5296
5130
takes_options = [
5297
5131
Option('delete',
5298
5132
help='Delete this tag rather than placing it.',
5308
5142
'revision',
5309
5143
]
5310
5144
5311
def run(self, tag_name=None,
5145
def run(self, tag_name,
5312
5146
delete=None,
5313
5147
directory='.',
5314
5148
force=None,
5315
5149
revision=None,
5316
5150
):
5317
5151
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)
5152
branch.lock_write()
5153
try:
5154
if delete:
5155
branch.tags.delete_tag(tag_name)
5156
self.outf.write('Deleted tag %s.\n' % tag_name)
5331
5157
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)
5158
if revision:
5159
if len(revision) != 1:
5160
raise errors.BzrCommandError(
5161
"Tags can only be placed on a single revision, "
5162
"not on a range")
5163
revision_id = revision[0].as_revision_id(branch)
5164
else:
5165
revision_id = branch.last_revision()
5166
if (not force) and branch.tags.has_tag(tag_name):
5167
raise errors.TagAlreadyExists(tag_name)
5168
branch.tags.set_tag(tag_name, revision_id)
5169
self.outf.write('Created tag %s.\n' % tag_name)
5170
finally:
5171
branch.unlock()
5342
5172
5343
5173
5344
5174
class cmd_tags(Command):
5345
__doc__ = """List tags.
5175
"""List tags.
5346
5176
5347
5177
This command shows a table of tag names and the revisions they reference.
5348
5178
"""
5376
5206
if not tags:
5377
5207
return
5378
5208
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()
5209
branch.lock_read()
5210
try:
5211
if revision:
5212
graph = branch.repository.get_graph()
5213
rev1, rev2 = _get_revision_range(revision, branch, self.name())
5214
revid1, revid2 = rev1.rev_id, rev2.rev_id
5215
# only show revisions between revid1 and revid2 (inclusive)
5216
tags = [(tag, revid) for tag, revid in tags if
5217
graph.is_between(revid, revid1, revid2)]
5218
if sort == 'alpha':
5219
tags.sort()
5220
elif sort == 'time':
5221
timestamps = {}
5222
for tag, revid in tags:
5223
try:
5224
revobj = branch.repository.get_revision(revid)
5225
except errors.NoSuchRevision:
5226
timestamp = sys.maxint # place them at the end
5227
else:
5228
timestamp = revobj.timestamp
5229
timestamps[revid] = timestamp
5230
tags.sort(key=lambda x: timestamps[x[1]])
5231
if not show_ids:
5232
# [ (tag, revid), ... ] -> [ (tag, dotted_revno), ... ]
5233
for index, (tag, revid) in enumerate(tags):
5234
try:
5235
revno = branch.revision_id_to_dotted_revno(revid)
5236
if isinstance(revno, tuple):
5237
revno = '.'.join(map(str, revno))
5238
except errors.NoSuchRevision:
5239
# Bad tag data/merges can lead to tagged revisions
5240
# which are not in this branch. Fail gracefully ...
5241
revno = '?'
5242
tags[index] = (tag, revno)
5243
finally:
5244
branch.unlock()
5413
5245
for tag, revspec in tags:
5414
5246
self.outf.write('%-20s %s\n' % (tag, revspec))
5415
5247
5416
5248
5417
5249
class cmd_reconfigure(Command):
5418
__doc__ = """Reconfigure the type of a bzr directory.
5250
"""Reconfigure the type of a bzr directory.
5419
5251
5420
5252
A target configuration must be specified.
5421
5253
5506
5338
5507
5339
5508
5340
class cmd_switch(Command):
5509
__doc__ = """Set the branch of a checkout and update.
5341
"""Set the branch of a checkout and update.
5510
5342
5511
5343
For lightweight checkouts, this changes the branch being referenced.
5512
5344
For heavyweight checkouts, this checks that there are no local commits
5524
5356
/path/to/newbranch.
5525
5357
5526
5358
Bound branches use the nickname of its master branch unless it is set
5527
locally, in which case switching will update the local nickname to be
5359
locally, in which case switching will update the the local nickname to be
5528
5360
that of the master.
5529
5361
"""
5530
5362
5531
takes_args = ['to_location?']
5363
takes_args = ['to_location']
5532
5364
takes_options = [Option('force',
5533
5365
help='Switch even if local commits will be lost.'),
5534
'revision',
5535
5366
Option('create-branch', short_name='b',
5536
5367
help='Create the target branch from this one before'
5537
5368
' switching to it.'),
5538
]
5369
]
5539
5370
5540
def run(self, to_location=None, force=False, create_branch=False,
5541
revision=None):
5371
def run(self, to_location, force=False, create_branch=False):
5542
5372
from bzrlib import switch
5543
5373
tree_location = '.'
5544
revision = _get_one_revision('switch', revision)
5545
5374
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
5375
try:
5552
5376
branch = control_dir.open_branch()
5553
5377
had_explicit_nick = branch.get_config().has_explicit_nickname()
5558
5382
if branch is None:
5559
5383
raise errors.BzrCommandError('cannot create branch without'
5560
5384
' source branch')
5561
to_location = directory_service.directories.dereference(
5562
to_location)
5563
5385
if '/' not in to_location and '\\' not in to_location:
5564
5386
# This path is meant to be relative to the existing branch
5565
5387
this_url = self._get_branch_location(control_dir)
5567
5389
to_branch = branch.bzrdir.sprout(to_location,
5568
5390
possible_transports=[branch.bzrdir.root_transport],
5569
5391
source_branch=branch).open_branch()
5392
# try:
5393
# from_branch = control_dir.open_branch()
5394
# except errors.NotBranchError:
5395
# raise BzrCommandError('Cannot create a branch from this'
5396
# ' location when we cannot open this branch')
5397
# from_branch.bzrdir.sprout(
5398
pass
5570
5399
else:
5571
5400
try:
5572
5401
to_branch = Branch.open(to_location)
5574
5403
this_url = self._get_branch_location(control_dir)
5575
5404
to_branch = Branch.open(
5576
5405
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)
5406
switch.switch(control_dir, to_branch, force)
5580
5407
if had_explicit_nick:
5581
5408
branch = control_dir.open_branch() #get the new branch!
5582
5409
branch.nick = to_branch.nick
5602
5429
5603
5430
5604
5431
class cmd_view(Command):
5605
__doc__ = """Manage filtered views.
5432
"""Manage filtered views.
5606
5433
5607
5434
Views provide a mask over the tree so that users can focus on
5608
5435
a subset of a tree when doing their work. After creating a view,
5756
5583
5757
5584
5758
5585
class cmd_hooks(Command):
5759
__doc__ = """Show hooks."""
5586
"""Show hooks."""
5760
5587
5761
5588
hidden = True
5762
5589
5775
5602
self.outf.write(" <no hooks installed>\n")
5776
5603
5777
5604
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
5605
class cmd_shelve(Command):
5804
__doc__ = """Temporarily set aside some changes from the current tree.
5606
"""Temporarily set aside some changes from the current tree.
5805
5607
5806
5608
Shelve allows you to temporarily put changes you've made "on the shelf",
5807
5609
ie. out of the way, until a later time when you can bring them back from
5854
5656
try:
5855
5657
shelver.run()
5856
5658
finally:
5857
shelver.finalize()
5659
shelver.work_tree.unlock()
5858
5660
except errors.UserAbort:
5859
5661
return 0
5860
5662
5861
5663
def run_for_list(self):
5862
5664
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
5665
tree.lock_read()
5666
try:
5667
manager = tree.get_shelf_manager()
5668
shelves = manager.active_shelves()
5669
if len(shelves) == 0:
5670
note('No shelved changes.')
5671
return 0
5672
for shelf_id in reversed(shelves):
5673
message = manager.get_metadata(shelf_id).get('message')
5674
if message is None:
5675
message = '<no message>'
5676
self.outf.write('%3d: %s\n' % (shelf_id, message))
5677
return 1
5678
finally:
5679
tree.unlock()
5875
5680
5876
5681
5877
5682
class cmd_unshelve(Command):
5878
__doc__ = """Restore shelved changes.
5683
"""Restore shelved changes.
5879
5684
5880
5685
By default, the most recently shelved changes are restored. However if you
5881
5686
specify a shelf by id those changes will be restored instead. This works
5889
5694
enum_switch=False, value_switches=True,
5890
5695
apply="Apply changes and remove from the shelf.",
5891
5696
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.",
5697
delete_only="Delete changes without applying them."
5896
5698
)
5897
5699
]
5898
5700
_see_also = ['shelve']
5907
5709
5908
5710
5909
5711
class cmd_clean_tree(Command):
5910
__doc__ = """Remove unwanted files from working tree.
5712
"""Remove unwanted files from working tree.
5911
5713
5912
5714
By default, only unknown files, not ignored files, are deleted. Versioned
5913
5715
files are never deleted.
5941
5743
5942
5744
5943
5745
class cmd_reference(Command):
5944
__doc__ = """list, view and set branch locations for nested trees.
5746
"""list, view and set branch locations for nested trees.
5945
5747
5946
5748
If no arguments are provided, lists the branch locations for nested trees.
5947
5749
If one argument is provided, display the branch location for that tree.
5987
5789
self.outf.write('%s %s\n' % (path, location))
5988
5790
5989
5791
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)
5792
# these get imported and then picked up by the scan for cmd_*
5793
# TODO: Some more consistent way to split command definitions across files;
5794
# we do need to load at least some information about them to know of
5795
# aliases. ideally we would avoid loading the implementation until the
5796
# details were needed.
5797
from bzrlib.cmd_version_info import cmd_version_info
5798
from bzrlib.conflicts import cmd_resolve, cmd_conflicts, restore
5799
from bzrlib.bundle.commands import (
5800
cmd_bundle_info,
5801
)
5802
from bzrlib.foreign import cmd_dpush
5803
from bzrlib.sign_my_commits import cmd_sign_my_commits
5804
from bzrlib.weave_commands import cmd_versionedfile_list, \
5805
cmd_weave_plan_merge, cmd_weave_merge_text
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0