« back to all changes in this revision
Viewing changes to bzrlib/builtins.py
- browse files at revision 3376.2.8
- compare with another revision
- download diff
- download tarball
- view history from revision 3376.2.8
- Committer: Martin Pool
- Date: 2008-05-08 04:12:06 UTC
- mto: This revision was merged to the branch mainline in revision 3415.
- Revision ID: mbp@sourcefrog.net-20080508041206-tkrr8ucmcyrlzkum
Some review cleanups for assertion removal
- files added:
- bzrlib/help_topics/en/hooks.txt
- bzrlib/tests/interversionedfile_implementations
- bzrlib/tests/revisionstore_implementations
- bzrlib/util/configobj/docs
- doc/en/developer-guide
- files removed:
- .testr.conf
- apport
- bzrlib/filters
- bzrlib/help_topics/es
- bzrlib/plugins/netrc_credential_store
- bzrlib/plugins/netrc_credential_store/tests
- bzrlib/plugins/news_merge
- bzrlib/plugins/news_merge/tests
- bzrlib/tests/ftp_server
- bzrlib/tests/per_bzrdir_colo
- bzrlib/tests/per_foreign_vcs
- bzrlib/tests/per_interbranch
- bzrlib/tests/per_repository_chk
- bzrlib/tests/per_repository_reference
- bzrlib/tests/per_uifactory
- bzrlib/tests/ssl_certs
- bzrlib/transport/ftp
- contrib/debian
- doc/developers/_static
- doc/developers/_templates
- doc/en/_static
- doc/en/_static/en
- doc/en/_templates
- doc/en/upgrade-guide
- doc/en/whats-new
- doc/es
- doc/es/_static
- doc/es/_static/es
- doc/es/_templates
- doc/es/mini-tutorial
- doc/es/quick-reference
- doc/es/user-guide
- doc/ja
- doc/ja/_static
- doc/ja/_templates
- doc/ja/mini-tutorial
- doc/ja/tutorials
- doc/ja/upgrade-guide
- doc/ja/user-guide
- doc/ja/user-guide/images
- doc/ja/user-reference
- doc/ru
- doc/ru/_static
- doc/ru/_static/ru
- doc/ru/_templates
- 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/_dirstate_helpers_pyx.h => bzrlib/_dirstate_helpers_c.h
- bzrlib/_dirstate_helpers_pyx.pyx => bzrlib/_dirstate_helpers_c.pyx
- bzrlib/_knit_load_data_pyx.pyx => bzrlib/_knit_load_data_c.pyx
- bzrlib/help_topics/en/conflict-types.txt => bzrlib/help_topics/en/conflicts.txt
- bzrlib/tests/per_branch/ => bzrlib/tests/branch_implementations/
- bzrlib/tests/per_bzrdir/ => bzrlib/tests/bzrdir_implementations/
- bzrlib/tests/ftp_server/medusa_based.py => bzrlib/tests/ftp_server.py
- bzrlib/tests/per_interrepository/ => bzrlib/tests/interrepository_implementations/
- bzrlib/tests/per_intertree/ => bzrlib/tests/intertree_implementations/
- bzrlib/tests/per_inventory/ => bzrlib/tests/inventory_implementations/
- bzrlib/tests/per_repository/ => bzrlib/tests/repository_implementations/
- bzrlib/tests/per_transport.py => bzrlib/tests/test_transport_implementations.py
- bzrlib/tests/per_versionedfile.py => bzrlib/tests/test_versionedfile.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
- doc/en/_static/en/Makefile => doc/en/quick-reference/Makefile
- doc/en/_static/en/bzr-en-quick-reference.pdf => doc/en/quick-reference/quick-start-summary.pdf
- doc/en/_static/en/bzr-en-quick-reference.png => doc/en/quick-reference/quick-start-summary.png
- doc/en/_static/en/bzr-en-quick-reference.svg => doc/en/quick-reference/quick-start-summary.svg
- doc/en/user-guide/part2_intro.txt => doc/en/user-guide/best_practice_intro.txt
- doc/en/user-guide/zen.txt => doc/en/user-guide/revnos.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) 2005-2010 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
25
import sys
26
26
import time
27
27
29
29
from bzrlib import (
30
30
bugtracker,
31
31
bundle,
32
btree_index,
33
32
bzrdir,
34
directory_service,
35
33
delta,
36
34
config,
37
35
errors,
38
36
globbing,
39
hooks,
37
ignores,
40
38
log,
41
39
merge as _mod_merge,
42
40
merge_directive,
43
41
osutils,
44
42
reconfigure,
45
rename_map,
46
43
revision as _mod_revision,
47
static_tuple,
48
44
symbol_versioning,
49
timestamp,
50
45
transport,
46
tree as _mod_tree,
51
47
ui,
52
48
urlutils,
53
views,
54
49
)
55
50
from bzrlib.branch import Branch
56
51
from bzrlib.conflicts import ConflictList
57
from bzrlib.transport import memory
58
from bzrlib.revisionspec import RevisionSpec, RevisionInfo
52
from bzrlib.revisionspec import RevisionSpec
59
53
from bzrlib.smtp_connection import SMTPConnection
60
54
from bzrlib.workingtree import WorkingTree
61
55
""")
62
56
63
from bzrlib.commands import (
64
Command,
65
builtin_command_registry,
66
display_command,
67
)
68
from bzrlib.option import (
69
ListOption,
70
Option,
71
RegistryOption,
72
custom_help,
73
_parse_revision_str,
74
)
75
from bzrlib.trace import mutter, note, warning, is_quiet, get_verbosity_level
76
77
78
def tree_files(file_list, default_branch=u'.', canonicalize=True,
79
apply_view=True):
57
from bzrlib.commands import Command, display_command
58
from bzrlib.option import ListOption, Option, RegistryOption, custom_help
59
from bzrlib.trace import mutter, note, warning, is_quiet, info
60
61
62
def tree_files(file_list, default_branch=u'.'):
80
63
try:
81
return internal_tree_files(file_list, default_branch, canonicalize,
82
apply_view)
64
return internal_tree_files(file_list, default_branch)
83
65
except errors.FileInWrongBranch, e:
84
66
raise errors.BzrCommandError("%s is not in the same branch as %s" %
85
67
(e.path, file_list[0]))
86
68
87
69
88
def tree_files_for_add(file_list):
89
"""
90
Return a tree and list of absolute paths from a file list.
91
92
Similar to tree_files, but add handles files a bit differently, so it a
93
custom implementation. In particular, MutableTreeTree.smart_add expects
94
absolute paths, which it immediately converts to relative paths.
95
"""
96
# FIXME Would be nice to just return the relative paths like
97
# internal_tree_files does, but there are a large number of unit tests
98
# that assume the current interface to mutabletree.smart_add
99
if file_list:
100
tree, relpath = WorkingTree.open_containing(file_list[0])
101
if tree.supports_views():
102
view_files = tree.views.lookup_view()
103
if view_files:
104
for filename in file_list:
105
if not osutils.is_inside_any(view_files, filename):
106
raise errors.FileOutsideView(filename, view_files)
107
file_list = file_list[:]
108
file_list[0] = tree.abspath(relpath)
109
else:
110
tree = WorkingTree.open_containing(u'.')[0]
111
if tree.supports_views():
112
view_files = tree.views.lookup_view()
113
if view_files:
114
file_list = view_files
115
view_str = views.view_display_str(view_files)
116
note("Ignoring files outside view. View is %s" % view_str)
117
return tree, file_list
118
119
120
def _get_one_revision(command_name, revisions):
121
if revisions is None:
122
return None
123
if len(revisions) != 1:
124
raise errors.BzrCommandError(
125
'bzr %s --revision takes exactly one revision identifier' % (
126
command_name,))
127
return revisions[0]
128
129
130
def _get_one_revision_tree(command_name, revisions, branch=None, tree=None):
131
"""Get a revision tree. Not suitable for commands that change the tree.
132
133
Specifically, the basis tree in dirstate trees is coupled to the dirstate
134
and doing a commit/uncommit/pull will at best fail due to changing the
135
basis revision data.
136
137
If tree is passed in, it should be already locked, for lifetime management
138
of the trees internal cached state.
139
"""
140
if branch is None:
141
branch = tree.branch
142
if revisions is None:
143
if tree is not None:
144
rev_tree = tree.basis_tree()
145
else:
146
rev_tree = branch.basis_tree()
147
else:
148
revision = _get_one_revision(command_name, revisions)
149
rev_tree = revision.as_tree(branch)
150
return rev_tree
151
152
153
70
# XXX: Bad function name; should possibly also be a class method of
154
71
# WorkingTree rather than a function.
155
def internal_tree_files(file_list, default_branch=u'.', canonicalize=True,
156
apply_view=True):
72
def internal_tree_files(file_list, default_branch=u'.'):
157
73
"""Convert command-line paths to a WorkingTree and relative paths.
158
74
159
75
This is typically used for command-line processors that take one or
161
77
162
78
The filenames given are not required to exist.
163
79
164
:param file_list: Filenames to convert.
80
:param file_list: Filenames to convert.
165
81
166
82
:param default_branch: Fallback tree path to use if file_list is empty or
167
83
None.
168
84
169
:param apply_view: if True and a view is set, apply it or check that
170
specified files are within it
171
172
85
:return: workingtree, [relative_paths]
173
86
"""
174
87
if file_list is None or len(file_list) == 0:
175
tree = WorkingTree.open_containing(default_branch)[0]
176
if tree.supports_views() and apply_view:
177
view_files = tree.views.lookup_view()
178
if view_files:
179
file_list = view_files
180
view_str = views.view_display_str(view_files)
181
note("Ignoring files outside view. View is %s" % view_str)
182
return tree, file_list
88
return WorkingTree.open_containing(default_branch)[0], file_list
183
89
tree = WorkingTree.open_containing(osutils.realpath(file_list[0]))[0]
184
return tree, safe_relpath_files(tree, file_list, canonicalize,
185
apply_view=apply_view)
186
187
188
def safe_relpath_files(tree, file_list, canonicalize=True, apply_view=True):
189
"""Convert file_list into a list of relpaths in tree.
190
191
:param tree: A tree to operate on.
192
:param file_list: A list of user provided paths or None.
193
:param apply_view: if True and a view is set, apply it or check that
194
specified files are within it
195
:return: A list of relative paths.
196
:raises errors.PathNotChild: When a provided path is in a different tree
197
than tree.
198
"""
199
if file_list is None:
200
return None
201
if tree.supports_views() and apply_view:
202
view_files = tree.views.lookup_view()
203
else:
204
view_files = []
205
90
new_list = []
206
# tree.relpath exists as a "thunk" to osutils, but canonical_relpath
207
# doesn't - fix that up here before we enter the loop.
208
if canonicalize:
209
fixer = lambda p: osutils.canonical_relpath(tree.basedir, p)
210
else:
211
fixer = tree.relpath
212
91
for filename in file_list:
213
92
try:
214
relpath = fixer(osutils.dereference_path(filename))
215
if view_files and not osutils.is_inside_any(view_files, relpath):
216
raise errors.FileOutsideView(filename, view_files)
217
new_list.append(relpath)
93
new_list.append(tree.relpath(osutils.dereference_path(filename)))
218
94
except errors.PathNotChild:
219
95
raise errors.FileInWrongBranch(tree.branch, filename)
220
return new_list
221
222
223
def _get_view_info_for_change_reporter(tree):
224
"""Get the view information from a tree for change reporting."""
225
view_info = None
96
return tree, new_list
97
98
99
@symbol_versioning.deprecated_function(symbol_versioning.zero_fifteen)
100
def get_format_type(typestring):
101
"""Parse and return a format specifier."""
102
# Have to use BzrDirMetaFormat1 directly, so that
103
# RepositoryFormat.set_default_format works
104
if typestring == "default":
105
return bzrdir.BzrDirMetaFormat1()
226
106
try:
227
current_view = tree.views.get_view_info()[0]
228
if current_view is not None:
229
view_info = (current_view, tree.views.lookup_view())
230
except errors.ViewsNotSupported:
231
pass
232
return view_info
107
return bzrdir.format_registry.make_bzrdir(typestring)
108
except KeyError:
109
msg = 'Unknown bzr format "%s". See "bzr help formats".' % typestring
110
raise errors.BzrCommandError(msg)
233
111
234
112
235
113
# TODO: Make sure no commands unconditionally use the working directory as a
239
117
# opens the branch?)
240
118
241
119
class cmd_status(Command):
242
__doc__ = """Display status summary.
120
"""Display status summary.
243
121
244
122
This reports on versioned and unknown files, reporting them
245
123
grouped by state. Possible states are:
265
143
unknown
266
144
Not versioned and not matching an ignore pattern.
267
145
268
Additionally for directories, symlinks and files with an executable
269
bit, Bazaar indicates their type using a trailing character: '/', '@'
270
or '*' respectively.
271
272
146
To see ignored files use 'bzr ignored'. For details on the
273
147
changes to file texts, use 'bzr diff'.
274
148
275
149
Note that --short or -S gives status flags for each item, similar
276
150
to Subversion's status command. To get output similar to svn -q,
277
use bzr status -SV.
151
use bzr -SV.
278
152
279
153
If no arguments are specified, the status of the entire working
280
154
directory is shown. Otherwise, only the status of the specified
281
155
files or directories is reported. If a directory is given, status
282
156
is reported for everything inside that directory.
283
157
284
Before merges are committed, the pending merge tip revisions are
285
shown. To see all pending merge revisions, use the -v option.
286
To skip the display of pending merge information altogether, use
287
the no-pending option or specify a file/directory.
288
289
158
If a revision argument is given, the status is calculated against
290
159
that revision, or between two revisions if two are provided.
291
160
"""
292
161
293
162
# TODO: --no-recurse, --recurse options
294
163
295
164
takes_args = ['file*']
296
takes_options = ['show-ids', 'revision', 'change', 'verbose',
165
takes_options = ['show-ids', 'revision', 'change',
297
166
Option('short', help='Use short status indicators.',
298
167
short_name='S'),
299
168
Option('versioned', help='Only show versioned files.',
305
174
306
175
encoding_type = 'replace'
307
176
_see_also = ['diff', 'revert', 'status-flags']
308
177
309
178
@display_command
310
179
def run(self, show_ids=False, file_list=None, revision=None, short=False,
311
versioned=False, no_pending=False, verbose=False):
180
versioned=False, no_pending=False):
312
181
from bzrlib.status import show_tree_status
313
182
314
183
if revision and len(revision) > 2:
315
184
raise errors.BzrCommandError('bzr status --revision takes exactly'
316
185
' one or two revision specifiers')
317
186
318
tree, relfile_list = tree_files(file_list)
319
# Avoid asking for specific files when that is not needed.
320
if relfile_list == ['']:
321
relfile_list = None
322
# Don't disable pending merges for full trees other than '.'.
323
if file_list == ['.']:
324
no_pending = True
325
# A specific path within a tree was given.
326
elif relfile_list is not None:
327
no_pending = True
187
tree, file_list = tree_files(file_list)
188
328
189
show_tree_status(tree, show_ids=show_ids,
329
specific_files=relfile_list, revision=revision,
190
specific_files=file_list, revision=revision,
330
191
to_file=self.outf, short=short, versioned=versioned,
331
show_pending=(not no_pending), verbose=verbose)
192
show_pending=not no_pending)
332
193
333
194
334
195
class cmd_cat_revision(Command):
335
__doc__ = """Write out metadata for a revision.
336
196
"""Write out metadata for a revision.
197
337
198
The revision to print can either be specified by a specific
338
199
revision identifier, or you can use --revision.
339
200
"""
343
204
takes_options = ['revision']
344
205
# cat-revision is more for frontends so should be exact
345
206
encoding = 'strict'
346
347
def print_revision(self, revisions, revid):
348
stream = revisions.get_record_stream([(revid,)], 'unordered', True)
349
record = stream.next()
350
if record.storage_kind == 'absent':
351
raise errors.NoSuchRevision(revisions, revid)
352
revtext = record.get_bytes_as('fulltext')
353
self.outf.write(revtext.decode('utf-8'))
354
207
355
208
@display_command
356
209
def run(self, revision_id=None, revision=None):
357
210
if revision_id is not None and revision is not None:
362
215
' --revision or a revision_id')
363
216
b = WorkingTree.open_containing(u'.')[0].branch
364
217
365
revisions = b.repository.revisions
366
if revisions is None:
367
raise errors.BzrCommandError('Repository %r does not support '
368
'access to raw revision texts')
369
370
b.repository.lock_read()
371
try:
372
# TODO: jam 20060112 should cat-revision always output utf-8?
373
if revision_id is not None:
374
revision_id = osutils.safe_revision_id(revision_id, warn=False)
375
try:
376
self.print_revision(revisions, revision_id)
377
except errors.NoSuchRevision:
378
msg = "The repository %s contains no revision %s." % (
379
b.repository.base, revision_id)
380
raise errors.BzrCommandError(msg)
381
elif revision is not None:
382
for rev in revision:
383
if rev is None:
384
raise errors.BzrCommandError(
385
'You cannot specify a NULL revision.')
386
rev_id = rev.as_revision_id(b)
387
self.print_revision(revisions, rev_id)
388
finally:
389
b.repository.unlock()
390
391
392
class cmd_dump_btree(Command):
393
__doc__ = """Dump the contents of a btree index file to stdout.
394
395
PATH is a btree index file, it can be any URL. This includes things like
396
.bzr/repository/pack-names, or .bzr/repository/indices/a34b3a...ca4a4.iix
397
398
By default, the tuples stored in the index file will be displayed. With
399
--raw, we will uncompress the pages, but otherwise display the raw bytes
400
stored in the index.
401
"""
402
403
# TODO: Do we want to dump the internal nodes as well?
404
# TODO: It would be nice to be able to dump the un-parsed information,
405
# rather than only going through iter_all_entries. However, this is
406
# good enough for a start
407
hidden = True
408
encoding_type = 'exact'
409
takes_args = ['path']
410
takes_options = [Option('raw', help='Write the uncompressed bytes out,'
411
' rather than the parsed tuples.'),
412
]
413
414
def run(self, path, raw=False):
415
dirname, basename = osutils.split(path)
416
t = transport.get_transport(dirname)
417
if raw:
418
self._dump_raw_bytes(t, basename)
419
else:
420
self._dump_entries(t, basename)
421
422
def _get_index_and_bytes(self, trans, basename):
423
"""Create a BTreeGraphIndex and raw bytes."""
424
bt = btree_index.BTreeGraphIndex(trans, basename, None)
425
bytes = trans.get_bytes(basename)
426
bt._file = cStringIO.StringIO(bytes)
427
bt._size = len(bytes)
428
return bt, bytes
429
430
def _dump_raw_bytes(self, trans, basename):
431
import zlib
432
433
# We need to parse at least the root node.
434
# This is because the first page of every row starts with an
435
# uncompressed header.
436
bt, bytes = self._get_index_and_bytes(trans, basename)
437
for page_idx, page_start in enumerate(xrange(0, len(bytes),
438
btree_index._PAGE_SIZE)):
439
page_end = min(page_start + btree_index._PAGE_SIZE, len(bytes))
440
page_bytes = bytes[page_start:page_end]
441
if page_idx == 0:
442
self.outf.write('Root node:\n')
443
header_end, data = bt._parse_header_from_bytes(page_bytes)
444
self.outf.write(page_bytes[:header_end])
445
page_bytes = data
446
self.outf.write('\nPage %d\n' % (page_idx,))
447
decomp_bytes = zlib.decompress(page_bytes)
448
self.outf.write(decomp_bytes)
449
self.outf.write('\n')
450
451
def _dump_entries(self, trans, basename):
452
try:
453
st = trans.stat(basename)
454
except errors.TransportNotPossible:
455
# We can't stat, so we'll fake it because we have to do the 'get()'
456
# anyway.
457
bt, _ = self._get_index_and_bytes(trans, basename)
458
else:
459
bt = btree_index.BTreeGraphIndex(trans, basename, st.st_size)
460
for node in bt.iter_all_entries():
461
# Node is made up of:
462
# (index, key, value, [references])
463
try:
464
refs = node[3]
465
except IndexError:
466
refs_as_tuples = None
467
else:
468
refs_as_tuples = static_tuple.as_tuples(refs)
469
as_tuple = (tuple(node[1]), node[2], refs_as_tuples)
470
self.outf.write('%s\n' % (as_tuple,))
471
218
# TODO: jam 20060112 should cat-revision always output utf-8?
219
if revision_id is not None:
220
revision_id = osutils.safe_revision_id(revision_id, warn=False)
221
self.outf.write(b.repository.get_revision_xml(revision_id).decode('utf-8'))
222
elif revision is not None:
223
for rev in revision:
224
if rev is None:
225
raise errors.BzrCommandError('You cannot specify a NULL'
226
' revision.')
227
rev_id = rev.as_revision_id(b)
228
self.outf.write(b.repository.get_revision_xml(rev_id).decode('utf-8'))
229
472
230
473
231
class cmd_remove_tree(Command):
474
__doc__ = """Remove the working tree from a given branch/checkout.
232
"""Remove the working tree from a given branch/checkout.
475
233
476
234
Since a lightweight checkout is little more than a working tree
477
235
this will refuse to run against one.
479
237
To re-create the working tree, use "bzr checkout".
480
238
"""
481
239
_see_also = ['checkout', 'working-trees']
482
takes_args = ['location*']
483
takes_options = [
484
Option('force',
485
help='Remove the working tree even if it has '
486
'uncommitted changes.'),
487
]
488
489
def run(self, location_list, force=False):
490
if not location_list:
491
location_list=['.']
492
493
for location in location_list:
494
d = bzrdir.BzrDir.open(location)
495
496
try:
497
working = d.open_workingtree()
498
except errors.NoWorkingTree:
499
raise errors.BzrCommandError("No working tree to remove")
500
except errors.NotLocalUrl:
501
raise errors.BzrCommandError("You cannot remove the working tree"
502
" of a remote path")
503
if not force:
504
if (working.has_changes()):
505
raise errors.UncommittedChanges(working)
506
507
if working.user_url != working.branch.user_url:
508
raise errors.BzrCommandError("You cannot remove the working tree"
509
" from a lightweight checkout")
510
511
d.destroy_workingtree()
512
240
241
takes_args = ['location?']
242
243
def run(self, location='.'):
244
d = bzrdir.BzrDir.open(location)
245
246
try:
247
working = d.open_workingtree()
248
except errors.NoWorkingTree:
249
raise errors.BzrCommandError("No working tree to remove")
250
except errors.NotLocalUrl:
251
raise errors.BzrCommandError("You cannot remove the working tree of a "
252
"remote path")
253
254
working_path = working.bzrdir.root_transport.base
255
branch_path = working.branch.bzrdir.root_transport.base
256
if working_path != branch_path:
257
raise errors.BzrCommandError("You cannot remove the working tree from "
258
"a lightweight checkout")
259
260
d.destroy_workingtree()
261
513
262
514
263
class cmd_revno(Command):
515
__doc__ = """Show current revision number.
264
"""Show current revision number.
516
265
517
266
This is equal to the number of revisions on this branch.
518
267
"""
519
268
520
269
_see_also = ['info']
521
270
takes_args = ['location?']
522
takes_options = [
523
Option('tree', help='Show revno of working tree'),
524
]
525
271
526
272
@display_command
527
def run(self, tree=False, location=u'.'):
528
if tree:
529
try:
530
wt = WorkingTree.open_containing(location)[0]
531
wt.lock_read()
532
except (errors.NoWorkingTree, errors.NotLocalUrl):
533
raise errors.NoWorkingTree(location)
534
self.add_cleanup(wt.unlock)
535
revid = wt.last_revision()
536
try:
537
revno_t = wt.branch.revision_id_to_dotted_revno(revid)
538
except errors.NoSuchRevision:
539
revno_t = ('???',)
540
revno = ".".join(str(n) for n in revno_t)
541
else:
542
b = Branch.open_containing(location)[0]
543
b.lock_read()
544
self.add_cleanup(b.unlock)
545
revno = b.revno()
546
self.cleanup_now()
547
self.outf.write(str(revno) + '\n')
273
def run(self, location=u'.'):
274
self.outf.write(str(Branch.open_containing(location)[0].revno()))
275
self.outf.write('\n')
548
276
549
277
550
278
class cmd_revision_info(Command):
551
__doc__ = """Show revision number and revision id for a given revision identifier.
279
"""Show revision number and revision id for a given revision identifier.
552
280
"""
553
281
hidden = True
554
282
takes_args = ['revision_info*']
555
takes_options = [
556
'revision',
557
Option('directory',
558
help='Branch to examine, '
559
'rather than the one containing the working directory.',
560
short_name='d',
561
type=unicode,
562
),
563
Option('tree', help='Show revno of working tree'),
564
]
283
takes_options = ['revision']
565
284
566
285
@display_command
567
def run(self, revision=None, directory=u'.', tree=False,
568
revision_info_list=[]):
286
def run(self, revision=None, revision_info_list=[]):
569
287
570
try:
571
wt = WorkingTree.open_containing(directory)[0]
572
b = wt.branch
573
wt.lock_read()
574
self.add_cleanup(wt.unlock)
575
except (errors.NoWorkingTree, errors.NotLocalUrl):
576
wt = None
577
b = Branch.open_containing(directory)[0]
578
b.lock_read()
579
self.add_cleanup(b.unlock)
580
revision_ids = []
288
revs = []
581
289
if revision is not None:
582
revision_ids.extend(rev.as_revision_id(b) for rev in revision)
290
revs.extend(revision)
583
291
if revision_info_list is not None:
584
for rev_str in revision_info_list:
585
rev_spec = RevisionSpec.from_string(rev_str)
586
revision_ids.append(rev_spec.as_revision_id(b))
587
# No arguments supplied, default to the last revision
588
if len(revision_ids) == 0:
589
if tree:
590
if wt is None:
591
raise errors.NoWorkingTree(directory)
592
revision_ids.append(wt.last_revision())
593
else:
594
revision_ids.append(b.last_revision())
595
596
revinfos = []
597
maxlen = 0
598
for revision_id in revision_ids:
292
for rev in revision_info_list:
293
revs.append(RevisionSpec.from_string(rev))
294
295
b = Branch.open_containing(u'.')[0]
296
297
if len(revs) == 0:
298
revs.append(RevisionSpec.from_string('-1'))
299
300
for rev in revs:
301
revision_id = rev.as_revision_id(b)
599
302
try:
600
dotted_revno = b.revision_id_to_dotted_revno(revision_id)
601
revno = '.'.join(str(i) for i in dotted_revno)
303
revno = '%4d' % (b.revision_id_to_revno(revision_id))
602
304
except errors.NoSuchRevision:
603
revno = '???'
604
maxlen = max(maxlen, len(revno))
605
revinfos.append([revno, revision_id])
606
607
self.cleanup_now()
608
for ri in revinfos:
609
self.outf.write('%*s %s\n' % (maxlen, ri[0], ri[1]))
610
611
305
dotted_map = b.get_revision_id_to_revno_map()
306
revno = '.'.join(str(i) for i in dotted_map[revision_id])
307
print '%s %s' % (revno, revision_id)
308
309
612
310
class cmd_add(Command):
613
__doc__ = """Add specified files or directories.
311
"""Add specified files or directories.
614
312
615
313
In non-recursive mode, all the named items are added, regardless
616
314
of whether they were previously ignored. A warning is given if
632
330
you should never need to explicitly add a directory, they'll just
633
331
get added when you add a file in the directory.
634
332
635
--dry-run will show which files would be added, but not actually
333
--dry-run will show which files would be added, but not actually
636
334
add them.
637
335
638
336
--file-ids-from will try to use the file ids from the supplied path.
642
340
branches that will be merged later (without showing the two different
643
341
adds as a conflict). It is also useful when merging another project
644
342
into a subdirectory of this one.
645
646
Any files matching patterns in the ignore list will not be added
647
unless they are explicitly mentioned.
648
343
"""
649
344
takes_args = ['file*']
650
345
takes_options = [
658
353
help='Lookup file ids from this tree.'),
659
354
]
660
355
encoding_type = 'replace'
661
_see_also = ['remove', 'ignore']
356
_see_also = ['remove']
662
357
663
358
def run(self, file_list, no_recurse=False, dry_run=False, verbose=False,
664
359
file_ids_from=None):
682
377
683
378
if base_tree:
684
379
base_tree.lock_read()
685
self.add_cleanup(base_tree.unlock)
686
tree, file_list = tree_files_for_add(file_list)
687
added, ignored = tree.smart_add(file_list, not
688
no_recurse, action=action, save=not dry_run)
689
self.cleanup_now()
380
try:
381
file_list = self._maybe_expand_globs(file_list)
382
if file_list:
383
tree = WorkingTree.open_containing(file_list[0])[0]
384
else:
385
tree = WorkingTree.open_containing(u'.')[0]
386
added, ignored = tree.smart_add(file_list, not
387
no_recurse, action=action, save=not dry_run)
388
finally:
389
if base_tree is not None:
390
base_tree.unlock()
690
391
if len(ignored) > 0:
691
392
if verbose:
692
393
for glob in sorted(ignored.keys()):
693
394
for path in ignored[glob]:
694
self.outf.write("ignored %s matching \"%s\"\n"
395
self.outf.write("ignored %s matching \"%s\"\n"
695
396
% (path, glob))
397
else:
398
match_len = 0
399
for glob, paths in ignored.items():
400
match_len += len(paths)
401
self.outf.write("ignored %d file(s).\n" % match_len)
402
self.outf.write("If you wish to add some of these files,"
403
" please add them by name.\n")
696
404
697
405
698
406
class cmd_mkdir(Command):
699
__doc__ = """Create a new versioned directory.
407
"""Create a new versioned directory.
700
408
701
409
This is equivalent to creating the directory and then adding it.
702
410
"""
706
414
707
415
def run(self, dir_list):
708
416
for d in dir_list:
417
os.mkdir(d)
709
418
wt, dd = WorkingTree.open_containing(d)
710
base = os.path.dirname(dd)
711
id = wt.path2id(base)
712
if id != None:
713
os.mkdir(d)
714
wt.add([dd])
715
self.outf.write('added %s\n' % d)
716
else:
717
raise errors.NotVersionedError(path=base)
419
wt.add([dd])
420
self.outf.write('added %s\n' % d)
718
421
719
422
720
423
class cmd_relpath(Command):
721
__doc__ = """Show path of a file relative to root"""
424
"""Show path of a file relative to root"""
722
425
723
426
takes_args = ['filename']
724
427
hidden = True
725
428
726
429
@display_command
727
430
def run(self, filename):
728
431
# TODO: jam 20050106 Can relpath return a munged path if
733
436
734
437
735
438
class cmd_inventory(Command):
736
__doc__ = """Show inventory of the current working copy or a revision.
439
"""Show inventory of the current working copy or a revision.
737
440
738
441
It is possible to limit the output to a particular entry
739
442
type using the --kind option. For example: --kind file.
758
461
if kind and kind not in ['file', 'directory', 'symlink']:
759
462
raise errors.BzrCommandError('invalid kind %r specified' % (kind,))
760
463
761
revision = _get_one_revision('inventory', revision)
762
464
work_tree, file_list = tree_files(file_list)
763
465
work_tree.lock_read()
764
self.add_cleanup(work_tree.unlock)
765
if revision is not None:
766
tree = revision.as_tree(work_tree.branch)
767
768
extra_trees = [work_tree]
769
tree.lock_read()
770
self.add_cleanup(tree.unlock)
771
else:
772
tree = work_tree
773
extra_trees = []
774
775
if file_list is not None:
776
file_ids = tree.paths2ids(file_list, trees=extra_trees,
777
require_versioned=True)
778
# find_ids_across_trees may include some paths that don't
779
# exist in 'tree'.
780
entries = sorted((tree.id2path(file_id), tree.inventory[file_id])
781
for file_id in file_ids if file_id in tree)
782
else:
783
entries = tree.inventory.entries()
784
785
self.cleanup_now()
466
try:
467
if revision is not None:
468
if len(revision) > 1:
469
raise errors.BzrCommandError(
470
'bzr inventory --revision takes exactly one revision'
471
' identifier')
472
revision_id = revision[0].as_revision_id(work_tree.branch)
473
tree = work_tree.branch.repository.revision_tree(revision_id)
474
475
extra_trees = [work_tree]
476
tree.lock_read()
477
else:
478
tree = work_tree
479
extra_trees = []
480
481
if file_list is not None:
482
file_ids = tree.paths2ids(file_list, trees=extra_trees,
483
require_versioned=True)
484
# find_ids_across_trees may include some paths that don't
485
# exist in 'tree'.
486
entries = sorted((tree.id2path(file_id), tree.inventory[file_id])
487
for file_id in file_ids if file_id in tree)
488
else:
489
entries = tree.inventory.entries()
490
finally:
491
tree.unlock()
492
if tree is not work_tree:
493
work_tree.unlock()
494
786
495
for path, entry in entries:
787
496
if kind and kind != entry.kind:
788
497
continue
794
503
795
504
796
505
class cmd_mv(Command):
797
__doc__ = """Move or rename a file.
506
"""Move or rename a file.
798
507
799
508
:Usage:
800
509
bzr mv OLDNAME NEWNAME
817
526
takes_args = ['names*']
818
527
takes_options = [Option("after", help="Move only the bzr identifier"
819
528
" of the file, because the file has already been moved."),
820
Option('auto', help='Automatically guess renames.'),
821
Option('dry-run', help='Avoid making changes when guessing renames.'),
822
529
]
823
530
aliases = ['move', 'rename']
824
531
encoding_type = 'replace'
825
532
826
def run(self, names_list, after=False, auto=False, dry_run=False):
827
if auto:
828
return self.run_auto(names_list, after, dry_run)
829
elif dry_run:
830
raise errors.BzrCommandError('--dry-run requires --auto.')
533
def run(self, names_list, after=False):
831
534
if names_list is None:
832
535
names_list = []
536
833
537
if len(names_list) < 2:
834
538
raise errors.BzrCommandError("missing file argument")
835
tree, rel_names = tree_files(names_list, canonicalize=False)
836
tree.lock_tree_write()
837
self.add_cleanup(tree.unlock)
838
self._run(tree, names_list, rel_names, after)
839
840
def run_auto(self, names_list, after, dry_run):
841
if names_list is not None and len(names_list) > 1:
842
raise errors.BzrCommandError('Only one path may be specified to'
843
' --auto.')
844
if after:
845
raise errors.BzrCommandError('--after cannot be specified with'
846
' --auto.')
847
work_tree, file_list = tree_files(names_list, default_branch='.')
848
work_tree.lock_tree_write()
849
self.add_cleanup(work_tree.unlock)
850
rename_map.RenameMap.guess_renames(work_tree, dry_run)
539
tree, rel_names = tree_files(names_list)
540
tree.lock_write()
541
try:
542
self._run(tree, names_list, rel_names, after)
543
finally:
544
tree.unlock()
851
545
852
546
def _run(self, tree, names_list, rel_names, after):
853
547
into_existing = osutils.isdir(names_list[-1])
862
556
into_existing = False
863
557
else:
864
558
inv = tree.inventory
865
# 'fix' the case of a potential 'from'
866
from_id = tree.path2id(
867
tree.get_canonical_inventory_path(rel_names[0]))
559
from_id = tree.path2id(rel_names[0])
868
560
if (not osutils.lexists(names_list[0]) and
869
561
from_id and inv.get_file_kind(from_id) == "directory"):
870
562
into_existing = False
871
563
# move/rename
872
564
if into_existing:
873
565
# move into existing directory
874
# All entries reference existing inventory items, so fix them up
875
# for cicp file-systems.
876
rel_names = tree.get_canonical_inventory_paths(rel_names)
877
for src, dest in tree.move(rel_names[:-1], rel_names[-1], after=after):
878
if not is_quiet():
879
self.outf.write("%s => %s\n" % (src, dest))
566
for pair in tree.move(rel_names[:-1], rel_names[-1], after=after):
567
self.outf.write("%s => %s\n" % pair)
880
568
else:
881
569
if len(names_list) != 2:
882
570
raise errors.BzrCommandError('to mv multiple files the'
883
571
' destination must be a versioned'
884
572
' directory')
885
886
# for cicp file-systems: the src references an existing inventory
887
# item:
888
src = tree.get_canonical_inventory_path(rel_names[0])
889
# Find the canonical version of the destination: In all cases, the
890
# parent of the target must be in the inventory, so we fetch the
891
# canonical version from there (we do not always *use* the
892
# canonicalized tail portion - we may be attempting to rename the
893
# case of the tail)
894
canon_dest = tree.get_canonical_inventory_path(rel_names[1])
895
dest_parent = osutils.dirname(canon_dest)
896
spec_tail = osutils.basename(rel_names[1])
897
# For a CICP file-system, we need to avoid creating 2 inventory
898
# entries that differ only by case. So regardless of the case
899
# we *want* to use (ie, specified by the user or the file-system),
900
# we must always choose to use the case of any existing inventory
901
# items. The only exception to this is when we are attempting a
902
# case-only rename (ie, canonical versions of src and dest are
903
# the same)
904
dest_id = tree.path2id(canon_dest)
905
if dest_id is None or tree.path2id(src) == dest_id:
906
# No existing item we care about, so work out what case we
907
# are actually going to use.
908
if after:
909
# If 'after' is specified, the tail must refer to a file on disk.
910
if dest_parent:
911
dest_parent_fq = osutils.pathjoin(tree.basedir, dest_parent)
912
else:
913
# pathjoin with an empty tail adds a slash, which breaks
914
# relpath :(
915
dest_parent_fq = tree.basedir
916
917
dest_tail = osutils.canonical_relpath(
918
dest_parent_fq,
919
osutils.pathjoin(dest_parent_fq, spec_tail))
920
else:
921
# not 'after', so case as specified is used
922
dest_tail = spec_tail
923
else:
924
# Use the existing item so 'mv' fails with AlreadyVersioned.
925
dest_tail = os.path.basename(canon_dest)
926
dest = osutils.pathjoin(dest_parent, dest_tail)
927
mutter("attempting to move %s => %s", src, dest)
928
tree.rename_one(src, dest, after=after)
929
if not is_quiet():
930
self.outf.write("%s => %s\n" % (src, dest))
573
tree.rename_one(rel_names[0], rel_names[1], after=after)
574
self.outf.write("%s => %s\n" % (rel_names[0], rel_names[1]))
931
575
932
576
933
577
class cmd_pull(Command):
934
__doc__ = """Turn this branch into a mirror of another branch.
578
"""Turn this branch into a mirror of another branch.
935
579
936
By default, this command only works on branches that have not diverged.
937
Branches are considered diverged if the destination branch's most recent
938
commit is one that has not been merged (directly or indirectly) into the
939
parent.
580
This command only works on branches that have not diverged. Branches are
581
considered diverged if the destination branch's most recent commit is one
582
that has not been merged (directly or indirectly) into the parent.
940
583
941
584
If branches have diverged, you can use 'bzr merge' to integrate the changes
942
585
from one into the other. Once one branch has merged, the other should
943
586
be able to pull it again.
944
587
945
If you want to replace your local changes and just want your branch to
946
match the remote one, use pull --overwrite. This will work even if the two
947
branches have diverged.
588
If you want to forget your local changes and just update your branch to
589
match the remote one, use pull --overwrite.
948
590
949
591
If there is no default location set, the first pull will set it. After
950
592
that, you can omit the location to use the default. To change the
956
598
with bzr send.
957
599
"""
958
600
959
_see_also = ['push', 'update', 'status-flags', 'send']
601
_see_also = ['push', 'update', 'status-flags']
960
602
takes_options = ['remember', 'overwrite', 'revision',
961
603
custom_help('verbose',
962
604
help='Show logs of pulled revisions.'),
966
608
short_name='d',
967
609
type=unicode,
968
610
),
969
Option('local',
970
help="Perform a local pull in a bound "
971
"branch. Local pulls are not applied to "
972
"the master branch."
973
),
974
611
]
975
612
takes_args = ['location?']
976
613
encoding_type = 'replace'
977
614
978
615
def run(self, location=None, remember=False, overwrite=False,
979
616
revision=None, verbose=False,
980
directory=None, local=False):
617
directory=None):
981
618
# FIXME: too much stuff is in the command class
982
619
revision_id = None
983
620
mergeable = None
986
623
try:
987
624
tree_to = WorkingTree.open_containing(directory)[0]
988
625
branch_to = tree_to.branch
989
tree_to.lock_write()
990
self.add_cleanup(tree_to.unlock)
991
626
except errors.NoWorkingTree:
992
627
tree_to = None
993
628
branch_to = Branch.open_containing(directory)[0]
994
branch_to.lock_write()
995
self.add_cleanup(branch_to.unlock)
996
997
if local and not branch_to.get_bound_location():
998
raise errors.LocalRequiresBoundBranch()
999
629
1000
630
possible_transports = []
1001
631
if location is not None:
1014
644
display_url = urlutils.unescape_for_display(stored_loc,
1015
645
self.outf.encoding)
1016
646
if not is_quiet():
1017
self.outf.write("Using saved parent location: %s\n" % display_url)
647
self.outf.write("Using saved location: %s\n" % display_url)
1018
648
location = stored_loc
1019
649
1020
revision = _get_one_revision('pull', revision)
1021
650
if mergeable is not None:
1022
651
if revision is not None:
1023
652
raise errors.BzrCommandError(
1029
658
else:
1030
659
branch_from = Branch.open(location,
1031
660
possible_transports=possible_transports)
1032
branch_from.lock_read()
1033
self.add_cleanup(branch_from.unlock)
1034
661
1035
662
if branch_to.get_parent() is None or remember:
1036
663
branch_to.set_parent(branch_from.base)
1037
664
1038
665
if revision is not None:
1039
revision_id = revision.as_revision_id(branch_from)
666
if len(revision) == 1:
667
revision_id = revision[0].as_revision_id(branch_from)
668
else:
669
raise errors.BzrCommandError(
670
'bzr pull --revision takes one value.')
1040
671
672
if verbose:
673
old_rh = branch_to.revision_history()
1041
674
if tree_to is not None:
1042
view_info = _get_view_info_for_change_reporter(tree_to)
1043
675
change_reporter = delta._ChangeReporter(
1044
unversioned_filter=tree_to.is_ignored,
1045
view_info=view_info)
1046
result = tree_to.pull(
1047
branch_from, overwrite, revision_id, change_reporter,
1048
possible_transports=possible_transports, local=local)
676
unversioned_filter=tree_to.is_ignored)
677
result = tree_to.pull(branch_from, overwrite, revision_id,
678
change_reporter,
679
possible_transports=possible_transports)
1049
680
else:
1050
result = branch_to.pull(
1051
branch_from, overwrite, revision_id, local=local)
681
result = branch_to.pull(branch_from, overwrite, revision_id)
1052
682
1053
683
result.report(self.outf)
1054
if verbose and result.old_revid != result.new_revid:
1055
log.show_branch_change(
1056
branch_to, self.outf, result.old_revno,
1057
result.old_revid)
684
if verbose:
685
new_rh = branch_to.revision_history()
686
log.show_changed_revisions(branch_to, old_rh, new_rh,
687
to_file=self.outf)
1058
688
1059
689
1060
690
class cmd_push(Command):
1061
__doc__ = """Update a mirror of this branch.
1062
691
"""Update a mirror of this branch.
692
1063
693
The target branch will not have its working tree populated because this
1064
694
is both expensive, and is not supported on remote file systems.
1065
695
1066
696
Some smart servers or protocols *may* put the working tree in place in
1067
697
the future.
1068
698
1072
702
1073
703
If branches have diverged, you can use 'bzr push --overwrite' to replace
1074
704
the other branch completely, discarding its unmerged changes.
1075
705
1076
706
If you want to ensure you have the different changes in the other branch,
1077
707
do a merge (see bzr help merge) from the other branch, and commit that.
1078
708
After that you will be able to do a push without '--overwrite'.
1099
729
' directory exists, but does not already'
1100
730
' have a control directory. This flag will'
1101
731
' allow push to proceed.'),
1102
Option('stacked',
1103
help='Create a stacked branch that references the public location '
1104
'of the parent branch.'),
1105
Option('stacked-on',
1106
help='Create a stacked branch that refers to another branch '
1107
'for the commit history. Only the work not present in the '
1108
'referenced branch is included in the branch created.',
1109
type=unicode),
1110
Option('strict',
1111
help='Refuse to push if there are uncommitted changes in'
1112
' the working tree, --no-strict disables the check.'),
1113
732
]
1114
733
takes_args = ['location?']
1115
734
encoding_type = 'replace'
1116
735
1117
736
def run(self, location=None, remember=False, overwrite=False,
1118
create_prefix=False, verbose=False, revision=None,
1119
use_existing_dir=False, directory=None, stacked_on=None,
1120
stacked=False, strict=None):
1121
from bzrlib.push import _show_push_branch
1122
737
create_prefix=False, verbose=False, revision=None,
738
use_existing_dir=False,
739
directory=None):
740
# FIXME: Way too big! Put this into a function called from the
741
# command.
1123
742
if directory is None:
1124
743
directory = '.'
1125
# Get the source branch
1126
(tree, br_from,
1127
_unused) = bzrdir.BzrDir.open_containing_tree_or_branch(directory)
1128
# Get the tip's revision_id
1129
revision = _get_one_revision('push', revision)
1130
if revision is not None:
1131
revision_id = revision.in_history(br_from).rev_id
1132
else:
1133
revision_id = None
1134
if tree is not None and revision_id is None:
1135
tree.check_changed_or_out_of_date(
1136
strict, 'push_strict',
1137
more_error='Use --no-strict to force the push.',
1138
more_warning='Uncommitted changes will not be pushed.')
1139
# Get the stacked_on branch, if any
1140
if stacked_on is not None:
1141
stacked_on = urlutils.normalize_url(stacked_on)
1142
elif stacked:
1143
parent_url = br_from.get_parent()
1144
if parent_url:
1145
parent = Branch.open(parent_url)
1146
stacked_on = parent.get_public_branch()
1147
if not stacked_on:
1148
# I considered excluding non-http url's here, thus forcing
1149
# 'public' branches only, but that only works for some
1150
# users, so it's best to just depend on the user spotting an
1151
# error by the feedback given to them. RBC 20080227.
1152
stacked_on = parent_url
1153
if not stacked_on:
1154
raise errors.BzrCommandError(
1155
"Could not determine branch to refer to.")
1156
1157
# Get the destination location
744
br_from = Branch.open_containing(directory)[0]
745
stored_loc = br_from.get_push_location()
1158
746
if location is None:
1159
stored_loc = br_from.get_push_location()
1160
747
if stored_loc is None:
1161
raise errors.BzrCommandError(
1162
"No push location known or specified.")
748
raise errors.BzrCommandError("No push location known or specified.")
1163
749
else:
1164
750
display_url = urlutils.unescape_for_display(stored_loc,
1165
751
self.outf.encoding)
1166
self.outf.write("Using saved push location: %s\n" % display_url)
752
self.outf.write("Using saved location: %s\n" % display_url)
1167
753
location = stored_loc
1168
754
1169
_show_push_branch(br_from, revision_id, location, self.outf,
1170
verbose=verbose, overwrite=overwrite, remember=remember,
1171
stacked_on=stacked_on, create_prefix=create_prefix,
1172
use_existing_dir=use_existing_dir)
755
to_transport = transport.get_transport(location)
756
757
br_to = repository_to = dir_to = None
758
try:
759
dir_to = bzrdir.BzrDir.open_from_transport(to_transport)
760
except errors.NotBranchError:
761
pass # Didn't find anything
762
else:
763
# If we can open a branch, use its direct repository, otherwise see
764
# if there is a repository without a branch.
765
try:
766
br_to = dir_to.open_branch()
767
except errors.NotBranchError:
768
# Didn't find a branch, can we find a repository?
769
try:
770
repository_to = dir_to.find_repository()
771
except errors.NoRepositoryPresent:
772
pass
773
else:
774
# Found a branch, so we must have found a repository
775
repository_to = br_to.repository
776
777
if revision is not None:
778
if len(revision) == 1:
779
revision_id = revision[0].in_history(br_from).rev_id
780
else:
781
raise errors.BzrCommandError(
782
'bzr push --revision takes one value.')
783
else:
784
revision_id = br_from.last_revision()
785
786
push_result = None
787
if verbose:
788
old_rh = []
789
if dir_to is None:
790
# The destination doesn't exist; create it.
791
# XXX: Refactor the create_prefix/no_create_prefix code into a
792
# common helper function
793
794
def make_directory(transport):
795
transport.mkdir('.')
796
return transport
797
798
def redirected(redirected_transport, e, redirection_notice):
799
return transport.get_transport(e.get_target_url())
800
801
try:
802
to_transport = transport.do_catching_redirections(
803
make_directory, to_transport, redirected)
804
except errors.FileExists:
805
if not use_existing_dir:
806
raise errors.BzrCommandError("Target directory %s"
807
" already exists, but does not have a valid .bzr"
808
" directory. Supply --use-existing-dir to push"
809
" there anyway." % location)
810
except errors.NoSuchFile:
811
if not create_prefix:
812
raise errors.BzrCommandError("Parent directory of %s"
813
" does not exist."
814
"\nYou may supply --create-prefix to create all"
815
" leading parent directories."
816
% location)
817
_create_prefix(to_transport)
818
except errors.TooManyRedirections:
819
raise errors.BzrCommandError("Too many redirections trying "
820
"to make %s." % location)
821
822
# Now the target directory exists, but doesn't have a .bzr
823
# directory. So we need to create it, along with any work to create
824
# all of the dependent branches, etc.
825
dir_to = br_from.bzrdir.clone_on_transport(to_transport,
826
revision_id=revision_id)
827
br_to = dir_to.open_branch()
828
# TODO: Some more useful message about what was copied
829
note('Created new branch.')
830
# We successfully created the target, remember it
831
if br_from.get_push_location() is None or remember:
832
br_from.set_push_location(br_to.base)
833
elif repository_to is None:
834
# we have a bzrdir but no branch or repository
835
# XXX: Figure out what to do other than complain.
836
raise errors.BzrCommandError("At %s you have a valid .bzr control"
837
" directory, but not a branch or repository. This is an"
838
" unsupported configuration. Please move the target directory"
839
" out of the way and try again."
840
% location)
841
elif br_to is None:
842
# We have a repository but no branch, copy the revisions, and then
843
# create a branch.
844
repository_to.fetch(br_from.repository, revision_id=revision_id)
845
br_to = br_from.clone(dir_to, revision_id=revision_id)
846
note('Created new branch.')
847
if br_from.get_push_location() is None or remember:
848
br_from.set_push_location(br_to.base)
849
else: # We have a valid to branch
850
# We were able to connect to the remote location, so remember it
851
# we don't need to successfully push because of possible divergence.
852
if br_from.get_push_location() is None or remember:
853
br_from.set_push_location(br_to.base)
854
if verbose:
855
old_rh = br_to.revision_history()
856
try:
857
try:
858
tree_to = dir_to.open_workingtree()
859
except errors.NotLocalUrl:
860
warning("This transport does not update the working "
861
"tree of: %s. See 'bzr help working-trees' for "
862
"more information." % br_to.base)
863
push_result = br_from.push(br_to, overwrite,
864
stop_revision=revision_id)
865
except errors.NoWorkingTree:
866
push_result = br_from.push(br_to, overwrite,
867
stop_revision=revision_id)
868
else:
869
tree_to.lock_write()
870
try:
871
push_result = br_from.push(tree_to.branch, overwrite,
872
stop_revision=revision_id)
873
tree_to.update()
874
finally:
875
tree_to.unlock()
876
except errors.DivergedBranches:
877
raise errors.BzrCommandError('These branches have diverged.'
878
' Try using "merge" and then "push".')
879
if push_result is not None:
880
push_result.report(self.outf)
881
elif verbose:
882
new_rh = br_to.revision_history()
883
if old_rh != new_rh:
884
# Something changed
885
from bzrlib.log import show_changed_revisions
886
show_changed_revisions(br_to, old_rh, new_rh,
887
to_file=self.outf)
888
else:
889
# we probably did a clone rather than a push, so a message was
890
# emitted above
891
pass
1173
892
1174
893
1175
894
class cmd_branch(Command):
1176
__doc__ = """Create a new branch that is a copy of an existing branch.
895
"""Create a new copy of a branch.
1177
896
1178
897
If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will
1179
898
be used. In other words, "branch ../foo/bar" will attempt to create ./bar.
1189
908
_see_also = ['checkout']
1190
909
takes_args = ['from_location', 'to_location?']
1191
910
takes_options = ['revision', Option('hardlink',
1192
help='Hard-link working tree files where possible.'),
1193
Option('no-tree',
1194
help="Create a branch without a working-tree."),
1195
Option('switch',
1196
help="Switch the checkout in the current directory "
1197
"to the new branch."),
1198
Option('stacked',
1199
help='Create a stacked branch referring to the source branch. '
1200
'The new branch will depend on the availability of the source '
1201
'branch for all operations.'),
1202
Option('standalone',
1203
help='Do not use a shared repository, even if available.'),
1204
Option('use-existing-dir',
1205
help='By default branch will fail if the target'
1206
' directory exists, but does not already'
1207
' have a control directory. This flag will'
1208
' allow branch to proceed.'),
1209
Option('bind',
1210
help="Bind new branch to from location."),
1211
]
911
help='Hard-link working tree files where possible.')]
1212
912
aliases = ['get', 'clone']
1213
913
1214
914
def run(self, from_location, to_location=None, revision=None,
1215
hardlink=False, stacked=False, standalone=False, no_tree=False,
1216
use_existing_dir=False, switch=False, bind=False):
1217
from bzrlib import switch as _mod_switch
915
hardlink=False):
1218
916
from bzrlib.tag import _merge_tags_if_possible
917
if revision is None:
918
revision = [None]
919
elif len(revision) > 1:
920
raise errors.BzrCommandError(
921
'bzr branch --revision takes exactly 1 revision value')
922
1219
923
accelerator_tree, br_from = bzrdir.BzrDir.open_tree_or_branch(
1220
924
from_location)
1221
revision = _get_one_revision('branch', revision)
1222
925
br_from.lock_read()
1223
self.add_cleanup(br_from.unlock)
1224
if revision is not None:
1225
revision_id = revision.as_revision_id(br_from)
1226
else:
1227
# FIXME - wt.last_revision, fallback to branch, fall back to
1228
# None or perhaps NULL_REVISION to mean copy nothing
1229
# RBC 20060209
1230
revision_id = br_from.last_revision()
1231
if to_location is None:
1232
to_location = urlutils.derive_to_location(from_location)
1233
to_transport = transport.get_transport(to_location)
1234
try:
1235
to_transport.mkdir('.')
1236
except errors.FileExists:
1237
if not use_existing_dir:
1238
raise errors.BzrCommandError('Target directory "%s" '
1239
'already exists.' % to_location)
1240
else:
1241
try:
1242
bzrdir.BzrDir.open_from_transport(to_transport)
1243
except errors.NotBranchError:
1244
pass
1245
else:
1246
raise errors.AlreadyBranchError(to_location)
1247
except errors.NoSuchFile:
1248
raise errors.BzrCommandError('Parent of "%s" does not exist.'
1249
% to_location)
1250
try:
1251
# preserve whatever source format we have.
1252
dir = br_from.bzrdir.sprout(to_transport.base, revision_id,
1253
possible_transports=[to_transport],
1254
accelerator_tree=accelerator_tree,
1255
hardlink=hardlink, stacked=stacked,
1256
force_new_repo=standalone,
1257
create_tree_if_local=not no_tree,
1258
source_branch=br_from)
1259
branch = dir.open_branch()
1260
except errors.NoSuchRevision:
1261
to_transport.delete_tree('.')
1262
msg = "The branch %s has no revision %s." % (from_location,
1263
revision)
1264
raise errors.BzrCommandError(msg)
1265
_merge_tags_if_possible(br_from, branch)
1266
# If the source branch is stacked, the new branch may
1267
# be stacked whether we asked for that explicitly or not.
1268
# We therefore need a try/except here and not just 'if stacked:'
1269
try:
1270
note('Created new stacked branch referring to %s.' %
1271
branch.get_stacked_on_url())
1272
except (errors.NotStacked, errors.UnstackableBranchFormat,
1273
errors.UnstackableRepositoryFormat), e:
926
try:
927
if len(revision) == 1 and revision[0] is not None:
928
revision_id = revision[0].as_revision_id(br_from)
929
else:
930
# FIXME - wt.last_revision, fallback to branch, fall back to
931
# None or perhaps NULL_REVISION to mean copy nothing
932
# RBC 20060209
933
revision_id = br_from.last_revision()
934
if to_location is None:
935
to_location = urlutils.derive_to_location(from_location)
936
name = None
937
else:
938
name = os.path.basename(to_location) + '\n'
939
940
to_transport = transport.get_transport(to_location)
941
try:
942
to_transport.mkdir('.')
943
except errors.FileExists:
944
raise errors.BzrCommandError('Target directory "%s" already'
945
' exists.' % to_location)
946
except errors.NoSuchFile:
947
raise errors.BzrCommandError('Parent of "%s" does not exist.'
948
% to_location)
949
try:
950
# preserve whatever source format we have.
951
dir = br_from.bzrdir.sprout(to_transport.base, revision_id,
952
possible_transports=[to_transport],
953
accelerator_tree=accelerator_tree,
954
hardlink=hardlink)
955
branch = dir.open_branch()
956
except errors.NoSuchRevision:
957
to_transport.delete_tree('.')
958
msg = "The branch %s has no revision %s." % (from_location, revision[0])
959
raise errors.BzrCommandError(msg)
960
if name:
961
branch.control_files.put_utf8('branch-name', name)
962
_merge_tags_if_possible(br_from, branch)
1274
963
note('Branched %d revision(s).' % branch.revno())
1275
if bind:
1276
# Bind to the parent
1277
parent_branch = Branch.open(from_location)
1278
branch.bind(parent_branch)
1279
note('New branch bound to %s' % from_location)
1280
if switch:
1281
# Switch to the new branch
1282
wt, _ = WorkingTree.open_containing('.')
1283
_mod_switch.switch(wt.bzrdir, branch)
1284
note('Switched to branch: %s',
1285
urlutils.unescape_for_display(branch.base, 'utf-8'))
964
finally:
965
br_from.unlock()
1286
966
1287
967
1288
968
class cmd_checkout(Command):
1289
__doc__ = """Create a new checkout of an existing branch.
969
"""Create a new checkout of an existing branch.
1290
970
1291
971
If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree for
1292
972
the branch found in '.'. This is useful if you have removed the working tree
1293
973
or if it was never created - i.e. if you pushed the branch to its current
1294
974
location using SFTP.
1295
975
1296
976
If the TO_LOCATION is omitted, the last component of the BRANCH_LOCATION will
1297
977
be used. In other words, "checkout ../foo/bar" will attempt to create ./bar.
1298
978
If the BRANCH_LOCATION has no / or path separator embedded, the TO_LOCATION
1326
1006
1327
1007
def run(self, branch_location=None, to_location=None, revision=None,
1328
1008
lightweight=False, files_from=None, hardlink=False):
1009
if revision is None:
1010
revision = [None]
1011
elif len(revision) > 1:
1012
raise errors.BzrCommandError(
1013
'bzr checkout --revision takes exactly 1 revision value')
1329
1014
if branch_location is None:
1330
1015
branch_location = osutils.getcwd()
1331
1016
to_location = branch_location
1332
1017
accelerator_tree, source = bzrdir.BzrDir.open_tree_or_branch(
1333
1018
branch_location)
1334
revision = _get_one_revision('checkout', revision)
1335
1019
if files_from is not None:
1336
1020
accelerator_tree = WorkingTree.open(files_from)
1337
if revision is not None:
1338
revision_id = revision.as_revision_id(source)
1021
if len(revision) == 1 and revision[0] is not None:
1022
revision_id = revision[0].as_revision_id(source)
1339
1023
else:
1340
1024
revision_id = None
1341
1025
if to_location is None:
1342
1026
to_location = urlutils.derive_to_location(branch_location)
1343
# if the source and to_location are the same,
1027
# if the source and to_location are the same,
1344
1028
# and there is no working tree,
1345
1029
# then reconstitute a branch
1346
1030
if (osutils.abspath(to_location) ==
1355
1039
1356
1040
1357
1041
class cmd_renames(Command):
1358
__doc__ = """Show list of renamed files.
1042
"""Show list of renamed files.
1359
1043
"""
1360
1044
# TODO: Option to show renames between two historical versions.
1361
1045
1367
1051
def run(self, dir=u'.'):
1368
1052
tree = WorkingTree.open_containing(dir)[0]
1369
1053
tree.lock_read()
1370
self.add_cleanup(tree.unlock)
1371
new_inv = tree.inventory
1372
old_tree = tree.basis_tree()
1373
old_tree.lock_read()
1374
self.add_cleanup(old_tree.unlock)
1375
old_inv = old_tree.inventory
1376
renames = []
1377
iterator = tree.iter_changes(old_tree, include_unchanged=True)
1378
for f, paths, c, v, p, n, k, e in iterator:
1379
if paths[0] == paths[1]:
1380
continue
1381
if None in (paths):
1382
continue
1383
renames.append(paths)
1384
renames.sort()
1385
for old_name, new_name in renames:
1386
self.outf.write("%s => %s\n" % (old_name, new_name))
1054
try:
1055
new_inv = tree.inventory
1056
old_tree = tree.basis_tree()
1057
old_tree.lock_read()
1058
try:
1059
old_inv = old_tree.inventory
1060
renames = list(_mod_tree.find_renames(old_inv, new_inv))
1061
renames.sort()
1062
for old_name, new_name in renames:
1063
self.outf.write("%s => %s\n" % (old_name, new_name))
1064
finally:
1065
old_tree.unlock()
1066
finally:
1067
tree.unlock()
1387
1068
1388
1069
1389
1070
class cmd_update(Command):
1390
__doc__ = """Update a tree to have the latest code committed to its branch.
1391
1071
"""Update a tree to have the latest code committed to its branch.
1072
1392
1073
This will perform a merge into the working tree, and may generate
1393
conflicts. If you have any local changes, you will still
1074
conflicts. If you have any local changes, you will still
1394
1075
need to commit them after the update for the update to be complete.
1395
1396
If you want to discard your local changes, you can just do a
1076
1077
If you want to discard your local changes, you can just do a
1397
1078
'bzr revert' instead of 'bzr commit' after the update.
1398
1399
If the tree's branch is bound to a master branch, it will also update
1400
the branch from the master.
1401
1079
"""
1402
1080
1403
1081
_see_also = ['pull', 'working-trees', 'status-flags']
1404
1082
takes_args = ['dir?']
1405
takes_options = ['revision']
1406
1083
aliases = ['up']
1407
1084
1408
def run(self, dir='.', revision=None):
1409
if revision is not None and len(revision) != 1:
1410
raise errors.BzrCommandError(
1411
"bzr update --revision takes exactly one revision")
1085
def run(self, dir='.'):
1412
1086
tree = WorkingTree.open_containing(dir)[0]
1413
branch = tree.branch
1414
1087
possible_transports = []
1415
master = branch.get_master_branch(
1088
master = tree.branch.get_master_branch(
1416
1089
possible_transports=possible_transports)
1417
1090
if master is not None:
1418
1091
tree.lock_write()
1419
branch_location = master.base
1420
1092
else:
1421
1093
tree.lock_tree_write()
1422
branch_location = tree.branch.base
1423
self.add_cleanup(tree.unlock)
1424
# get rid of the final '/' and be ready for display
1425
branch_location = urlutils.unescape_for_display(
1426
branch_location.rstrip('/'),
1427
self.outf.encoding)
1428
existing_pending_merges = tree.get_parent_ids()[1:]
1429
if master is None:
1430
old_tip = None
1431
else:
1432
# may need to fetch data into a heavyweight checkout
1433
# XXX: this may take some time, maybe we should display a
1434
# message
1435
old_tip = branch.update(possible_transports)
1436
if revision is not None:
1437
revision_id = revision[0].as_revision_id(branch)
1438
else:
1439
revision_id = branch.last_revision()
1440
if revision_id == _mod_revision.ensure_null(tree.last_revision()):
1441
revno = branch.revision_id_to_dotted_revno(revision_id)
1442
note("Tree is up to date at revision %s of branch %s" %
1443
('.'.join(map(str, revno)), branch_location))
1444
return 0
1445
view_info = _get_view_info_for_change_reporter(tree)
1446
change_reporter = delta._ChangeReporter(
1447
unversioned_filter=tree.is_ignored,
1448
view_info=view_info)
1449
1094
try:
1095
existing_pending_merges = tree.get_parent_ids()[1:]
1096
last_rev = _mod_revision.ensure_null(tree.last_revision())
1097
if last_rev == _mod_revision.ensure_null(
1098
tree.branch.last_revision()):
1099
# may be up to date, check master too.
1100
if master is None or last_rev == _mod_revision.ensure_null(
1101
master.last_revision()):
1102
revno = tree.branch.revision_id_to_revno(last_rev)
1103
note("Tree is up to date at revision %d." % (revno,))
1104
return 0
1450
1105
conflicts = tree.update(
1451
change_reporter,
1452
possible_transports=possible_transports,
1453
revision=revision_id,
1454
old_tip=old_tip)
1455
except errors.NoSuchRevision, e:
1456
raise errors.BzrCommandError(
1457
"branch has no revision %s\n"
1458
"bzr update --revision only works"
1459
" for a revision in the branch history"
1460
% (e.revision))
1461
revno = tree.branch.revision_id_to_dotted_revno(
1462
_mod_revision.ensure_null(tree.last_revision()))
1463
note('Updated to revision %s of branch %s' %
1464
('.'.join(map(str, revno)), branch_location))
1465
parent_ids = tree.get_parent_ids()
1466
if parent_ids[1:] and parent_ids[1:] != existing_pending_merges:
1467
note('Your local commits will now show as pending merges with '
1468
"'bzr status', and can be committed with 'bzr commit'.")
1469
if conflicts != 0:
1470
return 1
1471
else:
1472
return 0
1106
delta._ChangeReporter(unversioned_filter=tree.is_ignored),
1107
possible_transports=possible_transports)
1108
revno = tree.branch.revision_id_to_revno(
1109
_mod_revision.ensure_null(tree.last_revision()))
1110
note('Updated to revision %d.' % (revno,))
1111
if tree.get_parent_ids()[1:] != existing_pending_merges:
1112
note('Your local commits will now show as pending merges with '
1113
"'bzr status', and can be committed with 'bzr commit'.")
1114
if conflicts != 0:
1115
return 1
1116
else:
1117
return 0
1118
finally:
1119
tree.unlock()
1473
1120
1474
1121
1475
1122
class cmd_info(Command):
1476
__doc__ = """Show information about a working tree, branch or repository.
1123
"""Show information about a working tree, branch or repository.
1477
1124
1478
1125
This command will show all known locations and formats associated to the
1479
tree, branch or repository.
1480
1481
In verbose mode, statistical information is included with each report.
1482
To see extended statistic information, use a verbosity level of 2 or
1483
higher by specifying the verbose option multiple times, e.g. -vv.
1126
tree, branch or repository. Statistical information is included with
1127
each report.
1484
1128
1485
1129
Branches and working trees will also report any missing revisions.
1486
1487
:Examples:
1488
1489
Display information on the format and related locations:
1490
1491
bzr info
1492
1493
Display the above together with extended format information and
1494
basic statistics (like the number of files in the working tree and
1495
number of revisions in the branch and repository):
1496
1497
bzr info -v
1498
1499
Display the above together with number of committers to the branch:
1500
1501
bzr info -vv
1502
1130
"""
1503
1131
_see_also = ['revno', 'working-trees', 'repositories']
1504
1132
takes_args = ['location?']
1508
1136
@display_command
1509
1137
def run(self, location=None, verbose=False):
1510
1138
if verbose:
1511
noise_level = get_verbosity_level()
1139
noise_level = 2
1512
1140
else:
1513
1141
noise_level = 0
1514
1142
from bzrlib.info import show_bzrdir_info
1517
1145
1518
1146
1519
1147
class cmd_remove(Command):
1520
__doc__ = """Remove files or directories.
1521
1522
This makes bzr stop tracking changes to the specified files. bzr will delete
1523
them if they can easily be recovered using revert. If no options or
1524
parameters are given bzr will scan for files that are being tracked by bzr
1525
but missing in your tree and stop tracking them for you.
1148
"""Remove files or directories.
1149
1150
This makes bzr stop tracking changes to the specified files and
1151
delete them if they can easily be recovered using revert.
1152
1153
You can specify one or more files, and/or --new. If you specify --new,
1154
only 'added' files will be removed. If you specify both, then new files
1155
in the specified directories will be removed. If the directories are
1156
also new, they will also be removed.
1526
1157
"""
1527
1158
takes_args = ['file*']
1528
1159
takes_options = ['verbose',
1529
Option('new', help='Only remove files that have never been committed.'),
1160
Option('new', help='Remove newly-added files.'),
1530
1161
RegistryOption.from_kwargs('file-deletion-strategy',
1531
1162
'The file deletion mode to be used.',
1532
1163
title='Deletion Strategy', value_switches=True, enum_switch=False,
1533
1164
safe='Only delete files if they can be'
1534
1165
' safely recovered (default).',
1535
keep='Delete from bzr but leave the working copy.',
1166
keep="Don't delete any files.",
1536
1167
force='Delete all the specified files, even if they can not be '
1537
1168
'recovered and even if they are non-empty directories.')]
1538
aliases = ['rm', 'del']
1169
aliases = ['rm']
1539
1170
encoding_type = 'replace'
1540
1171
1541
1172
def run(self, file_list, verbose=False, new=False,
1544
1175
1545
1176
if file_list is not None:
1546
1177
file_list = [f for f in file_list]
1178
elif not new:
1179
raise errors.BzrCommandError('Specify one or more files to'
1180
' remove, or use --new.')
1547
1181
1548
tree.lock_write()
1549
self.add_cleanup(tree.unlock)
1550
# Heuristics should probably all move into tree.remove_smart or
1551
# some such?
1552
1182
if new:
1553
1183
added = tree.changes_from(tree.basis_tree(),
1554
1184
specific_files=file_list).added
1555
1185
file_list = sorted([f[0] for f in added], reverse=True)
1556
1186
if len(file_list) == 0:
1557
1187
raise errors.BzrCommandError('No matching files.')
1558
elif file_list is None:
1559
# missing files show up in iter_changes(basis) as
1560
# versioned-with-no-kind.
1561
missing = []
1562
for change in tree.iter_changes(tree.basis_tree()):
1563
# Find paths in the working tree that have no kind:
1564
if change[1][1] is not None and change[6][1] is None:
1565
missing.append(change[1][1])
1566
file_list = sorted(missing, reverse=True)
1567
file_deletion_strategy = 'keep'
1568
1188
tree.remove(file_list, verbose=verbose, to_file=self.outf,
1569
1189
keep_files=file_deletion_strategy=='keep',
1570
1190
force=file_deletion_strategy=='force')
1571
1191
1572
1192
1573
1193
class cmd_file_id(Command):
1574
__doc__ = """Print file_id of a particular file or directory.
1194
"""Print file_id of a particular file or directory.
1575
1195
1576
1196
The file_id is assigned when the file is first added and remains the
1577
1197
same through all revisions where the file exists, even when it is
1593
1213
1594
1214
1595
1215
class cmd_file_path(Command):
1596
__doc__ = """Print path of file_ids to a file or directory.
1216
"""Print path of file_ids to a file or directory.
1597
1217
1598
1218
This prints one line for each directory down to the target,
1599
1219
starting at the branch root.
1615
1235
1616
1236
1617
1237
class cmd_reconcile(Command):
1618
__doc__ = """Reconcile bzr metadata in a branch.
1238
"""Reconcile bzr metadata in a branch.
1619
1239
1620
1240
This can correct data mismatches that may have been caused by
1621
1241
previous ghost operations or bzr upgrades. You should only
1622
need to run this command if 'bzr check' or a bzr developer
1242
need to run this command if 'bzr check' or a bzr developer
1623
1243
advises you to run it.
1624
1244
1625
1245
If a second branch is provided, cross-branch reconciliation is
1627
1247
id which was not present in very early bzr versions is represented
1628
1248
correctly in both branches.
1629
1249
1630
At the same time it is run it may recompress data resulting in
1250
At the same time it is run it may recompress data resulting in
1631
1251
a potential saving in disk space or performance gain.
1632
1252
1633
1253
The branch *MUST* be on a listable system such as local disk or sftp.
1643
1263
1644
1264
1645
1265
class cmd_revision_history(Command):
1646
__doc__ = """Display the list of revision ids on a branch."""
1266
"""Display the list of revision ids on a branch."""
1647
1267
1648
1268
_see_also = ['log']
1649
1269
takes_args = ['location?']
1659
1279
1660
1280
1661
1281
class cmd_ancestry(Command):
1662
__doc__ = """List all revisions merged into this branch."""
1282
"""List all revisions merged into this branch."""
1663
1283
1664
1284
_see_also = ['log', 'revision-history']
1665
1285
takes_args = ['location?']
1684
1304
1685
1305
1686
1306
class cmd_init(Command):
1687
__doc__ = """Make a directory into a versioned branch.
1307
"""Make a directory into a versioned branch.
1688
1308
1689
1309
Use this to create an empty branch, or before importing an
1690
1310
existing project.
1691
1311
1692
If there is a repository in a parent directory of the location, then
1312
If there is a repository in a parent directory of the location, then
1693
1313
the history of the branch will be stored in the repository. Otherwise
1694
1314
init creates a standalone branch which carries its own history
1695
1315
in the .bzr directory.
1715
1335
RegistryOption('format',
1716
1336
help='Specify a format for this branch. '
1717
1337
'See "help formats".',
1718
lazy_registry=('bzrlib.bzrdir', 'format_registry'),
1719
converter=lambda name: bzrdir.format_registry.make_bzrdir(name),
1338
registry=bzrdir.format_registry,
1339
converter=bzrdir.format_registry.make_bzrdir,
1720
1340
value_switches=True,
1721
title="Branch format",
1341
title="Branch Format",
1722
1342
),
1723
1343
Option('append-revisions-only',
1724
1344
help='Never change revnos or the existing log.'
1747
1367
"\nYou may supply --create-prefix to create all"
1748
1368
" leading parent directories."
1749
1369
% location)
1750
to_transport.create_prefix()
1370
_create_prefix(to_transport)
1751
1371
1752
1372
try:
1753
a_bzrdir = bzrdir.BzrDir.open_from_transport(to_transport)
1373
existing_bzrdir = bzrdir.BzrDir.open_from_transport(to_transport)
1754
1374
except errors.NotBranchError:
1755
1375
# really a NotBzrDir error...
1756
1376
create_branch = bzrdir.BzrDir.create_branch_convenience
1757
1377
branch = create_branch(to_transport.base, format=format,
1758
1378
possible_transports=[to_transport])
1759
a_bzrdir = branch.bzrdir
1760
1379
else:
1761
1380
from bzrlib.transport.local import LocalTransport
1762
if a_bzrdir.has_branch():
1381
if existing_bzrdir.has_branch():
1763
1382
if (isinstance(to_transport, LocalTransport)
1764
and not a_bzrdir.has_workingtree()):
1383
and not existing_bzrdir.has_workingtree()):
1765
1384
raise errors.BranchExistsWithoutWorkingTree(location)
1766
1385
raise errors.AlreadyBranchError(location)
1767
branch = a_bzrdir.create_branch()
1768
a_bzrdir.create_workingtree()
1386
else:
1387
branch = existing_bzrdir.create_branch()
1388
existing_bzrdir.create_workingtree()
1769
1389
if append_revisions_only:
1770
1390
try:
1771
1391
branch.set_append_revisions_only(True)
1772
1392
except errors.UpgradeRequired:
1773
1393
raise errors.BzrCommandError('This branch format cannot be set'
1774
' to append-revisions-only. Try --default.')
1775
if not is_quiet():
1776
from bzrlib.info import describe_layout, describe_format
1777
try:
1778
tree = a_bzrdir.open_workingtree(recommend_upgrade=False)
1779
except (errors.NoWorkingTree, errors.NotLocalUrl):
1780
tree = None
1781
repository = branch.repository
1782
layout = describe_layout(repository, branch, tree).lower()
1783
format = describe_format(a_bzrdir, repository, branch, tree)
1784
self.outf.write("Created a %s (format: %s)\n" % (layout, format))
1785
if repository.is_shared():
1786
#XXX: maybe this can be refactored into transport.path_or_url()
1787
url = repository.bzrdir.root_transport.external_url()
1788
try:
1789
url = urlutils.local_path_from_url(url)
1790
except errors.InvalidURL:
1791
pass
1792
self.outf.write("Using shared repository: %s\n" % url)
1394
' to append-revisions-only. Try --experimental-branch6')
1793
1395
1794
1396
1795
1397
class cmd_init_repository(Command):
1796
__doc__ = """Create a shared repository for branches to share storage space.
1398
"""Create a shared repository to hold branches.
1797
1399
1798
1400
New branches created under the repository directory will store their
1799
revisions in the repository, not in the branch directory. For branches
1800
with shared history, this reduces the amount of storage needed and
1801
speeds up the creation of new branches.
1401
revisions in the repository, not in the branch directory.
1802
1402
1803
If the --no-trees option is given then the branches in the repository
1804
will not have working trees by default. They will still exist as
1805
directories on disk, but they will not have separate copies of the
1806
files at a certain revision. This can be useful for repositories that
1807
store branches which are interacted with through checkouts or remote
1808
branches, such as on a server.
1403
If the --no-trees option is used then the branches in the repository
1404
will not have working trees by default.
1809
1405
1810
1406
:Examples:
1811
Create a shared repository holding just branches::
1407
Create a shared repositories holding just branches::
1812
1408
1813
1409
bzr init-repo --no-trees repo
1814
1410
bzr init repo/trunk
1825
1421
takes_options = [RegistryOption('format',
1826
1422
help='Specify a format for this repository. See'
1827
1423
' "bzr help formats" for details.',
1828
lazy_registry=('bzrlib.bzrdir', 'format_registry'),
1829
converter=lambda name: bzrdir.format_registry.make_bzrdir(name),
1424
registry=bzrdir.format_registry,
1425
converter=bzrdir.format_registry.make_bzrdir,
1830
1426
value_switches=True, title='Repository format'),
1831
1427
Option('no-trees',
1832
1428
help='Branches in the repository will default to'
1847
1443
newdir = format.initialize_on_transport(to_transport)
1848
1444
repo = newdir.create_repository(shared=True)
1849
1445
repo.set_make_working_trees(not no_trees)
1850
if not is_quiet():
1851
from bzrlib.info import show_bzrdir_info
1852
show_bzrdir_info(repo.bzrdir, verbose=0, outfile=self.outf)
1853
1446
1854
1447
1855
1448
class cmd_diff(Command):
1856
__doc__ = """Show differences in the working tree, between revisions or branches.
1857
1449
"""Show differences in the working tree, between revisions or branches.
1450
1858
1451
If no arguments are given, all changes for the current tree are listed.
1859
1452
If files are given, only the changes in those files are listed.
1860
1453
Remote and multiple branches can be compared by using the --old and
1880
1473
1881
1474
bzr diff -r1
1882
1475
1883
Difference between revision 3 and revision 1::
1884
1885
bzr diff -r1..3
1886
1887
Difference between revision 3 and revision 1 for branch xxx::
1888
1889
bzr diff -r1..3 xxx
1890
1891
To see the changes introduced in revision X::
1892
1893
bzr diff -cX
1894
1895
Note that in the case of a merge, the -c option shows the changes
1896
compared to the left hand parent. To see the changes against
1897
another parent, use::
1898
1899
bzr diff -r<chosen_parent>..X
1900
1901
The changes introduced by revision 2 (equivalent to -r1..2)::
1902
1903
bzr diff -c2
1476
Difference between revision 2 and revision 1::
1477
1478
bzr diff -r1..2
1479
1480
Difference between revision 2 and revision 1 for branch xxx::
1481
1482
bzr diff -r1..2 xxx
1904
1483
1905
1484
Show just the differences for file NEWS::
1906
1485
1945
1524
help='Use this command to compare files.',
1946
1525
type=unicode,
1947
1526
),
1948
RegistryOption('format',
1949
help='Diff format to use.',
1950
lazy_registry=('bzrlib.diff', 'format_registry'),
1951
value_switches=False, title='Diff format'),
1952
1527
]
1953
1528
aliases = ['di', 'dif']
1954
1529
encoding_type = 'exact'
1955
1530
1956
1531
@display_command
1957
1532
def run(self, revision=None, file_list=None, diff_options=None,
1958
prefix=None, old=None, new=None, using=None, format=None):
1959
from bzrlib.diff import (get_trees_and_branches_to_diff_locked,
1960
show_diff_trees)
1533
prefix=None, old=None, new=None, using=None):
1534
from bzrlib.diff import _get_trees_to_diff, show_diff_trees
1961
1535
1962
1536
if (prefix is None) or (prefix == '0'):
1963
1537
# diff -p0 format
1977
1551
raise errors.BzrCommandError('bzr diff --revision takes exactly'
1978
1552
' one or two revision specifiers')
1979
1553
1980
if using is not None and format is not None:
1981
raise errors.BzrCommandError('--using and --format are mutually '
1982
'exclusive.')
1983
1984
(old_tree, new_tree,
1985
old_branch, new_branch,
1986
specific_files, extra_trees) = get_trees_and_branches_to_diff_locked(
1987
file_list, revision, old, new, self.add_cleanup, apply_view=True)
1988
return show_diff_trees(old_tree, new_tree, sys.stdout,
1554
old_tree, new_tree, specific_files, extra_trees = \
1555
_get_trees_to_diff(file_list, revision, old, new)
1556
return show_diff_trees(old_tree, new_tree, sys.stdout,
1989
1557
specific_files=specific_files,
1990
1558
external_diff_options=diff_options,
1991
1559
old_label=old_label, new_label=new_label,
1992
extra_trees=extra_trees, using=using,
1993
format_cls=format)
1560
extra_trees=extra_trees, using=using)
1994
1561
1995
1562
1996
1563
class cmd_deleted(Command):
1997
__doc__ = """List files deleted in the working tree.
1564
"""List files deleted in the working tree.
1998
1565
"""
1999
1566
# TODO: Show files deleted since a previous revision, or
2000
1567
# between two revisions.
2009
1576
def run(self, show_ids=False):
2010
1577
tree = WorkingTree.open_containing(u'.')[0]
2011
1578
tree.lock_read()
2012
self.add_cleanup(tree.unlock)
2013
old = tree.basis_tree()
2014
old.lock_read()
2015
self.add_cleanup(old.unlock)
2016
for path, ie in old.inventory.iter_entries():
2017
if not tree.has_id(ie.file_id):
2018
self.outf.write(path)
2019
if show_ids:
2020
self.outf.write(' ')
2021
self.outf.write(ie.file_id)
2022
self.outf.write('\n')
1579
try:
1580
old = tree.basis_tree()
1581
old.lock_read()
1582
try:
1583
for path, ie in old.inventory.iter_entries():
1584
if not tree.has_id(ie.file_id):
1585
self.outf.write(path)
1586
if show_ids:
1587
self.outf.write(' ')
1588
self.outf.write(ie.file_id)
1589
self.outf.write('\n')
1590
finally:
1591
old.unlock()
1592
finally:
1593
tree.unlock()
2023
1594
2024
1595
2025
1596
class cmd_modified(Command):
2026
__doc__ = """List files modified in working tree.
1597
"""List files modified in working tree.
2027
1598
"""
2028
1599
2029
1600
hidden = True
2030
1601
_see_also = ['status', 'ls']
2031
takes_options = [
2032
Option('null',
2033
help='Write an ascii NUL (\\0) separator '
2034
'between files rather than a newline.')
2035
]
2036
1602
2037
1603
@display_command
2038
def run(self, null=False):
1604
def run(self):
2039
1605
tree = WorkingTree.open_containing(u'.')[0]
2040
1606
td = tree.changes_from(tree.basis_tree())
2041
1607
for path, id, kind, text_modified, meta_modified in td.modified:
2042
if null:
2043
self.outf.write(path + '\0')
2044
else:
2045
self.outf.write(osutils.quotefn(path) + '\n')
1608
self.outf.write(path + '\n')
2046
1609
2047
1610
2048
1611
class cmd_added(Command):
2049
__doc__ = """List files added in working tree.
1612
"""List files added in working tree.
2050
1613
"""
2051
1614
2052
1615
hidden = True
2053
1616
_see_also = ['status', 'ls']
2054
takes_options = [
2055
Option('null',
2056
help='Write an ascii NUL (\\0) separator '
2057
'between files rather than a newline.')
2058
]
2059
1617
2060
1618
@display_command
2061
def run(self, null=False):
1619
def run(self):
2062
1620
wt = WorkingTree.open_containing(u'.')[0]
2063
1621
wt.lock_read()
2064
self.add_cleanup(wt.unlock)
2065
basis = wt.basis_tree()
2066
basis.lock_read()
2067
self.add_cleanup(basis.unlock)
2068
basis_inv = basis.inventory
2069
inv = wt.inventory
2070
for file_id in inv:
2071
if file_id in basis_inv:
2072
continue
2073
if inv.is_root(file_id) and len(basis_inv) == 0:
2074
continue
2075
path = inv.id2path(file_id)
2076
if not os.access(osutils.abspath(path), os.F_OK):
2077
continue
2078
if null:
2079
self.outf.write(path + '\0')
2080
else:
2081
self.outf.write(osutils.quotefn(path) + '\n')
1622
try:
1623
basis = wt.basis_tree()
1624
basis.lock_read()
1625
try:
1626
basis_inv = basis.inventory
1627
inv = wt.inventory
1628
for file_id in inv:
1629
if file_id in basis_inv:
1630
continue
1631
if inv.is_root(file_id) and len(basis_inv) == 0:
1632
continue
1633
path = inv.id2path(file_id)
1634
if not os.access(osutils.abspath(path), os.F_OK):
1635
continue
1636
self.outf.write(path + '\n')
1637
finally:
1638
basis.unlock()
1639
finally:
1640
wt.unlock()
2082
1641
2083
1642
2084
1643
class cmd_root(Command):
2085
__doc__ = """Show the tree root directory.
1644
"""Show the tree root directory.
2086
1645
2087
1646
The root is the nearest enclosing directory with a .bzr control
2088
1647
directory."""
2103
1662
raise errors.BzrCommandError(msg)
2104
1663
2105
1664
2106
def _parse_levels(s):
2107
try:
2108
return int(s)
2109
except ValueError:
2110
msg = "The levels argument must be an integer."
2111
raise errors.BzrCommandError(msg)
2112
2113
2114
1665
class cmd_log(Command):
2115
__doc__ = """Show historical log for a branch or subset of a branch.
2116
2117
log is bzr's default tool for exploring the history of a branch.
2118
The branch to use is taken from the first parameter. If no parameters
2119
are given, the branch containing the working directory is logged.
2120
Here are some simple examples::
2121
2122
bzr log log the current branch
2123
bzr log foo.py log a file in its branch
2124
bzr log http://server/branch log a branch on a server
2125
2126
The filtering, ordering and information shown for each revision can
2127
be controlled as explained below. By default, all revisions are
2128
shown sorted (topologically) so that newer revisions appear before
2129
older ones and descendants always appear before ancestors. If displayed,
2130
merged revisions are shown indented under the revision in which they
2131
were merged.
2132
2133
:Output control:
2134
2135
The log format controls how information about each revision is
2136
displayed. The standard log formats are called ``long``, ``short``
2137
and ``line``. The default is long. See ``bzr help log-formats``
2138
for more details on log formats.
2139
2140
The following options can be used to control what information is
2141
displayed::
2142
2143
-l N display a maximum of N revisions
2144
-n N display N levels of revisions (0 for all, 1 for collapsed)
2145
-v display a status summary (delta) for each revision
2146
-p display a diff (patch) for each revision
2147
--show-ids display revision-ids (and file-ids), not just revnos
2148
2149
Note that the default number of levels to display is a function of the
2150
log format. If the -n option is not used, the standard log formats show
2151
just the top level (mainline).
2152
2153
Status summaries are shown using status flags like A, M, etc. To see
2154
the changes explained using words like ``added`` and ``modified``
2155
instead, use the -vv option.
2156
2157
:Ordering control:
2158
2159
To display revisions from oldest to newest, use the --forward option.
2160
In most cases, using this option will have little impact on the total
2161
time taken to produce a log, though --forward does not incrementally
2162
display revisions like --reverse does when it can.
2163
2164
:Revision filtering:
2165
2166
The -r option can be used to specify what revision or range of revisions
2167
to filter against. The various forms are shown below::
2168
2169
-rX display revision X
2170
-rX.. display revision X and later
2171
-r..Y display up to and including revision Y
2172
-rX..Y display from X to Y inclusive
2173
2174
See ``bzr help revisionspec`` for details on how to specify X and Y.
2175
Some common examples are given below::
2176
2177
-r-1 show just the tip
2178
-r-10.. show the last 10 mainline revisions
2179
-rsubmit:.. show what's new on this branch
2180
-rancestor:path.. show changes since the common ancestor of this
2181
branch and the one at location path
2182
-rdate:yesterday.. show changes since yesterday
2183
2184
When logging a range of revisions using -rX..Y, log starts at
2185
revision Y and searches back in history through the primary
2186
("left-hand") parents until it finds X. When logging just the
2187
top level (using -n1), an error is reported if X is not found
2188
along the way. If multi-level logging is used (-n0), X may be
2189
a nested merge revision and the log will be truncated accordingly.
2190
2191
:Path filtering:
2192
2193
If parameters are given and the first one is not a branch, the log
2194
will be filtered to show only those revisions that changed the
2195
nominated files or directories.
2196
2197
Filenames are interpreted within their historical context. To log a
2198
deleted file, specify a revision range so that the file existed at
2199
the end or start of the range.
2200
2201
Historical context is also important when interpreting pathnames of
2202
renamed files/directories. Consider the following example:
2203
2204
* revision 1: add tutorial.txt
2205
* revision 2: modify tutorial.txt
2206
* revision 3: rename tutorial.txt to guide.txt; add tutorial.txt
2207
2208
In this case:
2209
2210
* ``bzr log guide.txt`` will log the file added in revision 1
2211
2212
* ``bzr log tutorial.txt`` will log the new file added in revision 3
2213
2214
* ``bzr log -r2 -p tutorial.txt`` will show the changes made to
2215
the original file in revision 2.
2216
2217
* ``bzr log -r2 -p guide.txt`` will display an error message as there
2218
was no file called guide.txt in revision 2.
2219
2220
Renames are always followed by log. By design, there is no need to
2221
explicitly ask for this (and no way to stop logging a file back
2222
until it was last renamed).
2223
2224
:Other filtering:
2225
2226
The --message option can be used for finding revisions that match a
2227
regular expression in a commit message.
2228
2229
:Tips & tricks:
2230
2231
GUI tools and IDEs are often better at exploring history than command
2232
line tools: you may prefer qlog or viz from qbzr or bzr-gtk, the
2233
bzr-explorer shell, or the Loggerhead web interface. See the Plugin
2234
Guide <http://doc.bazaar.canonical.com/plugins/en/> and
2235
<http://wiki.bazaar.canonical.com/IDEIntegration>.
2236
2237
You may find it useful to add the aliases below to ``bazaar.conf``::
2238
2239
[ALIASES]
2240
tip = log -r-1
2241
top = log -l10 --line
2242
show = log -v -p
2243
2244
``bzr tip`` will then show the latest revision while ``bzr top``
2245
will show the last 10 mainline revisions. To see the details of a
2246
particular revision X, ``bzr show -rX``.
2247
2248
If you are interested in looking deeper into a particular merge X,
2249
use ``bzr log -n0 -rX``.
2250
2251
``bzr log -v`` on a branch with lots of history is currently
2252
very slow. A fix for this issue is currently under development.
2253
With or without that fix, it is recommended that a revision range
2254
be given when using the -v option.
2255
2256
bzr has a generic full-text matching plugin, bzr-search, that can be
2257
used to find revisions matching user names, commit messages, etc.
2258
Among other features, this plugin can find all revisions containing
2259
a list of words but not others.
2260
2261
When exploring non-mainline history on large projects with deep
2262
history, the performance of log can be greatly improved by installing
2263
the historycache plugin. This plugin buffers historical information
2264
trading disk space for faster speed.
1666
"""Show log of a branch, file, or directory.
1667
1668
By default show the log of the branch containing the working directory.
1669
1670
To request a range of logs, you can use the command -r begin..end
1671
-r revision requests a specific revision, -r ..end or -r begin.. are
1672
also valid.
1673
1674
:Examples:
1675
Log the current branch::
1676
1677
bzr log
1678
1679
Log a file::
1680
1681
bzr log foo.c
1682
1683
Log the last 10 revisions of a branch::
1684
1685
bzr log -r -10.. http://server/branch
2265
1686
"""
2266
takes_args = ['file*']
2267
_see_also = ['log-formats', 'revisionspec']
1687
1688
# TODO: Make --revision support uuid: and hash: [future tag:] notation.
1689
1690
takes_args = ['location?']
2268
1691
takes_options = [
2269
1692
Option('forward',
2270
1693
help='Show from oldest to newest.'),
2271
'timezone',
1694
Option('timezone',
1695
type=str,
1696
help='Display timezone as local, original, or utc.'),
2272
1697
custom_help('verbose',
2273
1698
help='Show files changed in each revision.'),
2274
1699
'show-ids',
2275
1700
'revision',
2276
Option('change',
2277
type=bzrlib.option._parse_revision_str,
2278
short_name='c',
2279
help='Show just the specified revision.'
2280
' See also "help revisionspec".'),
2281
1701
'log-format',
2282
Option('levels',
2283
short_name='n',
2284
help='Number of levels to display - 0 for all, 1 for flat.',
2285
argname='N',
2286
type=_parse_levels),
2287
1702
Option('message',
2288
1703
short_name='m',
2289
1704
help='Show revisions whose message matches this '
2294
1709
help='Limit the output to the first N revisions.',
2295
1710
argname='N',
2296
1711
type=_parse_limit),
2297
Option('show-diff',
2298
short_name='p',
2299
help='Show changes made in each revision as a patch.'),
2300
Option('include-merges',
2301
help='Show merged revisions like --levels 0 does.'),
2302
Option('exclude-common-ancestry',
2303
help='Display only the revisions that are not part'
2304
' of both ancestries (require -rX..Y)'
2305
)
2306
1712
]
2307
1713
encoding_type = 'replace'
2308
1714
2309
1715
@display_command
2310
def run(self, file_list=None, timezone='original',
1716
def run(self, location=None, timezone='original',
2311
1717
verbose=False,
2312
1718
show_ids=False,
2313
1719
forward=False,
2314
1720
revision=None,
2315
change=None,
2316
1721
log_format=None,
2317
levels=None,
2318
1722
message=None,
2319
limit=None,
2320
show_diff=False,
2321
include_merges=False,
2322
exclude_common_ancestry=False,
2323
):
2324
from bzrlib.log import (
2325
Logger,
2326
make_log_request_dict,
2327
_get_info_for_log_files,
2328
)
1723
limit=None):
1724
from bzrlib.log import show_log
2329
1725
direction = (forward and 'forward') or 'reverse'
2330
if (exclude_common_ancestry
2331
and (revision is None or len(revision) != 2)):
2332
raise errors.BzrCommandError(
2333
'--exclude-common-ancestry requires -r with two revisions')
2334
if include_merges:
2335
if levels is None:
2336
levels = 0
2337
else:
2338
raise errors.BzrCommandError(
2339
'--levels and --include-merges are mutually exclusive')
2340
2341
if change is not None:
2342
if len(change) > 1:
2343
raise errors.RangeInChangeOption()
2344
if revision is not None:
2345
raise errors.BzrCommandError(
2346
'--revision and --change are mutually exclusive')
2347
else:
2348
revision = change
2349
2350
file_ids = []
2351
filter_by_dir = False
2352
if file_list:
2353
# find the file ids to log and check for directory filtering
2354
b, file_info_list, rev1, rev2 = _get_info_for_log_files(
2355
revision, file_list)
2356
self.add_cleanup(b.unlock)
2357
for relpath, file_id, kind in file_info_list:
1726
1727
# log everything
1728
file_id = None
1729
if location:
1730
# find the file id to log:
1731
1732
tree, b, fp = bzrdir.BzrDir.open_containing_tree_or_branch(
1733
location)
1734
if fp != '':
1735
if tree is None:
1736
tree = b.basis_tree()
1737
file_id = tree.path2id(fp)
2358
1738
if file_id is None:
2359
1739
raise errors.BzrCommandError(
2360
"Path unknown at end or start of revision range: %s" %
2361
relpath)
2362
# If the relpath is the top of the tree, we log everything
2363
if relpath == '':
2364
file_ids = []
2365
break
2366
else:
2367
file_ids.append(file_id)
2368
filter_by_dir = filter_by_dir or (
2369
kind in ['directory', 'tree-reference'])
1740
"Path does not have any revision history: %s" %
1741
location)
2370
1742
else:
2371
# log everything
2372
# FIXME ? log the current subdir only RBC 20060203
1743
# local dir only
1744
# FIXME ? log the current subdir only RBC 20060203
2373
1745
if revision is not None \
2374
1746
and len(revision) > 0 and revision[0].get_branch():
2375
1747
location = revision[0].get_branch()
2377
1749
location = '.'
2378
1750
dir, relpath = bzrdir.BzrDir.open_containing(location)
2379
1751
b = dir.open_branch()
2380
b.lock_read()
2381
self.add_cleanup(b.unlock)
2382
rev1, rev2 = _get_revision_range(revision, b, self.name())
2383
2384
# Decide on the type of delta & diff filtering to use
2385
# TODO: add an --all-files option to make this configurable & consistent
2386
if not verbose:
2387
delta_type = None
2388
else:
2389
delta_type = 'full'
2390
if not show_diff:
2391
diff_type = None
2392
elif file_ids:
2393
diff_type = 'partial'
2394
else:
2395
diff_type = 'full'
2396
2397
# Build the log formatter
2398
if log_format is None:
2399
log_format = log.log_formatter_registry.get_default(b)
2400
# Make a non-encoding output to include the diffs - bug 328007
2401
unencoded_output = ui.ui_factory.make_output_stream(encoding_type='exact')
2402
lf = log_format(show_ids=show_ids, to_file=self.outf,
2403
to_exact_file=unencoded_output,
2404
show_timezone=timezone,
2405
delta_format=get_verbosity_level(),
2406
levels=levels,
2407
show_advice=levels is None)
2408
2409
# Choose the algorithm for doing the logging. It's annoying
2410
# having multiple code paths like this but necessary until
2411
# the underlying repository format is faster at generating
2412
# deltas or can provide everything we need from the indices.
2413
# The default algorithm - match-using-deltas - works for
2414
# multiple files and directories and is faster for small
2415
# amounts of history (200 revisions say). However, it's too
2416
# slow for logging a single file in a repository with deep
2417
# history, i.e. > 10K revisions. In the spirit of "do no
2418
# evil when adding features", we continue to use the
2419
# original algorithm - per-file-graph - for the "single
2420
# file that isn't a directory without showing a delta" case.
2421
partial_history = revision and b.repository._format.supports_chks
2422
match_using_deltas = (len(file_ids) != 1 or filter_by_dir
2423
or delta_type or partial_history)
2424
2425
# Build the LogRequest and execute it
2426
if len(file_ids) == 0:
2427
file_ids = None
2428
rqst = make_log_request_dict(
2429
direction=direction, specific_fileids=file_ids,
2430
start_revision=rev1, end_revision=rev2, limit=limit,
2431
message_search=message, delta_type=delta_type,
2432
diff_type=diff_type, _match_using_deltas=match_using_deltas,
2433
exclude_common_ancestry=exclude_common_ancestry,
2434
)
2435
Logger(b, rqst).show(lf)
2436
2437
2438
def _get_revision_range(revisionspec_list, branch, command_name):
2439
"""Take the input of a revision option and turn it into a revision range.
2440
2441
It returns RevisionInfo objects which can be used to obtain the rev_id's
2442
of the desired revisions. It does some user input validations.
2443
"""
2444
if revisionspec_list is None:
2445
rev1 = None
2446
rev2 = None
2447
elif len(revisionspec_list) == 1:
2448
rev1 = rev2 = revisionspec_list[0].in_history(branch)
2449
elif len(revisionspec_list) == 2:
2450
start_spec = revisionspec_list[0]
2451
end_spec = revisionspec_list[1]
2452
if end_spec.get_branch() != start_spec.get_branch():
2453
# b is taken from revision[0].get_branch(), and
2454
# show_log will use its revision_history. Having
2455
# different branches will lead to weird behaviors.
2456
raise errors.BzrCommandError(
2457
"bzr %s doesn't accept two revisions in different"
2458
" branches." % command_name)
2459
if start_spec.spec is None:
2460
# Avoid loading all the history.
2461
rev1 = RevisionInfo(branch, None, None)
2462
else:
2463
rev1 = start_spec.in_history(branch)
2464
# Avoid loading all of history when we know a missing
2465
# end of range means the last revision ...
2466
if end_spec.spec is None:
2467
last_revno, last_revision_id = branch.last_revision_info()
2468
rev2 = RevisionInfo(branch, last_revno, last_revision_id)
2469
else:
2470
rev2 = end_spec.in_history(branch)
2471
else:
2472
raise errors.BzrCommandError(
2473
'bzr %s --revision takes one or two values.' % command_name)
2474
return rev1, rev2
2475
2476
2477
def _revision_range_to_revid_range(revision_range):
2478
rev_id1 = None
2479
rev_id2 = None
2480
if revision_range[0] is not None:
2481
rev_id1 = revision_range[0].rev_id
2482
if revision_range[1] is not None:
2483
rev_id2 = revision_range[1].rev_id
2484
return rev_id1, rev_id2
1752
1753
b.lock_read()
1754
try:
1755
if revision is None:
1756
rev1 = None
1757
rev2 = None
1758
elif len(revision) == 1:
1759
rev1 = rev2 = revision[0].in_history(b)
1760
elif len(revision) == 2:
1761
if revision[1].get_branch() != revision[0].get_branch():
1762
# b is taken from revision[0].get_branch(), and
1763
# show_log will use its revision_history. Having
1764
# different branches will lead to weird behaviors.
1765
raise errors.BzrCommandError(
1766
"Log doesn't accept two revisions in different"
1767
" branches.")
1768
rev1 = revision[0].in_history(b)
1769
rev2 = revision[1].in_history(b)
1770
else:
1771
raise errors.BzrCommandError(
1772
'bzr log --revision takes one or two values.')
1773
1774
if log_format is None:
1775
log_format = log.log_formatter_registry.get_default(b)
1776
1777
lf = log_format(show_ids=show_ids, to_file=self.outf,
1778
show_timezone=timezone)
1779
1780
show_log(b,
1781
lf,
1782
file_id,
1783
verbose=verbose,
1784
direction=direction,
1785
start_revision=rev1,
1786
end_revision=rev2,
1787
search=message,
1788
limit=limit)
1789
finally:
1790
b.unlock()
1791
2485
1792
2486
1793
def get_log_format(long=False, short=False, line=False, default='long'):
2487
1794
log_format = default
2495
1802
2496
1803
2497
1804
class cmd_touching_revisions(Command):
2498
__doc__ = """Return revision-ids which affected a particular file.
1805
"""Return revision-ids which affected a particular file.
2499
1806
2500
1807
A more user-friendly interface is "bzr log FILE".
2501
1808
"""
2506
1813
@display_command
2507
1814
def run(self, filename):
2508
1815
tree, relpath = WorkingTree.open_containing(filename)
1816
b = tree.branch
2509
1817
file_id = tree.path2id(relpath)
2510
b = tree.branch
2511
b.lock_read()
2512
self.add_cleanup(b.unlock)
2513
touching_revs = log.find_touching_revisions(b, file_id)
2514
for revno, revision_id, what in touching_revs:
1818
for revno, revision_id, what in log.find_touching_revisions(b, file_id):
2515
1819
self.outf.write("%6d %s\n" % (revno, what))
2516
1820
2517
1821
2518
1822
class cmd_ls(Command):
2519
__doc__ = """List files in a tree.
1823
"""List files in a tree.
2520
1824
"""
2521
1825
2522
1826
_see_also = ['status', 'cat']
2523
1827
takes_args = ['path?']
1828
# TODO: Take a revision or remote path and list that tree instead.
2524
1829
takes_options = [
2525
1830
'verbose',
2526
1831
'revision',
2527
Option('recursive', short_name='R',
2528
help='Recurse into subdirectories.'),
1832
Option('non-recursive',
1833
help='Don\'t recurse into subdirectories.'),
2529
1834
Option('from-root',
2530
1835
help='Print paths relative to the root of the branch.'),
2531
1836
Option('unknown', help='Print unknown files.'),
2532
Option('versioned', help='Print versioned files.',
2533
short_name='V'),
1837
Option('versioned', help='Print versioned files.'),
2534
1838
Option('ignored', help='Print ignored files.'),
2535
1839
Option('null',
2536
1840
help='Write an ascii NUL (\\0) separator '
2542
1846
]
2543
1847
@display_command
2544
1848
def run(self, revision=None, verbose=False,
2545
recursive=False, from_root=False,
1849
non_recursive=False, from_root=False,
2546
1850
unknown=False, versioned=False, ignored=False,
2547
1851
null=False, kind=None, show_ids=False, path=None):
2548
1852
2557
1861
2558
1862
if path is None:
2559
1863
fs_path = '.'
1864
prefix = ''
2560
1865
else:
2561
1866
if from_root:
2562
1867
raise errors.BzrCommandError('cannot specify both --from-root'
2563
1868
' and PATH')
2564
1869
fs_path = path
1870
prefix = path
2565
1871
tree, branch, relpath = bzrdir.BzrDir.open_containing_tree_or_branch(
2566
1872
fs_path)
2567
2568
# Calculate the prefix to use
2569
prefix = None
2570
1873
if from_root:
2571
if relpath:
2572
prefix = relpath + '/'
2573
elif fs_path != '.' and not fs_path.endswith('/'):
2574
prefix = fs_path + '/'
2575
2576
if revision is not None or tree is None:
2577
tree = _get_one_revision_tree('ls', revision, branch=branch)
2578
2579
apply_view = False
2580
if isinstance(tree, WorkingTree) and tree.supports_views():
2581
view_files = tree.views.lookup_view()
2582
if view_files:
2583
apply_view = True
2584
view_str = views.view_display_str(view_files)
2585
note("Ignoring files outside view. View is %s" % view_str)
1874
relpath = u''
1875
elif relpath:
1876
relpath += '/'
1877
if revision is not None:
1878
tree = branch.repository.revision_tree(
1879
revision[0].as_revision_id(branch))
1880
elif tree is None:
1881
tree = branch.basis_tree()
2586
1882
2587
1883
tree.lock_read()
2588
self.add_cleanup(tree.unlock)
2589
for fp, fc, fkind, fid, entry in tree.list_files(include_root=False,
2590
from_dir=relpath, recursive=recursive):
2591
# Apply additional masking
2592
if not all and not selection[fc]:
2593
continue
2594
if kind is not None and fkind != kind:
2595
continue
2596
if apply_view:
2597
try:
2598
if relpath:
2599
fullpath = osutils.pathjoin(relpath, fp)
2600
else:
2601
fullpath = fp
2602
views.check_path_in_view(tree, fullpath)
2603
except errors.FileOutsideView:
2604
continue
2605
2606
# Output the entry
2607
if prefix:
2608
fp = osutils.pathjoin(prefix, fp)
2609
kindch = entry.kind_character()
2610
outstring = fp + kindch
2611
ui.ui_factory.clear_term()
2612
if verbose:
2613
outstring = '%-8s %s' % (fc, outstring)
2614
if show_ids and fid is not None:
2615
outstring = "%-50s %s" % (outstring, fid)
2616
self.outf.write(outstring + '\n')
2617
elif null:
2618
self.outf.write(fp + '\0')
2619
if show_ids:
2620
if fid is not None:
2621
self.outf.write(fid)
2622
self.outf.write('\0')
2623
self.outf.flush()
2624
else:
2625
if show_ids:
2626
if fid is not None:
2627
my_id = fid
2628
else:
2629
my_id = ''
2630
self.outf.write('%-50s %s\n' % (outstring, my_id))
2631
else:
2632
self.outf.write(outstring + '\n')
1884
try:
1885
for fp, fc, fkind, fid, entry in tree.list_files(include_root=False):
1886
if fp.startswith(relpath):
1887
fp = osutils.pathjoin(prefix, fp[len(relpath):])
1888
if non_recursive and '/' in fp:
1889
continue
1890
if not all and not selection[fc]:
1891
continue
1892
if kind is not None and fkind != kind:
1893
continue
1894
if verbose:
1895
kindch = entry.kind_character()
1896
outstring = '%-8s %s%s' % (fc, fp, kindch)
1897
if show_ids and fid is not None:
1898
outstring = "%-50s %s" % (outstring, fid)
1899
self.outf.write(outstring + '\n')
1900
elif null:
1901
self.outf.write(fp + '\0')
1902
if show_ids:
1903
if fid is not None:
1904
self.outf.write(fid)
1905
self.outf.write('\0')
1906
self.outf.flush()
1907
else:
1908
if fid is not None:
1909
my_id = fid
1910
else:
1911
my_id = ''
1912
if show_ids:
1913
self.outf.write('%-50s %s\n' % (fp, my_id))
1914
else:
1915
self.outf.write(fp + '\n')
1916
finally:
1917
tree.unlock()
2633
1918
2634
1919
2635
1920
class cmd_unknowns(Command):
2636
__doc__ = """List unknown files.
1921
"""List unknown files.
2637
1922
"""
2638
1923
2639
1924
hidden = True
2646
1931
2647
1932
2648
1933
class cmd_ignore(Command):
2649
__doc__ = """Ignore specified files or patterns.
2650
2651
See ``bzr help patterns`` for details on the syntax of patterns.
2652
2653
If a .bzrignore file does not exist, the ignore command
2654
will create one and add the specified files or patterns to the newly
2655
created file. The ignore command will also automatically add the
2656
.bzrignore file to be versioned. Creating a .bzrignore file without
2657
the use of the ignore command will require an explicit add command.
1934
"""Ignore specified files or patterns.
2658
1935
2659
1936
To remove patterns from the ignore list, edit the .bzrignore file.
2660
After adding, editing or deleting that file either indirectly by
2661
using this command or directly by using an editor, be sure to commit
2662
it.
2663
2664
Bazaar also supports a global ignore file ~/.bazaar/ignore. On Windows
2665
the global ignore file can be found in the application data directory as
2666
C:\\Documents and Settings\\<user>\\Application Data\\Bazaar\\2.0\\ignore.
2667
Global ignores are not touched by this command. The global ignore file
2668
can be edited directly using an editor.
2669
2670
Patterns prefixed with '!' are exceptions to ignore patterns and take
2671
precedence over regular ignores. Such exceptions are used to specify
2672
files that should be versioned which would otherwise be ignored.
2673
2674
Patterns prefixed with '!!' act as regular ignore patterns, but have
2675
precedence over the '!' exception patterns.
2676
2677
Note: ignore patterns containing shell wildcards must be quoted from
1937
1938
Trailing slashes on patterns are ignored.
1939
If the pattern contains a slash or is a regular expression, it is compared
1940
to the whole path from the branch root. Otherwise, it is compared to only
1941
the last component of the path. To match a file only in the root
1942
directory, prepend './'.
1943
1944
Ignore patterns specifying absolute paths are not allowed.
1945
1946
Ignore patterns may include globbing wildcards such as::
1947
1948
? - Matches any single character except '/'
1949
* - Matches 0 or more characters except '/'
1950
/**/ - Matches 0 or more directories in a path
1951
[a-z] - Matches a single character from within a group of characters
1952
1953
Ignore patterns may also be Python regular expressions.
1954
Regular expression ignore patterns are identified by a 'RE:' prefix
1955
followed by the regular expression. Regular expression ignore patterns
1956
may not include named or numbered groups.
1957
1958
Note: ignore patterns containing shell wildcards must be quoted from
2678
1959
the shell on Unix.
2679
1960
2680
1961
:Examples:
2682
1963
2683
1964
bzr ignore ./Makefile
2684
1965
2685
Ignore .class files in all directories...::
1966
Ignore class files in all directories::
2686
1967
2687
1968
bzr ignore "*.class"
2688
1969
2689
...but do not ignore "special.class"::
2690
2691
bzr ignore "!special.class"
2692
2693
1970
Ignore .o files under the lib directory::
2694
1971
2695
1972
bzr ignore "lib/**/*.o"
2701
1978
Ignore everything but the "debian" toplevel directory::
2702
1979
2703
1980
bzr ignore "RE:(?!debian/).*"
2704
2705
Ignore everything except the "local" toplevel directory,
2706
but always ignore "*~" autosave files, even under local/::
2707
2708
bzr ignore "*"
2709
bzr ignore "!./local"
2710
bzr ignore "!!*~"
2711
1981
"""
2712
1982
2713
_see_also = ['status', 'ignored', 'patterns']
1983
_see_also = ['status', 'ignored']
2714
1984
takes_args = ['name_pattern*']
2715
1985
takes_options = [
2716
Option('default-rules',
2717
help='Display the default ignore rules that bzr uses.')
1986
Option('old-default-rules',
1987
help='Write out the ignore rules bzr < 0.9 always used.')
2718
1988
]
2719
2720
def run(self, name_pattern_list=None, default_rules=None):
2721
from bzrlib import ignores
2722
if default_rules is not None:
2723
# dump the default rules and exit
2724
for pattern in ignores.USER_DEFAULTS:
2725
self.outf.write("%s\n" % pattern)
1989
1990
def run(self, name_pattern_list=None, old_default_rules=None):
1991
from bzrlib.atomicfile import AtomicFile
1992
if old_default_rules is not None:
1993
# dump the rules and exit
1994
for pattern in ignores.OLD_DEFAULTS:
1995
print pattern
2726
1996
return
2727
1997
if not name_pattern_list:
2728
1998
raise errors.BzrCommandError("ignore requires at least one "
2729
"NAME_PATTERN or --default-rules.")
2730
name_pattern_list = [globbing.normalize_pattern(p)
1999
"NAME_PATTERN or --old-default-rules")
2000
name_pattern_list = [globbing.normalize_pattern(p)
2731
2001
for p in name_pattern_list]
2732
2002
for name_pattern in name_pattern_list:
2733
if (name_pattern[0] == '/' or
2003
if (name_pattern[0] == '/' or
2734
2004
(len(name_pattern) > 1 and name_pattern[1] == ':')):
2735
2005
raise errors.BzrCommandError(
2736
2006
"NAME_PATTERN should not be an absolute path")
2737
2007
tree, relpath = WorkingTree.open_containing(u'.')
2738
ignores.tree_ignores_add_patterns(tree, name_pattern_list)
2008
ifn = tree.abspath('.bzrignore')
2009
if os.path.exists(ifn):
2010
f = open(ifn, 'rt')
2011
try:
2012
igns = f.read().decode('utf-8')
2013
finally:
2014
f.close()
2015
else:
2016
igns = ''
2017
2018
# TODO: If the file already uses crlf-style termination, maybe
2019
# we should use that for the newly added lines?
2020
2021
if igns and igns[-1] != '\n':
2022
igns += '\n'
2023
for name_pattern in name_pattern_list:
2024
igns += name_pattern + '\n'
2025
2026
f = AtomicFile(ifn, 'wb')
2027
try:
2028
f.write(igns.encode('utf-8'))
2029
f.commit()
2030
finally:
2031
f.close()
2032
2033
if not tree.path2id('.bzrignore'):
2034
tree.add(['.bzrignore'])
2035
2739
2036
ignored = globbing.Globster(name_pattern_list)
2740
2037
matches = []
2741
2038
tree.lock_read()
2744
2041
if id is not None:
2745
2042
filename = entry[0]
2746
2043
if ignored.match(filename):
2747
matches.append(filename)
2044
matches.append(filename.encode('utf-8'))
2748
2045
tree.unlock()
2749
2046
if len(matches) > 0:
2750
self.outf.write("Warning: the following files are version controlled and"
2751
" match your ignore pattern:\n%s"
2752
"\nThese files will continue to be version controlled"
2753
" unless you 'bzr remove' them.\n" % ("\n".join(matches),))
2754
2047
print "Warning: the following files are version controlled and" \
2048
" match your ignore pattern:\n%s" % ("\n".join(matches),)
2755
2049
2756
2050
class cmd_ignored(Command):
2757
__doc__ = """List ignored files and the patterns that matched them.
2758
2759
List all the ignored files and the ignore pattern that caused the file to
2760
be ignored.
2761
2762
Alternatively, to list just the files::
2763
2764
bzr ls --ignored
2051
"""List ignored files and the patterns that matched them.
2765
2052
"""
2766
2053
2767
2054
encoding_type = 'replace'
2768
_see_also = ['ignore', 'ls']
2055
_see_also = ['ignore']
2769
2056
2770
2057
@display_command
2771
2058
def run(self):
2772
2059
tree = WorkingTree.open_containing(u'.')[0]
2773
2060
tree.lock_read()
2774
self.add_cleanup(tree.unlock)
2775
for path, file_class, kind, file_id, entry in tree.list_files():
2776
if file_class != 'I':
2777
continue
2778
## XXX: Slightly inefficient since this was already calculated
2779
pat = tree.is_ignored(path)
2780
self.outf.write('%-50s %s\n' % (path, pat))
2061
try:
2062
for path, file_class, kind, file_id, entry in tree.list_files():
2063
if file_class != 'I':
2064
continue
2065
## XXX: Slightly inefficient since this was already calculated
2066
pat = tree.is_ignored(path)
2067
self.outf.write('%-50s %s\n' % (path, pat))
2068
finally:
2069
tree.unlock()
2781
2070
2782
2071
2783
2072
class cmd_lookup_revision(Command):
2784
__doc__ = """Lookup the revision-id from a revision-number
2073
"""Lookup the revision-id from a revision-number
2785
2074
2786
2075
:Examples:
2787
2076
bzr lookup-revision 33
2788
2077
"""
2789
2078
hidden = True
2790
2079
takes_args = ['revno']
2791
2080
2792
2081
@display_command
2793
2082
def run(self, revno):
2794
2083
try:
2795
2084
revno = int(revno)
2796
2085
except ValueError:
2797
raise errors.BzrCommandError("not a valid revision-number: %r"
2798
% revno)
2799
revid = WorkingTree.open_containing(u'.')[0].branch.get_rev_id(revno)
2800
self.outf.write("%s\n" % revid)
2086
raise errors.BzrCommandError("not a valid revision-number: %r" % revno)
2087
2088
print WorkingTree.open_containing(u'.')[0].branch.get_rev_id(revno)
2801
2089
2802
2090
2803
2091
class cmd_export(Command):
2804
__doc__ = """Export current or past revision to a destination directory or archive.
2092
"""Export current or past revision to a destination directory or archive.
2805
2093
2806
2094
If no revision is specified this exports the last committed revision.
2807
2095
2828
2116
zip .zip
2829
2117
================= =========================
2830
2118
"""
2831
takes_args = ['dest', 'branch_or_subdir?']
2119
takes_args = ['dest', 'branch?']
2832
2120
takes_options = [
2833
2121
Option('format',
2834
2122
help="Type of file to export to.",
2835
2123
type=unicode),
2836
2124
'revision',
2837
Option('filters', help='Apply content filters to export the '
2838
'convenient form.'),
2839
2125
Option('root',
2840
2126
type=str,
2841
2127
help="Name of the root directory inside the exported file."),
2842
Option('per-file-timestamps',
2843
help='Set modification time of files to that of the last '
2844
'revision in which it was changed.'),
2845
2128
]
2846
def run(self, dest, branch_or_subdir=None, revision=None, format=None,
2847
root=None, filters=False, per_file_timestamps=False):
2129
def run(self, dest, branch=None, revision=None, format=None, root=None):
2848
2130
from bzrlib.export import export
2849
2131
2850
if branch_or_subdir is None:
2132
if branch is None:
2851
2133
tree = WorkingTree.open_containing(u'.')[0]
2852
2134
b = tree.branch
2853
subdir = None
2854
else:
2855
b, subdir = Branch.open_containing(branch_or_subdir)
2856
tree = None
2857
2858
rev_tree = _get_one_revision_tree('export', revision, branch=b, tree=tree)
2135
else:
2136
b = Branch.open(branch)
2137
2138
if revision is None:
2139
# should be tree.last_revision FIXME
2140
rev_id = b.last_revision()
2141
else:
2142
if len(revision) != 1:
2143
raise errors.BzrCommandError('bzr export --revision takes exactly 1 argument')
2144
rev_id = revision[0].as_revision_id(b)
2145
t = b.repository.revision_tree(rev_id)
2859
2146
try:
2860
export(rev_tree, dest, format, root, subdir, filtered=filters,
2861
per_file_timestamps=per_file_timestamps)
2147
export(t, dest, format, root)
2862
2148
except errors.NoSuchExportFormat, e:
2863
2149
raise errors.BzrCommandError('Unsupported export format: %s' % e.format)
2864
2150
2865
2151
2866
2152
class cmd_cat(Command):
2867
__doc__ = """Write the contents of a file as of a given revision to standard output.
2153
"""Write the contents of a file as of a given revision to standard output.
2868
2154
2869
2155
If no revision is nominated, the last revision is used.
2870
2156
2871
2157
Note: Take care to redirect standard output when using this command on a
2872
binary file.
2158
binary file.
2873
2159
"""
2874
2160
2875
2161
_see_also = ['ls']
2876
2162
takes_options = [
2877
2163
Option('name-from-revision', help='The path name in the old tree.'),
2878
Option('filters', help='Apply content filters to display the '
2879
'convenience form.'),
2880
2164
'revision',
2881
2165
]
2882
2166
takes_args = ['filename']
2883
2167
encoding_type = 'exact'
2884
2168
2885
2169
@display_command
2886
def run(self, filename, revision=None, name_from_revision=False,
2887
filters=False):
2170
def run(self, filename, revision=None, name_from_revision=False):
2888
2171
if revision is not None and len(revision) != 1:
2889
2172
raise errors.BzrCommandError("bzr cat --revision takes exactly"
2890
2173
" one revision specifier")
2891
2174
tree, branch, relpath = \
2892
2175
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
2893
2176
branch.lock_read()
2894
self.add_cleanup(branch.unlock)
2895
return self._run(tree, branch, relpath, filename, revision,
2896
name_from_revision, filters)
2177
try:
2178
return self._run(tree, branch, relpath, filename, revision,
2179
name_from_revision)
2180
finally:
2181
branch.unlock()
2897
2182
2898
def _run(self, tree, b, relpath, filename, revision, name_from_revision,
2899
filtered):
2183
def _run(self, tree, b, relpath, filename, revision, name_from_revision):
2900
2184
if tree is None:
2901
2185
tree = b.basis_tree()
2902
rev_tree = _get_one_revision_tree('cat', revision, branch=b)
2903
rev_tree.lock_read()
2904
self.add_cleanup(rev_tree.unlock)
2186
if revision is None:
2187
revision_id = b.last_revision()
2188
else:
2189
revision_id = revision[0].as_revision_id(b)
2905
2190
2191
cur_file_id = tree.path2id(relpath)
2192
rev_tree = b.repository.revision_tree(revision_id)
2906
2193
old_file_id = rev_tree.path2id(relpath)
2907
2194
2908
2195
if name_from_revision:
2909
# Try in revision if requested
2910
2196
if old_file_id is None:
2911
raise errors.BzrCommandError(
2912
"%r is not present in revision %s" % (
2913
filename, rev_tree.get_revision_id()))
2197
raise errors.BzrCommandError("%r is not present in revision %s"
2198
% (filename, revision_id))
2914
2199
else:
2915
content = rev_tree.get_file_text(old_file_id)
2916
else:
2917
cur_file_id = tree.path2id(relpath)
2918
found = False
2919
if cur_file_id is not None:
2920
# Then try with the actual file id
2921
try:
2922
content = rev_tree.get_file_text(cur_file_id)
2923
found = True
2924
except errors.NoSuchId:
2925
# The actual file id didn't exist at that time
2926
pass
2927
if not found and old_file_id is not None:
2928
# Finally try with the old file id
2929
content = rev_tree.get_file_text(old_file_id)
2930
found = True
2931
if not found:
2932
# Can't be found anywhere
2933
raise errors.BzrCommandError(
2934
"%r is not present in revision %s" % (
2935
filename, rev_tree.get_revision_id()))
2936
if filtered:
2937
from bzrlib.filters import (
2938
ContentFilterContext,
2939
filtered_output_bytes,
2940
)
2941
filters = rev_tree._content_filter_stack(relpath)
2942
chunks = content.splitlines(True)
2943
content = filtered_output_bytes(chunks, filters,
2944
ContentFilterContext(relpath, rev_tree))
2945
self.cleanup_now()
2946
self.outf.writelines(content)
2947
else:
2948
self.cleanup_now()
2949
self.outf.write(content)
2200
rev_tree.print_file(old_file_id)
2201
elif cur_file_id is not None:
2202
rev_tree.print_file(cur_file_id)
2203
elif old_file_id is not None:
2204
rev_tree.print_file(old_file_id)
2205
else:
2206
raise errors.BzrCommandError("%r is not present in revision %s" %
2207
(filename, revision_id))
2950
2208
2951
2209
2952
2210
class cmd_local_time_offset(Command):
2953
__doc__ = """Show the offset in seconds from GMT to local time."""
2954
hidden = True
2211
"""Show the offset in seconds from GMT to local time."""
2212
hidden = True
2955
2213
@display_command
2956
2214
def run(self):
2957
self.outf.write("%s\n" % osutils.local_time_offset())
2215
print osutils.local_time_offset()
2958
2216
2959
2217
2960
2218
2961
2219
class cmd_commit(Command):
2962
__doc__ = """Commit changes into a new revision.
2963
2964
An explanatory message needs to be given for each commit. This is
2965
often done by using the --message option (getting the message from the
2966
command line) or by using the --file option (getting the message from
2967
a file). If neither of these options is given, an editor is opened for
2968
the user to enter the message. To see the changed files in the
2969
boilerplate text loaded into the editor, use the --show-diff option.
2970
2971
By default, the entire tree is committed and the person doing the
2972
commit is assumed to be the author. These defaults can be overridden
2973
as explained below.
2974
2975
:Selective commits:
2976
2977
If selected files are specified, only changes to those files are
2978
committed. If a directory is specified then the directory and
2979
everything within it is committed.
2980
2981
When excludes are given, they take precedence over selected files.
2982
For example, to commit only changes within foo, but not changes
2983
within foo/bar::
2984
2985
bzr commit foo -x foo/bar
2986
2987
A selective commit after a merge is not yet supported.
2988
2989
:Custom authors:
2990
2991
If the author of the change is not the same person as the committer,
2992
you can specify the author's name using the --author option. The
2993
name should be in the same format as a committer-id, e.g.
2994
"John Doe <jdoe@example.com>". If there is more than one author of
2995
the change you can specify the option multiple times, once for each
2996
author.
2997
2998
:Checks:
2999
3000
A common mistake is to forget to add a new file or directory before
3001
running the commit command. The --strict option checks for unknown
3002
files and aborts the commit if any are found. More advanced pre-commit
3003
checks can be implemented by defining hooks. See ``bzr help hooks``
3004
for details.
3005
3006
:Things to note:
3007
3008
If you accidentially commit the wrong changes or make a spelling
3009
mistake in the commit message say, you can use the uncommit command
3010
to undo it. See ``bzr help uncommit`` for details.
3011
3012
Hooks can also be configured to run after a commit. This allows you
3013
to trigger updates to external systems like bug trackers. The --fixes
3014
option can be used to record the association between a revision and
3015
one or more bugs. See ``bzr help bugs`` for details.
3016
3017
A selective commit may fail in some cases where the committed
3018
tree would be invalid. Consider::
3019
3020
bzr init foo
3021
mkdir foo/bar
3022
bzr add foo/bar
3023
bzr commit foo -m "committing foo"
3024
bzr mv foo/bar foo/baz
3025
mkdir foo/bar
3026
bzr add foo/bar
3027
bzr commit foo/bar -m "committing bar but not baz"
3028
3029
In the example above, the last commit will fail by design. This gives
3030
the user the opportunity to decide whether they want to commit the
3031
rename at the same time, separately first, or not at all. (As a general
3032
rule, when in doubt, Bazaar has a policy of Doing the Safe Thing.)
2220
"""Commit changes into a new revision.
2221
2222
If no arguments are given, the entire tree is committed.
2223
2224
If selected files are specified, only changes to those files are
2225
committed. If a directory is specified then the directory and everything
2226
within it is committed.
2227
2228
If author of the change is not the same person as the committer, you can
2229
specify the author's name using the --author option. The name should be
2230
in the same format as a committer-id, e.g. "John Doe <jdoe@example.com>".
2231
2232
A selected-file commit may fail in some cases where the committed
2233
tree would be invalid. Consider::
2234
2235
bzr init foo
2236
mkdir foo/bar
2237
bzr add foo/bar
2238
bzr commit foo -m "committing foo"
2239
bzr mv foo/bar foo/baz
2240
mkdir foo/bar
2241
bzr add foo/bar
2242
bzr commit foo/bar -m "committing bar but not baz"
2243
2244
In the example above, the last commit will fail by design. This gives
2245
the user the opportunity to decide whether they want to commit the
2246
rename at the same time, separately first, or not at all. (As a general
2247
rule, when in doubt, Bazaar has a policy of Doing the Safe Thing.)
2248
2249
Note: A selected-file commit after a merge is not yet supported.
3033
2250
"""
3034
2251
# TODO: Run hooks on tree to-be-committed, and after commit.
3035
2252
3040
2257
3041
2258
# XXX: verbose currently does nothing
3042
2259
3043
_see_also = ['add', 'bugs', 'hooks', 'uncommit']
2260
_see_also = ['bugs', 'uncommit']
3044
2261
takes_args = ['selected*']
3045
2262
takes_options = [
3046
ListOption('exclude', type=str, short_name='x',
3047
help="Do not consider changes made to a given path."),
3048
2263
Option('message', type=unicode,
3049
2264
short_name='m',
3050
2265
help="Description of the new revision."),
3058
2273
Option('strict',
3059
2274
help="Refuse to commit if there are unknown "
3060
2275
"files in the working tree."),
3061
Option('commit-time', type=str,
3062
help="Manually set a commit time using commit date "
3063
"format, e.g. '2009-10-10 08:00:00 +0100'."),
3064
2276
ListOption('fixes', type=str,
3065
help="Mark a bug as being fixed by this revision "
3066
"(see \"bzr help bugs\")."),
3067
ListOption('author', type=unicode,
2277
help="Mark a bug as being fixed by this revision."),
2278
Option('author', type=unicode,
3068
2279
help="Set the author's name, if it's different "
3069
2280
"from the committer."),
3070
2281
Option('local',
3073
2284
"the master branch until a normal commit "
3074
2285
"is performed."
3075
2286
),
3076
Option('show-diff', short_name='p',
3077
help='When no message is supplied, show the diff along'
3078
' with the status summary in the message editor.'),
2287
Option('show-diff',
2288
help='When no message is supplied, show the diff along'
2289
' with the status summary in the message editor.'),
3079
2290
]
3080
2291
aliases = ['ci', 'checkin']
3081
2292
3082
def _iter_bug_fix_urls(self, fixes, branch):
2293
def _get_bug_fix_properties(self, fixes, branch):
2294
properties = []
3083
2295
# Configure the properties for bug fixing attributes.
3084
2296
for fixed_bug in fixes:
3085
2297
tokens = fixed_bug.split(':')
3086
2298
if len(tokens) != 2:
3087
2299
raise errors.BzrCommandError(
3088
"Invalid bug %s. Must be in the form of 'tracker:id'. "
3089
"See \"bzr help bugs\" for more information on this "
3090
"feature.\nCommit refused." % fixed_bug)
2300
"Invalid bug %s. Must be in the form of 'tag:id'. "
2301
"Commit refused." % fixed_bug)
3091
2302
tag, bug_id = tokens
3092
2303
try:
3093
yield bugtracker.get_bug_url(tag, branch, bug_id)
2304
bug_url = bugtracker.get_bug_url(tag, branch, bug_id)
3094
2305
except errors.UnknownBugTrackerAbbreviation:
3095
2306
raise errors.BzrCommandError(
3096
2307
'Unrecognized bug %s. Commit refused.' % fixed_bug)
3097
except errors.MalformedBugIdentifier, e:
2308
except errors.MalformedBugIdentifier:
3098
2309
raise errors.BzrCommandError(
3099
"%s\nCommit refused." % (str(e),))
2310
"Invalid bug identifier for %s. Commit refused."
2311
% fixed_bug)
2312
properties.append('%s fixed' % bug_url)
2313
return '\n'.join(properties)
3100
2314
3101
2315
def run(self, message=None, file=None, verbose=False, selected_list=None,
3102
2316
unchanged=False, strict=False, local=False, fixes=None,
3103
author=None, show_diff=False, exclude=None, commit_time=None):
2317
author=None, show_diff=False):
3104
2318
from bzrlib.errors import (
3105
2319
PointlessCommit,
3106
2320
ConflictsInTree,
3108
2322
)
3109
2323
from bzrlib.msgeditor import (
3110
2324
edit_commit_message_encoded,
3111
generate_commit_message_template,
3112
2325
make_commit_message_template_encoded
3113
2326
)
3114
2327
3115
commit_stamp = offset = None
3116
if commit_time is not None:
3117
try:
3118
commit_stamp, offset = timestamp.parse_patch_date(commit_time)
3119
except ValueError, e:
3120
raise errors.BzrCommandError(
3121
"Could not parse --commit-time: " + str(e))
3122
3123
2328
# TODO: Need a blackbox test for invoking the external editor; may be
3124
2329
# slightly problematic to run this cross-platform.
3125
2330
3126
# TODO: do more checks that the commit will succeed before
2331
# TODO: do more checks that the commit will succeed before
3127
2332
# spending the user's valuable time typing a commit message.
3128
2333
3129
2334
properties = {}
3137
2342
3138
2343
if fixes is None:
3139
2344
fixes = []
3140
bug_property = bugtracker.encode_fixes_bug_urls(
3141
self._iter_bug_fix_urls(fixes, tree.branch))
2345
bug_property = self._get_bug_fix_properties(fixes, tree.branch)
3142
2346
if bug_property:
3143
2347
properties['bugs'] = bug_property
3144
2348
3145
2349
if local and not tree.branch.get_bound_location():
3146
2350
raise errors.LocalRequiresBoundBranch()
3147
2351
3148
if message is not None:
3149
try:
3150
file_exists = osutils.lexists(message)
3151
except UnicodeError:
3152
# The commit message contains unicode characters that can't be
3153
# represented in the filesystem encoding, so that can't be a
3154
# file.
3155
file_exists = False
3156
if file_exists:
3157
warning_msg = (
3158
'The commit message is a file name: "%(f)s".\n'
3159
'(use --file "%(f)s" to take commit message from that file)'
3160
% { 'f': message })
3161
ui.ui_factory.show_warning(warning_msg)
3162
if '\r' in message:
3163
message = message.replace('\r\n', '\n')
3164
message = message.replace('\r', '\n')
3165
if file:
3166
raise errors.BzrCommandError(
3167
"please specify either --message or --file")
3168
3169
2352
def get_message(commit_obj):
3170
2353
"""Callback to get commit message"""
3171
if file:
3172
my_message = codecs.open(
3173
file, 'rt', osutils.get_user_encoding()).read()
3174
elif message is not None:
3175
my_message = message
3176
else:
3177
# No message supplied: make one up.
3178
# text is the status of the tree
3179
text = make_commit_message_template_encoded(tree,
2354
my_message = message
2355
if my_message is None and not file:
2356
t = make_commit_message_template_encoded(tree,
3180
2357
selected_list, diff=show_diff,
3181
output_encoding=osutils.get_user_encoding())
3182
# start_message is the template generated from hooks
3183
# XXX: Warning - looks like hooks return unicode,
3184
# make_commit_message_template_encoded returns user encoding.
3185
# We probably want to be using edit_commit_message instead to
3186
# avoid this.
3187
start_message = generate_commit_message_template(commit_obj)
3188
my_message = edit_commit_message_encoded(text,
3189
start_message=start_message)
2358
output_encoding=bzrlib.user_encoding)
2359
my_message = edit_commit_message_encoded(t)
3190
2360
if my_message is None:
3191
2361
raise errors.BzrCommandError("please specify a commit"
3192
2362
" message with either --message or --file")
2363
elif my_message and file:
2364
raise errors.BzrCommandError(
2365
"please specify either --message or --file")
2366
if file:
2367
my_message = codecs.open(file, 'rt',
2368
bzrlib.user_encoding).read()
3193
2369
if my_message == "":
3194
2370
raise errors.BzrCommandError("empty commit message specified")
3195
2371
return my_message
3196
2372
3197
# The API permits a commit with a filter of [] to mean 'select nothing'
3198
# but the command line should not do that.
3199
if not selected_list:
3200
selected_list = None
3201
2373
try:
3202
2374
tree.commit(message_callback=get_message,
3203
2375
specific_files=selected_list,
3204
2376
allow_pointless=unchanged, strict=strict, local=local,
3205
2377
reporter=None, verbose=verbose, revprops=properties,
3206
authors=author, timestamp=commit_stamp,
3207
timezone=offset,
3208
exclude=safe_relpath_files(tree, exclude))
2378
author=author)
3209
2379
except PointlessCommit:
3210
raise errors.BzrCommandError("No changes to commit."
3211
" Use --unchanged to commit anyhow.")
2380
# FIXME: This should really happen before the file is read in;
2381
# perhaps prepare the commit; get the message; then actually commit
2382
raise errors.BzrCommandError("no changes to commit."
2383
" use --unchanged to commit anyhow")
3212
2384
except ConflictsInTree:
3213
2385
raise errors.BzrCommandError('Conflicts detected in working '
3214
2386
'tree. Use "bzr conflicts" to list, "bzr resolve FILE" to'
3217
2389
raise errors.BzrCommandError("Commit refused because there are"
3218
2390
" unknown files in the working tree.")
3219
2391
except errors.BoundBranchOutOfDate, e:
3220
e.extra_help = ("\n"
3221
'To commit to master branch, run update and then commit.\n'
3222
'You can also pass --local to commit to continue working '
3223
'disconnected.')
3224
raise
2392
raise errors.BzrCommandError(str(e) + "\n"
2393
'To commit to master branch, run update and then commit.\n'
2394
'You can also pass --local to commit to continue working '
2395
'disconnected.')
3225
2396
3226
2397
3227
2398
class cmd_check(Command):
3228
__doc__ = """Validate working tree structure, branch consistency and repository history.
3229
3230
This command checks various invariants about branch and repository storage
3231
to detect data corruption or bzr bugs.
3232
3233
The working tree and branch checks will only give output if a problem is
3234
detected. The output fields of the repository check are:
3235
3236
revisions
3237
This is just the number of revisions checked. It doesn't
3238
indicate a problem.
3239
3240
versionedfiles
3241
This is just the number of versionedfiles checked. It
3242
doesn't indicate a problem.
3243
3244
unreferenced ancestors
3245
Texts that are ancestors of other texts, but
3246
are not properly referenced by the revision ancestry. This is a
3247
subtle problem that Bazaar can work around.
3248
3249
unique file texts
3250
This is the total number of unique file contents
3251
seen in the checked revisions. It does not indicate a problem.
3252
3253
repeated file texts
3254
This is the total number of repeated texts seen
3255
in the checked revisions. Texts can be repeated when their file
3256
entries are modified, but the file contents are not. It does not
3257
indicate a problem.
3258
3259
If no restrictions are specified, all Bazaar data that is found at the given
3260
location will be checked.
3261
3262
:Examples:
3263
3264
Check the tree and branch at 'foo'::
3265
3266
bzr check --tree --branch foo
3267
3268
Check only the repository at 'bar'::
3269
3270
bzr check --repo bar
3271
3272
Check everything at 'baz'::
3273
3274
bzr check baz
2399
"""Validate consistency of branch history.
2400
2401
This command checks various invariants about the branch storage to
2402
detect data corruption or bzr bugs.
2403
2404
Output fields:
2405
2406
revisions: This is just the number of revisions checked. It doesn't
2407
indicate a problem.
2408
versionedfiles: This is just the number of versionedfiles checked. It
2409
doesn't indicate a problem.
2410
unreferenced ancestors: Texts that are ancestors of other texts, but
2411
are not properly referenced by the revision ancestry. This is a
2412
subtle problem that Bazaar can work around.
2413
unique file texts: This is the total number of unique file contents
2414
seen in the checked revisions. It does not indicate a problem.
2415
repeated file texts: This is the total number of repeated texts seen
2416
in the checked revisions. Texts can be repeated when their file
2417
entries are modified, but the file contents are not. It does not
2418
indicate a problem.
3275
2419
"""
3276
2420
3277
2421
_see_also = ['reconcile']
3278
takes_args = ['path?']
3279
takes_options = ['verbose',
3280
Option('branch', help="Check the branch related to the"
3281
" current directory."),
3282
Option('repo', help="Check the repository related to the"
3283
" current directory."),
3284
Option('tree', help="Check the working tree related to"
3285
" the current directory.")]
2422
takes_args = ['branch?']
2423
takes_options = ['verbose']
3286
2424
3287
def run(self, path=None, verbose=False, branch=False, repo=False,
3288
tree=False):
3289
from bzrlib.check import check_dwim
3290
if path is None:
3291
path = '.'
3292
if not branch and not repo and not tree:
3293
branch = repo = tree = True
3294
check_dwim(path, verbose, do_branch=branch, do_repo=repo, do_tree=tree)
2425
def run(self, branch=None, verbose=False):
2426
from bzrlib.check import check
2427
if branch is None:
2428
branch_obj = Branch.open_containing('.')[0]
2429
else:
2430
branch_obj = Branch.open(branch)
2431
check(branch_obj, verbose)
2432
# bit hacky, check the tree parent is accurate
2433
try:
2434
if branch is None:
2435
tree = WorkingTree.open_containing('.')[0]
2436
else:
2437
tree = WorkingTree.open(branch)
2438
except (errors.NoWorkingTree, errors.NotLocalUrl):
2439
pass
2440
else:
2441
# This is a primitive 'check' for tree state. Currently this is not
2442
# integrated into the main check logic as yet.
2443
tree.lock_read()
2444
try:
2445
tree_basis = tree.basis_tree()
2446
tree_basis.lock_read()
2447
try:
2448
repo_basis = tree.branch.repository.revision_tree(
2449
tree.last_revision())
2450
if len(list(repo_basis.iter_changes(tree_basis))):
2451
raise errors.BzrCheckError(
2452
"Mismatched basis inventory content.")
2453
tree._validate()
2454
finally:
2455
tree_basis.unlock()
2456
finally:
2457
tree.unlock()
3295
2458
3296
2459
3297
2460
class cmd_upgrade(Command):
3298
__doc__ = """Upgrade branch storage to current format.
2461
"""Upgrade branch storage to current format.
3299
2462
3300
2463
The check command or bzr developers may sometimes advise you to run
3301
2464
this command. When the default format has changed you may also be warned
3308
2471
RegistryOption('format',
3309
2472
help='Upgrade to a specific format. See "bzr help'
3310
2473
' formats" for details.',
3311
lazy_registry=('bzrlib.bzrdir', 'format_registry'),
3312
converter=lambda name: bzrdir.format_registry.make_bzrdir(name),
2474
registry=bzrdir.format_registry,
2475
converter=bzrdir.format_registry.make_bzrdir,
3313
2476
value_switches=True, title='Branch format'),
3314
2477
]
3315
2478
3316
2479
def run(self, url='.', format=None):
3317
2480
from bzrlib.upgrade import upgrade
2481
if format is None:
2482
format = bzrdir.format_registry.make_bzrdir('default')
3318
2483
upgrade(url, format)
3319
2484
3320
2485
3321
2486
class cmd_whoami(Command):
3322
__doc__ = """Show or set bzr user id.
3323
2487
"""Show or set bzr user id.
2488
3324
2489
:Examples:
3325
2490
Show the email of the current user::
3326
2491
3338
2503
]
3339
2504
takes_args = ['name?']
3340
2505
encoding_type = 'replace'
3341
2506
3342
2507
@display_command
3343
2508
def run(self, email=False, branch=False, name=None):
3344
2509
if name is None:
3359
2524
except errors.NoEmailInUsername, e:
3360
2525
warning('"%s" does not seem to contain an email address. '
3361
2526
'This is allowed, but not recommended.', name)
3362
2527
3363
2528
# use global config unless --branch given
3364
2529
if branch:
3365
2530
c = Branch.open_containing('.')[0].get_config()
3369
2534
3370
2535
3371
2536
class cmd_nick(Command):
3372
__doc__ = """Print or set the branch nickname.
3373
3374
If unset, the tree root directory name is used as the nickname.
3375
To print the current nickname, execute with no argument.
3376
3377
Bound branches use the nickname of its master branch unless it is set
3378
locally.
2537
"""Print or set the branch nickname.
2538
2539
If unset, the tree root directory name is used as the nickname
2540
To print the current nickname, execute with no argument.
3379
2541
"""
3380
2542
3381
2543
_see_also = ['info']
3389
2551
3390
2552
@display_command
3391
2553
def printme(self, branch):
3392
self.outf.write('%s\n' % branch.nick)
3393
3394
3395
class cmd_alias(Command):
3396
__doc__ = """Set/unset and display aliases.
3397
3398
:Examples:
3399
Show the current aliases::
3400
3401
bzr alias
3402
3403
Show the alias specified for 'll'::
3404
3405
bzr alias ll
3406
3407
Set an alias for 'll'::
3408
3409
bzr alias ll="log --line -r-10..-1"
3410
3411
To remove an alias for 'll'::
3412
3413
bzr alias --remove ll
3414
3415
"""
3416
takes_args = ['name?']
3417
takes_options = [
3418
Option('remove', help='Remove the alias.'),
3419
]
3420
3421
def run(self, name=None, remove=False):
3422
if remove:
3423
self.remove_alias(name)
3424
elif name is None:
3425
self.print_aliases()
3426
else:
3427
equal_pos = name.find('=')
3428
if equal_pos == -1:
3429
self.print_alias(name)
3430
else:
3431
self.set_alias(name[:equal_pos], name[equal_pos+1:])
3432
3433
def remove_alias(self, alias_name):
3434
if alias_name is None:
3435
raise errors.BzrCommandError(
3436
'bzr alias --remove expects an alias to remove.')
3437
# If alias is not found, print something like:
3438
# unalias: foo: not found
3439
c = config.GlobalConfig()
3440
c.unset_alias(alias_name)
3441
3442
@display_command
3443
def print_aliases(self):
3444
"""Print out the defined aliases in a similar format to bash."""
3445
aliases = config.GlobalConfig().get_aliases()
3446
for key, value in sorted(aliases.iteritems()):
3447
self.outf.write('bzr alias %s="%s"\n' % (key, value))
3448
3449
@display_command
3450
def print_alias(self, alias_name):
3451
from bzrlib.commands import get_alias
3452
alias = get_alias(alias_name)
3453
if alias is None:
3454
self.outf.write("bzr alias: %s: not found\n" % alias_name)
3455
else:
3456
self.outf.write(
3457
'bzr alias %s="%s"\n' % (alias_name, ' '.join(alias)))
3458
3459
def set_alias(self, alias_name, alias_command):
3460
"""Save the alias in the global config."""
3461
c = config.GlobalConfig()
3462
c.set_alias(alias_name, alias_command)
2554
print branch.nick
3463
2555
3464
2556
3465
2557
class cmd_selftest(Command):
3466
__doc__ = """Run internal test suite.
3467
2558
"""Run internal test suite.
2559
3468
2560
If arguments are given, they are regular expressions that say which tests
3469
2561
should run. Tests matching any expression are run, and other tests are
3470
2562
not run.
3493
2585
modified by plugins will not be tested, and tests provided by plugins will
3494
2586
not be run.
3495
2587
3496
Tests that need working space on disk use a common temporary directory,
2588
Tests that need working space on disk use a common temporary directory,
3497
2589
typically inside $TMPDIR or /tmp.
3498
2590
3499
If you set BZR_TEST_PDB=1 when running selftest, failing tests will drop
3500
into a pdb postmortem session.
3501
3502
2591
:Examples:
3503
2592
Run only tests relating to 'ignore'::
3504
2593
3513
2602
def get_transport_type(typestring):
3514
2603
"""Parse and return a transport specifier."""
3515
2604
if typestring == "sftp":
3516
from bzrlib.tests import stub_sftp
3517
return stub_sftp.SFTPAbsoluteServer
2605
from bzrlib.transport.sftp import SFTPAbsoluteServer
2606
return SFTPAbsoluteServer
3518
2607
if typestring == "memory":
3519
from bzrlib.tests import test_server
3520
return memory.MemoryServer
2608
from bzrlib.transport.memory import MemoryServer
2609
return MemoryServer
3521
2610
if typestring == "fakenfs":
3522
from bzrlib.tests import test_server
3523
return test_server.FakeNFSServer
2611
from bzrlib.transport.fakenfs import FakeNFSServer
2612
return FakeNFSServer
3524
2613
msg = "No known transport type %s. Supported types are: sftp\n" %\
3525
2614
(typestring)
3526
2615
raise errors.BzrCommandError(msg)
3541
2630
Option('lsprof-timed',
3542
2631
help='Generate lsprof output for benchmarked'
3543
2632
' sections of code.'),
3544
Option('lsprof-tests',
3545
help='Generate lsprof output for each test.'),
3546
2633
Option('cache-dir', type=str,
3547
2634
help='Cache intermediate benchmark output in this '
3548
2635
'directory.'),
3552
2639
),
3553
2640
Option('list-only',
3554
2641
help='List the tests instead of running them.'),
3555
RegistryOption('parallel',
3556
help="Run the test suite in parallel.",
3557
lazy_registry=('bzrlib.tests', 'parallel_registry'),
3558
value_switches=False,
3559
),
3560
2642
Option('randomize', type=str, argname="SEED",
3561
2643
help='Randomize the order of tests using the given'
3562
2644
' seed or "now" for the current time.'),
3564
2646
short_name='x',
3565
2647
help='Exclude tests that match this regular'
3566
2648
' expression.'),
3567
Option('subunit',
3568
help='Output test progress via subunit.'),
3569
2649
Option('strict', help='Fail on missing dependencies or '
3570
2650
'known failures.'),
3571
2651
Option('load-list', type=str, argname='TESTLISTFILE',
3572
2652
help='Load a test id list from a text file.'),
3573
ListOption('debugflag', type=str, short_name='E',
3574
help='Turn on a selftest debug flag.'),
3575
ListOption('starting-with', type=str, argname='TESTID',
3576
param_name='starting_with', short_name='s',
3577
help=
3578
'Load only the tests starting with TESTID.'),
3579
2653
]
3580
2654
encoding_type = 'replace'
3581
2655
3582
def __init__(self):
3583
Command.__init__(self)
3584
self.additional_selftest_args = {}
3585
3586
2656
def run(self, testspecs_list=None, verbose=False, one=False,
3587
2657
transport=None, benchmark=None,
3588
2658
lsprof_timed=None, cache_dir=None,
3589
2659
first=False, list_only=False,
3590
2660
randomize=None, exclude=None, strict=False,
3591
load_list=None, debugflag=None, starting_with=None, subunit=False,
3592
parallel=None, lsprof_tests=False):
2661
load_list=None):
2662
import bzrlib.ui
3593
2663
from bzrlib.tests import selftest
3594
2664
import bzrlib.benchmarks as benchmarks
3595
2665
from bzrlib.benchmarks import tree_creator
3596
2666
3597
# Make deprecation warnings visible, unless -Werror is set
3598
symbol_versioning.activate_deprecation_warnings(override=False)
3599
3600
2667
if cache_dir is not None:
3601
2668
tree_creator.TreeCreator.CACHE_ROOT = osutils.abspath(cache_dir)
2669
if not list_only:
2670
print 'testing: %s' % (osutils.realpath(sys.argv[0]),)
2671
print ' %s (%s python%s)' % (
2672
bzrlib.__path__[0],
2673
bzrlib.version_string,
2674
bzrlib._format_version_tuple(sys.version_info),
2675
)
2676
print
3602
2677
if testspecs_list is not None:
3603
2678
pattern = '|'.join(testspecs_list)
3604
2679
else:
3605
2680
pattern = ".*"
3606
if subunit:
3607
try:
3608
from bzrlib.tests import SubUnitBzrRunner
3609
except ImportError:
3610
raise errors.BzrCommandError("subunit not available. subunit "
3611
"needs to be installed to use --subunit.")
3612
self.additional_selftest_args['runner_class'] = SubUnitBzrRunner
3613
# On Windows, disable automatic conversion of '\n' to '\r\n' in
3614
# stdout, which would corrupt the subunit stream.
3615
if sys.platform == "win32" and sys.stdout.fileno() >= 0:
3616
import msvcrt
3617
msvcrt.setmode(sys.stdout.fileno(), os.O_BINARY)
3618
if parallel:
3619
self.additional_selftest_args.setdefault(
3620
'suite_decorators', []).append(parallel)
3621
2681
if benchmark:
3622
2682
test_suite_factory = benchmarks.test_suite
3623
2683
# Unless user explicitly asks for quiet, be verbose in benchmarks
3624
2684
verbose = not is_quiet()
3625
2685
# TODO: should possibly lock the history file...
3626
2686
benchfile = open(".perf_history", "at", buffering=1)
3627
self.add_cleanup(benchfile.close)
3628
2687
else:
3629
2688
test_suite_factory = None
3630
2689
benchfile = None
3631
selftest_kwargs = {"verbose": verbose,
3632
"pattern": pattern,
3633
"stop_on_failure": one,
3634
"transport": transport,
3635
"test_suite_factory": test_suite_factory,
3636
"lsprof_timed": lsprof_timed,
3637
"lsprof_tests": lsprof_tests,
3638
"bench_history": benchfile,
3639
"matching_tests_first": first,
3640
"list_only": list_only,
3641
"random_seed": randomize,
3642
"exclude_pattern": exclude,
3643
"strict": strict,
3644
"load_list": load_list,
3645
"debug_flags": debugflag,
3646
"starting_with": starting_with
3647
}
3648
selftest_kwargs.update(self.additional_selftest_args)
3649
result = selftest(**selftest_kwargs)
2690
try:
2691
result = selftest(verbose=verbose,
2692
pattern=pattern,
2693
stop_on_failure=one,
2694
transport=transport,
2695
test_suite_factory=test_suite_factory,
2696
lsprof_timed=lsprof_timed,
2697
bench_history=benchfile,
2698
matching_tests_first=first,
2699
list_only=list_only,
2700
random_seed=randomize,
2701
exclude_pattern=exclude,
2702
strict=strict,
2703
load_list=load_list,
2704
)
2705
finally:
2706
if benchfile is not None:
2707
benchfile.close()
2708
if result:
2709
note('tests passed')
2710
else:
2711
note('tests failed')
3650
2712
return int(not result)
3651
2713
3652
2714
3653
2715
class cmd_version(Command):
3654
__doc__ = """Show version of bzr."""
2716
"""Show version of bzr."""
3655
2717
3656
2718
encoding_type = 'replace'
3657
takes_options = [
3658
Option("short", help="Print just the version number."),
3659
]
3660
2719
3661
2720
@display_command
3662
def run(self, short=False):
2721
def run(self):
3663
2722
from bzrlib.version import show_version
3664
if short:
3665
self.outf.write(bzrlib.version_string + '\n')
3666
else:
3667
show_version(to_file=self.outf)
2723
show_version(to_file=self.outf)
3668
2724
3669
2725
3670
2726
class cmd_rocks(Command):
3671
__doc__ = """Statement of optimism."""
2727
"""Statement of optimism."""
3672
2728
3673
2729
hidden = True
3674
2730
3675
2731
@display_command
3676
2732
def run(self):
3677
self.outf.write("It sure does!\n")
2733
print "It sure does!"
3678
2734
3679
2735
3680
2736
class cmd_find_merge_base(Command):
3681
__doc__ = """Find and print a base revision for merging two branches."""
2737
"""Find and print a base revision for merging two branches."""
3682
2738
# TODO: Options to specify revisions on either side, as if
3683
2739
# merging only part of the history.
3684
2740
takes_args = ['branch', 'other']
3685
2741
hidden = True
3686
2742
3687
2743
@display_command
3688
2744
def run(self, branch, other):
3689
2745
from bzrlib.revision import ensure_null
3690
2746
3691
2747
branch1 = Branch.open_containing(branch)[0]
3692
2748
branch2 = Branch.open_containing(other)[0]
3693
2749
branch1.lock_read()
3694
self.add_cleanup(branch1.unlock)
3695
branch2.lock_read()
3696
self.add_cleanup(branch2.unlock)
3697
last1 = ensure_null(branch1.last_revision())
3698
last2 = ensure_null(branch2.last_revision())
3699
3700
graph = branch1.repository.get_graph(branch2.repository)
3701
base_rev_id = graph.find_unique_lca(last1, last2)
3702
3703
self.outf.write('merge base is revision %s\n' % base_rev_id)
2750
try:
2751
branch2.lock_read()
2752
try:
2753
last1 = ensure_null(branch1.last_revision())
2754
last2 = ensure_null(branch2.last_revision())
2755
2756
graph = branch1.repository.get_graph(branch2.repository)
2757
base_rev_id = graph.find_unique_lca(last1, last2)
2758
2759
print 'merge base is revision %s' % base_rev_id
2760
finally:
2761
branch2.unlock()
2762
finally:
2763
branch1.unlock()
3704
2764
3705
2765
3706
2766
class cmd_merge(Command):
3707
__doc__ = """Perform a three-way merge.
3708
2767
"""Perform a three-way merge.
2768
3709
2769
The source of the merge can be specified either in the form of a branch,
3710
2770
or in the form of a path to a file containing a merge directive generated
3711
2771
with bzr send. If neither is specified, the default is the upstream branch
3721
2781
By default, bzr will try to merge in all new work from the other
3722
2782
branch, automatically determining an appropriate base. If this
3723
2783
fails, you may need to give an explicit base.
3724
2784
3725
2785
Merge will do its best to combine the changes in two branches, but there
3726
2786
are some kinds of problems only a human can fix. When it encounters those,
3727
2787
it will mark a conflict. A conflict means that you need to fix something,
3737
2797
The results of the merge are placed into the destination working
3738
2798
directory, where they can be reviewed (with bzr diff), tested, and then
3739
2799
committed to record the result of the merge.
3740
2800
3741
2801
merge refuses to run if there are any uncommitted changes, unless
3742
--force is given. The --force option can also be used to create a
3743
merge revision which has more than two parents.
3744
3745
If one would like to merge changes from the working tree of the other
3746
branch without merging any committed revisions, the --uncommitted option
3747
can be given.
3748
3749
To select only some changes to merge, use "merge -i", which will prompt
3750
you to apply each diff hunk and file change, similar to "shelve".
2802
--force is given.
3751
2803
3752
2804
:Examples:
3753
2805
To merge the latest revision from bzr.dev::
3762
2814
3763
2815
bzr merge -r 81..82 ../bzr.dev
3764
2816
3765
To apply a merge directive contained in /tmp/merge::
2817
To apply a merge directive contained in in /tmp/merge:
3766
2818
3767
2819
bzr merge /tmp/merge
3768
3769
To create a merge revision with three parents from two branches
3770
feature1a and feature1b:
3771
3772
bzr merge ../feature1a
3773
bzr merge ../feature1b --force
3774
bzr commit -m 'revision with three parents'
3775
2820
"""
3776
2821
3777
2822
encoding_type = 'exact'
3778
_see_also = ['update', 'remerge', 'status-flags', 'send']
2823
_see_also = ['update', 'remerge', 'status-flags']
3779
2824
takes_args = ['location?']
3780
2825
takes_options = [
3781
2826
'change',
3799
2844
short_name='d',
3800
2845
type=unicode,
3801
2846
),
3802
Option('preview', help='Instead of merging, show a diff of the'
3803
' merge.'),
3804
Option('interactive', help='Select changes interactively.',
3805
short_name='i')
2847
Option('preview', help='Instead of merging, show a diff of the merge.')
3806
2848
]
3807
2849
3808
2850
def run(self, location=None, revision=None, force=False,
3809
merge_type=None, show_base=False, reprocess=None, remember=False,
2851
merge_type=None, show_base=False, reprocess=False, remember=False,
3810
2852
uncommitted=False, pull=False,
3811
2853
directory=None,
3812
2854
preview=False,
3813
interactive=False,
3814
2855
):
3815
2856
if merge_type is None:
3816
2857
merge_type = _mod_merge.Merge3Merger
3821
2862
allow_pending = True
3822
2863
verified = 'inapplicable'
3823
2864
tree = WorkingTree.open_containing(directory)[0]
3824
2865
change_reporter = delta._ChangeReporter(
2866
unversioned_filter=tree.is_ignored)
2867
cleanups = []
3825
2868
try:
3826
basis_tree = tree.revision_tree(tree.last_revision())
3827
except errors.NoSuchRevision:
3828
basis_tree = tree.basis_tree()
3829
3830
# die as quickly as possible if there are uncommitted changes
3831
if not force:
3832
if tree.has_changes():
3833
raise errors.UncommittedChanges(tree)
3834
3835
view_info = _get_view_info_for_change_reporter(tree)
3836
change_reporter = delta._ChangeReporter(
3837
unversioned_filter=tree.is_ignored, view_info=view_info)
3838
pb = ui.ui_factory.nested_progress_bar()
3839
self.add_cleanup(pb.finished)
3840
tree.lock_write()
3841
self.add_cleanup(tree.unlock)
3842
if location is not None:
3843
try:
3844
mergeable = bundle.read_mergeable_from_url(location,
3845
possible_transports=possible_transports)
3846
except errors.NotABundle:
3847
mergeable = None
2869
pb = ui.ui_factory.nested_progress_bar()
2870
cleanups.append(pb.finished)
2871
tree.lock_write()
2872
cleanups.append(tree.unlock)
2873
if location is not None:
2874
try:
2875
mergeable = bundle.read_mergeable_from_url(location,
2876
possible_transports=possible_transports)
2877
except errors.NotABundle:
2878
mergeable = None
2879
else:
2880
if uncommitted:
2881
raise errors.BzrCommandError('Cannot use --uncommitted'
2882
' with bundles or merge directives.')
2883
2884
if revision is not None:
2885
raise errors.BzrCommandError(
2886
'Cannot use -r with merge directives or bundles')
2887
merger, verified = _mod_merge.Merger.from_mergeable(tree,
2888
mergeable, pb)
2889
2890
if merger is None and uncommitted:
2891
if revision is not None and len(revision) > 0:
2892
raise errors.BzrCommandError('Cannot use --uncommitted and'
2893
' --revision at the same time.')
2894
location = self._select_branch_location(tree, location)[0]
2895
other_tree, other_path = WorkingTree.open_containing(location)
2896
merger = _mod_merge.Merger.from_uncommitted(tree, other_tree,
2897
pb)
2898
allow_pending = False
2899
if other_path != '':
2900
merger.interesting_files = [other_path]
2901
2902
if merger is None:
2903
merger, allow_pending = self._get_merger_from_branch(tree,
2904
location, revision, remember, possible_transports, pb)
2905
2906
merger.merge_type = merge_type
2907
merger.reprocess = reprocess
2908
merger.show_base = show_base
2909
self.sanity_check_merger(merger)
2910
if (merger.base_rev_id == merger.other_rev_id and
2911
merger.other_rev_id != None):
2912
note('Nothing to do.')
2913
return 0
2914
if pull:
2915
if merger.interesting_files is not None:
2916
raise errors.BzrCommandError('Cannot pull individual files')
2917
if (merger.base_rev_id == tree.last_revision()):
2918
result = tree.pull(merger.other_branch, False,
2919
merger.other_rev_id)
2920
result.report(self.outf)
2921
return 0
2922
merger.check_basis(not force)
2923
if preview:
2924
return self._do_preview(merger)
3848
2925
else:
3849
if uncommitted:
3850
raise errors.BzrCommandError('Cannot use --uncommitted'
3851
' with bundles or merge directives.')
3852
3853
if revision is not None:
3854
raise errors.BzrCommandError(
3855
'Cannot use -r with merge directives or bundles')
3856
merger, verified = _mod_merge.Merger.from_mergeable(tree,
3857
mergeable, None)
3858
3859
if merger is None and uncommitted:
3860
if revision is not None and len(revision) > 0:
3861
raise errors.BzrCommandError('Cannot use --uncommitted and'
3862
' --revision at the same time.')
3863
merger = self.get_merger_from_uncommitted(tree, location, None)
3864
allow_pending = False
3865
3866
if merger is None:
3867
merger, allow_pending = self._get_merger_from_branch(tree,
3868
location, revision, remember, possible_transports, None)
3869
3870
merger.merge_type = merge_type
3871
merger.reprocess = reprocess
3872
merger.show_base = show_base
3873
self.sanity_check_merger(merger)
3874
if (merger.base_rev_id == merger.other_rev_id and
3875
merger.other_rev_id is not None):
3876
note('Nothing to do.')
3877
return 0
3878
if pull:
3879
if merger.interesting_files is not None:
3880
raise errors.BzrCommandError('Cannot pull individual files')
3881
if (merger.base_rev_id == tree.last_revision()):
3882
result = tree.pull(merger.other_branch, False,
3883
merger.other_rev_id)
3884
result.report(self.outf)
3885
return 0
3886
if merger.this_basis is None:
3887
raise errors.BzrCommandError(
3888
"This branch has no commits."
3889
" (perhaps you would prefer 'bzr pull')")
3890
if preview:
3891
return self._do_preview(merger)
3892
elif interactive:
3893
return self._do_interactive(merger)
3894
else:
3895
return self._do_merge(merger, change_reporter, allow_pending,
3896
verified)
3897
3898
def _get_preview(self, merger):
2926
return self._do_merge(merger, change_reporter, allow_pending,
2927
verified)
2928
finally:
2929
for cleanup in reversed(cleanups):
2930
cleanup()
2931
2932
def _do_preview(self, merger):
2933
from bzrlib.diff import show_diff_trees
3899
2934
tree_merger = merger.make_merger()
3900
2935
tt = tree_merger.make_preview_transform()
3901
self.add_cleanup(tt.finalize)
3902
result_tree = tt.get_preview_tree()
3903
return result_tree
3904
3905
def _do_preview(self, merger):
3906
from bzrlib.diff import show_diff_trees
3907
result_tree = self._get_preview(merger)
3908
show_diff_trees(merger.this_tree, result_tree, self.outf,
3909
old_label='', new_label='')
2936
try:
2937
result_tree = tt.get_preview_tree()
2938
show_diff_trees(merger.this_tree, result_tree, self.outf,
2939
old_label='', new_label='')
2940
finally:
2941
tt.finalize()
3910
2942
3911
2943
def _do_merge(self, merger, change_reporter, allow_pending, verified):
3912
2944
merger.change_reporter = change_reporter
3920
2952
else:
3921
2953
return 0
3922
2954
3923
def _do_interactive(self, merger):
3924
"""Perform an interactive merge.
3925
3926
This works by generating a preview tree of the merge, then using
3927
Shelver to selectively remove the differences between the working tree
3928
and the preview tree.
3929
"""
3930
from bzrlib import shelf_ui
3931
result_tree = self._get_preview(merger)
3932
writer = bzrlib.option.diff_writer_registry.get()
3933
shelver = shelf_ui.Shelver(merger.this_tree, result_tree, destroy=True,
3934
reporter=shelf_ui.ApplyReporter(),
3935
diff_writer=writer(sys.stdout))
3936
try:
3937
shelver.run()
3938
finally:
3939
shelver.finalize()
3940
3941
2955
def sanity_check_merger(self, merger):
3942
2956
if (merger.show_base and
3943
2957
not merger.merge_type is _mod_merge.Merge3Merger):
3944
2958
raise errors.BzrCommandError("Show-base is not supported for this"
3945
2959
" merge type. %s" % merger.merge_type)
3946
if merger.reprocess is None:
3947
if merger.show_base:
3948
merger.reprocess = False
3949
else:
3950
# Use reprocess if the merger supports it
3951
merger.reprocess = merger.merge_type.supports_reprocess
3952
2960
if merger.reprocess and not merger.merge_type.supports_reprocess:
3953
2961
raise errors.BzrCommandError("Conflict reduction is not supported"
3954
2962
" for merge type %s." %
3978
2986
base_branch, base_path = Branch.open_containing(base_loc,
3979
2987
possible_transports)
3980
2988
# Find the revision ids
3981
other_revision_id = None
3982
base_revision_id = None
3983
if revision is not None:
3984
if len(revision) >= 1:
3985
other_revision_id = revision[-1].as_revision_id(other_branch)
3986
if len(revision) == 2:
3987
base_revision_id = revision[0].as_revision_id(base_branch)
3988
if other_revision_id is None:
2989
if revision is None or len(revision) < 1 or revision[-1] is None:
3989
2990
other_revision_id = _mod_revision.ensure_null(
3990
2991
other_branch.last_revision())
2992
else:
2993
other_revision_id = revision[-1].as_revision_id(other_branch)
2994
if (revision is not None and len(revision) == 2
2995
and revision[0] is not None):
2996
base_revision_id = revision[0].as_revision_id(base_branch)
2997
else:
2998
base_revision_id = None
3991
2999
# Remember where we merge from
3992
3000
if ((remember or tree.branch.get_submit_branch() is None) and
3993
3001
user_location is not None):
4002
3010
allow_pending = True
4003
3011
return merger, allow_pending
4004
3012
4005
def get_merger_from_uncommitted(self, tree, location, pb):
4006
"""Get a merger for uncommitted changes.
4007
4008
:param tree: The tree the merger should apply to.
4009
:param location: The location containing uncommitted changes.
4010
:param pb: The progress bar to use for showing progress.
4011
"""
4012
location = self._select_branch_location(tree, location)[0]
4013
other_tree, other_path = WorkingTree.open_containing(location)
4014
merger = _mod_merge.Merger.from_uncommitted(tree, other_tree, pb)
4015
if other_path != '':
4016
merger.interesting_files = [other_path]
4017
return merger
4018
4019
3013
def _select_branch_location(self, tree, user_location, revision=None,
4020
3014
index=None):
4021
3015
"""Select a branch location, according to possible inputs.
4051
3045
Report if the remembered location was used.
4052
3046
"""
4053
3047
stored_location = tree.branch.get_submit_branch()
4054
stored_location_type = "submit"
4055
3048
if stored_location is None:
4056
3049
stored_location = tree.branch.get_parent()
4057
stored_location_type = "parent"
4058
3050
mutter("%s", stored_location)
4059
3051
if stored_location is None:
4060
3052
raise errors.BzrCommandError("No location specified or remembered")
4061
3053
display_url = urlutils.unescape_for_display(stored_location, 'utf-8')
4062
note(u"%s remembered %s location %s", verb_string,
4063
stored_location_type, display_url)
3054
note(u"%s remembered location %s", verb_string, display_url)
4064
3055
return stored_location
4065
3056
4066
3057
4067
3058
class cmd_remerge(Command):
4068
__doc__ = """Redo a merge.
3059
"""Redo a merge.
4069
3060
4070
3061
Use this if you want to try a different merge technique while resolving
4071
conflicts. Some merge techniques are better than others, and remerge
3062
conflicts. Some merge techniques are better than others, and remerge
4072
3063
lets you try different ones on different files.
4073
3064
4074
3065
The options for remerge have the same meaning and defaults as the ones for
4078
3069
:Examples:
4079
3070
Re-do the merge of all conflicted files, and show the base text in
4080
3071
conflict regions, in addition to the usual THIS and OTHER texts::
4081
3072
4082
3073
bzr remerge --show-base
4083
3074
4084
3075
Re-do the merge of "foobar", using the weave merge algorithm, with
4085
3076
additional processing to reduce the size of conflict regions::
4086
3077
4087
3078
bzr remerge --merge-type weave --reprocess foobar
4088
3079
"""
4089
3080
takes_args = ['file*']
4096
3087
4097
3088
def run(self, file_list=None, merge_type=None, show_base=False,
4098
3089
reprocess=False):
4099
from bzrlib.conflicts import restore
4100
3090
if merge_type is None:
4101
3091
merge_type = _mod_merge.Merge3Merger
4102
3092
tree, file_list = tree_files(file_list)
4103
3093
tree.lock_write()
4104
self.add_cleanup(tree.unlock)
4105
parents = tree.get_parent_ids()
4106
if len(parents) != 2:
4107
raise errors.BzrCommandError("Sorry, remerge only works after normal"
4108
" merges. Not cherrypicking or"
4109
" multi-merges.")
4110
repository = tree.branch.repository
4111
interesting_ids = None
4112
new_conflicts = []
4113
conflicts = tree.conflicts()
4114
if file_list is not None:
4115
interesting_ids = set()
4116
for filename in file_list:
4117
file_id = tree.path2id(filename)
4118
if file_id is None:
4119
raise errors.NotVersionedError(filename)
4120
interesting_ids.add(file_id)
4121
if tree.kind(file_id) != "directory":
4122
continue
4123
4124
for name, ie in tree.inventory.iter_entries(file_id):
4125
interesting_ids.add(ie.file_id)
4126
new_conflicts = conflicts.select_conflicts(tree, file_list)[0]
4127
else:
4128
# Remerge only supports resolving contents conflicts
4129
allowed_conflicts = ('text conflict', 'contents conflict')
4130
restore_files = [c.path for c in conflicts
4131
if c.typestring in allowed_conflicts]
4132
_mod_merge.transform_tree(tree, tree.basis_tree(), interesting_ids)
4133
tree.set_conflicts(ConflictList(new_conflicts))
4134
if file_list is not None:
4135
restore_files = file_list
4136
for filename in restore_files:
3094
try:
3095
parents = tree.get_parent_ids()
3096
if len(parents) != 2:
3097
raise errors.BzrCommandError("Sorry, remerge only works after normal"
3098
" merges. Not cherrypicking or"
3099
" multi-merges.")
3100
repository = tree.branch.repository
3101
interesting_ids = None
3102
new_conflicts = []
3103
conflicts = tree.conflicts()
3104
if file_list is not None:
3105
interesting_ids = set()
3106
for filename in file_list:
3107
file_id = tree.path2id(filename)
3108
if file_id is None:
3109
raise errors.NotVersionedError(filename)
3110
interesting_ids.add(file_id)
3111
if tree.kind(file_id) != "directory":
3112
continue
3113
3114
for name, ie in tree.inventory.iter_entries(file_id):
3115
interesting_ids.add(ie.file_id)
3116
new_conflicts = conflicts.select_conflicts(tree, file_list)[0]
3117
else:
3118
# Remerge only supports resolving contents conflicts
3119
allowed_conflicts = ('text conflict', 'contents conflict')
3120
restore_files = [c.path for c in conflicts
3121
if c.typestring in allowed_conflicts]
3122
_mod_merge.transform_tree(tree, tree.basis_tree(), interesting_ids)
3123
tree.set_conflicts(ConflictList(new_conflicts))
3124
if file_list is not None:
3125
restore_files = file_list
3126
for filename in restore_files:
3127
try:
3128
restore(tree.abspath(filename))
3129
except errors.NotConflicted:
3130
pass
3131
# Disable pending merges, because the file texts we are remerging
3132
# have not had those merges performed. If we use the wrong parents
3133
# list, we imply that the working tree text has seen and rejected
3134
# all the changes from the other tree, when in fact those changes
3135
# have not yet been seen.
3136
pb = ui.ui_factory.nested_progress_bar()
3137
tree.set_parent_ids(parents[:1])
4137
3138
try:
4138
restore(tree.abspath(filename))
4139
except errors.NotConflicted:
4140
pass
4141
# Disable pending merges, because the file texts we are remerging
4142
# have not had those merges performed. If we use the wrong parents
4143
# list, we imply that the working tree text has seen and rejected
4144
# all the changes from the other tree, when in fact those changes
4145
# have not yet been seen.
4146
tree.set_parent_ids(parents[:1])
4147
try:
4148
merger = _mod_merge.Merger.from_revision_ids(None, tree, parents[1])
4149
merger.interesting_ids = interesting_ids
4150
merger.merge_type = merge_type
4151
merger.show_base = show_base
4152
merger.reprocess = reprocess
4153
conflicts = merger.do_merge()
3139
merger = _mod_merge.Merger.from_revision_ids(pb,
3140
tree, parents[1])
3141
merger.interesting_ids = interesting_ids
3142
merger.merge_type = merge_type
3143
merger.show_base = show_base
3144
merger.reprocess = reprocess
3145
conflicts = merger.do_merge()
3146
finally:
3147
tree.set_parent_ids(parents)
3148
pb.finished()
4154
3149
finally:
4155
tree.set_parent_ids(parents)
3150
tree.unlock()
4156
3151
if conflicts > 0:
4157
3152
return 1
4158
3153
else:
4160
3155
4161
3156
4162
3157
class cmd_revert(Command):
4163
__doc__ = """Revert files to a previous revision.
3158
"""Revert files to a previous revision.
4164
3159
4165
3160
Giving a list of files will revert only those files. Otherwise, all files
4166
3161
will be reverted. If the revision is not specified with '--revision', the
4170
3165
merge instead. For example, "merge . --revision -2..-3" will remove the
4171
3166
changes introduced by -2, without affecting the changes introduced by -1.
4172
3167
Or to remove certain changes on a hunk-by-hunk basis, see the Shelf plugin.
4173
3168
4174
3169
By default, any files that have been manually changed will be backed up
4175
3170
first. (Files changed only by merge are not backed up.) Backup files have
4176
3171
'.~#~' appended to their name, where # is a number.
4180
3175
name. If you name a directory, all the contents of that directory will be
4181
3176
reverted.
4182
3177
4183
If you have newly added files since the target revision, they will be
4184
removed. If the files to be removed have been changed, backups will be
4185
created as above. Directories containing unknown files will not be
4186
deleted.
3178
Any files that have been newly added since that revision will be deleted,
3179
with a backup kept if appropriate. Directories containing unknown files
3180
will not be deleted.
4187
3181
4188
The working tree contains a list of revisions that have been merged but
4189
not yet committed. These revisions will be included as additional parents
4190
of the next commit. Normally, using revert clears that list as well as
4191
reverting the files. If any files are specified, revert leaves the list
4192
of uncommitted merges alone and reverts only the files. Use ``bzr revert
4193
.`` in the tree root to revert all files but keep the recorded merges,
4194
and ``bzr revert --forget-merges`` to clear the pending merge list without
3182
The working tree contains a list of pending merged revisions, which will
3183
be included as parents in the next commit. Normally, revert clears that
3184
list as well as reverting the files. If any files are specified, revert
3185
leaves the pending merge list alone and reverts only the files. Use "bzr
3186
revert ." in the tree root to revert all files but keep the merge record,
3187
and "bzr revert --forget-merges" to clear the pending merge list without
4195
3188
reverting any files.
4196
4197
Using "bzr revert --forget-merges", it is possible to apply all of the
4198
changes from a branch in a single revision. To do this, perform the merge
4199
as desired. Then doing revert with the "--forget-merges" option will keep
4200
the content of the tree as it was, but it will clear the list of pending
4201
merges. The next commit will then contain all of the changes that are
4202
present in the other branch, but without any other parent revisions.
4203
Because this technique forgets where these changes originated, it may
4204
cause additional conflicts on later merges involving the same source and
4205
target branches.
4206
3189
"""
4207
3190
4208
3191
_see_also = ['cat', 'export']
4217
3200
def run(self, revision=None, no_backup=False, file_list=None,
4218
3201
forget_merges=None):
4219
3202
tree, file_list = tree_files(file_list)
4220
tree.lock_tree_write()
4221
self.add_cleanup(tree.unlock)
4222
3203
if forget_merges:
4223
3204
tree.set_parent_ids(tree.get_parent_ids()[:1])
4224
3205
else:
4226
3207
4227
3208
@staticmethod
4228
3209
def _revert_tree_to_revision(tree, revision, file_list, no_backup):
4229
rev_tree = _get_one_revision_tree('revert', revision, tree=tree)
4230
tree.revert(file_list, rev_tree, not no_backup, None,
4231
report_changes=True)
3210
if revision is None:
3211
rev_id = tree.last_revision()
3212
elif len(revision) != 1:
3213
raise errors.BzrCommandError('bzr revert --revision takes exactly 1 argument')
3214
else:
3215
rev_id = revision[0].as_revision_id(tree.branch)
3216
pb = ui.ui_factory.nested_progress_bar()
3217
try:
3218
tree.revert(file_list,
3219
tree.branch.repository.revision_tree(rev_id),
3220
not no_backup, pb, report_changes=True)
3221
finally:
3222
pb.finished()
4232
3223
4233
3224
4234
3225
class cmd_assert_fail(Command):
4235
__doc__ = """Test reporting of assertion failures"""
3226
"""Test reporting of assertion failures"""
4236
3227
# intended just for use in testing
4237
3228
4238
3229
hidden = True
4242
3233
4243
3234
4244
3235
class cmd_help(Command):
4245
__doc__ = """Show help on a command or other topic.
3236
"""Show help on a command or other topic.
4246
3237
"""
4247
3238
4248
3239
_see_also = ['topics']
4251
3242
]
4252
3243
takes_args = ['topic?']
4253
3244
aliases = ['?', '--help', '-?', '-h']
4254
3245
4255
3246
@display_command
4256
3247
def run(self, topic=None, long=False):
4257
3248
import bzrlib.help
4261
3252
4262
3253
4263
3254
class cmd_shell_complete(Command):
4264
__doc__ = """Show appropriate completions for context.
3255
"""Show appropriate completions for context.
4265
3256
4266
3257
For a list of all available commands, say 'bzr shell-complete'.
4267
3258
"""
4268
3259
takes_args = ['context?']
4269
3260
aliases = ['s-c']
4270
3261
hidden = True
4271
3262
4272
3263
@display_command
4273
3264
def run(self, context=None):
4274
3265
import shellcomplete
4275
3266
shellcomplete.shellcomplete(context)
4276
3267
4277
3268
3269
class cmd_fetch(Command):
3270
"""Copy in history from another branch but don't merge it.
3271
3272
This is an internal method used for pull and merge.
3273
"""
3274
hidden = True
3275
takes_args = ['from_branch', 'to_branch']
3276
def run(self, from_branch, to_branch):
3277
from bzrlib.fetch import Fetcher
3278
from_b = Branch.open(from_branch)
3279
to_b = Branch.open(to_branch)
3280
Fetcher(to_b, from_b)
3281
3282
4278
3283
class cmd_missing(Command):
4279
__doc__ = """Show unmerged/unpulled revisions between two branches.
4280
3284
"""Show unmerged/unpulled revisions between two branches.
3285
4281
3286
OTHER_BRANCH may be local or remote.
4282
4283
To filter on a range of revisions, you can use the command -r begin..end
4284
-r revision requests a specific revision, -r ..end or -r begin.. are
4285
also valid.
4286
4287
:Exit values:
4288
1 - some missing revisions
4289
0 - no missing revisions
4290
4291
:Examples:
4292
4293
Determine the missing revisions between this and the branch at the
4294
remembered pull location::
4295
4296
bzr missing
4297
4298
Determine the missing revisions between this and another branch::
4299
4300
bzr missing http://server/branch
4301
4302
Determine the missing revisions up to a specific revision on the other
4303
branch::
4304
4305
bzr missing -r ..-10
4306
4307
Determine the missing revisions up to a specific revision on this
4308
branch::
4309
4310
bzr missing --my-revision ..-10
4311
3287
"""
4312
3288
4313
3289
_see_also = ['merge', 'pull']
4314
3290
takes_args = ['other_branch?']
4315
3291
takes_options = [
4316
Option('reverse', 'Reverse the order of revisions.'),
4317
Option('mine-only',
4318
'Display changes in the local branch only.'),
4319
Option('this' , 'Same as --mine-only.'),
4320
Option('theirs-only',
4321
'Display changes in the remote branch only.'),
4322
Option('other', 'Same as --theirs-only.'),
4323
'log-format',
4324
'show-ids',
4325
'verbose',
4326
custom_help('revision',
4327
help='Filter on other branch revisions (inclusive). '
4328
'See "help revisionspec" for details.'),
4329
Option('my-revision',
4330
type=_parse_revision_str,
4331
help='Filter on local branch revisions (inclusive). '
4332
'See "help revisionspec" for details.'),
4333
Option('include-merges',
4334
'Show all revisions in addition to the mainline ones.'),
4335
]
3292
Option('reverse', 'Reverse the order of revisions.'),
3293
Option('mine-only',
3294
'Display changes in the local branch only.'),
3295
Option('this' , 'Same as --mine-only.'),
3296
Option('theirs-only',
3297
'Display changes in the remote branch only.'),
3298
Option('other', 'Same as --theirs-only.'),
3299
'log-format',
3300
'show-ids',
3301
'verbose'
3302
]
4336
3303
encoding_type = 'replace'
4337
3304
4338
3305
@display_command
4339
3306
def run(self, other_branch=None, reverse=False, mine_only=False,
4340
theirs_only=False,
4341
log_format=None, long=False, short=False, line=False,
4342
show_ids=False, verbose=False, this=False, other=False,
4343
include_merges=False, revision=None, my_revision=None):
3307
theirs_only=False, log_format=None, long=False, short=False, line=False,
3308
show_ids=False, verbose=False, this=False, other=False):
4344
3309
from bzrlib.missing import find_unmerged, iter_log_revisions
4345
def message(s):
4346
if not is_quiet():
4347
self.outf.write(s)
4348
3310
4349
3311
if this:
4350
mine_only = this
3312
mine_only = this
4351
3313
if other:
4352
theirs_only = other
4353
# TODO: We should probably check that we don't have mine-only and
4354
# theirs-only set, but it gets complicated because we also have
4355
# this and other which could be used.
4356
restrict = 'all'
4357
if mine_only:
4358
restrict = 'local'
4359
elif theirs_only:
4360
restrict = 'remote'
3314
theirs_only = other
4361
3315
4362
3316
local_branch = Branch.open_containing(u".")[0]
4363
local_branch.lock_read()
4364
self.add_cleanup(local_branch.unlock)
4365
4366
3317
parent = local_branch.get_parent()
4367
3318
if other_branch is None:
4368
3319
other_branch = parent
4371
3322
" or specified.")
4372
3323
display_url = urlutils.unescape_for_display(parent,
4373
3324
self.outf.encoding)
4374
message("Using saved parent location: "
4375
+ display_url + "\n")
3325
self.outf.write("Using last location: " + display_url + "\n")
4376
3326
4377
3327
remote_branch = Branch.open(other_branch)
4378
3328
if remote_branch.base == local_branch.base:
4379
3329
remote_branch = local_branch
4380
else:
3330
local_branch.lock_read()
3331
try:
4381
3332
remote_branch.lock_read()
4382
self.add_cleanup(remote_branch.unlock)
4383
4384
local_revid_range = _revision_range_to_revid_range(
4385
_get_revision_range(my_revision, local_branch,
4386
self.name()))
4387
4388
remote_revid_range = _revision_range_to_revid_range(
4389
_get_revision_range(revision,
4390
remote_branch, self.name()))
4391
4392
local_extra, remote_extra = find_unmerged(
4393
local_branch, remote_branch, restrict,
4394
backward=not reverse,
4395
include_merges=include_merges,
4396
local_revid_range=local_revid_range,
4397
remote_revid_range=remote_revid_range)
4398
4399
if log_format is None:
4400
registry = log.log_formatter_registry
4401
log_format = registry.get_default(local_branch)
4402
lf = log_format(to_file=self.outf,
4403
show_ids=show_ids,
4404
show_timezone='original')
4405
4406
status_code = 0
4407
if local_extra and not theirs_only:
4408
message("You have %d extra revision(s):\n" %
4409
len(local_extra))
4410
for revision in iter_log_revisions(local_extra,
4411
local_branch.repository,
4412
verbose):
4413
lf.log_revision(revision)
4414
printed_local = True
4415
status_code = 1
4416
else:
4417
printed_local = False
4418
4419
if remote_extra and not mine_only:
4420
if printed_local is True:
4421
message("\n\n\n")
4422
message("You are missing %d revision(s):\n" %
4423
len(remote_extra))
4424
for revision in iter_log_revisions(remote_extra,
4425
remote_branch.repository,
4426
verbose):
4427
lf.log_revision(revision)
4428
status_code = 1
4429
4430
if mine_only and not local_extra:
4431
# We checked local, and found nothing extra
4432
message('This branch is up to date.\n')
4433
elif theirs_only and not remote_extra:
4434
# We checked remote, and found nothing extra
4435
message('Other branch is up to date.\n')
4436
elif not (mine_only or theirs_only or local_extra or
4437
remote_extra):
4438
# We checked both branches, and neither one had extra
4439
# revisions
4440
message("Branches are up to date.\n")
4441
self.cleanup_now()
3333
try:
3334
local_extra, remote_extra = find_unmerged(local_branch,
3335
remote_branch)
3336
if log_format is None:
3337
registry = log.log_formatter_registry
3338
log_format = registry.get_default(local_branch)
3339
lf = log_format(to_file=self.outf,
3340
show_ids=show_ids,
3341
show_timezone='original')
3342
if reverse is False:
3343
local_extra.reverse()
3344
remote_extra.reverse()
3345
if local_extra and not theirs_only:
3346
self.outf.write("You have %d extra revision(s):\n" %
3347
len(local_extra))
3348
for revision in iter_log_revisions(local_extra,
3349
local_branch.repository,
3350
verbose):
3351
lf.log_revision(revision)
3352
printed_local = True
3353
else:
3354
printed_local = False
3355
if remote_extra and not mine_only:
3356
if printed_local is True:
3357
self.outf.write("\n\n\n")
3358
self.outf.write("You are missing %d revision(s):\n" %
3359
len(remote_extra))
3360
for revision in iter_log_revisions(remote_extra,
3361
remote_branch.repository,
3362
verbose):
3363
lf.log_revision(revision)
3364
if not remote_extra and not local_extra:
3365
status_code = 0
3366
self.outf.write("Branches are up to date.\n")
3367
else:
3368
status_code = 1
3369
finally:
3370
remote_branch.unlock()
3371
finally:
3372
local_branch.unlock()
4442
3373
if not status_code and parent is None and other_branch is not None:
4443
3374
local_branch.lock_write()
4444
self.add_cleanup(local_branch.unlock)
4445
# handle race conditions - a parent might be set while we run.
4446
if local_branch.get_parent() is None:
4447
local_branch.set_parent(remote_branch.base)
3375
try:
3376
# handle race conditions - a parent might be set while we run.
3377
if local_branch.get_parent() is None:
3378
local_branch.set_parent(remote_branch.base)
3379
finally:
3380
local_branch.unlock()
4448
3381
return status_code
4449
3382
4450
3383
4451
3384
class cmd_pack(Command):
4452
__doc__ = """Compress the data within a repository.
4453
4454
This operation compresses the data within a bazaar repository. As
4455
bazaar supports automatic packing of repository, this operation is
4456
normally not required to be done manually.
4457
4458
During the pack operation, bazaar takes a backup of existing repository
4459
data, i.e. pack files. This backup is eventually removed by bazaar
4460
automatically when it is safe to do so. To save disk space by removing
4461
the backed up pack files, the --clean-obsolete-packs option may be
4462
used.
4463
4464
Warning: If you use --clean-obsolete-packs and your machine crashes
4465
during or immediately after repacking, you may be left with a state
4466
where the deletion has been written to disk but the new packs have not
4467
been. In this case the repository may be unusable.
4468
"""
3385
"""Compress the data within a repository."""
4469
3386
4470
3387
_see_also = ['repositories']
4471
3388
takes_args = ['branch_or_repo?']
4472
takes_options = [
4473
Option('clean-obsolete-packs', 'Delete obsolete packs to save disk space.'),
4474
]
4475
3389
4476
def run(self, branch_or_repo='.', clean_obsolete_packs=False):
3390
def run(self, branch_or_repo='.'):
4477
3391
dir = bzrdir.BzrDir.open_containing(branch_or_repo)[0]
4478
3392
try:
4479
3393
branch = dir.open_branch()
4480
3394
repository = branch.repository
4481
3395
except errors.NotBranchError:
4482
3396
repository = dir.open_repository()
4483
repository.pack(clean_obsolete_packs=clean_obsolete_packs)
3397
repository.pack()
4484
3398
4485
3399
4486
3400
class cmd_plugins(Command):
4487
__doc__ = """List the installed plugins.
4488
3401
"""List the installed plugins.
3402
4489
3403
This command displays the list of installed plugins including
4490
3404
version of plugin and a short description of each.
4491
3405
4497
3411
adding new commands, providing additional network transports and
4498
3412
customizing log output.
4499
3413
4500
See the Bazaar Plugin Guide <http://doc.bazaar.canonical.com/plugins/en/>
4501
for further information on plugins including where to find them and how to
4502
install them. Instructions are also provided there on how to write new
4503
plugins using the Python programming language.
3414
See the Bazaar web site, http://bazaar-vcs.org, for further
3415
information on plugins including where to find them and how to
3416
install them. Instructions are also provided there on how to
3417
write new plugins using the Python programming language.
4504
3418
"""
4505
3419
takes_options = ['verbose']
4506
3420
4521
3435
doc = '(no description)'
4522
3436
result.append((name_ver, doc, plugin.path()))
4523
3437
for name_ver, doc, path in sorted(result):
4524
self.outf.write("%s\n" % name_ver)
4525
self.outf.write(" %s\n" % doc)
3438
print name_ver
3439
print ' ', doc
4526
3440
if verbose:
4527
self.outf.write(" %s\n" % path)
4528
self.outf.write("\n")
3441
print ' ', path
3442
print
4529
3443
4530
3444
4531
3445
class cmd_testament(Command):
4532
__doc__ = """Show testament (signing-form) of a revision."""
3446
"""Show testament (signing-form) of a revision."""
4533
3447
takes_options = [
4534
3448
'revision',
4535
3449
Option('long', help='Produce long-format testament.'),
4543
3457
testament_class = StrictTestament
4544
3458
else:
4545
3459
testament_class = Testament
4546
if branch == '.':
4547
b = Branch.open_containing(branch)[0]
4548
else:
4549
b = Branch.open(branch)
3460
b = WorkingTree.open_containing(branch)[0].branch
4550
3461
b.lock_read()
4551
self.add_cleanup(b.unlock)
4552
if revision is None:
4553
rev_id = b.last_revision()
4554
else:
4555
rev_id = revision[0].as_revision_id(b)
4556
t = testament_class.from_revision(b.repository, rev_id)
4557
if long:
4558
sys.stdout.writelines(t.as_text_lines())
4559
else:
4560
sys.stdout.write(t.as_short_text())
3462
try:
3463
if revision is None:
3464
rev_id = b.last_revision()
3465
else:
3466
rev_id = revision[0].as_revision_id(b)
3467
t = testament_class.from_revision(b.repository, rev_id)
3468
if long:
3469
sys.stdout.writelines(t.as_text_lines())
3470
else:
3471
sys.stdout.write(t.as_short_text())
3472
finally:
3473
b.unlock()
4561
3474
4562
3475
4563
3476
class cmd_annotate(Command):
4564
__doc__ = """Show the origin of each line in a file.
3477
"""Show the origin of each line in a file.
4565
3478
4566
3479
This prints out the given file with an annotation on the left side
4567
3480
indicating which revision, author and date introduced the change.
4568
3481
4569
If the origin is the same for a run of consecutive lines, it is
3482
If the origin is the same for a run of consecutive lines, it is
4570
3483
shown only at the top, unless the --all option is given.
4571
3484
"""
4572
3485
# TODO: annotate directories; showing when each file was last changed
4573
# TODO: if the working copy is modified, show annotations on that
3486
# TODO: if the working copy is modified, show annotations on that
4574
3487
# with new uncommitted lines marked
4575
3488
aliases = ['ann', 'blame', 'praise']
4576
3489
takes_args = ['filename']
4584
3497
@display_command
4585
3498
def run(self, filename, all=False, long=False, revision=None,
4586
3499
show_ids=False):
4587
from bzrlib.annotate import annotate_file, annotate_file_tree
3500
from bzrlib.annotate import annotate_file
4588
3501
wt, branch, relpath = \
4589
3502
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
4590
3503
if wt is not None:
4591
3504
wt.lock_read()
4592
self.add_cleanup(wt.unlock)
4593
3505
else:
4594
3506
branch.lock_read()
4595
self.add_cleanup(branch.unlock)
4596
tree = _get_one_revision_tree('annotate', revision, branch=branch)
4597
tree.lock_read()
4598
self.add_cleanup(tree.unlock)
4599
if wt is not None:
4600
file_id = wt.path2id(relpath)
4601
else:
4602
file_id = tree.path2id(relpath)
4603
if file_id is None:
4604
raise errors.NotVersionedError(filename)
4605
file_version = tree.inventory[file_id].revision
4606
if wt is not None and revision is None:
4607
# If there is a tree and we're not annotating historical
4608
# versions, annotate the working tree's content.
4609
annotate_file_tree(wt, file_id, self.outf, long, all,
4610
show_ids=show_ids)
4611
else:
3507
try:
3508
if revision is None:
3509
revision_id = branch.last_revision()
3510
elif len(revision) != 1:
3511
raise errors.BzrCommandError('bzr annotate --revision takes exactly 1 argument')
3512
else:
3513
revision_id = revision[0].as_revision_id(branch)
3514
tree = branch.repository.revision_tree(revision_id)
3515
if wt is not None:
3516
file_id = wt.path2id(relpath)
3517
else:
3518
file_id = tree.path2id(relpath)
3519
if file_id is None:
3520
raise errors.NotVersionedError(filename)
3521
file_version = tree.inventory[file_id].revision
4612
3522
annotate_file(branch, file_version, file_id, long, all, self.outf,
4613
3523
show_ids=show_ids)
3524
finally:
3525
if wt is not None:
3526
wt.unlock()
3527
else:
3528
branch.unlock()
4614
3529
4615
3530
4616
3531
class cmd_re_sign(Command):
4617
__doc__ = """Create a digital signature for an existing revision."""
3532
"""Create a digital signature for an existing revision."""
4618
3533
# TODO be able to replace existing ones.
4619
3534
4620
3535
hidden = True # is this right ?
4621
3536
takes_args = ['revision_id*']
4622
3537
takes_options = ['revision']
4623
3538
4624
3539
def run(self, revision_id_list=None, revision=None):
4625
3540
if revision_id_list is not None and revision is not None:
4626
3541
raise errors.BzrCommandError('You can only supply one of revision_id or --revision')
4628
3543
raise errors.BzrCommandError('You must supply either --revision or a revision_id')
4629
3544
b = WorkingTree.open_containing(u'.')[0].branch
4630
3545
b.lock_write()
4631
self.add_cleanup(b.unlock)
4632
return self._run(b, revision_id_list, revision)
3546
try:
3547
return self._run(b, revision_id_list, revision)
3548
finally:
3549
b.unlock()
4633
3550
4634
3551
def _run(self, b, revision_id_list, revision):
4635
3552
import bzrlib.gpg as gpg
4680
3597
4681
3598
4682
3599
class cmd_bind(Command):
4683
__doc__ = """Convert the current branch into a checkout of the supplied branch.
4684
If no branch is supplied, rebind to the last bound location.
3600
"""Convert the current branch into a checkout of the supplied branch.
4685
3601
4686
3602
Once converted into a checkout, commits must succeed on the master branch
4687
3603
before they will be applied to the local branch.
4688
4689
Bound branches use the nickname of its master branch unless it is set
4690
locally, in which case binding will update the local nickname to be
4691
that of the master.
4692
3604
"""
4693
3605
4694
3606
_see_also = ['checkouts', 'unbind']
4705
3617
'This format does not remember old locations.')
4706
3618
else:
4707
3619
if location is None:
4708
if b.get_bound_location() is not None:
4709
raise errors.BzrCommandError('Branch is already bound')
4710
else:
4711
raise errors.BzrCommandError('No location supplied '
4712
'and no previous location known')
3620
raise errors.BzrCommandError('No location supplied and no '
3621
'previous location known')
4713
3622
b_other = Branch.open(location)
4714
3623
try:
4715
3624
b.bind(b_other)
4716
3625
except errors.DivergedBranches:
4717
3626
raise errors.BzrCommandError('These branches have diverged.'
4718
3627
' Try merging, and then bind again.')
4719
if b.get_config().has_explicit_nickname():
4720
b.nick = b_other.nick
4721
3628
4722
3629
4723
3630
class cmd_unbind(Command):
4724
__doc__ = """Convert the current checkout into a regular branch.
3631
"""Convert the current checkout into a regular branch.
4725
3632
4726
3633
After unbinding, the local branch is considered independent and subsequent
4727
3634
commits will be local only.
4738
3645
4739
3646
4740
3647
class cmd_uncommit(Command):
4741
__doc__ = """Remove the last committed revision.
3648
"""Remove the last committed revision.
4742
3649
4743
3650
--verbose will print out what is being removed.
4744
3651
--dry-run will go through all the motions, but not actually
4748
3655
specified revision. For example, "bzr uncommit -r 15" will leave the
4749
3656
branch at revision 15.
4750
3657
4751
Uncommit leaves the working tree ready for a new commit. The only change
4752
it may make is to restore any pending merges that were present before
4753
the commit.
3658
In the future, uncommit will create a revision bundle, which can then
3659
be re-applied.
4754
3660
"""
4755
3661
4756
3662
# TODO: jam 20060108 Add an option to allow uncommit to remove
4785
3691
4786
3692
if tree is not None:
4787
3693
tree.lock_write()
4788
self.add_cleanup(tree.unlock)
4789
3694
else:
4790
3695
b.lock_write()
4791
self.add_cleanup(b.unlock)
4792
return self._run(b, tree, dry_run, verbose, revision, force, local=local)
3696
try:
3697
return self._run(b, tree, dry_run, verbose, revision, force,
3698
local=local)
3699
finally:
3700
if tree is not None:
3701
tree.unlock()
3702
else:
3703
b.unlock()
4793
3704
4794
3705
def _run(self, b, tree, dry_run, verbose, revision, force, local=False):
4795
3706
from bzrlib.log import log_formatter, show_log
4827
3738
end_revision=last_revno)
4828
3739
4829
3740
if dry_run:
4830
self.outf.write('Dry-run, pretending to remove'
4831
' the above revisions.\n')
3741
print 'Dry-run, pretending to remove the above revisions.'
3742
if not force:
3743
val = raw_input('Press <enter> to continue')
4832
3744
else:
4833
self.outf.write('The above revision(s) will be removed.\n')
4834
4835
if not force:
4836
if not ui.ui_factory.get_boolean('Are you sure'):
4837
self.outf.write('Canceled')
4838
return 0
4839
4840
mutter('Uncommitting from {%s} to {%s}',
4841
last_rev_id, rev_id)
3745
print 'The above revision(s) will be removed.'
3746
if not force:
3747
val = raw_input('Are you sure [y/N]? ')
3748
if val.lower() not in ('y', 'yes'):
3749
print 'Canceled'
3750
return 0
3751
4842
3752
uncommit(b, tree=tree, dry_run=dry_run, verbose=verbose,
4843
3753
revno=revno, local=local)
4844
self.outf.write('You can restore the old tip by running:\n'
4845
' bzr pull . -r revid:%s\n' % last_rev_id)
4846
3754
4847
3755
4848
3756
class cmd_break_lock(Command):
4849
__doc__ = """Break a dead lock on a repository, branch or working directory.
3757
"""Break a dead lock on a repository, branch or working directory.
4850
3758
4851
3759
CAUTION: Locks should only be broken when you are sure that the process
4852
3760
holding the lock has been stopped.
4853
3761
4854
You can get information on what locks are open via the 'bzr info
4855
[location]' command.
4856
3762
You can get information on what locks are open via the 'bzr info' command.
3763
4857
3764
:Examples:
4858
3765
bzr break-lock
4859
bzr break-lock bzr+ssh://example.com/bzr/foo
4860
3766
"""
4861
3767
takes_args = ['location?']
4862
3768
4868
3774
control.break_lock()
4869
3775
except NotImplementedError:
4870
3776
pass
4871
3777
4872
3778
4873
3779
class cmd_wait_until_signalled(Command):
4874
__doc__ = """Test helper for test_start_and_stop_bzr_subprocess_send_signal.
3780
"""Test helper for test_start_and_stop_bzr_subprocess_send_signal.
4875
3781
4876
3782
This just prints a line to signal when it is ready, then blocks on stdin.
4877
3783
"""
4885
3791
4886
3792
4887
3793
class cmd_serve(Command):
4888
__doc__ = """Run the bzr server."""
3794
"""Run the bzr server."""
4889
3795
4890
3796
aliases = ['server']
4891
3797
4892
3798
takes_options = [
4893
3799
Option('inet',
4894
3800
help='Serve on stdin/out for use from inetd or sshd.'),
4895
RegistryOption('protocol',
4896
help="Protocol to serve.",
4897
lazy_registry=('bzrlib.transport', 'transport_server_registry'),
4898
value_switches=True),
4899
3801
Option('port',
4900
3802
help='Listen for connections on nominated port of the form '
4901
3803
'[hostname:]portnumber. Passing 0 as the port number will '
4902
'result in a dynamically allocated port. The default port '
4903
'depends on the protocol.',
3804
'result in a dynamically allocated port. The default port is '
3805
'4155.',
4904
3806
type=str),
4905
3807
Option('directory',
4906
3808
help='Serve contents of this directory.',
4908
3810
Option('allow-writes',
4909
3811
help='By default the server is a readonly server. Supplying '
4910
3812
'--allow-writes enables write access to the contents of '
4911
'the served directory and below. Note that ``bzr serve`` '
4912
'does not perform authentication, so unless some form of '
4913
'external authentication is arranged supplying this '
4914
'option leads to global uncontrolled write access to your '
4915
'file system.'
3813
'the served directory and below.'
4916
3814
),
4917
3815
]
4918
3816
4919
def get_host_and_port(self, port):
4920
"""Return the host and port to run the smart server on.
4921
4922
If 'port' is None, None will be returned for the host and port.
4923
4924
If 'port' has a colon in it, the string before the colon will be
4925
interpreted as the host.
4926
4927
:param port: A string of the port to run the server on.
4928
:return: A tuple of (host, port), where 'host' is a host name or IP,
4929
and port is an integer TCP/IP port.
4930
"""
4931
host = None
4932
if port is not None:
4933
if ':' in port:
4934
host, port = port.split(':')
4935
port = int(port)
4936
return host, port
4937
4938
def run(self, port=None, inet=False, directory=None, allow_writes=False,
4939
protocol=None):
4940
from bzrlib.transport import get_transport, transport_server_registry
3817
def run(self, port=None, inet=False, directory=None, allow_writes=False):
3818
from bzrlib import lockdir
3819
from bzrlib.smart import medium, server
3820
from bzrlib.transport import get_transport
3821
from bzrlib.transport.chroot import ChrootServer
4941
3822
if directory is None:
4942
3823
directory = os.getcwd()
4943
if protocol is None:
4944
protocol = transport_server_registry.get()
4945
host, port = self.get_host_and_port(port)
4946
3824
url = urlutils.local_path_to_url(directory)
4947
3825
if not allow_writes:
4948
3826
url = 'readonly+' + url
4949
transport = get_transport(url)
4950
protocol(transport, host, port, inet)
3827
chroot_server = ChrootServer(get_transport(url))
3828
chroot_server.setUp()
3829
t = get_transport(chroot_server.get_url())
3830
if inet:
3831
smart_server = medium.SmartServerPipeStreamMedium(
3832
sys.stdin, sys.stdout, t)
3833
else:
3834
host = medium.BZR_DEFAULT_INTERFACE
3835
if port is None:
3836
port = medium.BZR_DEFAULT_PORT
3837
else:
3838
if ':' in port:
3839
host, port = port.split(':')
3840
port = int(port)
3841
smart_server = server.SmartTCPServer(t, host=host, port=port)
3842
print 'listening on port: ', smart_server.port
3843
sys.stdout.flush()
3844
# for the duration of this server, no UI output is permitted.
3845
# note that this may cause problems with blackbox tests. This should
3846
# be changed with care though, as we dont want to use bandwidth sending
3847
# progress over stderr to smart server clients!
3848
old_factory = ui.ui_factory
3849
old_lockdir_timeout = lockdir._DEFAULT_TIMEOUT_SECONDS
3850
try:
3851
ui.ui_factory = ui.SilentUIFactory()
3852
lockdir._DEFAULT_TIMEOUT_SECONDS = 0
3853
smart_server.serve()
3854
finally:
3855
ui.ui_factory = old_factory
3856
lockdir._DEFAULT_TIMEOUT_SECONDS = old_lockdir_timeout
4951
3857
4952
3858
4953
3859
class cmd_join(Command):
4954
__doc__ = """Combine a tree into its containing tree.
4955
4956
This command requires the target tree to be in a rich-root format.
3860
"""Combine a subtree into its containing tree.
3861
3862
This command is for experimental use only. It requires the target tree
3863
to be in dirstate-with-subtree format, which cannot be converted into
3864
earlier formats.
4957
3865
4958
3866
The TREE argument should be an independent tree, inside another tree, but
4959
3867
not part of it. (Such trees can be produced by "bzr split", but also by
4962
3870
The result is a combined tree, with the subtree no longer an independant
4963
3871
part. This is marked as a merge of the subtree into the containing tree,
4964
3872
and all history is preserved.
3873
3874
If --reference is specified, the subtree retains its independence. It can
3875
be branched by itself, and can be part of multiple projects at the same
3876
time. But operations performed in the containing tree, such as commit
3877
and merge, will recurse into the subtree.
4965
3878
"""
4966
3879
4967
3880
_see_also = ['split']
4968
3881
takes_args = ['tree']
4969
3882
takes_options = [
4970
Option('reference', help='Join by reference.', hidden=True),
3883
Option('reference', help='Join by reference.'),
4971
3884
]
3885
hidden = True
4972
3886
4973
3887
def run(self, tree, reference=False):
4974
3888
sub_tree = WorkingTree.open(tree)
4992
3906
try:
4993
3907
containing_tree.subsume(sub_tree)
4994
3908
except errors.BadSubsumeSource, e:
4995
raise errors.BzrCommandError("Cannot join %s. %s" %
3909
raise errors.BzrCommandError("Cannot join %s. %s" %
4996
3910
(tree, e.reason))
4997
3911
4998
3912
4999
3913
class cmd_split(Command):
5000
__doc__ = """Split a subdirectory of a tree into a separate tree.
3914
"""Split a subdirectory of a tree into a separate tree.
5001
3915
5002
3916
This command will produce a target tree in a format that supports
5003
3917
rich roots, like 'rich-root' or 'rich-root-pack'. These formats cannot be
5008
3922
branch. Commits in the top-level tree will not apply to the new subtree.
5009
3923
"""
5010
3924
5011
_see_also = ['join']
3925
# join is not un-hidden yet
3926
#_see_also = ['join']
5012
3927
takes_args = ['tree']
5013
3928
5014
3929
def run(self, tree):
5019
3934
try:
5020
3935
containing_tree.extract(sub_id)
5021
3936
except errors.RootNotRich:
5022
raise errors.RichRootUpgradeRequired(containing_tree.branch.base)
3937
raise errors.UpgradeRequired(containing_tree.branch.base)
5023
3938
5024
3939
5025
3940
class cmd_merge_directive(Command):
5026
__doc__ = """Generate a merge directive for auto-merge tools.
3941
"""Generate a merge directive for auto-merge tools.
5027
3942
5028
3943
A directive requests a merge to be performed, and also provides all the
5029
3944
information necessary to do so. This means it must either include a
5122
4037
5123
4038
5124
4039
class cmd_send(Command):
5125
__doc__ = """Mail or create a merge-directive for submitting changes.
4040
"""Mail or create a merge-directive for submiting changes.
5126
4041
5127
4042
A merge directive provides many things needed for requesting merges:
5128
4043
5134
4049
directly from the merge directive, without retrieving data from a
5135
4050
branch.
5136
4051
5137
`bzr send` creates a compact data set that, when applied using bzr
5138
merge, has the same effect as merging from the source branch.
5139
5140
By default the merge directive is self-contained and can be applied to any
5141
branch containing submit_branch in its ancestory without needing access to
5142
the source branch.
5143
5144
If --no-bundle is specified, then Bazaar doesn't send the contents of the
5145
revisions, but only a structured request to merge from the
5146
public_location. In that case the public_branch is needed and it must be
5147
up-to-date and accessible to the recipient. The public_branch is always
5148
included if known, so that people can check it later.
5149
5150
The submit branch defaults to the parent of the source branch, but can be
5151
overridden. Both submit branch and public branch will be remembered in
5152
branch.conf the first time they are used for a particular branch. The
5153
source branch defaults to that containing the working directory, but can
5154
be changed using --from.
5155
5156
In order to calculate those changes, bzr must analyse the submit branch.
5157
Therefore it is most efficient for the submit branch to be a local mirror.
5158
If a public location is known for the submit_branch, that location is used
5159
in the merge directive.
5160
5161
The default behaviour is to send the merge directive by mail, unless -o is
5162
given, in which case it is sent to a file.
4052
If --no-bundle is specified, then public_branch is needed (and must be
4053
up-to-date), so that the receiver can perform the merge using the
4054
public_branch. The public_branch is always included if known, so that
4055
people can check it later.
4056
4057
The submit branch defaults to the parent, but can be overridden. Both
4058
submit branch and public branch will be remembered if supplied.
4059
4060
If a public_branch is known for the submit_branch, that public submit
4061
branch is used in the merge instructions. This means that a local mirror
4062
can be used as your actual submit branch, once you have set public_branch
4063
for that mirror.
5163
4064
5164
4065
Mail is sent using your preferred mail program. This should be transparent
5165
4066
on Windows (it uses MAPI). On Linux, it requires the xdg-email utility.
5166
4067
If the preferred client can't be found (or used), your editor will be used.
5167
4068
5168
4069
To use a specific mail program, set the mail_client configuration option.
5169
4070
(For Thunderbird 1.5, this works around some bugs.) Supported values for
5170
specific clients are "claws", "evolution", "kmail", "mail.app" (MacOS X's
5171
Mail.app), "mutt", and "thunderbird"; generic options are "default",
5172
"editor", "emacsclient", "mapi", and "xdg-email". Plugins may also add
5173
supported clients.
4071
specific clients are "evolution", "kmail", "mutt", and "thunderbird";
4072
generic options are "default", "editor", "mapi", and "xdg-email".
5174
4073
5175
4074
If mail is being sent, a to address is required. This can be supplied
5176
4075
either on the commandline, by setting the submit_to configuration
5177
option in the branch itself or the child_submit_to configuration option
4076
option in the branch itself or the child_submit_to configuration option
5178
4077
in the submit branch.
5179
4078
5180
4079
Two formats are currently supported: "4" uses revision bundle format 4 and
5182
4081
older formats. It is compatible with Bazaar 0.19 and later. It is the
5183
4082
default. "0.9" uses revision bundle format 0.9 and merge directive
5184
4083
format 1. It is compatible with Bazaar 0.12 - 0.18.
5185
5186
The merge directives created by bzr send may be applied using bzr merge or
5187
bzr pull by specifying a file containing a merge directive as the location.
5188
5189
bzr send makes extensive use of public locations to map local locations into
5190
URLs that can be used by other people. See `bzr help configuration` to
5191
set them, and use `bzr info` to display them.
4084
4085
Merge directives are applied using the merge command or the pull command.
5192
4086
"""
5193
4087
5194
4088
encoding_type = 'exact'
5209
4103
'rather than the one containing the working directory.',
5210
4104
short_name='f',
5211
4105
type=unicode),
5212
Option('output', short_name='o',
5213
help='Write merge directive to this file or directory; '
5214
'use - for stdout.',
4106
Option('output', short_name='o', help='Write directive to this file.',
5215
4107
type=unicode),
5216
Option('strict',
5217
help='Refuse to send if there are uncommitted changes in'
5218
' the working tree, --no-strict disables the check.'),
5219
4108
Option('mail-to', help='Mail the request to this address.',
5220
4109
type=unicode),
5221
4110
'revision',
5222
4111
'message',
5223
Option('body', help='Body for the email.', type=unicode),
5224
RegistryOption('format',
5225
help='Use the specified output format.',
5226
lazy_registry=('bzrlib.send', 'format_registry')),
4112
RegistryOption.from_kwargs('format',
4113
'Use the specified output format.',
4114
**{'4': 'Bundle format 4, Merge Directive 2 (default)',
4115
'0.9': 'Bundle format 0.9, Merge Directive 1',})
5227
4116
]
5228
4117
5229
4118
def run(self, submit_branch=None, public_branch=None, no_bundle=False,
5230
4119
no_patch=False, revision=None, remember=False, output=None,
5231
format=None, mail_to=None, message=None, body=None,
5232
strict=None, **kwargs):
5233
from bzrlib.send import send
5234
return send(submit_branch, revision, public_branch, remember,
5235
format, no_bundle, no_patch, output,
5236
kwargs.get('from', '.'), mail_to, message, body,
5237
self.outf,
5238
strict=strict)
4120
format='4', mail_to=None, message=None, **kwargs):
4121
return self._run(submit_branch, revision, public_branch, remember,
4122
format, no_bundle, no_patch, output,
4123
kwargs.get('from', '.'), mail_to, message)
4124
4125
def _run(self, submit_branch, revision, public_branch, remember, format,
4126
no_bundle, no_patch, output, from_, mail_to, message):
4127
from bzrlib.revision import NULL_REVISION
4128
branch = Branch.open_containing(from_)[0]
4129
if output is None:
4130
outfile = StringIO()
4131
elif output == '-':
4132
outfile = self.outf
4133
else:
4134
outfile = open(output, 'wb')
4135
# we may need to write data into branch's repository to calculate
4136
# the data to send.
4137
branch.lock_write()
4138
try:
4139
if output is None:
4140
config = branch.get_config()
4141
if mail_to is None:
4142
mail_to = config.get_user_option('submit_to')
4143
mail_client = config.get_mail_client()
4144
if remember and submit_branch is None:
4145
raise errors.BzrCommandError(
4146
'--remember requires a branch to be specified.')
4147
stored_submit_branch = branch.get_submit_branch()
4148
remembered_submit_branch = False
4149
if submit_branch is None:
4150
submit_branch = stored_submit_branch
4151
remembered_submit_branch = True
4152
else:
4153
if stored_submit_branch is None or remember:
4154
branch.set_submit_branch(submit_branch)
4155
if submit_branch is None:
4156
submit_branch = branch.get_parent()
4157
remembered_submit_branch = True
4158
if submit_branch is None:
4159
raise errors.BzrCommandError('No submit branch known or'
4160
' specified')
4161
if remembered_submit_branch:
4162
note('Using saved location: %s', submit_branch)
4163
4164
if mail_to is None:
4165
submit_config = Branch.open(submit_branch).get_config()
4166
mail_to = submit_config.get_user_option("child_submit_to")
4167
4168
stored_public_branch = branch.get_public_branch()
4169
if public_branch is None:
4170
public_branch = stored_public_branch
4171
elif stored_public_branch is None or remember:
4172
branch.set_public_branch(public_branch)
4173
if no_bundle and public_branch is None:
4174
raise errors.BzrCommandError('No public branch specified or'
4175
' known')
4176
base_revision_id = None
4177
revision_id = None
4178
if revision is not None:
4179
if len(revision) > 2:
4180
raise errors.BzrCommandError('bzr send takes '
4181
'at most two one revision identifiers')
4182
revision_id = revision[-1].as_revision_id(branch)
4183
if len(revision) == 2:
4184
base_revision_id = revision[0].as_revision_id(branch)
4185
if revision_id is None:
4186
revision_id = branch.last_revision()
4187
if revision_id == NULL_REVISION:
4188
raise errors.BzrCommandError('No revisions to submit.')
4189
if format == '4':
4190
directive = merge_directive.MergeDirective2.from_objects(
4191
branch.repository, revision_id, time.time(),
4192
osutils.local_time_offset(), submit_branch,
4193
public_branch=public_branch, include_patch=not no_patch,
4194
include_bundle=not no_bundle, message=message,
4195
base_revision_id=base_revision_id)
4196
elif format == '0.9':
4197
if not no_bundle:
4198
if not no_patch:
4199
patch_type = 'bundle'
4200
else:
4201
raise errors.BzrCommandError('Format 0.9 does not'
4202
' permit bundle with no patch')
4203
else:
4204
if not no_patch:
4205
patch_type = 'diff'
4206
else:
4207
patch_type = None
4208
directive = merge_directive.MergeDirective.from_objects(
4209
branch.repository, revision_id, time.time(),
4210
osutils.local_time_offset(), submit_branch,
4211
public_branch=public_branch, patch_type=patch_type,
4212
message=message)
4213
4214
outfile.writelines(directive.to_lines())
4215
if output is None:
4216
subject = '[MERGE] '
4217
if message is not None:
4218
subject += message
4219
else:
4220
revision = branch.repository.get_revision(revision_id)
4221
subject += revision.get_summary()
4222
basename = directive.get_disk_name(branch)
4223
mail_client.compose_merge_request(mail_to, subject,
4224
outfile.getvalue(), basename)
4225
finally:
4226
if output != '-':
4227
outfile.close()
4228
branch.unlock()
5239
4229
5240
4230
5241
4231
class cmd_bundle_revisions(cmd_send):
5242
__doc__ = """Create a merge-directive for submitting changes.
4232
4233
"""Create a merge-directive for submiting changes.
5243
4234
5244
4235
A merge directive provides many things needed for requesting merges:
5245
4236
5285
4276
type=unicode),
5286
4277
Option('output', short_name='o', help='Write directive to this file.',
5287
4278
type=unicode),
5288
Option('strict',
5289
help='Refuse to bundle revisions if there are uncommitted'
5290
' changes in the working tree, --no-strict disables the check.'),
5291
4279
'revision',
5292
RegistryOption('format',
5293
help='Use the specified output format.',
5294
lazy_registry=('bzrlib.send', 'format_registry')),
4280
RegistryOption.from_kwargs('format',
4281
'Use the specified output format.',
4282
**{'4': 'Bundle format 4, Merge Directive 2 (default)',
4283
'0.9': 'Bundle format 0.9, Merge Directive 1',})
5295
4284
]
5296
4285
aliases = ['bundle']
5297
4286
5301
4290
5302
4291
def run(self, submit_branch=None, public_branch=None, no_bundle=False,
5303
4292
no_patch=False, revision=None, remember=False, output=None,
5304
format=None, strict=None, **kwargs):
4293
format='4', **kwargs):
5305
4294
if output is None:
5306
4295
output = '-'
5307
from bzrlib.send import send
5308
return send(submit_branch, revision, public_branch, remember,
4296
return self._run(submit_branch, revision, public_branch, remember,
5309
4297
format, no_bundle, no_patch, output,
5310
kwargs.get('from', '.'), None, None, None,
5311
self.outf, strict=strict)
4298
kwargs.get('from', '.'), None, None)
5312
4299
5313
4300
5314
4301
class cmd_tag(Command):
5315
__doc__ = """Create, remove or modify a tag naming a revision.
5316
4302
"""Create, remove or modify a tag naming a revision.
4303
5317
4304
Tags give human-meaningful names to revisions. Commands that take a -r
5318
4305
(--revision) option can be given -rtag:X, where X is any previously
5319
4306
created tag.
5321
4308
Tags are stored in the branch. Tags are copied from one branch to another
5322
4309
along when you branch, push, pull or merge.
5323
4310
5324
It is an error to give a tag name that already exists unless you pass
4311
It is an error to give a tag name that already exists unless you pass
5325
4312
--force, in which case the tag is moved to point to the new revision.
5326
5327
To rename a tag (change the name but keep it on the same revsion), run ``bzr
5328
tag new-name -r tag:old-name`` and then ``bzr tag --delete oldname``.
5329
5330
If no tag name is specified it will be determined through the
5331
'automatic_tag_name' hook. This can e.g. be used to automatically tag
5332
upstream releases by reading configure.ac. See ``bzr help hooks`` for
5333
details.
5334
4313
"""
5335
4314
5336
4315
_see_also = ['commit', 'tags']
5337
takes_args = ['tag_name?']
4316
takes_args = ['tag_name']
5338
4317
takes_options = [
5339
4318
Option('delete',
5340
4319
help='Delete this tag rather than placing it.',
5350
4329
'revision',
5351
4330
]
5352
4331
5353
def run(self, tag_name=None,
4332
def run(self, tag_name,
5354
4333
delete=None,
5355
4334
directory='.',
5356
4335
force=None,
5358
4337
):
5359
4338
branch, relpath = Branch.open_containing(directory)
5360
4339
branch.lock_write()
5361
self.add_cleanup(branch.unlock)
5362
if delete:
5363
if tag_name is None:
5364
raise errors.BzrCommandError("No tag specified to delete.")
5365
branch.tags.delete_tag(tag_name)
5366
self.outf.write('Deleted tag %s.\n' % tag_name)
5367
else:
5368
if revision:
5369
if len(revision) != 1:
5370
raise errors.BzrCommandError(
5371
"Tags can only be placed on a single revision, "
5372
"not on a range")
5373
revision_id = revision[0].as_revision_id(branch)
4340
try:
4341
if delete:
4342
branch.tags.delete_tag(tag_name)
4343
self.outf.write('Deleted tag %s.\n' % tag_name)
5374
4344
else:
5375
revision_id = branch.last_revision()
5376
if tag_name is None:
5377
tag_name = branch.automatic_tag_name(revision_id)
5378
if tag_name is None:
5379
raise errors.BzrCommandError(
5380
"Please specify a tag name.")
5381
if (not force) and branch.tags.has_tag(tag_name):
5382
raise errors.TagAlreadyExists(tag_name)
5383
branch.tags.set_tag(tag_name, revision_id)
5384
self.outf.write('Created tag %s.\n' % tag_name)
4345
if revision:
4346
if len(revision) != 1:
4347
raise errors.BzrCommandError(
4348
"Tags can only be placed on a single revision, "
4349
"not on a range")
4350
revision_id = revision[0].as_revision_id(branch)
4351
else:
4352
revision_id = branch.last_revision()
4353
if (not force) and branch.tags.has_tag(tag_name):
4354
raise errors.TagAlreadyExists(tag_name)
4355
branch.tags.set_tag(tag_name, revision_id)
4356
self.outf.write('Created tag %s.\n' % tag_name)
4357
finally:
4358
branch.unlock()
5385
4359
5386
4360
5387
4361
class cmd_tags(Command):
5388
__doc__ = """List tags.
4362
"""List tags.
5389
4363
5390
4364
This command shows a table of tag names and the revisions they reference.
5391
4365
"""
5403
4377
time='Sort tags chronologically.',
5404
4378
),
5405
4379
'show-ids',
5406
'revision',
5407
4380
]
5408
4381
5409
4382
@display_command
5411
4384
directory='.',
5412
4385
sort='alpha',
5413
4386
show_ids=False,
5414
revision=None,
5415
4387
):
5416
4388
branch, relpath = Branch.open_containing(directory)
5417
5418
4389
tags = branch.tags.get_tag_dict().items()
5419
if not tags:
5420
return
5421
5422
branch.lock_read()
5423
self.add_cleanup(branch.unlock)
5424
if revision:
5425
graph = branch.repository.get_graph()
5426
rev1, rev2 = _get_revision_range(revision, branch, self.name())
5427
revid1, revid2 = rev1.rev_id, rev2.rev_id
5428
# only show revisions between revid1 and revid2 (inclusive)
5429
tags = [(tag, revid) for tag, revid in tags if
5430
graph.is_between(revid, revid1, revid2)]
5431
4390
if sort == 'alpha':
5432
4391
tags.sort()
5433
4392
elif sort == 'time':
5443
4402
tags.sort(key=lambda x: timestamps[x[1]])
5444
4403
if not show_ids:
5445
4404
# [ (tag, revid), ... ] -> [ (tag, dotted_revno), ... ]
5446
for index, (tag, revid) in enumerate(tags):
5447
try:
5448
revno = branch.revision_id_to_dotted_revno(revid)
5449
if isinstance(revno, tuple):
5450
revno = '.'.join(map(str, revno))
5451
except errors.NoSuchRevision:
5452
# Bad tag data/merges can lead to tagged revisions
5453
# which are not in this branch. Fail gracefully ...
5454
revno = '?'
5455
tags[index] = (tag, revno)
5456
self.cleanup_now()
4405
revno_map = branch.get_revision_id_to_revno_map()
4406
tags = [ (tag, '.'.join(map(str, revno_map.get(revid, ('?',)))))
4407
for tag, revid in tags ]
5457
4408
for tag, revspec in tags:
5458
4409
self.outf.write('%-20s %s\n' % (tag, revspec))
5459
4410
5460
4411
5461
4412
class cmd_reconfigure(Command):
5462
__doc__ = """Reconfigure the type of a bzr directory.
4413
"""Reconfigure the type of a bzr directory.
5463
4414
5464
4415
A target configuration must be specified.
5465
4416
5472
4423
If none of these is available, --bind-to must be specified.
5473
4424
"""
5474
4425
5475
_see_also = ['branches', 'checkouts', 'standalone-trees', 'working-trees']
5476
4426
takes_args = ['location?']
5477
takes_options = [
5478
RegistryOption.from_kwargs(
5479
'target_type',
5480
title='Target type',
5481
help='The type to reconfigure the directory to.',
5482
value_switches=True, enum_switch=False,
5483
branch='Reconfigure to be an unbound branch with no working tree.',
5484
tree='Reconfigure to be an unbound branch with a working tree.',
5485
checkout='Reconfigure to be a bound branch with a working tree.',
5486
lightweight_checkout='Reconfigure to be a lightweight'
5487
' checkout (with no local history).',
5488
standalone='Reconfigure to be a standalone branch '
5489
'(i.e. stop using shared repository).',
5490
use_shared='Reconfigure to use a shared repository.',
5491
with_trees='Reconfigure repository to create '
5492
'working trees on branches by default.',
5493
with_no_trees='Reconfigure repository to not create '
5494
'working trees on branches by default.'
5495
),
5496
Option('bind-to', help='Branch to bind checkout to.', type=str),
5497
Option('force',
5498
help='Perform reconfiguration even if local changes'
5499
' will be lost.'),
5500
Option('stacked-on',
5501
help='Reconfigure a branch to be stacked on another branch.',
5502
type=unicode,
5503
),
5504
Option('unstacked',
5505
help='Reconfigure a branch to be unstacked. This '
5506
'may require copying substantial data into it.',
5507
),
5508
]
4427
takes_options = [RegistryOption.from_kwargs('target_type',
4428
title='Target type',
4429
help='The type to reconfigure the directory to.',
4430
value_switches=True, enum_switch=False,
4431
branch='Reconfigure to a branch.',
4432
tree='Reconfigure to a tree.',
4433
checkout='Reconfigure to a checkout.',
4434
lightweight_checkout='Reconfigure to a lightweight'
4435
' checkout.',
4436
standalone='Reconfigure to be standalone.',
4437
use_shared='Reconfigure to use a shared repository.'),
4438
Option('bind-to', help='Branch to bind checkout to.',
4439
type=str),
4440
Option('force',
4441
help='Perform reconfiguration even if local changes'
4442
' will be lost.')
4443
]
5509
4444
5510
def run(self, location=None, target_type=None, bind_to=None, force=False,
5511
stacked_on=None,
5512
unstacked=None):
4445
def run(self, location=None, target_type=None, bind_to=None, force=False):
5513
4446
directory = bzrdir.BzrDir.open(location)
5514
if stacked_on and unstacked:
5515
raise BzrCommandError("Can't use both --stacked-on and --unstacked")
5516
elif stacked_on is not None:
5517
reconfigure.ReconfigureStackedOn().apply(directory, stacked_on)
5518
elif unstacked:
5519
reconfigure.ReconfigureUnstacked().apply(directory)
5520
# At the moment you can use --stacked-on and a different
5521
# reconfiguration shape at the same time; there seems no good reason
5522
# to ban it.
5523
4447
if target_type is None:
5524
if stacked_on or unstacked:
5525
return
5526
else:
5527
raise errors.BzrCommandError('No target configuration '
5528
'specified')
4448
raise errors.BzrCommandError('No target configuration specified')
5529
4449
elif target_type == 'branch':
5530
4450
reconfiguration = reconfigure.Reconfigure.to_branch(directory)
5531
4451
elif target_type == 'tree':
5532
4452
reconfiguration = reconfigure.Reconfigure.to_tree(directory)
5533
4453
elif target_type == 'checkout':
5534
reconfiguration = reconfigure.Reconfigure.to_checkout(
5535
directory, bind_to)
4454
reconfiguration = reconfigure.Reconfigure.to_checkout(directory,
4455
bind_to)
5536
4456
elif target_type == 'lightweight-checkout':
5537
4457
reconfiguration = reconfigure.Reconfigure.to_lightweight_checkout(
5538
4458
directory, bind_to)
5540
4460
reconfiguration = reconfigure.Reconfigure.to_use_shared(directory)
5541
4461
elif target_type == 'standalone':
5542
4462
reconfiguration = reconfigure.Reconfigure.to_standalone(directory)
5543
elif target_type == 'with-trees':
5544
reconfiguration = reconfigure.Reconfigure.set_repository_trees(
5545
directory, True)
5546
elif target_type == 'with-no-trees':
5547
reconfiguration = reconfigure.Reconfigure.set_repository_trees(
5548
directory, False)
5549
4463
reconfiguration.apply(force)
5550
4464
5551
4465
5552
4466
class cmd_switch(Command):
5553
__doc__ = """Set the branch of a checkout and update.
5554
4467
"""Set the branch of a checkout and update.
4468
5555
4469
For lightweight checkouts, this changes the branch being referenced.
5556
4470
For heavyweight checkouts, this checks that there are no local commits
5557
4471
versus the current bound branch, then it makes the local branch a mirror
5558
4472
of the new location and binds to it.
5559
4473
5560
4474
In both cases, the working tree is updated and uncommitted changes
5561
4475
are merged. The user can commit or revert these as they desire.
5562
4476
5566
4480
directory of the current branch. For example, if you are currently in a
5567
4481
checkout of /path/to/branch, specifying 'newbranch' will find a branch at
5568
4482
/path/to/newbranch.
5569
5570
Bound branches use the nickname of its master branch unless it is set
5571
locally, in which case switching will update the local nickname to be
5572
that of the master.
5573
4483
"""
5574
4484
5575
takes_args = ['to_location?']
4485
takes_args = ['to_location']
5576
4486
takes_options = [Option('force',
5577
help='Switch even if local commits will be lost.'),
5578
'revision',
5579
Option('create-branch', short_name='b',
5580
help='Create the target branch from this one before'
5581
' switching to it.'),
5582
]
4487
help='Switch even if local commits will be lost.')
4488
]
5583
4489
5584
def run(self, to_location=None, force=False, create_branch=False,
5585
revision=None):
4490
def run(self, to_location, force=False):
5586
4491
from bzrlib import switch
5587
4492
tree_location = '.'
5588
revision = _get_one_revision('switch', revision)
5589
4493
control_dir = bzrdir.BzrDir.open_containing(tree_location)[0]
5590
if to_location is None:
5591
if revision is None:
5592
raise errors.BzrCommandError('You must supply either a'
5593
' revision or a location')
5594
to_location = '.'
5595
4494
try:
5596
branch = control_dir.open_branch()
5597
had_explicit_nick = branch.get_config().has_explicit_nickname()
4495
to_branch = Branch.open(to_location)
5598
4496
except errors.NotBranchError:
5599
branch = None
5600
had_explicit_nick = False
5601
if create_branch:
5602
if branch is None:
5603
raise errors.BzrCommandError('cannot create branch without'
5604
' source branch')
5605
to_location = directory_service.directories.dereference(
5606
to_location)
5607
if '/' not in to_location and '\\' not in to_location:
5608
# This path is meant to be relative to the existing branch
5609
this_url = self._get_branch_location(control_dir)
5610
to_location = urlutils.join(this_url, '..', to_location)
5611
to_branch = branch.bzrdir.sprout(to_location,
5612
possible_transports=[branch.bzrdir.root_transport],
5613
source_branch=branch).open_branch()
5614
else:
5615
try:
5616
to_branch = Branch.open(to_location)
5617
except errors.NotBranchError:
5618
this_url = self._get_branch_location(control_dir)
5619
to_branch = Branch.open(
5620
urlutils.join(this_url, '..', to_location))
5621
if revision is not None:
5622
revision = revision.as_revision_id(to_branch)
5623
switch.switch(control_dir, to_branch, force, revision_id=revision)
5624
if had_explicit_nick:
5625
branch = control_dir.open_branch() #get the new branch!
5626
branch.nick = to_branch.nick
4497
to_branch = Branch.open(
4498
control_dir.open_branch().base + '../' + to_location)
4499
switch.switch(control_dir, to_branch, force)
5627
4500
note('Switched to branch: %s',
5628
4501
urlutils.unescape_for_display(to_branch.base, 'utf-8'))
5629
4502
5630
def _get_branch_location(self, control_dir):
5631
"""Return location of branch for this control dir."""
5632
try:
5633
this_branch = control_dir.open_branch()
5634
# This may be a heavy checkout, where we want the master branch
5635
master_location = this_branch.get_bound_location()
5636
if master_location is not None:
5637
return master_location
5638
# If not, use a local sibling
5639
return this_branch.base
5640
except errors.NotBranchError:
5641
format = control_dir.find_branch_format()
5642
if getattr(format, 'get_reference', None) is not None:
5643
return format.get_reference(control_dir)
5644
else:
5645
return control_dir.root_transport.base
5646
5647
5648
class cmd_view(Command):
5649
__doc__ = """Manage filtered views.
5650
5651
Views provide a mask over the tree so that users can focus on
5652
a subset of a tree when doing their work. After creating a view,
5653
commands that support a list of files - status, diff, commit, etc -
5654
effectively have that list of files implicitly given each time.
5655
An explicit list of files can still be given but those files
5656
must be within the current view.
5657
5658
In most cases, a view has a short life-span: it is created to make
5659
a selected change and is deleted once that change is committed.
5660
At other times, you may wish to create one or more named views
5661
and switch between them.
5662
5663
To disable the current view without deleting it, you can switch to
5664
the pseudo view called ``off``. This can be useful when you need
5665
to see the whole tree for an operation or two (e.g. merge) but
5666
want to switch back to your view after that.
5667
5668
:Examples:
5669
To define the current view::
5670
5671
bzr view file1 dir1 ...
5672
5673
To list the current view::
5674
5675
bzr view
5676
5677
To delete the current view::
5678
5679
bzr view --delete
5680
5681
To disable the current view without deleting it::
5682
5683
bzr view --switch off
5684
5685
To define a named view and switch to it::
5686
5687
bzr view --name view-name file1 dir1 ...
5688
5689
To list a named view::
5690
5691
bzr view --name view-name
5692
5693
To delete a named view::
5694
5695
bzr view --name view-name --delete
5696
5697
To switch to a named view::
5698
5699
bzr view --switch view-name
5700
5701
To list all views defined::
5702
5703
bzr view --all
5704
5705
To delete all views::
5706
5707
bzr view --delete --all
5708
"""
5709
5710
_see_also = []
5711
takes_args = ['file*']
5712
takes_options = [
5713
Option('all',
5714
help='Apply list or delete action to all views.',
5715
),
5716
Option('delete',
5717
help='Delete the view.',
5718
),
5719
Option('name',
5720
help='Name of the view to define, list or delete.',
5721
type=unicode,
5722
),
5723
Option('switch',
5724
help='Name of the view to switch to.',
5725
type=unicode,
5726
),
5727
]
5728
5729
def run(self, file_list,
5730
all=False,
5731
delete=False,
5732
name=None,
5733
switch=None,
5734
):
5735
tree, file_list = tree_files(file_list, apply_view=False)
5736
current_view, view_dict = tree.views.get_view_info()
5737
if name is None:
5738
name = current_view
5739
if delete:
5740
if file_list:
5741
raise errors.BzrCommandError(
5742
"Both --delete and a file list specified")
5743
elif switch:
5744
raise errors.BzrCommandError(
5745
"Both --delete and --switch specified")
5746
elif all:
5747
tree.views.set_view_info(None, {})
5748
self.outf.write("Deleted all views.\n")
5749
elif name is None:
5750
raise errors.BzrCommandError("No current view to delete")
5751
else:
5752
tree.views.delete_view(name)
5753
self.outf.write("Deleted '%s' view.\n" % name)
5754
elif switch:
5755
if file_list:
5756
raise errors.BzrCommandError(
5757
"Both --switch and a file list specified")
5758
elif all:
5759
raise errors.BzrCommandError(
5760
"Both --switch and --all specified")
5761
elif switch == 'off':
5762
if current_view is None:
5763
raise errors.BzrCommandError("No current view to disable")
5764
tree.views.set_view_info(None, view_dict)
5765
self.outf.write("Disabled '%s' view.\n" % (current_view))
5766
else:
5767
tree.views.set_view_info(switch, view_dict)
5768
view_str = views.view_display_str(tree.views.lookup_view())
5769
self.outf.write("Using '%s' view: %s\n" % (switch, view_str))
5770
elif all:
5771
if view_dict:
5772
self.outf.write('Views defined:\n')
5773
for view in sorted(view_dict):
5774
if view == current_view:
5775
active = "=>"
5776
else:
5777
active = " "
5778
view_str = views.view_display_str(view_dict[view])
5779
self.outf.write('%s %-20s %s\n' % (active, view, view_str))
5780
else:
5781
self.outf.write('No views defined.\n')
5782
elif file_list:
5783
if name is None:
5784
# No name given and no current view set
5785
name = 'my'
5786
elif name == 'off':
5787
raise errors.BzrCommandError(
5788
"Cannot change the 'off' pseudo view")
5789
tree.views.set_view(name, sorted(file_list))
5790
view_str = views.view_display_str(tree.views.lookup_view())
5791
self.outf.write("Using '%s' view: %s\n" % (name, view_str))
5792
else:
5793
# list the files
5794
if name is None:
5795
# No name given and no current view set
5796
self.outf.write('No current view.\n')
5797
else:
5798
view_str = views.view_display_str(tree.views.lookup_view(name))
5799
self.outf.write("'%s' view is: %s\n" % (name, view_str))
5800
5801
4503
5802
4504
class cmd_hooks(Command):
5803
__doc__ = """Show hooks."""
5804
5805
hidden = True
5806
5807
def run(self):
5808
for hook_key in sorted(hooks.known_hooks.keys()):
5809
some_hooks = hooks.known_hooks_key_to_object(hook_key)
5810
self.outf.write("%s:\n" % type(some_hooks).__name__)
5811
for hook_name, hook_point in sorted(some_hooks.items()):
5812
self.outf.write(" %s:\n" % (hook_name,))
5813
found_hooks = list(hook_point)
5814
if found_hooks:
5815
for hook in found_hooks:
5816
self.outf.write(" %s\n" %
5817
(some_hooks.get_hook_name(hook),))
5818
else:
5819
self.outf.write(" <no hooks installed>\n")
5820
5821
5822
class cmd_remove_branch(Command):
5823
__doc__ = """Remove a branch.
5824
5825
This will remove the branch from the specified location but
5826
will keep any working tree or repository in place.
5827
5828
:Examples:
5829
5830
Remove the branch at repo/trunk::
5831
5832
bzr remove-branch repo/trunk
5833
5834
"""
5835
5836
takes_args = ["location?"]
5837
5838
aliases = ["rmbranch"]
5839
5840
def run(self, location=None):
5841
if location is None:
5842
location = "."
5843
branch = Branch.open_containing(location)[0]
5844
branch.bzrdir.destroy_branch()
5845
5846
5847
class cmd_shelve(Command):
5848
__doc__ = """Temporarily set aside some changes from the current tree.
5849
5850
Shelve allows you to temporarily put changes you've made "on the shelf",
5851
ie. out of the way, until a later time when you can bring them back from
5852
the shelf with the 'unshelve' command. The changes are stored alongside
5853
your working tree, and so they aren't propagated along with your branch nor
5854
will they survive its deletion.
5855
5856
If shelve --list is specified, previously-shelved changes are listed.
5857
5858
Shelve is intended to help separate several sets of changes that have
5859
been inappropriately mingled. If you just want to get rid of all changes
5860
and you don't need to restore them later, use revert. If you want to
5861
shelve all text changes at once, use shelve --all.
5862
5863
If filenames are specified, only the changes to those files will be
5864
shelved. Other files will be left untouched.
5865
5866
If a revision is specified, changes since that revision will be shelved.
5867
5868
You can put multiple items on the shelf, and by default, 'unshelve' will
5869
restore the most recently shelved changes.
5870
"""
5871
5872
takes_args = ['file*']
5873
5874
takes_options = [
5875
'revision',
5876
Option('all', help='Shelve all changes.'),
5877
'message',
5878
RegistryOption('writer', 'Method to use for writing diffs.',
5879
bzrlib.option.diff_writer_registry,
5880
value_switches=True, enum_switch=False),
5881
5882
Option('list', help='List shelved changes.'),
5883
Option('destroy',
5884
help='Destroy removed changes instead of shelving them.'),
5885
]
5886
_see_also = ['unshelve']
5887
5888
def run(self, revision=None, all=False, file_list=None, message=None,
5889
writer=None, list=False, destroy=False):
5890
if list:
5891
return self.run_for_list()
5892
from bzrlib.shelf_ui import Shelver
5893
if writer is None:
5894
writer = bzrlib.option.diff_writer_registry.get()
5895
try:
5896
shelver = Shelver.from_args(writer(sys.stdout), revision, all,
5897
file_list, message, destroy=destroy)
5898
try:
5899
shelver.run()
5900
finally:
5901
shelver.finalize()
5902
except errors.UserAbort:
5903
return 0
5904
5905
def run_for_list(self):
5906
tree = WorkingTree.open_containing('.')[0]
5907
tree.lock_read()
5908
self.add_cleanup(tree.unlock)
5909
manager = tree.get_shelf_manager()
5910
shelves = manager.active_shelves()
5911
if len(shelves) == 0:
5912
note('No shelved changes.')
5913
return 0
5914
for shelf_id in reversed(shelves):
5915
message = manager.get_metadata(shelf_id).get('message')
5916
if message is None:
5917
message = '<no message>'
5918
self.outf.write('%3d: %s\n' % (shelf_id, message))
5919
return 1
5920
5921
5922
class cmd_unshelve(Command):
5923
__doc__ = """Restore shelved changes.
5924
5925
By default, the most recently shelved changes are restored. However if you
5926
specify a shelf by id those changes will be restored instead. This works
5927
best when the changes don't depend on each other.
5928
"""
5929
5930
takes_args = ['shelf_id?']
5931
takes_options = [
5932
RegistryOption.from_kwargs(
5933
'action', help="The action to perform.",
5934
enum_switch=False, value_switches=True,
5935
apply="Apply changes and remove from the shelf.",
5936
dry_run="Show changes, but do not apply or remove them.",
5937
preview="Instead of unshelving the changes, show the diff that "
5938
"would result from unshelving.",
5939
delete_only="Delete changes without applying them.",
5940
keep="Apply changes but don't delete them.",
5941
)
5942
]
5943
_see_also = ['shelve']
5944
5945
def run(self, shelf_id=None, action='apply'):
5946
from bzrlib.shelf_ui import Unshelver
5947
unshelver = Unshelver.from_args(shelf_id, action)
5948
try:
5949
unshelver.run()
5950
finally:
5951
unshelver.tree.unlock()
5952
5953
5954
class cmd_clean_tree(Command):
5955
__doc__ = """Remove unwanted files from working tree.
5956
5957
By default, only unknown files, not ignored files, are deleted. Versioned
5958
files are never deleted.
5959
5960
Another class is 'detritus', which includes files emitted by bzr during
5961
normal operations and selftests. (The value of these files decreases with
5962
time.)
5963
5964
If no options are specified, unknown files are deleted. Otherwise, option
5965
flags are respected, and may be combined.
5966
5967
To check what clean-tree will do, use --dry-run.
5968
"""
5969
takes_options = [Option('ignored', help='Delete all ignored files.'),
5970
Option('detritus', help='Delete conflict files, merge'
5971
' backups, and failed selftest dirs.'),
5972
Option('unknown',
5973
help='Delete files unknown to bzr (default).'),
5974
Option('dry-run', help='Show files to delete instead of'
5975
' deleting them.'),
5976
Option('force', help='Do not prompt before deleting.')]
5977
def run(self, unknown=False, ignored=False, detritus=False, dry_run=False,
5978
force=False):
5979
from bzrlib.clean_tree import clean_tree
5980
if not (unknown or ignored or detritus):
5981
unknown = True
5982
if dry_run:
5983
force = True
5984
clean_tree('.', unknown=unknown, ignored=ignored, detritus=detritus,
5985
dry_run=dry_run, no_prompt=force)
5986
5987
5988
class cmd_reference(Command):
5989
__doc__ = """list, view and set branch locations for nested trees.
5990
5991
If no arguments are provided, lists the branch locations for nested trees.
5992
If one argument is provided, display the branch location for that tree.
5993
If two arguments are provided, set the branch location for that tree.
5994
"""
5995
5996
hidden = True
5997
5998
takes_args = ['path?', 'location?']
5999
6000
def run(self, path=None, location=None):
6001
branchdir = '.'
6002
if path is not None:
6003
branchdir = path
6004
tree, branch, relpath =(
6005
bzrdir.BzrDir.open_containing_tree_or_branch(branchdir))
6006
if path is not None:
6007
path = relpath
6008
if tree is None:
6009
tree = branch.basis_tree()
4505
"""Show a branch's currently registered hooks.
4506
"""
4507
4508
hidden = True
4509
takes_args = ['path?']
4510
4511
def run(self, path=None):
6010
4512
if path is None:
6011
info = branch._get_all_reference_info().iteritems()
6012
self._display_reference_info(tree, branch, info)
4513
path = '.'
4514
branch_hooks = Branch.open(path).hooks
4515
for hook_type in branch_hooks:
4516
hooks = branch_hooks[hook_type]
4517
self.outf.write("%s:\n" % (hook_type,))
4518
if hooks:
4519
for hook in hooks:
4520
self.outf.write(" %s\n" %
4521
(branch_hooks.get_hook_name(hook),))
4522
else:
4523
self.outf.write(" <no hooks installed>\n")
4524
4525
4526
def _create_prefix(cur_transport):
4527
needed = [cur_transport]
4528
# Recurse upwards until we can create a directory successfully
4529
while True:
4530
new_transport = cur_transport.clone('..')
4531
if new_transport.base == cur_transport.base:
4532
raise errors.BzrCommandError(
4533
"Failed to create path prefix for %s."
4534
% cur_transport.base)
4535
try:
4536
new_transport.mkdir('.')
4537
except errors.NoSuchFile:
4538
needed.append(new_transport)
4539
cur_transport = new_transport
6013
4540
else:
6014
file_id = tree.path2id(path)
6015
if file_id is None:
6016
raise errors.NotVersionedError(path)
6017
if location is None:
6018
info = [(file_id, branch.get_reference_info(file_id))]
6019
self._display_reference_info(tree, branch, info)
6020
else:
6021
branch.set_reference_info(file_id, path, location)
6022
6023
def _display_reference_info(self, tree, branch, info):
6024
ref_list = []
6025
for file_id, (path, location) in info:
6026
try:
6027
path = tree.id2path(file_id)
6028
except errors.NoSuchId:
6029
pass
6030
ref_list.append((path, location))
6031
for path, location in sorted(ref_list):
6032
self.outf.write('%s %s\n' % (path, location))
6033
6034
6035
def _register_lazy_builtins():
6036
# register lazy builtins from other modules; called at startup and should
6037
# be only called once.
6038
for (name, aliases, module_name) in [
6039
('cmd_bundle_info', [], 'bzrlib.bundle.commands'),
6040
('cmd_dpush', [], 'bzrlib.foreign'),
6041
('cmd_version_info', [], 'bzrlib.cmd_version_info'),
6042
('cmd_resolve', ['resolved'], 'bzrlib.conflicts'),
6043
('cmd_conflicts', [], 'bzrlib.conflicts'),
6044
('cmd_sign_my_commits', [], 'bzrlib.sign_my_commits'),
6045
]:
6046
builtin_command_registry.register_lazy(name, aliases, module_name)
4541
break
4542
# Now we only need to create child directories
4543
while needed:
4544
cur_transport = needed.pop()
4545
cur_transport.ensure_base()
4546
4547
4548
# these get imported and then picked up by the scan for cmd_*
4549
# TODO: Some more consistent way to split command definitions across files;
4550
# we do need to load at least some information about them to know of
4551
# aliases. ideally we would avoid loading the implementation until the
4552
# details were needed.
4553
from bzrlib.cmd_version_info import cmd_version_info
4554
from bzrlib.conflicts import cmd_resolve, cmd_conflicts, restore
4555
from bzrlib.bundle.commands import (
4556
cmd_bundle_info,
4557
)
4558
from bzrlib.sign_my_commits import cmd_sign_my_commits
4559
from bzrlib.weave_commands import cmd_versionedfile_list, cmd_weave_join, \
4560
cmd_weave_plan_merge, cmd_weave_merge_text
Loggerhead is a web-based interface for Breezy
Version: 2.0.1