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