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