To get this branch, use:
bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
« back to all changes in this revision
Viewing changes to bzrlib/builtins.py
- browse files at revision 4144.5.9
- compare with another revision
- download diff
- download tarball
- view history from revision 4144.5.9
- Committer: Eric Siegerman
- Date: 2009-03-25 16:53:14 UTC
- mto: (4204.1.1 ianc-integration)
- mto: This revision was merged to the branch mainline in revision 4205.
- Revision ID: pub08@davor.org-20090325165314-1n3wv0ig2knf44xx
Another broken link.
- files added:
- bzrlib/_btree_serializer_c.pyx
- bzrlib/filters
- bzrlib/help_topics
- bzrlib/help_topics/en
- bzrlib/plugins/netrc_credential_store
- bzrlib/plugins/netrc_credential_store/tests
- bzrlib/repofmt
- bzrlib/smart
- bzrlib/tests/commands
- bzrlib/tests/ftp_server
- bzrlib/tests/inventory_implementations
- bzrlib/tests/per_interbranch
- bzrlib/tests/per_lock
- bzrlib/tests/per_repository_reference
- bzrlib/tests/ssl_certs
- bzrlib/transport/ftp
- bzrlib/util/tests
- bzrlib/version_info_formats
- doc/developers
- doc/en
- doc/en/admin-guide
- doc/en/developer-guide
- doc/en/mini-tutorial
- doc/en/quick-reference
- doc/en/release-notes
- doc/en/tutorials
- doc/en/user-guide
- doc/en/user-guide/images
- doc/en/user-reference
- doc/es
- doc/es/guia-desarrollador
- doc/es/guia-usuario
- doc/es/mini-tutorial
- doc/es/notas-version
- doc/es/referencia
- doc/es/referencia-rapida
- man1
- tools/packaging
- files removed:
- NEWS.developers
- bzrlib/bundle/old
- bzrlib/tests/interversionedfile_implementations
- bzrlib/tests/revisionstore_implementations
- files renamed:
- bzrlib/patiencediff.py => bzrlib/_patiencediff_py.py
- bzrlib/graph.py => bzrlib/deprecated_graph.py
- doc/configuration.txt => bzrlib/help_topics/en/configuration.txt
- bzrlib/tests/blackbox/test_bundle.py => bzrlib/tests/blackbox/test_send.py
- bzrlib/tests/HTTPTestUtil.py => bzrlib/tests/http_utils.py
- bzrlib/tests/repository_implementations/ => bzrlib/tests/per_repository/
- bzrlib/tests/test_command.py => bzrlib/tests/test_commands.py
- bzrlib/tests/test_graph.py => bzrlib/tests/test_deprecated_graph.py
- bzrlib/tests/test_revisionnamespaces.py => bzrlib/tests/test_revisionspec.py
- bzrlib/transport/ftp.py => bzrlib/transport/ftp/__init__.py
- bzrlib/win32console.py => bzrlib/win32utils.py
- bzrlib/xml5.py => bzrlib/xml8.py
- HACKING => doc/developers/HACKING.txt
- doc/centralized_workflow.txt => doc/en/tutorials/centralized_workflow.txt
- doc/tutorial.txt => doc/en/tutorials/tutorial.txt
- doc/index.txt => doc/en/user-guide/index.txt
- doc/plugins.txt => doc/en/user-guide/plugins.txt
- doc/setting_up_email.txt => doc/en/user-guide/setting_up_email.txt
- doc/specifying_revisions.txt => doc/en/user-guide/specifying_revisions.txt
- doc/using_aliases.txt => doc/en/user-guide/using_aliases.txt
- files modified:
- .bzrignore
- setup.py *
added
removed
bzrlib/builtins.py
1
# Copyright (C) 2004, 2005, 2006 by Canonical Ltd
1
# Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 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
12
12
#
13
13
# You should have received a copy of the GNU General Public License
14
14
# along with this program; if not, write to the Free Software
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
17
17
"""builtin bzr commands"""
18
18
19
import os
19
20
21
from bzrlib.lazy_import import lazy_import
22
lazy_import(globals(), """
20
23
import codecs
21
import errno
22
import os
23
import os.path
24
import cStringIO
24
25
import sys
26
import time
25
27
26
28
import bzrlib
27
29
from bzrlib import (
28
branch,
30
bugtracker,
29
31
bundle,
32
btree_index,
30
33
bzrdir,
34
delta,
31
35
config,
32
36
errors,
33
ignores,
37
globbing,
38
hooks,
34
39
log,
40
merge as _mod_merge,
41
merge_directive,
35
42
osutils,
36
repository,
43
reconfigure,
44
rename_map,
45
revision as _mod_revision,
46
symbol_versioning,
37
47
transport,
48
tree as _mod_tree,
38
49
ui,
39
50
urlutils,
51
views,
40
52
)
41
from bzrlib.branch import Branch, BranchReferenceFormat
42
from bzrlib.bundle import read_bundle_from_url
43
from bzrlib.bundle.apply_bundle import install_bundle, merge_bundle
53
from bzrlib.branch import Branch
44
54
from bzrlib.conflicts import ConflictList
55
from bzrlib.revisionspec import RevisionSpec, RevisionInfo
56
from bzrlib.smtp_connection import SMTPConnection
57
from bzrlib.workingtree import WorkingTree
58
""")
59
45
60
from bzrlib.commands import Command, display_command
46
from bzrlib.errors import (BzrError, BzrCheckError, BzrCommandError,
47
NotBranchError, DivergedBranches, NotConflicted,
48
NoSuchFile, NoWorkingTree, FileInWrongBranch,
49
NotVersionedError, NotABundle)
50
from bzrlib.merge import Merge3Merger
51
from bzrlib.option import Option
52
from bzrlib.progress import DummyProgress, ProgressPhase
53
from bzrlib.revision import common_ancestor
54
from bzrlib.revisionspec import RevisionSpec
55
from bzrlib.trace import mutter, note, log_error, warning, is_quiet, info
56
from bzrlib.transport.local import LocalTransport
57
from bzrlib.workingtree import WorkingTree
58
59
60
def tree_files(file_list, default_branch=u'.'):
61
from bzrlib.option import (
62
ListOption,
63
Option,
64
RegistryOption,
65
custom_help,
66
_parse_revision_str,
67
)
68
from bzrlib.trace import mutter, note, warning, is_quiet, get_verbosity_level
69
70
71
def tree_files(file_list, default_branch=u'.', canonicalize=True,
72
apply_view=True):
61
73
try:
62
return internal_tree_files(file_list, default_branch)
63
except FileInWrongBranch, e:
64
raise BzrCommandError("%s is not in the same branch as %s" %
65
(e.path, file_list[0]))
74
return internal_tree_files(file_list, default_branch, canonicalize,
75
apply_view)
76
except errors.FileInWrongBranch, e:
77
raise errors.BzrCommandError("%s is not in the same branch as %s" %
78
(e.path, file_list[0]))
79
80
81
def tree_files_for_add(file_list):
82
"""Add handles files a bit differently so it a custom implementation."""
83
if file_list:
84
tree = WorkingTree.open_containing(file_list[0])[0]
85
if tree.supports_views():
86
view_files = tree.views.lookup_view()
87
if view_files:
88
for filename in file_list:
89
if not osutils.is_inside_any(view_files, filename):
90
raise errors.FileOutsideView(filename, view_files)
91
else:
92
tree = WorkingTree.open_containing(u'.')[0]
93
if tree.supports_views():
94
view_files = tree.views.lookup_view()
95
if view_files:
96
file_list = view_files
97
view_str = views.view_display_str(view_files)
98
note("ignoring files outside view: %s" % view_str)
99
return tree, file_list
100
101
102
def _get_one_revision(command_name, revisions):
103
if revisions is None:
104
return None
105
if len(revisions) != 1:
106
raise errors.BzrCommandError(
107
'bzr %s --revision takes exactly one revision identifier' % (
108
command_name,))
109
return revisions[0]
110
111
112
def _get_one_revision_tree(command_name, revisions, branch=None, tree=None):
113
if branch is None:
114
branch = tree.branch
115
if revisions is None:
116
if tree is not None:
117
rev_tree = tree.basis_tree()
118
else:
119
rev_tree = branch.basis_tree()
120
else:
121
revision = _get_one_revision(command_name, revisions)
122
rev_tree = revision.as_tree(branch)
123
return rev_tree
66
124
67
125
68
126
# XXX: Bad function name; should possibly also be a class method of
69
127
# WorkingTree rather than a function.
70
def internal_tree_files(file_list, default_branch=u'.'):
128
def internal_tree_files(file_list, default_branch=u'.', canonicalize=True,
129
apply_view=True):
71
130
"""Convert command-line paths to a WorkingTree and relative paths.
72
131
73
132
This is typically used for command-line processors that take one or
75
134
76
135
The filenames given are not required to exist.
77
136
78
:param file_list: Filenames to convert.
79
80
:param default_branch: Fallback tree path to use if file_list is empty or None.
137
:param file_list: Filenames to convert.
138
139
:param default_branch: Fallback tree path to use if file_list is empty or
140
None.
141
142
:param apply_view: if True and a view is set, apply it or check that
143
specified files are within it
81
144
82
145
:return: workingtree, [relative_paths]
83
146
"""
84
147
if file_list is None or len(file_list) == 0:
85
return WorkingTree.open_containing(default_branch)[0], file_list
86
tree = WorkingTree.open_containing(file_list[0])[0]
148
tree = WorkingTree.open_containing(default_branch)[0]
149
if tree.supports_views() and apply_view:
150
view_files = tree.views.lookup_view()
151
if view_files:
152
file_list = view_files
153
view_str = views.view_display_str(view_files)
154
note("ignoring files outside view: %s" % view_str)
155
return tree, file_list
156
tree = WorkingTree.open_containing(osutils.realpath(file_list[0]))[0]
157
return tree, safe_relpath_files(tree, file_list, canonicalize,
158
apply_view=apply_view)
159
160
161
def safe_relpath_files(tree, file_list, canonicalize=True, apply_view=True):
162
"""Convert file_list into a list of relpaths in tree.
163
164
:param tree: A tree to operate on.
165
:param file_list: A list of user provided paths or None.
166
:param apply_view: if True and a view is set, apply it or check that
167
specified files are within it
168
:return: A list of relative paths.
169
:raises errors.PathNotChild: When a provided path is in a different tree
170
than tree.
171
"""
172
if file_list is None:
173
return None
174
if tree.supports_views() and apply_view:
175
view_files = tree.views.lookup_view()
176
else:
177
view_files = []
87
178
new_list = []
179
# tree.relpath exists as a "thunk" to osutils, but canonical_relpath
180
# doesn't - fix that up here before we enter the loop.
181
if canonicalize:
182
fixer = lambda p: osutils.canonical_relpath(tree.basedir, p)
183
else:
184
fixer = tree.relpath
88
185
for filename in file_list:
89
186
try:
90
new_list.append(tree.relpath(filename))
187
relpath = fixer(osutils.dereference_path(filename))
188
if view_files and not osutils.is_inside_any(view_files, relpath):
189
raise errors.FileOutsideView(filename, view_files)
190
new_list.append(relpath)
91
191
except errors.PathNotChild:
92
raise FileInWrongBranch(tree.branch, filename)
93
return tree, new_list
94
95
96
def get_format_type(typestring):
97
"""Parse and return a format specifier."""
98
if typestring == "weave":
99
return bzrdir.BzrDirFormat6()
100
if typestring == "default":
101
return bzrdir.BzrDirMetaFormat1()
102
if typestring == "metaweave":
103
format = bzrdir.BzrDirMetaFormat1()
104
format.repository_format = repository.RepositoryFormat7()
105
return format
106
if typestring == "knit":
107
format = bzrdir.BzrDirMetaFormat1()
108
format.repository_format = repository.RepositoryFormatKnit1()
109
return format
110
if typestring == "experimental-knit2":
111
format = bzrdir.BzrDirMetaFormat1()
112
format.repository_format = repository.RepositoryFormatKnit2()
113
return format
114
msg = "Unknown bzr format %s. Current formats are: default, knit,\n" \
115
"metaweave and weave" % typestring
116
raise BzrCommandError(msg)
192
raise errors.FileInWrongBranch(tree.branch, filename)
193
return new_list
194
195
196
def _get_view_info_for_change_reporter(tree):
197
"""Get the view information from a tree for change reporting."""
198
view_info = None
199
try:
200
current_view = tree.views.get_view_info()[0]
201
if current_view is not None:
202
view_info = (current_view, tree.views.lookup_view())
203
except errors.ViewsNotSupported:
204
pass
205
return view_info
117
206
118
207
119
208
# TODO: Make sure no commands unconditionally use the working directory as a
143
232
modified
144
233
Text has changed since the previous revision.
145
234
235
kind changed
236
File kind has been changed (e.g. from file to directory).
237
146
238
unknown
147
239
Not versioned and not matching an ignore pattern.
148
240
149
To see ignored files use 'bzr ignored'. For details in the
241
To see ignored files use 'bzr ignored'. For details on the
150
242
changes to file texts, use 'bzr diff'.
151
243
244
Note that --short or -S gives status flags for each item, similar
245
to Subversion's status command. To get output similar to svn -q,
246
use bzr status -SV.
247
152
248
If no arguments are specified, the status of the entire working
153
249
directory is shown. Otherwise, only the status of the specified
154
250
files or directories is reported. If a directory is given, status
155
251
is reported for everything inside that directory.
156
252
253
Before merges are committed, the pending merge tip revisions are
254
shown. To see all pending merge revisions, use the -v option.
255
To skip the display of pending merge information altogether, use
256
the no-pending option or specify a file/directory.
257
157
258
If a revision argument is given, the status is calculated against
158
259
that revision, or between two revisions if two are provided.
159
260
"""
160
261
161
262
# TODO: --no-recurse, --recurse options
162
263
163
264
takes_args = ['file*']
164
takes_options = ['show-ids', 'revision']
265
takes_options = ['show-ids', 'revision', 'change', 'verbose',
266
Option('short', help='Use short status indicators.',
267
short_name='S'),
268
Option('versioned', help='Only show versioned files.',
269
short_name='V'),
270
Option('no-pending', help='Don\'t show pending merges.',
271
),
272
]
165
273
aliases = ['st', 'stat']
166
274
167
275
encoding_type = 'replace'
168
276
_see_also = ['diff', 'revert', 'status-flags']
277
169
278
@display_command
170
def run(self, show_ids=False, file_list=None, revision=None):
279
def run(self, show_ids=False, file_list=None, revision=None, short=False,
280
versioned=False, no_pending=False, verbose=False):
171
281
from bzrlib.status import show_tree_status
172
282
173
tree, file_list = tree_files(file_list)
174
283
if revision and len(revision) > 2:
284
raise errors.BzrCommandError('bzr status --revision takes exactly'
285
' one or two revision specifiers')
286
287
tree, relfile_list = tree_files(file_list)
288
# Avoid asking for specific files when that is not needed.
289
if relfile_list == ['']:
290
relfile_list = None
291
# Don't disable pending merges for full trees other than '.'.
292
if file_list == ['.']:
293
no_pending = True
294
# A specific path within a tree was given.
295
elif relfile_list is not None:
296
no_pending = True
175
297
show_tree_status(tree, show_ids=show_ids,
176
specific_files=file_list, revision=revision,
177
to_file=self.outf)
298
specific_files=relfile_list, revision=revision,
299
to_file=self.outf, short=short, versioned=versioned,
300
show_pending=(not no_pending), verbose=verbose)
178
301
179
302
180
303
class cmd_cat_revision(Command):
181
304
"""Write out metadata for a revision.
182
305
183
306
The revision to print can either be specified by a specific
184
307
revision identifier, or you can use --revision.
185
308
"""
189
312
takes_options = ['revision']
190
313
# cat-revision is more for frontends so should be exact
191
314
encoding = 'strict'
192
315
193
316
@display_command
194
317
def run(self, revision_id=None, revision=None):
195
196
318
if revision_id is not None and revision is not None:
197
raise BzrCommandError('You can only supply one of revision_id or --revision')
319
raise errors.BzrCommandError('You can only supply one of'
320
' revision_id or --revision')
198
321
if revision_id is None and revision is None:
199
raise BzrCommandError('You must supply either --revision or a revision_id')
322
raise errors.BzrCommandError('You must supply either'
323
' --revision or a revision_id')
200
324
b = WorkingTree.open_containing(u'.')[0].branch
201
325
202
326
# TODO: jam 20060112 should cat-revision always output utf-8?
203
327
if revision_id is not None:
204
self.outf.write(b.repository.get_revision_xml(revision_id).decode('utf-8'))
328
revision_id = osutils.safe_revision_id(revision_id, warn=False)
329
try:
330
self.outf.write(b.repository.get_revision_xml(revision_id).decode('utf-8'))
331
except errors.NoSuchRevision:
332
msg = "The repository %s contains no revision %s." % (b.repository.base,
333
revision_id)
334
raise errors.BzrCommandError(msg)
205
335
elif revision is not None:
206
336
for rev in revision:
207
337
if rev is None:
208
raise BzrCommandError('You cannot specify a NULL revision.')
209
revno, rev_id = rev.in_history(b)
338
raise errors.BzrCommandError('You cannot specify a NULL'
339
' revision.')
340
rev_id = rev.as_revision_id(b)
210
341
self.outf.write(b.repository.get_revision_xml(rev_id).decode('utf-8'))
211
342
343
344
class cmd_dump_btree(Command):
345
"""Dump the contents of a btree index file to stdout.
346
347
PATH is a btree index file, it can be any URL. This includes things like
348
.bzr/repository/pack-names, or .bzr/repository/indices/a34b3a...ca4a4.iix
349
350
By default, the tuples stored in the index file will be displayed. With
351
--raw, we will uncompress the pages, but otherwise display the raw bytes
352
stored in the index.
353
"""
354
355
# TODO: Do we want to dump the internal nodes as well?
356
# TODO: It would be nice to be able to dump the un-parsed information,
357
# rather than only going through iter_all_entries. However, this is
358
# good enough for a start
359
hidden = True
360
encoding_type = 'exact'
361
takes_args = ['path']
362
takes_options = [Option('raw', help='Write the uncompressed bytes out,'
363
' rather than the parsed tuples.'),
364
]
365
366
def run(self, path, raw=False):
367
dirname, basename = osutils.split(path)
368
t = transport.get_transport(dirname)
369
if raw:
370
self._dump_raw_bytes(t, basename)
371
else:
372
self._dump_entries(t, basename)
373
374
def _get_index_and_bytes(self, trans, basename):
375
"""Create a BTreeGraphIndex and raw bytes."""
376
bt = btree_index.BTreeGraphIndex(trans, basename, None)
377
bytes = trans.get_bytes(basename)
378
bt._file = cStringIO.StringIO(bytes)
379
bt._size = len(bytes)
380
return bt, bytes
381
382
def _dump_raw_bytes(self, trans, basename):
383
import zlib
384
385
# We need to parse at least the root node.
386
# This is because the first page of every row starts with an
387
# uncompressed header.
388
bt, bytes = self._get_index_and_bytes(trans, basename)
389
for page_idx, page_start in enumerate(xrange(0, len(bytes),
390
btree_index._PAGE_SIZE)):
391
page_end = min(page_start + btree_index._PAGE_SIZE, len(bytes))
392
page_bytes = bytes[page_start:page_end]
393
if page_idx == 0:
394
self.outf.write('Root node:\n')
395
header_end, data = bt._parse_header_from_bytes(page_bytes)
396
self.outf.write(page_bytes[:header_end])
397
page_bytes = data
398
self.outf.write('\nPage %d\n' % (page_idx,))
399
decomp_bytes = zlib.decompress(page_bytes)
400
self.outf.write(decomp_bytes)
401
self.outf.write('\n')
402
403
def _dump_entries(self, trans, basename):
404
try:
405
st = trans.stat(basename)
406
except errors.TransportNotPossible:
407
# We can't stat, so we'll fake it because we have to do the 'get()'
408
# anyway.
409
bt, _ = self._get_index_and_bytes(trans, basename)
410
else:
411
bt = btree_index.BTreeGraphIndex(trans, basename, st.st_size)
412
for node in bt.iter_all_entries():
413
# Node is made up of:
414
# (index, key, value, [references])
415
self.outf.write('%s\n' % (node[1:],))
416
417
418
class cmd_remove_tree(Command):
419
"""Remove the working tree from a given branch/checkout.
420
421
Since a lightweight checkout is little more than a working tree
422
this will refuse to run against one.
423
424
To re-create the working tree, use "bzr checkout".
425
"""
426
_see_also = ['checkout', 'working-trees']
427
takes_args = ['location?']
428
takes_options = [
429
Option('force',
430
help='Remove the working tree even if it has '
431
'uncommitted changes.'),
432
]
433
434
def run(self, location='.', force=False):
435
d = bzrdir.BzrDir.open(location)
436
437
try:
438
working = d.open_workingtree()
439
except errors.NoWorkingTree:
440
raise errors.BzrCommandError("No working tree to remove")
441
except errors.NotLocalUrl:
442
raise errors.BzrCommandError("You cannot remove the working tree of a "
443
"remote path")
444
if not force:
445
changes = working.changes_from(working.basis_tree())
446
if changes.has_changed():
447
raise errors.UncommittedChanges(working)
448
449
working_path = working.bzrdir.root_transport.base
450
branch_path = working.branch.bzrdir.root_transport.base
451
if working_path != branch_path:
452
raise errors.BzrCommandError("You cannot remove the working tree from "
453
"a lightweight checkout")
454
455
d.destroy_workingtree()
456
212
457
213
458
class cmd_revno(Command):
214
459
"""Show current revision number.
216
461
This is equal to the number of revisions on this branch.
217
462
"""
218
463
464
_see_also = ['info']
219
465
takes_args = ['location?']
220
466
221
467
@display_command
229
475
"""
230
476
hidden = True
231
477
takes_args = ['revision_info*']
232
takes_options = ['revision']
478
takes_options = [
479
'revision',
480
Option('directory',
481
help='Branch to examine, '
482
'rather than the one containing the working directory.',
483
short_name='d',
484
type=unicode,
485
),
486
]
233
487
234
488
@display_command
235
def run(self, revision=None, revision_info_list=[]):
489
def run(self, revision=None, directory=u'.', revision_info_list=[]):
236
490
237
491
revs = []
238
492
if revision is not None:
240
494
if revision_info_list is not None:
241
495
for rev in revision_info_list:
242
496
revs.append(RevisionSpec.from_string(rev))
497
498
b = Branch.open_containing(directory)[0]
499
243
500
if len(revs) == 0:
244
raise BzrCommandError('You must supply a revision identifier')
245
246
b = WorkingTree.open_containing(u'.')[0].branch
501
revs.append(RevisionSpec.from_string('-1'))
247
502
248
503
for rev in revs:
249
revinfo = rev.in_history(b)
250
if revinfo.revno is None:
251
print ' %s' % revinfo.rev_id
252
else:
253
print '%4d %s' % (revinfo.revno, revinfo.rev_id)
254
255
504
revision_id = rev.as_revision_id(b)
505
try:
506
revno = '%4d' % (b.revision_id_to_revno(revision_id))
507
except errors.NoSuchRevision:
508
dotted_map = b.get_revision_id_to_revno_map()
509
revno = '.'.join(str(i) for i in dotted_map[revision_id])
510
print '%s %s' % (revno, revision_id)
511
512
256
513
class cmd_add(Command):
257
514
"""Add specified files or directories.
258
515
276
533
you should never need to explicitly add a directory, they'll just
277
534
get added when you add a file in the directory.
278
535
279
--dry-run will show which files would be added, but not actually
536
--dry-run will show which files would be added, but not actually
280
537
add them.
281
538
282
539
--file-ids-from will try to use the file ids from the supplied path.
283
540
It looks up ids trying to find a matching parent directory with the
284
same filename, and then by pure path.
541
same filename, and then by pure path. This option is rarely needed
542
but can be useful when adding the same logical file into two
543
branches that will be merged later (without showing the two different
544
adds as a conflict). It is also useful when merging another project
545
into a subdirectory of this one.
285
546
"""
286
547
takes_args = ['file*']
287
takes_options = ['no-recurse', 'dry-run', 'verbose',
288
Option('file-ids-from', type=unicode,
289
help='Lookup file ids from here')]
548
takes_options = [
549
Option('no-recurse',
550
help="Don't recursively add the contents of directories."),
551
Option('dry-run',
552
help="Show what would be done, but don't actually do anything."),
553
'verbose',
554
Option('file-ids-from',
555
type=unicode,
556
help='Lookup file ids from this tree.'),
557
]
290
558
encoding_type = 'replace'
559
_see_also = ['remove']
291
560
292
561
def run(self, file_list, no_recurse=False, dry_run=False, verbose=False,
293
562
file_ids_from=None):
294
563
import bzrlib.add
295
564
565
base_tree = None
296
566
if file_ids_from is not None:
297
567
try:
298
568
base_tree, base_path = WorkingTree.open_containing(
299
569
file_ids_from)
300
570
except errors.NoWorkingTree:
301
base_branch, base_path = branch.Branch.open_containing(
571
base_branch, base_path = Branch.open_containing(
302
572
file_ids_from)
303
573
base_tree = base_branch.basis_tree()
304
574
308
578
action = bzrlib.add.AddAction(to_file=self.outf,
309
579
should_print=(not is_quiet()))
310
580
311
added, ignored = bzrlib.add.smart_add(file_list, not no_recurse,
312
action=action, save=not dry_run)
581
if base_tree:
582
base_tree.lock_read()
583
try:
584
file_list = self._maybe_expand_globs(file_list)
585
tree, file_list = tree_files_for_add(file_list)
586
added, ignored = tree.smart_add(file_list, not
587
no_recurse, action=action, save=not dry_run)
588
finally:
589
if base_tree is not None:
590
base_tree.unlock()
313
591
if len(ignored) > 0:
314
592
if verbose:
315
593
for glob in sorted(ignored.keys()):
316
594
for path in ignored[glob]:
317
self.outf.write("ignored %s matching \"%s\"\n"
595
self.outf.write("ignored %s matching \"%s\"\n"
318
596
% (path, glob))
319
597
else:
320
598
match_len = 0
347
625
348
626
takes_args = ['filename']
349
627
hidden = True
350
628
351
629
@display_command
352
630
def run(self, filename):
353
631
# TODO: jam 20050106 Can relpath return a munged path if
361
639
"""Show inventory of the current working copy or a revision.
362
640
363
641
It is possible to limit the output to a particular entry
364
type using the --kind option. For example; --kind file.
642
type using the --kind option. For example: --kind file.
643
644
It is also possible to restrict the list of files to a specific
645
set. For example: bzr inventory --show-ids this/file
365
646
"""
366
647
367
takes_options = ['revision', 'show-ids', 'kind']
368
648
hidden = True
649
_see_also = ['ls']
650
takes_options = [
651
'revision',
652
'show-ids',
653
Option('kind',
654
help='List entries of a particular kind: file, directory, symlink.',
655
type=unicode),
656
]
657
takes_args = ['file*']
658
369
659
@display_command
370
def run(self, revision=None, show_ids=False, kind=None):
660
def run(self, revision=None, show_ids=False, kind=None, file_list=None):
371
661
if kind and kind not in ['file', 'directory', 'symlink']:
372
raise BzrCommandError('invalid kind specified')
373
tree = WorkingTree.open_containing(u'.')[0]
374
if revision is None:
375
inv = tree.read_working_inventory()
376
else:
377
if len(revision) > 1:
378
raise BzrCommandError('bzr inventory --revision takes'
379
' exactly one revision identifier')
380
inv = tree.branch.repository.get_revision_inventory(
381
revision[0].in_history(tree.branch).rev_id)
382
383
for path, entry in inv.entries():
662
raise errors.BzrCommandError('invalid kind %r specified' % (kind,))
663
664
revision = _get_one_revision('inventory', revision)
665
work_tree, file_list = tree_files(file_list)
666
work_tree.lock_read()
667
try:
668
if revision is not None:
669
tree = revision.as_tree(work_tree.branch)
670
671
extra_trees = [work_tree]
672
tree.lock_read()
673
else:
674
tree = work_tree
675
extra_trees = []
676
677
if file_list is not None:
678
file_ids = tree.paths2ids(file_list, trees=extra_trees,
679
require_versioned=True)
680
# find_ids_across_trees may include some paths that don't
681
# exist in 'tree'.
682
entries = sorted((tree.id2path(file_id), tree.inventory[file_id])
683
for file_id in file_ids if file_id in tree)
684
else:
685
entries = tree.inventory.entries()
686
finally:
687
tree.unlock()
688
if tree is not work_tree:
689
work_tree.unlock()
690
691
for path, entry in entries:
384
692
if kind and kind != entry.kind:
385
693
continue
386
694
if show_ids:
393
701
class cmd_mv(Command):
394
702
"""Move or rename a file.
395
703
396
usage:
704
:Usage:
397
705
bzr mv OLDNAME NEWNAME
706
398
707
bzr mv SOURCE... DESTINATION
399
708
400
709
If the last argument is a versioned directory, all the other names
401
710
are moved into it. Otherwise, there must be exactly two arguments
402
and the file is changed to a new name, which must not already exist.
711
and the file is changed to a new name.
712
713
If OLDNAME does not exist on the filesystem but is versioned and
714
NEWNAME does exist on the filesystem but is not versioned, mv
715
assumes that the file has been manually moved and only updates
716
its internal inventory to reflect that change.
717
The same is valid when moving many SOURCE files to a DESTINATION.
403
718
404
719
Files cannot be moved between branches.
405
720
"""
406
721
407
722
takes_args = ['names*']
723
takes_options = [Option("after", help="Move only the bzr identifier"
724
" of the file, because the file has already been moved."),
725
]
408
726
aliases = ['move', 'rename']
409
727
encoding_type = 'replace'
410
728
411
def run(self, names_list):
729
def run(self, names_list, after=False):
412
730
if names_list is None:
413
731
names_list = []
414
732
415
733
if len(names_list) < 2:
416
raise BzrCommandError("missing file argument")
417
tree, rel_names = tree_files(names_list)
418
419
if os.path.isdir(names_list[-1]):
734
raise errors.BzrCommandError("missing file argument")
735
tree, rel_names = tree_files(names_list, canonicalize=False)
736
tree.lock_write()
737
try:
738
self._run(tree, names_list, rel_names, after)
739
finally:
740
tree.unlock()
741
742
def _run(self, tree, names_list, rel_names, after):
743
into_existing = osutils.isdir(names_list[-1])
744
if into_existing and len(names_list) == 2:
745
# special cases:
746
# a. case-insensitive filesystem and change case of dir
747
# b. move directory after the fact (if the source used to be
748
# a directory, but now doesn't exist in the working tree
749
# and the target is an existing directory, just rename it)
750
if (not tree.case_sensitive
751
and rel_names[0].lower() == rel_names[1].lower()):
752
into_existing = False
753
else:
754
inv = tree.inventory
755
# 'fix' the case of a potential 'from'
756
from_id = tree.path2id(
757
tree.get_canonical_inventory_path(rel_names[0]))
758
if (not osutils.lexists(names_list[0]) and
759
from_id and inv.get_file_kind(from_id) == "directory"):
760
into_existing = False
761
# move/rename
762
if into_existing:
420
763
# move into existing directory
421
for pair in tree.move(rel_names[:-1], rel_names[-1]):
764
# All entries reference existing inventory items, so fix them up
765
# for cicp file-systems.
766
rel_names = tree.get_canonical_inventory_paths(rel_names)
767
for pair in tree.move(rel_names[:-1], rel_names[-1], after=after):
422
768
self.outf.write("%s => %s\n" % pair)
423
769
else:
424
770
if len(names_list) != 2:
425
raise BzrCommandError('to mv multiple files the destination '
426
'must be a versioned directory')
427
tree.rename_one(rel_names[0], rel_names[1])
428
self.outf.write("%s => %s\n" % (rel_names[0], rel_names[1]))
429
430
771
raise errors.BzrCommandError('to mv multiple files the'
772
' destination must be a versioned'
773
' directory')
774
775
# for cicp file-systems: the src references an existing inventory
776
# item:
777
src = tree.get_canonical_inventory_path(rel_names[0])
778
# Find the canonical version of the destination: In all cases, the
779
# parent of the target must be in the inventory, so we fetch the
780
# canonical version from there (we do not always *use* the
781
# canonicalized tail portion - we may be attempting to rename the
782
# case of the tail)
783
canon_dest = tree.get_canonical_inventory_path(rel_names[1])
784
dest_parent = osutils.dirname(canon_dest)
785
spec_tail = osutils.basename(rel_names[1])
786
# For a CICP file-system, we need to avoid creating 2 inventory
787
# entries that differ only by case. So regardless of the case
788
# we *want* to use (ie, specified by the user or the file-system),
789
# we must always choose to use the case of any existing inventory
790
# items. The only exception to this is when we are attempting a
791
# case-only rename (ie, canonical versions of src and dest are
792
# the same)
793
dest_id = tree.path2id(canon_dest)
794
if dest_id is None or tree.path2id(src) == dest_id:
795
# No existing item we care about, so work out what case we
796
# are actually going to use.
797
if after:
798
# If 'after' is specified, the tail must refer to a file on disk.
799
if dest_parent:
800
dest_parent_fq = osutils.pathjoin(tree.basedir, dest_parent)
801
else:
802
# pathjoin with an empty tail adds a slash, which breaks
803
# relpath :(
804
dest_parent_fq = tree.basedir
805
806
dest_tail = osutils.canonical_relpath(
807
dest_parent_fq,
808
osutils.pathjoin(dest_parent_fq, spec_tail))
809
else:
810
# not 'after', so case as specified is used
811
dest_tail = spec_tail
812
else:
813
# Use the existing item so 'mv' fails with AlreadyVersioned.
814
dest_tail = os.path.basename(canon_dest)
815
dest = osutils.pathjoin(dest_parent, dest_tail)
816
mutter("attempting to move %s => %s", src, dest)
817
tree.rename_one(src, dest, after=after)
818
self.outf.write("%s => %s\n" % (src, dest))
819
820
431
821
class cmd_pull(Command):
432
822
"""Turn this branch into a mirror of another branch.
433
823
446
836
that, you can omit the location to use the default. To change the
447
837
default, use --remember. The value will only be saved if the remote
448
838
location can be accessed.
839
840
Note: The location can be specified either in the form of a branch,
841
or in the form of a path to a file containing a merge directive generated
842
with bzr send.
449
843
"""
450
844
451
takes_options = ['remember', 'overwrite', 'revision', 'verbose']
845
_see_also = ['push', 'update', 'status-flags', 'send']
846
takes_options = ['remember', 'overwrite', 'revision',
847
custom_help('verbose',
848
help='Show logs of pulled revisions.'),
849
Option('directory',
850
help='Branch to pull into, '
851
'rather than the one containing the working directory.',
852
short_name='d',
853
type=unicode,
854
),
855
]
452
856
takes_args = ['location?']
453
857
encoding_type = 'replace'
454
858
455
def run(self, location=None, remember=False, overwrite=False, revision=None, verbose=False):
859
def run(self, location=None, remember=False, overwrite=False,
860
revision=None, verbose=False,
861
directory=None):
456
862
# FIXME: too much stuff is in the command class
863
revision_id = None
864
mergeable = None
865
if directory is None:
866
directory = u'.'
457
867
try:
458
tree_to = WorkingTree.open_containing(u'.')[0]
868
tree_to = WorkingTree.open_containing(directory)[0]
459
869
branch_to = tree_to.branch
460
except NoWorkingTree:
870
except errors.NoWorkingTree:
461
871
tree_to = None
462
branch_to = Branch.open_containing(u'.')[0]
872
branch_to = Branch.open_containing(directory)[0]
463
873
464
reader = None
874
possible_transports = []
465
875
if location is not None:
466
876
try:
467
reader = bundle.read_bundle_from_url(location)
468
except NotABundle:
469
pass # Continue on considering this url a Branch
877
mergeable = bundle.read_mergeable_from_url(location,
878
possible_transports=possible_transports)
879
except errors.NotABundle:
880
mergeable = None
470
881
471
882
stored_loc = branch_to.get_parent()
472
883
if location is None:
473
884
if stored_loc is None:
474
raise BzrCommandError("No pull location known or specified.")
885
raise errors.BzrCommandError("No pull location known or"
886
" specified.")
475
887
else:
476
888
display_url = urlutils.unescape_for_display(stored_loc,
477
889
self.outf.encoding)
478
self.outf.write("Using saved location: %s\n" % display_url)
890
if not is_quiet():
891
self.outf.write("Using saved parent location: %s\n" % display_url)
479
892
location = stored_loc
480
893
481
482
if reader is not None:
483
install_bundle(branch_to.repository, reader)
894
revision = _get_one_revision('pull', revision)
895
if mergeable is not None:
896
if revision is not None:
897
raise errors.BzrCommandError(
898
'Cannot use -r with merge directives or bundles')
899
mergeable.install_revisions(branch_to.repository)
900
base_revision_id, revision_id, verified = \
901
mergeable.get_merge_request(branch_to.repository)
484
902
branch_from = branch_to
485
903
else:
486
branch_from = Branch.open(location)
904
branch_from = Branch.open(location,
905
possible_transports=possible_transports)
487
906
488
907
if branch_to.get_parent() is None or remember:
489
908
branch_to.set_parent(branch_from.base)
490
909
491
rev_id = None
492
if revision is None:
493
if reader is not None:
494
rev_id = reader.target
495
elif len(revision) == 1:
496
rev_id = revision[0].in_history(branch_from).rev_id
497
else:
498
raise BzrCommandError('bzr pull --revision takes one value.')
499
500
old_rh = branch_to.revision_history()
501
if tree_to is not None:
502
count = tree_to.pull(branch_from, overwrite, rev_id)
503
else:
504
count = branch_to.pull(branch_from, overwrite, rev_id)
505
note('%d revision(s) pulled.' % (count,))
506
507
if verbose:
508
new_rh = branch_to.revision_history()
509
if old_rh != new_rh:
510
# Something changed
511
from bzrlib.log import show_changed_revisions
512
show_changed_revisions(branch_to, old_rh, new_rh,
513
to_file=self.outf)
910
if revision is not None:
911
revision_id = revision.as_revision_id(branch_from)
912
913
branch_to.lock_write()
914
try:
915
if tree_to is not None:
916
view_info = _get_view_info_for_change_reporter(tree_to)
917
change_reporter = delta._ChangeReporter(
918
unversioned_filter=tree_to.is_ignored, view_info=view_info)
919
result = tree_to.pull(branch_from, overwrite, revision_id,
920
change_reporter,
921
possible_transports=possible_transports)
922
else:
923
result = branch_to.pull(branch_from, overwrite, revision_id)
924
925
result.report(self.outf)
926
if verbose and result.old_revid != result.new_revid:
927
log.show_branch_change(branch_to, self.outf, result.old_revno,
928
result.old_revid)
929
finally:
930
branch_to.unlock()
514
931
515
932
516
933
class cmd_push(Command):
517
934
"""Update a mirror of this branch.
518
935
519
936
The target branch will not have its working tree populated because this
520
937
is both expensive, and is not supported on remote file systems.
521
938
522
939
Some smart servers or protocols *may* put the working tree in place in
523
940
the future.
524
941
528
945
529
946
If branches have diverged, you can use 'bzr push --overwrite' to replace
530
947
the other branch completely, discarding its unmerged changes.
531
948
532
949
If you want to ensure you have the different changes in the other branch,
533
950
do a merge (see bzr help merge) from the other branch, and commit that.
534
951
After that you will be able to do a push without '--overwrite'.
539
956
location can be accessed.
540
957
"""
541
958
542
takes_options = ['remember', 'overwrite', 'verbose',
543
Option('create-prefix',
544
help='Create the path leading up to the branch '
545
'if it does not already exist')]
959
_see_also = ['pull', 'update', 'working-trees']
960
takes_options = ['remember', 'overwrite', 'verbose', 'revision',
961
Option('create-prefix',
962
help='Create the path leading up to the branch '
963
'if it does not already exist.'),
964
Option('directory',
965
help='Branch to push from, '
966
'rather than the one containing the working directory.',
967
short_name='d',
968
type=unicode,
969
),
970
Option('use-existing-dir',
971
help='By default push will fail if the target'
972
' directory exists, but does not already'
973
' have a control directory. This flag will'
974
' allow push to proceed.'),
975
Option('stacked',
976
help='Create a stacked branch that references the public location '
977
'of the parent branch.'),
978
Option('stacked-on',
979
help='Create a stacked branch that refers to another branch '
980
'for the commit history. Only the work not present in the '
981
'referenced branch is included in the branch created.',
982
type=unicode),
983
]
546
984
takes_args = ['location?']
547
985
encoding_type = 'replace'
548
986
549
987
def run(self, location=None, remember=False, overwrite=False,
550
create_prefix=False, verbose=False):
551
# FIXME: Way too big! Put this into a function called from the
552
# command.
553
554
br_from = Branch.open_containing('.')[0]
555
stored_loc = br_from.get_push_location()
988
create_prefix=False, verbose=False, revision=None,
989
use_existing_dir=False, directory=None, stacked_on=None,
990
stacked=False):
991
from bzrlib.push import _show_push_branch
992
993
# Get the source branch and revision_id
994
if directory is None:
995
directory = '.'
996
br_from = Branch.open_containing(directory)[0]
997
revision = _get_one_revision('push', revision)
998
if revision is not None:
999
revision_id = revision.in_history(br_from).rev_id
1000
else:
1001
revision_id = br_from.last_revision()
1002
1003
# Get the stacked_on branch, if any
1004
if stacked_on is not None:
1005
stacked_on = urlutils.normalize_url(stacked_on)
1006
elif stacked:
1007
parent_url = br_from.get_parent()
1008
if parent_url:
1009
parent = Branch.open(parent_url)
1010
stacked_on = parent.get_public_branch()
1011
if not stacked_on:
1012
# I considered excluding non-http url's here, thus forcing
1013
# 'public' branches only, but that only works for some
1014
# users, so it's best to just depend on the user spotting an
1015
# error by the feedback given to them. RBC 20080227.
1016
stacked_on = parent_url
1017
if not stacked_on:
1018
raise errors.BzrCommandError(
1019
"Could not determine branch to refer to.")
1020
1021
# Get the destination location
556
1022
if location is None:
1023
stored_loc = br_from.get_push_location()
557
1024
if stored_loc is None:
558
raise BzrCommandError("No push location known or specified.")
1025
raise errors.BzrCommandError(
1026
"No push location known or specified.")
559
1027
else:
560
1028
display_url = urlutils.unescape_for_display(stored_loc,
561
1029
self.outf.encoding)
562
self.outf.write("Using saved location: %s\n" % display_url)
1030
self.outf.write("Using saved push location: %s\n" % display_url)
563
1031
location = stored_loc
564
1032
565
to_transport = transport.get_transport(location)
566
location_url = to_transport.base
567
568
old_rh = []
569
try:
570
dir_to = bzrdir.BzrDir.open(location_url)
571
br_to = dir_to.open_branch()
572
except NotBranchError:
573
# create a branch.
574
to_transport = to_transport.clone('..')
575
if not create_prefix:
576
try:
577
relurl = to_transport.relpath(location_url)
578
mutter('creating directory %s => %s', location_url, relurl)
579
to_transport.mkdir(relurl)
580
except NoSuchFile:
581
raise BzrCommandError("Parent directory of %s "
582
"does not exist." % location)
583
else:
584
current = to_transport.base
585
needed = [(to_transport, to_transport.relpath(location_url))]
586
while needed:
587
try:
588
to_transport, relpath = needed[-1]
589
to_transport.mkdir(relpath)
590
needed.pop()
591
except NoSuchFile:
592
new_transport = to_transport.clone('..')
593
needed.append((new_transport,
594
new_transport.relpath(to_transport.base)))
595
if new_transport.base == to_transport.base:
596
raise BzrCommandError("Could not create "
597
"path prefix.")
598
dir_to = br_from.bzrdir.clone(location_url,
599
revision_id=br_from.last_revision())
600
br_to = dir_to.open_branch()
601
count = len(br_to.revision_history())
602
# We successfully created the target, remember it
603
if br_from.get_push_location() is None or remember:
604
br_from.set_push_location(br_to.base)
605
else:
606
# We were able to connect to the remote location, so remember it
607
# we don't need to successfully push because of possible divergence.
608
if br_from.get_push_location() is None or remember:
609
br_from.set_push_location(br_to.base)
610
old_rh = br_to.revision_history()
611
try:
612
try:
613
tree_to = dir_to.open_workingtree()
614
except errors.NotLocalUrl:
615
warning('This transport does not update the working '
616
'tree of: %s' % (br_to.base,))
617
count = br_to.pull(br_from, overwrite)
618
except NoWorkingTree:
619
count = br_to.pull(br_from, overwrite)
620
else:
621
count = tree_to.pull(br_from, overwrite)
622
except DivergedBranches:
623
raise BzrCommandError("These branches have diverged."
624
" Try a merge then push with overwrite.")
625
note('%d revision(s) pushed.' % (count,))
626
627
if verbose:
628
new_rh = br_to.revision_history()
629
if old_rh != new_rh:
630
# Something changed
631
from bzrlib.log import show_changed_revisions
632
show_changed_revisions(br_to, old_rh, new_rh,
633
to_file=self.outf)
1033
_show_push_branch(br_from, revision_id, location, self.outf,
1034
verbose=verbose, overwrite=overwrite, remember=remember,
1035
stacked_on=stacked_on, create_prefix=create_prefix,
1036
use_existing_dir=use_existing_dir)
634
1037
635
1038
636
1039
class cmd_branch(Command):
638
1041
639
1042
If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will
640
1043
be used. In other words, "branch ../foo/bar" will attempt to create ./bar.
1044
If the FROM_LOCATION has no / or path separator embedded, the TO_LOCATION
1045
is derived from the FROM_LOCATION by stripping a leading scheme or drive
1046
identifier, if any. For example, "branch lp:foo-bar" will attempt to
1047
create ./foo-bar.
641
1048
642
1049
To retrieve the branch as of a particular revision, supply the --revision
643
1050
parameter, as in "branch foo/bar -r 5".
1051
"""
644
1052
645
--basis is to speed up branching from remote branches. When specified, it
646
copies all the file-contents, inventory and revision data from the basis
647
branch before copying anything from the remote branch.
648
"""
1053
_see_also = ['checkout']
649
1054
takes_args = ['from_location', 'to_location?']
650
takes_options = ['revision', 'basis']
1055
takes_options = ['revision', Option('hardlink',
1056
help='Hard-link working tree files where possible.'),
1057
Option('no-tree',
1058
help="Create a branch without a working-tree."),
1059
Option('stacked',
1060
help='Create a stacked branch referring to the source branch. '
1061
'The new branch will depend on the availability of the source '
1062
'branch for all operations.'),
1063
Option('standalone',
1064
help='Do not use a shared repository, even if available.'),
1065
]
651
1066
aliases = ['get', 'clone']
652
1067
653
def run(self, from_location, to_location=None, revision=None, basis=None):
654
if revision is None:
655
revision = [None]
656
elif len(revision) > 1:
657
raise BzrCommandError(
658
'bzr branch --revision takes exactly 1 revision value')
659
try:
660
br_from = Branch.open(from_location)
661
except OSError, e:
662
if e.errno == errno.ENOENT:
663
raise BzrCommandError('Source location "%s" does not'
664
' exist.' % to_location)
665
else:
666
raise
1068
def run(self, from_location, to_location=None, revision=None,
1069
hardlink=False, stacked=False, standalone=False, no_tree=False):
1070
from bzrlib.tag import _merge_tags_if_possible
1071
1072
accelerator_tree, br_from = bzrdir.BzrDir.open_tree_or_branch(
1073
from_location)
1074
revision = _get_one_revision('branch', revision)
667
1075
br_from.lock_read()
668
1076
try:
669
if basis is not None:
670
basis_dir = bzrdir.BzrDir.open_containing(basis)[0]
671
else:
672
basis_dir = None
673
if len(revision) == 1 and revision[0] is not None:
674
revision_id = revision[0].in_history(br_from)[1]
1077
if revision is not None:
1078
revision_id = revision.as_revision_id(br_from)
675
1079
else:
676
1080
# FIXME - wt.last_revision, fallback to branch, fall back to
677
1081
# None or perhaps NULL_REVISION to mean copy nothing
678
1082
# RBC 20060209
679
1083
revision_id = br_from.last_revision()
680
1084
if to_location is None:
681
to_location = os.path.basename(from_location.rstrip("/\\"))
682
name = None
683
else:
684
name = os.path.basename(to_location) + '\n'
685
1085
to_location = urlutils.derive_to_location(from_location)
686
1086
to_transport = transport.get_transport(to_location)
687
1087
try:
688
1088
to_transport.mkdir('.')
689
1089
except errors.FileExists:
690
raise BzrCommandError('Target directory "%s" already'
691
' exists.' % to_location)
1090
raise errors.BzrCommandError('Target directory "%s" already'
1091
' exists.' % to_location)
692
1092
except errors.NoSuchFile:
693
raise BzrCommandError('Parent of "%s" does not exist.' %
694
to_location)
1093
raise errors.BzrCommandError('Parent of "%s" does not exist.'
1094
% to_location)
695
1095
try:
696
1096
# preserve whatever source format we have.
697
dir = br_from.bzrdir.sprout(to_transport.base,
698
revision_id, basis_dir)
1097
dir = br_from.bzrdir.sprout(to_transport.base, revision_id,
1098
possible_transports=[to_transport],
1099
accelerator_tree=accelerator_tree,
1100
hardlink=hardlink, stacked=stacked,
1101
force_new_repo=standalone,
1102
create_tree_if_local=not no_tree,
1103
source_branch=br_from)
699
1104
branch = dir.open_branch()
700
1105
except errors.NoSuchRevision:
701
1106
to_transport.delete_tree('.')
702
msg = "The branch %s has no revision %s." % (from_location, revision[0])
703
raise BzrCommandError(msg)
704
except errors.UnlistableBranch:
705
osutils.rmtree(to_location)
706
msg = "The branch %s cannot be used as a --basis" % (basis,)
707
raise BzrCommandError(msg)
708
if name:
709
branch.control_files.put_utf8('branch-name', name)
710
note('Branched %d revision(s).' % branch.revno())
1107
msg = "The branch %s has no revision %s." % (from_location,
1108
revision)
1109
raise errors.BzrCommandError(msg)
1110
_merge_tags_if_possible(br_from, branch)
1111
# If the source branch is stacked, the new branch may
1112
# be stacked whether we asked for that explicitly or not.
1113
# We therefore need a try/except here and not just 'if stacked:'
1114
try:
1115
note('Created new stacked branch referring to %s.' %
1116
branch.get_stacked_on_url())
1117
except (errors.NotStacked, errors.UnstackableBranchFormat,
1118
errors.UnstackableRepositoryFormat), e:
1119
note('Branched %d revision(s).' % branch.revno())
711
1120
finally:
712
1121
br_from.unlock()
713
1122
719
1128
the branch found in '.'. This is useful if you have removed the working tree
720
1129
or if it was never created - i.e. if you pushed the branch to its current
721
1130
location using SFTP.
722
1131
723
1132
If the TO_LOCATION is omitted, the last component of the BRANCH_LOCATION will
724
1133
be used. In other words, "checkout ../foo/bar" will attempt to create ./bar.
1134
If the BRANCH_LOCATION has no / or path separator embedded, the TO_LOCATION
1135
is derived from the BRANCH_LOCATION by stripping a leading scheme or drive
1136
identifier, if any. For example, "checkout lp:foo-bar" will attempt to
1137
create ./foo-bar.
725
1138
726
1139
To retrieve the branch as of a particular revision, supply the --revision
727
1140
parameter, as in "checkout foo/bar -r 5". Note that this will be immediately
728
1141
out of date [so you cannot commit] but it may be useful (i.e. to examine old
729
1142
code.)
1143
"""
730
1144
731
--basis is to speed up checking out from remote branches. When specified, it
732
uses the inventory and file contents from the basis branch in preference to the
733
branch being checked out.
734
"""
1145
_see_also = ['checkouts', 'branch']
735
1146
takes_args = ['branch_location?', 'to_location?']
736
takes_options = ['revision', # , 'basis']
1147
takes_options = ['revision',
737
1148
Option('lightweight',
738
help="perform a lightweight checkout. Lightweight "
1149
help="Perform a lightweight checkout. Lightweight "
739
1150
"checkouts depend on access to the branch for "
740
"every operation. Normal checkouts can perform "
1151
"every operation. Normal checkouts can perform "
741
1152
"common operations like diff and status without "
742
1153
"such access, and also support local commits."
743
1154
),
1155
Option('files-from', type=str,
1156
help="Get file contents from this tree."),
1157
Option('hardlink',
1158
help='Hard-link working tree files where possible.'
1159
),
744
1160
]
745
1161
aliases = ['co']
746
1162
747
def run(self, branch_location=None, to_location=None, revision=None, basis=None,
748
lightweight=False):
749
if revision is None:
750
revision = [None]
751
elif len(revision) > 1:
752
raise BzrCommandError(
753
'bzr checkout --revision takes exactly 1 revision value')
1163
def run(self, branch_location=None, to_location=None, revision=None,
1164
lightweight=False, files_from=None, hardlink=False):
754
1165
if branch_location is None:
755
1166
branch_location = osutils.getcwd()
756
1167
to_location = branch_location
757
source = Branch.open(branch_location)
758
if len(revision) == 1 and revision[0] is not None:
759
revision_id = revision[0].in_history(source)[1]
1168
accelerator_tree, source = bzrdir.BzrDir.open_tree_or_branch(
1169
branch_location)
1170
revision = _get_one_revision('checkout', revision)
1171
if files_from is not None:
1172
accelerator_tree = WorkingTree.open(files_from)
1173
if revision is not None:
1174
revision_id = revision.as_revision_id(source)
760
1175
else:
761
1176
revision_id = None
762
1177
if to_location is None:
763
to_location = os.path.basename(branch_location.rstrip("/\\"))
764
# if the source and to_location are the same,
1178
to_location = urlutils.derive_to_location(branch_location)
1179
# if the source and to_location are the same,
765
1180
# and there is no working tree,
766
1181
# then reconstitute a branch
767
1182
if (osutils.abspath(to_location) ==
769
1184
try:
770
1185
source.bzrdir.open_workingtree()
771
1186
except errors.NoWorkingTree:
772
source.bzrdir.create_workingtree()
1187
source.bzrdir.create_workingtree(revision_id)
773
1188
return
774
try:
775
os.mkdir(to_location)
776
except OSError, e:
777
if e.errno == errno.EEXIST:
778
raise BzrCommandError('Target directory "%s" already'
779
' exists.' % to_location)
780
if e.errno == errno.ENOENT:
781
raise BzrCommandError('Parent of "%s" does not exist.' %
782
to_location)
783
else:
784
raise
785
old_format = bzrdir.BzrDirFormat.get_default_format()
786
bzrdir.BzrDirFormat.set_default_format(bzrdir.BzrDirMetaFormat1())
787
try:
788
source.create_checkout(to_location, revision_id, lightweight)
789
finally:
790
bzrdir.BzrDirFormat.set_default_format(old_format)
1189
source.create_checkout(to_location, revision_id, lightweight,
1190
accelerator_tree, hardlink)
791
1191
792
1192
793
1193
class cmd_renames(Command):
796
1196
# TODO: Option to show renames between two historical versions.
797
1197
798
1198
# TODO: Only show renames under dir, rather than in the whole branch.
1199
_see_also = ['status']
799
1200
takes_args = ['dir?']
800
1201
801
1202
@display_command
802
1203
def run(self, dir=u'.'):
803
from bzrlib.tree import find_renames
804
1204
tree = WorkingTree.open_containing(dir)[0]
805
old_inv = tree.basis_tree().inventory
806
new_inv = tree.read_working_inventory()
807
renames = list(find_renames(old_inv, new_inv))
808
renames.sort()
809
for old_name, new_name in renames:
810
self.outf.write("%s => %s\n" % (old_name, new_name))
1205
tree.lock_read()
1206
try:
1207
new_inv = tree.inventory
1208
old_tree = tree.basis_tree()
1209
old_tree.lock_read()
1210
try:
1211
old_inv = old_tree.inventory
1212
renames = []
1213
iterator = tree.iter_changes(old_tree, include_unchanged=True)
1214
for f, paths, c, v, p, n, k, e in iterator:
1215
if paths[0] == paths[1]:
1216
continue
1217
if None in (paths):
1218
continue
1219
renames.append(paths)
1220
renames.sort()
1221
for old_name, new_name in renames:
1222
self.outf.write("%s => %s\n" % (old_name, new_name))
1223
finally:
1224
old_tree.unlock()
1225
finally:
1226
tree.unlock()
811
1227
812
1228
813
1229
class cmd_update(Command):
814
1230
"""Update a tree to have the latest code committed to its branch.
815
1231
816
1232
This will perform a merge into the working tree, and may generate
817
conflicts. If you have any local changes, you will still
1233
conflicts. If you have any local changes, you will still
818
1234
need to commit them after the update for the update to be complete.
819
820
If you want to discard your local changes, you can just do a
1235
1236
If you want to discard your local changes, you can just do a
821
1237
'bzr revert' instead of 'bzr commit' after the update.
822
1238
"""
1239
1240
_see_also = ['pull', 'working-trees', 'status-flags']
823
1241
takes_args = ['dir?']
824
1242
aliases = ['up']
825
1243
826
1244
def run(self, dir='.'):
827
1245
tree = WorkingTree.open_containing(dir)[0]
828
tree.lock_write()
1246
possible_transports = []
1247
master = tree.branch.get_master_branch(
1248
possible_transports=possible_transports)
1249
if master is not None:
1250
tree.lock_write()
1251
else:
1252
tree.lock_tree_write()
829
1253
try:
830
existing_pending_merges = tree.pending_merges()
831
last_rev = tree.last_revision()
832
if last_rev == tree.branch.last_revision():
1254
existing_pending_merges = tree.get_parent_ids()[1:]
1255
last_rev = _mod_revision.ensure_null(tree.last_revision())
1256
if last_rev == _mod_revision.ensure_null(
1257
tree.branch.last_revision()):
833
1258
# may be up to date, check master too.
834
master = tree.branch.get_master_branch()
835
if master is None or last_rev == master.last_revision():
1259
if master is None or last_rev == _mod_revision.ensure_null(
1260
master.last_revision()):
836
1261
revno = tree.branch.revision_id_to_revno(last_rev)
837
1262
note("Tree is up to date at revision %d." % (revno,))
838
1263
return 0
839
conflicts = tree.update()
840
revno = tree.branch.revision_id_to_revno(tree.last_revision())
1264
view_info = _get_view_info_for_change_reporter(tree)
1265
conflicts = tree.update(
1266
delta._ChangeReporter(unversioned_filter=tree.is_ignored,
1267
view_info=view_info), possible_transports=possible_transports)
1268
revno = tree.branch.revision_id_to_revno(
1269
_mod_revision.ensure_null(tree.last_revision()))
841
1270
note('Updated to revision %d.' % (revno,))
842
if tree.pending_merges() != existing_pending_merges:
1271
if tree.get_parent_ids()[1:] != existing_pending_merges:
843
1272
note('Your local commits will now show as pending merges with '
844
1273
"'bzr status', and can be committed with 'bzr commit'.")
845
1274
if conflicts != 0:
854
1283
"""Show information about a working tree, branch or repository.
855
1284
856
1285
This command will show all known locations and formats associated to the
857
tree, branch or repository. Statistical information is included with
858
each report.
1286
tree, branch or repository.
1287
1288
In verbose mode, statistical information is included with each report.
1289
To see extended statistic information, use a verbosity level of 2 or
1290
higher by specifying the verbose option multiple times, e.g. -vv.
859
1291
860
1292
Branches and working trees will also report any missing revisions.
1293
1294
:Examples:
1295
1296
Display information on the format and related locations:
1297
1298
bzr info
1299
1300
Display the above together with extended format information and
1301
basic statistics (like the number of files in the working tree and
1302
number of revisions in the branch and repository):
1303
1304
bzr -v info
1305
1306
Display the above together with number of committers to the branch:
1307
1308
bzr -vv info
861
1309
"""
1310
_see_also = ['revno', 'working-trees', 'repositories']
862
1311
takes_args = ['location?']
863
1312
takes_options = ['verbose']
1313
encoding_type = 'replace'
864
1314
865
1315
@display_command
866
1316
def run(self, location=None, verbose=False):
1317
if verbose:
1318
noise_level = get_verbosity_level()
1319
else:
1320
noise_level = 0
867
1321
from bzrlib.info import show_bzrdir_info
868
1322
show_bzrdir_info(bzrdir.BzrDir.open_containing(location)[0],
869
verbose=verbose)
1323
verbose=noise_level, outfile=self.outf)
870
1324
871
1325
872
1326
class cmd_remove(Command):
873
"""Make a file unversioned.
874
875
This makes bzr stop tracking changes to a versioned file. It does
876
not delete the working copy.
877
878
You can specify one or more files, and/or --new. If you specify --new,
879
only 'added' files will be removed. If you specify both, then new files
880
in the specified directories will be removed. If the directories are
881
also new, they will also be removed.
1327
"""Remove files or directories.
1328
1329
This makes bzr stop tracking changes to the specified files. bzr will delete
1330
them if they can easily be recovered using revert. If no options or
1331
parameters are given bzr will scan for files that are being tracked by bzr
1332
but missing in your tree and stop tracking them for you.
882
1333
"""
883
1334
takes_args = ['file*']
884
takes_options = ['verbose', Option('new', help='remove newly-added files')]
885
aliases = ['rm']
1335
takes_options = ['verbose',
1336
Option('new', help='Only remove files that have never been committed.'),
1337
RegistryOption.from_kwargs('file-deletion-strategy',
1338
'The file deletion mode to be used.',
1339
title='Deletion Strategy', value_switches=True, enum_switch=False,
1340
safe='Only delete files if they can be'
1341
' safely recovered (default).',
1342
keep="Don't delete any files.",
1343
force='Delete all the specified files, even if they can not be '
1344
'recovered and even if they are non-empty directories.')]
1345
aliases = ['rm', 'del']
886
1346
encoding_type = 'replace'
887
888
def run(self, file_list, verbose=False, new=False):
1347
1348
def run(self, file_list, verbose=False, new=False,
1349
file_deletion_strategy='safe'):
889
1350
tree, file_list = tree_files(file_list)
890
if new is False:
891
if file_list is None:
892
raise BzrCommandError('Specify one or more files to remove, or'
893
' use --new.')
894
else:
895
added = tree.changes_from(tree.basis_tree(),
896
specific_files=file_list).added
897
file_list = sorted([f[0] for f in added], reverse=True)
898
if len(file_list) == 0:
899
raise BzrCommandError('No matching files.')
900
tree.remove(file_list, verbose=verbose, to_file=self.outf)
1351
1352
if file_list is not None:
1353
file_list = [f for f in file_list]
1354
1355
tree.lock_write()
1356
try:
1357
# Heuristics should probably all move into tree.remove_smart or
1358
# some such?
1359
if new:
1360
added = tree.changes_from(tree.basis_tree(),
1361
specific_files=file_list).added
1362
file_list = sorted([f[0] for f in added], reverse=True)
1363
if len(file_list) == 0:
1364
raise errors.BzrCommandError('No matching files.')
1365
elif file_list is None:
1366
# missing files show up in iter_changes(basis) as
1367
# versioned-with-no-kind.
1368
missing = []
1369
for change in tree.iter_changes(tree.basis_tree()):
1370
# Find paths in the working tree that have no kind:
1371
if change[1][1] is not None and change[6][1] is None:
1372
missing.append(change[1][1])
1373
file_list = sorted(missing, reverse=True)
1374
file_deletion_strategy = 'keep'
1375
tree.remove(file_list, verbose=verbose, to_file=self.outf,
1376
keep_files=file_deletion_strategy=='keep',
1377
force=file_deletion_strategy=='force')
1378
finally:
1379
tree.unlock()
901
1380
902
1381
903
1382
class cmd_file_id(Command):
909
1388
"""
910
1389
911
1390
hidden = True
1391
_see_also = ['inventory', 'ls']
912
1392
takes_args = ['filename']
913
1393
914
1394
@display_command
915
1395
def run(self, filename):
916
1396
tree, relpath = WorkingTree.open_containing(filename)
917
i = tree.inventory.path2id(relpath)
1397
i = tree.path2id(relpath)
918
1398
if i is None:
919
raise BzrError("%r is not a versioned file" % filename)
1399
raise errors.NotVersionedError(filename)
920
1400
else:
921
1401
self.outf.write(i + '\n')
922
1402
934
1414
@display_command
935
1415
def run(self, filename):
936
1416
tree, relpath = WorkingTree.open_containing(filename)
937
inv = tree.inventory
938
fid = inv.path2id(relpath)
1417
fid = tree.path2id(relpath)
939
1418
if fid is None:
940
raise BzrError("%r is not a versioned file" % filename)
941
for fip in inv.get_idpath(fid):
942
self.outf.write(fip + '\n')
1419
raise errors.NotVersionedError(filename)
1420
segments = osutils.splitpath(relpath)
1421
for pos in range(1, len(segments) + 1):
1422
path = osutils.joinpath(segments[:pos])
1423
self.outf.write("%s\n" % tree.path2id(path))
943
1424
944
1425
945
1426
class cmd_reconcile(Command):
947
1428
948
1429
This can correct data mismatches that may have been caused by
949
1430
previous ghost operations or bzr upgrades. You should only
950
need to run this command if 'bzr check' or a bzr developer
1431
need to run this command if 'bzr check' or a bzr developer
951
1432
advises you to run it.
952
1433
953
1434
If a second branch is provided, cross-branch reconciliation is
955
1436
id which was not present in very early bzr versions is represented
956
1437
correctly in both branches.
957
1438
958
At the same time it is run it may recompress data resulting in
1439
At the same time it is run it may recompress data resulting in
959
1440
a potential saving in disk space or performance gain.
960
1441
961
1442
The branch *MUST* be on a listable system such as local disk or sftp.
962
1443
"""
1444
1445
_see_also = ['check']
963
1446
takes_args = ['branch?']
964
1447
965
1448
def run(self, branch="."):
970
1453
971
1454
class cmd_revision_history(Command):
972
1455
"""Display the list of revision ids on a branch."""
1456
1457
_see_also = ['log']
973
1458
takes_args = ['location?']
974
1459
975
1460
hidden = True
984
1469
985
1470
class cmd_ancestry(Command):
986
1471
"""List all revisions merged into this branch."""
1472
1473
_see_also = ['log', 'revision-history']
987
1474
takes_args = ['location?']
988
1475
989
1476
hidden = True
1000
1487
last_revision = wt.last_revision()
1001
1488
1002
1489
revision_ids = b.repository.get_ancestry(last_revision)
1003
assert revision_ids[0] is None
1004
1490
revision_ids.pop(0)
1005
1491
for revision_id in revision_ids:
1006
1492
self.outf.write(revision_id + '\n')
1012
1498
Use this to create an empty branch, or before importing an
1013
1499
existing project.
1014
1500
1015
If there is a repository in a parent directory of the location, then
1501
If there is a repository in a parent directory of the location, then
1016
1502
the history of the branch will be stored in the repository. Otherwise
1017
init creates a standalone branch which carries its own history in
1018
.bzr.
1503
init creates a standalone branch which carries its own history
1504
in the .bzr directory.
1019
1505
1020
1506
If there is already a branch at the location but it has no working tree,
1021
1507
the tree can be populated with 'bzr checkout'.
1022
1508
1023
Recipe for importing a tree of files:
1509
Recipe for importing a tree of files::
1510
1024
1511
cd ~/project
1025
1512
bzr init
1026
1513
bzr add .
1027
1514
bzr status
1028
bzr commit -m 'imported project'
1515
bzr commit -m "imported project"
1029
1516
"""
1517
1518
_see_also = ['init-repository', 'branch', 'checkout']
1030
1519
takes_args = ['location?']
1031
1520
takes_options = [
1032
Option('format',
1033
help='Specify a format for this branch. Current'
1034
' formats are: default, knit, metaweave and'
1035
' weave. Default is knit; metaweave and'
1036
' weave are deprecated',
1037
type=get_format_type),
1038
]
1039
def run(self, location=None, format=None):
1521
Option('create-prefix',
1522
help='Create the path leading up to the branch '
1523
'if it does not already exist.'),
1524
RegistryOption('format',
1525
help='Specify a format for this branch. '
1526
'See "help formats".',
1527
lazy_registry=('bzrlib.bzrdir', 'format_registry'),
1528
converter=lambda name: bzrdir.format_registry.make_bzrdir(name),
1529
value_switches=True,
1530
title="Branch Format",
1531
),
1532
Option('append-revisions-only',
1533
help='Never change revnos or the existing log.'
1534
' Append revisions to it only.')
1535
]
1536
def run(self, location=None, format=None, append_revisions_only=False,
1537
create_prefix=False):
1040
1538
if format is None:
1041
format = get_format_type('default')
1539
format = bzrdir.format_registry.make_bzrdir('default')
1042
1540
if location is None:
1043
1541
location = u'.'
1044
1542
1049
1547
# Just using os.mkdir, since I don't
1050
1548
# believe that we want to create a bunch of
1051
1549
# locations if the user supplies an extended path
1052
# TODO: create-prefix
1053
try:
1054
to_transport.mkdir('.')
1055
except errors.FileExists:
1056
pass
1057
1058
try:
1059
existing_bzrdir = bzrdir.BzrDir.open(location)
1060
except NotBranchError:
1550
try:
1551
to_transport.ensure_base()
1552
except errors.NoSuchFile:
1553
if not create_prefix:
1554
raise errors.BzrCommandError("Parent directory of %s"
1555
" does not exist."
1556
"\nYou may supply --create-prefix to create all"
1557
" leading parent directories."
1558
% location)
1559
_create_prefix(to_transport)
1560
1561
try:
1562
a_bzrdir = bzrdir.BzrDir.open_from_transport(to_transport)
1563
except errors.NotBranchError:
1061
1564
# really a NotBzrDir error...
1062
bzrdir.BzrDir.create_branch_convenience(location, format=format)
1565
create_branch = bzrdir.BzrDir.create_branch_convenience
1566
branch = create_branch(to_transport.base, format=format,
1567
possible_transports=[to_transport])
1568
a_bzrdir = branch.bzrdir
1063
1569
else:
1064
if existing_bzrdir.has_branch():
1570
from bzrlib.transport.local import LocalTransport
1571
if a_bzrdir.has_branch():
1065
1572
if (isinstance(to_transport, LocalTransport)
1066
and not existing_bzrdir.has_workingtree()):
1573
and not a_bzrdir.has_workingtree()):
1067
1574
raise errors.BranchExistsWithoutWorkingTree(location)
1068
1575
raise errors.AlreadyBranchError(location)
1069
else:
1070
existing_bzrdir.create_branch()
1071
existing_bzrdir.create_workingtree()
1576
branch = a_bzrdir.create_branch()
1577
a_bzrdir.create_workingtree()
1578
if append_revisions_only:
1579
try:
1580
branch.set_append_revisions_only(True)
1581
except errors.UpgradeRequired:
1582
raise errors.BzrCommandError('This branch format cannot be set'
1583
' to append-revisions-only. Try --experimental-branch6')
1584
if not is_quiet():
1585
from bzrlib.info import describe_layout, describe_format
1586
try:
1587
tree = a_bzrdir.open_workingtree(recommend_upgrade=False)
1588
except (errors.NoWorkingTree, errors.NotLocalUrl):
1589
tree = None
1590
repository = branch.repository
1591
layout = describe_layout(repository, branch, tree).lower()
1592
format = describe_format(a_bzrdir, repository, branch, tree)
1593
self.outf.write("Created a %s (format: %s)\n" % (layout, format))
1594
if repository.is_shared():
1595
#XXX: maybe this can be refactored into transport.path_or_url()
1596
url = repository.bzrdir.root_transport.external_url()
1597
try:
1598
url = urlutils.local_path_from_url(url)
1599
except errors.InvalidURL:
1600
pass
1601
self.outf.write("Using shared repository: %s\n" % url)
1072
1602
1073
1603
1074
1604
class cmd_init_repository(Command):
1075
1605
"""Create a shared repository to hold branches.
1076
1606
1077
New branches created under the repository directory will store their revisions
1078
in the repository, not in the branch directory, if the branch format supports
1079
shared storage.
1080
1081
example:
1082
bzr init-repo repo
1083
bzr init repo/trunk
1084
bzr checkout --lightweight repo/trunk trunk-checkout
1085
cd trunk-checkout
1086
(add files here)
1607
New branches created under the repository directory will store their
1608
revisions in the repository, not in the branch directory.
1609
1610
If the --no-trees option is used then the branches in the repository
1611
will not have working trees by default.
1612
1613
:Examples:
1614
Create a shared repositories holding just branches::
1615
1616
bzr init-repo --no-trees repo
1617
bzr init repo/trunk
1618
1619
Make a lightweight checkout elsewhere::
1620
1621
bzr checkout --lightweight repo/trunk trunk-checkout
1622
cd trunk-checkout
1623
(add files here)
1087
1624
"""
1088
takes_args = ["location"]
1089
takes_options = [Option('format',
1090
help='Specify a format for this repository.'
1091
' Current formats are: default, knit,'
1092
' metaweave and weave. Default is knit;'
1093
' metaweave and weave are deprecated',
1094
type=get_format_type),
1095
Option('trees',
1096
help='Allows branches in repository to have'
1097
' a working tree')]
1625
1626
_see_also = ['init', 'branch', 'checkout', 'repositories']
1627
takes_args = ["location"]
1628
takes_options = [RegistryOption('format',
1629
help='Specify a format for this repository. See'
1630
' "bzr help formats" for details.',
1631
lazy_registry=('bzrlib.bzrdir', 'format_registry'),
1632
converter=lambda name: bzrdir.format_registry.make_bzrdir(name),
1633
value_switches=True, title='Repository format'),
1634
Option('no-trees',
1635
help='Branches in the repository will default to'
1636
' not having a working tree.'),
1637
]
1098
1638
aliases = ["init-repo"]
1099
def run(self, location, format=None, trees=False):
1639
1640
def run(self, location, format=None, no_trees=False):
1100
1641
if format is None:
1101
format = get_format_type('default')
1642
format = bzrdir.format_registry.make_bzrdir('default')
1102
1643
1103
1644
if location is None:
1104
1645
location = '.'
1105
1646
1106
1647
to_transport = transport.get_transport(location)
1107
try:
1108
to_transport.mkdir('.')
1109
except errors.FileExists:
1110
pass
1648
to_transport.ensure_base()
1111
1649
1112
1650
newdir = format.initialize_on_transport(to_transport)
1113
1651
repo = newdir.create_repository(shared=True)
1114
repo.set_make_working_trees(trees)
1652
repo.set_make_working_trees(not no_trees)
1653
if not is_quiet():
1654
from bzrlib.info import show_bzrdir_info
1655
show_bzrdir_info(repo.bzrdir, verbose=0, outfile=self.outf)
1115
1656
1116
1657
1117
1658
class cmd_diff(Command):
1118
"""Show differences in the working tree or between revisions.
1119
1120
If files are listed, only the changes in those files are listed.
1121
Otherwise, all changes for the tree are listed.
1659
"""Show differences in the working tree, between revisions or branches.
1660
1661
If no arguments are given, all changes for the current tree are listed.
1662
If files are given, only the changes in those files are listed.
1663
Remote and multiple branches can be compared by using the --old and
1664
--new options. If not provided, the default for both is derived from
1665
the first argument, if any, or the current tree if no arguments are
1666
given.
1122
1667
1123
1668
"bzr diff -p1" is equivalent to "bzr diff --prefix old/:new/", and
1124
1669
produces patches suitable for "patch -p1".
1125
1670
1126
examples:
1127
bzr diff
1128
Shows the difference in the working tree versus the last commit
1129
bzr diff -r1
1130
Difference between the working tree and revision 1
1131
bzr diff -r1..2
1132
Difference between revision 2 and revision 1
1133
bzr diff --diff-prefix old/:new/
1134
Same as 'bzr diff' but prefix paths with old/ and new/
1135
bzr diff bzr.mine bzr.dev
1136
Show the differences between the two working trees
1137
bzr diff foo.c
1138
Show just the differences for 'foo.c'
1671
:Exit values:
1672
1 - changed
1673
2 - unrepresentable changes
1674
3 - error
1675
0 - no change
1676
1677
:Examples:
1678
Shows the difference in the working tree versus the last commit::
1679
1680
bzr diff
1681
1682
Difference between the working tree and revision 1::
1683
1684
bzr diff -r1
1685
1686
Difference between revision 2 and revision 1::
1687
1688
bzr diff -r1..2
1689
1690
Difference between revision 2 and revision 1 for branch xxx::
1691
1692
bzr diff -r1..2 xxx
1693
1694
Show just the differences for file NEWS::
1695
1696
bzr diff NEWS
1697
1698
Show the differences in working tree xxx for file NEWS::
1699
1700
bzr diff xxx/NEWS
1701
1702
Show the differences from branch xxx to this working tree:
1703
1704
bzr diff --old xxx
1705
1706
Show the differences between two branches for file NEWS::
1707
1708
bzr diff --old xxx --new yyy NEWS
1709
1710
Same as 'bzr diff' but prefix paths with old/ and new/::
1711
1712
bzr diff --prefix old/:new/
1139
1713
"""
1140
# TODO: Option to use external diff command; could be GNU diff, wdiff,
1141
# or a graphical diff.
1142
1143
# TODO: Python difflib is not exactly the same as unidiff; should
1144
# either fix it up or prefer to use an external diff.
1145
1146
# TODO: Selected-file diff is inefficient and doesn't show you
1147
# deleted files.
1148
1149
# TODO: This probably handles non-Unix newlines poorly.
1150
1714
_see_also = ['status']
1151
1715
takes_args = ['file*']
1152
takes_options = ['revision', 'diff-options', 'prefix']
1716
takes_options = [
1717
Option('diff-options', type=str,
1718
help='Pass these options to the external diff program.'),
1719
Option('prefix', type=str,
1720
short_name='p',
1721
help='Set prefixes added to old and new filenames, as '
1722
'two values separated by a colon. (eg "old/:new/").'),
1723
Option('old',
1724
help='Branch/tree to compare from.',
1725
type=unicode,
1726
),
1727
Option('new',
1728
help='Branch/tree to compare to.',
1729
type=unicode,
1730
),
1731
'revision',
1732
'change',
1733
Option('using',
1734
help='Use this command to compare files.',
1735
type=unicode,
1736
),
1737
]
1153
1738
aliases = ['di', 'dif']
1154
1739
encoding_type = 'exact'
1155
1740
1156
1741
@display_command
1157
1742
def run(self, revision=None, file_list=None, diff_options=None,
1158
prefix=None):
1159
from bzrlib.diff import diff_cmd_helper, show_diff_trees
1743
prefix=None, old=None, new=None, using=None):
1744
from bzrlib.diff import _get_trees_to_diff, show_diff_trees
1160
1745
1161
1746
if (prefix is None) or (prefix == '0'):
1162
1747
# diff -p0 format
1165
1750
elif prefix == '1':
1166
1751
old_label = 'old/'
1167
1752
new_label = 'new/'
1168
else:
1169
if not ':' in prefix:
1170
raise BzrError("--diff-prefix expects two values separated by a colon")
1753
elif ':' in prefix:
1171
1754
old_label, new_label = prefix.split(":")
1172
1173
try:
1174
tree1, file_list = internal_tree_files(file_list)
1175
tree2 = None
1176
b = None
1177
b2 = None
1178
except FileInWrongBranch:
1179
if len(file_list) != 2:
1180
raise BzrCommandError("Files are in different branches")
1181
1182
tree1, file1 = WorkingTree.open_containing(file_list[0])
1183
tree2, file2 = WorkingTree.open_containing(file_list[1])
1184
if file1 != "" or file2 != "":
1185
# FIXME diff those two files. rbc 20051123
1186
raise BzrCommandError("Files are in different branches")
1187
file_list = None
1188
except NotBranchError:
1189
if (revision is not None and len(revision) == 2
1190
and not revision[0].needs_branch()
1191
and not revision[1].needs_branch()):
1192
# If both revision specs include a branch, we can
1193
# diff them without needing a local working tree
1194
tree1, tree2 = None, None
1195
else:
1196
raise
1197
if revision is not None:
1198
if tree2 is not None:
1199
raise BzrCommandError("Can't specify -r with two branches")
1200
if (len(revision) == 1) or (revision[1].spec is None):
1201
return diff_cmd_helper(tree1, file_list, diff_options,
1202
revision[0],
1203
old_label=old_label, new_label=new_label)
1204
elif len(revision) == 2:
1205
return diff_cmd_helper(tree1, file_list, diff_options,
1206
revision[0], revision[1],
1207
old_label=old_label, new_label=new_label)
1208
else:
1209
raise BzrCommandError('bzr diff --revision takes exactly one or two revision identifiers')
1210
1755
else:
1211
if tree2 is not None:
1212
return show_diff_trees(tree1, tree2, sys.stdout,
1213
specific_files=file_list,
1214
external_diff_options=diff_options,
1215
old_label=old_label, new_label=new_label)
1216
else:
1217
return diff_cmd_helper(tree1, file_list, diff_options,
1218
old_label=old_label, new_label=new_label)
1756
raise errors.BzrCommandError(
1757
'--prefix expects two values separated by a colon'
1758
' (eg "old/:new/")')
1759
1760
if revision and len(revision) > 2:
1761
raise errors.BzrCommandError('bzr diff --revision takes exactly'
1762
' one or two revision specifiers')
1763
1764
old_tree, new_tree, specific_files, extra_trees = \
1765
_get_trees_to_diff(file_list, revision, old, new,
1766
apply_view=True)
1767
return show_diff_trees(old_tree, new_tree, sys.stdout,
1768
specific_files=specific_files,
1769
external_diff_options=diff_options,
1770
old_label=old_label, new_label=new_label,
1771
extra_trees=extra_trees, using=using)
1219
1772
1220
1773
1221
1774
class cmd_deleted(Command):
1227
1780
# directories with readdir, rather than stating each one. Same
1228
1781
# level of effort but possibly much less IO. (Or possibly not,
1229
1782
# if the directories are very large...)
1783
_see_also = ['status', 'ls']
1230
1784
takes_options = ['show-ids']
1231
1785
1232
1786
@display_command
1233
1787
def run(self, show_ids=False):
1234
1788
tree = WorkingTree.open_containing(u'.')[0]
1235
old = tree.basis_tree()
1236
for path, ie in old.inventory.iter_entries():
1237
if not tree.has_id(ie.file_id):
1238
self.outf.write(path)
1239
if show_ids:
1240
self.outf.write(' ')
1241
self.outf.write(ie.file_id)
1242
self.outf.write('\n')
1789
tree.lock_read()
1790
try:
1791
old = tree.basis_tree()
1792
old.lock_read()
1793
try:
1794
for path, ie in old.inventory.iter_entries():
1795
if not tree.has_id(ie.file_id):
1796
self.outf.write(path)
1797
if show_ids:
1798
self.outf.write(' ')
1799
self.outf.write(ie.file_id)
1800
self.outf.write('\n')
1801
finally:
1802
old.unlock()
1803
finally:
1804
tree.unlock()
1243
1805
1244
1806
1245
1807
class cmd_modified(Command):
1246
"""List files modified in working tree."""
1808
"""List files modified in working tree.
1809
"""
1810
1247
1811
hidden = True
1812
_see_also = ['status', 'ls']
1813
takes_options = [
1814
Option('null',
1815
help='Write an ascii NUL (\\0) separator '
1816
'between files rather than a newline.')
1817
]
1818
1248
1819
@display_command
1249
def run(self):
1820
def run(self, null=False):
1250
1821
tree = WorkingTree.open_containing(u'.')[0]
1251
1822
td = tree.changes_from(tree.basis_tree())
1252
1823
for path, id, kind, text_modified, meta_modified in td.modified:
1253
self.outf.write(path + '\n')
1824
if null:
1825
self.outf.write(path + '\0')
1826
else:
1827
self.outf.write(osutils.quotefn(path) + '\n')
1254
1828
1255
1829
1256
1830
class cmd_added(Command):
1257
"""List files added in working tree."""
1831
"""List files added in working tree.
1832
"""
1833
1258
1834
hidden = True
1835
_see_also = ['status', 'ls']
1836
takes_options = [
1837
Option('null',
1838
help='Write an ascii NUL (\\0) separator '
1839
'between files rather than a newline.')
1840
]
1841
1259
1842
@display_command
1260
def run(self):
1843
def run(self, null=False):
1261
1844
wt = WorkingTree.open_containing(u'.')[0]
1262
basis_inv = wt.basis_tree().inventory
1263
inv = wt.inventory
1264
for file_id in inv:
1265
if file_id in basis_inv:
1266
continue
1267
path = inv.id2path(file_id)
1268
if not os.access(osutils.abspath(path), os.F_OK):
1269
continue
1270
self.outf.write(path + '\n')
1845
wt.lock_read()
1846
try:
1847
basis = wt.basis_tree()
1848
basis.lock_read()
1849
try:
1850
basis_inv = basis.inventory
1851
inv = wt.inventory
1852
for file_id in inv:
1853
if file_id in basis_inv:
1854
continue
1855
if inv.is_root(file_id) and len(basis_inv) == 0:
1856
continue
1857
path = inv.id2path(file_id)
1858
if not os.access(osutils.abspath(path), os.F_OK):
1859
continue
1860
if null:
1861
self.outf.write(path + '\0')
1862
else:
1863
self.outf.write(osutils.quotefn(path) + '\n')
1864
finally:
1865
basis.unlock()
1866
finally:
1867
wt.unlock()
1271
1868
1272
1869
1273
1870
class cmd_root(Command):
1275
1872
1276
1873
The root is the nearest enclosing directory with a .bzr control
1277
1874
directory."""
1875
1278
1876
takes_args = ['filename?']
1279
1877
@display_command
1280
1878
def run(self, filename=None):
1283
1881
self.outf.write(tree.basedir + '\n')
1284
1882
1285
1883
1884
def _parse_limit(limitstring):
1885
try:
1886
return int(limitstring)
1887
except ValueError:
1888
msg = "The limit argument must be an integer."
1889
raise errors.BzrCommandError(msg)
1890
1891
1892
def _parse_levels(s):
1893
try:
1894
return int(s)
1895
except ValueError:
1896
msg = "The levels argument must be an integer."
1897
raise errors.BzrCommandError(msg)
1898
1899
1286
1900
class cmd_log(Command):
1287
"""Show log of a branch, file, or directory.
1288
1289
By default show the log of the branch containing the working directory.
1290
1291
To request a range of logs, you can use the command -r begin..end
1292
-r revision requests a specific revision, -r ..end or -r begin.. are
1293
also valid.
1294
1295
examples:
1296
bzr log
1297
bzr log foo.c
1298
bzr log -r -10.. http://server/branch
1901
"""Show historical log for a branch or subset of a branch.
1902
1903
log is bzr's default tool for exploring the history of a branch.
1904
The branch to use is taken from the first parameter. If no parameters
1905
are given, the branch containing the working directory is logged.
1906
Here are some simple examples::
1907
1908
bzr log log the current branch
1909
bzr log foo.py log a file in its branch
1910
bzr log http://server/branch log a branch on a server
1911
1912
The filtering, ordering and information shown for each revision can
1913
be controlled as explained below. By default, all revisions are
1914
shown sorted (topologically) so that newer revisions appear before
1915
older ones and descendants always appear before ancestors. If displayed,
1916
merged revisions are shown indented under the revision in which they
1917
were merged.
1918
1919
:Output control:
1920
1921
The log format controls how information about each revision is
1922
displayed. The standard log formats are called ``long``, ``short``
1923
and ``line``. The default is long. See ``bzr help log-formats``
1924
for more details on log formats.
1925
1926
The following options can be used to control what information is
1927
displayed::
1928
1929
-l N display a maximum of N revisions
1930
-n N display N levels of revisions (0 for all, 1 for collapsed)
1931
-v display a status summary (delta) for each revision
1932
-p display a diff (patch) for each revision
1933
--show-ids display revision-ids (and file-ids), not just revnos
1934
1935
Note that the default number of levels to display is a function of the
1936
log format. If the -n option is not used, ``short`` and ``line`` show
1937
just the top level (mainline) while ``long`` shows all levels of merged
1938
revisions.
1939
1940
Status summaries are shown using status flags like A, M, etc. To see
1941
the changes explained using words like ``added`` and ``modified``
1942
instead, use the -vv option.
1943
1944
:Ordering control:
1945
1946
To display revisions from oldest to newest, use the --forward option.
1947
In most cases, using this option will have little impact on the total
1948
time taken to produce a log, though --forward does not incrementally
1949
display revisions like --reverse does when it can.
1950
1951
:Revision filtering:
1952
1953
The -r option can be used to specify what revision or range of revisions
1954
to filter against. The various forms are shown below::
1955
1956
-rX display revision X
1957
-rX.. display revision X and later
1958
-r..Y display up to and including revision Y
1959
-rX..Y display from X to Y inclusive
1960
1961
See ``bzr help revisionspec`` for details on how to specify X and Y.
1962
Some common examples are given below::
1963
1964
-r-1 show just the tip
1965
-r-10.. show the last 10 mainline revisions
1966
-rsubmit:.. show what's new on this branch
1967
-rancestor:path.. show changes since the common ancestor of this
1968
branch and the one at location path
1969
-rdate:yesterday.. show changes since yesterday
1970
1971
When logging a range of revisions using -rX..Y, log starts at
1972
revision Y and searches back in history through the primary
1973
("left-hand") parents until it finds X. When logging just the
1974
top level (using -n1), an error is reported if X is not found
1975
along the way. If multi-level logging is used (-n0), X may be
1976
a nested merge revision and the log will be truncated accordingly.
1977
1978
:Path filtering:
1979
1980
If a parameter is given and it's not a branch, the log will be filtered
1981
to show only those revisions that changed the nominated file or
1982
directory.
1983
1984
Filenames are interpreted within their historical context. To log a
1985
deleted file, specify a revision range so that the file existed at
1986
the end or start of the range.
1987
1988
Historical context is also important when interpreting pathnames of
1989
renamed files/directories. Consider the following example:
1990
1991
* revision 1: add tutorial.txt
1992
* revision 2: modify tutorial.txt
1993
* revision 3: rename tutorial.txt to guide.txt; add tutorial.txt
1994
1995
In this case:
1996
1997
* ``bzr log guide.txt`` will log the file added in revision 1
1998
1999
* ``bzr log tutorial.txt`` will log the new file added in revision 3
2000
2001
* ``bzr log -r2 -p tutorial.txt`` will show the changes made to
2002
the original file in revision 2.
2003
2004
* ``bzr log -r2 -p guide.txt`` will display an error message as there
2005
was no file called guide.txt in revision 2.
2006
2007
Renames are always followed by log. By design, there is no need to
2008
explicitly ask for this (and no way to stop logging a file back
2009
until it was last renamed).
2010
2011
Note: If the path is a directory, only revisions that directly changed
2012
that directory object are currently shown. This is considered a bug.
2013
(Support for filtering against multiple files and for files within a
2014
directory is under development.)
2015
2016
:Other filtering:
2017
2018
The --message option can be used for finding revisions that match a
2019
regular expression in a commit message.
2020
2021
:Tips & tricks:
2022
2023
GUI tools and IDEs are often better at exploring history than command
2024
line tools. You may prefer qlog or glog from the QBzr and Bzr-Gtk packages
2025
respectively for example. (TortoiseBzr uses qlog for displaying logs.) See
2026
http://bazaar-vcs.org/BzrPlugins and http://bazaar-vcs.org/IDEIntegration.
2027
2028
Web interfaces are often better at exploring history than command line
2029
tools, particularly for branches on servers. You may prefer Loggerhead
2030
or one of its alternatives. See http://bazaar-vcs.org/WebInterface.
2031
2032
You may find it useful to add the aliases below to ``bazaar.conf``::
2033
2034
[ALIASES]
2035
tip = log -r-1 -n1
2036
top = log -r-10.. --short --forward
2037
show = log -v -p -n1 --long
2038
2039
``bzr tip`` will then show the latest revision while ``bzr top``
2040
will show the last 10 mainline revisions. To see the details of a
2041
particular revision X, ``bzr show -rX``.
2042
2043
As many GUI tools and Web interfaces do, you may prefer viewing
2044
history collapsed initially. If you are interested in looking deeper
2045
into a particular merge X, use ``bzr log -n0 -rX``. If you like
2046
working this way, you may wish to either:
2047
2048
* change your default log format to short (or line)
2049
* add this alias: log = log -n1
2050
2051
``bzr log -v`` on a branch with lots of history is currently
2052
very slow. A fix for this issue is currently under development.
2053
With or without that fix, it is recommended that a revision range
2054
be given when using the -v option.
2055
2056
bzr has a generic full-text matching plugin, bzr-search, that can be
2057
used to find revisions matching user names, commit messages, etc.
2058
Among other features, this plugin can find all revisions containing
2059
a list of words but not others.
2060
2061
When exploring non-mainline history on large projects with deep
2062
history, the performance of log can be greatly improved by installing
2063
the revnocache plugin. This plugin buffers historical information
2064
trading disk space for faster speed.
1299
2065
"""
1300
1301
# TODO: Make --revision support uuid: and hash: [future tag:] notation.
1302
1303
2066
takes_args = ['location?']
1304
takes_options = [Option('forward',
1305
help='show from oldest to newest'),
1306
'timezone',
1307
Option('verbose',
1308
help='show files changed in each revision'),
1309
'show-ids', 'revision',
1310
'log-format',
1311
'line', 'long',
1312
Option('message',
1313
help='show revisions whose message matches this regexp',
1314
type=str),
1315
'short',
1316
]
2067
_see_also = ['log-formats', 'revisionspec']
2068
takes_options = [
2069
Option('forward',
2070
help='Show from oldest to newest.'),
2071
'timezone',
2072
custom_help('verbose',
2073
help='Show files changed in each revision.'),
2074
'show-ids',
2075
'revision',
2076
Option('change',
2077
type=bzrlib.option._parse_revision_str,
2078
short_name='c',
2079
help='Show just the specified revision.'
2080
' See also "help revisionspec".'),
2081
'log-format',
2082
Option('levels',
2083
short_name='n',
2084
help='Number of levels to display - 0 for all, 1 for flat.',
2085
argname='N',
2086
type=_parse_levels),
2087
Option('message',
2088
short_name='m',
2089
help='Show revisions whose message matches this '
2090
'regular expression.',
2091
type=str),
2092
Option('limit',
2093
short_name='l',
2094
help='Limit the output to the first N revisions.',
2095
argname='N',
2096
type=_parse_limit),
2097
Option('show-diff',
2098
short_name='p',
2099
help='Show changes made in each revision as a patch.'),
2100
]
1317
2101
encoding_type = 'replace'
1318
2102
1319
2103
@display_command
1322
2106
show_ids=False,
1323
2107
forward=False,
1324
2108
revision=None,
2109
change=None,
1325
2110
log_format=None,
2111
levels=None,
1326
2112
message=None,
1327
long=False,
1328
short=False,
1329
line=False):
1330
from bzrlib.log import log_formatter, show_log
1331
assert message is None or isinstance(message, basestring), \
1332
"invalid message argument %r" % message
2113
limit=None,
2114
show_diff=False):
2115
from bzrlib.log import show_log, _get_fileid_to_log
1333
2116
direction = (forward and 'forward') or 'reverse'
1334
2117
2118
if change is not None:
2119
if len(change) > 1:
2120
raise errors.RangeInChangeOption()
2121
if revision is not None:
2122
raise errors.BzrCommandError(
2123
'--revision and --change are mutually exclusive')
2124
else:
2125
revision = change
2126
1335
2127
# log everything
1336
2128
file_id = None
1337
2129
if location:
1338
2130
# find the file id to log:
1339
2131
1340
dir, fp = bzrdir.BzrDir.open_containing(location)
1341
b = dir.open_branch()
2132
tree, b, fp = bzrdir.BzrDir.open_containing_tree_or_branch(
2133
location)
1342
2134
if fp != '':
1343
try:
1344
# might be a tree:
1345
inv = dir.open_workingtree().inventory
1346
except (errors.NotBranchError, errors.NotLocalUrl):
1347
# either no tree, or is remote.
1348
inv = b.basis_tree().inventory
1349
file_id = inv.path2id(fp)
2135
file_id = _get_fileid_to_log(revision, tree, b, fp)
2136
if file_id is None:
2137
raise errors.BzrCommandError(
2138
"Path unknown at end or start of revision range: %s" %
2139
location)
1350
2140
else:
1351
2141
# local dir only
1352
# FIXME ? log the current subdir only RBC 20060203
2142
# FIXME ? log the current subdir only RBC 20060203
1353
2143
if revision is not None \
1354
2144
and len(revision) > 0 and revision[0].get_branch():
1355
2145
location = revision[0].get_branch()
1358
2148
dir, relpath = bzrdir.BzrDir.open_containing(location)
1359
2149
b = dir.open_branch()
1360
2150
1361
if revision is None:
1362
rev1 = None
1363
rev2 = None
1364
elif len(revision) == 1:
1365
rev1 = rev2 = revision[0].in_history(b).revno
1366
elif len(revision) == 2:
1367
if revision[1].get_branch() != revision[0].get_branch():
1368
# b is taken from revision[0].get_branch(), and
1369
# show_log will use its revision_history. Having
1370
# different branches will lead to weird behaviors.
1371
raise BzrCommandError(
1372
"Log doesn't accept two revisions in different branches.")
1373
if revision[0].spec is None:
1374
# missing begin-range means first revision
1375
rev1 = 1
1376
else:
1377
rev1 = revision[0].in_history(b).revno
1378
1379
if revision[1].spec is None:
1380
# missing end-range means last known revision
1381
rev2 = b.revno()
1382
else:
1383
rev2 = revision[1].in_history(b).revno
2151
b.lock_read()
2152
try:
2153
rev1, rev2 = _get_revision_range(revision, b, self.name())
2154
if log_format is None:
2155
log_format = log.log_formatter_registry.get_default(b)
2156
2157
lf = log_format(show_ids=show_ids, to_file=self.outf,
2158
show_timezone=timezone,
2159
delta_format=get_verbosity_level(),
2160
levels=levels)
2161
2162
show_log(b,
2163
lf,
2164
file_id,
2165
verbose=verbose,
2166
direction=direction,
2167
start_revision=rev1,
2168
end_revision=rev2,
2169
search=message,
2170
limit=limit,
2171
show_diff=show_diff)
2172
finally:
2173
b.unlock()
2174
2175
2176
def _get_revision_range(revisionspec_list, branch, command_name):
2177
"""Take the input of a revision option and turn it into a revision range.
2178
2179
It returns RevisionInfo objects which can be used to obtain the rev_id's
2180
of the desired revisons. It does some user input validations.
2181
"""
2182
if revisionspec_list is None:
2183
rev1 = None
2184
rev2 = None
2185
elif len(revisionspec_list) == 1:
2186
rev1 = rev2 = revisionspec_list[0].in_history(branch)
2187
elif len(revisionspec_list) == 2:
2188
start_spec = revisionspec_list[0]
2189
end_spec = revisionspec_list[1]
2190
if end_spec.get_branch() != start_spec.get_branch():
2191
# b is taken from revision[0].get_branch(), and
2192
# show_log will use its revision_history. Having
2193
# different branches will lead to weird behaviors.
2194
raise errors.BzrCommandError(
2195
"bzr %s doesn't accept two revisions in different"
2196
" branches." % command_name)
2197
rev1 = start_spec.in_history(branch)
2198
# Avoid loading all of history when we know a missing
2199
# end of range means the last revision ...
2200
if end_spec.spec is None:
2201
last_revno, last_revision_id = branch.last_revision_info()
2202
rev2 = RevisionInfo(branch, last_revno, last_revision_id)
1384
2203
else:
1385
raise BzrCommandError('bzr log --revision takes one or two values.')
1386
1387
# By this point, the revision numbers are converted to the +ve
1388
# form if they were supplied in the -ve form, so we can do
1389
# this comparison in relative safety
1390
if rev1 > rev2:
1391
(rev2, rev1) = (rev1, rev2)
1392
1393
if (log_format is None):
1394
default = b.get_config().log_format()
1395
log_format = get_log_format(long=long, short=short, line=line,
1396
default=default)
1397
lf = log_formatter(log_format,
1398
show_ids=show_ids,
1399
to_file=self.outf,
1400
show_timezone=timezone)
1401
1402
show_log(b,
1403
lf,
1404
file_id,
1405
verbose=verbose,
1406
direction=direction,
1407
start_revision=rev1,
1408
end_revision=rev2,
1409
search=message)
1410
2204
rev2 = end_spec.in_history(branch)
2205
else:
2206
raise errors.BzrCommandError(
2207
'bzr %s --revision takes one or two values.' % command_name)
2208
return rev1, rev2
2209
2210
2211
def _revision_range_to_revid_range(revision_range):
2212
rev_id1 = None
2213
rev_id2 = None
2214
if revision_range[0] is not None:
2215
rev_id1 = revision_range[0].rev_id
2216
if revision_range[1] is not None:
2217
rev_id2 = revision_range[1].rev_id
2218
return rev_id1, rev_id2
1411
2219
1412
2220
def get_log_format(long=False, short=False, line=False, default='long'):
1413
2221
log_format = default
1433
2241
def run(self, filename):
1434
2242
tree, relpath = WorkingTree.open_containing(filename)
1435
2243
b = tree.branch
1436
inv = tree.read_working_inventory()
1437
file_id = inv.path2id(relpath)
2244
file_id = tree.path2id(relpath)
1438
2245
for revno, revision_id, what in log.find_touching_revisions(b, file_id):
1439
2246
self.outf.write("%6d %s\n" % (revno, what))
1440
2247
1442
2249
class cmd_ls(Command):
1443
2250
"""List files in a tree.
1444
2251
"""
2252
2253
_see_also = ['status', 'cat']
2254
takes_args = ['path?']
1445
2255
# TODO: Take a revision or remote path and list that tree instead.
1446
hidden = True
1447
takes_options = ['verbose', 'revision',
1448
Option('non-recursive',
1449
help='don\'t recurse into sub-directories'),
1450
Option('from-root',
1451
help='Print all paths from the root of the branch.'),
1452
Option('unknown', help='Print unknown files'),
1453
Option('versioned', help='Print versioned files'),
1454
Option('ignored', help='Print ignored files'),
1455
1456
Option('null', help='Null separate the files'),
1457
]
2256
takes_options = [
2257
'verbose',
2258
'revision',
2259
Option('non-recursive',
2260
help='Don\'t recurse into subdirectories.'),
2261
Option('from-root',
2262
help='Print paths relative to the root of the branch.'),
2263
Option('unknown', help='Print unknown files.'),
2264
Option('versioned', help='Print versioned files.',
2265
short_name='V'),
2266
Option('ignored', help='Print ignored files.'),
2267
Option('null',
2268
help='Write an ascii NUL (\\0) separator '
2269
'between files rather than a newline.'),
2270
Option('kind',
2271
help='List entries of a particular kind: file, directory, symlink.',
2272
type=unicode),
2273
'show-ids',
2274
]
1458
2275
@display_command
1459
def run(self, revision=None, verbose=False,
2276
def run(self, revision=None, verbose=False,
1460
2277
non_recursive=False, from_root=False,
1461
2278
unknown=False, versioned=False, ignored=False,
1462
null=False):
2279
null=False, kind=None, show_ids=False, path=None):
2280
2281
if kind and kind not in ('file', 'directory', 'symlink'):
2282
raise errors.BzrCommandError('invalid kind specified')
1463
2283
1464
2284
if verbose and null:
1465
raise BzrCommandError('Cannot set both --verbose and --null')
2285
raise errors.BzrCommandError('Cannot set both --verbose and --null')
1466
2286
all = not (unknown or versioned or ignored)
1467
2287
1468
2288
selection = {'I':ignored, '?':unknown, 'V':versioned}
1469
2289
1470
tree, relpath = WorkingTree.open_containing(u'.')
2290
if path is None:
2291
fs_path = '.'
2292
prefix = ''
2293
else:
2294
if from_root:
2295
raise errors.BzrCommandError('cannot specify both --from-root'
2296
' and PATH')
2297
fs_path = path
2298
prefix = path
2299
tree, branch, relpath = bzrdir.BzrDir.open_containing_tree_or_branch(
2300
fs_path)
1471
2301
if from_root:
1472
2302
relpath = u''
1473
2303
elif relpath:
1474
2304
relpath += '/'
1475
if revision is not None:
1476
tree = tree.branch.repository.revision_tree(
1477
revision[0].in_history(tree.branch).rev_id)
1478
1479
for fp, fc, kind, fid, entry in tree.list_files():
1480
if fp.startswith(relpath):
1481
fp = fp[len(relpath):]
1482
if non_recursive and '/' in fp:
1483
continue
1484
if not all and not selection[fc]:
1485
continue
1486
if verbose:
2305
if revision is not None or tree is None:
2306
tree = _get_one_revision_tree('ls', revision, branch=branch)
2307
2308
apply_view = False
2309
if isinstance(tree, WorkingTree) and tree.supports_views():
2310
view_files = tree.views.lookup_view()
2311
if view_files:
2312
apply_view = True
2313
view_str = views.view_display_str(view_files)
2314
note("ignoring files outside view: %s" % view_str)
2315
2316
tree.lock_read()
2317
try:
2318
for fp, fc, fkind, fid, entry in tree.list_files(include_root=False):
2319
if fp.startswith(relpath):
2320
fp = osutils.pathjoin(prefix, fp[len(relpath):])
2321
if non_recursive and '/' in fp:
2322
continue
2323
if not all and not selection[fc]:
2324
continue
2325
if kind is not None and fkind != kind:
2326
continue
2327
if apply_view:
2328
try:
2329
views.check_path_in_view(tree, fp)
2330
except errors.FileOutsideView:
2331
continue
1487
2332
kindch = entry.kind_character()
1488
self.outf.write('%-8s %s%s\n' % (fc, fp, kindch))
1489
elif null:
1490
self.outf.write(fp + '\0')
1491
self.outf.flush()
1492
else:
1493
self.outf.write(fp + '\n')
2333
outstring = fp + kindch
2334
if verbose:
2335
outstring = '%-8s %s' % (fc, outstring)
2336
if show_ids and fid is not None:
2337
outstring = "%-50s %s" % (outstring, fid)
2338
self.outf.write(outstring + '\n')
2339
elif null:
2340
self.outf.write(fp + '\0')
2341
if show_ids:
2342
if fid is not None:
2343
self.outf.write(fid)
2344
self.outf.write('\0')
2345
self.outf.flush()
2346
else:
2347
if fid is not None:
2348
my_id = fid
2349
else:
2350
my_id = ''
2351
if show_ids:
2352
self.outf.write('%-50s %s\n' % (outstring, my_id))
2353
else:
2354
self.outf.write(outstring + '\n')
2355
finally:
2356
tree.unlock()
1494
2357
1495
2358
1496
2359
class cmd_unknowns(Command):
1497
"""List unknown files."""
2360
"""List unknown files.
2361
"""
2362
2363
hidden = True
2364
_see_also = ['ls']
2365
1498
2366
@display_command
1499
2367
def run(self):
1500
2368
for f in WorkingTree.open_containing(u'.')[0].unknowns():
1502
2370
1503
2371
1504
2372
class cmd_ignore(Command):
1505
"""Ignore a command or pattern.
2373
"""Ignore specified files or patterns.
2374
2375
See ``bzr help patterns`` for details on the syntax of patterns.
1506
2376
1507
2377
To remove patterns from the ignore list, edit the .bzrignore file.
1508
1509
If the pattern contains a slash, it is compared to the whole path
1510
from the branch root. Otherwise, it is compared to only the last
1511
component of the path. To match a file only in the root directory,
1512
prepend './'.
1513
1514
Ignore patterns are case-insensitive on case-insensitive systems.
1515
1516
Note: wildcards must be quoted from the shell on Unix.
1517
1518
examples:
1519
bzr ignore ./Makefile
1520
bzr ignore '*.class'
2378
After adding, editing or deleting that file either indirectly by
2379
using this command or directly by using an editor, be sure to commit
2380
it.
2381
2382
Note: ignore patterns containing shell wildcards must be quoted from
2383
the shell on Unix.
2384
2385
:Examples:
2386
Ignore the top level Makefile::
2387
2388
bzr ignore ./Makefile
2389
2390
Ignore class files in all directories::
2391
2392
bzr ignore "*.class"
2393
2394
Ignore .o files under the lib directory::
2395
2396
bzr ignore "lib/**/*.o"
2397
2398
Ignore .o files under the lib directory::
2399
2400
bzr ignore "RE:lib/.*\.o"
2401
2402
Ignore everything but the "debian" toplevel directory::
2403
2404
bzr ignore "RE:(?!debian/).*"
1521
2405
"""
1522
# TODO: Complain if the filename is absolute
1523
takes_args = ['name_pattern?']
2406
2407
_see_also = ['status', 'ignored', 'patterns']
2408
takes_args = ['name_pattern*']
1524
2409
takes_options = [
1525
Option('old-default-rules',
1526
help='Out the ignore rules bzr < 0.9 always used.')
1527
]
1528
1529
def run(self, name_pattern=None, old_default_rules=None):
1530
from bzrlib.atomicfile import AtomicFile
2410
Option('old-default-rules',
2411
help='Write out the ignore rules bzr < 0.9 always used.')
2412
]
2413
2414
def run(self, name_pattern_list=None, old_default_rules=None):
2415
from bzrlib import ignores
1531
2416
if old_default_rules is not None:
1532
2417
# dump the rules and exit
1533
2418
for pattern in ignores.OLD_DEFAULTS:
1534
2419
print pattern
1535
2420
return
1536
if name_pattern is None:
1537
raise BzrCommandError("ignore requires a NAME_PATTERN")
2421
if not name_pattern_list:
2422
raise errors.BzrCommandError("ignore requires at least one "
2423
"NAME_PATTERN or --old-default-rules")
2424
name_pattern_list = [globbing.normalize_pattern(p)
2425
for p in name_pattern_list]
2426
for name_pattern in name_pattern_list:
2427
if (name_pattern[0] == '/' or
2428
(len(name_pattern) > 1 and name_pattern[1] == ':')):
2429
raise errors.BzrCommandError(
2430
"NAME_PATTERN should not be an absolute path")
1538
2431
tree, relpath = WorkingTree.open_containing(u'.')
1539
ifn = tree.abspath('.bzrignore')
1540
if os.path.exists(ifn):
1541
f = open(ifn, 'rt')
1542
try:
1543
igns = f.read().decode('utf-8')
1544
finally:
1545
f.close()
1546
else:
1547
igns = ''
1548
1549
# TODO: If the file already uses crlf-style termination, maybe
1550
# we should use that for the newly added lines?
1551
1552
if igns and igns[-1] != '\n':
1553
igns += '\n'
1554
igns += name_pattern + '\n'
1555
1556
f = AtomicFile(ifn, 'wt')
1557
try:
1558
f.write(igns.encode('utf-8'))
1559
f.commit()
1560
finally:
1561
f.close()
1562
1563
inv = tree.inventory
1564
if inv.path2id('.bzrignore'):
1565
mutter('.bzrignore is already versioned')
1566
else:
1567
mutter('need to make new .bzrignore file versioned')
1568
tree.add(['.bzrignore'])
2432
ignores.tree_ignores_add_patterns(tree, name_pattern_list)
2433
ignored = globbing.Globster(name_pattern_list)
2434
matches = []
2435
tree.lock_read()
2436
for entry in tree.list_files():
2437
id = entry[3]
2438
if id is not None:
2439
filename = entry[0]
2440
if ignored.match(filename):
2441
matches.append(filename.encode('utf-8'))
2442
tree.unlock()
2443
if len(matches) > 0:
2444
print "Warning: the following files are version controlled and" \
2445
" match your ignore pattern:\n%s" \
2446
"\nThese files will continue to be version controlled" \
2447
" unless you 'bzr remove' them." % ("\n".join(matches),)
1569
2448
1570
2449
1571
2450
class cmd_ignored(Command):
1572
2451
"""List ignored files and the patterns that matched them.
1573
2452
1574
See also: bzr ignore"""
2453
List all the ignored files and the ignore pattern that caused the file to
2454
be ignored.
2455
2456
Alternatively, to list just the files::
2457
2458
bzr ls --ignored
2459
"""
2460
2461
encoding_type = 'replace'
2462
_see_also = ['ignore', 'ls']
2463
1575
2464
@display_command
1576
2465
def run(self):
1577
2466
tree = WorkingTree.open_containing(u'.')[0]
1578
for path, file_class, kind, file_id, entry in tree.list_files():
1579
if file_class != 'I':
1580
continue
1581
## XXX: Slightly inefficient since this was already calculated
1582
pat = tree.is_ignored(path)
1583
print '%-50s %s' % (path, pat)
2467
tree.lock_read()
2468
try:
2469
for path, file_class, kind, file_id, entry in tree.list_files():
2470
if file_class != 'I':
2471
continue
2472
## XXX: Slightly inefficient since this was already calculated
2473
pat = tree.is_ignored(path)
2474
self.outf.write('%-50s %s\n' % (path, pat))
2475
finally:
2476
tree.unlock()
1584
2477
1585
2478
1586
2479
class cmd_lookup_revision(Command):
1587
2480
"""Lookup the revision-id from a revision-number
1588
2481
1589
example:
2482
:Examples:
1590
2483
bzr lookup-revision 33
1591
2484
"""
1592
2485
hidden = True
1593
2486
takes_args = ['revno']
1594
2487
1595
2488
@display_command
1596
2489
def run(self, revno):
1597
2490
try:
1598
2491
revno = int(revno)
1599
2492
except ValueError:
1600
raise BzrCommandError("not a valid revision-number: %r" % revno)
2493
raise errors.BzrCommandError("not a valid revision-number: %r" % revno)
1601
2494
1602
2495
print WorkingTree.open_containing(u'.')[0].branch.get_rev_id(revno)
1603
2496
1604
2497
1605
2498
class cmd_export(Command):
1606
"""Export past revision to destination directory.
2499
"""Export current or past revision to a destination directory or archive.
1607
2500
1608
2501
If no revision is specified this exports the last committed revision.
1609
2502
1611
2504
given, try to find the format with the extension. If no extension
1612
2505
is found exports to a directory (equivalent to --format=dir).
1613
2506
1614
Root may be the top directory for tar, tgz and tbz2 formats. If none
1615
is given, the top directory will be the root name of the file.
1616
1617
Note: export of tree with non-ascii filenames to zip is not supported.
1618
1619
Supported formats Autodetected by extension
1620
----------------- -------------------------
1621
dir -
2507
If root is supplied, it will be used as the root directory inside
2508
container formats (tar, zip, etc). If it is not supplied it will default
2509
to the exported filename. The root option has no effect for 'dir' format.
2510
2511
If branch is omitted then the branch containing the current working
2512
directory will be used.
2513
2514
Note: Export of tree with non-ASCII filenames to zip is not supported.
2515
2516
================= =========================
2517
Supported formats Autodetected by extension
2518
================= =========================
2519
dir (none)
1622
2520
tar .tar
1623
2521
tbz2 .tar.bz2, .tbz2
1624
2522
tgz .tar.gz, .tgz
1625
2523
zip .zip
2524
================= =========================
1626
2525
"""
1627
takes_args = ['dest']
1628
takes_options = ['revision', 'format', 'root']
1629
def run(self, dest, revision=None, format=None, root=None):
2526
takes_args = ['dest', 'branch_or_subdir?']
2527
takes_options = [
2528
Option('format',
2529
help="Type of file to export to.",
2530
type=unicode),
2531
'revision',
2532
Option('filters', help='Apply content filters to export the '
2533
'convenient form.'),
2534
Option('root',
2535
type=str,
2536
help="Name of the root directory inside the exported file."),
2537
]
2538
def run(self, dest, branch_or_subdir=None, revision=None, format=None,
2539
root=None, filters=False):
1630
2540
from bzrlib.export import export
1631
tree = WorkingTree.open_containing(u'.')[0]
1632
b = tree.branch
1633
if revision is None:
1634
# should be tree.last_revision FIXME
1635
rev_id = b.last_revision()
2541
2542
if branch_or_subdir is None:
2543
tree = WorkingTree.open_containing(u'.')[0]
2544
b = tree.branch
2545
subdir = None
1636
2546
else:
1637
if len(revision) != 1:
1638
raise BzrError('bzr export --revision takes exactly 1 argument')
1639
rev_id = revision[0].in_history(b).rev_id
1640
t = b.repository.revision_tree(rev_id)
2547
b, subdir = Branch.open_containing(branch_or_subdir)
2548
tree = None
2549
2550
rev_tree = _get_one_revision_tree('export', revision, branch=b, tree=tree)
1641
2551
try:
1642
export(t, dest, format, root)
2552
export(rev_tree, dest, format, root, subdir, filtered=filters)
1643
2553
except errors.NoSuchExportFormat, e:
1644
raise BzrCommandError('Unsupported export format: %s' % e.format)
2554
raise errors.BzrCommandError('Unsupported export format: %s' % e.format)
1645
2555
1646
2556
1647
2557
class cmd_cat(Command):
1648
"""Write a file's text from a previous revision."""
1649
1650
takes_options = ['revision']
2558
"""Write the contents of a file as of a given revision to standard output.
2559
2560
If no revision is nominated, the last revision is used.
2561
2562
Note: Take care to redirect standard output when using this command on a
2563
binary file.
2564
"""
2565
2566
_see_also = ['ls']
2567
takes_options = [
2568
Option('name-from-revision', help='The path name in the old tree.'),
2569
Option('filters', help='Apply content filters to display the '
2570
'convenience form.'),
2571
'revision',
2572
]
1651
2573
takes_args = ['filename']
2574
encoding_type = 'exact'
1652
2575
1653
2576
@display_command
1654
def run(self, filename, revision=None):
2577
def run(self, filename, revision=None, name_from_revision=False,
2578
filters=False):
1655
2579
if revision is not None and len(revision) != 1:
1656
raise BzrCommandError("bzr cat --revision takes exactly one number")
1657
tree = None
2580
raise errors.BzrCommandError("bzr cat --revision takes exactly"
2581
" one revision specifier")
2582
tree, branch, relpath = \
2583
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
2584
branch.lock_read()
1658
2585
try:
1659
tree, relpath = WorkingTree.open_containing(filename)
1660
b = tree.branch
1661
except NotBranchError:
1662
pass
2586
return self._run(tree, branch, relpath, filename, revision,
2587
name_from_revision, filters)
2588
finally:
2589
branch.unlock()
1663
2590
2591
def _run(self, tree, b, relpath, filename, revision, name_from_revision,
2592
filtered):
1664
2593
if tree is None:
1665
b, relpath = Branch.open_containing(filename)
1666
if revision is not None and revision[0].get_branch() is not None:
1667
b = Branch.open(revision[0].get_branch())
1668
if revision is None:
1669
revision_id = b.last_revision()
1670
else:
1671
revision_id = revision[0].in_history(b).rev_id
1672
b.print_file(relpath, revision_id)
2594
tree = b.basis_tree()
2595
rev_tree = _get_one_revision_tree('cat', revision, branch=b)
2596
2597
old_file_id = rev_tree.path2id(relpath)
2598
2599
if name_from_revision:
2600
# Try in revision if requested
2601
if old_file_id is None:
2602
raise errors.BzrCommandError(
2603
"%r is not present in revision %s" % (
2604
filename, rev_tree.get_revision_id()))
2605
else:
2606
content = rev_tree.get_file_text(old_file_id)
2607
else:
2608
cur_file_id = tree.path2id(relpath)
2609
found = False
2610
if cur_file_id is not None:
2611
# Then try with the actual file id
2612
try:
2613
content = rev_tree.get_file_text(cur_file_id)
2614
found = True
2615
except errors.NoSuchId:
2616
# The actual file id didn't exist at that time
2617
pass
2618
if not found and old_file_id is not None:
2619
# Finally try with the old file id
2620
content = rev_tree.get_file_text(old_file_id)
2621
found = True
2622
if not found:
2623
# Can't be found anywhere
2624
raise errors.BzrCommandError(
2625
"%r is not present in revision %s" % (
2626
filename, rev_tree.get_revision_id()))
2627
if filtered:
2628
from bzrlib.filters import (
2629
ContentFilterContext,
2630
filtered_output_bytes,
2631
)
2632
filters = rev_tree._content_filter_stack(relpath)
2633
chunks = content.splitlines(True)
2634
content = filtered_output_bytes(chunks, filters,
2635
ContentFilterContext(relpath, rev_tree))
2636
self.outf.writelines(content)
2637
else:
2638
self.outf.write(content)
1673
2639
1674
2640
1675
2641
class cmd_local_time_offset(Command):
1676
2642
"""Show the offset in seconds from GMT to local time."""
1677
hidden = True
2643
hidden = True
1678
2644
@display_command
1679
2645
def run(self):
1680
2646
print osutils.local_time_offset()
1683
2649
1684
2650
class cmd_commit(Command):
1685
2651
"""Commit changes into a new revision.
1686
2652
1687
2653
If no arguments are given, the entire tree is committed.
1688
2654
1689
2655
If selected files are specified, only changes to those files are
1690
committed. If a directory is specified then the directory and everything
2656
committed. If a directory is specified then the directory and everything
1691
2657
within it is committed.
1692
2658
2659
When excludes are given, they take precedence over selected files.
2660
For example, too commit only changes within foo, but not changes within
2661
foo/bar::
2662
2663
bzr commit foo -x foo/bar
2664
2665
If author of the change is not the same person as the committer, you can
2666
specify the author's name using the --author option. The name should be
2667
in the same format as a committer-id, e.g. "John Doe <jdoe@example.com>".
2668
If there is more than one author of the change you can specify the option
2669
multiple times, once for each author.
2670
1693
2671
A selected-file commit may fail in some cases where the committed
1694
tree would be invalid, such as trying to commit a file in a
1695
newly-added directory that is not itself committed.
2672
tree would be invalid. Consider::
2673
2674
bzr init foo
2675
mkdir foo/bar
2676
bzr add foo/bar
2677
bzr commit foo -m "committing foo"
2678
bzr mv foo/bar foo/baz
2679
mkdir foo/bar
2680
bzr add foo/bar
2681
bzr commit foo/bar -m "committing bar but not baz"
2682
2683
In the example above, the last commit will fail by design. This gives
2684
the user the opportunity to decide whether they want to commit the
2685
rename at the same time, separately first, or not at all. (As a general
2686
rule, when in doubt, Bazaar has a policy of Doing the Safe Thing.)
2687
2688
Note: A selected-file commit after a merge is not yet supported.
1696
2689
"""
1697
2690
# TODO: Run hooks on tree to-be-committed, and after commit.
1698
2691
1703
2696
1704
2697
# XXX: verbose currently does nothing
1705
2698
2699
_see_also = ['bugs', 'uncommit']
1706
2700
takes_args = ['selected*']
1707
takes_options = ['message', 'verbose',
1708
Option('unchanged',
1709
help='commit even if nothing has changed'),
1710
Option('file', type=str,
1711
argname='msgfile',
1712
help='file containing commit message'),
1713
Option('strict',
1714
help="refuse to commit if there are unknown "
1715
"files in the working tree."),
1716
Option('local',
1717
help="perform a local only commit in a bound "
1718
"branch. Such commits are not pushed to "
1719
"the master branch until a normal commit "
1720
"is performed."
1721
),
1722
]
2701
takes_options = [
2702
ListOption('exclude', type=str, short_name='x',
2703
help="Do not consider changes made to a given path."),
2704
Option('message', type=unicode,
2705
short_name='m',
2706
help="Description of the new revision."),
2707
'verbose',
2708
Option('unchanged',
2709
help='Commit even if nothing has changed.'),
2710
Option('file', type=str,
2711
short_name='F',
2712
argname='msgfile',
2713
help='Take commit message from this file.'),
2714
Option('strict',
2715
help="Refuse to commit if there are unknown "
2716
"files in the working tree."),
2717
ListOption('fixes', type=str,
2718
help="Mark a bug as being fixed by this revision "
2719
"(see \"bzr help bugs\")."),
2720
ListOption('author', type=unicode,
2721
help="Set the author's name, if it's different "
2722
"from the committer."),
2723
Option('local',
2724
help="Perform a local commit in a bound "
2725
"branch. Local commits are not pushed to "
2726
"the master branch until a normal commit "
2727
"is performed."
2728
),
2729
Option('show-diff',
2730
help='When no message is supplied, show the diff along'
2731
' with the status summary in the message editor.'),
2732
]
1723
2733
aliases = ['ci', 'checkin']
1724
2734
1725
def run(self, message=None, file=None, verbose=True, selected_list=None,
1726
unchanged=False, strict=False, local=False):
1727
from bzrlib.commit import (NullCommitReporter, ReportCommitToLog)
1728
from bzrlib.errors import (PointlessCommit, ConflictsInTree,
1729
StrictCommitFailed)
1730
from bzrlib.msgeditor import edit_commit_message, \
1731
make_commit_message_template
1732
from tempfile import TemporaryFile
2735
def _iter_bug_fix_urls(self, fixes, branch):
2736
# Configure the properties for bug fixing attributes.
2737
for fixed_bug in fixes:
2738
tokens = fixed_bug.split(':')
2739
if len(tokens) != 2:
2740
raise errors.BzrCommandError(
2741
"Invalid bug %s. Must be in the form of 'tracker:id'. "
2742
"See \"bzr help bugs\" for more information on this "
2743
"feature.\nCommit refused." % fixed_bug)
2744
tag, bug_id = tokens
2745
try:
2746
yield bugtracker.get_bug_url(tag, branch, bug_id)
2747
except errors.UnknownBugTrackerAbbreviation:
2748
raise errors.BzrCommandError(
2749
'Unrecognized bug %s. Commit refused.' % fixed_bug)
2750
except errors.MalformedBugIdentifier, e:
2751
raise errors.BzrCommandError(
2752
"%s\nCommit refused." % (str(e),))
2753
2754
def run(self, message=None, file=None, verbose=False, selected_list=None,
2755
unchanged=False, strict=False, local=False, fixes=None,
2756
author=None, show_diff=False, exclude=None):
2757
from bzrlib.errors import (
2758
PointlessCommit,
2759
ConflictsInTree,
2760
StrictCommitFailed
2761
)
2762
from bzrlib.msgeditor import (
2763
edit_commit_message_encoded,
2764
generate_commit_message_template,
2765
make_commit_message_template_encoded
2766
)
1733
2767
1734
2768
# TODO: Need a blackbox test for invoking the external editor; may be
1735
2769
# slightly problematic to run this cross-platform.
1736
2770
1737
# TODO: do more checks that the commit will succeed before
2771
# TODO: do more checks that the commit will succeed before
1738
2772
# spending the user's valuable time typing a commit message.
1739
#
1740
# TODO: if the commit *does* happen to fail, then save the commit
1741
# message to a temporary file where it can be recovered
2773
2774
properties = {}
2775
1742
2776
tree, selected_list = tree_files(selected_list)
1743
2777
if selected_list == ['']:
1744
2778
# workaround - commit of root of tree should be exactly the same
1746
2780
# selected-file merge commit is not done yet
1747
2781
selected_list = []
1748
2782
2783
if fixes is None:
2784
fixes = []
2785
bug_property = bugtracker.encode_fixes_bug_urls(
2786
self._iter_bug_fix_urls(fixes, tree.branch))
2787
if bug_property:
2788
properties['bugs'] = bug_property
2789
1749
2790
if local and not tree.branch.get_bound_location():
1750
2791
raise errors.LocalRequiresBoundBranch()
1751
if message is None and not file:
1752
template = make_commit_message_template(tree, selected_list)
1753
message = edit_commit_message(template)
1754
if message is None:
1755
raise BzrCommandError("please specify a commit message"
1756
" with either --message or --file")
1757
elif message and file:
1758
raise BzrCommandError("please specify either --message or --file")
1759
1760
if file:
1761
message = codecs.open(file, 'rt', bzrlib.user_encoding).read()
1762
1763
if message == "":
1764
raise BzrCommandError("empty commit message specified")
1765
1766
if verbose:
1767
reporter = ReportCommitToLog()
1768
else:
1769
reporter = NullCommitReporter()
1770
2792
2793
def get_message(commit_obj):
2794
"""Callback to get commit message"""
2795
my_message = message
2796
if my_message is None and not file:
2797
t = make_commit_message_template_encoded(tree,
2798
selected_list, diff=show_diff,
2799
output_encoding=osutils.get_user_encoding())
2800
start_message = generate_commit_message_template(commit_obj)
2801
my_message = edit_commit_message_encoded(t,
2802
start_message=start_message)
2803
if my_message is None:
2804
raise errors.BzrCommandError("please specify a commit"
2805
" message with either --message or --file")
2806
elif my_message and file:
2807
raise errors.BzrCommandError(
2808
"please specify either --message or --file")
2809
if file:
2810
my_message = codecs.open(file, 'rt',
2811
osutils.get_user_encoding()).read()
2812
if my_message == "":
2813
raise errors.BzrCommandError("empty commit message specified")
2814
return my_message
2815
1771
2816
try:
1772
tree.commit(message, specific_files=selected_list,
2817
tree.commit(message_callback=get_message,
2818
specific_files=selected_list,
1773
2819
allow_pointless=unchanged, strict=strict, local=local,
1774
reporter=reporter)
2820
reporter=None, verbose=verbose, revprops=properties,
2821
authors=author,
2822
exclude=safe_relpath_files(tree, exclude))
1775
2823
except PointlessCommit:
1776
2824
# FIXME: This should really happen before the file is read in;
1777
2825
# perhaps prepare the commit; get the message; then actually commit
1778
raise BzrCommandError("no changes to commit."
1779
" use --unchanged to commit anyhow")
2826
raise errors.BzrCommandError("no changes to commit."
2827
" use --unchanged to commit anyhow")
1780
2828
except ConflictsInTree:
1781
raise BzrCommandError("Conflicts detected in working tree. "
1782
'Use "bzr conflicts" to list, "bzr resolve FILE" to resolve.')
2829
raise errors.BzrCommandError('Conflicts detected in working '
2830
'tree. Use "bzr conflicts" to list, "bzr resolve FILE" to'
2831
' resolve.')
1783
2832
except StrictCommitFailed:
1784
raise BzrCommandError("Commit refused because there are unknown "
1785
"files in the working tree.")
2833
raise errors.BzrCommandError("Commit refused because there are"
2834
" unknown files in the working tree.")
1786
2835
except errors.BoundBranchOutOfDate, e:
1787
raise BzrCommandError(str(e) + "\n"
1788
'To commit to master branch, run update and then commit.\n'
1789
'You can also pass --local to commit to continue working '
1790
'disconnected.')
2836
raise errors.BzrCommandError(str(e) + "\n"
2837
'To commit to master branch, run update and then commit.\n'
2838
'You can also pass --local to commit to continue working '
2839
'disconnected.')
2840
1791
2841
1792
2842
class cmd_check(Command):
1793
"""Validate consistency of branch history.
1794
1795
This command checks various invariants about the branch storage to
1796
detect data corruption or bzr bugs.
2843
"""Validate working tree structure, branch consistency and repository history.
2844
2845
This command checks various invariants about branch and repository storage
2846
to detect data corruption or bzr bugs.
2847
2848
The working tree and branch checks will only give output if a problem is
2849
detected. The output fields of the repository check are:
2850
2851
revisions: This is just the number of revisions checked. It doesn't
2852
indicate a problem.
2853
versionedfiles: This is just the number of versionedfiles checked. It
2854
doesn't indicate a problem.
2855
unreferenced ancestors: Texts that are ancestors of other texts, but
2856
are not properly referenced by the revision ancestry. This is a
2857
subtle problem that Bazaar can work around.
2858
unique file texts: This is the total number of unique file contents
2859
seen in the checked revisions. It does not indicate a problem.
2860
repeated file texts: This is the total number of repeated texts seen
2861
in the checked revisions. Texts can be repeated when their file
2862
entries are modified, but the file contents are not. It does not
2863
indicate a problem.
2864
2865
If no restrictions are specified, all Bazaar data that is found at the given
2866
location will be checked.
2867
2868
:Examples:
2869
2870
Check the tree and branch at 'foo'::
2871
2872
bzr check --tree --branch foo
2873
2874
Check only the repository at 'bar'::
2875
2876
bzr check --repo bar
2877
2878
Check everything at 'baz'::
2879
2880
bzr check baz
1797
2881
"""
1798
takes_args = ['branch?']
1799
takes_options = ['verbose']
1800
1801
def run(self, branch=None, verbose=False):
1802
from bzrlib.check import check
1803
if branch is None:
1804
tree = WorkingTree.open_containing()[0]
1805
branch = tree.branch
1806
else:
1807
branch = Branch.open(branch)
1808
check(branch, verbose)
1809
1810
1811
class cmd_scan_cache(Command):
1812
hidden = True
1813
def run(self):
1814
from bzrlib.hashcache import HashCache
1815
1816
c = HashCache(u'.')
1817
c.read()
1818
c.scan()
1819
1820
print '%6d stats' % c.stat_count
1821
print '%6d in hashcache' % len(c._cache)
1822
print '%6d files removed from cache' % c.removed_count
1823
print '%6d hashes updated' % c.update_count
1824
print '%6d files changed too recently to cache' % c.danger_count
1825
1826
if c.needs_write:
1827
c.write()
2882
2883
_see_also = ['reconcile']
2884
takes_args = ['path?']
2885
takes_options = ['verbose',
2886
Option('branch', help="Check the branch related to the"
2887
" current directory."),
2888
Option('repo', help="Check the repository related to the"
2889
" current directory."),
2890
Option('tree', help="Check the working tree related to"
2891
" the current directory.")]
2892
2893
def run(self, path=None, verbose=False, branch=False, repo=False,
2894
tree=False):
2895
from bzrlib.check import check_dwim
2896
if path is None:
2897
path = '.'
2898
if not branch and not repo and not tree:
2899
branch = repo = tree = True
2900
check_dwim(path, verbose, do_branch=branch, do_repo=repo, do_tree=tree)
1828
2901
1829
2902
1830
2903
class cmd_upgrade(Command):
1834
2907
this command. When the default format has changed you may also be warned
1835
2908
during other operations to upgrade.
1836
2909
"""
2910
2911
_see_also = ['check']
1837
2912
takes_args = ['url?']
1838
2913
takes_options = [
1839
Option('format',
1840
help='Upgrade to a specific format. Current formats'
1841
' are: default, knit, metaweave and weave.'
1842
' Default is knit; metaweave and weave are'
1843
' deprecated',
1844
type=get_format_type),
2914
RegistryOption('format',
2915
help='Upgrade to a specific format. See "bzr help'
2916
' formats" for details.',
2917
lazy_registry=('bzrlib.bzrdir', 'format_registry'),
2918
converter=lambda name: bzrdir.format_registry.make_bzrdir(name),
2919
value_switches=True, title='Branch format'),
1845
2920
]
1846
2921
1847
1848
2922
def run(self, url='.', format=None):
1849
2923
from bzrlib.upgrade import upgrade
1850
2924
if format is None:
1851
format = get_format_type('default')
2925
format = bzrdir.format_registry.make_bzrdir('default')
1852
2926
upgrade(url, format)
1853
2927
1854
2928
1855
2929
class cmd_whoami(Command):
1856
2930
"""Show or set bzr user id.
1857
1858
examples:
1859
bzr whoami --email
1860
bzr whoami 'Frank Chu <fchu@example.com>'
2931
2932
:Examples:
2933
Show the email of the current user::
2934
2935
bzr whoami --email
2936
2937
Set the current user::
2938
2939
bzr whoami "Frank Chu <fchu@example.com>"
1861
2940
"""
1862
2941
takes_options = [ Option('email',
1863
help='display email address only'),
2942
help='Display email address only.'),
1864
2943
Option('branch',
1865
help='set identity for the current branch instead of '
1866
'globally'),
2944
help='Set identity for the current branch instead of '
2945
'globally.'),
1867
2946
]
1868
2947
takes_args = ['name?']
1869
2948
encoding_type = 'replace'
1870
2949
1871
2950
@display_command
1872
2951
def run(self, email=False, branch=False, name=None):
1873
2952
if name is None:
1874
2953
# use branch if we're inside one; otherwise global config
1875
2954
try:
1876
2955
c = Branch.open_containing('.')[0].get_config()
1877
except NotBranchError:
2956
except errors.NotBranchError:
1878
2957
c = config.GlobalConfig()
1879
2958
if email:
1880
2959
self.outf.write(c.user_email() + '\n')
1885
2964
# display a warning if an email address isn't included in the given name.
1886
2965
try:
1887
2966
config.extract_email_address(name)
1888
except BzrError, e:
2967
except errors.NoEmailInUsername, e:
1889
2968
warning('"%s" does not seem to contain an email address. '
1890
2969
'This is allowed, but not recommended.', name)
1891
2970
1892
2971
# use global config unless --branch given
1893
2972
if branch:
1894
2973
c = Branch.open_containing('.')[0].get_config()
1898
2977
1899
2978
1900
2979
class cmd_nick(Command):
1901
"""Print or set the branch nickname.
1902
1903
If unset, the tree root directory name is used as the nickname
1904
To print the current nickname, execute with no argument.
2980
"""Print or set the branch nickname.
2981
2982
If unset, the tree root directory name is used as the nickname.
2983
To print the current nickname, execute with no argument.
2984
2985
Bound branches use the nickname of its master branch unless it is set
2986
locally.
1905
2987
"""
2988
2989
_see_also = ['info']
1906
2990
takes_args = ['nickname?']
1907
2991
def run(self, nickname=None):
1908
2992
branch = Branch.open_containing(u'.')[0]
1913
2997
1914
2998
@display_command
1915
2999
def printme(self, branch):
1916
print branch.nick
3000
print branch.nick
3001
3002
3003
class cmd_alias(Command):
3004
"""Set/unset and display aliases.
3005
3006
:Examples:
3007
Show the current aliases::
3008
3009
bzr alias
3010
3011
Show the alias specified for 'll'::
3012
3013
bzr alias ll
3014
3015
Set an alias for 'll'::
3016
3017
bzr alias ll="log --line -r-10..-1"
3018
3019
To remove an alias for 'll'::
3020
3021
bzr alias --remove ll
3022
3023
"""
3024
takes_args = ['name?']
3025
takes_options = [
3026
Option('remove', help='Remove the alias.'),
3027
]
3028
3029
def run(self, name=None, remove=False):
3030
if remove:
3031
self.remove_alias(name)
3032
elif name is None:
3033
self.print_aliases()
3034
else:
3035
equal_pos = name.find('=')
3036
if equal_pos == -1:
3037
self.print_alias(name)
3038
else:
3039
self.set_alias(name[:equal_pos], name[equal_pos+1:])
3040
3041
def remove_alias(self, alias_name):
3042
if alias_name is None:
3043
raise errors.BzrCommandError(
3044
'bzr alias --remove expects an alias to remove.')
3045
# If alias is not found, print something like:
3046
# unalias: foo: not found
3047
c = config.GlobalConfig()
3048
c.unset_alias(alias_name)
3049
3050
@display_command
3051
def print_aliases(self):
3052
"""Print out the defined aliases in a similar format to bash."""
3053
aliases = config.GlobalConfig().get_aliases()
3054
for key, value in sorted(aliases.iteritems()):
3055
self.outf.write('bzr alias %s="%s"\n' % (key, value))
3056
3057
@display_command
3058
def print_alias(self, alias_name):
3059
from bzrlib.commands import get_alias
3060
alias = get_alias(alias_name)
3061
if alias is None:
3062
self.outf.write("bzr alias: %s: not found\n" % alias_name)
3063
else:
3064
self.outf.write(
3065
'bzr alias %s="%s"\n' % (alias_name, ' '.join(alias)))
3066
3067
def set_alias(self, alias_name, alias_command):
3068
"""Save the alias in the global config."""
3069
c = config.GlobalConfig()
3070
c.set_alias(alias_name, alias_command)
1917
3071
1918
3072
1919
3073
class cmd_selftest(Command):
1920
3074
"""Run internal test suite.
1921
1922
This creates temporary test directories in the working directory,
1923
but not existing data is affected. These directories are deleted
1924
if the tests pass, or left behind to help in debugging if they
1925
fail and --keep-output is specified.
1926
1927
If arguments are given, they are regular expressions that say
1928
which tests should run.
3075
3076
If arguments are given, they are regular expressions that say which tests
3077
should run. Tests matching any expression are run, and other tests are
3078
not run.
3079
3080
Alternatively if --first is given, matching tests are run first and then
3081
all other tests are run. This is useful if you have been working in a
3082
particular area, but want to make sure nothing else was broken.
3083
3084
If --exclude is given, tests that match that regular expression are
3085
excluded, regardless of whether they match --first or not.
3086
3087
To help catch accidential dependencies between tests, the --randomize
3088
option is useful. In most cases, the argument used is the word 'now'.
3089
Note that the seed used for the random number generator is displayed
3090
when this option is used. The seed can be explicitly passed as the
3091
argument to this option if required. This enables reproduction of the
3092
actual ordering used if and when an order sensitive problem is encountered.
3093
3094
If --list-only is given, the tests that would be run are listed. This is
3095
useful when combined with --first, --exclude and/or --randomize to
3096
understand their impact. The test harness reports "Listed nn tests in ..."
3097
instead of "Ran nn tests in ..." when list mode is enabled.
1929
3098
1930
3099
If the global option '--no-plugins' is given, plugins are not loaded
1931
3100
before running the selftests. This has two effects: features provided or
1932
3101
modified by plugins will not be tested, and tests provided by plugins will
1933
3102
not be run.
1934
3103
1935
examples:
1936
bzr selftest ignore
1937
bzr --no-plugins selftest -v
3104
Tests that need working space on disk use a common temporary directory,
3105
typically inside $TMPDIR or /tmp.
3106
3107
:Examples:
3108
Run only tests relating to 'ignore'::
3109
3110
bzr selftest ignore
3111
3112
Disable plugins and list tests as they're run::
3113
3114
bzr --no-plugins selftest -v
1938
3115
"""
1939
# TODO: --list should give a list of all available tests
1940
1941
3116
# NB: this is used from the class without creating an instance, which is
1942
3117
# why it does not have a self parameter.
1943
3118
def get_transport_type(typestring):
1953
3128
return FakeNFSServer
1954
3129
msg = "No known transport type %s. Supported types are: sftp\n" %\
1955
3130
(typestring)
1956
raise BzrCommandError(msg)
3131
raise errors.BzrCommandError(msg)
1957
3132
1958
3133
hidden = True
1959
3134
takes_args = ['testspecs*']
1960
3135
takes_options = ['verbose',
1961
Option('one', help='stop when one test fails'),
1962
Option('keep-output',
1963
help='keep output directories when tests fail'),
1964
Option('transport',
3136
Option('one',
3137
help='Stop when one test fails.',
3138
short_name='1',
3139
),
3140
Option('transport',
1965
3141
help='Use a different transport by default '
1966
3142
'throughout the test suite.',
1967
3143
type=get_transport_type),
1968
Option('benchmark', help='run the bzr bencharks.'),
3144
Option('benchmark',
3145
help='Run the benchmarks rather than selftests.'),
1969
3146
Option('lsprof-timed',
1970
help='generate lsprof output for benchmarked'
3147
help='Generate lsprof output for benchmarked'
1971
3148
' sections of code.'),
1972
3149
Option('cache-dir', type=str,
1973
help='a directory to cache intermediate'
1974
' benchmark steps'),
3150
help='Cache intermediate benchmark output in this '
3151
'directory.'),
3152
Option('first',
3153
help='Run all tests, but run specified tests first.',
3154
short_name='f',
3155
),
3156
Option('list-only',
3157
help='List the tests instead of running them.'),
3158
Option('randomize', type=str, argname="SEED",
3159
help='Randomize the order of tests using the given'
3160
' seed or "now" for the current time.'),
3161
Option('exclude', type=str, argname="PATTERN",
3162
short_name='x',
3163
help='Exclude tests that match this regular'
3164
' expression.'),
3165
Option('subunit',
3166
help='Output test progress via subunit.'),
3167
Option('strict', help='Fail on missing dependencies or '
3168
'known failures.'),
3169
Option('load-list', type=str, argname='TESTLISTFILE',
3170
help='Load a test id list from a text file.'),
3171
ListOption('debugflag', type=str, short_name='E',
3172
help='Turn on a selftest debug flag.'),
3173
ListOption('starting-with', type=str, argname='TESTID',
3174
param_name='starting_with', short_name='s',
3175
help=
3176
'Load only the tests starting with TESTID.'),
1975
3177
]
1976
1977
def run(self, testspecs_list=None, verbose=None, one=False,
1978
keep_output=False, transport=None, benchmark=None,
1979
lsprof_timed=None, cache_dir=None):
1980
import bzrlib.ui
3178
encoding_type = 'replace'
3179
3180
def __init__(self):
3181
Command.__init__(self)
3182
self.additional_selftest_args = {}
3183
3184
def run(self, testspecs_list=None, verbose=False, one=False,
3185
transport=None, benchmark=None,
3186
lsprof_timed=None, cache_dir=None,
3187
first=False, list_only=False,
3188
randomize=None, exclude=None, strict=False,
3189
load_list=None, debugflag=None, starting_with=None, subunit=False):
1981
3190
from bzrlib.tests import selftest
1982
3191
import bzrlib.benchmarks as benchmarks
1983
3192
from bzrlib.benchmarks import tree_creator
1984
3193
3194
# Make deprecation warnings visible, unless -Werror is set
3195
symbol_versioning.activate_deprecation_warnings(override=False)
3196
1985
3197
if cache_dir is not None:
1986
3198
tree_creator.TreeCreator.CACHE_ROOT = osutils.abspath(cache_dir)
1987
# we don't want progress meters from the tests to go to the
1988
# real output; and we don't want log messages cluttering up
1989
# the real logs.
1990
save_ui = ui.ui_factory
1991
print '%10s: %s' % ('bzr', osutils.realpath(sys.argv[0]))
1992
print '%10s: %s' % ('bzrlib', bzrlib.__path__[0])
3199
if not list_only:
3200
print 'testing: %s' % (osutils.realpath(sys.argv[0]),)
3201
print ' %s (%s python%s)' % (
3202
bzrlib.__path__[0],
3203
bzrlib.version_string,
3204
bzrlib._format_version_tuple(sys.version_info),
3205
)
1993
3206
print
1994
info('running tests...')
3207
if testspecs_list is not None:
3208
pattern = '|'.join(testspecs_list)
3209
else:
3210
pattern = ".*"
3211
if subunit:
3212
try:
3213
from bzrlib.tests import SubUnitBzrRunner
3214
except ImportError:
3215
raise errors.BzrCommandError("subunit not available. subunit "
3216
"needs to be installed to use --subunit.")
3217
self.additional_selftest_args['runner_class'] = SubUnitBzrRunner
3218
if benchmark:
3219
test_suite_factory = benchmarks.test_suite
3220
# Unless user explicitly asks for quiet, be verbose in benchmarks
3221
verbose = not is_quiet()
3222
# TODO: should possibly lock the history file...
3223
benchfile = open(".perf_history", "at", buffering=1)
3224
else:
3225
test_suite_factory = None
3226
benchfile = None
1995
3227
try:
1996
ui.ui_factory = ui.SilentUIFactory()
1997
if testspecs_list is not None:
1998
pattern = '|'.join(testspecs_list)
1999
else:
2000
pattern = ".*"
2001
if benchmark:
2002
test_suite_factory = benchmarks.test_suite
2003
if verbose is None:
2004
verbose = True
2005
benchfile = open(".perf_history", "at")
2006
else:
2007
test_suite_factory = None
2008
if verbose is None:
2009
verbose = False
2010
benchfile = None
2011
try:
2012
result = selftest(verbose=verbose,
2013
pattern=pattern,
2014
stop_on_failure=one,
2015
keep_output=keep_output,
2016
transport=transport,
2017
test_suite_factory=test_suite_factory,
2018
lsprof_timed=lsprof_timed,
2019
bench_history=benchfile)
2020
finally:
2021
if benchfile is not None:
2022
benchfile.close()
2023
if result:
2024
info('tests passed')
2025
else:
2026
info('tests failed')
2027
return int(not result)
3228
selftest_kwargs = {"verbose": verbose,
3229
"pattern": pattern,
3230
"stop_on_failure": one,
3231
"transport": transport,
3232
"test_suite_factory": test_suite_factory,
3233
"lsprof_timed": lsprof_timed,
3234
"bench_history": benchfile,
3235
"matching_tests_first": first,
3236
"list_only": list_only,
3237
"random_seed": randomize,
3238
"exclude_pattern": exclude,
3239
"strict": strict,
3240
"load_list": load_list,
3241
"debug_flags": debugflag,
3242
"starting_with": starting_with
3243
}
3244
selftest_kwargs.update(self.additional_selftest_args)
3245
result = selftest(**selftest_kwargs)
2028
3246
finally:
2029
ui.ui_factory = save_ui
3247
if benchfile is not None:
3248
benchfile.close()
3249
if result:
3250
note('tests passed')
3251
else:
3252
note('tests failed')
3253
return int(not result)
2030
3254
2031
3255
2032
3256
class cmd_version(Command):
2033
3257
"""Show version of bzr."""
2034
3258
3259
encoding_type = 'replace'
3260
takes_options = [
3261
Option("short", help="Print just the version number."),
3262
]
3263
2035
3264
@display_command
2036
def run(self):
3265
def run(self, short=False):
2037
3266
from bzrlib.version import show_version
2038
show_version()
3267
if short:
3268
self.outf.write(bzrlib.version_string + '\n')
3269
else:
3270
show_version(to_file=self.outf)
2039
3271
2040
3272
2041
3273
class cmd_rocks(Command):
2045
3277
2046
3278
@display_command
2047
3279
def run(self):
2048
print "it sure does!"
3280
print "It sure does!"
2049
3281
2050
3282
2051
3283
class cmd_find_merge_base(Command):
2054
3286
# merging only part of the history.
2055
3287
takes_args = ['branch', 'other']
2056
3288
hidden = True
2057
3289
2058
3290
@display_command
2059
3291
def run(self, branch, other):
2060
from bzrlib.revision import common_ancestor, MultipleRevisionSources
2061
3292
from bzrlib.revision import ensure_null
3293
2062
3294
branch1 = Branch.open_containing(branch)[0]
2063
3295
branch2 = Branch.open_containing(other)[0]
2064
2065
history_1 = branch1.revision_history()
2066
history_2 = branch2.revision_history()
2067
2068
last1 = branch1.last_revision()
2069
last2 = branch2.last_revision()
2070
2071
source = MultipleRevisionSources(branch1.repository,
2072
branch2.repository)
2073
2074
base_rev_id = common_ancestor(last1, last2, source)
2075
2076
print 'merge base is revision %s' % base_rev_id
3296
branch1.lock_read()
3297
try:
3298
branch2.lock_read()
3299
try:
3300
last1 = ensure_null(branch1.last_revision())
3301
last2 = ensure_null(branch2.last_revision())
3302
3303
graph = branch1.repository.get_graph(branch2.repository)
3304
base_rev_id = graph.find_unique_lca(last1, last2)
3305
3306
print 'merge base is revision %s' % base_rev_id
3307
finally:
3308
branch2.unlock()
3309
finally:
3310
branch1.unlock()
2077
3311
2078
3312
2079
3313
class cmd_merge(Command):
2080
3314
"""Perform a three-way merge.
2081
2082
The branch is the branch you will merge from. By default, it will merge
2083
the latest revision. If you specify a revision, that revision will be
2084
merged. If you specify two revisions, the first will be used as a BASE,
2085
and the second one as OTHER. Revision numbers are always relative to the
2086
specified branch.
3315
3316
The source of the merge can be specified either in the form of a branch,
3317
or in the form of a path to a file containing a merge directive generated
3318
with bzr send. If neither is specified, the default is the upstream branch
3319
or the branch most recently merged using --remember.
3320
3321
When merging a branch, by default the tip will be merged. To pick a different
3322
revision, pass --revision. If you specify two values, the first will be used as
3323
BASE and the second one as OTHER. Merging individual revisions, or a subset of
3324
available revisions, like this is commonly referred to as "cherrypicking".
3325
3326
Revision numbers are always relative to the branch being merged.
2087
3327
2088
3328
By default, bzr will try to merge in all new work from the other
2089
3329
branch, automatically determining an appropriate base. If this
2090
3330
fails, you may need to give an explicit base.
2091
3331
2092
3332
Merge will do its best to combine the changes in two branches, but there
2093
3333
are some kinds of problems only a human can fix. When it encounters those,
2094
3334
it will mark a conflict. A conflict means that you need to fix something,
2101
3341
default, use --remember. The value will only be saved if the remote
2102
3342
location can be accessed.
2103
3343
2104
Examples:
2105
2106
To merge the latest revision from bzr.dev
2107
bzr merge ../bzr.dev
2108
2109
To merge changes up to and including revision 82 from bzr.dev
2110
bzr merge -r 82 ../bzr.dev
2111
2112
To merge the changes introduced by 82, without previous changes:
2113
bzr merge -r 81..82 ../bzr.dev
2114
3344
The results of the merge are placed into the destination working
3345
directory, where they can be reviewed (with bzr diff), tested, and then
3346
committed to record the result of the merge.
3347
2115
3348
merge refuses to run if there are any uncommitted changes, unless
2116
3349
--force is given.
2117
3350
2118
The following merge types are available:
3351
:Examples:
3352
To merge the latest revision from bzr.dev::
3353
3354
bzr merge ../bzr.dev
3355
3356
To merge changes up to and including revision 82 from bzr.dev::
3357
3358
bzr merge -r 82 ../bzr.dev
3359
3360
To merge the changes introduced by 82, without previous changes::
3361
3362
bzr merge -r 81..82 ../bzr.dev
3363
3364
To apply a merge directive contained in in /tmp/merge:
3365
3366
bzr merge /tmp/merge
2119
3367
"""
2120
takes_args = ['branch?']
2121
takes_options = ['revision', 'force', 'merge-type', 'reprocess', 'remember',
2122
Option('show-base', help="Show base revision text in "
2123
"conflicts"),
2124
Option('uncommitted', help='Apply uncommitted changes'
2125
' from a working copy, instead of branch changes')]
2126
2127
def help(self):
2128
from merge import merge_type_help
2129
from inspect import getdoc
2130
return getdoc(self) + '\n' + merge_type_help()
2131
2132
def run(self, branch=None, revision=None, force=False, merge_type=None,
2133
show_base=False, reprocess=False, remember=False,
2134
uncommitted=False):
3368
3369
encoding_type = 'exact'
3370
_see_also = ['update', 'remerge', 'status-flags', 'send']
3371
takes_args = ['location?']
3372
takes_options = [
3373
'change',
3374
'revision',
3375
Option('force',
3376
help='Merge even if the destination tree has uncommitted changes.'),
3377
'merge-type',
3378
'reprocess',
3379
'remember',
3380
Option('show-base', help="Show base revision text in "
3381
"conflicts."),
3382
Option('uncommitted', help='Apply uncommitted changes'
3383
' from a working copy, instead of branch changes.'),
3384
Option('pull', help='If the destination is already'
3385
' completely merged into the source, pull from the'
3386
' source rather than merging. When this happens,'
3387
' you do not need to commit the result.'),
3388
Option('directory',
3389
help='Branch to merge into, '
3390
'rather than the one containing the working directory.',
3391
short_name='d',
3392
type=unicode,
3393
),
3394
Option('preview', help='Instead of merging, show a diff of the merge.')
3395
]
3396
3397
def run(self, location=None, revision=None, force=False,
3398
merge_type=None, show_base=False, reprocess=None, remember=False,
3399
uncommitted=False, pull=False,
3400
directory=None,
3401
preview=False,
3402
):
2135
3403
if merge_type is None:
2136
merge_type = Merge3Merger
2137
2138
tree = WorkingTree.open_containing(u'.')[0]
2139
2140
if branch is not None:
2141
try:
2142
reader = bundle.read_bundle_from_url(branch)
2143
except NotABundle:
2144
pass # Continue on considering this url a Branch
2145
else:
2146
conflicts = merge_bundle(reader, tree, not force, merge_type,
2147
reprocess, show_base)
2148
if conflicts == 0:
2149
return 0
3404
merge_type = _mod_merge.Merge3Merger
3405
3406
if directory is None: directory = u'.'
3407
possible_transports = []
3408
merger = None
3409
allow_pending = True
3410
verified = 'inapplicable'
3411
tree = WorkingTree.open_containing(directory)[0]
3412
3413
# die as quickly as possible if there are uncommitted changes
3414
try:
3415
basis_tree = tree.revision_tree(tree.last_revision())
3416
except errors.NoSuchRevision:
3417
basis_tree = tree.basis_tree()
3418
if not force:
3419
changes = tree.changes_from(basis_tree)
3420
if changes.has_changed():
3421
raise errors.UncommittedChanges(tree)
3422
3423
view_info = _get_view_info_for_change_reporter(tree)
3424
change_reporter = delta._ChangeReporter(
3425
unversioned_filter=tree.is_ignored, view_info=view_info)
3426
cleanups = []
3427
try:
3428
pb = ui.ui_factory.nested_progress_bar()
3429
cleanups.append(pb.finished)
3430
tree.lock_write()
3431
cleanups.append(tree.unlock)
3432
if location is not None:
3433
try:
3434
mergeable = bundle.read_mergeable_from_url(location,
3435
possible_transports=possible_transports)
3436
except errors.NotABundle:
3437
mergeable = None
2150
3438
else:
2151
return 1
2152
2153
if revision is None \
2154
or len(revision) < 1 or revision[0].needs_branch():
2155
branch = self._get_remembered_parent(tree, branch, 'Merging from')
2156
2157
if revision is None or len(revision) < 1:
2158
if uncommitted:
2159
base = [branch, -1]
2160
other = [branch, None]
2161
else:
2162
base = [None, None]
2163
other = [branch, -1]
2164
other_branch, path = Branch.open_containing(branch)
2165
else:
2166
if uncommitted:
2167
raise BzrCommandError('Cannot use --uncommitted and --revision'
2168
' at the same time.')
2169
branch = revision[0].get_branch() or branch
2170
if len(revision) == 1:
2171
base = [None, None]
2172
other_branch, path = Branch.open_containing(branch)
2173
revno = revision[0].in_history(other_branch).revno
2174
other = [branch, revno]
2175
else:
2176
assert len(revision) == 2
2177
if None in revision:
2178
raise BzrCommandError(
2179
"Merge doesn't permit empty revision specifier.")
2180
base_branch, path = Branch.open_containing(branch)
2181
branch1 = revision[1].get_branch() or branch
2182
other_branch, path1 = Branch.open_containing(branch1)
2183
if revision[0].get_branch() is not None:
2184
# then path was obtained from it, and is None.
2185
path = path1
2186
2187
base = [branch, revision[0].in_history(base_branch).revno]
2188
other = [branch1, revision[1].in_history(other_branch).revno]
2189
2190
if tree.branch.get_parent() is None or remember:
2191
tree.branch.set_parent(other_branch.base)
2192
2193
if path != "":
2194
interesting_files = [path]
2195
else:
2196
interesting_files = None
2197
pb = ui.ui_factory.nested_progress_bar()
2198
try:
2199
try:
2200
conflict_count = merge(other, base, check_clean=(not force),
2201
merge_type=merge_type,
2202
reprocess=reprocess,
2203
show_base=show_base,
2204
pb=pb, file_list=interesting_files)
2205
finally:
2206
pb.finished()
2207
if conflict_count != 0:
2208
return 1
2209
else:
3439
if uncommitted:
3440
raise errors.BzrCommandError('Cannot use --uncommitted'
3441
' with bundles or merge directives.')
3442
3443
if revision is not None:
3444
raise errors.BzrCommandError(
3445
'Cannot use -r with merge directives or bundles')
3446
merger, verified = _mod_merge.Merger.from_mergeable(tree,
3447
mergeable, pb)
3448
3449
if merger is None and uncommitted:
3450
if revision is not None and len(revision) > 0:
3451
raise errors.BzrCommandError('Cannot use --uncommitted and'
3452
' --revision at the same time.')
3453
location = self._select_branch_location(tree, location)[0]
3454
other_tree, other_path = WorkingTree.open_containing(location)
3455
merger = _mod_merge.Merger.from_uncommitted(tree, other_tree,
3456
pb)
3457
allow_pending = False
3458
if other_path != '':
3459
merger.interesting_files = [other_path]
3460
3461
if merger is None:
3462
merger, allow_pending = self._get_merger_from_branch(tree,
3463
location, revision, remember, possible_transports, pb)
3464
3465
merger.merge_type = merge_type
3466
merger.reprocess = reprocess
3467
merger.show_base = show_base
3468
self.sanity_check_merger(merger)
3469
if (merger.base_rev_id == merger.other_rev_id and
3470
merger.other_rev_id is not None):
3471
note('Nothing to do.')
2210
3472
return 0
2211
except errors.AmbiguousBase, e:
2212
m = ("sorry, bzr can't determine the right merge base yet\n"
2213
"candidates are:\n "
2214
+ "\n ".join(e.bases)
2215
+ "\n"
2216
"please specify an explicit base with -r,\n"
2217
"and (if you want) report this to the bzr developers\n")
2218
log_error(m)
2219
2220
# TODO: move up to common parent; this isn't merge-specific anymore.
2221
def _get_remembered_parent(self, tree, supplied_location, verb_string):
3473
if pull:
3474
if merger.interesting_files is not None:
3475
raise errors.BzrCommandError('Cannot pull individual files')
3476
if (merger.base_rev_id == tree.last_revision()):
3477
result = tree.pull(merger.other_branch, False,
3478
merger.other_rev_id)
3479
result.report(self.outf)
3480
return 0
3481
merger.check_basis(False)
3482
if preview:
3483
return self._do_preview(merger)
3484
else:
3485
return self._do_merge(merger, change_reporter, allow_pending,
3486
verified)
3487
finally:
3488
for cleanup in reversed(cleanups):
3489
cleanup()
3490
3491
def _do_preview(self, merger):
3492
from bzrlib.diff import show_diff_trees
3493
tree_merger = merger.make_merger()
3494
tt = tree_merger.make_preview_transform()
3495
try:
3496
result_tree = tt.get_preview_tree()
3497
show_diff_trees(merger.this_tree, result_tree, self.outf,
3498
old_label='', new_label='')
3499
finally:
3500
tt.finalize()
3501
3502
def _do_merge(self, merger, change_reporter, allow_pending, verified):
3503
merger.change_reporter = change_reporter
3504
conflict_count = merger.do_merge()
3505
if allow_pending:
3506
merger.set_pending()
3507
if verified == 'failed':
3508
warning('Preview patch does not match changes')
3509
if conflict_count != 0:
3510
return 1
3511
else:
3512
return 0
3513
3514
def sanity_check_merger(self, merger):
3515
if (merger.show_base and
3516
not merger.merge_type is _mod_merge.Merge3Merger):
3517
raise errors.BzrCommandError("Show-base is not supported for this"
3518
" merge type. %s" % merger.merge_type)
3519
if merger.reprocess is None:
3520
if merger.show_base:
3521
merger.reprocess = False
3522
else:
3523
# Use reprocess if the merger supports it
3524
merger.reprocess = merger.merge_type.supports_reprocess
3525
if merger.reprocess and not merger.merge_type.supports_reprocess:
3526
raise errors.BzrCommandError("Conflict reduction is not supported"
3527
" for merge type %s." %
3528
merger.merge_type)
3529
if merger.reprocess and merger.show_base:
3530
raise errors.BzrCommandError("Cannot do conflict reduction and"
3531
" show base.")
3532
3533
def _get_merger_from_branch(self, tree, location, revision, remember,
3534
possible_transports, pb):
3535
"""Produce a merger from a location, assuming it refers to a branch."""
3536
from bzrlib.tag import _merge_tags_if_possible
3537
# find the branch locations
3538
other_loc, user_location = self._select_branch_location(tree, location,
3539
revision, -1)
3540
if revision is not None and len(revision) == 2:
3541
base_loc, _unused = self._select_branch_location(tree,
3542
location, revision, 0)
3543
else:
3544
base_loc = other_loc
3545
# Open the branches
3546
other_branch, other_path = Branch.open_containing(other_loc,
3547
possible_transports)
3548
if base_loc == other_loc:
3549
base_branch = other_branch
3550
else:
3551
base_branch, base_path = Branch.open_containing(base_loc,
3552
possible_transports)
3553
# Find the revision ids
3554
if revision is None or len(revision) < 1 or revision[-1] is None:
3555
other_revision_id = _mod_revision.ensure_null(
3556
other_branch.last_revision())
3557
else:
3558
other_revision_id = revision[-1].as_revision_id(other_branch)
3559
if (revision is not None and len(revision) == 2
3560
and revision[0] is not None):
3561
base_revision_id = revision[0].as_revision_id(base_branch)
3562
else:
3563
base_revision_id = None
3564
# Remember where we merge from
3565
if ((remember or tree.branch.get_submit_branch() is None) and
3566
user_location is not None):
3567
tree.branch.set_submit_branch(other_branch.base)
3568
_merge_tags_if_possible(other_branch, tree.branch)
3569
merger = _mod_merge.Merger.from_revision_ids(pb, tree,
3570
other_revision_id, base_revision_id, other_branch, base_branch)
3571
if other_path != '':
3572
allow_pending = False
3573
merger.interesting_files = [other_path]
3574
else:
3575
allow_pending = True
3576
return merger, allow_pending
3577
3578
def _select_branch_location(self, tree, user_location, revision=None,
3579
index=None):
3580
"""Select a branch location, according to possible inputs.
3581
3582
If provided, branches from ``revision`` are preferred. (Both
3583
``revision`` and ``index`` must be supplied.)
3584
3585
Otherwise, the ``location`` parameter is used. If it is None, then the
3586
``submit`` or ``parent`` location is used, and a note is printed.
3587
3588
:param tree: The working tree to select a branch for merging into
3589
:param location: The location entered by the user
3590
:param revision: The revision parameter to the command
3591
:param index: The index to use for the revision parameter. Negative
3592
indices are permitted.
3593
:return: (selected_location, user_location). The default location
3594
will be the user-entered location.
3595
"""
3596
if (revision is not None and index is not None
3597
and revision[index] is not None):
3598
branch = revision[index].get_branch()
3599
if branch is not None:
3600
return branch, branch
3601
if user_location is None:
3602
location = self._get_remembered(tree, 'Merging from')
3603
else:
3604
location = user_location
3605
return location, user_location
3606
3607
def _get_remembered(self, tree, verb_string):
2222
3608
"""Use tree.branch's parent if none was supplied.
2223
3609
2224
3610
Report if the remembered location was used.
2225
3611
"""
2226
if supplied_location is not None:
2227
return supplied_location
2228
stored_location = tree.branch.get_parent()
3612
stored_location = tree.branch.get_submit_branch()
3613
stored_location_type = "submit"
3614
if stored_location is None:
3615
stored_location = tree.branch.get_parent()
3616
stored_location_type = "parent"
2229
3617
mutter("%s", stored_location)
2230
3618
if stored_location is None:
2231
raise BzrCommandError("No location specified or remembered")
2232
display_url = urlutils.unescape_for_display(stored_location, self.outf.encoding)
2233
self.outf.write("%s remembered location %s\n" % (verb_string, display_url))
3619
raise errors.BzrCommandError("No location specified or remembered")
3620
display_url = urlutils.unescape_for_display(stored_location, 'utf-8')
3621
note(u"%s remembered %s location %s", verb_string,
3622
stored_location_type, display_url)
2234
3623
return stored_location
2235
3624
2236
3625
2238
3627
"""Redo a merge.
2239
3628
2240
3629
Use this if you want to try a different merge technique while resolving
2241
conflicts. Some merge techniques are better than others, and remerge
3630
conflicts. Some merge techniques are better than others, and remerge
2242
3631
lets you try different ones on different files.
2243
3632
2244
3633
The options for remerge have the same meaning and defaults as the ones for
2245
3634
merge. The difference is that remerge can (only) be run when there is a
2246
3635
pending merge, and it lets you specify particular files.
2247
3636
2248
Examples:
2249
$ bzr remerge --show-base
3637
:Examples:
2250
3638
Re-do the merge of all conflicted files, and show the base text in
2251
conflict regions, in addition to the usual THIS and OTHER texts.
2252
2253
$ bzr remerge --merge-type weave --reprocess foobar
3639
conflict regions, in addition to the usual THIS and OTHER texts::
3640
3641
bzr remerge --show-base
3642
2254
3643
Re-do the merge of "foobar", using the weave merge algorithm, with
2255
additional processing to reduce the size of conflict regions.
2256
2257
The following merge types are available:"""
3644
additional processing to reduce the size of conflict regions::
3645
3646
bzr remerge --merge-type weave --reprocess foobar
3647
"""
2258
3648
takes_args = ['file*']
2259
takes_options = ['merge-type', 'reprocess',
2260
Option('show-base', help="Show base revision text in "
2261
"conflicts")]
2262
2263
def help(self):
2264
from merge import merge_type_help
2265
from inspect import getdoc
2266
return getdoc(self) + '\n' + merge_type_help()
3649
takes_options = [
3650
'merge-type',
3651
'reprocess',
3652
Option('show-base',
3653
help="Show base revision text in conflicts."),
3654
]
2267
3655
2268
3656
def run(self, file_list=None, merge_type=None, show_base=False,
2269
3657
reprocess=False):
2270
from bzrlib.merge import merge_inner, transform_tree
2271
3658
if merge_type is None:
2272
merge_type = Merge3Merger
3659
merge_type = _mod_merge.Merge3Merger
2273
3660
tree, file_list = tree_files(file_list)
2274
3661
tree.lock_write()
2275
3662
try:
2276
3663
parents = tree.get_parent_ids()
2277
3664
if len(parents) != 2:
2278
raise BzrCommandError("Sorry, remerge only works after normal"
2279
" merges. Not cherrypicking or"
2280
" multi-merges.")
3665
raise errors.BzrCommandError("Sorry, remerge only works after normal"
3666
" merges. Not cherrypicking or"
3667
" multi-merges.")
2281
3668
repository = tree.branch.repository
2282
base_revision = common_ancestor(parents[0],
2283
parents[1], repository)
2284
base_tree = repository.revision_tree(base_revision)
2285
other_tree = repository.revision_tree(parents[1])
2286
3669
interesting_ids = None
2287
3670
new_conflicts = []
2288
3671
conflicts = tree.conflicts()
2291
3674
for filename in file_list:
2292
3675
file_id = tree.path2id(filename)
2293
3676
if file_id is None:
2294
raise NotVersionedError(filename)
3677
raise errors.NotVersionedError(filename)
2295
3678
interesting_ids.add(file_id)
2296
3679
if tree.kind(file_id) != "directory":
2297
3680
continue
2298
3681
2299
3682
for name, ie in tree.inventory.iter_entries(file_id):
2300
3683
interesting_ids.add(ie.file_id)
2301
3684
new_conflicts = conflicts.select_conflicts(tree, file_list)[0]
2302
transform_tree(tree, tree.basis_tree(), interesting_ids)
3685
else:
3686
# Remerge only supports resolving contents conflicts
3687
allowed_conflicts = ('text conflict', 'contents conflict')
3688
restore_files = [c.path for c in conflicts
3689
if c.typestring in allowed_conflicts]
3690
_mod_merge.transform_tree(tree, tree.basis_tree(), interesting_ids)
2303
3691
tree.set_conflicts(ConflictList(new_conflicts))
2304
if file_list is None:
2305
restore_files = list(tree.iter_conflicts())
2306
else:
3692
if file_list is not None:
2307
3693
restore_files = file_list
2308
3694
for filename in restore_files:
2309
3695
try:
2310
3696
restore(tree.abspath(filename))
2311
except NotConflicted:
3697
except errors.NotConflicted:
2312
3698
pass
2313
conflicts = merge_inner(tree.branch, other_tree, base_tree,
2314
this_tree=tree,
2315
interesting_ids=interesting_ids,
2316
other_rev_id=parents[1],
2317
merge_type=merge_type,
2318
show_base=show_base,
2319
reprocess=reprocess)
3699
# Disable pending merges, because the file texts we are remerging
3700
# have not had those merges performed. If we use the wrong parents
3701
# list, we imply that the working tree text has seen and rejected
3702
# all the changes from the other tree, when in fact those changes
3703
# have not yet been seen.
3704
pb = ui.ui_factory.nested_progress_bar()
3705
tree.set_parent_ids(parents[:1])
3706
try:
3707
merger = _mod_merge.Merger.from_revision_ids(pb,
3708
tree, parents[1])
3709
merger.interesting_ids = interesting_ids
3710
merger.merge_type = merge_type
3711
merger.show_base = show_base
3712
merger.reprocess = reprocess
3713
conflicts = merger.do_merge()
3714
finally:
3715
tree.set_parent_ids(parents)
3716
pb.finished()
2320
3717
finally:
2321
3718
tree.unlock()
2322
3719
if conflicts > 0:
2324
3721
else:
2325
3722
return 0
2326
3723
3724
2327
3725
class cmd_revert(Command):
2328
"""Reverse all changes since the last commit.
2329
2330
Only versioned files are affected. Specify filenames to revert only
2331
those files. By default, any files that are changed will be backed up
2332
first. Backup files have a '~' appended to their name.
3726
"""Revert files to a previous revision.
3727
3728
Giving a list of files will revert only those files. Otherwise, all files
3729
will be reverted. If the revision is not specified with '--revision', the
3730
last committed revision is used.
3731
3732
To remove only some changes, without reverting to a prior version, use
3733
merge instead. For example, "merge . --revision -2..-3" will remove the
3734
changes introduced by -2, without affecting the changes introduced by -1.
3735
Or to remove certain changes on a hunk-by-hunk basis, see the Shelf plugin.
3736
3737
By default, any files that have been manually changed will be backed up
3738
first. (Files changed only by merge are not backed up.) Backup files have
3739
'.~#~' appended to their name, where # is a number.
3740
3741
When you provide files, you can use their current pathname or the pathname
3742
from the target revision. So you can use revert to "undelete" a file by
3743
name. If you name a directory, all the contents of that directory will be
3744
reverted.
3745
3746
Any files that have been newly added since that revision will be deleted,
3747
with a backup kept if appropriate. Directories containing unknown files
3748
will not be deleted.
3749
3750
The working tree contains a list of pending merged revisions, which will
3751
be included as parents in the next commit. Normally, revert clears that
3752
list as well as reverting the files. If any files are specified, revert
3753
leaves the pending merge list alone and reverts only the files. Use "bzr
3754
revert ." in the tree root to revert all files but keep the merge record,
3755
and "bzr revert --forget-merges" to clear the pending merge list without
3756
reverting any files.
2333
3757
"""
2334
takes_options = ['revision', 'no-backup']
3758
3759
_see_also = ['cat', 'export']
3760
takes_options = [
3761
'revision',
3762
Option('no-backup', "Do not save backups of reverted files."),
3763
Option('forget-merges',
3764
'Remove pending merge marker, without changing any files.'),
3765
]
2335
3766
takes_args = ['file*']
2336
aliases = ['merge-revert']
2337
3767
2338
def run(self, revision=None, no_backup=False, file_list=None):
2339
from bzrlib.commands import parse_spec
2340
if file_list is not None:
2341
if len(file_list) == 0:
2342
raise BzrCommandError("No files specified")
2343
else:
2344
file_list = []
2345
3768
def run(self, revision=None, no_backup=False, file_list=None,
3769
forget_merges=None):
2346
3770
tree, file_list = tree_files(file_list)
2347
if revision is None:
2348
# FIXME should be tree.last_revision
2349
rev_id = tree.last_revision()
2350
elif len(revision) != 1:
2351
raise BzrCommandError('bzr revert --revision takes exactly 1 argument')
2352
else:
2353
rev_id = revision[0].in_history(tree.branch).rev_id
3771
tree.lock_write()
3772
try:
3773
if forget_merges:
3774
tree.set_parent_ids(tree.get_parent_ids()[:1])
3775
else:
3776
self._revert_tree_to_revision(tree, revision, file_list, no_backup)
3777
finally:
3778
tree.unlock()
3779
3780
@staticmethod
3781
def _revert_tree_to_revision(tree, revision, file_list, no_backup):
3782
rev_tree = _get_one_revision_tree('revert', revision, tree=tree)
2354
3783
pb = ui.ui_factory.nested_progress_bar()
2355
3784
try:
2356
tree.revert(file_list,
2357
tree.branch.repository.revision_tree(rev_id),
2358
not no_backup, pb)
3785
tree.revert(file_list, rev_tree, not no_backup, pb,
3786
report_changes=True)
2359
3787
finally:
2360
3788
pb.finished()
2361
3789
2362
3790
2363
3791
class cmd_assert_fail(Command):
2364
3792
"""Test reporting of assertion failures"""
3793
# intended just for use in testing
3794
2365
3795
hidden = True
3796
2366
3797
def run(self):
2367
assert False, "always fails"
3798
raise AssertionError("always fails")
2368
3799
2369
3800
2370
3801
class cmd_help(Command):
2371
3802
"""Show help on a command or other topic.
3803
"""
2372
3804
2373
For a list of all available commands, say 'bzr help commands'."""
2374
takes_options = [Option('long', 'show help on all commands')]
3805
_see_also = ['topics']
3806
takes_options = [
3807
Option('long', 'Show help on all commands.'),
3808
]
2375
3809
takes_args = ['topic?']
2376
3810
aliases = ['?', '--help', '-?', '-h']
2377
3811
2378
3812
@display_command
2379
3813
def run(self, topic=None, long=False):
2380
import help
3814
import bzrlib.help
2381
3815
if topic is None and long:
2382
3816
topic = "commands"
2383
help.help(topic)
3817
bzrlib.help.help(topic)
2384
3818
2385
3819
2386
3820
class cmd_shell_complete(Command):
2387
3821
"""Show appropriate completions for context.
2388
3822
2389
For a list of all available commands, say 'bzr shell-complete'."""
3823
For a list of all available commands, say 'bzr shell-complete'.
3824
"""
2390
3825
takes_args = ['context?']
2391
3826
aliases = ['s-c']
2392
3827
hidden = True
2393
3828
2394
3829
@display_command
2395
3830
def run(self, context=None):
2396
3831
import shellcomplete
2397
3832
shellcomplete.shellcomplete(context)
2398
3833
2399
3834
2400
class cmd_fetch(Command):
2401
"""Copy in history from another branch but don't merge it.
2402
2403
This is an internal method used for pull and merge."""
2404
hidden = True
2405
takes_args = ['from_branch', 'to_branch']
2406
def run(self, from_branch, to_branch):
2407
from bzrlib.fetch import Fetcher
2408
from_b = Branch.open(from_branch)
2409
to_b = Branch.open(to_branch)
2410
Fetcher(to_b, from_b)
2411
2412
2413
3835
class cmd_missing(Command):
2414
3836
"""Show unmerged/unpulled revisions between two branches.
2415
3837
2416
OTHER_BRANCH may be local or remote."""
3838
OTHER_BRANCH may be local or remote.
3839
3840
To filter on a range of revisions, you can use the command -r begin..end
3841
-r revision requests a specific revision, -r ..end or -r begin.. are
3842
also valid.
3843
3844
:Examples:
3845
3846
Determine the missing revisions between this and the branch at the
3847
remembered pull location::
3848
3849
bzr missing
3850
3851
Determine the missing revisions between this and another branch::
3852
3853
bzr missing http://server/branch
3854
3855
Determine the missing revisions up to a specific revision on the other
3856
branch::
3857
3858
bzr missing -r ..-10
3859
3860
Determine the missing revisions up to a specific revision on this
3861
branch::
3862
3863
bzr missing --my-revision ..-10
3864
"""
3865
3866
_see_also = ['merge', 'pull']
2417
3867
takes_args = ['other_branch?']
2418
takes_options = [Option('reverse', 'Reverse the order of revisions'),
2419
Option('mine-only',
2420
'Display changes in the local branch only'),
2421
Option('theirs-only',
2422
'Display changes in the remote branch only'),
2423
'log-format',
2424
'line',
2425
'long',
2426
'short',
2427
'show-ids',
2428
'verbose'
2429
]
3868
takes_options = [
3869
Option('reverse', 'Reverse the order of revisions.'),
3870
Option('mine-only',
3871
'Display changes in the local branch only.'),
3872
Option('this' , 'Same as --mine-only.'),
3873
Option('theirs-only',
3874
'Display changes in the remote branch only.'),
3875
Option('other', 'Same as --theirs-only.'),
3876
'log-format',
3877
'show-ids',
3878
'verbose',
3879
custom_help('revision',
3880
help='Filter on other branch revisions (inclusive). '
3881
'See "help revisionspec" for details.'),
3882
Option('my-revision',
3883
type=_parse_revision_str,
3884
help='Filter on local branch revisions (inclusive). '
3885
'See "help revisionspec" for details.'),
3886
Option('include-merges', 'Show merged revisions.'),
3887
]
2430
3888
encoding_type = 'replace'
2431
3889
2432
3890
@display_command
2433
3891
def run(self, other_branch=None, reverse=False, mine_only=False,
2434
theirs_only=False, log_format=None, long=False, short=False, line=False,
2435
show_ids=False, verbose=False):
2436
from bzrlib.missing import find_unmerged, iter_log_data
2437
from bzrlib.log import log_formatter
3892
theirs_only=False,
3893
log_format=None, long=False, short=False, line=False,
3894
show_ids=False, verbose=False, this=False, other=False,
3895
include_merges=False, revision=None, my_revision=None):
3896
from bzrlib.missing import find_unmerged, iter_log_revisions
3897
def message(s):
3898
if not is_quiet():
3899
self.outf.write(s)
3900
3901
if this:
3902
mine_only = this
3903
if other:
3904
theirs_only = other
3905
# TODO: We should probably check that we don't have mine-only and
3906
# theirs-only set, but it gets complicated because we also have
3907
# this and other which could be used.
3908
restrict = 'all'
3909
if mine_only:
3910
restrict = 'local'
3911
elif theirs_only:
3912
restrict = 'remote'
3913
2438
3914
local_branch = Branch.open_containing(u".")[0]
2439
3915
parent = local_branch.get_parent()
2440
3916
if other_branch is None:
2441
3917
other_branch = parent
2442
3918
if other_branch is None:
2443
raise BzrCommandError("No peer location known or specified.")
2444
print "Using last location: " + local_branch.get_parent()
3919
raise errors.BzrCommandError("No peer location known"
3920
" or specified.")
3921
display_url = urlutils.unescape_for_display(parent,
3922
self.outf.encoding)
3923
message("Using saved parent location: "
3924
+ display_url + "\n")
3925
2445
3926
remote_branch = Branch.open(other_branch)
2446
3927
if remote_branch.base == local_branch.base:
2447
3928
remote_branch = local_branch
3929
3930
local_revid_range = _revision_range_to_revid_range(
3931
_get_revision_range(my_revision, local_branch,
3932
self.name()))
3933
3934
remote_revid_range = _revision_range_to_revid_range(
3935
_get_revision_range(revision,
3936
remote_branch, self.name()))
3937
2448
3938
local_branch.lock_read()
2449
3939
try:
2450
3940
remote_branch.lock_read()
2451
3941
try:
2452
local_extra, remote_extra = find_unmerged(local_branch, remote_branch)
2453
if (log_format is None):
2454
default = local_branch.get_config().log_format()
2455
log_format = get_log_format(long=long, short=short,
2456
line=line, default=default)
2457
lf = log_formatter(log_format,
2458
to_file=self.outf,
2459
show_ids=show_ids,
2460
show_timezone='original')
2461
if reverse is False:
2462
local_extra.reverse()
2463
remote_extra.reverse()
3942
local_extra, remote_extra = find_unmerged(
3943
local_branch, remote_branch, restrict,
3944
backward=not reverse,
3945
include_merges=include_merges,
3946
local_revid_range=local_revid_range,
3947
remote_revid_range=remote_revid_range)
3948
3949
if log_format is None:
3950
registry = log.log_formatter_registry
3951
log_format = registry.get_default(local_branch)
3952
lf = log_format(to_file=self.outf,
3953
show_ids=show_ids,
3954
show_timezone='original')
3955
3956
status_code = 0
2464
3957
if local_extra and not theirs_only:
2465
print "You have %d extra revision(s):" % len(local_extra)
2466
for data in iter_log_data(local_extra, local_branch.repository,
2467
verbose):
2468
lf.show(*data)
3958
message("You have %d extra revision(s):\n" %
3959
len(local_extra))
3960
for revision in iter_log_revisions(local_extra,
3961
local_branch.repository,
3962
verbose):
3963
lf.log_revision(revision)
2469
3964
printed_local = True
3965
status_code = 1
2470
3966
else:
2471
3967
printed_local = False
3968
2472
3969
if remote_extra and not mine_only:
2473
3970
if printed_local is True:
2474
print "\n\n"
2475
print "You are missing %d revision(s):" % len(remote_extra)
2476
for data in iter_log_data(remote_extra, remote_branch.repository,
2477
verbose):
2478
lf.show(*data)
2479
if not remote_extra and not local_extra:
2480
status_code = 0
2481
print "Branches are up to date."
2482
else:
3971
message("\n\n\n")
3972
message("You are missing %d revision(s):\n" %
3973
len(remote_extra))
3974
for revision in iter_log_revisions(remote_extra,
3975
remote_branch.repository,
3976
verbose):
3977
lf.log_revision(revision)
2483
3978
status_code = 1
3979
3980
if mine_only and not local_extra:
3981
# We checked local, and found nothing extra
3982
message('This branch is up to date.\n')
3983
elif theirs_only and not remote_extra:
3984
# We checked remote, and found nothing extra
3985
message('Other branch is up to date.\n')
3986
elif not (mine_only or theirs_only or local_extra or
3987
remote_extra):
3988
# We checked both branches, and neither one had extra
3989
# revisions
3990
message("Branches are up to date.\n")
2484
3991
finally:
2485
3992
remote_branch.unlock()
2486
3993
finally:
2496
4003
return status_code
2497
4004
2498
4005
4006
class cmd_pack(Command):
4007
"""Compress the data within a repository."""
4008
4009
_see_also = ['repositories']
4010
takes_args = ['branch_or_repo?']
4011
4012
def run(self, branch_or_repo='.'):
4013
dir = bzrdir.BzrDir.open_containing(branch_or_repo)[0]
4014
try:
4015
branch = dir.open_branch()
4016
repository = branch.repository
4017
except errors.NotBranchError:
4018
repository = dir.open_repository()
4019
repository.pack()
4020
4021
2499
4022
class cmd_plugins(Command):
2500
"""List plugins"""
2501
hidden = True
4023
"""List the installed plugins.
4024
4025
This command displays the list of installed plugins including
4026
version of plugin and a short description of each.
4027
4028
--verbose shows the path where each plugin is located.
4029
4030
A plugin is an external component for Bazaar that extends the
4031
revision control system, by adding or replacing code in Bazaar.
4032
Plugins can do a variety of things, including overriding commands,
4033
adding new commands, providing additional network transports and
4034
customizing log output.
4035
4036
See the Bazaar web site, http://bazaar-vcs.org, for further
4037
information on plugins including where to find them and how to
4038
install them. Instructions are also provided there on how to
4039
write new plugins using the Python programming language.
4040
"""
4041
takes_options = ['verbose']
4042
2502
4043
@display_command
2503
def run(self):
4044
def run(self, verbose=False):
2504
4045
import bzrlib.plugin
2505
4046
from inspect import getdoc
2506
for name, plugin in bzrlib.plugin.all_plugins().items():
2507
if getattr(plugin, '__path__', None) is not None:
2508
print plugin.__path__[0]
2509
elif getattr(plugin, '__file__', None) is not None:
2510
print plugin.__file__
2511
else:
2512
print repr(plugin)
2513
2514
d = getdoc(plugin)
4047
result = []
4048
for name, plugin in bzrlib.plugin.plugins().items():
4049
version = plugin.__version__
4050
if version == 'unknown':
4051
version = ''
4052
name_ver = '%s %s' % (name, version)
4053
d = getdoc(plugin.module)
2515
4054
if d:
2516
print '\t', d.split('\n')[0]
4055
doc = d.split('\n')[0]
4056
else:
4057
doc = '(no description)'
4058
result.append((name_ver, doc, plugin.path()))
4059
for name_ver, doc, path in sorted(result):
4060
print name_ver
4061
print ' ', doc
4062
if verbose:
4063
print ' ', path
4064
print
2517
4065
2518
4066
2519
4067
class cmd_testament(Command):
2520
4068
"""Show testament (signing-form) of a revision."""
2521
takes_options = ['revision',
2522
Option('long', help='Produce long-format testament'),
2523
Option('strict', help='Produce a strict-format'
2524
' testament')]
4069
takes_options = [
4070
'revision',
4071
Option('long', help='Produce long-format testament.'),
4072
Option('strict',
4073
help='Produce a strict-format testament.')]
2525
4074
takes_args = ['branch?']
2526
4075
@display_command
2527
4076
def run(self, branch=u'.', revision=None, long=False, strict=False):
2530
4079
testament_class = StrictTestament
2531
4080
else:
2532
4081
testament_class = Testament
2533
b = WorkingTree.open_containing(branch)[0].branch
4082
if branch == '.':
4083
b = Branch.open_containing(branch)[0]
4084
else:
4085
b = Branch.open(branch)
2534
4086
b.lock_read()
2535
4087
try:
2536
4088
if revision is None:
2537
4089
rev_id = b.last_revision()
2538
4090
else:
2539
rev_id = revision[0].in_history(b).rev_id
4091
rev_id = revision[0].as_revision_id(b)
2540
4092
t = testament_class.from_revision(b.repository, rev_id)
2541
4093
if long:
2542
4094
sys.stdout.writelines(t.as_text_lines())
2552
4104
This prints out the given file with an annotation on the left side
2553
4105
indicating which revision, author and date introduced the change.
2554
4106
2555
If the origin is the same for a run of consecutive lines, it is
4107
If the origin is the same for a run of consecutive lines, it is
2556
4108
shown only at the top, unless the --all option is given.
2557
4109
"""
2558
4110
# TODO: annotate directories; showing when each file was last changed
2559
# TODO: if the working copy is modified, show annotations on that
4111
# TODO: if the working copy is modified, show annotations on that
2560
4112
# with new uncommitted lines marked
2561
4113
aliases = ['ann', 'blame', 'praise']
2562
4114
takes_args = ['filename']
2563
takes_options = [Option('all', help='show annotations on all lines'),
2564
Option('long', help='show date in annotations'),
2565
'revision'
4115
takes_options = [Option('all', help='Show annotations on all lines.'),
4116
Option('long', help='Show commit date in annotations.'),
4117
'revision',
4118
'show-ids',
2566
4119
]
4120
encoding_type = 'exact'
2567
4121
2568
4122
@display_command
2569
def run(self, filename, all=False, long=False, revision=None):
2570
from bzrlib.annotate import annotate_file
2571
tree, relpath = WorkingTree.open_containing(filename)
2572
branch = tree.branch
2573
branch.lock_read()
4123
def run(self, filename, all=False, long=False, revision=None,
4124
show_ids=False):
4125
from bzrlib.annotate import annotate_file, annotate_file_tree
4126
wt, branch, relpath = \
4127
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
4128
if wt is not None:
4129
wt.lock_read()
4130
else:
4131
branch.lock_read()
2574
4132
try:
2575
if revision is None:
2576
revision_id = branch.last_revision()
2577
elif len(revision) != 1:
2578
raise BzrCommandError('bzr annotate --revision takes exactly 1 argument')
4133
tree = _get_one_revision_tree('annotate', revision, branch=branch)
4134
if wt is not None:
4135
file_id = wt.path2id(relpath)
2579
4136
else:
2580
revision_id = revision[0].in_history(branch).rev_id
2581
file_id = tree.inventory.path2id(relpath)
2582
tree = branch.repository.revision_tree(revision_id)
4137
file_id = tree.path2id(relpath)
4138
if file_id is None:
4139
raise errors.NotVersionedError(filename)
2583
4140
file_version = tree.inventory[file_id].revision
2584
annotate_file(branch, file_version, file_id, long, all, sys.stdout)
4141
if wt is not None and revision is None:
4142
# If there is a tree and we're not annotating historical
4143
# versions, annotate the working tree's content.
4144
annotate_file_tree(wt, file_id, self.outf, long, all,
4145
show_ids=show_ids)
4146
else:
4147
annotate_file(branch, file_version, file_id, long, all, self.outf,
4148
show_ids=show_ids)
2585
4149
finally:
2586
branch.unlock()
4150
if wt is not None:
4151
wt.unlock()
4152
else:
4153
branch.unlock()
2587
4154
2588
4155
2589
4156
class cmd_re_sign(Command):
2593
4160
hidden = True # is this right ?
2594
4161
takes_args = ['revision_id*']
2595
4162
takes_options = ['revision']
2596
4163
2597
4164
def run(self, revision_id_list=None, revision=None):
2598
import bzrlib.gpg as gpg
2599
4165
if revision_id_list is not None and revision is not None:
2600
raise BzrCommandError('You can only supply one of revision_id or --revision')
4166
raise errors.BzrCommandError('You can only supply one of revision_id or --revision')
2601
4167
if revision_id_list is None and revision is None:
2602
raise BzrCommandError('You must supply either --revision or a revision_id')
4168
raise errors.BzrCommandError('You must supply either --revision or a revision_id')
2603
4169
b = WorkingTree.open_containing(u'.')[0].branch
4170
b.lock_write()
4171
try:
4172
return self._run(b, revision_id_list, revision)
4173
finally:
4174
b.unlock()
4175
4176
def _run(self, b, revision_id_list, revision):
4177
import bzrlib.gpg as gpg
2604
4178
gpg_strategy = gpg.GPGStrategy(b.get_config())
2605
4179
if revision_id_list is not None:
2606
for revision_id in revision_id_list:
2607
b.repository.sign_revision(revision_id, gpg_strategy)
4180
b.repository.start_write_group()
4181
try:
4182
for revision_id in revision_id_list:
4183
b.repository.sign_revision(revision_id, gpg_strategy)
4184
except:
4185
b.repository.abort_write_group()
4186
raise
4187
else:
4188
b.repository.commit_write_group()
2608
4189
elif revision is not None:
2609
4190
if len(revision) == 1:
2610
4191
revno, rev_id = revision[0].in_history(b)
2611
b.repository.sign_revision(rev_id, gpg_strategy)
4192
b.repository.start_write_group()
4193
try:
4194
b.repository.sign_revision(rev_id, gpg_strategy)
4195
except:
4196
b.repository.abort_write_group()
4197
raise
4198
else:
4199
b.repository.commit_write_group()
2612
4200
elif len(revision) == 2:
2613
4201
# are they both on rh- if so we can walk between them
2614
4202
# might be nice to have a range helper for arbitrary
2618
4206
if to_revid is None:
2619
4207
to_revno = b.revno()
2620
4208
if from_revno is None or to_revno is None:
2621
raise BzrCommandError('Cannot sign a range of non-revision-history revisions')
2622
for revno in range(from_revno, to_revno + 1):
2623
b.repository.sign_revision(b.get_rev_id(revno),
2624
gpg_strategy)
4209
raise errors.BzrCommandError('Cannot sign a range of non-revision-history revisions')
4210
b.repository.start_write_group()
4211
try:
4212
for revno in range(from_revno, to_revno + 1):
4213
b.repository.sign_revision(b.get_rev_id(revno),
4214
gpg_strategy)
4215
except:
4216
b.repository.abort_write_group()
4217
raise
4218
else:
4219
b.repository.commit_write_group()
2625
4220
else:
2626
raise BzrCommandError('Please supply either one revision, or a range.')
4221
raise errors.BzrCommandError('Please supply either one revision, or a range.')
2627
4222
2628
4223
2629
4224
class cmd_bind(Command):
2630
"""Bind the current branch to a master branch.
2631
2632
After binding, commits must succeed on the master branch
2633
before they are executed on the local one.
4225
"""Convert the current branch into a checkout of the supplied branch.
4226
4227
Once converted into a checkout, commits must succeed on the master branch
4228
before they will be applied to the local branch.
4229
4230
Bound branches use the nickname of its master branch unless it is set
4231
locally, in which case binding will update the the local nickname to be
4232
that of the master.
2634
4233
"""
2635
4234
2636
takes_args = ['location']
4235
_see_also = ['checkouts', 'unbind']
4236
takes_args = ['location?']
2637
4237
takes_options = []
2638
4238
2639
4239
def run(self, location=None):
2640
4240
b, relpath = Branch.open_containing(u'.')
4241
if location is None:
4242
try:
4243
location = b.get_old_bound_location()
4244
except errors.UpgradeRequired:
4245
raise errors.BzrCommandError('No location supplied. '
4246
'This format does not remember old locations.')
4247
else:
4248
if location is None:
4249
raise errors.BzrCommandError('No location supplied and no '
4250
'previous location known')
2641
4251
b_other = Branch.open(location)
2642
4252
try:
2643
4253
b.bind(b_other)
2644
except DivergedBranches:
2645
raise BzrCommandError('These branches have diverged.'
2646
' Try merging, and then bind again.')
4254
except errors.DivergedBranches:
4255
raise errors.BzrCommandError('These branches have diverged.'
4256
' Try merging, and then bind again.')
4257
if b.get_config().has_explicit_nickname():
4258
b.nick = b_other.nick
2647
4259
2648
4260
2649
4261
class cmd_unbind(Command):
2650
"""Unbind the current branch from its master branch.
4262
"""Convert the current checkout into a regular branch.
2651
4263
2652
After unbinding, the local branch is considered independent.
2653
All subsequent commits will be local.
4264
After unbinding, the local branch is considered independent and subsequent
4265
commits will be local only.
2654
4266
"""
2655
4267
4268
_see_also = ['checkouts', 'bind']
2656
4269
takes_args = []
2657
4270
takes_options = []
2658
4271
2659
4272
def run(self):
2660
4273
b, relpath = Branch.open_containing(u'.')
2661
4274
if not b.unbind():
2662
raise BzrCommandError('Local branch is not bound')
4275
raise errors.BzrCommandError('Local branch is not bound')
2663
4276
2664
4277
2665
4278
class cmd_uncommit(Command):
2668
4281
--verbose will print out what is being removed.
2669
4282
--dry-run will go through all the motions, but not actually
2670
4283
remove anything.
2671
2672
In the future, uncommit will create a revision bundle, which can then
2673
be re-applied.
4284
4285
If --revision is specified, uncommit revisions to leave the branch at the
4286
specified revision. For example, "bzr uncommit -r 15" will leave the
4287
branch at revision 15.
4288
4289
Uncommit leaves the working tree ready for a new commit. The only change
4290
it may make is to restore any pending merges that were present before
4291
the commit.
2674
4292
"""
2675
4293
2676
4294
# TODO: jam 20060108 Add an option to allow uncommit to remove
2677
4295
# unreferenced information in 'branch-as-repository' branches.
2678
4296
# TODO: jam 20060108 Add the ability for uncommit to remove unreferenced
2679
4297
# information in shared branches as well.
4298
_see_also = ['commit']
2680
4299
takes_options = ['verbose', 'revision',
2681
Option('dry-run', help='Don\'t actually make changes'),
2682
Option('force', help='Say yes to all questions.')]
4300
Option('dry-run', help='Don\'t actually make changes.'),
4301
Option('force', help='Say yes to all questions.'),
4302
Option('local',
4303
help="Only remove the commits from the local branch"
4304
" when in a checkout."
4305
),
4306
]
2683
4307
takes_args = ['location?']
2684
4308
aliases = []
4309
encoding_type = 'replace'
2685
4310
2686
4311
def run(self, location=None,
2687
4312
dry_run=False, verbose=False,
2688
revision=None, force=False):
2689
from bzrlib.log import log_formatter, show_log
2690
import sys
2691
from bzrlib.uncommit import uncommit
2692
4313
revision=None, force=False, local=False):
2693
4314
if location is None:
2694
4315
location = u'.'
2695
4316
control, relpath = bzrdir.BzrDir.open_containing(location)
2700
4321
tree = None
2701
4322
b = control.open_branch()
2702
4323
4324
if tree is not None:
4325
tree.lock_write()
4326
else:
4327
b.lock_write()
4328
try:
4329
return self._run(b, tree, dry_run, verbose, revision, force,
4330
local=local)
4331
finally:
4332
if tree is not None:
4333
tree.unlock()
4334
else:
4335
b.unlock()
4336
4337
def _run(self, b, tree, dry_run, verbose, revision, force, local=False):
4338
from bzrlib.log import log_formatter, show_log
4339
from bzrlib.uncommit import uncommit
4340
4341
last_revno, last_rev_id = b.last_revision_info()
4342
2703
4343
rev_id = None
2704
4344
if revision is None:
2705
revno = b.revno()
4345
revno = last_revno
4346
rev_id = last_rev_id
2706
4347
else:
2707
4348
# 'bzr uncommit -r 10' actually means uncommit
2708
4349
# so that the final tree is at revno 10.
2709
4350
# but bzrlib.uncommit.uncommit() actually uncommits
2710
4351
# the revisions that are supplied.
2711
4352
# So we need to offset it by one
2712
revno = revision[0].in_history(b).revno+1
4353
revno = revision[0].in_history(b).revno + 1
4354
if revno <= last_revno:
4355
rev_id = b.get_rev_id(revno)
2713
4356
2714
if revno <= b.revno():
2715
rev_id = b.get_rev_id(revno)
2716
if rev_id is None:
4357
if rev_id is None or _mod_revision.is_null(rev_id):
2717
4358
self.outf.write('No revisions to uncommit.\n')
2718
4359
return 1
2719
4360
2726
4367
verbose=False,
2727
4368
direction='forward',
2728
4369
start_revision=revno,
2729
end_revision=b.revno())
4370
end_revision=last_revno)
2730
4371
2731
4372
if dry_run:
2732
4373
print 'Dry-run, pretending to remove the above revisions.'
2740
4381
print 'Canceled'
2741
4382
return 0
2742
4383
4384
mutter('Uncommitting from {%s} to {%s}',
4385
last_rev_id, rev_id)
2743
4386
uncommit(b, tree=tree, dry_run=dry_run, verbose=verbose,
2744
revno=revno)
4387
revno=revno, local=local)
4388
note('You can restore the old tip by running:\n'
4389
' bzr pull . -r revid:%s', last_rev_id)
2745
4390
2746
4391
2747
4392
class cmd_break_lock(Command):
2751
4396
holding the lock has been stopped.
2752
4397
2753
4398
You can get information on what locks are open via the 'bzr info' command.
2754
2755
example:
4399
4400
:Examples:
2756
4401
bzr break-lock
2757
4402
"""
2758
4403
takes_args = ['location?']
2765
4410
control.break_lock()
2766
4411
except NotImplementedError:
2767
4412
pass
2768
2769
2770
2771
# command-line interpretation helper for merge-related commands
2772
def merge(other_revision, base_revision,
2773
check_clean=True, ignore_zero=False,
2774
this_dir=None, backup_files=False, merge_type=Merge3Merger,
2775
file_list=None, show_base=False, reprocess=False,
2776
pb=DummyProgress()):
2777
"""Merge changes into a tree.
2778
2779
base_revision
2780
list(path, revno) Base for three-way merge.
2781
If [None, None] then a base will be automatically determined.
2782
other_revision
2783
list(path, revno) Other revision for three-way merge.
2784
this_dir
2785
Directory to merge changes into; '.' by default.
2786
check_clean
2787
If true, this_dir must have no uncommitted changes before the
2788
merge begins.
2789
ignore_zero - If true, suppress the "zero conflicts" message when
2790
there are no conflicts; should be set when doing something we expect
2791
to complete perfectly.
2792
file_list - If supplied, merge only changes to selected files.
2793
2794
All available ancestors of other_revision and base_revision are
2795
automatically pulled into the branch.
2796
2797
The revno may be -1 to indicate the last revision on the branch, which is
2798
the typical case.
2799
2800
This function is intended for use from the command line; programmatic
2801
clients might prefer to call merge.merge_inner(), which has less magic
2802
behavior.
2803
"""
2804
from bzrlib.merge import Merger
2805
if this_dir is None:
2806
this_dir = u'.'
2807
this_tree = WorkingTree.open_containing(this_dir)[0]
2808
if show_base and not merge_type is Merge3Merger:
2809
raise BzrCommandError("Show-base is not supported for this merge"
2810
" type. %s" % merge_type)
2811
if reprocess and not merge_type.supports_reprocess:
2812
raise BzrCommandError("Conflict reduction is not supported for merge"
2813
" type %s." % merge_type)
2814
if reprocess and show_base:
2815
raise BzrCommandError("Cannot do conflict reduction and show base.")
2816
try:
2817
merger = Merger(this_tree.branch, this_tree=this_tree, pb=pb)
2818
merger.pp = ProgressPhase("Merge phase", 5, pb)
2819
merger.pp.next_phase()
2820
merger.check_basis(check_clean)
2821
merger.set_other(other_revision)
2822
merger.pp.next_phase()
2823
merger.set_base(base_revision)
2824
if merger.base_rev_id == merger.other_rev_id:
2825
note('Nothing to do.')
4413
4414
4415
class cmd_wait_until_signalled(Command):
4416
"""Test helper for test_start_and_stop_bzr_subprocess_send_signal.
4417
4418
This just prints a line to signal when it is ready, then blocks on stdin.
4419
"""
4420
4421
hidden = True
4422
4423
def run(self):
4424
sys.stdout.write("running\n")
4425
sys.stdout.flush()
4426
sys.stdin.readline()
4427
4428
4429
class cmd_serve(Command):
4430
"""Run the bzr server."""
4431
4432
aliases = ['server']
4433
4434
takes_options = [
4435
Option('inet',
4436
help='Serve on stdin/out for use from inetd or sshd.'),
4437
Option('port',
4438
help='Listen for connections on nominated port of the form '
4439
'[hostname:]portnumber. Passing 0 as the port number will '
4440
'result in a dynamically allocated port. The default port is '
4441
'4155.',
4442
type=str),
4443
Option('directory',
4444
help='Serve contents of this directory.',
4445
type=unicode),
4446
Option('allow-writes',
4447
help='By default the server is a readonly server. Supplying '
4448
'--allow-writes enables write access to the contents of '
4449
'the served directory and below.'
4450
),
4451
]
4452
4453
def run_smart_server(self, smart_server):
4454
"""Run 'smart_server' forever, with no UI output at all."""
4455
# For the duration of this server, no UI output is permitted. note
4456
# that this may cause problems with blackbox tests. This should be
4457
# changed with care though, as we dont want to use bandwidth sending
4458
# progress over stderr to smart server clients!
4459
from bzrlib import lockdir
4460
old_factory = ui.ui_factory
4461
old_lockdir_timeout = lockdir._DEFAULT_TIMEOUT_SECONDS
4462
try:
4463
ui.ui_factory = ui.SilentUIFactory()
4464
lockdir._DEFAULT_TIMEOUT_SECONDS = 0
4465
smart_server.serve()
4466
finally:
4467
ui.ui_factory = old_factory
4468
lockdir._DEFAULT_TIMEOUT_SECONDS = old_lockdir_timeout
4469
4470
def get_host_and_port(self, port):
4471
"""Return the host and port to run the smart server on.
4472
4473
If 'port' is None, the default host (`medium.BZR_DEFAULT_INTERFACE`)
4474
and port (`medium.BZR_DEFAULT_PORT`) will be used.
4475
4476
If 'port' has a colon in it, the string before the colon will be
4477
interpreted as the host.
4478
4479
:param port: A string of the port to run the server on.
4480
:return: A tuple of (host, port), where 'host' is a host name or IP,
4481
and port is an integer TCP/IP port.
4482
"""
4483
from bzrlib.smart import medium
4484
host = medium.BZR_DEFAULT_INTERFACE
4485
if port is None:
4486
port = medium.BZR_DEFAULT_PORT
4487
else:
4488
if ':' in port:
4489
host, port = port.split(':')
4490
port = int(port)
4491
return host, port
4492
4493
def get_smart_server(self, transport, inet, port):
4494
"""Construct a smart server.
4495
4496
:param transport: The base transport from which branches will be
4497
served.
4498
:param inet: If True, serve over stdin and stdout. Used for running
4499
from inet.
4500
:param port: The port to listen on. By default, it's `
4501
medium.BZR_DEFAULT_PORT`. See `get_host_and_port` for more
4502
information.
4503
:return: A smart server.
4504
"""
4505
from bzrlib.smart import medium, server
4506
if inet:
4507
smart_server = medium.SmartServerPipeStreamMedium(
4508
sys.stdin, sys.stdout, transport)
4509
else:
4510
host, port = self.get_host_and_port(port)
4511
smart_server = server.SmartTCPServer(
4512
transport, host=host, port=port)
4513
note('listening on port: %s' % smart_server.port)
4514
return smart_server
4515
4516
def run(self, port=None, inet=False, directory=None, allow_writes=False):
4517
from bzrlib.transport import get_transport
4518
from bzrlib.transport.chroot import ChrootServer
4519
if directory is None:
4520
directory = os.getcwd()
4521
url = urlutils.local_path_to_url(directory)
4522
if not allow_writes:
4523
url = 'readonly+' + url
4524
chroot_server = ChrootServer(get_transport(url))
4525
chroot_server.setUp()
4526
t = get_transport(chroot_server.get_url())
4527
smart_server = self.get_smart_server(t, inet, port)
4528
self.run_smart_server(smart_server)
4529
4530
4531
class cmd_join(Command):
4532
"""Combine a subtree into its containing tree.
4533
4534
This command is for experimental use only. It requires the target tree
4535
to be in dirstate-with-subtree format, which cannot be converted into
4536
earlier formats.
4537
4538
The TREE argument should be an independent tree, inside another tree, but
4539
not part of it. (Such trees can be produced by "bzr split", but also by
4540
running "bzr branch" with the target inside a tree.)
4541
4542
The result is a combined tree, with the subtree no longer an independant
4543
part. This is marked as a merge of the subtree into the containing tree,
4544
and all history is preserved.
4545
4546
If --reference is specified, the subtree retains its independence. It can
4547
be branched by itself, and can be part of multiple projects at the same
4548
time. But operations performed in the containing tree, such as commit
4549
and merge, will recurse into the subtree.
4550
"""
4551
4552
_see_also = ['split']
4553
takes_args = ['tree']
4554
takes_options = [
4555
Option('reference', help='Join by reference.'),
4556
]
4557
hidden = True
4558
4559
def run(self, tree, reference=False):
4560
sub_tree = WorkingTree.open(tree)
4561
parent_dir = osutils.dirname(sub_tree.basedir)
4562
containing_tree = WorkingTree.open_containing(parent_dir)[0]
4563
repo = containing_tree.branch.repository
4564
if not repo.supports_rich_root():
4565
raise errors.BzrCommandError(
4566
"Can't join trees because %s doesn't support rich root data.\n"
4567
"You can use bzr upgrade on the repository."
4568
% (repo,))
4569
if reference:
4570
try:
4571
containing_tree.add_reference(sub_tree)
4572
except errors.BadReferenceTarget, e:
4573
# XXX: Would be better to just raise a nicely printable
4574
# exception from the real origin. Also below. mbp 20070306
4575
raise errors.BzrCommandError("Cannot join %s. %s" %
4576
(tree, e.reason))
4577
else:
4578
try:
4579
containing_tree.subsume(sub_tree)
4580
except errors.BadSubsumeSource, e:
4581
raise errors.BzrCommandError("Cannot join %s. %s" %
4582
(tree, e.reason))
4583
4584
4585
class cmd_split(Command):
4586
"""Split a subdirectory of a tree into a separate tree.
4587
4588
This command will produce a target tree in a format that supports
4589
rich roots, like 'rich-root' or 'rich-root-pack'. These formats cannot be
4590
converted into earlier formats like 'dirstate-tags'.
4591
4592
The TREE argument should be a subdirectory of a working tree. That
4593
subdirectory will be converted into an independent tree, with its own
4594
branch. Commits in the top-level tree will not apply to the new subtree.
4595
"""
4596
4597
# join is not un-hidden yet
4598
#_see_also = ['join']
4599
takes_args = ['tree']
4600
4601
def run(self, tree):
4602
containing_tree, subdir = WorkingTree.open_containing(tree)
4603
sub_id = containing_tree.path2id(subdir)
4604
if sub_id is None:
4605
raise errors.NotVersionedError(subdir)
4606
try:
4607
containing_tree.extract(sub_id)
4608
except errors.RootNotRich:
4609
raise errors.UpgradeRequired(containing_tree.branch.base)
4610
4611
4612
class cmd_merge_directive(Command):
4613
"""Generate a merge directive for auto-merge tools.
4614
4615
A directive requests a merge to be performed, and also provides all the
4616
information necessary to do so. This means it must either include a
4617
revision bundle, or the location of a branch containing the desired
4618
revision.
4619
4620
A submit branch (the location to merge into) must be supplied the first
4621
time the command is issued. After it has been supplied once, it will
4622
be remembered as the default.
4623
4624
A public branch is optional if a revision bundle is supplied, but required
4625
if --diff or --plain is specified. It will be remembered as the default
4626
after the first use.
4627
"""
4628
4629
takes_args = ['submit_branch?', 'public_branch?']
4630
4631
hidden = True
4632
4633
_see_also = ['send']
4634
4635
takes_options = [
4636
RegistryOption.from_kwargs('patch-type',
4637
'The type of patch to include in the directive.',
4638
title='Patch type',
4639
value_switches=True,
4640
enum_switch=False,
4641
bundle='Bazaar revision bundle (default).',
4642
diff='Normal unified diff.',
4643
plain='No patch, just directive.'),
4644
Option('sign', help='GPG-sign the directive.'), 'revision',
4645
Option('mail-to', type=str,
4646
help='Instead of printing the directive, email to this address.'),
4647
Option('message', type=str, short_name='m',
4648
help='Message to use when committing this merge.')
4649
]
4650
4651
encoding_type = 'exact'
4652
4653
def run(self, submit_branch=None, public_branch=None, patch_type='bundle',
4654
sign=False, revision=None, mail_to=None, message=None):
4655
from bzrlib.revision import ensure_null, NULL_REVISION
4656
include_patch, include_bundle = {
4657
'plain': (False, False),
4658
'diff': (True, False),
4659
'bundle': (True, True),
4660
}[patch_type]
4661
branch = Branch.open('.')
4662
stored_submit_branch = branch.get_submit_branch()
4663
if submit_branch is None:
4664
submit_branch = stored_submit_branch
4665
else:
4666
if stored_submit_branch is None:
4667
branch.set_submit_branch(submit_branch)
4668
if submit_branch is None:
4669
submit_branch = branch.get_parent()
4670
if submit_branch is None:
4671
raise errors.BzrCommandError('No submit branch specified or known')
4672
4673
stored_public_branch = branch.get_public_branch()
4674
if public_branch is None:
4675
public_branch = stored_public_branch
4676
elif stored_public_branch is None:
4677
branch.set_public_branch(public_branch)
4678
if not include_bundle and public_branch is None:
4679
raise errors.BzrCommandError('No public branch specified or'
4680
' known')
4681
base_revision_id = None
4682
if revision is not None:
4683
if len(revision) > 2:
4684
raise errors.BzrCommandError('bzr merge-directive takes '
4685
'at most two one revision identifiers')
4686
revision_id = revision[-1].as_revision_id(branch)
4687
if len(revision) == 2:
4688
base_revision_id = revision[0].as_revision_id(branch)
4689
else:
4690
revision_id = branch.last_revision()
4691
revision_id = ensure_null(revision_id)
4692
if revision_id == NULL_REVISION:
4693
raise errors.BzrCommandError('No revisions to bundle.')
4694
directive = merge_directive.MergeDirective2.from_objects(
4695
branch.repository, revision_id, time.time(),
4696
osutils.local_time_offset(), submit_branch,
4697
public_branch=public_branch, include_patch=include_patch,
4698
include_bundle=include_bundle, message=message,
4699
base_revision_id=base_revision_id)
4700
if mail_to is None:
4701
if sign:
4702
self.outf.write(directive.to_signed(branch))
4703
else:
4704
self.outf.writelines(directive.to_lines())
4705
else:
4706
message = directive.to_email(mail_to, branch, sign)
4707
s = SMTPConnection(branch.get_config())
4708
s.send_email(message)
4709
4710
4711
class cmd_send(Command):
4712
"""Mail or create a merge-directive for submitting changes.
4713
4714
A merge directive provides many things needed for requesting merges:
4715
4716
* A machine-readable description of the merge to perform
4717
4718
* An optional patch that is a preview of the changes requested
4719
4720
* An optional bundle of revision data, so that the changes can be applied
4721
directly from the merge directive, without retrieving data from a
4722
branch.
4723
4724
If --no-bundle is specified, then public_branch is needed (and must be
4725
up-to-date), so that the receiver can perform the merge using the
4726
public_branch. The public_branch is always included if known, so that
4727
people can check it later.
4728
4729
The submit branch defaults to the parent, but can be overridden. Both
4730
submit branch and public branch will be remembered if supplied.
4731
4732
If a public_branch is known for the submit_branch, that public submit
4733
branch is used in the merge instructions. This means that a local mirror
4734
can be used as your actual submit branch, once you have set public_branch
4735
for that mirror.
4736
4737
Mail is sent using your preferred mail program. This should be transparent
4738
on Windows (it uses MAPI). On Linux, it requires the xdg-email utility.
4739
If the preferred client can't be found (or used), your editor will be used.
4740
4741
To use a specific mail program, set the mail_client configuration option.
4742
(For Thunderbird 1.5, this works around some bugs.) Supported values for
4743
specific clients are "claws", "evolution", "kmail", "mutt", and
4744
"thunderbird"; generic options are "default", "editor", "emacsclient",
4745
"mapi", and "xdg-email". Plugins may also add supported clients.
4746
4747
If mail is being sent, a to address is required. This can be supplied
4748
either on the commandline, by setting the submit_to configuration
4749
option in the branch itself or the child_submit_to configuration option
4750
in the submit branch.
4751
4752
Two formats are currently supported: "4" uses revision bundle format 4 and
4753
merge directive format 2. It is significantly faster and smaller than
4754
older formats. It is compatible with Bazaar 0.19 and later. It is the
4755
default. "0.9" uses revision bundle format 0.9 and merge directive
4756
format 1. It is compatible with Bazaar 0.12 - 0.18.
4757
4758
The merge directives created by bzr send may be applied using bzr merge or
4759
bzr pull by specifying a file containing a merge directive as the location.
4760
"""
4761
4762
encoding_type = 'exact'
4763
4764
_see_also = ['merge', 'pull']
4765
4766
takes_args = ['submit_branch?', 'public_branch?']
4767
4768
takes_options = [
4769
Option('no-bundle',
4770
help='Do not include a bundle in the merge directive.'),
4771
Option('no-patch', help='Do not include a preview patch in the merge'
4772
' directive.'),
4773
Option('remember',
4774
help='Remember submit and public branch.'),
4775
Option('from',
4776
help='Branch to generate the submission from, '
4777
'rather than the one containing the working directory.',
4778
short_name='f',
4779
type=unicode),
4780
Option('output', short_name='o',
4781
help='Write merge directive to this file; '
4782
'use - for stdout.',
4783
type=unicode),
4784
Option('mail-to', help='Mail the request to this address.',
4785
type=unicode),
4786
'revision',
4787
'message',
4788
Option('body', help='Body for the email.', type=unicode),
4789
RegistryOption.from_kwargs('format',
4790
'Use the specified output format.',
4791
**{'4': 'Bundle format 4, Merge Directive 2 (default)',
4792
'0.9': 'Bundle format 0.9, Merge Directive 1',})
4793
]
4794
4795
def run(self, submit_branch=None, public_branch=None, no_bundle=False,
4796
no_patch=False, revision=None, remember=False, output=None,
4797
format='4', mail_to=None, message=None, body=None, **kwargs):
4798
return self._run(submit_branch, revision, public_branch, remember,
4799
format, no_bundle, no_patch, output,
4800
kwargs.get('from', '.'), mail_to, message, body)
4801
4802
def _run(self, submit_branch, revision, public_branch, remember, format,
4803
no_bundle, no_patch, output, from_, mail_to, message, body):
4804
from bzrlib.revision import NULL_REVISION
4805
branch = Branch.open_containing(from_)[0]
4806
if output is None:
4807
outfile = cStringIO.StringIO()
4808
elif output == '-':
4809
outfile = self.outf
4810
else:
4811
outfile = open(output, 'wb')
4812
# we may need to write data into branch's repository to calculate
4813
# the data to send.
4814
branch.lock_write()
4815
try:
4816
if output is None:
4817
config = branch.get_config()
4818
if mail_to is None:
4819
mail_to = config.get_user_option('submit_to')
4820
mail_client = config.get_mail_client()
4821
if (not getattr(mail_client, 'supports_body', False)
4822
and body is not None):
4823
raise errors.BzrCommandError(
4824
'Mail client "%s" does not support specifying body' %
4825
mail_client.__class__.__name__)
4826
if remember and submit_branch is None:
4827
raise errors.BzrCommandError(
4828
'--remember requires a branch to be specified.')
4829
stored_submit_branch = branch.get_submit_branch()
4830
remembered_submit_branch = None
4831
if submit_branch is None:
4832
submit_branch = stored_submit_branch
4833
remembered_submit_branch = "submit"
4834
else:
4835
if stored_submit_branch is None or remember:
4836
branch.set_submit_branch(submit_branch)
4837
if submit_branch is None:
4838
submit_branch = branch.get_parent()
4839
remembered_submit_branch = "parent"
4840
if submit_branch is None:
4841
raise errors.BzrCommandError('No submit branch known or'
4842
' specified')
4843
if remembered_submit_branch is not None:
4844
note('Using saved %s location "%s" to determine what '
4845
'changes to submit.', remembered_submit_branch,
4846
submit_branch)
4847
4848
if mail_to is None:
4849
submit_config = Branch.open(submit_branch).get_config()
4850
mail_to = submit_config.get_user_option("child_submit_to")
4851
4852
stored_public_branch = branch.get_public_branch()
4853
if public_branch is None:
4854
public_branch = stored_public_branch
4855
elif stored_public_branch is None or remember:
4856
branch.set_public_branch(public_branch)
4857
if no_bundle and public_branch is None:
4858
raise errors.BzrCommandError('No public branch specified or'
4859
' known')
4860
base_revision_id = None
4861
revision_id = None
4862
if revision is not None:
4863
if len(revision) > 2:
4864
raise errors.BzrCommandError('bzr send takes '
4865
'at most two one revision identifiers')
4866
revision_id = revision[-1].as_revision_id(branch)
4867
if len(revision) == 2:
4868
base_revision_id = revision[0].as_revision_id(branch)
4869
if revision_id is None:
4870
revision_id = branch.last_revision()
4871
if revision_id == NULL_REVISION:
4872
raise errors.BzrCommandError('No revisions to submit.')
4873
if format == '4':
4874
directive = merge_directive.MergeDirective2.from_objects(
4875
branch.repository, revision_id, time.time(),
4876
osutils.local_time_offset(), submit_branch,
4877
public_branch=public_branch, include_patch=not no_patch,
4878
include_bundle=not no_bundle, message=message,
4879
base_revision_id=base_revision_id)
4880
elif format == '0.9':
4881
if not no_bundle:
4882
if not no_patch:
4883
patch_type = 'bundle'
4884
else:
4885
raise errors.BzrCommandError('Format 0.9 does not'
4886
' permit bundle with no patch')
4887
else:
4888
if not no_patch:
4889
patch_type = 'diff'
4890
else:
4891
patch_type = None
4892
directive = merge_directive.MergeDirective.from_objects(
4893
branch.repository, revision_id, time.time(),
4894
osutils.local_time_offset(), submit_branch,
4895
public_branch=public_branch, patch_type=patch_type,
4896
message=message)
4897
4898
outfile.writelines(directive.to_lines())
4899
if output is None:
4900
subject = '[MERGE] '
4901
if message is not None:
4902
subject += message
4903
else:
4904
revision = branch.repository.get_revision(revision_id)
4905
subject += revision.get_summary()
4906
basename = directive.get_disk_name(branch)
4907
mail_client.compose_merge_request(mail_to, subject,
4908
outfile.getvalue(),
4909
basename, body)
4910
finally:
4911
if output != '-':
4912
outfile.close()
4913
branch.unlock()
4914
4915
4916
class cmd_bundle_revisions(cmd_send):
4917
4918
"""Create a merge-directive for submitting changes.
4919
4920
A merge directive provides many things needed for requesting merges:
4921
4922
* A machine-readable description of the merge to perform
4923
4924
* An optional patch that is a preview of the changes requested
4925
4926
* An optional bundle of revision data, so that the changes can be applied
4927
directly from the merge directive, without retrieving data from a
4928
branch.
4929
4930
If --no-bundle is specified, then public_branch is needed (and must be
4931
up-to-date), so that the receiver can perform the merge using the
4932
public_branch. The public_branch is always included if known, so that
4933
people can check it later.
4934
4935
The submit branch defaults to the parent, but can be overridden. Both
4936
submit branch and public branch will be remembered if supplied.
4937
4938
If a public_branch is known for the submit_branch, that public submit
4939
branch is used in the merge instructions. This means that a local mirror
4940
can be used as your actual submit branch, once you have set public_branch
4941
for that mirror.
4942
4943
Two formats are currently supported: "4" uses revision bundle format 4 and
4944
merge directive format 2. It is significantly faster and smaller than
4945
older formats. It is compatible with Bazaar 0.19 and later. It is the
4946
default. "0.9" uses revision bundle format 0.9 and merge directive
4947
format 1. It is compatible with Bazaar 0.12 - 0.18.
4948
"""
4949
4950
takes_options = [
4951
Option('no-bundle',
4952
help='Do not include a bundle in the merge directive.'),
4953
Option('no-patch', help='Do not include a preview patch in the merge'
4954
' directive.'),
4955
Option('remember',
4956
help='Remember submit and public branch.'),
4957
Option('from',
4958
help='Branch to generate the submission from, '
4959
'rather than the one containing the working directory.',
4960
short_name='f',
4961
type=unicode),
4962
Option('output', short_name='o', help='Write directive to this file.',
4963
type=unicode),
4964
'revision',
4965
RegistryOption.from_kwargs('format',
4966
'Use the specified output format.',
4967
**{'4': 'Bundle format 4, Merge Directive 2 (default)',
4968
'0.9': 'Bundle format 0.9, Merge Directive 1',})
4969
]
4970
aliases = ['bundle']
4971
4972
_see_also = ['send', 'merge']
4973
4974
hidden = True
4975
4976
def run(self, submit_branch=None, public_branch=None, no_bundle=False,
4977
no_patch=False, revision=None, remember=False, output=None,
4978
format='4', **kwargs):
4979
if output is None:
4980
output = '-'
4981
return self._run(submit_branch, revision, public_branch, remember,
4982
format, no_bundle, no_patch, output,
4983
kwargs.get('from', '.'), None, None, None)
4984
4985
4986
class cmd_tag(Command):
4987
"""Create, remove or modify a tag naming a revision.
4988
4989
Tags give human-meaningful names to revisions. Commands that take a -r
4990
(--revision) option can be given -rtag:X, where X is any previously
4991
created tag.
4992
4993
Tags are stored in the branch. Tags are copied from one branch to another
4994
along when you branch, push, pull or merge.
4995
4996
It is an error to give a tag name that already exists unless you pass
4997
--force, in which case the tag is moved to point to the new revision.
4998
4999
To rename a tag (change the name but keep it on the same revsion), run ``bzr
5000
tag new-name -r tag:old-name`` and then ``bzr tag --delete oldname``.
5001
"""
5002
5003
_see_also = ['commit', 'tags']
5004
takes_args = ['tag_name']
5005
takes_options = [
5006
Option('delete',
5007
help='Delete this tag rather than placing it.',
5008
),
5009
Option('directory',
5010
help='Branch in which to place the tag.',
5011
short_name='d',
5012
type=unicode,
5013
),
5014
Option('force',
5015
help='Replace existing tags.',
5016
),
5017
'revision',
5018
]
5019
5020
def run(self, tag_name,
5021
delete=None,
5022
directory='.',
5023
force=None,
5024
revision=None,
5025
):
5026
branch, relpath = Branch.open_containing(directory)
5027
branch.lock_write()
5028
try:
5029
if delete:
5030
branch.tags.delete_tag(tag_name)
5031
self.outf.write('Deleted tag %s.\n' % tag_name)
5032
else:
5033
if revision:
5034
if len(revision) != 1:
5035
raise errors.BzrCommandError(
5036
"Tags can only be placed on a single revision, "
5037
"not on a range")
5038
revision_id = revision[0].as_revision_id(branch)
5039
else:
5040
revision_id = branch.last_revision()
5041
if (not force) and branch.tags.has_tag(tag_name):
5042
raise errors.TagAlreadyExists(tag_name)
5043
branch.tags.set_tag(tag_name, revision_id)
5044
self.outf.write('Created tag %s.\n' % tag_name)
5045
finally:
5046
branch.unlock()
5047
5048
5049
class cmd_tags(Command):
5050
"""List tags.
5051
5052
This command shows a table of tag names and the revisions they reference.
5053
"""
5054
5055
_see_also = ['tag']
5056
takes_options = [
5057
Option('directory',
5058
help='Branch whose tags should be displayed.',
5059
short_name='d',
5060
type=unicode,
5061
),
5062
RegistryOption.from_kwargs('sort',
5063
'Sort tags by different criteria.', title='Sorting',
5064
alpha='Sort tags lexicographically (default).',
5065
time='Sort tags chronologically.',
5066
),
5067
'show-ids',
5068
'revision',
5069
]
5070
5071
@display_command
5072
def run(self,
5073
directory='.',
5074
sort='alpha',
5075
show_ids=False,
5076
revision=None,
5077
):
5078
branch, relpath = Branch.open_containing(directory)
5079
5080
tags = branch.tags.get_tag_dict().items()
5081
if not tags:
5082
return
5083
5084
if revision:
5085
branch.lock_read()
5086
try:
5087
graph = branch.repository.get_graph()
5088
rev1, rev2 = _get_revision_range(revision, branch, self.name())
5089
revid1, revid2 = rev1.rev_id, rev2.rev_id
5090
# only show revisions between revid1 and revid2 (inclusive)
5091
tags = [(tag, revid) for tag, revid in tags if
5092
graph.is_between(revid, revid1, revid2)]
5093
finally:
5094
branch.unlock()
5095
if sort == 'alpha':
5096
tags.sort()
5097
elif sort == 'time':
5098
timestamps = {}
5099
for tag, revid in tags:
5100
try:
5101
revobj = branch.repository.get_revision(revid)
5102
except errors.NoSuchRevision:
5103
timestamp = sys.maxint # place them at the end
5104
else:
5105
timestamp = revobj.timestamp
5106
timestamps[revid] = timestamp
5107
tags.sort(key=lambda x: timestamps[x[1]])
5108
if not show_ids:
5109
# [ (tag, revid), ... ] -> [ (tag, dotted_revno), ... ]
5110
revno_map = branch.get_revision_id_to_revno_map()
5111
tags = [ (tag, '.'.join(map(str, revno_map.get(revid, ('?',)))))
5112
for tag, revid in tags ]
5113
for tag, revspec in tags:
5114
self.outf.write('%-20s %s\n' % (tag, revspec))
5115
5116
5117
class cmd_reconfigure(Command):
5118
"""Reconfigure the type of a bzr directory.
5119
5120
A target configuration must be specified.
5121
5122
For checkouts, the bind-to location will be auto-detected if not specified.
5123
The order of preference is
5124
1. For a lightweight checkout, the current bound location.
5125
2. For branches that used to be checkouts, the previously-bound location.
5126
3. The push location.
5127
4. The parent location.
5128
If none of these is available, --bind-to must be specified.
5129
"""
5130
5131
_see_also = ['branches', 'checkouts', 'standalone-trees', 'working-trees']
5132
takes_args = ['location?']
5133
takes_options = [
5134
RegistryOption.from_kwargs(
5135
'target_type',
5136
title='Target type',
5137
help='The type to reconfigure the directory to.',
5138
value_switches=True, enum_switch=False,
5139
branch='Reconfigure to be an unbound branch with no working tree.',
5140
tree='Reconfigure to be an unbound branch with a working tree.',
5141
checkout='Reconfigure to be a bound branch with a working tree.',
5142
lightweight_checkout='Reconfigure to be a lightweight'
5143
' checkout (with no local history).',
5144
standalone='Reconfigure to be a standalone branch '
5145
'(i.e. stop using shared repository).',
5146
use_shared='Reconfigure to use a shared repository.',
5147
with_trees='Reconfigure repository to create '
5148
'working trees on branches by default.',
5149
with_no_trees='Reconfigure repository to not create '
5150
'working trees on branches by default.'
5151
),
5152
Option('bind-to', help='Branch to bind checkout to.', type=str),
5153
Option('force',
5154
help='Perform reconfiguration even if local changes'
5155
' will be lost.')
5156
]
5157
5158
def run(self, location=None, target_type=None, bind_to=None, force=False):
5159
directory = bzrdir.BzrDir.open(location)
5160
if target_type is None:
5161
raise errors.BzrCommandError('No target configuration specified')
5162
elif target_type == 'branch':
5163
reconfiguration = reconfigure.Reconfigure.to_branch(directory)
5164
elif target_type == 'tree':
5165
reconfiguration = reconfigure.Reconfigure.to_tree(directory)
5166
elif target_type == 'checkout':
5167
reconfiguration = reconfigure.Reconfigure.to_checkout(
5168
directory, bind_to)
5169
elif target_type == 'lightweight-checkout':
5170
reconfiguration = reconfigure.Reconfigure.to_lightweight_checkout(
5171
directory, bind_to)
5172
elif target_type == 'use-shared':
5173
reconfiguration = reconfigure.Reconfigure.to_use_shared(directory)
5174
elif target_type == 'standalone':
5175
reconfiguration = reconfigure.Reconfigure.to_standalone(directory)
5176
elif target_type == 'with-trees':
5177
reconfiguration = reconfigure.Reconfigure.set_repository_trees(
5178
directory, True)
5179
elif target_type == 'with-no-trees':
5180
reconfiguration = reconfigure.Reconfigure.set_repository_trees(
5181
directory, False)
5182
reconfiguration.apply(force)
5183
5184
5185
class cmd_switch(Command):
5186
"""Set the branch of a checkout and update.
5187
5188
For lightweight checkouts, this changes the branch being referenced.
5189
For heavyweight checkouts, this checks that there are no local commits
5190
versus the current bound branch, then it makes the local branch a mirror
5191
of the new location and binds to it.
5192
5193
In both cases, the working tree is updated and uncommitted changes
5194
are merged. The user can commit or revert these as they desire.
5195
5196
Pending merges need to be committed or reverted before using switch.
5197
5198
The path to the branch to switch to can be specified relative to the parent
5199
directory of the current branch. For example, if you are currently in a
5200
checkout of /path/to/branch, specifying 'newbranch' will find a branch at
5201
/path/to/newbranch.
5202
5203
Bound branches use the nickname of its master branch unless it is set
5204
locally, in which case switching will update the the local nickname to be
5205
that of the master.
5206
"""
5207
5208
takes_args = ['to_location']
5209
takes_options = [Option('force',
5210
help='Switch even if local commits will be lost.')
5211
]
5212
5213
def run(self, to_location, force=False):
5214
from bzrlib import switch
5215
tree_location = '.'
5216
control_dir = bzrdir.BzrDir.open_containing(tree_location)[0]
5217
branch = control_dir.open_branch()
5218
try:
5219
to_branch = Branch.open(to_location)
5220
except errors.NotBranchError:
5221
this_branch = control_dir.open_branch()
5222
# This may be a heavy checkout, where we want the master branch
5223
this_url = this_branch.get_bound_location()
5224
# If not, use a local sibling
5225
if this_url is None:
5226
this_url = this_branch.base
5227
to_branch = Branch.open(
5228
urlutils.join(this_url, '..', to_location))
5229
switch.switch(control_dir, to_branch, force)
5230
if branch.get_config().has_explicit_nickname():
5231
branch = control_dir.open_branch() #get the new branch!
5232
branch.nick = to_branch.nick
5233
note('Switched to branch: %s',
5234
urlutils.unescape_for_display(to_branch.base, 'utf-8'))
5235
5236
5237
class cmd_guess_renames(Command):
5238
"""Guess which files have been have been renamed, based on their content.
5239
5240
Only versioned files which have been deleted are candidates for rename
5241
detection, and renames to ignored files will not be detected.
5242
"""
5243
5244
def run(self):
5245
work_tree, file_list = tree_files(None, default_branch='.')
5246
work_tree.lock_write()
5247
try:
5248
rename_map.RenameMap.guess_renames(work_tree)
5249
finally:
5250
work_tree.unlock()
5251
5252
5253
class cmd_view(Command):
5254
"""Manage filtered views.
5255
5256
Views provide a mask over the tree so that users can focus on
5257
a subset of a tree when doing their work. After creating a view,
5258
commands that support a list of files - status, diff, commit, etc -
5259
effectively have that list of files implicitly given each time.
5260
An explicit list of files can still be given but those files
5261
must be within the current view.
5262
5263
In most cases, a view has a short life-span: it is created to make
5264
a selected change and is deleted once that change is committed.
5265
At other times, you may wish to create one or more named views
5266
and switch between them.
5267
5268
To disable the current view without deleting it, you can switch to
5269
the pseudo view called ``off``. This can be useful when you need
5270
to see the whole tree for an operation or two (e.g. merge) but
5271
want to switch back to your view after that.
5272
5273
:Examples:
5274
To define the current view::
5275
5276
bzr view file1 dir1 ...
5277
5278
To list the current view::
5279
5280
bzr view
5281
5282
To delete the current view::
5283
5284
bzr view --delete
5285
5286
To disable the current view without deleting it::
5287
5288
bzr view --switch off
5289
5290
To define a named view and switch to it::
5291
5292
bzr view --name view-name file1 dir1 ...
5293
5294
To list a named view::
5295
5296
bzr view --name view-name
5297
5298
To delete a named view::
5299
5300
bzr view --name view-name --delete
5301
5302
To switch to a named view::
5303
5304
bzr view --switch view-name
5305
5306
To list all views defined::
5307
5308
bzr view --all
5309
5310
To delete all views::
5311
5312
bzr view --delete --all
5313
"""
5314
5315
_see_also = []
5316
takes_args = ['file*']
5317
takes_options = [
5318
Option('all',
5319
help='Apply list or delete action to all views.',
5320
),
5321
Option('delete',
5322
help='Delete the view.',
5323
),
5324
Option('name',
5325
help='Name of the view to define, list or delete.',
5326
type=unicode,
5327
),
5328
Option('switch',
5329
help='Name of the view to switch to.',
5330
type=unicode,
5331
),
5332
]
5333
5334
def run(self, file_list,
5335
all=False,
5336
delete=False,
5337
name=None,
5338
switch=None,
5339
):
5340
tree, file_list = tree_files(file_list, apply_view=False)
5341
current_view, view_dict = tree.views.get_view_info()
5342
if name is None:
5343
name = current_view
5344
if delete:
5345
if file_list:
5346
raise errors.BzrCommandError(
5347
"Both --delete and a file list specified")
5348
elif switch:
5349
raise errors.BzrCommandError(
5350
"Both --delete and --switch specified")
5351
elif all:
5352
tree.views.set_view_info(None, {})
5353
self.outf.write("Deleted all views.\n")
5354
elif name is None:
5355
raise errors.BzrCommandError("No current view to delete")
5356
else:
5357
tree.views.delete_view(name)
5358
self.outf.write("Deleted '%s' view.\n" % name)
5359
elif switch:
5360
if file_list:
5361
raise errors.BzrCommandError(
5362
"Both --switch and a file list specified")
5363
elif all:
5364
raise errors.BzrCommandError(
5365
"Both --switch and --all specified")
5366
elif switch == 'off':
5367
if current_view is None:
5368
raise errors.BzrCommandError("No current view to disable")
5369
tree.views.set_view_info(None, view_dict)
5370
self.outf.write("Disabled '%s' view.\n" % (current_view))
5371
else:
5372
tree.views.set_view_info(switch, view_dict)
5373
view_str = views.view_display_str(tree.views.lookup_view())
5374
self.outf.write("Using '%s' view: %s\n" % (switch, view_str))
5375
elif all:
5376
if view_dict:
5377
self.outf.write('Views defined:\n')
5378
for view in sorted(view_dict):
5379
if view == current_view:
5380
active = "=>"
5381
else:
5382
active = " "
5383
view_str = views.view_display_str(view_dict[view])
5384
self.outf.write('%s %-20s %s\n' % (active, view, view_str))
5385
else:
5386
self.outf.write('No views defined.\n')
5387
elif file_list:
5388
if name is None:
5389
# No name given and no current view set
5390
name = 'my'
5391
elif name == 'off':
5392
raise errors.BzrCommandError(
5393
"Cannot change the 'off' pseudo view")
5394
tree.views.set_view(name, sorted(file_list))
5395
view_str = views.view_display_str(tree.views.lookup_view())
5396
self.outf.write("Using '%s' view: %s\n" % (name, view_str))
5397
else:
5398
# list the files
5399
if name is None:
5400
# No name given and no current view set
5401
self.outf.write('No current view.\n')
5402
else:
5403
view_str = views.view_display_str(tree.views.lookup_view(name))
5404
self.outf.write("'%s' view is: %s\n" % (name, view_str))
5405
5406
5407
class cmd_hooks(Command):
5408
"""Show hooks."""
5409
5410
hidden = True
5411
5412
def run(self):
5413
for hook_key in sorted(hooks.known_hooks.keys()):
5414
some_hooks = hooks.known_hooks_key_to_object(hook_key)
5415
self.outf.write("%s:\n" % type(some_hooks).__name__)
5416
for hook_name, hook_point in sorted(some_hooks.items()):
5417
self.outf.write(" %s:\n" % (hook_name,))
5418
found_hooks = list(hook_point)
5419
if found_hooks:
5420
for hook in found_hooks:
5421
self.outf.write(" %s\n" %
5422
(some_hooks.get_hook_name(hook),))
5423
else:
5424
self.outf.write(" <no hooks installed>\n")
5425
5426
5427
class cmd_shelve(Command):
5428
"""Temporarily set aside some changes from the current tree.
5429
5430
Shelve allows you to temporarily put changes you've made "on the shelf",
5431
ie. out of the way, until a later time when you can bring them back from
5432
the shelf with the 'unshelve' command. The changes are stored alongside
5433
your working tree, and so they aren't propagated along with your branch nor
5434
will they survive its deletion.
5435
5436
If shelve --list is specified, previously-shelved changes are listed.
5437
5438
Shelve is intended to help separate several sets of changes that have
5439
been inappropriately mingled. If you just want to get rid of all changes
5440
and you don't need to restore them later, use revert. If you want to
5441
shelve all text changes at once, use shelve --all.
5442
5443
If filenames are specified, only the changes to those files will be
5444
shelved. Other files will be left untouched.
5445
5446
If a revision is specified, changes since that revision will be shelved.
5447
5448
You can put multiple items on the shelf, and by default, 'unshelve' will
5449
restore the most recently shelved changes.
5450
"""
5451
5452
takes_args = ['file*']
5453
5454
takes_options = [
5455
'revision',
5456
Option('all', help='Shelve all changes.'),
5457
'message',
5458
RegistryOption('writer', 'Method to use for writing diffs.',
5459
bzrlib.option.diff_writer_registry,
5460
value_switches=True, enum_switch=False),
5461
5462
Option('list', help='List shelved changes.'),
5463
Option('destroy',
5464
help='Destroy removed changes instead of shelving them.'),
5465
]
5466
_see_also = ['unshelve']
5467
5468
def run(self, revision=None, all=False, file_list=None, message=None,
5469
writer=None, list=False, destroy=False):
5470
if list:
5471
return self.run_for_list()
5472
from bzrlib.shelf_ui import Shelver
5473
if writer is None:
5474
writer = bzrlib.option.diff_writer_registry.get()
5475
try:
5476
Shelver.from_args(writer(sys.stdout), revision, all, file_list,
5477
message, destroy=destroy).run()
5478
except errors.UserAbort:
2826
5479
return 0
2827
merger.backup_files = backup_files
2828
merger.merge_type = merge_type
2829
merger.set_interesting_files(file_list)
2830
merger.show_base = show_base
2831
merger.reprocess = reprocess
2832
conflicts = merger.do_merge()
2833
if file_list is None:
2834
merger.set_pending()
2835
finally:
2836
pb.clear()
2837
return conflicts
5480
5481
def run_for_list(self):
5482
tree = WorkingTree.open_containing('.')[0]
5483
tree.lock_read()
5484
try:
5485
manager = tree.get_shelf_manager()
5486
shelves = manager.active_shelves()
5487
if len(shelves) == 0:
5488
note('No shelved changes.')
5489
return 0
5490
for shelf_id in reversed(shelves):
5491
message = manager.get_metadata(shelf_id).get('message')
5492
if message is None:
5493
message = '<no message>'
5494
self.outf.write('%3d: %s\n' % (shelf_id, message))
5495
return 1
5496
finally:
5497
tree.unlock()
5498
5499
5500
class cmd_unshelve(Command):
5501
"""Restore shelved changes.
5502
5503
By default, the most recently shelved changes are restored. However if you
5504
specify a shelf by id those changes will be restored instead. This works
5505
best when the changes don't depend on each other.
5506
"""
5507
5508
takes_args = ['shelf_id?']
5509
takes_options = [
5510
RegistryOption.from_kwargs(
5511
'action', help="The action to perform.",
5512
enum_switch=False, value_switches=True,
5513
apply="Apply changes and remove from the shelf.",
5514
dry_run="Show changes, but do not apply or remove them.",
5515
delete_only="Delete changes without applying them."
5516
)
5517
]
5518
_see_also = ['shelve']
5519
5520
def run(self, shelf_id=None, action='apply'):
5521
from bzrlib.shelf_ui import Unshelver
5522
Unshelver.from_args(shelf_id, action).run()
5523
5524
5525
class cmd_clean_tree(Command):
5526
"""Remove unwanted files from working tree.
5527
5528
By default, only unknown files, not ignored files, are deleted. Versioned
5529
files are never deleted.
5530
5531
Another class is 'detritus', which includes files emitted by bzr during
5532
normal operations and selftests. (The value of these files decreases with
5533
time.)
5534
5535
If no options are specified, unknown files are deleted. Otherwise, option
5536
flags are respected, and may be combined.
5537
5538
To check what clean-tree will do, use --dry-run.
5539
"""
5540
takes_options = [Option('ignored', help='Delete all ignored files.'),
5541
Option('detritus', help='Delete conflict files, merge'
5542
' backups, and failed selftest dirs.'),
5543
Option('unknown',
5544
help='Delete files unknown to bzr (default).'),
5545
Option('dry-run', help='Show files to delete instead of'
5546
' deleting them.'),
5547
Option('force', help='Do not prompt before deleting.')]
5548
def run(self, unknown=False, ignored=False, detritus=False, dry_run=False,
5549
force=False):
5550
from bzrlib.clean_tree import clean_tree
5551
if not (unknown or ignored or detritus):
5552
unknown = True
5553
if dry_run:
5554
force = True
5555
clean_tree('.', unknown=unknown, ignored=ignored, detritus=detritus,
5556
dry_run=dry_run, no_prompt=force)
5557
5558
5559
def _create_prefix(cur_transport):
5560
needed = [cur_transport]
5561
# Recurse upwards until we can create a directory successfully
5562
while True:
5563
new_transport = cur_transport.clone('..')
5564
if new_transport.base == cur_transport.base:
5565
raise errors.BzrCommandError(
5566
"Failed to create path prefix for %s."
5567
% cur_transport.base)
5568
try:
5569
new_transport.mkdir('.')
5570
except errors.NoSuchFile:
5571
needed.append(new_transport)
5572
cur_transport = new_transport
5573
else:
5574
break
5575
# Now we only need to create child directories
5576
while needed:
5577
cur_transport = needed.pop()
5578
cur_transport.ensure_base()
2838
5579
2839
5580
2840
5581
# these get imported and then picked up by the scan for cmd_*
2841
5582
# TODO: Some more consistent way to split command definitions across files;
2842
# we do need to load at least some information about them to know of
5583
# we do need to load at least some information about them to know of
2843
5584
# aliases. ideally we would avoid loading the implementation until the
2844
5585
# details were needed.
5586
from bzrlib.cmd_version_info import cmd_version_info
2845
5587
from bzrlib.conflicts import cmd_resolve, cmd_conflicts, restore
2846
from bzrlib.bundle.commands import cmd_bundle_revisions
5588
from bzrlib.bundle.commands import (
5589
cmd_bundle_info,
5590
)
2847
5591
from bzrlib.sign_my_commits import cmd_sign_my_commits
2848
from bzrlib.weave_commands import cmd_weave_list, cmd_weave_join, \
5592
from bzrlib.weave_commands import cmd_versionedfile_list, \
2849
5593
cmd_weave_plan_merge, cmd_weave_merge_text
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0