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