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