« back to all changes in this revision
Viewing changes to bzrlib/builtins.py
- browse files at revision 4769.1.1
- compare with another revision
- download diff
- download tarball
- view history from revision 4769.1.1
- Committer: Andrew Bennetts
- Date: 2009-10-26 06:44:40 UTC
- mfrom: (4634.77.9 2.0)
- mto: This revision was merged to the branch mainline in revision 4770.
- Revision ID: andrew.bennetts@canonical.com-20091026064440-06u7tpg7l6sjkh8h
Merge lp:bzr/2.0 into lp:bzr.
- files added:
- bzrlib/textui.py
- files removed:
- .testr.conf
- apport
- bzrlib/help_topics/es
- bzrlib/plugins/news_merge
- bzrlib/plugins/news_merge/tests
- bzrlib/tests/per_bzrdir_colo
- contrib/debian
- doc/en/whats-new
- doc/ja
- doc/ja/_static
- doc/ja/_templates
- doc/ja/mini-tutorial
- doc/ja/tutorials
- doc/ja/upgrade-guide
- doc/ja/user-guide
- doc/ja/user-guide/images
- doc/ja/user-reference
- files renamed:
- bzrlib/help_topics/en/conflict-types.txt => bzrlib/help_topics/en/conflicts.txt
- bzrlib/tests/test__bencode.py => bzrlib/tests/test_bencode.py
- bzrlib/help_topics/es/conflict-types.txt => doc/es/user-guide/resolving_conflicts.txt
- files modified:
- .bzrignore
added
removed
bzrlib/builtins.py
1
# Copyright (C) 2005-2010 Canonical Ltd
1
# Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
31
31
bundle,
32
32
btree_index,
33
33
bzrdir,
34
directory_service,
35
34
delta,
36
35
config,
37
36
errors,
44
43
reconfigure,
45
44
rename_map,
46
45
revision as _mod_revision,
47
static_tuple,
48
46
symbol_versioning,
49
timestamp,
50
47
transport,
51
48
ui,
52
49
urlutils,
54
51
)
55
52
from bzrlib.branch import Branch
56
53
from bzrlib.conflicts import ConflictList
57
from bzrlib.transport import memory
58
54
from bzrlib.revisionspec import RevisionSpec, RevisionInfo
59
55
from bzrlib.smtp_connection import SMTPConnection
60
56
from bzrlib.workingtree import WorkingTree
61
57
""")
62
58
63
from bzrlib.commands import (
64
Command,
65
builtin_command_registry,
66
display_command,
67
)
59
from bzrlib.commands import Command, display_command
68
60
from bzrlib.option import (
69
61
ListOption,
70
62
Option,
239
231
# opens the branch?)
240
232
241
233
class cmd_status(Command):
242
__doc__ = """Display status summary.
234
"""Display status summary.
243
235
244
236
This reports on versioned and unknown files, reporting them
245
237
grouped by state. Possible states are:
265
257
unknown
266
258
Not versioned and not matching an ignore pattern.
267
259
268
Additionally for directories, symlinks and files with an executable
269
bit, Bazaar indicates their type using a trailing character: '/', '@'
270
or '*' respectively.
271
272
260
To see ignored files use 'bzr ignored'. For details on the
273
261
changes to file texts, use 'bzr diff'.
274
262
332
320
333
321
334
322
class cmd_cat_revision(Command):
335
__doc__ = """Write out metadata for a revision.
323
"""Write out metadata for a revision.
336
324
337
325
The revision to print can either be specified by a specific
338
326
revision identifier, or you can use --revision.
344
332
# cat-revision is more for frontends so should be exact
345
333
encoding = 'strict'
346
334
347
def print_revision(self, revisions, revid):
348
stream = revisions.get_record_stream([(revid,)], 'unordered', True)
349
record = stream.next()
350
if record.storage_kind == 'absent':
351
raise errors.NoSuchRevision(revisions, revid)
352
revtext = record.get_bytes_as('fulltext')
353
self.outf.write(revtext.decode('utf-8'))
354
355
335
@display_command
356
336
def run(self, revision_id=None, revision=None):
357
337
if revision_id is not None and revision is not None:
362
342
' --revision or a revision_id')
363
343
b = WorkingTree.open_containing(u'.')[0].branch
364
344
365
revisions = b.repository.revisions
366
if revisions is None:
367
raise errors.BzrCommandError('Repository %r does not support '
368
'access to raw revision texts')
345
# TODO: jam 20060112 should cat-revision always output utf-8?
346
if revision_id is not None:
347
revision_id = osutils.safe_revision_id(revision_id, warn=False)
348
try:
349
self.outf.write(b.repository.get_revision_xml(revision_id).decode('utf-8'))
350
except errors.NoSuchRevision:
351
msg = "The repository %s contains no revision %s." % (b.repository.base,
352
revision_id)
353
raise errors.BzrCommandError(msg)
354
elif revision is not None:
355
for rev in revision:
356
if rev is None:
357
raise errors.BzrCommandError('You cannot specify a NULL'
358
' revision.')
359
rev_id = rev.as_revision_id(b)
360
self.outf.write(b.repository.get_revision_xml(rev_id).decode('utf-8'))
369
361
370
b.repository.lock_read()
371
try:
372
# TODO: jam 20060112 should cat-revision always output utf-8?
373
if revision_id is not None:
374
revision_id = osutils.safe_revision_id(revision_id, warn=False)
375
try:
376
self.print_revision(revisions, revision_id)
377
except errors.NoSuchRevision:
378
msg = "The repository %s contains no revision %s." % (
379
b.repository.base, revision_id)
380
raise errors.BzrCommandError(msg)
381
elif revision is not None:
382
for rev in revision:
383
if rev is None:
384
raise errors.BzrCommandError(
385
'You cannot specify a NULL revision.')
386
rev_id = rev.as_revision_id(b)
387
self.print_revision(revisions, rev_id)
388
finally:
389
b.repository.unlock()
390
391
362
392
363
class cmd_dump_btree(Command):
393
__doc__ = """Dump the contents of a btree index file to stdout.
364
"""Dump the contents of a btree index file to stdout.
394
365
395
366
PATH is a btree index file, it can be any URL. This includes things like
396
367
.bzr/repository/pack-names, or .bzr/repository/indices/a34b3a...ca4a4.iix
460
431
for node in bt.iter_all_entries():
461
432
# Node is made up of:
462
433
# (index, key, value, [references])
463
try:
464
refs = node[3]
465
except IndexError:
466
refs_as_tuples = None
467
else:
468
refs_as_tuples = static_tuple.as_tuples(refs)
434
refs_as_tuples = tuple([tuple([tuple(ref) for ref in ref_list])
435
for ref_list in node[3]])
469
436
as_tuple = (tuple(node[1]), node[2], refs_as_tuples)
470
437
self.outf.write('%s\n' % (as_tuple,))
471
438
472
439
473
440
class cmd_remove_tree(Command):
474
__doc__ = """Remove the working tree from a given branch/checkout.
441
"""Remove the working tree from a given branch/checkout.
475
442
476
443
Since a lightweight checkout is little more than a working tree
477
444
this will refuse to run against one.
479
446
To re-create the working tree, use "bzr checkout".
480
447
"""
481
448
_see_also = ['checkout', 'working-trees']
482
takes_args = ['location*']
449
takes_args = ['location?']
483
450
takes_options = [
484
451
Option('force',
485
452
help='Remove the working tree even if it has '
486
453
'uncommitted changes.'),
487
454
]
488
455
489
def run(self, location_list, force=False):
490
if not location_list:
491
location_list=['.']
492
493
for location in location_list:
494
d = bzrdir.BzrDir.open(location)
495
496
try:
497
working = d.open_workingtree()
498
except errors.NoWorkingTree:
499
raise errors.BzrCommandError("No working tree to remove")
500
except errors.NotLocalUrl:
501
raise errors.BzrCommandError("You cannot remove the working tree"
502
" of a remote path")
503
if not force:
504
if (working.has_changes()):
505
raise errors.UncommittedChanges(working)
506
507
if working.user_url != working.branch.user_url:
508
raise errors.BzrCommandError("You cannot remove the working tree"
509
" from a lightweight checkout")
510
511
d.destroy_workingtree()
456
def run(self, location='.', force=False):
457
d = bzrdir.BzrDir.open(location)
458
459
try:
460
working = d.open_workingtree()
461
except errors.NoWorkingTree:
462
raise errors.BzrCommandError("No working tree to remove")
463
except errors.NotLocalUrl:
464
raise errors.BzrCommandError("You cannot remove the working tree"
465
" of a remote path")
466
if not force:
467
if (working.has_changes()):
468
raise errors.UncommittedChanges(working)
469
470
working_path = working.bzrdir.root_transport.base
471
branch_path = working.branch.bzrdir.root_transport.base
472
if working_path != branch_path:
473
raise errors.BzrCommandError("You cannot remove the working tree"
474
" from a lightweight checkout")
475
476
d.destroy_workingtree()
512
477
513
478
514
479
class cmd_revno(Command):
515
__doc__ = """Show current revision number.
480
"""Show current revision number.
516
481
517
482
This is equal to the number of revisions on this branch.
518
483
"""
528
493
if tree:
529
494
try:
530
495
wt = WorkingTree.open_containing(location)[0]
531
self.add_cleanup(wt.lock_read().unlock)
496
wt.lock_read()
532
497
except (errors.NoWorkingTree, errors.NotLocalUrl):
533
498
raise errors.NoWorkingTree(location)
534
revid = wt.last_revision()
535
499
try:
536
revno_t = wt.branch.revision_id_to_dotted_revno(revid)
537
except errors.NoSuchRevision:
538
revno_t = ('???',)
539
revno = ".".join(str(n) for n in revno_t)
500
revid = wt.last_revision()
501
try:
502
revno_t = wt.branch.revision_id_to_dotted_revno(revid)
503
except errors.NoSuchRevision:
504
revno_t = ('???',)
505
revno = ".".join(str(n) for n in revno_t)
506
finally:
507
wt.unlock()
540
508
else:
541
509
b = Branch.open_containing(location)[0]
542
self.add_cleanup(b.lock_read().unlock)
543
revno = b.revno()
544
self.cleanup_now()
510
b.lock_read()
511
try:
512
revno = b.revno()
513
finally:
514
b.unlock()
515
545
516
self.outf.write(str(revno) + '\n')
546
517
547
518
548
519
class cmd_revision_info(Command):
549
__doc__ = """Show revision number and revision id for a given revision identifier.
520
"""Show revision number and revision id for a given revision identifier.
550
521
"""
551
522
hidden = True
552
523
takes_args = ['revision_info*']
568
539
try:
569
540
wt = WorkingTree.open_containing(directory)[0]
570
541
b = wt.branch
571
self.add_cleanup(wt.lock_read().unlock)
542
wt.lock_read()
572
543
except (errors.NoWorkingTree, errors.NotLocalUrl):
573
544
wt = None
574
545
b = Branch.open_containing(directory)[0]
575
self.add_cleanup(b.lock_read().unlock)
576
revision_ids = []
577
if revision is not None:
578
revision_ids.extend(rev.as_revision_id(b) for rev in revision)
579
if revision_info_list is not None:
580
for rev_str in revision_info_list:
581
rev_spec = RevisionSpec.from_string(rev_str)
582
revision_ids.append(rev_spec.as_revision_id(b))
583
# No arguments supplied, default to the last revision
584
if len(revision_ids) == 0:
585
if tree:
586
if wt is None:
587
raise errors.NoWorkingTree(directory)
588
revision_ids.append(wt.last_revision())
546
b.lock_read()
547
try:
548
revision_ids = []
549
if revision is not None:
550
revision_ids.extend(rev.as_revision_id(b) for rev in revision)
551
if revision_info_list is not None:
552
for rev_str in revision_info_list:
553
rev_spec = RevisionSpec.from_string(rev_str)
554
revision_ids.append(rev_spec.as_revision_id(b))
555
# No arguments supplied, default to the last revision
556
if len(revision_ids) == 0:
557
if tree:
558
if wt is None:
559
raise errors.NoWorkingTree(directory)
560
revision_ids.append(wt.last_revision())
561
else:
562
revision_ids.append(b.last_revision())
563
564
revinfos = []
565
maxlen = 0
566
for revision_id in revision_ids:
567
try:
568
dotted_revno = b.revision_id_to_dotted_revno(revision_id)
569
revno = '.'.join(str(i) for i in dotted_revno)
570
except errors.NoSuchRevision:
571
revno = '???'
572
maxlen = max(maxlen, len(revno))
573
revinfos.append([revno, revision_id])
574
finally:
575
if wt is None:
576
b.unlock()
589
577
else:
590
revision_ids.append(b.last_revision())
591
592
revinfos = []
593
maxlen = 0
594
for revision_id in revision_ids:
595
try:
596
dotted_revno = b.revision_id_to_dotted_revno(revision_id)
597
revno = '.'.join(str(i) for i in dotted_revno)
598
except errors.NoSuchRevision:
599
revno = '???'
600
maxlen = max(maxlen, len(revno))
601
revinfos.append([revno, revision_id])
602
603
self.cleanup_now()
578
wt.unlock()
579
604
580
for ri in revinfos:
605
581
self.outf.write('%*s %s\n' % (maxlen, ri[0], ri[1]))
606
582
607
583
608
584
class cmd_add(Command):
609
__doc__ = """Add specified files or directories.
585
"""Add specified files or directories.
610
586
611
587
In non-recursive mode, all the named items are added, regardless
612
588
of whether they were previously ignored. A warning is given if
677
653
should_print=(not is_quiet()))
678
654
679
655
if base_tree:
680
self.add_cleanup(base_tree.lock_read().unlock)
681
tree, file_list = tree_files_for_add(file_list)
682
added, ignored = tree.smart_add(file_list, not
683
no_recurse, action=action, save=not dry_run)
684
self.cleanup_now()
656
base_tree.lock_read()
657
try:
658
file_list = self._maybe_expand_globs(file_list)
659
tree, file_list = tree_files_for_add(file_list)
660
added, ignored = tree.smart_add(file_list, not
661
no_recurse, action=action, save=not dry_run)
662
finally:
663
if base_tree is not None:
664
base_tree.unlock()
685
665
if len(ignored) > 0:
686
666
if verbose:
687
667
for glob in sorted(ignored.keys()):
691
671
692
672
693
673
class cmd_mkdir(Command):
694
__doc__ = """Create a new versioned directory.
674
"""Create a new versioned directory.
695
675
696
676
This is equivalent to creating the directory and then adding it.
697
677
"""
701
681
702
682
def run(self, dir_list):
703
683
for d in dir_list:
684
os.mkdir(d)
704
685
wt, dd = WorkingTree.open_containing(d)
705
base = os.path.dirname(dd)
706
id = wt.path2id(base)
707
if id != None:
708
os.mkdir(d)
709
wt.add([dd])
710
self.outf.write('added %s\n' % d)
711
else:
712
raise errors.NotVersionedError(path=base)
686
wt.add([dd])
687
self.outf.write('added %s\n' % d)
713
688
714
689
715
690
class cmd_relpath(Command):
716
__doc__ = """Show path of a file relative to root"""
691
"""Show path of a file relative to root"""
717
692
718
693
takes_args = ['filename']
719
694
hidden = True
728
703
729
704
730
705
class cmd_inventory(Command):
731
__doc__ = """Show inventory of the current working copy or a revision.
706
"""Show inventory of the current working copy or a revision.
732
707
733
708
It is possible to limit the output to a particular entry
734
709
type using the --kind option. For example: --kind file.
755
730
756
731
revision = _get_one_revision('inventory', revision)
757
732
work_tree, file_list = tree_files(file_list)
758
self.add_cleanup(work_tree.lock_read().unlock)
759
if revision is not None:
760
tree = revision.as_tree(work_tree.branch)
761
762
extra_trees = [work_tree]
763
self.add_cleanup(tree.lock_read().unlock)
764
else:
765
tree = work_tree
766
extra_trees = []
767
768
if file_list is not None:
769
file_ids = tree.paths2ids(file_list, trees=extra_trees,
770
require_versioned=True)
771
# find_ids_across_trees may include some paths that don't
772
# exist in 'tree'.
773
entries = sorted((tree.id2path(file_id), tree.inventory[file_id])
774
for file_id in file_ids if file_id in tree)
775
else:
776
entries = tree.inventory.entries()
777
778
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
779
758
for path, entry in entries:
780
759
if kind and kind != entry.kind:
781
760
continue
787
766
788
767
789
768
class cmd_mv(Command):
790
__doc__ = """Move or rename a file.
769
"""Move or rename a file.
791
770
792
771
:Usage:
793
772
bzr mv OLDNAME NEWNAME
826
805
if len(names_list) < 2:
827
806
raise errors.BzrCommandError("missing file argument")
828
807
tree, rel_names = tree_files(names_list, canonicalize=False)
829
self.add_cleanup(tree.lock_tree_write().unlock)
830
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()
831
813
832
814
def run_auto(self, names_list, after, dry_run):
833
815
if names_list is not None and len(names_list) > 1:
837
819
raise errors.BzrCommandError('--after cannot be specified with'
838
820
' --auto.')
839
821
work_tree, file_list = tree_files(names_list, default_branch='.')
840
self.add_cleanup(work_tree.lock_tree_write().unlock)
841
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()
842
827
843
828
def _run(self, tree, names_list, rel_names, after):
844
829
into_existing = osutils.isdir(names_list[-1])
865
850
# All entries reference existing inventory items, so fix them up
866
851
# for cicp file-systems.
867
852
rel_names = tree.get_canonical_inventory_paths(rel_names)
868
for src, dest in tree.move(rel_names[:-1], rel_names[-1], after=after):
869
if not is_quiet():
870
self.outf.write("%s => %s\n" % (src, dest))
853
for pair in tree.move(rel_names[:-1], rel_names[-1], after=after):
854
self.outf.write("%s => %s\n" % pair)
871
855
else:
872
856
if len(names_list) != 2:
873
857
raise errors.BzrCommandError('to mv multiple files the'
917
901
dest = osutils.pathjoin(dest_parent, dest_tail)
918
902
mutter("attempting to move %s => %s", src, dest)
919
903
tree.rename_one(src, dest, after=after)
920
if not is_quiet():
921
self.outf.write("%s => %s\n" % (src, dest))
904
self.outf.write("%s => %s\n" % (src, dest))
922
905
923
906
924
907
class cmd_pull(Command):
925
__doc__ = """Turn this branch into a mirror of another branch.
908
"""Turn this branch into a mirror of another branch.
926
909
927
By default, this command only works on branches that have not diverged.
928
Branches are considered diverged if the destination branch's most recent
929
commit is one that has not been merged (directly or indirectly) into the
930
parent.
910
This command only works on branches that have not diverged. Branches are
911
considered diverged if the destination branch's most recent commit is one
912
that has not been merged (directly or indirectly) into the parent.
931
913
932
914
If branches have diverged, you can use 'bzr merge' to integrate the changes
933
915
from one into the other. Once one branch has merged, the other should
934
916
be able to pull it again.
935
917
936
If you want to replace your local changes and just want your branch to
937
match the remote one, use pull --overwrite. This will work even if the two
938
branches have diverged.
918
If you want to forget your local changes and just update your branch to
919
match the remote one, use pull --overwrite.
939
920
940
921
If there is no default location set, the first pull will set it. After
941
922
that, you can omit the location to use the default. To change the
977
958
try:
978
959
tree_to = WorkingTree.open_containing(directory)[0]
979
960
branch_to = tree_to.branch
980
self.add_cleanup(tree_to.lock_write().unlock)
981
961
except errors.NoWorkingTree:
982
962
tree_to = None
983
963
branch_to = Branch.open_containing(directory)[0]
984
self.add_cleanup(branch_to.lock_write().unlock)
985
964
986
965
if local and not branch_to.get_bound_location():
987
966
raise errors.LocalRequiresBoundBranch()
988
967
1018
997
else:
1019
998
branch_from = Branch.open(location,
1020
999
possible_transports=possible_transports)
1021
self.add_cleanup(branch_from.lock_read().unlock)
1022
1000
1023
1001
if branch_to.get_parent() is None or remember:
1024
1002
branch_to.set_parent(branch_from.base)
1025
1003
1026
if revision is not None:
1027
revision_id = revision.as_revision_id(branch_from)
1028
1029
if tree_to is not None:
1030
view_info = _get_view_info_for_change_reporter(tree_to)
1031
change_reporter = delta._ChangeReporter(
1032
unversioned_filter=tree_to.is_ignored,
1033
view_info=view_info)
1034
result = tree_to.pull(
1035
branch_from, overwrite, revision_id, change_reporter,
1036
possible_transports=possible_transports, local=local)
1037
else:
1038
result = branch_to.pull(
1039
branch_from, overwrite, revision_id, local=local)
1040
1041
result.report(self.outf)
1042
if verbose and result.old_revid != result.new_revid:
1043
log.show_branch_change(
1044
branch_to, self.outf, result.old_revno,
1045
result.old_revid)
1004
if branch_from is not branch_to:
1005
branch_from.lock_read()
1006
try:
1007
if revision is not None:
1008
revision_id = revision.as_revision_id(branch_from)
1009
1010
branch_to.lock_write()
1011
try:
1012
if tree_to is not None:
1013
view_info = _get_view_info_for_change_reporter(tree_to)
1014
change_reporter = delta._ChangeReporter(
1015
unversioned_filter=tree_to.is_ignored,
1016
view_info=view_info)
1017
result = tree_to.pull(
1018
branch_from, overwrite, revision_id, change_reporter,
1019
possible_transports=possible_transports, local=local)
1020
else:
1021
result = branch_to.pull(
1022
branch_from, overwrite, revision_id, local=local)
1023
1024
result.report(self.outf)
1025
if verbose and result.old_revid != result.new_revid:
1026
log.show_branch_change(
1027
branch_to, self.outf, result.old_revno,
1028
result.old_revid)
1029
finally:
1030
branch_to.unlock()
1031
finally:
1032
if branch_from is not branch_to:
1033
branch_from.unlock()
1046
1034
1047
1035
1048
1036
class cmd_push(Command):
1049
__doc__ = """Update a mirror of this branch.
1037
"""Update a mirror of this branch.
1050
1038
1051
1039
The target branch will not have its working tree populated because this
1052
1040
is both expensive, and is not supported on remote file systems.
1113
1101
# Get the source branch
1114
1102
(tree, br_from,
1115
1103
_unused) = bzrdir.BzrDir.open_containing_tree_or_branch(directory)
1104
if strict is None:
1105
strict = br_from.get_config().get_user_option_as_bool('push_strict')
1106
if strict is None: strict = True # default value
1116
1107
# Get the tip's revision_id
1117
1108
revision = _get_one_revision('push', revision)
1118
1109
if revision is not None:
1119
1110
revision_id = revision.in_history(br_from).rev_id
1120
1111
else:
1121
1112
revision_id = None
1122
if tree is not None and revision_id is None:
1123
tree.check_changed_or_out_of_date(
1124
strict, 'push_strict',
1125
more_error='Use --no-strict to force the push.',
1126
more_warning='Uncommitted changes will not be pushed.')
1113
if strict and tree is not None and revision_id is None:
1114
if (tree.has_changes()):
1115
raise errors.UncommittedChanges(
1116
tree, more='Use --no-strict to force the push.')
1117
if tree.last_revision() != tree.branch.last_revision():
1118
# The tree has lost sync with its branch, there is little
1119
# chance that the user is aware of it but he can still force
1120
# the push with --no-strict
1121
raise errors.OutOfDateTree(
1122
tree, more='Use --no-strict to force the push.')
1123
1127
1124
# Get the stacked_on branch, if any
1128
1125
if stacked_on is not None:
1129
1126
stacked_on = urlutils.normalize_url(stacked_on)
1161
1158
1162
1159
1163
1160
class cmd_branch(Command):
1164
__doc__ = """Create a new branch that is a copy of an existing branch.
1161
"""Create a new branch that is a copy of an existing branch.
1165
1162
1166
1163
If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will
1167
1164
be used. In other words, "branch ../foo/bar" will attempt to create ./bar.
1194
1191
' directory exists, but does not already'
1195
1192
' have a control directory. This flag will'
1196
1193
' allow branch to proceed.'),
1197
Option('bind',
1198
help="Bind new branch to from location."),
1199
1194
]
1200
1195
aliases = ['get', 'clone']
1201
1196
1202
1197
def run(self, from_location, to_location=None, revision=None,
1203
1198
hardlink=False, stacked=False, standalone=False, no_tree=False,
1204
use_existing_dir=False, switch=False, bind=False):
1199
use_existing_dir=False, switch=False):
1205
1200
from bzrlib import switch as _mod_switch
1206
1201
from bzrlib.tag import _merge_tags_if_possible
1207
1202
accelerator_tree, br_from = bzrdir.BzrDir.open_tree_or_branch(
1208
1203
from_location)
1204
if (accelerator_tree is not None and
1205
accelerator_tree.supports_content_filtering()):
1206
accelerator_tree = None
1209
1207
revision = _get_one_revision('branch', revision)
1210
self.add_cleanup(br_from.lock_read().unlock)
1211
if revision is not None:
1212
revision_id = revision.as_revision_id(br_from)
1213
else:
1214
# FIXME - wt.last_revision, fallback to branch, fall back to
1215
# None or perhaps NULL_REVISION to mean copy nothing
1216
# RBC 20060209
1217
revision_id = br_from.last_revision()
1218
if to_location is None:
1219
to_location = urlutils.derive_to_location(from_location)
1220
to_transport = transport.get_transport(to_location)
1208
br_from.lock_read()
1221
1209
try:
1222
to_transport.mkdir('.')
1223
except errors.FileExists:
1224
if not use_existing_dir:
1225
raise errors.BzrCommandError('Target directory "%s" '
1226
'already exists.' % to_location)
1210
if revision is not None:
1211
revision_id = revision.as_revision_id(br_from)
1227
1212
else:
1228
try:
1229
bzrdir.BzrDir.open_from_transport(to_transport)
1230
except errors.NotBranchError:
1231
pass
1213
# FIXME - wt.last_revision, fallback to branch, fall back to
1214
# None or perhaps NULL_REVISION to mean copy nothing
1215
# RBC 20060209
1216
revision_id = br_from.last_revision()
1217
if to_location is None:
1218
to_location = urlutils.derive_to_location(from_location)
1219
to_transport = transport.get_transport(to_location)
1220
try:
1221
to_transport.mkdir('.')
1222
except errors.FileExists:
1223
if not use_existing_dir:
1224
raise errors.BzrCommandError('Target directory "%s" '
1225
'already exists.' % to_location)
1232
1226
else:
1233
raise errors.AlreadyBranchError(to_location)
1234
except errors.NoSuchFile:
1235
raise errors.BzrCommandError('Parent of "%s" does not exist.'
1236
% to_location)
1237
try:
1238
# preserve whatever source format we have.
1239
dir = br_from.bzrdir.sprout(to_transport.base, revision_id,
1240
possible_transports=[to_transport],
1241
accelerator_tree=accelerator_tree,
1242
hardlink=hardlink, stacked=stacked,
1243
force_new_repo=standalone,
1244
create_tree_if_local=not no_tree,
1245
source_branch=br_from)
1246
branch = dir.open_branch()
1247
except errors.NoSuchRevision:
1248
to_transport.delete_tree('.')
1249
msg = "The branch %s has no revision %s." % (from_location,
1250
revision)
1251
raise errors.BzrCommandError(msg)
1252
_merge_tags_if_possible(br_from, branch)
1253
# If the source branch is stacked, the new branch may
1254
# be stacked whether we asked for that explicitly or not.
1255
# We therefore need a try/except here and not just 'if stacked:'
1256
try:
1257
note('Created new stacked branch referring to %s.' %
1258
branch.get_stacked_on_url())
1259
except (errors.NotStacked, errors.UnstackableBranchFormat,
1260
errors.UnstackableRepositoryFormat), e:
1261
note('Branched %d revision(s).' % branch.revno())
1262
if bind:
1263
# Bind to the parent
1264
parent_branch = Branch.open(from_location)
1265
branch.bind(parent_branch)
1266
note('New branch bound to %s' % from_location)
1267
if switch:
1268
# Switch to the new branch
1269
wt, _ = WorkingTree.open_containing('.')
1270
_mod_switch.switch(wt.bzrdir, branch)
1271
note('Switched to branch: %s',
1272
urlutils.unescape_for_display(branch.base, 'utf-8'))
1227
try:
1228
bzrdir.BzrDir.open_from_transport(to_transport)
1229
except errors.NotBranchError:
1230
pass
1231
else:
1232
raise errors.AlreadyBranchError(to_location)
1233
except errors.NoSuchFile:
1234
raise errors.BzrCommandError('Parent of "%s" does not exist.'
1235
% to_location)
1236
try:
1237
# preserve whatever source format we have.
1238
dir = br_from.bzrdir.sprout(to_transport.base, revision_id,
1239
possible_transports=[to_transport],
1240
accelerator_tree=accelerator_tree,
1241
hardlink=hardlink, stacked=stacked,
1242
force_new_repo=standalone,
1243
create_tree_if_local=not no_tree,
1244
source_branch=br_from)
1245
branch = dir.open_branch()
1246
except errors.NoSuchRevision:
1247
to_transport.delete_tree('.')
1248
msg = "The branch %s has no revision %s." % (from_location,
1249
revision)
1250
raise errors.BzrCommandError(msg)
1251
_merge_tags_if_possible(br_from, branch)
1252
# If the source branch is stacked, the new branch may
1253
# be stacked whether we asked for that explicitly or not.
1254
# We therefore need a try/except here and not just 'if stacked:'
1255
try:
1256
note('Created new stacked branch referring to %s.' %
1257
branch.get_stacked_on_url())
1258
except (errors.NotStacked, errors.UnstackableBranchFormat,
1259
errors.UnstackableRepositoryFormat), e:
1260
note('Branched %d revision(s).' % branch.revno())
1261
if switch:
1262
# Switch to the new branch
1263
wt, _ = WorkingTree.open_containing('.')
1264
_mod_switch.switch(wt.bzrdir, branch)
1265
note('Switched to branch: %s',
1266
urlutils.unescape_for_display(branch.base, 'utf-8'))
1267
finally:
1268
br_from.unlock()
1273
1269
1274
1270
1275
1271
class cmd_checkout(Command):
1276
__doc__ = """Create a new checkout of an existing branch.
1272
"""Create a new checkout of an existing branch.
1277
1273
1278
1274
If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree for
1279
1275
the branch found in '.'. This is useful if you have removed the working tree
1342
1338
1343
1339
1344
1340
class cmd_renames(Command):
1345
__doc__ = """Show list of renamed files.
1341
"""Show list of renamed files.
1346
1342
"""
1347
1343
# TODO: Option to show renames between two historical versions.
1348
1344
1353
1349
@display_command
1354
1350
def run(self, dir=u'.'):
1355
1351
tree = WorkingTree.open_containing(dir)[0]
1356
self.add_cleanup(tree.lock_read().unlock)
1357
new_inv = tree.inventory
1358
old_tree = tree.basis_tree()
1359
self.add_cleanup(old_tree.lock_read().unlock)
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))
1352
tree.lock_read()
1353
try:
1354
new_inv = tree.inventory
1355
old_tree = tree.basis_tree()
1356
old_tree.lock_read()
1357
try:
1358
old_inv = old_tree.inventory
1359
renames = []
1360
iterator = tree.iter_changes(old_tree, include_unchanged=True)
1361
for f, paths, c, v, p, n, k, e in iterator:
1362
if paths[0] == paths[1]:
1363
continue
1364
if None in (paths):
1365
continue
1366
renames.append(paths)
1367
renames.sort()
1368
for old_name, new_name in renames:
1369
self.outf.write("%s => %s\n" % (old_name, new_name))
1370
finally:
1371
old_tree.unlock()
1372
finally:
1373
tree.unlock()
1372
1374
1373
1375
1374
1376
class cmd_update(Command):
1375
__doc__ = """Update a tree to have the latest code committed to its branch.
1377
"""Update a tree to have the latest code committed to its branch.
1376
1378
1377
1379
This will perform a merge into the working tree, and may generate
1378
1380
conflicts. If you have any local changes, you will still
1380
1382
1381
1383
If you want to discard your local changes, you can just do a
1382
1384
'bzr revert' instead of 'bzr commit' after the update.
1383
1384
If the tree's branch is bound to a master branch, it will also update
1385
the branch from the master.
1386
1385
"""
1387
1386
1388
1387
_see_also = ['pull', 'working-trees', 'status-flags']
1389
1388
takes_args = ['dir?']
1390
takes_options = ['revision']
1391
1389
aliases = ['up']
1392
1390
1393
def run(self, dir='.', revision=None):
1394
if revision is not None and len(revision) != 1:
1395
raise errors.BzrCommandError(
1396
"bzr update --revision takes exactly one revision")
1391
def run(self, dir='.'):
1397
1392
tree = WorkingTree.open_containing(dir)[0]
1398
branch = tree.branch
1399
1393
possible_transports = []
1400
master = branch.get_master_branch(
1394
master = tree.branch.get_master_branch(
1401
1395
possible_transports=possible_transports)
1402
1396
if master is not None:
1403
branch_location = master.base
1404
1397
tree.lock_write()
1405
1398
else:
1406
branch_location = tree.branch.base
1407
1399
tree.lock_tree_write()
1408
self.add_cleanup(tree.unlock)
1409
# get rid of the final '/' and be ready for display
1410
branch_location = urlutils.unescape_for_display(
1411
branch_location.rstrip('/'),
1412
self.outf.encoding)
1413
existing_pending_merges = tree.get_parent_ids()[1:]
1414
if master is None:
1415
old_tip = None
1416
else:
1417
# may need to fetch data into a heavyweight checkout
1418
# XXX: this may take some time, maybe we should display a
1419
# message
1420
old_tip = branch.update(possible_transports)
1421
if revision is not None:
1422
revision_id = revision[0].as_revision_id(branch)
1423
else:
1424
revision_id = branch.last_revision()
1425
if revision_id == _mod_revision.ensure_null(tree.last_revision()):
1426
revno = branch.revision_id_to_dotted_revno(revision_id)
1427
note("Tree is up to date at revision %s of branch %s" %
1428
('.'.join(map(str, revno)), branch_location))
1429
return 0
1430
view_info = _get_view_info_for_change_reporter(tree)
1431
change_reporter = delta._ChangeReporter(
1432
unversioned_filter=tree.is_ignored,
1433
view_info=view_info)
1434
1400
try:
1401
existing_pending_merges = tree.get_parent_ids()[1:]
1402
last_rev = _mod_revision.ensure_null(tree.last_revision())
1403
if last_rev == _mod_revision.ensure_null(
1404
tree.branch.last_revision()):
1405
# may be up to date, check master too.
1406
if master is None or last_rev == _mod_revision.ensure_null(
1407
master.last_revision()):
1408
revno = tree.branch.revision_id_to_revno(last_rev)
1409
note("Tree is up to date at revision %d." % (revno,))
1410
return 0
1411
view_info = _get_view_info_for_change_reporter(tree)
1435
1412
conflicts = tree.update(
1436
change_reporter,
1437
possible_transports=possible_transports,
1438
revision=revision_id,
1439
old_tip=old_tip)
1440
except errors.NoSuchRevision, e:
1441
raise errors.BzrCommandError(
1442
"branch has no revision %s\n"
1443
"bzr update --revision only works"
1444
" for a revision in the branch history"
1445
% (e.revision))
1446
revno = tree.branch.revision_id_to_dotted_revno(
1447
_mod_revision.ensure_null(tree.last_revision()))
1448
note('Updated to revision %s of branch %s' %
1449
('.'.join(map(str, revno)), branch_location))
1450
parent_ids = tree.get_parent_ids()
1451
if parent_ids[1:] and parent_ids[1:] != existing_pending_merges:
1452
note('Your local commits will now show as pending merges with '
1453
"'bzr status', and can be committed with 'bzr commit'.")
1454
if conflicts != 0:
1455
return 1
1456
else:
1457
return 0
1413
delta._ChangeReporter(unversioned_filter=tree.is_ignored,
1414
view_info=view_info), possible_transports=possible_transports)
1415
revno = tree.branch.revision_id_to_revno(
1416
_mod_revision.ensure_null(tree.last_revision()))
1417
note('Updated to revision %d.' % (revno,))
1418
if tree.get_parent_ids()[1:] != existing_pending_merges:
1419
note('Your local commits will now show as pending merges with '
1420
"'bzr status', and can be committed with 'bzr commit'.")
1421
if conflicts != 0:
1422
return 1
1423
else:
1424
return 0
1425
finally:
1426
tree.unlock()
1458
1427
1459
1428
1460
1429
class cmd_info(Command):
1461
__doc__ = """Show information about a working tree, branch or repository.
1430
"""Show information about a working tree, branch or repository.
1462
1431
1463
1432
This command will show all known locations and formats associated to the
1464
1433
tree, branch or repository.
1502
1471
1503
1472
1504
1473
class cmd_remove(Command):
1505
__doc__ = """Remove files or directories.
1474
"""Remove files or directories.
1506
1475
1507
1476
This makes bzr stop tracking changes to the specified files. bzr will delete
1508
1477
them if they can easily be recovered using revert. If no options or
1530
1499
if file_list is not None:
1531
1500
file_list = [f for f in file_list]
1532
1501
1533
self.add_cleanup(tree.lock_write().unlock)
1534
# Heuristics should probably all move into tree.remove_smart or
1535
# some such?
1536
if new:
1537
added = tree.changes_from(tree.basis_tree(),
1538
specific_files=file_list).added
1539
file_list = sorted([f[0] for f in added], reverse=True)
1540
if len(file_list) == 0:
1541
raise errors.BzrCommandError('No matching files.')
1542
elif file_list is None:
1543
# missing files show up in iter_changes(basis) as
1544
# versioned-with-no-kind.
1545
missing = []
1546
for change in tree.iter_changes(tree.basis_tree()):
1547
# Find paths in the working tree that have no kind:
1548
if change[1][1] is not None and change[6][1] is None:
1549
missing.append(change[1][1])
1550
file_list = sorted(missing, reverse=True)
1551
file_deletion_strategy = 'keep'
1552
tree.remove(file_list, verbose=verbose, to_file=self.outf,
1553
keep_files=file_deletion_strategy=='keep',
1554
force=file_deletion_strategy=='force')
1502
tree.lock_write()
1503
try:
1504
# Heuristics should probably all move into tree.remove_smart or
1505
# some such?
1506
if new:
1507
added = tree.changes_from(tree.basis_tree(),
1508
specific_files=file_list).added
1509
file_list = sorted([f[0] for f in added], reverse=True)
1510
if len(file_list) == 0:
1511
raise errors.BzrCommandError('No matching files.')
1512
elif file_list is None:
1513
# missing files show up in iter_changes(basis) as
1514
# versioned-with-no-kind.
1515
missing = []
1516
for change in tree.iter_changes(tree.basis_tree()):
1517
# Find paths in the working tree that have no kind:
1518
if change[1][1] is not None and change[6][1] is None:
1519
missing.append(change[1][1])
1520
file_list = sorted(missing, reverse=True)
1521
file_deletion_strategy = 'keep'
1522
tree.remove(file_list, verbose=verbose, to_file=self.outf,
1523
keep_files=file_deletion_strategy=='keep',
1524
force=file_deletion_strategy=='force')
1525
finally:
1526
tree.unlock()
1555
1527
1556
1528
1557
1529
class cmd_file_id(Command):
1558
__doc__ = """Print file_id of a particular file or directory.
1530
"""Print file_id of a particular file or directory.
1559
1531
1560
1532
The file_id is assigned when the file is first added and remains the
1561
1533
same through all revisions where the file exists, even when it is
1577
1549
1578
1550
1579
1551
class cmd_file_path(Command):
1580
__doc__ = """Print path of file_ids to a file or directory.
1552
"""Print path of file_ids to a file or directory.
1581
1553
1582
1554
This prints one line for each directory down to the target,
1583
1555
starting at the branch root.
1599
1571
1600
1572
1601
1573
class cmd_reconcile(Command):
1602
__doc__ = """Reconcile bzr metadata in a branch.
1574
"""Reconcile bzr metadata in a branch.
1603
1575
1604
1576
This can correct data mismatches that may have been caused by
1605
1577
previous ghost operations or bzr upgrades. You should only
1627
1599
1628
1600
1629
1601
class cmd_revision_history(Command):
1630
__doc__ = """Display the list of revision ids on a branch."""
1602
"""Display the list of revision ids on a branch."""
1631
1603
1632
1604
_see_also = ['log']
1633
1605
takes_args = ['location?']
1643
1615
1644
1616
1645
1617
class cmd_ancestry(Command):
1646
__doc__ = """List all revisions merged into this branch."""
1618
"""List all revisions merged into this branch."""
1647
1619
1648
1620
_see_also = ['log', 'revision-history']
1649
1621
takes_args = ['location?']
1668
1640
1669
1641
1670
1642
class cmd_init(Command):
1671
__doc__ = """Make a directory into a versioned branch.
1643
"""Make a directory into a versioned branch.
1672
1644
1673
1645
Use this to create an empty branch, or before importing an
1674
1646
existing project.
1777
1749
1778
1750
1779
1751
class cmd_init_repository(Command):
1780
__doc__ = """Create a shared repository for branches to share storage space.
1752
"""Create a shared repository to hold branches.
1781
1753
1782
1754
New branches created under the repository directory will store their
1783
revisions in the repository, not in the branch directory. For branches
1784
with shared history, this reduces the amount of storage needed and
1785
speeds up the creation of new branches.
1755
revisions in the repository, not in the branch directory.
1786
1756
1787
If the --no-trees option is given then the branches in the repository
1788
will not have working trees by default. They will still exist as
1789
directories on disk, but they will not have separate copies of the
1790
files at a certain revision. This can be useful for repositories that
1791
store branches which are interacted with through checkouts or remote
1792
branches, such as on a server.
1757
If the --no-trees option is used then the branches in the repository
1758
will not have working trees by default.
1793
1759
1794
1760
:Examples:
1795
Create a shared repository holding just branches::
1761
Create a shared repositories holding just branches::
1796
1762
1797
1763
bzr init-repo --no-trees repo
1798
1764
bzr init repo/trunk
1837
1803
1838
1804
1839
1805
class cmd_diff(Command):
1840
__doc__ = """Show differences in the working tree, between revisions or branches.
1806
"""Show differences in the working tree, between revisions or branches.
1841
1807
1842
1808
If no arguments are given, all changes for the current tree are listed.
1843
1809
If files are given, only the changes in those files are listed.
1864
1830
1865
1831
bzr diff -r1
1866
1832
1867
Difference between revision 3 and revision 1::
1868
1869
bzr diff -r1..3
1870
1871
Difference between revision 3 and revision 1 for branch xxx::
1872
1873
bzr diff -r1..3 xxx
1874
1875
To see the changes introduced in revision X::
1876
1877
bzr diff -cX
1878
1879
Note that in the case of a merge, the -c option shows the changes
1880
compared to the left hand parent. To see the changes against
1881
another parent, use::
1882
1883
bzr diff -r<chosen_parent>..X
1884
1885
The changes introduced by revision 2 (equivalent to -r1..2)::
1886
1887
bzr diff -c2
1833
Difference between revision 2 and revision 1::
1834
1835
bzr diff -r1..2
1836
1837
Difference between revision 2 and revision 1 for branch xxx::
1838
1839
bzr diff -r1..2 xxx
1888
1840
1889
1841
Show just the differences for file NEWS::
1890
1842
1929
1881
help='Use this command to compare files.',
1930
1882
type=unicode,
1931
1883
),
1932
RegistryOption('format',
1933
help='Diff format to use.',
1934
lazy_registry=('bzrlib.diff', 'format_registry'),
1935
value_switches=False, title='Diff format'),
1936
1884
]
1937
1885
aliases = ['di', 'dif']
1938
1886
encoding_type = 'exact'
1939
1887
1940
1888
@display_command
1941
1889
def run(self, revision=None, file_list=None, diff_options=None,
1942
prefix=None, old=None, new=None, using=None, format=None):
1943
from bzrlib.diff import (get_trees_and_branches_to_diff_locked,
1944
show_diff_trees)
1890
prefix=None, old=None, new=None, using=None):
1891
from bzrlib.diff import get_trees_and_branches_to_diff, show_diff_trees
1945
1892
1946
1893
if (prefix is None) or (prefix == '0'):
1947
1894
# diff -p0 format
1961
1908
raise errors.BzrCommandError('bzr diff --revision takes exactly'
1962
1909
' one or two revision specifiers')
1963
1910
1964
if using is not None and format is not None:
1965
raise errors.BzrCommandError('--using and --format are mutually '
1966
'exclusive.')
1967
1968
1911
(old_tree, new_tree,
1969
1912
old_branch, new_branch,
1970
specific_files, extra_trees) = get_trees_and_branches_to_diff_locked(
1971
file_list, revision, old, new, self.add_cleanup, apply_view=True)
1913
specific_files, extra_trees) = get_trees_and_branches_to_diff(
1914
file_list, revision, old, new, apply_view=True)
1972
1915
return show_diff_trees(old_tree, new_tree, sys.stdout,
1973
1916
specific_files=specific_files,
1974
1917
external_diff_options=diff_options,
1975
1918
old_label=old_label, new_label=new_label,
1976
extra_trees=extra_trees, using=using,
1977
format_cls=format)
1919
extra_trees=extra_trees, using=using)
1978
1920
1979
1921
1980
1922
class cmd_deleted(Command):
1981
__doc__ = """List files deleted in the working tree.
1923
"""List files deleted in the working tree.
1982
1924
"""
1983
1925
# TODO: Show files deleted since a previous revision, or
1984
1926
# between two revisions.
1992
1934
@display_command
1993
1935
def run(self, show_ids=False):
1994
1936
tree = WorkingTree.open_containing(u'.')[0]
1995
self.add_cleanup(tree.lock_read().unlock)
1996
old = tree.basis_tree()
1997
self.add_cleanup(old.lock_read().unlock)
1998
for path, ie in old.inventory.iter_entries():
1999
if not tree.has_id(ie.file_id):
2000
self.outf.write(path)
2001
if show_ids:
2002
self.outf.write(' ')
2003
self.outf.write(ie.file_id)
2004
self.outf.write('\n')
1937
tree.lock_read()
1938
try:
1939
old = tree.basis_tree()
1940
old.lock_read()
1941
try:
1942
for path, ie in old.inventory.iter_entries():
1943
if not tree.has_id(ie.file_id):
1944
self.outf.write(path)
1945
if show_ids:
1946
self.outf.write(' ')
1947
self.outf.write(ie.file_id)
1948
self.outf.write('\n')
1949
finally:
1950
old.unlock()
1951
finally:
1952
tree.unlock()
2005
1953
2006
1954
2007
1955
class cmd_modified(Command):
2008
__doc__ = """List files modified in working tree.
1956
"""List files modified in working tree.
2009
1957
"""
2010
1958
2011
1959
hidden = True
2028
1976
2029
1977
2030
1978
class cmd_added(Command):
2031
__doc__ = """List files added in working tree.
1979
"""List files added in working tree.
2032
1980
"""
2033
1981
2034
1982
hidden = True
2042
1990
@display_command
2043
1991
def run(self, null=False):
2044
1992
wt = WorkingTree.open_containing(u'.')[0]
2045
self.add_cleanup(wt.lock_read().unlock)
2046
basis = wt.basis_tree()
2047
self.add_cleanup(basis.lock_read().unlock)
2048
basis_inv = basis.inventory
2049
inv = wt.inventory
2050
for file_id in inv:
2051
if file_id in basis_inv:
2052
continue
2053
if inv.is_root(file_id) and len(basis_inv) == 0:
2054
continue
2055
path = inv.id2path(file_id)
2056
if not os.access(osutils.abspath(path), os.F_OK):
2057
continue
2058
if null:
2059
self.outf.write(path + '\0')
2060
else:
2061
self.outf.write(osutils.quotefn(path) + '\n')
1993
wt.lock_read()
1994
try:
1995
basis = wt.basis_tree()
1996
basis.lock_read()
1997
try:
1998
basis_inv = basis.inventory
1999
inv = wt.inventory
2000
for file_id in inv:
2001
if file_id in basis_inv:
2002
continue
2003
if inv.is_root(file_id) and len(basis_inv) == 0:
2004
continue
2005
path = inv.id2path(file_id)
2006
if not os.access(osutils.abspath(path), os.F_OK):
2007
continue
2008
if null:
2009
self.outf.write(path + '\0')
2010
else:
2011
self.outf.write(osutils.quotefn(path) + '\n')
2012
finally:
2013
basis.unlock()
2014
finally:
2015
wt.unlock()
2062
2016
2063
2017
2064
2018
class cmd_root(Command):
2065
__doc__ = """Show the tree root directory.
2019
"""Show the tree root directory.
2066
2020
2067
2021
The root is the nearest enclosing directory with a .bzr control
2068
2022
directory."""
2092
2046
2093
2047
2094
2048
class cmd_log(Command):
2095
__doc__ = """Show historical log for a branch or subset of a branch.
2049
"""Show historical log for a branch or subset of a branch.
2096
2050
2097
2051
log is bzr's default tool for exploring the history of a branch.
2098
2052
The branch to use is taken from the first parameter. If no parameters
2209
2163
:Tips & tricks:
2210
2164
2211
2165
GUI tools and IDEs are often better at exploring history than command
2212
line tools: you may prefer qlog or viz from qbzr or bzr-gtk, the
2213
bzr-explorer shell, or the Loggerhead web interface. See the Plugin
2214
Guide <http://doc.bazaar.canonical.com/plugins/en/> and
2215
<http://wiki.bazaar.canonical.com/IDEIntegration>.
2166
line tools. You may prefer qlog or glog from the QBzr and Bzr-Gtk packages
2167
respectively for example. (TortoiseBzr uses qlog for displaying logs.) See
2168
http://bazaar-vcs.org/BzrPlugins and http://bazaar-vcs.org/IDEIntegration.
2169
2170
Web interfaces are often better at exploring history than command line
2171
tools, particularly for branches on servers. You may prefer Loggerhead
2172
or one of its alternatives. See http://bazaar-vcs.org/WebInterface.
2216
2173
2217
2174
You may find it useful to add the aliases below to ``bazaar.conf``::
2218
2175
2279
2236
help='Show changes made in each revision as a patch.'),
2280
2237
Option('include-merges',
2281
2238
help='Show merged revisions like --levels 0 does.'),
2282
Option('exclude-common-ancestry',
2283
help='Display only the revisions that are not part'
2284
' of both ancestries (require -rX..Y)'
2285
)
2286
2239
]
2287
2240
encoding_type = 'replace'
2288
2241
2298
2251
message=None,
2299
2252
limit=None,
2300
2253
show_diff=False,
2301
include_merges=False,
2302
exclude_common_ancestry=False,
2303
):
2254
include_merges=False):
2304
2255
from bzrlib.log import (
2305
2256
Logger,
2306
2257
make_log_request_dict,
2307
2258
_get_info_for_log_files,
2308
2259
)
2309
2260
direction = (forward and 'forward') or 'reverse'
2310
if (exclude_common_ancestry
2311
and (revision is None or len(revision) != 2)):
2312
raise errors.BzrCommandError(
2313
'--exclude-common-ancestry requires -r with two revisions')
2314
2261
if include_merges:
2315
2262
if levels is None:
2316
2263
levels = 0
2331
2278
filter_by_dir = False
2332
2279
if file_list:
2333
2280
# find the file ids to log and check for directory filtering
2334
b, file_info_list, rev1, rev2 = _get_info_for_log_files(
2335
revision, file_list, self.add_cleanup)
2281
b, file_info_list, rev1, rev2 = _get_info_for_log_files(revision,
2282
file_list)
2336
2283
for relpath, file_id, kind in file_info_list:
2337
2284
if file_id is None:
2338
2285
raise errors.BzrCommandError(
2356
2303
location = '.'
2357
2304
dir, relpath = bzrdir.BzrDir.open_containing(location)
2358
2305
b = dir.open_branch()
2359
self.add_cleanup(b.lock_read().unlock)
2360
2306
rev1, rev2 = _get_revision_range(revision, b, self.name())
2361
2307
2362
2308
# Decide on the type of delta & diff filtering to use
2372
2318
else:
2373
2319
diff_type = 'full'
2374
2320
2375
# Build the log formatter
2376
if log_format is None:
2377
log_format = log.log_formatter_registry.get_default(b)
2378
# Make a non-encoding output to include the diffs - bug 328007
2379
unencoded_output = ui.ui_factory.make_output_stream(encoding_type='exact')
2380
lf = log_format(show_ids=show_ids, to_file=self.outf,
2381
to_exact_file=unencoded_output,
2382
show_timezone=timezone,
2383
delta_format=get_verbosity_level(),
2384
levels=levels,
2385
show_advice=levels is None)
2386
2387
# Choose the algorithm for doing the logging. It's annoying
2388
# having multiple code paths like this but necessary until
2389
# the underlying repository format is faster at generating
2390
# deltas or can provide everything we need from the indices.
2391
# The default algorithm - match-using-deltas - works for
2392
# multiple files and directories and is faster for small
2393
# amounts of history (200 revisions say). However, it's too
2394
# slow for logging a single file in a repository with deep
2395
# history, i.e. > 10K revisions. In the spirit of "do no
2396
# evil when adding features", we continue to use the
2397
# original algorithm - per-file-graph - for the "single
2398
# file that isn't a directory without showing a delta" case.
2399
partial_history = revision and b.repository._format.supports_chks
2400
match_using_deltas = (len(file_ids) != 1 or filter_by_dir
2401
or delta_type or partial_history)
2402
2403
# Build the LogRequest and execute it
2404
if len(file_ids) == 0:
2405
file_ids = None
2406
rqst = make_log_request_dict(
2407
direction=direction, specific_fileids=file_ids,
2408
start_revision=rev1, end_revision=rev2, limit=limit,
2409
message_search=message, delta_type=delta_type,
2410
diff_type=diff_type, _match_using_deltas=match_using_deltas,
2411
exclude_common_ancestry=exclude_common_ancestry,
2412
)
2413
Logger(b, rqst).show(lf)
2321
b.lock_read()
2322
try:
2323
# Build the log formatter
2324
if log_format is None:
2325
log_format = log.log_formatter_registry.get_default(b)
2326
lf = log_format(show_ids=show_ids, to_file=self.outf,
2327
show_timezone=timezone,
2328
delta_format=get_verbosity_level(),
2329
levels=levels,
2330
show_advice=levels is None)
2331
2332
# Choose the algorithm for doing the logging. It's annoying
2333
# having multiple code paths like this but necessary until
2334
# the underlying repository format is faster at generating
2335
# deltas or can provide everything we need from the indices.
2336
# The default algorithm - match-using-deltas - works for
2337
# multiple files and directories and is faster for small
2338
# amounts of history (200 revisions say). However, it's too
2339
# slow for logging a single file in a repository with deep
2340
# history, i.e. > 10K revisions. In the spirit of "do no
2341
# evil when adding features", we continue to use the
2342
# original algorithm - per-file-graph - for the "single
2343
# file that isn't a directory without showing a delta" case.
2344
partial_history = revision and b.repository._format.supports_chks
2345
match_using_deltas = (len(file_ids) != 1 or filter_by_dir
2346
or delta_type or partial_history)
2347
2348
# Build the LogRequest and execute it
2349
if len(file_ids) == 0:
2350
file_ids = None
2351
rqst = make_log_request_dict(
2352
direction=direction, specific_fileids=file_ids,
2353
start_revision=rev1, end_revision=rev2, limit=limit,
2354
message_search=message, delta_type=delta_type,
2355
diff_type=diff_type, _match_using_deltas=match_using_deltas)
2356
Logger(b, rqst).show(lf)
2357
finally:
2358
b.unlock()
2414
2359
2415
2360
2416
2361
def _get_revision_range(revisionspec_list, branch, command_name):
2434
2379
raise errors.BzrCommandError(
2435
2380
"bzr %s doesn't accept two revisions in different"
2436
2381
" branches." % command_name)
2437
if start_spec.spec is None:
2438
# Avoid loading all the history.
2439
rev1 = RevisionInfo(branch, None, None)
2440
else:
2441
rev1 = start_spec.in_history(branch)
2382
rev1 = start_spec.in_history(branch)
2442
2383
# Avoid loading all of history when we know a missing
2443
2384
# end of range means the last revision ...
2444
2385
if end_spec.spec is None:
2473
2414
2474
2415
2475
2416
class cmd_touching_revisions(Command):
2476
__doc__ = """Return revision-ids which affected a particular file.
2417
"""Return revision-ids which affected a particular file.
2477
2418
2478
2419
A more user-friendly interface is "bzr log FILE".
2479
2420
"""
2484
2425
@display_command
2485
2426
def run(self, filename):
2486
2427
tree, relpath = WorkingTree.open_containing(filename)
2428
b = tree.branch
2487
2429
file_id = tree.path2id(relpath)
2488
b = tree.branch
2489
self.add_cleanup(b.lock_read().unlock)
2490
touching_revs = log.find_touching_revisions(b, file_id)
2491
for revno, revision_id, what in touching_revs:
2430
for revno, revision_id, what in log.find_touching_revisions(b, file_id):
2492
2431
self.outf.write("%6d %s\n" % (revno, what))
2493
2432
2494
2433
2495
2434
class cmd_ls(Command):
2496
__doc__ = """List files in a tree.
2435
"""List files in a tree.
2497
2436
"""
2498
2437
2499
2438
_see_also = ['status', 'cat']
2547
2486
if from_root:
2548
2487
if relpath:
2549
2488
prefix = relpath + '/'
2550
elif fs_path != '.' and not fs_path.endswith('/'):
2489
elif fs_path != '.':
2551
2490
prefix = fs_path + '/'
2552
2491
2553
2492
if revision is not None or tree is None:
2561
2500
view_str = views.view_display_str(view_files)
2562
2501
note("Ignoring files outside view. View is %s" % view_str)
2563
2502
2564
self.add_cleanup(tree.lock_read().unlock)
2565
for fp, fc, fkind, fid, entry in tree.list_files(include_root=False,
2566
from_dir=relpath, recursive=recursive):
2567
# Apply additional masking
2568
if not all and not selection[fc]:
2569
continue
2570
if kind is not None and fkind != kind:
2571
continue
2572
if apply_view:
2573
try:
2574
if relpath:
2575
fullpath = osutils.pathjoin(relpath, fp)
2576
else:
2577
fullpath = fp
2578
views.check_path_in_view(tree, fullpath)
2579
except errors.FileOutsideView:
2580
continue
2503
tree.lock_read()
2504
try:
2505
for fp, fc, fkind, fid, entry in tree.list_files(include_root=False,
2506
from_dir=relpath, recursive=recursive):
2507
# Apply additional masking
2508
if not all and not selection[fc]:
2509
continue
2510
if kind is not None and fkind != kind:
2511
continue
2512
if apply_view:
2513
try:
2514
if relpath:
2515
fullpath = osutils.pathjoin(relpath, fp)
2516
else:
2517
fullpath = fp
2518
views.check_path_in_view(tree, fullpath)
2519
except errors.FileOutsideView:
2520
continue
2581
2521
2582
# Output the entry
2583
if prefix:
2584
fp = osutils.pathjoin(prefix, fp)
2585
kindch = entry.kind_character()
2586
outstring = fp + kindch
2587
ui.ui_factory.clear_term()
2588
if verbose:
2589
outstring = '%-8s %s' % (fc, outstring)
2590
if show_ids and fid is not None:
2591
outstring = "%-50s %s" % (outstring, fid)
2592
self.outf.write(outstring + '\n')
2593
elif null:
2594
self.outf.write(fp + '\0')
2595
if show_ids:
2596
if fid is not None:
2597
self.outf.write(fid)
2598
self.outf.write('\0')
2599
self.outf.flush()
2600
else:
2601
if show_ids:
2602
if fid is not None:
2603
my_id = fid
2604
else:
2605
my_id = ''
2606
self.outf.write('%-50s %s\n' % (outstring, my_id))
2607
else:
2522
# Output the entry
2523
if prefix:
2524
fp = osutils.pathjoin(prefix, fp)
2525
kindch = entry.kind_character()
2526
outstring = fp + kindch
2527
ui.ui_factory.clear_term()
2528
if verbose:
2529
outstring = '%-8s %s' % (fc, outstring)
2530
if show_ids and fid is not None:
2531
outstring = "%-50s %s" % (outstring, fid)
2608
2532
self.outf.write(outstring + '\n')
2533
elif null:
2534
self.outf.write(fp + '\0')
2535
if show_ids:
2536
if fid is not None:
2537
self.outf.write(fid)
2538
self.outf.write('\0')
2539
self.outf.flush()
2540
else:
2541
if show_ids:
2542
if fid is not None:
2543
my_id = fid
2544
else:
2545
my_id = ''
2546
self.outf.write('%-50s %s\n' % (outstring, my_id))
2547
else:
2548
self.outf.write(outstring + '\n')
2549
finally:
2550
tree.unlock()
2609
2551
2610
2552
2611
2553
class cmd_unknowns(Command):
2612
__doc__ = """List unknown files.
2554
"""List unknown files.
2613
2555
"""
2614
2556
2615
2557
hidden = True
2622
2564
2623
2565
2624
2566
class cmd_ignore(Command):
2625
__doc__ = """Ignore specified files or patterns.
2567
"""Ignore specified files or patterns.
2626
2568
2627
2569
See ``bzr help patterns`` for details on the syntax of patterns.
2628
2570
2629
If a .bzrignore file does not exist, the ignore command
2630
will create one and add the specified files or patterns to the newly
2631
created file. The ignore command will also automatically add the
2632
.bzrignore file to be versioned. Creating a .bzrignore file without
2633
the use of the ignore command will require an explicit add command.
2634
2635
2571
To remove patterns from the ignore list, edit the .bzrignore file.
2636
2572
After adding, editing or deleting that file either indirectly by
2637
2573
using this command or directly by using an editor, be sure to commit
2638
2574
it.
2639
2640
Bazaar also supports a global ignore file ~/.bazaar/ignore. On Windows
2641
the global ignore file can be found in the application data directory as
2642
C:\\Documents and Settings\\<user>\\Application Data\\Bazaar\\2.0\\ignore.
2643
Global ignores are not touched by this command. The global ignore file
2644
can be edited directly using an editor.
2645
2646
Patterns prefixed with '!' are exceptions to ignore patterns and take
2647
precedence over regular ignores. Such exceptions are used to specify
2648
files that should be versioned which would otherwise be ignored.
2649
2650
Patterns prefixed with '!!' act as regular ignore patterns, but have
2651
precedence over the '!' exception patterns.
2652
2575
2653
2576
Note: ignore patterns containing shell wildcards must be quoted from
2654
2577
the shell on Unix.
2658
2581
2659
2582
bzr ignore ./Makefile
2660
2583
2661
Ignore .class files in all directories...::
2584
Ignore class files in all directories::
2662
2585
2663
2586
bzr ignore "*.class"
2664
2587
2665
...but do not ignore "special.class"::
2666
2667
bzr ignore "!special.class"
2668
2669
2588
Ignore .o files under the lib directory::
2670
2589
2671
2590
bzr ignore "lib/**/*.o"
2677
2596
Ignore everything but the "debian" toplevel directory::
2678
2597
2679
2598
bzr ignore "RE:(?!debian/).*"
2680
2681
Ignore everything except the "local" toplevel directory,
2682
but always ignore "*~" autosave files, even under local/::
2683
2684
bzr ignore "*"
2685
bzr ignore "!./local"
2686
bzr ignore "!!*~"
2687
2599
"""
2688
2600
2689
2601
_see_also = ['status', 'ignored', 'patterns']
2690
2602
takes_args = ['name_pattern*']
2691
2603
takes_options = [
2692
Option('default-rules',
2693
help='Display the default ignore rules that bzr uses.')
2604
Option('old-default-rules',
2605
help='Write out the ignore rules bzr < 0.9 always used.')
2694
2606
]
2695
2607
2696
def run(self, name_pattern_list=None, default_rules=None):
2608
def run(self, name_pattern_list=None, old_default_rules=None):
2697
2609
from bzrlib import ignores
2698
if default_rules is not None:
2699
# dump the default rules and exit
2700
for pattern in ignores.USER_DEFAULTS:
2701
self.outf.write("%s\n" % pattern)
2610
if old_default_rules is not None:
2611
# dump the rules and exit
2612
for pattern in ignores.OLD_DEFAULTS:
2613
print pattern
2702
2614
return
2703
2615
if not name_pattern_list:
2704
2616
raise errors.BzrCommandError("ignore requires at least one "
2705
"NAME_PATTERN or --default-rules.")
2617
"NAME_PATTERN or --old-default-rules")
2706
2618
name_pattern_list = [globbing.normalize_pattern(p)
2707
2619
for p in name_pattern_list]
2708
2620
for name_pattern in name_pattern_list:
2720
2632
if id is not None:
2721
2633
filename = entry[0]
2722
2634
if ignored.match(filename):
2723
matches.append(filename)
2635
matches.append(filename.encode('utf-8'))
2724
2636
tree.unlock()
2725
2637
if len(matches) > 0:
2726
self.outf.write("Warning: the following files are version controlled and"
2727
" match your ignore pattern:\n%s"
2728
"\nThese files will continue to be version controlled"
2729
" unless you 'bzr remove' them.\n" % ("\n".join(matches),))
2638
print "Warning: the following files are version controlled and" \
2639
" match your ignore pattern:\n%s" \
2640
"\nThese files will continue to be version controlled" \
2641
" unless you 'bzr remove' them." % ("\n".join(matches),)
2730
2642
2731
2643
2732
2644
class cmd_ignored(Command):
2733
__doc__ = """List ignored files and the patterns that matched them.
2645
"""List ignored files and the patterns that matched them.
2734
2646
2735
2647
List all the ignored files and the ignore pattern that caused the file to
2736
2648
be ignored.
2746
2658
@display_command
2747
2659
def run(self):
2748
2660
tree = WorkingTree.open_containing(u'.')[0]
2749
self.add_cleanup(tree.lock_read().unlock)
2750
for path, file_class, kind, file_id, entry in tree.list_files():
2751
if file_class != 'I':
2752
continue
2753
## XXX: Slightly inefficient since this was already calculated
2754
pat = tree.is_ignored(path)
2755
self.outf.write('%-50s %s\n' % (path, pat))
2661
tree.lock_read()
2662
try:
2663
for path, file_class, kind, file_id, entry in tree.list_files():
2664
if file_class != 'I':
2665
continue
2666
## XXX: Slightly inefficient since this was already calculated
2667
pat = tree.is_ignored(path)
2668
self.outf.write('%-50s %s\n' % (path, pat))
2669
finally:
2670
tree.unlock()
2756
2671
2757
2672
2758
2673
class cmd_lookup_revision(Command):
2759
__doc__ = """Lookup the revision-id from a revision-number
2674
"""Lookup the revision-id from a revision-number
2760
2675
2761
2676
:Examples:
2762
2677
bzr lookup-revision 33
2769
2684
try:
2770
2685
revno = int(revno)
2771
2686
except ValueError:
2772
raise errors.BzrCommandError("not a valid revision-number: %r"
2773
% revno)
2774
revid = WorkingTree.open_containing(u'.')[0].branch.get_rev_id(revno)
2775
self.outf.write("%s\n" % revid)
2687
raise errors.BzrCommandError("not a valid revision-number: %r" % revno)
2688
2689
print WorkingTree.open_containing(u'.')[0].branch.get_rev_id(revno)
2776
2690
2777
2691
2778
2692
class cmd_export(Command):
2779
__doc__ = """Export current or past revision to a destination directory or archive.
2693
"""Export current or past revision to a destination directory or archive.
2780
2694
2781
2695
If no revision is specified this exports the last committed revision.
2782
2696
2814
2728
Option('root',
2815
2729
type=str,
2816
2730
help="Name of the root directory inside the exported file."),
2817
Option('per-file-timestamps',
2818
help='Set modification time of files to that of the last '
2819
'revision in which it was changed.'),
2820
2731
]
2821
2732
def run(self, dest, branch_or_subdir=None, revision=None, format=None,
2822
root=None, filters=False, per_file_timestamps=False):
2733
root=None, filters=False):
2823
2734
from bzrlib.export import export
2824
2735
2825
2736
if branch_or_subdir is None:
2832
2743
2833
2744
rev_tree = _get_one_revision_tree('export', revision, branch=b, tree=tree)
2834
2745
try:
2835
export(rev_tree, dest, format, root, subdir, filtered=filters,
2836
per_file_timestamps=per_file_timestamps)
2746
export(rev_tree, dest, format, root, subdir, filtered=filters)
2837
2747
except errors.NoSuchExportFormat, e:
2838
2748
raise errors.BzrCommandError('Unsupported export format: %s' % e.format)
2839
2749
2840
2750
2841
2751
class cmd_cat(Command):
2842
__doc__ = """Write the contents of a file as of a given revision to standard output.
2752
"""Write the contents of a file as of a given revision to standard output.
2843
2753
2844
2754
If no revision is nominated, the last revision is used.
2845
2755
2865
2775
" one revision specifier")
2866
2776
tree, branch, relpath = \
2867
2777
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
2868
self.add_cleanup(branch.lock_read().unlock)
2869
return self._run(tree, branch, relpath, filename, revision,
2870
name_from_revision, filters)
2778
branch.lock_read()
2779
try:
2780
return self._run(tree, branch, relpath, filename, revision,
2781
name_from_revision, filters)
2782
finally:
2783
branch.unlock()
2871
2784
2872
2785
def _run(self, tree, b, relpath, filename, revision, name_from_revision,
2873
2786
filtered):
2874
2787
if tree is None:
2875
2788
tree = b.basis_tree()
2876
2789
rev_tree = _get_one_revision_tree('cat', revision, branch=b)
2877
self.add_cleanup(rev_tree.lock_read().unlock)
2878
2790
2879
2791
old_file_id = rev_tree.path2id(relpath)
2880
2792
2915
2827
chunks = content.splitlines(True)
2916
2828
content = filtered_output_bytes(chunks, filters,
2917
2829
ContentFilterContext(relpath, rev_tree))
2918
self.cleanup_now()
2919
2830
self.outf.writelines(content)
2920
2831
else:
2921
self.cleanup_now()
2922
2832
self.outf.write(content)
2923
2833
2924
2834
2925
2835
class cmd_local_time_offset(Command):
2926
__doc__ = """Show the offset in seconds from GMT to local time."""
2836
"""Show the offset in seconds from GMT to local time."""
2927
2837
hidden = True
2928
2838
@display_command
2929
2839
def run(self):
2930
self.outf.write("%s\n" % osutils.local_time_offset())
2840
print osutils.local_time_offset()
2931
2841
2932
2842
2933
2843
2934
2844
class cmd_commit(Command):
2935
__doc__ = """Commit changes into a new revision.
2845
"""Commit changes into a new revision.
2936
2846
2937
2847
An explanatory message needs to be given for each commit. This is
2938
2848
often done by using the --message option (getting the message from the
3031
2941
Option('strict',
3032
2942
help="Refuse to commit if there are unknown "
3033
2943
"files in the working tree."),
3034
Option('commit-time', type=str,
3035
help="Manually set a commit time using commit date "
3036
"format, e.g. '2009-10-10 08:00:00 +0100'."),
3037
2944
ListOption('fixes', type=str,
3038
2945
help="Mark a bug as being fixed by this revision "
3039
2946
"(see \"bzr help bugs\")."),
3046
2953
"the master branch until a normal commit "
3047
2954
"is performed."
3048
2955
),
3049
Option('show-diff', short_name='p',
3050
help='When no message is supplied, show the diff along'
3051
' with the status summary in the message editor.'),
2956
Option('show-diff',
2957
help='When no message is supplied, show the diff along'
2958
' with the status summary in the message editor.'),
3052
2959
]
3053
2960
aliases = ['ci', 'checkin']
3054
2961
3073
2980
3074
2981
def run(self, message=None, file=None, verbose=False, selected_list=None,
3075
2982
unchanged=False, strict=False, local=False, fixes=None,
3076
author=None, show_diff=False, exclude=None, commit_time=None):
2983
author=None, show_diff=False, exclude=None):
3077
2984
from bzrlib.errors import (
3078
2985
PointlessCommit,
3079
2986
ConflictsInTree,
3085
2992
make_commit_message_template_encoded
3086
2993
)
3087
2994
3088
commit_stamp = offset = None
3089
if commit_time is not None:
3090
try:
3091
commit_stamp, offset = timestamp.parse_patch_date(commit_time)
3092
except ValueError, e:
3093
raise errors.BzrCommandError(
3094
"Could not parse --commit-time: " + str(e))
3095
3096
2995
# TODO: Need a blackbox test for invoking the external editor; may be
3097
2996
# slightly problematic to run this cross-platform.
3098
2997
3118
3017
if local and not tree.branch.get_bound_location():
3119
3018
raise errors.LocalRequiresBoundBranch()
3120
3019
3121
if message is not None:
3122
try:
3123
file_exists = osutils.lexists(message)
3124
except UnicodeError:
3125
# The commit message contains unicode characters that can't be
3126
# represented in the filesystem encoding, so that can't be a
3127
# file.
3128
file_exists = False
3129
if file_exists:
3130
warning_msg = (
3131
'The commit message is a file name: "%(f)s".\n'
3132
'(use --file "%(f)s" to take commit message from that file)'
3133
% { 'f': message })
3134
ui.ui_factory.show_warning(warning_msg)
3135
if '\r' in message:
3136
message = message.replace('\r\n', '\n')
3137
message = message.replace('\r', '\n')
3138
if file:
3139
raise errors.BzrCommandError(
3140
"please specify either --message or --file")
3141
3142
3020
def get_message(commit_obj):
3143
3021
"""Callback to get commit message"""
3144
if file:
3145
my_message = codecs.open(
3146
file, 'rt', osutils.get_user_encoding()).read()
3147
elif message is not None:
3148
my_message = message
3149
else:
3150
# No message supplied: make one up.
3151
# text is the status of the tree
3152
text = make_commit_message_template_encoded(tree,
3022
my_message = message
3023
if my_message is None and not file:
3024
t = make_commit_message_template_encoded(tree,
3153
3025
selected_list, diff=show_diff,
3154
3026
output_encoding=osutils.get_user_encoding())
3155
# start_message is the template generated from hooks
3156
# XXX: Warning - looks like hooks return unicode,
3157
# make_commit_message_template_encoded returns user encoding.
3158
# We probably want to be using edit_commit_message instead to
3159
# avoid this.
3160
3027
start_message = generate_commit_message_template(commit_obj)
3161
my_message = edit_commit_message_encoded(text,
3028
my_message = edit_commit_message_encoded(t,
3162
3029
start_message=start_message)
3163
3030
if my_message is None:
3164
3031
raise errors.BzrCommandError("please specify a commit"
3165
3032
" message with either --message or --file")
3033
elif my_message and file:
3034
raise errors.BzrCommandError(
3035
"please specify either --message or --file")
3036
if file:
3037
my_message = codecs.open(file, 'rt',
3038
osutils.get_user_encoding()).read()
3166
3039
if my_message == "":
3167
3040
raise errors.BzrCommandError("empty commit message specified")
3168
3041
return my_message
3176
3049
specific_files=selected_list,
3177
3050
allow_pointless=unchanged, strict=strict, local=local,
3178
3051
reporter=None, verbose=verbose, revprops=properties,
3179
authors=author, timestamp=commit_stamp,
3180
timezone=offset,
3052
authors=author,
3181
3053
exclude=safe_relpath_files(tree, exclude))
3182
3054
except PointlessCommit:
3055
# FIXME: This should really happen before the file is read in;
3056
# perhaps prepare the commit; get the message; then actually commit
3183
3057
raise errors.BzrCommandError("No changes to commit."
3184
3058
" Use --unchanged to commit anyhow.")
3185
3059
except ConflictsInTree:
3190
3064
raise errors.BzrCommandError("Commit refused because there are"
3191
3065
" unknown files in the working tree.")
3192
3066
except errors.BoundBranchOutOfDate, e:
3193
e.extra_help = ("\n"
3194
'To commit to master branch, run update and then commit.\n'
3195
'You can also pass --local to commit to continue working '
3196
'disconnected.')
3197
raise
3067
raise errors.BzrCommandError(str(e) + "\n"
3068
'To commit to master branch, run update and then commit.\n'
3069
'You can also pass --local to commit to continue working '
3070
'disconnected.')
3198
3071
3199
3072
3200
3073
class cmd_check(Command):
3201
__doc__ = """Validate working tree structure, branch consistency and repository history.
3074
"""Validate working tree structure, branch consistency and repository history.
3202
3075
3203
3076
This command checks various invariants about branch and repository storage
3204
3077
to detect data corruption or bzr bugs.
3268
3141
3269
3142
3270
3143
class cmd_upgrade(Command):
3271
__doc__ = """Upgrade branch storage to current format.
3144
"""Upgrade branch storage to current format.
3272
3145
3273
3146
The check command or bzr developers may sometimes advise you to run
3274
3147
this command. When the default format has changed you may also be warned
3292
3165
3293
3166
3294
3167
class cmd_whoami(Command):
3295
__doc__ = """Show or set bzr user id.
3168
"""Show or set bzr user id.
3296
3169
3297
3170
:Examples:
3298
3171
Show the email of the current user::
3342
3215
3343
3216
3344
3217
class cmd_nick(Command):
3345
__doc__ = """Print or set the branch nickname.
3218
"""Print or set the branch nickname.
3346
3219
3347
3220
If unset, the tree root directory name is used as the nickname.
3348
3221
To print the current nickname, execute with no argument.
3362
3235
3363
3236
@display_command
3364
3237
def printme(self, branch):
3365
self.outf.write('%s\n' % branch.nick)
3238
print branch.nick
3366
3239
3367
3240
3368
3241
class cmd_alias(Command):
3369
__doc__ = """Set/unset and display aliases.
3242
"""Set/unset and display aliases.
3370
3243
3371
3244
:Examples:
3372
3245
Show the current aliases::
3436
3309
3437
3310
3438
3311
class cmd_selftest(Command):
3439
__doc__ = """Run internal test suite.
3312
"""Run internal test suite.
3440
3313
3441
3314
If arguments are given, they are regular expressions that say which tests
3442
3315
should run. Tests matching any expression are run, and other tests are
3486
3359
def get_transport_type(typestring):
3487
3360
"""Parse and return a transport specifier."""
3488
3361
if typestring == "sftp":
3489
from bzrlib.tests import stub_sftp
3490
return stub_sftp.SFTPAbsoluteServer
3362
from bzrlib.transport.sftp import SFTPAbsoluteServer
3363
return SFTPAbsoluteServer
3491
3364
if typestring == "memory":
3492
from bzrlib.tests import test_server
3493
return memory.MemoryServer
3365
from bzrlib.transport.memory import MemoryServer
3366
return MemoryServer
3494
3367
if typestring == "fakenfs":
3495
from bzrlib.tests import test_server
3496
return test_server.FakeNFSServer
3368
from bzrlib.transport.fakenfs import FakeNFSServer
3369
return FakeNFSServer
3497
3370
msg = "No known transport type %s. Supported types are: sftp\n" %\
3498
3371
(typestring)
3499
3372
raise errors.BzrCommandError(msg)
3583
3456
raise errors.BzrCommandError("subunit not available. subunit "
3584
3457
"needs to be installed to use --subunit.")
3585
3458
self.additional_selftest_args['runner_class'] = SubUnitBzrRunner
3586
# On Windows, disable automatic conversion of '\n' to '\r\n' in
3587
# stdout, which would corrupt the subunit stream.
3588
if sys.platform == "win32" and sys.stdout.fileno() >= 0:
3589
import msvcrt
3590
msvcrt.setmode(sys.stdout.fileno(), os.O_BINARY)
3591
3459
if parallel:
3592
3460
self.additional_selftest_args.setdefault(
3593
3461
'suite_decorators', []).append(parallel)
3597
3465
verbose = not is_quiet()
3598
3466
# TODO: should possibly lock the history file...
3599
3467
benchfile = open(".perf_history", "at", buffering=1)
3600
self.add_cleanup(benchfile.close)
3601
3468
else:
3602
3469
test_suite_factory = None
3603
3470
benchfile = None
3604
selftest_kwargs = {"verbose": verbose,
3605
"pattern": pattern,
3606
"stop_on_failure": one,
3607
"transport": transport,
3608
"test_suite_factory": test_suite_factory,
3609
"lsprof_timed": lsprof_timed,
3610
"lsprof_tests": lsprof_tests,
3611
"bench_history": benchfile,
3612
"matching_tests_first": first,
3613
"list_only": list_only,
3614
"random_seed": randomize,
3615
"exclude_pattern": exclude,
3616
"strict": strict,
3617
"load_list": load_list,
3618
"debug_flags": debugflag,
3619
"starting_with": starting_with
3620
}
3621
selftest_kwargs.update(self.additional_selftest_args)
3622
result = selftest(**selftest_kwargs)
3471
try:
3472
selftest_kwargs = {"verbose": verbose,
3473
"pattern": pattern,
3474
"stop_on_failure": one,
3475
"transport": transport,
3476
"test_suite_factory": test_suite_factory,
3477
"lsprof_timed": lsprof_timed,
3478
"lsprof_tests": lsprof_tests,
3479
"bench_history": benchfile,
3480
"matching_tests_first": first,
3481
"list_only": list_only,
3482
"random_seed": randomize,
3483
"exclude_pattern": exclude,
3484
"strict": strict,
3485
"load_list": load_list,
3486
"debug_flags": debugflag,
3487
"starting_with": starting_with
3488
}
3489
selftest_kwargs.update(self.additional_selftest_args)
3490
result = selftest(**selftest_kwargs)
3491
finally:
3492
if benchfile is not None:
3493
benchfile.close()
3623
3494
return int(not result)
3624
3495
3625
3496
3626
3497
class cmd_version(Command):
3627
__doc__ = """Show version of bzr."""
3498
"""Show version of bzr."""
3628
3499
3629
3500
encoding_type = 'replace'
3630
3501
takes_options = [
3641
3512
3642
3513
3643
3514
class cmd_rocks(Command):
3644
__doc__ = """Statement of optimism."""
3515
"""Statement of optimism."""
3645
3516
3646
3517
hidden = True
3647
3518
3648
3519
@display_command
3649
3520
def run(self):
3650
self.outf.write("It sure does!\n")
3521
print "It sure does!"
3651
3522
3652
3523
3653
3524
class cmd_find_merge_base(Command):
3654
__doc__ = """Find and print a base revision for merging two branches."""
3525
"""Find and print a base revision for merging two branches."""
3655
3526
# TODO: Options to specify revisions on either side, as if
3656
3527
# merging only part of the history.
3657
3528
takes_args = ['branch', 'other']
3663
3534
3664
3535
branch1 = Branch.open_containing(branch)[0]
3665
3536
branch2 = Branch.open_containing(other)[0]
3666
self.add_cleanup(branch1.lock_read().unlock)
3667
self.add_cleanup(branch2.lock_read().unlock)
3668
last1 = ensure_null(branch1.last_revision())
3669
last2 = ensure_null(branch2.last_revision())
3670
3671
graph = branch1.repository.get_graph(branch2.repository)
3672
base_rev_id = graph.find_unique_lca(last1, last2)
3673
3674
self.outf.write('merge base is revision %s\n' % base_rev_id)
3537
branch1.lock_read()
3538
try:
3539
branch2.lock_read()
3540
try:
3541
last1 = ensure_null(branch1.last_revision())
3542
last2 = ensure_null(branch2.last_revision())
3543
3544
graph = branch1.repository.get_graph(branch2.repository)
3545
base_rev_id = graph.find_unique_lca(last1, last2)
3546
3547
print 'merge base is revision %s' % base_rev_id
3548
finally:
3549
branch2.unlock()
3550
finally:
3551
branch1.unlock()
3675
3552
3676
3553
3677
3554
class cmd_merge(Command):
3678
__doc__ = """Perform a three-way merge.
3555
"""Perform a three-way merge.
3679
3556
3680
3557
The source of the merge can be specified either in the form of a branch,
3681
3558
or in the form of a path to a file containing a merge directive generated
3710
3587
committed to record the result of the merge.
3711
3588
3712
3589
merge refuses to run if there are any uncommitted changes, unless
3713
--force is given. The --force option can also be used to create a
3714
merge revision which has more than two parents.
3715
3716
If one would like to merge changes from the working tree of the other
3717
branch without merging any committed revisions, the --uncommitted option
3718
can be given.
3590
--force is given.
3719
3591
3720
3592
To select only some changes to merge, use "merge -i", which will prompt
3721
3593
you to apply each diff hunk and file change, similar to "shelve".
3733
3605
3734
3606
bzr merge -r 81..82 ../bzr.dev
3735
3607
3736
To apply a merge directive contained in /tmp/merge::
3608
To apply a merge directive contained in /tmp/merge:
3737
3609
3738
3610
bzr merge /tmp/merge
3739
3740
To create a merge revision with three parents from two branches
3741
feature1a and feature1b:
3742
3743
bzr merge ../feature1a
3744
bzr merge ../feature1b --force
3745
bzr commit -m 'revision with three parents'
3746
3611
"""
3747
3612
3748
3613
encoding_type = 'exact'
3806
3671
view_info = _get_view_info_for_change_reporter(tree)
3807
3672
change_reporter = delta._ChangeReporter(
3808
3673
unversioned_filter=tree.is_ignored, view_info=view_info)
3809
pb = ui.ui_factory.nested_progress_bar()
3810
self.add_cleanup(pb.finished)
3811
self.add_cleanup(tree.lock_write().unlock)
3812
if location is not None:
3813
try:
3814
mergeable = bundle.read_mergeable_from_url(location,
3815
possible_transports=possible_transports)
3816
except errors.NotABundle:
3817
mergeable = None
3674
cleanups = []
3675
try:
3676
pb = ui.ui_factory.nested_progress_bar()
3677
cleanups.append(pb.finished)
3678
tree.lock_write()
3679
cleanups.append(tree.unlock)
3680
if location is not None:
3681
try:
3682
mergeable = bundle.read_mergeable_from_url(location,
3683
possible_transports=possible_transports)
3684
except errors.NotABundle:
3685
mergeable = None
3686
else:
3687
if uncommitted:
3688
raise errors.BzrCommandError('Cannot use --uncommitted'
3689
' with bundles or merge directives.')
3690
3691
if revision is not None:
3692
raise errors.BzrCommandError(
3693
'Cannot use -r with merge directives or bundles')
3694
merger, verified = _mod_merge.Merger.from_mergeable(tree,
3695
mergeable, pb)
3696
3697
if merger is None and uncommitted:
3698
if revision is not None and len(revision) > 0:
3699
raise errors.BzrCommandError('Cannot use --uncommitted and'
3700
' --revision at the same time.')
3701
merger = self.get_merger_from_uncommitted(tree, location, pb,
3702
cleanups)
3703
allow_pending = False
3704
3705
if merger is None:
3706
merger, allow_pending = self._get_merger_from_branch(tree,
3707
location, revision, remember, possible_transports, pb)
3708
3709
merger.merge_type = merge_type
3710
merger.reprocess = reprocess
3711
merger.show_base = show_base
3712
self.sanity_check_merger(merger)
3713
if (merger.base_rev_id == merger.other_rev_id and
3714
merger.other_rev_id is not None):
3715
note('Nothing to do.')
3716
return 0
3717
if pull:
3718
if merger.interesting_files is not None:
3719
raise errors.BzrCommandError('Cannot pull individual files')
3720
if (merger.base_rev_id == tree.last_revision()):
3721
result = tree.pull(merger.other_branch, False,
3722
merger.other_rev_id)
3723
result.report(self.outf)
3724
return 0
3725
if merger.this_basis is None:
3726
raise errors.BzrCommandError(
3727
"This branch has no commits."
3728
" (perhaps you would prefer 'bzr pull')")
3729
if preview:
3730
return self._do_preview(merger, cleanups)
3731
elif interactive:
3732
return self._do_interactive(merger, cleanups)
3818
3733
else:
3819
if uncommitted:
3820
raise errors.BzrCommandError('Cannot use --uncommitted'
3821
' with bundles or merge directives.')
3822
3823
if revision is not None:
3824
raise errors.BzrCommandError(
3825
'Cannot use -r with merge directives or bundles')
3826
merger, verified = _mod_merge.Merger.from_mergeable(tree,
3827
mergeable, None)
3828
3829
if merger is None and uncommitted:
3830
if revision is not None and len(revision) > 0:
3831
raise errors.BzrCommandError('Cannot use --uncommitted and'
3832
' --revision at the same time.')
3833
merger = self.get_merger_from_uncommitted(tree, location, None)
3834
allow_pending = False
3835
3836
if merger is None:
3837
merger, allow_pending = self._get_merger_from_branch(tree,
3838
location, revision, remember, possible_transports, None)
3839
3840
merger.merge_type = merge_type
3841
merger.reprocess = reprocess
3842
merger.show_base = show_base
3843
self.sanity_check_merger(merger)
3844
if (merger.base_rev_id == merger.other_rev_id and
3845
merger.other_rev_id is not None):
3846
note('Nothing to do.')
3847
return 0
3848
if pull:
3849
if merger.interesting_files is not None:
3850
raise errors.BzrCommandError('Cannot pull individual files')
3851
if (merger.base_rev_id == tree.last_revision()):
3852
result = tree.pull(merger.other_branch, False,
3853
merger.other_rev_id)
3854
result.report(self.outf)
3855
return 0
3856
if merger.this_basis is None:
3857
raise errors.BzrCommandError(
3858
"This branch has no commits."
3859
" (perhaps you would prefer 'bzr pull')")
3860
if preview:
3861
return self._do_preview(merger)
3862
elif interactive:
3863
return self._do_interactive(merger)
3864
else:
3865
return self._do_merge(merger, change_reporter, allow_pending,
3866
verified)
3867
3868
def _get_preview(self, merger):
3734
return self._do_merge(merger, change_reporter, allow_pending,
3735
verified)
3736
finally:
3737
for cleanup in reversed(cleanups):
3738
cleanup()
3739
3740
def _get_preview(self, merger, cleanups):
3869
3741
tree_merger = merger.make_merger()
3870
3742
tt = tree_merger.make_preview_transform()
3871
self.add_cleanup(tt.finalize)
3743
cleanups.append(tt.finalize)
3872
3744
result_tree = tt.get_preview_tree()
3873
3745
return result_tree
3874
3746
3875
def _do_preview(self, merger):
3747
def _do_preview(self, merger, cleanups):
3876
3748
from bzrlib.diff import show_diff_trees
3877
result_tree = self._get_preview(merger)
3749
result_tree = self._get_preview(merger, cleanups)
3878
3750
show_diff_trees(merger.this_tree, result_tree, self.outf,
3879
3751
old_label='', new_label='')
3880
3752
3890
3762
else:
3891
3763
return 0
3892
3764
3893
def _do_interactive(self, merger):
3765
def _do_interactive(self, merger, cleanups):
3894
3766
"""Perform an interactive merge.
3895
3767
3896
3768
This works by generating a preview tree of the merge, then using
3898
3770
and the preview tree.
3899
3771
"""
3900
3772
from bzrlib import shelf_ui
3901
result_tree = self._get_preview(merger)
3773
result_tree = self._get_preview(merger, cleanups)
3902
3774
writer = bzrlib.option.diff_writer_registry.get()
3903
3775
shelver = shelf_ui.Shelver(merger.this_tree, result_tree, destroy=True,
3904
3776
reporter=shelf_ui.ApplyReporter(),
3905
3777
diff_writer=writer(sys.stdout))
3906
try:
3907
shelver.run()
3908
finally:
3909
shelver.finalize()
3778
shelver.run()
3910
3779
3911
3780
def sanity_check_merger(self, merger):
3912
3781
if (merger.show_base and
3972
3841
allow_pending = True
3973
3842
return merger, allow_pending
3974
3843
3975
def get_merger_from_uncommitted(self, tree, location, pb):
3844
def get_merger_from_uncommitted(self, tree, location, pb, cleanups):
3976
3845
"""Get a merger for uncommitted changes.
3977
3846
3978
3847
:param tree: The tree the merger should apply to.
3979
3848
:param location: The location containing uncommitted changes.
3980
3849
:param pb: The progress bar to use for showing progress.
3850
:param cleanups: A list of operations to perform to clean up the
3851
temporary directories, unfinalized objects, etc.
3981
3852
"""
3982
3853
location = self._select_branch_location(tree, location)[0]
3983
3854
other_tree, other_path = WorkingTree.open_containing(location)
4035
3906
4036
3907
4037
3908
class cmd_remerge(Command):
4038
__doc__ = """Redo a merge.
3909
"""Redo a merge.
4039
3910
4040
3911
Use this if you want to try a different merge technique while resolving
4041
3912
conflicts. Some merge techniques are better than others, and remerge
4066
3937
4067
3938
def run(self, file_list=None, merge_type=None, show_base=False,
4068
3939
reprocess=False):
4069
from bzrlib.conflicts import restore
4070
3940
if merge_type is None:
4071
3941
merge_type = _mod_merge.Merge3Merger
4072
3942
tree, file_list = tree_files(file_list)
4073
self.add_cleanup(tree.lock_write().unlock)
4074
parents = tree.get_parent_ids()
4075
if len(parents) != 2:
4076
raise errors.BzrCommandError("Sorry, remerge only works after normal"
4077
" merges. Not cherrypicking or"
4078
" multi-merges.")
4079
repository = tree.branch.repository
4080
interesting_ids = None
4081
new_conflicts = []
4082
conflicts = tree.conflicts()
4083
if file_list is not None:
4084
interesting_ids = set()
4085
for filename in file_list:
4086
file_id = tree.path2id(filename)
4087
if file_id is None:
4088
raise errors.NotVersionedError(filename)
4089
interesting_ids.add(file_id)
4090
if tree.kind(file_id) != "directory":
4091
continue
3943
tree.lock_write()
3944
try:
3945
parents = tree.get_parent_ids()
3946
if len(parents) != 2:
3947
raise errors.BzrCommandError("Sorry, remerge only works after normal"
3948
" merges. Not cherrypicking or"
3949
" multi-merges.")
3950
repository = tree.branch.repository
3951
interesting_ids = None
3952
new_conflicts = []
3953
conflicts = tree.conflicts()
3954
if file_list is not None:
3955
interesting_ids = set()
3956
for filename in file_list:
3957
file_id = tree.path2id(filename)
3958
if file_id is None:
3959
raise errors.NotVersionedError(filename)
3960
interesting_ids.add(file_id)
3961
if tree.kind(file_id) != "directory":
3962
continue
4092
3963
4093
for name, ie in tree.inventory.iter_entries(file_id):
4094
interesting_ids.add(ie.file_id)
4095
new_conflicts = conflicts.select_conflicts(tree, file_list)[0]
4096
else:
4097
# Remerge only supports resolving contents conflicts
4098
allowed_conflicts = ('text conflict', 'contents conflict')
4099
restore_files = [c.path for c in conflicts
4100
if c.typestring in allowed_conflicts]
4101
_mod_merge.transform_tree(tree, tree.basis_tree(), interesting_ids)
4102
tree.set_conflicts(ConflictList(new_conflicts))
4103
if file_list is not None:
4104
restore_files = file_list
4105
for filename in restore_files:
3964
for name, ie in tree.inventory.iter_entries(file_id):
3965
interesting_ids.add(ie.file_id)
3966
new_conflicts = conflicts.select_conflicts(tree, file_list)[0]
3967
else:
3968
# Remerge only supports resolving contents conflicts
3969
allowed_conflicts = ('text conflict', 'contents conflict')
3970
restore_files = [c.path for c in conflicts
3971
if c.typestring in allowed_conflicts]
3972
_mod_merge.transform_tree(tree, tree.basis_tree(), interesting_ids)
3973
tree.set_conflicts(ConflictList(new_conflicts))
3974
if file_list is not None:
3975
restore_files = file_list
3976
for filename in restore_files:
3977
try:
3978
restore(tree.abspath(filename))
3979
except errors.NotConflicted:
3980
pass
3981
# Disable pending merges, because the file texts we are remerging
3982
# have not had those merges performed. If we use the wrong parents
3983
# list, we imply that the working tree text has seen and rejected
3984
# all the changes from the other tree, when in fact those changes
3985
# have not yet been seen.
3986
pb = ui.ui_factory.nested_progress_bar()
3987
tree.set_parent_ids(parents[:1])
4106
3988
try:
4107
restore(tree.abspath(filename))
4108
except errors.NotConflicted:
4109
pass
4110
# Disable pending merges, because the file texts we are remerging
4111
# have not had those merges performed. If we use the wrong parents
4112
# list, we imply that the working tree text has seen and rejected
4113
# all the changes from the other tree, when in fact those changes
4114
# have not yet been seen.
4115
tree.set_parent_ids(parents[:1])
4116
try:
4117
merger = _mod_merge.Merger.from_revision_ids(None, tree, parents[1])
4118
merger.interesting_ids = interesting_ids
4119
merger.merge_type = merge_type
4120
merger.show_base = show_base
4121
merger.reprocess = reprocess
4122
conflicts = merger.do_merge()
3989
merger = _mod_merge.Merger.from_revision_ids(pb,
3990
tree, parents[1])
3991
merger.interesting_ids = interesting_ids
3992
merger.merge_type = merge_type
3993
merger.show_base = show_base
3994
merger.reprocess = reprocess
3995
conflicts = merger.do_merge()
3996
finally:
3997
tree.set_parent_ids(parents)
3998
pb.finished()
4123
3999
finally:
4124
tree.set_parent_ids(parents)
4000
tree.unlock()
4125
4001
if conflicts > 0:
4126
4002
return 1
4127
4003
else:
4129
4005
4130
4006
4131
4007
class cmd_revert(Command):
4132
__doc__ = """Revert files to a previous revision.
4008
"""Revert files to a previous revision.
4133
4009
4134
4010
Giving a list of files will revert only those files. Otherwise, all files
4135
4011
will be reverted. If the revision is not specified with '--revision', the
4149
4025
name. If you name a directory, all the contents of that directory will be
4150
4026
reverted.
4151
4027
4152
If you have newly added files since the target revision, they will be
4153
removed. If the files to be removed have been changed, backups will be
4154
created as above. Directories containing unknown files will not be
4155
deleted.
4028
Any files that have been newly added since that revision will be deleted,
4029
with a backup kept if appropriate. Directories containing unknown files
4030
will not be deleted.
4156
4031
4157
The working tree contains a list of revisions that have been merged but
4158
not yet committed. These revisions will be included as additional parents
4159
of the next commit. Normally, using revert clears that list as well as
4160
reverting the files. If any files are specified, revert leaves the list
4161
of uncommitted merges alone and reverts only the files. Use ``bzr revert
4162
.`` in the tree root to revert all files but keep the recorded merges,
4163
and ``bzr revert --forget-merges`` to clear the pending merge list without
4032
The working tree contains a list of pending merged revisions, which will
4033
be included as parents in the next commit. Normally, revert clears that
4034
list as well as reverting the files. If any files are specified, revert
4035
leaves the pending merge list alone and reverts only the files. Use "bzr
4036
revert ." in the tree root to revert all files but keep the merge record,
4037
and "bzr revert --forget-merges" to clear the pending merge list without
4164
4038
reverting any files.
4165
4166
Using "bzr revert --forget-merges", it is possible to apply all of the
4167
changes from a branch in a single revision. To do this, perform the merge
4168
as desired. Then doing revert with the "--forget-merges" option will keep
4169
the content of the tree as it was, but it will clear the list of pending
4170
merges. The next commit will then contain all of the changes that are
4171
present in the other branch, but without any other parent revisions.
4172
Because this technique forgets where these changes originated, it may
4173
cause additional conflicts on later merges involving the same source and
4174
target branches.
4175
4039
"""
4176
4040
4177
4041
_see_also = ['cat', 'export']
4186
4050
def run(self, revision=None, no_backup=False, file_list=None,
4187
4051
forget_merges=None):
4188
4052
tree, file_list = tree_files(file_list)
4189
self.add_cleanup(tree.lock_tree_write().unlock)
4190
if forget_merges:
4191
tree.set_parent_ids(tree.get_parent_ids()[:1])
4192
else:
4193
self._revert_tree_to_revision(tree, revision, file_list, no_backup)
4053
tree.lock_write()
4054
try:
4055
if forget_merges:
4056
tree.set_parent_ids(tree.get_parent_ids()[:1])
4057
else:
4058
self._revert_tree_to_revision(tree, revision, file_list, no_backup)
4059
finally:
4060
tree.unlock()
4194
4061
4195
4062
@staticmethod
4196
4063
def _revert_tree_to_revision(tree, revision, file_list, no_backup):
4197
4064
rev_tree = _get_one_revision_tree('revert', revision, tree=tree)
4198
tree.revert(file_list, rev_tree, not no_backup, None,
4199
report_changes=True)
4065
pb = ui.ui_factory.nested_progress_bar()
4066
try:
4067
tree.revert(file_list, rev_tree, not no_backup, pb,
4068
report_changes=True)
4069
finally:
4070
pb.finished()
4200
4071
4201
4072
4202
4073
class cmd_assert_fail(Command):
4203
__doc__ = """Test reporting of assertion failures"""
4074
"""Test reporting of assertion failures"""
4204
4075
# intended just for use in testing
4205
4076
4206
4077
hidden = True
4210
4081
4211
4082
4212
4083
class cmd_help(Command):
4213
__doc__ = """Show help on a command or other topic.
4084
"""Show help on a command or other topic.
4214
4085
"""
4215
4086
4216
4087
_see_also = ['topics']
4229
4100
4230
4101
4231
4102
class cmd_shell_complete(Command):
4232
__doc__ = """Show appropriate completions for context.
4103
"""Show appropriate completions for context.
4233
4104
4234
4105
For a list of all available commands, say 'bzr shell-complete'.
4235
4106
"""
4244
4115
4245
4116
4246
4117
class cmd_missing(Command):
4247
__doc__ = """Show unmerged/unpulled revisions between two branches.
4118
"""Show unmerged/unpulled revisions between two branches.
4248
4119
4249
4120
OTHER_BRANCH may be local or remote.
4250
4121
4251
4122
To filter on a range of revisions, you can use the command -r begin..end
4252
4123
-r revision requests a specific revision, -r ..end or -r begin.. are
4253
4124
also valid.
4254
4255
:Exit values:
4256
1 - some missing revisions
4257
0 - no missing revisions
4258
4125
4259
4126
:Examples:
4260
4127
4328
4195
restrict = 'remote'
4329
4196
4330
4197
local_branch = Branch.open_containing(u".")[0]
4331
self.add_cleanup(local_branch.lock_read().unlock)
4332
4333
4198
parent = local_branch.get_parent()
4334
4199
if other_branch is None:
4335
4200
other_branch = parent
4344
4209
remote_branch = Branch.open(other_branch)
4345
4210
if remote_branch.base == local_branch.base:
4346
4211
remote_branch = local_branch
4347
else:
4348
self.add_cleanup(remote_branch.lock_read().unlock)
4349
4212
4350
4213
local_revid_range = _revision_range_to_revid_range(
4351
4214
_get_revision_range(my_revision, local_branch,
4355
4218
_get_revision_range(revision,
4356
4219
remote_branch, self.name()))
4357
4220
4358
local_extra, remote_extra = find_unmerged(
4359
local_branch, remote_branch, restrict,
4360
backward=not reverse,
4361
include_merges=include_merges,
4362
local_revid_range=local_revid_range,
4363
remote_revid_range=remote_revid_range)
4364
4365
if log_format is None:
4366
registry = log.log_formatter_registry
4367
log_format = registry.get_default(local_branch)
4368
lf = log_format(to_file=self.outf,
4369
show_ids=show_ids,
4370
show_timezone='original')
4371
4372
status_code = 0
4373
if local_extra and not theirs_only:
4374
message("You have %d extra revision(s):\n" %
4375
len(local_extra))
4376
for revision in iter_log_revisions(local_extra,
4377
local_branch.repository,
4378
verbose):
4379
lf.log_revision(revision)
4380
printed_local = True
4381
status_code = 1
4382
else:
4383
printed_local = False
4384
4385
if remote_extra and not mine_only:
4386
if printed_local is True:
4387
message("\n\n\n")
4388
message("You are missing %d revision(s):\n" %
4389
len(remote_extra))
4390
for revision in iter_log_revisions(remote_extra,
4391
remote_branch.repository,
4392
verbose):
4393
lf.log_revision(revision)
4394
status_code = 1
4395
4396
if mine_only and not local_extra:
4397
# We checked local, and found nothing extra
4398
message('This branch is up to date.\n')
4399
elif theirs_only and not remote_extra:
4400
# We checked remote, and found nothing extra
4401
message('Other branch is up to date.\n')
4402
elif not (mine_only or theirs_only or local_extra or
4403
remote_extra):
4404
# We checked both branches, and neither one had extra
4405
# revisions
4406
message("Branches are up to date.\n")
4407
self.cleanup_now()
4221
local_branch.lock_read()
4222
try:
4223
remote_branch.lock_read()
4224
try:
4225
local_extra, remote_extra = find_unmerged(
4226
local_branch, remote_branch, restrict,
4227
backward=not reverse,
4228
include_merges=include_merges,
4229
local_revid_range=local_revid_range,
4230
remote_revid_range=remote_revid_range)
4231
4232
if log_format is None:
4233
registry = log.log_formatter_registry
4234
log_format = registry.get_default(local_branch)
4235
lf = log_format(to_file=self.outf,
4236
show_ids=show_ids,
4237
show_timezone='original')
4238
4239
status_code = 0
4240
if local_extra and not theirs_only:
4241
message("You have %d extra revision(s):\n" %
4242
len(local_extra))
4243
for revision in iter_log_revisions(local_extra,
4244
local_branch.repository,
4245
verbose):
4246
lf.log_revision(revision)
4247
printed_local = True
4248
status_code = 1
4249
else:
4250
printed_local = False
4251
4252
if remote_extra and not mine_only:
4253
if printed_local is True:
4254
message("\n\n\n")
4255
message("You are missing %d revision(s):\n" %
4256
len(remote_extra))
4257
for revision in iter_log_revisions(remote_extra,
4258
remote_branch.repository,
4259
verbose):
4260
lf.log_revision(revision)
4261
status_code = 1
4262
4263
if mine_only and not local_extra:
4264
# We checked local, and found nothing extra
4265
message('This branch is up to date.\n')
4266
elif theirs_only and not remote_extra:
4267
# We checked remote, and found nothing extra
4268
message('Other branch is up to date.\n')
4269
elif not (mine_only or theirs_only or local_extra or
4270
remote_extra):
4271
# We checked both branches, and neither one had extra
4272
# revisions
4273
message("Branches are up to date.\n")
4274
finally:
4275
remote_branch.unlock()
4276
finally:
4277
local_branch.unlock()
4408
4278
if not status_code and parent is None and other_branch is not None:
4409
self.add_cleanup(local_branch.lock_write().unlock)
4410
# handle race conditions - a parent might be set while we run.
4411
if local_branch.get_parent() is None:
4412
local_branch.set_parent(remote_branch.base)
4279
local_branch.lock_write()
4280
try:
4281
# handle race conditions - a parent might be set while we run.
4282
if local_branch.get_parent() is None:
4283
local_branch.set_parent(remote_branch.base)
4284
finally:
4285
local_branch.unlock()
4413
4286
return status_code
4414
4287
4415
4288
4416
4289
class cmd_pack(Command):
4417
__doc__ = """Compress the data within a repository.
4418
4419
This operation compresses the data within a bazaar repository. As
4420
bazaar supports automatic packing of repository, this operation is
4421
normally not required to be done manually.
4422
4423
During the pack operation, bazaar takes a backup of existing repository
4424
data, i.e. pack files. This backup is eventually removed by bazaar
4425
automatically when it is safe to do so. To save disk space by removing
4426
the backed up pack files, the --clean-obsolete-packs option may be
4427
used.
4428
4429
Warning: If you use --clean-obsolete-packs and your machine crashes
4430
during or immediately after repacking, you may be left with a state
4431
where the deletion has been written to disk but the new packs have not
4432
been. In this case the repository may be unusable.
4433
"""
4290
"""Compress the data within a repository."""
4434
4291
4435
4292
_see_also = ['repositories']
4436
4293
takes_args = ['branch_or_repo?']
4437
takes_options = [
4438
Option('clean-obsolete-packs', 'Delete obsolete packs to save disk space.'),
4439
]
4440
4294
4441
def run(self, branch_or_repo='.', clean_obsolete_packs=False):
4295
def run(self, branch_or_repo='.'):
4442
4296
dir = bzrdir.BzrDir.open_containing(branch_or_repo)[0]
4443
4297
try:
4444
4298
branch = dir.open_branch()
4445
4299
repository = branch.repository
4446
4300
except errors.NotBranchError:
4447
4301
repository = dir.open_repository()
4448
repository.pack(clean_obsolete_packs=clean_obsolete_packs)
4302
repository.pack()
4449
4303
4450
4304
4451
4305
class cmd_plugins(Command):
4452
__doc__ = """List the installed plugins.
4306
"""List the installed plugins.
4453
4307
4454
4308
This command displays the list of installed plugins including
4455
4309
version of plugin and a short description of each.
4462
4316
adding new commands, providing additional network transports and
4463
4317
customizing log output.
4464
4318
4465
See the Bazaar Plugin Guide <http://doc.bazaar.canonical.com/plugins/en/>
4466
for further information on plugins including where to find them and how to
4467
install them. Instructions are also provided there on how to write new
4468
plugins using the Python programming language.
4319
See the Bazaar web site, http://bazaar-vcs.org, for further
4320
information on plugins including where to find them and how to
4321
install them. Instructions are also provided there on how to
4322
write new plugins using the Python programming language.
4469
4323
"""
4470
4324
takes_options = ['verbose']
4471
4325
4486
4340
doc = '(no description)'
4487
4341
result.append((name_ver, doc, plugin.path()))
4488
4342
for name_ver, doc, path in sorted(result):
4489
self.outf.write("%s\n" % name_ver)
4490
self.outf.write(" %s\n" % doc)
4343
print name_ver
4344
print ' ', doc
4491
4345
if verbose:
4492
self.outf.write(" %s\n" % path)
4493
self.outf.write("\n")
4346
print ' ', path
4347
print
4494
4348
4495
4349
4496
4350
class cmd_testament(Command):
4497
__doc__ = """Show testament (signing-form) of a revision."""
4351
"""Show testament (signing-form) of a revision."""
4498
4352
takes_options = [
4499
4353
'revision',
4500
4354
Option('long', help='Produce long-format testament.'),
4512
4366
b = Branch.open_containing(branch)[0]
4513
4367
else:
4514
4368
b = Branch.open(branch)
4515
self.add_cleanup(b.lock_read().unlock)
4516
if revision is None:
4517
rev_id = b.last_revision()
4518
else:
4519
rev_id = revision[0].as_revision_id(b)
4520
t = testament_class.from_revision(b.repository, rev_id)
4521
if long:
4522
sys.stdout.writelines(t.as_text_lines())
4523
else:
4524
sys.stdout.write(t.as_short_text())
4369
b.lock_read()
4370
try:
4371
if revision is None:
4372
rev_id = b.last_revision()
4373
else:
4374
rev_id = revision[0].as_revision_id(b)
4375
t = testament_class.from_revision(b.repository, rev_id)
4376
if long:
4377
sys.stdout.writelines(t.as_text_lines())
4378
else:
4379
sys.stdout.write(t.as_short_text())
4380
finally:
4381
b.unlock()
4525
4382
4526
4383
4527
4384
class cmd_annotate(Command):
4528
__doc__ = """Show the origin of each line in a file.
4385
"""Show the origin of each line in a file.
4529
4386
4530
4387
This prints out the given file with an annotation on the left side
4531
4388
indicating which revision, author and date introduced the change.
4552
4409
wt, branch, relpath = \
4553
4410
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
4554
4411
if wt is not None:
4555
self.add_cleanup(wt.lock_read().unlock)
4556
else:
4557
self.add_cleanup(branch.lock_read().unlock)
4558
tree = _get_one_revision_tree('annotate', revision, branch=branch)
4559
self.add_cleanup(tree.lock_read().unlock)
4560
if wt is not None:
4561
file_id = wt.path2id(relpath)
4562
else:
4563
file_id = tree.path2id(relpath)
4564
if file_id is None:
4565
raise errors.NotVersionedError(filename)
4566
file_version = tree.inventory[file_id].revision
4567
if wt is not None and revision is None:
4568
# If there is a tree and we're not annotating historical
4569
# versions, annotate the working tree's content.
4570
annotate_file_tree(wt, file_id, self.outf, long, all,
4571
show_ids=show_ids)
4572
else:
4573
annotate_file(branch, file_version, file_id, long, all, self.outf,
4574
show_ids=show_ids)
4412
wt.lock_read()
4413
else:
4414
branch.lock_read()
4415
try:
4416
tree = _get_one_revision_tree('annotate', revision, branch=branch)
4417
if wt is not None:
4418
file_id = wt.path2id(relpath)
4419
else:
4420
file_id = tree.path2id(relpath)
4421
if file_id is None:
4422
raise errors.NotVersionedError(filename)
4423
file_version = tree.inventory[file_id].revision
4424
if wt is not None and revision is None:
4425
# If there is a tree and we're not annotating historical
4426
# versions, annotate the working tree's content.
4427
annotate_file_tree(wt, file_id, self.outf, long, all,
4428
show_ids=show_ids)
4429
else:
4430
annotate_file(branch, file_version, file_id, long, all, self.outf,
4431
show_ids=show_ids)
4432
finally:
4433
if wt is not None:
4434
wt.unlock()
4435
else:
4436
branch.unlock()
4575
4437
4576
4438
4577
4439
class cmd_re_sign(Command):
4578
__doc__ = """Create a digital signature for an existing revision."""
4440
"""Create a digital signature for an existing revision."""
4579
4441
# TODO be able to replace existing ones.
4580
4442
4581
4443
hidden = True # is this right ?
4588
4450
if revision_id_list is None and revision is None:
4589
4451
raise errors.BzrCommandError('You must supply either --revision or a revision_id')
4590
4452
b = WorkingTree.open_containing(u'.')[0].branch
4591
self.add_cleanup(b.lock_write().unlock)
4592
return self._run(b, revision_id_list, revision)
4453
b.lock_write()
4454
try:
4455
return self._run(b, revision_id_list, revision)
4456
finally:
4457
b.unlock()
4593
4458
4594
4459
def _run(self, b, revision_id_list, revision):
4595
4460
import bzrlib.gpg as gpg
4640
4505
4641
4506
4642
4507
class cmd_bind(Command):
4643
__doc__ = """Convert the current branch into a checkout of the supplied branch.
4644
If no branch is supplied, rebind to the last bound location.
4508
"""Convert the current branch into a checkout of the supplied branch.
4645
4509
4646
4510
Once converted into a checkout, commits must succeed on the master branch
4647
4511
before they will be applied to the local branch.
4648
4512
4649
4513
Bound branches use the nickname of its master branch unless it is set
4650
locally, in which case binding will update the local nickname to be
4514
locally, in which case binding will update the the local nickname to be
4651
4515
that of the master.
4652
4516
"""
4653
4517
4665
4529
'This format does not remember old locations.')
4666
4530
else:
4667
4531
if location is None:
4668
if b.get_bound_location() is not None:
4669
raise errors.BzrCommandError('Branch is already bound')
4670
else:
4671
raise errors.BzrCommandError('No location supplied '
4672
'and no previous location known')
4532
raise errors.BzrCommandError('No location supplied and no '
4533
'previous location known')
4673
4534
b_other = Branch.open(location)
4674
4535
try:
4675
4536
b.bind(b_other)
4681
4542
4682
4543
4683
4544
class cmd_unbind(Command):
4684
__doc__ = """Convert the current checkout into a regular branch.
4545
"""Convert the current checkout into a regular branch.
4685
4546
4686
4547
After unbinding, the local branch is considered independent and subsequent
4687
4548
commits will be local only.
4698
4559
4699
4560
4700
4561
class cmd_uncommit(Command):
4701
__doc__ = """Remove the last committed revision.
4562
"""Remove the last committed revision.
4702
4563
4703
4564
--verbose will print out what is being removed.
4704
4565
--dry-run will go through all the motions, but not actually
4744
4605
b = control.open_branch()
4745
4606
4746
4607
if tree is not None:
4747
self.add_cleanup(tree.lock_write().unlock)
4608
tree.lock_write()
4748
4609
else:
4749
self.add_cleanup(b.lock_write().unlock)
4750
return self._run(b, tree, dry_run, verbose, revision, force, local=local)
4610
b.lock_write()
4611
try:
4612
return self._run(b, tree, dry_run, verbose, revision, force,
4613
local=local)
4614
finally:
4615
if tree is not None:
4616
tree.unlock()
4617
else:
4618
b.unlock()
4751
4619
4752
4620
def _run(self, b, tree, dry_run, verbose, revision, force, local=False):
4753
4621
from bzrlib.log import log_formatter, show_log
4785
4653
end_revision=last_revno)
4786
4654
4787
4655
if dry_run:
4788
self.outf.write('Dry-run, pretending to remove'
4789
' the above revisions.\n')
4656
print 'Dry-run, pretending to remove the above revisions.'
4657
if not force:
4658
val = raw_input('Press <enter> to continue')
4790
4659
else:
4791
self.outf.write('The above revision(s) will be removed.\n')
4792
4793
if not force:
4794
if not ui.ui_factory.get_boolean('Are you sure'):
4795
self.outf.write('Canceled')
4796
return 0
4660
print 'The above revision(s) will be removed.'
4661
if not force:
4662
val = raw_input('Are you sure [y/N]? ')
4663
if val.lower() not in ('y', 'yes'):
4664
print 'Canceled'
4665
return 0
4797
4666
4798
4667
mutter('Uncommitting from {%s} to {%s}',
4799
4668
last_rev_id, rev_id)
4800
4669
uncommit(b, tree=tree, dry_run=dry_run, verbose=verbose,
4801
4670
revno=revno, local=local)
4802
self.outf.write('You can restore the old tip by running:\n'
4803
' bzr pull . -r revid:%s\n' % last_rev_id)
4671
note('You can restore the old tip by running:\n'
4672
' bzr pull . -r revid:%s', last_rev_id)
4804
4673
4805
4674
4806
4675
class cmd_break_lock(Command):
4807
__doc__ = """Break a dead lock on a repository, branch or working directory.
4676
"""Break a dead lock on a repository, branch or working directory.
4808
4677
4809
4678
CAUTION: Locks should only be broken when you are sure that the process
4810
4679
holding the lock has been stopped.
4811
4680
4812
You can get information on what locks are open via the 'bzr info
4813
[location]' command.
4681
You can get information on what locks are open via the 'bzr info' command.
4814
4682
4815
4683
:Examples:
4816
4684
bzr break-lock
4817
bzr break-lock bzr+ssh://example.com/bzr/foo
4818
4685
"""
4819
4686
takes_args = ['location?']
4820
4687
4829
4696
4830
4697
4831
4698
class cmd_wait_until_signalled(Command):
4832
__doc__ = """Test helper for test_start_and_stop_bzr_subprocess_send_signal.
4699
"""Test helper for test_start_and_stop_bzr_subprocess_send_signal.
4833
4700
4834
4701
This just prints a line to signal when it is ready, then blocks on stdin.
4835
4702
"""
4843
4710
4844
4711
4845
4712
class cmd_serve(Command):
4846
__doc__ = """Run the bzr server."""
4713
"""Run the bzr server."""
4847
4714
4848
4715
aliases = ['server']
4849
4716
4850
4717
takes_options = [
4851
4718
Option('inet',
4852
4719
help='Serve on stdin/out for use from inetd or sshd.'),
4853
RegistryOption('protocol',
4854
help="Protocol to serve.",
4720
RegistryOption('protocol',
4721
help="Protocol to serve.",
4855
4722
lazy_registry=('bzrlib.transport', 'transport_server_registry'),
4856
4723
value_switches=True),
4857
4724
Option('port',
4866
4733
Option('allow-writes',
4867
4734
help='By default the server is a readonly server. Supplying '
4868
4735
'--allow-writes enables write access to the contents of '
4869
'the served directory and below. Note that ``bzr serve`` '
4870
'does not perform authentication, so unless some form of '
4871
'external authentication is arranged supplying this '
4872
'option leads to global uncontrolled write access to your '
4873
'file system.'
4736
'the served directory and below.'
4874
4737
),
4875
4738
]
4876
4739
4909
4772
4910
4773
4911
4774
class cmd_join(Command):
4912
__doc__ = """Combine a tree into its containing tree.
4775
"""Combine a tree into its containing tree.
4913
4776
4914
4777
This command requires the target tree to be in a rich-root format.
4915
4778
4955
4818
4956
4819
4957
4820
class cmd_split(Command):
4958
__doc__ = """Split a subdirectory of a tree into a separate tree.
4821
"""Split a subdirectory of a tree into a separate tree.
4959
4822
4960
4823
This command will produce a target tree in a format that supports
4961
4824
rich roots, like 'rich-root' or 'rich-root-pack'. These formats cannot be
4981
4844
4982
4845
4983
4846
class cmd_merge_directive(Command):
4984
__doc__ = """Generate a merge directive for auto-merge tools.
4847
"""Generate a merge directive for auto-merge tools.
4985
4848
4986
4849
A directive requests a merge to be performed, and also provides all the
4987
4850
information necessary to do so. This means it must either include a
5080
4943
5081
4944
5082
4945
class cmd_send(Command):
5083
__doc__ = """Mail or create a merge-directive for submitting changes.
4946
"""Mail or create a merge-directive for submitting changes.
5084
4947
5085
4948
A merge directive provides many things needed for requesting merges:
5086
4949
5092
4955
directly from the merge directive, without retrieving data from a
5093
4956
branch.
5094
4957
5095
`bzr send` creates a compact data set that, when applied using bzr
5096
merge, has the same effect as merging from the source branch.
5097
5098
By default the merge directive is self-contained and can be applied to any
5099
branch containing submit_branch in its ancestory without needing access to
5100
the source branch.
5101
5102
If --no-bundle is specified, then Bazaar doesn't send the contents of the
5103
revisions, but only a structured request to merge from the
5104
public_location. In that case the public_branch is needed and it must be
5105
up-to-date and accessible to the recipient. The public_branch is always
5106
included if known, so that people can check it later.
5107
5108
The submit branch defaults to the parent of the source branch, but can be
5109
overridden. Both submit branch and public branch will be remembered in
5110
branch.conf the first time they are used for a particular branch. The
5111
source branch defaults to that containing the working directory, but can
5112
be changed using --from.
5113
5114
In order to calculate those changes, bzr must analyse the submit branch.
5115
Therefore it is most efficient for the submit branch to be a local mirror.
5116
If a public location is known for the submit_branch, that location is used
5117
in the merge directive.
5118
5119
The default behaviour is to send the merge directive by mail, unless -o is
5120
given, in which case it is sent to a file.
4958
If --no-bundle is specified, then public_branch is needed (and must be
4959
up-to-date), so that the receiver can perform the merge using the
4960
public_branch. The public_branch is always included if known, so that
4961
people can check it later.
4962
4963
The submit branch defaults to the parent, but can be overridden. Both
4964
submit branch and public branch will be remembered if supplied.
4965
4966
If a public_branch is known for the submit_branch, that public submit
4967
branch is used in the merge instructions. This means that a local mirror
4968
can be used as your actual submit branch, once you have set public_branch
4969
for that mirror.
5121
4970
5122
4971
Mail is sent using your preferred mail program. This should be transparent
5123
4972
on Windows (it uses MAPI). On Linux, it requires the xdg-email utility.
5143
4992
5144
4993
The merge directives created by bzr send may be applied using bzr merge or
5145
4994
bzr pull by specifying a file containing a merge directive as the location.
5146
5147
bzr send makes extensive use of public locations to map local locations into
5148
URLs that can be used by other people. See `bzr help configuration` to
5149
set them, and use `bzr info` to display them.
5150
4995
"""
5151
4996
5152
4997
encoding_type = 'exact'
5168
5013
short_name='f',
5169
5014
type=unicode),
5170
5015
Option('output', short_name='o',
5171
help='Write merge directive to this file or directory; '
5016
help='Write merge directive to this file; '
5172
5017
'use - for stdout.',
5173
5018
type=unicode),
5174
5019
Option('strict',
5197
5042
5198
5043
5199
5044
class cmd_bundle_revisions(cmd_send):
5200
__doc__ = """Create a merge-directive for submitting changes.
5045
"""Create a merge-directive for submitting changes.
5201
5046
5202
5047
A merge directive provides many things needed for requesting merges:
5203
5048
5270
5115
5271
5116
5272
5117
class cmd_tag(Command):
5273
__doc__ = """Create, remove or modify a tag naming a revision.
5118
"""Create, remove or modify a tag naming a revision.
5274
5119
5275
5120
Tags give human-meaningful names to revisions. Commands that take a -r
5276
5121
(--revision) option can be given -rtag:X, where X is any previously
5284
5129
5285
5130
To rename a tag (change the name but keep it on the same revsion), run ``bzr
5286
5131
tag new-name -r tag:old-name`` and then ``bzr tag --delete oldname``.
5287
5288
If no tag name is specified it will be determined through the
5289
'automatic_tag_name' hook. This can e.g. be used to automatically tag
5290
upstream releases by reading configure.ac. See ``bzr help hooks`` for
5291
details.
5292
5132
"""
5293
5133
5294
5134
_see_also = ['commit', 'tags']
5295
takes_args = ['tag_name?']
5135
takes_args = ['tag_name']
5296
5136
takes_options = [
5297
5137
Option('delete',
5298
5138
help='Delete this tag rather than placing it.',
5308
5148
'revision',
5309
5149
]
5310
5150
5311
def run(self, tag_name=None,
5151
def run(self, tag_name,
5312
5152
delete=None,
5313
5153
directory='.',
5314
5154
force=None,
5315
5155
revision=None,
5316
5156
):
5317
5157
branch, relpath = Branch.open_containing(directory)
5318
self.add_cleanup(branch.lock_write().unlock)
5319
if delete:
5320
if tag_name is None:
5321
raise errors.BzrCommandError("No tag specified to delete.")
5322
branch.tags.delete_tag(tag_name)
5323
self.outf.write('Deleted tag %s.\n' % tag_name)
5324
else:
5325
if revision:
5326
if len(revision) != 1:
5327
raise errors.BzrCommandError(
5328
"Tags can only be placed on a single revision, "
5329
"not on a range")
5330
revision_id = revision[0].as_revision_id(branch)
5158
branch.lock_write()
5159
try:
5160
if delete:
5161
branch.tags.delete_tag(tag_name)
5162
self.outf.write('Deleted tag %s.\n' % tag_name)
5331
5163
else:
5332
revision_id = branch.last_revision()
5333
if tag_name is None:
5334
tag_name = branch.automatic_tag_name(revision_id)
5335
if tag_name is None:
5336
raise errors.BzrCommandError(
5337
"Please specify a tag name.")
5338
if (not force) and branch.tags.has_tag(tag_name):
5339
raise errors.TagAlreadyExists(tag_name)
5340
branch.tags.set_tag(tag_name, revision_id)
5341
self.outf.write('Created tag %s.\n' % tag_name)
5164
if revision:
5165
if len(revision) != 1:
5166
raise errors.BzrCommandError(
5167
"Tags can only be placed on a single revision, "
5168
"not on a range")
5169
revision_id = revision[0].as_revision_id(branch)
5170
else:
5171
revision_id = branch.last_revision()
5172
if (not force) and branch.tags.has_tag(tag_name):
5173
raise errors.TagAlreadyExists(tag_name)
5174
branch.tags.set_tag(tag_name, revision_id)
5175
self.outf.write('Created tag %s.\n' % tag_name)
5176
finally:
5177
branch.unlock()
5342
5178
5343
5179
5344
5180
class cmd_tags(Command):
5345
__doc__ = """List tags.
5181
"""List tags.
5346
5182
5347
5183
This command shows a table of tag names and the revisions they reference.
5348
5184
"""
5376
5212
if not tags:
5377
5213
return
5378
5214
5379
self.add_cleanup(branch.lock_read().unlock)
5380
if revision:
5381
graph = branch.repository.get_graph()
5382
rev1, rev2 = _get_revision_range(revision, branch, self.name())
5383
revid1, revid2 = rev1.rev_id, rev2.rev_id
5384
# only show revisions between revid1 and revid2 (inclusive)
5385
tags = [(tag, revid) for tag, revid in tags if
5386
graph.is_between(revid, revid1, revid2)]
5387
if sort == 'alpha':
5388
tags.sort()
5389
elif sort == 'time':
5390
timestamps = {}
5391
for tag, revid in tags:
5392
try:
5393
revobj = branch.repository.get_revision(revid)
5394
except errors.NoSuchRevision:
5395
timestamp = sys.maxint # place them at the end
5396
else:
5397
timestamp = revobj.timestamp
5398
timestamps[revid] = timestamp
5399
tags.sort(key=lambda x: timestamps[x[1]])
5400
if not show_ids:
5401
# [ (tag, revid), ... ] -> [ (tag, dotted_revno), ... ]
5402
for index, (tag, revid) in enumerate(tags):
5403
try:
5404
revno = branch.revision_id_to_dotted_revno(revid)
5405
if isinstance(revno, tuple):
5406
revno = '.'.join(map(str, revno))
5407
except errors.NoSuchRevision:
5408
# Bad tag data/merges can lead to tagged revisions
5409
# which are not in this branch. Fail gracefully ...
5410
revno = '?'
5411
tags[index] = (tag, revno)
5412
self.cleanup_now()
5215
branch.lock_read()
5216
try:
5217
if revision:
5218
graph = branch.repository.get_graph()
5219
rev1, rev2 = _get_revision_range(revision, branch, self.name())
5220
revid1, revid2 = rev1.rev_id, rev2.rev_id
5221
# only show revisions between revid1 and revid2 (inclusive)
5222
tags = [(tag, revid) for tag, revid in tags if
5223
graph.is_between(revid, revid1, revid2)]
5224
if sort == 'alpha':
5225
tags.sort()
5226
elif sort == 'time':
5227
timestamps = {}
5228
for tag, revid in tags:
5229
try:
5230
revobj = branch.repository.get_revision(revid)
5231
except errors.NoSuchRevision:
5232
timestamp = sys.maxint # place them at the end
5233
else:
5234
timestamp = revobj.timestamp
5235
timestamps[revid] = timestamp
5236
tags.sort(key=lambda x: timestamps[x[1]])
5237
if not show_ids:
5238
# [ (tag, revid), ... ] -> [ (tag, dotted_revno), ... ]
5239
for index, (tag, revid) in enumerate(tags):
5240
try:
5241
revno = branch.revision_id_to_dotted_revno(revid)
5242
if isinstance(revno, tuple):
5243
revno = '.'.join(map(str, revno))
5244
except errors.NoSuchRevision:
5245
# Bad tag data/merges can lead to tagged revisions
5246
# which are not in this branch. Fail gracefully ...
5247
revno = '?'
5248
tags[index] = (tag, revno)
5249
finally:
5250
branch.unlock()
5413
5251
for tag, revspec in tags:
5414
5252
self.outf.write('%-20s %s\n' % (tag, revspec))
5415
5253
5416
5254
5417
5255
class cmd_reconfigure(Command):
5418
__doc__ = """Reconfigure the type of a bzr directory.
5256
"""Reconfigure the type of a bzr directory.
5419
5257
5420
5258
A target configuration must be specified.
5421
5259
5506
5344
5507
5345
5508
5346
class cmd_switch(Command):
5509
__doc__ = """Set the branch of a checkout and update.
5347
"""Set the branch of a checkout and update.
5510
5348
5511
5349
For lightweight checkouts, this changes the branch being referenced.
5512
5350
For heavyweight checkouts, this checks that there are no local commits
5524
5362
/path/to/newbranch.
5525
5363
5526
5364
Bound branches use the nickname of its master branch unless it is set
5527
locally, in which case switching will update the local nickname to be
5365
locally, in which case switching will update the the local nickname to be
5528
5366
that of the master.
5529
5367
"""
5530
5368
5531
takes_args = ['to_location?']
5369
takes_args = ['to_location']
5532
5370
takes_options = [Option('force',
5533
5371
help='Switch even if local commits will be lost.'),
5534
'revision',
5535
5372
Option('create-branch', short_name='b',
5536
5373
help='Create the target branch from this one before'
5537
5374
' switching to it.'),
5538
]
5375
]
5539
5376
5540
def run(self, to_location=None, force=False, create_branch=False,
5541
revision=None):
5377
def run(self, to_location, force=False, create_branch=False):
5542
5378
from bzrlib import switch
5543
5379
tree_location = '.'
5544
revision = _get_one_revision('switch', revision)
5545
5380
control_dir = bzrdir.BzrDir.open_containing(tree_location)[0]
5546
if to_location is None:
5547
if revision is None:
5548
raise errors.BzrCommandError('You must supply either a'
5549
' revision or a location')
5550
to_location = '.'
5551
5381
try:
5552
5382
branch = control_dir.open_branch()
5553
5383
had_explicit_nick = branch.get_config().has_explicit_nickname()
5558
5388
if branch is None:
5559
5389
raise errors.BzrCommandError('cannot create branch without'
5560
5390
' source branch')
5561
to_location = directory_service.directories.dereference(
5562
to_location)
5563
5391
if '/' not in to_location and '\\' not in to_location:
5564
5392
# This path is meant to be relative to the existing branch
5565
5393
this_url = self._get_branch_location(control_dir)
5567
5395
to_branch = branch.bzrdir.sprout(to_location,
5568
5396
possible_transports=[branch.bzrdir.root_transport],
5569
5397
source_branch=branch).open_branch()
5398
# try:
5399
# from_branch = control_dir.open_branch()
5400
# except errors.NotBranchError:
5401
# raise BzrCommandError('Cannot create a branch from this'
5402
# ' location when we cannot open this branch')
5403
# from_branch.bzrdir.sprout(
5404
pass
5570
5405
else:
5571
5406
try:
5572
5407
to_branch = Branch.open(to_location)
5574
5409
this_url = self._get_branch_location(control_dir)
5575
5410
to_branch = Branch.open(
5576
5411
urlutils.join(this_url, '..', to_location))
5577
if revision is not None:
5578
revision = revision.as_revision_id(to_branch)
5579
switch.switch(control_dir, to_branch, force, revision_id=revision)
5412
switch.switch(control_dir, to_branch, force)
5580
5413
if had_explicit_nick:
5581
5414
branch = control_dir.open_branch() #get the new branch!
5582
5415
branch.nick = to_branch.nick
5602
5435
5603
5436
5604
5437
class cmd_view(Command):
5605
__doc__ = """Manage filtered views.
5438
"""Manage filtered views.
5606
5439
5607
5440
Views provide a mask over the tree so that users can focus on
5608
5441
a subset of a tree when doing their work. After creating a view,
5756
5589
5757
5590
5758
5591
class cmd_hooks(Command):
5759
__doc__ = """Show hooks."""
5592
"""Show hooks."""
5760
5593
5761
5594
hidden = True
5762
5595
5775
5608
self.outf.write(" <no hooks installed>\n")
5776
5609
5777
5610
5778
class cmd_remove_branch(Command):
5779
__doc__ = """Remove a branch.
5780
5781
This will remove the branch from the specified location but
5782
will keep any working tree or repository in place.
5783
5784
:Examples:
5785
5786
Remove the branch at repo/trunk::
5787
5788
bzr remove-branch repo/trunk
5789
5790
"""
5791
5792
takes_args = ["location?"]
5793
5794
aliases = ["rmbranch"]
5795
5796
def run(self, location=None):
5797
if location is None:
5798
location = "."
5799
branch = Branch.open_containing(location)[0]
5800
branch.bzrdir.destroy_branch()
5801
5802
5803
5611
class cmd_shelve(Command):
5804
__doc__ = """Temporarily set aside some changes from the current tree.
5612
"""Temporarily set aside some changes from the current tree.
5805
5613
5806
5614
Shelve allows you to temporarily put changes you've made "on the shelf",
5807
5615
ie. out of the way, until a later time when you can bring them back from
5854
5662
try:
5855
5663
shelver.run()
5856
5664
finally:
5857
shelver.finalize()
5665
shelver.work_tree.unlock()
5858
5666
except errors.UserAbort:
5859
5667
return 0
5860
5668
5861
5669
def run_for_list(self):
5862
5670
tree = WorkingTree.open_containing('.')[0]
5863
self.add_cleanup(tree.lock_read().unlock)
5864
manager = tree.get_shelf_manager()
5865
shelves = manager.active_shelves()
5866
if len(shelves) == 0:
5867
note('No shelved changes.')
5868
return 0
5869
for shelf_id in reversed(shelves):
5870
message = manager.get_metadata(shelf_id).get('message')
5871
if message is None:
5872
message = '<no message>'
5873
self.outf.write('%3d: %s\n' % (shelf_id, message))
5874
return 1
5671
tree.lock_read()
5672
try:
5673
manager = tree.get_shelf_manager()
5674
shelves = manager.active_shelves()
5675
if len(shelves) == 0:
5676
note('No shelved changes.')
5677
return 0
5678
for shelf_id in reversed(shelves):
5679
message = manager.get_metadata(shelf_id).get('message')
5680
if message is None:
5681
message = '<no message>'
5682
self.outf.write('%3d: %s\n' % (shelf_id, message))
5683
return 1
5684
finally:
5685
tree.unlock()
5875
5686
5876
5687
5877
5688
class cmd_unshelve(Command):
5878
__doc__ = """Restore shelved changes.
5689
"""Restore shelved changes.
5879
5690
5880
5691
By default, the most recently shelved changes are restored. However if you
5881
5692
specify a shelf by id those changes will be restored instead. This works
5889
5700
enum_switch=False, value_switches=True,
5890
5701
apply="Apply changes and remove from the shelf.",
5891
5702
dry_run="Show changes, but do not apply or remove them.",
5892
preview="Instead of unshelving the changes, show the diff that "
5893
"would result from unshelving.",
5894
delete_only="Delete changes without applying them.",
5895
keep="Apply changes but don't delete them.",
5703
delete_only="Delete changes without applying them."
5896
5704
)
5897
5705
]
5898
5706
_see_also = ['shelve']
5907
5715
5908
5716
5909
5717
class cmd_clean_tree(Command):
5910
__doc__ = """Remove unwanted files from working tree.
5718
"""Remove unwanted files from working tree.
5911
5719
5912
5720
By default, only unknown files, not ignored files, are deleted. Versioned
5913
5721
files are never deleted.
5941
5749
5942
5750
5943
5751
class cmd_reference(Command):
5944
__doc__ = """list, view and set branch locations for nested trees.
5752
"""list, view and set branch locations for nested trees.
5945
5753
5946
5754
If no arguments are provided, lists the branch locations for nested trees.
5947
5755
If one argument is provided, display the branch location for that tree.
5987
5795
self.outf.write('%s %s\n' % (path, location))
5988
5796
5989
5797
5990
def _register_lazy_builtins():
5991
# register lazy builtins from other modules; called at startup and should
5992
# be only called once.
5993
for (name, aliases, module_name) in [
5994
('cmd_bundle_info', [], 'bzrlib.bundle.commands'),
5995
('cmd_dpush', [], 'bzrlib.foreign'),
5996
('cmd_version_info', [], 'bzrlib.cmd_version_info'),
5997
('cmd_resolve', ['resolved'], 'bzrlib.conflicts'),
5998
('cmd_conflicts', [], 'bzrlib.conflicts'),
5999
('cmd_sign_my_commits', [], 'bzrlib.sign_my_commits'),
6000
]:
6001
builtin_command_registry.register_lazy(name, aliases, module_name)
5798
# these get imported and then picked up by the scan for cmd_*
5799
# TODO: Some more consistent way to split command definitions across files;
5800
# we do need to load at least some information about them to know of
5801
# aliases. ideally we would avoid loading the implementation until the
5802
# details were needed.
5803
from bzrlib.cmd_version_info import cmd_version_info
5804
from bzrlib.conflicts import cmd_resolve, cmd_conflicts, restore
5805
from bzrlib.bundle.commands import (
5806
cmd_bundle_info,
5807
)
5808
from bzrlib.foreign import cmd_dpush
5809
from bzrlib.sign_my_commits import cmd_sign_my_commits
5810
from bzrlib.weave_commands import cmd_versionedfile_list, \
5811
cmd_weave_plan_merge, cmd_weave_merge_text
Loggerhead is a web-based interface for Breezy
Version: 2.0.1