« back to all changes in this revision
Viewing changes to bzrlib/builtins.py
- browse files at revision 1685.1.71
- compare with another revision
- download diff
- download tarball
- view history from revision 1685.1.71
- Committer: Wouter van Heyst
- Date: 2006-06-06 22:37:30 UTC
- mto: This revision was merged to the branch mainline in revision 1752.
- Revision ID: larstiq@larstiq.dyndns.org-20060606223730-a308c5429fc6c617
change branch.{get,set}_parent to store a relative path but return full urls
- files added:
- NEWS.developers
- bzrlib/bundle/old
- bzrlib/tests/interversionedfile_implementations
- bzrlib/tests/revisionstore_implementations
- bzrlib/util/urlgrabber
- files removed:
- COPYING.txt
- bzrlib/benchmarks/tree_creator
- bzrlib/help_topics
- bzrlib/help_topics/en
- bzrlib/repofmt
- bzrlib/smart
- bzrlib/tests/commands
- bzrlib/tests/intertree_implementations
- bzrlib/tests/inventory_implementations
- bzrlib/tests/per_lock
- bzrlib/tests/per_repository_reference
- bzrlib/tests/tree_implementations
- bzrlib/transport/ftp
- bzrlib/util/tests
- bzrlib/version_info_formats
- doc/developers
- doc/en
- doc/en/admin-guide
- doc/en/developer-guide
- doc/en/mini-tutorial
- doc/en/quick-reference
- doc/en/release-notes
- doc/en/tutorials
- doc/en/user-guide
- doc/en/user-guide/images
- doc/en/user-reference
- doc/es
- doc/es/guia-desarrollador
- doc/es/guia-usuario
- doc/es/mini-tutorial
- doc/es/notas-version
- doc/es/referencia
- doc/es/referencia-rapida
- man1
- tools/packaging
- tools/win32
- files renamed:
- doc/developers/HACKING.txt => HACKING
- bzrlib/bundle/bundle_data.py => bzrlib/bundle/read_bundle.py
- bzrlib/bundle/serializer/v08.py => bzrlib/bundle/serializer/v07.py
- bzrlib/deprecated_graph.py => bzrlib/graph.py
- bzrlib/_patiencediff_py.py => bzrlib/patiencediff.py
- bzrlib/tests/http_utils.py => bzrlib/tests/HTTPTestUtil.py
- bzrlib/tests/per_repository/ => bzrlib/tests/repository_implementations/
- bzrlib/tests/test_commands.py => bzrlib/tests/test_command.py
- bzrlib/tests/test_deprecated_graph.py => bzrlib/tests/test_graph.py
- bzrlib/tests/test_revisionspec.py => bzrlib/tests/test_revisionnamespaces.py
- bzrlib/tests/per_repository/test_revision.py => bzrlib/tests/test_revprops.py
- bzrlib/transport/ftp/__init__.py => bzrlib/transport/ftp.py
- bzrlib/win32utils.py => bzrlib/win32console.py
- bzrlib/xml8.py => bzrlib/xml5.py
- bzrlib/help_topics/en/configuration.txt => doc/configuration.txt
- doc/en/user-guide/plugins.txt => doc/plugins.txt
- doc/en/user-guide/setting_up_email.txt => doc/setting_up_email.txt
- doc/en/user-guide/specifying_revisions.txt => doc/specifying_revisions.txt
- doc/en/tutorials/tutorial.txt => doc/tutorial.txt
- doc/en/user-guide/using_aliases.txt => doc/using_aliases.txt
- files modified:
- .bzrignore
added
removed
bzrlib/builtins.py
1
# Copyright (C) 2004, 2005, 2006, 2007, 2008 Canonical Ltd
2
#
1
# Copyright (C) 2004, 2005, 2006 by Canonical Ltd
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
5
5
# the Free Software Foundation; either version 2 of the License, or
6
6
# (at your option) any later version.
7
#
7
8
8
# This program is distributed in the hope that it will be useful,
9
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11
11
# GNU General Public License for more details.
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
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
16
16
17
17
"""builtin bzr commands"""
18
18
19
20
import codecs
21
import errno
19
22
import os
20
21
from bzrlib.lazy_import import lazy_import
22
lazy_import(globals(), """
23
import codecs
24
import cStringIO
23
from shutil import rmtree
25
24
import sys
26
import time
27
25
28
26
import bzrlib
29
from bzrlib import (
30
bugtracker,
31
bundle,
32
btree_index,
33
bzrdir,
34
delta,
35
config,
36
errors,
37
globbing,
38
log,
39
merge as _mod_merge,
40
merge_directive,
41
osutils,
42
reconfigure,
43
revision as _mod_revision,
44
symbol_versioning,
45
transport,
46
tree as _mod_tree,
47
ui,
48
urlutils,
49
)
27
import bzrlib.branch
50
28
from bzrlib.branch import Branch
51
from bzrlib.conflicts import ConflictList
29
import bzrlib.bzrdir as bzrdir
30
from bzrlib.bundle.read_bundle import BundleReader
31
from bzrlib.bundle.apply_bundle import merge_bundle
32
from bzrlib.commands import Command, display_command
33
import bzrlib.errors as errors
34
from bzrlib.errors import (BzrError, BzrCheckError, BzrCommandError,
35
NotBranchError, DivergedBranches, NotConflicted,
36
NoSuchFile, NoWorkingTree, FileInWrongBranch,
37
NotVersionedError, BadBundle)
38
from bzrlib.log import show_one_log
39
from bzrlib.merge import Merge3Merger
40
from bzrlib.option import Option
41
import bzrlib.osutils
42
from bzrlib.progress import DummyProgress, ProgressPhase
43
from bzrlib.revision import common_ancestor
52
44
from bzrlib.revisionspec import RevisionSpec
53
from bzrlib.smtp_connection import SMTPConnection
45
import bzrlib.trace
46
from bzrlib.trace import mutter, note, log_error, warning, is_quiet
47
from bzrlib.transport.local import LocalTransport
48
import bzrlib.ui
49
import bzrlib.urlutils as urlutils
54
50
from bzrlib.workingtree import WorkingTree
55
""")
56
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
60
51
61
52
62
53
def tree_files(file_list, default_branch=u'.'):
63
54
try:
64
55
return internal_tree_files(file_list, default_branch)
65
except errors.FileInWrongBranch, e:
66
raise errors.BzrCommandError("%s is not in the same branch as %s" %
67
(e.path, file_list[0]))
68
69
70
def _get_one_revision_tree(command_name, revisions, branch=None, tree=None):
71
if branch is None:
72
branch = tree.branch
73
if revisions is None:
74
if tree is not None:
75
rev_tree = tree.basis_tree()
76
else:
77
rev_tree = branch.basis_tree()
78
else:
79
if len(revisions) != 1:
80
raise errors.BzrCommandError(
81
'bzr %s --revision takes exactly one revision identifier' % (
82
command_name,))
83
rev_tree = revisions[0].as_tree(branch)
84
return rev_tree
56
except FileInWrongBranch, e:
57
raise BzrCommandError("%s is not in the same branch as %s" %
58
(e.path, file_list[0]))
85
59
86
60
87
61
# XXX: Bad function name; should possibly also be a class method of
96
70
97
71
:param file_list: Filenames to convert.
98
72
99
:param default_branch: Fallback tree path to use if file_list is empty or
100
None.
73
:param default_branch: Fallback tree path to use if file_list is empty or None.
101
74
102
75
:return: workingtree, [relative_paths]
103
76
"""
104
77
if file_list is None or len(file_list) == 0:
105
78
return WorkingTree.open_containing(default_branch)[0], file_list
106
tree = WorkingTree.open_containing(osutils.realpath(file_list[0]))[0]
107
return tree, safe_relpath_files(tree, file_list)
108
109
110
def safe_relpath_files(tree, file_list):
111
"""Convert file_list into a list of relpaths in tree.
112
113
:param tree: A tree to operate on.
114
:param file_list: A list of user provided paths or None.
115
:return: A list of relative paths.
116
:raises errors.PathNotChild: When a provided path is in a different tree
117
than tree.
118
"""
119
if file_list is None:
120
return None
79
tree = WorkingTree.open_containing(file_list[0])[0]
121
80
new_list = []
122
81
for filename in file_list:
123
82
try:
124
new_list.append(tree.relpath(osutils.dereference_path(filename)))
83
new_list.append(tree.relpath(filename))
125
84
except errors.PathNotChild:
126
raise errors.FileInWrongBranch(tree.branch, filename)
127
return new_list
85
raise FileInWrongBranch(tree.branch, filename)
86
return tree, new_list
87
88
89
def get_format_type(typestring):
90
"""Parse and return a format specifier."""
91
if typestring == "weave":
92
return bzrdir.BzrDirFormat6()
93
if typestring == "default":
94
return bzrdir.BzrDirMetaFormat1()
95
if typestring == "metaweave":
96
format = bzrdir.BzrDirMetaFormat1()
97
format.repository_format = bzrlib.repository.RepositoryFormat7()
98
return format
99
if typestring == "knit":
100
format = bzrdir.BzrDirMetaFormat1()
101
format.repository_format = bzrlib.repository.RepositoryFormatKnit1()
102
return format
103
msg = "Unknown bzr format %s. Current formats are: default, knit,\n" \
104
"metaweave and weave" % typestring
105
raise BzrCommandError(msg)
128
106
129
107
130
108
# TODO: Make sure no commands unconditionally use the working directory as a
154
132
modified
155
133
Text has changed since the previous revision.
156
134
157
kind changed
158
File kind has been changed (e.g. from file to directory).
135
unchanged
136
Nothing about this file has changed since the previous revision.
137
Only shown with --all.
159
138
160
139
unknown
161
140
Not versioned and not matching an ignore pattern.
162
141
163
To see ignored files use 'bzr ignored'. For details on the
142
To see ignored files use 'bzr ignored'. For details in the
164
143
changes to file texts, use 'bzr diff'.
165
166
Note that --short or -S gives status flags for each item, similar
167
to Subversion's status command. To get output similar to svn -q,
168
use bzr status -SV.
169
144
170
145
If no arguments are specified, the status of the entire working
171
146
directory is shown. Otherwise, only the status of the specified
179
154
# TODO: --no-recurse, --recurse options
180
155
181
156
takes_args = ['file*']
182
takes_options = ['show-ids', 'revision', 'change',
183
Option('short', help='Use short status indicators.',
184
short_name='S'),
185
Option('versioned', help='Only show versioned files.',
186
short_name='V'),
187
Option('no-pending', help='Don\'t show pending merges.',
188
),
189
]
157
takes_options = ['all', 'show-ids', 'revision']
190
158
aliases = ['st', 'stat']
191
159
192
160
encoding_type = 'replace'
193
_see_also = ['diff', 'revert', 'status-flags']
194
161
195
162
@display_command
196
def run(self, show_ids=False, file_list=None, revision=None, short=False,
197
versioned=False, no_pending=False):
163
def run(self, all=False, show_ids=False, file_list=None, revision=None):
198
164
from bzrlib.status import show_tree_status
199
165
200
if revision and len(revision) > 2:
201
raise errors.BzrCommandError('bzr status --revision takes exactly'
202
' one or two revision specifiers')
203
204
tree, relfile_list = tree_files(file_list)
205
# Avoid asking for specific files when that is not needed.
206
if relfile_list == ['']:
207
relfile_list = None
208
# Don't disable pending merges for full trees other than '.'.
209
if file_list == ['.']:
210
no_pending = True
211
# A specific path within a tree was given.
212
elif relfile_list is not None:
213
no_pending = True
214
show_tree_status(tree, show_ids=show_ids,
215
specific_files=relfile_list, revision=revision,
216
to_file=self.outf, short=short, versioned=versioned,
217
show_pending=(not no_pending))
166
tree, file_list = tree_files(file_list)
167
168
show_tree_status(tree, show_unchanged=all, show_ids=show_ids,
169
specific_files=file_list, revision=revision,
170
to_file=self.outf)
218
171
219
172
220
173
class cmd_cat_revision(Command):
227
180
hidden = True
228
181
takes_args = ['revision_id?']
229
182
takes_options = ['revision']
230
# cat-revision is more for frontends so should be exact
231
encoding = 'strict'
232
183
233
184
@display_command
234
185
def run(self, revision_id=None, revision=None):
186
235
187
if revision_id is not None and revision is not None:
236
raise errors.BzrCommandError('You can only supply one of'
237
' revision_id or --revision')
188
raise BzrCommandError('You can only supply one of revision_id or --revision')
238
189
if revision_id is None and revision is None:
239
raise errors.BzrCommandError('You must supply either'
240
' --revision or a revision_id')
190
raise BzrCommandError('You must supply either --revision or a revision_id')
241
191
b = WorkingTree.open_containing(u'.')[0].branch
242
192
243
193
# TODO: jam 20060112 should cat-revision always output utf-8?
244
194
if revision_id is not None:
245
revision_id = osutils.safe_revision_id(revision_id, warn=False)
246
try:
247
self.outf.write(b.repository.get_revision_xml(revision_id).decode('utf-8'))
248
except errors.NoSuchRevision:
249
msg = "The repository %s contains no revision %s." % (b.repository.base,
250
revision_id)
251
raise errors.BzrCommandError(msg)
195
self.outf.write(b.repository.get_revision_xml(revision_id).decode('utf-8'))
252
196
elif revision is not None:
253
197
for rev in revision:
254
198
if rev is None:
255
raise errors.BzrCommandError('You cannot specify a NULL'
256
' revision.')
257
rev_id = rev.as_revision_id(b)
199
raise BzrCommandError('You cannot specify a NULL revision.')
200
revno, rev_id = rev.in_history(b)
258
201
self.outf.write(b.repository.get_revision_xml(rev_id).decode('utf-8'))
259
260
261
class cmd_dump_btree(Command):
262
"""Dump the contents of a btree index file to stdout.
263
264
PATH is a btree index file, it can be any URL. This includes things like
265
.bzr/repository/pack-names, or .bzr/repository/indices/a34b3a...ca4a4.iix
266
267
By default, the tuples stored in the index file will be displayed. With
268
--raw, we will uncompress the pages, but otherwise display the raw bytes
269
stored in the index.
270
"""
271
272
# TODO: Do we want to dump the internal nodes as well?
273
# TODO: It would be nice to be able to dump the un-parsed information,
274
# rather than only going through iter_all_entries. However, this is
275
# good enough for a start
276
hidden = True
277
encoding_type = 'exact'
278
takes_args = ['path']
279
takes_options = [Option('raw', help='Write the uncompressed bytes out,'
280
' rather than the parsed tuples.'),
281
]
282
283
def run(self, path, raw=False):
284
dirname, basename = osutils.split(path)
285
t = transport.get_transport(dirname)
286
if raw:
287
self._dump_raw_bytes(t, basename)
288
else:
289
self._dump_entries(t, basename)
290
291
def _get_index_and_bytes(self, trans, basename):
292
"""Create a BTreeGraphIndex and raw bytes."""
293
bt = btree_index.BTreeGraphIndex(trans, basename, None)
294
bytes = trans.get_bytes(basename)
295
bt._file = cStringIO.StringIO(bytes)
296
bt._size = len(bytes)
297
return bt, bytes
298
299
def _dump_raw_bytes(self, trans, basename):
300
import zlib
301
302
# We need to parse at least the root node.
303
# This is because the first page of every row starts with an
304
# uncompressed header.
305
bt, bytes = self._get_index_and_bytes(trans, basename)
306
for page_idx, page_start in enumerate(xrange(0, len(bytes),
307
btree_index._PAGE_SIZE)):
308
page_end = min(page_start + btree_index._PAGE_SIZE, len(bytes))
309
page_bytes = bytes[page_start:page_end]
310
if page_idx == 0:
311
self.outf.write('Root node:\n')
312
header_end, data = bt._parse_header_from_bytes(page_bytes)
313
self.outf.write(page_bytes[:header_end])
314
page_bytes = data
315
self.outf.write('\nPage %d\n' % (page_idx,))
316
decomp_bytes = zlib.decompress(page_bytes)
317
self.outf.write(decomp_bytes)
318
self.outf.write('\n')
319
320
def _dump_entries(self, trans, basename):
321
try:
322
st = trans.stat(basename)
323
except errors.TransportNotPossible:
324
# We can't stat, so we'll fake it because we have to do the 'get()'
325
# anyway.
326
bt, _ = self._get_index_and_bytes(trans, basename)
327
else:
328
bt = btree_index.BTreeGraphIndex(trans, basename, st.st_size)
329
for node in bt.iter_all_entries():
330
# Node is made up of:
331
# (index, key, value, [references])
332
self.outf.write('%s\n' % (node[1:],))
333
334
335
class cmd_remove_tree(Command):
336
"""Remove the working tree from a given branch/checkout.
337
338
Since a lightweight checkout is little more than a working tree
339
this will refuse to run against one.
340
341
To re-create the working tree, use "bzr checkout".
342
"""
343
_see_also = ['checkout', 'working-trees']
344
takes_args = ['location?']
345
takes_options = [
346
Option('force',
347
help='Remove the working tree even if it has '
348
'uncommitted changes.'),
349
]
350
351
def run(self, location='.', force=False):
352
d = bzrdir.BzrDir.open(location)
353
354
try:
355
working = d.open_workingtree()
356
except errors.NoWorkingTree:
357
raise errors.BzrCommandError("No working tree to remove")
358
except errors.NotLocalUrl:
359
raise errors.BzrCommandError("You cannot remove the working tree of a "
360
"remote path")
361
if not force:
362
changes = working.changes_from(working.basis_tree())
363
if changes.has_changed():
364
raise errors.UncommittedChanges(working)
365
366
working_path = working.bzrdir.root_transport.base
367
branch_path = working.branch.bzrdir.root_transport.base
368
if working_path != branch_path:
369
raise errors.BzrCommandError("You cannot remove the working tree from "
370
"a lightweight checkout")
371
372
d.destroy_workingtree()
373
202
374
203
375
204
class cmd_revno(Command):
376
205
"""Show current revision number.
378
207
This is equal to the number of revisions on this branch.
379
208
"""
380
209
381
_see_also = ['info']
382
210
takes_args = ['location?']
383
211
384
212
@display_command
402
230
revs.extend(revision)
403
231
if revision_info_list is not None:
404
232
for rev in revision_info_list:
405
revs.append(RevisionSpec.from_string(rev))
406
407
b = Branch.open_containing(u'.')[0]
408
233
revs.append(RevisionSpec(rev))
409
234
if len(revs) == 0:
410
revs.append(RevisionSpec.from_string('-1'))
235
raise BzrCommandError('You must supply a revision identifier')
236
237
b = WorkingTree.open_containing(u'.')[0].branch
411
238
412
239
for rev in revs:
413
revision_id = rev.as_revision_id(b)
414
try:
415
revno = '%4d' % (b.revision_id_to_revno(revision_id))
416
except errors.NoSuchRevision:
417
dotted_map = b.get_revision_id_to_revno_map()
418
revno = '.'.join(str(i) for i in dotted_map[revision_id])
419
print '%s %s' % (revno, revision_id)
240
revinfo = rev.in_history(b)
241
if revinfo.revno is None:
242
print ' %s' % revinfo.rev_id
243
else:
244
print '%4d %s' % (revinfo.revno, revinfo.rev_id)
420
245
421
246
422
247
class cmd_add(Command):
439
264
440
265
Adding a file whose parent directory is not versioned will
441
266
implicitly add the parent, and so on up to the root. This means
442
you should never need to explicitly add a directory, they'll just
267
you should never need to explictly add a directory, they'll just
443
268
get added when you add a file in the directory.
444
269
445
270
--dry-run will show which files would be added, but not actually
446
271
add them.
447
448
--file-ids-from will try to use the file ids from the supplied path.
449
It looks up ids trying to find a matching parent directory with the
450
same filename, and then by pure path. This option is rarely needed
451
but can be useful when adding the same logical file into two
452
branches that will be merged later (without showing the two different
453
adds as a conflict). It is also useful when merging another project
454
into a subdirectory of this one.
455
272
"""
456
273
takes_args = ['file*']
457
takes_options = [
458
Option('no-recurse',
459
help="Don't recursively add the contents of directories."),
460
Option('dry-run',
461
help="Show what would be done, but don't actually do anything."),
462
'verbose',
463
Option('file-ids-from',
464
type=unicode,
465
help='Lookup file ids from this tree.'),
466
]
274
takes_options = ['no-recurse', 'dry-run', 'verbose']
467
275
encoding_type = 'replace'
468
_see_also = ['remove']
469
276
470
def run(self, file_list, no_recurse=False, dry_run=False, verbose=False,
471
file_ids_from=None):
277
def run(self, file_list, no_recurse=False, dry_run=False, verbose=False):
472
278
import bzrlib.add
473
279
474
base_tree = None
475
if file_ids_from is not None:
476
try:
477
base_tree, base_path = WorkingTree.open_containing(
478
file_ids_from)
479
except errors.NoWorkingTree:
480
base_branch, base_path = Branch.open_containing(
481
file_ids_from)
482
base_tree = base_branch.basis_tree()
483
484
action = bzrlib.add.AddFromBaseAction(base_tree, base_path,
485
to_file=self.outf, should_print=(not is_quiet()))
486
else:
487
action = bzrlib.add.AddAction(to_file=self.outf,
488
should_print=(not is_quiet()))
489
490
if base_tree:
491
base_tree.lock_read()
492
try:
493
file_list = self._maybe_expand_globs(file_list)
494
if file_list:
495
tree = WorkingTree.open_containing(file_list[0])[0]
496
else:
497
tree = WorkingTree.open_containing(u'.')[0]
498
added, ignored = tree.smart_add(file_list, not
499
no_recurse, action=action, save=not dry_run)
500
finally:
501
if base_tree is not None:
502
base_tree.unlock()
280
action = bzrlib.add.AddAction(to_file=self.outf,
281
should_add=(not dry_run), should_print=(not is_quiet()))
282
283
added, ignored = bzrlib.add.smart_add(file_list, not no_recurse,
284
action=action)
503
285
if len(ignored) > 0:
504
286
if verbose:
505
287
for glob in sorted(ignored.keys()):
520
302
521
303
This is equivalent to creating the directory and then adding it.
522
304
"""
523
524
305
takes_args = ['dir+']
525
306
encoding_type = 'replace'
526
307
529
310
os.mkdir(d)
530
311
wt, dd = WorkingTree.open_containing(d)
531
312
wt.add([dd])
532
self.outf.write('added %s\n' % d)
313
print >>self.outf, 'added', d
533
314
534
315
535
316
class cmd_relpath(Command):
536
317
"""Show path of a file relative to root"""
537
538
318
takes_args = ['filename']
539
319
hidden = True
540
320
551
331
"""Show inventory of the current working copy or a revision.
552
332
553
333
It is possible to limit the output to a particular entry
554
type using the --kind option. For example: --kind file.
555
556
It is also possible to restrict the list of files to a specific
557
set. For example: bzr inventory --show-ids this/file
334
type using the --kind option. For example; --kind file.
558
335
"""
559
560
hidden = True
561
_see_also = ['ls']
562
takes_options = [
563
'revision',
564
'show-ids',
565
Option('kind',
566
help='List entries of a particular kind: file, directory, symlink.',
567
type=unicode),
568
]
569
takes_args = ['file*']
570
336
takes_options = ['revision', 'show-ids', 'kind']
337
571
338
@display_command
572
def run(self, revision=None, show_ids=False, kind=None, file_list=None):
339
def run(self, revision=None, show_ids=False, kind=None):
573
340
if kind and kind not in ['file', 'directory', 'symlink']:
574
raise errors.BzrCommandError('invalid kind %r specified' % (kind,))
575
576
work_tree, file_list = tree_files(file_list)
577
work_tree.lock_read()
578
try:
579
if revision is not None:
580
if len(revision) > 1:
581
raise errors.BzrCommandError(
582
'bzr inventory --revision takes exactly one revision'
583
' identifier')
584
tree = revision[0].as_tree(work_tree.branch)
585
586
extra_trees = [work_tree]
587
tree.lock_read()
588
else:
589
tree = work_tree
590
extra_trees = []
591
592
if file_list is not None:
593
file_ids = tree.paths2ids(file_list, trees=extra_trees,
594
require_versioned=True)
595
# find_ids_across_trees may include some paths that don't
596
# exist in 'tree'.
597
entries = sorted((tree.id2path(file_id), tree.inventory[file_id])
598
for file_id in file_ids if file_id in tree)
599
else:
600
entries = tree.inventory.entries()
601
finally:
602
tree.unlock()
603
if tree is not work_tree:
604
work_tree.unlock()
605
606
for path, entry in entries:
341
raise BzrCommandError('invalid kind specified')
342
tree = WorkingTree.open_containing(u'.')[0]
343
if revision is None:
344
inv = tree.read_working_inventory()
345
else:
346
if len(revision) > 1:
347
raise BzrCommandError('bzr inventory --revision takes'
348
' exactly one revision identifier')
349
inv = tree.branch.repository.get_revision_inventory(
350
revision[0].in_history(tree.branch).rev_id)
351
352
for path, entry in inv.entries():
607
353
if kind and kind != entry.kind:
608
354
continue
609
355
if show_ids:
616
362
class cmd_mv(Command):
617
363
"""Move or rename a file.
618
364
619
:Usage:
365
usage:
620
366
bzr mv OLDNAME NEWNAME
621
622
367
bzr mv SOURCE... DESTINATION
623
368
624
369
If the last argument is a versioned directory, all the other names
625
370
are moved into it. Otherwise, there must be exactly two arguments
626
and the file is changed to a new name.
627
628
If OLDNAME does not exist on the filesystem but is versioned and
629
NEWNAME does exist on the filesystem but is not versioned, mv
630
assumes that the file has been manually moved and only updates
631
its internal inventory to reflect that change.
632
The same is valid when moving many SOURCE files to a DESTINATION.
371
and the file is changed to a new name, which must not already exist.
633
372
634
373
Files cannot be moved between branches.
635
374
"""
636
637
375
takes_args = ['names*']
638
takes_options = [Option("after", help="Move only the bzr identifier"
639
" of the file, because the file has already been moved."),
640
]
641
376
aliases = ['move', 'rename']
377
642
378
encoding_type = 'replace'
643
379
644
def run(self, names_list, after=False):
645
if names_list is None:
646
names_list = []
647
380
def run(self, names_list):
648
381
if len(names_list) < 2:
649
raise errors.BzrCommandError("missing file argument")
382
raise BzrCommandError("missing file argument")
650
383
tree, rel_names = tree_files(names_list)
651
tree.lock_write()
652
try:
653
self._run(tree, names_list, rel_names, after)
654
finally:
655
tree.unlock()
656
657
def _run(self, tree, names_list, rel_names, after):
658
into_existing = osutils.isdir(names_list[-1])
659
if into_existing and len(names_list) == 2:
660
# special cases:
661
# a. case-insensitive filesystem and change case of dir
662
# b. move directory after the fact (if the source used to be
663
# a directory, but now doesn't exist in the working tree
664
# and the target is an existing directory, just rename it)
665
if (not tree.case_sensitive
666
and rel_names[0].lower() == rel_names[1].lower()):
667
into_existing = False
668
else:
669
inv = tree.inventory
670
from_id = tree.path2id(rel_names[0])
671
if (not osutils.lexists(names_list[0]) and
672
from_id and inv.get_file_kind(from_id) == "directory"):
673
into_existing = False
674
# move/rename
675
if into_existing:
384
385
if os.path.isdir(names_list[-1]):
676
386
# move into existing directory
677
for pair in tree.move(rel_names[:-1], rel_names[-1], after=after):
387
for pair in tree.move(rel_names[:-1], rel_names[-1]):
678
388
self.outf.write("%s => %s\n" % pair)
679
389
else:
680
390
if len(names_list) != 2:
681
raise errors.BzrCommandError('to mv multiple files the'
682
' destination must be a versioned'
683
' directory')
684
tree.rename_one(rel_names[0], rel_names[1], after=after)
391
raise BzrCommandError('to mv multiple files the destination '
392
'must be a versioned directory')
393
tree.rename_one(rel_names[0], rel_names[1])
685
394
self.outf.write("%s => %s\n" % (rel_names[0], rel_names[1]))
686
687
395
396
688
397
class cmd_pull(Command):
689
398
"""Turn this branch into a mirror of another branch.
690
399
696
405
from one into the other. Once one branch has merged, the other should
697
406
be able to pull it again.
698
407
408
If branches have diverged, you can use 'bzr merge' to pull the text changes
409
from one into the other. Once one branch has merged, the other should
410
be able to pull it again.
411
699
412
If you want to forget your local changes and just update your branch to
700
413
match the remote one, use pull --overwrite.
701
414
702
415
If there is no default location set, the first pull will set it. After
703
416
that, you can omit the location to use the default. To change the
704
default, use --remember. The value will only be saved if the remote
705
location can be accessed.
706
707
Note: The location can be specified either in the form of a branch,
708
or in the form of a path to a file containing a merge directive generated
709
with bzr send.
417
default, use --remember.
710
418
"""
711
712
_see_also = ['push', 'update', 'status-flags']
713
takes_options = ['remember', 'overwrite', 'revision',
714
custom_help('verbose',
715
help='Show logs of pulled revisions.'),
716
Option('directory',
717
help='Branch to pull into, '
718
'rather than the one containing the working directory.',
719
short_name='d',
720
type=unicode,
721
),
722
]
419
takes_options = ['remember', 'overwrite', 'revision', 'verbose']
723
420
takes_args = ['location?']
724
421
encoding_type = 'replace'
725
422
726
def run(self, location=None, remember=False, overwrite=False,
727
revision=None, verbose=False,
728
directory=None):
423
def run(self, location=None, remember=False, overwrite=False, revision=None, verbose=False):
729
424
# FIXME: too much stuff is in the command class
730
revision_id = None
731
mergeable = None
732
if directory is None:
733
directory = u'.'
734
425
try:
735
tree_to = WorkingTree.open_containing(directory)[0]
426
tree_to = WorkingTree.open_containing(u'.')[0]
736
427
branch_to = tree_to.branch
737
except errors.NoWorkingTree:
428
except NoWorkingTree:
738
429
tree_to = None
739
branch_to = Branch.open_containing(directory)[0]
740
741
possible_transports = []
742
if location is not None:
743
try:
744
mergeable = bundle.read_mergeable_from_url(location,
745
possible_transports=possible_transports)
746
except errors.NotABundle:
747
mergeable = None
748
430
branch_to = Branch.open_containing(u'.')[0]
749
431
stored_loc = branch_to.get_parent()
750
432
if location is None:
751
433
if stored_loc is None:
752
raise errors.BzrCommandError("No pull location known or"
753
" specified.")
434
raise BzrCommandError("No pull location known or specified.")
754
435
else:
755
436
display_url = urlutils.unescape_for_display(stored_loc,
756
437
self.outf.encoding)
757
if not is_quiet():
758
self.outf.write("Using saved parent location: %s\n" % display_url)
438
self.outf.write("Using saved location: %s\n" % display_url)
759
439
location = stored_loc
760
440
761
if mergeable is not None:
762
if revision is not None:
763
raise errors.BzrCommandError(
764
'Cannot use -r with merge directives or bundles')
765
mergeable.install_revisions(branch_to.repository)
766
base_revision_id, revision_id, verified = \
767
mergeable.get_merge_request(branch_to.repository)
768
branch_from = branch_to
769
else:
770
branch_from = Branch.open(location,
771
possible_transports=possible_transports)
772
773
if branch_to.get_parent() is None or remember:
774
branch_to.set_parent(branch_from.base)
775
776
if revision is not None:
777
if len(revision) == 1:
778
revision_id = revision[0].as_revision_id(branch_from)
779
else:
780
raise errors.BzrCommandError(
781
'bzr pull --revision takes one value.')
782
783
branch_to.lock_write()
784
try:
785
if tree_to is not None:
786
change_reporter = delta._ChangeReporter(
787
unversioned_filter=tree_to.is_ignored)
788
result = tree_to.pull(branch_from, overwrite, revision_id,
789
change_reporter,
790
possible_transports=possible_transports)
791
else:
792
result = branch_to.pull(branch_from, overwrite, revision_id)
793
794
result.report(self.outf)
795
if verbose and result.old_revid != result.new_revid:
796
old_rh = list(
797
branch_to.repository.iter_reverse_revision_history(
798
result.old_revid))
799
old_rh.reverse()
800
new_rh = branch_to.revision_history()
801
log.show_changed_revisions(branch_to, old_rh, new_rh,
802
to_file=self.outf)
803
finally:
804
branch_to.unlock()
441
branch_from = Branch.open(location)
442
443
if branch_to.get_parent() is None or remember:
444
branch_to.set_parent(branch_from.base)
445
446
if revision is None:
447
rev_id = None
448
elif len(revision) == 1:
449
rev_id = revision[0].in_history(branch_from).rev_id
450
else:
451
raise BzrCommandError('bzr pull --revision takes one value.')
452
453
old_rh = branch_to.revision_history()
454
if tree_to is not None:
455
count = tree_to.pull(branch_from, overwrite, rev_id)
456
else:
457
count = branch_to.pull(branch_from, overwrite, rev_id)
458
note('%d revision(s) pulled.' % (count,))
459
460
if verbose:
461
new_rh = branch_to.revision_history()
462
if old_rh != new_rh:
463
# Something changed
464
from bzrlib.log import show_changed_revisions
465
show_changed_revisions(branch_to, old_rh, new_rh,
466
to_file=self.outf)
805
467
806
468
807
469
class cmd_push(Command):
826
488
827
489
If there is no default push location set, the first push will set it.
828
490
After that, you can omit the location to use the default. To change the
829
default, use --remember. The value will only be saved if the remote
830
location can be accessed.
491
default, use --remember.
831
492
"""
832
833
_see_also = ['pull', 'update', 'working-trees']
834
takes_options = ['remember', 'overwrite', 'verbose', 'revision',
835
Option('create-prefix',
836
help='Create the path leading up to the branch '
837
'if it does not already exist.'),
838
Option('directory',
839
help='Branch to push from, '
840
'rather than the one containing the working directory.',
841
short_name='d',
842
type=unicode,
843
),
844
Option('use-existing-dir',
845
help='By default push will fail if the target'
846
' directory exists, but does not already'
847
' have a control directory. This flag will'
848
' allow push to proceed.'),
849
Option('stacked',
850
help='Create a stacked branch that references the public location '
851
'of the parent branch.'),
852
Option('stacked-on',
853
help='Create a stacked branch that refers to another branch '
854
'for the commit history. Only the work not present in the '
855
'referenced branch is included in the branch created.',
856
type=unicode),
857
]
493
takes_options = ['remember', 'overwrite', 'verbose',
494
Option('create-prefix',
495
help='Create the path leading up to the branch '
496
'if it does not already exist')]
858
497
takes_args = ['location?']
859
498
encoding_type = 'replace'
860
499
861
500
def run(self, location=None, remember=False, overwrite=False,
862
create_prefix=False, verbose=False, revision=None,
863
use_existing_dir=False, directory=None, stacked_on=None,
864
stacked=False):
865
from bzrlib.push import _show_push_branch
866
867
# Get the source branch and revision_id
868
if directory is None:
869
directory = '.'
870
br_from = Branch.open_containing(directory)[0]
871
if revision is not None:
872
if len(revision) == 1:
873
revision_id = revision[0].in_history(br_from).rev_id
874
else:
875
raise errors.BzrCommandError(
876
'bzr push --revision takes one value.')
877
else:
878
revision_id = br_from.last_revision()
879
880
# Get the stacked_on branch, if any
881
if stacked_on is not None:
882
stacked_on = urlutils.normalize_url(stacked_on)
883
elif stacked:
884
parent_url = br_from.get_parent()
885
if parent_url:
886
parent = Branch.open(parent_url)
887
stacked_on = parent.get_public_branch()
888
if not stacked_on:
889
# I considered excluding non-http url's here, thus forcing
890
# 'public' branches only, but that only works for some
891
# users, so it's best to just depend on the user spotting an
892
# error by the feedback given to them. RBC 20080227.
893
stacked_on = parent_url
894
if not stacked_on:
895
raise errors.BzrCommandError(
896
"Could not determine branch to refer to.")
897
898
# Get the destination location
501
create_prefix=False, verbose=False):
502
# FIXME: Way too big! Put this into a function called from the
503
# command.
504
from bzrlib.transport import get_transport
505
506
br_from = Branch.open_containing('.')[0]
507
stored_loc = br_from.get_push_location()
899
508
if location is None:
900
stored_loc = br_from.get_push_location()
901
509
if stored_loc is None:
902
raise errors.BzrCommandError(
903
"No push location known or specified.")
510
raise BzrCommandError("No push location known or specified.")
904
511
else:
905
512
display_url = urlutils.unescape_for_display(stored_loc,
906
513
self.outf.encoding)
907
self.outf.write("Using saved push location: %s\n" % display_url)
514
self.outf.write("Using saved location: %s" % display_url)
908
515
location = stored_loc
909
516
910
_show_push_branch(br_from, revision_id, location, self.outf,
911
verbose=verbose, overwrite=overwrite, remember=remember,
912
stacked_on=stacked_on, create_prefix=create_prefix,
913
use_existing_dir=use_existing_dir)
517
transport = get_transport(location)
518
location_url = transport.base
519
if br_from.get_push_location() is None or remember:
520
br_from.set_push_location(location_url)
521
522
old_rh = []
523
try:
524
dir_to = bzrlib.bzrdir.BzrDir.open(location_url)
525
br_to = dir_to.open_branch()
526
except NotBranchError:
527
# create a branch.
528
transport = transport.clone('..')
529
if not create_prefix:
530
try:
531
relurl = transport.relpath(location_url)
532
mutter('creating directory %s => %s', location_url, relurl)
533
transport.mkdir(relurl)
534
except NoSuchFile:
535
raise BzrCommandError("Parent directory of %s "
536
"does not exist." % location)
537
else:
538
current = transport.base
539
needed = [(transport, transport.relpath(location_url))]
540
while needed:
541
try:
542
transport, relpath = needed[-1]
543
transport.mkdir(relpath)
544
needed.pop()
545
except NoSuchFile:
546
new_transport = transport.clone('..')
547
needed.append((new_transport,
548
new_transport.relpath(transport.base)))
549
if new_transport.base == transport.base:
550
raise BzrCommandError("Could not create "
551
"path prefix.")
552
dir_to = br_from.bzrdir.clone(location_url,
553
revision_id=br_from.last_revision())
554
br_to = dir_to.open_branch()
555
count = len(br_to.revision_history())
556
else:
557
old_rh = br_to.revision_history()
558
try:
559
try:
560
tree_to = dir_to.open_workingtree()
561
except errors.NotLocalUrl:
562
warning('This transport does not update the working '
563
'tree of: %s' % (br_to.base,))
564
count = br_to.pull(br_from, overwrite)
565
except NoWorkingTree:
566
count = br_to.pull(br_from, overwrite)
567
else:
568
count = tree_to.pull(br_from, overwrite)
569
except DivergedBranches:
570
raise BzrCommandError("These branches have diverged."
571
" Try a merge then push with overwrite.")
572
note('%d revision(s) pushed.' % (count,))
573
574
if verbose:
575
new_rh = br_to.revision_history()
576
if old_rh != new_rh:
577
# Something changed
578
from bzrlib.log import show_changed_revisions
579
show_changed_revisions(br_to, old_rh, new_rh,
580
to_file=self.outf)
914
581
915
582
916
583
class cmd_branch(Command):
918
585
919
586
If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will
920
587
be used. In other words, "branch ../foo/bar" will attempt to create ./bar.
921
If the FROM_LOCATION has no / or path separator embedded, the TO_LOCATION
922
is derived from the FROM_LOCATION by stripping a leading scheme or drive
923
identifier, if any. For example, "branch lp:foo-bar" will attempt to
924
create ./foo-bar.
925
588
926
589
To retrieve the branch as of a particular revision, supply the --revision
927
590
parameter, as in "branch foo/bar -r 5".
591
592
--basis is to speed up branching from remote branches. When specified, it
593
copies all the file-contents, inventory and revision data from the basis
594
branch before copying anything from the remote branch.
928
595
"""
929
930
_see_also = ['checkout']
931
596
takes_args = ['from_location', 'to_location?']
932
takes_options = ['revision', Option('hardlink',
933
help='Hard-link working tree files where possible.'),
934
Option('stacked',
935
help='Create a stacked branch referring to the source branch. '
936
'The new branch will depend on the availability of the source '
937
'branch for all operations.'),
938
Option('standalone',
939
help='Do not use a shared repository, even if available.'),
940
]
597
takes_options = ['revision', 'basis']
941
598
aliases = ['get', 'clone']
942
599
943
def run(self, from_location, to_location=None, revision=None,
944
hardlink=False, stacked=False, standalone=False):
945
from bzrlib.tag import _merge_tags_if_possible
600
def run(self, from_location, to_location=None, revision=None, basis=None):
601
from bzrlib.transport import get_transport
602
from bzrlib.osutils import rmtree
946
603
if revision is None:
947
604
revision = [None]
948
605
elif len(revision) > 1:
949
raise errors.BzrCommandError(
606
raise BzrCommandError(
950
607
'bzr branch --revision takes exactly 1 revision value')
951
952
accelerator_tree, br_from = bzrdir.BzrDir.open_tree_or_branch(
953
from_location)
608
try:
609
br_from = Branch.open(from_location)
610
except OSError, e:
611
if e.errno == errno.ENOENT:
612
raise BzrCommandError('Source location "%s" does not'
613
' exist.' % to_location)
614
else:
615
raise
954
616
br_from.lock_read()
955
617
try:
618
if basis is not None:
619
basis_dir = bzrdir.BzrDir.open_containing(basis)[0]
620
else:
621
basis_dir = None
956
622
if len(revision) == 1 and revision[0] is not None:
957
revision_id = revision[0].as_revision_id(br_from)
623
revision_id = revision[0].in_history(br_from)[1]
958
624
else:
959
625
# FIXME - wt.last_revision, fallback to branch, fall back to
960
626
# None or perhaps NULL_REVISION to mean copy nothing
961
627
# RBC 20060209
962
628
revision_id = br_from.last_revision()
963
629
if to_location is None:
964
to_location = urlutils.derive_to_location(from_location)
965
to_transport = transport.get_transport(to_location)
630
to_location = os.path.basename(from_location.rstrip("/\\"))
631
name = None
632
else:
633
name = os.path.basename(to_location) + '\n'
634
635
to_transport = get_transport(to_location)
966
636
try:
967
637
to_transport.mkdir('.')
968
except errors.FileExists:
969
raise errors.BzrCommandError('Target directory "%s" already'
970
' exists.' % to_location)
971
except errors.NoSuchFile:
972
raise errors.BzrCommandError('Parent of "%s" does not exist.'
973
% to_location)
638
except bzrlib.errors.FileExists:
639
raise BzrCommandError('Target directory "%s" already'
640
' exists.' % to_location)
641
except bzrlib.errors.NoSuchFile:
642
raise BzrCommandError('Parent of "%s" does not exist.' %
643
to_location)
974
644
try:
975
645
# preserve whatever source format we have.
976
dir = br_from.bzrdir.sprout(to_transport.base, revision_id,
977
possible_transports=[to_transport],
978
accelerator_tree=accelerator_tree,
979
hardlink=hardlink, stacked=stacked,
980
force_new_repo=standalone)
646
dir = br_from.bzrdir.sprout(to_transport.base,
647
revision_id, basis_dir)
981
648
branch = dir.open_branch()
982
except errors.NoSuchRevision:
983
to_transport.delete_tree('.')
984
msg = "The branch %s has no revision %s." % (from_location,
985
revision[0])
986
raise errors.BzrCommandError(msg)
987
_merge_tags_if_possible(br_from, branch)
988
# If the source branch is stacked, the new branch may
989
# be stacked whether we asked for that explicitly or not.
990
# We therefore need a try/except here and not just 'if stacked:'
991
try:
992
note('Created new stacked branch referring to %s.' %
993
branch.get_stacked_on_url())
994
except (errors.NotStacked, errors.UnstackableBranchFormat,
995
errors.UnstackableRepositoryFormat), e:
996
note('Branched %d revision(s).' % branch.revno())
649
except bzrlib.errors.NoSuchRevision:
650
# TODO: jam 20060426 This only works on local paths
651
# and it would be nice if 'bzr branch' could
652
# work on a remote path
653
rmtree(to_location)
654
msg = "The branch %s has no revision %s." % (from_location, revision[0])
655
raise BzrCommandError(msg)
656
except bzrlib.errors.UnlistableBranch:
657
rmtree(to_location)
658
msg = "The branch %s cannot be used as a --basis" % (basis,)
659
raise BzrCommandError(msg)
660
if name:
661
branch.control_files.put_utf8('branch-name', name)
662
note('Branched %d revision(s).' % branch.revno())
997
663
finally:
998
664
br_from.unlock()
999
665
1008
674
1009
675
If the TO_LOCATION is omitted, the last component of the BRANCH_LOCATION will
1010
676
be used. In other words, "checkout ../foo/bar" will attempt to create ./bar.
1011
If the BRANCH_LOCATION has no / or path separator embedded, the TO_LOCATION
1012
is derived from the BRANCH_LOCATION by stripping a leading scheme or drive
1013
identifier, if any. For example, "checkout lp:foo-bar" will attempt to
1014
create ./foo-bar.
1015
677
1016
678
To retrieve the branch as of a particular revision, supply the --revision
1017
679
parameter, as in "checkout foo/bar -r 5". Note that this will be immediately
1018
680
out of date [so you cannot commit] but it may be useful (i.e. to examine old
1019
681
code.)
682
683
--basis is to speed up checking out from remote branches. When specified, it
684
uses the inventory and file contents from the basis branch in preference to the
685
branch being checked out.
1020
686
"""
1021
1022
_see_also = ['checkouts', 'branch']
1023
687
takes_args = ['branch_location?', 'to_location?']
1024
takes_options = ['revision',
688
takes_options = ['revision', # , 'basis']
1025
689
Option('lightweight',
1026
help="Perform a lightweight checkout. Lightweight "
690
help="perform a lightweight checkout. Lightweight "
1027
691
"checkouts depend on access to the branch for "
1028
"every operation. Normal checkouts can perform "
692
"every operation. Normal checkouts can perform "
1029
693
"common operations like diff and status without "
1030
694
"such access, and also support local commits."
1031
695
),
1032
Option('files-from', type=str,
1033
help="Get file contents from this tree."),
1034
Option('hardlink',
1035
help='Hard-link working tree files where possible.'
1036
),
1037
696
]
1038
aliases = ['co']
1039
697
1040
def run(self, branch_location=None, to_location=None, revision=None,
1041
lightweight=False, files_from=None, hardlink=False):
698
def run(self, branch_location=None, to_location=None, revision=None, basis=None,
699
lightweight=False):
1042
700
if revision is None:
1043
701
revision = [None]
1044
702
elif len(revision) > 1:
1045
raise errors.BzrCommandError(
703
raise BzrCommandError(
1046
704
'bzr checkout --revision takes exactly 1 revision value')
1047
705
if branch_location is None:
1048
branch_location = osutils.getcwd()
706
branch_location = bzrlib.osutils.getcwd()
1049
707
to_location = branch_location
1050
accelerator_tree, source = bzrdir.BzrDir.open_tree_or_branch(
1051
branch_location)
1052
if files_from is not None:
1053
accelerator_tree = WorkingTree.open(files_from)
708
source = Branch.open(branch_location)
1054
709
if len(revision) == 1 and revision[0] is not None:
1055
revision_id = revision[0].as_revision_id(source)
710
revision_id = revision[0].in_history(source)[1]
1056
711
else:
1057
712
revision_id = None
1058
713
if to_location is None:
1059
to_location = urlutils.derive_to_location(branch_location)
714
to_location = os.path.basename(branch_location.rstrip("/\\"))
1060
715
# if the source and to_location are the same,
1061
716
# and there is no working tree,
1062
717
# then reconstitute a branch
1063
if (osutils.abspath(to_location) ==
1064
osutils.abspath(branch_location)):
718
if (bzrlib.osutils.abspath(to_location) ==
719
bzrlib.osutils.abspath(branch_location)):
1065
720
try:
1066
721
source.bzrdir.open_workingtree()
1067
722
except errors.NoWorkingTree:
1068
source.bzrdir.create_workingtree(revision_id)
723
source.bzrdir.create_workingtree()
1069
724
return
1070
source.create_checkout(to_location, revision_id, lightweight,
1071
accelerator_tree, hardlink)
725
try:
726
os.mkdir(to_location)
727
except OSError, e:
728
if e.errno == errno.EEXIST:
729
raise BzrCommandError('Target directory "%s" already'
730
' exists.' % to_location)
731
if e.errno == errno.ENOENT:
732
raise BzrCommandError('Parent of "%s" does not exist.' %
733
to_location)
734
else:
735
raise
736
old_format = bzrlib.bzrdir.BzrDirFormat.get_default_format()
737
bzrlib.bzrdir.BzrDirFormat.set_default_format(bzrdir.BzrDirMetaFormat1())
738
try:
739
if lightweight:
740
checkout = bzrdir.BzrDirMetaFormat1().initialize(to_location)
741
bzrlib.branch.BranchReferenceFormat().initialize(checkout, source)
742
else:
743
checkout_branch = bzrlib.bzrdir.BzrDir.create_branch_convenience(
744
to_location, force_new_tree=False)
745
checkout = checkout_branch.bzrdir
746
checkout_branch.bind(source)
747
if revision_id is not None:
748
rh = checkout_branch.revision_history()
749
checkout_branch.set_revision_history(rh[:rh.index(revision_id) + 1])
750
checkout.create_workingtree(revision_id)
751
finally:
752
bzrlib.bzrdir.BzrDirFormat.set_default_format(old_format)
1072
753
1073
754
1074
755
class cmd_renames(Command):
1077
758
# TODO: Option to show renames between two historical versions.
1078
759
1079
760
# TODO: Only show renames under dir, rather than in the whole branch.
1080
_see_also = ['status']
1081
761
takes_args = ['dir?']
1082
762
1083
763
@display_command
1084
764
def run(self, dir=u'.'):
1085
765
tree = WorkingTree.open_containing(dir)[0]
1086
tree.lock_read()
1087
try:
1088
new_inv = tree.inventory
1089
old_tree = tree.basis_tree()
1090
old_tree.lock_read()
1091
try:
1092
old_inv = old_tree.inventory
1093
renames = []
1094
iterator = tree.iter_changes(old_tree, include_unchanged=True)
1095
for f, paths, c, v, p, n, k, e in iterator:
1096
if paths[0] == paths[1]:
1097
continue
1098
if None in (paths):
1099
continue
1100
renames.append(paths)
1101
renames.sort()
1102
for old_name, new_name in renames:
1103
self.outf.write("%s => %s\n" % (old_name, new_name))
1104
finally:
1105
old_tree.unlock()
1106
finally:
1107
tree.unlock()
766
old_inv = tree.basis_tree().inventory
767
new_inv = tree.read_working_inventory()
768
769
renames = list(bzrlib.tree.find_renames(old_inv, new_inv))
770
renames.sort()
771
for old_name, new_name in renames:
772
self.outf.write("%s => %s\n" % (old_name, new_name))
1108
773
1109
774
1110
775
class cmd_update(Command):
1117
782
If you want to discard your local changes, you can just do a
1118
783
'bzr revert' instead of 'bzr commit' after the update.
1119
784
"""
1120
1121
_see_also = ['pull', 'working-trees', 'status-flags']
1122
785
takes_args = ['dir?']
1123
aliases = ['up']
1124
786
1125
787
def run(self, dir='.'):
1126
788
tree = WorkingTree.open_containing(dir)[0]
1127
possible_transports = []
1128
master = tree.branch.get_master_branch(
1129
possible_transports=possible_transports)
1130
if master is not None:
1131
tree.lock_write()
1132
else:
1133
tree.lock_tree_write()
789
tree.lock_write()
1134
790
try:
1135
existing_pending_merges = tree.get_parent_ids()[1:]
1136
last_rev = _mod_revision.ensure_null(tree.last_revision())
1137
if last_rev == _mod_revision.ensure_null(
1138
tree.branch.last_revision()):
791
if tree.last_revision() == tree.branch.last_revision():
1139
792
# may be up to date, check master too.
1140
if master is None or last_rev == _mod_revision.ensure_null(
1141
master.last_revision()):
1142
revno = tree.branch.revision_id_to_revno(last_rev)
1143
note("Tree is up to date at revision %d." % (revno,))
1144
return 0
1145
conflicts = tree.update(
1146
delta._ChangeReporter(unversioned_filter=tree.is_ignored),
1147
possible_transports=possible_transports)
1148
revno = tree.branch.revision_id_to_revno(
1149
_mod_revision.ensure_null(tree.last_revision()))
1150
note('Updated to revision %d.' % (revno,))
1151
if tree.get_parent_ids()[1:] != existing_pending_merges:
1152
note('Your local commits will now show as pending merges with '
1153
"'bzr status', and can be committed with 'bzr commit'.")
793
master = tree.branch.get_master_branch()
794
if master is None or master.last_revision == tree.last_revision():
795
note("Tree is up to date.")
796
return
797
conflicts = tree.update()
798
note('Updated to revision %d.' %
799
(tree.branch.revision_id_to_revno(tree.last_revision()),))
1154
800
if conflicts != 0:
1155
801
return 1
1156
802
else:
1168
814
1169
815
Branches and working trees will also report any missing revisions.
1170
816
"""
1171
_see_also = ['revno', 'working-trees', 'repositories']
1172
817
takes_args = ['location?']
1173
818
takes_options = ['verbose']
1174
encoding_type = 'replace'
1175
819
1176
820
@display_command
1177
821
def run(self, location=None, verbose=False):
1178
if verbose:
1179
noise_level = 2
1180
else:
1181
noise_level = 0
1182
822
from bzrlib.info import show_bzrdir_info
1183
823
show_bzrdir_info(bzrdir.BzrDir.open_containing(location)[0],
1184
verbose=noise_level, outfile=self.outf)
824
verbose=verbose)
1185
825
1186
826
1187
827
class cmd_remove(Command):
1188
"""Remove files or directories.
1189
1190
This makes bzr stop tracking changes to the specified files. bzr will delete
1191
them if they can easily be recovered using revert. If no options or
1192
parameters are given bzr will scan for files that are being tracked by bzr
1193
but missing in your tree and stop tracking them for you.
828
"""Make a file unversioned.
829
830
This makes bzr stop tracking changes to a versioned file. It does
831
not delete the working copy.
832
833
You can specify one or more files, and/or --new. If you specify --new,
834
only 'added' files will be removed. If you specify both, then new files
835
in the specified directories will be removed. If the directories are
836
also new, they will also be removed.
1194
837
"""
1195
838
takes_args = ['file*']
1196
takes_options = ['verbose',
1197
Option('new', help='Only remove files that have never been committed.'),
1198
RegistryOption.from_kwargs('file-deletion-strategy',
1199
'The file deletion mode to be used.',
1200
title='Deletion Strategy', value_switches=True, enum_switch=False,
1201
safe='Only delete files if they can be'
1202
' safely recovered (default).',
1203
keep="Don't delete any files.",
1204
force='Delete all the specified files, even if they can not be '
1205
'recovered and even if they are non-empty directories.')]
1206
aliases = ['rm', 'del']
1207
encoding_type = 'replace'
1208
1209
def run(self, file_list, verbose=False, new=False,
1210
file_deletion_strategy='safe'):
839
takes_options = ['verbose', Option('new', help='remove newly-added files')]
840
aliases = ['rm']
841
842
def run(self, file_list, verbose=False, new=False):
1211
843
tree, file_list = tree_files(file_list)
1212
1213
if file_list is not None:
1214
file_list = [f for f in file_list]
1215
1216
tree.lock_write()
1217
try:
1218
# Heuristics should probably all move into tree.remove_smart or
1219
# some such?
1220
if new:
1221
added = tree.changes_from(tree.basis_tree(),
1222
specific_files=file_list).added
1223
file_list = sorted([f[0] for f in added], reverse=True)
1224
if len(file_list) == 0:
1225
raise errors.BzrCommandError('No matching files.')
1226
elif file_list is None:
1227
# missing files show up in iter_changes(basis) as
1228
# versioned-with-no-kind.
1229
missing = []
1230
for change in tree.iter_changes(tree.basis_tree()):
1231
# Find paths in the working tree that have no kind:
1232
if change[1][1] is not None and change[6][1] is None:
1233
missing.append(change[1][1])
1234
file_list = sorted(missing, reverse=True)
1235
file_deletion_strategy = 'keep'
1236
tree.remove(file_list, verbose=verbose, to_file=self.outf,
1237
keep_files=file_deletion_strategy=='keep',
1238
force=file_deletion_strategy=='force')
1239
finally:
1240
tree.unlock()
844
if new is False:
845
if file_list is None:
846
raise BzrCommandError('Specify one or more files to remove, or'
847
' use --new.')
848
else:
849
from bzrlib.delta import compare_trees
850
added = [compare_trees(tree.basis_tree(), tree,
851
specific_files=file_list).added]
852
file_list = sorted([f[0] for f in added[0]], reverse=True)
853
if len(file_list) == 0:
854
raise BzrCommandError('No matching files.')
855
tree.remove(file_list, verbose=verbose)
1241
856
1242
857
1243
858
class cmd_file_id(Command):
1247
862
same through all revisions where the file exists, even when it is
1248
863
moved or renamed.
1249
864
"""
1250
1251
865
hidden = True
1252
_see_also = ['inventory', 'ls']
1253
866
takes_args = ['filename']
1254
867
1255
868
@display_command
1256
869
def run(self, filename):
1257
870
tree, relpath = WorkingTree.open_containing(filename)
1258
i = tree.path2id(relpath)
1259
if i is None:
1260
raise errors.NotVersionedError(filename)
871
i = tree.inventory.path2id(relpath)
872
if i == None:
873
raise BzrError("%r is not a versioned file" % filename)
1261
874
else:
1262
self.outf.write(i + '\n')
875
self.outf.write(i)
876
self.outf.write('\n')
1263
877
1264
878
1265
879
class cmd_file_path(Command):
1268
882
This prints one line for each directory down to the target,
1269
883
starting at the branch root.
1270
884
"""
1271
1272
885
hidden = True
1273
886
takes_args = ['filename']
1274
887
1275
888
@display_command
1276
889
def run(self, filename):
1277
890
tree, relpath = WorkingTree.open_containing(filename)
1278
fid = tree.path2id(relpath)
1279
if fid is None:
1280
raise errors.NotVersionedError(filename)
1281
segments = osutils.splitpath(relpath)
1282
for pos in range(1, len(segments) + 1):
1283
path = osutils.joinpath(segments[:pos])
1284
self.outf.write("%s\n" % tree.path2id(path))
891
inv = tree.inventory
892
fid = inv.path2id(relpath)
893
if fid == None:
894
raise BzrError("%r is not a versioned file" % filename)
895
for fip in inv.get_idpath(fid):
896
self.outf.write(fip)
897
self.outf.write('\n')
1285
898
1286
899
1287
900
class cmd_reconcile(Command):
1302
915
1303
916
The branch *MUST* be on a listable system such as local disk or sftp.
1304
917
"""
1305
1306
_see_also = ['check']
1307
918
takes_args = ['branch?']
1308
919
1309
920
def run(self, branch="."):
1310
921
from bzrlib.reconcile import reconcile
1311
dir = bzrdir.BzrDir.open(branch)
922
dir = bzrlib.bzrdir.BzrDir.open(branch)
1312
923
reconcile(dir)
1313
924
1314
925
1315
926
class cmd_revision_history(Command):
1316
"""Display the list of revision ids on a branch."""
1317
1318
_see_also = ['log']
1319
takes_args = ['location?']
1320
927
"""Display list of revision ids on this branch."""
1321
928
hidden = True
1322
929
1323
930
@display_command
1324
def run(self, location="."):
1325
branch = Branch.open_containing(location)[0]
1326
for revid in branch.revision_history():
1327
self.outf.write(revid)
931
def run(self):
932
branch = WorkingTree.open_containing(u'.')[0].branch
933
for patchid in branch.revision_history():
934
self.outf.write(patchid)
1328
935
self.outf.write('\n')
1329
936
1330
937
1331
938
class cmd_ancestry(Command):
1332
939
"""List all revisions merged into this branch."""
1333
1334
_see_also = ['log', 'revision-history']
1335
takes_args = ['location?']
1336
1337
940
hidden = True
1338
941
1339
942
@display_command
1340
def run(self, location="."):
1341
try:
1342
wt = WorkingTree.open_containing(location)[0]
1343
except errors.NoWorkingTree:
1344
b = Branch.open(location)
1345
last_revision = b.last_revision()
1346
else:
1347
b = wt.branch
1348
last_revision = wt.last_revision()
1349
1350
revision_ids = b.repository.get_ancestry(last_revision)
943
def run(self):
944
tree = WorkingTree.open_containing(u'.')[0]
945
b = tree.branch
946
# FIXME. should be tree.last_revision
947
revision_ids = b.repository.get_ancestry(b.last_revision())
948
assert revision_ids[0] == None
1351
949
revision_ids.pop(0)
1352
950
for revision_id in revision_ids:
1353
951
self.outf.write(revision_id + '\n')
1361
959
1362
960
If there is a repository in a parent directory of the location, then
1363
961
the history of the branch will be stored in the repository. Otherwise
1364
init creates a standalone branch which carries its own history
1365
in the .bzr directory.
962
init creates a standalone branch which carries its own history in
963
.bzr.
1366
964
1367
965
If there is already a branch at the location but it has no working tree,
1368
966
the tree can be populated with 'bzr checkout'.
1369
967
1370
Recipe for importing a tree of files::
1371
968
Recipe for importing a tree of files:
1372
969
cd ~/project
1373
970
bzr init
1374
971
bzr add .
1375
972
bzr status
1376
bzr commit -m "imported project"
973
bzr commit -m 'imported project'
1377
974
"""
1378
1379
_see_also = ['init-repository', 'branch', 'checkout']
1380
975
takes_args = ['location?']
1381
976
takes_options = [
1382
Option('create-prefix',
1383
help='Create the path leading up to the branch '
1384
'if it does not already exist.'),
1385
RegistryOption('format',
1386
help='Specify a format for this branch. '
1387
'See "help formats".',
1388
lazy_registry=('bzrlib.bzrdir', 'format_registry'),
1389
converter=lambda name: bzrdir.format_registry.make_bzrdir(name),
1390
value_switches=True,
1391
title="Branch Format",
1392
),
1393
Option('append-revisions-only',
1394
help='Never change revnos or the existing log.'
1395
' Append revisions to it only.')
1396
]
1397
def run(self, location=None, format=None, append_revisions_only=False,
1398
create_prefix=False):
977
Option('format',
978
help='Specify a format for this branch. Current'
979
' formats are: default, knit, metaweave and'
980
' weave. Default is knit; metaweave and'
981
' weave are deprecated',
982
type=get_format_type),
983
]
984
def run(self, location=None, format=None):
985
from bzrlib.branch import Branch
1399
986
if format is None:
1400
format = bzrdir.format_registry.make_bzrdir('default')
987
format = get_format_type('default')
1401
988
if location is None:
1402
989
location = u'.'
1403
1404
to_transport = transport.get_transport(location)
1405
1406
# The path has to exist to initialize a
1407
# branch inside of it.
1408
# Just using os.mkdir, since I don't
1409
# believe that we want to create a bunch of
1410
# locations if the user supplies an extended path
1411
try:
1412
to_transport.ensure_base()
1413
except errors.NoSuchFile:
1414
if not create_prefix:
1415
raise errors.BzrCommandError("Parent directory of %s"
1416
" does not exist."
1417
"\nYou may supply --create-prefix to create all"
1418
" leading parent directories."
1419
% location)
1420
_create_prefix(to_transport)
1421
1422
try:
1423
a_bzrdir = bzrdir.BzrDir.open_from_transport(to_transport)
1424
except errors.NotBranchError:
990
else:
991
# The path has to exist to initialize a
992
# branch inside of it.
993
# Just using os.mkdir, since I don't
994
# believe that we want to create a bunch of
995
# locations if the user supplies an extended path
996
if not os.path.exists(location):
997
os.mkdir(location)
998
try:
999
existing_bzrdir = bzrdir.BzrDir.open(location)
1000
except NotBranchError:
1425
1001
# really a NotBzrDir error...
1426
create_branch = bzrdir.BzrDir.create_branch_convenience
1427
branch = create_branch(to_transport.base, format=format,
1428
possible_transports=[to_transport])
1429
a_bzrdir = branch.bzrdir
1002
bzrdir.BzrDir.create_branch_convenience(location, format=format)
1430
1003
else:
1431
from bzrlib.transport.local import LocalTransport
1432
if a_bzrdir.has_branch():
1433
if (isinstance(to_transport, LocalTransport)
1434
and not a_bzrdir.has_workingtree()):
1435
raise errors.BranchExistsWithoutWorkingTree(location)
1436
raise errors.AlreadyBranchError(location)
1437
branch = a_bzrdir.create_branch()
1438
a_bzrdir.create_workingtree()
1439
if append_revisions_only:
1440
try:
1441
branch.set_append_revisions_only(True)
1442
except errors.UpgradeRequired:
1443
raise errors.BzrCommandError('This branch format cannot be set'
1444
' to append-revisions-only. Try --experimental-branch6')
1445
if not is_quiet():
1446
from bzrlib.info import show_bzrdir_info
1447
show_bzrdir_info(a_bzrdir, verbose=0, outfile=self.outf)
1004
if existing_bzrdir.has_branch():
1005
if existing_bzrdir.has_workingtree():
1006
raise errors.AlreadyBranchError(location)
1007
else:
1008
raise errors.BranchExistsWithoutWorkingTree(location)
1009
else:
1010
existing_bzrdir.create_branch()
1011
existing_bzrdir.create_workingtree()
1448
1012
1449
1013
1450
1014
class cmd_init_repository(Command):
1451
1015
"""Create a shared repository to hold branches.
1452
1016
1453
New branches created under the repository directory will store their
1454
revisions in the repository, not in the branch directory.
1455
1456
If the --no-trees option is used then the branches in the repository
1457
will not have working trees by default.
1458
1459
:Examples:
1460
Create a shared repositories holding just branches::
1461
1462
bzr init-repo --no-trees repo
1463
bzr init repo/trunk
1464
1465
Make a lightweight checkout elsewhere::
1466
1467
bzr checkout --lightweight repo/trunk trunk-checkout
1468
cd trunk-checkout
1469
(add files here)
1017
New branches created under the repository directory will store their revisions
1018
in the repository, not in the branch directory, if the branch format supports
1019
shared storage.
1020
1021
example:
1022
bzr init-repo repo
1023
bzr init repo/trunk
1024
bzr checkout --lightweight repo/trunk trunk-checkout
1025
cd trunk-checkout
1026
(add files here)
1470
1027
"""
1471
1472
_see_also = ['init', 'branch', 'checkout', 'repositories']
1473
takes_args = ["location"]
1474
takes_options = [RegistryOption('format',
1475
help='Specify a format for this repository. See'
1476
' "bzr help formats" for details.',
1477
lazy_registry=('bzrlib.bzrdir', 'format_registry'),
1478
converter=lambda name: bzrdir.format_registry.make_bzrdir(name),
1479
value_switches=True, title='Repository format'),
1480
Option('no-trees',
1481
help='Branches in the repository will default to'
1482
' not having a working tree.'),
1483
]
1028
takes_args = ["location"]
1029
takes_options = [Option('format',
1030
help='Specify a format for this repository.'
1031
' Current formats are: default, knit,'
1032
' metaweave and weave. Default is knit;'
1033
' metaweave and weave are deprecated',
1034
type=get_format_type),
1035
Option('trees',
1036
help='Allows branches in repository to have'
1037
' a working tree')]
1484
1038
aliases = ["init-repo"]
1485
1486
def run(self, location, format=None, no_trees=False):
1039
def run(self, location, format=None, trees=False):
1040
from bzrlib.transport import get_transport
1487
1041
if format is None:
1488
format = bzrdir.format_registry.make_bzrdir('default')
1489
1490
if location is None:
1491
location = '.'
1492
1493
to_transport = transport.get_transport(location)
1494
to_transport.ensure_base()
1495
1496
newdir = format.initialize_on_transport(to_transport)
1042
format = get_format_type('default')
1043
transport = get_transport(location)
1044
if not transport.has('.'):
1045
transport.mkdir('')
1046
newdir = format.initialize_on_transport(transport)
1497
1047
repo = newdir.create_repository(shared=True)
1498
repo.set_make_working_trees(not no_trees)
1499
if not is_quiet():
1500
from bzrlib.info import show_bzrdir_info
1501
show_bzrdir_info(repo.bzrdir, verbose=0, outfile=self.outf)
1048
repo.set_make_working_trees(trees)
1502
1049
1503
1050
1504
1051
class cmd_diff(Command):
1505
"""Show differences in the working tree, between revisions or branches.
1052
"""Show differences in working tree.
1506
1053
1507
If no arguments are given, all changes for the current tree are listed.
1508
If files are given, only the changes in those files are listed.
1509
Remote and multiple branches can be compared by using the --old and
1510
--new options. If not provided, the default for both is derived from
1511
the first argument, if any, or the current tree if no arguments are
1512
given.
1054
If files are listed, only the changes in those files are listed.
1055
Otherwise, all changes for the tree are listed.
1513
1056
1514
1057
"bzr diff -p1" is equivalent to "bzr diff --prefix old/:new/", and
1515
1058
produces patches suitable for "patch -p1".
1516
1059
1517
:Exit values:
1518
1 - changed
1519
2 - unrepresentable changes
1520
3 - error
1521
0 - no change
1522
1523
:Examples:
1524
Shows the difference in the working tree versus the last commit::
1525
1526
bzr diff
1527
1528
Difference between the working tree and revision 1::
1529
1530
bzr diff -r1
1531
1532
Difference between revision 2 and revision 1::
1533
1534
bzr diff -r1..2
1535
1536
Difference between revision 2 and revision 1 for branch xxx::
1537
1538
bzr diff -r1..2 xxx
1539
1540
Show just the differences for file NEWS::
1541
1542
bzr diff NEWS
1543
1544
Show the differences in working tree xxx for file NEWS::
1545
1546
bzr diff xxx/NEWS
1547
1548
Show the differences from branch xxx to this working tree:
1549
1550
bzr diff --old xxx
1551
1552
Show the differences between two branches for file NEWS::
1553
1554
bzr diff --old xxx --new yyy NEWS
1555
1556
Same as 'bzr diff' but prefix paths with old/ and new/::
1557
1558
bzr diff --prefix old/:new/
1060
examples:
1061
bzr diff
1062
bzr diff -r1
1063
bzr diff -r1..2
1064
bzr diff --diff-prefix old/:new/
1065
bzr diff bzr.mine bzr.dev
1066
bzr diff foo.c
1559
1067
"""
1560
_see_also = ['status']
1068
# TODO: Option to use external diff command; could be GNU diff, wdiff,
1069
# or a graphical diff.
1070
1071
# TODO: Python difflib is not exactly the same as unidiff; should
1072
# either fix it up or prefer to use an external diff.
1073
1074
# TODO: Selected-file diff is inefficient and doesn't show you
1075
# deleted files.
1076
1077
# TODO: This probably handles non-Unix newlines poorly.
1078
1561
1079
takes_args = ['file*']
1562
takes_options = [
1563
Option('diff-options', type=str,
1564
help='Pass these options to the external diff program.'),
1565
Option('prefix', type=str,
1566
short_name='p',
1567
help='Set prefixes added to old and new filenames, as '
1568
'two values separated by a colon. (eg "old/:new/").'),
1569
Option('old',
1570
help='Branch/tree to compare from.',
1571
type=unicode,
1572
),
1573
Option('new',
1574
help='Branch/tree to compare to.',
1575
type=unicode,
1576
),
1577
'revision',
1578
'change',
1579
Option('using',
1580
help='Use this command to compare files.',
1581
type=unicode,
1582
),
1583
]
1080
takes_options = ['revision', 'diff-options', 'prefix']
1584
1081
aliases = ['di', 'dif']
1585
1082
encoding_type = 'exact'
1586
1083
1587
1084
@display_command
1588
1085
def run(self, revision=None, file_list=None, diff_options=None,
1589
prefix=None, old=None, new=None, using=None):
1590
from bzrlib.diff import _get_trees_to_diff, show_diff_trees
1086
prefix=None):
1087
from bzrlib.diff import diff_cmd_helper, show_diff_trees
1591
1088
1592
1089
if (prefix is None) or (prefix == '0'):
1593
1090
# diff -p0 format
1596
1093
elif prefix == '1':
1597
1094
old_label = 'old/'
1598
1095
new_label = 'new/'
1599
elif ':' in prefix:
1096
else:
1097
if not ':' in prefix:
1098
raise BzrError("--diff-prefix expects two values separated by a colon")
1600
1099
old_label, new_label = prefix.split(":")
1100
1101
try:
1102
tree1, file_list = internal_tree_files(file_list)
1103
tree2 = None
1104
b = None
1105
b2 = None
1106
except FileInWrongBranch:
1107
if len(file_list) != 2:
1108
raise BzrCommandError("Files are in different branches")
1109
1110
tree1, file1 = WorkingTree.open_containing(file_list[0])
1111
tree2, file2 = WorkingTree.open_containing(file_list[1])
1112
if file1 != "" or file2 != "":
1113
# FIXME diff those two files. rbc 20051123
1114
raise BzrCommandError("Files are in different branches")
1115
file_list = None
1116
if revision is not None:
1117
if tree2 is not None:
1118
raise BzrCommandError("Can't specify -r with two branches")
1119
if (len(revision) == 1) or (revision[1].spec is None):
1120
return diff_cmd_helper(tree1, file_list, diff_options,
1121
revision[0],
1122
old_label=old_label, new_label=new_label)
1123
elif len(revision) == 2:
1124
return diff_cmd_helper(tree1, file_list, diff_options,
1125
revision[0], revision[1],
1126
old_label=old_label, new_label=new_label)
1127
else:
1128
raise BzrCommandError('bzr diff --revision takes exactly one or two revision identifiers')
1601
1129
else:
1602
raise errors.BzrCommandError(
1603
'--prefix expects two values separated by a colon'
1604
' (eg "old/:new/")')
1605
1606
if revision and len(revision) > 2:
1607
raise errors.BzrCommandError('bzr diff --revision takes exactly'
1608
' one or two revision specifiers')
1609
1610
old_tree, new_tree, specific_files, extra_trees = \
1611
_get_trees_to_diff(file_list, revision, old, new)
1612
return show_diff_trees(old_tree, new_tree, sys.stdout,
1613
specific_files=specific_files,
1614
external_diff_options=diff_options,
1615
old_label=old_label, new_label=new_label,
1616
extra_trees=extra_trees, using=using)
1130
if tree2 is not None:
1131
return show_diff_trees(tree1, tree2, sys.stdout,
1132
specific_files=file_list,
1133
external_diff_options=diff_options,
1134
old_label=old_label, new_label=new_label)
1135
else:
1136
return diff_cmd_helper(tree1, file_list, diff_options,
1137
old_label=old_label, new_label=new_label)
1617
1138
1618
1139
1619
1140
class cmd_deleted(Command):
1625
1146
# directories with readdir, rather than stating each one. Same
1626
1147
# level of effort but possibly much less IO. (Or possibly not,
1627
1148
# if the directories are very large...)
1628
_see_also = ['status', 'ls']
1629
1149
takes_options = ['show-ids']
1630
1150
1631
1151
@display_command
1632
1152
def run(self, show_ids=False):
1633
1153
tree = WorkingTree.open_containing(u'.')[0]
1634
tree.lock_read()
1635
try:
1636
old = tree.basis_tree()
1637
old.lock_read()
1638
try:
1639
for path, ie in old.inventory.iter_entries():
1640
if not tree.has_id(ie.file_id):
1641
self.outf.write(path)
1642
if show_ids:
1643
self.outf.write(' ')
1644
self.outf.write(ie.file_id)
1645
self.outf.write('\n')
1646
finally:
1647
old.unlock()
1648
finally:
1649
tree.unlock()
1154
old = tree.basis_tree()
1155
for path, ie in old.inventory.iter_entries():
1156
if not tree.has_id(ie.file_id):
1157
self.outf.write(path)
1158
if show_ids:
1159
self.outf.write(' ')
1160
self.outf.write(ie.file_id)
1161
self.outf.write('\n')
1650
1162
1651
1163
1652
1164
class cmd_modified(Command):
1653
"""List files modified in working tree.
1654
"""
1655
1165
"""List files modified in working tree."""
1656
1166
hidden = True
1657
_see_also = ['status', 'ls']
1658
takes_options = [
1659
Option('null',
1660
help='Write an ascii NUL (\\0) separator '
1661
'between files rather than a newline.')
1662
]
1663
1664
1167
@display_command
1665
def run(self, null=False):
1168
def run(self):
1169
from bzrlib.delta import compare_trees
1170
1666
1171
tree = WorkingTree.open_containing(u'.')[0]
1667
td = tree.changes_from(tree.basis_tree())
1172
td = compare_trees(tree.basis_tree(), tree)
1173
1668
1174
for path, id, kind, text_modified, meta_modified in td.modified:
1669
if null:
1670
self.outf.write(path + '\0')
1671
else:
1672
self.outf.write(osutils.quotefn(path) + '\n')
1175
self.outf.write(path)
1176
self.outf.write('\n')
1673
1177
1674
1178
1675
1179
class cmd_added(Command):
1676
"""List files added in working tree.
1677
"""
1678
1180
"""List files added in working tree."""
1679
1181
hidden = True
1680
_see_also = ['status', 'ls']
1681
takes_options = [
1682
Option('null',
1683
help='Write an ascii NUL (\\0) separator '
1684
'between files rather than a newline.')
1685
]
1686
1687
1182
@display_command
1688
def run(self, null=False):
1183
def run(self):
1689
1184
wt = WorkingTree.open_containing(u'.')[0]
1690
wt.lock_read()
1691
try:
1692
basis = wt.basis_tree()
1693
basis.lock_read()
1694
try:
1695
basis_inv = basis.inventory
1696
inv = wt.inventory
1697
for file_id in inv:
1698
if file_id in basis_inv:
1699
continue
1700
if inv.is_root(file_id) and len(basis_inv) == 0:
1701
continue
1702
path = inv.id2path(file_id)
1703
if not os.access(osutils.abspath(path), os.F_OK):
1704
continue
1705
if null:
1706
self.outf.write(path + '\0')
1707
else:
1708
self.outf.write(osutils.quotefn(path) + '\n')
1709
finally:
1710
basis.unlock()
1711
finally:
1712
wt.unlock()
1185
basis_inv = wt.basis_tree().inventory
1186
inv = wt.inventory
1187
for file_id in inv:
1188
if file_id in basis_inv:
1189
continue
1190
path = inv.id2path(file_id)
1191
if not os.access(bzrlib.osutils.abspath(path), os.F_OK):
1192
continue
1193
self.outf.write(path)
1194
self.outf.write('\n')
1713
1195
1714
1196
1715
1197
class cmd_root(Command):
1717
1199
1718
1200
The root is the nearest enclosing directory with a .bzr control
1719
1201
directory."""
1720
1721
1202
takes_args = ['filename?']
1722
1203
@display_command
1723
1204
def run(self, filename=None):
1724
1205
"""Print the branch root."""
1725
1206
tree = WorkingTree.open_containing(filename)[0]
1726
self.outf.write(tree.basedir + '\n')
1727
1728
1729
def _parse_limit(limitstring):
1730
try:
1731
return int(limitstring)
1732
except ValueError:
1733
msg = "The limit argument must be an integer."
1734
raise errors.BzrCommandError(msg)
1207
self.outf.write(tree.basedir)
1208
self.outf.write('\n')
1735
1209
1736
1210
1737
1211
class cmd_log(Command):
1743
1217
-r revision requests a specific revision, -r ..end or -r begin.. are
1744
1218
also valid.
1745
1219
1746
:Examples:
1747
Log the current branch::
1748
1749
bzr log
1750
1751
Log a file::
1752
1753
bzr log foo.c
1754
1755
Log the last 10 revisions of a branch::
1756
1757
bzr log -r -10.. http://server/branch
1220
examples:
1221
bzr log
1222
bzr log foo.c
1223
bzr log -r -10.. http://server/branch
1758
1224
"""
1759
1225
1760
1226
# TODO: Make --revision support uuid: and hash: [future tag:] notation.
1761
1227
1762
1228
takes_args = ['location?']
1763
takes_options = [
1764
Option('forward',
1765
help='Show from oldest to newest.'),
1766
'timezone',
1767
custom_help('verbose',
1768
help='Show files changed in each revision.'),
1769
'show-ids',
1770
'revision',
1771
Option('change',
1772
type=bzrlib.option._parse_revision_str,
1773
short_name='c',
1774
help='Show just the specified revision.'
1775
' See also "help revisionspec".'),
1776
'log-format',
1777
Option('message',
1778
short_name='m',
1779
help='Show revisions whose message matches this '
1780
'regular expression.',
1781
type=str),
1782
Option('limit',
1783
short_name='l',
1784
help='Limit the output to the first N revisions.',
1785
argname='N',
1786
type=_parse_limit),
1787
]
1229
takes_options = [Option('forward',
1230
help='show from oldest to newest'),
1231
'timezone',
1232
Option('verbose',
1233
help='show files changed in each revision'),
1234
'show-ids', 'revision',
1235
'log-format',
1236
'line', 'long',
1237
Option('message',
1238
help='show revisions whose message matches this regexp',
1239
type=str),
1240
'short',
1241
]
1788
1242
encoding_type = 'replace'
1789
1243
1790
1244
@display_command
1793
1247
show_ids=False,
1794
1248
forward=False,
1795
1249
revision=None,
1796
change=None,
1797
1250
log_format=None,
1798
1251
message=None,
1799
limit=None):
1800
from bzrlib.log import show_log
1252
long=False,
1253
short=False,
1254
line=False):
1255
from bzrlib.log import log_formatter, show_log
1256
assert message is None or isinstance(message, basestring), \
1257
"invalid message argument %r" % message
1801
1258
direction = (forward and 'forward') or 'reverse'
1802
1803
if change is not None:
1804
if len(change) > 1:
1805
raise errors.RangeInChangeOption()
1806
if revision is not None:
1807
raise errors.BzrCommandError(
1808
'--revision and --change are mutually exclusive')
1809
else:
1810
revision = change
1811
1259
1812
1260
# log everything
1813
1261
file_id = None
1814
1262
if location:
1815
1263
# find the file id to log:
1816
1264
1817
tree, b, fp = bzrdir.BzrDir.open_containing_tree_or_branch(
1818
location)
1265
dir, fp = bzrdir.BzrDir.open_containing(location)
1266
b = dir.open_branch()
1819
1267
if fp != '':
1820
if tree is None:
1821
tree = b.basis_tree()
1822
file_id = tree.path2id(fp)
1823
if file_id is None:
1824
raise errors.BzrCommandError(
1825
"Path does not have any revision history: %s" %
1826
location)
1268
try:
1269
# might be a tree:
1270
inv = dir.open_workingtree().inventory
1271
except (errors.NotBranchError, errors.NotLocalUrl):
1272
# either no tree, or is remote.
1273
inv = b.basis_tree().inventory
1274
file_id = inv.path2id(fp)
1827
1275
else:
1828
1276
# local dir only
1829
1277
# FIXME ? log the current subdir only RBC 20060203
1830
if revision is not None \
1831
and len(revision) > 0 and revision[0].get_branch():
1832
location = revision[0].get_branch()
1833
else:
1834
location = '.'
1835
dir, relpath = bzrdir.BzrDir.open_containing(location)
1278
dir, relpath = bzrdir.BzrDir.open_containing('.')
1836
1279
b = dir.open_branch()
1837
1280
1838
b.lock_read()
1839
try:
1840
if revision is None:
1841
rev1 = None
1842
rev2 = None
1843
elif len(revision) == 1:
1844
rev1 = rev2 = revision[0].in_history(b)
1845
elif len(revision) == 2:
1846
if revision[1].get_branch() != revision[0].get_branch():
1847
# b is taken from revision[0].get_branch(), and
1848
# show_log will use its revision_history. Having
1849
# different branches will lead to weird behaviors.
1850
raise errors.BzrCommandError(
1851
"Log doesn't accept two revisions in different"
1852
" branches.")
1853
rev1 = revision[0].in_history(b)
1854
rev2 = revision[1].in_history(b)
1855
else:
1856
raise errors.BzrCommandError(
1857
'bzr log --revision takes one or two values.')
1858
1859
if log_format is None:
1860
log_format = log.log_formatter_registry.get_default(b)
1861
1862
lf = log_format(show_ids=show_ids, to_file=self.outf,
1863
show_timezone=timezone)
1864
1865
show_log(b,
1866
lf,
1867
file_id,
1868
verbose=verbose,
1869
direction=direction,
1870
start_revision=rev1,
1871
end_revision=rev2,
1872
search=message,
1873
limit=limit)
1874
finally:
1875
b.unlock()
1281
if revision is None:
1282
rev1 = None
1283
rev2 = None
1284
elif len(revision) == 1:
1285
rev1 = rev2 = revision[0].in_history(b).revno
1286
elif len(revision) == 2:
1287
if revision[0].spec is None:
1288
# missing begin-range means first revision
1289
rev1 = 1
1290
else:
1291
rev1 = revision[0].in_history(b).revno
1292
1293
if revision[1].spec is None:
1294
# missing end-range means last known revision
1295
rev2 = b.revno()
1296
else:
1297
rev2 = revision[1].in_history(b).revno
1298
else:
1299
raise BzrCommandError('bzr log --revision takes one or two values.')
1300
1301
# By this point, the revision numbers are converted to the +ve
1302
# form if they were supplied in the -ve form, so we can do
1303
# this comparison in relative safety
1304
if rev1 > rev2:
1305
(rev2, rev1) = (rev1, rev2)
1306
1307
if (log_format == None):
1308
default = bzrlib.config.BranchConfig(b).log_format()
1309
log_format = get_log_format(long=long, short=short, line=line, default=default)
1310
lf = log_formatter(log_format,
1311
show_ids=show_ids,
1312
to_file=self.outf,
1313
show_timezone=timezone)
1314
1315
show_log(b,
1316
lf,
1317
file_id,
1318
verbose=verbose,
1319
direction=direction,
1320
start_revision=rev1,
1321
end_revision=rev2,
1322
search=message)
1876
1323
1877
1324
1878
1325
def get_log_format(long=False, short=False, line=False, default='long'):
1889
1336
class cmd_touching_revisions(Command):
1890
1337
"""Return revision-ids which affected a particular file.
1891
1338
1892
A more user-friendly interface is "bzr log FILE".
1893
"""
1894
1339
A more user-friendly interface is "bzr log FILE"."""
1895
1340
hidden = True
1896
1341
takes_args = ["filename"]
1342
encoding_type = 'replace'
1897
1343
1898
1344
@display_command
1899
1345
def run(self, filename):
1900
1346
tree, relpath = WorkingTree.open_containing(filename)
1901
1347
b = tree.branch
1902
file_id = tree.path2id(relpath)
1903
for revno, revision_id, what in log.find_touching_revisions(b, file_id):
1348
inv = tree.read_working_inventory()
1349
file_id = inv.path2id(relpath)
1350
for revno, revision_id, what in bzrlib.log.find_touching_revisions(b, file_id):
1904
1351
self.outf.write("%6d %s\n" % (revno, what))
1905
1352
1906
1353
1907
1354
class cmd_ls(Command):
1908
1355
"""List files in a tree.
1909
1356
"""
1910
1911
_see_also = ['status', 'cat']
1912
takes_args = ['path?']
1913
1357
# TODO: Take a revision or remote path and list that tree instead.
1914
takes_options = [
1915
'verbose',
1916
'revision',
1917
Option('non-recursive',
1918
help='Don\'t recurse into subdirectories.'),
1919
Option('from-root',
1920
help='Print paths relative to the root of the branch.'),
1921
Option('unknown', help='Print unknown files.'),
1922
Option('versioned', help='Print versioned files.',
1923
short_name='V'),
1924
Option('ignored', help='Print ignored files.'),
1925
Option('null',
1926
help='Write an ascii NUL (\\0) separator '
1927
'between files rather than a newline.'),
1928
Option('kind',
1929
help='List entries of a particular kind: file, directory, symlink.',
1930
type=unicode),
1931
'show-ids',
1932
]
1358
hidden = True
1359
takes_options = ['verbose', 'revision',
1360
Option('non-recursive',
1361
help='don\'t recurse into sub-directories'),
1362
Option('from-root',
1363
help='Print all paths from the root of the branch.'),
1364
Option('unknown', help='Print unknown files'),
1365
Option('versioned', help='Print versioned files'),
1366
Option('ignored', help='Print ignored files'),
1367
1368
Option('null', help='Null separate the files'),
1369
]
1933
1370
@display_command
1934
def run(self, revision=None, verbose=False,
1371
def run(self, revision=None, verbose=False,
1935
1372
non_recursive=False, from_root=False,
1936
1373
unknown=False, versioned=False, ignored=False,
1937
null=False, kind=None, show_ids=False, path=None):
1938
1939
if kind and kind not in ('file', 'directory', 'symlink'):
1940
raise errors.BzrCommandError('invalid kind specified')
1374
null=False):
1941
1375
1942
1376
if verbose and null:
1943
raise errors.BzrCommandError('Cannot set both --verbose and --null')
1377
raise BzrCommandError('Cannot set both --verbose and --null')
1944
1378
all = not (unknown or versioned or ignored)
1945
1379
1946
1380
selection = {'I':ignored, '?':unknown, 'V':versioned}
1947
1381
1948
if path is None:
1949
fs_path = '.'
1950
prefix = ''
1951
else:
1952
if from_root:
1953
raise errors.BzrCommandError('cannot specify both --from-root'
1954
' and PATH')
1955
fs_path = path
1956
prefix = path
1957
tree, branch, relpath = bzrdir.BzrDir.open_containing_tree_or_branch(
1958
fs_path)
1382
tree, relpath = WorkingTree.open_containing(u'.')
1959
1383
if from_root:
1960
1384
relpath = u''
1961
1385
elif relpath:
1962
1386
relpath += '/'
1963
if revision is not None or tree is None:
1964
tree = _get_one_revision_tree('ls', revision, branch=branch)
1387
if revision is not None:
1388
tree = tree.branch.repository.revision_tree(
1389
revision[0].in_history(tree.branch).rev_id)
1965
1390
1966
tree.lock_read()
1967
try:
1968
for fp, fc, fkind, fid, entry in tree.list_files(include_root=False):
1969
if fp.startswith(relpath):
1970
fp = osutils.pathjoin(prefix, fp[len(relpath):])
1971
if non_recursive and '/' in fp:
1972
continue
1973
if not all and not selection[fc]:
1974
continue
1975
if kind is not None and fkind != kind:
1976
continue
1977
if verbose:
1978
kindch = entry.kind_character()
1979
outstring = '%-8s %s%s' % (fc, fp, kindch)
1980
if show_ids and fid is not None:
1981
outstring = "%-50s %s" % (outstring, fid)
1982
self.outf.write(outstring + '\n')
1983
elif null:
1984
self.outf.write(fp + '\0')
1985
if show_ids:
1986
if fid is not None:
1987
self.outf.write(fid)
1988
self.outf.write('\0')
1989
self.outf.flush()
1990
else:
1991
if fid is not None:
1992
my_id = fid
1993
else:
1994
my_id = ''
1995
if show_ids:
1996
self.outf.write('%-50s %s\n' % (fp, my_id))
1997
else:
1998
self.outf.write(fp + '\n')
1999
finally:
2000
tree.unlock()
1391
for fp, fc, kind, fid, entry in tree.list_files():
1392
if fp.startswith(relpath):
1393
fp = fp[len(relpath):]
1394
if non_recursive and '/' in fp:
1395
continue
1396
if not all and not selection[fc]:
1397
continue
1398
if verbose:
1399
kindch = entry.kind_character()
1400
self.outf.write('%-8s %s%s\n' % (fc, fp, kindch))
1401
elif null:
1402
self.outf.write(fp)
1403
self.outf.write('\0')
1404
self.outf.flush()
1405
else:
1406
self.outf.write(fp)
1407
self.outf.write('\n')
2001
1408
2002
1409
2003
1410
class cmd_unknowns(Command):
2004
"""List unknown files.
2005
"""
2006
2007
hidden = True
2008
_see_also = ['ls']
2009
1411
"""List unknown files."""
2010
1412
@display_command
2011
1413
def run(self):
1414
from bzrlib.osutils import quotefn
2012
1415
for f in WorkingTree.open_containing(u'.')[0].unknowns():
2013
self.outf.write(osutils.quotefn(f) + '\n')
1416
self.outf.write(quotefn(f))
1417
self.outf.write('\n')
2014
1418
2015
1419
2016
1420
class cmd_ignore(Command):
2017
"""Ignore specified files or patterns.
2018
2019
See ``bzr help patterns`` for details on the syntax of patterns.
1421
"""Ignore a command or pattern.
2020
1422
2021
1423
To remove patterns from the ignore list, edit the .bzrignore file.
2022
After adding, editing or deleting that file either indirectly by
2023
using this command or directly by using an editor, be sure to commit
2024
it.
2025
2026
Note: ignore patterns containing shell wildcards must be quoted from
2027
the shell on Unix.
2028
2029
:Examples:
2030
Ignore the top level Makefile::
2031
2032
bzr ignore ./Makefile
2033
2034
Ignore class files in all directories::
2035
2036
bzr ignore "*.class"
2037
2038
Ignore .o files under the lib directory::
2039
2040
bzr ignore "lib/**/*.o"
2041
2042
Ignore .o files under the lib directory::
2043
2044
bzr ignore "RE:lib/.*\.o"
2045
2046
Ignore everything but the "debian" toplevel directory::
2047
2048
bzr ignore "RE:(?!debian/).*"
1424
1425
If the pattern contains a slash, it is compared to the whole path
1426
from the branch root. Otherwise, it is compared to only the last
1427
component of the path. To match a file only in the root directory,
1428
prepend './'.
1429
1430
Ignore patterns are case-insensitive on case-insensitive systems.
1431
1432
Note: wildcards must be quoted from the shell on Unix.
1433
1434
examples:
1435
bzr ignore ./Makefile
1436
bzr ignore '*.class'
2049
1437
"""
2050
2051
_see_also = ['status', 'ignored', 'patterns']
2052
takes_args = ['name_pattern*']
2053
takes_options = [
2054
Option('old-default-rules',
2055
help='Write out the ignore rules bzr < 0.9 always used.')
2056
]
1438
# TODO: Complain if the filename is absolute
1439
takes_args = ['name_pattern']
2057
1440
2058
def run(self, name_pattern_list=None, old_default_rules=None):
2059
from bzrlib import ignores
2060
if old_default_rules is not None:
2061
# dump the rules and exit
2062
for pattern in ignores.OLD_DEFAULTS:
2063
print pattern
2064
return
2065
if not name_pattern_list:
2066
raise errors.BzrCommandError("ignore requires at least one "
2067
"NAME_PATTERN or --old-default-rules")
2068
name_pattern_list = [globbing.normalize_pattern(p)
2069
for p in name_pattern_list]
2070
for name_pattern in name_pattern_list:
2071
if (name_pattern[0] == '/' or
2072
(len(name_pattern) > 1 and name_pattern[1] == ':')):
2073
raise errors.BzrCommandError(
2074
"NAME_PATTERN should not be an absolute path")
1441
def run(self, name_pattern):
1442
from bzrlib.atomicfile import AtomicFile
1443
import os.path
1444
2075
1445
tree, relpath = WorkingTree.open_containing(u'.')
2076
ignores.tree_ignores_add_patterns(tree, name_pattern_list)
2077
ignored = globbing.Globster(name_pattern_list)
2078
matches = []
2079
tree.lock_read()
2080
for entry in tree.list_files():
2081
id = entry[3]
2082
if id is not None:
2083
filename = entry[0]
2084
if ignored.match(filename):
2085
matches.append(filename.encode('utf-8'))
2086
tree.unlock()
2087
if len(matches) > 0:
2088
print "Warning: the following files are version controlled and" \
2089
" match your ignore pattern:\n%s" % ("\n".join(matches),)
1446
ifn = tree.abspath('.bzrignore')
1447
1448
if os.path.exists(ifn):
1449
f = open(ifn, 'rt')
1450
try:
1451
igns = f.read().decode('utf-8')
1452
finally:
1453
f.close()
1454
else:
1455
igns = ''
1456
1457
# TODO: If the file already uses crlf-style termination, maybe
1458
# we should use that for the newly added lines?
1459
1460
if igns and igns[-1] != '\n':
1461
igns += '\n'
1462
igns += name_pattern + '\n'
1463
1464
f = AtomicFile(ifn, 'wt')
1465
try:
1466
f.write(igns.encode('utf-8'))
1467
f.commit()
1468
finally:
1469
f.close()
1470
1471
inv = tree.inventory
1472
if inv.path2id('.bzrignore'):
1473
mutter('.bzrignore is already versioned')
1474
else:
1475
mutter('need to make new .bzrignore file versioned')
1476
tree.add(['.bzrignore'])
2090
1477
2091
1478
2092
1479
class cmd_ignored(Command):
2093
1480
"""List ignored files and the patterns that matched them.
2094
1481
2095
List all the ignored files and the ignore pattern that caused the file to
2096
be ignored.
2097
2098
Alternatively, to list just the files::
2099
2100
bzr ls --ignored
2101
"""
2102
2103
encoding_type = 'replace'
2104
_see_also = ['ignore', 'ls']
2105
1482
See also: bzr ignore"""
2106
1483
@display_command
2107
1484
def run(self):
2108
1485
tree = WorkingTree.open_containing(u'.')[0]
2109
tree.lock_read()
2110
try:
2111
for path, file_class, kind, file_id, entry in tree.list_files():
2112
if file_class != 'I':
2113
continue
2114
## XXX: Slightly inefficient since this was already calculated
2115
pat = tree.is_ignored(path)
2116
self.outf.write('%-50s %s\n' % (path, pat))
2117
finally:
2118
tree.unlock()
1486
for path, file_class, kind, file_id, entry in tree.list_files():
1487
if file_class != 'I':
1488
continue
1489
## XXX: Slightly inefficient since this was already calculated
1490
pat = tree.is_ignored(path)
1491
print '%-50s %s' % (path, pat)
2119
1492
2120
1493
2121
1494
class cmd_lookup_revision(Command):
2122
1495
"""Lookup the revision-id from a revision-number
2123
1496
2124
:Examples:
1497
example:
2125
1498
bzr lookup-revision 33
2126
1499
"""
2127
1500
hidden = True
2132
1505
try:
2133
1506
revno = int(revno)
2134
1507
except ValueError:
2135
raise errors.BzrCommandError("not a valid revision-number: %r" % revno)
1508
raise BzrCommandError("not a valid revision-number: %r" % revno)
2136
1509
2137
1510
print WorkingTree.open_containing(u'.')[0].branch.get_rev_id(revno)
2138
1511
2139
1512
2140
1513
class cmd_export(Command):
2141
"""Export current or past revision to a destination directory or archive.
1514
"""Export past revision to destination directory.
2142
1515
2143
1516
If no revision is specified this exports the last committed revision.
2144
1517
2146
1519
given, try to find the format with the extension. If no extension
2147
1520
is found exports to a directory (equivalent to --format=dir).
2148
1521
2149
If root is supplied, it will be used as the root directory inside
2150
container formats (tar, zip, etc). If it is not supplied it will default
2151
to the exported filename. The root option has no effect for 'dir' format.
2152
2153
If branch is omitted then the branch containing the current working
2154
directory will be used.
2155
2156
Note: Export of tree with non-ASCII filenames to zip is not supported.
2157
2158
================= =========================
2159
Supported formats Autodetected by extension
2160
================= =========================
2161
dir (none)
1522
Root may be the top directory for tar, tgz and tbz2 formats. If none
1523
is given, the top directory will be the root name of the file.
1524
1525
Note: export of tree with non-ascii filenames to zip is not supported.
1526
1527
Supported formats Autodetected by extension
1528
----------------- -------------------------
1529
dir -
2162
1530
tar .tar
2163
1531
tbz2 .tar.bz2, .tbz2
2164
1532
tgz .tar.gz, .tgz
2165
1533
zip .zip
2166
================= =========================
2167
1534
"""
2168
takes_args = ['dest', 'branch_or_subdir?']
2169
takes_options = [
2170
Option('format',
2171
help="Type of file to export to.",
2172
type=unicode),
2173
'revision',
2174
Option('root',
2175
type=str,
2176
help="Name of the root directory inside the exported file."),
2177
]
2178
def run(self, dest, branch_or_subdir=None, revision=None, format=None,
2179
root=None):
1535
takes_args = ['dest']
1536
takes_options = ['revision', 'format', 'root']
1537
def run(self, dest, revision=None, format=None, root=None):
1538
import os.path
2180
1539
from bzrlib.export import export
2181
2182
if branch_or_subdir is None:
2183
tree = WorkingTree.open_containing(u'.')[0]
2184
b = tree.branch
2185
subdir = None
1540
tree = WorkingTree.open_containing(u'.')[0]
1541
b = tree.branch
1542
if revision is None:
1543
# should be tree.last_revision FIXME
1544
rev_id = b.last_revision()
2186
1545
else:
2187
b, subdir = Branch.open_containing(branch_or_subdir)
2188
tree = None
2189
2190
rev_tree = _get_one_revision_tree('export', revision, branch=b, tree=tree)
1546
if len(revision) != 1:
1547
raise BzrError('bzr export --revision takes exactly 1 argument')
1548
rev_id = revision[0].in_history(b).rev_id
1549
t = b.repository.revision_tree(rev_id)
2191
1550
try:
2192
export(rev_tree, dest, format, root, subdir)
1551
export(t, dest, format, root)
2193
1552
except errors.NoSuchExportFormat, e:
2194
raise errors.BzrCommandError('Unsupported export format: %s' % e.format)
1553
raise BzrCommandError('Unsupported export format: %s' % e.format)
2195
1554
2196
1555
2197
1556
class cmd_cat(Command):
2198
"""Write the contents of a file as of a given revision to standard output.
2199
2200
If no revision is nominated, the last revision is used.
2201
2202
Note: Take care to redirect standard output when using this command on a
2203
binary file.
2204
"""
2205
2206
_see_also = ['ls']
2207
takes_options = [
2208
Option('name-from-revision', help='The path name in the old tree.'),
2209
'revision',
2210
]
1557
"""Write a file's text from a previous revision."""
1558
1559
takes_options = ['revision']
2211
1560
takes_args = ['filename']
2212
encoding_type = 'exact'
2213
1561
2214
1562
@display_command
2215
def run(self, filename, revision=None, name_from_revision=False):
1563
def run(self, filename, revision=None):
2216
1564
if revision is not None and len(revision) != 1:
2217
raise errors.BzrCommandError("bzr cat --revision takes exactly"
2218
" one revision specifier")
2219
tree, branch, relpath = \
2220
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
2221
branch.lock_read()
1565
raise BzrCommandError("bzr cat --revision takes exactly one number")
1566
tree = None
2222
1567
try:
2223
return self._run(tree, branch, relpath, filename, revision,
2224
name_from_revision)
2225
finally:
2226
branch.unlock()
1568
tree, relpath = WorkingTree.open_containing(filename)
1569
b = tree.branch
1570
except NotBranchError:
1571
pass
2227
1572
2228
def _run(self, tree, b, relpath, filename, revision, name_from_revision):
2229
1573
if tree is None:
2230
tree = b.basis_tree()
2231
rev_tree = _get_one_revision_tree('cat', revision, branch=b)
2232
2233
cur_file_id = tree.path2id(relpath)
2234
old_file_id = rev_tree.path2id(relpath)
2235
2236
if name_from_revision:
2237
if old_file_id is None:
2238
raise errors.BzrCommandError(
2239
"%r is not present in revision %s" % (
2240
filename, rev_tree.get_revision_id()))
2241
else:
2242
content = rev_tree.get_file_text(old_file_id)
2243
elif cur_file_id is not None:
2244
content = rev_tree.get_file_text(cur_file_id)
2245
elif old_file_id is not None:
2246
content = rev_tree.get_file_text(old_file_id)
1574
b, relpath = Branch.open_containing(filename)
1575
if revision is None:
1576
revision_id = b.last_revision()
2247
1577
else:
2248
raise errors.BzrCommandError(
2249
"%r is not present in revision %s" % (
2250
filename, rev_tree.get_revision_id()))
2251
self.outf.write(content)
1578
revision_id = revision[0].in_history(b).rev_id
1579
b.print_file(relpath, revision_id)
2252
1580
2253
1581
2254
1582
class cmd_local_time_offset(Command):
2256
1584
hidden = True
2257
1585
@display_command
2258
1586
def run(self):
2259
print osutils.local_time_offset()
1587
print bzrlib.osutils.local_time_offset()
2260
1588
2261
1589
2262
1590
2269
1597
committed. If a directory is specified then the directory and everything
2270
1598
within it is committed.
2271
1599
2272
When excludes are given, they take precedence over selected files.
2273
For example, too commit only changes within foo, but not changes within
2274
foo/bar::
2275
2276
bzr commit foo -x foo/bar
2277
2278
If author of the change is not the same person as the committer, you can
2279
specify the author's name using the --author option. The name should be
2280
in the same format as a committer-id, e.g. "John Doe <jdoe@example.com>".
2281
2282
1600
A selected-file commit may fail in some cases where the committed
2283
tree would be invalid. Consider::
2284
2285
bzr init foo
2286
mkdir foo/bar
2287
bzr add foo/bar
2288
bzr commit foo -m "committing foo"
2289
bzr mv foo/bar foo/baz
2290
mkdir foo/bar
2291
bzr add foo/bar
2292
bzr commit foo/bar -m "committing bar but not baz"
2293
2294
In the example above, the last commit will fail by design. This gives
2295
the user the opportunity to decide whether they want to commit the
2296
rename at the same time, separately first, or not at all. (As a general
2297
rule, when in doubt, Bazaar has a policy of Doing the Safe Thing.)
2298
2299
Note: A selected-file commit after a merge is not yet supported.
1601
tree would be invalid, such as trying to commit a file in a
1602
newly-added directory that is not itself committed.
2300
1603
"""
2301
1604
# TODO: Run hooks on tree to-be-committed, and after commit.
2302
1605
2307
1610
2308
1611
# XXX: verbose currently does nothing
2309
1612
2310
_see_also = ['bugs', 'uncommit']
2311
1613
takes_args = ['selected*']
2312
takes_options = [
2313
ListOption('exclude', type=str, short_name='x',
2314
help="Do not consider changes made to a given path."),
2315
Option('message', type=unicode,
2316
short_name='m',
2317
help="Description of the new revision."),
2318
'verbose',
2319
Option('unchanged',
2320
help='Commit even if nothing has changed.'),
2321
Option('file', type=str,
2322
short_name='F',
2323
argname='msgfile',
2324
help='Take commit message from this file.'),
2325
Option('strict',
2326
help="Refuse to commit if there are unknown "
2327
"files in the working tree."),
2328
ListOption('fixes', type=str,
2329
help="Mark a bug as being fixed by this revision."),
2330
Option('author', type=unicode,
2331
help="Set the author's name, if it's different "
2332
"from the committer."),
2333
Option('local',
2334
help="Perform a local commit in a bound "
2335
"branch. Local commits are not pushed to "
2336
"the master branch until a normal commit "
2337
"is performed."
2338
),
2339
Option('show-diff',
2340
help='When no message is supplied, show the diff along'
2341
' with the status summary in the message editor.'),
2342
]
1614
takes_options = ['message', 'verbose',
1615
Option('unchanged',
1616
help='commit even if nothing has changed'),
1617
Option('file', type=str,
1618
argname='msgfile',
1619
help='file containing commit message'),
1620
Option('strict',
1621
help="refuse to commit if there are unknown "
1622
"files in the working tree."),
1623
Option('local',
1624
help="perform a local only commit in a bound "
1625
"branch. Such commits are not pushed to "
1626
"the master branch until a normal commit "
1627
"is performed."
1628
),
1629
]
2343
1630
aliases = ['ci', 'checkin']
2344
1631
2345
def _get_bug_fix_properties(self, fixes, branch):
2346
properties = []
2347
# Configure the properties for bug fixing attributes.
2348
for fixed_bug in fixes:
2349
tokens = fixed_bug.split(':')
2350
if len(tokens) != 2:
2351
raise errors.BzrCommandError(
2352
"Invalid bug %s. Must be in the form of 'tag:id'. "
2353
"Commit refused." % fixed_bug)
2354
tag, bug_id = tokens
2355
try:
2356
bug_url = bugtracker.get_bug_url(tag, branch, bug_id)
2357
except errors.UnknownBugTrackerAbbreviation:
2358
raise errors.BzrCommandError(
2359
'Unrecognized bug %s. Commit refused.' % fixed_bug)
2360
except errors.MalformedBugIdentifier:
2361
raise errors.BzrCommandError(
2362
"Invalid bug identifier for %s. Commit refused."
2363
% fixed_bug)
2364
properties.append('%s fixed' % bug_url)
2365
return '\n'.join(properties)
2366
2367
def run(self, message=None, file=None, verbose=False, selected_list=None,
2368
unchanged=False, strict=False, local=False, fixes=None,
2369
author=None, show_diff=False, exclude=None):
2370
from bzrlib.errors import (
2371
PointlessCommit,
2372
ConflictsInTree,
2373
StrictCommitFailed
2374
)
2375
from bzrlib.msgeditor import (
2376
edit_commit_message_encoded,
2377
make_commit_message_template_encoded
2378
)
1632
def run(self, message=None, file=None, verbose=True, selected_list=None,
1633
unchanged=False, strict=False, local=False):
1634
from bzrlib.commit import (NullCommitReporter, ReportCommitToLog)
1635
from bzrlib.errors import (PointlessCommit, ConflictsInTree,
1636
StrictCommitFailed)
1637
from bzrlib.msgeditor import edit_commit_message, \
1638
make_commit_message_template
1639
from tempfile import TemporaryFile
2379
1640
2380
1641
# TODO: Need a blackbox test for invoking the external editor; may be
2381
1642
# slightly problematic to run this cross-platform.
2382
1643
2383
1644
# TODO: do more checks that the commit will succeed before
2384
1645
# spending the user's valuable time typing a commit message.
2385
2386
properties = {}
2387
1646
#
1647
# TODO: if the commit *does* happen to fail, then save the commit
1648
# message to a temporary file where it can be recovered
2388
1649
tree, selected_list = tree_files(selected_list)
2389
1650
if selected_list == ['']:
2390
1651
# workaround - commit of root of tree should be exactly the same
2392
1653
# selected-file merge commit is not done yet
2393
1654
selected_list = []
2394
1655
2395
if fixes is None:
2396
fixes = []
2397
bug_property = self._get_bug_fix_properties(fixes, tree.branch)
2398
if bug_property:
2399
properties['bugs'] = bug_property
2400
2401
1656
if local and not tree.branch.get_bound_location():
2402
1657
raise errors.LocalRequiresBoundBranch()
2403
2404
def get_message(commit_obj):
2405
"""Callback to get commit message"""
2406
my_message = message
2407
if my_message is None and not file:
2408
t = make_commit_message_template_encoded(tree,
2409
selected_list, diff=show_diff,
2410
output_encoding=osutils.get_user_encoding())
2411
my_message = edit_commit_message_encoded(t)
2412
if my_message is None:
2413
raise errors.BzrCommandError("please specify a commit"
2414
" message with either --message or --file")
2415
elif my_message and file:
2416
raise errors.BzrCommandError(
2417
"please specify either --message or --file")
2418
if file:
2419
my_message = codecs.open(file, 'rt',
2420
osutils.get_user_encoding()).read()
2421
if my_message == "":
2422
raise errors.BzrCommandError("empty commit message specified")
2423
return my_message
2424
1658
if message is None and not file:
1659
template = make_commit_message_template(tree, selected_list)
1660
message = edit_commit_message(template)
1661
if message is None:
1662
raise BzrCommandError("please specify a commit message"
1663
" with either --message or --file")
1664
elif message and file:
1665
raise BzrCommandError("please specify either --message or --file")
1666
1667
if file:
1668
message = codecs.open(file, 'rt', bzrlib.user_encoding).read()
1669
1670
if message == "":
1671
raise BzrCommandError("empty commit message specified")
1672
1673
if verbose:
1674
reporter = ReportCommitToLog()
1675
else:
1676
reporter = NullCommitReporter()
1677
2425
1678
try:
2426
tree.commit(message_callback=get_message,
2427
specific_files=selected_list,
1679
tree.commit(message, specific_files=selected_list,
2428
1680
allow_pointless=unchanged, strict=strict, local=local,
2429
reporter=None, verbose=verbose, revprops=properties,
2430
author=author,
2431
exclude=safe_relpath_files(tree, exclude))
1681
reporter=reporter)
2432
1682
except PointlessCommit:
2433
1683
# FIXME: This should really happen before the file is read in;
2434
1684
# perhaps prepare the commit; get the message; then actually commit
2435
raise errors.BzrCommandError("no changes to commit."
2436
" use --unchanged to commit anyhow")
1685
raise BzrCommandError("no changes to commit",
1686
["use --unchanged to commit anyhow"])
2437
1687
except ConflictsInTree:
2438
raise errors.BzrCommandError('Conflicts detected in working '
2439
'tree. Use "bzr conflicts" to list, "bzr resolve FILE" to'
2440
' resolve.')
1688
raise BzrCommandError("Conflicts detected in working tree. "
1689
'Use "bzr conflicts" to list, "bzr resolve FILE" to resolve.')
2441
1690
except StrictCommitFailed:
2442
raise errors.BzrCommandError("Commit refused because there are"
2443
" unknown files in the working tree.")
1691
raise BzrCommandError("Commit refused because there are unknown "
1692
"files in the working tree.")
2444
1693
except errors.BoundBranchOutOfDate, e:
2445
raise errors.BzrCommandError(str(e) + "\n"
2446
'To commit to master branch, run update and then commit.\n'
2447
'You can also pass --local to commit to continue working '
2448
'disconnected.')
1694
raise BzrCommandError(str(e)
1695
+ ' Either unbind, update, or'
1696
' pass --local to commit.')
2449
1697
2450
1698
2451
1699
class cmd_check(Command):
2452
"""Validate working tree structure, branch consistency and repository history.
2453
2454
This command checks various invariants about branch and repository storage
2455
to detect data corruption or bzr bugs.
2456
2457
The working tree and branch checks will only give output if a problem is
2458
detected. The output fields of the repository check are:
2459
2460
revisions: This is just the number of revisions checked. It doesn't
2461
indicate a problem.
2462
versionedfiles: This is just the number of versionedfiles checked. It
2463
doesn't indicate a problem.
2464
unreferenced ancestors: Texts that are ancestors of other texts, but
2465
are not properly referenced by the revision ancestry. This is a
2466
subtle problem that Bazaar can work around.
2467
unique file texts: This is the total number of unique file contents
2468
seen in the checked revisions. It does not indicate a problem.
2469
repeated file texts: This is the total number of repeated texts seen
2470
in the checked revisions. Texts can be repeated when their file
2471
entries are modified, but the file contents are not. It does not
2472
indicate a problem.
2473
2474
If no restrictions are specified, all Bazaar data that is found at the given
2475
location will be checked.
2476
2477
:Examples:
2478
2479
Check the tree and branch at 'foo'::
2480
2481
bzr check --tree --branch foo
2482
2483
Check only the repository at 'bar'::
2484
2485
bzr check --repo bar
2486
2487
Check everything at 'baz'::
2488
2489
bzr check baz
1700
"""Validate consistency of branch history.
1701
1702
This command checks various invariants about the branch storage to
1703
detect data corruption or bzr bugs.
2490
1704
"""
2491
2492
_see_also = ['reconcile']
2493
takes_args = ['path?']
2494
takes_options = ['verbose',
2495
Option('branch', help="Check the branch related to the"
2496
" current directory."),
2497
Option('repo', help="Check the repository related to the"
2498
" current directory."),
2499
Option('tree', help="Check the working tree related to"
2500
" the current directory.")]
2501
2502
def run(self, path=None, verbose=False, branch=False, repo=False,
2503
tree=False):
2504
from bzrlib.check import check_dwim
2505
if path is None:
2506
path = '.'
2507
if not branch and not repo and not tree:
2508
branch = repo = tree = True
2509
check_dwim(path, verbose, do_branch=branch, do_repo=repo, do_tree=tree)
1705
takes_args = ['branch?']
1706
takes_options = ['verbose']
1707
1708
def run(self, branch=None, verbose=False):
1709
from bzrlib.check import check
1710
if branch is None:
1711
tree = WorkingTree.open_containing()[0]
1712
branch = tree.branch
1713
else:
1714
branch = Branch.open(branch)
1715
check(branch, verbose)
1716
1717
1718
class cmd_scan_cache(Command):
1719
hidden = True
1720
def run(self):
1721
from bzrlib.hashcache import HashCache
1722
1723
c = HashCache(u'.')
1724
c.read()
1725
c.scan()
1726
1727
print '%6d stats' % c.stat_count
1728
print '%6d in hashcache' % len(c._cache)
1729
print '%6d files removed from cache' % c.removed_count
1730
print '%6d hashes updated' % c.update_count
1731
print '%6d files changed too recently to cache' % c.danger_count
1732
1733
if c.needs_write:
1734
c.write()
2510
1735
2511
1736
2512
1737
class cmd_upgrade(Command):
2516
1741
this command. When the default format has changed you may also be warned
2517
1742
during other operations to upgrade.
2518
1743
"""
2519
2520
_see_also = ['check']
2521
1744
takes_args = ['url?']
2522
1745
takes_options = [
2523
RegistryOption('format',
2524
help='Upgrade to a specific format. See "bzr help'
2525
' formats" for details.',
2526
lazy_registry=('bzrlib.bzrdir', 'format_registry'),
2527
converter=lambda name: bzrdir.format_registry.make_bzrdir(name),
2528
value_switches=True, title='Branch format'),
1746
Option('format',
1747
help='Upgrade to a specific format. Current formats'
1748
' are: default, knit, metaweave and weave.'
1749
' Default is knit; metaweave and weave are'
1750
' deprecated',
1751
type=get_format_type),
2529
1752
]
2530
1753
1754
2531
1755
def run(self, url='.', format=None):
2532
1756
from bzrlib.upgrade import upgrade
2533
1757
if format is None:
2534
format = bzrdir.format_registry.make_bzrdir('default')
1758
format = get_format_type('default')
2535
1759
upgrade(url, format)
2536
1760
2537
1761
2538
1762
class cmd_whoami(Command):
2539
"""Show or set bzr user id.
2540
2541
:Examples:
2542
Show the email of the current user::
2543
2544
bzr whoami --email
2545
2546
Set the current user::
2547
2548
bzr whoami "Frank Chu <fchu@example.com>"
2549
"""
2550
takes_options = [ Option('email',
2551
help='Display email address only.'),
2552
Option('branch',
2553
help='Set identity for the current branch instead of '
2554
'globally.'),
2555
]
2556
takes_args = ['name?']
2557
encoding_type = 'replace'
1763
"""Show bzr user id."""
1764
takes_options = ['email']
2558
1765
2559
1766
@display_command
2560
def run(self, email=False, branch=False, name=None):
2561
if name is None:
2562
# use branch if we're inside one; otherwise global config
2563
try:
2564
c = Branch.open_containing('.')[0].get_config()
2565
except errors.NotBranchError:
2566
c = config.GlobalConfig()
2567
if email:
2568
self.outf.write(c.user_email() + '\n')
2569
else:
2570
self.outf.write(c.username() + '\n')
2571
return
2572
2573
# display a warning if an email address isn't included in the given name.
1767
def run(self, email=False):
2574
1768
try:
2575
config.extract_email_address(name)
2576
except errors.NoEmailInUsername, e:
2577
warning('"%s" does not seem to contain an email address. '
2578
'This is allowed, but not recommended.', name)
1769
b = WorkingTree.open_containing(u'.')[0].branch
1770
config = bzrlib.config.BranchConfig(b)
1771
except NotBranchError:
1772
config = bzrlib.config.GlobalConfig()
2579
1773
2580
# use global config unless --branch given
2581
if branch:
2582
c = Branch.open_containing('.')[0].get_config()
1774
if email:
1775
print config.user_email()
2583
1776
else:
2584
c = config.GlobalConfig()
2585
c.set_user_option('email', name)
1777
print config.username()
2586
1778
2587
1779
2588
1780
class cmd_nick(Command):
2591
1783
If unset, the tree root directory name is used as the nickname
2592
1784
To print the current nickname, execute with no argument.
2593
1785
"""
2594
2595
_see_also = ['info']
2596
1786
takes_args = ['nickname?']
2597
1787
def run(self, nickname=None):
2598
1788
branch = Branch.open_containing(u'.')[0]
2603
1793
2604
1794
@display_command
2605
1795
def printme(self, branch):
2606
print branch.nick
2607
2608
2609
class cmd_alias(Command):
2610
"""Set/unset and display aliases.
2611
2612
:Examples:
2613
Show the current aliases::
2614
2615
bzr alias
2616
2617
Show the alias specified for 'll'::
2618
2619
bzr alias ll
2620
2621
Set an alias for 'll'::
2622
2623
bzr alias ll="log --line -r-10..-1"
2624
2625
To remove an alias for 'll'::
2626
2627
bzr alias --remove ll
2628
2629
"""
2630
takes_args = ['name?']
2631
takes_options = [
2632
Option('remove', help='Remove the alias.'),
2633
]
2634
2635
def run(self, name=None, remove=False):
2636
if remove:
2637
self.remove_alias(name)
2638
elif name is None:
2639
self.print_aliases()
2640
else:
2641
equal_pos = name.find('=')
2642
if equal_pos == -1:
2643
self.print_alias(name)
2644
else:
2645
self.set_alias(name[:equal_pos], name[equal_pos+1:])
2646
2647
def remove_alias(self, alias_name):
2648
if alias_name is None:
2649
raise errors.BzrCommandError(
2650
'bzr alias --remove expects an alias to remove.')
2651
# If alias is not found, print something like:
2652
# unalias: foo: not found
2653
c = config.GlobalConfig()
2654
c.unset_alias(alias_name)
2655
2656
@display_command
2657
def print_aliases(self):
2658
"""Print out the defined aliases in a similar format to bash."""
2659
aliases = config.GlobalConfig().get_aliases()
2660
for key, value in sorted(aliases.iteritems()):
2661
self.outf.write('bzr alias %s="%s"\n' % (key, value))
2662
2663
@display_command
2664
def print_alias(self, alias_name):
2665
from bzrlib.commands import get_alias
2666
alias = get_alias(alias_name)
2667
if alias is None:
2668
self.outf.write("bzr alias: %s: not found\n" % alias_name)
2669
else:
2670
self.outf.write(
2671
'bzr alias %s="%s"\n' % (alias_name, ' '.join(alias)))
2672
2673
def set_alias(self, alias_name, alias_command):
2674
"""Save the alias in the global config."""
2675
c = config.GlobalConfig()
2676
c.set_alias(alias_name, alias_command)
1796
print branch.nick
2677
1797
2678
1798
2679
1799
class cmd_selftest(Command):
2680
1800
"""Run internal test suite.
2681
1801
2682
If arguments are given, they are regular expressions that say which tests
2683
should run. Tests matching any expression are run, and other tests are
2684
not run.
2685
2686
Alternatively if --first is given, matching tests are run first and then
2687
all other tests are run. This is useful if you have been working in a
2688
particular area, but want to make sure nothing else was broken.
2689
2690
If --exclude is given, tests that match that regular expression are
2691
excluded, regardless of whether they match --first or not.
2692
2693
To help catch accidential dependencies between tests, the --randomize
2694
option is useful. In most cases, the argument used is the word 'now'.
2695
Note that the seed used for the random number generator is displayed
2696
when this option is used. The seed can be explicitly passed as the
2697
argument to this option if required. This enables reproduction of the
2698
actual ordering used if and when an order sensitive problem is encountered.
2699
2700
If --list-only is given, the tests that would be run are listed. This is
2701
useful when combined with --first, --exclude and/or --randomize to
2702
understand their impact. The test harness reports "Listed nn tests in ..."
2703
instead of "Ran nn tests in ..." when list mode is enabled.
1802
This creates temporary test directories in the working directory,
1803
but not existing data is affected. These directories are deleted
1804
if the tests pass, or left behind to help in debugging if they
1805
fail and --keep-output is specified.
1806
1807
If arguments are given, they are regular expressions that say
1808
which tests should run.
2704
1809
2705
1810
If the global option '--no-plugins' is given, plugins are not loaded
2706
1811
before running the selftests. This has two effects: features provided or
2707
1812
modified by plugins will not be tested, and tests provided by plugins will
2708
1813
not be run.
2709
1814
2710
Tests that need working space on disk use a common temporary directory,
2711
typically inside $TMPDIR or /tmp.
2712
2713
:Examples:
2714
Run only tests relating to 'ignore'::
2715
2716
bzr selftest ignore
2717
2718
Disable plugins and list tests as they're run::
2719
2720
bzr --no-plugins selftest -v
1815
examples:
1816
bzr selftest ignore
1817
bzr --no-plugins selftest -v
2721
1818
"""
1819
# TODO: --list should give a list of all available tests
1820
2722
1821
# NB: this is used from the class without creating an instance, which is
2723
1822
# why it does not have a self parameter.
2724
1823
def get_transport_type(typestring):
2734
1833
return FakeNFSServer
2735
1834
msg = "No known transport type %s. Supported types are: sftp\n" %\
2736
1835
(typestring)
2737
raise errors.BzrCommandError(msg)
1836
raise BzrCommandError(msg)
2738
1837
2739
1838
hidden = True
2740
1839
takes_args = ['testspecs*']
2741
1840
takes_options = ['verbose',
2742
Option('one',
2743
help='Stop when one test fails.',
2744
short_name='1',
2745
),
2746
Option('transport',
1841
Option('one', help='stop when one test fails'),
1842
Option('keep-output',
1843
help='keep output directories when tests fail'),
1844
Option('transport',
2747
1845
help='Use a different transport by default '
2748
1846
'throughout the test suite.',
2749
1847
type=get_transport_type),
2750
Option('benchmark',
2751
help='Run the benchmarks rather than selftests.'),
1848
Option('benchmark', help='run the bzr bencharks.'),
2752
1849
Option('lsprof-timed',
2753
help='Generate lsprof output for benchmarked'
1850
help='generate lsprof output for benchmarked'
2754
1851
' sections of code.'),
2755
Option('cache-dir', type=str,
2756
help='Cache intermediate benchmark output in this '
2757
'directory.'),
2758
Option('first',
2759
help='Run all tests, but run specified tests first.',
2760
short_name='f',
2761
),
2762
Option('list-only',
2763
help='List the tests instead of running them.'),
2764
Option('randomize', type=str, argname="SEED",
2765
help='Randomize the order of tests using the given'
2766
' seed or "now" for the current time.'),
2767
Option('exclude', type=str, argname="PATTERN",
2768
short_name='x',
2769
help='Exclude tests that match this regular'
2770
' expression.'),
2771
Option('strict', help='Fail on missing dependencies or '
2772
'known failures.'),
2773
Option('load-list', type=str, argname='TESTLISTFILE',
2774
help='Load a test id list from a text file.'),
2775
ListOption('debugflag', type=str, short_name='E',
2776
help='Turn on a selftest debug flag.'),
2777
ListOption('starting-with', type=str, argname='TESTID',
2778
param_name='starting_with', short_name='s',
2779
help=
2780
'Load only the tests starting with TESTID.'),
2781
1852
]
2782
encoding_type = 'replace'
2783
1853
2784
def run(self, testspecs_list=None, verbose=False, one=False,
2785
transport=None, benchmark=None,
2786
lsprof_timed=None, cache_dir=None,
2787
first=False, list_only=False,
2788
randomize=None, exclude=None, strict=False,
2789
load_list=None, debugflag=None, starting_with=None):
1854
def run(self, testspecs_list=None, verbose=None, one=False,
1855
keep_output=False, transport=None, benchmark=None,
1856
lsprof_timed=None):
1857
import bzrlib.ui
2790
1858
from bzrlib.tests import selftest
2791
1859
import bzrlib.benchmarks as benchmarks
2792
from bzrlib.benchmarks import tree_creator
2793
2794
# Make deprecation warnings visible, unless -Werror is set
2795
symbol_versioning.activate_deprecation_warnings(override=False)
2796
2797
if cache_dir is not None:
2798
tree_creator.TreeCreator.CACHE_ROOT = osutils.abspath(cache_dir)
2799
if not list_only:
2800
print 'testing: %s' % (osutils.realpath(sys.argv[0]),)
2801
print ' %s (%s python%s)' % (
2802
bzrlib.__path__[0],
2803
bzrlib.version_string,
2804
bzrlib._format_version_tuple(sys.version_info),
2805
)
1860
# we don't want progress meters from the tests to go to the
1861
# real output; and we don't want log messages cluttering up
1862
# the real logs.
1863
save_ui = bzrlib.ui.ui_factory
1864
print '%10s: %s' % ('bzr', bzrlib.osutils.realpath(sys.argv[0]))
1865
print '%10s: %s' % ('bzrlib', bzrlib.__path__[0])
2806
1866
print
2807
if testspecs_list is not None:
2808
pattern = '|'.join(testspecs_list)
2809
else:
2810
pattern = ".*"
2811
if benchmark:
2812
test_suite_factory = benchmarks.test_suite
2813
# Unless user explicitly asks for quiet, be verbose in benchmarks
2814
verbose = not is_quiet()
2815
# TODO: should possibly lock the history file...
2816
benchfile = open(".perf_history", "at", buffering=1)
2817
else:
2818
test_suite_factory = None
2819
benchfile = None
1867
bzrlib.trace.info('running tests...')
2820
1868
try:
2821
result = selftest(verbose=verbose,
1869
bzrlib.ui.ui_factory = bzrlib.ui.SilentUIFactory()
1870
if testspecs_list is not None:
1871
pattern = '|'.join(testspecs_list)
1872
else:
1873
pattern = ".*"
1874
if benchmark:
1875
test_suite_factory = benchmarks.test_suite
1876
if verbose is None:
1877
verbose = True
1878
else:
1879
test_suite_factory = None
1880
if verbose is None:
1881
verbose = False
1882
result = selftest(verbose=verbose,
2822
1883
pattern=pattern,
2823
stop_on_failure=one,
1884
stop_on_failure=one,
1885
keep_output=keep_output,
2824
1886
transport=transport,
2825
1887
test_suite_factory=test_suite_factory,
2826
lsprof_timed=lsprof_timed,
2827
bench_history=benchfile,
2828
matching_tests_first=first,
2829
list_only=list_only,
2830
random_seed=randomize,
2831
exclude_pattern=exclude,
2832
strict=strict,
2833
load_list=load_list,
2834
debug_flags=debugflag,
2835
starting_with=starting_with,
2836
)
1888
lsprof_timed=lsprof_timed)
1889
if result:
1890
bzrlib.trace.info('tests passed')
1891
else:
1892
bzrlib.trace.info('tests failed')
1893
return int(not result)
2837
1894
finally:
2838
if benchfile is not None:
2839
benchfile.close()
2840
if result:
2841
note('tests passed')
2842
else:
2843
note('tests failed')
2844
return int(not result)
1895
bzrlib.ui.ui_factory = save_ui
1896
1897
1898
def _get_bzr_branch():
1899
"""If bzr is run from a branch, return Branch or None"""
1900
import bzrlib.errors
1901
from bzrlib.branch import Branch
1902
from bzrlib.osutils import abspath
1903
from os.path import dirname
1904
1905
try:
1906
branch = Branch.open(dirname(abspath(dirname(__file__))))
1907
return branch
1908
except bzrlib.errors.BzrError:
1909
return None
1910
1911
1912
def show_version():
1913
print "bzr (bazaar-ng) %s" % bzrlib.__version__
1914
# is bzrlib itself in a branch?
1915
branch = _get_bzr_branch()
1916
if branch:
1917
rh = branch.revision_history()
1918
revno = len(rh)
1919
print " bzr checkout, revision %d" % (revno,)
1920
print " nick: %s" % (branch.nick,)
1921
if rh:
1922
print " revid: %s" % (rh[-1],)
1923
print "Using python interpreter:", sys.executable
1924
import site
1925
print "Using python standard library:", os.path.dirname(site.__file__)
1926
print "Using bzrlib:",
1927
if len(bzrlib.__path__) > 1:
1928
# print repr, which is a good enough way of making it clear it's
1929
# more than one element (eg ['/foo/bar', '/foo/bzr'])
1930
print repr(bzrlib.__path__)
1931
else:
1932
print bzrlib.__path__[0]
1933
1934
print
1935
print bzrlib.__copyright__
1936
print "http://bazaar-vcs.org/"
1937
print
1938
print "bzr comes with ABSOLUTELY NO WARRANTY. bzr is free software, and"
1939
print "you may use, modify and redistribute it under the terms of the GNU"
1940
print "General Public License version 2 or later."
2845
1941
2846
1942
2847
1943
class cmd_version(Command):
2848
1944
"""Show version of bzr."""
2849
2850
encoding_type = 'replace'
2851
takes_options = [
2852
Option("short", help="Print just the version number."),
2853
]
2854
2855
1945
@display_command
2856
def run(self, short=False):
2857
from bzrlib.version import show_version
2858
if short:
2859
self.outf.write(bzrlib.version_string + '\n')
2860
else:
2861
show_version(to_file=self.outf)
2862
1946
def run(self):
1947
show_version()
2863
1948
2864
1949
class cmd_rocks(Command):
2865
1950
"""Statement of optimism."""
2866
2867
1951
hidden = True
2868
2869
1952
@display_command
2870
1953
def run(self):
2871
print "It sure does!"
1954
print "it sure does!"
2872
1955
2873
1956
2874
1957
class cmd_find_merge_base(Command):
2875
"""Find and print a base revision for merging two branches."""
1958
"""Find and print a base revision for merging two branches.
1959
"""
2876
1960
# TODO: Options to specify revisions on either side, as if
2877
1961
# merging only part of the history.
2878
1962
takes_args = ['branch', 'other']
2880
1964
2881
1965
@display_command
2882
1966
def run(self, branch, other):
2883
from bzrlib.revision import ensure_null
1967
from bzrlib.revision import common_ancestor, MultipleRevisionSources
2884
1968
2885
1969
branch1 = Branch.open_containing(branch)[0]
2886
1970
branch2 = Branch.open_containing(other)[0]
2887
branch1.lock_read()
2888
try:
2889
branch2.lock_read()
2890
try:
2891
last1 = ensure_null(branch1.last_revision())
2892
last2 = ensure_null(branch2.last_revision())
2893
2894
graph = branch1.repository.get_graph(branch2.repository)
2895
base_rev_id = graph.find_unique_lca(last1, last2)
2896
2897
print 'merge base is revision %s' % base_rev_id
2898
finally:
2899
branch2.unlock()
2900
finally:
2901
branch1.unlock()
1971
1972
history_1 = branch1.revision_history()
1973
history_2 = branch2.revision_history()
1974
1975
last1 = branch1.last_revision()
1976
last2 = branch2.last_revision()
1977
1978
source = MultipleRevisionSources(branch1.repository,
1979
branch2.repository)
1980
1981
base_rev_id = common_ancestor(last1, last2, source)
1982
1983
print 'merge base is revision %s' % base_rev_id
1984
1985
return
1986
1987
if base_revno is None:
1988
raise bzrlib.errors.UnrelatedBranches()
1989
1990
print ' r%-6d in %s' % (base_revno, branch)
1991
1992
other_revno = branch2.revision_id_to_revno(base_revid)
1993
1994
print ' r%-6d in %s' % (other_revno, other)
1995
2902
1996
2903
1997
2904
1998
class cmd_merge(Command):
2905
1999
"""Perform a three-way merge.
2906
2000
2907
The source of the merge can be specified either in the form of a branch,
2908
or in the form of a path to a file containing a merge directive generated
2909
with bzr send. If neither is specified, the default is the upstream branch
2910
or the branch most recently merged using --remember.
2911
2912
When merging a branch, by default the tip will be merged. To pick a different
2913
revision, pass --revision. If you specify two values, the first will be used as
2914
BASE and the second one as OTHER. Merging individual revisions, or a subset of
2915
available revisions, like this is commonly referred to as "cherrypicking".
2916
2917
Revision numbers are always relative to the branch being merged.
2001
The branch is the branch you will merge from. By default, it will
2002
merge the latest revision. If you specify a revision, that
2003
revision will be merged. If you specify two revisions, the first
2004
will be used as a BASE, and the second one as OTHER. Revision
2005
numbers are always relative to the specified branch.
2918
2006
2919
2007
By default, bzr will try to merge in all new work from the other
2920
2008
branch, automatically determining an appropriate base. If this
2929
2017
2930
2018
If there is no default branch set, the first merge will set it. After
2931
2019
that, you can omit the branch to use the default. To change the
2932
default, use --remember. The value will only be saved if the remote
2933
location can be accessed.
2934
2935
The results of the merge are placed into the destination working
2936
directory, where they can be reviewed (with bzr diff), tested, and then
2937
committed to record the result of the merge.
2020
default, use --remember.
2021
2022
Examples:
2023
2024
To merge the latest revision from bzr.dev
2025
bzr merge ../bzr.dev
2026
2027
To merge changes up to and including revision 82 from bzr.dev
2028
bzr merge -r 82 ../bzr.dev
2029
2030
To merge the changes introduced by 82, without previous changes:
2031
bzr merge -r 81..82 ../bzr.dev
2938
2032
2939
2033
merge refuses to run if there are any uncommitted changes, unless
2940
2034
--force is given.
2941
2035
2942
:Examples:
2943
To merge the latest revision from bzr.dev::
2944
2945
bzr merge ../bzr.dev
2946
2947
To merge changes up to and including revision 82 from bzr.dev::
2948
2949
bzr merge -r 82 ../bzr.dev
2950
2951
To merge the changes introduced by 82, without previous changes::
2952
2953
bzr merge -r 81..82 ../bzr.dev
2954
2955
To apply a merge directive contained in in /tmp/merge:
2956
2957
bzr merge /tmp/merge
2036
The following merge types are available:
2958
2037
"""
2959
2960
encoding_type = 'exact'
2961
_see_also = ['update', 'remerge', 'status-flags']
2962
takes_args = ['location?']
2963
takes_options = [
2964
'change',
2965
'revision',
2966
Option('force',
2967
help='Merge even if the destination tree has uncommitted changes.'),
2968
'merge-type',
2969
'reprocess',
2970
'remember',
2971
Option('show-base', help="Show base revision text in "
2972
"conflicts."),
2973
Option('uncommitted', help='Apply uncommitted changes'
2974
' from a working copy, instead of branch changes.'),
2975
Option('pull', help='If the destination is already'
2976
' completely merged into the source, pull from the'
2977
' source rather than merging. When this happens,'
2978
' you do not need to commit the result.'),
2979
Option('directory',
2980
help='Branch to merge into, '
2981
'rather than the one containing the working directory.',
2982
short_name='d',
2983
type=unicode,
2984
),
2985
Option('preview', help='Instead of merging, show a diff of the merge.')
2986
]
2987
2988
def run(self, location=None, revision=None, force=False,
2989
merge_type=None, show_base=False, reprocess=None, remember=False,
2990
uncommitted=False, pull=False,
2991
directory=None,
2992
preview=False,
2993
):
2038
takes_args = ['branch?']
2039
takes_options = ['revision', 'force', 'merge-type', 'reprocess', 'remember',
2040
Option('show-base', help="Show base revision text in "
2041
"conflicts")]
2042
2043
def help(self):
2044
from merge import merge_type_help
2045
from inspect import getdoc
2046
return getdoc(self) + '\n' + merge_type_help()
2047
2048
def run(self, branch=None, revision=None, force=False, merge_type=None,
2049
show_base=False, reprocess=False, remember=False):
2994
2050
if merge_type is None:
2995
merge_type = _mod_merge.Merge3Merger
2996
2997
if directory is None: directory = u'.'
2998
possible_transports = []
2999
merger = None
3000
allow_pending = True
3001
verified = 'inapplicable'
3002
tree = WorkingTree.open_containing(directory)[0]
3003
change_reporter = delta._ChangeReporter(
3004
unversioned_filter=tree.is_ignored)
3005
cleanups = []
3006
try:
3007
pb = ui.ui_factory.nested_progress_bar()
3008
cleanups.append(pb.finished)
3009
tree.lock_write()
3010
cleanups.append(tree.unlock)
3011
if location is not None:
3012
try:
3013
mergeable = bundle.read_mergeable_from_url(location,
3014
possible_transports=possible_transports)
3015
except errors.NotABundle:
3016
mergeable = None
3017
else:
3018
if uncommitted:
3019
raise errors.BzrCommandError('Cannot use --uncommitted'
3020
' with bundles or merge directives.')
3021
3022
if revision is not None:
3023
raise errors.BzrCommandError(
3024
'Cannot use -r with merge directives or bundles')
3025
merger, verified = _mod_merge.Merger.from_mergeable(tree,
3026
mergeable, pb)
3027
3028
if merger is None and uncommitted:
3029
if revision is not None and len(revision) > 0:
3030
raise errors.BzrCommandError('Cannot use --uncommitted and'
3031
' --revision at the same time.')
3032
location = self._select_branch_location(tree, location)[0]
3033
other_tree, other_path = WorkingTree.open_containing(location)
3034
merger = _mod_merge.Merger.from_uncommitted(tree, other_tree,
3035
pb)
3036
allow_pending = False
3037
if other_path != '':
3038
merger.interesting_files = [other_path]
3039
3040
if merger is None:
3041
merger, allow_pending = self._get_merger_from_branch(tree,
3042
location, revision, remember, possible_transports, pb)
3043
3044
merger.merge_type = merge_type
3045
merger.reprocess = reprocess
3046
merger.show_base = show_base
3047
self.sanity_check_merger(merger)
3048
if (merger.base_rev_id == merger.other_rev_id and
3049
merger.other_rev_id is not None):
3050
note('Nothing to do.')
3051
return 0
3052
if pull:
3053
if merger.interesting_files is not None:
3054
raise errors.BzrCommandError('Cannot pull individual files')
3055
if (merger.base_rev_id == tree.last_revision()):
3056
result = tree.pull(merger.other_branch, False,
3057
merger.other_rev_id)
3058
result.report(self.outf)
3059
return 0
3060
merger.check_basis(not force)
3061
if preview:
3062
return self._do_preview(merger)
3063
else:
3064
return self._do_merge(merger, change_reporter, allow_pending,
3065
verified)
3066
finally:
3067
for cleanup in reversed(cleanups):
3068
cleanup()
3069
3070
def _do_preview(self, merger):
3071
from bzrlib.diff import show_diff_trees
3072
tree_merger = merger.make_merger()
3073
tt = tree_merger.make_preview_transform()
3074
try:
3075
result_tree = tt.get_preview_tree()
3076
show_diff_trees(merger.this_tree, result_tree, self.outf,
3077
old_label='', new_label='')
3078
finally:
3079
tt.finalize()
3080
3081
def _do_merge(self, merger, change_reporter, allow_pending, verified):
3082
merger.change_reporter = change_reporter
3083
conflict_count = merger.do_merge()
3084
if allow_pending:
3085
merger.set_pending()
3086
if verified == 'failed':
3087
warning('Preview patch does not match changes')
3088
if conflict_count != 0:
3089
return 1
3090
else:
3091
return 0
3092
3093
def sanity_check_merger(self, merger):
3094
if (merger.show_base and
3095
not merger.merge_type is _mod_merge.Merge3Merger):
3096
raise errors.BzrCommandError("Show-base is not supported for this"
3097
" merge type. %s" % merger.merge_type)
3098
if merger.reprocess is None:
3099
if merger.show_base:
3100
merger.reprocess = False
3101
else:
3102
# Use reprocess if the merger supports it
3103
merger.reprocess = merger.merge_type.supports_reprocess
3104
if merger.reprocess and not merger.merge_type.supports_reprocess:
3105
raise errors.BzrCommandError("Conflict reduction is not supported"
3106
" for merge type %s." %
3107
merger.merge_type)
3108
if merger.reprocess and merger.show_base:
3109
raise errors.BzrCommandError("Cannot do conflict reduction and"
3110
" show base.")
3111
3112
def _get_merger_from_branch(self, tree, location, revision, remember,
3113
possible_transports, pb):
3114
"""Produce a merger from a location, assuming it refers to a branch."""
3115
from bzrlib.tag import _merge_tags_if_possible
3116
# find the branch locations
3117
other_loc, user_location = self._select_branch_location(tree, location,
3118
revision, -1)
3119
if revision is not None and len(revision) == 2:
3120
base_loc, _unused = self._select_branch_location(tree,
3121
location, revision, 0)
3122
else:
3123
base_loc = other_loc
3124
# Open the branches
3125
other_branch, other_path = Branch.open_containing(other_loc,
3126
possible_transports)
3127
if base_loc == other_loc:
3128
base_branch = other_branch
3129
else:
3130
base_branch, base_path = Branch.open_containing(base_loc,
3131
possible_transports)
3132
# Find the revision ids
3133
if revision is None or len(revision) < 1 or revision[-1] is None:
3134
other_revision_id = _mod_revision.ensure_null(
3135
other_branch.last_revision())
3136
else:
3137
other_revision_id = revision[-1].as_revision_id(other_branch)
3138
if (revision is not None and len(revision) == 2
3139
and revision[0] is not None):
3140
base_revision_id = revision[0].as_revision_id(base_branch)
3141
else:
3142
base_revision_id = None
3143
# Remember where we merge from
3144
if ((remember or tree.branch.get_submit_branch() is None) and
3145
user_location is not None):
3146
tree.branch.set_submit_branch(other_branch.base)
3147
_merge_tags_if_possible(other_branch, tree.branch)
3148
merger = _mod_merge.Merger.from_revision_ids(pb, tree,
3149
other_revision_id, base_revision_id, other_branch, base_branch)
3150
if other_path != '':
3151
allow_pending = False
3152
merger.interesting_files = [other_path]
3153
else:
3154
allow_pending = True
3155
return merger, allow_pending
3156
3157
def _select_branch_location(self, tree, user_location, revision=None,
3158
index=None):
3159
"""Select a branch location, according to possible inputs.
3160
3161
If provided, branches from ``revision`` are preferred. (Both
3162
``revision`` and ``index`` must be supplied.)
3163
3164
Otherwise, the ``location`` parameter is used. If it is None, then the
3165
``submit`` or ``parent`` location is used, and a note is printed.
3166
3167
:param tree: The working tree to select a branch for merging into
3168
:param location: The location entered by the user
3169
:param revision: The revision parameter to the command
3170
:param index: The index to use for the revision parameter. Negative
3171
indices are permitted.
3172
:return: (selected_location, user_location). The default location
3173
will be the user-entered location.
3174
"""
3175
if (revision is not None and index is not None
3176
and revision[index] is not None):
3177
branch = revision[index].get_branch()
2051
merge_type = Merge3Merger
2052
2053
tree = WorkingTree.open_containing(u'.')[0]
2054
2055
try:
3178
2056
if branch is not None:
3179
return branch, branch
3180
if user_location is None:
3181
location = self._get_remembered(tree, 'Merging from')
3182
else:
3183
location = user_location
3184
return location, user_location
3185
3186
def _get_remembered(self, tree, verb_string):
2057
reader = BundleReader(file(branch, 'rb'))
2058
else:
2059
reader = None
2060
except IOError, e:
2061
if e.errno not in (errno.ENOENT, errno.EISDIR):
2062
raise
2063
reader = None
2064
except BadBundle:
2065
reader = None
2066
if reader is not None:
2067
conflicts = merge_bundle(reader, tree, not force, merge_type,
2068
reprocess, show_base)
2069
if conflicts == 0:
2070
return 0
2071
else:
2072
return 1
2073
2074
branch = self._get_remembered_parent(tree, branch, 'Merging from')
2075
2076
if revision is None or len(revision) < 1:
2077
base = [None, None]
2078
other = [branch, -1]
2079
other_branch, path = Branch.open_containing(branch)
2080
else:
2081
if len(revision) == 1:
2082
base = [None, None]
2083
other_branch, path = Branch.open_containing(branch)
2084
revno = revision[0].in_history(other_branch).revno
2085
other = [branch, revno]
2086
else:
2087
assert len(revision) == 2
2088
if None in revision:
2089
raise BzrCommandError(
2090
"Merge doesn't permit that revision specifier.")
2091
other_branch, path = Branch.open_containing(branch)
2092
2093
base = [branch, revision[0].in_history(other_branch).revno]
2094
other = [branch, revision[1].in_history(other_branch).revno]
2095
2096
if tree.branch.get_parent() is None or remember:
2097
tree.branch.set_parent(other_branch.base)
2098
2099
if path != "":
2100
interesting_files = [path]
2101
else:
2102
interesting_files = None
2103
pb = bzrlib.ui.ui_factory.nested_progress_bar()
2104
try:
2105
try:
2106
conflict_count = merge(other, base, check_clean=(not force),
2107
merge_type=merge_type,
2108
reprocess=reprocess,
2109
show_base=show_base,
2110
pb=pb, file_list=interesting_files)
2111
finally:
2112
pb.finished()
2113
if conflict_count != 0:
2114
return 1
2115
else:
2116
return 0
2117
except bzrlib.errors.AmbiguousBase, e:
2118
m = ("sorry, bzr can't determine the right merge base yet\n"
2119
"candidates are:\n "
2120
+ "\n ".join(e.bases)
2121
+ "\n"
2122
"please specify an explicit base with -r,\n"
2123
"and (if you want) report this to the bzr developers\n")
2124
log_error(m)
2125
2126
# TODO: move up to common parent; this isn't merge-specific anymore.
2127
def _get_remembered_parent(self, tree, supplied_location, verb_string):
3187
2128
"""Use tree.branch's parent if none was supplied.
3188
2129
3189
2130
Report if the remembered location was used.
3190
2131
"""
3191
stored_location = tree.branch.get_submit_branch()
3192
stored_location_type = "submit"
3193
if stored_location is None:
3194
stored_location = tree.branch.get_parent()
3195
stored_location_type = "parent"
2132
if supplied_location is not None:
2133
return supplied_location
2134
stored_location = tree.branch.get_parent()
3196
2135
mutter("%s", stored_location)
3197
2136
if stored_location is None:
3198
raise errors.BzrCommandError("No location specified or remembered")
3199
display_url = urlutils.unescape_for_display(stored_location, 'utf-8')
3200
note(u"%s remembered %s location %s", verb_string,
3201
stored_location_type, display_url)
2137
raise BzrCommandError("No location specified or remembered")
2138
display_url = urlutils.unescape_for_display(stored_location, self.outf.encoding)
2139
self.outf.write("%s remembered location %s\n" % (verb_string, display_url))
3202
2140
return stored_location
3203
2141
3204
2142
3213
2151
merge. The difference is that remerge can (only) be run when there is a
3214
2152
pending merge, and it lets you specify particular files.
3215
2153
3216
:Examples:
2154
Examples:
2155
$ bzr remerge --show-base
3217
2156
Re-do the merge of all conflicted files, and show the base text in
3218
conflict regions, in addition to the usual THIS and OTHER texts::
3219
3220
bzr remerge --show-base
2157
conflict regions, in addition to the usual THIS and OTHER texts.
3221
2158
2159
$ bzr remerge --merge-type weave --reprocess foobar
3222
2160
Re-do the merge of "foobar", using the weave merge algorithm, with
3223
additional processing to reduce the size of conflict regions::
3224
3225
bzr remerge --merge-type weave --reprocess foobar
3226
"""
2161
additional processing to reduce the size of conflict regions.
2162
2163
The following merge types are available:"""
3227
2164
takes_args = ['file*']
3228
takes_options = [
3229
'merge-type',
3230
'reprocess',
3231
Option('show-base',
3232
help="Show base revision text in conflicts."),
3233
]
2165
takes_options = ['merge-type', 'reprocess',
2166
Option('show-base', help="Show base revision text in "
2167
"conflicts")]
2168
2169
def help(self):
2170
from merge import merge_type_help
2171
from inspect import getdoc
2172
return getdoc(self) + '\n' + merge_type_help()
3234
2173
3235
2174
def run(self, file_list=None, merge_type=None, show_base=False,
3236
2175
reprocess=False):
2176
from bzrlib.merge import merge_inner, transform_tree
3237
2177
if merge_type is None:
3238
merge_type = _mod_merge.Merge3Merger
2178
merge_type = Merge3Merger
3239
2179
tree, file_list = tree_files(file_list)
3240
2180
tree.lock_write()
3241
2181
try:
3242
parents = tree.get_parent_ids()
3243
if len(parents) != 2:
3244
raise errors.BzrCommandError("Sorry, remerge only works after normal"
3245
" merges. Not cherrypicking or"
3246
" multi-merges.")
2182
pending_merges = tree.pending_merges()
2183
if len(pending_merges) != 1:
2184
raise BzrCommandError("Sorry, remerge only works after normal"
2185
+ " merges. Not cherrypicking or"
2186
+ "multi-merges.")
3247
2187
repository = tree.branch.repository
2188
base_revision = common_ancestor(tree.branch.last_revision(),
2189
pending_merges[0], repository)
2190
base_tree = repository.revision_tree(base_revision)
2191
other_tree = repository.revision_tree(pending_merges[0])
3248
2192
interesting_ids = None
3249
new_conflicts = []
3250
conflicts = tree.conflicts()
3251
2193
if file_list is not None:
3252
2194
interesting_ids = set()
3253
2195
for filename in file_list:
3254
2196
file_id = tree.path2id(filename)
3255
2197
if file_id is None:
3256
raise errors.NotVersionedError(filename)
2198
raise NotVersionedError(filename)
3257
2199
interesting_ids.add(file_id)
3258
2200
if tree.kind(file_id) != "directory":
3259
2201
continue
3260
2202
3261
2203
for name, ie in tree.inventory.iter_entries(file_id):
3262
2204
interesting_ids.add(ie.file_id)
3263
new_conflicts = conflicts.select_conflicts(tree, file_list)[0]
2205
transform_tree(tree, tree.basis_tree(), interesting_ids)
2206
if file_list is None:
2207
restore_files = list(tree.iter_conflicts())
3264
2208
else:
3265
# Remerge only supports resolving contents conflicts
3266
allowed_conflicts = ('text conflict', 'contents conflict')
3267
restore_files = [c.path for c in conflicts
3268
if c.typestring in allowed_conflicts]
3269
_mod_merge.transform_tree(tree, tree.basis_tree(), interesting_ids)
3270
tree.set_conflicts(ConflictList(new_conflicts))
3271
if file_list is not None:
3272
2209
restore_files = file_list
3273
2210
for filename in restore_files:
3274
2211
try:
3275
2212
restore(tree.abspath(filename))
3276
except errors.NotConflicted:
2213
except NotConflicted:
3277
2214
pass
3278
# Disable pending merges, because the file texts we are remerging
3279
# have not had those merges performed. If we use the wrong parents
3280
# list, we imply that the working tree text has seen and rejected
3281
# all the changes from the other tree, when in fact those changes
3282
# have not yet been seen.
3283
pb = ui.ui_factory.nested_progress_bar()
3284
tree.set_parent_ids(parents[:1])
3285
try:
3286
merger = _mod_merge.Merger.from_revision_ids(pb,
3287
tree, parents[1])
3288
merger.interesting_ids = interesting_ids
3289
merger.merge_type = merge_type
3290
merger.show_base = show_base
3291
merger.reprocess = reprocess
3292
conflicts = merger.do_merge()
3293
finally:
3294
tree.set_parent_ids(parents)
3295
pb.finished()
2215
conflicts = merge_inner(tree.branch, other_tree, base_tree,
2216
this_tree=tree,
2217
interesting_ids = interesting_ids,
2218
other_rev_id=pending_merges[0],
2219
merge_type=merge_type,
2220
show_base=show_base,
2221
reprocess=reprocess)
3296
2222
finally:
3297
2223
tree.unlock()
3298
2224
if conflicts > 0:
3300
2226
else:
3301
2227
return 0
3302
2228
3303
3304
2229
class cmd_revert(Command):
3305
"""Revert files to a previous revision.
3306
3307
Giving a list of files will revert only those files. Otherwise, all files
3308
will be reverted. If the revision is not specified with '--revision', the
3309
last committed revision is used.
3310
3311
To remove only some changes, without reverting to a prior version, use
3312
merge instead. For example, "merge . --revision -2..-3" will remove the
3313
changes introduced by -2, without affecting the changes introduced by -1.
3314
Or to remove certain changes on a hunk-by-hunk basis, see the Shelf plugin.
3315
3316
By default, any files that have been manually changed will be backed up
3317
first. (Files changed only by merge are not backed up.) Backup files have
3318
'.~#~' appended to their name, where # is a number.
3319
3320
When you provide files, you can use their current pathname or the pathname
3321
from the target revision. So you can use revert to "undelete" a file by
3322
name. If you name a directory, all the contents of that directory will be
3323
reverted.
3324
3325
Any files that have been newly added since that revision will be deleted,
3326
with a backup kept if appropriate. Directories containing unknown files
3327
will not be deleted.
3328
3329
The working tree contains a list of pending merged revisions, which will
3330
be included as parents in the next commit. Normally, revert clears that
3331
list as well as reverting the files. If any files are specified, revert
3332
leaves the pending merge list alone and reverts only the files. Use "bzr
3333
revert ." in the tree root to revert all files but keep the merge record,
3334
and "bzr revert --forget-merges" to clear the pending merge list without
3335
reverting any files.
2230
"""Reverse all changes since the last commit.
2231
2232
Only versioned files are affected. Specify filenames to revert only
2233
those files. By default, any files that are changed will be backed up
2234
first. Backup files have a '~' appended to their name.
3336
2235
"""
3337
3338
_see_also = ['cat', 'export']
3339
takes_options = [
3340
'revision',
3341
Option('no-backup', "Do not save backups of reverted files."),
3342
Option('forget-merges',
3343
'Remove pending merge marker, without changing any files.'),
3344
]
2236
takes_options = ['revision', 'no-backup']
3345
2237
takes_args = ['file*']
2238
aliases = ['merge-revert']
3346
2239
3347
def run(self, revision=None, no_backup=False, file_list=None,
3348
forget_merges=None):
2240
def run(self, revision=None, no_backup=False, file_list=None):
2241
from bzrlib.commands import parse_spec
2242
if file_list is not None:
2243
if len(file_list) == 0:
2244
raise BzrCommandError("No files specified")
2245
else:
2246
file_list = []
2247
3349
2248
tree, file_list = tree_files(file_list)
3350
tree.lock_write()
3351
try:
3352
if forget_merges:
3353
tree.set_parent_ids(tree.get_parent_ids()[:1])
3354
else:
3355
self._revert_tree_to_revision(tree, revision, file_list, no_backup)
3356
finally:
3357
tree.unlock()
3358
3359
@staticmethod
3360
def _revert_tree_to_revision(tree, revision, file_list, no_backup):
3361
rev_tree = _get_one_revision_tree('revert', revision, tree=tree)
3362
pb = ui.ui_factory.nested_progress_bar()
3363
try:
3364
tree.revert(file_list, rev_tree, not no_backup, pb,
3365
report_changes=True)
2249
if revision is None:
2250
# FIXME should be tree.last_revision
2251
rev_id = tree.last_revision()
2252
elif len(revision) != 1:
2253
raise BzrCommandError('bzr revert --revision takes exactly 1 argument')
2254
else:
2255
rev_id = revision[0].in_history(tree.branch).rev_id
2256
pb = bzrlib.ui.ui_factory.nested_progress_bar()
2257
try:
2258
tree.revert(file_list,
2259
tree.branch.repository.revision_tree(rev_id),
2260
not no_backup, pb)
3366
2261
finally:
3367
2262
pb.finished()
3368
2263
3369
2264
3370
2265
class cmd_assert_fail(Command):
3371
2266
"""Test reporting of assertion failures"""
3372
# intended just for use in testing
3373
3374
2267
hidden = True
3375
3376
2268
def run(self):
3377
raise AssertionError("always fails")
2269
assert False, "always fails"
3378
2270
3379
2271
3380
2272
class cmd_help(Command):
3381
2273
"""Show help on a command or other topic.
3382
"""
3383
2274
3384
_see_also = ['topics']
3385
takes_options = [
3386
Option('long', 'Show help on all commands.'),
3387
]
2275
For a list of all available commands, say 'bzr help commands'."""
2276
takes_options = [Option('long', 'show help on all commands')]
3388
2277
takes_args = ['topic?']
3389
2278
aliases = ['?', '--help', '-?', '-h']
3390
2279
3391
2280
@display_command
3392
2281
def run(self, topic=None, long=False):
3393
import bzrlib.help
2282
import help
3394
2283
if topic is None and long:
3395
2284
topic = "commands"
3396
bzrlib.help.help(topic)
2285
help.help(topic)
3397
2286
3398
2287
3399
2288
class cmd_shell_complete(Command):
3400
2289
"""Show appropriate completions for context.
3401
2290
3402
For a list of all available commands, say 'bzr shell-complete'.
3403
"""
2291
For a list of all available commands, say 'bzr shell-complete'."""
3404
2292
takes_args = ['context?']
3405
2293
aliases = ['s-c']
3406
2294
hidden = True
3411
2299
shellcomplete.shellcomplete(context)
3412
2300
3413
2301
2302
class cmd_fetch(Command):
2303
"""Copy in history from another branch but don't merge it.
2304
2305
This is an internal method used for pull and merge."""
2306
hidden = True
2307
takes_args = ['from_branch', 'to_branch']
2308
def run(self, from_branch, to_branch):
2309
from bzrlib.fetch import Fetcher
2310
from bzrlib.branch import Branch
2311
from_b = Branch.open(from_branch)
2312
to_b = Branch.open(to_branch)
2313
Fetcher(to_b, from_b)
2314
2315
3414
2316
class cmd_missing(Command):
3415
2317
"""Show unmerged/unpulled revisions between two branches.
3416
3417
OTHER_BRANCH may be local or remote.
3418
"""
3419
2318
3420
_see_also = ['merge', 'pull']
2319
OTHER_BRANCH may be local or remote."""
3421
2320
takes_args = ['other_branch?']
3422
takes_options = [
3423
Option('reverse', 'Reverse the order of revisions.'),
3424
Option('mine-only',
3425
'Display changes in the local branch only.'),
3426
Option('this' , 'Same as --mine-only.'),
3427
Option('theirs-only',
3428
'Display changes in the remote branch only.'),
3429
Option('other', 'Same as --theirs-only.'),
3430
'log-format',
3431
'show-ids',
3432
'verbose',
3433
Option('include-merges', 'Show merged revisions.'),
3434
]
3435
encoding_type = 'replace'
2321
takes_options = [Option('reverse', 'Reverse the order of revisions'),
2322
Option('mine-only',
2323
'Display changes in the local branch only'),
2324
Option('theirs-only',
2325
'Display changes in the remote branch only'),
2326
'log-format',
2327
'line',
2328
'long',
2329
'short',
2330
'show-ids',
2331
'verbose'
2332
]
3436
2333
3437
@display_command
3438
2334
def run(self, other_branch=None, reverse=False, mine_only=False,
3439
theirs_only=False,
3440
log_format=None, long=False, short=False, line=False,
3441
show_ids=False, verbose=False, this=False, other=False,
3442
include_merges=False):
3443
from bzrlib.missing import find_unmerged, iter_log_revisions
3444
3445
if this:
3446
mine_only = this
3447
if other:
3448
theirs_only = other
3449
# TODO: We should probably check that we don't have mine-only and
3450
# theirs-only set, but it gets complicated because we also have
3451
# this and other which could be used.
3452
restrict = 'all'
3453
if mine_only:
3454
restrict = 'local'
3455
elif theirs_only:
3456
restrict = 'remote'
3457
3458
local_branch = Branch.open_containing(u".")[0]
2335
theirs_only=False, log_format=None, long=False, short=False, line=False,
2336
show_ids=False, verbose=False):
2337
from bzrlib.missing import find_unmerged, iter_log_data
2338
from bzrlib.log import log_formatter
2339
local_branch = bzrlib.branch.Branch.open_containing(u".")[0]
3459
2340
parent = local_branch.get_parent()
3460
2341
if other_branch is None:
3461
2342
other_branch = parent
3462
2343
if other_branch is None:
3463
raise errors.BzrCommandError("No peer location known"
3464
" or specified.")
3465
display_url = urlutils.unescape_for_display(parent,
3466
self.outf.encoding)
3467
self.outf.write("Using saved parent location: "
3468
+ display_url + "\n")
3469
3470
remote_branch = Branch.open(other_branch)
2344
raise BzrCommandError("No missing location known or specified.")
2345
print "Using last location: " + local_branch.get_parent()
2346
remote_branch = bzrlib.branch.Branch.open(other_branch)
3471
2347
if remote_branch.base == local_branch.base:
3472
2348
remote_branch = local_branch
3473
2349
local_branch.lock_read()
3474
2350
try:
3475
2351
remote_branch.lock_read()
3476
2352
try:
3477
local_extra, remote_extra = find_unmerged(
3478
local_branch, remote_branch, restrict,
3479
backward=not reverse,
3480
include_merges=include_merges)
3481
3482
if log_format is None:
3483
registry = log.log_formatter_registry
3484
log_format = registry.get_default(local_branch)
3485
lf = log_format(to_file=self.outf,
3486
show_ids=show_ids,
3487
show_timezone='original')
3488
3489
status_code = 0
2353
local_extra, remote_extra = find_unmerged(local_branch, remote_branch)
2354
if (log_format == None):
2355
default = bzrlib.config.BranchConfig(local_branch).log_format()
2356
log_format = get_log_format(long=long, short=short, line=line, default=default)
2357
lf = log_formatter(log_format, sys.stdout,
2358
show_ids=show_ids,
2359
show_timezone='original')
2360
if reverse is False:
2361
local_extra.reverse()
2362
remote_extra.reverse()
3490
2363
if local_extra and not theirs_only:
3491
self.outf.write("You have %d extra revision(s):\n" %
3492
len(local_extra))
3493
for revision in iter_log_revisions(local_extra,
3494
local_branch.repository,
3495
verbose):
3496
lf.log_revision(revision)
2364
print "You have %d extra revision(s):" % len(local_extra)
2365
for data in iter_log_data(local_extra, local_branch.repository,
2366
verbose):
2367
lf.show(*data)
3497
2368
printed_local = True
3498
status_code = 1
3499
2369
else:
3500
2370
printed_local = False
3501
3502
2371
if remote_extra and not mine_only:
3503
2372
if printed_local is True:
3504
self.outf.write("\n\n\n")
3505
self.outf.write("You are missing %d revision(s):\n" %
3506
len(remote_extra))
3507
for revision in iter_log_revisions(remote_extra,
3508
remote_branch.repository,
3509
verbose):
3510
lf.log_revision(revision)
2373
print "\n\n"
2374
print "You are missing %d revision(s):" % len(remote_extra)
2375
for data in iter_log_data(remote_extra, remote_branch.repository,
2376
verbose):
2377
lf.show(*data)
2378
if not remote_extra and not local_extra:
2379
status_code = 0
2380
print "Branches are up to date."
2381
else:
3511
2382
status_code = 1
3512
3513
if mine_only and not local_extra:
3514
# We checked local, and found nothing extra
3515
self.outf.write('This branch is up to date.\n')
3516
elif theirs_only and not remote_extra:
3517
# We checked remote, and found nothing extra
3518
self.outf.write('Other branch is up to date.\n')
3519
elif not (mine_only or theirs_only or local_extra or
3520
remote_extra):
3521
# We checked both branches, and neither one had extra
3522
# revisions
3523
self.outf.write("Branches are up to date.\n")
3524
2383
finally:
3525
2384
remote_branch.unlock()
3526
2385
finally:
3536
2395
return status_code
3537
2396
3538
2397
3539
class cmd_pack(Command):
3540
"""Compress the data within a repository."""
3541
3542
_see_also = ['repositories']
3543
takes_args = ['branch_or_repo?']
3544
3545
def run(self, branch_or_repo='.'):
3546
dir = bzrdir.BzrDir.open_containing(branch_or_repo)[0]
3547
try:
3548
branch = dir.open_branch()
3549
repository = branch.repository
3550
except errors.NotBranchError:
3551
repository = dir.open_repository()
3552
repository.pack()
3553
3554
3555
2398
class cmd_plugins(Command):
3556
"""List the installed plugins.
3557
3558
This command displays the list of installed plugins including
3559
version of plugin and a short description of each.
3560
3561
--verbose shows the path where each plugin is located.
3562
3563
A plugin is an external component for Bazaar that extends the
3564
revision control system, by adding or replacing code in Bazaar.
3565
Plugins can do a variety of things, including overriding commands,
3566
adding new commands, providing additional network transports and
3567
customizing log output.
3568
3569
See the Bazaar web site, http://bazaar-vcs.org, for further
3570
information on plugins including where to find them and how to
3571
install them. Instructions are also provided there on how to
3572
write new plugins using the Python programming language.
3573
"""
3574
takes_options = ['verbose']
3575
2399
"""List plugins"""
2400
hidden = True
3576
2401
@display_command
3577
def run(self, verbose=False):
2402
def run(self):
3578
2403
import bzrlib.plugin
3579
2404
from inspect import getdoc
3580
result = []
3581
for name, plugin in bzrlib.plugin.plugins().items():
3582
version = plugin.__version__
3583
if version == 'unknown':
3584
version = ''
3585
name_ver = '%s %s' % (name, version)
3586
d = getdoc(plugin.module)
2405
for name, plugin in bzrlib.plugin.all_plugins().items():
2406
if hasattr(plugin, '__path__'):
2407
print plugin.__path__[0]
2408
elif hasattr(plugin, '__file__'):
2409
print plugin.__file__
2410
else:
2411
print `plugin`
2412
2413
d = getdoc(plugin)
3587
2414
if d:
3588
doc = d.split('\n')[0]
3589
else:
3590
doc = '(no description)'
3591
result.append((name_ver, doc, plugin.path()))
3592
for name_ver, doc, path in sorted(result):
3593
print name_ver
3594
print ' ', doc
3595
if verbose:
3596
print ' ', path
3597
print
2415
print '\t', d.split('\n')[0]
3598
2416
3599
2417
3600
2418
class cmd_testament(Command):
3601
2419
"""Show testament (signing-form) of a revision."""
3602
takes_options = [
3603
'revision',
3604
Option('long', help='Produce long-format testament.'),
3605
Option('strict',
3606
help='Produce a strict-format testament.')]
2420
takes_options = ['revision', 'long']
3607
2421
takes_args = ['branch?']
3608
2422
@display_command
3609
def run(self, branch=u'.', revision=None, long=False, strict=False):
3610
from bzrlib.testament import Testament, StrictTestament
3611
if strict is True:
3612
testament_class = StrictTestament
3613
else:
3614
testament_class = Testament
3615
if branch == '.':
3616
b = Branch.open_containing(branch)[0]
3617
else:
3618
b = Branch.open(branch)
2423
def run(self, branch=u'.', revision=None, long=False):
2424
from bzrlib.testament import Testament
2425
b = WorkingTree.open_containing(branch)[0].branch
3619
2426
b.lock_read()
3620
2427
try:
3621
2428
if revision is None:
3622
2429
rev_id = b.last_revision()
3623
2430
else:
3624
rev_id = revision[0].as_revision_id(b)
3625
t = testament_class.from_revision(b.repository, rev_id)
2431
rev_id = revision[0].in_history(b).rev_id
2432
t = Testament.from_revision(b.repository, rev_id)
3626
2433
if long:
3627
2434
sys.stdout.writelines(t.as_text_lines())
3628
2435
else:
3643
2450
# TODO: annotate directories; showing when each file was last changed
3644
2451
# TODO: if the working copy is modified, show annotations on that
3645
2452
# with new uncommitted lines marked
3646
aliases = ['ann', 'blame', 'praise']
2453
aliases = ['blame', 'praise']
3647
2454
takes_args = ['filename']
3648
takes_options = [Option('all', help='Show annotations on all lines.'),
3649
Option('long', help='Show commit date in annotations.'),
3650
'revision',
3651
'show-ids',
2455
takes_options = [Option('all', help='show annotations on all lines'),
2456
Option('long', help='show date in annotations'),
2457
'revision'
3652
2458
]
3653
encoding_type = 'exact'
3654
2459
3655
2460
@display_command
3656
def run(self, filename, all=False, long=False, revision=None,
3657
show_ids=False):
3658
from bzrlib.annotate import annotate_file, annotate_file_tree
3659
wt, branch, relpath = \
3660
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
3661
if wt is not None:
3662
wt.lock_read()
3663
else:
3664
branch.lock_read()
2461
def run(self, filename, all=False, long=False, revision=None):
2462
from bzrlib.annotate import annotate_file
2463
tree, relpath = WorkingTree.open_containing(filename)
2464
branch = tree.branch
2465
branch.lock_read()
3665
2466
try:
3666
tree = _get_one_revision_tree('annotate', revision, branch=branch)
3667
if wt is not None:
3668
file_id = wt.path2id(relpath)
2467
if revision is None:
2468
revision_id = branch.last_revision()
2469
elif len(revision) != 1:
2470
raise BzrCommandError('bzr annotate --revision takes exactly 1 argument')
3669
2471
else:
3670
file_id = tree.path2id(relpath)
3671
if file_id is None:
3672
raise errors.NotVersionedError(filename)
2472
revision_id = revision[0].in_history(branch).rev_id
2473
file_id = tree.inventory.path2id(relpath)
2474
tree = branch.repository.revision_tree(revision_id)
3673
2475
file_version = tree.inventory[file_id].revision
3674
if wt is not None and revision is None:
3675
# If there is a tree and we're not annotating historical
3676
# versions, annotate the working tree's content.
3677
annotate_file_tree(wt, file_id, self.outf, long, all,
3678
show_ids=show_ids)
3679
else:
3680
annotate_file(branch, file_version, file_id, long, all, self.outf,
3681
show_ids=show_ids)
2476
annotate_file(branch, file_version, file_id, long, all, sys.stdout)
3682
2477
finally:
3683
if wt is not None:
3684
wt.unlock()
3685
else:
3686
branch.unlock()
2478
branch.unlock()
3687
2479
3688
2480
3689
2481
class cmd_re_sign(Command):
3695
2487
takes_options = ['revision']
3696
2488
3697
2489
def run(self, revision_id_list=None, revision=None):
2490
import bzrlib.config as config
2491
import bzrlib.gpg as gpg
3698
2492
if revision_id_list is not None and revision is not None:
3699
raise errors.BzrCommandError('You can only supply one of revision_id or --revision')
2493
raise BzrCommandError('You can only supply one of revision_id or --revision')
3700
2494
if revision_id_list is None and revision is None:
3701
raise errors.BzrCommandError('You must supply either --revision or a revision_id')
2495
raise BzrCommandError('You must supply either --revision or a revision_id')
3702
2496
b = WorkingTree.open_containing(u'.')[0].branch
3703
b.lock_write()
3704
try:
3705
return self._run(b, revision_id_list, revision)
3706
finally:
3707
b.unlock()
3708
3709
def _run(self, b, revision_id_list, revision):
3710
import bzrlib.gpg as gpg
3711
gpg_strategy = gpg.GPGStrategy(b.get_config())
2497
gpg_strategy = gpg.GPGStrategy(config.BranchConfig(b))
3712
2498
if revision_id_list is not None:
3713
b.repository.start_write_group()
3714
try:
3715
for revision_id in revision_id_list:
3716
b.repository.sign_revision(revision_id, gpg_strategy)
3717
except:
3718
b.repository.abort_write_group()
3719
raise
3720
else:
3721
b.repository.commit_write_group()
2499
for revision_id in revision_id_list:
2500
b.repository.sign_revision(revision_id, gpg_strategy)
3722
2501
elif revision is not None:
3723
2502
if len(revision) == 1:
3724
2503
revno, rev_id = revision[0].in_history(b)
3725
b.repository.start_write_group()
3726
try:
3727
b.repository.sign_revision(rev_id, gpg_strategy)
3728
except:
3729
b.repository.abort_write_group()
3730
raise
3731
else:
3732
b.repository.commit_write_group()
2504
b.repository.sign_revision(rev_id, gpg_strategy)
3733
2505
elif len(revision) == 2:
3734
2506
# are they both on rh- if so we can walk between them
3735
2507
# might be nice to have a range helper for arbitrary
3739
2511
if to_revid is None:
3740
2512
to_revno = b.revno()
3741
2513
if from_revno is None or to_revno is None:
3742
raise errors.BzrCommandError('Cannot sign a range of non-revision-history revisions')
3743
b.repository.start_write_group()
3744
try:
3745
for revno in range(from_revno, to_revno + 1):
3746
b.repository.sign_revision(b.get_rev_id(revno),
3747
gpg_strategy)
3748
except:
3749
b.repository.abort_write_group()
3750
raise
3751
else:
3752
b.repository.commit_write_group()
2514
raise BzrCommandError('Cannot sign a range of non-revision-history revisions')
2515
for revno in range(from_revno, to_revno + 1):
2516
b.repository.sign_revision(b.get_rev_id(revno),
2517
gpg_strategy)
3753
2518
else:
3754
raise errors.BzrCommandError('Please supply either one revision, or a range.')
2519
raise BzrCommandError('Please supply either one revision, or a range.')
3755
2520
3756
2521
3757
2522
class cmd_bind(Command):
3758
"""Convert the current branch into a checkout of the supplied branch.
2523
"""Bind the current branch to a master branch.
3759
2524
3760
Once converted into a checkout, commits must succeed on the master branch
3761
before they will be applied to the local branch.
2525
After binding, commits must succeed on the master branch
2526
before they are executed on the local one.
3762
2527
"""
3763
2528
3764
_see_also = ['checkouts', 'unbind']
3765
takes_args = ['location?']
2529
takes_args = ['location']
3766
2530
takes_options = []
3767
2531
3768
2532
def run(self, location=None):
3769
2533
b, relpath = Branch.open_containing(u'.')
3770
if location is None:
3771
try:
3772
location = b.get_old_bound_location()
3773
except errors.UpgradeRequired:
3774
raise errors.BzrCommandError('No location supplied. '
3775
'This format does not remember old locations.')
3776
else:
3777
if location is None:
3778
raise errors.BzrCommandError('No location supplied and no '
3779
'previous location known')
3780
2534
b_other = Branch.open(location)
3781
2535
try:
3782
2536
b.bind(b_other)
3783
except errors.DivergedBranches:
3784
raise errors.BzrCommandError('These branches have diverged.'
3785
' Try merging, and then bind again.')
2537
except DivergedBranches:
2538
raise BzrCommandError('These branches have diverged.'
2539
' Try merging, and then bind again.')
3786
2540
3787
2541
3788
2542
class cmd_unbind(Command):
3789
"""Convert the current checkout into a regular branch.
2543
"""Unbind the current branch from its master branch.
3790
2544
3791
After unbinding, the local branch is considered independent and subsequent
3792
commits will be local only.
2545
After unbinding, the local branch is considered independent.
2546
All subsequent commits will be local.
3793
2547
"""
3794
2548
3795
_see_also = ['checkouts', 'bind']
3796
2549
takes_args = []
3797
2550
takes_options = []
3798
2551
3799
2552
def run(self):
3800
2553
b, relpath = Branch.open_containing(u'.')
3801
2554
if not b.unbind():
3802
raise errors.BzrCommandError('Local branch is not bound')
3803
3804
3805
class cmd_uncommit(Command):
2555
raise BzrCommandError('Local branch is not bound')
2556
2557
2558
class cmd_uncommit(bzrlib.commands.Command):
3806
2559
"""Remove the last committed revision.
3807
2560
3808
2561
--verbose will print out what is being removed.
3809
2562
--dry-run will go through all the motions, but not actually
3810
2563
remove anything.
3811
3812
If --revision is specified, uncommit revisions to leave the branch at the
3813
specified revision. For example, "bzr uncommit -r 15" will leave the
3814
branch at revision 15.
3815
3816
Uncommit leaves the working tree ready for a new commit. The only change
3817
it may make is to restore any pending merges that were present before
3818
the commit.
2564
2565
In the future, uncommit will create a revision bundle, which can then
2566
be re-applied.
3819
2567
"""
3820
2568
3821
2569
# TODO: jam 20060108 Add an option to allow uncommit to remove
3822
# unreferenced information in 'branch-as-repository' branches.
2570
# unreferenced information in 'branch-as-repostory' branches.
3823
2571
# TODO: jam 20060108 Add the ability for uncommit to remove unreferenced
3824
2572
# information in shared branches as well.
3825
_see_also = ['commit']
3826
2573
takes_options = ['verbose', 'revision',
3827
Option('dry-run', help='Don\'t actually make changes.'),
3828
Option('force', help='Say yes to all questions.'),
3829
Option('local',
3830
help="Only remove the commits from the local branch"
3831
" when in a checkout."
3832
),
3833
]
2574
Option('dry-run', help='Don\'t actually make changes'),
2575
Option('force', help='Say yes to all questions.')]
3834
2576
takes_args = ['location?']
3835
2577
aliases = []
3836
encoding_type = 'replace'
3837
2578
3838
def run(self, location=None,
2579
def run(self, location=None,
3839
2580
dry_run=False, verbose=False,
3840
revision=None, force=False, local=False):
2581
revision=None, force=False):
2582
from bzrlib.branch import Branch
2583
from bzrlib.log import log_formatter
2584
import sys
2585
from bzrlib.uncommit import uncommit
2586
3841
2587
if location is None:
3842
2588
location = u'.'
3843
2589
control, relpath = bzrdir.BzrDir.open_containing(location)
3848
2594
tree = None
3849
2595
b = control.open_branch()
3850
2596
3851
if tree is not None:
3852
tree.lock_write()
3853
else:
3854
b.lock_write()
3855
try:
3856
return self._run(b, tree, dry_run, verbose, revision, force,
3857
local=local)
3858
finally:
3859
if tree is not None:
3860
tree.unlock()
3861
else:
3862
b.unlock()
3863
3864
def _run(self, b, tree, dry_run, verbose, revision, force, local=False):
3865
from bzrlib.log import log_formatter, show_log
3866
from bzrlib.uncommit import uncommit
3867
3868
last_revno, last_rev_id = b.last_revision_info()
3869
3870
rev_id = None
3871
2597
if revision is None:
3872
revno = last_revno
3873
rev_id = last_rev_id
2598
revno = b.revno()
2599
rev_id = b.last_revision()
3874
2600
else:
3875
# 'bzr uncommit -r 10' actually means uncommit
3876
# so that the final tree is at revno 10.
3877
# but bzrlib.uncommit.uncommit() actually uncommits
3878
# the revisions that are supplied.
3879
# So we need to offset it by one
3880
revno = revision[0].in_history(b).revno + 1
3881
if revno <= last_revno:
3882
rev_id = b.get_rev_id(revno)
3883
3884
if rev_id is None or _mod_revision.is_null(rev_id):
3885
self.outf.write('No revisions to uncommit.\n')
3886
return 1
3887
3888
lf = log_formatter('short',
3889
to_file=self.outf,
3890
show_timezone='original')
3891
3892
show_log(b,
3893
lf,
3894
verbose=False,
3895
direction='forward',
3896
start_revision=revno,
3897
end_revision=last_revno)
2601
revno, rev_id = revision[0].in_history(b)
2602
if rev_id is None:
2603
print 'No revisions to uncommit.'
2604
2605
for r in range(revno, b.revno()+1):
2606
rev_id = b.get_rev_id(r)
2607
lf = log_formatter('short', to_file=sys.stdout,show_timezone='original')
2608
lf.show(r, b.repository.get_revision(rev_id), None)
3898
2609
3899
2610
if dry_run:
3900
2611
print 'Dry-run, pretending to remove the above revisions.'
3908
2619
print 'Canceled'
3909
2620
return 0
3910
2621
3911
mutter('Uncommitting from {%s} to {%s}',
3912
last_rev_id, rev_id)
3913
2622
uncommit(b, tree=tree, dry_run=dry_run, verbose=verbose,
3914
revno=revno, local=local)
3915
note('You can restore the old tip by running:\n'
3916
' bzr pull . -r revid:%s', last_rev_id)
2623
revno=revno)
3917
2624
3918
2625
3919
2626
class cmd_break_lock(Command):
3924
2631
3925
2632
You can get information on what locks are open via the 'bzr info' command.
3926
2633
3927
:Examples:
2634
example:
3928
2635
bzr break-lock
3929
2636
"""
3930
2637
takes_args = ['location?']
3939
2646
pass
3940
2647
3941
2648
3942
class cmd_wait_until_signalled(Command):
3943
"""Test helper for test_start_and_stop_bzr_subprocess_send_signal.
3944
3945
This just prints a line to signal when it is ready, then blocks on stdin.
3946
"""
3947
3948
hidden = True
3949
3950
def run(self):
3951
sys.stdout.write("running\n")
3952
sys.stdout.flush()
3953
sys.stdin.readline()
3954
3955
3956
class cmd_serve(Command):
3957
"""Run the bzr server."""
3958
3959
aliases = ['server']
3960
3961
takes_options = [
3962
Option('inet',
3963
help='Serve on stdin/out for use from inetd or sshd.'),
3964
Option('port',
3965
help='Listen for connections on nominated port of the form '
3966
'[hostname:]portnumber. Passing 0 as the port number will '
3967
'result in a dynamically allocated port. The default port is '
3968
'4155.',
3969
type=str),
3970
Option('directory',
3971
help='Serve contents of this directory.',
3972
type=unicode),
3973
Option('allow-writes',
3974
help='By default the server is a readonly server. Supplying '
3975
'--allow-writes enables write access to the contents of '
3976
'the served directory and below.'
3977
),
3978
]
3979
3980
def run(self, port=None, inet=False, directory=None, allow_writes=False):
3981
from bzrlib import lockdir
3982
from bzrlib.smart import medium, server
3983
from bzrlib.transport import get_transport
3984
from bzrlib.transport.chroot import ChrootServer
3985
if directory is None:
3986
directory = os.getcwd()
3987
url = urlutils.local_path_to_url(directory)
3988
if not allow_writes:
3989
url = 'readonly+' + url
3990
chroot_server = ChrootServer(get_transport(url))
3991
chroot_server.setUp()
3992
t = get_transport(chroot_server.get_url())
3993
if inet:
3994
smart_server = medium.SmartServerPipeStreamMedium(
3995
sys.stdin, sys.stdout, t)
3996
else:
3997
host = medium.BZR_DEFAULT_INTERFACE
3998
if port is None:
3999
port = medium.BZR_DEFAULT_PORT
4000
else:
4001
if ':' in port:
4002
host, port = port.split(':')
4003
port = int(port)
4004
smart_server = server.SmartTCPServer(t, host=host, port=port)
4005
print 'listening on port: ', smart_server.port
4006
sys.stdout.flush()
4007
# for the duration of this server, no UI output is permitted.
4008
# note that this may cause problems with blackbox tests. This should
4009
# be changed with care though, as we dont want to use bandwidth sending
4010
# progress over stderr to smart server clients!
4011
old_factory = ui.ui_factory
4012
old_lockdir_timeout = lockdir._DEFAULT_TIMEOUT_SECONDS
4013
try:
4014
ui.ui_factory = ui.SilentUIFactory()
4015
lockdir._DEFAULT_TIMEOUT_SECONDS = 0
4016
smart_server.serve()
4017
finally:
4018
ui.ui_factory = old_factory
4019
lockdir._DEFAULT_TIMEOUT_SECONDS = old_lockdir_timeout
4020
4021
4022
class cmd_join(Command):
4023
"""Combine a subtree into its containing tree.
4024
4025
This command is for experimental use only. It requires the target tree
4026
to be in dirstate-with-subtree format, which cannot be converted into
4027
earlier formats.
4028
4029
The TREE argument should be an independent tree, inside another tree, but
4030
not part of it. (Such trees can be produced by "bzr split", but also by
4031
running "bzr branch" with the target inside a tree.)
4032
4033
The result is a combined tree, with the subtree no longer an independant
4034
part. This is marked as a merge of the subtree into the containing tree,
4035
and all history is preserved.
4036
4037
If --reference is specified, the subtree retains its independence. It can
4038
be branched by itself, and can be part of multiple projects at the same
4039
time. But operations performed in the containing tree, such as commit
4040
and merge, will recurse into the subtree.
4041
"""
4042
4043
_see_also = ['split']
4044
takes_args = ['tree']
4045
takes_options = [
4046
Option('reference', help='Join by reference.'),
4047
]
4048
hidden = True
4049
4050
def run(self, tree, reference=False):
4051
sub_tree = WorkingTree.open(tree)
4052
parent_dir = osutils.dirname(sub_tree.basedir)
4053
containing_tree = WorkingTree.open_containing(parent_dir)[0]
4054
repo = containing_tree.branch.repository
4055
if not repo.supports_rich_root():
4056
raise errors.BzrCommandError(
4057
"Can't join trees because %s doesn't support rich root data.\n"
4058
"You can use bzr upgrade on the repository."
4059
% (repo,))
4060
if reference:
4061
try:
4062
containing_tree.add_reference(sub_tree)
4063
except errors.BadReferenceTarget, e:
4064
# XXX: Would be better to just raise a nicely printable
4065
# exception from the real origin. Also below. mbp 20070306
4066
raise errors.BzrCommandError("Cannot join %s. %s" %
4067
(tree, e.reason))
4068
else:
4069
try:
4070
containing_tree.subsume(sub_tree)
4071
except errors.BadSubsumeSource, e:
4072
raise errors.BzrCommandError("Cannot join %s. %s" %
4073
(tree, e.reason))
4074
4075
4076
class cmd_split(Command):
4077
"""Split a subdirectory of a tree into a separate tree.
4078
4079
This command will produce a target tree in a format that supports
4080
rich roots, like 'rich-root' or 'rich-root-pack'. These formats cannot be
4081
converted into earlier formats like 'dirstate-tags'.
4082
4083
The TREE argument should be a subdirectory of a working tree. That
4084
subdirectory will be converted into an independent tree, with its own
4085
branch. Commits in the top-level tree will not apply to the new subtree.
4086
"""
4087
4088
# join is not un-hidden yet
4089
#_see_also = ['join']
4090
takes_args = ['tree']
4091
4092
def run(self, tree):
4093
containing_tree, subdir = WorkingTree.open_containing(tree)
4094
sub_id = containing_tree.path2id(subdir)
4095
if sub_id is None:
4096
raise errors.NotVersionedError(subdir)
4097
try:
4098
containing_tree.extract(sub_id)
4099
except errors.RootNotRich:
4100
raise errors.UpgradeRequired(containing_tree.branch.base)
4101
4102
4103
class cmd_merge_directive(Command):
4104
"""Generate a merge directive for auto-merge tools.
4105
4106
A directive requests a merge to be performed, and also provides all the
4107
information necessary to do so. This means it must either include a
4108
revision bundle, or the location of a branch containing the desired
4109
revision.
4110
4111
A submit branch (the location to merge into) must be supplied the first
4112
time the command is issued. After it has been supplied once, it will
4113
be remembered as the default.
4114
4115
A public branch is optional if a revision bundle is supplied, but required
4116
if --diff or --plain is specified. It will be remembered as the default
4117
after the first use.
4118
"""
4119
4120
takes_args = ['submit_branch?', 'public_branch?']
4121
4122
hidden = True
4123
4124
_see_also = ['send']
4125
4126
takes_options = [
4127
RegistryOption.from_kwargs('patch-type',
4128
'The type of patch to include in the directive.',
4129
title='Patch type',
4130
value_switches=True,
4131
enum_switch=False,
4132
bundle='Bazaar revision bundle (default).',
4133
diff='Normal unified diff.',
4134
plain='No patch, just directive.'),
4135
Option('sign', help='GPG-sign the directive.'), 'revision',
4136
Option('mail-to', type=str,
4137
help='Instead of printing the directive, email to this address.'),
4138
Option('message', type=str, short_name='m',
4139
help='Message to use when committing this merge.')
4140
]
4141
4142
encoding_type = 'exact'
4143
4144
def run(self, submit_branch=None, public_branch=None, patch_type='bundle',
4145
sign=False, revision=None, mail_to=None, message=None):
4146
from bzrlib.revision import ensure_null, NULL_REVISION
4147
include_patch, include_bundle = {
4148
'plain': (False, False),
4149
'diff': (True, False),
4150
'bundle': (True, True),
4151
}[patch_type]
4152
branch = Branch.open('.')
4153
stored_submit_branch = branch.get_submit_branch()
4154
if submit_branch is None:
4155
submit_branch = stored_submit_branch
4156
else:
4157
if stored_submit_branch is None:
4158
branch.set_submit_branch(submit_branch)
4159
if submit_branch is None:
4160
submit_branch = branch.get_parent()
4161
if submit_branch is None:
4162
raise errors.BzrCommandError('No submit branch specified or known')
4163
4164
stored_public_branch = branch.get_public_branch()
4165
if public_branch is None:
4166
public_branch = stored_public_branch
4167
elif stored_public_branch is None:
4168
branch.set_public_branch(public_branch)
4169
if not include_bundle and public_branch is None:
4170
raise errors.BzrCommandError('No public branch specified or'
4171
' known')
4172
base_revision_id = None
4173
if revision is not None:
4174
if len(revision) > 2:
4175
raise errors.BzrCommandError('bzr merge-directive takes '
4176
'at most two one revision identifiers')
4177
revision_id = revision[-1].as_revision_id(branch)
4178
if len(revision) == 2:
4179
base_revision_id = revision[0].as_revision_id(branch)
4180
else:
4181
revision_id = branch.last_revision()
4182
revision_id = ensure_null(revision_id)
4183
if revision_id == NULL_REVISION:
4184
raise errors.BzrCommandError('No revisions to bundle.')
4185
directive = merge_directive.MergeDirective2.from_objects(
4186
branch.repository, revision_id, time.time(),
4187
osutils.local_time_offset(), submit_branch,
4188
public_branch=public_branch, include_patch=include_patch,
4189
include_bundle=include_bundle, message=message,
4190
base_revision_id=base_revision_id)
4191
if mail_to is None:
4192
if sign:
4193
self.outf.write(directive.to_signed(branch))
4194
else:
4195
self.outf.writelines(directive.to_lines())
4196
else:
4197
message = directive.to_email(mail_to, branch, sign)
4198
s = SMTPConnection(branch.get_config())
4199
s.send_email(message)
4200
4201
4202
class cmd_send(Command):
4203
"""Mail or create a merge-directive for submiting changes.
4204
4205
A merge directive provides many things needed for requesting merges:
4206
4207
* A machine-readable description of the merge to perform
4208
4209
* An optional patch that is a preview of the changes requested
4210
4211
* An optional bundle of revision data, so that the changes can be applied
4212
directly from the merge directive, without retrieving data from a
4213
branch.
4214
4215
If --no-bundle is specified, then public_branch is needed (and must be
4216
up-to-date), so that the receiver can perform the merge using the
4217
public_branch. The public_branch is always included if known, so that
4218
people can check it later.
4219
4220
The submit branch defaults to the parent, but can be overridden. Both
4221
submit branch and public branch will be remembered if supplied.
4222
4223
If a public_branch is known for the submit_branch, that public submit
4224
branch is used in the merge instructions. This means that a local mirror
4225
can be used as your actual submit branch, once you have set public_branch
4226
for that mirror.
4227
4228
Mail is sent using your preferred mail program. This should be transparent
4229
on Windows (it uses MAPI). On Linux, it requires the xdg-email utility.
4230
If the preferred client can't be found (or used), your editor will be used.
4231
4232
To use a specific mail program, set the mail_client configuration option.
4233
(For Thunderbird 1.5, this works around some bugs.) Supported values for
4234
specific clients are "evolution", "kmail", "mutt", and "thunderbird";
4235
generic options are "default", "editor", "emacsclient", "mapi", and
4236
"xdg-email". Plugins may also add supported clients.
4237
4238
If mail is being sent, a to address is required. This can be supplied
4239
either on the commandline, by setting the submit_to configuration
4240
option in the branch itself or the child_submit_to configuration option
4241
in the submit branch.
4242
4243
Two formats are currently supported: "4" uses revision bundle format 4 and
4244
merge directive format 2. It is significantly faster and smaller than
4245
older formats. It is compatible with Bazaar 0.19 and later. It is the
4246
default. "0.9" uses revision bundle format 0.9 and merge directive
4247
format 1. It is compatible with Bazaar 0.12 - 0.18.
4248
4249
Merge directives are applied using the merge command or the pull command.
4250
"""
4251
4252
encoding_type = 'exact'
4253
4254
_see_also = ['merge', 'pull']
4255
4256
takes_args = ['submit_branch?', 'public_branch?']
4257
4258
takes_options = [
4259
Option('no-bundle',
4260
help='Do not include a bundle in the merge directive.'),
4261
Option('no-patch', help='Do not include a preview patch in the merge'
4262
' directive.'),
4263
Option('remember',
4264
help='Remember submit and public branch.'),
4265
Option('from',
4266
help='Branch to generate the submission from, '
4267
'rather than the one containing the working directory.',
4268
short_name='f',
4269
type=unicode),
4270
Option('output', short_name='o',
4271
help='Write merge directive to this file; '
4272
'use - for stdout.',
4273
type=unicode),
4274
Option('mail-to', help='Mail the request to this address.',
4275
type=unicode),
4276
'revision',
4277
'message',
4278
RegistryOption.from_kwargs('format',
4279
'Use the specified output format.',
4280
**{'4': 'Bundle format 4, Merge Directive 2 (default)',
4281
'0.9': 'Bundle format 0.9, Merge Directive 1',})
4282
]
4283
4284
def run(self, submit_branch=None, public_branch=None, no_bundle=False,
4285
no_patch=False, revision=None, remember=False, output=None,
4286
format='4', mail_to=None, message=None, **kwargs):
4287
return self._run(submit_branch, revision, public_branch, remember,
4288
format, no_bundle, no_patch, output,
4289
kwargs.get('from', '.'), mail_to, message)
4290
4291
def _run(self, submit_branch, revision, public_branch, remember, format,
4292
no_bundle, no_patch, output, from_, mail_to, message):
4293
from bzrlib.revision import NULL_REVISION
4294
branch = Branch.open_containing(from_)[0]
4295
if output is None:
4296
outfile = cStringIO.StringIO()
4297
elif output == '-':
4298
outfile = self.outf
4299
else:
4300
outfile = open(output, 'wb')
4301
# we may need to write data into branch's repository to calculate
4302
# the data to send.
4303
branch.lock_write()
4304
try:
4305
if output is None:
4306
config = branch.get_config()
4307
if mail_to is None:
4308
mail_to = config.get_user_option('submit_to')
4309
mail_client = config.get_mail_client()
4310
if remember and submit_branch is None:
4311
raise errors.BzrCommandError(
4312
'--remember requires a branch to be specified.')
4313
stored_submit_branch = branch.get_submit_branch()
4314
remembered_submit_branch = None
4315
if submit_branch is None:
4316
submit_branch = stored_submit_branch
4317
remembered_submit_branch = "submit"
4318
else:
4319
if stored_submit_branch is None or remember:
4320
branch.set_submit_branch(submit_branch)
4321
if submit_branch is None:
4322
submit_branch = branch.get_parent()
4323
remembered_submit_branch = "parent"
4324
if submit_branch is None:
4325
raise errors.BzrCommandError('No submit branch known or'
4326
' specified')
4327
if remembered_submit_branch is not None:
4328
note('Using saved %s location "%s" to determine what '
4329
'changes to submit.', remembered_submit_branch,
4330
submit_branch)
4331
4332
if mail_to is None:
4333
submit_config = Branch.open(submit_branch).get_config()
4334
mail_to = submit_config.get_user_option("child_submit_to")
4335
4336
stored_public_branch = branch.get_public_branch()
4337
if public_branch is None:
4338
public_branch = stored_public_branch
4339
elif stored_public_branch is None or remember:
4340
branch.set_public_branch(public_branch)
4341
if no_bundle and public_branch is None:
4342
raise errors.BzrCommandError('No public branch specified or'
4343
' known')
4344
base_revision_id = None
4345
revision_id = None
4346
if revision is not None:
4347
if len(revision) > 2:
4348
raise errors.BzrCommandError('bzr send takes '
4349
'at most two one revision identifiers')
4350
revision_id = revision[-1].as_revision_id(branch)
4351
if len(revision) == 2:
4352
base_revision_id = revision[0].as_revision_id(branch)
4353
if revision_id is None:
4354
revision_id = branch.last_revision()
4355
if revision_id == NULL_REVISION:
4356
raise errors.BzrCommandError('No revisions to submit.')
4357
if format == '4':
4358
directive = merge_directive.MergeDirective2.from_objects(
4359
branch.repository, revision_id, time.time(),
4360
osutils.local_time_offset(), submit_branch,
4361
public_branch=public_branch, include_patch=not no_patch,
4362
include_bundle=not no_bundle, message=message,
4363
base_revision_id=base_revision_id)
4364
elif format == '0.9':
4365
if not no_bundle:
4366
if not no_patch:
4367
patch_type = 'bundle'
4368
else:
4369
raise errors.BzrCommandError('Format 0.9 does not'
4370
' permit bundle with no patch')
4371
else:
4372
if not no_patch:
4373
patch_type = 'diff'
4374
else:
4375
patch_type = None
4376
directive = merge_directive.MergeDirective.from_objects(
4377
branch.repository, revision_id, time.time(),
4378
osutils.local_time_offset(), submit_branch,
4379
public_branch=public_branch, patch_type=patch_type,
4380
message=message)
4381
4382
outfile.writelines(directive.to_lines())
4383
if output is None:
4384
subject = '[MERGE] '
4385
if message is not None:
4386
subject += message
4387
else:
4388
revision = branch.repository.get_revision(revision_id)
4389
subject += revision.get_summary()
4390
basename = directive.get_disk_name(branch)
4391
mail_client.compose_merge_request(mail_to, subject,
4392
outfile.getvalue(), basename)
4393
finally:
4394
if output != '-':
4395
outfile.close()
4396
branch.unlock()
4397
4398
4399
class cmd_bundle_revisions(cmd_send):
4400
4401
"""Create a merge-directive for submiting changes.
4402
4403
A merge directive provides many things needed for requesting merges:
4404
4405
* A machine-readable description of the merge to perform
4406
4407
* An optional patch that is a preview of the changes requested
4408
4409
* An optional bundle of revision data, so that the changes can be applied
4410
directly from the merge directive, without retrieving data from a
4411
branch.
4412
4413
If --no-bundle is specified, then public_branch is needed (and must be
4414
up-to-date), so that the receiver can perform the merge using the
4415
public_branch. The public_branch is always included if known, so that
4416
people can check it later.
4417
4418
The submit branch defaults to the parent, but can be overridden. Both
4419
submit branch and public branch will be remembered if supplied.
4420
4421
If a public_branch is known for the submit_branch, that public submit
4422
branch is used in the merge instructions. This means that a local mirror
4423
can be used as your actual submit branch, once you have set public_branch
4424
for that mirror.
4425
4426
Two formats are currently supported: "4" uses revision bundle format 4 and
4427
merge directive format 2. It is significantly faster and smaller than
4428
older formats. It is compatible with Bazaar 0.19 and later. It is the
4429
default. "0.9" uses revision bundle format 0.9 and merge directive
4430
format 1. It is compatible with Bazaar 0.12 - 0.18.
4431
"""
4432
4433
takes_options = [
4434
Option('no-bundle',
4435
help='Do not include a bundle in the merge directive.'),
4436
Option('no-patch', help='Do not include a preview patch in the merge'
4437
' directive.'),
4438
Option('remember',
4439
help='Remember submit and public branch.'),
4440
Option('from',
4441
help='Branch to generate the submission from, '
4442
'rather than the one containing the working directory.',
4443
short_name='f',
4444
type=unicode),
4445
Option('output', short_name='o', help='Write directive to this file.',
4446
type=unicode),
4447
'revision',
4448
RegistryOption.from_kwargs('format',
4449
'Use the specified output format.',
4450
**{'4': 'Bundle format 4, Merge Directive 2 (default)',
4451
'0.9': 'Bundle format 0.9, Merge Directive 1',})
4452
]
4453
aliases = ['bundle']
4454
4455
_see_also = ['send', 'merge']
4456
4457
hidden = True
4458
4459
def run(self, submit_branch=None, public_branch=None, no_bundle=False,
4460
no_patch=False, revision=None, remember=False, output=None,
4461
format='4', **kwargs):
4462
if output is None:
4463
output = '-'
4464
return self._run(submit_branch, revision, public_branch, remember,
4465
format, no_bundle, no_patch, output,
4466
kwargs.get('from', '.'), None, None)
4467
4468
4469
class cmd_tag(Command):
4470
"""Create, remove or modify a tag naming a revision.
4471
4472
Tags give human-meaningful names to revisions. Commands that take a -r
4473
(--revision) option can be given -rtag:X, where X is any previously
4474
created tag.
4475
4476
Tags are stored in the branch. Tags are copied from one branch to another
4477
along when you branch, push, pull or merge.
4478
4479
It is an error to give a tag name that already exists unless you pass
4480
--force, in which case the tag is moved to point to the new revision.
4481
4482
To rename a tag (change the name but keep it on the same revsion), run ``bzr
4483
tag new-name -r tag:old-name`` and then ``bzr tag --delete oldname``.
4484
"""
4485
4486
_see_also = ['commit', 'tags']
4487
takes_args = ['tag_name']
4488
takes_options = [
4489
Option('delete',
4490
help='Delete this tag rather than placing it.',
4491
),
4492
Option('directory',
4493
help='Branch in which to place the tag.',
4494
short_name='d',
4495
type=unicode,
4496
),
4497
Option('force',
4498
help='Replace existing tags.',
4499
),
4500
'revision',
4501
]
4502
4503
def run(self, tag_name,
4504
delete=None,
4505
directory='.',
4506
force=None,
4507
revision=None,
4508
):
4509
branch, relpath = Branch.open_containing(directory)
4510
branch.lock_write()
4511
try:
4512
if delete:
4513
branch.tags.delete_tag(tag_name)
4514
self.outf.write('Deleted tag %s.\n' % tag_name)
4515
else:
4516
if revision:
4517
if len(revision) != 1:
4518
raise errors.BzrCommandError(
4519
"Tags can only be placed on a single revision, "
4520
"not on a range")
4521
revision_id = revision[0].as_revision_id(branch)
4522
else:
4523
revision_id = branch.last_revision()
4524
if (not force) and branch.tags.has_tag(tag_name):
4525
raise errors.TagAlreadyExists(tag_name)
4526
branch.tags.set_tag(tag_name, revision_id)
4527
self.outf.write('Created tag %s.\n' % tag_name)
4528
finally:
4529
branch.unlock()
4530
4531
4532
class cmd_tags(Command):
4533
"""List tags.
4534
4535
This command shows a table of tag names and the revisions they reference.
4536
"""
4537
4538
_see_also = ['tag']
4539
takes_options = [
4540
Option('directory',
4541
help='Branch whose tags should be displayed.',
4542
short_name='d',
4543
type=unicode,
4544
),
4545
RegistryOption.from_kwargs('sort',
4546
'Sort tags by different criteria.', title='Sorting',
4547
alpha='Sort tags lexicographically (default).',
4548
time='Sort tags chronologically.',
4549
),
4550
'show-ids',
4551
]
4552
4553
@display_command
4554
def run(self,
4555
directory='.',
4556
sort='alpha',
4557
show_ids=False,
4558
):
4559
branch, relpath = Branch.open_containing(directory)
4560
tags = branch.tags.get_tag_dict().items()
4561
if not tags:
4562
return
4563
if sort == 'alpha':
4564
tags.sort()
4565
elif sort == 'time':
4566
timestamps = {}
4567
for tag, revid in tags:
4568
try:
4569
revobj = branch.repository.get_revision(revid)
4570
except errors.NoSuchRevision:
4571
timestamp = sys.maxint # place them at the end
4572
else:
4573
timestamp = revobj.timestamp
4574
timestamps[revid] = timestamp
4575
tags.sort(key=lambda x: timestamps[x[1]])
4576
if not show_ids:
4577
# [ (tag, revid), ... ] -> [ (tag, dotted_revno), ... ]
4578
revno_map = branch.get_revision_id_to_revno_map()
4579
tags = [ (tag, '.'.join(map(str, revno_map.get(revid, ('?',)))))
4580
for tag, revid in tags ]
4581
for tag, revspec in tags:
4582
self.outf.write('%-20s %s\n' % (tag, revspec))
4583
4584
4585
class cmd_reconfigure(Command):
4586
"""Reconfigure the type of a bzr directory.
4587
4588
A target configuration must be specified.
4589
4590
For checkouts, the bind-to location will be auto-detected if not specified.
4591
The order of preference is
4592
1. For a lightweight checkout, the current bound location.
4593
2. For branches that used to be checkouts, the previously-bound location.
4594
3. The push location.
4595
4. The parent location.
4596
If none of these is available, --bind-to must be specified.
4597
"""
4598
4599
_see_also = ['branches', 'checkouts', 'standalone-trees', 'working-trees']
4600
takes_args = ['location?']
4601
takes_options = [RegistryOption.from_kwargs('target_type',
4602
title='Target type',
4603
help='The type to reconfigure the directory to.',
4604
value_switches=True, enum_switch=False,
4605
branch='Reconfigure to be an unbound branch '
4606
'with no working tree.',
4607
tree='Reconfigure to be an unbound branch '
4608
'with a working tree.',
4609
checkout='Reconfigure to be a bound branch '
4610
'with a working tree.',
4611
lightweight_checkout='Reconfigure to be a lightweight'
4612
' checkout (with no local history).',
4613
standalone='Reconfigure to be a standalone branch '
4614
'(i.e. stop using shared repository).',
4615
use_shared='Reconfigure to use a shared repository.'),
4616
Option('bind-to', help='Branch to bind checkout to.',
4617
type=str),
4618
Option('force',
4619
help='Perform reconfiguration even if local changes'
4620
' will be lost.')
4621
]
4622
4623
def run(self, location=None, target_type=None, bind_to=None, force=False):
4624
directory = bzrdir.BzrDir.open(location)
4625
if target_type is None:
4626
raise errors.BzrCommandError('No target configuration specified')
4627
elif target_type == 'branch':
4628
reconfiguration = reconfigure.Reconfigure.to_branch(directory)
4629
elif target_type == 'tree':
4630
reconfiguration = reconfigure.Reconfigure.to_tree(directory)
4631
elif target_type == 'checkout':
4632
reconfiguration = reconfigure.Reconfigure.to_checkout(directory,
4633
bind_to)
4634
elif target_type == 'lightweight-checkout':
4635
reconfiguration = reconfigure.Reconfigure.to_lightweight_checkout(
4636
directory, bind_to)
4637
elif target_type == 'use-shared':
4638
reconfiguration = reconfigure.Reconfigure.to_use_shared(directory)
4639
elif target_type == 'standalone':
4640
reconfiguration = reconfigure.Reconfigure.to_standalone(directory)
4641
reconfiguration.apply(force)
4642
4643
4644
class cmd_switch(Command):
4645
"""Set the branch of a checkout and update.
4646
4647
For lightweight checkouts, this changes the branch being referenced.
4648
For heavyweight checkouts, this checks that there are no local commits
4649
versus the current bound branch, then it makes the local branch a mirror
4650
of the new location and binds to it.
4651
4652
In both cases, the working tree is updated and uncommitted changes
4653
are merged. The user can commit or revert these as they desire.
4654
4655
Pending merges need to be committed or reverted before using switch.
4656
4657
The path to the branch to switch to can be specified relative to the parent
4658
directory of the current branch. For example, if you are currently in a
4659
checkout of /path/to/branch, specifying 'newbranch' will find a branch at
4660
/path/to/newbranch.
4661
"""
4662
4663
takes_args = ['to_location']
4664
takes_options = [Option('force',
4665
help='Switch even if local commits will be lost.')
4666
]
4667
4668
def run(self, to_location, force=False):
4669
from bzrlib import switch
4670
tree_location = '.'
4671
control_dir = bzrdir.BzrDir.open_containing(tree_location)[0]
4672
try:
4673
to_branch = Branch.open(to_location)
4674
except errors.NotBranchError:
4675
this_branch = control_dir.open_branch()
4676
# This may be a heavy checkout, where we want the master branch
4677
this_url = this_branch.get_bound_location()
4678
# If not, use a local sibling
4679
if this_url is None:
4680
this_url = this_branch.base
4681
to_branch = Branch.open(
4682
urlutils.join(this_url, '..', to_location))
4683
switch.switch(control_dir, to_branch, force)
4684
note('Switched to branch: %s',
4685
urlutils.unescape_for_display(to_branch.base, 'utf-8'))
4686
4687
4688
class cmd_hooks(Command):
4689
"""Show a branch's currently registered hooks.
4690
"""
4691
4692
hidden = True
4693
takes_args = ['path?']
4694
4695
def run(self, path=None):
4696
if path is None:
4697
path = '.'
4698
branch_hooks = Branch.open(path).hooks
4699
for hook_type in branch_hooks:
4700
hooks = branch_hooks[hook_type]
4701
self.outf.write("%s:\n" % (hook_type,))
4702
if hooks:
4703
for hook in hooks:
4704
self.outf.write(" %s\n" %
4705
(branch_hooks.get_hook_name(hook),))
4706
else:
4707
self.outf.write(" <no hooks installed>\n")
4708
4709
4710
def _create_prefix(cur_transport):
4711
needed = [cur_transport]
4712
# Recurse upwards until we can create a directory successfully
4713
while True:
4714
new_transport = cur_transport.clone('..')
4715
if new_transport.base == cur_transport.base:
4716
raise errors.BzrCommandError(
4717
"Failed to create path prefix for %s."
4718
% cur_transport.base)
4719
try:
4720
new_transport.mkdir('.')
4721
except errors.NoSuchFile:
4722
needed.append(new_transport)
4723
cur_transport = new_transport
4724
else:
4725
break
4726
# Now we only need to create child directories
4727
while needed:
4728
cur_transport = needed.pop()
4729
cur_transport.ensure_base()
2649
2650
# command-line interpretation helper for merge-related commands
2651
def merge(other_revision, base_revision,
2652
check_clean=True, ignore_zero=False,
2653
this_dir=None, backup_files=False, merge_type=Merge3Merger,
2654
file_list=None, show_base=False, reprocess=False,
2655
pb=DummyProgress()):
2656
"""Merge changes into a tree.
2657
2658
base_revision
2659
list(path, revno) Base for three-way merge.
2660
If [None, None] then a base will be automatically determined.
2661
other_revision
2662
list(path, revno) Other revision for three-way merge.
2663
this_dir
2664
Directory to merge changes into; '.' by default.
2665
check_clean
2666
If true, this_dir must have no uncommitted changes before the
2667
merge begins.
2668
ignore_zero - If true, suppress the "zero conflicts" message when
2669
there are no conflicts; should be set when doing something we expect
2670
to complete perfectly.
2671
file_list - If supplied, merge only changes to selected files.
2672
2673
All available ancestors of other_revision and base_revision are
2674
automatically pulled into the branch.
2675
2676
The revno may be -1 to indicate the last revision on the branch, which is
2677
the typical case.
2678
2679
This function is intended for use from the command line; programmatic
2680
clients might prefer to call merge.merge_inner(), which has less magic
2681
behavior.
2682
"""
2683
from bzrlib.merge import Merger
2684
if this_dir is None:
2685
this_dir = u'.'
2686
this_tree = WorkingTree.open_containing(this_dir)[0]
2687
if show_base and not merge_type is Merge3Merger:
2688
raise BzrCommandError("Show-base is not supported for this merge"
2689
" type. %s" % merge_type)
2690
if reprocess and not merge_type.supports_reprocess:
2691
raise BzrCommandError("Conflict reduction is not supported for merge"
2692
" type %s." % merge_type)
2693
if reprocess and show_base:
2694
raise BzrCommandError("Cannot do conflict reduction and show base.")
2695
try:
2696
merger = Merger(this_tree.branch, this_tree=this_tree, pb=pb)
2697
merger.pp = ProgressPhase("Merge phase", 5, pb)
2698
merger.pp.next_phase()
2699
merger.check_basis(check_clean)
2700
merger.set_other(other_revision)
2701
merger.pp.next_phase()
2702
merger.set_base(base_revision)
2703
if merger.base_rev_id == merger.other_rev_id:
2704
note('Nothing to do.')
2705
return 0
2706
merger.backup_files = backup_files
2707
merger.merge_type = merge_type
2708
merger.set_interesting_files(file_list)
2709
merger.show_base = show_base
2710
merger.reprocess = reprocess
2711
conflicts = merger.do_merge()
2712
if file_list is None:
2713
merger.set_pending()
2714
finally:
2715
pb.clear()
2716
return conflicts
4730
2717
4731
2718
4732
2719
# these get imported and then picked up by the scan for cmd_*
4734
2721
# we do need to load at least some information about them to know of
4735
2722
# aliases. ideally we would avoid loading the implementation until the
4736
2723
# details were needed.
4737
from bzrlib.cmd_version_info import cmd_version_info
4738
2724
from bzrlib.conflicts import cmd_resolve, cmd_conflicts, restore
4739
from bzrlib.bundle.commands import (
4740
cmd_bundle_info,
4741
)
2725
from bzrlib.bundle.commands import cmd_bundle_revisions
4742
2726
from bzrlib.sign_my_commits import cmd_sign_my_commits
4743
from bzrlib.weave_commands import cmd_versionedfile_list, \
2727
from bzrlib.weave_commands import cmd_weave_list, cmd_weave_join, \
4744
2728
cmd_weave_plan_merge, cmd_weave_merge_text
Loggerhead is a web-based interface for Breezy
Version: 2.0.1