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