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