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