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