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