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