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