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