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