To get this branch, use:
bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
« back to all changes in this revision
Viewing changes to bzrlib/builtins.py
- browse files at revision 4721.3.2
- compare with another revision
- download diff
- download tarball
- view history from revision 4721.3.2
- Committer: Vincent Ladeuil
- Date: 2009-10-06 14:40:37 UTC
- mto: (4728.1.2 integration)
- mto: This revision was merged to the branch mainline in revision 4731.
- Revision ID: v.ladeuil+lp@free.fr-20091006144037-o76rgosv9hj3td0y
Simplify mutable_tree.has_changes() and update call sites.
* bzrlib/workingtree.py:
(WorkingTree.merge_from_branch): Add a force parameter. Replace
the check_basis() call by the corresponding code, taken the new
'force' parameter into account.
* bzrlib/tests/test_status.py:
(TestStatus.make_multiple_pending_tree): Add force=True on
supplementary merges.
* bzrlib/tests/test_reconfigure.py:
(TestReconfigure): Add a test for pending merges.
* bzrlib/tests/test_msgeditor.py:
(MsgEditorTest.make_multiple_pending_tree): Add force=True on
supplementary merges.
* bzrlib/tests/blackbox/test_uncommit.py:
(TestUncommit.test_uncommit_octopus_merge): Add force=True on
supplementary merges.
* bzrlib/send.py:
(send): Use the simplified has_changes(). Fix typo in comment too.
* bzrlib/reconfigure.py:
(Reconfigure._check): Use the simplified has_changes().
* bzrlib/mutabletree.py:
(MutableTree.has_changes): Make the tree parameter optional but
retain it for tests. Add a pending merges check.
* bzrlib/merge.py:
(Merger.ensure_revision_trees, Merger.file_revisions,
Merger.check_basis, Merger.compare_basis): Deprecate.
* bzrlib/bundle/apply_bundle.py:
(merge_bundle): Replace the check_basis() call by the
corresponding code.
* bzrlib/builtins.py:
(cmd_remove_tree.run, cmd_push.run, cmd_merge.run): Use the
simplified has_changes().
(cmd_merge.run): Replace the check_basis call() by the corresponding
code (minus the alredy done has_changes() check).
* bzrlib/workingtree.py:
(WorkingTree.merge_from_branch): Add a force parameter. Replace
the check_basis() call by the corresponding code, taken the new
'force' parameter into account.
* bzrlib/tests/test_status.py:
(TestStatus.make_multiple_pending_tree): Add force=True on
supplementary merges.
* bzrlib/tests/test_reconfigure.py:
(TestReconfigure): Add a test for pending merges.
* bzrlib/tests/test_msgeditor.py:
(MsgEditorTest.make_multiple_pending_tree): Add force=True on
supplementary merges.
* bzrlib/tests/blackbox/test_uncommit.py:
(TestUncommit.test_uncommit_octopus_merge): Add force=True on
supplementary merges.
* bzrlib/send.py:
(send): Use the simplified has_changes(). Fix typo in comment too.
* bzrlib/reconfigure.py:
(Reconfigure._check): Use the simplified has_changes().
* bzrlib/mutabletree.py:
(MutableTree.has_changes): Make the tree parameter optional but
retain it for tests. Add a pending merges check.
* bzrlib/merge.py:
(Merger.ensure_revision_trees, Merger.file_revisions,
Merger.check_basis, Merger.compare_basis): Deprecate.
* bzrlib/bundle/apply_bundle.py:
(merge_bundle): Replace the check_basis() call by the
corresponding code.
* bzrlib/builtins.py:
(cmd_remove_tree.run, cmd_push.run, cmd_merge.run): Use the
simplified has_changes().
(cmd_merge.run): Replace the check_basis call() by the corresponding
code (minus the alredy done has_changes() check).
- files added:
- bzrlib/textui.py
- files removed:
- .testr.conf
- apport
- bzrlib/help_topics/es
- bzrlib/plugins/news_merge
- bzrlib/plugins/news_merge/tests
- bzrlib/tests/per_bzrdir_colo
- bzrlib/tests/per_foreign_vcs
- bzrlib/tests/per_uifactory
- contrib/debian
- doc/en/whats-new
- doc/ja
- doc/ja/_static
- doc/ja/_templates
- doc/ja/mini-tutorial
- doc/ja/tutorials
- doc/ja/upgrade-guide
- doc/ja/user-guide
- doc/ja/user-guide/images
- doc/ja/user-reference
- files renamed:
- bzrlib/help_topics/en/conflict-types.txt => bzrlib/help_topics/en/conflicts.txt
- bzrlib/tests/test__bencode.py => bzrlib/tests/test_bencode.py
- bzrlib/help_topics/es/conflict-types.txt => doc/es/user-guide/resolving_conflicts.txt
- files modified:
- .bzrignore
added
removed
bzrlib/builtins.py
1
# Copyright (C) 2005-2010 Canonical Ltd
1
# Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
31
31
bundle,
32
32
btree_index,
33
33
bzrdir,
34
directory_service,
35
34
delta,
36
35
config,
37
36
errors,
44
43
reconfigure,
45
44
rename_map,
46
45
revision as _mod_revision,
47
static_tuple,
48
46
symbol_versioning,
49
timestamp,
50
47
transport,
51
48
ui,
52
49
urlutils,
54
51
)
55
52
from bzrlib.branch import Branch
56
53
from bzrlib.conflicts import ConflictList
57
from bzrlib.transport import memory
58
54
from bzrlib.revisionspec import RevisionSpec, RevisionInfo
59
55
from bzrlib.smtp_connection import SMTPConnection
60
56
from bzrlib.workingtree import WorkingTree
61
57
""")
62
58
63
from bzrlib.commands import (
64
Command,
65
builtin_command_registry,
66
display_command,
67
)
59
from bzrlib.commands import Command, display_command
68
60
from bzrlib.option import (
69
61
ListOption,
70
62
Option,
232
224
return view_info
233
225
234
226
235
def _open_directory_or_containing_tree_or_branch(filename, directory):
236
"""Open the tree or branch containing the specified file, unless
237
the --directory option is used to specify a different branch."""
238
if directory is not None:
239
return (None, Branch.open(directory), filename)
240
return bzrdir.BzrDir.open_containing_tree_or_branch(filename)
241
242
243
227
# TODO: Make sure no commands unconditionally use the working directory as a
244
228
# branch. If a filename argument is used, the first of them should be used to
245
229
# specify the branch. (Perhaps this can be factored out into some kind of
247
231
# opens the branch?)
248
232
249
233
class cmd_status(Command):
250
__doc__ = """Display status summary.
234
"""Display status summary.
251
235
252
236
This reports on versioned and unknown files, reporting them
253
237
grouped by state. Possible states are:
273
257
unknown
274
258
Not versioned and not matching an ignore pattern.
275
259
276
Additionally for directories, symlinks and files with an executable
277
bit, Bazaar indicates their type using a trailing character: '/', '@'
278
or '*' respectively.
279
280
260
To see ignored files use 'bzr ignored'. For details on the
281
261
changes to file texts, use 'bzr diff'.
282
262
340
320
341
321
342
322
class cmd_cat_revision(Command):
343
__doc__ = """Write out metadata for a revision.
323
"""Write out metadata for a revision.
344
324
345
325
The revision to print can either be specified by a specific
346
326
revision identifier, or you can use --revision.
348
328
349
329
hidden = True
350
330
takes_args = ['revision_id?']
351
takes_options = ['directory', 'revision']
331
takes_options = ['revision']
352
332
# cat-revision is more for frontends so should be exact
353
333
encoding = 'strict'
354
334
355
def print_revision(self, revisions, revid):
356
stream = revisions.get_record_stream([(revid,)], 'unordered', True)
357
record = stream.next()
358
if record.storage_kind == 'absent':
359
raise errors.NoSuchRevision(revisions, revid)
360
revtext = record.get_bytes_as('fulltext')
361
self.outf.write(revtext.decode('utf-8'))
362
363
335
@display_command
364
def run(self, revision_id=None, revision=None, directory=u'.'):
336
def run(self, revision_id=None, revision=None):
365
337
if revision_id is not None and revision is not None:
366
338
raise errors.BzrCommandError('You can only supply one of'
367
339
' revision_id or --revision')
368
340
if revision_id is None and revision is None:
369
341
raise errors.BzrCommandError('You must supply either'
370
342
' --revision or a revision_id')
371
b = WorkingTree.open_containing(directory)[0].branch
372
373
revisions = b.repository.revisions
374
if revisions is None:
375
raise errors.BzrCommandError('Repository %r does not support '
376
'access to raw revision texts')
377
378
b.repository.lock_read()
379
try:
380
# TODO: jam 20060112 should cat-revision always output utf-8?
381
if revision_id is not None:
382
revision_id = osutils.safe_revision_id(revision_id, warn=False)
383
try:
384
self.print_revision(revisions, revision_id)
385
except errors.NoSuchRevision:
386
msg = "The repository %s contains no revision %s." % (
387
b.repository.base, revision_id)
388
raise errors.BzrCommandError(msg)
389
elif revision is not None:
390
for rev in revision:
391
if rev is None:
392
raise errors.BzrCommandError(
393
'You cannot specify a NULL revision.')
394
rev_id = rev.as_revision_id(b)
395
self.print_revision(revisions, rev_id)
396
finally:
397
b.repository.unlock()
398
343
b = WorkingTree.open_containing(u'.')[0].branch
344
345
# TODO: jam 20060112 should cat-revision always output utf-8?
346
if revision_id is not None:
347
revision_id = osutils.safe_revision_id(revision_id, warn=False)
348
try:
349
self.outf.write(b.repository.get_revision_xml(revision_id).decode('utf-8'))
350
except errors.NoSuchRevision:
351
msg = "The repository %s contains no revision %s." % (b.repository.base,
352
revision_id)
353
raise errors.BzrCommandError(msg)
354
elif revision is not None:
355
for rev in revision:
356
if rev is None:
357
raise errors.BzrCommandError('You cannot specify a NULL'
358
' revision.')
359
rev_id = rev.as_revision_id(b)
360
self.outf.write(b.repository.get_revision_xml(rev_id).decode('utf-8'))
361
399
362
400
363
class cmd_dump_btree(Command):
401
__doc__ = """Dump the contents of a btree index file to stdout.
364
"""Dump the contents of a btree index file to stdout.
402
365
403
366
PATH is a btree index file, it can be any URL. This includes things like
404
367
.bzr/repository/pack-names, or .bzr/repository/indices/a34b3a...ca4a4.iix
468
431
for node in bt.iter_all_entries():
469
432
# Node is made up of:
470
433
# (index, key, value, [references])
471
try:
472
refs = node[3]
473
except IndexError:
474
refs_as_tuples = None
475
else:
476
refs_as_tuples = static_tuple.as_tuples(refs)
477
as_tuple = (tuple(node[1]), node[2], refs_as_tuples)
478
self.outf.write('%s\n' % (as_tuple,))
434
self.outf.write('%s\n' % (node[1:],))
479
435
480
436
481
437
class cmd_remove_tree(Command):
482
__doc__ = """Remove the working tree from a given branch/checkout.
438
"""Remove the working tree from a given branch/checkout.
483
439
484
440
Since a lightweight checkout is little more than a working tree
485
441
this will refuse to run against one.
487
443
To re-create the working tree, use "bzr checkout".
488
444
"""
489
445
_see_also = ['checkout', 'working-trees']
490
takes_args = ['location*']
446
takes_args = ['location?']
491
447
takes_options = [
492
448
Option('force',
493
449
help='Remove the working tree even if it has '
494
450
'uncommitted changes.'),
495
451
]
496
452
497
def run(self, location_list, force=False):
498
if not location_list:
499
location_list=['.']
500
501
for location in location_list:
502
d = bzrdir.BzrDir.open(location)
503
504
try:
505
working = d.open_workingtree()
506
except errors.NoWorkingTree:
507
raise errors.BzrCommandError("No working tree to remove")
508
except errors.NotLocalUrl:
509
raise errors.BzrCommandError("You cannot remove the working tree"
510
" of a remote path")
511
if not force:
512
if (working.has_changes()):
513
raise errors.UncommittedChanges(working)
514
515
if working.user_url != working.branch.user_url:
516
raise errors.BzrCommandError("You cannot remove the working tree"
517
" from a lightweight checkout")
518
519
d.destroy_workingtree()
453
def run(self, location='.', force=False):
454
d = bzrdir.BzrDir.open(location)
455
456
try:
457
working = d.open_workingtree()
458
except errors.NoWorkingTree:
459
raise errors.BzrCommandError("No working tree to remove")
460
except errors.NotLocalUrl:
461
raise errors.BzrCommandError("You cannot remove the working tree"
462
" of a remote path")
463
if not force:
464
if (working.has_changes()):
465
raise errors.UncommittedChanges(working)
466
467
working_path = working.bzrdir.root_transport.base
468
branch_path = working.branch.bzrdir.root_transport.base
469
if working_path != branch_path:
470
raise errors.BzrCommandError("You cannot remove the working tree"
471
" from a lightweight checkout")
472
473
d.destroy_workingtree()
520
474
521
475
522
476
class cmd_revno(Command):
523
__doc__ = """Show current revision number.
477
"""Show current revision number.
524
478
525
479
This is equal to the number of revisions on this branch.
526
480
"""
536
490
if tree:
537
491
try:
538
492
wt = WorkingTree.open_containing(location)[0]
539
self.add_cleanup(wt.lock_read().unlock)
493
wt.lock_read()
540
494
except (errors.NoWorkingTree, errors.NotLocalUrl):
541
495
raise errors.NoWorkingTree(location)
542
revid = wt.last_revision()
543
496
try:
544
revno_t = wt.branch.revision_id_to_dotted_revno(revid)
545
except errors.NoSuchRevision:
546
revno_t = ('???',)
547
revno = ".".join(str(n) for n in revno_t)
497
revid = wt.last_revision()
498
try:
499
revno_t = wt.branch.revision_id_to_dotted_revno(revid)
500
except errors.NoSuchRevision:
501
revno_t = ('???',)
502
revno = ".".join(str(n) for n in revno_t)
503
finally:
504
wt.unlock()
548
505
else:
549
506
b = Branch.open_containing(location)[0]
550
self.add_cleanup(b.lock_read().unlock)
551
revno = b.revno()
552
self.cleanup_now()
507
b.lock_read()
508
try:
509
revno = b.revno()
510
finally:
511
b.unlock()
512
553
513
self.outf.write(str(revno) + '\n')
554
514
555
515
556
516
class cmd_revision_info(Command):
557
__doc__ = """Show revision number and revision id for a given revision identifier.
517
"""Show revision number and revision id for a given revision identifier.
558
518
"""
559
519
hidden = True
560
520
takes_args = ['revision_info*']
561
521
takes_options = [
562
522
'revision',
563
custom_help('directory',
523
Option('directory',
564
524
help='Branch to examine, '
565
'rather than the one containing the working directory.'),
525
'rather than the one containing the working directory.',
526
short_name='d',
527
type=unicode,
528
),
566
529
Option('tree', help='Show revno of working tree'),
567
530
]
568
531
573
536
try:
574
537
wt = WorkingTree.open_containing(directory)[0]
575
538
b = wt.branch
576
self.add_cleanup(wt.lock_read().unlock)
539
wt.lock_read()
577
540
except (errors.NoWorkingTree, errors.NotLocalUrl):
578
541
wt = None
579
542
b = Branch.open_containing(directory)[0]
580
self.add_cleanup(b.lock_read().unlock)
581
revision_ids = []
582
if revision is not None:
583
revision_ids.extend(rev.as_revision_id(b) for rev in revision)
584
if revision_info_list is not None:
585
for rev_str in revision_info_list:
586
rev_spec = RevisionSpec.from_string(rev_str)
587
revision_ids.append(rev_spec.as_revision_id(b))
588
# No arguments supplied, default to the last revision
589
if len(revision_ids) == 0:
590
if tree:
591
if wt is None:
592
raise errors.NoWorkingTree(directory)
593
revision_ids.append(wt.last_revision())
543
b.lock_read()
544
try:
545
revision_ids = []
546
if revision is not None:
547
revision_ids.extend(rev.as_revision_id(b) for rev in revision)
548
if revision_info_list is not None:
549
for rev_str in revision_info_list:
550
rev_spec = RevisionSpec.from_string(rev_str)
551
revision_ids.append(rev_spec.as_revision_id(b))
552
# No arguments supplied, default to the last revision
553
if len(revision_ids) == 0:
554
if tree:
555
if wt is None:
556
raise errors.NoWorkingTree(directory)
557
revision_ids.append(wt.last_revision())
558
else:
559
revision_ids.append(b.last_revision())
560
561
revinfos = []
562
maxlen = 0
563
for revision_id in revision_ids:
564
try:
565
dotted_revno = b.revision_id_to_dotted_revno(revision_id)
566
revno = '.'.join(str(i) for i in dotted_revno)
567
except errors.NoSuchRevision:
568
revno = '???'
569
maxlen = max(maxlen, len(revno))
570
revinfos.append([revno, revision_id])
571
finally:
572
if wt is None:
573
b.unlock()
594
574
else:
595
revision_ids.append(b.last_revision())
596
597
revinfos = []
598
maxlen = 0
599
for revision_id in revision_ids:
600
try:
601
dotted_revno = b.revision_id_to_dotted_revno(revision_id)
602
revno = '.'.join(str(i) for i in dotted_revno)
603
except errors.NoSuchRevision:
604
revno = '???'
605
maxlen = max(maxlen, len(revno))
606
revinfos.append([revno, revision_id])
607
608
self.cleanup_now()
575
wt.unlock()
576
609
577
for ri in revinfos:
610
578
self.outf.write('%*s %s\n' % (maxlen, ri[0], ri[1]))
611
579
612
580
613
581
class cmd_add(Command):
614
__doc__ = """Add specified files or directories.
582
"""Add specified files or directories.
615
583
616
584
In non-recursive mode, all the named items are added, regardless
617
585
of whether they were previously ignored. A warning is given if
682
650
should_print=(not is_quiet()))
683
651
684
652
if base_tree:
685
self.add_cleanup(base_tree.lock_read().unlock)
686
tree, file_list = tree_files_for_add(file_list)
687
added, ignored = tree.smart_add(file_list, not
688
no_recurse, action=action, save=not dry_run)
689
self.cleanup_now()
653
base_tree.lock_read()
654
try:
655
file_list = self._maybe_expand_globs(file_list)
656
tree, file_list = tree_files_for_add(file_list)
657
added, ignored = tree.smart_add(file_list, not
658
no_recurse, action=action, save=not dry_run)
659
finally:
660
if base_tree is not None:
661
base_tree.unlock()
690
662
if len(ignored) > 0:
691
663
if verbose:
692
664
for glob in sorted(ignored.keys()):
696
668
697
669
698
670
class cmd_mkdir(Command):
699
__doc__ = """Create a new versioned directory.
671
"""Create a new versioned directory.
700
672
701
673
This is equivalent to creating the directory and then adding it.
702
674
"""
706
678
707
679
def run(self, dir_list):
708
680
for d in dir_list:
681
os.mkdir(d)
709
682
wt, dd = WorkingTree.open_containing(d)
710
base = os.path.dirname(dd)
711
id = wt.path2id(base)
712
if id != None:
713
os.mkdir(d)
714
wt.add([dd])
715
self.outf.write('added %s\n' % d)
716
else:
717
raise errors.NotVersionedError(path=base)
683
wt.add([dd])
684
self.outf.write('added %s\n' % d)
718
685
719
686
720
687
class cmd_relpath(Command):
721
__doc__ = """Show path of a file relative to root"""
688
"""Show path of a file relative to root"""
722
689
723
690
takes_args = ['filename']
724
691
hidden = True
733
700
734
701
735
702
class cmd_inventory(Command):
736
__doc__ = """Show inventory of the current working copy or a revision.
703
"""Show inventory of the current working copy or a revision.
737
704
738
705
It is possible to limit the output to a particular entry
739
706
type using the --kind option. For example: --kind file.
760
727
761
728
revision = _get_one_revision('inventory', revision)
762
729
work_tree, file_list = tree_files(file_list)
763
self.add_cleanup(work_tree.lock_read().unlock)
764
if revision is not None:
765
tree = revision.as_tree(work_tree.branch)
766
767
extra_trees = [work_tree]
768
self.add_cleanup(tree.lock_read().unlock)
769
else:
770
tree = work_tree
771
extra_trees = []
772
773
if file_list is not None:
774
file_ids = tree.paths2ids(file_list, trees=extra_trees,
775
require_versioned=True)
776
# find_ids_across_trees may include some paths that don't
777
# exist in 'tree'.
778
entries = sorted((tree.id2path(file_id), tree.inventory[file_id])
779
for file_id in file_ids if file_id in tree)
780
else:
781
entries = tree.inventory.entries()
782
783
self.cleanup_now()
730
work_tree.lock_read()
731
try:
732
if revision is not None:
733
tree = revision.as_tree(work_tree.branch)
734
735
extra_trees = [work_tree]
736
tree.lock_read()
737
else:
738
tree = work_tree
739
extra_trees = []
740
741
if file_list is not None:
742
file_ids = tree.paths2ids(file_list, trees=extra_trees,
743
require_versioned=True)
744
# find_ids_across_trees may include some paths that don't
745
# exist in 'tree'.
746
entries = sorted((tree.id2path(file_id), tree.inventory[file_id])
747
for file_id in file_ids if file_id in tree)
748
else:
749
entries = tree.inventory.entries()
750
finally:
751
tree.unlock()
752
if tree is not work_tree:
753
work_tree.unlock()
754
784
755
for path, entry in entries:
785
756
if kind and kind != entry.kind:
786
757
continue
792
763
793
764
794
765
class cmd_mv(Command):
795
__doc__ = """Move or rename a file.
766
"""Move or rename a file.
796
767
797
768
:Usage:
798
769
bzr mv OLDNAME NEWNAME
831
802
if len(names_list) < 2:
832
803
raise errors.BzrCommandError("missing file argument")
833
804
tree, rel_names = tree_files(names_list, canonicalize=False)
834
self.add_cleanup(tree.lock_tree_write().unlock)
835
self._run(tree, names_list, rel_names, after)
805
tree.lock_tree_write()
806
try:
807
self._run(tree, names_list, rel_names, after)
808
finally:
809
tree.unlock()
836
810
837
811
def run_auto(self, names_list, after, dry_run):
838
812
if names_list is not None and len(names_list) > 1:
842
816
raise errors.BzrCommandError('--after cannot be specified with'
843
817
' --auto.')
844
818
work_tree, file_list = tree_files(names_list, default_branch='.')
845
self.add_cleanup(work_tree.lock_tree_write().unlock)
846
rename_map.RenameMap.guess_renames(work_tree, dry_run)
819
work_tree.lock_tree_write()
820
try:
821
rename_map.RenameMap.guess_renames(work_tree, dry_run)
822
finally:
823
work_tree.unlock()
847
824
848
825
def _run(self, tree, names_list, rel_names, after):
849
826
into_existing = osutils.isdir(names_list[-1])
870
847
# All entries reference existing inventory items, so fix them up
871
848
# for cicp file-systems.
872
849
rel_names = tree.get_canonical_inventory_paths(rel_names)
873
for src, dest in tree.move(rel_names[:-1], rel_names[-1], after=after):
874
if not is_quiet():
875
self.outf.write("%s => %s\n" % (src, dest))
850
for pair in tree.move(rel_names[:-1], rel_names[-1], after=after):
851
self.outf.write("%s => %s\n" % pair)
876
852
else:
877
853
if len(names_list) != 2:
878
854
raise errors.BzrCommandError('to mv multiple files the'
922
898
dest = osutils.pathjoin(dest_parent, dest_tail)
923
899
mutter("attempting to move %s => %s", src, dest)
924
900
tree.rename_one(src, dest, after=after)
925
if not is_quiet():
926
self.outf.write("%s => %s\n" % (src, dest))
901
self.outf.write("%s => %s\n" % (src, dest))
927
902
928
903
929
904
class cmd_pull(Command):
930
__doc__ = """Turn this branch into a mirror of another branch.
905
"""Turn this branch into a mirror of another branch.
931
906
932
By default, this command only works on branches that have not diverged.
933
Branches are considered diverged if the destination branch's most recent
934
commit is one that has not been merged (directly or indirectly) into the
935
parent.
907
This command only works on branches that have not diverged. Branches are
908
considered diverged if the destination branch's most recent commit is one
909
that has not been merged (directly or indirectly) into the parent.
936
910
937
911
If branches have diverged, you can use 'bzr merge' to integrate the changes
938
912
from one into the other. Once one branch has merged, the other should
939
913
be able to pull it again.
940
914
941
If you want to replace your local changes and just want your branch to
942
match the remote one, use pull --overwrite. This will work even if the two
943
branches have diverged.
915
If you want to forget your local changes and just update your branch to
916
match the remote one, use pull --overwrite.
944
917
945
918
If there is no default location set, the first pull will set it. After
946
919
that, you can omit the location to use the default. To change the
956
929
takes_options = ['remember', 'overwrite', 'revision',
957
930
custom_help('verbose',
958
931
help='Show logs of pulled revisions.'),
959
custom_help('directory',
932
Option('directory',
960
933
help='Branch to pull into, '
961
'rather than the one containing the working directory.'),
934
'rather than the one containing the working directory.',
935
short_name='d',
936
type=unicode,
937
),
962
938
Option('local',
963
939
help="Perform a local pull in a bound "
964
940
"branch. Local pulls are not applied to "
979
955
try:
980
956
tree_to = WorkingTree.open_containing(directory)[0]
981
957
branch_to = tree_to.branch
982
self.add_cleanup(tree_to.lock_write().unlock)
983
958
except errors.NoWorkingTree:
984
959
tree_to = None
985
960
branch_to = Branch.open_containing(directory)[0]
986
self.add_cleanup(branch_to.lock_write().unlock)
987
961
988
962
if local and not branch_to.get_bound_location():
989
963
raise errors.LocalRequiresBoundBranch()
990
964
1020
994
else:
1021
995
branch_from = Branch.open(location,
1022
996
possible_transports=possible_transports)
1023
self.add_cleanup(branch_from.lock_read().unlock)
1024
997
1025
998
if branch_to.get_parent() is None or remember:
1026
999
branch_to.set_parent(branch_from.base)
1027
1000
1028
if revision is not None:
1029
revision_id = revision.as_revision_id(branch_from)
1030
1031
if tree_to is not None:
1032
view_info = _get_view_info_for_change_reporter(tree_to)
1033
change_reporter = delta._ChangeReporter(
1034
unversioned_filter=tree_to.is_ignored,
1035
view_info=view_info)
1036
result = tree_to.pull(
1037
branch_from, overwrite, revision_id, change_reporter,
1038
possible_transports=possible_transports, local=local)
1039
else:
1040
result = branch_to.pull(
1041
branch_from, overwrite, revision_id, local=local)
1042
1043
result.report(self.outf)
1044
if verbose and result.old_revid != result.new_revid:
1045
log.show_branch_change(
1046
branch_to, self.outf, result.old_revno,
1047
result.old_revid)
1001
if branch_from is not branch_to:
1002
branch_from.lock_read()
1003
try:
1004
if revision is not None:
1005
revision_id = revision.as_revision_id(branch_from)
1006
1007
branch_to.lock_write()
1008
try:
1009
if tree_to is not None:
1010
view_info = _get_view_info_for_change_reporter(tree_to)
1011
change_reporter = delta._ChangeReporter(
1012
unversioned_filter=tree_to.is_ignored,
1013
view_info=view_info)
1014
result = tree_to.pull(
1015
branch_from, overwrite, revision_id, change_reporter,
1016
possible_transports=possible_transports, local=local)
1017
else:
1018
result = branch_to.pull(
1019
branch_from, overwrite, revision_id, local=local)
1020
1021
result.report(self.outf)
1022
if verbose and result.old_revid != result.new_revid:
1023
log.show_branch_change(
1024
branch_to, self.outf, result.old_revno,
1025
result.old_revid)
1026
finally:
1027
branch_to.unlock()
1028
finally:
1029
if branch_from is not branch_to:
1030
branch_from.unlock()
1048
1031
1049
1032
1050
1033
class cmd_push(Command):
1051
__doc__ = """Update a mirror of this branch.
1034
"""Update a mirror of this branch.
1052
1035
1053
1036
The target branch will not have its working tree populated because this
1054
1037
is both expensive, and is not supported on remote file systems.
1078
1061
Option('create-prefix',
1079
1062
help='Create the path leading up to the branch '
1080
1063
'if it does not already exist.'),
1081
custom_help('directory',
1064
Option('directory',
1082
1065
help='Branch to push from, '
1083
'rather than the one containing the working directory.'),
1066
'rather than the one containing the working directory.',
1067
short_name='d',
1068
type=unicode,
1069
),
1084
1070
Option('use-existing-dir',
1085
1071
help='By default push will fail if the target'
1086
1072
' directory exists, but does not already'
1112
1098
# Get the source branch
1113
1099
(tree, br_from,
1114
1100
_unused) = bzrdir.BzrDir.open_containing_tree_or_branch(directory)
1101
if strict is None:
1102
strict = br_from.get_config().get_user_option_as_bool('push_strict')
1103
if strict is None: strict = True # default value
1115
1104
# Get the tip's revision_id
1116
1105
revision = _get_one_revision('push', revision)
1117
1106
if revision is not None:
1118
1107
revision_id = revision.in_history(br_from).rev_id
1119
1108
else:
1120
1109
revision_id = None
1121
if tree is not None and revision_id is None:
1122
tree.check_changed_or_out_of_date(
1123
strict, 'push_strict',
1124
more_error='Use --no-strict to force the push.',
1125
more_warning='Uncommitted changes will not be pushed.')
1110
if strict and tree is not None and revision_id is None:
1111
if (tree.has_changes()):
1112
raise errors.UncommittedChanges(
1113
tree, more='Use --no-strict to force the push.')
1114
if tree.last_revision() != tree.branch.last_revision():
1115
# The tree has lost sync with its branch, there is little
1116
# chance that the user is aware of it but he can still force
1117
# the push with --no-strict
1118
raise errors.OutOfDateTree(
1119
tree, more='Use --no-strict to force the push.')
1120
1126
1121
# Get the stacked_on branch, if any
1127
1122
if stacked_on is not None:
1128
1123
stacked_on = urlutils.normalize_url(stacked_on)
1160
1155
1161
1156
1162
1157
class cmd_branch(Command):
1163
__doc__ = """Create a new branch that is a copy of an existing branch.
1158
"""Create a new branch that is a copy of an existing branch.
1164
1159
1165
1160
If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will
1166
1161
be used. In other words, "branch ../foo/bar" will attempt to create ./bar.
1193
1188
' directory exists, but does not already'
1194
1189
' have a control directory. This flag will'
1195
1190
' allow branch to proceed.'),
1196
Option('bind',
1197
help="Bind new branch to from location."),
1198
1191
]
1199
1192
aliases = ['get', 'clone']
1200
1193
1201
1194
def run(self, from_location, to_location=None, revision=None,
1202
1195
hardlink=False, stacked=False, standalone=False, no_tree=False,
1203
use_existing_dir=False, switch=False, bind=False):
1196
use_existing_dir=False, switch=False):
1204
1197
from bzrlib import switch as _mod_switch
1205
1198
from bzrlib.tag import _merge_tags_if_possible
1206
1199
accelerator_tree, br_from = bzrdir.BzrDir.open_tree_or_branch(
1207
1200
from_location)
1201
if (accelerator_tree is not None and
1202
accelerator_tree.supports_content_filtering()):
1203
accelerator_tree = None
1208
1204
revision = _get_one_revision('branch', revision)
1209
self.add_cleanup(br_from.lock_read().unlock)
1210
if revision is not None:
1211
revision_id = revision.as_revision_id(br_from)
1212
else:
1213
# FIXME - wt.last_revision, fallback to branch, fall back to
1214
# None or perhaps NULL_REVISION to mean copy nothing
1215
# RBC 20060209
1216
revision_id = br_from.last_revision()
1217
if to_location is None:
1218
to_location = urlutils.derive_to_location(from_location)
1219
to_transport = transport.get_transport(to_location)
1205
br_from.lock_read()
1220
1206
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)
1207
if revision is not None:
1208
revision_id = revision.as_revision_id(br_from)
1226
1209
else:
1227
try:
1228
bzrdir.BzrDir.open_from_transport(to_transport)
1229
except errors.NotBranchError:
1230
pass
1210
# FIXME - wt.last_revision, fallback to branch, fall back to
1211
# None or perhaps NULL_REVISION to mean copy nothing
1212
# RBC 20060209
1213
revision_id = br_from.last_revision()
1214
if to_location is None:
1215
to_location = urlutils.derive_to_location(from_location)
1216
to_transport = transport.get_transport(to_location)
1217
try:
1218
to_transport.mkdir('.')
1219
except errors.FileExists:
1220
if not use_existing_dir:
1221
raise errors.BzrCommandError('Target directory "%s" '
1222
'already exists.' % to_location)
1231
1223
else:
1232
raise errors.AlreadyBranchError(to_location)
1233
except errors.NoSuchFile:
1234
raise errors.BzrCommandError('Parent of "%s" does not exist.'
1235
% to_location)
1236
try:
1237
# preserve whatever source format we have.
1238
dir = br_from.bzrdir.sprout(to_transport.base, revision_id,
1239
possible_transports=[to_transport],
1240
accelerator_tree=accelerator_tree,
1241
hardlink=hardlink, stacked=stacked,
1242
force_new_repo=standalone,
1243
create_tree_if_local=not no_tree,
1244
source_branch=br_from)
1245
branch = dir.open_branch()
1246
except errors.NoSuchRevision:
1247
to_transport.delete_tree('.')
1248
msg = "The branch %s has no revision %s." % (from_location,
1249
revision)
1250
raise errors.BzrCommandError(msg)
1251
_merge_tags_if_possible(br_from, branch)
1252
# If the source branch is stacked, the new branch may
1253
# be stacked whether we asked for that explicitly or not.
1254
# We therefore need a try/except here and not just 'if stacked:'
1255
try:
1256
note('Created new stacked branch referring to %s.' %
1257
branch.get_stacked_on_url())
1258
except (errors.NotStacked, errors.UnstackableBranchFormat,
1259
errors.UnstackableRepositoryFormat), e:
1260
note('Branched %d revision(s).' % branch.revno())
1261
if bind:
1262
# Bind to the parent
1263
parent_branch = Branch.open(from_location)
1264
branch.bind(parent_branch)
1265
note('New branch bound to %s' % from_location)
1266
if switch:
1267
# Switch to the new branch
1268
wt, _ = WorkingTree.open_containing('.')
1269
_mod_switch.switch(wt.bzrdir, branch)
1270
note('Switched to branch: %s',
1271
urlutils.unescape_for_display(branch.base, 'utf-8'))
1224
try:
1225
bzrdir.BzrDir.open_from_transport(to_transport)
1226
except errors.NotBranchError:
1227
pass
1228
else:
1229
raise errors.AlreadyBranchError(to_location)
1230
except errors.NoSuchFile:
1231
raise errors.BzrCommandError('Parent of "%s" does not exist.'
1232
% to_location)
1233
try:
1234
# preserve whatever source format we have.
1235
dir = br_from.bzrdir.sprout(to_transport.base, revision_id,
1236
possible_transports=[to_transport],
1237
accelerator_tree=accelerator_tree,
1238
hardlink=hardlink, stacked=stacked,
1239
force_new_repo=standalone,
1240
create_tree_if_local=not no_tree,
1241
source_branch=br_from)
1242
branch = dir.open_branch()
1243
except errors.NoSuchRevision:
1244
to_transport.delete_tree('.')
1245
msg = "The branch %s has no revision %s." % (from_location,
1246
revision)
1247
raise errors.BzrCommandError(msg)
1248
_merge_tags_if_possible(br_from, branch)
1249
# If the source branch is stacked, the new branch may
1250
# be stacked whether we asked for that explicitly or not.
1251
# We therefore need a try/except here and not just 'if stacked:'
1252
try:
1253
note('Created new stacked branch referring to %s.' %
1254
branch.get_stacked_on_url())
1255
except (errors.NotStacked, errors.UnstackableBranchFormat,
1256
errors.UnstackableRepositoryFormat), e:
1257
note('Branched %d revision(s).' % branch.revno())
1258
if switch:
1259
# Switch to the new branch
1260
wt, _ = WorkingTree.open_containing('.')
1261
_mod_switch.switch(wt.bzrdir, branch)
1262
note('Switched to branch: %s',
1263
urlutils.unescape_for_display(branch.base, 'utf-8'))
1264
finally:
1265
br_from.unlock()
1272
1266
1273
1267
1274
1268
class cmd_checkout(Command):
1275
__doc__ = """Create a new checkout of an existing branch.
1269
"""Create a new checkout of an existing branch.
1276
1270
1277
1271
If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree for
1278
1272
the branch found in '.'. This is useful if you have removed the working tree
1336
1330
except errors.NoWorkingTree:
1337
1331
source.bzrdir.create_workingtree(revision_id)
1338
1332
return
1339
1340
if not lightweight:
1341
message = ('Copying history to "%s". '
1342
'To checkout without local history use --lightweight.' % to_location)
1343
ui.ui_factory.show_message(message)
1344
1333
source.create_checkout(to_location, revision_id, lightweight,
1345
1334
accelerator_tree, hardlink)
1346
1335
1347
1336
1348
1337
class cmd_renames(Command):
1349
__doc__ = """Show list of renamed files.
1338
"""Show list of renamed files.
1350
1339
"""
1351
1340
# TODO: Option to show renames between two historical versions.
1352
1341
1357
1346
@display_command
1358
1347
def run(self, dir=u'.'):
1359
1348
tree = WorkingTree.open_containing(dir)[0]
1360
self.add_cleanup(tree.lock_read().unlock)
1361
new_inv = tree.inventory
1362
old_tree = tree.basis_tree()
1363
self.add_cleanup(old_tree.lock_read().unlock)
1364
old_inv = old_tree.inventory
1365
renames = []
1366
iterator = tree.iter_changes(old_tree, include_unchanged=True)
1367
for f, paths, c, v, p, n, k, e in iterator:
1368
if paths[0] == paths[1]:
1369
continue
1370
if None in (paths):
1371
continue
1372
renames.append(paths)
1373
renames.sort()
1374
for old_name, new_name in renames:
1375
self.outf.write("%s => %s\n" % (old_name, new_name))
1349
tree.lock_read()
1350
try:
1351
new_inv = tree.inventory
1352
old_tree = tree.basis_tree()
1353
old_tree.lock_read()
1354
try:
1355
old_inv = old_tree.inventory
1356
renames = []
1357
iterator = tree.iter_changes(old_tree, include_unchanged=True)
1358
for f, paths, c, v, p, n, k, e in iterator:
1359
if paths[0] == paths[1]:
1360
continue
1361
if None in (paths):
1362
continue
1363
renames.append(paths)
1364
renames.sort()
1365
for old_name, new_name in renames:
1366
self.outf.write("%s => %s\n" % (old_name, new_name))
1367
finally:
1368
old_tree.unlock()
1369
finally:
1370
tree.unlock()
1376
1371
1377
1372
1378
1373
class cmd_update(Command):
1379
__doc__ = """Update a tree to have the latest code committed to its branch.
1374
"""Update a tree to have the latest code committed to its branch.
1380
1375
1381
1376
This will perform a merge into the working tree, and may generate
1382
1377
conflicts. If you have any local changes, you will still
1384
1379
1385
1380
If you want to discard your local changes, you can just do a
1386
1381
'bzr revert' instead of 'bzr commit' after the update.
1387
1388
If the tree's branch is bound to a master branch, it will also update
1389
the branch from the master.
1390
1382
"""
1391
1383
1392
1384
_see_also = ['pull', 'working-trees', 'status-flags']
1393
1385
takes_args = ['dir?']
1394
takes_options = ['revision']
1395
1386
aliases = ['up']
1396
1387
1397
def run(self, dir='.', revision=None):
1398
if revision is not None and len(revision) != 1:
1399
raise errors.BzrCommandError(
1400
"bzr update --revision takes exactly one revision")
1388
def run(self, dir='.'):
1401
1389
tree = WorkingTree.open_containing(dir)[0]
1402
branch = tree.branch
1403
1390
possible_transports = []
1404
master = branch.get_master_branch(
1391
master = tree.branch.get_master_branch(
1405
1392
possible_transports=possible_transports)
1406
1393
if master is not None:
1407
branch_location = master.base
1408
1394
tree.lock_write()
1409
1395
else:
1410
branch_location = tree.branch.base
1411
1396
tree.lock_tree_write()
1412
self.add_cleanup(tree.unlock)
1413
# get rid of the final '/' and be ready for display
1414
branch_location = urlutils.unescape_for_display(
1415
branch_location.rstrip('/'),
1416
self.outf.encoding)
1417
existing_pending_merges = tree.get_parent_ids()[1:]
1418
if master is None:
1419
old_tip = None
1420
else:
1421
# may need to fetch data into a heavyweight checkout
1422
# XXX: this may take some time, maybe we should display a
1423
# message
1424
old_tip = branch.update(possible_transports)
1425
if revision is not None:
1426
revision_id = revision[0].as_revision_id(branch)
1427
else:
1428
revision_id = branch.last_revision()
1429
if revision_id == _mod_revision.ensure_null(tree.last_revision()):
1430
revno = branch.revision_id_to_dotted_revno(revision_id)
1431
note("Tree is up to date at revision %s of branch %s" %
1432
('.'.join(map(str, revno)), branch_location))
1433
return 0
1434
view_info = _get_view_info_for_change_reporter(tree)
1435
change_reporter = delta._ChangeReporter(
1436
unversioned_filter=tree.is_ignored,
1437
view_info=view_info)
1438
1397
try:
1398
existing_pending_merges = tree.get_parent_ids()[1:]
1399
last_rev = _mod_revision.ensure_null(tree.last_revision())
1400
if last_rev == _mod_revision.ensure_null(
1401
tree.branch.last_revision()):
1402
# may be up to date, check master too.
1403
if master is None or last_rev == _mod_revision.ensure_null(
1404
master.last_revision()):
1405
revno = tree.branch.revision_id_to_revno(last_rev)
1406
note("Tree is up to date at revision %d." % (revno,))
1407
return 0
1408
view_info = _get_view_info_for_change_reporter(tree)
1439
1409
conflicts = tree.update(
1440
change_reporter,
1441
possible_transports=possible_transports,
1442
revision=revision_id,
1443
old_tip=old_tip)
1444
except errors.NoSuchRevision, e:
1445
raise errors.BzrCommandError(
1446
"branch has no revision %s\n"
1447
"bzr update --revision only works"
1448
" for a revision in the branch history"
1449
% (e.revision))
1450
revno = tree.branch.revision_id_to_dotted_revno(
1451
_mod_revision.ensure_null(tree.last_revision()))
1452
note('Updated to revision %s of branch %s' %
1453
('.'.join(map(str, revno)), branch_location))
1454
parent_ids = tree.get_parent_ids()
1455
if parent_ids[1:] and parent_ids[1:] != existing_pending_merges:
1456
note('Your local commits will now show as pending merges with '
1457
"'bzr status', and can be committed with 'bzr commit'.")
1458
if conflicts != 0:
1459
return 1
1460
else:
1461
return 0
1410
delta._ChangeReporter(unversioned_filter=tree.is_ignored,
1411
view_info=view_info), possible_transports=possible_transports)
1412
revno = tree.branch.revision_id_to_revno(
1413
_mod_revision.ensure_null(tree.last_revision()))
1414
note('Updated to revision %d.' % (revno,))
1415
if tree.get_parent_ids()[1:] != existing_pending_merges:
1416
note('Your local commits will now show as pending merges with '
1417
"'bzr status', and can be committed with 'bzr commit'.")
1418
if conflicts != 0:
1419
return 1
1420
else:
1421
return 0
1422
finally:
1423
tree.unlock()
1462
1424
1463
1425
1464
1426
class cmd_info(Command):
1465
__doc__ = """Show information about a working tree, branch or repository.
1427
"""Show information about a working tree, branch or repository.
1466
1428
1467
1429
This command will show all known locations and formats associated to the
1468
1430
tree, branch or repository.
1506
1468
1507
1469
1508
1470
class cmd_remove(Command):
1509
__doc__ = """Remove files or directories.
1471
"""Remove files or directories.
1510
1472
1511
1473
This makes bzr stop tracking changes to the specified files. bzr will delete
1512
1474
them if they can easily be recovered using revert. If no options or
1534
1496
if file_list is not None:
1535
1497
file_list = [f for f in file_list]
1536
1498
1537
self.add_cleanup(tree.lock_write().unlock)
1538
# Heuristics should probably all move into tree.remove_smart or
1539
# some such?
1540
if new:
1541
added = tree.changes_from(tree.basis_tree(),
1542
specific_files=file_list).added
1543
file_list = sorted([f[0] for f in added], reverse=True)
1544
if len(file_list) == 0:
1545
raise errors.BzrCommandError('No matching files.')
1546
elif file_list is None:
1547
# missing files show up in iter_changes(basis) as
1548
# versioned-with-no-kind.
1549
missing = []
1550
for change in tree.iter_changes(tree.basis_tree()):
1551
# Find paths in the working tree that have no kind:
1552
if change[1][1] is not None and change[6][1] is None:
1553
missing.append(change[1][1])
1554
file_list = sorted(missing, reverse=True)
1555
file_deletion_strategy = 'keep'
1556
tree.remove(file_list, verbose=verbose, to_file=self.outf,
1557
keep_files=file_deletion_strategy=='keep',
1558
force=file_deletion_strategy=='force')
1499
tree.lock_write()
1500
try:
1501
# Heuristics should probably all move into tree.remove_smart or
1502
# some such?
1503
if new:
1504
added = tree.changes_from(tree.basis_tree(),
1505
specific_files=file_list).added
1506
file_list = sorted([f[0] for f in added], reverse=True)
1507
if len(file_list) == 0:
1508
raise errors.BzrCommandError('No matching files.')
1509
elif file_list is None:
1510
# missing files show up in iter_changes(basis) as
1511
# versioned-with-no-kind.
1512
missing = []
1513
for change in tree.iter_changes(tree.basis_tree()):
1514
# Find paths in the working tree that have no kind:
1515
if change[1][1] is not None and change[6][1] is None:
1516
missing.append(change[1][1])
1517
file_list = sorted(missing, reverse=True)
1518
file_deletion_strategy = 'keep'
1519
tree.remove(file_list, verbose=verbose, to_file=self.outf,
1520
keep_files=file_deletion_strategy=='keep',
1521
force=file_deletion_strategy=='force')
1522
finally:
1523
tree.unlock()
1559
1524
1560
1525
1561
1526
class cmd_file_id(Command):
1562
__doc__ = """Print file_id of a particular file or directory.
1527
"""Print file_id of a particular file or directory.
1563
1528
1564
1529
The file_id is assigned when the file is first added and remains the
1565
1530
same through all revisions where the file exists, even when it is
1581
1546
1582
1547
1583
1548
class cmd_file_path(Command):
1584
__doc__ = """Print path of file_ids to a file or directory.
1549
"""Print path of file_ids to a file or directory.
1585
1550
1586
1551
This prints one line for each directory down to the target,
1587
1552
starting at the branch root.
1603
1568
1604
1569
1605
1570
class cmd_reconcile(Command):
1606
__doc__ = """Reconcile bzr metadata in a branch.
1571
"""Reconcile bzr metadata in a branch.
1607
1572
1608
1573
This can correct data mismatches that may have been caused by
1609
1574
previous ghost operations or bzr upgrades. You should only
1631
1596
1632
1597
1633
1598
class cmd_revision_history(Command):
1634
__doc__ = """Display the list of revision ids on a branch."""
1599
"""Display the list of revision ids on a branch."""
1635
1600
1636
1601
_see_also = ['log']
1637
1602
takes_args = ['location?']
1647
1612
1648
1613
1649
1614
class cmd_ancestry(Command):
1650
__doc__ = """List all revisions merged into this branch."""
1615
"""List all revisions merged into this branch."""
1651
1616
1652
1617
_see_also = ['log', 'revision-history']
1653
1618
takes_args = ['location?']
1672
1637
1673
1638
1674
1639
class cmd_init(Command):
1675
__doc__ = """Make a directory into a versioned branch.
1640
"""Make a directory into a versioned branch.
1676
1641
1677
1642
Use this to create an empty branch, or before importing an
1678
1643
existing project.
1781
1746
1782
1747
1783
1748
class cmd_init_repository(Command):
1784
__doc__ = """Create a shared repository for branches to share storage space.
1749
"""Create a shared repository to hold branches.
1785
1750
1786
1751
New branches created under the repository directory will store their
1787
revisions in the repository, not in the branch directory. For branches
1788
with shared history, this reduces the amount of storage needed and
1789
speeds up the creation of new branches.
1752
revisions in the repository, not in the branch directory.
1790
1753
1791
If the --no-trees option is given then the branches in the repository
1792
will not have working trees by default. They will still exist as
1793
directories on disk, but they will not have separate copies of the
1794
files at a certain revision. This can be useful for repositories that
1795
store branches which are interacted with through checkouts or remote
1796
branches, such as on a server.
1754
If the --no-trees option is used then the branches in the repository
1755
will not have working trees by default.
1797
1756
1798
1757
:Examples:
1799
Create a shared repository holding just branches::
1758
Create a shared repositories holding just branches::
1800
1759
1801
1760
bzr init-repo --no-trees repo
1802
1761
bzr init repo/trunk
1841
1800
1842
1801
1843
1802
class cmd_diff(Command):
1844
__doc__ = """Show differences in the working tree, between revisions or branches.
1803
"""Show differences in the working tree, between revisions or branches.
1845
1804
1846
1805
If no arguments are given, all changes for the current tree are listed.
1847
1806
If files are given, only the changes in those files are listed.
1868
1827
1869
1828
bzr diff -r1
1870
1829
1871
Difference between revision 3 and revision 1::
1872
1873
bzr diff -r1..3
1874
1875
Difference between revision 3 and revision 1 for branch xxx::
1876
1877
bzr diff -r1..3 xxx
1878
1879
To see the changes introduced in revision X::
1880
1881
bzr diff -cX
1882
1883
Note that in the case of a merge, the -c option shows the changes
1884
compared to the left hand parent. To see the changes against
1885
another parent, use::
1886
1887
bzr diff -r<chosen_parent>..X
1888
1889
The changes introduced by revision 2 (equivalent to -r1..2)::
1890
1891
bzr diff -c2
1830
Difference between revision 2 and revision 1::
1831
1832
bzr diff -r1..2
1833
1834
Difference between revision 2 and revision 1 for branch xxx::
1835
1836
bzr diff -r1..2 xxx
1892
1837
1893
1838
Show just the differences for file NEWS::
1894
1839
1933
1878
help='Use this command to compare files.',
1934
1879
type=unicode,
1935
1880
),
1936
RegistryOption('format',
1937
help='Diff format to use.',
1938
lazy_registry=('bzrlib.diff', 'format_registry'),
1939
value_switches=False, title='Diff format'),
1940
1881
]
1941
1882
aliases = ['di', 'dif']
1942
1883
encoding_type = 'exact'
1943
1884
1944
1885
@display_command
1945
1886
def run(self, revision=None, file_list=None, diff_options=None,
1946
prefix=None, old=None, new=None, using=None, format=None):
1947
from bzrlib.diff import (get_trees_and_branches_to_diff_locked,
1948
show_diff_trees)
1887
prefix=None, old=None, new=None, using=None):
1888
from bzrlib.diff import _get_trees_to_diff, show_diff_trees
1949
1889
1950
1890
if (prefix is None) or (prefix == '0'):
1951
1891
# diff -p0 format
1965
1905
raise errors.BzrCommandError('bzr diff --revision takes exactly'
1966
1906
' one or two revision specifiers')
1967
1907
1968
if using is not None and format is not None:
1969
raise errors.BzrCommandError('--using and --format are mutually '
1970
'exclusive.')
1971
1972
(old_tree, new_tree,
1973
old_branch, new_branch,
1974
specific_files, extra_trees) = get_trees_and_branches_to_diff_locked(
1975
file_list, revision, old, new, self.add_cleanup, apply_view=True)
1908
old_tree, new_tree, specific_files, extra_trees = \
1909
_get_trees_to_diff(file_list, revision, old, new,
1910
apply_view=True)
1976
1911
return show_diff_trees(old_tree, new_tree, sys.stdout,
1977
1912
specific_files=specific_files,
1978
1913
external_diff_options=diff_options,
1979
1914
old_label=old_label, new_label=new_label,
1980
extra_trees=extra_trees, using=using,
1981
format_cls=format)
1915
extra_trees=extra_trees, using=using)
1982
1916
1983
1917
1984
1918
class cmd_deleted(Command):
1985
__doc__ = """List files deleted in the working tree.
1919
"""List files deleted in the working tree.
1986
1920
"""
1987
1921
# TODO: Show files deleted since a previous revision, or
1988
1922
# between two revisions.
1991
1925
# level of effort but possibly much less IO. (Or possibly not,
1992
1926
# if the directories are very large...)
1993
1927
_see_also = ['status', 'ls']
1994
takes_options = ['directory', 'show-ids']
1928
takes_options = ['show-ids']
1995
1929
1996
1930
@display_command
1997
def run(self, show_ids=False, directory=u'.'):
1998
tree = WorkingTree.open_containing(directory)[0]
1999
self.add_cleanup(tree.lock_read().unlock)
2000
old = tree.basis_tree()
2001
self.add_cleanup(old.lock_read().unlock)
2002
for path, ie in old.inventory.iter_entries():
2003
if not tree.has_id(ie.file_id):
2004
self.outf.write(path)
2005
if show_ids:
2006
self.outf.write(' ')
2007
self.outf.write(ie.file_id)
2008
self.outf.write('\n')
1931
def run(self, show_ids=False):
1932
tree = WorkingTree.open_containing(u'.')[0]
1933
tree.lock_read()
1934
try:
1935
old = tree.basis_tree()
1936
old.lock_read()
1937
try:
1938
for path, ie in old.inventory.iter_entries():
1939
if not tree.has_id(ie.file_id):
1940
self.outf.write(path)
1941
if show_ids:
1942
self.outf.write(' ')
1943
self.outf.write(ie.file_id)
1944
self.outf.write('\n')
1945
finally:
1946
old.unlock()
1947
finally:
1948
tree.unlock()
2009
1949
2010
1950
2011
1951
class cmd_modified(Command):
2012
__doc__ = """List files modified in working tree.
1952
"""List files modified in working tree.
2013
1953
"""
2014
1954
2015
1955
hidden = True
2016
1956
_see_also = ['status', 'ls']
2017
takes_options = ['directory', 'null']
1957
takes_options = [
1958
Option('null',
1959
help='Write an ascii NUL (\\0) separator '
1960
'between files rather than a newline.')
1961
]
2018
1962
2019
1963
@display_command
2020
def run(self, null=False, directory=u'.'):
2021
tree = WorkingTree.open_containing(directory)[0]
1964
def run(self, null=False):
1965
tree = WorkingTree.open_containing(u'.')[0]
2022
1966
td = tree.changes_from(tree.basis_tree())
2023
1967
for path, id, kind, text_modified, meta_modified in td.modified:
2024
1968
if null:
2028
1972
2029
1973
2030
1974
class cmd_added(Command):
2031
__doc__ = """List files added in working tree.
1975
"""List files added in working tree.
2032
1976
"""
2033
1977
2034
1978
hidden = True
2035
1979
_see_also = ['status', 'ls']
2036
takes_options = ['directory', 'null']
1980
takes_options = [
1981
Option('null',
1982
help='Write an ascii NUL (\\0) separator '
1983
'between files rather than a newline.')
1984
]
2037
1985
2038
1986
@display_command
2039
def run(self, null=False, directory=u'.'):
2040
wt = WorkingTree.open_containing(directory)[0]
2041
self.add_cleanup(wt.lock_read().unlock)
2042
basis = wt.basis_tree()
2043
self.add_cleanup(basis.lock_read().unlock)
2044
basis_inv = basis.inventory
2045
inv = wt.inventory
2046
for file_id in inv:
2047
if file_id in basis_inv:
2048
continue
2049
if inv.is_root(file_id) and len(basis_inv) == 0:
2050
continue
2051
path = inv.id2path(file_id)
2052
if not os.access(osutils.pathjoin(wt.basedir, path), os.F_OK):
2053
continue
2054
if null:
2055
self.outf.write(path + '\0')
2056
else:
2057
self.outf.write(osutils.quotefn(path) + '\n')
1987
def run(self, null=False):
1988
wt = WorkingTree.open_containing(u'.')[0]
1989
wt.lock_read()
1990
try:
1991
basis = wt.basis_tree()
1992
basis.lock_read()
1993
try:
1994
basis_inv = basis.inventory
1995
inv = wt.inventory
1996
for file_id in inv:
1997
if file_id in basis_inv:
1998
continue
1999
if inv.is_root(file_id) and len(basis_inv) == 0:
2000
continue
2001
path = inv.id2path(file_id)
2002
if not os.access(osutils.abspath(path), os.F_OK):
2003
continue
2004
if null:
2005
self.outf.write(path + '\0')
2006
else:
2007
self.outf.write(osutils.quotefn(path) + '\n')
2008
finally:
2009
basis.unlock()
2010
finally:
2011
wt.unlock()
2058
2012
2059
2013
2060
2014
class cmd_root(Command):
2061
__doc__ = """Show the tree root directory.
2015
"""Show the tree root directory.
2062
2016
2063
2017
The root is the nearest enclosing directory with a .bzr control
2064
2018
directory."""
2088
2042
2089
2043
2090
2044
class cmd_log(Command):
2091
__doc__ = """Show historical log for a branch or subset of a branch.
2045
"""Show historical log for a branch or subset of a branch.
2092
2046
2093
2047
log is bzr's default tool for exploring the history of a branch.
2094
2048
The branch to use is taken from the first parameter. If no parameters
2205
2159
:Tips & tricks:
2206
2160
2207
2161
GUI tools and IDEs are often better at exploring history than command
2208
line tools: you may prefer qlog or viz from qbzr or bzr-gtk, the
2209
bzr-explorer shell, or the Loggerhead web interface. See the Plugin
2210
Guide <http://doc.bazaar.canonical.com/plugins/en/> and
2211
<http://wiki.bazaar.canonical.com/IDEIntegration>.
2162
line tools. You may prefer qlog or glog from the QBzr and Bzr-Gtk packages
2163
respectively for example. (TortoiseBzr uses qlog for displaying logs.) See
2164
http://bazaar-vcs.org/BzrPlugins and http://bazaar-vcs.org/IDEIntegration.
2165
2166
Web interfaces are often better at exploring history than command line
2167
tools, particularly for branches on servers. You may prefer Loggerhead
2168
or one of its alternatives. See http://bazaar-vcs.org/WebInterface.
2212
2169
2213
2170
You may find it useful to add the aliases below to ``bazaar.conf``::
2214
2171
2255
2212
help='Show just the specified revision.'
2256
2213
' See also "help revisionspec".'),
2257
2214
'log-format',
2258
RegistryOption('authors',
2259
'What names to list as authors - first, all or committer.',
2260
title='Authors',
2261
lazy_registry=('bzrlib.log', 'author_list_registry'),
2262
),
2263
2215
Option('levels',
2264
2216
short_name='n',
2265
2217
help='Number of levels to display - 0 for all, 1 for flat.',
2280
2232
help='Show changes made in each revision as a patch.'),
2281
2233
Option('include-merges',
2282
2234
help='Show merged revisions like --levels 0 does.'),
2283
Option('exclude-common-ancestry',
2284
help='Display only the revisions that are not part'
2285
' of both ancestries (require -rX..Y)'
2286
)
2287
2235
]
2288
2236
encoding_type = 'replace'
2289
2237
2299
2247
message=None,
2300
2248
limit=None,
2301
2249
show_diff=False,
2302
include_merges=False,
2303
authors=None,
2304
exclude_common_ancestry=False,
2305
):
2250
include_merges=False):
2306
2251
from bzrlib.log import (
2307
2252
Logger,
2308
2253
make_log_request_dict,
2309
2254
_get_info_for_log_files,
2310
2255
)
2311
2256
direction = (forward and 'forward') or 'reverse'
2312
if (exclude_common_ancestry
2313
and (revision is None or len(revision) != 2)):
2314
raise errors.BzrCommandError(
2315
'--exclude-common-ancestry requires -r with two revisions')
2316
2257
if include_merges:
2317
2258
if levels is None:
2318
2259
levels = 0
2333
2274
filter_by_dir = False
2334
2275
if file_list:
2335
2276
# find the file ids to log and check for directory filtering
2336
b, file_info_list, rev1, rev2 = _get_info_for_log_files(
2337
revision, file_list, self.add_cleanup)
2277
b, file_info_list, rev1, rev2 = _get_info_for_log_files(revision,
2278
file_list)
2338
2279
for relpath, file_id, kind in file_info_list:
2339
2280
if file_id is None:
2340
2281
raise errors.BzrCommandError(
2358
2299
location = '.'
2359
2300
dir, relpath = bzrdir.BzrDir.open_containing(location)
2360
2301
b = dir.open_branch()
2361
self.add_cleanup(b.lock_read().unlock)
2362
2302
rev1, rev2 = _get_revision_range(revision, b, self.name())
2363
2303
2364
2304
# Decide on the type of delta & diff filtering to use
2374
2314
else:
2375
2315
diff_type = 'full'
2376
2316
2377
# Build the log formatter
2378
if log_format is None:
2379
log_format = log.log_formatter_registry.get_default(b)
2380
# Make a non-encoding output to include the diffs - bug 328007
2381
unencoded_output = ui.ui_factory.make_output_stream(encoding_type='exact')
2382
lf = log_format(show_ids=show_ids, to_file=self.outf,
2383
to_exact_file=unencoded_output,
2384
show_timezone=timezone,
2385
delta_format=get_verbosity_level(),
2386
levels=levels,
2387
show_advice=levels is None,
2388
author_list_handler=authors)
2389
2390
# Choose the algorithm for doing the logging. It's annoying
2391
# having multiple code paths like this but necessary until
2392
# the underlying repository format is faster at generating
2393
# deltas or can provide everything we need from the indices.
2394
# The default algorithm - match-using-deltas - works for
2395
# multiple files and directories and is faster for small
2396
# amounts of history (200 revisions say). However, it's too
2397
# slow for logging a single file in a repository with deep
2398
# history, i.e. > 10K revisions. In the spirit of "do no
2399
# evil when adding features", we continue to use the
2400
# original algorithm - per-file-graph - for the "single
2401
# file that isn't a directory without showing a delta" case.
2402
partial_history = revision and b.repository._format.supports_chks
2403
match_using_deltas = (len(file_ids) != 1 or filter_by_dir
2404
or delta_type or partial_history)
2405
2406
# Build the LogRequest and execute it
2407
if len(file_ids) == 0:
2408
file_ids = None
2409
rqst = make_log_request_dict(
2410
direction=direction, specific_fileids=file_ids,
2411
start_revision=rev1, end_revision=rev2, limit=limit,
2412
message_search=message, delta_type=delta_type,
2413
diff_type=diff_type, _match_using_deltas=match_using_deltas,
2414
exclude_common_ancestry=exclude_common_ancestry,
2415
)
2416
Logger(b, rqst).show(lf)
2317
b.lock_read()
2318
try:
2319
# Build the log formatter
2320
if log_format is None:
2321
log_format = log.log_formatter_registry.get_default(b)
2322
lf = log_format(show_ids=show_ids, to_file=self.outf,
2323
show_timezone=timezone,
2324
delta_format=get_verbosity_level(),
2325
levels=levels,
2326
show_advice=levels is None)
2327
2328
# Choose the algorithm for doing the logging. It's annoying
2329
# having multiple code paths like this but necessary until
2330
# the underlying repository format is faster at generating
2331
# deltas or can provide everything we need from the indices.
2332
# The default algorithm - match-using-deltas - works for
2333
# multiple files and directories and is faster for small
2334
# amounts of history (200 revisions say). However, it's too
2335
# slow for logging a single file in a repository with deep
2336
# history, i.e. > 10K revisions. In the spirit of "do no
2337
# evil when adding features", we continue to use the
2338
# original algorithm - per-file-graph - for the "single
2339
# file that isn't a directory without showing a delta" case.
2340
partial_history = revision and b.repository._format.supports_chks
2341
match_using_deltas = (len(file_ids) != 1 or filter_by_dir
2342
or delta_type or partial_history)
2343
2344
# Build the LogRequest and execute it
2345
if len(file_ids) == 0:
2346
file_ids = None
2347
rqst = make_log_request_dict(
2348
direction=direction, specific_fileids=file_ids,
2349
start_revision=rev1, end_revision=rev2, limit=limit,
2350
message_search=message, delta_type=delta_type,
2351
diff_type=diff_type, _match_using_deltas=match_using_deltas)
2352
Logger(b, rqst).show(lf)
2353
finally:
2354
b.unlock()
2417
2355
2418
2356
2419
2357
def _get_revision_range(revisionspec_list, branch, command_name):
2437
2375
raise errors.BzrCommandError(
2438
2376
"bzr %s doesn't accept two revisions in different"
2439
2377
" branches." % command_name)
2440
if start_spec.spec is None:
2441
# Avoid loading all the history.
2442
rev1 = RevisionInfo(branch, None, None)
2443
else:
2444
rev1 = start_spec.in_history(branch)
2378
rev1 = start_spec.in_history(branch)
2445
2379
# Avoid loading all of history when we know a missing
2446
2380
# end of range means the last revision ...
2447
2381
if end_spec.spec is None:
2476
2410
2477
2411
2478
2412
class cmd_touching_revisions(Command):
2479
__doc__ = """Return revision-ids which affected a particular file.
2413
"""Return revision-ids which affected a particular file.
2480
2414
2481
2415
A more user-friendly interface is "bzr log FILE".
2482
2416
"""
2487
2421
@display_command
2488
2422
def run(self, filename):
2489
2423
tree, relpath = WorkingTree.open_containing(filename)
2424
b = tree.branch
2490
2425
file_id = tree.path2id(relpath)
2491
b = tree.branch
2492
self.add_cleanup(b.lock_read().unlock)
2493
touching_revs = log.find_touching_revisions(b, file_id)
2494
for revno, revision_id, what in touching_revs:
2426
for revno, revision_id, what in log.find_touching_revisions(b, file_id):
2495
2427
self.outf.write("%6d %s\n" % (revno, what))
2496
2428
2497
2429
2498
2430
class cmd_ls(Command):
2499
__doc__ = """List files in a tree.
2431
"""List files in a tree.
2500
2432
"""
2501
2433
2502
2434
_see_also = ['status', 'cat']
2508
2440
help='Recurse into subdirectories.'),
2509
2441
Option('from-root',
2510
2442
help='Print paths relative to the root of the branch.'),
2511
Option('unknown', short_name='u',
2512
help='Print unknown files.'),
2443
Option('unknown', help='Print unknown files.'),
2513
2444
Option('versioned', help='Print versioned files.',
2514
2445
short_name='V'),
2515
Option('ignored', short_name='i',
2516
help='Print ignored files.'),
2517
Option('kind', short_name='k',
2446
Option('ignored', help='Print ignored files.'),
2447
Option('null',
2448
help='Write an ascii NUL (\\0) separator '
2449
'between files rather than a newline.'),
2450
Option('kind',
2518
2451
help='List entries of a particular kind: file, directory, symlink.',
2519
2452
type=unicode),
2520
'null',
2521
2453
'show-ids',
2522
'directory',
2523
2454
]
2524
2455
@display_command
2525
2456
def run(self, revision=None, verbose=False,
2526
2457
recursive=False, from_root=False,
2527
2458
unknown=False, versioned=False, ignored=False,
2528
null=False, kind=None, show_ids=False, path=None, directory=None):
2459
null=False, kind=None, show_ids=False, path=None):
2529
2460
2530
2461
if kind and kind not in ('file', 'directory', 'symlink'):
2531
2462
raise errors.BzrCommandError('invalid kind specified')
2543
2474
raise errors.BzrCommandError('cannot specify both --from-root'
2544
2475
' and PATH')
2545
2476
fs_path = path
2546
tree, branch, relpath = \
2547
_open_directory_or_containing_tree_or_branch(fs_path, directory)
2477
tree, branch, relpath = bzrdir.BzrDir.open_containing_tree_or_branch(
2478
fs_path)
2548
2479
2549
2480
# Calculate the prefix to use
2550
2481
prefix = None
2551
2482
if from_root:
2552
2483
if relpath:
2553
2484
prefix = relpath + '/'
2554
elif fs_path != '.' and not fs_path.endswith('/'):
2485
elif fs_path != '.':
2555
2486
prefix = fs_path + '/'
2556
2487
2557
2488
if revision is not None or tree is None:
2565
2496
view_str = views.view_display_str(view_files)
2566
2497
note("Ignoring files outside view. View is %s" % view_str)
2567
2498
2568
self.add_cleanup(tree.lock_read().unlock)
2569
for fp, fc, fkind, fid, entry in tree.list_files(include_root=False,
2570
from_dir=relpath, recursive=recursive):
2571
# Apply additional masking
2572
if not all and not selection[fc]:
2573
continue
2574
if kind is not None and fkind != kind:
2575
continue
2576
if apply_view:
2577
try:
2578
if relpath:
2579
fullpath = osutils.pathjoin(relpath, fp)
2580
else:
2581
fullpath = fp
2582
views.check_path_in_view(tree, fullpath)
2583
except errors.FileOutsideView:
2584
continue
2499
tree.lock_read()
2500
try:
2501
for fp, fc, fkind, fid, entry in tree.list_files(include_root=False,
2502
from_dir=relpath, recursive=recursive):
2503
# Apply additional masking
2504
if not all and not selection[fc]:
2505
continue
2506
if kind is not None and fkind != kind:
2507
continue
2508
if apply_view:
2509
try:
2510
if relpath:
2511
fullpath = osutils.pathjoin(relpath, fp)
2512
else:
2513
fullpath = fp
2514
views.check_path_in_view(tree, fullpath)
2515
except errors.FileOutsideView:
2516
continue
2585
2517
2586
# Output the entry
2587
if prefix:
2588
fp = osutils.pathjoin(prefix, fp)
2589
kindch = entry.kind_character()
2590
outstring = fp + kindch
2591
ui.ui_factory.clear_term()
2592
if verbose:
2593
outstring = '%-8s %s' % (fc, outstring)
2594
if show_ids and fid is not None:
2595
outstring = "%-50s %s" % (outstring, fid)
2596
self.outf.write(outstring + '\n')
2597
elif null:
2598
self.outf.write(fp + '\0')
2599
if show_ids:
2600
if fid is not None:
2601
self.outf.write(fid)
2602
self.outf.write('\0')
2603
self.outf.flush()
2604
else:
2605
if show_ids:
2606
if fid is not None:
2607
my_id = fid
2608
else:
2609
my_id = ''
2610
self.outf.write('%-50s %s\n' % (outstring, my_id))
2611
else:
2518
# Output the entry
2519
if prefix:
2520
fp = osutils.pathjoin(prefix, fp)
2521
kindch = entry.kind_character()
2522
outstring = fp + kindch
2523
ui.ui_factory.clear_term()
2524
if verbose:
2525
outstring = '%-8s %s' % (fc, outstring)
2526
if show_ids and fid is not None:
2527
outstring = "%-50s %s" % (outstring, fid)
2612
2528
self.outf.write(outstring + '\n')
2529
elif null:
2530
self.outf.write(fp + '\0')
2531
if show_ids:
2532
if fid is not None:
2533
self.outf.write(fid)
2534
self.outf.write('\0')
2535
self.outf.flush()
2536
else:
2537
if show_ids:
2538
if fid is not None:
2539
my_id = fid
2540
else:
2541
my_id = ''
2542
self.outf.write('%-50s %s\n' % (outstring, my_id))
2543
else:
2544
self.outf.write(outstring + '\n')
2545
finally:
2546
tree.unlock()
2613
2547
2614
2548
2615
2549
class cmd_unknowns(Command):
2616
__doc__ = """List unknown files.
2550
"""List unknown files.
2617
2551
"""
2618
2552
2619
2553
hidden = True
2620
2554
_see_also = ['ls']
2621
takes_options = ['directory']
2622
2555
2623
2556
@display_command
2624
def run(self, directory=u'.'):
2625
for f in WorkingTree.open_containing(directory)[0].unknowns():
2557
def run(self):
2558
for f in WorkingTree.open_containing(u'.')[0].unknowns():
2626
2559
self.outf.write(osutils.quotefn(f) + '\n')
2627
2560
2628
2561
2629
2562
class cmd_ignore(Command):
2630
__doc__ = """Ignore specified files or patterns.
2563
"""Ignore specified files or patterns.
2631
2564
2632
2565
See ``bzr help patterns`` for details on the syntax of patterns.
2633
2566
2634
If a .bzrignore file does not exist, the ignore command
2635
will create one and add the specified files or patterns to the newly
2636
created file. The ignore command will also automatically add the
2637
.bzrignore file to be versioned. Creating a .bzrignore file without
2638
the use of the ignore command will require an explicit add command.
2639
2640
2567
To remove patterns from the ignore list, edit the .bzrignore file.
2641
2568
After adding, editing or deleting that file either indirectly by
2642
2569
using this command or directly by using an editor, be sure to commit
2643
2570
it.
2644
2645
Bazaar also supports a global ignore file ~/.bazaar/ignore. On Windows
2646
the global ignore file can be found in the application data directory as
2647
C:\\Documents and Settings\\<user>\\Application Data\\Bazaar\\2.0\\ignore.
2648
Global ignores are not touched by this command. The global ignore file
2649
can be edited directly using an editor.
2650
2651
Patterns prefixed with '!' are exceptions to ignore patterns and take
2652
precedence over regular ignores. Such exceptions are used to specify
2653
files that should be versioned which would otherwise be ignored.
2654
2655
Patterns prefixed with '!!' act as regular ignore patterns, but have
2656
precedence over the '!' exception patterns.
2657
2571
2658
2572
Note: ignore patterns containing shell wildcards must be quoted from
2659
2573
the shell on Unix.
2663
2577
2664
2578
bzr ignore ./Makefile
2665
2579
2666
Ignore .class files in all directories...::
2580
Ignore class files in all directories::
2667
2581
2668
2582
bzr ignore "*.class"
2669
2583
2670
...but do not ignore "special.class"::
2671
2672
bzr ignore "!special.class"
2673
2674
2584
Ignore .o files under the lib directory::
2675
2585
2676
2586
bzr ignore "lib/**/*.o"
2682
2592
Ignore everything but the "debian" toplevel directory::
2683
2593
2684
2594
bzr ignore "RE:(?!debian/).*"
2685
2686
Ignore everything except the "local" toplevel directory,
2687
but always ignore "*~" autosave files, even under local/::
2688
2689
bzr ignore "*"
2690
bzr ignore "!./local"
2691
bzr ignore "!!*~"
2692
2595
"""
2693
2596
2694
2597
_see_also = ['status', 'ignored', 'patterns']
2695
2598
takes_args = ['name_pattern*']
2696
takes_options = ['directory',
2697
Option('default-rules',
2698
help='Display the default ignore rules that bzr uses.')
2599
takes_options = [
2600
Option('old-default-rules',
2601
help='Write out the ignore rules bzr < 0.9 always used.')
2699
2602
]
2700
2603
2701
def run(self, name_pattern_list=None, default_rules=None,
2702
directory=u'.'):
2604
def run(self, name_pattern_list=None, old_default_rules=None):
2703
2605
from bzrlib import ignores
2704
if default_rules is not None:
2705
# dump the default rules and exit
2706
for pattern in ignores.USER_DEFAULTS:
2707
self.outf.write("%s\n" % pattern)
2606
if old_default_rules is not None:
2607
# dump the rules and exit
2608
for pattern in ignores.OLD_DEFAULTS:
2609
print pattern
2708
2610
return
2709
2611
if not name_pattern_list:
2710
2612
raise errors.BzrCommandError("ignore requires at least one "
2711
"NAME_PATTERN or --default-rules.")
2613
"NAME_PATTERN or --old-default-rules")
2712
2614
name_pattern_list = [globbing.normalize_pattern(p)
2713
2615
for p in name_pattern_list]
2714
2616
for name_pattern in name_pattern_list:
2716
2618
(len(name_pattern) > 1 and name_pattern[1] == ':')):
2717
2619
raise errors.BzrCommandError(
2718
2620
"NAME_PATTERN should not be an absolute path")
2719
tree, relpath = WorkingTree.open_containing(directory)
2621
tree, relpath = WorkingTree.open_containing(u'.')
2720
2622
ignores.tree_ignores_add_patterns(tree, name_pattern_list)
2721
2623
ignored = globbing.Globster(name_pattern_list)
2722
2624
matches = []
2726
2628
if id is not None:
2727
2629
filename = entry[0]
2728
2630
if ignored.match(filename):
2729
matches.append(filename)
2631
matches.append(filename.encode('utf-8'))
2730
2632
tree.unlock()
2731
2633
if len(matches) > 0:
2732
self.outf.write("Warning: the following files are version controlled and"
2733
" match your ignore pattern:\n%s"
2734
"\nThese files will continue to be version controlled"
2735
" unless you 'bzr remove' them.\n" % ("\n".join(matches),))
2634
print "Warning: the following files are version controlled and" \
2635
" match your ignore pattern:\n%s" \
2636
"\nThese files will continue to be version controlled" \
2637
" unless you 'bzr remove' them." % ("\n".join(matches),)
2736
2638
2737
2639
2738
2640
class cmd_ignored(Command):
2739
__doc__ = """List ignored files and the patterns that matched them.
2641
"""List ignored files and the patterns that matched them.
2740
2642
2741
2643
List all the ignored files and the ignore pattern that caused the file to
2742
2644
be ignored.
2748
2650
2749
2651
encoding_type = 'replace'
2750
2652
_see_also = ['ignore', 'ls']
2751
takes_options = ['directory']
2752
2653
2753
2654
@display_command
2754
def run(self, directory=u'.'):
2755
tree = WorkingTree.open_containing(directory)[0]
2756
self.add_cleanup(tree.lock_read().unlock)
2757
for path, file_class, kind, file_id, entry in tree.list_files():
2758
if file_class != 'I':
2759
continue
2760
## XXX: Slightly inefficient since this was already calculated
2761
pat = tree.is_ignored(path)
2762
self.outf.write('%-50s %s\n' % (path, pat))
2655
def run(self):
2656
tree = WorkingTree.open_containing(u'.')[0]
2657
tree.lock_read()
2658
try:
2659
for path, file_class, kind, file_id, entry in tree.list_files():
2660
if file_class != 'I':
2661
continue
2662
## XXX: Slightly inefficient since this was already calculated
2663
pat = tree.is_ignored(path)
2664
self.outf.write('%-50s %s\n' % (path, pat))
2665
finally:
2666
tree.unlock()
2763
2667
2764
2668
2765
2669
class cmd_lookup_revision(Command):
2766
__doc__ = """Lookup the revision-id from a revision-number
2670
"""Lookup the revision-id from a revision-number
2767
2671
2768
2672
:Examples:
2769
2673
bzr lookup-revision 33
2770
2674
"""
2771
2675
hidden = True
2772
2676
takes_args = ['revno']
2773
takes_options = ['directory']
2774
2677
2775
2678
@display_command
2776
def run(self, revno, directory=u'.'):
2679
def run(self, revno):
2777
2680
try:
2778
2681
revno = int(revno)
2779
2682
except ValueError:
2780
raise errors.BzrCommandError("not a valid revision-number: %r"
2781
% revno)
2782
revid = WorkingTree.open_containing(directory)[0].branch.get_rev_id(revno)
2783
self.outf.write("%s\n" % revid)
2683
raise errors.BzrCommandError("not a valid revision-number: %r" % revno)
2684
2685
print WorkingTree.open_containing(u'.')[0].branch.get_rev_id(revno)
2784
2686
2785
2687
2786
2688
class cmd_export(Command):
2787
__doc__ = """Export current or past revision to a destination directory or archive.
2689
"""Export current or past revision to a destination directory or archive.
2788
2690
2789
2691
If no revision is specified this exports the last committed revision.
2790
2692
2812
2714
================= =========================
2813
2715
"""
2814
2716
takes_args = ['dest', 'branch_or_subdir?']
2815
takes_options = ['directory',
2717
takes_options = [
2816
2718
Option('format',
2817
2719
help="Type of file to export to.",
2818
2720
type=unicode),
2822
2724
Option('root',
2823
2725
type=str,
2824
2726
help="Name of the root directory inside the exported file."),
2825
Option('per-file-timestamps',
2826
help='Set modification time of files to that of the last '
2827
'revision in which it was changed.'),
2828
2727
]
2829
2728
def run(self, dest, branch_or_subdir=None, revision=None, format=None,
2830
root=None, filters=False, per_file_timestamps=False, directory=u'.'):
2729
root=None, filters=False):
2831
2730
from bzrlib.export import export
2832
2731
2833
2732
if branch_or_subdir is None:
2834
tree = WorkingTree.open_containing(directory)[0]
2733
tree = WorkingTree.open_containing(u'.')[0]
2835
2734
b = tree.branch
2836
2735
subdir = None
2837
2736
else:
2840
2739
2841
2740
rev_tree = _get_one_revision_tree('export', revision, branch=b, tree=tree)
2842
2741
try:
2843
export(rev_tree, dest, format, root, subdir, filtered=filters,
2844
per_file_timestamps=per_file_timestamps)
2742
export(rev_tree, dest, format, root, subdir, filtered=filters)
2845
2743
except errors.NoSuchExportFormat, e:
2846
2744
raise errors.BzrCommandError('Unsupported export format: %s' % e.format)
2847
2745
2848
2746
2849
2747
class cmd_cat(Command):
2850
__doc__ = """Write the contents of a file as of a given revision to standard output.
2748
"""Write the contents of a file as of a given revision to standard output.
2851
2749
2852
2750
If no revision is nominated, the last revision is used.
2853
2751
2856
2754
"""
2857
2755
2858
2756
_see_also = ['ls']
2859
takes_options = ['directory',
2757
takes_options = [
2860
2758
Option('name-from-revision', help='The path name in the old tree.'),
2861
2759
Option('filters', help='Apply content filters to display the '
2862
2760
'convenience form.'),
2867
2765
2868
2766
@display_command
2869
2767
def run(self, filename, revision=None, name_from_revision=False,
2870
filters=False, directory=None):
2768
filters=False):
2871
2769
if revision is not None and len(revision) != 1:
2872
2770
raise errors.BzrCommandError("bzr cat --revision takes exactly"
2873
2771
" one revision specifier")
2874
2772
tree, branch, relpath = \
2875
_open_directory_or_containing_tree_or_branch(filename, directory)
2876
self.add_cleanup(branch.lock_read().unlock)
2877
return self._run(tree, branch, relpath, filename, revision,
2878
name_from_revision, filters)
2773
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
2774
branch.lock_read()
2775
try:
2776
return self._run(tree, branch, relpath, filename, revision,
2777
name_from_revision, filters)
2778
finally:
2779
branch.unlock()
2879
2780
2880
2781
def _run(self, tree, b, relpath, filename, revision, name_from_revision,
2881
2782
filtered):
2882
2783
if tree is None:
2883
2784
tree = b.basis_tree()
2884
2785
rev_tree = _get_one_revision_tree('cat', revision, branch=b)
2885
self.add_cleanup(rev_tree.lock_read().unlock)
2886
2786
2887
2787
old_file_id = rev_tree.path2id(relpath)
2888
2788
2923
2823
chunks = content.splitlines(True)
2924
2824
content = filtered_output_bytes(chunks, filters,
2925
2825
ContentFilterContext(relpath, rev_tree))
2926
self.cleanup_now()
2927
2826
self.outf.writelines(content)
2928
2827
else:
2929
self.cleanup_now()
2930
2828
self.outf.write(content)
2931
2829
2932
2830
2933
2831
class cmd_local_time_offset(Command):
2934
__doc__ = """Show the offset in seconds from GMT to local time."""
2832
"""Show the offset in seconds from GMT to local time."""
2935
2833
hidden = True
2936
2834
@display_command
2937
2835
def run(self):
2938
self.outf.write("%s\n" % osutils.local_time_offset())
2836
print osutils.local_time_offset()
2939
2837
2940
2838
2941
2839
2942
2840
class cmd_commit(Command):
2943
__doc__ = """Commit changes into a new revision.
2841
"""Commit changes into a new revision.
2944
2842
2945
2843
An explanatory message needs to be given for each commit. This is
2946
2844
often done by using the --message option (getting the message from the
3039
2937
Option('strict',
3040
2938
help="Refuse to commit if there are unknown "
3041
2939
"files in the working tree."),
3042
Option('commit-time', type=str,
3043
help="Manually set a commit time using commit date "
3044
"format, e.g. '2009-10-10 08:00:00 +0100'."),
3045
2940
ListOption('fixes', type=str,
3046
2941
help="Mark a bug as being fixed by this revision "
3047
2942
"(see \"bzr help bugs\")."),
3054
2949
"the master branch until a normal commit "
3055
2950
"is performed."
3056
2951
),
3057
Option('show-diff', short_name='p',
3058
help='When no message is supplied, show the diff along'
3059
' with the status summary in the message editor.'),
2952
Option('show-diff',
2953
help='When no message is supplied, show the diff along'
2954
' with the status summary in the message editor.'),
3060
2955
]
3061
2956
aliases = ['ci', 'checkin']
3062
2957
3081
2976
3082
2977
def run(self, message=None, file=None, verbose=False, selected_list=None,
3083
2978
unchanged=False, strict=False, local=False, fixes=None,
3084
author=None, show_diff=False, exclude=None, commit_time=None):
2979
author=None, show_diff=False, exclude=None):
3085
2980
from bzrlib.errors import (
3086
2981
PointlessCommit,
3087
2982
ConflictsInTree,
3093
2988
make_commit_message_template_encoded
3094
2989
)
3095
2990
3096
commit_stamp = offset = None
3097
if commit_time is not None:
3098
try:
3099
commit_stamp, offset = timestamp.parse_patch_date(commit_time)
3100
except ValueError, e:
3101
raise errors.BzrCommandError(
3102
"Could not parse --commit-time: " + str(e))
3103
3104
2991
# TODO: Need a blackbox test for invoking the external editor; may be
3105
2992
# slightly problematic to run this cross-platform.
3106
2993
3126
3013
if local and not tree.branch.get_bound_location():
3127
3014
raise errors.LocalRequiresBoundBranch()
3128
3015
3129
if message is not None:
3130
try:
3131
file_exists = osutils.lexists(message)
3132
except UnicodeError:
3133
# The commit message contains unicode characters that can't be
3134
# represented in the filesystem encoding, so that can't be a
3135
# file.
3136
file_exists = False
3137
if file_exists:
3138
warning_msg = (
3139
'The commit message is a file name: "%(f)s".\n'
3140
'(use --file "%(f)s" to take commit message from that file)'
3141
% { 'f': message })
3142
ui.ui_factory.show_warning(warning_msg)
3143
if '\r' in message:
3144
message = message.replace('\r\n', '\n')
3145
message = message.replace('\r', '\n')
3146
if file:
3147
raise errors.BzrCommandError(
3148
"please specify either --message or --file")
3149
3150
3016
def get_message(commit_obj):
3151
3017
"""Callback to get commit message"""
3152
if file:
3153
my_message = codecs.open(
3154
file, 'rt', osutils.get_user_encoding()).read()
3155
elif message is not None:
3156
my_message = message
3157
else:
3158
# No message supplied: make one up.
3159
# text is the status of the tree
3160
text = make_commit_message_template_encoded(tree,
3018
my_message = message
3019
if my_message is None and not file:
3020
t = make_commit_message_template_encoded(tree,
3161
3021
selected_list, diff=show_diff,
3162
3022
output_encoding=osutils.get_user_encoding())
3163
# start_message is the template generated from hooks
3164
# XXX: Warning - looks like hooks return unicode,
3165
# make_commit_message_template_encoded returns user encoding.
3166
# We probably want to be using edit_commit_message instead to
3167
# avoid this.
3168
3023
start_message = generate_commit_message_template(commit_obj)
3169
my_message = edit_commit_message_encoded(text,
3024
my_message = edit_commit_message_encoded(t,
3170
3025
start_message=start_message)
3171
3026
if my_message is None:
3172
3027
raise errors.BzrCommandError("please specify a commit"
3173
3028
" message with either --message or --file")
3029
elif my_message and file:
3030
raise errors.BzrCommandError(
3031
"please specify either --message or --file")
3032
if file:
3033
my_message = codecs.open(file, 'rt',
3034
osutils.get_user_encoding()).read()
3174
3035
if my_message == "":
3175
3036
raise errors.BzrCommandError("empty commit message specified")
3176
3037
return my_message
3184
3045
specific_files=selected_list,
3185
3046
allow_pointless=unchanged, strict=strict, local=local,
3186
3047
reporter=None, verbose=verbose, revprops=properties,
3187
authors=author, timestamp=commit_stamp,
3188
timezone=offset,
3048
authors=author,
3189
3049
exclude=safe_relpath_files(tree, exclude))
3190
3050
except PointlessCommit:
3051
# FIXME: This should really happen before the file is read in;
3052
# perhaps prepare the commit; get the message; then actually commit
3191
3053
raise errors.BzrCommandError("No changes to commit."
3192
3054
" Use --unchanged to commit anyhow.")
3193
3055
except ConflictsInTree:
3198
3060
raise errors.BzrCommandError("Commit refused because there are"
3199
3061
" unknown files in the working tree.")
3200
3062
except errors.BoundBranchOutOfDate, e:
3201
e.extra_help = ("\n"
3202
'To commit to master branch, run update and then commit.\n'
3203
'You can also pass --local to commit to continue working '
3204
'disconnected.')
3205
raise
3063
raise errors.BzrCommandError(str(e) + "\n"
3064
'To commit to master branch, run update and then commit.\n'
3065
'You can also pass --local to commit to continue working '
3066
'disconnected.')
3206
3067
3207
3068
3208
3069
class cmd_check(Command):
3209
__doc__ = """Validate working tree structure, branch consistency and repository history.
3070
"""Validate working tree structure, branch consistency and repository history.
3210
3071
3211
3072
This command checks various invariants about branch and repository storage
3212
3073
to detect data corruption or bzr bugs.
3276
3137
3277
3138
3278
3139
class cmd_upgrade(Command):
3279
__doc__ = """Upgrade branch storage to current format.
3140
"""Upgrade branch storage to current format.
3280
3141
3281
3142
The check command or bzr developers may sometimes advise you to run
3282
3143
this command. When the default format has changed you may also be warned
3300
3161
3301
3162
3302
3163
class cmd_whoami(Command):
3303
__doc__ = """Show or set bzr user id.
3164
"""Show or set bzr user id.
3304
3165
3305
3166
:Examples:
3306
3167
Show the email of the current user::
3350
3211
3351
3212
3352
3213
class cmd_nick(Command):
3353
__doc__ = """Print or set the branch nickname.
3214
"""Print or set the branch nickname.
3354
3215
3355
3216
If unset, the tree root directory name is used as the nickname.
3356
3217
To print the current nickname, execute with no argument.
3361
3222
3362
3223
_see_also = ['info']
3363
3224
takes_args = ['nickname?']
3364
takes_options = ['directory']
3365
def run(self, nickname=None, directory=u'.'):
3366
branch = Branch.open_containing(directory)[0]
3225
def run(self, nickname=None):
3226
branch = Branch.open_containing(u'.')[0]
3367
3227
if nickname is None:
3368
3228
self.printme(branch)
3369
3229
else:
3371
3231
3372
3232
@display_command
3373
3233
def printme(self, branch):
3374
self.outf.write('%s\n' % branch.nick)
3234
print branch.nick
3375
3235
3376
3236
3377
3237
class cmd_alias(Command):
3378
__doc__ = """Set/unset and display aliases.
3238
"""Set/unset and display aliases.
3379
3239
3380
3240
:Examples:
3381
3241
Show the current aliases::
3445
3305
3446
3306
3447
3307
class cmd_selftest(Command):
3448
__doc__ = """Run internal test suite.
3308
"""Run internal test suite.
3449
3309
3450
3310
If arguments are given, they are regular expressions that say which tests
3451
3311
should run. Tests matching any expression are run, and other tests are
3495
3355
def get_transport_type(typestring):
3496
3356
"""Parse and return a transport specifier."""
3497
3357
if typestring == "sftp":
3498
from bzrlib.tests import stub_sftp
3499
return stub_sftp.SFTPAbsoluteServer
3358
from bzrlib.transport.sftp import SFTPAbsoluteServer
3359
return SFTPAbsoluteServer
3500
3360
if typestring == "memory":
3501
from bzrlib.tests import test_server
3502
return memory.MemoryServer
3361
from bzrlib.transport.memory import MemoryServer
3362
return MemoryServer
3503
3363
if typestring == "fakenfs":
3504
from bzrlib.tests import test_server
3505
return test_server.FakeNFSServer
3364
from bzrlib.transport.fakenfs import FakeNFSServer
3365
return FakeNFSServer
3506
3366
msg = "No known transport type %s. Supported types are: sftp\n" %\
3507
3367
(typestring)
3508
3368
raise errors.BzrCommandError(msg)
3592
3452
raise errors.BzrCommandError("subunit not available. subunit "
3593
3453
"needs to be installed to use --subunit.")
3594
3454
self.additional_selftest_args['runner_class'] = SubUnitBzrRunner
3595
# On Windows, disable automatic conversion of '\n' to '\r\n' in
3596
# stdout, which would corrupt the subunit stream.
3597
if sys.platform == "win32" and sys.stdout.fileno() >= 0:
3598
import msvcrt
3599
msvcrt.setmode(sys.stdout.fileno(), os.O_BINARY)
3600
3455
if parallel:
3601
3456
self.additional_selftest_args.setdefault(
3602
3457
'suite_decorators', []).append(parallel)
3606
3461
verbose = not is_quiet()
3607
3462
# TODO: should possibly lock the history file...
3608
3463
benchfile = open(".perf_history", "at", buffering=1)
3609
self.add_cleanup(benchfile.close)
3610
3464
else:
3611
3465
test_suite_factory = None
3612
3466
benchfile = None
3613
selftest_kwargs = {"verbose": verbose,
3614
"pattern": pattern,
3615
"stop_on_failure": one,
3616
"transport": transport,
3617
"test_suite_factory": test_suite_factory,
3618
"lsprof_timed": lsprof_timed,
3619
"lsprof_tests": lsprof_tests,
3620
"bench_history": benchfile,
3621
"matching_tests_first": first,
3622
"list_only": list_only,
3623
"random_seed": randomize,
3624
"exclude_pattern": exclude,
3625
"strict": strict,
3626
"load_list": load_list,
3627
"debug_flags": debugflag,
3628
"starting_with": starting_with
3629
}
3630
selftest_kwargs.update(self.additional_selftest_args)
3631
result = selftest(**selftest_kwargs)
3467
try:
3468
selftest_kwargs = {"verbose": verbose,
3469
"pattern": pattern,
3470
"stop_on_failure": one,
3471
"transport": transport,
3472
"test_suite_factory": test_suite_factory,
3473
"lsprof_timed": lsprof_timed,
3474
"lsprof_tests": lsprof_tests,
3475
"bench_history": benchfile,
3476
"matching_tests_first": first,
3477
"list_only": list_only,
3478
"random_seed": randomize,
3479
"exclude_pattern": exclude,
3480
"strict": strict,
3481
"load_list": load_list,
3482
"debug_flags": debugflag,
3483
"starting_with": starting_with
3484
}
3485
selftest_kwargs.update(self.additional_selftest_args)
3486
result = selftest(**selftest_kwargs)
3487
finally:
3488
if benchfile is not None:
3489
benchfile.close()
3632
3490
return int(not result)
3633
3491
3634
3492
3635
3493
class cmd_version(Command):
3636
__doc__ = """Show version of bzr."""
3494
"""Show version of bzr."""
3637
3495
3638
3496
encoding_type = 'replace'
3639
3497
takes_options = [
3650
3508
3651
3509
3652
3510
class cmd_rocks(Command):
3653
__doc__ = """Statement of optimism."""
3511
"""Statement of optimism."""
3654
3512
3655
3513
hidden = True
3656
3514
3657
3515
@display_command
3658
3516
def run(self):
3659
self.outf.write("It sure does!\n")
3517
print "It sure does!"
3660
3518
3661
3519
3662
3520
class cmd_find_merge_base(Command):
3663
__doc__ = """Find and print a base revision for merging two branches."""
3521
"""Find and print a base revision for merging two branches."""
3664
3522
# TODO: Options to specify revisions on either side, as if
3665
3523
# merging only part of the history.
3666
3524
takes_args = ['branch', 'other']
3672
3530
3673
3531
branch1 = Branch.open_containing(branch)[0]
3674
3532
branch2 = Branch.open_containing(other)[0]
3675
self.add_cleanup(branch1.lock_read().unlock)
3676
self.add_cleanup(branch2.lock_read().unlock)
3677
last1 = ensure_null(branch1.last_revision())
3678
last2 = ensure_null(branch2.last_revision())
3679
3680
graph = branch1.repository.get_graph(branch2.repository)
3681
base_rev_id = graph.find_unique_lca(last1, last2)
3682
3683
self.outf.write('merge base is revision %s\n' % base_rev_id)
3533
branch1.lock_read()
3534
try:
3535
branch2.lock_read()
3536
try:
3537
last1 = ensure_null(branch1.last_revision())
3538
last2 = ensure_null(branch2.last_revision())
3539
3540
graph = branch1.repository.get_graph(branch2.repository)
3541
base_rev_id = graph.find_unique_lca(last1, last2)
3542
3543
print 'merge base is revision %s' % base_rev_id
3544
finally:
3545
branch2.unlock()
3546
finally:
3547
branch1.unlock()
3684
3548
3685
3549
3686
3550
class cmd_merge(Command):
3687
__doc__ = """Perform a three-way merge.
3551
"""Perform a three-way merge.
3688
3552
3689
3553
The source of the merge can be specified either in the form of a branch,
3690
3554
or in the form of a path to a file containing a merge directive generated
3719
3583
committed to record the result of the merge.
3720
3584
3721
3585
merge refuses to run if there are any uncommitted changes, unless
3722
--force is given. The --force option can also be used to create a
3723
merge revision which has more than two parents.
3724
3725
If one would like to merge changes from the working tree of the other
3726
branch without merging any committed revisions, the --uncommitted option
3727
can be given.
3586
--force is given.
3728
3587
3729
3588
To select only some changes to merge, use "merge -i", which will prompt
3730
3589
you to apply each diff hunk and file change, similar to "shelve".
3742
3601
3743
3602
bzr merge -r 81..82 ../bzr.dev
3744
3603
3745
To apply a merge directive contained in /tmp/merge::
3604
To apply a merge directive contained in /tmp/merge:
3746
3605
3747
3606
bzr merge /tmp/merge
3748
3749
To create a merge revision with three parents from two branches
3750
feature1a and feature1b:
3751
3752
bzr merge ../feature1a
3753
bzr merge ../feature1b --force
3754
bzr commit -m 'revision with three parents'
3755
3607
"""
3756
3608
3757
3609
encoding_type = 'exact'
3773
3625
' completely merged into the source, pull from the'
3774
3626
' source rather than merging. When this happens,'
3775
3627
' you do not need to commit the result.'),
3776
custom_help('directory',
3628
Option('directory',
3777
3629
help='Branch to merge into, '
3778
'rather than the one containing the working directory.'),
3630
'rather than the one containing the working directory.',
3631
short_name='d',
3632
type=unicode,
3633
),
3779
3634
Option('preview', help='Instead of merging, show a diff of the'
3780
3635
' merge.'),
3781
3636
Option('interactive', help='Select changes interactively.',
3812
3667
view_info = _get_view_info_for_change_reporter(tree)
3813
3668
change_reporter = delta._ChangeReporter(
3814
3669
unversioned_filter=tree.is_ignored, view_info=view_info)
3815
pb = ui.ui_factory.nested_progress_bar()
3816
self.add_cleanup(pb.finished)
3817
self.add_cleanup(tree.lock_write().unlock)
3818
if location is not None:
3819
try:
3820
mergeable = bundle.read_mergeable_from_url(location,
3821
possible_transports=possible_transports)
3822
except errors.NotABundle:
3823
mergeable = None
3670
cleanups = []
3671
try:
3672
pb = ui.ui_factory.nested_progress_bar()
3673
cleanups.append(pb.finished)
3674
tree.lock_write()
3675
cleanups.append(tree.unlock)
3676
if location is not None:
3677
try:
3678
mergeable = bundle.read_mergeable_from_url(location,
3679
possible_transports=possible_transports)
3680
except errors.NotABundle:
3681
mergeable = None
3682
else:
3683
if uncommitted:
3684
raise errors.BzrCommandError('Cannot use --uncommitted'
3685
' with bundles or merge directives.')
3686
3687
if revision is not None:
3688
raise errors.BzrCommandError(
3689
'Cannot use -r with merge directives or bundles')
3690
merger, verified = _mod_merge.Merger.from_mergeable(tree,
3691
mergeable, pb)
3692
3693
if merger is None and uncommitted:
3694
if revision is not None and len(revision) > 0:
3695
raise errors.BzrCommandError('Cannot use --uncommitted and'
3696
' --revision at the same time.')
3697
merger = self.get_merger_from_uncommitted(tree, location, pb,
3698
cleanups)
3699
allow_pending = False
3700
3701
if merger is None:
3702
merger, allow_pending = self._get_merger_from_branch(tree,
3703
location, revision, remember, possible_transports, pb)
3704
3705
merger.merge_type = merge_type
3706
merger.reprocess = reprocess
3707
merger.show_base = show_base
3708
self.sanity_check_merger(merger)
3709
if (merger.base_rev_id == merger.other_rev_id and
3710
merger.other_rev_id is not None):
3711
note('Nothing to do.')
3712
return 0
3713
if pull:
3714
if merger.interesting_files is not None:
3715
raise errors.BzrCommandError('Cannot pull individual files')
3716
if (merger.base_rev_id == tree.last_revision()):
3717
result = tree.pull(merger.other_branch, False,
3718
merger.other_rev_id)
3719
result.report(self.outf)
3720
return 0
3721
if merger.this_basis is None:
3722
raise errors.BzrCommandError(
3723
"This branch has no commits."
3724
" (perhaps you would prefer 'bzr pull')")
3725
if preview:
3726
return self._do_preview(merger, cleanups)
3727
elif interactive:
3728
return self._do_interactive(merger, cleanups)
3824
3729
else:
3825
if uncommitted:
3826
raise errors.BzrCommandError('Cannot use --uncommitted'
3827
' with bundles or merge directives.')
3828
3829
if revision is not None:
3830
raise errors.BzrCommandError(
3831
'Cannot use -r with merge directives or bundles')
3832
merger, verified = _mod_merge.Merger.from_mergeable(tree,
3833
mergeable, None)
3834
3835
if merger is None and uncommitted:
3836
if revision is not None and len(revision) > 0:
3837
raise errors.BzrCommandError('Cannot use --uncommitted and'
3838
' --revision at the same time.')
3839
merger = self.get_merger_from_uncommitted(tree, location, None)
3840
allow_pending = False
3841
3842
if merger is None:
3843
merger, allow_pending = self._get_merger_from_branch(tree,
3844
location, revision, remember, possible_transports, None)
3845
3846
merger.merge_type = merge_type
3847
merger.reprocess = reprocess
3848
merger.show_base = show_base
3849
self.sanity_check_merger(merger)
3850
if (merger.base_rev_id == merger.other_rev_id and
3851
merger.other_rev_id is not None):
3852
note('Nothing to do.')
3853
return 0
3854
if pull:
3855
if merger.interesting_files is not None:
3856
raise errors.BzrCommandError('Cannot pull individual files')
3857
if (merger.base_rev_id == tree.last_revision()):
3858
result = tree.pull(merger.other_branch, False,
3859
merger.other_rev_id)
3860
result.report(self.outf)
3861
return 0
3862
if merger.this_basis is None:
3863
raise errors.BzrCommandError(
3864
"This branch has no commits."
3865
" (perhaps you would prefer 'bzr pull')")
3866
if preview:
3867
return self._do_preview(merger)
3868
elif interactive:
3869
return self._do_interactive(merger)
3870
else:
3871
return self._do_merge(merger, change_reporter, allow_pending,
3872
verified)
3873
3874
def _get_preview(self, merger):
3730
return self._do_merge(merger, change_reporter, allow_pending,
3731
verified)
3732
finally:
3733
for cleanup in reversed(cleanups):
3734
cleanup()
3735
3736
def _get_preview(self, merger, cleanups):
3875
3737
tree_merger = merger.make_merger()
3876
3738
tt = tree_merger.make_preview_transform()
3877
self.add_cleanup(tt.finalize)
3739
cleanups.append(tt.finalize)
3878
3740
result_tree = tt.get_preview_tree()
3879
3741
return result_tree
3880
3742
3881
def _do_preview(self, merger):
3743
def _do_preview(self, merger, cleanups):
3882
3744
from bzrlib.diff import show_diff_trees
3883
result_tree = self._get_preview(merger)
3745
result_tree = self._get_preview(merger, cleanups)
3884
3746
show_diff_trees(merger.this_tree, result_tree, self.outf,
3885
3747
old_label='', new_label='')
3886
3748
3896
3758
else:
3897
3759
return 0
3898
3760
3899
def _do_interactive(self, merger):
3761
def _do_interactive(self, merger, cleanups):
3900
3762
"""Perform an interactive merge.
3901
3763
3902
3764
This works by generating a preview tree of the merge, then using
3904
3766
and the preview tree.
3905
3767
"""
3906
3768
from bzrlib import shelf_ui
3907
result_tree = self._get_preview(merger)
3769
result_tree = self._get_preview(merger, cleanups)
3908
3770
writer = bzrlib.option.diff_writer_registry.get()
3909
3771
shelver = shelf_ui.Shelver(merger.this_tree, result_tree, destroy=True,
3910
3772
reporter=shelf_ui.ApplyReporter(),
3911
3773
diff_writer=writer(sys.stdout))
3912
try:
3913
shelver.run()
3914
finally:
3915
shelver.finalize()
3774
shelver.run()
3916
3775
3917
3776
def sanity_check_merger(self, merger):
3918
3777
if (merger.show_base and
3978
3837
allow_pending = True
3979
3838
return merger, allow_pending
3980
3839
3981
def get_merger_from_uncommitted(self, tree, location, pb):
3840
def get_merger_from_uncommitted(self, tree, location, pb, cleanups):
3982
3841
"""Get a merger for uncommitted changes.
3983
3842
3984
3843
:param tree: The tree the merger should apply to.
3985
3844
:param location: The location containing uncommitted changes.
3986
3845
:param pb: The progress bar to use for showing progress.
3846
:param cleanups: A list of operations to perform to clean up the
3847
temporary directories, unfinalized objects, etc.
3987
3848
"""
3988
3849
location = self._select_branch_location(tree, location)[0]
3989
3850
other_tree, other_path = WorkingTree.open_containing(location)
4041
3902
4042
3903
4043
3904
class cmd_remerge(Command):
4044
__doc__ = """Redo a merge.
3905
"""Redo a merge.
4045
3906
4046
3907
Use this if you want to try a different merge technique while resolving
4047
3908
conflicts. Some merge techniques are better than others, and remerge
4072
3933
4073
3934
def run(self, file_list=None, merge_type=None, show_base=False,
4074
3935
reprocess=False):
4075
from bzrlib.conflicts import restore
4076
3936
if merge_type is None:
4077
3937
merge_type = _mod_merge.Merge3Merger
4078
3938
tree, file_list = tree_files(file_list)
4079
self.add_cleanup(tree.lock_write().unlock)
4080
parents = tree.get_parent_ids()
4081
if len(parents) != 2:
4082
raise errors.BzrCommandError("Sorry, remerge only works after normal"
4083
" merges. Not cherrypicking or"
4084
" multi-merges.")
4085
repository = tree.branch.repository
4086
interesting_ids = None
4087
new_conflicts = []
4088
conflicts = tree.conflicts()
4089
if file_list is not None:
4090
interesting_ids = set()
4091
for filename in file_list:
4092
file_id = tree.path2id(filename)
4093
if file_id is None:
4094
raise errors.NotVersionedError(filename)
4095
interesting_ids.add(file_id)
4096
if tree.kind(file_id) != "directory":
4097
continue
3939
tree.lock_write()
3940
try:
3941
parents = tree.get_parent_ids()
3942
if len(parents) != 2:
3943
raise errors.BzrCommandError("Sorry, remerge only works after normal"
3944
" merges. Not cherrypicking or"
3945
" multi-merges.")
3946
repository = tree.branch.repository
3947
interesting_ids = None
3948
new_conflicts = []
3949
conflicts = tree.conflicts()
3950
if file_list is not None:
3951
interesting_ids = set()
3952
for filename in file_list:
3953
file_id = tree.path2id(filename)
3954
if file_id is None:
3955
raise errors.NotVersionedError(filename)
3956
interesting_ids.add(file_id)
3957
if tree.kind(file_id) != "directory":
3958
continue
4098
3959
4099
for name, ie in tree.inventory.iter_entries(file_id):
4100
interesting_ids.add(ie.file_id)
4101
new_conflicts = conflicts.select_conflicts(tree, file_list)[0]
4102
else:
4103
# Remerge only supports resolving contents conflicts
4104
allowed_conflicts = ('text conflict', 'contents conflict')
4105
restore_files = [c.path for c in conflicts
4106
if c.typestring in allowed_conflicts]
4107
_mod_merge.transform_tree(tree, tree.basis_tree(), interesting_ids)
4108
tree.set_conflicts(ConflictList(new_conflicts))
4109
if file_list is not None:
4110
restore_files = file_list
4111
for filename in restore_files:
3960
for name, ie in tree.inventory.iter_entries(file_id):
3961
interesting_ids.add(ie.file_id)
3962
new_conflicts = conflicts.select_conflicts(tree, file_list)[0]
3963
else:
3964
# Remerge only supports resolving contents conflicts
3965
allowed_conflicts = ('text conflict', 'contents conflict')
3966
restore_files = [c.path for c in conflicts
3967
if c.typestring in allowed_conflicts]
3968
_mod_merge.transform_tree(tree, tree.basis_tree(), interesting_ids)
3969
tree.set_conflicts(ConflictList(new_conflicts))
3970
if file_list is not None:
3971
restore_files = file_list
3972
for filename in restore_files:
3973
try:
3974
restore(tree.abspath(filename))
3975
except errors.NotConflicted:
3976
pass
3977
# Disable pending merges, because the file texts we are remerging
3978
# have not had those merges performed. If we use the wrong parents
3979
# list, we imply that the working tree text has seen and rejected
3980
# all the changes from the other tree, when in fact those changes
3981
# have not yet been seen.
3982
pb = ui.ui_factory.nested_progress_bar()
3983
tree.set_parent_ids(parents[:1])
4112
3984
try:
4113
restore(tree.abspath(filename))
4114
except errors.NotConflicted:
4115
pass
4116
# Disable pending merges, because the file texts we are remerging
4117
# have not had those merges performed. If we use the wrong parents
4118
# list, we imply that the working tree text has seen and rejected
4119
# all the changes from the other tree, when in fact those changes
4120
# have not yet been seen.
4121
tree.set_parent_ids(parents[:1])
4122
try:
4123
merger = _mod_merge.Merger.from_revision_ids(None, tree, parents[1])
4124
merger.interesting_ids = interesting_ids
4125
merger.merge_type = merge_type
4126
merger.show_base = show_base
4127
merger.reprocess = reprocess
4128
conflicts = merger.do_merge()
3985
merger = _mod_merge.Merger.from_revision_ids(pb,
3986
tree, parents[1])
3987
merger.interesting_ids = interesting_ids
3988
merger.merge_type = merge_type
3989
merger.show_base = show_base
3990
merger.reprocess = reprocess
3991
conflicts = merger.do_merge()
3992
finally:
3993
tree.set_parent_ids(parents)
3994
pb.finished()
4129
3995
finally:
4130
tree.set_parent_ids(parents)
3996
tree.unlock()
4131
3997
if conflicts > 0:
4132
3998
return 1
4133
3999
else:
4135
4001
4136
4002
4137
4003
class cmd_revert(Command):
4138
__doc__ = """Revert files to a previous revision.
4004
"""Revert files to a previous revision.
4139
4005
4140
4006
Giving a list of files will revert only those files. Otherwise, all files
4141
4007
will be reverted. If the revision is not specified with '--revision', the
4155
4021
name. If you name a directory, all the contents of that directory will be
4156
4022
reverted.
4157
4023
4158
If you have newly added files since the target revision, they will be
4159
removed. If the files to be removed have been changed, backups will be
4160
created as above. Directories containing unknown files will not be
4161
deleted.
4024
Any files that have been newly added since that revision will be deleted,
4025
with a backup kept if appropriate. Directories containing unknown files
4026
will not be deleted.
4162
4027
4163
The working tree contains a list of revisions that have been merged but
4164
not yet committed. These revisions will be included as additional parents
4165
of the next commit. Normally, using revert clears that list as well as
4166
reverting the files. If any files are specified, revert leaves the list
4167
of uncommitted merges alone and reverts only the files. Use ``bzr revert
4168
.`` in the tree root to revert all files but keep the recorded merges,
4169
and ``bzr revert --forget-merges`` to clear the pending merge list without
4028
The working tree contains a list of pending merged revisions, which will
4029
be included as parents in the next commit. Normally, revert clears that
4030
list as well as reverting the files. If any files are specified, revert
4031
leaves the pending merge list alone and reverts only the files. Use "bzr
4032
revert ." in the tree root to revert all files but keep the merge record,
4033
and "bzr revert --forget-merges" to clear the pending merge list without
4170
4034
reverting any files.
4171
4172
Using "bzr revert --forget-merges", it is possible to apply all of the
4173
changes from a branch in a single revision. To do this, perform the merge
4174
as desired. Then doing revert with the "--forget-merges" option will keep
4175
the content of the tree as it was, but it will clear the list of pending
4176
merges. The next commit will then contain all of the changes that are
4177
present in the other branch, but without any other parent revisions.
4178
Because this technique forgets where these changes originated, it may
4179
cause additional conflicts on later merges involving the same source and
4180
target branches.
4181
4035
"""
4182
4036
4183
4037
_see_also = ['cat', 'export']
4192
4046
def run(self, revision=None, no_backup=False, file_list=None,
4193
4047
forget_merges=None):
4194
4048
tree, file_list = tree_files(file_list)
4195
self.add_cleanup(tree.lock_tree_write().unlock)
4196
if forget_merges:
4197
tree.set_parent_ids(tree.get_parent_ids()[:1])
4198
else:
4199
self._revert_tree_to_revision(tree, revision, file_list, no_backup)
4049
tree.lock_write()
4050
try:
4051
if forget_merges:
4052
tree.set_parent_ids(tree.get_parent_ids()[:1])
4053
else:
4054
self._revert_tree_to_revision(tree, revision, file_list, no_backup)
4055
finally:
4056
tree.unlock()
4200
4057
4201
4058
@staticmethod
4202
4059
def _revert_tree_to_revision(tree, revision, file_list, no_backup):
4203
4060
rev_tree = _get_one_revision_tree('revert', revision, tree=tree)
4204
tree.revert(file_list, rev_tree, not no_backup, None,
4205
report_changes=True)
4061
pb = ui.ui_factory.nested_progress_bar()
4062
try:
4063
tree.revert(file_list, rev_tree, not no_backup, pb,
4064
report_changes=True)
4065
finally:
4066
pb.finished()
4206
4067
4207
4068
4208
4069
class cmd_assert_fail(Command):
4209
__doc__ = """Test reporting of assertion failures"""
4070
"""Test reporting of assertion failures"""
4210
4071
# intended just for use in testing
4211
4072
4212
4073
hidden = True
4216
4077
4217
4078
4218
4079
class cmd_help(Command):
4219
__doc__ = """Show help on a command or other topic.
4080
"""Show help on a command or other topic.
4220
4081
"""
4221
4082
4222
4083
_see_also = ['topics']
4235
4096
4236
4097
4237
4098
class cmd_shell_complete(Command):
4238
__doc__ = """Show appropriate completions for context.
4099
"""Show appropriate completions for context.
4239
4100
4240
4101
For a list of all available commands, say 'bzr shell-complete'.
4241
4102
"""
4250
4111
4251
4112
4252
4113
class cmd_missing(Command):
4253
__doc__ = """Show unmerged/unpulled revisions between two branches.
4114
"""Show unmerged/unpulled revisions between two branches.
4254
4115
4255
4116
OTHER_BRANCH may be local or remote.
4256
4117
4257
4118
To filter on a range of revisions, you can use the command -r begin..end
4258
4119
-r revision requests a specific revision, -r ..end or -r begin.. are
4259
4120
also valid.
4260
4261
:Exit values:
4262
1 - some missing revisions
4263
0 - no missing revisions
4264
4121
4265
4122
:Examples:
4266
4123
4334
4191
restrict = 'remote'
4335
4192
4336
4193
local_branch = Branch.open_containing(u".")[0]
4337
self.add_cleanup(local_branch.lock_read().unlock)
4338
4339
4194
parent = local_branch.get_parent()
4340
4195
if other_branch is None:
4341
4196
other_branch = parent
4350
4205
remote_branch = Branch.open(other_branch)
4351
4206
if remote_branch.base == local_branch.base:
4352
4207
remote_branch = local_branch
4353
else:
4354
self.add_cleanup(remote_branch.lock_read().unlock)
4355
4208
4356
4209
local_revid_range = _revision_range_to_revid_range(
4357
4210
_get_revision_range(my_revision, local_branch,
4361
4214
_get_revision_range(revision,
4362
4215
remote_branch, self.name()))
4363
4216
4364
local_extra, remote_extra = find_unmerged(
4365
local_branch, remote_branch, restrict,
4366
backward=not reverse,
4367
include_merges=include_merges,
4368
local_revid_range=local_revid_range,
4369
remote_revid_range=remote_revid_range)
4370
4371
if log_format is None:
4372
registry = log.log_formatter_registry
4373
log_format = registry.get_default(local_branch)
4374
lf = log_format(to_file=self.outf,
4375
show_ids=show_ids,
4376
show_timezone='original')
4377
4378
status_code = 0
4379
if local_extra and not theirs_only:
4380
message("You have %d extra revision(s):\n" %
4381
len(local_extra))
4382
for revision in iter_log_revisions(local_extra,
4383
local_branch.repository,
4384
verbose):
4385
lf.log_revision(revision)
4386
printed_local = True
4387
status_code = 1
4388
else:
4389
printed_local = False
4390
4391
if remote_extra and not mine_only:
4392
if printed_local is True:
4393
message("\n\n\n")
4394
message("You are missing %d revision(s):\n" %
4395
len(remote_extra))
4396
for revision in iter_log_revisions(remote_extra,
4397
remote_branch.repository,
4398
verbose):
4399
lf.log_revision(revision)
4400
status_code = 1
4401
4402
if mine_only and not local_extra:
4403
# We checked local, and found nothing extra
4404
message('This branch is up to date.\n')
4405
elif theirs_only and not remote_extra:
4406
# We checked remote, and found nothing extra
4407
message('Other branch is up to date.\n')
4408
elif not (mine_only or theirs_only or local_extra or
4409
remote_extra):
4410
# We checked both branches, and neither one had extra
4411
# revisions
4412
message("Branches are up to date.\n")
4413
self.cleanup_now()
4217
local_branch.lock_read()
4218
try:
4219
remote_branch.lock_read()
4220
try:
4221
local_extra, remote_extra = find_unmerged(
4222
local_branch, remote_branch, restrict,
4223
backward=not reverse,
4224
include_merges=include_merges,
4225
local_revid_range=local_revid_range,
4226
remote_revid_range=remote_revid_range)
4227
4228
if log_format is None:
4229
registry = log.log_formatter_registry
4230
log_format = registry.get_default(local_branch)
4231
lf = log_format(to_file=self.outf,
4232
show_ids=show_ids,
4233
show_timezone='original')
4234
4235
status_code = 0
4236
if local_extra and not theirs_only:
4237
message("You have %d extra revision(s):\n" %
4238
len(local_extra))
4239
for revision in iter_log_revisions(local_extra,
4240
local_branch.repository,
4241
verbose):
4242
lf.log_revision(revision)
4243
printed_local = True
4244
status_code = 1
4245
else:
4246
printed_local = False
4247
4248
if remote_extra and not mine_only:
4249
if printed_local is True:
4250
message("\n\n\n")
4251
message("You are missing %d revision(s):\n" %
4252
len(remote_extra))
4253
for revision in iter_log_revisions(remote_extra,
4254
remote_branch.repository,
4255
verbose):
4256
lf.log_revision(revision)
4257
status_code = 1
4258
4259
if mine_only and not local_extra:
4260
# We checked local, and found nothing extra
4261
message('This branch is up to date.\n')
4262
elif theirs_only and not remote_extra:
4263
# We checked remote, and found nothing extra
4264
message('Other branch is up to date.\n')
4265
elif not (mine_only or theirs_only or local_extra or
4266
remote_extra):
4267
# We checked both branches, and neither one had extra
4268
# revisions
4269
message("Branches are up to date.\n")
4270
finally:
4271
remote_branch.unlock()
4272
finally:
4273
local_branch.unlock()
4414
4274
if not status_code and parent is None and other_branch is not None:
4415
self.add_cleanup(local_branch.lock_write().unlock)
4416
# handle race conditions - a parent might be set while we run.
4417
if local_branch.get_parent() is None:
4418
local_branch.set_parent(remote_branch.base)
4275
local_branch.lock_write()
4276
try:
4277
# handle race conditions - a parent might be set while we run.
4278
if local_branch.get_parent() is None:
4279
local_branch.set_parent(remote_branch.base)
4280
finally:
4281
local_branch.unlock()
4419
4282
return status_code
4420
4283
4421
4284
4422
4285
class cmd_pack(Command):
4423
__doc__ = """Compress the data within a repository.
4424
4425
This operation compresses the data within a bazaar repository. As
4426
bazaar supports automatic packing of repository, this operation is
4427
normally not required to be done manually.
4428
4429
During the pack operation, bazaar takes a backup of existing repository
4430
data, i.e. pack files. This backup is eventually removed by bazaar
4431
automatically when it is safe to do so. To save disk space by removing
4432
the backed up pack files, the --clean-obsolete-packs option may be
4433
used.
4434
4435
Warning: If you use --clean-obsolete-packs and your machine crashes
4436
during or immediately after repacking, you may be left with a state
4437
where the deletion has been written to disk but the new packs have not
4438
been. In this case the repository may be unusable.
4439
"""
4286
"""Compress the data within a repository."""
4440
4287
4441
4288
_see_also = ['repositories']
4442
4289
takes_args = ['branch_or_repo?']
4443
takes_options = [
4444
Option('clean-obsolete-packs', 'Delete obsolete packs to save disk space.'),
4445
]
4446
4290
4447
def run(self, branch_or_repo='.', clean_obsolete_packs=False):
4291
def run(self, branch_or_repo='.'):
4448
4292
dir = bzrdir.BzrDir.open_containing(branch_or_repo)[0]
4449
4293
try:
4450
4294
branch = dir.open_branch()
4451
4295
repository = branch.repository
4452
4296
except errors.NotBranchError:
4453
4297
repository = dir.open_repository()
4454
repository.pack(clean_obsolete_packs=clean_obsolete_packs)
4298
repository.pack()
4455
4299
4456
4300
4457
4301
class cmd_plugins(Command):
4458
__doc__ = """List the installed plugins.
4302
"""List the installed plugins.
4459
4303
4460
4304
This command displays the list of installed plugins including
4461
4305
version of plugin and a short description of each.
4468
4312
adding new commands, providing additional network transports and
4469
4313
customizing log output.
4470
4314
4471
See the Bazaar Plugin Guide <http://doc.bazaar.canonical.com/plugins/en/>
4472
for further information on plugins including where to find them and how to
4473
install them. Instructions are also provided there on how to write new
4474
plugins using the Python programming language.
4315
See the Bazaar web site, http://bazaar-vcs.org, for further
4316
information on plugins including where to find them and how to
4317
install them. Instructions are also provided there on how to
4318
write new plugins using the Python programming language.
4475
4319
"""
4476
4320
takes_options = ['verbose']
4477
4321
4492
4336
doc = '(no description)'
4493
4337
result.append((name_ver, doc, plugin.path()))
4494
4338
for name_ver, doc, path in sorted(result):
4495
self.outf.write("%s\n" % name_ver)
4496
self.outf.write(" %s\n" % doc)
4339
print name_ver
4340
print ' ', doc
4497
4341
if verbose:
4498
self.outf.write(" %s\n" % path)
4499
self.outf.write("\n")
4342
print ' ', path
4343
print
4500
4344
4501
4345
4502
4346
class cmd_testament(Command):
4503
__doc__ = """Show testament (signing-form) of a revision."""
4347
"""Show testament (signing-form) of a revision."""
4504
4348
takes_options = [
4505
4349
'revision',
4506
4350
Option('long', help='Produce long-format testament.'),
4518
4362
b = Branch.open_containing(branch)[0]
4519
4363
else:
4520
4364
b = Branch.open(branch)
4521
self.add_cleanup(b.lock_read().unlock)
4522
if revision is None:
4523
rev_id = b.last_revision()
4524
else:
4525
rev_id = revision[0].as_revision_id(b)
4526
t = testament_class.from_revision(b.repository, rev_id)
4527
if long:
4528
sys.stdout.writelines(t.as_text_lines())
4529
else:
4530
sys.stdout.write(t.as_short_text())
4365
b.lock_read()
4366
try:
4367
if revision is None:
4368
rev_id = b.last_revision()
4369
else:
4370
rev_id = revision[0].as_revision_id(b)
4371
t = testament_class.from_revision(b.repository, rev_id)
4372
if long:
4373
sys.stdout.writelines(t.as_text_lines())
4374
else:
4375
sys.stdout.write(t.as_short_text())
4376
finally:
4377
b.unlock()
4531
4378
4532
4379
4533
4380
class cmd_annotate(Command):
4534
__doc__ = """Show the origin of each line in a file.
4381
"""Show the origin of each line in a file.
4535
4382
4536
4383
This prints out the given file with an annotation on the left side
4537
4384
indicating which revision, author and date introduced the change.
4548
4395
Option('long', help='Show commit date in annotations.'),
4549
4396
'revision',
4550
4397
'show-ids',
4551
'directory',
4552
4398
]
4553
4399
encoding_type = 'exact'
4554
4400
4555
4401
@display_command
4556
4402
def run(self, filename, all=False, long=False, revision=None,
4557
show_ids=False, directory=None):
4403
show_ids=False):
4558
4404
from bzrlib.annotate import annotate_file, annotate_file_tree
4559
4405
wt, branch, relpath = \
4560
_open_directory_or_containing_tree_or_branch(filename, directory)
4561
if wt is not None:
4562
self.add_cleanup(wt.lock_read().unlock)
4563
else:
4564
self.add_cleanup(branch.lock_read().unlock)
4565
tree = _get_one_revision_tree('annotate', revision, branch=branch)
4566
self.add_cleanup(tree.lock_read().unlock)
4567
if wt is not None:
4568
file_id = wt.path2id(relpath)
4569
else:
4570
file_id = tree.path2id(relpath)
4571
if file_id is None:
4572
raise errors.NotVersionedError(filename)
4573
file_version = tree.inventory[file_id].revision
4574
if wt is not None and revision is None:
4575
# If there is a tree and we're not annotating historical
4576
# versions, annotate the working tree's content.
4577
annotate_file_tree(wt, file_id, self.outf, long, all,
4578
show_ids=show_ids)
4579
else:
4580
annotate_file(branch, file_version, file_id, long, all, self.outf,
4581
show_ids=show_ids)
4406
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
4407
if wt is not None:
4408
wt.lock_read()
4409
else:
4410
branch.lock_read()
4411
try:
4412
tree = _get_one_revision_tree('annotate', revision, branch=branch)
4413
if wt is not None:
4414
file_id = wt.path2id(relpath)
4415
else:
4416
file_id = tree.path2id(relpath)
4417
if file_id is None:
4418
raise errors.NotVersionedError(filename)
4419
file_version = tree.inventory[file_id].revision
4420
if wt is not None and revision is None:
4421
# If there is a tree and we're not annotating historical
4422
# versions, annotate the working tree's content.
4423
annotate_file_tree(wt, file_id, self.outf, long, all,
4424
show_ids=show_ids)
4425
else:
4426
annotate_file(branch, file_version, file_id, long, all, self.outf,
4427
show_ids=show_ids)
4428
finally:
4429
if wt is not None:
4430
wt.unlock()
4431
else:
4432
branch.unlock()
4582
4433
4583
4434
4584
4435
class cmd_re_sign(Command):
4585
__doc__ = """Create a digital signature for an existing revision."""
4436
"""Create a digital signature for an existing revision."""
4586
4437
# TODO be able to replace existing ones.
4587
4438
4588
4439
hidden = True # is this right ?
4589
4440
takes_args = ['revision_id*']
4590
takes_options = ['directory', 'revision']
4441
takes_options = ['revision']
4591
4442
4592
def run(self, revision_id_list=None, revision=None, directory=u'.'):
4443
def run(self, revision_id_list=None, revision=None):
4593
4444
if revision_id_list is not None and revision is not None:
4594
4445
raise errors.BzrCommandError('You can only supply one of revision_id or --revision')
4595
4446
if revision_id_list is None and revision is None:
4596
4447
raise errors.BzrCommandError('You must supply either --revision or a revision_id')
4597
b = WorkingTree.open_containing(directory)[0].branch
4598
self.add_cleanup(b.lock_write().unlock)
4599
return self._run(b, revision_id_list, revision)
4448
b = WorkingTree.open_containing(u'.')[0].branch
4449
b.lock_write()
4450
try:
4451
return self._run(b, revision_id_list, revision)
4452
finally:
4453
b.unlock()
4600
4454
4601
4455
def _run(self, b, revision_id_list, revision):
4602
4456
import bzrlib.gpg as gpg
4647
4501
4648
4502
4649
4503
class cmd_bind(Command):
4650
__doc__ = """Convert the current branch into a checkout of the supplied branch.
4651
If no branch is supplied, rebind to the last bound location.
4504
"""Convert the current branch into a checkout of the supplied branch.
4652
4505
4653
4506
Once converted into a checkout, commits must succeed on the master branch
4654
4507
before they will be applied to the local branch.
4655
4508
4656
4509
Bound branches use the nickname of its master branch unless it is set
4657
locally, in which case binding will update the local nickname to be
4510
locally, in which case binding will update the the local nickname to be
4658
4511
that of the master.
4659
4512
"""
4660
4513
4661
4514
_see_also = ['checkouts', 'unbind']
4662
4515
takes_args = ['location?']
4663
takes_options = ['directory']
4516
takes_options = []
4664
4517
4665
def run(self, location=None, directory=u'.'):
4666
b, relpath = Branch.open_containing(directory)
4518
def run(self, location=None):
4519
b, relpath = Branch.open_containing(u'.')
4667
4520
if location is None:
4668
4521
try:
4669
4522
location = b.get_old_bound_location()
4672
4525
'This format does not remember old locations.')
4673
4526
else:
4674
4527
if location is None:
4675
if b.get_bound_location() is not None:
4676
raise errors.BzrCommandError('Branch is already bound')
4677
else:
4678
raise errors.BzrCommandError('No location supplied '
4679
'and no previous location known')
4528
raise errors.BzrCommandError('No location supplied and no '
4529
'previous location known')
4680
4530
b_other = Branch.open(location)
4681
4531
try:
4682
4532
b.bind(b_other)
4688
4538
4689
4539
4690
4540
class cmd_unbind(Command):
4691
__doc__ = """Convert the current checkout into a regular branch.
4541
"""Convert the current checkout into a regular branch.
4692
4542
4693
4543
After unbinding, the local branch is considered independent and subsequent
4694
4544
commits will be local only.
4696
4546
4697
4547
_see_also = ['checkouts', 'bind']
4698
4548
takes_args = []
4699
takes_options = ['directory']
4549
takes_options = []
4700
4550
4701
def run(self, directory=u'.'):
4702
b, relpath = Branch.open_containing(directory)
4551
def run(self):
4552
b, relpath = Branch.open_containing(u'.')
4703
4553
if not b.unbind():
4704
4554
raise errors.BzrCommandError('Local branch is not bound')
4705
4555
4706
4556
4707
4557
class cmd_uncommit(Command):
4708
__doc__ = """Remove the last committed revision.
4558
"""Remove the last committed revision.
4709
4559
4710
4560
--verbose will print out what is being removed.
4711
4561
--dry-run will go through all the motions, but not actually
4751
4601
b = control.open_branch()
4752
4602
4753
4603
if tree is not None:
4754
self.add_cleanup(tree.lock_write().unlock)
4604
tree.lock_write()
4755
4605
else:
4756
self.add_cleanup(b.lock_write().unlock)
4757
return self._run(b, tree, dry_run, verbose, revision, force, local=local)
4606
b.lock_write()
4607
try:
4608
return self._run(b, tree, dry_run, verbose, revision, force,
4609
local=local)
4610
finally:
4611
if tree is not None:
4612
tree.unlock()
4613
else:
4614
b.unlock()
4758
4615
4759
4616
def _run(self, b, tree, dry_run, verbose, revision, force, local=False):
4760
4617
from bzrlib.log import log_formatter, show_log
4792
4649
end_revision=last_revno)
4793
4650
4794
4651
if dry_run:
4795
self.outf.write('Dry-run, pretending to remove'
4796
' the above revisions.\n')
4652
print 'Dry-run, pretending to remove the above revisions.'
4653
if not force:
4654
val = raw_input('Press <enter> to continue')
4797
4655
else:
4798
self.outf.write('The above revision(s) will be removed.\n')
4799
4800
if not force:
4801
if not ui.ui_factory.get_boolean('Are you sure'):
4802
self.outf.write('Canceled')
4803
return 0
4656
print 'The above revision(s) will be removed.'
4657
if not force:
4658
val = raw_input('Are you sure [y/N]? ')
4659
if val.lower() not in ('y', 'yes'):
4660
print 'Canceled'
4661
return 0
4804
4662
4805
4663
mutter('Uncommitting from {%s} to {%s}',
4806
4664
last_rev_id, rev_id)
4807
4665
uncommit(b, tree=tree, dry_run=dry_run, verbose=verbose,
4808
4666
revno=revno, local=local)
4809
self.outf.write('You can restore the old tip by running:\n'
4810
' bzr pull . -r revid:%s\n' % last_rev_id)
4667
note('You can restore the old tip by running:\n'
4668
' bzr pull . -r revid:%s', last_rev_id)
4811
4669
4812
4670
4813
4671
class cmd_break_lock(Command):
4814
__doc__ = """Break a dead lock on a repository, branch or working directory.
4672
"""Break a dead lock on a repository, branch or working directory.
4815
4673
4816
4674
CAUTION: Locks should only be broken when you are sure that the process
4817
4675
holding the lock has been stopped.
4818
4676
4819
You can get information on what locks are open via the 'bzr info
4820
[location]' command.
4677
You can get information on what locks are open via the 'bzr info' command.
4821
4678
4822
4679
:Examples:
4823
4680
bzr break-lock
4824
bzr break-lock bzr+ssh://example.com/bzr/foo
4825
4681
"""
4826
4682
takes_args = ['location?']
4827
4683
4836
4692
4837
4693
4838
4694
class cmd_wait_until_signalled(Command):
4839
__doc__ = """Test helper for test_start_and_stop_bzr_subprocess_send_signal.
4695
"""Test helper for test_start_and_stop_bzr_subprocess_send_signal.
4840
4696
4841
4697
This just prints a line to signal when it is ready, then blocks on stdin.
4842
4698
"""
4850
4706
4851
4707
4852
4708
class cmd_serve(Command):
4853
__doc__ = """Run the bzr server."""
4709
"""Run the bzr server."""
4854
4710
4855
4711
aliases = ['server']
4856
4712
4857
4713
takes_options = [
4858
4714
Option('inet',
4859
4715
help='Serve on stdin/out for use from inetd or sshd.'),
4860
RegistryOption('protocol',
4861
help="Protocol to serve.",
4716
RegistryOption('protocol',
4717
help="Protocol to serve.",
4862
4718
lazy_registry=('bzrlib.transport', 'transport_server_registry'),
4863
4719
value_switches=True),
4864
4720
Option('port',
4867
4723
'result in a dynamically allocated port. The default port '
4868
4724
'depends on the protocol.',
4869
4725
type=str),
4870
custom_help('directory',
4871
help='Serve contents of this directory.'),
4726
Option('directory',
4727
help='Serve contents of this directory.',
4728
type=unicode),
4872
4729
Option('allow-writes',
4873
4730
help='By default the server is a readonly server. Supplying '
4874
4731
'--allow-writes enables write access to the contents of '
4875
'the served directory and below. Note that ``bzr serve`` '
4876
'does not perform authentication, so unless some form of '
4877
'external authentication is arranged supplying this '
4878
'option leads to global uncontrolled write access to your '
4879
'file system.'
4732
'the served directory and below.'
4880
4733
),
4881
4734
]
4882
4735
4915
4768
4916
4769
4917
4770
class cmd_join(Command):
4918
__doc__ = """Combine a tree into its containing tree.
4771
"""Combine a tree into its containing tree.
4919
4772
4920
4773
This command requires the target tree to be in a rich-root format.
4921
4774
4961
4814
4962
4815
4963
4816
class cmd_split(Command):
4964
__doc__ = """Split a subdirectory of a tree into a separate tree.
4817
"""Split a subdirectory of a tree into a separate tree.
4965
4818
4966
4819
This command will produce a target tree in a format that supports
4967
4820
rich roots, like 'rich-root' or 'rich-root-pack'. These formats cannot be
4987
4840
4988
4841
4989
4842
class cmd_merge_directive(Command):
4990
__doc__ = """Generate a merge directive for auto-merge tools.
4843
"""Generate a merge directive for auto-merge tools.
4991
4844
4992
4845
A directive requests a merge to be performed, and also provides all the
4993
4846
information necessary to do so. This means it must either include a
5086
4939
5087
4940
5088
4941
class cmd_send(Command):
5089
__doc__ = """Mail or create a merge-directive for submitting changes.
4942
"""Mail or create a merge-directive for submitting changes.
5090
4943
5091
4944
A merge directive provides many things needed for requesting merges:
5092
4945
5098
4951
directly from the merge directive, without retrieving data from a
5099
4952
branch.
5100
4953
5101
`bzr send` creates a compact data set that, when applied using bzr
5102
merge, has the same effect as merging from the source branch.
5103
5104
By default the merge directive is self-contained and can be applied to any
5105
branch containing submit_branch in its ancestory without needing access to
5106
the source branch.
5107
5108
If --no-bundle is specified, then Bazaar doesn't send the contents of the
5109
revisions, but only a structured request to merge from the
5110
public_location. In that case the public_branch is needed and it must be
5111
up-to-date and accessible to the recipient. The public_branch is always
5112
included if known, so that people can check it later.
5113
5114
The submit branch defaults to the parent of the source branch, but can be
5115
overridden. Both submit branch and public branch will be remembered in
5116
branch.conf the first time they are used for a particular branch. The
5117
source branch defaults to that containing the working directory, but can
5118
be changed using --from.
5119
5120
In order to calculate those changes, bzr must analyse the submit branch.
5121
Therefore it is most efficient for the submit branch to be a local mirror.
5122
If a public location is known for the submit_branch, that location is used
5123
in the merge directive.
5124
5125
The default behaviour is to send the merge directive by mail, unless -o is
5126
given, in which case it is sent to a file.
4954
If --no-bundle is specified, then public_branch is needed (and must be
4955
up-to-date), so that the receiver can perform the merge using the
4956
public_branch. The public_branch is always included if known, so that
4957
people can check it later.
4958
4959
The submit branch defaults to the parent, but can be overridden. Both
4960
submit branch and public branch will be remembered if supplied.
4961
4962
If a public_branch is known for the submit_branch, that public submit
4963
branch is used in the merge instructions. This means that a local mirror
4964
can be used as your actual submit branch, once you have set public_branch
4965
for that mirror.
5127
4966
5128
4967
Mail is sent using your preferred mail program. This should be transparent
5129
4968
on Windows (it uses MAPI). On Linux, it requires the xdg-email utility.
5131
4970
5132
4971
To use a specific mail program, set the mail_client configuration option.
5133
4972
(For Thunderbird 1.5, this works around some bugs.) Supported values for
5134
specific clients are "claws", "evolution", "kmail", "mail.app" (MacOS X's
5135
Mail.app), "mutt", and "thunderbird"; generic options are "default",
5136
"editor", "emacsclient", "mapi", and "xdg-email". Plugins may also add
5137
supported clients.
4973
specific clients are "claws", "evolution", "kmail", "mutt", and
4974
"thunderbird"; generic options are "default", "editor", "emacsclient",
4975
"mapi", and "xdg-email". Plugins may also add supported clients.
5138
4976
5139
4977
If mail is being sent, a to address is required. This can be supplied
5140
4978
either on the commandline, by setting the submit_to configuration
5149
4987
5150
4988
The merge directives created by bzr send may be applied using bzr merge or
5151
4989
bzr pull by specifying a file containing a merge directive as the location.
5152
5153
bzr send makes extensive use of public locations to map local locations into
5154
URLs that can be used by other people. See `bzr help configuration` to
5155
set them, and use `bzr info` to display them.
5156
4990
"""
5157
4991
5158
4992
encoding_type = 'exact'
5174
5008
short_name='f',
5175
5009
type=unicode),
5176
5010
Option('output', short_name='o',
5177
help='Write merge directive to this file or directory; '
5011
help='Write merge directive to this file; '
5178
5012
'use - for stdout.',
5179
5013
type=unicode),
5180
5014
Option('strict',
5203
5037
5204
5038
5205
5039
class cmd_bundle_revisions(cmd_send):
5206
__doc__ = """Create a merge-directive for submitting changes.
5040
"""Create a merge-directive for submitting changes.
5207
5041
5208
5042
A merge directive provides many things needed for requesting merges:
5209
5043
5276
5110
5277
5111
5278
5112
class cmd_tag(Command):
5279
__doc__ = """Create, remove or modify a tag naming a revision.
5113
"""Create, remove or modify a tag naming a revision.
5280
5114
5281
5115
Tags give human-meaningful names to revisions. Commands that take a -r
5282
5116
(--revision) option can be given -rtag:X, where X is any previously
5290
5124
5291
5125
To rename a tag (change the name but keep it on the same revsion), run ``bzr
5292
5126
tag new-name -r tag:old-name`` and then ``bzr tag --delete oldname``.
5293
5294
If no tag name is specified it will be determined through the
5295
'automatic_tag_name' hook. This can e.g. be used to automatically tag
5296
upstream releases by reading configure.ac. See ``bzr help hooks`` for
5297
details.
5298
5127
"""
5299
5128
5300
5129
_see_also = ['commit', 'tags']
5301
takes_args = ['tag_name?']
5130
takes_args = ['tag_name']
5302
5131
takes_options = [
5303
5132
Option('delete',
5304
5133
help='Delete this tag rather than placing it.',
5305
5134
),
5306
custom_help('directory',
5307
help='Branch in which to place the tag.'),
5135
Option('directory',
5136
help='Branch in which to place the tag.',
5137
short_name='d',
5138
type=unicode,
5139
),
5308
5140
Option('force',
5309
5141
help='Replace existing tags.',
5310
5142
),
5311
5143
'revision',
5312
5144
]
5313
5145
5314
def run(self, tag_name=None,
5146
def run(self, tag_name,
5315
5147
delete=None,
5316
5148
directory='.',
5317
5149
force=None,
5318
5150
revision=None,
5319
5151
):
5320
5152
branch, relpath = Branch.open_containing(directory)
5321
self.add_cleanup(branch.lock_write().unlock)
5322
if delete:
5323
if tag_name is None:
5324
raise errors.BzrCommandError("No tag specified to delete.")
5325
branch.tags.delete_tag(tag_name)
5326
self.outf.write('Deleted tag %s.\n' % tag_name)
5327
else:
5328
if revision:
5329
if len(revision) != 1:
5330
raise errors.BzrCommandError(
5331
"Tags can only be placed on a single revision, "
5332
"not on a range")
5333
revision_id = revision[0].as_revision_id(branch)
5153
branch.lock_write()
5154
try:
5155
if delete:
5156
branch.tags.delete_tag(tag_name)
5157
self.outf.write('Deleted tag %s.\n' % tag_name)
5334
5158
else:
5335
revision_id = branch.last_revision()
5336
if tag_name is None:
5337
tag_name = branch.automatic_tag_name(revision_id)
5338
if tag_name is None:
5339
raise errors.BzrCommandError(
5340
"Please specify a tag name.")
5341
if (not force) and branch.tags.has_tag(tag_name):
5342
raise errors.TagAlreadyExists(tag_name)
5343
branch.tags.set_tag(tag_name, revision_id)
5344
self.outf.write('Created tag %s.\n' % tag_name)
5159
if revision:
5160
if len(revision) != 1:
5161
raise errors.BzrCommandError(
5162
"Tags can only be placed on a single revision, "
5163
"not on a range")
5164
revision_id = revision[0].as_revision_id(branch)
5165
else:
5166
revision_id = branch.last_revision()
5167
if (not force) and branch.tags.has_tag(tag_name):
5168
raise errors.TagAlreadyExists(tag_name)
5169
branch.tags.set_tag(tag_name, revision_id)
5170
self.outf.write('Created tag %s.\n' % tag_name)
5171
finally:
5172
branch.unlock()
5345
5173
5346
5174
5347
5175
class cmd_tags(Command):
5348
__doc__ = """List tags.
5176
"""List tags.
5349
5177
5350
5178
This command shows a table of tag names and the revisions they reference.
5351
5179
"""
5352
5180
5353
5181
_see_also = ['tag']
5354
5182
takes_options = [
5355
custom_help('directory',
5356
help='Branch whose tags should be displayed.'),
5183
Option('directory',
5184
help='Branch whose tags should be displayed.',
5185
short_name='d',
5186
type=unicode,
5187
),
5357
5188
RegistryOption.from_kwargs('sort',
5358
5189
'Sort tags by different criteria.', title='Sorting',
5359
5190
alpha='Sort tags lexicographically (default).',
5376
5207
if not tags:
5377
5208
return
5378
5209
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()
5210
branch.lock_read()
5211
try:
5212
if revision:
5213
graph = branch.repository.get_graph()
5214
rev1, rev2 = _get_revision_range(revision, branch, self.name())
5215
revid1, revid2 = rev1.rev_id, rev2.rev_id
5216
# only show revisions between revid1 and revid2 (inclusive)
5217
tags = [(tag, revid) for tag, revid in tags if
5218
graph.is_between(revid, revid1, revid2)]
5219
if sort == 'alpha':
5220
tags.sort()
5221
elif sort == 'time':
5222
timestamps = {}
5223
for tag, revid in tags:
5224
try:
5225
revobj = branch.repository.get_revision(revid)
5226
except errors.NoSuchRevision:
5227
timestamp = sys.maxint # place them at the end
5228
else:
5229
timestamp = revobj.timestamp
5230
timestamps[revid] = timestamp
5231
tags.sort(key=lambda x: timestamps[x[1]])
5232
if not show_ids:
5233
# [ (tag, revid), ... ] -> [ (tag, dotted_revno), ... ]
5234
for index, (tag, revid) in enumerate(tags):
5235
try:
5236
revno = branch.revision_id_to_dotted_revno(revid)
5237
if isinstance(revno, tuple):
5238
revno = '.'.join(map(str, revno))
5239
except errors.NoSuchRevision:
5240
# Bad tag data/merges can lead to tagged revisions
5241
# which are not in this branch. Fail gracefully ...
5242
revno = '?'
5243
tags[index] = (tag, revno)
5244
finally:
5245
branch.unlock()
5413
5246
for tag, revspec in tags:
5414
5247
self.outf.write('%-20s %s\n' % (tag, revspec))
5415
5248
5416
5249
5417
5250
class cmd_reconfigure(Command):
5418
__doc__ = """Reconfigure the type of a bzr directory.
5251
"""Reconfigure the type of a bzr directory.
5419
5252
5420
5253
A target configuration must be specified.
5421
5254
5506
5339
5507
5340
5508
5341
class cmd_switch(Command):
5509
__doc__ = """Set the branch of a checkout and update.
5342
"""Set the branch of a checkout and update.
5510
5343
5511
5344
For lightweight checkouts, this changes the branch being referenced.
5512
5345
For heavyweight checkouts, this checks that there are no local commits
5524
5357
/path/to/newbranch.
5525
5358
5526
5359
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
5360
locally, in which case switching will update the the local nickname to be
5528
5361
that of the master.
5529
5362
"""
5530
5363
5531
takes_args = ['to_location?']
5364
takes_args = ['to_location']
5532
5365
takes_options = [Option('force',
5533
5366
help='Switch even if local commits will be lost.'),
5534
'revision',
5535
5367
Option('create-branch', short_name='b',
5536
5368
help='Create the target branch from this one before'
5537
5369
' switching to it.'),
5538
]
5370
]
5539
5371
5540
def run(self, to_location=None, force=False, create_branch=False,
5541
revision=None):
5372
def run(self, to_location, force=False, create_branch=False):
5542
5373
from bzrlib import switch
5543
5374
tree_location = '.'
5544
revision = _get_one_revision('switch', revision)
5545
5375
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
5376
try:
5552
5377
branch = control_dir.open_branch()
5553
5378
had_explicit_nick = branch.get_config().has_explicit_nickname()
5558
5383
if branch is None:
5559
5384
raise errors.BzrCommandError('cannot create branch without'
5560
5385
' source branch')
5561
to_location = directory_service.directories.dereference(
5562
to_location)
5563
5386
if '/' not in to_location and '\\' not in to_location:
5564
5387
# This path is meant to be relative to the existing branch
5565
5388
this_url = self._get_branch_location(control_dir)
5567
5390
to_branch = branch.bzrdir.sprout(to_location,
5568
5391
possible_transports=[branch.bzrdir.root_transport],
5569
5392
source_branch=branch).open_branch()
5393
# try:
5394
# from_branch = control_dir.open_branch()
5395
# except errors.NotBranchError:
5396
# raise BzrCommandError('Cannot create a branch from this'
5397
# ' location when we cannot open this branch')
5398
# from_branch.bzrdir.sprout(
5399
pass
5570
5400
else:
5571
5401
try:
5572
5402
to_branch = Branch.open(to_location)
5574
5404
this_url = self._get_branch_location(control_dir)
5575
5405
to_branch = Branch.open(
5576
5406
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)
5407
switch.switch(control_dir, to_branch, force)
5580
5408
if had_explicit_nick:
5581
5409
branch = control_dir.open_branch() #get the new branch!
5582
5410
branch.nick = to_branch.nick
5602
5430
5603
5431
5604
5432
class cmd_view(Command):
5605
__doc__ = """Manage filtered views.
5433
"""Manage filtered views.
5606
5434
5607
5435
Views provide a mask over the tree so that users can focus on
5608
5436
a subset of a tree when doing their work. After creating a view,
5756
5584
5757
5585
5758
5586
class cmd_hooks(Command):
5759
__doc__ = """Show hooks."""
5587
"""Show hooks."""
5760
5588
5761
5589
hidden = True
5762
5590
5775
5603
self.outf.write(" <no hooks installed>\n")
5776
5604
5777
5605
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
5606
class cmd_shelve(Command):
5804
__doc__ = """Temporarily set aside some changes from the current tree.
5607
"""Temporarily set aside some changes from the current tree.
5805
5608
5806
5609
Shelve allows you to temporarily put changes you've made "on the shelf",
5807
5610
ie. out of the way, until a later time when you can bring them back from
5854
5657
try:
5855
5658
shelver.run()
5856
5659
finally:
5857
shelver.finalize()
5660
shelver.work_tree.unlock()
5858
5661
except errors.UserAbort:
5859
5662
return 0
5860
5663
5861
5664
def run_for_list(self):
5862
5665
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
5666
tree.lock_read()
5667
try:
5668
manager = tree.get_shelf_manager()
5669
shelves = manager.active_shelves()
5670
if len(shelves) == 0:
5671
note('No shelved changes.')
5672
return 0
5673
for shelf_id in reversed(shelves):
5674
message = manager.get_metadata(shelf_id).get('message')
5675
if message is None:
5676
message = '<no message>'
5677
self.outf.write('%3d: %s\n' % (shelf_id, message))
5678
return 1
5679
finally:
5680
tree.unlock()
5875
5681
5876
5682
5877
5683
class cmd_unshelve(Command):
5878
__doc__ = """Restore shelved changes.
5684
"""Restore shelved changes.
5879
5685
5880
5686
By default, the most recently shelved changes are restored. However if you
5881
5687
specify a shelf by id those changes will be restored instead. This works
5889
5695
enum_switch=False, value_switches=True,
5890
5696
apply="Apply changes and remove from the shelf.",
5891
5697
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.",
5698
delete_only="Delete changes without applying them."
5896
5699
)
5897
5700
]
5898
5701
_see_also = ['shelve']
5907
5710
5908
5711
5909
5712
class cmd_clean_tree(Command):
5910
__doc__ = """Remove unwanted files from working tree.
5713
"""Remove unwanted files from working tree.
5911
5714
5912
5715
By default, only unknown files, not ignored files, are deleted. Versioned
5913
5716
files are never deleted.
5921
5724
5922
5725
To check what clean-tree will do, use --dry-run.
5923
5726
"""
5924
takes_options = ['directory',
5925
Option('ignored', help='Delete all ignored files.'),
5727
takes_options = [Option('ignored', help='Delete all ignored files.'),
5926
5728
Option('detritus', help='Delete conflict files, merge'
5927
5729
' backups, and failed selftest dirs.'),
5928
5730
Option('unknown',
5931
5733
' deleting them.'),
5932
5734
Option('force', help='Do not prompt before deleting.')]
5933
5735
def run(self, unknown=False, ignored=False, detritus=False, dry_run=False,
5934
force=False, directory=u'.'):
5736
force=False):
5935
5737
from bzrlib.clean_tree import clean_tree
5936
5738
if not (unknown or ignored or detritus):
5937
5739
unknown = True
5938
5740
if dry_run:
5939
5741
force = True
5940
clean_tree(directory, unknown=unknown, ignored=ignored,
5941
detritus=detritus, dry_run=dry_run, no_prompt=force)
5742
clean_tree('.', unknown=unknown, ignored=ignored, detritus=detritus,
5743
dry_run=dry_run, no_prompt=force)
5942
5744
5943
5745
5944
5746
class cmd_reference(Command):
5945
__doc__ = """list, view and set branch locations for nested trees.
5747
"""list, view and set branch locations for nested trees.
5946
5748
5947
5749
If no arguments are provided, lists the branch locations for nested trees.
5948
5750
If one argument is provided, display the branch location for that tree.
5988
5790
self.outf.write('%s %s\n' % (path, location))
5989
5791
5990
5792
5991
def _register_lazy_builtins():
5992
# register lazy builtins from other modules; called at startup and should
5993
# be only called once.
5994
for (name, aliases, module_name) in [
5995
('cmd_bundle_info', [], 'bzrlib.bundle.commands'),
5996
('cmd_dpush', [], 'bzrlib.foreign'),
5997
('cmd_version_info', [], 'bzrlib.cmd_version_info'),
5998
('cmd_resolve', ['resolved'], 'bzrlib.conflicts'),
5999
('cmd_conflicts', [], 'bzrlib.conflicts'),
6000
('cmd_sign_my_commits', [], 'bzrlib.sign_my_commits'),
6001
]:
6002
builtin_command_registry.register_lazy(name, aliases, module_name)
5793
# these get imported and then picked up by the scan for cmd_*
5794
# TODO: Some more consistent way to split command definitions across files;
5795
# we do need to load at least some information about them to know of
5796
# aliases. ideally we would avoid loading the implementation until the
5797
# details were needed.
5798
from bzrlib.cmd_version_info import cmd_version_info
5799
from bzrlib.conflicts import cmd_resolve, cmd_conflicts, restore
5800
from bzrlib.bundle.commands import (
5801
cmd_bundle_info,
5802
)
5803
from bzrlib.foreign import cmd_dpush
5804
from bzrlib.sign_my_commits import cmd_sign_my_commits
5805
from bzrlib.weave_commands import cmd_versionedfile_list, \
5806
cmd_weave_plan_merge, cmd_weave_merge_text
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0