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 4798.6.3
- compare with another revision
- download diff
- download tarball
- view history from revision 4798.6.3
- Committer: Neil Martinsen-Burrell
- Date: 2009-11-25 16:04:57 UTC
- mto: This revision was merged to the branch mainline in revision 4843.
- Revision ID: nmb@wartburg.edu-20091125160457-56y1yl8iw4y9q4x8
Add discussion of conflicts
- files added:
- bzrlib/textui.py
- files removed:
- .testr.conf
- apport
- bzrlib/help_topics/es
- bzrlib/plugins/news_merge
- bzrlib/plugins/news_merge/tests
- bzrlib/tests/per_bzrdir_colo
- contrib/debian
- doc/en/whats-new
- files renamed:
- bzrlib/help_topics/en/conflict-types.txt => bzrlib/help_topics/en/conflicts.txt
- bzrlib/tests/test__bencode.py => bzrlib/tests/test_bencode.py
- bzrlib/help_topics/es/conflict-types.txt => doc/es/user-guide/resolving_conflicts.txt
- files modified:
- .bzrignore
added
removed
bzrlib/builtins.py
1
# Copyright (C) 2005-2010 Canonical Ltd
1
# Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
31
31
bundle,
32
32
btree_index,
33
33
bzrdir,
34
directory_service,
35
34
delta,
36
35
config,
37
36
errors,
44
43
reconfigure,
45
44
rename_map,
46
45
revision as _mod_revision,
47
static_tuple,
48
46
symbol_versioning,
49
timestamp,
50
47
transport,
51
48
ui,
52
49
urlutils,
54
51
)
55
52
from bzrlib.branch import Branch
56
53
from bzrlib.conflicts import ConflictList
57
from bzrlib.transport import memory
58
54
from bzrlib.revisionspec import RevisionSpec, RevisionInfo
59
55
from bzrlib.smtp_connection import SMTPConnection
60
56
from bzrlib.workingtree import WorkingTree
61
57
""")
62
58
63
from bzrlib.commands import (
64
Command,
65
builtin_command_registry,
66
display_command,
67
)
59
from bzrlib.commands import Command, display_command
68
60
from bzrlib.option import (
69
61
ListOption,
70
62
Option,
232
224
return view_info
233
225
234
226
235
def _open_directory_or_containing_tree_or_branch(filename, directory):
236
"""Open the tree or branch containing the specified file, unless
237
the --directory option is used to specify a different branch."""
238
if directory is not None:
239
return (None, Branch.open(directory), filename)
240
return bzrdir.BzrDir.open_containing_tree_or_branch(filename)
241
242
243
227
# TODO: Make sure no commands unconditionally use the working directory as a
244
228
# branch. If a filename argument is used, the first of them should be used to
245
229
# specify the branch. (Perhaps this can be factored out into some kind of
247
231
# opens the branch?)
248
232
249
233
class cmd_status(Command):
250
__doc__ = """Display status summary.
234
"""Display status summary.
251
235
252
236
This reports on versioned and unknown files, reporting them
253
237
grouped by state. Possible states are:
273
257
unknown
274
258
Not versioned and not matching an ignore pattern.
275
259
276
Additionally for directories, symlinks and files with an executable
277
bit, Bazaar indicates their type using a trailing character: '/', '@'
278
or '*' respectively.
279
280
260
To see ignored files use 'bzr ignored'. For details on the
281
261
changes to file texts, use 'bzr diff'.
282
262
283
263
Note that --short or -S gives status flags for each item, similar
284
264
to Subversion's status command. To get output similar to svn -q,
285
use bzr status -SV.
265
use bzr status -SV. Additionally for directories, symlinks and
266
files with executable bit changes, Bazaar indicates this with a
267
trailing '/', '@ or '*' respectively.
286
268
287
269
If no arguments are specified, the status of the entire working
288
270
directory is shown. Otherwise, only the status of the specified
340
322
341
323
342
324
class cmd_cat_revision(Command):
343
__doc__ = """Write out metadata for a revision.
325
"""Write out metadata for a revision.
344
326
345
327
The revision to print can either be specified by a specific
346
328
revision identifier, or you can use --revision.
348
330
349
331
hidden = True
350
332
takes_args = ['revision_id?']
351
takes_options = ['directory', 'revision']
333
takes_options = ['revision']
352
334
# cat-revision is more for frontends so should be exact
353
335
encoding = 'strict'
354
336
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
337
@display_command
364
def run(self, revision_id=None, revision=None, directory=u'.'):
338
def run(self, revision_id=None, revision=None):
365
339
if revision_id is not None and revision is not None:
366
340
raise errors.BzrCommandError('You can only supply one of'
367
341
' revision_id or --revision')
368
342
if revision_id is None and revision is None:
369
343
raise errors.BzrCommandError('You must supply either'
370
344
' --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
345
b = WorkingTree.open_containing(u'.')[0].branch
346
347
# TODO: jam 20060112 should cat-revision always output utf-8?
348
if revision_id is not None:
349
revision_id = osutils.safe_revision_id(revision_id, warn=False)
350
try:
351
self.outf.write(b.repository.get_revision_xml(revision_id).decode('utf-8'))
352
except errors.NoSuchRevision:
353
msg = "The repository %s contains no revision %s." % (b.repository.base,
354
revision_id)
355
raise errors.BzrCommandError(msg)
356
elif revision is not None:
357
for rev in revision:
358
if rev is None:
359
raise errors.BzrCommandError('You cannot specify a NULL'
360
' revision.')
361
rev_id = rev.as_revision_id(b)
362
self.outf.write(b.repository.get_revision_xml(rev_id).decode('utf-8'))
363
399
364
400
365
class cmd_dump_btree(Command):
401
__doc__ = """Dump the contents of a btree index file to stdout.
366
"""Dump the contents of a btree index file to stdout.
402
367
403
368
PATH is a btree index file, it can be any URL. This includes things like
404
369
.bzr/repository/pack-names, or .bzr/repository/indices/a34b3a...ca4a4.iix
468
433
for node in bt.iter_all_entries():
469
434
# Node is made up of:
470
435
# (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)
436
refs_as_tuples = tuple([tuple([tuple(ref) for ref in ref_list])
437
for ref_list in node[3]])
477
438
as_tuple = (tuple(node[1]), node[2], refs_as_tuples)
478
439
self.outf.write('%s\n' % (as_tuple,))
479
440
480
441
481
442
class cmd_remove_tree(Command):
482
__doc__ = """Remove the working tree from a given branch/checkout.
443
"""Remove the working tree from a given branch/checkout.
483
444
484
445
Since a lightweight checkout is little more than a working tree
485
446
this will refuse to run against one.
487
448
To re-create the working tree, use "bzr checkout".
488
449
"""
489
450
_see_also = ['checkout', 'working-trees']
490
takes_args = ['location*']
451
takes_args = ['location?']
491
452
takes_options = [
492
453
Option('force',
493
454
help='Remove the working tree even if it has '
494
455
'uncommitted changes.'),
495
456
]
496
457
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()
458
def run(self, location='.', force=False):
459
d = bzrdir.BzrDir.open(location)
460
461
try:
462
working = d.open_workingtree()
463
except errors.NoWorkingTree:
464
raise errors.BzrCommandError("No working tree to remove")
465
except errors.NotLocalUrl:
466
raise errors.BzrCommandError("You cannot remove the working tree"
467
" of a remote path")
468
if not force:
469
if (working.has_changes()):
470
raise errors.UncommittedChanges(working)
471
472
working_path = working.bzrdir.root_transport.base
473
branch_path = working.branch.bzrdir.root_transport.base
474
if working_path != branch_path:
475
raise errors.BzrCommandError("You cannot remove the working tree"
476
" from a lightweight checkout")
477
478
d.destroy_workingtree()
520
479
521
480
522
481
class cmd_revno(Command):
523
__doc__ = """Show current revision number.
482
"""Show current revision number.
524
483
525
484
This is equal to the number of revisions on this branch.
526
485
"""
536
495
if tree:
537
496
try:
538
497
wt = WorkingTree.open_containing(location)[0]
539
self.add_cleanup(wt.lock_read().unlock)
498
wt.lock_read()
540
499
except (errors.NoWorkingTree, errors.NotLocalUrl):
541
500
raise errors.NoWorkingTree(location)
542
revid = wt.last_revision()
543
501
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)
502
revid = wt.last_revision()
503
try:
504
revno_t = wt.branch.revision_id_to_dotted_revno(revid)
505
except errors.NoSuchRevision:
506
revno_t = ('???',)
507
revno = ".".join(str(n) for n in revno_t)
508
finally:
509
wt.unlock()
548
510
else:
549
511
b = Branch.open_containing(location)[0]
550
self.add_cleanup(b.lock_read().unlock)
551
revno = b.revno()
552
self.cleanup_now()
512
b.lock_read()
513
try:
514
revno = b.revno()
515
finally:
516
b.unlock()
517
553
518
self.outf.write(str(revno) + '\n')
554
519
555
520
556
521
class cmd_revision_info(Command):
557
__doc__ = """Show revision number and revision id for a given revision identifier.
522
"""Show revision number and revision id for a given revision identifier.
558
523
"""
559
524
hidden = True
560
525
takes_args = ['revision_info*']
561
526
takes_options = [
562
527
'revision',
563
custom_help('directory',
528
Option('directory',
564
529
help='Branch to examine, '
565
'rather than the one containing the working directory.'),
530
'rather than the one containing the working directory.',
531
short_name='d',
532
type=unicode,
533
),
566
534
Option('tree', help='Show revno of working tree'),
567
535
]
568
536
573
541
try:
574
542
wt = WorkingTree.open_containing(directory)[0]
575
543
b = wt.branch
576
self.add_cleanup(wt.lock_read().unlock)
544
wt.lock_read()
577
545
except (errors.NoWorkingTree, errors.NotLocalUrl):
578
546
wt = None
579
547
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())
548
b.lock_read()
549
try:
550
revision_ids = []
551
if revision is not None:
552
revision_ids.extend(rev.as_revision_id(b) for rev in revision)
553
if revision_info_list is not None:
554
for rev_str in revision_info_list:
555
rev_spec = RevisionSpec.from_string(rev_str)
556
revision_ids.append(rev_spec.as_revision_id(b))
557
# No arguments supplied, default to the last revision
558
if len(revision_ids) == 0:
559
if tree:
560
if wt is None:
561
raise errors.NoWorkingTree(directory)
562
revision_ids.append(wt.last_revision())
563
else:
564
revision_ids.append(b.last_revision())
565
566
revinfos = []
567
maxlen = 0
568
for revision_id in revision_ids:
569
try:
570
dotted_revno = b.revision_id_to_dotted_revno(revision_id)
571
revno = '.'.join(str(i) for i in dotted_revno)
572
except errors.NoSuchRevision:
573
revno = '???'
574
maxlen = max(maxlen, len(revno))
575
revinfos.append([revno, revision_id])
576
finally:
577
if wt is None:
578
b.unlock()
594
579
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()
580
wt.unlock()
581
609
582
for ri in revinfos:
610
583
self.outf.write('%*s %s\n' % (maxlen, ri[0], ri[1]))
611
584
612
585
613
586
class cmd_add(Command):
614
__doc__ = """Add specified files or directories.
587
"""Add specified files or directories.
615
588
616
589
In non-recursive mode, all the named items are added, regardless
617
590
of whether they were previously ignored. A warning is given if
682
655
should_print=(not is_quiet()))
683
656
684
657
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()
658
base_tree.lock_read()
659
try:
660
tree, file_list = tree_files_for_add(file_list)
661
added, ignored = tree.smart_add(file_list, not
662
no_recurse, action=action, save=not dry_run)
663
finally:
664
if base_tree is not None:
665
base_tree.unlock()
690
666
if len(ignored) > 0:
691
667
if verbose:
692
668
for glob in sorted(ignored.keys()):
696
672
697
673
698
674
class cmd_mkdir(Command):
699
__doc__ = """Create a new versioned directory.
675
"""Create a new versioned directory.
700
676
701
677
This is equivalent to creating the directory and then adding it.
702
678
"""
706
682
707
683
def run(self, dir_list):
708
684
for d in dir_list:
685
os.mkdir(d)
709
686
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)
687
wt.add([dd])
688
self.outf.write('added %s\n' % d)
718
689
719
690
720
691
class cmd_relpath(Command):
721
__doc__ = """Show path of a file relative to root"""
692
"""Show path of a file relative to root"""
722
693
723
694
takes_args = ['filename']
724
695
hidden = True
733
704
734
705
735
706
class cmd_inventory(Command):
736
__doc__ = """Show inventory of the current working copy or a revision.
707
"""Show inventory of the current working copy or a revision.
737
708
738
709
It is possible to limit the output to a particular entry
739
710
type using the --kind option. For example: --kind file.
760
731
761
732
revision = _get_one_revision('inventory', revision)
762
733
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()
734
work_tree.lock_read()
735
try:
736
if revision is not None:
737
tree = revision.as_tree(work_tree.branch)
738
739
extra_trees = [work_tree]
740
tree.lock_read()
741
else:
742
tree = work_tree
743
extra_trees = []
744
745
if file_list is not None:
746
file_ids = tree.paths2ids(file_list, trees=extra_trees,
747
require_versioned=True)
748
# find_ids_across_trees may include some paths that don't
749
# exist in 'tree'.
750
entries = sorted((tree.id2path(file_id), tree.inventory[file_id])
751
for file_id in file_ids if file_id in tree)
752
else:
753
entries = tree.inventory.entries()
754
finally:
755
tree.unlock()
756
if tree is not work_tree:
757
work_tree.unlock()
758
784
759
for path, entry in entries:
785
760
if kind and kind != entry.kind:
786
761
continue
792
767
793
768
794
769
class cmd_mv(Command):
795
__doc__ = """Move or rename a file.
770
"""Move or rename a file.
796
771
797
772
:Usage:
798
773
bzr mv OLDNAME NEWNAME
831
806
if len(names_list) < 2:
832
807
raise errors.BzrCommandError("missing file argument")
833
808
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)
809
tree.lock_tree_write()
810
try:
811
self._run(tree, names_list, rel_names, after)
812
finally:
813
tree.unlock()
836
814
837
815
def run_auto(self, names_list, after, dry_run):
838
816
if names_list is not None and len(names_list) > 1:
842
820
raise errors.BzrCommandError('--after cannot be specified with'
843
821
' --auto.')
844
822
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)
823
work_tree.lock_tree_write()
824
try:
825
rename_map.RenameMap.guess_renames(work_tree, dry_run)
826
finally:
827
work_tree.unlock()
847
828
848
829
def _run(self, tree, names_list, rel_names, after):
849
830
into_existing = osutils.isdir(names_list[-1])
870
851
# All entries reference existing inventory items, so fix them up
871
852
# for cicp file-systems.
872
853
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))
854
for pair in tree.move(rel_names[:-1], rel_names[-1], after=after):
855
self.outf.write("%s => %s\n" % pair)
876
856
else:
877
857
if len(names_list) != 2:
878
858
raise errors.BzrCommandError('to mv multiple files the'
922
902
dest = osutils.pathjoin(dest_parent, dest_tail)
923
903
mutter("attempting to move %s => %s", src, dest)
924
904
tree.rename_one(src, dest, after=after)
925
if not is_quiet():
926
self.outf.write("%s => %s\n" % (src, dest))
905
self.outf.write("%s => %s\n" % (src, dest))
927
906
928
907
929
908
class cmd_pull(Command):
930
__doc__ = """Turn this branch into a mirror of another branch.
909
"""Turn this branch into a mirror of another branch.
931
910
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.
911
This command only works on branches that have not diverged. Branches are
912
considered diverged if the destination branch's most recent commit is one
913
that has not been merged (directly or indirectly) into the parent.
936
914
937
915
If branches have diverged, you can use 'bzr merge' to integrate the changes
938
916
from one into the other. Once one branch has merged, the other should
939
917
be able to pull it again.
940
918
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.
919
If you want to forget your local changes and just update your branch to
920
match the remote one, use pull --overwrite.
944
921
945
922
If there is no default location set, the first pull will set it. After
946
923
that, you can omit the location to use the default. To change the
956
933
takes_options = ['remember', 'overwrite', 'revision',
957
934
custom_help('verbose',
958
935
help='Show logs of pulled revisions.'),
959
custom_help('directory',
936
Option('directory',
960
937
help='Branch to pull into, '
961
'rather than the one containing the working directory.'),
938
'rather than the one containing the working directory.',
939
short_name='d',
940
type=unicode,
941
),
962
942
Option('local',
963
943
help="Perform a local pull in a bound "
964
944
"branch. Local pulls are not applied to "
979
959
try:
980
960
tree_to = WorkingTree.open_containing(directory)[0]
981
961
branch_to = tree_to.branch
982
self.add_cleanup(tree_to.lock_write().unlock)
983
962
except errors.NoWorkingTree:
984
963
tree_to = None
985
964
branch_to = Branch.open_containing(directory)[0]
986
self.add_cleanup(branch_to.lock_write().unlock)
987
965
988
966
if local and not branch_to.get_bound_location():
989
967
raise errors.LocalRequiresBoundBranch()
990
968
1020
998
else:
1021
999
branch_from = Branch.open(location,
1022
1000
possible_transports=possible_transports)
1023
self.add_cleanup(branch_from.lock_read().unlock)
1024
1001
1025
1002
if branch_to.get_parent() is None or remember:
1026
1003
branch_to.set_parent(branch_from.base)
1027
1004
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)
1005
if branch_from is not branch_to:
1006
branch_from.lock_read()
1007
try:
1008
if revision is not None:
1009
revision_id = revision.as_revision_id(branch_from)
1010
1011
branch_to.lock_write()
1012
try:
1013
if tree_to is not None:
1014
view_info = _get_view_info_for_change_reporter(tree_to)
1015
change_reporter = delta._ChangeReporter(
1016
unversioned_filter=tree_to.is_ignored,
1017
view_info=view_info)
1018
result = tree_to.pull(
1019
branch_from, overwrite, revision_id, change_reporter,
1020
possible_transports=possible_transports, local=local)
1021
else:
1022
result = branch_to.pull(
1023
branch_from, overwrite, revision_id, local=local)
1024
1025
result.report(self.outf)
1026
if verbose and result.old_revid != result.new_revid:
1027
log.show_branch_change(
1028
branch_to, self.outf, result.old_revno,
1029
result.old_revid)
1030
finally:
1031
branch_to.unlock()
1032
finally:
1033
if branch_from is not branch_to:
1034
branch_from.unlock()
1048
1035
1049
1036
1050
1037
class cmd_push(Command):
1051
__doc__ = """Update a mirror of this branch.
1038
"""Update a mirror of this branch.
1052
1039
1053
1040
The target branch will not have its working tree populated because this
1054
1041
is both expensive, and is not supported on remote file systems.
1078
1065
Option('create-prefix',
1079
1066
help='Create the path leading up to the branch '
1080
1067
'if it does not already exist.'),
1081
custom_help('directory',
1068
Option('directory',
1082
1069
help='Branch to push from, '
1083
'rather than the one containing the working directory.'),
1070
'rather than the one containing the working directory.',
1071
short_name='d',
1072
type=unicode,
1073
),
1084
1074
Option('use-existing-dir',
1085
1075
help='By default push will fail if the target'
1086
1076
' directory exists, but does not already'
1112
1102
# Get the source branch
1113
1103
(tree, br_from,
1114
1104
_unused) = bzrdir.BzrDir.open_containing_tree_or_branch(directory)
1105
if strict is None:
1106
strict = br_from.get_config().get_user_option_as_bool('push_strict')
1107
if strict is None: strict = True # default value
1115
1108
# Get the tip's revision_id
1116
1109
revision = _get_one_revision('push', revision)
1117
1110
if revision is not None:
1118
1111
revision_id = revision.in_history(br_from).rev_id
1119
1112
else:
1120
1113
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.')
1114
if strict and tree is not None and revision_id is None:
1115
if (tree.has_changes()):
1116
raise errors.UncommittedChanges(
1117
tree, more='Use --no-strict to force the push.')
1118
if tree.last_revision() != tree.branch.last_revision():
1119
# The tree has lost sync with its branch, there is little
1120
# chance that the user is aware of it but he can still force
1121
# the push with --no-strict
1122
raise errors.OutOfDateTree(
1123
tree, more='Use --no-strict to force the push.')
1124
1126
1125
# Get the stacked_on branch, if any
1127
1126
if stacked_on is not None:
1128
1127
stacked_on = urlutils.normalize_url(stacked_on)
1160
1159
1161
1160
1162
1161
class cmd_branch(Command):
1163
__doc__ = """Create a new branch that is a copy of an existing branch.
1162
"""Create a new branch that is a copy of an existing branch.
1164
1163
1165
1164
If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will
1166
1165
be used. In other words, "branch ../foo/bar" will attempt to create ./bar.
1193
1192
' directory exists, but does not already'
1194
1193
' have a control directory. This flag will'
1195
1194
' allow branch to proceed.'),
1196
Option('bind',
1197
help="Bind new branch to from location."),
1198
1195
]
1199
1196
aliases = ['get', 'clone']
1200
1197
1201
1198
def run(self, from_location, to_location=None, revision=None,
1202
1199
hardlink=False, stacked=False, standalone=False, no_tree=False,
1203
use_existing_dir=False, switch=False, bind=False):
1200
use_existing_dir=False, switch=False):
1204
1201
from bzrlib import switch as _mod_switch
1205
1202
from bzrlib.tag import _merge_tags_if_possible
1206
1203
accelerator_tree, br_from = bzrdir.BzrDir.open_tree_or_branch(
1207
1204
from_location)
1205
if (accelerator_tree is not None and
1206
accelerator_tree.supports_content_filtering()):
1207
accelerator_tree = None
1208
1208
revision = _get_one_revision('branch', revision)
1209
self.add_cleanup(br_from.lock_read().unlock)
1210
if revision is not None:
1211
revision_id = revision.as_revision_id(br_from)
1212
else:
1213
# FIXME - wt.last_revision, fallback to branch, fall back to
1214
# None or perhaps NULL_REVISION to mean copy nothing
1215
# RBC 20060209
1216
revision_id = br_from.last_revision()
1217
if to_location is None:
1218
to_location = urlutils.derive_to_location(from_location)
1219
to_transport = transport.get_transport(to_location)
1209
br_from.lock_read()
1220
1210
try:
1221
to_transport.mkdir('.')
1222
except errors.FileExists:
1223
if not use_existing_dir:
1224
raise errors.BzrCommandError('Target directory "%s" '
1225
'already exists.' % to_location)
1211
if revision is not None:
1212
revision_id = revision.as_revision_id(br_from)
1226
1213
else:
1227
try:
1228
bzrdir.BzrDir.open_from_transport(to_transport)
1229
except errors.NotBranchError:
1230
pass
1214
# FIXME - wt.last_revision, fallback to branch, fall back to
1215
# None or perhaps NULL_REVISION to mean copy nothing
1216
# RBC 20060209
1217
revision_id = br_from.last_revision()
1218
if to_location is None:
1219
to_location = urlutils.derive_to_location(from_location)
1220
to_transport = transport.get_transport(to_location)
1221
try:
1222
to_transport.mkdir('.')
1223
except errors.FileExists:
1224
if not use_existing_dir:
1225
raise errors.BzrCommandError('Target directory "%s" '
1226
'already exists.' % to_location)
1231
1227
else:
1232
raise errors.AlreadyBranchError(to_location)
1233
except errors.NoSuchFile:
1234
raise errors.BzrCommandError('Parent of "%s" does not exist.'
1235
% to_location)
1236
try:
1237
# preserve whatever source format we have.
1238
dir = br_from.bzrdir.sprout(to_transport.base, revision_id,
1239
possible_transports=[to_transport],
1240
accelerator_tree=accelerator_tree,
1241
hardlink=hardlink, stacked=stacked,
1242
force_new_repo=standalone,
1243
create_tree_if_local=not no_tree,
1244
source_branch=br_from)
1245
branch = dir.open_branch()
1246
except errors.NoSuchRevision:
1247
to_transport.delete_tree('.')
1248
msg = "The branch %s has no revision %s." % (from_location,
1249
revision)
1250
raise errors.BzrCommandError(msg)
1251
_merge_tags_if_possible(br_from, branch)
1252
# If the source branch is stacked, the new branch may
1253
# be stacked whether we asked for that explicitly or not.
1254
# We therefore need a try/except here and not just 'if stacked:'
1255
try:
1256
note('Created new stacked branch referring to %s.' %
1257
branch.get_stacked_on_url())
1258
except (errors.NotStacked, errors.UnstackableBranchFormat,
1259
errors.UnstackableRepositoryFormat), e:
1260
note('Branched %d revision(s).' % branch.revno())
1261
if bind:
1262
# Bind to the parent
1263
parent_branch = Branch.open(from_location)
1264
branch.bind(parent_branch)
1265
note('New branch bound to %s' % from_location)
1266
if switch:
1267
# Switch to the new branch
1268
wt, _ = WorkingTree.open_containing('.')
1269
_mod_switch.switch(wt.bzrdir, branch)
1270
note('Switched to branch: %s',
1271
urlutils.unescape_for_display(branch.base, 'utf-8'))
1228
try:
1229
bzrdir.BzrDir.open_from_transport(to_transport)
1230
except errors.NotBranchError:
1231
pass
1232
else:
1233
raise errors.AlreadyBranchError(to_location)
1234
except errors.NoSuchFile:
1235
raise errors.BzrCommandError('Parent of "%s" does not exist.'
1236
% to_location)
1237
try:
1238
# preserve whatever source format we have.
1239
dir = br_from.bzrdir.sprout(to_transport.base, revision_id,
1240
possible_transports=[to_transport],
1241
accelerator_tree=accelerator_tree,
1242
hardlink=hardlink, stacked=stacked,
1243
force_new_repo=standalone,
1244
create_tree_if_local=not no_tree,
1245
source_branch=br_from)
1246
branch = dir.open_branch()
1247
except errors.NoSuchRevision:
1248
to_transport.delete_tree('.')
1249
msg = "The branch %s has no revision %s." % (from_location,
1250
revision)
1251
raise errors.BzrCommandError(msg)
1252
_merge_tags_if_possible(br_from, branch)
1253
# If the source branch is stacked, the new branch may
1254
# be stacked whether we asked for that explicitly or not.
1255
# We therefore need a try/except here and not just 'if stacked:'
1256
try:
1257
note('Created new stacked branch referring to %s.' %
1258
branch.get_stacked_on_url())
1259
except (errors.NotStacked, errors.UnstackableBranchFormat,
1260
errors.UnstackableRepositoryFormat), e:
1261
note('Branched %d revision(s).' % branch.revno())
1262
if switch:
1263
# Switch to the new branch
1264
wt, _ = WorkingTree.open_containing('.')
1265
_mod_switch.switch(wt.bzrdir, branch)
1266
note('Switched to branch: %s',
1267
urlutils.unescape_for_display(branch.base, 'utf-8'))
1268
finally:
1269
br_from.unlock()
1272
1270
1273
1271
1274
1272
class cmd_checkout(Command):
1275
__doc__ = """Create a new checkout of an existing branch.
1273
"""Create a new checkout of an existing branch.
1276
1274
1277
1275
If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree for
1278
1276
the branch found in '.'. This is useful if you have removed the working tree
1336
1334
except errors.NoWorkingTree:
1337
1335
source.bzrdir.create_workingtree(revision_id)
1338
1336
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
1337
source.create_checkout(to_location, revision_id, lightweight,
1345
1338
accelerator_tree, hardlink)
1346
1339
1347
1340
1348
1341
class cmd_renames(Command):
1349
__doc__ = """Show list of renamed files.
1342
"""Show list of renamed files.
1350
1343
"""
1351
1344
# TODO: Option to show renames between two historical versions.
1352
1345
1357
1350
@display_command
1358
1351
def run(self, dir=u'.'):
1359
1352
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))
1353
tree.lock_read()
1354
try:
1355
new_inv = tree.inventory
1356
old_tree = tree.basis_tree()
1357
old_tree.lock_read()
1358
try:
1359
old_inv = old_tree.inventory
1360
renames = []
1361
iterator = tree.iter_changes(old_tree, include_unchanged=True)
1362
for f, paths, c, v, p, n, k, e in iterator:
1363
if paths[0] == paths[1]:
1364
continue
1365
if None in (paths):
1366
continue
1367
renames.append(paths)
1368
renames.sort()
1369
for old_name, new_name in renames:
1370
self.outf.write("%s => %s\n" % (old_name, new_name))
1371
finally:
1372
old_tree.unlock()
1373
finally:
1374
tree.unlock()
1376
1375
1377
1376
1378
1377
class cmd_update(Command):
1379
__doc__ = """Update a tree to have the latest code committed to its branch.
1378
"""Update a tree to have the latest code committed to its branch.
1380
1379
1381
1380
This will perform a merge into the working tree, and may generate
1382
1381
conflicts. If you have any local changes, you will still
1384
1383
1385
1384
If you want to discard your local changes, you can just do a
1386
1385
'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
1386
"""
1391
1387
1392
1388
_see_also = ['pull', 'working-trees', 'status-flags']
1393
1389
takes_args = ['dir?']
1394
takes_options = ['revision']
1395
1390
aliases = ['up']
1396
1391
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")
1392
def run(self, dir='.'):
1401
1393
tree = WorkingTree.open_containing(dir)[0]
1402
branch = tree.branch
1403
1394
possible_transports = []
1404
master = branch.get_master_branch(
1395
master = tree.branch.get_master_branch(
1405
1396
possible_transports=possible_transports)
1406
1397
if master is not None:
1407
branch_location = master.base
1408
1398
tree.lock_write()
1409
1399
else:
1410
branch_location = tree.branch.base
1411
1400
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
1401
try:
1402
existing_pending_merges = tree.get_parent_ids()[1:]
1403
last_rev = _mod_revision.ensure_null(tree.last_revision())
1404
if last_rev == _mod_revision.ensure_null(
1405
tree.branch.last_revision()):
1406
# may be up to date, check master too.
1407
if master is None or last_rev == _mod_revision.ensure_null(
1408
master.last_revision()):
1409
revno = tree.branch.revision_id_to_revno(last_rev)
1410
note("Tree is up to date at revision %d." % (revno,))
1411
return 0
1412
view_info = _get_view_info_for_change_reporter(tree)
1439
1413
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
1414
delta._ChangeReporter(unversioned_filter=tree.is_ignored,
1415
view_info=view_info), possible_transports=possible_transports)
1416
revno = tree.branch.revision_id_to_revno(
1417
_mod_revision.ensure_null(tree.last_revision()))
1418
note('Updated to revision %d.' % (revno,))
1419
if tree.get_parent_ids()[1:] != existing_pending_merges:
1420
note('Your local commits will now show as pending merges with '
1421
"'bzr status', and can be committed with 'bzr commit'.")
1422
if conflicts != 0:
1423
return 1
1424
else:
1425
return 0
1426
finally:
1427
tree.unlock()
1462
1428
1463
1429
1464
1430
class cmd_info(Command):
1465
__doc__ = """Show information about a working tree, branch or repository.
1431
"""Show information about a working tree, branch or repository.
1466
1432
1467
1433
This command will show all known locations and formats associated to the
1468
1434
tree, branch or repository.
1506
1472
1507
1473
1508
1474
class cmd_remove(Command):
1509
__doc__ = """Remove files or directories.
1475
"""Remove files or directories.
1510
1476
1511
1477
This makes bzr stop tracking changes to the specified files. bzr will delete
1512
1478
them if they can easily be recovered using revert. If no options or
1534
1500
if file_list is not None:
1535
1501
file_list = [f for f in file_list]
1536
1502
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')
1503
tree.lock_write()
1504
try:
1505
# Heuristics should probably all move into tree.remove_smart or
1506
# some such?
1507
if new:
1508
added = tree.changes_from(tree.basis_tree(),
1509
specific_files=file_list).added
1510
file_list = sorted([f[0] for f in added], reverse=True)
1511
if len(file_list) == 0:
1512
raise errors.BzrCommandError('No matching files.')
1513
elif file_list is None:
1514
# missing files show up in iter_changes(basis) as
1515
# versioned-with-no-kind.
1516
missing = []
1517
for change in tree.iter_changes(tree.basis_tree()):
1518
# Find paths in the working tree that have no kind:
1519
if change[1][1] is not None and change[6][1] is None:
1520
missing.append(change[1][1])
1521
file_list = sorted(missing, reverse=True)
1522
file_deletion_strategy = 'keep'
1523
tree.remove(file_list, verbose=verbose, to_file=self.outf,
1524
keep_files=file_deletion_strategy=='keep',
1525
force=file_deletion_strategy=='force')
1526
finally:
1527
tree.unlock()
1559
1528
1560
1529
1561
1530
class cmd_file_id(Command):
1562
__doc__ = """Print file_id of a particular file or directory.
1531
"""Print file_id of a particular file or directory.
1563
1532
1564
1533
The file_id is assigned when the file is first added and remains the
1565
1534
same through all revisions where the file exists, even when it is
1581
1550
1582
1551
1583
1552
class cmd_file_path(Command):
1584
__doc__ = """Print path of file_ids to a file or directory.
1553
"""Print path of file_ids to a file or directory.
1585
1554
1586
1555
This prints one line for each directory down to the target,
1587
1556
starting at the branch root.
1603
1572
1604
1573
1605
1574
class cmd_reconcile(Command):
1606
__doc__ = """Reconcile bzr metadata in a branch.
1575
"""Reconcile bzr metadata in a branch.
1607
1576
1608
1577
This can correct data mismatches that may have been caused by
1609
1578
previous ghost operations or bzr upgrades. You should only
1631
1600
1632
1601
1633
1602
class cmd_revision_history(Command):
1634
__doc__ = """Display the list of revision ids on a branch."""
1603
"""Display the list of revision ids on a branch."""
1635
1604
1636
1605
_see_also = ['log']
1637
1606
takes_args = ['location?']
1647
1616
1648
1617
1649
1618
class cmd_ancestry(Command):
1650
__doc__ = """List all revisions merged into this branch."""
1619
"""List all revisions merged into this branch."""
1651
1620
1652
1621
_see_also = ['log', 'revision-history']
1653
1622
takes_args = ['location?']
1672
1641
1673
1642
1674
1643
class cmd_init(Command):
1675
__doc__ = """Make a directory into a versioned branch.
1644
"""Make a directory into a versioned branch.
1676
1645
1677
1646
Use this to create an empty branch, or before importing an
1678
1647
existing project.
1781
1750
1782
1751
1783
1752
class cmd_init_repository(Command):
1784
__doc__ = """Create a shared repository for branches to share storage space.
1753
"""Create a shared repository to hold branches.
1785
1754
1786
1755
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.
1756
revisions in the repository, not in the branch directory.
1790
1757
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.
1758
If the --no-trees option is used then the branches in the repository
1759
will not have working trees by default.
1797
1760
1798
1761
:Examples:
1799
Create a shared repository holding just branches::
1762
Create a shared repositories holding just branches::
1800
1763
1801
1764
bzr init-repo --no-trees repo
1802
1765
bzr init repo/trunk
1841
1804
1842
1805
1843
1806
class cmd_diff(Command):
1844
__doc__ = """Show differences in the working tree, between revisions or branches.
1807
"""Show differences in the working tree, between revisions or branches.
1845
1808
1846
1809
If no arguments are given, all changes for the current tree are listed.
1847
1810
If files are given, only the changes in those files are listed.
1868
1831
1869
1832
bzr diff -r1
1870
1833
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
1834
Difference between revision 2 and revision 1::
1835
1836
bzr diff -r1..2
1837
1838
Difference between revision 2 and revision 1 for branch xxx::
1839
1840
bzr diff -r1..2 xxx
1892
1841
1893
1842
Show just the differences for file NEWS::
1894
1843
1933
1882
help='Use this command to compare files.',
1934
1883
type=unicode,
1935
1884
),
1936
RegistryOption('format',
1937
help='Diff format to use.',
1938
lazy_registry=('bzrlib.diff', 'format_registry'),
1939
value_switches=False, title='Diff format'),
1940
1885
]
1941
1886
aliases = ['di', 'dif']
1942
1887
encoding_type = 'exact'
1943
1888
1944
1889
@display_command
1945
1890
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)
1891
prefix=None, old=None, new=None, using=None):
1892
from bzrlib.diff import get_trees_and_branches_to_diff, show_diff_trees
1949
1893
1950
1894
if (prefix is None) or (prefix == '0'):
1951
1895
# diff -p0 format
1965
1909
raise errors.BzrCommandError('bzr diff --revision takes exactly'
1966
1910
' one or two revision specifiers')
1967
1911
1968
if using is not None and format is not None:
1969
raise errors.BzrCommandError('--using and --format are mutually '
1970
'exclusive.')
1971
1972
1912
(old_tree, new_tree,
1973
1913
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)
1914
specific_files, extra_trees) = get_trees_and_branches_to_diff(
1915
file_list, revision, old, new, apply_view=True)
1976
1916
return show_diff_trees(old_tree, new_tree, sys.stdout,
1977
1917
specific_files=specific_files,
1978
1918
external_diff_options=diff_options,
1979
1919
old_label=old_label, new_label=new_label,
1980
extra_trees=extra_trees, using=using,
1981
format_cls=format)
1920
extra_trees=extra_trees, using=using)
1982
1921
1983
1922
1984
1923
class cmd_deleted(Command):
1985
__doc__ = """List files deleted in the working tree.
1924
"""List files deleted in the working tree.
1986
1925
"""
1987
1926
# TODO: Show files deleted since a previous revision, or
1988
1927
# between two revisions.
1991
1930
# level of effort but possibly much less IO. (Or possibly not,
1992
1931
# if the directories are very large...)
1993
1932
_see_also = ['status', 'ls']
1994
takes_options = ['directory', 'show-ids']
1933
takes_options = ['show-ids']
1995
1934
1996
1935
@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')
1936
def run(self, show_ids=False):
1937
tree = WorkingTree.open_containing(u'.')[0]
1938
tree.lock_read()
1939
try:
1940
old = tree.basis_tree()
1941
old.lock_read()
1942
try:
1943
for path, ie in old.inventory.iter_entries():
1944
if not tree.has_id(ie.file_id):
1945
self.outf.write(path)
1946
if show_ids:
1947
self.outf.write(' ')
1948
self.outf.write(ie.file_id)
1949
self.outf.write('\n')
1950
finally:
1951
old.unlock()
1952
finally:
1953
tree.unlock()
2009
1954
2010
1955
2011
1956
class cmd_modified(Command):
2012
__doc__ = """List files modified in working tree.
1957
"""List files modified in working tree.
2013
1958
"""
2014
1959
2015
1960
hidden = True
2016
1961
_see_also = ['status', 'ls']
2017
takes_options = ['directory', 'null']
1962
takes_options = [
1963
Option('null',
1964
help='Write an ascii NUL (\\0) separator '
1965
'between files rather than a newline.')
1966
]
2018
1967
2019
1968
@display_command
2020
def run(self, null=False, directory=u'.'):
2021
tree = WorkingTree.open_containing(directory)[0]
1969
def run(self, null=False):
1970
tree = WorkingTree.open_containing(u'.')[0]
2022
1971
td = tree.changes_from(tree.basis_tree())
2023
1972
for path, id, kind, text_modified, meta_modified in td.modified:
2024
1973
if null:
2028
1977
2029
1978
2030
1979
class cmd_added(Command):
2031
__doc__ = """List files added in working tree.
1980
"""List files added in working tree.
2032
1981
"""
2033
1982
2034
1983
hidden = True
2035
1984
_see_also = ['status', 'ls']
2036
takes_options = ['directory', 'null']
1985
takes_options = [
1986
Option('null',
1987
help='Write an ascii NUL (\\0) separator '
1988
'between files rather than a newline.')
1989
]
2037
1990
2038
1991
@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')
1992
def run(self, null=False):
1993
wt = WorkingTree.open_containing(u'.')[0]
1994
wt.lock_read()
1995
try:
1996
basis = wt.basis_tree()
1997
basis.lock_read()
1998
try:
1999
basis_inv = basis.inventory
2000
inv = wt.inventory
2001
for file_id in inv:
2002
if file_id in basis_inv:
2003
continue
2004
if inv.is_root(file_id) and len(basis_inv) == 0:
2005
continue
2006
path = inv.id2path(file_id)
2007
if not os.access(osutils.abspath(path), os.F_OK):
2008
continue
2009
if null:
2010
self.outf.write(path + '\0')
2011
else:
2012
self.outf.write(osutils.quotefn(path) + '\n')
2013
finally:
2014
basis.unlock()
2015
finally:
2016
wt.unlock()
2058
2017
2059
2018
2060
2019
class cmd_root(Command):
2061
__doc__ = """Show the tree root directory.
2020
"""Show the tree root directory.
2062
2021
2063
2022
The root is the nearest enclosing directory with a .bzr control
2064
2023
directory."""
2088
2047
2089
2048
2090
2049
class cmd_log(Command):
2091
__doc__ = """Show historical log for a branch or subset of a branch.
2050
"""Show historical log for a branch or subset of a branch.
2092
2051
2093
2052
log is bzr's default tool for exploring the history of a branch.
2094
2053
The branch to use is taken from the first parameter. If no parameters
2205
2164
:Tips & tricks:
2206
2165
2207
2166
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>.
2167
line tools. You may prefer qlog or glog from the QBzr and Bzr-Gtk packages
2168
respectively for example. (TortoiseBzr uses qlog for displaying logs.) See
2169
http://bazaar-vcs.org/BzrPlugins and http://bazaar-vcs.org/IDEIntegration.
2170
2171
Web interfaces are often better at exploring history than command line
2172
tools, particularly for branches on servers. You may prefer Loggerhead
2173
or one of its alternatives. See http://bazaar-vcs.org/WebInterface.
2212
2174
2213
2175
You may find it useful to add the aliases below to ``bazaar.conf``::
2214
2176
2255
2217
help='Show just the specified revision.'
2256
2218
' See also "help revisionspec".'),
2257
2219
'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
2220
Option('levels',
2264
2221
short_name='n',
2265
2222
help='Number of levels to display - 0 for all, 1 for flat.',
2280
2237
help='Show changes made in each revision as a patch.'),
2281
2238
Option('include-merges',
2282
2239
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
2240
]
2288
2241
encoding_type = 'replace'
2289
2242
2299
2252
message=None,
2300
2253
limit=None,
2301
2254
show_diff=False,
2302
include_merges=False,
2303
authors=None,
2304
exclude_common_ancestry=False,
2305
):
2255
include_merges=False):
2306
2256
from bzrlib.log import (
2307
2257
Logger,
2308
2258
make_log_request_dict,
2309
2259
_get_info_for_log_files,
2310
2260
)
2311
2261
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
2262
if include_merges:
2317
2263
if levels is None:
2318
2264
levels = 0
2331
2277
2332
2278
file_ids = []
2333
2279
filter_by_dir = False
2334
if file_list:
2335
# 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)
2338
for relpath, file_id, kind in file_info_list:
2339
if file_id is None:
2340
raise errors.BzrCommandError(
2341
"Path unknown at end or start of revision range: %s" %
2342
relpath)
2343
# If the relpath is the top of the tree, we log everything
2344
if relpath == '':
2345
file_ids = []
2346
break
2280
b = None
2281
try:
2282
if file_list:
2283
# find the file ids to log and check for directory filtering
2284
b, file_info_list, rev1, rev2 = _get_info_for_log_files(
2285
revision, file_list)
2286
for relpath, file_id, kind in file_info_list:
2287
if file_id is None:
2288
raise errors.BzrCommandError(
2289
"Path unknown at end or start of revision range: %s" %
2290
relpath)
2291
# If the relpath is the top of the tree, we log everything
2292
if relpath == '':
2293
file_ids = []
2294
break
2295
else:
2296
file_ids.append(file_id)
2297
filter_by_dir = filter_by_dir or (
2298
kind in ['directory', 'tree-reference'])
2299
else:
2300
# log everything
2301
# FIXME ? log the current subdir only RBC 20060203
2302
if revision is not None \
2303
and len(revision) > 0 and revision[0].get_branch():
2304
location = revision[0].get_branch()
2347
2305
else:
2348
file_ids.append(file_id)
2349
filter_by_dir = filter_by_dir or (
2350
kind in ['directory', 'tree-reference'])
2351
else:
2352
# log everything
2353
# FIXME ? log the current subdir only RBC 20060203
2354
if revision is not None \
2355
and len(revision) > 0 and revision[0].get_branch():
2356
location = revision[0].get_branch()
2357
else:
2358
location = '.'
2359
dir, relpath = bzrdir.BzrDir.open_containing(location)
2360
b = dir.open_branch()
2361
self.add_cleanup(b.lock_read().unlock)
2362
rev1, rev2 = _get_revision_range(revision, b, self.name())
2363
2364
# Decide on the type of delta & diff filtering to use
2365
# TODO: add an --all-files option to make this configurable & consistent
2366
if not verbose:
2367
delta_type = None
2368
else:
2369
delta_type = 'full'
2370
if not show_diff:
2371
diff_type = None
2372
elif file_ids:
2373
diff_type = 'partial'
2374
else:
2375
diff_type = 'full'
2376
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)
2306
location = '.'
2307
dir, relpath = bzrdir.BzrDir.open_containing(location)
2308
b = dir.open_branch()
2309
b.lock_read()
2310
rev1, rev2 = _get_revision_range(revision, b, self.name())
2311
2312
# Decide on the type of delta & diff filtering to use
2313
# TODO: add an --all-files option to make this configurable & consistent
2314
if not verbose:
2315
delta_type = None
2316
else:
2317
delta_type = 'full'
2318
if not show_diff:
2319
diff_type = None
2320
elif file_ids:
2321
diff_type = 'partial'
2322
else:
2323
diff_type = 'full'
2324
2325
# Build the log formatter
2326
if log_format is None:
2327
log_format = log.log_formatter_registry.get_default(b)
2328
lf = log_format(show_ids=show_ids, to_file=self.outf,
2329
show_timezone=timezone,
2330
delta_format=get_verbosity_level(),
2331
levels=levels,
2332
show_advice=levels is None)
2333
2334
# Choose the algorithm for doing the logging. It's annoying
2335
# having multiple code paths like this but necessary until
2336
# the underlying repository format is faster at generating
2337
# deltas or can provide everything we need from the indices.
2338
# The default algorithm - match-using-deltas - works for
2339
# multiple files and directories and is faster for small
2340
# amounts of history (200 revisions say). However, it's too
2341
# slow for logging a single file in a repository with deep
2342
# history, i.e. > 10K revisions. In the spirit of "do no
2343
# evil when adding features", we continue to use the
2344
# original algorithm - per-file-graph - for the "single
2345
# file that isn't a directory without showing a delta" case.
2346
partial_history = revision and b.repository._format.supports_chks
2347
match_using_deltas = (len(file_ids) != 1 or filter_by_dir
2348
or delta_type or partial_history)
2349
2350
# Build the LogRequest and execute it
2351
if len(file_ids) == 0:
2352
file_ids = None
2353
rqst = make_log_request_dict(
2354
direction=direction, specific_fileids=file_ids,
2355
start_revision=rev1, end_revision=rev2, limit=limit,
2356
message_search=message, delta_type=delta_type,
2357
diff_type=diff_type, _match_using_deltas=match_using_deltas)
2358
Logger(b, rqst).show(lf)
2359
finally:
2360
if b is not None:
2361
b.unlock()
2417
2362
2418
2363
2419
2364
def _get_revision_range(revisionspec_list, branch, command_name):
2437
2382
raise errors.BzrCommandError(
2438
2383
"bzr %s doesn't accept two revisions in different"
2439
2384
" 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)
2385
rev1 = start_spec.in_history(branch)
2445
2386
# Avoid loading all of history when we know a missing
2446
2387
# end of range means the last revision ...
2447
2388
if end_spec.spec is None:
2476
2417
2477
2418
2478
2419
class cmd_touching_revisions(Command):
2479
__doc__ = """Return revision-ids which affected a particular file.
2420
"""Return revision-ids which affected a particular file.
2480
2421
2481
2422
A more user-friendly interface is "bzr log FILE".
2482
2423
"""
2489
2430
tree, relpath = WorkingTree.open_containing(filename)
2490
2431
file_id = tree.path2id(relpath)
2491
2432
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:
2495
self.outf.write("%6d %s\n" % (revno, what))
2433
b.lock_read()
2434
try:
2435
touching_revs = log.find_touching_revisions(b, file_id)
2436
for revno, revision_id, what in touching_revs:
2437
self.outf.write("%6d %s\n" % (revno, what))
2438
finally:
2439
b.unlock()
2496
2440
2497
2441
2498
2442
class cmd_ls(Command):
2499
__doc__ = """List files in a tree.
2443
"""List files in a tree.
2500
2444
"""
2501
2445
2502
2446
_see_also = ['status', 'cat']
2508
2452
help='Recurse into subdirectories.'),
2509
2453
Option('from-root',
2510
2454
help='Print paths relative to the root of the branch.'),
2511
Option('unknown', short_name='u',
2512
help='Print unknown files.'),
2455
Option('unknown', help='Print unknown files.'),
2513
2456
Option('versioned', help='Print versioned files.',
2514
2457
short_name='V'),
2515
Option('ignored', short_name='i',
2516
help='Print ignored files.'),
2517
Option('kind', short_name='k',
2458
Option('ignored', help='Print ignored files.'),
2459
Option('null',
2460
help='Write an ascii NUL (\\0) separator '
2461
'between files rather than a newline.'),
2462
Option('kind',
2518
2463
help='List entries of a particular kind: file, directory, symlink.',
2519
2464
type=unicode),
2520
'null',
2521
2465
'show-ids',
2522
'directory',
2523
2466
]
2524
2467
@display_command
2525
2468
def run(self, revision=None, verbose=False,
2526
2469
recursive=False, from_root=False,
2527
2470
unknown=False, versioned=False, ignored=False,
2528
null=False, kind=None, show_ids=False, path=None, directory=None):
2471
null=False, kind=None, show_ids=False, path=None):
2529
2472
2530
2473
if kind and kind not in ('file', 'directory', 'symlink'):
2531
2474
raise errors.BzrCommandError('invalid kind specified')
2543
2486
raise errors.BzrCommandError('cannot specify both --from-root'
2544
2487
' and PATH')
2545
2488
fs_path = path
2546
tree, branch, relpath = \
2547
_open_directory_or_containing_tree_or_branch(fs_path, directory)
2489
tree, branch, relpath = bzrdir.BzrDir.open_containing_tree_or_branch(
2490
fs_path)
2548
2491
2549
2492
# Calculate the prefix to use
2550
2493
prefix = None
2551
2494
if from_root:
2552
2495
if relpath:
2553
2496
prefix = relpath + '/'
2554
elif fs_path != '.' and not fs_path.endswith('/'):
2497
elif fs_path != '.':
2555
2498
prefix = fs_path + '/'
2556
2499
2557
2500
if revision is not None or tree is None:
2565
2508
view_str = views.view_display_str(view_files)
2566
2509
note("Ignoring files outside view. View is %s" % view_str)
2567
2510
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
2511
tree.lock_read()
2512
try:
2513
for fp, fc, fkind, fid, entry in tree.list_files(include_root=False,
2514
from_dir=relpath, recursive=recursive):
2515
# Apply additional masking
2516
if not all and not selection[fc]:
2517
continue
2518
if kind is not None and fkind != kind:
2519
continue
2520
if apply_view:
2521
try:
2522
if relpath:
2523
fullpath = osutils.pathjoin(relpath, fp)
2524
else:
2525
fullpath = fp
2526
views.check_path_in_view(tree, fullpath)
2527
except errors.FileOutsideView:
2528
continue
2585
2529
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:
2530
# Output the entry
2531
if prefix:
2532
fp = osutils.pathjoin(prefix, fp)
2533
kindch = entry.kind_character()
2534
outstring = fp + kindch
2535
ui.ui_factory.clear_term()
2536
if verbose:
2537
outstring = '%-8s %s' % (fc, outstring)
2538
if show_ids and fid is not None:
2539
outstring = "%-50s %s" % (outstring, fid)
2612
2540
self.outf.write(outstring + '\n')
2541
elif null:
2542
self.outf.write(fp + '\0')
2543
if show_ids:
2544
if fid is not None:
2545
self.outf.write(fid)
2546
self.outf.write('\0')
2547
self.outf.flush()
2548
else:
2549
if show_ids:
2550
if fid is not None:
2551
my_id = fid
2552
else:
2553
my_id = ''
2554
self.outf.write('%-50s %s\n' % (outstring, my_id))
2555
else:
2556
self.outf.write(outstring + '\n')
2557
finally:
2558
tree.unlock()
2613
2559
2614
2560
2615
2561
class cmd_unknowns(Command):
2616
__doc__ = """List unknown files.
2562
"""List unknown files.
2617
2563
"""
2618
2564
2619
2565
hidden = True
2620
2566
_see_also = ['ls']
2621
takes_options = ['directory']
2622
2567
2623
2568
@display_command
2624
def run(self, directory=u'.'):
2625
for f in WorkingTree.open_containing(directory)[0].unknowns():
2569
def run(self):
2570
for f in WorkingTree.open_containing(u'.')[0].unknowns():
2626
2571
self.outf.write(osutils.quotefn(f) + '\n')
2627
2572
2628
2573
2629
2574
class cmd_ignore(Command):
2630
__doc__ = """Ignore specified files or patterns.
2575
"""Ignore specified files or patterns.
2631
2576
2632
2577
See ``bzr help patterns`` for details on the syntax of patterns.
2633
2578
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
2579
To remove patterns from the ignore list, edit the .bzrignore file.
2641
2580
After adding, editing or deleting that file either indirectly by
2642
2581
using this command or directly by using an editor, be sure to commit
2643
2582
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
2583
2658
2584
Note: ignore patterns containing shell wildcards must be quoted from
2659
2585
the shell on Unix.
2663
2589
2664
2590
bzr ignore ./Makefile
2665
2591
2666
Ignore .class files in all directories...::
2592
Ignore class files in all directories::
2667
2593
2668
2594
bzr ignore "*.class"
2669
2595
2670
...but do not ignore "special.class"::
2671
2672
bzr ignore "!special.class"
2673
2674
2596
Ignore .o files under the lib directory::
2675
2597
2676
2598
bzr ignore "lib/**/*.o"
2682
2604
Ignore everything but the "debian" toplevel directory::
2683
2605
2684
2606
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
2607
"""
2693
2608
2694
2609
_see_also = ['status', 'ignored', 'patterns']
2695
2610
takes_args = ['name_pattern*']
2696
takes_options = ['directory',
2697
Option('default-rules',
2698
help='Display the default ignore rules that bzr uses.')
2611
takes_options = [
2612
Option('old-default-rules',
2613
help='Write out the ignore rules bzr < 0.9 always used.')
2699
2614
]
2700
2615
2701
def run(self, name_pattern_list=None, default_rules=None,
2702
directory=u'.'):
2616
def run(self, name_pattern_list=None, old_default_rules=None):
2703
2617
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)
2618
if old_default_rules is not None:
2619
# dump the rules and exit
2620
for pattern in ignores.OLD_DEFAULTS:
2621
print pattern
2708
2622
return
2709
2623
if not name_pattern_list:
2710
2624
raise errors.BzrCommandError("ignore requires at least one "
2711
"NAME_PATTERN or --default-rules.")
2625
"NAME_PATTERN or --old-default-rules")
2712
2626
name_pattern_list = [globbing.normalize_pattern(p)
2713
2627
for p in name_pattern_list]
2714
2628
for name_pattern in name_pattern_list:
2716
2630
(len(name_pattern) > 1 and name_pattern[1] == ':')):
2717
2631
raise errors.BzrCommandError(
2718
2632
"NAME_PATTERN should not be an absolute path")
2719
tree, relpath = WorkingTree.open_containing(directory)
2633
tree, relpath = WorkingTree.open_containing(u'.')
2720
2634
ignores.tree_ignores_add_patterns(tree, name_pattern_list)
2721
2635
ignored = globbing.Globster(name_pattern_list)
2722
2636
matches = []
2726
2640
if id is not None:
2727
2641
filename = entry[0]
2728
2642
if ignored.match(filename):
2729
matches.append(filename)
2643
matches.append(filename.encode('utf-8'))
2730
2644
tree.unlock()
2731
2645
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),))
2646
print "Warning: the following files are version controlled and" \
2647
" match your ignore pattern:\n%s" \
2648
"\nThese files will continue to be version controlled" \
2649
" unless you 'bzr remove' them." % ("\n".join(matches),)
2736
2650
2737
2651
2738
2652
class cmd_ignored(Command):
2739
__doc__ = """List ignored files and the patterns that matched them.
2653
"""List ignored files and the patterns that matched them.
2740
2654
2741
2655
List all the ignored files and the ignore pattern that caused the file to
2742
2656
be ignored.
2748
2662
2749
2663
encoding_type = 'replace'
2750
2664
_see_also = ['ignore', 'ls']
2751
takes_options = ['directory']
2752
2665
2753
2666
@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))
2667
def run(self):
2668
tree = WorkingTree.open_containing(u'.')[0]
2669
tree.lock_read()
2670
try:
2671
for path, file_class, kind, file_id, entry in tree.list_files():
2672
if file_class != 'I':
2673
continue
2674
## XXX: Slightly inefficient since this was already calculated
2675
pat = tree.is_ignored(path)
2676
self.outf.write('%-50s %s\n' % (path, pat))
2677
finally:
2678
tree.unlock()
2763
2679
2764
2680
2765
2681
class cmd_lookup_revision(Command):
2766
__doc__ = """Lookup the revision-id from a revision-number
2682
"""Lookup the revision-id from a revision-number
2767
2683
2768
2684
:Examples:
2769
2685
bzr lookup-revision 33
2770
2686
"""
2771
2687
hidden = True
2772
2688
takes_args = ['revno']
2773
takes_options = ['directory']
2774
2689
2775
2690
@display_command
2776
def run(self, revno, directory=u'.'):
2691
def run(self, revno):
2777
2692
try:
2778
2693
revno = int(revno)
2779
2694
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)
2695
raise errors.BzrCommandError("not a valid revision-number: %r" % revno)
2696
2697
print WorkingTree.open_containing(u'.')[0].branch.get_rev_id(revno)
2784
2698
2785
2699
2786
2700
class cmd_export(Command):
2787
__doc__ = """Export current or past revision to a destination directory or archive.
2701
"""Export current or past revision to a destination directory or archive.
2788
2702
2789
2703
If no revision is specified this exports the last committed revision.
2790
2704
2812
2726
================= =========================
2813
2727
"""
2814
2728
takes_args = ['dest', 'branch_or_subdir?']
2815
takes_options = ['directory',
2729
takes_options = [
2816
2730
Option('format',
2817
2731
help="Type of file to export to.",
2818
2732
type=unicode),
2822
2736
Option('root',
2823
2737
type=str,
2824
2738
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
2739
]
2829
2740
def run(self, dest, branch_or_subdir=None, revision=None, format=None,
2830
root=None, filters=False, per_file_timestamps=False, directory=u'.'):
2741
root=None, filters=False):
2831
2742
from bzrlib.export import export
2832
2743
2833
2744
if branch_or_subdir is None:
2834
tree = WorkingTree.open_containing(directory)[0]
2745
tree = WorkingTree.open_containing(u'.')[0]
2835
2746
b = tree.branch
2836
2747
subdir = None
2837
2748
else:
2840
2751
2841
2752
rev_tree = _get_one_revision_tree('export', revision, branch=b, tree=tree)
2842
2753
try:
2843
export(rev_tree, dest, format, root, subdir, filtered=filters,
2844
per_file_timestamps=per_file_timestamps)
2754
export(rev_tree, dest, format, root, subdir, filtered=filters)
2845
2755
except errors.NoSuchExportFormat, e:
2846
2756
raise errors.BzrCommandError('Unsupported export format: %s' % e.format)
2847
2757
2848
2758
2849
2759
class cmd_cat(Command):
2850
__doc__ = """Write the contents of a file as of a given revision to standard output.
2760
"""Write the contents of a file as of a given revision to standard output.
2851
2761
2852
2762
If no revision is nominated, the last revision is used.
2853
2763
2856
2766
"""
2857
2767
2858
2768
_see_also = ['ls']
2859
takes_options = ['directory',
2769
takes_options = [
2860
2770
Option('name-from-revision', help='The path name in the old tree.'),
2861
2771
Option('filters', help='Apply content filters to display the '
2862
2772
'convenience form.'),
2867
2777
2868
2778
@display_command
2869
2779
def run(self, filename, revision=None, name_from_revision=False,
2870
filters=False, directory=None):
2780
filters=False):
2871
2781
if revision is not None and len(revision) != 1:
2872
2782
raise errors.BzrCommandError("bzr cat --revision takes exactly"
2873
2783
" one revision specifier")
2874
2784
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)
2785
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
2786
branch.lock_read()
2787
try:
2788
return self._run(tree, branch, relpath, filename, revision,
2789
name_from_revision, filters)
2790
finally:
2791
branch.unlock()
2879
2792
2880
2793
def _run(self, tree, b, relpath, filename, revision, name_from_revision,
2881
2794
filtered):
2882
2795
if tree is None:
2883
2796
tree = b.basis_tree()
2884
2797
rev_tree = _get_one_revision_tree('cat', revision, branch=b)
2885
self.add_cleanup(rev_tree.lock_read().unlock)
2886
2798
2887
2799
old_file_id = rev_tree.path2id(relpath)
2888
2800
2923
2835
chunks = content.splitlines(True)
2924
2836
content = filtered_output_bytes(chunks, filters,
2925
2837
ContentFilterContext(relpath, rev_tree))
2926
self.cleanup_now()
2927
2838
self.outf.writelines(content)
2928
2839
else:
2929
self.cleanup_now()
2930
2840
self.outf.write(content)
2931
2841
2932
2842
2933
2843
class cmd_local_time_offset(Command):
2934
__doc__ = """Show the offset in seconds from GMT to local time."""
2844
"""Show the offset in seconds from GMT to local time."""
2935
2845
hidden = True
2936
2846
@display_command
2937
2847
def run(self):
2938
self.outf.write("%s\n" % osutils.local_time_offset())
2848
print osutils.local_time_offset()
2939
2849
2940
2850
2941
2851
2942
2852
class cmd_commit(Command):
2943
__doc__ = """Commit changes into a new revision.
2853
"""Commit changes into a new revision.
2944
2854
2945
2855
An explanatory message needs to be given for each commit. This is
2946
2856
often done by using the --message option (getting the message from the
3039
2949
Option('strict',
3040
2950
help="Refuse to commit if there are unknown "
3041
2951
"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
2952
ListOption('fixes', type=str,
3046
2953
help="Mark a bug as being fixed by this revision "
3047
2954
"(see \"bzr help bugs\")."),
3054
2961
"the master branch until a normal commit "
3055
2962
"is performed."
3056
2963
),
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.'),
2964
Option('show-diff',
2965
help='When no message is supplied, show the diff along'
2966
' with the status summary in the message editor.'),
3060
2967
]
3061
2968
aliases = ['ci', 'checkin']
3062
2969
3081
2988
3082
2989
def run(self, message=None, file=None, verbose=False, selected_list=None,
3083
2990
unchanged=False, strict=False, local=False, fixes=None,
3084
author=None, show_diff=False, exclude=None, commit_time=None):
2991
author=None, show_diff=False, exclude=None):
3085
2992
from bzrlib.errors import (
3086
2993
PointlessCommit,
3087
2994
ConflictsInTree,
3093
3000
make_commit_message_template_encoded
3094
3001
)
3095
3002
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
3003
# TODO: Need a blackbox test for invoking the external editor; may be
3105
3004
# slightly problematic to run this cross-platform.
3106
3005
3126
3025
if local and not tree.branch.get_bound_location():
3127
3026
raise errors.LocalRequiresBoundBranch()
3128
3027
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
3028
def get_message(commit_obj):
3151
3029
"""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,
3030
my_message = message
3031
if my_message is not None and '\r' in my_message:
3032
my_message = my_message.replace('\r\n', '\n')
3033
my_message = my_message.replace('\r', '\n')
3034
if my_message is None and not file:
3035
t = make_commit_message_template_encoded(tree,
3161
3036
selected_list, diff=show_diff,
3162
3037
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
3038
start_message = generate_commit_message_template(commit_obj)
3169
my_message = edit_commit_message_encoded(text,
3039
my_message = edit_commit_message_encoded(t,
3170
3040
start_message=start_message)
3171
3041
if my_message is None:
3172
3042
raise errors.BzrCommandError("please specify a commit"
3173
3043
" message with either --message or --file")
3044
elif my_message and file:
3045
raise errors.BzrCommandError(
3046
"please specify either --message or --file")
3047
if file:
3048
my_message = codecs.open(file, 'rt',
3049
osutils.get_user_encoding()).read()
3174
3050
if my_message == "":
3175
3051
raise errors.BzrCommandError("empty commit message specified")
3176
3052
return my_message
3184
3060
specific_files=selected_list,
3185
3061
allow_pointless=unchanged, strict=strict, local=local,
3186
3062
reporter=None, verbose=verbose, revprops=properties,
3187
authors=author, timestamp=commit_stamp,
3188
timezone=offset,
3063
authors=author,
3189
3064
exclude=safe_relpath_files(tree, exclude))
3190
3065
except PointlessCommit:
3066
# FIXME: This should really happen before the file is read in;
3067
# perhaps prepare the commit; get the message; then actually commit
3191
3068
raise errors.BzrCommandError("No changes to commit."
3192
3069
" Use --unchanged to commit anyhow.")
3193
3070
except ConflictsInTree:
3198
3075
raise errors.BzrCommandError("Commit refused because there are"
3199
3076
" unknown files in the working tree.")
3200
3077
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
3078
raise errors.BzrCommandError(str(e) + "\n"
3079
'To commit to master branch, run update and then commit.\n'
3080
'You can also pass --local to commit to continue working '
3081
'disconnected.')
3206
3082
3207
3083
3208
3084
class cmd_check(Command):
3209
__doc__ = """Validate working tree structure, branch consistency and repository history.
3085
"""Validate working tree structure, branch consistency and repository history.
3210
3086
3211
3087
This command checks various invariants about branch and repository storage
3212
3088
to detect data corruption or bzr bugs.
3276
3152
3277
3153
3278
3154
class cmd_upgrade(Command):
3279
__doc__ = """Upgrade branch storage to current format.
3155
"""Upgrade branch storage to current format.
3280
3156
3281
3157
The check command or bzr developers may sometimes advise you to run
3282
3158
this command. When the default format has changed you may also be warned
3300
3176
3301
3177
3302
3178
class cmd_whoami(Command):
3303
__doc__ = """Show or set bzr user id.
3179
"""Show or set bzr user id.
3304
3180
3305
3181
:Examples:
3306
3182
Show the email of the current user::
3350
3226
3351
3227
3352
3228
class cmd_nick(Command):
3353
__doc__ = """Print or set the branch nickname.
3229
"""Print or set the branch nickname.
3354
3230
3355
3231
If unset, the tree root directory name is used as the nickname.
3356
3232
To print the current nickname, execute with no argument.
3361
3237
3362
3238
_see_also = ['info']
3363
3239
takes_args = ['nickname?']
3364
takes_options = ['directory']
3365
def run(self, nickname=None, directory=u'.'):
3366
branch = Branch.open_containing(directory)[0]
3240
def run(self, nickname=None):
3241
branch = Branch.open_containing(u'.')[0]
3367
3242
if nickname is None:
3368
3243
self.printme(branch)
3369
3244
else:
3371
3246
3372
3247
@display_command
3373
3248
def printme(self, branch):
3374
self.outf.write('%s\n' % branch.nick)
3249
print branch.nick
3375
3250
3376
3251
3377
3252
class cmd_alias(Command):
3378
__doc__ = """Set/unset and display aliases.
3253
"""Set/unset and display aliases.
3379
3254
3380
3255
:Examples:
3381
3256
Show the current aliases::
3445
3320
3446
3321
3447
3322
class cmd_selftest(Command):
3448
__doc__ = """Run internal test suite.
3323
"""Run internal test suite.
3449
3324
3450
3325
If arguments are given, they are regular expressions that say which tests
3451
3326
should run. Tests matching any expression are run, and other tests are
3495
3370
def get_transport_type(typestring):
3496
3371
"""Parse and return a transport specifier."""
3497
3372
if typestring == "sftp":
3498
from bzrlib.tests import stub_sftp
3499
return stub_sftp.SFTPAbsoluteServer
3373
from bzrlib.transport.sftp import SFTPAbsoluteServer
3374
return SFTPAbsoluteServer
3500
3375
if typestring == "memory":
3501
from bzrlib.tests import test_server
3502
return memory.MemoryServer
3376
from bzrlib.transport.memory import MemoryServer
3377
return MemoryServer
3503
3378
if typestring == "fakenfs":
3504
from bzrlib.tests import test_server
3505
return test_server.FakeNFSServer
3379
from bzrlib.transport.fakenfs import FakeNFSServer
3380
return FakeNFSServer
3506
3381
msg = "No known transport type %s. Supported types are: sftp\n" %\
3507
3382
(typestring)
3508
3383
raise errors.BzrCommandError(msg)
3592
3467
raise errors.BzrCommandError("subunit not available. subunit "
3593
3468
"needs to be installed to use --subunit.")
3594
3469
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
3470
if parallel:
3601
3471
self.additional_selftest_args.setdefault(
3602
3472
'suite_decorators', []).append(parallel)
3606
3476
verbose = not is_quiet()
3607
3477
# TODO: should possibly lock the history file...
3608
3478
benchfile = open(".perf_history", "at", buffering=1)
3609
self.add_cleanup(benchfile.close)
3610
3479
else:
3611
3480
test_suite_factory = None
3612
3481
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)
3482
try:
3483
selftest_kwargs = {"verbose": verbose,
3484
"pattern": pattern,
3485
"stop_on_failure": one,
3486
"transport": transport,
3487
"test_suite_factory": test_suite_factory,
3488
"lsprof_timed": lsprof_timed,
3489
"lsprof_tests": lsprof_tests,
3490
"bench_history": benchfile,
3491
"matching_tests_first": first,
3492
"list_only": list_only,
3493
"random_seed": randomize,
3494
"exclude_pattern": exclude,
3495
"strict": strict,
3496
"load_list": load_list,
3497
"debug_flags": debugflag,
3498
"starting_with": starting_with
3499
}
3500
selftest_kwargs.update(self.additional_selftest_args)
3501
result = selftest(**selftest_kwargs)
3502
finally:
3503
if benchfile is not None:
3504
benchfile.close()
3632
3505
return int(not result)
3633
3506
3634
3507
3635
3508
class cmd_version(Command):
3636
__doc__ = """Show version of bzr."""
3509
"""Show version of bzr."""
3637
3510
3638
3511
encoding_type = 'replace'
3639
3512
takes_options = [
3650
3523
3651
3524
3652
3525
class cmd_rocks(Command):
3653
__doc__ = """Statement of optimism."""
3526
"""Statement of optimism."""
3654
3527
3655
3528
hidden = True
3656
3529
3657
3530
@display_command
3658
3531
def run(self):
3659
self.outf.write("It sure does!\n")
3532
print "It sure does!"
3660
3533
3661
3534
3662
3535
class cmd_find_merge_base(Command):
3663
__doc__ = """Find and print a base revision for merging two branches."""
3536
"""Find and print a base revision for merging two branches."""
3664
3537
# TODO: Options to specify revisions on either side, as if
3665
3538
# merging only part of the history.
3666
3539
takes_args = ['branch', 'other']
3672
3545
3673
3546
branch1 = Branch.open_containing(branch)[0]
3674
3547
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)
3548
branch1.lock_read()
3549
try:
3550
branch2.lock_read()
3551
try:
3552
last1 = ensure_null(branch1.last_revision())
3553
last2 = ensure_null(branch2.last_revision())
3554
3555
graph = branch1.repository.get_graph(branch2.repository)
3556
base_rev_id = graph.find_unique_lca(last1, last2)
3557
3558
print 'merge base is revision %s' % base_rev_id
3559
finally:
3560
branch2.unlock()
3561
finally:
3562
branch1.unlock()
3684
3563
3685
3564
3686
3565
class cmd_merge(Command):
3687
__doc__ = """Perform a three-way merge.
3566
"""Perform a three-way merge.
3688
3567
3689
3568
The source of the merge can be specified either in the form of a branch,
3690
3569
or in the form of a path to a file containing a merge directive generated
3719
3598
committed to record the result of the merge.
3720
3599
3721
3600
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.
3601
--force is given.
3728
3602
3729
3603
To select only some changes to merge, use "merge -i", which will prompt
3730
3604
you to apply each diff hunk and file change, similar to "shelve".
3742
3616
3743
3617
bzr merge -r 81..82 ../bzr.dev
3744
3618
3745
To apply a merge directive contained in /tmp/merge::
3619
To apply a merge directive contained in /tmp/merge:
3746
3620
3747
3621
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
3622
"""
3756
3623
3757
3624
encoding_type = 'exact'
3773
3640
' completely merged into the source, pull from the'
3774
3641
' source rather than merging. When this happens,'
3775
3642
' you do not need to commit the result.'),
3776
custom_help('directory',
3643
Option('directory',
3777
3644
help='Branch to merge into, '
3778
'rather than the one containing the working directory.'),
3645
'rather than the one containing the working directory.',
3646
short_name='d',
3647
type=unicode,
3648
),
3779
3649
Option('preview', help='Instead of merging, show a diff of the'
3780
3650
' merge.'),
3781
3651
Option('interactive', help='Select changes interactively.',
3812
3682
view_info = _get_view_info_for_change_reporter(tree)
3813
3683
change_reporter = delta._ChangeReporter(
3814
3684
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
3685
cleanups = []
3686
try:
3687
pb = ui.ui_factory.nested_progress_bar()
3688
cleanups.append(pb.finished)
3689
tree.lock_write()
3690
cleanups.append(tree.unlock)
3691
if location is not None:
3692
try:
3693
mergeable = bundle.read_mergeable_from_url(location,
3694
possible_transports=possible_transports)
3695
except errors.NotABundle:
3696
mergeable = None
3697
else:
3698
if uncommitted:
3699
raise errors.BzrCommandError('Cannot use --uncommitted'
3700
' with bundles or merge directives.')
3701
3702
if revision is not None:
3703
raise errors.BzrCommandError(
3704
'Cannot use -r with merge directives or bundles')
3705
merger, verified = _mod_merge.Merger.from_mergeable(tree,
3706
mergeable, pb)
3707
3708
if merger is None and uncommitted:
3709
if revision is not None and len(revision) > 0:
3710
raise errors.BzrCommandError('Cannot use --uncommitted and'
3711
' --revision at the same time.')
3712
merger = self.get_merger_from_uncommitted(tree, location, pb,
3713
cleanups)
3714
allow_pending = False
3715
3716
if merger is None:
3717
merger, allow_pending = self._get_merger_from_branch(tree,
3718
location, revision, remember, possible_transports, pb)
3719
3720
merger.merge_type = merge_type
3721
merger.reprocess = reprocess
3722
merger.show_base = show_base
3723
self.sanity_check_merger(merger)
3724
if (merger.base_rev_id == merger.other_rev_id and
3725
merger.other_rev_id is not None):
3726
note('Nothing to do.')
3727
return 0
3728
if pull:
3729
if merger.interesting_files is not None:
3730
raise errors.BzrCommandError('Cannot pull individual files')
3731
if (merger.base_rev_id == tree.last_revision()):
3732
result = tree.pull(merger.other_branch, False,
3733
merger.other_rev_id)
3734
result.report(self.outf)
3735
return 0
3736
if merger.this_basis is None:
3737
raise errors.BzrCommandError(
3738
"This branch has no commits."
3739
" (perhaps you would prefer 'bzr pull')")
3740
if preview:
3741
return self._do_preview(merger, cleanups)
3742
elif interactive:
3743
return self._do_interactive(merger, cleanups)
3824
3744
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):
3745
return self._do_merge(merger, change_reporter, allow_pending,
3746
verified)
3747
finally:
3748
for cleanup in reversed(cleanups):
3749
cleanup()
3750
3751
def _get_preview(self, merger, cleanups):
3875
3752
tree_merger = merger.make_merger()
3876
3753
tt = tree_merger.make_preview_transform()
3877
self.add_cleanup(tt.finalize)
3754
cleanups.append(tt.finalize)
3878
3755
result_tree = tt.get_preview_tree()
3879
3756
return result_tree
3880
3757
3881
def _do_preview(self, merger):
3758
def _do_preview(self, merger, cleanups):
3882
3759
from bzrlib.diff import show_diff_trees
3883
result_tree = self._get_preview(merger)
3760
result_tree = self._get_preview(merger, cleanups)
3884
3761
show_diff_trees(merger.this_tree, result_tree, self.outf,
3885
3762
old_label='', new_label='')
3886
3763
3896
3773
else:
3897
3774
return 0
3898
3775
3899
def _do_interactive(self, merger):
3776
def _do_interactive(self, merger, cleanups):
3900
3777
"""Perform an interactive merge.
3901
3778
3902
3779
This works by generating a preview tree of the merge, then using
3904
3781
and the preview tree.
3905
3782
"""
3906
3783
from bzrlib import shelf_ui
3907
result_tree = self._get_preview(merger)
3784
result_tree = self._get_preview(merger, cleanups)
3908
3785
writer = bzrlib.option.diff_writer_registry.get()
3909
3786
shelver = shelf_ui.Shelver(merger.this_tree, result_tree, destroy=True,
3910
3787
reporter=shelf_ui.ApplyReporter(),
3911
3788
diff_writer=writer(sys.stdout))
3912
try:
3913
shelver.run()
3914
finally:
3915
shelver.finalize()
3789
shelver.run()
3916
3790
3917
3791
def sanity_check_merger(self, merger):
3918
3792
if (merger.show_base and
3978
3852
allow_pending = True
3979
3853
return merger, allow_pending
3980
3854
3981
def get_merger_from_uncommitted(self, tree, location, pb):
3855
def get_merger_from_uncommitted(self, tree, location, pb, cleanups):
3982
3856
"""Get a merger for uncommitted changes.
3983
3857
3984
3858
:param tree: The tree the merger should apply to.
3985
3859
:param location: The location containing uncommitted changes.
3986
3860
:param pb: The progress bar to use for showing progress.
3861
:param cleanups: A list of operations to perform to clean up the
3862
temporary directories, unfinalized objects, etc.
3987
3863
"""
3988
3864
location = self._select_branch_location(tree, location)[0]
3989
3865
other_tree, other_path = WorkingTree.open_containing(location)
4041
3917
4042
3918
4043
3919
class cmd_remerge(Command):
4044
__doc__ = """Redo a merge.
3920
"""Redo a merge.
4045
3921
4046
3922
Use this if you want to try a different merge technique while resolving
4047
3923
conflicts. Some merge techniques are better than others, and remerge
4072
3948
4073
3949
def run(self, file_list=None, merge_type=None, show_base=False,
4074
3950
reprocess=False):
4075
from bzrlib.conflicts import restore
4076
3951
if merge_type is None:
4077
3952
merge_type = _mod_merge.Merge3Merger
4078
3953
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
3954
tree.lock_write()
3955
try:
3956
parents = tree.get_parent_ids()
3957
if len(parents) != 2:
3958
raise errors.BzrCommandError("Sorry, remerge only works after normal"
3959
" merges. Not cherrypicking or"
3960
" multi-merges.")
3961
repository = tree.branch.repository
3962
interesting_ids = None
3963
new_conflicts = []
3964
conflicts = tree.conflicts()
3965
if file_list is not None:
3966
interesting_ids = set()
3967
for filename in file_list:
3968
file_id = tree.path2id(filename)
3969
if file_id is None:
3970
raise errors.NotVersionedError(filename)
3971
interesting_ids.add(file_id)
3972
if tree.kind(file_id) != "directory":
3973
continue
4098
3974
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:
3975
for name, ie in tree.inventory.iter_entries(file_id):
3976
interesting_ids.add(ie.file_id)
3977
new_conflicts = conflicts.select_conflicts(tree, file_list)[0]
3978
else:
3979
# Remerge only supports resolving contents conflicts
3980
allowed_conflicts = ('text conflict', 'contents conflict')
3981
restore_files = [c.path for c in conflicts
3982
if c.typestring in allowed_conflicts]
3983
_mod_merge.transform_tree(tree, tree.basis_tree(), interesting_ids)
3984
tree.set_conflicts(ConflictList(new_conflicts))
3985
if file_list is not None:
3986
restore_files = file_list
3987
for filename in restore_files:
3988
try:
3989
restore(tree.abspath(filename))
3990
except errors.NotConflicted:
3991
pass
3992
# Disable pending merges, because the file texts we are remerging
3993
# have not had those merges performed. If we use the wrong parents
3994
# list, we imply that the working tree text has seen and rejected
3995
# all the changes from the other tree, when in fact those changes
3996
# have not yet been seen.
3997
pb = ui.ui_factory.nested_progress_bar()
3998
tree.set_parent_ids(parents[:1])
4112
3999
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()
4000
merger = _mod_merge.Merger.from_revision_ids(pb,
4001
tree, parents[1])
4002
merger.interesting_ids = interesting_ids
4003
merger.merge_type = merge_type
4004
merger.show_base = show_base
4005
merger.reprocess = reprocess
4006
conflicts = merger.do_merge()
4007
finally:
4008
tree.set_parent_ids(parents)
4009
pb.finished()
4129
4010
finally:
4130
tree.set_parent_ids(parents)
4011
tree.unlock()
4131
4012
if conflicts > 0:
4132
4013
return 1
4133
4014
else:
4135
4016
4136
4017
4137
4018
class cmd_revert(Command):
4138
__doc__ = """Revert files to a previous revision.
4019
"""Revert files to a previous revision.
4139
4020
4140
4021
Giving a list of files will revert only those files. Otherwise, all files
4141
4022
will be reverted. If the revision is not specified with '--revision', the
4155
4036
name. If you name a directory, all the contents of that directory will be
4156
4037
reverted.
4157
4038
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.
4039
Any files that have been newly added since that revision will be deleted,
4040
with a backup kept if appropriate. Directories containing unknown files
4041
will not be deleted.
4162
4042
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
4043
The working tree contains a list of pending merged revisions, which will
4044
be included as parents in the next commit. Normally, revert clears that
4045
list as well as reverting the files. If any files are specified, revert
4046
leaves the pending merge list alone and reverts only the files. Use "bzr
4047
revert ." in the tree root to revert all files but keep the merge record,
4048
and "bzr revert --forget-merges" to clear the pending merge list without
4170
4049
reverting any files.
4171
4050
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
4051
Using "bzr revert --forget-merges", it is possible to apply the changes
4052
from an arbitrary merge as a single revision. To do this, perform the
4053
merge as desired. Then doing revert with the "--forget-merges" option will
4054
keep the content of the tree as it was, but it will clear the list of
4055
pending merges. The next commit will then contain all of the changes that
4056
would have been in the merge, but without any mention of the other parent
4057
revisions. Because this technique forgets where these changes originated,
4058
it may cause additional conflicts on later merges involving the source and
4180
4059
target branches.
4181
4060
"""
4182
4061
4192
4071
def run(self, revision=None, no_backup=False, file_list=None,
4193
4072
forget_merges=None):
4194
4073
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)
4074
tree.lock_write()
4075
try:
4076
if forget_merges:
4077
tree.set_parent_ids(tree.get_parent_ids()[:1])
4078
else:
4079
self._revert_tree_to_revision(tree, revision, file_list, no_backup)
4080
finally:
4081
tree.unlock()
4200
4082
4201
4083
@staticmethod
4202
4084
def _revert_tree_to_revision(tree, revision, file_list, no_backup):
4203
4085
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)
4086
pb = ui.ui_factory.nested_progress_bar()
4087
try:
4088
tree.revert(file_list, rev_tree, not no_backup, pb,
4089
report_changes=True)
4090
finally:
4091
pb.finished()
4206
4092
4207
4093
4208
4094
class cmd_assert_fail(Command):
4209
__doc__ = """Test reporting of assertion failures"""
4095
"""Test reporting of assertion failures"""
4210
4096
# intended just for use in testing
4211
4097
4212
4098
hidden = True
4216
4102
4217
4103
4218
4104
class cmd_help(Command):
4219
__doc__ = """Show help on a command or other topic.
4105
"""Show help on a command or other topic.
4220
4106
"""
4221
4107
4222
4108
_see_also = ['topics']
4235
4121
4236
4122
4237
4123
class cmd_shell_complete(Command):
4238
__doc__ = """Show appropriate completions for context.
4124
"""Show appropriate completions for context.
4239
4125
4240
4126
For a list of all available commands, say 'bzr shell-complete'.
4241
4127
"""
4250
4136
4251
4137
4252
4138
class cmd_missing(Command):
4253
__doc__ = """Show unmerged/unpulled revisions between two branches.
4139
"""Show unmerged/unpulled revisions between two branches.
4254
4140
4255
4141
OTHER_BRANCH may be local or remote.
4256
4142
4257
4143
To filter on a range of revisions, you can use the command -r begin..end
4258
4144
-r revision requests a specific revision, -r ..end or -r begin.. are
4259
4145
also valid.
4260
4261
:Exit values:
4262
1 - some missing revisions
4263
0 - no missing revisions
4264
4146
4265
4147
:Examples:
4266
4148
4334
4216
restrict = 'remote'
4335
4217
4336
4218
local_branch = Branch.open_containing(u".")[0]
4337
self.add_cleanup(local_branch.lock_read().unlock)
4338
4339
4219
parent = local_branch.get_parent()
4340
4220
if other_branch is None:
4341
4221
other_branch = parent
4350
4230
remote_branch = Branch.open(other_branch)
4351
4231
if remote_branch.base == local_branch.base:
4352
4232
remote_branch = local_branch
4353
else:
4354
self.add_cleanup(remote_branch.lock_read().unlock)
4355
4233
4356
4234
local_revid_range = _revision_range_to_revid_range(
4357
4235
_get_revision_range(my_revision, local_branch,
4361
4239
_get_revision_range(revision,
4362
4240
remote_branch, self.name()))
4363
4241
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()
4242
local_branch.lock_read()
4243
try:
4244
remote_branch.lock_read()
4245
try:
4246
local_extra, remote_extra = find_unmerged(
4247
local_branch, remote_branch, restrict,
4248
backward=not reverse,
4249
include_merges=include_merges,
4250
local_revid_range=local_revid_range,
4251
remote_revid_range=remote_revid_range)
4252
4253
if log_format is None:
4254
registry = log.log_formatter_registry
4255
log_format = registry.get_default(local_branch)
4256
lf = log_format(to_file=self.outf,
4257
show_ids=show_ids,
4258
show_timezone='original')
4259
4260
status_code = 0
4261
if local_extra and not theirs_only:
4262
message("You have %d extra revision(s):\n" %
4263
len(local_extra))
4264
for revision in iter_log_revisions(local_extra,
4265
local_branch.repository,
4266
verbose):
4267
lf.log_revision(revision)
4268
printed_local = True
4269
status_code = 1
4270
else:
4271
printed_local = False
4272
4273
if remote_extra and not mine_only:
4274
if printed_local is True:
4275
message("\n\n\n")
4276
message("You are missing %d revision(s):\n" %
4277
len(remote_extra))
4278
for revision in iter_log_revisions(remote_extra,
4279
remote_branch.repository,
4280
verbose):
4281
lf.log_revision(revision)
4282
status_code = 1
4283
4284
if mine_only and not local_extra:
4285
# We checked local, and found nothing extra
4286
message('This branch is up to date.\n')
4287
elif theirs_only and not remote_extra:
4288
# We checked remote, and found nothing extra
4289
message('Other branch is up to date.\n')
4290
elif not (mine_only or theirs_only or local_extra or
4291
remote_extra):
4292
# We checked both branches, and neither one had extra
4293
# revisions
4294
message("Branches are up to date.\n")
4295
finally:
4296
remote_branch.unlock()
4297
finally:
4298
local_branch.unlock()
4414
4299
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)
4300
local_branch.lock_write()
4301
try:
4302
# handle race conditions - a parent might be set while we run.
4303
if local_branch.get_parent() is None:
4304
local_branch.set_parent(remote_branch.base)
4305
finally:
4306
local_branch.unlock()
4419
4307
return status_code
4420
4308
4421
4309
4422
4310
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
"""
4311
"""Compress the data within a repository."""
4440
4312
4441
4313
_see_also = ['repositories']
4442
4314
takes_args = ['branch_or_repo?']
4443
takes_options = [
4444
Option('clean-obsolete-packs', 'Delete obsolete packs to save disk space.'),
4445
]
4446
4315
4447
def run(self, branch_or_repo='.', clean_obsolete_packs=False):
4316
def run(self, branch_or_repo='.'):
4448
4317
dir = bzrdir.BzrDir.open_containing(branch_or_repo)[0]
4449
4318
try:
4450
4319
branch = dir.open_branch()
4451
4320
repository = branch.repository
4452
4321
except errors.NotBranchError:
4453
4322
repository = dir.open_repository()
4454
repository.pack(clean_obsolete_packs=clean_obsolete_packs)
4323
repository.pack()
4455
4324
4456
4325
4457
4326
class cmd_plugins(Command):
4458
__doc__ = """List the installed plugins.
4327
"""List the installed plugins.
4459
4328
4460
4329
This command displays the list of installed plugins including
4461
4330
version of plugin and a short description of each.
4468
4337
adding new commands, providing additional network transports and
4469
4338
customizing log output.
4470
4339
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.
4340
See the Bazaar web site, http://bazaar-vcs.org, for further
4341
information on plugins including where to find them and how to
4342
install them. Instructions are also provided there on how to
4343
write new plugins using the Python programming language.
4475
4344
"""
4476
4345
takes_options = ['verbose']
4477
4346
4492
4361
doc = '(no description)'
4493
4362
result.append((name_ver, doc, plugin.path()))
4494
4363
for name_ver, doc, path in sorted(result):
4495
self.outf.write("%s\n" % name_ver)
4496
self.outf.write(" %s\n" % doc)
4364
print name_ver
4365
print ' ', doc
4497
4366
if verbose:
4498
self.outf.write(" %s\n" % path)
4499
self.outf.write("\n")
4367
print ' ', path
4368
print
4500
4369
4501
4370
4502
4371
class cmd_testament(Command):
4503
__doc__ = """Show testament (signing-form) of a revision."""
4372
"""Show testament (signing-form) of a revision."""
4504
4373
takes_options = [
4505
4374
'revision',
4506
4375
Option('long', help='Produce long-format testament.'),
4518
4387
b = Branch.open_containing(branch)[0]
4519
4388
else:
4520
4389
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())
4390
b.lock_read()
4391
try:
4392
if revision is None:
4393
rev_id = b.last_revision()
4394
else:
4395
rev_id = revision[0].as_revision_id(b)
4396
t = testament_class.from_revision(b.repository, rev_id)
4397
if long:
4398
sys.stdout.writelines(t.as_text_lines())
4399
else:
4400
sys.stdout.write(t.as_short_text())
4401
finally:
4402
b.unlock()
4531
4403
4532
4404
4533
4405
class cmd_annotate(Command):
4534
__doc__ = """Show the origin of each line in a file.
4406
"""Show the origin of each line in a file.
4535
4407
4536
4408
This prints out the given file with an annotation on the left side
4537
4409
indicating which revision, author and date introduced the change.
4548
4420
Option('long', help='Show commit date in annotations.'),
4549
4421
'revision',
4550
4422
'show-ids',
4551
'directory',
4552
4423
]
4553
4424
encoding_type = 'exact'
4554
4425
4555
4426
@display_command
4556
4427
def run(self, filename, all=False, long=False, revision=None,
4557
show_ids=False, directory=None):
4428
show_ids=False):
4558
4429
from bzrlib.annotate import annotate_file, annotate_file_tree
4559
4430
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)
4431
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
4432
if wt is not None:
4433
wt.lock_read()
4434
else:
4435
branch.lock_read()
4436
try:
4437
tree = _get_one_revision_tree('annotate', revision, branch=branch)
4438
if wt is not None:
4439
file_id = wt.path2id(relpath)
4440
else:
4441
file_id = tree.path2id(relpath)
4442
if file_id is None:
4443
raise errors.NotVersionedError(filename)
4444
file_version = tree.inventory[file_id].revision
4445
if wt is not None and revision is None:
4446
# If there is a tree and we're not annotating historical
4447
# versions, annotate the working tree's content.
4448
annotate_file_tree(wt, file_id, self.outf, long, all,
4449
show_ids=show_ids)
4450
else:
4451
annotate_file(branch, file_version, file_id, long, all, self.outf,
4452
show_ids=show_ids)
4453
finally:
4454
if wt is not None:
4455
wt.unlock()
4456
else:
4457
branch.unlock()
4582
4458
4583
4459
4584
4460
class cmd_re_sign(Command):
4585
__doc__ = """Create a digital signature for an existing revision."""
4461
"""Create a digital signature for an existing revision."""
4586
4462
# TODO be able to replace existing ones.
4587
4463
4588
4464
hidden = True # is this right ?
4589
4465
takes_args = ['revision_id*']
4590
takes_options = ['directory', 'revision']
4466
takes_options = ['revision']
4591
4467
4592
def run(self, revision_id_list=None, revision=None, directory=u'.'):
4468
def run(self, revision_id_list=None, revision=None):
4593
4469
if revision_id_list is not None and revision is not None:
4594
4470
raise errors.BzrCommandError('You can only supply one of revision_id or --revision')
4595
4471
if revision_id_list is None and revision is None:
4596
4472
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)
4473
b = WorkingTree.open_containing(u'.')[0].branch
4474
b.lock_write()
4475
try:
4476
return self._run(b, revision_id_list, revision)
4477
finally:
4478
b.unlock()
4600
4479
4601
4480
def _run(self, b, revision_id_list, revision):
4602
4481
import bzrlib.gpg as gpg
4647
4526
4648
4527
4649
4528
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.
4529
"""Convert the current branch into a checkout of the supplied branch.
4652
4530
4653
4531
Once converted into a checkout, commits must succeed on the master branch
4654
4532
before they will be applied to the local branch.
4660
4538
4661
4539
_see_also = ['checkouts', 'unbind']
4662
4540
takes_args = ['location?']
4663
takes_options = ['directory']
4541
takes_options = []
4664
4542
4665
def run(self, location=None, directory=u'.'):
4666
b, relpath = Branch.open_containing(directory)
4543
def run(self, location=None):
4544
b, relpath = Branch.open_containing(u'.')
4667
4545
if location is None:
4668
4546
try:
4669
4547
location = b.get_old_bound_location()
4672
4550
'This format does not remember old locations.')
4673
4551
else:
4674
4552
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')
4553
raise errors.BzrCommandError('No location supplied and no '
4554
'previous location known')
4680
4555
b_other = Branch.open(location)
4681
4556
try:
4682
4557
b.bind(b_other)
4688
4563
4689
4564
4690
4565
class cmd_unbind(Command):
4691
__doc__ = """Convert the current checkout into a regular branch.
4566
"""Convert the current checkout into a regular branch.
4692
4567
4693
4568
After unbinding, the local branch is considered independent and subsequent
4694
4569
commits will be local only.
4696
4571
4697
4572
_see_also = ['checkouts', 'bind']
4698
4573
takes_args = []
4699
takes_options = ['directory']
4574
takes_options = []
4700
4575
4701
def run(self, directory=u'.'):
4702
b, relpath = Branch.open_containing(directory)
4576
def run(self):
4577
b, relpath = Branch.open_containing(u'.')
4703
4578
if not b.unbind():
4704
4579
raise errors.BzrCommandError('Local branch is not bound')
4705
4580
4706
4581
4707
4582
class cmd_uncommit(Command):
4708
__doc__ = """Remove the last committed revision.
4583
"""Remove the last committed revision.
4709
4584
4710
4585
--verbose will print out what is being removed.
4711
4586
--dry-run will go through all the motions, but not actually
4751
4626
b = control.open_branch()
4752
4627
4753
4628
if tree is not None:
4754
self.add_cleanup(tree.lock_write().unlock)
4629
tree.lock_write()
4755
4630
else:
4756
self.add_cleanup(b.lock_write().unlock)
4757
return self._run(b, tree, dry_run, verbose, revision, force, local=local)
4631
b.lock_write()
4632
try:
4633
return self._run(b, tree, dry_run, verbose, revision, force,
4634
local=local)
4635
finally:
4636
if tree is not None:
4637
tree.unlock()
4638
else:
4639
b.unlock()
4758
4640
4759
4641
def _run(self, b, tree, dry_run, verbose, revision, force, local=False):
4760
4642
from bzrlib.log import log_formatter, show_log
4792
4674
end_revision=last_revno)
4793
4675
4794
4676
if dry_run:
4795
self.outf.write('Dry-run, pretending to remove'
4796
' the above revisions.\n')
4677
print 'Dry-run, pretending to remove the above revisions.'
4678
if not force:
4679
val = raw_input('Press <enter> to continue')
4797
4680
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
4681
print 'The above revision(s) will be removed.'
4682
if not force:
4683
val = raw_input('Are you sure [y/N]? ')
4684
if val.lower() not in ('y', 'yes'):
4685
print 'Canceled'
4686
return 0
4804
4687
4805
4688
mutter('Uncommitting from {%s} to {%s}',
4806
4689
last_rev_id, rev_id)
4807
4690
uncommit(b, tree=tree, dry_run=dry_run, verbose=verbose,
4808
4691
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)
4692
note('You can restore the old tip by running:\n'
4693
' bzr pull . -r revid:%s', last_rev_id)
4811
4694
4812
4695
4813
4696
class cmd_break_lock(Command):
4814
__doc__ = """Break a dead lock on a repository, branch or working directory.
4697
"""Break a dead lock on a repository, branch or working directory.
4815
4698
4816
4699
CAUTION: Locks should only be broken when you are sure that the process
4817
4700
holding the lock has been stopped.
4818
4701
4819
You can get information on what locks are open via the 'bzr info
4820
[location]' command.
4702
You can get information on what locks are open via the 'bzr info' command.
4821
4703
4822
4704
:Examples:
4823
4705
bzr break-lock
4824
bzr break-lock bzr+ssh://example.com/bzr/foo
4825
4706
"""
4826
4707
takes_args = ['location?']
4827
4708
4836
4717
4837
4718
4838
4719
class cmd_wait_until_signalled(Command):
4839
__doc__ = """Test helper for test_start_and_stop_bzr_subprocess_send_signal.
4720
"""Test helper for test_start_and_stop_bzr_subprocess_send_signal.
4840
4721
4841
4722
This just prints a line to signal when it is ready, then blocks on stdin.
4842
4723
"""
4850
4731
4851
4732
4852
4733
class cmd_serve(Command):
4853
__doc__ = """Run the bzr server."""
4734
"""Run the bzr server."""
4854
4735
4855
4736
aliases = ['server']
4856
4737
4857
4738
takes_options = [
4858
4739
Option('inet',
4859
4740
help='Serve on stdin/out for use from inetd or sshd.'),
4860
RegistryOption('protocol',
4861
help="Protocol to serve.",
4741
RegistryOption('protocol',
4742
help="Protocol to serve.",
4862
4743
lazy_registry=('bzrlib.transport', 'transport_server_registry'),
4863
4744
value_switches=True),
4864
4745
Option('port',
4867
4748
'result in a dynamically allocated port. The default port '
4868
4749
'depends on the protocol.',
4869
4750
type=str),
4870
custom_help('directory',
4871
help='Serve contents of this directory.'),
4751
Option('directory',
4752
help='Serve contents of this directory.',
4753
type=unicode),
4872
4754
Option('allow-writes',
4873
4755
help='By default the server is a readonly server. Supplying '
4874
4756
'--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.'
4757
'the served directory and below.'
4880
4758
),
4881
4759
]
4882
4760
4915
4793
4916
4794
4917
4795
class cmd_join(Command):
4918
__doc__ = """Combine a tree into its containing tree.
4796
"""Combine a tree into its containing tree.
4919
4797
4920
4798
This command requires the target tree to be in a rich-root format.
4921
4799
4961
4839
4962
4840
4963
4841
class cmd_split(Command):
4964
__doc__ = """Split a subdirectory of a tree into a separate tree.
4842
"""Split a subdirectory of a tree into a separate tree.
4965
4843
4966
4844
This command will produce a target tree in a format that supports
4967
4845
rich roots, like 'rich-root' or 'rich-root-pack'. These formats cannot be
4987
4865
4988
4866
4989
4867
class cmd_merge_directive(Command):
4990
__doc__ = """Generate a merge directive for auto-merge tools.
4868
"""Generate a merge directive for auto-merge tools.
4991
4869
4992
4870
A directive requests a merge to be performed, and also provides all the
4993
4871
information necessary to do so. This means it must either include a
5086
4964
5087
4965
5088
4966
class cmd_send(Command):
5089
__doc__ = """Mail or create a merge-directive for submitting changes.
4967
"""Mail or create a merge-directive for submitting changes.
5090
4968
5091
4969
A merge directive provides many things needed for requesting merges:
5092
4970
5098
4976
directly from the merge directive, without retrieving data from a
5099
4977
branch.
5100
4978
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.
4979
If --no-bundle is specified, then public_branch is needed (and must be
4980
up-to-date), so that the receiver can perform the merge using the
4981
public_branch. The public_branch is always included if known, so that
4982
people can check it later.
4983
4984
The submit branch defaults to the parent, but can be overridden. Both
4985
submit branch and public branch will be remembered if supplied.
4986
4987
If a public_branch is known for the submit_branch, that public submit
4988
branch is used in the merge instructions. This means that a local mirror
4989
can be used as your actual submit branch, once you have set public_branch
4990
for that mirror.
5127
4991
5128
4992
Mail is sent using your preferred mail program. This should be transparent
5129
4993
on Windows (it uses MAPI). On Linux, it requires the xdg-email utility.
5149
5013
5150
5014
The merge directives created by bzr send may be applied using bzr merge or
5151
5015
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
5016
"""
5157
5017
5158
5018
encoding_type = 'exact'
5174
5034
short_name='f',
5175
5035
type=unicode),
5176
5036
Option('output', short_name='o',
5177
help='Write merge directive to this file or directory; '
5037
help='Write merge directive to this file; '
5178
5038
'use - for stdout.',
5179
5039
type=unicode),
5180
5040
Option('strict',
5203
5063
5204
5064
5205
5065
class cmd_bundle_revisions(cmd_send):
5206
__doc__ = """Create a merge-directive for submitting changes.
5066
"""Create a merge-directive for submitting changes.
5207
5067
5208
5068
A merge directive provides many things needed for requesting merges:
5209
5069
5276
5136
5277
5137
5278
5138
class cmd_tag(Command):
5279
__doc__ = """Create, remove or modify a tag naming a revision.
5139
"""Create, remove or modify a tag naming a revision.
5280
5140
5281
5141
Tags give human-meaningful names to revisions. Commands that take a -r
5282
5142
(--revision) option can be given -rtag:X, where X is any previously
5290
5150
5291
5151
To rename a tag (change the name but keep it on the same revsion), run ``bzr
5292
5152
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
5153
"""
5299
5154
5300
5155
_see_also = ['commit', 'tags']
5301
takes_args = ['tag_name?']
5156
takes_args = ['tag_name']
5302
5157
takes_options = [
5303
5158
Option('delete',
5304
5159
help='Delete this tag rather than placing it.',
5305
5160
),
5306
custom_help('directory',
5307
help='Branch in which to place the tag.'),
5161
Option('directory',
5162
help='Branch in which to place the tag.',
5163
short_name='d',
5164
type=unicode,
5165
),
5308
5166
Option('force',
5309
5167
help='Replace existing tags.',
5310
5168
),
5311
5169
'revision',
5312
5170
]
5313
5171
5314
def run(self, tag_name=None,
5172
def run(self, tag_name,
5315
5173
delete=None,
5316
5174
directory='.',
5317
5175
force=None,
5318
5176
revision=None,
5319
5177
):
5320
5178
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)
5179
branch.lock_write()
5180
try:
5181
if delete:
5182
branch.tags.delete_tag(tag_name)
5183
self.outf.write('Deleted tag %s.\n' % tag_name)
5334
5184
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)
5185
if revision:
5186
if len(revision) != 1:
5187
raise errors.BzrCommandError(
5188
"Tags can only be placed on a single revision, "
5189
"not on a range")
5190
revision_id = revision[0].as_revision_id(branch)
5191
else:
5192
revision_id = branch.last_revision()
5193
if (not force) and branch.tags.has_tag(tag_name):
5194
raise errors.TagAlreadyExists(tag_name)
5195
branch.tags.set_tag(tag_name, revision_id)
5196
self.outf.write('Created tag %s.\n' % tag_name)
5197
finally:
5198
branch.unlock()
5345
5199
5346
5200
5347
5201
class cmd_tags(Command):
5348
__doc__ = """List tags.
5202
"""List tags.
5349
5203
5350
5204
This command shows a table of tag names and the revisions they reference.
5351
5205
"""
5352
5206
5353
5207
_see_also = ['tag']
5354
5208
takes_options = [
5355
custom_help('directory',
5356
help='Branch whose tags should be displayed.'),
5209
Option('directory',
5210
help='Branch whose tags should be displayed.',
5211
short_name='d',
5212
type=unicode,
5213
),
5357
5214
RegistryOption.from_kwargs('sort',
5358
5215
'Sort tags by different criteria.', title='Sorting',
5359
5216
alpha='Sort tags lexicographically (default).',
5376
5233
if not tags:
5377
5234
return
5378
5235
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()
5236
branch.lock_read()
5237
try:
5238
if revision:
5239
graph = branch.repository.get_graph()
5240
rev1, rev2 = _get_revision_range(revision, branch, self.name())
5241
revid1, revid2 = rev1.rev_id, rev2.rev_id
5242
# only show revisions between revid1 and revid2 (inclusive)
5243
tags = [(tag, revid) for tag, revid in tags if
5244
graph.is_between(revid, revid1, revid2)]
5245
if sort == 'alpha':
5246
tags.sort()
5247
elif sort == 'time':
5248
timestamps = {}
5249
for tag, revid in tags:
5250
try:
5251
revobj = branch.repository.get_revision(revid)
5252
except errors.NoSuchRevision:
5253
timestamp = sys.maxint # place them at the end
5254
else:
5255
timestamp = revobj.timestamp
5256
timestamps[revid] = timestamp
5257
tags.sort(key=lambda x: timestamps[x[1]])
5258
if not show_ids:
5259
# [ (tag, revid), ... ] -> [ (tag, dotted_revno), ... ]
5260
for index, (tag, revid) in enumerate(tags):
5261
try:
5262
revno = branch.revision_id_to_dotted_revno(revid)
5263
if isinstance(revno, tuple):
5264
revno = '.'.join(map(str, revno))
5265
except errors.NoSuchRevision:
5266
# Bad tag data/merges can lead to tagged revisions
5267
# which are not in this branch. Fail gracefully ...
5268
revno = '?'
5269
tags[index] = (tag, revno)
5270
finally:
5271
branch.unlock()
5413
5272
for tag, revspec in tags:
5414
5273
self.outf.write('%-20s %s\n' % (tag, revspec))
5415
5274
5416
5275
5417
5276
class cmd_reconfigure(Command):
5418
__doc__ = """Reconfigure the type of a bzr directory.
5277
"""Reconfigure the type of a bzr directory.
5419
5278
5420
5279
A target configuration must be specified.
5421
5280
5506
5365
5507
5366
5508
5367
class cmd_switch(Command):
5509
__doc__ = """Set the branch of a checkout and update.
5368
"""Set the branch of a checkout and update.
5510
5369
5511
5370
For lightweight checkouts, this changes the branch being referenced.
5512
5371
For heavyweight checkouts, this checks that there are no local commits
5528
5387
that of the master.
5529
5388
"""
5530
5389
5531
takes_args = ['to_location?']
5390
takes_args = ['to_location']
5532
5391
takes_options = [Option('force',
5533
5392
help='Switch even if local commits will be lost.'),
5534
'revision',
5535
5393
Option('create-branch', short_name='b',
5536
5394
help='Create the target branch from this one before'
5537
5395
' switching to it.'),
5538
]
5396
]
5539
5397
5540
def run(self, to_location=None, force=False, create_branch=False,
5541
revision=None):
5398
def run(self, to_location, force=False, create_branch=False):
5542
5399
from bzrlib import switch
5543
5400
tree_location = '.'
5544
revision = _get_one_revision('switch', revision)
5545
5401
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
5402
try:
5552
5403
branch = control_dir.open_branch()
5553
5404
had_explicit_nick = branch.get_config().has_explicit_nickname()
5558
5409
if branch is None:
5559
5410
raise errors.BzrCommandError('cannot create branch without'
5560
5411
' source branch')
5561
to_location = directory_service.directories.dereference(
5562
to_location)
5563
5412
if '/' not in to_location and '\\' not in to_location:
5564
5413
# This path is meant to be relative to the existing branch
5565
5414
this_url = self._get_branch_location(control_dir)
5567
5416
to_branch = branch.bzrdir.sprout(to_location,
5568
5417
possible_transports=[branch.bzrdir.root_transport],
5569
5418
source_branch=branch).open_branch()
5419
# try:
5420
# from_branch = control_dir.open_branch()
5421
# except errors.NotBranchError:
5422
# raise BzrCommandError('Cannot create a branch from this'
5423
# ' location when we cannot open this branch')
5424
# from_branch.bzrdir.sprout(
5425
pass
5570
5426
else:
5571
5427
try:
5572
5428
to_branch = Branch.open(to_location)
5574
5430
this_url = self._get_branch_location(control_dir)
5575
5431
to_branch = Branch.open(
5576
5432
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)
5433
switch.switch(control_dir, to_branch, force)
5580
5434
if had_explicit_nick:
5581
5435
branch = control_dir.open_branch() #get the new branch!
5582
5436
branch.nick = to_branch.nick
5602
5456
5603
5457
5604
5458
class cmd_view(Command):
5605
__doc__ = """Manage filtered views.
5459
"""Manage filtered views.
5606
5460
5607
5461
Views provide a mask over the tree so that users can focus on
5608
5462
a subset of a tree when doing their work. After creating a view,
5756
5610
5757
5611
5758
5612
class cmd_hooks(Command):
5759
__doc__ = """Show hooks."""
5613
"""Show hooks."""
5760
5614
5761
5615
hidden = True
5762
5616
5775
5629
self.outf.write(" <no hooks installed>\n")
5776
5630
5777
5631
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
5632
class cmd_shelve(Command):
5804
__doc__ = """Temporarily set aside some changes from the current tree.
5633
"""Temporarily set aside some changes from the current tree.
5805
5634
5806
5635
Shelve allows you to temporarily put changes you've made "on the shelf",
5807
5636
ie. out of the way, until a later time when you can bring them back from
5860
5689
5861
5690
def run_for_list(self):
5862
5691
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
5692
tree.lock_read()
5693
try:
5694
manager = tree.get_shelf_manager()
5695
shelves = manager.active_shelves()
5696
if len(shelves) == 0:
5697
note('No shelved changes.')
5698
return 0
5699
for shelf_id in reversed(shelves):
5700
message = manager.get_metadata(shelf_id).get('message')
5701
if message is None:
5702
message = '<no message>'
5703
self.outf.write('%3d: %s\n' % (shelf_id, message))
5704
return 1
5705
finally:
5706
tree.unlock()
5875
5707
5876
5708
5877
5709
class cmd_unshelve(Command):
5878
__doc__ = """Restore shelved changes.
5710
"""Restore shelved changes.
5879
5711
5880
5712
By default, the most recently shelved changes are restored. However if you
5881
5713
specify a shelf by id those changes will be restored instead. This works
5889
5721
enum_switch=False, value_switches=True,
5890
5722
apply="Apply changes and remove from the shelf.",
5891
5723
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.",
5724
delete_only="Delete changes without applying them."
5896
5725
)
5897
5726
]
5898
5727
_see_also = ['shelve']
5907
5736
5908
5737
5909
5738
class cmd_clean_tree(Command):
5910
__doc__ = """Remove unwanted files from working tree.
5739
"""Remove unwanted files from working tree.
5911
5740
5912
5741
By default, only unknown files, not ignored files, are deleted. Versioned
5913
5742
files are never deleted.
5921
5750
5922
5751
To check what clean-tree will do, use --dry-run.
5923
5752
"""
5924
takes_options = ['directory',
5925
Option('ignored', help='Delete all ignored files.'),
5753
takes_options = [Option('ignored', help='Delete all ignored files.'),
5926
5754
Option('detritus', help='Delete conflict files, merge'
5927
5755
' backups, and failed selftest dirs.'),
5928
5756
Option('unknown',
5931
5759
' deleting them.'),
5932
5760
Option('force', help='Do not prompt before deleting.')]
5933
5761
def run(self, unknown=False, ignored=False, detritus=False, dry_run=False,
5934
force=False, directory=u'.'):
5762
force=False):
5935
5763
from bzrlib.clean_tree import clean_tree
5936
5764
if not (unknown or ignored or detritus):
5937
5765
unknown = True
5938
5766
if dry_run:
5939
5767
force = True
5940
clean_tree(directory, unknown=unknown, ignored=ignored,
5941
detritus=detritus, dry_run=dry_run, no_prompt=force)
5768
clean_tree('.', unknown=unknown, ignored=ignored, detritus=detritus,
5769
dry_run=dry_run, no_prompt=force)
5942
5770
5943
5771
5944
5772
class cmd_reference(Command):
5945
__doc__ = """list, view and set branch locations for nested trees.
5773
"""list, view and set branch locations for nested trees.
5946
5774
5947
5775
If no arguments are provided, lists the branch locations for nested trees.
5948
5776
If one argument is provided, display the branch location for that tree.
5988
5816
self.outf.write('%s %s\n' % (path, location))
5989
5817
5990
5818
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)
5819
# these get imported and then picked up by the scan for cmd_*
5820
# TODO: Some more consistent way to split command definitions across files;
5821
# we do need to load at least some information about them to know of
5822
# aliases. ideally we would avoid loading the implementation until the
5823
# details were needed.
5824
from bzrlib.cmd_version_info import cmd_version_info
5825
from bzrlib.conflicts import cmd_resolve, cmd_conflicts, restore
5826
from bzrlib.bundle.commands import (
5827
cmd_bundle_info,
5828
)
5829
from bzrlib.foreign import cmd_dpush
5830
from bzrlib.sign_my_commits import cmd_sign_my_commits
5831
from bzrlib.weave_commands import cmd_versionedfile_list, \
5832
cmd_weave_plan_merge, cmd_weave_merge_text
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0