« back to all changes in this revision
Viewing changes to bzrlib/builtins.py
- browse files at revision 2254
- compare with another revision
- download diff
- download tarball
- view history from revision 2254
- Committer: Canonical.com Patch Queue Manager
- Date: 2007-02-01 23:48:08 UTC
- mfrom: (2225.1.6 revert)
- Revision ID: pqm@pqm.ubuntu.com-20070201234808-3b1302d73474bd8c
Display changes made by revert
- files added:
- COPYING.txt
- bzrlib/benchmarks/tree_creator
- bzrlib/repofmt
- bzrlib/version_info_formats
- tools/win32
- files removed:
- bzrlib/util/urlgrabber
- files renamed:
- bzrlib/tests/repository_implementations/test_revprops.py => bzrlib/tests/repository_implementations/test_revision.py
- bzrlib/tests/test_command.py => bzrlib/tests/test_commands.py
- files modified:
- .bzrignore
- setup.py *
added
removed
bzrlib/builtins.py
1
# Copyright (C) 2004, 2005, 2006 by Canonical Ltd
1
# Copyright (C) 2004, 2005, 2006 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
16
16
17
17
"""builtin bzr commands"""
18
18
19
import os
19
20
21
from bzrlib.lazy_import import lazy_import
22
lazy_import(globals(), """
20
23
import codecs
21
24
import errno
22
import os
23
import os.path
24
25
import sys
26
import tempfile
25
27
26
28
import bzrlib
27
29
from bzrlib import (
28
30
branch,
29
31
bundle,
30
32
bzrdir,
33
delta,
31
34
config,
32
35
errors,
33
36
ignores,
34
37
log,
38
merge as _mod_merge,
35
39
osutils,
36
40
repository,
37
41
transport,
42
tree as _mod_tree,
38
43
ui,
39
44
urlutils,
40
45
)
41
from bzrlib.branch import Branch, BranchReferenceFormat
42
from bzrlib.bundle import read_bundle_from_url
46
from bzrlib.branch import Branch
43
47
from bzrlib.bundle.apply_bundle import install_bundle, merge_bundle
44
48
from bzrlib.conflicts import ConflictList
49
from bzrlib.revision import common_ancestor
50
from bzrlib.revisionspec import RevisionSpec
51
from bzrlib.workingtree import WorkingTree
52
""")
53
45
54
from bzrlib.commands import Command, display_command
46
from bzrlib.errors import (BzrError, BzrCheckError, BzrCommandError,
47
NotBranchError, DivergedBranches, NotConflicted,
48
NoSuchFile, NoWorkingTree, FileInWrongBranch,
49
NotVersionedError, NotABundle)
50
from bzrlib.merge import Merge3Merger
51
from bzrlib.option import Option
55
from bzrlib.option import Option, RegistryOption
52
56
from bzrlib.progress import DummyProgress, ProgressPhase
53
from bzrlib.revision import common_ancestor
54
from bzrlib.revisionspec import RevisionSpec
55
57
from bzrlib.trace import mutter, note, log_error, warning, is_quiet, info
56
from bzrlib.transport.local import LocalTransport
57
from bzrlib.workingtree import WorkingTree
58
58
59
59
60
60
def tree_files(file_list, default_branch=u'.'):
61
61
try:
62
62
return internal_tree_files(file_list, default_branch)
63
except FileInWrongBranch, e:
64
raise BzrCommandError("%s is not in the same branch as %s" %
65
(e.path, file_list[0]))
63
except errors.FileInWrongBranch, e:
64
raise errors.BzrCommandError("%s is not in the same branch as %s" %
65
(e.path, file_list[0]))
66
66
67
67
68
68
# XXX: Bad function name; should possibly also be a class method of
77
77
78
78
:param file_list: Filenames to convert.
79
79
80
:param default_branch: Fallback tree path to use if file_list is empty or None.
80
:param default_branch: Fallback tree path to use if file_list is empty or
81
None.
81
82
82
83
:return: workingtree, [relative_paths]
83
84
"""
84
85
if file_list is None or len(file_list) == 0:
85
86
return WorkingTree.open_containing(default_branch)[0], file_list
86
tree = WorkingTree.open_containing(file_list[0])[0]
87
tree = WorkingTree.open_containing(osutils.realpath(file_list[0]))[0]
87
88
new_list = []
88
89
for filename in file_list:
89
90
try:
90
new_list.append(tree.relpath(filename))
91
new_list.append(tree.relpath(osutils.dereference_path(filename)))
91
92
except errors.PathNotChild:
92
raise FileInWrongBranch(tree.branch, filename)
93
raise errors.FileInWrongBranch(tree.branch, filename)
93
94
return tree, new_list
94
95
95
96
96
97
def get_format_type(typestring):
97
98
"""Parse and return a format specifier."""
98
if typestring == "weave":
99
return bzrdir.BzrDirFormat6()
99
# Have to use BzrDirMetaFormat1 directly, so that
100
# RepositoryFormat.set_default_format works
100
101
if typestring == "default":
101
102
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
msg = "Unknown bzr format %s. Current formats are: default, knit,\n" \
111
"metaweave and weave" % typestring
112
raise BzrCommandError(msg)
103
try:
104
return bzrdir.format_registry.make_bzrdir(typestring)
105
except KeyError:
106
msg = 'Unknown bzr format "%s". See "bzr help formats".' % typestring
107
raise errors.BzrCommandError(msg)
113
108
114
109
115
110
# TODO: Make sure no commands unconditionally use the working directory as a
124
119
This reports on versioned and unknown files, reporting them
125
120
grouped by state. Possible states are:
126
121
127
added
122
added / A
128
123
Versioned in the working copy but not in the previous revision.
129
124
130
removed
125
removed / D
131
126
Versioned in the previous revision but removed or deleted
132
127
in the working copy.
133
128
134
renamed
129
renamed / R
135
130
Path of this file changed from the previous revision;
136
131
the text may also have changed. This includes files whose
137
132
parent directory was renamed.
138
133
139
modified
134
modified / M
140
135
Text has changed since the previous revision.
141
136
142
unknown
137
unknown / ?
143
138
Not versioned and not matching an ignore pattern.
144
139
145
140
To see ignored files use 'bzr ignored'. For details in the
146
141
changes to file texts, use 'bzr diff'.
142
143
--short gives a one character status flag for each item, similar
144
to the SVN's status command.
147
145
148
146
If no arguments are specified, the status of the entire working
149
147
directory is shown. Otherwise, only the status of the specified
157
155
# TODO: --no-recurse, --recurse options
158
156
159
157
takes_args = ['file*']
160
takes_options = ['show-ids', 'revision']
158
takes_options = ['show-ids', 'revision', 'short']
161
159
aliases = ['st', 'stat']
162
160
163
161
encoding_type = 'replace'
164
162
165
163
@display_command
166
def run(self, show_ids=False, file_list=None, revision=None):
164
def run(self, show_ids=False, file_list=None, revision=None, short=False):
167
165
from bzrlib.status import show_tree_status
168
166
169
167
tree, file_list = tree_files(file_list)
170
168
171
169
show_tree_status(tree, show_ids=show_ids,
172
170
specific_files=file_list, revision=revision,
173
to_file=self.outf)
171
to_file=self.outf,
172
short=short)
174
173
175
174
176
175
class cmd_cat_revision(Command):
190
189
def run(self, revision_id=None, revision=None):
191
190
192
191
if revision_id is not None and revision is not None:
193
raise BzrCommandError('You can only supply one of revision_id or --revision')
192
raise errors.BzrCommandError('You can only supply one of'
193
' revision_id or --revision')
194
194
if revision_id is None and revision is None:
195
raise BzrCommandError('You must supply either --revision or a revision_id')
195
raise errors.BzrCommandError('You must supply either'
196
' --revision or a revision_id')
196
197
b = WorkingTree.open_containing(u'.')[0].branch
197
198
198
199
# TODO: jam 20060112 should cat-revision always output utf-8?
201
202
elif revision is not None:
202
203
for rev in revision:
203
204
if rev is None:
204
raise BzrCommandError('You cannot specify a NULL revision.')
205
raise errors.BzrCommandError('You cannot specify a NULL'
206
' revision.')
205
207
revno, rev_id = rev.in_history(b)
206
208
self.outf.write(b.repository.get_revision_xml(rev_id).decode('utf-8'))
207
209
208
210
211
class cmd_remove_tree(Command):
212
"""Remove the working tree from a given branch/checkout.
213
214
Since a lightweight checkout is little more than a working tree
215
this will refuse to run against one.
216
"""
217
218
hidden = True
219
220
takes_args = ['location?']
221
222
def run(self, location='.'):
223
d = bzrdir.BzrDir.open(location)
224
225
try:
226
working = d.open_workingtree()
227
except errors.NoWorkingTree:
228
raise errors.BzrCommandError("No working tree to remove")
229
except errors.NotLocalUrl:
230
raise errors.BzrCommandError("You cannot remove the working tree of a "
231
"remote path")
232
233
working_path = working.bzrdir.root_transport.base
234
branch_path = working.branch.bzrdir.root_transport.base
235
if working_path != branch_path:
236
raise errors.BzrCommandError("You cannot remove the working tree from "
237
"a lightweight checkout")
238
239
d.destroy_workingtree()
240
241
209
242
class cmd_revno(Command):
210
243
"""Show current revision number.
211
244
235
268
revs.extend(revision)
236
269
if revision_info_list is not None:
237
270
for rev in revision_info_list:
238
revs.append(RevisionSpec(rev))
271
revs.append(RevisionSpec.from_string(rev))
239
272
if len(revs) == 0:
240
raise BzrCommandError('You must supply a revision identifier')
273
raise errors.BzrCommandError('You must supply a revision identifier')
241
274
242
275
b = WorkingTree.open_containing(u'.')[0].branch
243
276
274
307
275
308
--dry-run will show which files would be added, but not actually
276
309
add them.
310
311
--file-ids-from will try to use the file ids from the supplied path.
312
It looks up ids trying to find a matching parent directory with the
313
same filename, and then by pure path.
277
314
"""
278
315
takes_args = ['file*']
279
takes_options = ['no-recurse', 'dry-run', 'verbose']
316
takes_options = ['no-recurse', 'dry-run', 'verbose',
317
Option('file-ids-from', type=unicode,
318
help='Lookup file ids from here')]
280
319
encoding_type = 'replace'
281
320
282
def run(self, file_list, no_recurse=False, dry_run=False, verbose=False):
321
def run(self, file_list, no_recurse=False, dry_run=False, verbose=False,
322
file_ids_from=None):
283
323
import bzrlib.add
284
324
285
action = bzrlib.add.AddAction(to_file=self.outf,
286
should_print=(not is_quiet()))
287
288
added, ignored = bzrlib.add.smart_add(file_list, not no_recurse,
325
if file_ids_from is not None:
326
try:
327
base_tree, base_path = WorkingTree.open_containing(
328
file_ids_from)
329
except errors.NoWorkingTree:
330
base_branch, base_path = Branch.open_containing(
331
file_ids_from)
332
base_tree = base_branch.basis_tree()
333
334
action = bzrlib.add.AddFromBaseAction(base_tree, base_path,
335
to_file=self.outf, should_print=(not is_quiet()))
336
else:
337
action = bzrlib.add.AddAction(to_file=self.outf,
338
should_print=(not is_quiet()))
339
340
added, ignored = bzrlib.add.smart_add(file_list, not no_recurse,
289
341
action=action, save=not dry_run)
290
342
if len(ignored) > 0:
291
343
if verbose:
338
390
"""Show inventory of the current working copy or a revision.
339
391
340
392
It is possible to limit the output to a particular entry
341
type using the --kind option. For example; --kind file.
393
type using the --kind option. For example: --kind file.
394
395
It is also possible to restrict the list of files to a specific
396
set. For example: bzr inventory --show-ids this/file
342
397
"""
343
398
344
399
takes_options = ['revision', 'show-ids', 'kind']
345
400
takes_args = ['file*']
401
346
402
@display_command
347
def run(self, revision=None, show_ids=False, kind=None):
403
def run(self, revision=None, show_ids=False, kind=None, file_list=None):
348
404
if kind and kind not in ['file', 'directory', 'symlink']:
349
raise BzrCommandError('invalid kind specified')
350
tree = WorkingTree.open_containing(u'.')[0]
351
if revision is None:
352
inv = tree.read_working_inventory()
353
else:
405
raise errors.BzrCommandError('invalid kind specified')
406
407
work_tree, file_list = tree_files(file_list)
408
409
if revision is not None:
354
410
if len(revision) > 1:
355
raise BzrCommandError('bzr inventory --revision takes'
356
' exactly one revision identifier')
357
inv = tree.branch.repository.get_revision_inventory(
358
revision[0].in_history(tree.branch).rev_id)
359
360
for path, entry in inv.entries():
411
raise errors.BzrCommandError('bzr inventory --revision takes'
412
' exactly one revision identifier')
413
revision_id = revision[0].in_history(work_tree.branch).rev_id
414
tree = work_tree.branch.repository.revision_tree(revision_id)
415
416
# We include work_tree as well as 'tree' here
417
# So that doing '-r 10 path/foo' will lookup whatever file
418
# exists now at 'path/foo' even if it has been renamed, as
419
# well as whatever files existed in revision 10 at path/foo
420
trees = [tree, work_tree]
421
else:
422
tree = work_tree
423
trees = [tree]
424
425
if file_list is not None:
426
file_ids = _mod_tree.find_ids_across_trees(file_list, trees,
427
require_versioned=True)
428
# find_ids_across_trees may include some paths that don't
429
# exist in 'tree'.
430
entries = sorted((tree.id2path(file_id), tree.inventory[file_id])
431
for file_id in file_ids if file_id in tree)
432
else:
433
entries = tree.inventory.entries()
434
435
for path, entry in entries:
361
436
if kind and kind != entry.kind:
362
437
continue
363
438
if show_ids:
376
451
377
452
If the last argument is a versioned directory, all the other names
378
453
are moved into it. Otherwise, there must be exactly two arguments
379
and the file is changed to a new name, which must not already exist.
454
and the file is changed to a new name.
455
456
If OLDNAME does not exist on the filesystem but is versioned and
457
NEWNAME does exist on the filesystem but is not versioned, mv
458
assumes that the file has been manually moved and only updates
459
its internal inventory to reflect that change.
460
The same is valid when moving many SOURCE files to a DESTINATION.
380
461
381
462
Files cannot be moved between branches.
382
463
"""
383
464
384
465
takes_args = ['names*']
466
takes_options = [Option("after", help="move only the bzr identifier"
467
" of the file (file has already been moved). Use this flag if"
468
" bzr is not able to detect this itself.")]
385
469
aliases = ['move', 'rename']
386
470
encoding_type = 'replace'
387
471
388
def run(self, names_list):
472
def run(self, names_list, after=False):
389
473
if names_list is None:
390
474
names_list = []
391
475
392
476
if len(names_list) < 2:
393
raise BzrCommandError("missing file argument")
477
raise errors.BzrCommandError("missing file argument")
394
478
tree, rel_names = tree_files(names_list)
395
479
396
480
if os.path.isdir(names_list[-1]):
397
481
# move into existing directory
398
for pair in tree.move(rel_names[:-1], rel_names[-1]):
482
for pair in tree.move(rel_names[:-1], rel_names[-1], after=after):
399
483
self.outf.write("%s => %s\n" % pair)
400
484
else:
401
485
if len(names_list) != 2:
402
raise BzrCommandError('to mv multiple files the destination '
403
'must be a versioned directory')
404
tree.rename_one(rel_names[0], rel_names[1])
486
raise errors.BzrCommandError('to mv multiple files the'
487
' destination must be a versioned'
488
' directory')
489
tree.rename_one(rel_names[0], rel_names[1], after=after)
405
490
self.outf.write("%s => %s\n" % (rel_names[0], rel_names[1]))
406
491
407
492
434
519
try:
435
520
tree_to = WorkingTree.open_containing(u'.')[0]
436
521
branch_to = tree_to.branch
437
except NoWorkingTree:
522
except errors.NoWorkingTree:
438
523
tree_to = None
439
524
branch_to = Branch.open_containing(u'.')[0]
440
525
442
527
if location is not None:
443
528
try:
444
529
reader = bundle.read_bundle_from_url(location)
445
except NotABundle:
530
except errors.NotABundle:
446
531
pass # Continue on considering this url a Branch
447
532
448
533
stored_loc = branch_to.get_parent()
449
534
if location is None:
450
535
if stored_loc is None:
451
raise BzrCommandError("No pull location known or specified.")
536
raise errors.BzrCommandError("No pull location known or"
537
" specified.")
452
538
else:
453
539
display_url = urlutils.unescape_for_display(stored_loc,
454
540
self.outf.encoding)
472
558
elif len(revision) == 1:
473
559
rev_id = revision[0].in_history(branch_from).rev_id
474
560
else:
475
raise BzrCommandError('bzr pull --revision takes one value.')
561
raise errors.BzrCommandError('bzr pull --revision takes one value.')
476
562
477
563
old_rh = branch_to.revision_history()
478
564
if tree_to is not None:
532
618
stored_loc = br_from.get_push_location()
533
619
if location is None:
534
620
if stored_loc is None:
535
raise BzrCommandError("No push location known or specified.")
621
raise errors.BzrCommandError("No push location known or specified.")
536
622
else:
537
623
display_url = urlutils.unescape_for_display(stored_loc,
538
624
self.outf.encoding)
546
632
try:
547
633
dir_to = bzrdir.BzrDir.open(location_url)
548
634
br_to = dir_to.open_branch()
549
except NotBranchError:
635
except errors.NotBranchError:
550
636
# create a branch.
551
637
to_transport = to_transport.clone('..')
552
638
if not create_prefix:
554
640
relurl = to_transport.relpath(location_url)
555
641
mutter('creating directory %s => %s', location_url, relurl)
556
642
to_transport.mkdir(relurl)
557
except NoSuchFile:
558
raise BzrCommandError("Parent directory of %s "
559
"does not exist." % location)
643
except errors.NoSuchFile:
644
raise errors.BzrCommandError("Parent directory of %s "
645
"does not exist." % location)
560
646
else:
561
647
current = to_transport.base
562
648
needed = [(to_transport, to_transport.relpath(location_url))]
565
651
to_transport, relpath = needed[-1]
566
652
to_transport.mkdir(relpath)
567
653
needed.pop()
568
except NoSuchFile:
654
except errors.NoSuchFile:
569
655
new_transport = to_transport.clone('..')
570
656
needed.append((new_transport,
571
657
new_transport.relpath(to_transport.base)))
572
658
if new_transport.base == to_transport.base:
573
raise BzrCommandError("Could not create "
574
"path prefix.")
659
raise errors.BzrCommandError("Could not create "
660
"path prefix.")
575
661
dir_to = br_from.bzrdir.clone(location_url,
576
662
revision_id=br_from.last_revision())
577
663
br_to = dir_to.open_branch()
591
677
except errors.NotLocalUrl:
592
678
warning('This transport does not update the working '
593
679
'tree of: %s' % (br_to.base,))
594
count = br_to.pull(br_from, overwrite)
595
except NoWorkingTree:
596
count = br_to.pull(br_from, overwrite)
680
count = br_from.push(br_to, overwrite)
681
except errors.NoWorkingTree:
682
count = br_from.push(br_to, overwrite)
597
683
else:
598
count = tree_to.pull(br_from, overwrite)
599
except DivergedBranches:
600
raise BzrCommandError("These branches have diverged."
601
" Try a merge then push with overwrite.")
684
tree_to.lock_write()
685
try:
686
count = br_from.push(tree_to.branch, overwrite)
687
tree_to.update()
688
finally:
689
tree_to.unlock()
690
except errors.DivergedBranches:
691
raise errors.BzrCommandError('These branches have diverged.'
692
' Try using "merge" and then "push".')
602
693
note('%d revision(s) pushed.' % (count,))
603
694
604
695
if verbose:
631
722
if revision is None:
632
723
revision = [None]
633
724
elif len(revision) > 1:
634
raise BzrCommandError(
725
raise errors.BzrCommandError(
635
726
'bzr branch --revision takes exactly 1 revision value')
636
727
try:
637
728
br_from = Branch.open(from_location)
638
729
except OSError, e:
639
730
if e.errno == errno.ENOENT:
640
raise BzrCommandError('Source location "%s" does not'
641
' exist.' % to_location)
731
raise errors.BzrCommandError('Source location "%s" does not'
732
' exist.' % to_location)
642
733
else:
643
734
raise
644
735
br_from.lock_read()
664
755
try:
665
756
to_transport.mkdir('.')
666
757
except errors.FileExists:
667
raise BzrCommandError('Target directory "%s" already'
668
' exists.' % to_location)
758
raise errors.BzrCommandError('Target directory "%s" already'
759
' exists.' % to_location)
669
760
except errors.NoSuchFile:
670
raise BzrCommandError('Parent of "%s" does not exist.' %
671
to_location)
761
raise errors.BzrCommandError('Parent of "%s" does not exist.'
762
% to_location)
672
763
try:
673
764
# preserve whatever source format we have.
674
765
dir = br_from.bzrdir.sprout(to_transport.base,
677
768
except errors.NoSuchRevision:
678
769
to_transport.delete_tree('.')
679
770
msg = "The branch %s has no revision %s." % (from_location, revision[0])
680
raise BzrCommandError(msg)
771
raise errors.BzrCommandError(msg)
681
772
except errors.UnlistableBranch:
682
773
osutils.rmtree(to_location)
683
774
msg = "The branch %s cannot be used as a --basis" % (basis,)
684
raise BzrCommandError(msg)
775
raise errors.BzrCommandError(msg)
685
776
if name:
686
777
branch.control_files.put_utf8('branch-name', name)
687
778
note('Branched %d revision(s).' % branch.revno())
726
817
if revision is None:
727
818
revision = [None]
728
819
elif len(revision) > 1:
729
raise BzrCommandError(
820
raise errors.BzrCommandError(
730
821
'bzr checkout --revision takes exactly 1 revision value')
731
822
if branch_location is None:
732
823
branch_location = osutils.getcwd()
741
832
# if the source and to_location are the same,
742
833
# and there is no working tree,
743
834
# then reconstitute a branch
744
if (osutils.abspath(to_location) ==
835
if (osutils.abspath(to_location) ==
745
836
osutils.abspath(branch_location)):
746
837
try:
747
838
source.bzrdir.open_workingtree()
752
843
os.mkdir(to_location)
753
844
except OSError, e:
754
845
if e.errno == errno.EEXIST:
755
raise BzrCommandError('Target directory "%s" already'
756
' exists.' % to_location)
846
raise errors.BzrCommandError('Target directory "%s" already'
847
' exists.' % to_location)
757
848
if e.errno == errno.ENOENT:
758
raise BzrCommandError('Parent of "%s" does not exist.' %
759
to_location)
849
raise errors.BzrCommandError('Parent of "%s" does not exist.'
850
% to_location)
760
851
else:
761
852
raise
762
old_format = bzrdir.BzrDirFormat.get_default_format()
763
bzrdir.BzrDirFormat.set_default_format(bzrdir.BzrDirMetaFormat1())
764
try:
765
if lightweight:
766
checkout = bzrdir.BzrDirMetaFormat1().initialize(to_location)
767
branch.BranchReferenceFormat().initialize(checkout, source)
768
else:
769
checkout_branch = bzrdir.BzrDir.create_branch_convenience(
770
to_location, force_new_tree=False)
771
checkout = checkout_branch.bzrdir
772
checkout_branch.bind(source)
773
if revision_id is not None:
774
rh = checkout_branch.revision_history()
775
checkout_branch.set_revision_history(rh[:rh.index(revision_id) + 1])
776
checkout.create_workingtree(revision_id)
777
finally:
778
bzrdir.BzrDirFormat.set_default_format(old_format)
853
source.create_checkout(to_location, revision_id, lightweight)
779
854
780
855
781
856
class cmd_renames(Command):
788
863
789
864
@display_command
790
865
def run(self, dir=u'.'):
791
from bzrlib.tree import find_renames
792
866
tree = WorkingTree.open_containing(dir)[0]
793
867
old_inv = tree.basis_tree().inventory
794
868
new_inv = tree.read_working_inventory()
795
renames = list(find_renames(old_inv, new_inv))
869
renames = list(_mod_tree.find_renames(old_inv, new_inv))
796
870
renames.sort()
797
871
for old_name, new_name in renames:
798
872
self.outf.write("%s => %s\n" % (old_name, new_name))
813
887
814
888
def run(self, dir='.'):
815
889
tree = WorkingTree.open_containing(dir)[0]
816
tree.lock_write()
890
master = tree.branch.get_master_branch()
891
if master is not None:
892
tree.lock_write()
893
else:
894
tree.lock_tree_write()
817
895
try:
818
last_rev = tree.last_revision()
896
existing_pending_merges = tree.get_parent_ids()[1:]
897
last_rev = tree.last_revision()
819
898
if last_rev == tree.branch.last_revision():
820
899
# may be up to date, check master too.
821
900
master = tree.branch.get_master_branch()
826
905
conflicts = tree.update()
827
906
revno = tree.branch.revision_id_to_revno(tree.last_revision())
828
907
note('Updated to revision %d.' % (revno,))
908
if tree.get_parent_ids()[1:] != existing_pending_merges:
909
note('Your local commits will now show as pending merges with '
910
"'bzr status', and can be committed with 'bzr commit'.")
829
911
if conflicts != 0:
830
912
return 1
831
913
else:
873
955
tree, file_list = tree_files(file_list)
874
956
if new is False:
875
957
if file_list is None:
876
raise BzrCommandError('Specify one or more files to remove, or'
877
' use --new.')
958
raise errors.BzrCommandError('Specify one or more files to'
959
' remove, or use --new.')
878
960
else:
879
961
added = tree.changes_from(tree.basis_tree(),
880
962
specific_files=file_list).added
881
963
file_list = sorted([f[0] for f in added], reverse=True)
882
964
if len(file_list) == 0:
883
raise BzrCommandError('No matching files.')
965
raise errors.BzrCommandError('No matching files.')
884
966
tree.remove(file_list, verbose=verbose, to_file=self.outf)
885
967
886
968
899
981
def run(self, filename):
900
982
tree, relpath = WorkingTree.open_containing(filename)
901
983
i = tree.inventory.path2id(relpath)
902
if i == None:
903
raise BzrError("%r is not a versioned file" % filename)
984
if i is None:
985
raise errors.NotVersionedError(filename)
904
986
else:
905
987
self.outf.write(i + '\n')
906
988
920
1002
tree, relpath = WorkingTree.open_containing(filename)
921
1003
inv = tree.inventory
922
1004
fid = inv.path2id(relpath)
923
if fid == None:
924
raise BzrError("%r is not a versioned file" % filename)
1005
if fid is None:
1006
raise errors.NotVersionedError(filename)
925
1007
for fip in inv.get_idpath(fid):
926
1008
self.outf.write(fip + '\n')
927
1009
984
1066
last_revision = wt.last_revision()
985
1067
986
1068
revision_ids = b.repository.get_ancestry(last_revision)
987
assert revision_ids[0] == None
1069
assert revision_ids[0] is None
988
1070
revision_ids.pop(0)
989
1071
for revision_id in revision_ids:
990
1072
self.outf.write(revision_id + '\n')
1013
1095
"""
1014
1096
takes_args = ['location?']
1015
1097
takes_options = [
1016
Option('format',
1098
RegistryOption('format',
1017
1099
help='Specify a format for this branch. Current'
1018
1100
' formats are: default, knit, metaweave and'
1019
1101
' weave. Default is knit; metaweave and'
1020
1102
' weave are deprecated',
1021
type=get_format_type),
1103
registry=bzrdir.format_registry,
1104
converter=get_format_type,
1105
value_switches=True),
1022
1106
]
1023
1107
def run(self, location=None, format=None):
1024
1108
if format is None:
1041
1125
1042
1126
try:
1043
1127
existing_bzrdir = bzrdir.BzrDir.open(location)
1044
except NotBranchError:
1128
except errors.NotBranchError:
1045
1129
# really a NotBzrDir error...
1046
1130
bzrdir.BzrDir.create_branch_convenience(location, format=format)
1047
1131
else:
1132
from bzrlib.transport.local import LocalTransport
1048
1133
if existing_bzrdir.has_branch():
1049
1134
if (isinstance(to_transport, LocalTransport)
1050
1135
and not existing_bzrdir.has_workingtree()):
1070
1155
(add files here)
1071
1156
"""
1072
1157
takes_args = ["location"]
1073
takes_options = [Option('format',
1158
takes_options = [RegistryOption('format',
1074
1159
help='Specify a format for this repository.'
1075
1160
' Current formats are: default, knit,'
1076
1161
' metaweave and weave. Default is knit;'
1077
1162
' metaweave and weave are deprecated',
1078
type=get_format_type),
1163
registry=bzrdir.format_registry,
1164
converter=get_format_type,
1165
value_switches=True),
1079
1166
Option('trees',
1080
1167
help='Allows branches in repository to have'
1081
1168
' a working tree')]
1131
1218
# deleted files.
1132
1219
1133
1220
# TODO: This probably handles non-Unix newlines poorly.
1134
1221
1135
1222
takes_args = ['file*']
1136
takes_options = ['revision', 'diff-options', 'prefix']
1223
takes_options = ['revision', 'diff-options',
1224
Option('prefix', type=str,
1225
short_name='p',
1226
help='Set prefixes to added to old and new filenames, as '
1227
'two values separated by a colon.'),
1228
]
1137
1229
aliases = ['di', 'dif']
1138
1230
encoding_type = 'exact'
1139
1231
1149
1241
elif prefix == '1':
1150
1242
old_label = 'old/'
1151
1243
new_label = 'new/'
1152
else:
1153
if not ':' in prefix:
1154
raise BzrError("--diff-prefix expects two values separated by a colon")
1244
elif ':' in prefix:
1155
1245
old_label, new_label = prefix.split(":")
1246
else:
1247
raise BzrCommandError(
1248
"--prefix expects two values separated by a colon")
1249
1250
if revision and len(revision) > 2:
1251
raise errors.BzrCommandError('bzr diff --revision takes exactly'
1252
' one or two revision specifiers')
1156
1253
1157
1254
try:
1158
1255
tree1, file_list = internal_tree_files(file_list)
1159
1256
tree2 = None
1160
1257
b = None
1161
1258
b2 = None
1162
except FileInWrongBranch:
1259
except errors.FileInWrongBranch:
1163
1260
if len(file_list) != 2:
1164
raise BzrCommandError("Files are in different branches")
1261
raise errors.BzrCommandError("Files are in different branches")
1165
1262
1166
1263
tree1, file1 = WorkingTree.open_containing(file_list[0])
1167
1264
tree2, file2 = WorkingTree.open_containing(file_list[1])
1168
1265
if file1 != "" or file2 != "":
1169
1266
# FIXME diff those two files. rbc 20051123
1170
raise BzrCommandError("Files are in different branches")
1267
raise errors.BzrCommandError("Files are in different branches")
1171
1268
file_list = None
1172
except NotBranchError:
1269
except errors.NotBranchError:
1173
1270
if (revision is not None and len(revision) == 2
1174
1271
and not revision[0].needs_branch()
1175
1272
and not revision[1].needs_branch()):
1178
1275
tree1, tree2 = None, None
1179
1276
else:
1180
1277
raise
1181
if revision is not None:
1182
if tree2 is not None:
1183
raise BzrCommandError("Can't specify -r with two branches")
1184
if (len(revision) == 1) or (revision[1].spec is None):
1185
return diff_cmd_helper(tree1, file_list, diff_options,
1186
revision[0],
1187
old_label=old_label, new_label=new_label)
1188
elif len(revision) == 2:
1189
return diff_cmd_helper(tree1, file_list, diff_options,
1190
revision[0], revision[1],
1191
old_label=old_label, new_label=new_label)
1192
else:
1193
raise BzrCommandError('bzr diff --revision takes exactly one or two revision identifiers')
1194
else:
1195
if tree2 is not None:
1196
return show_diff_trees(tree1, tree2, sys.stdout,
1197
specific_files=file_list,
1198
external_diff_options=diff_options,
1199
old_label=old_label, new_label=new_label)
1200
else:
1201
return diff_cmd_helper(tree1, file_list, diff_options,
1202
old_label=old_label, new_label=new_label)
1278
1279
if tree2 is not None:
1280
if revision is not None:
1281
# FIXME: but there should be a clean way to diff between
1282
# non-default versions of two trees, it's not hard to do
1283
# internally...
1284
raise errors.BzrCommandError(
1285
"Sorry, diffing arbitrary revisions across branches "
1286
"is not implemented yet")
1287
return show_diff_trees(tree1, tree2, sys.stdout,
1288
specific_files=file_list,
1289
external_diff_options=diff_options,
1290
old_label=old_label, new_label=new_label)
1291
1292
return diff_cmd_helper(tree1, file_list, diff_options,
1293
revision_specs=revision,
1294
old_label=old_label, new_label=new_label)
1203
1295
1204
1296
1205
1297
class cmd_deleted(Command):
1248
1340
for file_id in inv:
1249
1341
if file_id in basis_inv:
1250
1342
continue
1343
if inv.is_root(file_id) and len(basis_inv) == 0:
1344
continue
1251
1345
path = inv.id2path(file_id)
1252
1346
if not os.access(osutils.abspath(path), os.F_OK):
1253
1347
continue
1289
1383
help='show from oldest to newest'),
1290
1384
'timezone',
1291
1385
Option('verbose',
1386
short_name='v',
1292
1387
help='show files changed in each revision'),
1293
1388
'show-ids', 'revision',
1294
1389
'log-format',
1295
1390
'line', 'long',
1296
1391
Option('message',
1392
short_name='m',
1297
1393
help='show revisions whose message matches this regexp',
1298
1394
type=str),
1299
1395
'short',
1331
1427
# either no tree, or is remote.
1332
1428
inv = b.basis_tree().inventory
1333
1429
file_id = inv.path2id(fp)
1430
if file_id is None:
1431
raise errors.BzrCommandError(
1432
"Path does not have any revision history: %s" %
1433
location)
1334
1434
else:
1335
1435
# local dir only
1336
1436
# FIXME ? log the current subdir only RBC 20060203
1337
dir, relpath = bzrdir.BzrDir.open_containing('.')
1437
if revision is not None \
1438
and len(revision) > 0 and revision[0].get_branch():
1439
location = revision[0].get_branch()
1440
else:
1441
location = '.'
1442
dir, relpath = bzrdir.BzrDir.open_containing(location)
1338
1443
b = dir.open_branch()
1339
1444
1340
1445
if revision is None:
1343
1448
elif len(revision) == 1:
1344
1449
rev1 = rev2 = revision[0].in_history(b).revno
1345
1450
elif len(revision) == 2:
1451
if revision[1].get_branch() != revision[0].get_branch():
1452
# b is taken from revision[0].get_branch(), and
1453
# show_log will use its revision_history. Having
1454
# different branches will lead to weird behaviors.
1455
raise errors.BzrCommandError(
1456
"Log doesn't accept two revisions in different branches.")
1346
1457
if revision[0].spec is None:
1347
1458
# missing begin-range means first revision
1348
1459
rev1 = 1
1355
1466
else:
1356
1467
rev2 = revision[1].in_history(b).revno
1357
1468
else:
1358
raise BzrCommandError('bzr log --revision takes one or two values.')
1469
raise errors.BzrCommandError('bzr log --revision takes one or two values.')
1359
1470
1360
1471
# By this point, the revision numbers are converted to the +ve
1361
1472
# form if they were supplied in the -ve form, so we can do
1363
1474
if rev1 > rev2:
1364
1475
(rev2, rev1) = (rev1, rev2)
1365
1476
1366
if (log_format == None):
1477
if (log_format is None):
1367
1478
default = b.get_config().log_format()
1368
1479
log_format = get_log_format(long=long, short=short, line=line,
1369
1480
default=default)
1415
1526
class cmd_ls(Command):
1416
1527
"""List files in a tree.
1417
1528
"""
1529
1530
takes_args = ['path?']
1418
1531
# TODO: Take a revision or remote path and list that tree instead.
1419
hidden = True
1420
1532
takes_options = ['verbose', 'revision',
1421
1533
Option('non-recursive',
1422
1534
help='don\'t recurse into sub-directories'),
1427
1539
Option('ignored', help='Print ignored files'),
1428
1540
1429
1541
Option('null', help='Null separate the files'),
1542
'kind', 'show-ids'
1430
1543
]
1431
1544
@display_command
1432
1545
def run(self, revision=None, verbose=False,
1433
1546
non_recursive=False, from_root=False,
1434
1547
unknown=False, versioned=False, ignored=False,
1435
null=False):
1548
null=False, kind=None, show_ids=False, path=None):
1549
1550
if kind and kind not in ('file', 'directory', 'symlink'):
1551
raise errors.BzrCommandError('invalid kind specified')
1436
1552
1437
1553
if verbose and null:
1438
raise BzrCommandError('Cannot set both --verbose and --null')
1554
raise errors.BzrCommandError('Cannot set both --verbose and --null')
1439
1555
all = not (unknown or versioned or ignored)
1440
1556
1441
1557
selection = {'I':ignored, '?':unknown, 'V':versioned}
1442
1558
1443
tree, relpath = WorkingTree.open_containing(u'.')
1559
if path is None:
1560
fs_path = '.'
1561
prefix = ''
1562
else:
1563
if from_root:
1564
raise errors.BzrCommandError('cannot specify both --from-root'
1565
' and PATH')
1566
fs_path = path
1567
prefix = path
1568
tree, branch, relpath = bzrdir.BzrDir.open_containing_tree_or_branch(
1569
fs_path)
1444
1570
if from_root:
1445
1571
relpath = u''
1446
1572
elif relpath:
1447
1573
relpath += '/'
1448
1574
if revision is not None:
1449
tree = tree.branch.repository.revision_tree(
1450
revision[0].in_history(tree.branch).rev_id)
1575
tree = branch.repository.revision_tree(
1576
revision[0].in_history(branch).rev_id)
1577
elif tree is None:
1578
tree = branch.basis_tree()
1451
1579
1452
for fp, fc, kind, fid, entry in tree.list_files():
1580
for fp, fc, fkind, fid, entry in tree.list_files(include_root=False):
1453
1581
if fp.startswith(relpath):
1454
fp = fp[len(relpath):]
1582
fp = osutils.pathjoin(prefix, fp[len(relpath):])
1455
1583
if non_recursive and '/' in fp:
1456
1584
continue
1457
1585
if not all and not selection[fc]:
1458
1586
continue
1587
if kind is not None and fkind != kind:
1588
continue
1459
1589
if verbose:
1460
1590
kindch = entry.kind_character()
1461
self.outf.write('%-8s %s%s\n' % (fc, fp, kindch))
1591
outstring = '%-8s %s%s' % (fc, fp, kindch)
1592
if show_ids and fid is not None:
1593
outstring = "%-50s %s" % (outstring, fid)
1594
self.outf.write(outstring + '\n')
1462
1595
elif null:
1463
1596
self.outf.write(fp + '\0')
1597
if show_ids:
1598
if fid is not None:
1599
self.outf.write(fid)
1600
self.outf.write('\0')
1464
1601
self.outf.flush()
1465
1602
else:
1466
self.outf.write(fp + '\n')
1603
if fid is not None:
1604
my_id = fid
1605
else:
1606
my_id = ''
1607
if show_ids:
1608
self.outf.write('%-50s %s\n' % (fp, my_id))
1609
else:
1610
self.outf.write(fp + '\n')
1467
1611
1468
1612
1469
1613
class cmd_unknowns(Command):
1475
1619
1476
1620
1477
1621
class cmd_ignore(Command):
1478
"""Ignore a command or pattern.
1622
"""Ignore specified files or patterns.
1479
1623
1480
1624
To remove patterns from the ignore list, edit the .bzrignore file.
1481
1625
1482
If the pattern contains a slash, it is compared to the whole path
1483
from the branch root. Otherwise, it is compared to only the last
1484
component of the path. To match a file only in the root directory,
1485
prepend './'.
1486
1487
Ignore patterns are case-insensitive on case-insensitive systems.
1488
1489
Note: wildcards must be quoted from the shell on Unix.
1626
Trailing slashes on patterns are ignored.
1627
If the pattern contains a slash or is a regular expression, it is compared
1628
to the whole path from the branch root. Otherwise, it is compared to only
1629
the last component of the path. To match a file only in the root
1630
directory, prepend './'.
1631
1632
Ignore patterns specifying absolute paths are not allowed.
1633
1634
Ignore patterns may include globbing wildcards such as:
1635
? - Matches any single character except '/'
1636
* - Matches 0 or more characters except '/'
1637
/**/ - Matches 0 or more directories in a path
1638
[a-z] - Matches a single character from within a group of characters
1639
1640
Ignore patterns may also be Python regular expressions.
1641
Regular expression ignore patterns are identified by a 'RE:' prefix
1642
followed by the regular expression. Regular expression ignore patterns
1643
may not include named or numbered groups.
1644
1645
Note: ignore patterns containing shell wildcards must be quoted from
1646
the shell on Unix.
1490
1647
1491
1648
examples:
1492
1649
bzr ignore ./Makefile
1493
1650
bzr ignore '*.class'
1651
bzr ignore 'lib/**/*.o'
1652
bzr ignore 'RE:lib/.*\.o'
1494
1653
"""
1495
# TODO: Complain if the filename is absolute
1496
takes_args = ['name_pattern?']
1654
takes_args = ['name_pattern*']
1497
1655
takes_options = [
1498
1656
Option('old-default-rules',
1499
1657
help='Out the ignore rules bzr < 0.9 always used.')
1500
1658
]
1501
1659
1502
def run(self, name_pattern=None, old_default_rules=None):
1660
def run(self, name_pattern_list=None, old_default_rules=None):
1503
1661
from bzrlib.atomicfile import AtomicFile
1504
1662
if old_default_rules is not None:
1505
1663
# dump the rules and exit
1506
1664
for pattern in ignores.OLD_DEFAULTS:
1507
1665
print pattern
1508
1666
return
1509
if name_pattern is None:
1510
raise BzrCommandError("ignore requires a NAME_PATTERN")
1667
if not name_pattern_list:
1668
raise errors.BzrCommandError("ignore requires at least one "
1669
"NAME_PATTERN or --old-default-rules")
1670
for name_pattern in name_pattern_list:
1671
if name_pattern[0] == '/':
1672
raise errors.BzrCommandError(
1673
"NAME_PATTERN should not be an absolute path")
1511
1674
tree, relpath = WorkingTree.open_containing(u'.')
1512
1675
ifn = tree.abspath('.bzrignore')
1513
1676
if os.path.exists(ifn):
1524
1687
1525
1688
if igns and igns[-1] != '\n':
1526
1689
igns += '\n'
1527
igns += name_pattern + '\n'
1690
for name_pattern in name_pattern_list:
1691
igns += name_pattern.rstrip('/') + '\n'
1528
1692
1529
f = AtomicFile(ifn, 'wt')
1693
f = AtomicFile(ifn, 'wb')
1530
1694
try:
1531
1695
f.write(igns.encode('utf-8'))
1532
1696
f.commit()
1570
1734
try:
1571
1735
revno = int(revno)
1572
1736
except ValueError:
1573
raise BzrCommandError("not a valid revision-number: %r" % revno)
1737
raise errors.BzrCommandError("not a valid revision-number: %r" % revno)
1574
1738
1575
1739
print WorkingTree.open_containing(u'.')[0].branch.get_rev_id(revno)
1576
1740
1587
1751
Root may be the top directory for tar, tgz and tbz2 formats. If none
1588
1752
is given, the top directory will be the root name of the file.
1589
1753
1754
If branch is omitted then the branch containing the CWD will be used.
1755
1590
1756
Note: export of tree with non-ascii filenames to zip is not supported.
1591
1757
1592
1758
Supported formats Autodetected by extension
1597
1763
tgz .tar.gz, .tgz
1598
1764
zip .zip
1599
1765
"""
1600
takes_args = ['dest']
1766
takes_args = ['dest', 'branch?']
1601
1767
takes_options = ['revision', 'format', 'root']
1602
def run(self, dest, revision=None, format=None, root=None):
1768
def run(self, dest, branch=None, revision=None, format=None, root=None):
1603
1769
from bzrlib.export import export
1604
tree = WorkingTree.open_containing(u'.')[0]
1605
b = tree.branch
1770
1771
if branch is None:
1772
tree = WorkingTree.open_containing(u'.')[0]
1773
b = tree.branch
1774
else:
1775
b = Branch.open(branch)
1776
1606
1777
if revision is None:
1607
1778
# should be tree.last_revision FIXME
1608
1779
rev_id = b.last_revision()
1609
1780
else:
1610
1781
if len(revision) != 1:
1611
raise BzrError('bzr export --revision takes exactly 1 argument')
1782
raise errors.BzrCommandError('bzr export --revision takes exactly 1 argument')
1612
1783
rev_id = revision[0].in_history(b).rev_id
1613
1784
t = b.repository.revision_tree(rev_id)
1614
1785
try:
1615
1786
export(t, dest, format, root)
1616
1787
except errors.NoSuchExportFormat, e:
1617
raise BzrCommandError('Unsupported export format: %s' % e.format)
1788
raise errors.BzrCommandError('Unsupported export format: %s' % e.format)
1618
1789
1619
1790
1620
1791
class cmd_cat(Command):
1621
1792
"""Write a file's text from a previous revision."""
1622
1793
1623
takes_options = ['revision']
1794
takes_options = ['revision', 'name-from-revision']
1624
1795
takes_args = ['filename']
1796
encoding_type = 'exact'
1625
1797
1626
1798
@display_command
1627
def run(self, filename, revision=None):
1799
def run(self, filename, revision=None, name_from_revision=False):
1628
1800
if revision is not None and len(revision) != 1:
1629
raise BzrCommandError("bzr cat --revision takes exactly one number")
1801
raise errors.BzrCommandError("bzr cat --revision takes exactly"
1802
" one number")
1803
1630
1804
tree = None
1631
1805
try:
1632
1806
tree, relpath = WorkingTree.open_containing(filename)
1633
1807
b = tree.branch
1634
except NotBranchError:
1808
except (errors.NotBranchError, errors.NotLocalUrl):
1635
1809
pass
1636
1810
1811
if revision is not None and revision[0].get_branch() is not None:
1812
b = Branch.open(revision[0].get_branch())
1637
1813
if tree is None:
1638
1814
b, relpath = Branch.open_containing(filename)
1815
tree = b.basis_tree()
1639
1816
if revision is None:
1640
1817
revision_id = b.last_revision()
1641
1818
else:
1642
1819
revision_id = revision[0].in_history(b).rev_id
1643
b.print_file(relpath, revision_id)
1820
1821
cur_file_id = tree.path2id(relpath)
1822
rev_tree = b.repository.revision_tree(revision_id)
1823
old_file_id = rev_tree.path2id(relpath)
1824
1825
if name_from_revision:
1826
if old_file_id is None:
1827
raise errors.BzrCommandError("%r is not present in revision %s"
1828
% (filename, revision_id))
1829
else:
1830
rev_tree.print_file(old_file_id)
1831
elif cur_file_id is not None:
1832
rev_tree.print_file(cur_file_id)
1833
elif old_file_id is not None:
1834
rev_tree.print_file(old_file_id)
1835
else:
1836
raise errors.BzrCommandError("%r is not present in revision %s" %
1837
(filename, revision_id))
1644
1838
1645
1839
1646
1840
class cmd_local_time_offset(Command):
1679
1873
Option('unchanged',
1680
1874
help='commit even if nothing has changed'),
1681
1875
Option('file', type=str,
1876
short_name='F',
1682
1877
argname='msgfile',
1683
1878
help='file containing commit message'),
1684
1879
Option('strict',
1700
1895
StrictCommitFailed)
1701
1896
from bzrlib.msgeditor import edit_commit_message, \
1702
1897
make_commit_message_template
1703
from tempfile import TemporaryFile
1704
1898
1705
1899
# TODO: Need a blackbox test for invoking the external editor; may be
1706
1900
# slightly problematic to run this cross-platform.
1707
1901
1708
1902
# TODO: do more checks that the commit will succeed before
1709
1903
# spending the user's valuable time typing a commit message.
1710
#
1711
# TODO: if the commit *does* happen to fail, then save the commit
1712
# message to a temporary file where it can be recovered
1713
1904
tree, selected_list = tree_files(selected_list)
1714
1905
if selected_list == ['']:
1715
1906
# workaround - commit of root of tree should be exactly the same
1719
1910
1720
1911
if local and not tree.branch.get_bound_location():
1721
1912
raise errors.LocalRequiresBoundBranch()
1722
if message is None and not file:
1723
template = make_commit_message_template(tree, selected_list)
1724
message = edit_commit_message(template)
1725
if message is None:
1726
raise BzrCommandError("please specify a commit message"
1727
" with either --message or --file")
1728
elif message and file:
1729
raise BzrCommandError("please specify either --message or --file")
1730
1731
if file:
1732
message = codecs.open(file, 'rt', bzrlib.user_encoding).read()
1733
1913
1734
if message == "":
1735
raise BzrCommandError("empty commit message specified")
1914
def get_message(commit_obj):
1915
"""Callback to get commit message"""
1916
my_message = message
1917
if my_message is None and not file:
1918
template = make_commit_message_template(tree, selected_list)
1919
my_message = edit_commit_message(template)
1920
if my_message is None:
1921
raise errors.BzrCommandError("please specify a commit"
1922
" message with either --message or --file")
1923
elif my_message and file:
1924
raise errors.BzrCommandError(
1925
"please specify either --message or --file")
1926
if file:
1927
my_message = codecs.open(file, 'rt',
1928
bzrlib.user_encoding).read()
1929
if my_message == "":
1930
raise errors.BzrCommandError("empty commit message specified")
1931
return my_message
1736
1932
1737
1933
if verbose:
1738
1934
reporter = ReportCommitToLog()
1739
1935
else:
1740
1936
reporter = NullCommitReporter()
1741
1937
1742
1938
try:
1743
tree.commit(message, specific_files=selected_list,
1939
tree.commit(message_callback=get_message,
1940
specific_files=selected_list,
1744
1941
allow_pointless=unchanged, strict=strict, local=local,
1745
1942
reporter=reporter)
1746
1943
except PointlessCommit:
1747
1944
# FIXME: This should really happen before the file is read in;
1748
1945
# perhaps prepare the commit; get the message; then actually commit
1749
raise BzrCommandError("no changes to commit."
1750
" use --unchanged to commit anyhow")
1946
raise errors.BzrCommandError("no changes to commit."
1947
" use --unchanged to commit anyhow")
1751
1948
except ConflictsInTree:
1752
raise BzrCommandError("Conflicts detected in working tree. "
1753
'Use "bzr conflicts" to list, "bzr resolve FILE" to resolve.')
1949
raise errors.BzrCommandError('Conflicts detected in working '
1950
'tree. Use "bzr conflicts" to list, "bzr resolve FILE" to'
1951
' resolve.')
1754
1952
except StrictCommitFailed:
1755
raise BzrCommandError("Commit refused because there are unknown "
1756
"files in the working tree.")
1953
raise errors.BzrCommandError("Commit refused because there are"
1954
" unknown files in the working tree.")
1757
1955
except errors.BoundBranchOutOfDate, e:
1758
raise BzrCommandError(str(e)
1759
+ ' Either unbind, update, or'
1760
' pass --local to commit.')
1956
raise errors.BzrCommandError(str(e) + "\n"
1957
'To commit to master branch, run update and then commit.\n'
1958
'You can also pass --local to commit to continue working '
1959
'disconnected.')
1761
1960
1762
1961
1763
1962
class cmd_check(Command):
1779
1978
check(branch, verbose)
1780
1979
1781
1980
1782
class cmd_scan_cache(Command):
1783
hidden = True
1784
def run(self):
1785
from bzrlib.hashcache import HashCache
1786
1787
c = HashCache(u'.')
1788
c.read()
1789
c.scan()
1790
1791
print '%6d stats' % c.stat_count
1792
print '%6d in hashcache' % len(c._cache)
1793
print '%6d files removed from cache' % c.removed_count
1794
print '%6d hashes updated' % c.update_count
1795
print '%6d files changed too recently to cache' % c.danger_count
1796
1797
if c.needs_write:
1798
c.write()
1799
1800
1801
1981
class cmd_upgrade(Command):
1802
1982
"""Upgrade branch storage to current format.
1803
1983
1807
1987
"""
1808
1988
takes_args = ['url?']
1809
1989
takes_options = [
1810
Option('format',
1811
help='Upgrade to a specific format. Current formats'
1812
' are: default, knit, metaweave and weave.'
1813
' Default is knit; metaweave and weave are'
1814
' deprecated',
1815
type=get_format_type),
1990
RegistryOption('format',
1991
help='Upgrade to a specific format. Current formats'
1992
' are: default, knit, metaweave and weave.'
1993
' Default is knit; metaweave and weave are'
1994
' deprecated',
1995
registry=bzrdir.format_registry,
1996
converter=get_format_type,
1997
value_switches=True),
1816
1998
]
1817
1999
1818
2000
1845
2027
# use branch if we're inside one; otherwise global config
1846
2028
try:
1847
2029
c = Branch.open_containing('.')[0].get_config()
1848
except NotBranchError:
2030
except errors.NotBranchError:
1849
2031
c = config.GlobalConfig()
1850
2032
if email:
1851
2033
self.outf.write(c.user_email() + '\n')
1856
2038
# display a warning if an email address isn't included in the given name.
1857
2039
try:
1858
2040
config.extract_email_address(name)
1859
except BzrError, e:
2041
except errors.NoEmailInUsername, e:
1860
2042
warning('"%s" does not seem to contain an email address. '
1861
2043
'This is allowed, but not recommended.', name)
1862
2044
1890
2072
class cmd_selftest(Command):
1891
2073
"""Run internal test suite.
1892
2074
1893
This creates temporary test directories in the working directory,
1894
but not existing data is affected. These directories are deleted
1895
if the tests pass, or left behind to help in debugging if they
1896
fail and --keep-output is specified.
2075
This creates temporary test directories in the working directory, but not
2076
existing data is affected. These directories are deleted if the tests
2077
pass, or left behind to help in debugging if they fail and --keep-output
2078
is specified.
1897
2079
1898
If arguments are given, they are regular expressions that say
1899
which tests should run.
2080
If arguments are given, they are regular expressions that say which tests
2081
should run. Tests matching any expression are run, and other tests are
2082
not run.
2083
2084
Alternatively if --first is given, matching tests are run first and then
2085
all other tests are run. This is useful if you have been working in a
2086
particular area, but want to make sure nothing else was broken.
1900
2087
1901
2088
If the global option '--no-plugins' is given, plugins are not loaded
1902
2089
before running the selftests. This has two effects: features provided or
1903
2090
modified by plugins will not be tested, and tests provided by plugins will
1904
2091
not be run.
1905
2092
1906
examples:
2093
examples::
1907
2094
bzr selftest ignore
2095
run only tests relating to 'ignore'
1908
2096
bzr --no-plugins selftest -v
2097
disable plugins and list tests as they're run
1909
2098
"""
1910
2099
# TODO: --list should give a list of all available tests
1911
2100
1924
2113
return FakeNFSServer
1925
2114
msg = "No known transport type %s. Supported types are: sftp\n" %\
1926
2115
(typestring)
1927
raise BzrCommandError(msg)
2116
raise errors.BzrCommandError(msg)
1928
2117
1929
2118
hidden = True
1930
2119
takes_args = ['testspecs*']
1940
2129
Option('lsprof-timed',
1941
2130
help='generate lsprof output for benchmarked'
1942
2131
' sections of code.'),
2132
Option('cache-dir', type=str,
2133
help='a directory to cache intermediate'
2134
' benchmark steps'),
2135
Option('clean-output',
2136
help='clean temporary tests directories'
2137
' without running tests'),
2138
Option('first',
2139
help='run all tests, but run specified tests first',
2140
)
1943
2141
]
2142
encoding_type = 'replace'
1944
2143
1945
2144
def run(self, testspecs_list=None, verbose=None, one=False,
1946
2145
keep_output=False, transport=None, benchmark=None,
1947
lsprof_timed=None):
2146
lsprof_timed=None, cache_dir=None, clean_output=False,
2147
first=False):
1948
2148
import bzrlib.ui
1949
2149
from bzrlib.tests import selftest
1950
2150
import bzrlib.benchmarks as benchmarks
1951
# we don't want progress meters from the tests to go to the
1952
# real output; and we don't want log messages cluttering up
1953
# the real logs.
1954
save_ui = ui.ui_factory
2151
from bzrlib.benchmarks import tree_creator
2152
2153
if clean_output:
2154
from bzrlib.tests import clean_selftest_output
2155
clean_selftest_output()
2156
return 0
2157
2158
if cache_dir is not None:
2159
tree_creator.TreeCreator.CACHE_ROOT = osutils.abspath(cache_dir)
1955
2160
print '%10s: %s' % ('bzr', osutils.realpath(sys.argv[0]))
1956
2161
print '%10s: %s' % ('bzrlib', bzrlib.__path__[0])
1957
2162
print
1958
info('running tests...')
2163
if testspecs_list is not None:
2164
pattern = '|'.join(testspecs_list)
2165
else:
2166
pattern = ".*"
2167
if benchmark:
2168
test_suite_factory = benchmarks.test_suite
2169
if verbose is None:
2170
verbose = True
2171
# TODO: should possibly lock the history file...
2172
benchfile = open(".perf_history", "at", buffering=1)
2173
else:
2174
test_suite_factory = None
2175
if verbose is None:
2176
verbose = False
2177
benchfile = None
1959
2178
try:
1960
ui.ui_factory = ui.SilentUIFactory()
1961
if testspecs_list is not None:
1962
pattern = '|'.join(testspecs_list)
1963
else:
1964
pattern = ".*"
1965
if benchmark:
1966
test_suite_factory = benchmarks.test_suite
1967
if verbose is None:
1968
verbose = True
1969
else:
1970
test_suite_factory = None
1971
if verbose is None:
1972
verbose = False
1973
2179
result = selftest(verbose=verbose,
1974
2180
pattern=pattern,
1975
2181
stop_on_failure=one,
1976
2182
keep_output=keep_output,
1977
2183
transport=transport,
1978
2184
test_suite_factory=test_suite_factory,
1979
lsprof_timed=lsprof_timed)
1980
if result:
1981
info('tests passed')
1982
else:
1983
info('tests failed')
1984
return int(not result)
2185
lsprof_timed=lsprof_timed,
2186
bench_history=benchfile,
2187
matching_tests_first=first,
2188
)
1985
2189
finally:
1986
ui.ui_factory = save_ui
1987
1988
1989
def _get_bzr_branch():
1990
"""If bzr is run from a branch, return Branch or None"""
1991
from os.path import dirname
1992
1993
try:
1994
branch = Branch.open(dirname(osutils.abspath(dirname(__file__))))
1995
return branch
1996
except errors.BzrError:
1997
return None
1998
1999
2000
def show_version():
2001
import bzrlib
2002
print "bzr (bazaar-ng) %s" % bzrlib.__version__
2003
# is bzrlib itself in a branch?
2004
branch = _get_bzr_branch()
2005
if branch:
2006
rh = branch.revision_history()
2007
revno = len(rh)
2008
print " bzr checkout, revision %d" % (revno,)
2009
print " nick: %s" % (branch.nick,)
2010
if rh:
2011
print " revid: %s" % (rh[-1],)
2012
print "Using python interpreter:", sys.executable
2013
import site
2014
print "Using python standard library:", os.path.dirname(site.__file__)
2015
print "Using bzrlib:",
2016
if len(bzrlib.__path__) > 1:
2017
# print repr, which is a good enough way of making it clear it's
2018
# more than one element (eg ['/foo/bar', '/foo/bzr'])
2019
print repr(bzrlib.__path__)
2020
else:
2021
print bzrlib.__path__[0]
2022
2023
print
2024
print bzrlib.__copyright__
2025
print "http://bazaar-vcs.org/"
2026
print
2027
print "bzr comes with ABSOLUTELY NO WARRANTY. bzr is free software, and"
2028
print "you may use, modify and redistribute it under the terms of the GNU"
2029
print "General Public License version 2 or later."
2190
if benchfile is not None:
2191
benchfile.close()
2192
if result:
2193
info('tests passed')
2194
else:
2195
info('tests failed')
2196
return int(not result)
2030
2197
2031
2198
2032
2199
class cmd_version(Command):
2034
2201
2035
2202
@display_command
2036
2203
def run(self):
2204
from bzrlib.version import show_version
2037
2205
show_version()
2038
2206
2039
2207
2056
2224
2057
2225
@display_command
2058
2226
def run(self, branch, other):
2059
from bzrlib.revision import common_ancestor, MultipleRevisionSources
2227
from bzrlib.revision import MultipleRevisionSources
2060
2228
2061
2229
branch1 = Branch.open_containing(branch)[0]
2062
2230
branch2 = Branch.open_containing(other)[0]
2119
2287
takes_args = ['branch?']
2120
2288
takes_options = ['revision', 'force', 'merge-type', 'reprocess', 'remember',
2121
2289
Option('show-base', help="Show base revision text in "
2122
"conflicts")]
2290
"conflicts"),
2291
Option('uncommitted', help='Apply uncommitted changes'
2292
' from a working copy, instead of branch changes'),
2293
Option('pull', help='If the destination is already'
2294
' completely merged into the source, pull from the'
2295
' source rather than merging. When this happens,'
2296
' you do not need to commit the result.'),
2297
]
2123
2298
2124
2299
def help(self):
2125
from merge import merge_type_help
2126
2300
from inspect import getdoc
2127
return getdoc(self) + '\n' + merge_type_help()
2301
return getdoc(self) + '\n' + _mod_merge.merge_type_help()
2128
2302
2129
2303
def run(self, branch=None, revision=None, force=False, merge_type=None,
2130
show_base=False, reprocess=False, remember=False):
2304
show_base=False, reprocess=False, remember=False,
2305
uncommitted=False, pull=False):
2131
2306
if merge_type is None:
2132
merge_type = Merge3Merger
2307
merge_type = _mod_merge.Merge3Merger
2133
2308
2134
2309
tree = WorkingTree.open_containing(u'.')[0]
2135
2310
2136
2311
if branch is not None:
2137
2312
try:
2138
2313
reader = bundle.read_bundle_from_url(branch)
2139
except NotABundle:
2314
except errors.NotABundle:
2140
2315
pass # Continue on considering this url a Branch
2141
2316
else:
2142
2317
conflicts = merge_bundle(reader, tree, not force, merge_type,
2146
2321
else:
2147
2322
return 1
2148
2323
2149
branch = self._get_remembered_parent(tree, branch, 'Merging from')
2324
if revision is None \
2325
or len(revision) < 1 or revision[0].needs_branch():
2326
branch = self._get_remembered_parent(tree, branch, 'Merging from')
2150
2327
2151
2328
if revision is None or len(revision) < 1:
2152
base = [None, None]
2153
other = [branch, -1]
2329
if uncommitted:
2330
base = [branch, -1]
2331
other = [branch, None]
2332
else:
2333
base = [None, None]
2334
other = [branch, -1]
2154
2335
other_branch, path = Branch.open_containing(branch)
2155
2336
else:
2337
if uncommitted:
2338
raise errors.BzrCommandError('Cannot use --uncommitted and'
2339
' --revision at the same time.')
2340
branch = revision[0].get_branch() or branch
2156
2341
if len(revision) == 1:
2157
2342
base = [None, None]
2158
2343
other_branch, path = Branch.open_containing(branch)
2161
2346
else:
2162
2347
assert len(revision) == 2
2163
2348
if None in revision:
2164
raise BzrCommandError(
2165
"Merge doesn't permit that revision specifier.")
2166
other_branch, path = Branch.open_containing(branch)
2349
raise errors.BzrCommandError(
2350
"Merge doesn't permit empty revision specifier.")
2351
base_branch, path = Branch.open_containing(branch)
2352
branch1 = revision[1].get_branch() or branch
2353
other_branch, path1 = Branch.open_containing(branch1)
2354
if revision[0].get_branch() is not None:
2355
# then path was obtained from it, and is None.
2356
path = path1
2167
2357
2168
base = [branch, revision[0].in_history(other_branch).revno]
2169
other = [branch, revision[1].in_history(other_branch).revno]
2358
base = [branch, revision[0].in_history(base_branch).revno]
2359
other = [branch1, revision[1].in_history(other_branch).revno]
2170
2360
2171
2361
if tree.branch.get_parent() is None or remember:
2172
2362
tree.branch.set_parent(other_branch.base)
2178
2368
pb = ui.ui_factory.nested_progress_bar()
2179
2369
try:
2180
2370
try:
2181
conflict_count = merge(other, base, check_clean=(not force),
2182
merge_type=merge_type,
2183
reprocess=reprocess,
2184
show_base=show_base,
2185
pb=pb, file_list=interesting_files)
2371
conflict_count = _merge_helper(
2372
other, base, check_clean=(not force),
2373
merge_type=merge_type,
2374
reprocess=reprocess,
2375
show_base=show_base,
2376
pull=pull,
2377
pb=pb, file_list=interesting_files)
2186
2378
finally:
2187
2379
pb.finished()
2188
2380
if conflict_count != 0:
2209
2401
stored_location = tree.branch.get_parent()
2210
2402
mutter("%s", stored_location)
2211
2403
if stored_location is None:
2212
raise BzrCommandError("No location specified or remembered")
2404
raise errors.BzrCommandError("No location specified or remembered")
2213
2405
display_url = urlutils.unescape_for_display(stored_location, self.outf.encoding)
2214
2406
self.outf.write("%s remembered location %s\n" % (verb_string, display_url))
2215
2407
return stored_location
2242
2434
"conflicts")]
2243
2435
2244
2436
def help(self):
2245
from merge import merge_type_help
2246
2437
from inspect import getdoc
2247
return getdoc(self) + '\n' + merge_type_help()
2438
return getdoc(self) + '\n' + _mod_merge.merge_type_help()
2248
2439
2249
2440
def run(self, file_list=None, merge_type=None, show_base=False,
2250
2441
reprocess=False):
2251
from bzrlib.merge import merge_inner, transform_tree
2252
2442
if merge_type is None:
2253
merge_type = Merge3Merger
2443
merge_type = _mod_merge.Merge3Merger
2254
2444
tree, file_list = tree_files(file_list)
2255
2445
tree.lock_write()
2256
2446
try:
2257
pending_merges = tree.pending_merges()
2258
if len(pending_merges) != 1:
2259
raise BzrCommandError("Sorry, remerge only works after normal"
2260
" merges. Not cherrypicking or"
2261
" multi-merges.")
2447
parents = tree.get_parent_ids()
2448
if len(parents) != 2:
2449
raise errors.BzrCommandError("Sorry, remerge only works after normal"
2450
" merges. Not cherrypicking or"
2451
" multi-merges.")
2262
2452
repository = tree.branch.repository
2263
base_revision = common_ancestor(tree.branch.last_revision(),
2264
pending_merges[0], repository)
2453
base_revision = common_ancestor(parents[0],
2454
parents[1], repository)
2265
2455
base_tree = repository.revision_tree(base_revision)
2266
other_tree = repository.revision_tree(pending_merges[0])
2456
other_tree = repository.revision_tree(parents[1])
2267
2457
interesting_ids = None
2268
2458
new_conflicts = []
2269
2459
conflicts = tree.conflicts()
2272
2462
for filename in file_list:
2273
2463
file_id = tree.path2id(filename)
2274
2464
if file_id is None:
2275
raise NotVersionedError(filename)
2465
raise errors.NotVersionedError(filename)
2276
2466
interesting_ids.add(file_id)
2277
2467
if tree.kind(file_id) != "directory":
2278
2468
continue
2280
2470
for name, ie in tree.inventory.iter_entries(file_id):
2281
2471
interesting_ids.add(ie.file_id)
2282
2472
new_conflicts = conflicts.select_conflicts(tree, file_list)[0]
2283
transform_tree(tree, tree.basis_tree(), interesting_ids)
2473
else:
2474
# Remerge only supports resolving contents conflicts
2475
allowed_conflicts = ('text conflict', 'contents conflict')
2476
restore_files = [c.path for c in conflicts
2477
if c.typestring in allowed_conflicts]
2478
_mod_merge.transform_tree(tree, tree.basis_tree(), interesting_ids)
2284
2479
tree.set_conflicts(ConflictList(new_conflicts))
2285
if file_list is None:
2286
restore_files = list(tree.iter_conflicts())
2287
else:
2480
if file_list is not None:
2288
2481
restore_files = file_list
2289
2482
for filename in restore_files:
2290
2483
try:
2291
2484
restore(tree.abspath(filename))
2292
except NotConflicted:
2485
except errors.NotConflicted:
2293
2486
pass
2294
conflicts = merge_inner(tree.branch, other_tree, base_tree,
2295
this_tree=tree,
2296
interesting_ids=interesting_ids,
2297
other_rev_id=pending_merges[0],
2298
merge_type=merge_type,
2299
show_base=show_base,
2300
reprocess=reprocess)
2487
conflicts = _mod_merge.merge_inner(
2488
tree.branch, other_tree, base_tree,
2489
this_tree=tree,
2490
interesting_ids=interesting_ids,
2491
other_rev_id=parents[1],
2492
merge_type=merge_type,
2493
show_base=show_base,
2494
reprocess=reprocess)
2301
2495
finally:
2302
2496
tree.unlock()
2303
2497
if conflicts > 0:
2305
2499
else:
2306
2500
return 0
2307
2501
2502
2308
2503
class cmd_revert(Command):
2309
"""Reverse all changes since the last commit.
2310
2311
Only versioned files are affected. Specify filenames to revert only
2312
those files. By default, any files that are changed will be backed up
2313
first. Backup files have a '~' appended to their name.
2504
"""Revert files to a previous revision.
2505
2506
Giving a list of files will revert only those files. Otherwise, all files
2507
will be reverted. If the revision is not specified with '--revision', the
2508
last committed revision is used.
2509
2510
To remove only some changes, without reverting to a prior version, use
2511
merge instead. For example, "merge . --r-2..-3" will remove the changes
2512
introduced by -2, without affecting the changes introduced by -1. Or
2513
to remove certain changes on a hunk-by-hunk basis, see the Shelf plugin.
2514
2515
By default, any files that have been manually changed will be backed up
2516
first. (Files changed only by merge are not backed up.) Backup files have
2517
'.~#~' appended to their name, where # is a number.
2518
2519
When you provide files, you can use their current pathname or the pathname
2520
from the target revision. So you can use revert to "undelete" a file by
2521
name. If you name a directory, all the contents of that directory will be
2522
reverted.
2314
2523
"""
2315
2524
takes_options = ['revision', 'no-backup']
2316
2525
takes_args = ['file*']
2317
2526
aliases = ['merge-revert']
2318
2527
2319
2528
def run(self, revision=None, no_backup=False, file_list=None):
2320
from bzrlib.commands import parse_spec
2321
2529
if file_list is not None:
2322
2530
if len(file_list) == 0:
2323
raise BzrCommandError("No files specified")
2531
raise errors.BzrCommandError("No files specified")
2324
2532
else:
2325
2533
file_list = []
2326
2534
2329
2537
# FIXME should be tree.last_revision
2330
2538
rev_id = tree.last_revision()
2331
2539
elif len(revision) != 1:
2332
raise BzrCommandError('bzr revert --revision takes exactly 1 argument')
2540
raise errors.BzrCommandError('bzr revert --revision takes exactly 1 argument')
2333
2541
else:
2334
2542
rev_id = revision[0].in_history(tree.branch).rev_id
2335
2543
pb = ui.ui_factory.nested_progress_bar()
2336
2544
try:
2337
2545
tree.revert(file_list,
2338
2546
tree.branch.repository.revision_tree(rev_id),
2339
not no_backup, pb)
2547
not no_backup, pb, report_changes=True)
2340
2548
finally:
2341
2549
pb.finished()
2342
2550
2343
2551
2344
2552
class cmd_assert_fail(Command):
2345
2553
"""Test reporting of assertion failures"""
2554
# intended just for use in testing
2555
2346
2556
hidden = True
2557
2347
2558
def run(self):
2348
assert False, "always fails"
2559
raise AssertionError("always fails")
2349
2560
2350
2561
2351
2562
class cmd_help(Command):
2352
2563
"""Show help on a command or other topic.
2353
2564
2354
For a list of all available commands, say 'bzr help commands'."""
2565
For a list of all available commands, say 'bzr help commands'.
2566
"""
2355
2567
takes_options = [Option('long', 'show help on all commands')]
2356
2568
takes_args = ['topic?']
2357
2569
aliases = ['?', '--help', '-?', '-h']
2358
2570
2359
2571
@display_command
2360
2572
def run(self, topic=None, long=False):
2361
import help
2573
import bzrlib.help
2362
2574
if topic is None and long:
2363
2575
topic = "commands"
2364
help.help(topic)
2576
bzrlib.help.help(topic)
2365
2577
2366
2578
2367
2579
class cmd_shell_complete(Command):
2368
2580
"""Show appropriate completions for context.
2369
2581
2370
For a list of all available commands, say 'bzr shell-complete'."""
2582
For a list of all available commands, say 'bzr shell-complete'.
2583
"""
2371
2584
takes_args = ['context?']
2372
2585
aliases = ['s-c']
2373
2586
hidden = True
2381
2594
class cmd_fetch(Command):
2382
2595
"""Copy in history from another branch but don't merge it.
2383
2596
2384
This is an internal method used for pull and merge."""
2597
This is an internal method used for pull and merge.
2598
"""
2385
2599
hidden = True
2386
2600
takes_args = ['from_branch', 'to_branch']
2387
2601
def run(self, from_branch, to_branch):
2394
2608
class cmd_missing(Command):
2395
2609
"""Show unmerged/unpulled revisions between two branches.
2396
2610
2397
OTHER_BRANCH may be local or remote."""
2611
OTHER_BRANCH may be local or remote.
2612
"""
2398
2613
takes_args = ['other_branch?']
2399
2614
takes_options = [Option('reverse', 'Reverse the order of revisions'),
2400
2615
Option('mine-only',
2421
2636
if other_branch is None:
2422
2637
other_branch = parent
2423
2638
if other_branch is None:
2424
raise BzrCommandError("No peer location known or specified.")
2425
print "Using last location: " + local_branch.get_parent()
2639
raise errors.BzrCommandError("No peer location known or specified.")
2640
display_url = urlutils.unescape_for_display(parent,
2641
self.outf.encoding)
2642
print "Using last location: " + display_url
2643
2426
2644
remote_branch = Branch.open(other_branch)
2427
2645
if remote_branch.base == local_branch.base:
2428
2646
remote_branch = local_branch
2431
2649
remote_branch.lock_read()
2432
2650
try:
2433
2651
local_extra, remote_extra = find_unmerged(local_branch, remote_branch)
2434
if (log_format == None):
2652
if (log_format is None):
2435
2653
default = local_branch.get_config().log_format()
2436
2654
log_format = get_log_format(long=long, short=short,
2437
2655
line=line, default=default)
2485
2703
import bzrlib.plugin
2486
2704
from inspect import getdoc
2487
2705
for name, plugin in bzrlib.plugin.all_plugins().items():
2488
if hasattr(plugin, '__path__'):
2706
if getattr(plugin, '__path__', None) is not None:
2489
2707
print plugin.__path__[0]
2490
elif hasattr(plugin, '__file__'):
2708
elif getattr(plugin, '__file__', None) is not None:
2491
2709
print plugin.__file__
2492
2710
else:
2493
print `plugin`
2711
print repr(plugin)
2494
2712
2495
2713
d = getdoc(plugin)
2496
2714
if d:
2499
2717
2500
2718
class cmd_testament(Command):
2501
2719
"""Show testament (signing-form) of a revision."""
2502
takes_options = ['revision', 'long',
2720
takes_options = ['revision',
2721
Option('long', help='Produce long-format testament'),
2503
2722
Option('strict', help='Produce a strict-format'
2504
2723
' testament')]
2505
2724
takes_args = ['branch?']
2542
2761
takes_args = ['filename']
2543
2762
takes_options = [Option('all', help='show annotations on all lines'),
2544
2763
Option('long', help='show date in annotations'),
2545
'revision'
2764
'revision',
2765
'show-ids',
2546
2766
]
2547
2767
2548
2768
@display_command
2549
def run(self, filename, all=False, long=False, revision=None):
2769
def run(self, filename, all=False, long=False, revision=None,
2770
show_ids=False):
2550
2771
from bzrlib.annotate import annotate_file
2551
2772
tree, relpath = WorkingTree.open_containing(filename)
2552
2773
branch = tree.branch
2555
2776
if revision is None:
2556
2777
revision_id = branch.last_revision()
2557
2778
elif len(revision) != 1:
2558
raise BzrCommandError('bzr annotate --revision takes exactly 1 argument')
2779
raise errors.BzrCommandError('bzr annotate --revision takes exactly 1 argument')
2559
2780
else:
2560
2781
revision_id = revision[0].in_history(branch).rev_id
2561
2782
file_id = tree.inventory.path2id(relpath)
2562
2783
tree = branch.repository.revision_tree(revision_id)
2563
2784
file_version = tree.inventory[file_id].revision
2564
annotate_file(branch, file_version, file_id, long, all, sys.stdout)
2785
annotate_file(branch, file_version, file_id, long, all, sys.stdout,
2786
show_ids=show_ids)
2565
2787
finally:
2566
2788
branch.unlock()
2567
2789
2577
2799
def run(self, revision_id_list=None, revision=None):
2578
2800
import bzrlib.gpg as gpg
2579
2801
if revision_id_list is not None and revision is not None:
2580
raise BzrCommandError('You can only supply one of revision_id or --revision')
2802
raise errors.BzrCommandError('You can only supply one of revision_id or --revision')
2581
2803
if revision_id_list is None and revision is None:
2582
raise BzrCommandError('You must supply either --revision or a revision_id')
2804
raise errors.BzrCommandError('You must supply either --revision or a revision_id')
2583
2805
b = WorkingTree.open_containing(u'.')[0].branch
2584
2806
gpg_strategy = gpg.GPGStrategy(b.get_config())
2585
2807
if revision_id_list is not None:
2598
2820
if to_revid is None:
2599
2821
to_revno = b.revno()
2600
2822
if from_revno is None or to_revno is None:
2601
raise BzrCommandError('Cannot sign a range of non-revision-history revisions')
2823
raise errors.BzrCommandError('Cannot sign a range of non-revision-history revisions')
2602
2824
for revno in range(from_revno, to_revno + 1):
2603
2825
b.repository.sign_revision(b.get_rev_id(revno),
2604
2826
gpg_strategy)
2605
2827
else:
2606
raise BzrCommandError('Please supply either one revision, or a range.')
2828
raise errors.BzrCommandError('Please supply either one revision, or a range.')
2607
2829
2608
2830
2609
2831
class cmd_bind(Command):
2621
2843
b_other = Branch.open(location)
2622
2844
try:
2623
2845
b.bind(b_other)
2624
except DivergedBranches:
2625
raise BzrCommandError('These branches have diverged.'
2626
' Try merging, and then bind again.')
2846
except errors.DivergedBranches:
2847
raise errors.BzrCommandError('These branches have diverged.'
2848
' Try merging, and then bind again.')
2627
2849
2628
2850
2629
2851
class cmd_unbind(Command):
2639
2861
def run(self):
2640
2862
b, relpath = Branch.open_containing(u'.')
2641
2863
if not b.unbind():
2642
raise BzrCommandError('Local branch is not bound')
2864
raise errors.BzrCommandError('Local branch is not bound')
2643
2865
2644
2866
2645
2867
class cmd_uncommit(Command):
2747
2969
pass
2748
2970
2749
2971
2972
class cmd_wait_until_signalled(Command):
2973
"""Test helper for test_start_and_stop_bzr_subprocess_send_signal.
2974
2975
This just prints a line to signal when it is ready, then blocks on stdin.
2976
"""
2977
2978
hidden = True
2979
2980
def run(self):
2981
sys.stdout.write("running\n")
2982
sys.stdout.flush()
2983
sys.stdin.readline()
2984
2985
2986
class cmd_serve(Command):
2987
"""Run the bzr server."""
2988
2989
aliases = ['server']
2990
2991
takes_options = [
2992
Option('inet',
2993
help='serve on stdin/out for use from inetd or sshd'),
2994
Option('port',
2995
help='listen for connections on nominated port of the form '
2996
'[hostname:]portnumber. Passing 0 as the port number will '
2997
'result in a dynamically allocated port.',
2998
type=str),
2999
Option('directory',
3000
help='serve contents of directory',
3001
type=unicode),
3002
Option('allow-writes',
3003
help='By default the server is a readonly server. Supplying '
3004
'--allow-writes enables write access to the contents of '
3005
'the served directory and below. '
3006
),
3007
]
3008
3009
def run(self, port=None, inet=False, directory=None, allow_writes=False):
3010
from bzrlib.transport import smart
3011
from bzrlib.transport import get_transport
3012
if directory is None:
3013
directory = os.getcwd()
3014
url = urlutils.local_path_to_url(directory)
3015
if not allow_writes:
3016
url = 'readonly+' + url
3017
t = get_transport(url)
3018
if inet:
3019
server = smart.SmartServerPipeStreamMedium(sys.stdin, sys.stdout, t)
3020
elif port is not None:
3021
if ':' in port:
3022
host, port = port.split(':')
3023
else:
3024
host = '127.0.0.1'
3025
server = smart.SmartTCPServer(t, host=host, port=int(port))
3026
print 'listening on port: ', server.port
3027
sys.stdout.flush()
3028
else:
3029
raise errors.BzrCommandError("bzr serve requires one of --inet or --port")
3030
server.serve()
3031
2750
3032
2751
3033
# command-line interpretation helper for merge-related commands
2752
def merge(other_revision, base_revision,
2753
check_clean=True, ignore_zero=False,
2754
this_dir=None, backup_files=False, merge_type=Merge3Merger,
2755
file_list=None, show_base=False, reprocess=False,
2756
pb=DummyProgress()):
3034
def _merge_helper(other_revision, base_revision,
3035
check_clean=True, ignore_zero=False,
3036
this_dir=None, backup_files=False,
3037
merge_type=None,
3038
file_list=None, show_base=False, reprocess=False,
3039
pull=False,
3040
pb=DummyProgress()):
2757
3041
"""Merge changes into a tree.
2758
3042
2759
3043
base_revision
2781
3065
clients might prefer to call merge.merge_inner(), which has less magic
2782
3066
behavior.
2783
3067
"""
2784
from bzrlib.merge import Merger
3068
# Loading it late, so that we don't always have to import bzrlib.merge
3069
if merge_type is None:
3070
merge_type = _mod_merge.Merge3Merger
2785
3071
if this_dir is None:
2786
3072
this_dir = u'.'
2787
3073
this_tree = WorkingTree.open_containing(this_dir)[0]
2788
if show_base and not merge_type is Merge3Merger:
2789
raise BzrCommandError("Show-base is not supported for this merge"
2790
" type. %s" % merge_type)
3074
if show_base and not merge_type is _mod_merge.Merge3Merger:
3075
raise errors.BzrCommandError("Show-base is not supported for this merge"
3076
" type. %s" % merge_type)
2791
3077
if reprocess and not merge_type.supports_reprocess:
2792
raise BzrCommandError("Conflict reduction is not supported for merge"
2793
" type %s." % merge_type)
3078
raise errors.BzrCommandError("Conflict reduction is not supported for merge"
3079
" type %s." % merge_type)
2794
3080
if reprocess and show_base:
2795
raise BzrCommandError("Cannot do conflict reduction and show base.")
3081
raise errors.BzrCommandError("Cannot do conflict reduction and show base.")
2796
3082
try:
2797
merger = Merger(this_tree.branch, this_tree=this_tree, pb=pb)
3083
merger = _mod_merge.Merger(this_tree.branch, this_tree=this_tree,
3084
pb=pb)
2798
3085
merger.pp = ProgressPhase("Merge phase", 5, pb)
2799
3086
merger.pp.next_phase()
2800
3087
merger.check_basis(check_clean)
2804
3091
if merger.base_rev_id == merger.other_rev_id:
2805
3092
note('Nothing to do.')
2806
3093
return 0
3094
if file_list is None:
3095
if pull and merger.base_rev_id == merger.this_rev_id:
3096
count = merger.this_tree.pull(merger.this_branch,
3097
False, merger.other_rev_id)
3098
note('%d revision(s) pulled.' % (count,))
3099
return 0
2807
3100
merger.backup_files = backup_files
2808
3101
merger.merge_type = merge_type
2809
3102
merger.set_interesting_files(file_list)
2817
3110
return conflicts
2818
3111
2819
3112
3113
# Compatibility
3114
merge = _merge_helper
3115
3116
2820
3117
# these get imported and then picked up by the scan for cmd_*
2821
3118
# TODO: Some more consistent way to split command definitions across files;
2822
3119
# we do need to load at least some information about them to know of
2823
3120
# aliases. ideally we would avoid loading the implementation until the
2824
3121
# details were needed.
3122
from bzrlib.cmd_version_info import cmd_version_info
2825
3123
from bzrlib.conflicts import cmd_resolve, cmd_conflicts, restore
2826
3124
from bzrlib.bundle.commands import cmd_bundle_revisions
2827
3125
from bzrlib.sign_my_commits import cmd_sign_my_commits
Loggerhead is a web-based interface for Breezy
Version: 2.0.1