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