« back to all changes in this revision
Viewing changes to bzrlib/builtins.py
- browse files at revision 2221.4.11
- compare with another revision
- download diff
- download tarball
- view history from revision 2221.4.11
- Committer: Aaron Bentley
- Date: 2007-02-07 03:09:58 UTC
- mfrom: (2268 +trunk)
- mto: This revision was merged to the branch mainline in revision 2269.
- Revision ID: aaron.bentley@utoronto.ca-20070207030958-fx6ykp7rg7zma6xu
Merge bzr.dev
- files added:
- BRANCH.TODO
- bzrlib/benchmarks
- bzrlib/benchmarks/tree_creator
- bzrlib/bundle
- bzrlib/bundle/old
- bzrlib/bundle/serializer
- bzrlib/doc
- bzrlib/doc/api
- bzrlib/export
- bzrlib/plugins
- bzrlib/plugins/launchpad
- bzrlib/repofmt
- bzrlib/store
- bzrlib/store/revision
- bzrlib/store/versioned
- bzrlib/tests
- bzrlib/tests/blackbox
- bzrlib/tests/branch_implementations
- bzrlib/tests/bzrdir_implementations
- bzrlib/tests/interrepository_implementations
- bzrlib/tests/intertree_implementations
- bzrlib/tests/interversionedfile_implementations
- bzrlib/tests/repository_implementations
- bzrlib/tests/revisionstore_implementations
- bzrlib/tests/test_patches_data
- bzrlib/tests/tree_implementations
- bzrlib/tests/workingtree_implementations
- bzrlib/transport
- bzrlib/transport/http
- bzrlib/ui
- bzrlib/util
- bzrlib/util/configobj
- bzrlib/util/configobj/docs
- bzrlib/util/effbot
- bzrlib/util/effbot/org
- bzrlib/version_info_formats
- contrib/emacs
- tools
- tools/doc_generate
- tools/win32
- files removed:
- bzrlib/mdiff.py
- notes
- patches
- urlgrabber
- files renamed:
- bzrlib/changeset.py => bzrlib/bundle/__init__.py
- bzrlib/store.py => bzrlib/store/__init__.py
- elementtree/ => bzrlib/util/elementtree/
- bzrlib/xml.py => bzrlib/xml_serializer.py
- contrib/bash/bzr => contrib/bash/bzr.simple
- bzrlib/newinventory.py => contrib/newinventory.py
- files modified:
- .bzrignore
- bzr *
added
removed
bzrlib/builtins.py
1
# Copyright (C) 2004, 2005, 2006 Canonical Ltd
2
#
3
# This program is free software; you can redistribute it and/or modify
4
# it under the terms of the GNU General Public License as published by
5
# the Free Software Foundation; either version 2 of the License, or
6
# (at your option) any later version.
7
#
8
# This program is distributed in the hope that it will be useful,
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11
# GNU General Public License for more details.
12
#
13
# You should have received a copy of the GNU General Public License
14
# along with this program; if not, write to the Free Software
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
16
17
"""builtin bzr commands"""
18
19
import os
20
21
from bzrlib.lazy_import import lazy_import
22
lazy_import(globals(), """
23
import codecs
24
import errno
25
import sys
26
import tempfile
27
28
import bzrlib
29
from bzrlib import (
30
branch,
31
bundle,
32
bzrdir,
33
delta,
34
config,
35
errors,
36
ignores,
37
log,
38
merge as _mod_merge,
39
osutils,
40
repository,
41
symbol_versioning,
42
transport,
43
tree as _mod_tree,
44
ui,
45
urlutils,
46
)
47
from bzrlib.branch import Branch
48
from bzrlib.bundle.apply_bundle import install_bundle, merge_bundle
49
from bzrlib.conflicts import ConflictList
50
from bzrlib.revision import common_ancestor
51
from bzrlib.revisionspec import RevisionSpec
52
from bzrlib.workingtree import WorkingTree
53
""")
54
55
from bzrlib.commands import Command, display_command
56
from bzrlib.option import Option, RegistryOption
57
from bzrlib.progress import DummyProgress, ProgressPhase
58
from bzrlib.trace import mutter, note, log_error, warning, is_quiet, info
59
60
61
def tree_files(file_list, default_branch=u'.'):
62
try:
63
return internal_tree_files(file_list, default_branch)
64
except errors.FileInWrongBranch, e:
65
raise errors.BzrCommandError("%s is not in the same branch as %s" %
66
(e.path, file_list[0]))
67
68
69
# XXX: Bad function name; should possibly also be a class method of
70
# WorkingTree rather than a function.
71
def internal_tree_files(file_list, default_branch=u'.'):
72
"""Convert command-line paths to a WorkingTree and relative paths.
73
74
This is typically used for command-line processors that take one or
75
more filenames, and infer the workingtree that contains them.
76
77
The filenames given are not required to exist.
78
79
:param file_list: Filenames to convert.
80
81
:param default_branch: Fallback tree path to use if file_list is empty or
82
None.
83
84
:return: workingtree, [relative_paths]
85
"""
86
if file_list is None or len(file_list) == 0:
87
return WorkingTree.open_containing(default_branch)[0], file_list
88
tree = WorkingTree.open_containing(osutils.realpath(file_list[0]))[0]
89
new_list = []
90
for filename in file_list:
91
try:
92
new_list.append(tree.relpath(osutils.dereference_path(filename)))
93
except errors.PathNotChild:
94
raise errors.FileInWrongBranch(tree.branch, filename)
95
return tree, new_list
96
97
98
@symbol_versioning.deprecated_function(symbol_versioning.zero_fifteen)
99
def get_format_type(typestring):
100
"""Parse and return a format specifier."""
101
# Have to use BzrDirMetaFormat1 directly, so that
102
# RepositoryFormat.set_default_format works
103
if typestring == "default":
104
return bzrdir.BzrDirMetaFormat1()
105
try:
106
return bzrdir.format_registry.make_bzrdir(typestring)
107
except KeyError:
108
msg = 'Unknown bzr format "%s". See "bzr help formats".' % typestring
109
raise errors.BzrCommandError(msg)
110
111
112
# TODO: Make sure no commands unconditionally use the working directory as a
113
# branch. If a filename argument is used, the first of them should be used to
114
# specify the branch. (Perhaps this can be factored out into some kind of
115
# Argument class, representing a file in a branch, where the first occurrence
116
# opens the branch?)
117
118
class cmd_status(Command):
119
"""Display status summary.
120
121
This reports on versioned and unknown files, reporting them
122
grouped by state. Possible states are:
123
124
added
125
Versioned in the working copy but not in the previous revision.
126
127
removed
128
Versioned in the previous revision but removed or deleted
129
in the working copy.
130
131
renamed
132
Path of this file changed from the previous revision;
133
the text may also have changed. This includes files whose
134
parent directory was renamed.
135
136
modified
137
Text has changed since the previous revision.
138
139
kind changed
140
File kind has been changed (e.g. from file to directory).
141
142
unknown
143
Not versioned and not matching an ignore pattern.
144
145
To see ignored files use 'bzr ignored'. For details in the
146
changes to file texts, use 'bzr diff'.
147
148
--short gives a status flags for each item, similar to the SVN's status
149
command.
150
151
Column 1: versioning / renames
152
+ File versioned
153
- File unversioned
154
R File renamed
155
? File unknown
156
C File has conflicts
157
P Entry for a pending merge (not a file)
158
159
Column 2: Contents
160
N File created
161
D File deleted
162
K File kind changed
163
M File modified
164
165
Column 3: Execute
166
* The execute bit was changed
167
168
If no arguments are specified, the status of the entire working
169
directory is shown. Otherwise, only the status of the specified
170
files or directories is reported. If a directory is given, status
171
is reported for everything inside that directory.
172
173
If a revision argument is given, the status is calculated against
174
that revision, or between two revisions if two are provided.
175
"""
176
177
# TODO: --no-recurse, --recurse options
178
179
takes_args = ['file*']
180
takes_options = ['show-ids', 'revision', 'short']
181
aliases = ['st', 'stat']
182
183
encoding_type = 'replace'
184
185
@display_command
186
def run(self, show_ids=False, file_list=None, revision=None, short=False):
187
from bzrlib.status import show_tree_status
188
189
tree, file_list = tree_files(file_list)
190
191
show_tree_status(tree, show_ids=show_ids,
192
specific_files=file_list, revision=revision,
193
to_file=self.outf,
194
short=short)
195
196
197
class cmd_cat_revision(Command):
198
"""Write out metadata for a revision.
199
200
The revision to print can either be specified by a specific
201
revision identifier, or you can use --revision.
202
"""
203
204
hidden = True
205
takes_args = ['revision_id?']
206
takes_options = ['revision']
207
# cat-revision is more for frontends so should be exact
208
encoding = 'strict'
209
210
@display_command
211
def run(self, revision_id=None, revision=None):
212
213
if revision_id is not None and revision is not None:
214
raise errors.BzrCommandError('You can only supply one of'
215
' revision_id or --revision')
216
if revision_id is None and revision is None:
217
raise errors.BzrCommandError('You must supply either'
218
' --revision or a revision_id')
219
b = WorkingTree.open_containing(u'.')[0].branch
220
221
# TODO: jam 20060112 should cat-revision always output utf-8?
222
if revision_id is not None:
223
self.outf.write(b.repository.get_revision_xml(revision_id).decode('utf-8'))
224
elif revision is not None:
225
for rev in revision:
226
if rev is None:
227
raise errors.BzrCommandError('You cannot specify a NULL'
228
' revision.')
229
revno, rev_id = rev.in_history(b)
230
self.outf.write(b.repository.get_revision_xml(rev_id).decode('utf-8'))
231
232
233
class cmd_remove_tree(Command):
234
"""Remove the working tree from a given branch/checkout.
235
236
Since a lightweight checkout is little more than a working tree
237
this will refuse to run against one.
238
"""
239
240
hidden = True
241
242
takes_args = ['location?']
243
244
def run(self, location='.'):
245
d = bzrdir.BzrDir.open(location)
246
247
try:
248
working = d.open_workingtree()
249
except errors.NoWorkingTree:
250
raise errors.BzrCommandError("No working tree to remove")
251
except errors.NotLocalUrl:
252
raise errors.BzrCommandError("You cannot remove the working tree of a "
253
"remote path")
254
255
working_path = working.bzrdir.root_transport.base
256
branch_path = working.branch.bzrdir.root_transport.base
257
if working_path != branch_path:
258
raise errors.BzrCommandError("You cannot remove the working tree from "
259
"a lightweight checkout")
260
261
d.destroy_workingtree()
262
263
264
class cmd_revno(Command):
265
"""Show current revision number.
266
267
This is equal to the number of revisions on this branch.
268
"""
269
270
takes_args = ['location?']
271
272
@display_command
273
def run(self, location=u'.'):
274
self.outf.write(str(Branch.open_containing(location)[0].revno()))
275
self.outf.write('\n')
276
277
278
class cmd_revision_info(Command):
279
"""Show revision number and revision id for a given revision identifier.
280
"""
281
hidden = True
282
takes_args = ['revision_info*']
283
takes_options = ['revision']
284
285
@display_command
286
def run(self, revision=None, revision_info_list=[]):
287
288
revs = []
289
if revision is not None:
290
revs.extend(revision)
291
if revision_info_list is not None:
292
for rev in revision_info_list:
293
revs.append(RevisionSpec.from_string(rev))
294
if len(revs) == 0:
295
raise errors.BzrCommandError('You must supply a revision identifier')
296
297
b = WorkingTree.open_containing(u'.')[0].branch
298
299
for rev in revs:
300
revinfo = rev.in_history(b)
301
if revinfo.revno is None:
302
print ' %s' % revinfo.rev_id
303
else:
304
print '%4d %s' % (revinfo.revno, revinfo.rev_id)
305
306
307
class cmd_add(Command):
308
"""Add specified files or directories.
309
310
In non-recursive mode, all the named items are added, regardless
311
of whether they were previously ignored. A warning is given if
312
any of the named files are already versioned.
313
314
In recursive mode (the default), files are treated the same way
315
but the behaviour for directories is different. Directories that
316
are already versioned do not give a warning. All directories,
317
whether already versioned or not, are searched for files or
318
subdirectories that are neither versioned or ignored, and these
319
are added. This search proceeds recursively into versioned
320
directories. If no names are given '.' is assumed.
321
322
Therefore simply saying 'bzr add' will version all files that
323
are currently unknown.
324
325
Adding a file whose parent directory is not versioned will
326
implicitly add the parent, and so on up to the root. This means
327
you should never need to explicitly add a directory, they'll just
328
get added when you add a file in the directory.
329
330
--dry-run will show which files would be added, but not actually
331
add them.
332
333
--file-ids-from will try to use the file ids from the supplied path.
334
It looks up ids trying to find a matching parent directory with the
335
same filename, and then by pure path.
336
"""
337
takes_args = ['file*']
338
takes_options = ['no-recurse', 'dry-run', 'verbose',
339
Option('file-ids-from', type=unicode,
340
help='Lookup file ids from here')]
341
encoding_type = 'replace'
342
343
def run(self, file_list, no_recurse=False, dry_run=False, verbose=False,
344
file_ids_from=None):
345
import bzrlib.add
346
347
if file_ids_from is not None:
348
try:
349
base_tree, base_path = WorkingTree.open_containing(
350
file_ids_from)
351
except errors.NoWorkingTree:
352
base_branch, base_path = Branch.open_containing(
353
file_ids_from)
354
base_tree = base_branch.basis_tree()
355
356
action = bzrlib.add.AddFromBaseAction(base_tree, base_path,
357
to_file=self.outf, should_print=(not is_quiet()))
358
else:
359
action = bzrlib.add.AddAction(to_file=self.outf,
360
should_print=(not is_quiet()))
361
362
added, ignored = bzrlib.add.smart_add(file_list, not no_recurse,
363
action=action, save=not dry_run)
364
if len(ignored) > 0:
365
if verbose:
366
for glob in sorted(ignored.keys()):
367
for path in ignored[glob]:
368
self.outf.write("ignored %s matching \"%s\"\n"
369
% (path, glob))
370
else:
371
match_len = 0
372
for glob, paths in ignored.items():
373
match_len += len(paths)
374
self.outf.write("ignored %d file(s).\n" % match_len)
375
self.outf.write("If you wish to add some of these files,"
376
" please add them by name.\n")
377
378
379
class cmd_mkdir(Command):
380
"""Create a new versioned directory.
381
382
This is equivalent to creating the directory and then adding it.
383
"""
384
385
takes_args = ['dir+']
386
encoding_type = 'replace'
387
388
def run(self, dir_list):
389
for d in dir_list:
390
os.mkdir(d)
391
wt, dd = WorkingTree.open_containing(d)
392
wt.add([dd])
393
self.outf.write('added %s\n' % d)
394
395
396
class cmd_relpath(Command):
397
"""Show path of a file relative to root"""
398
399
takes_args = ['filename']
400
hidden = True
401
402
@display_command
403
def run(self, filename):
404
# TODO: jam 20050106 Can relpath return a munged path if
405
# sys.stdout encoding cannot represent it?
406
tree, relpath = WorkingTree.open_containing(filename)
407
self.outf.write(relpath)
408
self.outf.write('\n')
409
410
411
class cmd_inventory(Command):
412
"""Show inventory of the current working copy or a revision.
413
414
It is possible to limit the output to a particular entry
415
type using the --kind option. For example: --kind file.
416
417
It is also possible to restrict the list of files to a specific
418
set. For example: bzr inventory --show-ids this/file
419
"""
420
421
takes_options = ['revision', 'show-ids', 'kind']
422
takes_args = ['file*']
423
424
@display_command
425
def run(self, revision=None, show_ids=False, kind=None, file_list=None):
426
if kind and kind not in ['file', 'directory', 'symlink']:
427
raise errors.BzrCommandError('invalid kind specified')
428
429
work_tree, file_list = tree_files(file_list)
430
431
if revision is not None:
432
if len(revision) > 1:
433
raise errors.BzrCommandError('bzr inventory --revision takes'
434
' exactly one revision identifier')
435
revision_id = revision[0].in_history(work_tree.branch).rev_id
436
tree = work_tree.branch.repository.revision_tree(revision_id)
437
438
# We include work_tree as well as 'tree' here
439
# So that doing '-r 10 path/foo' will lookup whatever file
440
# exists now at 'path/foo' even if it has been renamed, as
441
# well as whatever files existed in revision 10 at path/foo
442
trees = [tree, work_tree]
443
else:
444
tree = work_tree
445
trees = [tree]
446
447
if file_list is not None:
448
file_ids = _mod_tree.find_ids_across_trees(file_list, trees,
449
require_versioned=True)
450
# find_ids_across_trees may include some paths that don't
451
# exist in 'tree'.
452
entries = sorted((tree.id2path(file_id), tree.inventory[file_id])
453
for file_id in file_ids if file_id in tree)
454
else:
455
entries = tree.inventory.entries()
456
457
for path, entry in entries:
458
if kind and kind != entry.kind:
459
continue
460
if show_ids:
461
self.outf.write('%-50s %s\n' % (path, entry.file_id))
462
else:
463
self.outf.write(path)
464
self.outf.write('\n')
465
466
467
class cmd_mv(Command):
468
"""Move or rename a file.
469
470
usage:
471
bzr mv OLDNAME NEWNAME
472
bzr mv SOURCE... DESTINATION
473
474
If the last argument is a versioned directory, all the other names
475
are moved into it. Otherwise, there must be exactly two arguments
476
and the file is changed to a new name.
477
478
If OLDNAME does not exist on the filesystem but is versioned and
479
NEWNAME does exist on the filesystem but is not versioned, mv
480
assumes that the file has been manually moved and only updates
481
its internal inventory to reflect that change.
482
The same is valid when moving many SOURCE files to a DESTINATION.
483
484
Files cannot be moved between branches.
485
"""
486
487
takes_args = ['names*']
488
takes_options = [Option("after", help="move only the bzr identifier"
489
" of the file (file has already been moved). Use this flag if"
490
" bzr is not able to detect this itself.")]
491
aliases = ['move', 'rename']
492
encoding_type = 'replace'
493
494
def run(self, names_list, after=False):
495
if names_list is None:
496
names_list = []
497
498
if len(names_list) < 2:
499
raise errors.BzrCommandError("missing file argument")
500
tree, rel_names = tree_files(names_list)
501
502
if os.path.isdir(names_list[-1]):
503
# move into existing directory
504
for pair in tree.move(rel_names[:-1], rel_names[-1], after=after):
505
self.outf.write("%s => %s\n" % pair)
506
else:
507
if len(names_list) != 2:
508
raise errors.BzrCommandError('to mv multiple files the'
509
' destination must be a versioned'
510
' directory')
511
tree.rename_one(rel_names[0], rel_names[1], after=after)
512
self.outf.write("%s => %s\n" % (rel_names[0], rel_names[1]))
513
514
515
class cmd_pull(Command):
516
"""Turn this branch into a mirror of another branch.
517
518
This command only works on branches that have not diverged. Branches are
519
considered diverged if the destination branch's most recent commit is one
520
that has not been merged (directly or indirectly) into the parent.
521
522
If branches have diverged, you can use 'bzr merge' to integrate the changes
523
from one into the other. Once one branch has merged, the other should
524
be able to pull it again.
525
526
If you want to forget your local changes and just update your branch to
527
match the remote one, use pull --overwrite.
528
529
If there is no default location set, the first pull will set it. After
530
that, you can omit the location to use the default. To change the
531
default, use --remember. The value will only be saved if the remote
532
location can be accessed.
533
"""
534
535
takes_options = ['remember', 'overwrite', 'revision', 'verbose']
536
takes_args = ['location?']
537
encoding_type = 'replace'
538
539
def run(self, location=None, remember=False, overwrite=False, revision=None, verbose=False):
540
# FIXME: too much stuff is in the command class
541
try:
542
tree_to = WorkingTree.open_containing(u'.')[0]
543
branch_to = tree_to.branch
544
except errors.NoWorkingTree:
545
tree_to = None
546
branch_to = Branch.open_containing(u'.')[0]
547
548
reader = None
549
if location is not None:
550
try:
551
reader = bundle.read_bundle_from_url(location)
552
except errors.NotABundle:
553
pass # Continue on considering this url a Branch
554
555
stored_loc = branch_to.get_parent()
556
if location is None:
557
if stored_loc is None:
558
raise errors.BzrCommandError("No pull location known or"
559
" specified.")
560
else:
561
display_url = urlutils.unescape_for_display(stored_loc,
562
self.outf.encoding)
563
self.outf.write("Using saved location: %s\n" % display_url)
564
location = stored_loc
565
566
567
if reader is not None:
568
install_bundle(branch_to.repository, reader)
569
branch_from = branch_to
570
else:
571
branch_from = Branch.open(location)
572
573
if branch_to.get_parent() is None or remember:
574
branch_to.set_parent(branch_from.base)
575
576
rev_id = None
577
if revision is None:
578
if reader is not None:
579
rev_id = reader.target
580
elif len(revision) == 1:
581
rev_id = revision[0].in_history(branch_from).rev_id
582
else:
583
raise errors.BzrCommandError('bzr pull --revision takes one value.')
584
585
old_rh = branch_to.revision_history()
586
if tree_to is not None:
587
count = tree_to.pull(branch_from, overwrite, rev_id)
588
else:
589
count = branch_to.pull(branch_from, overwrite, rev_id)
590
note('%d revision(s) pulled.' % (count,))
591
592
if verbose:
593
new_rh = branch_to.revision_history()
594
if old_rh != new_rh:
595
# Something changed
596
from bzrlib.log import show_changed_revisions
597
show_changed_revisions(branch_to, old_rh, new_rh,
598
to_file=self.outf)
599
600
601
class cmd_push(Command):
602
"""Update a mirror of this branch.
603
604
The target branch will not have its working tree populated because this
605
is both expensive, and is not supported on remote file systems.
606
607
Some smart servers or protocols *may* put the working tree in place in
608
the future.
609
610
This command only works on branches that have not diverged. Branches are
611
considered diverged if the destination branch's most recent commit is one
612
that has not been merged (directly or indirectly) by the source branch.
613
614
If branches have diverged, you can use 'bzr push --overwrite' to replace
615
the other branch completely, discarding its unmerged changes.
616
617
If you want to ensure you have the different changes in the other branch,
618
do a merge (see bzr help merge) from the other branch, and commit that.
619
After that you will be able to do a push without '--overwrite'.
620
621
If there is no default push location set, the first push will set it.
622
After that, you can omit the location to use the default. To change the
623
default, use --remember. The value will only be saved if the remote
624
location can be accessed.
625
"""
626
627
takes_options = ['remember', 'overwrite', 'verbose',
628
Option('create-prefix',
629
help='Create the path leading up to the branch '
630
'if it does not already exist')]
631
takes_args = ['location?']
632
encoding_type = 'replace'
633
634
def run(self, location=None, remember=False, overwrite=False,
635
create_prefix=False, verbose=False):
636
# FIXME: Way too big! Put this into a function called from the
637
# command.
638
639
br_from = Branch.open_containing('.')[0]
640
stored_loc = br_from.get_push_location()
641
if location is None:
642
if stored_loc is None:
643
raise errors.BzrCommandError("No push location known or specified.")
644
else:
645
display_url = urlutils.unescape_for_display(stored_loc,
646
self.outf.encoding)
647
self.outf.write("Using saved location: %s\n" % display_url)
648
location = stored_loc
649
650
to_transport = transport.get_transport(location)
651
location_url = to_transport.base
652
653
old_rh = []
654
try:
655
dir_to = bzrdir.BzrDir.open(location_url)
656
br_to = dir_to.open_branch()
657
except errors.NotBranchError:
658
# create a branch.
659
to_transport = to_transport.clone('..')
660
if not create_prefix:
661
try:
662
relurl = to_transport.relpath(location_url)
663
mutter('creating directory %s => %s', location_url, relurl)
664
to_transport.mkdir(relurl)
665
except errors.NoSuchFile:
666
raise errors.BzrCommandError("Parent directory of %s "
667
"does not exist." % location)
668
else:
669
current = to_transport.base
670
needed = [(to_transport, to_transport.relpath(location_url))]
671
while needed:
672
try:
673
to_transport, relpath = needed[-1]
674
to_transport.mkdir(relpath)
675
needed.pop()
676
except errors.NoSuchFile:
677
new_transport = to_transport.clone('..')
678
needed.append((new_transport,
679
new_transport.relpath(to_transport.base)))
680
if new_transport.base == to_transport.base:
681
raise errors.BzrCommandError("Could not create "
682
"path prefix.")
683
dir_to = br_from.bzrdir.clone(location_url,
684
revision_id=br_from.last_revision())
685
br_to = dir_to.open_branch()
686
count = br_to.last_revision_info()[0]
687
# We successfully created the target, remember it
688
if br_from.get_push_location() is None or remember:
689
br_from.set_push_location(br_to.base)
690
else:
691
# We were able to connect to the remote location, so remember it
692
# we don't need to successfully push because of possible divergence.
693
if br_from.get_push_location() is None or remember:
694
br_from.set_push_location(br_to.base)
695
old_rh = br_to.revision_history()
696
try:
697
try:
698
tree_to = dir_to.open_workingtree()
699
except errors.NotLocalUrl:
700
warning('This transport does not update the working '
701
'tree of: %s' % (br_to.base,))
702
count = br_from.push(br_to, overwrite)
703
except errors.NoWorkingTree:
704
count = br_from.push(br_to, overwrite)
705
else:
706
tree_to.lock_write()
707
try:
708
count = br_from.push(tree_to.branch, overwrite)
709
tree_to.update()
710
finally:
711
tree_to.unlock()
712
except errors.DivergedBranches:
713
raise errors.BzrCommandError('These branches have diverged.'
714
' Try using "merge" and then "push".')
715
note('%d revision(s) pushed.' % (count,))
716
717
if verbose:
718
new_rh = br_to.revision_history()
719
if old_rh != new_rh:
720
# Something changed
721
from bzrlib.log import show_changed_revisions
722
show_changed_revisions(br_to, old_rh, new_rh,
723
to_file=self.outf)
724
725
726
class cmd_branch(Command):
727
"""Create a new copy of a branch.
728
729
If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will
730
be used. In other words, "branch ../foo/bar" will attempt to create ./bar.
731
732
To retrieve the branch as of a particular revision, supply the --revision
733
parameter, as in "branch foo/bar -r 5".
734
735
--basis is to speed up branching from remote branches. When specified, it
736
copies all the file-contents, inventory and revision data from the basis
737
branch before copying anything from the remote branch.
738
"""
739
takes_args = ['from_location', 'to_location?']
740
takes_options = ['revision', 'basis']
741
aliases = ['get', 'clone']
742
743
def run(self, from_location, to_location=None, revision=None, basis=None):
744
if revision is None:
745
revision = [None]
746
elif len(revision) > 1:
747
raise errors.BzrCommandError(
748
'bzr branch --revision takes exactly 1 revision value')
749
try:
750
br_from = Branch.open(from_location)
751
except OSError, e:
752
if e.errno == errno.ENOENT:
753
raise errors.BzrCommandError('Source location "%s" does not'
754
' exist.' % to_location)
755
else:
756
raise
757
br_from.lock_read()
758
try:
759
if basis is not None:
760
basis_dir = bzrdir.BzrDir.open_containing(basis)[0]
761
else:
762
basis_dir = None
763
if len(revision) == 1 and revision[0] is not None:
764
revision_id = revision[0].in_history(br_from)[1]
765
else:
766
# FIXME - wt.last_revision, fallback to branch, fall back to
767
# None or perhaps NULL_REVISION to mean copy nothing
768
# RBC 20060209
769
revision_id = br_from.last_revision()
770
if to_location is None:
771
to_location = os.path.basename(from_location.rstrip("/\\"))
772
name = None
773
else:
774
name = os.path.basename(to_location) + '\n'
775
776
to_transport = transport.get_transport(to_location)
777
try:
778
to_transport.mkdir('.')
779
except errors.FileExists:
780
raise errors.BzrCommandError('Target directory "%s" already'
781
' exists.' % to_location)
782
except errors.NoSuchFile:
783
raise errors.BzrCommandError('Parent of "%s" does not exist.'
784
% to_location)
785
try:
786
# preserve whatever source format we have.
787
dir = br_from.bzrdir.sprout(to_transport.base,
788
revision_id, basis_dir)
789
branch = dir.open_branch()
790
except errors.NoSuchRevision:
791
to_transport.delete_tree('.')
792
msg = "The branch %s has no revision %s." % (from_location, revision[0])
793
raise errors.BzrCommandError(msg)
794
except errors.UnlistableBranch:
795
osutils.rmtree(to_location)
796
msg = "The branch %s cannot be used as a --basis" % (basis,)
797
raise errors.BzrCommandError(msg)
798
if name:
799
branch.control_files.put_utf8('branch-name', name)
800
note('Branched %d revision(s).' % branch.revno())
801
finally:
802
br_from.unlock()
803
804
805
class cmd_checkout(Command):
806
"""Create a new checkout of an existing branch.
807
808
If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree for
809
the branch found in '.'. This is useful if you have removed the working tree
810
or if it was never created - i.e. if you pushed the branch to its current
811
location using SFTP.
812
813
If the TO_LOCATION is omitted, the last component of the BRANCH_LOCATION will
814
be used. In other words, "checkout ../foo/bar" will attempt to create ./bar.
815
816
To retrieve the branch as of a particular revision, supply the --revision
817
parameter, as in "checkout foo/bar -r 5". Note that this will be immediately
818
out of date [so you cannot commit] but it may be useful (i.e. to examine old
819
code.)
820
821
--basis is to speed up checking out from remote branches. When specified, it
822
uses the inventory and file contents from the basis branch in preference to the
823
branch being checked out.
824
"""
825
takes_args = ['branch_location?', 'to_location?']
826
takes_options = ['revision', # , 'basis']
827
Option('lightweight',
828
help="perform a lightweight checkout. Lightweight "
829
"checkouts depend on access to the branch for "
830
"every operation. Normal checkouts can perform "
831
"common operations like diff and status without "
832
"such access, and also support local commits."
833
),
834
]
835
aliases = ['co']
836
837
def run(self, branch_location=None, to_location=None, revision=None, basis=None,
838
lightweight=False):
839
if revision is None:
840
revision = [None]
841
elif len(revision) > 1:
842
raise errors.BzrCommandError(
843
'bzr checkout --revision takes exactly 1 revision value')
844
if branch_location is None:
845
branch_location = osutils.getcwd()
846
to_location = branch_location
847
source = Branch.open(branch_location)
848
if len(revision) == 1 and revision[0] is not None:
849
revision_id = revision[0].in_history(source)[1]
850
else:
851
revision_id = None
852
if to_location is None:
853
to_location = os.path.basename(branch_location.rstrip("/\\"))
854
# if the source and to_location are the same,
855
# and there is no working tree,
856
# then reconstitute a branch
857
if (osutils.abspath(to_location) ==
858
osutils.abspath(branch_location)):
859
try:
860
source.bzrdir.open_workingtree()
861
except errors.NoWorkingTree:
862
source.bzrdir.create_workingtree()
863
return
864
try:
865
os.mkdir(to_location)
866
except OSError, e:
867
if e.errno == errno.EEXIST:
868
raise errors.BzrCommandError('Target directory "%s" already'
869
' exists.' % to_location)
870
if e.errno == errno.ENOENT:
871
raise errors.BzrCommandError('Parent of "%s" does not exist.'
872
% to_location)
873
else:
874
raise
875
source.create_checkout(to_location, revision_id, lightweight)
876
877
878
class cmd_renames(Command):
879
"""Show list of renamed files.
880
"""
881
# TODO: Option to show renames between two historical versions.
882
883
# TODO: Only show renames under dir, rather than in the whole branch.
884
takes_args = ['dir?']
885
886
@display_command
887
def run(self, dir=u'.'):
888
tree = WorkingTree.open_containing(dir)[0]
889
old_inv = tree.basis_tree().inventory
890
new_inv = tree.read_working_inventory()
891
renames = list(_mod_tree.find_renames(old_inv, new_inv))
892
renames.sort()
893
for old_name, new_name in renames:
894
self.outf.write("%s => %s\n" % (old_name, new_name))
895
896
897
class cmd_update(Command):
898
"""Update a tree to have the latest code committed to its branch.
899
900
This will perform a merge into the working tree, and may generate
901
conflicts. If you have any local changes, you will still
902
need to commit them after the update for the update to be complete.
903
904
If you want to discard your local changes, you can just do a
905
'bzr revert' instead of 'bzr commit' after the update.
906
"""
907
takes_args = ['dir?']
908
aliases = ['up']
909
910
def run(self, dir='.'):
911
tree = WorkingTree.open_containing(dir)[0]
912
master = tree.branch.get_master_branch()
913
if master is not None:
914
tree.lock_write()
915
else:
916
tree.lock_tree_write()
917
try:
918
existing_pending_merges = tree.get_parent_ids()[1:]
919
last_rev = tree.last_revision()
920
if last_rev == tree.branch.last_revision():
921
# may be up to date, check master too.
922
master = tree.branch.get_master_branch()
923
if master is None or last_rev == master.last_revision():
924
revno = tree.branch.revision_id_to_revno(last_rev)
925
note("Tree is up to date at revision %d." % (revno,))
926
return 0
927
conflicts = tree.update()
928
revno = tree.branch.revision_id_to_revno(tree.last_revision())
929
note('Updated to revision %d.' % (revno,))
930
if tree.get_parent_ids()[1:] != existing_pending_merges:
931
note('Your local commits will now show as pending merges with '
932
"'bzr status', and can be committed with 'bzr commit'.")
933
if conflicts != 0:
934
return 1
935
else:
936
return 0
937
finally:
938
tree.unlock()
939
940
941
class cmd_info(Command):
942
"""Show information about a working tree, branch or repository.
943
944
This command will show all known locations and formats associated to the
945
tree, branch or repository. Statistical information is included with
946
each report.
947
948
Branches and working trees will also report any missing revisions.
949
"""
950
takes_args = ['location?']
951
takes_options = ['verbose']
952
953
@display_command
954
def run(self, location=None, verbose=False):
955
from bzrlib.info import show_bzrdir_info
956
show_bzrdir_info(bzrdir.BzrDir.open_containing(location)[0],
957
verbose=verbose)
958
959
960
class cmd_remove(Command):
961
"""Make a file unversioned.
962
963
This makes bzr stop tracking changes to a versioned file. It does
964
not delete the working copy.
965
966
You can specify one or more files, and/or --new. If you specify --new,
967
only 'added' files will be removed. If you specify both, then new files
968
in the specified directories will be removed. If the directories are
969
also new, they will also be removed.
970
"""
971
takes_args = ['file*']
972
takes_options = ['verbose', Option('new', help='remove newly-added files')]
973
aliases = ['rm']
974
encoding_type = 'replace'
975
976
def run(self, file_list, verbose=False, new=False):
977
tree, file_list = tree_files(file_list)
978
if new is False:
979
if file_list is None:
980
raise errors.BzrCommandError('Specify one or more files to'
981
' remove, or use --new.')
982
else:
983
added = tree.changes_from(tree.basis_tree(),
984
specific_files=file_list).added
985
file_list = sorted([f[0] for f in added], reverse=True)
986
if len(file_list) == 0:
987
raise errors.BzrCommandError('No matching files.')
988
tree.remove(file_list, verbose=verbose, to_file=self.outf)
989
990
991
class cmd_file_id(Command):
992
"""Print file_id of a particular file or directory.
993
994
The file_id is assigned when the file is first added and remains the
995
same through all revisions where the file exists, even when it is
996
moved or renamed.
997
"""
998
999
hidden = True
1000
takes_args = ['filename']
1001
1002
@display_command
1003
def run(self, filename):
1004
tree, relpath = WorkingTree.open_containing(filename)
1005
i = tree.inventory.path2id(relpath)
1006
if i is None:
1007
raise errors.NotVersionedError(filename)
1008
else:
1009
self.outf.write(i + '\n')
1010
1011
1012
class cmd_file_path(Command):
1013
"""Print path of file_ids to a file or directory.
1014
1015
This prints one line for each directory down to the target,
1016
starting at the branch root.
1017
"""
1018
1019
hidden = True
1020
takes_args = ['filename']
1021
1022
@display_command
1023
def run(self, filename):
1024
tree, relpath = WorkingTree.open_containing(filename)
1025
inv = tree.inventory
1026
fid = inv.path2id(relpath)
1027
if fid is None:
1028
raise errors.NotVersionedError(filename)
1029
for fip in inv.get_idpath(fid):
1030
self.outf.write(fip + '\n')
1031
1032
1033
class cmd_reconcile(Command):
1034
"""Reconcile bzr metadata in a branch.
1035
1036
This can correct data mismatches that may have been caused by
1037
previous ghost operations or bzr upgrades. You should only
1038
need to run this command if 'bzr check' or a bzr developer
1039
advises you to run it.
1040
1041
If a second branch is provided, cross-branch reconciliation is
1042
also attempted, which will check that data like the tree root
1043
id which was not present in very early bzr versions is represented
1044
correctly in both branches.
1045
1046
At the same time it is run it may recompress data resulting in
1047
a potential saving in disk space or performance gain.
1048
1049
The branch *MUST* be on a listable system such as local disk or sftp.
1050
"""
1051
takes_args = ['branch?']
1052
1053
def run(self, branch="."):
1054
from bzrlib.reconcile import reconcile
1055
dir = bzrdir.BzrDir.open(branch)
1056
reconcile(dir)
1057
1058
1059
class cmd_revision_history(Command):
1060
"""Display the list of revision ids on a branch."""
1061
takes_args = ['location?']
1062
1063
hidden = True
1064
1065
@display_command
1066
def run(self, location="."):
1067
branch = Branch.open_containing(location)[0]
1068
for revid in branch.revision_history():
1069
self.outf.write(revid)
1070
self.outf.write('\n')
1071
1072
1073
class cmd_ancestry(Command):
1074
"""List all revisions merged into this branch."""
1075
takes_args = ['location?']
1076
1077
hidden = True
1078
1079
@display_command
1080
def run(self, location="."):
1081
try:
1082
wt = WorkingTree.open_containing(location)[0]
1083
except errors.NoWorkingTree:
1084
b = Branch.open(location)
1085
last_revision = b.last_revision()
1086
else:
1087
b = wt.branch
1088
last_revision = wt.last_revision()
1089
1090
revision_ids = b.repository.get_ancestry(last_revision)
1091
assert revision_ids[0] is None
1092
revision_ids.pop(0)
1093
for revision_id in revision_ids:
1094
self.outf.write(revision_id + '\n')
1095
1096
1097
class cmd_init(Command):
1098
"""Make a directory into a versioned branch.
1099
1100
Use this to create an empty branch, or before importing an
1101
existing project.
1102
1103
If there is a repository in a parent directory of the location, then
1104
the history of the branch will be stored in the repository. Otherwise
1105
init creates a standalone branch which carries its own history in
1106
.bzr.
1107
1108
If there is already a branch at the location but it has no working tree,
1109
the tree can be populated with 'bzr checkout'.
1110
1111
Recipe for importing a tree of files:
1112
cd ~/project
1113
bzr init
1114
bzr add .
1115
bzr status
1116
bzr commit -m 'imported project'
1117
"""
1118
takes_args = ['location?']
1119
takes_options = [
1120
RegistryOption('format',
1121
help='Specify a format for this branch. Current'
1122
' formats are: default, knit, metaweave and'
1123
' weave. Default is knit; metaweave and'
1124
' weave are deprecated',
1125
converter=bzrdir.format_registry.make_bzrdir,
1126
registry=bzrdir.format_registry,
1127
value_switches=True),
1128
]
1129
def run(self, location=None, format=None):
1130
if format is None:
1131
format = bzrdir.format_registry.make_bzrdir('default')
1132
if location is None:
1133
location = u'.'
1134
1135
to_transport = transport.get_transport(location)
1136
1137
# The path has to exist to initialize a
1138
# branch inside of it.
1139
# Just using os.mkdir, since I don't
1140
# believe that we want to create a bunch of
1141
# locations if the user supplies an extended path
1142
# TODO: create-prefix
1143
try:
1144
to_transport.mkdir('.')
1145
except errors.FileExists:
1146
pass
1147
1148
try:
1149
existing_bzrdir = bzrdir.BzrDir.open(location)
1150
except errors.NotBranchError:
1151
# really a NotBzrDir error...
1152
bzrdir.BzrDir.create_branch_convenience(location, format=format)
1153
else:
1154
from bzrlib.transport.local import LocalTransport
1155
if existing_bzrdir.has_branch():
1156
if (isinstance(to_transport, LocalTransport)
1157
and not existing_bzrdir.has_workingtree()):
1158
raise errors.BranchExistsWithoutWorkingTree(location)
1159
raise errors.AlreadyBranchError(location)
1160
else:
1161
existing_bzrdir.create_branch()
1162
existing_bzrdir.create_workingtree()
1163
1164
1165
class cmd_init_repository(Command):
1166
"""Create a shared repository to hold branches.
1167
1168
New branches created under the repository directory will store their revisions
1169
in the repository, not in the branch directory, if the branch format supports
1170
shared storage.
1171
1172
example:
1173
bzr init-repo repo
1174
bzr init repo/trunk
1175
bzr checkout --lightweight repo/trunk trunk-checkout
1176
cd trunk-checkout
1177
(add files here)
1178
"""
1179
takes_args = ["location"]
1180
takes_options = [RegistryOption('format',
1181
help='Specify a format for this repository.'
1182
' Current formats are: default, knit,'
1183
' metaweave and weave. Default is knit;'
1184
' metaweave and weave are deprecated',
1185
registry=bzrdir.format_registry,
1186
converter=bzrdir.format_registry.make_bzrdir,
1187
value_switches=True),
1188
Option('trees',
1189
help='Allows branches in repository to have'
1190
' a working tree')]
1191
aliases = ["init-repo"]
1192
def run(self, location, format=None, trees=False):
1193
if format is None:
1194
format = bzrdir.format_registry.make_bzrdir('default')
1195
1196
if location is None:
1197
location = '.'
1198
1199
to_transport = transport.get_transport(location)
1200
try:
1201
to_transport.mkdir('.')
1202
except errors.FileExists:
1203
pass
1204
1205
newdir = format.initialize_on_transport(to_transport)
1206
repo = newdir.create_repository(shared=True)
1207
repo.set_make_working_trees(trees)
1208
1209
1210
class cmd_diff(Command):
1211
"""Show differences in the working tree or between revisions.
1212
1213
If files are listed, only the changes in those files are listed.
1214
Otherwise, all changes for the tree are listed.
1215
1216
"bzr diff -p1" is equivalent to "bzr diff --prefix old/:new/", and
1217
produces patches suitable for "patch -p1".
1218
1219
examples:
1220
bzr diff
1221
Shows the difference in the working tree versus the last commit
1222
bzr diff -r1
1223
Difference between the working tree and revision 1
1224
bzr diff -r1..2
1225
Difference between revision 2 and revision 1
1226
bzr diff --diff-prefix old/:new/
1227
Same as 'bzr diff' but prefix paths with old/ and new/
1228
bzr diff bzr.mine bzr.dev
1229
Show the differences between the two working trees
1230
bzr diff foo.c
1231
Show just the differences for 'foo.c'
1232
"""
1233
# TODO: Option to use external diff command; could be GNU diff, wdiff,
1234
# or a graphical diff.
1235
1236
# TODO: Python difflib is not exactly the same as unidiff; should
1237
# either fix it up or prefer to use an external diff.
1238
1239
# TODO: Selected-file diff is inefficient and doesn't show you
1240
# deleted files.
1241
1242
# TODO: This probably handles non-Unix newlines poorly.
1243
1244
takes_args = ['file*']
1245
takes_options = ['revision', 'diff-options',
1246
Option('prefix', type=str,
1247
short_name='p',
1248
help='Set prefixes to added to old and new filenames, as '
1249
'two values separated by a colon.'),
1250
]
1251
aliases = ['di', 'dif']
1252
encoding_type = 'exact'
1253
1254
@display_command
1255
def run(self, revision=None, file_list=None, diff_options=None,
1256
prefix=None):
1257
from bzrlib.diff import diff_cmd_helper, show_diff_trees
1258
1259
if (prefix is None) or (prefix == '0'):
1260
# diff -p0 format
1261
old_label = ''
1262
new_label = ''
1263
elif prefix == '1':
1264
old_label = 'old/'
1265
new_label = 'new/'
1266
elif ':' in prefix:
1267
old_label, new_label = prefix.split(":")
1268
else:
1269
raise BzrCommandError(
1270
"--prefix expects two values separated by a colon")
1271
1272
if revision and len(revision) > 2:
1273
raise errors.BzrCommandError('bzr diff --revision takes exactly'
1274
' one or two revision specifiers')
1275
1276
try:
1277
tree1, file_list = internal_tree_files(file_list)
1278
tree2 = None
1279
b = None
1280
b2 = None
1281
except errors.FileInWrongBranch:
1282
if len(file_list) != 2:
1283
raise errors.BzrCommandError("Files are in different branches")
1284
1285
tree1, file1 = WorkingTree.open_containing(file_list[0])
1286
tree2, file2 = WorkingTree.open_containing(file_list[1])
1287
if file1 != "" or file2 != "":
1288
# FIXME diff those two files. rbc 20051123
1289
raise errors.BzrCommandError("Files are in different branches")
1290
file_list = None
1291
except errors.NotBranchError:
1292
if (revision is not None and len(revision) == 2
1293
and not revision[0].needs_branch()
1294
and not revision[1].needs_branch()):
1295
# If both revision specs include a branch, we can
1296
# diff them without needing a local working tree
1297
tree1, tree2 = None, None
1298
else:
1299
raise
1300
1301
if tree2 is not None:
1302
if revision is not None:
1303
# FIXME: but there should be a clean way to diff between
1304
# non-default versions of two trees, it's not hard to do
1305
# internally...
1306
raise errors.BzrCommandError(
1307
"Sorry, diffing arbitrary revisions across branches "
1308
"is not implemented yet")
1309
return show_diff_trees(tree1, tree2, sys.stdout,
1310
specific_files=file_list,
1311
external_diff_options=diff_options,
1312
old_label=old_label, new_label=new_label)
1313
1314
return diff_cmd_helper(tree1, file_list, diff_options,
1315
revision_specs=revision,
1316
old_label=old_label, new_label=new_label)
1317
1318
1319
class cmd_deleted(Command):
1320
"""List files deleted in the working tree.
1321
"""
1322
# TODO: Show files deleted since a previous revision, or
1323
# between two revisions.
1324
# TODO: Much more efficient way to do this: read in new
1325
# directories with readdir, rather than stating each one. Same
1326
# level of effort but possibly much less IO. (Or possibly not,
1327
# if the directories are very large...)
1328
takes_options = ['show-ids']
1329
1330
@display_command
1331
def run(self, show_ids=False):
1332
tree = WorkingTree.open_containing(u'.')[0]
1333
old = tree.basis_tree()
1334
for path, ie in old.inventory.iter_entries():
1335
if not tree.has_id(ie.file_id):
1336
self.outf.write(path)
1337
if show_ids:
1338
self.outf.write(' ')
1339
self.outf.write(ie.file_id)
1340
self.outf.write('\n')
1341
1342
1343
class cmd_modified(Command):
1344
"""List files modified in working tree."""
1345
hidden = True
1346
@display_command
1347
def run(self):
1348
tree = WorkingTree.open_containing(u'.')[0]
1349
td = tree.changes_from(tree.basis_tree())
1350
for path, id, kind, text_modified, meta_modified in td.modified:
1351
self.outf.write(path + '\n')
1352
1353
1354
class cmd_added(Command):
1355
"""List files added in working tree."""
1356
hidden = True
1357
@display_command
1358
def run(self):
1359
wt = WorkingTree.open_containing(u'.')[0]
1360
basis_inv = wt.basis_tree().inventory
1361
inv = wt.inventory
1362
for file_id in inv:
1363
if file_id in basis_inv:
1364
continue
1365
if inv.is_root(file_id) and len(basis_inv) == 0:
1366
continue
1367
path = inv.id2path(file_id)
1368
if not os.access(osutils.abspath(path), os.F_OK):
1369
continue
1370
self.outf.write(path + '\n')
1371
1372
1373
class cmd_root(Command):
1374
"""Show the tree root directory.
1375
1376
The root is the nearest enclosing directory with a .bzr control
1377
directory."""
1378
takes_args = ['filename?']
1379
@display_command
1380
def run(self, filename=None):
1381
"""Print the branch root."""
1382
tree = WorkingTree.open_containing(filename)[0]
1383
self.outf.write(tree.basedir + '\n')
1384
1385
1386
class cmd_log(Command):
1387
"""Show log of a branch, file, or directory.
1388
1389
By default show the log of the branch containing the working directory.
1390
1391
To request a range of logs, you can use the command -r begin..end
1392
-r revision requests a specific revision, -r ..end or -r begin.. are
1393
also valid.
1394
1395
examples:
1396
bzr log
1397
bzr log foo.c
1398
bzr log -r -10.. http://server/branch
1399
"""
1400
1401
# TODO: Make --revision support uuid: and hash: [future tag:] notation.
1402
1403
takes_args = ['location?']
1404
takes_options = [Option('forward',
1405
help='show from oldest to newest'),
1406
'timezone',
1407
Option('verbose',
1408
short_name='v',
1409
help='show files changed in each revision'),
1410
'show-ids', 'revision',
1411
'log-format',
1412
Option('message',
1413
short_name='m',
1414
help='show revisions whose message matches this regexp',
1415
type=str),
1416
]
1417
encoding_type = 'replace'
1418
1419
@display_command
1420
def run(self, location=None, timezone='original',
1421
verbose=False,
1422
show_ids=False,
1423
forward=False,
1424
revision=None,
1425
log_format=None,
1426
message=None):
1427
from bzrlib.log import show_log
1428
assert message is None or isinstance(message, basestring), \
1429
"invalid message argument %r" % message
1430
direction = (forward and 'forward') or 'reverse'
1431
1432
# log everything
1433
file_id = None
1434
if location:
1435
# find the file id to log:
1436
1437
dir, fp = bzrdir.BzrDir.open_containing(location)
1438
b = dir.open_branch()
1439
if fp != '':
1440
try:
1441
# might be a tree:
1442
inv = dir.open_workingtree().inventory
1443
except (errors.NotBranchError, errors.NotLocalUrl):
1444
# either no tree, or is remote.
1445
inv = b.basis_tree().inventory
1446
file_id = inv.path2id(fp)
1447
if file_id is None:
1448
raise errors.BzrCommandError(
1449
"Path does not have any revision history: %s" %
1450
location)
1451
else:
1452
# local dir only
1453
# FIXME ? log the current subdir only RBC 20060203
1454
if revision is not None \
1455
and len(revision) > 0 and revision[0].get_branch():
1456
location = revision[0].get_branch()
1457
else:
1458
location = '.'
1459
dir, relpath = bzrdir.BzrDir.open_containing(location)
1460
b = dir.open_branch()
1461
1462
if revision is None:
1463
rev1 = None
1464
rev2 = None
1465
elif len(revision) == 1:
1466
rev1 = rev2 = revision[0].in_history(b).revno
1467
elif len(revision) == 2:
1468
if revision[1].get_branch() != revision[0].get_branch():
1469
# b is taken from revision[0].get_branch(), and
1470
# show_log will use its revision_history. Having
1471
# different branches will lead to weird behaviors.
1472
raise errors.BzrCommandError(
1473
"Log doesn't accept two revisions in different branches.")
1474
if revision[0].spec is None:
1475
# missing begin-range means first revision
1476
rev1 = 1
1477
else:
1478
rev1 = revision[0].in_history(b).revno
1479
1480
if revision[1].spec is None:
1481
# missing end-range means last known revision
1482
rev2 = b.revno()
1483
else:
1484
rev2 = revision[1].in_history(b).revno
1485
else:
1486
raise errors.BzrCommandError('bzr log --revision takes one or two values.')
1487
1488
# By this point, the revision numbers are converted to the +ve
1489
# form if they were supplied in the -ve form, so we can do
1490
# this comparison in relative safety
1491
if rev1 > rev2:
1492
(rev2, rev1) = (rev1, rev2)
1493
1494
if log_format is None:
1495
log_format = log.log_formatter_registry.get_default(b)
1496
1497
lf = log_format(show_ids=show_ids, to_file=self.outf,
1498
show_timezone=timezone)
1499
1500
show_log(b,
1501
lf,
1502
file_id,
1503
verbose=verbose,
1504
direction=direction,
1505
start_revision=rev1,
1506
end_revision=rev2,
1507
search=message)
1508
1509
1510
def get_log_format(long=False, short=False, line=False, default='long'):
1511
log_format = default
1512
if long:
1513
log_format = 'long'
1514
if short:
1515
log_format = 'short'
1516
if line:
1517
log_format = 'line'
1518
return log_format
1519
1520
1521
class cmd_touching_revisions(Command):
1522
"""Return revision-ids which affected a particular file.
1523
1524
A more user-friendly interface is "bzr log FILE".
1525
"""
1526
1527
hidden = True
1528
takes_args = ["filename"]
1529
1530
@display_command
1531
def run(self, filename):
1532
tree, relpath = WorkingTree.open_containing(filename)
1533
b = tree.branch
1534
inv = tree.read_working_inventory()
1535
file_id = inv.path2id(relpath)
1536
for revno, revision_id, what in log.find_touching_revisions(b, file_id):
1537
self.outf.write("%6d %s\n" % (revno, what))
1538
1539
1540
class cmd_ls(Command):
1541
"""List files in a tree.
1542
"""
1543
1544
takes_args = ['path?']
1545
# TODO: Take a revision or remote path and list that tree instead.
1546
takes_options = ['verbose', 'revision',
1547
Option('non-recursive',
1548
help='don\'t recurse into sub-directories'),
1549
Option('from-root',
1550
help='Print all paths from the root of the branch.'),
1551
Option('unknown', help='Print unknown files'),
1552
Option('versioned', help='Print versioned files'),
1553
Option('ignored', help='Print ignored files'),
1554
1555
Option('null', help='Null separate the files'),
1556
'kind', 'show-ids'
1557
]
1558
@display_command
1559
def run(self, revision=None, verbose=False,
1560
non_recursive=False, from_root=False,
1561
unknown=False, versioned=False, ignored=False,
1562
null=False, kind=None, show_ids=False, path=None):
1563
1564
if kind and kind not in ('file', 'directory', 'symlink'):
1565
raise errors.BzrCommandError('invalid kind specified')
1566
1567
if verbose and null:
1568
raise errors.BzrCommandError('Cannot set both --verbose and --null')
1569
all = not (unknown or versioned or ignored)
1570
1571
selection = {'I':ignored, '?':unknown, 'V':versioned}
1572
1573
if path is None:
1574
fs_path = '.'
1575
prefix = ''
1576
else:
1577
if from_root:
1578
raise errors.BzrCommandError('cannot specify both --from-root'
1579
' and PATH')
1580
fs_path = path
1581
prefix = path
1582
tree, branch, relpath = bzrdir.BzrDir.open_containing_tree_or_branch(
1583
fs_path)
1584
if from_root:
1585
relpath = u''
1586
elif relpath:
1587
relpath += '/'
1588
if revision is not None:
1589
tree = branch.repository.revision_tree(
1590
revision[0].in_history(branch).rev_id)
1591
elif tree is None:
1592
tree = branch.basis_tree()
1593
1594
for fp, fc, fkind, fid, entry in tree.list_files(include_root=False):
1595
if fp.startswith(relpath):
1596
fp = osutils.pathjoin(prefix, fp[len(relpath):])
1597
if non_recursive and '/' in fp:
1598
continue
1599
if not all and not selection[fc]:
1600
continue
1601
if kind is not None and fkind != kind:
1602
continue
1603
if verbose:
1604
kindch = entry.kind_character()
1605
outstring = '%-8s %s%s' % (fc, fp, kindch)
1606
if show_ids and fid is not None:
1607
outstring = "%-50s %s" % (outstring, fid)
1608
self.outf.write(outstring + '\n')
1609
elif null:
1610
self.outf.write(fp + '\0')
1611
if show_ids:
1612
if fid is not None:
1613
self.outf.write(fid)
1614
self.outf.write('\0')
1615
self.outf.flush()
1616
else:
1617
if fid is not None:
1618
my_id = fid
1619
else:
1620
my_id = ''
1621
if show_ids:
1622
self.outf.write('%-50s %s\n' % (fp, my_id))
1623
else:
1624
self.outf.write(fp + '\n')
1625
1626
1627
class cmd_unknowns(Command):
1628
"""List unknown files."""
1629
@display_command
1630
def run(self):
1631
for f in WorkingTree.open_containing(u'.')[0].unknowns():
1632
self.outf.write(osutils.quotefn(f) + '\n')
1633
1634
1635
class cmd_ignore(Command):
1636
"""Ignore specified files or patterns.
1637
1638
To remove patterns from the ignore list, edit the .bzrignore file.
1639
1640
Trailing slashes on patterns are ignored.
1641
If the pattern contains a slash or is a regular expression, it is compared
1642
to the whole path from the branch root. Otherwise, it is compared to only
1643
the last component of the path. To match a file only in the root
1644
directory, prepend './'.
1645
1646
Ignore patterns specifying absolute paths are not allowed.
1647
1648
Ignore patterns may include globbing wildcards such as:
1649
? - Matches any single character except '/'
1650
* - Matches 0 or more characters except '/'
1651
/**/ - Matches 0 or more directories in a path
1652
[a-z] - Matches a single character from within a group of characters
1653
1654
Ignore patterns may also be Python regular expressions.
1655
Regular expression ignore patterns are identified by a 'RE:' prefix
1656
followed by the regular expression. Regular expression ignore patterns
1657
may not include named or numbered groups.
1658
1659
Note: ignore patterns containing shell wildcards must be quoted from
1660
the shell on Unix.
1661
1662
examples:
1663
bzr ignore ./Makefile
1664
bzr ignore '*.class'
1665
bzr ignore 'lib/**/*.o'
1666
bzr ignore 'RE:lib/.*\.o'
1667
"""
1668
takes_args = ['name_pattern*']
1669
takes_options = [
1670
Option('old-default-rules',
1671
help='Out the ignore rules bzr < 0.9 always used.')
1672
]
1673
1674
def run(self, name_pattern_list=None, old_default_rules=None):
1675
from bzrlib.atomicfile import AtomicFile
1676
if old_default_rules is not None:
1677
# dump the rules and exit
1678
for pattern in ignores.OLD_DEFAULTS:
1679
print pattern
1680
return
1681
if not name_pattern_list:
1682
raise errors.BzrCommandError("ignore requires at least one "
1683
"NAME_PATTERN or --old-default-rules")
1684
for name_pattern in name_pattern_list:
1685
if name_pattern[0] == '/':
1686
raise errors.BzrCommandError(
1687
"NAME_PATTERN should not be an absolute path")
1688
tree, relpath = WorkingTree.open_containing(u'.')
1689
ifn = tree.abspath('.bzrignore')
1690
if os.path.exists(ifn):
1691
f = open(ifn, 'rt')
1692
try:
1693
igns = f.read().decode('utf-8')
1694
finally:
1695
f.close()
1696
else:
1697
igns = ''
1698
1699
# TODO: If the file already uses crlf-style termination, maybe
1700
# we should use that for the newly added lines?
1701
1702
if igns and igns[-1] != '\n':
1703
igns += '\n'
1704
for name_pattern in name_pattern_list:
1705
igns += name_pattern.rstrip('/') + '\n'
1706
1707
f = AtomicFile(ifn, 'wb')
1708
try:
1709
f.write(igns.encode('utf-8'))
1710
f.commit()
1711
finally:
1712
f.close()
1713
1714
inv = tree.inventory
1715
if inv.path2id('.bzrignore'):
1716
mutter('.bzrignore is already versioned')
1717
else:
1718
mutter('need to make new .bzrignore file versioned')
1719
tree.add(['.bzrignore'])
1720
1721
1722
class cmd_ignored(Command):
1723
"""List ignored files and the patterns that matched them.
1724
1725
See also: bzr ignore"""
1726
@display_command
1727
def run(self):
1728
tree = WorkingTree.open_containing(u'.')[0]
1729
for path, file_class, kind, file_id, entry in tree.list_files():
1730
if file_class != 'I':
1731
continue
1732
## XXX: Slightly inefficient since this was already calculated
1733
pat = tree.is_ignored(path)
1734
print '%-50s %s' % (path, pat)
1735
1736
1737
class cmd_lookup_revision(Command):
1738
"""Lookup the revision-id from a revision-number
1739
1740
example:
1741
bzr lookup-revision 33
1742
"""
1743
hidden = True
1744
takes_args = ['revno']
1745
1746
@display_command
1747
def run(self, revno):
1748
try:
1749
revno = int(revno)
1750
except ValueError:
1751
raise errors.BzrCommandError("not a valid revision-number: %r" % revno)
1752
1753
print WorkingTree.open_containing(u'.')[0].branch.get_rev_id(revno)
1754
1755
1756
class cmd_export(Command):
1757
"""Export past revision to destination directory.
1758
1759
If no revision is specified this exports the last committed revision.
1760
1761
Format may be an "exporter" name, such as tar, tgz, tbz2. If none is
1762
given, try to find the format with the extension. If no extension
1763
is found exports to a directory (equivalent to --format=dir).
1764
1765
Root may be the top directory for tar, tgz and tbz2 formats. If none
1766
is given, the top directory will be the root name of the file.
1767
1768
If branch is omitted then the branch containing the CWD will be used.
1769
1770
Note: export of tree with non-ascii filenames to zip is not supported.
1771
1772
Supported formats Autodetected by extension
1773
----------------- -------------------------
1774
dir -
1775
tar .tar
1776
tbz2 .tar.bz2, .tbz2
1777
tgz .tar.gz, .tgz
1778
zip .zip
1779
"""
1780
takes_args = ['dest', 'branch?']
1781
takes_options = ['revision', 'format', 'root']
1782
def run(self, dest, branch=None, revision=None, format=None, root=None):
1783
from bzrlib.export import export
1784
1785
if branch is None:
1786
tree = WorkingTree.open_containing(u'.')[0]
1787
b = tree.branch
1788
else:
1789
b = Branch.open(branch)
1790
1791
if revision is None:
1792
# should be tree.last_revision FIXME
1793
rev_id = b.last_revision()
1794
else:
1795
if len(revision) != 1:
1796
raise errors.BzrCommandError('bzr export --revision takes exactly 1 argument')
1797
rev_id = revision[0].in_history(b).rev_id
1798
t = b.repository.revision_tree(rev_id)
1799
try:
1800
export(t, dest, format, root)
1801
except errors.NoSuchExportFormat, e:
1802
raise errors.BzrCommandError('Unsupported export format: %s' % e.format)
1803
1804
1805
class cmd_cat(Command):
1806
"""Write a file's text from a previous revision."""
1807
1808
takes_options = ['revision', 'name-from-revision']
1809
takes_args = ['filename']
1810
encoding_type = 'exact'
1811
1812
@display_command
1813
def run(self, filename, revision=None, name_from_revision=False):
1814
if revision is not None and len(revision) != 1:
1815
raise errors.BzrCommandError("bzr cat --revision takes exactly"
1816
" one number")
1817
1818
tree = None
1819
try:
1820
tree, relpath = WorkingTree.open_containing(filename)
1821
b = tree.branch
1822
except (errors.NotBranchError, errors.NotLocalUrl):
1823
pass
1824
1825
if revision is not None and revision[0].get_branch() is not None:
1826
b = Branch.open(revision[0].get_branch())
1827
if tree is None:
1828
b, relpath = Branch.open_containing(filename)
1829
tree = b.basis_tree()
1830
if revision is None:
1831
revision_id = b.last_revision()
1832
else:
1833
revision_id = revision[0].in_history(b).rev_id
1834
1835
cur_file_id = tree.path2id(relpath)
1836
rev_tree = b.repository.revision_tree(revision_id)
1837
old_file_id = rev_tree.path2id(relpath)
1838
1839
if name_from_revision:
1840
if old_file_id is None:
1841
raise errors.BzrCommandError("%r is not present in revision %s"
1842
% (filename, revision_id))
1843
else:
1844
rev_tree.print_file(old_file_id)
1845
elif cur_file_id is not None:
1846
rev_tree.print_file(cur_file_id)
1847
elif old_file_id is not None:
1848
rev_tree.print_file(old_file_id)
1849
else:
1850
raise errors.BzrCommandError("%r is not present in revision %s" %
1851
(filename, revision_id))
1852
1853
1854
class cmd_local_time_offset(Command):
1855
"""Show the offset in seconds from GMT to local time."""
1856
hidden = True
1857
@display_command
1858
def run(self):
1859
print osutils.local_time_offset()
1860
1861
1862
1863
class cmd_commit(Command):
1864
"""Commit changes into a new revision.
1865
1866
If no arguments are given, the entire tree is committed.
1867
1868
If selected files are specified, only changes to those files are
1869
committed. If a directory is specified then the directory and everything
1870
within it is committed.
1871
1872
A selected-file commit may fail in some cases where the committed
1873
tree would be invalid, such as trying to commit a file in a
1874
newly-added directory that is not itself committed.
1875
"""
1876
# TODO: Run hooks on tree to-be-committed, and after commit.
1877
1878
# TODO: Strict commit that fails if there are deleted files.
1879
# (what does "deleted files" mean ??)
1880
1881
# TODO: Give better message for -s, --summary, used by tla people
1882
1883
# XXX: verbose currently does nothing
1884
1885
takes_args = ['selected*']
1886
takes_options = ['message', 'verbose',
1887
Option('unchanged',
1888
help='commit even if nothing has changed'),
1889
Option('file', type=str,
1890
short_name='F',
1891
argname='msgfile',
1892
help='file containing commit message'),
1893
Option('strict',
1894
help="refuse to commit if there are unknown "
1895
"files in the working tree."),
1896
Option('local',
1897
help="perform a local only commit in a bound "
1898
"branch. Such commits are not pushed to "
1899
"the master branch until a normal commit "
1900
"is performed."
1901
),
1902
]
1903
aliases = ['ci', 'checkin']
1904
1905
def run(self, message=None, file=None, verbose=True, selected_list=None,
1906
unchanged=False, strict=False, local=False):
1907
from bzrlib.commit import (NullCommitReporter, ReportCommitToLog)
1908
from bzrlib.errors import (PointlessCommit, ConflictsInTree,
1909
StrictCommitFailed)
1910
from bzrlib.msgeditor import edit_commit_message, \
1911
make_commit_message_template
1912
1913
# TODO: Need a blackbox test for invoking the external editor; may be
1914
# slightly problematic to run this cross-platform.
1915
1916
# TODO: do more checks that the commit will succeed before
1917
# spending the user's valuable time typing a commit message.
1918
tree, selected_list = tree_files(selected_list)
1919
if selected_list == ['']:
1920
# workaround - commit of root of tree should be exactly the same
1921
# as just default commit in that tree, and succeed even though
1922
# selected-file merge commit is not done yet
1923
selected_list = []
1924
1925
if local and not tree.branch.get_bound_location():
1926
raise errors.LocalRequiresBoundBranch()
1927
1928
def get_message(commit_obj):
1929
"""Callback to get commit message"""
1930
my_message = message
1931
if my_message is None and not file:
1932
template = make_commit_message_template(tree, selected_list)
1933
my_message = edit_commit_message(template)
1934
if my_message is None:
1935
raise errors.BzrCommandError("please specify a commit"
1936
" message with either --message or --file")
1937
elif my_message and file:
1938
raise errors.BzrCommandError(
1939
"please specify either --message or --file")
1940
if file:
1941
my_message = codecs.open(file, 'rt',
1942
bzrlib.user_encoding).read()
1943
if my_message == "":
1944
raise errors.BzrCommandError("empty commit message specified")
1945
return my_message
1946
1947
if verbose:
1948
reporter = ReportCommitToLog()
1949
else:
1950
reporter = NullCommitReporter()
1951
1952
try:
1953
tree.commit(message_callback=get_message,
1954
specific_files=selected_list,
1955
allow_pointless=unchanged, strict=strict, local=local,
1956
reporter=reporter)
1957
except PointlessCommit:
1958
# FIXME: This should really happen before the file is read in;
1959
# perhaps prepare the commit; get the message; then actually commit
1960
raise errors.BzrCommandError("no changes to commit."
1961
" use --unchanged to commit anyhow")
1962
except ConflictsInTree:
1963
raise errors.BzrCommandError('Conflicts detected in working '
1964
'tree. Use "bzr conflicts" to list, "bzr resolve FILE" to'
1965
' resolve.')
1966
except StrictCommitFailed:
1967
raise errors.BzrCommandError("Commit refused because there are"
1968
" unknown files in the working tree.")
1969
except errors.BoundBranchOutOfDate, e:
1970
raise errors.BzrCommandError(str(e) + "\n"
1971
'To commit to master branch, run update and then commit.\n'
1972
'You can also pass --local to commit to continue working '
1973
'disconnected.')
1974
1975
1976
class cmd_check(Command):
1977
"""Validate consistency of branch history.
1978
1979
This command checks various invariants about the branch storage to
1980
detect data corruption or bzr bugs.
1981
"""
1982
takes_args = ['branch?']
1983
takes_options = ['verbose']
1984
1985
def run(self, branch=None, verbose=False):
1986
from bzrlib.check import check
1987
if branch is None:
1988
tree = WorkingTree.open_containing()[0]
1989
branch = tree.branch
1990
else:
1991
branch = Branch.open(branch)
1992
check(branch, verbose)
1993
1994
1995
class cmd_upgrade(Command):
1996
"""Upgrade branch storage to current format.
1997
1998
The check command or bzr developers may sometimes advise you to run
1999
this command. When the default format has changed you may also be warned
2000
during other operations to upgrade.
2001
"""
2002
takes_args = ['url?']
2003
takes_options = [
2004
RegistryOption('format',
2005
help='Upgrade to a specific format. Current formats'
2006
' are: default, knit, metaweave and weave.'
2007
' Default is knit; metaweave and weave are'
2008
' deprecated',
2009
registry=bzrdir.format_registry,
2010
converter=bzrdir.format_registry.make_bzrdir,
2011
value_switches=True),
2012
]
2013
2014
2015
def run(self, url='.', format=None):
2016
from bzrlib.upgrade import upgrade
2017
if format is None:
2018
format = bzrdir.format_registry.make_bzrdir('default')
2019
upgrade(url, format)
2020
2021
2022
class cmd_whoami(Command):
2023
"""Show or set bzr user id.
2024
2025
examples:
2026
bzr whoami --email
2027
bzr whoami 'Frank Chu <fchu@example.com>'
2028
"""
2029
takes_options = [ Option('email',
2030
help='display email address only'),
2031
Option('branch',
2032
help='set identity for the current branch instead of '
2033
'globally'),
2034
]
2035
takes_args = ['name?']
2036
encoding_type = 'replace'
2037
2038
@display_command
2039
def run(self, email=False, branch=False, name=None):
2040
if name is None:
2041
# use branch if we're inside one; otherwise global config
2042
try:
2043
c = Branch.open_containing('.')[0].get_config()
2044
except errors.NotBranchError:
2045
c = config.GlobalConfig()
2046
if email:
2047
self.outf.write(c.user_email() + '\n')
2048
else:
2049
self.outf.write(c.username() + '\n')
2050
return
2051
2052
# display a warning if an email address isn't included in the given name.
2053
try:
2054
config.extract_email_address(name)
2055
except errors.NoEmailInUsername, e:
2056
warning('"%s" does not seem to contain an email address. '
2057
'This is allowed, but not recommended.', name)
2058
2059
# use global config unless --branch given
2060
if branch:
2061
c = Branch.open_containing('.')[0].get_config()
2062
else:
2063
c = config.GlobalConfig()
2064
c.set_user_option('email', name)
2065
2066
2067
class cmd_nick(Command):
2068
"""Print or set the branch nickname.
2069
2070
If unset, the tree root directory name is used as the nickname
2071
To print the current nickname, execute with no argument.
2072
"""
2073
takes_args = ['nickname?']
2074
def run(self, nickname=None):
2075
branch = Branch.open_containing(u'.')[0]
2076
if nickname is None:
2077
self.printme(branch)
2078
else:
2079
branch.nick = nickname
2080
2081
@display_command
2082
def printme(self, branch):
2083
print branch.nick
2084
2085
2086
class cmd_selftest(Command):
2087
"""Run internal test suite.
2088
2089
This creates temporary test directories in the working directory, but not
2090
existing data is affected. These directories are deleted if the tests
2091
pass, or left behind to help in debugging if they fail and --keep-output
2092
is specified.
2093
2094
If arguments are given, they are regular expressions that say which tests
2095
should run. Tests matching any expression are run, and other tests are
2096
not run.
2097
2098
Alternatively if --first is given, matching tests are run first and then
2099
all other tests are run. This is useful if you have been working in a
2100
particular area, but want to make sure nothing else was broken.
2101
2102
If the global option '--no-plugins' is given, plugins are not loaded
2103
before running the selftests. This has two effects: features provided or
2104
modified by plugins will not be tested, and tests provided by plugins will
2105
not be run.
2106
2107
examples::
2108
bzr selftest ignore
2109
run only tests relating to 'ignore'
2110
bzr --no-plugins selftest -v
2111
disable plugins and list tests as they're run
2112
"""
2113
# TODO: --list should give a list of all available tests
2114
2115
# NB: this is used from the class without creating an instance, which is
2116
# why it does not have a self parameter.
2117
def get_transport_type(typestring):
2118
"""Parse and return a transport specifier."""
2119
if typestring == "sftp":
2120
from bzrlib.transport.sftp import SFTPAbsoluteServer
2121
return SFTPAbsoluteServer
2122
if typestring == "memory":
2123
from bzrlib.transport.memory import MemoryServer
2124
return MemoryServer
2125
if typestring == "fakenfs":
2126
from bzrlib.transport.fakenfs import FakeNFSServer
2127
return FakeNFSServer
2128
msg = "No known transport type %s. Supported types are: sftp\n" %\
2129
(typestring)
2130
raise errors.BzrCommandError(msg)
2131
2132
hidden = True
2133
takes_args = ['testspecs*']
2134
takes_options = ['verbose',
2135
Option('one', help='stop when one test fails'),
2136
Option('keep-output',
2137
help='keep output directories when tests fail'),
2138
Option('transport',
2139
help='Use a different transport by default '
2140
'throughout the test suite.',
2141
type=get_transport_type),
2142
Option('benchmark', help='run the bzr bencharks.'),
2143
Option('lsprof-timed',
2144
help='generate lsprof output for benchmarked'
2145
' sections of code.'),
2146
Option('cache-dir', type=str,
2147
help='a directory to cache intermediate'
2148
' benchmark steps'),
2149
Option('clean-output',
2150
help='clean temporary tests directories'
2151
' without running tests'),
2152
Option('first',
2153
help='run all tests, but run specified tests first',
2154
)
2155
]
2156
encoding_type = 'replace'
2157
2158
def run(self, testspecs_list=None, verbose=None, one=False,
2159
keep_output=False, transport=None, benchmark=None,
2160
lsprof_timed=None, cache_dir=None, clean_output=False,
2161
first=False):
2162
import bzrlib.ui
2163
from bzrlib.tests import selftest
2164
import bzrlib.benchmarks as benchmarks
2165
from bzrlib.benchmarks import tree_creator
2166
2167
if clean_output:
2168
from bzrlib.tests import clean_selftest_output
2169
clean_selftest_output()
2170
return 0
2171
2172
if cache_dir is not None:
2173
tree_creator.TreeCreator.CACHE_ROOT = osutils.abspath(cache_dir)
2174
print '%10s: %s' % ('bzr', osutils.realpath(sys.argv[0]))
2175
print '%10s: %s' % ('bzrlib', bzrlib.__path__[0])
2176
print
2177
if testspecs_list is not None:
2178
pattern = '|'.join(testspecs_list)
2179
else:
2180
pattern = ".*"
2181
if benchmark:
2182
test_suite_factory = benchmarks.test_suite
2183
if verbose is None:
2184
verbose = True
2185
# TODO: should possibly lock the history file...
2186
benchfile = open(".perf_history", "at", buffering=1)
2187
else:
2188
test_suite_factory = None
2189
if verbose is None:
2190
verbose = False
2191
benchfile = None
2192
try:
2193
result = selftest(verbose=verbose,
2194
pattern=pattern,
2195
stop_on_failure=one,
2196
keep_output=keep_output,
2197
transport=transport,
2198
test_suite_factory=test_suite_factory,
2199
lsprof_timed=lsprof_timed,
2200
bench_history=benchfile,
2201
matching_tests_first=first,
2202
)
2203
finally:
2204
if benchfile is not None:
2205
benchfile.close()
2206
if result:
2207
info('tests passed')
2208
else:
2209
info('tests failed')
2210
return int(not result)
2211
2212
2213
class cmd_version(Command):
2214
"""Show version of bzr."""
2215
2216
@display_command
2217
def run(self):
2218
from bzrlib.version import show_version
2219
show_version()
2220
2221
2222
class cmd_rocks(Command):
2223
"""Statement of optimism."""
2224
2225
hidden = True
2226
2227
@display_command
2228
def run(self):
2229
print "it sure does!"
2230
2231
2232
class cmd_find_merge_base(Command):
2233
"""Find and print a base revision for merging two branches."""
2234
# TODO: Options to specify revisions on either side, as if
2235
# merging only part of the history.
2236
takes_args = ['branch', 'other']
2237
hidden = True
2238
2239
@display_command
2240
def run(self, branch, other):
2241
from bzrlib.revision import MultipleRevisionSources
2242
2243
branch1 = Branch.open_containing(branch)[0]
2244
branch2 = Branch.open_containing(other)[0]
2245
2246
last1 = branch1.last_revision()
2247
last2 = branch2.last_revision()
2248
2249
source = MultipleRevisionSources(branch1.repository,
2250
branch2.repository)
2251
2252
base_rev_id = common_ancestor(last1, last2, source)
2253
2254
print 'merge base is revision %s' % base_rev_id
2255
2256
2257
class cmd_merge(Command):
2258
"""Perform a three-way merge.
2259
2260
The branch is the branch you will merge from. By default, it will merge
2261
the latest revision. If you specify a revision, that revision will be
2262
merged. If you specify two revisions, the first will be used as a BASE,
2263
and the second one as OTHER. Revision numbers are always relative to the
2264
specified branch.
2265
2266
By default, bzr will try to merge in all new work from the other
2267
branch, automatically determining an appropriate base. If this
2268
fails, you may need to give an explicit base.
2269
2270
Merge will do its best to combine the changes in two branches, but there
2271
are some kinds of problems only a human can fix. When it encounters those,
2272
it will mark a conflict. A conflict means that you need to fix something,
2273
before you should commit.
2274
2275
Use bzr resolve when you have fixed a problem. See also bzr conflicts.
2276
2277
If there is no default branch set, the first merge will set it. After
2278
that, you can omit the branch to use the default. To change the
2279
default, use --remember. The value will only be saved if the remote
2280
location can be accessed.
2281
2282
Examples:
2283
2284
To merge the latest revision from bzr.dev
2285
bzr merge ../bzr.dev
2286
2287
To merge changes up to and including revision 82 from bzr.dev
2288
bzr merge -r 82 ../bzr.dev
2289
2290
To merge the changes introduced by 82, without previous changes:
2291
bzr merge -r 81..82 ../bzr.dev
2292
2293
merge refuses to run if there are any uncommitted changes, unless
2294
--force is given.
2295
2296
The following merge types are available:
2297
"""
2298
takes_args = ['branch?']
2299
takes_options = ['revision', 'force', 'merge-type', 'reprocess', 'remember',
2300
Option('show-base', help="Show base revision text in "
2301
"conflicts"),
2302
Option('uncommitted', help='Apply uncommitted changes'
2303
' from a working copy, instead of branch changes'),
2304
Option('pull', help='If the destination is already'
2305
' completely merged into the source, pull from the'
2306
' source rather than merging. When this happens,'
2307
' you do not need to commit the result.'),
2308
]
2309
2310
def help(self):
2311
from inspect import getdoc
2312
return getdoc(self) + '\n' + _mod_merge.merge_type_help()
2313
2314
def run(self, branch=None, revision=None, force=False, merge_type=None,
2315
show_base=False, reprocess=False, remember=False,
2316
uncommitted=False, pull=False):
2317
if merge_type is None:
2318
merge_type = _mod_merge.Merge3Merger
2319
2320
tree = WorkingTree.open_containing(u'.')[0]
2321
2322
if branch is not None:
2323
try:
2324
reader = bundle.read_bundle_from_url(branch)
2325
except errors.NotABundle:
2326
pass # Continue on considering this url a Branch
2327
else:
2328
conflicts = merge_bundle(reader, tree, not force, merge_type,
2329
reprocess, show_base)
2330
if conflicts == 0:
2331
return 0
2332
else:
2333
return 1
2334
2335
if revision is None \
2336
or len(revision) < 1 or revision[0].needs_branch():
2337
branch = self._get_remembered_parent(tree, branch, 'Merging from')
2338
2339
if revision is None or len(revision) < 1:
2340
if uncommitted:
2341
base = [branch, -1]
2342
other = [branch, None]
2343
else:
2344
base = [None, None]
2345
other = [branch, -1]
2346
other_branch, path = Branch.open_containing(branch)
2347
else:
2348
if uncommitted:
2349
raise errors.BzrCommandError('Cannot use --uncommitted and'
2350
' --revision at the same time.')
2351
branch = revision[0].get_branch() or branch
2352
if len(revision) == 1:
2353
base = [None, None]
2354
other_branch, path = Branch.open_containing(branch)
2355
revno = revision[0].in_history(other_branch).revno
2356
other = [branch, revno]
2357
else:
2358
assert len(revision) == 2
2359
if None in revision:
2360
raise errors.BzrCommandError(
2361
"Merge doesn't permit empty revision specifier.")
2362
base_branch, path = Branch.open_containing(branch)
2363
branch1 = revision[1].get_branch() or branch
2364
other_branch, path1 = Branch.open_containing(branch1)
2365
if revision[0].get_branch() is not None:
2366
# then path was obtained from it, and is None.
2367
path = path1
2368
2369
base = [branch, revision[0].in_history(base_branch).revno]
2370
other = [branch1, revision[1].in_history(other_branch).revno]
2371
2372
if tree.branch.get_parent() is None or remember:
2373
tree.branch.set_parent(other_branch.base)
2374
2375
if path != "":
2376
interesting_files = [path]
2377
else:
2378
interesting_files = None
2379
pb = ui.ui_factory.nested_progress_bar()
2380
try:
2381
try:
2382
conflict_count = _merge_helper(
2383
other, base, check_clean=(not force),
2384
merge_type=merge_type,
2385
reprocess=reprocess,
2386
show_base=show_base,
2387
pull=pull,
2388
pb=pb, file_list=interesting_files)
2389
finally:
2390
pb.finished()
2391
if conflict_count != 0:
2392
return 1
2393
else:
2394
return 0
2395
except errors.AmbiguousBase, e:
2396
m = ("sorry, bzr can't determine the right merge base yet\n"
2397
"candidates are:\n "
2398
+ "\n ".join(e.bases)
2399
+ "\n"
2400
"please specify an explicit base with -r,\n"
2401
"and (if you want) report this to the bzr developers\n")
2402
log_error(m)
2403
2404
# TODO: move up to common parent; this isn't merge-specific anymore.
2405
def _get_remembered_parent(self, tree, supplied_location, verb_string):
2406
"""Use tree.branch's parent if none was supplied.
2407
2408
Report if the remembered location was used.
2409
"""
2410
if supplied_location is not None:
2411
return supplied_location
2412
stored_location = tree.branch.get_parent()
2413
mutter("%s", stored_location)
2414
if stored_location is None:
2415
raise errors.BzrCommandError("No location specified or remembered")
2416
display_url = urlutils.unescape_for_display(stored_location, self.outf.encoding)
2417
self.outf.write("%s remembered location %s\n" % (verb_string, display_url))
2418
return stored_location
2419
2420
2421
class cmd_remerge(Command):
2422
"""Redo a merge.
2423
2424
Use this if you want to try a different merge technique while resolving
2425
conflicts. Some merge techniques are better than others, and remerge
2426
lets you try different ones on different files.
2427
2428
The options for remerge have the same meaning and defaults as the ones for
2429
merge. The difference is that remerge can (only) be run when there is a
2430
pending merge, and it lets you specify particular files.
2431
2432
Examples:
2433
$ bzr remerge --show-base
2434
Re-do the merge of all conflicted files, and show the base text in
2435
conflict regions, in addition to the usual THIS and OTHER texts.
2436
2437
$ bzr remerge --merge-type weave --reprocess foobar
2438
Re-do the merge of "foobar", using the weave merge algorithm, with
2439
additional processing to reduce the size of conflict regions.
2440
2441
The following merge types are available:"""
2442
takes_args = ['file*']
2443
takes_options = ['merge-type', 'reprocess',
2444
Option('show-base', help="Show base revision text in "
2445
"conflicts")]
2446
2447
def help(self):
2448
from inspect import getdoc
2449
return getdoc(self) + '\n' + _mod_merge.merge_type_help()
2450
2451
def run(self, file_list=None, merge_type=None, show_base=False,
2452
reprocess=False):
2453
if merge_type is None:
2454
merge_type = _mod_merge.Merge3Merger
2455
tree, file_list = tree_files(file_list)
2456
tree.lock_write()
2457
try:
2458
parents = tree.get_parent_ids()
2459
if len(parents) != 2:
2460
raise errors.BzrCommandError("Sorry, remerge only works after normal"
2461
" merges. Not cherrypicking or"
2462
" multi-merges.")
2463
repository = tree.branch.repository
2464
base_revision = common_ancestor(parents[0],
2465
parents[1], repository)
2466
base_tree = repository.revision_tree(base_revision)
2467
other_tree = repository.revision_tree(parents[1])
2468
interesting_ids = None
2469
new_conflicts = []
2470
conflicts = tree.conflicts()
2471
if file_list is not None:
2472
interesting_ids = set()
2473
for filename in file_list:
2474
file_id = tree.path2id(filename)
2475
if file_id is None:
2476
raise errors.NotVersionedError(filename)
2477
interesting_ids.add(file_id)
2478
if tree.kind(file_id) != "directory":
2479
continue
2480
2481
for name, ie in tree.inventory.iter_entries(file_id):
2482
interesting_ids.add(ie.file_id)
2483
new_conflicts = conflicts.select_conflicts(tree, file_list)[0]
2484
else:
2485
# Remerge only supports resolving contents conflicts
2486
allowed_conflicts = ('text conflict', 'contents conflict')
2487
restore_files = [c.path for c in conflicts
2488
if c.typestring in allowed_conflicts]
2489
_mod_merge.transform_tree(tree, tree.basis_tree(), interesting_ids)
2490
tree.set_conflicts(ConflictList(new_conflicts))
2491
if file_list is not None:
2492
restore_files = file_list
2493
for filename in restore_files:
2494
try:
2495
restore(tree.abspath(filename))
2496
except errors.NotConflicted:
2497
pass
2498
conflicts = _mod_merge.merge_inner(
2499
tree.branch, other_tree, base_tree,
2500
this_tree=tree,
2501
interesting_ids=interesting_ids,
2502
other_rev_id=parents[1],
2503
merge_type=merge_type,
2504
show_base=show_base,
2505
reprocess=reprocess)
2506
finally:
2507
tree.unlock()
2508
if conflicts > 0:
2509
return 1
2510
else:
2511
return 0
2512
2513
2514
class cmd_revert(Command):
2515
"""Revert files to a previous revision.
2516
2517
Giving a list of files will revert only those files. Otherwise, all files
2518
will be reverted. If the revision is not specified with '--revision', the
2519
last committed revision is used.
2520
2521
To remove only some changes, without reverting to a prior version, use
2522
merge instead. For example, "merge . --r-2..-3" will remove the changes
2523
introduced by -2, without affecting the changes introduced by -1. Or
2524
to remove certain changes on a hunk-by-hunk basis, see the Shelf plugin.
2525
2526
By default, any files that have been manually changed will be backed up
2527
first. (Files changed only by merge are not backed up.) Backup files have
2528
'.~#~' appended to their name, where # is a number.
2529
2530
When you provide files, you can use their current pathname or the pathname
2531
from the target revision. So you can use revert to "undelete" a file by
2532
name. If you name a directory, all the contents of that directory will be
2533
reverted.
2534
"""
2535
takes_options = ['revision', 'no-backup']
2536
takes_args = ['file*']
2537
aliases = ['merge-revert']
2538
2539
def run(self, revision=None, no_backup=False, file_list=None):
2540
if file_list is not None:
2541
if len(file_list) == 0:
2542
raise errors.BzrCommandError("No files specified")
2543
else:
2544
file_list = []
2545
2546
tree, file_list = tree_files(file_list)
2547
if revision is None:
2548
# FIXME should be tree.last_revision
2549
rev_id = tree.last_revision()
2550
elif len(revision) != 1:
2551
raise errors.BzrCommandError('bzr revert --revision takes exactly 1 argument')
2552
else:
2553
rev_id = revision[0].in_history(tree.branch).rev_id
2554
pb = ui.ui_factory.nested_progress_bar()
2555
try:
2556
tree.revert(file_list,
2557
tree.branch.repository.revision_tree(rev_id),
2558
not no_backup, pb, report_changes=True)
2559
finally:
2560
pb.finished()
2561
2562
2563
class cmd_assert_fail(Command):
2564
"""Test reporting of assertion failures"""
2565
# intended just for use in testing
2566
2567
hidden = True
2568
2569
def run(self):
2570
raise AssertionError("always fails")
2571
2572
2573
class cmd_help(Command):
2574
"""Show help on a command or other topic.
2575
2576
For a list of all available commands, say 'bzr help commands'.
2577
"""
2578
takes_options = [Option('long', 'show help on all commands')]
2579
takes_args = ['topic?']
2580
aliases = ['?', '--help', '-?', '-h']
2581
2582
@display_command
2583
def run(self, topic=None, long=False):
2584
import bzrlib.help
2585
if topic is None and long:
2586
topic = "commands"
2587
bzrlib.help.help(topic)
2588
2589
2590
class cmd_shell_complete(Command):
2591
"""Show appropriate completions for context.
2592
2593
For a list of all available commands, say 'bzr shell-complete'.
2594
"""
2595
takes_args = ['context?']
2596
aliases = ['s-c']
2597
hidden = True
2598
2599
@display_command
2600
def run(self, context=None):
2601
import shellcomplete
2602
shellcomplete.shellcomplete(context)
2603
2604
2605
class cmd_fetch(Command):
2606
"""Copy in history from another branch but don't merge it.
2607
2608
This is an internal method used for pull and merge.
2609
"""
2610
hidden = True
2611
takes_args = ['from_branch', 'to_branch']
2612
def run(self, from_branch, to_branch):
2613
from bzrlib.fetch import Fetcher
2614
from_b = Branch.open(from_branch)
2615
to_b = Branch.open(to_branch)
2616
Fetcher(to_b, from_b)
2617
2618
2619
class cmd_missing(Command):
2620
"""Show unmerged/unpulled revisions between two branches.
2621
2622
OTHER_BRANCH may be local or remote.
2623
"""
2624
takes_args = ['other_branch?']
2625
takes_options = [Option('reverse', 'Reverse the order of revisions'),
2626
Option('mine-only',
2627
'Display changes in the local branch only'),
2628
Option('theirs-only',
2629
'Display changes in the remote branch only'),
2630
'log-format',
2631
'show-ids',
2632
'verbose'
2633
]
2634
encoding_type = 'replace'
2635
2636
@display_command
2637
def run(self, other_branch=None, reverse=False, mine_only=False,
2638
theirs_only=False, log_format=None, long=False, short=False, line=False,
2639
show_ids=False, verbose=False):
2640
from bzrlib.missing import find_unmerged, iter_log_data
2641
from bzrlib.log import log_formatter
2642
local_branch = Branch.open_containing(u".")[0]
2643
parent = local_branch.get_parent()
2644
if other_branch is None:
2645
other_branch = parent
2646
if other_branch is None:
2647
raise errors.BzrCommandError("No peer location known or specified.")
2648
display_url = urlutils.unescape_for_display(parent,
2649
self.outf.encoding)
2650
print "Using last location: " + display_url
2651
2652
remote_branch = Branch.open(other_branch)
2653
if remote_branch.base == local_branch.base:
2654
remote_branch = local_branch
2655
local_branch.lock_read()
2656
try:
2657
remote_branch.lock_read()
2658
try:
2659
local_extra, remote_extra = find_unmerged(local_branch, remote_branch)
2660
if (log_format is None):
2661
log_format = log.log_formatter_registry.get_default(
2662
local_branch)
2663
lf = log_format(to_file=self.outf,
2664
show_ids=show_ids,
2665
show_timezone='original')
2666
if reverse is False:
2667
local_extra.reverse()
2668
remote_extra.reverse()
2669
if local_extra and not theirs_only:
2670
print "You have %d extra revision(s):" % len(local_extra)
2671
for data in iter_log_data(local_extra, local_branch.repository,
2672
verbose):
2673
lf.show(*data)
2674
printed_local = True
2675
else:
2676
printed_local = False
2677
if remote_extra and not mine_only:
2678
if printed_local is True:
2679
print "\n\n"
2680
print "You are missing %d revision(s):" % len(remote_extra)
2681
for data in iter_log_data(remote_extra, remote_branch.repository,
2682
verbose):
2683
lf.show(*data)
2684
if not remote_extra and not local_extra:
2685
status_code = 0
2686
print "Branches are up to date."
2687
else:
2688
status_code = 1
2689
finally:
2690
remote_branch.unlock()
2691
finally:
2692
local_branch.unlock()
2693
if not status_code and parent is None and other_branch is not None:
2694
local_branch.lock_write()
2695
try:
2696
# handle race conditions - a parent might be set while we run.
2697
if local_branch.get_parent() is None:
2698
local_branch.set_parent(remote_branch.base)
2699
finally:
2700
local_branch.unlock()
2701
return status_code
2702
2703
2704
class cmd_plugins(Command):
2705
"""List plugins"""
2706
hidden = True
2707
@display_command
2708
def run(self):
2709
import bzrlib.plugin
2710
from inspect import getdoc
2711
for name, plugin in bzrlib.plugin.all_plugins().items():
2712
if getattr(plugin, '__path__', None) is not None:
2713
print plugin.__path__[0]
2714
elif getattr(plugin, '__file__', None) is not None:
2715
print plugin.__file__
2716
else:
2717
print repr(plugin)
2718
2719
d = getdoc(plugin)
2720
if d:
2721
print '\t', d.split('\n')[0]
2722
2723
2724
class cmd_testament(Command):
2725
"""Show testament (signing-form) of a revision."""
2726
takes_options = ['revision',
2727
Option('long', help='Produce long-format testament'),
2728
Option('strict', help='Produce a strict-format'
2729
' testament')]
2730
takes_args = ['branch?']
2731
@display_command
2732
def run(self, branch=u'.', revision=None, long=False, strict=False):
2733
from bzrlib.testament import Testament, StrictTestament
2734
if strict is True:
2735
testament_class = StrictTestament
2736
else:
2737
testament_class = Testament
2738
b = WorkingTree.open_containing(branch)[0].branch
2739
b.lock_read()
2740
try:
2741
if revision is None:
2742
rev_id = b.last_revision()
2743
else:
2744
rev_id = revision[0].in_history(b).rev_id
2745
t = testament_class.from_revision(b.repository, rev_id)
2746
if long:
2747
sys.stdout.writelines(t.as_text_lines())
2748
else:
2749
sys.stdout.write(t.as_short_text())
2750
finally:
2751
b.unlock()
2752
2753
2754
class cmd_annotate(Command):
2755
"""Show the origin of each line in a file.
2756
2757
This prints out the given file with an annotation on the left side
2758
indicating which revision, author and date introduced the change.
2759
2760
If the origin is the same for a run of consecutive lines, it is
2761
shown only at the top, unless the --all option is given.
2762
"""
2763
# TODO: annotate directories; showing when each file was last changed
2764
# TODO: if the working copy is modified, show annotations on that
2765
# with new uncommitted lines marked
2766
aliases = ['ann', 'blame', 'praise']
2767
takes_args = ['filename']
2768
takes_options = [Option('all', help='show annotations on all lines'),
2769
Option('long', help='show date in annotations'),
2770
'revision',
2771
'show-ids',
2772
]
2773
2774
@display_command
2775
def run(self, filename, all=False, long=False, revision=None,
2776
show_ids=False):
2777
from bzrlib.annotate import annotate_file
2778
tree, relpath = WorkingTree.open_containing(filename)
2779
branch = tree.branch
2780
branch.lock_read()
2781
try:
2782
if revision is None:
2783
revision_id = branch.last_revision()
2784
elif len(revision) != 1:
2785
raise errors.BzrCommandError('bzr annotate --revision takes exactly 1 argument')
2786
else:
2787
revision_id = revision[0].in_history(branch).rev_id
2788
file_id = tree.inventory.path2id(relpath)
2789
tree = branch.repository.revision_tree(revision_id)
2790
file_version = tree.inventory[file_id].revision
2791
annotate_file(branch, file_version, file_id, long, all, sys.stdout,
2792
show_ids=show_ids)
2793
finally:
2794
branch.unlock()
2795
2796
2797
class cmd_re_sign(Command):
2798
"""Create a digital signature for an existing revision."""
2799
# TODO be able to replace existing ones.
2800
2801
hidden = True # is this right ?
2802
takes_args = ['revision_id*']
2803
takes_options = ['revision']
2804
2805
def run(self, revision_id_list=None, revision=None):
2806
import bzrlib.gpg as gpg
2807
if revision_id_list is not None and revision is not None:
2808
raise errors.BzrCommandError('You can only supply one of revision_id or --revision')
2809
if revision_id_list is None and revision is None:
2810
raise errors.BzrCommandError('You must supply either --revision or a revision_id')
2811
b = WorkingTree.open_containing(u'.')[0].branch
2812
gpg_strategy = gpg.GPGStrategy(b.get_config())
2813
if revision_id_list is not None:
2814
for revision_id in revision_id_list:
2815
b.repository.sign_revision(revision_id, gpg_strategy)
2816
elif revision is not None:
2817
if len(revision) == 1:
2818
revno, rev_id = revision[0].in_history(b)
2819
b.repository.sign_revision(rev_id, gpg_strategy)
2820
elif len(revision) == 2:
2821
# are they both on rh- if so we can walk between them
2822
# might be nice to have a range helper for arbitrary
2823
# revision paths. hmm.
2824
from_revno, from_revid = revision[0].in_history(b)
2825
to_revno, to_revid = revision[1].in_history(b)
2826
if to_revid is None:
2827
to_revno = b.revno()
2828
if from_revno is None or to_revno is None:
2829
raise errors.BzrCommandError('Cannot sign a range of non-revision-history revisions')
2830
for revno in range(from_revno, to_revno + 1):
2831
b.repository.sign_revision(b.get_rev_id(revno),
2832
gpg_strategy)
2833
else:
2834
raise errors.BzrCommandError('Please supply either one revision, or a range.')
2835
2836
2837
class cmd_bind(Command):
2838
"""Bind the current branch to a master branch.
2839
2840
After binding, commits must succeed on the master branch
2841
before they are executed on the local one.
2842
"""
2843
2844
takes_args = ['location']
2845
takes_options = []
2846
2847
def run(self, location=None):
2848
b, relpath = Branch.open_containing(u'.')
2849
b_other = Branch.open(location)
2850
try:
2851
b.bind(b_other)
2852
except errors.DivergedBranches:
2853
raise errors.BzrCommandError('These branches have diverged.'
2854
' Try merging, and then bind again.')
2855
2856
2857
class cmd_unbind(Command):
2858
"""Unbind the current branch from its master branch.
2859
2860
After unbinding, the local branch is considered independent.
2861
All subsequent commits will be local.
2862
"""
2863
2864
takes_args = []
2865
takes_options = []
2866
2867
def run(self):
2868
b, relpath = Branch.open_containing(u'.')
2869
if not b.unbind():
2870
raise errors.BzrCommandError('Local branch is not bound')
2871
2872
2873
class cmd_uncommit(Command):
2874
"""Remove the last committed revision.
2875
2876
--verbose will print out what is being removed.
2877
--dry-run will go through all the motions, but not actually
2878
remove anything.
2879
2880
In the future, uncommit will create a revision bundle, which can then
2881
be re-applied.
2882
"""
2883
2884
# TODO: jam 20060108 Add an option to allow uncommit to remove
2885
# unreferenced information in 'branch-as-repository' branches.
2886
# TODO: jam 20060108 Add the ability for uncommit to remove unreferenced
2887
# information in shared branches as well.
2888
takes_options = ['verbose', 'revision',
2889
Option('dry-run', help='Don\'t actually make changes'),
2890
Option('force', help='Say yes to all questions.')]
2891
takes_args = ['location?']
2892
aliases = []
2893
2894
def run(self, location=None,
2895
dry_run=False, verbose=False,
2896
revision=None, force=False):
2897
from bzrlib.log import log_formatter, show_log
2898
import sys
2899
from bzrlib.uncommit import uncommit
2900
2901
if location is None:
2902
location = u'.'
2903
control, relpath = bzrdir.BzrDir.open_containing(location)
2904
try:
2905
tree = control.open_workingtree()
2906
b = tree.branch
2907
except (errors.NoWorkingTree, errors.NotLocalUrl):
2908
tree = None
2909
b = control.open_branch()
2910
2911
rev_id = None
2912
if revision is None:
2913
revno = b.revno()
2914
else:
2915
# 'bzr uncommit -r 10' actually means uncommit
2916
# so that the final tree is at revno 10.
2917
# but bzrlib.uncommit.uncommit() actually uncommits
2918
# the revisions that are supplied.
2919
# So we need to offset it by one
2920
revno = revision[0].in_history(b).revno+1
2921
2922
if revno <= b.revno():
2923
rev_id = b.get_rev_id(revno)
2924
if rev_id is None:
2925
self.outf.write('No revisions to uncommit.\n')
2926
return 1
2927
2928
lf = log_formatter('short',
2929
to_file=self.outf,
2930
show_timezone='original')
2931
2932
show_log(b,
2933
lf,
2934
verbose=False,
2935
direction='forward',
2936
start_revision=revno,
2937
end_revision=b.revno())
2938
2939
if dry_run:
2940
print 'Dry-run, pretending to remove the above revisions.'
2941
if not force:
2942
val = raw_input('Press <enter> to continue')
2943
else:
2944
print 'The above revision(s) will be removed.'
2945
if not force:
2946
val = raw_input('Are you sure [y/N]? ')
2947
if val.lower() not in ('y', 'yes'):
2948
print 'Canceled'
2949
return 0
2950
2951
uncommit(b, tree=tree, dry_run=dry_run, verbose=verbose,
2952
revno=revno)
2953
2954
2955
class cmd_break_lock(Command):
2956
"""Break a dead lock on a repository, branch or working directory.
2957
2958
CAUTION: Locks should only be broken when you are sure that the process
2959
holding the lock has been stopped.
2960
2961
You can get information on what locks are open via the 'bzr info' command.
2962
2963
example:
2964
bzr break-lock
2965
"""
2966
takes_args = ['location?']
2967
2968
def run(self, location=None, show=False):
2969
if location is None:
2970
location = u'.'
2971
control, relpath = bzrdir.BzrDir.open_containing(location)
2972
try:
2973
control.break_lock()
2974
except NotImplementedError:
2975
pass
2976
2977
2978
class cmd_wait_until_signalled(Command):
2979
"""Test helper for test_start_and_stop_bzr_subprocess_send_signal.
2980
2981
This just prints a line to signal when it is ready, then blocks on stdin.
2982
"""
2983
2984
hidden = True
2985
2986
def run(self):
2987
sys.stdout.write("running\n")
2988
sys.stdout.flush()
2989
sys.stdin.readline()
2990
2991
2992
class cmd_serve(Command):
2993
"""Run the bzr server."""
2994
2995
aliases = ['server']
2996
2997
takes_options = [
2998
Option('inet',
2999
help='serve on stdin/out for use from inetd or sshd'),
3000
Option('port',
3001
help='listen for connections on nominated port of the form '
3002
'[hostname:]portnumber. Passing 0 as the port number will '
3003
'result in a dynamically allocated port.',
3004
type=str),
3005
Option('directory',
3006
help='serve contents of directory',
3007
type=unicode),
3008
Option('allow-writes',
3009
help='By default the server is a readonly server. Supplying '
3010
'--allow-writes enables write access to the contents of '
3011
'the served directory and below. '
3012
),
3013
]
3014
3015
def run(self, port=None, inet=False, directory=None, allow_writes=False):
3016
from bzrlib.transport import smart
3017
from bzrlib.transport import get_transport
3018
if directory is None:
3019
directory = os.getcwd()
3020
url = urlutils.local_path_to_url(directory)
3021
if not allow_writes:
3022
url = 'readonly+' + url
3023
t = get_transport(url)
3024
if inet:
3025
server = smart.SmartServerPipeStreamMedium(sys.stdin, sys.stdout, t)
3026
elif port is not None:
3027
if ':' in port:
3028
host, port = port.split(':')
3029
else:
3030
host = '127.0.0.1'
3031
server = smart.SmartTCPServer(t, host=host, port=int(port))
3032
print 'listening on port: ', server.port
3033
sys.stdout.flush()
3034
else:
3035
raise errors.BzrCommandError("bzr serve requires one of --inet or --port")
3036
server.serve()
3037
3038
3039
# command-line interpretation helper for merge-related commands
3040
def _merge_helper(other_revision, base_revision,
3041
check_clean=True, ignore_zero=False,
3042
this_dir=None, backup_files=False,
3043
merge_type=None,
3044
file_list=None, show_base=False, reprocess=False,
3045
pull=False,
3046
pb=DummyProgress()):
3047
"""Merge changes into a tree.
3048
3049
base_revision
3050
list(path, revno) Base for three-way merge.
3051
If [None, None] then a base will be automatically determined.
3052
other_revision
3053
list(path, revno) Other revision for three-way merge.
3054
this_dir
3055
Directory to merge changes into; '.' by default.
3056
check_clean
3057
If true, this_dir must have no uncommitted changes before the
3058
merge begins.
3059
ignore_zero - If true, suppress the "zero conflicts" message when
3060
there are no conflicts; should be set when doing something we expect
3061
to complete perfectly.
3062
file_list - If supplied, merge only changes to selected files.
3063
3064
All available ancestors of other_revision and base_revision are
3065
automatically pulled into the branch.
3066
3067
The revno may be -1 to indicate the last revision on the branch, which is
3068
the typical case.
3069
3070
This function is intended for use from the command line; programmatic
3071
clients might prefer to call merge.merge_inner(), which has less magic
3072
behavior.
3073
"""
3074
# Loading it late, so that we don't always have to import bzrlib.merge
3075
if merge_type is None:
3076
merge_type = _mod_merge.Merge3Merger
3077
if this_dir is None:
3078
this_dir = u'.'
3079
this_tree = WorkingTree.open_containing(this_dir)[0]
3080
if show_base and not merge_type is _mod_merge.Merge3Merger:
3081
raise errors.BzrCommandError("Show-base is not supported for this merge"
3082
" type. %s" % merge_type)
3083
if reprocess and not merge_type.supports_reprocess:
3084
raise errors.BzrCommandError("Conflict reduction is not supported for merge"
3085
" type %s." % merge_type)
3086
if reprocess and show_base:
3087
raise errors.BzrCommandError("Cannot do conflict reduction and show base.")
3088
try:
3089
merger = _mod_merge.Merger(this_tree.branch, this_tree=this_tree,
3090
pb=pb)
3091
merger.pp = ProgressPhase("Merge phase", 5, pb)
3092
merger.pp.next_phase()
3093
merger.check_basis(check_clean)
3094
merger.set_other(other_revision)
3095
merger.pp.next_phase()
3096
merger.set_base(base_revision)
3097
if merger.base_rev_id == merger.other_rev_id:
3098
note('Nothing to do.')
3099
return 0
3100
if file_list is None:
3101
if pull and merger.base_rev_id == merger.this_rev_id:
3102
count = merger.this_tree.pull(merger.this_branch,
3103
False, merger.other_rev_id)
3104
note('%d revision(s) pulled.' % (count,))
3105
return 0
3106
merger.backup_files = backup_files
3107
merger.merge_type = merge_type
3108
merger.set_interesting_files(file_list)
3109
merger.show_base = show_base
3110
merger.reprocess = reprocess
3111
conflicts = merger.do_merge()
3112
if file_list is None:
3113
merger.set_pending()
3114
finally:
3115
pb.clear()
3116
return conflicts
3117
3118
3119
# Compatibility
3120
merge = _merge_helper
3121
3122
3123
# these get imported and then picked up by the scan for cmd_*
3124
# TODO: Some more consistent way to split command definitions across files;
3125
# we do need to load at least some information about them to know of
3126
# aliases. ideally we would avoid loading the implementation until the
3127
# details were needed.
3128
from bzrlib.cmd_version_info import cmd_version_info
3129
from bzrlib.conflicts import cmd_resolve, cmd_conflicts, restore
3130
from bzrlib.bundle.commands import cmd_bundle_revisions
3131
from bzrlib.sign_my_commits import cmd_sign_my_commits
3132
from bzrlib.weave_commands import cmd_weave_list, cmd_weave_join, \
3133
cmd_weave_plan_merge, cmd_weave_merge_text
Loggerhead is a web-based interface for Breezy
Version: 2.0.1