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