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