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