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 4750
- compare with another revision
- download diff
- download tarball
- view history from revision 4750
- Committer: Canonical.com Patch Queue Manager
- Date: 2009-10-15 21:28:14 UTC
- mfrom: (4634.75.2 jam-integration)
- Revision ID: pqm@pqm.ubuntu.com-20091015212814-i4j0hjrcob5cdw6j
(mbp) Fix bug #446033 by skipping non-existing entries in readdir.
- files added:
- bzrlib/textui.py
- files removed:
- .testr.conf
- apport
- bzrlib/help_topics/es
- bzrlib/plugins/news_merge
- bzrlib/plugins/news_merge/tests
- bzrlib/tests/per_bzrdir_colo
- bzrlib/tests/per_foreign_vcs
- contrib/debian
- doc/en/whats-new
- doc/ja
- doc/ja/_static
- doc/ja/_templates
- doc/ja/mini-tutorial
- doc/ja/tutorials
- doc/ja/upgrade-guide
- doc/ja/user-guide
- doc/ja/user-guide/images
- doc/ja/user-reference
- files renamed:
- bzrlib/help_topics/en/conflict-types.txt => bzrlib/help_topics/en/conflicts.txt
- bzrlib/tests/test__bencode.py => bzrlib/tests/test_bencode.py
- bzrlib/help_topics/es/conflict-types.txt => doc/es/user-guide/resolving_conflicts.txt
- files modified:
- .bzrignore
added
removed
bzrlib/builtins.py
1
# Copyright (C) 2005-2010 Canonical Ltd
1
# Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
31
31
bundle,
32
32
btree_index,
33
33
bzrdir,
34
directory_service,
35
34
delta,
36
35
config,
37
36
errors,
44
43
reconfigure,
45
44
rename_map,
46
45
revision as _mod_revision,
47
static_tuple,
48
46
symbol_versioning,
49
timestamp,
50
47
transport,
51
48
ui,
52
49
urlutils,
54
51
)
55
52
from bzrlib.branch import Branch
56
53
from bzrlib.conflicts import ConflictList
57
from bzrlib.transport import memory
58
54
from bzrlib.revisionspec import RevisionSpec, RevisionInfo
59
55
from bzrlib.smtp_connection import SMTPConnection
60
56
from bzrlib.workingtree import WorkingTree
61
57
""")
62
58
63
from bzrlib.commands import (
64
Command,
65
builtin_command_registry,
66
display_command,
67
)
59
from bzrlib.commands import Command, display_command
68
60
from bzrlib.option import (
69
61
ListOption,
70
62
Option,
232
224
return view_info
233
225
234
226
235
def _open_directory_or_containing_tree_or_branch(filename, directory):
236
"""Open the tree or branch containing the specified file, unless
237
the --directory option is used to specify a different branch."""
238
if directory is not None:
239
return (None, Branch.open(directory), filename)
240
return bzrdir.BzrDir.open_containing_tree_or_branch(filename)
241
242
243
227
# TODO: Make sure no commands unconditionally use the working directory as a
244
228
# branch. If a filename argument is used, the first of them should be used to
245
229
# specify the branch. (Perhaps this can be factored out into some kind of
247
231
# opens the branch?)
248
232
249
233
class cmd_status(Command):
250
__doc__ = """Display status summary.
234
"""Display status summary.
251
235
252
236
This reports on versioned and unknown files, reporting them
253
237
grouped by state. Possible states are:
273
257
unknown
274
258
Not versioned and not matching an ignore pattern.
275
259
276
Additionally for directories, symlinks and files with an executable
277
bit, Bazaar indicates their type using a trailing character: '/', '@'
278
or '*' respectively.
279
280
260
To see ignored files use 'bzr ignored'. For details on the
281
261
changes to file texts, use 'bzr diff'.
282
262
340
320
341
321
342
322
class cmd_cat_revision(Command):
343
__doc__ = """Write out metadata for a revision.
323
"""Write out metadata for a revision.
344
324
345
325
The revision to print can either be specified by a specific
346
326
revision identifier, or you can use --revision.
348
328
349
329
hidden = True
350
330
takes_args = ['revision_id?']
351
takes_options = ['directory', 'revision']
331
takes_options = ['revision']
352
332
# cat-revision is more for frontends so should be exact
353
333
encoding = 'strict'
354
334
355
def print_revision(self, revisions, revid):
356
stream = revisions.get_record_stream([(revid,)], 'unordered', True)
357
record = stream.next()
358
if record.storage_kind == 'absent':
359
raise errors.NoSuchRevision(revisions, revid)
360
revtext = record.get_bytes_as('fulltext')
361
self.outf.write(revtext.decode('utf-8'))
362
363
335
@display_command
364
def run(self, revision_id=None, revision=None, directory=u'.'):
336
def run(self, revision_id=None, revision=None):
365
337
if revision_id is not None and revision is not None:
366
338
raise errors.BzrCommandError('You can only supply one of'
367
339
' revision_id or --revision')
368
340
if revision_id is None and revision is None:
369
341
raise errors.BzrCommandError('You must supply either'
370
342
' --revision or a revision_id')
371
b = WorkingTree.open_containing(directory)[0].branch
372
373
revisions = b.repository.revisions
374
if revisions is None:
375
raise errors.BzrCommandError('Repository %r does not support '
376
'access to raw revision texts')
377
378
b.repository.lock_read()
379
try:
380
# TODO: jam 20060112 should cat-revision always output utf-8?
381
if revision_id is not None:
382
revision_id = osutils.safe_revision_id(revision_id, warn=False)
383
try:
384
self.print_revision(revisions, revision_id)
385
except errors.NoSuchRevision:
386
msg = "The repository %s contains no revision %s." % (
387
b.repository.base, revision_id)
388
raise errors.BzrCommandError(msg)
389
elif revision is not None:
390
for rev in revision:
391
if rev is None:
392
raise errors.BzrCommandError(
393
'You cannot specify a NULL revision.')
394
rev_id = rev.as_revision_id(b)
395
self.print_revision(revisions, rev_id)
396
finally:
397
b.repository.unlock()
398
343
b = WorkingTree.open_containing(u'.')[0].branch
344
345
# TODO: jam 20060112 should cat-revision always output utf-8?
346
if revision_id is not None:
347
revision_id = osutils.safe_revision_id(revision_id, warn=False)
348
try:
349
self.outf.write(b.repository.get_revision_xml(revision_id).decode('utf-8'))
350
except errors.NoSuchRevision:
351
msg = "The repository %s contains no revision %s." % (b.repository.base,
352
revision_id)
353
raise errors.BzrCommandError(msg)
354
elif revision is not None:
355
for rev in revision:
356
if rev is None:
357
raise errors.BzrCommandError('You cannot specify a NULL'
358
' revision.')
359
rev_id = rev.as_revision_id(b)
360
self.outf.write(b.repository.get_revision_xml(rev_id).decode('utf-8'))
361
399
362
400
363
class cmd_dump_btree(Command):
401
__doc__ = """Dump the contents of a btree index file to stdout.
364
"""Dump the contents of a btree index file to stdout.
402
365
403
366
PATH is a btree index file, it can be any URL. This includes things like
404
367
.bzr/repository/pack-names, or .bzr/repository/indices/a34b3a...ca4a4.iix
468
431
for node in bt.iter_all_entries():
469
432
# Node is made up of:
470
433
# (index, key, value, [references])
471
try:
472
refs = node[3]
473
except IndexError:
474
refs_as_tuples = None
475
else:
476
refs_as_tuples = static_tuple.as_tuples(refs)
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
2333
2278
filter_by_dir = False
2334
2279
if file_list:
2335
2280
# 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)
2281
b, file_info_list, rev1, rev2 = _get_info_for_log_files(revision,
2282
file_list)
2338
2283
for relpath, file_id, kind in file_info_list:
2339
2284
if file_id is None:
2340
2285
raise errors.BzrCommandError(
2358
2303
location = '.'
2359
2304
dir, relpath = bzrdir.BzrDir.open_containing(location)
2360
2305
b = dir.open_branch()
2361
self.add_cleanup(b.lock_read().unlock)
2362
2306
rev1, rev2 = _get_revision_range(revision, b, self.name())
2363
2307
2364
2308
# Decide on the type of delta & diff filtering to use
2374
2318
else:
2375
2319
diff_type = 'full'
2376
2320
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)
2321
b.lock_read()
2322
try:
2323
# Build the log formatter
2324
if log_format is None:
2325
log_format = log.log_formatter_registry.get_default(b)
2326
lf = log_format(show_ids=show_ids, to_file=self.outf,
2327
show_timezone=timezone,
2328
delta_format=get_verbosity_level(),
2329
levels=levels,
2330
show_advice=levels is None)
2331
2332
# Choose the algorithm for doing the logging. It's annoying
2333
# having multiple code paths like this but necessary until
2334
# the underlying repository format is faster at generating
2335
# deltas or can provide everything we need from the indices.
2336
# The default algorithm - match-using-deltas - works for
2337
# multiple files and directories and is faster for small
2338
# amounts of history (200 revisions say). However, it's too
2339
# slow for logging a single file in a repository with deep
2340
# history, i.e. > 10K revisions. In the spirit of "do no
2341
# evil when adding features", we continue to use the
2342
# original algorithm - per-file-graph - for the "single
2343
# file that isn't a directory without showing a delta" case.
2344
partial_history = revision and b.repository._format.supports_chks
2345
match_using_deltas = (len(file_ids) != 1 or filter_by_dir
2346
or delta_type or partial_history)
2347
2348
# Build the LogRequest and execute it
2349
if len(file_ids) == 0:
2350
file_ids = None
2351
rqst = make_log_request_dict(
2352
direction=direction, specific_fileids=file_ids,
2353
start_revision=rev1, end_revision=rev2, limit=limit,
2354
message_search=message, delta_type=delta_type,
2355
diff_type=diff_type, _match_using_deltas=match_using_deltas)
2356
Logger(b, rqst).show(lf)
2357
finally:
2358
b.unlock()
2417
2359
2418
2360
2419
2361
def _get_revision_range(revisionspec_list, branch, command_name):
2437
2379
raise errors.BzrCommandError(
2438
2380
"bzr %s doesn't accept two revisions in different"
2439
2381
" 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)
2382
rev1 = start_spec.in_history(branch)
2445
2383
# Avoid loading all of history when we know a missing
2446
2384
# end of range means the last revision ...
2447
2385
if end_spec.spec is None:
2476
2414
2477
2415
2478
2416
class cmd_touching_revisions(Command):
2479
__doc__ = """Return revision-ids which affected a particular file.
2417
"""Return revision-ids which affected a particular file.
2480
2418
2481
2419
A more user-friendly interface is "bzr log FILE".
2482
2420
"""
2487
2425
@display_command
2488
2426
def run(self, filename):
2489
2427
tree, relpath = WorkingTree.open_containing(filename)
2428
b = tree.branch
2490
2429
file_id = tree.path2id(relpath)
2491
b = tree.branch
2492
self.add_cleanup(b.lock_read().unlock)
2493
touching_revs = log.find_touching_revisions(b, file_id)
2494
for revno, revision_id, what in touching_revs:
2430
for revno, revision_id, what in log.find_touching_revisions(b, file_id):
2495
2431
self.outf.write("%6d %s\n" % (revno, what))
2496
2432
2497
2433
2498
2434
class cmd_ls(Command):
2499
__doc__ = """List files in a tree.
2435
"""List files in a tree.
2500
2436
"""
2501
2437
2502
2438
_see_also = ['status', 'cat']
2508
2444
help='Recurse into subdirectories.'),
2509
2445
Option('from-root',
2510
2446
help='Print paths relative to the root of the branch.'),
2511
Option('unknown', short_name='u',
2512
help='Print unknown files.'),
2447
Option('unknown', help='Print unknown files.'),
2513
2448
Option('versioned', help='Print versioned files.',
2514
2449
short_name='V'),
2515
Option('ignored', short_name='i',
2516
help='Print ignored files.'),
2517
Option('kind', short_name='k',
2450
Option('ignored', help='Print ignored files.'),
2451
Option('null',
2452
help='Write an ascii NUL (\\0) separator '
2453
'between files rather than a newline.'),
2454
Option('kind',
2518
2455
help='List entries of a particular kind: file, directory, symlink.',
2519
2456
type=unicode),
2520
'null',
2521
2457
'show-ids',
2522
'directory',
2523
2458
]
2524
2459
@display_command
2525
2460
def run(self, revision=None, verbose=False,
2526
2461
recursive=False, from_root=False,
2527
2462
unknown=False, versioned=False, ignored=False,
2528
null=False, kind=None, show_ids=False, path=None, directory=None):
2463
null=False, kind=None, show_ids=False, path=None):
2529
2464
2530
2465
if kind and kind not in ('file', 'directory', 'symlink'):
2531
2466
raise errors.BzrCommandError('invalid kind specified')
2543
2478
raise errors.BzrCommandError('cannot specify both --from-root'
2544
2479
' and PATH')
2545
2480
fs_path = path
2546
tree, branch, relpath = \
2547
_open_directory_or_containing_tree_or_branch(fs_path, directory)
2481
tree, branch, relpath = bzrdir.BzrDir.open_containing_tree_or_branch(
2482
fs_path)
2548
2483
2549
2484
# Calculate the prefix to use
2550
2485
prefix = None
2551
2486
if from_root:
2552
2487
if relpath:
2553
2488
prefix = relpath + '/'
2554
elif fs_path != '.' and not fs_path.endswith('/'):
2489
elif fs_path != '.':
2555
2490
prefix = fs_path + '/'
2556
2491
2557
2492
if revision is not None or tree is None:
2565
2500
view_str = views.view_display_str(view_files)
2566
2501
note("Ignoring files outside view. View is %s" % view_str)
2567
2502
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
2503
tree.lock_read()
2504
try:
2505
for fp, fc, fkind, fid, entry in tree.list_files(include_root=False,
2506
from_dir=relpath, recursive=recursive):
2507
# Apply additional masking
2508
if not all and not selection[fc]:
2509
continue
2510
if kind is not None and fkind != kind:
2511
continue
2512
if apply_view:
2513
try:
2514
if relpath:
2515
fullpath = osutils.pathjoin(relpath, fp)
2516
else:
2517
fullpath = fp
2518
views.check_path_in_view(tree, fullpath)
2519
except errors.FileOutsideView:
2520
continue
2585
2521
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:
2522
# Output the entry
2523
if prefix:
2524
fp = osutils.pathjoin(prefix, fp)
2525
kindch = entry.kind_character()
2526
outstring = fp + kindch
2527
ui.ui_factory.clear_term()
2528
if verbose:
2529
outstring = '%-8s %s' % (fc, outstring)
2530
if show_ids and fid is not None:
2531
outstring = "%-50s %s" % (outstring, fid)
2612
2532
self.outf.write(outstring + '\n')
2533
elif null:
2534
self.outf.write(fp + '\0')
2535
if show_ids:
2536
if fid is not None:
2537
self.outf.write(fid)
2538
self.outf.write('\0')
2539
self.outf.flush()
2540
else:
2541
if show_ids:
2542
if fid is not None:
2543
my_id = fid
2544
else:
2545
my_id = ''
2546
self.outf.write('%-50s %s\n' % (outstring, my_id))
2547
else:
2548
self.outf.write(outstring + '\n')
2549
finally:
2550
tree.unlock()
2613
2551
2614
2552
2615
2553
class cmd_unknowns(Command):
2616
__doc__ = """List unknown files.
2554
"""List unknown files.
2617
2555
"""
2618
2556
2619
2557
hidden = True
2620
2558
_see_also = ['ls']
2621
takes_options = ['directory']
2622
2559
2623
2560
@display_command
2624
def run(self, directory=u'.'):
2625
for f in WorkingTree.open_containing(directory)[0].unknowns():
2561
def run(self):
2562
for f in WorkingTree.open_containing(u'.')[0].unknowns():
2626
2563
self.outf.write(osutils.quotefn(f) + '\n')
2627
2564
2628
2565
2629
2566
class cmd_ignore(Command):
2630
__doc__ = """Ignore specified files or patterns.
2567
"""Ignore specified files or patterns.
2631
2568
2632
2569
See ``bzr help patterns`` for details on the syntax of patterns.
2633
2570
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
2571
To remove patterns from the ignore list, edit the .bzrignore file.
2641
2572
After adding, editing or deleting that file either indirectly by
2642
2573
using this command or directly by using an editor, be sure to commit
2643
2574
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
2575
2658
2576
Note: ignore patterns containing shell wildcards must be quoted from
2659
2577
the shell on Unix.
2663
2581
2664
2582
bzr ignore ./Makefile
2665
2583
2666
Ignore .class files in all directories...::
2584
Ignore class files in all directories::
2667
2585
2668
2586
bzr ignore "*.class"
2669
2587
2670
...but do not ignore "special.class"::
2671
2672
bzr ignore "!special.class"
2673
2674
2588
Ignore .o files under the lib directory::
2675
2589
2676
2590
bzr ignore "lib/**/*.o"
2682
2596
Ignore everything but the "debian" toplevel directory::
2683
2597
2684
2598
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
2599
"""
2693
2600
2694
2601
_see_also = ['status', 'ignored', 'patterns']
2695
2602
takes_args = ['name_pattern*']
2696
takes_options = ['directory',
2697
Option('default-rules',
2698
help='Display the default ignore rules that bzr uses.')
2603
takes_options = [
2604
Option('old-default-rules',
2605
help='Write out the ignore rules bzr < 0.9 always used.')
2699
2606
]
2700
2607
2701
def run(self, name_pattern_list=None, default_rules=None,
2702
directory=u'.'):
2608
def run(self, name_pattern_list=None, old_default_rules=None):
2703
2609
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)
2610
if old_default_rules is not None:
2611
# dump the rules and exit
2612
for pattern in ignores.OLD_DEFAULTS:
2613
print pattern
2708
2614
return
2709
2615
if not name_pattern_list:
2710
2616
raise errors.BzrCommandError("ignore requires at least one "
2711
"NAME_PATTERN or --default-rules.")
2617
"NAME_PATTERN or --old-default-rules")
2712
2618
name_pattern_list = [globbing.normalize_pattern(p)
2713
2619
for p in name_pattern_list]
2714
2620
for name_pattern in name_pattern_list:
2716
2622
(len(name_pattern) > 1 and name_pattern[1] == ':')):
2717
2623
raise errors.BzrCommandError(
2718
2624
"NAME_PATTERN should not be an absolute path")
2719
tree, relpath = WorkingTree.open_containing(directory)
2625
tree, relpath = WorkingTree.open_containing(u'.')
2720
2626
ignores.tree_ignores_add_patterns(tree, name_pattern_list)
2721
2627
ignored = globbing.Globster(name_pattern_list)
2722
2628
matches = []
2726
2632
if id is not None:
2727
2633
filename = entry[0]
2728
2634
if ignored.match(filename):
2729
matches.append(filename)
2635
matches.append(filename.encode('utf-8'))
2730
2636
tree.unlock()
2731
2637
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),))
2638
print "Warning: the following files are version controlled and" \
2639
" match your ignore pattern:\n%s" \
2640
"\nThese files will continue to be version controlled" \
2641
" unless you 'bzr remove' them." % ("\n".join(matches),)
2736
2642
2737
2643
2738
2644
class cmd_ignored(Command):
2739
__doc__ = """List ignored files and the patterns that matched them.
2645
"""List ignored files and the patterns that matched them.
2740
2646
2741
2647
List all the ignored files and the ignore pattern that caused the file to
2742
2648
be ignored.
2748
2654
2749
2655
encoding_type = 'replace'
2750
2656
_see_also = ['ignore', 'ls']
2751
takes_options = ['directory']
2752
2657
2753
2658
@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))
2659
def run(self):
2660
tree = WorkingTree.open_containing(u'.')[0]
2661
tree.lock_read()
2662
try:
2663
for path, file_class, kind, file_id, entry in tree.list_files():
2664
if file_class != 'I':
2665
continue
2666
## XXX: Slightly inefficient since this was already calculated
2667
pat = tree.is_ignored(path)
2668
self.outf.write('%-50s %s\n' % (path, pat))
2669
finally:
2670
tree.unlock()
2763
2671
2764
2672
2765
2673
class cmd_lookup_revision(Command):
2766
__doc__ = """Lookup the revision-id from a revision-number
2674
"""Lookup the revision-id from a revision-number
2767
2675
2768
2676
:Examples:
2769
2677
bzr lookup-revision 33
2770
2678
"""
2771
2679
hidden = True
2772
2680
takes_args = ['revno']
2773
takes_options = ['directory']
2774
2681
2775
2682
@display_command
2776
def run(self, revno, directory=u'.'):
2683
def run(self, revno):
2777
2684
try:
2778
2685
revno = int(revno)
2779
2686
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)
2687
raise errors.BzrCommandError("not a valid revision-number: %r" % revno)
2688
2689
print WorkingTree.open_containing(u'.')[0].branch.get_rev_id(revno)
2784
2690
2785
2691
2786
2692
class cmd_export(Command):
2787
__doc__ = """Export current or past revision to a destination directory or archive.
2693
"""Export current or past revision to a destination directory or archive.
2788
2694
2789
2695
If no revision is specified this exports the last committed revision.
2790
2696
2812
2718
================= =========================
2813
2719
"""
2814
2720
takes_args = ['dest', 'branch_or_subdir?']
2815
takes_options = ['directory',
2721
takes_options = [
2816
2722
Option('format',
2817
2723
help="Type of file to export to.",
2818
2724
type=unicode),
2822
2728
Option('root',
2823
2729
type=str,
2824
2730
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
2731
]
2829
2732
def run(self, dest, branch_or_subdir=None, revision=None, format=None,
2830
root=None, filters=False, per_file_timestamps=False, directory=u'.'):
2733
root=None, filters=False):
2831
2734
from bzrlib.export import export
2832
2735
2833
2736
if branch_or_subdir is None:
2834
tree = WorkingTree.open_containing(directory)[0]
2737
tree = WorkingTree.open_containing(u'.')[0]
2835
2738
b = tree.branch
2836
2739
subdir = None
2837
2740
else:
2840
2743
2841
2744
rev_tree = _get_one_revision_tree('export', revision, branch=b, tree=tree)
2842
2745
try:
2843
export(rev_tree, dest, format, root, subdir, filtered=filters,
2844
per_file_timestamps=per_file_timestamps)
2746
export(rev_tree, dest, format, root, subdir, filtered=filters)
2845
2747
except errors.NoSuchExportFormat, e:
2846
2748
raise errors.BzrCommandError('Unsupported export format: %s' % e.format)
2847
2749
2848
2750
2849
2751
class cmd_cat(Command):
2850
__doc__ = """Write the contents of a file as of a given revision to standard output.
2752
"""Write the contents of a file as of a given revision to standard output.
2851
2753
2852
2754
If no revision is nominated, the last revision is used.
2853
2755
2856
2758
"""
2857
2759
2858
2760
_see_also = ['ls']
2859
takes_options = ['directory',
2761
takes_options = [
2860
2762
Option('name-from-revision', help='The path name in the old tree.'),
2861
2763
Option('filters', help='Apply content filters to display the '
2862
2764
'convenience form.'),
2867
2769
2868
2770
@display_command
2869
2771
def run(self, filename, revision=None, name_from_revision=False,
2870
filters=False, directory=None):
2772
filters=False):
2871
2773
if revision is not None and len(revision) != 1:
2872
2774
raise errors.BzrCommandError("bzr cat --revision takes exactly"
2873
2775
" one revision specifier")
2874
2776
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)
2777
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
2778
branch.lock_read()
2779
try:
2780
return self._run(tree, branch, relpath, filename, revision,
2781
name_from_revision, filters)
2782
finally:
2783
branch.unlock()
2879
2784
2880
2785
def _run(self, tree, b, relpath, filename, revision, name_from_revision,
2881
2786
filtered):
2882
2787
if tree is None:
2883
2788
tree = b.basis_tree()
2884
2789
rev_tree = _get_one_revision_tree('cat', revision, branch=b)
2885
self.add_cleanup(rev_tree.lock_read().unlock)
2886
2790
2887
2791
old_file_id = rev_tree.path2id(relpath)
2888
2792
2923
2827
chunks = content.splitlines(True)
2924
2828
content = filtered_output_bytes(chunks, filters,
2925
2829
ContentFilterContext(relpath, rev_tree))
2926
self.cleanup_now()
2927
2830
self.outf.writelines(content)
2928
2831
else:
2929
self.cleanup_now()
2930
2832
self.outf.write(content)
2931
2833
2932
2834
2933
2835
class cmd_local_time_offset(Command):
2934
__doc__ = """Show the offset in seconds from GMT to local time."""
2836
"""Show the offset in seconds from GMT to local time."""
2935
2837
hidden = True
2936
2838
@display_command
2937
2839
def run(self):
2938
self.outf.write("%s\n" % osutils.local_time_offset())
2840
print osutils.local_time_offset()
2939
2841
2940
2842
2941
2843
2942
2844
class cmd_commit(Command):
2943
__doc__ = """Commit changes into a new revision.
2845
"""Commit changes into a new revision.
2944
2846
2945
2847
An explanatory message needs to be given for each commit. This is
2946
2848
often done by using the --message option (getting the message from the
3039
2941
Option('strict',
3040
2942
help="Refuse to commit if there are unknown "
3041
2943
"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
2944
ListOption('fixes', type=str,
3046
2945
help="Mark a bug as being fixed by this revision "
3047
2946
"(see \"bzr help bugs\")."),
3054
2953
"the master branch until a normal commit "
3055
2954
"is performed."
3056
2955
),
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.'),
2956
Option('show-diff',
2957
help='When no message is supplied, show the diff along'
2958
' with the status summary in the message editor.'),
3060
2959
]
3061
2960
aliases = ['ci', 'checkin']
3062
2961
3081
2980
3082
2981
def run(self, message=None, file=None, verbose=False, selected_list=None,
3083
2982
unchanged=False, strict=False, local=False, fixes=None,
3084
author=None, show_diff=False, exclude=None, commit_time=None):
2983
author=None, show_diff=False, exclude=None):
3085
2984
from bzrlib.errors import (
3086
2985
PointlessCommit,
3087
2986
ConflictsInTree,
3093
2992
make_commit_message_template_encoded
3094
2993
)
3095
2994
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
2995
# TODO: Need a blackbox test for invoking the external editor; may be
3105
2996
# slightly problematic to run this cross-platform.
3106
2997
3126
3017
if local and not tree.branch.get_bound_location():
3127
3018
raise errors.LocalRequiresBoundBranch()
3128
3019
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
3020
def get_message(commit_obj):
3151
3021
"""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,
3022
my_message = message
3023
if my_message is None and not file:
3024
t = make_commit_message_template_encoded(tree,
3161
3025
selected_list, diff=show_diff,
3162
3026
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
3027
start_message = generate_commit_message_template(commit_obj)
3169
my_message = edit_commit_message_encoded(text,
3028
my_message = edit_commit_message_encoded(t,
3170
3029
start_message=start_message)
3171
3030
if my_message is None:
3172
3031
raise errors.BzrCommandError("please specify a commit"
3173
3032
" message with either --message or --file")
3033
elif my_message and file:
3034
raise errors.BzrCommandError(
3035
"please specify either --message or --file")
3036
if file:
3037
my_message = codecs.open(file, 'rt',
3038
osutils.get_user_encoding()).read()
3174
3039
if my_message == "":
3175
3040
raise errors.BzrCommandError("empty commit message specified")
3176
3041
return my_message
3184
3049
specific_files=selected_list,
3185
3050
allow_pointless=unchanged, strict=strict, local=local,
3186
3051
reporter=None, verbose=verbose, revprops=properties,
3187
authors=author, timestamp=commit_stamp,
3188
timezone=offset,
3052
authors=author,
3189
3053
exclude=safe_relpath_files(tree, exclude))
3190
3054
except PointlessCommit:
3055
# FIXME: This should really happen before the file is read in;
3056
# perhaps prepare the commit; get the message; then actually commit
3191
3057
raise errors.BzrCommandError("No changes to commit."
3192
3058
" Use --unchanged to commit anyhow.")
3193
3059
except ConflictsInTree:
3198
3064
raise errors.BzrCommandError("Commit refused because there are"
3199
3065
" unknown files in the working tree.")
3200
3066
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
3067
raise errors.BzrCommandError(str(e) + "\n"
3068
'To commit to master branch, run update and then commit.\n'
3069
'You can also pass --local to commit to continue working '
3070
'disconnected.')
3206
3071
3207
3072
3208
3073
class cmd_check(Command):
3209
__doc__ = """Validate working tree structure, branch consistency and repository history.
3074
"""Validate working tree structure, branch consistency and repository history.
3210
3075
3211
3076
This command checks various invariants about branch and repository storage
3212
3077
to detect data corruption or bzr bugs.
3276
3141
3277
3142
3278
3143
class cmd_upgrade(Command):
3279
__doc__ = """Upgrade branch storage to current format.
3144
"""Upgrade branch storage to current format.
3280
3145
3281
3146
The check command or bzr developers may sometimes advise you to run
3282
3147
this command. When the default format has changed you may also be warned
3300
3165
3301
3166
3302
3167
class cmd_whoami(Command):
3303
__doc__ = """Show or set bzr user id.
3168
"""Show or set bzr user id.
3304
3169
3305
3170
:Examples:
3306
3171
Show the email of the current user::
3350
3215
3351
3216
3352
3217
class cmd_nick(Command):
3353
__doc__ = """Print or set the branch nickname.
3218
"""Print or set the branch nickname.
3354
3219
3355
3220
If unset, the tree root directory name is used as the nickname.
3356
3221
To print the current nickname, execute with no argument.
3361
3226
3362
3227
_see_also = ['info']
3363
3228
takes_args = ['nickname?']
3364
takes_options = ['directory']
3365
def run(self, nickname=None, directory=u'.'):
3366
branch = Branch.open_containing(directory)[0]
3229
def run(self, nickname=None):
3230
branch = Branch.open_containing(u'.')[0]
3367
3231
if nickname is None:
3368
3232
self.printme(branch)
3369
3233
else:
3371
3235
3372
3236
@display_command
3373
3237
def printme(self, branch):
3374
self.outf.write('%s\n' % branch.nick)
3238
print branch.nick
3375
3239
3376
3240
3377
3241
class cmd_alias(Command):
3378
__doc__ = """Set/unset and display aliases.
3242
"""Set/unset and display aliases.
3379
3243
3380
3244
:Examples:
3381
3245
Show the current aliases::
3445
3309
3446
3310
3447
3311
class cmd_selftest(Command):
3448
__doc__ = """Run internal test suite.
3312
"""Run internal test suite.
3449
3313
3450
3314
If arguments are given, they are regular expressions that say which tests
3451
3315
should run. Tests matching any expression are run, and other tests are
3495
3359
def get_transport_type(typestring):
3496
3360
"""Parse and return a transport specifier."""
3497
3361
if typestring == "sftp":
3498
from bzrlib.tests import stub_sftp
3499
return stub_sftp.SFTPAbsoluteServer
3362
from bzrlib.transport.sftp import SFTPAbsoluteServer
3363
return SFTPAbsoluteServer
3500
3364
if typestring == "memory":
3501
from bzrlib.tests import test_server
3502
return memory.MemoryServer
3365
from bzrlib.transport.memory import MemoryServer
3366
return MemoryServer
3503
3367
if typestring == "fakenfs":
3504
from bzrlib.tests import test_server
3505
return test_server.FakeNFSServer
3368
from bzrlib.transport.fakenfs import FakeNFSServer
3369
return FakeNFSServer
3506
3370
msg = "No known transport type %s. Supported types are: sftp\n" %\
3507
3371
(typestring)
3508
3372
raise errors.BzrCommandError(msg)
3592
3456
raise errors.BzrCommandError("subunit not available. subunit "
3593
3457
"needs to be installed to use --subunit.")
3594
3458
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
3459
if parallel:
3601
3460
self.additional_selftest_args.setdefault(
3602
3461
'suite_decorators', []).append(parallel)
3606
3465
verbose = not is_quiet()
3607
3466
# TODO: should possibly lock the history file...
3608
3467
benchfile = open(".perf_history", "at", buffering=1)
3609
self.add_cleanup(benchfile.close)
3610
3468
else:
3611
3469
test_suite_factory = None
3612
3470
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)
3471
try:
3472
selftest_kwargs = {"verbose": verbose,
3473
"pattern": pattern,
3474
"stop_on_failure": one,
3475
"transport": transport,
3476
"test_suite_factory": test_suite_factory,
3477
"lsprof_timed": lsprof_timed,
3478
"lsprof_tests": lsprof_tests,
3479
"bench_history": benchfile,
3480
"matching_tests_first": first,
3481
"list_only": list_only,
3482
"random_seed": randomize,
3483
"exclude_pattern": exclude,
3484
"strict": strict,
3485
"load_list": load_list,
3486
"debug_flags": debugflag,
3487
"starting_with": starting_with
3488
}
3489
selftest_kwargs.update(self.additional_selftest_args)
3490
result = selftest(**selftest_kwargs)
3491
finally:
3492
if benchfile is not None:
3493
benchfile.close()
3632
3494
return int(not result)
3633
3495
3634
3496
3635
3497
class cmd_version(Command):
3636
__doc__ = """Show version of bzr."""
3498
"""Show version of bzr."""
3637
3499
3638
3500
encoding_type = 'replace'
3639
3501
takes_options = [
3650
3512
3651
3513
3652
3514
class cmd_rocks(Command):
3653
__doc__ = """Statement of optimism."""
3515
"""Statement of optimism."""
3654
3516
3655
3517
hidden = True
3656
3518
3657
3519
@display_command
3658
3520
def run(self):
3659
self.outf.write("It sure does!\n")
3521
print "It sure does!"
3660
3522
3661
3523
3662
3524
class cmd_find_merge_base(Command):
3663
__doc__ = """Find and print a base revision for merging two branches."""
3525
"""Find and print a base revision for merging two branches."""
3664
3526
# TODO: Options to specify revisions on either side, as if
3665
3527
# merging only part of the history.
3666
3528
takes_args = ['branch', 'other']
3672
3534
3673
3535
branch1 = Branch.open_containing(branch)[0]
3674
3536
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)
3537
branch1.lock_read()
3538
try:
3539
branch2.lock_read()
3540
try:
3541
last1 = ensure_null(branch1.last_revision())
3542
last2 = ensure_null(branch2.last_revision())
3543
3544
graph = branch1.repository.get_graph(branch2.repository)
3545
base_rev_id = graph.find_unique_lca(last1, last2)
3546
3547
print 'merge base is revision %s' % base_rev_id
3548
finally:
3549
branch2.unlock()
3550
finally:
3551
branch1.unlock()
3684
3552
3685
3553
3686
3554
class cmd_merge(Command):
3687
__doc__ = """Perform a three-way merge.
3555
"""Perform a three-way merge.
3688
3556
3689
3557
The source of the merge can be specified either in the form of a branch,
3690
3558
or in the form of a path to a file containing a merge directive generated
3719
3587
committed to record the result of the merge.
3720
3588
3721
3589
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.
3590
--force is given.
3728
3591
3729
3592
To select only some changes to merge, use "merge -i", which will prompt
3730
3593
you to apply each diff hunk and file change, similar to "shelve".
3742
3605
3743
3606
bzr merge -r 81..82 ../bzr.dev
3744
3607
3745
To apply a merge directive contained in /tmp/merge::
3608
To apply a merge directive contained in /tmp/merge:
3746
3609
3747
3610
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
3611
"""
3756
3612
3757
3613
encoding_type = 'exact'
3773
3629
' completely merged into the source, pull from the'
3774
3630
' source rather than merging. When this happens,'
3775
3631
' you do not need to commit the result.'),
3776
custom_help('directory',
3632
Option('directory',
3777
3633
help='Branch to merge into, '
3778
'rather than the one containing the working directory.'),
3634
'rather than the one containing the working directory.',
3635
short_name='d',
3636
type=unicode,
3637
),
3779
3638
Option('preview', help='Instead of merging, show a diff of the'
3780
3639
' merge.'),
3781
3640
Option('interactive', help='Select changes interactively.',
3812
3671
view_info = _get_view_info_for_change_reporter(tree)
3813
3672
change_reporter = delta._ChangeReporter(
3814
3673
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
3674
cleanups = []
3675
try:
3676
pb = ui.ui_factory.nested_progress_bar()
3677
cleanups.append(pb.finished)
3678
tree.lock_write()
3679
cleanups.append(tree.unlock)
3680
if location is not None:
3681
try:
3682
mergeable = bundle.read_mergeable_from_url(location,
3683
possible_transports=possible_transports)
3684
except errors.NotABundle:
3685
mergeable = None
3686
else:
3687
if uncommitted:
3688
raise errors.BzrCommandError('Cannot use --uncommitted'
3689
' with bundles or merge directives.')
3690
3691
if revision is not None:
3692
raise errors.BzrCommandError(
3693
'Cannot use -r with merge directives or bundles')
3694
merger, verified = _mod_merge.Merger.from_mergeable(tree,
3695
mergeable, pb)
3696
3697
if merger is None and uncommitted:
3698
if revision is not None and len(revision) > 0:
3699
raise errors.BzrCommandError('Cannot use --uncommitted and'
3700
' --revision at the same time.')
3701
merger = self.get_merger_from_uncommitted(tree, location, pb,
3702
cleanups)
3703
allow_pending = False
3704
3705
if merger is None:
3706
merger, allow_pending = self._get_merger_from_branch(tree,
3707
location, revision, remember, possible_transports, pb)
3708
3709
merger.merge_type = merge_type
3710
merger.reprocess = reprocess
3711
merger.show_base = show_base
3712
self.sanity_check_merger(merger)
3713
if (merger.base_rev_id == merger.other_rev_id and
3714
merger.other_rev_id is not None):
3715
note('Nothing to do.')
3716
return 0
3717
if pull:
3718
if merger.interesting_files is not None:
3719
raise errors.BzrCommandError('Cannot pull individual files')
3720
if (merger.base_rev_id == tree.last_revision()):
3721
result = tree.pull(merger.other_branch, False,
3722
merger.other_rev_id)
3723
result.report(self.outf)
3724
return 0
3725
if merger.this_basis is None:
3726
raise errors.BzrCommandError(
3727
"This branch has no commits."
3728
" (perhaps you would prefer 'bzr pull')")
3729
if preview:
3730
return self._do_preview(merger, cleanups)
3731
elif interactive:
3732
return self._do_interactive(merger, cleanups)
3824
3733
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):
3734
return self._do_merge(merger, change_reporter, allow_pending,
3735
verified)
3736
finally:
3737
for cleanup in reversed(cleanups):
3738
cleanup()
3739
3740
def _get_preview(self, merger, cleanups):
3875
3741
tree_merger = merger.make_merger()
3876
3742
tt = tree_merger.make_preview_transform()
3877
self.add_cleanup(tt.finalize)
3743
cleanups.append(tt.finalize)
3878
3744
result_tree = tt.get_preview_tree()
3879
3745
return result_tree
3880
3746
3881
def _do_preview(self, merger):
3747
def _do_preview(self, merger, cleanups):
3882
3748
from bzrlib.diff import show_diff_trees
3883
result_tree = self._get_preview(merger)
3749
result_tree = self._get_preview(merger, cleanups)
3884
3750
show_diff_trees(merger.this_tree, result_tree, self.outf,
3885
3751
old_label='', new_label='')
3886
3752
3896
3762
else:
3897
3763
return 0
3898
3764
3899
def _do_interactive(self, merger):
3765
def _do_interactive(self, merger, cleanups):
3900
3766
"""Perform an interactive merge.
3901
3767
3902
3768
This works by generating a preview tree of the merge, then using
3904
3770
and the preview tree.
3905
3771
"""
3906
3772
from bzrlib import shelf_ui
3907
result_tree = self._get_preview(merger)
3773
result_tree = self._get_preview(merger, cleanups)
3908
3774
writer = bzrlib.option.diff_writer_registry.get()
3909
3775
shelver = shelf_ui.Shelver(merger.this_tree, result_tree, destroy=True,
3910
3776
reporter=shelf_ui.ApplyReporter(),
3911
3777
diff_writer=writer(sys.stdout))
3912
try:
3913
shelver.run()
3914
finally:
3915
shelver.finalize()
3778
shelver.run()
3916
3779
3917
3780
def sanity_check_merger(self, merger):
3918
3781
if (merger.show_base and
3978
3841
allow_pending = True
3979
3842
return merger, allow_pending
3980
3843
3981
def get_merger_from_uncommitted(self, tree, location, pb):
3844
def get_merger_from_uncommitted(self, tree, location, pb, cleanups):
3982
3845
"""Get a merger for uncommitted changes.
3983
3846
3984
3847
:param tree: The tree the merger should apply to.
3985
3848
:param location: The location containing uncommitted changes.
3986
3849
:param pb: The progress bar to use for showing progress.
3850
:param cleanups: A list of operations to perform to clean up the
3851
temporary directories, unfinalized objects, etc.
3987
3852
"""
3988
3853
location = self._select_branch_location(tree, location)[0]
3989
3854
other_tree, other_path = WorkingTree.open_containing(location)
4041
3906
4042
3907
4043
3908
class cmd_remerge(Command):
4044
__doc__ = """Redo a merge.
3909
"""Redo a merge.
4045
3910
4046
3911
Use this if you want to try a different merge technique while resolving
4047
3912
conflicts. Some merge techniques are better than others, and remerge
4072
3937
4073
3938
def run(self, file_list=None, merge_type=None, show_base=False,
4074
3939
reprocess=False):
4075
from bzrlib.conflicts import restore
4076
3940
if merge_type is None:
4077
3941
merge_type = _mod_merge.Merge3Merger
4078
3942
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
3943
tree.lock_write()
3944
try:
3945
parents = tree.get_parent_ids()
3946
if len(parents) != 2:
3947
raise errors.BzrCommandError("Sorry, remerge only works after normal"
3948
" merges. Not cherrypicking or"
3949
" multi-merges.")
3950
repository = tree.branch.repository
3951
interesting_ids = None
3952
new_conflicts = []
3953
conflicts = tree.conflicts()
3954
if file_list is not None:
3955
interesting_ids = set()
3956
for filename in file_list:
3957
file_id = tree.path2id(filename)
3958
if file_id is None:
3959
raise errors.NotVersionedError(filename)
3960
interesting_ids.add(file_id)
3961
if tree.kind(file_id) != "directory":
3962
continue
4098
3963
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:
3964
for name, ie in tree.inventory.iter_entries(file_id):
3965
interesting_ids.add(ie.file_id)
3966
new_conflicts = conflicts.select_conflicts(tree, file_list)[0]
3967
else:
3968
# Remerge only supports resolving contents conflicts
3969
allowed_conflicts = ('text conflict', 'contents conflict')
3970
restore_files = [c.path for c in conflicts
3971
if c.typestring in allowed_conflicts]
3972
_mod_merge.transform_tree(tree, tree.basis_tree(), interesting_ids)
3973
tree.set_conflicts(ConflictList(new_conflicts))
3974
if file_list is not None:
3975
restore_files = file_list
3976
for filename in restore_files:
3977
try:
3978
restore(tree.abspath(filename))
3979
except errors.NotConflicted:
3980
pass
3981
# Disable pending merges, because the file texts we are remerging
3982
# have not had those merges performed. If we use the wrong parents
3983
# list, we imply that the working tree text has seen and rejected
3984
# all the changes from the other tree, when in fact those changes
3985
# have not yet been seen.
3986
pb = ui.ui_factory.nested_progress_bar()
3987
tree.set_parent_ids(parents[:1])
4112
3988
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()
3989
merger = _mod_merge.Merger.from_revision_ids(pb,
3990
tree, parents[1])
3991
merger.interesting_ids = interesting_ids
3992
merger.merge_type = merge_type
3993
merger.show_base = show_base
3994
merger.reprocess = reprocess
3995
conflicts = merger.do_merge()
3996
finally:
3997
tree.set_parent_ids(parents)
3998
pb.finished()
4129
3999
finally:
4130
tree.set_parent_ids(parents)
4000
tree.unlock()
4131
4001
if conflicts > 0:
4132
4002
return 1
4133
4003
else:
4135
4005
4136
4006
4137
4007
class cmd_revert(Command):
4138
__doc__ = """Revert files to a previous revision.
4008
"""Revert files to a previous revision.
4139
4009
4140
4010
Giving a list of files will revert only those files. Otherwise, all files
4141
4011
will be reverted. If the revision is not specified with '--revision', the
4155
4025
name. If you name a directory, all the contents of that directory will be
4156
4026
reverted.
4157
4027
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.
4028
Any files that have been newly added since that revision will be deleted,
4029
with a backup kept if appropriate. Directories containing unknown files
4030
will not be deleted.
4162
4031
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
4032
The working tree contains a list of pending merged revisions, which will
4033
be included as parents in the next commit. Normally, revert clears that
4034
list as well as reverting the files. If any files are specified, revert
4035
leaves the pending merge list alone and reverts only the files. Use "bzr
4036
revert ." in the tree root to revert all files but keep the merge record,
4037
and "bzr revert --forget-merges" to clear the pending merge list without
4170
4038
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
4039
"""
4182
4040
4183
4041
_see_also = ['cat', 'export']
4192
4050
def run(self, revision=None, no_backup=False, file_list=None,
4193
4051
forget_merges=None):
4194
4052
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)
4053
tree.lock_write()
4054
try:
4055
if forget_merges:
4056
tree.set_parent_ids(tree.get_parent_ids()[:1])
4057
else:
4058
self._revert_tree_to_revision(tree, revision, file_list, no_backup)
4059
finally:
4060
tree.unlock()
4200
4061
4201
4062
@staticmethod
4202
4063
def _revert_tree_to_revision(tree, revision, file_list, no_backup):
4203
4064
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)
4065
pb = ui.ui_factory.nested_progress_bar()
4066
try:
4067
tree.revert(file_list, rev_tree, not no_backup, pb,
4068
report_changes=True)
4069
finally:
4070
pb.finished()
4206
4071
4207
4072
4208
4073
class cmd_assert_fail(Command):
4209
__doc__ = """Test reporting of assertion failures"""
4074
"""Test reporting of assertion failures"""
4210
4075
# intended just for use in testing
4211
4076
4212
4077
hidden = True
4216
4081
4217
4082
4218
4083
class cmd_help(Command):
4219
__doc__ = """Show help on a command or other topic.
4084
"""Show help on a command or other topic.
4220
4085
"""
4221
4086
4222
4087
_see_also = ['topics']
4235
4100
4236
4101
4237
4102
class cmd_shell_complete(Command):
4238
__doc__ = """Show appropriate completions for context.
4103
"""Show appropriate completions for context.
4239
4104
4240
4105
For a list of all available commands, say 'bzr shell-complete'.
4241
4106
"""
4250
4115
4251
4116
4252
4117
class cmd_missing(Command):
4253
__doc__ = """Show unmerged/unpulled revisions between two branches.
4118
"""Show unmerged/unpulled revisions between two branches.
4254
4119
4255
4120
OTHER_BRANCH may be local or remote.
4256
4121
4257
4122
To filter on a range of revisions, you can use the command -r begin..end
4258
4123
-r revision requests a specific revision, -r ..end or -r begin.. are
4259
4124
also valid.
4260
4261
:Exit values:
4262
1 - some missing revisions
4263
0 - no missing revisions
4264
4125
4265
4126
:Examples:
4266
4127
4334
4195
restrict = 'remote'
4335
4196
4336
4197
local_branch = Branch.open_containing(u".")[0]
4337
self.add_cleanup(local_branch.lock_read().unlock)
4338
4339
4198
parent = local_branch.get_parent()
4340
4199
if other_branch is None:
4341
4200
other_branch = parent
4350
4209
remote_branch = Branch.open(other_branch)
4351
4210
if remote_branch.base == local_branch.base:
4352
4211
remote_branch = local_branch
4353
else:
4354
self.add_cleanup(remote_branch.lock_read().unlock)
4355
4212
4356
4213
local_revid_range = _revision_range_to_revid_range(
4357
4214
_get_revision_range(my_revision, local_branch,
4361
4218
_get_revision_range(revision,
4362
4219
remote_branch, self.name()))
4363
4220
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()
4221
local_branch.lock_read()
4222
try:
4223
remote_branch.lock_read()
4224
try:
4225
local_extra, remote_extra = find_unmerged(
4226
local_branch, remote_branch, restrict,
4227
backward=not reverse,
4228
include_merges=include_merges,
4229
local_revid_range=local_revid_range,
4230
remote_revid_range=remote_revid_range)
4231
4232
if log_format is None:
4233
registry = log.log_formatter_registry
4234
log_format = registry.get_default(local_branch)
4235
lf = log_format(to_file=self.outf,
4236
show_ids=show_ids,
4237
show_timezone='original')
4238
4239
status_code = 0
4240
if local_extra and not theirs_only:
4241
message("You have %d extra revision(s):\n" %
4242
len(local_extra))
4243
for revision in iter_log_revisions(local_extra,
4244
local_branch.repository,
4245
verbose):
4246
lf.log_revision(revision)
4247
printed_local = True
4248
status_code = 1
4249
else:
4250
printed_local = False
4251
4252
if remote_extra and not mine_only:
4253
if printed_local is True:
4254
message("\n\n\n")
4255
message("You are missing %d revision(s):\n" %
4256
len(remote_extra))
4257
for revision in iter_log_revisions(remote_extra,
4258
remote_branch.repository,
4259
verbose):
4260
lf.log_revision(revision)
4261
status_code = 1
4262
4263
if mine_only and not local_extra:
4264
# We checked local, and found nothing extra
4265
message('This branch is up to date.\n')
4266
elif theirs_only and not remote_extra:
4267
# We checked remote, and found nothing extra
4268
message('Other branch is up to date.\n')
4269
elif not (mine_only or theirs_only or local_extra or
4270
remote_extra):
4271
# We checked both branches, and neither one had extra
4272
# revisions
4273
message("Branches are up to date.\n")
4274
finally:
4275
remote_branch.unlock()
4276
finally:
4277
local_branch.unlock()
4414
4278
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)
4279
local_branch.lock_write()
4280
try:
4281
# handle race conditions - a parent might be set while we run.
4282
if local_branch.get_parent() is None:
4283
local_branch.set_parent(remote_branch.base)
4284
finally:
4285
local_branch.unlock()
4419
4286
return status_code
4420
4287
4421
4288
4422
4289
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
"""
4290
"""Compress the data within a repository."""
4440
4291
4441
4292
_see_also = ['repositories']
4442
4293
takes_args = ['branch_or_repo?']
4443
takes_options = [
4444
Option('clean-obsolete-packs', 'Delete obsolete packs to save disk space.'),
4445
]
4446
4294
4447
def run(self, branch_or_repo='.', clean_obsolete_packs=False):
4295
def run(self, branch_or_repo='.'):
4448
4296
dir = bzrdir.BzrDir.open_containing(branch_or_repo)[0]
4449
4297
try:
4450
4298
branch = dir.open_branch()
4451
4299
repository = branch.repository
4452
4300
except errors.NotBranchError:
4453
4301
repository = dir.open_repository()
4454
repository.pack(clean_obsolete_packs=clean_obsolete_packs)
4302
repository.pack()
4455
4303
4456
4304
4457
4305
class cmd_plugins(Command):
4458
__doc__ = """List the installed plugins.
4306
"""List the installed plugins.
4459
4307
4460
4308
This command displays the list of installed plugins including
4461
4309
version of plugin and a short description of each.
4468
4316
adding new commands, providing additional network transports and
4469
4317
customizing log output.
4470
4318
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.
4319
See the Bazaar web site, http://bazaar-vcs.org, for further
4320
information on plugins including where to find them and how to
4321
install them. Instructions are also provided there on how to
4322
write new plugins using the Python programming language.
4475
4323
"""
4476
4324
takes_options = ['verbose']
4477
4325
4492
4340
doc = '(no description)'
4493
4341
result.append((name_ver, doc, plugin.path()))
4494
4342
for name_ver, doc, path in sorted(result):
4495
self.outf.write("%s\n" % name_ver)
4496
self.outf.write(" %s\n" % doc)
4343
print name_ver
4344
print ' ', doc
4497
4345
if verbose:
4498
self.outf.write(" %s\n" % path)
4499
self.outf.write("\n")
4346
print ' ', path
4347
print
4500
4348
4501
4349
4502
4350
class cmd_testament(Command):
4503
__doc__ = """Show testament (signing-form) of a revision."""
4351
"""Show testament (signing-form) of a revision."""
4504
4352
takes_options = [
4505
4353
'revision',
4506
4354
Option('long', help='Produce long-format testament.'),
4518
4366
b = Branch.open_containing(branch)[0]
4519
4367
else:
4520
4368
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())
4369
b.lock_read()
4370
try:
4371
if revision is None:
4372
rev_id = b.last_revision()
4373
else:
4374
rev_id = revision[0].as_revision_id(b)
4375
t = testament_class.from_revision(b.repository, rev_id)
4376
if long:
4377
sys.stdout.writelines(t.as_text_lines())
4378
else:
4379
sys.stdout.write(t.as_short_text())
4380
finally:
4381
b.unlock()
4531
4382
4532
4383
4533
4384
class cmd_annotate(Command):
4534
__doc__ = """Show the origin of each line in a file.
4385
"""Show the origin of each line in a file.
4535
4386
4536
4387
This prints out the given file with an annotation on the left side
4537
4388
indicating which revision, author and date introduced the change.
4548
4399
Option('long', help='Show commit date in annotations.'),
4549
4400
'revision',
4550
4401
'show-ids',
4551
'directory',
4552
4402
]
4553
4403
encoding_type = 'exact'
4554
4404
4555
4405
@display_command
4556
4406
def run(self, filename, all=False, long=False, revision=None,
4557
show_ids=False, directory=None):
4407
show_ids=False):
4558
4408
from bzrlib.annotate import annotate_file, annotate_file_tree
4559
4409
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)
4410
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
4411
if wt is not None:
4412
wt.lock_read()
4413
else:
4414
branch.lock_read()
4415
try:
4416
tree = _get_one_revision_tree('annotate', revision, branch=branch)
4417
if wt is not None:
4418
file_id = wt.path2id(relpath)
4419
else:
4420
file_id = tree.path2id(relpath)
4421
if file_id is None:
4422
raise errors.NotVersionedError(filename)
4423
file_version = tree.inventory[file_id].revision
4424
if wt is not None and revision is None:
4425
# If there is a tree and we're not annotating historical
4426
# versions, annotate the working tree's content.
4427
annotate_file_tree(wt, file_id, self.outf, long, all,
4428
show_ids=show_ids)
4429
else:
4430
annotate_file(branch, file_version, file_id, long, all, self.outf,
4431
show_ids=show_ids)
4432
finally:
4433
if wt is not None:
4434
wt.unlock()
4435
else:
4436
branch.unlock()
4582
4437
4583
4438
4584
4439
class cmd_re_sign(Command):
4585
__doc__ = """Create a digital signature for an existing revision."""
4440
"""Create a digital signature for an existing revision."""
4586
4441
# TODO be able to replace existing ones.
4587
4442
4588
4443
hidden = True # is this right ?
4589
4444
takes_args = ['revision_id*']
4590
takes_options = ['directory', 'revision']
4445
takes_options = ['revision']
4591
4446
4592
def run(self, revision_id_list=None, revision=None, directory=u'.'):
4447
def run(self, revision_id_list=None, revision=None):
4593
4448
if revision_id_list is not None and revision is not None:
4594
4449
raise errors.BzrCommandError('You can only supply one of revision_id or --revision')
4595
4450
if revision_id_list is None and revision is None:
4596
4451
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)
4452
b = WorkingTree.open_containing(u'.')[0].branch
4453
b.lock_write()
4454
try:
4455
return self._run(b, revision_id_list, revision)
4456
finally:
4457
b.unlock()
4600
4458
4601
4459
def _run(self, b, revision_id_list, revision):
4602
4460
import bzrlib.gpg as gpg
4647
4505
4648
4506
4649
4507
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.
4508
"""Convert the current branch into a checkout of the supplied branch.
4652
4509
4653
4510
Once converted into a checkout, commits must succeed on the master branch
4654
4511
before they will be applied to the local branch.
4655
4512
4656
4513
Bound branches use the nickname of its master branch unless it is set
4657
locally, in which case binding will update the local nickname to be
4514
locally, in which case binding will update the the local nickname to be
4658
4515
that of the master.
4659
4516
"""
4660
4517
4661
4518
_see_also = ['checkouts', 'unbind']
4662
4519
takes_args = ['location?']
4663
takes_options = ['directory']
4520
takes_options = []
4664
4521
4665
def run(self, location=None, directory=u'.'):
4666
b, relpath = Branch.open_containing(directory)
4522
def run(self, location=None):
4523
b, relpath = Branch.open_containing(u'.')
4667
4524
if location is None:
4668
4525
try:
4669
4526
location = b.get_old_bound_location()
4672
4529
'This format does not remember old locations.')
4673
4530
else:
4674
4531
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')
4532
raise errors.BzrCommandError('No location supplied and no '
4533
'previous location known')
4680
4534
b_other = Branch.open(location)
4681
4535
try:
4682
4536
b.bind(b_other)
4688
4542
4689
4543
4690
4544
class cmd_unbind(Command):
4691
__doc__ = """Convert the current checkout into a regular branch.
4545
"""Convert the current checkout into a regular branch.
4692
4546
4693
4547
After unbinding, the local branch is considered independent and subsequent
4694
4548
commits will be local only.
4696
4550
4697
4551
_see_also = ['checkouts', 'bind']
4698
4552
takes_args = []
4699
takes_options = ['directory']
4553
takes_options = []
4700
4554
4701
def run(self, directory=u'.'):
4702
b, relpath = Branch.open_containing(directory)
4555
def run(self):
4556
b, relpath = Branch.open_containing(u'.')
4703
4557
if not b.unbind():
4704
4558
raise errors.BzrCommandError('Local branch is not bound')
4705
4559
4706
4560
4707
4561
class cmd_uncommit(Command):
4708
__doc__ = """Remove the last committed revision.
4562
"""Remove the last committed revision.
4709
4563
4710
4564
--verbose will print out what is being removed.
4711
4565
--dry-run will go through all the motions, but not actually
4751
4605
b = control.open_branch()
4752
4606
4753
4607
if tree is not None:
4754
self.add_cleanup(tree.lock_write().unlock)
4608
tree.lock_write()
4755
4609
else:
4756
self.add_cleanup(b.lock_write().unlock)
4757
return self._run(b, tree, dry_run, verbose, revision, force, local=local)
4610
b.lock_write()
4611
try:
4612
return self._run(b, tree, dry_run, verbose, revision, force,
4613
local=local)
4614
finally:
4615
if tree is not None:
4616
tree.unlock()
4617
else:
4618
b.unlock()
4758
4619
4759
4620
def _run(self, b, tree, dry_run, verbose, revision, force, local=False):
4760
4621
from bzrlib.log import log_formatter, show_log
4792
4653
end_revision=last_revno)
4793
4654
4794
4655
if dry_run:
4795
self.outf.write('Dry-run, pretending to remove'
4796
' the above revisions.\n')
4656
print 'Dry-run, pretending to remove the above revisions.'
4657
if not force:
4658
val = raw_input('Press <enter> to continue')
4797
4659
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
4660
print 'The above revision(s) will be removed.'
4661
if not force:
4662
val = raw_input('Are you sure [y/N]? ')
4663
if val.lower() not in ('y', 'yes'):
4664
print 'Canceled'
4665
return 0
4804
4666
4805
4667
mutter('Uncommitting from {%s} to {%s}',
4806
4668
last_rev_id, rev_id)
4807
4669
uncommit(b, tree=tree, dry_run=dry_run, verbose=verbose,
4808
4670
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)
4671
note('You can restore the old tip by running:\n'
4672
' bzr pull . -r revid:%s', last_rev_id)
4811
4673
4812
4674
4813
4675
class cmd_break_lock(Command):
4814
__doc__ = """Break a dead lock on a repository, branch or working directory.
4676
"""Break a dead lock on a repository, branch or working directory.
4815
4677
4816
4678
CAUTION: Locks should only be broken when you are sure that the process
4817
4679
holding the lock has been stopped.
4818
4680
4819
You can get information on what locks are open via the 'bzr info
4820
[location]' command.
4681
You can get information on what locks are open via the 'bzr info' command.
4821
4682
4822
4683
:Examples:
4823
4684
bzr break-lock
4824
bzr break-lock bzr+ssh://example.com/bzr/foo
4825
4685
"""
4826
4686
takes_args = ['location?']
4827
4687
4836
4696
4837
4697
4838
4698
class cmd_wait_until_signalled(Command):
4839
__doc__ = """Test helper for test_start_and_stop_bzr_subprocess_send_signal.
4699
"""Test helper for test_start_and_stop_bzr_subprocess_send_signal.
4840
4700
4841
4701
This just prints a line to signal when it is ready, then blocks on stdin.
4842
4702
"""
4850
4710
4851
4711
4852
4712
class cmd_serve(Command):
4853
__doc__ = """Run the bzr server."""
4713
"""Run the bzr server."""
4854
4714
4855
4715
aliases = ['server']
4856
4716
4857
4717
takes_options = [
4858
4718
Option('inet',
4859
4719
help='Serve on stdin/out for use from inetd or sshd.'),
4860
RegistryOption('protocol',
4861
help="Protocol to serve.",
4720
RegistryOption('protocol',
4721
help="Protocol to serve.",
4862
4722
lazy_registry=('bzrlib.transport', 'transport_server_registry'),
4863
4723
value_switches=True),
4864
4724
Option('port',
4867
4727
'result in a dynamically allocated port. The default port '
4868
4728
'depends on the protocol.',
4869
4729
type=str),
4870
custom_help('directory',
4871
help='Serve contents of this directory.'),
4730
Option('directory',
4731
help='Serve contents of this directory.',
4732
type=unicode),
4872
4733
Option('allow-writes',
4873
4734
help='By default the server is a readonly server. Supplying '
4874
4735
'--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.'
4736
'the served directory and below.'
4880
4737
),
4881
4738
]
4882
4739
4915
4772
4916
4773
4917
4774
class cmd_join(Command):
4918
__doc__ = """Combine a tree into its containing tree.
4775
"""Combine a tree into its containing tree.
4919
4776
4920
4777
This command requires the target tree to be in a rich-root format.
4921
4778
4961
4818
4962
4819
4963
4820
class cmd_split(Command):
4964
__doc__ = """Split a subdirectory of a tree into a separate tree.
4821
"""Split a subdirectory of a tree into a separate tree.
4965
4822
4966
4823
This command will produce a target tree in a format that supports
4967
4824
rich roots, like 'rich-root' or 'rich-root-pack'. These formats cannot be
4987
4844
4988
4845
4989
4846
class cmd_merge_directive(Command):
4990
__doc__ = """Generate a merge directive for auto-merge tools.
4847
"""Generate a merge directive for auto-merge tools.
4991
4848
4992
4849
A directive requests a merge to be performed, and also provides all the
4993
4850
information necessary to do so. This means it must either include a
5086
4943
5087
4944
5088
4945
class cmd_send(Command):
5089
__doc__ = """Mail or create a merge-directive for submitting changes.
4946
"""Mail or create a merge-directive for submitting changes.
5090
4947
5091
4948
A merge directive provides many things needed for requesting merges:
5092
4949
5098
4955
directly from the merge directive, without retrieving data from a
5099
4956
branch.
5100
4957
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.
4958
If --no-bundle is specified, then public_branch is needed (and must be
4959
up-to-date), so that the receiver can perform the merge using the
4960
public_branch. The public_branch is always included if known, so that
4961
people can check it later.
4962
4963
The submit branch defaults to the parent, but can be overridden. Both
4964
submit branch and public branch will be remembered if supplied.
4965
4966
If a public_branch is known for the submit_branch, that public submit
4967
branch is used in the merge instructions. This means that a local mirror
4968
can be used as your actual submit branch, once you have set public_branch
4969
for that mirror.
5127
4970
5128
4971
Mail is sent using your preferred mail program. This should be transparent
5129
4972
on Windows (it uses MAPI). On Linux, it requires the xdg-email utility.
5149
4992
5150
4993
The merge directives created by bzr send may be applied using bzr merge or
5151
4994
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
4995
"""
5157
4996
5158
4997
encoding_type = 'exact'
5174
5013
short_name='f',
5175
5014
type=unicode),
5176
5015
Option('output', short_name='o',
5177
help='Write merge directive to this file or directory; '
5016
help='Write merge directive to this file; '
5178
5017
'use - for stdout.',
5179
5018
type=unicode),
5180
5019
Option('strict',
5203
5042
5204
5043
5205
5044
class cmd_bundle_revisions(cmd_send):
5206
__doc__ = """Create a merge-directive for submitting changes.
5045
"""Create a merge-directive for submitting changes.
5207
5046
5208
5047
A merge directive provides many things needed for requesting merges:
5209
5048
5276
5115
5277
5116
5278
5117
class cmd_tag(Command):
5279
__doc__ = """Create, remove or modify a tag naming a revision.
5118
"""Create, remove or modify a tag naming a revision.
5280
5119
5281
5120
Tags give human-meaningful names to revisions. Commands that take a -r
5282
5121
(--revision) option can be given -rtag:X, where X is any previously
5290
5129
5291
5130
To rename a tag (change the name but keep it on the same revsion), run ``bzr
5292
5131
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
5132
"""
5299
5133
5300
5134
_see_also = ['commit', 'tags']
5301
takes_args = ['tag_name?']
5135
takes_args = ['tag_name']
5302
5136
takes_options = [
5303
5137
Option('delete',
5304
5138
help='Delete this tag rather than placing it.',
5305
5139
),
5306
custom_help('directory',
5307
help='Branch in which to place the tag.'),
5140
Option('directory',
5141
help='Branch in which to place the tag.',
5142
short_name='d',
5143
type=unicode,
5144
),
5308
5145
Option('force',
5309
5146
help='Replace existing tags.',
5310
5147
),
5311
5148
'revision',
5312
5149
]
5313
5150
5314
def run(self, tag_name=None,
5151
def run(self, tag_name,
5315
5152
delete=None,
5316
5153
directory='.',
5317
5154
force=None,
5318
5155
revision=None,
5319
5156
):
5320
5157
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)
5158
branch.lock_write()
5159
try:
5160
if delete:
5161
branch.tags.delete_tag(tag_name)
5162
self.outf.write('Deleted tag %s.\n' % tag_name)
5334
5163
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)
5164
if revision:
5165
if len(revision) != 1:
5166
raise errors.BzrCommandError(
5167
"Tags can only be placed on a single revision, "
5168
"not on a range")
5169
revision_id = revision[0].as_revision_id(branch)
5170
else:
5171
revision_id = branch.last_revision()
5172
if (not force) and branch.tags.has_tag(tag_name):
5173
raise errors.TagAlreadyExists(tag_name)
5174
branch.tags.set_tag(tag_name, revision_id)
5175
self.outf.write('Created tag %s.\n' % tag_name)
5176
finally:
5177
branch.unlock()
5345
5178
5346
5179
5347
5180
class cmd_tags(Command):
5348
__doc__ = """List tags.
5181
"""List tags.
5349
5182
5350
5183
This command shows a table of tag names and the revisions they reference.
5351
5184
"""
5352
5185
5353
5186
_see_also = ['tag']
5354
5187
takes_options = [
5355
custom_help('directory',
5356
help='Branch whose tags should be displayed.'),
5188
Option('directory',
5189
help='Branch whose tags should be displayed.',
5190
short_name='d',
5191
type=unicode,
5192
),
5357
5193
RegistryOption.from_kwargs('sort',
5358
5194
'Sort tags by different criteria.', title='Sorting',
5359
5195
alpha='Sort tags lexicographically (default).',
5376
5212
if not tags:
5377
5213
return
5378
5214
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()
5215
branch.lock_read()
5216
try:
5217
if revision:
5218
graph = branch.repository.get_graph()
5219
rev1, rev2 = _get_revision_range(revision, branch, self.name())
5220
revid1, revid2 = rev1.rev_id, rev2.rev_id
5221
# only show revisions between revid1 and revid2 (inclusive)
5222
tags = [(tag, revid) for tag, revid in tags if
5223
graph.is_between(revid, revid1, revid2)]
5224
if sort == 'alpha':
5225
tags.sort()
5226
elif sort == 'time':
5227
timestamps = {}
5228
for tag, revid in tags:
5229
try:
5230
revobj = branch.repository.get_revision(revid)
5231
except errors.NoSuchRevision:
5232
timestamp = sys.maxint # place them at the end
5233
else:
5234
timestamp = revobj.timestamp
5235
timestamps[revid] = timestamp
5236
tags.sort(key=lambda x: timestamps[x[1]])
5237
if not show_ids:
5238
# [ (tag, revid), ... ] -> [ (tag, dotted_revno), ... ]
5239
for index, (tag, revid) in enumerate(tags):
5240
try:
5241
revno = branch.revision_id_to_dotted_revno(revid)
5242
if isinstance(revno, tuple):
5243
revno = '.'.join(map(str, revno))
5244
except errors.NoSuchRevision:
5245
# Bad tag data/merges can lead to tagged revisions
5246
# which are not in this branch. Fail gracefully ...
5247
revno = '?'
5248
tags[index] = (tag, revno)
5249
finally:
5250
branch.unlock()
5413
5251
for tag, revspec in tags:
5414
5252
self.outf.write('%-20s %s\n' % (tag, revspec))
5415
5253
5416
5254
5417
5255
class cmd_reconfigure(Command):
5418
__doc__ = """Reconfigure the type of a bzr directory.
5256
"""Reconfigure the type of a bzr directory.
5419
5257
5420
5258
A target configuration must be specified.
5421
5259
5506
5344
5507
5345
5508
5346
class cmd_switch(Command):
5509
__doc__ = """Set the branch of a checkout and update.
5347
"""Set the branch of a checkout and update.
5510
5348
5511
5349
For lightweight checkouts, this changes the branch being referenced.
5512
5350
For heavyweight checkouts, this checks that there are no local commits
5524
5362
/path/to/newbranch.
5525
5363
5526
5364
Bound branches use the nickname of its master branch unless it is set
5527
locally, in which case switching will update the local nickname to be
5365
locally, in which case switching will update the the local nickname to be
5528
5366
that of the master.
5529
5367
"""
5530
5368
5531
takes_args = ['to_location?']
5369
takes_args = ['to_location']
5532
5370
takes_options = [Option('force',
5533
5371
help='Switch even if local commits will be lost.'),
5534
'revision',
5535
5372
Option('create-branch', short_name='b',
5536
5373
help='Create the target branch from this one before'
5537
5374
' switching to it.'),
5538
]
5375
]
5539
5376
5540
def run(self, to_location=None, force=False, create_branch=False,
5541
revision=None):
5377
def run(self, to_location, force=False, create_branch=False):
5542
5378
from bzrlib import switch
5543
5379
tree_location = '.'
5544
revision = _get_one_revision('switch', revision)
5545
5380
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
5381
try:
5552
5382
branch = control_dir.open_branch()
5553
5383
had_explicit_nick = branch.get_config().has_explicit_nickname()
5558
5388
if branch is None:
5559
5389
raise errors.BzrCommandError('cannot create branch without'
5560
5390
' source branch')
5561
to_location = directory_service.directories.dereference(
5562
to_location)
5563
5391
if '/' not in to_location and '\\' not in to_location:
5564
5392
# This path is meant to be relative to the existing branch
5565
5393
this_url = self._get_branch_location(control_dir)
5567
5395
to_branch = branch.bzrdir.sprout(to_location,
5568
5396
possible_transports=[branch.bzrdir.root_transport],
5569
5397
source_branch=branch).open_branch()
5398
# try:
5399
# from_branch = control_dir.open_branch()
5400
# except errors.NotBranchError:
5401
# raise BzrCommandError('Cannot create a branch from this'
5402
# ' location when we cannot open this branch')
5403
# from_branch.bzrdir.sprout(
5404
pass
5570
5405
else:
5571
5406
try:
5572
5407
to_branch = Branch.open(to_location)
5574
5409
this_url = self._get_branch_location(control_dir)
5575
5410
to_branch = Branch.open(
5576
5411
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)
5412
switch.switch(control_dir, to_branch, force)
5580
5413
if had_explicit_nick:
5581
5414
branch = control_dir.open_branch() #get the new branch!
5582
5415
branch.nick = to_branch.nick
5602
5435
5603
5436
5604
5437
class cmd_view(Command):
5605
__doc__ = """Manage filtered views.
5438
"""Manage filtered views.
5606
5439
5607
5440
Views provide a mask over the tree so that users can focus on
5608
5441
a subset of a tree when doing their work. After creating a view,
5756
5589
5757
5590
5758
5591
class cmd_hooks(Command):
5759
__doc__ = """Show hooks."""
5592
"""Show hooks."""
5760
5593
5761
5594
hidden = True
5762
5595
5775
5608
self.outf.write(" <no hooks installed>\n")
5776
5609
5777
5610
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
5611
class cmd_shelve(Command):
5804
__doc__ = """Temporarily set aside some changes from the current tree.
5612
"""Temporarily set aside some changes from the current tree.
5805
5613
5806
5614
Shelve allows you to temporarily put changes you've made "on the shelf",
5807
5615
ie. out of the way, until a later time when you can bring them back from
5854
5662
try:
5855
5663
shelver.run()
5856
5664
finally:
5857
shelver.finalize()
5665
shelver.work_tree.unlock()
5858
5666
except errors.UserAbort:
5859
5667
return 0
5860
5668
5861
5669
def run_for_list(self):
5862
5670
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
5671
tree.lock_read()
5672
try:
5673
manager = tree.get_shelf_manager()
5674
shelves = manager.active_shelves()
5675
if len(shelves) == 0:
5676
note('No shelved changes.')
5677
return 0
5678
for shelf_id in reversed(shelves):
5679
message = manager.get_metadata(shelf_id).get('message')
5680
if message is None:
5681
message = '<no message>'
5682
self.outf.write('%3d: %s\n' % (shelf_id, message))
5683
return 1
5684
finally:
5685
tree.unlock()
5875
5686
5876
5687
5877
5688
class cmd_unshelve(Command):
5878
__doc__ = """Restore shelved changes.
5689
"""Restore shelved changes.
5879
5690
5880
5691
By default, the most recently shelved changes are restored. However if you
5881
5692
specify a shelf by id those changes will be restored instead. This works
5889
5700
enum_switch=False, value_switches=True,
5890
5701
apply="Apply changes and remove from the shelf.",
5891
5702
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.",
5703
delete_only="Delete changes without applying them."
5896
5704
)
5897
5705
]
5898
5706
_see_also = ['shelve']
5907
5715
5908
5716
5909
5717
class cmd_clean_tree(Command):
5910
__doc__ = """Remove unwanted files from working tree.
5718
"""Remove unwanted files from working tree.
5911
5719
5912
5720
By default, only unknown files, not ignored files, are deleted. Versioned
5913
5721
files are never deleted.
5921
5729
5922
5730
To check what clean-tree will do, use --dry-run.
5923
5731
"""
5924
takes_options = ['directory',
5925
Option('ignored', help='Delete all ignored files.'),
5732
takes_options = [Option('ignored', help='Delete all ignored files.'),
5926
5733
Option('detritus', help='Delete conflict files, merge'
5927
5734
' backups, and failed selftest dirs.'),
5928
5735
Option('unknown',
5931
5738
' deleting them.'),
5932
5739
Option('force', help='Do not prompt before deleting.')]
5933
5740
def run(self, unknown=False, ignored=False, detritus=False, dry_run=False,
5934
force=False, directory=u'.'):
5741
force=False):
5935
5742
from bzrlib.clean_tree import clean_tree
5936
5743
if not (unknown or ignored or detritus):
5937
5744
unknown = True
5938
5745
if dry_run:
5939
5746
force = True
5940
clean_tree(directory, unknown=unknown, ignored=ignored,
5941
detritus=detritus, dry_run=dry_run, no_prompt=force)
5747
clean_tree('.', unknown=unknown, ignored=ignored, detritus=detritus,
5748
dry_run=dry_run, no_prompt=force)
5942
5749
5943
5750
5944
5751
class cmd_reference(Command):
5945
__doc__ = """list, view and set branch locations for nested trees.
5752
"""list, view and set branch locations for nested trees.
5946
5753
5947
5754
If no arguments are provided, lists the branch locations for nested trees.
5948
5755
If one argument is provided, display the branch location for that tree.
5988
5795
self.outf.write('%s %s\n' % (path, location))
5989
5796
5990
5797
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)
5798
# these get imported and then picked up by the scan for cmd_*
5799
# TODO: Some more consistent way to split command definitions across files;
5800
# we do need to load at least some information about them to know of
5801
# aliases. ideally we would avoid loading the implementation until the
5802
# details were needed.
5803
from bzrlib.cmd_version_info import cmd_version_info
5804
from bzrlib.conflicts import cmd_resolve, cmd_conflicts, restore
5805
from bzrlib.bundle.commands import (
5806
cmd_bundle_info,
5807
)
5808
from bzrlib.foreign import cmd_dpush
5809
from bzrlib.sign_my_commits import cmd_sign_my_commits
5810
from bzrlib.weave_commands import cmd_versionedfile_list, \
5811
cmd_weave_plan_merge, cmd_weave_merge_text
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0