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 4711.1.2
- compare with another revision
- download diff
- download tarball
- view history from revision 4711.1.2
- Committer: Martin Pool
- Date: 2009-09-23 04:54:41 UTC
- mto: This revision was merged to the branch mainline in revision 4745.
- Revision ID: mbp@sourcefrog.net-20090923045441-80j9qcur76c9xjor
Start adding tests.per_uifactory
- files added:
- bzrlib/textui.py
- files removed:
- .testr.conf
- apport
- bzrlib/help_topics/es
- bzrlib/plugins/news_merge
- bzrlib/plugins/news_merge/tests
- bzrlib/tests/per_bzrdir_colo
- bzrlib/tests/per_foreign_vcs
- 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
if (working.has_changes(working.basis_tree())
465
or len(working.get_parent_ids()) > 1):
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
1336
1332
except errors.NoWorkingTree:
1337
1333
source.bzrdir.create_workingtree(revision_id)
1338
1334
return
1339
1340
if not lightweight:
1341
message = ('Copying history to "%s". '
1342
'To checkout without local history use --lightweight.' % to_location)
1343
ui.ui_factory.show_message(message)
1344
1335
source.create_checkout(to_location, revision_id, lightweight,
1345
1336
accelerator_tree, hardlink)
1346
1337
1347
1338
1348
1339
class cmd_renames(Command):
1349
__doc__ = """Show list of renamed files.
1340
"""Show list of renamed files.
1350
1341
"""
1351
1342
# TODO: Option to show renames between two historical versions.
1352
1343
1357
1348
@display_command
1358
1349
def run(self, dir=u'.'):
1359
1350
tree = WorkingTree.open_containing(dir)[0]
1360
self.add_cleanup(tree.lock_read().unlock)
1361
new_inv = tree.inventory
1362
old_tree = tree.basis_tree()
1363
self.add_cleanup(old_tree.lock_read().unlock)
1364
old_inv = old_tree.inventory
1365
renames = []
1366
iterator = tree.iter_changes(old_tree, include_unchanged=True)
1367
for f, paths, c, v, p, n, k, e in iterator:
1368
if paths[0] == paths[1]:
1369
continue
1370
if None in (paths):
1371
continue
1372
renames.append(paths)
1373
renames.sort()
1374
for old_name, new_name in renames:
1375
self.outf.write("%s => %s\n" % (old_name, new_name))
1351
tree.lock_read()
1352
try:
1353
new_inv = tree.inventory
1354
old_tree = tree.basis_tree()
1355
old_tree.lock_read()
1356
try:
1357
old_inv = old_tree.inventory
1358
renames = []
1359
iterator = tree.iter_changes(old_tree, include_unchanged=True)
1360
for f, paths, c, v, p, n, k, e in iterator:
1361
if paths[0] == paths[1]:
1362
continue
1363
if None in (paths):
1364
continue
1365
renames.append(paths)
1366
renames.sort()
1367
for old_name, new_name in renames:
1368
self.outf.write("%s => %s\n" % (old_name, new_name))
1369
finally:
1370
old_tree.unlock()
1371
finally:
1372
tree.unlock()
1376
1373
1377
1374
1378
1375
class cmd_update(Command):
1379
__doc__ = """Update a tree to have the latest code committed to its branch.
1376
"""Update a tree to have the latest code committed to its branch.
1380
1377
1381
1378
This will perform a merge into the working tree, and may generate
1382
1379
conflicts. If you have any local changes, you will still
1384
1381
1385
1382
If you want to discard your local changes, you can just do a
1386
1383
'bzr revert' instead of 'bzr commit' after the update.
1387
1388
If the tree's branch is bound to a master branch, it will also update
1389
the branch from the master.
1390
1384
"""
1391
1385
1392
1386
_see_also = ['pull', 'working-trees', 'status-flags']
1393
1387
takes_args = ['dir?']
1394
takes_options = ['revision']
1395
1388
aliases = ['up']
1396
1389
1397
def run(self, dir='.', revision=None):
1398
if revision is not None and len(revision) != 1:
1399
raise errors.BzrCommandError(
1400
"bzr update --revision takes exactly one revision")
1390
def run(self, dir='.'):
1401
1391
tree = WorkingTree.open_containing(dir)[0]
1402
branch = tree.branch
1403
1392
possible_transports = []
1404
master = branch.get_master_branch(
1393
master = tree.branch.get_master_branch(
1405
1394
possible_transports=possible_transports)
1406
1395
if master is not None:
1407
branch_location = master.base
1408
1396
tree.lock_write()
1409
1397
else:
1410
branch_location = tree.branch.base
1411
1398
tree.lock_tree_write()
1412
self.add_cleanup(tree.unlock)
1413
# get rid of the final '/' and be ready for display
1414
branch_location = urlutils.unescape_for_display(
1415
branch_location.rstrip('/'),
1416
self.outf.encoding)
1417
existing_pending_merges = tree.get_parent_ids()[1:]
1418
if master is None:
1419
old_tip = None
1420
else:
1421
# may need to fetch data into a heavyweight checkout
1422
# XXX: this may take some time, maybe we should display a
1423
# message
1424
old_tip = branch.update(possible_transports)
1425
if revision is not None:
1426
revision_id = revision[0].as_revision_id(branch)
1427
else:
1428
revision_id = branch.last_revision()
1429
if revision_id == _mod_revision.ensure_null(tree.last_revision()):
1430
revno = branch.revision_id_to_dotted_revno(revision_id)
1431
note("Tree is up to date at revision %s of branch %s" %
1432
('.'.join(map(str, revno)), branch_location))
1433
return 0
1434
view_info = _get_view_info_for_change_reporter(tree)
1435
change_reporter = delta._ChangeReporter(
1436
unversioned_filter=tree.is_ignored,
1437
view_info=view_info)
1438
1399
try:
1400
existing_pending_merges = tree.get_parent_ids()[1:]
1401
last_rev = _mod_revision.ensure_null(tree.last_revision())
1402
if last_rev == _mod_revision.ensure_null(
1403
tree.branch.last_revision()):
1404
# may be up to date, check master too.
1405
if master is None or last_rev == _mod_revision.ensure_null(
1406
master.last_revision()):
1407
revno = tree.branch.revision_id_to_revno(last_rev)
1408
note("Tree is up to date at revision %d." % (revno,))
1409
return 0
1410
view_info = _get_view_info_for_change_reporter(tree)
1439
1411
conflicts = tree.update(
1440
change_reporter,
1441
possible_transports=possible_transports,
1442
revision=revision_id,
1443
old_tip=old_tip)
1444
except errors.NoSuchRevision, e:
1445
raise errors.BzrCommandError(
1446
"branch has no revision %s\n"
1447
"bzr update --revision only works"
1448
" for a revision in the branch history"
1449
% (e.revision))
1450
revno = tree.branch.revision_id_to_dotted_revno(
1451
_mod_revision.ensure_null(tree.last_revision()))
1452
note('Updated to revision %s of branch %s' %
1453
('.'.join(map(str, revno)), branch_location))
1454
parent_ids = tree.get_parent_ids()
1455
if parent_ids[1:] and parent_ids[1:] != existing_pending_merges:
1456
note('Your local commits will now show as pending merges with '
1457
"'bzr status', and can be committed with 'bzr commit'.")
1458
if conflicts != 0:
1459
return 1
1460
else:
1461
return 0
1412
delta._ChangeReporter(unversioned_filter=tree.is_ignored,
1413
view_info=view_info), possible_transports=possible_transports)
1414
revno = tree.branch.revision_id_to_revno(
1415
_mod_revision.ensure_null(tree.last_revision()))
1416
note('Updated to revision %d.' % (revno,))
1417
if tree.get_parent_ids()[1:] != existing_pending_merges:
1418
note('Your local commits will now show as pending merges with '
1419
"'bzr status', and can be committed with 'bzr commit'.")
1420
if conflicts != 0:
1421
return 1
1422
else:
1423
return 0
1424
finally:
1425
tree.unlock()
1462
1426
1463
1427
1464
1428
class cmd_info(Command):
1465
__doc__ = """Show information about a working tree, branch or repository.
1429
"""Show information about a working tree, branch or repository.
1466
1430
1467
1431
This command will show all known locations and formats associated to the
1468
1432
tree, branch or repository.
1506
1470
1507
1471
1508
1472
class cmd_remove(Command):
1509
__doc__ = """Remove files or directories.
1473
"""Remove files or directories.
1510
1474
1511
1475
This makes bzr stop tracking changes to the specified files. bzr will delete
1512
1476
them if they can easily be recovered using revert. If no options or
1534
1498
if file_list is not None:
1535
1499
file_list = [f for f in file_list]
1536
1500
1537
self.add_cleanup(tree.lock_write().unlock)
1538
# Heuristics should probably all move into tree.remove_smart or
1539
# some such?
1540
if new:
1541
added = tree.changes_from(tree.basis_tree(),
1542
specific_files=file_list).added
1543
file_list = sorted([f[0] for f in added], reverse=True)
1544
if len(file_list) == 0:
1545
raise errors.BzrCommandError('No matching files.')
1546
elif file_list is None:
1547
# missing files show up in iter_changes(basis) as
1548
# versioned-with-no-kind.
1549
missing = []
1550
for change in tree.iter_changes(tree.basis_tree()):
1551
# Find paths in the working tree that have no kind:
1552
if change[1][1] is not None and change[6][1] is None:
1553
missing.append(change[1][1])
1554
file_list = sorted(missing, reverse=True)
1555
file_deletion_strategy = 'keep'
1556
tree.remove(file_list, verbose=verbose, to_file=self.outf,
1557
keep_files=file_deletion_strategy=='keep',
1558
force=file_deletion_strategy=='force')
1501
tree.lock_write()
1502
try:
1503
# Heuristics should probably all move into tree.remove_smart or
1504
# some such?
1505
if new:
1506
added = tree.changes_from(tree.basis_tree(),
1507
specific_files=file_list).added
1508
file_list = sorted([f[0] for f in added], reverse=True)
1509
if len(file_list) == 0:
1510
raise errors.BzrCommandError('No matching files.')
1511
elif file_list is None:
1512
# missing files show up in iter_changes(basis) as
1513
# versioned-with-no-kind.
1514
missing = []
1515
for change in tree.iter_changes(tree.basis_tree()):
1516
# Find paths in the working tree that have no kind:
1517
if change[1][1] is not None and change[6][1] is None:
1518
missing.append(change[1][1])
1519
file_list = sorted(missing, reverse=True)
1520
file_deletion_strategy = 'keep'
1521
tree.remove(file_list, verbose=verbose, to_file=self.outf,
1522
keep_files=file_deletion_strategy=='keep',
1523
force=file_deletion_strategy=='force')
1524
finally:
1525
tree.unlock()
1559
1526
1560
1527
1561
1528
class cmd_file_id(Command):
1562
__doc__ = """Print file_id of a particular file or directory.
1529
"""Print file_id of a particular file or directory.
1563
1530
1564
1531
The file_id is assigned when the file is first added and remains the
1565
1532
same through all revisions where the file exists, even when it is
1581
1548
1582
1549
1583
1550
class cmd_file_path(Command):
1584
__doc__ = """Print path of file_ids to a file or directory.
1551
"""Print path of file_ids to a file or directory.
1585
1552
1586
1553
This prints one line for each directory down to the target,
1587
1554
starting at the branch root.
1603
1570
1604
1571
1605
1572
class cmd_reconcile(Command):
1606
__doc__ = """Reconcile bzr metadata in a branch.
1573
"""Reconcile bzr metadata in a branch.
1607
1574
1608
1575
This can correct data mismatches that may have been caused by
1609
1576
previous ghost operations or bzr upgrades. You should only
1631
1598
1632
1599
1633
1600
class cmd_revision_history(Command):
1634
__doc__ = """Display the list of revision ids on a branch."""
1601
"""Display the list of revision ids on a branch."""
1635
1602
1636
1603
_see_also = ['log']
1637
1604
takes_args = ['location?']
1647
1614
1648
1615
1649
1616
class cmd_ancestry(Command):
1650
__doc__ = """List all revisions merged into this branch."""
1617
"""List all revisions merged into this branch."""
1651
1618
1652
1619
_see_also = ['log', 'revision-history']
1653
1620
takes_args = ['location?']
1672
1639
1673
1640
1674
1641
class cmd_init(Command):
1675
__doc__ = """Make a directory into a versioned branch.
1642
"""Make a directory into a versioned branch.
1676
1643
1677
1644
Use this to create an empty branch, or before importing an
1678
1645
existing project.
1781
1748
1782
1749
1783
1750
class cmd_init_repository(Command):
1784
__doc__ = """Create a shared repository for branches to share storage space.
1751
"""Create a shared repository to hold branches.
1785
1752
1786
1753
New branches created under the repository directory will store their
1787
revisions in the repository, not in the branch directory. For branches
1788
with shared history, this reduces the amount of storage needed and
1789
speeds up the creation of new branches.
1754
revisions in the repository, not in the branch directory.
1790
1755
1791
If the --no-trees option is given then the branches in the repository
1792
will not have working trees by default. They will still exist as
1793
directories on disk, but they will not have separate copies of the
1794
files at a certain revision. This can be useful for repositories that
1795
store branches which are interacted with through checkouts or remote
1796
branches, such as on a server.
1756
If the --no-trees option is used then the branches in the repository
1757
will not have working trees by default.
1797
1758
1798
1759
:Examples:
1799
Create a shared repository holding just branches::
1760
Create a shared repositories holding just branches::
1800
1761
1801
1762
bzr init-repo --no-trees repo
1802
1763
bzr init repo/trunk
1841
1802
1842
1803
1843
1804
class cmd_diff(Command):
1844
__doc__ = """Show differences in the working tree, between revisions or branches.
1805
"""Show differences in the working tree, between revisions or branches.
1845
1806
1846
1807
If no arguments are given, all changes for the current tree are listed.
1847
1808
If files are given, only the changes in those files are listed.
1868
1829
1869
1830
bzr diff -r1
1870
1831
1871
Difference between revision 3 and revision 1::
1872
1873
bzr diff -r1..3
1874
1875
Difference between revision 3 and revision 1 for branch xxx::
1876
1877
bzr diff -r1..3 xxx
1878
1879
To see the changes introduced in revision X::
1880
1881
bzr diff -cX
1882
1883
Note that in the case of a merge, the -c option shows the changes
1884
compared to the left hand parent. To see the changes against
1885
another parent, use::
1886
1887
bzr diff -r<chosen_parent>..X
1888
1889
The changes introduced by revision 2 (equivalent to -r1..2)::
1890
1891
bzr diff -c2
1832
Difference between revision 2 and revision 1::
1833
1834
bzr diff -r1..2
1835
1836
Difference between revision 2 and revision 1 for branch xxx::
1837
1838
bzr diff -r1..2 xxx
1892
1839
1893
1840
Show just the differences for file NEWS::
1894
1841
1933
1880
help='Use this command to compare files.',
1934
1881
type=unicode,
1935
1882
),
1936
RegistryOption('format',
1937
help='Diff format to use.',
1938
lazy_registry=('bzrlib.diff', 'format_registry'),
1939
value_switches=False, title='Diff format'),
1940
1883
]
1941
1884
aliases = ['di', 'dif']
1942
1885
encoding_type = 'exact'
1943
1886
1944
1887
@display_command
1945
1888
def run(self, revision=None, file_list=None, diff_options=None,
1946
prefix=None, old=None, new=None, using=None, format=None):
1947
from bzrlib.diff import (get_trees_and_branches_to_diff_locked,
1948
show_diff_trees)
1889
prefix=None, old=None, new=None, using=None):
1890
from bzrlib.diff import _get_trees_to_diff, show_diff_trees
1949
1891
1950
1892
if (prefix is None) or (prefix == '0'):
1951
1893
# diff -p0 format
1965
1907
raise errors.BzrCommandError('bzr diff --revision takes exactly'
1966
1908
' one or two revision specifiers')
1967
1909
1968
if using is not None and format is not None:
1969
raise errors.BzrCommandError('--using and --format are mutually '
1970
'exclusive.')
1971
1972
(old_tree, new_tree,
1973
old_branch, new_branch,
1974
specific_files, extra_trees) = get_trees_and_branches_to_diff_locked(
1975
file_list, revision, old, new, self.add_cleanup, apply_view=True)
1910
old_tree, new_tree, specific_files, extra_trees = \
1911
_get_trees_to_diff(file_list, revision, old, new,
1912
apply_view=True)
1976
1913
return show_diff_trees(old_tree, new_tree, sys.stdout,
1977
1914
specific_files=specific_files,
1978
1915
external_diff_options=diff_options,
1979
1916
old_label=old_label, new_label=new_label,
1980
extra_trees=extra_trees, using=using,
1981
format_cls=format)
1917
extra_trees=extra_trees, using=using)
1982
1918
1983
1919
1984
1920
class cmd_deleted(Command):
1985
__doc__ = """List files deleted in the working tree.
1921
"""List files deleted in the working tree.
1986
1922
"""
1987
1923
# TODO: Show files deleted since a previous revision, or
1988
1924
# between two revisions.
1991
1927
# level of effort but possibly much less IO. (Or possibly not,
1992
1928
# if the directories are very large...)
1993
1929
_see_also = ['status', 'ls']
1994
takes_options = ['directory', 'show-ids']
1930
takes_options = ['show-ids']
1995
1931
1996
1932
@display_command
1997
def run(self, show_ids=False, directory=u'.'):
1998
tree = WorkingTree.open_containing(directory)[0]
1999
self.add_cleanup(tree.lock_read().unlock)
2000
old = tree.basis_tree()
2001
self.add_cleanup(old.lock_read().unlock)
2002
for path, ie in old.inventory.iter_entries():
2003
if not tree.has_id(ie.file_id):
2004
self.outf.write(path)
2005
if show_ids:
2006
self.outf.write(' ')
2007
self.outf.write(ie.file_id)
2008
self.outf.write('\n')
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()
2009
1951
2010
1952
2011
1953
class cmd_modified(Command):
2012
__doc__ = """List files modified in working tree.
1954
"""List files modified in working tree.
2013
1955
"""
2014
1956
2015
1957
hidden = True
2016
1958
_see_also = ['status', 'ls']
2017
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
]
2018
1964
2019
1965
@display_command
2020
def run(self, null=False, directory=u'.'):
2021
tree = WorkingTree.open_containing(directory)[0]
1966
def run(self, null=False):
1967
tree = WorkingTree.open_containing(u'.')[0]
2022
1968
td = tree.changes_from(tree.basis_tree())
2023
1969
for path, id, kind, text_modified, meta_modified in td.modified:
2024
1970
if null:
2028
1974
2029
1975
2030
1976
class cmd_added(Command):
2031
__doc__ = """List files added in working tree.
1977
"""List files added in working tree.
2032
1978
"""
2033
1979
2034
1980
hidden = True
2035
1981
_see_also = ['status', 'ls']
2036
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
]
2037
1987
2038
1988
@display_command
2039
def run(self, null=False, directory=u'.'):
2040
wt = WorkingTree.open_containing(directory)[0]
2041
self.add_cleanup(wt.lock_read().unlock)
2042
basis = wt.basis_tree()
2043
self.add_cleanup(basis.lock_read().unlock)
2044
basis_inv = basis.inventory
2045
inv = wt.inventory
2046
for file_id in inv:
2047
if file_id in basis_inv:
2048
continue
2049
if inv.is_root(file_id) and len(basis_inv) == 0:
2050
continue
2051
path = inv.id2path(file_id)
2052
if not os.access(osutils.pathjoin(wt.basedir, path), os.F_OK):
2053
continue
2054
if null:
2055
self.outf.write(path + '\0')
2056
else:
2057
self.outf.write(osutils.quotefn(path) + '\n')
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()
2058
2014
2059
2015
2060
2016
class cmd_root(Command):
2061
__doc__ = """Show the tree root directory.
2017
"""Show the tree root directory.
2062
2018
2063
2019
The root is the nearest enclosing directory with a .bzr control
2064
2020
directory."""
2088
2044
2089
2045
2090
2046
class cmd_log(Command):
2091
__doc__ = """Show historical log for a branch or subset of a branch.
2047
"""Show historical log for a branch or subset of a branch.
2092
2048
2093
2049
log is bzr's default tool for exploring the history of a branch.
2094
2050
The branch to use is taken from the first parameter. If no parameters
2205
2161
:Tips & tricks:
2206
2162
2207
2163
GUI tools and IDEs are often better at exploring history than command
2208
line tools: you may prefer qlog or viz from qbzr or bzr-gtk, the
2209
bzr-explorer shell, or the Loggerhead web interface. See the Plugin
2210
Guide <http://doc.bazaar.canonical.com/plugins/en/> and
2211
<http://wiki.bazaar.canonical.com/IDEIntegration>.
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.
2212
2171
2213
2172
You may find it useful to add the aliases below to ``bazaar.conf``::
2214
2173
2255
2214
help='Show just the specified revision.'
2256
2215
' See also "help revisionspec".'),
2257
2216
'log-format',
2258
RegistryOption('authors',
2259
'What names to list as authors - first, all or committer.',
2260
title='Authors',
2261
lazy_registry=('bzrlib.log', 'author_list_registry'),
2262
),
2263
2217
Option('levels',
2264
2218
short_name='n',
2265
2219
help='Number of levels to display - 0 for all, 1 for flat.',
2280
2234
help='Show changes made in each revision as a patch.'),
2281
2235
Option('include-merges',
2282
2236
help='Show merged revisions like --levels 0 does.'),
2283
Option('exclude-common-ancestry',
2284
help='Display only the revisions that are not part'
2285
' of both ancestries (require -rX..Y)'
2286
)
2287
2237
]
2288
2238
encoding_type = 'replace'
2289
2239
2299
2249
message=None,
2300
2250
limit=None,
2301
2251
show_diff=False,
2302
include_merges=False,
2303
authors=None,
2304
exclude_common_ancestry=False,
2305
):
2252
include_merges=False):
2306
2253
from bzrlib.log import (
2307
2254
Logger,
2308
2255
make_log_request_dict,
2309
2256
_get_info_for_log_files,
2310
2257
)
2311
2258
direction = (forward and 'forward') or 'reverse'
2312
if (exclude_common_ancestry
2313
and (revision is None or len(revision) != 2)):
2314
raise errors.BzrCommandError(
2315
'--exclude-common-ancestry requires -r with two revisions')
2316
2259
if include_merges:
2317
2260
if levels is None:
2318
2261
levels = 0
2333
2276
filter_by_dir = False
2334
2277
if file_list:
2335
2278
# find the file ids to log and check for directory filtering
2336
b, file_info_list, rev1, rev2 = _get_info_for_log_files(
2337
revision, file_list, self.add_cleanup)
2279
b, file_info_list, rev1, rev2 = _get_info_for_log_files(revision,
2280
file_list)
2338
2281
for relpath, file_id, kind in file_info_list:
2339
2282
if file_id is None:
2340
2283
raise errors.BzrCommandError(
2358
2301
location = '.'
2359
2302
dir, relpath = bzrdir.BzrDir.open_containing(location)
2360
2303
b = dir.open_branch()
2361
self.add_cleanup(b.lock_read().unlock)
2362
2304
rev1, rev2 = _get_revision_range(revision, b, self.name())
2363
2305
2364
2306
# Decide on the type of delta & diff filtering to use
2374
2316
else:
2375
2317
diff_type = 'full'
2376
2318
2377
# Build the log formatter
2378
if log_format is None:
2379
log_format = log.log_formatter_registry.get_default(b)
2380
# Make a non-encoding output to include the diffs - bug 328007
2381
unencoded_output = ui.ui_factory.make_output_stream(encoding_type='exact')
2382
lf = log_format(show_ids=show_ids, to_file=self.outf,
2383
to_exact_file=unencoded_output,
2384
show_timezone=timezone,
2385
delta_format=get_verbosity_level(),
2386
levels=levels,
2387
show_advice=levels is None,
2388
author_list_handler=authors)
2389
2390
# Choose the algorithm for doing the logging. It's annoying
2391
# having multiple code paths like this but necessary until
2392
# the underlying repository format is faster at generating
2393
# deltas or can provide everything we need from the indices.
2394
# The default algorithm - match-using-deltas - works for
2395
# multiple files and directories and is faster for small
2396
# amounts of history (200 revisions say). However, it's too
2397
# slow for logging a single file in a repository with deep
2398
# history, i.e. > 10K revisions. In the spirit of "do no
2399
# evil when adding features", we continue to use the
2400
# original algorithm - per-file-graph - for the "single
2401
# file that isn't a directory without showing a delta" case.
2402
partial_history = revision and b.repository._format.supports_chks
2403
match_using_deltas = (len(file_ids) != 1 or filter_by_dir
2404
or delta_type or partial_history)
2405
2406
# Build the LogRequest and execute it
2407
if len(file_ids) == 0:
2408
file_ids = None
2409
rqst = make_log_request_dict(
2410
direction=direction, specific_fileids=file_ids,
2411
start_revision=rev1, end_revision=rev2, limit=limit,
2412
message_search=message, delta_type=delta_type,
2413
diff_type=diff_type, _match_using_deltas=match_using_deltas,
2414
exclude_common_ancestry=exclude_common_ancestry,
2415
)
2416
Logger(b, rqst).show(lf)
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()
2417
2357
2418
2358
2419
2359
def _get_revision_range(revisionspec_list, branch, command_name):
2437
2377
raise errors.BzrCommandError(
2438
2378
"bzr %s doesn't accept two revisions in different"
2439
2379
" branches." % command_name)
2440
if start_spec.spec is None:
2441
# Avoid loading all the history.
2442
rev1 = RevisionInfo(branch, None, None)
2443
else:
2444
rev1 = start_spec.in_history(branch)
2380
rev1 = start_spec.in_history(branch)
2445
2381
# Avoid loading all of history when we know a missing
2446
2382
# end of range means the last revision ...
2447
2383
if end_spec.spec is None:
2476
2412
2477
2413
2478
2414
class cmd_touching_revisions(Command):
2479
__doc__ = """Return revision-ids which affected a particular file.
2415
"""Return revision-ids which affected a particular file.
2480
2416
2481
2417
A more user-friendly interface is "bzr log FILE".
2482
2418
"""
2487
2423
@display_command
2488
2424
def run(self, filename):
2489
2425
tree, relpath = WorkingTree.open_containing(filename)
2426
b = tree.branch
2490
2427
file_id = tree.path2id(relpath)
2491
b = tree.branch
2492
self.add_cleanup(b.lock_read().unlock)
2493
touching_revs = log.find_touching_revisions(b, file_id)
2494
for revno, revision_id, what in touching_revs:
2428
for revno, revision_id, what in log.find_touching_revisions(b, file_id):
2495
2429
self.outf.write("%6d %s\n" % (revno, what))
2496
2430
2497
2431
2498
2432
class cmd_ls(Command):
2499
__doc__ = """List files in a tree.
2433
"""List files in a tree.
2500
2434
"""
2501
2435
2502
2436
_see_also = ['status', 'cat']
2508
2442
help='Recurse into subdirectories.'),
2509
2443
Option('from-root',
2510
2444
help='Print paths relative to the root of the branch.'),
2511
Option('unknown', short_name='u',
2512
help='Print unknown files.'),
2445
Option('unknown', help='Print unknown files.'),
2513
2446
Option('versioned', help='Print versioned files.',
2514
2447
short_name='V'),
2515
Option('ignored', short_name='i',
2516
help='Print ignored files.'),
2517
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',
2518
2453
help='List entries of a particular kind: file, directory, symlink.',
2519
2454
type=unicode),
2520
'null',
2521
2455
'show-ids',
2522
'directory',
2523
2456
]
2524
2457
@display_command
2525
2458
def run(self, revision=None, verbose=False,
2526
2459
recursive=False, from_root=False,
2527
2460
unknown=False, versioned=False, ignored=False,
2528
null=False, kind=None, show_ids=False, path=None, directory=None):
2461
null=False, kind=None, show_ids=False, path=None):
2529
2462
2530
2463
if kind and kind not in ('file', 'directory', 'symlink'):
2531
2464
raise errors.BzrCommandError('invalid kind specified')
2543
2476
raise errors.BzrCommandError('cannot specify both --from-root'
2544
2477
' and PATH')
2545
2478
fs_path = path
2546
tree, branch, relpath = \
2547
_open_directory_or_containing_tree_or_branch(fs_path, directory)
2479
tree, branch, relpath = bzrdir.BzrDir.open_containing_tree_or_branch(
2480
fs_path)
2548
2481
2549
2482
# Calculate the prefix to use
2550
2483
prefix = None
2551
2484
if from_root:
2552
2485
if relpath:
2553
2486
prefix = relpath + '/'
2554
elif fs_path != '.' and not fs_path.endswith('/'):
2487
elif fs_path != '.':
2555
2488
prefix = fs_path + '/'
2556
2489
2557
2490
if revision is not None or tree is None:
2565
2498
view_str = views.view_display_str(view_files)
2566
2499
note("Ignoring files outside view. View is %s" % view_str)
2567
2500
2568
self.add_cleanup(tree.lock_read().unlock)
2569
for fp, fc, fkind, fid, entry in tree.list_files(include_root=False,
2570
from_dir=relpath, recursive=recursive):
2571
# Apply additional masking
2572
if not all and not selection[fc]:
2573
continue
2574
if kind is not None and fkind != kind:
2575
continue
2576
if apply_view:
2577
try:
2578
if relpath:
2579
fullpath = osutils.pathjoin(relpath, fp)
2580
else:
2581
fullpath = fp
2582
views.check_path_in_view(tree, fullpath)
2583
except errors.FileOutsideView:
2584
continue
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
2585
2519
2586
# Output the entry
2587
if prefix:
2588
fp = osutils.pathjoin(prefix, fp)
2589
kindch = entry.kind_character()
2590
outstring = fp + kindch
2591
ui.ui_factory.clear_term()
2592
if verbose:
2593
outstring = '%-8s %s' % (fc, outstring)
2594
if show_ids and fid is not None:
2595
outstring = "%-50s %s" % (outstring, fid)
2596
self.outf.write(outstring + '\n')
2597
elif null:
2598
self.outf.write(fp + '\0')
2599
if show_ids:
2600
if fid is not None:
2601
self.outf.write(fid)
2602
self.outf.write('\0')
2603
self.outf.flush()
2604
else:
2605
if show_ids:
2606
if fid is not None:
2607
my_id = fid
2608
else:
2609
my_id = ''
2610
self.outf.write('%-50s %s\n' % (outstring, my_id))
2611
else:
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)
2612
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()
2613
2549
2614
2550
2615
2551
class cmd_unknowns(Command):
2616
__doc__ = """List unknown files.
2552
"""List unknown files.
2617
2553
"""
2618
2554
2619
2555
hidden = True
2620
2556
_see_also = ['ls']
2621
takes_options = ['directory']
2622
2557
2623
2558
@display_command
2624
def run(self, directory=u'.'):
2625
for f in WorkingTree.open_containing(directory)[0].unknowns():
2559
def run(self):
2560
for f in WorkingTree.open_containing(u'.')[0].unknowns():
2626
2561
self.outf.write(osutils.quotefn(f) + '\n')
2627
2562
2628
2563
2629
2564
class cmd_ignore(Command):
2630
__doc__ = """Ignore specified files or patterns.
2565
"""Ignore specified files or patterns.
2631
2566
2632
2567
See ``bzr help patterns`` for details on the syntax of patterns.
2633
2568
2634
If a .bzrignore file does not exist, the ignore command
2635
will create one and add the specified files or patterns to the newly
2636
created file. The ignore command will also automatically add the
2637
.bzrignore file to be versioned. Creating a .bzrignore file without
2638
the use of the ignore command will require an explicit add command.
2639
2640
2569
To remove patterns from the ignore list, edit the .bzrignore file.
2641
2570
After adding, editing or deleting that file either indirectly by
2642
2571
using this command or directly by using an editor, be sure to commit
2643
2572
it.
2644
2645
Bazaar also supports a global ignore file ~/.bazaar/ignore. On Windows
2646
the global ignore file can be found in the application data directory as
2647
C:\\Documents and Settings\\<user>\\Application Data\\Bazaar\\2.0\\ignore.
2648
Global ignores are not touched by this command. The global ignore file
2649
can be edited directly using an editor.
2650
2651
Patterns prefixed with '!' are exceptions to ignore patterns and take
2652
precedence over regular ignores. Such exceptions are used to specify
2653
files that should be versioned which would otherwise be ignored.
2654
2655
Patterns prefixed with '!!' act as regular ignore patterns, but have
2656
precedence over the '!' exception patterns.
2657
2573
2658
2574
Note: ignore patterns containing shell wildcards must be quoted from
2659
2575
the shell on Unix.
2663
2579
2664
2580
bzr ignore ./Makefile
2665
2581
2666
Ignore .class files in all directories...::
2582
Ignore class files in all directories::
2667
2583
2668
2584
bzr ignore "*.class"
2669
2585
2670
...but do not ignore "special.class"::
2671
2672
bzr ignore "!special.class"
2673
2674
2586
Ignore .o files under the lib directory::
2675
2587
2676
2588
bzr ignore "lib/**/*.o"
2682
2594
Ignore everything but the "debian" toplevel directory::
2683
2595
2684
2596
bzr ignore "RE:(?!debian/).*"
2685
2686
Ignore everything except the "local" toplevel directory,
2687
but always ignore "*~" autosave files, even under local/::
2688
2689
bzr ignore "*"
2690
bzr ignore "!./local"
2691
bzr ignore "!!*~"
2692
2597
"""
2693
2598
2694
2599
_see_also = ['status', 'ignored', 'patterns']
2695
2600
takes_args = ['name_pattern*']
2696
takes_options = ['directory',
2697
Option('default-rules',
2698
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.')
2699
2604
]
2700
2605
2701
def run(self, name_pattern_list=None, default_rules=None,
2702
directory=u'.'):
2606
def run(self, name_pattern_list=None, old_default_rules=None):
2703
2607
from bzrlib import ignores
2704
if default_rules is not None:
2705
# dump the default rules and exit
2706
for pattern in ignores.USER_DEFAULTS:
2707
self.outf.write("%s\n" % pattern)
2608
if old_default_rules is not None:
2609
# dump the rules and exit
2610
for pattern in ignores.OLD_DEFAULTS:
2611
print pattern
2708
2612
return
2709
2613
if not name_pattern_list:
2710
2614
raise errors.BzrCommandError("ignore requires at least one "
2711
"NAME_PATTERN or --default-rules.")
2615
"NAME_PATTERN or --old-default-rules")
2712
2616
name_pattern_list = [globbing.normalize_pattern(p)
2713
2617
for p in name_pattern_list]
2714
2618
for name_pattern in name_pattern_list:
2716
2620
(len(name_pattern) > 1 and name_pattern[1] == ':')):
2717
2621
raise errors.BzrCommandError(
2718
2622
"NAME_PATTERN should not be an absolute path")
2719
tree, relpath = WorkingTree.open_containing(directory)
2623
tree, relpath = WorkingTree.open_containing(u'.')
2720
2624
ignores.tree_ignores_add_patterns(tree, name_pattern_list)
2721
2625
ignored = globbing.Globster(name_pattern_list)
2722
2626
matches = []
2726
2630
if id is not None:
2727
2631
filename = entry[0]
2728
2632
if ignored.match(filename):
2729
matches.append(filename)
2633
matches.append(filename.encode('utf-8'))
2730
2634
tree.unlock()
2731
2635
if len(matches) > 0:
2732
self.outf.write("Warning: the following files are version controlled and"
2733
" match your ignore pattern:\n%s"
2734
"\nThese files will continue to be version controlled"
2735
" unless you 'bzr remove' them.\n" % ("\n".join(matches),))
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),)
2736
2640
2737
2641
2738
2642
class cmd_ignored(Command):
2739
__doc__ = """List ignored files and the patterns that matched them.
2643
"""List ignored files and the patterns that matched them.
2740
2644
2741
2645
List all the ignored files and the ignore pattern that caused the file to
2742
2646
be ignored.
2748
2652
2749
2653
encoding_type = 'replace'
2750
2654
_see_also = ['ignore', 'ls']
2751
takes_options = ['directory']
2752
2655
2753
2656
@display_command
2754
def run(self, directory=u'.'):
2755
tree = WorkingTree.open_containing(directory)[0]
2756
self.add_cleanup(tree.lock_read().unlock)
2757
for path, file_class, kind, file_id, entry in tree.list_files():
2758
if file_class != 'I':
2759
continue
2760
## XXX: Slightly inefficient since this was already calculated
2761
pat = tree.is_ignored(path)
2762
self.outf.write('%-50s %s\n' % (path, pat))
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()
2763
2669
2764
2670
2765
2671
class cmd_lookup_revision(Command):
2766
__doc__ = """Lookup the revision-id from a revision-number
2672
"""Lookup the revision-id from a revision-number
2767
2673
2768
2674
:Examples:
2769
2675
bzr lookup-revision 33
2770
2676
"""
2771
2677
hidden = True
2772
2678
takes_args = ['revno']
2773
takes_options = ['directory']
2774
2679
2775
2680
@display_command
2776
def run(self, revno, directory=u'.'):
2681
def run(self, revno):
2777
2682
try:
2778
2683
revno = int(revno)
2779
2684
except ValueError:
2780
raise errors.BzrCommandError("not a valid revision-number: %r"
2781
% revno)
2782
revid = WorkingTree.open_containing(directory)[0].branch.get_rev_id(revno)
2783
self.outf.write("%s\n" % revid)
2685
raise errors.BzrCommandError("not a valid revision-number: %r" % revno)
2686
2687
print WorkingTree.open_containing(u'.')[0].branch.get_rev_id(revno)
2784
2688
2785
2689
2786
2690
class cmd_export(Command):
2787
__doc__ = """Export current or past revision to a destination directory or archive.
2691
"""Export current or past revision to a destination directory or archive.
2788
2692
2789
2693
If no revision is specified this exports the last committed revision.
2790
2694
2812
2716
================= =========================
2813
2717
"""
2814
2718
takes_args = ['dest', 'branch_or_subdir?']
2815
takes_options = ['directory',
2719
takes_options = [
2816
2720
Option('format',
2817
2721
help="Type of file to export to.",
2818
2722
type=unicode),
2822
2726
Option('root',
2823
2727
type=str,
2824
2728
help="Name of the root directory inside the exported file."),
2825
Option('per-file-timestamps',
2826
help='Set modification time of files to that of the last '
2827
'revision in which it was changed.'),
2828
2729
]
2829
2730
def run(self, dest, branch_or_subdir=None, revision=None, format=None,
2830
root=None, filters=False, per_file_timestamps=False, directory=u'.'):
2731
root=None, filters=False):
2831
2732
from bzrlib.export import export
2832
2733
2833
2734
if branch_or_subdir is None:
2834
tree = WorkingTree.open_containing(directory)[0]
2735
tree = WorkingTree.open_containing(u'.')[0]
2835
2736
b = tree.branch
2836
2737
subdir = None
2837
2738
else:
2840
2741
2841
2742
rev_tree = _get_one_revision_tree('export', revision, branch=b, tree=tree)
2842
2743
try:
2843
export(rev_tree, dest, format, root, subdir, filtered=filters,
2844
per_file_timestamps=per_file_timestamps)
2744
export(rev_tree, dest, format, root, subdir, filtered=filters)
2845
2745
except errors.NoSuchExportFormat, e:
2846
2746
raise errors.BzrCommandError('Unsupported export format: %s' % e.format)
2847
2747
2848
2748
2849
2749
class cmd_cat(Command):
2850
__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.
2851
2751
2852
2752
If no revision is nominated, the last revision is used.
2853
2753
2856
2756
"""
2857
2757
2858
2758
_see_also = ['ls']
2859
takes_options = ['directory',
2759
takes_options = [
2860
2760
Option('name-from-revision', help='The path name in the old tree.'),
2861
2761
Option('filters', help='Apply content filters to display the '
2862
2762
'convenience form.'),
2867
2767
2868
2768
@display_command
2869
2769
def run(self, filename, revision=None, name_from_revision=False,
2870
filters=False, directory=None):
2770
filters=False):
2871
2771
if revision is not None and len(revision) != 1:
2872
2772
raise errors.BzrCommandError("bzr cat --revision takes exactly"
2873
2773
" one revision specifier")
2874
2774
tree, branch, relpath = \
2875
_open_directory_or_containing_tree_or_branch(filename, directory)
2876
self.add_cleanup(branch.lock_read().unlock)
2877
return self._run(tree, branch, relpath, filename, revision,
2878
name_from_revision, filters)
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()
2879
2782
2880
2783
def _run(self, tree, b, relpath, filename, revision, name_from_revision,
2881
2784
filtered):
2882
2785
if tree is None:
2883
2786
tree = b.basis_tree()
2884
2787
rev_tree = _get_one_revision_tree('cat', revision, branch=b)
2885
self.add_cleanup(rev_tree.lock_read().unlock)
2886
2788
2887
2789
old_file_id = rev_tree.path2id(relpath)
2888
2790
2923
2825
chunks = content.splitlines(True)
2924
2826
content = filtered_output_bytes(chunks, filters,
2925
2827
ContentFilterContext(relpath, rev_tree))
2926
self.cleanup_now()
2927
2828
self.outf.writelines(content)
2928
2829
else:
2929
self.cleanup_now()
2930
2830
self.outf.write(content)
2931
2831
2932
2832
2933
2833
class cmd_local_time_offset(Command):
2934
__doc__ = """Show the offset in seconds from GMT to local time."""
2834
"""Show the offset in seconds from GMT to local time."""
2935
2835
hidden = True
2936
2836
@display_command
2937
2837
def run(self):
2938
self.outf.write("%s\n" % osutils.local_time_offset())
2838
print osutils.local_time_offset()
2939
2839
2940
2840
2941
2841
2942
2842
class cmd_commit(Command):
2943
__doc__ = """Commit changes into a new revision.
2843
"""Commit changes into a new revision.
2944
2844
2945
2845
An explanatory message needs to be given for each commit. This is
2946
2846
often done by using the --message option (getting the message from the
3039
2939
Option('strict',
3040
2940
help="Refuse to commit if there are unknown "
3041
2941
"files in the working tree."),
3042
Option('commit-time', type=str,
3043
help="Manually set a commit time using commit date "
3044
"format, e.g. '2009-10-10 08:00:00 +0100'."),
3045
2942
ListOption('fixes', type=str,
3046
2943
help="Mark a bug as being fixed by this revision "
3047
2944
"(see \"bzr help bugs\")."),
3054
2951
"the master branch until a normal commit "
3055
2952
"is performed."
3056
2953
),
3057
Option('show-diff', short_name='p',
3058
help='When no message is supplied, show the diff along'
3059
' with the status summary in the message editor.'),
2954
Option('show-diff',
2955
help='When no message is supplied, show the diff along'
2956
' with the status summary in the message editor.'),
3060
2957
]
3061
2958
aliases = ['ci', 'checkin']
3062
2959
3081
2978
3082
2979
def run(self, message=None, file=None, verbose=False, selected_list=None,
3083
2980
unchanged=False, strict=False, local=False, fixes=None,
3084
author=None, show_diff=False, exclude=None, commit_time=None):
2981
author=None, show_diff=False, exclude=None):
3085
2982
from bzrlib.errors import (
3086
2983
PointlessCommit,
3087
2984
ConflictsInTree,
3093
2990
make_commit_message_template_encoded
3094
2991
)
3095
2992
3096
commit_stamp = offset = None
3097
if commit_time is not None:
3098
try:
3099
commit_stamp, offset = timestamp.parse_patch_date(commit_time)
3100
except ValueError, e:
3101
raise errors.BzrCommandError(
3102
"Could not parse --commit-time: " + str(e))
3103
3104
2993
# TODO: Need a blackbox test for invoking the external editor; may be
3105
2994
# slightly problematic to run this cross-platform.
3106
2995
3126
3015
if local and not tree.branch.get_bound_location():
3127
3016
raise errors.LocalRequiresBoundBranch()
3128
3017
3129
if message is not None:
3130
try:
3131
file_exists = osutils.lexists(message)
3132
except UnicodeError:
3133
# The commit message contains unicode characters that can't be
3134
# represented in the filesystem encoding, so that can't be a
3135
# file.
3136
file_exists = False
3137
if file_exists:
3138
warning_msg = (
3139
'The commit message is a file name: "%(f)s".\n'
3140
'(use --file "%(f)s" to take commit message from that file)'
3141
% { 'f': message })
3142
ui.ui_factory.show_warning(warning_msg)
3143
if '\r' in message:
3144
message = message.replace('\r\n', '\n')
3145
message = message.replace('\r', '\n')
3146
if file:
3147
raise errors.BzrCommandError(
3148
"please specify either --message or --file")
3149
3150
3018
def get_message(commit_obj):
3151
3019
"""Callback to get commit message"""
3152
if file:
3153
my_message = codecs.open(
3154
file, 'rt', osutils.get_user_encoding()).read()
3155
elif message is not None:
3156
my_message = message
3157
else:
3158
# No message supplied: make one up.
3159
# text is the status of the tree
3160
text = make_commit_message_template_encoded(tree,
3020
my_message = message
3021
if my_message is None and not file:
3022
t = make_commit_message_template_encoded(tree,
3161
3023
selected_list, diff=show_diff,
3162
3024
output_encoding=osutils.get_user_encoding())
3163
# start_message is the template generated from hooks
3164
# XXX: Warning - looks like hooks return unicode,
3165
# make_commit_message_template_encoded returns user encoding.
3166
# We probably want to be using edit_commit_message instead to
3167
# avoid this.
3168
3025
start_message = generate_commit_message_template(commit_obj)
3169
my_message = edit_commit_message_encoded(text,
3026
my_message = edit_commit_message_encoded(t,
3170
3027
start_message=start_message)
3171
3028
if my_message is None:
3172
3029
raise errors.BzrCommandError("please specify a commit"
3173
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()
3174
3037
if my_message == "":
3175
3038
raise errors.BzrCommandError("empty commit message specified")
3176
3039
return my_message
3184
3047
specific_files=selected_list,
3185
3048
allow_pointless=unchanged, strict=strict, local=local,
3186
3049
reporter=None, verbose=verbose, revprops=properties,
3187
authors=author, timestamp=commit_stamp,
3188
timezone=offset,
3050
authors=author,
3189
3051
exclude=safe_relpath_files(tree, exclude))
3190
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
3191
3055
raise errors.BzrCommandError("No changes to commit."
3192
3056
" Use --unchanged to commit anyhow.")
3193
3057
except ConflictsInTree:
3198
3062
raise errors.BzrCommandError("Commit refused because there are"
3199
3063
" unknown files in the working tree.")
3200
3064
except errors.BoundBranchOutOfDate, e:
3201
e.extra_help = ("\n"
3202
'To commit to master branch, run update and then commit.\n'
3203
'You can also pass --local to commit to continue working '
3204
'disconnected.')
3205
raise
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.')
3206
3069
3207
3070
3208
3071
class cmd_check(Command):
3209
__doc__ = """Validate working tree structure, branch consistency and repository history.
3072
"""Validate working tree structure, branch consistency and repository history.
3210
3073
3211
3074
This command checks various invariants about branch and repository storage
3212
3075
to detect data corruption or bzr bugs.
3276
3139
3277
3140
3278
3141
class cmd_upgrade(Command):
3279
__doc__ = """Upgrade branch storage to current format.
3142
"""Upgrade branch storage to current format.
3280
3143
3281
3144
The check command or bzr developers may sometimes advise you to run
3282
3145
this command. When the default format has changed you may also be warned
3300
3163
3301
3164
3302
3165
class cmd_whoami(Command):
3303
__doc__ = """Show or set bzr user id.
3166
"""Show or set bzr user id.
3304
3167
3305
3168
:Examples:
3306
3169
Show the email of the current user::
3350
3213
3351
3214
3352
3215
class cmd_nick(Command):
3353
__doc__ = """Print or set the branch nickname.
3216
"""Print or set the branch nickname.
3354
3217
3355
3218
If unset, the tree root directory name is used as the nickname.
3356
3219
To print the current nickname, execute with no argument.
3361
3224
3362
3225
_see_also = ['info']
3363
3226
takes_args = ['nickname?']
3364
takes_options = ['directory']
3365
def run(self, nickname=None, directory=u'.'):
3366
branch = Branch.open_containing(directory)[0]
3227
def run(self, nickname=None):
3228
branch = Branch.open_containing(u'.')[0]
3367
3229
if nickname is None:
3368
3230
self.printme(branch)
3369
3231
else:
3371
3233
3372
3234
@display_command
3373
3235
def printme(self, branch):
3374
self.outf.write('%s\n' % branch.nick)
3236
print branch.nick
3375
3237
3376
3238
3377
3239
class cmd_alias(Command):
3378
__doc__ = """Set/unset and display aliases.
3240
"""Set/unset and display aliases.
3379
3241
3380
3242
:Examples:
3381
3243
Show the current aliases::
3445
3307
3446
3308
3447
3309
class cmd_selftest(Command):
3448
__doc__ = """Run internal test suite.
3310
"""Run internal test suite.
3449
3311
3450
3312
If arguments are given, they are regular expressions that say which tests
3451
3313
should run. Tests matching any expression are run, and other tests are
3495
3357
def get_transport_type(typestring):
3496
3358
"""Parse and return a transport specifier."""
3497
3359
if typestring == "sftp":
3498
from bzrlib.tests import stub_sftp
3499
return stub_sftp.SFTPAbsoluteServer
3360
from bzrlib.transport.sftp import SFTPAbsoluteServer
3361
return SFTPAbsoluteServer
3500
3362
if typestring == "memory":
3501
from bzrlib.tests import test_server
3502
return memory.MemoryServer
3363
from bzrlib.transport.memory import MemoryServer
3364
return MemoryServer
3503
3365
if typestring == "fakenfs":
3504
from bzrlib.tests import test_server
3505
return test_server.FakeNFSServer
3366
from bzrlib.transport.fakenfs import FakeNFSServer
3367
return FakeNFSServer
3506
3368
msg = "No known transport type %s. Supported types are: sftp\n" %\
3507
3369
(typestring)
3508
3370
raise errors.BzrCommandError(msg)
3592
3454
raise errors.BzrCommandError("subunit not available. subunit "
3593
3455
"needs to be installed to use --subunit.")
3594
3456
self.additional_selftest_args['runner_class'] = SubUnitBzrRunner
3595
# On Windows, disable automatic conversion of '\n' to '\r\n' in
3596
# stdout, which would corrupt the subunit stream.
3597
if sys.platform == "win32" and sys.stdout.fileno() >= 0:
3598
import msvcrt
3599
msvcrt.setmode(sys.stdout.fileno(), os.O_BINARY)
3600
3457
if parallel:
3601
3458
self.additional_selftest_args.setdefault(
3602
3459
'suite_decorators', []).append(parallel)
3606
3463
verbose = not is_quiet()
3607
3464
# TODO: should possibly lock the history file...
3608
3465
benchfile = open(".perf_history", "at", buffering=1)
3609
self.add_cleanup(benchfile.close)
3610
3466
else:
3611
3467
test_suite_factory = None
3612
3468
benchfile = None
3613
selftest_kwargs = {"verbose": verbose,
3614
"pattern": pattern,
3615
"stop_on_failure": one,
3616
"transport": transport,
3617
"test_suite_factory": test_suite_factory,
3618
"lsprof_timed": lsprof_timed,
3619
"lsprof_tests": lsprof_tests,
3620
"bench_history": benchfile,
3621
"matching_tests_first": first,
3622
"list_only": list_only,
3623
"random_seed": randomize,
3624
"exclude_pattern": exclude,
3625
"strict": strict,
3626
"load_list": load_list,
3627
"debug_flags": debugflag,
3628
"starting_with": starting_with
3629
}
3630
selftest_kwargs.update(self.additional_selftest_args)
3631
result = selftest(**selftest_kwargs)
3469
try:
3470
selftest_kwargs = {"verbose": verbose,
3471
"pattern": pattern,
3472
"stop_on_failure": one,
3473
"transport": transport,
3474
"test_suite_factory": test_suite_factory,
3475
"lsprof_timed": lsprof_timed,
3476
"lsprof_tests": lsprof_tests,
3477
"bench_history": benchfile,
3478
"matching_tests_first": first,
3479
"list_only": list_only,
3480
"random_seed": randomize,
3481
"exclude_pattern": exclude,
3482
"strict": strict,
3483
"load_list": load_list,
3484
"debug_flags": debugflag,
3485
"starting_with": starting_with
3486
}
3487
selftest_kwargs.update(self.additional_selftest_args)
3488
result = selftest(**selftest_kwargs)
3489
finally:
3490
if benchfile is not None:
3491
benchfile.close()
3632
3492
return int(not result)
3633
3493
3634
3494
3635
3495
class cmd_version(Command):
3636
__doc__ = """Show version of bzr."""
3496
"""Show version of bzr."""
3637
3497
3638
3498
encoding_type = 'replace'
3639
3499
takes_options = [
3650
3510
3651
3511
3652
3512
class cmd_rocks(Command):
3653
__doc__ = """Statement of optimism."""
3513
"""Statement of optimism."""
3654
3514
3655
3515
hidden = True
3656
3516
3657
3517
@display_command
3658
3518
def run(self):
3659
self.outf.write("It sure does!\n")
3519
print "It sure does!"
3660
3520
3661
3521
3662
3522
class cmd_find_merge_base(Command):
3663
__doc__ = """Find and print a base revision for merging two branches."""
3523
"""Find and print a base revision for merging two branches."""
3664
3524
# TODO: Options to specify revisions on either side, as if
3665
3525
# merging only part of the history.
3666
3526
takes_args = ['branch', 'other']
3672
3532
3673
3533
branch1 = Branch.open_containing(branch)[0]
3674
3534
branch2 = Branch.open_containing(other)[0]
3675
self.add_cleanup(branch1.lock_read().unlock)
3676
self.add_cleanup(branch2.lock_read().unlock)
3677
last1 = ensure_null(branch1.last_revision())
3678
last2 = ensure_null(branch2.last_revision())
3679
3680
graph = branch1.repository.get_graph(branch2.repository)
3681
base_rev_id = graph.find_unique_lca(last1, last2)
3682
3683
self.outf.write('merge base is revision %s\n' % base_rev_id)
3535
branch1.lock_read()
3536
try:
3537
branch2.lock_read()
3538
try:
3539
last1 = ensure_null(branch1.last_revision())
3540
last2 = ensure_null(branch2.last_revision())
3541
3542
graph = branch1.repository.get_graph(branch2.repository)
3543
base_rev_id = graph.find_unique_lca(last1, last2)
3544
3545
print 'merge base is revision %s' % base_rev_id
3546
finally:
3547
branch2.unlock()
3548
finally:
3549
branch1.unlock()
3684
3550
3685
3551
3686
3552
class cmd_merge(Command):
3687
__doc__ = """Perform a three-way merge.
3553
"""Perform a three-way merge.
3688
3554
3689
3555
The source of the merge can be specified either in the form of a branch,
3690
3556
or in the form of a path to a file containing a merge directive generated
3719
3585
committed to record the result of the merge.
3720
3586
3721
3587
merge refuses to run if there are any uncommitted changes, unless
3722
--force is given. The --force option can also be used to create a
3723
merge revision which has more than two parents.
3724
3725
If one would like to merge changes from the working tree of the other
3726
branch without merging any committed revisions, the --uncommitted option
3727
can be given.
3588
--force is given.
3728
3589
3729
3590
To select only some changes to merge, use "merge -i", which will prompt
3730
3591
you to apply each diff hunk and file change, similar to "shelve".
3742
3603
3743
3604
bzr merge -r 81..82 ../bzr.dev
3744
3605
3745
To apply a merge directive contained in /tmp/merge::
3606
To apply a merge directive contained in /tmp/merge:
3746
3607
3747
3608
bzr merge /tmp/merge
3748
3749
To create a merge revision with three parents from two branches
3750
feature1a and feature1b:
3751
3752
bzr merge ../feature1a
3753
bzr merge ../feature1b --force
3754
bzr commit -m 'revision with three parents'
3755
3609
"""
3756
3610
3757
3611
encoding_type = 'exact'
3773
3627
' completely merged into the source, pull from the'
3774
3628
' source rather than merging. When this happens,'
3775
3629
' you do not need to commit the result.'),
3776
custom_help('directory',
3630
Option('directory',
3777
3631
help='Branch to merge into, '
3778
'rather than the one containing the working directory.'),
3632
'rather than the one containing the working directory.',
3633
short_name='d',
3634
type=unicode,
3635
),
3779
3636
Option('preview', help='Instead of merging, show a diff of the'
3780
3637
' merge.'),
3781
3638
Option('interactive', help='Select changes interactively.',
3806
3663
3807
3664
# die as quickly as possible if there are uncommitted changes
3808
3665
if not force:
3809
if tree.has_changes():
3666
if tree.has_changes(basis_tree) or len(tree.get_parent_ids()) > 1:
3810
3667
raise errors.UncommittedChanges(tree)
3811
3668
3812
3669
view_info = _get_view_info_for_change_reporter(tree)
3813
3670
change_reporter = delta._ChangeReporter(
3814
3671
unversioned_filter=tree.is_ignored, view_info=view_info)
3815
pb = ui.ui_factory.nested_progress_bar()
3816
self.add_cleanup(pb.finished)
3817
self.add_cleanup(tree.lock_write().unlock)
3818
if location is not None:
3819
try:
3820
mergeable = bundle.read_mergeable_from_url(location,
3821
possible_transports=possible_transports)
3822
except errors.NotABundle:
3823
mergeable = None
3672
cleanups = []
3673
try:
3674
pb = ui.ui_factory.nested_progress_bar()
3675
cleanups.append(pb.finished)
3676
tree.lock_write()
3677
cleanups.append(tree.unlock)
3678
if location is not None:
3679
try:
3680
mergeable = bundle.read_mergeable_from_url(location,
3681
possible_transports=possible_transports)
3682
except errors.NotABundle:
3683
mergeable = None
3684
else:
3685
if uncommitted:
3686
raise errors.BzrCommandError('Cannot use --uncommitted'
3687
' with bundles or merge directives.')
3688
3689
if revision is not None:
3690
raise errors.BzrCommandError(
3691
'Cannot use -r with merge directives or bundles')
3692
merger, verified = _mod_merge.Merger.from_mergeable(tree,
3693
mergeable, pb)
3694
3695
if merger is None and uncommitted:
3696
if revision is not None and len(revision) > 0:
3697
raise errors.BzrCommandError('Cannot use --uncommitted and'
3698
' --revision at the same time.')
3699
merger = self.get_merger_from_uncommitted(tree, location, pb,
3700
cleanups)
3701
allow_pending = False
3702
3703
if merger is None:
3704
merger, allow_pending = self._get_merger_from_branch(tree,
3705
location, revision, remember, possible_transports, pb)
3706
3707
merger.merge_type = merge_type
3708
merger.reprocess = reprocess
3709
merger.show_base = show_base
3710
self.sanity_check_merger(merger)
3711
if (merger.base_rev_id == merger.other_rev_id and
3712
merger.other_rev_id is not None):
3713
note('Nothing to do.')
3714
return 0
3715
if pull:
3716
if merger.interesting_files is not None:
3717
raise errors.BzrCommandError('Cannot pull individual files')
3718
if (merger.base_rev_id == tree.last_revision()):
3719
result = tree.pull(merger.other_branch, False,
3720
merger.other_rev_id)
3721
result.report(self.outf)
3722
return 0
3723
merger.check_basis(False)
3724
if preview:
3725
return self._do_preview(merger, cleanups)
3726
elif interactive:
3727
return self._do_interactive(merger, cleanups)
3824
3728
else:
3825
if uncommitted:
3826
raise errors.BzrCommandError('Cannot use --uncommitted'
3827
' with bundles or merge directives.')
3828
3829
if revision is not None:
3830
raise errors.BzrCommandError(
3831
'Cannot use -r with merge directives or bundles')
3832
merger, verified = _mod_merge.Merger.from_mergeable(tree,
3833
mergeable, None)
3834
3835
if merger is None and uncommitted:
3836
if revision is not None and len(revision) > 0:
3837
raise errors.BzrCommandError('Cannot use --uncommitted and'
3838
' --revision at the same time.')
3839
merger = self.get_merger_from_uncommitted(tree, location, None)
3840
allow_pending = False
3841
3842
if merger is None:
3843
merger, allow_pending = self._get_merger_from_branch(tree,
3844
location, revision, remember, possible_transports, None)
3845
3846
merger.merge_type = merge_type
3847
merger.reprocess = reprocess
3848
merger.show_base = show_base
3849
self.sanity_check_merger(merger)
3850
if (merger.base_rev_id == merger.other_rev_id and
3851
merger.other_rev_id is not None):
3852
note('Nothing to do.')
3853
return 0
3854
if pull:
3855
if merger.interesting_files is not None:
3856
raise errors.BzrCommandError('Cannot pull individual files')
3857
if (merger.base_rev_id == tree.last_revision()):
3858
result = tree.pull(merger.other_branch, False,
3859
merger.other_rev_id)
3860
result.report(self.outf)
3861
return 0
3862
if merger.this_basis is None:
3863
raise errors.BzrCommandError(
3864
"This branch has no commits."
3865
" (perhaps you would prefer 'bzr pull')")
3866
if preview:
3867
return self._do_preview(merger)
3868
elif interactive:
3869
return self._do_interactive(merger)
3870
else:
3871
return self._do_merge(merger, change_reporter, allow_pending,
3872
verified)
3873
3874
def _get_preview(self, merger):
3729
return self._do_merge(merger, change_reporter, allow_pending,
3730
verified)
3731
finally:
3732
for cleanup in reversed(cleanups):
3733
cleanup()
3734
3735
def _get_preview(self, merger, cleanups):
3875
3736
tree_merger = merger.make_merger()
3876
3737
tt = tree_merger.make_preview_transform()
3877
self.add_cleanup(tt.finalize)
3738
cleanups.append(tt.finalize)
3878
3739
result_tree = tt.get_preview_tree()
3879
3740
return result_tree
3880
3741
3881
def _do_preview(self, merger):
3742
def _do_preview(self, merger, cleanups):
3882
3743
from bzrlib.diff import show_diff_trees
3883
result_tree = self._get_preview(merger)
3744
result_tree = self._get_preview(merger, cleanups)
3884
3745
show_diff_trees(merger.this_tree, result_tree, self.outf,
3885
3746
old_label='', new_label='')
3886
3747
3896
3757
else:
3897
3758
return 0
3898
3759
3899
def _do_interactive(self, merger):
3760
def _do_interactive(self, merger, cleanups):
3900
3761
"""Perform an interactive merge.
3901
3762
3902
3763
This works by generating a preview tree of the merge, then using
3904
3765
and the preview tree.
3905
3766
"""
3906
3767
from bzrlib import shelf_ui
3907
result_tree = self._get_preview(merger)
3768
result_tree = self._get_preview(merger, cleanups)
3908
3769
writer = bzrlib.option.diff_writer_registry.get()
3909
3770
shelver = shelf_ui.Shelver(merger.this_tree, result_tree, destroy=True,
3910
3771
reporter=shelf_ui.ApplyReporter(),
3911
3772
diff_writer=writer(sys.stdout))
3912
try:
3913
shelver.run()
3914
finally:
3915
shelver.finalize()
3773
shelver.run()
3916
3774
3917
3775
def sanity_check_merger(self, merger):
3918
3776
if (merger.show_base and
3978
3836
allow_pending = True
3979
3837
return merger, allow_pending
3980
3838
3981
def get_merger_from_uncommitted(self, tree, location, pb):
3839
def get_merger_from_uncommitted(self, tree, location, pb, cleanups):
3982
3840
"""Get a merger for uncommitted changes.
3983
3841
3984
3842
:param tree: The tree the merger should apply to.
3985
3843
:param location: The location containing uncommitted changes.
3986
3844
:param pb: The progress bar to use for showing progress.
3845
:param cleanups: A list of operations to perform to clean up the
3846
temporary directories, unfinalized objects, etc.
3987
3847
"""
3988
3848
location = self._select_branch_location(tree, location)[0]
3989
3849
other_tree, other_path = WorkingTree.open_containing(location)
4041
3901
4042
3902
4043
3903
class cmd_remerge(Command):
4044
__doc__ = """Redo a merge.
3904
"""Redo a merge.
4045
3905
4046
3906
Use this if you want to try a different merge technique while resolving
4047
3907
conflicts. Some merge techniques are better than others, and remerge
4072
3932
4073
3933
def run(self, file_list=None, merge_type=None, show_base=False,
4074
3934
reprocess=False):
4075
from bzrlib.conflicts import restore
4076
3935
if merge_type is None:
4077
3936
merge_type = _mod_merge.Merge3Merger
4078
3937
tree, file_list = tree_files(file_list)
4079
self.add_cleanup(tree.lock_write().unlock)
4080
parents = tree.get_parent_ids()
4081
if len(parents) != 2:
4082
raise errors.BzrCommandError("Sorry, remerge only works after normal"
4083
" merges. Not cherrypicking or"
4084
" multi-merges.")
4085
repository = tree.branch.repository
4086
interesting_ids = None
4087
new_conflicts = []
4088
conflicts = tree.conflicts()
4089
if file_list is not None:
4090
interesting_ids = set()
4091
for filename in file_list:
4092
file_id = tree.path2id(filename)
4093
if file_id is None:
4094
raise errors.NotVersionedError(filename)
4095
interesting_ids.add(file_id)
4096
if tree.kind(file_id) != "directory":
4097
continue
3938
tree.lock_write()
3939
try:
3940
parents = tree.get_parent_ids()
3941
if len(parents) != 2:
3942
raise errors.BzrCommandError("Sorry, remerge only works after normal"
3943
" merges. Not cherrypicking or"
3944
" multi-merges.")
3945
repository = tree.branch.repository
3946
interesting_ids = None
3947
new_conflicts = []
3948
conflicts = tree.conflicts()
3949
if file_list is not None:
3950
interesting_ids = set()
3951
for filename in file_list:
3952
file_id = tree.path2id(filename)
3953
if file_id is None:
3954
raise errors.NotVersionedError(filename)
3955
interesting_ids.add(file_id)
3956
if tree.kind(file_id) != "directory":
3957
continue
4098
3958
4099
for name, ie in tree.inventory.iter_entries(file_id):
4100
interesting_ids.add(ie.file_id)
4101
new_conflicts = conflicts.select_conflicts(tree, file_list)[0]
4102
else:
4103
# Remerge only supports resolving contents conflicts
4104
allowed_conflicts = ('text conflict', 'contents conflict')
4105
restore_files = [c.path for c in conflicts
4106
if c.typestring in allowed_conflicts]
4107
_mod_merge.transform_tree(tree, tree.basis_tree(), interesting_ids)
4108
tree.set_conflicts(ConflictList(new_conflicts))
4109
if file_list is not None:
4110
restore_files = file_list
4111
for filename in restore_files:
3959
for name, ie in tree.inventory.iter_entries(file_id):
3960
interesting_ids.add(ie.file_id)
3961
new_conflicts = conflicts.select_conflicts(tree, file_list)[0]
3962
else:
3963
# Remerge only supports resolving contents conflicts
3964
allowed_conflicts = ('text conflict', 'contents conflict')
3965
restore_files = [c.path for c in conflicts
3966
if c.typestring in allowed_conflicts]
3967
_mod_merge.transform_tree(tree, tree.basis_tree(), interesting_ids)
3968
tree.set_conflicts(ConflictList(new_conflicts))
3969
if file_list is not None:
3970
restore_files = file_list
3971
for filename in restore_files:
3972
try:
3973
restore(tree.abspath(filename))
3974
except errors.NotConflicted:
3975
pass
3976
# Disable pending merges, because the file texts we are remerging
3977
# have not had those merges performed. If we use the wrong parents
3978
# list, we imply that the working tree text has seen and rejected
3979
# all the changes from the other tree, when in fact those changes
3980
# have not yet been seen.
3981
pb = ui.ui_factory.nested_progress_bar()
3982
tree.set_parent_ids(parents[:1])
4112
3983
try:
4113
restore(tree.abspath(filename))
4114
except errors.NotConflicted:
4115
pass
4116
# Disable pending merges, because the file texts we are remerging
4117
# have not had those merges performed. If we use the wrong parents
4118
# list, we imply that the working tree text has seen and rejected
4119
# all the changes from the other tree, when in fact those changes
4120
# have not yet been seen.
4121
tree.set_parent_ids(parents[:1])
4122
try:
4123
merger = _mod_merge.Merger.from_revision_ids(None, tree, parents[1])
4124
merger.interesting_ids = interesting_ids
4125
merger.merge_type = merge_type
4126
merger.show_base = show_base
4127
merger.reprocess = reprocess
4128
conflicts = merger.do_merge()
3984
merger = _mod_merge.Merger.from_revision_ids(pb,
3985
tree, parents[1])
3986
merger.interesting_ids = interesting_ids
3987
merger.merge_type = merge_type
3988
merger.show_base = show_base
3989
merger.reprocess = reprocess
3990
conflicts = merger.do_merge()
3991
finally:
3992
tree.set_parent_ids(parents)
3993
pb.finished()
4129
3994
finally:
4130
tree.set_parent_ids(parents)
3995
tree.unlock()
4131
3996
if conflicts > 0:
4132
3997
return 1
4133
3998
else:
4135
4000
4136
4001
4137
4002
class cmd_revert(Command):
4138
__doc__ = """Revert files to a previous revision.
4003
"""Revert files to a previous revision.
4139
4004
4140
4005
Giving a list of files will revert only those files. Otherwise, all files
4141
4006
will be reverted. If the revision is not specified with '--revision', the
4155
4020
name. If you name a directory, all the contents of that directory will be
4156
4021
reverted.
4157
4022
4158
If you have newly added files since the target revision, they will be
4159
removed. If the files to be removed have been changed, backups will be
4160
created as above. Directories containing unknown files will not be
4161
deleted.
4023
Any files that have been newly added since that revision will be deleted,
4024
with a backup kept if appropriate. Directories containing unknown files
4025
will not be deleted.
4162
4026
4163
The working tree contains a list of revisions that have been merged but
4164
not yet committed. These revisions will be included as additional parents
4165
of the next commit. Normally, using revert clears that list as well as
4166
reverting the files. If any files are specified, revert leaves the list
4167
of uncommitted merges alone and reverts only the files. Use ``bzr revert
4168
.`` in the tree root to revert all files but keep the recorded merges,
4169
and ``bzr revert --forget-merges`` to clear the pending merge list without
4027
The working tree contains a list of pending merged revisions, which will
4028
be included as parents in the next commit. Normally, revert clears that
4029
list as well as reverting the files. If any files are specified, revert
4030
leaves the pending merge list alone and reverts only the files. Use "bzr
4031
revert ." in the tree root to revert all files but keep the merge record,
4032
and "bzr revert --forget-merges" to clear the pending merge list without
4170
4033
reverting any files.
4171
4172
Using "bzr revert --forget-merges", it is possible to apply all of the
4173
changes from a branch in a single revision. To do this, perform the merge
4174
as desired. Then doing revert with the "--forget-merges" option will keep
4175
the content of the tree as it was, but it will clear the list of pending
4176
merges. The next commit will then contain all of the changes that are
4177
present in the other branch, but without any other parent revisions.
4178
Because this technique forgets where these changes originated, it may
4179
cause additional conflicts on later merges involving the same source and
4180
target branches.
4181
4034
"""
4182
4035
4183
4036
_see_also = ['cat', 'export']
4192
4045
def run(self, revision=None, no_backup=False, file_list=None,
4193
4046
forget_merges=None):
4194
4047
tree, file_list = tree_files(file_list)
4195
self.add_cleanup(tree.lock_tree_write().unlock)
4196
if forget_merges:
4197
tree.set_parent_ids(tree.get_parent_ids()[:1])
4198
else:
4199
self._revert_tree_to_revision(tree, revision, file_list, no_backup)
4048
tree.lock_write()
4049
try:
4050
if forget_merges:
4051
tree.set_parent_ids(tree.get_parent_ids()[:1])
4052
else:
4053
self._revert_tree_to_revision(tree, revision, file_list, no_backup)
4054
finally:
4055
tree.unlock()
4200
4056
4201
4057
@staticmethod
4202
4058
def _revert_tree_to_revision(tree, revision, file_list, no_backup):
4203
4059
rev_tree = _get_one_revision_tree('revert', revision, tree=tree)
4204
tree.revert(file_list, rev_tree, not no_backup, None,
4205
report_changes=True)
4060
pb = ui.ui_factory.nested_progress_bar()
4061
try:
4062
tree.revert(file_list, rev_tree, not no_backup, pb,
4063
report_changes=True)
4064
finally:
4065
pb.finished()
4206
4066
4207
4067
4208
4068
class cmd_assert_fail(Command):
4209
__doc__ = """Test reporting of assertion failures"""
4069
"""Test reporting of assertion failures"""
4210
4070
# intended just for use in testing
4211
4071
4212
4072
hidden = True
4216
4076
4217
4077
4218
4078
class cmd_help(Command):
4219
__doc__ = """Show help on a command or other topic.
4079
"""Show help on a command or other topic.
4220
4080
"""
4221
4081
4222
4082
_see_also = ['topics']
4235
4095
4236
4096
4237
4097
class cmd_shell_complete(Command):
4238
__doc__ = """Show appropriate completions for context.
4098
"""Show appropriate completions for context.
4239
4099
4240
4100
For a list of all available commands, say 'bzr shell-complete'.
4241
4101
"""
4250
4110
4251
4111
4252
4112
class cmd_missing(Command):
4253
__doc__ = """Show unmerged/unpulled revisions between two branches.
4113
"""Show unmerged/unpulled revisions between two branches.
4254
4114
4255
4115
OTHER_BRANCH may be local or remote.
4256
4116
4257
4117
To filter on a range of revisions, you can use the command -r begin..end
4258
4118
-r revision requests a specific revision, -r ..end or -r begin.. are
4259
4119
also valid.
4260
4261
:Exit values:
4262
1 - some missing revisions
4263
0 - no missing revisions
4264
4120
4265
4121
:Examples:
4266
4122
4334
4190
restrict = 'remote'
4335
4191
4336
4192
local_branch = Branch.open_containing(u".")[0]
4337
self.add_cleanup(local_branch.lock_read().unlock)
4338
4339
4193
parent = local_branch.get_parent()
4340
4194
if other_branch is None:
4341
4195
other_branch = parent
4350
4204
remote_branch = Branch.open(other_branch)
4351
4205
if remote_branch.base == local_branch.base:
4352
4206
remote_branch = local_branch
4353
else:
4354
self.add_cleanup(remote_branch.lock_read().unlock)
4355
4207
4356
4208
local_revid_range = _revision_range_to_revid_range(
4357
4209
_get_revision_range(my_revision, local_branch,
4361
4213
_get_revision_range(revision,
4362
4214
remote_branch, self.name()))
4363
4215
4364
local_extra, remote_extra = find_unmerged(
4365
local_branch, remote_branch, restrict,
4366
backward=not reverse,
4367
include_merges=include_merges,
4368
local_revid_range=local_revid_range,
4369
remote_revid_range=remote_revid_range)
4370
4371
if log_format is None:
4372
registry = log.log_formatter_registry
4373
log_format = registry.get_default(local_branch)
4374
lf = log_format(to_file=self.outf,
4375
show_ids=show_ids,
4376
show_timezone='original')
4377
4378
status_code = 0
4379
if local_extra and not theirs_only:
4380
message("You have %d extra revision(s):\n" %
4381
len(local_extra))
4382
for revision in iter_log_revisions(local_extra,
4383
local_branch.repository,
4384
verbose):
4385
lf.log_revision(revision)
4386
printed_local = True
4387
status_code = 1
4388
else:
4389
printed_local = False
4390
4391
if remote_extra and not mine_only:
4392
if printed_local is True:
4393
message("\n\n\n")
4394
message("You are missing %d revision(s):\n" %
4395
len(remote_extra))
4396
for revision in iter_log_revisions(remote_extra,
4397
remote_branch.repository,
4398
verbose):
4399
lf.log_revision(revision)
4400
status_code = 1
4401
4402
if mine_only and not local_extra:
4403
# We checked local, and found nothing extra
4404
message('This branch is up to date.\n')
4405
elif theirs_only and not remote_extra:
4406
# We checked remote, and found nothing extra
4407
message('Other branch is up to date.\n')
4408
elif not (mine_only or theirs_only or local_extra or
4409
remote_extra):
4410
# We checked both branches, and neither one had extra
4411
# revisions
4412
message("Branches are up to date.\n")
4413
self.cleanup_now()
4216
local_branch.lock_read()
4217
try:
4218
remote_branch.lock_read()
4219
try:
4220
local_extra, remote_extra = find_unmerged(
4221
local_branch, remote_branch, restrict,
4222
backward=not reverse,
4223
include_merges=include_merges,
4224
local_revid_range=local_revid_range,
4225
remote_revid_range=remote_revid_range)
4226
4227
if log_format is None:
4228
registry = log.log_formatter_registry
4229
log_format = registry.get_default(local_branch)
4230
lf = log_format(to_file=self.outf,
4231
show_ids=show_ids,
4232
show_timezone='original')
4233
4234
status_code = 0
4235
if local_extra and not theirs_only:
4236
message("You have %d extra revision(s):\n" %
4237
len(local_extra))
4238
for revision in iter_log_revisions(local_extra,
4239
local_branch.repository,
4240
verbose):
4241
lf.log_revision(revision)
4242
printed_local = True
4243
status_code = 1
4244
else:
4245
printed_local = False
4246
4247
if remote_extra and not mine_only:
4248
if printed_local is True:
4249
message("\n\n\n")
4250
message("You are missing %d revision(s):\n" %
4251
len(remote_extra))
4252
for revision in iter_log_revisions(remote_extra,
4253
remote_branch.repository,
4254
verbose):
4255
lf.log_revision(revision)
4256
status_code = 1
4257
4258
if mine_only and not local_extra:
4259
# We checked local, and found nothing extra
4260
message('This branch is up to date.\n')
4261
elif theirs_only and not remote_extra:
4262
# We checked remote, and found nothing extra
4263
message('Other branch is up to date.\n')
4264
elif not (mine_only or theirs_only or local_extra or
4265
remote_extra):
4266
# We checked both branches, and neither one had extra
4267
# revisions
4268
message("Branches are up to date.\n")
4269
finally:
4270
remote_branch.unlock()
4271
finally:
4272
local_branch.unlock()
4414
4273
if not status_code and parent is None and other_branch is not None:
4415
self.add_cleanup(local_branch.lock_write().unlock)
4416
# handle race conditions - a parent might be set while we run.
4417
if local_branch.get_parent() is None:
4418
local_branch.set_parent(remote_branch.base)
4274
local_branch.lock_write()
4275
try:
4276
# handle race conditions - a parent might be set while we run.
4277
if local_branch.get_parent() is None:
4278
local_branch.set_parent(remote_branch.base)
4279
finally:
4280
local_branch.unlock()
4419
4281
return status_code
4420
4282
4421
4283
4422
4284
class cmd_pack(Command):
4423
__doc__ = """Compress the data within a repository.
4424
4425
This operation compresses the data within a bazaar repository. As
4426
bazaar supports automatic packing of repository, this operation is
4427
normally not required to be done manually.
4428
4429
During the pack operation, bazaar takes a backup of existing repository
4430
data, i.e. pack files. This backup is eventually removed by bazaar
4431
automatically when it is safe to do so. To save disk space by removing
4432
the backed up pack files, the --clean-obsolete-packs option may be
4433
used.
4434
4435
Warning: If you use --clean-obsolete-packs and your machine crashes
4436
during or immediately after repacking, you may be left with a state
4437
where the deletion has been written to disk but the new packs have not
4438
been. In this case the repository may be unusable.
4439
"""
4285
"""Compress the data within a repository."""
4440
4286
4441
4287
_see_also = ['repositories']
4442
4288
takes_args = ['branch_or_repo?']
4443
takes_options = [
4444
Option('clean-obsolete-packs', 'Delete obsolete packs to save disk space.'),
4445
]
4446
4289
4447
def run(self, branch_or_repo='.', clean_obsolete_packs=False):
4290
def run(self, branch_or_repo='.'):
4448
4291
dir = bzrdir.BzrDir.open_containing(branch_or_repo)[0]
4449
4292
try:
4450
4293
branch = dir.open_branch()
4451
4294
repository = branch.repository
4452
4295
except errors.NotBranchError:
4453
4296
repository = dir.open_repository()
4454
repository.pack(clean_obsolete_packs=clean_obsolete_packs)
4297
repository.pack()
4455
4298
4456
4299
4457
4300
class cmd_plugins(Command):
4458
__doc__ = """List the installed plugins.
4301
"""List the installed plugins.
4459
4302
4460
4303
This command displays the list of installed plugins including
4461
4304
version of plugin and a short description of each.
4468
4311
adding new commands, providing additional network transports and
4469
4312
customizing log output.
4470
4313
4471
See the Bazaar Plugin Guide <http://doc.bazaar.canonical.com/plugins/en/>
4472
for further information on plugins including where to find them and how to
4473
install them. Instructions are also provided there on how to write new
4474
plugins using the Python programming language.
4314
See the Bazaar web site, http://bazaar-vcs.org, for further
4315
information on plugins including where to find them and how to
4316
install them. Instructions are also provided there on how to
4317
write new plugins using the Python programming language.
4475
4318
"""
4476
4319
takes_options = ['verbose']
4477
4320
4492
4335
doc = '(no description)'
4493
4336
result.append((name_ver, doc, plugin.path()))
4494
4337
for name_ver, doc, path in sorted(result):
4495
self.outf.write("%s\n" % name_ver)
4496
self.outf.write(" %s\n" % doc)
4338
print name_ver
4339
print ' ', doc
4497
4340
if verbose:
4498
self.outf.write(" %s\n" % path)
4499
self.outf.write("\n")
4341
print ' ', path
4342
print
4500
4343
4501
4344
4502
4345
class cmd_testament(Command):
4503
__doc__ = """Show testament (signing-form) of a revision."""
4346
"""Show testament (signing-form) of a revision."""
4504
4347
takes_options = [
4505
4348
'revision',
4506
4349
Option('long', help='Produce long-format testament.'),
4518
4361
b = Branch.open_containing(branch)[0]
4519
4362
else:
4520
4363
b = Branch.open(branch)
4521
self.add_cleanup(b.lock_read().unlock)
4522
if revision is None:
4523
rev_id = b.last_revision()
4524
else:
4525
rev_id = revision[0].as_revision_id(b)
4526
t = testament_class.from_revision(b.repository, rev_id)
4527
if long:
4528
sys.stdout.writelines(t.as_text_lines())
4529
else:
4530
sys.stdout.write(t.as_short_text())
4364
b.lock_read()
4365
try:
4366
if revision is None:
4367
rev_id = b.last_revision()
4368
else:
4369
rev_id = revision[0].as_revision_id(b)
4370
t = testament_class.from_revision(b.repository, rev_id)
4371
if long:
4372
sys.stdout.writelines(t.as_text_lines())
4373
else:
4374
sys.stdout.write(t.as_short_text())
4375
finally:
4376
b.unlock()
4531
4377
4532
4378
4533
4379
class cmd_annotate(Command):
4534
__doc__ = """Show the origin of each line in a file.
4380
"""Show the origin of each line in a file.
4535
4381
4536
4382
This prints out the given file with an annotation on the left side
4537
4383
indicating which revision, author and date introduced the change.
4548
4394
Option('long', help='Show commit date in annotations.'),
4549
4395
'revision',
4550
4396
'show-ids',
4551
'directory',
4552
4397
]
4553
4398
encoding_type = 'exact'
4554
4399
4555
4400
@display_command
4556
4401
def run(self, filename, all=False, long=False, revision=None,
4557
show_ids=False, directory=None):
4402
show_ids=False):
4558
4403
from bzrlib.annotate import annotate_file, annotate_file_tree
4559
4404
wt, branch, relpath = \
4560
_open_directory_or_containing_tree_or_branch(filename, directory)
4561
if wt is not None:
4562
self.add_cleanup(wt.lock_read().unlock)
4563
else:
4564
self.add_cleanup(branch.lock_read().unlock)
4565
tree = _get_one_revision_tree('annotate', revision, branch=branch)
4566
self.add_cleanup(tree.lock_read().unlock)
4567
if wt is not None:
4568
file_id = wt.path2id(relpath)
4569
else:
4570
file_id = tree.path2id(relpath)
4571
if file_id is None:
4572
raise errors.NotVersionedError(filename)
4573
file_version = tree.inventory[file_id].revision
4574
if wt is not None and revision is None:
4575
# If there is a tree and we're not annotating historical
4576
# versions, annotate the working tree's content.
4577
annotate_file_tree(wt, file_id, self.outf, long, all,
4578
show_ids=show_ids)
4579
else:
4580
annotate_file(branch, file_version, file_id, long, all, self.outf,
4581
show_ids=show_ids)
4405
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
4406
if wt is not None:
4407
wt.lock_read()
4408
else:
4409
branch.lock_read()
4410
try:
4411
tree = _get_one_revision_tree('annotate', revision, branch=branch)
4412
if wt is not None:
4413
file_id = wt.path2id(relpath)
4414
else:
4415
file_id = tree.path2id(relpath)
4416
if file_id is None:
4417
raise errors.NotVersionedError(filename)
4418
file_version = tree.inventory[file_id].revision
4419
if wt is not None and revision is None:
4420
# If there is a tree and we're not annotating historical
4421
# versions, annotate the working tree's content.
4422
annotate_file_tree(wt, file_id, self.outf, long, all,
4423
show_ids=show_ids)
4424
else:
4425
annotate_file(branch, file_version, file_id, long, all, self.outf,
4426
show_ids=show_ids)
4427
finally:
4428
if wt is not None:
4429
wt.unlock()
4430
else:
4431
branch.unlock()
4582
4432
4583
4433
4584
4434
class cmd_re_sign(Command):
4585
__doc__ = """Create a digital signature for an existing revision."""
4435
"""Create a digital signature for an existing revision."""
4586
4436
# TODO be able to replace existing ones.
4587
4437
4588
4438
hidden = True # is this right ?
4589
4439
takes_args = ['revision_id*']
4590
takes_options = ['directory', 'revision']
4440
takes_options = ['revision']
4591
4441
4592
def run(self, revision_id_list=None, revision=None, directory=u'.'):
4442
def run(self, revision_id_list=None, revision=None):
4593
4443
if revision_id_list is not None and revision is not None:
4594
4444
raise errors.BzrCommandError('You can only supply one of revision_id or --revision')
4595
4445
if revision_id_list is None and revision is None:
4596
4446
raise errors.BzrCommandError('You must supply either --revision or a revision_id')
4597
b = WorkingTree.open_containing(directory)[0].branch
4598
self.add_cleanup(b.lock_write().unlock)
4599
return self._run(b, revision_id_list, revision)
4447
b = WorkingTree.open_containing(u'.')[0].branch
4448
b.lock_write()
4449
try:
4450
return self._run(b, revision_id_list, revision)
4451
finally:
4452
b.unlock()
4600
4453
4601
4454
def _run(self, b, revision_id_list, revision):
4602
4455
import bzrlib.gpg as gpg
4647
4500
4648
4501
4649
4502
class cmd_bind(Command):
4650
__doc__ = """Convert the current branch into a checkout of the supplied branch.
4651
If no branch is supplied, rebind to the last bound location.
4503
"""Convert the current branch into a checkout of the supplied branch.
4652
4504
4653
4505
Once converted into a checkout, commits must succeed on the master branch
4654
4506
before they will be applied to the local branch.
4655
4507
4656
4508
Bound branches use the nickname of its master branch unless it is set
4657
locally, in which case binding will update the local nickname to be
4509
locally, in which case binding will update the the local nickname to be
4658
4510
that of the master.
4659
4511
"""
4660
4512
4661
4513
_see_also = ['checkouts', 'unbind']
4662
4514
takes_args = ['location?']
4663
takes_options = ['directory']
4515
takes_options = []
4664
4516
4665
def run(self, location=None, directory=u'.'):
4666
b, relpath = Branch.open_containing(directory)
4517
def run(self, location=None):
4518
b, relpath = Branch.open_containing(u'.')
4667
4519
if location is None:
4668
4520
try:
4669
4521
location = b.get_old_bound_location()
4672
4524
'This format does not remember old locations.')
4673
4525
else:
4674
4526
if location is None:
4675
if b.get_bound_location() is not None:
4676
raise errors.BzrCommandError('Branch is already bound')
4677
else:
4678
raise errors.BzrCommandError('No location supplied '
4679
'and no previous location known')
4527
raise errors.BzrCommandError('No location supplied and no '
4528
'previous location known')
4680
4529
b_other = Branch.open(location)
4681
4530
try:
4682
4531
b.bind(b_other)
4688
4537
4689
4538
4690
4539
class cmd_unbind(Command):
4691
__doc__ = """Convert the current checkout into a regular branch.
4540
"""Convert the current checkout into a regular branch.
4692
4541
4693
4542
After unbinding, the local branch is considered independent and subsequent
4694
4543
commits will be local only.
4696
4545
4697
4546
_see_also = ['checkouts', 'bind']
4698
4547
takes_args = []
4699
takes_options = ['directory']
4548
takes_options = []
4700
4549
4701
def run(self, directory=u'.'):
4702
b, relpath = Branch.open_containing(directory)
4550
def run(self):
4551
b, relpath = Branch.open_containing(u'.')
4703
4552
if not b.unbind():
4704
4553
raise errors.BzrCommandError('Local branch is not bound')
4705
4554
4706
4555
4707
4556
class cmd_uncommit(Command):
4708
__doc__ = """Remove the last committed revision.
4557
"""Remove the last committed revision.
4709
4558
4710
4559
--verbose will print out what is being removed.
4711
4560
--dry-run will go through all the motions, but not actually
4751
4600
b = control.open_branch()
4752
4601
4753
4602
if tree is not None:
4754
self.add_cleanup(tree.lock_write().unlock)
4603
tree.lock_write()
4755
4604
else:
4756
self.add_cleanup(b.lock_write().unlock)
4757
return self._run(b, tree, dry_run, verbose, revision, force, local=local)
4605
b.lock_write()
4606
try:
4607
return self._run(b, tree, dry_run, verbose, revision, force,
4608
local=local)
4609
finally:
4610
if tree is not None:
4611
tree.unlock()
4612
else:
4613
b.unlock()
4758
4614
4759
4615
def _run(self, b, tree, dry_run, verbose, revision, force, local=False):
4760
4616
from bzrlib.log import log_formatter, show_log
4792
4648
end_revision=last_revno)
4793
4649
4794
4650
if dry_run:
4795
self.outf.write('Dry-run, pretending to remove'
4796
' the above revisions.\n')
4651
print 'Dry-run, pretending to remove the above revisions.'
4652
if not force:
4653
val = raw_input('Press <enter> to continue')
4797
4654
else:
4798
self.outf.write('The above revision(s) will be removed.\n')
4799
4800
if not force:
4801
if not ui.ui_factory.get_boolean('Are you sure'):
4802
self.outf.write('Canceled')
4803
return 0
4655
print 'The above revision(s) will be removed.'
4656
if not force:
4657
val = raw_input('Are you sure [y/N]? ')
4658
if val.lower() not in ('y', 'yes'):
4659
print 'Canceled'
4660
return 0
4804
4661
4805
4662
mutter('Uncommitting from {%s} to {%s}',
4806
4663
last_rev_id, rev_id)
4807
4664
uncommit(b, tree=tree, dry_run=dry_run, verbose=verbose,
4808
4665
revno=revno, local=local)
4809
self.outf.write('You can restore the old tip by running:\n'
4810
' bzr pull . -r revid:%s\n' % last_rev_id)
4666
note('You can restore the old tip by running:\n'
4667
' bzr pull . -r revid:%s', last_rev_id)
4811
4668
4812
4669
4813
4670
class cmd_break_lock(Command):
4814
__doc__ = """Break a dead lock on a repository, branch or working directory.
4671
"""Break a dead lock on a repository, branch or working directory.
4815
4672
4816
4673
CAUTION: Locks should only be broken when you are sure that the process
4817
4674
holding the lock has been stopped.
4818
4675
4819
You can get information on what locks are open via the 'bzr info
4820
[location]' command.
4676
You can get information on what locks are open via the 'bzr info' command.
4821
4677
4822
4678
:Examples:
4823
4679
bzr break-lock
4824
bzr break-lock bzr+ssh://example.com/bzr/foo
4825
4680
"""
4826
4681
takes_args = ['location?']
4827
4682
4836
4691
4837
4692
4838
4693
class cmd_wait_until_signalled(Command):
4839
__doc__ = """Test helper for test_start_and_stop_bzr_subprocess_send_signal.
4694
"""Test helper for test_start_and_stop_bzr_subprocess_send_signal.
4840
4695
4841
4696
This just prints a line to signal when it is ready, then blocks on stdin.
4842
4697
"""
4850
4705
4851
4706
4852
4707
class cmd_serve(Command):
4853
__doc__ = """Run the bzr server."""
4708
"""Run the bzr server."""
4854
4709
4855
4710
aliases = ['server']
4856
4711
4857
4712
takes_options = [
4858
4713
Option('inet',
4859
4714
help='Serve on stdin/out for use from inetd or sshd.'),
4860
RegistryOption('protocol',
4861
help="Protocol to serve.",
4715
RegistryOption('protocol',
4716
help="Protocol to serve.",
4862
4717
lazy_registry=('bzrlib.transport', 'transport_server_registry'),
4863
4718
value_switches=True),
4864
4719
Option('port',
4867
4722
'result in a dynamically allocated port. The default port '
4868
4723
'depends on the protocol.',
4869
4724
type=str),
4870
custom_help('directory',
4871
help='Serve contents of this directory.'),
4725
Option('directory',
4726
help='Serve contents of this directory.',
4727
type=unicode),
4872
4728
Option('allow-writes',
4873
4729
help='By default the server is a readonly server. Supplying '
4874
4730
'--allow-writes enables write access to the contents of '
4875
'the served directory and below. Note that ``bzr serve`` '
4876
'does not perform authentication, so unless some form of '
4877
'external authentication is arranged supplying this '
4878
'option leads to global uncontrolled write access to your '
4879
'file system.'
4731
'the served directory and below.'
4880
4732
),
4881
4733
]
4882
4734
4915
4767
4916
4768
4917
4769
class cmd_join(Command):
4918
__doc__ = """Combine a tree into its containing tree.
4770
"""Combine a tree into its containing tree.
4919
4771
4920
4772
This command requires the target tree to be in a rich-root format.
4921
4773
4961
4813
4962
4814
4963
4815
class cmd_split(Command):
4964
__doc__ = """Split a subdirectory of a tree into a separate tree.
4816
"""Split a subdirectory of a tree into a separate tree.
4965
4817
4966
4818
This command will produce a target tree in a format that supports
4967
4819
rich roots, like 'rich-root' or 'rich-root-pack'. These formats cannot be
4987
4839
4988
4840
4989
4841
class cmd_merge_directive(Command):
4990
__doc__ = """Generate a merge directive for auto-merge tools.
4842
"""Generate a merge directive for auto-merge tools.
4991
4843
4992
4844
A directive requests a merge to be performed, and also provides all the
4993
4845
information necessary to do so. This means it must either include a
5086
4938
5087
4939
5088
4940
class cmd_send(Command):
5089
__doc__ = """Mail or create a merge-directive for submitting changes.
4941
"""Mail or create a merge-directive for submitting changes.
5090
4942
5091
4943
A merge directive provides many things needed for requesting merges:
5092
4944
5098
4950
directly from the merge directive, without retrieving data from a
5099
4951
branch.
5100
4952
5101
`bzr send` creates a compact data set that, when applied using bzr
5102
merge, has the same effect as merging from the source branch.
5103
5104
By default the merge directive is self-contained and can be applied to any
5105
branch containing submit_branch in its ancestory without needing access to
5106
the source branch.
5107
5108
If --no-bundle is specified, then Bazaar doesn't send the contents of the
5109
revisions, but only a structured request to merge from the
5110
public_location. In that case the public_branch is needed and it must be
5111
up-to-date and accessible to the recipient. The public_branch is always
5112
included if known, so that people can check it later.
5113
5114
The submit branch defaults to the parent of the source branch, but can be
5115
overridden. Both submit branch and public branch will be remembered in
5116
branch.conf the first time they are used for a particular branch. The
5117
source branch defaults to that containing the working directory, but can
5118
be changed using --from.
5119
5120
In order to calculate those changes, bzr must analyse the submit branch.
5121
Therefore it is most efficient for the submit branch to be a local mirror.
5122
If a public location is known for the submit_branch, that location is used
5123
in the merge directive.
5124
5125
The default behaviour is to send the merge directive by mail, unless -o is
5126
given, in which case it is sent to a file.
4953
If --no-bundle is specified, then public_branch is needed (and must be
4954
up-to-date), so that the receiver can perform the merge using the
4955
public_branch. The public_branch is always included if known, so that
4956
people can check it later.
4957
4958
The submit branch defaults to the parent, but can be overridden. Both
4959
submit branch and public branch will be remembered if supplied.
4960
4961
If a public_branch is known for the submit_branch, that public submit
4962
branch is used in the merge instructions. This means that a local mirror
4963
can be used as your actual submit branch, once you have set public_branch
4964
for that mirror.
5127
4965
5128
4966
Mail is sent using your preferred mail program. This should be transparent
5129
4967
on Windows (it uses MAPI). On Linux, it requires the xdg-email utility.
5131
4969
5132
4970
To use a specific mail program, set the mail_client configuration option.
5133
4971
(For Thunderbird 1.5, this works around some bugs.) Supported values for
5134
specific clients are "claws", "evolution", "kmail", "mail.app" (MacOS X's
5135
Mail.app), "mutt", and "thunderbird"; generic options are "default",
5136
"editor", "emacsclient", "mapi", and "xdg-email". Plugins may also add
5137
supported clients.
4972
specific clients are "claws", "evolution", "kmail", "mutt", and
4973
"thunderbird"; generic options are "default", "editor", "emacsclient",
4974
"mapi", and "xdg-email". Plugins may also add supported clients.
5138
4975
5139
4976
If mail is being sent, a to address is required. This can be supplied
5140
4977
either on the commandline, by setting the submit_to configuration
5149
4986
5150
4987
The merge directives created by bzr send may be applied using bzr merge or
5151
4988
bzr pull by specifying a file containing a merge directive as the location.
5152
5153
bzr send makes extensive use of public locations to map local locations into
5154
URLs that can be used by other people. See `bzr help configuration` to
5155
set them, and use `bzr info` to display them.
5156
4989
"""
5157
4990
5158
4991
encoding_type = 'exact'
5174
5007
short_name='f',
5175
5008
type=unicode),
5176
5009
Option('output', short_name='o',
5177
help='Write merge directive to this file or directory; '
5010
help='Write merge directive to this file; '
5178
5011
'use - for stdout.',
5179
5012
type=unicode),
5180
5013
Option('strict',
5203
5036
5204
5037
5205
5038
class cmd_bundle_revisions(cmd_send):
5206
__doc__ = """Create a merge-directive for submitting changes.
5039
"""Create a merge-directive for submitting changes.
5207
5040
5208
5041
A merge directive provides many things needed for requesting merges:
5209
5042
5276
5109
5277
5110
5278
5111
class cmd_tag(Command):
5279
__doc__ = """Create, remove or modify a tag naming a revision.
5112
"""Create, remove or modify a tag naming a revision.
5280
5113
5281
5114
Tags give human-meaningful names to revisions. Commands that take a -r
5282
5115
(--revision) option can be given -rtag:X, where X is any previously
5290
5123
5291
5124
To rename a tag (change the name but keep it on the same revsion), run ``bzr
5292
5125
tag new-name -r tag:old-name`` and then ``bzr tag --delete oldname``.
5293
5294
If no tag name is specified it will be determined through the
5295
'automatic_tag_name' hook. This can e.g. be used to automatically tag
5296
upstream releases by reading configure.ac. See ``bzr help hooks`` for
5297
details.
5298
5126
"""
5299
5127
5300
5128
_see_also = ['commit', 'tags']
5301
takes_args = ['tag_name?']
5129
takes_args = ['tag_name']
5302
5130
takes_options = [
5303
5131
Option('delete',
5304
5132
help='Delete this tag rather than placing it.',
5305
5133
),
5306
custom_help('directory',
5307
help='Branch in which to place the tag.'),
5134
Option('directory',
5135
help='Branch in which to place the tag.',
5136
short_name='d',
5137
type=unicode,
5138
),
5308
5139
Option('force',
5309
5140
help='Replace existing tags.',
5310
5141
),
5311
5142
'revision',
5312
5143
]
5313
5144
5314
def run(self, tag_name=None,
5145
def run(self, tag_name,
5315
5146
delete=None,
5316
5147
directory='.',
5317
5148
force=None,
5318
5149
revision=None,
5319
5150
):
5320
5151
branch, relpath = Branch.open_containing(directory)
5321
self.add_cleanup(branch.lock_write().unlock)
5322
if delete:
5323
if tag_name is None:
5324
raise errors.BzrCommandError("No tag specified to delete.")
5325
branch.tags.delete_tag(tag_name)
5326
self.outf.write('Deleted tag %s.\n' % tag_name)
5327
else:
5328
if revision:
5329
if len(revision) != 1:
5330
raise errors.BzrCommandError(
5331
"Tags can only be placed on a single revision, "
5332
"not on a range")
5333
revision_id = revision[0].as_revision_id(branch)
5152
branch.lock_write()
5153
try:
5154
if delete:
5155
branch.tags.delete_tag(tag_name)
5156
self.outf.write('Deleted tag %s.\n' % tag_name)
5334
5157
else:
5335
revision_id = branch.last_revision()
5336
if tag_name is None:
5337
tag_name = branch.automatic_tag_name(revision_id)
5338
if tag_name is None:
5339
raise errors.BzrCommandError(
5340
"Please specify a tag name.")
5341
if (not force) and branch.tags.has_tag(tag_name):
5342
raise errors.TagAlreadyExists(tag_name)
5343
branch.tags.set_tag(tag_name, revision_id)
5344
self.outf.write('Created tag %s.\n' % tag_name)
5158
if revision:
5159
if len(revision) != 1:
5160
raise errors.BzrCommandError(
5161
"Tags can only be placed on a single revision, "
5162
"not on a range")
5163
revision_id = revision[0].as_revision_id(branch)
5164
else:
5165
revision_id = branch.last_revision()
5166
if (not force) and branch.tags.has_tag(tag_name):
5167
raise errors.TagAlreadyExists(tag_name)
5168
branch.tags.set_tag(tag_name, revision_id)
5169
self.outf.write('Created tag %s.\n' % tag_name)
5170
finally:
5171
branch.unlock()
5345
5172
5346
5173
5347
5174
class cmd_tags(Command):
5348
__doc__ = """List tags.
5175
"""List tags.
5349
5176
5350
5177
This command shows a table of tag names and the revisions they reference.
5351
5178
"""
5352
5179
5353
5180
_see_also = ['tag']
5354
5181
takes_options = [
5355
custom_help('directory',
5356
help='Branch whose tags should be displayed.'),
5182
Option('directory',
5183
help='Branch whose tags should be displayed.',
5184
short_name='d',
5185
type=unicode,
5186
),
5357
5187
RegistryOption.from_kwargs('sort',
5358
5188
'Sort tags by different criteria.', title='Sorting',
5359
5189
alpha='Sort tags lexicographically (default).',
5376
5206
if not tags:
5377
5207
return
5378
5208
5379
self.add_cleanup(branch.lock_read().unlock)
5380
if revision:
5381
graph = branch.repository.get_graph()
5382
rev1, rev2 = _get_revision_range(revision, branch, self.name())
5383
revid1, revid2 = rev1.rev_id, rev2.rev_id
5384
# only show revisions between revid1 and revid2 (inclusive)
5385
tags = [(tag, revid) for tag, revid in tags if
5386
graph.is_between(revid, revid1, revid2)]
5387
if sort == 'alpha':
5388
tags.sort()
5389
elif sort == 'time':
5390
timestamps = {}
5391
for tag, revid in tags:
5392
try:
5393
revobj = branch.repository.get_revision(revid)
5394
except errors.NoSuchRevision:
5395
timestamp = sys.maxint # place them at the end
5396
else:
5397
timestamp = revobj.timestamp
5398
timestamps[revid] = timestamp
5399
tags.sort(key=lambda x: timestamps[x[1]])
5400
if not show_ids:
5401
# [ (tag, revid), ... ] -> [ (tag, dotted_revno), ... ]
5402
for index, (tag, revid) in enumerate(tags):
5403
try:
5404
revno = branch.revision_id_to_dotted_revno(revid)
5405
if isinstance(revno, tuple):
5406
revno = '.'.join(map(str, revno))
5407
except errors.NoSuchRevision:
5408
# Bad tag data/merges can lead to tagged revisions
5409
# which are not in this branch. Fail gracefully ...
5410
revno = '?'
5411
tags[index] = (tag, revno)
5412
self.cleanup_now()
5209
branch.lock_read()
5210
try:
5211
if revision:
5212
graph = branch.repository.get_graph()
5213
rev1, rev2 = _get_revision_range(revision, branch, self.name())
5214
revid1, revid2 = rev1.rev_id, rev2.rev_id
5215
# only show revisions between revid1 and revid2 (inclusive)
5216
tags = [(tag, revid) for tag, revid in tags if
5217
graph.is_between(revid, revid1, revid2)]
5218
if sort == 'alpha':
5219
tags.sort()
5220
elif sort == 'time':
5221
timestamps = {}
5222
for tag, revid in tags:
5223
try:
5224
revobj = branch.repository.get_revision(revid)
5225
except errors.NoSuchRevision:
5226
timestamp = sys.maxint # place them at the end
5227
else:
5228
timestamp = revobj.timestamp
5229
timestamps[revid] = timestamp
5230
tags.sort(key=lambda x: timestamps[x[1]])
5231
if not show_ids:
5232
# [ (tag, revid), ... ] -> [ (tag, dotted_revno), ... ]
5233
for index, (tag, revid) in enumerate(tags):
5234
try:
5235
revno = branch.revision_id_to_dotted_revno(revid)
5236
if isinstance(revno, tuple):
5237
revno = '.'.join(map(str, revno))
5238
except errors.NoSuchRevision:
5239
# Bad tag data/merges can lead to tagged revisions
5240
# which are not in this branch. Fail gracefully ...
5241
revno = '?'
5242
tags[index] = (tag, revno)
5243
finally:
5244
branch.unlock()
5413
5245
for tag, revspec in tags:
5414
5246
self.outf.write('%-20s %s\n' % (tag, revspec))
5415
5247
5416
5248
5417
5249
class cmd_reconfigure(Command):
5418
__doc__ = """Reconfigure the type of a bzr directory.
5250
"""Reconfigure the type of a bzr directory.
5419
5251
5420
5252
A target configuration must be specified.
5421
5253
5506
5338
5507
5339
5508
5340
class cmd_switch(Command):
5509
__doc__ = """Set the branch of a checkout and update.
5341
"""Set the branch of a checkout and update.
5510
5342
5511
5343
For lightweight checkouts, this changes the branch being referenced.
5512
5344
For heavyweight checkouts, this checks that there are no local commits
5524
5356
/path/to/newbranch.
5525
5357
5526
5358
Bound branches use the nickname of its master branch unless it is set
5527
locally, in which case switching will update the local nickname to be
5359
locally, in which case switching will update the the local nickname to be
5528
5360
that of the master.
5529
5361
"""
5530
5362
5531
takes_args = ['to_location?']
5363
takes_args = ['to_location']
5532
5364
takes_options = [Option('force',
5533
5365
help='Switch even if local commits will be lost.'),
5534
'revision',
5535
5366
Option('create-branch', short_name='b',
5536
5367
help='Create the target branch from this one before'
5537
5368
' switching to it.'),
5538
]
5369
]
5539
5370
5540
def run(self, to_location=None, force=False, create_branch=False,
5541
revision=None):
5371
def run(self, to_location, force=False, create_branch=False):
5542
5372
from bzrlib import switch
5543
5373
tree_location = '.'
5544
revision = _get_one_revision('switch', revision)
5545
5374
control_dir = bzrdir.BzrDir.open_containing(tree_location)[0]
5546
if to_location is None:
5547
if revision is None:
5548
raise errors.BzrCommandError('You must supply either a'
5549
' revision or a location')
5550
to_location = '.'
5551
5375
try:
5552
5376
branch = control_dir.open_branch()
5553
5377
had_explicit_nick = branch.get_config().has_explicit_nickname()
5558
5382
if branch is None:
5559
5383
raise errors.BzrCommandError('cannot create branch without'
5560
5384
' source branch')
5561
to_location = directory_service.directories.dereference(
5562
to_location)
5563
5385
if '/' not in to_location and '\\' not in to_location:
5564
5386
# This path is meant to be relative to the existing branch
5565
5387
this_url = self._get_branch_location(control_dir)
5567
5389
to_branch = branch.bzrdir.sprout(to_location,
5568
5390
possible_transports=[branch.bzrdir.root_transport],
5569
5391
source_branch=branch).open_branch()
5392
# try:
5393
# from_branch = control_dir.open_branch()
5394
# except errors.NotBranchError:
5395
# raise BzrCommandError('Cannot create a branch from this'
5396
# ' location when we cannot open this branch')
5397
# from_branch.bzrdir.sprout(
5398
pass
5570
5399
else:
5571
5400
try:
5572
5401
to_branch = Branch.open(to_location)
5574
5403
this_url = self._get_branch_location(control_dir)
5575
5404
to_branch = Branch.open(
5576
5405
urlutils.join(this_url, '..', to_location))
5577
if revision is not None:
5578
revision = revision.as_revision_id(to_branch)
5579
switch.switch(control_dir, to_branch, force, revision_id=revision)
5406
switch.switch(control_dir, to_branch, force)
5580
5407
if had_explicit_nick:
5581
5408
branch = control_dir.open_branch() #get the new branch!
5582
5409
branch.nick = to_branch.nick
5602
5429
5603
5430
5604
5431
class cmd_view(Command):
5605
__doc__ = """Manage filtered views.
5432
"""Manage filtered views.
5606
5433
5607
5434
Views provide a mask over the tree so that users can focus on
5608
5435
a subset of a tree when doing their work. After creating a view,
5756
5583
5757
5584
5758
5585
class cmd_hooks(Command):
5759
__doc__ = """Show hooks."""
5586
"""Show hooks."""
5760
5587
5761
5588
hidden = True
5762
5589
5775
5602
self.outf.write(" <no hooks installed>\n")
5776
5603
5777
5604
5778
class cmd_remove_branch(Command):
5779
__doc__ = """Remove a branch.
5780
5781
This will remove the branch from the specified location but
5782
will keep any working tree or repository in place.
5783
5784
:Examples:
5785
5786
Remove the branch at repo/trunk::
5787
5788
bzr remove-branch repo/trunk
5789
5790
"""
5791
5792
takes_args = ["location?"]
5793
5794
aliases = ["rmbranch"]
5795
5796
def run(self, location=None):
5797
if location is None:
5798
location = "."
5799
branch = Branch.open_containing(location)[0]
5800
branch.bzrdir.destroy_branch()
5801
5802
5803
5605
class cmd_shelve(Command):
5804
__doc__ = """Temporarily set aside some changes from the current tree.
5606
"""Temporarily set aside some changes from the current tree.
5805
5607
5806
5608
Shelve allows you to temporarily put changes you've made "on the shelf",
5807
5609
ie. out of the way, until a later time when you can bring them back from
5854
5656
try:
5855
5657
shelver.run()
5856
5658
finally:
5857
shelver.finalize()
5659
shelver.work_tree.unlock()
5858
5660
except errors.UserAbort:
5859
5661
return 0
5860
5662
5861
5663
def run_for_list(self):
5862
5664
tree = WorkingTree.open_containing('.')[0]
5863
self.add_cleanup(tree.lock_read().unlock)
5864
manager = tree.get_shelf_manager()
5865
shelves = manager.active_shelves()
5866
if len(shelves) == 0:
5867
note('No shelved changes.')
5868
return 0
5869
for shelf_id in reversed(shelves):
5870
message = manager.get_metadata(shelf_id).get('message')
5871
if message is None:
5872
message = '<no message>'
5873
self.outf.write('%3d: %s\n' % (shelf_id, message))
5874
return 1
5665
tree.lock_read()
5666
try:
5667
manager = tree.get_shelf_manager()
5668
shelves = manager.active_shelves()
5669
if len(shelves) == 0:
5670
note('No shelved changes.')
5671
return 0
5672
for shelf_id in reversed(shelves):
5673
message = manager.get_metadata(shelf_id).get('message')
5674
if message is None:
5675
message = '<no message>'
5676
self.outf.write('%3d: %s\n' % (shelf_id, message))
5677
return 1
5678
finally:
5679
tree.unlock()
5875
5680
5876
5681
5877
5682
class cmd_unshelve(Command):
5878
__doc__ = """Restore shelved changes.
5683
"""Restore shelved changes.
5879
5684
5880
5685
By default, the most recently shelved changes are restored. However if you
5881
5686
specify a shelf by id those changes will be restored instead. This works
5889
5694
enum_switch=False, value_switches=True,
5890
5695
apply="Apply changes and remove from the shelf.",
5891
5696
dry_run="Show changes, but do not apply or remove them.",
5892
preview="Instead of unshelving the changes, show the diff that "
5893
"would result from unshelving.",
5894
delete_only="Delete changes without applying them.",
5895
keep="Apply changes but don't delete them.",
5697
delete_only="Delete changes without applying them."
5896
5698
)
5897
5699
]
5898
5700
_see_also = ['shelve']
5907
5709
5908
5710
5909
5711
class cmd_clean_tree(Command):
5910
__doc__ = """Remove unwanted files from working tree.
5712
"""Remove unwanted files from working tree.
5911
5713
5912
5714
By default, only unknown files, not ignored files, are deleted. Versioned
5913
5715
files are never deleted.
5921
5723
5922
5724
To check what clean-tree will do, use --dry-run.
5923
5725
"""
5924
takes_options = ['directory',
5925
Option('ignored', help='Delete all ignored files.'),
5726
takes_options = [Option('ignored', help='Delete all ignored files.'),
5926
5727
Option('detritus', help='Delete conflict files, merge'
5927
5728
' backups, and failed selftest dirs.'),
5928
5729
Option('unknown',
5931
5732
' deleting them.'),
5932
5733
Option('force', help='Do not prompt before deleting.')]
5933
5734
def run(self, unknown=False, ignored=False, detritus=False, dry_run=False,
5934
force=False, directory=u'.'):
5735
force=False):
5935
5736
from bzrlib.clean_tree import clean_tree
5936
5737
if not (unknown or ignored or detritus):
5937
5738
unknown = True
5938
5739
if dry_run:
5939
5740
force = True
5940
clean_tree(directory, unknown=unknown, ignored=ignored,
5941
detritus=detritus, dry_run=dry_run, no_prompt=force)
5741
clean_tree('.', unknown=unknown, ignored=ignored, detritus=detritus,
5742
dry_run=dry_run, no_prompt=force)
5942
5743
5943
5744
5944
5745
class cmd_reference(Command):
5945
__doc__ = """list, view and set branch locations for nested trees.
5746
"""list, view and set branch locations for nested trees.
5946
5747
5947
5748
If no arguments are provided, lists the branch locations for nested trees.
5948
5749
If one argument is provided, display the branch location for that tree.
5988
5789
self.outf.write('%s %s\n' % (path, location))
5989
5790
5990
5791
5991
def _register_lazy_builtins():
5992
# register lazy builtins from other modules; called at startup and should
5993
# be only called once.
5994
for (name, aliases, module_name) in [
5995
('cmd_bundle_info', [], 'bzrlib.bundle.commands'),
5996
('cmd_dpush', [], 'bzrlib.foreign'),
5997
('cmd_version_info', [], 'bzrlib.cmd_version_info'),
5998
('cmd_resolve', ['resolved'], 'bzrlib.conflicts'),
5999
('cmd_conflicts', [], 'bzrlib.conflicts'),
6000
('cmd_sign_my_commits', [], 'bzrlib.sign_my_commits'),
6001
]:
6002
builtin_command_registry.register_lazy(name, aliases, module_name)
5792
# these get imported and then picked up by the scan for cmd_*
5793
# TODO: Some more consistent way to split command definitions across files;
5794
# we do need to load at least some information about them to know of
5795
# aliases. ideally we would avoid loading the implementation until the
5796
# details were needed.
5797
from bzrlib.cmd_version_info import cmd_version_info
5798
from bzrlib.conflicts import cmd_resolve, cmd_conflicts, restore
5799
from bzrlib.bundle.commands import (
5800
cmd_bundle_info,
5801
)
5802
from bzrlib.foreign import cmd_dpush
5803
from bzrlib.sign_my_commits import cmd_sign_my_commits
5804
from bzrlib.weave_commands import cmd_versionedfile_list, \
5805
cmd_weave_plan_merge, cmd_weave_merge_text
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0