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 4632.1.1
- compare with another revision
- download diff
- download tarball
- view history from revision 4632.1.1
- Committer: Vincent Ladeuil
- Date: 2009-08-20 09:30:34 UTC
- mto: This revision was merged to the branch mainline in revision 4633.
- Revision ID: v.ladeuil+lp@free.fr-20090820093034-64jq23ddxe44tqfb
(vila)(trivial) Fix bzrtools tag used for windows installers
- files added:
- bzrlib/textui.py
- doc/_static/en/quick-reference
- doc/en/developer-guide
- doc/en/migration
- doc/es/developer-guide
- doc/es/release-notes
- doc/es/user-reference
- files removed:
- .testr.conf
- apport
- bzrlib/help_topics/es
- bzrlib/plugins/news_merge
- bzrlib/plugins/news_merge/tests
- bzrlib/tests/per_bzrdir_colo
- bzrlib/tests/per_foreign_vcs
- bzrlib/tests/per_uifactory
- contrib/debian
- doc/developers/_static
- doc/developers/_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
- 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
- doc/en/Makefile => doc/Makefile
- doc/en/_static/ => doc/_static/
- doc/en/_static/en/Makefile => doc/_static/en/quick-reference/Makefile
- doc/en/_static/en/bzr-en-quick-reference.pdf => doc/_static/en/quick-reference/bzr-quick-reference.pdf
- doc/en/_static/en/bzr-en-quick-reference.png => doc/_static/en/quick-reference/bzr-quick-reference.png
- doc/en/_static/en/bzr-en-quick-reference.svg => doc/_static/en/quick-reference/bzr-quick-reference.svg
- doc/en/_templates/ => doc/_templates/
- doc/en/conf.py => doc/conf.py
- doc/en/index.txt => doc/contents.txt
- doc/developers/HACKING.txt => doc/en/developer-guide/HACKING.txt
- doc/en/user-guide/index.txt => doc/en/user-guide/index-for-2x.txt
- 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/en/make.bat => doc/make.bat
- 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
682
642
should_print=(not is_quiet()))
683
643
684
644
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()
645
base_tree.lock_read()
646
try:
647
file_list = self._maybe_expand_globs(file_list)
648
tree, file_list = tree_files_for_add(file_list)
649
added, ignored = tree.smart_add(file_list, not
650
no_recurse, action=action, save=not dry_run)
651
finally:
652
if base_tree is not None:
653
base_tree.unlock()
690
654
if len(ignored) > 0:
691
655
if verbose:
692
656
for glob in sorted(ignored.keys()):
696
660
697
661
698
662
class cmd_mkdir(Command):
699
__doc__ = """Create a new versioned directory.
663
"""Create a new versioned directory.
700
664
701
665
This is equivalent to creating the directory and then adding it.
702
666
"""
706
670
707
671
def run(self, dir_list):
708
672
for d in dir_list:
673
os.mkdir(d)
709
674
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)
675
wt.add([dd])
676
self.outf.write('added %s\n' % d)
718
677
719
678
720
679
class cmd_relpath(Command):
721
__doc__ = """Show path of a file relative to root"""
680
"""Show path of a file relative to root"""
722
681
723
682
takes_args = ['filename']
724
683
hidden = True
733
692
734
693
735
694
class cmd_inventory(Command):
736
__doc__ = """Show inventory of the current working copy or a revision.
695
"""Show inventory of the current working copy or a revision.
737
696
738
697
It is possible to limit the output to a particular entry
739
698
type using the --kind option. For example: --kind file.
760
719
761
720
revision = _get_one_revision('inventory', revision)
762
721
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()
722
work_tree.lock_read()
723
try:
724
if revision is not None:
725
tree = revision.as_tree(work_tree.branch)
726
727
extra_trees = [work_tree]
728
tree.lock_read()
729
else:
730
tree = work_tree
731
extra_trees = []
732
733
if file_list is not None:
734
file_ids = tree.paths2ids(file_list, trees=extra_trees,
735
require_versioned=True)
736
# find_ids_across_trees may include some paths that don't
737
# exist in 'tree'.
738
entries = sorted((tree.id2path(file_id), tree.inventory[file_id])
739
for file_id in file_ids if file_id in tree)
740
else:
741
entries = tree.inventory.entries()
742
finally:
743
tree.unlock()
744
if tree is not work_tree:
745
work_tree.unlock()
746
784
747
for path, entry in entries:
785
748
if kind and kind != entry.kind:
786
749
continue
792
755
793
756
794
757
class cmd_mv(Command):
795
__doc__ = """Move or rename a file.
758
"""Move or rename a file.
796
759
797
760
:Usage:
798
761
bzr mv OLDNAME NEWNAME
831
794
if len(names_list) < 2:
832
795
raise errors.BzrCommandError("missing file argument")
833
796
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)
797
tree.lock_tree_write()
798
try:
799
self._run(tree, names_list, rel_names, after)
800
finally:
801
tree.unlock()
836
802
837
803
def run_auto(self, names_list, after, dry_run):
838
804
if names_list is not None and len(names_list) > 1:
842
808
raise errors.BzrCommandError('--after cannot be specified with'
843
809
' --auto.')
844
810
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)
811
work_tree.lock_tree_write()
812
try:
813
rename_map.RenameMap.guess_renames(work_tree, dry_run)
814
finally:
815
work_tree.unlock()
847
816
848
817
def _run(self, tree, names_list, rel_names, after):
849
818
into_existing = osutils.isdir(names_list[-1])
870
839
# All entries reference existing inventory items, so fix them up
871
840
# for cicp file-systems.
872
841
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))
842
for pair in tree.move(rel_names[:-1], rel_names[-1], after=after):
843
self.outf.write("%s => %s\n" % pair)
876
844
else:
877
845
if len(names_list) != 2:
878
846
raise errors.BzrCommandError('to mv multiple files the'
922
890
dest = osutils.pathjoin(dest_parent, dest_tail)
923
891
mutter("attempting to move %s => %s", src, dest)
924
892
tree.rename_one(src, dest, after=after)
925
if not is_quiet():
926
self.outf.write("%s => %s\n" % (src, dest))
893
self.outf.write("%s => %s\n" % (src, dest))
927
894
928
895
929
896
class cmd_pull(Command):
930
__doc__ = """Turn this branch into a mirror of another branch.
897
"""Turn this branch into a mirror of another branch.
931
898
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.
899
This command only works on branches that have not diverged. Branches are
900
considered diverged if the destination branch's most recent commit is one
901
that has not been merged (directly or indirectly) into the parent.
936
902
937
903
If branches have diverged, you can use 'bzr merge' to integrate the changes
938
904
from one into the other. Once one branch has merged, the other should
939
905
be able to pull it again.
940
906
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.
907
If you want to forget your local changes and just update your branch to
908
match the remote one, use pull --overwrite.
944
909
945
910
If there is no default location set, the first pull will set it. After
946
911
that, you can omit the location to use the default. To change the
956
921
takes_options = ['remember', 'overwrite', 'revision',
957
922
custom_help('verbose',
958
923
help='Show logs of pulled revisions.'),
959
custom_help('directory',
924
Option('directory',
960
925
help='Branch to pull into, '
961
'rather than the one containing the working directory.'),
926
'rather than the one containing the working directory.',
927
short_name='d',
928
type=unicode,
929
),
962
930
Option('local',
963
931
help="Perform a local pull in a bound "
964
932
"branch. Local pulls are not applied to "
979
947
try:
980
948
tree_to = WorkingTree.open_containing(directory)[0]
981
949
branch_to = tree_to.branch
982
self.add_cleanup(tree_to.lock_write().unlock)
983
950
except errors.NoWorkingTree:
984
951
tree_to = None
985
952
branch_to = Branch.open_containing(directory)[0]
986
self.add_cleanup(branch_to.lock_write().unlock)
987
953
988
954
if local and not branch_to.get_bound_location():
989
955
raise errors.LocalRequiresBoundBranch()
990
956
1020
986
else:
1021
987
branch_from = Branch.open(location,
1022
988
possible_transports=possible_transports)
1023
self.add_cleanup(branch_from.lock_read().unlock)
1024
989
1025
990
if branch_to.get_parent() is None or remember:
1026
991
branch_to.set_parent(branch_from.base)
1027
992
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)
993
if branch_from is not branch_to:
994
branch_from.lock_read()
995
try:
996
if revision is not None:
997
revision_id = revision.as_revision_id(branch_from)
998
999
branch_to.lock_write()
1000
try:
1001
if tree_to is not None:
1002
view_info = _get_view_info_for_change_reporter(tree_to)
1003
change_reporter = delta._ChangeReporter(
1004
unversioned_filter=tree_to.is_ignored,
1005
view_info=view_info)
1006
result = tree_to.pull(
1007
branch_from, overwrite, revision_id, change_reporter,
1008
possible_transports=possible_transports, local=local)
1009
else:
1010
result = branch_to.pull(
1011
branch_from, overwrite, revision_id, local=local)
1012
1013
result.report(self.outf)
1014
if verbose and result.old_revid != result.new_revid:
1015
log.show_branch_change(
1016
branch_to, self.outf, result.old_revno,
1017
result.old_revid)
1018
finally:
1019
branch_to.unlock()
1020
finally:
1021
if branch_from is not branch_to:
1022
branch_from.unlock()
1048
1023
1049
1024
1050
1025
class cmd_push(Command):
1051
__doc__ = """Update a mirror of this branch.
1026
"""Update a mirror of this branch.
1052
1027
1053
1028
The target branch will not have its working tree populated because this
1054
1029
is both expensive, and is not supported on remote file systems.
1078
1053
Option('create-prefix',
1079
1054
help='Create the path leading up to the branch '
1080
1055
'if it does not already exist.'),
1081
custom_help('directory',
1056
Option('directory',
1082
1057
help='Branch to push from, '
1083
'rather than the one containing the working directory.'),
1058
'rather than the one containing the working directory.',
1059
short_name='d',
1060
type=unicode,
1061
),
1084
1062
Option('use-existing-dir',
1085
1063
help='By default push will fail if the target'
1086
1064
' directory exists, but does not already'
1112
1090
# Get the source branch
1113
1091
(tree, br_from,
1114
1092
_unused) = bzrdir.BzrDir.open_containing_tree_or_branch(directory)
1093
if strict is None:
1094
strict = br_from.get_config().get_user_option_as_bool('push_strict')
1095
if strict is None: strict = True # default value
1115
1096
# Get the tip's revision_id
1116
1097
revision = _get_one_revision('push', revision)
1117
1098
if revision is not None:
1118
1099
revision_id = revision.in_history(br_from).rev_id
1119
1100
else:
1120
1101
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.')
1102
if strict and tree is not None and revision_id is None:
1103
if (tree.has_changes(tree.basis_tree())
1104
or len(tree.get_parent_ids()) > 1):
1105
raise errors.UncommittedChanges(
1106
tree, more='Use --no-strict to force the push.')
1107
if tree.last_revision() != tree.branch.last_revision():
1108
# The tree has lost sync with its branch, there is little
1109
# chance that the user is aware of it but he can still force
1110
# the push with --no-strict
1111
raise errors.OutOfDateTree(
1112
tree, more='Use --no-strict to force the push.')
1113
1126
1114
# Get the stacked_on branch, if any
1127
1115
if stacked_on is not None:
1128
1116
stacked_on = urlutils.normalize_url(stacked_on)
1160
1148
1161
1149
1162
1150
class cmd_branch(Command):
1163
__doc__ = """Create a new branch that is a copy of an existing branch.
1151
"""Create a new branch that is a copy of an existing branch.
1164
1152
1165
1153
If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will
1166
1154
be used. In other words, "branch ../foo/bar" will attempt to create ./bar.
1179
1167
help='Hard-link working tree files where possible.'),
1180
1168
Option('no-tree',
1181
1169
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
1170
Option('stacked',
1186
1171
help='Create a stacked branch referring to the source branch. '
1187
1172
'The new branch will depend on the availability of the source '
1193
1178
' directory exists, but does not already'
1194
1179
' have a control directory. This flag will'
1195
1180
' allow branch to proceed.'),
1196
Option('bind',
1197
help="Bind new branch to from location."),
1198
1181
]
1199
1182
aliases = ['get', 'clone']
1200
1183
1201
1184
def run(self, from_location, to_location=None, revision=None,
1202
1185
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
1186
use_existing_dir=False):
1205
1187
from bzrlib.tag import _merge_tags_if_possible
1188
1206
1189
accelerator_tree, br_from = bzrdir.BzrDir.open_tree_or_branch(
1207
1190
from_location)
1191
if (accelerator_tree is not None and
1192
accelerator_tree.supports_content_filtering()):
1193
accelerator_tree = None
1208
1194
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)
1195
br_from.lock_read()
1220
1196
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)
1197
if revision is not None:
1198
revision_id = revision.as_revision_id(br_from)
1226
1199
else:
1227
try:
1228
bzrdir.BzrDir.open_from_transport(to_transport)
1229
except errors.NotBranchError:
1230
pass
1200
# FIXME - wt.last_revision, fallback to branch, fall back to
1201
# None or perhaps NULL_REVISION to mean copy nothing
1202
# RBC 20060209
1203
revision_id = br_from.last_revision()
1204
if to_location is None:
1205
to_location = urlutils.derive_to_location(from_location)
1206
to_transport = transport.get_transport(to_location)
1207
try:
1208
to_transport.mkdir('.')
1209
except errors.FileExists:
1210
if not use_existing_dir:
1211
raise errors.BzrCommandError('Target directory "%s" '
1212
'already exists.' % to_location)
1231
1213
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'))
1214
try:
1215
bzrdir.BzrDir.open_from_transport(to_transport)
1216
except errors.NotBranchError:
1217
pass
1218
else:
1219
raise errors.AlreadyBranchError(to_location)
1220
except errors.NoSuchFile:
1221
raise errors.BzrCommandError('Parent of "%s" does not exist.'
1222
% to_location)
1223
try:
1224
# preserve whatever source format we have.
1225
dir = br_from.bzrdir.sprout(to_transport.base, revision_id,
1226
possible_transports=[to_transport],
1227
accelerator_tree=accelerator_tree,
1228
hardlink=hardlink, stacked=stacked,
1229
force_new_repo=standalone,
1230
create_tree_if_local=not no_tree,
1231
source_branch=br_from)
1232
branch = dir.open_branch()
1233
except errors.NoSuchRevision:
1234
to_transport.delete_tree('.')
1235
msg = "The branch %s has no revision %s." % (from_location,
1236
revision)
1237
raise errors.BzrCommandError(msg)
1238
_merge_tags_if_possible(br_from, branch)
1239
# If the source branch is stacked, the new branch may
1240
# be stacked whether we asked for that explicitly or not.
1241
# We therefore need a try/except here and not just 'if stacked:'
1242
try:
1243
note('Created new stacked branch referring to %s.' %
1244
branch.get_stacked_on_url())
1245
except (errors.NotStacked, errors.UnstackableBranchFormat,
1246
errors.UnstackableRepositoryFormat), e:
1247
note('Branched %d revision(s).' % branch.revno())
1248
finally:
1249
br_from.unlock()
1272
1250
1273
1251
1274
1252
class cmd_checkout(Command):
1275
__doc__ = """Create a new checkout of an existing branch.
1253
"""Create a new checkout of an existing branch.
1276
1254
1277
1255
If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree for
1278
1256
the branch found in '.'. This is useful if you have removed the working tree
1336
1314
except errors.NoWorkingTree:
1337
1315
source.bzrdir.create_workingtree(revision_id)
1338
1316
return
1339
1340
if not lightweight:
1341
message = ('Copying history to "%s". '
1342
'To checkout without local history use --lightweight.' % to_location)
1343
ui.ui_factory.show_message(message)
1344
1317
source.create_checkout(to_location, revision_id, lightweight,
1345
1318
accelerator_tree, hardlink)
1346
1319
1347
1320
1348
1321
class cmd_renames(Command):
1349
__doc__ = """Show list of renamed files.
1322
"""Show list of renamed files.
1350
1323
"""
1351
1324
# TODO: Option to show renames between two historical versions.
1352
1325
1357
1330
@display_command
1358
1331
def run(self, dir=u'.'):
1359
1332
tree = WorkingTree.open_containing(dir)[0]
1360
self.add_cleanup(tree.lock_read().unlock)
1361
new_inv = tree.inventory
1362
old_tree = tree.basis_tree()
1363
self.add_cleanup(old_tree.lock_read().unlock)
1364
old_inv = old_tree.inventory
1365
renames = []
1366
iterator = tree.iter_changes(old_tree, include_unchanged=True)
1367
for f, paths, c, v, p, n, k, e in iterator:
1368
if paths[0] == paths[1]:
1369
continue
1370
if None in (paths):
1371
continue
1372
renames.append(paths)
1373
renames.sort()
1374
for old_name, new_name in renames:
1375
self.outf.write("%s => %s\n" % (old_name, new_name))
1333
tree.lock_read()
1334
try:
1335
new_inv = tree.inventory
1336
old_tree = tree.basis_tree()
1337
old_tree.lock_read()
1338
try:
1339
old_inv = old_tree.inventory
1340
renames = []
1341
iterator = tree.iter_changes(old_tree, include_unchanged=True)
1342
for f, paths, c, v, p, n, k, e in iterator:
1343
if paths[0] == paths[1]:
1344
continue
1345
if None in (paths):
1346
continue
1347
renames.append(paths)
1348
renames.sort()
1349
for old_name, new_name in renames:
1350
self.outf.write("%s => %s\n" % (old_name, new_name))
1351
finally:
1352
old_tree.unlock()
1353
finally:
1354
tree.unlock()
1376
1355
1377
1356
1378
1357
class cmd_update(Command):
1379
__doc__ = """Update a tree to have the latest code committed to its branch.
1358
"""Update a tree to have the latest code committed to its branch.
1380
1359
1381
1360
This will perform a merge into the working tree, and may generate
1382
1361
conflicts. If you have any local changes, you will still
1384
1363
1385
1364
If you want to discard your local changes, you can just do a
1386
1365
'bzr revert' instead of 'bzr commit' after the update.
1387
1388
If the tree's branch is bound to a master branch, it will also update
1389
the branch from the master.
1390
1366
"""
1391
1367
1392
1368
_see_also = ['pull', 'working-trees', 'status-flags']
1393
1369
takes_args = ['dir?']
1394
takes_options = ['revision']
1395
1370
aliases = ['up']
1396
1371
1397
def run(self, dir='.', revision=None):
1398
if revision is not None and len(revision) != 1:
1399
raise errors.BzrCommandError(
1400
"bzr update --revision takes exactly one revision")
1372
def run(self, dir='.'):
1401
1373
tree = WorkingTree.open_containing(dir)[0]
1402
branch = tree.branch
1403
1374
possible_transports = []
1404
master = branch.get_master_branch(
1375
master = tree.branch.get_master_branch(
1405
1376
possible_transports=possible_transports)
1406
1377
if master is not None:
1407
branch_location = master.base
1408
1378
tree.lock_write()
1409
1379
else:
1410
branch_location = tree.branch.base
1411
1380
tree.lock_tree_write()
1412
self.add_cleanup(tree.unlock)
1413
# get rid of the final '/' and be ready for display
1414
branch_location = urlutils.unescape_for_display(
1415
branch_location.rstrip('/'),
1416
self.outf.encoding)
1417
existing_pending_merges = tree.get_parent_ids()[1:]
1418
if master is None:
1419
old_tip = None
1420
else:
1421
# may need to fetch data into a heavyweight checkout
1422
# XXX: this may take some time, maybe we should display a
1423
# message
1424
old_tip = branch.update(possible_transports)
1425
if revision is not None:
1426
revision_id = revision[0].as_revision_id(branch)
1427
else:
1428
revision_id = branch.last_revision()
1429
if revision_id == _mod_revision.ensure_null(tree.last_revision()):
1430
revno = branch.revision_id_to_dotted_revno(revision_id)
1431
note("Tree is up to date at revision %s of branch %s" %
1432
('.'.join(map(str, revno)), branch_location))
1433
return 0
1434
view_info = _get_view_info_for_change_reporter(tree)
1435
change_reporter = delta._ChangeReporter(
1436
unversioned_filter=tree.is_ignored,
1437
view_info=view_info)
1438
1381
try:
1382
existing_pending_merges = tree.get_parent_ids()[1:]
1383
last_rev = _mod_revision.ensure_null(tree.last_revision())
1384
if last_rev == _mod_revision.ensure_null(
1385
tree.branch.last_revision()):
1386
# may be up to date, check master too.
1387
if master is None or last_rev == _mod_revision.ensure_null(
1388
master.last_revision()):
1389
revno = tree.branch.revision_id_to_revno(last_rev)
1390
note("Tree is up to date at revision %d." % (revno,))
1391
return 0
1392
view_info = _get_view_info_for_change_reporter(tree)
1439
1393
conflicts = tree.update(
1440
change_reporter,
1441
possible_transports=possible_transports,
1442
revision=revision_id,
1443
old_tip=old_tip)
1444
except errors.NoSuchRevision, e:
1445
raise errors.BzrCommandError(
1446
"branch has no revision %s\n"
1447
"bzr update --revision only works"
1448
" for a revision in the branch history"
1449
% (e.revision))
1450
revno = tree.branch.revision_id_to_dotted_revno(
1451
_mod_revision.ensure_null(tree.last_revision()))
1452
note('Updated to revision %s of branch %s' %
1453
('.'.join(map(str, revno)), branch_location))
1454
parent_ids = tree.get_parent_ids()
1455
if parent_ids[1:] and parent_ids[1:] != existing_pending_merges:
1456
note('Your local commits will now show as pending merges with '
1457
"'bzr status', and can be committed with 'bzr commit'.")
1458
if conflicts != 0:
1459
return 1
1460
else:
1461
return 0
1394
delta._ChangeReporter(unversioned_filter=tree.is_ignored,
1395
view_info=view_info), possible_transports=possible_transports)
1396
revno = tree.branch.revision_id_to_revno(
1397
_mod_revision.ensure_null(tree.last_revision()))
1398
note('Updated to revision %d.' % (revno,))
1399
if tree.get_parent_ids()[1:] != existing_pending_merges:
1400
note('Your local commits will now show as pending merges with '
1401
"'bzr status', and can be committed with 'bzr commit'.")
1402
if conflicts != 0:
1403
return 1
1404
else:
1405
return 0
1406
finally:
1407
tree.unlock()
1462
1408
1463
1409
1464
1410
class cmd_info(Command):
1465
__doc__ = """Show information about a working tree, branch or repository.
1411
"""Show information about a working tree, branch or repository.
1466
1412
1467
1413
This command will show all known locations and formats associated to the
1468
1414
tree, branch or repository.
1506
1452
1507
1453
1508
1454
class cmd_remove(Command):
1509
__doc__ = """Remove files or directories.
1455
"""Remove files or directories.
1510
1456
1511
1457
This makes bzr stop tracking changes to the specified files. bzr will delete
1512
1458
them if they can easily be recovered using revert. If no options or
1534
1480
if file_list is not None:
1535
1481
file_list = [f for f in file_list]
1536
1482
1537
self.add_cleanup(tree.lock_write().unlock)
1538
# Heuristics should probably all move into tree.remove_smart or
1539
# some such?
1540
if new:
1541
added = tree.changes_from(tree.basis_tree(),
1542
specific_files=file_list).added
1543
file_list = sorted([f[0] for f in added], reverse=True)
1544
if len(file_list) == 0:
1545
raise errors.BzrCommandError('No matching files.')
1546
elif file_list is None:
1547
# missing files show up in iter_changes(basis) as
1548
# versioned-with-no-kind.
1549
missing = []
1550
for change in tree.iter_changes(tree.basis_tree()):
1551
# Find paths in the working tree that have no kind:
1552
if change[1][1] is not None and change[6][1] is None:
1553
missing.append(change[1][1])
1554
file_list = sorted(missing, reverse=True)
1555
file_deletion_strategy = 'keep'
1556
tree.remove(file_list, verbose=verbose, to_file=self.outf,
1557
keep_files=file_deletion_strategy=='keep',
1558
force=file_deletion_strategy=='force')
1483
tree.lock_write()
1484
try:
1485
# Heuristics should probably all move into tree.remove_smart or
1486
# some such?
1487
if new:
1488
added = tree.changes_from(tree.basis_tree(),
1489
specific_files=file_list).added
1490
file_list = sorted([f[0] for f in added], reverse=True)
1491
if len(file_list) == 0:
1492
raise errors.BzrCommandError('No matching files.')
1493
elif file_list is None:
1494
# missing files show up in iter_changes(basis) as
1495
# versioned-with-no-kind.
1496
missing = []
1497
for change in tree.iter_changes(tree.basis_tree()):
1498
# Find paths in the working tree that have no kind:
1499
if change[1][1] is not None and change[6][1] is None:
1500
missing.append(change[1][1])
1501
file_list = sorted(missing, reverse=True)
1502
file_deletion_strategy = 'keep'
1503
tree.remove(file_list, verbose=verbose, to_file=self.outf,
1504
keep_files=file_deletion_strategy=='keep',
1505
force=file_deletion_strategy=='force')
1506
finally:
1507
tree.unlock()
1559
1508
1560
1509
1561
1510
class cmd_file_id(Command):
1562
__doc__ = """Print file_id of a particular file or directory.
1511
"""Print file_id of a particular file or directory.
1563
1512
1564
1513
The file_id is assigned when the file is first added and remains the
1565
1514
same through all revisions where the file exists, even when it is
1581
1530
1582
1531
1583
1532
class cmd_file_path(Command):
1584
__doc__ = """Print path of file_ids to a file or directory.
1533
"""Print path of file_ids to a file or directory.
1585
1534
1586
1535
This prints one line for each directory down to the target,
1587
1536
starting at the branch root.
1603
1552
1604
1553
1605
1554
class cmd_reconcile(Command):
1606
__doc__ = """Reconcile bzr metadata in a branch.
1555
"""Reconcile bzr metadata in a branch.
1607
1556
1608
1557
This can correct data mismatches that may have been caused by
1609
1558
previous ghost operations or bzr upgrades. You should only
1631
1580
1632
1581
1633
1582
class cmd_revision_history(Command):
1634
__doc__ = """Display the list of revision ids on a branch."""
1583
"""Display the list of revision ids on a branch."""
1635
1584
1636
1585
_see_also = ['log']
1637
1586
takes_args = ['location?']
1647
1596
1648
1597
1649
1598
class cmd_ancestry(Command):
1650
__doc__ = """List all revisions merged into this branch."""
1599
"""List all revisions merged into this branch."""
1651
1600
1652
1601
_see_also = ['log', 'revision-history']
1653
1602
takes_args = ['location?']
1672
1621
1673
1622
1674
1623
class cmd_init(Command):
1675
__doc__ = """Make a directory into a versioned branch.
1624
"""Make a directory into a versioned branch.
1676
1625
1677
1626
Use this to create an empty branch, or before importing an
1678
1627
existing project.
1706
1655
lazy_registry=('bzrlib.bzrdir', 'format_registry'),
1707
1656
converter=lambda name: bzrdir.format_registry.make_bzrdir(name),
1708
1657
value_switches=True,
1709
title="Branch format",
1658
title="Branch Format",
1710
1659
),
1711
1660
Option('append-revisions-only',
1712
1661
help='Never change revnos or the existing log.'
1781
1730
1782
1731
1783
1732
class cmd_init_repository(Command):
1784
__doc__ = """Create a shared repository for branches to share storage space.
1733
"""Create a shared repository to hold branches.
1785
1734
1786
1735
New branches created under the repository directory will store their
1787
revisions in the repository, not in the branch directory. For branches
1788
with shared history, this reduces the amount of storage needed and
1789
speeds up the creation of new branches.
1736
revisions in the repository, not in the branch directory.
1790
1737
1791
If the --no-trees option is given then the branches in the repository
1792
will not have working trees by default. They will still exist as
1793
directories on disk, but they will not have separate copies of the
1794
files at a certain revision. This can be useful for repositories that
1795
store branches which are interacted with through checkouts or remote
1796
branches, such as on a server.
1738
If the --no-trees option is used then the branches in the repository
1739
will not have working trees by default.
1797
1740
1798
1741
:Examples:
1799
Create a shared repository holding just branches::
1742
Create a shared repositories holding just branches::
1800
1743
1801
1744
bzr init-repo --no-trees repo
1802
1745
bzr init repo/trunk
1841
1784
1842
1785
1843
1786
class cmd_diff(Command):
1844
__doc__ = """Show differences in the working tree, between revisions or branches.
1787
"""Show differences in the working tree, between revisions or branches.
1845
1788
1846
1789
If no arguments are given, all changes for the current tree are listed.
1847
1790
If files are given, only the changes in those files are listed.
1868
1811
1869
1812
bzr diff -r1
1870
1813
1871
Difference between revision 3 and revision 1::
1872
1873
bzr diff -r1..3
1874
1875
Difference between revision 3 and revision 1 for branch xxx::
1876
1877
bzr diff -r1..3 xxx
1878
1879
To see the changes introduced in revision X::
1880
1881
bzr diff -cX
1882
1883
Note that in the case of a merge, the -c option shows the changes
1884
compared to the left hand parent. To see the changes against
1885
another parent, use::
1886
1887
bzr diff -r<chosen_parent>..X
1888
1889
The changes introduced by revision 2 (equivalent to -r1..2)::
1890
1891
bzr diff -c2
1814
Difference between revision 2 and revision 1::
1815
1816
bzr diff -r1..2
1817
1818
Difference between revision 2 and revision 1 for branch xxx::
1819
1820
bzr diff -r1..2 xxx
1892
1821
1893
1822
Show just the differences for file NEWS::
1894
1823
1933
1862
help='Use this command to compare files.',
1934
1863
type=unicode,
1935
1864
),
1936
RegistryOption('format',
1937
help='Diff format to use.',
1938
lazy_registry=('bzrlib.diff', 'format_registry'),
1939
value_switches=False, title='Diff format'),
1940
1865
]
1941
1866
aliases = ['di', 'dif']
1942
1867
encoding_type = 'exact'
1943
1868
1944
1869
@display_command
1945
1870
def run(self, revision=None, file_list=None, diff_options=None,
1946
prefix=None, old=None, new=None, using=None, format=None):
1947
from bzrlib.diff import (get_trees_and_branches_to_diff_locked,
1948
show_diff_trees)
1871
prefix=None, old=None, new=None, using=None):
1872
from bzrlib.diff import _get_trees_to_diff, show_diff_trees
1949
1873
1950
1874
if (prefix is None) or (prefix == '0'):
1951
1875
# diff -p0 format
1965
1889
raise errors.BzrCommandError('bzr diff --revision takes exactly'
1966
1890
' one or two revision specifiers')
1967
1891
1968
if using is not None and format is not None:
1969
raise errors.BzrCommandError('--using and --format are mutually '
1970
'exclusive.')
1971
1972
(old_tree, new_tree,
1973
old_branch, new_branch,
1974
specific_files, extra_trees) = get_trees_and_branches_to_diff_locked(
1975
file_list, revision, old, new, self.add_cleanup, apply_view=True)
1892
old_tree, new_tree, specific_files, extra_trees = \
1893
_get_trees_to_diff(file_list, revision, old, new,
1894
apply_view=True)
1976
1895
return show_diff_trees(old_tree, new_tree, sys.stdout,
1977
1896
specific_files=specific_files,
1978
1897
external_diff_options=diff_options,
1979
1898
old_label=old_label, new_label=new_label,
1980
extra_trees=extra_trees, using=using,
1981
format_cls=format)
1899
extra_trees=extra_trees, using=using)
1982
1900
1983
1901
1984
1902
class cmd_deleted(Command):
1985
__doc__ = """List files deleted in the working tree.
1903
"""List files deleted in the working tree.
1986
1904
"""
1987
1905
# TODO: Show files deleted since a previous revision, or
1988
1906
# between two revisions.
1991
1909
# level of effort but possibly much less IO. (Or possibly not,
1992
1910
# if the directories are very large...)
1993
1911
_see_also = ['status', 'ls']
1994
takes_options = ['directory', 'show-ids']
1912
takes_options = ['show-ids']
1995
1913
1996
1914
@display_command
1997
def run(self, show_ids=False, directory=u'.'):
1998
tree = WorkingTree.open_containing(directory)[0]
1999
self.add_cleanup(tree.lock_read().unlock)
2000
old = tree.basis_tree()
2001
self.add_cleanup(old.lock_read().unlock)
2002
for path, ie in old.inventory.iter_entries():
2003
if not tree.has_id(ie.file_id):
2004
self.outf.write(path)
2005
if show_ids:
2006
self.outf.write(' ')
2007
self.outf.write(ie.file_id)
2008
self.outf.write('\n')
1915
def run(self, show_ids=False):
1916
tree = WorkingTree.open_containing(u'.')[0]
1917
tree.lock_read()
1918
try:
1919
old = tree.basis_tree()
1920
old.lock_read()
1921
try:
1922
for path, ie in old.inventory.iter_entries():
1923
if not tree.has_id(ie.file_id):
1924
self.outf.write(path)
1925
if show_ids:
1926
self.outf.write(' ')
1927
self.outf.write(ie.file_id)
1928
self.outf.write('\n')
1929
finally:
1930
old.unlock()
1931
finally:
1932
tree.unlock()
2009
1933
2010
1934
2011
1935
class cmd_modified(Command):
2012
__doc__ = """List files modified in working tree.
1936
"""List files modified in working tree.
2013
1937
"""
2014
1938
2015
1939
hidden = True
2016
1940
_see_also = ['status', 'ls']
2017
takes_options = ['directory', 'null']
1941
takes_options = [
1942
Option('null',
1943
help='Write an ascii NUL (\\0) separator '
1944
'between files rather than a newline.')
1945
]
2018
1946
2019
1947
@display_command
2020
def run(self, null=False, directory=u'.'):
2021
tree = WorkingTree.open_containing(directory)[0]
1948
def run(self, null=False):
1949
tree = WorkingTree.open_containing(u'.')[0]
2022
1950
td = tree.changes_from(tree.basis_tree())
2023
1951
for path, id, kind, text_modified, meta_modified in td.modified:
2024
1952
if null:
2028
1956
2029
1957
2030
1958
class cmd_added(Command):
2031
__doc__ = """List files added in working tree.
1959
"""List files added in working tree.
2032
1960
"""
2033
1961
2034
1962
hidden = True
2035
1963
_see_also = ['status', 'ls']
2036
takes_options = ['directory', 'null']
1964
takes_options = [
1965
Option('null',
1966
help='Write an ascii NUL (\\0) separator '
1967
'between files rather than a newline.')
1968
]
2037
1969
2038
1970
@display_command
2039
def run(self, null=False, directory=u'.'):
2040
wt = WorkingTree.open_containing(directory)[0]
2041
self.add_cleanup(wt.lock_read().unlock)
2042
basis = wt.basis_tree()
2043
self.add_cleanup(basis.lock_read().unlock)
2044
basis_inv = basis.inventory
2045
inv = wt.inventory
2046
for file_id in inv:
2047
if file_id in basis_inv:
2048
continue
2049
if inv.is_root(file_id) and len(basis_inv) == 0:
2050
continue
2051
path = inv.id2path(file_id)
2052
if not os.access(osutils.pathjoin(wt.basedir, path), os.F_OK):
2053
continue
2054
if null:
2055
self.outf.write(path + '\0')
2056
else:
2057
self.outf.write(osutils.quotefn(path) + '\n')
1971
def run(self, null=False):
1972
wt = WorkingTree.open_containing(u'.')[0]
1973
wt.lock_read()
1974
try:
1975
basis = wt.basis_tree()
1976
basis.lock_read()
1977
try:
1978
basis_inv = basis.inventory
1979
inv = wt.inventory
1980
for file_id in inv:
1981
if file_id in basis_inv:
1982
continue
1983
if inv.is_root(file_id) and len(basis_inv) == 0:
1984
continue
1985
path = inv.id2path(file_id)
1986
if not os.access(osutils.abspath(path), os.F_OK):
1987
continue
1988
if null:
1989
self.outf.write(path + '\0')
1990
else:
1991
self.outf.write(osutils.quotefn(path) + '\n')
1992
finally:
1993
basis.unlock()
1994
finally:
1995
wt.unlock()
2058
1996
2059
1997
2060
1998
class cmd_root(Command):
2061
__doc__ = """Show the tree root directory.
1999
"""Show the tree root directory.
2062
2000
2063
2001
The root is the nearest enclosing directory with a .bzr control
2064
2002
directory."""
2088
2026
2089
2027
2090
2028
class cmd_log(Command):
2091
__doc__ = """Show historical log for a branch or subset of a branch.
2029
"""Show historical log for a branch or subset of a branch.
2092
2030
2093
2031
log is bzr's default tool for exploring the history of a branch.
2094
2032
The branch to use is taken from the first parameter. If no parameters
2205
2143
:Tips & tricks:
2206
2144
2207
2145
GUI tools and IDEs are often better at exploring history than command
2208
line tools: you may prefer qlog or viz from qbzr or bzr-gtk, the
2209
bzr-explorer shell, or the Loggerhead web interface. See the Plugin
2210
Guide <http://doc.bazaar.canonical.com/plugins/en/> and
2211
<http://wiki.bazaar.canonical.com/IDEIntegration>.
2146
line tools. You may prefer qlog or glog from the QBzr and Bzr-Gtk packages
2147
respectively for example. (TortoiseBzr uses qlog for displaying logs.) See
2148
http://bazaar-vcs.org/BzrPlugins and http://bazaar-vcs.org/IDEIntegration.
2149
2150
Web interfaces are often better at exploring history than command line
2151
tools, particularly for branches on servers. You may prefer Loggerhead
2152
or one of its alternatives. See http://bazaar-vcs.org/WebInterface.
2212
2153
2213
2154
You may find it useful to add the aliases below to ``bazaar.conf``::
2214
2155
2255
2196
help='Show just the specified revision.'
2256
2197
' See also "help revisionspec".'),
2257
2198
'log-format',
2258
RegistryOption('authors',
2259
'What names to list as authors - first, all or committer.',
2260
title='Authors',
2261
lazy_registry=('bzrlib.log', 'author_list_registry'),
2262
),
2263
2199
Option('levels',
2264
2200
short_name='n',
2265
2201
help='Number of levels to display - 0 for all, 1 for flat.',
2280
2216
help='Show changes made in each revision as a patch.'),
2281
2217
Option('include-merges',
2282
2218
help='Show merged revisions like --levels 0 does.'),
2283
Option('exclude-common-ancestry',
2284
help='Display only the revisions that are not part'
2285
' of both ancestries (require -rX..Y)'
2286
)
2287
2219
]
2288
2220
encoding_type = 'replace'
2289
2221
2299
2231
message=None,
2300
2232
limit=None,
2301
2233
show_diff=False,
2302
include_merges=False,
2303
authors=None,
2304
exclude_common_ancestry=False,
2305
):
2234
include_merges=False):
2306
2235
from bzrlib.log import (
2307
2236
Logger,
2308
2237
make_log_request_dict,
2309
2238
_get_info_for_log_files,
2310
2239
)
2311
2240
direction = (forward and 'forward') or 'reverse'
2312
if (exclude_common_ancestry
2313
and (revision is None or len(revision) != 2)):
2314
raise errors.BzrCommandError(
2315
'--exclude-common-ancestry requires -r with two revisions')
2316
2241
if include_merges:
2317
2242
if levels is None:
2318
2243
levels = 0
2333
2258
filter_by_dir = False
2334
2259
if file_list:
2335
2260
# find the file ids to log and check for directory filtering
2336
b, file_info_list, rev1, rev2 = _get_info_for_log_files(
2337
revision, file_list, self.add_cleanup)
2261
b, file_info_list, rev1, rev2 = _get_info_for_log_files(revision,
2262
file_list)
2338
2263
for relpath, file_id, kind in file_info_list:
2339
2264
if file_id is None:
2340
2265
raise errors.BzrCommandError(
2358
2283
location = '.'
2359
2284
dir, relpath = bzrdir.BzrDir.open_containing(location)
2360
2285
b = dir.open_branch()
2361
self.add_cleanup(b.lock_read().unlock)
2362
2286
rev1, rev2 = _get_revision_range(revision, b, self.name())
2363
2287
2364
2288
# Decide on the type of delta & diff filtering to use
2374
2298
else:
2375
2299
diff_type = 'full'
2376
2300
2377
# Build the log formatter
2378
if log_format is None:
2379
log_format = log.log_formatter_registry.get_default(b)
2380
# Make a non-encoding output to include the diffs - bug 328007
2381
unencoded_output = ui.ui_factory.make_output_stream(encoding_type='exact')
2382
lf = log_format(show_ids=show_ids, to_file=self.outf,
2383
to_exact_file=unencoded_output,
2384
show_timezone=timezone,
2385
delta_format=get_verbosity_level(),
2386
levels=levels,
2387
show_advice=levels is None,
2388
author_list_handler=authors)
2389
2390
# Choose the algorithm for doing the logging. It's annoying
2391
# having multiple code paths like this but necessary until
2392
# the underlying repository format is faster at generating
2393
# deltas or can provide everything we need from the indices.
2394
# The default algorithm - match-using-deltas - works for
2395
# multiple files and directories and is faster for small
2396
# amounts of history (200 revisions say). However, it's too
2397
# slow for logging a single file in a repository with deep
2398
# history, i.e. > 10K revisions. In the spirit of "do no
2399
# evil when adding features", we continue to use the
2400
# original algorithm - per-file-graph - for the "single
2401
# file that isn't a directory without showing a delta" case.
2402
partial_history = revision and b.repository._format.supports_chks
2403
match_using_deltas = (len(file_ids) != 1 or filter_by_dir
2404
or delta_type or partial_history)
2405
2406
# Build the LogRequest and execute it
2407
if len(file_ids) == 0:
2408
file_ids = None
2409
rqst = make_log_request_dict(
2410
direction=direction, specific_fileids=file_ids,
2411
start_revision=rev1, end_revision=rev2, limit=limit,
2412
message_search=message, delta_type=delta_type,
2413
diff_type=diff_type, _match_using_deltas=match_using_deltas,
2414
exclude_common_ancestry=exclude_common_ancestry,
2415
)
2416
Logger(b, rqst).show(lf)
2301
b.lock_read()
2302
try:
2303
# Build the log formatter
2304
if log_format is None:
2305
log_format = log.log_formatter_registry.get_default(b)
2306
lf = log_format(show_ids=show_ids, to_file=self.outf,
2307
show_timezone=timezone,
2308
delta_format=get_verbosity_level(),
2309
levels=levels,
2310
show_advice=levels is None)
2311
2312
# Choose the algorithm for doing the logging. It's annoying
2313
# having multiple code paths like this but necessary until
2314
# the underlying repository format is faster at generating
2315
# deltas or can provide everything we need from the indices.
2316
# The default algorithm - match-using-deltas - works for
2317
# multiple files and directories and is faster for small
2318
# amounts of history (200 revisions say). However, it's too
2319
# slow for logging a single file in a repository with deep
2320
# history, i.e. > 10K revisions. In the spirit of "do no
2321
# evil when adding features", we continue to use the
2322
# original algorithm - per-file-graph - for the "single
2323
# file that isn't a directory without showing a delta" case.
2324
partial_history = revision and b.repository._format.supports_chks
2325
match_using_deltas = (len(file_ids) != 1 or filter_by_dir
2326
or delta_type or partial_history)
2327
2328
# Build the LogRequest and execute it
2329
if len(file_ids) == 0:
2330
file_ids = None
2331
rqst = make_log_request_dict(
2332
direction=direction, specific_fileids=file_ids,
2333
start_revision=rev1, end_revision=rev2, limit=limit,
2334
message_search=message, delta_type=delta_type,
2335
diff_type=diff_type, _match_using_deltas=match_using_deltas)
2336
Logger(b, rqst).show(lf)
2337
finally:
2338
b.unlock()
2417
2339
2418
2340
2419
2341
def _get_revision_range(revisionspec_list, branch, command_name):
2437
2359
raise errors.BzrCommandError(
2438
2360
"bzr %s doesn't accept two revisions in different"
2439
2361
" branches." % command_name)
2440
if start_spec.spec is None:
2441
# Avoid loading all the history.
2442
rev1 = RevisionInfo(branch, None, None)
2443
else:
2444
rev1 = start_spec.in_history(branch)
2362
rev1 = start_spec.in_history(branch)
2445
2363
# Avoid loading all of history when we know a missing
2446
2364
# end of range means the last revision ...
2447
2365
if end_spec.spec is None:
2476
2394
2477
2395
2478
2396
class cmd_touching_revisions(Command):
2479
__doc__ = """Return revision-ids which affected a particular file.
2397
"""Return revision-ids which affected a particular file.
2480
2398
2481
2399
A more user-friendly interface is "bzr log FILE".
2482
2400
"""
2487
2405
@display_command
2488
2406
def run(self, filename):
2489
2407
tree, relpath = WorkingTree.open_containing(filename)
2408
b = tree.branch
2490
2409
file_id = tree.path2id(relpath)
2491
b = tree.branch
2492
self.add_cleanup(b.lock_read().unlock)
2493
touching_revs = log.find_touching_revisions(b, file_id)
2494
for revno, revision_id, what in touching_revs:
2410
for revno, revision_id, what in log.find_touching_revisions(b, file_id):
2495
2411
self.outf.write("%6d %s\n" % (revno, what))
2496
2412
2497
2413
2498
2414
class cmd_ls(Command):
2499
__doc__ = """List files in a tree.
2415
"""List files in a tree.
2500
2416
"""
2501
2417
2502
2418
_see_also = ['status', 'cat']
2508
2424
help='Recurse into subdirectories.'),
2509
2425
Option('from-root',
2510
2426
help='Print paths relative to the root of the branch.'),
2511
Option('unknown', short_name='u',
2512
help='Print unknown files.'),
2427
Option('unknown', help='Print unknown files.'),
2513
2428
Option('versioned', help='Print versioned files.',
2514
2429
short_name='V'),
2515
Option('ignored', short_name='i',
2516
help='Print ignored files.'),
2517
Option('kind', short_name='k',
2430
Option('ignored', help='Print ignored files.'),
2431
Option('null',
2432
help='Write an ascii NUL (\\0) separator '
2433
'between files rather than a newline.'),
2434
Option('kind',
2518
2435
help='List entries of a particular kind: file, directory, symlink.',
2519
2436
type=unicode),
2520
'null',
2521
2437
'show-ids',
2522
'directory',
2523
2438
]
2524
2439
@display_command
2525
2440
def run(self, revision=None, verbose=False,
2526
2441
recursive=False, from_root=False,
2527
2442
unknown=False, versioned=False, ignored=False,
2528
null=False, kind=None, show_ids=False, path=None, directory=None):
2443
null=False, kind=None, show_ids=False, path=None):
2529
2444
2530
2445
if kind and kind not in ('file', 'directory', 'symlink'):
2531
2446
raise errors.BzrCommandError('invalid kind specified')
2543
2458
raise errors.BzrCommandError('cannot specify both --from-root'
2544
2459
' and PATH')
2545
2460
fs_path = path
2546
tree, branch, relpath = \
2547
_open_directory_or_containing_tree_or_branch(fs_path, directory)
2461
tree, branch, relpath = bzrdir.BzrDir.open_containing_tree_or_branch(
2462
fs_path)
2548
2463
2549
2464
# Calculate the prefix to use
2550
2465
prefix = None
2551
2466
if from_root:
2552
2467
if relpath:
2553
2468
prefix = relpath + '/'
2554
elif fs_path != '.' and not fs_path.endswith('/'):
2469
elif fs_path != '.':
2555
2470
prefix = fs_path + '/'
2556
2471
2557
2472
if revision is not None or tree is None:
2565
2480
view_str = views.view_display_str(view_files)
2566
2481
note("Ignoring files outside view. View is %s" % view_str)
2567
2482
2568
self.add_cleanup(tree.lock_read().unlock)
2569
for fp, fc, fkind, fid, entry in tree.list_files(include_root=False,
2570
from_dir=relpath, recursive=recursive):
2571
# Apply additional masking
2572
if not all and not selection[fc]:
2573
continue
2574
if kind is not None and fkind != kind:
2575
continue
2576
if apply_view:
2577
try:
2578
if relpath:
2579
fullpath = osutils.pathjoin(relpath, fp)
2580
else:
2581
fullpath = fp
2582
views.check_path_in_view(tree, fullpath)
2583
except errors.FileOutsideView:
2584
continue
2483
tree.lock_read()
2484
try:
2485
for fp, fc, fkind, fid, entry in tree.list_files(include_root=False,
2486
from_dir=relpath, recursive=recursive):
2487
# Apply additional masking
2488
if not all and not selection[fc]:
2489
continue
2490
if kind is not None and fkind != kind:
2491
continue
2492
if apply_view:
2493
try:
2494
if relpath:
2495
fullpath = osutils.pathjoin(relpath, fp)
2496
else:
2497
fullpath = fp
2498
views.check_path_in_view(tree, fullpath)
2499
except errors.FileOutsideView:
2500
continue
2585
2501
2586
# Output the entry
2587
if prefix:
2588
fp = osutils.pathjoin(prefix, fp)
2589
kindch = entry.kind_character()
2590
outstring = fp + kindch
2591
ui.ui_factory.clear_term()
2592
if verbose:
2593
outstring = '%-8s %s' % (fc, outstring)
2594
if show_ids and fid is not None:
2595
outstring = "%-50s %s" % (outstring, fid)
2596
self.outf.write(outstring + '\n')
2597
elif null:
2598
self.outf.write(fp + '\0')
2599
if show_ids:
2600
if fid is not None:
2601
self.outf.write(fid)
2602
self.outf.write('\0')
2603
self.outf.flush()
2604
else:
2605
if show_ids:
2606
if fid is not None:
2607
my_id = fid
2608
else:
2609
my_id = ''
2610
self.outf.write('%-50s %s\n' % (outstring, my_id))
2611
else:
2502
# Output the entry
2503
if prefix:
2504
fp = osutils.pathjoin(prefix, fp)
2505
kindch = entry.kind_character()
2506
outstring = fp + kindch
2507
ui.ui_factory.clear_term()
2508
if verbose:
2509
outstring = '%-8s %s' % (fc, outstring)
2510
if show_ids and fid is not None:
2511
outstring = "%-50s %s" % (outstring, fid)
2612
2512
self.outf.write(outstring + '\n')
2513
elif null:
2514
self.outf.write(fp + '\0')
2515
if show_ids:
2516
if fid is not None:
2517
self.outf.write(fid)
2518
self.outf.write('\0')
2519
self.outf.flush()
2520
else:
2521
if show_ids:
2522
if fid is not None:
2523
my_id = fid
2524
else:
2525
my_id = ''
2526
self.outf.write('%-50s %s\n' % (outstring, my_id))
2527
else:
2528
self.outf.write(outstring + '\n')
2529
finally:
2530
tree.unlock()
2613
2531
2614
2532
2615
2533
class cmd_unknowns(Command):
2616
__doc__ = """List unknown files.
2534
"""List unknown files.
2617
2535
"""
2618
2536
2619
2537
hidden = True
2620
2538
_see_also = ['ls']
2621
takes_options = ['directory']
2622
2539
2623
2540
@display_command
2624
def run(self, directory=u'.'):
2625
for f in WorkingTree.open_containing(directory)[0].unknowns():
2541
def run(self):
2542
for f in WorkingTree.open_containing(u'.')[0].unknowns():
2626
2543
self.outf.write(osutils.quotefn(f) + '\n')
2627
2544
2628
2545
2629
2546
class cmd_ignore(Command):
2630
__doc__ = """Ignore specified files or patterns.
2547
"""Ignore specified files or patterns.
2631
2548
2632
2549
See ``bzr help patterns`` for details on the syntax of patterns.
2633
2550
2634
If a .bzrignore file does not exist, the ignore command
2635
will create one and add the specified files or patterns to the newly
2636
created file. The ignore command will also automatically add the
2637
.bzrignore file to be versioned. Creating a .bzrignore file without
2638
the use of the ignore command will require an explicit add command.
2639
2640
2551
To remove patterns from the ignore list, edit the .bzrignore file.
2641
2552
After adding, editing or deleting that file either indirectly by
2642
2553
using this command or directly by using an editor, be sure to commit
2643
2554
it.
2644
2645
Bazaar also supports a global ignore file ~/.bazaar/ignore. On Windows
2646
the global ignore file can be found in the application data directory as
2647
C:\\Documents and Settings\\<user>\\Application Data\\Bazaar\\2.0\\ignore.
2648
Global ignores are not touched by this command. The global ignore file
2649
can be edited directly using an editor.
2650
2651
Patterns prefixed with '!' are exceptions to ignore patterns and take
2652
precedence over regular ignores. Such exceptions are used to specify
2653
files that should be versioned which would otherwise be ignored.
2654
2655
Patterns prefixed with '!!' act as regular ignore patterns, but have
2656
precedence over the '!' exception patterns.
2657
2555
2658
2556
Note: ignore patterns containing shell wildcards must be quoted from
2659
2557
the shell on Unix.
2663
2561
2664
2562
bzr ignore ./Makefile
2665
2563
2666
Ignore .class files in all directories...::
2564
Ignore class files in all directories::
2667
2565
2668
2566
bzr ignore "*.class"
2669
2567
2670
...but do not ignore "special.class"::
2671
2672
bzr ignore "!special.class"
2673
2674
2568
Ignore .o files under the lib directory::
2675
2569
2676
2570
bzr ignore "lib/**/*.o"
2682
2576
Ignore everything but the "debian" toplevel directory::
2683
2577
2684
2578
bzr ignore "RE:(?!debian/).*"
2685
2686
Ignore everything except the "local" toplevel directory,
2687
but always ignore "*~" autosave files, even under local/::
2688
2689
bzr ignore "*"
2690
bzr ignore "!./local"
2691
bzr ignore "!!*~"
2692
2579
"""
2693
2580
2694
2581
_see_also = ['status', 'ignored', 'patterns']
2695
2582
takes_args = ['name_pattern*']
2696
takes_options = ['directory',
2697
Option('default-rules',
2698
help='Display the default ignore rules that bzr uses.')
2583
takes_options = [
2584
Option('old-default-rules',
2585
help='Write out the ignore rules bzr < 0.9 always used.')
2699
2586
]
2700
2587
2701
def run(self, name_pattern_list=None, default_rules=None,
2702
directory=u'.'):
2588
def run(self, name_pattern_list=None, old_default_rules=None):
2703
2589
from bzrlib import ignores
2704
if default_rules is not None:
2705
# dump the default rules and exit
2706
for pattern in ignores.USER_DEFAULTS:
2707
self.outf.write("%s\n" % pattern)
2590
if old_default_rules is not None:
2591
# dump the rules and exit
2592
for pattern in ignores.OLD_DEFAULTS:
2593
print pattern
2708
2594
return
2709
2595
if not name_pattern_list:
2710
2596
raise errors.BzrCommandError("ignore requires at least one "
2711
"NAME_PATTERN or --default-rules.")
2597
"NAME_PATTERN or --old-default-rules")
2712
2598
name_pattern_list = [globbing.normalize_pattern(p)
2713
2599
for p in name_pattern_list]
2714
2600
for name_pattern in name_pattern_list:
2716
2602
(len(name_pattern) > 1 and name_pattern[1] == ':')):
2717
2603
raise errors.BzrCommandError(
2718
2604
"NAME_PATTERN should not be an absolute path")
2719
tree, relpath = WorkingTree.open_containing(directory)
2605
tree, relpath = WorkingTree.open_containing(u'.')
2720
2606
ignores.tree_ignores_add_patterns(tree, name_pattern_list)
2721
2607
ignored = globbing.Globster(name_pattern_list)
2722
2608
matches = []
2726
2612
if id is not None:
2727
2613
filename = entry[0]
2728
2614
if ignored.match(filename):
2729
matches.append(filename)
2615
matches.append(filename.encode('utf-8'))
2730
2616
tree.unlock()
2731
2617
if len(matches) > 0:
2732
self.outf.write("Warning: the following files are version controlled and"
2733
" match your ignore pattern:\n%s"
2734
"\nThese files will continue to be version controlled"
2735
" unless you 'bzr remove' them.\n" % ("\n".join(matches),))
2618
print "Warning: the following files are version controlled and" \
2619
" match your ignore pattern:\n%s" \
2620
"\nThese files will continue to be version controlled" \
2621
" unless you 'bzr remove' them." % ("\n".join(matches),)
2736
2622
2737
2623
2738
2624
class cmd_ignored(Command):
2739
__doc__ = """List ignored files and the patterns that matched them.
2625
"""List ignored files and the patterns that matched them.
2740
2626
2741
2627
List all the ignored files and the ignore pattern that caused the file to
2742
2628
be ignored.
2748
2634
2749
2635
encoding_type = 'replace'
2750
2636
_see_also = ['ignore', 'ls']
2751
takes_options = ['directory']
2752
2637
2753
2638
@display_command
2754
def run(self, directory=u'.'):
2755
tree = WorkingTree.open_containing(directory)[0]
2756
self.add_cleanup(tree.lock_read().unlock)
2757
for path, file_class, kind, file_id, entry in tree.list_files():
2758
if file_class != 'I':
2759
continue
2760
## XXX: Slightly inefficient since this was already calculated
2761
pat = tree.is_ignored(path)
2762
self.outf.write('%-50s %s\n' % (path, pat))
2639
def run(self):
2640
tree = WorkingTree.open_containing(u'.')[0]
2641
tree.lock_read()
2642
try:
2643
for path, file_class, kind, file_id, entry in tree.list_files():
2644
if file_class != 'I':
2645
continue
2646
## XXX: Slightly inefficient since this was already calculated
2647
pat = tree.is_ignored(path)
2648
self.outf.write('%-50s %s\n' % (path, pat))
2649
finally:
2650
tree.unlock()
2763
2651
2764
2652
2765
2653
class cmd_lookup_revision(Command):
2766
__doc__ = """Lookup the revision-id from a revision-number
2654
"""Lookup the revision-id from a revision-number
2767
2655
2768
2656
:Examples:
2769
2657
bzr lookup-revision 33
2770
2658
"""
2771
2659
hidden = True
2772
2660
takes_args = ['revno']
2773
takes_options = ['directory']
2774
2661
2775
2662
@display_command
2776
def run(self, revno, directory=u'.'):
2663
def run(self, revno):
2777
2664
try:
2778
2665
revno = int(revno)
2779
2666
except ValueError:
2780
raise errors.BzrCommandError("not a valid revision-number: %r"
2781
% revno)
2782
revid = WorkingTree.open_containing(directory)[0].branch.get_rev_id(revno)
2783
self.outf.write("%s\n" % revid)
2667
raise errors.BzrCommandError("not a valid revision-number: %r" % revno)
2668
2669
print WorkingTree.open_containing(u'.')[0].branch.get_rev_id(revno)
2784
2670
2785
2671
2786
2672
class cmd_export(Command):
2787
__doc__ = """Export current or past revision to a destination directory or archive.
2673
"""Export current or past revision to a destination directory or archive.
2788
2674
2789
2675
If no revision is specified this exports the last committed revision.
2790
2676
2812
2698
================= =========================
2813
2699
"""
2814
2700
takes_args = ['dest', 'branch_or_subdir?']
2815
takes_options = ['directory',
2701
takes_options = [
2816
2702
Option('format',
2817
2703
help="Type of file to export to.",
2818
2704
type=unicode),
2822
2708
Option('root',
2823
2709
type=str,
2824
2710
help="Name of the root directory inside the exported file."),
2825
Option('per-file-timestamps',
2826
help='Set modification time of files to that of the last '
2827
'revision in which it was changed.'),
2828
2711
]
2829
2712
def run(self, dest, branch_or_subdir=None, revision=None, format=None,
2830
root=None, filters=False, per_file_timestamps=False, directory=u'.'):
2713
root=None, filters=False):
2831
2714
from bzrlib.export import export
2832
2715
2833
2716
if branch_or_subdir is None:
2834
tree = WorkingTree.open_containing(directory)[0]
2717
tree = WorkingTree.open_containing(u'.')[0]
2835
2718
b = tree.branch
2836
2719
subdir = None
2837
2720
else:
2840
2723
2841
2724
rev_tree = _get_one_revision_tree('export', revision, branch=b, tree=tree)
2842
2725
try:
2843
export(rev_tree, dest, format, root, subdir, filtered=filters,
2844
per_file_timestamps=per_file_timestamps)
2726
export(rev_tree, dest, format, root, subdir, filtered=filters)
2845
2727
except errors.NoSuchExportFormat, e:
2846
2728
raise errors.BzrCommandError('Unsupported export format: %s' % e.format)
2847
2729
2848
2730
2849
2731
class cmd_cat(Command):
2850
__doc__ = """Write the contents of a file as of a given revision to standard output.
2732
"""Write the contents of a file as of a given revision to standard output.
2851
2733
2852
2734
If no revision is nominated, the last revision is used.
2853
2735
2856
2738
"""
2857
2739
2858
2740
_see_also = ['ls']
2859
takes_options = ['directory',
2741
takes_options = [
2860
2742
Option('name-from-revision', help='The path name in the old tree.'),
2861
2743
Option('filters', help='Apply content filters to display the '
2862
2744
'convenience form.'),
2867
2749
2868
2750
@display_command
2869
2751
def run(self, filename, revision=None, name_from_revision=False,
2870
filters=False, directory=None):
2752
filters=False):
2871
2753
if revision is not None and len(revision) != 1:
2872
2754
raise errors.BzrCommandError("bzr cat --revision takes exactly"
2873
2755
" one revision specifier")
2874
2756
tree, branch, relpath = \
2875
_open_directory_or_containing_tree_or_branch(filename, directory)
2876
self.add_cleanup(branch.lock_read().unlock)
2877
return self._run(tree, branch, relpath, filename, revision,
2878
name_from_revision, filters)
2757
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
2758
branch.lock_read()
2759
try:
2760
return self._run(tree, branch, relpath, filename, revision,
2761
name_from_revision, filters)
2762
finally:
2763
branch.unlock()
2879
2764
2880
2765
def _run(self, tree, b, relpath, filename, revision, name_from_revision,
2881
2766
filtered):
2882
2767
if tree is None:
2883
2768
tree = b.basis_tree()
2884
2769
rev_tree = _get_one_revision_tree('cat', revision, branch=b)
2885
self.add_cleanup(rev_tree.lock_read().unlock)
2886
2770
2887
2771
old_file_id = rev_tree.path2id(relpath)
2888
2772
2923
2807
chunks = content.splitlines(True)
2924
2808
content = filtered_output_bytes(chunks, filters,
2925
2809
ContentFilterContext(relpath, rev_tree))
2926
self.cleanup_now()
2927
2810
self.outf.writelines(content)
2928
2811
else:
2929
self.cleanup_now()
2930
2812
self.outf.write(content)
2931
2813
2932
2814
2933
2815
class cmd_local_time_offset(Command):
2934
__doc__ = """Show the offset in seconds from GMT to local time."""
2816
"""Show the offset in seconds from GMT to local time."""
2935
2817
hidden = True
2936
2818
@display_command
2937
2819
def run(self):
2938
self.outf.write("%s\n" % osutils.local_time_offset())
2820
print osutils.local_time_offset()
2939
2821
2940
2822
2941
2823
2942
2824
class cmd_commit(Command):
2943
__doc__ = """Commit changes into a new revision.
2825
"""Commit changes into a new revision.
2944
2826
2945
2827
An explanatory message needs to be given for each commit. This is
2946
2828
often done by using the --message option (getting the message from the
3039
2921
Option('strict',
3040
2922
help="Refuse to commit if there are unknown "
3041
2923
"files in the working tree."),
3042
Option('commit-time', type=str,
3043
help="Manually set a commit time using commit date "
3044
"format, e.g. '2009-10-10 08:00:00 +0100'."),
3045
2924
ListOption('fixes', type=str,
3046
2925
help="Mark a bug as being fixed by this revision "
3047
2926
"(see \"bzr help bugs\")."),
3054
2933
"the master branch until a normal commit "
3055
2934
"is performed."
3056
2935
),
3057
Option('show-diff', short_name='p',
3058
help='When no message is supplied, show the diff along'
3059
' with the status summary in the message editor.'),
2936
Option('show-diff',
2937
help='When no message is supplied, show the diff along'
2938
' with the status summary in the message editor.'),
3060
2939
]
3061
2940
aliases = ['ci', 'checkin']
3062
2941
3081
2960
3082
2961
def run(self, message=None, file=None, verbose=False, selected_list=None,
3083
2962
unchanged=False, strict=False, local=False, fixes=None,
3084
author=None, show_diff=False, exclude=None, commit_time=None):
2963
author=None, show_diff=False, exclude=None):
3085
2964
from bzrlib.errors import (
3086
2965
PointlessCommit,
3087
2966
ConflictsInTree,
3093
2972
make_commit_message_template_encoded
3094
2973
)
3095
2974
3096
commit_stamp = offset = None
3097
if commit_time is not None:
3098
try:
3099
commit_stamp, offset = timestamp.parse_patch_date(commit_time)
3100
except ValueError, e:
3101
raise errors.BzrCommandError(
3102
"Could not parse --commit-time: " + str(e))
3103
3104
2975
# TODO: Need a blackbox test for invoking the external editor; may be
3105
2976
# slightly problematic to run this cross-platform.
3106
2977
3126
2997
if local and not tree.branch.get_bound_location():
3127
2998
raise errors.LocalRequiresBoundBranch()
3128
2999
3129
if message is not None:
3130
try:
3131
file_exists = osutils.lexists(message)
3132
except UnicodeError:
3133
# The commit message contains unicode characters that can't be
3134
# represented in the filesystem encoding, so that can't be a
3135
# file.
3136
file_exists = False
3137
if file_exists:
3138
warning_msg = (
3139
'The commit message is a file name: "%(f)s".\n'
3140
'(use --file "%(f)s" to take commit message from that file)'
3141
% { 'f': message })
3142
ui.ui_factory.show_warning(warning_msg)
3143
if '\r' in message:
3144
message = message.replace('\r\n', '\n')
3145
message = message.replace('\r', '\n')
3146
if file:
3147
raise errors.BzrCommandError(
3148
"please specify either --message or --file")
3149
3150
3000
def get_message(commit_obj):
3151
3001
"""Callback to get commit message"""
3152
if file:
3153
my_message = codecs.open(
3154
file, 'rt', osutils.get_user_encoding()).read()
3155
elif message is not None:
3156
my_message = message
3157
else:
3158
# No message supplied: make one up.
3159
# text is the status of the tree
3160
text = make_commit_message_template_encoded(tree,
3002
my_message = message
3003
if my_message is None and not file:
3004
t = make_commit_message_template_encoded(tree,
3161
3005
selected_list, diff=show_diff,
3162
3006
output_encoding=osutils.get_user_encoding())
3163
# start_message is the template generated from hooks
3164
# XXX: Warning - looks like hooks return unicode,
3165
# make_commit_message_template_encoded returns user encoding.
3166
# We probably want to be using edit_commit_message instead to
3167
# avoid this.
3168
3007
start_message = generate_commit_message_template(commit_obj)
3169
my_message = edit_commit_message_encoded(text,
3008
my_message = edit_commit_message_encoded(t,
3170
3009
start_message=start_message)
3171
3010
if my_message is None:
3172
3011
raise errors.BzrCommandError("please specify a commit"
3173
3012
" message with either --message or --file")
3013
elif my_message and file:
3014
raise errors.BzrCommandError(
3015
"please specify either --message or --file")
3016
if file:
3017
my_message = codecs.open(file, 'rt',
3018
osutils.get_user_encoding()).read()
3174
3019
if my_message == "":
3175
3020
raise errors.BzrCommandError("empty commit message specified")
3176
3021
return my_message
3177
3022
3178
# The API permits a commit with a filter of [] to mean 'select nothing'
3179
# but the command line should not do that.
3180
if not selected_list:
3181
selected_list = None
3182
3023
try:
3183
3024
tree.commit(message_callback=get_message,
3184
3025
specific_files=selected_list,
3185
3026
allow_pointless=unchanged, strict=strict, local=local,
3186
3027
reporter=None, verbose=verbose, revprops=properties,
3187
authors=author, timestamp=commit_stamp,
3188
timezone=offset,
3028
authors=author,
3189
3029
exclude=safe_relpath_files(tree, exclude))
3190
3030
except PointlessCommit:
3031
# FIXME: This should really happen before the file is read in;
3032
# perhaps prepare the commit; get the message; then actually commit
3191
3033
raise errors.BzrCommandError("No changes to commit."
3192
3034
" Use --unchanged to commit anyhow.")
3193
3035
except ConflictsInTree:
3198
3040
raise errors.BzrCommandError("Commit refused because there are"
3199
3041
" unknown files in the working tree.")
3200
3042
except errors.BoundBranchOutOfDate, e:
3201
e.extra_help = ("\n"
3202
'To commit to master branch, run update and then commit.\n'
3203
'You can also pass --local to commit to continue working '
3204
'disconnected.')
3205
raise
3043
raise errors.BzrCommandError(str(e) + "\n"
3044
'To commit to master branch, run update and then commit.\n'
3045
'You can also pass --local to commit to continue working '
3046
'disconnected.')
3206
3047
3207
3048
3208
3049
class cmd_check(Command):
3209
__doc__ = """Validate working tree structure, branch consistency and repository history.
3050
"""Validate working tree structure, branch consistency and repository history.
3210
3051
3211
3052
This command checks various invariants about branch and repository storage
3212
3053
to detect data corruption or bzr bugs.
3276
3117
3277
3118
3278
3119
class cmd_upgrade(Command):
3279
__doc__ = """Upgrade branch storage to current format.
3120
"""Upgrade branch storage to current format.
3280
3121
3281
3122
The check command or bzr developers may sometimes advise you to run
3282
3123
this command. When the default format has changed you may also be warned
3300
3141
3301
3142
3302
3143
class cmd_whoami(Command):
3303
__doc__ = """Show or set bzr user id.
3144
"""Show or set bzr user id.
3304
3145
3305
3146
:Examples:
3306
3147
Show the email of the current user::
3350
3191
3351
3192
3352
3193
class cmd_nick(Command):
3353
__doc__ = """Print or set the branch nickname.
3194
"""Print or set the branch nickname.
3354
3195
3355
3196
If unset, the tree root directory name is used as the nickname.
3356
3197
To print the current nickname, execute with no argument.
3361
3202
3362
3203
_see_also = ['info']
3363
3204
takes_args = ['nickname?']
3364
takes_options = ['directory']
3365
def run(self, nickname=None, directory=u'.'):
3366
branch = Branch.open_containing(directory)[0]
3205
def run(self, nickname=None):
3206
branch = Branch.open_containing(u'.')[0]
3367
3207
if nickname is None:
3368
3208
self.printme(branch)
3369
3209
else:
3371
3211
3372
3212
@display_command
3373
3213
def printme(self, branch):
3374
self.outf.write('%s\n' % branch.nick)
3214
print branch.nick
3375
3215
3376
3216
3377
3217
class cmd_alias(Command):
3378
__doc__ = """Set/unset and display aliases.
3218
"""Set/unset and display aliases.
3379
3219
3380
3220
:Examples:
3381
3221
Show the current aliases::
3445
3285
3446
3286
3447
3287
class cmd_selftest(Command):
3448
__doc__ = """Run internal test suite.
3288
"""Run internal test suite.
3449
3289
3450
3290
If arguments are given, they are regular expressions that say which tests
3451
3291
should run. Tests matching any expression are run, and other tests are
3478
3318
Tests that need working space on disk use a common temporary directory,
3479
3319
typically inside $TMPDIR or /tmp.
3480
3320
3481
If you set BZR_TEST_PDB=1 when running selftest, failing tests will drop
3482
into a pdb postmortem session.
3483
3484
3321
:Examples:
3485
3322
Run only tests relating to 'ignore'::
3486
3323
3495
3332
def get_transport_type(typestring):
3496
3333
"""Parse and return a transport specifier."""
3497
3334
if typestring == "sftp":
3498
from bzrlib.tests import stub_sftp
3499
return stub_sftp.SFTPAbsoluteServer
3335
from bzrlib.transport.sftp import SFTPAbsoluteServer
3336
return SFTPAbsoluteServer
3500
3337
if typestring == "memory":
3501
from bzrlib.tests import test_server
3502
return memory.MemoryServer
3338
from bzrlib.transport.memory import MemoryServer
3339
return MemoryServer
3503
3340
if typestring == "fakenfs":
3504
from bzrlib.tests import test_server
3505
return test_server.FakeNFSServer
3341
from bzrlib.transport.fakenfs import FakeNFSServer
3342
return FakeNFSServer
3506
3343
msg = "No known transport type %s. Supported types are: sftp\n" %\
3507
3344
(typestring)
3508
3345
raise errors.BzrCommandError(msg)
3523
3360
Option('lsprof-timed',
3524
3361
help='Generate lsprof output for benchmarked'
3525
3362
' sections of code.'),
3526
Option('lsprof-tests',
3527
help='Generate lsprof output for each test.'),
3528
3363
Option('cache-dir', type=str,
3529
3364
help='Cache intermediate benchmark output in this '
3530
3365
'directory.'),
3571
3406
first=False, list_only=False,
3572
3407
randomize=None, exclude=None, strict=False,
3573
3408
load_list=None, debugflag=None, starting_with=None, subunit=False,
3574
parallel=None, lsprof_tests=False):
3409
parallel=None):
3575
3410
from bzrlib.tests import selftest
3576
3411
import bzrlib.benchmarks as benchmarks
3577
3412
from bzrlib.benchmarks import tree_creator
3592
3427
raise errors.BzrCommandError("subunit not available. subunit "
3593
3428
"needs to be installed to use --subunit.")
3594
3429
self.additional_selftest_args['runner_class'] = SubUnitBzrRunner
3595
# On Windows, disable automatic conversion of '\n' to '\r\n' in
3596
# stdout, which would corrupt the subunit stream.
3597
if sys.platform == "win32" and sys.stdout.fileno() >= 0:
3598
import msvcrt
3599
msvcrt.setmode(sys.stdout.fileno(), os.O_BINARY)
3600
3430
if parallel:
3601
3431
self.additional_selftest_args.setdefault(
3602
3432
'suite_decorators', []).append(parallel)
3606
3436
verbose = not is_quiet()
3607
3437
# TODO: should possibly lock the history file...
3608
3438
benchfile = open(".perf_history", "at", buffering=1)
3609
self.add_cleanup(benchfile.close)
3610
3439
else:
3611
3440
test_suite_factory = None
3612
3441
benchfile = None
3613
selftest_kwargs = {"verbose": verbose,
3614
"pattern": pattern,
3615
"stop_on_failure": one,
3616
"transport": transport,
3617
"test_suite_factory": test_suite_factory,
3618
"lsprof_timed": lsprof_timed,
3619
"lsprof_tests": lsprof_tests,
3620
"bench_history": benchfile,
3621
"matching_tests_first": first,
3622
"list_only": list_only,
3623
"random_seed": randomize,
3624
"exclude_pattern": exclude,
3625
"strict": strict,
3626
"load_list": load_list,
3627
"debug_flags": debugflag,
3628
"starting_with": starting_with
3629
}
3630
selftest_kwargs.update(self.additional_selftest_args)
3631
result = selftest(**selftest_kwargs)
3442
try:
3443
selftest_kwargs = {"verbose": verbose,
3444
"pattern": pattern,
3445
"stop_on_failure": one,
3446
"transport": transport,
3447
"test_suite_factory": test_suite_factory,
3448
"lsprof_timed": lsprof_timed,
3449
"bench_history": benchfile,
3450
"matching_tests_first": first,
3451
"list_only": list_only,
3452
"random_seed": randomize,
3453
"exclude_pattern": exclude,
3454
"strict": strict,
3455
"load_list": load_list,
3456
"debug_flags": debugflag,
3457
"starting_with": starting_with
3458
}
3459
selftest_kwargs.update(self.additional_selftest_args)
3460
result = selftest(**selftest_kwargs)
3461
finally:
3462
if benchfile is not None:
3463
benchfile.close()
3632
3464
return int(not result)
3633
3465
3634
3466
3635
3467
class cmd_version(Command):
3636
__doc__ = """Show version of bzr."""
3468
"""Show version of bzr."""
3637
3469
3638
3470
encoding_type = 'replace'
3639
3471
takes_options = [
3650
3482
3651
3483
3652
3484
class cmd_rocks(Command):
3653
__doc__ = """Statement of optimism."""
3485
"""Statement of optimism."""
3654
3486
3655
3487
hidden = True
3656
3488
3657
3489
@display_command
3658
3490
def run(self):
3659
self.outf.write("It sure does!\n")
3491
print "It sure does!"
3660
3492
3661
3493
3662
3494
class cmd_find_merge_base(Command):
3663
__doc__ = """Find and print a base revision for merging two branches."""
3495
"""Find and print a base revision for merging two branches."""
3664
3496
# TODO: Options to specify revisions on either side, as if
3665
3497
# merging only part of the history.
3666
3498
takes_args = ['branch', 'other']
3672
3504
3673
3505
branch1 = Branch.open_containing(branch)[0]
3674
3506
branch2 = Branch.open_containing(other)[0]
3675
self.add_cleanup(branch1.lock_read().unlock)
3676
self.add_cleanup(branch2.lock_read().unlock)
3677
last1 = ensure_null(branch1.last_revision())
3678
last2 = ensure_null(branch2.last_revision())
3679
3680
graph = branch1.repository.get_graph(branch2.repository)
3681
base_rev_id = graph.find_unique_lca(last1, last2)
3682
3683
self.outf.write('merge base is revision %s\n' % base_rev_id)
3507
branch1.lock_read()
3508
try:
3509
branch2.lock_read()
3510
try:
3511
last1 = ensure_null(branch1.last_revision())
3512
last2 = ensure_null(branch2.last_revision())
3513
3514
graph = branch1.repository.get_graph(branch2.repository)
3515
base_rev_id = graph.find_unique_lca(last1, last2)
3516
3517
print 'merge base is revision %s' % base_rev_id
3518
finally:
3519
branch2.unlock()
3520
finally:
3521
branch1.unlock()
3684
3522
3685
3523
3686
3524
class cmd_merge(Command):
3687
__doc__ = """Perform a three-way merge.
3525
"""Perform a three-way merge.
3688
3526
3689
3527
The source of the merge can be specified either in the form of a branch,
3690
3528
or in the form of a path to a file containing a merge directive generated
3719
3557
committed to record the result of the merge.
3720
3558
3721
3559
merge refuses to run if there are any uncommitted changes, unless
3722
--force is given. The --force option can also be used to create a
3723
merge revision which has more than two parents.
3724
3725
If one would like to merge changes from the working tree of the other
3726
branch without merging any committed revisions, the --uncommitted option
3727
can be given.
3560
--force is given.
3728
3561
3729
3562
To select only some changes to merge, use "merge -i", which will prompt
3730
3563
you to apply each diff hunk and file change, similar to "shelve".
3742
3575
3743
3576
bzr merge -r 81..82 ../bzr.dev
3744
3577
3745
To apply a merge directive contained in /tmp/merge::
3578
To apply a merge directive contained in /tmp/merge:
3746
3579
3747
3580
bzr merge /tmp/merge
3748
3749
To create a merge revision with three parents from two branches
3750
feature1a and feature1b:
3751
3752
bzr merge ../feature1a
3753
bzr merge ../feature1b --force
3754
bzr commit -m 'revision with three parents'
3755
3581
"""
3756
3582
3757
3583
encoding_type = 'exact'
3773
3599
' completely merged into the source, pull from the'
3774
3600
' source rather than merging. When this happens,'
3775
3601
' you do not need to commit the result.'),
3776
custom_help('directory',
3602
Option('directory',
3777
3603
help='Branch to merge into, '
3778
'rather than the one containing the working directory.'),
3604
'rather than the one containing the working directory.',
3605
short_name='d',
3606
type=unicode,
3607
),
3779
3608
Option('preview', help='Instead of merging, show a diff of the'
3780
3609
' merge.'),
3781
3610
Option('interactive', help='Select changes interactively.',
3799
3628
verified = 'inapplicable'
3800
3629
tree = WorkingTree.open_containing(directory)[0]
3801
3630
3631
# die as quickly as possible if there are uncommitted changes
3802
3632
try:
3803
3633
basis_tree = tree.revision_tree(tree.last_revision())
3804
3634
except errors.NoSuchRevision:
3805
3635
basis_tree = tree.basis_tree()
3806
3807
# die as quickly as possible if there are uncommitted changes
3808
3636
if not force:
3809
if tree.has_changes():
3637
if tree.has_changes(basis_tree):
3810
3638
raise errors.UncommittedChanges(tree)
3811
3639
3812
3640
view_info = _get_view_info_for_change_reporter(tree)
3813
3641
change_reporter = delta._ChangeReporter(
3814
3642
unversioned_filter=tree.is_ignored, view_info=view_info)
3815
pb = ui.ui_factory.nested_progress_bar()
3816
self.add_cleanup(pb.finished)
3817
self.add_cleanup(tree.lock_write().unlock)
3818
if location is not None:
3819
try:
3820
mergeable = bundle.read_mergeable_from_url(location,
3821
possible_transports=possible_transports)
3822
except errors.NotABundle:
3823
mergeable = None
3643
cleanups = []
3644
try:
3645
pb = ui.ui_factory.nested_progress_bar()
3646
cleanups.append(pb.finished)
3647
tree.lock_write()
3648
cleanups.append(tree.unlock)
3649
if location is not None:
3650
try:
3651
mergeable = bundle.read_mergeable_from_url(location,
3652
possible_transports=possible_transports)
3653
except errors.NotABundle:
3654
mergeable = None
3655
else:
3656
if uncommitted:
3657
raise errors.BzrCommandError('Cannot use --uncommitted'
3658
' with bundles or merge directives.')
3659
3660
if revision is not None:
3661
raise errors.BzrCommandError(
3662
'Cannot use -r with merge directives or bundles')
3663
merger, verified = _mod_merge.Merger.from_mergeable(tree,
3664
mergeable, pb)
3665
3666
if merger is None and uncommitted:
3667
if revision is not None and len(revision) > 0:
3668
raise errors.BzrCommandError('Cannot use --uncommitted and'
3669
' --revision at the same time.')
3670
merger = self.get_merger_from_uncommitted(tree, location, pb,
3671
cleanups)
3672
allow_pending = False
3673
3674
if merger is None:
3675
merger, allow_pending = self._get_merger_from_branch(tree,
3676
location, revision, remember, possible_transports, pb)
3677
3678
merger.merge_type = merge_type
3679
merger.reprocess = reprocess
3680
merger.show_base = show_base
3681
self.sanity_check_merger(merger)
3682
if (merger.base_rev_id == merger.other_rev_id and
3683
merger.other_rev_id is not None):
3684
note('Nothing to do.')
3685
return 0
3686
if pull:
3687
if merger.interesting_files is not None:
3688
raise errors.BzrCommandError('Cannot pull individual files')
3689
if (merger.base_rev_id == tree.last_revision()):
3690
result = tree.pull(merger.other_branch, False,
3691
merger.other_rev_id)
3692
result.report(self.outf)
3693
return 0
3694
merger.check_basis(False)
3695
if preview:
3696
return self._do_preview(merger, cleanups)
3697
elif interactive:
3698
return self._do_interactive(merger, cleanups)
3824
3699
else:
3825
if uncommitted:
3826
raise errors.BzrCommandError('Cannot use --uncommitted'
3827
' with bundles or merge directives.')
3828
3829
if revision is not None:
3830
raise errors.BzrCommandError(
3831
'Cannot use -r with merge directives or bundles')
3832
merger, verified = _mod_merge.Merger.from_mergeable(tree,
3833
mergeable, None)
3834
3835
if merger is None and uncommitted:
3836
if revision is not None and len(revision) > 0:
3837
raise errors.BzrCommandError('Cannot use --uncommitted and'
3838
' --revision at the same time.')
3839
merger = self.get_merger_from_uncommitted(tree, location, None)
3840
allow_pending = False
3841
3842
if merger is None:
3843
merger, allow_pending = self._get_merger_from_branch(tree,
3844
location, revision, remember, possible_transports, None)
3845
3846
merger.merge_type = merge_type
3847
merger.reprocess = reprocess
3848
merger.show_base = show_base
3849
self.sanity_check_merger(merger)
3850
if (merger.base_rev_id == merger.other_rev_id and
3851
merger.other_rev_id is not None):
3852
note('Nothing to do.')
3853
return 0
3854
if pull:
3855
if merger.interesting_files is not None:
3856
raise errors.BzrCommandError('Cannot pull individual files')
3857
if (merger.base_rev_id == tree.last_revision()):
3858
result = tree.pull(merger.other_branch, False,
3859
merger.other_rev_id)
3860
result.report(self.outf)
3861
return 0
3862
if merger.this_basis is None:
3863
raise errors.BzrCommandError(
3864
"This branch has no commits."
3865
" (perhaps you would prefer 'bzr pull')")
3866
if preview:
3867
return self._do_preview(merger)
3868
elif interactive:
3869
return self._do_interactive(merger)
3870
else:
3871
return self._do_merge(merger, change_reporter, allow_pending,
3872
verified)
3873
3874
def _get_preview(self, merger):
3700
return self._do_merge(merger, change_reporter, allow_pending,
3701
verified)
3702
finally:
3703
for cleanup in reversed(cleanups):
3704
cleanup()
3705
3706
def _get_preview(self, merger, cleanups):
3875
3707
tree_merger = merger.make_merger()
3876
3708
tt = tree_merger.make_preview_transform()
3877
self.add_cleanup(tt.finalize)
3709
cleanups.append(tt.finalize)
3878
3710
result_tree = tt.get_preview_tree()
3879
3711
return result_tree
3880
3712
3881
def _do_preview(self, merger):
3713
def _do_preview(self, merger, cleanups):
3882
3714
from bzrlib.diff import show_diff_trees
3883
result_tree = self._get_preview(merger)
3715
result_tree = self._get_preview(merger, cleanups)
3884
3716
show_diff_trees(merger.this_tree, result_tree, self.outf,
3885
3717
old_label='', new_label='')
3886
3718
3896
3728
else:
3897
3729
return 0
3898
3730
3899
def _do_interactive(self, merger):
3731
def _do_interactive(self, merger, cleanups):
3900
3732
"""Perform an interactive merge.
3901
3733
3902
3734
This works by generating a preview tree of the merge, then using
3904
3736
and the preview tree.
3905
3737
"""
3906
3738
from bzrlib import shelf_ui
3907
result_tree = self._get_preview(merger)
3739
result_tree = self._get_preview(merger, cleanups)
3908
3740
writer = bzrlib.option.diff_writer_registry.get()
3909
3741
shelver = shelf_ui.Shelver(merger.this_tree, result_tree, destroy=True,
3910
3742
reporter=shelf_ui.ApplyReporter(),
3911
3743
diff_writer=writer(sys.stdout))
3912
try:
3913
shelver.run()
3914
finally:
3915
shelver.finalize()
3744
shelver.run()
3916
3745
3917
3746
def sanity_check_merger(self, merger):
3918
3747
if (merger.show_base and
3978
3807
allow_pending = True
3979
3808
return merger, allow_pending
3980
3809
3981
def get_merger_from_uncommitted(self, tree, location, pb):
3810
def get_merger_from_uncommitted(self, tree, location, pb, cleanups):
3982
3811
"""Get a merger for uncommitted changes.
3983
3812
3984
3813
:param tree: The tree the merger should apply to.
3985
3814
:param location: The location containing uncommitted changes.
3986
3815
:param pb: The progress bar to use for showing progress.
3816
:param cleanups: A list of operations to perform to clean up the
3817
temporary directories, unfinalized objects, etc.
3987
3818
"""
3988
3819
location = self._select_branch_location(tree, location)[0]
3989
3820
other_tree, other_path = WorkingTree.open_containing(location)
4041
3872
4042
3873
4043
3874
class cmd_remerge(Command):
4044
__doc__ = """Redo a merge.
3875
"""Redo a merge.
4045
3876
4046
3877
Use this if you want to try a different merge technique while resolving
4047
3878
conflicts. Some merge techniques are better than others, and remerge
4072
3903
4073
3904
def run(self, file_list=None, merge_type=None, show_base=False,
4074
3905
reprocess=False):
4075
from bzrlib.conflicts import restore
4076
3906
if merge_type is None:
4077
3907
merge_type = _mod_merge.Merge3Merger
4078
3908
tree, file_list = tree_files(file_list)
4079
self.add_cleanup(tree.lock_write().unlock)
4080
parents = tree.get_parent_ids()
4081
if len(parents) != 2:
4082
raise errors.BzrCommandError("Sorry, remerge only works after normal"
4083
" merges. Not cherrypicking or"
4084
" multi-merges.")
4085
repository = tree.branch.repository
4086
interesting_ids = None
4087
new_conflicts = []
4088
conflicts = tree.conflicts()
4089
if file_list is not None:
4090
interesting_ids = set()
4091
for filename in file_list:
4092
file_id = tree.path2id(filename)
4093
if file_id is None:
4094
raise errors.NotVersionedError(filename)
4095
interesting_ids.add(file_id)
4096
if tree.kind(file_id) != "directory":
4097
continue
3909
tree.lock_write()
3910
try:
3911
parents = tree.get_parent_ids()
3912
if len(parents) != 2:
3913
raise errors.BzrCommandError("Sorry, remerge only works after normal"
3914
" merges. Not cherrypicking or"
3915
" multi-merges.")
3916
repository = tree.branch.repository
3917
interesting_ids = None
3918
new_conflicts = []
3919
conflicts = tree.conflicts()
3920
if file_list is not None:
3921
interesting_ids = set()
3922
for filename in file_list:
3923
file_id = tree.path2id(filename)
3924
if file_id is None:
3925
raise errors.NotVersionedError(filename)
3926
interesting_ids.add(file_id)
3927
if tree.kind(file_id) != "directory":
3928
continue
4098
3929
4099
for name, ie in tree.inventory.iter_entries(file_id):
4100
interesting_ids.add(ie.file_id)
4101
new_conflicts = conflicts.select_conflicts(tree, file_list)[0]
4102
else:
4103
# Remerge only supports resolving contents conflicts
4104
allowed_conflicts = ('text conflict', 'contents conflict')
4105
restore_files = [c.path for c in conflicts
4106
if c.typestring in allowed_conflicts]
4107
_mod_merge.transform_tree(tree, tree.basis_tree(), interesting_ids)
4108
tree.set_conflicts(ConflictList(new_conflicts))
4109
if file_list is not None:
4110
restore_files = file_list
4111
for filename in restore_files:
3930
for name, ie in tree.inventory.iter_entries(file_id):
3931
interesting_ids.add(ie.file_id)
3932
new_conflicts = conflicts.select_conflicts(tree, file_list)[0]
3933
else:
3934
# Remerge only supports resolving contents conflicts
3935
allowed_conflicts = ('text conflict', 'contents conflict')
3936
restore_files = [c.path for c in conflicts
3937
if c.typestring in allowed_conflicts]
3938
_mod_merge.transform_tree(tree, tree.basis_tree(), interesting_ids)
3939
tree.set_conflicts(ConflictList(new_conflicts))
3940
if file_list is not None:
3941
restore_files = file_list
3942
for filename in restore_files:
3943
try:
3944
restore(tree.abspath(filename))
3945
except errors.NotConflicted:
3946
pass
3947
# Disable pending merges, because the file texts we are remerging
3948
# have not had those merges performed. If we use the wrong parents
3949
# list, we imply that the working tree text has seen and rejected
3950
# all the changes from the other tree, when in fact those changes
3951
# have not yet been seen.
3952
pb = ui.ui_factory.nested_progress_bar()
3953
tree.set_parent_ids(parents[:1])
4112
3954
try:
4113
restore(tree.abspath(filename))
4114
except errors.NotConflicted:
4115
pass
4116
# Disable pending merges, because the file texts we are remerging
4117
# have not had those merges performed. If we use the wrong parents
4118
# list, we imply that the working tree text has seen and rejected
4119
# all the changes from the other tree, when in fact those changes
4120
# have not yet been seen.
4121
tree.set_parent_ids(parents[:1])
4122
try:
4123
merger = _mod_merge.Merger.from_revision_ids(None, tree, parents[1])
4124
merger.interesting_ids = interesting_ids
4125
merger.merge_type = merge_type
4126
merger.show_base = show_base
4127
merger.reprocess = reprocess
4128
conflicts = merger.do_merge()
3955
merger = _mod_merge.Merger.from_revision_ids(pb,
3956
tree, parents[1])
3957
merger.interesting_ids = interesting_ids
3958
merger.merge_type = merge_type
3959
merger.show_base = show_base
3960
merger.reprocess = reprocess
3961
conflicts = merger.do_merge()
3962
finally:
3963
tree.set_parent_ids(parents)
3964
pb.finished()
4129
3965
finally:
4130
tree.set_parent_ids(parents)
3966
tree.unlock()
4131
3967
if conflicts > 0:
4132
3968
return 1
4133
3969
else:
4135
3971
4136
3972
4137
3973
class cmd_revert(Command):
4138
__doc__ = """Revert files to a previous revision.
3974
"""Revert files to a previous revision.
4139
3975
4140
3976
Giving a list of files will revert only those files. Otherwise, all files
4141
3977
will be reverted. If the revision is not specified with '--revision', the
4155
3991
name. If you name a directory, all the contents of that directory will be
4156
3992
reverted.
4157
3993
4158
If you have newly added files since the target revision, they will be
4159
removed. If the files to be removed have been changed, backups will be
4160
created as above. Directories containing unknown files will not be
4161
deleted.
3994
Any files that have been newly added since that revision will be deleted,
3995
with a backup kept if appropriate. Directories containing unknown files
3996
will not be deleted.
4162
3997
4163
The working tree contains a list of revisions that have been merged but
4164
not yet committed. These revisions will be included as additional parents
4165
of the next commit. Normally, using revert clears that list as well as
4166
reverting the files. If any files are specified, revert leaves the list
4167
of uncommitted merges alone and reverts only the files. Use ``bzr revert
4168
.`` in the tree root to revert all files but keep the recorded merges,
4169
and ``bzr revert --forget-merges`` to clear the pending merge list without
3998
The working tree contains a list of pending merged revisions, which will
3999
be included as parents in the next commit. Normally, revert clears that
4000
list as well as reverting the files. If any files are specified, revert
4001
leaves the pending merge list alone and reverts only the files. Use "bzr
4002
revert ." in the tree root to revert all files but keep the merge record,
4003
and "bzr revert --forget-merges" to clear the pending merge list without
4170
4004
reverting any files.
4171
4172
Using "bzr revert --forget-merges", it is possible to apply all of the
4173
changes from a branch in a single revision. To do this, perform the merge
4174
as desired. Then doing revert with the "--forget-merges" option will keep
4175
the content of the tree as it was, but it will clear the list of pending
4176
merges. The next commit will then contain all of the changes that are
4177
present in the other branch, but without any other parent revisions.
4178
Because this technique forgets where these changes originated, it may
4179
cause additional conflicts on later merges involving the same source and
4180
target branches.
4181
4005
"""
4182
4006
4183
4007
_see_also = ['cat', 'export']
4192
4016
def run(self, revision=None, no_backup=False, file_list=None,
4193
4017
forget_merges=None):
4194
4018
tree, file_list = tree_files(file_list)
4195
self.add_cleanup(tree.lock_tree_write().unlock)
4196
if forget_merges:
4197
tree.set_parent_ids(tree.get_parent_ids()[:1])
4198
else:
4199
self._revert_tree_to_revision(tree, revision, file_list, no_backup)
4019
tree.lock_write()
4020
try:
4021
if forget_merges:
4022
tree.set_parent_ids(tree.get_parent_ids()[:1])
4023
else:
4024
self._revert_tree_to_revision(tree, revision, file_list, no_backup)
4025
finally:
4026
tree.unlock()
4200
4027
4201
4028
@staticmethod
4202
4029
def _revert_tree_to_revision(tree, revision, file_list, no_backup):
4203
4030
rev_tree = _get_one_revision_tree('revert', revision, tree=tree)
4204
tree.revert(file_list, rev_tree, not no_backup, None,
4205
report_changes=True)
4031
pb = ui.ui_factory.nested_progress_bar()
4032
try:
4033
tree.revert(file_list, rev_tree, not no_backup, pb,
4034
report_changes=True)
4035
finally:
4036
pb.finished()
4206
4037
4207
4038
4208
4039
class cmd_assert_fail(Command):
4209
__doc__ = """Test reporting of assertion failures"""
4040
"""Test reporting of assertion failures"""
4210
4041
# intended just for use in testing
4211
4042
4212
4043
hidden = True
4216
4047
4217
4048
4218
4049
class cmd_help(Command):
4219
__doc__ = """Show help on a command or other topic.
4050
"""Show help on a command or other topic.
4220
4051
"""
4221
4052
4222
4053
_see_also = ['topics']
4235
4066
4236
4067
4237
4068
class cmd_shell_complete(Command):
4238
__doc__ = """Show appropriate completions for context.
4069
"""Show appropriate completions for context.
4239
4070
4240
4071
For a list of all available commands, say 'bzr shell-complete'.
4241
4072
"""
4250
4081
4251
4082
4252
4083
class cmd_missing(Command):
4253
__doc__ = """Show unmerged/unpulled revisions between two branches.
4084
"""Show unmerged/unpulled revisions between two branches.
4254
4085
4255
4086
OTHER_BRANCH may be local or remote.
4256
4087
4257
4088
To filter on a range of revisions, you can use the command -r begin..end
4258
4089
-r revision requests a specific revision, -r ..end or -r begin.. are
4259
4090
also valid.
4260
4261
:Exit values:
4262
1 - some missing revisions
4263
0 - no missing revisions
4264
4091
4265
4092
:Examples:
4266
4093
4334
4161
restrict = 'remote'
4335
4162
4336
4163
local_branch = Branch.open_containing(u".")[0]
4337
self.add_cleanup(local_branch.lock_read().unlock)
4338
4339
4164
parent = local_branch.get_parent()
4340
4165
if other_branch is None:
4341
4166
other_branch = parent
4350
4175
remote_branch = Branch.open(other_branch)
4351
4176
if remote_branch.base == local_branch.base:
4352
4177
remote_branch = local_branch
4353
else:
4354
self.add_cleanup(remote_branch.lock_read().unlock)
4355
4178
4356
4179
local_revid_range = _revision_range_to_revid_range(
4357
4180
_get_revision_range(my_revision, local_branch,
4361
4184
_get_revision_range(revision,
4362
4185
remote_branch, self.name()))
4363
4186
4364
local_extra, remote_extra = find_unmerged(
4365
local_branch, remote_branch, restrict,
4366
backward=not reverse,
4367
include_merges=include_merges,
4368
local_revid_range=local_revid_range,
4369
remote_revid_range=remote_revid_range)
4370
4371
if log_format is None:
4372
registry = log.log_formatter_registry
4373
log_format = registry.get_default(local_branch)
4374
lf = log_format(to_file=self.outf,
4375
show_ids=show_ids,
4376
show_timezone='original')
4377
4378
status_code = 0
4379
if local_extra and not theirs_only:
4380
message("You have %d extra revision(s):\n" %
4381
len(local_extra))
4382
for revision in iter_log_revisions(local_extra,
4383
local_branch.repository,
4384
verbose):
4385
lf.log_revision(revision)
4386
printed_local = True
4387
status_code = 1
4388
else:
4389
printed_local = False
4390
4391
if remote_extra and not mine_only:
4392
if printed_local is True:
4393
message("\n\n\n")
4394
message("You are missing %d revision(s):\n" %
4395
len(remote_extra))
4396
for revision in iter_log_revisions(remote_extra,
4397
remote_branch.repository,
4398
verbose):
4399
lf.log_revision(revision)
4400
status_code = 1
4401
4402
if mine_only and not local_extra:
4403
# We checked local, and found nothing extra
4404
message('This branch is up to date.\n')
4405
elif theirs_only and not remote_extra:
4406
# We checked remote, and found nothing extra
4407
message('Other branch is up to date.\n')
4408
elif not (mine_only or theirs_only or local_extra or
4409
remote_extra):
4410
# We checked both branches, and neither one had extra
4411
# revisions
4412
message("Branches are up to date.\n")
4413
self.cleanup_now()
4187
local_branch.lock_read()
4188
try:
4189
remote_branch.lock_read()
4190
try:
4191
local_extra, remote_extra = find_unmerged(
4192
local_branch, remote_branch, restrict,
4193
backward=not reverse,
4194
include_merges=include_merges,
4195
local_revid_range=local_revid_range,
4196
remote_revid_range=remote_revid_range)
4197
4198
if log_format is None:
4199
registry = log.log_formatter_registry
4200
log_format = registry.get_default(local_branch)
4201
lf = log_format(to_file=self.outf,
4202
show_ids=show_ids,
4203
show_timezone='original')
4204
4205
status_code = 0
4206
if local_extra and not theirs_only:
4207
message("You have %d extra revision(s):\n" %
4208
len(local_extra))
4209
for revision in iter_log_revisions(local_extra,
4210
local_branch.repository,
4211
verbose):
4212
lf.log_revision(revision)
4213
printed_local = True
4214
status_code = 1
4215
else:
4216
printed_local = False
4217
4218
if remote_extra and not mine_only:
4219
if printed_local is True:
4220
message("\n\n\n")
4221
message("You are missing %d revision(s):\n" %
4222
len(remote_extra))
4223
for revision in iter_log_revisions(remote_extra,
4224
remote_branch.repository,
4225
verbose):
4226
lf.log_revision(revision)
4227
status_code = 1
4228
4229
if mine_only and not local_extra:
4230
# We checked local, and found nothing extra
4231
message('This branch is up to date.\n')
4232
elif theirs_only and not remote_extra:
4233
# We checked remote, and found nothing extra
4234
message('Other branch is up to date.\n')
4235
elif not (mine_only or theirs_only or local_extra or
4236
remote_extra):
4237
# We checked both branches, and neither one had extra
4238
# revisions
4239
message("Branches are up to date.\n")
4240
finally:
4241
remote_branch.unlock()
4242
finally:
4243
local_branch.unlock()
4414
4244
if not status_code and parent is None and other_branch is not None:
4415
self.add_cleanup(local_branch.lock_write().unlock)
4416
# handle race conditions - a parent might be set while we run.
4417
if local_branch.get_parent() is None:
4418
local_branch.set_parent(remote_branch.base)
4245
local_branch.lock_write()
4246
try:
4247
# handle race conditions - a parent might be set while we run.
4248
if local_branch.get_parent() is None:
4249
local_branch.set_parent(remote_branch.base)
4250
finally:
4251
local_branch.unlock()
4419
4252
return status_code
4420
4253
4421
4254
4422
4255
class cmd_pack(Command):
4423
__doc__ = """Compress the data within a repository.
4424
4425
This operation compresses the data within a bazaar repository. As
4426
bazaar supports automatic packing of repository, this operation is
4427
normally not required to be done manually.
4428
4429
During the pack operation, bazaar takes a backup of existing repository
4430
data, i.e. pack files. This backup is eventually removed by bazaar
4431
automatically when it is safe to do so. To save disk space by removing
4432
the backed up pack files, the --clean-obsolete-packs option may be
4433
used.
4434
4435
Warning: If you use --clean-obsolete-packs and your machine crashes
4436
during or immediately after repacking, you may be left with a state
4437
where the deletion has been written to disk but the new packs have not
4438
been. In this case the repository may be unusable.
4439
"""
4256
"""Compress the data within a repository."""
4440
4257
4441
4258
_see_also = ['repositories']
4442
4259
takes_args = ['branch_or_repo?']
4443
takes_options = [
4444
Option('clean-obsolete-packs', 'Delete obsolete packs to save disk space.'),
4445
]
4446
4260
4447
def run(self, branch_or_repo='.', clean_obsolete_packs=False):
4261
def run(self, branch_or_repo='.'):
4448
4262
dir = bzrdir.BzrDir.open_containing(branch_or_repo)[0]
4449
4263
try:
4450
4264
branch = dir.open_branch()
4451
4265
repository = branch.repository
4452
4266
except errors.NotBranchError:
4453
4267
repository = dir.open_repository()
4454
repository.pack(clean_obsolete_packs=clean_obsolete_packs)
4268
repository.pack()
4455
4269
4456
4270
4457
4271
class cmd_plugins(Command):
4458
__doc__ = """List the installed plugins.
4272
"""List the installed plugins.
4459
4273
4460
4274
This command displays the list of installed plugins including
4461
4275
version of plugin and a short description of each.
4468
4282
adding new commands, providing additional network transports and
4469
4283
customizing log output.
4470
4284
4471
See the Bazaar Plugin Guide <http://doc.bazaar.canonical.com/plugins/en/>
4472
for further information on plugins including where to find them and how to
4473
install them. Instructions are also provided there on how to write new
4474
plugins using the Python programming language.
4285
See the Bazaar web site, http://bazaar-vcs.org, for further
4286
information on plugins including where to find them and how to
4287
install them. Instructions are also provided there on how to
4288
write new plugins using the Python programming language.
4475
4289
"""
4476
4290
takes_options = ['verbose']
4477
4291
4492
4306
doc = '(no description)'
4493
4307
result.append((name_ver, doc, plugin.path()))
4494
4308
for name_ver, doc, path in sorted(result):
4495
self.outf.write("%s\n" % name_ver)
4496
self.outf.write(" %s\n" % doc)
4309
print name_ver
4310
print ' ', doc
4497
4311
if verbose:
4498
self.outf.write(" %s\n" % path)
4499
self.outf.write("\n")
4312
print ' ', path
4313
print
4500
4314
4501
4315
4502
4316
class cmd_testament(Command):
4503
__doc__ = """Show testament (signing-form) of a revision."""
4317
"""Show testament (signing-form) of a revision."""
4504
4318
takes_options = [
4505
4319
'revision',
4506
4320
Option('long', help='Produce long-format testament.'),
4518
4332
b = Branch.open_containing(branch)[0]
4519
4333
else:
4520
4334
b = Branch.open(branch)
4521
self.add_cleanup(b.lock_read().unlock)
4522
if revision is None:
4523
rev_id = b.last_revision()
4524
else:
4525
rev_id = revision[0].as_revision_id(b)
4526
t = testament_class.from_revision(b.repository, rev_id)
4527
if long:
4528
sys.stdout.writelines(t.as_text_lines())
4529
else:
4530
sys.stdout.write(t.as_short_text())
4335
b.lock_read()
4336
try:
4337
if revision is None:
4338
rev_id = b.last_revision()
4339
else:
4340
rev_id = revision[0].as_revision_id(b)
4341
t = testament_class.from_revision(b.repository, rev_id)
4342
if long:
4343
sys.stdout.writelines(t.as_text_lines())
4344
else:
4345
sys.stdout.write(t.as_short_text())
4346
finally:
4347
b.unlock()
4531
4348
4532
4349
4533
4350
class cmd_annotate(Command):
4534
__doc__ = """Show the origin of each line in a file.
4351
"""Show the origin of each line in a file.
4535
4352
4536
4353
This prints out the given file with an annotation on the left side
4537
4354
indicating which revision, author and date introduced the change.
4548
4365
Option('long', help='Show commit date in annotations.'),
4549
4366
'revision',
4550
4367
'show-ids',
4551
'directory',
4552
4368
]
4553
4369
encoding_type = 'exact'
4554
4370
4555
4371
@display_command
4556
4372
def run(self, filename, all=False, long=False, revision=None,
4557
show_ids=False, directory=None):
4373
show_ids=False):
4558
4374
from bzrlib.annotate import annotate_file, annotate_file_tree
4559
4375
wt, branch, relpath = \
4560
_open_directory_or_containing_tree_or_branch(filename, directory)
4561
if wt is not None:
4562
self.add_cleanup(wt.lock_read().unlock)
4563
else:
4564
self.add_cleanup(branch.lock_read().unlock)
4565
tree = _get_one_revision_tree('annotate', revision, branch=branch)
4566
self.add_cleanup(tree.lock_read().unlock)
4567
if wt is not None:
4568
file_id = wt.path2id(relpath)
4569
else:
4570
file_id = tree.path2id(relpath)
4571
if file_id is None:
4572
raise errors.NotVersionedError(filename)
4573
file_version = tree.inventory[file_id].revision
4574
if wt is not None and revision is None:
4575
# If there is a tree and we're not annotating historical
4576
# versions, annotate the working tree's content.
4577
annotate_file_tree(wt, file_id, self.outf, long, all,
4578
show_ids=show_ids)
4579
else:
4580
annotate_file(branch, file_version, file_id, long, all, self.outf,
4581
show_ids=show_ids)
4376
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
4377
if wt is not None:
4378
wt.lock_read()
4379
else:
4380
branch.lock_read()
4381
try:
4382
tree = _get_one_revision_tree('annotate', revision, branch=branch)
4383
if wt is not None:
4384
file_id = wt.path2id(relpath)
4385
else:
4386
file_id = tree.path2id(relpath)
4387
if file_id is None:
4388
raise errors.NotVersionedError(filename)
4389
file_version = tree.inventory[file_id].revision
4390
if wt is not None and revision is None:
4391
# If there is a tree and we're not annotating historical
4392
# versions, annotate the working tree's content.
4393
annotate_file_tree(wt, file_id, self.outf, long, all,
4394
show_ids=show_ids)
4395
else:
4396
annotate_file(branch, file_version, file_id, long, all, self.outf,
4397
show_ids=show_ids)
4398
finally:
4399
if wt is not None:
4400
wt.unlock()
4401
else:
4402
branch.unlock()
4582
4403
4583
4404
4584
4405
class cmd_re_sign(Command):
4585
__doc__ = """Create a digital signature for an existing revision."""
4406
"""Create a digital signature for an existing revision."""
4586
4407
# TODO be able to replace existing ones.
4587
4408
4588
4409
hidden = True # is this right ?
4589
4410
takes_args = ['revision_id*']
4590
takes_options = ['directory', 'revision']
4411
takes_options = ['revision']
4591
4412
4592
def run(self, revision_id_list=None, revision=None, directory=u'.'):
4413
def run(self, revision_id_list=None, revision=None):
4593
4414
if revision_id_list is not None and revision is not None:
4594
4415
raise errors.BzrCommandError('You can only supply one of revision_id or --revision')
4595
4416
if revision_id_list is None and revision is None:
4596
4417
raise errors.BzrCommandError('You must supply either --revision or a revision_id')
4597
b = WorkingTree.open_containing(directory)[0].branch
4598
self.add_cleanup(b.lock_write().unlock)
4599
return self._run(b, revision_id_list, revision)
4418
b = WorkingTree.open_containing(u'.')[0].branch
4419
b.lock_write()
4420
try:
4421
return self._run(b, revision_id_list, revision)
4422
finally:
4423
b.unlock()
4600
4424
4601
4425
def _run(self, b, revision_id_list, revision):
4602
4426
import bzrlib.gpg as gpg
4647
4471
4648
4472
4649
4473
class cmd_bind(Command):
4650
__doc__ = """Convert the current branch into a checkout of the supplied branch.
4651
If no branch is supplied, rebind to the last bound location.
4474
"""Convert the current branch into a checkout of the supplied branch.
4652
4475
4653
4476
Once converted into a checkout, commits must succeed on the master branch
4654
4477
before they will be applied to the local branch.
4655
4478
4656
4479
Bound branches use the nickname of its master branch unless it is set
4657
locally, in which case binding will update the local nickname to be
4480
locally, in which case binding will update the the local nickname to be
4658
4481
that of the master.
4659
4482
"""
4660
4483
4661
4484
_see_also = ['checkouts', 'unbind']
4662
4485
takes_args = ['location?']
4663
takes_options = ['directory']
4486
takes_options = []
4664
4487
4665
def run(self, location=None, directory=u'.'):
4666
b, relpath = Branch.open_containing(directory)
4488
def run(self, location=None):
4489
b, relpath = Branch.open_containing(u'.')
4667
4490
if location is None:
4668
4491
try:
4669
4492
location = b.get_old_bound_location()
4672
4495
'This format does not remember old locations.')
4673
4496
else:
4674
4497
if location is None:
4675
if b.get_bound_location() is not None:
4676
raise errors.BzrCommandError('Branch is already bound')
4677
else:
4678
raise errors.BzrCommandError('No location supplied '
4679
'and no previous location known')
4498
raise errors.BzrCommandError('No location supplied and no '
4499
'previous location known')
4680
4500
b_other = Branch.open(location)
4681
4501
try:
4682
4502
b.bind(b_other)
4688
4508
4689
4509
4690
4510
class cmd_unbind(Command):
4691
__doc__ = """Convert the current checkout into a regular branch.
4511
"""Convert the current checkout into a regular branch.
4692
4512
4693
4513
After unbinding, the local branch is considered independent and subsequent
4694
4514
commits will be local only.
4696
4516
4697
4517
_see_also = ['checkouts', 'bind']
4698
4518
takes_args = []
4699
takes_options = ['directory']
4519
takes_options = []
4700
4520
4701
def run(self, directory=u'.'):
4702
b, relpath = Branch.open_containing(directory)
4521
def run(self):
4522
b, relpath = Branch.open_containing(u'.')
4703
4523
if not b.unbind():
4704
4524
raise errors.BzrCommandError('Local branch is not bound')
4705
4525
4706
4526
4707
4527
class cmd_uncommit(Command):
4708
__doc__ = """Remove the last committed revision.
4528
"""Remove the last committed revision.
4709
4529
4710
4530
--verbose will print out what is being removed.
4711
4531
--dry-run will go through all the motions, but not actually
4751
4571
b = control.open_branch()
4752
4572
4753
4573
if tree is not None:
4754
self.add_cleanup(tree.lock_write().unlock)
4574
tree.lock_write()
4755
4575
else:
4756
self.add_cleanup(b.lock_write().unlock)
4757
return self._run(b, tree, dry_run, verbose, revision, force, local=local)
4576
b.lock_write()
4577
try:
4578
return self._run(b, tree, dry_run, verbose, revision, force,
4579
local=local)
4580
finally:
4581
if tree is not None:
4582
tree.unlock()
4583
else:
4584
b.unlock()
4758
4585
4759
4586
def _run(self, b, tree, dry_run, verbose, revision, force, local=False):
4760
4587
from bzrlib.log import log_formatter, show_log
4792
4619
end_revision=last_revno)
4793
4620
4794
4621
if dry_run:
4795
self.outf.write('Dry-run, pretending to remove'
4796
' the above revisions.\n')
4622
print 'Dry-run, pretending to remove the above revisions.'
4623
if not force:
4624
val = raw_input('Press <enter> to continue')
4797
4625
else:
4798
self.outf.write('The above revision(s) will be removed.\n')
4799
4800
if not force:
4801
if not ui.ui_factory.get_boolean('Are you sure'):
4802
self.outf.write('Canceled')
4803
return 0
4626
print 'The above revision(s) will be removed.'
4627
if not force:
4628
val = raw_input('Are you sure [y/N]? ')
4629
if val.lower() not in ('y', 'yes'):
4630
print 'Canceled'
4631
return 0
4804
4632
4805
4633
mutter('Uncommitting from {%s} to {%s}',
4806
4634
last_rev_id, rev_id)
4807
4635
uncommit(b, tree=tree, dry_run=dry_run, verbose=verbose,
4808
4636
revno=revno, local=local)
4809
self.outf.write('You can restore the old tip by running:\n'
4810
' bzr pull . -r revid:%s\n' % last_rev_id)
4637
note('You can restore the old tip by running:\n'
4638
' bzr pull . -r revid:%s', last_rev_id)
4811
4639
4812
4640
4813
4641
class cmd_break_lock(Command):
4814
__doc__ = """Break a dead lock on a repository, branch or working directory.
4642
"""Break a dead lock on a repository, branch or working directory.
4815
4643
4816
4644
CAUTION: Locks should only be broken when you are sure that the process
4817
4645
holding the lock has been stopped.
4818
4646
4819
You can get information on what locks are open via the 'bzr info
4820
[location]' command.
4647
You can get information on what locks are open via the 'bzr info' command.
4821
4648
4822
4649
:Examples:
4823
4650
bzr break-lock
4824
bzr break-lock bzr+ssh://example.com/bzr/foo
4825
4651
"""
4826
4652
takes_args = ['location?']
4827
4653
4836
4662
4837
4663
4838
4664
class cmd_wait_until_signalled(Command):
4839
__doc__ = """Test helper for test_start_and_stop_bzr_subprocess_send_signal.
4665
"""Test helper for test_start_and_stop_bzr_subprocess_send_signal.
4840
4666
4841
4667
This just prints a line to signal when it is ready, then blocks on stdin.
4842
4668
"""
4850
4676
4851
4677
4852
4678
class cmd_serve(Command):
4853
__doc__ = """Run the bzr server."""
4679
"""Run the bzr server."""
4854
4680
4855
4681
aliases = ['server']
4856
4682
4857
4683
takes_options = [
4858
4684
Option('inet',
4859
4685
help='Serve on stdin/out for use from inetd or sshd.'),
4860
RegistryOption('protocol',
4861
help="Protocol to serve.",
4686
RegistryOption('protocol',
4687
help="Protocol to serve.",
4862
4688
lazy_registry=('bzrlib.transport', 'transport_server_registry'),
4863
4689
value_switches=True),
4864
4690
Option('port',
4867
4693
'result in a dynamically allocated port. The default port '
4868
4694
'depends on the protocol.',
4869
4695
type=str),
4870
custom_help('directory',
4871
help='Serve contents of this directory.'),
4696
Option('directory',
4697
help='Serve contents of this directory.',
4698
type=unicode),
4872
4699
Option('allow-writes',
4873
4700
help='By default the server is a readonly server. Supplying '
4874
4701
'--allow-writes enables write access to the contents of '
4875
'the served directory and below. Note that ``bzr serve`` '
4876
'does not perform authentication, so unless some form of '
4877
'external authentication is arranged supplying this '
4878
'option leads to global uncontrolled write access to your '
4879
'file system.'
4702
'the served directory and below.'
4880
4703
),
4881
4704
]
4882
4705
4915
4738
4916
4739
4917
4740
class cmd_join(Command):
4918
__doc__ = """Combine a tree into its containing tree.
4741
"""Combine a tree into its containing tree.
4919
4742
4920
4743
This command requires the target tree to be in a rich-root format.
4921
4744
4961
4784
4962
4785
4963
4786
class cmd_split(Command):
4964
__doc__ = """Split a subdirectory of a tree into a separate tree.
4787
"""Split a subdirectory of a tree into a separate tree.
4965
4788
4966
4789
This command will produce a target tree in a format that supports
4967
4790
rich roots, like 'rich-root' or 'rich-root-pack'. These formats cannot be
4987
4810
4988
4811
4989
4812
class cmd_merge_directive(Command):
4990
__doc__ = """Generate a merge directive for auto-merge tools.
4813
"""Generate a merge directive for auto-merge tools.
4991
4814
4992
4815
A directive requests a merge to be performed, and also provides all the
4993
4816
information necessary to do so. This means it must either include a
5086
4909
5087
4910
5088
4911
class cmd_send(Command):
5089
__doc__ = """Mail or create a merge-directive for submitting changes.
4912
"""Mail or create a merge-directive for submitting changes.
5090
4913
5091
4914
A merge directive provides many things needed for requesting merges:
5092
4915
5098
4921
directly from the merge directive, without retrieving data from a
5099
4922
branch.
5100
4923
5101
`bzr send` creates a compact data set that, when applied using bzr
5102
merge, has the same effect as merging from the source branch.
5103
5104
By default the merge directive is self-contained and can be applied to any
5105
branch containing submit_branch in its ancestory without needing access to
5106
the source branch.
5107
5108
If --no-bundle is specified, then Bazaar doesn't send the contents of the
5109
revisions, but only a structured request to merge from the
5110
public_location. In that case the public_branch is needed and it must be
5111
up-to-date and accessible to the recipient. The public_branch is always
5112
included if known, so that people can check it later.
5113
5114
The submit branch defaults to the parent of the source branch, but can be
5115
overridden. Both submit branch and public branch will be remembered in
5116
branch.conf the first time they are used for a particular branch. The
5117
source branch defaults to that containing the working directory, but can
5118
be changed using --from.
5119
5120
In order to calculate those changes, bzr must analyse the submit branch.
5121
Therefore it is most efficient for the submit branch to be a local mirror.
5122
If a public location is known for the submit_branch, that location is used
5123
in the merge directive.
5124
5125
The default behaviour is to send the merge directive by mail, unless -o is
5126
given, in which case it is sent to a file.
4924
If --no-bundle is specified, then public_branch is needed (and must be
4925
up-to-date), so that the receiver can perform the merge using the
4926
public_branch. The public_branch is always included if known, so that
4927
people can check it later.
4928
4929
The submit branch defaults to the parent, but can be overridden. Both
4930
submit branch and public branch will be remembered if supplied.
4931
4932
If a public_branch is known for the submit_branch, that public submit
4933
branch is used in the merge instructions. This means that a local mirror
4934
can be used as your actual submit branch, once you have set public_branch
4935
for that mirror.
5127
4936
5128
4937
Mail is sent using your preferred mail program. This should be transparent
5129
4938
on Windows (it uses MAPI). On Linux, it requires the xdg-email utility.
5131
4940
5132
4941
To use a specific mail program, set the mail_client configuration option.
5133
4942
(For Thunderbird 1.5, this works around some bugs.) Supported values for
5134
specific clients are "claws", "evolution", "kmail", "mail.app" (MacOS X's
5135
Mail.app), "mutt", and "thunderbird"; generic options are "default",
5136
"editor", "emacsclient", "mapi", and "xdg-email". Plugins may also add
5137
supported clients.
4943
specific clients are "claws", "evolution", "kmail", "mutt", and
4944
"thunderbird"; generic options are "default", "editor", "emacsclient",
4945
"mapi", and "xdg-email". Plugins may also add supported clients.
5138
4946
5139
4947
If mail is being sent, a to address is required. This can be supplied
5140
4948
either on the commandline, by setting the submit_to configuration
5149
4957
5150
4958
The merge directives created by bzr send may be applied using bzr merge or
5151
4959
bzr pull by specifying a file containing a merge directive as the location.
5152
5153
bzr send makes extensive use of public locations to map local locations into
5154
URLs that can be used by other people. See `bzr help configuration` to
5155
set them, and use `bzr info` to display them.
5156
4960
"""
5157
4961
5158
4962
encoding_type = 'exact'
5174
4978
short_name='f',
5175
4979
type=unicode),
5176
4980
Option('output', short_name='o',
5177
help='Write merge directive to this file or directory; '
4981
help='Write merge directive to this file; '
5178
4982
'use - for stdout.',
5179
4983
type=unicode),
5180
4984
Option('strict',
5203
5007
5204
5008
5205
5009
class cmd_bundle_revisions(cmd_send):
5206
__doc__ = """Create a merge-directive for submitting changes.
5010
"""Create a merge-directive for submitting changes.
5207
5011
5208
5012
A merge directive provides many things needed for requesting merges:
5209
5013
5276
5080
5277
5081
5278
5082
class cmd_tag(Command):
5279
__doc__ = """Create, remove or modify a tag naming a revision.
5083
"""Create, remove or modify a tag naming a revision.
5280
5084
5281
5085
Tags give human-meaningful names to revisions. Commands that take a -r
5282
5086
(--revision) option can be given -rtag:X, where X is any previously
5290
5094
5291
5095
To rename a tag (change the name but keep it on the same revsion), run ``bzr
5292
5096
tag new-name -r tag:old-name`` and then ``bzr tag --delete oldname``.
5293
5294
If no tag name is specified it will be determined through the
5295
'automatic_tag_name' hook. This can e.g. be used to automatically tag
5296
upstream releases by reading configure.ac. See ``bzr help hooks`` for
5297
details.
5298
5097
"""
5299
5098
5300
5099
_see_also = ['commit', 'tags']
5301
takes_args = ['tag_name?']
5100
takes_args = ['tag_name']
5302
5101
takes_options = [
5303
5102
Option('delete',
5304
5103
help='Delete this tag rather than placing it.',
5305
5104
),
5306
custom_help('directory',
5307
help='Branch in which to place the tag.'),
5105
Option('directory',
5106
help='Branch in which to place the tag.',
5107
short_name='d',
5108
type=unicode,
5109
),
5308
5110
Option('force',
5309
5111
help='Replace existing tags.',
5310
5112
),
5311
5113
'revision',
5312
5114
]
5313
5115
5314
def run(self, tag_name=None,
5116
def run(self, tag_name,
5315
5117
delete=None,
5316
5118
directory='.',
5317
5119
force=None,
5318
5120
revision=None,
5319
5121
):
5320
5122
branch, relpath = Branch.open_containing(directory)
5321
self.add_cleanup(branch.lock_write().unlock)
5322
if delete:
5323
if tag_name is None:
5324
raise errors.BzrCommandError("No tag specified to delete.")
5325
branch.tags.delete_tag(tag_name)
5326
self.outf.write('Deleted tag %s.\n' % tag_name)
5327
else:
5328
if revision:
5329
if len(revision) != 1:
5330
raise errors.BzrCommandError(
5331
"Tags can only be placed on a single revision, "
5332
"not on a range")
5333
revision_id = revision[0].as_revision_id(branch)
5123
branch.lock_write()
5124
try:
5125
if delete:
5126
branch.tags.delete_tag(tag_name)
5127
self.outf.write('Deleted tag %s.\n' % tag_name)
5334
5128
else:
5335
revision_id = branch.last_revision()
5336
if tag_name is None:
5337
tag_name = branch.automatic_tag_name(revision_id)
5338
if tag_name is None:
5339
raise errors.BzrCommandError(
5340
"Please specify a tag name.")
5341
if (not force) and branch.tags.has_tag(tag_name):
5342
raise errors.TagAlreadyExists(tag_name)
5343
branch.tags.set_tag(tag_name, revision_id)
5344
self.outf.write('Created tag %s.\n' % tag_name)
5129
if revision:
5130
if len(revision) != 1:
5131
raise errors.BzrCommandError(
5132
"Tags can only be placed on a single revision, "
5133
"not on a range")
5134
revision_id = revision[0].as_revision_id(branch)
5135
else:
5136
revision_id = branch.last_revision()
5137
if (not force) and branch.tags.has_tag(tag_name):
5138
raise errors.TagAlreadyExists(tag_name)
5139
branch.tags.set_tag(tag_name, revision_id)
5140
self.outf.write('Created tag %s.\n' % tag_name)
5141
finally:
5142
branch.unlock()
5345
5143
5346
5144
5347
5145
class cmd_tags(Command):
5348
__doc__ = """List tags.
5146
"""List tags.
5349
5147
5350
5148
This command shows a table of tag names and the revisions they reference.
5351
5149
"""
5352
5150
5353
5151
_see_also = ['tag']
5354
5152
takes_options = [
5355
custom_help('directory',
5356
help='Branch whose tags should be displayed.'),
5153
Option('directory',
5154
help='Branch whose tags should be displayed.',
5155
short_name='d',
5156
type=unicode,
5157
),
5357
5158
RegistryOption.from_kwargs('sort',
5358
5159
'Sort tags by different criteria.', title='Sorting',
5359
5160
alpha='Sort tags lexicographically (default).',
5376
5177
if not tags:
5377
5178
return
5378
5179
5379
self.add_cleanup(branch.lock_read().unlock)
5380
if revision:
5381
graph = branch.repository.get_graph()
5382
rev1, rev2 = _get_revision_range(revision, branch, self.name())
5383
revid1, revid2 = rev1.rev_id, rev2.rev_id
5384
# only show revisions between revid1 and revid2 (inclusive)
5385
tags = [(tag, revid) for tag, revid in tags if
5386
graph.is_between(revid, revid1, revid2)]
5387
if sort == 'alpha':
5388
tags.sort()
5389
elif sort == 'time':
5390
timestamps = {}
5391
for tag, revid in tags:
5392
try:
5393
revobj = branch.repository.get_revision(revid)
5394
except errors.NoSuchRevision:
5395
timestamp = sys.maxint # place them at the end
5396
else:
5397
timestamp = revobj.timestamp
5398
timestamps[revid] = timestamp
5399
tags.sort(key=lambda x: timestamps[x[1]])
5400
if not show_ids:
5401
# [ (tag, revid), ... ] -> [ (tag, dotted_revno), ... ]
5402
for index, (tag, revid) in enumerate(tags):
5403
try:
5404
revno = branch.revision_id_to_dotted_revno(revid)
5405
if isinstance(revno, tuple):
5406
revno = '.'.join(map(str, revno))
5407
except errors.NoSuchRevision:
5408
# Bad tag data/merges can lead to tagged revisions
5409
# which are not in this branch. Fail gracefully ...
5410
revno = '?'
5411
tags[index] = (tag, revno)
5412
self.cleanup_now()
5180
branch.lock_read()
5181
try:
5182
if revision:
5183
graph = branch.repository.get_graph()
5184
rev1, rev2 = _get_revision_range(revision, branch, self.name())
5185
revid1, revid2 = rev1.rev_id, rev2.rev_id
5186
# only show revisions between revid1 and revid2 (inclusive)
5187
tags = [(tag, revid) for tag, revid in tags if
5188
graph.is_between(revid, revid1, revid2)]
5189
if sort == 'alpha':
5190
tags.sort()
5191
elif sort == 'time':
5192
timestamps = {}
5193
for tag, revid in tags:
5194
try:
5195
revobj = branch.repository.get_revision(revid)
5196
except errors.NoSuchRevision:
5197
timestamp = sys.maxint # place them at the end
5198
else:
5199
timestamp = revobj.timestamp
5200
timestamps[revid] = timestamp
5201
tags.sort(key=lambda x: timestamps[x[1]])
5202
if not show_ids:
5203
# [ (tag, revid), ... ] -> [ (tag, dotted_revno), ... ]
5204
for index, (tag, revid) in enumerate(tags):
5205
try:
5206
revno = branch.revision_id_to_dotted_revno(revid)
5207
if isinstance(revno, tuple):
5208
revno = '.'.join(map(str, revno))
5209
except errors.NoSuchRevision:
5210
# Bad tag data/merges can lead to tagged revisions
5211
# which are not in this branch. Fail gracefully ...
5212
revno = '?'
5213
tags[index] = (tag, revno)
5214
finally:
5215
branch.unlock()
5413
5216
for tag, revspec in tags:
5414
5217
self.outf.write('%-20s %s\n' % (tag, revspec))
5415
5218
5416
5219
5417
5220
class cmd_reconfigure(Command):
5418
__doc__ = """Reconfigure the type of a bzr directory.
5221
"""Reconfigure the type of a bzr directory.
5419
5222
5420
5223
A target configuration must be specified.
5421
5224
5506
5309
5507
5310
5508
5311
class cmd_switch(Command):
5509
__doc__ = """Set the branch of a checkout and update.
5312
"""Set the branch of a checkout and update.
5510
5313
5511
5314
For lightweight checkouts, this changes the branch being referenced.
5512
5315
For heavyweight checkouts, this checks that there are no local commits
5524
5327
/path/to/newbranch.
5525
5328
5526
5329
Bound branches use the nickname of its master branch unless it is set
5527
locally, in which case switching will update the local nickname to be
5330
locally, in which case switching will update the the local nickname to be
5528
5331
that of the master.
5529
5332
"""
5530
5333
5531
takes_args = ['to_location?']
5334
takes_args = ['to_location']
5532
5335
takes_options = [Option('force',
5533
5336
help='Switch even if local commits will be lost.'),
5534
'revision',
5535
5337
Option('create-branch', short_name='b',
5536
5338
help='Create the target branch from this one before'
5537
5339
' switching to it.'),
5538
]
5340
]
5539
5341
5540
def run(self, to_location=None, force=False, create_branch=False,
5541
revision=None):
5342
def run(self, to_location, force=False, create_branch=False):
5542
5343
from bzrlib import switch
5543
5344
tree_location = '.'
5544
revision = _get_one_revision('switch', revision)
5545
5345
control_dir = bzrdir.BzrDir.open_containing(tree_location)[0]
5546
if to_location is None:
5547
if revision is None:
5548
raise errors.BzrCommandError('You must supply either a'
5549
' revision or a location')
5550
to_location = '.'
5551
5346
try:
5552
5347
branch = control_dir.open_branch()
5553
5348
had_explicit_nick = branch.get_config().has_explicit_nickname()
5558
5353
if branch is None:
5559
5354
raise errors.BzrCommandError('cannot create branch without'
5560
5355
' source branch')
5561
to_location = directory_service.directories.dereference(
5562
to_location)
5563
5356
if '/' not in to_location and '\\' not in to_location:
5564
5357
# This path is meant to be relative to the existing branch
5565
5358
this_url = self._get_branch_location(control_dir)
5567
5360
to_branch = branch.bzrdir.sprout(to_location,
5568
5361
possible_transports=[branch.bzrdir.root_transport],
5569
5362
source_branch=branch).open_branch()
5363
# try:
5364
# from_branch = control_dir.open_branch()
5365
# except errors.NotBranchError:
5366
# raise BzrCommandError('Cannot create a branch from this'
5367
# ' location when we cannot open this branch')
5368
# from_branch.bzrdir.sprout(
5369
pass
5570
5370
else:
5571
5371
try:
5572
5372
to_branch = Branch.open(to_location)
5574
5374
this_url = self._get_branch_location(control_dir)
5575
5375
to_branch = Branch.open(
5576
5376
urlutils.join(this_url, '..', to_location))
5577
if revision is not None:
5578
revision = revision.as_revision_id(to_branch)
5579
switch.switch(control_dir, to_branch, force, revision_id=revision)
5377
switch.switch(control_dir, to_branch, force)
5580
5378
if had_explicit_nick:
5581
5379
branch = control_dir.open_branch() #get the new branch!
5582
5380
branch.nick = to_branch.nick
5602
5400
5603
5401
5604
5402
class cmd_view(Command):
5605
__doc__ = """Manage filtered views.
5403
"""Manage filtered views.
5606
5404
5607
5405
Views provide a mask over the tree so that users can focus on
5608
5406
a subset of a tree when doing their work. After creating a view,
5756
5554
5757
5555
5758
5556
class cmd_hooks(Command):
5759
__doc__ = """Show hooks."""
5557
"""Show hooks."""
5760
5558
5761
5559
hidden = True
5762
5560
5775
5573
self.outf.write(" <no hooks installed>\n")
5776
5574
5777
5575
5778
class cmd_remove_branch(Command):
5779
__doc__ = """Remove a branch.
5780
5781
This will remove the branch from the specified location but
5782
will keep any working tree or repository in place.
5783
5784
:Examples:
5785
5786
Remove the branch at repo/trunk::
5787
5788
bzr remove-branch repo/trunk
5789
5790
"""
5791
5792
takes_args = ["location?"]
5793
5794
aliases = ["rmbranch"]
5795
5796
def run(self, location=None):
5797
if location is None:
5798
location = "."
5799
branch = Branch.open_containing(location)[0]
5800
branch.bzrdir.destroy_branch()
5801
5802
5803
5576
class cmd_shelve(Command):
5804
__doc__ = """Temporarily set aside some changes from the current tree.
5577
"""Temporarily set aside some changes from the current tree.
5805
5578
5806
5579
Shelve allows you to temporarily put changes you've made "on the shelf",
5807
5580
ie. out of the way, until a later time when you can bring them back from
5849
5622
if writer is None:
5850
5623
writer = bzrlib.option.diff_writer_registry.get()
5851
5624
try:
5852
shelver = Shelver.from_args(writer(sys.stdout), revision, all,
5853
file_list, message, destroy=destroy)
5854
try:
5855
shelver.run()
5856
finally:
5857
shelver.finalize()
5625
Shelver.from_args(writer(sys.stdout), revision, all, file_list,
5626
message, destroy=destroy).run()
5858
5627
except errors.UserAbort:
5859
5628
return 0
5860
5629
5861
5630
def run_for_list(self):
5862
5631
tree = WorkingTree.open_containing('.')[0]
5863
self.add_cleanup(tree.lock_read().unlock)
5864
manager = tree.get_shelf_manager()
5865
shelves = manager.active_shelves()
5866
if len(shelves) == 0:
5867
note('No shelved changes.')
5868
return 0
5869
for shelf_id in reversed(shelves):
5870
message = manager.get_metadata(shelf_id).get('message')
5871
if message is None:
5872
message = '<no message>'
5873
self.outf.write('%3d: %s\n' % (shelf_id, message))
5874
return 1
5632
tree.lock_read()
5633
try:
5634
manager = tree.get_shelf_manager()
5635
shelves = manager.active_shelves()
5636
if len(shelves) == 0:
5637
note('No shelved changes.')
5638
return 0
5639
for shelf_id in reversed(shelves):
5640
message = manager.get_metadata(shelf_id).get('message')
5641
if message is None:
5642
message = '<no message>'
5643
self.outf.write('%3d: %s\n' % (shelf_id, message))
5644
return 1
5645
finally:
5646
tree.unlock()
5875
5647
5876
5648
5877
5649
class cmd_unshelve(Command):
5878
__doc__ = """Restore shelved changes.
5650
"""Restore shelved changes.
5879
5651
5880
5652
By default, the most recently shelved changes are restored. However if you
5881
5653
specify a shelf by id those changes will be restored instead. This works
5889
5661
enum_switch=False, value_switches=True,
5890
5662
apply="Apply changes and remove from the shelf.",
5891
5663
dry_run="Show changes, but do not apply or remove them.",
5892
preview="Instead of unshelving the changes, show the diff that "
5893
"would result from unshelving.",
5894
delete_only="Delete changes without applying them.",
5895
keep="Apply changes but don't delete them.",
5664
delete_only="Delete changes without applying them."
5896
5665
)
5897
5666
]
5898
5667
_see_also = ['shelve']
5899
5668
5900
5669
def run(self, shelf_id=None, action='apply'):
5901
5670
from bzrlib.shelf_ui import Unshelver
5902
unshelver = Unshelver.from_args(shelf_id, action)
5903
try:
5904
unshelver.run()
5905
finally:
5906
unshelver.tree.unlock()
5671
Unshelver.from_args(shelf_id, action).run()
5907
5672
5908
5673
5909
5674
class cmd_clean_tree(Command):
5910
__doc__ = """Remove unwanted files from working tree.
5675
"""Remove unwanted files from working tree.
5911
5676
5912
5677
By default, only unknown files, not ignored files, are deleted. Versioned
5913
5678
files are never deleted.
5921
5686
5922
5687
To check what clean-tree will do, use --dry-run.
5923
5688
"""
5924
takes_options = ['directory',
5925
Option('ignored', help='Delete all ignored files.'),
5689
takes_options = [Option('ignored', help='Delete all ignored files.'),
5926
5690
Option('detritus', help='Delete conflict files, merge'
5927
5691
' backups, and failed selftest dirs.'),
5928
5692
Option('unknown',
5931
5695
' deleting them.'),
5932
5696
Option('force', help='Do not prompt before deleting.')]
5933
5697
def run(self, unknown=False, ignored=False, detritus=False, dry_run=False,
5934
force=False, directory=u'.'):
5698
force=False):
5935
5699
from bzrlib.clean_tree import clean_tree
5936
5700
if not (unknown or ignored or detritus):
5937
5701
unknown = True
5938
5702
if dry_run:
5939
5703
force = True
5940
clean_tree(directory, unknown=unknown, ignored=ignored,
5941
detritus=detritus, dry_run=dry_run, no_prompt=force)
5704
clean_tree('.', unknown=unknown, ignored=ignored, detritus=detritus,
5705
dry_run=dry_run, no_prompt=force)
5942
5706
5943
5707
5944
5708
class cmd_reference(Command):
5945
__doc__ = """list, view and set branch locations for nested trees.
5709
"""list, view and set branch locations for nested trees.
5946
5710
5947
5711
If no arguments are provided, lists the branch locations for nested trees.
5948
5712
If one argument is provided, display the branch location for that tree.
5988
5752
self.outf.write('%s %s\n' % (path, location))
5989
5753
5990
5754
5991
def _register_lazy_builtins():
5992
# register lazy builtins from other modules; called at startup and should
5993
# be only called once.
5994
for (name, aliases, module_name) in [
5995
('cmd_bundle_info', [], 'bzrlib.bundle.commands'),
5996
('cmd_dpush', [], 'bzrlib.foreign'),
5997
('cmd_version_info', [], 'bzrlib.cmd_version_info'),
5998
('cmd_resolve', ['resolved'], 'bzrlib.conflicts'),
5999
('cmd_conflicts', [], 'bzrlib.conflicts'),
6000
('cmd_sign_my_commits', [], 'bzrlib.sign_my_commits'),
6001
]:
6002
builtin_command_registry.register_lazy(name, aliases, module_name)
5755
# these get imported and then picked up by the scan for cmd_*
5756
# TODO: Some more consistent way to split command definitions across files;
5757
# we do need to load at least some information about them to know of
5758
# aliases. ideally we would avoid loading the implementation until the
5759
# details were needed.
5760
from bzrlib.cmd_version_info import cmd_version_info
5761
from bzrlib.conflicts import cmd_resolve, cmd_conflicts, restore
5762
from bzrlib.bundle.commands import (
5763
cmd_bundle_info,
5764
)
5765
from bzrlib.foreign import cmd_dpush
5766
from bzrlib.sign_my_commits import cmd_sign_my_commits
5767
from bzrlib.weave_commands import cmd_versionedfile_list, \
5768
cmd_weave_plan_merge, cmd_weave_merge_text
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0