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