« back to all changes in this revision
Viewing changes to bzrlib/builtins.py
- browse files at revision 2052.3.4
- compare with another revision
- download diff
- download tarball
- view history from revision 2052.3.4
- Committer: John Arbash Meinel
- Date: 2006-10-16 01:25:46 UTC
- mfrom: (2071 +trunk)
- mto: This revision was merged to the branch mainline in revision 2080.
- Revision ID: john@arbash-meinel.com-20061016012546-d01a0740671b4d73
[merge] bzr.dev
- files added:
- BRANCH.TODO
- 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/version_info_formats
- contrib/emacs
- tools
- tools/doc_generate
- tools/win32
- files removed:
- bzrlib/mdiff.py
- notes
- patches
- urlgrabber
- files renamed:
- bzrlib/changeset.py => bzrlib/bundle/__init__.py
- bzrlib/store.py => bzrlib/store/__init__.py
- elementtree/ => bzrlib/util/elementtree/
- bzrlib/xml.py => bzrlib/xml_serializer.py
- contrib/bash/bzr => contrib/bash/bzr.simple
- bzrlib/newinventory.py => contrib/newinventory.py
- files modified:
- .bzrignore
- bzr *
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
tree.lock_write()
853
try:
854
existing_pending_merges = tree.get_parent_ids()[1:]
855
last_rev = tree.last_revision()
856
if last_rev == tree.branch.last_revision():
857
# may be up to date, check master too.
858
master = tree.branch.get_master_branch()
859
if master is None or last_rev == master.last_revision():
860
revno = tree.branch.revision_id_to_revno(last_rev)
861
note("Tree is up to date at revision %d." % (revno,))
862
return 0
863
conflicts = tree.update()
864
revno = tree.branch.revision_id_to_revno(tree.last_revision())
865
note('Updated to revision %d.' % (revno,))
866
if tree.get_parent_ids()[1:] != existing_pending_merges:
867
note('Your local commits will now show as pending merges with '
868
"'bzr status', and can be committed with 'bzr commit'.")
869
if conflicts != 0:
870
return 1
871
else:
872
return 0
873
finally:
874
tree.unlock()
875
876
877
class cmd_info(Command):
878
"""Show information about a working tree, branch or repository.
879
880
This command will show all known locations and formats associated to the
881
tree, branch or repository. Statistical information is included with
882
each report.
883
884
Branches and working trees will also report any missing revisions.
885
"""
886
takes_args = ['location?']
887
takes_options = ['verbose']
888
889
@display_command
890
def run(self, location=None, verbose=False):
891
from bzrlib.info import show_bzrdir_info
892
show_bzrdir_info(bzrdir.BzrDir.open_containing(location)[0],
893
verbose=verbose)
894
895
896
class cmd_remove(Command):
897
"""Make a file unversioned.
898
899
This makes bzr stop tracking changes to a versioned file. It does
900
not delete the working copy.
901
902
You can specify one or more files, and/or --new. If you specify --new,
903
only 'added' files will be removed. If you specify both, then new files
904
in the specified directories will be removed. If the directories are
905
also new, they will also be removed.
906
"""
907
takes_args = ['file*']
908
takes_options = ['verbose', Option('new', help='remove newly-added files')]
909
aliases = ['rm']
910
encoding_type = 'replace'
911
912
def run(self, file_list, verbose=False, new=False):
913
tree, file_list = tree_files(file_list)
914
if new is False:
915
if file_list is None:
916
raise errors.BzrCommandError('Specify one or more files to'
917
' remove, or use --new.')
918
else:
919
added = tree.changes_from(tree.basis_tree(),
920
specific_files=file_list).added
921
file_list = sorted([f[0] for f in added], reverse=True)
922
if len(file_list) == 0:
923
raise errors.BzrCommandError('No matching files.')
924
tree.remove(file_list, verbose=verbose, to_file=self.outf)
925
926
927
class cmd_file_id(Command):
928
"""Print file_id of a particular file or directory.
929
930
The file_id is assigned when the file is first added and remains the
931
same through all revisions where the file exists, even when it is
932
moved or renamed.
933
"""
934
935
hidden = True
936
takes_args = ['filename']
937
938
@display_command
939
def run(self, filename):
940
tree, relpath = WorkingTree.open_containing(filename)
941
i = tree.inventory.path2id(relpath)
942
if i is None:
943
raise errors.BzrError("%r is not a versioned file" % filename)
944
else:
945
self.outf.write(i + '\n')
946
947
948
class cmd_file_path(Command):
949
"""Print path of file_ids to a file or directory.
950
951
This prints one line for each directory down to the target,
952
starting at the branch root.
953
"""
954
955
hidden = True
956
takes_args = ['filename']
957
958
@display_command
959
def run(self, filename):
960
tree, relpath = WorkingTree.open_containing(filename)
961
inv = tree.inventory
962
fid = inv.path2id(relpath)
963
if fid is None:
964
raise errors.BzrError("%r is not a versioned file" % filename)
965
for fip in inv.get_idpath(fid):
966
self.outf.write(fip + '\n')
967
968
969
class cmd_reconcile(Command):
970
"""Reconcile bzr metadata in a branch.
971
972
This can correct data mismatches that may have been caused by
973
previous ghost operations or bzr upgrades. You should only
974
need to run this command if 'bzr check' or a bzr developer
975
advises you to run it.
976
977
If a second branch is provided, cross-branch reconciliation is
978
also attempted, which will check that data like the tree root
979
id which was not present in very early bzr versions is represented
980
correctly in both branches.
981
982
At the same time it is run it may recompress data resulting in
983
a potential saving in disk space or performance gain.
984
985
The branch *MUST* be on a listable system such as local disk or sftp.
986
"""
987
takes_args = ['branch?']
988
989
def run(self, branch="."):
990
from bzrlib.reconcile import reconcile
991
dir = bzrdir.BzrDir.open(branch)
992
reconcile(dir)
993
994
995
class cmd_revision_history(Command):
996
"""Display the list of revision ids on a branch."""
997
takes_args = ['location?']
998
999
hidden = True
1000
1001
@display_command
1002
def run(self, location="."):
1003
branch = Branch.open_containing(location)[0]
1004
for revid in branch.revision_history():
1005
self.outf.write(revid)
1006
self.outf.write('\n')
1007
1008
1009
class cmd_ancestry(Command):
1010
"""List all revisions merged into this branch."""
1011
takes_args = ['location?']
1012
1013
hidden = True
1014
1015
@display_command
1016
def run(self, location="."):
1017
try:
1018
wt = WorkingTree.open_containing(location)[0]
1019
except errors.NoWorkingTree:
1020
b = Branch.open(location)
1021
last_revision = b.last_revision()
1022
else:
1023
b = wt.branch
1024
last_revision = wt.last_revision()
1025
1026
revision_ids = b.repository.get_ancestry(last_revision)
1027
assert revision_ids[0] is None
1028
revision_ids.pop(0)
1029
for revision_id in revision_ids:
1030
self.outf.write(revision_id + '\n')
1031
1032
1033
class cmd_init(Command):
1034
"""Make a directory into a versioned branch.
1035
1036
Use this to create an empty branch, or before importing an
1037
existing project.
1038
1039
If there is a repository in a parent directory of the location, then
1040
the history of the branch will be stored in the repository. Otherwise
1041
init creates a standalone branch which carries its own history in
1042
.bzr.
1043
1044
If there is already a branch at the location but it has no working tree,
1045
the tree can be populated with 'bzr checkout'.
1046
1047
Recipe for importing a tree of files:
1048
cd ~/project
1049
bzr init
1050
bzr add .
1051
bzr status
1052
bzr commit -m 'imported project'
1053
"""
1054
takes_args = ['location?']
1055
takes_options = [
1056
Option('format',
1057
help='Specify a format for this branch. Current'
1058
' formats are: default, knit, metaweave and'
1059
' weave. Default is knit; metaweave and'
1060
' weave are deprecated',
1061
type=get_format_type),
1062
]
1063
def run(self, location=None, format=None):
1064
if format is None:
1065
format = get_format_type('default')
1066
if location is None:
1067
location = u'.'
1068
1069
to_transport = transport.get_transport(location)
1070
1071
# The path has to exist to initialize a
1072
# branch inside of it.
1073
# Just using os.mkdir, since I don't
1074
# believe that we want to create a bunch of
1075
# locations if the user supplies an extended path
1076
# TODO: create-prefix
1077
try:
1078
to_transport.mkdir('.')
1079
except errors.FileExists:
1080
pass
1081
1082
try:
1083
existing_bzrdir = bzrdir.BzrDir.open(location)
1084
except errors.NotBranchError:
1085
# really a NotBzrDir error...
1086
bzrdir.BzrDir.create_branch_convenience(location, format=format)
1087
else:
1088
from bzrlib.transport.local import LocalTransport
1089
if existing_bzrdir.has_branch():
1090
if (isinstance(to_transport, LocalTransport)
1091
and not existing_bzrdir.has_workingtree()):
1092
raise errors.BranchExistsWithoutWorkingTree(location)
1093
raise errors.AlreadyBranchError(location)
1094
else:
1095
existing_bzrdir.create_branch()
1096
existing_bzrdir.create_workingtree()
1097
1098
1099
class cmd_init_repository(Command):
1100
"""Create a shared repository to hold branches.
1101
1102
New branches created under the repository directory will store their revisions
1103
in the repository, not in the branch directory, if the branch format supports
1104
shared storage.
1105
1106
example:
1107
bzr init-repo repo
1108
bzr init repo/trunk
1109
bzr checkout --lightweight repo/trunk trunk-checkout
1110
cd trunk-checkout
1111
(add files here)
1112
"""
1113
takes_args = ["location"]
1114
takes_options = [Option('format',
1115
help='Specify a format for this repository.'
1116
' Current formats are: default, knit,'
1117
' metaweave and weave. Default is knit;'
1118
' metaweave and weave are deprecated',
1119
type=get_format_type),
1120
Option('trees',
1121
help='Allows branches in repository to have'
1122
' a working tree')]
1123
aliases = ["init-repo"]
1124
def run(self, location, format=None, trees=False):
1125
if format is None:
1126
format = get_format_type('default')
1127
1128
if location is None:
1129
location = '.'
1130
1131
to_transport = transport.get_transport(location)
1132
try:
1133
to_transport.mkdir('.')
1134
except errors.FileExists:
1135
pass
1136
1137
newdir = format.initialize_on_transport(to_transport)
1138
repo = newdir.create_repository(shared=True)
1139
repo.set_make_working_trees(trees)
1140
1141
1142
class cmd_diff(Command):
1143
"""Show differences in the working tree or between revisions.
1144
1145
If files are listed, only the changes in those files are listed.
1146
Otherwise, all changes for the tree are listed.
1147
1148
"bzr diff -p1" is equivalent to "bzr diff --prefix old/:new/", and
1149
produces patches suitable for "patch -p1".
1150
1151
examples:
1152
bzr diff
1153
Shows the difference in the working tree versus the last commit
1154
bzr diff -r1
1155
Difference between the working tree and revision 1
1156
bzr diff -r1..2
1157
Difference between revision 2 and revision 1
1158
bzr diff --diff-prefix old/:new/
1159
Same as 'bzr diff' but prefix paths with old/ and new/
1160
bzr diff bzr.mine bzr.dev
1161
Show the differences between the two working trees
1162
bzr diff foo.c
1163
Show just the differences for 'foo.c'
1164
"""
1165
# TODO: Option to use external diff command; could be GNU diff, wdiff,
1166
# or a graphical diff.
1167
1168
# TODO: Python difflib is not exactly the same as unidiff; should
1169
# either fix it up or prefer to use an external diff.
1170
1171
# TODO: Selected-file diff is inefficient and doesn't show you
1172
# deleted files.
1173
1174
# TODO: This probably handles non-Unix newlines poorly.
1175
1176
takes_args = ['file*']
1177
takes_options = ['revision', 'diff-options', 'prefix']
1178
aliases = ['di', 'dif']
1179
encoding_type = 'exact'
1180
1181
@display_command
1182
def run(self, revision=None, file_list=None, diff_options=None,
1183
prefix=None):
1184
from bzrlib.diff import diff_cmd_helper, show_diff_trees
1185
1186
if (prefix is None) or (prefix == '0'):
1187
# diff -p0 format
1188
old_label = ''
1189
new_label = ''
1190
elif prefix == '1':
1191
old_label = 'old/'
1192
new_label = 'new/'
1193
else:
1194
if not ':' in prefix:
1195
raise errors.BzrError("--diff-prefix expects two values"
1196
" separated by a colon")
1197
old_label, new_label = prefix.split(":")
1198
1199
try:
1200
tree1, file_list = internal_tree_files(file_list)
1201
tree2 = None
1202
b = None
1203
b2 = None
1204
except errors.FileInWrongBranch:
1205
if len(file_list) != 2:
1206
raise errors.BzrCommandError("Files are in different branches")
1207
1208
tree1, file1 = WorkingTree.open_containing(file_list[0])
1209
tree2, file2 = WorkingTree.open_containing(file_list[1])
1210
if file1 != "" or file2 != "":
1211
# FIXME diff those two files. rbc 20051123
1212
raise errors.BzrCommandError("Files are in different branches")
1213
file_list = None
1214
except errors.NotBranchError:
1215
if (revision is not None and len(revision) == 2
1216
and not revision[0].needs_branch()
1217
and not revision[1].needs_branch()):
1218
# If both revision specs include a branch, we can
1219
# diff them without needing a local working tree
1220
tree1, tree2 = None, None
1221
else:
1222
raise
1223
if revision is not None:
1224
if tree2 is not None:
1225
raise errors.BzrCommandError("Can't specify -r with two branches")
1226
if (len(revision) == 1) or (revision[1].spec is None):
1227
return diff_cmd_helper(tree1, file_list, diff_options,
1228
revision[0],
1229
old_label=old_label, new_label=new_label)
1230
elif len(revision) == 2:
1231
return diff_cmd_helper(tree1, file_list, diff_options,
1232
revision[0], revision[1],
1233
old_label=old_label, new_label=new_label)
1234
else:
1235
raise errors.BzrCommandError('bzr diff --revision takes exactly'
1236
' one or two revision identifiers')
1237
else:
1238
if tree2 is not None:
1239
return show_diff_trees(tree1, tree2, sys.stdout,
1240
specific_files=file_list,
1241
external_diff_options=diff_options,
1242
old_label=old_label, new_label=new_label)
1243
else:
1244
return diff_cmd_helper(tree1, file_list, diff_options,
1245
old_label=old_label, new_label=new_label)
1246
1247
1248
class cmd_deleted(Command):
1249
"""List files deleted in the working tree.
1250
"""
1251
# TODO: Show files deleted since a previous revision, or
1252
# between two revisions.
1253
# TODO: Much more efficient way to do this: read in new
1254
# directories with readdir, rather than stating each one. Same
1255
# level of effort but possibly much less IO. (Or possibly not,
1256
# if the directories are very large...)
1257
takes_options = ['show-ids']
1258
1259
@display_command
1260
def run(self, show_ids=False):
1261
tree = WorkingTree.open_containing(u'.')[0]
1262
old = tree.basis_tree()
1263
for path, ie in old.inventory.iter_entries():
1264
if not tree.has_id(ie.file_id):
1265
self.outf.write(path)
1266
if show_ids:
1267
self.outf.write(' ')
1268
self.outf.write(ie.file_id)
1269
self.outf.write('\n')
1270
1271
1272
class cmd_modified(Command):
1273
"""List files modified in working tree."""
1274
hidden = True
1275
@display_command
1276
def run(self):
1277
tree = WorkingTree.open_containing(u'.')[0]
1278
td = tree.changes_from(tree.basis_tree())
1279
for path, id, kind, text_modified, meta_modified in td.modified:
1280
self.outf.write(path + '\n')
1281
1282
1283
class cmd_added(Command):
1284
"""List files added in working tree."""
1285
hidden = True
1286
@display_command
1287
def run(self):
1288
wt = WorkingTree.open_containing(u'.')[0]
1289
basis_inv = wt.basis_tree().inventory
1290
inv = wt.inventory
1291
for file_id in inv:
1292
if file_id in basis_inv:
1293
continue
1294
path = inv.id2path(file_id)
1295
if not os.access(osutils.abspath(path), os.F_OK):
1296
continue
1297
self.outf.write(path + '\n')
1298
1299
1300
class cmd_root(Command):
1301
"""Show the tree root directory.
1302
1303
The root is the nearest enclosing directory with a .bzr control
1304
directory."""
1305
takes_args = ['filename?']
1306
@display_command
1307
def run(self, filename=None):
1308
"""Print the branch root."""
1309
tree = WorkingTree.open_containing(filename)[0]
1310
self.outf.write(tree.basedir + '\n')
1311
1312
1313
class cmd_log(Command):
1314
"""Show log of a branch, file, or directory.
1315
1316
By default show the log of the branch containing the working directory.
1317
1318
To request a range of logs, you can use the command -r begin..end
1319
-r revision requests a specific revision, -r ..end or -r begin.. are
1320
also valid.
1321
1322
examples:
1323
bzr log
1324
bzr log foo.c
1325
bzr log -r -10.. http://server/branch
1326
"""
1327
1328
# TODO: Make --revision support uuid: and hash: [future tag:] notation.
1329
1330
takes_args = ['location?']
1331
takes_options = [Option('forward',
1332
help='show from oldest to newest'),
1333
'timezone',
1334
Option('verbose',
1335
help='show files changed in each revision'),
1336
'show-ids', 'revision',
1337
'log-format',
1338
'line', 'long',
1339
Option('message',
1340
help='show revisions whose message matches this regexp',
1341
type=str),
1342
'short',
1343
]
1344
encoding_type = 'replace'
1345
1346
@display_command
1347
def run(self, location=None, timezone='original',
1348
verbose=False,
1349
show_ids=False,
1350
forward=False,
1351
revision=None,
1352
log_format=None,
1353
message=None,
1354
long=False,
1355
short=False,
1356
line=False):
1357
from bzrlib.log import log_formatter, show_log
1358
assert message is None or isinstance(message, basestring), \
1359
"invalid message argument %r" % message
1360
direction = (forward and 'forward') or 'reverse'
1361
1362
# log everything
1363
file_id = None
1364
if location:
1365
# find the file id to log:
1366
1367
dir, fp = bzrdir.BzrDir.open_containing(location)
1368
b = dir.open_branch()
1369
if fp != '':
1370
try:
1371
# might be a tree:
1372
inv = dir.open_workingtree().inventory
1373
except (errors.NotBranchError, errors.NotLocalUrl):
1374
# either no tree, or is remote.
1375
inv = b.basis_tree().inventory
1376
file_id = inv.path2id(fp)
1377
else:
1378
# local dir only
1379
# FIXME ? log the current subdir only RBC 20060203
1380
if revision is not None \
1381
and len(revision) > 0 and revision[0].get_branch():
1382
location = revision[0].get_branch()
1383
else:
1384
location = '.'
1385
dir, relpath = bzrdir.BzrDir.open_containing(location)
1386
b = dir.open_branch()
1387
1388
if revision is None:
1389
rev1 = None
1390
rev2 = None
1391
elif len(revision) == 1:
1392
rev1 = rev2 = revision[0].in_history(b).revno
1393
elif len(revision) == 2:
1394
if revision[1].get_branch() != revision[0].get_branch():
1395
# b is taken from revision[0].get_branch(), and
1396
# show_log will use its revision_history. Having
1397
# different branches will lead to weird behaviors.
1398
raise errors.BzrCommandError(
1399
"Log doesn't accept two revisions in different branches.")
1400
if revision[0].spec is None:
1401
# missing begin-range means first revision
1402
rev1 = 1
1403
else:
1404
rev1 = revision[0].in_history(b).revno
1405
1406
if revision[1].spec is None:
1407
# missing end-range means last known revision
1408
rev2 = b.revno()
1409
else:
1410
rev2 = revision[1].in_history(b).revno
1411
else:
1412
raise errors.BzrCommandError('bzr log --revision takes one or two values.')
1413
1414
# By this point, the revision numbers are converted to the +ve
1415
# form if they were supplied in the -ve form, so we can do
1416
# this comparison in relative safety
1417
if rev1 > rev2:
1418
(rev2, rev1) = (rev1, rev2)
1419
1420
if (log_format is None):
1421
default = b.get_config().log_format()
1422
log_format = get_log_format(long=long, short=short, line=line,
1423
default=default)
1424
lf = log_formatter(log_format,
1425
show_ids=show_ids,
1426
to_file=self.outf,
1427
show_timezone=timezone)
1428
1429
show_log(b,
1430
lf,
1431
file_id,
1432
verbose=verbose,
1433
direction=direction,
1434
start_revision=rev1,
1435
end_revision=rev2,
1436
search=message)
1437
1438
1439
def get_log_format(long=False, short=False, line=False, default='long'):
1440
log_format = default
1441
if long:
1442
log_format = 'long'
1443
if short:
1444
log_format = 'short'
1445
if line:
1446
log_format = 'line'
1447
return log_format
1448
1449
1450
class cmd_touching_revisions(Command):
1451
"""Return revision-ids which affected a particular file.
1452
1453
A more user-friendly interface is "bzr log FILE".
1454
"""
1455
1456
hidden = True
1457
takes_args = ["filename"]
1458
1459
@display_command
1460
def run(self, filename):
1461
tree, relpath = WorkingTree.open_containing(filename)
1462
b = tree.branch
1463
inv = tree.read_working_inventory()
1464
file_id = inv.path2id(relpath)
1465
for revno, revision_id, what in log.find_touching_revisions(b, file_id):
1466
self.outf.write("%6d %s\n" % (revno, what))
1467
1468
1469
class cmd_ls(Command):
1470
"""List files in a tree.
1471
"""
1472
# TODO: Take a revision or remote path and list that tree instead.
1473
hidden = True
1474
takes_options = ['verbose', 'revision',
1475
Option('non-recursive',
1476
help='don\'t recurse into sub-directories'),
1477
Option('from-root',
1478
help='Print all paths from the root of the branch.'),
1479
Option('unknown', help='Print unknown files'),
1480
Option('versioned', help='Print versioned files'),
1481
Option('ignored', help='Print ignored files'),
1482
1483
Option('null', help='Null separate the files'),
1484
]
1485
@display_command
1486
def run(self, revision=None, verbose=False,
1487
non_recursive=False, from_root=False,
1488
unknown=False, versioned=False, ignored=False,
1489
null=False):
1490
1491
if verbose and null:
1492
raise errors.BzrCommandError('Cannot set both --verbose and --null')
1493
all = not (unknown or versioned or ignored)
1494
1495
selection = {'I':ignored, '?':unknown, 'V':versioned}
1496
1497
tree, relpath = WorkingTree.open_containing(u'.')
1498
if from_root:
1499
relpath = u''
1500
elif relpath:
1501
relpath += '/'
1502
if revision is not None:
1503
tree = tree.branch.repository.revision_tree(
1504
revision[0].in_history(tree.branch).rev_id)
1505
1506
for fp, fc, kind, fid, entry in tree.list_files():
1507
if fp.startswith(relpath):
1508
fp = fp[len(relpath):]
1509
if non_recursive and '/' in fp:
1510
continue
1511
if not all and not selection[fc]:
1512
continue
1513
if verbose:
1514
kindch = entry.kind_character()
1515
self.outf.write('%-8s %s%s\n' % (fc, fp, kindch))
1516
elif null:
1517
self.outf.write(fp + '\0')
1518
self.outf.flush()
1519
else:
1520
self.outf.write(fp + '\n')
1521
1522
1523
class cmd_unknowns(Command):
1524
"""List unknown files."""
1525
@display_command
1526
def run(self):
1527
for f in WorkingTree.open_containing(u'.')[0].unknowns():
1528
self.outf.write(osutils.quotefn(f) + '\n')
1529
1530
1531
class cmd_ignore(Command):
1532
"""Ignore a command or pattern.
1533
1534
To remove patterns from the ignore list, edit the .bzrignore file.
1535
1536
If the pattern contains a slash, it is compared to the whole path
1537
from the branch root. Otherwise, it is compared to only the last
1538
component of the path. To match a file only in the root directory,
1539
prepend './'.
1540
1541
Ignore patterns are case-insensitive on case-insensitive systems.
1542
1543
Note: wildcards must be quoted from the shell on Unix.
1544
1545
examples:
1546
bzr ignore ./Makefile
1547
bzr ignore '*.class'
1548
"""
1549
# TODO: Complain if the filename is absolute
1550
takes_args = ['name_pattern?']
1551
takes_options = [
1552
Option('old-default-rules',
1553
help='Out the ignore rules bzr < 0.9 always used.')
1554
]
1555
1556
def run(self, name_pattern=None, old_default_rules=None):
1557
from bzrlib.atomicfile import AtomicFile
1558
if old_default_rules is not None:
1559
# dump the rules and exit
1560
for pattern in ignores.OLD_DEFAULTS:
1561
print pattern
1562
return
1563
if name_pattern is None:
1564
raise errors.BzrCommandError("ignore requires a NAME_PATTERN")
1565
tree, relpath = WorkingTree.open_containing(u'.')
1566
ifn = tree.abspath('.bzrignore')
1567
if os.path.exists(ifn):
1568
f = open(ifn, 'rt')
1569
try:
1570
igns = f.read().decode('utf-8')
1571
finally:
1572
f.close()
1573
else:
1574
igns = ''
1575
1576
# TODO: If the file already uses crlf-style termination, maybe
1577
# we should use that for the newly added lines?
1578
1579
if igns and igns[-1] != '\n':
1580
igns += '\n'
1581
igns += name_pattern + '\n'
1582
1583
f = AtomicFile(ifn, 'wt')
1584
try:
1585
f.write(igns.encode('utf-8'))
1586
f.commit()
1587
finally:
1588
f.close()
1589
1590
inv = tree.inventory
1591
if inv.path2id('.bzrignore'):
1592
mutter('.bzrignore is already versioned')
1593
else:
1594
mutter('need to make new .bzrignore file versioned')
1595
tree.add(['.bzrignore'])
1596
1597
1598
class cmd_ignored(Command):
1599
"""List ignored files and the patterns that matched them.
1600
1601
See also: bzr ignore"""
1602
@display_command
1603
def run(self):
1604
tree = WorkingTree.open_containing(u'.')[0]
1605
for path, file_class, kind, file_id, entry in tree.list_files():
1606
if file_class != 'I':
1607
continue
1608
## XXX: Slightly inefficient since this was already calculated
1609
pat = tree.is_ignored(path)
1610
print '%-50s %s' % (path, pat)
1611
1612
1613
class cmd_lookup_revision(Command):
1614
"""Lookup the revision-id from a revision-number
1615
1616
example:
1617
bzr lookup-revision 33
1618
"""
1619
hidden = True
1620
takes_args = ['revno']
1621
1622
@display_command
1623
def run(self, revno):
1624
try:
1625
revno = int(revno)
1626
except ValueError:
1627
raise errors.BzrCommandError("not a valid revision-number: %r" % revno)
1628
1629
print WorkingTree.open_containing(u'.')[0].branch.get_rev_id(revno)
1630
1631
1632
class cmd_export(Command):
1633
"""Export past revision to destination directory.
1634
1635
If no revision is specified this exports the last committed revision.
1636
1637
Format may be an "exporter" name, such as tar, tgz, tbz2. If none is
1638
given, try to find the format with the extension. If no extension
1639
is found exports to a directory (equivalent to --format=dir).
1640
1641
Root may be the top directory for tar, tgz and tbz2 formats. If none
1642
is given, the top directory will be the root name of the file.
1643
1644
Note: export of tree with non-ascii filenames to zip is not supported.
1645
1646
Supported formats Autodetected by extension
1647
----------------- -------------------------
1648
dir -
1649
tar .tar
1650
tbz2 .tar.bz2, .tbz2
1651
tgz .tar.gz, .tgz
1652
zip .zip
1653
"""
1654
takes_args = ['dest']
1655
takes_options = ['revision', 'format', 'root']
1656
def run(self, dest, revision=None, format=None, root=None):
1657
from bzrlib.export import export
1658
tree = WorkingTree.open_containing(u'.')[0]
1659
b = tree.branch
1660
if revision is None:
1661
# should be tree.last_revision FIXME
1662
rev_id = b.last_revision()
1663
else:
1664
if len(revision) != 1:
1665
raise errors.BzrError('bzr export --revision takes exactly'
1666
' 1 argument')
1667
rev_id = revision[0].in_history(b).rev_id
1668
t = b.repository.revision_tree(rev_id)
1669
try:
1670
export(t, dest, format, root)
1671
except errors.NoSuchExportFormat, e:
1672
raise errors.BzrCommandError('Unsupported export format: %s' % e.format)
1673
1674
1675
class cmd_cat(Command):
1676
"""Write a file's text from a previous revision."""
1677
1678
takes_options = ['revision']
1679
takes_args = ['filename']
1680
1681
@display_command
1682
def run(self, filename, revision=None):
1683
if revision is not None and len(revision) != 1:
1684
raise errors.BzrCommandError("bzr cat --revision takes exactly one number")
1685
tree = None
1686
try:
1687
tree, relpath = WorkingTree.open_containing(filename)
1688
b = tree.branch
1689
except errors.NotBranchError:
1690
pass
1691
1692
if tree is None:
1693
b, relpath = Branch.open_containing(filename)
1694
if revision is not None and revision[0].get_branch() is not None:
1695
b = Branch.open(revision[0].get_branch())
1696
if revision is None:
1697
revision_id = b.last_revision()
1698
else:
1699
revision_id = revision[0].in_history(b).rev_id
1700
b.print_file(relpath, revision_id)
1701
1702
1703
class cmd_local_time_offset(Command):
1704
"""Show the offset in seconds from GMT to local time."""
1705
hidden = True
1706
@display_command
1707
def run(self):
1708
print osutils.local_time_offset()
1709
1710
1711
1712
class cmd_commit(Command):
1713
"""Commit changes into a new revision.
1714
1715
If no arguments are given, the entire tree is committed.
1716
1717
If selected files are specified, only changes to those files are
1718
committed. If a directory is specified then the directory and everything
1719
within it is committed.
1720
1721
A selected-file commit may fail in some cases where the committed
1722
tree would be invalid, such as trying to commit a file in a
1723
newly-added directory that is not itself committed.
1724
"""
1725
# TODO: Run hooks on tree to-be-committed, and after commit.
1726
1727
# TODO: Strict commit that fails if there are deleted files.
1728
# (what does "deleted files" mean ??)
1729
1730
# TODO: Give better message for -s, --summary, used by tla people
1731
1732
# XXX: verbose currently does nothing
1733
1734
takes_args = ['selected*']
1735
takes_options = ['message', 'verbose',
1736
Option('unchanged',
1737
help='commit even if nothing has changed'),
1738
Option('file', type=str,
1739
argname='msgfile',
1740
help='file containing commit message'),
1741
Option('strict',
1742
help="refuse to commit if there are unknown "
1743
"files in the working tree."),
1744
Option('local',
1745
help="perform a local only commit in a bound "
1746
"branch. Such commits are not pushed to "
1747
"the master branch until a normal commit "
1748
"is performed."
1749
),
1750
]
1751
aliases = ['ci', 'checkin']
1752
1753
def run(self, message=None, file=None, verbose=True, selected_list=None,
1754
unchanged=False, strict=False, local=False):
1755
from bzrlib.commit import (NullCommitReporter, ReportCommitToLog)
1756
from bzrlib.errors import (PointlessCommit, ConflictsInTree,
1757
StrictCommitFailed)
1758
from bzrlib.msgeditor import edit_commit_message, \
1759
make_commit_message_template
1760
from tempfile import TemporaryFile
1761
1762
# TODO: Need a blackbox test for invoking the external editor; may be
1763
# slightly problematic to run this cross-platform.
1764
1765
# TODO: do more checks that the commit will succeed before
1766
# spending the user's valuable time typing a commit message.
1767
#
1768
# TODO: if the commit *does* happen to fail, then save the commit
1769
# message to a temporary file where it can be recovered
1770
tree, selected_list = tree_files(selected_list)
1771
if selected_list == ['']:
1772
# workaround - commit of root of tree should be exactly the same
1773
# as just default commit in that tree, and succeed even though
1774
# selected-file merge commit is not done yet
1775
selected_list = []
1776
1777
if local and not tree.branch.get_bound_location():
1778
raise errors.LocalRequiresBoundBranch()
1779
if message is None and not file:
1780
template = make_commit_message_template(tree, selected_list)
1781
message = edit_commit_message(template)
1782
if message is None:
1783
raise errors.BzrCommandError("please specify a commit message"
1784
" with either --message or --file")
1785
elif message and file:
1786
raise errors.BzrCommandError("please specify either --message or --file")
1787
1788
if file:
1789
message = codecs.open(file, 'rt', bzrlib.user_encoding).read()
1790
1791
if message == "":
1792
raise errors.BzrCommandError("empty commit message specified")
1793
1794
if verbose:
1795
reporter = ReportCommitToLog()
1796
else:
1797
reporter = NullCommitReporter()
1798
1799
try:
1800
tree.commit(message, specific_files=selected_list,
1801
allow_pointless=unchanged, strict=strict, local=local,
1802
reporter=reporter)
1803
except PointlessCommit:
1804
# FIXME: This should really happen before the file is read in;
1805
# perhaps prepare the commit; get the message; then actually commit
1806
raise errors.BzrCommandError("no changes to commit."
1807
" use --unchanged to commit anyhow")
1808
except ConflictsInTree:
1809
raise errors.BzrCommandError("Conflicts detected in working tree. "
1810
'Use "bzr conflicts" to list, "bzr resolve FILE" to resolve.')
1811
except StrictCommitFailed:
1812
raise errors.BzrCommandError("Commit refused because there are unknown "
1813
"files in the working tree.")
1814
except errors.BoundBranchOutOfDate, e:
1815
raise errors.BzrCommandError(str(e) + "\n"
1816
'To commit to master branch, run update and then commit.\n'
1817
'You can also pass --local to commit to continue working '
1818
'disconnected.')
1819
1820
class cmd_check(Command):
1821
"""Validate consistency of branch history.
1822
1823
This command checks various invariants about the branch storage to
1824
detect data corruption or bzr bugs.
1825
"""
1826
takes_args = ['branch?']
1827
takes_options = ['verbose']
1828
1829
def run(self, branch=None, verbose=False):
1830
from bzrlib.check import check
1831
if branch is None:
1832
tree = WorkingTree.open_containing()[0]
1833
branch = tree.branch
1834
else:
1835
branch = Branch.open(branch)
1836
check(branch, verbose)
1837
1838
1839
class cmd_scan_cache(Command):
1840
hidden = True
1841
def run(self):
1842
from bzrlib.hashcache import HashCache
1843
1844
c = HashCache(u'.')
1845
c.read()
1846
c.scan()
1847
1848
print '%6d stats' % c.stat_count
1849
print '%6d in hashcache' % len(c._cache)
1850
print '%6d files removed from cache' % c.removed_count
1851
print '%6d hashes updated' % c.update_count
1852
print '%6d files changed too recently to cache' % c.danger_count
1853
1854
if c.needs_write:
1855
c.write()
1856
1857
1858
class cmd_upgrade(Command):
1859
"""Upgrade branch storage to current format.
1860
1861
The check command or bzr developers may sometimes advise you to run
1862
this command. When the default format has changed you may also be warned
1863
during other operations to upgrade.
1864
"""
1865
takes_args = ['url?']
1866
takes_options = [
1867
Option('format',
1868
help='Upgrade to a specific format. Current formats'
1869
' are: default, knit, metaweave and weave.'
1870
' Default is knit; metaweave and weave are'
1871
' deprecated',
1872
type=get_format_type),
1873
]
1874
1875
1876
def run(self, url='.', format=None):
1877
from bzrlib.upgrade import upgrade
1878
if format is None:
1879
format = get_format_type('default')
1880
upgrade(url, format)
1881
1882
1883
class cmd_whoami(Command):
1884
"""Show or set bzr user id.
1885
1886
examples:
1887
bzr whoami --email
1888
bzr whoami 'Frank Chu <fchu@example.com>'
1889
"""
1890
takes_options = [ Option('email',
1891
help='display email address only'),
1892
Option('branch',
1893
help='set identity for the current branch instead of '
1894
'globally'),
1895
]
1896
takes_args = ['name?']
1897
encoding_type = 'replace'
1898
1899
@display_command
1900
def run(self, email=False, branch=False, name=None):
1901
if name is None:
1902
# use branch if we're inside one; otherwise global config
1903
try:
1904
c = Branch.open_containing('.')[0].get_config()
1905
except errors.NotBranchError:
1906
c = config.GlobalConfig()
1907
if email:
1908
self.outf.write(c.user_email() + '\n')
1909
else:
1910
self.outf.write(c.username() + '\n')
1911
return
1912
1913
# display a warning if an email address isn't included in the given name.
1914
try:
1915
config.extract_email_address(name)
1916
except errors.NoEmailInUsername, e:
1917
warning('"%s" does not seem to contain an email address. '
1918
'This is allowed, but not recommended.', name)
1919
1920
# use global config unless --branch given
1921
if branch:
1922
c = Branch.open_containing('.')[0].get_config()
1923
else:
1924
c = config.GlobalConfig()
1925
c.set_user_option('email', name)
1926
1927
1928
class cmd_nick(Command):
1929
"""Print or set the branch nickname.
1930
1931
If unset, the tree root directory name is used as the nickname
1932
To print the current nickname, execute with no argument.
1933
"""
1934
takes_args = ['nickname?']
1935
def run(self, nickname=None):
1936
branch = Branch.open_containing(u'.')[0]
1937
if nickname is None:
1938
self.printme(branch)
1939
else:
1940
branch.nick = nickname
1941
1942
@display_command
1943
def printme(self, branch):
1944
print branch.nick
1945
1946
1947
class cmd_selftest(Command):
1948
"""Run internal test suite.
1949
1950
This creates temporary test directories in the working directory,
1951
but not existing data is affected. These directories are deleted
1952
if the tests pass, or left behind to help in debugging if they
1953
fail and --keep-output is specified.
1954
1955
If arguments are given, they are regular expressions that say
1956
which tests should run.
1957
1958
If the global option '--no-plugins' is given, plugins are not loaded
1959
before running the selftests. This has two effects: features provided or
1960
modified by plugins will not be tested, and tests provided by plugins will
1961
not be run.
1962
1963
examples:
1964
bzr selftest ignore
1965
bzr --no-plugins selftest -v
1966
"""
1967
# TODO: --list should give a list of all available tests
1968
1969
# NB: this is used from the class without creating an instance, which is
1970
# why it does not have a self parameter.
1971
def get_transport_type(typestring):
1972
"""Parse and return a transport specifier."""
1973
if typestring == "sftp":
1974
from bzrlib.transport.sftp import SFTPAbsoluteServer
1975
return SFTPAbsoluteServer
1976
if typestring == "memory":
1977
from bzrlib.transport.memory import MemoryServer
1978
return MemoryServer
1979
if typestring == "fakenfs":
1980
from bzrlib.transport.fakenfs import FakeNFSServer
1981
return FakeNFSServer
1982
msg = "No known transport type %s. Supported types are: sftp\n" %\
1983
(typestring)
1984
raise errors.BzrCommandError(msg)
1985
1986
hidden = True
1987
takes_args = ['testspecs*']
1988
takes_options = ['verbose',
1989
Option('one', help='stop when one test fails'),
1990
Option('keep-output',
1991
help='keep output directories when tests fail'),
1992
Option('transport',
1993
help='Use a different transport by default '
1994
'throughout the test suite.',
1995
type=get_transport_type),
1996
Option('benchmark', help='run the bzr bencharks.'),
1997
Option('lsprof-timed',
1998
help='generate lsprof output for benchmarked'
1999
' sections of code.'),
2000
Option('cache-dir', type=str,
2001
help='a directory to cache intermediate'
2002
' benchmark steps'),
2003
]
2004
2005
def run(self, testspecs_list=None, verbose=None, one=False,
2006
keep_output=False, transport=None, benchmark=None,
2007
lsprof_timed=None, cache_dir=None):
2008
import bzrlib.ui
2009
from bzrlib.tests import selftest
2010
import bzrlib.benchmarks as benchmarks
2011
from bzrlib.benchmarks import tree_creator
2012
2013
if cache_dir is not None:
2014
tree_creator.TreeCreator.CACHE_ROOT = osutils.abspath(cache_dir)
2015
# we don't want progress meters from the tests to go to the
2016
# real output; and we don't want log messages cluttering up
2017
# the real logs.
2018
save_ui = ui.ui_factory
2019
print '%10s: %s' % ('bzr', osutils.realpath(sys.argv[0]))
2020
print '%10s: %s' % ('bzrlib', bzrlib.__path__[0])
2021
print
2022
info('running tests...')
2023
try:
2024
ui.ui_factory = ui.SilentUIFactory()
2025
if testspecs_list is not None:
2026
pattern = '|'.join(testspecs_list)
2027
else:
2028
pattern = ".*"
2029
if benchmark:
2030
test_suite_factory = benchmarks.test_suite
2031
if verbose is None:
2032
verbose = True
2033
# TODO: should possibly lock the history file...
2034
benchfile = open(".perf_history", "at")
2035
else:
2036
test_suite_factory = None
2037
if verbose is None:
2038
verbose = False
2039
benchfile = None
2040
try:
2041
result = selftest(verbose=verbose,
2042
pattern=pattern,
2043
stop_on_failure=one,
2044
keep_output=keep_output,
2045
transport=transport,
2046
test_suite_factory=test_suite_factory,
2047
lsprof_timed=lsprof_timed,
2048
bench_history=benchfile)
2049
finally:
2050
if benchfile is not None:
2051
benchfile.close()
2052
if result:
2053
info('tests passed')
2054
else:
2055
info('tests failed')
2056
return int(not result)
2057
finally:
2058
ui.ui_factory = save_ui
2059
2060
2061
class cmd_version(Command):
2062
"""Show version of bzr."""
2063
2064
@display_command
2065
def run(self):
2066
from bzrlib.version import show_version
2067
show_version()
2068
2069
2070
class cmd_rocks(Command):
2071
"""Statement of optimism."""
2072
2073
hidden = True
2074
2075
@display_command
2076
def run(self):
2077
print "it sure does!"
2078
2079
2080
class cmd_find_merge_base(Command):
2081
"""Find and print a base revision for merging two branches."""
2082
# TODO: Options to specify revisions on either side, as if
2083
# merging only part of the history.
2084
takes_args = ['branch', 'other']
2085
hidden = True
2086
2087
@display_command
2088
def run(self, branch, other):
2089
from bzrlib.revision import MultipleRevisionSources
2090
2091
branch1 = Branch.open_containing(branch)[0]
2092
branch2 = Branch.open_containing(other)[0]
2093
2094
history_1 = branch1.revision_history()
2095
history_2 = branch2.revision_history()
2096
2097
last1 = branch1.last_revision()
2098
last2 = branch2.last_revision()
2099
2100
source = MultipleRevisionSources(branch1.repository,
2101
branch2.repository)
2102
2103
base_rev_id = common_ancestor(last1, last2, source)
2104
2105
print 'merge base is revision %s' % base_rev_id
2106
2107
2108
class cmd_merge(Command):
2109
"""Perform a three-way merge.
2110
2111
The branch is the branch you will merge from. By default, it will merge
2112
the latest revision. If you specify a revision, that revision will be
2113
merged. If you specify two revisions, the first will be used as a BASE,
2114
and the second one as OTHER. Revision numbers are always relative to the
2115
specified branch.
2116
2117
By default, bzr will try to merge in all new work from the other
2118
branch, automatically determining an appropriate base. If this
2119
fails, you may need to give an explicit base.
2120
2121
Merge will do its best to combine the changes in two branches, but there
2122
are some kinds of problems only a human can fix. When it encounters those,
2123
it will mark a conflict. A conflict means that you need to fix something,
2124
before you should commit.
2125
2126
Use bzr resolve when you have fixed a problem. See also bzr conflicts.
2127
2128
If there is no default branch set, the first merge will set it. After
2129
that, you can omit the branch to use the default. To change the
2130
default, use --remember. The value will only be saved if the remote
2131
location can be accessed.
2132
2133
Examples:
2134
2135
To merge the latest revision from bzr.dev
2136
bzr merge ../bzr.dev
2137
2138
To merge changes up to and including revision 82 from bzr.dev
2139
bzr merge -r 82 ../bzr.dev
2140
2141
To merge the changes introduced by 82, without previous changes:
2142
bzr merge -r 81..82 ../bzr.dev
2143
2144
merge refuses to run if there are any uncommitted changes, unless
2145
--force is given.
2146
2147
The following merge types are available:
2148
"""
2149
takes_args = ['branch?']
2150
takes_options = ['revision', 'force', 'merge-type', 'reprocess', 'remember',
2151
Option('show-base', help="Show base revision text in "
2152
"conflicts"),
2153
Option('uncommitted', help='Apply uncommitted changes'
2154
' from a working copy, instead of branch changes')]
2155
2156
def help(self):
2157
from inspect import getdoc
2158
return getdoc(self) + '\n' + _mod_merge.merge_type_help()
2159
2160
def run(self, branch=None, revision=None, force=False, merge_type=None,
2161
show_base=False, reprocess=False, remember=False,
2162
uncommitted=False):
2163
if merge_type is None:
2164
merge_type = _mod_merge.Merge3Merger
2165
2166
tree = WorkingTree.open_containing(u'.')[0]
2167
2168
if branch is not None:
2169
try:
2170
reader = bundle.read_bundle_from_url(branch)
2171
except errors.NotABundle:
2172
pass # Continue on considering this url a Branch
2173
else:
2174
conflicts = merge_bundle(reader, tree, not force, merge_type,
2175
reprocess, show_base)
2176
if conflicts == 0:
2177
return 0
2178
else:
2179
return 1
2180
2181
if revision is None \
2182
or len(revision) < 1 or revision[0].needs_branch():
2183
branch = self._get_remembered_parent(tree, branch, 'Merging from')
2184
2185
if revision is None or len(revision) < 1:
2186
if uncommitted:
2187
base = [branch, -1]
2188
other = [branch, None]
2189
else:
2190
base = [None, None]
2191
other = [branch, -1]
2192
other_branch, path = Branch.open_containing(branch)
2193
else:
2194
if uncommitted:
2195
raise errors.BzrCommandError('Cannot use --uncommitted and'
2196
' --revision at the same time.')
2197
branch = revision[0].get_branch() or branch
2198
if len(revision) == 1:
2199
base = [None, None]
2200
other_branch, path = Branch.open_containing(branch)
2201
revno = revision[0].in_history(other_branch).revno
2202
other = [branch, revno]
2203
else:
2204
assert len(revision) == 2
2205
if None in revision:
2206
raise errors.BzrCommandError(
2207
"Merge doesn't permit empty revision specifier.")
2208
base_branch, path = Branch.open_containing(branch)
2209
branch1 = revision[1].get_branch() or branch
2210
other_branch, path1 = Branch.open_containing(branch1)
2211
if revision[0].get_branch() is not None:
2212
# then path was obtained from it, and is None.
2213
path = path1
2214
2215
base = [branch, revision[0].in_history(base_branch).revno]
2216
other = [branch1, revision[1].in_history(other_branch).revno]
2217
2218
if tree.branch.get_parent() is None or remember:
2219
tree.branch.set_parent(other_branch.base)
2220
2221
if path != "":
2222
interesting_files = [path]
2223
else:
2224
interesting_files = None
2225
pb = ui.ui_factory.nested_progress_bar()
2226
try:
2227
try:
2228
conflict_count = _merge_helper(
2229
other, base, check_clean=(not force),
2230
merge_type=merge_type,
2231
reprocess=reprocess,
2232
show_base=show_base,
2233
pb=pb, file_list=interesting_files)
2234
finally:
2235
pb.finished()
2236
if conflict_count != 0:
2237
return 1
2238
else:
2239
return 0
2240
except errors.AmbiguousBase, e:
2241
m = ("sorry, bzr can't determine the right merge base yet\n"
2242
"candidates are:\n "
2243
+ "\n ".join(e.bases)
2244
+ "\n"
2245
"please specify an explicit base with -r,\n"
2246
"and (if you want) report this to the bzr developers\n")
2247
log_error(m)
2248
2249
# TODO: move up to common parent; this isn't merge-specific anymore.
2250
def _get_remembered_parent(self, tree, supplied_location, verb_string):
2251
"""Use tree.branch's parent if none was supplied.
2252
2253
Report if the remembered location was used.
2254
"""
2255
if supplied_location is not None:
2256
return supplied_location
2257
stored_location = tree.branch.get_parent()
2258
mutter("%s", stored_location)
2259
if stored_location is None:
2260
raise errors.BzrCommandError("No location specified or remembered")
2261
display_url = urlutils.unescape_for_display(stored_location, self.outf.encoding)
2262
self.outf.write("%s remembered location %s\n" % (verb_string, display_url))
2263
return stored_location
2264
2265
2266
class cmd_remerge(Command):
2267
"""Redo a merge.
2268
2269
Use this if you want to try a different merge technique while resolving
2270
conflicts. Some merge techniques are better than others, and remerge
2271
lets you try different ones on different files.
2272
2273
The options for remerge have the same meaning and defaults as the ones for
2274
merge. The difference is that remerge can (only) be run when there is a
2275
pending merge, and it lets you specify particular files.
2276
2277
Examples:
2278
$ bzr remerge --show-base
2279
Re-do the merge of all conflicted files, and show the base text in
2280
conflict regions, in addition to the usual THIS and OTHER texts.
2281
2282
$ bzr remerge --merge-type weave --reprocess foobar
2283
Re-do the merge of "foobar", using the weave merge algorithm, with
2284
additional processing to reduce the size of conflict regions.
2285
2286
The following merge types are available:"""
2287
takes_args = ['file*']
2288
takes_options = ['merge-type', 'reprocess',
2289
Option('show-base', help="Show base revision text in "
2290
"conflicts")]
2291
2292
def help(self):
2293
from inspect import getdoc
2294
return getdoc(self) + '\n' + _mod_merge.merge_type_help()
2295
2296
def run(self, file_list=None, merge_type=None, show_base=False,
2297
reprocess=False):
2298
if merge_type is None:
2299
merge_type = _mod_merge.Merge3Merger
2300
tree, file_list = tree_files(file_list)
2301
tree.lock_write()
2302
try:
2303
parents = tree.get_parent_ids()
2304
if len(parents) != 2:
2305
raise errors.BzrCommandError("Sorry, remerge only works after normal"
2306
" merges. Not cherrypicking or"
2307
" multi-merges.")
2308
repository = tree.branch.repository
2309
base_revision = common_ancestor(parents[0],
2310
parents[1], repository)
2311
base_tree = repository.revision_tree(base_revision)
2312
other_tree = repository.revision_tree(parents[1])
2313
interesting_ids = None
2314
new_conflicts = []
2315
conflicts = tree.conflicts()
2316
if file_list is not None:
2317
interesting_ids = set()
2318
for filename in file_list:
2319
file_id = tree.path2id(filename)
2320
if file_id is None:
2321
raise errors.NotVersionedError(filename)
2322
interesting_ids.add(file_id)
2323
if tree.kind(file_id) != "directory":
2324
continue
2325
2326
for name, ie in tree.inventory.iter_entries(file_id):
2327
interesting_ids.add(ie.file_id)
2328
new_conflicts = conflicts.select_conflicts(tree, file_list)[0]
2329
_mod_merge.transform_tree(tree, tree.basis_tree(), interesting_ids)
2330
tree.set_conflicts(ConflictList(new_conflicts))
2331
if file_list is None:
2332
restore_files = list(tree.iter_conflicts())
2333
else:
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.SmartStreamServer(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.1