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