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