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 4634.99.1
- compare with another revision
- download diff
- download tarball
- view history from revision 4634.99.1
- Committer: Naoki INADA
- Date: 2009-10-29 10:01:19 UTC
- mto: (4634.97.3 2.0)
- mto: This revision was merged to the branch mainline in revision 4798.
- Revision ID: inada-n@klab.jp-20091029100119-uckv9t7ej2qrghw3
import doc-ja rev90
- files added:
- bzrlib/benchmarks
- bzrlib/benchmarks/tree_creator
- files removed:
- .testr.conf
- apport
- bzrlib/help_topics/es
- bzrlib/plugins/bash_completion
- bzrlib/plugins/bash_completion/tests
- bzrlib/plugins/news_merge
- bzrlib/plugins/news_merge/tests
- bzrlib/tests/per_bzrdir_colo
- bzrlib/tests/per_foreign_vcs
- bzrlib/tests/per_uifactory
- contrib/debian
- doc/en/whats-new
- 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,
180
172
view_str = views.view_display_str(view_files)
181
173
note("Ignoring files outside view. View is %s" % view_str)
182
174
return tree, file_list
183
tree = WorkingTree.open_containing(file_list[0])[0]
175
tree = WorkingTree.open_containing(osutils.realpath(file_list[0]))[0]
184
176
return tree, safe_relpath_files(tree, file_list, canonicalize,
185
177
apply_view=apply_view)
186
178
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)
477
as_tuple = (tuple(node[1]), node[2], refs_as_tuples)
478
self.outf.write('%s\n' % (as_tuple,))
434
self.outf.write('%s\n' % (node[1:],))
479
435
480
436
481
437
class cmd_remove_tree(Command):
482
__doc__ = """Remove the working tree from a given branch/checkout.
438
"""Remove the working tree from a given branch/checkout.
483
439
484
440
Since a lightweight checkout is little more than a working tree
485
441
this will refuse to run against one.
487
443
To re-create the working tree, use "bzr checkout".
488
444
"""
489
445
_see_also = ['checkout', 'working-trees']
490
takes_args = ['location*']
446
takes_args = ['location?']
491
447
takes_options = [
492
448
Option('force',
493
449
help='Remove the working tree even if it has '
494
'uncommitted or shelved changes.'),
450
'uncommitted changes.'),
495
451
]
496
452
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
if working.get_shelf_manager().last_shelf() is not None:
515
raise errors.ShelvedChanges(working)
516
517
if working.user_url != working.branch.user_url:
518
raise errors.BzrCommandError("You cannot remove the working tree"
519
" from a lightweight checkout")
520
521
d.destroy_workingtree()
453
def run(self, location='.', force=False):
454
d = bzrdir.BzrDir.open(location)
455
456
try:
457
working = d.open_workingtree()
458
except errors.NoWorkingTree:
459
raise errors.BzrCommandError("No working tree to remove")
460
except errors.NotLocalUrl:
461
raise errors.BzrCommandError("You cannot remove the working tree"
462
" of a remote path")
463
if not force:
464
# XXX: What about pending merges ? -- vila 20090629
465
if working.has_changes(working.basis_tree()):
466
raise errors.UncommittedChanges(working)
467
468
working_path = working.bzrdir.root_transport.base
469
branch_path = working.branch.bzrdir.root_transport.base
470
if working_path != branch_path:
471
raise errors.BzrCommandError("You cannot remove the working tree"
472
" from a lightweight checkout")
473
474
d.destroy_workingtree()
522
475
523
476
524
477
class cmd_revno(Command):
525
__doc__ = """Show current revision number.
478
"""Show current revision number.
526
479
527
480
This is equal to the number of revisions on this branch.
528
481
"""
538
491
if tree:
539
492
try:
540
493
wt = WorkingTree.open_containing(location)[0]
541
self.add_cleanup(wt.lock_read().unlock)
494
wt.lock_read()
542
495
except (errors.NoWorkingTree, errors.NotLocalUrl):
543
496
raise errors.NoWorkingTree(location)
544
revid = wt.last_revision()
545
497
try:
546
revno_t = wt.branch.revision_id_to_dotted_revno(revid)
547
except errors.NoSuchRevision:
548
revno_t = ('???',)
549
revno = ".".join(str(n) for n in revno_t)
498
revid = wt.last_revision()
499
try:
500
revno_t = wt.branch.revision_id_to_dotted_revno(revid)
501
except errors.NoSuchRevision:
502
revno_t = ('???',)
503
revno = ".".join(str(n) for n in revno_t)
504
finally:
505
wt.unlock()
550
506
else:
551
507
b = Branch.open_containing(location)[0]
552
self.add_cleanup(b.lock_read().unlock)
553
revno = b.revno()
554
self.cleanup_now()
508
b.lock_read()
509
try:
510
revno = b.revno()
511
finally:
512
b.unlock()
513
555
514
self.outf.write(str(revno) + '\n')
556
515
557
516
558
517
class cmd_revision_info(Command):
559
__doc__ = """Show revision number and revision id for a given revision identifier.
518
"""Show revision number and revision id for a given revision identifier.
560
519
"""
561
520
hidden = True
562
521
takes_args = ['revision_info*']
563
522
takes_options = [
564
523
'revision',
565
custom_help('directory',
524
Option('directory',
566
525
help='Branch to examine, '
567
'rather than the one containing the working directory.'),
526
'rather than the one containing the working directory.',
527
short_name='d',
528
type=unicode,
529
),
568
530
Option('tree', help='Show revno of working tree'),
569
531
]
570
532
575
537
try:
576
538
wt = WorkingTree.open_containing(directory)[0]
577
539
b = wt.branch
578
self.add_cleanup(wt.lock_read().unlock)
540
wt.lock_read()
579
541
except (errors.NoWorkingTree, errors.NotLocalUrl):
580
542
wt = None
581
543
b = Branch.open_containing(directory)[0]
582
self.add_cleanup(b.lock_read().unlock)
583
revision_ids = []
584
if revision is not None:
585
revision_ids.extend(rev.as_revision_id(b) for rev in revision)
586
if revision_info_list is not None:
587
for rev_str in revision_info_list:
588
rev_spec = RevisionSpec.from_string(rev_str)
589
revision_ids.append(rev_spec.as_revision_id(b))
590
# No arguments supplied, default to the last revision
591
if len(revision_ids) == 0:
592
if tree:
593
if wt is None:
594
raise errors.NoWorkingTree(directory)
595
revision_ids.append(wt.last_revision())
544
b.lock_read()
545
try:
546
revision_ids = []
547
if revision is not None:
548
revision_ids.extend(rev.as_revision_id(b) for rev in revision)
549
if revision_info_list is not None:
550
for rev_str in revision_info_list:
551
rev_spec = RevisionSpec.from_string(rev_str)
552
revision_ids.append(rev_spec.as_revision_id(b))
553
# No arguments supplied, default to the last revision
554
if len(revision_ids) == 0:
555
if tree:
556
if wt is None:
557
raise errors.NoWorkingTree(directory)
558
revision_ids.append(wt.last_revision())
559
else:
560
revision_ids.append(b.last_revision())
561
562
revinfos = []
563
maxlen = 0
564
for revision_id in revision_ids:
565
try:
566
dotted_revno = b.revision_id_to_dotted_revno(revision_id)
567
revno = '.'.join(str(i) for i in dotted_revno)
568
except errors.NoSuchRevision:
569
revno = '???'
570
maxlen = max(maxlen, len(revno))
571
revinfos.append([revno, revision_id])
572
finally:
573
if wt is None:
574
b.unlock()
596
575
else:
597
revision_ids.append(b.last_revision())
598
599
revinfos = []
600
maxlen = 0
601
for revision_id in revision_ids:
602
try:
603
dotted_revno = b.revision_id_to_dotted_revno(revision_id)
604
revno = '.'.join(str(i) for i in dotted_revno)
605
except errors.NoSuchRevision:
606
revno = '???'
607
maxlen = max(maxlen, len(revno))
608
revinfos.append([revno, revision_id])
609
610
self.cleanup_now()
576
wt.unlock()
577
611
578
for ri in revinfos:
612
579
self.outf.write('%*s %s\n' % (maxlen, ri[0], ri[1]))
613
580
614
581
615
582
class cmd_add(Command):
616
__doc__ = """Add specified files or directories.
583
"""Add specified files or directories.
617
584
618
585
In non-recursive mode, all the named items are added, regardless
619
586
of whether they were previously ignored. A warning is given if
684
651
should_print=(not is_quiet()))
685
652
686
653
if base_tree:
687
self.add_cleanup(base_tree.lock_read().unlock)
688
tree, file_list = tree_files_for_add(file_list)
689
added, ignored = tree.smart_add(file_list, not
690
no_recurse, action=action, save=not dry_run)
691
self.cleanup_now()
654
base_tree.lock_read()
655
try:
656
file_list = self._maybe_expand_globs(file_list)
657
tree, file_list = tree_files_for_add(file_list)
658
added, ignored = tree.smart_add(file_list, not
659
no_recurse, action=action, save=not dry_run)
660
finally:
661
if base_tree is not None:
662
base_tree.unlock()
692
663
if len(ignored) > 0:
693
664
if verbose:
694
665
for glob in sorted(ignored.keys()):
698
669
699
670
700
671
class cmd_mkdir(Command):
701
__doc__ = """Create a new versioned directory.
672
"""Create a new versioned directory.
702
673
703
674
This is equivalent to creating the directory and then adding it.
704
675
"""
708
679
709
680
def run(self, dir_list):
710
681
for d in dir_list:
682
os.mkdir(d)
711
683
wt, dd = WorkingTree.open_containing(d)
712
base = os.path.dirname(dd)
713
id = wt.path2id(base)
714
if id != None:
715
os.mkdir(d)
716
wt.add([dd])
717
self.outf.write('added %s\n' % d)
718
else:
719
raise errors.NotVersionedError(path=base)
684
wt.add([dd])
685
self.outf.write('added %s\n' % d)
720
686
721
687
722
688
class cmd_relpath(Command):
723
__doc__ = """Show path of a file relative to root"""
689
"""Show path of a file relative to root"""
724
690
725
691
takes_args = ['filename']
726
692
hidden = True
735
701
736
702
737
703
class cmd_inventory(Command):
738
__doc__ = """Show inventory of the current working copy or a revision.
704
"""Show inventory of the current working copy or a revision.
739
705
740
706
It is possible to limit the output to a particular entry
741
707
type using the --kind option. For example: --kind file.
762
728
763
729
revision = _get_one_revision('inventory', revision)
764
730
work_tree, file_list = tree_files(file_list)
765
self.add_cleanup(work_tree.lock_read().unlock)
766
if revision is not None:
767
tree = revision.as_tree(work_tree.branch)
768
769
extra_trees = [work_tree]
770
self.add_cleanup(tree.lock_read().unlock)
771
else:
772
tree = work_tree
773
extra_trees = []
774
775
if file_list is not None:
776
file_ids = tree.paths2ids(file_list, trees=extra_trees,
777
require_versioned=True)
778
# find_ids_across_trees may include some paths that don't
779
# exist in 'tree'.
780
entries = sorted((tree.id2path(file_id), tree.inventory[file_id])
781
for file_id in file_ids if file_id in tree)
782
else:
783
entries = tree.inventory.entries()
784
785
self.cleanup_now()
731
work_tree.lock_read()
732
try:
733
if revision is not None:
734
tree = revision.as_tree(work_tree.branch)
735
736
extra_trees = [work_tree]
737
tree.lock_read()
738
else:
739
tree = work_tree
740
extra_trees = []
741
742
if file_list is not None:
743
file_ids = tree.paths2ids(file_list, trees=extra_trees,
744
require_versioned=True)
745
# find_ids_across_trees may include some paths that don't
746
# exist in 'tree'.
747
entries = sorted((tree.id2path(file_id), tree.inventory[file_id])
748
for file_id in file_ids if file_id in tree)
749
else:
750
entries = tree.inventory.entries()
751
finally:
752
tree.unlock()
753
if tree is not work_tree:
754
work_tree.unlock()
755
786
756
for path, entry in entries:
787
757
if kind and kind != entry.kind:
788
758
continue
794
764
795
765
796
766
class cmd_mv(Command):
797
__doc__ = """Move or rename a file.
767
"""Move or rename a file.
798
768
799
769
:Usage:
800
770
bzr mv OLDNAME NEWNAME
833
803
if len(names_list) < 2:
834
804
raise errors.BzrCommandError("missing file argument")
835
805
tree, rel_names = tree_files(names_list, canonicalize=False)
836
self.add_cleanup(tree.lock_tree_write().unlock)
837
self._run(tree, names_list, rel_names, after)
806
tree.lock_tree_write()
807
try:
808
self._run(tree, names_list, rel_names, after)
809
finally:
810
tree.unlock()
838
811
839
812
def run_auto(self, names_list, after, dry_run):
840
813
if names_list is not None and len(names_list) > 1:
844
817
raise errors.BzrCommandError('--after cannot be specified with'
845
818
' --auto.')
846
819
work_tree, file_list = tree_files(names_list, default_branch='.')
847
self.add_cleanup(work_tree.lock_tree_write().unlock)
848
rename_map.RenameMap.guess_renames(work_tree, dry_run)
820
work_tree.lock_tree_write()
821
try:
822
rename_map.RenameMap.guess_renames(work_tree, dry_run)
823
finally:
824
work_tree.unlock()
849
825
850
826
def _run(self, tree, names_list, rel_names, after):
851
827
into_existing = osutils.isdir(names_list[-1])
872
848
# All entries reference existing inventory items, so fix them up
873
849
# for cicp file-systems.
874
850
rel_names = tree.get_canonical_inventory_paths(rel_names)
875
for src, dest in tree.move(rel_names[:-1], rel_names[-1], after=after):
876
if not is_quiet():
877
self.outf.write("%s => %s\n" % (src, dest))
851
for pair in tree.move(rel_names[:-1], rel_names[-1], after=after):
852
self.outf.write("%s => %s\n" % pair)
878
853
else:
879
854
if len(names_list) != 2:
880
855
raise errors.BzrCommandError('to mv multiple files the'
924
899
dest = osutils.pathjoin(dest_parent, dest_tail)
925
900
mutter("attempting to move %s => %s", src, dest)
926
901
tree.rename_one(src, dest, after=after)
927
if not is_quiet():
928
self.outf.write("%s => %s\n" % (src, dest))
902
self.outf.write("%s => %s\n" % (src, dest))
929
903
930
904
931
905
class cmd_pull(Command):
932
__doc__ = """Turn this branch into a mirror of another branch.
906
"""Turn this branch into a mirror of another branch.
933
907
934
By default, this command only works on branches that have not diverged.
935
Branches are considered diverged if the destination branch's most recent
936
commit is one that has not been merged (directly or indirectly) into the
937
parent.
908
This command only works on branches that have not diverged. Branches are
909
considered diverged if the destination branch's most recent commit is one
910
that has not been merged (directly or indirectly) into the parent.
938
911
939
912
If branches have diverged, you can use 'bzr merge' to integrate the changes
940
913
from one into the other. Once one branch has merged, the other should
941
914
be able to pull it again.
942
915
943
If you want to replace your local changes and just want your branch to
944
match the remote one, use pull --overwrite. This will work even if the two
945
branches have diverged.
916
If you want to forget your local changes and just update your branch to
917
match the remote one, use pull --overwrite.
946
918
947
919
If there is no default location set, the first pull will set it. After
948
920
that, you can omit the location to use the default. To change the
958
930
takes_options = ['remember', 'overwrite', 'revision',
959
931
custom_help('verbose',
960
932
help='Show logs of pulled revisions.'),
961
custom_help('directory',
933
Option('directory',
962
934
help='Branch to pull into, '
963
'rather than the one containing the working directory.'),
935
'rather than the one containing the working directory.',
936
short_name='d',
937
type=unicode,
938
),
964
939
Option('local',
965
940
help="Perform a local pull in a bound "
966
941
"branch. Local pulls are not applied to "
981
956
try:
982
957
tree_to = WorkingTree.open_containing(directory)[0]
983
958
branch_to = tree_to.branch
984
self.add_cleanup(tree_to.lock_write().unlock)
985
959
except errors.NoWorkingTree:
986
960
tree_to = None
987
961
branch_to = Branch.open_containing(directory)[0]
988
self.add_cleanup(branch_to.lock_write().unlock)
989
962
990
963
if local and not branch_to.get_bound_location():
991
964
raise errors.LocalRequiresBoundBranch()
992
965
1022
995
else:
1023
996
branch_from = Branch.open(location,
1024
997
possible_transports=possible_transports)
1025
self.add_cleanup(branch_from.lock_read().unlock)
1026
998
1027
999
if branch_to.get_parent() is None or remember:
1028
1000
branch_to.set_parent(branch_from.base)
1029
1001
1030
if revision is not None:
1031
revision_id = revision.as_revision_id(branch_from)
1032
1033
if tree_to is not None:
1034
view_info = _get_view_info_for_change_reporter(tree_to)
1035
change_reporter = delta._ChangeReporter(
1036
unversioned_filter=tree_to.is_ignored,
1037
view_info=view_info)
1038
result = tree_to.pull(
1039
branch_from, overwrite, revision_id, change_reporter,
1040
possible_transports=possible_transports, local=local)
1041
else:
1042
result = branch_to.pull(
1043
branch_from, overwrite, revision_id, local=local)
1044
1045
result.report(self.outf)
1046
if verbose and result.old_revid != result.new_revid:
1047
log.show_branch_change(
1048
branch_to, self.outf, result.old_revno,
1049
result.old_revid)
1002
if branch_from is not branch_to:
1003
branch_from.lock_read()
1004
try:
1005
if revision is not None:
1006
revision_id = revision.as_revision_id(branch_from)
1007
1008
branch_to.lock_write()
1009
try:
1010
if tree_to is not None:
1011
view_info = _get_view_info_for_change_reporter(tree_to)
1012
change_reporter = delta._ChangeReporter(
1013
unversioned_filter=tree_to.is_ignored,
1014
view_info=view_info)
1015
result = tree_to.pull(
1016
branch_from, overwrite, revision_id, change_reporter,
1017
possible_transports=possible_transports, local=local)
1018
else:
1019
result = branch_to.pull(
1020
branch_from, overwrite, revision_id, local=local)
1021
1022
result.report(self.outf)
1023
if verbose and result.old_revid != result.new_revid:
1024
log.show_branch_change(
1025
branch_to, self.outf, result.old_revno,
1026
result.old_revid)
1027
finally:
1028
branch_to.unlock()
1029
finally:
1030
if branch_from is not branch_to:
1031
branch_from.unlock()
1050
1032
1051
1033
1052
1034
class cmd_push(Command):
1053
__doc__ = """Update a mirror of this branch.
1035
"""Update a mirror of this branch.
1054
1036
1055
1037
The target branch will not have its working tree populated because this
1056
1038
is both expensive, and is not supported on remote file systems.
1080
1062
Option('create-prefix',
1081
1063
help='Create the path leading up to the branch '
1082
1064
'if it does not already exist.'),
1083
custom_help('directory',
1065
Option('directory',
1084
1066
help='Branch to push from, '
1085
'rather than the one containing the working directory.'),
1067
'rather than the one containing the working directory.',
1068
short_name='d',
1069
type=unicode,
1070
),
1086
1071
Option('use-existing-dir',
1087
1072
help='By default push will fail if the target'
1088
1073
' directory exists, but does not already'
1114
1099
# Get the source branch
1115
1100
(tree, br_from,
1116
1101
_unused) = bzrdir.BzrDir.open_containing_tree_or_branch(directory)
1102
if strict is None:
1103
strict = br_from.get_config().get_user_option_as_bool('push_strict')
1104
if strict is None: strict = True # default value
1117
1105
# Get the tip's revision_id
1118
1106
revision = _get_one_revision('push', revision)
1119
1107
if revision is not None:
1120
1108
revision_id = revision.in_history(br_from).rev_id
1121
1109
else:
1122
1110
revision_id = None
1123
if tree is not None and revision_id is None:
1124
tree.check_changed_or_out_of_date(
1125
strict, 'push_strict',
1126
more_error='Use --no-strict to force the push.',
1127
more_warning='Uncommitted changes will not be pushed.')
1111
if strict and tree is not None and revision_id is None:
1112
if (tree.has_changes(tree.basis_tree())
1113
or len(tree.get_parent_ids()) > 1):
1114
raise errors.UncommittedChanges(
1115
tree, more='Use --no-strict to force the push.')
1116
if tree.last_revision() != tree.branch.last_revision():
1117
# The tree has lost sync with its branch, there is little
1118
# chance that the user is aware of it but he can still force
1119
# the push with --no-strict
1120
raise errors.OutOfDateTree(
1121
tree, more='Use --no-strict to force the push.')
1122
1128
1123
# Get the stacked_on branch, if any
1129
1124
if stacked_on is not None:
1130
1125
stacked_on = urlutils.normalize_url(stacked_on)
1162
1157
1163
1158
1164
1159
class cmd_branch(Command):
1165
__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.
1166
1161
1167
1162
If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will
1168
1163
be used. In other words, "branch ../foo/bar" will attempt to create ./bar.
1195
1190
' directory exists, but does not already'
1196
1191
' have a control directory. This flag will'
1197
1192
' allow branch to proceed.'),
1198
Option('bind',
1199
help="Bind new branch to from location."),
1200
1193
]
1201
1194
aliases = ['get', 'clone']
1202
1195
1203
1196
def run(self, from_location, to_location=None, revision=None,
1204
1197
hardlink=False, stacked=False, standalone=False, no_tree=False,
1205
use_existing_dir=False, switch=False, bind=False):
1198
use_existing_dir=False, switch=False):
1206
1199
from bzrlib import switch as _mod_switch
1207
1200
from bzrlib.tag import _merge_tags_if_possible
1208
1201
accelerator_tree, br_from = bzrdir.BzrDir.open_tree_or_branch(
1209
1202
from_location)
1203
if (accelerator_tree is not None and
1204
accelerator_tree.supports_content_filtering()):
1205
accelerator_tree = None
1210
1206
revision = _get_one_revision('branch', revision)
1211
self.add_cleanup(br_from.lock_read().unlock)
1212
if revision is not None:
1213
revision_id = revision.as_revision_id(br_from)
1214
else:
1215
# FIXME - wt.last_revision, fallback to branch, fall back to
1216
# None or perhaps NULL_REVISION to mean copy nothing
1217
# RBC 20060209
1218
revision_id = br_from.last_revision()
1219
if to_location is None:
1220
to_location = urlutils.derive_to_location(from_location)
1221
to_transport = transport.get_transport(to_location)
1207
br_from.lock_read()
1222
1208
try:
1223
to_transport.mkdir('.')
1224
except errors.FileExists:
1225
if not use_existing_dir:
1226
raise errors.BzrCommandError('Target directory "%s" '
1227
'already exists.' % to_location)
1209
if revision is not None:
1210
revision_id = revision.as_revision_id(br_from)
1228
1211
else:
1229
try:
1230
bzrdir.BzrDir.open_from_transport(to_transport)
1231
except errors.NotBranchError:
1232
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)
1233
1225
else:
1234
raise errors.AlreadyBranchError(to_location)
1235
except errors.NoSuchFile:
1236
raise errors.BzrCommandError('Parent of "%s" does not exist.'
1237
% to_location)
1238
try:
1239
# preserve whatever source format we have.
1240
dir = br_from.bzrdir.sprout(to_transport.base, revision_id,
1241
possible_transports=[to_transport],
1242
accelerator_tree=accelerator_tree,
1243
hardlink=hardlink, stacked=stacked,
1244
force_new_repo=standalone,
1245
create_tree_if_local=not no_tree,
1246
source_branch=br_from)
1247
branch = dir.open_branch()
1248
except errors.NoSuchRevision:
1249
to_transport.delete_tree('.')
1250
msg = "The branch %s has no revision %s." % (from_location,
1251
revision)
1252
raise errors.BzrCommandError(msg)
1253
_merge_tags_if_possible(br_from, branch)
1254
# If the source branch is stacked, the new branch may
1255
# be stacked whether we asked for that explicitly or not.
1256
# We therefore need a try/except here and not just 'if stacked:'
1257
try:
1258
note('Created new stacked branch referring to %s.' %
1259
branch.get_stacked_on_url())
1260
except (errors.NotStacked, errors.UnstackableBranchFormat,
1261
errors.UnstackableRepositoryFormat), e:
1262
note('Branched %d revision(s).' % branch.revno())
1263
if bind:
1264
# Bind to the parent
1265
parent_branch = Branch.open(from_location)
1266
branch.bind(parent_branch)
1267
note('New branch bound to %s' % from_location)
1268
if switch:
1269
# Switch to the new branch
1270
wt, _ = WorkingTree.open_containing('.')
1271
_mod_switch.switch(wt.bzrdir, branch)
1272
note('Switched to branch: %s',
1273
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()
1274
1268
1275
1269
1276
1270
class cmd_checkout(Command):
1277
__doc__ = """Create a new checkout of an existing branch.
1271
"""Create a new checkout of an existing branch.
1278
1272
1279
1273
If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree for
1280
1274
the branch found in '.'. This is useful if you have removed the working tree
1343
1337
1344
1338
1345
1339
class cmd_renames(Command):
1346
__doc__ = """Show list of renamed files.
1340
"""Show list of renamed files.
1347
1341
"""
1348
1342
# TODO: Option to show renames between two historical versions.
1349
1343
1354
1348
@display_command
1355
1349
def run(self, dir=u'.'):
1356
1350
tree = WorkingTree.open_containing(dir)[0]
1357
self.add_cleanup(tree.lock_read().unlock)
1358
new_inv = tree.inventory
1359
old_tree = tree.basis_tree()
1360
self.add_cleanup(old_tree.lock_read().unlock)
1361
old_inv = old_tree.inventory
1362
renames = []
1363
iterator = tree.iter_changes(old_tree, include_unchanged=True)
1364
for f, paths, c, v, p, n, k, e in iterator:
1365
if paths[0] == paths[1]:
1366
continue
1367
if None in (paths):
1368
continue
1369
renames.append(paths)
1370
renames.sort()
1371
for old_name, new_name in renames:
1372
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()
1373
1373
1374
1374
1375
1375
class cmd_update(Command):
1376
__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.
1377
1377
1378
1378
This will perform a merge into the working tree, and may generate
1379
1379
conflicts. If you have any local changes, you will still
1381
1381
1382
1382
If you want to discard your local changes, you can just do a
1383
1383
'bzr revert' instead of 'bzr commit' after the update.
1384
1385
If the tree's branch is bound to a master branch, it will also update
1386
the branch from the master.
1387
1384
"""
1388
1385
1389
1386
_see_also = ['pull', 'working-trees', 'status-flags']
1390
1387
takes_args = ['dir?']
1391
takes_options = ['revision']
1392
1388
aliases = ['up']
1393
1389
1394
def run(self, dir='.', revision=None):
1395
if revision is not None and len(revision) != 1:
1396
raise errors.BzrCommandError(
1397
"bzr update --revision takes exactly one revision")
1390
def run(self, dir='.'):
1398
1391
tree = WorkingTree.open_containing(dir)[0]
1399
branch = tree.branch
1400
1392
possible_transports = []
1401
master = branch.get_master_branch(
1393
master = tree.branch.get_master_branch(
1402
1394
possible_transports=possible_transports)
1403
1395
if master is not None:
1404
branch_location = master.base
1405
1396
tree.lock_write()
1406
1397
else:
1407
branch_location = tree.branch.base
1408
1398
tree.lock_tree_write()
1409
self.add_cleanup(tree.unlock)
1410
# get rid of the final '/' and be ready for display
1411
branch_location = urlutils.unescape_for_display(
1412
branch_location.rstrip('/'),
1413
self.outf.encoding)
1414
existing_pending_merges = tree.get_parent_ids()[1:]
1415
if master is None:
1416
old_tip = None
1417
else:
1418
# may need to fetch data into a heavyweight checkout
1419
# XXX: this may take some time, maybe we should display a
1420
# message
1421
old_tip = branch.update(possible_transports)
1422
if revision is not None:
1423
revision_id = revision[0].as_revision_id(branch)
1424
else:
1425
revision_id = branch.last_revision()
1426
if revision_id == _mod_revision.ensure_null(tree.last_revision()):
1427
revno = branch.revision_id_to_dotted_revno(revision_id)
1428
note("Tree is up to date at revision %s of branch %s" %
1429
('.'.join(map(str, revno)), branch_location))
1430
return 0
1431
view_info = _get_view_info_for_change_reporter(tree)
1432
change_reporter = delta._ChangeReporter(
1433
unversioned_filter=tree.is_ignored,
1434
view_info=view_info)
1435
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)
1436
1411
conflicts = tree.update(
1437
change_reporter,
1438
possible_transports=possible_transports,
1439
revision=revision_id,
1440
old_tip=old_tip)
1441
except errors.NoSuchRevision, e:
1442
raise errors.BzrCommandError(
1443
"branch has no revision %s\n"
1444
"bzr update --revision only works"
1445
" for a revision in the branch history"
1446
% (e.revision))
1447
revno = tree.branch.revision_id_to_dotted_revno(
1448
_mod_revision.ensure_null(tree.last_revision()))
1449
note('Updated to revision %s of branch %s' %
1450
('.'.join(map(str, revno)), branch_location))
1451
parent_ids = tree.get_parent_ids()
1452
if parent_ids[1:] and parent_ids[1:] != existing_pending_merges:
1453
note('Your local commits will now show as pending merges with '
1454
"'bzr status', and can be committed with 'bzr commit'.")
1455
if conflicts != 0:
1456
return 1
1457
else:
1458
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()
1459
1426
1460
1427
1461
1428
class cmd_info(Command):
1462
__doc__ = """Show information about a working tree, branch or repository.
1429
"""Show information about a working tree, branch or repository.
1463
1430
1464
1431
This command will show all known locations and formats associated to the
1465
1432
tree, branch or repository.
1503
1470
1504
1471
1505
1472
class cmd_remove(Command):
1506
__doc__ = """Remove files or directories.
1473
"""Remove files or directories.
1507
1474
1508
1475
This makes bzr stop tracking changes to the specified files. bzr will delete
1509
1476
them if they can easily be recovered using revert. If no options or
1531
1498
if file_list is not None:
1532
1499
file_list = [f for f in file_list]
1533
1500
1534
self.add_cleanup(tree.lock_write().unlock)
1535
# Heuristics should probably all move into tree.remove_smart or
1536
# some such?
1537
if new:
1538
added = tree.changes_from(tree.basis_tree(),
1539
specific_files=file_list).added
1540
file_list = sorted([f[0] for f in added], reverse=True)
1541
if len(file_list) == 0:
1542
raise errors.BzrCommandError('No matching files.')
1543
elif file_list is None:
1544
# missing files show up in iter_changes(basis) as
1545
# versioned-with-no-kind.
1546
missing = []
1547
for change in tree.iter_changes(tree.basis_tree()):
1548
# Find paths in the working tree that have no kind:
1549
if change[1][1] is not None and change[6][1] is None:
1550
missing.append(change[1][1])
1551
file_list = sorted(missing, reverse=True)
1552
file_deletion_strategy = 'keep'
1553
tree.remove(file_list, verbose=verbose, to_file=self.outf,
1554
keep_files=file_deletion_strategy=='keep',
1555
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()
1556
1526
1557
1527
1558
1528
class cmd_file_id(Command):
1559
__doc__ = """Print file_id of a particular file or directory.
1529
"""Print file_id of a particular file or directory.
1560
1530
1561
1531
The file_id is assigned when the file is first added and remains the
1562
1532
same through all revisions where the file exists, even when it is
1578
1548
1579
1549
1580
1550
class cmd_file_path(Command):
1581
__doc__ = """Print path of file_ids to a file or directory.
1551
"""Print path of file_ids to a file or directory.
1582
1552
1583
1553
This prints one line for each directory down to the target,
1584
1554
starting at the branch root.
1600
1570
1601
1571
1602
1572
class cmd_reconcile(Command):
1603
__doc__ = """Reconcile bzr metadata in a branch.
1573
"""Reconcile bzr metadata in a branch.
1604
1574
1605
1575
This can correct data mismatches that may have been caused by
1606
1576
previous ghost operations or bzr upgrades. You should only
1628
1598
1629
1599
1630
1600
class cmd_revision_history(Command):
1631
__doc__ = """Display the list of revision ids on a branch."""
1601
"""Display the list of revision ids on a branch."""
1632
1602
1633
1603
_see_also = ['log']
1634
1604
takes_args = ['location?']
1644
1614
1645
1615
1646
1616
class cmd_ancestry(Command):
1647
__doc__ = """List all revisions merged into this branch."""
1617
"""List all revisions merged into this branch."""
1648
1618
1649
1619
_see_also = ['log', 'revision-history']
1650
1620
takes_args = ['location?']
1669
1639
1670
1640
1671
1641
class cmd_init(Command):
1672
__doc__ = """Make a directory into a versioned branch.
1642
"""Make a directory into a versioned branch.
1673
1643
1674
1644
Use this to create an empty branch, or before importing an
1675
1645
existing project.
1778
1748
1779
1749
1780
1750
class cmd_init_repository(Command):
1781
__doc__ = """Create a shared repository for branches to share storage space.
1751
"""Create a shared repository to hold branches.
1782
1752
1783
1753
New branches created under the repository directory will store their
1784
revisions in the repository, not in the branch directory. For branches
1785
with shared history, this reduces the amount of storage needed and
1786
speeds up the creation of new branches.
1754
revisions in the repository, not in the branch directory.
1787
1755
1788
If the --no-trees option is given then the branches in the repository
1789
will not have working trees by default. They will still exist as
1790
directories on disk, but they will not have separate copies of the
1791
files at a certain revision. This can be useful for repositories that
1792
store branches which are interacted with through checkouts or remote
1793
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.
1794
1758
1795
1759
:Examples:
1796
Create a shared repository holding just branches::
1760
Create a shared repositories holding just branches::
1797
1761
1798
1762
bzr init-repo --no-trees repo
1799
1763
bzr init repo/trunk
1838
1802
1839
1803
1840
1804
class cmd_diff(Command):
1841
__doc__ = """Show differences in the working tree, between revisions or branches.
1805
"""Show differences in the working tree, between revisions or branches.
1842
1806
1843
1807
If no arguments are given, all changes for the current tree are listed.
1844
1808
If files are given, only the changes in those files are listed.
1865
1829
1866
1830
bzr diff -r1
1867
1831
1868
Difference between revision 3 and revision 1::
1869
1870
bzr diff -r1..3
1871
1872
Difference between revision 3 and revision 1 for branch xxx::
1873
1874
bzr diff -r1..3 xxx
1875
1876
To see the changes introduced in revision X::
1877
1878
bzr diff -cX
1879
1880
Note that in the case of a merge, the -c option shows the changes
1881
compared to the left hand parent. To see the changes against
1882
another parent, use::
1883
1884
bzr diff -r<chosen_parent>..X
1885
1886
The changes introduced by revision 2 (equivalent to -r1..2)::
1887
1888
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
1889
1839
1890
1840
Show just the differences for file NEWS::
1891
1841
1930
1880
help='Use this command to compare files.',
1931
1881
type=unicode,
1932
1882
),
1933
RegistryOption('format',
1934
help='Diff format to use.',
1935
lazy_registry=('bzrlib.diff', 'format_registry'),
1936
value_switches=False, title='Diff format'),
1937
1883
]
1938
1884
aliases = ['di', 'dif']
1939
1885
encoding_type = 'exact'
1940
1886
1941
1887
@display_command
1942
1888
def run(self, revision=None, file_list=None, diff_options=None,
1943
prefix=None, old=None, new=None, using=None, format=None):
1944
from bzrlib.diff import (get_trees_and_branches_to_diff_locked,
1945
show_diff_trees)
1889
prefix=None, old=None, new=None, using=None):
1890
from bzrlib.diff import _get_trees_to_diff, show_diff_trees
1946
1891
1947
1892
if (prefix is None) or (prefix == '0'):
1948
1893
# diff -p0 format
1962
1907
raise errors.BzrCommandError('bzr diff --revision takes exactly'
1963
1908
' one or two revision specifiers')
1964
1909
1965
if using is not None and format is not None:
1966
raise errors.BzrCommandError('--using and --format are mutually '
1967
'exclusive.')
1968
1969
(old_tree, new_tree,
1970
old_branch, new_branch,
1971
specific_files, extra_trees) = get_trees_and_branches_to_diff_locked(
1972
file_list, revision, old, new, self.add_cleanup, apply_view=True)
1973
# GNU diff on Windows uses ANSI encoding for filenames
1974
path_encoding = osutils.get_diff_header_encoding()
1910
old_tree, new_tree, specific_files, extra_trees = \
1911
_get_trees_to_diff(file_list, revision, old, new,
1912
apply_view=True)
1975
1913
return show_diff_trees(old_tree, new_tree, sys.stdout,
1976
1914
specific_files=specific_files,
1977
1915
external_diff_options=diff_options,
1978
1916
old_label=old_label, new_label=new_label,
1979
extra_trees=extra_trees,
1980
path_encoding=path_encoding,
1981
using=using,
1982
format_cls=format)
1917
extra_trees=extra_trees, using=using)
1983
1918
1984
1919
1985
1920
class cmd_deleted(Command):
1986
__doc__ = """List files deleted in the working tree.
1921
"""List files deleted in the working tree.
1987
1922
"""
1988
1923
# TODO: Show files deleted since a previous revision, or
1989
1924
# between two revisions.
1992
1927
# level of effort but possibly much less IO. (Or possibly not,
1993
1928
# if the directories are very large...)
1994
1929
_see_also = ['status', 'ls']
1995
takes_options = ['directory', 'show-ids']
1930
takes_options = ['show-ids']
1996
1931
1997
1932
@display_command
1998
def run(self, show_ids=False, directory=u'.'):
1999
tree = WorkingTree.open_containing(directory)[0]
2000
self.add_cleanup(tree.lock_read().unlock)
2001
old = tree.basis_tree()
2002
self.add_cleanup(old.lock_read().unlock)
2003
for path, ie in old.inventory.iter_entries():
2004
if not tree.has_id(ie.file_id):
2005
self.outf.write(path)
2006
if show_ids:
2007
self.outf.write(' ')
2008
self.outf.write(ie.file_id)
2009
self.outf.write('\n')
1933
def run(self, show_ids=False):
1934
tree = WorkingTree.open_containing(u'.')[0]
1935
tree.lock_read()
1936
try:
1937
old = tree.basis_tree()
1938
old.lock_read()
1939
try:
1940
for path, ie in old.inventory.iter_entries():
1941
if not tree.has_id(ie.file_id):
1942
self.outf.write(path)
1943
if show_ids:
1944
self.outf.write(' ')
1945
self.outf.write(ie.file_id)
1946
self.outf.write('\n')
1947
finally:
1948
old.unlock()
1949
finally:
1950
tree.unlock()
2010
1951
2011
1952
2012
1953
class cmd_modified(Command):
2013
__doc__ = """List files modified in working tree.
1954
"""List files modified in working tree.
2014
1955
"""
2015
1956
2016
1957
hidden = True
2017
1958
_see_also = ['status', 'ls']
2018
takes_options = ['directory', 'null']
1959
takes_options = [
1960
Option('null',
1961
help='Write an ascii NUL (\\0) separator '
1962
'between files rather than a newline.')
1963
]
2019
1964
2020
1965
@display_command
2021
def run(self, null=False, directory=u'.'):
2022
tree = WorkingTree.open_containing(directory)[0]
1966
def run(self, null=False):
1967
tree = WorkingTree.open_containing(u'.')[0]
2023
1968
td = tree.changes_from(tree.basis_tree())
2024
1969
for path, id, kind, text_modified, meta_modified in td.modified:
2025
1970
if null:
2029
1974
2030
1975
2031
1976
class cmd_added(Command):
2032
__doc__ = """List files added in working tree.
1977
"""List files added in working tree.
2033
1978
"""
2034
1979
2035
1980
hidden = True
2036
1981
_see_also = ['status', 'ls']
2037
takes_options = ['directory', 'null']
1982
takes_options = [
1983
Option('null',
1984
help='Write an ascii NUL (\\0) separator '
1985
'between files rather than a newline.')
1986
]
2038
1987
2039
1988
@display_command
2040
def run(self, null=False, directory=u'.'):
2041
wt = WorkingTree.open_containing(directory)[0]
2042
self.add_cleanup(wt.lock_read().unlock)
2043
basis = wt.basis_tree()
2044
self.add_cleanup(basis.lock_read().unlock)
2045
basis_inv = basis.inventory
2046
inv = wt.inventory
2047
for file_id in inv:
2048
if file_id in basis_inv:
2049
continue
2050
if inv.is_root(file_id) and len(basis_inv) == 0:
2051
continue
2052
path = inv.id2path(file_id)
2053
if not os.access(osutils.pathjoin(wt.basedir, path), os.F_OK):
2054
continue
2055
if null:
2056
self.outf.write(path + '\0')
2057
else:
2058
self.outf.write(osutils.quotefn(path) + '\n')
1989
def run(self, null=False):
1990
wt = WorkingTree.open_containing(u'.')[0]
1991
wt.lock_read()
1992
try:
1993
basis = wt.basis_tree()
1994
basis.lock_read()
1995
try:
1996
basis_inv = basis.inventory
1997
inv = wt.inventory
1998
for file_id in inv:
1999
if file_id in basis_inv:
2000
continue
2001
if inv.is_root(file_id) and len(basis_inv) == 0:
2002
continue
2003
path = inv.id2path(file_id)
2004
if not os.access(osutils.abspath(path), os.F_OK):
2005
continue
2006
if null:
2007
self.outf.write(path + '\0')
2008
else:
2009
self.outf.write(osutils.quotefn(path) + '\n')
2010
finally:
2011
basis.unlock()
2012
finally:
2013
wt.unlock()
2059
2014
2060
2015
2061
2016
class cmd_root(Command):
2062
__doc__ = """Show the tree root directory.
2017
"""Show the tree root directory.
2063
2018
2064
2019
The root is the nearest enclosing directory with a .bzr control
2065
2020
directory."""
2089
2044
2090
2045
2091
2046
class cmd_log(Command):
2092
__doc__ = """Show historical log for a branch or subset of a branch.
2047
"""Show historical log for a branch or subset of a branch.
2093
2048
2094
2049
log is bzr's default tool for exploring the history of a branch.
2095
2050
The branch to use is taken from the first parameter. If no parameters
2206
2161
:Tips & tricks:
2207
2162
2208
2163
GUI tools and IDEs are often better at exploring history than command
2209
line tools: you may prefer qlog or viz from qbzr or bzr-gtk, the
2210
bzr-explorer shell, or the Loggerhead web interface. See the Plugin
2211
Guide <http://doc.bazaar.canonical.com/plugins/en/> and
2212
<http://wiki.bazaar.canonical.com/IDEIntegration>.
2164
line tools. You may prefer qlog or glog from the QBzr and Bzr-Gtk packages
2165
respectively for example. (TortoiseBzr uses qlog for displaying logs.) See
2166
http://bazaar-vcs.org/BzrPlugins and http://bazaar-vcs.org/IDEIntegration.
2167
2168
Web interfaces are often better at exploring history than command line
2169
tools, particularly for branches on servers. You may prefer Loggerhead
2170
or one of its alternatives. See http://bazaar-vcs.org/WebInterface.
2213
2171
2214
2172
You may find it useful to add the aliases below to ``bazaar.conf``::
2215
2173
2256
2214
help='Show just the specified revision.'
2257
2215
' See also "help revisionspec".'),
2258
2216
'log-format',
2259
RegistryOption('authors',
2260
'What names to list as authors - first, all or committer.',
2261
title='Authors',
2262
lazy_registry=('bzrlib.log', 'author_list_registry'),
2263
),
2264
2217
Option('levels',
2265
2218
short_name='n',
2266
2219
help='Number of levels to display - 0 for all, 1 for flat.',
2281
2234
help='Show changes made in each revision as a patch.'),
2282
2235
Option('include-merges',
2283
2236
help='Show merged revisions like --levels 0 does.'),
2284
Option('exclude-common-ancestry',
2285
help='Display only the revisions that are not part'
2286
' of both ancestries (require -rX..Y)'
2287
)
2288
2237
]
2289
2238
encoding_type = 'replace'
2290
2239
2300
2249
message=None,
2301
2250
limit=None,
2302
2251
show_diff=False,
2303
include_merges=False,
2304
authors=None,
2305
exclude_common_ancestry=False,
2306
):
2252
include_merges=False):
2307
2253
from bzrlib.log import (
2308
2254
Logger,
2309
2255
make_log_request_dict,
2310
2256
_get_info_for_log_files,
2311
2257
)
2312
2258
direction = (forward and 'forward') or 'reverse'
2313
if (exclude_common_ancestry
2314
and (revision is None or len(revision) != 2)):
2315
raise errors.BzrCommandError(
2316
'--exclude-common-ancestry requires -r with two revisions')
2317
2259
if include_merges:
2318
2260
if levels is None:
2319
2261
levels = 0
2332
2274
2333
2275
file_ids = []
2334
2276
filter_by_dir = False
2335
if file_list:
2336
# find the file ids to log and check for directory filtering
2337
b, file_info_list, rev1, rev2 = _get_info_for_log_files(
2338
revision, file_list, self.add_cleanup)
2339
for relpath, file_id, kind in file_info_list:
2340
if file_id is None:
2341
raise errors.BzrCommandError(
2342
"Path unknown at end or start of revision range: %s" %
2343
relpath)
2344
# If the relpath is the top of the tree, we log everything
2345
if relpath == '':
2346
file_ids = []
2347
break
2277
b = None
2278
try:
2279
if file_list:
2280
# find the file ids to log and check for directory filtering
2281
b, file_info_list, rev1, rev2 = _get_info_for_log_files(
2282
revision, file_list)
2283
for relpath, file_id, kind in file_info_list:
2284
if file_id is None:
2285
raise errors.BzrCommandError(
2286
"Path unknown at end or start of revision range: %s" %
2287
relpath)
2288
# If the relpath is the top of the tree, we log everything
2289
if relpath == '':
2290
file_ids = []
2291
break
2292
else:
2293
file_ids.append(file_id)
2294
filter_by_dir = filter_by_dir or (
2295
kind in ['directory', 'tree-reference'])
2296
else:
2297
# log everything
2298
# FIXME ? log the current subdir only RBC 20060203
2299
if revision is not None \
2300
and len(revision) > 0 and revision[0].get_branch():
2301
location = revision[0].get_branch()
2348
2302
else:
2349
file_ids.append(file_id)
2350
filter_by_dir = filter_by_dir or (
2351
kind in ['directory', 'tree-reference'])
2352
else:
2353
# log everything
2354
# FIXME ? log the current subdir only RBC 20060203
2355
if revision is not None \
2356
and len(revision) > 0 and revision[0].get_branch():
2357
location = revision[0].get_branch()
2358
else:
2359
location = '.'
2360
dir, relpath = bzrdir.BzrDir.open_containing(location)
2361
b = dir.open_branch()
2362
self.add_cleanup(b.lock_read().unlock)
2363
rev1, rev2 = _get_revision_range(revision, b, self.name())
2364
2365
# Decide on the type of delta & diff filtering to use
2366
# TODO: add an --all-files option to make this configurable & consistent
2367
if not verbose:
2368
delta_type = None
2369
else:
2370
delta_type = 'full'
2371
if not show_diff:
2372
diff_type = None
2373
elif file_ids:
2374
diff_type = 'partial'
2375
else:
2376
diff_type = 'full'
2377
2378
# Build the log formatter
2379
if log_format is None:
2380
log_format = log.log_formatter_registry.get_default(b)
2381
# Make a non-encoding output to include the diffs - bug 328007
2382
unencoded_output = ui.ui_factory.make_output_stream(encoding_type='exact')
2383
lf = log_format(show_ids=show_ids, to_file=self.outf,
2384
to_exact_file=unencoded_output,
2385
show_timezone=timezone,
2386
delta_format=get_verbosity_level(),
2387
levels=levels,
2388
show_advice=levels is None,
2389
author_list_handler=authors)
2390
2391
# Choose the algorithm for doing the logging. It's annoying
2392
# having multiple code paths like this but necessary until
2393
# the underlying repository format is faster at generating
2394
# deltas or can provide everything we need from the indices.
2395
# The default algorithm - match-using-deltas - works for
2396
# multiple files and directories and is faster for small
2397
# amounts of history (200 revisions say). However, it's too
2398
# slow for logging a single file in a repository with deep
2399
# history, i.e. > 10K revisions. In the spirit of "do no
2400
# evil when adding features", we continue to use the
2401
# original algorithm - per-file-graph - for the "single
2402
# file that isn't a directory without showing a delta" case.
2403
partial_history = revision and b.repository._format.supports_chks
2404
match_using_deltas = (len(file_ids) != 1 or filter_by_dir
2405
or delta_type or partial_history)
2406
2407
# Build the LogRequest and execute it
2408
if len(file_ids) == 0:
2409
file_ids = None
2410
rqst = make_log_request_dict(
2411
direction=direction, specific_fileids=file_ids,
2412
start_revision=rev1, end_revision=rev2, limit=limit,
2413
message_search=message, delta_type=delta_type,
2414
diff_type=diff_type, _match_using_deltas=match_using_deltas,
2415
exclude_common_ancestry=exclude_common_ancestry,
2416
)
2417
Logger(b, rqst).show(lf)
2303
location = '.'
2304
dir, relpath = bzrdir.BzrDir.open_containing(location)
2305
b = dir.open_branch()
2306
b.lock_read()
2307
rev1, rev2 = _get_revision_range(revision, b, self.name())
2308
2309
# Decide on the type of delta & diff filtering to use
2310
# TODO: add an --all-files option to make this configurable & consistent
2311
if not verbose:
2312
delta_type = None
2313
else:
2314
delta_type = 'full'
2315
if not show_diff:
2316
diff_type = None
2317
elif file_ids:
2318
diff_type = 'partial'
2319
else:
2320
diff_type = 'full'
2321
2322
# Build the log formatter
2323
if log_format is None:
2324
log_format = log.log_formatter_registry.get_default(b)
2325
lf = log_format(show_ids=show_ids, to_file=self.outf,
2326
show_timezone=timezone,
2327
delta_format=get_verbosity_level(),
2328
levels=levels,
2329
show_advice=levels is None)
2330
2331
# Choose the algorithm for doing the logging. It's annoying
2332
# having multiple code paths like this but necessary until
2333
# the underlying repository format is faster at generating
2334
# deltas or can provide everything we need from the indices.
2335
# The default algorithm - match-using-deltas - works for
2336
# multiple files and directories and is faster for small
2337
# amounts of history (200 revisions say). However, it's too
2338
# slow for logging a single file in a repository with deep
2339
# history, i.e. > 10K revisions. In the spirit of "do no
2340
# evil when adding features", we continue to use the
2341
# original algorithm - per-file-graph - for the "single
2342
# file that isn't a directory without showing a delta" case.
2343
partial_history = revision and b.repository._format.supports_chks
2344
match_using_deltas = (len(file_ids) != 1 or filter_by_dir
2345
or delta_type or partial_history)
2346
2347
# Build the LogRequest and execute it
2348
if len(file_ids) == 0:
2349
file_ids = None
2350
rqst = make_log_request_dict(
2351
direction=direction, specific_fileids=file_ids,
2352
start_revision=rev1, end_revision=rev2, limit=limit,
2353
message_search=message, delta_type=delta_type,
2354
diff_type=diff_type, _match_using_deltas=match_using_deltas)
2355
Logger(b, rqst).show(lf)
2356
finally:
2357
if b is not None:
2358
b.unlock()
2418
2359
2419
2360
2420
2361
def _get_revision_range(revisionspec_list, branch, command_name):
2438
2379
raise errors.BzrCommandError(
2439
2380
"bzr %s doesn't accept two revisions in different"
2440
2381
" branches." % command_name)
2441
if start_spec.spec is None:
2442
# Avoid loading all the history.
2443
rev1 = RevisionInfo(branch, None, None)
2444
else:
2445
rev1 = start_spec.in_history(branch)
2382
rev1 = start_spec.in_history(branch)
2446
2383
# Avoid loading all of history when we know a missing
2447
2384
# end of range means the last revision ...
2448
2385
if end_spec.spec is None:
2477
2414
2478
2415
2479
2416
class cmd_touching_revisions(Command):
2480
__doc__ = """Return revision-ids which affected a particular file.
2417
"""Return revision-ids which affected a particular file.
2481
2418
2482
2419
A more user-friendly interface is "bzr log FILE".
2483
2420
"""
2490
2427
tree, relpath = WorkingTree.open_containing(filename)
2491
2428
file_id = tree.path2id(relpath)
2492
2429
b = tree.branch
2493
self.add_cleanup(b.lock_read().unlock)
2494
touching_revs = log.find_touching_revisions(b, file_id)
2495
for revno, revision_id, what in touching_revs:
2496
self.outf.write("%6d %s\n" % (revno, what))
2430
b.lock_read()
2431
try:
2432
touching_revs = log.find_touching_revisions(b, file_id)
2433
for revno, revision_id, what in touching_revs:
2434
self.outf.write("%6d %s\n" % (revno, what))
2435
finally:
2436
b.unlock()
2497
2437
2498
2438
2499
2439
class cmd_ls(Command):
2500
__doc__ = """List files in a tree.
2440
"""List files in a tree.
2501
2441
"""
2502
2442
2503
2443
_see_also = ['status', 'cat']
2509
2449
help='Recurse into subdirectories.'),
2510
2450
Option('from-root',
2511
2451
help='Print paths relative to the root of the branch.'),
2512
Option('unknown', short_name='u',
2513
help='Print unknown files.'),
2452
Option('unknown', help='Print unknown files.'),
2514
2453
Option('versioned', help='Print versioned files.',
2515
2454
short_name='V'),
2516
Option('ignored', short_name='i',
2517
help='Print ignored files.'),
2518
Option('kind', short_name='k',
2455
Option('ignored', help='Print ignored files.'),
2456
Option('null',
2457
help='Write an ascii NUL (\\0) separator '
2458
'between files rather than a newline.'),
2459
Option('kind',
2519
2460
help='List entries of a particular kind: file, directory, symlink.',
2520
2461
type=unicode),
2521
'null',
2522
2462
'show-ids',
2523
'directory',
2524
2463
]
2525
2464
@display_command
2526
2465
def run(self, revision=None, verbose=False,
2527
2466
recursive=False, from_root=False,
2528
2467
unknown=False, versioned=False, ignored=False,
2529
null=False, kind=None, show_ids=False, path=None, directory=None):
2468
null=False, kind=None, show_ids=False, path=None):
2530
2469
2531
2470
if kind and kind not in ('file', 'directory', 'symlink'):
2532
2471
raise errors.BzrCommandError('invalid kind specified')
2544
2483
raise errors.BzrCommandError('cannot specify both --from-root'
2545
2484
' and PATH')
2546
2485
fs_path = path
2547
tree, branch, relpath = \
2548
_open_directory_or_containing_tree_or_branch(fs_path, directory)
2486
tree, branch, relpath = bzrdir.BzrDir.open_containing_tree_or_branch(
2487
fs_path)
2549
2488
2550
2489
# Calculate the prefix to use
2551
2490
prefix = None
2552
2491
if from_root:
2553
2492
if relpath:
2554
2493
prefix = relpath + '/'
2555
elif fs_path != '.' and not fs_path.endswith('/'):
2494
elif fs_path != '.':
2556
2495
prefix = fs_path + '/'
2557
2496
2558
2497
if revision is not None or tree is None:
2566
2505
view_str = views.view_display_str(view_files)
2567
2506
note("Ignoring files outside view. View is %s" % view_str)
2568
2507
2569
self.add_cleanup(tree.lock_read().unlock)
2570
for fp, fc, fkind, fid, entry in tree.list_files(include_root=False,
2571
from_dir=relpath, recursive=recursive):
2572
# Apply additional masking
2573
if not all and not selection[fc]:
2574
continue
2575
if kind is not None and fkind != kind:
2576
continue
2577
if apply_view:
2578
try:
2579
if relpath:
2580
fullpath = osutils.pathjoin(relpath, fp)
2581
else:
2582
fullpath = fp
2583
views.check_path_in_view(tree, fullpath)
2584
except errors.FileOutsideView:
2585
continue
2508
tree.lock_read()
2509
try:
2510
for fp, fc, fkind, fid, entry in tree.list_files(include_root=False,
2511
from_dir=relpath, recursive=recursive):
2512
# Apply additional masking
2513
if not all and not selection[fc]:
2514
continue
2515
if kind is not None and fkind != kind:
2516
continue
2517
if apply_view:
2518
try:
2519
if relpath:
2520
fullpath = osutils.pathjoin(relpath, fp)
2521
else:
2522
fullpath = fp
2523
views.check_path_in_view(tree, fullpath)
2524
except errors.FileOutsideView:
2525
continue
2586
2526
2587
# Output the entry
2588
if prefix:
2589
fp = osutils.pathjoin(prefix, fp)
2590
kindch = entry.kind_character()
2591
outstring = fp + kindch
2592
ui.ui_factory.clear_term()
2593
if verbose:
2594
outstring = '%-8s %s' % (fc, outstring)
2595
if show_ids and fid is not None:
2596
outstring = "%-50s %s" % (outstring, fid)
2597
self.outf.write(outstring + '\n')
2598
elif null:
2599
self.outf.write(fp + '\0')
2600
if show_ids:
2601
if fid is not None:
2602
self.outf.write(fid)
2603
self.outf.write('\0')
2604
self.outf.flush()
2605
else:
2606
if show_ids:
2607
if fid is not None:
2608
my_id = fid
2609
else:
2610
my_id = ''
2611
self.outf.write('%-50s %s\n' % (outstring, my_id))
2612
else:
2527
# Output the entry
2528
if prefix:
2529
fp = osutils.pathjoin(prefix, fp)
2530
kindch = entry.kind_character()
2531
outstring = fp + kindch
2532
ui.ui_factory.clear_term()
2533
if verbose:
2534
outstring = '%-8s %s' % (fc, outstring)
2535
if show_ids and fid is not None:
2536
outstring = "%-50s %s" % (outstring, fid)
2613
2537
self.outf.write(outstring + '\n')
2538
elif null:
2539
self.outf.write(fp + '\0')
2540
if show_ids:
2541
if fid is not None:
2542
self.outf.write(fid)
2543
self.outf.write('\0')
2544
self.outf.flush()
2545
else:
2546
if show_ids:
2547
if fid is not None:
2548
my_id = fid
2549
else:
2550
my_id = ''
2551
self.outf.write('%-50s %s\n' % (outstring, my_id))
2552
else:
2553
self.outf.write(outstring + '\n')
2554
finally:
2555
tree.unlock()
2614
2556
2615
2557
2616
2558
class cmd_unknowns(Command):
2617
__doc__ = """List unknown files.
2559
"""List unknown files.
2618
2560
"""
2619
2561
2620
2562
hidden = True
2621
2563
_see_also = ['ls']
2622
takes_options = ['directory']
2623
2564
2624
2565
@display_command
2625
def run(self, directory=u'.'):
2626
for f in WorkingTree.open_containing(directory)[0].unknowns():
2566
def run(self):
2567
for f in WorkingTree.open_containing(u'.')[0].unknowns():
2627
2568
self.outf.write(osutils.quotefn(f) + '\n')
2628
2569
2629
2570
2630
2571
class cmd_ignore(Command):
2631
__doc__ = """Ignore specified files or patterns.
2572
"""Ignore specified files or patterns.
2632
2573
2633
2574
See ``bzr help patterns`` for details on the syntax of patterns.
2634
2575
2635
If a .bzrignore file does not exist, the ignore command
2636
will create one and add the specified files or patterns to the newly
2637
created file. The ignore command will also automatically add the
2638
.bzrignore file to be versioned. Creating a .bzrignore file without
2639
the use of the ignore command will require an explicit add command.
2640
2641
2576
To remove patterns from the ignore list, edit the .bzrignore file.
2642
2577
After adding, editing or deleting that file either indirectly by
2643
2578
using this command or directly by using an editor, be sure to commit
2644
2579
it.
2645
2646
Bazaar also supports a global ignore file ~/.bazaar/ignore. On Windows
2647
the global ignore file can be found in the application data directory as
2648
C:\\Documents and Settings\\<user>\\Application Data\\Bazaar\\2.0\\ignore.
2649
Global ignores are not touched by this command. The global ignore file
2650
can be edited directly using an editor.
2651
2652
Patterns prefixed with '!' are exceptions to ignore patterns and take
2653
precedence over regular ignores. Such exceptions are used to specify
2654
files that should be versioned which would otherwise be ignored.
2655
2656
Patterns prefixed with '!!' act as regular ignore patterns, but have
2657
precedence over the '!' exception patterns.
2658
2580
2659
2581
Note: ignore patterns containing shell wildcards must be quoted from
2660
2582
the shell on Unix.
2664
2586
2665
2587
bzr ignore ./Makefile
2666
2588
2667
Ignore .class files in all directories...::
2589
Ignore class files in all directories::
2668
2590
2669
2591
bzr ignore "*.class"
2670
2592
2671
...but do not ignore "special.class"::
2672
2673
bzr ignore "!special.class"
2674
2675
2593
Ignore .o files under the lib directory::
2676
2594
2677
2595
bzr ignore "lib/**/*.o"
2683
2601
Ignore everything but the "debian" toplevel directory::
2684
2602
2685
2603
bzr ignore "RE:(?!debian/).*"
2686
2687
Ignore everything except the "local" toplevel directory,
2688
but always ignore "*~" autosave files, even under local/::
2689
2690
bzr ignore "*"
2691
bzr ignore "!./local"
2692
bzr ignore "!!*~"
2693
2604
"""
2694
2605
2695
2606
_see_also = ['status', 'ignored', 'patterns']
2696
2607
takes_args = ['name_pattern*']
2697
takes_options = ['directory',
2698
Option('default-rules',
2699
help='Display the default ignore rules that bzr uses.')
2608
takes_options = [
2609
Option('old-default-rules',
2610
help='Write out the ignore rules bzr < 0.9 always used.')
2700
2611
]
2701
2612
2702
def run(self, name_pattern_list=None, default_rules=None,
2703
directory=u'.'):
2613
def run(self, name_pattern_list=None, old_default_rules=None):
2704
2614
from bzrlib import ignores
2705
if default_rules is not None:
2706
# dump the default rules and exit
2707
for pattern in ignores.USER_DEFAULTS:
2708
self.outf.write("%s\n" % pattern)
2615
if old_default_rules is not None:
2616
# dump the rules and exit
2617
for pattern in ignores.OLD_DEFAULTS:
2618
print pattern
2709
2619
return
2710
2620
if not name_pattern_list:
2711
2621
raise errors.BzrCommandError("ignore requires at least one "
2712
"NAME_PATTERN or --default-rules.")
2622
"NAME_PATTERN or --old-default-rules")
2713
2623
name_pattern_list = [globbing.normalize_pattern(p)
2714
2624
for p in name_pattern_list]
2715
bad_patterns = ''
2716
for p in name_pattern_list:
2717
if not globbing.Globster.is_pattern_valid(p):
2718
bad_patterns += ('\n %s' % p)
2719
if bad_patterns:
2720
msg = ('Invalid ignore pattern(s) found. %s' % bad_patterns)
2721
ui.ui_factory.show_error(msg)
2722
raise errors.InvalidPattern('')
2723
2625
for name_pattern in name_pattern_list:
2724
2626
if (name_pattern[0] == '/' or
2725
2627
(len(name_pattern) > 1 and name_pattern[1] == ':')):
2726
2628
raise errors.BzrCommandError(
2727
2629
"NAME_PATTERN should not be an absolute path")
2728
tree, relpath = WorkingTree.open_containing(directory)
2630
tree, relpath = WorkingTree.open_containing(u'.')
2729
2631
ignores.tree_ignores_add_patterns(tree, name_pattern_list)
2730
2632
ignored = globbing.Globster(name_pattern_list)
2731
2633
matches = []
2732
self.add_cleanup(tree.lock_read().unlock)
2634
tree.lock_read()
2733
2635
for entry in tree.list_files():
2734
2636
id = entry[3]
2735
2637
if id is not None:
2736
2638
filename = entry[0]
2737
2639
if ignored.match(filename):
2738
matches.append(filename)
2640
matches.append(filename.encode('utf-8'))
2641
tree.unlock()
2739
2642
if len(matches) > 0:
2740
self.outf.write("Warning: the following files are version controlled and"
2741
" match your ignore pattern:\n%s"
2742
"\nThese files will continue to be version controlled"
2743
" unless you 'bzr remove' them.\n" % ("\n".join(matches),))
2643
print "Warning: the following files are version controlled and" \
2644
" match your ignore pattern:\n%s" \
2645
"\nThese files will continue to be version controlled" \
2646
" unless you 'bzr remove' them." % ("\n".join(matches),)
2744
2647
2745
2648
2746
2649
class cmd_ignored(Command):
2747
__doc__ = """List ignored files and the patterns that matched them.
2650
"""List ignored files and the patterns that matched them.
2748
2651
2749
2652
List all the ignored files and the ignore pattern that caused the file to
2750
2653
be ignored.
2756
2659
2757
2660
encoding_type = 'replace'
2758
2661
_see_also = ['ignore', 'ls']
2759
takes_options = ['directory']
2760
2662
2761
2663
@display_command
2762
def run(self, directory=u'.'):
2763
tree = WorkingTree.open_containing(directory)[0]
2764
self.add_cleanup(tree.lock_read().unlock)
2765
for path, file_class, kind, file_id, entry in tree.list_files():
2766
if file_class != 'I':
2767
continue
2768
## XXX: Slightly inefficient since this was already calculated
2769
pat = tree.is_ignored(path)
2770
self.outf.write('%-50s %s\n' % (path, pat))
2664
def run(self):
2665
tree = WorkingTree.open_containing(u'.')[0]
2666
tree.lock_read()
2667
try:
2668
for path, file_class, kind, file_id, entry in tree.list_files():
2669
if file_class != 'I':
2670
continue
2671
## XXX: Slightly inefficient since this was already calculated
2672
pat = tree.is_ignored(path)
2673
self.outf.write('%-50s %s\n' % (path, pat))
2674
finally:
2675
tree.unlock()
2771
2676
2772
2677
2773
2678
class cmd_lookup_revision(Command):
2774
__doc__ = """Lookup the revision-id from a revision-number
2679
"""Lookup the revision-id from a revision-number
2775
2680
2776
2681
:Examples:
2777
2682
bzr lookup-revision 33
2778
2683
"""
2779
2684
hidden = True
2780
2685
takes_args = ['revno']
2781
takes_options = ['directory']
2782
2686
2783
2687
@display_command
2784
def run(self, revno, directory=u'.'):
2688
def run(self, revno):
2785
2689
try:
2786
2690
revno = int(revno)
2787
2691
except ValueError:
2788
raise errors.BzrCommandError("not a valid revision-number: %r"
2789
% revno)
2790
revid = WorkingTree.open_containing(directory)[0].branch.get_rev_id(revno)
2791
self.outf.write("%s\n" % revid)
2692
raise errors.BzrCommandError("not a valid revision-number: %r" % revno)
2693
2694
print WorkingTree.open_containing(u'.')[0].branch.get_rev_id(revno)
2792
2695
2793
2696
2794
2697
class cmd_export(Command):
2795
__doc__ = """Export current or past revision to a destination directory or archive.
2698
"""Export current or past revision to a destination directory or archive.
2796
2699
2797
2700
If no revision is specified this exports the last committed revision.
2798
2701
2820
2723
================= =========================
2821
2724
"""
2822
2725
takes_args = ['dest', 'branch_or_subdir?']
2823
takes_options = ['directory',
2726
takes_options = [
2824
2727
Option('format',
2825
2728
help="Type of file to export to.",
2826
2729
type=unicode),
2830
2733
Option('root',
2831
2734
type=str,
2832
2735
help="Name of the root directory inside the exported file."),
2833
Option('per-file-timestamps',
2834
help='Set modification time of files to that of the last '
2835
'revision in which it was changed.'),
2836
2736
]
2837
2737
def run(self, dest, branch_or_subdir=None, revision=None, format=None,
2838
root=None, filters=False, per_file_timestamps=False, directory=u'.'):
2738
root=None, filters=False):
2839
2739
from bzrlib.export import export
2840
2740
2841
2741
if branch_or_subdir is None:
2842
tree = WorkingTree.open_containing(directory)[0]
2742
tree = WorkingTree.open_containing(u'.')[0]
2843
2743
b = tree.branch
2844
2744
subdir = None
2845
2745
else:
2848
2748
2849
2749
rev_tree = _get_one_revision_tree('export', revision, branch=b, tree=tree)
2850
2750
try:
2851
export(rev_tree, dest, format, root, subdir, filtered=filters,
2852
per_file_timestamps=per_file_timestamps)
2751
export(rev_tree, dest, format, root, subdir, filtered=filters)
2853
2752
except errors.NoSuchExportFormat, e:
2854
2753
raise errors.BzrCommandError('Unsupported export format: %s' % e.format)
2855
2754
2856
2755
2857
2756
class cmd_cat(Command):
2858
__doc__ = """Write the contents of a file as of a given revision to standard output.
2757
"""Write the contents of a file as of a given revision to standard output.
2859
2758
2860
2759
If no revision is nominated, the last revision is used.
2861
2760
2864
2763
"""
2865
2764
2866
2765
_see_also = ['ls']
2867
takes_options = ['directory',
2766
takes_options = [
2868
2767
Option('name-from-revision', help='The path name in the old tree.'),
2869
2768
Option('filters', help='Apply content filters to display the '
2870
2769
'convenience form.'),
2875
2774
2876
2775
@display_command
2877
2776
def run(self, filename, revision=None, name_from_revision=False,
2878
filters=False, directory=None):
2777
filters=False):
2879
2778
if revision is not None and len(revision) != 1:
2880
2779
raise errors.BzrCommandError("bzr cat --revision takes exactly"
2881
2780
" one revision specifier")
2882
2781
tree, branch, relpath = \
2883
_open_directory_or_containing_tree_or_branch(filename, directory)
2884
self.add_cleanup(branch.lock_read().unlock)
2885
return self._run(tree, branch, relpath, filename, revision,
2886
name_from_revision, filters)
2782
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
2783
branch.lock_read()
2784
try:
2785
return self._run(tree, branch, relpath, filename, revision,
2786
name_from_revision, filters)
2787
finally:
2788
branch.unlock()
2887
2789
2888
2790
def _run(self, tree, b, relpath, filename, revision, name_from_revision,
2889
2791
filtered):
2890
2792
if tree is None:
2891
2793
tree = b.basis_tree()
2892
2794
rev_tree = _get_one_revision_tree('cat', revision, branch=b)
2893
self.add_cleanup(rev_tree.lock_read().unlock)
2894
2795
2895
2796
old_file_id = rev_tree.path2id(relpath)
2896
2797
2931
2832
chunks = content.splitlines(True)
2932
2833
content = filtered_output_bytes(chunks, filters,
2933
2834
ContentFilterContext(relpath, rev_tree))
2934
self.cleanup_now()
2935
2835
self.outf.writelines(content)
2936
2836
else:
2937
self.cleanup_now()
2938
2837
self.outf.write(content)
2939
2838
2940
2839
2941
2840
class cmd_local_time_offset(Command):
2942
__doc__ = """Show the offset in seconds from GMT to local time."""
2841
"""Show the offset in seconds from GMT to local time."""
2943
2842
hidden = True
2944
2843
@display_command
2945
2844
def run(self):
2946
self.outf.write("%s\n" % osutils.local_time_offset())
2845
print osutils.local_time_offset()
2947
2846
2948
2847
2949
2848
2950
2849
class cmd_commit(Command):
2951
__doc__ = """Commit changes into a new revision.
2850
"""Commit changes into a new revision.
2952
2851
2953
2852
An explanatory message needs to be given for each commit. This is
2954
2853
often done by using the --message option (getting the message from the
3047
2946
Option('strict',
3048
2947
help="Refuse to commit if there are unknown "
3049
2948
"files in the working tree."),
3050
Option('commit-time', type=str,
3051
help="Manually set a commit time using commit date "
3052
"format, e.g. '2009-10-10 08:00:00 +0100'."),
3053
2949
ListOption('fixes', type=str,
3054
2950
help="Mark a bug as being fixed by this revision "
3055
2951
"(see \"bzr help bugs\")."),
3062
2958
"the master branch until a normal commit "
3063
2959
"is performed."
3064
2960
),
3065
Option('show-diff', short_name='p',
3066
help='When no message is supplied, show the diff along'
3067
' with the status summary in the message editor.'),
2961
Option('show-diff',
2962
help='When no message is supplied, show the diff along'
2963
' with the status summary in the message editor.'),
3068
2964
]
3069
2965
aliases = ['ci', 'checkin']
3070
2966
3089
2985
3090
2986
def run(self, message=None, file=None, verbose=False, selected_list=None,
3091
2987
unchanged=False, strict=False, local=False, fixes=None,
3092
author=None, show_diff=False, exclude=None, commit_time=None):
2988
author=None, show_diff=False, exclude=None):
3093
2989
from bzrlib.errors import (
3094
2990
PointlessCommit,
3095
2991
ConflictsInTree,
3101
2997
make_commit_message_template_encoded
3102
2998
)
3103
2999
3104
commit_stamp = offset = None
3105
if commit_time is not None:
3106
try:
3107
commit_stamp, offset = timestamp.parse_patch_date(commit_time)
3108
except ValueError, e:
3109
raise errors.BzrCommandError(
3110
"Could not parse --commit-time: " + str(e))
3111
3112
3000
# TODO: Need a blackbox test for invoking the external editor; may be
3113
3001
# slightly problematic to run this cross-platform.
3114
3002
3134
3022
if local and not tree.branch.get_bound_location():
3135
3023
raise errors.LocalRequiresBoundBranch()
3136
3024
3137
if message is not None:
3138
try:
3139
file_exists = osutils.lexists(message)
3140
except UnicodeError:
3141
# The commit message contains unicode characters that can't be
3142
# represented in the filesystem encoding, so that can't be a
3143
# file.
3144
file_exists = False
3145
if file_exists:
3146
warning_msg = (
3147
'The commit message is a file name: "%(f)s".\n'
3148
'(use --file "%(f)s" to take commit message from that file)'
3149
% { 'f': message })
3150
ui.ui_factory.show_warning(warning_msg)
3151
if '\r' in message:
3152
message = message.replace('\r\n', '\n')
3153
message = message.replace('\r', '\n')
3154
if file:
3155
raise errors.BzrCommandError(
3156
"please specify either --message or --file")
3157
3158
3025
def get_message(commit_obj):
3159
3026
"""Callback to get commit message"""
3160
if file:
3161
f = codecs.open(file, 'rt', osutils.get_user_encoding())
3162
try:
3163
my_message = f.read()
3164
finally:
3165
f.close()
3166
elif message is not None:
3167
my_message = message
3168
else:
3169
# No message supplied: make one up.
3170
# text is the status of the tree
3171
text = make_commit_message_template_encoded(tree,
3027
my_message = message
3028
if my_message is None and not file:
3029
t = make_commit_message_template_encoded(tree,
3172
3030
selected_list, diff=show_diff,
3173
3031
output_encoding=osutils.get_user_encoding())
3174
# start_message is the template generated from hooks
3175
# XXX: Warning - looks like hooks return unicode,
3176
# make_commit_message_template_encoded returns user encoding.
3177
# We probably want to be using edit_commit_message instead to
3178
# avoid this.
3179
3032
start_message = generate_commit_message_template(commit_obj)
3180
my_message = edit_commit_message_encoded(text,
3033
my_message = edit_commit_message_encoded(t,
3181
3034
start_message=start_message)
3182
3035
if my_message is None:
3183
3036
raise errors.BzrCommandError("please specify a commit"
3184
3037
" message with either --message or --file")
3038
elif my_message and file:
3039
raise errors.BzrCommandError(
3040
"please specify either --message or --file")
3041
if file:
3042
my_message = codecs.open(file, 'rt',
3043
osutils.get_user_encoding()).read()
3185
3044
if my_message == "":
3186
3045
raise errors.BzrCommandError("empty commit message specified")
3187
3046
return my_message
3195
3054
specific_files=selected_list,
3196
3055
allow_pointless=unchanged, strict=strict, local=local,
3197
3056
reporter=None, verbose=verbose, revprops=properties,
3198
authors=author, timestamp=commit_stamp,
3199
timezone=offset,
3057
authors=author,
3200
3058
exclude=safe_relpath_files(tree, exclude))
3201
3059
except PointlessCommit:
3060
# FIXME: This should really happen before the file is read in;
3061
# perhaps prepare the commit; get the message; then actually commit
3202
3062
raise errors.BzrCommandError("No changes to commit."
3203
3063
" Use --unchanged to commit anyhow.")
3204
3064
except ConflictsInTree:
3209
3069
raise errors.BzrCommandError("Commit refused because there are"
3210
3070
" unknown files in the working tree.")
3211
3071
except errors.BoundBranchOutOfDate, e:
3212
e.extra_help = ("\n"
3213
'To commit to master branch, run update and then commit.\n'
3214
'You can also pass --local to commit to continue working '
3215
'disconnected.')
3216
raise
3072
raise errors.BzrCommandError(str(e) + "\n"
3073
'To commit to master branch, run update and then commit.\n'
3074
'You can also pass --local to commit to continue working '
3075
'disconnected.')
3217
3076
3218
3077
3219
3078
class cmd_check(Command):
3220
__doc__ = """Validate working tree structure, branch consistency and repository history.
3079
"""Validate working tree structure, branch consistency and repository history.
3221
3080
3222
3081
This command checks various invariants about branch and repository storage
3223
3082
to detect data corruption or bzr bugs.
3287
3146
3288
3147
3289
3148
class cmd_upgrade(Command):
3290
__doc__ = """Upgrade branch storage to current format.
3149
"""Upgrade branch storage to current format.
3291
3150
3292
3151
The check command or bzr developers may sometimes advise you to run
3293
3152
this command. When the default format has changed you may also be warned
3311
3170
3312
3171
3313
3172
class cmd_whoami(Command):
3314
__doc__ = """Show or set bzr user id.
3173
"""Show or set bzr user id.
3315
3174
3316
3175
:Examples:
3317
3176
Show the email of the current user::
3322
3181
3323
3182
bzr whoami "Frank Chu <fchu@example.com>"
3324
3183
"""
3325
takes_options = [ 'directory',
3326
Option('email',
3184
takes_options = [ Option('email',
3327
3185
help='Display email address only.'),
3328
3186
Option('branch',
3329
3187
help='Set identity for the current branch instead of '
3333
3191
encoding_type = 'replace'
3334
3192
3335
3193
@display_command
3336
def run(self, email=False, branch=False, name=None, directory=None):
3194
def run(self, email=False, branch=False, name=None):
3337
3195
if name is None:
3338
if directory is None:
3339
# use branch if we're inside one; otherwise global config
3340
try:
3341
c = Branch.open_containing(u'.')[0].get_config()
3342
except errors.NotBranchError:
3343
c = config.GlobalConfig()
3344
else:
3345
c = Branch.open(directory).get_config()
3196
# use branch if we're inside one; otherwise global config
3197
try:
3198
c = Branch.open_containing('.')[0].get_config()
3199
except errors.NotBranchError:
3200
c = config.GlobalConfig()
3346
3201
if email:
3347
3202
self.outf.write(c.user_email() + '\n')
3348
3203
else:
3358
3213
3359
3214
# use global config unless --branch given
3360
3215
if branch:
3361
if directory is None:
3362
c = Branch.open_containing(u'.')[0].get_config()
3363
else:
3364
c = Branch.open(directory).get_config()
3216
c = Branch.open_containing('.')[0].get_config()
3365
3217
else:
3366
3218
c = config.GlobalConfig()
3367
3219
c.set_user_option('email', name)
3368
3220
3369
3221
3370
3222
class cmd_nick(Command):
3371
__doc__ = """Print or set the branch nickname.
3223
"""Print or set the branch nickname.
3372
3224
3373
3225
If unset, the tree root directory name is used as the nickname.
3374
3226
To print the current nickname, execute with no argument.
3379
3231
3380
3232
_see_also = ['info']
3381
3233
takes_args = ['nickname?']
3382
takes_options = ['directory']
3383
def run(self, nickname=None, directory=u'.'):
3384
branch = Branch.open_containing(directory)[0]
3234
def run(self, nickname=None):
3235
branch = Branch.open_containing(u'.')[0]
3385
3236
if nickname is None:
3386
3237
self.printme(branch)
3387
3238
else:
3389
3240
3390
3241
@display_command
3391
3242
def printme(self, branch):
3392
self.outf.write('%s\n' % branch.nick)
3243
print branch.nick
3393
3244
3394
3245
3395
3246
class cmd_alias(Command):
3396
__doc__ = """Set/unset and display aliases.
3247
"""Set/unset and display aliases.
3397
3248
3398
3249
:Examples:
3399
3250
Show the current aliases::
3463
3314
3464
3315
3465
3316
class cmd_selftest(Command):
3466
__doc__ = """Run internal test suite.
3317
"""Run internal test suite.
3467
3318
3468
3319
If arguments are given, they are regular expressions that say which tests
3469
3320
should run. Tests matching any expression are run, and other tests are
3496
3347
Tests that need working space on disk use a common temporary directory,
3497
3348
typically inside $TMPDIR or /tmp.
3498
3349
3499
If you set BZR_TEST_PDB=1 when running selftest, failing tests will drop
3500
into a pdb postmortem session.
3501
3502
3350
:Examples:
3503
3351
Run only tests relating to 'ignore'::
3504
3352
3513
3361
def get_transport_type(typestring):
3514
3362
"""Parse and return a transport specifier."""
3515
3363
if typestring == "sftp":
3516
from bzrlib.tests import stub_sftp
3517
return stub_sftp.SFTPAbsoluteServer
3364
from bzrlib.transport.sftp import SFTPAbsoluteServer
3365
return SFTPAbsoluteServer
3518
3366
if typestring == "memory":
3519
from bzrlib.tests import test_server
3520
return memory.MemoryServer
3367
from bzrlib.transport.memory import MemoryServer
3368
return MemoryServer
3521
3369
if typestring == "fakenfs":
3522
from bzrlib.tests import test_server
3523
return test_server.FakeNFSServer
3370
from bzrlib.transport.fakenfs import FakeNFSServer
3371
return FakeNFSServer
3524
3372
msg = "No known transport type %s. Supported types are: sftp\n" %\
3525
3373
(typestring)
3526
3374
raise errors.BzrCommandError(msg)
3537
3385
'throughout the test suite.',
3538
3386
type=get_transport_type),
3539
3387
Option('benchmark',
3540
help='Run the benchmarks rather than selftests.',
3541
hidden=True),
3388
help='Run the benchmarks rather than selftests.'),
3542
3389
Option('lsprof-timed',
3543
3390
help='Generate lsprof output for benchmarked'
3544
3391
' sections of code.'),
3545
Option('lsprof-tests',
3546
help='Generate lsprof output for each test.'),
3392
Option('cache-dir', type=str,
3393
help='Cache intermediate benchmark output in this '
3394
'directory.'),
3547
3395
Option('first',
3548
3396
help='Run all tests, but run specified tests first.',
3549
3397
short_name='f',
3583
3431
3584
3432
def run(self, testspecs_list=None, verbose=False, one=False,
3585
3433
transport=None, benchmark=None,
3586
lsprof_timed=None,
3434
lsprof_timed=None, cache_dir=None,
3587
3435
first=False, list_only=False,
3588
3436
randomize=None, exclude=None, strict=False,
3589
3437
load_list=None, debugflag=None, starting_with=None, subunit=False,
3590
parallel=None, lsprof_tests=False):
3438
parallel=None):
3591
3439
from bzrlib.tests import selftest
3440
import bzrlib.benchmarks as benchmarks
3441
from bzrlib.benchmarks import tree_creator
3592
3442
3593
3443
# Make deprecation warnings visible, unless -Werror is set
3594
3444
symbol_versioning.activate_deprecation_warnings(override=False)
3595
3445
3446
if cache_dir is not None:
3447
tree_creator.TreeCreator.CACHE_ROOT = osutils.abspath(cache_dir)
3596
3448
if testspecs_list is not None:
3597
3449
pattern = '|'.join(testspecs_list)
3598
3450
else:
3604
3456
raise errors.BzrCommandError("subunit not available. subunit "
3605
3457
"needs to be installed to use --subunit.")
3606
3458
self.additional_selftest_args['runner_class'] = SubUnitBzrRunner
3607
# On Windows, disable automatic conversion of '\n' to '\r\n' in
3608
# stdout, which would corrupt the subunit stream.
3609
# FIXME: This has been fixed in subunit trunk (>0.0.5) so the
3610
# following code can be deleted when it's sufficiently deployed
3611
# -- vila/mgz 20100514
3612
if (sys.platform == "win32"
3613
and getattr(sys.stdout, 'fileno', None) is not None):
3614
import msvcrt
3615
msvcrt.setmode(sys.stdout.fileno(), os.O_BINARY)
3616
3459
if parallel:
3617
3460
self.additional_selftest_args.setdefault(
3618
3461
'suite_decorators', []).append(parallel)
3619
3462
if benchmark:
3620
raise errors.BzrCommandError(
3621
"--benchmark is no longer supported from bzr 2.2; "
3622
"use bzr-usertest instead")
3623
test_suite_factory = None
3624
selftest_kwargs = {"verbose": verbose,
3625
"pattern": pattern,
3626
"stop_on_failure": one,
3627
"transport": transport,
3628
"test_suite_factory": test_suite_factory,
3629
"lsprof_timed": lsprof_timed,
3630
"lsprof_tests": lsprof_tests,
3631
"matching_tests_first": first,
3632
"list_only": list_only,
3633
"random_seed": randomize,
3634
"exclude_pattern": exclude,
3635
"strict": strict,
3636
"load_list": load_list,
3637
"debug_flags": debugflag,
3638
"starting_with": starting_with
3639
}
3640
selftest_kwargs.update(self.additional_selftest_args)
3641
result = selftest(**selftest_kwargs)
3463
test_suite_factory = benchmarks.test_suite
3464
# Unless user explicitly asks for quiet, be verbose in benchmarks
3465
verbose = not is_quiet()
3466
# TODO: should possibly lock the history file...
3467
benchfile = open(".perf_history", "at", buffering=1)
3468
else:
3469
test_suite_factory = None
3470
benchfile = None
3471
try:
3472
selftest_kwargs = {"verbose": verbose,
3473
"pattern": pattern,
3474
"stop_on_failure": one,
3475
"transport": transport,
3476
"test_suite_factory": test_suite_factory,
3477
"lsprof_timed": lsprof_timed,
3478
"bench_history": benchfile,
3479
"matching_tests_first": first,
3480
"list_only": list_only,
3481
"random_seed": randomize,
3482
"exclude_pattern": exclude,
3483
"strict": strict,
3484
"load_list": load_list,
3485
"debug_flags": debugflag,
3486
"starting_with": starting_with
3487
}
3488
selftest_kwargs.update(self.additional_selftest_args)
3489
result = selftest(**selftest_kwargs)
3490
finally:
3491
if benchfile is not None:
3492
benchfile.close()
3642
3493
return int(not result)
3643
3494
3644
3495
3645
3496
class cmd_version(Command):
3646
__doc__ = """Show version of bzr."""
3497
"""Show version of bzr."""
3647
3498
3648
3499
encoding_type = 'replace'
3649
3500
takes_options = [
3660
3511
3661
3512
3662
3513
class cmd_rocks(Command):
3663
__doc__ = """Statement of optimism."""
3514
"""Statement of optimism."""
3664
3515
3665
3516
hidden = True
3666
3517
3667
3518
@display_command
3668
3519
def run(self):
3669
self.outf.write("It sure does!\n")
3520
print "It sure does!"
3670
3521
3671
3522
3672
3523
class cmd_find_merge_base(Command):
3673
__doc__ = """Find and print a base revision for merging two branches."""
3524
"""Find and print a base revision for merging two branches."""
3674
3525
# TODO: Options to specify revisions on either side, as if
3675
3526
# merging only part of the history.
3676
3527
takes_args = ['branch', 'other']
3682
3533
3683
3534
branch1 = Branch.open_containing(branch)[0]
3684
3535
branch2 = Branch.open_containing(other)[0]
3685
self.add_cleanup(branch1.lock_read().unlock)
3686
self.add_cleanup(branch2.lock_read().unlock)
3687
last1 = ensure_null(branch1.last_revision())
3688
last2 = ensure_null(branch2.last_revision())
3689
3690
graph = branch1.repository.get_graph(branch2.repository)
3691
base_rev_id = graph.find_unique_lca(last1, last2)
3692
3693
self.outf.write('merge base is revision %s\n' % base_rev_id)
3536
branch1.lock_read()
3537
try:
3538
branch2.lock_read()
3539
try:
3540
last1 = ensure_null(branch1.last_revision())
3541
last2 = ensure_null(branch2.last_revision())
3542
3543
graph = branch1.repository.get_graph(branch2.repository)
3544
base_rev_id = graph.find_unique_lca(last1, last2)
3545
3546
print 'merge base is revision %s' % base_rev_id
3547
finally:
3548
branch2.unlock()
3549
finally:
3550
branch1.unlock()
3694
3551
3695
3552
3696
3553
class cmd_merge(Command):
3697
__doc__ = """Perform a three-way merge.
3554
"""Perform a three-way merge.
3698
3555
3699
3556
The source of the merge can be specified either in the form of a branch,
3700
3557
or in the form of a path to a file containing a merge directive generated
3729
3586
committed to record the result of the merge.
3730
3587
3731
3588
merge refuses to run if there are any uncommitted changes, unless
3732
--force is given. The --force option can also be used to create a
3733
merge revision which has more than two parents.
3734
3735
If one would like to merge changes from the working tree of the other
3736
branch without merging any committed revisions, the --uncommitted option
3737
can be given.
3589
--force is given.
3738
3590
3739
3591
To select only some changes to merge, use "merge -i", which will prompt
3740
3592
you to apply each diff hunk and file change, similar to "shelve".
3752
3604
3753
3605
bzr merge -r 81..82 ../bzr.dev
3754
3606
3755
To apply a merge directive contained in /tmp/merge::
3607
To apply a merge directive contained in /tmp/merge:
3756
3608
3757
3609
bzr merge /tmp/merge
3758
3759
To create a merge revision with three parents from two branches
3760
feature1a and feature1b:
3761
3762
bzr merge ../feature1a
3763
bzr merge ../feature1b --force
3764
bzr commit -m 'revision with three parents'
3765
3610
"""
3766
3611
3767
3612
encoding_type = 'exact'
3783
3628
' completely merged into the source, pull from the'
3784
3629
' source rather than merging. When this happens,'
3785
3630
' you do not need to commit the result.'),
3786
custom_help('directory',
3631
Option('directory',
3787
3632
help='Branch to merge into, '
3788
'rather than the one containing the working directory.'),
3633
'rather than the one containing the working directory.',
3634
short_name='d',
3635
type=unicode,
3636
),
3789
3637
Option('preview', help='Instead of merging, show a diff of the'
3790
3638
' merge.'),
3791
3639
Option('interactive', help='Select changes interactively.',
3809
3657
verified = 'inapplicable'
3810
3658
tree = WorkingTree.open_containing(directory)[0]
3811
3659
3660
# die as quickly as possible if there are uncommitted changes
3812
3661
try:
3813
3662
basis_tree = tree.revision_tree(tree.last_revision())
3814
3663
except errors.NoSuchRevision:
3815
3664
basis_tree = tree.basis_tree()
3816
3817
# die as quickly as possible if there are uncommitted changes
3818
3665
if not force:
3819
if tree.has_changes():
3666
if tree.has_changes(basis_tree):
3820
3667
raise errors.UncommittedChanges(tree)
3821
3668
3822
3669
view_info = _get_view_info_for_change_reporter(tree)
3823
3670
change_reporter = delta._ChangeReporter(
3824
3671
unversioned_filter=tree.is_ignored, view_info=view_info)
3825
pb = ui.ui_factory.nested_progress_bar()
3826
self.add_cleanup(pb.finished)
3827
self.add_cleanup(tree.lock_write().unlock)
3828
if location is not None:
3829
try:
3830
mergeable = bundle.read_mergeable_from_url(location,
3831
possible_transports=possible_transports)
3832
except errors.NotABundle:
3833
mergeable = None
3672
cleanups = []
3673
try:
3674
pb = ui.ui_factory.nested_progress_bar()
3675
cleanups.append(pb.finished)
3676
tree.lock_write()
3677
cleanups.append(tree.unlock)
3678
if location is not None:
3679
try:
3680
mergeable = bundle.read_mergeable_from_url(location,
3681
possible_transports=possible_transports)
3682
except errors.NotABundle:
3683
mergeable = None
3684
else:
3685
if uncommitted:
3686
raise errors.BzrCommandError('Cannot use --uncommitted'
3687
' with bundles or merge directives.')
3688
3689
if revision is not None:
3690
raise errors.BzrCommandError(
3691
'Cannot use -r with merge directives or bundles')
3692
merger, verified = _mod_merge.Merger.from_mergeable(tree,
3693
mergeable, pb)
3694
3695
if merger is None and uncommitted:
3696
if revision is not None and len(revision) > 0:
3697
raise errors.BzrCommandError('Cannot use --uncommitted and'
3698
' --revision at the same time.')
3699
merger = self.get_merger_from_uncommitted(tree, location, pb,
3700
cleanups)
3701
allow_pending = False
3702
3703
if merger is None:
3704
merger, allow_pending = self._get_merger_from_branch(tree,
3705
location, revision, remember, possible_transports, pb)
3706
3707
merger.merge_type = merge_type
3708
merger.reprocess = reprocess
3709
merger.show_base = show_base
3710
self.sanity_check_merger(merger)
3711
if (merger.base_rev_id == merger.other_rev_id and
3712
merger.other_rev_id is not None):
3713
note('Nothing to do.')
3714
return 0
3715
if pull:
3716
if merger.interesting_files is not None:
3717
raise errors.BzrCommandError('Cannot pull individual files')
3718
if (merger.base_rev_id == tree.last_revision()):
3719
result = tree.pull(merger.other_branch, False,
3720
merger.other_rev_id)
3721
result.report(self.outf)
3722
return 0
3723
merger.check_basis(False)
3724
if preview:
3725
return self._do_preview(merger, cleanups)
3726
elif interactive:
3727
return self._do_interactive(merger, cleanups)
3834
3728
else:
3835
if uncommitted:
3836
raise errors.BzrCommandError('Cannot use --uncommitted'
3837
' with bundles or merge directives.')
3838
3839
if revision is not None:
3840
raise errors.BzrCommandError(
3841
'Cannot use -r with merge directives or bundles')
3842
merger, verified = _mod_merge.Merger.from_mergeable(tree,
3843
mergeable, None)
3844
3845
if merger is None and uncommitted:
3846
if revision is not None and len(revision) > 0:
3847
raise errors.BzrCommandError('Cannot use --uncommitted and'
3848
' --revision at the same time.')
3849
merger = self.get_merger_from_uncommitted(tree, location, None)
3850
allow_pending = False
3851
3852
if merger is None:
3853
merger, allow_pending = self._get_merger_from_branch(tree,
3854
location, revision, remember, possible_transports, None)
3855
3856
merger.merge_type = merge_type
3857
merger.reprocess = reprocess
3858
merger.show_base = show_base
3859
self.sanity_check_merger(merger)
3860
if (merger.base_rev_id == merger.other_rev_id and
3861
merger.other_rev_id is not None):
3862
note('Nothing to do.')
3863
return 0
3864
if pull:
3865
if merger.interesting_files is not None:
3866
raise errors.BzrCommandError('Cannot pull individual files')
3867
if (merger.base_rev_id == tree.last_revision()):
3868
result = tree.pull(merger.other_branch, False,
3869
merger.other_rev_id)
3870
result.report(self.outf)
3871
return 0
3872
if merger.this_basis is None:
3873
raise errors.BzrCommandError(
3874
"This branch has no commits."
3875
" (perhaps you would prefer 'bzr pull')")
3876
if preview:
3877
return self._do_preview(merger)
3878
elif interactive:
3879
return self._do_interactive(merger)
3880
else:
3881
return self._do_merge(merger, change_reporter, allow_pending,
3882
verified)
3883
3884
def _get_preview(self, merger):
3729
return self._do_merge(merger, change_reporter, allow_pending,
3730
verified)
3731
finally:
3732
for cleanup in reversed(cleanups):
3733
cleanup()
3734
3735
def _get_preview(self, merger, cleanups):
3885
3736
tree_merger = merger.make_merger()
3886
3737
tt = tree_merger.make_preview_transform()
3887
self.add_cleanup(tt.finalize)
3738
cleanups.append(tt.finalize)
3888
3739
result_tree = tt.get_preview_tree()
3889
3740
return result_tree
3890
3741
3891
def _do_preview(self, merger):
3742
def _do_preview(self, merger, cleanups):
3892
3743
from bzrlib.diff import show_diff_trees
3893
result_tree = self._get_preview(merger)
3894
path_encoding = osutils.get_diff_header_encoding()
3744
result_tree = self._get_preview(merger, cleanups)
3895
3745
show_diff_trees(merger.this_tree, result_tree, self.outf,
3896
old_label='', new_label='',
3897
path_encoding=path_encoding)
3746
old_label='', new_label='')
3898
3747
3899
3748
def _do_merge(self, merger, change_reporter, allow_pending, verified):
3900
3749
merger.change_reporter = change_reporter
3908
3757
else:
3909
3758
return 0
3910
3759
3911
def _do_interactive(self, merger):
3760
def _do_interactive(self, merger, cleanups):
3912
3761
"""Perform an interactive merge.
3913
3762
3914
3763
This works by generating a preview tree of the merge, then using
3916
3765
and the preview tree.
3917
3766
"""
3918
3767
from bzrlib import shelf_ui
3919
result_tree = self._get_preview(merger)
3768
result_tree = self._get_preview(merger, cleanups)
3920
3769
writer = bzrlib.option.diff_writer_registry.get()
3921
3770
shelver = shelf_ui.Shelver(merger.this_tree, result_tree, destroy=True,
3922
3771
reporter=shelf_ui.ApplyReporter(),
3923
3772
diff_writer=writer(sys.stdout))
3924
try:
3925
shelver.run()
3926
finally:
3927
shelver.finalize()
3773
shelver.run()
3928
3774
3929
3775
def sanity_check_merger(self, merger):
3930
3776
if (merger.show_base and
3990
3836
allow_pending = True
3991
3837
return merger, allow_pending
3992
3838
3993
def get_merger_from_uncommitted(self, tree, location, pb):
3839
def get_merger_from_uncommitted(self, tree, location, pb, cleanups):
3994
3840
"""Get a merger for uncommitted changes.
3995
3841
3996
3842
:param tree: The tree the merger should apply to.
3997
3843
:param location: The location containing uncommitted changes.
3998
3844
:param pb: The progress bar to use for showing progress.
3845
:param cleanups: A list of operations to perform to clean up the
3846
temporary directories, unfinalized objects, etc.
3999
3847
"""
4000
3848
location = self._select_branch_location(tree, location)[0]
4001
3849
other_tree, other_path = WorkingTree.open_containing(location)
4053
3901
4054
3902
4055
3903
class cmd_remerge(Command):
4056
__doc__ = """Redo a merge.
3904
"""Redo a merge.
4057
3905
4058
3906
Use this if you want to try a different merge technique while resolving
4059
3907
conflicts. Some merge techniques are better than others, and remerge
4084
3932
4085
3933
def run(self, file_list=None, merge_type=None, show_base=False,
4086
3934
reprocess=False):
4087
from bzrlib.conflicts import restore
4088
3935
if merge_type is None:
4089
3936
merge_type = _mod_merge.Merge3Merger
4090
3937
tree, file_list = tree_files(file_list)
4091
self.add_cleanup(tree.lock_write().unlock)
4092
parents = tree.get_parent_ids()
4093
if len(parents) != 2:
4094
raise errors.BzrCommandError("Sorry, remerge only works after normal"
4095
" merges. Not cherrypicking or"
4096
" multi-merges.")
4097
repository = tree.branch.repository
4098
interesting_ids = None
4099
new_conflicts = []
4100
conflicts = tree.conflicts()
4101
if file_list is not None:
4102
interesting_ids = set()
4103
for filename in file_list:
4104
file_id = tree.path2id(filename)
4105
if file_id is None:
4106
raise errors.NotVersionedError(filename)
4107
interesting_ids.add(file_id)
4108
if tree.kind(file_id) != "directory":
4109
continue
3938
tree.lock_write()
3939
try:
3940
parents = tree.get_parent_ids()
3941
if len(parents) != 2:
3942
raise errors.BzrCommandError("Sorry, remerge only works after normal"
3943
" merges. Not cherrypicking or"
3944
" multi-merges.")
3945
repository = tree.branch.repository
3946
interesting_ids = None
3947
new_conflicts = []
3948
conflicts = tree.conflicts()
3949
if file_list is not None:
3950
interesting_ids = set()
3951
for filename in file_list:
3952
file_id = tree.path2id(filename)
3953
if file_id is None:
3954
raise errors.NotVersionedError(filename)
3955
interesting_ids.add(file_id)
3956
if tree.kind(file_id) != "directory":
3957
continue
4110
3958
4111
for name, ie in tree.inventory.iter_entries(file_id):
4112
interesting_ids.add(ie.file_id)
4113
new_conflicts = conflicts.select_conflicts(tree, file_list)[0]
4114
else:
4115
# Remerge only supports resolving contents conflicts
4116
allowed_conflicts = ('text conflict', 'contents conflict')
4117
restore_files = [c.path for c in conflicts
4118
if c.typestring in allowed_conflicts]
4119
_mod_merge.transform_tree(tree, tree.basis_tree(), interesting_ids)
4120
tree.set_conflicts(ConflictList(new_conflicts))
4121
if file_list is not None:
4122
restore_files = file_list
4123
for filename in restore_files:
3959
for name, ie in tree.inventory.iter_entries(file_id):
3960
interesting_ids.add(ie.file_id)
3961
new_conflicts = conflicts.select_conflicts(tree, file_list)[0]
3962
else:
3963
# Remerge only supports resolving contents conflicts
3964
allowed_conflicts = ('text conflict', 'contents conflict')
3965
restore_files = [c.path for c in conflicts
3966
if c.typestring in allowed_conflicts]
3967
_mod_merge.transform_tree(tree, tree.basis_tree(), interesting_ids)
3968
tree.set_conflicts(ConflictList(new_conflicts))
3969
if file_list is not None:
3970
restore_files = file_list
3971
for filename in restore_files:
3972
try:
3973
restore(tree.abspath(filename))
3974
except errors.NotConflicted:
3975
pass
3976
# Disable pending merges, because the file texts we are remerging
3977
# have not had those merges performed. If we use the wrong parents
3978
# list, we imply that the working tree text has seen and rejected
3979
# all the changes from the other tree, when in fact those changes
3980
# have not yet been seen.
3981
pb = ui.ui_factory.nested_progress_bar()
3982
tree.set_parent_ids(parents[:1])
4124
3983
try:
4125
restore(tree.abspath(filename))
4126
except errors.NotConflicted:
4127
pass
4128
# Disable pending merges, because the file texts we are remerging
4129
# have not had those merges performed. If we use the wrong parents
4130
# list, we imply that the working tree text has seen and rejected
4131
# all the changes from the other tree, when in fact those changes
4132
# have not yet been seen.
4133
tree.set_parent_ids(parents[:1])
4134
try:
4135
merger = _mod_merge.Merger.from_revision_ids(None, tree, parents[1])
4136
merger.interesting_ids = interesting_ids
4137
merger.merge_type = merge_type
4138
merger.show_base = show_base
4139
merger.reprocess = reprocess
4140
conflicts = merger.do_merge()
3984
merger = _mod_merge.Merger.from_revision_ids(pb,
3985
tree, parents[1])
3986
merger.interesting_ids = interesting_ids
3987
merger.merge_type = merge_type
3988
merger.show_base = show_base
3989
merger.reprocess = reprocess
3990
conflicts = merger.do_merge()
3991
finally:
3992
tree.set_parent_ids(parents)
3993
pb.finished()
4141
3994
finally:
4142
tree.set_parent_ids(parents)
3995
tree.unlock()
4143
3996
if conflicts > 0:
4144
3997
return 1
4145
3998
else:
4147
4000
4148
4001
4149
4002
class cmd_revert(Command):
4150
__doc__ = """Revert files to a previous revision.
4003
"""Revert files to a previous revision.
4151
4004
4152
4005
Giving a list of files will revert only those files. Otherwise, all files
4153
4006
will be reverted. If the revision is not specified with '--revision', the
4167
4020
name. If you name a directory, all the contents of that directory will be
4168
4021
reverted.
4169
4022
4170
If you have newly added files since the target revision, they will be
4171
removed. If the files to be removed have been changed, backups will be
4172
created as above. Directories containing unknown files will not be
4173
deleted.
4023
Any files that have been newly added since that revision will be deleted,
4024
with a backup kept if appropriate. Directories containing unknown files
4025
will not be deleted.
4174
4026
4175
The working tree contains a list of revisions that have been merged but
4176
not yet committed. These revisions will be included as additional parents
4177
of the next commit. Normally, using revert clears that list as well as
4178
reverting the files. If any files are specified, revert leaves the list
4179
of uncommitted merges alone and reverts only the files. Use ``bzr revert
4180
.`` in the tree root to revert all files but keep the recorded merges,
4181
and ``bzr revert --forget-merges`` to clear the pending merge list without
4027
The working tree contains a list of pending merged revisions, which will
4028
be included as parents in the next commit. Normally, revert clears that
4029
list as well as reverting the files. If any files are specified, revert
4030
leaves the pending merge list alone and reverts only the files. Use "bzr
4031
revert ." in the tree root to revert all files but keep the merge record,
4032
and "bzr revert --forget-merges" to clear the pending merge list without
4182
4033
reverting any files.
4183
4184
Using "bzr revert --forget-merges", it is possible to apply all of the
4185
changes from a branch in a single revision. To do this, perform the merge
4186
as desired. Then doing revert with the "--forget-merges" option will keep
4187
the content of the tree as it was, but it will clear the list of pending
4188
merges. The next commit will then contain all of the changes that are
4189
present in the other branch, but without any other parent revisions.
4190
Because this technique forgets where these changes originated, it may
4191
cause additional conflicts on later merges involving the same source and
4192
target branches.
4193
4034
"""
4194
4035
4195
4036
_see_also = ['cat', 'export']
4204
4045
def run(self, revision=None, no_backup=False, file_list=None,
4205
4046
forget_merges=None):
4206
4047
tree, file_list = tree_files(file_list)
4207
self.add_cleanup(tree.lock_tree_write().unlock)
4208
if forget_merges:
4209
tree.set_parent_ids(tree.get_parent_ids()[:1])
4210
else:
4211
self._revert_tree_to_revision(tree, revision, file_list, no_backup)
4048
tree.lock_write()
4049
try:
4050
if forget_merges:
4051
tree.set_parent_ids(tree.get_parent_ids()[:1])
4052
else:
4053
self._revert_tree_to_revision(tree, revision, file_list, no_backup)
4054
finally:
4055
tree.unlock()
4212
4056
4213
4057
@staticmethod
4214
4058
def _revert_tree_to_revision(tree, revision, file_list, no_backup):
4215
4059
rev_tree = _get_one_revision_tree('revert', revision, tree=tree)
4216
tree.revert(file_list, rev_tree, not no_backup, None,
4217
report_changes=True)
4060
pb = ui.ui_factory.nested_progress_bar()
4061
try:
4062
tree.revert(file_list, rev_tree, not no_backup, pb,
4063
report_changes=True)
4064
finally:
4065
pb.finished()
4218
4066
4219
4067
4220
4068
class cmd_assert_fail(Command):
4221
__doc__ = """Test reporting of assertion failures"""
4069
"""Test reporting of assertion failures"""
4222
4070
# intended just for use in testing
4223
4071
4224
4072
hidden = True
4228
4076
4229
4077
4230
4078
class cmd_help(Command):
4231
__doc__ = """Show help on a command or other topic.
4079
"""Show help on a command or other topic.
4232
4080
"""
4233
4081
4234
4082
_see_also = ['topics']
4247
4095
4248
4096
4249
4097
class cmd_shell_complete(Command):
4250
__doc__ = """Show appropriate completions for context.
4098
"""Show appropriate completions for context.
4251
4099
4252
4100
For a list of all available commands, say 'bzr shell-complete'.
4253
4101
"""
4262
4110
4263
4111
4264
4112
class cmd_missing(Command):
4265
__doc__ = """Show unmerged/unpulled revisions between two branches.
4113
"""Show unmerged/unpulled revisions between two branches.
4266
4114
4267
4115
OTHER_BRANCH may be local or remote.
4268
4116
4269
4117
To filter on a range of revisions, you can use the command -r begin..end
4270
4118
-r revision requests a specific revision, -r ..end or -r begin.. are
4271
4119
also valid.
4272
4273
:Exit values:
4274
1 - some missing revisions
4275
0 - no missing revisions
4276
4120
4277
4121
:Examples:
4278
4122
4299
4143
_see_also = ['merge', 'pull']
4300
4144
takes_args = ['other_branch?']
4301
4145
takes_options = [
4302
'directory',
4303
4146
Option('reverse', 'Reverse the order of revisions.'),
4304
4147
Option('mine-only',
4305
4148
'Display changes in the local branch only.'),
4327
4170
theirs_only=False,
4328
4171
log_format=None, long=False, short=False, line=False,
4329
4172
show_ids=False, verbose=False, this=False, other=False,
4330
include_merges=False, revision=None, my_revision=None,
4331
directory=u'.'):
4173
include_merges=False, revision=None, my_revision=None):
4332
4174
from bzrlib.missing import find_unmerged, iter_log_revisions
4333
4175
def message(s):
4334
4176
if not is_quiet():
4347
4189
elif theirs_only:
4348
4190
restrict = 'remote'
4349
4191
4350
local_branch = Branch.open_containing(directory)[0]
4351
self.add_cleanup(local_branch.lock_read().unlock)
4352
4192
local_branch = Branch.open_containing(u".")[0]
4353
4193
parent = local_branch.get_parent()
4354
4194
if other_branch is None:
4355
4195
other_branch = parent
4364
4204
remote_branch = Branch.open(other_branch)
4365
4205
if remote_branch.base == local_branch.base:
4366
4206
remote_branch = local_branch
4367
else:
4368
self.add_cleanup(remote_branch.lock_read().unlock)
4369
4207
4370
4208
local_revid_range = _revision_range_to_revid_range(
4371
4209
_get_revision_range(my_revision, local_branch,
4375
4213
_get_revision_range(revision,
4376
4214
remote_branch, self.name()))
4377
4215
4378
local_extra, remote_extra = find_unmerged(
4379
local_branch, remote_branch, restrict,
4380
backward=not reverse,
4381
include_merges=include_merges,
4382
local_revid_range=local_revid_range,
4383
remote_revid_range=remote_revid_range)
4384
4385
if log_format is None:
4386
registry = log.log_formatter_registry
4387
log_format = registry.get_default(local_branch)
4388
lf = log_format(to_file=self.outf,
4389
show_ids=show_ids,
4390
show_timezone='original')
4391
4392
status_code = 0
4393
if local_extra and not theirs_only:
4394
message("You have %d extra revision(s):\n" %
4395
len(local_extra))
4396
for revision in iter_log_revisions(local_extra,
4397
local_branch.repository,
4398
verbose):
4399
lf.log_revision(revision)
4400
printed_local = True
4401
status_code = 1
4402
else:
4403
printed_local = False
4404
4405
if remote_extra and not mine_only:
4406
if printed_local is True:
4407
message("\n\n\n")
4408
message("You are missing %d revision(s):\n" %
4409
len(remote_extra))
4410
for revision in iter_log_revisions(remote_extra,
4411
remote_branch.repository,
4412
verbose):
4413
lf.log_revision(revision)
4414
status_code = 1
4415
4416
if mine_only and not local_extra:
4417
# We checked local, and found nothing extra
4418
message('This branch is up to date.\n')
4419
elif theirs_only and not remote_extra:
4420
# We checked remote, and found nothing extra
4421
message('Other branch is up to date.\n')
4422
elif not (mine_only or theirs_only or local_extra or
4423
remote_extra):
4424
# We checked both branches, and neither one had extra
4425
# revisions
4426
message("Branches are up to date.\n")
4427
self.cleanup_now()
4216
local_branch.lock_read()
4217
try:
4218
remote_branch.lock_read()
4219
try:
4220
local_extra, remote_extra = find_unmerged(
4221
local_branch, remote_branch, restrict,
4222
backward=not reverse,
4223
include_merges=include_merges,
4224
local_revid_range=local_revid_range,
4225
remote_revid_range=remote_revid_range)
4226
4227
if log_format is None:
4228
registry = log.log_formatter_registry
4229
log_format = registry.get_default(local_branch)
4230
lf = log_format(to_file=self.outf,
4231
show_ids=show_ids,
4232
show_timezone='original')
4233
4234
status_code = 0
4235
if local_extra and not theirs_only:
4236
message("You have %d extra revision(s):\n" %
4237
len(local_extra))
4238
for revision in iter_log_revisions(local_extra,
4239
local_branch.repository,
4240
verbose):
4241
lf.log_revision(revision)
4242
printed_local = True
4243
status_code = 1
4244
else:
4245
printed_local = False
4246
4247
if remote_extra and not mine_only:
4248
if printed_local is True:
4249
message("\n\n\n")
4250
message("You are missing %d revision(s):\n" %
4251
len(remote_extra))
4252
for revision in iter_log_revisions(remote_extra,
4253
remote_branch.repository,
4254
verbose):
4255
lf.log_revision(revision)
4256
status_code = 1
4257
4258
if mine_only and not local_extra:
4259
# We checked local, and found nothing extra
4260
message('This branch is up to date.\n')
4261
elif theirs_only and not remote_extra:
4262
# We checked remote, and found nothing extra
4263
message('Other branch is up to date.\n')
4264
elif not (mine_only or theirs_only or local_extra or
4265
remote_extra):
4266
# We checked both branches, and neither one had extra
4267
# revisions
4268
message("Branches are up to date.\n")
4269
finally:
4270
remote_branch.unlock()
4271
finally:
4272
local_branch.unlock()
4428
4273
if not status_code and parent is None and other_branch is not None:
4429
self.add_cleanup(local_branch.lock_write().unlock)
4430
# handle race conditions - a parent might be set while we run.
4431
if local_branch.get_parent() is None:
4432
local_branch.set_parent(remote_branch.base)
4274
local_branch.lock_write()
4275
try:
4276
# handle race conditions - a parent might be set while we run.
4277
if local_branch.get_parent() is None:
4278
local_branch.set_parent(remote_branch.base)
4279
finally:
4280
local_branch.unlock()
4433
4281
return status_code
4434
4282
4435
4283
4436
4284
class cmd_pack(Command):
4437
__doc__ = """Compress the data within a repository.
4438
4439
This operation compresses the data within a bazaar repository. As
4440
bazaar supports automatic packing of repository, this operation is
4441
normally not required to be done manually.
4442
4443
During the pack operation, bazaar takes a backup of existing repository
4444
data, i.e. pack files. This backup is eventually removed by bazaar
4445
automatically when it is safe to do so. To save disk space by removing
4446
the backed up pack files, the --clean-obsolete-packs option may be
4447
used.
4448
4449
Warning: If you use --clean-obsolete-packs and your machine crashes
4450
during or immediately after repacking, you may be left with a state
4451
where the deletion has been written to disk but the new packs have not
4452
been. In this case the repository may be unusable.
4453
"""
4285
"""Compress the data within a repository."""
4454
4286
4455
4287
_see_also = ['repositories']
4456
4288
takes_args = ['branch_or_repo?']
4457
takes_options = [
4458
Option('clean-obsolete-packs', 'Delete obsolete packs to save disk space.'),
4459
]
4460
4289
4461
def run(self, branch_or_repo='.', clean_obsolete_packs=False):
4290
def run(self, branch_or_repo='.'):
4462
4291
dir = bzrdir.BzrDir.open_containing(branch_or_repo)[0]
4463
4292
try:
4464
4293
branch = dir.open_branch()
4465
4294
repository = branch.repository
4466
4295
except errors.NotBranchError:
4467
4296
repository = dir.open_repository()
4468
repository.pack(clean_obsolete_packs=clean_obsolete_packs)
4297
repository.pack()
4469
4298
4470
4299
4471
4300
class cmd_plugins(Command):
4472
__doc__ = """List the installed plugins.
4301
"""List the installed plugins.
4473
4302
4474
4303
This command displays the list of installed plugins including
4475
4304
version of plugin and a short description of each.
4482
4311
adding new commands, providing additional network transports and
4483
4312
customizing log output.
4484
4313
4485
See the Bazaar Plugin Guide <http://doc.bazaar.canonical.com/plugins/en/>
4486
for further information on plugins including where to find them and how to
4487
install them. Instructions are also provided there on how to write new
4488
plugins using the Python programming language.
4314
See the Bazaar web site, http://bazaar-vcs.org, for further
4315
information on plugins including where to find them and how to
4316
install them. Instructions are also provided there on how to
4317
write new plugins using the Python programming language.
4489
4318
"""
4490
4319
takes_options = ['verbose']
4491
4320
4506
4335
doc = '(no description)'
4507
4336
result.append((name_ver, doc, plugin.path()))
4508
4337
for name_ver, doc, path in sorted(result):
4509
self.outf.write("%s\n" % name_ver)
4510
self.outf.write(" %s\n" % doc)
4338
print name_ver
4339
print ' ', doc
4511
4340
if verbose:
4512
self.outf.write(" %s\n" % path)
4513
self.outf.write("\n")
4341
print ' ', path
4342
print
4514
4343
4515
4344
4516
4345
class cmd_testament(Command):
4517
__doc__ = """Show testament (signing-form) of a revision."""
4346
"""Show testament (signing-form) of a revision."""
4518
4347
takes_options = [
4519
4348
'revision',
4520
4349
Option('long', help='Produce long-format testament.'),
4532
4361
b = Branch.open_containing(branch)[0]
4533
4362
else:
4534
4363
b = Branch.open(branch)
4535
self.add_cleanup(b.lock_read().unlock)
4536
if revision is None:
4537
rev_id = b.last_revision()
4538
else:
4539
rev_id = revision[0].as_revision_id(b)
4540
t = testament_class.from_revision(b.repository, rev_id)
4541
if long:
4542
sys.stdout.writelines(t.as_text_lines())
4543
else:
4544
sys.stdout.write(t.as_short_text())
4364
b.lock_read()
4365
try:
4366
if revision is None:
4367
rev_id = b.last_revision()
4368
else:
4369
rev_id = revision[0].as_revision_id(b)
4370
t = testament_class.from_revision(b.repository, rev_id)
4371
if long:
4372
sys.stdout.writelines(t.as_text_lines())
4373
else:
4374
sys.stdout.write(t.as_short_text())
4375
finally:
4376
b.unlock()
4545
4377
4546
4378
4547
4379
class cmd_annotate(Command):
4548
__doc__ = """Show the origin of each line in a file.
4380
"""Show the origin of each line in a file.
4549
4381
4550
4382
This prints out the given file with an annotation on the left side
4551
4383
indicating which revision, author and date introduced the change.
4562
4394
Option('long', help='Show commit date in annotations.'),
4563
4395
'revision',
4564
4396
'show-ids',
4565
'directory',
4566
4397
]
4567
4398
encoding_type = 'exact'
4568
4399
4569
4400
@display_command
4570
4401
def run(self, filename, all=False, long=False, revision=None,
4571
show_ids=False, directory=None):
4402
show_ids=False):
4572
4403
from bzrlib.annotate import annotate_file, annotate_file_tree
4573
4404
wt, branch, relpath = \
4574
_open_directory_or_containing_tree_or_branch(filename, directory)
4575
if wt is not None:
4576
self.add_cleanup(wt.lock_read().unlock)
4577
else:
4578
self.add_cleanup(branch.lock_read().unlock)
4579
tree = _get_one_revision_tree('annotate', revision, branch=branch)
4580
self.add_cleanup(tree.lock_read().unlock)
4581
if wt is not None:
4582
file_id = wt.path2id(relpath)
4583
else:
4584
file_id = tree.path2id(relpath)
4585
if file_id is None:
4586
raise errors.NotVersionedError(filename)
4587
file_version = tree.inventory[file_id].revision
4588
if wt is not None and revision is None:
4589
# If there is a tree and we're not annotating historical
4590
# versions, annotate the working tree's content.
4591
annotate_file_tree(wt, file_id, self.outf, long, all,
4592
show_ids=show_ids)
4593
else:
4594
annotate_file(branch, file_version, file_id, long, all, self.outf,
4595
show_ids=show_ids)
4405
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
4406
if wt is not None:
4407
wt.lock_read()
4408
else:
4409
branch.lock_read()
4410
try:
4411
tree = _get_one_revision_tree('annotate', revision, branch=branch)
4412
if wt is not None:
4413
file_id = wt.path2id(relpath)
4414
else:
4415
file_id = tree.path2id(relpath)
4416
if file_id is None:
4417
raise errors.NotVersionedError(filename)
4418
file_version = tree.inventory[file_id].revision
4419
if wt is not None and revision is None:
4420
# If there is a tree and we're not annotating historical
4421
# versions, annotate the working tree's content.
4422
annotate_file_tree(wt, file_id, self.outf, long, all,
4423
show_ids=show_ids)
4424
else:
4425
annotate_file(branch, file_version, file_id, long, all, self.outf,
4426
show_ids=show_ids)
4427
finally:
4428
if wt is not None:
4429
wt.unlock()
4430
else:
4431
branch.unlock()
4596
4432
4597
4433
4598
4434
class cmd_re_sign(Command):
4599
__doc__ = """Create a digital signature for an existing revision."""
4435
"""Create a digital signature for an existing revision."""
4600
4436
# TODO be able to replace existing ones.
4601
4437
4602
4438
hidden = True # is this right ?
4603
4439
takes_args = ['revision_id*']
4604
takes_options = ['directory', 'revision']
4440
takes_options = ['revision']
4605
4441
4606
def run(self, revision_id_list=None, revision=None, directory=u'.'):
4442
def run(self, revision_id_list=None, revision=None):
4607
4443
if revision_id_list is not None and revision is not None:
4608
4444
raise errors.BzrCommandError('You can only supply one of revision_id or --revision')
4609
4445
if revision_id_list is None and revision is None:
4610
4446
raise errors.BzrCommandError('You must supply either --revision or a revision_id')
4611
b = WorkingTree.open_containing(directory)[0].branch
4612
self.add_cleanup(b.lock_write().unlock)
4613
return self._run(b, revision_id_list, revision)
4447
b = WorkingTree.open_containing(u'.')[0].branch
4448
b.lock_write()
4449
try:
4450
return self._run(b, revision_id_list, revision)
4451
finally:
4452
b.unlock()
4614
4453
4615
4454
def _run(self, b, revision_id_list, revision):
4616
4455
import bzrlib.gpg as gpg
4661
4500
4662
4501
4663
4502
class cmd_bind(Command):
4664
__doc__ = """Convert the current branch into a checkout of the supplied branch.
4665
If no branch is supplied, rebind to the last bound location.
4503
"""Convert the current branch into a checkout of the supplied branch.
4666
4504
4667
4505
Once converted into a checkout, commits must succeed on the master branch
4668
4506
before they will be applied to the local branch.
4669
4507
4670
4508
Bound branches use the nickname of its master branch unless it is set
4671
locally, in which case binding will update the local nickname to be
4509
locally, in which case binding will update the the local nickname to be
4672
4510
that of the master.
4673
4511
"""
4674
4512
4675
4513
_see_also = ['checkouts', 'unbind']
4676
4514
takes_args = ['location?']
4677
takes_options = ['directory']
4515
takes_options = []
4678
4516
4679
def run(self, location=None, directory=u'.'):
4680
b, relpath = Branch.open_containing(directory)
4517
def run(self, location=None):
4518
b, relpath = Branch.open_containing(u'.')
4681
4519
if location is None:
4682
4520
try:
4683
4521
location = b.get_old_bound_location()
4686
4524
'This format does not remember old locations.')
4687
4525
else:
4688
4526
if location is None:
4689
if b.get_bound_location() is not None:
4690
raise errors.BzrCommandError('Branch is already bound')
4691
else:
4692
raise errors.BzrCommandError('No location supplied '
4693
'and no previous location known')
4527
raise errors.BzrCommandError('No location supplied and no '
4528
'previous location known')
4694
4529
b_other = Branch.open(location)
4695
4530
try:
4696
4531
b.bind(b_other)
4702
4537
4703
4538
4704
4539
class cmd_unbind(Command):
4705
__doc__ = """Convert the current checkout into a regular branch.
4540
"""Convert the current checkout into a regular branch.
4706
4541
4707
4542
After unbinding, the local branch is considered independent and subsequent
4708
4543
commits will be local only.
4710
4545
4711
4546
_see_also = ['checkouts', 'bind']
4712
4547
takes_args = []
4713
takes_options = ['directory']
4548
takes_options = []
4714
4549
4715
def run(self, directory=u'.'):
4716
b, relpath = Branch.open_containing(directory)
4550
def run(self):
4551
b, relpath = Branch.open_containing(u'.')
4717
4552
if not b.unbind():
4718
4553
raise errors.BzrCommandError('Local branch is not bound')
4719
4554
4720
4555
4721
4556
class cmd_uncommit(Command):
4722
__doc__ = """Remove the last committed revision.
4557
"""Remove the last committed revision.
4723
4558
4724
4559
--verbose will print out what is being removed.
4725
4560
--dry-run will go through all the motions, but not actually
4765
4600
b = control.open_branch()
4766
4601
4767
4602
if tree is not None:
4768
self.add_cleanup(tree.lock_write().unlock)
4603
tree.lock_write()
4769
4604
else:
4770
self.add_cleanup(b.lock_write().unlock)
4771
return self._run(b, tree, dry_run, verbose, revision, force, local=local)
4605
b.lock_write()
4606
try:
4607
return self._run(b, tree, dry_run, verbose, revision, force,
4608
local=local)
4609
finally:
4610
if tree is not None:
4611
tree.unlock()
4612
else:
4613
b.unlock()
4772
4614
4773
4615
def _run(self, b, tree, dry_run, verbose, revision, force, local=False):
4774
4616
from bzrlib.log import log_formatter, show_log
4806
4648
end_revision=last_revno)
4807
4649
4808
4650
if dry_run:
4809
self.outf.write('Dry-run, pretending to remove'
4810
' the above revisions.\n')
4651
print 'Dry-run, pretending to remove the above revisions.'
4652
if not force:
4653
val = raw_input('Press <enter> to continue')
4811
4654
else:
4812
self.outf.write('The above revision(s) will be removed.\n')
4813
4814
if not force:
4815
if not ui.ui_factory.get_boolean('Are you sure'):
4816
self.outf.write('Canceled')
4817
return 0
4655
print 'The above revision(s) will be removed.'
4656
if not force:
4657
val = raw_input('Are you sure [y/N]? ')
4658
if val.lower() not in ('y', 'yes'):
4659
print 'Canceled'
4660
return 0
4818
4661
4819
4662
mutter('Uncommitting from {%s} to {%s}',
4820
4663
last_rev_id, rev_id)
4821
4664
uncommit(b, tree=tree, dry_run=dry_run, verbose=verbose,
4822
4665
revno=revno, local=local)
4823
self.outf.write('You can restore the old tip by running:\n'
4824
' bzr pull . -r revid:%s\n' % last_rev_id)
4666
note('You can restore the old tip by running:\n'
4667
' bzr pull . -r revid:%s', last_rev_id)
4825
4668
4826
4669
4827
4670
class cmd_break_lock(Command):
4828
__doc__ = """Break a dead lock on a repository, branch or working directory.
4671
"""Break a dead lock on a repository, branch or working directory.
4829
4672
4830
4673
CAUTION: Locks should only be broken when you are sure that the process
4831
4674
holding the lock has been stopped.
4832
4675
4833
You can get information on what locks are open via the 'bzr info
4834
[location]' command.
4676
You can get information on what locks are open via the 'bzr info' command.
4835
4677
4836
4678
:Examples:
4837
4679
bzr break-lock
4838
bzr break-lock bzr+ssh://example.com/bzr/foo
4839
4680
"""
4840
4681
takes_args = ['location?']
4841
4682
4850
4691
4851
4692
4852
4693
class cmd_wait_until_signalled(Command):
4853
__doc__ = """Test helper for test_start_and_stop_bzr_subprocess_send_signal.
4694
"""Test helper for test_start_and_stop_bzr_subprocess_send_signal.
4854
4695
4855
4696
This just prints a line to signal when it is ready, then blocks on stdin.
4856
4697
"""
4864
4705
4865
4706
4866
4707
class cmd_serve(Command):
4867
__doc__ = """Run the bzr server."""
4708
"""Run the bzr server."""
4868
4709
4869
4710
aliases = ['server']
4870
4711
4871
4712
takes_options = [
4872
4713
Option('inet',
4873
4714
help='Serve on stdin/out for use from inetd or sshd.'),
4874
RegistryOption('protocol',
4875
help="Protocol to serve.",
4715
RegistryOption('protocol',
4716
help="Protocol to serve.",
4876
4717
lazy_registry=('bzrlib.transport', 'transport_server_registry'),
4877
4718
value_switches=True),
4878
4719
Option('port',
4881
4722
'result in a dynamically allocated port. The default port '
4882
4723
'depends on the protocol.',
4883
4724
type=str),
4884
custom_help('directory',
4885
help='Serve contents of this directory.'),
4725
Option('directory',
4726
help='Serve contents of this directory.',
4727
type=unicode),
4886
4728
Option('allow-writes',
4887
4729
help='By default the server is a readonly server. Supplying '
4888
4730
'--allow-writes enables write access to the contents of '
4889
'the served directory and below. Note that ``bzr serve`` '
4890
'does not perform authentication, so unless some form of '
4891
'external authentication is arranged supplying this '
4892
'option leads to global uncontrolled write access to your '
4893
'file system.'
4731
'the served directory and below.'
4894
4732
),
4895
4733
]
4896
4734
4915
4753
4916
4754
def run(self, port=None, inet=False, directory=None, allow_writes=False,
4917
4755
protocol=None):
4918
from bzrlib import transport
4756
from bzrlib.transport import get_transport, transport_server_registry
4919
4757
if directory is None:
4920
4758
directory = os.getcwd()
4921
4759
if protocol is None:
4922
protocol = transport.transport_server_registry.get()
4760
protocol = transport_server_registry.get()
4923
4761
host, port = self.get_host_and_port(port)
4924
4762
url = urlutils.local_path_to_url(directory)
4925
4763
if not allow_writes:
4926
4764
url = 'readonly+' + url
4927
t = transport.get_transport(url)
4928
protocol(t, host, port, inet)
4765
transport = get_transport(url)
4766
protocol(transport, host, port, inet)
4929
4767
4930
4768
4931
4769
class cmd_join(Command):
4932
__doc__ = """Combine a tree into its containing tree.
4770
"""Combine a tree into its containing tree.
4933
4771
4934
4772
This command requires the target tree to be in a rich-root format.
4935
4773
4975
4813
4976
4814
4977
4815
class cmd_split(Command):
4978
__doc__ = """Split a subdirectory of a tree into a separate tree.
4816
"""Split a subdirectory of a tree into a separate tree.
4979
4817
4980
4818
This command will produce a target tree in a format that supports
4981
4819
rich roots, like 'rich-root' or 'rich-root-pack'. These formats cannot be
5001
4839
5002
4840
5003
4841
class cmd_merge_directive(Command):
5004
__doc__ = """Generate a merge directive for auto-merge tools.
4842
"""Generate a merge directive for auto-merge tools.
5005
4843
5006
4844
A directive requests a merge to be performed, and also provides all the
5007
4845
information necessary to do so. This means it must either include a
5024
4862
_see_also = ['send']
5025
4863
5026
4864
takes_options = [
5027
'directory',
5028
4865
RegistryOption.from_kwargs('patch-type',
5029
4866
'The type of patch to include in the directive.',
5030
4867
title='Patch type',
5043
4880
encoding_type = 'exact'
5044
4881
5045
4882
def run(self, submit_branch=None, public_branch=None, patch_type='bundle',
5046
sign=False, revision=None, mail_to=None, message=None,
5047
directory=u'.'):
4883
sign=False, revision=None, mail_to=None, message=None):
5048
4884
from bzrlib.revision import ensure_null, NULL_REVISION
5049
4885
include_patch, include_bundle = {
5050
4886
'plain': (False, False),
5051
4887
'diff': (True, False),
5052
4888
'bundle': (True, True),
5053
4889
}[patch_type]
5054
branch = Branch.open(directory)
4890
branch = Branch.open('.')
5055
4891
stored_submit_branch = branch.get_submit_branch()
5056
4892
if submit_branch is None:
5057
4893
submit_branch = stored_submit_branch
5102
4938
5103
4939
5104
4940
class cmd_send(Command):
5105
__doc__ = """Mail or create a merge-directive for submitting changes.
4941
"""Mail or create a merge-directive for submitting changes.
5106
4942
5107
4943
A merge directive provides many things needed for requesting merges:
5108
4944
5114
4950
directly from the merge directive, without retrieving data from a
5115
4951
branch.
5116
4952
5117
`bzr send` creates a compact data set that, when applied using bzr
5118
merge, has the same effect as merging from the source branch.
5119
5120
By default the merge directive is self-contained and can be applied to any
5121
branch containing submit_branch in its ancestory without needing access to
5122
the source branch.
5123
5124
If --no-bundle is specified, then Bazaar doesn't send the contents of the
5125
revisions, but only a structured request to merge from the
5126
public_location. In that case the public_branch is needed and it must be
5127
up-to-date and accessible to the recipient. The public_branch is always
5128
included if known, so that people can check it later.
5129
5130
The submit branch defaults to the parent of the source branch, but can be
5131
overridden. Both submit branch and public branch will be remembered in
5132
branch.conf the first time they are used for a particular branch. The
5133
source branch defaults to that containing the working directory, but can
5134
be changed using --from.
5135
5136
In order to calculate those changes, bzr must analyse the submit branch.
5137
Therefore it is most efficient for the submit branch to be a local mirror.
5138
If a public location is known for the submit_branch, that location is used
5139
in the merge directive.
5140
5141
The default behaviour is to send the merge directive by mail, unless -o is
5142
given, in which case it is sent to a file.
4953
If --no-bundle is specified, then public_branch is needed (and must be
4954
up-to-date), so that the receiver can perform the merge using the
4955
public_branch. The public_branch is always included if known, so that
4956
people can check it later.
4957
4958
The submit branch defaults to the parent, but can be overridden. Both
4959
submit branch and public branch will be remembered if supplied.
4960
4961
If a public_branch is known for the submit_branch, that public submit
4962
branch is used in the merge instructions. This means that a local mirror
4963
can be used as your actual submit branch, once you have set public_branch
4964
for that mirror.
5143
4965
5144
4966
Mail is sent using your preferred mail program. This should be transparent
5145
on Windows (it uses MAPI). On Unix, it requires the xdg-email utility.
4967
on Windows (it uses MAPI). On Linux, it requires the xdg-email utility.
5146
4968
If the preferred client can't be found (or used), your editor will be used.
5147
4969
5148
4970
To use a specific mail program, set the mail_client configuration option.
5149
4971
(For Thunderbird 1.5, this works around some bugs.) Supported values for
5150
specific clients are "claws", "evolution", "kmail", "mail.app" (MacOS X's
5151
Mail.app), "mutt", and "thunderbird"; generic options are "default",
5152
"editor", "emacsclient", "mapi", and "xdg-email". Plugins may also add
5153
supported clients.
4972
specific clients are "claws", "evolution", "kmail", "mutt", and
4973
"thunderbird"; generic options are "default", "editor", "emacsclient",
4974
"mapi", and "xdg-email". Plugins may also add supported clients.
5154
4975
5155
4976
If mail is being sent, a to address is required. This can be supplied
5156
4977
either on the commandline, by setting the submit_to configuration
5165
4986
5166
4987
The merge directives created by bzr send may be applied using bzr merge or
5167
4988
bzr pull by specifying a file containing a merge directive as the location.
5168
5169
bzr send makes extensive use of public locations to map local locations into
5170
URLs that can be used by other people. See `bzr help configuration` to
5171
set them, and use `bzr info` to display them.
5172
4989
"""
5173
4990
5174
4991
encoding_type = 'exact'
5190
5007
short_name='f',
5191
5008
type=unicode),
5192
5009
Option('output', short_name='o',
5193
help='Write merge directive to this file or directory; '
5010
help='Write merge directive to this file; '
5194
5011
'use - for stdout.',
5195
5012
type=unicode),
5196
5013
Option('strict',
5219
5036
5220
5037
5221
5038
class cmd_bundle_revisions(cmd_send):
5222
__doc__ = """Create a merge-directive for submitting changes.
5039
"""Create a merge-directive for submitting changes.
5223
5040
5224
5041
A merge directive provides many things needed for requesting merges:
5225
5042
5292
5109
5293
5110
5294
5111
class cmd_tag(Command):
5295
__doc__ = """Create, remove or modify a tag naming a revision.
5112
"""Create, remove or modify a tag naming a revision.
5296
5113
5297
5114
Tags give human-meaningful names to revisions. Commands that take a -r
5298
5115
(--revision) option can be given -rtag:X, where X is any previously
5306
5123
5307
5124
To rename a tag (change the name but keep it on the same revsion), run ``bzr
5308
5125
tag new-name -r tag:old-name`` and then ``bzr tag --delete oldname``.
5309
5310
If no tag name is specified it will be determined through the
5311
'automatic_tag_name' hook. This can e.g. be used to automatically tag
5312
upstream releases by reading configure.ac. See ``bzr help hooks`` for
5313
details.
5314
5126
"""
5315
5127
5316
5128
_see_also = ['commit', 'tags']
5317
takes_args = ['tag_name?']
5129
takes_args = ['tag_name']
5318
5130
takes_options = [
5319
5131
Option('delete',
5320
5132
help='Delete this tag rather than placing it.',
5321
5133
),
5322
custom_help('directory',
5323
help='Branch in which to place the tag.'),
5134
Option('directory',
5135
help='Branch in which to place the tag.',
5136
short_name='d',
5137
type=unicode,
5138
),
5324
5139
Option('force',
5325
5140
help='Replace existing tags.',
5326
5141
),
5327
5142
'revision',
5328
5143
]
5329
5144
5330
def run(self, tag_name=None,
5145
def run(self, tag_name,
5331
5146
delete=None,
5332
5147
directory='.',
5333
5148
force=None,
5334
5149
revision=None,
5335
5150
):
5336
5151
branch, relpath = Branch.open_containing(directory)
5337
self.add_cleanup(branch.lock_write().unlock)
5338
if delete:
5339
if tag_name is None:
5340
raise errors.BzrCommandError("No tag specified to delete.")
5341
branch.tags.delete_tag(tag_name)
5342
self.outf.write('Deleted tag %s.\n' % tag_name)
5343
else:
5344
if revision:
5345
if len(revision) != 1:
5346
raise errors.BzrCommandError(
5347
"Tags can only be placed on a single revision, "
5348
"not on a range")
5349
revision_id = revision[0].as_revision_id(branch)
5152
branch.lock_write()
5153
try:
5154
if delete:
5155
branch.tags.delete_tag(tag_name)
5156
self.outf.write('Deleted tag %s.\n' % tag_name)
5350
5157
else:
5351
revision_id = branch.last_revision()
5352
if tag_name is None:
5353
tag_name = branch.automatic_tag_name(revision_id)
5354
if tag_name is None:
5355
raise errors.BzrCommandError(
5356
"Please specify a tag name.")
5357
if (not force) and branch.tags.has_tag(tag_name):
5358
raise errors.TagAlreadyExists(tag_name)
5359
branch.tags.set_tag(tag_name, revision_id)
5360
self.outf.write('Created tag %s.\n' % tag_name)
5158
if revision:
5159
if len(revision) != 1:
5160
raise errors.BzrCommandError(
5161
"Tags can only be placed on a single revision, "
5162
"not on a range")
5163
revision_id = revision[0].as_revision_id(branch)
5164
else:
5165
revision_id = branch.last_revision()
5166
if (not force) and branch.tags.has_tag(tag_name):
5167
raise errors.TagAlreadyExists(tag_name)
5168
branch.tags.set_tag(tag_name, revision_id)
5169
self.outf.write('Created tag %s.\n' % tag_name)
5170
finally:
5171
branch.unlock()
5361
5172
5362
5173
5363
5174
class cmd_tags(Command):
5364
__doc__ = """List tags.
5175
"""List tags.
5365
5176
5366
5177
This command shows a table of tag names and the revisions they reference.
5367
5178
"""
5368
5179
5369
5180
_see_also = ['tag']
5370
5181
takes_options = [
5371
custom_help('directory',
5372
help='Branch whose tags should be displayed.'),
5182
Option('directory',
5183
help='Branch whose tags should be displayed.',
5184
short_name='d',
5185
type=unicode,
5186
),
5373
5187
RegistryOption.from_kwargs('sort',
5374
5188
'Sort tags by different criteria.', title='Sorting',
5375
5189
alpha='Sort tags lexicographically (default).',
5392
5206
if not tags:
5393
5207
return
5394
5208
5395
self.add_cleanup(branch.lock_read().unlock)
5396
if revision:
5397
graph = branch.repository.get_graph()
5398
rev1, rev2 = _get_revision_range(revision, branch, self.name())
5399
revid1, revid2 = rev1.rev_id, rev2.rev_id
5400
# only show revisions between revid1 and revid2 (inclusive)
5401
tags = [(tag, revid) for tag, revid in tags if
5402
graph.is_between(revid, revid1, revid2)]
5403
if sort == 'alpha':
5404
tags.sort()
5405
elif sort == 'time':
5406
timestamps = {}
5407
for tag, revid in tags:
5408
try:
5409
revobj = branch.repository.get_revision(revid)
5410
except errors.NoSuchRevision:
5411
timestamp = sys.maxint # place them at the end
5412
else:
5413
timestamp = revobj.timestamp
5414
timestamps[revid] = timestamp
5415
tags.sort(key=lambda x: timestamps[x[1]])
5416
if not show_ids:
5417
# [ (tag, revid), ... ] -> [ (tag, dotted_revno), ... ]
5418
for index, (tag, revid) in enumerate(tags):
5419
try:
5420
revno = branch.revision_id_to_dotted_revno(revid)
5421
if isinstance(revno, tuple):
5422
revno = '.'.join(map(str, revno))
5423
except errors.NoSuchRevision:
5424
# Bad tag data/merges can lead to tagged revisions
5425
# which are not in this branch. Fail gracefully ...
5426
revno = '?'
5427
tags[index] = (tag, revno)
5428
self.cleanup_now()
5209
branch.lock_read()
5210
try:
5211
if revision:
5212
graph = branch.repository.get_graph()
5213
rev1, rev2 = _get_revision_range(revision, branch, self.name())
5214
revid1, revid2 = rev1.rev_id, rev2.rev_id
5215
# only show revisions between revid1 and revid2 (inclusive)
5216
tags = [(tag, revid) for tag, revid in tags if
5217
graph.is_between(revid, revid1, revid2)]
5218
if sort == 'alpha':
5219
tags.sort()
5220
elif sort == 'time':
5221
timestamps = {}
5222
for tag, revid in tags:
5223
try:
5224
revobj = branch.repository.get_revision(revid)
5225
except errors.NoSuchRevision:
5226
timestamp = sys.maxint # place them at the end
5227
else:
5228
timestamp = revobj.timestamp
5229
timestamps[revid] = timestamp
5230
tags.sort(key=lambda x: timestamps[x[1]])
5231
if not show_ids:
5232
# [ (tag, revid), ... ] -> [ (tag, dotted_revno), ... ]
5233
for index, (tag, revid) in enumerate(tags):
5234
try:
5235
revno = branch.revision_id_to_dotted_revno(revid)
5236
if isinstance(revno, tuple):
5237
revno = '.'.join(map(str, revno))
5238
except errors.NoSuchRevision:
5239
# Bad tag data/merges can lead to tagged revisions
5240
# which are not in this branch. Fail gracefully ...
5241
revno = '?'
5242
tags[index] = (tag, revno)
5243
finally:
5244
branch.unlock()
5429
5245
for tag, revspec in tags:
5430
5246
self.outf.write('%-20s %s\n' % (tag, revspec))
5431
5247
5432
5248
5433
5249
class cmd_reconfigure(Command):
5434
__doc__ = """Reconfigure the type of a bzr directory.
5250
"""Reconfigure the type of a bzr directory.
5435
5251
5436
5252
A target configuration must be specified.
5437
5253
5522
5338
5523
5339
5524
5340
class cmd_switch(Command):
5525
__doc__ = """Set the branch of a checkout and update.
5341
"""Set the branch of a checkout and update.
5526
5342
5527
5343
For lightweight checkouts, this changes the branch being referenced.
5528
5344
For heavyweight checkouts, this checks that there are no local commits
5540
5356
/path/to/newbranch.
5541
5357
5542
5358
Bound branches use the nickname of its master branch unless it is set
5543
locally, in which case switching will update the local nickname to be
5359
locally, in which case switching will update the the local nickname to be
5544
5360
that of the master.
5545
5361
"""
5546
5362
5547
takes_args = ['to_location?']
5548
takes_options = ['directory',
5549
Option('force',
5363
takes_args = ['to_location']
5364
takes_options = [Option('force',
5550
5365
help='Switch even if local commits will be lost.'),
5551
'revision',
5552
5366
Option('create-branch', short_name='b',
5553
5367
help='Create the target branch from this one before'
5554
5368
' switching to it.'),
5555
]
5369
]
5556
5370
5557
def run(self, to_location=None, force=False, create_branch=False,
5558
revision=None, directory=u'.'):
5371
def run(self, to_location, force=False, create_branch=False):
5559
5372
from bzrlib import switch
5560
tree_location = directory
5561
revision = _get_one_revision('switch', revision)
5373
tree_location = '.'
5562
5374
control_dir = bzrdir.BzrDir.open_containing(tree_location)[0]
5563
if to_location is None:
5564
if revision is None:
5565
raise errors.BzrCommandError('You must supply either a'
5566
' revision or a location')
5567
to_location = tree_location
5568
5375
try:
5569
5376
branch = control_dir.open_branch()
5570
5377
had_explicit_nick = branch.get_config().has_explicit_nickname()
5575
5382
if branch is None:
5576
5383
raise errors.BzrCommandError('cannot create branch without'
5577
5384
' source branch')
5578
to_location = directory_service.directories.dereference(
5579
to_location)
5580
5385
if '/' not in to_location and '\\' not in to_location:
5581
5386
# This path is meant to be relative to the existing branch
5582
5387
this_url = self._get_branch_location(control_dir)
5584
5389
to_branch = branch.bzrdir.sprout(to_location,
5585
5390
possible_transports=[branch.bzrdir.root_transport],
5586
5391
source_branch=branch).open_branch()
5392
# try:
5393
# from_branch = control_dir.open_branch()
5394
# except errors.NotBranchError:
5395
# raise BzrCommandError('Cannot create a branch from this'
5396
# ' location when we cannot open this branch')
5397
# from_branch.bzrdir.sprout(
5398
pass
5587
5399
else:
5588
5400
try:
5589
5401
to_branch = Branch.open(to_location)
5591
5403
this_url = self._get_branch_location(control_dir)
5592
5404
to_branch = Branch.open(
5593
5405
urlutils.join(this_url, '..', to_location))
5594
if revision is not None:
5595
revision = revision.as_revision_id(to_branch)
5596
switch.switch(control_dir, to_branch, force, revision_id=revision)
5406
switch.switch(control_dir, to_branch, force)
5597
5407
if had_explicit_nick:
5598
5408
branch = control_dir.open_branch() #get the new branch!
5599
5409
branch.nick = to_branch.nick
5619
5429
5620
5430
5621
5431
class cmd_view(Command):
5622
__doc__ = """Manage filtered views.
5432
"""Manage filtered views.
5623
5433
5624
5434
Views provide a mask over the tree so that users can focus on
5625
5435
a subset of a tree when doing their work. After creating a view,
5773
5583
5774
5584
5775
5585
class cmd_hooks(Command):
5776
__doc__ = """Show hooks."""
5586
"""Show hooks."""
5777
5587
5778
5588
hidden = True
5779
5589
5792
5602
self.outf.write(" <no hooks installed>\n")
5793
5603
5794
5604
5795
class cmd_remove_branch(Command):
5796
__doc__ = """Remove a branch.
5797
5798
This will remove the branch from the specified location but
5799
will keep any working tree or repository in place.
5800
5801
:Examples:
5802
5803
Remove the branch at repo/trunk::
5804
5805
bzr remove-branch repo/trunk
5806
5807
"""
5808
5809
takes_args = ["location?"]
5810
5811
aliases = ["rmbranch"]
5812
5813
def run(self, location=None):
5814
if location is None:
5815
location = "."
5816
branch = Branch.open_containing(location)[0]
5817
branch.bzrdir.destroy_branch()
5818
5819
5820
5605
class cmd_shelve(Command):
5821
__doc__ = """Temporarily set aside some changes from the current tree.
5606
"""Temporarily set aside some changes from the current tree.
5822
5607
5823
5608
Shelve allows you to temporarily put changes you've made "on the shelf",
5824
5609
ie. out of the way, until a later time when you can bring them back from
5845
5630
takes_args = ['file*']
5846
5631
5847
5632
takes_options = [
5848
'directory',
5849
5633
'revision',
5850
5634
Option('all', help='Shelve all changes.'),
5851
5635
'message',
5860
5644
_see_also = ['unshelve']
5861
5645
5862
5646
def run(self, revision=None, all=False, file_list=None, message=None,
5863
writer=None, list=False, destroy=False, directory=u'.'):
5647
writer=None, list=False, destroy=False):
5864
5648
if list:
5865
5649
return self.run_for_list()
5866
5650
from bzrlib.shelf_ui import Shelver
5868
5652
writer = bzrlib.option.diff_writer_registry.get()
5869
5653
try:
5870
5654
shelver = Shelver.from_args(writer(sys.stdout), revision, all,
5871
file_list, message, destroy=destroy, directory=directory)
5655
file_list, message, destroy=destroy)
5872
5656
try:
5873
5657
shelver.run()
5874
5658
finally:
5875
shelver.finalize()
5659
shelver.work_tree.unlock()
5876
5660
except errors.UserAbort:
5877
5661
return 0
5878
5662
5879
5663
def run_for_list(self):
5880
5664
tree = WorkingTree.open_containing('.')[0]
5881
self.add_cleanup(tree.lock_read().unlock)
5882
manager = tree.get_shelf_manager()
5883
shelves = manager.active_shelves()
5884
if len(shelves) == 0:
5885
note('No shelved changes.')
5886
return 0
5887
for shelf_id in reversed(shelves):
5888
message = manager.get_metadata(shelf_id).get('message')
5889
if message is None:
5890
message = '<no message>'
5891
self.outf.write('%3d: %s\n' % (shelf_id, message))
5892
return 1
5665
tree.lock_read()
5666
try:
5667
manager = tree.get_shelf_manager()
5668
shelves = manager.active_shelves()
5669
if len(shelves) == 0:
5670
note('No shelved changes.')
5671
return 0
5672
for shelf_id in reversed(shelves):
5673
message = manager.get_metadata(shelf_id).get('message')
5674
if message is None:
5675
message = '<no message>'
5676
self.outf.write('%3d: %s\n' % (shelf_id, message))
5677
return 1
5678
finally:
5679
tree.unlock()
5893
5680
5894
5681
5895
5682
class cmd_unshelve(Command):
5896
__doc__ = """Restore shelved changes.
5683
"""Restore shelved changes.
5897
5684
5898
5685
By default, the most recently shelved changes are restored. However if you
5899
5686
specify a shelf by id those changes will be restored instead. This works
5902
5689
5903
5690
takes_args = ['shelf_id?']
5904
5691
takes_options = [
5905
'directory',
5906
5692
RegistryOption.from_kwargs(
5907
5693
'action', help="The action to perform.",
5908
5694
enum_switch=False, value_switches=True,
5909
5695
apply="Apply changes and remove from the shelf.",
5910
5696
dry_run="Show changes, but do not apply or remove them.",
5911
preview="Instead of unshelving the changes, show the diff that "
5912
"would result from unshelving.",
5913
delete_only="Delete changes without applying them.",
5914
keep="Apply changes but don't delete them.",
5697
delete_only="Delete changes without applying them."
5915
5698
)
5916
5699
]
5917
5700
_see_also = ['shelve']
5918
5701
5919
def run(self, shelf_id=None, action='apply', directory=u'.'):
5702
def run(self, shelf_id=None, action='apply'):
5920
5703
from bzrlib.shelf_ui import Unshelver
5921
unshelver = Unshelver.from_args(shelf_id, action, directory=directory)
5704
unshelver = Unshelver.from_args(shelf_id, action)
5922
5705
try:
5923
5706
unshelver.run()
5924
5707
finally:
5926
5709
5927
5710
5928
5711
class cmd_clean_tree(Command):
5929
__doc__ = """Remove unwanted files from working tree.
5712
"""Remove unwanted files from working tree.
5930
5713
5931
5714
By default, only unknown files, not ignored files, are deleted. Versioned
5932
5715
files are never deleted.
5940
5723
5941
5724
To check what clean-tree will do, use --dry-run.
5942
5725
"""
5943
takes_options = ['directory',
5944
Option('ignored', help='Delete all ignored files.'),
5726
takes_options = [Option('ignored', help='Delete all ignored files.'),
5945
5727
Option('detritus', help='Delete conflict files, merge'
5946
5728
' backups, and failed selftest dirs.'),
5947
5729
Option('unknown',
5950
5732
' deleting them.'),
5951
5733
Option('force', help='Do not prompt before deleting.')]
5952
5734
def run(self, unknown=False, ignored=False, detritus=False, dry_run=False,
5953
force=False, directory=u'.'):
5735
force=False):
5954
5736
from bzrlib.clean_tree import clean_tree
5955
5737
if not (unknown or ignored or detritus):
5956
5738
unknown = True
5957
5739
if dry_run:
5958
5740
force = True
5959
clean_tree(directory, unknown=unknown, ignored=ignored,
5960
detritus=detritus, dry_run=dry_run, no_prompt=force)
5741
clean_tree('.', unknown=unknown, ignored=ignored, detritus=detritus,
5742
dry_run=dry_run, no_prompt=force)
5961
5743
5962
5744
5963
5745
class cmd_reference(Command):
5964
__doc__ = """list, view and set branch locations for nested trees.
5746
"""list, view and set branch locations for nested trees.
5965
5747
5966
5748
If no arguments are provided, lists the branch locations for nested trees.
5967
5749
If one argument is provided, display the branch location for that tree.
6007
5789
self.outf.write('%s %s\n' % (path, location))
6008
5790
6009
5791
6010
def _register_lazy_builtins():
6011
# register lazy builtins from other modules; called at startup and should
6012
# be only called once.
6013
for (name, aliases, module_name) in [
6014
('cmd_bundle_info', [], 'bzrlib.bundle.commands'),
6015
('cmd_dpush', [], 'bzrlib.foreign'),
6016
('cmd_version_info', [], 'bzrlib.cmd_version_info'),
6017
('cmd_resolve', ['resolved'], 'bzrlib.conflicts'),
6018
('cmd_conflicts', [], 'bzrlib.conflicts'),
6019
('cmd_sign_my_commits', [], 'bzrlib.sign_my_commits'),
6020
]:
6021
builtin_command_registry.register_lazy(name, aliases, module_name)
5792
# these get imported and then picked up by the scan for cmd_*
5793
# TODO: Some more consistent way to split command definitions across files;
5794
# we do need to load at least some information about them to know of
5795
# aliases. ideally we would avoid loading the implementation until the
5796
# details were needed.
5797
from bzrlib.cmd_version_info import cmd_version_info
5798
from bzrlib.conflicts import cmd_resolve, cmd_conflicts, restore
5799
from bzrlib.bundle.commands import (
5800
cmd_bundle_info,
5801
)
5802
from bzrlib.foreign import cmd_dpush
5803
from bzrlib.sign_my_commits import cmd_sign_my_commits
5804
from bzrlib.weave_commands import cmd_versionedfile_list, \
5805
cmd_weave_plan_merge, cmd_weave_merge_text
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0