« back to all changes in this revision
Viewing changes to bzrlib/builtins.py
- browse files at revision 1692.7.3
- compare with another revision
- download diff
- download tarball
- view history from revision 1692.7.3
- Committer: Martin Pool
- Date: 2006-05-04 02:40:31 UTC
- mto: This revision was merged to the branch mainline in revision 1697.
- Revision ID: mbp@sourcefrog.net-20060504024031-82abe45d799c9350
Remove backup warning from bzr help
- files added:
- BRANCH.TODO
- bzrlib/doc
- bzrlib/doc/api
- bzrlib/export
- 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/interversionedfile_implementations
- bzrlib/tests/repository_implementations
- bzrlib/tests/revisionstore_implementations
- bzrlib/tests/workingtree_implementations
- bzrlib/transport
- bzrlib/transport/http
- bzrlib/ui
- bzrlib/util/configobj
- bzrlib/util/configobj/docs
- tools/doc_generate
- files removed:
- bzrlib/changeset.py
- patches
- files renamed:
- bzrlib/store.py => bzrlib/store/__init__.py
- bzrlib/selftest/ => bzrlib/tests/
- bzrlib/selftest/teststatus.py => bzrlib/tests/blackbox/test_status.py
- bzrlib/selftest/blackbox.py => bzrlib/tests/blackbox/test_too_much.py
- bzrlib/selftest/versioning.py => bzrlib/tests/blackbox/test_versioning.py
- bzrlib/selftest/testbranch.py => bzrlib/tests/branch_implementations/test_branch.py
- bzrlib/selftest/test_parent.py => bzrlib/tests/branch_implementations/test_parent.py
- bzrlib/selftest/testdiff.py => bzrlib/tests/test_diff.py
- bzrlib/selftest/testfetch.py => bzrlib/tests/test_fetch.py
- bzrlib/selftest/testhashcache.py => bzrlib/tests/test_hashcache.py
- bzrlib/selftest/testinv.py => bzrlib/tests/test_inv.py
- bzrlib/selftest/testlog.py => bzrlib/tests/test_log.py
- bzrlib/selftest/testmerge3.py => bzrlib/tests/test_merge3.py
- bzrlib/selftest/plugins.py => bzrlib/tests/test_plugins.py
- bzrlib/selftest/testrevision.py => bzrlib/tests/test_revision.py
- bzrlib/selftest/testrevisionnamespaces.py => bzrlib/tests/test_revisionnamespaces.py
- tools/testweave.py => bzrlib/tests/test_weave.py
- bzrlib/selftest/whitebox.py => bzrlib/tests/test_whitebox.py
- bzrlib/ui.py => bzrlib/ui/__init__.py
- tools/history2weaves.py => bzrlib/upgrade.py
- bzrlib/xml.py => bzrlib/xml_serializer.py
- bzrlib/newinventory.py => contrib/newinventory.py
- bzr-man.py => tools/doc_generate/autodoc_man.py
- files modified:
- .bzrignore
- bzr *
- setup.py *
added
removed
bzrlib/builtins.py
1
# Copyright (C) 2004, 2005 by Canonical Ltd
1
# Copyright (C) 2004, 2005, 2006 by Canonical Ltd
2
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
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
17
"""builtin bzr commands"""
18
19
20
import errno
21
import os
22
from shutil import rmtree
18
23
import sys
19
import os
20
24
21
25
import bzrlib
26
import bzrlib.branch
27
from bzrlib.branch import Branch
28
import bzrlib.bzrdir as bzrdir
29
from bzrlib.commands import Command, display_command
30
from bzrlib.revision import common_ancestor
31
import bzrlib.errors as errors
32
from bzrlib.errors import (BzrError, BzrCheckError, BzrCommandError,
33
NotBranchError, DivergedBranches, NotConflicted,
34
NoSuchFile, NoWorkingTree, FileInWrongBranch,
35
NotVersionedError)
36
from bzrlib.log import show_one_log
37
from bzrlib.merge import Merge3Merger
38
from bzrlib.option import Option
39
from bzrlib.progress import DummyProgress, ProgressPhase
40
from bzrlib.revisionspec import RevisionSpec
22
41
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
42
from bzrlib.trace import mutter, note, log_error, warning, is_quiet
43
from bzrlib.transport.local import LocalTransport
44
import bzrlib.ui
45
from bzrlib.workingtree import WorkingTree
46
47
48
def tree_files(file_list, default_branch=u'.'):
49
try:
50
return internal_tree_files(file_list, default_branch)
51
except FileInWrongBranch, e:
52
raise BzrCommandError("%s is not in the same branch as %s" %
53
(e.path, file_list[0]))
54
55
56
# XXX: Bad function name; should possibly also be a class method of
57
# WorkingTree rather than a function.
58
def internal_tree_files(file_list, default_branch=u'.'):
59
"""Convert command-line paths to a WorkingTree and relative paths.
60
61
This is typically used for command-line processors that take one or
62
more filenames, and infer the workingtree that contains them.
63
64
The filenames given are not required to exist.
65
66
:param file_list: Filenames to convert.
67
68
:param default_branch: Fallback tree path to use if file_list is empty or None.
69
70
:return: workingtree, [relative_paths]
71
"""
72
if file_list is None or len(file_list) == 0:
73
return WorkingTree.open_containing(default_branch)[0], file_list
74
tree = WorkingTree.open_containing(file_list[0])[0]
75
new_list = []
76
for filename in file_list:
77
try:
78
new_list.append(tree.relpath(filename))
79
except errors.PathNotChild:
80
raise FileInWrongBranch(tree.branch, filename)
81
return tree, new_list
82
83
84
def get_format_type(typestring):
85
"""Parse and return a format specifier."""
86
if typestring == "weave":
87
return bzrdir.BzrDirFormat6()
88
if typestring == "metadir":
89
return bzrdir.BzrDirMetaFormat1()
90
if typestring == "knit":
91
format = bzrdir.BzrDirMetaFormat1()
92
format.repository_format = bzrlib.repository.RepositoryFormatKnit1()
93
return format
94
msg = "No known bzr-dir format %s. Supported types are: weave, metadir\n" %\
95
(typestring)
96
raise BzrCommandError(msg)
97
98
99
# TODO: Make sure no commands unconditionally use the working directory as a
100
# branch. If a filename argument is used, the first of them should be used to
101
# specify the branch. (Perhaps this can be factored out into some kind of
102
# Argument class, representing a file in a branch, where the first occurrence
103
# opens the branch?)
29
104
30
105
class cmd_status(Command):
31
106
"""Display status summary.
63
138
files or directories is reported. If a directory is given, status
64
139
is reported for everything inside that directory.
65
140
66
If a revision is specified, the changes since that revision are shown.
141
If a revision argument is given, the status is calculated against
142
that revision, or between two revisions if two are provided.
67
143
"""
144
145
# TODO: --no-recurse, --recurse options
146
68
147
takes_args = ['file*']
69
148
takes_options = ['all', 'show-ids', 'revision']
70
149
aliases = ['st', 'stat']
71
150
72
def run(self, all=False, show_ids=False, file_list=None):
73
if file_list:
74
b = find_branch(file_list[0])
75
file_list = [b.relpath(x) for x in file_list]
76
# special case: only one path was given and it's the root
77
# of the branch
78
if file_list == ['']:
79
file_list = None
80
else:
81
b = find_branch('.')
151
@display_command
152
def run(self, all=False, show_ids=False, file_list=None, revision=None):
153
tree, file_list = tree_files(file_list)
82
154
83
from bzrlib.status import show_status
84
show_status(b, show_unchanged=all, show_ids=show_ids,
85
specific_files=file_list)
155
from bzrlib.status import show_tree_status
156
show_tree_status(tree, show_unchanged=all, show_ids=show_ids,
157
specific_files=file_list, revision=revision)
86
158
87
159
88
160
class cmd_cat_revision(Command):
89
"""Write out metadata for a revision."""
161
"""Write out metadata for a revision.
162
163
The revision to print can either be specified by a specific
164
revision identifier, or you can use --revision.
165
"""
90
166
91
167
hidden = True
92
takes_args = ['revision_id']
168
takes_args = ['revision_id?']
169
takes_options = ['revision']
93
170
94
def run(self, revision_id):
95
from bzrlib.xml import pack_xml
96
pack_xml(find_branch('.').get_revision(revision_id), sys.stdout)
171
@display_command
172
def run(self, revision_id=None, revision=None):
97
173
174
if revision_id is not None and revision is not None:
175
raise BzrCommandError('You can only supply one of revision_id or --revision')
176
if revision_id is None and revision is None:
177
raise BzrCommandError('You must supply either --revision or a revision_id')
178
b = WorkingTree.open_containing(u'.')[0].branch
179
if revision_id is not None:
180
sys.stdout.write(b.repository.get_revision_xml(revision_id))
181
elif revision is not None:
182
for rev in revision:
183
if rev is None:
184
raise BzrCommandError('You cannot specify a NULL revision.')
185
revno, rev_id = rev.in_history(b)
186
sys.stdout.write(b.repository.get_revision_xml(rev_id))
187
98
188
99
189
class cmd_revno(Command):
100
190
"""Show current revision number.
101
191
102
192
This is equal to the number of revisions on this branch."""
103
def run(self):
104
print find_branch('.').revno()
193
takes_args = ['location?']
194
@display_command
195
def run(self, location=u'.'):
196
print Branch.open_containing(location)[0].revno()
197
105
198
106
199
class cmd_revision_info(Command):
107
200
"""Show revision number and revision id for a given revision identifier.
109
202
hidden = True
110
203
takes_args = ['revision_info*']
111
204
takes_options = ['revision']
112
def run(self, revision=None, revision_info_list=None):
113
from bzrlib.branch import find_branch
205
@display_command
206
def run(self, revision=None, revision_info_list=[]):
114
207
115
208
revs = []
116
209
if revision is not None:
117
210
revs.extend(revision)
118
211
if revision_info_list is not None:
119
revs.extend(revision_info_list)
212
for rev in revision_info_list:
213
revs.append(RevisionSpec(rev))
120
214
if len(revs) == 0:
121
215
raise BzrCommandError('You must supply a revision identifier')
122
216
123
b = find_branch('.')
217
b = WorkingTree.open_containing(u'.')[0].branch
124
218
125
219
for rev in revs:
126
print '%4d %s' % b.get_revision_info(rev)
220
revinfo = rev.in_history(b)
221
if revinfo.revno is None:
222
print ' %s' % revinfo.rev_id
223
else:
224
print '%4d %s' % (revinfo.revno, revinfo.rev_id)
127
225
128
226
129
227
class cmd_add(Command):
144
242
Therefore simply saying 'bzr add' will version all files that
145
243
are currently unknown.
146
244
147
TODO: Perhaps adding a file whose directly is not versioned should
148
recursively add that parent, rather than giving an error?
245
Adding a file whose parent directory is not versioned will
246
implicitly add the parent, and so on up to the root. This means
247
you should never need to explictly add a directory, they'll just
248
get added when you add a file in the directory.
249
250
--dry-run will show which files would be added, but not actually
251
add them.
149
252
"""
150
253
takes_args = ['file*']
151
takes_options = ['verbose', 'no-recurse']
152
153
def run(self, file_list, verbose=False, no_recurse=False):
154
# verbose currently has no effect
155
from bzrlib.add import smart_add, add_reporter_print
156
smart_add(file_list, not no_recurse, add_reporter_print)
157
254
takes_options = ['no-recurse', 'dry-run', 'verbose']
255
256
def run(self, file_list, no_recurse=False, dry_run=False, verbose=False):
257
import bzrlib.add
258
259
if dry_run:
260
if is_quiet():
261
# This is pointless, but I'd rather not raise an error
262
action = bzrlib.add.add_action_null
263
else:
264
action = bzrlib.add.add_action_print
265
elif is_quiet():
266
action = bzrlib.add.add_action_add
267
else:
268
action = bzrlib.add.add_action_add_and_print
269
270
added, ignored = bzrlib.add.smart_add(file_list, not no_recurse,
271
action)
272
if len(ignored) > 0:
273
for glob in sorted(ignored.keys()):
274
match_len = len(ignored[glob])
275
if verbose:
276
for path in ignored[glob]:
277
print "ignored %s matching \"%s\"" % (path, glob)
278
else:
279
print "ignored %d file(s) matching \"%s\"" % (match_len,
280
glob)
281
print "If you wish to add some of these files, please add them"\
282
" by name."
158
283
159
284
160
285
class cmd_mkdir(Command):
165
290
takes_args = ['dir+']
166
291
167
292
def run(self, dir_list):
168
b = None
169
170
293
for d in dir_list:
171
294
os.mkdir(d)
172
if not b:
173
b = find_branch(d)
174
b.add([d])
295
wt, dd = WorkingTree.open_containing(d)
296
wt.add([dd])
175
297
print 'added', d
176
298
177
299
180
302
takes_args = ['filename']
181
303
hidden = True
182
304
305
@display_command
183
306
def run(self, filename):
184
print find_branch(filename).relpath(filename)
185
307
tree, relpath = WorkingTree.open_containing(filename)
308
print relpath
186
309
187
310
188
311
class cmd_inventory(Command):
189
"""Show inventory of the current working copy or a revision."""
190
takes_options = ['revision', 'show-ids']
312
"""Show inventory of the current working copy or a revision.
313
314
It is possible to limit the output to a particular entry
315
type using the --kind option. For example; --kind file.
316
"""
317
takes_options = ['revision', 'show-ids', 'kind']
191
318
192
def run(self, revision=None, show_ids=False):
193
b = find_branch('.')
194
if revision == None:
195
inv = b.read_working_inventory()
319
@display_command
320
def run(self, revision=None, show_ids=False, kind=None):
321
if kind and kind not in ['file', 'directory', 'symlink']:
322
raise BzrCommandError('invalid kind specified')
323
tree = WorkingTree.open_containing(u'.')[0]
324
if revision is None:
325
inv = tree.read_working_inventory()
196
326
else:
197
327
if len(revision) > 1:
198
328
raise BzrCommandError('bzr inventory --revision takes'
199
329
' exactly one revision identifier')
200
inv = b.get_revision_inventory(b.lookup_revision(revision[0]))
330
inv = tree.branch.repository.get_revision_inventory(
331
revision[0].in_history(tree.branch).rev_id)
201
332
202
333
for path, entry in inv.entries():
334
if kind and kind != entry.kind:
335
continue
203
336
if show_ids:
204
337
print '%-50s %s' % (path, entry.file_id)
205
338
else:
206
339
print path
207
340
208
341
209
class cmd_move(Command):
210
"""Move files to a different directory.
211
212
examples:
213
bzr move *.txt doc
214
215
The destination must be a versioned directory in the same branch.
216
"""
217
takes_args = ['source$', 'dest']
218
def run(self, source_list, dest):
219
b = find_branch('.')
220
221
# TODO: glob expansion on windows?
222
b.move([b.relpath(s) for s in source_list], b.relpath(dest))
223
224
225
class cmd_rename(Command):
226
"""Change the name of an entry.
227
228
examples:
229
bzr rename frob.c frobber.c
230
bzr rename src/frob.c lib/frob.c
231
232
It is an error if the destination name exists.
233
234
See also the 'move' command, which moves files into a different
235
directory without changing their name.
236
237
TODO: Some way to rename multiple files without invoking bzr for each
238
one?"""
239
takes_args = ['from_name', 'to_name']
240
241
def run(self, from_name, to_name):
242
b = find_branch('.')
243
b.rename_one(b.relpath(from_name), b.relpath(to_name))
244
245
246
247
342
class cmd_mv(Command):
248
343
"""Move or rename a file.
249
344
258
353
Files cannot be moved between branches.
259
354
"""
260
355
takes_args = ['names*']
356
aliases = ['move', 'rename']
357
261
358
def run(self, names_list):
262
359
if len(names_list) < 2:
263
360
raise BzrCommandError("missing file argument")
264
b = find_branch(names_list[0])
265
266
rel_names = [b.relpath(x) for x in names_list]
361
tree, rel_names = tree_files(names_list)
267
362
268
363
if os.path.isdir(names_list[-1]):
269
364
# move into existing directory
270
for pair in b.move(rel_names[:-1], rel_names[-1]):
365
for pair in tree.move(rel_names[:-1], rel_names[-1]):
271
366
print "%s => %s" % pair
272
367
else:
273
368
if len(names_list) != 2:
274
369
raise BzrCommandError('to mv multiple files the destination '
275
370
'must be a versioned directory')
276
for pair in b.move(rel_names[0], rel_names[1]):
277
print "%s => %s" % pair
371
tree.rename_one(rel_names[0], rel_names[1])
372
print "%s => %s" % (rel_names[0], rel_names[1])
278
373
279
374
280
281
282
375
class cmd_pull(Command):
283
"""Pull any changes from another branch into the current one.
284
285
If the location is omitted, the last-used location will be used.
286
Both the revision history and the working directory will be
287
updated.
376
"""Turn this branch into a mirror of another branch.
288
377
289
378
This command only works on branches that have not diverged. Branches are
290
considered diverged if both branches have had commits without first
291
pulling from the other.
379
considered diverged if the destination branch's most recent commit is one
380
that has not been merged (directly or indirectly) into the parent.
381
382
If branches have diverged, you can use 'bzr merge' to integrate the changes
383
from one into the other. Once one branch has merged, the other should
384
be able to pull it again.
292
385
293
386
If branches have diverged, you can use 'bzr merge' to pull the text changes
294
from one into the other.
387
from one into the other. Once one branch has merged, the other should
388
be able to pull it again.
389
390
If you want to forget your local changes and just update your branch to
391
match the remote one, use pull --overwrite.
392
393
If there is no default location set, the first pull will set it. After
394
that, you can omit the location to use the default. To change the
395
default, use --remember.
295
396
"""
397
takes_options = ['remember', 'overwrite', 'revision', 'verbose']
296
398
takes_args = ['location?']
297
399
298
def run(self, location=None):
299
from bzrlib.merge import merge
300
import tempfile
301
from shutil import rmtree
302
import errno
303
from bzrlib.branch import pull_loc
304
305
br_to = find_branch('.')
306
stored_loc = None
400
def run(self, location=None, remember=False, overwrite=False, revision=None, verbose=False):
401
# FIXME: too much stuff is in the command class
307
402
try:
308
stored_loc = br_to.controlfile("x-pull", "rb").read().rstrip('\n')
309
except IOError, e:
310
if e.errno != errno.ENOENT:
311
raise
403
tree_to = WorkingTree.open_containing(u'.')[0]
404
branch_to = tree_to.branch
405
except NoWorkingTree:
406
tree_to = None
407
branch_to = Branch.open_containing(u'.')[0]
408
stored_loc = branch_to.get_parent()
312
409
if location is None:
313
410
if stored_loc is None:
314
411
raise BzrCommandError("No pull location known or specified.")
315
412
else:
316
print "Using last location: %s" % stored_loc
317
location = stored_loc
318
cache_root = tempfile.mkdtemp()
319
from bzrlib.branch import DivergedBranches
320
br_from = find_branch(location)
321
location = pull_loc(br_from)
322
old_revno = br_to.revno()
323
try:
324
from branch import find_cached_branch, DivergedBranches
325
br_from = find_cached_branch(location, cache_root)
326
location = pull_loc(br_from)
327
old_revno = br_to.revno()
413
print "Using saved location: %s" % stored_loc
414
location = stored_loc
415
416
if branch_to.get_parent() is None or remember:
417
branch_to.set_parent(location)
418
419
branch_from = Branch.open(location)
420
421
if revision is None:
422
rev_id = None
423
elif len(revision) == 1:
424
rev_id = revision[0].in_history(branch_from).rev_id
425
else:
426
raise BzrCommandError('bzr pull --revision takes one value.')
427
428
old_rh = branch_to.revision_history()
429
if tree_to is not None:
430
count = tree_to.pull(branch_from, overwrite, rev_id)
431
else:
432
count = branch_to.pull(branch_from, overwrite, rev_id)
433
note('%d revision(s) pulled.' % (count,))
434
435
if verbose:
436
new_rh = branch_to.revision_history()
437
if old_rh != new_rh:
438
# Something changed
439
from bzrlib.log import show_changed_revisions
440
show_changed_revisions(branch_to, old_rh, new_rh)
441
442
443
class cmd_push(Command):
444
"""Update a mirror of this branch.
445
446
The target branch will not have its working tree populated because this
447
is both expensive, and is not supported on remote file systems.
448
449
Some smart servers or protocols *may* put the working tree in place in
450
the future.
451
452
This command only works on branches that have not diverged. Branches are
453
considered diverged if the destination branch's most recent commit is one
454
that has not been merged (directly or indirectly) by the source branch.
455
456
If branches have diverged, you can use 'bzr push --overwrite' to replace
457
the other branch completely, discarding its unmerged changes.
458
459
If you want to ensure you have the different changes in the other branch,
460
do a merge (see bzr help merge) from the other branch, and commit that.
461
After that you will be able to do a push without '--overwrite'.
462
463
If there is no default push location set, the first push will set it.
464
After that, you can omit the location to use the default. To change the
465
default, use --remember.
466
"""
467
takes_options = ['remember', 'overwrite',
468
Option('create-prefix',
469
help='Create the path leading up to the branch '
470
'if it does not already exist')]
471
takes_args = ['location?']
472
473
def run(self, location=None, remember=False, overwrite=False,
474
create_prefix=False, verbose=False):
475
# FIXME: Way too big! Put this into a function called from the
476
# command.
477
from bzrlib.transport import get_transport
478
479
tree_from = WorkingTree.open_containing(u'.')[0]
480
br_from = tree_from.branch
481
stored_loc = tree_from.branch.get_push_location()
482
if location is None:
483
if stored_loc is None:
484
raise BzrCommandError("No push location known or specified.")
485
else:
486
print "Using saved location: %s" % stored_loc
487
location = stored_loc
488
if br_from.get_push_location() is None or remember:
489
br_from.set_push_location(location)
490
try:
491
dir_to = bzrlib.bzrdir.BzrDir.open(location)
492
br_to = dir_to.open_branch()
493
except NotBranchError:
494
# create a branch.
495
transport = get_transport(location).clone('..')
496
if not create_prefix:
497
try:
498
transport.mkdir(transport.relpath(location))
499
except NoSuchFile:
500
raise BzrCommandError("Parent directory of %s "
501
"does not exist." % location)
502
else:
503
current = transport.base
504
needed = [(transport, transport.relpath(location))]
505
while needed:
506
try:
507
transport, relpath = needed[-1]
508
transport.mkdir(relpath)
509
needed.pop()
510
except NoSuchFile:
511
new_transport = transport.clone('..')
512
needed.append((new_transport,
513
new_transport.relpath(transport.base)))
514
if new_transport.base == transport.base:
515
raise BzrCommandError("Could not create "
516
"path prefix.")
517
dir_to = br_from.bzrdir.clone(location)
518
br_to = dir_to.open_branch()
519
old_rh = br_to.revision_history()
520
try:
328
521
try:
329
br_to.update_revisions(br_from)
330
except DivergedBranches:
331
raise BzrCommandError("These branches have diverged."
332
" Try merge.")
333
334
merge(('.', -1), ('.', old_revno), check_clean=False)
335
if location != stored_loc:
336
br_to.controlfile("x-pull", "wb").write(location + "\n")
337
finally:
338
rmtree(cache_root)
522
tree_to = dir_to.open_workingtree()
523
except errors.NotLocalUrl:
524
# TODO: This should be updated for branches which don't have a
525
# working tree, as opposed to ones where we just couldn't
526
# update the tree.
527
warning('This transport does not update the working '
528
'tree of: %s' % (br_to.base,))
529
count = br_to.pull(br_from, overwrite)
530
except NoWorkingTree:
531
count = br_to.pull(br_from, overwrite)
532
else:
533
count = tree_to.pull(br_from, overwrite)
534
except DivergedBranches:
535
raise BzrCommandError("These branches have diverged."
536
" Try a merge then push with overwrite.")
537
note('%d revision(s) pushed.' % (count,))
339
538
539
if verbose:
540
new_rh = br_to.revision_history()
541
if old_rh != new_rh:
542
# Something changed
543
from bzrlib.log import show_changed_revisions
544
show_changed_revisions(br_to, old_rh, new_rh)
340
545
341
546
342
547
class cmd_branch(Command):
347
552
348
553
To retrieve the branch as of a particular revision, supply the --revision
349
554
parameter, as in "branch foo/bar -r 5".
555
556
--basis is to speed up branching from remote branches. When specified, it
557
copies all the file-contents, inventory and revision data from the basis
558
branch before copying anything from the remote branch.
350
559
"""
351
560
takes_args = ['from_location', 'to_location?']
352
takes_options = ['revision']
561
takes_options = ['revision', 'basis']
353
562
aliases = ['get', 'clone']
354
563
355
def run(self, from_location, to_location=None, revision=None):
356
from bzrlib.branch import copy_branch, find_cached_branch
357
import tempfile
358
import errno
359
from shutil import rmtree
360
cache_root = tempfile.mkdtemp()
361
try:
362
if revision is None:
363
revision = [None]
364
elif len(revision) > 1:
365
raise BzrCommandError(
366
'bzr branch --revision takes exactly 1 revision value')
367
try:
368
br_from = find_cached_branch(from_location, cache_root)
369
except OSError, e:
370
if e.errno == errno.ENOENT:
371
raise BzrCommandError('Source location "%s" does not'
372
' exist.' % to_location)
373
else:
374
raise
564
def run(self, from_location, to_location=None, revision=None, basis=None):
565
if revision is None:
566
revision = [None]
567
elif len(revision) > 1:
568
raise BzrCommandError(
569
'bzr branch --revision takes exactly 1 revision value')
570
try:
571
br_from = Branch.open(from_location)
572
except OSError, e:
573
if e.errno == errno.ENOENT:
574
raise BzrCommandError('Source location "%s" does not'
575
' exist.' % to_location)
576
else:
577
raise
578
br_from.lock_read()
579
try:
580
if basis is not None:
581
basis_dir = bzrdir.BzrDir.open_containing(basis)[0]
582
else:
583
basis_dir = None
584
if len(revision) == 1 and revision[0] is not None:
585
revision_id = revision[0].in_history(br_from)[1]
586
else:
587
# FIXME - wt.last_revision, fallback to branch, fall back to
588
# None or perhaps NULL_REVISION to mean copy nothing
589
# RBC 20060209
590
revision_id = br_from.last_revision()
375
591
if to_location is None:
376
592
to_location = os.path.basename(from_location.rstrip("/\\"))
593
name = None
594
else:
595
name = os.path.basename(to_location) + '\n'
377
596
try:
378
597
os.mkdir(to_location)
379
598
except OSError, e:
386
605
else:
387
606
raise
388
607
try:
389
copy_branch(br_from, to_location, revision[0])
608
# preserve whatever source format we have.
609
dir = br_from.bzrdir.sprout(to_location, revision_id, basis_dir)
610
branch = dir.open_branch()
390
611
except bzrlib.errors.NoSuchRevision:
391
612
rmtree(to_location)
392
msg = "The branch %s has no revision %d." % (from_location, revision[0])
393
raise BzrCommandError(msg)
394
finally:
395
rmtree(cache_root)
613
msg = "The branch %s has no revision %s." % (from_location, revision[0])
614
raise BzrCommandError(msg)
615
except bzrlib.errors.UnlistableBranch:
616
rmtree(to_location)
617
msg = "The branch %s cannot be used as a --basis" % (basis,)
618
raise BzrCommandError(msg)
619
if name:
620
branch.control_files.put_utf8('branch-name', name)
621
622
note('Branched %d revision(s).' % branch.revno())
623
finally:
624
br_from.unlock()
625
626
627
class cmd_checkout(Command):
628
"""Create a new checkout of an existing branch.
629
630
If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree for
631
the branch found in '.'. This is useful if you have removed the working tree
632
or if it was never created - i.e. if you pushed the branch to its current
633
location using SFTP.
634
635
If the TO_LOCATION is omitted, the last component of the BRANCH_LOCATION will
636
be used. In other words, "checkout ../foo/bar" will attempt to create ./bar.
637
638
To retrieve the branch as of a particular revision, supply the --revision
639
parameter, as in "checkout foo/bar -r 5". Note that this will be immediately
640
out of date [so you cannot commit] but it may be useful (i.e. to examine old
641
code.)
642
643
--basis is to speed up checking out from remote branches. When specified, it
644
uses the inventory and file contents from the basis branch in preference to the
645
branch being checked out.
646
"""
647
takes_args = ['branch_location?', 'to_location?']
648
takes_options = ['revision', # , 'basis']
649
Option('lightweight',
650
help="perform a lightweight checkout. Lightweight "
651
"checkouts depend on access to the branch for "
652
"every operation. Normal checkouts can perform "
653
"common operations like diff and status without "
654
"such access, and also support local commits."
655
),
656
]
657
658
def run(self, branch_location=None, to_location=None, revision=None, basis=None,
659
lightweight=False):
660
if revision is None:
661
revision = [None]
662
elif len(revision) > 1:
663
raise BzrCommandError(
664
'bzr checkout --revision takes exactly 1 revision value')
665
if branch_location is None:
666
branch_location = bzrlib.osutils.getcwd()
667
to_location = branch_location
668
source = Branch.open(branch_location)
669
if len(revision) == 1 and revision[0] is not None:
670
revision_id = revision[0].in_history(source)[1]
671
else:
672
revision_id = None
673
if to_location is None:
674
to_location = os.path.basename(branch_location.rstrip("/\\"))
675
# if the source and to_location are the same,
676
# and there is no working tree,
677
# then reconstitute a branch
678
if (bzrlib.osutils.abspath(to_location) ==
679
bzrlib.osutils.abspath(branch_location)):
680
try:
681
source.bzrdir.open_workingtree()
682
except errors.NoWorkingTree:
683
source.bzrdir.create_workingtree()
684
return
685
try:
686
os.mkdir(to_location)
687
except OSError, e:
688
if e.errno == errno.EEXIST:
689
raise BzrCommandError('Target directory "%s" already'
690
' exists.' % to_location)
691
if e.errno == errno.ENOENT:
692
raise BzrCommandError('Parent of "%s" does not exist.' %
693
to_location)
694
else:
695
raise
696
old_format = bzrlib.bzrdir.BzrDirFormat.get_default_format()
697
bzrlib.bzrdir.BzrDirFormat.set_default_format(bzrdir.BzrDirMetaFormat1())
698
try:
699
if lightweight:
700
checkout = bzrdir.BzrDirMetaFormat1().initialize(to_location)
701
bzrlib.branch.BranchReferenceFormat().initialize(checkout, source)
702
else:
703
checkout_branch = bzrlib.bzrdir.BzrDir.create_branch_convenience(
704
to_location, force_new_tree=False)
705
checkout = checkout_branch.bzrdir
706
checkout_branch.bind(source)
707
if revision_id is not None:
708
rh = checkout_branch.revision_history()
709
checkout_branch.set_revision_history(rh[:rh.index(revision_id) + 1])
710
checkout.create_workingtree(revision_id)
711
finally:
712
bzrlib.bzrdir.BzrDirFormat.set_default_format(old_format)
396
713
397
714
398
715
class cmd_renames(Command):
399
716
"""Show list of renamed files.
400
401
TODO: Option to show renames between two historical versions.
402
403
TODO: Only show renames under dir, rather than in the whole branch.
404
717
"""
718
# TODO: Option to show renames between two historical versions.
719
720
# TODO: Only show renames under dir, rather than in the whole branch.
405
721
takes_args = ['dir?']
406
722
407
def run(self, dir='.'):
408
b = find_branch(dir)
409
old_inv = b.basis_tree().inventory
410
new_inv = b.read_working_inventory()
723
@display_command
724
def run(self, dir=u'.'):
725
tree = WorkingTree.open_containing(dir)[0]
726
old_inv = tree.basis_tree().inventory
727
new_inv = tree.read_working_inventory()
411
728
412
729
renames = list(bzrlib.tree.find_renames(old_inv, new_inv))
413
730
renames.sort()
415
732
print "%s => %s" % (old_name, new_name)
416
733
417
734
735
class cmd_update(Command):
736
"""Update a tree to have the latest code committed to its branch.
737
738
This will perform a merge into the working tree, and may generate
739
conflicts. If you have any local changes, you will still
740
need to commit them after the update for the update to be complete.
741
742
If you want to discard your local changes, you can just do a
743
'bzr revert' instead of 'bzr commit' after the update.
744
"""
745
takes_args = ['dir?']
746
747
def run(self, dir='.'):
748
tree = WorkingTree.open_containing(dir)[0]
749
tree.lock_write()
750
try:
751
if tree.last_revision() == tree.branch.last_revision():
752
# may be up to date, check master too.
753
master = tree.branch.get_master_branch()
754
if master is None or master.last_revision == tree.last_revision():
755
note("Tree is up to date.")
756
return
757
conflicts = tree.update()
758
note('Updated to revision %d.' %
759
(tree.branch.revision_id_to_revno(tree.last_revision()),))
760
if conflicts != 0:
761
return 1
762
else:
763
return 0
764
finally:
765
tree.unlock()
766
767
418
768
class cmd_info(Command):
419
"""Show statistical information about a branch."""
420
takes_args = ['branch?']
421
422
def run(self, branch=None):
423
import info
424
425
b = find_branch(branch)
426
info.show_info(b)
769
"""Show information about a working tree, branch or repository.
770
771
This command will show all known locations and formats associated to the
772
tree, branch or repository. Statistical information is included with
773
each report.
774
775
Branches and working trees will also report any missing revisions.
776
"""
777
takes_args = ['location?']
778
takes_options = ['verbose']
779
780
@display_command
781
def run(self, location=None, verbose=False):
782
from bzrlib.info import show_bzrdir_info
783
show_bzrdir_info(bzrdir.BzrDir.open_containing(location)[0],
784
verbose=verbose)
427
785
428
786
429
787
class cmd_remove(Command):
434
792
"""
435
793
takes_args = ['file+']
436
794
takes_options = ['verbose']
795
aliases = ['rm']
437
796
438
797
def run(self, file_list, verbose=False):
439
b = find_branch(file_list[0])
440
b.remove([b.relpath(f) for f in file_list], verbose=verbose)
798
tree, file_list = tree_files(file_list)
799
tree.remove(file_list, verbose=verbose)
441
800
442
801
443
802
class cmd_file_id(Command):
449
808
"""
450
809
hidden = True
451
810
takes_args = ['filename']
811
@display_command
452
812
def run(self, filename):
453
b = find_branch(filename)
454
i = b.inventory.path2id(b.relpath(filename))
813
tree, relpath = WorkingTree.open_containing(filename)
814
i = tree.inventory.path2id(relpath)
455
815
if i == None:
456
816
raise BzrError("%r is not a versioned file" % filename)
457
817
else:
465
825
starting at the branch root."""
466
826
hidden = True
467
827
takes_args = ['filename']
828
@display_command
468
829
def run(self, filename):
469
b = find_branch(filename)
470
inv = b.inventory
471
fid = inv.path2id(b.relpath(filename))
830
tree, relpath = WorkingTree.open_containing(filename)
831
inv = tree.inventory
832
fid = inv.path2id(relpath)
472
833
if fid == None:
473
834
raise BzrError("%r is not a versioned file" % filename)
474
835
for fip in inv.get_idpath(fid):
475
836
print fip
476
837
477
838
839
class cmd_reconcile(Command):
840
"""Reconcile bzr metadata in a branch.
841
842
This can correct data mismatches that may have been caused by
843
previous ghost operations or bzr upgrades. You should only
844
need to run this command if 'bzr check' or a bzr developer
845
advises you to run it.
846
847
If a second branch is provided, cross-branch reconciliation is
848
also attempted, which will check that data like the tree root
849
id which was not present in very early bzr versions is represented
850
correctly in both branches.
851
852
At the same time it is run it may recompress data resulting in
853
a potential saving in disk space or performance gain.
854
855
The branch *MUST* be on a listable system such as local disk or sftp.
856
"""
857
takes_args = ['branch?']
858
859
def run(self, branch="."):
860
from bzrlib.reconcile import reconcile
861
dir = bzrlib.bzrdir.BzrDir.open(branch)
862
reconcile(dir)
863
864
478
865
class cmd_revision_history(Command):
479
866
"""Display list of revision ids on this branch."""
480
867
hidden = True
868
@display_command
481
869
def run(self):
482
for patchid in find_branch('.').revision_history():
870
branch = WorkingTree.open_containing(u'.')[0].branch
871
for patchid in branch.revision_history():
483
872
print patchid
484
873
485
874
486
class cmd_directories(Command):
487
"""Display list of versioned directories in this branch."""
875
class cmd_ancestry(Command):
876
"""List all revisions merged into this branch."""
877
hidden = True
878
@display_command
488
879
def run(self):
489
for name, ie in find_branch('.').read_working_inventory().directories():
490
if name == '':
491
print '.'
492
else:
493
print name
880
tree = WorkingTree.open_containing(u'.')[0]
881
b = tree.branch
882
# FIXME. should be tree.last_revision
883
for revision_id in b.repository.get_ancestry(b.last_revision()):
884
print revision_id
494
885
495
886
496
887
class cmd_init(Command):
499
890
Use this to create an empty branch, or before importing an
500
891
existing project.
501
892
893
If there is a repository in a parent directory of the location, then
894
the history of the branch will be stored in the repository. Otherwise
895
init creates a standalone branch which carries its own history in
896
.bzr.
897
898
If there is already a branch at the location but it has no working tree,
899
the tree can be populated with 'bzr checkout'.
900
502
901
Recipe for importing a tree of files:
503
902
cd ~/project
504
903
bzr init
505
bzr add -v .
904
bzr add .
506
905
bzr status
507
906
bzr commit -m 'imported project'
508
907
"""
509
def run(self):
908
takes_args = ['location?']
909
takes_options = [
910
Option('format',
911
help='Create a specific format rather than the'
912
' current default format. Currently supports:'
913
' metadir, knit, and weave',
914
type=get_format_type),
915
]
916
def run(self, location=None, format=None):
510
917
from bzrlib.branch import Branch
511
Branch('.', init=True)
918
if location is None:
919
location = u'.'
920
else:
921
# The path has to exist to initialize a
922
# branch inside of it.
923
# Just using os.mkdir, since I don't
924
# believe that we want to create a bunch of
925
# locations if the user supplies an extended path
926
if not os.path.exists(location):
927
os.mkdir(location)
928
try:
929
existing_bzrdir = bzrdir.BzrDir.open(location)
930
except NotBranchError:
931
# really a NotBzrDir error...
932
bzrdir.BzrDir.create_branch_convenience(location, format=format)
933
else:
934
if existing_bzrdir.has_branch():
935
if existing_bzrdir.has_workingtree():
936
raise errors.AlreadyBranchError(location)
937
else:
938
raise errors.BranchExistsWithoutWorkingTree(location)
939
else:
940
existing_bzrdir.create_branch()
941
existing_bzrdir.create_workingtree()
942
943
944
class cmd_init_repository(Command):
945
"""Create a shared repository to hold branches.
946
947
New branches created under the repository directory will store their revisions
948
in the repository, not in the branch directory, if the branch format supports
949
shared storage.
950
951
example:
952
bzr init-repo repo
953
bzr init repo/trunk
954
bzr checkout --lightweight repo/trunk trunk-checkout
955
cd trunk-checkout
956
(add files here)
957
"""
958
takes_args = ["location"]
959
takes_options = [Option('format',
960
help='Use a specific format rather than the'
961
' current default format. Currently this'
962
' option accepts "weave", "metadir" and "knit"',
963
type=get_format_type),
964
Option('trees',
965
help='Allows branches in repository to have'
966
' a working tree')]
967
aliases = ["init-repo"]
968
def run(self, location, format=None, trees=False):
969
from bzrlib.bzrdir import BzrDirMetaFormat1
970
from bzrlib.transport import get_transport
971
if format is None:
972
format = BzrDirMetaFormat1()
973
transport = get_transport(location)
974
if not transport.has('.'):
975
transport.mkdir('')
976
newdir = format.initialize_on_transport(transport)
977
repo = newdir.create_repository(shared=True)
978
repo.set_make_working_trees(trees)
512
979
513
980
514
981
class cmd_diff(Command):
517
984
If files are listed, only the changes in those files are listed.
518
985
Otherwise, all changes for the tree are listed.
519
986
520
TODO: Allow diff across branches.
521
522
TODO: Option to use external diff command; could be GNU diff, wdiff,
523
or a graphical diff.
524
525
TODO: Python difflib is not exactly the same as unidiff; should
526
either fix it up or prefer to use an external diff.
527
528
TODO: If a directory is given, diff everything under that.
529
530
TODO: Selected-file diff is inefficient and doesn't show you
531
deleted files.
532
533
TODO: This probably handles non-Unix newlines poorly.
534
535
987
examples:
536
988
bzr diff
537
989
bzr diff -r1
538
bzr diff -r1:2
990
bzr diff -r1..2
539
991
"""
992
# TODO: Allow diff across branches.
993
# TODO: Option to use external diff command; could be GNU diff, wdiff,
994
# or a graphical diff.
995
996
# TODO: Python difflib is not exactly the same as unidiff; should
997
# either fix it up or prefer to use an external diff.
998
999
# TODO: If a directory is given, diff everything under that.
1000
1001
# TODO: Selected-file diff is inefficient and doesn't show you
1002
# deleted files.
1003
1004
# TODO: This probably handles non-Unix newlines poorly.
540
1005
541
1006
takes_args = ['file*']
542
takes_options = ['revision', 'diff-options']
1007
takes_options = ['revision', 'diff-options', 'diff-prefix']
543
1008
aliases = ['di', 'dif']
544
1009
545
def run(self, revision=None, file_list=None, diff_options=None):
546
from bzrlib.diff import show_diff
1010
@display_command
1011
def run(self, revision=None, file_list=None, diff_options=None,
1012
diff_prefix=None):
1013
from bzrlib.diff import diff_cmd_helper, show_diff_trees
547
1014
548
if file_list:
549
b = find_branch(file_list[0])
550
file_list = [b.relpath(f) for f in file_list]
551
if file_list == ['']:
552
# just pointing to top-of-tree
553
file_list = None
1015
if diff_prefix:
1016
if not ':' in diff_prefix:
1017
raise BzrError("--diff-prefix expects two values separated by a colon")
1018
old_label,new_label=diff_prefix.split(":")
554
1019
else:
555
b = find_branch('.')
1020
old_label='a/'
1021
new_label='b/'
1022
1023
try:
1024
tree1, file_list = internal_tree_files(file_list)
1025
tree2 = None
1026
b = None
1027
b2 = None
1028
except FileInWrongBranch:
1029
if len(file_list) != 2:
1030
raise BzrCommandError("Files are in different branches")
556
1031
1032
tree1, file1 = WorkingTree.open_containing(file_list[0])
1033
tree2, file2 = WorkingTree.open_containing(file_list[1])
1034
if file1 != "" or file2 != "":
1035
# FIXME diff those two files. rbc 20051123
1036
raise BzrCommandError("Files are in different branches")
1037
file_list = None
557
1038
if revision is not None:
558
if len(revision) == 1:
559
show_diff(b, revision[0], specific_files=file_list,
560
external_diff_options=diff_options)
1039
if tree2 is not None:
1040
raise BzrCommandError("Can't specify -r with two branches")
1041
if (len(revision) == 1) or (revision[1].spec is None):
1042
return diff_cmd_helper(tree1, file_list, diff_options,
1043
revision[0],
1044
old_label=old_label, new_label=new_label)
561
1045
elif len(revision) == 2:
562
show_diff(b, revision[0], specific_files=file_list,
563
external_diff_options=diff_options,
564
revision2=revision[1])
1046
return diff_cmd_helper(tree1, file_list, diff_options,
1047
revision[0], revision[1],
1048
old_label=old_label, new_label=new_label)
565
1049
else:
566
1050
raise BzrCommandError('bzr diff --revision takes exactly one or two revision identifiers')
567
1051
else:
568
show_diff(b, None, specific_files=file_list,
569
external_diff_options=diff_options)
570
571
1052
if tree2 is not None:
1053
return show_diff_trees(tree1, tree2, sys.stdout,
1054
specific_files=file_list,
1055
external_diff_options=diff_options,
1056
old_label=old_label, new_label=new_label)
1057
else:
1058
return diff_cmd_helper(tree1, file_list, diff_options,
1059
old_label=old_label, new_label=new_label)
572
1060
573
1061
574
1062
class cmd_deleted(Command):
575
1063
"""List files deleted in the working tree.
576
577
TODO: Show files deleted since a previous revision, or between two revisions.
578
1064
"""
1065
# TODO: Show files deleted since a previous revision, or
1066
# between two revisions.
1067
# TODO: Much more efficient way to do this: read in new
1068
# directories with readdir, rather than stating each one. Same
1069
# level of effort but possibly much less IO. (Or possibly not,
1070
# if the directories are very large...)
1071
@display_command
579
1072
def run(self, show_ids=False):
580
b = find_branch('.')
581
old = b.basis_tree()
582
new = b.working_tree()
583
584
## TODO: Much more efficient way to do this: read in new
585
## directories with readdir, rather than stating each one. Same
586
## level of effort but possibly much less IO. (Or possibly not,
587
## if the directories are very large...)
588
1073
tree = WorkingTree.open_containing(u'.')[0]
1074
old = tree.basis_tree()
589
1075
for path, ie in old.inventory.iter_entries():
590
if not new.has_id(ie.file_id):
1076
if not tree.has_id(ie.file_id):
591
1077
if show_ids:
592
1078
print '%-50s %s' % (path, ie.file_id)
593
1079
else:
597
1083
class cmd_modified(Command):
598
1084
"""List files modified in working tree."""
599
1085
hidden = True
1086
@display_command
600
1087
def run(self):
601
1088
from bzrlib.delta import compare_trees
602
1089
603
b = find_branch('.')
604
td = compare_trees(b.basis_tree(), b.working_tree())
1090
tree = WorkingTree.open_containing(u'.')[0]
1091
td = compare_trees(tree.basis_tree(), tree)
605
1092
606
for path, id, kind in td.modified:
1093
for path, id, kind, text_modified, meta_modified in td.modified:
607
1094
print path
608
1095
609
1096
611
1098
class cmd_added(Command):
612
1099
"""List files added in working tree."""
613
1100
hidden = True
1101
@display_command
614
1102
def run(self):
615
b = find_branch('.')
616
wt = b.working_tree()
617
basis_inv = b.basis_tree().inventory
1103
wt = WorkingTree.open_containing(u'.')[0]
1104
basis_inv = wt.basis_tree().inventory
618
1105
inv = wt.inventory
619
1106
for file_id in inv:
620
1107
if file_id in basis_inv:
621
1108
continue
622
1109
path = inv.id2path(file_id)
623
if not os.access(b.abspath(path), os.F_OK):
1110
if not os.access(bzrlib.osutils.abspath(path), os.F_OK):
624
1111
continue
625
1112
print path
626
1113
632
1119
The root is the nearest enclosing directory with a .bzr control
633
1120
directory."""
634
1121
takes_args = ['filename?']
1122
@display_command
635
1123
def run(self, filename=None):
636
1124
"""Print the branch root."""
637
b = find_branch(filename)
638
print getattr(b, 'base', None) or getattr(b, 'baseurl')
1125
tree = WorkingTree.open_containing(filename)[0]
1126
print tree.basedir
639
1127
640
1128
641
1129
class cmd_log(Command):
642
"""Show log of this branch.
643
644
To request a range of logs, you can use the command -r begin:end
645
-r revision requests a specific revision, -r :end or -r begin: are
1130
"""Show log of a branch, file, or directory.
1131
1132
By default show the log of the branch containing the working directory.
1133
1134
To request a range of logs, you can use the command -r begin..end
1135
-r revision requests a specific revision, -r ..end or -r begin.. are
646
1136
also valid.
647
1137
648
--message allows you to give a regular expression, which will be evaluated
649
so that only matching entries will be displayed.
650
651
TODO: Make --revision support uuid: and hash: [future tag:] notation.
652
1138
examples:
1139
bzr log
1140
bzr log foo.c
1141
bzr log -r -10.. http://server/branch
653
1142
"""
654
1143
655
takes_args = ['filename?']
656
takes_options = ['forward', 'timezone', 'verbose', 'show-ids', 'revision',
657
'long', 'message', 'short',]
658
659
def run(self, filename=None, timezone='original',
1144
# TODO: Make --revision support uuid: and hash: [future tag:] notation.
1145
1146
takes_args = ['location?']
1147
takes_options = [Option('forward',
1148
help='show from oldest to newest'),
1149
'timezone',
1150
Option('verbose',
1151
help='show files changed in each revision'),
1152
'show-ids', 'revision',
1153
'log-format',
1154
'line', 'long',
1155
Option('message',
1156
help='show revisions whose message matches this regexp',
1157
type=str),
1158
'short',
1159
]
1160
@display_command
1161
def run(self, location=None, timezone='original',
660
1162
verbose=False,
661
1163
show_ids=False,
662
1164
forward=False,
663
1165
revision=None,
1166
log_format=None,
664
1167
message=None,
665
1168
long=False,
666
short=False):
1169
short=False,
1170
line=False):
667
1171
from bzrlib.log import log_formatter, show_log
668
1172
import codecs
669
1173
assert message is None or isinstance(message, basestring), \
1174
"invalid message argument %r" % message
670
1175
direction = (forward and 'forward') or 'reverse'
671
1176
672
if filename:
673
b = find_branch(filename)
674
fp = b.relpath(filename)
675
if fp:
676
file_id = b.read_working_inventory().path2id(fp)
677
else:
678
file_id = None # points to branch root
1177
# log everything
1178
file_id = None
1179
if location:
1180
# find the file id to log:
1181
1182
dir, fp = bzrdir.BzrDir.open_containing(location)
1183
b = dir.open_branch()
1184
if fp != '':
1185
try:
1186
# might be a tree:
1187
inv = dir.open_workingtree().inventory
1188
except (errors.NotBranchError, errors.NotLocalUrl):
1189
# either no tree, or is remote.
1190
inv = b.basis_tree().inventory
1191
file_id = inv.path2id(fp)
679
1192
else:
680
b = find_branch('.')
681
file_id = None
1193
# local dir only
1194
# FIXME ? log the current subdir only RBC 20060203
1195
dir, relpath = bzrdir.BzrDir.open_containing('.')
1196
b = dir.open_branch()
682
1197
683
1198
if revision is None:
684
1199
rev1 = None
685
1200
rev2 = None
686
1201
elif len(revision) == 1:
687
rev1 = rev2 = b.get_revision_info(revision[0])[0]
1202
rev1 = rev2 = revision[0].in_history(b).revno
688
1203
elif len(revision) == 2:
689
rev1 = b.get_revision_info(revision[0])[0]
690
rev2 = b.get_revision_info(revision[1])[0]
1204
if revision[0].spec is None:
1205
# missing begin-range means first revision
1206
rev1 = 1
1207
else:
1208
rev1 = revision[0].in_history(b).revno
1209
1210
if revision[1].spec is None:
1211
# missing end-range means last known revision
1212
rev2 = b.revno()
1213
else:
1214
rev2 = revision[1].in_history(b).revno
691
1215
else:
692
1216
raise BzrCommandError('bzr log --revision takes one or two values.')
693
1217
694
if rev1 == 0:
695
rev1 = None
696
if rev2 == 0:
697
rev2 = None
1218
# By this point, the revision numbers are converted to the +ve
1219
# form if they were supplied in the -ve form, so we can do
1220
# this comparison in relative safety
1221
if rev1 > rev2:
1222
(rev2, rev1) = (rev1, rev2)
698
1223
699
mutter('encoding log as %r' % bzrlib.user_encoding)
1224
mutter('encoding log as %r', bzrlib.user_encoding)
700
1225
701
1226
# use 'replace' so that we don't abort if trying to write out
702
1227
# in e.g. the default C locale.
703
1228
outf = codecs.getwriter(bzrlib.user_encoding)(sys.stdout, errors='replace')
704
1229
705
if not short:
706
log_format = 'long'
707
else:
708
log_format = 'short'
1230
if (log_format == None):
1231
default = bzrlib.config.BranchConfig(b).log_format()
1232
log_format = get_log_format(long=long, short=short, line=line, default=default)
1233
709
1234
lf = log_formatter(log_format,
710
1235
show_ids=show_ids,
711
1236
to_file=outf,
721
1246
search=message)
722
1247
723
1248
1249
def get_log_format(long=False, short=False, line=False, default='long'):
1250
log_format = default
1251
if long:
1252
log_format = 'long'
1253
if short:
1254
log_format = 'short'
1255
if line:
1256
log_format = 'line'
1257
return log_format
1258
724
1259
725
1260
class cmd_touching_revisions(Command):
726
1261
"""Return revision-ids which affected a particular file.
728
1263
A more user-friendly interface is "bzr log FILE"."""
729
1264
hidden = True
730
1265
takes_args = ["filename"]
1266
@display_command
731
1267
def run(self, filename):
732
b = find_branch(filename)
733
inv = b.read_working_inventory()
734
file_id = inv.path2id(b.relpath(filename))
1268
tree, relpath = WorkingTree.open_containing(filename)
1269
b = tree.branch
1270
inv = tree.read_working_inventory()
1271
file_id = inv.path2id(relpath)
735
1272
for revno, revision_id, what in bzrlib.log.find_touching_revisions(b, file_id):
736
1273
print "%6d %s" % (revno, what)
737
1274
738
1275
739
1276
class cmd_ls(Command):
740
1277
"""List files in a tree.
741
742
TODO: Take a revision or remote path and list that tree instead.
743
1278
"""
1279
# TODO: Take a revision or remote path and list that tree instead.
744
1280
hidden = True
745
def run(self, revision=None, verbose=False):
746
b = find_branch('.')
747
if revision == None:
748
tree = b.working_tree()
749
else:
750
tree = b.revision_tree(b.lookup_revision(revision))
751
752
for fp, fc, kind, fid in tree.list_files():
753
if verbose:
754
if kind == 'directory':
755
kindch = '/'
756
elif kind == 'file':
757
kindch = ''
1281
takes_options = ['verbose', 'revision',
1282
Option('non-recursive',
1283
help='don\'t recurse into sub-directories'),
1284
Option('from-root',
1285
help='Print all paths from the root of the branch.'),
1286
Option('unknown', help='Print unknown files'),
1287
Option('versioned', help='Print versioned files'),
1288
Option('ignored', help='Print ignored files'),
1289
1290
Option('null', help='Null separate the files'),
1291
]
1292
@display_command
1293
def run(self, revision=None, verbose=False,
1294
non_recursive=False, from_root=False,
1295
unknown=False, versioned=False, ignored=False,
1296
null=False):
1297
1298
if verbose and null:
1299
raise BzrCommandError('Cannot set both --verbose and --null')
1300
all = not (unknown or versioned or ignored)
1301
1302
selection = {'I':ignored, '?':unknown, 'V':versioned}
1303
1304
tree, relpath = WorkingTree.open_containing(u'.')
1305
if from_root:
1306
relpath = u''
1307
elif relpath:
1308
relpath += '/'
1309
if revision is not None:
1310
tree = tree.branch.repository.revision_tree(
1311
revision[0].in_history(tree.branch).rev_id)
1312
for fp, fc, kind, fid, entry in tree.list_files():
1313
if fp.startswith(relpath):
1314
fp = fp[len(relpath):]
1315
if non_recursive and '/' in fp:
1316
continue
1317
if not all and not selection[fc]:
1318
continue
1319
if verbose:
1320
kindch = entry.kind_character()
1321
print '%-8s %s%s' % (fc, fp, kindch)
1322
elif null:
1323
sys.stdout.write(fp)
1324
sys.stdout.write('\0')
1325
sys.stdout.flush()
758
1326
else:
759
kindch = '???'
760
761
print '%-8s %s%s' % (fc, fp, kindch)
762
else:
763
print fp
764
1327
print fp
765
1328
766
1329
767
1330
class cmd_unknowns(Command):
768
1331
"""List unknown files."""
1332
@display_command
769
1333
def run(self):
770
1334
from bzrlib.osutils import quotefn
771
for f in find_branch('.').unknowns():
1335
for f in WorkingTree.open_containing(u'.')[0].unknowns():
772
1336
print quotefn(f)
773
1337
774
1338
775
776
1339
class cmd_ignore(Command):
777
1340
"""Ignore a command or pattern.
778
1341
779
1342
To remove patterns from the ignore list, edit the .bzrignore file.
780
1343
781
1344
If the pattern contains a slash, it is compared to the whole path
782
from the branch root. Otherwise, it is comapred to only the last
783
component of the path.
1345
from the branch root. Otherwise, it is compared to only the last
1346
component of the path. To match a file only in the root directory,
1347
prepend './'.
784
1348
785
1349
Ignore patterns are case-insensitive on case-insensitive systems.
786
1350
790
1354
bzr ignore ./Makefile
791
1355
bzr ignore '*.class'
792
1356
"""
1357
# TODO: Complain if the filename is absolute
793
1358
takes_args = ['name_pattern']
794
1359
795
1360
def run(self, name_pattern):
796
1361
from bzrlib.atomicfile import AtomicFile
797
1362
import os.path
798
1363
799
b = find_branch('.')
800
ifn = b.abspath('.bzrignore')
1364
tree, relpath = WorkingTree.open_containing(u'.')
1365
ifn = tree.abspath('.bzrignore')
801
1366
802
1367
if os.path.exists(ifn):
803
1368
f = open(ifn, 'rt')
822
1387
finally:
823
1388
f.close()
824
1389
825
inv = b.working_tree().inventory
1390
inv = tree.inventory
826
1391
if inv.path2id('.bzrignore'):
827
1392
mutter('.bzrignore is already versioned')
828
1393
else:
829
1394
mutter('need to make new .bzrignore file versioned')
830
b.add(['.bzrignore'])
831
1395
tree.add(['.bzrignore'])
832
1396
833
1397
834
1398
class cmd_ignored(Command):
835
1399
"""List ignored files and the patterns that matched them.
836
1400
837
1401
See also: bzr ignore"""
1402
@display_command
838
1403
def run(self):
839
tree = find_branch('.').working_tree()
840
for path, file_class, kind, file_id in tree.list_files():
1404
tree = WorkingTree.open_containing(u'.')[0]
1405
for path, file_class, kind, file_id, entry in tree.list_files():
841
1406
if file_class != 'I':
842
1407
continue
843
1408
## XXX: Slightly inefficient since this was already calculated
854
1419
hidden = True
855
1420
takes_args = ['revno']
856
1421
1422
@display_command
857
1423
def run(self, revno):
858
1424
try:
859
1425
revno = int(revno)
860
1426
except ValueError:
861
1427
raise BzrCommandError("not a valid revision-number: %r" % revno)
862
1428
863
print find_branch('.').lookup_revision(revno)
1429
print WorkingTree.open_containing(u'.')[0].branch.get_rev_id(revno)
864
1430
865
1431
866
1432
class cmd_export(Command):
873
1439
is found exports to a directory (equivalent to --format=dir).
874
1440
875
1441
Root may be the top directory for tar, tgz and tbz2 formats. If none
876
is given, the top directory will be the root name of the file."""
877
# TODO: list known exporters
1442
is given, the top directory will be the root name of the file.
1443
1444
Note: export of tree with non-ascii filenames to zip is not supported.
1445
1446
Supported formats Autodetected by extension
1447
----------------- -------------------------
1448
dir -
1449
tar .tar
1450
tbz2 .tar.bz2, .tbz2
1451
tgz .tar.gz, .tgz
1452
zip .zip
1453
"""
878
1454
takes_args = ['dest']
879
1455
takes_options = ['revision', 'format', 'root']
880
1456
def run(self, dest, revision=None, format=None, root=None):
881
1457
import os.path
882
b = find_branch('.')
1458
from bzrlib.export import export
1459
tree = WorkingTree.open_containing(u'.')[0]
1460
b = tree.branch
883
1461
if revision is None:
884
rev_id = b.last_patch()
1462
# should be tree.last_revision FIXME
1463
rev_id = b.last_revision()
885
1464
else:
886
1465
if len(revision) != 1:
887
1466
raise BzrError('bzr export --revision takes exactly 1 argument')
888
revno, rev_id = b.get_revision_info(revision[0])
889
t = b.revision_tree(rev_id)
890
root, ext = os.path.splitext(dest)
891
if not format:
892
if ext in (".tar",):
893
format = "tar"
894
elif ext in (".gz", ".tgz"):
895
format = "tgz"
896
elif ext in (".bz2", ".tbz2"):
897
format = "tbz2"
898
else:
899
format = "dir"
900
t.export(dest, format, root)
1467
rev_id = revision[0].in_history(b).rev_id
1468
t = b.repository.revision_tree(rev_id)
1469
try:
1470
export(t, dest, format, root)
1471
except errors.NoSuchExportFormat, e:
1472
raise BzrCommandError('Unsupported export format: %s' % e.format)
901
1473
902
1474
903
1475
class cmd_cat(Command):
906
1478
takes_options = ['revision']
907
1479
takes_args = ['filename']
908
1480
1481
@display_command
909
1482
def run(self, filename, revision=None):
910
if revision == None:
911
raise BzrCommandError("bzr cat requires a revision number")
912
elif len(revision) != 1:
1483
if revision is not None and len(revision) != 1:
913
1484
raise BzrCommandError("bzr cat --revision takes exactly one number")
914
b = find_branch('.')
915
b.print_file(b.relpath(filename), revision[0])
1485
tree = None
1486
try:
1487
tree, relpath = WorkingTree.open_containing(filename)
1488
b = tree.branch
1489
except NotBranchError:
1490
pass
1491
1492
if tree is None:
1493
b, relpath = Branch.open_containing(filename)
1494
if revision is None:
1495
revision_id = b.last_revision()
1496
else:
1497
revision_id = revision[0].in_history(b).rev_id
1498
b.print_file(relpath, revision_id)
916
1499
917
1500
918
1501
class cmd_local_time_offset(Command):
919
1502
"""Show the offset in seconds from GMT to local time."""
920
1503
hidden = True
1504
@display_command
921
1505
def run(self):
922
1506
print bzrlib.osutils.local_time_offset()
923
1507
935
1519
A selected-file commit may fail in some cases where the committed
936
1520
tree would be invalid, such as trying to commit a file in a
937
1521
newly-added directory that is not itself committed.
938
939
TODO: Run hooks on tree to-be-committed, and after commit.
940
941
TODO: Strict commit that fails if there are unknown or deleted files.
942
1522
"""
1523
# TODO: Run hooks on tree to-be-committed, and after commit.
1524
1525
# TODO: Strict commit that fails if there are deleted files.
1526
# (what does "deleted files" mean ??)
1527
1528
# TODO: Give better message for -s, --summary, used by tla people
1529
1530
# XXX: verbose currently does nothing
1531
943
1532
takes_args = ['selected*']
944
takes_options = ['message', 'file', 'verbose', 'unchanged']
1533
takes_options = ['message', 'verbose',
1534
Option('unchanged',
1535
help='commit even if nothing has changed'),
1536
Option('file', type=str,
1537
argname='msgfile',
1538
help='file containing commit message'),
1539
Option('strict',
1540
help="refuse to commit if there are unknown "
1541
"files in the working tree."),
1542
Option('local',
1543
help="perform a local only commit in a bound "
1544
"branch. Such commits are not pushed to "
1545
"the master branch until a normal commit "
1546
"is performed."
1547
),
1548
]
945
1549
aliases = ['ci', 'checkin']
946
1550
947
# TODO: Give better message for -s, --summary, used by tla people
948
949
1551
def run(self, message=None, file=None, verbose=True, selected_list=None,
950
unchanged=False):
951
from bzrlib.errors import PointlessCommit
952
from bzrlib.msgeditor import edit_commit_message
953
from bzrlib.status import show_status
954
from cStringIO import StringIO
955
956
b = find_branch('.')
957
if selected_list:
958
selected_list = [b.relpath(s) for s in selected_list]
959
960
if not message and not file:
961
catcher = StringIO()
962
show_status(b, specific_files=selected_list,
963
to_file=catcher)
964
message = edit_commit_message(catcher.getvalue())
965
1552
unchanged=False, strict=False, local=False):
1553
from bzrlib.commit import (NullCommitReporter, ReportCommitToLog)
1554
from bzrlib.errors import (PointlessCommit, ConflictsInTree,
1555
StrictCommitFailed)
1556
from bzrlib.msgeditor import edit_commit_message, \
1557
make_commit_message_template
1558
from tempfile import TemporaryFile
1559
import codecs
1560
1561
# TODO: Need a blackbox test for invoking the external editor; may be
1562
# slightly problematic to run this cross-platform.
1563
1564
# TODO: do more checks that the commit will succeed before
1565
# spending the user's valuable time typing a commit message.
1566
#
1567
# TODO: if the commit *does* happen to fail, then save the commit
1568
# message to a temporary file where it can be recovered
1569
tree, selected_list = tree_files(selected_list)
1570
if local and not tree.branch.get_bound_location():
1571
raise errors.LocalRequiresBoundBranch()
1572
if message is None and not file:
1573
template = make_commit_message_template(tree, selected_list)
1574
message = edit_commit_message(template)
966
1575
if message is None:
967
1576
raise BzrCommandError("please specify a commit message"
968
1577
" with either --message or --file")
973
1582
import codecs
974
1583
message = codecs.open(file, 'rt', bzrlib.user_encoding).read()
975
1584
1585
if message == "":
1586
raise BzrCommandError("empty commit message specified")
1587
1588
if verbose:
1589
reporter = ReportCommitToLog()
1590
else:
1591
reporter = NullCommitReporter()
1592
976
1593
try:
977
b.commit(message, verbose=verbose,
978
specific_files=selected_list,
979
allow_pointless=unchanged)
1594
tree.commit(message, specific_files=selected_list,
1595
allow_pointless=unchanged, strict=strict, local=local,
1596
reporter=reporter)
980
1597
except PointlessCommit:
981
1598
# FIXME: This should really happen before the file is read in;
982
1599
# perhaps prepare the commit; get the message; then actually commit
983
1600
raise BzrCommandError("no changes to commit",
984
1601
["use --unchanged to commit anyhow"])
1602
except ConflictsInTree:
1603
raise BzrCommandError("Conflicts detected in working tree. "
1604
'Use "bzr conflicts" to list, "bzr resolve FILE" to resolve.')
1605
except StrictCommitFailed:
1606
raise BzrCommandError("Commit refused because there are unknown "
1607
"files in the working tree.")
1608
except errors.BoundBranchOutOfDate, e:
1609
raise BzrCommandError(str(e)
1610
+ ' Either unbind, update, or'
1611
' pass --local to commit.')
985
1612
986
1613
987
1614
class cmd_check(Command):
989
1616
990
1617
This command checks various invariants about the branch storage to
991
1618
detect data corruption or bzr bugs.
992
993
If given the --update flag, it will update some optional fields
994
to help ensure data consistency.
995
1619
"""
996
takes_args = ['dir?']
1620
takes_args = ['branch?']
1621
takes_options = ['verbose']
997
1622
998
def run(self, dir='.'):
1623
def run(self, branch=None, verbose=False):
999
1624
from bzrlib.check import check
1000
1001
check(find_branch(dir))
1625
if branch is None:
1626
tree = WorkingTree.open_containing()[0]
1627
branch = tree.branch
1628
else:
1629
branch = Branch.open(branch)
1630
check(branch, verbose)
1002
1631
1003
1632
1004
1633
class cmd_scan_cache(Command):
1006
1635
def run(self):
1007
1636
from bzrlib.hashcache import HashCache
1008
1637
1009
c = HashCache('.')
1638
c = HashCache(u'.')
1010
1639
c.read()
1011
1640
c.scan()
1012
1641
1018
1647
1019
1648
if c.needs_write:
1020
1649
c.write()
1021
1022
1650
1023
1651
1024
1652
class cmd_upgrade(Command):
1025
1653
"""Upgrade branch storage to current format.
1026
1654
1027
1655
The check command or bzr developers may sometimes advise you to run
1028
this command.
1656
this command. When the default format has changed you may also be warned
1657
during other operations to upgrade.
1029
1658
"""
1030
takes_args = ['dir?']
1031
1032
def run(self, dir='.'):
1659
takes_args = ['url?']
1660
takes_options = [
1661
Option('format',
1662
help='Upgrade to a specific format rather than the'
1663
' current default format. Currently this'
1664
' option accepts "weave", "metadir" and'
1665
' "knit".',
1666
type=get_format_type),
1667
]
1668
1669
1670
def run(self, url='.', format=None):
1033
1671
from bzrlib.upgrade import upgrade
1034
upgrade(find_branch(dir))
1035
1672
upgrade(url, format)
1036
1673
1037
1674
1038
1675
class cmd_whoami(Command):
1039
1676
"""Show bzr user id."""
1040
1677
takes_options = ['email']
1041
1678
1679
@display_command
1042
1680
def run(self, email=False):
1043
1681
try:
1044
b = bzrlib.branch.find_branch('.')
1045
except:
1046
b = None
1682
b = WorkingTree.open_containing(u'.')[0].branch
1683
config = bzrlib.config.BranchConfig(b)
1684
except NotBranchError:
1685
config = bzrlib.config.GlobalConfig()
1047
1686
1048
1687
if email:
1049
print bzrlib.osutils.user_email(b)
1050
else:
1051
print bzrlib.osutils.username(b)
1688
print config.user_email()
1689
else:
1690
print config.username()
1691
1692
1693
class cmd_nick(Command):
1694
"""Print or set the branch nickname.
1695
1696
If unset, the tree root directory name is used as the nickname
1697
To print the current nickname, execute with no argument.
1698
"""
1699
takes_args = ['nickname?']
1700
def run(self, nickname=None):
1701
branch = Branch.open_containing(u'.')[0]
1702
if nickname is None:
1703
self.printme(branch)
1704
else:
1705
branch.nick = nickname
1706
1707
@display_command
1708
def printme(self, branch):
1709
print branch.nick
1052
1710
1053
1711
1054
1712
class cmd_selftest(Command):
1055
"""Run internal test suite"""
1713
"""Run internal test suite.
1714
1715
This creates temporary test directories in the working directory,
1716
but not existing data is affected. These directories are deleted
1717
if the tests pass, or left behind to help in debugging if they
1718
fail and --keep-output is specified.
1719
1720
If arguments are given, they are regular expressions that say
1721
which tests should run.
1722
1723
If the global option '--no-plugins' is given, plugins are not loaded
1724
before running the selftests. This has two effects: features provided or
1725
modified by plugins will not be tested, and tests provided by plugins will
1726
not be run.
1727
1728
examples:
1729
bzr selftest ignore
1730
bzr --no-plugins selftest -v
1731
"""
1732
# TODO: --list should give a list of all available tests
1733
1734
# NB: this is used from the class without creating an instance, which is
1735
# why it does not have a self parameter.
1736
def get_transport_type(typestring):
1737
"""Parse and return a transport specifier."""
1738
if typestring == "sftp":
1739
from bzrlib.transport.sftp import SFTPAbsoluteServer
1740
return SFTPAbsoluteServer
1741
if typestring == "memory":
1742
from bzrlib.transport.memory import MemoryServer
1743
return MemoryServer
1744
if typestring == "fakenfs":
1745
from bzrlib.transport.fakenfs import FakeNFSServer
1746
return FakeNFSServer
1747
msg = "No known transport type %s. Supported types are: sftp\n" %\
1748
(typestring)
1749
raise BzrCommandError(msg)
1750
1056
1751
hidden = True
1057
takes_options = ['verbose', 'pattern']
1058
def run(self, verbose=False, pattern=".*"):
1752
takes_args = ['testspecs*']
1753
takes_options = ['verbose',
1754
Option('one', help='stop when one test fails'),
1755
Option('keep-output',
1756
help='keep output directories when tests fail'),
1757
Option('transport',
1758
help='Use a different transport by default '
1759
'throughout the test suite.',
1760
type=get_transport_type),
1761
]
1762
1763
def run(self, testspecs_list=None, verbose=False, one=False,
1764
keep_output=False, transport=None):
1059
1765
import bzrlib.ui
1060
from bzrlib.selftest import selftest
1766
from bzrlib.tests import selftest
1061
1767
# we don't want progress meters from the tests to go to the
1062
1768
# real output; and we don't want log messages cluttering up
1063
1769
# the real logs.
1065
1771
bzrlib.trace.info('running tests...')
1066
1772
try:
1067
1773
bzrlib.ui.ui_factory = bzrlib.ui.SilentUIFactory()
1068
result = selftest(verbose=verbose, pattern=pattern)
1774
if testspecs_list is not None:
1775
pattern = '|'.join(testspecs_list)
1776
else:
1777
pattern = ".*"
1778
result = selftest(verbose=verbose,
1779
pattern=pattern,
1780
stop_on_failure=one,
1781
keep_output=keep_output,
1782
transport=transport)
1069
1783
if result:
1070
1784
bzrlib.trace.info('tests passed')
1071
1785
else:
1075
1789
bzrlib.ui.ui_factory = save_ui
1076
1790
1077
1791
1792
def _get_bzr_branch():
1793
"""If bzr is run from a branch, return Branch or None"""
1794
import bzrlib.errors
1795
from bzrlib.branch import Branch
1796
from bzrlib.osutils import abspath
1797
from os.path import dirname
1798
1799
try:
1800
branch = Branch.open(dirname(abspath(dirname(__file__))))
1801
return branch
1802
except bzrlib.errors.BzrError:
1803
return None
1804
1805
1078
1806
def show_version():
1079
1807
print "bzr (bazaar-ng) %s" % bzrlib.__version__
1080
1808
# is bzrlib itself in a branch?
1081
bzrrev = bzrlib.get_bzr_revision()
1082
if bzrrev:
1083
print " (bzr checkout, revision %d {%s})" % bzrrev
1809
branch = _get_bzr_branch()
1810
if branch:
1811
rh = branch.revision_history()
1812
revno = len(rh)
1813
print " bzr checkout, revision %d" % (revno,)
1814
print " nick: %s" % (branch.nick,)
1815
if rh:
1816
print " revid: %s" % (rh[-1],)
1084
1817
print bzrlib.__copyright__
1085
1818
print "http://bazaar-ng.org/"
1086
1819
print
1091
1824
1092
1825
class cmd_version(Command):
1093
1826
"""Show version of bzr."""
1827
@display_command
1094
1828
def run(self):
1095
1829
show_version()
1096
1830
1097
1831
class cmd_rocks(Command):
1098
1832
"""Statement of optimism."""
1099
1833
hidden = True
1834
@display_command
1100
1835
def run(self):
1101
1836
print "it sure does!"
1102
1837
1103
1838
1104
1839
class cmd_find_merge_base(Command):
1105
1840
"""Find and print a base revision for merging two branches.
1106
1107
TODO: Options to specify revisions on either side, as if
1108
merging only part of the history.
1109
1841
"""
1842
# TODO: Options to specify revisions on either side, as if
1843
# merging only part of the history.
1110
1844
takes_args = ['branch', 'other']
1111
1845
hidden = True
1112
1846
1847
@display_command
1113
1848
def run(self, branch, other):
1114
1849
from bzrlib.revision import common_ancestor, MultipleRevisionSources
1115
1850
1116
branch1 = find_branch(branch)
1117
branch2 = find_branch(other)
1851
branch1 = Branch.open_containing(branch)[0]
1852
branch2 = Branch.open_containing(other)[0]
1118
1853
1119
1854
history_1 = branch1.revision_history()
1120
1855
history_2 = branch2.revision_history()
1121
1856
1122
last1 = branch1.last_patch()
1123
last2 = branch2.last_patch()
1857
last1 = branch1.last_revision()
1858
last2 = branch2.last_revision()
1124
1859
1125
source = MultipleRevisionSources(branch1, branch2)
1860
source = MultipleRevisionSources(branch1.repository,
1861
branch2.repository)
1126
1862
1127
1863
base_rev_id = common_ancestor(last1, last2, source)
1128
1864
1150
1886
will be used as a BASE, and the second one as OTHER. Revision
1151
1887
numbers are always relative to the specified branch.
1152
1888
1153
By default bzr will try to merge in all new work from the other
1889
By default, bzr will try to merge in all new work from the other
1154
1890
branch, automatically determining an appropriate base. If this
1155
1891
fails, you may need to give an explicit base.
1156
1892
1893
Merge will do its best to combine the changes in two branches, but there
1894
are some kinds of problems only a human can fix. When it encounters those,
1895
it will mark a conflict. A conflict means that you need to fix something,
1896
before you should commit.
1897
1898
Use bzr resolve when you have fixed a problem. See also bzr conflicts.
1899
1900
If there is no default branch set, the first merge will set it. After
1901
that, you can omit the branch to use the default. To change the
1902
default, use --remember.
1903
1157
1904
Examples:
1158
1905
1159
1906
To merge the latest revision from bzr.dev
1169
1916
--force is given.
1170
1917
"""
1171
1918
takes_args = ['branch?']
1172
takes_options = ['revision', 'force', 'merge-type']
1919
takes_options = ['revision', 'force', 'merge-type', 'reprocess', 'remember',
1920
Option('show-base', help="Show base revision text in "
1921
"conflicts")]
1173
1922
1174
def run(self, branch='.', revision=None, force=False,
1175
merge_type=None):
1176
from bzrlib.merge import merge
1177
from bzrlib.merge_core import ApplyMerge3
1923
def run(self, branch=None, revision=None, force=False, merge_type=None,
1924
show_base=False, reprocess=False, remember=False):
1178
1925
if merge_type is None:
1179
merge_type = ApplyMerge3
1926
merge_type = Merge3Merger
1927
1928
tree = WorkingTree.open_containing(u'.')[0]
1929
stored_loc = tree.branch.get_parent()
1930
if branch is None:
1931
if stored_loc is None:
1932
raise BzrCommandError("No merge branch known or specified.")
1933
else:
1934
print "Using saved branch: %s" % stored_loc
1935
branch = stored_loc
1936
1937
if tree.branch.get_parent() is None or remember:
1938
tree.branch.set_parent(branch)
1180
1939
1181
1940
if revision is None or len(revision) < 1:
1182
1941
base = [None, None]
1183
other = (branch, -1)
1942
other = [branch, -1]
1943
other_branch, path = Branch.open_containing(branch)
1184
1944
else:
1185
1945
if len(revision) == 1:
1186
other = (branch, revision[0])
1187
base = (None, None)
1946
base = [None, None]
1947
other_branch, path = Branch.open_containing(branch)
1948
revno = revision[0].in_history(other_branch).revno
1949
other = [branch, revno]
1188
1950
else:
1189
1951
assert len(revision) == 2
1190
1952
if None in revision:
1191
1953
raise BzrCommandError(
1192
1954
"Merge doesn't permit that revision specifier.")
1193
base = (branch, revision[0])
1194
other = (branch, revision[1])
1955
b, path = Branch.open_containing(branch)
1195
1956
1957
base = [branch, revision[0].in_history(b).revno]
1958
other = [branch, revision[1].in_history(b).revno]
1959
if path != "":
1960
interesting_files = [path]
1961
else:
1962
interesting_files = None
1963
pb = bzrlib.ui.ui_factory.nested_progress_bar()
1196
1964
try:
1197
merge(other, base, check_clean=(not force), merge_type=merge_type)
1965
try:
1966
conflict_count = merge(other, base, check_clean=(not force),
1967
merge_type=merge_type,
1968
reprocess=reprocess,
1969
show_base=show_base,
1970
pb=pb, file_list=interesting_files)
1971
finally:
1972
pb.finished()
1973
if conflict_count != 0:
1974
return 1
1975
else:
1976
return 0
1198
1977
except bzrlib.errors.AmbiguousBase, e:
1199
1978
m = ("sorry, bzr can't determine the right merge base yet\n"
1200
1979
"candidates are:\n "
1205
1984
log_error(m)
1206
1985
1207
1986
1987
class cmd_remerge(Command):
1988
"""Redo a merge.
1989
"""
1990
takes_args = ['file*']
1991
takes_options = ['merge-type', 'reprocess',
1992
Option('show-base', help="Show base revision text in "
1993
"conflicts")]
1994
1995
def run(self, file_list=None, merge_type=None, show_base=False,
1996
reprocess=False):
1997
from bzrlib.merge import merge_inner, transform_tree
1998
if merge_type is None:
1999
merge_type = Merge3Merger
2000
tree, file_list = tree_files(file_list)
2001
tree.lock_write()
2002
try:
2003
pending_merges = tree.pending_merges()
2004
if len(pending_merges) != 1:
2005
raise BzrCommandError("Sorry, remerge only works after normal"
2006
+ " merges. Not cherrypicking or"
2007
+ "multi-merges.")
2008
repository = tree.branch.repository
2009
base_revision = common_ancestor(tree.branch.last_revision(),
2010
pending_merges[0], repository)
2011
base_tree = repository.revision_tree(base_revision)
2012
other_tree = repository.revision_tree(pending_merges[0])
2013
interesting_ids = None
2014
if file_list is not None:
2015
interesting_ids = set()
2016
for filename in file_list:
2017
file_id = tree.path2id(filename)
2018
if file_id is None:
2019
raise NotVersionedError(filename)
2020
interesting_ids.add(file_id)
2021
if tree.kind(file_id) != "directory":
2022
continue
2023
2024
for name, ie in tree.inventory.iter_entries(file_id):
2025
interesting_ids.add(ie.file_id)
2026
transform_tree(tree, tree.basis_tree(), interesting_ids)
2027
if file_list is None:
2028
restore_files = list(tree.iter_conflicts())
2029
else:
2030
restore_files = file_list
2031
for filename in restore_files:
2032
try:
2033
restore(tree.abspath(filename))
2034
except NotConflicted:
2035
pass
2036
conflicts = merge_inner(tree.branch, other_tree, base_tree,
2037
this_tree=tree,
2038
interesting_ids = interesting_ids,
2039
other_rev_id=pending_merges[0],
2040
merge_type=merge_type,
2041
show_base=show_base,
2042
reprocess=reprocess)
2043
finally:
2044
tree.unlock()
2045
if conflicts > 0:
2046
return 1
2047
else:
2048
return 0
2049
1208
2050
class cmd_revert(Command):
1209
2051
"""Reverse all changes since the last commit.
1210
2052
1217
2059
aliases = ['merge-revert']
1218
2060
1219
2061
def run(self, revision=None, no_backup=False, file_list=None):
1220
from bzrlib.merge import merge
1221
from bzrlib.branch import Branch
1222
2062
from bzrlib.commands import parse_spec
1223
1224
2063
if file_list is not None:
1225
2064
if len(file_list) == 0:
1226
2065
raise BzrCommandError("No files specified")
2066
else:
2067
file_list = []
2068
2069
tree, file_list = tree_files(file_list)
1227
2070
if revision is None:
1228
revision = [-1]
2071
# FIXME should be tree.last_revision
2072
rev_id = tree.last_revision()
1229
2073
elif len(revision) != 1:
1230
2074
raise BzrCommandError('bzr revert --revision takes exactly 1 argument')
1231
merge(('.', revision[0]), parse_spec('.'),
1232
check_clean=False,
1233
ignore_zero=True,
1234
backup_files=not no_backup,
1235
file_list=file_list)
1236
if not file_list:
1237
Branch('.').set_pending_merges([])
2075
else:
2076
rev_id = revision[0].in_history(tree.branch).rev_id
2077
pb = bzrlib.ui.ui_factory.nested_progress_bar()
2078
try:
2079
tree.revert(file_list,
2080
tree.branch.repository.revision_tree(rev_id),
2081
not no_backup, pb)
2082
finally:
2083
pb.finished()
1238
2084
1239
2085
1240
2086
class cmd_assert_fail(Command):
1248
2094
"""Show help on a command or other topic.
1249
2095
1250
2096
For a list of all available commands, say 'bzr help commands'."""
1251
takes_options = ['long']
2097
takes_options = [Option('long', 'show help on all commands')]
1252
2098
takes_args = ['topic?']
1253
aliases = ['?']
2099
aliases = ['?', '--help', '-?', '-h']
1254
2100
2101
@display_command
1255
2102
def run(self, topic=None, long=False):
1256
2103
import help
1257
2104
if topic is None and long:
1267
2114
aliases = ['s-c']
1268
2115
hidden = True
1269
2116
2117
@display_command
1270
2118
def run(self, context=None):
1271
2119
import shellcomplete
1272
2120
shellcomplete.shellcomplete(context)
1273
2121
1274
2122
2123
class cmd_fetch(Command):
2124
"""Copy in history from another branch but don't merge it.
2125
2126
This is an internal method used for pull and merge."""
2127
hidden = True
2128
takes_args = ['from_branch', 'to_branch']
2129
def run(self, from_branch, to_branch):
2130
from bzrlib.fetch import Fetcher
2131
from bzrlib.branch import Branch
2132
from_b = Branch.open(from_branch)
2133
to_b = Branch.open(to_branch)
2134
Fetcher(to_b, from_b)
2135
2136
1275
2137
class cmd_missing(Command):
1276
"""What is missing in this branch relative to other branch.
1277
"""
1278
takes_args = ['remote?']
1279
aliases = ['mis', 'miss']
1280
# We don't have to add quiet to the list, because
1281
# unknown options are parsed as booleans
1282
takes_options = ['verbose', 'quiet']
1283
1284
def run(self, remote=None, verbose=False, quiet=False):
1285
from bzrlib.errors import BzrCommandError
1286
from bzrlib.missing import show_missing
1287
1288
if verbose and quiet:
1289
raise BzrCommandError('Cannot pass both quiet and verbose')
1290
1291
b = find_branch('.')
1292
parent = b.get_parent()
1293
if remote is None:
1294
if parent is None:
2138
"""Show unmerged/unpulled revisions between two branches.
2139
2140
OTHER_BRANCH may be local or remote."""
2141
takes_args = ['other_branch?']
2142
takes_options = [Option('reverse', 'Reverse the order of revisions'),
2143
Option('mine-only',
2144
'Display changes in the local branch only'),
2145
Option('theirs-only',
2146
'Display changes in the remote branch only'),
2147
'log-format',
2148
'line',
2149
'long',
2150
'short',
2151
'show-ids',
2152
'verbose'
2153
]
2154
2155
def run(self, other_branch=None, reverse=False, mine_only=False,
2156
theirs_only=False, log_format=None, long=False, short=False, line=False,
2157
show_ids=False, verbose=False):
2158
from bzrlib.missing import find_unmerged, iter_log_data
2159
from bzrlib.log import log_formatter
2160
local_branch = bzrlib.branch.Branch.open_containing(u".")[0]
2161
parent = local_branch.get_parent()
2162
if other_branch is None:
2163
other_branch = parent
2164
if other_branch is None:
1295
2165
raise BzrCommandError("No missing location known or specified.")
1296
else:
1297
if not quiet:
1298
print "Using last location: %s" % parent
1299
remote = parent
1300
elif parent is None:
1301
# We only update x-pull if it did not exist, missing should not change the parent
1302
b.controlfile('x-pull', 'wb').write(remote + '\n')
1303
br_remote = find_branch(remote)
1304
1305
return show_missing(b, br_remote, verbose=verbose, quiet=quiet)
1306
2166
print "Using last location: " + local_branch.get_parent()
2167
remote_branch = bzrlib.branch.Branch.open(other_branch)
2168
if remote_branch.base == local_branch.base:
2169
remote_branch = local_branch
2170
local_branch.lock_read()
2171
try:
2172
remote_branch.lock_read()
2173
try:
2174
local_extra, remote_extra = find_unmerged(local_branch, remote_branch)
2175
if (log_format == None):
2176
default = bzrlib.config.BranchConfig(local_branch).log_format()
2177
log_format = get_log_format(long=long, short=short, line=line, default=default)
2178
lf = log_formatter(log_format, sys.stdout,
2179
show_ids=show_ids,
2180
show_timezone='original')
2181
if reverse is False:
2182
local_extra.reverse()
2183
remote_extra.reverse()
2184
if local_extra and not theirs_only:
2185
print "You have %d extra revision(s):" % len(local_extra)
2186
for data in iter_log_data(local_extra, local_branch.repository,
2187
verbose):
2188
lf.show(*data)
2189
printed_local = True
2190
else:
2191
printed_local = False
2192
if remote_extra and not mine_only:
2193
if printed_local is True:
2194
print "\n\n"
2195
print "You are missing %d revision(s):" % len(remote_extra)
2196
for data in iter_log_data(remote_extra, remote_branch.repository,
2197
verbose):
2198
lf.show(*data)
2199
if not remote_extra and not local_extra:
2200
status_code = 0
2201
print "Branches are up to date."
2202
else:
2203
status_code = 1
2204
finally:
2205
remote_branch.unlock()
2206
finally:
2207
local_branch.unlock()
2208
if not status_code and parent is None and other_branch is not None:
2209
local_branch.lock_write()
2210
try:
2211
# handle race conditions - a parent might be set while we run.
2212
if local_branch.get_parent() is None:
2213
local_branch.set_parent(other_branch)
2214
finally:
2215
local_branch.unlock()
2216
return status_code
1307
2217
1308
2218
1309
2219
class cmd_plugins(Command):
1310
2220
"""List plugins"""
1311
2221
hidden = True
2222
@display_command
1312
2223
def run(self):
1313
2224
import bzrlib.plugin
1314
2225
from inspect import getdoc
1315
for plugin in bzrlib.plugin.all_plugins:
2226
for name, plugin in bzrlib.plugin.all_plugins().items():
1316
2227
if hasattr(plugin, '__path__'):
1317
2228
print plugin.__path__[0]
1318
2229
elif hasattr(plugin, '__file__'):
1325
2236
print '\t', d.split('\n')[0]
1326
2237
1327
2238
2239
class cmd_testament(Command):
2240
"""Show testament (signing-form) of a revision."""
2241
takes_options = ['revision', 'long']
2242
takes_args = ['branch?']
2243
@display_command
2244
def run(self, branch=u'.', revision=None, long=False):
2245
from bzrlib.testament import Testament
2246
b = WorkingTree.open_containing(branch)[0].branch
2247
b.lock_read()
2248
try:
2249
if revision is None:
2250
rev_id = b.last_revision()
2251
else:
2252
rev_id = revision[0].in_history(b).rev_id
2253
t = Testament.from_revision(b.repository, rev_id)
2254
if long:
2255
sys.stdout.writelines(t.as_text_lines())
2256
else:
2257
sys.stdout.write(t.as_short_text())
2258
finally:
2259
b.unlock()
2260
2261
2262
class cmd_annotate(Command):
2263
"""Show the origin of each line in a file.
2264
2265
This prints out the given file with an annotation on the left side
2266
indicating which revision, author and date introduced the change.
2267
2268
If the origin is the same for a run of consecutive lines, it is
2269
shown only at the top, unless the --all option is given.
2270
"""
2271
# TODO: annotate directories; showing when each file was last changed
2272
# TODO: annotate a previous version of a file
2273
# TODO: if the working copy is modified, show annotations on that
2274
# with new uncommitted lines marked
2275
aliases = ['blame', 'praise']
2276
takes_args = ['filename']
2277
takes_options = [Option('all', help='show annotations on all lines'),
2278
Option('long', help='show date in annotations'),
2279
]
2280
2281
@display_command
2282
def run(self, filename, all=False, long=False):
2283
from bzrlib.annotate import annotate_file
2284
tree, relpath = WorkingTree.open_containing(filename)
2285
branch = tree.branch
2286
branch.lock_read()
2287
try:
2288
file_id = tree.inventory.path2id(relpath)
2289
tree = branch.repository.revision_tree(branch.last_revision())
2290
file_version = tree.inventory[file_id].revision
2291
annotate_file(branch, file_version, file_id, long, all, sys.stdout)
2292
finally:
2293
branch.unlock()
2294
2295
2296
class cmd_re_sign(Command):
2297
"""Create a digital signature for an existing revision."""
2298
# TODO be able to replace existing ones.
2299
2300
hidden = True # is this right ?
2301
takes_args = ['revision_id*']
2302
takes_options = ['revision']
2303
2304
def run(self, revision_id_list=None, revision=None):
2305
import bzrlib.config as config
2306
import bzrlib.gpg as gpg
2307
if revision_id_list is not None and revision is not None:
2308
raise BzrCommandError('You can only supply one of revision_id or --revision')
2309
if revision_id_list is None and revision is None:
2310
raise BzrCommandError('You must supply either --revision or a revision_id')
2311
b = WorkingTree.open_containing(u'.')[0].branch
2312
gpg_strategy = gpg.GPGStrategy(config.BranchConfig(b))
2313
if revision_id_list is not None:
2314
for revision_id in revision_id_list:
2315
b.repository.sign_revision(revision_id, gpg_strategy)
2316
elif revision is not None:
2317
if len(revision) == 1:
2318
revno, rev_id = revision[0].in_history(b)
2319
b.repository.sign_revision(rev_id, gpg_strategy)
2320
elif len(revision) == 2:
2321
# are they both on rh- if so we can walk between them
2322
# might be nice to have a range helper for arbitrary
2323
# revision paths. hmm.
2324
from_revno, from_revid = revision[0].in_history(b)
2325
to_revno, to_revid = revision[1].in_history(b)
2326
if to_revid is None:
2327
to_revno = b.revno()
2328
if from_revno is None or to_revno is None:
2329
raise BzrCommandError('Cannot sign a range of non-revision-history revisions')
2330
for revno in range(from_revno, to_revno + 1):
2331
b.repository.sign_revision(b.get_rev_id(revno),
2332
gpg_strategy)
2333
else:
2334
raise BzrCommandError('Please supply either one revision, or a range.')
2335
2336
2337
class cmd_bind(Command):
2338
"""Bind the current branch to a master branch.
2339
2340
After binding, commits must succeed on the master branch
2341
before they are executed on the local one.
2342
"""
2343
2344
takes_args = ['location']
2345
takes_options = []
2346
2347
def run(self, location=None):
2348
b, relpath = Branch.open_containing(u'.')
2349
b_other = Branch.open(location)
2350
try:
2351
b.bind(b_other)
2352
except DivergedBranches:
2353
raise BzrCommandError('These branches have diverged.'
2354
' Try merging, and then bind again.')
2355
2356
2357
class cmd_unbind(Command):
2358
"""Bind the current branch to its parent.
2359
2360
After unbinding, the local branch is considered independent.
2361
"""
2362
2363
takes_args = []
2364
takes_options = []
2365
2366
def run(self):
2367
b, relpath = Branch.open_containing(u'.')
2368
if not b.unbind():
2369
raise BzrCommandError('Local branch is not bound')
2370
2371
2372
class cmd_uncommit(bzrlib.commands.Command):
2373
"""Remove the last committed revision.
2374
2375
By supplying the --all flag, it will not only remove the entry
2376
from revision_history, but also remove all of the entries in the
2377
stores.
2378
2379
--verbose will print out what is being removed.
2380
--dry-run will go through all the motions, but not actually
2381
remove anything.
2382
2383
In the future, uncommit will create a changeset, which can then
2384
be re-applied.
2385
"""
2386
2387
# TODO: jam 20060108 Add an option to allow uncommit to remove
2388
# unreferenced information in 'branch-as-repostory' branches.
2389
# TODO: jam 20060108 Add the ability for uncommit to remove unreferenced
2390
# information in shared branches as well.
2391
takes_options = ['verbose', 'revision',
2392
Option('dry-run', help='Don\'t actually make changes'),
2393
Option('force', help='Say yes to all questions.')]
2394
takes_args = ['location?']
2395
aliases = []
2396
2397
def run(self, location=None,
2398
dry_run=False, verbose=False,
2399
revision=None, force=False):
2400
from bzrlib.branch import Branch
2401
from bzrlib.log import log_formatter
2402
import sys
2403
from bzrlib.uncommit import uncommit
2404
2405
if location is None:
2406
location = u'.'
2407
control, relpath = bzrdir.BzrDir.open_containing(location)
2408
try:
2409
tree = control.open_workingtree()
2410
b = tree.branch
2411
except (errors.NoWorkingTree, errors.NotLocalUrl):
2412
tree = None
2413
b = control.open_branch()
2414
2415
if revision is None:
2416
revno = b.revno()
2417
rev_id = b.last_revision()
2418
else:
2419
revno, rev_id = revision[0].in_history(b)
2420
if rev_id is None:
2421
print 'No revisions to uncommit.'
2422
2423
for r in range(revno, b.revno()+1):
2424
rev_id = b.get_rev_id(r)
2425
lf = log_formatter('short', to_file=sys.stdout,show_timezone='original')
2426
lf.show(r, b.repository.get_revision(rev_id), None)
2427
2428
if dry_run:
2429
print 'Dry-run, pretending to remove the above revisions.'
2430
if not force:
2431
val = raw_input('Press <enter> to continue')
2432
else:
2433
print 'The above revision(s) will be removed.'
2434
if not force:
2435
val = raw_input('Are you sure [y/N]? ')
2436
if val.lower() not in ('y', 'yes'):
2437
print 'Canceled'
2438
return 0
2439
2440
uncommit(b, tree=tree, dry_run=dry_run, verbose=verbose,
2441
revno=revno)
2442
2443
2444
class cmd_break_lock(Command):
2445
"""Break a dead lock on a repository, branch or working directory.
2446
2447
CAUTION: Locks should only be broken when you are sure that the process
2448
holding the lock has been stopped.
2449
2450
example:
2451
bzr break-lock .
2452
"""
2453
takes_args = ['location']
2454
takes_options = [Option('show',
2455
help="just show information on the lock, " \
2456
"don't break it"),
2457
]
2458
def run(self, location, show=False):
2459
raise NotImplementedError("sorry, break-lock is not complete yet; "
2460
"you can remove the 'held' directory manually to break the lock")
2461
2462
2463
# command-line interpretation helper for merge-related commands
2464
def merge(other_revision, base_revision,
2465
check_clean=True, ignore_zero=False,
2466
this_dir=None, backup_files=False, merge_type=Merge3Merger,
2467
file_list=None, show_base=False, reprocess=False,
2468
pb=DummyProgress()):
2469
"""Merge changes into a tree.
2470
2471
base_revision
2472
list(path, revno) Base for three-way merge.
2473
If [None, None] then a base will be automatically determined.
2474
other_revision
2475
list(path, revno) Other revision for three-way merge.
2476
this_dir
2477
Directory to merge changes into; '.' by default.
2478
check_clean
2479
If true, this_dir must have no uncommitted changes before the
2480
merge begins.
2481
ignore_zero - If true, suppress the "zero conflicts" message when
2482
there are no conflicts; should be set when doing something we expect
2483
to complete perfectly.
2484
file_list - If supplied, merge only changes to selected files.
2485
2486
All available ancestors of other_revision and base_revision are
2487
automatically pulled into the branch.
2488
2489
The revno may be -1 to indicate the last revision on the branch, which is
2490
the typical case.
2491
2492
This function is intended for use from the command line; programmatic
2493
clients might prefer to call merge.merge_inner(), which has less magic
2494
behavior.
2495
"""
2496
from bzrlib.merge import Merger
2497
if this_dir is None:
2498
this_dir = u'.'
2499
this_tree = WorkingTree.open_containing(this_dir)[0]
2500
if show_base and not merge_type is Merge3Merger:
2501
raise BzrCommandError("Show-base is not supported for this merge"
2502
" type. %s" % merge_type)
2503
if reprocess and not merge_type.supports_reprocess:
2504
raise BzrCommandError("Conflict reduction is not supported for merge"
2505
" type %s." % merge_type)
2506
if reprocess and show_base:
2507
raise BzrCommandError("Cannot do conflict reduction and show base.")
2508
try:
2509
merger = Merger(this_tree.branch, this_tree=this_tree, pb=pb)
2510
merger.pp = ProgressPhase("Merge phase", 5, pb)
2511
merger.pp.next_phase()
2512
merger.check_basis(check_clean)
2513
merger.set_other(other_revision)
2514
merger.pp.next_phase()
2515
merger.set_base(base_revision)
2516
if merger.base_rev_id == merger.other_rev_id:
2517
note('Nothing to do.')
2518
return 0
2519
merger.backup_files = backup_files
2520
merger.merge_type = merge_type
2521
merger.set_interesting_files(file_list)
2522
merger.show_base = show_base
2523
merger.reprocess = reprocess
2524
conflicts = merger.do_merge()
2525
if file_list is None:
2526
merger.set_pending()
2527
finally:
2528
pb.clear()
2529
return conflicts
2530
2531
2532
# these get imported and then picked up by the scan for cmd_*
2533
# TODO: Some more consistent way to split command definitions across files;
2534
# we do need to load at least some information about them to know of
2535
# aliases. ideally we would avoid loading the implementation until the
2536
# details were needed.
2537
from bzrlib.conflicts import cmd_resolve, cmd_conflicts, restore
2538
from bzrlib.sign_my_commits import cmd_sign_my_commits
2539
from bzrlib.weave_commands import cmd_weave_list, cmd_weave_join, \
2540
cmd_weave_plan_merge, cmd_weave_merge_text
Loggerhead is a web-based interface for Breezy
Version: 2.0.1