« back to all changes in this revision
Viewing changes to bzrlib/builtins.py
- browse files at revision 6372.4.2
- compare with another revision
- download diff
- download tarball
- view history from revision 6372.4.2
- Committer: Jelmer Vernooij
- Date: 2011-12-15 12:59:56 UTC
- mto: This revision was merged to the branch mainline in revision 6379.
- Revision ID: jelmer@samba.org-20111215125956-8mi9ixwtf35zfurg
Fix remaining tests.
- files added:
- .testr.conf
- apport
- bzrlib/doc_generate/builders
- bzrlib/doc_generate/writers
- bzrlib/plugins/bash_completion
- bzrlib/plugins/bash_completion/tests
- bzrlib/plugins/changelog_merge
- bzrlib/plugins/changelog_merge/tests
- bzrlib/plugins/po_merge
- bzrlib/plugins/po_merge/tests
- bzrlib/plugins/weave_fmt
- bzrlib/plugins/weave_fmt/tests
- bzrlib/tests/doc_generate
- bzrlib/tests/doc_generate/builders
- bzrlib/tests/doc_generate/writers
- bzrlib/tests/per_bzrdir
- bzrlib/tests/per_controldir_colo
- bzrlib/tests/per_repository_vf
- doc/en/whats-new
- po
- files removed:
- bzrlib/benchmarks
- bzrlib/benchmarks/tree_creator
- files renamed:
- bzrlib/sign_my_commits.py => bzrlib/commit_signature_commands.py
- bzrlib/doc_generate/sphinx_conf.py => bzrlib/doc_generate/conf.py
- bzrlib/repofmt/weaverepo.py => bzrlib/plugins/weave_fmt/repository.py
- bzrlib/xml4.py => bzrlib/plugins/weave_fmt/xml4.py
- bzrlib/tests/per_bzrdir/ => bzrlib/tests/per_controldir/
- bzrlib/tests/per_bzrdir/test_bzrdir.py => bzrlib/tests/per_controldir/test_controldir.py
- bzrlib/tests/per_repository/test_is_write_locked.py => bzrlib/tests/per_repository/test_locking.py
- bzrlib/tests/per_repository/helpers.py => bzrlib/tests/per_repository_vf/helpers.py
- bzrlib/tests/per_repository/test__generate_text_key_index.py => bzrlib/tests/per_repository_vf/test__generate_text_key_index.py
- bzrlib/tests/per_repository/test_add_inventory_by_delta.py => bzrlib/tests/per_repository_vf/test_add_inventory_by_delta.py
- bzrlib/tests/per_repository/test_check_reconcile.py => bzrlib/tests/per_repository_vf/test_check_reconcile.py
- bzrlib/tests/per_repository/test_find_text_key_references.py => bzrlib/tests/per_repository_vf/test_find_text_key_references.py
- bzrlib/tests/per_repository/test_merge_directive.py => bzrlib/tests/per_repository_vf/test_merge_directive.py
- NEWS => doc/en/release-notes/bzr-2.3.txt
- files modified:
- .bzrignore
added
removed
bzrlib/builtins.py
1
# Copyright (C) 2004-2010 Canonical Ltd
1
# Copyright (C) 2005-2011 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
18
18
19
19
import os
20
20
21
import bzrlib.bzrdir
22
21
23
from bzrlib.lazy_import import lazy_import
22
24
lazy_import(globals(), """
23
import codecs
24
25
import cStringIO
26
import errno
25
27
import sys
26
28
import time
27
29
30
32
bugtracker,
31
33
bundle,
32
34
btree_index,
33
bzrdir,
35
controldir,
34
36
directory_service,
35
37
delta,
36
config,
38
config as _mod_config,
37
39
errors,
38
40
globbing,
39
41
hooks,
45
47
rename_map,
46
48
revision as _mod_revision,
47
49
static_tuple,
48
symbol_versioning,
49
50
timestamp,
50
51
transport,
51
52
ui,
52
53
urlutils,
53
54
views,
55
gpg,
54
56
)
55
57
from bzrlib.branch import Branch
56
58
from bzrlib.conflicts import ConflictList
59
from bzrlib.transport import memory
57
60
from bzrlib.revisionspec import RevisionSpec, RevisionInfo
58
61
from bzrlib.smtp_connection import SMTPConnection
59
62
from bzrlib.workingtree import WorkingTree
63
from bzrlib.i18n import gettext, ngettext
60
64
""")
61
65
62
from bzrlib.commands import Command, display_command
66
from bzrlib.commands import (
67
Command,
68
builtin_command_registry,
69
display_command,
70
)
63
71
from bzrlib.option import (
64
72
ListOption,
65
73
Option,
68
76
_parse_revision_str,
69
77
)
70
78
from bzrlib.trace import mutter, note, warning, is_quiet, get_verbosity_level
71
72
79
from bzrlib import (
80
symbol_versioning,
81
)
82
83
84
@symbol_versioning.deprecated_function(symbol_versioning.deprecated_in((2, 3, 0)))
73
85
def tree_files(file_list, default_branch=u'.', canonicalize=True,
74
86
apply_view=True):
75
try:
76
return internal_tree_files(file_list, default_branch, canonicalize,
77
apply_view)
78
except errors.FileInWrongBranch, e:
79
raise errors.BzrCommandError("%s is not in the same branch as %s" %
80
(e.path, file_list[0]))
87
return internal_tree_files(file_list, default_branch, canonicalize,
88
apply_view)
81
89
82
90
83
91
def tree_files_for_add(file_list):
108
116
if view_files:
109
117
file_list = view_files
110
118
view_str = views.view_display_str(view_files)
111
note("Ignoring files outside view. View is %s" % view_str)
119
note(gettext("Ignoring files outside view. View is %s") % view_str)
112
120
return tree, file_list
113
121
114
122
116
124
if revisions is None:
117
125
return None
118
126
if len(revisions) != 1:
119
raise errors.BzrCommandError(
120
'bzr %s --revision takes exactly one revision identifier' % (
127
raise errors.BzrCommandError(gettext(
128
'bzr %s --revision takes exactly one revision identifier') % (
121
129
command_name,))
122
130
return revisions[0]
123
131
147
155
148
156
# XXX: Bad function name; should possibly also be a class method of
149
157
# WorkingTree rather than a function.
158
@symbol_versioning.deprecated_function(symbol_versioning.deprecated_in((2, 3, 0)))
150
159
def internal_tree_files(file_list, default_branch=u'.', canonicalize=True,
151
160
apply_view=True):
152
161
"""Convert command-line paths to a WorkingTree and relative paths.
153
162
163
Deprecated: use WorkingTree.open_containing_paths instead.
164
154
165
This is typically used for command-line processors that take one or
155
166
more filenames, and infer the workingtree that contains them.
156
167
166
177
167
178
:return: workingtree, [relative_paths]
168
179
"""
169
if file_list is None or len(file_list) == 0:
170
tree = WorkingTree.open_containing(default_branch)[0]
171
if tree.supports_views() and apply_view:
172
view_files = tree.views.lookup_view()
173
if view_files:
174
file_list = view_files
175
view_str = views.view_display_str(view_files)
176
note("Ignoring files outside view. View is %s" % view_str)
177
return tree, file_list
178
tree = WorkingTree.open_containing(osutils.realpath(file_list[0]))[0]
179
return tree, safe_relpath_files(tree, file_list, canonicalize,
180
apply_view=apply_view)
181
182
183
def safe_relpath_files(tree, file_list, canonicalize=True, apply_view=True):
184
"""Convert file_list into a list of relpaths in tree.
185
186
:param tree: A tree to operate on.
187
:param file_list: A list of user provided paths or None.
188
:param apply_view: if True and a view is set, apply it or check that
189
specified files are within it
190
:return: A list of relative paths.
191
:raises errors.PathNotChild: When a provided path is in a different tree
192
than tree.
193
"""
194
if file_list is None:
195
return None
196
if tree.supports_views() and apply_view:
197
view_files = tree.views.lookup_view()
198
else:
199
view_files = []
200
new_list = []
201
# tree.relpath exists as a "thunk" to osutils, but canonical_relpath
202
# doesn't - fix that up here before we enter the loop.
203
if canonicalize:
204
fixer = lambda p: osutils.canonical_relpath(tree.basedir, p)
205
else:
206
fixer = tree.relpath
207
for filename in file_list:
208
try:
209
relpath = fixer(osutils.dereference_path(filename))
210
if view_files and not osutils.is_inside_any(view_files, relpath):
211
raise errors.FileOutsideView(filename, view_files)
212
new_list.append(relpath)
213
except errors.PathNotChild:
214
raise errors.FileInWrongBranch(tree.branch, filename)
215
return new_list
180
return WorkingTree.open_containing_paths(
181
file_list, default_directory='.',
182
canonicalize=True,
183
apply_view=True)
216
184
217
185
218
186
def _get_view_info_for_change_reporter(tree):
227
195
return view_info
228
196
229
197
198
def _open_directory_or_containing_tree_or_branch(filename, directory):
199
"""Open the tree or branch containing the specified file, unless
200
the --directory option is used to specify a different branch."""
201
if directory is not None:
202
return (None, Branch.open(directory), filename)
203
return controldir.ControlDir.open_containing_tree_or_branch(filename)
204
205
230
206
# TODO: Make sure no commands unconditionally use the working directory as a
231
207
# branch. If a filename argument is used, the first of them should be used to
232
208
# specify the branch. (Perhaps this can be factored out into some kind of
234
210
# opens the branch?)
235
211
236
212
class cmd_status(Command):
237
"""Display status summary.
213
__doc__ = """Display status summary.
238
214
239
215
This reports on versioned and unknown files, reporting them
240
216
grouped by state. Possible states are:
260
236
unknown
261
237
Not versioned and not matching an ignore pattern.
262
238
263
Additionally for directories, symlinks and files with an executable
264
bit, Bazaar indicates their type using a trailing character: '/', '@'
265
or '*' respectively.
239
Additionally for directories, symlinks and files with a changed
240
executable bit, Bazaar indicates their type using a trailing
241
character: '/', '@' or '*' respectively. These decorations can be
242
disabled using the '--no-classify' option.
266
243
267
244
To see ignored files use 'bzr ignored'. For details on the
268
245
changes to file texts, use 'bzr diff'.
281
258
To skip the display of pending merge information altogether, use
282
259
the no-pending option or specify a file/directory.
283
260
284
If a revision argument is given, the status is calculated against
285
that revision, or between two revisions if two are provided.
261
To compare the working directory to a specific revision, pass a
262
single revision to the revision argument.
263
264
To see which files have changed in a specific revision, or between
265
two revisions, pass a revision range to the revision argument.
266
This will produce the same results as calling 'bzr diff --summarize'.
286
267
"""
287
268
288
269
# TODO: --no-recurse, --recurse options
295
276
short_name='V'),
296
277
Option('no-pending', help='Don\'t show pending merges.',
297
278
),
279
Option('no-classify',
280
help='Do not mark object type using indicator.',
281
),
298
282
]
299
283
aliases = ['st', 'stat']
300
284
303
287
304
288
@display_command
305
289
def run(self, show_ids=False, file_list=None, revision=None, short=False,
306
versioned=False, no_pending=False, verbose=False):
290
versioned=False, no_pending=False, verbose=False,
291
no_classify=False):
307
292
from bzrlib.status import show_tree_status
308
293
309
294
if revision and len(revision) > 2:
310
raise errors.BzrCommandError('bzr status --revision takes exactly'
311
' one or two revision specifiers')
295
raise errors.BzrCommandError(gettext('bzr status --revision takes exactly'
296
' one or two revision specifiers'))
312
297
313
tree, relfile_list = tree_files(file_list)
298
tree, relfile_list = WorkingTree.open_containing_paths(file_list)
314
299
# Avoid asking for specific files when that is not needed.
315
300
if relfile_list == ['']:
316
301
relfile_list = None
323
308
show_tree_status(tree, show_ids=show_ids,
324
309
specific_files=relfile_list, revision=revision,
325
310
to_file=self.outf, short=short, versioned=versioned,
326
show_pending=(not no_pending), verbose=verbose)
311
show_pending=(not no_pending), verbose=verbose,
312
classify=not no_classify)
327
313
328
314
329
315
class cmd_cat_revision(Command):
330
"""Write out metadata for a revision.
316
__doc__ = """Write out metadata for a revision.
331
317
332
318
The revision to print can either be specified by a specific
333
319
revision identifier, or you can use --revision.
335
321
336
322
hidden = True
337
323
takes_args = ['revision_id?']
338
takes_options = ['revision']
324
takes_options = ['directory', 'revision']
339
325
# cat-revision is more for frontends so should be exact
340
326
encoding = 'strict'
341
327
328
def print_revision(self, revisions, revid):
329
stream = revisions.get_record_stream([(revid,)], 'unordered', True)
330
record = stream.next()
331
if record.storage_kind == 'absent':
332
raise errors.NoSuchRevision(revisions, revid)
333
revtext = record.get_bytes_as('fulltext')
334
self.outf.write(revtext.decode('utf-8'))
335
342
336
@display_command
343
def run(self, revision_id=None, revision=None):
337
def run(self, revision_id=None, revision=None, directory=u'.'):
344
338
if revision_id is not None and revision is not None:
345
raise errors.BzrCommandError('You can only supply one of'
346
' revision_id or --revision')
339
raise errors.BzrCommandError(gettext('You can only supply one of'
340
' revision_id or --revision'))
347
341
if revision_id is None and revision is None:
348
raise errors.BzrCommandError('You must supply either'
349
' --revision or a revision_id')
350
b = WorkingTree.open_containing(u'.')[0].branch
351
352
# TODO: jam 20060112 should cat-revision always output utf-8?
353
if revision_id is not None:
354
revision_id = osutils.safe_revision_id(revision_id, warn=False)
355
try:
356
self.outf.write(b.repository.get_revision_xml(revision_id).decode('utf-8'))
357
except errors.NoSuchRevision:
358
msg = "The repository %s contains no revision %s." % (b.repository.base,
359
revision_id)
360
raise errors.BzrCommandError(msg)
361
elif revision is not None:
362
for rev in revision:
363
if rev is None:
364
raise errors.BzrCommandError('You cannot specify a NULL'
365
' revision.')
366
rev_id = rev.as_revision_id(b)
367
self.outf.write(b.repository.get_revision_xml(rev_id).decode('utf-8'))
368
342
raise errors.BzrCommandError(gettext('You must supply either'
343
' --revision or a revision_id'))
344
345
b = controldir.ControlDir.open_containing_tree_or_branch(directory)[1]
346
347
revisions = b.repository.revisions
348
if revisions is None:
349
raise errors.BzrCommandError(gettext('Repository %r does not support '
350
'access to raw revision texts'))
351
352
b.repository.lock_read()
353
try:
354
# TODO: jam 20060112 should cat-revision always output utf-8?
355
if revision_id is not None:
356
revision_id = osutils.safe_revision_id(revision_id, warn=False)
357
try:
358
self.print_revision(revisions, revision_id)
359
except errors.NoSuchRevision:
360
msg = gettext("The repository {0} contains no revision {1}.").format(
361
b.repository.base, revision_id)
362
raise errors.BzrCommandError(msg)
363
elif revision is not None:
364
for rev in revision:
365
if rev is None:
366
raise errors.BzrCommandError(
367
gettext('You cannot specify a NULL revision.'))
368
rev_id = rev.as_revision_id(b)
369
self.print_revision(revisions, rev_id)
370
finally:
371
b.repository.unlock()
372
369
373
370
374
class cmd_dump_btree(Command):
371
"""Dump the contents of a btree index file to stdout.
375
__doc__ = """Dump the contents of a btree index file to stdout.
372
376
373
377
PATH is a btree index file, it can be any URL. This includes things like
374
378
.bzr/repository/pack-names, or .bzr/repository/indices/a34b3a...ca4a4.iix
422
426
self.outf.write(page_bytes[:header_end])
423
427
page_bytes = data
424
428
self.outf.write('\nPage %d\n' % (page_idx,))
425
decomp_bytes = zlib.decompress(page_bytes)
426
self.outf.write(decomp_bytes)
427
self.outf.write('\n')
429
if len(page_bytes) == 0:
430
self.outf.write('(empty)\n');
431
else:
432
decomp_bytes = zlib.decompress(page_bytes)
433
self.outf.write(decomp_bytes)
434
self.outf.write('\n')
428
435
429
436
def _dump_entries(self, trans, basename):
430
437
try:
438
445
for node in bt.iter_all_entries():
439
446
# Node is made up of:
440
447
# (index, key, value, [references])
441
refs_as_tuples = static_tuple.as_tuples(node[3])
448
try:
449
refs = node[3]
450
except IndexError:
451
refs_as_tuples = None
452
else:
453
refs_as_tuples = static_tuple.as_tuples(refs)
442
454
as_tuple = (tuple(node[1]), node[2], refs_as_tuples)
443
455
self.outf.write('%s\n' % (as_tuple,))
444
456
445
457
446
458
class cmd_remove_tree(Command):
447
"""Remove the working tree from a given branch/checkout.
459
__doc__ = """Remove the working tree from a given branch/checkout.
448
460
449
461
Since a lightweight checkout is little more than a working tree
450
462
this will refuse to run against one.
452
464
To re-create the working tree, use "bzr checkout".
453
465
"""
454
466
_see_also = ['checkout', 'working-trees']
455
takes_args = ['location?']
467
takes_args = ['location*']
456
468
takes_options = [
457
469
Option('force',
458
470
help='Remove the working tree even if it has '
459
'uncommitted changes.'),
471
'uncommitted or shelved changes.'),
460
472
]
461
473
462
def run(self, location='.', force=False):
463
d = bzrdir.BzrDir.open(location)
464
474
def run(self, location_list, force=False):
475
if not location_list:
476
location_list=['.']
477
478
for location in location_list:
479
d = controldir.ControlDir.open(location)
480
481
try:
482
working = d.open_workingtree()
483
except errors.NoWorkingTree:
484
raise errors.BzrCommandError(gettext("No working tree to remove"))
485
except errors.NotLocalUrl:
486
raise errors.BzrCommandError(gettext("You cannot remove the working tree"
487
" of a remote path"))
488
if not force:
489
if (working.has_changes()):
490
raise errors.UncommittedChanges(working)
491
if working.get_shelf_manager().last_shelf() is not None:
492
raise errors.ShelvedChanges(working)
493
494
if working.user_url != working.branch.user_url:
495
raise errors.BzrCommandError(gettext("You cannot remove the working tree"
496
" from a lightweight checkout"))
497
498
d.destroy_workingtree()
499
500
501
class cmd_repair_workingtree(Command):
502
__doc__ = """Reset the working tree state file.
503
504
This is not meant to be used normally, but more as a way to recover from
505
filesystem corruption, etc. This rebuilds the working inventory back to a
506
'known good' state. Any new modifications (adding a file, renaming, etc)
507
will be lost, though modified files will still be detected as such.
508
509
Most users will want something more like "bzr revert" or "bzr update"
510
unless the state file has become corrupted.
511
512
By default this attempts to recover the current state by looking at the
513
headers of the state file. If the state file is too corrupted to even do
514
that, you can supply --revision to force the state of the tree.
515
"""
516
517
takes_options = ['revision', 'directory',
518
Option('force',
519
help='Reset the tree even if it doesn\'t appear to be'
520
' corrupted.'),
521
]
522
hidden = True
523
524
def run(self, revision=None, directory='.', force=False):
525
tree, _ = WorkingTree.open_containing(directory)
526
self.add_cleanup(tree.lock_tree_write().unlock)
527
if not force:
528
try:
529
tree.check_state()
530
except errors.BzrError:
531
pass # There seems to be a real error here, so we'll reset
532
else:
533
# Refuse
534
raise errors.BzrCommandError(gettext(
535
'The tree does not appear to be corrupt. You probably'
536
' want "bzr revert" instead. Use "--force" if you are'
537
' sure you want to reset the working tree.'))
538
if revision is None:
539
revision_ids = None
540
else:
541
revision_ids = [r.as_revision_id(tree.branch) for r in revision]
465
542
try:
466
working = d.open_workingtree()
467
except errors.NoWorkingTree:
468
raise errors.BzrCommandError("No working tree to remove")
469
except errors.NotLocalUrl:
470
raise errors.BzrCommandError("You cannot remove the working tree"
471
" of a remote path")
472
if not force:
473
if (working.has_changes()):
474
raise errors.UncommittedChanges(working)
475
476
working_path = working.bzrdir.root_transport.base
477
branch_path = working.branch.bzrdir.root_transport.base
478
if working_path != branch_path:
479
raise errors.BzrCommandError("You cannot remove the working tree"
480
" from a lightweight checkout")
481
482
d.destroy_workingtree()
543
tree.reset_state(revision_ids)
544
except errors.BzrError, e:
545
if revision_ids is None:
546
extra = (gettext(', the header appears corrupt, try passing -r -1'
547
' to set the state to the last commit'))
548
else:
549
extra = ''
550
raise errors.BzrCommandError(gettext('failed to reset the tree state{0}').format(extra))
483
551
484
552
485
553
class cmd_revno(Command):
486
"""Show current revision number.
554
__doc__ = """Show current revision number.
487
555
488
556
This is equal to the number of revisions on this branch.
489
557
"""
491
559
_see_also = ['info']
492
560
takes_args = ['location?']
493
561
takes_options = [
494
Option('tree', help='Show revno of working tree'),
562
Option('tree', help='Show revno of working tree.'),
563
'revision',
495
564
]
496
565
497
566
@display_command
498
def run(self, tree=False, location=u'.'):
567
def run(self, tree=False, location=u'.', revision=None):
568
if revision is not None and tree:
569
raise errors.BzrCommandError(gettext("--tree and --revision can "
570
"not be used together"))
571
499
572
if tree:
500
573
try:
501
574
wt = WorkingTree.open_containing(location)[0]
502
wt.lock_read()
575
self.add_cleanup(wt.lock_read().unlock)
503
576
except (errors.NoWorkingTree, errors.NotLocalUrl):
504
577
raise errors.NoWorkingTree(location)
505
self.add_cleanup(wt.unlock)
578
b = wt.branch
506
579
revid = wt.last_revision()
507
try:
508
revno_t = wt.branch.revision_id_to_dotted_revno(revid)
509
except errors.NoSuchRevision:
510
revno_t = ('???',)
511
revno = ".".join(str(n) for n in revno_t)
512
580
else:
513
581
b = Branch.open_containing(location)[0]
514
b.lock_read()
515
self.add_cleanup(b.unlock)
516
revno = b.revno()
582
self.add_cleanup(b.lock_read().unlock)
583
if revision:
584
if len(revision) != 1:
585
raise errors.BzrCommandError(gettext(
586
"Tags can only be placed on a single revision, "
587
"not on a range"))
588
revid = revision[0].as_revision_id(b)
589
else:
590
revid = b.last_revision()
591
try:
592
revno_t = b.revision_id_to_dotted_revno(revid)
593
except errors.NoSuchRevision:
594
revno_t = ('???',)
595
revno = ".".join(str(n) for n in revno_t)
517
596
self.cleanup_now()
518
self.outf.write(str(revno) + '\n')
597
self.outf.write(revno + '\n')
519
598
520
599
521
600
class cmd_revision_info(Command):
522
"""Show revision number and revision id for a given revision identifier.
601
__doc__ = """Show revision number and revision id for a given revision identifier.
523
602
"""
524
603
hidden = True
525
604
takes_args = ['revision_info*']
526
605
takes_options = [
527
606
'revision',
528
Option('directory',
607
custom_help('directory',
529
608
help='Branch to examine, '
530
'rather than the one containing the working directory.',
531
short_name='d',
532
type=unicode,
533
),
534
Option('tree', help='Show revno of working tree'),
609
'rather than the one containing the working directory.'),
610
Option('tree', help='Show revno of working tree.'),
535
611
]
536
612
537
613
@display_command
541
617
try:
542
618
wt = WorkingTree.open_containing(directory)[0]
543
619
b = wt.branch
544
wt.lock_read()
545
self.add_cleanup(wt.unlock)
620
self.add_cleanup(wt.lock_read().unlock)
546
621
except (errors.NoWorkingTree, errors.NotLocalUrl):
547
622
wt = None
548
623
b = Branch.open_containing(directory)[0]
549
b.lock_read()
550
self.add_cleanup(b.unlock)
624
self.add_cleanup(b.lock_read().unlock)
551
625
revision_ids = []
552
626
if revision is not None:
553
627
revision_ids.extend(rev.as_revision_id(b) for rev in revision)
581
655
582
656
583
657
class cmd_add(Command):
584
"""Add specified files or directories.
658
__doc__ = """Add specified files or directories.
585
659
586
660
In non-recursive mode, all the named items are added, regardless
587
661
of whether they were previously ignored. A warning is given if
595
669
are added. This search proceeds recursively into versioned
596
670
directories. If no names are given '.' is assumed.
597
671
672
A warning will be printed when nested trees are encountered,
673
unless they are explicitly ignored.
674
598
675
Therefore simply saying 'bzr add' will version all files that
599
676
are currently unknown.
600
677
616
693
617
694
Any files matching patterns in the ignore list will not be added
618
695
unless they are explicitly mentioned.
696
697
In recursive mode, files larger than the configuration option
698
add.maximum_file_size will be skipped. Named items are never skipped due
699
to file size.
619
700
"""
620
701
takes_args = ['file*']
621
702
takes_options = [
648
729
action = bzrlib.add.AddFromBaseAction(base_tree, base_path,
649
730
to_file=self.outf, should_print=(not is_quiet()))
650
731
else:
651
action = bzrlib.add.AddAction(to_file=self.outf,
732
action = bzrlib.add.AddWithSkipLargeAction(to_file=self.outf,
652
733
should_print=(not is_quiet()))
653
734
654
735
if base_tree:
655
base_tree.lock_read()
656
self.add_cleanup(base_tree.unlock)
736
self.add_cleanup(base_tree.lock_read().unlock)
657
737
tree, file_list = tree_files_for_add(file_list)
658
738
added, ignored = tree.smart_add(file_list, not
659
739
no_recurse, action=action, save=not dry_run)
662
742
if verbose:
663
743
for glob in sorted(ignored.keys()):
664
744
for path in ignored[glob]:
665
self.outf.write("ignored %s matching \"%s\"\n"
666
% (path, glob))
745
self.outf.write(
746
gettext("ignored {0} matching \"{1}\"\n").format(
747
path, glob))
667
748
668
749
669
750
class cmd_mkdir(Command):
670
"""Create a new versioned directory.
751
__doc__ = """Create a new versioned directory.
671
752
672
753
This is equivalent to creating the directory and then adding it.
673
754
"""
674
755
675
756
takes_args = ['dir+']
757
takes_options = [
758
Option(
759
'parents',
760
help='No error if existing, make parent directories as needed.',
761
short_name='p'
762
)
763
]
676
764
encoding_type = 'replace'
677
765
678
def run(self, dir_list):
679
for d in dir_list:
680
os.mkdir(d)
681
wt, dd = WorkingTree.open_containing(d)
682
wt.add([dd])
683
self.outf.write('added %s\n' % d)
766
@classmethod
767
def add_file_with_parents(cls, wt, relpath):
768
if wt.path2id(relpath) is not None:
769
return
770
cls.add_file_with_parents(wt, osutils.dirname(relpath))
771
wt.add([relpath])
772
773
@classmethod
774
def add_file_single(cls, wt, relpath):
775
wt.add([relpath])
776
777
def run(self, dir_list, parents=False):
778
if parents:
779
add_file = self.add_file_with_parents
780
else:
781
add_file = self.add_file_single
782
for dir in dir_list:
783
wt, relpath = WorkingTree.open_containing(dir)
784
if parents:
785
try:
786
os.makedirs(dir)
787
except OSError, e:
788
if e.errno != errno.EEXIST:
789
raise
790
else:
791
os.mkdir(dir)
792
add_file(wt, relpath)
793
if not is_quiet():
794
self.outf.write(gettext('added %s\n') % dir)
684
795
685
796
686
797
class cmd_relpath(Command):
687
"""Show path of a file relative to root"""
798
__doc__ = """Show path of a file relative to root"""
688
799
689
800
takes_args = ['filename']
690
801
hidden = True
699
810
700
811
701
812
class cmd_inventory(Command):
702
"""Show inventory of the current working copy or a revision.
813
__doc__ = """Show inventory of the current working copy or a revision.
703
814
704
815
It is possible to limit the output to a particular entry
705
816
type using the --kind option. For example: --kind file.
722
833
@display_command
723
834
def run(self, revision=None, show_ids=False, kind=None, file_list=None):
724
835
if kind and kind not in ['file', 'directory', 'symlink']:
725
raise errors.BzrCommandError('invalid kind %r specified' % (kind,))
836
raise errors.BzrCommandError(gettext('invalid kind %r specified') % (kind,))
726
837
727
838
revision = _get_one_revision('inventory', revision)
728
work_tree, file_list = tree_files(file_list)
729
work_tree.lock_read()
730
self.add_cleanup(work_tree.unlock)
839
work_tree, file_list = WorkingTree.open_containing_paths(file_list)
840
self.add_cleanup(work_tree.lock_read().unlock)
731
841
if revision is not None:
732
842
tree = revision.as_tree(work_tree.branch)
733
843
734
844
extra_trees = [work_tree]
735
tree.lock_read()
736
self.add_cleanup(tree.unlock)
845
self.add_cleanup(tree.lock_read().unlock)
737
846
else:
738
847
tree = work_tree
739
848
extra_trees = []
743
852
require_versioned=True)
744
853
# find_ids_across_trees may include some paths that don't
745
854
# exist in 'tree'.
746
entries = sorted((tree.id2path(file_id), tree.inventory[file_id])
747
for file_id in file_ids if file_id in tree)
855
entries = sorted(
856
(tree.id2path(file_id), tree.inventory[file_id])
857
for file_id in file_ids if tree.has_id(file_id))
748
858
else:
749
859
entries = tree.inventory.entries()
750
860
760
870
761
871
762
872
class cmd_mv(Command):
763
"""Move or rename a file.
873
__doc__ = """Move or rename a file.
764
874
765
875
:Usage:
766
876
bzr mv OLDNAME NEWNAME
793
903
if auto:
794
904
return self.run_auto(names_list, after, dry_run)
795
905
elif dry_run:
796
raise errors.BzrCommandError('--dry-run requires --auto.')
906
raise errors.BzrCommandError(gettext('--dry-run requires --auto.'))
797
907
if names_list is None:
798
908
names_list = []
799
909
if len(names_list) < 2:
800
raise errors.BzrCommandError("missing file argument")
801
tree, rel_names = tree_files(names_list, canonicalize=False)
802
tree.lock_tree_write()
803
self.add_cleanup(tree.unlock)
910
raise errors.BzrCommandError(gettext("missing file argument"))
911
tree, rel_names = WorkingTree.open_containing_paths(names_list, canonicalize=False)
912
for file_name in rel_names[0:-1]:
913
if file_name == '':
914
raise errors.BzrCommandError(gettext("can not move root of branch"))
915
self.add_cleanup(tree.lock_tree_write().unlock)
804
916
self._run(tree, names_list, rel_names, after)
805
917
806
918
def run_auto(self, names_list, after, dry_run):
807
919
if names_list is not None and len(names_list) > 1:
808
raise errors.BzrCommandError('Only one path may be specified to'
809
' --auto.')
920
raise errors.BzrCommandError(gettext('Only one path may be specified to'
921
' --auto.'))
810
922
if after:
811
raise errors.BzrCommandError('--after cannot be specified with'
812
' --auto.')
813
work_tree, file_list = tree_files(names_list, default_branch='.')
814
work_tree.lock_tree_write()
815
self.add_cleanup(work_tree.unlock)
923
raise errors.BzrCommandError(gettext('--after cannot be specified with'
924
' --auto.'))
925
work_tree, file_list = WorkingTree.open_containing_paths(
926
names_list, default_directory='.')
927
self.add_cleanup(work_tree.lock_tree_write().unlock)
816
928
rename_map.RenameMap.guess_renames(work_tree, dry_run)
817
929
818
930
def _run(self, tree, names_list, rel_names, after):
845
957
self.outf.write("%s => %s\n" % (src, dest))
846
958
else:
847
959
if len(names_list) != 2:
848
raise errors.BzrCommandError('to mv multiple files the'
960
raise errors.BzrCommandError(gettext('to mv multiple files the'
849
961
' destination must be a versioned'
850
' directory')
962
' directory'))
851
963
852
964
# for cicp file-systems: the src references an existing inventory
853
965
# item:
897
1009
898
1010
899
1011
class cmd_pull(Command):
900
"""Turn this branch into a mirror of another branch.
1012
__doc__ = """Turn this branch into a mirror of another branch.
901
1013
902
1014
By default, this command only works on branches that have not diverged.
903
1015
Branches are considered diverged if the destination branch's most recent
912
1024
match the remote one, use pull --overwrite. This will work even if the two
913
1025
branches have diverged.
914
1026
915
If there is no default location set, the first pull will set it. After
916
that, you can omit the location to use the default. To change the
917
default, use --remember. The value will only be saved if the remote
918
location can be accessed.
1027
If there is no default location set, the first pull will set it (use
1028
--no-remember to avoid setting it). After that, you can omit the
1029
location to use the default. To change the default, use --remember. The
1030
value will only be saved if the remote location can be accessed.
1031
1032
The --verbose option will display the revisions pulled using the log_format
1033
configuration option. You can use a different format by overriding it with
1034
-Olog_format=<other_format>.
919
1035
920
1036
Note: The location can be specified either in the form of a branch,
921
1037
or in the form of a path to a file containing a merge directive generated
926
1042
takes_options = ['remember', 'overwrite', 'revision',
927
1043
custom_help('verbose',
928
1044
help='Show logs of pulled revisions.'),
929
Option('directory',
1045
custom_help('directory',
930
1046
help='Branch to pull into, '
931
'rather than the one containing the working directory.',
932
short_name='d',
933
type=unicode,
934
),
1047
'rather than the one containing the working directory.'),
935
1048
Option('local',
936
1049
help="Perform a local pull in a bound "
937
1050
"branch. Local pulls are not applied to "
938
1051
"the master branch."
939
1052
),
1053
Option('show-base',
1054
help="Show base revision text in conflicts.")
940
1055
]
941
1056
takes_args = ['location?']
942
1057
encoding_type = 'replace'
943
1058
944
def run(self, location=None, remember=False, overwrite=False,
1059
def run(self, location=None, remember=None, overwrite=False,
945
1060
revision=None, verbose=False,
946
directory=None, local=False):
1061
directory=None, local=False,
1062
show_base=False):
947
1063
# FIXME: too much stuff is in the command class
948
1064
revision_id = None
949
1065
mergeable = None
952
1068
try:
953
1069
tree_to = WorkingTree.open_containing(directory)[0]
954
1070
branch_to = tree_to.branch
1071
self.add_cleanup(tree_to.lock_write().unlock)
955
1072
except errors.NoWorkingTree:
956
1073
tree_to = None
957
1074
branch_to = Branch.open_containing(directory)[0]
958
1075
self.add_cleanup(branch_to.lock_write().unlock)
1076
1077
if tree_to is None and show_base:
1078
raise errors.BzrCommandError(gettext("Need working tree for --show-base."))
1079
959
1080
if local and not branch_to.get_bound_location():
960
1081
raise errors.LocalRequiresBoundBranch()
961
1082
970
1091
stored_loc = branch_to.get_parent()
971
1092
if location is None:
972
1093
if stored_loc is None:
973
raise errors.BzrCommandError("No pull location known or"
974
" specified.")
1094
raise errors.BzrCommandError(gettext("No pull location known or"
1095
" specified."))
975
1096
else:
976
1097
display_url = urlutils.unescape_for_display(stored_loc,
977
1098
self.outf.encoding)
978
1099
if not is_quiet():
979
self.outf.write("Using saved parent location: %s\n" % display_url)
1100
self.outf.write(gettext("Using saved parent location: %s\n") % display_url)
980
1101
location = stored_loc
981
1102
982
1103
revision = _get_one_revision('pull', revision)
983
1104
if mergeable is not None:
984
1105
if revision is not None:
985
raise errors.BzrCommandError(
986
'Cannot use -r with merge directives or bundles')
1106
raise errors.BzrCommandError(gettext(
1107
'Cannot use -r with merge directives or bundles'))
987
1108
mergeable.install_revisions(branch_to.repository)
988
1109
base_revision_id, revision_id, verified = \
989
1110
mergeable.get_merge_request(branch_to.repository)
991
1112
else:
992
1113
branch_from = Branch.open(location,
993
1114
possible_transports=possible_transports)
994
995
if branch_to.get_parent() is None or remember:
1115
self.add_cleanup(branch_from.lock_read().unlock)
1116
# Remembers if asked explicitly or no previous location is set
1117
if (remember
1118
or (remember is None and branch_to.get_parent() is None)):
996
1119
branch_to.set_parent(branch_from.base)
997
1120
998
if branch_from is not branch_to:
999
branch_from.lock_read()
1000
self.add_cleanup(branch_from.unlock)
1001
1121
if revision is not None:
1002
1122
revision_id = revision.as_revision_id(branch_from)
1003
1123
1004
branch_to.lock_write()
1005
self.add_cleanup(branch_to.unlock)
1006
1124
if tree_to is not None:
1007
1125
view_info = _get_view_info_for_change_reporter(tree_to)
1008
1126
change_reporter = delta._ChangeReporter(
1010
1128
view_info=view_info)
1011
1129
result = tree_to.pull(
1012
1130
branch_from, overwrite, revision_id, change_reporter,
1013
possible_transports=possible_transports, local=local)
1131
local=local, show_base=show_base)
1014
1132
else:
1015
1133
result = branch_to.pull(
1016
1134
branch_from, overwrite, revision_id, local=local)
1020
1138
log.show_branch_change(
1021
1139
branch_to, self.outf, result.old_revno,
1022
1140
result.old_revid)
1141
if getattr(result, 'tag_conflicts', None):
1142
return 1
1143
else:
1144
return 0
1023
1145
1024
1146
1025
1147
class cmd_push(Command):
1026
"""Update a mirror of this branch.
1148
__doc__ = """Update a mirror of this branch.
1027
1149
1028
1150
The target branch will not have its working tree populated because this
1029
1151
is both expensive, and is not supported on remote file systems.
1042
1164
do a merge (see bzr help merge) from the other branch, and commit that.
1043
1165
After that you will be able to do a push without '--overwrite'.
1044
1166
1045
If there is no default push location set, the first push will set it.
1046
After that, you can omit the location to use the default. To change the
1047
default, use --remember. The value will only be saved if the remote
1048
location can be accessed.
1167
If there is no default push location set, the first push will set it (use
1168
--no-remember to avoid setting it). After that, you can omit the
1169
location to use the default. To change the default, use --remember. The
1170
value will only be saved if the remote location can be accessed.
1171
1172
The --verbose option will display the revisions pushed using the log_format
1173
configuration option. You can use a different format by overriding it with
1174
-Olog_format=<other_format>.
1049
1175
"""
1050
1176
1051
1177
_see_also = ['pull', 'update', 'working-trees']
1053
1179
Option('create-prefix',
1054
1180
help='Create the path leading up to the branch '
1055
1181
'if it does not already exist.'),
1056
Option('directory',
1182
custom_help('directory',
1057
1183
help='Branch to push from, '
1058
'rather than the one containing the working directory.',
1059
short_name='d',
1060
type=unicode,
1061
),
1184
'rather than the one containing the working directory.'),
1062
1185
Option('use-existing-dir',
1063
1186
help='By default push will fail if the target'
1064
1187
' directory exists, but does not already'
1075
1198
Option('strict',
1076
1199
help='Refuse to push if there are uncommitted changes in'
1077
1200
' the working tree, --no-strict disables the check.'),
1201
Option('no-tree',
1202
help="Don't populate the working tree, even for protocols"
1203
" that support it."),
1078
1204
]
1079
1205
takes_args = ['location?']
1080
1206
encoding_type = 'replace'
1081
1207
1082
def run(self, location=None, remember=False, overwrite=False,
1208
def run(self, location=None, remember=None, overwrite=False,
1083
1209
create_prefix=False, verbose=False, revision=None,
1084
1210
use_existing_dir=False, directory=None, stacked_on=None,
1085
stacked=False, strict=None):
1211
stacked=False, strict=None, no_tree=False):
1086
1212
from bzrlib.push import _show_push_branch
1087
1213
1088
1214
if directory is None:
1089
1215
directory = '.'
1090
1216
# Get the source branch
1091
1217
(tree, br_from,
1092
_unused) = bzrdir.BzrDir.open_containing_tree_or_branch(directory)
1093
if strict is None:
1094
strict = br_from.get_config().get_user_option_as_bool('push_strict')
1095
if strict is None: strict = True # default value
1218
_unused) = controldir.ControlDir.open_containing_tree_or_branch(directory)
1096
1219
# Get the tip's revision_id
1097
1220
revision = _get_one_revision('push', revision)
1098
1221
if revision is not None:
1099
1222
revision_id = revision.in_history(br_from).rev_id
1100
1223
else:
1101
1224
revision_id = None
1102
if strict and tree is not None and revision_id is None:
1103
if (tree.has_changes()):
1104
raise errors.UncommittedChanges(
1105
tree, more='Use --no-strict to force the push.')
1106
if tree.last_revision() != tree.branch.last_revision():
1107
# The tree has lost sync with its branch, there is little
1108
# chance that the user is aware of it but he can still force
1109
# the push with --no-strict
1110
raise errors.OutOfDateTree(
1111
tree, more='Use --no-strict to force the push.')
1112
1225
if tree is not None and revision_id is None:
1226
tree.check_changed_or_out_of_date(
1227
strict, 'push_strict',
1228
more_error='Use --no-strict to force the push.',
1229
more_warning='Uncommitted changes will not be pushed.')
1113
1230
# Get the stacked_on branch, if any
1114
1231
if stacked_on is not None:
1115
1232
stacked_on = urlutils.normalize_url(stacked_on)
1125
1242
# error by the feedback given to them. RBC 20080227.
1126
1243
stacked_on = parent_url
1127
1244
if not stacked_on:
1128
raise errors.BzrCommandError(
1129
"Could not determine branch to refer to.")
1245
raise errors.BzrCommandError(gettext(
1246
"Could not determine branch to refer to."))
1130
1247
1131
1248
# Get the destination location
1132
1249
if location is None:
1133
1250
stored_loc = br_from.get_push_location()
1134
1251
if stored_loc is None:
1135
raise errors.BzrCommandError(
1136
"No push location known or specified.")
1252
raise errors.BzrCommandError(gettext(
1253
"No push location known or specified."))
1137
1254
else:
1138
1255
display_url = urlutils.unescape_for_display(stored_loc,
1139
1256
self.outf.encoding)
1140
self.outf.write("Using saved push location: %s\n" % display_url)
1257
note(gettext("Using saved push location: %s") % display_url)
1141
1258
location = stored_loc
1142
1259
1143
1260
_show_push_branch(br_from, revision_id, location, self.outf,
1144
1261
verbose=verbose, overwrite=overwrite, remember=remember,
1145
1262
stacked_on=stacked_on, create_prefix=create_prefix,
1146
use_existing_dir=use_existing_dir)
1263
use_existing_dir=use_existing_dir, no_tree=no_tree)
1147
1264
1148
1265
1149
1266
class cmd_branch(Command):
1150
"""Create a new branch that is a copy of an existing branch.
1267
__doc__ = """Create a new branch that is a copy of an existing branch.
1151
1268
1152
1269
If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will
1153
1270
be used. In other words, "branch ../foo/bar" will attempt to create ./bar.
1158
1275
1159
1276
To retrieve the branch as of a particular revision, supply the --revision
1160
1277
parameter, as in "branch foo/bar -r 5".
1278
1279
The synonyms 'clone' and 'get' for this command are deprecated.
1161
1280
"""
1162
1281
1163
1282
_see_also = ['checkout']
1164
1283
takes_args = ['from_location', 'to_location?']
1165
takes_options = ['revision', Option('hardlink',
1166
help='Hard-link working tree files where possible.'),
1284
takes_options = ['revision',
1285
Option('hardlink', help='Hard-link working tree files where possible.'),
1286
Option('files-from', type=str,
1287
help="Get file contents from this tree."),
1167
1288
Option('no-tree',
1168
1289
help="Create a branch without a working-tree."),
1169
1290
Option('switch',
1187
1308
1188
1309
def run(self, from_location, to_location=None, revision=None,
1189
1310
hardlink=False, stacked=False, standalone=False, no_tree=False,
1190
use_existing_dir=False, switch=False, bind=False):
1311
use_existing_dir=False, switch=False, bind=False,
1312
files_from=None):
1191
1313
from bzrlib import switch as _mod_switch
1192
1314
from bzrlib.tag import _merge_tags_if_possible
1193
accelerator_tree, br_from = bzrdir.BzrDir.open_tree_or_branch(
1315
if self.invoked_as in ['get', 'clone']:
1316
ui.ui_factory.show_user_warning(
1317
'deprecated_command',
1318
deprecated_name=self.invoked_as,
1319
recommended_name='branch',
1320
deprecated_in_version='2.4')
1321
accelerator_tree, br_from = controldir.ControlDir.open_tree_or_branch(
1194
1322
from_location)
1323
if not (hardlink or files_from):
1324
# accelerator_tree is usually slower because you have to read N
1325
# files (no readahead, lots of seeks, etc), but allow the user to
1326
# explicitly request it
1327
accelerator_tree = None
1328
if files_from is not None and files_from != from_location:
1329
accelerator_tree = WorkingTree.open(files_from)
1195
1330
revision = _get_one_revision('branch', revision)
1196
br_from.lock_read()
1197
self.add_cleanup(br_from.unlock)
1331
self.add_cleanup(br_from.lock_read().unlock)
1198
1332
if revision is not None:
1199
1333
revision_id = revision.as_revision_id(br_from)
1200
1334
else:
1203
1337
# RBC 20060209
1204
1338
revision_id = br_from.last_revision()
1205
1339
if to_location is None:
1206
to_location = urlutils.derive_to_location(from_location)
1340
to_location = getattr(br_from, "name", None)
1341
if to_location is None:
1342
to_location = urlutils.derive_to_location(from_location)
1207
1343
to_transport = transport.get_transport(to_location)
1208
1344
try:
1209
1345
to_transport.mkdir('.')
1210
1346
except errors.FileExists:
1211
if not use_existing_dir:
1212
raise errors.BzrCommandError('Target directory "%s" '
1213
'already exists.' % to_location)
1347
try:
1348
to_dir = controldir.ControlDir.open_from_transport(
1349
to_transport)
1350
except errors.NotBranchError:
1351
if not use_existing_dir:
1352
raise errors.BzrCommandError(gettext('Target directory "%s" '
1353
'already exists.') % to_location)
1354
else:
1355
to_dir = None
1214
1356
else:
1215
1357
try:
1216
bzrdir.BzrDir.open_from_transport(to_transport)
1358
to_dir.open_branch()
1217
1359
except errors.NotBranchError:
1218
1360
pass
1219
1361
else:
1220
1362
raise errors.AlreadyBranchError(to_location)
1221
1363
except errors.NoSuchFile:
1222
raise errors.BzrCommandError('Parent of "%s" does not exist.'
1364
raise errors.BzrCommandError(gettext('Parent of "%s" does not exist.')
1223
1365
% to_location)
1224
try:
1225
# preserve whatever source format we have.
1226
dir = br_from.bzrdir.sprout(to_transport.base, revision_id,
1227
possible_transports=[to_transport],
1228
accelerator_tree=accelerator_tree,
1229
hardlink=hardlink, stacked=stacked,
1230
force_new_repo=standalone,
1231
create_tree_if_local=not no_tree,
1232
source_branch=br_from)
1233
branch = dir.open_branch()
1234
except errors.NoSuchRevision:
1235
to_transport.delete_tree('.')
1236
msg = "The branch %s has no revision %s." % (from_location,
1237
revision)
1238
raise errors.BzrCommandError(msg)
1366
else:
1367
to_dir = None
1368
if to_dir is None:
1369
try:
1370
# preserve whatever source format we have.
1371
to_dir = br_from.bzrdir.sprout(to_transport.base, revision_id,
1372
possible_transports=[to_transport],
1373
accelerator_tree=accelerator_tree,
1374
hardlink=hardlink, stacked=stacked,
1375
force_new_repo=standalone,
1376
create_tree_if_local=not no_tree,
1377
source_branch=br_from)
1378
branch = to_dir.open_branch(
1379
possible_transports=[
1380
br_from.bzrdir.root_transport, to_transport])
1381
except errors.NoSuchRevision:
1382
to_transport.delete_tree('.')
1383
msg = gettext("The branch {0} has no revision {1}.").format(
1384
from_location, revision)
1385
raise errors.BzrCommandError(msg)
1386
else:
1387
branch = br_from.sprout(to_dir, revision_id=revision_id)
1239
1388
_merge_tags_if_possible(br_from, branch)
1240
1389
# If the source branch is stacked, the new branch may
1241
1390
# be stacked whether we asked for that explicitly or not.
1242
1391
# We therefore need a try/except here and not just 'if stacked:'
1243
1392
try:
1244
note('Created new stacked branch referring to %s.' %
1393
note(gettext('Created new stacked branch referring to %s.') %
1245
1394
branch.get_stacked_on_url())
1246
1395
except (errors.NotStacked, errors.UnstackableBranchFormat,
1247
1396
errors.UnstackableRepositoryFormat), e:
1248
note('Branched %d revision(s).' % branch.revno())
1397
note(ngettext('Branched %d revision.', 'Branched %d revisions.', branch.revno()) % branch.revno())
1249
1398
if bind:
1250
1399
# Bind to the parent
1251
1400
parent_branch = Branch.open(from_location)
1252
1401
branch.bind(parent_branch)
1253
note('New branch bound to %s' % from_location)
1402
note(gettext('New branch bound to %s') % from_location)
1254
1403
if switch:
1255
1404
# Switch to the new branch
1256
1405
wt, _ = WorkingTree.open_containing('.')
1257
1406
_mod_switch.switch(wt.bzrdir, branch)
1258
note('Switched to branch: %s',
1407
note(gettext('Switched to branch: %s'),
1259
1408
urlutils.unescape_for_display(branch.base, 'utf-8'))
1260
1409
1261
1410
1411
class cmd_branches(Command):
1412
__doc__ = """List the branches available at the current location.
1413
1414
This command will print the names of all the branches at the current
1415
location.
1416
"""
1417
1418
takes_args = ['location?']
1419
takes_options = [
1420
Option('recursive', short_name='R',
1421
help='Recursively scan for branches rather than '
1422
'just looking in the specified location.')]
1423
1424
def run(self, location=".", recursive=False):
1425
if recursive:
1426
t = transport.get_transport(location)
1427
if not t.listable():
1428
raise errors.BzrCommandError(
1429
"Can't scan this type of location.")
1430
for b in controldir.ControlDir.find_branches(t):
1431
self.outf.write("%s\n" % urlutils.unescape_for_display(
1432
urlutils.relative_url(t.base, b.base),
1433
self.outf.encoding).rstrip("/"))
1434
else:
1435
dir = controldir.ControlDir.open_containing(location)[0]
1436
for branch in dir.list_branches():
1437
if branch.name is None:
1438
self.outf.write(gettext(" (default)\n"))
1439
else:
1440
self.outf.write(" %s\n" % branch.name.encode(
1441
self.outf.encoding))
1442
1443
1262
1444
class cmd_checkout(Command):
1263
"""Create a new checkout of an existing branch.
1445
__doc__ = """Create a new checkout of an existing branch.
1264
1446
1265
1447
If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree for
1266
1448
the branch found in '.'. This is useful if you have removed the working tree
1303
1485
if branch_location is None:
1304
1486
branch_location = osutils.getcwd()
1305
1487
to_location = branch_location
1306
accelerator_tree, source = bzrdir.BzrDir.open_tree_or_branch(
1488
accelerator_tree, source = controldir.ControlDir.open_tree_or_branch(
1307
1489
branch_location)
1490
if not (hardlink or files_from):
1491
# accelerator_tree is usually slower because you have to read N
1492
# files (no readahead, lots of seeks, etc), but allow the user to
1493
# explicitly request it
1494
accelerator_tree = None
1308
1495
revision = _get_one_revision('checkout', revision)
1309
if files_from is not None:
1496
if files_from is not None and files_from != branch_location:
1310
1497
accelerator_tree = WorkingTree.open(files_from)
1311
1498
if revision is not None:
1312
1499
revision_id = revision.as_revision_id(source)
1329
1516
1330
1517
1331
1518
class cmd_renames(Command):
1332
"""Show list of renamed files.
1519
__doc__ = """Show list of renamed files.
1333
1520
"""
1334
1521
# TODO: Option to show renames between two historical versions.
1335
1522
1340
1527
@display_command
1341
1528
def run(self, dir=u'.'):
1342
1529
tree = WorkingTree.open_containing(dir)[0]
1343
tree.lock_read()
1344
self.add_cleanup(tree.unlock)
1530
self.add_cleanup(tree.lock_read().unlock)
1345
1531
new_inv = tree.inventory
1346
1532
old_tree = tree.basis_tree()
1347
old_tree.lock_read()
1348
self.add_cleanup(old_tree.unlock)
1533
self.add_cleanup(old_tree.lock_read().unlock)
1349
1534
old_inv = old_tree.inventory
1350
1535
renames = []
1351
1536
iterator = tree.iter_changes(old_tree, include_unchanged=True)
1361
1546
1362
1547
1363
1548
class cmd_update(Command):
1364
"""Update a tree to have the latest code committed to its branch.
1365
1366
This will perform a merge into the working tree, and may generate
1367
conflicts. If you have any local changes, you will still
1368
need to commit them after the update for the update to be complete.
1369
1370
If you want to discard your local changes, you can just do a
1371
'bzr revert' instead of 'bzr commit' after the update.
1372
1373
If the tree's branch is bound to a master branch, it will also update
1549
__doc__ = """Update a working tree to a new revision.
1550
1551
This will perform a merge of the destination revision (the tip of the
1552
branch, or the specified revision) into the working tree, and then make
1553
that revision the basis revision for the working tree.
1554
1555
You can use this to visit an older revision, or to update a working tree
1556
that is out of date from its branch.
1557
1558
If there are any uncommitted changes in the tree, they will be carried
1559
across and remain as uncommitted changes after the update. To discard
1560
these changes, use 'bzr revert'. The uncommitted changes may conflict
1561
with the changes brought in by the change in basis revision.
1562
1563
If the tree's branch is bound to a master branch, bzr will also update
1374
1564
the branch from the master.
1565
1566
You cannot update just a single file or directory, because each Bazaar
1567
working tree has just a single basis revision. If you want to restore a
1568
file that has been removed locally, use 'bzr revert' instead of 'bzr
1569
update'. If you want to restore a file to its state in a previous
1570
revision, use 'bzr revert' with a '-r' option, or use 'bzr cat' to write
1571
out the old content of that file to a new location.
1572
1573
The 'dir' argument, if given, must be the location of the root of a
1574
working tree to update. By default, the working tree that contains the
1575
current working directory is used.
1375
1576
"""
1376
1577
1377
1578
_see_also = ['pull', 'working-trees', 'status-flags']
1378
1579
takes_args = ['dir?']
1379
takes_options = ['revision']
1580
takes_options = ['revision',
1581
Option('show-base',
1582
help="Show base revision text in conflicts."),
1583
]
1380
1584
aliases = ['up']
1381
1585
1382
def run(self, dir='.', revision=None):
1586
def run(self, dir=None, revision=None, show_base=None):
1383
1587
if revision is not None and len(revision) != 1:
1384
raise errors.BzrCommandError(
1385
"bzr update --revision takes exactly one revision")
1386
tree = WorkingTree.open_containing(dir)[0]
1588
raise errors.BzrCommandError(gettext(
1589
"bzr update --revision takes exactly one revision"))
1590
if dir is None:
1591
tree = WorkingTree.open_containing('.')[0]
1592
else:
1593
tree, relpath = WorkingTree.open_containing(dir)
1594
if relpath:
1595
# See bug 557886.
1596
raise errors.BzrCommandError(gettext(
1597
"bzr update can only update a whole tree, "
1598
"not a file or subdirectory"))
1387
1599
branch = tree.branch
1388
1600
possible_transports = []
1389
1601
master = branch.get_master_branch(
1390
1602
possible_transports=possible_transports)
1391
1603
if master is not None:
1392
tree.lock_write()
1393
1604
branch_location = master.base
1605
tree.lock_write()
1394
1606
else:
1607
branch_location = tree.branch.base
1395
1608
tree.lock_tree_write()
1396
branch_location = tree.branch.base
1397
1609
self.add_cleanup(tree.unlock)
1398
1610
# get rid of the final '/' and be ready for display
1399
branch_location = urlutils.unescape_for_display(branch_location[:-1],
1400
self.outf.encoding)
1611
branch_location = urlutils.unescape_for_display(
1612
branch_location.rstrip('/'),
1613
self.outf.encoding)
1401
1614
existing_pending_merges = tree.get_parent_ids()[1:]
1402
1615
if master is None:
1403
1616
old_tip = None
1411
1624
else:
1412
1625
revision_id = branch.last_revision()
1413
1626
if revision_id == _mod_revision.ensure_null(tree.last_revision()):
1414
revno = branch.revision_id_to_revno(revision_id)
1415
note("Tree is up to date at revision %d of branch %s" %
1416
(revno, branch_location))
1627
revno = branch.revision_id_to_dotted_revno(revision_id)
1628
note(gettext("Tree is up to date at revision {0} of branch {1}"
1629
).format('.'.join(map(str, revno)), branch_location))
1417
1630
return 0
1418
1631
view_info = _get_view_info_for_change_reporter(tree)
1419
1632
change_reporter = delta._ChangeReporter(
1424
1637
change_reporter,
1425
1638
possible_transports=possible_transports,
1426
1639
revision=revision_id,
1427
old_tip=old_tip)
1640
old_tip=old_tip,
1641
show_base=show_base)
1428
1642
except errors.NoSuchRevision, e:
1429
raise errors.BzrCommandError(
1643
raise errors.BzrCommandError(gettext(
1430
1644
"branch has no revision %s\n"
1431
1645
"bzr update --revision only works"
1432
" for a revision in the branch history"
1646
" for a revision in the branch history")
1433
1647
% (e.revision))
1434
revno = tree.branch.revision_id_to_revno(
1648
revno = tree.branch.revision_id_to_dotted_revno(
1435
1649
_mod_revision.ensure_null(tree.last_revision()))
1436
note('Updated to revision %d of branch %s' %
1437
(revno, branch_location))
1438
if tree.get_parent_ids()[1:] != existing_pending_merges:
1439
note('Your local commits will now show as pending merges with '
1440
"'bzr status', and can be committed with 'bzr commit'.")
1650
note(gettext('Updated to revision {0} of branch {1}').format(
1651
'.'.join(map(str, revno)), branch_location))
1652
parent_ids = tree.get_parent_ids()
1653
if parent_ids[1:] and parent_ids[1:] != existing_pending_merges:
1654
note(gettext('Your local commits will now show as pending merges with '
1655
"'bzr status', and can be committed with 'bzr commit'."))
1441
1656
if conflicts != 0:
1442
1657
return 1
1443
1658
else:
1445
1660
1446
1661
1447
1662
class cmd_info(Command):
1448
"""Show information about a working tree, branch or repository.
1663
__doc__ = """Show information about a working tree, branch or repository.
1449
1664
1450
1665
This command will show all known locations and formats associated to the
1451
1666
tree, branch or repository.
1484
1699
else:
1485
1700
noise_level = 0
1486
1701
from bzrlib.info import show_bzrdir_info
1487
show_bzrdir_info(bzrdir.BzrDir.open_containing(location)[0],
1702
show_bzrdir_info(controldir.ControlDir.open_containing(location)[0],
1488
1703
verbose=noise_level, outfile=self.outf)
1489
1704
1490
1705
1491
1706
class cmd_remove(Command):
1492
"""Remove files or directories.
1707
__doc__ = """Remove files or directories.
1493
1708
1494
This makes bzr stop tracking changes to the specified files. bzr will delete
1495
them if they can easily be recovered using revert. If no options or
1496
parameters are given bzr will scan for files that are being tracked by bzr
1497
but missing in your tree and stop tracking them for you.
1709
This makes Bazaar stop tracking changes to the specified files. Bazaar will
1710
delete them if they can easily be recovered using revert otherwise they
1711
will be backed up (adding an extention of the form .~#~). If no options or
1712
parameters are given Bazaar will scan for files that are being tracked by
1713
Bazaar but missing in your tree and stop tracking them for you.
1498
1714
"""
1499
1715
takes_args = ['file*']
1500
1716
takes_options = ['verbose',
1502
1718
RegistryOption.from_kwargs('file-deletion-strategy',
1503
1719
'The file deletion mode to be used.',
1504
1720
title='Deletion Strategy', value_switches=True, enum_switch=False,
1505
safe='Only delete files if they can be'
1506
' safely recovered (default).',
1721
safe='Backup changed files (default).',
1507
1722
keep='Delete from bzr but leave the working copy.',
1723
no_backup='Don\'t backup changed files.',
1508
1724
force='Delete all the specified files, even if they can not be '
1509
'recovered and even if they are non-empty directories.')]
1725
'recovered and even if they are non-empty directories. '
1726
'(deprecated, use no-backup)')]
1510
1727
aliases = ['rm', 'del']
1511
1728
encoding_type = 'replace'
1512
1729
1513
1730
def run(self, file_list, verbose=False, new=False,
1514
1731
file_deletion_strategy='safe'):
1515
tree, file_list = tree_files(file_list)
1732
if file_deletion_strategy == 'force':
1733
note(gettext("(The --force option is deprecated, rather use --no-backup "
1734
"in future.)"))
1735
file_deletion_strategy = 'no-backup'
1736
1737
tree, file_list = WorkingTree.open_containing_paths(file_list)
1516
1738
1517
1739
if file_list is not None:
1518
1740
file_list = [f for f in file_list]
1519
1741
1520
tree.lock_write()
1521
self.add_cleanup(tree.unlock)
1742
self.add_cleanup(tree.lock_write().unlock)
1522
1743
# Heuristics should probably all move into tree.remove_smart or
1523
1744
# some such?
1524
1745
if new:
1526
1747
specific_files=file_list).added
1527
1748
file_list = sorted([f[0] for f in added], reverse=True)
1528
1749
if len(file_list) == 0:
1529
raise errors.BzrCommandError('No matching files.')
1750
raise errors.BzrCommandError(gettext('No matching files.'))
1530
1751
elif file_list is None:
1531
1752
# missing files show up in iter_changes(basis) as
1532
1753
# versioned-with-no-kind.
1539
1760
file_deletion_strategy = 'keep'
1540
1761
tree.remove(file_list, verbose=verbose, to_file=self.outf,
1541
1762
keep_files=file_deletion_strategy=='keep',
1542
force=file_deletion_strategy=='force')
1763
force=(file_deletion_strategy=='no-backup'))
1543
1764
1544
1765
1545
1766
class cmd_file_id(Command):
1546
"""Print file_id of a particular file or directory.
1767
__doc__ = """Print file_id of a particular file or directory.
1547
1768
1548
1769
The file_id is assigned when the file is first added and remains the
1549
1770
same through all revisions where the file exists, even when it is
1565
1786
1566
1787
1567
1788
class cmd_file_path(Command):
1568
"""Print path of file_ids to a file or directory.
1789
__doc__ = """Print path of file_ids to a file or directory.
1569
1790
1570
1791
This prints one line for each directory down to the target,
1571
1792
starting at the branch root.
1587
1808
1588
1809
1589
1810
class cmd_reconcile(Command):
1590
"""Reconcile bzr metadata in a branch.
1811
__doc__ = """Reconcile bzr metadata in a branch.
1591
1812
1592
1813
This can correct data mismatches that may have been caused by
1593
1814
previous ghost operations or bzr upgrades. You should only
1607
1828
1608
1829
_see_also = ['check']
1609
1830
takes_args = ['branch?']
1831
takes_options = [
1832
Option('canonicalize-chks',
1833
help='Make sure CHKs are in canonical form (repairs '
1834
'bug 522637).',
1835
hidden=True),
1836
]
1610
1837
1611
def run(self, branch="."):
1838
def run(self, branch=".", canonicalize_chks=False):
1612
1839
from bzrlib.reconcile import reconcile
1613
dir = bzrdir.BzrDir.open(branch)
1614
reconcile(dir)
1840
dir = controldir.ControlDir.open(branch)
1841
reconcile(dir, canonicalize_chks=canonicalize_chks)
1615
1842
1616
1843
1617
1844
class cmd_revision_history(Command):
1618
"""Display the list of revision ids on a branch."""
1845
__doc__ = """Display the list of revision ids on a branch."""
1619
1846
1620
1847
_see_also = ['log']
1621
1848
takes_args = ['location?']
1625
1852
@display_command
1626
1853
def run(self, location="."):
1627
1854
branch = Branch.open_containing(location)[0]
1628
for revid in branch.revision_history():
1855
self.add_cleanup(branch.lock_read().unlock)
1856
graph = branch.repository.get_graph()
1857
history = list(graph.iter_lefthand_ancestry(branch.last_revision(),
1858
[_mod_revision.NULL_REVISION]))
1859
for revid in reversed(history):
1629
1860
self.outf.write(revid)
1630
1861
self.outf.write('\n')
1631
1862
1632
1863
1633
1864
class cmd_ancestry(Command):
1634
"""List all revisions merged into this branch."""
1865
__doc__ = """List all revisions merged into this branch."""
1635
1866
1636
1867
_see_also = ['log', 'revision-history']
1637
1868
takes_args = ['location?']
1649
1880
b = wt.branch
1650
1881
last_revision = wt.last_revision()
1651
1882
1652
revision_ids = b.repository.get_ancestry(last_revision)
1653
revision_ids.pop(0)
1654
for revision_id in revision_ids:
1883
self.add_cleanup(b.repository.lock_read().unlock)
1884
graph = b.repository.get_graph()
1885
revisions = [revid for revid, parents in
1886
graph.iter_ancestry([last_revision])]
1887
for revision_id in reversed(revisions):
1888
if _mod_revision.is_null(revision_id):
1889
continue
1655
1890
self.outf.write(revision_id + '\n')
1656
1891
1657
1892
1658
1893
class cmd_init(Command):
1659
"""Make a directory into a versioned branch.
1894
__doc__ = """Make a directory into a versioned branch.
1660
1895
1661
1896
Use this to create an empty branch, or before importing an
1662
1897
existing project.
1688
1923
help='Specify a format for this branch. '
1689
1924
'See "help formats".',
1690
1925
lazy_registry=('bzrlib.bzrdir', 'format_registry'),
1691
converter=lambda name: bzrdir.format_registry.make_bzrdir(name),
1926
converter=lambda name: controldir.format_registry.make_bzrdir(name),
1692
1927
value_switches=True,
1693
1928
title="Branch format",
1694
1929
),
1695
1930
Option('append-revisions-only',
1696
1931
help='Never change revnos or the existing log.'
1697
' Append revisions to it only.')
1932
' Append revisions to it only.'),
1933
Option('no-tree',
1934
'Create a branch without a working tree.')
1698
1935
]
1699
1936
def run(self, location=None, format=None, append_revisions_only=False,
1700
create_prefix=False):
1937
create_prefix=False, no_tree=False):
1701
1938
if format is None:
1702
format = bzrdir.format_registry.make_bzrdir('default')
1939
format = controldir.format_registry.make_bzrdir('default')
1703
1940
if location is None:
1704
1941
location = u'.'
1705
1942
1714
1951
to_transport.ensure_base()
1715
1952
except errors.NoSuchFile:
1716
1953
if not create_prefix:
1717
raise errors.BzrCommandError("Parent directory of %s"
1954
raise errors.BzrCommandError(gettext("Parent directory of %s"
1718
1955
" does not exist."
1719
1956
"\nYou may supply --create-prefix to create all"
1720
" leading parent directories."
1957
" leading parent directories.")
1721
1958
% location)
1722
1959
to_transport.create_prefix()
1723
1960
1724
1961
try:
1725
a_bzrdir = bzrdir.BzrDir.open_from_transport(to_transport)
1962
a_bzrdir = controldir.ControlDir.open_from_transport(to_transport)
1726
1963
except errors.NotBranchError:
1727
1964
# really a NotBzrDir error...
1728
create_branch = bzrdir.BzrDir.create_branch_convenience
1965
create_branch = controldir.ControlDir.create_branch_convenience
1966
if no_tree:
1967
force_new_tree = False
1968
else:
1969
force_new_tree = None
1729
1970
branch = create_branch(to_transport.base, format=format,
1730
possible_transports=[to_transport])
1971
possible_transports=[to_transport],
1972
force_new_tree=force_new_tree)
1731
1973
a_bzrdir = branch.bzrdir
1732
1974
else:
1733
1975
from bzrlib.transport.local import LocalTransport
1737
1979
raise errors.BranchExistsWithoutWorkingTree(location)
1738
1980
raise errors.AlreadyBranchError(location)
1739
1981
branch = a_bzrdir.create_branch()
1740
a_bzrdir.create_workingtree()
1982
if not no_tree and not a_bzrdir.has_workingtree():
1983
a_bzrdir.create_workingtree()
1741
1984
if append_revisions_only:
1742
1985
try:
1743
1986
branch.set_append_revisions_only(True)
1744
1987
except errors.UpgradeRequired:
1745
raise errors.BzrCommandError('This branch format cannot be set'
1746
' to append-revisions-only. Try --default.')
1988
raise errors.BzrCommandError(gettext('This branch format cannot be set'
1989
' to append-revisions-only. Try --default.'))
1747
1990
if not is_quiet():
1748
1991
from bzrlib.info import describe_layout, describe_format
1749
1992
try:
1753
1996
repository = branch.repository
1754
1997
layout = describe_layout(repository, branch, tree).lower()
1755
1998
format = describe_format(a_bzrdir, repository, branch, tree)
1756
self.outf.write("Created a %s (format: %s)\n" % (layout, format))
1999
self.outf.write(gettext("Created a {0} (format: {1})\n").format(
2000
layout, format))
1757
2001
if repository.is_shared():
1758
2002
#XXX: maybe this can be refactored into transport.path_or_url()
1759
2003
url = repository.bzrdir.root_transport.external_url()
1761
2005
url = urlutils.local_path_from_url(url)
1762
2006
except errors.InvalidURL:
1763
2007
pass
1764
self.outf.write("Using shared repository: %s\n" % url)
2008
self.outf.write(gettext("Using shared repository: %s\n") % url)
1765
2009
1766
2010
1767
2011
class cmd_init_repository(Command):
1768
"""Create a shared repository for branches to share storage space.
2012
__doc__ = """Create a shared repository for branches to share storage space.
1769
2013
1770
2014
New branches created under the repository directory will store their
1771
2015
revisions in the repository, not in the branch directory. For branches
1797
2041
takes_options = [RegistryOption('format',
1798
2042
help='Specify a format for this repository. See'
1799
2043
' "bzr help formats" for details.',
1800
lazy_registry=('bzrlib.bzrdir', 'format_registry'),
1801
converter=lambda name: bzrdir.format_registry.make_bzrdir(name),
2044
lazy_registry=('bzrlib.controldir', 'format_registry'),
2045
converter=lambda name: controldir.format_registry.make_bzrdir(name),
1802
2046
value_switches=True, title='Repository format'),
1803
2047
Option('no-trees',
1804
2048
help='Branches in the repository will default to'
1808
2052
1809
2053
def run(self, location, format=None, no_trees=False):
1810
2054
if format is None:
1811
format = bzrdir.format_registry.make_bzrdir('default')
2055
format = controldir.format_registry.make_bzrdir('default')
1812
2056
1813
2057
if location is None:
1814
2058
location = '.'
1825
2069
1826
2070
1827
2071
class cmd_diff(Command):
1828
"""Show differences in the working tree, between revisions or branches.
2072
__doc__ = """Show differences in the working tree, between revisions or branches.
1829
2073
1830
2074
If no arguments are given, all changes for the current tree are listed.
1831
2075
If files are given, only the changes in those files are listed.
1837
2081
"bzr diff -p1" is equivalent to "bzr diff --prefix old/:new/", and
1838
2082
produces patches suitable for "patch -p1".
1839
2083
2084
Note that when using the -r argument with a range of revisions, the
2085
differences are computed between the two specified revisions. That
2086
is, the command does not show the changes introduced by the first
2087
revision in the range. This differs from the interpretation of
2088
revision ranges used by "bzr log" which includes the first revision
2089
in the range.
2090
1840
2091
:Exit values:
1841
2092
1 - changed
1842
2093
2 - unrepresentable changes
1860
2111
1861
2112
bzr diff -r1..3 xxx
1862
2113
1863
To see the changes introduced in revision X::
2114
The changes introduced by revision 2 (equivalent to -r1..2)::
2115
2116
bzr diff -c2
2117
2118
To see the changes introduced by revision X::
1864
2119
1865
2120
bzr diff -cX
1866
2121
1870
2125
1871
2126
bzr diff -r<chosen_parent>..X
1872
2127
1873
The changes introduced by revision 2 (equivalent to -r1..2)::
2128
The changes between the current revision and the previous revision
2129
(equivalent to -c-1 and -r-2..-1)
1874
2130
1875
bzr diff -c2
2131
bzr diff -r-2..
1876
2132
1877
2133
Show just the differences for file NEWS::
1878
2134
1893
2149
Same as 'bzr diff' but prefix paths with old/ and new/::
1894
2150
1895
2151
bzr diff --prefix old/:new/
2152
2153
Show the differences using a custom diff program with options::
2154
2155
bzr diff --using /usr/bin/diff --diff-options -wu
1896
2156
"""
1897
2157
_see_also = ['status']
1898
2158
takes_args = ['file*']
1917
2177
help='Use this command to compare files.',
1918
2178
type=unicode,
1919
2179
),
2180
RegistryOption('format',
2181
short_name='F',
2182
help='Diff format to use.',
2183
lazy_registry=('bzrlib.diff', 'format_registry'),
2184
title='Diff format'),
1920
2185
]
1921
2186
aliases = ['di', 'dif']
1922
2187
encoding_type = 'exact'
1923
2188
1924
2189
@display_command
1925
2190
def run(self, revision=None, file_list=None, diff_options=None,
1926
prefix=None, old=None, new=None, using=None):
1927
from bzrlib.diff import get_trees_and_branches_to_diff, show_diff_trees
2191
prefix=None, old=None, new=None, using=None, format=None):
2192
from bzrlib.diff import (get_trees_and_branches_to_diff_locked,
2193
show_diff_trees)
1928
2194
1929
2195
if (prefix is None) or (prefix == '0'):
1930
2196
# diff -p0 format
1936
2202
elif ':' in prefix:
1937
2203
old_label, new_label = prefix.split(":")
1938
2204
else:
1939
raise errors.BzrCommandError(
2205
raise errors.BzrCommandError(gettext(
1940
2206
'--prefix expects two values separated by a colon'
1941
' (eg "old/:new/")')
2207
' (eg "old/:new/")'))
1942
2208
1943
2209
if revision and len(revision) > 2:
1944
raise errors.BzrCommandError('bzr diff --revision takes exactly'
1945
' one or two revision specifiers')
2210
raise errors.BzrCommandError(gettext('bzr diff --revision takes exactly'
2211
' one or two revision specifiers'))
2212
2213
if using is not None and format is not None:
2214
raise errors.BzrCommandError(gettext(
2215
'{0} and {1} are mutually exclusive').format(
2216
'--using', '--format'))
1946
2217
1947
2218
(old_tree, new_tree,
1948
2219
old_branch, new_branch,
1949
specific_files, extra_trees) = get_trees_and_branches_to_diff(
1950
file_list, revision, old, new, apply_view=True)
2220
specific_files, extra_trees) = get_trees_and_branches_to_diff_locked(
2221
file_list, revision, old, new, self.add_cleanup, apply_view=True)
2222
# GNU diff on Windows uses ANSI encoding for filenames
2223
path_encoding = osutils.get_diff_header_encoding()
1951
2224
return show_diff_trees(old_tree, new_tree, sys.stdout,
1952
2225
specific_files=specific_files,
1953
2226
external_diff_options=diff_options,
1954
2227
old_label=old_label, new_label=new_label,
1955
extra_trees=extra_trees, using=using)
2228
extra_trees=extra_trees,
2229
path_encoding=path_encoding,
2230
using=using,
2231
format_cls=format)
1956
2232
1957
2233
1958
2234
class cmd_deleted(Command):
1959
"""List files deleted in the working tree.
2235
__doc__ = """List files deleted in the working tree.
1960
2236
"""
1961
2237
# TODO: Show files deleted since a previous revision, or
1962
2238
# between two revisions.
1965
2241
# level of effort but possibly much less IO. (Or possibly not,
1966
2242
# if the directories are very large...)
1967
2243
_see_also = ['status', 'ls']
1968
takes_options = ['show-ids']
2244
takes_options = ['directory', 'show-ids']
1969
2245
1970
2246
@display_command
1971
def run(self, show_ids=False):
1972
tree = WorkingTree.open_containing(u'.')[0]
1973
tree.lock_read()
1974
self.add_cleanup(tree.unlock)
2247
def run(self, show_ids=False, directory=u'.'):
2248
tree = WorkingTree.open_containing(directory)[0]
2249
self.add_cleanup(tree.lock_read().unlock)
1975
2250
old = tree.basis_tree()
1976
old.lock_read()
1977
self.add_cleanup(old.unlock)
2251
self.add_cleanup(old.lock_read().unlock)
1978
2252
for path, ie in old.inventory.iter_entries():
1979
2253
if not tree.has_id(ie.file_id):
1980
2254
self.outf.write(path)
1985
2259
1986
2260
1987
2261
class cmd_modified(Command):
1988
"""List files modified in working tree.
2262
__doc__ = """List files modified in working tree.
1989
2263
"""
1990
2264
1991
2265
hidden = True
1992
2266
_see_also = ['status', 'ls']
1993
takes_options = [
1994
Option('null',
1995
help='Write an ascii NUL (\\0) separator '
1996
'between files rather than a newline.')
1997
]
2267
takes_options = ['directory', 'null']
1998
2268
1999
2269
@display_command
2000
def run(self, null=False):
2001
tree = WorkingTree.open_containing(u'.')[0]
2270
def run(self, null=False, directory=u'.'):
2271
tree = WorkingTree.open_containing(directory)[0]
2272
self.add_cleanup(tree.lock_read().unlock)
2002
2273
td = tree.changes_from(tree.basis_tree())
2274
self.cleanup_now()
2003
2275
for path, id, kind, text_modified, meta_modified in td.modified:
2004
2276
if null:
2005
2277
self.outf.write(path + '\0')
2008
2280
2009
2281
2010
2282
class cmd_added(Command):
2011
"""List files added in working tree.
2283
__doc__ = """List files added in working tree.
2012
2284
"""
2013
2285
2014
2286
hidden = True
2015
2287
_see_also = ['status', 'ls']
2016
takes_options = [
2017
Option('null',
2018
help='Write an ascii NUL (\\0) separator '
2019
'between files rather than a newline.')
2020
]
2288
takes_options = ['directory', 'null']
2021
2289
2022
2290
@display_command
2023
def run(self, null=False):
2024
wt = WorkingTree.open_containing(u'.')[0]
2025
wt.lock_read()
2026
self.add_cleanup(wt.unlock)
2291
def run(self, null=False, directory=u'.'):
2292
wt = WorkingTree.open_containing(directory)[0]
2293
self.add_cleanup(wt.lock_read().unlock)
2027
2294
basis = wt.basis_tree()
2028
basis.lock_read()
2029
self.add_cleanup(basis.unlock)
2295
self.add_cleanup(basis.lock_read().unlock)
2030
2296
basis_inv = basis.inventory
2031
2297
inv = wt.inventory
2032
2298
for file_id in inv:
2033
if file_id in basis_inv:
2299
if basis_inv.has_id(file_id):
2034
2300
continue
2035
2301
if inv.is_root(file_id) and len(basis_inv) == 0:
2036
2302
continue
2037
2303
path = inv.id2path(file_id)
2038
if not os.access(osutils.abspath(path), os.F_OK):
2304
if not os.access(osutils.pathjoin(wt.basedir, path), os.F_OK):
2039
2305
continue
2040
2306
if null:
2041
2307
self.outf.write(path + '\0')
2044
2310
2045
2311
2046
2312
class cmd_root(Command):
2047
"""Show the tree root directory.
2313
__doc__ = """Show the tree root directory.
2048
2314
2049
2315
The root is the nearest enclosing directory with a .bzr control
2050
2316
directory."""
2061
2327
try:
2062
2328
return int(limitstring)
2063
2329
except ValueError:
2064
msg = "The limit argument must be an integer."
2330
msg = gettext("The limit argument must be an integer.")
2065
2331
raise errors.BzrCommandError(msg)
2066
2332
2067
2333
2069
2335
try:
2070
2336
return int(s)
2071
2337
except ValueError:
2072
msg = "The levels argument must be an integer."
2338
msg = gettext("The levels argument must be an integer.")
2073
2339
raise errors.BzrCommandError(msg)
2074
2340
2075
2341
2076
2342
class cmd_log(Command):
2077
"""Show historical log for a branch or subset of a branch.
2343
__doc__ = """Show historical log for a branch or subset of a branch.
2078
2344
2079
2345
log is bzr's default tool for exploring the history of a branch.
2080
2346
The branch to use is taken from the first parameter. If no parameters
2185
2451
2186
2452
:Other filtering:
2187
2453
2188
The --message option can be used for finding revisions that match a
2189
regular expression in a commit message.
2454
The --match option can be used for finding revisions that match a
2455
regular expression in a commit message, committer, author or bug.
2456
Specifying the option several times will match any of the supplied
2457
expressions. --match-author, --match-bugs, --match-committer and
2458
--match-message can be used to only match a specific field.
2190
2459
2191
2460
:Tips & tricks:
2192
2461
2241
2510
help='Show just the specified revision.'
2242
2511
' See also "help revisionspec".'),
2243
2512
'log-format',
2513
RegistryOption('authors',
2514
'What names to list as authors - first, all or committer.',
2515
title='Authors',
2516
lazy_registry=('bzrlib.log', 'author_list_registry'),
2517
),
2244
2518
Option('levels',
2245
2519
short_name='n',
2246
2520
help='Number of levels to display - 0 for all, 1 for flat.',
2247
2521
argname='N',
2248
2522
type=_parse_levels),
2249
2523
Option('message',
2250
short_name='m',
2251
2524
help='Show revisions whose message matches this '
2252
2525
'regular expression.',
2253
type=str),
2526
type=str,
2527
hidden=True),
2254
2528
Option('limit',
2255
2529
short_name='l',
2256
2530
help='Limit the output to the first N revisions.',
2259
2533
Option('show-diff',
2260
2534
short_name='p',
2261
2535
help='Show changes made in each revision as a patch.'),
2262
Option('include-merges',
2536
Option('include-merged',
2263
2537
help='Show merged revisions like --levels 0 does.'),
2538
Option('include-merges', hidden=True,
2539
help='Historical alias for --include-merged.'),
2540
Option('omit-merges',
2541
help='Do not report commits with more than one parent.'),
2542
Option('exclude-common-ancestry',
2543
help='Display only the revisions that are not part'
2544
' of both ancestries (require -rX..Y).'
2545
),
2546
Option('signatures',
2547
help='Show digital signature validity.'),
2548
ListOption('match',
2549
short_name='m',
2550
help='Show revisions whose properties match this '
2551
'expression.',
2552
type=str),
2553
ListOption('match-message',
2554
help='Show revisions whose message matches this '
2555
'expression.',
2556
type=str),
2557
ListOption('match-committer',
2558
help='Show revisions whose committer matches this '
2559
'expression.',
2560
type=str),
2561
ListOption('match-author',
2562
help='Show revisions whose authors match this '
2563
'expression.',
2564
type=str),
2565
ListOption('match-bugs',
2566
help='Show revisions whose bugs match this '
2567
'expression.',
2568
type=str)
2264
2569
]
2265
2570
encoding_type = 'replace'
2266
2571
2276
2581
message=None,
2277
2582
limit=None,
2278
2583
show_diff=False,
2279
include_merges=False):
2584
include_merged=None,
2585
authors=None,
2586
exclude_common_ancestry=False,
2587
signatures=False,
2588
match=None,
2589
match_message=None,
2590
match_committer=None,
2591
match_author=None,
2592
match_bugs=None,
2593
omit_merges=False,
2594
include_merges=symbol_versioning.DEPRECATED_PARAMETER,
2595
):
2280
2596
from bzrlib.log import (
2281
2597
Logger,
2282
2598
make_log_request_dict,
2283
2599
_get_info_for_log_files,
2284
2600
)
2285
2601
direction = (forward and 'forward') or 'reverse'
2286
if include_merges:
2602
if symbol_versioning.deprecated_passed(include_merges):
2603
ui.ui_factory.show_user_warning(
2604
'deprecated_command_option',
2605
deprecated_name='--include-merges',
2606
recommended_name='--include-merged',
2607
deprecated_in_version='2.5',
2608
command=self.invoked_as)
2609
if include_merged is None:
2610
include_merged = include_merges
2611
else:
2612
raise errors.BzrCommandError(gettext(
2613
'{0} and {1} are mutually exclusive').format(
2614
'--include-merges', '--include-merged'))
2615
if include_merged is None:
2616
include_merged = False
2617
if (exclude_common_ancestry
2618
and (revision is None or len(revision) != 2)):
2619
raise errors.BzrCommandError(gettext(
2620
'--exclude-common-ancestry requires -r with two revisions'))
2621
if include_merged:
2287
2622
if levels is None:
2288
2623
levels = 0
2289
2624
else:
2290
raise errors.BzrCommandError(
2291
'--levels and --include-merges are mutually exclusive')
2625
raise errors.BzrCommandError(gettext(
2626
'{0} and {1} are mutually exclusive').format(
2627
'--levels', '--include-merged'))
2292
2628
2293
2629
if change is not None:
2294
2630
if len(change) > 1:
2295
2631
raise errors.RangeInChangeOption()
2296
2632
if revision is not None:
2297
raise errors.BzrCommandError(
2298
'--revision and --change are mutually exclusive')
2633
raise errors.BzrCommandError(gettext(
2634
'{0} and {1} are mutually exclusive').format(
2635
'--revision', '--change'))
2299
2636
else:
2300
2637
revision = change
2301
2638
2304
2641
if file_list:
2305
2642
# find the file ids to log and check for directory filtering
2306
2643
b, file_info_list, rev1, rev2 = _get_info_for_log_files(
2307
revision, file_list)
2308
self.add_cleanup(b.unlock)
2644
revision, file_list, self.add_cleanup)
2309
2645
for relpath, file_id, kind in file_info_list:
2310
2646
if file_id is None:
2311
raise errors.BzrCommandError(
2312
"Path unknown at end or start of revision range: %s" %
2647
raise errors.BzrCommandError(gettext(
2648
"Path unknown at end or start of revision range: %s") %
2313
2649
relpath)
2314
2650
# If the relpath is the top of the tree, we log everything
2315
2651
if relpath == '':
2327
2663
location = revision[0].get_branch()
2328
2664
else:
2329
2665
location = '.'
2330
dir, relpath = bzrdir.BzrDir.open_containing(location)
2666
dir, relpath = controldir.ControlDir.open_containing(location)
2331
2667
b = dir.open_branch()
2332
b.lock_read()
2333
self.add_cleanup(b.unlock)
2668
self.add_cleanup(b.lock_read().unlock)
2334
2669
rev1, rev2 = _get_revision_range(revision, b, self.name())
2335
2670
2671
if b.get_config().validate_signatures_in_log():
2672
signatures = True
2673
2674
if signatures:
2675
if not gpg.GPGStrategy.verify_signatures_available():
2676
raise errors.GpgmeNotInstalled(None)
2677
2336
2678
# Decide on the type of delta & diff filtering to use
2337
2679
# TODO: add an --all-files option to make this configurable & consistent
2338
2680
if not verbose:
2356
2698
show_timezone=timezone,
2357
2699
delta_format=get_verbosity_level(),
2358
2700
levels=levels,
2359
show_advice=levels is None)
2701
show_advice=levels is None,
2702
author_list_handler=authors)
2360
2703
2361
2704
# Choose the algorithm for doing the logging. It's annoying
2362
2705
# having multiple code paths like this but necessary until
2374
2717
match_using_deltas = (len(file_ids) != 1 or filter_by_dir
2375
2718
or delta_type or partial_history)
2376
2719
2720
match_dict = {}
2721
if match:
2722
match_dict[''] = match
2723
if match_message:
2724
match_dict['message'] = match_message
2725
if match_committer:
2726
match_dict['committer'] = match_committer
2727
if match_author:
2728
match_dict['author'] = match_author
2729
if match_bugs:
2730
match_dict['bugs'] = match_bugs
2731
2377
2732
# Build the LogRequest and execute it
2378
2733
if len(file_ids) == 0:
2379
2734
file_ids = None
2381
2736
direction=direction, specific_fileids=file_ids,
2382
2737
start_revision=rev1, end_revision=rev2, limit=limit,
2383
2738
message_search=message, delta_type=delta_type,
2384
diff_type=diff_type, _match_using_deltas=match_using_deltas)
2739
diff_type=diff_type, _match_using_deltas=match_using_deltas,
2740
exclude_common_ancestry=exclude_common_ancestry, match=match_dict,
2741
signature=signatures, omit_merges=omit_merges,
2742
)
2385
2743
Logger(b, rqst).show(lf)
2386
2744
2387
2745
2403
2761
# b is taken from revision[0].get_branch(), and
2404
2762
# show_log will use its revision_history. Having
2405
2763
# different branches will lead to weird behaviors.
2406
raise errors.BzrCommandError(
2764
raise errors.BzrCommandError(gettext(
2407
2765
"bzr %s doesn't accept two revisions in different"
2408
" branches." % command_name)
2409
rev1 = start_spec.in_history(branch)
2766
" branches.") % command_name)
2767
if start_spec.spec is None:
2768
# Avoid loading all the history.
2769
rev1 = RevisionInfo(branch, None, None)
2770
else:
2771
rev1 = start_spec.in_history(branch)
2410
2772
# Avoid loading all of history when we know a missing
2411
2773
# end of range means the last revision ...
2412
2774
if end_spec.spec is None:
2415
2777
else:
2416
2778
rev2 = end_spec.in_history(branch)
2417
2779
else:
2418
raise errors.BzrCommandError(
2419
'bzr %s --revision takes one or two values.' % command_name)
2780
raise errors.BzrCommandError(gettext(
2781
'bzr %s --revision takes one or two values.') % command_name)
2420
2782
return rev1, rev2
2421
2783
2422
2784
2441
2803
2442
2804
2443
2805
class cmd_touching_revisions(Command):
2444
"""Return revision-ids which affected a particular file.
2806
__doc__ = """Return revision-ids which affected a particular file.
2445
2807
2446
2808
A more user-friendly interface is "bzr log FILE".
2447
2809
"""
2454
2816
tree, relpath = WorkingTree.open_containing(filename)
2455
2817
file_id = tree.path2id(relpath)
2456
2818
b = tree.branch
2457
b.lock_read()
2458
self.add_cleanup(b.unlock)
2819
self.add_cleanup(b.lock_read().unlock)
2459
2820
touching_revs = log.find_touching_revisions(b, file_id)
2460
2821
for revno, revision_id, what in touching_revs:
2461
2822
self.outf.write("%6d %s\n" % (revno, what))
2462
2823
2463
2824
2464
2825
class cmd_ls(Command):
2465
"""List files in a tree.
2826
__doc__ = """List files in a tree.
2466
2827
"""
2467
2828
2468
2829
_see_also = ['status', 'cat']
2474
2835
help='Recurse into subdirectories.'),
2475
2836
Option('from-root',
2476
2837
help='Print paths relative to the root of the branch.'),
2477
Option('unknown', help='Print unknown files.'),
2838
Option('unknown', short_name='u',
2839
help='Print unknown files.'),
2478
2840
Option('versioned', help='Print versioned files.',
2479
2841
short_name='V'),
2480
Option('ignored', help='Print ignored files.'),
2481
Option('null',
2482
help='Write an ascii NUL (\\0) separator '
2483
'between files rather than a newline.'),
2484
Option('kind',
2842
Option('ignored', short_name='i',
2843
help='Print ignored files.'),
2844
Option('kind', short_name='k',
2485
2845
help='List entries of a particular kind: file, directory, symlink.',
2486
2846
type=unicode),
2847
'null',
2487
2848
'show-ids',
2849
'directory',
2488
2850
]
2489
2851
@display_command
2490
2852
def run(self, revision=None, verbose=False,
2491
2853
recursive=False, from_root=False,
2492
2854
unknown=False, versioned=False, ignored=False,
2493
null=False, kind=None, show_ids=False, path=None):
2855
null=False, kind=None, show_ids=False, path=None, directory=None):
2494
2856
2495
2857
if kind and kind not in ('file', 'directory', 'symlink'):
2496
raise errors.BzrCommandError('invalid kind specified')
2858
raise errors.BzrCommandError(gettext('invalid kind specified'))
2497
2859
2498
2860
if verbose and null:
2499
raise errors.BzrCommandError('Cannot set both --verbose and --null')
2861
raise errors.BzrCommandError(gettext('Cannot set both --verbose and --null'))
2500
2862
all = not (unknown or versioned or ignored)
2501
2863
2502
2864
selection = {'I':ignored, '?':unknown, 'V':versioned}
2505
2867
fs_path = '.'
2506
2868
else:
2507
2869
if from_root:
2508
raise errors.BzrCommandError('cannot specify both --from-root'
2509
' and PATH')
2870
raise errors.BzrCommandError(gettext('cannot specify both --from-root'
2871
' and PATH'))
2510
2872
fs_path = path
2511
tree, branch, relpath = bzrdir.BzrDir.open_containing_tree_or_branch(
2512
fs_path)
2873
tree, branch, relpath = \
2874
_open_directory_or_containing_tree_or_branch(fs_path, directory)
2513
2875
2514
2876
# Calculate the prefix to use
2515
2877
prefix = None
2528
2890
if view_files:
2529
2891
apply_view = True
2530
2892
view_str = views.view_display_str(view_files)
2531
note("Ignoring files outside view. View is %s" % view_str)
2893
note(gettext("Ignoring files outside view. View is %s") % view_str)
2532
2894
2533
tree.lock_read()
2534
self.add_cleanup(tree.unlock)
2895
self.add_cleanup(tree.lock_read().unlock)
2535
2896
for fp, fc, fkind, fid, entry in tree.list_files(include_root=False,
2536
2897
from_dir=relpath, recursive=recursive):
2537
2898
# Apply additional masking
2579
2940
2580
2941
2581
2942
class cmd_unknowns(Command):
2582
"""List unknown files.
2943
__doc__ = """List unknown files.
2583
2944
"""
2584
2945
2585
2946
hidden = True
2586
2947
_see_also = ['ls']
2948
takes_options = ['directory']
2587
2949
2588
2950
@display_command
2589
def run(self):
2590
for f in WorkingTree.open_containing(u'.')[0].unknowns():
2951
def run(self, directory=u'.'):
2952
for f in WorkingTree.open_containing(directory)[0].unknowns():
2591
2953
self.outf.write(osutils.quotefn(f) + '\n')
2592
2954
2593
2955
2594
2956
class cmd_ignore(Command):
2595
"""Ignore specified files or patterns.
2957
__doc__ = """Ignore specified files or patterns.
2596
2958
2597
2959
See ``bzr help patterns`` for details on the syntax of patterns.
2598
2960
2607
2969
using this command or directly by using an editor, be sure to commit
2608
2970
it.
2609
2971
2972
Bazaar also supports a global ignore file ~/.bazaar/ignore. On Windows
2973
the global ignore file can be found in the application data directory as
2974
C:\\Documents and Settings\\<user>\\Application Data\\Bazaar\\2.0\\ignore.
2975
Global ignores are not touched by this command. The global ignore file
2976
can be edited directly using an editor.
2977
2610
2978
Patterns prefixed with '!' are exceptions to ignore patterns and take
2611
2979
precedence over regular ignores. Such exceptions are used to specify
2612
2980
files that should be versioned which would otherwise be ignored.
2614
2982
Patterns prefixed with '!!' act as regular ignore patterns, but have
2615
2983
precedence over the '!' exception patterns.
2616
2984
2617
Note: ignore patterns containing shell wildcards must be quoted from
2618
the shell on Unix.
2985
:Notes:
2986
2987
* Ignore patterns containing shell wildcards must be quoted from
2988
the shell on Unix.
2989
2990
* Ignore patterns starting with "#" act as comments in the ignore file.
2991
To ignore patterns that begin with that character, use the "RE:" prefix.
2619
2992
2620
2993
:Examples:
2621
2994
Ignore the top level Makefile::
2630
3003
2631
3004
bzr ignore "!special.class"
2632
3005
3006
Ignore files whose name begins with the "#" character::
3007
3008
bzr ignore "RE:^#"
3009
2633
3010
Ignore .o files under the lib directory::
2634
3011
2635
3012
bzr ignore "lib/**/*.o"
2643
3020
bzr ignore "RE:(?!debian/).*"
2644
3021
2645
3022
Ignore everything except the "local" toplevel directory,
2646
but always ignore "*~" autosave files, even under local/::
3023
but always ignore autosave files ending in ~, even under local/::
2647
3024
2648
3025
bzr ignore "*"
2649
3026
bzr ignore "!./local"
2652
3029
2653
3030
_see_also = ['status', 'ignored', 'patterns']
2654
3031
takes_args = ['name_pattern*']
2655
takes_options = [
2656
Option('old-default-rules',
2657
help='Write out the ignore rules bzr < 0.9 always used.')
3032
takes_options = ['directory',
3033
Option('default-rules',
3034
help='Display the default ignore rules that bzr uses.')
2658
3035
]
2659
3036
2660
def run(self, name_pattern_list=None, old_default_rules=None):
3037
def run(self, name_pattern_list=None, default_rules=None,
3038
directory=u'.'):
2661
3039
from bzrlib import ignores
2662
if old_default_rules is not None:
2663
# dump the rules and exit
2664
for pattern in ignores.OLD_DEFAULTS:
2665
print pattern
3040
if default_rules is not None:
3041
# dump the default rules and exit
3042
for pattern in ignores.USER_DEFAULTS:
3043
self.outf.write("%s\n" % pattern)
2666
3044
return
2667
3045
if not name_pattern_list:
2668
raise errors.BzrCommandError("ignore requires at least one "
2669
"NAME_PATTERN or --old-default-rules")
3046
raise errors.BzrCommandError(gettext("ignore requires at least one "
3047
"NAME_PATTERN or --default-rules."))
2670
3048
name_pattern_list = [globbing.normalize_pattern(p)
2671
3049
for p in name_pattern_list]
3050
bad_patterns = ''
3051
bad_patterns_count = 0
3052
for p in name_pattern_list:
3053
if not globbing.Globster.is_pattern_valid(p):
3054
bad_patterns_count += 1
3055
bad_patterns += ('\n %s' % p)
3056
if bad_patterns:
3057
msg = (ngettext('Invalid ignore pattern found. %s',
3058
'Invalid ignore patterns found. %s',
3059
bad_patterns_count) % bad_patterns)
3060
ui.ui_factory.show_error(msg)
3061
raise errors.InvalidPattern('')
2672
3062
for name_pattern in name_pattern_list:
2673
3063
if (name_pattern[0] == '/' or
2674
3064
(len(name_pattern) > 1 and name_pattern[1] == ':')):
2675
raise errors.BzrCommandError(
2676
"NAME_PATTERN should not be an absolute path")
2677
tree, relpath = WorkingTree.open_containing(u'.')
3065
raise errors.BzrCommandError(gettext(
3066
"NAME_PATTERN should not be an absolute path"))
3067
tree, relpath = WorkingTree.open_containing(directory)
2678
3068
ignores.tree_ignores_add_patterns(tree, name_pattern_list)
2679
3069
ignored = globbing.Globster(name_pattern_list)
2680
3070
matches = []
2681
tree.lock_read()
3071
self.add_cleanup(tree.lock_read().unlock)
2682
3072
for entry in tree.list_files():
2683
3073
id = entry[3]
2684
3074
if id is not None:
2685
3075
filename = entry[0]
2686
3076
if ignored.match(filename):
2687
matches.append(filename.encode('utf-8'))
2688
tree.unlock()
3077
matches.append(filename)
2689
3078
if len(matches) > 0:
2690
print "Warning: the following files are version controlled and" \
2691
" match your ignore pattern:\n%s" \
2692
"\nThese files will continue to be version controlled" \
2693
" unless you 'bzr remove' them." % ("\n".join(matches),)
3079
self.outf.write(gettext("Warning: the following files are version "
3080
"controlled and match your ignore pattern:\n%s"
3081
"\nThese files will continue to be version controlled"
3082
" unless you 'bzr remove' them.\n") % ("\n".join(matches),))
2694
3083
2695
3084
2696
3085
class cmd_ignored(Command):
2697
"""List ignored files and the patterns that matched them.
3086
__doc__ = """List ignored files and the patterns that matched them.
2698
3087
2699
3088
List all the ignored files and the ignore pattern that caused the file to
2700
3089
be ignored.
2706
3095
2707
3096
encoding_type = 'replace'
2708
3097
_see_also = ['ignore', 'ls']
3098
takes_options = ['directory']
2709
3099
2710
3100
@display_command
2711
def run(self):
2712
tree = WorkingTree.open_containing(u'.')[0]
2713
tree.lock_read()
2714
self.add_cleanup(tree.unlock)
3101
def run(self, directory=u'.'):
3102
tree = WorkingTree.open_containing(directory)[0]
3103
self.add_cleanup(tree.lock_read().unlock)
2715
3104
for path, file_class, kind, file_id, entry in tree.list_files():
2716
3105
if file_class != 'I':
2717
3106
continue
2721
3110
2722
3111
2723
3112
class cmd_lookup_revision(Command):
2724
"""Lookup the revision-id from a revision-number
3113
__doc__ = """Lookup the revision-id from a revision-number
2725
3114
2726
3115
:Examples:
2727
3116
bzr lookup-revision 33
2728
3117
"""
2729
3118
hidden = True
2730
3119
takes_args = ['revno']
3120
takes_options = ['directory']
2731
3121
2732
3122
@display_command
2733
def run(self, revno):
3123
def run(self, revno, directory=u'.'):
2734
3124
try:
2735
3125
revno = int(revno)
2736
3126
except ValueError:
2737
raise errors.BzrCommandError("not a valid revision-number: %r" % revno)
2738
2739
print WorkingTree.open_containing(u'.')[0].branch.get_rev_id(revno)
3127
raise errors.BzrCommandError(gettext("not a valid revision-number: %r")
3128
% revno)
3129
revid = WorkingTree.open_containing(directory)[0].branch.get_rev_id(revno)
3130
self.outf.write("%s\n" % revid)
2740
3131
2741
3132
2742
3133
class cmd_export(Command):
2743
"""Export current or past revision to a destination directory or archive.
3134
__doc__ = """Export current or past revision to a destination directory or archive.
2744
3135
2745
3136
If no revision is specified this exports the last committed revision.
2746
3137
2767
3158
zip .zip
2768
3159
================= =========================
2769
3160
"""
3161
encoding = 'exact'
2770
3162
takes_args = ['dest', 'branch_or_subdir?']
2771
takes_options = [
3163
takes_options = ['directory',
2772
3164
Option('format',
2773
3165
help="Type of file to export to.",
2774
3166
type=unicode),
2778
3170
Option('root',
2779
3171
type=str,
2780
3172
help="Name of the root directory inside the exported file."),
3173
Option('per-file-timestamps',
3174
help='Set modification time of files to that of the last '
3175
'revision in which it was changed.'),
3176
Option('uncommitted',
3177
help='Export the working tree contents rather than that of the '
3178
'last revision.'),
2781
3179
]
2782
3180
def run(self, dest, branch_or_subdir=None, revision=None, format=None,
2783
root=None, filters=False):
3181
root=None, filters=False, per_file_timestamps=False, uncommitted=False,
3182
directory=u'.'):
2784
3183
from bzrlib.export import export
2785
3184
2786
3185
if branch_or_subdir is None:
2787
tree = WorkingTree.open_containing(u'.')[0]
2788
b = tree.branch
2789
subdir = None
3186
branch_or_subdir = directory
3187
3188
(tree, b, subdir) = controldir.ControlDir.open_containing_tree_or_branch(
3189
branch_or_subdir)
3190
if tree is not None:
3191
self.add_cleanup(tree.lock_read().unlock)
3192
3193
if uncommitted:
3194
if tree is None:
3195
raise errors.BzrCommandError(
3196
gettext("--uncommitted requires a working tree"))
3197
export_tree = tree
2790
3198
else:
2791
b, subdir = Branch.open_containing(branch_or_subdir)
2792
tree = None
2793
2794
rev_tree = _get_one_revision_tree('export', revision, branch=b, tree=tree)
3199
export_tree = _get_one_revision_tree('export', revision, branch=b, tree=tree)
2795
3200
try:
2796
export(rev_tree, dest, format, root, subdir, filtered=filters)
3201
export(export_tree, dest, format, root, subdir, filtered=filters,
3202
per_file_timestamps=per_file_timestamps)
2797
3203
except errors.NoSuchExportFormat, e:
2798
raise errors.BzrCommandError('Unsupported export format: %s' % e.format)
3204
raise errors.BzrCommandError(
3205
gettext('Unsupported export format: %s') % e.format)
2799
3206
2800
3207
2801
3208
class cmd_cat(Command):
2802
"""Write the contents of a file as of a given revision to standard output.
3209
__doc__ = """Write the contents of a file as of a given revision to standard output.
2803
3210
2804
3211
If no revision is nominated, the last revision is used.
2805
3212
2808
3215
"""
2809
3216
2810
3217
_see_also = ['ls']
2811
takes_options = [
3218
takes_options = ['directory',
2812
3219
Option('name-from-revision', help='The path name in the old tree.'),
2813
3220
Option('filters', help='Apply content filters to display the '
2814
3221
'convenience form.'),
2819
3226
2820
3227
@display_command
2821
3228
def run(self, filename, revision=None, name_from_revision=False,
2822
filters=False):
3229
filters=False, directory=None):
2823
3230
if revision is not None and len(revision) != 1:
2824
raise errors.BzrCommandError("bzr cat --revision takes exactly"
2825
" one revision specifier")
3231
raise errors.BzrCommandError(gettext("bzr cat --revision takes exactly"
3232
" one revision specifier"))
2826
3233
tree, branch, relpath = \
2827
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
2828
branch.lock_read()
2829
self.add_cleanup(branch.unlock)
3234
_open_directory_or_containing_tree_or_branch(filename, directory)
3235
self.add_cleanup(branch.lock_read().unlock)
2830
3236
return self._run(tree, branch, relpath, filename, revision,
2831
3237
name_from_revision, filters)
2832
3238
2835
3241
if tree is None:
2836
3242
tree = b.basis_tree()
2837
3243
rev_tree = _get_one_revision_tree('cat', revision, branch=b)
2838
rev_tree.lock_read()
2839
self.add_cleanup(rev_tree.unlock)
3244
self.add_cleanup(rev_tree.lock_read().unlock)
2840
3245
2841
3246
old_file_id = rev_tree.path2id(relpath)
2842
3247
3248
# TODO: Split out this code to something that generically finds the
3249
# best id for a path across one or more trees; it's like
3250
# find_ids_across_trees but restricted to find just one. -- mbp
3251
# 20110705.
2843
3252
if name_from_revision:
2844
3253
# Try in revision if requested
2845
3254
if old_file_id is None:
2846
raise errors.BzrCommandError(
2847
"%r is not present in revision %s" % (
3255
raise errors.BzrCommandError(gettext(
3256
"{0!r} is not present in revision {1}").format(
2848
3257
filename, rev_tree.get_revision_id()))
2849
3258
else:
2850
content = rev_tree.get_file_text(old_file_id)
3259
actual_file_id = old_file_id
2851
3260
else:
2852
3261
cur_file_id = tree.path2id(relpath)
2853
found = False
2854
if cur_file_id is not None:
2855
# Then try with the actual file id
2856
try:
2857
content = rev_tree.get_file_text(cur_file_id)
2858
found = True
2859
except errors.NoSuchId:
2860
# The actual file id didn't exist at that time
2861
pass
2862
if not found and old_file_id is not None:
2863
# Finally try with the old file id
2864
content = rev_tree.get_file_text(old_file_id)
2865
found = True
2866
if not found:
2867
# Can't be found anywhere
2868
raise errors.BzrCommandError(
2869
"%r is not present in revision %s" % (
3262
if cur_file_id is not None and rev_tree.has_id(cur_file_id):
3263
actual_file_id = cur_file_id
3264
elif old_file_id is not None:
3265
actual_file_id = old_file_id
3266
else:
3267
raise errors.BzrCommandError(gettext(
3268
"{0!r} is not present in revision {1}").format(
2870
3269
filename, rev_tree.get_revision_id()))
2871
3270
if filtered:
2872
from bzrlib.filters import (
2873
ContentFilterContext,
2874
filtered_output_bytes,
2875
)
2876
filters = rev_tree._content_filter_stack(relpath)
2877
chunks = content.splitlines(True)
2878
content = filtered_output_bytes(chunks, filters,
2879
ContentFilterContext(relpath, rev_tree))
2880
self.cleanup_now()
2881
self.outf.writelines(content)
3271
from bzrlib.filter_tree import ContentFilterTree
3272
filter_tree = ContentFilterTree(rev_tree,
3273
rev_tree._content_filter_stack)
3274
content = filter_tree.get_file_text(actual_file_id)
2882
3275
else:
2883
self.cleanup_now()
2884
self.outf.write(content)
3276
content = rev_tree.get_file_text(actual_file_id)
3277
self.cleanup_now()
3278
self.outf.write(content)
2885
3279
2886
3280
2887
3281
class cmd_local_time_offset(Command):
2888
"""Show the offset in seconds from GMT to local time."""
3282
__doc__ = """Show the offset in seconds from GMT to local time."""
2889
3283
hidden = True
2890
3284
@display_command
2891
3285
def run(self):
2892
print osutils.local_time_offset()
3286
self.outf.write("%s\n" % osutils.local_time_offset())
2893
3287
2894
3288
2895
3289
2896
3290
class cmd_commit(Command):
2897
"""Commit changes into a new revision.
3291
__doc__ = """Commit changes into a new revision.
2898
3292
2899
3293
An explanatory message needs to be given for each commit. This is
2900
3294
often done by using the --message option (getting the message from the
2948
3342
to trigger updates to external systems like bug trackers. The --fixes
2949
3343
option can be used to record the association between a revision and
2950
3344
one or more bugs. See ``bzr help bugs`` for details.
2951
2952
A selective commit may fail in some cases where the committed
2953
tree would be invalid. Consider::
2954
2955
bzr init foo
2956
mkdir foo/bar
2957
bzr add foo/bar
2958
bzr commit foo -m "committing foo"
2959
bzr mv foo/bar foo/baz
2960
mkdir foo/bar
2961
bzr add foo/bar
2962
bzr commit foo/bar -m "committing bar but not baz"
2963
2964
In the example above, the last commit will fail by design. This gives
2965
the user the opportunity to decide whether they want to commit the
2966
rename at the same time, separately first, or not at all. (As a general
2967
rule, when in doubt, Bazaar has a policy of Doing the Safe Thing.)
2968
3345
"""
2969
# TODO: Run hooks on tree to-be-committed, and after commit.
2970
2971
# TODO: Strict commit that fails if there are deleted files.
2972
# (what does "deleted files" mean ??)
2973
2974
# TODO: Give better message for -s, --summary, used by tla people
2975
2976
# XXX: verbose currently does nothing
2977
3346
2978
3347
_see_also = ['add', 'bugs', 'hooks', 'uncommit']
2979
3348
takes_args = ['selected*']
3008
3377
"the master branch until a normal commit "
3009
3378
"is performed."
3010
3379
),
3011
Option('show-diff',
3380
Option('show-diff', short_name='p',
3012
3381
help='When no message is supplied, show the diff along'
3013
3382
' with the status summary in the message editor.'),
3383
Option('lossy',
3384
help='When committing to a foreign version control '
3385
'system do not push data that can not be natively '
3386
'represented.'),
3014
3387
]
3015
3388
aliases = ['ci', 'checkin']
3016
3389
3017
3390
def _iter_bug_fix_urls(self, fixes, branch):
3391
default_bugtracker = None
3018
3392
# Configure the properties for bug fixing attributes.
3019
3393
for fixed_bug in fixes:
3020
3394
tokens = fixed_bug.split(':')
3021
if len(tokens) != 2:
3022
raise errors.BzrCommandError(
3395
if len(tokens) == 1:
3396
if default_bugtracker is None:
3397
branch_config = branch.get_config()
3398
default_bugtracker = branch_config.get_user_option(
3399
"bugtracker")
3400
if default_bugtracker is None:
3401
raise errors.BzrCommandError(gettext(
3402
"No tracker specified for bug %s. Use the form "
3403
"'tracker:id' or specify a default bug tracker "
3404
"using the `bugtracker` option.\nSee "
3405
"\"bzr help bugs\" for more information on this "
3406
"feature. Commit refused.") % fixed_bug)
3407
tag = default_bugtracker
3408
bug_id = tokens[0]
3409
elif len(tokens) != 2:
3410
raise errors.BzrCommandError(gettext(
3023
3411
"Invalid bug %s. Must be in the form of 'tracker:id'. "
3024
3412
"See \"bzr help bugs\" for more information on this "
3025
"feature.\nCommit refused." % fixed_bug)
3026
tag, bug_id = tokens
3413
"feature.\nCommit refused.") % fixed_bug)
3414
else:
3415
tag, bug_id = tokens
3027
3416
try:
3028
3417
yield bugtracker.get_bug_url(tag, branch, bug_id)
3029
3418
except errors.UnknownBugTrackerAbbreviation:
3030
raise errors.BzrCommandError(
3031
'Unrecognized bug %s. Commit refused.' % fixed_bug)
3419
raise errors.BzrCommandError(gettext(
3420
'Unrecognized bug %s. Commit refused.') % fixed_bug)
3032
3421
except errors.MalformedBugIdentifier, e:
3033
raise errors.BzrCommandError(
3034
"%s\nCommit refused." % (str(e),))
3422
raise errors.BzrCommandError(gettext(
3423
"%s\nCommit refused.") % (str(e),))
3035
3424
3036
3425
def run(self, message=None, file=None, verbose=False, selected_list=None,
3037
3426
unchanged=False, strict=False, local=False, fixes=None,
3038
author=None, show_diff=False, exclude=None, commit_time=None):
3427
author=None, show_diff=False, exclude=None, commit_time=None,
3428
lossy=False):
3039
3429
from bzrlib.errors import (
3040
3430
PointlessCommit,
3041
3431
ConflictsInTree,
3044
3434
from bzrlib.msgeditor import (
3045
3435
edit_commit_message_encoded,
3046
3436
generate_commit_message_template,
3047
make_commit_message_template_encoded
3437
make_commit_message_template_encoded,
3438
set_commit_message,
3048
3439
)
3049
3440
3050
3441
commit_stamp = offset = None
3052
3443
try:
3053
3444
commit_stamp, offset = timestamp.parse_patch_date(commit_time)
3054
3445
except ValueError, e:
3055
raise errors.BzrCommandError(
3056
"Could not parse --commit-time: " + str(e))
3057
3058
# TODO: Need a blackbox test for invoking the external editor; may be
3059
# slightly problematic to run this cross-platform.
3060
3061
# TODO: do more checks that the commit will succeed before
3062
# spending the user's valuable time typing a commit message.
3446
raise errors.BzrCommandError(gettext(
3447
"Could not parse --commit-time: " + str(e)))
3063
3448
3064
3449
properties = {}
3065
3450
3066
tree, selected_list = tree_files(selected_list)
3451
tree, selected_list = WorkingTree.open_containing_paths(selected_list)
3067
3452
if selected_list == ['']:
3068
3453
# workaround - commit of root of tree should be exactly the same
3069
3454
# as just default commit in that tree, and succeed even though
3094
3479
'(use --file "%(f)s" to take commit message from that file)'
3095
3480
% { 'f': message })
3096
3481
ui.ui_factory.show_warning(warning_msg)
3482
if '\r' in message:
3483
message = message.replace('\r\n', '\n')
3484
message = message.replace('\r', '\n')
3485
if file:
3486
raise errors.BzrCommandError(gettext(
3487
"please specify either --message or --file"))
3097
3488
3098
3489
def get_message(commit_obj):
3099
3490
"""Callback to get commit message"""
3100
my_message = message
3101
if my_message is not None and '\r' in my_message:
3102
my_message = my_message.replace('\r\n', '\n')
3103
my_message = my_message.replace('\r', '\n')
3104
if my_message is None and not file:
3105
t = make_commit_message_template_encoded(tree,
3491
if file:
3492
f = open(file)
3493
try:
3494
my_message = f.read().decode(osutils.get_user_encoding())
3495
finally:
3496
f.close()
3497
elif message is not None:
3498
my_message = message
3499
else:
3500
# No message supplied: make one up.
3501
# text is the status of the tree
3502
text = make_commit_message_template_encoded(tree,
3106
3503
selected_list, diff=show_diff,
3107
3504
output_encoding=osutils.get_user_encoding())
3108
start_message = generate_commit_message_template(commit_obj)
3109
my_message = edit_commit_message_encoded(t,
3110
start_message=start_message)
3111
if my_message is None:
3112
raise errors.BzrCommandError("please specify a commit"
3113
" message with either --message or --file")
3114
elif my_message and file:
3115
raise errors.BzrCommandError(
3116
"please specify either --message or --file")
3117
if file:
3118
my_message = codecs.open(file, 'rt',
3119
osutils.get_user_encoding()).read()
3120
if my_message == "":
3121
raise errors.BzrCommandError("empty commit message specified")
3505
# start_message is the template generated from hooks
3506
# XXX: Warning - looks like hooks return unicode,
3507
# make_commit_message_template_encoded returns user encoding.
3508
# We probably want to be using edit_commit_message instead to
3509
# avoid this.
3510
my_message = set_commit_message(commit_obj)
3511
if my_message is None:
3512
start_message = generate_commit_message_template(commit_obj)
3513
my_message = edit_commit_message_encoded(text,
3514
start_message=start_message)
3515
if my_message is None:
3516
raise errors.BzrCommandError(gettext("please specify a commit"
3517
" message with either --message or --file"))
3518
if my_message == "":
3519
raise errors.BzrCommandError(gettext("Empty commit message specified."
3520
" Please specify a commit message with either"
3521
" --message or --file or leave a blank message"
3522
" with --message \"\"."))
3122
3523
return my_message
3123
3524
3124
3525
# The API permits a commit with a filter of [] to mean 'select nothing'
3132
3533
reporter=None, verbose=verbose, revprops=properties,
3133
3534
authors=author, timestamp=commit_stamp,
3134
3535
timezone=offset,
3135
exclude=safe_relpath_files(tree, exclude))
3536
exclude=tree.safe_relpath_files(exclude),
3537
lossy=lossy)
3136
3538
except PointlessCommit:
3137
# FIXME: This should really happen before the file is read in;
3138
# perhaps prepare the commit; get the message; then actually commit
3139
raise errors.BzrCommandError("No changes to commit."
3140
" Use --unchanged to commit anyhow.")
3539
raise errors.BzrCommandError(gettext("No changes to commit."
3540
" Please 'bzr add' the files you want to commit, or use"
3541
" --unchanged to force an empty commit."))
3141
3542
except ConflictsInTree:
3142
raise errors.BzrCommandError('Conflicts detected in working '
3543
raise errors.BzrCommandError(gettext('Conflicts detected in working '
3143
3544
'tree. Use "bzr conflicts" to list, "bzr resolve FILE" to'
3144
' resolve.')
3545
' resolve.'))
3145
3546
except StrictCommitFailed:
3146
raise errors.BzrCommandError("Commit refused because there are"
3147
" unknown files in the working tree.")
3547
raise errors.BzrCommandError(gettext("Commit refused because there are"
3548
" unknown files in the working tree."))
3148
3549
except errors.BoundBranchOutOfDate, e:
3149
raise errors.BzrCommandError(str(e) + "\n"
3150
'To commit to master branch, run update and then commit.\n'
3151
'You can also pass --local to commit to continue working '
3152
'disconnected.')
3550
e.extra_help = (gettext("\n"
3551
'To commit to master branch, run update and then commit.\n'
3552
'You can also pass --local to commit to continue working '
3553
'disconnected.'))
3554
raise
3153
3555
3154
3556
3155
3557
class cmd_check(Command):
3156
"""Validate working tree structure, branch consistency and repository history.
3558
__doc__ = """Validate working tree structure, branch consistency and repository history.
3157
3559
3158
3560
This command checks various invariants about branch and repository storage
3159
3561
to detect data corruption or bzr bugs.
3223
3625
3224
3626
3225
3627
class cmd_upgrade(Command):
3226
"""Upgrade branch storage to current format.
3227
3228
The check command or bzr developers may sometimes advise you to run
3229
this command. When the default format has changed you may also be warned
3230
during other operations to upgrade.
3628
__doc__ = """Upgrade a repository, branch or working tree to a newer format.
3629
3630
When the default format has changed after a major new release of
3631
Bazaar, you may be informed during certain operations that you
3632
should upgrade. Upgrading to a newer format may improve performance
3633
or make new features available. It may however limit interoperability
3634
with older repositories or with older versions of Bazaar.
3635
3636
If you wish to upgrade to a particular format rather than the
3637
current default, that can be specified using the --format option.
3638
As a consequence, you can use the upgrade command this way to
3639
"downgrade" to an earlier format, though some conversions are
3640
a one way process (e.g. changing from the 1.x default to the
3641
2.x default) so downgrading is not always possible.
3642
3643
A backup.bzr.~#~ directory is created at the start of the conversion
3644
process (where # is a number). By default, this is left there on
3645
completion. If the conversion fails, delete the new .bzr directory
3646
and rename this one back in its place. Use the --clean option to ask
3647
for the backup.bzr directory to be removed on successful conversion.
3648
Alternatively, you can delete it by hand if everything looks good
3649
afterwards.
3650
3651
If the location given is a shared repository, dependent branches
3652
are also converted provided the repository converts successfully.
3653
If the conversion of a branch fails, remaining branches are still
3654
tried.
3655
3656
For more information on upgrades, see the Bazaar Upgrade Guide,
3657
http://doc.bazaar.canonical.com/latest/en/upgrade-guide/.
3231
3658
"""
3232
3659
3233
_see_also = ['check']
3660
_see_also = ['check', 'reconcile', 'formats']
3234
3661
takes_args = ['url?']
3235
3662
takes_options = [
3236
RegistryOption('format',
3237
help='Upgrade to a specific format. See "bzr help'
3238
' formats" for details.',
3239
lazy_registry=('bzrlib.bzrdir', 'format_registry'),
3240
converter=lambda name: bzrdir.format_registry.make_bzrdir(name),
3241
value_switches=True, title='Branch format'),
3242
]
3663
RegistryOption('format',
3664
help='Upgrade to a specific format. See "bzr help'
3665
' formats" for details.',
3666
lazy_registry=('bzrlib.controldir', 'format_registry'),
3667
converter=lambda name: controldir.format_registry.make_bzrdir(name),
3668
value_switches=True, title='Branch format'),
3669
Option('clean',
3670
help='Remove the backup.bzr directory if successful.'),
3671
Option('dry-run',
3672
help="Show what would be done, but don't actually do anything."),
3673
]
3243
3674
3244
def run(self, url='.', format=None):
3675
def run(self, url='.', format=None, clean=False, dry_run=False):
3245
3676
from bzrlib.upgrade import upgrade
3246
upgrade(url, format)
3677
exceptions = upgrade(url, format, clean_up=clean, dry_run=dry_run)
3678
if exceptions:
3679
if len(exceptions) == 1:
3680
# Compatibility with historical behavior
3681
raise exceptions[0]
3682
else:
3683
return 3
3247
3684
3248
3685
3249
3686
class cmd_whoami(Command):
3250
"""Show or set bzr user id.
3687
__doc__ = """Show or set bzr user id.
3251
3688
3252
3689
:Examples:
3253
3690
Show the email of the current user::
3258
3695
3259
3696
bzr whoami "Frank Chu <fchu@example.com>"
3260
3697
"""
3261
takes_options = [ Option('email',
3698
takes_options = [ 'directory',
3699
Option('email',
3262
3700
help='Display email address only.'),
3263
3701
Option('branch',
3264
3702
help='Set identity for the current branch instead of '
3268
3706
encoding_type = 'replace'
3269
3707
3270
3708
@display_command
3271
def run(self, email=False, branch=False, name=None):
3709
def run(self, email=False, branch=False, name=None, directory=None):
3272
3710
if name is None:
3273
# use branch if we're inside one; otherwise global config
3274
try:
3275
c = Branch.open_containing('.')[0].get_config()
3276
except errors.NotBranchError:
3277
c = config.GlobalConfig()
3711
if directory is None:
3712
# use branch if we're inside one; otherwise global config
3713
try:
3714
c = Branch.open_containing(u'.')[0].get_config_stack()
3715
except errors.NotBranchError:
3716
c = _mod_config.GlobalStack()
3717
else:
3718
c = Branch.open(directory).get_config_stack()
3719
identity = c.get('email')
3278
3720
if email:
3279
self.outf.write(c.user_email() + '\n')
3721
self.outf.write(_mod_config.extract_email_address(identity)
3722
+ '\n')
3280
3723
else:
3281
self.outf.write(c.username() + '\n')
3724
self.outf.write(identity + '\n')
3282
3725
return
3283
3726
3727
if email:
3728
raise errors.BzrCommandError(gettext("--email can only be used to display existing "
3729
"identity"))
3730
3284
3731
# display a warning if an email address isn't included in the given name.
3285
3732
try:
3286
config.extract_email_address(name)
3733
_mod_config.extract_email_address(name)
3287
3734
except errors.NoEmailInUsername, e:
3288
3735
warning('"%s" does not seem to contain an email address. '
3289
3736
'This is allowed, but not recommended.', name)
3290
3737
3291
3738
# use global config unless --branch given
3292
3739
if branch:
3293
c = Branch.open_containing('.')[0].get_config()
3740
if directory is None:
3741
c = Branch.open_containing(u'.')[0].get_config_stack()
3742
else:
3743
c = Branch.open(directory).get_config_stack()
3294
3744
else:
3295
c = config.GlobalConfig()
3296
c.set_user_option('email', name)
3745
c = _mod_config.GlobalStack()
3746
c.set('email', name)
3297
3747
3298
3748
3299
3749
class cmd_nick(Command):
3300
"""Print or set the branch nickname.
3750
__doc__ = """Print or set the branch nickname.
3301
3751
3302
3752
If unset, the tree root directory name is used as the nickname.
3303
3753
To print the current nickname, execute with no argument.
3308
3758
3309
3759
_see_also = ['info']
3310
3760
takes_args = ['nickname?']
3311
def run(self, nickname=None):
3312
branch = Branch.open_containing(u'.')[0]
3761
takes_options = ['directory']
3762
def run(self, nickname=None, directory=u'.'):
3763
branch = Branch.open_containing(directory)[0]
3313
3764
if nickname is None:
3314
3765
self.printme(branch)
3315
3766
else:
3317
3768
3318
3769
@display_command
3319
3770
def printme(self, branch):
3320
print branch.nick
3771
self.outf.write('%s\n' % branch.nick)
3321
3772
3322
3773
3323
3774
class cmd_alias(Command):
3324
"""Set/unset and display aliases.
3775
__doc__ = """Set/unset and display aliases.
3325
3776
3326
3777
:Examples:
3327
3778
Show the current aliases::
3360
3811
3361
3812
def remove_alias(self, alias_name):
3362
3813
if alias_name is None:
3363
raise errors.BzrCommandError(
3364
'bzr alias --remove expects an alias to remove.')
3814
raise errors.BzrCommandError(gettext(
3815
'bzr alias --remove expects an alias to remove.'))
3365
3816
# If alias is not found, print something like:
3366
3817
# unalias: foo: not found
3367
c = config.GlobalConfig()
3818
c = _mod_config.GlobalConfig()
3368
3819
c.unset_alias(alias_name)
3369
3820
3370
3821
@display_command
3371
3822
def print_aliases(self):
3372
3823
"""Print out the defined aliases in a similar format to bash."""
3373
aliases = config.GlobalConfig().get_aliases()
3824
aliases = _mod_config.GlobalConfig().get_aliases()
3374
3825
for key, value in sorted(aliases.iteritems()):
3375
3826
self.outf.write('bzr alias %s="%s"\n' % (key, value))
3376
3827
3386
3837
3387
3838
def set_alias(self, alias_name, alias_command):
3388
3839
"""Save the alias in the global config."""
3389
c = config.GlobalConfig()
3840
c = _mod_config.GlobalConfig()
3390
3841
c.set_alias(alias_name, alias_command)
3391
3842
3392
3843
3393
3844
class cmd_selftest(Command):
3394
"""Run internal test suite.
3845
__doc__ = """Run internal test suite.
3395
3846
3396
3847
If arguments are given, they are regular expressions that say which tests
3397
3848
should run. Tests matching any expression are run, and other tests are
3427
3878
If you set BZR_TEST_PDB=1 when running selftest, failing tests will drop
3428
3879
into a pdb postmortem session.
3429
3880
3881
The --coverage=DIRNAME global option produces a report with covered code
3882
indicated.
3883
3430
3884
:Examples:
3431
3885
Run only tests relating to 'ignore'::
3432
3886
3441
3895
def get_transport_type(typestring):
3442
3896
"""Parse and return a transport specifier."""
3443
3897
if typestring == "sftp":
3444
from bzrlib.transport.sftp import SFTPAbsoluteServer
3445
return SFTPAbsoluteServer
3446
if typestring == "memory":
3447
from bzrlib.transport.memory import MemoryServer
3448
return MemoryServer
3449
if typestring == "fakenfs":
3450
from bzrlib.transport.fakenfs import FakeNFSServer
3451
return FakeNFSServer
3898
from bzrlib.tests import stub_sftp
3899
return stub_sftp.SFTPAbsoluteServer
3900
elif typestring == "memory":
3901
from bzrlib.tests import test_server
3902
return memory.MemoryServer
3903
elif typestring == "fakenfs":
3904
from bzrlib.tests import test_server
3905
return test_server.FakeNFSServer
3452
3906
msg = "No known transport type %s. Supported types are: sftp\n" %\
3453
3907
(typestring)
3454
3908
raise errors.BzrCommandError(msg)
3465
3919
'throughout the test suite.',
3466
3920
type=get_transport_type),
3467
3921
Option('benchmark',
3468
help='Run the benchmarks rather than selftests.'),
3922
help='Run the benchmarks rather than selftests.',
3923
hidden=True),
3469
3924
Option('lsprof-timed',
3470
3925
help='Generate lsprof output for benchmarked'
3471
3926
' sections of code.'),
3472
3927
Option('lsprof-tests',
3473
3928
help='Generate lsprof output for each test.'),
3474
Option('cache-dir', type=str,
3475
help='Cache intermediate benchmark output in this '
3476
'directory.'),
3477
3929
Option('first',
3478
3930
help='Run all tests, but run specified tests first.',
3479
3931
short_name='f',
3488
3940
Option('randomize', type=str, argname="SEED",
3489
3941
help='Randomize the order of tests using the given'
3490
3942
' seed or "now" for the current time.'),
3491
Option('exclude', type=str, argname="PATTERN",
3492
short_name='x',
3493
help='Exclude tests that match this regular'
3494
' expression.'),
3943
ListOption('exclude', type=str, argname="PATTERN",
3944
short_name='x',
3945
help='Exclude tests that match this regular'
3946
' expression.'),
3495
3947
Option('subunit',
3496
3948
help='Output test progress via subunit.'),
3497
3949
Option('strict', help='Fail on missing dependencies or '
3504
3956
param_name='starting_with', short_name='s',
3505
3957
help=
3506
3958
'Load only the tests starting with TESTID.'),
3959
Option('sync',
3960
help="By default we disable fsync and fdatasync"
3961
" while running the test suite.")
3507
3962
]
3508
3963
encoding_type = 'replace'
3509
3964
3513
3968
3514
3969
def run(self, testspecs_list=None, verbose=False, one=False,
3515
3970
transport=None, benchmark=None,
3516
lsprof_timed=None, cache_dir=None,
3971
lsprof_timed=None,
3517
3972
first=False, list_only=False,
3518
3973
randomize=None, exclude=None, strict=False,
3519
3974
load_list=None, debugflag=None, starting_with=None, subunit=False,
3520
parallel=None, lsprof_tests=False):
3521
from bzrlib.tests import selftest
3522
import bzrlib.benchmarks as benchmarks
3523
from bzrlib.benchmarks import tree_creator
3524
3525
# Make deprecation warnings visible, unless -Werror is set
3526
symbol_versioning.activate_deprecation_warnings(override=False)
3527
3528
if cache_dir is not None:
3529
tree_creator.TreeCreator.CACHE_ROOT = osutils.abspath(cache_dir)
3975
parallel=None, lsprof_tests=False,
3976
sync=False):
3977
from bzrlib import tests
3978
3530
3979
if testspecs_list is not None:
3531
3980
pattern = '|'.join(testspecs_list)
3532
3981
else:
3535
3984
try:
3536
3985
from bzrlib.tests import SubUnitBzrRunner
3537
3986
except ImportError:
3538
raise errors.BzrCommandError("subunit not available. subunit "
3539
"needs to be installed to use --subunit.")
3987
raise errors.BzrCommandError(gettext("subunit not available. subunit "
3988
"needs to be installed to use --subunit."))
3540
3989
self.additional_selftest_args['runner_class'] = SubUnitBzrRunner
3990
# On Windows, disable automatic conversion of '\n' to '\r\n' in
3991
# stdout, which would corrupt the subunit stream.
3992
# FIXME: This has been fixed in subunit trunk (>0.0.5) so the
3993
# following code can be deleted when it's sufficiently deployed
3994
# -- vila/mgz 20100514
3995
if (sys.platform == "win32"
3996
and getattr(sys.stdout, 'fileno', None) is not None):
3997
import msvcrt
3998
msvcrt.setmode(sys.stdout.fileno(), os.O_BINARY)
3541
3999
if parallel:
3542
4000
self.additional_selftest_args.setdefault(
3543
4001
'suite_decorators', []).append(parallel)
3544
4002
if benchmark:
3545
test_suite_factory = benchmarks.test_suite
3546
# Unless user explicitly asks for quiet, be verbose in benchmarks
3547
verbose = not is_quiet()
3548
# TODO: should possibly lock the history file...
3549
benchfile = open(".perf_history", "at", buffering=1)
3550
self.add_cleanup(benchfile.close)
4003
raise errors.BzrCommandError(gettext(
4004
"--benchmark is no longer supported from bzr 2.2; "
4005
"use bzr-usertest instead"))
4006
test_suite_factory = None
4007
if not exclude:
4008
exclude_pattern = None
3551
4009
else:
3552
test_suite_factory = None
3553
benchfile = None
4010
exclude_pattern = '(' + '|'.join(exclude) + ')'
4011
if not sync:
4012
self._disable_fsync()
3554
4013
selftest_kwargs = {"verbose": verbose,
3555
4014
"pattern": pattern,
3556
4015
"stop_on_failure": one,
3558
4017
"test_suite_factory": test_suite_factory,
3559
4018
"lsprof_timed": lsprof_timed,
3560
4019
"lsprof_tests": lsprof_tests,
3561
"bench_history": benchfile,
3562
4020
"matching_tests_first": first,
3563
4021
"list_only": list_only,
3564
4022
"random_seed": randomize,
3565
"exclude_pattern": exclude,
4023
"exclude_pattern": exclude_pattern,
3566
4024
"strict": strict,
3567
4025
"load_list": load_list,
3568
4026
"debug_flags": debugflag,
3569
4027
"starting_with": starting_with
3570
4028
}
3571
4029
selftest_kwargs.update(self.additional_selftest_args)
3572
result = selftest(**selftest_kwargs)
4030
4031
# Make deprecation warnings visible, unless -Werror is set
4032
cleanup = symbol_versioning.activate_deprecation_warnings(
4033
override=False)
4034
try:
4035
result = tests.selftest(**selftest_kwargs)
4036
finally:
4037
cleanup()
3573
4038
return int(not result)
3574
4039
4040
def _disable_fsync(self):
4041
"""Change the 'os' functionality to not synchronize."""
4042
self._orig_fsync = getattr(os, 'fsync', None)
4043
if self._orig_fsync is not None:
4044
os.fsync = lambda filedes: None
4045
self._orig_fdatasync = getattr(os, 'fdatasync', None)
4046
if self._orig_fdatasync is not None:
4047
os.fdatasync = lambda filedes: None
4048
3575
4049
3576
4050
class cmd_version(Command):
3577
"""Show version of bzr."""
4051
__doc__ = """Show version of bzr."""
3578
4052
3579
4053
encoding_type = 'replace'
3580
4054
takes_options = [
3591
4065
3592
4066
3593
4067
class cmd_rocks(Command):
3594
"""Statement of optimism."""
4068
__doc__ = """Statement of optimism."""
3595
4069
3596
4070
hidden = True
3597
4071
3598
4072
@display_command
3599
4073
def run(self):
3600
print "It sure does!"
4074
self.outf.write(gettext("It sure does!\n"))
3601
4075
3602
4076
3603
4077
class cmd_find_merge_base(Command):
3604
"""Find and print a base revision for merging two branches."""
4078
__doc__ = """Find and print a base revision for merging two branches."""
3605
4079
# TODO: Options to specify revisions on either side, as if
3606
4080
# merging only part of the history.
3607
4081
takes_args = ['branch', 'other']
3613
4087
3614
4088
branch1 = Branch.open_containing(branch)[0]
3615
4089
branch2 = Branch.open_containing(other)[0]
3616
branch1.lock_read()
3617
self.add_cleanup(branch1.unlock)
3618
branch2.lock_read()
3619
self.add_cleanup(branch2.unlock)
4090
self.add_cleanup(branch1.lock_read().unlock)
4091
self.add_cleanup(branch2.lock_read().unlock)
3620
4092
last1 = ensure_null(branch1.last_revision())
3621
4093
last2 = ensure_null(branch2.last_revision())
3622
4094
3623
4095
graph = branch1.repository.get_graph(branch2.repository)
3624
4096
base_rev_id = graph.find_unique_lca(last1, last2)
3625
4097
3626
print 'merge base is revision %s' % base_rev_id
4098
self.outf.write(gettext('merge base is revision %s\n') % base_rev_id)
3627
4099
3628
4100
3629
4101
class cmd_merge(Command):
3630
"""Perform a three-way merge.
4102
__doc__ = """Perform a three-way merge.
3631
4103
3632
4104
The source of the merge can be specified either in the form of a branch,
3633
4105
or in the form of a path to a file containing a merge directive generated
3634
4106
with bzr send. If neither is specified, the default is the upstream branch
3635
or the branch most recently merged using --remember.
3636
3637
When merging a branch, by default the tip will be merged. To pick a different
3638
revision, pass --revision. If you specify two values, the first will be used as
3639
BASE and the second one as OTHER. Merging individual revisions, or a subset of
3640
available revisions, like this is commonly referred to as "cherrypicking".
3641
3642
Revision numbers are always relative to the branch being merged.
3643
3644
By default, bzr will try to merge in all new work from the other
3645
branch, automatically determining an appropriate base. If this
3646
fails, you may need to give an explicit base.
4107
or the branch most recently merged using --remember. The source of the
4108
merge may also be specified in the form of a path to a file in another
4109
branch: in this case, only the modifications to that file are merged into
4110
the current working tree.
4111
4112
When merging from a branch, by default bzr will try to merge in all new
4113
work from the other branch, automatically determining an appropriate base
4114
revision. If this fails, you may need to give an explicit base.
4115
4116
To pick a different ending revision, pass "--revision OTHER". bzr will
4117
try to merge in all new work up to and including revision OTHER.
4118
4119
If you specify two values, "--revision BASE..OTHER", only revisions BASE
4120
through OTHER, excluding BASE but including OTHER, will be merged. If this
4121
causes some revisions to be skipped, i.e. if the destination branch does
4122
not already contain revision BASE, such a merge is commonly referred to as
4123
a "cherrypick". Unlike a normal merge, Bazaar does not currently track
4124
cherrypicks. The changes look like a normal commit, and the history of the
4125
changes from the other branch is not stored in the commit.
4126
4127
Revision numbers are always relative to the source branch.
3647
4128
3648
4129
Merge will do its best to combine the changes in two branches, but there
3649
4130
are some kinds of problems only a human can fix. When it encounters those,
3652
4133
3653
4134
Use bzr resolve when you have fixed a problem. See also bzr conflicts.
3654
4135
3655
If there is no default branch set, the first merge will set it. After
3656
that, you can omit the branch to use the default. To change the
3657
default, use --remember. The value will only be saved if the remote
3658
location can be accessed.
4136
If there is no default branch set, the first merge will set it (use
4137
--no-remember to avoid setting it). After that, you can omit the branch
4138
to use the default. To change the default, use --remember. The value will
4139
only be saved if the remote location can be accessed.
3659
4140
3660
4141
The results of the merge are placed into the destination working
3661
4142
directory, where they can be reviewed (with bzr diff), tested, and then
3662
4143
committed to record the result of the merge.
3663
4144
3664
4145
merge refuses to run if there are any uncommitted changes, unless
3665
--force is given. The --force option can also be used to create a
4146
--force is given. If --force is given, then the changes from the source
4147
will be merged with the current working tree, including any uncommitted
4148
changes in the tree. The --force option can also be used to create a
3666
4149
merge revision which has more than two parents.
3667
4150
3668
4151
If one would like to merge changes from the working tree of the other
3673
4156
you to apply each diff hunk and file change, similar to "shelve".
3674
4157
3675
4158
:Examples:
3676
To merge the latest revision from bzr.dev::
4159
To merge all new revisions from bzr.dev::
3677
4160
3678
4161
bzr merge ../bzr.dev
3679
4162
3716
4199
' completely merged into the source, pull from the'
3717
4200
' source rather than merging. When this happens,'
3718
4201
' you do not need to commit the result.'),
3719
Option('directory',
4202
custom_help('directory',
3720
4203
help='Branch to merge into, '
3721
'rather than the one containing the working directory.',
3722
short_name='d',
3723
type=unicode,
3724
),
4204
'rather than the one containing the working directory.'),
3725
4205
Option('preview', help='Instead of merging, show a diff of the'
3726
4206
' merge.'),
3727
4207
Option('interactive', help='Select changes interactively.',
3729
4209
]
3730
4210
3731
4211
def run(self, location=None, revision=None, force=False,
3732
merge_type=None, show_base=False, reprocess=None, remember=False,
4212
merge_type=None, show_base=False, reprocess=None, remember=None,
3733
4213
uncommitted=False, pull=False,
3734
4214
directory=None,
3735
4215
preview=False,
3743
4223
merger = None
3744
4224
allow_pending = True
3745
4225
verified = 'inapplicable'
4226
3746
4227
tree = WorkingTree.open_containing(directory)[0]
4228
if tree.branch.revno() == 0:
4229
raise errors.BzrCommandError(gettext('Merging into empty branches not currently supported, '
4230
'https://bugs.launchpad.net/bzr/+bug/308562'))
3747
4231
3748
4232
try:
3749
4233
basis_tree = tree.revision_tree(tree.last_revision())
3760
4244
unversioned_filter=tree.is_ignored, view_info=view_info)
3761
4245
pb = ui.ui_factory.nested_progress_bar()
3762
4246
self.add_cleanup(pb.finished)
3763
tree.lock_write()
3764
self.add_cleanup(tree.unlock)
4247
self.add_cleanup(tree.lock_write().unlock)
3765
4248
if location is not None:
3766
4249
try:
3767
4250
mergeable = bundle.read_mergeable_from_url(location,
3770
4253
mergeable = None
3771
4254
else:
3772
4255
if uncommitted:
3773
raise errors.BzrCommandError('Cannot use --uncommitted'
3774
' with bundles or merge directives.')
4256
raise errors.BzrCommandError(gettext('Cannot use --uncommitted'
4257
' with bundles or merge directives.'))
3775
4258
3776
4259
if revision is not None:
3777
raise errors.BzrCommandError(
3778
'Cannot use -r with merge directives or bundles')
4260
raise errors.BzrCommandError(gettext(
4261
'Cannot use -r with merge directives or bundles'))
3779
4262
merger, verified = _mod_merge.Merger.from_mergeable(tree,
3780
mergeable, pb)
4263
mergeable, None)
3781
4264
3782
4265
if merger is None and uncommitted:
3783
4266
if revision is not None and len(revision) > 0:
3784
raise errors.BzrCommandError('Cannot use --uncommitted and'
3785
' --revision at the same time.')
3786
merger = self.get_merger_from_uncommitted(tree, location, pb)
4267
raise errors.BzrCommandError(gettext('Cannot use --uncommitted and'
4268
' --revision at the same time.'))
4269
merger = self.get_merger_from_uncommitted(tree, location, None)
3787
4270
allow_pending = False
3788
4271
3789
4272
if merger is None:
3790
4273
merger, allow_pending = self._get_merger_from_branch(tree,
3791
location, revision, remember, possible_transports, pb)
4274
location, revision, remember, possible_transports, None)
3792
4275
3793
4276
merger.merge_type = merge_type
3794
4277
merger.reprocess = reprocess
3796
4279
self.sanity_check_merger(merger)
3797
4280
if (merger.base_rev_id == merger.other_rev_id and
3798
4281
merger.other_rev_id is not None):
3799
note('Nothing to do.')
4282
# check if location is a nonexistent file (and not a branch) to
4283
# disambiguate the 'Nothing to do'
4284
if merger.interesting_files:
4285
if not merger.other_tree.has_filename(
4286
merger.interesting_files[0]):
4287
note(gettext("merger: ") + str(merger))
4288
raise errors.PathsDoNotExist([location])
4289
note(gettext('Nothing to do.'))
3800
4290
return 0
3801
if pull:
4291
if pull and not preview:
3802
4292
if merger.interesting_files is not None:
3803
raise errors.BzrCommandError('Cannot pull individual files')
4293
raise errors.BzrCommandError(gettext('Cannot pull individual files'))
3804
4294
if (merger.base_rev_id == tree.last_revision()):
3805
4295
result = tree.pull(merger.other_branch, False,
3806
4296
merger.other_rev_id)
3807
4297
result.report(self.outf)
3808
4298
return 0
3809
4299
if merger.this_basis is None:
3810
raise errors.BzrCommandError(
4300
raise errors.BzrCommandError(gettext(
3811
4301
"This branch has no commits."
3812
" (perhaps you would prefer 'bzr pull')")
4302
" (perhaps you would prefer 'bzr pull')"))
3813
4303
if preview:
3814
4304
return self._do_preview(merger)
3815
4305
elif interactive:
3828
4318
def _do_preview(self, merger):
3829
4319
from bzrlib.diff import show_diff_trees
3830
4320
result_tree = self._get_preview(merger)
4321
path_encoding = osutils.get_diff_header_encoding()
3831
4322
show_diff_trees(merger.this_tree, result_tree, self.outf,
3832
old_label='', new_label='')
4323
old_label='', new_label='',
4324
path_encoding=path_encoding)
3833
4325
3834
4326
def _do_merge(self, merger, change_reporter, allow_pending, verified):
3835
4327
merger.change_reporter = change_reporter
3864
4356
def sanity_check_merger(self, merger):
3865
4357
if (merger.show_base and
3866
4358
not merger.merge_type is _mod_merge.Merge3Merger):
3867
raise errors.BzrCommandError("Show-base is not supported for this"
3868
" merge type. %s" % merger.merge_type)
4359
raise errors.BzrCommandError(gettext("Show-base is not supported for this"
4360
" merge type. %s") % merger.merge_type)
3869
4361
if merger.reprocess is None:
3870
4362
if merger.show_base:
3871
4363
merger.reprocess = False
3873
4365
# Use reprocess if the merger supports it
3874
4366
merger.reprocess = merger.merge_type.supports_reprocess
3875
4367
if merger.reprocess and not merger.merge_type.supports_reprocess:
3876
raise errors.BzrCommandError("Conflict reduction is not supported"
3877
" for merge type %s." %
4368
raise errors.BzrCommandError(gettext("Conflict reduction is not supported"
4369
" for merge type %s.") %
3878
4370
merger.merge_type)
3879
4371
if merger.reprocess and merger.show_base:
3880
raise errors.BzrCommandError("Cannot do conflict reduction and"
3881
" show base.")
4372
raise errors.BzrCommandError(gettext("Cannot do conflict reduction and"
4373
" show base."))
3882
4374
3883
4375
def _get_merger_from_branch(self, tree, location, revision, remember,
3884
4376
possible_transports, pb):
3911
4403
if other_revision_id is None:
3912
4404
other_revision_id = _mod_revision.ensure_null(
3913
4405
other_branch.last_revision())
3914
# Remember where we merge from
3915
if ((remember or tree.branch.get_submit_branch() is None) and
3916
user_location is not None):
4406
# Remember where we merge from. We need to remember if:
4407
# - user specify a location (and we don't merge from the parent
4408
# branch)
4409
# - user ask to remember or there is no previous location set to merge
4410
# from and user didn't ask to *not* remember
4411
if (user_location is not None
4412
and ((remember
4413
or (remember is None
4414
and tree.branch.get_submit_branch() is None)))):
3917
4415
tree.branch.set_submit_branch(other_branch.base)
3918
_merge_tags_if_possible(other_branch, tree.branch)
4416
# Merge tags (but don't set them in the master branch yet, the user
4417
# might revert this merge). Commit will propagate them.
4418
_merge_tags_if_possible(other_branch, tree.branch, ignore_master=True)
3919
4419
merger = _mod_merge.Merger.from_revision_ids(pb, tree,
3920
4420
other_revision_id, base_revision_id, other_branch, base_branch)
3921
4421
if other_path != '':
3980
4480
stored_location_type = "parent"
3981
4481
mutter("%s", stored_location)
3982
4482
if stored_location is None:
3983
raise errors.BzrCommandError("No location specified or remembered")
4483
raise errors.BzrCommandError(gettext("No location specified or remembered"))
3984
4484
display_url = urlutils.unescape_for_display(stored_location, 'utf-8')
3985
note(u"%s remembered %s location %s", verb_string,
3986
stored_location_type, display_url)
4485
note(gettext("{0} remembered {1} location {2}").format(verb_string,
4486
stored_location_type, display_url))
3987
4487
return stored_location
3988
4488
3989
4489
3990
4490
class cmd_remerge(Command):
3991
"""Redo a merge.
4491
__doc__ = """Redo a merge.
3992
4492
3993
4493
Use this if you want to try a different merge technique while resolving
3994
4494
conflicts. Some merge techniques are better than others, and remerge
4019
4519
4020
4520
def run(self, file_list=None, merge_type=None, show_base=False,
4021
4521
reprocess=False):
4522
from bzrlib.conflicts import restore
4022
4523
if merge_type is None:
4023
4524
merge_type = _mod_merge.Merge3Merger
4024
tree, file_list = tree_files(file_list)
4025
tree.lock_write()
4026
self.add_cleanup(tree.unlock)
4525
tree, file_list = WorkingTree.open_containing_paths(file_list)
4526
self.add_cleanup(tree.lock_write().unlock)
4027
4527
parents = tree.get_parent_ids()
4028
4528
if len(parents) != 2:
4029
raise errors.BzrCommandError("Sorry, remerge only works after normal"
4529
raise errors.BzrCommandError(gettext("Sorry, remerge only works after normal"
4030
4530
" merges. Not cherrypicking or"
4031
" multi-merges.")
4531
" multi-merges."))
4032
4532
repository = tree.branch.repository
4033
4533
interesting_ids = None
4034
4534
new_conflicts = []
4065
4565
# list, we imply that the working tree text has seen and rejected
4066
4566
# all the changes from the other tree, when in fact those changes
4067
4567
# have not yet been seen.
4068
pb = ui.ui_factory.nested_progress_bar()
4069
4568
tree.set_parent_ids(parents[:1])
4070
4569
try:
4071
merger = _mod_merge.Merger.from_revision_ids(pb,
4072
tree, parents[1])
4570
merger = _mod_merge.Merger.from_revision_ids(None, tree, parents[1])
4073
4571
merger.interesting_ids = interesting_ids
4074
4572
merger.merge_type = merge_type
4075
4573
merger.show_base = show_base
4077
4575
conflicts = merger.do_merge()
4078
4576
finally:
4079
4577
tree.set_parent_ids(parents)
4080
pb.finished()
4081
4578
if conflicts > 0:
4082
4579
return 1
4083
4580
else:
4085
4582
4086
4583
4087
4584
class cmd_revert(Command):
4088
"""Revert files to a previous revision.
4585
__doc__ = """Revert files to a previous revision.
4089
4586
4090
4587
Giving a list of files will revert only those files. Otherwise, all files
4091
4588
will be reverted. If the revision is not specified with '--revision', the
4092
4589
last committed revision is used.
4093
4590
4094
4591
To remove only some changes, without reverting to a prior version, use
4095
merge instead. For example, "merge . --revision -2..-3" will remove the
4096
changes introduced by -2, without affecting the changes introduced by -1.
4097
Or to remove certain changes on a hunk-by-hunk basis, see the Shelf plugin.
4592
merge instead. For example, "merge . -r -2..-3" (don't forget the ".")
4593
will remove the changes introduced by the second last commit (-2), without
4594
affecting the changes introduced by the last commit (-1). To remove
4595
certain changes on a hunk-by-hunk basis, see the shelve command.
4098
4596
4099
4597
By default, any files that have been manually changed will be backed up
4100
4598
first. (Files changed only by merge are not backed up.) Backup files have
4130
4628
target branches.
4131
4629
"""
4132
4630
4133
_see_also = ['cat', 'export']
4631
_see_also = ['cat', 'export', 'merge', 'shelve']
4134
4632
takes_options = [
4135
4633
'revision',
4136
4634
Option('no-backup', "Do not save backups of reverted files."),
4141
4639
4142
4640
def run(self, revision=None, no_backup=False, file_list=None,
4143
4641
forget_merges=None):
4144
tree, file_list = tree_files(file_list)
4145
tree.lock_write()
4146
self.add_cleanup(tree.unlock)
4642
tree, file_list = WorkingTree.open_containing_paths(file_list)
4643
self.add_cleanup(tree.lock_tree_write().unlock)
4147
4644
if forget_merges:
4148
4645
tree.set_parent_ids(tree.get_parent_ids()[:1])
4149
4646
else:
4152
4649
@staticmethod
4153
4650
def _revert_tree_to_revision(tree, revision, file_list, no_backup):
4154
4651
rev_tree = _get_one_revision_tree('revert', revision, tree=tree)
4155
pb = ui.ui_factory.nested_progress_bar()
4156
try:
4157
tree.revert(file_list, rev_tree, not no_backup, pb,
4158
report_changes=True)
4159
finally:
4160
pb.finished()
4652
tree.revert(file_list, rev_tree, not no_backup, None,
4653
report_changes=True)
4161
4654
4162
4655
4163
4656
class cmd_assert_fail(Command):
4164
"""Test reporting of assertion failures"""
4657
__doc__ = """Test reporting of assertion failures"""
4165
4658
# intended just for use in testing
4166
4659
4167
4660
hidden = True
4171
4664
4172
4665
4173
4666
class cmd_help(Command):
4174
"""Show help on a command or other topic.
4667
__doc__ = """Show help on a command or other topic.
4175
4668
"""
4176
4669
4177
4670
_see_also = ['topics']
4190
4683
4191
4684
4192
4685
class cmd_shell_complete(Command):
4193
"""Show appropriate completions for context.
4686
__doc__ = """Show appropriate completions for context.
4194
4687
4195
4688
For a list of all available commands, say 'bzr shell-complete'.
4196
4689
"""
4205
4698
4206
4699
4207
4700
class cmd_missing(Command):
4208
"""Show unmerged/unpulled revisions between two branches.
4701
__doc__ = """Show unmerged/unpulled revisions between two branches.
4209
4702
4210
4703
OTHER_BRANCH may be local or remote.
4211
4704
4242
4735
_see_also = ['merge', 'pull']
4243
4736
takes_args = ['other_branch?']
4244
4737
takes_options = [
4738
'directory',
4245
4739
Option('reverse', 'Reverse the order of revisions.'),
4246
4740
Option('mine-only',
4247
4741
'Display changes in the local branch only.'),
4259
4753
type=_parse_revision_str,
4260
4754
help='Filter on local branch revisions (inclusive). '
4261
4755
'See "help revisionspec" for details.'),
4262
Option('include-merges',
4756
Option('include-merged',
4263
4757
'Show all revisions in addition to the mainline ones.'),
4758
Option('include-merges', hidden=True,
4759
help='Historical alias for --include-merged.'),
4264
4760
]
4265
4761
encoding_type = 'replace'
4266
4762
4269
4765
theirs_only=False,
4270
4766
log_format=None, long=False, short=False, line=False,
4271
4767
show_ids=False, verbose=False, this=False, other=False,
4272
include_merges=False, revision=None, my_revision=None):
4768
include_merged=None, revision=None, my_revision=None,
4769
directory=u'.',
4770
include_merges=symbol_versioning.DEPRECATED_PARAMETER):
4273
4771
from bzrlib.missing import find_unmerged, iter_log_revisions
4274
4772
def message(s):
4275
4773
if not is_quiet():
4276
4774
self.outf.write(s)
4277
4775
4776
if symbol_versioning.deprecated_passed(include_merges):
4777
ui.ui_factory.show_user_warning(
4778
'deprecated_command_option',
4779
deprecated_name='--include-merges',
4780
recommended_name='--include-merged',
4781
deprecated_in_version='2.5',
4782
command=self.invoked_as)
4783
if include_merged is None:
4784
include_merged = include_merges
4785
else:
4786
raise errors.BzrCommandError(gettext(
4787
'{0} and {1} are mutually exclusive').format(
4788
'--include-merges', '--include-merged'))
4789
if include_merged is None:
4790
include_merged = False
4278
4791
if this:
4279
4792
mine_only = this
4280
4793
if other:
4288
4801
elif theirs_only:
4289
4802
restrict = 'remote'
4290
4803
4291
local_branch = Branch.open_containing(u".")[0]
4804
local_branch = Branch.open_containing(directory)[0]
4805
self.add_cleanup(local_branch.lock_read().unlock)
4806
4292
4807
parent = local_branch.get_parent()
4293
4808
if other_branch is None:
4294
4809
other_branch = parent
4295
4810
if other_branch is None:
4296
raise errors.BzrCommandError("No peer location known"
4297
" or specified.")
4811
raise errors.BzrCommandError(gettext("No peer location known"
4812
" or specified."))
4298
4813
display_url = urlutils.unescape_for_display(parent,
4299
4814
self.outf.encoding)
4300
message("Using saved parent location: "
4301
+ display_url + "\n")
4815
message(gettext("Using saved parent location: {0}\n").format(
4816
display_url))
4302
4817
4303
4818
remote_branch = Branch.open(other_branch)
4304
4819
if remote_branch.base == local_branch.base:
4305
4820
remote_branch = local_branch
4821
else:
4822
self.add_cleanup(remote_branch.lock_read().unlock)
4306
4823
4307
local_branch.lock_read()
4308
self.add_cleanup(local_branch.unlock)
4309
4824
local_revid_range = _revision_range_to_revid_range(
4310
4825
_get_revision_range(my_revision, local_branch,
4311
4826
self.name()))
4312
4827
4313
remote_branch.lock_read()
4314
self.add_cleanup(remote_branch.unlock)
4315
4828
remote_revid_range = _revision_range_to_revid_range(
4316
4829
_get_revision_range(revision,
4317
4830
remote_branch, self.name()))
4319
4832
local_extra, remote_extra = find_unmerged(
4320
4833
local_branch, remote_branch, restrict,
4321
4834
backward=not reverse,
4322
include_merges=include_merges,
4835
include_merged=include_merged,
4323
4836
local_revid_range=local_revid_range,
4324
4837
remote_revid_range=remote_revid_range)
4325
4838
4332
4845
4333
4846
status_code = 0
4334
4847
if local_extra and not theirs_only:
4335
message("You have %d extra revision(s):\n" %
4848
message(ngettext("You have %d extra revision:\n",
4849
"You have %d extra revisions:\n",
4850
len(local_extra)) %
4336
4851
len(local_extra))
4337
4852
for revision in iter_log_revisions(local_extra,
4338
4853
local_branch.repository,
4346
4861
if remote_extra and not mine_only:
4347
4862
if printed_local is True:
4348
4863
message("\n\n\n")
4349
message("You are missing %d revision(s):\n" %
4864
message(ngettext("You are missing %d revision:\n",
4865
"You are missing %d revisions:\n",
4866
len(remote_extra)) %
4350
4867
len(remote_extra))
4351
4868
for revision in iter_log_revisions(remote_extra,
4352
4869
remote_branch.repository,
4356
4873
4357
4874
if mine_only and not local_extra:
4358
4875
# We checked local, and found nothing extra
4359
message('This branch is up to date.\n')
4876
message(gettext('This branch has no new revisions.\n'))
4360
4877
elif theirs_only and not remote_extra:
4361
4878
# We checked remote, and found nothing extra
4362
message('Other branch is up to date.\n')
4879
message(gettext('Other branch has no new revisions.\n'))
4363
4880
elif not (mine_only or theirs_only or local_extra or
4364
4881
remote_extra):
4365
4882
# We checked both branches, and neither one had extra
4366
4883
# revisions
4367
message("Branches are up to date.\n")
4884
message(gettext("Branches are up to date.\n"))
4368
4885
self.cleanup_now()
4369
4886
if not status_code and parent is None and other_branch is not None:
4370
local_branch.lock_write()
4371
self.add_cleanup(local_branch.unlock)
4887
self.add_cleanup(local_branch.lock_write().unlock)
4372
4888
# handle race conditions - a parent might be set while we run.
4373
4889
if local_branch.get_parent() is None:
4374
4890
local_branch.set_parent(remote_branch.base)
4376
4892
4377
4893
4378
4894
class cmd_pack(Command):
4379
"""Compress the data within a repository."""
4895
__doc__ = """Compress the data within a repository.
4896
4897
This operation compresses the data within a bazaar repository. As
4898
bazaar supports automatic packing of repository, this operation is
4899
normally not required to be done manually.
4900
4901
During the pack operation, bazaar takes a backup of existing repository
4902
data, i.e. pack files. This backup is eventually removed by bazaar
4903
automatically when it is safe to do so. To save disk space by removing
4904
the backed up pack files, the --clean-obsolete-packs option may be
4905
used.
4906
4907
Warning: If you use --clean-obsolete-packs and your machine crashes
4908
during or immediately after repacking, you may be left with a state
4909
where the deletion has been written to disk but the new packs have not
4910
been. In this case the repository may be unusable.
4911
"""
4380
4912
4381
4913
_see_also = ['repositories']
4382
4914
takes_args = ['branch_or_repo?']
4915
takes_options = [
4916
Option('clean-obsolete-packs', 'Delete obsolete packs to save disk space.'),
4917
]
4383
4918
4384
def run(self, branch_or_repo='.'):
4385
dir = bzrdir.BzrDir.open_containing(branch_or_repo)[0]
4919
def run(self, branch_or_repo='.', clean_obsolete_packs=False):
4920
dir = controldir.ControlDir.open_containing(branch_or_repo)[0]
4386
4921
try:
4387
4922
branch = dir.open_branch()
4388
4923
repository = branch.repository
4389
4924
except errors.NotBranchError:
4390
4925
repository = dir.open_repository()
4391
repository.pack()
4926
repository.pack(clean_obsolete_packs=clean_obsolete_packs)
4392
4927
4393
4928
4394
4929
class cmd_plugins(Command):
4395
"""List the installed plugins.
4930
__doc__ = """List the installed plugins.
4396
4931
4397
4932
This command displays the list of installed plugins including
4398
4933
version of plugin and a short description of each.
4414
4949
4415
4950
@display_command
4416
4951
def run(self, verbose=False):
4417
import bzrlib.plugin
4418
from inspect import getdoc
4419
result = []
4420
for name, plugin in bzrlib.plugin.plugins().items():
4421
version = plugin.__version__
4422
if version == 'unknown':
4423
version = ''
4424
name_ver = '%s %s' % (name, version)
4425
d = getdoc(plugin.module)
4426
if d:
4427
doc = d.split('\n')[0]
4428
else:
4429
doc = '(no description)'
4430
result.append((name_ver, doc, plugin.path()))
4431
for name_ver, doc, path in sorted(result):
4432
print name_ver
4433
print ' ', doc
4434
if verbose:
4435
print ' ', path
4436
print
4952
from bzrlib import plugin
4953
# Don't give writelines a generator as some codecs don't like that
4954
self.outf.writelines(
4955
list(plugin.describe_plugins(show_paths=verbose)))
4437
4956
4438
4957
4439
4958
class cmd_testament(Command):
4440
"""Show testament (signing-form) of a revision."""
4959
__doc__ = """Show testament (signing-form) of a revision."""
4441
4960
takes_options = [
4442
4961
'revision',
4443
4962
Option('long', help='Produce long-format testament.'),
4455
4974
b = Branch.open_containing(branch)[0]
4456
4975
else:
4457
4976
b = Branch.open(branch)
4458
b.lock_read()
4459
self.add_cleanup(b.unlock)
4977
self.add_cleanup(b.lock_read().unlock)
4460
4978
if revision is None:
4461
4979
rev_id = b.last_revision()
4462
4980
else:
4469
4987
4470
4988
4471
4989
class cmd_annotate(Command):
4472
"""Show the origin of each line in a file.
4990
__doc__ = """Show the origin of each line in a file.
4473
4991
4474
4992
This prints out the given file with an annotation on the left side
4475
4993
indicating which revision, author and date introduced the change.
4486
5004
Option('long', help='Show commit date in annotations.'),
4487
5005
'revision',
4488
5006
'show-ids',
5007
'directory',
4489
5008
]
4490
5009
encoding_type = 'exact'
4491
5010
4492
5011
@display_command
4493
5012
def run(self, filename, all=False, long=False, revision=None,
4494
show_ids=False):
4495
from bzrlib.annotate import annotate_file, annotate_file_tree
5013
show_ids=False, directory=None):
5014
from bzrlib.annotate import (
5015
annotate_file_tree,
5016
)
4496
5017
wt, branch, relpath = \
4497
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
5018
_open_directory_or_containing_tree_or_branch(filename, directory)
4498
5019
if wt is not None:
4499
wt.lock_read()
4500
self.add_cleanup(wt.unlock)
5020
self.add_cleanup(wt.lock_read().unlock)
4501
5021
else:
4502
branch.lock_read()
4503
self.add_cleanup(branch.unlock)
5022
self.add_cleanup(branch.lock_read().unlock)
4504
5023
tree = _get_one_revision_tree('annotate', revision, branch=branch)
4505
tree.lock_read()
4506
self.add_cleanup(tree.unlock)
4507
if wt is not None:
5024
self.add_cleanup(tree.lock_read().unlock)
5025
if wt is not None and revision is None:
4508
5026
file_id = wt.path2id(relpath)
4509
5027
else:
4510
5028
file_id = tree.path2id(relpath)
4511
5029
if file_id is None:
4512
5030
raise errors.NotVersionedError(filename)
4513
file_version = tree.inventory[file_id].revision
4514
5031
if wt is not None and revision is None:
4515
5032
# If there is a tree and we're not annotating historical
4516
5033
# versions, annotate the working tree's content.
4517
5034
annotate_file_tree(wt, file_id, self.outf, long, all,
4518
5035
show_ids=show_ids)
4519
5036
else:
4520
annotate_file(branch, file_version, file_id, long, all, self.outf,
4521
show_ids=show_ids)
5037
annotate_file_tree(tree, file_id, self.outf, long, all,
5038
show_ids=show_ids, branch=branch)
4522
5039
4523
5040
4524
5041
class cmd_re_sign(Command):
4525
"""Create a digital signature for an existing revision."""
5042
__doc__ = """Create a digital signature for an existing revision."""
4526
5043
# TODO be able to replace existing ones.
4527
5044
4528
5045
hidden = True # is this right ?
4529
5046
takes_args = ['revision_id*']
4530
takes_options = ['revision']
5047
takes_options = ['directory', 'revision']
4531
5048
4532
def run(self, revision_id_list=None, revision=None):
5049
def run(self, revision_id_list=None, revision=None, directory=u'.'):
4533
5050
if revision_id_list is not None and revision is not None:
4534
raise errors.BzrCommandError('You can only supply one of revision_id or --revision')
5051
raise errors.BzrCommandError(gettext('You can only supply one of revision_id or --revision'))
4535
5052
if revision_id_list is None and revision is None:
4536
raise errors.BzrCommandError('You must supply either --revision or a revision_id')
4537
b = WorkingTree.open_containing(u'.')[0].branch
4538
b.lock_write()
4539
self.add_cleanup(b.unlock)
5053
raise errors.BzrCommandError(gettext('You must supply either --revision or a revision_id'))
5054
b = WorkingTree.open_containing(directory)[0].branch
5055
self.add_cleanup(b.lock_write().unlock)
4540
5056
return self._run(b, revision_id_list, revision)
4541
5057
4542
5058
def _run(self, b, revision_id_list, revision):
4543
5059
import bzrlib.gpg as gpg
4544
gpg_strategy = gpg.GPGStrategy(b.get_config())
5060
gpg_strategy = gpg.GPGStrategy(b.get_config_stack())
4545
5061
if revision_id_list is not None:
4546
5062
b.repository.start_write_group()
4547
5063
try:
4572
5088
if to_revid is None:
4573
5089
to_revno = b.revno()
4574
5090
if from_revno is None or to_revno is None:
4575
raise errors.BzrCommandError('Cannot sign a range of non-revision-history revisions')
5091
raise errors.BzrCommandError(gettext('Cannot sign a range of non-revision-history revisions'))
4576
5092
b.repository.start_write_group()
4577
5093
try:
4578
5094
for revno in range(from_revno, to_revno + 1):
4584
5100
else:
4585
5101
b.repository.commit_write_group()
4586
5102
else:
4587
raise errors.BzrCommandError('Please supply either one revision, or a range.')
5103
raise errors.BzrCommandError(gettext('Please supply either one revision, or a range.'))
4588
5104
4589
5105
4590
5106
class cmd_bind(Command):
4591
"""Convert the current branch into a checkout of the supplied branch.
5107
__doc__ = """Convert the current branch into a checkout of the supplied branch.
5108
If no branch is supplied, rebind to the last bound location.
4592
5109
4593
5110
Once converted into a checkout, commits must succeed on the master branch
4594
5111
before they will be applied to the local branch.
4600
5117
4601
5118
_see_also = ['checkouts', 'unbind']
4602
5119
takes_args = ['location?']
4603
takes_options = []
5120
takes_options = ['directory']
4604
5121
4605
def run(self, location=None):
4606
b, relpath = Branch.open_containing(u'.')
5122
def run(self, location=None, directory=u'.'):
5123
b, relpath = Branch.open_containing(directory)
4607
5124
if location is None:
4608
5125
try:
4609
5126
location = b.get_old_bound_location()
4610
5127
except errors.UpgradeRequired:
4611
raise errors.BzrCommandError('No location supplied. '
4612
'This format does not remember old locations.')
5128
raise errors.BzrCommandError(gettext('No location supplied. '
5129
'This format does not remember old locations.'))
4613
5130
else:
4614
5131
if location is None:
4615
raise errors.BzrCommandError('No location supplied and no '
4616
'previous location known')
5132
if b.get_bound_location() is not None:
5133
raise errors.BzrCommandError(gettext('Branch is already bound'))
5134
else:
5135
raise errors.BzrCommandError(gettext('No location supplied '
5136
'and no previous location known'))
4617
5137
b_other = Branch.open(location)
4618
5138
try:
4619
5139
b.bind(b_other)
4620
5140
except errors.DivergedBranches:
4621
raise errors.BzrCommandError('These branches have diverged.'
4622
' Try merging, and then bind again.')
5141
raise errors.BzrCommandError(gettext('These branches have diverged.'
5142
' Try merging, and then bind again.'))
4623
5143
if b.get_config().has_explicit_nickname():
4624
5144
b.nick = b_other.nick
4625
5145
4626
5146
4627
5147
class cmd_unbind(Command):
4628
"""Convert the current checkout into a regular branch.
5148
__doc__ = """Convert the current checkout into a regular branch.
4629
5149
4630
5150
After unbinding, the local branch is considered independent and subsequent
4631
5151
commits will be local only.
4633
5153
4634
5154
_see_also = ['checkouts', 'bind']
4635
5155
takes_args = []
4636
takes_options = []
5156
takes_options = ['directory']
4637
5157
4638
def run(self):
4639
b, relpath = Branch.open_containing(u'.')
5158
def run(self, directory=u'.'):
5159
b, relpath = Branch.open_containing(directory)
4640
5160
if not b.unbind():
4641
raise errors.BzrCommandError('Local branch is not bound')
5161
raise errors.BzrCommandError(gettext('Local branch is not bound'))
4642
5162
4643
5163
4644
5164
class cmd_uncommit(Command):
4645
"""Remove the last committed revision.
5165
__doc__ = """Remove the last committed revision.
4646
5166
4647
5167
--verbose will print out what is being removed.
4648
5168
--dry-run will go through all the motions, but not actually
4665
5185
takes_options = ['verbose', 'revision',
4666
5186
Option('dry-run', help='Don\'t actually make changes.'),
4667
5187
Option('force', help='Say yes to all questions.'),
5188
Option('keep-tags',
5189
help='Keep tags that point to removed revisions.'),
4668
5190
Option('local',
4669
5191
help="Only remove the commits from the local branch"
4670
5192
" when in a checkout."
4674
5196
aliases = []
4675
5197
encoding_type = 'replace'
4676
5198
4677
def run(self, location=None,
4678
dry_run=False, verbose=False,
4679
revision=None, force=False, local=False):
5199
def run(self, location=None, dry_run=False, verbose=False,
5200
revision=None, force=False, local=False, keep_tags=False):
4680
5201
if location is None:
4681
5202
location = u'.'
4682
control, relpath = bzrdir.BzrDir.open_containing(location)
5203
control, relpath = controldir.ControlDir.open_containing(location)
4683
5204
try:
4684
5205
tree = control.open_workingtree()
4685
5206
b = tree.branch
4688
5209
b = control.open_branch()
4689
5210
4690
5211
if tree is not None:
4691
tree.lock_write()
4692
self.add_cleanup(tree.unlock)
5212
self.add_cleanup(tree.lock_write().unlock)
4693
5213
else:
4694
b.lock_write()
4695
self.add_cleanup(b.unlock)
4696
return self._run(b, tree, dry_run, verbose, revision, force, local=local)
5214
self.add_cleanup(b.lock_write().unlock)
5215
return self._run(b, tree, dry_run, verbose, revision, force,
5216
local, keep_tags)
4697
5217
4698
def _run(self, b, tree, dry_run, verbose, revision, force, local=False):
5218
def _run(self, b, tree, dry_run, verbose, revision, force, local,
5219
keep_tags):
4699
5220
from bzrlib.log import log_formatter, show_log
4700
5221
from bzrlib.uncommit import uncommit
4701
5222
4716
5237
rev_id = b.get_rev_id(revno)
4717
5238
4718
5239
if rev_id is None or _mod_revision.is_null(rev_id):
4719
self.outf.write('No revisions to uncommit.\n')
5240
self.outf.write(gettext('No revisions to uncommit.\n'))
4720
5241
return 1
4721
5242
4722
5243
lf = log_formatter('short',
4731
5252
end_revision=last_revno)
4732
5253
4733
5254
if dry_run:
4734
print 'Dry-run, pretending to remove the above revisions.'
4735
if not force:
4736
val = raw_input('Press <enter> to continue')
5255
self.outf.write(gettext('Dry-run, pretending to remove'
5256
' the above revisions.\n'))
4737
5257
else:
4738
print 'The above revision(s) will be removed.'
4739
if not force:
4740
val = raw_input('Are you sure [y/N]? ')
4741
if val.lower() not in ('y', 'yes'):
4742
print 'Canceled'
4743
return 0
5258
self.outf.write(gettext('The above revision(s) will be removed.\n'))
5259
5260
if not force:
5261
if not ui.ui_factory.confirm_action(
5262
gettext(u'Uncommit these revisions'),
5263
'bzrlib.builtins.uncommit',
5264
{}):
5265
self.outf.write(gettext('Canceled\n'))
5266
return 0
4744
5267
4745
5268
mutter('Uncommitting from {%s} to {%s}',
4746
5269
last_rev_id, rev_id)
4747
5270
uncommit(b, tree=tree, dry_run=dry_run, verbose=verbose,
4748
revno=revno, local=local)
4749
note('You can restore the old tip by running:\n'
4750
' bzr pull . -r revid:%s', last_rev_id)
5271
revno=revno, local=local, keep_tags=keep_tags)
5272
self.outf.write(gettext('You can restore the old tip by running:\n'
5273
' bzr pull . -r revid:%s\n') % last_rev_id)
4751
5274
4752
5275
4753
5276
class cmd_break_lock(Command):
4754
"""Break a dead lock on a repository, branch or working directory.
5277
__doc__ = """Break a dead lock.
5278
5279
This command breaks a lock on a repository, branch, working directory or
5280
config file.
4755
5281
4756
5282
CAUTION: Locks should only be broken when you are sure that the process
4757
5283
holding the lock has been stopped.
4762
5288
:Examples:
4763
5289
bzr break-lock
4764
5290
bzr break-lock bzr+ssh://example.com/bzr/foo
5291
bzr break-lock --conf ~/.bazaar
4765
5292
"""
5293
4766
5294
takes_args = ['location?']
5295
takes_options = [
5296
Option('config',
5297
help='LOCATION is the directory where the config lock is.'),
5298
Option('force',
5299
help='Do not ask for confirmation before breaking the lock.'),
5300
]
4767
5301
4768
def run(self, location=None, show=False):
5302
def run(self, location=None, config=False, force=False):
4769
5303
if location is None:
4770
5304
location = u'.'
4771
control, relpath = bzrdir.BzrDir.open_containing(location)
4772
try:
4773
control.break_lock()
4774
except NotImplementedError:
4775
pass
5305
if force:
5306
ui.ui_factory = ui.ConfirmationUserInterfacePolicy(ui.ui_factory,
5307
None,
5308
{'bzrlib.lockdir.break': True})
5309
if config:
5310
conf = _mod_config.LockableConfig(file_name=location)
5311
conf.break_lock()
5312
else:
5313
control, relpath = controldir.ControlDir.open_containing(location)
5314
try:
5315
control.break_lock()
5316
except NotImplementedError:
5317
pass
4776
5318
4777
5319
4778
5320
class cmd_wait_until_signalled(Command):
4779
"""Test helper for test_start_and_stop_bzr_subprocess_send_signal.
5321
__doc__ = """Test helper for test_start_and_stop_bzr_subprocess_send_signal.
4780
5322
4781
5323
This just prints a line to signal when it is ready, then blocks on stdin.
4782
5324
"""
4790
5332
4791
5333
4792
5334
class cmd_serve(Command):
4793
"""Run the bzr server."""
5335
__doc__ = """Run the bzr server."""
4794
5336
4795
5337
aliases = ['server']
4796
5338
4807
5349
'result in a dynamically allocated port. The default port '
4808
5350
'depends on the protocol.',
4809
5351
type=str),
4810
Option('directory',
4811
help='Serve contents of this directory.',
4812
type=unicode),
5352
custom_help('directory',
5353
help='Serve contents of this directory.'),
4813
5354
Option('allow-writes',
4814
5355
help='By default the server is a readonly server. Supplying '
4815
5356
'--allow-writes enables write access to the contents of '
4819
5360
'option leads to global uncontrolled write access to your '
4820
5361
'file system.'
4821
5362
),
5363
Option('client-timeout', type=float,
5364
help='Override the default idle client timeout (5min).'),
4822
5365
]
4823
5366
4824
5367
def get_host_and_port(self, port):
4841
5384
return host, port
4842
5385
4843
5386
def run(self, port=None, inet=False, directory=None, allow_writes=False,
4844
protocol=None):
4845
from bzrlib.transport import get_transport, transport_server_registry
5387
protocol=None, client_timeout=None):
5388
from bzrlib import transport
4846
5389
if directory is None:
4847
5390
directory = os.getcwd()
4848
5391
if protocol is None:
4849
protocol = transport_server_registry.get()
5392
protocol = transport.transport_server_registry.get()
4850
5393
host, port = self.get_host_and_port(port)
4851
url = urlutils.local_path_to_url(directory)
5394
url = transport.location_to_url(directory)
4852
5395
if not allow_writes:
4853
5396
url = 'readonly+' + url
4854
transport = get_transport(url)
4855
protocol(transport, host, port, inet)
5397
t = transport.get_transport_from_url(url)
5398
try:
5399
protocol(t, host, port, inet, client_timeout)
5400
except TypeError, e:
5401
# We use symbol_versioning.deprecated_in just so that people
5402
# grepping can find it here.
5403
# symbol_versioning.deprecated_in((2, 5, 0))
5404
symbol_versioning.warn(
5405
'Got TypeError(%s)\ntrying to call protocol: %s.%s\n'
5406
'Most likely it needs to be updated to support a'
5407
' "timeout" parameter (added in bzr 2.5.0)'
5408
% (e, protocol.__module__, protocol),
5409
DeprecationWarning)
5410
protocol(t, host, port, inet)
4856
5411
4857
5412
4858
5413
class cmd_join(Command):
4859
"""Combine a tree into its containing tree.
5414
__doc__ = """Combine a tree into its containing tree.
4860
5415
4861
5416
This command requires the target tree to be in a rich-root format.
4862
5417
4864
5419
not part of it. (Such trees can be produced by "bzr split", but also by
4865
5420
running "bzr branch" with the target inside a tree.)
4866
5421
4867
The result is a combined tree, with the subtree no longer an independant
5422
The result is a combined tree, with the subtree no longer an independent
4868
5423
part. This is marked as a merge of the subtree into the containing tree,
4869
5424
and all history is preserved.
4870
5425
"""
4881
5436
containing_tree = WorkingTree.open_containing(parent_dir)[0]
4882
5437
repo = containing_tree.branch.repository
4883
5438
if not repo.supports_rich_root():
4884
raise errors.BzrCommandError(
5439
raise errors.BzrCommandError(gettext(
4885
5440
"Can't join trees because %s doesn't support rich root data.\n"
4886
"You can use bzr upgrade on the repository."
5441
"You can use bzr upgrade on the repository.")
4887
5442
% (repo,))
4888
5443
if reference:
4889
5444
try:
4891
5446
except errors.BadReferenceTarget, e:
4892
5447
# XXX: Would be better to just raise a nicely printable
4893
5448
# exception from the real origin. Also below. mbp 20070306
4894
raise errors.BzrCommandError("Cannot join %s. %s" %
4895
(tree, e.reason))
5449
raise errors.BzrCommandError(
5450
gettext("Cannot join {0}. {1}").format(tree, e.reason))
4896
5451
else:
4897
5452
try:
4898
5453
containing_tree.subsume(sub_tree)
4899
5454
except errors.BadSubsumeSource, e:
4900
raise errors.BzrCommandError("Cannot join %s. %s" %
4901
(tree, e.reason))
5455
raise errors.BzrCommandError(
5456
gettext("Cannot join {0}. {1}").format(tree, e.reason))
4902
5457
4903
5458
4904
5459
class cmd_split(Command):
4905
"""Split a subdirectory of a tree into a separate tree.
5460
__doc__ = """Split a subdirectory of a tree into a separate tree.
4906
5461
4907
5462
This command will produce a target tree in a format that supports
4908
5463
rich roots, like 'rich-root' or 'rich-root-pack'. These formats cannot be
4928
5483
4929
5484
4930
5485
class cmd_merge_directive(Command):
4931
"""Generate a merge directive for auto-merge tools.
5486
__doc__ = """Generate a merge directive for auto-merge tools.
4932
5487
4933
5488
A directive requests a merge to be performed, and also provides all the
4934
5489
information necessary to do so. This means it must either include a
4951
5506
_see_also = ['send']
4952
5507
4953
5508
takes_options = [
5509
'directory',
4954
5510
RegistryOption.from_kwargs('patch-type',
4955
5511
'The type of patch to include in the directive.',
4956
5512
title='Patch type',
4969
5525
encoding_type = 'exact'
4970
5526
4971
5527
def run(self, submit_branch=None, public_branch=None, patch_type='bundle',
4972
sign=False, revision=None, mail_to=None, message=None):
5528
sign=False, revision=None, mail_to=None, message=None,
5529
directory=u'.'):
4973
5530
from bzrlib.revision import ensure_null, NULL_REVISION
4974
5531
include_patch, include_bundle = {
4975
5532
'plain': (False, False),
4976
5533
'diff': (True, False),
4977
5534
'bundle': (True, True),
4978
5535
}[patch_type]
4979
branch = Branch.open('.')
5536
branch = Branch.open(directory)
4980
5537
stored_submit_branch = branch.get_submit_branch()
4981
5538
if submit_branch is None:
4982
5539
submit_branch = stored_submit_branch
4986
5543
if submit_branch is None:
4987
5544
submit_branch = branch.get_parent()
4988
5545
if submit_branch is None:
4989
raise errors.BzrCommandError('No submit branch specified or known')
5546
raise errors.BzrCommandError(gettext('No submit branch specified or known'))
4990
5547
4991
5548
stored_public_branch = branch.get_public_branch()
4992
5549
if public_branch is None:
4994
5551
elif stored_public_branch is None:
4995
5552
branch.set_public_branch(public_branch)
4996
5553
if not include_bundle and public_branch is None:
4997
raise errors.BzrCommandError('No public branch specified or'
4998
' known')
5554
raise errors.BzrCommandError(gettext('No public branch specified or'
5555
' known'))
4999
5556
base_revision_id = None
5000
5557
if revision is not None:
5001
5558
if len(revision) > 2:
5002
raise errors.BzrCommandError('bzr merge-directive takes '
5003
'at most two one revision identifiers')
5559
raise errors.BzrCommandError(gettext('bzr merge-directive takes '
5560
'at most two one revision identifiers'))
5004
5561
revision_id = revision[-1].as_revision_id(branch)
5005
5562
if len(revision) == 2:
5006
5563
base_revision_id = revision[0].as_revision_id(branch)
5008
5565
revision_id = branch.last_revision()
5009
5566
revision_id = ensure_null(revision_id)
5010
5567
if revision_id == NULL_REVISION:
5011
raise errors.BzrCommandError('No revisions to bundle.')
5568
raise errors.BzrCommandError(gettext('No revisions to bundle.'))
5012
5569
directive = merge_directive.MergeDirective2.from_objects(
5013
5570
branch.repository, revision_id, time.time(),
5014
5571
osutils.local_time_offset(), submit_branch,
5027
5584
5028
5585
5029
5586
class cmd_send(Command):
5030
"""Mail or create a merge-directive for submitting changes.
5587
__doc__ = """Mail or create a merge-directive for submitting changes.
5031
5588
5032
5589
A merge directive provides many things needed for requesting merges:
5033
5590
5058
5615
source branch defaults to that containing the working directory, but can
5059
5616
be changed using --from.
5060
5617
5618
Both the submit branch and the public branch follow the usual behavior with
5619
respect to --remember: If there is no default location set, the first send
5620
will set it (use --no-remember to avoid setting it). After that, you can
5621
omit the location to use the default. To change the default, use
5622
--remember. The value will only be saved if the location can be accessed.
5623
5061
5624
In order to calculate those changes, bzr must analyse the submit branch.
5062
5625
Therefore it is most efficient for the submit branch to be a local mirror.
5063
5626
If a public location is known for the submit_branch, that location is used
5067
5630
given, in which case it is sent to a file.
5068
5631
5069
5632
Mail is sent using your preferred mail program. This should be transparent
5070
on Windows (it uses MAPI). On Linux, it requires the xdg-email utility.
5633
on Windows (it uses MAPI). On Unix, it requires the xdg-email utility.
5071
5634
If the preferred client can't be found (or used), your editor will be used.
5072
5635
5073
5636
To use a specific mail program, set the mail_client configuration option.
5115
5678
short_name='f',
5116
5679
type=unicode),
5117
5680
Option('output', short_name='o',
5118
help='Write merge directive to this file; '
5681
help='Write merge directive to this file or directory; '
5119
5682
'use - for stdout.',
5120
5683
type=unicode),
5121
5684
Option('strict',
5132
5695
]
5133
5696
5134
5697
def run(self, submit_branch=None, public_branch=None, no_bundle=False,
5135
no_patch=False, revision=None, remember=False, output=None,
5698
no_patch=False, revision=None, remember=None, output=None,
5136
5699
format=None, mail_to=None, message=None, body=None,
5137
5700
strict=None, **kwargs):
5138
5701
from bzrlib.send import send
5144
5707
5145
5708
5146
5709
class cmd_bundle_revisions(cmd_send):
5147
"""Create a merge-directive for submitting changes.
5710
__doc__ = """Create a merge-directive for submitting changes.
5148
5711
5149
5712
A merge directive provides many things needed for requesting merges:
5150
5713
5217
5780
5218
5781
5219
5782
class cmd_tag(Command):
5220
"""Create, remove or modify a tag naming a revision.
5783
__doc__ = """Create, remove or modify a tag naming a revision.
5221
5784
5222
5785
Tags give human-meaningful names to revisions. Commands that take a -r
5223
5786
(--revision) option can be given -rtag:X, where X is any previously
5231
5794
5232
5795
To rename a tag (change the name but keep it on the same revsion), run ``bzr
5233
5796
tag new-name -r tag:old-name`` and then ``bzr tag --delete oldname``.
5797
5798
If no tag name is specified it will be determined through the
5799
'automatic_tag_name' hook. This can e.g. be used to automatically tag
5800
upstream releases by reading configure.ac. See ``bzr help hooks`` for
5801
details.
5234
5802
"""
5235
5803
5236
5804
_see_also = ['commit', 'tags']
5237
takes_args = ['tag_name']
5805
takes_args = ['tag_name?']
5238
5806
takes_options = [
5239
5807
Option('delete',
5240
5808
help='Delete this tag rather than placing it.',
5241
5809
),
5242
Option('directory',
5243
help='Branch in which to place the tag.',
5244
short_name='d',
5245
type=unicode,
5246
),
5810
custom_help('directory',
5811
help='Branch in which to place the tag.'),
5247
5812
Option('force',
5248
5813
help='Replace existing tags.',
5249
5814
),
5250
5815
'revision',
5251
5816
]
5252
5817
5253
def run(self, tag_name,
5818
def run(self, tag_name=None,
5254
5819
delete=None,
5255
5820
directory='.',
5256
5821
force=None,
5257
5822
revision=None,
5258
5823
):
5259
5824
branch, relpath = Branch.open_containing(directory)
5260
branch.lock_write()
5261
self.add_cleanup(branch.unlock)
5825
self.add_cleanup(branch.lock_write().unlock)
5262
5826
if delete:
5827
if tag_name is None:
5828
raise errors.BzrCommandError(gettext("No tag specified to delete."))
5263
5829
branch.tags.delete_tag(tag_name)
5264
self.outf.write('Deleted tag %s.\n' % tag_name)
5830
note(gettext('Deleted tag %s.') % tag_name)
5265
5831
else:
5266
5832
if revision:
5267
5833
if len(revision) != 1:
5268
raise errors.BzrCommandError(
5834
raise errors.BzrCommandError(gettext(
5269
5835
"Tags can only be placed on a single revision, "
5270
"not on a range")
5836
"not on a range"))
5271
5837
revision_id = revision[0].as_revision_id(branch)
5272
5838
else:
5273
5839
revision_id = branch.last_revision()
5274
if (not force) and branch.tags.has_tag(tag_name):
5840
if tag_name is None:
5841
tag_name = branch.automatic_tag_name(revision_id)
5842
if tag_name is None:
5843
raise errors.BzrCommandError(gettext(
5844
"Please specify a tag name."))
5845
try:
5846
existing_target = branch.tags.lookup_tag(tag_name)
5847
except errors.NoSuchTag:
5848
existing_target = None
5849
if not force and existing_target not in (None, revision_id):
5275
5850
raise errors.TagAlreadyExists(tag_name)
5276
branch.tags.set_tag(tag_name, revision_id)
5277
self.outf.write('Created tag %s.\n' % tag_name)
5851
if existing_target == revision_id:
5852
note(gettext('Tag %s already exists for that revision.') % tag_name)
5853
else:
5854
branch.tags.set_tag(tag_name, revision_id)
5855
if existing_target is None:
5856
note(gettext('Created tag %s.') % tag_name)
5857
else:
5858
note(gettext('Updated tag %s.') % tag_name)
5278
5859
5279
5860
5280
5861
class cmd_tags(Command):
5281
"""List tags.
5862
__doc__ = """List tags.
5282
5863
5283
5864
This command shows a table of tag names and the revisions they reference.
5284
5865
"""
5285
5866
5286
5867
_see_also = ['tag']
5287
5868
takes_options = [
5288
Option('directory',
5289
help='Branch whose tags should be displayed.',
5290
short_name='d',
5291
type=unicode,
5292
),
5293
RegistryOption.from_kwargs('sort',
5869
custom_help('directory',
5870
help='Branch whose tags should be displayed.'),
5871
RegistryOption('sort',
5294
5872
'Sort tags by different criteria.', title='Sorting',
5295
alpha='Sort tags lexicographically (default).',
5296
time='Sort tags chronologically.',
5873
lazy_registry=('bzrlib.tag', 'tag_sort_methods')
5297
5874
),
5298
5875
'show-ids',
5299
5876
'revision',
5300
5877
]
5301
5878
5302
5879
@display_command
5303
def run(self,
5304
directory='.',
5305
sort='alpha',
5306
show_ids=False,
5307
revision=None,
5308
):
5880
def run(self, directory='.', sort=None, show_ids=False, revision=None):
5881
from bzrlib.tag import tag_sort_methods
5309
5882
branch, relpath = Branch.open_containing(directory)
5310
5883
5311
5884
tags = branch.tags.get_tag_dict().items()
5312
5885
if not tags:
5313
5886
return
5314
5887
5315
branch.lock_read()
5316
self.add_cleanup(branch.unlock)
5888
self.add_cleanup(branch.lock_read().unlock)
5317
5889
if revision:
5318
graph = branch.repository.get_graph()
5319
rev1, rev2 = _get_revision_range(revision, branch, self.name())
5320
revid1, revid2 = rev1.rev_id, rev2.rev_id
5321
# only show revisions between revid1 and revid2 (inclusive)
5322
tags = [(tag, revid) for tag, revid in tags if
5323
graph.is_between(revid, revid1, revid2)]
5324
if sort == 'alpha':
5325
tags.sort()
5326
elif sort == 'time':
5327
timestamps = {}
5328
for tag, revid in tags:
5329
try:
5330
revobj = branch.repository.get_revision(revid)
5331
except errors.NoSuchRevision:
5332
timestamp = sys.maxint # place them at the end
5333
else:
5334
timestamp = revobj.timestamp
5335
timestamps[revid] = timestamp
5336
tags.sort(key=lambda x: timestamps[x[1]])
5890
# Restrict to the specified range
5891
tags = self._tags_for_range(branch, revision)
5892
if sort is None:
5893
sort = tag_sort_methods.get()
5894
sort(branch, tags)
5337
5895
if not show_ids:
5338
5896
# [ (tag, revid), ... ] -> [ (tag, dotted_revno), ... ]
5339
5897
for index, (tag, revid) in enumerate(tags):
5341
5899
revno = branch.revision_id_to_dotted_revno(revid)
5342
5900
if isinstance(revno, tuple):
5343
5901
revno = '.'.join(map(str, revno))
5344
except errors.NoSuchRevision:
5902
except (errors.NoSuchRevision,
5903
errors.GhostRevisionsHaveNoRevno,
5904
errors.UnsupportedOperation):
5345
5905
# Bad tag data/merges can lead to tagged revisions
5346
5906
# which are not in this branch. Fail gracefully ...
5347
5907
revno = '?'
5350
5910
for tag, revspec in tags:
5351
5911
self.outf.write('%-20s %s\n' % (tag, revspec))
5352
5912
5913
def _tags_for_range(self, branch, revision):
5914
range_valid = True
5915
rev1, rev2 = _get_revision_range(revision, branch, self.name())
5916
revid1, revid2 = rev1.rev_id, rev2.rev_id
5917
# _get_revision_range will always set revid2 if it's not specified.
5918
# If revid1 is None, it means we want to start from the branch
5919
# origin which is always a valid ancestor. If revid1 == revid2, the
5920
# ancestry check is useless.
5921
if revid1 and revid1 != revid2:
5922
# FIXME: We really want to use the same graph than
5923
# branch.iter_merge_sorted_revisions below, but this is not
5924
# easily available -- vila 2011-09-23
5925
if branch.repository.get_graph().is_ancestor(revid2, revid1):
5926
# We don't want to output anything in this case...
5927
return []
5928
# only show revisions between revid1 and revid2 (inclusive)
5929
tagged_revids = branch.tags.get_reverse_tag_dict()
5930
found = []
5931
for r in branch.iter_merge_sorted_revisions(
5932
start_revision_id=revid2, stop_revision_id=revid1,
5933
stop_rule='include'):
5934
revid_tags = tagged_revids.get(r[0], None)
5935
if revid_tags:
5936
found.extend([(tag, r[0]) for tag in revid_tags])
5937
return found
5938
5353
5939
5354
5940
class cmd_reconfigure(Command):
5355
"""Reconfigure the type of a bzr directory.
5941
__doc__ = """Reconfigure the type of a bzr directory.
5356
5942
5357
5943
A target configuration must be specified.
5358
5944
5369
5955
takes_args = ['location?']
5370
5956
takes_options = [
5371
5957
RegistryOption.from_kwargs(
5372
'target_type',
5373
title='Target type',
5374
help='The type to reconfigure the directory to.',
5958
'tree_type',
5959
title='Tree type',
5960
help='The relation between branch and tree.',
5375
5961
value_switches=True, enum_switch=False,
5376
5962
branch='Reconfigure to be an unbound branch with no working tree.',
5377
5963
tree='Reconfigure to be an unbound branch with a working tree.',
5378
5964
checkout='Reconfigure to be a bound branch with a working tree.',
5379
5965
lightweight_checkout='Reconfigure to be a lightweight'
5380
5966
' checkout (with no local history).',
5967
),
5968
RegistryOption.from_kwargs(
5969
'repository_type',
5970
title='Repository type',
5971
help='Location fo the repository.',
5972
value_switches=True, enum_switch=False,
5381
5973
standalone='Reconfigure to be a standalone branch '
5382
5974
'(i.e. stop using shared repository).',
5383
5975
use_shared='Reconfigure to use a shared repository.',
5976
),
5977
RegistryOption.from_kwargs(
5978
'repository_trees',
5979
title='Trees in Repository',
5980
help='Whether new branches in the repository have trees.',
5981
value_switches=True, enum_switch=False,
5384
5982
with_trees='Reconfigure repository to create '
5385
5983
'working trees on branches by default.',
5386
5984
with_no_trees='Reconfigure repository to not create '
5400
5998
),
5401
5999
]
5402
6000
5403
def run(self, location=None, target_type=None, bind_to=None, force=False,
5404
stacked_on=None,
5405
unstacked=None):
5406
directory = bzrdir.BzrDir.open(location)
6001
def run(self, location=None, bind_to=None, force=False,
6002
tree_type=None, repository_type=None, repository_trees=None,
6003
stacked_on=None, unstacked=None):
6004
directory = controldir.ControlDir.open(location)
5407
6005
if stacked_on and unstacked:
5408
raise BzrCommandError("Can't use both --stacked-on and --unstacked")
6006
raise errors.BzrCommandError(gettext("Can't use both --stacked-on and --unstacked"))
5409
6007
elif stacked_on is not None:
5410
6008
reconfigure.ReconfigureStackedOn().apply(directory, stacked_on)
5411
6009
elif unstacked:
5413
6011
# At the moment you can use --stacked-on and a different
5414
6012
# reconfiguration shape at the same time; there seems no good reason
5415
6013
# to ban it.
5416
if target_type is None:
6014
if (tree_type is None and
6015
repository_type is None and
6016
repository_trees is None):
5417
6017
if stacked_on or unstacked:
5418
6018
return
5419
6019
else:
5420
raise errors.BzrCommandError('No target configuration '
5421
'specified')
5422
elif target_type == 'branch':
6020
raise errors.BzrCommandError(gettext('No target configuration '
6021
'specified'))
6022
reconfiguration = None
6023
if tree_type == 'branch':
5423
6024
reconfiguration = reconfigure.Reconfigure.to_branch(directory)
5424
elif target_type == 'tree':
6025
elif tree_type == 'tree':
5425
6026
reconfiguration = reconfigure.Reconfigure.to_tree(directory)
5426
elif target_type == 'checkout':
6027
elif tree_type == 'checkout':
5427
6028
reconfiguration = reconfigure.Reconfigure.to_checkout(
5428
6029
directory, bind_to)
5429
elif target_type == 'lightweight-checkout':
6030
elif tree_type == 'lightweight-checkout':
5430
6031
reconfiguration = reconfigure.Reconfigure.to_lightweight_checkout(
5431
6032
directory, bind_to)
5432
elif target_type == 'use-shared':
6033
if reconfiguration:
6034
reconfiguration.apply(force)
6035
reconfiguration = None
6036
if repository_type == 'use-shared':
5433
6037
reconfiguration = reconfigure.Reconfigure.to_use_shared(directory)
5434
elif target_type == 'standalone':
6038
elif repository_type == 'standalone':
5435
6039
reconfiguration = reconfigure.Reconfigure.to_standalone(directory)
5436
elif target_type == 'with-trees':
6040
if reconfiguration:
6041
reconfiguration.apply(force)
6042
reconfiguration = None
6043
if repository_trees == 'with-trees':
5437
6044
reconfiguration = reconfigure.Reconfigure.set_repository_trees(
5438
6045
directory, True)
5439
elif target_type == 'with-no-trees':
6046
elif repository_trees == 'with-no-trees':
5440
6047
reconfiguration = reconfigure.Reconfigure.set_repository_trees(
5441
6048
directory, False)
5442
reconfiguration.apply(force)
6049
if reconfiguration:
6050
reconfiguration.apply(force)
6051
reconfiguration = None
5443
6052
5444
6053
5445
6054
class cmd_switch(Command):
5446
"""Set the branch of a checkout and update.
6055
__doc__ = """Set the branch of a checkout and update.
5447
6056
5448
6057
For lightweight checkouts, this changes the branch being referenced.
5449
6058
For heavyweight checkouts, this checks that there are no local commits
5466
6075
"""
5467
6076
5468
6077
takes_args = ['to_location?']
5469
takes_options = [Option('force',
6078
takes_options = ['directory',
6079
Option('force',
5470
6080
help='Switch even if local commits will be lost.'),
5471
6081
'revision',
5472
6082
Option('create-branch', short_name='b',
5475
6085
]
5476
6086
5477
6087
def run(self, to_location=None, force=False, create_branch=False,
5478
revision=None):
6088
revision=None, directory=u'.'):
5479
6089
from bzrlib import switch
5480
tree_location = '.'
6090
tree_location = directory
5481
6091
revision = _get_one_revision('switch', revision)
5482
control_dir = bzrdir.BzrDir.open_containing(tree_location)[0]
6092
control_dir = controldir.ControlDir.open_containing(tree_location)[0]
5483
6093
if to_location is None:
5484
6094
if revision is None:
5485
raise errors.BzrCommandError('You must supply either a'
5486
' revision or a location')
5487
to_location = '.'
6095
raise errors.BzrCommandError(gettext('You must supply either a'
6096
' revision or a location'))
6097
to_location = tree_location
5488
6098
try:
5489
6099
branch = control_dir.open_branch()
5490
6100
had_explicit_nick = branch.get_config().has_explicit_nickname()
5493
6103
had_explicit_nick = False
5494
6104
if create_branch:
5495
6105
if branch is None:
5496
raise errors.BzrCommandError('cannot create branch without'
5497
' source branch')
6106
raise errors.BzrCommandError(gettext('cannot create branch without'
6107
' source branch'))
5498
6108
to_location = directory_service.directories.dereference(
5499
6109
to_location)
5500
6110
if '/' not in to_location and '\\' not in to_location:
5501
6111
# This path is meant to be relative to the existing branch
5502
6112
this_url = self._get_branch_location(control_dir)
5503
to_location = urlutils.join(this_url, '..', to_location)
6113
# Perhaps the target control dir supports colocated branches?
6114
try:
6115
root = controldir.ControlDir.open(this_url,
6116
possible_transports=[control_dir.user_transport])
6117
except errors.NotBranchError:
6118
colocated = False
6119
else:
6120
colocated = root._format.colocated_branches
6121
if colocated:
6122
to_location = urlutils.join_segment_parameters(this_url,
6123
{"branch": urlutils.escape(to_location)})
6124
else:
6125
to_location = urlutils.join(
6126
this_url, '..', urlutils.escape(to_location))
5504
6127
to_branch = branch.bzrdir.sprout(to_location,
5505
6128
possible_transports=[branch.bzrdir.root_transport],
5506
6129
source_branch=branch).open_branch()
5507
6130
else:
6131
# Perhaps it's a colocated branch?
5508
6132
try:
5509
to_branch = Branch.open(to_location)
5510
except errors.NotBranchError:
5511
this_url = self._get_branch_location(control_dir)
5512
to_branch = Branch.open(
5513
urlutils.join(this_url, '..', to_location))
6133
to_branch = control_dir.open_branch(to_location)
6134
except (errors.NotBranchError, errors.NoColocatedBranchSupport):
6135
try:
6136
to_branch = Branch.open(to_location)
6137
except errors.NotBranchError:
6138
this_url = self._get_branch_location(control_dir)
6139
to_branch = Branch.open(
6140
urlutils.join(
6141
this_url, '..', urlutils.escape(to_location)))
5514
6142
if revision is not None:
5515
6143
revision = revision.as_revision_id(to_branch)
5516
6144
switch.switch(control_dir, to_branch, force, revision_id=revision)
5517
6145
if had_explicit_nick:
5518
6146
branch = control_dir.open_branch() #get the new branch!
5519
6147
branch.nick = to_branch.nick
5520
note('Switched to branch: %s',
6148
note(gettext('Switched to branch: %s'),
5521
6149
urlutils.unescape_for_display(to_branch.base, 'utf-8'))
5522
6150
5523
6151
def _get_branch_location(self, control_dir):
5539
6167
5540
6168
5541
6169
class cmd_view(Command):
5542
"""Manage filtered views.
6170
__doc__ = """Manage filtered views.
5543
6171
5544
6172
Views provide a mask over the tree so that users can focus on
5545
6173
a subset of a tree when doing their work. After creating a view,
5625
6253
name=None,
5626
6254
switch=None,
5627
6255
):
5628
tree, file_list = tree_files(file_list, apply_view=False)
6256
tree, file_list = WorkingTree.open_containing_paths(file_list,
6257
apply_view=False)
5629
6258
current_view, view_dict = tree.views.get_view_info()
5630
6259
if name is None:
5631
6260
name = current_view
5632
6261
if delete:
5633
6262
if file_list:
5634
raise errors.BzrCommandError(
5635
"Both --delete and a file list specified")
6263
raise errors.BzrCommandError(gettext(
6264
"Both --delete and a file list specified"))
5636
6265
elif switch:
5637
raise errors.BzrCommandError(
5638
"Both --delete and --switch specified")
6266
raise errors.BzrCommandError(gettext(
6267
"Both --delete and --switch specified"))
5639
6268
elif all:
5640
6269
tree.views.set_view_info(None, {})
5641
self.outf.write("Deleted all views.\n")
6270
self.outf.write(gettext("Deleted all views.\n"))
5642
6271
elif name is None:
5643
raise errors.BzrCommandError("No current view to delete")
6272
raise errors.BzrCommandError(gettext("No current view to delete"))
5644
6273
else:
5645
6274
tree.views.delete_view(name)
5646
self.outf.write("Deleted '%s' view.\n" % name)
6275
self.outf.write(gettext("Deleted '%s' view.\n") % name)
5647
6276
elif switch:
5648
6277
if file_list:
5649
raise errors.BzrCommandError(
5650
"Both --switch and a file list specified")
6278
raise errors.BzrCommandError(gettext(
6279
"Both --switch and a file list specified"))
5651
6280
elif all:
5652
raise errors.BzrCommandError(
5653
"Both --switch and --all specified")
6281
raise errors.BzrCommandError(gettext(
6282
"Both --switch and --all specified"))
5654
6283
elif switch == 'off':
5655
6284
if current_view is None:
5656
raise errors.BzrCommandError("No current view to disable")
6285
raise errors.BzrCommandError(gettext("No current view to disable"))
5657
6286
tree.views.set_view_info(None, view_dict)
5658
self.outf.write("Disabled '%s' view.\n" % (current_view))
6287
self.outf.write(gettext("Disabled '%s' view.\n") % (current_view))
5659
6288
else:
5660
6289
tree.views.set_view_info(switch, view_dict)
5661
6290
view_str = views.view_display_str(tree.views.lookup_view())
5662
self.outf.write("Using '%s' view: %s\n" % (switch, view_str))
6291
self.outf.write(gettext("Using '{0}' view: {1}\n").format(switch, view_str))
5663
6292
elif all:
5664
6293
if view_dict:
5665
self.outf.write('Views defined:\n')
6294
self.outf.write(gettext('Views defined:\n'))
5666
6295
for view in sorted(view_dict):
5667
6296
if view == current_view:
5668
6297
active = "=>"
5671
6300
view_str = views.view_display_str(view_dict[view])
5672
6301
self.outf.write('%s %-20s %s\n' % (active, view, view_str))
5673
6302
else:
5674
self.outf.write('No views defined.\n')
6303
self.outf.write(gettext('No views defined.\n'))
5675
6304
elif file_list:
5676
6305
if name is None:
5677
6306
# No name given and no current view set
5678
6307
name = 'my'
5679
6308
elif name == 'off':
5680
raise errors.BzrCommandError(
5681
"Cannot change the 'off' pseudo view")
6309
raise errors.BzrCommandError(gettext(
6310
"Cannot change the 'off' pseudo view"))
5682
6311
tree.views.set_view(name, sorted(file_list))
5683
6312
view_str = views.view_display_str(tree.views.lookup_view())
5684
self.outf.write("Using '%s' view: %s\n" % (name, view_str))
6313
self.outf.write(gettext("Using '{0}' view: {1}\n").format(name, view_str))
5685
6314
else:
5686
6315
# list the files
5687
6316
if name is None:
5688
6317
# No name given and no current view set
5689
self.outf.write('No current view.\n')
6318
self.outf.write(gettext('No current view.\n'))
5690
6319
else:
5691
6320
view_str = views.view_display_str(tree.views.lookup_view(name))
5692
self.outf.write("'%s' view is: %s\n" % (name, view_str))
6321
self.outf.write(gettext("'{0}' view is: {1}\n").format(name, view_str))
5693
6322
5694
6323
5695
6324
class cmd_hooks(Command):
5696
"""Show hooks."""
6325
__doc__ = """Show hooks."""
5697
6326
5698
6327
hidden = True
5699
6328
5709
6338
self.outf.write(" %s\n" %
5710
6339
(some_hooks.get_hook_name(hook),))
5711
6340
else:
5712
self.outf.write(" <no hooks installed>\n")
6341
self.outf.write(gettext(" <no hooks installed>\n"))
6342
6343
6344
class cmd_remove_branch(Command):
6345
__doc__ = """Remove a branch.
6346
6347
This will remove the branch from the specified location but
6348
will keep any working tree or repository in place.
6349
6350
:Examples:
6351
6352
Remove the branch at repo/trunk::
6353
6354
bzr remove-branch repo/trunk
6355
6356
"""
6357
6358
takes_args = ["location?"]
6359
6360
aliases = ["rmbranch"]
6361
6362
def run(self, location=None):
6363
if location is None:
6364
location = "."
6365
branch = Branch.open_containing(location)[0]
6366
branch.bzrdir.destroy_branch()
5713
6367
5714
6368
5715
6369
class cmd_shelve(Command):
5716
"""Temporarily set aside some changes from the current tree.
6370
__doc__ = """Temporarily set aside some changes from the current tree.
5717
6371
5718
6372
Shelve allows you to temporarily put changes you've made "on the shelf",
5719
6373
ie. out of the way, until a later time when you can bring them back from
5735
6389
5736
6390
You can put multiple items on the shelf, and by default, 'unshelve' will
5737
6391
restore the most recently shelved changes.
6392
6393
For complicated changes, it is possible to edit the changes in a separate
6394
editor program to decide what the file remaining in the working copy
6395
should look like. To do this, add the configuration option
6396
6397
change_editor = PROGRAM @new_path @old_path
6398
6399
where @new_path is replaced with the path of the new version of the
6400
file and @old_path is replaced with the path of the old version of
6401
the file. The PROGRAM should save the new file with the desired
6402
contents of the file in the working tree.
6403
5738
6404
"""
5739
6405
5740
6406
takes_args = ['file*']
5741
6407
5742
6408
takes_options = [
6409
'directory',
5743
6410
'revision',
5744
6411
Option('all', help='Shelve all changes.'),
5745
6412
'message',
5751
6418
Option('destroy',
5752
6419
help='Destroy removed changes instead of shelving them.'),
5753
6420
]
5754
_see_also = ['unshelve']
6421
_see_also = ['unshelve', 'configuration']
5755
6422
5756
6423
def run(self, revision=None, all=False, file_list=None, message=None,
5757
writer=None, list=False, destroy=False):
6424
writer=None, list=False, destroy=False, directory=None):
5758
6425
if list:
5759
return self.run_for_list()
6426
return self.run_for_list(directory=directory)
5760
6427
from bzrlib.shelf_ui import Shelver
5761
6428
if writer is None:
5762
6429
writer = bzrlib.option.diff_writer_registry.get()
5763
6430
try:
5764
6431
shelver = Shelver.from_args(writer(sys.stdout), revision, all,
5765
file_list, message, destroy=destroy)
6432
file_list, message, destroy=destroy, directory=directory)
5766
6433
try:
5767
6434
shelver.run()
5768
6435
finally:
5770
6437
except errors.UserAbort:
5771
6438
return 0
5772
6439
5773
def run_for_list(self):
5774
tree = WorkingTree.open_containing('.')[0]
5775
tree.lock_read()
5776
self.add_cleanup(tree.unlock)
6440
def run_for_list(self, directory=None):
6441
if directory is None:
6442
directory = u'.'
6443
tree = WorkingTree.open_containing(directory)[0]
6444
self.add_cleanup(tree.lock_read().unlock)
5777
6445
manager = tree.get_shelf_manager()
5778
6446
shelves = manager.active_shelves()
5779
6447
if len(shelves) == 0:
5780
note('No shelved changes.')
6448
note(gettext('No shelved changes.'))
5781
6449
return 0
5782
6450
for shelf_id in reversed(shelves):
5783
6451
message = manager.get_metadata(shelf_id).get('message')
5788
6456
5789
6457
5790
6458
class cmd_unshelve(Command):
5791
"""Restore shelved changes.
6459
__doc__ = """Restore shelved changes.
5792
6460
5793
6461
By default, the most recently shelved changes are restored. However if you
5794
6462
specify a shelf by id those changes will be restored instead. This works
5797
6465
5798
6466
takes_args = ['shelf_id?']
5799
6467
takes_options = [
6468
'directory',
5800
6469
RegistryOption.from_kwargs(
5801
6470
'action', help="The action to perform.",
5802
6471
enum_switch=False, value_switches=True,
5810
6479
]
5811
6480
_see_also = ['shelve']
5812
6481
5813
def run(self, shelf_id=None, action='apply'):
6482
def run(self, shelf_id=None, action='apply', directory=u'.'):
5814
6483
from bzrlib.shelf_ui import Unshelver
5815
unshelver = Unshelver.from_args(shelf_id, action)
6484
unshelver = Unshelver.from_args(shelf_id, action, directory=directory)
5816
6485
try:
5817
6486
unshelver.run()
5818
6487
finally:
5820
6489
5821
6490
5822
6491
class cmd_clean_tree(Command):
5823
"""Remove unwanted files from working tree.
6492
__doc__ = """Remove unwanted files from working tree.
5824
6493
5825
6494
By default, only unknown files, not ignored files, are deleted. Versioned
5826
6495
files are never deleted.
5834
6503
5835
6504
To check what clean-tree will do, use --dry-run.
5836
6505
"""
5837
takes_options = [Option('ignored', help='Delete all ignored files.'),
5838
Option('detritus', help='Delete conflict files, merge'
6506
takes_options = ['directory',
6507
Option('ignored', help='Delete all ignored files.'),
6508
Option('detritus', help='Delete conflict files, merge and revert'
5839
6509
' backups, and failed selftest dirs.'),
5840
6510
Option('unknown',
5841
6511
help='Delete files unknown to bzr (default).'),
5843
6513
' deleting them.'),
5844
6514
Option('force', help='Do not prompt before deleting.')]
5845
6515
def run(self, unknown=False, ignored=False, detritus=False, dry_run=False,
5846
force=False):
6516
force=False, directory=u'.'):
5847
6517
from bzrlib.clean_tree import clean_tree
5848
6518
if not (unknown or ignored or detritus):
5849
6519
unknown = True
5850
6520
if dry_run:
5851
6521
force = True
5852
clean_tree('.', unknown=unknown, ignored=ignored, detritus=detritus,
5853
dry_run=dry_run, no_prompt=force)
6522
clean_tree(directory, unknown=unknown, ignored=ignored,
6523
detritus=detritus, dry_run=dry_run, no_prompt=force)
5854
6524
5855
6525
5856
6526
class cmd_reference(Command):
5857
"""list, view and set branch locations for nested trees.
6527
__doc__ = """list, view and set branch locations for nested trees.
5858
6528
5859
6529
If no arguments are provided, lists the branch locations for nested trees.
5860
6530
If one argument is provided, display the branch location for that tree.
5870
6540
if path is not None:
5871
6541
branchdir = path
5872
6542
tree, branch, relpath =(
5873
bzrdir.BzrDir.open_containing_tree_or_branch(branchdir))
6543
controldir.ControlDir.open_containing_tree_or_branch(branchdir))
5874
6544
if path is not None:
5875
6545
path = relpath
5876
6546
if tree is None:
5900
6570
self.outf.write('%s %s\n' % (path, location))
5901
6571
5902
6572
5903
# these get imported and then picked up by the scan for cmd_*
5904
# TODO: Some more consistent way to split command definitions across files;
5905
# we do need to load at least some information about them to know of
5906
# aliases. ideally we would avoid loading the implementation until the
5907
# details were needed.
5908
from bzrlib.cmd_version_info import cmd_version_info
5909
from bzrlib.conflicts import cmd_resolve, cmd_conflicts, restore
5910
from bzrlib.bundle.commands import (
5911
cmd_bundle_info,
5912
)
5913
from bzrlib.foreign import cmd_dpush
5914
from bzrlib.sign_my_commits import cmd_sign_my_commits
5915
from bzrlib.weave_commands import cmd_versionedfile_list, \
5916
cmd_weave_plan_merge, cmd_weave_merge_text
6573
class cmd_export_pot(Command):
6574
__doc__ = """Export command helps and error messages in po format."""
6575
6576
hidden = True
6577
takes_options = [Option('plugin',
6578
help='Export help text from named command '\
6579
'(defaults to all built in commands).',
6580
type=str),
6581
Option('include-duplicates',
6582
help='Output multiple copies of the same msgid '
6583
'string if it appears more than once.'),
6584
]
6585
6586
def run(self, plugin=None, include_duplicates=False):
6587
from bzrlib.export_pot import export_pot
6588
export_pot(self.outf, plugin, include_duplicates)
6589
6590
6591
def _register_lazy_builtins():
6592
# register lazy builtins from other modules; called at startup and should
6593
# be only called once.
6594
for (name, aliases, module_name) in [
6595
('cmd_bundle_info', [], 'bzrlib.bundle.commands'),
6596
('cmd_config', [], 'bzrlib.config'),
6597
('cmd_dpush', [], 'bzrlib.foreign'),
6598
('cmd_version_info', [], 'bzrlib.cmd_version_info'),
6599
('cmd_resolve', ['resolved'], 'bzrlib.conflicts'),
6600
('cmd_conflicts', [], 'bzrlib.conflicts'),
6601
('cmd_sign_my_commits', [], 'bzrlib.commit_signature_commands'),
6602
('cmd_verify_signatures', [],
6603
'bzrlib.commit_signature_commands'),
6604
('cmd_test_script', [], 'bzrlib.cmd_test_script'),
6605
]:
6606
builtin_command_registry.register_lazy(name, aliases, module_name)
Loggerhead is a web-based interface for Breezy
Version: 2.0.1