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