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