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