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