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