« back to all changes in this revision
Viewing changes to bzrlib/builtins.py
- browse files at revision 2208.4.4
- compare with another revision
- compare with revision 1717
- download diff
- download tarball
- view history from revision 2208.4.4
- Committer: Andrew Bennetts
- Date: 2007-04-26 06:19:07 UTC
- mfrom: (2459 +trunk)
- mto: (2432.3.7 hpss-vfs-fallback)
- mto: This revision was merged to the branch mainline in revision 2463.
- Revision ID: andrew.bennetts@canonical.com-20070426061907-ipn74twdz1gmz52i
Merge bzr.dev.
- files added:
- bzrlib/breakin.py
- bzrlib/repofmt
- bzrlib/smart
- bzrlib/tests/per_lock
- man1
- files removed:
- NEWS.developers
- files renamed:
- bzrlib/transport/smart.py => bzrlib/transport/remote.py
- bzrlib/win32console.py => bzrlib/win32utils.py
- files modified:
- .bzrignore
- setup.py *
added
removed
bzrlib/builtins.py
1
# Copyright (C) 2004, 2005, 2006 Canonical Ltd
1
# Copyright (C) 2004, 2005, 2006, 2007 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
17
17
"""builtin bzr commands"""
18
18
19
19
import os
20
from StringIO import StringIO
20
21
21
22
from bzrlib.lazy_import import lazy_import
22
23
lazy_import(globals(), """
23
24
import codecs
24
25
import errno
26
import smtplib
25
27
import sys
26
28
import tempfile
29
import time
27
30
28
31
import bzrlib
29
32
from bzrlib import (
30
33
branch,
34
bugtracker,
31
35
bundle,
32
36
bzrdir,
37
delta,
33
38
config,
34
39
errors,
40
globbing,
35
41
ignores,
36
42
log,
37
43
merge as _mod_merge,
44
merge_directive,
38
45
osutils,
46
registry,
39
47
repository,
48
symbol_versioning,
40
49
transport,
41
50
tree as _mod_tree,
42
51
ui,
51
60
""")
52
61
53
62
from bzrlib.commands import Command, display_command
54
from bzrlib.option import Option
63
from bzrlib.option import ListOption, Option, RegistryOption
55
64
from bzrlib.progress import DummyProgress, ProgressPhase
56
65
from bzrlib.trace import mutter, note, log_error, warning, is_quiet, info
57
66
93
102
return tree, new_list
94
103
95
104
105
@symbol_versioning.deprecated_function(symbol_versioning.zero_fifteen)
96
106
def get_format_type(typestring):
97
107
"""Parse and return a format specifier."""
98
if typestring == "weave":
99
return bzrdir.BzrDirFormat6()
108
# Have to use BzrDirMetaFormat1 directly, so that
109
# RepositoryFormat.set_default_format works
100
110
if typestring == "default":
101
111
return bzrdir.BzrDirMetaFormat1()
102
if typestring == "metaweave":
103
format = bzrdir.BzrDirMetaFormat1()
104
format.repository_format = repository.RepositoryFormat7()
105
return format
106
if typestring == "knit":
107
format = bzrdir.BzrDirMetaFormat1()
108
format.repository_format = repository.RepositoryFormatKnit1()
109
return format
110
if typestring == "experimental-knit2":
111
format = bzrdir.BzrDirMetaFormat1()
112
format.repository_format = repository.RepositoryFormatKnit2()
113
return format
114
msg = "Unknown bzr format %s. Current formats are: default, knit,\n" \
115
"metaweave and weave" % typestring
116
raise errors.BzrCommandError(msg)
112
try:
113
return bzrdir.format_registry.make_bzrdir(typestring)
114
except KeyError:
115
msg = 'Unknown bzr format "%s". See "bzr help formats".' % typestring
116
raise errors.BzrCommandError(msg)
117
117
118
118
119
119
# TODO: Make sure no commands unconditionally use the working directory as a
128
128
This reports on versioned and unknown files, reporting them
129
129
grouped by state. Possible states are:
130
130
131
added / A
131
added
132
132
Versioned in the working copy but not in the previous revision.
133
133
134
removed / D
134
removed
135
135
Versioned in the previous revision but removed or deleted
136
136
in the working copy.
137
137
138
renamed / R
138
renamed
139
139
Path of this file changed from the previous revision;
140
140
the text may also have changed. This includes files whose
141
141
parent directory was renamed.
142
142
143
modified / M
143
modified
144
144
Text has changed since the previous revision.
145
145
146
unknown / ?
146
kind changed
147
File kind has been changed (e.g. from file to directory).
148
149
unknown
147
150
Not versioned and not matching an ignore pattern.
148
151
149
To see ignored files use 'bzr ignored'. For details in the
152
To see ignored files use 'bzr ignored'. For details on the
150
153
changes to file texts, use 'bzr diff'.
151
154
152
--short gives a one character status flag for each item, similar
153
to the SVN's status command.
155
--short gives a status flags for each item, similar to the SVN's status
156
command.
157
158
Column 1: versioning / renames
159
+ File versioned
160
- File unversioned
161
R File renamed
162
? File unknown
163
C File has conflicts
164
P Entry for a pending merge (not a file)
165
166
Column 2: Contents
167
N File created
168
D File deleted
169
K File kind changed
170
M File modified
171
172
Column 3: Execute
173
* The execute bit was changed
154
174
155
175
If no arguments are specified, the status of the entire working
156
176
directory is shown. Otherwise, only the status of the specified
164
184
# TODO: --no-recurse, --recurse options
165
185
166
186
takes_args = ['file*']
167
takes_options = ['show-ids', 'revision', 'short']
187
takes_options = ['show-ids', 'revision',
188
Option('short', help='Give short SVN-style status lines'),
189
Option('versioned', help='Only show versioned files')]
168
190
aliases = ['st', 'stat']
169
191
170
192
encoding_type = 'replace'
193
_see_also = ['diff', 'revert']
171
194
172
195
@display_command
173
def run(self, show_ids=False, file_list=None, revision=None, short=False):
196
def run(self, show_ids=False, file_list=None, revision=None, short=False,
197
versioned=False):
174
198
from bzrlib.status import show_tree_status
175
199
176
200
tree, file_list = tree_files(file_list)
177
201
178
202
show_tree_status(tree, show_ids=show_ids,
179
203
specific_files=file_list, revision=revision,
180
to_file=self.outf,
181
short=short)
204
to_file=self.outf, short=short, versioned=versioned)
182
205
183
206
184
207
class cmd_cat_revision(Command):
197
220
@display_command
198
221
def run(self, revision_id=None, revision=None):
199
222
223
revision_id = osutils.safe_revision_id(revision_id, warn=False)
200
224
if revision_id is not None and revision is not None:
201
225
raise errors.BzrCommandError('You can only supply one of'
202
226
' revision_id or --revision')
222
246
223
247
Since a lightweight checkout is little more than a working tree
224
248
this will refuse to run against one.
249
250
To re-create the working tree, use "bzr checkout".
225
251
"""
226
227
hidden = True
252
_see_also = ['checkout']
228
253
229
254
takes_args = ['location?']
230
255
254
279
This is equal to the number of revisions on this branch.
255
280
"""
256
281
282
_see_also = ['info']
257
283
takes_args = ['location?']
258
284
259
285
@display_command
319
345
320
346
--file-ids-from will try to use the file ids from the supplied path.
321
347
It looks up ids trying to find a matching parent directory with the
322
same filename, and then by pure path.
348
same filename, and then by pure path. This option is rarely needed
349
but can be useful when adding the same logical file into two
350
branches that will be merged later (without showing the two different
351
adds as a conflict). It is also useful when merging another project
352
into a subdirectory of this one.
323
353
"""
324
354
takes_args = ['file*']
325
355
takes_options = ['no-recurse', 'dry-run', 'verbose',
326
356
Option('file-ids-from', type=unicode,
327
357
help='Lookup file ids from here')]
328
358
encoding_type = 'replace'
359
_see_also = ['remove']
329
360
330
361
def run(self, file_list, no_recurse=False, dry_run=False, verbose=False,
331
362
file_ids_from=None):
332
363
import bzrlib.add
333
364
365
base_tree = None
334
366
if file_ids_from is not None:
335
367
try:
336
368
base_tree, base_path = WorkingTree.open_containing(
346
378
action = bzrlib.add.AddAction(to_file=self.outf,
347
379
should_print=(not is_quiet()))
348
380
349
added, ignored = bzrlib.add.smart_add(file_list, not no_recurse,
350
action=action, save=not dry_run)
381
if base_tree:
382
base_tree.lock_read()
383
try:
384
added, ignored = bzrlib.add.smart_add(file_list, not no_recurse,
385
action=action, save=not dry_run)
386
finally:
387
if base_tree is not None:
388
base_tree.unlock()
351
389
if len(ignored) > 0:
352
390
if verbose:
353
391
for glob in sorted(ignored.keys()):
405
443
set. For example: bzr inventory --show-ids this/file
406
444
"""
407
445
446
hidden = True
447
_see_also = ['ls']
408
448
takes_options = ['revision', 'show-ids', 'kind']
409
449
takes_args = ['file*']
410
450
414
454
raise errors.BzrCommandError('invalid kind specified')
415
455
416
456
work_tree, file_list = tree_files(file_list)
417
418
if revision is not None:
419
if len(revision) > 1:
420
raise errors.BzrCommandError('bzr inventory --revision takes'
421
' exactly one revision identifier')
422
revision_id = revision[0].in_history(work_tree.branch).rev_id
423
tree = work_tree.branch.repository.revision_tree(revision_id)
424
425
# We include work_tree as well as 'tree' here
426
# So that doing '-r 10 path/foo' will lookup whatever file
427
# exists now at 'path/foo' even if it has been renamed, as
428
# well as whatever files existed in revision 10 at path/foo
429
trees = [tree, work_tree]
430
else:
431
tree = work_tree
432
trees = [tree]
433
434
if file_list is not None:
435
file_ids = _mod_tree.find_ids_across_trees(file_list, trees,
436
require_versioned=True)
437
# find_ids_across_trees may include some paths that don't
438
# exist in 'tree'.
439
entries = sorted((tree.id2path(file_id), tree.inventory[file_id])
440
for file_id in file_ids if file_id in tree)
441
else:
442
entries = tree.inventory.entries()
457
work_tree.lock_read()
458
try:
459
if revision is not None:
460
if len(revision) > 1:
461
raise errors.BzrCommandError(
462
'bzr inventory --revision takes exactly one revision'
463
' identifier')
464
revision_id = revision[0].in_history(work_tree.branch).rev_id
465
tree = work_tree.branch.repository.revision_tree(revision_id)
466
467
extra_trees = [work_tree]
468
tree.lock_read()
469
else:
470
tree = work_tree
471
extra_trees = []
472
473
if file_list is not None:
474
file_ids = tree.paths2ids(file_list, trees=extra_trees,
475
require_versioned=True)
476
# find_ids_across_trees may include some paths that don't
477
# exist in 'tree'.
478
entries = sorted((tree.id2path(file_id), tree.inventory[file_id])
479
for file_id in file_ids if file_id in tree)
480
else:
481
entries = tree.inventory.entries()
482
finally:
483
tree.unlock()
484
if tree is not work_tree:
485
work_tree.unlock()
443
486
444
487
for path, entry in entries:
445
488
if kind and kind != entry.kind:
460
503
461
504
If the last argument is a versioned directory, all the other names
462
505
are moved into it. Otherwise, there must be exactly two arguments
463
and the file is changed to a new name, which must not already exist.
506
and the file is changed to a new name.
507
508
If OLDNAME does not exist on the filesystem but is versioned and
509
NEWNAME does exist on the filesystem but is not versioned, mv
510
assumes that the file has been manually moved and only updates
511
its internal inventory to reflect that change.
512
The same is valid when moving many SOURCE files to a DESTINATION.
464
513
465
514
Files cannot be moved between branches.
466
515
"""
467
516
468
517
takes_args = ['names*']
518
takes_options = [Option("after", help="move only the bzr identifier"
519
" of the file (file has already been moved). Use this flag if"
520
" bzr is not able to detect this itself.")]
469
521
aliases = ['move', 'rename']
470
522
encoding_type = 'replace'
471
523
472
def run(self, names_list):
524
def run(self, names_list, after=False):
473
525
if names_list is None:
474
526
names_list = []
475
527
479
531
480
532
if os.path.isdir(names_list[-1]):
481
533
# move into existing directory
482
for pair in tree.move(rel_names[:-1], rel_names[-1]):
534
for pair in tree.move(rel_names[:-1], rel_names[-1], after=after):
483
535
self.outf.write("%s => %s\n" % pair)
484
536
else:
485
537
if len(names_list) != 2:
486
raise errors.BzrCommandError('to mv multiple files the destination '
487
'must be a versioned directory')
488
tree.rename_one(rel_names[0], rel_names[1])
538
raise errors.BzrCommandError('to mv multiple files the'
539
' destination must be a versioned'
540
' directory')
541
tree.rename_one(rel_names[0], rel_names[1], after=after)
489
542
self.outf.write("%s => %s\n" % (rel_names[0], rel_names[1]))
490
543
491
544
509
562
location can be accessed.
510
563
"""
511
564
512
takes_options = ['remember', 'overwrite', 'revision', 'verbose']
565
_see_also = ['push', 'update']
566
takes_options = ['remember', 'overwrite', 'revision', 'verbose',
567
Option('directory',
568
help='branch to pull into, '
569
'rather than the one containing the working directory',
570
short_name='d',
571
type=unicode,
572
),
573
]
513
574
takes_args = ['location?']
514
575
encoding_type = 'replace'
515
576
516
def run(self, location=None, remember=False, overwrite=False, revision=None, verbose=False):
577
def run(self, location=None, remember=False, overwrite=False,
578
revision=None, verbose=False,
579
directory=None):
580
from bzrlib.tag import _merge_tags_if_possible
517
581
# FIXME: too much stuff is in the command class
582
revision_id = None
583
mergeable = None
584
if directory is None:
585
directory = u'.'
518
586
try:
519
tree_to = WorkingTree.open_containing(u'.')[0]
587
tree_to = WorkingTree.open_containing(directory)[0]
520
588
branch_to = tree_to.branch
521
589
except errors.NoWorkingTree:
522
590
tree_to = None
523
branch_to = Branch.open_containing(u'.')[0]
591
branch_to = Branch.open_containing(directory)[0]
524
592
525
593
reader = None
526
594
if location is not None:
527
595
try:
528
reader = bundle.read_bundle_from_url(location)
596
mergeable = bundle.read_mergeable_from_url(
597
location)
529
598
except errors.NotABundle:
530
599
pass # Continue on considering this url a Branch
531
600
540
609
self.outf.write("Using saved location: %s\n" % display_url)
541
610
location = stored_loc
542
611
543
544
if reader is not None:
545
install_bundle(branch_to.repository, reader)
612
if mergeable is not None:
613
if revision is not None:
614
raise errors.BzrCommandError(
615
'Cannot use -r with merge directives or bundles')
616
revision_id = mergeable.install_revisions(branch_to.repository)
546
617
branch_from = branch_to
547
618
else:
548
619
branch_from = Branch.open(location)
550
621
if branch_to.get_parent() is None or remember:
551
622
branch_to.set_parent(branch_from.base)
552
623
553
rev_id = None
554
if revision is None:
555
if reader is not None:
556
rev_id = reader.target
557
elif len(revision) == 1:
558
rev_id = revision[0].in_history(branch_from).rev_id
559
else:
560
raise errors.BzrCommandError('bzr pull --revision takes one value.')
624
if revision is not None:
625
if len(revision) == 1:
626
revision_id = revision[0].in_history(branch_from).rev_id
627
else:
628
raise errors.BzrCommandError(
629
'bzr pull --revision takes one value.')
561
630
562
631
old_rh = branch_to.revision_history()
563
632
if tree_to is not None:
564
count = tree_to.pull(branch_from, overwrite, rev_id)
633
result = tree_to.pull(branch_from, overwrite, revision_id,
634
delta._ChangeReporter(unversioned_filter=tree_to.is_ignored))
565
635
else:
566
count = branch_to.pull(branch_from, overwrite, rev_id)
567
note('%d revision(s) pulled.' % (count,))
636
result = branch_to.pull(branch_from, overwrite, revision_id)
568
637
638
result.report(self.outf)
569
639
if verbose:
640
from bzrlib.log import show_changed_revisions
570
641
new_rh = branch_to.revision_history()
571
if old_rh != new_rh:
572
# Something changed
573
from bzrlib.log import show_changed_revisions
574
show_changed_revisions(branch_to, old_rh, new_rh,
575
to_file=self.outf)
642
show_changed_revisions(branch_to, old_rh, new_rh,
643
to_file=self.outf)
576
644
577
645
578
646
class cmd_push(Command):
601
669
location can be accessed.
602
670
"""
603
671
672
_see_also = ['pull', 'update']
604
673
takes_options = ['remember', 'overwrite', 'verbose',
605
Option('create-prefix',
606
help='Create the path leading up to the branch '
607
'if it does not already exist')]
674
Option('create-prefix',
675
help='Create the path leading up to the branch '
676
'if it does not already exist'),
677
Option('directory',
678
help='branch to push from, '
679
'rather than the one containing the working directory',
680
short_name='d',
681
type=unicode,
682
),
683
Option('use-existing-dir',
684
help='By default push will fail if the target'
685
' directory exists, but does not already'
686
' have a control directory. This flag will'
687
' allow push to proceed.'),
688
]
608
689
takes_args = ['location?']
609
690
encoding_type = 'replace'
610
691
611
692
def run(self, location=None, remember=False, overwrite=False,
612
create_prefix=False, verbose=False):
693
create_prefix=False, verbose=False,
694
use_existing_dir=False,
695
directory=None):
613
696
# FIXME: Way too big! Put this into a function called from the
614
697
# command.
615
616
br_from = Branch.open_containing('.')[0]
698
if directory is None:
699
directory = '.'
700
br_from = Branch.open_containing(directory)[0]
617
701
stored_loc = br_from.get_push_location()
618
702
if location is None:
619
703
if stored_loc is None:
627
711
to_transport = transport.get_transport(location)
628
712
location_url = to_transport.base
629
713
714
br_to = repository_to = dir_to = None
715
try:
716
dir_to = bzrdir.BzrDir.open_from_transport(to_transport)
717
except errors.NotBranchError:
718
pass # Didn't find anything
719
else:
720
# If we can open a branch, use its direct repository, otherwise see
721
# if there is a repository without a branch.
722
try:
723
br_to = dir_to.open_branch()
724
except errors.NotBranchError:
725
# Didn't find a branch, can we find a repository?
726
try:
727
repository_to = dir_to.find_repository()
728
except errors.NoRepositoryPresent:
729
pass
730
else:
731
# Found a branch, so we must have found a repository
732
repository_to = br_to.repository
733
push_result = None
630
734
old_rh = []
631
try:
632
dir_to = bzrdir.BzrDir.open(location_url)
633
br_to = dir_to.open_branch()
634
except errors.NotBranchError:
635
# create a branch.
636
to_transport = to_transport.clone('..')
637
if not create_prefix:
638
try:
639
relurl = to_transport.relpath(location_url)
640
mutter('creating directory %s => %s', location_url, relurl)
641
to_transport.mkdir(relurl)
642
except errors.NoSuchFile:
643
raise errors.BzrCommandError("Parent directory of %s "
644
"does not exist." % location)
645
else:
646
current = to_transport.base
647
needed = [(to_transport, to_transport.relpath(location_url))]
735
if dir_to is None:
736
# The destination doesn't exist; create it.
737
# XXX: Refactor the create_prefix/no_create_prefix code into a
738
# common helper function
739
try:
740
to_transport.mkdir('.')
741
except errors.FileExists:
742
if not use_existing_dir:
743
raise errors.BzrCommandError("Target directory %s"
744
" already exists, but does not have a valid .bzr"
745
" directory. Supply --use-existing-dir to push"
746
" there anyway." % location)
747
except errors.NoSuchFile:
748
if not create_prefix:
749
raise errors.BzrCommandError("Parent directory of %s"
750
" does not exist."
751
"\nYou may supply --create-prefix to create all"
752
" leading parent directories."
753
% location)
754
755
cur_transport = to_transport
756
needed = [cur_transport]
757
# Recurse upwards until we can create a directory successfully
758
while True:
759
new_transport = cur_transport.clone('..')
760
if new_transport.base == cur_transport.base:
761
raise errors.BzrCommandError("Failed to create path"
762
" prefix for %s."
763
% location)
764
try:
765
new_transport.mkdir('.')
766
except errors.NoSuchFile:
767
needed.append(new_transport)
768
cur_transport = new_transport
769
else:
770
break
771
772
# Now we only need to create child directories
648
773
while needed:
649
try:
650
to_transport, relpath = needed[-1]
651
to_transport.mkdir(relpath)
652
needed.pop()
653
except errors.NoSuchFile:
654
new_transport = to_transport.clone('..')
655
needed.append((new_transport,
656
new_transport.relpath(to_transport.base)))
657
if new_transport.base == to_transport.base:
658
raise errors.BzrCommandError("Could not create "
659
"path prefix.")
774
cur_transport = needed.pop()
775
cur_transport.mkdir('.')
776
777
# Now the target directory exists, but doesn't have a .bzr
778
# directory. So we need to create it, along with any work to create
779
# all of the dependent branches, etc.
660
780
dir_to = br_from.bzrdir.clone(location_url,
661
781
revision_id=br_from.last_revision())
662
782
br_to = dir_to.open_branch()
663
count = len(br_to.revision_history())
783
# TODO: Some more useful message about what was copied
784
note('Created new branch.')
664
785
# We successfully created the target, remember it
665
786
if br_from.get_push_location() is None or remember:
666
787
br_from.set_push_location(br_to.base)
667
else:
788
elif repository_to is None:
789
# we have a bzrdir but no branch or repository
790
# XXX: Figure out what to do other than complain.
791
raise errors.BzrCommandError("At %s you have a valid .bzr control"
792
" directory, but not a branch or repository. This is an"
793
" unsupported configuration. Please move the target directory"
794
" out of the way and try again."
795
% location)
796
elif br_to is None:
797
# We have a repository but no branch, copy the revisions, and then
798
# create a branch.
799
last_revision_id = br_from.last_revision()
800
repository_to.fetch(br_from.repository,
801
revision_id=last_revision_id)
802
br_to = br_from.clone(dir_to, revision_id=last_revision_id)
803
note('Created new branch.')
804
if br_from.get_push_location() is None or remember:
805
br_from.set_push_location(br_to.base)
806
else: # We have a valid to branch
668
807
# We were able to connect to the remote location, so remember it
669
808
# we don't need to successfully push because of possible divergence.
670
809
if br_from.get_push_location() is None or remember:
676
815
except errors.NotLocalUrl:
677
816
warning('This transport does not update the working '
678
817
'tree of: %s' % (br_to.base,))
679
count = br_to.pull(br_from, overwrite)
818
push_result = br_from.push(br_to, overwrite)
680
819
except errors.NoWorkingTree:
681
count = br_to.pull(br_from, overwrite)
820
push_result = br_from.push(br_to, overwrite)
682
821
else:
683
count = tree_to.pull(br_from, overwrite)
822
tree_to.lock_write()
823
try:
824
push_result = br_from.push(tree_to.branch, overwrite)
825
tree_to.update()
826
finally:
827
tree_to.unlock()
684
828
except errors.DivergedBranches:
685
829
raise errors.BzrCommandError('These branches have diverged.'
686
830
' Try using "merge" and then "push".')
687
note('%d revision(s) pushed.' % (count,))
688
689
if verbose:
831
if push_result is not None:
832
push_result.report(self.outf)
833
elif verbose:
690
834
new_rh = br_to.revision_history()
691
835
if old_rh != new_rh:
692
836
# Something changed
693
837
from bzrlib.log import show_changed_revisions
694
838
show_changed_revisions(br_to, old_rh, new_rh,
695
839
to_file=self.outf)
840
else:
841
# we probably did a clone rather than a push, so a message was
842
# emitted above
843
pass
696
844
697
845
698
846
class cmd_branch(Command):
703
851
704
852
To retrieve the branch as of a particular revision, supply the --revision
705
853
parameter, as in "branch foo/bar -r 5".
854
"""
706
855
707
--basis is to speed up branching from remote branches. When specified, it
708
copies all the file-contents, inventory and revision data from the basis
709
branch before copying anything from the remote branch.
710
"""
856
_see_also = ['checkout']
711
857
takes_args = ['from_location', 'to_location?']
712
takes_options = ['revision', 'basis']
858
takes_options = ['revision']
713
859
aliases = ['get', 'clone']
714
860
715
def run(self, from_location, to_location=None, revision=None, basis=None):
861
def run(self, from_location, to_location=None, revision=None):
862
from bzrlib.tag import _merge_tags_if_possible
716
863
if revision is None:
717
864
revision = [None]
718
865
elif len(revision) > 1:
719
866
raise errors.BzrCommandError(
720
867
'bzr branch --revision takes exactly 1 revision value')
721
try:
722
br_from = Branch.open(from_location)
723
except OSError, e:
724
if e.errno == errno.ENOENT:
725
raise errors.BzrCommandError('Source location "%s" does not'
726
' exist.' % to_location)
727
else:
728
raise
868
869
br_from = Branch.open(from_location)
729
870
br_from.lock_read()
730
871
try:
731
if basis is not None:
732
basis_dir = bzrdir.BzrDir.open_containing(basis)[0]
733
else:
734
basis_dir = None
735
872
if len(revision) == 1 and revision[0] is not None:
736
873
revision_id = revision[0].in_history(br_from)[1]
737
874
else:
756
893
% to_location)
757
894
try:
758
895
# preserve whatever source format we have.
759
dir = br_from.bzrdir.sprout(to_transport.base,
760
revision_id, basis_dir)
896
dir = br_from.bzrdir.sprout(to_transport.base, revision_id)
761
897
branch = dir.open_branch()
762
898
except errors.NoSuchRevision:
763
899
to_transport.delete_tree('.')
764
900
msg = "The branch %s has no revision %s." % (from_location, revision[0])
765
901
raise errors.BzrCommandError(msg)
766
except errors.UnlistableBranch:
767
osutils.rmtree(to_location)
768
msg = "The branch %s cannot be used as a --basis" % (basis,)
769
raise errors.BzrCommandError(msg)
770
902
if name:
771
903
branch.control_files.put_utf8('branch-name', name)
904
_merge_tags_if_possible(br_from, branch)
772
905
note('Branched %d revision(s).' % branch.revno())
773
906
finally:
774
907
br_from.unlock()
789
922
parameter, as in "checkout foo/bar -r 5". Note that this will be immediately
790
923
out of date [so you cannot commit] but it may be useful (i.e. to examine old
791
924
code.)
925
"""
792
926
793
--basis is to speed up checking out from remote branches. When specified, it
794
uses the inventory and file contents from the basis branch in preference to the
795
branch being checked out.
796
"""
927
_see_also = ['checkouts', 'branch']
797
928
takes_args = ['branch_location?', 'to_location?']
798
takes_options = ['revision', # , 'basis']
929
takes_options = ['revision',
799
930
Option('lightweight',
800
931
help="perform a lightweight checkout. Lightweight "
801
932
"checkouts depend on access to the branch for "
806
937
]
807
938
aliases = ['co']
808
939
809
def run(self, branch_location=None, to_location=None, revision=None, basis=None,
940
def run(self, branch_location=None, to_location=None, revision=None,
810
941
lightweight=False):
811
942
if revision is None:
812
943
revision = [None]
844
975
% to_location)
845
976
else:
846
977
raise
847
old_format = bzrdir.BzrDirFormat.get_default_format()
848
bzrdir.BzrDirFormat.set_default_format(bzrdir.BzrDirMetaFormat1())
849
try:
850
source.create_checkout(to_location, revision_id, lightweight)
851
finally:
852
bzrdir.BzrDirFormat.set_default_format(old_format)
978
source.create_checkout(to_location, revision_id, lightweight)
853
979
854
980
855
981
class cmd_renames(Command):
858
984
# TODO: Option to show renames between two historical versions.
859
985
860
986
# TODO: Only show renames under dir, rather than in the whole branch.
987
_see_also = ['status']
861
988
takes_args = ['dir?']
862
989
863
990
@display_command
864
991
def run(self, dir=u'.'):
865
992
tree = WorkingTree.open_containing(dir)[0]
866
old_inv = tree.basis_tree().inventory
867
new_inv = tree.read_working_inventory()
868
renames = list(_mod_tree.find_renames(old_inv, new_inv))
869
renames.sort()
870
for old_name, new_name in renames:
871
self.outf.write("%s => %s\n" % (old_name, new_name))
993
tree.lock_read()
994
try:
995
new_inv = tree.inventory
996
old_tree = tree.basis_tree()
997
old_tree.lock_read()
998
try:
999
old_inv = old_tree.inventory
1000
renames = list(_mod_tree.find_renames(old_inv, new_inv))
1001
renames.sort()
1002
for old_name, new_name in renames:
1003
self.outf.write("%s => %s\n" % (old_name, new_name))
1004
finally:
1005
old_tree.unlock()
1006
finally:
1007
tree.unlock()
872
1008
873
1009
874
1010
class cmd_update(Command):
881
1017
If you want to discard your local changes, you can just do a
882
1018
'bzr revert' instead of 'bzr commit' after the update.
883
1019
"""
1020
1021
_see_also = ['pull']
884
1022
takes_args = ['dir?']
885
1023
aliases = ['up']
886
1024
924
1062
925
1063
Branches and working trees will also report any missing revisions.
926
1064
"""
1065
_see_also = ['revno']
927
1066
takes_args = ['location?']
928
1067
takes_options = ['verbose']
929
1068
935
1074
936
1075
937
1076
class cmd_remove(Command):
938
"""Make a file unversioned.
1077
"""Remove files or directories.
939
1078
940
This makes bzr stop tracking changes to a versioned file. It does
941
not delete the working copy.
1079
This makes bzr stop tracking changes to the specified files and
1080
delete them if they can easily be recovered using revert.
942
1081
943
1082
You can specify one or more files, and/or --new. If you specify --new,
944
1083
only 'added' files will be removed. If you specify both, then new files
946
1085
also new, they will also be removed.
947
1086
"""
948
1087
takes_args = ['file*']
949
takes_options = ['verbose', Option('new', help='remove newly-added files')]
1088
takes_options = ['verbose',
1089
Option('new', help='remove newly-added files'),
1090
RegistryOption.from_kwargs('file-deletion-strategy',
1091
'The file deletion mode to be used',
1092
title='Deletion Strategy', value_switches=True, enum_switch=False,
1093
safe='Only delete files if they can be'
1094
' safely recovered (default).',
1095
keep="Don't delete any files.",
1096
force='Delete all the specified files, even if they can not be '
1097
'recovered and even if they are non-empty directories.')]
950
1098
aliases = ['rm']
951
1099
encoding_type = 'replace'
952
953
def run(self, file_list, verbose=False, new=False):
1100
1101
def run(self, file_list, verbose=False, new=False,
1102
file_deletion_strategy='safe'):
954
1103
tree, file_list = tree_files(file_list)
955
if new is False:
956
if file_list is None:
957
raise errors.BzrCommandError('Specify one or more files to'
958
' remove, or use --new.')
959
else:
1104
1105
if file_list is not None:
1106
file_list = [f for f in file_list if f != '']
1107
elif not new:
1108
raise errors.BzrCommandError('Specify one or more files to'
1109
' remove, or use --new.')
1110
1111
if new:
960
1112
added = tree.changes_from(tree.basis_tree(),
961
1113
specific_files=file_list).added
962
1114
file_list = sorted([f[0] for f in added], reverse=True)
963
1115
if len(file_list) == 0:
964
1116
raise errors.BzrCommandError('No matching files.')
965
tree.remove(file_list, verbose=verbose, to_file=self.outf)
1117
tree.remove(file_list, verbose=verbose, to_file=self.outf,
1118
keep_files=file_deletion_strategy=='keep',
1119
force=file_deletion_strategy=='force')
966
1120
967
1121
968
1122
class cmd_file_id(Command):
974
1128
"""
975
1129
976
1130
hidden = True
1131
_see_also = ['inventory', 'ls']
977
1132
takes_args = ['filename']
978
1133
979
1134
@display_command
980
1135
def run(self, filename):
981
1136
tree, relpath = WorkingTree.open_containing(filename)
982
i = tree.inventory.path2id(relpath)
1137
i = tree.path2id(relpath)
983
1138
if i is None:
984
1139
raise errors.NotVersionedError(filename)
985
1140
else:
999
1154
@display_command
1000
1155
def run(self, filename):
1001
1156
tree, relpath = WorkingTree.open_containing(filename)
1002
inv = tree.inventory
1003
fid = inv.path2id(relpath)
1157
fid = tree.path2id(relpath)
1004
1158
if fid is None:
1005
1159
raise errors.NotVersionedError(filename)
1006
for fip in inv.get_idpath(fid):
1007
self.outf.write(fip + '\n')
1160
segments = osutils.splitpath(relpath)
1161
for pos in range(1, len(segments) + 1):
1162
path = osutils.joinpath(segments[:pos])
1163
self.outf.write("%s\n" % tree.path2id(path))
1008
1164
1009
1165
1010
1166
class cmd_reconcile(Command):
1025
1181
1026
1182
The branch *MUST* be on a listable system such as local disk or sftp.
1027
1183
"""
1184
1185
_see_also = ['check']
1028
1186
takes_args = ['branch?']
1029
1187
1030
1188
def run(self, branch="."):
1035
1193
1036
1194
class cmd_revision_history(Command):
1037
1195
"""Display the list of revision ids on a branch."""
1196
1197
_see_also = ['log']
1038
1198
takes_args = ['location?']
1039
1199
1040
1200
hidden = True
1049
1209
1050
1210
class cmd_ancestry(Command):
1051
1211
"""List all revisions merged into this branch."""
1212
1213
_see_also = ['log', 'revision-history']
1052
1214
takes_args = ['location?']
1053
1215
1054
1216
hidden = True
1079
1241
1080
1242
If there is a repository in a parent directory of the location, then
1081
1243
the history of the branch will be stored in the repository. Otherwise
1082
init creates a standalone branch which carries its own history in
1083
.bzr.
1244
init creates a standalone branch which carries its own history
1245
in the .bzr directory.
1084
1246
1085
1247
If there is already a branch at the location but it has no working tree,
1086
1248
the tree can be populated with 'bzr checkout'.
1092
1254
bzr status
1093
1255
bzr commit -m 'imported project'
1094
1256
"""
1257
1258
_see_also = ['init-repo', 'branch', 'checkout']
1095
1259
takes_args = ['location?']
1096
1260
takes_options = [
1097
Option('format',
1098
help='Specify a format for this branch. Current'
1099
' formats are: default, knit, metaweave and'
1100
' weave. Default is knit; metaweave and'
1101
' weave are deprecated',
1102
type=get_format_type),
1103
]
1104
def run(self, location=None, format=None):
1261
RegistryOption('format',
1262
help='Specify a format for this branch. '
1263
'See "help formats".',
1264
registry=bzrdir.format_registry,
1265
converter=bzrdir.format_registry.make_bzrdir,
1266
value_switches=True,
1267
title="Branch Format",
1268
),
1269
Option('append-revisions-only',
1270
help='Never change revnos or the existing log.'
1271
' Append revisions to it only.')
1272
]
1273
def run(self, location=None, format=None, append_revisions_only=False):
1105
1274
if format is None:
1106
format = get_format_type('default')
1275
format = bzrdir.format_registry.make_bzrdir('default')
1107
1276
if location is None:
1108
1277
location = u'.'
1109
1278
1124
1293
existing_bzrdir = bzrdir.BzrDir.open(location)
1125
1294
except errors.NotBranchError:
1126
1295
# really a NotBzrDir error...
1127
bzrdir.BzrDir.create_branch_convenience(location, format=format)
1296
branch = bzrdir.BzrDir.create_branch_convenience(to_transport.base,
1297
format=format)
1128
1298
else:
1129
1299
from bzrlib.transport.local import LocalTransport
1130
1300
if existing_bzrdir.has_branch():
1133
1303
raise errors.BranchExistsWithoutWorkingTree(location)
1134
1304
raise errors.AlreadyBranchError(location)
1135
1305
else:
1136
existing_bzrdir.create_branch()
1306
branch = existing_bzrdir.create_branch()
1137
1307
existing_bzrdir.create_workingtree()
1308
if append_revisions_only:
1309
try:
1310
branch.set_append_revisions_only(True)
1311
except errors.UpgradeRequired:
1312
raise errors.BzrCommandError('This branch format cannot be set'
1313
' to append-revisions-only. Try --experimental-branch6')
1138
1314
1139
1315
1140
1316
class cmd_init_repository(Command):
1141
1317
"""Create a shared repository to hold branches.
1142
1318
1143
1319
New branches created under the repository directory will store their revisions
1144
in the repository, not in the branch directory, if the branch format supports
1145
shared storage.
1320
in the repository, not in the branch directory.
1146
1321
1147
1322
example:
1148
bzr init-repo repo
1323
bzr init-repo --no-trees repo
1149
1324
bzr init repo/trunk
1150
1325
bzr checkout --lightweight repo/trunk trunk-checkout
1151
1326
cd trunk-checkout
1152
1327
(add files here)
1153
1328
"""
1154
takes_args = ["location"]
1155
takes_options = [Option('format',
1156
help='Specify a format for this repository.'
1157
' Current formats are: default, knit,'
1158
' metaweave and weave. Default is knit;'
1159
' metaweave and weave are deprecated',
1160
type=get_format_type),
1161
Option('trees',
1162
help='Allows branches in repository to have'
1163
' a working tree')]
1329
1330
_see_also = ['init', 'branch', 'checkout']
1331
takes_args = ["location"]
1332
takes_options = [RegistryOption('format',
1333
help='Specify a format for this repository. See'
1334
' "bzr help formats" for details',
1335
registry=bzrdir.format_registry,
1336
converter=bzrdir.format_registry.make_bzrdir,
1337
value_switches=True, title='Repository format'),
1338
Option('no-trees',
1339
help='Branches in the repository will default to'
1340
' not having a working tree'),
1341
]
1164
1342
aliases = ["init-repo"]
1165
def run(self, location, format=None, trees=False):
1343
1344
def run(self, location, format=None, no_trees=False):
1166
1345
if format is None:
1167
format = get_format_type('default')
1346
format = bzrdir.format_registry.make_bzrdir('default')
1168
1347
1169
1348
if location is None:
1170
1349
location = '.'
1177
1356
1178
1357
newdir = format.initialize_on_transport(to_transport)
1179
1358
repo = newdir.create_repository(shared=True)
1180
repo.set_make_working_trees(trees)
1359
repo.set_make_working_trees(not no_trees)
1181
1360
1182
1361
1183
1362
class cmd_diff(Command):
1196
1375
Difference between the working tree and revision 1
1197
1376
bzr diff -r1..2
1198
1377
Difference between revision 2 and revision 1
1199
bzr diff --diff-prefix old/:new/
1378
bzr diff --prefix old/:new/
1200
1379
Same as 'bzr diff' but prefix paths with old/ and new/
1201
1380
bzr diff bzr.mine bzr.dev
1202
1381
Show the differences between the two working trees
1214
1393
1215
1394
# TODO: This probably handles non-Unix newlines poorly.
1216
1395
1396
_see_also = ['status']
1217
1397
takes_args = ['file*']
1218
1398
takes_options = ['revision', 'diff-options',
1219
1399
Option('prefix', type=str,
1220
1400
short_name='p',
1221
1401
help='Set prefixes to added to old and new filenames, as '
1222
'two values separated by a colon.'),
1402
'two values separated by a colon. (eg "old/:new/")'),
1223
1403
]
1224
1404
aliases = ['di', 'dif']
1225
1405
encoding_type = 'exact'
1239
1419
elif ':' in prefix:
1240
1420
old_label, new_label = prefix.split(":")
1241
1421
else:
1242
raise BzrCommandError(
1243
"--prefix expects two values separated by a colon")
1422
raise errors.BzrCommandError(
1423
'--prefix expects two values separated by a colon'
1424
' (eg "old/:new/")')
1244
1425
1245
1426
if revision and len(revision) > 2:
1246
1427
raise errors.BzrCommandError('bzr diff --revision takes exactly'
1247
1428
' one or two revision specifiers')
1248
1429
1249
1430
try:
1250
1431
tree1, file_list = internal_tree_files(file_list)
1251
1432
tree2 = None
1298
1479
# directories with readdir, rather than stating each one. Same
1299
1480
# level of effort but possibly much less IO. (Or possibly not,
1300
1481
# if the directories are very large...)
1482
_see_also = ['status', 'ls']
1301
1483
takes_options = ['show-ids']
1302
1484
1303
1485
@display_command
1304
1486
def run(self, show_ids=False):
1305
1487
tree = WorkingTree.open_containing(u'.')[0]
1306
old = tree.basis_tree()
1307
for path, ie in old.inventory.iter_entries():
1308
if not tree.has_id(ie.file_id):
1309
self.outf.write(path)
1310
if show_ids:
1311
self.outf.write(' ')
1312
self.outf.write(ie.file_id)
1313
self.outf.write('\n')
1488
tree.lock_read()
1489
try:
1490
old = tree.basis_tree()
1491
old.lock_read()
1492
try:
1493
for path, ie in old.inventory.iter_entries():
1494
if not tree.has_id(ie.file_id):
1495
self.outf.write(path)
1496
if show_ids:
1497
self.outf.write(' ')
1498
self.outf.write(ie.file_id)
1499
self.outf.write('\n')
1500
finally:
1501
old.unlock()
1502
finally:
1503
tree.unlock()
1314
1504
1315
1505
1316
1506
class cmd_modified(Command):
1317
"""List files modified in working tree."""
1507
"""List files modified in working tree.
1508
"""
1509
1318
1510
hidden = True
1511
_see_also = ['status', 'ls']
1512
1319
1513
@display_command
1320
1514
def run(self):
1321
1515
tree = WorkingTree.open_containing(u'.')[0]
1325
1519
1326
1520
1327
1521
class cmd_added(Command):
1328
"""List files added in working tree."""
1522
"""List files added in working tree.
1523
"""
1524
1329
1525
hidden = True
1526
_see_also = ['status', 'ls']
1527
1330
1528
@display_command
1331
1529
def run(self):
1332
1530
wt = WorkingTree.open_containing(u'.')[0]
1333
basis_inv = wt.basis_tree().inventory
1334
inv = wt.inventory
1335
for file_id in inv:
1336
if file_id in basis_inv:
1337
continue
1338
if inv.is_root(file_id) and len(basis_inv) == 0:
1339
continue
1340
path = inv.id2path(file_id)
1341
if not os.access(osutils.abspath(path), os.F_OK):
1342
continue
1343
self.outf.write(path + '\n')
1531
wt.lock_read()
1532
try:
1533
basis = wt.basis_tree()
1534
basis.lock_read()
1535
try:
1536
basis_inv = basis.inventory
1537
inv = wt.inventory
1538
for file_id in inv:
1539
if file_id in basis_inv:
1540
continue
1541
if inv.is_root(file_id) and len(basis_inv) == 0:
1542
continue
1543
path = inv.id2path(file_id)
1544
if not os.access(osutils.abspath(path), os.F_OK):
1545
continue
1546
self.outf.write(path + '\n')
1547
finally:
1548
basis.unlock()
1549
finally:
1550
wt.unlock()
1344
1551
1345
1552
1346
1553
class cmd_root(Command):
1348
1555
1349
1556
The root is the nearest enclosing directory with a .bzr control
1350
1557
directory."""
1558
1351
1559
takes_args = ['filename?']
1352
1560
@display_command
1353
1561
def run(self, filename=None):
1382
1590
help='show files changed in each revision'),
1383
1591
'show-ids', 'revision',
1384
1592
'log-format',
1385
'line', 'long',
1386
1593
Option('message',
1387
1594
short_name='m',
1388
1595
help='show revisions whose message matches this regexp',
1389
1596
type=str),
1390
'short',
1391
1597
]
1392
1598
encoding_type = 'replace'
1393
1599
1398
1604
forward=False,
1399
1605
revision=None,
1400
1606
log_format=None,
1401
message=None,
1402
long=False,
1403
short=False,
1404
line=False):
1405
from bzrlib.log import log_formatter, show_log
1607
message=None):
1608
from bzrlib.log import show_log
1406
1609
assert message is None or isinstance(message, basestring), \
1407
1610
"invalid message argument %r" % message
1408
1611
direction = (forward and 'forward') or 'reverse'
1412
1615
if location:
1413
1616
# find the file id to log:
1414
1617
1415
dir, fp = bzrdir.BzrDir.open_containing(location)
1416
b = dir.open_branch()
1618
tree, b, fp = bzrdir.BzrDir.open_containing_tree_or_branch(
1619
location)
1417
1620
if fp != '':
1418
try:
1419
# might be a tree:
1420
inv = dir.open_workingtree().inventory
1421
except (errors.NotBranchError, errors.NotLocalUrl):
1422
# either no tree, or is remote.
1423
inv = b.basis_tree().inventory
1424
file_id = inv.path2id(fp)
1621
if tree is None:
1622
tree = b.basis_tree()
1623
file_id = tree.path2id(fp)
1425
1624
if file_id is None:
1426
1625
raise errors.BzrCommandError(
1427
1626
"Path does not have any revision history: %s" %
1437
1636
dir, relpath = bzrdir.BzrDir.open_containing(location)
1438
1637
b = dir.open_branch()
1439
1638
1440
if revision is None:
1441
rev1 = None
1442
rev2 = None
1443
elif len(revision) == 1:
1444
rev1 = rev2 = revision[0].in_history(b).revno
1445
elif len(revision) == 2:
1446
if revision[1].get_branch() != revision[0].get_branch():
1447
# b is taken from revision[0].get_branch(), and
1448
# show_log will use its revision_history. Having
1449
# different branches will lead to weird behaviors.
1639
b.lock_read()
1640
try:
1641
if revision is None:
1642
rev1 = None
1643
rev2 = None
1644
elif len(revision) == 1:
1645
rev1 = rev2 = revision[0].in_history(b).revno
1646
elif len(revision) == 2:
1647
if revision[1].get_branch() != revision[0].get_branch():
1648
# b is taken from revision[0].get_branch(), and
1649
# show_log will use its revision_history. Having
1650
# different branches will lead to weird behaviors.
1651
raise errors.BzrCommandError(
1652
"Log doesn't accept two revisions in different"
1653
" branches.")
1654
if revision[0].spec is None:
1655
# missing begin-range means first revision
1656
rev1 = 1
1657
else:
1658
rev1 = revision[0].in_history(b).revno
1659
1660
if revision[1].spec is None:
1661
# missing end-range means last known revision
1662
rev2 = b.revno()
1663
else:
1664
rev2 = revision[1].in_history(b).revno
1665
else:
1450
1666
raise errors.BzrCommandError(
1451
"Log doesn't accept two revisions in different branches.")
1452
if revision[0].spec is None:
1453
# missing begin-range means first revision
1454
rev1 = 1
1455
else:
1456
rev1 = revision[0].in_history(b).revno
1457
1458
if revision[1].spec is None:
1459
# missing end-range means last known revision
1460
rev2 = b.revno()
1461
else:
1462
rev2 = revision[1].in_history(b).revno
1463
else:
1464
raise errors.BzrCommandError('bzr log --revision takes one or two values.')
1465
1466
# By this point, the revision numbers are converted to the +ve
1467
# form if they were supplied in the -ve form, so we can do
1468
# this comparison in relative safety
1469
if rev1 > rev2:
1470
(rev2, rev1) = (rev1, rev2)
1471
1472
if (log_format is None):
1473
default = b.get_config().log_format()
1474
log_format = get_log_format(long=long, short=short, line=line,
1475
default=default)
1476
lf = log_formatter(log_format,
1477
show_ids=show_ids,
1478
to_file=self.outf,
1479
show_timezone=timezone)
1480
1481
show_log(b,
1482
lf,
1483
file_id,
1484
verbose=verbose,
1485
direction=direction,
1486
start_revision=rev1,
1487
end_revision=rev2,
1488
search=message)
1667
'bzr log --revision takes one or two values.')
1668
1669
# By this point, the revision numbers are converted to the +ve
1670
# form if they were supplied in the -ve form, so we can do
1671
# this comparison in relative safety
1672
if rev1 > rev2:
1673
(rev2, rev1) = (rev1, rev2)
1674
1675
if log_format is None:
1676
log_format = log.log_formatter_registry.get_default(b)
1677
1678
lf = log_format(show_ids=show_ids, to_file=self.outf,
1679
show_timezone=timezone)
1680
1681
show_log(b,
1682
lf,
1683
file_id,
1684
verbose=verbose,
1685
direction=direction,
1686
start_revision=rev1,
1687
end_revision=rev2,
1688
search=message)
1689
finally:
1690
b.unlock()
1489
1691
1490
1692
1491
1693
def get_log_format(long=False, short=False, line=False, default='long'):
1512
1714
def run(self, filename):
1513
1715
tree, relpath = WorkingTree.open_containing(filename)
1514
1716
b = tree.branch
1515
inv = tree.read_working_inventory()
1516
file_id = inv.path2id(relpath)
1717
file_id = tree.path2id(relpath)
1517
1718
for revno, revision_id, what in log.find_touching_revisions(b, file_id):
1518
1719
self.outf.write("%6d %s\n" % (revno, what))
1519
1720
1522
1723
"""List files in a tree.
1523
1724
"""
1524
1725
1726
_see_also = ['status', 'cat']
1727
takes_args = ['path?']
1525
1728
# TODO: Take a revision or remote path and list that tree instead.
1526
1729
takes_options = ['verbose', 'revision',
1527
1730
Option('non-recursive',
1533
1736
Option('ignored', help='Print ignored files'),
1534
1737
1535
1738
Option('null', help='Null separate the files'),
1536
'kind',
1739
'kind', 'show-ids'
1537
1740
]
1538
1741
@display_command
1539
1742
def run(self, revision=None, verbose=False,
1540
1743
non_recursive=False, from_root=False,
1541
1744
unknown=False, versioned=False, ignored=False,
1542
null=False, kind=None):
1745
null=False, kind=None, show_ids=False, path=None):
1543
1746
1544
1747
if kind and kind not in ('file', 'directory', 'symlink'):
1545
1748
raise errors.BzrCommandError('invalid kind specified')
1550
1753
1551
1754
selection = {'I':ignored, '?':unknown, 'V':versioned}
1552
1755
1553
tree, relpath = WorkingTree.open_containing(u'.')
1756
if path is None:
1757
fs_path = '.'
1758
prefix = ''
1759
else:
1760
if from_root:
1761
raise errors.BzrCommandError('cannot specify both --from-root'
1762
' and PATH')
1763
fs_path = path
1764
prefix = path
1765
tree, branch, relpath = bzrdir.BzrDir.open_containing_tree_or_branch(
1766
fs_path)
1554
1767
if from_root:
1555
1768
relpath = u''
1556
1769
elif relpath:
1557
1770
relpath += '/'
1558
1771
if revision is not None:
1559
tree = tree.branch.repository.revision_tree(
1560
revision[0].in_history(tree.branch).rev_id)
1772
tree = branch.repository.revision_tree(
1773
revision[0].in_history(branch).rev_id)
1774
elif tree is None:
1775
tree = branch.basis_tree()
1561
1776
1562
for fp, fc, fkind, fid, entry in tree.list_files(include_root=False):
1563
if fp.startswith(relpath):
1564
fp = fp[len(relpath):]
1565
if non_recursive and '/' in fp:
1566
continue
1567
if not all and not selection[fc]:
1568
continue
1569
if kind is not None and fkind != kind:
1570
continue
1571
if verbose:
1572
kindch = entry.kind_character()
1573
self.outf.write('%-8s %s%s\n' % (fc, fp, kindch))
1574
elif null:
1575
self.outf.write(fp + '\0')
1576
self.outf.flush()
1577
else:
1578
self.outf.write(fp + '\n')
1777
tree.lock_read()
1778
try:
1779
for fp, fc, fkind, fid, entry in tree.list_files(include_root=False):
1780
if fp.startswith(relpath):
1781
fp = osutils.pathjoin(prefix, fp[len(relpath):])
1782
if non_recursive and '/' in fp:
1783
continue
1784
if not all and not selection[fc]:
1785
continue
1786
if kind is not None and fkind != kind:
1787
continue
1788
if verbose:
1789
kindch = entry.kind_character()
1790
outstring = '%-8s %s%s' % (fc, fp, kindch)
1791
if show_ids and fid is not None:
1792
outstring = "%-50s %s" % (outstring, fid)
1793
self.outf.write(outstring + '\n')
1794
elif null:
1795
self.outf.write(fp + '\0')
1796
if show_ids:
1797
if fid is not None:
1798
self.outf.write(fid)
1799
self.outf.write('\0')
1800
self.outf.flush()
1801
else:
1802
if fid is not None:
1803
my_id = fid
1804
else:
1805
my_id = ''
1806
if show_ids:
1807
self.outf.write('%-50s %s\n' % (fp, my_id))
1808
else:
1809
self.outf.write(fp + '\n')
1810
finally:
1811
tree.unlock()
1579
1812
1580
1813
1581
1814
class cmd_unknowns(Command):
1582
"""List unknown files."""
1815
"""List unknown files.
1816
"""
1817
1818
hidden = True
1819
_see_also = ['ls']
1820
1583
1821
@display_command
1584
1822
def run(self):
1585
1823
for f in WorkingTree.open_containing(u'.')[0].unknowns():
1619
1857
bzr ignore 'lib/**/*.o'
1620
1858
bzr ignore 'RE:lib/.*\.o'
1621
1859
"""
1860
1861
_see_also = ['status', 'ignored']
1622
1862
takes_args = ['name_pattern*']
1623
1863
takes_options = [
1624
1864
Option('old-default-rules',
1635
1875
if not name_pattern_list:
1636
1876
raise errors.BzrCommandError("ignore requires at least one "
1637
1877
"NAME_PATTERN or --old-default-rules")
1878
name_pattern_list = [globbing.normalize_pattern(p)
1879
for p in name_pattern_list]
1638
1880
for name_pattern in name_pattern_list:
1639
if name_pattern[0] == '/':
1881
if (name_pattern[0] == '/' or
1882
(len(name_pattern) > 1 and name_pattern[1] == ':')):
1640
1883
raise errors.BzrCommandError(
1641
1884
"NAME_PATTERN should not be an absolute path")
1642
1885
tree, relpath = WorkingTree.open_containing(u'.')
1656
1899
if igns and igns[-1] != '\n':
1657
1900
igns += '\n'
1658
1901
for name_pattern in name_pattern_list:
1659
igns += name_pattern.rstrip('/') + '\n'
1902
igns += name_pattern + '\n'
1660
1903
1661
1904
f = AtomicFile(ifn, 'wb')
1662
1905
try:
1665
1908
finally:
1666
1909
f.close()
1667
1910
1668
inv = tree.inventory
1669
if inv.path2id('.bzrignore'):
1670
mutter('.bzrignore is already versioned')
1671
else:
1672
mutter('need to make new .bzrignore file versioned')
1911
if not tree.path2id('.bzrignore'):
1673
1912
tree.add(['.bzrignore'])
1674
1913
1675
1914
1676
1915
class cmd_ignored(Command):
1677
1916
"""List ignored files and the patterns that matched them.
1917
"""
1678
1918
1679
See also: bzr ignore"""
1919
_see_also = ['ignore']
1680
1920
@display_command
1681
1921
def run(self):
1682
1922
tree = WorkingTree.open_containing(u'.')[0]
1683
for path, file_class, kind, file_id, entry in tree.list_files():
1684
if file_class != 'I':
1685
continue
1686
## XXX: Slightly inefficient since this was already calculated
1687
pat = tree.is_ignored(path)
1688
print '%-50s %s' % (path, pat)
1923
tree.lock_read()
1924
try:
1925
for path, file_class, kind, file_id, entry in tree.list_files():
1926
if file_class != 'I':
1927
continue
1928
## XXX: Slightly inefficient since this was already calculated
1929
pat = tree.is_ignored(path)
1930
print '%-50s %s' % (path, pat)
1931
finally:
1932
tree.unlock()
1689
1933
1690
1934
1691
1935
class cmd_lookup_revision(Command):
1708
1952
1709
1953
1710
1954
class cmd_export(Command):
1711
"""Export past revision to destination directory.
1955
"""Export current or past revision to a destination directory or archive.
1712
1956
1713
1957
If no revision is specified this exports the last committed revision.
1714
1958
1716
1960
given, try to find the format with the extension. If no extension
1717
1961
is found exports to a directory (equivalent to --format=dir).
1718
1962
1719
Root may be the top directory for tar, tgz and tbz2 formats. If none
1720
is given, the top directory will be the root name of the file.
1721
1722
If branch is omitted then the branch containing the CWD will be used.
1723
1724
Note: export of tree with non-ascii filenames to zip is not supported.
1963
If root is supplied, it will be used as the root directory inside
1964
container formats (tar, zip, etc). If it is not supplied it will default
1965
to the exported filename. The root option has no effect for 'dir' format.
1966
1967
If branch is omitted then the branch containing the current working
1968
directory will be used.
1969
1970
Note: Export of tree with non-ASCII filenames to zip is not supported.
1725
1971
1726
1972
Supported formats Autodetected by extension
1727
1973
----------------- -------------------------
1757
2003
1758
2004
1759
2005
class cmd_cat(Command):
1760
"""Write a file's text from a previous revision."""
1761
2006
"""Write the contents of a file as of a given revision to standard output.
2007
2008
If no revision is nominated, the last revision is used.
2009
2010
Note: Take care to redirect standard output when using this command on a
2011
binary file.
2012
"""
2013
2014
_see_also = ['ls']
1762
2015
takes_options = ['revision', 'name-from-revision']
1763
2016
takes_args = ['filename']
1764
2017
encoding_type = 'exact'
1771
2024
1772
2025
tree = None
1773
2026
try:
1774
tree, relpath = WorkingTree.open_containing(filename)
1775
b = tree.branch
1776
except (errors.NotBranchError, errors.NotLocalUrl):
2027
tree, b, relpath = \
2028
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
2029
except errors.NotBranchError:
1777
2030
pass
1778
2031
1779
2032
if revision is not None and revision[0].get_branch() is not None:
1780
2033
b = Branch.open(revision[0].get_branch())
1781
2034
if tree is None:
1782
b, relpath = Branch.open_containing(filename)
1783
2035
tree = b.basis_tree()
1784
2036
if revision is None:
1785
2037
revision_id = b.last_revision()
1824
2076
within it is committed.
1825
2077
1826
2078
A selected-file commit may fail in some cases where the committed
1827
tree would be invalid, such as trying to commit a file in a
1828
newly-added directory that is not itself committed.
2079
tree would be invalid. Consider::
2080
2081
bzr init foo
2082
mkdir foo/bar
2083
bzr add foo/bar
2084
bzr commit foo -m "committing foo"
2085
bzr mv foo/bar foo/baz
2086
mkdir foo/bar
2087
bzr add foo/bar
2088
bzr commit foo/bar -m "committing bar but not baz"
2089
2090
In the example above, the last commit will fail by design. This gives
2091
the user the opportunity to decide whether they want to commit the
2092
rename at the same time, separately first, or not at all. (As a general
2093
rule, when in doubt, Bazaar has a policy of Doing the Safe Thing.)
2094
2095
Note: A selected-file commit after a merge is not yet supported.
1829
2096
"""
1830
2097
# TODO: Run hooks on tree to-be-committed, and after commit.
1831
2098
1836
2103
1837
2104
# XXX: verbose currently does nothing
1838
2105
2106
_see_also = ['bugs', 'uncommit']
1839
2107
takes_args = ['selected*']
1840
2108
takes_options = ['message', 'verbose',
1841
2109
Option('unchanged',
1847
2115
Option('strict',
1848
2116
help="refuse to commit if there are unknown "
1849
2117
"files in the working tree."),
2118
ListOption('fixes', type=str,
2119
help="mark a bug as being fixed by this "
2120
"revision."),
1850
2121
Option('local',
1851
2122
help="perform a local only commit in a bound "
1852
2123
"branch. Such commits are not pushed to "
1856
2127
]
1857
2128
aliases = ['ci', 'checkin']
1858
2129
2130
def _get_bug_fix_properties(self, fixes, branch):
2131
properties = []
2132
# Configure the properties for bug fixing attributes.
2133
for fixed_bug in fixes:
2134
tokens = fixed_bug.split(':')
2135
if len(tokens) != 2:
2136
raise errors.BzrCommandError(
2137
"Invalid bug %s. Must be in the form of 'tag:id'. "
2138
"Commit refused." % fixed_bug)
2139
tag, bug_id = tokens
2140
try:
2141
bug_url = bugtracker.get_bug_url(tag, branch, bug_id)
2142
except errors.UnknownBugTrackerAbbreviation:
2143
raise errors.BzrCommandError(
2144
'Unrecognized bug %s. Commit refused.' % fixed_bug)
2145
except errors.MalformedBugIdentifier:
2146
raise errors.BzrCommandError(
2147
"Invalid bug identifier for %s. Commit refused."
2148
% fixed_bug)
2149
properties.append('%s fixed' % bug_url)
2150
return '\n'.join(properties)
2151
1859
2152
def run(self, message=None, file=None, verbose=True, selected_list=None,
1860
unchanged=False, strict=False, local=False):
2153
unchanged=False, strict=False, local=False, fixes=None):
1861
2154
from bzrlib.commit import (NullCommitReporter, ReportCommitToLog)
1862
2155
from bzrlib.errors import (PointlessCommit, ConflictsInTree,
1863
2156
StrictCommitFailed)
1869
2162
1870
2163
# TODO: do more checks that the commit will succeed before
1871
2164
# spending the user's valuable time typing a commit message.
2165
2166
properties = {}
2167
1872
2168
tree, selected_list = tree_files(selected_list)
1873
2169
if selected_list == ['']:
1874
2170
# workaround - commit of root of tree should be exactly the same
1876
2172
# selected-file merge commit is not done yet
1877
2173
selected_list = []
1878
2174
2175
bug_property = self._get_bug_fix_properties(fixes, tree.branch)
2176
if bug_property:
2177
properties['bugs'] = bug_property
2178
1879
2179
if local and not tree.branch.get_bound_location():
1880
2180
raise errors.LocalRequiresBoundBranch()
1881
2181
1897
2197
if my_message == "":
1898
2198
raise errors.BzrCommandError("empty commit message specified")
1899
2199
return my_message
1900
2200
1901
2201
if verbose:
1902
2202
reporter = ReportCommitToLog()
1903
2203
else:
1907
2207
tree.commit(message_callback=get_message,
1908
2208
specific_files=selected_list,
1909
2209
allow_pointless=unchanged, strict=strict, local=local,
1910
reporter=reporter)
2210
reporter=reporter, revprops=properties)
1911
2211
except PointlessCommit:
1912
2212
# FIXME: This should really happen before the file is read in;
1913
2213
# perhaps prepare the commit; get the message; then actually commit
1933
2233
This command checks various invariants about the branch storage to
1934
2234
detect data corruption or bzr bugs.
1935
2235
"""
2236
2237
_see_also = ['reconcile']
1936
2238
takes_args = ['branch?']
1937
2239
takes_options = ['verbose']
1938
2240
1953
2255
this command. When the default format has changed you may also be warned
1954
2256
during other operations to upgrade.
1955
2257
"""
2258
2259
_see_also = ['check']
1956
2260
takes_args = ['url?']
1957
2261
takes_options = [
1958
Option('format',
1959
help='Upgrade to a specific format. Current formats'
1960
' are: default, knit, metaweave and weave.'
1961
' Default is knit; metaweave and weave are'
1962
' deprecated',
1963
type=get_format_type),
2262
RegistryOption('format',
2263
help='Upgrade to a specific format. See "bzr help'
2264
' formats" for details',
2265
registry=bzrdir.format_registry,
2266
converter=bzrdir.format_registry.make_bzrdir,
2267
value_switches=True, title='Branch format'),
1964
2268
]
1965
2269
1966
1967
2270
def run(self, url='.', format=None):
1968
2271
from bzrlib.upgrade import upgrade
1969
2272
if format is None:
1970
format = get_format_type('default')
2273
format = bzrdir.format_registry.make_bzrdir('default')
1971
2274
upgrade(url, format)
1972
2275
1973
2276
2022
2325
If unset, the tree root directory name is used as the nickname
2023
2326
To print the current nickname, execute with no argument.
2024
2327
"""
2328
2329
_see_also = ['info']
2025
2330
takes_args = ['nickname?']
2026
2331
def run(self, nickname=None):
2027
2332
branch = Branch.open_containing(u'.')[0]
2032
2337
2033
2338
@display_command
2034
2339
def printme(self, branch):
2035
print branch.nick
2340
print branch.nick
2036
2341
2037
2342
2038
2343
class cmd_selftest(Command):
2039
2344
"""Run internal test suite.
2040
2345
2041
This creates temporary test directories in the working directory,
2042
but not existing data is affected. These directories are deleted
2043
if the tests pass, or left behind to help in debugging if they
2044
fail and --keep-output is specified.
2346
This creates temporary test directories in the working directory, but no
2347
existing data is affected. These directories are deleted if the tests
2348
pass, or left behind to help in debugging if they fail and --keep-output
2349
is specified.
2045
2350
2046
If arguments are given, they are regular expressions that say
2047
which tests should run.
2351
If arguments are given, they are regular expressions that say which tests
2352
should run. Tests matching any expression are run, and other tests are
2353
not run.
2354
2355
Alternatively if --first is given, matching tests are run first and then
2356
all other tests are run. This is useful if you have been working in a
2357
particular area, but want to make sure nothing else was broken.
2358
2359
If --exclude is given, tests that match that regular expression are
2360
excluded, regardless of whether they match --first or not.
2361
2362
To help catch accidential dependencies between tests, the --randomize
2363
option is useful. In most cases, the argument used is the word 'now'.
2364
Note that the seed used for the random number generator is displayed
2365
when this option is used. The seed can be explicitly passed as the
2366
argument to this option if required. This enables reproduction of the
2367
actual ordering used if and when an order sensitive problem is encountered.
2368
2369
If --list-only is given, the tests that would be run are listed. This is
2370
useful when combined with --first, --exclude and/or --randomize to
2371
understand their impact. The test harness reports "Listed nn tests in ..."
2372
instead of "Ran nn tests in ..." when list mode is enabled.
2048
2373
2049
2374
If the global option '--no-plugins' is given, plugins are not loaded
2050
2375
before running the selftests. This has two effects: features provided or
2051
2376
modified by plugins will not be tested, and tests provided by plugins will
2052
2377
not be run.
2053
2378
2054
examples:
2379
examples::
2055
2380
bzr selftest ignore
2381
run only tests relating to 'ignore'
2056
2382
bzr --no-plugins selftest -v
2383
disable plugins and list tests as they're run
2384
2385
For each test, that needs actual disk access, bzr create their own
2386
subdirectory in the temporary testing directory (testXXXX.tmp).
2387
By default the name of such subdirectory is based on the name of the test.
2388
If option '--numbered-dirs' is given, bzr will use sequent numbers
2389
of running tests to create such subdirectories. This is default behavior
2390
on Windows because of path length limitation.
2057
2391
"""
2058
# TODO: --list should give a list of all available tests
2059
2060
2392
# NB: this is used from the class without creating an instance, which is
2061
2393
# why it does not have a self parameter.
2062
2394
def get_transport_type(typestring):
2077
2409
hidden = True
2078
2410
takes_args = ['testspecs*']
2079
2411
takes_options = ['verbose',
2080
Option('one', help='stop when one test fails'),
2081
Option('keep-output',
2412
Option('one',
2413
help='stop when one test fails',
2414
short_name='1',
2415
),
2416
Option('keep-output',
2082
2417
help='keep output directories when tests fail'),
2083
Option('transport',
2418
Option('transport',
2084
2419
help='Use a different transport by default '
2085
2420
'throughout the test suite.',
2086
2421
type=get_transport_type),
2087
Option('benchmark', help='run the bzr bencharks.'),
2422
Option('benchmark', help='run the bzr benchmarks.'),
2088
2423
Option('lsprof-timed',
2089
2424
help='generate lsprof output for benchmarked'
2090
2425
' sections of code.'),
2094
2429
Option('clean-output',
2095
2430
help='clean temporary tests directories'
2096
2431
' without running tests'),
2432
Option('first',
2433
help='run all tests, but run specified tests first',
2434
short_name='f',
2435
),
2436
Option('numbered-dirs',
2437
help='use numbered dirs for TestCaseInTempDir'),
2438
Option('list-only',
2439
help='list the tests instead of running them'),
2440
Option('randomize', type=str, argname="SEED",
2441
help='randomize the order of tests using the given'
2442
' seed or "now" for the current time'),
2443
Option('exclude', type=str, argname="PATTERN",
2444
short_name='x',
2445
help='exclude tests that match this regular'
2446
' expression'),
2097
2447
]
2448
encoding_type = 'replace'
2098
2449
2099
2450
def run(self, testspecs_list=None, verbose=None, one=False,
2100
2451
keep_output=False, transport=None, benchmark=None,
2101
lsprof_timed=None, cache_dir=None, clean_output=False):
2452
lsprof_timed=None, cache_dir=None, clean_output=False,
2453
first=False, numbered_dirs=None, list_only=False,
2454
randomize=None, exclude=None):
2102
2455
import bzrlib.ui
2103
2456
from bzrlib.tests import selftest
2104
2457
import bzrlib.benchmarks as benchmarks
2109
2462
clean_selftest_output()
2110
2463
return 0
2111
2464
2465
if numbered_dirs is None and sys.platform == 'win32':
2466
numbered_dirs = True
2467
2112
2468
if cache_dir is not None:
2113
2469
tree_creator.TreeCreator.CACHE_ROOT = osutils.abspath(cache_dir)
2114
2470
print '%10s: %s' % ('bzr', osutils.realpath(sys.argv[0]))
2137
2493
transport=transport,
2138
2494
test_suite_factory=test_suite_factory,
2139
2495
lsprof_timed=lsprof_timed,
2140
bench_history=benchfile)
2496
bench_history=benchfile,
2497
matching_tests_first=first,
2498
numbered_dirs=numbered_dirs,
2499
list_only=list_only,
2500
random_seed=randomize,
2501
exclude_pattern=exclude
2502
)
2141
2503
finally:
2142
2504
if benchfile is not None:
2143
2505
benchfile.close()
2164
2526
2165
2527
@display_command
2166
2528
def run(self):
2167
print "it sure does!"
2529
print "It sure does!"
2168
2530
2169
2531
2170
2532
class cmd_find_merge_base(Command):
2181
2543
branch1 = Branch.open_containing(branch)[0]
2182
2544
branch2 = Branch.open_containing(other)[0]
2183
2545
2184
history_1 = branch1.revision_history()
2185
history_2 = branch2.revision_history()
2186
2187
2546
last1 = branch1.last_revision()
2188
2547
last2 = branch2.last_revision()
2189
2548
2220
2579
default, use --remember. The value will only be saved if the remote
2221
2580
location can be accessed.
2222
2581
2582
The results of the merge are placed into the destination working
2583
directory, where they can be reviewed (with bzr diff), tested, and then
2584
committed to record the result of the merge.
2585
2223
2586
Examples:
2224
2587
2225
To merge the latest revision from bzr.dev
2226
bzr merge ../bzr.dev
2588
To merge the latest revision from bzr.dev:
2589
bzr merge ../bzr.dev
2227
2590
2228
To merge changes up to and including revision 82 from bzr.dev
2229
bzr merge -r 82 ../bzr.dev
2591
To merge changes up to and including revision 82 from bzr.dev:
2592
bzr merge -r 82 ../bzr.dev
2230
2593
2231
2594
To merge the changes introduced by 82, without previous changes:
2232
bzr merge -r 81..82 ../bzr.dev
2595
bzr merge -r 81..82 ../bzr.dev
2233
2596
2234
2597
merge refuses to run if there are any uncommitted changes, unless
2235
2598
--force is given.
2599
"""
2236
2600
2237
The following merge types are available:
2238
"""
2601
_see_also = ['update', 'remerge']
2239
2602
takes_args = ['branch?']
2240
2603
takes_options = ['revision', 'force', 'merge-type', 'reprocess', 'remember',
2241
Option('show-base', help="Show base revision text in "
2242
"conflicts"),
2243
Option('uncommitted', help='Apply uncommitted changes'
2244
' from a working copy, instead of branch changes'),
2245
Option('pull', help='If the destination is already'
2246
' completely merged into the source, pull from the'
2247
' source rather than merging. When this happens,'
2248
' you do not need to commit the result.'),
2249
]
2250
2251
def help(self):
2252
from inspect import getdoc
2253
return getdoc(self) + '\n' + _mod_merge.merge_type_help()
2604
Option('show-base', help="Show base revision text in "
2605
"conflicts"),
2606
Option('uncommitted', help='Apply uncommitted changes'
2607
' from a working copy, instead of branch changes'),
2608
Option('pull', help='If the destination is already'
2609
' completely merged into the source, pull from the'
2610
' source rather than merging. When this happens,'
2611
' you do not need to commit the result.'),
2612
Option('directory',
2613
help='Branch to merge into, '
2614
'rather than the one containing the working directory',
2615
short_name='d',
2616
type=unicode,
2617
),
2618
]
2254
2619
2255
2620
def run(self, branch=None, revision=None, force=False, merge_type=None,
2256
show_base=False, reprocess=False, remember=False,
2257
uncommitted=False, pull=False):
2621
show_base=False, reprocess=False, remember=False,
2622
uncommitted=False, pull=False,
2623
directory=None,
2624
):
2625
from bzrlib.tag import _merge_tags_if_possible
2626
other_revision_id = None
2258
2627
if merge_type is None:
2259
2628
merge_type = _mod_merge.Merge3Merger
2260
2629
2261
tree = WorkingTree.open_containing(u'.')[0]
2630
if directory is None: directory = u'.'
2631
# XXX: jam 20070225 WorkingTree should be locked before you extract its
2632
# inventory. Because merge is a mutating operation, it really
2633
# should be a lock_write() for the whole cmd_merge operation.
2634
# However, cmd_merge open's its own tree in _merge_helper, which
2635
# means if we lock here, the later lock_write() will always block.
2636
# Either the merge helper code should be updated to take a tree,
2637
# (What about tree.merge_from_branch?)
2638
tree = WorkingTree.open_containing(directory)[0]
2639
change_reporter = delta._ChangeReporter(
2640
unversioned_filter=tree.is_ignored)
2262
2641
2263
2642
if branch is not None:
2264
2643
try:
2265
reader = bundle.read_bundle_from_url(branch)
2644
mergeable = bundle.read_mergeable_from_url(
2645
branch)
2266
2646
except errors.NotABundle:
2267
2647
pass # Continue on considering this url a Branch
2268
2648
else:
2269
conflicts = merge_bundle(reader, tree, not force, merge_type,
2270
reprocess, show_base)
2271
if conflicts == 0:
2272
return 0
2273
else:
2274
return 1
2649
if revision is not None:
2650
raise errors.BzrCommandError(
2651
'Cannot use -r with merge directives or bundles')
2652
other_revision_id = mergeable.install_revisions(
2653
tree.branch.repository)
2654
revision = [RevisionSpec.from_string(
2655
'revid:' + other_revision_id)]
2275
2656
2276
2657
if revision is None \
2277
2658
or len(revision) < 1 or revision[0].needs_branch():
2292
2673
branch = revision[0].get_branch() or branch
2293
2674
if len(revision) == 1:
2294
2675
base = [None, None]
2295
other_branch, path = Branch.open_containing(branch)
2296
revno = revision[0].in_history(other_branch).revno
2297
other = [branch, revno]
2676
if other_revision_id is not None:
2677
other_branch = None
2678
path = ""
2679
other = None
2680
else:
2681
other_branch, path = Branch.open_containing(branch)
2682
revno = revision[0].in_history(other_branch).revno
2683
other = [branch, revno]
2298
2684
else:
2299
2685
assert len(revision) == 2
2300
2686
if None in revision:
2310
2696
base = [branch, revision[0].in_history(base_branch).revno]
2311
2697
other = [branch1, revision[1].in_history(other_branch).revno]
2312
2698
2313
if tree.branch.get_parent() is None or remember:
2699
if ((tree.branch.get_parent() is None or remember) and
2700
other_branch is not None):
2314
2701
tree.branch.set_parent(other_branch.base)
2315
2702
2703
# pull tags now... it's a bit inconsistent to do it ahead of copying
2704
# the history but that's done inside the merge code
2705
if other_branch is not None:
2706
_merge_tags_if_possible(other_branch, tree.branch)
2707
2316
2708
if path != "":
2317
2709
interesting_files = [path]
2318
2710
else:
2321
2713
try:
2322
2714
try:
2323
2715
conflict_count = _merge_helper(
2324
other, base, check_clean=(not force),
2716
other, base, other_rev_id=other_revision_id,
2717
check_clean=(not force),
2325
2718
merge_type=merge_type,
2326
2719
reprocess=reprocess,
2327
2720
show_base=show_base,
2328
2721
pull=pull,
2329
pb=pb, file_list=interesting_files)
2722
this_dir=directory,
2723
pb=pb, file_list=interesting_files,
2724
change_reporter=change_reporter)
2330
2725
finally:
2331
2726
pb.finished()
2332
2727
if conflict_count != 0:
2371
2766
pending merge, and it lets you specify particular files.
2372
2767
2373
2768
Examples:
2769
2374
2770
$ bzr remerge --show-base
2375
2771
Re-do the merge of all conflicted files, and show the base text in
2376
2772
conflict regions, in addition to the usual THIS and OTHER texts.
2378
2774
$ bzr remerge --merge-type weave --reprocess foobar
2379
2775
Re-do the merge of "foobar", using the weave merge algorithm, with
2380
2776
additional processing to reduce the size of conflict regions.
2381
2382
The following merge types are available:"""
2777
"""
2383
2778
takes_args = ['file*']
2384
2779
takes_options = ['merge-type', 'reprocess',
2385
2780
Option('show-base', help="Show base revision text in "
2386
2781
"conflicts")]
2387
2782
2388
def help(self):
2389
from inspect import getdoc
2390
return getdoc(self) + '\n' + _mod_merge.merge_type_help()
2391
2392
2783
def run(self, file_list=None, merge_type=None, show_base=False,
2393
2784
reprocess=False):
2394
2785
if merge_type is None:
2473
2864
name. If you name a directory, all the contents of that directory will be
2474
2865
reverted.
2475
2866
"""
2867
2868
_see_also = ['cat', 'export']
2476
2869
takes_options = ['revision', 'no-backup']
2477
2870
takes_args = ['file*']
2478
aliases = ['merge-revert']
2479
2871
2480
2872
def run(self, revision=None, no_backup=False, file_list=None):
2481
2873
if file_list is not None:
2496
2888
try:
2497
2889
tree.revert(file_list,
2498
2890
tree.branch.repository.revision_tree(rev_id),
2499
not no_backup, pb)
2891
not no_backup, pb, report_changes=True)
2500
2892
finally:
2501
2893
pb.finished()
2502
2894
2513
2905
2514
2906
class cmd_help(Command):
2515
2907
"""Show help on a command or other topic.
2908
"""
2516
2909
2517
For a list of all available commands, say 'bzr help commands'.
2518
"""
2910
_see_also = ['topics']
2519
2911
takes_options = [Option('long', 'show help on all commands')]
2520
2912
takes_args = ['topic?']
2521
2913
aliases = ['?', '--help', '-?', '-h']
2562
2954
2563
2955
OTHER_BRANCH may be local or remote.
2564
2956
"""
2957
2958
_see_also = ['merge', 'pull']
2565
2959
takes_args = ['other_branch?']
2566
2960
takes_options = [Option('reverse', 'Reverse the order of revisions'),
2567
2961
Option('mine-only',
2569
2963
Option('theirs-only',
2570
2964
'Display changes in the remote branch only'),
2571
2965
'log-format',
2572
'line',
2573
'long',
2574
'short',
2575
2966
'show-ids',
2576
2967
'verbose'
2577
2968
]
2589
2980
other_branch = parent
2590
2981
if other_branch is None:
2591
2982
raise errors.BzrCommandError("No peer location known or specified.")
2592
print "Using last location: " + local_branch.get_parent()
2983
display_url = urlutils.unescape_for_display(parent,
2984
self.outf.encoding)
2985
print "Using last location: " + display_url
2986
2593
2987
remote_branch = Branch.open(other_branch)
2594
2988
if remote_branch.base == local_branch.base:
2595
2989
remote_branch = local_branch
2599
2993
try:
2600
2994
local_extra, remote_extra = find_unmerged(local_branch, remote_branch)
2601
2995
if (log_format is None):
2602
default = local_branch.get_config().log_format()
2603
log_format = get_log_format(long=long, short=short,
2604
line=line, default=default)
2605
lf = log_formatter(log_format,
2606
to_file=self.outf,
2607
show_ids=show_ids,
2608
show_timezone='original')
2996
log_format = log.log_formatter_registry.get_default(
2997
local_branch)
2998
lf = log_format(to_file=self.outf,
2999
show_ids=show_ids,
3000
show_timezone='original')
2609
3001
if reverse is False:
2610
3002
local_extra.reverse()
2611
3003
remote_extra.reverse()
2666
3058
2667
3059
class cmd_testament(Command):
2668
3060
"""Show testament (signing-form) of a revision."""
2669
takes_options = ['revision',
3061
takes_options = ['revision',
2670
3062
Option('long', help='Produce long-format testament'),
2671
3063
Option('strict', help='Produce a strict-format'
2672
3064
' testament')]
2728
3120
raise errors.BzrCommandError('bzr annotate --revision takes exactly 1 argument')
2729
3121
else:
2730
3122
revision_id = revision[0].in_history(branch).rev_id
2731
file_id = tree.inventory.path2id(relpath)
3123
file_id = tree.path2id(relpath)
2732
3124
tree = branch.repository.revision_tree(revision_id)
2733
3125
file_version = tree.inventory[file_id].revision
2734
3126
annotate_file(branch, file_version, file_id, long, all, sys.stdout,
2778
3170
2779
3171
2780
3172
class cmd_bind(Command):
2781
"""Bind the current branch to a master branch.
3173
"""Convert the current branch into a checkout of the supplied branch.
2782
3174
2783
After binding, commits must succeed on the master branch
2784
before they are executed on the local one.
3175
Once converted into a checkout, commits must succeed on the master branch
3176
before they will be applied to the local branch.
2785
3177
"""
2786
3178
2787
takes_args = ['location']
3179
_see_also = ['checkouts', 'unbind']
3180
takes_args = ['location?']
2788
3181
takes_options = []
2789
3182
2790
3183
def run(self, location=None):
2791
3184
b, relpath = Branch.open_containing(u'.')
3185
if location is None:
3186
try:
3187
location = b.get_old_bound_location()
3188
except errors.UpgradeRequired:
3189
raise errors.BzrCommandError('No location supplied. '
3190
'This format does not remember old locations.')
3191
else:
3192
if location is None:
3193
raise errors.BzrCommandError('No location supplied and no '
3194
'previous location known')
2792
3195
b_other = Branch.open(location)
2793
3196
try:
2794
3197
b.bind(b_other)
2798
3201
2799
3202
2800
3203
class cmd_unbind(Command):
2801
"""Unbind the current branch from its master branch.
3204
"""Convert the current checkout into a regular branch.
2802
3205
2803
After unbinding, the local branch is considered independent.
2804
All subsequent commits will be local.
3206
After unbinding, the local branch is considered independent and subsequent
3207
commits will be local only.
2805
3208
"""
2806
3209
3210
_see_also = ['checkouts', 'bind']
2807
3211
takes_args = []
2808
3212
takes_options = []
2809
3213
2828
3232
# unreferenced information in 'branch-as-repository' branches.
2829
3233
# TODO: jam 20060108 Add the ability for uncommit to remove unreferenced
2830
3234
# information in shared branches as well.
3235
_see_also = ['commit']
2831
3236
takes_options = ['verbose', 'revision',
2832
3237
Option('dry-run', help='Don\'t actually make changes'),
2833
3238
Option('force', help='Say yes to all questions.')]
2943
3348
Option('port',
2944
3349
help='listen for connections on nominated port of the form '
2945
3350
'[hostname:]portnumber. Passing 0 as the port number will '
2946
'result in a dynamically allocated port.',
3351
'result in a dynamically allocated port. Default port is '
3352
'4155.',
2947
3353
type=str),
2948
3354
Option('directory',
2949
3355
help='serve contents of directory',
2956
3362
]
2957
3363
2958
3364
def run(self, port=None, inet=False, directory=None, allow_writes=False):
2959
from bzrlib.transport import smart
3365
from bzrlib.smart import medium, server
2960
3366
from bzrlib.transport import get_transport
3367
from bzrlib.transport.chroot import ChrootServer
3368
from bzrlib.transport.remote import BZR_DEFAULT_PORT, BZR_DEFAULT_INTERFACE
2961
3369
if directory is None:
2962
3370
directory = os.getcwd()
2963
3371
url = urlutils.local_path_to_url(directory)
2964
3372
if not allow_writes:
2965
3373
url = 'readonly+' + url
2966
t = get_transport(url)
3374
chroot_server = ChrootServer(get_transport(url))
3375
chroot_server.setUp()
3376
t = get_transport(chroot_server.get_url())
2967
3377
if inet:
2968
server = smart.SmartServerPipeStreamMedium(sys.stdin, sys.stdout, t)
2969
elif port is not None:
2970
if ':' in port:
2971
host, port = port.split(':')
3378
smart_server = medium.SmartServerPipeStreamMedium(
3379
sys.stdin, sys.stdout, t)
3380
else:
3381
host = BZR_DEFAULT_INTERFACE
3382
if port is None:
3383
port = BZR_DEFAULT_PORT
2972
3384
else:
2973
host = '127.0.0.1'
2974
server = smart.SmartTCPServer(t, host=host, port=int(port))
2975
print 'listening on port: ', server.port
3385
if ':' in port:
3386
host, port = port.split(':')
3387
port = int(port)
3388
smart_server = server.SmartTCPServer(t, host=host, port=port)
3389
print 'listening on port: ', smart_server.port
2976
3390
sys.stdout.flush()
2977
else:
2978
raise errors.BzrCommandError("bzr serve requires one of --inet or --port")
2979
server.serve()
3391
# for the duration of this server, no UI output is permitted.
3392
# note that this may cause problems with blackbox tests. This should
3393
# be changed with care though, as we dont want to use bandwidth sending
3394
# progress over stderr to smart server clients!
3395
old_factory = ui.ui_factory
3396
try:
3397
ui.ui_factory = ui.SilentUIFactory()
3398
smart_server.serve()
3399
finally:
3400
ui.ui_factory = old_factory
3401
3402
3403
class cmd_join(Command):
3404
"""Combine a subtree into its containing tree.
3405
3406
This command is for experimental use only. It requires the target tree
3407
to be in dirstate-with-subtree format, which cannot be converted into
3408
earlier formats.
3409
3410
The TREE argument should be an independent tree, inside another tree, but
3411
not part of it. (Such trees can be produced by "bzr split", but also by
3412
running "bzr branch" with the target inside a tree.)
3413
3414
The result is a combined tree, with the subtree no longer an independant
3415
part. This is marked as a merge of the subtree into the containing tree,
3416
and all history is preserved.
3417
3418
If --reference is specified, the subtree retains its independence. It can
3419
be branched by itself, and can be part of multiple projects at the same
3420
time. But operations performed in the containing tree, such as commit
3421
and merge, will recurse into the subtree.
3422
"""
3423
3424
_see_also = ['split']
3425
takes_args = ['tree']
3426
takes_options = [Option('reference', 'join by reference')]
3427
hidden = True
3428
3429
def run(self, tree, reference=False):
3430
sub_tree = WorkingTree.open(tree)
3431
parent_dir = osutils.dirname(sub_tree.basedir)
3432
containing_tree = WorkingTree.open_containing(parent_dir)[0]
3433
repo = containing_tree.branch.repository
3434
if not repo.supports_rich_root():
3435
raise errors.BzrCommandError(
3436
"Can't join trees because %s doesn't support rich root data.\n"
3437
"You can use bzr upgrade on the repository."
3438
% (repo,))
3439
if reference:
3440
try:
3441
containing_tree.add_reference(sub_tree)
3442
except errors.BadReferenceTarget, e:
3443
# XXX: Would be better to just raise a nicely printable
3444
# exception from the real origin. Also below. mbp 20070306
3445
raise errors.BzrCommandError("Cannot join %s. %s" %
3446
(tree, e.reason))
3447
else:
3448
try:
3449
containing_tree.subsume(sub_tree)
3450
except errors.BadSubsumeSource, e:
3451
raise errors.BzrCommandError("Cannot join %s. %s" %
3452
(tree, e.reason))
3453
3454
3455
class cmd_split(Command):
3456
"""Split a tree into two trees.
3457
3458
This command is for experimental use only. It requires the target tree
3459
to be in dirstate-with-subtree format, which cannot be converted into
3460
earlier formats.
3461
3462
The TREE argument should be a subdirectory of a working tree. That
3463
subdirectory will be converted into an independent tree, with its own
3464
branch. Commits in the top-level tree will not apply to the new subtree.
3465
If you want that behavior, do "bzr join --reference TREE".
3466
"""
3467
3468
_see_also = ['join']
3469
takes_args = ['tree']
3470
3471
hidden = True
3472
3473
def run(self, tree):
3474
containing_tree, subdir = WorkingTree.open_containing(tree)
3475
sub_id = containing_tree.path2id(subdir)
3476
if sub_id is None:
3477
raise errors.NotVersionedError(subdir)
3478
try:
3479
containing_tree.extract(sub_id)
3480
except errors.RootNotRich:
3481
raise errors.UpgradeRequired(containing_tree.branch.base)
3482
3483
3484
3485
class cmd_merge_directive(Command):
3486
"""Generate a merge directive for auto-merge tools.
3487
3488
A directive requests a merge to be performed, and also provides all the
3489
information necessary to do so. This means it must either include a
3490
revision bundle, or the location of a branch containing the desired
3491
revision.
3492
3493
A submit branch (the location to merge into) must be supplied the first
3494
time the command is issued. After it has been supplied once, it will
3495
be remembered as the default.
3496
3497
A public branch is optional if a revision bundle is supplied, but required
3498
if --diff or --plain is specified. It will be remembered as the default
3499
after the first use.
3500
"""
3501
3502
takes_args = ['submit_branch?', 'public_branch?']
3503
3504
takes_options = [
3505
RegistryOption.from_kwargs('patch-type',
3506
'The type of patch to include in the directive',
3507
title='Patch type', value_switches=True, enum_switch=False,
3508
bundle='Bazaar revision bundle (default)',
3509
diff='Normal unified diff',
3510
plain='No patch, just directive'),
3511
Option('sign', help='GPG-sign the directive'), 'revision',
3512
Option('mail-to', type=str,
3513
help='Instead of printing the directive, email to this address'),
3514
Option('message', type=str, short_name='m',
3515
help='Message to use when committing this merge')
3516
]
3517
3518
def run(self, submit_branch=None, public_branch=None, patch_type='bundle',
3519
sign=False, revision=None, mail_to=None, message=None):
3520
if patch_type == 'plain':
3521
patch_type = None
3522
branch = Branch.open('.')
3523
stored_submit_branch = branch.get_submit_branch()
3524
if submit_branch is None:
3525
submit_branch = stored_submit_branch
3526
else:
3527
if stored_submit_branch is None:
3528
branch.set_submit_branch(submit_branch)
3529
if submit_branch is None:
3530
submit_branch = branch.get_parent()
3531
if submit_branch is None:
3532
raise errors.BzrCommandError('No submit branch specified or known')
3533
3534
stored_public_branch = branch.get_public_branch()
3535
if public_branch is None:
3536
public_branch = stored_public_branch
3537
elif stored_public_branch is None:
3538
branch.set_public_branch(public_branch)
3539
if patch_type != "bundle" and public_branch is None:
3540
raise errors.BzrCommandError('No public branch specified or'
3541
' known')
3542
if revision is not None:
3543
if len(revision) != 1:
3544
raise errors.BzrCommandError('bzr merge-directive takes '
3545
'exactly one revision identifier')
3546
else:
3547
revision_id = revision[0].in_history(branch).rev_id
3548
else:
3549
revision_id = branch.last_revision()
3550
directive = merge_directive.MergeDirective.from_objects(
3551
branch.repository, revision_id, time.time(),
3552
osutils.local_time_offset(), submit_branch,
3553
public_branch=public_branch, patch_type=patch_type,
3554
message=message)
3555
if mail_to is None:
3556
if sign:
3557
self.outf.write(directive.to_signed(branch))
3558
else:
3559
self.outf.writelines(directive.to_lines())
3560
else:
3561
message = directive.to_email(mail_to, branch, sign)
3562
s = smtplib.SMTP()
3563
server = branch.get_config().get_user_option('smtp_server')
3564
if not server:
3565
server = 'localhost'
3566
s.connect(server)
3567
s.sendmail(message['From'], message['To'], message.as_string())
3568
3569
3570
class cmd_tag(Command):
3571
"""Create a tag naming a revision.
3572
3573
Tags give human-meaningful names to revisions. Commands that take a -r
3574
(--revision) option can be given -rtag:X, where X is any previously
3575
created tag.
3576
3577
Tags are stored in the branch. Tags are copied from one branch to another
3578
along when you branch, push, pull or merge.
3579
3580
It is an error to give a tag name that already exists unless you pass
3581
--force, in which case the tag is moved to point to the new revision.
3582
"""
3583
3584
_see_also = ['commit', 'tags']
3585
takes_args = ['tag_name']
3586
takes_options = [
3587
Option('delete',
3588
help='Delete this tag rather than placing it.',
3589
),
3590
Option('directory',
3591
help='Branch in which to place the tag.',
3592
short_name='d',
3593
type=unicode,
3594
),
3595
Option('force',
3596
help='Replace existing tags',
3597
),
3598
'revision',
3599
]
3600
3601
def run(self, tag_name,
3602
delete=None,
3603
directory='.',
3604
force=None,
3605
revision=None,
3606
):
3607
branch, relpath = Branch.open_containing(directory)
3608
branch.lock_write()
3609
try:
3610
if delete:
3611
branch.tags.delete_tag(tag_name)
3612
self.outf.write('Deleted tag %s.\n' % tag_name)
3613
else:
3614
if revision:
3615
if len(revision) != 1:
3616
raise errors.BzrCommandError(
3617
"Tags can only be placed on a single revision, "
3618
"not on a range")
3619
revision_id = revision[0].in_history(branch).rev_id
3620
else:
3621
revision_id = branch.last_revision()
3622
if (not force) and branch.tags.has_tag(tag_name):
3623
raise errors.TagAlreadyExists(tag_name)
3624
branch.tags.set_tag(tag_name, revision_id)
3625
self.outf.write('Created tag %s.\n' % tag_name)
3626
finally:
3627
branch.unlock()
3628
3629
3630
class cmd_tags(Command):
3631
"""List tags.
3632
3633
This tag shows a table of tag names and the revisions they reference.
3634
"""
3635
3636
_see_also = ['tag']
3637
takes_options = [
3638
Option('directory',
3639
help='Branch whose tags should be displayed',
3640
short_name='d',
3641
type=unicode,
3642
),
3643
]
3644
3645
@display_command
3646
def run(self,
3647
directory='.',
3648
):
3649
branch, relpath = Branch.open_containing(directory)
3650
for tag_name, target in sorted(branch.tags.get_tag_dict().items()):
3651
self.outf.write('%-20s %s\n' % (tag_name, target))
2980
3652
2981
3653
2982
3654
# command-line interpretation helper for merge-related commands
2986
3658
merge_type=None,
2987
3659
file_list=None, show_base=False, reprocess=False,
2988
3660
pull=False,
2989
pb=DummyProgress()):
3661
pb=DummyProgress(),
3662
change_reporter=None,
3663
other_rev_id=None):
2990
3664
"""Merge changes into a tree.
2991
3665
2992
3666
base_revision
3028
3702
" type %s." % merge_type)
3029
3703
if reprocess and show_base:
3030
3704
raise errors.BzrCommandError("Cannot do conflict reduction and show base.")
3705
# TODO: jam 20070226 We should really lock these trees earlier. However, we
3706
# only want to take out a lock_tree_write() if we don't have to pull
3707
# any ancestry. But merge might fetch ancestry in the middle, in
3708
# which case we would need a lock_write().
3709
# Because we cannot upgrade locks, for now we live with the fact that
3710
# the tree will be locked multiple times during a merge. (Maybe
3711
# read-only some of the time, but it means things will get read
3712
# multiple times.)
3031
3713
try:
3032
3714
merger = _mod_merge.Merger(this_tree.branch, this_tree=this_tree,
3033
pb=pb)
3715
pb=pb, change_reporter=change_reporter)
3034
3716
merger.pp = ProgressPhase("Merge phase", 5, pb)
3035
3717
merger.pp.next_phase()
3036
3718
merger.check_basis(check_clean)
3037
merger.set_other(other_revision)
3719
if other_rev_id is not None:
3720
merger.set_other_revision(other_rev_id, this_tree.branch)
3721
else:
3722
merger.set_other(other_revision)
3038
3723
merger.pp.next_phase()
3039
3724
merger.set_base(base_revision)
3040
3725
if merger.base_rev_id == merger.other_rev_id:
3042
3727
return 0
3043
3728
if file_list is None:
3044
3729
if pull and merger.base_rev_id == merger.this_rev_id:
3045
count = merger.this_tree.pull(merger.this_branch,
3730
# FIXME: deduplicate with pull
3731
result = merger.this_tree.pull(merger.this_branch,
3046
3732
False, merger.other_rev_id)
3047
note('%d revision(s) pulled.' % (count,))
3733
if result.old_revid == result.new_revid:
3734
note('No revisions to pull.')
3735
else:
3736
note('Now on revision %d.' % result.new_revno)
3048
3737
return 0
3049
3738
merger.backup_files = backup_files
3050
3739
merger.merge_type = merge_type
Loggerhead is a web-based interface for Breezy
Version: 2.0.1