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