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