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