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