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