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 4501.3.6
- compare with another revision
- download diff
- download tarball
- view history from revision 4501.3.6
- Committer: Ian Clatworthy
- Date: 2009-07-13 06:58:49 UTC
- mto: (4527.1.1 integration)
- mto: This revision was merged to the branch mainline in revision 4529.
- Revision ID: ian.clatworthy@canonical.com-20090713065849-n7g2rsjyl6dt1mgv
Apply review feedback
- files added:
- bzrlib/textui.py
- doc/en/developer-guide
- doc/es/developer-guide
- doc/es/release-notes
- doc/es/user-reference
- files removed:
- .testr.conf
- apport
- bzrlib/help_topics/es
- bzrlib/plugins/bash_completion
- bzrlib/plugins/bash_completion/tests
- bzrlib/plugins/news_merge
- bzrlib/plugins/news_merge/tests
- bzrlib/tests/per_bzrdir_colo
- bzrlib/tests/per_foreign_vcs
- bzrlib/tests/per_uifactory
- contrib/debian
- doc/developers/_static
- doc/developers/_templates
- doc/en/_static
- doc/en/_static/en
- doc/en/_templates
- doc/en/whats-new
- doc/es/_static
- doc/es/_static/es
- doc/es/_templates
- 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
- doc/ru/_static
- doc/ru/_static/ru
- doc/ru/_templates
- tools/win32/buildout-templates
- tools/win32/buildout-templates/bin
- 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/tests/per_pack_repository.py => bzrlib/tests/test_pack_repository.py
- bzrlib/tests/per_versionedfile.py => bzrlib/tests/test_versionedfile.py
- doc/developers/HACKING.txt => doc/en/developer-guide/HACKING.txt
- doc/en/_static/en/Makefile => doc/en/quick-reference/Makefile
- doc/en/_static/en/bzr-en-quick-reference.pdf => doc/en/quick-reference/quick-start-summary.pdf
- doc/en/_static/en/bzr-en-quick-reference.png => doc/en/quick-reference/quick-start-summary.png
- doc/en/_static/en/bzr-en-quick-reference.svg => doc/en/quick-reference/quick-start-summary.svg
- doc/es/_static/es/Makefile => doc/es/quick-reference/Makefile
- doc/es/_static/es/bzr-es-quick-reference.pdf => doc/es/quick-reference/quick-start-summary.pdf
- doc/es/_static/es/bzr-es-quick-reference.png => doc/es/quick-reference/quick-start-summary.png
- doc/es/_static/es/bzr-es-quick-reference.svg => doc/es/quick-reference/quick-start-summary.svg
- bzrlib/help_topics/es/conflict-types.txt => doc/es/user-guide/resolving_conflicts.txt
- doc/es/index.txt => doc/index.es.txt
- doc/ru/index.txt => doc/index.ru.txt
- doc/ru/_static/ru/Makefile => doc/ru/quick-reference/Makefile
- doc/ru/_static/ru/bzr-ru-quick-reference.pdf => doc/ru/quick-reference/quick-start-summary.pdf
- doc/ru/_static/ru/bzr-ru-quick-reference.png => doc/ru/quick-reference/quick-start-summary.png
- doc/ru/_static/ru/bzr-ru-quick-reference.svg => doc/ru/quick-reference/quick-start-summary.svg
- 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,
128
120
129
121
130
122
def _get_one_revision_tree(command_name, revisions, branch=None, tree=None):
131
"""Get a revision tree. Not suitable for commands that change the tree.
132
133
Specifically, the basis tree in dirstate trees is coupled to the dirstate
134
and doing a commit/uncommit/pull will at best fail due to changing the
135
basis revision data.
136
137
If tree is passed in, it should be already locked, for lifetime management
138
of the trees internal cached state.
139
"""
140
123
if branch is None:
141
124
branch = tree.branch
142
125
if revisions is None:
232
215
return view_info
233
216
234
217
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
218
# TODO: Make sure no commands unconditionally use the working directory as a
244
219
# branch. If a filename argument is used, the first of them should be used to
245
220
# specify the branch. (Perhaps this can be factored out into some kind of
247
222
# opens the branch?)
248
223
249
224
class cmd_status(Command):
250
__doc__ = """Display status summary.
225
"""Display status summary.
251
226
252
227
This reports on versioned and unknown files, reporting them
253
228
grouped by state. Possible states are:
273
248
unknown
274
249
Not versioned and not matching an ignore pattern.
275
250
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
251
To see ignored files use 'bzr ignored'. For details on the
281
252
changes to file texts, use 'bzr diff'.
282
253
340
311
341
312
342
313
class cmd_cat_revision(Command):
343
__doc__ = """Write out metadata for a revision.
314
"""Write out metadata for a revision.
344
315
345
316
The revision to print can either be specified by a specific
346
317
revision identifier, or you can use --revision.
348
319
349
320
hidden = True
350
321
takes_args = ['revision_id?']
351
takes_options = ['directory', 'revision']
322
takes_options = ['revision']
352
323
# cat-revision is more for frontends so should be exact
353
324
encoding = 'strict'
354
325
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
326
@display_command
364
def run(self, revision_id=None, revision=None, directory=u'.'):
327
def run(self, revision_id=None, revision=None):
365
328
if revision_id is not None and revision is not None:
366
329
raise errors.BzrCommandError('You can only supply one of'
367
330
' revision_id or --revision')
368
331
if revision_id is None and revision is None:
369
332
raise errors.BzrCommandError('You must supply either'
370
333
' --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
334
b = WorkingTree.open_containing(u'.')[0].branch
335
336
# TODO: jam 20060112 should cat-revision always output utf-8?
337
if revision_id is not None:
338
revision_id = osutils.safe_revision_id(revision_id, warn=False)
339
try:
340
self.outf.write(b.repository.get_revision_xml(revision_id).decode('utf-8'))
341
except errors.NoSuchRevision:
342
msg = "The repository %s contains no revision %s." % (b.repository.base,
343
revision_id)
344
raise errors.BzrCommandError(msg)
345
elif revision is not None:
346
for rev in revision:
347
if rev is None:
348
raise errors.BzrCommandError('You cannot specify a NULL'
349
' revision.')
350
rev_id = rev.as_revision_id(b)
351
self.outf.write(b.repository.get_revision_xml(rev_id).decode('utf-8'))
352
399
353
400
354
class cmd_dump_btree(Command):
401
__doc__ = """Dump the contents of a btree index file to stdout.
355
"""Dump the contents of a btree index file to stdout.
402
356
403
357
PATH is a btree index file, it can be any URL. This includes things like
404
358
.bzr/repository/pack-names, or .bzr/repository/indices/a34b3a...ca4a4.iix
468
422
for node in bt.iter_all_entries():
469
423
# Node is made up of:
470
424
# (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,))
425
self.outf.write('%s\n' % (node[1:],))
479
426
480
427
481
428
class cmd_remove_tree(Command):
482
__doc__ = """Remove the working tree from a given branch/checkout.
429
"""Remove the working tree from a given branch/checkout.
483
430
484
431
Since a lightweight checkout is little more than a working tree
485
432
this will refuse to run against one.
487
434
To re-create the working tree, use "bzr checkout".
488
435
"""
489
436
_see_also = ['checkout', 'working-trees']
490
takes_args = ['location*']
437
takes_args = ['location?']
491
438
takes_options = [
492
439
Option('force',
493
440
help='Remove the working tree even if it has '
494
441
'uncommitted changes.'),
495
442
]
496
443
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()
444
def run(self, location='.', force=False):
445
d = bzrdir.BzrDir.open(location)
446
447
try:
448
working = d.open_workingtree()
449
except errors.NoWorkingTree:
450
raise errors.BzrCommandError("No working tree to remove")
451
except errors.NotLocalUrl:
452
raise errors.BzrCommandError("You cannot remove the working tree"
453
" of a remote path")
454
if not force:
455
# XXX: What about pending merges ? -- vila 20090629
456
if working.has_changes(working.basis_tree()):
457
raise errors.UncommittedChanges(working)
458
459
working_path = working.bzrdir.root_transport.base
460
branch_path = working.branch.bzrdir.root_transport.base
461
if working_path != branch_path:
462
raise errors.BzrCommandError("You cannot remove the working tree"
463
" from a lightweight checkout")
464
465
d.destroy_workingtree()
520
466
521
467
522
468
class cmd_revno(Command):
523
__doc__ = """Show current revision number.
469
"""Show current revision number.
524
470
525
471
This is equal to the number of revisions on this branch.
526
472
"""
536
482
if tree:
537
483
try:
538
484
wt = WorkingTree.open_containing(location)[0]
539
self.add_cleanup(wt.lock_read().unlock)
485
wt.lock_read()
540
486
except (errors.NoWorkingTree, errors.NotLocalUrl):
541
487
raise errors.NoWorkingTree(location)
542
revid = wt.last_revision()
543
488
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)
489
revid = wt.last_revision()
490
try:
491
revno_t = wt.branch.revision_id_to_dotted_revno(revid)
492
except errors.NoSuchRevision:
493
revno_t = ('???',)
494
revno = ".".join(str(n) for n in revno_t)
495
finally:
496
wt.unlock()
548
497
else:
549
498
b = Branch.open_containing(location)[0]
550
self.add_cleanup(b.lock_read().unlock)
551
revno = b.revno()
552
self.cleanup_now()
499
b.lock_read()
500
try:
501
revno = b.revno()
502
finally:
503
b.unlock()
504
553
505
self.outf.write(str(revno) + '\n')
554
506
555
507
556
508
class cmd_revision_info(Command):
557
__doc__ = """Show revision number and revision id for a given revision identifier.
509
"""Show revision number and revision id for a given revision identifier.
558
510
"""
559
511
hidden = True
560
512
takes_args = ['revision_info*']
561
513
takes_options = [
562
514
'revision',
563
custom_help('directory',
515
Option('directory',
564
516
help='Branch to examine, '
565
'rather than the one containing the working directory.'),
517
'rather than the one containing the working directory.',
518
short_name='d',
519
type=unicode,
520
),
566
521
Option('tree', help='Show revno of working tree'),
567
522
]
568
523
573
528
try:
574
529
wt = WorkingTree.open_containing(directory)[0]
575
530
b = wt.branch
576
self.add_cleanup(wt.lock_read().unlock)
531
wt.lock_read()
577
532
except (errors.NoWorkingTree, errors.NotLocalUrl):
578
533
wt = None
579
534
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())
535
b.lock_read()
536
try:
537
revision_ids = []
538
if revision is not None:
539
revision_ids.extend(rev.as_revision_id(b) for rev in revision)
540
if revision_info_list is not None:
541
for rev_str in revision_info_list:
542
rev_spec = RevisionSpec.from_string(rev_str)
543
revision_ids.append(rev_spec.as_revision_id(b))
544
# No arguments supplied, default to the last revision
545
if len(revision_ids) == 0:
546
if tree:
547
if wt is None:
548
raise errors.NoWorkingTree(directory)
549
revision_ids.append(wt.last_revision())
550
else:
551
revision_ids.append(b.last_revision())
552
553
revinfos = []
554
maxlen = 0
555
for revision_id in revision_ids:
556
try:
557
dotted_revno = b.revision_id_to_dotted_revno(revision_id)
558
revno = '.'.join(str(i) for i in dotted_revno)
559
except errors.NoSuchRevision:
560
revno = '???'
561
maxlen = max(maxlen, len(revno))
562
revinfos.append([revno, revision_id])
563
finally:
564
if wt is None:
565
b.unlock()
594
566
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()
567
wt.unlock()
568
609
569
for ri in revinfos:
610
570
self.outf.write('%*s %s\n' % (maxlen, ri[0], ri[1]))
611
571
612
572
613
573
class cmd_add(Command):
614
__doc__ = """Add specified files or directories.
574
"""Add specified files or directories.
615
575
616
576
In non-recursive mode, all the named items are added, regardless
617
577
of whether they were previously ignored. A warning is given if
643
603
branches that will be merged later (without showing the two different
644
604
adds as a conflict). It is also useful when merging another project
645
605
into a subdirectory of this one.
646
647
Any files matching patterns in the ignore list will not be added
648
unless they are explicitly mentioned.
649
606
"""
650
607
takes_args = ['file*']
651
608
takes_options = [
659
616
help='Lookup file ids from this tree.'),
660
617
]
661
618
encoding_type = 'replace'
662
_see_also = ['remove', 'ignore']
619
_see_also = ['remove']
663
620
664
621
def run(self, file_list, no_recurse=False, dry_run=False, verbose=False,
665
622
file_ids_from=None):
682
639
should_print=(not is_quiet()))
683
640
684
641
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()
642
base_tree.lock_read()
643
try:
644
file_list = self._maybe_expand_globs(file_list)
645
tree, file_list = tree_files_for_add(file_list)
646
added, ignored = tree.smart_add(file_list, not
647
no_recurse, action=action, save=not dry_run)
648
finally:
649
if base_tree is not None:
650
base_tree.unlock()
690
651
if len(ignored) > 0:
691
652
if verbose:
692
653
for glob in sorted(ignored.keys()):
693
654
for path in ignored[glob]:
694
655
self.outf.write("ignored %s matching \"%s\"\n"
695
656
% (path, glob))
657
else:
658
match_len = 0
659
for glob, paths in ignored.items():
660
match_len += len(paths)
661
self.outf.write("ignored %d file(s).\n" % match_len)
662
self.outf.write("If you wish to add ignored files, "
663
"please add them explicitly by name. "
664
"(\"bzr ignored\" gives a list)\n")
696
665
697
666
698
667
class cmd_mkdir(Command):
699
__doc__ = """Create a new versioned directory.
668
"""Create a new versioned directory.
700
669
701
670
This is equivalent to creating the directory and then adding it.
702
671
"""
706
675
707
676
def run(self, dir_list):
708
677
for d in dir_list:
678
os.mkdir(d)
709
679
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)
680
wt.add([dd])
681
self.outf.write('added %s\n' % d)
718
682
719
683
720
684
class cmd_relpath(Command):
721
__doc__ = """Show path of a file relative to root"""
685
"""Show path of a file relative to root"""
722
686
723
687
takes_args = ['filename']
724
688
hidden = True
733
697
734
698
735
699
class cmd_inventory(Command):
736
__doc__ = """Show inventory of the current working copy or a revision.
700
"""Show inventory of the current working copy or a revision.
737
701
738
702
It is possible to limit the output to a particular entry
739
703
type using the --kind option. For example: --kind file.
760
724
761
725
revision = _get_one_revision('inventory', revision)
762
726
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()
727
work_tree.lock_read()
728
try:
729
if revision is not None:
730
tree = revision.as_tree(work_tree.branch)
731
732
extra_trees = [work_tree]
733
tree.lock_read()
734
else:
735
tree = work_tree
736
extra_trees = []
737
738
if file_list is not None:
739
file_ids = tree.paths2ids(file_list, trees=extra_trees,
740
require_versioned=True)
741
# find_ids_across_trees may include some paths that don't
742
# exist in 'tree'.
743
entries = sorted((tree.id2path(file_id), tree.inventory[file_id])
744
for file_id in file_ids if file_id in tree)
745
else:
746
entries = tree.inventory.entries()
747
finally:
748
tree.unlock()
749
if tree is not work_tree:
750
work_tree.unlock()
751
784
752
for path, entry in entries:
785
753
if kind and kind != entry.kind:
786
754
continue
792
760
793
761
794
762
class cmd_mv(Command):
795
__doc__ = """Move or rename a file.
763
"""Move or rename a file.
796
764
797
765
:Usage:
798
766
bzr mv OLDNAME NEWNAME
831
799
if len(names_list) < 2:
832
800
raise errors.BzrCommandError("missing file argument")
833
801
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)
802
tree.lock_write()
803
try:
804
self._run(tree, names_list, rel_names, after)
805
finally:
806
tree.unlock()
836
807
837
808
def run_auto(self, names_list, after, dry_run):
838
809
if names_list is not None and len(names_list) > 1:
842
813
raise errors.BzrCommandError('--after cannot be specified with'
843
814
' --auto.')
844
815
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)
816
work_tree.lock_write()
817
try:
818
rename_map.RenameMap.guess_renames(work_tree, dry_run)
819
finally:
820
work_tree.unlock()
847
821
848
822
def _run(self, tree, names_list, rel_names, after):
849
823
into_existing = osutils.isdir(names_list[-1])
870
844
# All entries reference existing inventory items, so fix them up
871
845
# for cicp file-systems.
872
846
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))
847
for pair in tree.move(rel_names[:-1], rel_names[-1], after=after):
848
self.outf.write("%s => %s\n" % pair)
876
849
else:
877
850
if len(names_list) != 2:
878
851
raise errors.BzrCommandError('to mv multiple files the'
922
895
dest = osutils.pathjoin(dest_parent, dest_tail)
923
896
mutter("attempting to move %s => %s", src, dest)
924
897
tree.rename_one(src, dest, after=after)
925
if not is_quiet():
926
self.outf.write("%s => %s\n" % (src, dest))
898
self.outf.write("%s => %s\n" % (src, dest))
927
899
928
900
929
901
class cmd_pull(Command):
930
__doc__ = """Turn this branch into a mirror of another branch.
902
"""Turn this branch into a mirror of another branch.
931
903
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.
904
This command only works on branches that have not diverged. Branches are
905
considered diverged if the destination branch's most recent commit is one
906
that has not been merged (directly or indirectly) into the parent.
936
907
937
908
If branches have diverged, you can use 'bzr merge' to integrate the changes
938
909
from one into the other. Once one branch has merged, the other should
939
910
be able to pull it again.
940
911
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.
912
If you want to forget your local changes and just update your branch to
913
match the remote one, use pull --overwrite.
944
914
945
915
If there is no default location set, the first pull will set it. After
946
916
that, you can omit the location to use the default. To change the
956
926
takes_options = ['remember', 'overwrite', 'revision',
957
927
custom_help('verbose',
958
928
help='Show logs of pulled revisions.'),
959
custom_help('directory',
929
Option('directory',
960
930
help='Branch to pull into, '
961
'rather than the one containing the working directory.'),
931
'rather than the one containing the working directory.',
932
short_name='d',
933
type=unicode,
934
),
962
935
Option('local',
963
936
help="Perform a local pull in a bound "
964
937
"branch. Local pulls are not applied to "
979
952
try:
980
953
tree_to = WorkingTree.open_containing(directory)[0]
981
954
branch_to = tree_to.branch
982
self.add_cleanup(tree_to.lock_write().unlock)
983
955
except errors.NoWorkingTree:
984
956
tree_to = None
985
957
branch_to = Branch.open_containing(directory)[0]
986
self.add_cleanup(branch_to.lock_write().unlock)
987
958
988
959
if local and not branch_to.get_bound_location():
989
960
raise errors.LocalRequiresBoundBranch()
990
961
1020
991
else:
1021
992
branch_from = Branch.open(location,
1022
993
possible_transports=possible_transports)
1023
self.add_cleanup(branch_from.lock_read().unlock)
1024
994
1025
995
if branch_to.get_parent() is None or remember:
1026
996
branch_to.set_parent(branch_from.base)
1027
997
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)
998
if branch_from is not branch_to:
999
branch_from.lock_read()
1000
try:
1001
if revision is not None:
1002
revision_id = revision.as_revision_id(branch_from)
1003
1004
branch_to.lock_write()
1005
try:
1006
if tree_to is not None:
1007
view_info = _get_view_info_for_change_reporter(tree_to)
1008
change_reporter = delta._ChangeReporter(
1009
unversioned_filter=tree_to.is_ignored,
1010
view_info=view_info)
1011
result = tree_to.pull(
1012
branch_from, overwrite, revision_id, change_reporter,
1013
possible_transports=possible_transports, local=local)
1014
else:
1015
result = branch_to.pull(
1016
branch_from, overwrite, revision_id, local=local)
1017
1018
result.report(self.outf)
1019
if verbose and result.old_revid != result.new_revid:
1020
log.show_branch_change(
1021
branch_to, self.outf, result.old_revno,
1022
result.old_revid)
1023
finally:
1024
branch_to.unlock()
1025
finally:
1026
if branch_from is not branch_to:
1027
branch_from.unlock()
1048
1028
1049
1029
1050
1030
class cmd_push(Command):
1051
__doc__ = """Update a mirror of this branch.
1031
"""Update a mirror of this branch.
1052
1032
1053
1033
The target branch will not have its working tree populated because this
1054
1034
is both expensive, and is not supported on remote file systems.
1078
1058
Option('create-prefix',
1079
1059
help='Create the path leading up to the branch '
1080
1060
'if it does not already exist.'),
1081
custom_help('directory',
1061
Option('directory',
1082
1062
help='Branch to push from, '
1083
'rather than the one containing the working directory.'),
1063
'rather than the one containing the working directory.',
1064
short_name='d',
1065
type=unicode,
1066
),
1084
1067
Option('use-existing-dir',
1085
1068
help='By default push will fail if the target'
1086
1069
' directory exists, but does not already'
1112
1095
# Get the source branch
1113
1096
(tree, br_from,
1114
1097
_unused) = bzrdir.BzrDir.open_containing_tree_or_branch(directory)
1098
if strict is None:
1099
strict = br_from.get_config().get_user_option('push_strict')
1100
if strict is not None:
1101
# FIXME: This should be better supported by config
1102
# -- vila 20090611
1103
bools = dict(yes=True, no=False, on=True, off=False,
1104
true=True, false=False)
1105
try:
1106
strict = bools[strict.lower()]
1107
except KeyError:
1108
strict = None
1115
1109
# Get the tip's revision_id
1116
1110
revision = _get_one_revision('push', revision)
1117
1111
if revision is not None:
1118
1112
revision_id = revision.in_history(br_from).rev_id
1119
1113
else:
1120
1114
revision_id = None
1121
if tree is not None and revision_id is None:
1122
tree.check_changed_or_out_of_date(
1123
strict, 'push_strict',
1124
more_error='Use --no-strict to force the push.',
1125
more_warning='Uncommitted changes will not be pushed.')
1115
if (tree is not None and revision_id is None
1116
and (strict is None or strict)): # Default to True:
1117
if (tree.has_changes(tree.basis_tree())
1118
or len(tree.get_parent_ids()) > 1):
1119
raise errors.UncommittedChanges(
1120
tree, more='Use --no-strict to force the push.')
1121
if tree.last_revision() != tree.branch.last_revision():
1122
# The tree has lost sync with its branch, there is little
1123
# chance that the user is aware of it but he can still force
1124
# the push with --no-strict
1125
raise errors.OutOfDateTree(
1126
tree, more='Use --no-strict to force the push.')
1127
1126
1128
# Get the stacked_on branch, if any
1127
1129
if stacked_on is not None:
1128
1130
stacked_on = urlutils.normalize_url(stacked_on)
1160
1162
1161
1163
1162
1164
class cmd_branch(Command):
1163
__doc__ = """Create a new branch that is a copy of an existing branch.
1165
"""Create a new branch that is a copy of an existing branch.
1164
1166
1165
1167
If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will
1166
1168
be used. In other words, "branch ../foo/bar" will attempt to create ./bar.
1179
1181
help='Hard-link working tree files where possible.'),
1180
1182
Option('no-tree',
1181
1183
help="Create a branch without a working-tree."),
1182
Option('switch',
1183
help="Switch the checkout in the current directory "
1184
"to the new branch."),
1185
1184
Option('stacked',
1186
1185
help='Create a stacked branch referring to the source branch. '
1187
1186
'The new branch will depend on the availability of the source '
1193
1192
' directory exists, but does not already'
1194
1193
' have a control directory. This flag will'
1195
1194
' allow branch to proceed.'),
1196
Option('bind',
1197
help="Bind new branch to from location."),
1198
1195
]
1199
1196
aliases = ['get', 'clone']
1200
1197
1201
1198
def run(self, from_location, to_location=None, revision=None,
1202
1199
hardlink=False, stacked=False, standalone=False, no_tree=False,
1203
use_existing_dir=False, switch=False, bind=False):
1204
from bzrlib import switch as _mod_switch
1200
use_existing_dir=False):
1205
1201
from bzrlib.tag import _merge_tags_if_possible
1202
1206
1203
accelerator_tree, br_from = bzrdir.BzrDir.open_tree_or_branch(
1207
1204
from_location)
1205
if (accelerator_tree is not None and
1206
accelerator_tree.supports_content_filtering()):
1207
accelerator_tree = None
1208
1208
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)
1209
br_from.lock_read()
1220
1210
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)
1211
if revision is not None:
1212
revision_id = revision.as_revision_id(br_from)
1226
1213
else:
1227
try:
1228
bzrdir.BzrDir.open_from_transport(to_transport)
1229
except errors.NotBranchError:
1230
pass
1214
# FIXME - wt.last_revision, fallback to branch, fall back to
1215
# None or perhaps NULL_REVISION to mean copy nothing
1216
# RBC 20060209
1217
revision_id = br_from.last_revision()
1218
if to_location is None:
1219
to_location = urlutils.derive_to_location(from_location)
1220
to_transport = transport.get_transport(to_location)
1221
try:
1222
to_transport.mkdir('.')
1223
except errors.FileExists:
1224
if not use_existing_dir:
1225
raise errors.BzrCommandError('Target directory "%s" '
1226
'already exists.' % to_location)
1231
1227
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'))
1228
try:
1229
bzrdir.BzrDir.open_from_transport(to_transport)
1230
except errors.NotBranchError:
1231
pass
1232
else:
1233
raise errors.AlreadyBranchError(to_location)
1234
except errors.NoSuchFile:
1235
raise errors.BzrCommandError('Parent of "%s" does not exist.'
1236
% to_location)
1237
try:
1238
# preserve whatever source format we have.
1239
dir = br_from.bzrdir.sprout(to_transport.base, revision_id,
1240
possible_transports=[to_transport],
1241
accelerator_tree=accelerator_tree,
1242
hardlink=hardlink, stacked=stacked,
1243
force_new_repo=standalone,
1244
create_tree_if_local=not no_tree,
1245
source_branch=br_from)
1246
branch = dir.open_branch()
1247
except errors.NoSuchRevision:
1248
to_transport.delete_tree('.')
1249
msg = "The branch %s has no revision %s." % (from_location,
1250
revision)
1251
raise errors.BzrCommandError(msg)
1252
_merge_tags_if_possible(br_from, branch)
1253
# If the source branch is stacked, the new branch may
1254
# be stacked whether we asked for that explicitly or not.
1255
# We therefore need a try/except here and not just 'if stacked:'
1256
try:
1257
note('Created new stacked branch referring to %s.' %
1258
branch.get_stacked_on_url())
1259
except (errors.NotStacked, errors.UnstackableBranchFormat,
1260
errors.UnstackableRepositoryFormat), e:
1261
note('Branched %d revision(s).' % branch.revno())
1262
finally:
1263
br_from.unlock()
1272
1264
1273
1265
1274
1266
class cmd_checkout(Command):
1275
__doc__ = """Create a new checkout of an existing branch.
1267
"""Create a new checkout of an existing branch.
1276
1268
1277
1269
If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree for
1278
1270
the branch found in '.'. This is useful if you have removed the working tree
1341
1333
1342
1334
1343
1335
class cmd_renames(Command):
1344
__doc__ = """Show list of renamed files.
1336
"""Show list of renamed files.
1345
1337
"""
1346
1338
# TODO: Option to show renames between two historical versions.
1347
1339
1352
1344
@display_command
1353
1345
def run(self, dir=u'.'):
1354
1346
tree = WorkingTree.open_containing(dir)[0]
1355
self.add_cleanup(tree.lock_read().unlock)
1356
new_inv = tree.inventory
1357
old_tree = tree.basis_tree()
1358
self.add_cleanup(old_tree.lock_read().unlock)
1359
old_inv = old_tree.inventory
1360
renames = []
1361
iterator = tree.iter_changes(old_tree, include_unchanged=True)
1362
for f, paths, c, v, p, n, k, e in iterator:
1363
if paths[0] == paths[1]:
1364
continue
1365
if None in (paths):
1366
continue
1367
renames.append(paths)
1368
renames.sort()
1369
for old_name, new_name in renames:
1370
self.outf.write("%s => %s\n" % (old_name, new_name))
1347
tree.lock_read()
1348
try:
1349
new_inv = tree.inventory
1350
old_tree = tree.basis_tree()
1351
old_tree.lock_read()
1352
try:
1353
old_inv = old_tree.inventory
1354
renames = []
1355
iterator = tree.iter_changes(old_tree, include_unchanged=True)
1356
for f, paths, c, v, p, n, k, e in iterator:
1357
if paths[0] == paths[1]:
1358
continue
1359
if None in (paths):
1360
continue
1361
renames.append(paths)
1362
renames.sort()
1363
for old_name, new_name in renames:
1364
self.outf.write("%s => %s\n" % (old_name, new_name))
1365
finally:
1366
old_tree.unlock()
1367
finally:
1368
tree.unlock()
1371
1369
1372
1370
1373
1371
class cmd_update(Command):
1374
__doc__ = """Update a tree to have the latest code committed to its branch.
1372
"""Update a tree to have the latest code committed to its branch.
1375
1373
1376
1374
This will perform a merge into the working tree, and may generate
1377
1375
conflicts. If you have any local changes, you will still
1379
1377
1380
1378
If you want to discard your local changes, you can just do a
1381
1379
'bzr revert' instead of 'bzr commit' after the update.
1382
1383
If the tree's branch is bound to a master branch, it will also update
1384
the branch from the master.
1385
1380
"""
1386
1381
1387
1382
_see_also = ['pull', 'working-trees', 'status-flags']
1388
1383
takes_args = ['dir?']
1389
takes_options = ['revision']
1390
1384
aliases = ['up']
1391
1385
1392
def run(self, dir='.', revision=None):
1393
if revision is not None and len(revision) != 1:
1394
raise errors.BzrCommandError(
1395
"bzr update --revision takes exactly one revision")
1386
def run(self, dir='.'):
1396
1387
tree = WorkingTree.open_containing(dir)[0]
1397
branch = tree.branch
1398
1388
possible_transports = []
1399
master = branch.get_master_branch(
1389
master = tree.branch.get_master_branch(
1400
1390
possible_transports=possible_transports)
1401
1391
if master is not None:
1402
branch_location = master.base
1403
1392
tree.lock_write()
1404
1393
else:
1405
branch_location = tree.branch.base
1406
1394
tree.lock_tree_write()
1407
self.add_cleanup(tree.unlock)
1408
# get rid of the final '/' and be ready for display
1409
branch_location = urlutils.unescape_for_display(
1410
branch_location.rstrip('/'),
1411
self.outf.encoding)
1412
existing_pending_merges = tree.get_parent_ids()[1:]
1413
if master is None:
1414
old_tip = None
1415
else:
1416
# may need to fetch data into a heavyweight checkout
1417
# XXX: this may take some time, maybe we should display a
1418
# message
1419
old_tip = branch.update(possible_transports)
1420
if revision is not None:
1421
revision_id = revision[0].as_revision_id(branch)
1422
else:
1423
revision_id = branch.last_revision()
1424
if revision_id == _mod_revision.ensure_null(tree.last_revision()):
1425
revno = branch.revision_id_to_dotted_revno(revision_id)
1426
note("Tree is up to date at revision %s of branch %s" %
1427
('.'.join(map(str, revno)), branch_location))
1428
return 0
1429
view_info = _get_view_info_for_change_reporter(tree)
1430
change_reporter = delta._ChangeReporter(
1431
unversioned_filter=tree.is_ignored,
1432
view_info=view_info)
1433
1395
try:
1396
existing_pending_merges = tree.get_parent_ids()[1:]
1397
last_rev = _mod_revision.ensure_null(tree.last_revision())
1398
if last_rev == _mod_revision.ensure_null(
1399
tree.branch.last_revision()):
1400
# may be up to date, check master too.
1401
if master is None or last_rev == _mod_revision.ensure_null(
1402
master.last_revision()):
1403
revno = tree.branch.revision_id_to_revno(last_rev)
1404
note("Tree is up to date at revision %d." % (revno,))
1405
return 0
1406
view_info = _get_view_info_for_change_reporter(tree)
1434
1407
conflicts = tree.update(
1435
change_reporter,
1436
possible_transports=possible_transports,
1437
revision=revision_id,
1438
old_tip=old_tip)
1439
except errors.NoSuchRevision, e:
1440
raise errors.BzrCommandError(
1441
"branch has no revision %s\n"
1442
"bzr update --revision only works"
1443
" for a revision in the branch history"
1444
% (e.revision))
1445
revno = tree.branch.revision_id_to_dotted_revno(
1446
_mod_revision.ensure_null(tree.last_revision()))
1447
note('Updated to revision %s of branch %s' %
1448
('.'.join(map(str, revno)), branch_location))
1449
parent_ids = tree.get_parent_ids()
1450
if parent_ids[1:] and parent_ids[1:] != existing_pending_merges:
1451
note('Your local commits will now show as pending merges with '
1452
"'bzr status', and can be committed with 'bzr commit'.")
1453
if conflicts != 0:
1454
return 1
1455
else:
1456
return 0
1408
delta._ChangeReporter(unversioned_filter=tree.is_ignored,
1409
view_info=view_info), possible_transports=possible_transports)
1410
revno = tree.branch.revision_id_to_revno(
1411
_mod_revision.ensure_null(tree.last_revision()))
1412
note('Updated to revision %d.' % (revno,))
1413
if tree.get_parent_ids()[1:] != existing_pending_merges:
1414
note('Your local commits will now show as pending merges with '
1415
"'bzr status', and can be committed with 'bzr commit'.")
1416
if conflicts != 0:
1417
return 1
1418
else:
1419
return 0
1420
finally:
1421
tree.unlock()
1457
1422
1458
1423
1459
1424
class cmd_info(Command):
1460
__doc__ = """Show information about a working tree, branch or repository.
1425
"""Show information about a working tree, branch or repository.
1461
1426
1462
1427
This command will show all known locations and formats associated to the
1463
1428
tree, branch or repository.
1501
1466
1502
1467
1503
1468
class cmd_remove(Command):
1504
__doc__ = """Remove files or directories.
1469
"""Remove files or directories.
1505
1470
1506
1471
This makes bzr stop tracking changes to the specified files. bzr will delete
1507
1472
them if they can easily be recovered using revert. If no options or
1516
1481
title='Deletion Strategy', value_switches=True, enum_switch=False,
1517
1482
safe='Only delete files if they can be'
1518
1483
' safely recovered (default).',
1519
keep='Delete from bzr but leave the working copy.',
1484
keep="Don't delete any files.",
1520
1485
force='Delete all the specified files, even if they can not be '
1521
1486
'recovered and even if they are non-empty directories.')]
1522
1487
aliases = ['rm', 'del']
1529
1494
if file_list is not None:
1530
1495
file_list = [f for f in file_list]
1531
1496
1532
self.add_cleanup(tree.lock_write().unlock)
1533
# Heuristics should probably all move into tree.remove_smart or
1534
# some such?
1535
if new:
1536
added = tree.changes_from(tree.basis_tree(),
1537
specific_files=file_list).added
1538
file_list = sorted([f[0] for f in added], reverse=True)
1539
if len(file_list) == 0:
1540
raise errors.BzrCommandError('No matching files.')
1541
elif file_list is None:
1542
# missing files show up in iter_changes(basis) as
1543
# versioned-with-no-kind.
1544
missing = []
1545
for change in tree.iter_changes(tree.basis_tree()):
1546
# Find paths in the working tree that have no kind:
1547
if change[1][1] is not None and change[6][1] is None:
1548
missing.append(change[1][1])
1549
file_list = sorted(missing, reverse=True)
1550
file_deletion_strategy = 'keep'
1551
tree.remove(file_list, verbose=verbose, to_file=self.outf,
1552
keep_files=file_deletion_strategy=='keep',
1553
force=file_deletion_strategy=='force')
1497
tree.lock_write()
1498
try:
1499
# Heuristics should probably all move into tree.remove_smart or
1500
# some such?
1501
if new:
1502
added = tree.changes_from(tree.basis_tree(),
1503
specific_files=file_list).added
1504
file_list = sorted([f[0] for f in added], reverse=True)
1505
if len(file_list) == 0:
1506
raise errors.BzrCommandError('No matching files.')
1507
elif file_list is None:
1508
# missing files show up in iter_changes(basis) as
1509
# versioned-with-no-kind.
1510
missing = []
1511
for change in tree.iter_changes(tree.basis_tree()):
1512
# Find paths in the working tree that have no kind:
1513
if change[1][1] is not None and change[6][1] is None:
1514
missing.append(change[1][1])
1515
file_list = sorted(missing, reverse=True)
1516
file_deletion_strategy = 'keep'
1517
tree.remove(file_list, verbose=verbose, to_file=self.outf,
1518
keep_files=file_deletion_strategy=='keep',
1519
force=file_deletion_strategy=='force')
1520
finally:
1521
tree.unlock()
1554
1522
1555
1523
1556
1524
class cmd_file_id(Command):
1557
__doc__ = """Print file_id of a particular file or directory.
1525
"""Print file_id of a particular file or directory.
1558
1526
1559
1527
The file_id is assigned when the file is first added and remains the
1560
1528
same through all revisions where the file exists, even when it is
1576
1544
1577
1545
1578
1546
class cmd_file_path(Command):
1579
__doc__ = """Print path of file_ids to a file or directory.
1547
"""Print path of file_ids to a file or directory.
1580
1548
1581
1549
This prints one line for each directory down to the target,
1582
1550
starting at the branch root.
1598
1566
1599
1567
1600
1568
class cmd_reconcile(Command):
1601
__doc__ = """Reconcile bzr metadata in a branch.
1569
"""Reconcile bzr metadata in a branch.
1602
1570
1603
1571
This can correct data mismatches that may have been caused by
1604
1572
previous ghost operations or bzr upgrades. You should only
1626
1594
1627
1595
1628
1596
class cmd_revision_history(Command):
1629
__doc__ = """Display the list of revision ids on a branch."""
1597
"""Display the list of revision ids on a branch."""
1630
1598
1631
1599
_see_also = ['log']
1632
1600
takes_args = ['location?']
1642
1610
1643
1611
1644
1612
class cmd_ancestry(Command):
1645
__doc__ = """List all revisions merged into this branch."""
1613
"""List all revisions merged into this branch."""
1646
1614
1647
1615
_see_also = ['log', 'revision-history']
1648
1616
takes_args = ['location?']
1667
1635
1668
1636
1669
1637
class cmd_init(Command):
1670
__doc__ = """Make a directory into a versioned branch.
1638
"""Make a directory into a versioned branch.
1671
1639
1672
1640
Use this to create an empty branch, or before importing an
1673
1641
existing project.
1701
1669
lazy_registry=('bzrlib.bzrdir', 'format_registry'),
1702
1670
converter=lambda name: bzrdir.format_registry.make_bzrdir(name),
1703
1671
value_switches=True,
1704
title="Branch format",
1672
title="Branch Format",
1705
1673
),
1706
1674
Option('append-revisions-only',
1707
1675
help='Never change revnos or the existing log.'
1776
1744
1777
1745
1778
1746
class cmd_init_repository(Command):
1779
__doc__ = """Create a shared repository for branches to share storage space.
1747
"""Create a shared repository to hold branches.
1780
1748
1781
1749
New branches created under the repository directory will store their
1782
revisions in the repository, not in the branch directory. For branches
1783
with shared history, this reduces the amount of storage needed and
1784
speeds up the creation of new branches.
1750
revisions in the repository, not in the branch directory.
1785
1751
1786
If the --no-trees option is given then the branches in the repository
1787
will not have working trees by default. They will still exist as
1788
directories on disk, but they will not have separate copies of the
1789
files at a certain revision. This can be useful for repositories that
1790
store branches which are interacted with through checkouts or remote
1791
branches, such as on a server.
1752
If the --no-trees option is used then the branches in the repository
1753
will not have working trees by default.
1792
1754
1793
1755
:Examples:
1794
Create a shared repository holding just branches::
1756
Create a shared repositories holding just branches::
1795
1757
1796
1758
bzr init-repo --no-trees repo
1797
1759
bzr init repo/trunk
1836
1798
1837
1799
1838
1800
class cmd_diff(Command):
1839
__doc__ = """Show differences in the working tree, between revisions or branches.
1801
"""Show differences in the working tree, between revisions or branches.
1840
1802
1841
1803
If no arguments are given, all changes for the current tree are listed.
1842
1804
If files are given, only the changes in those files are listed.
1863
1825
1864
1826
bzr diff -r1
1865
1827
1866
Difference between revision 3 and revision 1::
1867
1868
bzr diff -r1..3
1869
1870
Difference between revision 3 and revision 1 for branch xxx::
1871
1872
bzr diff -r1..3 xxx
1873
1874
To see the changes introduced in revision X::
1875
1876
bzr diff -cX
1877
1878
Note that in the case of a merge, the -c option shows the changes
1879
compared to the left hand parent. To see the changes against
1880
another parent, use::
1881
1882
bzr diff -r<chosen_parent>..X
1883
1884
The changes introduced by revision 2 (equivalent to -r1..2)::
1885
1886
bzr diff -c2
1828
Difference between revision 2 and revision 1::
1829
1830
bzr diff -r1..2
1831
1832
Difference between revision 2 and revision 1 for branch xxx::
1833
1834
bzr diff -r1..2 xxx
1887
1835
1888
1836
Show just the differences for file NEWS::
1889
1837
1928
1876
help='Use this command to compare files.',
1929
1877
type=unicode,
1930
1878
),
1931
RegistryOption('format',
1932
help='Diff format to use.',
1933
lazy_registry=('bzrlib.diff', 'format_registry'),
1934
value_switches=False, title='Diff format'),
1935
1879
]
1936
1880
aliases = ['di', 'dif']
1937
1881
encoding_type = 'exact'
1938
1882
1939
1883
@display_command
1940
1884
def run(self, revision=None, file_list=None, diff_options=None,
1941
prefix=None, old=None, new=None, using=None, format=None):
1942
from bzrlib.diff import (get_trees_and_branches_to_diff_locked,
1943
show_diff_trees)
1885
prefix=None, old=None, new=None, using=None):
1886
from bzrlib.diff import _get_trees_to_diff, show_diff_trees
1944
1887
1945
1888
if (prefix is None) or (prefix == '0'):
1946
1889
# diff -p0 format
1960
1903
raise errors.BzrCommandError('bzr diff --revision takes exactly'
1961
1904
' one or two revision specifiers')
1962
1905
1963
if using is not None and format is not None:
1964
raise errors.BzrCommandError('--using and --format are mutually '
1965
'exclusive.')
1966
1967
(old_tree, new_tree,
1968
old_branch, new_branch,
1969
specific_files, extra_trees) = get_trees_and_branches_to_diff_locked(
1970
file_list, revision, old, new, self.add_cleanup, apply_view=True)
1906
old_tree, new_tree, specific_files, extra_trees = \
1907
_get_trees_to_diff(file_list, revision, old, new,
1908
apply_view=True)
1971
1909
return show_diff_trees(old_tree, new_tree, sys.stdout,
1972
1910
specific_files=specific_files,
1973
1911
external_diff_options=diff_options,
1974
1912
old_label=old_label, new_label=new_label,
1975
extra_trees=extra_trees, using=using,
1976
format_cls=format)
1913
extra_trees=extra_trees, using=using)
1977
1914
1978
1915
1979
1916
class cmd_deleted(Command):
1980
__doc__ = """List files deleted in the working tree.
1917
"""List files deleted in the working tree.
1981
1918
"""
1982
1919
# TODO: Show files deleted since a previous revision, or
1983
1920
# between two revisions.
1986
1923
# level of effort but possibly much less IO. (Or possibly not,
1987
1924
# if the directories are very large...)
1988
1925
_see_also = ['status', 'ls']
1989
takes_options = ['directory', 'show-ids']
1926
takes_options = ['show-ids']
1990
1927
1991
1928
@display_command
1992
def run(self, show_ids=False, directory=u'.'):
1993
tree = WorkingTree.open_containing(directory)[0]
1994
self.add_cleanup(tree.lock_read().unlock)
1995
old = tree.basis_tree()
1996
self.add_cleanup(old.lock_read().unlock)
1997
for path, ie in old.inventory.iter_entries():
1998
if not tree.has_id(ie.file_id):
1999
self.outf.write(path)
2000
if show_ids:
2001
self.outf.write(' ')
2002
self.outf.write(ie.file_id)
2003
self.outf.write('\n')
1929
def run(self, show_ids=False):
1930
tree = WorkingTree.open_containing(u'.')[0]
1931
tree.lock_read()
1932
try:
1933
old = tree.basis_tree()
1934
old.lock_read()
1935
try:
1936
for path, ie in old.inventory.iter_entries():
1937
if not tree.has_id(ie.file_id):
1938
self.outf.write(path)
1939
if show_ids:
1940
self.outf.write(' ')
1941
self.outf.write(ie.file_id)
1942
self.outf.write('\n')
1943
finally:
1944
old.unlock()
1945
finally:
1946
tree.unlock()
2004
1947
2005
1948
2006
1949
class cmd_modified(Command):
2007
__doc__ = """List files modified in working tree.
1950
"""List files modified in working tree.
2008
1951
"""
2009
1952
2010
1953
hidden = True
2011
1954
_see_also = ['status', 'ls']
2012
takes_options = ['directory', 'null']
1955
takes_options = [
1956
Option('null',
1957
help='Write an ascii NUL (\\0) separator '
1958
'between files rather than a newline.')
1959
]
2013
1960
2014
1961
@display_command
2015
def run(self, null=False, directory=u'.'):
2016
tree = WorkingTree.open_containing(directory)[0]
1962
def run(self, null=False):
1963
tree = WorkingTree.open_containing(u'.')[0]
2017
1964
td = tree.changes_from(tree.basis_tree())
2018
1965
for path, id, kind, text_modified, meta_modified in td.modified:
2019
1966
if null:
2023
1970
2024
1971
2025
1972
class cmd_added(Command):
2026
__doc__ = """List files added in working tree.
1973
"""List files added in working tree.
2027
1974
"""
2028
1975
2029
1976
hidden = True
2030
1977
_see_also = ['status', 'ls']
2031
takes_options = ['directory', 'null']
1978
takes_options = [
1979
Option('null',
1980
help='Write an ascii NUL (\\0) separator '
1981
'between files rather than a newline.')
1982
]
2032
1983
2033
1984
@display_command
2034
def run(self, null=False, directory=u'.'):
2035
wt = WorkingTree.open_containing(directory)[0]
2036
self.add_cleanup(wt.lock_read().unlock)
2037
basis = wt.basis_tree()
2038
self.add_cleanup(basis.lock_read().unlock)
2039
basis_inv = basis.inventory
2040
inv = wt.inventory
2041
for file_id in inv:
2042
if file_id in basis_inv:
2043
continue
2044
if inv.is_root(file_id) and len(basis_inv) == 0:
2045
continue
2046
path = inv.id2path(file_id)
2047
if not os.access(osutils.pathjoin(wt.basedir, path), os.F_OK):
2048
continue
2049
if null:
2050
self.outf.write(path + '\0')
2051
else:
2052
self.outf.write(osutils.quotefn(path) + '\n')
1985
def run(self, null=False):
1986
wt = WorkingTree.open_containing(u'.')[0]
1987
wt.lock_read()
1988
try:
1989
basis = wt.basis_tree()
1990
basis.lock_read()
1991
try:
1992
basis_inv = basis.inventory
1993
inv = wt.inventory
1994
for file_id in inv:
1995
if file_id in basis_inv:
1996
continue
1997
if inv.is_root(file_id) and len(basis_inv) == 0:
1998
continue
1999
path = inv.id2path(file_id)
2000
if not os.access(osutils.abspath(path), os.F_OK):
2001
continue
2002
if null:
2003
self.outf.write(path + '\0')
2004
else:
2005
self.outf.write(osutils.quotefn(path) + '\n')
2006
finally:
2007
basis.unlock()
2008
finally:
2009
wt.unlock()
2053
2010
2054
2011
2055
2012
class cmd_root(Command):
2056
__doc__ = """Show the tree root directory.
2013
"""Show the tree root directory.
2057
2014
2058
2015
The root is the nearest enclosing directory with a .bzr control
2059
2016
directory."""
2083
2040
2084
2041
2085
2042
class cmd_log(Command):
2086
__doc__ = """Show historical log for a branch or subset of a branch.
2043
"""Show historical log for a branch or subset of a branch.
2087
2044
2088
2045
log is bzr's default tool for exploring the history of a branch.
2089
2046
The branch to use is taken from the first parameter. If no parameters
2200
2157
:Tips & tricks:
2201
2158
2202
2159
GUI tools and IDEs are often better at exploring history than command
2203
line tools: you may prefer qlog or viz from qbzr or bzr-gtk, the
2204
bzr-explorer shell, or the Loggerhead web interface. See the Plugin
2205
Guide <http://doc.bazaar.canonical.com/plugins/en/> and
2206
<http://wiki.bazaar.canonical.com/IDEIntegration>.
2160
line tools. You may prefer qlog or glog from the QBzr and Bzr-Gtk packages
2161
respectively for example. (TortoiseBzr uses qlog for displaying logs.) See
2162
http://bazaar-vcs.org/BzrPlugins and http://bazaar-vcs.org/IDEIntegration.
2163
2164
Web interfaces are often better at exploring history than command line
2165
tools, particularly for branches on servers. You may prefer Loggerhead
2166
or one of its alternatives. See http://bazaar-vcs.org/WebInterface.
2207
2167
2208
2168
You may find it useful to add the aliases below to ``bazaar.conf``::
2209
2169
2250
2210
help='Show just the specified revision.'
2251
2211
' See also "help revisionspec".'),
2252
2212
'log-format',
2253
RegistryOption('authors',
2254
'What names to list as authors - first, all or committer.',
2255
title='Authors',
2256
lazy_registry=('bzrlib.log', 'author_list_registry'),
2257
),
2258
2213
Option('levels',
2259
2214
short_name='n',
2260
2215
help='Number of levels to display - 0 for all, 1 for flat.',
2275
2230
help='Show changes made in each revision as a patch.'),
2276
2231
Option('include-merges',
2277
2232
help='Show merged revisions like --levels 0 does.'),
2278
Option('exclude-common-ancestry',
2279
help='Display only the revisions that are not part'
2280
' of both ancestries (require -rX..Y)'
2281
)
2282
2233
]
2283
2234
encoding_type = 'replace'
2284
2235
2294
2245
message=None,
2295
2246
limit=None,
2296
2247
show_diff=False,
2297
include_merges=False,
2298
authors=None,
2299
exclude_common_ancestry=False,
2300
):
2248
include_merges=False):
2301
2249
from bzrlib.log import (
2302
2250
Logger,
2303
2251
make_log_request_dict,
2304
2252
_get_info_for_log_files,
2305
2253
)
2306
2254
direction = (forward and 'forward') or 'reverse'
2307
if (exclude_common_ancestry
2308
and (revision is None or len(revision) != 2)):
2309
raise errors.BzrCommandError(
2310
'--exclude-common-ancestry requires -r with two revisions')
2311
2255
if include_merges:
2312
2256
if levels is None:
2313
2257
levels = 0
2328
2272
filter_by_dir = False
2329
2273
if file_list:
2330
2274
# find the file ids to log and check for directory filtering
2331
b, file_info_list, rev1, rev2 = _get_info_for_log_files(
2332
revision, file_list, self.add_cleanup)
2275
b, file_info_list, rev1, rev2 = _get_info_for_log_files(revision,
2276
file_list)
2333
2277
for relpath, file_id, kind in file_info_list:
2334
2278
if file_id is None:
2335
2279
raise errors.BzrCommandError(
2353
2297
location = '.'
2354
2298
dir, relpath = bzrdir.BzrDir.open_containing(location)
2355
2299
b = dir.open_branch()
2356
self.add_cleanup(b.lock_read().unlock)
2357
2300
rev1, rev2 = _get_revision_range(revision, b, self.name())
2358
2301
2359
2302
# Decide on the type of delta & diff filtering to use
2369
2312
else:
2370
2313
diff_type = 'full'
2371
2314
2372
# Build the log formatter
2373
if log_format is None:
2374
log_format = log.log_formatter_registry.get_default(b)
2375
# Make a non-encoding output to include the diffs - bug 328007
2376
unencoded_output = ui.ui_factory.make_output_stream(encoding_type='exact')
2377
lf = log_format(show_ids=show_ids, to_file=self.outf,
2378
to_exact_file=unencoded_output,
2379
show_timezone=timezone,
2380
delta_format=get_verbosity_level(),
2381
levels=levels,
2382
show_advice=levels is None,
2383
author_list_handler=authors)
2384
2385
# Choose the algorithm for doing the logging. It's annoying
2386
# having multiple code paths like this but necessary until
2387
# the underlying repository format is faster at generating
2388
# deltas or can provide everything we need from the indices.
2389
# The default algorithm - match-using-deltas - works for
2390
# multiple files and directories and is faster for small
2391
# amounts of history (200 revisions say). However, it's too
2392
# slow for logging a single file in a repository with deep
2393
# history, i.e. > 10K revisions. In the spirit of "do no
2394
# evil when adding features", we continue to use the
2395
# original algorithm - per-file-graph - for the "single
2396
# file that isn't a directory without showing a delta" case.
2397
partial_history = revision and b.repository._format.supports_chks
2398
match_using_deltas = (len(file_ids) != 1 or filter_by_dir
2399
or delta_type or partial_history)
2400
2401
# Build the LogRequest and execute it
2402
if len(file_ids) == 0:
2403
file_ids = None
2404
rqst = make_log_request_dict(
2405
direction=direction, specific_fileids=file_ids,
2406
start_revision=rev1, end_revision=rev2, limit=limit,
2407
message_search=message, delta_type=delta_type,
2408
diff_type=diff_type, _match_using_deltas=match_using_deltas,
2409
exclude_common_ancestry=exclude_common_ancestry,
2410
)
2411
Logger(b, rqst).show(lf)
2315
b.lock_read()
2316
try:
2317
# Build the log formatter
2318
if log_format is None:
2319
log_format = log.log_formatter_registry.get_default(b)
2320
lf = log_format(show_ids=show_ids, to_file=self.outf,
2321
show_timezone=timezone,
2322
delta_format=get_verbosity_level(),
2323
levels=levels,
2324
show_advice=levels is None)
2325
2326
# Choose the algorithm for doing the logging. It's annoying
2327
# having multiple code paths like this but necessary until
2328
# the underlying repository format is faster at generating
2329
# deltas or can provide everything we need from the indices.
2330
# The default algorithm - match-using-deltas - works for
2331
# multiple files and directories and is faster for small
2332
# amounts of history (200 revisions say). However, it's too
2333
# slow for logging a single file in a repository with deep
2334
# history, i.e. > 10K revisions. In the spirit of "do no
2335
# evil when adding features", we continue to use the
2336
# original algorithm - per-file-graph - for the "single
2337
# file that isn't a directory without showing a delta" case.
2338
partial_history = revision and b.repository._format.supports_chks
2339
match_using_deltas = (len(file_ids) != 1 or filter_by_dir
2340
or delta_type or partial_history)
2341
2342
# Build the LogRequest and execute it
2343
if len(file_ids) == 0:
2344
file_ids = None
2345
rqst = make_log_request_dict(
2346
direction=direction, specific_fileids=file_ids,
2347
start_revision=rev1, end_revision=rev2, limit=limit,
2348
message_search=message, delta_type=delta_type,
2349
diff_type=diff_type, _match_using_deltas=match_using_deltas)
2350
Logger(b, rqst).show(lf)
2351
finally:
2352
b.unlock()
2412
2353
2413
2354
2414
2355
def _get_revision_range(revisionspec_list, branch, command_name):
2432
2373
raise errors.BzrCommandError(
2433
2374
"bzr %s doesn't accept two revisions in different"
2434
2375
" branches." % command_name)
2435
if start_spec.spec is None:
2436
# Avoid loading all the history.
2437
rev1 = RevisionInfo(branch, None, None)
2438
else:
2439
rev1 = start_spec.in_history(branch)
2376
rev1 = start_spec.in_history(branch)
2440
2377
# Avoid loading all of history when we know a missing
2441
2378
# end of range means the last revision ...
2442
2379
if end_spec.spec is None:
2471
2408
2472
2409
2473
2410
class cmd_touching_revisions(Command):
2474
__doc__ = """Return revision-ids which affected a particular file.
2411
"""Return revision-ids which affected a particular file.
2475
2412
2476
2413
A more user-friendly interface is "bzr log FILE".
2477
2414
"""
2482
2419
@display_command
2483
2420
def run(self, filename):
2484
2421
tree, relpath = WorkingTree.open_containing(filename)
2422
b = tree.branch
2485
2423
file_id = tree.path2id(relpath)
2486
b = tree.branch
2487
self.add_cleanup(b.lock_read().unlock)
2488
touching_revs = log.find_touching_revisions(b, file_id)
2489
for revno, revision_id, what in touching_revs:
2424
for revno, revision_id, what in log.find_touching_revisions(b, file_id):
2490
2425
self.outf.write("%6d %s\n" % (revno, what))
2491
2426
2492
2427
2493
2428
class cmd_ls(Command):
2494
__doc__ = """List files in a tree.
2429
"""List files in a tree.
2495
2430
"""
2496
2431
2497
2432
_see_also = ['status', 'cat']
2503
2438
help='Recurse into subdirectories.'),
2504
2439
Option('from-root',
2505
2440
help='Print paths relative to the root of the branch.'),
2506
Option('unknown', short_name='u',
2507
help='Print unknown files.'),
2441
Option('unknown', help='Print unknown files.'),
2508
2442
Option('versioned', help='Print versioned files.',
2509
2443
short_name='V'),
2510
Option('ignored', short_name='i',
2511
help='Print ignored files.'),
2512
Option('kind', short_name='k',
2444
Option('ignored', help='Print ignored files.'),
2445
Option('null',
2446
help='Write an ascii NUL (\\0) separator '
2447
'between files rather than a newline.'),
2448
Option('kind',
2513
2449
help='List entries of a particular kind: file, directory, symlink.',
2514
2450
type=unicode),
2515
'null',
2516
2451
'show-ids',
2517
'directory',
2518
2452
]
2519
2453
@display_command
2520
2454
def run(self, revision=None, verbose=False,
2521
2455
recursive=False, from_root=False,
2522
2456
unknown=False, versioned=False, ignored=False,
2523
null=False, kind=None, show_ids=False, path=None, directory=None):
2457
null=False, kind=None, show_ids=False, path=None):
2524
2458
2525
2459
if kind and kind not in ('file', 'directory', 'symlink'):
2526
2460
raise errors.BzrCommandError('invalid kind specified')
2538
2472
raise errors.BzrCommandError('cannot specify both --from-root'
2539
2473
' and PATH')
2540
2474
fs_path = path
2541
tree, branch, relpath = \
2542
_open_directory_or_containing_tree_or_branch(fs_path, directory)
2475
tree, branch, relpath = bzrdir.BzrDir.open_containing_tree_or_branch(
2476
fs_path)
2543
2477
2544
2478
# Calculate the prefix to use
2545
2479
prefix = None
2546
2480
if from_root:
2547
2481
if relpath:
2548
2482
prefix = relpath + '/'
2549
elif fs_path != '.' and not fs_path.endswith('/'):
2483
elif fs_path != '.':
2550
2484
prefix = fs_path + '/'
2551
2485
2552
2486
if revision is not None or tree is None:
2560
2494
view_str = views.view_display_str(view_files)
2561
2495
note("Ignoring files outside view. View is %s" % view_str)
2562
2496
2563
self.add_cleanup(tree.lock_read().unlock)
2564
for fp, fc, fkind, fid, entry in tree.list_files(include_root=False,
2565
from_dir=relpath, recursive=recursive):
2566
# Apply additional masking
2567
if not all and not selection[fc]:
2568
continue
2569
if kind is not None and fkind != kind:
2570
continue
2571
if apply_view:
2572
try:
2573
if relpath:
2574
fullpath = osutils.pathjoin(relpath, fp)
2575
else:
2576
fullpath = fp
2577
views.check_path_in_view(tree, fullpath)
2578
except errors.FileOutsideView:
2579
continue
2497
tree.lock_read()
2498
try:
2499
for fp, fc, fkind, fid, entry in tree.list_files(include_root=False,
2500
from_dir=relpath, recursive=recursive):
2501
# Apply additional masking
2502
if not all and not selection[fc]:
2503
continue
2504
if kind is not None and fkind != kind:
2505
continue
2506
if apply_view:
2507
try:
2508
if relpath:
2509
fullpath = osutils.pathjoin(relpath, fp)
2510
else:
2511
fullpath = fp
2512
views.check_path_in_view(tree, fullpath)
2513
except errors.FileOutsideView:
2514
continue
2580
2515
2581
# Output the entry
2582
if prefix:
2583
fp = osutils.pathjoin(prefix, fp)
2584
kindch = entry.kind_character()
2585
outstring = fp + kindch
2586
ui.ui_factory.clear_term()
2587
if verbose:
2588
outstring = '%-8s %s' % (fc, outstring)
2589
if show_ids and fid is not None:
2590
outstring = "%-50s %s" % (outstring, fid)
2591
self.outf.write(outstring + '\n')
2592
elif null:
2593
self.outf.write(fp + '\0')
2594
if show_ids:
2595
if fid is not None:
2596
self.outf.write(fid)
2597
self.outf.write('\0')
2598
self.outf.flush()
2599
else:
2600
if show_ids:
2601
if fid is not None:
2602
my_id = fid
2603
else:
2604
my_id = ''
2605
self.outf.write('%-50s %s\n' % (outstring, my_id))
2606
else:
2516
# Output the entry
2517
if prefix:
2518
fp = osutils.pathjoin(prefix, fp)
2519
kindch = entry.kind_character()
2520
outstring = fp + kindch
2521
ui.ui_factory.clear_term()
2522
if verbose:
2523
outstring = '%-8s %s' % (fc, outstring)
2524
if show_ids and fid is not None:
2525
outstring = "%-50s %s" % (outstring, fid)
2607
2526
self.outf.write(outstring + '\n')
2527
elif null:
2528
self.outf.write(fp + '\0')
2529
if show_ids:
2530
if fid is not None:
2531
self.outf.write(fid)
2532
self.outf.write('\0')
2533
self.outf.flush()
2534
else:
2535
if show_ids:
2536
if fid is not None:
2537
my_id = fid
2538
else:
2539
my_id = ''
2540
self.outf.write('%-50s %s\n' % (outstring, my_id))
2541
else:
2542
self.outf.write(outstring + '\n')
2543
finally:
2544
tree.unlock()
2608
2545
2609
2546
2610
2547
class cmd_unknowns(Command):
2611
__doc__ = """List unknown files.
2548
"""List unknown files.
2612
2549
"""
2613
2550
2614
2551
hidden = True
2615
2552
_see_also = ['ls']
2616
takes_options = ['directory']
2617
2553
2618
2554
@display_command
2619
def run(self, directory=u'.'):
2620
for f in WorkingTree.open_containing(directory)[0].unknowns():
2555
def run(self):
2556
for f in WorkingTree.open_containing(u'.')[0].unknowns():
2621
2557
self.outf.write(osutils.quotefn(f) + '\n')
2622
2558
2623
2559
2624
2560
class cmd_ignore(Command):
2625
__doc__ = """Ignore specified files or patterns.
2561
"""Ignore specified files or patterns.
2626
2562
2627
2563
See ``bzr help patterns`` for details on the syntax of patterns.
2628
2564
2629
If a .bzrignore file does not exist, the ignore command
2630
will create one and add the specified files or patterns to the newly
2631
created file. The ignore command will also automatically add the
2632
.bzrignore file to be versioned. Creating a .bzrignore file without
2633
the use of the ignore command will require an explicit add command.
2634
2635
2565
To remove patterns from the ignore list, edit the .bzrignore file.
2636
2566
After adding, editing or deleting that file either indirectly by
2637
2567
using this command or directly by using an editor, be sure to commit
2638
2568
it.
2639
2640
Bazaar also supports a global ignore file ~/.bazaar/ignore. On Windows
2641
the global ignore file can be found in the application data directory as
2642
C:\\Documents and Settings\\<user>\\Application Data\\Bazaar\\2.0\\ignore.
2643
Global ignores are not touched by this command. The global ignore file
2644
can be edited directly using an editor.
2645
2646
Patterns prefixed with '!' are exceptions to ignore patterns and take
2647
precedence over regular ignores. Such exceptions are used to specify
2648
files that should be versioned which would otherwise be ignored.
2649
2650
Patterns prefixed with '!!' act as regular ignore patterns, but have
2651
precedence over the '!' exception patterns.
2652
2569
2653
2570
Note: ignore patterns containing shell wildcards must be quoted from
2654
2571
the shell on Unix.
2658
2575
2659
2576
bzr ignore ./Makefile
2660
2577
2661
Ignore .class files in all directories...::
2578
Ignore class files in all directories::
2662
2579
2663
2580
bzr ignore "*.class"
2664
2581
2665
...but do not ignore "special.class"::
2666
2667
bzr ignore "!special.class"
2668
2669
2582
Ignore .o files under the lib directory::
2670
2583
2671
2584
bzr ignore "lib/**/*.o"
2677
2590
Ignore everything but the "debian" toplevel directory::
2678
2591
2679
2592
bzr ignore "RE:(?!debian/).*"
2680
2681
Ignore everything except the "local" toplevel directory,
2682
but always ignore "*~" autosave files, even under local/::
2683
2684
bzr ignore "*"
2685
bzr ignore "!./local"
2686
bzr ignore "!!*~"
2687
2593
"""
2688
2594
2689
2595
_see_also = ['status', 'ignored', 'patterns']
2690
2596
takes_args = ['name_pattern*']
2691
takes_options = ['directory',
2692
Option('default-rules',
2693
help='Display the default ignore rules that bzr uses.')
2597
takes_options = [
2598
Option('old-default-rules',
2599
help='Write out the ignore rules bzr < 0.9 always used.')
2694
2600
]
2695
2601
2696
def run(self, name_pattern_list=None, default_rules=None,
2697
directory=u'.'):
2602
def run(self, name_pattern_list=None, old_default_rules=None):
2698
2603
from bzrlib import ignores
2699
if default_rules is not None:
2700
# dump the default rules and exit
2701
for pattern in ignores.USER_DEFAULTS:
2702
self.outf.write("%s\n" % pattern)
2604
if old_default_rules is not None:
2605
# dump the rules and exit
2606
for pattern in ignores.OLD_DEFAULTS:
2607
print pattern
2703
2608
return
2704
2609
if not name_pattern_list:
2705
2610
raise errors.BzrCommandError("ignore requires at least one "
2706
"NAME_PATTERN or --default-rules.")
2611
"NAME_PATTERN or --old-default-rules")
2707
2612
name_pattern_list = [globbing.normalize_pattern(p)
2708
2613
for p in name_pattern_list]
2709
2614
for name_pattern in name_pattern_list:
2711
2616
(len(name_pattern) > 1 and name_pattern[1] == ':')):
2712
2617
raise errors.BzrCommandError(
2713
2618
"NAME_PATTERN should not be an absolute path")
2714
tree, relpath = WorkingTree.open_containing(directory)
2619
tree, relpath = WorkingTree.open_containing(u'.')
2715
2620
ignores.tree_ignores_add_patterns(tree, name_pattern_list)
2716
2621
ignored = globbing.Globster(name_pattern_list)
2717
2622
matches = []
2721
2626
if id is not None:
2722
2627
filename = entry[0]
2723
2628
if ignored.match(filename):
2724
matches.append(filename)
2629
matches.append(filename.encode('utf-8'))
2725
2630
tree.unlock()
2726
2631
if len(matches) > 0:
2727
self.outf.write("Warning: the following files are version controlled and"
2728
" match your ignore pattern:\n%s"
2729
"\nThese files will continue to be version controlled"
2730
" unless you 'bzr remove' them.\n" % ("\n".join(matches),))
2632
print "Warning: the following files are version controlled and" \
2633
" match your ignore pattern:\n%s" \
2634
"\nThese files will continue to be version controlled" \
2635
" unless you 'bzr remove' them." % ("\n".join(matches),)
2731
2636
2732
2637
2733
2638
class cmd_ignored(Command):
2734
__doc__ = """List ignored files and the patterns that matched them.
2639
"""List ignored files and the patterns that matched them.
2735
2640
2736
2641
List all the ignored files and the ignore pattern that caused the file to
2737
2642
be ignored.
2743
2648
2744
2649
encoding_type = 'replace'
2745
2650
_see_also = ['ignore', 'ls']
2746
takes_options = ['directory']
2747
2651
2748
2652
@display_command
2749
def run(self, directory=u'.'):
2750
tree = WorkingTree.open_containing(directory)[0]
2751
self.add_cleanup(tree.lock_read().unlock)
2752
for path, file_class, kind, file_id, entry in tree.list_files():
2753
if file_class != 'I':
2754
continue
2755
## XXX: Slightly inefficient since this was already calculated
2756
pat = tree.is_ignored(path)
2757
self.outf.write('%-50s %s\n' % (path, pat))
2653
def run(self):
2654
tree = WorkingTree.open_containing(u'.')[0]
2655
tree.lock_read()
2656
try:
2657
for path, file_class, kind, file_id, entry in tree.list_files():
2658
if file_class != 'I':
2659
continue
2660
## XXX: Slightly inefficient since this was already calculated
2661
pat = tree.is_ignored(path)
2662
self.outf.write('%-50s %s\n' % (path, pat))
2663
finally:
2664
tree.unlock()
2758
2665
2759
2666
2760
2667
class cmd_lookup_revision(Command):
2761
__doc__ = """Lookup the revision-id from a revision-number
2668
"""Lookup the revision-id from a revision-number
2762
2669
2763
2670
:Examples:
2764
2671
bzr lookup-revision 33
2765
2672
"""
2766
2673
hidden = True
2767
2674
takes_args = ['revno']
2768
takes_options = ['directory']
2769
2675
2770
2676
@display_command
2771
def run(self, revno, directory=u'.'):
2677
def run(self, revno):
2772
2678
try:
2773
2679
revno = int(revno)
2774
2680
except ValueError:
2775
raise errors.BzrCommandError("not a valid revision-number: %r"
2776
% revno)
2777
revid = WorkingTree.open_containing(directory)[0].branch.get_rev_id(revno)
2778
self.outf.write("%s\n" % revid)
2681
raise errors.BzrCommandError("not a valid revision-number: %r" % revno)
2682
2683
print WorkingTree.open_containing(u'.')[0].branch.get_rev_id(revno)
2779
2684
2780
2685
2781
2686
class cmd_export(Command):
2782
__doc__ = """Export current or past revision to a destination directory or archive.
2687
"""Export current or past revision to a destination directory or archive.
2783
2688
2784
2689
If no revision is specified this exports the last committed revision.
2785
2690
2807
2712
================= =========================
2808
2713
"""
2809
2714
takes_args = ['dest', 'branch_or_subdir?']
2810
takes_options = ['directory',
2715
takes_options = [
2811
2716
Option('format',
2812
2717
help="Type of file to export to.",
2813
2718
type=unicode),
2817
2722
Option('root',
2818
2723
type=str,
2819
2724
help="Name of the root directory inside the exported file."),
2820
Option('per-file-timestamps',
2821
help='Set modification time of files to that of the last '
2822
'revision in which it was changed.'),
2823
2725
]
2824
2726
def run(self, dest, branch_or_subdir=None, revision=None, format=None,
2825
root=None, filters=False, per_file_timestamps=False, directory=u'.'):
2727
root=None, filters=False):
2826
2728
from bzrlib.export import export
2827
2729
2828
2730
if branch_or_subdir is None:
2829
tree = WorkingTree.open_containing(directory)[0]
2731
tree = WorkingTree.open_containing(u'.')[0]
2830
2732
b = tree.branch
2831
2733
subdir = None
2832
2734
else:
2835
2737
2836
2738
rev_tree = _get_one_revision_tree('export', revision, branch=b, tree=tree)
2837
2739
try:
2838
export(rev_tree, dest, format, root, subdir, filtered=filters,
2839
per_file_timestamps=per_file_timestamps)
2740
export(rev_tree, dest, format, root, subdir, filtered=filters)
2840
2741
except errors.NoSuchExportFormat, e:
2841
2742
raise errors.BzrCommandError('Unsupported export format: %s' % e.format)
2842
2743
2843
2744
2844
2745
class cmd_cat(Command):
2845
__doc__ = """Write the contents of a file as of a given revision to standard output.
2746
"""Write the contents of a file as of a given revision to standard output.
2846
2747
2847
2748
If no revision is nominated, the last revision is used.
2848
2749
2851
2752
"""
2852
2753
2853
2754
_see_also = ['ls']
2854
takes_options = ['directory',
2755
takes_options = [
2855
2756
Option('name-from-revision', help='The path name in the old tree.'),
2856
2757
Option('filters', help='Apply content filters to display the '
2857
2758
'convenience form.'),
2862
2763
2863
2764
@display_command
2864
2765
def run(self, filename, revision=None, name_from_revision=False,
2865
filters=False, directory=None):
2766
filters=False):
2866
2767
if revision is not None and len(revision) != 1:
2867
2768
raise errors.BzrCommandError("bzr cat --revision takes exactly"
2868
2769
" one revision specifier")
2869
2770
tree, branch, relpath = \
2870
_open_directory_or_containing_tree_or_branch(filename, directory)
2871
self.add_cleanup(branch.lock_read().unlock)
2872
return self._run(tree, branch, relpath, filename, revision,
2873
name_from_revision, filters)
2771
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
2772
branch.lock_read()
2773
try:
2774
return self._run(tree, branch, relpath, filename, revision,
2775
name_from_revision, filters)
2776
finally:
2777
branch.unlock()
2874
2778
2875
2779
def _run(self, tree, b, relpath, filename, revision, name_from_revision,
2876
2780
filtered):
2877
2781
if tree is None:
2878
2782
tree = b.basis_tree()
2879
2783
rev_tree = _get_one_revision_tree('cat', revision, branch=b)
2880
self.add_cleanup(rev_tree.lock_read().unlock)
2881
2784
2882
2785
old_file_id = rev_tree.path2id(relpath)
2883
2786
2918
2821
chunks = content.splitlines(True)
2919
2822
content = filtered_output_bytes(chunks, filters,
2920
2823
ContentFilterContext(relpath, rev_tree))
2921
self.cleanup_now()
2922
2824
self.outf.writelines(content)
2923
2825
else:
2924
self.cleanup_now()
2925
2826
self.outf.write(content)
2926
2827
2927
2828
2928
2829
class cmd_local_time_offset(Command):
2929
__doc__ = """Show the offset in seconds from GMT to local time."""
2830
"""Show the offset in seconds from GMT to local time."""
2930
2831
hidden = True
2931
2832
@display_command
2932
2833
def run(self):
2933
self.outf.write("%s\n" % osutils.local_time_offset())
2834
print osutils.local_time_offset()
2934
2835
2935
2836
2936
2837
2937
2838
class cmd_commit(Command):
2938
__doc__ = """Commit changes into a new revision.
2839
"""Commit changes into a new revision.
2939
2840
2940
2841
An explanatory message needs to be given for each commit. This is
2941
2842
often done by using the --message option (getting the message from the
3034
2935
Option('strict',
3035
2936
help="Refuse to commit if there are unknown "
3036
2937
"files in the working tree."),
3037
Option('commit-time', type=str,
3038
help="Manually set a commit time using commit date "
3039
"format, e.g. '2009-10-10 08:00:00 +0100'."),
3040
2938
ListOption('fixes', type=str,
3041
2939
help="Mark a bug as being fixed by this revision "
3042
2940
"(see \"bzr help bugs\")."),
3049
2947
"the master branch until a normal commit "
3050
2948
"is performed."
3051
2949
),
3052
Option('show-diff', short_name='p',
3053
help='When no message is supplied, show the diff along'
3054
' with the status summary in the message editor.'),
2950
Option('show-diff',
2951
help='When no message is supplied, show the diff along'
2952
' with the status summary in the message editor.'),
3055
2953
]
3056
2954
aliases = ['ci', 'checkin']
3057
2955
3076
2974
3077
2975
def run(self, message=None, file=None, verbose=False, selected_list=None,
3078
2976
unchanged=False, strict=False, local=False, fixes=None,
3079
author=None, show_diff=False, exclude=None, commit_time=None):
2977
author=None, show_diff=False, exclude=None):
3080
2978
from bzrlib.errors import (
3081
2979
PointlessCommit,
3082
2980
ConflictsInTree,
3088
2986
make_commit_message_template_encoded
3089
2987
)
3090
2988
3091
commit_stamp = offset = None
3092
if commit_time is not None:
3093
try:
3094
commit_stamp, offset = timestamp.parse_patch_date(commit_time)
3095
except ValueError, e:
3096
raise errors.BzrCommandError(
3097
"Could not parse --commit-time: " + str(e))
3098
3099
2989
# TODO: Need a blackbox test for invoking the external editor; may be
3100
2990
# slightly problematic to run this cross-platform.
3101
2991
3121
3011
if local and not tree.branch.get_bound_location():
3122
3012
raise errors.LocalRequiresBoundBranch()
3123
3013
3124
if message is not None:
3125
try:
3126
file_exists = osutils.lexists(message)
3127
except UnicodeError:
3128
# The commit message contains unicode characters that can't be
3129
# represented in the filesystem encoding, so that can't be a
3130
# file.
3131
file_exists = False
3132
if file_exists:
3133
warning_msg = (
3134
'The commit message is a file name: "%(f)s".\n'
3135
'(use --file "%(f)s" to take commit message from that file)'
3136
% { 'f': message })
3137
ui.ui_factory.show_warning(warning_msg)
3138
if '\r' in message:
3139
message = message.replace('\r\n', '\n')
3140
message = message.replace('\r', '\n')
3141
if file:
3142
raise errors.BzrCommandError(
3143
"please specify either --message or --file")
3144
3145
3014
def get_message(commit_obj):
3146
3015
"""Callback to get commit message"""
3147
if file:
3148
f = codecs.open(file, 'rt', osutils.get_user_encoding())
3149
try:
3150
my_message = f.read()
3151
finally:
3152
f.close()
3153
elif message is not None:
3154
my_message = message
3155
else:
3156
# No message supplied: make one up.
3157
# text is the status of the tree
3158
text = make_commit_message_template_encoded(tree,
3016
my_message = message
3017
if my_message is None and not file:
3018
t = make_commit_message_template_encoded(tree,
3159
3019
selected_list, diff=show_diff,
3160
3020
output_encoding=osutils.get_user_encoding())
3161
# start_message is the template generated from hooks
3162
# XXX: Warning - looks like hooks return unicode,
3163
# make_commit_message_template_encoded returns user encoding.
3164
# We probably want to be using edit_commit_message instead to
3165
# avoid this.
3166
3021
start_message = generate_commit_message_template(commit_obj)
3167
my_message = edit_commit_message_encoded(text,
3022
my_message = edit_commit_message_encoded(t,
3168
3023
start_message=start_message)
3169
3024
if my_message is None:
3170
3025
raise errors.BzrCommandError("please specify a commit"
3171
3026
" message with either --message or --file")
3027
elif my_message and file:
3028
raise errors.BzrCommandError(
3029
"please specify either --message or --file")
3030
if file:
3031
my_message = codecs.open(file, 'rt',
3032
osutils.get_user_encoding()).read()
3172
3033
if my_message == "":
3173
3034
raise errors.BzrCommandError("empty commit message specified")
3174
3035
return my_message
3175
3036
3176
# The API permits a commit with a filter of [] to mean 'select nothing'
3177
# but the command line should not do that.
3178
if not selected_list:
3179
selected_list = None
3180
3037
try:
3181
3038
tree.commit(message_callback=get_message,
3182
3039
specific_files=selected_list,
3183
3040
allow_pointless=unchanged, strict=strict, local=local,
3184
3041
reporter=None, verbose=verbose, revprops=properties,
3185
authors=author, timestamp=commit_stamp,
3186
timezone=offset,
3042
authors=author,
3187
3043
exclude=safe_relpath_files(tree, exclude))
3188
3044
except PointlessCommit:
3045
# FIXME: This should really happen before the file is read in;
3046
# perhaps prepare the commit; get the message; then actually commit
3189
3047
raise errors.BzrCommandError("No changes to commit."
3190
3048
" Use --unchanged to commit anyhow.")
3191
3049
except ConflictsInTree:
3196
3054
raise errors.BzrCommandError("Commit refused because there are"
3197
3055
" unknown files in the working tree.")
3198
3056
except errors.BoundBranchOutOfDate, e:
3199
e.extra_help = ("\n"
3200
'To commit to master branch, run update and then commit.\n'
3201
'You can also pass --local to commit to continue working '
3202
'disconnected.')
3203
raise
3057
raise errors.BzrCommandError(str(e) + "\n"
3058
'To commit to master branch, run update and then commit.\n'
3059
'You can also pass --local to commit to continue working '
3060
'disconnected.')
3204
3061
3205
3062
3206
3063
class cmd_check(Command):
3207
__doc__ = """Validate working tree structure, branch consistency and repository history.
3064
"""Validate working tree structure, branch consistency and repository history.
3208
3065
3209
3066
This command checks various invariants about branch and repository storage
3210
3067
to detect data corruption or bzr bugs.
3274
3131
3275
3132
3276
3133
class cmd_upgrade(Command):
3277
__doc__ = """Upgrade branch storage to current format.
3134
"""Upgrade branch storage to current format.
3278
3135
3279
3136
The check command or bzr developers may sometimes advise you to run
3280
3137
this command. When the default format has changed you may also be warned
3298
3155
3299
3156
3300
3157
class cmd_whoami(Command):
3301
__doc__ = """Show or set bzr user id.
3158
"""Show or set bzr user id.
3302
3159
3303
3160
:Examples:
3304
3161
Show the email of the current user::
3348
3205
3349
3206
3350
3207
class cmd_nick(Command):
3351
__doc__ = """Print or set the branch nickname.
3208
"""Print or set the branch nickname.
3352
3209
3353
3210
If unset, the tree root directory name is used as the nickname.
3354
3211
To print the current nickname, execute with no argument.
3359
3216
3360
3217
_see_also = ['info']
3361
3218
takes_args = ['nickname?']
3362
takes_options = ['directory']
3363
def run(self, nickname=None, directory=u'.'):
3364
branch = Branch.open_containing(directory)[0]
3219
def run(self, nickname=None):
3220
branch = Branch.open_containing(u'.')[0]
3365
3221
if nickname is None:
3366
3222
self.printme(branch)
3367
3223
else:
3369
3225
3370
3226
@display_command
3371
3227
def printme(self, branch):
3372
self.outf.write('%s\n' % branch.nick)
3228
print branch.nick
3373
3229
3374
3230
3375
3231
class cmd_alias(Command):
3376
__doc__ = """Set/unset and display aliases.
3232
"""Set/unset and display aliases.
3377
3233
3378
3234
:Examples:
3379
3235
Show the current aliases::
3443
3299
3444
3300
3445
3301
class cmd_selftest(Command):
3446
__doc__ = """Run internal test suite.
3302
"""Run internal test suite.
3447
3303
3448
3304
If arguments are given, they are regular expressions that say which tests
3449
3305
should run. Tests matching any expression are run, and other tests are
3476
3332
Tests that need working space on disk use a common temporary directory,
3477
3333
typically inside $TMPDIR or /tmp.
3478
3334
3479
If you set BZR_TEST_PDB=1 when running selftest, failing tests will drop
3480
into a pdb postmortem session.
3481
3482
3335
:Examples:
3483
3336
Run only tests relating to 'ignore'::
3484
3337
3493
3346
def get_transport_type(typestring):
3494
3347
"""Parse and return a transport specifier."""
3495
3348
if typestring == "sftp":
3496
from bzrlib.tests import stub_sftp
3497
return stub_sftp.SFTPAbsoluteServer
3349
from bzrlib.transport.sftp import SFTPAbsoluteServer
3350
return SFTPAbsoluteServer
3498
3351
if typestring == "memory":
3499
from bzrlib.tests import test_server
3500
return memory.MemoryServer
3352
from bzrlib.transport.memory import MemoryServer
3353
return MemoryServer
3501
3354
if typestring == "fakenfs":
3502
from bzrlib.tests import test_server
3503
return test_server.FakeNFSServer
3355
from bzrlib.transport.fakenfs import FakeNFSServer
3356
return FakeNFSServer
3504
3357
msg = "No known transport type %s. Supported types are: sftp\n" %\
3505
3358
(typestring)
3506
3359
raise errors.BzrCommandError(msg)
3521
3374
Option('lsprof-timed',
3522
3375
help='Generate lsprof output for benchmarked'
3523
3376
' sections of code.'),
3524
Option('lsprof-tests',
3525
help='Generate lsprof output for each test.'),
3526
3377
Option('cache-dir', type=str,
3527
3378
help='Cache intermediate benchmark output in this '
3528
3379
'directory.'),
3569
3420
first=False, list_only=False,
3570
3421
randomize=None, exclude=None, strict=False,
3571
3422
load_list=None, debugflag=None, starting_with=None, subunit=False,
3572
parallel=None, lsprof_tests=False):
3423
parallel=None):
3573
3424
from bzrlib.tests import selftest
3574
3425
import bzrlib.benchmarks as benchmarks
3575
3426
from bzrlib.benchmarks import tree_creator
3590
3441
raise errors.BzrCommandError("subunit not available. subunit "
3591
3442
"needs to be installed to use --subunit.")
3592
3443
self.additional_selftest_args['runner_class'] = SubUnitBzrRunner
3593
# On Windows, disable automatic conversion of '\n' to '\r\n' in
3594
# stdout, which would corrupt the subunit stream.
3595
# FIXME: This has been fixed in subunit trunk (>0.0.5) so the
3596
# following code can be deleted when it's sufficiently deployed
3597
# -- vila/mgz 20100514
3598
if (sys.platform == "win32"
3599
and getattr(sys.stdout, 'fileno', None) is not None):
3600
import msvcrt
3601
msvcrt.setmode(sys.stdout.fileno(), os.O_BINARY)
3602
3444
if parallel:
3603
3445
self.additional_selftest_args.setdefault(
3604
3446
'suite_decorators', []).append(parallel)
3608
3450
verbose = not is_quiet()
3609
3451
# TODO: should possibly lock the history file...
3610
3452
benchfile = open(".perf_history", "at", buffering=1)
3611
self.add_cleanup(benchfile.close)
3612
3453
else:
3613
3454
test_suite_factory = None
3614
3455
benchfile = None
3615
selftest_kwargs = {"verbose": verbose,
3616
"pattern": pattern,
3617
"stop_on_failure": one,
3618
"transport": transport,
3619
"test_suite_factory": test_suite_factory,
3620
"lsprof_timed": lsprof_timed,
3621
"lsprof_tests": lsprof_tests,
3622
"bench_history": benchfile,
3623
"matching_tests_first": first,
3624
"list_only": list_only,
3625
"random_seed": randomize,
3626
"exclude_pattern": exclude,
3627
"strict": strict,
3628
"load_list": load_list,
3629
"debug_flags": debugflag,
3630
"starting_with": starting_with
3631
}
3632
selftest_kwargs.update(self.additional_selftest_args)
3633
result = selftest(**selftest_kwargs)
3456
try:
3457
selftest_kwargs = {"verbose": verbose,
3458
"pattern": pattern,
3459
"stop_on_failure": one,
3460
"transport": transport,
3461
"test_suite_factory": test_suite_factory,
3462
"lsprof_timed": lsprof_timed,
3463
"bench_history": benchfile,
3464
"matching_tests_first": first,
3465
"list_only": list_only,
3466
"random_seed": randomize,
3467
"exclude_pattern": exclude,
3468
"strict": strict,
3469
"load_list": load_list,
3470
"debug_flags": debugflag,
3471
"starting_with": starting_with
3472
}
3473
selftest_kwargs.update(self.additional_selftest_args)
3474
result = selftest(**selftest_kwargs)
3475
finally:
3476
if benchfile is not None:
3477
benchfile.close()
3634
3478
return int(not result)
3635
3479
3636
3480
3637
3481
class cmd_version(Command):
3638
__doc__ = """Show version of bzr."""
3482
"""Show version of bzr."""
3639
3483
3640
3484
encoding_type = 'replace'
3641
3485
takes_options = [
3652
3496
3653
3497
3654
3498
class cmd_rocks(Command):
3655
__doc__ = """Statement of optimism."""
3499
"""Statement of optimism."""
3656
3500
3657
3501
hidden = True
3658
3502
3659
3503
@display_command
3660
3504
def run(self):
3661
self.outf.write("It sure does!\n")
3505
print "It sure does!"
3662
3506
3663
3507
3664
3508
class cmd_find_merge_base(Command):
3665
__doc__ = """Find and print a base revision for merging two branches."""
3509
"""Find and print a base revision for merging two branches."""
3666
3510
# TODO: Options to specify revisions on either side, as if
3667
3511
# merging only part of the history.
3668
3512
takes_args = ['branch', 'other']
3674
3518
3675
3519
branch1 = Branch.open_containing(branch)[0]
3676
3520
branch2 = Branch.open_containing(other)[0]
3677
self.add_cleanup(branch1.lock_read().unlock)
3678
self.add_cleanup(branch2.lock_read().unlock)
3679
last1 = ensure_null(branch1.last_revision())
3680
last2 = ensure_null(branch2.last_revision())
3681
3682
graph = branch1.repository.get_graph(branch2.repository)
3683
base_rev_id = graph.find_unique_lca(last1, last2)
3684
3685
self.outf.write('merge base is revision %s\n' % base_rev_id)
3521
branch1.lock_read()
3522
try:
3523
branch2.lock_read()
3524
try:
3525
last1 = ensure_null(branch1.last_revision())
3526
last2 = ensure_null(branch2.last_revision())
3527
3528
graph = branch1.repository.get_graph(branch2.repository)
3529
base_rev_id = graph.find_unique_lca(last1, last2)
3530
3531
print 'merge base is revision %s' % base_rev_id
3532
finally:
3533
branch2.unlock()
3534
finally:
3535
branch1.unlock()
3686
3536
3687
3537
3688
3538
class cmd_merge(Command):
3689
__doc__ = """Perform a three-way merge.
3539
"""Perform a three-way merge.
3690
3540
3691
3541
The source of the merge can be specified either in the form of a branch,
3692
3542
or in the form of a path to a file containing a merge directive generated
3721
3571
committed to record the result of the merge.
3722
3572
3723
3573
merge refuses to run if there are any uncommitted changes, unless
3724
--force is given. The --force option can also be used to create a
3725
merge revision which has more than two parents.
3726
3727
If one would like to merge changes from the working tree of the other
3728
branch without merging any committed revisions, the --uncommitted option
3729
can be given.
3730
3731
To select only some changes to merge, use "merge -i", which will prompt
3732
you to apply each diff hunk and file change, similar to "shelve".
3574
--force is given.
3733
3575
3734
3576
:Examples:
3735
3577
To merge the latest revision from bzr.dev::
3744
3586
3745
3587
bzr merge -r 81..82 ../bzr.dev
3746
3588
3747
To apply a merge directive contained in /tmp/merge::
3589
To apply a merge directive contained in /tmp/merge:
3748
3590
3749
3591
bzr merge /tmp/merge
3750
3751
To create a merge revision with three parents from two branches
3752
feature1a and feature1b:
3753
3754
bzr merge ../feature1a
3755
bzr merge ../feature1b --force
3756
bzr commit -m 'revision with three parents'
3757
3592
"""
3758
3593
3759
3594
encoding_type = 'exact'
3775
3610
' completely merged into the source, pull from the'
3776
3611
' source rather than merging. When this happens,'
3777
3612
' you do not need to commit the result.'),
3778
custom_help('directory',
3613
Option('directory',
3779
3614
help='Branch to merge into, '
3780
'rather than the one containing the working directory.'),
3781
Option('preview', help='Instead of merging, show a diff of the'
3782
' merge.'),
3783
Option('interactive', help='Select changes interactively.',
3784
short_name='i')
3615
'rather than the one containing the working directory.',
3616
short_name='d',
3617
type=unicode,
3618
),
3619
Option('preview', help='Instead of merging, show a diff of the merge.')
3785
3620
]
3786
3621
3787
3622
def run(self, location=None, revision=None, force=False,
3789
3624
uncommitted=False, pull=False,
3790
3625
directory=None,
3791
3626
preview=False,
3792
interactive=False,
3793
3627
):
3794
3628
if merge_type is None:
3795
3629
merge_type = _mod_merge.Merge3Merger
3801
3635
verified = 'inapplicable'
3802
3636
tree = WorkingTree.open_containing(directory)[0]
3803
3637
3638
# die as quickly as possible if there are uncommitted changes
3804
3639
try:
3805
3640
basis_tree = tree.revision_tree(tree.last_revision())
3806
3641
except errors.NoSuchRevision:
3807
3642
basis_tree = tree.basis_tree()
3808
3809
# die as quickly as possible if there are uncommitted changes
3810
3643
if not force:
3811
if tree.has_changes():
3644
if tree.has_changes(basis_tree):
3812
3645
raise errors.UncommittedChanges(tree)
3813
3646
3814
3647
view_info = _get_view_info_for_change_reporter(tree)
3815
3648
change_reporter = delta._ChangeReporter(
3816
3649
unversioned_filter=tree.is_ignored, view_info=view_info)
3817
pb = ui.ui_factory.nested_progress_bar()
3818
self.add_cleanup(pb.finished)
3819
self.add_cleanup(tree.lock_write().unlock)
3820
if location is not None:
3821
try:
3822
mergeable = bundle.read_mergeable_from_url(location,
3823
possible_transports=possible_transports)
3824
except errors.NotABundle:
3825
mergeable = None
3650
cleanups = []
3651
try:
3652
pb = ui.ui_factory.nested_progress_bar()
3653
cleanups.append(pb.finished)
3654
tree.lock_write()
3655
cleanups.append(tree.unlock)
3656
if location is not None:
3657
try:
3658
mergeable = bundle.read_mergeable_from_url(location,
3659
possible_transports=possible_transports)
3660
except errors.NotABundle:
3661
mergeable = None
3662
else:
3663
if uncommitted:
3664
raise errors.BzrCommandError('Cannot use --uncommitted'
3665
' with bundles or merge directives.')
3666
3667
if revision is not None:
3668
raise errors.BzrCommandError(
3669
'Cannot use -r with merge directives or bundles')
3670
merger, verified = _mod_merge.Merger.from_mergeable(tree,
3671
mergeable, pb)
3672
3673
if merger is None and uncommitted:
3674
if revision is not None and len(revision) > 0:
3675
raise errors.BzrCommandError('Cannot use --uncommitted and'
3676
' --revision at the same time.')
3677
merger = self.get_merger_from_uncommitted(tree, location, pb,
3678
cleanups)
3679
allow_pending = False
3680
3681
if merger is None:
3682
merger, allow_pending = self._get_merger_from_branch(tree,
3683
location, revision, remember, possible_transports, pb)
3684
3685
merger.merge_type = merge_type
3686
merger.reprocess = reprocess
3687
merger.show_base = show_base
3688
self.sanity_check_merger(merger)
3689
if (merger.base_rev_id == merger.other_rev_id and
3690
merger.other_rev_id is not None):
3691
note('Nothing to do.')
3692
return 0
3693
if pull:
3694
if merger.interesting_files is not None:
3695
raise errors.BzrCommandError('Cannot pull individual files')
3696
if (merger.base_rev_id == tree.last_revision()):
3697
result = tree.pull(merger.other_branch, False,
3698
merger.other_rev_id)
3699
result.report(self.outf)
3700
return 0
3701
merger.check_basis(False)
3702
if preview:
3703
return self._do_preview(merger)
3826
3704
else:
3827
if uncommitted:
3828
raise errors.BzrCommandError('Cannot use --uncommitted'
3829
' with bundles or merge directives.')
3830
3831
if revision is not None:
3832
raise errors.BzrCommandError(
3833
'Cannot use -r with merge directives or bundles')
3834
merger, verified = _mod_merge.Merger.from_mergeable(tree,
3835
mergeable, None)
3836
3837
if merger is None and uncommitted:
3838
if revision is not None and len(revision) > 0:
3839
raise errors.BzrCommandError('Cannot use --uncommitted and'
3840
' --revision at the same time.')
3841
merger = self.get_merger_from_uncommitted(tree, location, None)
3842
allow_pending = False
3843
3844
if merger is None:
3845
merger, allow_pending = self._get_merger_from_branch(tree,
3846
location, revision, remember, possible_transports, None)
3847
3848
merger.merge_type = merge_type
3849
merger.reprocess = reprocess
3850
merger.show_base = show_base
3851
self.sanity_check_merger(merger)
3852
if (merger.base_rev_id == merger.other_rev_id and
3853
merger.other_rev_id is not None):
3854
note('Nothing to do.')
3855
return 0
3856
if pull:
3857
if merger.interesting_files is not None:
3858
raise errors.BzrCommandError('Cannot pull individual files')
3859
if (merger.base_rev_id == tree.last_revision()):
3860
result = tree.pull(merger.other_branch, False,
3861
merger.other_rev_id)
3862
result.report(self.outf)
3863
return 0
3864
if merger.this_basis is None:
3865
raise errors.BzrCommandError(
3866
"This branch has no commits."
3867
" (perhaps you would prefer 'bzr pull')")
3868
if preview:
3869
return self._do_preview(merger)
3870
elif interactive:
3871
return self._do_interactive(merger)
3872
else:
3873
return self._do_merge(merger, change_reporter, allow_pending,
3874
verified)
3875
3876
def _get_preview(self, merger):
3705
return self._do_merge(merger, change_reporter, allow_pending,
3706
verified)
3707
finally:
3708
for cleanup in reversed(cleanups):
3709
cleanup()
3710
3711
def _do_preview(self, merger):
3712
from bzrlib.diff import show_diff_trees
3877
3713
tree_merger = merger.make_merger()
3878
3714
tt = tree_merger.make_preview_transform()
3879
self.add_cleanup(tt.finalize)
3880
result_tree = tt.get_preview_tree()
3881
return result_tree
3882
3883
def _do_preview(self, merger):
3884
from bzrlib.diff import show_diff_trees
3885
result_tree = self._get_preview(merger)
3886
show_diff_trees(merger.this_tree, result_tree, self.outf,
3887
old_label='', new_label='')
3715
try:
3716
result_tree = tt.get_preview_tree()
3717
show_diff_trees(merger.this_tree, result_tree, self.outf,
3718
old_label='', new_label='')
3719
finally:
3720
tt.finalize()
3888
3721
3889
3722
def _do_merge(self, merger, change_reporter, allow_pending, verified):
3890
3723
merger.change_reporter = change_reporter
3898
3731
else:
3899
3732
return 0
3900
3733
3901
def _do_interactive(self, merger):
3902
"""Perform an interactive merge.
3903
3904
This works by generating a preview tree of the merge, then using
3905
Shelver to selectively remove the differences between the working tree
3906
and the preview tree.
3907
"""
3908
from bzrlib import shelf_ui
3909
result_tree = self._get_preview(merger)
3910
writer = bzrlib.option.diff_writer_registry.get()
3911
shelver = shelf_ui.Shelver(merger.this_tree, result_tree, destroy=True,
3912
reporter=shelf_ui.ApplyReporter(),
3913
diff_writer=writer(sys.stdout))
3914
try:
3915
shelver.run()
3916
finally:
3917
shelver.finalize()
3918
3919
3734
def sanity_check_merger(self, merger):
3920
3735
if (merger.show_base and
3921
3736
not merger.merge_type is _mod_merge.Merge3Merger):
3956
3771
base_branch, base_path = Branch.open_containing(base_loc,
3957
3772
possible_transports)
3958
3773
# Find the revision ids
3959
other_revision_id = None
3960
base_revision_id = None
3961
if revision is not None:
3962
if len(revision) >= 1:
3963
other_revision_id = revision[-1].as_revision_id(other_branch)
3964
if len(revision) == 2:
3965
base_revision_id = revision[0].as_revision_id(base_branch)
3966
if other_revision_id is None:
3774
if revision is None or len(revision) < 1 or revision[-1] is None:
3967
3775
other_revision_id = _mod_revision.ensure_null(
3968
3776
other_branch.last_revision())
3777
else:
3778
other_revision_id = revision[-1].as_revision_id(other_branch)
3779
if (revision is not None and len(revision) == 2
3780
and revision[0] is not None):
3781
base_revision_id = revision[0].as_revision_id(base_branch)
3782
else:
3783
base_revision_id = None
3969
3784
# Remember where we merge from
3970
3785
if ((remember or tree.branch.get_submit_branch() is None) and
3971
3786
user_location is not None):
3980
3795
allow_pending = True
3981
3796
return merger, allow_pending
3982
3797
3983
def get_merger_from_uncommitted(self, tree, location, pb):
3798
def get_merger_from_uncommitted(self, tree, location, pb, cleanups):
3984
3799
"""Get a merger for uncommitted changes.
3985
3800
3986
3801
:param tree: The tree the merger should apply to.
3987
3802
:param location: The location containing uncommitted changes.
3988
3803
:param pb: The progress bar to use for showing progress.
3804
:param cleanups: A list of operations to perform to clean up the
3805
temporary directories, unfinalized objects, etc.
3989
3806
"""
3990
3807
location = self._select_branch_location(tree, location)[0]
3991
3808
other_tree, other_path = WorkingTree.open_containing(location)
4043
3860
4044
3861
4045
3862
class cmd_remerge(Command):
4046
__doc__ = """Redo a merge.
3863
"""Redo a merge.
4047
3864
4048
3865
Use this if you want to try a different merge technique while resolving
4049
3866
conflicts. Some merge techniques are better than others, and remerge
4074
3891
4075
3892
def run(self, file_list=None, merge_type=None, show_base=False,
4076
3893
reprocess=False):
4077
from bzrlib.conflicts import restore
4078
3894
if merge_type is None:
4079
3895
merge_type = _mod_merge.Merge3Merger
4080
3896
tree, file_list = tree_files(file_list)
4081
self.add_cleanup(tree.lock_write().unlock)
4082
parents = tree.get_parent_ids()
4083
if len(parents) != 2:
4084
raise errors.BzrCommandError("Sorry, remerge only works after normal"
4085
" merges. Not cherrypicking or"
4086
" multi-merges.")
4087
repository = tree.branch.repository
4088
interesting_ids = None
4089
new_conflicts = []
4090
conflicts = tree.conflicts()
4091
if file_list is not None:
4092
interesting_ids = set()
4093
for filename in file_list:
4094
file_id = tree.path2id(filename)
4095
if file_id is None:
4096
raise errors.NotVersionedError(filename)
4097
interesting_ids.add(file_id)
4098
if tree.kind(file_id) != "directory":
4099
continue
3897
tree.lock_write()
3898
try:
3899
parents = tree.get_parent_ids()
3900
if len(parents) != 2:
3901
raise errors.BzrCommandError("Sorry, remerge only works after normal"
3902
" merges. Not cherrypicking or"
3903
" multi-merges.")
3904
repository = tree.branch.repository
3905
interesting_ids = None
3906
new_conflicts = []
3907
conflicts = tree.conflicts()
3908
if file_list is not None:
3909
interesting_ids = set()
3910
for filename in file_list:
3911
file_id = tree.path2id(filename)
3912
if file_id is None:
3913
raise errors.NotVersionedError(filename)
3914
interesting_ids.add(file_id)
3915
if tree.kind(file_id) != "directory":
3916
continue
4100
3917
4101
for name, ie in tree.inventory.iter_entries(file_id):
4102
interesting_ids.add(ie.file_id)
4103
new_conflicts = conflicts.select_conflicts(tree, file_list)[0]
4104
else:
4105
# Remerge only supports resolving contents conflicts
4106
allowed_conflicts = ('text conflict', 'contents conflict')
4107
restore_files = [c.path for c in conflicts
4108
if c.typestring in allowed_conflicts]
4109
_mod_merge.transform_tree(tree, tree.basis_tree(), interesting_ids)
4110
tree.set_conflicts(ConflictList(new_conflicts))
4111
if file_list is not None:
4112
restore_files = file_list
4113
for filename in restore_files:
3918
for name, ie in tree.inventory.iter_entries(file_id):
3919
interesting_ids.add(ie.file_id)
3920
new_conflicts = conflicts.select_conflicts(tree, file_list)[0]
3921
else:
3922
# Remerge only supports resolving contents conflicts
3923
allowed_conflicts = ('text conflict', 'contents conflict')
3924
restore_files = [c.path for c in conflicts
3925
if c.typestring in allowed_conflicts]
3926
_mod_merge.transform_tree(tree, tree.basis_tree(), interesting_ids)
3927
tree.set_conflicts(ConflictList(new_conflicts))
3928
if file_list is not None:
3929
restore_files = file_list
3930
for filename in restore_files:
3931
try:
3932
restore(tree.abspath(filename))
3933
except errors.NotConflicted:
3934
pass
3935
# Disable pending merges, because the file texts we are remerging
3936
# have not had those merges performed. If we use the wrong parents
3937
# list, we imply that the working tree text has seen and rejected
3938
# all the changes from the other tree, when in fact those changes
3939
# have not yet been seen.
3940
pb = ui.ui_factory.nested_progress_bar()
3941
tree.set_parent_ids(parents[:1])
4114
3942
try:
4115
restore(tree.abspath(filename))
4116
except errors.NotConflicted:
4117
pass
4118
# Disable pending merges, because the file texts we are remerging
4119
# have not had those merges performed. If we use the wrong parents
4120
# list, we imply that the working tree text has seen and rejected
4121
# all the changes from the other tree, when in fact those changes
4122
# have not yet been seen.
4123
tree.set_parent_ids(parents[:1])
4124
try:
4125
merger = _mod_merge.Merger.from_revision_ids(None, tree, parents[1])
4126
merger.interesting_ids = interesting_ids
4127
merger.merge_type = merge_type
4128
merger.show_base = show_base
4129
merger.reprocess = reprocess
4130
conflicts = merger.do_merge()
3943
merger = _mod_merge.Merger.from_revision_ids(pb,
3944
tree, parents[1])
3945
merger.interesting_ids = interesting_ids
3946
merger.merge_type = merge_type
3947
merger.show_base = show_base
3948
merger.reprocess = reprocess
3949
conflicts = merger.do_merge()
3950
finally:
3951
tree.set_parent_ids(parents)
3952
pb.finished()
4131
3953
finally:
4132
tree.set_parent_ids(parents)
3954
tree.unlock()
4133
3955
if conflicts > 0:
4134
3956
return 1
4135
3957
else:
4137
3959
4138
3960
4139
3961
class cmd_revert(Command):
4140
__doc__ = """Revert files to a previous revision.
3962
"""Revert files to a previous revision.
4141
3963
4142
3964
Giving a list of files will revert only those files. Otherwise, all files
4143
3965
will be reverted. If the revision is not specified with '--revision', the
4157
3979
name. If you name a directory, all the contents of that directory will be
4158
3980
reverted.
4159
3981
4160
If you have newly added files since the target revision, they will be
4161
removed. If the files to be removed have been changed, backups will be
4162
created as above. Directories containing unknown files will not be
4163
deleted.
3982
Any files that have been newly added since that revision will be deleted,
3983
with a backup kept if appropriate. Directories containing unknown files
3984
will not be deleted.
4164
3985
4165
The working tree contains a list of revisions that have been merged but
4166
not yet committed. These revisions will be included as additional parents
4167
of the next commit. Normally, using revert clears that list as well as
4168
reverting the files. If any files are specified, revert leaves the list
4169
of uncommitted merges alone and reverts only the files. Use ``bzr revert
4170
.`` in the tree root to revert all files but keep the recorded merges,
4171
and ``bzr revert --forget-merges`` to clear the pending merge list without
3986
The working tree contains a list of pending merged revisions, which will
3987
be included as parents in the next commit. Normally, revert clears that
3988
list as well as reverting the files. If any files are specified, revert
3989
leaves the pending merge list alone and reverts only the files. Use "bzr
3990
revert ." in the tree root to revert all files but keep the merge record,
3991
and "bzr revert --forget-merges" to clear the pending merge list without
4172
3992
reverting any files.
4173
4174
Using "bzr revert --forget-merges", it is possible to apply all of the
4175
changes from a branch in a single revision. To do this, perform the merge
4176
as desired. Then doing revert with the "--forget-merges" option will keep
4177
the content of the tree as it was, but it will clear the list of pending
4178
merges. The next commit will then contain all of the changes that are
4179
present in the other branch, but without any other parent revisions.
4180
Because this technique forgets where these changes originated, it may
4181
cause additional conflicts on later merges involving the same source and
4182
target branches.
4183
3993
"""
4184
3994
4185
3995
_see_also = ['cat', 'export']
4194
4004
def run(self, revision=None, no_backup=False, file_list=None,
4195
4005
forget_merges=None):
4196
4006
tree, file_list = tree_files(file_list)
4197
self.add_cleanup(tree.lock_tree_write().unlock)
4198
if forget_merges:
4199
tree.set_parent_ids(tree.get_parent_ids()[:1])
4200
else:
4201
self._revert_tree_to_revision(tree, revision, file_list, no_backup)
4007
tree.lock_write()
4008
try:
4009
if forget_merges:
4010
tree.set_parent_ids(tree.get_parent_ids()[:1])
4011
else:
4012
self._revert_tree_to_revision(tree, revision, file_list, no_backup)
4013
finally:
4014
tree.unlock()
4202
4015
4203
4016
@staticmethod
4204
4017
def _revert_tree_to_revision(tree, revision, file_list, no_backup):
4205
4018
rev_tree = _get_one_revision_tree('revert', revision, tree=tree)
4206
tree.revert(file_list, rev_tree, not no_backup, None,
4207
report_changes=True)
4019
pb = ui.ui_factory.nested_progress_bar()
4020
try:
4021
tree.revert(file_list, rev_tree, not no_backup, pb,
4022
report_changes=True)
4023
finally:
4024
pb.finished()
4208
4025
4209
4026
4210
4027
class cmd_assert_fail(Command):
4211
__doc__ = """Test reporting of assertion failures"""
4028
"""Test reporting of assertion failures"""
4212
4029
# intended just for use in testing
4213
4030
4214
4031
hidden = True
4218
4035
4219
4036
4220
4037
class cmd_help(Command):
4221
__doc__ = """Show help on a command or other topic.
4038
"""Show help on a command or other topic.
4222
4039
"""
4223
4040
4224
4041
_see_also = ['topics']
4237
4054
4238
4055
4239
4056
class cmd_shell_complete(Command):
4240
__doc__ = """Show appropriate completions for context.
4057
"""Show appropriate completions for context.
4241
4058
4242
4059
For a list of all available commands, say 'bzr shell-complete'.
4243
4060
"""
4252
4069
4253
4070
4254
4071
class cmd_missing(Command):
4255
__doc__ = """Show unmerged/unpulled revisions between two branches.
4072
"""Show unmerged/unpulled revisions between two branches.
4256
4073
4257
4074
OTHER_BRANCH may be local or remote.
4258
4075
4259
4076
To filter on a range of revisions, you can use the command -r begin..end
4260
4077
-r revision requests a specific revision, -r ..end or -r begin.. are
4261
4078
also valid.
4262
4263
:Exit values:
4264
1 - some missing revisions
4265
0 - no missing revisions
4266
4079
4267
4080
:Examples:
4268
4081
4336
4149
restrict = 'remote'
4337
4150
4338
4151
local_branch = Branch.open_containing(u".")[0]
4339
self.add_cleanup(local_branch.lock_read().unlock)
4340
4341
4152
parent = local_branch.get_parent()
4342
4153
if other_branch is None:
4343
4154
other_branch = parent
4352
4163
remote_branch = Branch.open(other_branch)
4353
4164
if remote_branch.base == local_branch.base:
4354
4165
remote_branch = local_branch
4355
else:
4356
self.add_cleanup(remote_branch.lock_read().unlock)
4357
4166
4358
4167
local_revid_range = _revision_range_to_revid_range(
4359
4168
_get_revision_range(my_revision, local_branch,
4363
4172
_get_revision_range(revision,
4364
4173
remote_branch, self.name()))
4365
4174
4366
local_extra, remote_extra = find_unmerged(
4367
local_branch, remote_branch, restrict,
4368
backward=not reverse,
4369
include_merges=include_merges,
4370
local_revid_range=local_revid_range,
4371
remote_revid_range=remote_revid_range)
4372
4373
if log_format is None:
4374
registry = log.log_formatter_registry
4375
log_format = registry.get_default(local_branch)
4376
lf = log_format(to_file=self.outf,
4377
show_ids=show_ids,
4378
show_timezone='original')
4379
4380
status_code = 0
4381
if local_extra and not theirs_only:
4382
message("You have %d extra revision(s):\n" %
4383
len(local_extra))
4384
for revision in iter_log_revisions(local_extra,
4385
local_branch.repository,
4386
verbose):
4387
lf.log_revision(revision)
4388
printed_local = True
4389
status_code = 1
4390
else:
4391
printed_local = False
4392
4393
if remote_extra and not mine_only:
4394
if printed_local is True:
4395
message("\n\n\n")
4396
message("You are missing %d revision(s):\n" %
4397
len(remote_extra))
4398
for revision in iter_log_revisions(remote_extra,
4399
remote_branch.repository,
4400
verbose):
4401
lf.log_revision(revision)
4402
status_code = 1
4403
4404
if mine_only and not local_extra:
4405
# We checked local, and found nothing extra
4406
message('This branch is up to date.\n')
4407
elif theirs_only and not remote_extra:
4408
# We checked remote, and found nothing extra
4409
message('Other branch is up to date.\n')
4410
elif not (mine_only or theirs_only or local_extra or
4411
remote_extra):
4412
# We checked both branches, and neither one had extra
4413
# revisions
4414
message("Branches are up to date.\n")
4415
self.cleanup_now()
4175
local_branch.lock_read()
4176
try:
4177
remote_branch.lock_read()
4178
try:
4179
local_extra, remote_extra = find_unmerged(
4180
local_branch, remote_branch, restrict,
4181
backward=not reverse,
4182
include_merges=include_merges,
4183
local_revid_range=local_revid_range,
4184
remote_revid_range=remote_revid_range)
4185
4186
if log_format is None:
4187
registry = log.log_formatter_registry
4188
log_format = registry.get_default(local_branch)
4189
lf = log_format(to_file=self.outf,
4190
show_ids=show_ids,
4191
show_timezone='original')
4192
4193
status_code = 0
4194
if local_extra and not theirs_only:
4195
message("You have %d extra revision(s):\n" %
4196
len(local_extra))
4197
for revision in iter_log_revisions(local_extra,
4198
local_branch.repository,
4199
verbose):
4200
lf.log_revision(revision)
4201
printed_local = True
4202
status_code = 1
4203
else:
4204
printed_local = False
4205
4206
if remote_extra and not mine_only:
4207
if printed_local is True:
4208
message("\n\n\n")
4209
message("You are missing %d revision(s):\n" %
4210
len(remote_extra))
4211
for revision in iter_log_revisions(remote_extra,
4212
remote_branch.repository,
4213
verbose):
4214
lf.log_revision(revision)
4215
status_code = 1
4216
4217
if mine_only and not local_extra:
4218
# We checked local, and found nothing extra
4219
message('This branch is up to date.\n')
4220
elif theirs_only and not remote_extra:
4221
# We checked remote, and found nothing extra
4222
message('Other branch is up to date.\n')
4223
elif not (mine_only or theirs_only or local_extra or
4224
remote_extra):
4225
# We checked both branches, and neither one had extra
4226
# revisions
4227
message("Branches are up to date.\n")
4228
finally:
4229
remote_branch.unlock()
4230
finally:
4231
local_branch.unlock()
4416
4232
if not status_code and parent is None and other_branch is not None:
4417
self.add_cleanup(local_branch.lock_write().unlock)
4418
# handle race conditions - a parent might be set while we run.
4419
if local_branch.get_parent() is None:
4420
local_branch.set_parent(remote_branch.base)
4233
local_branch.lock_write()
4234
try:
4235
# handle race conditions - a parent might be set while we run.
4236
if local_branch.get_parent() is None:
4237
local_branch.set_parent(remote_branch.base)
4238
finally:
4239
local_branch.unlock()
4421
4240
return status_code
4422
4241
4423
4242
4424
4243
class cmd_pack(Command):
4425
__doc__ = """Compress the data within a repository.
4426
4427
This operation compresses the data within a bazaar repository. As
4428
bazaar supports automatic packing of repository, this operation is
4429
normally not required to be done manually.
4430
4431
During the pack operation, bazaar takes a backup of existing repository
4432
data, i.e. pack files. This backup is eventually removed by bazaar
4433
automatically when it is safe to do so. To save disk space by removing
4434
the backed up pack files, the --clean-obsolete-packs option may be
4435
used.
4436
4437
Warning: If you use --clean-obsolete-packs and your machine crashes
4438
during or immediately after repacking, you may be left with a state
4439
where the deletion has been written to disk but the new packs have not
4440
been. In this case the repository may be unusable.
4441
"""
4244
"""Compress the data within a repository."""
4442
4245
4443
4246
_see_also = ['repositories']
4444
4247
takes_args = ['branch_or_repo?']
4445
takes_options = [
4446
Option('clean-obsolete-packs', 'Delete obsolete packs to save disk space.'),
4447
]
4448
4248
4449
def run(self, branch_or_repo='.', clean_obsolete_packs=False):
4249
def run(self, branch_or_repo='.'):
4450
4250
dir = bzrdir.BzrDir.open_containing(branch_or_repo)[0]
4451
4251
try:
4452
4252
branch = dir.open_branch()
4453
4253
repository = branch.repository
4454
4254
except errors.NotBranchError:
4455
4255
repository = dir.open_repository()
4456
repository.pack(clean_obsolete_packs=clean_obsolete_packs)
4256
repository.pack()
4457
4257
4458
4258
4459
4259
class cmd_plugins(Command):
4460
__doc__ = """List the installed plugins.
4260
"""List the installed plugins.
4461
4261
4462
4262
This command displays the list of installed plugins including
4463
4263
version of plugin and a short description of each.
4470
4270
adding new commands, providing additional network transports and
4471
4271
customizing log output.
4472
4272
4473
See the Bazaar Plugin Guide <http://doc.bazaar.canonical.com/plugins/en/>
4474
for further information on plugins including where to find them and how to
4475
install them. Instructions are also provided there on how to write new
4476
plugins using the Python programming language.
4273
See the Bazaar web site, http://bazaar-vcs.org, for further
4274
information on plugins including where to find them and how to
4275
install them. Instructions are also provided there on how to
4276
write new plugins using the Python programming language.
4477
4277
"""
4478
4278
takes_options = ['verbose']
4479
4279
4494
4294
doc = '(no description)'
4495
4295
result.append((name_ver, doc, plugin.path()))
4496
4296
for name_ver, doc, path in sorted(result):
4497
self.outf.write("%s\n" % name_ver)
4498
self.outf.write(" %s\n" % doc)
4297
print name_ver
4298
print ' ', doc
4499
4299
if verbose:
4500
self.outf.write(" %s\n" % path)
4501
self.outf.write("\n")
4300
print ' ', path
4301
print
4502
4302
4503
4303
4504
4304
class cmd_testament(Command):
4505
__doc__ = """Show testament (signing-form) of a revision."""
4305
"""Show testament (signing-form) of a revision."""
4506
4306
takes_options = [
4507
4307
'revision',
4508
4308
Option('long', help='Produce long-format testament.'),
4520
4320
b = Branch.open_containing(branch)[0]
4521
4321
else:
4522
4322
b = Branch.open(branch)
4523
self.add_cleanup(b.lock_read().unlock)
4524
if revision is None:
4525
rev_id = b.last_revision()
4526
else:
4527
rev_id = revision[0].as_revision_id(b)
4528
t = testament_class.from_revision(b.repository, rev_id)
4529
if long:
4530
sys.stdout.writelines(t.as_text_lines())
4531
else:
4532
sys.stdout.write(t.as_short_text())
4323
b.lock_read()
4324
try:
4325
if revision is None:
4326
rev_id = b.last_revision()
4327
else:
4328
rev_id = revision[0].as_revision_id(b)
4329
t = testament_class.from_revision(b.repository, rev_id)
4330
if long:
4331
sys.stdout.writelines(t.as_text_lines())
4332
else:
4333
sys.stdout.write(t.as_short_text())
4334
finally:
4335
b.unlock()
4533
4336
4534
4337
4535
4338
class cmd_annotate(Command):
4536
__doc__ = """Show the origin of each line in a file.
4339
"""Show the origin of each line in a file.
4537
4340
4538
4341
This prints out the given file with an annotation on the left side
4539
4342
indicating which revision, author and date introduced the change.
4550
4353
Option('long', help='Show commit date in annotations.'),
4551
4354
'revision',
4552
4355
'show-ids',
4553
'directory',
4554
4356
]
4555
4357
encoding_type = 'exact'
4556
4358
4557
4359
@display_command
4558
4360
def run(self, filename, all=False, long=False, revision=None,
4559
show_ids=False, directory=None):
4361
show_ids=False):
4560
4362
from bzrlib.annotate import annotate_file, annotate_file_tree
4561
4363
wt, branch, relpath = \
4562
_open_directory_or_containing_tree_or_branch(filename, directory)
4563
if wt is not None:
4564
self.add_cleanup(wt.lock_read().unlock)
4565
else:
4566
self.add_cleanup(branch.lock_read().unlock)
4567
tree = _get_one_revision_tree('annotate', revision, branch=branch)
4568
self.add_cleanup(tree.lock_read().unlock)
4569
if wt is not None:
4570
file_id = wt.path2id(relpath)
4571
else:
4572
file_id = tree.path2id(relpath)
4573
if file_id is None:
4574
raise errors.NotVersionedError(filename)
4575
file_version = tree.inventory[file_id].revision
4576
if wt is not None and revision is None:
4577
# If there is a tree and we're not annotating historical
4578
# versions, annotate the working tree's content.
4579
annotate_file_tree(wt, file_id, self.outf, long, all,
4580
show_ids=show_ids)
4581
else:
4582
annotate_file(branch, file_version, file_id, long, all, self.outf,
4583
show_ids=show_ids)
4364
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
4365
if wt is not None:
4366
wt.lock_read()
4367
else:
4368
branch.lock_read()
4369
try:
4370
tree = _get_one_revision_tree('annotate', revision, branch=branch)
4371
if wt is not None:
4372
file_id = wt.path2id(relpath)
4373
else:
4374
file_id = tree.path2id(relpath)
4375
if file_id is None:
4376
raise errors.NotVersionedError(filename)
4377
file_version = tree.inventory[file_id].revision
4378
if wt is not None and revision is None:
4379
# If there is a tree and we're not annotating historical
4380
# versions, annotate the working tree's content.
4381
annotate_file_tree(wt, file_id, self.outf, long, all,
4382
show_ids=show_ids)
4383
else:
4384
annotate_file(branch, file_version, file_id, long, all, self.outf,
4385
show_ids=show_ids)
4386
finally:
4387
if wt is not None:
4388
wt.unlock()
4389
else:
4390
branch.unlock()
4584
4391
4585
4392
4586
4393
class cmd_re_sign(Command):
4587
__doc__ = """Create a digital signature for an existing revision."""
4394
"""Create a digital signature for an existing revision."""
4588
4395
# TODO be able to replace existing ones.
4589
4396
4590
4397
hidden = True # is this right ?
4591
4398
takes_args = ['revision_id*']
4592
takes_options = ['directory', 'revision']
4399
takes_options = ['revision']
4593
4400
4594
def run(self, revision_id_list=None, revision=None, directory=u'.'):
4401
def run(self, revision_id_list=None, revision=None):
4595
4402
if revision_id_list is not None and revision is not None:
4596
4403
raise errors.BzrCommandError('You can only supply one of revision_id or --revision')
4597
4404
if revision_id_list is None and revision is None:
4598
4405
raise errors.BzrCommandError('You must supply either --revision or a revision_id')
4599
b = WorkingTree.open_containing(directory)[0].branch
4600
self.add_cleanup(b.lock_write().unlock)
4601
return self._run(b, revision_id_list, revision)
4406
b = WorkingTree.open_containing(u'.')[0].branch
4407
b.lock_write()
4408
try:
4409
return self._run(b, revision_id_list, revision)
4410
finally:
4411
b.unlock()
4602
4412
4603
4413
def _run(self, b, revision_id_list, revision):
4604
4414
import bzrlib.gpg as gpg
4649
4459
4650
4460
4651
4461
class cmd_bind(Command):
4652
__doc__ = """Convert the current branch into a checkout of the supplied branch.
4653
If no branch is supplied, rebind to the last bound location.
4462
"""Convert the current branch into a checkout of the supplied branch.
4654
4463
4655
4464
Once converted into a checkout, commits must succeed on the master branch
4656
4465
before they will be applied to the local branch.
4657
4466
4658
4467
Bound branches use the nickname of its master branch unless it is set
4659
locally, in which case binding will update the local nickname to be
4468
locally, in which case binding will update the the local nickname to be
4660
4469
that of the master.
4661
4470
"""
4662
4471
4663
4472
_see_also = ['checkouts', 'unbind']
4664
4473
takes_args = ['location?']
4665
takes_options = ['directory']
4474
takes_options = []
4666
4475
4667
def run(self, location=None, directory=u'.'):
4668
b, relpath = Branch.open_containing(directory)
4476
def run(self, location=None):
4477
b, relpath = Branch.open_containing(u'.')
4669
4478
if location is None:
4670
4479
try:
4671
4480
location = b.get_old_bound_location()
4674
4483
'This format does not remember old locations.')
4675
4484
else:
4676
4485
if location is None:
4677
if b.get_bound_location() is not None:
4678
raise errors.BzrCommandError('Branch is already bound')
4679
else:
4680
raise errors.BzrCommandError('No location supplied '
4681
'and no previous location known')
4486
raise errors.BzrCommandError('No location supplied and no '
4487
'previous location known')
4682
4488
b_other = Branch.open(location)
4683
4489
try:
4684
4490
b.bind(b_other)
4690
4496
4691
4497
4692
4498
class cmd_unbind(Command):
4693
__doc__ = """Convert the current checkout into a regular branch.
4499
"""Convert the current checkout into a regular branch.
4694
4500
4695
4501
After unbinding, the local branch is considered independent and subsequent
4696
4502
commits will be local only.
4698
4504
4699
4505
_see_also = ['checkouts', 'bind']
4700
4506
takes_args = []
4701
takes_options = ['directory']
4507
takes_options = []
4702
4508
4703
def run(self, directory=u'.'):
4704
b, relpath = Branch.open_containing(directory)
4509
def run(self):
4510
b, relpath = Branch.open_containing(u'.')
4705
4511
if not b.unbind():
4706
4512
raise errors.BzrCommandError('Local branch is not bound')
4707
4513
4708
4514
4709
4515
class cmd_uncommit(Command):
4710
__doc__ = """Remove the last committed revision.
4516
"""Remove the last committed revision.
4711
4517
4712
4518
--verbose will print out what is being removed.
4713
4519
--dry-run will go through all the motions, but not actually
4753
4559
b = control.open_branch()
4754
4560
4755
4561
if tree is not None:
4756
self.add_cleanup(tree.lock_write().unlock)
4562
tree.lock_write()
4757
4563
else:
4758
self.add_cleanup(b.lock_write().unlock)
4759
return self._run(b, tree, dry_run, verbose, revision, force, local=local)
4564
b.lock_write()
4565
try:
4566
return self._run(b, tree, dry_run, verbose, revision, force,
4567
local=local)
4568
finally:
4569
if tree is not None:
4570
tree.unlock()
4571
else:
4572
b.unlock()
4760
4573
4761
4574
def _run(self, b, tree, dry_run, verbose, revision, force, local=False):
4762
4575
from bzrlib.log import log_formatter, show_log
4794
4607
end_revision=last_revno)
4795
4608
4796
4609
if dry_run:
4797
self.outf.write('Dry-run, pretending to remove'
4798
' the above revisions.\n')
4610
print 'Dry-run, pretending to remove the above revisions.'
4611
if not force:
4612
val = raw_input('Press <enter> to continue')
4799
4613
else:
4800
self.outf.write('The above revision(s) will be removed.\n')
4801
4802
if not force:
4803
if not ui.ui_factory.get_boolean('Are you sure'):
4804
self.outf.write('Canceled')
4805
return 0
4614
print 'The above revision(s) will be removed.'
4615
if not force:
4616
val = raw_input('Are you sure [y/N]? ')
4617
if val.lower() not in ('y', 'yes'):
4618
print 'Canceled'
4619
return 0
4806
4620
4807
4621
mutter('Uncommitting from {%s} to {%s}',
4808
4622
last_rev_id, rev_id)
4809
4623
uncommit(b, tree=tree, dry_run=dry_run, verbose=verbose,
4810
4624
revno=revno, local=local)
4811
self.outf.write('You can restore the old tip by running:\n'
4812
' bzr pull . -r revid:%s\n' % last_rev_id)
4625
note('You can restore the old tip by running:\n'
4626
' bzr pull . -r revid:%s', last_rev_id)
4813
4627
4814
4628
4815
4629
class cmd_break_lock(Command):
4816
__doc__ = """Break a dead lock on a repository, branch or working directory.
4630
"""Break a dead lock on a repository, branch or working directory.
4817
4631
4818
4632
CAUTION: Locks should only be broken when you are sure that the process
4819
4633
holding the lock has been stopped.
4820
4634
4821
You can get information on what locks are open via the 'bzr info
4822
[location]' command.
4635
You can get information on what locks are open via the 'bzr info' command.
4823
4636
4824
4637
:Examples:
4825
4638
bzr break-lock
4826
bzr break-lock bzr+ssh://example.com/bzr/foo
4827
4639
"""
4828
4640
takes_args = ['location?']
4829
4641
4838
4650
4839
4651
4840
4652
class cmd_wait_until_signalled(Command):
4841
__doc__ = """Test helper for test_start_and_stop_bzr_subprocess_send_signal.
4653
"""Test helper for test_start_and_stop_bzr_subprocess_send_signal.
4842
4654
4843
4655
This just prints a line to signal when it is ready, then blocks on stdin.
4844
4656
"""
4852
4664
4853
4665
4854
4666
class cmd_serve(Command):
4855
__doc__ = """Run the bzr server."""
4667
"""Run the bzr server."""
4856
4668
4857
4669
aliases = ['server']
4858
4670
4859
4671
takes_options = [
4860
4672
Option('inet',
4861
4673
help='Serve on stdin/out for use from inetd or sshd.'),
4862
RegistryOption('protocol',
4863
help="Protocol to serve.",
4674
RegistryOption('protocol',
4675
help="Protocol to serve.",
4864
4676
lazy_registry=('bzrlib.transport', 'transport_server_registry'),
4865
4677
value_switches=True),
4866
4678
Option('port',
4869
4681
'result in a dynamically allocated port. The default port '
4870
4682
'depends on the protocol.',
4871
4683
type=str),
4872
custom_help('directory',
4873
help='Serve contents of this directory.'),
4684
Option('directory',
4685
help='Serve contents of this directory.',
4686
type=unicode),
4874
4687
Option('allow-writes',
4875
4688
help='By default the server is a readonly server. Supplying '
4876
4689
'--allow-writes enables write access to the contents of '
4877
'the served directory and below. Note that ``bzr serve`` '
4878
'does not perform authentication, so unless some form of '
4879
'external authentication is arranged supplying this '
4880
'option leads to global uncontrolled write access to your '
4881
'file system.'
4690
'the served directory and below.'
4882
4691
),
4883
4692
]
4884
4693
4917
4726
4918
4727
4919
4728
class cmd_join(Command):
4920
__doc__ = """Combine a tree into its containing tree.
4729
"""Combine a tree into its containing tree.
4921
4730
4922
4731
This command requires the target tree to be in a rich-root format.
4923
4732
4963
4772
4964
4773
4965
4774
class cmd_split(Command):
4966
__doc__ = """Split a subdirectory of a tree into a separate tree.
4775
"""Split a subdirectory of a tree into a separate tree.
4967
4776
4968
4777
This command will produce a target tree in a format that supports
4969
4778
rich roots, like 'rich-root' or 'rich-root-pack'. These formats cannot be
4989
4798
4990
4799
4991
4800
class cmd_merge_directive(Command):
4992
__doc__ = """Generate a merge directive for auto-merge tools.
4801
"""Generate a merge directive for auto-merge tools.
4993
4802
4994
4803
A directive requests a merge to be performed, and also provides all the
4995
4804
information necessary to do so. This means it must either include a
5088
4897
5089
4898
5090
4899
class cmd_send(Command):
5091
__doc__ = """Mail or create a merge-directive for submitting changes.
4900
"""Mail or create a merge-directive for submitting changes.
5092
4901
5093
4902
A merge directive provides many things needed for requesting merges:
5094
4903
5100
4909
directly from the merge directive, without retrieving data from a
5101
4910
branch.
5102
4911
5103
`bzr send` creates a compact data set that, when applied using bzr
5104
merge, has the same effect as merging from the source branch.
5105
5106
By default the merge directive is self-contained and can be applied to any
5107
branch containing submit_branch in its ancestory without needing access to
5108
the source branch.
5109
5110
If --no-bundle is specified, then Bazaar doesn't send the contents of the
5111
revisions, but only a structured request to merge from the
5112
public_location. In that case the public_branch is needed and it must be
5113
up-to-date and accessible to the recipient. The public_branch is always
5114
included if known, so that people can check it later.
5115
5116
The submit branch defaults to the parent of the source branch, but can be
5117
overridden. Both submit branch and public branch will be remembered in
5118
branch.conf the first time they are used for a particular branch. The
5119
source branch defaults to that containing the working directory, but can
5120
be changed using --from.
5121
5122
In order to calculate those changes, bzr must analyse the submit branch.
5123
Therefore it is most efficient for the submit branch to be a local mirror.
5124
If a public location is known for the submit_branch, that location is used
5125
in the merge directive.
5126
5127
The default behaviour is to send the merge directive by mail, unless -o is
5128
given, in which case it is sent to a file.
4912
If --no-bundle is specified, then public_branch is needed (and must be
4913
up-to-date), so that the receiver can perform the merge using the
4914
public_branch. The public_branch is always included if known, so that
4915
people can check it later.
4916
4917
The submit branch defaults to the parent, but can be overridden. Both
4918
submit branch and public branch will be remembered if supplied.
4919
4920
If a public_branch is known for the submit_branch, that public submit
4921
branch is used in the merge instructions. This means that a local mirror
4922
can be used as your actual submit branch, once you have set public_branch
4923
for that mirror.
5129
4924
5130
4925
Mail is sent using your preferred mail program. This should be transparent
5131
on Windows (it uses MAPI). On Unix, it requires the xdg-email utility.
4926
on Windows (it uses MAPI). On Linux, it requires the xdg-email utility.
5132
4927
If the preferred client can't be found (or used), your editor will be used.
5133
4928
5134
4929
To use a specific mail program, set the mail_client configuration option.
5135
4930
(For Thunderbird 1.5, this works around some bugs.) Supported values for
5136
specific clients are "claws", "evolution", "kmail", "mail.app" (MacOS X's
5137
Mail.app), "mutt", and "thunderbird"; generic options are "default",
5138
"editor", "emacsclient", "mapi", and "xdg-email". Plugins may also add
5139
supported clients.
4931
specific clients are "claws", "evolution", "kmail", "mutt", and
4932
"thunderbird"; generic options are "default", "editor", "emacsclient",
4933
"mapi", and "xdg-email". Plugins may also add supported clients.
5140
4934
5141
4935
If mail is being sent, a to address is required. This can be supplied
5142
4936
either on the commandline, by setting the submit_to configuration
5151
4945
5152
4946
The merge directives created by bzr send may be applied using bzr merge or
5153
4947
bzr pull by specifying a file containing a merge directive as the location.
5154
5155
bzr send makes extensive use of public locations to map local locations into
5156
URLs that can be used by other people. See `bzr help configuration` to
5157
set them, and use `bzr info` to display them.
5158
4948
"""
5159
4949
5160
4950
encoding_type = 'exact'
5176
4966
short_name='f',
5177
4967
type=unicode),
5178
4968
Option('output', short_name='o',
5179
help='Write merge directive to this file or directory; '
4969
help='Write merge directive to this file; '
5180
4970
'use - for stdout.',
5181
4971
type=unicode),
5182
4972
Option('strict',
5205
4995
5206
4996
5207
4997
class cmd_bundle_revisions(cmd_send):
5208
__doc__ = """Create a merge-directive for submitting changes.
4998
"""Create a merge-directive for submitting changes.
5209
4999
5210
5000
A merge directive provides many things needed for requesting merges:
5211
5001
5278
5068
5279
5069
5280
5070
class cmd_tag(Command):
5281
__doc__ = """Create, remove or modify a tag naming a revision.
5071
"""Create, remove or modify a tag naming a revision.
5282
5072
5283
5073
Tags give human-meaningful names to revisions. Commands that take a -r
5284
5074
(--revision) option can be given -rtag:X, where X is any previously
5292
5082
5293
5083
To rename a tag (change the name but keep it on the same revsion), run ``bzr
5294
5084
tag new-name -r tag:old-name`` and then ``bzr tag --delete oldname``.
5295
5296
If no tag name is specified it will be determined through the
5297
'automatic_tag_name' hook. This can e.g. be used to automatically tag
5298
upstream releases by reading configure.ac. See ``bzr help hooks`` for
5299
details.
5300
5085
"""
5301
5086
5302
5087
_see_also = ['commit', 'tags']
5303
takes_args = ['tag_name?']
5088
takes_args = ['tag_name']
5304
5089
takes_options = [
5305
5090
Option('delete',
5306
5091
help='Delete this tag rather than placing it.',
5307
5092
),
5308
custom_help('directory',
5309
help='Branch in which to place the tag.'),
5093
Option('directory',
5094
help='Branch in which to place the tag.',
5095
short_name='d',
5096
type=unicode,
5097
),
5310
5098
Option('force',
5311
5099
help='Replace existing tags.',
5312
5100
),
5313
5101
'revision',
5314
5102
]
5315
5103
5316
def run(self, tag_name=None,
5104
def run(self, tag_name,
5317
5105
delete=None,
5318
5106
directory='.',
5319
5107
force=None,
5320
5108
revision=None,
5321
5109
):
5322
5110
branch, relpath = Branch.open_containing(directory)
5323
self.add_cleanup(branch.lock_write().unlock)
5324
if delete:
5325
if tag_name is None:
5326
raise errors.BzrCommandError("No tag specified to delete.")
5327
branch.tags.delete_tag(tag_name)
5328
self.outf.write('Deleted tag %s.\n' % tag_name)
5329
else:
5330
if revision:
5331
if len(revision) != 1:
5332
raise errors.BzrCommandError(
5333
"Tags can only be placed on a single revision, "
5334
"not on a range")
5335
revision_id = revision[0].as_revision_id(branch)
5111
branch.lock_write()
5112
try:
5113
if delete:
5114
branch.tags.delete_tag(tag_name)
5115
self.outf.write('Deleted tag %s.\n' % tag_name)
5336
5116
else:
5337
revision_id = branch.last_revision()
5338
if tag_name is None:
5339
tag_name = branch.automatic_tag_name(revision_id)
5340
if tag_name is None:
5341
raise errors.BzrCommandError(
5342
"Please specify a tag name.")
5343
if (not force) and branch.tags.has_tag(tag_name):
5344
raise errors.TagAlreadyExists(tag_name)
5345
branch.tags.set_tag(tag_name, revision_id)
5346
self.outf.write('Created tag %s.\n' % tag_name)
5117
if revision:
5118
if len(revision) != 1:
5119
raise errors.BzrCommandError(
5120
"Tags can only be placed on a single revision, "
5121
"not on a range")
5122
revision_id = revision[0].as_revision_id(branch)
5123
else:
5124
revision_id = branch.last_revision()
5125
if (not force) and branch.tags.has_tag(tag_name):
5126
raise errors.TagAlreadyExists(tag_name)
5127
branch.tags.set_tag(tag_name, revision_id)
5128
self.outf.write('Created tag %s.\n' % tag_name)
5129
finally:
5130
branch.unlock()
5347
5131
5348
5132
5349
5133
class cmd_tags(Command):
5350
__doc__ = """List tags.
5134
"""List tags.
5351
5135
5352
5136
This command shows a table of tag names and the revisions they reference.
5353
5137
"""
5354
5138
5355
5139
_see_also = ['tag']
5356
5140
takes_options = [
5357
custom_help('directory',
5358
help='Branch whose tags should be displayed.'),
5141
Option('directory',
5142
help='Branch whose tags should be displayed.',
5143
short_name='d',
5144
type=unicode,
5145
),
5359
5146
RegistryOption.from_kwargs('sort',
5360
5147
'Sort tags by different criteria.', title='Sorting',
5361
5148
alpha='Sort tags lexicographically (default).',
5378
5165
if not tags:
5379
5166
return
5380
5167
5381
self.add_cleanup(branch.lock_read().unlock)
5382
if revision:
5383
graph = branch.repository.get_graph()
5384
rev1, rev2 = _get_revision_range(revision, branch, self.name())
5385
revid1, revid2 = rev1.rev_id, rev2.rev_id
5386
# only show revisions between revid1 and revid2 (inclusive)
5387
tags = [(tag, revid) for tag, revid in tags if
5388
graph.is_between(revid, revid1, revid2)]
5389
if sort == 'alpha':
5390
tags.sort()
5391
elif sort == 'time':
5392
timestamps = {}
5393
for tag, revid in tags:
5394
try:
5395
revobj = branch.repository.get_revision(revid)
5396
except errors.NoSuchRevision:
5397
timestamp = sys.maxint # place them at the end
5398
else:
5399
timestamp = revobj.timestamp
5400
timestamps[revid] = timestamp
5401
tags.sort(key=lambda x: timestamps[x[1]])
5402
if not show_ids:
5403
# [ (tag, revid), ... ] -> [ (tag, dotted_revno), ... ]
5404
for index, (tag, revid) in enumerate(tags):
5405
try:
5406
revno = branch.revision_id_to_dotted_revno(revid)
5407
if isinstance(revno, tuple):
5408
revno = '.'.join(map(str, revno))
5409
except errors.NoSuchRevision:
5410
# Bad tag data/merges can lead to tagged revisions
5411
# which are not in this branch. Fail gracefully ...
5412
revno = '?'
5413
tags[index] = (tag, revno)
5414
self.cleanup_now()
5168
branch.lock_read()
5169
try:
5170
if revision:
5171
graph = branch.repository.get_graph()
5172
rev1, rev2 = _get_revision_range(revision, branch, self.name())
5173
revid1, revid2 = rev1.rev_id, rev2.rev_id
5174
# only show revisions between revid1 and revid2 (inclusive)
5175
tags = [(tag, revid) for tag, revid in tags if
5176
graph.is_between(revid, revid1, revid2)]
5177
if sort == 'alpha':
5178
tags.sort()
5179
elif sort == 'time':
5180
timestamps = {}
5181
for tag, revid in tags:
5182
try:
5183
revobj = branch.repository.get_revision(revid)
5184
except errors.NoSuchRevision:
5185
timestamp = sys.maxint # place them at the end
5186
else:
5187
timestamp = revobj.timestamp
5188
timestamps[revid] = timestamp
5189
tags.sort(key=lambda x: timestamps[x[1]])
5190
if not show_ids:
5191
# [ (tag, revid), ... ] -> [ (tag, dotted_revno), ... ]
5192
for index, (tag, revid) in enumerate(tags):
5193
try:
5194
revno = branch.revision_id_to_dotted_revno(revid)
5195
if isinstance(revno, tuple):
5196
revno = '.'.join(map(str, revno))
5197
except errors.NoSuchRevision:
5198
# Bad tag data/merges can lead to tagged revisions
5199
# which are not in this branch. Fail gracefully ...
5200
revno = '?'
5201
tags[index] = (tag, revno)
5202
finally:
5203
branch.unlock()
5415
5204
for tag, revspec in tags:
5416
5205
self.outf.write('%-20s %s\n' % (tag, revspec))
5417
5206
5418
5207
5419
5208
class cmd_reconfigure(Command):
5420
__doc__ = """Reconfigure the type of a bzr directory.
5209
"""Reconfigure the type of a bzr directory.
5421
5210
5422
5211
A target configuration must be specified.
5423
5212
5453
5242
),
5454
5243
Option('bind-to', help='Branch to bind checkout to.', type=str),
5455
5244
Option('force',
5456
help='Perform reconfiguration even if local changes'
5457
' will be lost.'),
5458
Option('stacked-on',
5459
help='Reconfigure a branch to be stacked on another branch.',
5460
type=unicode,
5461
),
5462
Option('unstacked',
5463
help='Reconfigure a branch to be unstacked. This '
5464
'may require copying substantial data into it.',
5465
),
5245
help='Perform reconfiguration even if local changes'
5246
' will be lost.')
5466
5247
]
5467
5248
5468
def run(self, location=None, target_type=None, bind_to=None, force=False,
5469
stacked_on=None,
5470
unstacked=None):
5249
def run(self, location=None, target_type=None, bind_to=None, force=False):
5471
5250
directory = bzrdir.BzrDir.open(location)
5472
if stacked_on and unstacked:
5473
raise BzrCommandError("Can't use both --stacked-on and --unstacked")
5474
elif stacked_on is not None:
5475
reconfigure.ReconfigureStackedOn().apply(directory, stacked_on)
5476
elif unstacked:
5477
reconfigure.ReconfigureUnstacked().apply(directory)
5478
# At the moment you can use --stacked-on and a different
5479
# reconfiguration shape at the same time; there seems no good reason
5480
# to ban it.
5481
5251
if target_type is None:
5482
if stacked_on or unstacked:
5483
return
5484
else:
5485
raise errors.BzrCommandError('No target configuration '
5486
'specified')
5252
raise errors.BzrCommandError('No target configuration specified')
5487
5253
elif target_type == 'branch':
5488
5254
reconfiguration = reconfigure.Reconfigure.to_branch(directory)
5489
5255
elif target_type == 'tree':
5508
5274
5509
5275
5510
5276
class cmd_switch(Command):
5511
__doc__ = """Set the branch of a checkout and update.
5277
"""Set the branch of a checkout and update.
5512
5278
5513
5279
For lightweight checkouts, this changes the branch being referenced.
5514
5280
For heavyweight checkouts, this checks that there are no local commits
5526
5292
/path/to/newbranch.
5527
5293
5528
5294
Bound branches use the nickname of its master branch unless it is set
5529
locally, in which case switching will update the local nickname to be
5295
locally, in which case switching will update the the local nickname to be
5530
5296
that of the master.
5531
5297
"""
5532
5298
5533
takes_args = ['to_location?']
5299
takes_args = ['to_location']
5534
5300
takes_options = [Option('force',
5535
help='Switch even if local commits will be lost.'),
5536
'revision',
5537
Option('create-branch', short_name='b',
5538
help='Create the target branch from this one before'
5539
' switching to it.'),
5540
]
5301
help='Switch even if local commits will be lost.')
5302
]
5541
5303
5542
def run(self, to_location=None, force=False, create_branch=False,
5543
revision=None):
5304
def run(self, to_location, force=False):
5544
5305
from bzrlib import switch
5545
5306
tree_location = '.'
5546
revision = _get_one_revision('switch', revision)
5547
5307
control_dir = bzrdir.BzrDir.open_containing(tree_location)[0]
5548
if to_location is None:
5549
if revision is None:
5550
raise errors.BzrCommandError('You must supply either a'
5551
' revision or a location')
5552
to_location = '.'
5553
5308
try:
5554
5309
branch = control_dir.open_branch()
5555
5310
had_explicit_nick = branch.get_config().has_explicit_nickname()
5556
5311
except errors.NotBranchError:
5557
branch = None
5558
5312
had_explicit_nick = False
5559
if create_branch:
5560
if branch is None:
5561
raise errors.BzrCommandError('cannot create branch without'
5562
' source branch')
5563
to_location = directory_service.directories.dereference(
5564
to_location)
5565
if '/' not in to_location and '\\' not in to_location:
5566
# This path is meant to be relative to the existing branch
5567
this_url = self._get_branch_location(control_dir)
5568
to_location = urlutils.join(this_url, '..', to_location)
5569
to_branch = branch.bzrdir.sprout(to_location,
5570
possible_transports=[branch.bzrdir.root_transport],
5571
source_branch=branch).open_branch()
5572
else:
5573
try:
5574
to_branch = Branch.open(to_location)
5575
except errors.NotBranchError:
5576
this_url = self._get_branch_location(control_dir)
5577
to_branch = Branch.open(
5578
urlutils.join(this_url, '..', to_location))
5579
if revision is not None:
5580
revision = revision.as_revision_id(to_branch)
5581
switch.switch(control_dir, to_branch, force, revision_id=revision)
5313
try:
5314
to_branch = Branch.open(to_location)
5315
except errors.NotBranchError:
5316
this_url = self._get_branch_location(control_dir)
5317
to_branch = Branch.open(
5318
urlutils.join(this_url, '..', to_location))
5319
switch.switch(control_dir, to_branch, force)
5582
5320
if had_explicit_nick:
5583
5321
branch = control_dir.open_branch() #get the new branch!
5584
5322
branch.nick = to_branch.nick
5604
5342
5605
5343
5606
5344
class cmd_view(Command):
5607
__doc__ = """Manage filtered views.
5345
"""Manage filtered views.
5608
5346
5609
5347
Views provide a mask over the tree so that users can focus on
5610
5348
a subset of a tree when doing their work. After creating a view,
5758
5496
5759
5497
5760
5498
class cmd_hooks(Command):
5761
__doc__ = """Show hooks."""
5499
"""Show hooks."""
5762
5500
5763
5501
hidden = True
5764
5502
5777
5515
self.outf.write(" <no hooks installed>\n")
5778
5516
5779
5517
5780
class cmd_remove_branch(Command):
5781
__doc__ = """Remove a branch.
5782
5783
This will remove the branch from the specified location but
5784
will keep any working tree or repository in place.
5785
5786
:Examples:
5787
5788
Remove the branch at repo/trunk::
5789
5790
bzr remove-branch repo/trunk
5791
5792
"""
5793
5794
takes_args = ["location?"]
5795
5796
aliases = ["rmbranch"]
5797
5798
def run(self, location=None):
5799
if location is None:
5800
location = "."
5801
branch = Branch.open_containing(location)[0]
5802
branch.bzrdir.destroy_branch()
5803
5804
5805
5518
class cmd_shelve(Command):
5806
__doc__ = """Temporarily set aside some changes from the current tree.
5519
"""Temporarily set aside some changes from the current tree.
5807
5520
5808
5521
Shelve allows you to temporarily put changes you've made "on the shelf",
5809
5522
ie. out of the way, until a later time when you can bring them back from
5851
5564
if writer is None:
5852
5565
writer = bzrlib.option.diff_writer_registry.get()
5853
5566
try:
5854
shelver = Shelver.from_args(writer(sys.stdout), revision, all,
5855
file_list, message, destroy=destroy)
5856
try:
5857
shelver.run()
5858
finally:
5859
shelver.finalize()
5567
Shelver.from_args(writer(sys.stdout), revision, all, file_list,
5568
message, destroy=destroy).run()
5860
5569
except errors.UserAbort:
5861
5570
return 0
5862
5571
5863
5572
def run_for_list(self):
5864
5573
tree = WorkingTree.open_containing('.')[0]
5865
self.add_cleanup(tree.lock_read().unlock)
5866
manager = tree.get_shelf_manager()
5867
shelves = manager.active_shelves()
5868
if len(shelves) == 0:
5869
note('No shelved changes.')
5870
return 0
5871
for shelf_id in reversed(shelves):
5872
message = manager.get_metadata(shelf_id).get('message')
5873
if message is None:
5874
message = '<no message>'
5875
self.outf.write('%3d: %s\n' % (shelf_id, message))
5876
return 1
5574
tree.lock_read()
5575
try:
5576
manager = tree.get_shelf_manager()
5577
shelves = manager.active_shelves()
5578
if len(shelves) == 0:
5579
note('No shelved changes.')
5580
return 0
5581
for shelf_id in reversed(shelves):
5582
message = manager.get_metadata(shelf_id).get('message')
5583
if message is None:
5584
message = '<no message>'
5585
self.outf.write('%3d: %s\n' % (shelf_id, message))
5586
return 1
5587
finally:
5588
tree.unlock()
5877
5589
5878
5590
5879
5591
class cmd_unshelve(Command):
5880
__doc__ = """Restore shelved changes.
5592
"""Restore shelved changes.
5881
5593
5882
5594
By default, the most recently shelved changes are restored. However if you
5883
5595
specify a shelf by id those changes will be restored instead. This works
5891
5603
enum_switch=False, value_switches=True,
5892
5604
apply="Apply changes and remove from the shelf.",
5893
5605
dry_run="Show changes, but do not apply or remove them.",
5894
preview="Instead of unshelving the changes, show the diff that "
5895
"would result from unshelving.",
5896
delete_only="Delete changes without applying them.",
5897
keep="Apply changes but don't delete them.",
5606
delete_only="Delete changes without applying them."
5898
5607
)
5899
5608
]
5900
5609
_see_also = ['shelve']
5901
5610
5902
5611
def run(self, shelf_id=None, action='apply'):
5903
5612
from bzrlib.shelf_ui import Unshelver
5904
unshelver = Unshelver.from_args(shelf_id, action)
5905
try:
5906
unshelver.run()
5907
finally:
5908
unshelver.tree.unlock()
5613
Unshelver.from_args(shelf_id, action).run()
5909
5614
5910
5615
5911
5616
class cmd_clean_tree(Command):
5912
__doc__ = """Remove unwanted files from working tree.
5617
"""Remove unwanted files from working tree.
5913
5618
5914
5619
By default, only unknown files, not ignored files, are deleted. Versioned
5915
5620
files are never deleted.
5923
5628
5924
5629
To check what clean-tree will do, use --dry-run.
5925
5630
"""
5926
takes_options = ['directory',
5927
Option('ignored', help='Delete all ignored files.'),
5631
takes_options = [Option('ignored', help='Delete all ignored files.'),
5928
5632
Option('detritus', help='Delete conflict files, merge'
5929
5633
' backups, and failed selftest dirs.'),
5930
5634
Option('unknown',
5933
5637
' deleting them.'),
5934
5638
Option('force', help='Do not prompt before deleting.')]
5935
5639
def run(self, unknown=False, ignored=False, detritus=False, dry_run=False,
5936
force=False, directory=u'.'):
5640
force=False):
5937
5641
from bzrlib.clean_tree import clean_tree
5938
5642
if not (unknown or ignored or detritus):
5939
5643
unknown = True
5940
5644
if dry_run:
5941
5645
force = True
5942
clean_tree(directory, unknown=unknown, ignored=ignored,
5943
detritus=detritus, dry_run=dry_run, no_prompt=force)
5646
clean_tree('.', unknown=unknown, ignored=ignored, detritus=detritus,
5647
dry_run=dry_run, no_prompt=force)
5944
5648
5945
5649
5946
5650
class cmd_reference(Command):
5947
__doc__ = """list, view and set branch locations for nested trees.
5651
"""list, view and set branch locations for nested trees.
5948
5652
5949
5653
If no arguments are provided, lists the branch locations for nested trees.
5950
5654
If one argument is provided, display the branch location for that tree.
5990
5694
self.outf.write('%s %s\n' % (path, location))
5991
5695
5992
5696
5993
def _register_lazy_builtins():
5994
# register lazy builtins from other modules; called at startup and should
5995
# be only called once.
5996
for (name, aliases, module_name) in [
5997
('cmd_bundle_info', [], 'bzrlib.bundle.commands'),
5998
('cmd_dpush', [], 'bzrlib.foreign'),
5999
('cmd_version_info', [], 'bzrlib.cmd_version_info'),
6000
('cmd_resolve', ['resolved'], 'bzrlib.conflicts'),
6001
('cmd_conflicts', [], 'bzrlib.conflicts'),
6002
('cmd_sign_my_commits', [], 'bzrlib.sign_my_commits'),
6003
]:
6004
builtin_command_registry.register_lazy(name, aliases, module_name)
5697
# these get imported and then picked up by the scan for cmd_*
5698
# TODO: Some more consistent way to split command definitions across files;
5699
# we do need to load at least some information about them to know of
5700
# aliases. ideally we would avoid loading the implementation until the
5701
# details were needed.
5702
from bzrlib.cmd_version_info import cmd_version_info
5703
from bzrlib.conflicts import cmd_resolve, cmd_conflicts, restore
5704
from bzrlib.bundle.commands import (
5705
cmd_bundle_info,
5706
)
5707
from bzrlib.foreign import cmd_dpush
5708
from bzrlib.sign_my_commits import cmd_sign_my_commits
5709
from bzrlib.weave_commands import cmd_versionedfile_list, \
5710
cmd_weave_plan_merge, cmd_weave_merge_text
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0