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