« back to all changes in this revision
Viewing changes to bzrlib/builtins.py
- browse files at revision 3564
- compare with another revision
- download diff
- download tarball
- view history from revision 3564
- Committer: Canonical.com Patch Queue Manager
- Date: 2008-07-18 03:07:07 UTC
- mfrom: (3535.5.1 lean_imports)
- Revision ID: pqm@pqm.ubuntu.com-20080718030707-qimx9fv1d4xhlk1m
(jam) Some small import cleanups, to reduce unused dependencies.
- files added:
- bzrlib/_walkdirs_win32.h
- bzrlib/util/configobj/docs
- doc/en/developer-guide
- doc/es/guia-desarrollador
- doc/es/notas-version
- doc/es/referencia
- files removed:
- .testr.conf
- apport
- bzrlib/filters
- bzrlib/help_topics/es
- bzrlib/plugins/netrc_credential_store
- bzrlib/plugins/netrc_credential_store/tests
- bzrlib/plugins/news_merge
- bzrlib/plugins/news_merge/tests
- bzrlib/tests/ftp_server
- bzrlib/tests/per_bzrdir_colo
- bzrlib/tests/per_foreign_vcs
- bzrlib/tests/per_interbranch
- bzrlib/tests/per_repository_chk
- bzrlib/tests/per_uifactory
- bzrlib/tests/ssl_certs
- bzrlib/transport/ftp
- contrib/debian
- doc/developers/_static
- doc/developers/_templates
- doc/en/_static
- doc/en/_static/en
- doc/en/_templates
- doc/en/upgrade-guide
- doc/en/whats-new
- doc/es/_static
- doc/es/_static/es
- doc/es/_templates
- doc/ja
- doc/ja/_static
- doc/ja/_templates
- doc/ja/mini-tutorial
- doc/ja/tutorials
- doc/ja/upgrade-guide
- doc/ja/user-guide
- doc/ja/user-guide/images
- doc/ja/user-reference
- 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 renamed:
- bzrlib/_dirstate_helpers_pyx.h => bzrlib/_dirstate_helpers_c.h
- bzrlib/_dirstate_helpers_pyx.pyx => bzrlib/_dirstate_helpers_c.pyx
- bzrlib/_knit_load_data_pyx.pyx => bzrlib/_knit_load_data_c.pyx
- bzrlib/help_topics/en/conflict-types.txt => bzrlib/help_topics/en/conflicts.txt
- bzrlib/tests/per_branch/ => bzrlib/tests/branch_implementations/
- bzrlib/tests/per_bzrdir/ => bzrlib/tests/bzrdir_implementations/
- bzrlib/tests/ftp_server/medusa_based.py => bzrlib/tests/ftp_server.py
- bzrlib/tests/per_interrepository/ => bzrlib/tests/interrepository_implementations/
- bzrlib/tests/per_intertree/ => bzrlib/tests/intertree_implementations/
- bzrlib/tests/per_inventory/ => bzrlib/tests/inventory_implementations/
- bzrlib/tests/per_repository/ => bzrlib/tests/repository_implementations/
- bzrlib/tests/per_transport.py => bzrlib/tests/test_transport_implementations.py
- bzrlib/tests/per_versionedfile.py => bzrlib/tests/test_versionedfile.py
- bzrlib/tests/per_tree/ => bzrlib/tests/tree_implementations/
- bzrlib/tests/per_workingtree/ => bzrlib/tests/workingtree_implementations/
- bzrlib/transport/ftp/__init__.py => bzrlib/transport/ftp.py
- bzrlib/util/_bencode_py.py => bzrlib/util/bencode.py
- doc/en/_static/en/Makefile => doc/en/quick-reference/Makefile
- doc/en/_static/en/bzr-en-quick-reference.pdf => doc/en/quick-reference/quick-start-summary.pdf
- doc/en/_static/en/bzr-en-quick-reference.png => doc/en/quick-reference/quick-start-summary.png
- doc/en/_static/en/bzr-en-quick-reference.svg => doc/en/quick-reference/quick-start-summary.svg
- doc/es/user-guide/ => doc/es/guia-usuario/
- bzrlib/help_topics/es/conflict-types.txt => doc/es/guia-usuario/resolving_conflicts.txt
- doc/es/quick-reference/ => doc/es/referencia-rapida/
- doc/es/_static/es/Makefile => doc/es/referencia-rapida/Makefile
- doc/es/_static/es/bzr-es-quick-reference.svg => doc/es/referencia-rapida/referencia-rapida.svg
- doc/es/index.txt => doc/index.es.txt
- tools/generate_docs.py => generate_docs.py
- bzrlib/doc_generate/ => tools/doc_generate/
- files modified:
- .bzrignore
added
removed
bzrlib/builtins.py
1
# Copyright (C) 2005-2010 Canonical Ltd
1
# Copyright (C) 2004, 2005, 2006, 2007, 2008 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
12
12
#
13
13
# You should have received a copy of the GNU General Public License
14
14
# along with this program; if not, write to the Free Software
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
16
16
17
17
"""builtin bzr commands"""
18
18
19
19
import os
20
from StringIO import StringIO
20
21
21
22
from bzrlib.lazy_import import lazy_import
22
23
lazy_import(globals(), """
23
24
import codecs
24
import cStringIO
25
25
import sys
26
26
import time
27
27
29
29
from bzrlib import (
30
30
bugtracker,
31
31
bundle,
32
btree_index,
33
32
bzrdir,
34
directory_service,
35
33
delta,
36
34
config,
37
35
errors,
38
36
globbing,
39
hooks,
37
ignores,
40
38
log,
41
39
merge as _mod_merge,
42
40
merge_directive,
43
41
osutils,
44
42
reconfigure,
45
rename_map,
46
43
revision as _mod_revision,
47
static_tuple,
48
44
symbol_versioning,
49
timestamp,
50
45
transport,
46
tree as _mod_tree,
51
47
ui,
52
48
urlutils,
53
views,
54
49
)
55
50
from bzrlib.branch import Branch
56
51
from bzrlib.conflicts import ConflictList
57
from bzrlib.transport import memory
58
from bzrlib.revisionspec import RevisionSpec, RevisionInfo
52
from bzrlib.revisionspec import RevisionSpec
59
53
from bzrlib.smtp_connection import SMTPConnection
60
54
from bzrlib.workingtree import WorkingTree
61
55
""")
62
56
63
from bzrlib.commands import (
64
Command,
65
builtin_command_registry,
66
display_command,
67
)
68
from bzrlib.option import (
69
ListOption,
70
Option,
71
RegistryOption,
72
custom_help,
73
_parse_revision_str,
74
)
75
from bzrlib.trace import mutter, note, warning, is_quiet, get_verbosity_level
76
77
78
def tree_files(file_list, default_branch=u'.', canonicalize=True,
79
apply_view=True):
57
from bzrlib.commands import Command, display_command
58
from bzrlib.option import ListOption, Option, RegistryOption, custom_help
59
from bzrlib.trace import mutter, note, warning, is_quiet, info
60
61
62
def tree_files(file_list, default_branch=u'.'):
80
63
try:
81
return internal_tree_files(file_list, default_branch, canonicalize,
82
apply_view)
64
return internal_tree_files(file_list, default_branch)
83
65
except errors.FileInWrongBranch, e:
84
66
raise errors.BzrCommandError("%s is not in the same branch as %s" %
85
67
(e.path, file_list[0]))
86
68
87
69
88
def tree_files_for_add(file_list):
89
"""
90
Return a tree and list of absolute paths from a file list.
91
92
Similar to tree_files, but add handles files a bit differently, so it a
93
custom implementation. In particular, MutableTreeTree.smart_add expects
94
absolute paths, which it immediately converts to relative paths.
95
"""
96
# FIXME Would be nice to just return the relative paths like
97
# internal_tree_files does, but there are a large number of unit tests
98
# that assume the current interface to mutabletree.smart_add
99
if file_list:
100
tree, relpath = WorkingTree.open_containing(file_list[0])
101
if tree.supports_views():
102
view_files = tree.views.lookup_view()
103
if view_files:
104
for filename in file_list:
105
if not osutils.is_inside_any(view_files, filename):
106
raise errors.FileOutsideView(filename, view_files)
107
file_list = file_list[:]
108
file_list[0] = tree.abspath(relpath)
109
else:
110
tree = WorkingTree.open_containing(u'.')[0]
111
if tree.supports_views():
112
view_files = tree.views.lookup_view()
113
if view_files:
114
file_list = view_files
115
view_str = views.view_display_str(view_files)
116
note("Ignoring files outside view. View is %s" % view_str)
117
return tree, file_list
118
119
120
def _get_one_revision(command_name, revisions):
121
if revisions is None:
122
return None
123
if len(revisions) != 1:
124
raise errors.BzrCommandError(
125
'bzr %s --revision takes exactly one revision identifier' % (
126
command_name,))
127
return revisions[0]
128
129
130
def _get_one_revision_tree(command_name, revisions, branch=None, tree=None):
131
"""Get a revision tree. Not suitable for commands that change the tree.
132
133
Specifically, the basis tree in dirstate trees is coupled to the dirstate
134
and doing a commit/uncommit/pull will at best fail due to changing the
135
basis revision data.
136
137
If tree is passed in, it should be already locked, for lifetime management
138
of the trees internal cached state.
139
"""
140
if branch is None:
141
branch = tree.branch
142
if revisions is None:
143
if tree is not None:
144
rev_tree = tree.basis_tree()
145
else:
146
rev_tree = branch.basis_tree()
147
else:
148
revision = _get_one_revision(command_name, revisions)
149
rev_tree = revision.as_tree(branch)
150
return rev_tree
151
152
153
70
# XXX: Bad function name; should possibly also be a class method of
154
71
# WorkingTree rather than a function.
155
def internal_tree_files(file_list, default_branch=u'.', canonicalize=True,
156
apply_view=True):
72
def internal_tree_files(file_list, default_branch=u'.'):
157
73
"""Convert command-line paths to a WorkingTree and relative paths.
158
74
159
75
This is typically used for command-line processors that take one or
161
77
162
78
The filenames given are not required to exist.
163
79
164
:param file_list: Filenames to convert.
80
:param file_list: Filenames to convert.
165
81
166
82
:param default_branch: Fallback tree path to use if file_list is empty or
167
83
None.
168
84
169
:param apply_view: if True and a view is set, apply it or check that
170
specified files are within it
171
172
85
:return: workingtree, [relative_paths]
173
86
"""
174
87
if file_list is None or len(file_list) == 0:
175
tree = WorkingTree.open_containing(default_branch)[0]
176
if tree.supports_views() and apply_view:
177
view_files = tree.views.lookup_view()
178
if view_files:
179
file_list = view_files
180
view_str = views.view_display_str(view_files)
181
note("Ignoring files outside view. View is %s" % view_str)
182
return tree, file_list
88
return WorkingTree.open_containing(default_branch)[0], file_list
183
89
tree = WorkingTree.open_containing(osutils.realpath(file_list[0]))[0]
184
return tree, safe_relpath_files(tree, file_list, canonicalize,
185
apply_view=apply_view)
186
187
188
def safe_relpath_files(tree, file_list, canonicalize=True, apply_view=True):
189
"""Convert file_list into a list of relpaths in tree.
190
191
:param tree: A tree to operate on.
192
:param file_list: A list of user provided paths or None.
193
:param apply_view: if True and a view is set, apply it or check that
194
specified files are within it
195
:return: A list of relative paths.
196
:raises errors.PathNotChild: When a provided path is in a different tree
197
than tree.
198
"""
199
if file_list is None:
200
return None
201
if tree.supports_views() and apply_view:
202
view_files = tree.views.lookup_view()
203
else:
204
view_files = []
205
90
new_list = []
206
# tree.relpath exists as a "thunk" to osutils, but canonical_relpath
207
# doesn't - fix that up here before we enter the loop.
208
if canonicalize:
209
fixer = lambda p: osutils.canonical_relpath(tree.basedir, p)
210
else:
211
fixer = tree.relpath
212
91
for filename in file_list:
213
92
try:
214
relpath = fixer(osutils.dereference_path(filename))
215
if view_files and not osutils.is_inside_any(view_files, relpath):
216
raise errors.FileOutsideView(filename, view_files)
217
new_list.append(relpath)
93
new_list.append(tree.relpath(osutils.dereference_path(filename)))
218
94
except errors.PathNotChild:
219
95
raise errors.FileInWrongBranch(tree.branch, filename)
220
return new_list
221
222
223
def _get_view_info_for_change_reporter(tree):
224
"""Get the view information from a tree for change reporting."""
225
view_info = None
226
try:
227
current_view = tree.views.get_view_info()[0]
228
if current_view is not None:
229
view_info = (current_view, tree.views.lookup_view())
230
except errors.ViewsNotSupported:
231
pass
232
return view_info
96
return tree, new_list
233
97
234
98
235
99
# TODO: Make sure no commands unconditionally use the working directory as a
239
103
# opens the branch?)
240
104
241
105
class cmd_status(Command):
242
__doc__ = """Display status summary.
106
"""Display status summary.
243
107
244
108
This reports on versioned and unknown files, reporting them
245
109
grouped by state. Possible states are:
265
129
unknown
266
130
Not versioned and not matching an ignore pattern.
267
131
268
Additionally for directories, symlinks and files with an executable
269
bit, Bazaar indicates their type using a trailing character: '/', '@'
270
or '*' respectively.
271
272
132
To see ignored files use 'bzr ignored'. For details on the
273
133
changes to file texts, use 'bzr diff'.
274
134
275
135
Note that --short or -S gives status flags for each item, similar
276
136
to Subversion's status command. To get output similar to svn -q,
277
137
use bzr status -SV.
281
141
files or directories is reported. If a directory is given, status
282
142
is reported for everything inside that directory.
283
143
284
Before merges are committed, the pending merge tip revisions are
285
shown. To see all pending merge revisions, use the -v option.
286
To skip the display of pending merge information altogether, use
287
the no-pending option or specify a file/directory.
288
289
144
If a revision argument is given, the status is calculated against
290
145
that revision, or between two revisions if two are provided.
291
146
"""
292
147
293
148
# TODO: --no-recurse, --recurse options
294
149
295
150
takes_args = ['file*']
296
takes_options = ['show-ids', 'revision', 'change', 'verbose',
151
takes_options = ['show-ids', 'revision', 'change',
297
152
Option('short', help='Use short status indicators.',
298
153
short_name='S'),
299
154
Option('versioned', help='Only show versioned files.',
305
160
306
161
encoding_type = 'replace'
307
162
_see_also = ['diff', 'revert', 'status-flags']
308
163
309
164
@display_command
310
165
def run(self, show_ids=False, file_list=None, revision=None, short=False,
311
versioned=False, no_pending=False, verbose=False):
166
versioned=False, no_pending=False):
312
167
from bzrlib.status import show_tree_status
313
168
314
169
if revision and len(revision) > 2:
315
170
raise errors.BzrCommandError('bzr status --revision takes exactly'
316
171
' one or two revision specifiers')
317
172
318
tree, relfile_list = tree_files(file_list)
319
# Avoid asking for specific files when that is not needed.
320
if relfile_list == ['']:
321
relfile_list = None
322
# Don't disable pending merges for full trees other than '.'.
323
if file_list == ['.']:
324
no_pending = True
325
# A specific path within a tree was given.
326
elif relfile_list is not None:
327
no_pending = True
173
tree, file_list = tree_files(file_list)
174
328
175
show_tree_status(tree, show_ids=show_ids,
329
specific_files=relfile_list, revision=revision,
176
specific_files=file_list, revision=revision,
330
177
to_file=self.outf, short=short, versioned=versioned,
331
show_pending=(not no_pending), verbose=verbose)
178
show_pending=not no_pending)
332
179
333
180
334
181
class cmd_cat_revision(Command):
335
__doc__ = """Write out metadata for a revision.
336
182
"""Write out metadata for a revision.
183
337
184
The revision to print can either be specified by a specific
338
185
revision identifier, or you can use --revision.
339
186
"""
343
190
takes_options = ['revision']
344
191
# cat-revision is more for frontends so should be exact
345
192
encoding = 'strict'
346
347
def print_revision(self, revisions, revid):
348
stream = revisions.get_record_stream([(revid,)], 'unordered', True)
349
record = stream.next()
350
if record.storage_kind == 'absent':
351
raise errors.NoSuchRevision(revisions, revid)
352
revtext = record.get_bytes_as('fulltext')
353
self.outf.write(revtext.decode('utf-8'))
354
193
355
194
@display_command
356
195
def run(self, revision_id=None, revision=None):
357
196
if revision_id is not None and revision is not None:
362
201
' --revision or a revision_id')
363
202
b = WorkingTree.open_containing(u'.')[0].branch
364
203
365
revisions = b.repository.revisions
366
if revisions is None:
367
raise errors.BzrCommandError('Repository %r does not support '
368
'access to raw revision texts')
369
370
b.repository.lock_read()
371
try:
372
# TODO: jam 20060112 should cat-revision always output utf-8?
373
if revision_id is not None:
374
revision_id = osutils.safe_revision_id(revision_id, warn=False)
375
try:
376
self.print_revision(revisions, revision_id)
377
except errors.NoSuchRevision:
378
msg = "The repository %s contains no revision %s." % (
379
b.repository.base, revision_id)
380
raise errors.BzrCommandError(msg)
381
elif revision is not None:
382
for rev in revision:
383
if rev is None:
384
raise errors.BzrCommandError(
385
'You cannot specify a NULL revision.')
386
rev_id = rev.as_revision_id(b)
387
self.print_revision(revisions, rev_id)
388
finally:
389
b.repository.unlock()
390
391
392
class cmd_dump_btree(Command):
393
__doc__ = """Dump the contents of a btree index file to stdout.
394
395
PATH is a btree index file, it can be any URL. This includes things like
396
.bzr/repository/pack-names, or .bzr/repository/indices/a34b3a...ca4a4.iix
397
398
By default, the tuples stored in the index file will be displayed. With
399
--raw, we will uncompress the pages, but otherwise display the raw bytes
400
stored in the index.
401
"""
402
403
# TODO: Do we want to dump the internal nodes as well?
404
# TODO: It would be nice to be able to dump the un-parsed information,
405
# rather than only going through iter_all_entries. However, this is
406
# good enough for a start
407
hidden = True
408
encoding_type = 'exact'
409
takes_args = ['path']
410
takes_options = [Option('raw', help='Write the uncompressed bytes out,'
411
' rather than the parsed tuples.'),
412
]
413
414
def run(self, path, raw=False):
415
dirname, basename = osutils.split(path)
416
t = transport.get_transport(dirname)
417
if raw:
418
self._dump_raw_bytes(t, basename)
419
else:
420
self._dump_entries(t, basename)
421
422
def _get_index_and_bytes(self, trans, basename):
423
"""Create a BTreeGraphIndex and raw bytes."""
424
bt = btree_index.BTreeGraphIndex(trans, basename, None)
425
bytes = trans.get_bytes(basename)
426
bt._file = cStringIO.StringIO(bytes)
427
bt._size = len(bytes)
428
return bt, bytes
429
430
def _dump_raw_bytes(self, trans, basename):
431
import zlib
432
433
# We need to parse at least the root node.
434
# This is because the first page of every row starts with an
435
# uncompressed header.
436
bt, bytes = self._get_index_and_bytes(trans, basename)
437
for page_idx, page_start in enumerate(xrange(0, len(bytes),
438
btree_index._PAGE_SIZE)):
439
page_end = min(page_start + btree_index._PAGE_SIZE, len(bytes))
440
page_bytes = bytes[page_start:page_end]
441
if page_idx == 0:
442
self.outf.write('Root node:\n')
443
header_end, data = bt._parse_header_from_bytes(page_bytes)
444
self.outf.write(page_bytes[:header_end])
445
page_bytes = data
446
self.outf.write('\nPage %d\n' % (page_idx,))
447
decomp_bytes = zlib.decompress(page_bytes)
448
self.outf.write(decomp_bytes)
449
self.outf.write('\n')
450
451
def _dump_entries(self, trans, basename):
452
try:
453
st = trans.stat(basename)
454
except errors.TransportNotPossible:
455
# We can't stat, so we'll fake it because we have to do the 'get()'
456
# anyway.
457
bt, _ = self._get_index_and_bytes(trans, basename)
458
else:
459
bt = btree_index.BTreeGraphIndex(trans, basename, st.st_size)
460
for node in bt.iter_all_entries():
461
# Node is made up of:
462
# (index, key, value, [references])
463
try:
464
refs = node[3]
465
except IndexError:
466
refs_as_tuples = None
467
else:
468
refs_as_tuples = static_tuple.as_tuples(refs)
469
as_tuple = (tuple(node[1]), node[2], refs_as_tuples)
470
self.outf.write('%s\n' % (as_tuple,))
471
204
# TODO: jam 20060112 should cat-revision always output utf-8?
205
if revision_id is not None:
206
revision_id = osutils.safe_revision_id(revision_id, warn=False)
207
self.outf.write(b.repository.get_revision_xml(revision_id).decode('utf-8'))
208
elif revision is not None:
209
for rev in revision:
210
if rev is None:
211
raise errors.BzrCommandError('You cannot specify a NULL'
212
' revision.')
213
rev_id = rev.as_revision_id(b)
214
self.outf.write(b.repository.get_revision_xml(rev_id).decode('utf-8'))
215
472
216
473
217
class cmd_remove_tree(Command):
474
__doc__ = """Remove the working tree from a given branch/checkout.
218
"""Remove the working tree from a given branch/checkout.
475
219
476
220
Since a lightweight checkout is little more than a working tree
477
221
this will refuse to run against one.
479
223
To re-create the working tree, use "bzr checkout".
480
224
"""
481
225
_see_also = ['checkout', 'working-trees']
482
takes_args = ['location*']
483
takes_options = [
484
Option('force',
485
help='Remove the working tree even if it has '
486
'uncommitted changes.'),
487
]
488
489
def run(self, location_list, force=False):
490
if not location_list:
491
location_list=['.']
492
493
for location in location_list:
494
d = bzrdir.BzrDir.open(location)
495
496
try:
497
working = d.open_workingtree()
498
except errors.NoWorkingTree:
499
raise errors.BzrCommandError("No working tree to remove")
500
except errors.NotLocalUrl:
501
raise errors.BzrCommandError("You cannot remove the working tree"
502
" of a remote path")
503
if not force:
504
if (working.has_changes()):
505
raise errors.UncommittedChanges(working)
506
507
if working.user_url != working.branch.user_url:
508
raise errors.BzrCommandError("You cannot remove the working tree"
509
" from a lightweight checkout")
510
511
d.destroy_workingtree()
512
226
227
takes_args = ['location?']
228
229
def run(self, location='.'):
230
d = bzrdir.BzrDir.open(location)
231
232
try:
233
working = d.open_workingtree()
234
except errors.NoWorkingTree:
235
raise errors.BzrCommandError("No working tree to remove")
236
except errors.NotLocalUrl:
237
raise errors.BzrCommandError("You cannot remove the working tree of a "
238
"remote path")
239
240
working_path = working.bzrdir.root_transport.base
241
branch_path = working.branch.bzrdir.root_transport.base
242
if working_path != branch_path:
243
raise errors.BzrCommandError("You cannot remove the working tree from "
244
"a lightweight checkout")
245
246
d.destroy_workingtree()
247
513
248
514
249
class cmd_revno(Command):
515
__doc__ = """Show current revision number.
250
"""Show current revision number.
516
251
517
252
This is equal to the number of revisions on this branch.
518
253
"""
519
254
520
255
_see_also = ['info']
521
256
takes_args = ['location?']
522
takes_options = [
523
Option('tree', help='Show revno of working tree'),
524
]
525
257
526
258
@display_command
527
def run(self, tree=False, location=u'.'):
528
if tree:
529
try:
530
wt = WorkingTree.open_containing(location)[0]
531
self.add_cleanup(wt.lock_read().unlock)
532
except (errors.NoWorkingTree, errors.NotLocalUrl):
533
raise errors.NoWorkingTree(location)
534
revid = wt.last_revision()
535
try:
536
revno_t = wt.branch.revision_id_to_dotted_revno(revid)
537
except errors.NoSuchRevision:
538
revno_t = ('???',)
539
revno = ".".join(str(n) for n in revno_t)
540
else:
541
b = Branch.open_containing(location)[0]
542
self.add_cleanup(b.lock_read().unlock)
543
revno = b.revno()
544
self.cleanup_now()
545
self.outf.write(str(revno) + '\n')
259
def run(self, location=u'.'):
260
self.outf.write(str(Branch.open_containing(location)[0].revno()))
261
self.outf.write('\n')
546
262
547
263
548
264
class cmd_revision_info(Command):
549
__doc__ = """Show revision number and revision id for a given revision identifier.
265
"""Show revision number and revision id for a given revision identifier.
550
266
"""
551
267
hidden = True
552
268
takes_args = ['revision_info*']
553
takes_options = [
554
'revision',
555
Option('directory',
556
help='Branch to examine, '
557
'rather than the one containing the working directory.',
558
short_name='d',
559
type=unicode,
560
),
561
Option('tree', help='Show revno of working tree'),
562
]
269
takes_options = ['revision']
563
270
564
271
@display_command
565
def run(self, revision=None, directory=u'.', tree=False,
566
revision_info_list=[]):
272
def run(self, revision=None, revision_info_list=[]):
567
273
568
try:
569
wt = WorkingTree.open_containing(directory)[0]
570
b = wt.branch
571
self.add_cleanup(wt.lock_read().unlock)
572
except (errors.NoWorkingTree, errors.NotLocalUrl):
573
wt = None
574
b = Branch.open_containing(directory)[0]
575
self.add_cleanup(b.lock_read().unlock)
576
revision_ids = []
274
revs = []
577
275
if revision is not None:
578
revision_ids.extend(rev.as_revision_id(b) for rev in revision)
276
revs.extend(revision)
579
277
if revision_info_list is not None:
580
for rev_str in revision_info_list:
581
rev_spec = RevisionSpec.from_string(rev_str)
582
revision_ids.append(rev_spec.as_revision_id(b))
583
# No arguments supplied, default to the last revision
584
if len(revision_ids) == 0:
585
if tree:
586
if wt is None:
587
raise errors.NoWorkingTree(directory)
588
revision_ids.append(wt.last_revision())
589
else:
590
revision_ids.append(b.last_revision())
591
592
revinfos = []
593
maxlen = 0
594
for revision_id in revision_ids:
278
for rev in revision_info_list:
279
revs.append(RevisionSpec.from_string(rev))
280
281
b = Branch.open_containing(u'.')[0]
282
283
if len(revs) == 0:
284
revs.append(RevisionSpec.from_string('-1'))
285
286
for rev in revs:
287
revision_id = rev.as_revision_id(b)
595
288
try:
596
dotted_revno = b.revision_id_to_dotted_revno(revision_id)
597
revno = '.'.join(str(i) for i in dotted_revno)
289
revno = '%4d' % (b.revision_id_to_revno(revision_id))
598
290
except errors.NoSuchRevision:
599
revno = '???'
600
maxlen = max(maxlen, len(revno))
601
revinfos.append([revno, revision_id])
602
603
self.cleanup_now()
604
for ri in revinfos:
605
self.outf.write('%*s %s\n' % (maxlen, ri[0], ri[1]))
606
607
291
dotted_map = b.get_revision_id_to_revno_map()
292
revno = '.'.join(str(i) for i in dotted_map[revision_id])
293
print '%s %s' % (revno, revision_id)
294
295
608
296
class cmd_add(Command):
609
__doc__ = """Add specified files or directories.
297
"""Add specified files or directories.
610
298
611
299
In non-recursive mode, all the named items are added, regardless
612
300
of whether they were previously ignored. A warning is given if
628
316
you should never need to explicitly add a directory, they'll just
629
317
get added when you add a file in the directory.
630
318
631
--dry-run will show which files would be added, but not actually
319
--dry-run will show which files would be added, but not actually
632
320
add them.
633
321
634
322
--file-ids-from will try to use the file ids from the supplied path.
638
326
branches that will be merged later (without showing the two different
639
327
adds as a conflict). It is also useful when merging another project
640
328
into a subdirectory of this one.
641
642
Any files matching patterns in the ignore list will not be added
643
unless they are explicitly mentioned.
644
329
"""
645
330
takes_args = ['file*']
646
331
takes_options = [
654
339
help='Lookup file ids from this tree.'),
655
340
]
656
341
encoding_type = 'replace'
657
_see_also = ['remove', 'ignore']
342
_see_also = ['remove']
658
343
659
344
def run(self, file_list, no_recurse=False, dry_run=False, verbose=False,
660
345
file_ids_from=None):
677
362
should_print=(not is_quiet()))
678
363
679
364
if base_tree:
680
self.add_cleanup(base_tree.lock_read().unlock)
681
tree, file_list = tree_files_for_add(file_list)
682
added, ignored = tree.smart_add(file_list, not
683
no_recurse, action=action, save=not dry_run)
684
self.cleanup_now()
365
base_tree.lock_read()
366
try:
367
file_list = self._maybe_expand_globs(file_list)
368
if file_list:
369
tree = WorkingTree.open_containing(file_list[0])[0]
370
else:
371
tree = WorkingTree.open_containing(u'.')[0]
372
added, ignored = tree.smart_add(file_list, not
373
no_recurse, action=action, save=not dry_run)
374
finally:
375
if base_tree is not None:
376
base_tree.unlock()
685
377
if len(ignored) > 0:
686
378
if verbose:
687
379
for glob in sorted(ignored.keys()):
688
380
for path in ignored[glob]:
689
self.outf.write("ignored %s matching \"%s\"\n"
381
self.outf.write("ignored %s matching \"%s\"\n"
690
382
% (path, glob))
383
else:
384
match_len = 0
385
for glob, paths in ignored.items():
386
match_len += len(paths)
387
self.outf.write("ignored %d file(s).\n" % match_len)
388
self.outf.write("If you wish to add some of these files,"
389
" please add them by name.\n")
691
390
692
391
693
392
class cmd_mkdir(Command):
694
__doc__ = """Create a new versioned directory.
393
"""Create a new versioned directory.
695
394
696
395
This is equivalent to creating the directory and then adding it.
697
396
"""
701
400
702
401
def run(self, dir_list):
703
402
for d in dir_list:
403
os.mkdir(d)
704
404
wt, dd = WorkingTree.open_containing(d)
705
base = os.path.dirname(dd)
706
id = wt.path2id(base)
707
if id != None:
708
os.mkdir(d)
709
wt.add([dd])
710
self.outf.write('added %s\n' % d)
711
else:
712
raise errors.NotVersionedError(path=base)
405
wt.add([dd])
406
self.outf.write('added %s\n' % d)
713
407
714
408
715
409
class cmd_relpath(Command):
716
__doc__ = """Show path of a file relative to root"""
410
"""Show path of a file relative to root"""
717
411
718
412
takes_args = ['filename']
719
413
hidden = True
720
414
721
415
@display_command
722
416
def run(self, filename):
723
417
# TODO: jam 20050106 Can relpath return a munged path if
728
422
729
423
730
424
class cmd_inventory(Command):
731
__doc__ = """Show inventory of the current working copy or a revision.
425
"""Show inventory of the current working copy or a revision.
732
426
733
427
It is possible to limit the output to a particular entry
734
428
type using the --kind option. For example: --kind file.
753
447
if kind and kind not in ['file', 'directory', 'symlink']:
754
448
raise errors.BzrCommandError('invalid kind %r specified' % (kind,))
755
449
756
revision = _get_one_revision('inventory', revision)
757
450
work_tree, file_list = tree_files(file_list)
758
self.add_cleanup(work_tree.lock_read().unlock)
759
if revision is not None:
760
tree = revision.as_tree(work_tree.branch)
761
762
extra_trees = [work_tree]
763
self.add_cleanup(tree.lock_read().unlock)
764
else:
765
tree = work_tree
766
extra_trees = []
767
768
if file_list is not None:
769
file_ids = tree.paths2ids(file_list, trees=extra_trees,
770
require_versioned=True)
771
# find_ids_across_trees may include some paths that don't
772
# exist in 'tree'.
773
entries = sorted((tree.id2path(file_id), tree.inventory[file_id])
774
for file_id in file_ids if file_id in tree)
775
else:
776
entries = tree.inventory.entries()
777
778
self.cleanup_now()
451
work_tree.lock_read()
452
try:
453
if revision is not None:
454
if len(revision) > 1:
455
raise errors.BzrCommandError(
456
'bzr inventory --revision takes exactly one revision'
457
' identifier')
458
revision_id = revision[0].as_revision_id(work_tree.branch)
459
tree = work_tree.branch.repository.revision_tree(revision_id)
460
461
extra_trees = [work_tree]
462
tree.lock_read()
463
else:
464
tree = work_tree
465
extra_trees = []
466
467
if file_list is not None:
468
file_ids = tree.paths2ids(file_list, trees=extra_trees,
469
require_versioned=True)
470
# find_ids_across_trees may include some paths that don't
471
# exist in 'tree'.
472
entries = sorted((tree.id2path(file_id), tree.inventory[file_id])
473
for file_id in file_ids if file_id in tree)
474
else:
475
entries = tree.inventory.entries()
476
finally:
477
tree.unlock()
478
if tree is not work_tree:
479
work_tree.unlock()
480
779
481
for path, entry in entries:
780
482
if kind and kind != entry.kind:
781
483
continue
787
489
788
490
789
491
class cmd_mv(Command):
790
__doc__ = """Move or rename a file.
492
"""Move or rename a file.
791
493
792
494
:Usage:
793
495
bzr mv OLDNAME NEWNAME
810
512
takes_args = ['names*']
811
513
takes_options = [Option("after", help="Move only the bzr identifier"
812
514
" of the file, because the file has already been moved."),
813
Option('auto', help='Automatically guess renames.'),
814
Option('dry-run', help='Avoid making changes when guessing renames.'),
815
515
]
816
516
aliases = ['move', 'rename']
817
517
encoding_type = 'replace'
818
518
819
def run(self, names_list, after=False, auto=False, dry_run=False):
820
if auto:
821
return self.run_auto(names_list, after, dry_run)
822
elif dry_run:
823
raise errors.BzrCommandError('--dry-run requires --auto.')
519
def run(self, names_list, after=False):
824
520
if names_list is None:
825
521
names_list = []
522
826
523
if len(names_list) < 2:
827
524
raise errors.BzrCommandError("missing file argument")
828
tree, rel_names = tree_files(names_list, canonicalize=False)
829
self.add_cleanup(tree.lock_tree_write().unlock)
830
self._run(tree, names_list, rel_names, after)
831
832
def run_auto(self, names_list, after, dry_run):
833
if names_list is not None and len(names_list) > 1:
834
raise errors.BzrCommandError('Only one path may be specified to'
835
' --auto.')
836
if after:
837
raise errors.BzrCommandError('--after cannot be specified with'
838
' --auto.')
839
work_tree, file_list = tree_files(names_list, default_branch='.')
840
self.add_cleanup(work_tree.lock_tree_write().unlock)
841
rename_map.RenameMap.guess_renames(work_tree, dry_run)
525
tree, rel_names = tree_files(names_list)
526
tree.lock_write()
527
try:
528
self._run(tree, names_list, rel_names, after)
529
finally:
530
tree.unlock()
842
531
843
532
def _run(self, tree, names_list, rel_names, after):
844
533
into_existing = osutils.isdir(names_list[-1])
853
542
into_existing = False
854
543
else:
855
544
inv = tree.inventory
856
# 'fix' the case of a potential 'from'
857
from_id = tree.path2id(
858
tree.get_canonical_inventory_path(rel_names[0]))
545
from_id = tree.path2id(rel_names[0])
859
546
if (not osutils.lexists(names_list[0]) and
860
547
from_id and inv.get_file_kind(from_id) == "directory"):
861
548
into_existing = False
862
549
# move/rename
863
550
if into_existing:
864
551
# move into existing directory
865
# All entries reference existing inventory items, so fix them up
866
# for cicp file-systems.
867
rel_names = tree.get_canonical_inventory_paths(rel_names)
868
for src, dest in tree.move(rel_names[:-1], rel_names[-1], after=after):
869
if not is_quiet():
870
self.outf.write("%s => %s\n" % (src, dest))
552
for pair in tree.move(rel_names[:-1], rel_names[-1], after=after):
553
self.outf.write("%s => %s\n" % pair)
871
554
else:
872
555
if len(names_list) != 2:
873
556
raise errors.BzrCommandError('to mv multiple files the'
874
557
' destination must be a versioned'
875
558
' directory')
876
877
# for cicp file-systems: the src references an existing inventory
878
# item:
879
src = tree.get_canonical_inventory_path(rel_names[0])
880
# Find the canonical version of the destination: In all cases, the
881
# parent of the target must be in the inventory, so we fetch the
882
# canonical version from there (we do not always *use* the
883
# canonicalized tail portion - we may be attempting to rename the
884
# case of the tail)
885
canon_dest = tree.get_canonical_inventory_path(rel_names[1])
886
dest_parent = osutils.dirname(canon_dest)
887
spec_tail = osutils.basename(rel_names[1])
888
# For a CICP file-system, we need to avoid creating 2 inventory
889
# entries that differ only by case. So regardless of the case
890
# we *want* to use (ie, specified by the user or the file-system),
891
# we must always choose to use the case of any existing inventory
892
# items. The only exception to this is when we are attempting a
893
# case-only rename (ie, canonical versions of src and dest are
894
# the same)
895
dest_id = tree.path2id(canon_dest)
896
if dest_id is None or tree.path2id(src) == dest_id:
897
# No existing item we care about, so work out what case we
898
# are actually going to use.
899
if after:
900
# If 'after' is specified, the tail must refer to a file on disk.
901
if dest_parent:
902
dest_parent_fq = osutils.pathjoin(tree.basedir, dest_parent)
903
else:
904
# pathjoin with an empty tail adds a slash, which breaks
905
# relpath :(
906
dest_parent_fq = tree.basedir
907
908
dest_tail = osutils.canonical_relpath(
909
dest_parent_fq,
910
osutils.pathjoin(dest_parent_fq, spec_tail))
911
else:
912
# not 'after', so case as specified is used
913
dest_tail = spec_tail
914
else:
915
# Use the existing item so 'mv' fails with AlreadyVersioned.
916
dest_tail = os.path.basename(canon_dest)
917
dest = osutils.pathjoin(dest_parent, dest_tail)
918
mutter("attempting to move %s => %s", src, dest)
919
tree.rename_one(src, dest, after=after)
920
if not is_quiet():
921
self.outf.write("%s => %s\n" % (src, dest))
559
tree.rename_one(rel_names[0], rel_names[1], after=after)
560
self.outf.write("%s => %s\n" % (rel_names[0], rel_names[1]))
922
561
923
562
924
563
class cmd_pull(Command):
925
__doc__ = """Turn this branch into a mirror of another branch.
564
"""Turn this branch into a mirror of another branch.
926
565
927
By default, this command only works on branches that have not diverged.
928
Branches are considered diverged if the destination branch's most recent
929
commit is one that has not been merged (directly or indirectly) into the
930
parent.
566
This command only works on branches that have not diverged. Branches are
567
considered diverged if the destination branch's most recent commit is one
568
that has not been merged (directly or indirectly) into the parent.
931
569
932
570
If branches have diverged, you can use 'bzr merge' to integrate the changes
933
571
from one into the other. Once one branch has merged, the other should
934
572
be able to pull it again.
935
573
936
If you want to replace your local changes and just want your branch to
937
match the remote one, use pull --overwrite. This will work even if the two
938
branches have diverged.
574
If you want to forget your local changes and just update your branch to
575
match the remote one, use pull --overwrite.
939
576
940
577
If there is no default location set, the first pull will set it. After
941
578
that, you can omit the location to use the default. To change the
947
584
with bzr send.
948
585
"""
949
586
950
_see_also = ['push', 'update', 'status-flags', 'send']
587
_see_also = ['push', 'update', 'status-flags']
951
588
takes_options = ['remember', 'overwrite', 'revision',
952
589
custom_help('verbose',
953
590
help='Show logs of pulled revisions.'),
957
594
short_name='d',
958
595
type=unicode,
959
596
),
960
Option('local',
961
help="Perform a local pull in a bound "
962
"branch. Local pulls are not applied to "
963
"the master branch."
964
),
965
597
]
966
598
takes_args = ['location?']
967
599
encoding_type = 'replace'
968
600
969
601
def run(self, location=None, remember=False, overwrite=False,
970
602
revision=None, verbose=False,
971
directory=None, local=False):
603
directory=None):
972
604
# FIXME: too much stuff is in the command class
973
605
revision_id = None
974
606
mergeable = None
977
609
try:
978
610
tree_to = WorkingTree.open_containing(directory)[0]
979
611
branch_to = tree_to.branch
980
self.add_cleanup(tree_to.lock_write().unlock)
981
612
except errors.NoWorkingTree:
982
613
tree_to = None
983
614
branch_to = Branch.open_containing(directory)[0]
984
self.add_cleanup(branch_to.lock_write().unlock)
985
986
if local and not branch_to.get_bound_location():
987
raise errors.LocalRequiresBoundBranch()
988
615
989
616
possible_transports = []
990
617
if location is not None:
1003
630
display_url = urlutils.unescape_for_display(stored_loc,
1004
631
self.outf.encoding)
1005
632
if not is_quiet():
1006
self.outf.write("Using saved parent location: %s\n" % display_url)
633
self.outf.write("Using saved location: %s\n" % display_url)
1007
634
location = stored_loc
1008
635
1009
revision = _get_one_revision('pull', revision)
1010
636
if mergeable is not None:
1011
637
if revision is not None:
1012
638
raise errors.BzrCommandError(
1018
644
else:
1019
645
branch_from = Branch.open(location,
1020
646
possible_transports=possible_transports)
1021
self.add_cleanup(branch_from.lock_read().unlock)
1022
647
1023
648
if branch_to.get_parent() is None or remember:
1024
649
branch_to.set_parent(branch_from.base)
1025
650
1026
651
if revision is not None:
1027
revision_id = revision.as_revision_id(branch_from)
1028
1029
if tree_to is not None:
1030
view_info = _get_view_info_for_change_reporter(tree_to)
1031
change_reporter = delta._ChangeReporter(
1032
unversioned_filter=tree_to.is_ignored,
1033
view_info=view_info)
1034
result = tree_to.pull(
1035
branch_from, overwrite, revision_id, change_reporter,
1036
possible_transports=possible_transports, local=local)
1037
else:
1038
result = branch_to.pull(
1039
branch_from, overwrite, revision_id, local=local)
1040
1041
result.report(self.outf)
1042
if verbose and result.old_revid != result.new_revid:
1043
log.show_branch_change(
1044
branch_to, self.outf, result.old_revno,
1045
result.old_revid)
652
if len(revision) == 1:
653
revision_id = revision[0].as_revision_id(branch_from)
654
else:
655
raise errors.BzrCommandError(
656
'bzr pull --revision takes one value.')
657
658
branch_to.lock_write()
659
try:
660
if tree_to is not None:
661
change_reporter = delta._ChangeReporter(
662
unversioned_filter=tree_to.is_ignored)
663
result = tree_to.pull(branch_from, overwrite, revision_id,
664
change_reporter,
665
possible_transports=possible_transports)
666
else:
667
result = branch_to.pull(branch_from, overwrite, revision_id)
668
669
result.report(self.outf)
670
if verbose and result.old_revid != result.new_revid:
671
old_rh = list(
672
branch_to.repository.iter_reverse_revision_history(
673
result.old_revid))
674
old_rh.reverse()
675
new_rh = branch_to.revision_history()
676
log.show_changed_revisions(branch_to, old_rh, new_rh,
677
to_file=self.outf)
678
finally:
679
branch_to.unlock()
1046
680
1047
681
1048
682
class cmd_push(Command):
1049
__doc__ = """Update a mirror of this branch.
1050
683
"""Update a mirror of this branch.
684
1051
685
The target branch will not have its working tree populated because this
1052
686
is both expensive, and is not supported on remote file systems.
1053
687
1054
688
Some smart servers or protocols *may* put the working tree in place in
1055
689
the future.
1056
690
1060
694
1061
695
If branches have diverged, you can use 'bzr push --overwrite' to replace
1062
696
the other branch completely, discarding its unmerged changes.
1063
697
1064
698
If you want to ensure you have the different changes in the other branch,
1065
699
do a merge (see bzr help merge) from the other branch, and commit that.
1066
700
After that you will be able to do a push without '--overwrite'.
1095
729
'for the commit history. Only the work not present in the '
1096
730
'referenced branch is included in the branch created.',
1097
731
type=unicode),
1098
Option('strict',
1099
help='Refuse to push if there are uncommitted changes in'
1100
' the working tree, --no-strict disables the check.'),
1101
732
]
1102
733
takes_args = ['location?']
1103
734
encoding_type = 'replace'
1105
736
def run(self, location=None, remember=False, overwrite=False,
1106
737
create_prefix=False, verbose=False, revision=None,
1107
738
use_existing_dir=False, directory=None, stacked_on=None,
1108
stacked=False, strict=None):
739
stacked=False):
1109
740
from bzrlib.push import _show_push_branch
1110
741
742
# Get the source branch and revision_id
1111
743
if directory is None:
1112
744
directory = '.'
1113
# Get the source branch
1114
(tree, br_from,
1115
_unused) = bzrdir.BzrDir.open_containing_tree_or_branch(directory)
1116
# Get the tip's revision_id
1117
revision = _get_one_revision('push', revision)
745
br_from = Branch.open_containing(directory)[0]
1118
746
if revision is not None:
1119
revision_id = revision.in_history(br_from).rev_id
747
if len(revision) == 1:
748
revision_id = revision[0].in_history(br_from).rev_id
749
else:
750
raise errors.BzrCommandError(
751
'bzr push --revision takes one value.')
1120
752
else:
1121
revision_id = None
1122
if tree is not None and revision_id is None:
1123
tree.check_changed_or_out_of_date(
1124
strict, 'push_strict',
1125
more_error='Use --no-strict to force the push.',
1126
more_warning='Uncommitted changes will not be pushed.')
753
revision_id = br_from.last_revision()
754
1127
755
# Get the stacked_on branch, if any
1128
756
if stacked_on is not None:
1129
757
stacked_on = urlutils.normalize_url(stacked_on)
1151
779
else:
1152
780
display_url = urlutils.unescape_for_display(stored_loc,
1153
781
self.outf.encoding)
1154
self.outf.write("Using saved push location: %s\n" % display_url)
782
self.outf.write("Using saved location: %s\n" % display_url)
1155
783
location = stored_loc
1156
784
1157
785
_show_push_branch(br_from, revision_id, location, self.outf,
1161
789
1162
790
1163
791
class cmd_branch(Command):
1164
__doc__ = """Create a new branch that is a copy of an existing branch.
792
"""Create a new copy of a branch.
1165
793
1166
794
If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will
1167
795
be used. In other words, "branch ../foo/bar" will attempt to create ./bar.
1178
806
takes_args = ['from_location', 'to_location?']
1179
807
takes_options = ['revision', Option('hardlink',
1180
808
help='Hard-link working tree files where possible.'),
1181
Option('no-tree',
1182
help="Create a branch without a working-tree."),
1183
Option('switch',
1184
help="Switch the checkout in the current directory "
1185
"to the new branch."),
1186
809
Option('stacked',
1187
810
help='Create a stacked branch referring to the source branch. '
1188
811
'The new branch will depend on the availability of the source '
1189
812
'branch for all operations.'),
1190
Option('standalone',
1191
help='Do not use a shared repository, even if available.'),
1192
Option('use-existing-dir',
1193
help='By default branch will fail if the target'
1194
' directory exists, but does not already'
1195
' have a control directory. This flag will'
1196
' allow branch to proceed.'),
1197
Option('bind',
1198
help="Bind new branch to from location."),
1199
813
]
1200
814
aliases = ['get', 'clone']
1201
815
1202
816
def run(self, from_location, to_location=None, revision=None,
1203
hardlink=False, stacked=False, standalone=False, no_tree=False,
1204
use_existing_dir=False, switch=False, bind=False):
1205
from bzrlib import switch as _mod_switch
817
hardlink=False, stacked=False):
1206
818
from bzrlib.tag import _merge_tags_if_possible
819
if revision is None:
820
revision = [None]
821
elif len(revision) > 1:
822
raise errors.BzrCommandError(
823
'bzr branch --revision takes exactly 1 revision value')
824
1207
825
accelerator_tree, br_from = bzrdir.BzrDir.open_tree_or_branch(
1208
826
from_location)
1209
revision = _get_one_revision('branch', revision)
1210
self.add_cleanup(br_from.lock_read().unlock)
1211
if revision is not None:
1212
revision_id = revision.as_revision_id(br_from)
1213
else:
1214
# FIXME - wt.last_revision, fallback to branch, fall back to
1215
# None or perhaps NULL_REVISION to mean copy nothing
1216
# RBC 20060209
1217
revision_id = br_from.last_revision()
1218
if to_location is None:
1219
to_location = urlutils.derive_to_location(from_location)
1220
to_transport = transport.get_transport(to_location)
827
br_from.lock_read()
1221
828
try:
1222
to_transport.mkdir('.')
1223
except errors.FileExists:
1224
if not use_existing_dir:
1225
raise errors.BzrCommandError('Target directory "%s" '
1226
'already exists.' % to_location)
829
if len(revision) == 1 and revision[0] is not None:
830
revision_id = revision[0].as_revision_id(br_from)
1227
831
else:
1228
try:
1229
bzrdir.BzrDir.open_from_transport(to_transport)
1230
except errors.NotBranchError:
1231
pass
1232
else:
1233
raise errors.AlreadyBranchError(to_location)
1234
except errors.NoSuchFile:
1235
raise errors.BzrCommandError('Parent of "%s" does not exist.'
1236
% to_location)
1237
try:
1238
# preserve whatever source format we have.
1239
dir = br_from.bzrdir.sprout(to_transport.base, revision_id,
1240
possible_transports=[to_transport],
1241
accelerator_tree=accelerator_tree,
1242
hardlink=hardlink, stacked=stacked,
1243
force_new_repo=standalone,
1244
create_tree_if_local=not no_tree,
1245
source_branch=br_from)
1246
branch = dir.open_branch()
1247
except errors.NoSuchRevision:
1248
to_transport.delete_tree('.')
1249
msg = "The branch %s has no revision %s." % (from_location,
1250
revision)
1251
raise errors.BzrCommandError(msg)
1252
_merge_tags_if_possible(br_from, branch)
1253
# If the source branch is stacked, the new branch may
1254
# be stacked whether we asked for that explicitly or not.
1255
# We therefore need a try/except here and not just 'if stacked:'
1256
try:
1257
note('Created new stacked branch referring to %s.' %
1258
branch.get_stacked_on_url())
1259
except (errors.NotStacked, errors.UnstackableBranchFormat,
1260
errors.UnstackableRepositoryFormat), e:
1261
note('Branched %d revision(s).' % branch.revno())
1262
if bind:
1263
# Bind to the parent
1264
parent_branch = Branch.open(from_location)
1265
branch.bind(parent_branch)
1266
note('New branch bound to %s' % from_location)
1267
if switch:
1268
# Switch to the new branch
1269
wt, _ = WorkingTree.open_containing('.')
1270
_mod_switch.switch(wt.bzrdir, branch)
1271
note('Switched to branch: %s',
1272
urlutils.unescape_for_display(branch.base, 'utf-8'))
832
# FIXME - wt.last_revision, fallback to branch, fall back to
833
# None or perhaps NULL_REVISION to mean copy nothing
834
# RBC 20060209
835
revision_id = br_from.last_revision()
836
if to_location is None:
837
to_location = urlutils.derive_to_location(from_location)
838
to_transport = transport.get_transport(to_location)
839
try:
840
to_transport.mkdir('.')
841
except errors.FileExists:
842
raise errors.BzrCommandError('Target directory "%s" already'
843
' exists.' % to_location)
844
except errors.NoSuchFile:
845
raise errors.BzrCommandError('Parent of "%s" does not exist.'
846
% to_location)
847
try:
848
# preserve whatever source format we have.
849
dir = br_from.bzrdir.sprout(to_transport.base, revision_id,
850
possible_transports=[to_transport],
851
accelerator_tree=accelerator_tree,
852
hardlink=hardlink, stacked=stacked)
853
branch = dir.open_branch()
854
except errors.NoSuchRevision:
855
to_transport.delete_tree('.')
856
msg = "The branch %s has no revision %s." % (from_location,
857
revision[0])
858
raise errors.BzrCommandError(msg)
859
_merge_tags_if_possible(br_from, branch)
860
# If the source branch is stacked, the new branch may
861
# be stacked whether we asked for that explicitly or not.
862
# We therefore need a try/except here and not just 'if stacked:'
863
try:
864
note('Created new stacked branch referring to %s.' %
865
branch.get_stacked_on_url())
866
except (errors.NotStacked, errors.UnstackableBranchFormat,
867
errors.UnstackableRepositoryFormat), e:
868
note('Branched %d revision(s).' % branch.revno())
869
finally:
870
br_from.unlock()
1273
871
1274
872
1275
873
class cmd_checkout(Command):
1276
__doc__ = """Create a new checkout of an existing branch.
874
"""Create a new checkout of an existing branch.
1277
875
1278
876
If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree for
1279
877
the branch found in '.'. This is useful if you have removed the working tree
1280
878
or if it was never created - i.e. if you pushed the branch to its current
1281
879
location using SFTP.
1282
880
1283
881
If the TO_LOCATION is omitted, the last component of the BRANCH_LOCATION will
1284
882
be used. In other words, "checkout ../foo/bar" will attempt to create ./bar.
1285
883
If the BRANCH_LOCATION has no / or path separator embedded, the TO_LOCATION
1313
911
1314
912
def run(self, branch_location=None, to_location=None, revision=None,
1315
913
lightweight=False, files_from=None, hardlink=False):
914
if revision is None:
915
revision = [None]
916
elif len(revision) > 1:
917
raise errors.BzrCommandError(
918
'bzr checkout --revision takes exactly 1 revision value')
1316
919
if branch_location is None:
1317
920
branch_location = osutils.getcwd()
1318
921
to_location = branch_location
1319
922
accelerator_tree, source = bzrdir.BzrDir.open_tree_or_branch(
1320
923
branch_location)
1321
revision = _get_one_revision('checkout', revision)
1322
924
if files_from is not None:
1323
925
accelerator_tree = WorkingTree.open(files_from)
1324
if revision is not None:
1325
revision_id = revision.as_revision_id(source)
926
if len(revision) == 1 and revision[0] is not None:
927
revision_id = revision[0].as_revision_id(source)
1326
928
else:
1327
929
revision_id = None
1328
930
if to_location is None:
1329
931
to_location = urlutils.derive_to_location(branch_location)
1330
# if the source and to_location are the same,
932
# if the source and to_location are the same,
1331
933
# and there is no working tree,
1332
934
# then reconstitute a branch
1333
935
if (osutils.abspath(to_location) ==
1342
944
1343
945
1344
946
class cmd_renames(Command):
1345
__doc__ = """Show list of renamed files.
947
"""Show list of renamed files.
1346
948
"""
1347
949
# TODO: Option to show renames between two historical versions.
1348
950
1353
955
@display_command
1354
956
def run(self, dir=u'.'):
1355
957
tree = WorkingTree.open_containing(dir)[0]
1356
self.add_cleanup(tree.lock_read().unlock)
1357
new_inv = tree.inventory
1358
old_tree = tree.basis_tree()
1359
self.add_cleanup(old_tree.lock_read().unlock)
1360
old_inv = old_tree.inventory
1361
renames = []
1362
iterator = tree.iter_changes(old_tree, include_unchanged=True)
1363
for f, paths, c, v, p, n, k, e in iterator:
1364
if paths[0] == paths[1]:
1365
continue
1366
if None in (paths):
1367
continue
1368
renames.append(paths)
1369
renames.sort()
1370
for old_name, new_name in renames:
1371
self.outf.write("%s => %s\n" % (old_name, new_name))
958
tree.lock_read()
959
try:
960
new_inv = tree.inventory
961
old_tree = tree.basis_tree()
962
old_tree.lock_read()
963
try:
964
old_inv = old_tree.inventory
965
renames = list(_mod_tree.find_renames(old_inv, new_inv))
966
renames.sort()
967
for old_name, new_name in renames:
968
self.outf.write("%s => %s\n" % (old_name, new_name))
969
finally:
970
old_tree.unlock()
971
finally:
972
tree.unlock()
1372
973
1373
974
1374
975
class cmd_update(Command):
1375
__doc__ = """Update a tree to have the latest code committed to its branch.
1376
976
"""Update a tree to have the latest code committed to its branch.
977
1377
978
This will perform a merge into the working tree, and may generate
1378
conflicts. If you have any local changes, you will still
979
conflicts. If you have any local changes, you will still
1379
980
need to commit them after the update for the update to be complete.
1380
1381
If you want to discard your local changes, you can just do a
981
982
If you want to discard your local changes, you can just do a
1382
983
'bzr revert' instead of 'bzr commit' after the update.
1383
1384
If the tree's branch is bound to a master branch, it will also update
1385
the branch from the master.
1386
984
"""
1387
985
1388
986
_see_also = ['pull', 'working-trees', 'status-flags']
1389
987
takes_args = ['dir?']
1390
takes_options = ['revision']
1391
988
aliases = ['up']
1392
989
1393
def run(self, dir='.', revision=None):
1394
if revision is not None and len(revision) != 1:
1395
raise errors.BzrCommandError(
1396
"bzr update --revision takes exactly one revision")
990
def run(self, dir='.'):
1397
991
tree = WorkingTree.open_containing(dir)[0]
1398
branch = tree.branch
1399
992
possible_transports = []
1400
master = branch.get_master_branch(
993
master = tree.branch.get_master_branch(
1401
994
possible_transports=possible_transports)
1402
995
if master is not None:
1403
branch_location = master.base
1404
996
tree.lock_write()
1405
997
else:
1406
branch_location = tree.branch.base
1407
998
tree.lock_tree_write()
1408
self.add_cleanup(tree.unlock)
1409
# get rid of the final '/' and be ready for display
1410
branch_location = urlutils.unescape_for_display(
1411
branch_location.rstrip('/'),
1412
self.outf.encoding)
1413
existing_pending_merges = tree.get_parent_ids()[1:]
1414
if master is None:
1415
old_tip = None
1416
else:
1417
# may need to fetch data into a heavyweight checkout
1418
# XXX: this may take some time, maybe we should display a
1419
# message
1420
old_tip = branch.update(possible_transports)
1421
if revision is not None:
1422
revision_id = revision[0].as_revision_id(branch)
1423
else:
1424
revision_id = branch.last_revision()
1425
if revision_id == _mod_revision.ensure_null(tree.last_revision()):
1426
revno = branch.revision_id_to_dotted_revno(revision_id)
1427
note("Tree is up to date at revision %s of branch %s" %
1428
('.'.join(map(str, revno)), branch_location))
1429
return 0
1430
view_info = _get_view_info_for_change_reporter(tree)
1431
change_reporter = delta._ChangeReporter(
1432
unversioned_filter=tree.is_ignored,
1433
view_info=view_info)
1434
999
try:
1000
existing_pending_merges = tree.get_parent_ids()[1:]
1001
last_rev = _mod_revision.ensure_null(tree.last_revision())
1002
if last_rev == _mod_revision.ensure_null(
1003
tree.branch.last_revision()):
1004
# may be up to date, check master too.
1005
if master is None or last_rev == _mod_revision.ensure_null(
1006
master.last_revision()):
1007
revno = tree.branch.revision_id_to_revno(last_rev)
1008
note("Tree is up to date at revision %d." % (revno,))
1009
return 0
1435
1010
conflicts = tree.update(
1436
change_reporter,
1437
possible_transports=possible_transports,
1438
revision=revision_id,
1439
old_tip=old_tip)
1440
except errors.NoSuchRevision, e:
1441
raise errors.BzrCommandError(
1442
"branch has no revision %s\n"
1443
"bzr update --revision only works"
1444
" for a revision in the branch history"
1445
% (e.revision))
1446
revno = tree.branch.revision_id_to_dotted_revno(
1447
_mod_revision.ensure_null(tree.last_revision()))
1448
note('Updated to revision %s of branch %s' %
1449
('.'.join(map(str, revno)), branch_location))
1450
parent_ids = tree.get_parent_ids()
1451
if parent_ids[1:] and parent_ids[1:] != existing_pending_merges:
1452
note('Your local commits will now show as pending merges with '
1453
"'bzr status', and can be committed with 'bzr commit'.")
1454
if conflicts != 0:
1455
return 1
1456
else:
1457
return 0
1011
delta._ChangeReporter(unversioned_filter=tree.is_ignored),
1012
possible_transports=possible_transports)
1013
revno = tree.branch.revision_id_to_revno(
1014
_mod_revision.ensure_null(tree.last_revision()))
1015
note('Updated to revision %d.' % (revno,))
1016
if tree.get_parent_ids()[1:] != existing_pending_merges:
1017
note('Your local commits will now show as pending merges with '
1018
"'bzr status', and can be committed with 'bzr commit'.")
1019
if conflicts != 0:
1020
return 1
1021
else:
1022
return 0
1023
finally:
1024
tree.unlock()
1458
1025
1459
1026
1460
1027
class cmd_info(Command):
1461
__doc__ = """Show information about a working tree, branch or repository.
1028
"""Show information about a working tree, branch or repository.
1462
1029
1463
1030
This command will show all known locations and formats associated to the
1464
tree, branch or repository.
1465
1466
In verbose mode, statistical information is included with each report.
1467
To see extended statistic information, use a verbosity level of 2 or
1468
higher by specifying the verbose option multiple times, e.g. -vv.
1031
tree, branch or repository. Statistical information is included with
1032
each report.
1469
1033
1470
1034
Branches and working trees will also report any missing revisions.
1471
1472
:Examples:
1473
1474
Display information on the format and related locations:
1475
1476
bzr info
1477
1478
Display the above together with extended format information and
1479
basic statistics (like the number of files in the working tree and
1480
number of revisions in the branch and repository):
1481
1482
bzr info -v
1483
1484
Display the above together with number of committers to the branch:
1485
1486
bzr info -vv
1487
1035
"""
1488
1036
_see_also = ['revno', 'working-trees', 'repositories']
1489
1037
takes_args = ['location?']
1493
1041
@display_command
1494
1042
def run(self, location=None, verbose=False):
1495
1043
if verbose:
1496
noise_level = get_verbosity_level()
1044
noise_level = 2
1497
1045
else:
1498
1046
noise_level = 0
1499
1047
from bzrlib.info import show_bzrdir_info
1502
1050
1503
1051
1504
1052
class cmd_remove(Command):
1505
__doc__ = """Remove files or directories.
1506
1507
This makes bzr stop tracking changes to the specified files. bzr will delete
1508
them if they can easily be recovered using revert. If no options or
1509
parameters are given bzr will scan for files that are being tracked by bzr
1510
but missing in your tree and stop tracking them for you.
1053
"""Remove files or directories.
1054
1055
This makes bzr stop tracking changes to the specified files and
1056
delete them if they can easily be recovered using revert.
1057
1058
You can specify one or more files, and/or --new. If you specify --new,
1059
only 'added' files will be removed. If you specify both, then new files
1060
in the specified directories will be removed. If the directories are
1061
also new, they will also be removed.
1511
1062
"""
1512
1063
takes_args = ['file*']
1513
1064
takes_options = ['verbose',
1514
Option('new', help='Only remove files that have never been committed.'),
1065
Option('new', help='Remove newly-added files.'),
1515
1066
RegistryOption.from_kwargs('file-deletion-strategy',
1516
1067
'The file deletion mode to be used.',
1517
1068
title='Deletion Strategy', value_switches=True, enum_switch=False,
1518
1069
safe='Only delete files if they can be'
1519
1070
' safely recovered (default).',
1520
keep='Delete from bzr but leave the working copy.',
1071
keep="Don't delete any files.",
1521
1072
force='Delete all the specified files, even if they can not be '
1522
1073
'recovered and even if they are non-empty directories.')]
1523
aliases = ['rm', 'del']
1074
aliases = ['rm']
1524
1075
encoding_type = 'replace'
1525
1076
1526
1077
def run(self, file_list, verbose=False, new=False,
1529
1080
1530
1081
if file_list is not None:
1531
1082
file_list = [f for f in file_list]
1083
elif not new:
1084
raise errors.BzrCommandError('Specify one or more files to'
1085
' remove, or use --new.')
1532
1086
1533
self.add_cleanup(tree.lock_write().unlock)
1534
# Heuristics should probably all move into tree.remove_smart or
1535
# some such?
1536
1087
if new:
1537
1088
added = tree.changes_from(tree.basis_tree(),
1538
1089
specific_files=file_list).added
1539
1090
file_list = sorted([f[0] for f in added], reverse=True)
1540
1091
if len(file_list) == 0:
1541
1092
raise errors.BzrCommandError('No matching files.')
1542
elif file_list is None:
1543
# missing files show up in iter_changes(basis) as
1544
# versioned-with-no-kind.
1545
missing = []
1546
for change in tree.iter_changes(tree.basis_tree()):
1547
# Find paths in the working tree that have no kind:
1548
if change[1][1] is not None and change[6][1] is None:
1549
missing.append(change[1][1])
1550
file_list = sorted(missing, reverse=True)
1551
file_deletion_strategy = 'keep'
1552
1093
tree.remove(file_list, verbose=verbose, to_file=self.outf,
1553
1094
keep_files=file_deletion_strategy=='keep',
1554
1095
force=file_deletion_strategy=='force')
1555
1096
1556
1097
1557
1098
class cmd_file_id(Command):
1558
__doc__ = """Print file_id of a particular file or directory.
1099
"""Print file_id of a particular file or directory.
1559
1100
1560
1101
The file_id is assigned when the file is first added and remains the
1561
1102
same through all revisions where the file exists, even when it is
1577
1118
1578
1119
1579
1120
class cmd_file_path(Command):
1580
__doc__ = """Print path of file_ids to a file or directory.
1121
"""Print path of file_ids to a file or directory.
1581
1122
1582
1123
This prints one line for each directory down to the target,
1583
1124
starting at the branch root.
1599
1140
1600
1141
1601
1142
class cmd_reconcile(Command):
1602
__doc__ = """Reconcile bzr metadata in a branch.
1143
"""Reconcile bzr metadata in a branch.
1603
1144
1604
1145
This can correct data mismatches that may have been caused by
1605
1146
previous ghost operations or bzr upgrades. You should only
1606
need to run this command if 'bzr check' or a bzr developer
1147
need to run this command if 'bzr check' or a bzr developer
1607
1148
advises you to run it.
1608
1149
1609
1150
If a second branch is provided, cross-branch reconciliation is
1611
1152
id which was not present in very early bzr versions is represented
1612
1153
correctly in both branches.
1613
1154
1614
At the same time it is run it may recompress data resulting in
1155
At the same time it is run it may recompress data resulting in
1615
1156
a potential saving in disk space or performance gain.
1616
1157
1617
1158
The branch *MUST* be on a listable system such as local disk or sftp.
1627
1168
1628
1169
1629
1170
class cmd_revision_history(Command):
1630
__doc__ = """Display the list of revision ids on a branch."""
1171
"""Display the list of revision ids on a branch."""
1631
1172
1632
1173
_see_also = ['log']
1633
1174
takes_args = ['location?']
1643
1184
1644
1185
1645
1186
class cmd_ancestry(Command):
1646
__doc__ = """List all revisions merged into this branch."""
1187
"""List all revisions merged into this branch."""
1647
1188
1648
1189
_see_also = ['log', 'revision-history']
1649
1190
takes_args = ['location?']
1668
1209
1669
1210
1670
1211
class cmd_init(Command):
1671
__doc__ = """Make a directory into a versioned branch.
1212
"""Make a directory into a versioned branch.
1672
1213
1673
1214
Use this to create an empty branch, or before importing an
1674
1215
existing project.
1675
1216
1676
If there is a repository in a parent directory of the location, then
1217
If there is a repository in a parent directory of the location, then
1677
1218
the history of the branch will be stored in the repository. Otherwise
1678
1219
init creates a standalone branch which carries its own history
1679
1220
in the .bzr directory.
1699
1240
RegistryOption('format',
1700
1241
help='Specify a format for this branch. '
1701
1242
'See "help formats".',
1702
lazy_registry=('bzrlib.bzrdir', 'format_registry'),
1703
converter=lambda name: bzrdir.format_registry.make_bzrdir(name),
1243
registry=bzrdir.format_registry,
1244
converter=bzrdir.format_registry.make_bzrdir,
1704
1245
value_switches=True,
1705
title="Branch format",
1246
title="Branch Format",
1706
1247
),
1707
1248
Option('append-revisions-only',
1708
1249
help='Never change revnos or the existing log.'
1731
1272
"\nYou may supply --create-prefix to create all"
1732
1273
" leading parent directories."
1733
1274
% location)
1734
to_transport.create_prefix()
1275
_create_prefix(to_transport)
1735
1276
1736
1277
try:
1737
a_bzrdir = bzrdir.BzrDir.open_from_transport(to_transport)
1278
existing_bzrdir = bzrdir.BzrDir.open_from_transport(to_transport)
1738
1279
except errors.NotBranchError:
1739
1280
# really a NotBzrDir error...
1740
1281
create_branch = bzrdir.BzrDir.create_branch_convenience
1741
1282
branch = create_branch(to_transport.base, format=format,
1742
1283
possible_transports=[to_transport])
1743
a_bzrdir = branch.bzrdir
1744
1284
else:
1745
1285
from bzrlib.transport.local import LocalTransport
1746
if a_bzrdir.has_branch():
1286
if existing_bzrdir.has_branch():
1747
1287
if (isinstance(to_transport, LocalTransport)
1748
and not a_bzrdir.has_workingtree()):
1288
and not existing_bzrdir.has_workingtree()):
1749
1289
raise errors.BranchExistsWithoutWorkingTree(location)
1750
1290
raise errors.AlreadyBranchError(location)
1751
branch = a_bzrdir.create_branch()
1752
a_bzrdir.create_workingtree()
1291
else:
1292
branch = existing_bzrdir.create_branch()
1293
existing_bzrdir.create_workingtree()
1753
1294
if append_revisions_only:
1754
1295
try:
1755
1296
branch.set_append_revisions_only(True)
1756
1297
except errors.UpgradeRequired:
1757
1298
raise errors.BzrCommandError('This branch format cannot be set'
1758
' to append-revisions-only. Try --default.')
1759
if not is_quiet():
1760
from bzrlib.info import describe_layout, describe_format
1761
try:
1762
tree = a_bzrdir.open_workingtree(recommend_upgrade=False)
1763
except (errors.NoWorkingTree, errors.NotLocalUrl):
1764
tree = None
1765
repository = branch.repository
1766
layout = describe_layout(repository, branch, tree).lower()
1767
format = describe_format(a_bzrdir, repository, branch, tree)
1768
self.outf.write("Created a %s (format: %s)\n" % (layout, format))
1769
if repository.is_shared():
1770
#XXX: maybe this can be refactored into transport.path_or_url()
1771
url = repository.bzrdir.root_transport.external_url()
1772
try:
1773
url = urlutils.local_path_from_url(url)
1774
except errors.InvalidURL:
1775
pass
1776
self.outf.write("Using shared repository: %s\n" % url)
1299
' to append-revisions-only. Try --experimental-branch6')
1777
1300
1778
1301
1779
1302
class cmd_init_repository(Command):
1780
__doc__ = """Create a shared repository for branches to share storage space.
1303
"""Create a shared repository to hold branches.
1781
1304
1782
1305
New branches created under the repository directory will store their
1783
revisions in the repository, not in the branch directory. For branches
1784
with shared history, this reduces the amount of storage needed and
1785
speeds up the creation of new branches.
1306
revisions in the repository, not in the branch directory.
1786
1307
1787
If the --no-trees option is given then the branches in the repository
1788
will not have working trees by default. They will still exist as
1789
directories on disk, but they will not have separate copies of the
1790
files at a certain revision. This can be useful for repositories that
1791
store branches which are interacted with through checkouts or remote
1792
branches, such as on a server.
1308
If the --no-trees option is used then the branches in the repository
1309
will not have working trees by default.
1793
1310
1794
1311
:Examples:
1795
Create a shared repository holding just branches::
1312
Create a shared repositories holding just branches::
1796
1313
1797
1314
bzr init-repo --no-trees repo
1798
1315
bzr init repo/trunk
1809
1326
takes_options = [RegistryOption('format',
1810
1327
help='Specify a format for this repository. See'
1811
1328
' "bzr help formats" for details.',
1812
lazy_registry=('bzrlib.bzrdir', 'format_registry'),
1813
converter=lambda name: bzrdir.format_registry.make_bzrdir(name),
1329
registry=bzrdir.format_registry,
1330
converter=bzrdir.format_registry.make_bzrdir,
1814
1331
value_switches=True, title='Repository format'),
1815
1332
Option('no-trees',
1816
1333
help='Branches in the repository will default to'
1831
1348
newdir = format.initialize_on_transport(to_transport)
1832
1349
repo = newdir.create_repository(shared=True)
1833
1350
repo.set_make_working_trees(not no_trees)
1834
if not is_quiet():
1835
from bzrlib.info import show_bzrdir_info
1836
show_bzrdir_info(repo.bzrdir, verbose=0, outfile=self.outf)
1837
1351
1838
1352
1839
1353
class cmd_diff(Command):
1840
__doc__ = """Show differences in the working tree, between revisions or branches.
1841
1354
"""Show differences in the working tree, between revisions or branches.
1355
1842
1356
If no arguments are given, all changes for the current tree are listed.
1843
1357
If files are given, only the changes in those files are listed.
1844
1358
Remote and multiple branches can be compared by using the --old and
1864
1378
1865
1379
bzr diff -r1
1866
1380
1867
Difference between revision 3 and revision 1::
1868
1869
bzr diff -r1..3
1870
1871
Difference between revision 3 and revision 1 for branch xxx::
1872
1873
bzr diff -r1..3 xxx
1874
1875
To see the changes introduced in revision X::
1876
1877
bzr diff -cX
1878
1879
Note that in the case of a merge, the -c option shows the changes
1880
compared to the left hand parent. To see the changes against
1881
another parent, use::
1882
1883
bzr diff -r<chosen_parent>..X
1884
1885
The changes introduced by revision 2 (equivalent to -r1..2)::
1886
1887
bzr diff -c2
1381
Difference between revision 2 and revision 1::
1382
1383
bzr diff -r1..2
1384
1385
Difference between revision 2 and revision 1 for branch xxx::
1386
1387
bzr diff -r1..2 xxx
1888
1388
1889
1389
Show just the differences for file NEWS::
1890
1390
1929
1429
help='Use this command to compare files.',
1930
1430
type=unicode,
1931
1431
),
1932
RegistryOption('format',
1933
help='Diff format to use.',
1934
lazy_registry=('bzrlib.diff', 'format_registry'),
1935
value_switches=False, title='Diff format'),
1936
1432
]
1937
1433
aliases = ['di', 'dif']
1938
1434
encoding_type = 'exact'
1939
1435
1940
1436
@display_command
1941
1437
def run(self, revision=None, file_list=None, diff_options=None,
1942
prefix=None, old=None, new=None, using=None, format=None):
1943
from bzrlib.diff import (get_trees_and_branches_to_diff_locked,
1944
show_diff_trees)
1438
prefix=None, old=None, new=None, using=None):
1439
from bzrlib.diff import _get_trees_to_diff, show_diff_trees
1945
1440
1946
1441
if (prefix is None) or (prefix == '0'):
1947
1442
# diff -p0 format
1961
1456
raise errors.BzrCommandError('bzr diff --revision takes exactly'
1962
1457
' one or two revision specifiers')
1963
1458
1964
if using is not None and format is not None:
1965
raise errors.BzrCommandError('--using and --format are mutually '
1966
'exclusive.')
1967
1968
(old_tree, new_tree,
1969
old_branch, new_branch,
1970
specific_files, extra_trees) = get_trees_and_branches_to_diff_locked(
1971
file_list, revision, old, new, self.add_cleanup, apply_view=True)
1972
return show_diff_trees(old_tree, new_tree, sys.stdout,
1459
old_tree, new_tree, specific_files, extra_trees = \
1460
_get_trees_to_diff(file_list, revision, old, new)
1461
return show_diff_trees(old_tree, new_tree, sys.stdout,
1973
1462
specific_files=specific_files,
1974
1463
external_diff_options=diff_options,
1975
1464
old_label=old_label, new_label=new_label,
1976
extra_trees=extra_trees, using=using,
1977
format_cls=format)
1465
extra_trees=extra_trees, using=using)
1978
1466
1979
1467
1980
1468
class cmd_deleted(Command):
1981
__doc__ = """List files deleted in the working tree.
1469
"""List files deleted in the working tree.
1982
1470
"""
1983
1471
# TODO: Show files deleted since a previous revision, or
1984
1472
# between two revisions.
1992
1480
@display_command
1993
1481
def run(self, show_ids=False):
1994
1482
tree = WorkingTree.open_containing(u'.')[0]
1995
self.add_cleanup(tree.lock_read().unlock)
1996
old = tree.basis_tree()
1997
self.add_cleanup(old.lock_read().unlock)
1998
for path, ie in old.inventory.iter_entries():
1999
if not tree.has_id(ie.file_id):
2000
self.outf.write(path)
2001
if show_ids:
2002
self.outf.write(' ')
2003
self.outf.write(ie.file_id)
2004
self.outf.write('\n')
1483
tree.lock_read()
1484
try:
1485
old = tree.basis_tree()
1486
old.lock_read()
1487
try:
1488
for path, ie in old.inventory.iter_entries():
1489
if not tree.has_id(ie.file_id):
1490
self.outf.write(path)
1491
if show_ids:
1492
self.outf.write(' ')
1493
self.outf.write(ie.file_id)
1494
self.outf.write('\n')
1495
finally:
1496
old.unlock()
1497
finally:
1498
tree.unlock()
2005
1499
2006
1500
2007
1501
class cmd_modified(Command):
2008
__doc__ = """List files modified in working tree.
1502
"""List files modified in working tree.
2009
1503
"""
2010
1504
2011
1505
hidden = True
2028
1522
2029
1523
2030
1524
class cmd_added(Command):
2031
__doc__ = """List files added in working tree.
1525
"""List files added in working tree.
2032
1526
"""
2033
1527
2034
1528
hidden = True
2042
1536
@display_command
2043
1537
def run(self, null=False):
2044
1538
wt = WorkingTree.open_containing(u'.')[0]
2045
self.add_cleanup(wt.lock_read().unlock)
2046
basis = wt.basis_tree()
2047
self.add_cleanup(basis.lock_read().unlock)
2048
basis_inv = basis.inventory
2049
inv = wt.inventory
2050
for file_id in inv:
2051
if file_id in basis_inv:
2052
continue
2053
if inv.is_root(file_id) and len(basis_inv) == 0:
2054
continue
2055
path = inv.id2path(file_id)
2056
if not os.access(osutils.abspath(path), os.F_OK):
2057
continue
2058
if null:
2059
self.outf.write(path + '\0')
2060
else:
2061
self.outf.write(osutils.quotefn(path) + '\n')
1539
wt.lock_read()
1540
try:
1541
basis = wt.basis_tree()
1542
basis.lock_read()
1543
try:
1544
basis_inv = basis.inventory
1545
inv = wt.inventory
1546
for file_id in inv:
1547
if file_id in basis_inv:
1548
continue
1549
if inv.is_root(file_id) and len(basis_inv) == 0:
1550
continue
1551
path = inv.id2path(file_id)
1552
if not os.access(osutils.abspath(path), os.F_OK):
1553
continue
1554
if null:
1555
self.outf.write(path + '\0')
1556
else:
1557
self.outf.write(osutils.quotefn(path) + '\n')
1558
finally:
1559
basis.unlock()
1560
finally:
1561
wt.unlock()
2062
1562
2063
1563
2064
1564
class cmd_root(Command):
2065
__doc__ = """Show the tree root directory.
1565
"""Show the tree root directory.
2066
1566
2067
1567
The root is the nearest enclosing directory with a .bzr control
2068
1568
directory."""
2083
1583
raise errors.BzrCommandError(msg)
2084
1584
2085
1585
2086
def _parse_levels(s):
2087
try:
2088
return int(s)
2089
except ValueError:
2090
msg = "The levels argument must be an integer."
2091
raise errors.BzrCommandError(msg)
2092
2093
2094
1586
class cmd_log(Command):
2095
__doc__ = """Show historical log for a branch or subset of a branch.
2096
2097
log is bzr's default tool for exploring the history of a branch.
2098
The branch to use is taken from the first parameter. If no parameters
2099
are given, the branch containing the working directory is logged.
2100
Here are some simple examples::
2101
2102
bzr log log the current branch
2103
bzr log foo.py log a file in its branch
2104
bzr log http://server/branch log a branch on a server
2105
2106
The filtering, ordering and information shown for each revision can
2107
be controlled as explained below. By default, all revisions are
2108
shown sorted (topologically) so that newer revisions appear before
2109
older ones and descendants always appear before ancestors. If displayed,
2110
merged revisions are shown indented under the revision in which they
2111
were merged.
2112
2113
:Output control:
2114
2115
The log format controls how information about each revision is
2116
displayed. The standard log formats are called ``long``, ``short``
2117
and ``line``. The default is long. See ``bzr help log-formats``
2118
for more details on log formats.
2119
2120
The following options can be used to control what information is
2121
displayed::
2122
2123
-l N display a maximum of N revisions
2124
-n N display N levels of revisions (0 for all, 1 for collapsed)
2125
-v display a status summary (delta) for each revision
2126
-p display a diff (patch) for each revision
2127
--show-ids display revision-ids (and file-ids), not just revnos
2128
2129
Note that the default number of levels to display is a function of the
2130
log format. If the -n option is not used, the standard log formats show
2131
just the top level (mainline).
2132
2133
Status summaries are shown using status flags like A, M, etc. To see
2134
the changes explained using words like ``added`` and ``modified``
2135
instead, use the -vv option.
2136
2137
:Ordering control:
2138
2139
To display revisions from oldest to newest, use the --forward option.
2140
In most cases, using this option will have little impact on the total
2141
time taken to produce a log, though --forward does not incrementally
2142
display revisions like --reverse does when it can.
2143
2144
:Revision filtering:
2145
2146
The -r option can be used to specify what revision or range of revisions
2147
to filter against. The various forms are shown below::
2148
2149
-rX display revision X
2150
-rX.. display revision X and later
2151
-r..Y display up to and including revision Y
2152
-rX..Y display from X to Y inclusive
2153
2154
See ``bzr help revisionspec`` for details on how to specify X and Y.
2155
Some common examples are given below::
2156
2157
-r-1 show just the tip
2158
-r-10.. show the last 10 mainline revisions
2159
-rsubmit:.. show what's new on this branch
2160
-rancestor:path.. show changes since the common ancestor of this
2161
branch and the one at location path
2162
-rdate:yesterday.. show changes since yesterday
2163
2164
When logging a range of revisions using -rX..Y, log starts at
2165
revision Y and searches back in history through the primary
2166
("left-hand") parents until it finds X. When logging just the
2167
top level (using -n1), an error is reported if X is not found
2168
along the way. If multi-level logging is used (-n0), X may be
2169
a nested merge revision and the log will be truncated accordingly.
2170
2171
:Path filtering:
2172
2173
If parameters are given and the first one is not a branch, the log
2174
will be filtered to show only those revisions that changed the
2175
nominated files or directories.
2176
2177
Filenames are interpreted within their historical context. To log a
2178
deleted file, specify a revision range so that the file existed at
2179
the end or start of the range.
2180
2181
Historical context is also important when interpreting pathnames of
2182
renamed files/directories. Consider the following example:
2183
2184
* revision 1: add tutorial.txt
2185
* revision 2: modify tutorial.txt
2186
* revision 3: rename tutorial.txt to guide.txt; add tutorial.txt
2187
2188
In this case:
2189
2190
* ``bzr log guide.txt`` will log the file added in revision 1
2191
2192
* ``bzr log tutorial.txt`` will log the new file added in revision 3
2193
2194
* ``bzr log -r2 -p tutorial.txt`` will show the changes made to
2195
the original file in revision 2.
2196
2197
* ``bzr log -r2 -p guide.txt`` will display an error message as there
2198
was no file called guide.txt in revision 2.
2199
2200
Renames are always followed by log. By design, there is no need to
2201
explicitly ask for this (and no way to stop logging a file back
2202
until it was last renamed).
2203
2204
:Other filtering:
2205
2206
The --message option can be used for finding revisions that match a
2207
regular expression in a commit message.
2208
2209
:Tips & tricks:
2210
2211
GUI tools and IDEs are often better at exploring history than command
2212
line tools: you may prefer qlog or viz from qbzr or bzr-gtk, the
2213
bzr-explorer shell, or the Loggerhead web interface. See the Plugin
2214
Guide <http://doc.bazaar.canonical.com/plugins/en/> and
2215
<http://wiki.bazaar.canonical.com/IDEIntegration>.
2216
2217
You may find it useful to add the aliases below to ``bazaar.conf``::
2218
2219
[ALIASES]
2220
tip = log -r-1
2221
top = log -l10 --line
2222
show = log -v -p
2223
2224
``bzr tip`` will then show the latest revision while ``bzr top``
2225
will show the last 10 mainline revisions. To see the details of a
2226
particular revision X, ``bzr show -rX``.
2227
2228
If you are interested in looking deeper into a particular merge X,
2229
use ``bzr log -n0 -rX``.
2230
2231
``bzr log -v`` on a branch with lots of history is currently
2232
very slow. A fix for this issue is currently under development.
2233
With or without that fix, it is recommended that a revision range
2234
be given when using the -v option.
2235
2236
bzr has a generic full-text matching plugin, bzr-search, that can be
2237
used to find revisions matching user names, commit messages, etc.
2238
Among other features, this plugin can find all revisions containing
2239
a list of words but not others.
2240
2241
When exploring non-mainline history on large projects with deep
2242
history, the performance of log can be greatly improved by installing
2243
the historycache plugin. This plugin buffers historical information
2244
trading disk space for faster speed.
1587
"""Show log of a branch, file, or directory.
1588
1589
By default show the log of the branch containing the working directory.
1590
1591
To request a range of logs, you can use the command -r begin..end
1592
-r revision requests a specific revision, -r ..end or -r begin.. are
1593
also valid.
1594
1595
:Examples:
1596
Log the current branch::
1597
1598
bzr log
1599
1600
Log a file::
1601
1602
bzr log foo.c
1603
1604
Log the last 10 revisions of a branch::
1605
1606
bzr log -r -10.. http://server/branch
2245
1607
"""
2246
takes_args = ['file*']
2247
_see_also = ['log-formats', 'revisionspec']
1608
1609
# TODO: Make --revision support uuid: and hash: [future tag:] notation.
1610
1611
takes_args = ['location?']
2248
1612
takes_options = [
2249
1613
Option('forward',
2250
1614
help='Show from oldest to newest.'),
2251
'timezone',
1615
Option('timezone',
1616
type=str,
1617
help='Display timezone as local, original, or utc.'),
2252
1618
custom_help('verbose',
2253
1619
help='Show files changed in each revision.'),
2254
1620
'show-ids',
2255
1621
'revision',
2256
Option('change',
2257
type=bzrlib.option._parse_revision_str,
2258
short_name='c',
2259
help='Show just the specified revision.'
2260
' See also "help revisionspec".'),
2261
1622
'log-format',
2262
Option('levels',
2263
short_name='n',
2264
help='Number of levels to display - 0 for all, 1 for flat.',
2265
argname='N',
2266
type=_parse_levels),
2267
1623
Option('message',
2268
1624
short_name='m',
2269
1625
help='Show revisions whose message matches this '
2274
1630
help='Limit the output to the first N revisions.',
2275
1631
argname='N',
2276
1632
type=_parse_limit),
2277
Option('show-diff',
2278
short_name='p',
2279
help='Show changes made in each revision as a patch.'),
2280
Option('include-merges',
2281
help='Show merged revisions like --levels 0 does.'),
2282
Option('exclude-common-ancestry',
2283
help='Display only the revisions that are not part'
2284
' of both ancestries (require -rX..Y)'
2285
)
2286
1633
]
2287
1634
encoding_type = 'replace'
2288
1635
2289
1636
@display_command
2290
def run(self, file_list=None, timezone='original',
1637
def run(self, location=None, timezone='original',
2291
1638
verbose=False,
2292
1639
show_ids=False,
2293
1640
forward=False,
2294
1641
revision=None,
2295
change=None,
2296
1642
log_format=None,
2297
levels=None,
2298
1643
message=None,
2299
limit=None,
2300
show_diff=False,
2301
include_merges=False,
2302
exclude_common_ancestry=False,
2303
):
2304
from bzrlib.log import (
2305
Logger,
2306
make_log_request_dict,
2307
_get_info_for_log_files,
2308
)
1644
limit=None):
1645
from bzrlib.log import show_log
2309
1646
direction = (forward and 'forward') or 'reverse'
2310
if (exclude_common_ancestry
2311
and (revision is None or len(revision) != 2)):
2312
raise errors.BzrCommandError(
2313
'--exclude-common-ancestry requires -r with two revisions')
2314
if include_merges:
2315
if levels is None:
2316
levels = 0
2317
else:
2318
raise errors.BzrCommandError(
2319
'--levels and --include-merges are mutually exclusive')
2320
2321
if change is not None:
2322
if len(change) > 1:
2323
raise errors.RangeInChangeOption()
2324
if revision is not None:
2325
raise errors.BzrCommandError(
2326
'--revision and --change are mutually exclusive')
2327
else:
2328
revision = change
2329
2330
file_ids = []
2331
filter_by_dir = False
2332
if file_list:
2333
# find the file ids to log and check for directory filtering
2334
b, file_info_list, rev1, rev2 = _get_info_for_log_files(
2335
revision, file_list, self.add_cleanup)
2336
for relpath, file_id, kind in file_info_list:
1647
1648
# log everything
1649
file_id = None
1650
if location:
1651
# find the file id to log:
1652
1653
tree, b, fp = bzrdir.BzrDir.open_containing_tree_or_branch(
1654
location)
1655
if fp != '':
1656
if tree is None:
1657
tree = b.basis_tree()
1658
file_id = tree.path2id(fp)
2337
1659
if file_id is None:
2338
1660
raise errors.BzrCommandError(
2339
"Path unknown at end or start of revision range: %s" %
2340
relpath)
2341
# If the relpath is the top of the tree, we log everything
2342
if relpath == '':
2343
file_ids = []
2344
break
2345
else:
2346
file_ids.append(file_id)
2347
filter_by_dir = filter_by_dir or (
2348
kind in ['directory', 'tree-reference'])
1661
"Path does not have any revision history: %s" %
1662
location)
2349
1663
else:
2350
# log everything
2351
# FIXME ? log the current subdir only RBC 20060203
1664
# local dir only
1665
# FIXME ? log the current subdir only RBC 20060203
2352
1666
if revision is not None \
2353
1667
and len(revision) > 0 and revision[0].get_branch():
2354
1668
location = revision[0].get_branch()
2356
1670
location = '.'
2357
1671
dir, relpath = bzrdir.BzrDir.open_containing(location)
2358
1672
b = dir.open_branch()
2359
self.add_cleanup(b.lock_read().unlock)
2360
rev1, rev2 = _get_revision_range(revision, b, self.name())
2361
2362
# Decide on the type of delta & diff filtering to use
2363
# TODO: add an --all-files option to make this configurable & consistent
2364
if not verbose:
2365
delta_type = None
2366
else:
2367
delta_type = 'full'
2368
if not show_diff:
2369
diff_type = None
2370
elif file_ids:
2371
diff_type = 'partial'
2372
else:
2373
diff_type = 'full'
2374
2375
# Build the log formatter
2376
if log_format is None:
2377
log_format = log.log_formatter_registry.get_default(b)
2378
# Make a non-encoding output to include the diffs - bug 328007
2379
unencoded_output = ui.ui_factory.make_output_stream(encoding_type='exact')
2380
lf = log_format(show_ids=show_ids, to_file=self.outf,
2381
to_exact_file=unencoded_output,
2382
show_timezone=timezone,
2383
delta_format=get_verbosity_level(),
2384
levels=levels,
2385
show_advice=levels is None)
2386
2387
# Choose the algorithm for doing the logging. It's annoying
2388
# having multiple code paths like this but necessary until
2389
# the underlying repository format is faster at generating
2390
# deltas or can provide everything we need from the indices.
2391
# The default algorithm - match-using-deltas - works for
2392
# multiple files and directories and is faster for small
2393
# amounts of history (200 revisions say). However, it's too
2394
# slow for logging a single file in a repository with deep
2395
# history, i.e. > 10K revisions. In the spirit of "do no
2396
# evil when adding features", we continue to use the
2397
# original algorithm - per-file-graph - for the "single
2398
# file that isn't a directory without showing a delta" case.
2399
partial_history = revision and b.repository._format.supports_chks
2400
match_using_deltas = (len(file_ids) != 1 or filter_by_dir
2401
or delta_type or partial_history)
2402
2403
# Build the LogRequest and execute it
2404
if len(file_ids) == 0:
2405
file_ids = None
2406
rqst = make_log_request_dict(
2407
direction=direction, specific_fileids=file_ids,
2408
start_revision=rev1, end_revision=rev2, limit=limit,
2409
message_search=message, delta_type=delta_type,
2410
diff_type=diff_type, _match_using_deltas=match_using_deltas,
2411
exclude_common_ancestry=exclude_common_ancestry,
2412
)
2413
Logger(b, rqst).show(lf)
2414
2415
2416
def _get_revision_range(revisionspec_list, branch, command_name):
2417
"""Take the input of a revision option and turn it into a revision range.
2418
2419
It returns RevisionInfo objects which can be used to obtain the rev_id's
2420
of the desired revisions. It does some user input validations.
2421
"""
2422
if revisionspec_list is None:
2423
rev1 = None
2424
rev2 = None
2425
elif len(revisionspec_list) == 1:
2426
rev1 = rev2 = revisionspec_list[0].in_history(branch)
2427
elif len(revisionspec_list) == 2:
2428
start_spec = revisionspec_list[0]
2429
end_spec = revisionspec_list[1]
2430
if end_spec.get_branch() != start_spec.get_branch():
2431
# b is taken from revision[0].get_branch(), and
2432
# show_log will use its revision_history. Having
2433
# different branches will lead to weird behaviors.
2434
raise errors.BzrCommandError(
2435
"bzr %s doesn't accept two revisions in different"
2436
" branches." % command_name)
2437
if start_spec.spec is None:
2438
# Avoid loading all the history.
2439
rev1 = RevisionInfo(branch, None, None)
2440
else:
2441
rev1 = start_spec.in_history(branch)
2442
# Avoid loading all of history when we know a missing
2443
# end of range means the last revision ...
2444
if end_spec.spec is None:
2445
last_revno, last_revision_id = branch.last_revision_info()
2446
rev2 = RevisionInfo(branch, last_revno, last_revision_id)
2447
else:
2448
rev2 = end_spec.in_history(branch)
2449
else:
2450
raise errors.BzrCommandError(
2451
'bzr %s --revision takes one or two values.' % command_name)
2452
return rev1, rev2
2453
2454
2455
def _revision_range_to_revid_range(revision_range):
2456
rev_id1 = None
2457
rev_id2 = None
2458
if revision_range[0] is not None:
2459
rev_id1 = revision_range[0].rev_id
2460
if revision_range[1] is not None:
2461
rev_id2 = revision_range[1].rev_id
2462
return rev_id1, rev_id2
1673
1674
b.lock_read()
1675
try:
1676
if revision is None:
1677
rev1 = None
1678
rev2 = None
1679
elif len(revision) == 1:
1680
rev1 = rev2 = revision[0].in_history(b)
1681
elif len(revision) == 2:
1682
if revision[1].get_branch() != revision[0].get_branch():
1683
# b is taken from revision[0].get_branch(), and
1684
# show_log will use its revision_history. Having
1685
# different branches will lead to weird behaviors.
1686
raise errors.BzrCommandError(
1687
"Log doesn't accept two revisions in different"
1688
" branches.")
1689
rev1 = revision[0].in_history(b)
1690
rev2 = revision[1].in_history(b)
1691
else:
1692
raise errors.BzrCommandError(
1693
'bzr log --revision takes one or two values.')
1694
1695
if log_format is None:
1696
log_format = log.log_formatter_registry.get_default(b)
1697
1698
lf = log_format(show_ids=show_ids, to_file=self.outf,
1699
show_timezone=timezone)
1700
1701
show_log(b,
1702
lf,
1703
file_id,
1704
verbose=verbose,
1705
direction=direction,
1706
start_revision=rev1,
1707
end_revision=rev2,
1708
search=message,
1709
limit=limit)
1710
finally:
1711
b.unlock()
1712
2463
1713
2464
1714
def get_log_format(long=False, short=False, line=False, default='long'):
2465
1715
log_format = default
2473
1723
2474
1724
2475
1725
class cmd_touching_revisions(Command):
2476
__doc__ = """Return revision-ids which affected a particular file.
1726
"""Return revision-ids which affected a particular file.
2477
1727
2478
1728
A more user-friendly interface is "bzr log FILE".
2479
1729
"""
2484
1734
@display_command
2485
1735
def run(self, filename):
2486
1736
tree, relpath = WorkingTree.open_containing(filename)
1737
b = tree.branch
2487
1738
file_id = tree.path2id(relpath)
2488
b = tree.branch
2489
self.add_cleanup(b.lock_read().unlock)
2490
touching_revs = log.find_touching_revisions(b, file_id)
2491
for revno, revision_id, what in touching_revs:
1739
for revno, revision_id, what in log.find_touching_revisions(b, file_id):
2492
1740
self.outf.write("%6d %s\n" % (revno, what))
2493
1741
2494
1742
2495
1743
class cmd_ls(Command):
2496
__doc__ = """List files in a tree.
1744
"""List files in a tree.
2497
1745
"""
2498
1746
2499
1747
_see_also = ['status', 'cat']
2500
1748
takes_args = ['path?']
1749
# TODO: Take a revision or remote path and list that tree instead.
2501
1750
takes_options = [
2502
1751
'verbose',
2503
1752
'revision',
2504
Option('recursive', short_name='R',
2505
help='Recurse into subdirectories.'),
1753
Option('non-recursive',
1754
help='Don\'t recurse into subdirectories.'),
2506
1755
Option('from-root',
2507
1756
help='Print paths relative to the root of the branch.'),
2508
1757
Option('unknown', help='Print unknown files.'),
2519
1768
]
2520
1769
@display_command
2521
1770
def run(self, revision=None, verbose=False,
2522
recursive=False, from_root=False,
1771
non_recursive=False, from_root=False,
2523
1772
unknown=False, versioned=False, ignored=False,
2524
1773
null=False, kind=None, show_ids=False, path=None):
2525
1774
2534
1783
2535
1784
if path is None:
2536
1785
fs_path = '.'
1786
prefix = ''
2537
1787
else:
2538
1788
if from_root:
2539
1789
raise errors.BzrCommandError('cannot specify both --from-root'
2540
1790
' and PATH')
2541
1791
fs_path = path
1792
prefix = path
2542
1793
tree, branch, relpath = bzrdir.BzrDir.open_containing_tree_or_branch(
2543
1794
fs_path)
2544
2545
# Calculate the prefix to use
2546
prefix = None
2547
1795
if from_root:
2548
if relpath:
2549
prefix = relpath + '/'
2550
elif fs_path != '.' and not fs_path.endswith('/'):
2551
prefix = fs_path + '/'
2552
2553
if revision is not None or tree is None:
2554
tree = _get_one_revision_tree('ls', revision, branch=branch)
2555
2556
apply_view = False
2557
if isinstance(tree, WorkingTree) and tree.supports_views():
2558
view_files = tree.views.lookup_view()
2559
if view_files:
2560
apply_view = True
2561
view_str = views.view_display_str(view_files)
2562
note("Ignoring files outside view. View is %s" % view_str)
2563
2564
self.add_cleanup(tree.lock_read().unlock)
2565
for fp, fc, fkind, fid, entry in tree.list_files(include_root=False,
2566
from_dir=relpath, recursive=recursive):
2567
# Apply additional masking
2568
if not all and not selection[fc]:
2569
continue
2570
if kind is not None and fkind != kind:
2571
continue
2572
if apply_view:
2573
try:
2574
if relpath:
2575
fullpath = osutils.pathjoin(relpath, fp)
2576
else:
2577
fullpath = fp
2578
views.check_path_in_view(tree, fullpath)
2579
except errors.FileOutsideView:
2580
continue
2581
2582
# Output the entry
2583
if prefix:
2584
fp = osutils.pathjoin(prefix, fp)
2585
kindch = entry.kind_character()
2586
outstring = fp + kindch
2587
ui.ui_factory.clear_term()
2588
if verbose:
2589
outstring = '%-8s %s' % (fc, outstring)
2590
if show_ids and fid is not None:
2591
outstring = "%-50s %s" % (outstring, fid)
2592
self.outf.write(outstring + '\n')
2593
elif null:
2594
self.outf.write(fp + '\0')
2595
if show_ids:
2596
if fid is not None:
2597
self.outf.write(fid)
2598
self.outf.write('\0')
2599
self.outf.flush()
2600
else:
2601
if show_ids:
2602
if fid is not None:
2603
my_id = fid
2604
else:
2605
my_id = ''
2606
self.outf.write('%-50s %s\n' % (outstring, my_id))
2607
else:
2608
self.outf.write(outstring + '\n')
1796
relpath = u''
1797
elif relpath:
1798
relpath += '/'
1799
if revision is not None:
1800
tree = branch.repository.revision_tree(
1801
revision[0].as_revision_id(branch))
1802
elif tree is None:
1803
tree = branch.basis_tree()
1804
1805
tree.lock_read()
1806
try:
1807
for fp, fc, fkind, fid, entry in tree.list_files(include_root=False):
1808
if fp.startswith(relpath):
1809
fp = osutils.pathjoin(prefix, fp[len(relpath):])
1810
if non_recursive and '/' in fp:
1811
continue
1812
if not all and not selection[fc]:
1813
continue
1814
if kind is not None and fkind != kind:
1815
continue
1816
if verbose:
1817
kindch = entry.kind_character()
1818
outstring = '%-8s %s%s' % (fc, fp, kindch)
1819
if show_ids and fid is not None:
1820
outstring = "%-50s %s" % (outstring, fid)
1821
self.outf.write(outstring + '\n')
1822
elif null:
1823
self.outf.write(fp + '\0')
1824
if show_ids:
1825
if fid is not None:
1826
self.outf.write(fid)
1827
self.outf.write('\0')
1828
self.outf.flush()
1829
else:
1830
if fid is not None:
1831
my_id = fid
1832
else:
1833
my_id = ''
1834
if show_ids:
1835
self.outf.write('%-50s %s\n' % (fp, my_id))
1836
else:
1837
self.outf.write(fp + '\n')
1838
finally:
1839
tree.unlock()
2609
1840
2610
1841
2611
1842
class cmd_unknowns(Command):
2612
__doc__ = """List unknown files.
1843
"""List unknown files.
2613
1844
"""
2614
1845
2615
1846
hidden = True
2622
1853
2623
1854
2624
1855
class cmd_ignore(Command):
2625
__doc__ = """Ignore specified files or patterns.
1856
"""Ignore specified files or patterns.
2626
1857
2627
1858
See ``bzr help patterns`` for details on the syntax of patterns.
2628
1859
2629
If a .bzrignore file does not exist, the ignore command
2630
will create one and add the specified files or patterns to the newly
2631
created file. The ignore command will also automatically add the
2632
.bzrignore file to be versioned. Creating a .bzrignore file without
2633
the use of the ignore command will require an explicit add command.
2634
2635
1860
To remove patterns from the ignore list, edit the .bzrignore file.
2636
1861
After adding, editing or deleting that file either indirectly by
2637
1862
using this command or directly by using an editor, be sure to commit
2638
1863
it.
2639
2640
Bazaar also supports a global ignore file ~/.bazaar/ignore. On Windows
2641
the global ignore file can be found in the application data directory as
2642
C:\\Documents and Settings\\<user>\\Application Data\\Bazaar\\2.0\\ignore.
2643
Global ignores are not touched by this command. The global ignore file
2644
can be edited directly using an editor.
2645
2646
Patterns prefixed with '!' are exceptions to ignore patterns and take
2647
precedence over regular ignores. Such exceptions are used to specify
2648
files that should be versioned which would otherwise be ignored.
2649
2650
Patterns prefixed with '!!' act as regular ignore patterns, but have
2651
precedence over the '!' exception patterns.
2652
2653
Note: ignore patterns containing shell wildcards must be quoted from
1864
1865
Note: ignore patterns containing shell wildcards must be quoted from
2654
1866
the shell on Unix.
2655
1867
2656
1868
:Examples:
2658
1870
2659
1871
bzr ignore ./Makefile
2660
1872
2661
Ignore .class files in all directories...::
1873
Ignore class files in all directories::
2662
1874
2663
1875
bzr ignore "*.class"
2664
1876
2665
...but do not ignore "special.class"::
2666
2667
bzr ignore "!special.class"
2668
2669
1877
Ignore .o files under the lib directory::
2670
1878
2671
1879
bzr ignore "lib/**/*.o"
2677
1885
Ignore everything but the "debian" toplevel directory::
2678
1886
2679
1887
bzr ignore "RE:(?!debian/).*"
2680
2681
Ignore everything except the "local" toplevel directory,
2682
but always ignore "*~" autosave files, even under local/::
2683
2684
bzr ignore "*"
2685
bzr ignore "!./local"
2686
bzr ignore "!!*~"
2687
1888
"""
2688
1889
2689
1890
_see_also = ['status', 'ignored', 'patterns']
2690
1891
takes_args = ['name_pattern*']
2691
1892
takes_options = [
2692
Option('default-rules',
2693
help='Display the default ignore rules that bzr uses.')
1893
Option('old-default-rules',
1894
help='Write out the ignore rules bzr < 0.9 always used.')
2694
1895
]
2695
2696
def run(self, name_pattern_list=None, default_rules=None):
1896
1897
def run(self, name_pattern_list=None, old_default_rules=None):
2697
1898
from bzrlib import ignores
2698
if default_rules is not None:
2699
# dump the default rules and exit
2700
for pattern in ignores.USER_DEFAULTS:
2701
self.outf.write("%s\n" % pattern)
1899
if old_default_rules is not None:
1900
# dump the rules and exit
1901
for pattern in ignores.OLD_DEFAULTS:
1902
print pattern
2702
1903
return
2703
1904
if not name_pattern_list:
2704
1905
raise errors.BzrCommandError("ignore requires at least one "
2705
"NAME_PATTERN or --default-rules.")
2706
name_pattern_list = [globbing.normalize_pattern(p)
1906
"NAME_PATTERN or --old-default-rules")
1907
name_pattern_list = [globbing.normalize_pattern(p)
2707
1908
for p in name_pattern_list]
2708
1909
for name_pattern in name_pattern_list:
2709
if (name_pattern[0] == '/' or
1910
if (name_pattern[0] == '/' or
2710
1911
(len(name_pattern) > 1 and name_pattern[1] == ':')):
2711
1912
raise errors.BzrCommandError(
2712
1913
"NAME_PATTERN should not be an absolute path")
2720
1921
if id is not None:
2721
1922
filename = entry[0]
2722
1923
if ignored.match(filename):
2723
matches.append(filename)
1924
matches.append(filename.encode('utf-8'))
2724
1925
tree.unlock()
2725
1926
if len(matches) > 0:
2726
self.outf.write("Warning: the following files are version controlled and"
2727
" match your ignore pattern:\n%s"
2728
"\nThese files will continue to be version controlled"
2729
" unless you 'bzr remove' them.\n" % ("\n".join(matches),))
2730
1927
print "Warning: the following files are version controlled and" \
1928
" match your ignore pattern:\n%s" % ("\n".join(matches),)
2731
1929
2732
1930
class cmd_ignored(Command):
2733
__doc__ = """List ignored files and the patterns that matched them.
2734
2735
List all the ignored files and the ignore pattern that caused the file to
2736
be ignored.
2737
2738
Alternatively, to list just the files::
2739
2740
bzr ls --ignored
1931
"""List ignored files and the patterns that matched them.
2741
1932
"""
2742
1933
2743
1934
encoding_type = 'replace'
2744
_see_also = ['ignore', 'ls']
1935
_see_also = ['ignore']
2745
1936
2746
1937
@display_command
2747
1938
def run(self):
2748
1939
tree = WorkingTree.open_containing(u'.')[0]
2749
self.add_cleanup(tree.lock_read().unlock)
2750
for path, file_class, kind, file_id, entry in tree.list_files():
2751
if file_class != 'I':
2752
continue
2753
## XXX: Slightly inefficient since this was already calculated
2754
pat = tree.is_ignored(path)
2755
self.outf.write('%-50s %s\n' % (path, pat))
1940
tree.lock_read()
1941
try:
1942
for path, file_class, kind, file_id, entry in tree.list_files():
1943
if file_class != 'I':
1944
continue
1945
## XXX: Slightly inefficient since this was already calculated
1946
pat = tree.is_ignored(path)
1947
self.outf.write('%-50s %s\n' % (path, pat))
1948
finally:
1949
tree.unlock()
2756
1950
2757
1951
2758
1952
class cmd_lookup_revision(Command):
2759
__doc__ = """Lookup the revision-id from a revision-number
1953
"""Lookup the revision-id from a revision-number
2760
1954
2761
1955
:Examples:
2762
1956
bzr lookup-revision 33
2763
1957
"""
2764
1958
hidden = True
2765
1959
takes_args = ['revno']
2766
1960
2767
1961
@display_command
2768
1962
def run(self, revno):
2769
1963
try:
2770
1964
revno = int(revno)
2771
1965
except ValueError:
2772
raise errors.BzrCommandError("not a valid revision-number: %r"
2773
% revno)
2774
revid = WorkingTree.open_containing(u'.')[0].branch.get_rev_id(revno)
2775
self.outf.write("%s\n" % revid)
1966
raise errors.BzrCommandError("not a valid revision-number: %r" % revno)
1967
1968
print WorkingTree.open_containing(u'.')[0].branch.get_rev_id(revno)
2776
1969
2777
1970
2778
1971
class cmd_export(Command):
2779
__doc__ = """Export current or past revision to a destination directory or archive.
1972
"""Export current or past revision to a destination directory or archive.
2780
1973
2781
1974
If no revision is specified this exports the last committed revision.
2782
1975
2803
1996
zip .zip
2804
1997
================= =========================
2805
1998
"""
2806
takes_args = ['dest', 'branch_or_subdir?']
1999
takes_args = ['dest', 'branch?']
2807
2000
takes_options = [
2808
2001
Option('format',
2809
2002
help="Type of file to export to.",
2810
2003
type=unicode),
2811
2004
'revision',
2812
Option('filters', help='Apply content filters to export the '
2813
'convenient form.'),
2814
2005
Option('root',
2815
2006
type=str,
2816
2007
help="Name of the root directory inside the exported file."),
2817
Option('per-file-timestamps',
2818
help='Set modification time of files to that of the last '
2819
'revision in which it was changed.'),
2820
2008
]
2821
def run(self, dest, branch_or_subdir=None, revision=None, format=None,
2822
root=None, filters=False, per_file_timestamps=False):
2009
def run(self, dest, branch=None, revision=None, format=None, root=None):
2823
2010
from bzrlib.export import export
2824
2011
2825
if branch_or_subdir is None:
2012
if branch is None:
2826
2013
tree = WorkingTree.open_containing(u'.')[0]
2827
2014
b = tree.branch
2828
subdir = None
2829
else:
2830
b, subdir = Branch.open_containing(branch_or_subdir)
2831
tree = None
2832
2833
rev_tree = _get_one_revision_tree('export', revision, branch=b, tree=tree)
2015
else:
2016
b = Branch.open(branch)
2017
2018
if revision is None:
2019
# should be tree.last_revision FIXME
2020
rev_id = b.last_revision()
2021
else:
2022
if len(revision) != 1:
2023
raise errors.BzrCommandError('bzr export --revision takes exactly 1 argument')
2024
rev_id = revision[0].as_revision_id(b)
2025
t = b.repository.revision_tree(rev_id)
2834
2026
try:
2835
export(rev_tree, dest, format, root, subdir, filtered=filters,
2836
per_file_timestamps=per_file_timestamps)
2027
export(t, dest, format, root)
2837
2028
except errors.NoSuchExportFormat, e:
2838
2029
raise errors.BzrCommandError('Unsupported export format: %s' % e.format)
2839
2030
2840
2031
2841
2032
class cmd_cat(Command):
2842
__doc__ = """Write the contents of a file as of a given revision to standard output.
2033
"""Write the contents of a file as of a given revision to standard output.
2843
2034
2844
2035
If no revision is nominated, the last revision is used.
2845
2036
2846
2037
Note: Take care to redirect standard output when using this command on a
2847
binary file.
2038
binary file.
2848
2039
"""
2849
2040
2850
2041
_see_also = ['ls']
2851
2042
takes_options = [
2852
2043
Option('name-from-revision', help='The path name in the old tree.'),
2853
Option('filters', help='Apply content filters to display the '
2854
'convenience form.'),
2855
2044
'revision',
2856
2045
]
2857
2046
takes_args = ['filename']
2858
2047
encoding_type = 'exact'
2859
2048
2860
2049
@display_command
2861
def run(self, filename, revision=None, name_from_revision=False,
2862
filters=False):
2050
def run(self, filename, revision=None, name_from_revision=False):
2863
2051
if revision is not None and len(revision) != 1:
2864
2052
raise errors.BzrCommandError("bzr cat --revision takes exactly"
2865
2053
" one revision specifier")
2866
2054
tree, branch, relpath = \
2867
2055
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
2868
self.add_cleanup(branch.lock_read().unlock)
2869
return self._run(tree, branch, relpath, filename, revision,
2870
name_from_revision, filters)
2056
branch.lock_read()
2057
try:
2058
return self._run(tree, branch, relpath, filename, revision,
2059
name_from_revision)
2060
finally:
2061
branch.unlock()
2871
2062
2872
def _run(self, tree, b, relpath, filename, revision, name_from_revision,
2873
filtered):
2063
def _run(self, tree, b, relpath, filename, revision, name_from_revision):
2874
2064
if tree is None:
2875
2065
tree = b.basis_tree()
2876
rev_tree = _get_one_revision_tree('cat', revision, branch=b)
2877
self.add_cleanup(rev_tree.lock_read().unlock)
2066
if revision is None:
2067
revision_id = b.last_revision()
2068
else:
2069
revision_id = revision[0].as_revision_id(b)
2878
2070
2071
cur_file_id = tree.path2id(relpath)
2072
rev_tree = b.repository.revision_tree(revision_id)
2879
2073
old_file_id = rev_tree.path2id(relpath)
2880
2074
2881
2075
if name_from_revision:
2882
# Try in revision if requested
2883
2076
if old_file_id is None:
2884
raise errors.BzrCommandError(
2885
"%r is not present in revision %s" % (
2886
filename, rev_tree.get_revision_id()))
2077
raise errors.BzrCommandError("%r is not present in revision %s"
2078
% (filename, revision_id))
2887
2079
else:
2888
2080
content = rev_tree.get_file_text(old_file_id)
2889
else:
2890
cur_file_id = tree.path2id(relpath)
2891
found = False
2892
if cur_file_id is not None:
2893
# Then try with the actual file id
2894
try:
2895
content = rev_tree.get_file_text(cur_file_id)
2896
found = True
2897
except errors.NoSuchId:
2898
# The actual file id didn't exist at that time
2899
pass
2900
if not found and old_file_id is not None:
2901
# Finally try with the old file id
2902
content = rev_tree.get_file_text(old_file_id)
2903
found = True
2904
if not found:
2905
# Can't be found anywhere
2906
raise errors.BzrCommandError(
2907
"%r is not present in revision %s" % (
2908
filename, rev_tree.get_revision_id()))
2909
if filtered:
2910
from bzrlib.filters import (
2911
ContentFilterContext,
2912
filtered_output_bytes,
2913
)
2914
filters = rev_tree._content_filter_stack(relpath)
2915
chunks = content.splitlines(True)
2916
content = filtered_output_bytes(chunks, filters,
2917
ContentFilterContext(relpath, rev_tree))
2918
self.cleanup_now()
2919
self.outf.writelines(content)
2920
else:
2921
self.cleanup_now()
2922
self.outf.write(content)
2081
elif cur_file_id is not None:
2082
content = rev_tree.get_file_text(cur_file_id)
2083
elif old_file_id is not None:
2084
content = rev_tree.get_file_text(old_file_id)
2085
else:
2086
raise errors.BzrCommandError("%r is not present in revision %s" %
2087
(filename, revision_id))
2088
self.outf.write(content)
2923
2089
2924
2090
2925
2091
class cmd_local_time_offset(Command):
2926
__doc__ = """Show the offset in seconds from GMT to local time."""
2927
hidden = True
2092
"""Show the offset in seconds from GMT to local time."""
2093
hidden = True
2928
2094
@display_command
2929
2095
def run(self):
2930
self.outf.write("%s\n" % osutils.local_time_offset())
2096
print osutils.local_time_offset()
2931
2097
2932
2098
2933
2099
2934
2100
class cmd_commit(Command):
2935
__doc__ = """Commit changes into a new revision.
2936
2937
An explanatory message needs to be given for each commit. This is
2938
often done by using the --message option (getting the message from the
2939
command line) or by using the --file option (getting the message from
2940
a file). If neither of these options is given, an editor is opened for
2941
the user to enter the message. To see the changed files in the
2942
boilerplate text loaded into the editor, use the --show-diff option.
2943
2944
By default, the entire tree is committed and the person doing the
2945
commit is assumed to be the author. These defaults can be overridden
2946
as explained below.
2947
2948
:Selective commits:
2949
2950
If selected files are specified, only changes to those files are
2951
committed. If a directory is specified then the directory and
2952
everything within it is committed.
2953
2954
When excludes are given, they take precedence over selected files.
2955
For example, to commit only changes within foo, but not changes
2956
within foo/bar::
2957
2958
bzr commit foo -x foo/bar
2959
2960
A selective commit after a merge is not yet supported.
2961
2962
:Custom authors:
2963
2964
If the author of the change is not the same person as the committer,
2965
you can specify the author's name using the --author option. The
2966
name should be in the same format as a committer-id, e.g.
2967
"John Doe <jdoe@example.com>". If there is more than one author of
2968
the change you can specify the option multiple times, once for each
2969
author.
2970
2971
:Checks:
2972
2973
A common mistake is to forget to add a new file or directory before
2974
running the commit command. The --strict option checks for unknown
2975
files and aborts the commit if any are found. More advanced pre-commit
2976
checks can be implemented by defining hooks. See ``bzr help hooks``
2977
for details.
2978
2979
:Things to note:
2980
2981
If you accidentially commit the wrong changes or make a spelling
2982
mistake in the commit message say, you can use the uncommit command
2983
to undo it. See ``bzr help uncommit`` for details.
2984
2985
Hooks can also be configured to run after a commit. This allows you
2986
to trigger updates to external systems like bug trackers. The --fixes
2987
option can be used to record the association between a revision and
2988
one or more bugs. See ``bzr help bugs`` for details.
2989
2990
A selective commit may fail in some cases where the committed
2991
tree would be invalid. Consider::
2992
2993
bzr init foo
2994
mkdir foo/bar
2995
bzr add foo/bar
2996
bzr commit foo -m "committing foo"
2997
bzr mv foo/bar foo/baz
2998
mkdir foo/bar
2999
bzr add foo/bar
3000
bzr commit foo/bar -m "committing bar but not baz"
3001
3002
In the example above, the last commit will fail by design. This gives
3003
the user the opportunity to decide whether they want to commit the
3004
rename at the same time, separately first, or not at all. (As a general
3005
rule, when in doubt, Bazaar has a policy of Doing the Safe Thing.)
2101
"""Commit changes into a new revision.
2102
2103
If no arguments are given, the entire tree is committed.
2104
2105
If selected files are specified, only changes to those files are
2106
committed. If a directory is specified then the directory and everything
2107
within it is committed.
2108
2109
If author of the change is not the same person as the committer, you can
2110
specify the author's name using the --author option. The name should be
2111
in the same format as a committer-id, e.g. "John Doe <jdoe@example.com>".
2112
2113
A selected-file commit may fail in some cases where the committed
2114
tree would be invalid. Consider::
2115
2116
bzr init foo
2117
mkdir foo/bar
2118
bzr add foo/bar
2119
bzr commit foo -m "committing foo"
2120
bzr mv foo/bar foo/baz
2121
mkdir foo/bar
2122
bzr add foo/bar
2123
bzr commit foo/bar -m "committing bar but not baz"
2124
2125
In the example above, the last commit will fail by design. This gives
2126
the user the opportunity to decide whether they want to commit the
2127
rename at the same time, separately first, or not at all. (As a general
2128
rule, when in doubt, Bazaar has a policy of Doing the Safe Thing.)
2129
2130
Note: A selected-file commit after a merge is not yet supported.
3006
2131
"""
3007
2132
# TODO: Run hooks on tree to-be-committed, and after commit.
3008
2133
3013
2138
3014
2139
# XXX: verbose currently does nothing
3015
2140
3016
_see_also = ['add', 'bugs', 'hooks', 'uncommit']
2141
_see_also = ['bugs', 'uncommit']
3017
2142
takes_args = ['selected*']
3018
2143
takes_options = [
3019
ListOption('exclude', type=str, short_name='x',
3020
help="Do not consider changes made to a given path."),
3021
2144
Option('message', type=unicode,
3022
2145
short_name='m',
3023
2146
help="Description of the new revision."),
3031
2154
Option('strict',
3032
2155
help="Refuse to commit if there are unknown "
3033
2156
"files in the working tree."),
3034
Option('commit-time', type=str,
3035
help="Manually set a commit time using commit date "
3036
"format, e.g. '2009-10-10 08:00:00 +0100'."),
3037
2157
ListOption('fixes', type=str,
3038
help="Mark a bug as being fixed by this revision "
3039
"(see \"bzr help bugs\")."),
3040
ListOption('author', type=unicode,
2158
help="Mark a bug as being fixed by this revision."),
2159
Option('author', type=unicode,
3041
2160
help="Set the author's name, if it's different "
3042
2161
"from the committer."),
3043
2162
Option('local',
3046
2165
"the master branch until a normal commit "
3047
2166
"is performed."
3048
2167
),
3049
Option('show-diff', short_name='p',
3050
help='When no message is supplied, show the diff along'
3051
' with the status summary in the message editor.'),
2168
Option('show-diff',
2169
help='When no message is supplied, show the diff along'
2170
' with the status summary in the message editor.'),
3052
2171
]
3053
2172
aliases = ['ci', 'checkin']
3054
2173
3055
def _iter_bug_fix_urls(self, fixes, branch):
2174
def _get_bug_fix_properties(self, fixes, branch):
2175
properties = []
3056
2176
# Configure the properties for bug fixing attributes.
3057
2177
for fixed_bug in fixes:
3058
2178
tokens = fixed_bug.split(':')
3059
2179
if len(tokens) != 2:
3060
2180
raise errors.BzrCommandError(
3061
"Invalid bug %s. Must be in the form of 'tracker:id'. "
3062
"See \"bzr help bugs\" for more information on this "
3063
"feature.\nCommit refused." % fixed_bug)
2181
"Invalid bug %s. Must be in the form of 'tag:id'. "
2182
"Commit refused." % fixed_bug)
3064
2183
tag, bug_id = tokens
3065
2184
try:
3066
yield bugtracker.get_bug_url(tag, branch, bug_id)
2185
bug_url = bugtracker.get_bug_url(tag, branch, bug_id)
3067
2186
except errors.UnknownBugTrackerAbbreviation:
3068
2187
raise errors.BzrCommandError(
3069
2188
'Unrecognized bug %s. Commit refused.' % fixed_bug)
3070
except errors.MalformedBugIdentifier, e:
2189
except errors.MalformedBugIdentifier:
3071
2190
raise errors.BzrCommandError(
3072
"%s\nCommit refused." % (str(e),))
2191
"Invalid bug identifier for %s. Commit refused."
2192
% fixed_bug)
2193
properties.append('%s fixed' % bug_url)
2194
return '\n'.join(properties)
3073
2195
3074
2196
def run(self, message=None, file=None, verbose=False, selected_list=None,
3075
2197
unchanged=False, strict=False, local=False, fixes=None,
3076
author=None, show_diff=False, exclude=None, commit_time=None):
2198
author=None, show_diff=False):
3077
2199
from bzrlib.errors import (
3078
2200
PointlessCommit,
3079
2201
ConflictsInTree,
3081
2203
)
3082
2204
from bzrlib.msgeditor import (
3083
2205
edit_commit_message_encoded,
3084
generate_commit_message_template,
3085
2206
make_commit_message_template_encoded
3086
2207
)
3087
2208
3088
commit_stamp = offset = None
3089
if commit_time is not None:
3090
try:
3091
commit_stamp, offset = timestamp.parse_patch_date(commit_time)
3092
except ValueError, e:
3093
raise errors.BzrCommandError(
3094
"Could not parse --commit-time: " + str(e))
3095
3096
2209
# TODO: Need a blackbox test for invoking the external editor; may be
3097
2210
# slightly problematic to run this cross-platform.
3098
2211
3099
# TODO: do more checks that the commit will succeed before
2212
# TODO: do more checks that the commit will succeed before
3100
2213
# spending the user's valuable time typing a commit message.
3101
2214
3102
2215
properties = {}
3110
2223
3111
2224
if fixes is None:
3112
2225
fixes = []
3113
bug_property = bugtracker.encode_fixes_bug_urls(
3114
self._iter_bug_fix_urls(fixes, tree.branch))
2226
bug_property = self._get_bug_fix_properties(fixes, tree.branch)
3115
2227
if bug_property:
3116
2228
properties['bugs'] = bug_property
3117
2229
3118
2230
if local and not tree.branch.get_bound_location():
3119
2231
raise errors.LocalRequiresBoundBranch()
3120
2232
3121
if message is not None:
3122
try:
3123
file_exists = osutils.lexists(message)
3124
except UnicodeError:
3125
# The commit message contains unicode characters that can't be
3126
# represented in the filesystem encoding, so that can't be a
3127
# file.
3128
file_exists = False
3129
if file_exists:
3130
warning_msg = (
3131
'The commit message is a file name: "%(f)s".\n'
3132
'(use --file "%(f)s" to take commit message from that file)'
3133
% { 'f': message })
3134
ui.ui_factory.show_warning(warning_msg)
3135
if '\r' in message:
3136
message = message.replace('\r\n', '\n')
3137
message = message.replace('\r', '\n')
3138
if file:
3139
raise errors.BzrCommandError(
3140
"please specify either --message or --file")
3141
3142
2233
def get_message(commit_obj):
3143
2234
"""Callback to get commit message"""
3144
if file:
3145
my_message = codecs.open(
3146
file, 'rt', osutils.get_user_encoding()).read()
3147
elif message is not None:
3148
my_message = message
3149
else:
3150
# No message supplied: make one up.
3151
# text is the status of the tree
3152
text = make_commit_message_template_encoded(tree,
2235
my_message = message
2236
if my_message is None and not file:
2237
t = make_commit_message_template_encoded(tree,
3153
2238
selected_list, diff=show_diff,
3154
output_encoding=osutils.get_user_encoding())
3155
# start_message is the template generated from hooks
3156
# XXX: Warning - looks like hooks return unicode,
3157
# make_commit_message_template_encoded returns user encoding.
3158
# We probably want to be using edit_commit_message instead to
3159
# avoid this.
3160
start_message = generate_commit_message_template(commit_obj)
3161
my_message = edit_commit_message_encoded(text,
3162
start_message=start_message)
2239
output_encoding=bzrlib.user_encoding)
2240
my_message = edit_commit_message_encoded(t)
3163
2241
if my_message is None:
3164
2242
raise errors.BzrCommandError("please specify a commit"
3165
2243
" message with either --message or --file")
2244
elif my_message and file:
2245
raise errors.BzrCommandError(
2246
"please specify either --message or --file")
2247
if file:
2248
my_message = codecs.open(file, 'rt',
2249
bzrlib.user_encoding).read()
3166
2250
if my_message == "":
3167
2251
raise errors.BzrCommandError("empty commit message specified")
3168
2252
return my_message
3169
2253
3170
# The API permits a commit with a filter of [] to mean 'select nothing'
3171
# but the command line should not do that.
3172
if not selected_list:
3173
selected_list = None
3174
2254
try:
3175
2255
tree.commit(message_callback=get_message,
3176
2256
specific_files=selected_list,
3177
2257
allow_pointless=unchanged, strict=strict, local=local,
3178
2258
reporter=None, verbose=verbose, revprops=properties,
3179
authors=author, timestamp=commit_stamp,
3180
timezone=offset,
3181
exclude=safe_relpath_files(tree, exclude))
2259
author=author)
3182
2260
except PointlessCommit:
3183
raise errors.BzrCommandError("No changes to commit."
3184
" Use --unchanged to commit anyhow.")
2261
# FIXME: This should really happen before the file is read in;
2262
# perhaps prepare the commit; get the message; then actually commit
2263
raise errors.BzrCommandError("no changes to commit."
2264
" use --unchanged to commit anyhow")
3185
2265
except ConflictsInTree:
3186
2266
raise errors.BzrCommandError('Conflicts detected in working '
3187
2267
'tree. Use "bzr conflicts" to list, "bzr resolve FILE" to'
3190
2270
raise errors.BzrCommandError("Commit refused because there are"
3191
2271
" unknown files in the working tree.")
3192
2272
except errors.BoundBranchOutOfDate, e:
3193
e.extra_help = ("\n"
3194
'To commit to master branch, run update and then commit.\n'
3195
'You can also pass --local to commit to continue working '
3196
'disconnected.')
3197
raise
2273
raise errors.BzrCommandError(str(e) + "\n"
2274
'To commit to master branch, run update and then commit.\n'
2275
'You can also pass --local to commit to continue working '
2276
'disconnected.')
3198
2277
3199
2278
3200
2279
class cmd_check(Command):
3201
__doc__ = """Validate working tree structure, branch consistency and repository history.
2280
"""Validate working tree structure, branch consistency and repository
2281
history.
3202
2282
3203
2283
This command checks various invariants about branch and repository storage
3204
2284
to detect data corruption or bzr bugs.
3206
2286
The working tree and branch checks will only give output if a problem is
3207
2287
detected. The output fields of the repository check are:
3208
2288
3209
revisions
3210
This is just the number of revisions checked. It doesn't
3211
indicate a problem.
3212
3213
versionedfiles
3214
This is just the number of versionedfiles checked. It
3215
doesn't indicate a problem.
3216
3217
unreferenced ancestors
3218
Texts that are ancestors of other texts, but
3219
are not properly referenced by the revision ancestry. This is a
3220
subtle problem that Bazaar can work around.
3221
3222
unique file texts
3223
This is the total number of unique file contents
3224
seen in the checked revisions. It does not indicate a problem.
3225
3226
repeated file texts
3227
This is the total number of repeated texts seen
3228
in the checked revisions. Texts can be repeated when their file
3229
entries are modified, but the file contents are not. It does not
3230
indicate a problem.
3231
3232
If no restrictions are specified, all Bazaar data that is found at the given
3233
location will be checked.
3234
3235
:Examples:
3236
3237
Check the tree and branch at 'foo'::
3238
3239
bzr check --tree --branch foo
3240
3241
Check only the repository at 'bar'::
3242
3243
bzr check --repo bar
3244
3245
Check everything at 'baz'::
3246
3247
bzr check baz
2289
revisions: This is just the number of revisions checked. It doesn't
2290
indicate a problem.
2291
versionedfiles: This is just the number of versionedfiles checked. It
2292
doesn't indicate a problem.
2293
unreferenced ancestors: Texts that are ancestors of other texts, but
2294
are not properly referenced by the revision ancestry. This is a
2295
subtle problem that Bazaar can work around.
2296
unique file texts: This is the total number of unique file contents
2297
seen in the checked revisions. It does not indicate a problem.
2298
repeated file texts: This is the total number of repeated texts seen
2299
in the checked revisions. Texts can be repeated when their file
2300
entries are modified, but the file contents are not. It does not
2301
indicate a problem.
3248
2302
"""
3249
2303
3250
2304
_see_also = ['reconcile']
3251
2305
takes_args = ['path?']
3252
takes_options = ['verbose',
3253
Option('branch', help="Check the branch related to the"
3254
" current directory."),
3255
Option('repo', help="Check the repository related to the"
3256
" current directory."),
3257
Option('tree', help="Check the working tree related to"
3258
" the current directory.")]
2306
takes_options = ['verbose']
3259
2307
3260
def run(self, path=None, verbose=False, branch=False, repo=False,
3261
tree=False):
2308
def run(self, path=None, verbose=False):
3262
2309
from bzrlib.check import check_dwim
3263
2310
if path is None:
3264
2311
path = '.'
3265
if not branch and not repo and not tree:
3266
branch = repo = tree = True
3267
check_dwim(path, verbose, do_branch=branch, do_repo=repo, do_tree=tree)
2312
check_dwim(path, verbose)
3268
2313
3269
2314
3270
2315
class cmd_upgrade(Command):
3271
__doc__ = """Upgrade branch storage to current format.
2316
"""Upgrade branch storage to current format.
3272
2317
3273
2318
The check command or bzr developers may sometimes advise you to run
3274
2319
this command. When the default format has changed you may also be warned
3281
2326
RegistryOption('format',
3282
2327
help='Upgrade to a specific format. See "bzr help'
3283
2328
' formats" for details.',
3284
lazy_registry=('bzrlib.bzrdir', 'format_registry'),
3285
converter=lambda name: bzrdir.format_registry.make_bzrdir(name),
2329
registry=bzrdir.format_registry,
2330
converter=bzrdir.format_registry.make_bzrdir,
3286
2331
value_switches=True, title='Branch format'),
3287
2332
]
3288
2333
3289
2334
def run(self, url='.', format=None):
3290
2335
from bzrlib.upgrade import upgrade
2336
if format is None:
2337
format = bzrdir.format_registry.make_bzrdir('default')
3291
2338
upgrade(url, format)
3292
2339
3293
2340
3294
2341
class cmd_whoami(Command):
3295
__doc__ = """Show or set bzr user id.
3296
2342
"""Show or set bzr user id.
2343
3297
2344
:Examples:
3298
2345
Show the email of the current user::
3299
2346
3311
2358
]
3312
2359
takes_args = ['name?']
3313
2360
encoding_type = 'replace'
3314
2361
3315
2362
@display_command
3316
2363
def run(self, email=False, branch=False, name=None):
3317
2364
if name is None:
3332
2379
except errors.NoEmailInUsername, e:
3333
2380
warning('"%s" does not seem to contain an email address. '
3334
2381
'This is allowed, but not recommended.', name)
3335
2382
3336
2383
# use global config unless --branch given
3337
2384
if branch:
3338
2385
c = Branch.open_containing('.')[0].get_config()
3342
2389
3343
2390
3344
2391
class cmd_nick(Command):
3345
__doc__ = """Print or set the branch nickname.
3346
3347
If unset, the tree root directory name is used as the nickname.
3348
To print the current nickname, execute with no argument.
3349
3350
Bound branches use the nickname of its master branch unless it is set
3351
locally.
2392
"""Print or set the branch nickname.
2393
2394
If unset, the tree root directory name is used as the nickname
2395
To print the current nickname, execute with no argument.
3352
2396
"""
3353
2397
3354
2398
_see_also = ['info']
3362
2406
3363
2407
@display_command
3364
2408
def printme(self, branch):
3365
self.outf.write('%s\n' % branch.nick)
2409
print branch.nick
3366
2410
3367
2411
3368
2412
class cmd_alias(Command):
3369
__doc__ = """Set/unset and display aliases.
2413
"""Set/unset and display aliases.
3370
2414
3371
2415
:Examples:
3372
2416
Show the current aliases::
3436
2480
3437
2481
3438
2482
class cmd_selftest(Command):
3439
__doc__ = """Run internal test suite.
3440
2483
"""Run internal test suite.
2484
3441
2485
If arguments are given, they are regular expressions that say which tests
3442
2486
should run. Tests matching any expression are run, and other tests are
3443
2487
not run.
3466
2510
modified by plugins will not be tested, and tests provided by plugins will
3467
2511
not be run.
3468
2512
3469
Tests that need working space on disk use a common temporary directory,
2513
Tests that need working space on disk use a common temporary directory,
3470
2514
typically inside $TMPDIR or /tmp.
3471
2515
3472
If you set BZR_TEST_PDB=1 when running selftest, failing tests will drop
3473
into a pdb postmortem session.
3474
3475
2516
:Examples:
3476
2517
Run only tests relating to 'ignore'::
3477
2518
3486
2527
def get_transport_type(typestring):
3487
2528
"""Parse and return a transport specifier."""
3488
2529
if typestring == "sftp":
3489
from bzrlib.tests import stub_sftp
3490
return stub_sftp.SFTPAbsoluteServer
2530
from bzrlib.transport.sftp import SFTPAbsoluteServer
2531
return SFTPAbsoluteServer
3491
2532
if typestring == "memory":
3492
from bzrlib.tests import test_server
3493
return memory.MemoryServer
2533
from bzrlib.transport.memory import MemoryServer
2534
return MemoryServer
3494
2535
if typestring == "fakenfs":
3495
from bzrlib.tests import test_server
3496
return test_server.FakeNFSServer
2536
from bzrlib.transport.fakenfs import FakeNFSServer
2537
return FakeNFSServer
3497
2538
msg = "No known transport type %s. Supported types are: sftp\n" %\
3498
2539
(typestring)
3499
2540
raise errors.BzrCommandError(msg)
3514
2555
Option('lsprof-timed',
3515
2556
help='Generate lsprof output for benchmarked'
3516
2557
' sections of code.'),
3517
Option('lsprof-tests',
3518
help='Generate lsprof output for each test.'),
3519
2558
Option('cache-dir', type=str,
3520
2559
help='Cache intermediate benchmark output in this '
3521
2560
'directory.'),
3525
2564
),
3526
2565
Option('list-only',
3527
2566
help='List the tests instead of running them.'),
3528
RegistryOption('parallel',
3529
help="Run the test suite in parallel.",
3530
lazy_registry=('bzrlib.tests', 'parallel_registry'),
3531
value_switches=False,
3532
),
3533
2567
Option('randomize', type=str, argname="SEED",
3534
2568
help='Randomize the order of tests using the given'
3535
2569
' seed or "now" for the current time.'),
3537
2571
short_name='x',
3538
2572
help='Exclude tests that match this regular'
3539
2573
' expression.'),
3540
Option('subunit',
3541
help='Output test progress via subunit.'),
3542
2574
Option('strict', help='Fail on missing dependencies or '
3543
2575
'known failures.'),
3544
2576
Option('load-list', type=str, argname='TESTLISTFILE',
3545
2577
help='Load a test id list from a text file.'),
3546
2578
ListOption('debugflag', type=str, short_name='E',
3547
2579
help='Turn on a selftest debug flag.'),
3548
ListOption('starting-with', type=str, argname='TESTID',
3549
param_name='starting_with', short_name='s',
3550
help=
3551
'Load only the tests starting with TESTID.'),
2580
Option('starting-with', type=str, argname='TESTID',
2581
short_name='s',
2582
help='Load only the tests starting with TESTID.'),
3552
2583
]
3553
2584
encoding_type = 'replace'
3554
2585
3555
def __init__(self):
3556
Command.__init__(self)
3557
self.additional_selftest_args = {}
3558
3559
2586
def run(self, testspecs_list=None, verbose=False, one=False,
3560
2587
transport=None, benchmark=None,
3561
2588
lsprof_timed=None, cache_dir=None,
3562
2589
first=False, list_only=False,
3563
2590
randomize=None, exclude=None, strict=False,
3564
load_list=None, debugflag=None, starting_with=None, subunit=False,
3565
parallel=None, lsprof_tests=False):
2591
load_list=None, debugflag=None, starting_with=None):
2592
import bzrlib.ui
3566
2593
from bzrlib.tests import selftest
3567
2594
import bzrlib.benchmarks as benchmarks
3568
2595
from bzrlib.benchmarks import tree_creator
3572
2599
3573
2600
if cache_dir is not None:
3574
2601
tree_creator.TreeCreator.CACHE_ROOT = osutils.abspath(cache_dir)
2602
if not list_only:
2603
print 'testing: %s' % (osutils.realpath(sys.argv[0]),)
2604
print ' %s (%s python%s)' % (
2605
bzrlib.__path__[0],
2606
bzrlib.version_string,
2607
bzrlib._format_version_tuple(sys.version_info),
2608
)
2609
print
3575
2610
if testspecs_list is not None:
3576
2611
pattern = '|'.join(testspecs_list)
3577
2612
else:
3578
2613
pattern = ".*"
3579
if subunit:
3580
try:
3581
from bzrlib.tests import SubUnitBzrRunner
3582
except ImportError:
3583
raise errors.BzrCommandError("subunit not available. subunit "
3584
"needs to be installed to use --subunit.")
3585
self.additional_selftest_args['runner_class'] = SubUnitBzrRunner
3586
# On Windows, disable automatic conversion of '\n' to '\r\n' in
3587
# stdout, which would corrupt the subunit stream.
3588
if sys.platform == "win32" and sys.stdout.fileno() >= 0:
3589
import msvcrt
3590
msvcrt.setmode(sys.stdout.fileno(), os.O_BINARY)
3591
if parallel:
3592
self.additional_selftest_args.setdefault(
3593
'suite_decorators', []).append(parallel)
3594
2614
if benchmark:
3595
2615
test_suite_factory = benchmarks.test_suite
3596
2616
# Unless user explicitly asks for quiet, be verbose in benchmarks
3597
2617
verbose = not is_quiet()
3598
2618
# TODO: should possibly lock the history file...
3599
2619
benchfile = open(".perf_history", "at", buffering=1)
3600
self.add_cleanup(benchfile.close)
3601
2620
else:
3602
2621
test_suite_factory = None
3603
2622
benchfile = None
3604
selftest_kwargs = {"verbose": verbose,
3605
"pattern": pattern,
3606
"stop_on_failure": one,
3607
"transport": transport,
3608
"test_suite_factory": test_suite_factory,
3609
"lsprof_timed": lsprof_timed,
3610
"lsprof_tests": lsprof_tests,
3611
"bench_history": benchfile,
3612
"matching_tests_first": first,
3613
"list_only": list_only,
3614
"random_seed": randomize,
3615
"exclude_pattern": exclude,
3616
"strict": strict,
3617
"load_list": load_list,
3618
"debug_flags": debugflag,
3619
"starting_with": starting_with
3620
}
3621
selftest_kwargs.update(self.additional_selftest_args)
3622
result = selftest(**selftest_kwargs)
2623
try:
2624
result = selftest(verbose=verbose,
2625
pattern=pattern,
2626
stop_on_failure=one,
2627
transport=transport,
2628
test_suite_factory=test_suite_factory,
2629
lsprof_timed=lsprof_timed,
2630
bench_history=benchfile,
2631
matching_tests_first=first,
2632
list_only=list_only,
2633
random_seed=randomize,
2634
exclude_pattern=exclude,
2635
strict=strict,
2636
load_list=load_list,
2637
debug_flags=debugflag,
2638
starting_with=starting_with,
2639
)
2640
finally:
2641
if benchfile is not None:
2642
benchfile.close()
2643
if result:
2644
note('tests passed')
2645
else:
2646
note('tests failed')
3623
2647
return int(not result)
3624
2648
3625
2649
3626
2650
class cmd_version(Command):
3627
__doc__ = """Show version of bzr."""
2651
"""Show version of bzr."""
3628
2652
3629
2653
encoding_type = 'replace'
3630
2654
takes_options = [
3641
2665
3642
2666
3643
2667
class cmd_rocks(Command):
3644
__doc__ = """Statement of optimism."""
2668
"""Statement of optimism."""
3645
2669
3646
2670
hidden = True
3647
2671
3648
2672
@display_command
3649
2673
def run(self):
3650
self.outf.write("It sure does!\n")
2674
print "It sure does!"
3651
2675
3652
2676
3653
2677
class cmd_find_merge_base(Command):
3654
__doc__ = """Find and print a base revision for merging two branches."""
2678
"""Find and print a base revision for merging two branches."""
3655
2679
# TODO: Options to specify revisions on either side, as if
3656
2680
# merging only part of the history.
3657
2681
takes_args = ['branch', 'other']
3658
2682
hidden = True
3659
2683
3660
2684
@display_command
3661
2685
def run(self, branch, other):
3662
2686
from bzrlib.revision import ensure_null
3663
2687
3664
2688
branch1 = Branch.open_containing(branch)[0]
3665
2689
branch2 = Branch.open_containing(other)[0]
3666
self.add_cleanup(branch1.lock_read().unlock)
3667
self.add_cleanup(branch2.lock_read().unlock)
3668
last1 = ensure_null(branch1.last_revision())
3669
last2 = ensure_null(branch2.last_revision())
3670
3671
graph = branch1.repository.get_graph(branch2.repository)
3672
base_rev_id = graph.find_unique_lca(last1, last2)
3673
3674
self.outf.write('merge base is revision %s\n' % base_rev_id)
2690
branch1.lock_read()
2691
try:
2692
branch2.lock_read()
2693
try:
2694
last1 = ensure_null(branch1.last_revision())
2695
last2 = ensure_null(branch2.last_revision())
2696
2697
graph = branch1.repository.get_graph(branch2.repository)
2698
base_rev_id = graph.find_unique_lca(last1, last2)
2699
2700
print 'merge base is revision %s' % base_rev_id
2701
finally:
2702
branch2.unlock()
2703
finally:
2704
branch1.unlock()
3675
2705
3676
2706
3677
2707
class cmd_merge(Command):
3678
__doc__ = """Perform a three-way merge.
3679
2708
"""Perform a three-way merge.
2709
3680
2710
The source of the merge can be specified either in the form of a branch,
3681
2711
or in the form of a path to a file containing a merge directive generated
3682
2712
with bzr send. If neither is specified, the default is the upstream branch
3692
2722
By default, bzr will try to merge in all new work from the other
3693
2723
branch, automatically determining an appropriate base. If this
3694
2724
fails, you may need to give an explicit base.
3695
2725
3696
2726
Merge will do its best to combine the changes in two branches, but there
3697
2727
are some kinds of problems only a human can fix. When it encounters those,
3698
2728
it will mark a conflict. A conflict means that you need to fix something,
3708
2738
The results of the merge are placed into the destination working
3709
2739
directory, where they can be reviewed (with bzr diff), tested, and then
3710
2740
committed to record the result of the merge.
3711
2741
3712
2742
merge refuses to run if there are any uncommitted changes, unless
3713
--force is given. The --force option can also be used to create a
3714
merge revision which has more than two parents.
3715
3716
If one would like to merge changes from the working tree of the other
3717
branch without merging any committed revisions, the --uncommitted option
3718
can be given.
3719
3720
To select only some changes to merge, use "merge -i", which will prompt
3721
you to apply each diff hunk and file change, similar to "shelve".
2743
--force is given.
3722
2744
3723
2745
:Examples:
3724
2746
To merge the latest revision from bzr.dev::
3733
2755
3734
2756
bzr merge -r 81..82 ../bzr.dev
3735
2757
3736
To apply a merge directive contained in /tmp/merge::
2758
To apply a merge directive contained in in /tmp/merge:
3737
2759
3738
2760
bzr merge /tmp/merge
3739
3740
To create a merge revision with three parents from two branches
3741
feature1a and feature1b:
3742
3743
bzr merge ../feature1a
3744
bzr merge ../feature1b --force
3745
bzr commit -m 'revision with three parents'
3746
2761
"""
3747
2762
3748
2763
encoding_type = 'exact'
3749
_see_also = ['update', 'remerge', 'status-flags', 'send']
2764
_see_also = ['update', 'remerge', 'status-flags']
3750
2765
takes_args = ['location?']
3751
2766
takes_options = [
3752
2767
'change',
3770
2785
short_name='d',
3771
2786
type=unicode,
3772
2787
),
3773
Option('preview', help='Instead of merging, show a diff of the'
3774
' merge.'),
3775
Option('interactive', help='Select changes interactively.',
3776
short_name='i')
2788
Option('preview', help='Instead of merging, show a diff of the merge.')
3777
2789
]
3778
2790
3779
2791
def run(self, location=None, revision=None, force=False,
3780
merge_type=None, show_base=False, reprocess=None, remember=False,
2792
merge_type=None, show_base=False, reprocess=False, remember=False,
3781
2793
uncommitted=False, pull=False,
3782
2794
directory=None,
3783
2795
preview=False,
3784
interactive=False,
3785
2796
):
3786
2797
if merge_type is None:
3787
2798
merge_type = _mod_merge.Merge3Merger
3792
2803
allow_pending = True
3793
2804
verified = 'inapplicable'
3794
2805
tree = WorkingTree.open_containing(directory)[0]
3795
2806
change_reporter = delta._ChangeReporter(
2807
unversioned_filter=tree.is_ignored)
2808
cleanups = []
3796
2809
try:
3797
basis_tree = tree.revision_tree(tree.last_revision())
3798
except errors.NoSuchRevision:
3799
basis_tree = tree.basis_tree()
3800
3801
# die as quickly as possible if there are uncommitted changes
3802
if not force:
3803
if tree.has_changes():
3804
raise errors.UncommittedChanges(tree)
3805
3806
view_info = _get_view_info_for_change_reporter(tree)
3807
change_reporter = delta._ChangeReporter(
3808
unversioned_filter=tree.is_ignored, view_info=view_info)
3809
pb = ui.ui_factory.nested_progress_bar()
3810
self.add_cleanup(pb.finished)
3811
self.add_cleanup(tree.lock_write().unlock)
3812
if location is not None:
3813
try:
3814
mergeable = bundle.read_mergeable_from_url(location,
3815
possible_transports=possible_transports)
3816
except errors.NotABundle:
3817
mergeable = None
2810
pb = ui.ui_factory.nested_progress_bar()
2811
cleanups.append(pb.finished)
2812
tree.lock_write()
2813
cleanups.append(tree.unlock)
2814
if location is not None:
2815
try:
2816
mergeable = bundle.read_mergeable_from_url(location,
2817
possible_transports=possible_transports)
2818
except errors.NotABundle:
2819
mergeable = None
2820
else:
2821
if uncommitted:
2822
raise errors.BzrCommandError('Cannot use --uncommitted'
2823
' with bundles or merge directives.')
2824
2825
if revision is not None:
2826
raise errors.BzrCommandError(
2827
'Cannot use -r with merge directives or bundles')
2828
merger, verified = _mod_merge.Merger.from_mergeable(tree,
2829
mergeable, pb)
2830
2831
if merger is None and uncommitted:
2832
if revision is not None and len(revision) > 0:
2833
raise errors.BzrCommandError('Cannot use --uncommitted and'
2834
' --revision at the same time.')
2835
location = self._select_branch_location(tree, location)[0]
2836
other_tree, other_path = WorkingTree.open_containing(location)
2837
merger = _mod_merge.Merger.from_uncommitted(tree, other_tree,
2838
pb)
2839
allow_pending = False
2840
if other_path != '':
2841
merger.interesting_files = [other_path]
2842
2843
if merger is None:
2844
merger, allow_pending = self._get_merger_from_branch(tree,
2845
location, revision, remember, possible_transports, pb)
2846
2847
merger.merge_type = merge_type
2848
merger.reprocess = reprocess
2849
merger.show_base = show_base
2850
self.sanity_check_merger(merger)
2851
if (merger.base_rev_id == merger.other_rev_id and
2852
merger.other_rev_id is not None):
2853
note('Nothing to do.')
2854
return 0
2855
if pull:
2856
if merger.interesting_files is not None:
2857
raise errors.BzrCommandError('Cannot pull individual files')
2858
if (merger.base_rev_id == tree.last_revision()):
2859
result = tree.pull(merger.other_branch, False,
2860
merger.other_rev_id)
2861
result.report(self.outf)
2862
return 0
2863
merger.check_basis(not force)
2864
if preview:
2865
return self._do_preview(merger)
3818
2866
else:
3819
if uncommitted:
3820
raise errors.BzrCommandError('Cannot use --uncommitted'
3821
' with bundles or merge directives.')
3822
3823
if revision is not None:
3824
raise errors.BzrCommandError(
3825
'Cannot use -r with merge directives or bundles')
3826
merger, verified = _mod_merge.Merger.from_mergeable(tree,
3827
mergeable, None)
3828
3829
if merger is None and uncommitted:
3830
if revision is not None and len(revision) > 0:
3831
raise errors.BzrCommandError('Cannot use --uncommitted and'
3832
' --revision at the same time.')
3833
merger = self.get_merger_from_uncommitted(tree, location, None)
3834
allow_pending = False
3835
3836
if merger is None:
3837
merger, allow_pending = self._get_merger_from_branch(tree,
3838
location, revision, remember, possible_transports, None)
3839
3840
merger.merge_type = merge_type
3841
merger.reprocess = reprocess
3842
merger.show_base = show_base
3843
self.sanity_check_merger(merger)
3844
if (merger.base_rev_id == merger.other_rev_id and
3845
merger.other_rev_id is not None):
3846
note('Nothing to do.')
3847
return 0
3848
if pull:
3849
if merger.interesting_files is not None:
3850
raise errors.BzrCommandError('Cannot pull individual files')
3851
if (merger.base_rev_id == tree.last_revision()):
3852
result = tree.pull(merger.other_branch, False,
3853
merger.other_rev_id)
3854
result.report(self.outf)
3855
return 0
3856
if merger.this_basis is None:
3857
raise errors.BzrCommandError(
3858
"This branch has no commits."
3859
" (perhaps you would prefer 'bzr pull')")
3860
if preview:
3861
return self._do_preview(merger)
3862
elif interactive:
3863
return self._do_interactive(merger)
3864
else:
3865
return self._do_merge(merger, change_reporter, allow_pending,
3866
verified)
3867
3868
def _get_preview(self, merger):
2867
return self._do_merge(merger, change_reporter, allow_pending,
2868
verified)
2869
finally:
2870
for cleanup in reversed(cleanups):
2871
cleanup()
2872
2873
def _do_preview(self, merger):
2874
from bzrlib.diff import show_diff_trees
3869
2875
tree_merger = merger.make_merger()
3870
2876
tt = tree_merger.make_preview_transform()
3871
self.add_cleanup(tt.finalize)
3872
result_tree = tt.get_preview_tree()
3873
return result_tree
3874
3875
def _do_preview(self, merger):
3876
from bzrlib.diff import show_diff_trees
3877
result_tree = self._get_preview(merger)
3878
show_diff_trees(merger.this_tree, result_tree, self.outf,
3879
old_label='', new_label='')
2877
try:
2878
result_tree = tt.get_preview_tree()
2879
show_diff_trees(merger.this_tree, result_tree, self.outf,
2880
old_label='', new_label='')
2881
finally:
2882
tt.finalize()
3880
2883
3881
2884
def _do_merge(self, merger, change_reporter, allow_pending, verified):
3882
2885
merger.change_reporter = change_reporter
3890
2893
else:
3891
2894
return 0
3892
2895
3893
def _do_interactive(self, merger):
3894
"""Perform an interactive merge.
3895
3896
This works by generating a preview tree of the merge, then using
3897
Shelver to selectively remove the differences between the working tree
3898
and the preview tree.
3899
"""
3900
from bzrlib import shelf_ui
3901
result_tree = self._get_preview(merger)
3902
writer = bzrlib.option.diff_writer_registry.get()
3903
shelver = shelf_ui.Shelver(merger.this_tree, result_tree, destroy=True,
3904
reporter=shelf_ui.ApplyReporter(),
3905
diff_writer=writer(sys.stdout))
3906
try:
3907
shelver.run()
3908
finally:
3909
shelver.finalize()
3910
3911
2896
def sanity_check_merger(self, merger):
3912
2897
if (merger.show_base and
3913
2898
not merger.merge_type is _mod_merge.Merge3Merger):
3914
2899
raise errors.BzrCommandError("Show-base is not supported for this"
3915
2900
" merge type. %s" % merger.merge_type)
3916
if merger.reprocess is None:
3917
if merger.show_base:
3918
merger.reprocess = False
3919
else:
3920
# Use reprocess if the merger supports it
3921
merger.reprocess = merger.merge_type.supports_reprocess
3922
2901
if merger.reprocess and not merger.merge_type.supports_reprocess:
3923
2902
raise errors.BzrCommandError("Conflict reduction is not supported"
3924
2903
" for merge type %s." %
3948
2927
base_branch, base_path = Branch.open_containing(base_loc,
3949
2928
possible_transports)
3950
2929
# Find the revision ids
3951
other_revision_id = None
3952
base_revision_id = None
3953
if revision is not None:
3954
if len(revision) >= 1:
3955
other_revision_id = revision[-1].as_revision_id(other_branch)
3956
if len(revision) == 2:
3957
base_revision_id = revision[0].as_revision_id(base_branch)
3958
if other_revision_id is None:
2930
if revision is None or len(revision) < 1 or revision[-1] is None:
3959
2931
other_revision_id = _mod_revision.ensure_null(
3960
2932
other_branch.last_revision())
2933
else:
2934
other_revision_id = revision[-1].as_revision_id(other_branch)
2935
if (revision is not None and len(revision) == 2
2936
and revision[0] is not None):
2937
base_revision_id = revision[0].as_revision_id(base_branch)
2938
else:
2939
base_revision_id = None
3961
2940
# Remember where we merge from
3962
2941
if ((remember or tree.branch.get_submit_branch() is None) and
3963
2942
user_location is not None):
3972
2951
allow_pending = True
3973
2952
return merger, allow_pending
3974
2953
3975
def get_merger_from_uncommitted(self, tree, location, pb):
3976
"""Get a merger for uncommitted changes.
3977
3978
:param tree: The tree the merger should apply to.
3979
:param location: The location containing uncommitted changes.
3980
:param pb: The progress bar to use for showing progress.
3981
"""
3982
location = self._select_branch_location(tree, location)[0]
3983
other_tree, other_path = WorkingTree.open_containing(location)
3984
merger = _mod_merge.Merger.from_uncommitted(tree, other_tree, pb)
3985
if other_path != '':
3986
merger.interesting_files = [other_path]
3987
return merger
3988
3989
2954
def _select_branch_location(self, tree, user_location, revision=None,
3990
2955
index=None):
3991
2956
"""Select a branch location, according to possible inputs.
4021
2986
Report if the remembered location was used.
4022
2987
"""
4023
2988
stored_location = tree.branch.get_submit_branch()
4024
stored_location_type = "submit"
4025
2989
if stored_location is None:
4026
2990
stored_location = tree.branch.get_parent()
4027
stored_location_type = "parent"
4028
2991
mutter("%s", stored_location)
4029
2992
if stored_location is None:
4030
2993
raise errors.BzrCommandError("No location specified or remembered")
4031
2994
display_url = urlutils.unescape_for_display(stored_location, 'utf-8')
4032
note(u"%s remembered %s location %s", verb_string,
4033
stored_location_type, display_url)
2995
note(u"%s remembered location %s", verb_string, display_url)
4034
2996
return stored_location
4035
2997
4036
2998
4037
2999
class cmd_remerge(Command):
4038
__doc__ = """Redo a merge.
3000
"""Redo a merge.
4039
3001
4040
3002
Use this if you want to try a different merge technique while resolving
4041
conflicts. Some merge techniques are better than others, and remerge
3003
conflicts. Some merge techniques are better than others, and remerge
4042
3004
lets you try different ones on different files.
4043
3005
4044
3006
The options for remerge have the same meaning and defaults as the ones for
4048
3010
:Examples:
4049
3011
Re-do the merge of all conflicted files, and show the base text in
4050
3012
conflict regions, in addition to the usual THIS and OTHER texts::
4051
3013
4052
3014
bzr remerge --show-base
4053
3015
4054
3016
Re-do the merge of "foobar", using the weave merge algorithm, with
4055
3017
additional processing to reduce the size of conflict regions::
4056
3018
4057
3019
bzr remerge --merge-type weave --reprocess foobar
4058
3020
"""
4059
3021
takes_args = ['file*']
4066
3028
4067
3029
def run(self, file_list=None, merge_type=None, show_base=False,
4068
3030
reprocess=False):
4069
from bzrlib.conflicts import restore
4070
3031
if merge_type is None:
4071
3032
merge_type = _mod_merge.Merge3Merger
4072
3033
tree, file_list = tree_files(file_list)
4073
self.add_cleanup(tree.lock_write().unlock)
4074
parents = tree.get_parent_ids()
4075
if len(parents) != 2:
4076
raise errors.BzrCommandError("Sorry, remerge only works after normal"
4077
" merges. Not cherrypicking or"
4078
" multi-merges.")
4079
repository = tree.branch.repository
4080
interesting_ids = None
4081
new_conflicts = []
4082
conflicts = tree.conflicts()
4083
if file_list is not None:
4084
interesting_ids = set()
4085
for filename in file_list:
4086
file_id = tree.path2id(filename)
4087
if file_id is None:
4088
raise errors.NotVersionedError(filename)
4089
interesting_ids.add(file_id)
4090
if tree.kind(file_id) != "directory":
4091
continue
4092
4093
for name, ie in tree.inventory.iter_entries(file_id):
4094
interesting_ids.add(ie.file_id)
4095
new_conflicts = conflicts.select_conflicts(tree, file_list)[0]
4096
else:
4097
# Remerge only supports resolving contents conflicts
4098
allowed_conflicts = ('text conflict', 'contents conflict')
4099
restore_files = [c.path for c in conflicts
4100
if c.typestring in allowed_conflicts]
4101
_mod_merge.transform_tree(tree, tree.basis_tree(), interesting_ids)
4102
tree.set_conflicts(ConflictList(new_conflicts))
4103
if file_list is not None:
4104
restore_files = file_list
4105
for filename in restore_files:
3034
tree.lock_write()
3035
try:
3036
parents = tree.get_parent_ids()
3037
if len(parents) != 2:
3038
raise errors.BzrCommandError("Sorry, remerge only works after normal"
3039
" merges. Not cherrypicking or"
3040
" multi-merges.")
3041
repository = tree.branch.repository
3042
interesting_ids = None
3043
new_conflicts = []
3044
conflicts = tree.conflicts()
3045
if file_list is not None:
3046
interesting_ids = set()
3047
for filename in file_list:
3048
file_id = tree.path2id(filename)
3049
if file_id is None:
3050
raise errors.NotVersionedError(filename)
3051
interesting_ids.add(file_id)
3052
if tree.kind(file_id) != "directory":
3053
continue
3054
3055
for name, ie in tree.inventory.iter_entries(file_id):
3056
interesting_ids.add(ie.file_id)
3057
new_conflicts = conflicts.select_conflicts(tree, file_list)[0]
3058
else:
3059
# Remerge only supports resolving contents conflicts
3060
allowed_conflicts = ('text conflict', 'contents conflict')
3061
restore_files = [c.path for c in conflicts
3062
if c.typestring in allowed_conflicts]
3063
_mod_merge.transform_tree(tree, tree.basis_tree(), interesting_ids)
3064
tree.set_conflicts(ConflictList(new_conflicts))
3065
if file_list is not None:
3066
restore_files = file_list
3067
for filename in restore_files:
3068
try:
3069
restore(tree.abspath(filename))
3070
except errors.NotConflicted:
3071
pass
3072
# Disable pending merges, because the file texts we are remerging
3073
# have not had those merges performed. If we use the wrong parents
3074
# list, we imply that the working tree text has seen and rejected
3075
# all the changes from the other tree, when in fact those changes
3076
# have not yet been seen.
3077
pb = ui.ui_factory.nested_progress_bar()
3078
tree.set_parent_ids(parents[:1])
4106
3079
try:
4107
restore(tree.abspath(filename))
4108
except errors.NotConflicted:
4109
pass
4110
# Disable pending merges, because the file texts we are remerging
4111
# have not had those merges performed. If we use the wrong parents
4112
# list, we imply that the working tree text has seen and rejected
4113
# all the changes from the other tree, when in fact those changes
4114
# have not yet been seen.
4115
tree.set_parent_ids(parents[:1])
4116
try:
4117
merger = _mod_merge.Merger.from_revision_ids(None, tree, parents[1])
4118
merger.interesting_ids = interesting_ids
4119
merger.merge_type = merge_type
4120
merger.show_base = show_base
4121
merger.reprocess = reprocess
4122
conflicts = merger.do_merge()
3080
merger = _mod_merge.Merger.from_revision_ids(pb,
3081
tree, parents[1])
3082
merger.interesting_ids = interesting_ids
3083
merger.merge_type = merge_type
3084
merger.show_base = show_base
3085
merger.reprocess = reprocess
3086
conflicts = merger.do_merge()
3087
finally:
3088
tree.set_parent_ids(parents)
3089
pb.finished()
4123
3090
finally:
4124
tree.set_parent_ids(parents)
3091
tree.unlock()
4125
3092
if conflicts > 0:
4126
3093
return 1
4127
3094
else:
4129
3096
4130
3097
4131
3098
class cmd_revert(Command):
4132
__doc__ = """Revert files to a previous revision.
3099
"""Revert files to a previous revision.
4133
3100
4134
3101
Giving a list of files will revert only those files. Otherwise, all files
4135
3102
will be reverted. If the revision is not specified with '--revision', the
4139
3106
merge instead. For example, "merge . --revision -2..-3" will remove the
4140
3107
changes introduced by -2, without affecting the changes introduced by -1.
4141
3108
Or to remove certain changes on a hunk-by-hunk basis, see the Shelf plugin.
4142
3109
4143
3110
By default, any files that have been manually changed will be backed up
4144
3111
first. (Files changed only by merge are not backed up.) Backup files have
4145
3112
'.~#~' appended to their name, where # is a number.
4149
3116
name. If you name a directory, all the contents of that directory will be
4150
3117
reverted.
4151
3118
4152
If you have newly added files since the target revision, they will be
4153
removed. If the files to be removed have been changed, backups will be
4154
created as above. Directories containing unknown files will not be
4155
deleted.
3119
Any files that have been newly added since that revision will be deleted,
3120
with a backup kept if appropriate. Directories containing unknown files
3121
will not be deleted.
4156
3122
4157
The working tree contains a list of revisions that have been merged but
4158
not yet committed. These revisions will be included as additional parents
4159
of the next commit. Normally, using revert clears that list as well as
4160
reverting the files. If any files are specified, revert leaves the list
4161
of uncommitted merges alone and reverts only the files. Use ``bzr revert
4162
.`` in the tree root to revert all files but keep the recorded merges,
4163
and ``bzr revert --forget-merges`` to clear the pending merge list without
3123
The working tree contains a list of pending merged revisions, which will
3124
be included as parents in the next commit. Normally, revert clears that
3125
list as well as reverting the files. If any files are specified, revert
3126
leaves the pending merge list alone and reverts only the files. Use "bzr
3127
revert ." in the tree root to revert all files but keep the merge record,
3128
and "bzr revert --forget-merges" to clear the pending merge list without
4164
3129
reverting any files.
4165
4166
Using "bzr revert --forget-merges", it is possible to apply all of the
4167
changes from a branch in a single revision. To do this, perform the merge
4168
as desired. Then doing revert with the "--forget-merges" option will keep
4169
the content of the tree as it was, but it will clear the list of pending
4170
merges. The next commit will then contain all of the changes that are
4171
present in the other branch, but without any other parent revisions.
4172
Because this technique forgets where these changes originated, it may
4173
cause additional conflicts on later merges involving the same source and
4174
target branches.
4175
3130
"""
4176
3131
4177
3132
_see_also = ['cat', 'export']
4186
3141
def run(self, revision=None, no_backup=False, file_list=None,
4187
3142
forget_merges=None):
4188
3143
tree, file_list = tree_files(file_list)
4189
self.add_cleanup(tree.lock_tree_write().unlock)
4190
3144
if forget_merges:
4191
3145
tree.set_parent_ids(tree.get_parent_ids()[:1])
4192
3146
else:
4194
3148
4195
3149
@staticmethod
4196
3150
def _revert_tree_to_revision(tree, revision, file_list, no_backup):
4197
rev_tree = _get_one_revision_tree('revert', revision, tree=tree)
4198
tree.revert(file_list, rev_tree, not no_backup, None,
4199
report_changes=True)
3151
if revision is None:
3152
rev_id = tree.last_revision()
3153
elif len(revision) != 1:
3154
raise errors.BzrCommandError('bzr revert --revision takes exactly 1 argument')
3155
else:
3156
rev_id = revision[0].as_revision_id(tree.branch)
3157
pb = ui.ui_factory.nested_progress_bar()
3158
try:
3159
tree.revert(file_list,
3160
tree.branch.repository.revision_tree(rev_id),
3161
not no_backup, pb, report_changes=True)
3162
finally:
3163
pb.finished()
4200
3164
4201
3165
4202
3166
class cmd_assert_fail(Command):
4203
__doc__ = """Test reporting of assertion failures"""
3167
"""Test reporting of assertion failures"""
4204
3168
# intended just for use in testing
4205
3169
4206
3170
hidden = True
4210
3174
4211
3175
4212
3176
class cmd_help(Command):
4213
__doc__ = """Show help on a command or other topic.
3177
"""Show help on a command or other topic.
4214
3178
"""
4215
3179
4216
3180
_see_also = ['topics']
4219
3183
]
4220
3184
takes_args = ['topic?']
4221
3185
aliases = ['?', '--help', '-?', '-h']
4222
3186
4223
3187
@display_command
4224
3188
def run(self, topic=None, long=False):
4225
3189
import bzrlib.help
4229
3193
4230
3194
4231
3195
class cmd_shell_complete(Command):
4232
__doc__ = """Show appropriate completions for context.
3196
"""Show appropriate completions for context.
4233
3197
4234
3198
For a list of all available commands, say 'bzr shell-complete'.
4235
3199
"""
4236
3200
takes_args = ['context?']
4237
3201
aliases = ['s-c']
4238
3202
hidden = True
4239
3203
4240
3204
@display_command
4241
3205
def run(self, context=None):
4242
3206
import shellcomplete
4244
3208
4245
3209
4246
3210
class cmd_missing(Command):
4247
__doc__ = """Show unmerged/unpulled revisions between two branches.
4248
3211
"""Show unmerged/unpulled revisions between two branches.
3212
4249
3213
OTHER_BRANCH may be local or remote.
4250
4251
To filter on a range of revisions, you can use the command -r begin..end
4252
-r revision requests a specific revision, -r ..end or -r begin.. are
4253
also valid.
4254
4255
:Exit values:
4256
1 - some missing revisions
4257
0 - no missing revisions
4258
4259
:Examples:
4260
4261
Determine the missing revisions between this and the branch at the
4262
remembered pull location::
4263
4264
bzr missing
4265
4266
Determine the missing revisions between this and another branch::
4267
4268
bzr missing http://server/branch
4269
4270
Determine the missing revisions up to a specific revision on the other
4271
branch::
4272
4273
bzr missing -r ..-10
4274
4275
Determine the missing revisions up to a specific revision on this
4276
branch::
4277
4278
bzr missing --my-revision ..-10
4279
3214
"""
4280
3215
4281
3216
_see_also = ['merge', 'pull']
4282
3217
takes_args = ['other_branch?']
4283
3218
takes_options = [
4284
Option('reverse', 'Reverse the order of revisions.'),
4285
Option('mine-only',
4286
'Display changes in the local branch only.'),
4287
Option('this' , 'Same as --mine-only.'),
4288
Option('theirs-only',
4289
'Display changes in the remote branch only.'),
4290
Option('other', 'Same as --theirs-only.'),
4291
'log-format',
4292
'show-ids',
4293
'verbose',
4294
custom_help('revision',
4295
help='Filter on other branch revisions (inclusive). '
4296
'See "help revisionspec" for details.'),
4297
Option('my-revision',
4298
type=_parse_revision_str,
4299
help='Filter on local branch revisions (inclusive). '
4300
'See "help revisionspec" for details.'),
4301
Option('include-merges',
4302
'Show all revisions in addition to the mainline ones.'),
4303
]
3219
Option('reverse', 'Reverse the order of revisions.'),
3220
Option('mine-only',
3221
'Display changes in the local branch only.'),
3222
Option('this' , 'Same as --mine-only.'),
3223
Option('theirs-only',
3224
'Display changes in the remote branch only.'),
3225
Option('other', 'Same as --theirs-only.'),
3226
'log-format',
3227
'show-ids',
3228
'verbose'
3229
]
4304
3230
encoding_type = 'replace'
4305
3231
4306
3232
@display_command
4307
3233
def run(self, other_branch=None, reverse=False, mine_only=False,
4308
theirs_only=False,
4309
log_format=None, long=False, short=False, line=False,
4310
show_ids=False, verbose=False, this=False, other=False,
4311
include_merges=False, revision=None, my_revision=None):
3234
theirs_only=False, log_format=None, long=False, short=False, line=False,
3235
show_ids=False, verbose=False, this=False, other=False):
4312
3236
from bzrlib.missing import find_unmerged, iter_log_revisions
4313
def message(s):
4314
if not is_quiet():
4315
self.outf.write(s)
4316
3237
4317
3238
if this:
4318
3239
mine_only = this
4328
3249
restrict = 'remote'
4329
3250
4330
3251
local_branch = Branch.open_containing(u".")[0]
4331
self.add_cleanup(local_branch.lock_read().unlock)
4332
4333
3252
parent = local_branch.get_parent()
4334
3253
if other_branch is None:
4335
3254
other_branch = parent
4338
3257
" or specified.")
4339
3258
display_url = urlutils.unescape_for_display(parent,
4340
3259
self.outf.encoding)
4341
message("Using saved parent location: "
4342
+ display_url + "\n")
3260
self.outf.write("Using last location: " + display_url + "\n")
4343
3261
4344
3262
remote_branch = Branch.open(other_branch)
4345
3263
if remote_branch.base == local_branch.base:
4346
3264
remote_branch = local_branch
4347
else:
4348
self.add_cleanup(remote_branch.lock_read().unlock)
4349
4350
local_revid_range = _revision_range_to_revid_range(
4351
_get_revision_range(my_revision, local_branch,
4352
self.name()))
4353
4354
remote_revid_range = _revision_range_to_revid_range(
4355
_get_revision_range(revision,
4356
remote_branch, self.name()))
4357
4358
local_extra, remote_extra = find_unmerged(
4359
local_branch, remote_branch, restrict,
4360
backward=not reverse,
4361
include_merges=include_merges,
4362
local_revid_range=local_revid_range,
4363
remote_revid_range=remote_revid_range)
4364
4365
if log_format is None:
4366
registry = log.log_formatter_registry
4367
log_format = registry.get_default(local_branch)
4368
lf = log_format(to_file=self.outf,
4369
show_ids=show_ids,
4370
show_timezone='original')
4371
4372
status_code = 0
4373
if local_extra and not theirs_only:
4374
message("You have %d extra revision(s):\n" %
4375
len(local_extra))
4376
for revision in iter_log_revisions(local_extra,
4377
local_branch.repository,
4378
verbose):
4379
lf.log_revision(revision)
4380
printed_local = True
4381
status_code = 1
4382
else:
4383
printed_local = False
4384
4385
if remote_extra and not mine_only:
4386
if printed_local is True:
4387
message("\n\n\n")
4388
message("You are missing %d revision(s):\n" %
4389
len(remote_extra))
4390
for revision in iter_log_revisions(remote_extra,
4391
remote_branch.repository,
4392
verbose):
4393
lf.log_revision(revision)
4394
status_code = 1
4395
4396
if mine_only and not local_extra:
4397
# We checked local, and found nothing extra
4398
message('This branch is up to date.\n')
4399
elif theirs_only and not remote_extra:
4400
# We checked remote, and found nothing extra
4401
message('Other branch is up to date.\n')
4402
elif not (mine_only or theirs_only or local_extra or
4403
remote_extra):
4404
# We checked both branches, and neither one had extra
4405
# revisions
4406
message("Branches are up to date.\n")
4407
self.cleanup_now()
3265
local_branch.lock_read()
3266
try:
3267
remote_branch.lock_read()
3268
try:
3269
local_extra, remote_extra = find_unmerged(
3270
local_branch, remote_branch, restrict)
3271
3272
if log_format is None:
3273
registry = log.log_formatter_registry
3274
log_format = registry.get_default(local_branch)
3275
lf = log_format(to_file=self.outf,
3276
show_ids=show_ids,
3277
show_timezone='original')
3278
if reverse is False:
3279
if local_extra is not None:
3280
local_extra.reverse()
3281
if remote_extra is not None:
3282
remote_extra.reverse()
3283
3284
status_code = 0
3285
if local_extra and not theirs_only:
3286
self.outf.write("You have %d extra revision(s):\n" %
3287
len(local_extra))
3288
for revision in iter_log_revisions(local_extra,
3289
local_branch.repository,
3290
verbose):
3291
lf.log_revision(revision)
3292
printed_local = True
3293
status_code = 1
3294
else:
3295
printed_local = False
3296
3297
if remote_extra and not mine_only:
3298
if printed_local is True:
3299
self.outf.write("\n\n\n")
3300
self.outf.write("You are missing %d revision(s):\n" %
3301
len(remote_extra))
3302
for revision in iter_log_revisions(remote_extra,
3303
remote_branch.repository,
3304
verbose):
3305
lf.log_revision(revision)
3306
status_code = 1
3307
3308
if mine_only and not local_extra:
3309
# We checked local, and found nothing extra
3310
self.outf.write('This branch is up to date.\n')
3311
elif theirs_only and not remote_extra:
3312
# We checked remote, and found nothing extra
3313
self.outf.write('Other branch is up to date.\n')
3314
elif not (mine_only or theirs_only or local_extra or
3315
remote_extra):
3316
# We checked both branches, and neither one had extra
3317
# revisions
3318
self.outf.write("Branches are up to date.\n")
3319
finally:
3320
remote_branch.unlock()
3321
finally:
3322
local_branch.unlock()
4408
3323
if not status_code and parent is None and other_branch is not None:
4409
self.add_cleanup(local_branch.lock_write().unlock)
4410
# handle race conditions - a parent might be set while we run.
4411
if local_branch.get_parent() is None:
4412
local_branch.set_parent(remote_branch.base)
3324
local_branch.lock_write()
3325
try:
3326
# handle race conditions - a parent might be set while we run.
3327
if local_branch.get_parent() is None:
3328
local_branch.set_parent(remote_branch.base)
3329
finally:
3330
local_branch.unlock()
4413
3331
return status_code
4414
3332
4415
3333
4416
3334
class cmd_pack(Command):
4417
__doc__ = """Compress the data within a repository.
4418
4419
This operation compresses the data within a bazaar repository. As
4420
bazaar supports automatic packing of repository, this operation is
4421
normally not required to be done manually.
4422
4423
During the pack operation, bazaar takes a backup of existing repository
4424
data, i.e. pack files. This backup is eventually removed by bazaar
4425
automatically when it is safe to do so. To save disk space by removing
4426
the backed up pack files, the --clean-obsolete-packs option may be
4427
used.
4428
4429
Warning: If you use --clean-obsolete-packs and your machine crashes
4430
during or immediately after repacking, you may be left with a state
4431
where the deletion has been written to disk but the new packs have not
4432
been. In this case the repository may be unusable.
4433
"""
3335
"""Compress the data within a repository."""
4434
3336
4435
3337
_see_also = ['repositories']
4436
3338
takes_args = ['branch_or_repo?']
4437
takes_options = [
4438
Option('clean-obsolete-packs', 'Delete obsolete packs to save disk space.'),
4439
]
4440
3339
4441
def run(self, branch_or_repo='.', clean_obsolete_packs=False):
3340
def run(self, branch_or_repo='.'):
4442
3341
dir = bzrdir.BzrDir.open_containing(branch_or_repo)[0]
4443
3342
try:
4444
3343
branch = dir.open_branch()
4445
3344
repository = branch.repository
4446
3345
except errors.NotBranchError:
4447
3346
repository = dir.open_repository()
4448
repository.pack(clean_obsolete_packs=clean_obsolete_packs)
3347
repository.pack()
4449
3348
4450
3349
4451
3350
class cmd_plugins(Command):
4452
__doc__ = """List the installed plugins.
4453
3351
"""List the installed plugins.
3352
4454
3353
This command displays the list of installed plugins including
4455
3354
version of plugin and a short description of each.
4456
3355
4462
3361
adding new commands, providing additional network transports and
4463
3362
customizing log output.
4464
3363
4465
See the Bazaar Plugin Guide <http://doc.bazaar.canonical.com/plugins/en/>
4466
for further information on plugins including where to find them and how to
4467
install them. Instructions are also provided there on how to write new
4468
plugins using the Python programming language.
3364
See the Bazaar web site, http://bazaar-vcs.org, for further
3365
information on plugins including where to find them and how to
3366
install them. Instructions are also provided there on how to
3367
write new plugins using the Python programming language.
4469
3368
"""
4470
3369
takes_options = ['verbose']
4471
3370
4486
3385
doc = '(no description)'
4487
3386
result.append((name_ver, doc, plugin.path()))
4488
3387
for name_ver, doc, path in sorted(result):
4489
self.outf.write("%s\n" % name_ver)
4490
self.outf.write(" %s\n" % doc)
3388
print name_ver
3389
print ' ', doc
4491
3390
if verbose:
4492
self.outf.write(" %s\n" % path)
4493
self.outf.write("\n")
3391
print ' ', path
3392
print
4494
3393
4495
3394
4496
3395
class cmd_testament(Command):
4497
__doc__ = """Show testament (signing-form) of a revision."""
3396
"""Show testament (signing-form) of a revision."""
4498
3397
takes_options = [
4499
3398
'revision',
4500
3399
Option('long', help='Produce long-format testament.'),
4512
3411
b = Branch.open_containing(branch)[0]
4513
3412
else:
4514
3413
b = Branch.open(branch)
4515
self.add_cleanup(b.lock_read().unlock)
4516
if revision is None:
4517
rev_id = b.last_revision()
4518
else:
4519
rev_id = revision[0].as_revision_id(b)
4520
t = testament_class.from_revision(b.repository, rev_id)
4521
if long:
4522
sys.stdout.writelines(t.as_text_lines())
4523
else:
4524
sys.stdout.write(t.as_short_text())
3414
b.lock_read()
3415
try:
3416
if revision is None:
3417
rev_id = b.last_revision()
3418
else:
3419
rev_id = revision[0].as_revision_id(b)
3420
t = testament_class.from_revision(b.repository, rev_id)
3421
if long:
3422
sys.stdout.writelines(t.as_text_lines())
3423
else:
3424
sys.stdout.write(t.as_short_text())
3425
finally:
3426
b.unlock()
4525
3427
4526
3428
4527
3429
class cmd_annotate(Command):
4528
__doc__ = """Show the origin of each line in a file.
3430
"""Show the origin of each line in a file.
4529
3431
4530
3432
This prints out the given file with an annotation on the left side
4531
3433
indicating which revision, author and date introduced the change.
4532
3434
4533
If the origin is the same for a run of consecutive lines, it is
3435
If the origin is the same for a run of consecutive lines, it is
4534
3436
shown only at the top, unless the --all option is given.
4535
3437
"""
4536
3438
# TODO: annotate directories; showing when each file was last changed
4537
# TODO: if the working copy is modified, show annotations on that
3439
# TODO: if the working copy is modified, show annotations on that
4538
3440
# with new uncommitted lines marked
4539
3441
aliases = ['ann', 'blame', 'praise']
4540
3442
takes_args = ['filename']
4548
3450
@display_command
4549
3451
def run(self, filename, all=False, long=False, revision=None,
4550
3452
show_ids=False):
4551
from bzrlib.annotate import annotate_file, annotate_file_tree
3453
from bzrlib.annotate import annotate_file
4552
3454
wt, branch, relpath = \
4553
3455
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
4554
3456
if wt is not None:
4555
self.add_cleanup(wt.lock_read().unlock)
4556
else:
4557
self.add_cleanup(branch.lock_read().unlock)
4558
tree = _get_one_revision_tree('annotate', revision, branch=branch)
4559
self.add_cleanup(tree.lock_read().unlock)
4560
if wt is not None:
4561
file_id = wt.path2id(relpath)
4562
else:
4563
file_id = tree.path2id(relpath)
4564
if file_id is None:
4565
raise errors.NotVersionedError(filename)
4566
file_version = tree.inventory[file_id].revision
4567
if wt is not None and revision is None:
4568
# If there is a tree and we're not annotating historical
4569
# versions, annotate the working tree's content.
4570
annotate_file_tree(wt, file_id, self.outf, long, all,
4571
show_ids=show_ids)
4572
else:
3457
wt.lock_read()
3458
else:
3459
branch.lock_read()
3460
try:
3461
if revision is None:
3462
revision_id = branch.last_revision()
3463
elif len(revision) != 1:
3464
raise errors.BzrCommandError('bzr annotate --revision takes exactly 1 argument')
3465
else:
3466
revision_id = revision[0].as_revision_id(branch)
3467
tree = branch.repository.revision_tree(revision_id)
3468
if wt is not None:
3469
file_id = wt.path2id(relpath)
3470
else:
3471
file_id = tree.path2id(relpath)
3472
if file_id is None:
3473
raise errors.NotVersionedError(filename)
3474
file_version = tree.inventory[file_id].revision
4573
3475
annotate_file(branch, file_version, file_id, long, all, self.outf,
4574
3476
show_ids=show_ids)
3477
finally:
3478
if wt is not None:
3479
wt.unlock()
3480
else:
3481
branch.unlock()
4575
3482
4576
3483
4577
3484
class cmd_re_sign(Command):
4578
__doc__ = """Create a digital signature for an existing revision."""
3485
"""Create a digital signature for an existing revision."""
4579
3486
# TODO be able to replace existing ones.
4580
3487
4581
3488
hidden = True # is this right ?
4582
3489
takes_args = ['revision_id*']
4583
3490
takes_options = ['revision']
4584
3491
4585
3492
def run(self, revision_id_list=None, revision=None):
4586
3493
if revision_id_list is not None and revision is not None:
4587
3494
raise errors.BzrCommandError('You can only supply one of revision_id or --revision')
4588
3495
if revision_id_list is None and revision is None:
4589
3496
raise errors.BzrCommandError('You must supply either --revision or a revision_id')
4590
3497
b = WorkingTree.open_containing(u'.')[0].branch
4591
self.add_cleanup(b.lock_write().unlock)
4592
return self._run(b, revision_id_list, revision)
3498
b.lock_write()
3499
try:
3500
return self._run(b, revision_id_list, revision)
3501
finally:
3502
b.unlock()
4593
3503
4594
3504
def _run(self, b, revision_id_list, revision):
4595
3505
import bzrlib.gpg as gpg
4640
3550
4641
3551
4642
3552
class cmd_bind(Command):
4643
__doc__ = """Convert the current branch into a checkout of the supplied branch.
4644
If no branch is supplied, rebind to the last bound location.
3553
"""Convert the current branch into a checkout of the supplied branch.
4645
3554
4646
3555
Once converted into a checkout, commits must succeed on the master branch
4647
3556
before they will be applied to the local branch.
4648
4649
Bound branches use the nickname of its master branch unless it is set
4650
locally, in which case binding will update the local nickname to be
4651
that of the master.
4652
3557
"""
4653
3558
4654
3559
_see_also = ['checkouts', 'unbind']
4665
3570
'This format does not remember old locations.')
4666
3571
else:
4667
3572
if location is None:
4668
if b.get_bound_location() is not None:
4669
raise errors.BzrCommandError('Branch is already bound')
4670
else:
4671
raise errors.BzrCommandError('No location supplied '
4672
'and no previous location known')
3573
raise errors.BzrCommandError('No location supplied and no '
3574
'previous location known')
4673
3575
b_other = Branch.open(location)
4674
3576
try:
4675
3577
b.bind(b_other)
4676
3578
except errors.DivergedBranches:
4677
3579
raise errors.BzrCommandError('These branches have diverged.'
4678
3580
' Try merging, and then bind again.')
4679
if b.get_config().has_explicit_nickname():
4680
b.nick = b_other.nick
4681
3581
4682
3582
4683
3583
class cmd_unbind(Command):
4684
__doc__ = """Convert the current checkout into a regular branch.
3584
"""Convert the current checkout into a regular branch.
4685
3585
4686
3586
After unbinding, the local branch is considered independent and subsequent
4687
3587
commits will be local only.
4698
3598
4699
3599
4700
3600
class cmd_uncommit(Command):
4701
__doc__ = """Remove the last committed revision.
3601
"""Remove the last committed revision.
4702
3602
4703
3603
--verbose will print out what is being removed.
4704
3604
--dry-run will go through all the motions, but not actually
4744
3644
b = control.open_branch()
4745
3645
4746
3646
if tree is not None:
4747
self.add_cleanup(tree.lock_write().unlock)
3647
tree.lock_write()
4748
3648
else:
4749
self.add_cleanup(b.lock_write().unlock)
4750
return self._run(b, tree, dry_run, verbose, revision, force, local=local)
3649
b.lock_write()
3650
try:
3651
return self._run(b, tree, dry_run, verbose, revision, force,
3652
local=local)
3653
finally:
3654
if tree is not None:
3655
tree.unlock()
3656
else:
3657
b.unlock()
4751
3658
4752
3659
def _run(self, b, tree, dry_run, verbose, revision, force, local=False):
4753
3660
from bzrlib.log import log_formatter, show_log
4785
3692
end_revision=last_revno)
4786
3693
4787
3694
if dry_run:
4788
self.outf.write('Dry-run, pretending to remove'
4789
' the above revisions.\n')
3695
print 'Dry-run, pretending to remove the above revisions.'
3696
if not force:
3697
val = raw_input('Press <enter> to continue')
4790
3698
else:
4791
self.outf.write('The above revision(s) will be removed.\n')
4792
4793
if not force:
4794
if not ui.ui_factory.get_boolean('Are you sure'):
4795
self.outf.write('Canceled')
4796
return 0
4797
4798
mutter('Uncommitting from {%s} to {%s}',
4799
last_rev_id, rev_id)
3699
print 'The above revision(s) will be removed.'
3700
if not force:
3701
val = raw_input('Are you sure [y/N]? ')
3702
if val.lower() not in ('y', 'yes'):
3703
print 'Canceled'
3704
return 0
3705
4800
3706
uncommit(b, tree=tree, dry_run=dry_run, verbose=verbose,
4801
3707
revno=revno, local=local)
4802
self.outf.write('You can restore the old tip by running:\n'
4803
' bzr pull . -r revid:%s\n' % last_rev_id)
4804
3708
4805
3709
4806
3710
class cmd_break_lock(Command):
4807
__doc__ = """Break a dead lock on a repository, branch or working directory.
3711
"""Break a dead lock on a repository, branch or working directory.
4808
3712
4809
3713
CAUTION: Locks should only be broken when you are sure that the process
4810
3714
holding the lock has been stopped.
4811
3715
4812
You can get information on what locks are open via the 'bzr info
4813
[location]' command.
4814
3716
You can get information on what locks are open via the 'bzr info' command.
3717
4815
3718
:Examples:
4816
3719
bzr break-lock
4817
bzr break-lock bzr+ssh://example.com/bzr/foo
4818
3720
"""
4819
3721
takes_args = ['location?']
4820
3722
4826
3728
control.break_lock()
4827
3729
except NotImplementedError:
4828
3730
pass
4829
3731
4830
3732
4831
3733
class cmd_wait_until_signalled(Command):
4832
__doc__ = """Test helper for test_start_and_stop_bzr_subprocess_send_signal.
3734
"""Test helper for test_start_and_stop_bzr_subprocess_send_signal.
4833
3735
4834
3736
This just prints a line to signal when it is ready, then blocks on stdin.
4835
3737
"""
4843
3745
4844
3746
4845
3747
class cmd_serve(Command):
4846
__doc__ = """Run the bzr server."""
3748
"""Run the bzr server."""
4847
3749
4848
3750
aliases = ['server']
4849
3751
4850
3752
takes_options = [
4851
3753
Option('inet',
4852
3754
help='Serve on stdin/out for use from inetd or sshd.'),
4853
RegistryOption('protocol',
4854
help="Protocol to serve.",
4855
lazy_registry=('bzrlib.transport', 'transport_server_registry'),
4856
value_switches=True),
4857
3755
Option('port',
4858
3756
help='Listen for connections on nominated port of the form '
4859
3757
'[hostname:]portnumber. Passing 0 as the port number will '
4860
'result in a dynamically allocated port. The default port '
4861
'depends on the protocol.',
3758
'result in a dynamically allocated port. The default port is '
3759
'4155.',
4862
3760
type=str),
4863
3761
Option('directory',
4864
3762
help='Serve contents of this directory.',
4866
3764
Option('allow-writes',
4867
3765
help='By default the server is a readonly server. Supplying '
4868
3766
'--allow-writes enables write access to the contents of '
4869
'the served directory and below. Note that ``bzr serve`` '
4870
'does not perform authentication, so unless some form of '
4871
'external authentication is arranged supplying this '
4872
'option leads to global uncontrolled write access to your '
4873
'file system.'
3767
'the served directory and below.'
4874
3768
),
4875
3769
]
4876
3770
4877
def get_host_and_port(self, port):
4878
"""Return the host and port to run the smart server on.
4879
4880
If 'port' is None, None will be returned for the host and port.
4881
4882
If 'port' has a colon in it, the string before the colon will be
4883
interpreted as the host.
4884
4885
:param port: A string of the port to run the server on.
4886
:return: A tuple of (host, port), where 'host' is a host name or IP,
4887
and port is an integer TCP/IP port.
4888
"""
4889
host = None
4890
if port is not None:
4891
if ':' in port:
4892
host, port = port.split(':')
4893
port = int(port)
4894
return host, port
4895
4896
def run(self, port=None, inet=False, directory=None, allow_writes=False,
4897
protocol=None):
4898
from bzrlib.transport import get_transport, transport_server_registry
3771
def run(self, port=None, inet=False, directory=None, allow_writes=False):
3772
from bzrlib import lockdir
3773
from bzrlib.smart import medium, server
3774
from bzrlib.transport import get_transport
3775
from bzrlib.transport.chroot import ChrootServer
4899
3776
if directory is None:
4900
3777
directory = os.getcwd()
4901
if protocol is None:
4902
protocol = transport_server_registry.get()
4903
host, port = self.get_host_and_port(port)
4904
3778
url = urlutils.local_path_to_url(directory)
4905
3779
if not allow_writes:
4906
3780
url = 'readonly+' + url
4907
transport = get_transport(url)
4908
protocol(transport, host, port, inet)
3781
chroot_server = ChrootServer(get_transport(url))
3782
chroot_server.setUp()
3783
t = get_transport(chroot_server.get_url())
3784
if inet:
3785
smart_server = medium.SmartServerPipeStreamMedium(
3786
sys.stdin, sys.stdout, t)
3787
else:
3788
host = medium.BZR_DEFAULT_INTERFACE
3789
if port is None:
3790
port = medium.BZR_DEFAULT_PORT
3791
else:
3792
if ':' in port:
3793
host, port = port.split(':')
3794
port = int(port)
3795
smart_server = server.SmartTCPServer(t, host=host, port=port)
3796
print 'listening on port: ', smart_server.port
3797
sys.stdout.flush()
3798
# for the duration of this server, no UI output is permitted.
3799
# note that this may cause problems with blackbox tests. This should
3800
# be changed with care though, as we dont want to use bandwidth sending
3801
# progress over stderr to smart server clients!
3802
old_factory = ui.ui_factory
3803
old_lockdir_timeout = lockdir._DEFAULT_TIMEOUT_SECONDS
3804
try:
3805
ui.ui_factory = ui.SilentUIFactory()
3806
lockdir._DEFAULT_TIMEOUT_SECONDS = 0
3807
smart_server.serve()
3808
finally:
3809
ui.ui_factory = old_factory
3810
lockdir._DEFAULT_TIMEOUT_SECONDS = old_lockdir_timeout
4909
3811
4910
3812
4911
3813
class cmd_join(Command):
4912
__doc__ = """Combine a tree into its containing tree.
4913
4914
This command requires the target tree to be in a rich-root format.
3814
"""Combine a subtree into its containing tree.
3815
3816
This command is for experimental use only. It requires the target tree
3817
to be in dirstate-with-subtree format, which cannot be converted into
3818
earlier formats.
4915
3819
4916
3820
The TREE argument should be an independent tree, inside another tree, but
4917
3821
not part of it. (Such trees can be produced by "bzr split", but also by
4920
3824
The result is a combined tree, with the subtree no longer an independant
4921
3825
part. This is marked as a merge of the subtree into the containing tree,
4922
3826
and all history is preserved.
3827
3828
If --reference is specified, the subtree retains its independence. It can
3829
be branched by itself, and can be part of multiple projects at the same
3830
time. But operations performed in the containing tree, such as commit
3831
and merge, will recurse into the subtree.
4923
3832
"""
4924
3833
4925
3834
_see_also = ['split']
4926
3835
takes_args = ['tree']
4927
3836
takes_options = [
4928
Option('reference', help='Join by reference.', hidden=True),
3837
Option('reference', help='Join by reference.'),
4929
3838
]
3839
hidden = True
4930
3840
4931
3841
def run(self, tree, reference=False):
4932
3842
sub_tree = WorkingTree.open(tree)
4950
3860
try:
4951
3861
containing_tree.subsume(sub_tree)
4952
3862
except errors.BadSubsumeSource, e:
4953
raise errors.BzrCommandError("Cannot join %s. %s" %
3863
raise errors.BzrCommandError("Cannot join %s. %s" %
4954
3864
(tree, e.reason))
4955
3865
4956
3866
4957
3867
class cmd_split(Command):
4958
__doc__ = """Split a subdirectory of a tree into a separate tree.
3868
"""Split a subdirectory of a tree into a separate tree.
4959
3869
4960
3870
This command will produce a target tree in a format that supports
4961
3871
rich roots, like 'rich-root' or 'rich-root-pack'. These formats cannot be
4966
3876
branch. Commits in the top-level tree will not apply to the new subtree.
4967
3877
"""
4968
3878
4969
_see_also = ['join']
3879
# join is not un-hidden yet
3880
#_see_also = ['join']
4970
3881
takes_args = ['tree']
4971
3882
4972
3883
def run(self, tree):
4977
3888
try:
4978
3889
containing_tree.extract(sub_id)
4979
3890
except errors.RootNotRich:
4980
raise errors.RichRootUpgradeRequired(containing_tree.branch.base)
3891
raise errors.UpgradeRequired(containing_tree.branch.base)
4981
3892
4982
3893
4983
3894
class cmd_merge_directive(Command):
4984
__doc__ = """Generate a merge directive for auto-merge tools.
3895
"""Generate a merge directive for auto-merge tools.
4985
3896
4986
3897
A directive requests a merge to be performed, and also provides all the
4987
3898
information necessary to do so. This means it must either include a
5080
3991
5081
3992
5082
3993
class cmd_send(Command):
5083
__doc__ = """Mail or create a merge-directive for submitting changes.
3994
"""Mail or create a merge-directive for submiting changes.
5084
3995
5085
3996
A merge directive provides many things needed for requesting merges:
5086
3997
5092
4003
directly from the merge directive, without retrieving data from a
5093
4004
branch.
5094
4005
5095
`bzr send` creates a compact data set that, when applied using bzr
5096
merge, has the same effect as merging from the source branch.
5097
5098
By default the merge directive is self-contained and can be applied to any
5099
branch containing submit_branch in its ancestory without needing access to
5100
the source branch.
5101
5102
If --no-bundle is specified, then Bazaar doesn't send the contents of the
5103
revisions, but only a structured request to merge from the
5104
public_location. In that case the public_branch is needed and it must be
5105
up-to-date and accessible to the recipient. The public_branch is always
5106
included if known, so that people can check it later.
5107
5108
The submit branch defaults to the parent of the source branch, but can be
5109
overridden. Both submit branch and public branch will be remembered in
5110
branch.conf the first time they are used for a particular branch. The
5111
source branch defaults to that containing the working directory, but can
5112
be changed using --from.
5113
5114
In order to calculate those changes, bzr must analyse the submit branch.
5115
Therefore it is most efficient for the submit branch to be a local mirror.
5116
If a public location is known for the submit_branch, that location is used
5117
in the merge directive.
5118
5119
The default behaviour is to send the merge directive by mail, unless -o is
5120
given, in which case it is sent to a file.
4006
If --no-bundle is specified, then public_branch is needed (and must be
4007
up-to-date), so that the receiver can perform the merge using the
4008
public_branch. The public_branch is always included if known, so that
4009
people can check it later.
4010
4011
The submit branch defaults to the parent, but can be overridden. Both
4012
submit branch and public branch will be remembered if supplied.
4013
4014
If a public_branch is known for the submit_branch, that public submit
4015
branch is used in the merge instructions. This means that a local mirror
4016
can be used as your actual submit branch, once you have set public_branch
4017
for that mirror.
5121
4018
5122
4019
Mail is sent using your preferred mail program. This should be transparent
5123
4020
on Windows (it uses MAPI). On Linux, it requires the xdg-email utility.
5124
4021
If the preferred client can't be found (or used), your editor will be used.
5125
4022
5126
4023
To use a specific mail program, set the mail_client configuration option.
5127
4024
(For Thunderbird 1.5, this works around some bugs.) Supported values for
5128
specific clients are "claws", "evolution", "kmail", "mail.app" (MacOS X's
5129
Mail.app), "mutt", and "thunderbird"; generic options are "default",
5130
"editor", "emacsclient", "mapi", and "xdg-email". Plugins may also add
5131
supported clients.
4025
specific clients are "evolution", "kmail", "mutt", and "thunderbird";
4026
generic options are "default", "editor", "emacsclient", "mapi", and
4027
"xdg-email".
5132
4028
5133
4029
If mail is being sent, a to address is required. This can be supplied
5134
4030
either on the commandline, by setting the submit_to configuration
5135
option in the branch itself or the child_submit_to configuration option
4031
option in the branch itself or the child_submit_to configuration option
5136
4032
in the submit branch.
5137
4033
5138
4034
Two formats are currently supported: "4" uses revision bundle format 4 and
5140
4036
older formats. It is compatible with Bazaar 0.19 and later. It is the
5141
4037
default. "0.9" uses revision bundle format 0.9 and merge directive
5142
4038
format 1. It is compatible with Bazaar 0.12 - 0.18.
5143
5144
The merge directives created by bzr send may be applied using bzr merge or
5145
bzr pull by specifying a file containing a merge directive as the location.
5146
5147
bzr send makes extensive use of public locations to map local locations into
5148
URLs that can be used by other people. See `bzr help configuration` to
5149
set them, and use `bzr info` to display them.
4039
4040
Merge directives are applied using the merge command or the pull command.
5150
4041
"""
5151
4042
5152
4043
encoding_type = 'exact'
5168
4059
short_name='f',
5169
4060
type=unicode),
5170
4061
Option('output', short_name='o',
5171
help='Write merge directive to this file or directory; '
4062
help='Write merge directive to this file; '
5172
4063
'use - for stdout.',
5173
4064
type=unicode),
5174
Option('strict',
5175
help='Refuse to send if there are uncommitted changes in'
5176
' the working tree, --no-strict disables the check.'),
5177
4065
Option('mail-to', help='Mail the request to this address.',
5178
4066
type=unicode),
5179
4067
'revision',
5180
4068
'message',
5181
Option('body', help='Body for the email.', type=unicode),
5182
RegistryOption('format',
5183
help='Use the specified output format.',
5184
lazy_registry=('bzrlib.send', 'format_registry')),
4069
RegistryOption.from_kwargs('format',
4070
'Use the specified output format.',
4071
**{'4': 'Bundle format 4, Merge Directive 2 (default)',
4072
'0.9': 'Bundle format 0.9, Merge Directive 1',})
5185
4073
]
5186
4074
5187
4075
def run(self, submit_branch=None, public_branch=None, no_bundle=False,
5188
4076
no_patch=False, revision=None, remember=False, output=None,
5189
format=None, mail_to=None, message=None, body=None,
5190
strict=None, **kwargs):
5191
from bzrlib.send import send
5192
return send(submit_branch, revision, public_branch, remember,
5193
format, no_bundle, no_patch, output,
5194
kwargs.get('from', '.'), mail_to, message, body,
5195
self.outf,
5196
strict=strict)
4077
format='4', mail_to=None, message=None, **kwargs):
4078
return self._run(submit_branch, revision, public_branch, remember,
4079
format, no_bundle, no_patch, output,
4080
kwargs.get('from', '.'), mail_to, message)
4081
4082
def _run(self, submit_branch, revision, public_branch, remember, format,
4083
no_bundle, no_patch, output, from_, mail_to, message):
4084
from bzrlib.revision import NULL_REVISION
4085
branch = Branch.open_containing(from_)[0]
4086
if output is None:
4087
outfile = StringIO()
4088
elif output == '-':
4089
outfile = self.outf
4090
else:
4091
outfile = open(output, 'wb')
4092
# we may need to write data into branch's repository to calculate
4093
# the data to send.
4094
branch.lock_write()
4095
try:
4096
if output is None:
4097
config = branch.get_config()
4098
if mail_to is None:
4099
mail_to = config.get_user_option('submit_to')
4100
mail_client = config.get_mail_client()
4101
if remember and submit_branch is None:
4102
raise errors.BzrCommandError(
4103
'--remember requires a branch to be specified.')
4104
stored_submit_branch = branch.get_submit_branch()
4105
remembered_submit_branch = False
4106
if submit_branch is None:
4107
submit_branch = stored_submit_branch
4108
remembered_submit_branch = True
4109
else:
4110
if stored_submit_branch is None or remember:
4111
branch.set_submit_branch(submit_branch)
4112
if submit_branch is None:
4113
submit_branch = branch.get_parent()
4114
remembered_submit_branch = True
4115
if submit_branch is None:
4116
raise errors.BzrCommandError('No submit branch known or'
4117
' specified')
4118
if remembered_submit_branch:
4119
note('Using saved location: %s', submit_branch)
4120
4121
if mail_to is None:
4122
submit_config = Branch.open(submit_branch).get_config()
4123
mail_to = submit_config.get_user_option("child_submit_to")
4124
4125
stored_public_branch = branch.get_public_branch()
4126
if public_branch is None:
4127
public_branch = stored_public_branch
4128
elif stored_public_branch is None or remember:
4129
branch.set_public_branch(public_branch)
4130
if no_bundle and public_branch is None:
4131
raise errors.BzrCommandError('No public branch specified or'
4132
' known')
4133
base_revision_id = None
4134
revision_id = None
4135
if revision is not None:
4136
if len(revision) > 2:
4137
raise errors.BzrCommandError('bzr send takes '
4138
'at most two one revision identifiers')
4139
revision_id = revision[-1].as_revision_id(branch)
4140
if len(revision) == 2:
4141
base_revision_id = revision[0].as_revision_id(branch)
4142
if revision_id is None:
4143
revision_id = branch.last_revision()
4144
if revision_id == NULL_REVISION:
4145
raise errors.BzrCommandError('No revisions to submit.')
4146
if format == '4':
4147
directive = merge_directive.MergeDirective2.from_objects(
4148
branch.repository, revision_id, time.time(),
4149
osutils.local_time_offset(), submit_branch,
4150
public_branch=public_branch, include_patch=not no_patch,
4151
include_bundle=not no_bundle, message=message,
4152
base_revision_id=base_revision_id)
4153
elif format == '0.9':
4154
if not no_bundle:
4155
if not no_patch:
4156
patch_type = 'bundle'
4157
else:
4158
raise errors.BzrCommandError('Format 0.9 does not'
4159
' permit bundle with no patch')
4160
else:
4161
if not no_patch:
4162
patch_type = 'diff'
4163
else:
4164
patch_type = None
4165
directive = merge_directive.MergeDirective.from_objects(
4166
branch.repository, revision_id, time.time(),
4167
osutils.local_time_offset(), submit_branch,
4168
public_branch=public_branch, patch_type=patch_type,
4169
message=message)
4170
4171
outfile.writelines(directive.to_lines())
4172
if output is None:
4173
subject = '[MERGE] '
4174
if message is not None:
4175
subject += message
4176
else:
4177
revision = branch.repository.get_revision(revision_id)
4178
subject += revision.get_summary()
4179
basename = directive.get_disk_name(branch)
4180
mail_client.compose_merge_request(mail_to, subject,
4181
outfile.getvalue(), basename)
4182
finally:
4183
if output != '-':
4184
outfile.close()
4185
branch.unlock()
5197
4186
5198
4187
5199
4188
class cmd_bundle_revisions(cmd_send):
5200
__doc__ = """Create a merge-directive for submitting changes.
4189
4190
"""Create a merge-directive for submiting changes.
5201
4191
5202
4192
A merge directive provides many things needed for requesting merges:
5203
4193
5243
4233
type=unicode),
5244
4234
Option('output', short_name='o', help='Write directive to this file.',
5245
4235
type=unicode),
5246
Option('strict',
5247
help='Refuse to bundle revisions if there are uncommitted'
5248
' changes in the working tree, --no-strict disables the check.'),
5249
4236
'revision',
5250
RegistryOption('format',
5251
help='Use the specified output format.',
5252
lazy_registry=('bzrlib.send', 'format_registry')),
4237
RegistryOption.from_kwargs('format',
4238
'Use the specified output format.',
4239
**{'4': 'Bundle format 4, Merge Directive 2 (default)',
4240
'0.9': 'Bundle format 0.9, Merge Directive 1',})
5253
4241
]
5254
4242
aliases = ['bundle']
5255
4243
5259
4247
5260
4248
def run(self, submit_branch=None, public_branch=None, no_bundle=False,
5261
4249
no_patch=False, revision=None, remember=False, output=None,
5262
format=None, strict=None, **kwargs):
4250
format='4', **kwargs):
5263
4251
if output is None:
5264
4252
output = '-'
5265
from bzrlib.send import send
5266
return send(submit_branch, revision, public_branch, remember,
4253
return self._run(submit_branch, revision, public_branch, remember,
5267
4254
format, no_bundle, no_patch, output,
5268
kwargs.get('from', '.'), None, None, None,
5269
self.outf, strict=strict)
4255
kwargs.get('from', '.'), None, None)
5270
4256
5271
4257
5272
4258
class cmd_tag(Command):
5273
__doc__ = """Create, remove or modify a tag naming a revision.
5274
4259
"""Create, remove or modify a tag naming a revision.
4260
5275
4261
Tags give human-meaningful names to revisions. Commands that take a -r
5276
4262
(--revision) option can be given -rtag:X, where X is any previously
5277
4263
created tag.
5279
4265
Tags are stored in the branch. Tags are copied from one branch to another
5280
4266
along when you branch, push, pull or merge.
5281
4267
5282
It is an error to give a tag name that already exists unless you pass
4268
It is an error to give a tag name that already exists unless you pass
5283
4269
--force, in which case the tag is moved to point to the new revision.
5284
5285
To rename a tag (change the name but keep it on the same revsion), run ``bzr
5286
tag new-name -r tag:old-name`` and then ``bzr tag --delete oldname``.
5287
5288
If no tag name is specified it will be determined through the
5289
'automatic_tag_name' hook. This can e.g. be used to automatically tag
5290
upstream releases by reading configure.ac. See ``bzr help hooks`` for
5291
details.
5292
4270
"""
5293
4271
5294
4272
_see_also = ['commit', 'tags']
5295
takes_args = ['tag_name?']
4273
takes_args = ['tag_name']
5296
4274
takes_options = [
5297
4275
Option('delete',
5298
4276
help='Delete this tag rather than placing it.',
5308
4286
'revision',
5309
4287
]
5310
4288
5311
def run(self, tag_name=None,
4289
def run(self, tag_name,
5312
4290
delete=None,
5313
4291
directory='.',
5314
4292
force=None,
5315
4293
revision=None,
5316
4294
):
5317
4295
branch, relpath = Branch.open_containing(directory)
5318
self.add_cleanup(branch.lock_write().unlock)
5319
if delete:
5320
if tag_name is None:
5321
raise errors.BzrCommandError("No tag specified to delete.")
5322
branch.tags.delete_tag(tag_name)
5323
self.outf.write('Deleted tag %s.\n' % tag_name)
5324
else:
5325
if revision:
5326
if len(revision) != 1:
5327
raise errors.BzrCommandError(
5328
"Tags can only be placed on a single revision, "
5329
"not on a range")
5330
revision_id = revision[0].as_revision_id(branch)
4296
branch.lock_write()
4297
try:
4298
if delete:
4299
branch.tags.delete_tag(tag_name)
4300
self.outf.write('Deleted tag %s.\n' % tag_name)
5331
4301
else:
5332
revision_id = branch.last_revision()
5333
if tag_name is None:
5334
tag_name = branch.automatic_tag_name(revision_id)
5335
if tag_name is None:
5336
raise errors.BzrCommandError(
5337
"Please specify a tag name.")
5338
if (not force) and branch.tags.has_tag(tag_name):
5339
raise errors.TagAlreadyExists(tag_name)
5340
branch.tags.set_tag(tag_name, revision_id)
5341
self.outf.write('Created tag %s.\n' % tag_name)
4302
if revision:
4303
if len(revision) != 1:
4304
raise errors.BzrCommandError(
4305
"Tags can only be placed on a single revision, "
4306
"not on a range")
4307
revision_id = revision[0].as_revision_id(branch)
4308
else:
4309
revision_id = branch.last_revision()
4310
if (not force) and branch.tags.has_tag(tag_name):
4311
raise errors.TagAlreadyExists(tag_name)
4312
branch.tags.set_tag(tag_name, revision_id)
4313
self.outf.write('Created tag %s.\n' % tag_name)
4314
finally:
4315
branch.unlock()
5342
4316
5343
4317
5344
4318
class cmd_tags(Command):
5345
__doc__ = """List tags.
4319
"""List tags.
5346
4320
5347
4321
This command shows a table of tag names and the revisions they reference.
5348
4322
"""
5360
4334
time='Sort tags chronologically.',
5361
4335
),
5362
4336
'show-ids',
5363
'revision',
5364
4337
]
5365
4338
5366
4339
@display_command
5368
4341
directory='.',
5369
4342
sort='alpha',
5370
4343
show_ids=False,
5371
revision=None,
5372
4344
):
5373
4345
branch, relpath = Branch.open_containing(directory)
5374
5375
4346
tags = branch.tags.get_tag_dict().items()
5376
if not tags:
5377
return
5378
5379
self.add_cleanup(branch.lock_read().unlock)
5380
if revision:
5381
graph = branch.repository.get_graph()
5382
rev1, rev2 = _get_revision_range(revision, branch, self.name())
5383
revid1, revid2 = rev1.rev_id, rev2.rev_id
5384
# only show revisions between revid1 and revid2 (inclusive)
5385
tags = [(tag, revid) for tag, revid in tags if
5386
graph.is_between(revid, revid1, revid2)]
5387
4347
if sort == 'alpha':
5388
4348
tags.sort()
5389
4349
elif sort == 'time':
5399
4359
tags.sort(key=lambda x: timestamps[x[1]])
5400
4360
if not show_ids:
5401
4361
# [ (tag, revid), ... ] -> [ (tag, dotted_revno), ... ]
5402
for index, (tag, revid) in enumerate(tags):
5403
try:
5404
revno = branch.revision_id_to_dotted_revno(revid)
5405
if isinstance(revno, tuple):
5406
revno = '.'.join(map(str, revno))
5407
except errors.NoSuchRevision:
5408
# Bad tag data/merges can lead to tagged revisions
5409
# which are not in this branch. Fail gracefully ...
5410
revno = '?'
5411
tags[index] = (tag, revno)
5412
self.cleanup_now()
4362
revno_map = branch.get_revision_id_to_revno_map()
4363
tags = [ (tag, '.'.join(map(str, revno_map.get(revid, ('?',)))))
4364
for tag, revid in tags ]
5413
4365
for tag, revspec in tags:
5414
4366
self.outf.write('%-20s %s\n' % (tag, revspec))
5415
4367
5416
4368
5417
4369
class cmd_reconfigure(Command):
5418
__doc__ = """Reconfigure the type of a bzr directory.
4370
"""Reconfigure the type of a bzr directory.
5419
4371
5420
4372
A target configuration must be specified.
5421
4373
5430
4382
5431
4383
_see_also = ['branches', 'checkouts', 'standalone-trees', 'working-trees']
5432
4384
takes_args = ['location?']
5433
takes_options = [
5434
RegistryOption.from_kwargs(
5435
'target_type',
5436
title='Target type',
5437
help='The type to reconfigure the directory to.',
5438
value_switches=True, enum_switch=False,
5439
branch='Reconfigure to be an unbound branch with no working tree.',
5440
tree='Reconfigure to be an unbound branch with a working tree.',
5441
checkout='Reconfigure to be a bound branch with a working tree.',
5442
lightweight_checkout='Reconfigure to be a lightweight'
5443
' checkout (with no local history).',
5444
standalone='Reconfigure to be a standalone branch '
5445
'(i.e. stop using shared repository).',
5446
use_shared='Reconfigure to use a shared repository.',
5447
with_trees='Reconfigure repository to create '
5448
'working trees on branches by default.',
5449
with_no_trees='Reconfigure repository to not create '
5450
'working trees on branches by default.'
5451
),
5452
Option('bind-to', help='Branch to bind checkout to.', type=str),
5453
Option('force',
5454
help='Perform reconfiguration even if local changes'
5455
' will be lost.'),
5456
Option('stacked-on',
5457
help='Reconfigure a branch to be stacked on another branch.',
5458
type=unicode,
5459
),
5460
Option('unstacked',
5461
help='Reconfigure a branch to be unstacked. This '
5462
'may require copying substantial data into it.',
5463
),
5464
]
4385
takes_options = [RegistryOption.from_kwargs('target_type',
4386
title='Target type',
4387
help='The type to reconfigure the directory to.',
4388
value_switches=True, enum_switch=False,
4389
branch='Reconfigure to be an unbound branch '
4390
'with no working tree.',
4391
tree='Reconfigure to be an unbound branch '
4392
'with a working tree.',
4393
checkout='Reconfigure to be a bound branch '
4394
'with a working tree.',
4395
lightweight_checkout='Reconfigure to be a lightweight'
4396
' checkout (with no local history).',
4397
standalone='Reconfigure to be a standalone branch '
4398
'(i.e. stop using shared repository).',
4399
use_shared='Reconfigure to use a shared repository.'),
4400
Option('bind-to', help='Branch to bind checkout to.',
4401
type=str),
4402
Option('force',
4403
help='Perform reconfiguration even if local changes'
4404
' will be lost.')
4405
]
5465
4406
5466
def run(self, location=None, target_type=None, bind_to=None, force=False,
5467
stacked_on=None,
5468
unstacked=None):
4407
def run(self, location=None, target_type=None, bind_to=None, force=False):
5469
4408
directory = bzrdir.BzrDir.open(location)
5470
if stacked_on and unstacked:
5471
raise BzrCommandError("Can't use both --stacked-on and --unstacked")
5472
elif stacked_on is not None:
5473
reconfigure.ReconfigureStackedOn().apply(directory, stacked_on)
5474
elif unstacked:
5475
reconfigure.ReconfigureUnstacked().apply(directory)
5476
# At the moment you can use --stacked-on and a different
5477
# reconfiguration shape at the same time; there seems no good reason
5478
# to ban it.
5479
4409
if target_type is None:
5480
if stacked_on or unstacked:
5481
return
5482
else:
5483
raise errors.BzrCommandError('No target configuration '
5484
'specified')
4410
raise errors.BzrCommandError('No target configuration specified')
5485
4411
elif target_type == 'branch':
5486
4412
reconfiguration = reconfigure.Reconfigure.to_branch(directory)
5487
4413
elif target_type == 'tree':
5488
4414
reconfiguration = reconfigure.Reconfigure.to_tree(directory)
5489
4415
elif target_type == 'checkout':
5490
reconfiguration = reconfigure.Reconfigure.to_checkout(
5491
directory, bind_to)
4416
reconfiguration = reconfigure.Reconfigure.to_checkout(directory,
4417
bind_to)
5492
4418
elif target_type == 'lightweight-checkout':
5493
4419
reconfiguration = reconfigure.Reconfigure.to_lightweight_checkout(
5494
4420
directory, bind_to)
5496
4422
reconfiguration = reconfigure.Reconfigure.to_use_shared(directory)
5497
4423
elif target_type == 'standalone':
5498
4424
reconfiguration = reconfigure.Reconfigure.to_standalone(directory)
5499
elif target_type == 'with-trees':
5500
reconfiguration = reconfigure.Reconfigure.set_repository_trees(
5501
directory, True)
5502
elif target_type == 'with-no-trees':
5503
reconfiguration = reconfigure.Reconfigure.set_repository_trees(
5504
directory, False)
5505
4425
reconfiguration.apply(force)
5506
4426
5507
4427
5508
4428
class cmd_switch(Command):
5509
__doc__ = """Set the branch of a checkout and update.
5510
4429
"""Set the branch of a checkout and update.
4430
5511
4431
For lightweight checkouts, this changes the branch being referenced.
5512
4432
For heavyweight checkouts, this checks that there are no local commits
5513
4433
versus the current bound branch, then it makes the local branch a mirror
5514
4434
of the new location and binds to it.
5515
4435
5516
4436
In both cases, the working tree is updated and uncommitted changes
5517
4437
are merged. The user can commit or revert these as they desire.
5518
4438
5522
4442
directory of the current branch. For example, if you are currently in a
5523
4443
checkout of /path/to/branch, specifying 'newbranch' will find a branch at
5524
4444
/path/to/newbranch.
5525
5526
Bound branches use the nickname of its master branch unless it is set
5527
locally, in which case switching will update the local nickname to be
5528
that of the master.
5529
4445
"""
5530
4446
5531
takes_args = ['to_location?']
4447
takes_args = ['to_location']
5532
4448
takes_options = [Option('force',
5533
help='Switch even if local commits will be lost.'),
5534
'revision',
5535
Option('create-branch', short_name='b',
5536
help='Create the target branch from this one before'
5537
' switching to it.'),
5538
]
4449
help='Switch even if local commits will be lost.')
4450
]
5539
4451
5540
def run(self, to_location=None, force=False, create_branch=False,
5541
revision=None):
4452
def run(self, to_location, force=False):
5542
4453
from bzrlib import switch
5543
4454
tree_location = '.'
5544
revision = _get_one_revision('switch', revision)
5545
4455
control_dir = bzrdir.BzrDir.open_containing(tree_location)[0]
5546
if to_location is None:
5547
if revision is None:
5548
raise errors.BzrCommandError('You must supply either a'
5549
' revision or a location')
5550
to_location = '.'
5551
4456
try:
5552
branch = control_dir.open_branch()
5553
had_explicit_nick = branch.get_config().has_explicit_nickname()
4457
to_branch = Branch.open(to_location)
5554
4458
except errors.NotBranchError:
5555
branch = None
5556
had_explicit_nick = False
5557
if create_branch:
5558
if branch is None:
5559
raise errors.BzrCommandError('cannot create branch without'
5560
' source branch')
5561
to_location = directory_service.directories.dereference(
5562
to_location)
5563
if '/' not in to_location and '\\' not in to_location:
5564
# This path is meant to be relative to the existing branch
5565
this_url = self._get_branch_location(control_dir)
5566
to_location = urlutils.join(this_url, '..', to_location)
5567
to_branch = branch.bzrdir.sprout(to_location,
5568
possible_transports=[branch.bzrdir.root_transport],
5569
source_branch=branch).open_branch()
5570
else:
5571
try:
5572
to_branch = Branch.open(to_location)
5573
except errors.NotBranchError:
5574
this_url = self._get_branch_location(control_dir)
5575
to_branch = Branch.open(
5576
urlutils.join(this_url, '..', to_location))
5577
if revision is not None:
5578
revision = revision.as_revision_id(to_branch)
5579
switch.switch(control_dir, to_branch, force, revision_id=revision)
5580
if had_explicit_nick:
5581
branch = control_dir.open_branch() #get the new branch!
5582
branch.nick = to_branch.nick
4459
to_branch = Branch.open(
4460
control_dir.open_branch().base + '../' + to_location)
4461
switch.switch(control_dir, to_branch, force)
5583
4462
note('Switched to branch: %s',
5584
4463
urlutils.unescape_for_display(to_branch.base, 'utf-8'))
5585
4464
5586
def _get_branch_location(self, control_dir):
5587
"""Return location of branch for this control dir."""
5588
try:
5589
this_branch = control_dir.open_branch()
5590
# This may be a heavy checkout, where we want the master branch
5591
master_location = this_branch.get_bound_location()
5592
if master_location is not None:
5593
return master_location
5594
# If not, use a local sibling
5595
return this_branch.base
5596
except errors.NotBranchError:
5597
format = control_dir.find_branch_format()
5598
if getattr(format, 'get_reference', None) is not None:
5599
return format.get_reference(control_dir)
5600
else:
5601
return control_dir.root_transport.base
5602
5603
5604
class cmd_view(Command):
5605
__doc__ = """Manage filtered views.
5606
5607
Views provide a mask over the tree so that users can focus on
5608
a subset of a tree when doing their work. After creating a view,
5609
commands that support a list of files - status, diff, commit, etc -
5610
effectively have that list of files implicitly given each time.
5611
An explicit list of files can still be given but those files
5612
must be within the current view.
5613
5614
In most cases, a view has a short life-span: it is created to make
5615
a selected change and is deleted once that change is committed.
5616
At other times, you may wish to create one or more named views
5617
and switch between them.
5618
5619
To disable the current view without deleting it, you can switch to
5620
the pseudo view called ``off``. This can be useful when you need
5621
to see the whole tree for an operation or two (e.g. merge) but
5622
want to switch back to your view after that.
5623
5624
:Examples:
5625
To define the current view::
5626
5627
bzr view file1 dir1 ...
5628
5629
To list the current view::
5630
5631
bzr view
5632
5633
To delete the current view::
5634
5635
bzr view --delete
5636
5637
To disable the current view without deleting it::
5638
5639
bzr view --switch off
5640
5641
To define a named view and switch to it::
5642
5643
bzr view --name view-name file1 dir1 ...
5644
5645
To list a named view::
5646
5647
bzr view --name view-name
5648
5649
To delete a named view::
5650
5651
bzr view --name view-name --delete
5652
5653
To switch to a named view::
5654
5655
bzr view --switch view-name
5656
5657
To list all views defined::
5658
5659
bzr view --all
5660
5661
To delete all views::
5662
5663
bzr view --delete --all
5664
"""
5665
5666
_see_also = []
5667
takes_args = ['file*']
5668
takes_options = [
5669
Option('all',
5670
help='Apply list or delete action to all views.',
5671
),
5672
Option('delete',
5673
help='Delete the view.',
5674
),
5675
Option('name',
5676
help='Name of the view to define, list or delete.',
5677
type=unicode,
5678
),
5679
Option('switch',
5680
help='Name of the view to switch to.',
5681
type=unicode,
5682
),
5683
]
5684
5685
def run(self, file_list,
5686
all=False,
5687
delete=False,
5688
name=None,
5689
switch=None,
5690
):
5691
tree, file_list = tree_files(file_list, apply_view=False)
5692
current_view, view_dict = tree.views.get_view_info()
5693
if name is None:
5694
name = current_view
5695
if delete:
5696
if file_list:
5697
raise errors.BzrCommandError(
5698
"Both --delete and a file list specified")
5699
elif switch:
5700
raise errors.BzrCommandError(
5701
"Both --delete and --switch specified")
5702
elif all:
5703
tree.views.set_view_info(None, {})
5704
self.outf.write("Deleted all views.\n")
5705
elif name is None:
5706
raise errors.BzrCommandError("No current view to delete")
5707
else:
5708
tree.views.delete_view(name)
5709
self.outf.write("Deleted '%s' view.\n" % name)
5710
elif switch:
5711
if file_list:
5712
raise errors.BzrCommandError(
5713
"Both --switch and a file list specified")
5714
elif all:
5715
raise errors.BzrCommandError(
5716
"Both --switch and --all specified")
5717
elif switch == 'off':
5718
if current_view is None:
5719
raise errors.BzrCommandError("No current view to disable")
5720
tree.views.set_view_info(None, view_dict)
5721
self.outf.write("Disabled '%s' view.\n" % (current_view))
5722
else:
5723
tree.views.set_view_info(switch, view_dict)
5724
view_str = views.view_display_str(tree.views.lookup_view())
5725
self.outf.write("Using '%s' view: %s\n" % (switch, view_str))
5726
elif all:
5727
if view_dict:
5728
self.outf.write('Views defined:\n')
5729
for view in sorted(view_dict):
5730
if view == current_view:
5731
active = "=>"
5732
else:
5733
active = " "
5734
view_str = views.view_display_str(view_dict[view])
5735
self.outf.write('%s %-20s %s\n' % (active, view, view_str))
5736
else:
5737
self.outf.write('No views defined.\n')
5738
elif file_list:
5739
if name is None:
5740
# No name given and no current view set
5741
name = 'my'
5742
elif name == 'off':
5743
raise errors.BzrCommandError(
5744
"Cannot change the 'off' pseudo view")
5745
tree.views.set_view(name, sorted(file_list))
5746
view_str = views.view_display_str(tree.views.lookup_view())
5747
self.outf.write("Using '%s' view: %s\n" % (name, view_str))
5748
else:
5749
# list the files
5750
if name is None:
5751
# No name given and no current view set
5752
self.outf.write('No current view.\n')
5753
else:
5754
view_str = views.view_display_str(tree.views.lookup_view(name))
5755
self.outf.write("'%s' view is: %s\n" % (name, view_str))
5756
5757
4465
5758
4466
class cmd_hooks(Command):
5759
__doc__ = """Show hooks."""
5760
5761
hidden = True
5762
5763
def run(self):
5764
for hook_key in sorted(hooks.known_hooks.keys()):
5765
some_hooks = hooks.known_hooks_key_to_object(hook_key)
5766
self.outf.write("%s:\n" % type(some_hooks).__name__)
5767
for hook_name, hook_point in sorted(some_hooks.items()):
5768
self.outf.write(" %s:\n" % (hook_name,))
5769
found_hooks = list(hook_point)
5770
if found_hooks:
5771
for hook in found_hooks:
5772
self.outf.write(" %s\n" %
5773
(some_hooks.get_hook_name(hook),))
5774
else:
5775
self.outf.write(" <no hooks installed>\n")
5776
5777
5778
class cmd_remove_branch(Command):
5779
__doc__ = """Remove a branch.
5780
5781
This will remove the branch from the specified location but
5782
will keep any working tree or repository in place.
5783
5784
:Examples:
5785
5786
Remove the branch at repo/trunk::
5787
5788
bzr remove-branch repo/trunk
5789
5790
"""
5791
5792
takes_args = ["location?"]
5793
5794
aliases = ["rmbranch"]
5795
5796
def run(self, location=None):
5797
if location is None:
5798
location = "."
5799
branch = Branch.open_containing(location)[0]
5800
branch.bzrdir.destroy_branch()
5801
5802
5803
class cmd_shelve(Command):
5804
__doc__ = """Temporarily set aside some changes from the current tree.
5805
5806
Shelve allows you to temporarily put changes you've made "on the shelf",
5807
ie. out of the way, until a later time when you can bring them back from
5808
the shelf with the 'unshelve' command. The changes are stored alongside
5809
your working tree, and so they aren't propagated along with your branch nor
5810
will they survive its deletion.
5811
5812
If shelve --list is specified, previously-shelved changes are listed.
5813
5814
Shelve is intended to help separate several sets of changes that have
5815
been inappropriately mingled. If you just want to get rid of all changes
5816
and you don't need to restore them later, use revert. If you want to
5817
shelve all text changes at once, use shelve --all.
5818
5819
If filenames are specified, only the changes to those files will be
5820
shelved. Other files will be left untouched.
5821
5822
If a revision is specified, changes since that revision will be shelved.
5823
5824
You can put multiple items on the shelf, and by default, 'unshelve' will
5825
restore the most recently shelved changes.
5826
"""
5827
5828
takes_args = ['file*']
5829
5830
takes_options = [
5831
'revision',
5832
Option('all', help='Shelve all changes.'),
5833
'message',
5834
RegistryOption('writer', 'Method to use for writing diffs.',
5835
bzrlib.option.diff_writer_registry,
5836
value_switches=True, enum_switch=False),
5837
5838
Option('list', help='List shelved changes.'),
5839
Option('destroy',
5840
help='Destroy removed changes instead of shelving them.'),
5841
]
5842
_see_also = ['unshelve']
5843
5844
def run(self, revision=None, all=False, file_list=None, message=None,
5845
writer=None, list=False, destroy=False):
5846
if list:
5847
return self.run_for_list()
5848
from bzrlib.shelf_ui import Shelver
5849
if writer is None:
5850
writer = bzrlib.option.diff_writer_registry.get()
5851
try:
5852
shelver = Shelver.from_args(writer(sys.stdout), revision, all,
5853
file_list, message, destroy=destroy)
5854
try:
5855
shelver.run()
5856
finally:
5857
shelver.finalize()
5858
except errors.UserAbort:
5859
return 0
5860
5861
def run_for_list(self):
5862
tree = WorkingTree.open_containing('.')[0]
5863
self.add_cleanup(tree.lock_read().unlock)
5864
manager = tree.get_shelf_manager()
5865
shelves = manager.active_shelves()
5866
if len(shelves) == 0:
5867
note('No shelved changes.')
5868
return 0
5869
for shelf_id in reversed(shelves):
5870
message = manager.get_metadata(shelf_id).get('message')
5871
if message is None:
5872
message = '<no message>'
5873
self.outf.write('%3d: %s\n' % (shelf_id, message))
5874
return 1
5875
5876
5877
class cmd_unshelve(Command):
5878
__doc__ = """Restore shelved changes.
5879
5880
By default, the most recently shelved changes are restored. However if you
5881
specify a shelf by id those changes will be restored instead. This works
5882
best when the changes don't depend on each other.
5883
"""
5884
5885
takes_args = ['shelf_id?']
5886
takes_options = [
5887
RegistryOption.from_kwargs(
5888
'action', help="The action to perform.",
5889
enum_switch=False, value_switches=True,
5890
apply="Apply changes and remove from the shelf.",
5891
dry_run="Show changes, but do not apply or remove them.",
5892
preview="Instead of unshelving the changes, show the diff that "
5893
"would result from unshelving.",
5894
delete_only="Delete changes without applying them.",
5895
keep="Apply changes but don't delete them.",
5896
)
5897
]
5898
_see_also = ['shelve']
5899
5900
def run(self, shelf_id=None, action='apply'):
5901
from bzrlib.shelf_ui import Unshelver
5902
unshelver = Unshelver.from_args(shelf_id, action)
5903
try:
5904
unshelver.run()
5905
finally:
5906
unshelver.tree.unlock()
5907
5908
5909
class cmd_clean_tree(Command):
5910
__doc__ = """Remove unwanted files from working tree.
5911
5912
By default, only unknown files, not ignored files, are deleted. Versioned
5913
files are never deleted.
5914
5915
Another class is 'detritus', which includes files emitted by bzr during
5916
normal operations and selftests. (The value of these files decreases with
5917
time.)
5918
5919
If no options are specified, unknown files are deleted. Otherwise, option
5920
flags are respected, and may be combined.
5921
5922
To check what clean-tree will do, use --dry-run.
5923
"""
5924
takes_options = [Option('ignored', help='Delete all ignored files.'),
5925
Option('detritus', help='Delete conflict files, merge'
5926
' backups, and failed selftest dirs.'),
5927
Option('unknown',
5928
help='Delete files unknown to bzr (default).'),
5929
Option('dry-run', help='Show files to delete instead of'
5930
' deleting them.'),
5931
Option('force', help='Do not prompt before deleting.')]
5932
def run(self, unknown=False, ignored=False, detritus=False, dry_run=False,
5933
force=False):
5934
from bzrlib.clean_tree import clean_tree
5935
if not (unknown or ignored or detritus):
5936
unknown = True
5937
if dry_run:
5938
force = True
5939
clean_tree('.', unknown=unknown, ignored=ignored, detritus=detritus,
5940
dry_run=dry_run, no_prompt=force)
5941
5942
5943
class cmd_reference(Command):
5944
__doc__ = """list, view and set branch locations for nested trees.
5945
5946
If no arguments are provided, lists the branch locations for nested trees.
5947
If one argument is provided, display the branch location for that tree.
5948
If two arguments are provided, set the branch location for that tree.
5949
"""
5950
5951
hidden = True
5952
5953
takes_args = ['path?', 'location?']
5954
5955
def run(self, path=None, location=None):
5956
branchdir = '.'
5957
if path is not None:
5958
branchdir = path
5959
tree, branch, relpath =(
5960
bzrdir.BzrDir.open_containing_tree_or_branch(branchdir))
5961
if path is not None:
5962
path = relpath
5963
if tree is None:
5964
tree = branch.basis_tree()
4467
"""Show a branch's currently registered hooks.
4468
"""
4469
4470
hidden = True
4471
takes_args = ['path?']
4472
4473
def run(self, path=None):
5965
4474
if path is None:
5966
info = branch._get_all_reference_info().iteritems()
5967
self._display_reference_info(tree, branch, info)
4475
path = '.'
4476
branch_hooks = Branch.open(path).hooks
4477
for hook_type in branch_hooks:
4478
hooks = branch_hooks[hook_type]
4479
self.outf.write("%s:\n" % (hook_type,))
4480
if hooks:
4481
for hook in hooks:
4482
self.outf.write(" %s\n" %
4483
(branch_hooks.get_hook_name(hook),))
4484
else:
4485
self.outf.write(" <no hooks installed>\n")
4486
4487
4488
def _create_prefix(cur_transport):
4489
needed = [cur_transport]
4490
# Recurse upwards until we can create a directory successfully
4491
while True:
4492
new_transport = cur_transport.clone('..')
4493
if new_transport.base == cur_transport.base:
4494
raise errors.BzrCommandError(
4495
"Failed to create path prefix for %s."
4496
% cur_transport.base)
4497
try:
4498
new_transport.mkdir('.')
4499
except errors.NoSuchFile:
4500
needed.append(new_transport)
4501
cur_transport = new_transport
5968
4502
else:
5969
file_id = tree.path2id(path)
5970
if file_id is None:
5971
raise errors.NotVersionedError(path)
5972
if location is None:
5973
info = [(file_id, branch.get_reference_info(file_id))]
5974
self._display_reference_info(tree, branch, info)
5975
else:
5976
branch.set_reference_info(file_id, path, location)
5977
5978
def _display_reference_info(self, tree, branch, info):
5979
ref_list = []
5980
for file_id, (path, location) in info:
5981
try:
5982
path = tree.id2path(file_id)
5983
except errors.NoSuchId:
5984
pass
5985
ref_list.append((path, location))
5986
for path, location in sorted(ref_list):
5987
self.outf.write('%s %s\n' % (path, location))
5988
5989
5990
def _register_lazy_builtins():
5991
# register lazy builtins from other modules; called at startup and should
5992
# be only called once.
5993
for (name, aliases, module_name) in [
5994
('cmd_bundle_info', [], 'bzrlib.bundle.commands'),
5995
('cmd_dpush', [], 'bzrlib.foreign'),
5996
('cmd_version_info', [], 'bzrlib.cmd_version_info'),
5997
('cmd_resolve', ['resolved'], 'bzrlib.conflicts'),
5998
('cmd_conflicts', [], 'bzrlib.conflicts'),
5999
('cmd_sign_my_commits', [], 'bzrlib.sign_my_commits'),
6000
]:
6001
builtin_command_registry.register_lazy(name, aliases, module_name)
4503
break
4504
# Now we only need to create child directories
4505
while needed:
4506
cur_transport = needed.pop()
4507
cur_transport.ensure_base()
4508
4509
4510
# these get imported and then picked up by the scan for cmd_*
4511
# TODO: Some more consistent way to split command definitions across files;
4512
# we do need to load at least some information about them to know of
4513
# aliases. ideally we would avoid loading the implementation until the
4514
# details were needed.
4515
from bzrlib.cmd_version_info import cmd_version_info
4516
from bzrlib.conflicts import cmd_resolve, cmd_conflicts, restore
4517
from bzrlib.bundle.commands import (
4518
cmd_bundle_info,
4519
)
4520
from bzrlib.sign_my_commits import cmd_sign_my_commits
4521
from bzrlib.weave_commands import cmd_versionedfile_list, \
4522
cmd_weave_plan_merge, cmd_weave_merge_text
Loggerhead is a web-based interface for Breezy
Version: 2.0.1