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