« back to all changes in this revision
Viewing changes to bzrlib/builtins.py
- browse files at revision 6165.4.8
- compare with another revision
- download diff
- download tarball
- view history from revision 6165.4.8
- Committer: Jelmer Vernooij
- Date: 2011-09-26 15:21:01 UTC
- mfrom: (6165.2.3 avoid-revision-history)
- mto: This revision was merged to the branch mainline in revision 6216.
- Revision ID: jelmer@samba.org-20110926152101-afcxw1hikybyivfd
merge avoid-revision-history.
- 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/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
20
20
21
21
from bzrlib.lazy_import import lazy_import
22
22
lazy_import(globals(), """
23
import codecs
24
23
import cStringIO
25
24
import sys
26
25
import time
33
32
bzrdir,
34
33
directory_service,
35
34
delta,
36
config,
35
config as _mod_config,
37
36
errors,
38
37
globbing,
39
38
hooks,
45
44
rename_map,
46
45
revision as _mod_revision,
47
46
static_tuple,
48
symbol_versioning,
49
47
timestamp,
50
48
transport,
51
49
ui,
52
50
urlutils,
53
51
views,
52
gpg,
54
53
)
55
54
from bzrlib.branch import Branch
56
55
from bzrlib.conflicts import ConflictList
58
57
from bzrlib.revisionspec import RevisionSpec, RevisionInfo
59
58
from bzrlib.smtp_connection import SMTPConnection
60
59
from bzrlib.workingtree import WorkingTree
60
from bzrlib.i18n import gettext, ngettext
61
61
""")
62
62
63
from bzrlib.commands import Command, display_command
63
from bzrlib.commands import (
64
Command,
65
builtin_command_registry,
66
display_command,
67
)
64
68
from bzrlib.option import (
65
69
ListOption,
66
70
Option,
69
73
_parse_revision_str,
70
74
)
71
75
from bzrlib.trace import mutter, note, warning, is_quiet, get_verbosity_level
72
73
76
from bzrlib import (
77
symbol_versioning,
78
)
79
80
81
@symbol_versioning.deprecated_function(symbol_versioning.deprecated_in((2, 3, 0)))
74
82
def tree_files(file_list, default_branch=u'.', canonicalize=True,
75
83
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]))
84
return internal_tree_files(file_list, default_branch, canonicalize,
85
apply_view)
82
86
83
87
84
88
def tree_files_for_add(file_list):
109
113
if view_files:
110
114
file_list = view_files
111
115
view_str = views.view_display_str(view_files)
112
note("Ignoring files outside view. View is %s" % view_str)
116
note(gettext("Ignoring files outside view. View is %s") % view_str)
113
117
return tree, file_list
114
118
115
119
117
121
if revisions is None:
118
122
return None
119
123
if len(revisions) != 1:
120
raise errors.BzrCommandError(
121
'bzr %s --revision takes exactly one revision identifier' % (
124
raise errors.BzrCommandError(gettext(
125
'bzr %s --revision takes exactly one revision identifier') % (
122
126
command_name,))
123
127
return revisions[0]
124
128
148
152
149
153
# XXX: Bad function name; should possibly also be a class method of
150
154
# WorkingTree rather than a function.
155
@symbol_versioning.deprecated_function(symbol_versioning.deprecated_in((2, 3, 0)))
151
156
def internal_tree_files(file_list, default_branch=u'.', canonicalize=True,
152
157
apply_view=True):
153
158
"""Convert command-line paths to a WorkingTree and relative paths.
154
159
160
Deprecated: use WorkingTree.open_containing_paths instead.
161
155
162
This is typically used for command-line processors that take one or
156
163
more filenames, and infer the workingtree that contains them.
157
164
167
174
168
175
:return: workingtree, [relative_paths]
169
176
"""
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
177
return WorkingTree.open_containing_paths(
178
file_list, default_directory='.',
179
canonicalize=True,
180
apply_view=True)
217
181
218
182
219
183
def _get_view_info_for_change_reporter(tree):
228
192
return view_info
229
193
230
194
195
def _open_directory_or_containing_tree_or_branch(filename, directory):
196
"""Open the tree or branch containing the specified file, unless
197
the --directory option is used to specify a different branch."""
198
if directory is not None:
199
return (None, Branch.open(directory), filename)
200
return bzrdir.BzrDir.open_containing_tree_or_branch(filename)
201
202
231
203
# TODO: Make sure no commands unconditionally use the working directory as a
232
204
# branch. If a filename argument is used, the first of them should be used to
233
205
# specify the branch. (Perhaps this can be factored out into some kind of
235
207
# opens the branch?)
236
208
237
209
class cmd_status(Command):
238
"""Display status summary.
210
__doc__ = """Display status summary.
239
211
240
212
This reports on versioned and unknown files, reporting them
241
213
grouped by state. Possible states are:
261
233
unknown
262
234
Not versioned and not matching an ignore pattern.
263
235
264
Additionally for directories, symlinks and files with an executable
265
bit, Bazaar indicates their type using a trailing character: '/', '@'
266
or '*' respectively.
236
Additionally for directories, symlinks and files with a changed
237
executable bit, Bazaar indicates their type using a trailing
238
character: '/', '@' or '*' respectively. These decorations can be
239
disabled using the '--no-classify' option.
267
240
268
241
To see ignored files use 'bzr ignored'. For details on the
269
242
changes to file texts, use 'bzr diff'.
282
255
To skip the display of pending merge information altogether, use
283
256
the no-pending option or specify a file/directory.
284
257
285
If a revision argument is given, the status is calculated against
286
that revision, or between two revisions if two are provided.
258
To compare the working directory to a specific revision, pass a
259
single revision to the revision argument.
260
261
To see which files have changed in a specific revision, or between
262
two revisions, pass a revision range to the revision argument.
263
This will produce the same results as calling 'bzr diff --summarize'.
287
264
"""
288
265
289
266
# TODO: --no-recurse, --recurse options
296
273
short_name='V'),
297
274
Option('no-pending', help='Don\'t show pending merges.',
298
275
),
276
Option('no-classify',
277
help='Do not mark object type using indicator.',
278
),
299
279
]
300
280
aliases = ['st', 'stat']
301
281
304
284
305
285
@display_command
306
286
def run(self, show_ids=False, file_list=None, revision=None, short=False,
307
versioned=False, no_pending=False, verbose=False):
287
versioned=False, no_pending=False, verbose=False,
288
no_classify=False):
308
289
from bzrlib.status import show_tree_status
309
290
310
291
if revision and len(revision) > 2:
311
raise errors.BzrCommandError('bzr status --revision takes exactly'
312
' one or two revision specifiers')
292
raise errors.BzrCommandError(gettext('bzr status --revision takes exactly'
293
' one or two revision specifiers'))
313
294
314
tree, relfile_list = tree_files(file_list)
295
tree, relfile_list = WorkingTree.open_containing_paths(file_list)
315
296
# Avoid asking for specific files when that is not needed.
316
297
if relfile_list == ['']:
317
298
relfile_list = None
324
305
show_tree_status(tree, show_ids=show_ids,
325
306
specific_files=relfile_list, revision=revision,
326
307
to_file=self.outf, short=short, versioned=versioned,
327
show_pending=(not no_pending), verbose=verbose)
308
show_pending=(not no_pending), verbose=verbose,
309
classify=not no_classify)
328
310
329
311
330
312
class cmd_cat_revision(Command):
331
"""Write out metadata for a revision.
313
__doc__ = """Write out metadata for a revision.
332
314
333
315
The revision to print can either be specified by a specific
334
316
revision identifier, or you can use --revision.
336
318
337
319
hidden = True
338
320
takes_args = ['revision_id?']
339
takes_options = ['revision']
321
takes_options = ['directory', 'revision']
340
322
# cat-revision is more for frontends so should be exact
341
323
encoding = 'strict'
342
324
325
def print_revision(self, revisions, revid):
326
stream = revisions.get_record_stream([(revid,)], 'unordered', True)
327
record = stream.next()
328
if record.storage_kind == 'absent':
329
raise errors.NoSuchRevision(revisions, revid)
330
revtext = record.get_bytes_as('fulltext')
331
self.outf.write(revtext.decode('utf-8'))
332
343
333
@display_command
344
def run(self, revision_id=None, revision=None):
334
def run(self, revision_id=None, revision=None, directory=u'.'):
345
335
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')
336
raise errors.BzrCommandError(gettext('You can only supply one of'
337
' revision_id or --revision'))
348
338
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
339
raise errors.BzrCommandError(gettext('You must supply either'
340
' --revision or a revision_id'))
341
342
b = bzrdir.BzrDir.open_containing_tree_or_branch(directory)[1]
343
344
revisions = b.repository.revisions
345
if revisions is None:
346
raise errors.BzrCommandError(gettext('Repository %r does not support '
347
'access to raw revision texts'))
348
349
b.repository.lock_read()
350
try:
351
# TODO: jam 20060112 should cat-revision always output utf-8?
352
if revision_id is not None:
353
revision_id = osutils.safe_revision_id(revision_id, warn=False)
354
try:
355
self.print_revision(revisions, revision_id)
356
except errors.NoSuchRevision:
357
msg = gettext("The repository {0} contains no revision {1}.").format(
358
b.repository.base, revision_id)
359
raise errors.BzrCommandError(msg)
360
elif revision is not None:
361
for rev in revision:
362
if rev is None:
363
raise errors.BzrCommandError(
364
gettext('You cannot specify a NULL revision.'))
365
rev_id = rev.as_revision_id(b)
366
self.print_revision(revisions, rev_id)
367
finally:
368
b.repository.unlock()
369
370
370
371
371
class cmd_dump_btree(Command):
372
"""Dump the contents of a btree index file to stdout.
372
__doc__ = """Dump the contents of a btree index file to stdout.
373
373
374
374
PATH is a btree index file, it can be any URL. This includes things like
375
375
.bzr/repository/pack-names, or .bzr/repository/indices/a34b3a...ca4a4.iix
423
423
self.outf.write(page_bytes[:header_end])
424
424
page_bytes = data
425
425
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')
426
if len(page_bytes) == 0:
427
self.outf.write('(empty)\n');
428
else:
429
decomp_bytes = zlib.decompress(page_bytes)
430
self.outf.write(decomp_bytes)
431
self.outf.write('\n')
429
432
430
433
def _dump_entries(self, trans, basename):
431
434
try:
439
442
for node in bt.iter_all_entries():
440
443
# Node is made up of:
441
444
# (index, key, value, [references])
442
refs_as_tuples = static_tuple.as_tuples(node[3])
445
try:
446
refs = node[3]
447
except IndexError:
448
refs_as_tuples = None
449
else:
450
refs_as_tuples = static_tuple.as_tuples(refs)
443
451
as_tuple = (tuple(node[1]), node[2], refs_as_tuples)
444
452
self.outf.write('%s\n' % (as_tuple,))
445
453
446
454
447
455
class cmd_remove_tree(Command):
448
"""Remove the working tree from a given branch/checkout.
456
__doc__ = """Remove the working tree from a given branch/checkout.
449
457
450
458
Since a lightweight checkout is little more than a working tree
451
459
this will refuse to run against one.
457
465
takes_options = [
458
466
Option('force',
459
467
help='Remove the working tree even if it has '
460
'uncommitted changes.'),
468
'uncommitted or shelved changes.'),
461
469
]
462
470
463
471
def run(self, location_list, force=False):
470
478
try:
471
479
working = d.open_workingtree()
472
480
except errors.NoWorkingTree:
473
raise errors.BzrCommandError("No working tree to remove")
481
raise errors.BzrCommandError(gettext("No working tree to remove"))
474
482
except errors.NotLocalUrl:
475
raise errors.BzrCommandError("You cannot remove the working tree"
476
" of a remote path")
483
raise errors.BzrCommandError(gettext("You cannot remove the working tree"
484
" of a remote path"))
477
485
if not force:
478
486
if (working.has_changes()):
479
487
raise errors.UncommittedChanges(working)
488
if working.get_shelf_manager().last_shelf() is not None:
489
raise errors.ShelvedChanges(working)
480
490
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")
491
if working.user_url != working.branch.user_url:
492
raise errors.BzrCommandError(gettext("You cannot remove the working tree"
493
" from a lightweight checkout"))
486
494
487
495
d.destroy_workingtree()
488
496
489
497
498
class cmd_repair_workingtree(Command):
499
__doc__ = """Reset the working tree state file.
500
501
This is not meant to be used normally, but more as a way to recover from
502
filesystem corruption, etc. This rebuilds the working inventory back to a
503
'known good' state. Any new modifications (adding a file, renaming, etc)
504
will be lost, though modified files will still be detected as such.
505
506
Most users will want something more like "bzr revert" or "bzr update"
507
unless the state file has become corrupted.
508
509
By default this attempts to recover the current state by looking at the
510
headers of the state file. If the state file is too corrupted to even do
511
that, you can supply --revision to force the state of the tree.
512
"""
513
514
takes_options = ['revision', 'directory',
515
Option('force',
516
help='Reset the tree even if it doesn\'t appear to be'
517
' corrupted.'),
518
]
519
hidden = True
520
521
def run(self, revision=None, directory='.', force=False):
522
tree, _ = WorkingTree.open_containing(directory)
523
self.add_cleanup(tree.lock_tree_write().unlock)
524
if not force:
525
try:
526
tree.check_state()
527
except errors.BzrError:
528
pass # There seems to be a real error here, so we'll reset
529
else:
530
# Refuse
531
raise errors.BzrCommandError(gettext(
532
'The tree does not appear to be corrupt. You probably'
533
' want "bzr revert" instead. Use "--force" if you are'
534
' sure you want to reset the working tree.'))
535
if revision is None:
536
revision_ids = None
537
else:
538
revision_ids = [r.as_revision_id(tree.branch) for r in revision]
539
try:
540
tree.reset_state(revision_ids)
541
except errors.BzrError, e:
542
if revision_ids is None:
543
extra = (gettext(', the header appears corrupt, try passing -r -1'
544
' to set the state to the last commit'))
545
else:
546
extra = ''
547
raise errors.BzrCommandError(gettext('failed to reset the tree state{0}').format(extra))
548
549
490
550
class cmd_revno(Command):
491
"""Show current revision number.
551
__doc__ = """Show current revision number.
492
552
493
553
This is equal to the number of revisions on this branch.
494
554
"""
504
564
if tree:
505
565
try:
506
566
wt = WorkingTree.open_containing(location)[0]
507
wt.lock_read()
567
self.add_cleanup(wt.lock_read().unlock)
508
568
except (errors.NoWorkingTree, errors.NotLocalUrl):
509
569
raise errors.NoWorkingTree(location)
510
self.add_cleanup(wt.unlock)
511
570
revid = wt.last_revision()
512
571
try:
513
572
revno_t = wt.branch.revision_id_to_dotted_revno(revid)
516
575
revno = ".".join(str(n) for n in revno_t)
517
576
else:
518
577
b = Branch.open_containing(location)[0]
519
b.lock_read()
520
self.add_cleanup(b.unlock)
578
self.add_cleanup(b.lock_read().unlock)
521
579
revno = b.revno()
522
580
self.cleanup_now()
523
581
self.outf.write(str(revno) + '\n')
524
582
525
583
526
584
class cmd_revision_info(Command):
527
"""Show revision number and revision id for a given revision identifier.
585
__doc__ = """Show revision number and revision id for a given revision identifier.
528
586
"""
529
587
hidden = True
530
588
takes_args = ['revision_info*']
531
589
takes_options = [
532
590
'revision',
533
Option('directory',
591
custom_help('directory',
534
592
help='Branch to examine, '
535
'rather than the one containing the working directory.',
536
short_name='d',
537
type=unicode,
538
),
593
'rather than the one containing the working directory.'),
539
594
Option('tree', help='Show revno of working tree'),
540
595
]
541
596
546
601
try:
547
602
wt = WorkingTree.open_containing(directory)[0]
548
603
b = wt.branch
549
wt.lock_read()
550
self.add_cleanup(wt.unlock)
604
self.add_cleanup(wt.lock_read().unlock)
551
605
except (errors.NoWorkingTree, errors.NotLocalUrl):
552
606
wt = None
553
607
b = Branch.open_containing(directory)[0]
554
b.lock_read()
555
self.add_cleanup(b.unlock)
608
self.add_cleanup(b.lock_read().unlock)
556
609
revision_ids = []
557
610
if revision is not None:
558
611
revision_ids.extend(rev.as_revision_id(b) for rev in revision)
586
639
587
640
588
641
class cmd_add(Command):
589
"""Add specified files or directories.
642
__doc__ = """Add specified files or directories.
590
643
591
644
In non-recursive mode, all the named items are added, regardless
592
645
of whether they were previously ignored. A warning is given if
600
653
are added. This search proceeds recursively into versioned
601
654
directories. If no names are given '.' is assumed.
602
655
656
A warning will be printed when nested trees are encountered,
657
unless they are explicitly ignored.
658
603
659
Therefore simply saying 'bzr add' will version all files that
604
660
are currently unknown.
605
661
621
677
622
678
Any files matching patterns in the ignore list will not be added
623
679
unless they are explicitly mentioned.
680
681
In recursive mode, files larger than the configuration option
682
add.maximum_file_size will be skipped. Named items are never skipped due
683
to file size.
624
684
"""
625
685
takes_args = ['file*']
626
686
takes_options = [
653
713
action = bzrlib.add.AddFromBaseAction(base_tree, base_path,
654
714
to_file=self.outf, should_print=(not is_quiet()))
655
715
else:
656
action = bzrlib.add.AddAction(to_file=self.outf,
716
action = bzrlib.add.AddWithSkipLargeAction(to_file=self.outf,
657
717
should_print=(not is_quiet()))
658
718
659
719
if base_tree:
660
base_tree.lock_read()
661
self.add_cleanup(base_tree.unlock)
720
self.add_cleanup(base_tree.lock_read().unlock)
662
721
tree, file_list = tree_files_for_add(file_list)
663
722
added, ignored = tree.smart_add(file_list, not
664
723
no_recurse, action=action, save=not dry_run)
667
726
if verbose:
668
727
for glob in sorted(ignored.keys()):
669
728
for path in ignored[glob]:
670
self.outf.write("ignored %s matching \"%s\"\n"
671
% (path, glob))
729
self.outf.write(
730
gettext("ignored {0} matching \"{1}\"\n").format(
731
path, glob))
672
732
673
733
674
734
class cmd_mkdir(Command):
675
"""Create a new versioned directory.
735
__doc__ = """Create a new versioned directory.
676
736
677
737
This is equivalent to creating the directory and then adding it.
678
738
"""
682
742
683
743
def run(self, dir_list):
684
744
for d in dir_list:
685
os.mkdir(d)
686
745
wt, dd = WorkingTree.open_containing(d)
687
wt.add([dd])
688
self.outf.write('added %s\n' % d)
746
base = os.path.dirname(dd)
747
id = wt.path2id(base)
748
if id != None:
749
os.mkdir(d)
750
wt.add([dd])
751
self.outf.write(gettext('added %s\n') % d)
752
else:
753
raise errors.NotVersionedError(path=base)
689
754
690
755
691
756
class cmd_relpath(Command):
692
"""Show path of a file relative to root"""
757
__doc__ = """Show path of a file relative to root"""
693
758
694
759
takes_args = ['filename']
695
760
hidden = True
704
769
705
770
706
771
class cmd_inventory(Command):
707
"""Show inventory of the current working copy or a revision.
772
__doc__ = """Show inventory of the current working copy or a revision.
708
773
709
774
It is possible to limit the output to a particular entry
710
775
type using the --kind option. For example: --kind file.
727
792
@display_command
728
793
def run(self, revision=None, show_ids=False, kind=None, file_list=None):
729
794
if kind and kind not in ['file', 'directory', 'symlink']:
730
raise errors.BzrCommandError('invalid kind %r specified' % (kind,))
795
raise errors.BzrCommandError(gettext('invalid kind %r specified') % (kind,))
731
796
732
797
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)
798
work_tree, file_list = WorkingTree.open_containing_paths(file_list)
799
self.add_cleanup(work_tree.lock_read().unlock)
736
800
if revision is not None:
737
801
tree = revision.as_tree(work_tree.branch)
738
802
739
803
extra_trees = [work_tree]
740
tree.lock_read()
741
self.add_cleanup(tree.unlock)
804
self.add_cleanup(tree.lock_read().unlock)
742
805
else:
743
806
tree = work_tree
744
807
extra_trees = []
748
811
require_versioned=True)
749
812
# find_ids_across_trees may include some paths that don't
750
813
# 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)
814
entries = sorted(
815
(tree.id2path(file_id), tree.inventory[file_id])
816
for file_id in file_ids if tree.has_id(file_id))
753
817
else:
754
818
entries = tree.inventory.entries()
755
819
765
829
766
830
767
831
class cmd_mv(Command):
768
"""Move or rename a file.
832
__doc__ = """Move or rename a file.
769
833
770
834
:Usage:
771
835
bzr mv OLDNAME NEWNAME
798
862
if auto:
799
863
return self.run_auto(names_list, after, dry_run)
800
864
elif dry_run:
801
raise errors.BzrCommandError('--dry-run requires --auto.')
865
raise errors.BzrCommandError(gettext('--dry-run requires --auto.'))
802
866
if names_list is None:
803
867
names_list = []
804
868
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)
869
raise errors.BzrCommandError(gettext("missing file argument"))
870
tree, rel_names = WorkingTree.open_containing_paths(names_list, canonicalize=False)
871
self.add_cleanup(tree.lock_tree_write().unlock)
809
872
self._run(tree, names_list, rel_names, after)
810
873
811
874
def run_auto(self, names_list, after, dry_run):
812
875
if names_list is not None and len(names_list) > 1:
813
raise errors.BzrCommandError('Only one path may be specified to'
814
' --auto.')
876
raise errors.BzrCommandError(gettext('Only one path may be specified to'
877
' --auto.'))
815
878
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)
879
raise errors.BzrCommandError(gettext('--after cannot be specified with'
880
' --auto.'))
881
work_tree, file_list = WorkingTree.open_containing_paths(
882
names_list, default_directory='.')
883
self.add_cleanup(work_tree.lock_tree_write().unlock)
821
884
rename_map.RenameMap.guess_renames(work_tree, dry_run)
822
885
823
886
def _run(self, tree, names_list, rel_names, after):
850
913
self.outf.write("%s => %s\n" % (src, dest))
851
914
else:
852
915
if len(names_list) != 2:
853
raise errors.BzrCommandError('to mv multiple files the'
916
raise errors.BzrCommandError(gettext('to mv multiple files the'
854
917
' destination must be a versioned'
855
' directory')
918
' directory'))
856
919
857
920
# for cicp file-systems: the src references an existing inventory
858
921
# item:
902
965
903
966
904
967
class cmd_pull(Command):
905
"""Turn this branch into a mirror of another branch.
968
__doc__ = """Turn this branch into a mirror of another branch.
906
969
907
970
By default, this command only works on branches that have not diverged.
908
971
Branches are considered diverged if the destination branch's most recent
917
980
match the remote one, use pull --overwrite. This will work even if the two
918
981
branches have diverged.
919
982
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.
983
If there is no default location set, the first pull will set it (use
984
--no-remember to avoid setting it). After that, you can omit the
985
location to use the default. To change the default, use --remember. The
986
value will only be saved if the remote location can be accessed.
924
987
925
988
Note: The location can be specified either in the form of a branch,
926
989
or in the form of a path to a file containing a merge directive generated
931
994
takes_options = ['remember', 'overwrite', 'revision',
932
995
custom_help('verbose',
933
996
help='Show logs of pulled revisions.'),
934
Option('directory',
997
custom_help('directory',
935
998
help='Branch to pull into, '
936
'rather than the one containing the working directory.',
937
short_name='d',
938
type=unicode,
939
),
999
'rather than the one containing the working directory.'),
940
1000
Option('local',
941
1001
help="Perform a local pull in a bound "
942
1002
"branch. Local pulls are not applied to "
943
1003
"the master branch."
944
1004
),
1005
Option('show-base',
1006
help="Show base revision text in conflicts.")
945
1007
]
946
1008
takes_args = ['location?']
947
1009
encoding_type = 'replace'
948
1010
949
def run(self, location=None, remember=False, overwrite=False,
1011
def run(self, location=None, remember=None, overwrite=False,
950
1012
revision=None, verbose=False,
951
directory=None, local=False):
1013
directory=None, local=False,
1014
show_base=False):
952
1015
# FIXME: too much stuff is in the command class
953
1016
revision_id = None
954
1017
mergeable = None
957
1020
try:
958
1021
tree_to = WorkingTree.open_containing(directory)[0]
959
1022
branch_to = tree_to.branch
1023
self.add_cleanup(tree_to.lock_write().unlock)
960
1024
except errors.NoWorkingTree:
961
1025
tree_to = None
962
1026
branch_to = Branch.open_containing(directory)[0]
963
1027
self.add_cleanup(branch_to.lock_write().unlock)
1028
1029
if tree_to is None and show_base:
1030
raise errors.BzrCommandError(gettext("Need working tree for --show-base."))
1031
964
1032
if local and not branch_to.get_bound_location():
965
1033
raise errors.LocalRequiresBoundBranch()
966
1034
975
1043
stored_loc = branch_to.get_parent()
976
1044
if location is None:
977
1045
if stored_loc is None:
978
raise errors.BzrCommandError("No pull location known or"
979
" specified.")
1046
raise errors.BzrCommandError(gettext("No pull location known or"
1047
" specified."))
980
1048
else:
981
1049
display_url = urlutils.unescape_for_display(stored_loc,
982
1050
self.outf.encoding)
983
1051
if not is_quiet():
984
self.outf.write("Using saved parent location: %s\n" % display_url)
1052
self.outf.write(gettext("Using saved parent location: %s\n") % display_url)
985
1053
location = stored_loc
986
1054
987
1055
revision = _get_one_revision('pull', revision)
988
1056
if mergeable is not None:
989
1057
if revision is not None:
990
raise errors.BzrCommandError(
991
'Cannot use -r with merge directives or bundles')
1058
raise errors.BzrCommandError(gettext(
1059
'Cannot use -r with merge directives or bundles'))
992
1060
mergeable.install_revisions(branch_to.repository)
993
1061
base_revision_id, revision_id, verified = \
994
1062
mergeable.get_merge_request(branch_to.repository)
996
1064
else:
997
1065
branch_from = Branch.open(location,
998
1066
possible_transports=possible_transports)
999
1000
if branch_to.get_parent() is None or remember:
1067
self.add_cleanup(branch_from.lock_read().unlock)
1068
# Remembers if asked explicitly or no previous location is set
1069
if (remember
1070
or (remember is None and branch_to.get_parent() is None)):
1001
1071
branch_to.set_parent(branch_from.base)
1002
1072
1003
if branch_from is not branch_to:
1004
branch_from.lock_read()
1005
self.add_cleanup(branch_from.unlock)
1006
1073
if revision is not None:
1007
1074
revision_id = revision.as_revision_id(branch_from)
1008
1075
1009
branch_to.lock_write()
1010
self.add_cleanup(branch_to.unlock)
1011
1076
if tree_to is not None:
1012
1077
view_info = _get_view_info_for_change_reporter(tree_to)
1013
1078
change_reporter = delta._ChangeReporter(
1015
1080
view_info=view_info)
1016
1081
result = tree_to.pull(
1017
1082
branch_from, overwrite, revision_id, change_reporter,
1018
possible_transports=possible_transports, local=local)
1083
local=local, show_base=show_base)
1019
1084
else:
1020
1085
result = branch_to.pull(
1021
1086
branch_from, overwrite, revision_id, local=local)
1025
1090
log.show_branch_change(
1026
1091
branch_to, self.outf, result.old_revno,
1027
1092
result.old_revid)
1093
if getattr(result, 'tag_conflicts', None):
1094
return 1
1095
else:
1096
return 0
1028
1097
1029
1098
1030
1099
class cmd_push(Command):
1031
"""Update a mirror of this branch.
1100
__doc__ = """Update a mirror of this branch.
1032
1101
1033
1102
The target branch will not have its working tree populated because this
1034
1103
is both expensive, and is not supported on remote file systems.
1047
1116
do a merge (see bzr help merge) from the other branch, and commit that.
1048
1117
After that you will be able to do a push without '--overwrite'.
1049
1118
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.
1119
If there is no default push location set, the first push will set it (use
1120
--no-remember to avoid setting it). After that, you can omit the
1121
location to use the default. To change the default, use --remember. The
1122
value will only be saved if the remote location can be accessed.
1054
1123
"""
1055
1124
1056
1125
_see_also = ['pull', 'update', 'working-trees']
1058
1127
Option('create-prefix',
1059
1128
help='Create the path leading up to the branch '
1060
1129
'if it does not already exist.'),
1061
Option('directory',
1130
custom_help('directory',
1062
1131
help='Branch to push from, '
1063
'rather than the one containing the working directory.',
1064
short_name='d',
1065
type=unicode,
1066
),
1132
'rather than the one containing the working directory.'),
1067
1133
Option('use-existing-dir',
1068
1134
help='By default push will fail if the target'
1069
1135
' directory exists, but does not already'
1080
1146
Option('strict',
1081
1147
help='Refuse to push if there are uncommitted changes in'
1082
1148
' the working tree, --no-strict disables the check.'),
1149
Option('no-tree',
1150
help="Don't populate the working tree, even for protocols"
1151
" that support it."),
1083
1152
]
1084
1153
takes_args = ['location?']
1085
1154
encoding_type = 'replace'
1086
1155
1087
def run(self, location=None, remember=False, overwrite=False,
1156
def run(self, location=None, remember=None, overwrite=False,
1088
1157
create_prefix=False, verbose=False, revision=None,
1089
1158
use_existing_dir=False, directory=None, stacked_on=None,
1090
stacked=False, strict=None):
1159
stacked=False, strict=None, no_tree=False):
1091
1160
from bzrlib.push import _show_push_branch
1092
1161
1093
1162
if directory is None:
1095
1164
# Get the source branch
1096
1165
(tree, br_from,
1097
1166
_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
1101
1167
# Get the tip's revision_id
1102
1168
revision = _get_one_revision('push', revision)
1103
1169
if revision is not None:
1104
1170
revision_id = revision.in_history(br_from).rev_id
1105
1171
else:
1106
1172
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
1173
if tree is not None and revision_id is None:
1174
tree.check_changed_or_out_of_date(
1175
strict, 'push_strict',
1176
more_error='Use --no-strict to force the push.',
1177
more_warning='Uncommitted changes will not be pushed.')
1118
1178
# Get the stacked_on branch, if any
1119
1179
if stacked_on is not None:
1120
1180
stacked_on = urlutils.normalize_url(stacked_on)
1130
1190
# error by the feedback given to them. RBC 20080227.
1131
1191
stacked_on = parent_url
1132
1192
if not stacked_on:
1133
raise errors.BzrCommandError(
1134
"Could not determine branch to refer to.")
1193
raise errors.BzrCommandError(gettext(
1194
"Could not determine branch to refer to."))
1135
1195
1136
1196
# Get the destination location
1137
1197
if location is None:
1138
1198
stored_loc = br_from.get_push_location()
1139
1199
if stored_loc is None:
1140
raise errors.BzrCommandError(
1141
"No push location known or specified.")
1200
raise errors.BzrCommandError(gettext(
1201
"No push location known or specified."))
1142
1202
else:
1143
1203
display_url = urlutils.unescape_for_display(stored_loc,
1144
1204
self.outf.encoding)
1145
self.outf.write("Using saved push location: %s\n" % display_url)
1205
note(gettext("Using saved push location: %s") % display_url)
1146
1206
location = stored_loc
1147
1207
1148
1208
_show_push_branch(br_from, revision_id, location, self.outf,
1149
1209
verbose=verbose, overwrite=overwrite, remember=remember,
1150
1210
stacked_on=stacked_on, create_prefix=create_prefix,
1151
use_existing_dir=use_existing_dir)
1211
use_existing_dir=use_existing_dir, no_tree=no_tree)
1152
1212
1153
1213
1154
1214
class cmd_branch(Command):
1155
"""Create a new branch that is a copy of an existing branch.
1215
__doc__ = """Create a new branch that is a copy of an existing branch.
1156
1216
1157
1217
If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will
1158
1218
be used. In other words, "branch ../foo/bar" will attempt to create ./bar.
1163
1223
1164
1224
To retrieve the branch as of a particular revision, supply the --revision
1165
1225
parameter, as in "branch foo/bar -r 5".
1226
1227
The synonyms 'clone' and 'get' for this command are deprecated.
1166
1228
"""
1167
1229
1168
1230
_see_also = ['checkout']
1169
1231
takes_args = ['from_location', 'to_location?']
1170
takes_options = ['revision', Option('hardlink',
1171
help='Hard-link working tree files where possible.'),
1232
takes_options = ['revision',
1233
Option('hardlink', help='Hard-link working tree files where possible.'),
1234
Option('files-from', type=str,
1235
help="Get file contents from this tree."),
1172
1236
Option('no-tree',
1173
1237
help="Create a branch without a working-tree."),
1174
1238
Option('switch',
1192
1256
1193
1257
def run(self, from_location, to_location=None, revision=None,
1194
1258
hardlink=False, stacked=False, standalone=False, no_tree=False,
1195
use_existing_dir=False, switch=False, bind=False):
1259
use_existing_dir=False, switch=False, bind=False,
1260
files_from=None):
1196
1261
from bzrlib import switch as _mod_switch
1197
1262
from bzrlib.tag import _merge_tags_if_possible
1263
if self.invoked_as in ['get', 'clone']:
1264
ui.ui_factory.show_user_warning(
1265
'deprecated_command',
1266
deprecated_name=self.invoked_as,
1267
recommended_name='branch',
1268
deprecated_in_version='2.4')
1198
1269
accelerator_tree, br_from = bzrdir.BzrDir.open_tree_or_branch(
1199
1270
from_location)
1271
if not (hardlink or files_from):
1272
# accelerator_tree is usually slower because you have to read N
1273
# files (no readahead, lots of seeks, etc), but allow the user to
1274
# explicitly request it
1275
accelerator_tree = None
1276
if files_from is not None and files_from != from_location:
1277
accelerator_tree = WorkingTree.open(files_from)
1200
1278
revision = _get_one_revision('branch', revision)
1201
br_from.lock_read()
1202
self.add_cleanup(br_from.unlock)
1279
self.add_cleanup(br_from.lock_read().unlock)
1203
1280
if revision is not None:
1204
1281
revision_id = revision.as_revision_id(br_from)
1205
1282
else:
1214
1291
to_transport.mkdir('.')
1215
1292
except errors.FileExists:
1216
1293
if not use_existing_dir:
1217
raise errors.BzrCommandError('Target directory "%s" '
1218
'already exists.' % to_location)
1294
raise errors.BzrCommandError(gettext('Target directory "%s" '
1295
'already exists.') % to_location)
1219
1296
else:
1220
1297
try:
1221
1298
bzrdir.BzrDir.open_from_transport(to_transport)
1224
1301
else:
1225
1302
raise errors.AlreadyBranchError(to_location)
1226
1303
except errors.NoSuchFile:
1227
raise errors.BzrCommandError('Parent of "%s" does not exist.'
1304
raise errors.BzrCommandError(gettext('Parent of "%s" does not exist.')
1228
1305
% to_location)
1229
1306
try:
1230
1307
# preserve whatever source format we have.
1238
1315
branch = dir.open_branch()
1239
1316
except errors.NoSuchRevision:
1240
1317
to_transport.delete_tree('.')
1241
msg = "The branch %s has no revision %s." % (from_location,
1242
revision)
1318
msg = gettext("The branch {0} has no revision {1}.").format(
1319
from_location, revision)
1243
1320
raise errors.BzrCommandError(msg)
1244
1321
_merge_tags_if_possible(br_from, branch)
1245
1322
# If the source branch is stacked, the new branch may
1246
1323
# be stacked whether we asked for that explicitly or not.
1247
1324
# We therefore need a try/except here and not just 'if stacked:'
1248
1325
try:
1249
note('Created new stacked branch referring to %s.' %
1326
note(gettext('Created new stacked branch referring to %s.') %
1250
1327
branch.get_stacked_on_url())
1251
1328
except (errors.NotStacked, errors.UnstackableBranchFormat,
1252
1329
errors.UnstackableRepositoryFormat), e:
1253
note('Branched %d revision(s).' % branch.revno())
1330
note(ngettext('Branched %d revision.', 'Branched %d revisions.', branch.revno()) % branch.revno())
1254
1331
if bind:
1255
1332
# Bind to the parent
1256
1333
parent_branch = Branch.open(from_location)
1257
1334
branch.bind(parent_branch)
1258
note('New branch bound to %s' % from_location)
1335
note(gettext('New branch bound to %s') % from_location)
1259
1336
if switch:
1260
1337
# Switch to the new branch
1261
1338
wt, _ = WorkingTree.open_containing('.')
1262
1339
_mod_switch.switch(wt.bzrdir, branch)
1263
note('Switched to branch: %s',
1340
note(gettext('Switched to branch: %s'),
1264
1341
urlutils.unescape_for_display(branch.base, 'utf-8'))
1265
1342
1266
1343
1344
class cmd_branches(Command):
1345
__doc__ = """List the branches available at the current location.
1346
1347
This command will print the names of all the branches at the current location.
1348
"""
1349
1350
takes_args = ['location?']
1351
1352
def run(self, location="."):
1353
dir = bzrdir.BzrDir.open_containing(location)[0]
1354
for branch in dir.list_branches():
1355
if branch.name is None:
1356
self.outf.write(gettext(" (default)\n"))
1357
else:
1358
self.outf.write(" %s\n" % branch.name.encode(self.outf.encoding))
1359
1360
1267
1361
class cmd_checkout(Command):
1268
"""Create a new checkout of an existing branch.
1362
__doc__ = """Create a new checkout of an existing branch.
1269
1363
1270
1364
If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree for
1271
1365
the branch found in '.'. This is useful if you have removed the working tree
1310
1404
to_location = branch_location
1311
1405
accelerator_tree, source = bzrdir.BzrDir.open_tree_or_branch(
1312
1406
branch_location)
1407
if not (hardlink or files_from):
1408
# accelerator_tree is usually slower because you have to read N
1409
# files (no readahead, lots of seeks, etc), but allow the user to
1410
# explicitly request it
1411
accelerator_tree = None
1313
1412
revision = _get_one_revision('checkout', revision)
1314
if files_from is not None:
1413
if files_from is not None and files_from != branch_location:
1315
1414
accelerator_tree = WorkingTree.open(files_from)
1316
1415
if revision is not None:
1317
1416
revision_id = revision.as_revision_id(source)
1334
1433
1335
1434
1336
1435
class cmd_renames(Command):
1337
"""Show list of renamed files.
1436
__doc__ = """Show list of renamed files.
1338
1437
"""
1339
1438
# TODO: Option to show renames between two historical versions.
1340
1439
1345
1444
@display_command
1346
1445
def run(self, dir=u'.'):
1347
1446
tree = WorkingTree.open_containing(dir)[0]
1348
tree.lock_read()
1349
self.add_cleanup(tree.unlock)
1447
self.add_cleanup(tree.lock_read().unlock)
1350
1448
new_inv = tree.inventory
1351
1449
old_tree = tree.basis_tree()
1352
old_tree.lock_read()
1353
self.add_cleanup(old_tree.unlock)
1450
self.add_cleanup(old_tree.lock_read().unlock)
1354
1451
old_inv = old_tree.inventory
1355
1452
renames = []
1356
1453
iterator = tree.iter_changes(old_tree, include_unchanged=True)
1366
1463
1367
1464
1368
1465
class cmd_update(Command):
1369
"""Update a tree to have the latest code committed to its branch.
1466
__doc__ = """Update a tree to have the latest code committed to its branch.
1370
1467
1371
1468
This will perform a merge into the working tree, and may generate
1372
1469
conflicts. If you have any local changes, you will still
1375
1472
If you want to discard your local changes, you can just do a
1376
1473
'bzr revert' instead of 'bzr commit' after the update.
1377
1474
1475
If you want to restore a file that has been removed locally, use
1476
'bzr revert' instead of 'bzr update'.
1477
1378
1478
If the tree's branch is bound to a master branch, it will also update
1379
1479
the branch from the master.
1380
1480
"""
1381
1481
1382
1482
_see_also = ['pull', 'working-trees', 'status-flags']
1383
1483
takes_args = ['dir?']
1384
takes_options = ['revision']
1484
takes_options = ['revision',
1485
Option('show-base',
1486
help="Show base revision text in conflicts."),
1487
]
1385
1488
aliases = ['up']
1386
1489
1387
def run(self, dir='.', revision=None):
1490
def run(self, dir='.', revision=None, show_base=None):
1388
1491
if revision is not None and len(revision) != 1:
1389
raise errors.BzrCommandError(
1390
"bzr update --revision takes exactly one revision")
1492
raise errors.BzrCommandError(gettext(
1493
"bzr update --revision takes exactly one revision"))
1391
1494
tree = WorkingTree.open_containing(dir)[0]
1392
1495
branch = tree.branch
1393
1496
possible_transports = []
1394
1497
master = branch.get_master_branch(
1395
1498
possible_transports=possible_transports)
1396
1499
if master is not None:
1397
tree.lock_write()
1398
1500
branch_location = master.base
1501
tree.lock_write()
1399
1502
else:
1503
branch_location = tree.branch.base
1400
1504
tree.lock_tree_write()
1401
branch_location = tree.branch.base
1402
1505
self.add_cleanup(tree.unlock)
1403
1506
# get rid of the final '/' and be ready for display
1404
branch_location = urlutils.unescape_for_display(branch_location[:-1],
1405
self.outf.encoding)
1507
branch_location = urlutils.unescape_for_display(
1508
branch_location.rstrip('/'),
1509
self.outf.encoding)
1406
1510
existing_pending_merges = tree.get_parent_ids()[1:]
1407
1511
if master is None:
1408
1512
old_tip = None
1416
1520
else:
1417
1521
revision_id = branch.last_revision()
1418
1522
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))
1523
revno = branch.revision_id_to_dotted_revno(revision_id)
1524
note(gettext("Tree is up to date at revision {0} of branch {1}"
1525
).format('.'.join(map(str, revno)), branch_location))
1422
1526
return 0
1423
1527
view_info = _get_view_info_for_change_reporter(tree)
1424
1528
change_reporter = delta._ChangeReporter(
1429
1533
change_reporter,
1430
1534
possible_transports=possible_transports,
1431
1535
revision=revision_id,
1432
old_tip=old_tip)
1536
old_tip=old_tip,
1537
show_base=show_base)
1433
1538
except errors.NoSuchRevision, e:
1434
raise errors.BzrCommandError(
1539
raise errors.BzrCommandError(gettext(
1435
1540
"branch has no revision %s\n"
1436
1541
"bzr update --revision only works"
1437
" for a revision in the branch history"
1542
" for a revision in the branch history")
1438
1543
% (e.revision))
1439
revno = tree.branch.revision_id_to_revno(
1544
revno = tree.branch.revision_id_to_dotted_revno(
1440
1545
_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'.")
1546
note(gettext('Updated to revision {0} of branch {1}').format(
1547
'.'.join(map(str, revno)), branch_location))
1548
parent_ids = tree.get_parent_ids()
1549
if parent_ids[1:] and parent_ids[1:] != existing_pending_merges:
1550
note(gettext('Your local commits will now show as pending merges with '
1551
"'bzr status', and can be committed with 'bzr commit'."))
1446
1552
if conflicts != 0:
1447
1553
return 1
1448
1554
else:
1450
1556
1451
1557
1452
1558
class cmd_info(Command):
1453
"""Show information about a working tree, branch or repository.
1559
__doc__ = """Show information about a working tree, branch or repository.
1454
1560
1455
1561
This command will show all known locations and formats associated to the
1456
1562
tree, branch or repository.
1494
1600
1495
1601
1496
1602
class cmd_remove(Command):
1497
"""Remove files or directories.
1603
__doc__ = """Remove files or directories.
1498
1604
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.
1605
This makes Bazaar stop tracking changes to the specified files. Bazaar will
1606
delete them if they can easily be recovered using revert otherwise they
1607
will be backed up (adding an extention of the form .~#~). If no options or
1608
parameters are given Bazaar will scan for files that are being tracked by
1609
Bazaar but missing in your tree and stop tracking them for you.
1503
1610
"""
1504
1611
takes_args = ['file*']
1505
1612
takes_options = ['verbose',
1507
1614
RegistryOption.from_kwargs('file-deletion-strategy',
1508
1615
'The file deletion mode to be used.',
1509
1616
title='Deletion Strategy', value_switches=True, enum_switch=False,
1510
safe='Only delete files if they can be'
1511
' safely recovered (default).',
1617
safe='Backup changed files (default).',
1512
1618
keep='Delete from bzr but leave the working copy.',
1619
no_backup='Don\'t backup changed files.',
1513
1620
force='Delete all the specified files, even if they can not be '
1514
'recovered and even if they are non-empty directories.')]
1621
'recovered and even if they are non-empty directories. '
1622
'(deprecated, use no-backup)')]
1515
1623
aliases = ['rm', 'del']
1516
1624
encoding_type = 'replace'
1517
1625
1518
1626
def run(self, file_list, verbose=False, new=False,
1519
1627
file_deletion_strategy='safe'):
1520
tree, file_list = tree_files(file_list)
1628
if file_deletion_strategy == 'force':
1629
note(gettext("(The --force option is deprecated, rather use --no-backup "
1630
"in future.)"))
1631
file_deletion_strategy = 'no-backup'
1632
1633
tree, file_list = WorkingTree.open_containing_paths(file_list)
1521
1634
1522
1635
if file_list is not None:
1523
1636
file_list = [f for f in file_list]
1524
1637
1525
tree.lock_write()
1526
self.add_cleanup(tree.unlock)
1638
self.add_cleanup(tree.lock_write().unlock)
1527
1639
# Heuristics should probably all move into tree.remove_smart or
1528
1640
# some such?
1529
1641
if new:
1531
1643
specific_files=file_list).added
1532
1644
file_list = sorted([f[0] for f in added], reverse=True)
1533
1645
if len(file_list) == 0:
1534
raise errors.BzrCommandError('No matching files.')
1646
raise errors.BzrCommandError(gettext('No matching files.'))
1535
1647
elif file_list is None:
1536
1648
# missing files show up in iter_changes(basis) as
1537
1649
# versioned-with-no-kind.
1544
1656
file_deletion_strategy = 'keep'
1545
1657
tree.remove(file_list, verbose=verbose, to_file=self.outf,
1546
1658
keep_files=file_deletion_strategy=='keep',
1547
force=file_deletion_strategy=='force')
1659
force=(file_deletion_strategy=='no-backup'))
1548
1660
1549
1661
1550
1662
class cmd_file_id(Command):
1551
"""Print file_id of a particular file or directory.
1663
__doc__ = """Print file_id of a particular file or directory.
1552
1664
1553
1665
The file_id is assigned when the file is first added and remains the
1554
1666
same through all revisions where the file exists, even when it is
1570
1682
1571
1683
1572
1684
class cmd_file_path(Command):
1573
"""Print path of file_ids to a file or directory.
1685
__doc__ = """Print path of file_ids to a file or directory.
1574
1686
1575
1687
This prints one line for each directory down to the target,
1576
1688
starting at the branch root.
1592
1704
1593
1705
1594
1706
class cmd_reconcile(Command):
1595
"""Reconcile bzr metadata in a branch.
1707
__doc__ = """Reconcile bzr metadata in a branch.
1596
1708
1597
1709
This can correct data mismatches that may have been caused by
1598
1710
previous ghost operations or bzr upgrades. You should only
1612
1724
1613
1725
_see_also = ['check']
1614
1726
takes_args = ['branch?']
1727
takes_options = [
1728
Option('canonicalize-chks',
1729
help='Make sure CHKs are in canonical form (repairs '
1730
'bug 522637).',
1731
hidden=True),
1732
]
1615
1733
1616
def run(self, branch="."):
1734
def run(self, branch=".", canonicalize_chks=False):
1617
1735
from bzrlib.reconcile import reconcile
1618
1736
dir = bzrdir.BzrDir.open(branch)
1619
reconcile(dir)
1737
reconcile(dir, canonicalize_chks=canonicalize_chks)
1620
1738
1621
1739
1622
1740
class cmd_revision_history(Command):
1623
"""Display the list of revision ids on a branch."""
1741
__doc__ = """Display the list of revision ids on a branch."""
1624
1742
1625
1743
_see_also = ['log']
1626
1744
takes_args = ['location?']
1636
1754
1637
1755
1638
1756
class cmd_ancestry(Command):
1639
"""List all revisions merged into this branch."""
1757
__doc__ = """List all revisions merged into this branch."""
1640
1758
1641
1759
_see_also = ['log', 'revision-history']
1642
1760
takes_args = ['location?']
1654
1772
b = wt.branch
1655
1773
last_revision = wt.last_revision()
1656
1774
1657
revision_ids = b.repository.get_ancestry(last_revision)
1658
revision_ids.pop(0)
1659
for revision_id in revision_ids:
1775
self.add_cleanup(b.repository.lock_read().unlock)
1776
graph = b.repository.get_graph()
1777
revisions = [revid for revid, parents in
1778
graph.iter_ancestry([last_revision])]
1779
for revision_id in reversed(revisions):
1780
if _mod_revision.is_null(revision_id):
1781
continue
1660
1782
self.outf.write(revision_id + '\n')
1661
1783
1662
1784
1663
1785
class cmd_init(Command):
1664
"""Make a directory into a versioned branch.
1786
__doc__ = """Make a directory into a versioned branch.
1665
1787
1666
1788
Use this to create an empty branch, or before importing an
1667
1789
existing project.
1699
1821
),
1700
1822
Option('append-revisions-only',
1701
1823
help='Never change revnos or the existing log.'
1702
' Append revisions to it only.')
1824
' Append revisions to it only.'),
1825
Option('no-tree',
1826
'Create a branch without a working tree.')
1703
1827
]
1704
1828
def run(self, location=None, format=None, append_revisions_only=False,
1705
create_prefix=False):
1829
create_prefix=False, no_tree=False):
1706
1830
if format is None:
1707
1831
format = bzrdir.format_registry.make_bzrdir('default')
1708
1832
if location is None:
1719
1843
to_transport.ensure_base()
1720
1844
except errors.NoSuchFile:
1721
1845
if not create_prefix:
1722
raise errors.BzrCommandError("Parent directory of %s"
1846
raise errors.BzrCommandError(gettext("Parent directory of %s"
1723
1847
" does not exist."
1724
1848
"\nYou may supply --create-prefix to create all"
1725
" leading parent directories."
1849
" leading parent directories.")
1726
1850
% location)
1727
1851
to_transport.create_prefix()
1728
1852
1731
1855
except errors.NotBranchError:
1732
1856
# really a NotBzrDir error...
1733
1857
create_branch = bzrdir.BzrDir.create_branch_convenience
1858
if no_tree:
1859
force_new_tree = False
1860
else:
1861
force_new_tree = None
1734
1862
branch = create_branch(to_transport.base, format=format,
1735
possible_transports=[to_transport])
1863
possible_transports=[to_transport],
1864
force_new_tree=force_new_tree)
1736
1865
a_bzrdir = branch.bzrdir
1737
1866
else:
1738
1867
from bzrlib.transport.local import LocalTransport
1742
1871
raise errors.BranchExistsWithoutWorkingTree(location)
1743
1872
raise errors.AlreadyBranchError(location)
1744
1873
branch = a_bzrdir.create_branch()
1745
a_bzrdir.create_workingtree()
1874
if not no_tree:
1875
a_bzrdir.create_workingtree()
1746
1876
if append_revisions_only:
1747
1877
try:
1748
1878
branch.set_append_revisions_only(True)
1749
1879
except errors.UpgradeRequired:
1750
raise errors.BzrCommandError('This branch format cannot be set'
1751
' to append-revisions-only. Try --default.')
1880
raise errors.BzrCommandError(gettext('This branch format cannot be set'
1881
' to append-revisions-only. Try --default.'))
1752
1882
if not is_quiet():
1753
1883
from bzrlib.info import describe_layout, describe_format
1754
1884
try:
1758
1888
repository = branch.repository
1759
1889
layout = describe_layout(repository, branch, tree).lower()
1760
1890
format = describe_format(a_bzrdir, repository, branch, tree)
1761
self.outf.write("Created a %s (format: %s)\n" % (layout, format))
1891
self.outf.write(gettext("Created a {0} (format: {1})\n").format(
1892
layout, format))
1762
1893
if repository.is_shared():
1763
1894
#XXX: maybe this can be refactored into transport.path_or_url()
1764
1895
url = repository.bzrdir.root_transport.external_url()
1766
1897
url = urlutils.local_path_from_url(url)
1767
1898
except errors.InvalidURL:
1768
1899
pass
1769
self.outf.write("Using shared repository: %s\n" % url)
1900
self.outf.write(gettext("Using shared repository: %s\n") % url)
1770
1901
1771
1902
1772
1903
class cmd_init_repository(Command):
1773
"""Create a shared repository for branches to share storage space.
1904
__doc__ = """Create a shared repository for branches to share storage space.
1774
1905
1775
1906
New branches created under the repository directory will store their
1776
1907
revisions in the repository, not in the branch directory. For branches
1830
1961
1831
1962
1832
1963
class cmd_diff(Command):
1833
"""Show differences in the working tree, between revisions or branches.
1964
__doc__ = """Show differences in the working tree, between revisions or branches.
1834
1965
1835
1966
If no arguments are given, all changes for the current tree are listed.
1836
1967
If files are given, only the changes in those files are listed.
1842
1973
"bzr diff -p1" is equivalent to "bzr diff --prefix old/:new/", and
1843
1974
produces patches suitable for "patch -p1".
1844
1975
1976
Note that when using the -r argument with a range of revisions, the
1977
differences are computed between the two specified revisions. That
1978
is, the command does not show the changes introduced by the first
1979
revision in the range. This differs from the interpretation of
1980
revision ranges used by "bzr log" which includes the first revision
1981
in the range.
1982
1845
1983
:Exit values:
1846
1984
1 - changed
1847
1985
2 - unrepresentable changes
1865
2003
1866
2004
bzr diff -r1..3 xxx
1867
2005
1868
To see the changes introduced in revision X::
2006
The changes introduced by revision 2 (equivalent to -r1..2)::
2007
2008
bzr diff -c2
2009
2010
To see the changes introduced by revision X::
1869
2011
1870
2012
bzr diff -cX
1871
2013
1875
2017
1876
2018
bzr diff -r<chosen_parent>..X
1877
2019
1878
The changes introduced by revision 2 (equivalent to -r1..2)::
2020
The changes between the current revision and the previous revision
2021
(equivalent to -c-1 and -r-2..-1)
1879
2022
1880
bzr diff -c2
2023
bzr diff -r-2..
1881
2024
1882
2025
Show just the differences for file NEWS::
1883
2026
1898
2041
Same as 'bzr diff' but prefix paths with old/ and new/::
1899
2042
1900
2043
bzr diff --prefix old/:new/
2044
2045
Show the differences using a custom diff program with options::
2046
2047
bzr diff --using /usr/bin/diff --diff-options -wu
1901
2048
"""
1902
2049
_see_also = ['status']
1903
2050
takes_args = ['file*']
1922
2069
help='Use this command to compare files.',
1923
2070
type=unicode,
1924
2071
),
2072
RegistryOption('format',
2073
short_name='F',
2074
help='Diff format to use.',
2075
lazy_registry=('bzrlib.diff', 'format_registry'),
2076
title='Diff format'),
1925
2077
]
1926
2078
aliases = ['di', 'dif']
1927
2079
encoding_type = 'exact'
1928
2080
1929
2081
@display_command
1930
2082
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
2083
prefix=None, old=None, new=None, using=None, format=None):
2084
from bzrlib.diff import (get_trees_and_branches_to_diff_locked,
2085
show_diff_trees)
1933
2086
1934
2087
if (prefix is None) or (prefix == '0'):
1935
2088
# diff -p0 format
1941
2094
elif ':' in prefix:
1942
2095
old_label, new_label = prefix.split(":")
1943
2096
else:
1944
raise errors.BzrCommandError(
2097
raise errors.BzrCommandError(gettext(
1945
2098
'--prefix expects two values separated by a colon'
1946
' (eg "old/:new/")')
2099
' (eg "old/:new/")'))
1947
2100
1948
2101
if revision and len(revision) > 2:
1949
raise errors.BzrCommandError('bzr diff --revision takes exactly'
1950
' one or two revision specifiers')
2102
raise errors.BzrCommandError(gettext('bzr diff --revision takes exactly'
2103
' one or two revision specifiers'))
2104
2105
if using is not None and format is not None:
2106
raise errors.BzrCommandError(gettext(
2107
'{0} and {1} are mutually exclusive').format(
2108
'--using', '--format'))
1951
2109
1952
2110
(old_tree, new_tree,
1953
2111
old_branch, new_branch,
1954
specific_files, extra_trees) = get_trees_and_branches_to_diff(
1955
file_list, revision, old, new, apply_view=True)
2112
specific_files, extra_trees) = get_trees_and_branches_to_diff_locked(
2113
file_list, revision, old, new, self.add_cleanup, apply_view=True)
2114
# GNU diff on Windows uses ANSI encoding for filenames
2115
path_encoding = osutils.get_diff_header_encoding()
1956
2116
return show_diff_trees(old_tree, new_tree, sys.stdout,
1957
2117
specific_files=specific_files,
1958
2118
external_diff_options=diff_options,
1959
2119
old_label=old_label, new_label=new_label,
1960
extra_trees=extra_trees, using=using)
2120
extra_trees=extra_trees,
2121
path_encoding=path_encoding,
2122
using=using,
2123
format_cls=format)
1961
2124
1962
2125
1963
2126
class cmd_deleted(Command):
1964
"""List files deleted in the working tree.
2127
__doc__ = """List files deleted in the working tree.
1965
2128
"""
1966
2129
# TODO: Show files deleted since a previous revision, or
1967
2130
# between two revisions.
1970
2133
# level of effort but possibly much less IO. (Or possibly not,
1971
2134
# if the directories are very large...)
1972
2135
_see_also = ['status', 'ls']
1973
takes_options = ['show-ids']
2136
takes_options = ['directory', 'show-ids']
1974
2137
1975
2138
@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)
2139
def run(self, show_ids=False, directory=u'.'):
2140
tree = WorkingTree.open_containing(directory)[0]
2141
self.add_cleanup(tree.lock_read().unlock)
1980
2142
old = tree.basis_tree()
1981
old.lock_read()
1982
self.add_cleanup(old.unlock)
2143
self.add_cleanup(old.lock_read().unlock)
1983
2144
for path, ie in old.inventory.iter_entries():
1984
2145
if not tree.has_id(ie.file_id):
1985
2146
self.outf.write(path)
1990
2151
1991
2152
1992
2153
class cmd_modified(Command):
1993
"""List files modified in working tree.
2154
__doc__ = """List files modified in working tree.
1994
2155
"""
1995
2156
1996
2157
hidden = True
1997
2158
_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
]
2159
takes_options = ['directory', 'null']
2003
2160
2004
2161
@display_command
2005
def run(self, null=False):
2006
tree = WorkingTree.open_containing(u'.')[0]
2162
def run(self, null=False, directory=u'.'):
2163
tree = WorkingTree.open_containing(directory)[0]
2164
self.add_cleanup(tree.lock_read().unlock)
2007
2165
td = tree.changes_from(tree.basis_tree())
2166
self.cleanup_now()
2008
2167
for path, id, kind, text_modified, meta_modified in td.modified:
2009
2168
if null:
2010
2169
self.outf.write(path + '\0')
2013
2172
2014
2173
2015
2174
class cmd_added(Command):
2016
"""List files added in working tree.
2175
__doc__ = """List files added in working tree.
2017
2176
"""
2018
2177
2019
2178
hidden = True
2020
2179
_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
]
2180
takes_options = ['directory', 'null']
2026
2181
2027
2182
@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)
2183
def run(self, null=False, directory=u'.'):
2184
wt = WorkingTree.open_containing(directory)[0]
2185
self.add_cleanup(wt.lock_read().unlock)
2032
2186
basis = wt.basis_tree()
2033
basis.lock_read()
2034
self.add_cleanup(basis.unlock)
2187
self.add_cleanup(basis.lock_read().unlock)
2035
2188
basis_inv = basis.inventory
2036
2189
inv = wt.inventory
2037
2190
for file_id in inv:
2038
if file_id in basis_inv:
2191
if basis_inv.has_id(file_id):
2039
2192
continue
2040
2193
if inv.is_root(file_id) and len(basis_inv) == 0:
2041
2194
continue
2042
2195
path = inv.id2path(file_id)
2043
if not os.access(osutils.abspath(path), os.F_OK):
2196
if not os.access(osutils.pathjoin(wt.basedir, path), os.F_OK):
2044
2197
continue
2045
2198
if null:
2046
2199
self.outf.write(path + '\0')
2049
2202
2050
2203
2051
2204
class cmd_root(Command):
2052
"""Show the tree root directory.
2205
__doc__ = """Show the tree root directory.
2053
2206
2054
2207
The root is the nearest enclosing directory with a .bzr control
2055
2208
directory."""
2066
2219
try:
2067
2220
return int(limitstring)
2068
2221
except ValueError:
2069
msg = "The limit argument must be an integer."
2222
msg = gettext("The limit argument must be an integer.")
2070
2223
raise errors.BzrCommandError(msg)
2071
2224
2072
2225
2074
2227
try:
2075
2228
return int(s)
2076
2229
except ValueError:
2077
msg = "The levels argument must be an integer."
2230
msg = gettext("The levels argument must be an integer.")
2078
2231
raise errors.BzrCommandError(msg)
2079
2232
2080
2233
2081
2234
class cmd_log(Command):
2082
"""Show historical log for a branch or subset of a branch.
2235
__doc__ = """Show historical log for a branch or subset of a branch.
2083
2236
2084
2237
log is bzr's default tool for exploring the history of a branch.
2085
2238
The branch to use is taken from the first parameter. If no parameters
2190
2343
2191
2344
:Other filtering:
2192
2345
2193
The --message option can be used for finding revisions that match a
2194
regular expression in a commit message.
2346
The --match option can be used for finding revisions that match a
2347
regular expression in a commit message, committer, author or bug.
2348
Specifying the option several times will match any of the supplied
2349
expressions. --match-author, --match-bugs, --match-committer and
2350
--match-message can be used to only match a specific field.
2195
2351
2196
2352
:Tips & tricks:
2197
2353
2246
2402
help='Show just the specified revision.'
2247
2403
' See also "help revisionspec".'),
2248
2404
'log-format',
2405
RegistryOption('authors',
2406
'What names to list as authors - first, all or committer.',
2407
title='Authors',
2408
lazy_registry=('bzrlib.log', 'author_list_registry'),
2409
),
2249
2410
Option('levels',
2250
2411
short_name='n',
2251
2412
help='Number of levels to display - 0 for all, 1 for flat.',
2252
2413
argname='N',
2253
2414
type=_parse_levels),
2254
2415
Option('message',
2255
short_name='m',
2256
2416
help='Show revisions whose message matches this '
2257
2417
'regular expression.',
2258
type=str),
2418
type=str,
2419
hidden=True),
2259
2420
Option('limit',
2260
2421
short_name='l',
2261
2422
help='Limit the output to the first N revisions.',
2264
2425
Option('show-diff',
2265
2426
short_name='p',
2266
2427
help='Show changes made in each revision as a patch.'),
2267
Option('include-merges',
2428
Option('include-merged',
2268
2429
help='Show merged revisions like --levels 0 does.'),
2430
Option('include-merges', hidden=True,
2431
help='Historical alias for --include-merged.'),
2432
Option('omit-merges',
2433
help='Do not report commits with more than one parent.'),
2434
Option('exclude-common-ancestry',
2435
help='Display only the revisions that are not part'
2436
' of both ancestries (require -rX..Y)'
2437
),
2438
Option('signatures',
2439
help='Show digital signature validity'),
2440
ListOption('match',
2441
short_name='m',
2442
help='Show revisions whose properties match this '
2443
'expression.',
2444
type=str),
2445
ListOption('match-message',
2446
help='Show revisions whose message matches this '
2447
'expression.',
2448
type=str),
2449
ListOption('match-committer',
2450
help='Show revisions whose committer matches this '
2451
'expression.',
2452
type=str),
2453
ListOption('match-author',
2454
help='Show revisions whose authors match this '
2455
'expression.',
2456
type=str),
2457
ListOption('match-bugs',
2458
help='Show revisions whose bugs match this '
2459
'expression.',
2460
type=str)
2269
2461
]
2270
2462
encoding_type = 'replace'
2271
2463
2281
2473
message=None,
2282
2474
limit=None,
2283
2475
show_diff=False,
2284
include_merges=False):
2476
include_merged=None,
2477
authors=None,
2478
exclude_common_ancestry=False,
2479
signatures=False,
2480
match=None,
2481
match_message=None,
2482
match_committer=None,
2483
match_author=None,
2484
match_bugs=None,
2485
omit_merges=False,
2486
include_merges=symbol_versioning.DEPRECATED_PARAMETER,
2487
):
2285
2488
from bzrlib.log import (
2286
2489
Logger,
2287
2490
make_log_request_dict,
2288
2491
_get_info_for_log_files,
2289
2492
)
2290
2493
direction = (forward and 'forward') or 'reverse'
2291
if include_merges:
2494
if symbol_versioning.deprecated_passed(include_merges):
2495
ui.ui_factory.show_user_warning(
2496
'deprecated_command_option',
2497
deprecated_name='--include-merges',
2498
recommended_name='--include-merged',
2499
deprecated_in_version='2.5',
2500
command=self.invoked_as)
2501
if include_merged is None:
2502
include_merged = include_merges
2503
else:
2504
raise errors.BzrCommandError(gettext(
2505
'{0} and {1} are mutually exclusive').format(
2506
'--include-merges', '--include-merged'))
2507
if include_merged is None:
2508
include_merged = False
2509
if (exclude_common_ancestry
2510
and (revision is None or len(revision) != 2)):
2511
raise errors.BzrCommandError(gettext(
2512
'--exclude-common-ancestry requires -r with two revisions'))
2513
if include_merged:
2292
2514
if levels is None:
2293
2515
levels = 0
2294
2516
else:
2295
raise errors.BzrCommandError(
2296
'--levels and --include-merges are mutually exclusive')
2517
raise errors.BzrCommandError(gettext(
2518
'{0} and {1} are mutually exclusive').format(
2519
'--levels', '--include-merged'))
2297
2520
2298
2521
if change is not None:
2299
2522
if len(change) > 1:
2300
2523
raise errors.RangeInChangeOption()
2301
2524
if revision is not None:
2302
raise errors.BzrCommandError(
2303
'--revision and --change are mutually exclusive')
2525
raise errors.BzrCommandError(gettext(
2526
'{0} and {1} are mutually exclusive').format(
2527
'--revision', '--change'))
2304
2528
else:
2305
2529
revision = change
2306
2530
2309
2533
if file_list:
2310
2534
# find the file ids to log and check for directory filtering
2311
2535
b, file_info_list, rev1, rev2 = _get_info_for_log_files(
2312
revision, file_list)
2313
self.add_cleanup(b.unlock)
2536
revision, file_list, self.add_cleanup)
2314
2537
for relpath, file_id, kind in file_info_list:
2315
2538
if file_id is None:
2316
raise errors.BzrCommandError(
2317
"Path unknown at end or start of revision range: %s" %
2539
raise errors.BzrCommandError(gettext(
2540
"Path unknown at end or start of revision range: %s") %
2318
2541
relpath)
2319
2542
# If the relpath is the top of the tree, we log everything
2320
2543
if relpath == '':
2334
2557
location = '.'
2335
2558
dir, relpath = bzrdir.BzrDir.open_containing(location)
2336
2559
b = dir.open_branch()
2337
b.lock_read()
2338
self.add_cleanup(b.unlock)
2560
self.add_cleanup(b.lock_read().unlock)
2339
2561
rev1, rev2 = _get_revision_range(revision, b, self.name())
2340
2562
2563
if b.get_config().validate_signatures_in_log():
2564
signatures = True
2565
2566
if signatures:
2567
if not gpg.GPGStrategy.verify_signatures_available():
2568
raise errors.GpgmeNotInstalled(None)
2569
2341
2570
# Decide on the type of delta & diff filtering to use
2342
2571
# TODO: add an --all-files option to make this configurable & consistent
2343
2572
if not verbose:
2361
2590
show_timezone=timezone,
2362
2591
delta_format=get_verbosity_level(),
2363
2592
levels=levels,
2364
show_advice=levels is None)
2593
show_advice=levels is None,
2594
author_list_handler=authors)
2365
2595
2366
2596
# Choose the algorithm for doing the logging. It's annoying
2367
2597
# having multiple code paths like this but necessary until
2379
2609
match_using_deltas = (len(file_ids) != 1 or filter_by_dir
2380
2610
or delta_type or partial_history)
2381
2611
2612
match_dict = {}
2613
if match:
2614
match_dict[''] = match
2615
if match_message:
2616
match_dict['message'] = match_message
2617
if match_committer:
2618
match_dict['committer'] = match_committer
2619
if match_author:
2620
match_dict['author'] = match_author
2621
if match_bugs:
2622
match_dict['bugs'] = match_bugs
2623
2382
2624
# Build the LogRequest and execute it
2383
2625
if len(file_ids) == 0:
2384
2626
file_ids = None
2386
2628
direction=direction, specific_fileids=file_ids,
2387
2629
start_revision=rev1, end_revision=rev2, limit=limit,
2388
2630
message_search=message, delta_type=delta_type,
2389
diff_type=diff_type, _match_using_deltas=match_using_deltas)
2631
diff_type=diff_type, _match_using_deltas=match_using_deltas,
2632
exclude_common_ancestry=exclude_common_ancestry, match=match_dict,
2633
signature=signatures, omit_merges=omit_merges,
2634
)
2390
2635
Logger(b, rqst).show(lf)
2391
2636
2392
2637
2408
2653
# b is taken from revision[0].get_branch(), and
2409
2654
# show_log will use its revision_history. Having
2410
2655
# different branches will lead to weird behaviors.
2411
raise errors.BzrCommandError(
2656
raise errors.BzrCommandError(gettext(
2412
2657
"bzr %s doesn't accept two revisions in different"
2413
" branches." % command_name)
2414
rev1 = start_spec.in_history(branch)
2658
" branches.") % command_name)
2659
if start_spec.spec is None:
2660
# Avoid loading all the history.
2661
rev1 = RevisionInfo(branch, None, None)
2662
else:
2663
rev1 = start_spec.in_history(branch)
2415
2664
# Avoid loading all of history when we know a missing
2416
2665
# end of range means the last revision ...
2417
2666
if end_spec.spec is None:
2420
2669
else:
2421
2670
rev2 = end_spec.in_history(branch)
2422
2671
else:
2423
raise errors.BzrCommandError(
2424
'bzr %s --revision takes one or two values.' % command_name)
2672
raise errors.BzrCommandError(gettext(
2673
'bzr %s --revision takes one or two values.') % command_name)
2425
2674
return rev1, rev2
2426
2675
2427
2676
2446
2695
2447
2696
2448
2697
class cmd_touching_revisions(Command):
2449
"""Return revision-ids which affected a particular file.
2698
__doc__ = """Return revision-ids which affected a particular file.
2450
2699
2451
2700
A more user-friendly interface is "bzr log FILE".
2452
2701
"""
2459
2708
tree, relpath = WorkingTree.open_containing(filename)
2460
2709
file_id = tree.path2id(relpath)
2461
2710
b = tree.branch
2462
b.lock_read()
2463
self.add_cleanup(b.unlock)
2711
self.add_cleanup(b.lock_read().unlock)
2464
2712
touching_revs = log.find_touching_revisions(b, file_id)
2465
2713
for revno, revision_id, what in touching_revs:
2466
2714
self.outf.write("%6d %s\n" % (revno, what))
2467
2715
2468
2716
2469
2717
class cmd_ls(Command):
2470
"""List files in a tree.
2718
__doc__ = """List files in a tree.
2471
2719
"""
2472
2720
2473
2721
_see_also = ['status', 'cat']
2479
2727
help='Recurse into subdirectories.'),
2480
2728
Option('from-root',
2481
2729
help='Print paths relative to the root of the branch.'),
2482
Option('unknown', help='Print unknown files.'),
2730
Option('unknown', short_name='u',
2731
help='Print unknown files.'),
2483
2732
Option('versioned', help='Print versioned files.',
2484
2733
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',
2734
Option('ignored', short_name='i',
2735
help='Print ignored files.'),
2736
Option('kind', short_name='k',
2490
2737
help='List entries of a particular kind: file, directory, symlink.',
2491
2738
type=unicode),
2739
'null',
2492
2740
'show-ids',
2741
'directory',
2493
2742
]
2494
2743
@display_command
2495
2744
def run(self, revision=None, verbose=False,
2496
2745
recursive=False, from_root=False,
2497
2746
unknown=False, versioned=False, ignored=False,
2498
null=False, kind=None, show_ids=False, path=None):
2747
null=False, kind=None, show_ids=False, path=None, directory=None):
2499
2748
2500
2749
if kind and kind not in ('file', 'directory', 'symlink'):
2501
raise errors.BzrCommandError('invalid kind specified')
2750
raise errors.BzrCommandError(gettext('invalid kind specified'))
2502
2751
2503
2752
if verbose and null:
2504
raise errors.BzrCommandError('Cannot set both --verbose and --null')
2753
raise errors.BzrCommandError(gettext('Cannot set both --verbose and --null'))
2505
2754
all = not (unknown or versioned or ignored)
2506
2755
2507
2756
selection = {'I':ignored, '?':unknown, 'V':versioned}
2510
2759
fs_path = '.'
2511
2760
else:
2512
2761
if from_root:
2513
raise errors.BzrCommandError('cannot specify both --from-root'
2514
' and PATH')
2762
raise errors.BzrCommandError(gettext('cannot specify both --from-root'
2763
' and PATH'))
2515
2764
fs_path = path
2516
tree, branch, relpath = bzrdir.BzrDir.open_containing_tree_or_branch(
2517
fs_path)
2765
tree, branch, relpath = \
2766
_open_directory_or_containing_tree_or_branch(fs_path, directory)
2518
2767
2519
2768
# Calculate the prefix to use
2520
2769
prefix = None
2533
2782
if view_files:
2534
2783
apply_view = True
2535
2784
view_str = views.view_display_str(view_files)
2536
note("Ignoring files outside view. View is %s" % view_str)
2785
note(gettext("Ignoring files outside view. View is %s") % view_str)
2537
2786
2538
tree.lock_read()
2539
self.add_cleanup(tree.unlock)
2787
self.add_cleanup(tree.lock_read().unlock)
2540
2788
for fp, fc, fkind, fid, entry in tree.list_files(include_root=False,
2541
2789
from_dir=relpath, recursive=recursive):
2542
2790
# Apply additional masking
2584
2832
2585
2833
2586
2834
class cmd_unknowns(Command):
2587
"""List unknown files.
2835
__doc__ = """List unknown files.
2588
2836
"""
2589
2837
2590
2838
hidden = True
2591
2839
_see_also = ['ls']
2840
takes_options = ['directory']
2592
2841
2593
2842
@display_command
2594
def run(self):
2595
for f in WorkingTree.open_containing(u'.')[0].unknowns():
2843
def run(self, directory=u'.'):
2844
for f in WorkingTree.open_containing(directory)[0].unknowns():
2596
2845
self.outf.write(osutils.quotefn(f) + '\n')
2597
2846
2598
2847
2599
2848
class cmd_ignore(Command):
2600
"""Ignore specified files or patterns.
2849
__doc__ = """Ignore specified files or patterns.
2601
2850
2602
2851
See ``bzr help patterns`` for details on the syntax of patterns.
2603
2852
2612
2861
using this command or directly by using an editor, be sure to commit
2613
2862
it.
2614
2863
2864
Bazaar also supports a global ignore file ~/.bazaar/ignore. On Windows
2865
the global ignore file can be found in the application data directory as
2866
C:\\Documents and Settings\\<user>\\Application Data\\Bazaar\\2.0\\ignore.
2867
Global ignores are not touched by this command. The global ignore file
2868
can be edited directly using an editor.
2869
2615
2870
Patterns prefixed with '!' are exceptions to ignore patterns and take
2616
2871
precedence over regular ignores. Such exceptions are used to specify
2617
2872
files that should be versioned which would otherwise be ignored.
2619
2874
Patterns prefixed with '!!' act as regular ignore patterns, but have
2620
2875
precedence over the '!' exception patterns.
2621
2876
2622
Note: ignore patterns containing shell wildcards must be quoted from
2623
the shell on Unix.
2877
:Notes:
2878
2879
* Ignore patterns containing shell wildcards must be quoted from
2880
the shell on Unix.
2881
2882
* Ignore patterns starting with "#" act as comments in the ignore file.
2883
To ignore patterns that begin with that character, use the "RE:" prefix.
2624
2884
2625
2885
:Examples:
2626
2886
Ignore the top level Makefile::
2635
2895
2636
2896
bzr ignore "!special.class"
2637
2897
2898
Ignore files whose name begins with the "#" character::
2899
2900
bzr ignore "RE:^#"
2901
2638
2902
Ignore .o files under the lib directory::
2639
2903
2640
2904
bzr ignore "lib/**/*.o"
2648
2912
bzr ignore "RE:(?!debian/).*"
2649
2913
2650
2914
Ignore everything except the "local" toplevel directory,
2651
but always ignore "*~" autosave files, even under local/::
2915
but always ignore autosave files ending in ~, even under local/::
2652
2916
2653
2917
bzr ignore "*"
2654
2918
bzr ignore "!./local"
2657
2921
2658
2922
_see_also = ['status', 'ignored', 'patterns']
2659
2923
takes_args = ['name_pattern*']
2660
takes_options = [
2661
Option('old-default-rules',
2662
help='Write out the ignore rules bzr < 0.9 always used.')
2924
takes_options = ['directory',
2925
Option('default-rules',
2926
help='Display the default ignore rules that bzr uses.')
2663
2927
]
2664
2928
2665
def run(self, name_pattern_list=None, old_default_rules=None):
2929
def run(self, name_pattern_list=None, default_rules=None,
2930
directory=u'.'):
2666
2931
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
2932
if default_rules is not None:
2933
# dump the default rules and exit
2934
for pattern in ignores.USER_DEFAULTS:
2935
self.outf.write("%s\n" % pattern)
2671
2936
return
2672
2937
if not name_pattern_list:
2673
raise errors.BzrCommandError("ignore requires at least one "
2674
"NAME_PATTERN or --old-default-rules")
2938
raise errors.BzrCommandError(gettext("ignore requires at least one "
2939
"NAME_PATTERN or --default-rules."))
2675
2940
name_pattern_list = [globbing.normalize_pattern(p)
2676
2941
for p in name_pattern_list]
2942
bad_patterns = ''
2943
bad_patterns_count = 0
2944
for p in name_pattern_list:
2945
if not globbing.Globster.is_pattern_valid(p):
2946
bad_patterns_count += 1
2947
bad_patterns += ('\n %s' % p)
2948
if bad_patterns:
2949
msg = (ngettext('Invalid ignore pattern found. %s',
2950
'Invalid ignore patterns found. %s',
2951
bad_patterns_count) % bad_patterns)
2952
ui.ui_factory.show_error(msg)
2953
raise errors.InvalidPattern('')
2677
2954
for name_pattern in name_pattern_list:
2678
2955
if (name_pattern[0] == '/' or
2679
2956
(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'.')
2957
raise errors.BzrCommandError(gettext(
2958
"NAME_PATTERN should not be an absolute path"))
2959
tree, relpath = WorkingTree.open_containing(directory)
2683
2960
ignores.tree_ignores_add_patterns(tree, name_pattern_list)
2684
2961
ignored = globbing.Globster(name_pattern_list)
2685
2962
matches = []
2686
tree.lock_read()
2963
self.add_cleanup(tree.lock_read().unlock)
2687
2964
for entry in tree.list_files():
2688
2965
id = entry[3]
2689
2966
if id is not None:
2690
2967
filename = entry[0]
2691
2968
if ignored.match(filename):
2692
matches.append(filename.encode('utf-8'))
2693
tree.unlock()
2969
matches.append(filename)
2694
2970
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),)
2971
self.outf.write(gettext("Warning: the following files are version "
2972
"controlled and match your ignore pattern:\n%s"
2973
"\nThese files will continue to be version controlled"
2974
" unless you 'bzr remove' them.\n") % ("\n".join(matches),))
2699
2975
2700
2976
2701
2977
class cmd_ignored(Command):
2702
"""List ignored files and the patterns that matched them.
2978
__doc__ = """List ignored files and the patterns that matched them.
2703
2979
2704
2980
List all the ignored files and the ignore pattern that caused the file to
2705
2981
be ignored.
2711
2987
2712
2988
encoding_type = 'replace'
2713
2989
_see_also = ['ignore', 'ls']
2990
takes_options = ['directory']
2714
2991
2715
2992
@display_command
2716
def run(self):
2717
tree = WorkingTree.open_containing(u'.')[0]
2718
tree.lock_read()
2719
self.add_cleanup(tree.unlock)
2993
def run(self, directory=u'.'):
2994
tree = WorkingTree.open_containing(directory)[0]
2995
self.add_cleanup(tree.lock_read().unlock)
2720
2996
for path, file_class, kind, file_id, entry in tree.list_files():
2721
2997
if file_class != 'I':
2722
2998
continue
2726
3002
2727
3003
2728
3004
class cmd_lookup_revision(Command):
2729
"""Lookup the revision-id from a revision-number
3005
__doc__ = """Lookup the revision-id from a revision-number
2730
3006
2731
3007
:Examples:
2732
3008
bzr lookup-revision 33
2733
3009
"""
2734
3010
hidden = True
2735
3011
takes_args = ['revno']
3012
takes_options = ['directory']
2736
3013
2737
3014
@display_command
2738
def run(self, revno):
3015
def run(self, revno, directory=u'.'):
2739
3016
try:
2740
3017
revno = int(revno)
2741
3018
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)
3019
raise errors.BzrCommandError(gettext("not a valid revision-number: %r")
3020
% revno)
3021
revid = WorkingTree.open_containing(directory)[0].branch.get_rev_id(revno)
3022
self.outf.write("%s\n" % revid)
2745
3023
2746
3024
2747
3025
class cmd_export(Command):
2748
"""Export current or past revision to a destination directory or archive.
3026
__doc__ = """Export current or past revision to a destination directory or archive.
2749
3027
2750
3028
If no revision is specified this exports the last committed revision.
2751
3029
2772
3050
zip .zip
2773
3051
================= =========================
2774
3052
"""
3053
encoding = 'exact'
2775
3054
takes_args = ['dest', 'branch_or_subdir?']
2776
takes_options = [
3055
takes_options = ['directory',
2777
3056
Option('format',
2778
3057
help="Type of file to export to.",
2779
3058
type=unicode),
2783
3062
Option('root',
2784
3063
type=str,
2785
3064
help="Name of the root directory inside the exported file."),
3065
Option('per-file-timestamps',
3066
help='Set modification time of files to that of the last '
3067
'revision in which it was changed.'),
2786
3068
]
2787
3069
def run(self, dest, branch_or_subdir=None, revision=None, format=None,
2788
root=None, filters=False):
3070
root=None, filters=False, per_file_timestamps=False, directory=u'.'):
2789
3071
from bzrlib.export import export
2790
3072
2791
3073
if branch_or_subdir is None:
2792
tree = WorkingTree.open_containing(u'.')[0]
3074
tree = WorkingTree.open_containing(directory)[0]
2793
3075
b = tree.branch
2794
3076
subdir = None
2795
3077
else:
2798
3080
2799
3081
rev_tree = _get_one_revision_tree('export', revision, branch=b, tree=tree)
2800
3082
try:
2801
export(rev_tree, dest, format, root, subdir, filtered=filters)
3083
export(rev_tree, dest, format, root, subdir, filtered=filters,
3084
per_file_timestamps=per_file_timestamps)
2802
3085
except errors.NoSuchExportFormat, e:
2803
raise errors.BzrCommandError('Unsupported export format: %s' % e.format)
3086
raise errors.BzrCommandError(gettext('Unsupported export format: %s') % e.format)
2804
3087
2805
3088
2806
3089
class cmd_cat(Command):
2807
"""Write the contents of a file as of a given revision to standard output.
3090
__doc__ = """Write the contents of a file as of a given revision to standard output.
2808
3091
2809
3092
If no revision is nominated, the last revision is used.
2810
3093
2813
3096
"""
2814
3097
2815
3098
_see_also = ['ls']
2816
takes_options = [
3099
takes_options = ['directory',
2817
3100
Option('name-from-revision', help='The path name in the old tree.'),
2818
3101
Option('filters', help='Apply content filters to display the '
2819
3102
'convenience form.'),
2824
3107
2825
3108
@display_command
2826
3109
def run(self, filename, revision=None, name_from_revision=False,
2827
filters=False):
3110
filters=False, directory=None):
2828
3111
if revision is not None and len(revision) != 1:
2829
raise errors.BzrCommandError("bzr cat --revision takes exactly"
2830
" one revision specifier")
3112
raise errors.BzrCommandError(gettext("bzr cat --revision takes exactly"
3113
" one revision specifier"))
2831
3114
tree, branch, relpath = \
2832
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
2833
branch.lock_read()
2834
self.add_cleanup(branch.unlock)
3115
_open_directory_or_containing_tree_or_branch(filename, directory)
3116
self.add_cleanup(branch.lock_read().unlock)
2835
3117
return self._run(tree, branch, relpath, filename, revision,
2836
3118
name_from_revision, filters)
2837
3119
2840
3122
if tree is None:
2841
3123
tree = b.basis_tree()
2842
3124
rev_tree = _get_one_revision_tree('cat', revision, branch=b)
2843
rev_tree.lock_read()
2844
self.add_cleanup(rev_tree.unlock)
3125
self.add_cleanup(rev_tree.lock_read().unlock)
2845
3126
2846
3127
old_file_id = rev_tree.path2id(relpath)
2847
3128
3129
# TODO: Split out this code to something that generically finds the
3130
# best id for a path across one or more trees; it's like
3131
# find_ids_across_trees but restricted to find just one. -- mbp
3132
# 20110705.
2848
3133
if name_from_revision:
2849
3134
# Try in revision if requested
2850
3135
if old_file_id is None:
2851
raise errors.BzrCommandError(
2852
"%r is not present in revision %s" % (
3136
raise errors.BzrCommandError(gettext(
3137
"{0!r} is not present in revision {1}").format(
2853
3138
filename, rev_tree.get_revision_id()))
2854
3139
else:
2855
content = rev_tree.get_file_text(old_file_id)
3140
actual_file_id = old_file_id
2856
3141
else:
2857
3142
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" % (
3143
if cur_file_id is not None and rev_tree.has_id(cur_file_id):
3144
actual_file_id = cur_file_id
3145
elif old_file_id is not None:
3146
actual_file_id = old_file_id
3147
else:
3148
raise errors.BzrCommandError(gettext(
3149
"{0!r} is not present in revision {1}").format(
2875
3150
filename, rev_tree.get_revision_id()))
2876
3151
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)
3152
from bzrlib.filter_tree import ContentFilterTree
3153
filter_tree = ContentFilterTree(rev_tree,
3154
rev_tree._content_filter_stack)
3155
content = filter_tree.get_file_text(actual_file_id)
2887
3156
else:
2888
self.cleanup_now()
2889
self.outf.write(content)
3157
content = rev_tree.get_file_text(actual_file_id)
3158
self.cleanup_now()
3159
self.outf.write(content)
2890
3160
2891
3161
2892
3162
class cmd_local_time_offset(Command):
2893
"""Show the offset in seconds from GMT to local time."""
3163
__doc__ = """Show the offset in seconds from GMT to local time."""
2894
3164
hidden = True
2895
3165
@display_command
2896
3166
def run(self):
2897
print osutils.local_time_offset()
3167
self.outf.write("%s\n" % osutils.local_time_offset())
2898
3168
2899
3169
2900
3170
2901
3171
class cmd_commit(Command):
2902
"""Commit changes into a new revision.
3172
__doc__ = """Commit changes into a new revision.
2903
3173
2904
3174
An explanatory message needs to be given for each commit. This is
2905
3175
often done by using the --message option (getting the message from the
2953
3223
to trigger updates to external systems like bug trackers. The --fixes
2954
3224
option can be used to record the association between a revision and
2955
3225
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
3226
"""
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
3227
2983
3228
_see_also = ['add', 'bugs', 'hooks', 'uncommit']
2984
3229
takes_args = ['selected*']
3013
3258
"the master branch until a normal commit "
3014
3259
"is performed."
3015
3260
),
3016
Option('show-diff',
3261
Option('show-diff', short_name='p',
3017
3262
help='When no message is supplied, show the diff along'
3018
3263
' with the status summary in the message editor.'),
3264
Option('lossy',
3265
help='When committing to a foreign version control '
3266
'system do not push data that can not be natively '
3267
'represented.'),
3019
3268
]
3020
3269
aliases = ['ci', 'checkin']
3021
3270
3022
3271
def _iter_bug_fix_urls(self, fixes, branch):
3272
default_bugtracker = None
3023
3273
# Configure the properties for bug fixing attributes.
3024
3274
for fixed_bug in fixes:
3025
3275
tokens = fixed_bug.split(':')
3026
if len(tokens) != 2:
3027
raise errors.BzrCommandError(
3276
if len(tokens) == 1:
3277
if default_bugtracker is None:
3278
branch_config = branch.get_config()
3279
default_bugtracker = branch_config.get_user_option(
3280
"bugtracker")
3281
if default_bugtracker is None:
3282
raise errors.BzrCommandError(gettext(
3283
"No tracker specified for bug %s. Use the form "
3284
"'tracker:id' or specify a default bug tracker "
3285
"using the `bugtracker` option.\nSee "
3286
"\"bzr help bugs\" for more information on this "
3287
"feature. Commit refused.") % fixed_bug)
3288
tag = default_bugtracker
3289
bug_id = tokens[0]
3290
elif len(tokens) != 2:
3291
raise errors.BzrCommandError(gettext(
3028
3292
"Invalid bug %s. Must be in the form of 'tracker:id'. "
3029
3293
"See \"bzr help bugs\" for more information on this "
3030
"feature.\nCommit refused." % fixed_bug)
3031
tag, bug_id = tokens
3294
"feature.\nCommit refused.") % fixed_bug)
3295
else:
3296
tag, bug_id = tokens
3032
3297
try:
3033
3298
yield bugtracker.get_bug_url(tag, branch, bug_id)
3034
3299
except errors.UnknownBugTrackerAbbreviation:
3035
raise errors.BzrCommandError(
3036
'Unrecognized bug %s. Commit refused.' % fixed_bug)
3300
raise errors.BzrCommandError(gettext(
3301
'Unrecognized bug %s. Commit refused.') % fixed_bug)
3037
3302
except errors.MalformedBugIdentifier, e:
3038
raise errors.BzrCommandError(
3039
"%s\nCommit refused." % (str(e),))
3303
raise errors.BzrCommandError(gettext(
3304
"%s\nCommit refused.") % (str(e),))
3040
3305
3041
3306
def run(self, message=None, file=None, verbose=False, selected_list=None,
3042
3307
unchanged=False, strict=False, local=False, fixes=None,
3043
author=None, show_diff=False, exclude=None, commit_time=None):
3308
author=None, show_diff=False, exclude=None, commit_time=None,
3309
lossy=False):
3044
3310
from bzrlib.errors import (
3045
3311
PointlessCommit,
3046
3312
ConflictsInTree,
3049
3315
from bzrlib.msgeditor import (
3050
3316
edit_commit_message_encoded,
3051
3317
generate_commit_message_template,
3052
make_commit_message_template_encoded
3318
make_commit_message_template_encoded,
3319
set_commit_message,
3053
3320
)
3054
3321
3055
3322
commit_stamp = offset = None
3057
3324
try:
3058
3325
commit_stamp, offset = timestamp.parse_patch_date(commit_time)
3059
3326
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.
3327
raise errors.BzrCommandError(gettext(
3328
"Could not parse --commit-time: " + str(e)))
3068
3329
3069
3330
properties = {}
3070
3331
3071
tree, selected_list = tree_files(selected_list)
3332
tree, selected_list = WorkingTree.open_containing_paths(selected_list)
3072
3333
if selected_list == ['']:
3073
3334
# workaround - commit of root of tree should be exactly the same
3074
3335
# as just default commit in that tree, and succeed even though
3099
3360
'(use --file "%(f)s" to take commit message from that file)'
3100
3361
% { 'f': message })
3101
3362
ui.ui_factory.show_warning(warning_msg)
3363
if '\r' in message:
3364
message = message.replace('\r\n', '\n')
3365
message = message.replace('\r', '\n')
3366
if file:
3367
raise errors.BzrCommandError(gettext(
3368
"please specify either --message or --file"))
3102
3369
3103
3370
def get_message(commit_obj):
3104
3371
"""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,
3372
if file:
3373
f = open(file)
3374
try:
3375
my_message = f.read().decode(osutils.get_user_encoding())
3376
finally:
3377
f.close()
3378
elif message is not None:
3379
my_message = message
3380
else:
3381
# No message supplied: make one up.
3382
# text is the status of the tree
3383
text = make_commit_message_template_encoded(tree,
3111
3384
selected_list, diff=show_diff,
3112
3385
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")
3386
# start_message is the template generated from hooks
3387
# XXX: Warning - looks like hooks return unicode,
3388
# make_commit_message_template_encoded returns user encoding.
3389
# We probably want to be using edit_commit_message instead to
3390
# avoid this.
3391
my_message = set_commit_message(commit_obj)
3392
if my_message is None:
3393
start_message = generate_commit_message_template(commit_obj)
3394
my_message = edit_commit_message_encoded(text,
3395
start_message=start_message)
3396
if my_message is None:
3397
raise errors.BzrCommandError(gettext("please specify a commit"
3398
" message with either --message or --file"))
3399
if my_message == "":
3400
raise errors.BzrCommandError(gettext("Empty commit message specified."
3401
" Please specify a commit message with either"
3402
" --message or --file or leave a blank message"
3403
" with --message \"\"."))
3127
3404
return my_message
3128
3405
3129
3406
# The API permits a commit with a filter of [] to mean 'select nothing'
3137
3414
reporter=None, verbose=verbose, revprops=properties,
3138
3415
authors=author, timestamp=commit_stamp,
3139
3416
timezone=offset,
3140
exclude=safe_relpath_files(tree, exclude))
3417
exclude=tree.safe_relpath_files(exclude),
3418
lossy=lossy)
3141
3419
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.")
3420
raise errors.BzrCommandError(gettext("No changes to commit."
3421
" Please 'bzr add' the files you want to commit, or use"
3422
" --unchanged to force an empty commit."))
3146
3423
except ConflictsInTree:
3147
raise errors.BzrCommandError('Conflicts detected in working '
3424
raise errors.BzrCommandError(gettext('Conflicts detected in working '
3148
3425
'tree. Use "bzr conflicts" to list, "bzr resolve FILE" to'
3149
' resolve.')
3426
' resolve.'))
3150
3427
except StrictCommitFailed:
3151
raise errors.BzrCommandError("Commit refused because there are"
3152
" unknown files in the working tree.")
3428
raise errors.BzrCommandError(gettext("Commit refused because there are"
3429
" unknown files in the working tree."))
3153
3430
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.')
3431
e.extra_help = (gettext("\n"
3432
'To commit to master branch, run update and then commit.\n'
3433
'You can also pass --local to commit to continue working '
3434
'disconnected.'))
3435
raise
3158
3436
3159
3437
3160
3438
class cmd_check(Command):
3161
"""Validate working tree structure, branch consistency and repository history.
3439
__doc__ = """Validate working tree structure, branch consistency and repository history.
3162
3440
3163
3441
This command checks various invariants about branch and repository storage
3164
3442
to detect data corruption or bzr bugs.
3228
3506
3229
3507
3230
3508
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.
3509
__doc__ = """Upgrade a repository, branch or working tree to a newer format.
3510
3511
When the default format has changed after a major new release of
3512
Bazaar, you may be informed during certain operations that you
3513
should upgrade. Upgrading to a newer format may improve performance
3514
or make new features available. It may however limit interoperability
3515
with older repositories or with older versions of Bazaar.
3516
3517
If you wish to upgrade to a particular format rather than the
3518
current default, that can be specified using the --format option.
3519
As a consequence, you can use the upgrade command this way to
3520
"downgrade" to an earlier format, though some conversions are
3521
a one way process (e.g. changing from the 1.x default to the
3522
2.x default) so downgrading is not always possible.
3523
3524
A backup.bzr.~#~ directory is created at the start of the conversion
3525
process (where # is a number). By default, this is left there on
3526
completion. If the conversion fails, delete the new .bzr directory
3527
and rename this one back in its place. Use the --clean option to ask
3528
for the backup.bzr directory to be removed on successful conversion.
3529
Alternatively, you can delete it by hand if everything looks good
3530
afterwards.
3531
3532
If the location given is a shared repository, dependent branches
3533
are also converted provided the repository converts successfully.
3534
If the conversion of a branch fails, remaining branches are still
3535
tried.
3536
3537
For more information on upgrades, see the Bazaar Upgrade Guide,
3538
http://doc.bazaar.canonical.com/latest/en/upgrade-guide/.
3236
3539
"""
3237
3540
3238
_see_also = ['check']
3541
_see_also = ['check', 'reconcile', 'formats']
3239
3542
takes_args = ['url?']
3240
3543
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
]
3544
RegistryOption('format',
3545
help='Upgrade to a specific format. See "bzr help'
3546
' formats" for details.',
3547
lazy_registry=('bzrlib.bzrdir', 'format_registry'),
3548
converter=lambda name: bzrdir.format_registry.make_bzrdir(name),
3549
value_switches=True, title='Branch format'),
3550
Option('clean',
3551
help='Remove the backup.bzr directory if successful.'),
3552
Option('dry-run',
3553
help="Show what would be done, but don't actually do anything."),
3554
]
3248
3555
3249
def run(self, url='.', format=None):
3556
def run(self, url='.', format=None, clean=False, dry_run=False):
3250
3557
from bzrlib.upgrade import upgrade
3251
upgrade(url, format)
3558
exceptions = upgrade(url, format, clean_up=clean, dry_run=dry_run)
3559
if exceptions:
3560
if len(exceptions) == 1:
3561
# Compatibility with historical behavior
3562
raise exceptions[0]
3563
else:
3564
return 3
3252
3565
3253
3566
3254
3567
class cmd_whoami(Command):
3255
"""Show or set bzr user id.
3568
__doc__ = """Show or set bzr user id.
3256
3569
3257
3570
:Examples:
3258
3571
Show the email of the current user::
3263
3576
3264
3577
bzr whoami "Frank Chu <fchu@example.com>"
3265
3578
"""
3266
takes_options = [ Option('email',
3579
takes_options = [ 'directory',
3580
Option('email',
3267
3581
help='Display email address only.'),
3268
3582
Option('branch',
3269
3583
help='Set identity for the current branch instead of '
3273
3587
encoding_type = 'replace'
3274
3588
3275
3589
@display_command
3276
def run(self, email=False, branch=False, name=None):
3590
def run(self, email=False, branch=False, name=None, directory=None):
3277
3591
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()
3592
if directory is None:
3593
# use branch if we're inside one; otherwise global config
3594
try:
3595
c = Branch.open_containing(u'.')[0].get_config()
3596
except errors.NotBranchError:
3597
c = _mod_config.GlobalConfig()
3598
else:
3599
c = Branch.open(directory).get_config()
3283
3600
if email:
3284
3601
self.outf.write(c.user_email() + '\n')
3285
3602
else:
3286
3603
self.outf.write(c.username() + '\n')
3287
3604
return
3288
3605
3606
if email:
3607
raise errors.BzrCommandError(gettext("--email can only be used to display existing "
3608
"identity"))
3609
3289
3610
# display a warning if an email address isn't included in the given name.
3290
3611
try:
3291
config.extract_email_address(name)
3612
_mod_config.extract_email_address(name)
3292
3613
except errors.NoEmailInUsername, e:
3293
3614
warning('"%s" does not seem to contain an email address. '
3294
3615
'This is allowed, but not recommended.', name)
3295
3616
3296
3617
# use global config unless --branch given
3297
3618
if branch:
3298
c = Branch.open_containing('.')[0].get_config()
3619
if directory is None:
3620
c = Branch.open_containing(u'.')[0].get_config()
3621
else:
3622
c = Branch.open(directory).get_config()
3299
3623
else:
3300
c = config.GlobalConfig()
3624
c = _mod_config.GlobalConfig()
3301
3625
c.set_user_option('email', name)
3302
3626
3303
3627
3304
3628
class cmd_nick(Command):
3305
"""Print or set the branch nickname.
3629
__doc__ = """Print or set the branch nickname.
3306
3630
3307
3631
If unset, the tree root directory name is used as the nickname.
3308
3632
To print the current nickname, execute with no argument.
3313
3637
3314
3638
_see_also = ['info']
3315
3639
takes_args = ['nickname?']
3316
def run(self, nickname=None):
3317
branch = Branch.open_containing(u'.')[0]
3640
takes_options = ['directory']
3641
def run(self, nickname=None, directory=u'.'):
3642
branch = Branch.open_containing(directory)[0]
3318
3643
if nickname is None:
3319
3644
self.printme(branch)
3320
3645
else:
3322
3647
3323
3648
@display_command
3324
3649
def printme(self, branch):
3325
print branch.nick
3650
self.outf.write('%s\n' % branch.nick)
3326
3651
3327
3652
3328
3653
class cmd_alias(Command):
3329
"""Set/unset and display aliases.
3654
__doc__ = """Set/unset and display aliases.
3330
3655
3331
3656
:Examples:
3332
3657
Show the current aliases::
3365
3690
3366
3691
def remove_alias(self, alias_name):
3367
3692
if alias_name is None:
3368
raise errors.BzrCommandError(
3369
'bzr alias --remove expects an alias to remove.')
3693
raise errors.BzrCommandError(gettext(
3694
'bzr alias --remove expects an alias to remove.'))
3370
3695
# If alias is not found, print something like:
3371
3696
# unalias: foo: not found
3372
c = config.GlobalConfig()
3697
c = _mod_config.GlobalConfig()
3373
3698
c.unset_alias(alias_name)
3374
3699
3375
3700
@display_command
3376
3701
def print_aliases(self):
3377
3702
"""Print out the defined aliases in a similar format to bash."""
3378
aliases = config.GlobalConfig().get_aliases()
3703
aliases = _mod_config.GlobalConfig().get_aliases()
3379
3704
for key, value in sorted(aliases.iteritems()):
3380
3705
self.outf.write('bzr alias %s="%s"\n' % (key, value))
3381
3706
3391
3716
3392
3717
def set_alias(self, alias_name, alias_command):
3393
3718
"""Save the alias in the global config."""
3394
c = config.GlobalConfig()
3719
c = _mod_config.GlobalConfig()
3395
3720
c.set_alias(alias_name, alias_command)
3396
3721
3397
3722
3398
3723
class cmd_selftest(Command):
3399
"""Run internal test suite.
3724
__doc__ = """Run internal test suite.
3400
3725
3401
3726
If arguments are given, they are regular expressions that say which tests
3402
3727
should run. Tests matching any expression are run, and other tests are
3432
3757
If you set BZR_TEST_PDB=1 when running selftest, failing tests will drop
3433
3758
into a pdb postmortem session.
3434
3759
3760
The --coverage=DIRNAME global option produces a report with covered code
3761
indicated.
3762
3435
3763
:Examples:
3436
3764
Run only tests relating to 'ignore'::
3437
3765
3448
3776
if typestring == "sftp":
3449
3777
from bzrlib.tests import stub_sftp
3450
3778
return stub_sftp.SFTPAbsoluteServer
3451
if typestring == "memory":
3779
elif typestring == "memory":
3452
3780
from bzrlib.tests import test_server
3453
3781
return memory.MemoryServer
3454
if typestring == "fakenfs":
3782
elif typestring == "fakenfs":
3455
3783
from bzrlib.tests import test_server
3456
3784
return test_server.FakeNFSServer
3457
3785
msg = "No known transport type %s. Supported types are: sftp\n" %\
3470
3798
'throughout the test suite.',
3471
3799
type=get_transport_type),
3472
3800
Option('benchmark',
3473
help='Run the benchmarks rather than selftests.'),
3801
help='Run the benchmarks rather than selftests.',
3802
hidden=True),
3474
3803
Option('lsprof-timed',
3475
3804
help='Generate lsprof output for benchmarked'
3476
3805
' sections of code.'),
3477
3806
Option('lsprof-tests',
3478
3807
help='Generate lsprof output for each test.'),
3479
Option('cache-dir', type=str,
3480
help='Cache intermediate benchmark output in this '
3481
'directory.'),
3482
3808
Option('first',
3483
3809
help='Run all tests, but run specified tests first.',
3484
3810
short_name='f',
3493
3819
Option('randomize', type=str, argname="SEED",
3494
3820
help='Randomize the order of tests using the given'
3495
3821
' 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.'),
3822
ListOption('exclude', type=str, argname="PATTERN",
3823
short_name='x',
3824
help='Exclude tests that match this regular'
3825
' expression.'),
3500
3826
Option('subunit',
3501
3827
help='Output test progress via subunit.'),
3502
3828
Option('strict', help='Fail on missing dependencies or '
3509
3835
param_name='starting_with', short_name='s',
3510
3836
help=
3511
3837
'Load only the tests starting with TESTID.'),
3838
Option('sync',
3839
help="By default we disable fsync and fdatasync"
3840
" while running the test suite.")
3512
3841
]
3513
3842
encoding_type = 'replace'
3514
3843
3518
3847
3519
3848
def run(self, testspecs_list=None, verbose=False, one=False,
3520
3849
transport=None, benchmark=None,
3521
lsprof_timed=None, cache_dir=None,
3850
lsprof_timed=None,
3522
3851
first=False, list_only=False,
3523
3852
randomize=None, exclude=None, strict=False,
3524
3853
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)
3854
parallel=None, lsprof_tests=False,
3855
sync=False):
3856
from bzrlib import tests
3857
3535
3858
if testspecs_list is not None:
3536
3859
pattern = '|'.join(testspecs_list)
3537
3860
else:
3540
3863
try:
3541
3864
from bzrlib.tests import SubUnitBzrRunner
3542
3865
except ImportError:
3543
raise errors.BzrCommandError("subunit not available. subunit "
3544
"needs to be installed to use --subunit.")
3866
raise errors.BzrCommandError(gettext("subunit not available. subunit "
3867
"needs to be installed to use --subunit."))
3545
3868
self.additional_selftest_args['runner_class'] = SubUnitBzrRunner
3869
# On Windows, disable automatic conversion of '\n' to '\r\n' in
3870
# stdout, which would corrupt the subunit stream.
3871
# FIXME: This has been fixed in subunit trunk (>0.0.5) so the
3872
# following code can be deleted when it's sufficiently deployed
3873
# -- vila/mgz 20100514
3874
if (sys.platform == "win32"
3875
and getattr(sys.stdout, 'fileno', None) is not None):
3876
import msvcrt
3877
msvcrt.setmode(sys.stdout.fileno(), os.O_BINARY)
3546
3878
if parallel:
3547
3879
self.additional_selftest_args.setdefault(
3548
3880
'suite_decorators', []).append(parallel)
3549
3881
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)
3882
raise errors.BzrCommandError(gettext(
3883
"--benchmark is no longer supported from bzr 2.2; "
3884
"use bzr-usertest instead"))
3885
test_suite_factory = None
3886
if not exclude:
3887
exclude_pattern = None
3556
3888
else:
3557
test_suite_factory = None
3558
benchfile = None
3889
exclude_pattern = '(' + '|'.join(exclude) + ')'
3890
if not sync:
3891
self._disable_fsync()
3559
3892
selftest_kwargs = {"verbose": verbose,
3560
3893
"pattern": pattern,
3561
3894
"stop_on_failure": one,
3563
3896
"test_suite_factory": test_suite_factory,
3564
3897
"lsprof_timed": lsprof_timed,
3565
3898
"lsprof_tests": lsprof_tests,
3566
"bench_history": benchfile,
3567
3899
"matching_tests_first": first,
3568
3900
"list_only": list_only,
3569
3901
"random_seed": randomize,
3570
"exclude_pattern": exclude,
3902
"exclude_pattern": exclude_pattern,
3571
3903
"strict": strict,
3572
3904
"load_list": load_list,
3573
3905
"debug_flags": debugflag,
3574
3906
"starting_with": starting_with
3575
3907
}
3576
3908
selftest_kwargs.update(self.additional_selftest_args)
3577
result = selftest(**selftest_kwargs)
3909
3910
# Make deprecation warnings visible, unless -Werror is set
3911
cleanup = symbol_versioning.activate_deprecation_warnings(
3912
override=False)
3913
try:
3914
result = tests.selftest(**selftest_kwargs)
3915
finally:
3916
cleanup()
3578
3917
return int(not result)
3579
3918
3919
def _disable_fsync(self):
3920
"""Change the 'os' functionality to not synchronize."""
3921
self._orig_fsync = getattr(os, 'fsync', None)
3922
if self._orig_fsync is not None:
3923
os.fsync = lambda filedes: None
3924
self._orig_fdatasync = getattr(os, 'fdatasync', None)
3925
if self._orig_fdatasync is not None:
3926
os.fdatasync = lambda filedes: None
3927
3580
3928
3581
3929
class cmd_version(Command):
3582
"""Show version of bzr."""
3930
__doc__ = """Show version of bzr."""
3583
3931
3584
3932
encoding_type = 'replace'
3585
3933
takes_options = [
3596
3944
3597
3945
3598
3946
class cmd_rocks(Command):
3599
"""Statement of optimism."""
3947
__doc__ = """Statement of optimism."""
3600
3948
3601
3949
hidden = True
3602
3950
3603
3951
@display_command
3604
3952
def run(self):
3605
print "It sure does!"
3953
self.outf.write(gettext("It sure does!\n"))
3606
3954
3607
3955
3608
3956
class cmd_find_merge_base(Command):
3609
"""Find and print a base revision for merging two branches."""
3957
__doc__ = """Find and print a base revision for merging two branches."""
3610
3958
# TODO: Options to specify revisions on either side, as if
3611
3959
# merging only part of the history.
3612
3960
takes_args = ['branch', 'other']
3618
3966
3619
3967
branch1 = Branch.open_containing(branch)[0]
3620
3968
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)
3969
self.add_cleanup(branch1.lock_read().unlock)
3970
self.add_cleanup(branch2.lock_read().unlock)
3625
3971
last1 = ensure_null(branch1.last_revision())
3626
3972
last2 = ensure_null(branch2.last_revision())
3627
3973
3628
3974
graph = branch1.repository.get_graph(branch2.repository)
3629
3975
base_rev_id = graph.find_unique_lca(last1, last2)
3630
3976
3631
print 'merge base is revision %s' % base_rev_id
3977
self.outf.write(gettext('merge base is revision %s\n') % base_rev_id)
3632
3978
3633
3979
3634
3980
class cmd_merge(Command):
3635
"""Perform a three-way merge.
3981
__doc__ = """Perform a three-way merge.
3636
3982
3637
3983
The source of the merge can be specified either in the form of a branch,
3638
3984
or in the form of a path to a file containing a merge directive generated
3639
3985
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.
3986
or the branch most recently merged using --remember. The source of the
3987
merge may also be specified in the form of a path to a file in another
3988
branch: in this case, only the modifications to that file are merged into
3989
the current working tree.
3990
3991
When merging from a branch, by default bzr will try to merge in all new
3992
work from the other branch, automatically determining an appropriate base
3993
revision. If this fails, you may need to give an explicit base.
3994
3995
To pick a different ending revision, pass "--revision OTHER". bzr will
3996
try to merge in all new work up to and including revision OTHER.
3997
3998
If you specify two values, "--revision BASE..OTHER", only revisions BASE
3999
through OTHER, excluding BASE but including OTHER, will be merged. If this
4000
causes some revisions to be skipped, i.e. if the destination branch does
4001
not already contain revision BASE, such a merge is commonly referred to as
4002
a "cherrypick". Unlike a normal merge, Bazaar does not currently track
4003
cherrypicks. The changes look like a normal commit, and the history of the
4004
changes from the other branch is not stored in the commit.
4005
4006
Revision numbers are always relative to the source branch.
3652
4007
3653
4008
Merge will do its best to combine the changes in two branches, but there
3654
4009
are some kinds of problems only a human can fix. When it encounters those,
3657
4012
3658
4013
Use bzr resolve when you have fixed a problem. See also bzr conflicts.
3659
4014
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.
4015
If there is no default branch set, the first merge will set it (use
4016
--no-remember to avoid setting it). After that, you can omit the branch
4017
to use the default. To change the default, use --remember. The value will
4018
only be saved if the remote location can be accessed.
3664
4019
3665
4020
The results of the merge are placed into the destination working
3666
4021
directory, where they can be reviewed (with bzr diff), tested, and then
3667
4022
committed to record the result of the merge.
3668
4023
3669
4024
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
4025
--force is given. If --force is given, then the changes from the source
4026
will be merged with the current working tree, including any uncommitted
4027
changes in the tree. The --force option can also be used to create a
3671
4028
merge revision which has more than two parents.
3672
4029
3673
4030
If one would like to merge changes from the working tree of the other
3678
4035
you to apply each diff hunk and file change, similar to "shelve".
3679
4036
3680
4037
:Examples:
3681
To merge the latest revision from bzr.dev::
4038
To merge all new revisions from bzr.dev::
3682
4039
3683
4040
bzr merge ../bzr.dev
3684
4041
3721
4078
' completely merged into the source, pull from the'
3722
4079
' source rather than merging. When this happens,'
3723
4080
' you do not need to commit the result.'),
3724
Option('directory',
4081
custom_help('directory',
3725
4082
help='Branch to merge into, '
3726
'rather than the one containing the working directory.',
3727
short_name='d',
3728
type=unicode,
3729
),
4083
'rather than the one containing the working directory.'),
3730
4084
Option('preview', help='Instead of merging, show a diff of the'
3731
4085
' merge.'),
3732
4086
Option('interactive', help='Select changes interactively.',
3734
4088
]
3735
4089
3736
4090
def run(self, location=None, revision=None, force=False,
3737
merge_type=None, show_base=False, reprocess=None, remember=False,
4091
merge_type=None, show_base=False, reprocess=None, remember=None,
3738
4092
uncommitted=False, pull=False,
3739
4093
directory=None,
3740
4094
preview=False,
3748
4102
merger = None
3749
4103
allow_pending = True
3750
4104
verified = 'inapplicable'
4105
3751
4106
tree = WorkingTree.open_containing(directory)[0]
4107
if tree.branch.revno() == 0:
4108
raise errors.BzrCommandError(gettext('Merging into empty branches not currently supported, '
4109
'https://bugs.launchpad.net/bzr/+bug/308562'))
3752
4110
3753
4111
try:
3754
4112
basis_tree = tree.revision_tree(tree.last_revision())
3765
4123
unversioned_filter=tree.is_ignored, view_info=view_info)
3766
4124
pb = ui.ui_factory.nested_progress_bar()
3767
4125
self.add_cleanup(pb.finished)
3768
tree.lock_write()
3769
self.add_cleanup(tree.unlock)
4126
self.add_cleanup(tree.lock_write().unlock)
3770
4127
if location is not None:
3771
4128
try:
3772
4129
mergeable = bundle.read_mergeable_from_url(location,
3775
4132
mergeable = None
3776
4133
else:
3777
4134
if uncommitted:
3778
raise errors.BzrCommandError('Cannot use --uncommitted'
3779
' with bundles or merge directives.')
4135
raise errors.BzrCommandError(gettext('Cannot use --uncommitted'
4136
' with bundles or merge directives.'))
3780
4137
3781
4138
if revision is not None:
3782
raise errors.BzrCommandError(
3783
'Cannot use -r with merge directives or bundles')
4139
raise errors.BzrCommandError(gettext(
4140
'Cannot use -r with merge directives or bundles'))
3784
4141
merger, verified = _mod_merge.Merger.from_mergeable(tree,
3785
4142
mergeable, None)
3786
4143
3787
4144
if merger is None and uncommitted:
3788
4145
if revision is not None and len(revision) > 0:
3789
raise errors.BzrCommandError('Cannot use --uncommitted and'
3790
' --revision at the same time.')
4146
raise errors.BzrCommandError(gettext('Cannot use --uncommitted and'
4147
' --revision at the same time.'))
3791
4148
merger = self.get_merger_from_uncommitted(tree, location, None)
3792
4149
allow_pending = False
3793
4150
3801
4158
self.sanity_check_merger(merger)
3802
4159
if (merger.base_rev_id == merger.other_rev_id and
3803
4160
merger.other_rev_id is not None):
3804
note('Nothing to do.')
4161
# check if location is a nonexistent file (and not a branch) to
4162
# disambiguate the 'Nothing to do'
4163
if merger.interesting_files:
4164
if not merger.other_tree.has_filename(
4165
merger.interesting_files[0]):
4166
note(gettext("merger: ") + str(merger))
4167
raise errors.PathsDoNotExist([location])
4168
note(gettext('Nothing to do.'))
3805
4169
return 0
3806
if pull:
4170
if pull and not preview:
3807
4171
if merger.interesting_files is not None:
3808
raise errors.BzrCommandError('Cannot pull individual files')
4172
raise errors.BzrCommandError(gettext('Cannot pull individual files'))
3809
4173
if (merger.base_rev_id == tree.last_revision()):
3810
4174
result = tree.pull(merger.other_branch, False,
3811
4175
merger.other_rev_id)
3812
4176
result.report(self.outf)
3813
4177
return 0
3814
4178
if merger.this_basis is None:
3815
raise errors.BzrCommandError(
4179
raise errors.BzrCommandError(gettext(
3816
4180
"This branch has no commits."
3817
" (perhaps you would prefer 'bzr pull')")
4181
" (perhaps you would prefer 'bzr pull')"))
3818
4182
if preview:
3819
4183
return self._do_preview(merger)
3820
4184
elif interactive:
3833
4197
def _do_preview(self, merger):
3834
4198
from bzrlib.diff import show_diff_trees
3835
4199
result_tree = self._get_preview(merger)
4200
path_encoding = osutils.get_diff_header_encoding()
3836
4201
show_diff_trees(merger.this_tree, result_tree, self.outf,
3837
old_label='', new_label='')
4202
old_label='', new_label='',
4203
path_encoding=path_encoding)
3838
4204
3839
4205
def _do_merge(self, merger, change_reporter, allow_pending, verified):
3840
4206
merger.change_reporter = change_reporter
3869
4235
def sanity_check_merger(self, merger):
3870
4236
if (merger.show_base and
3871
4237
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)
4238
raise errors.BzrCommandError(gettext("Show-base is not supported for this"
4239
" merge type. %s") % merger.merge_type)
3874
4240
if merger.reprocess is None:
3875
4241
if merger.show_base:
3876
4242
merger.reprocess = False
3878
4244
# Use reprocess if the merger supports it
3879
4245
merger.reprocess = merger.merge_type.supports_reprocess
3880
4246
if merger.reprocess and not merger.merge_type.supports_reprocess:
3881
raise errors.BzrCommandError("Conflict reduction is not supported"
3882
" for merge type %s." %
4247
raise errors.BzrCommandError(gettext("Conflict reduction is not supported"
4248
" for merge type %s.") %
3883
4249
merger.merge_type)
3884
4250
if merger.reprocess and merger.show_base:
3885
raise errors.BzrCommandError("Cannot do conflict reduction and"
3886
" show base.")
4251
raise errors.BzrCommandError(gettext("Cannot do conflict reduction and"
4252
" show base."))
3887
4253
3888
4254
def _get_merger_from_branch(self, tree, location, revision, remember,
3889
4255
possible_transports, pb):
3916
4282
if other_revision_id is None:
3917
4283
other_revision_id = _mod_revision.ensure_null(
3918
4284
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):
4285
# Remember where we merge from. We need to remember if:
4286
# - user specify a location (and we don't merge from the parent
4287
# branch)
4288
# - user ask to remember or there is no previous location set to merge
4289
# from and user didn't ask to *not* remember
4290
if (user_location is not None
4291
and ((remember
4292
or (remember is None
4293
and tree.branch.get_submit_branch() is None)))):
3922
4294
tree.branch.set_submit_branch(other_branch.base)
3923
_merge_tags_if_possible(other_branch, tree.branch)
4295
# Merge tags (but don't set them in the master branch yet, the user
4296
# might revert this merge). Commit will propagate them.
4297
_merge_tags_if_possible(other_branch, tree.branch, ignore_master=True)
3924
4298
merger = _mod_merge.Merger.from_revision_ids(pb, tree,
3925
4299
other_revision_id, base_revision_id, other_branch, base_branch)
3926
4300
if other_path != '':
3985
4359
stored_location_type = "parent"
3986
4360
mutter("%s", stored_location)
3987
4361
if stored_location is None:
3988
raise errors.BzrCommandError("No location specified or remembered")
4362
raise errors.BzrCommandError(gettext("No location specified or remembered"))
3989
4363
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)
4364
note(gettext("{0} remembered {1} location {2}").format(verb_string,
4365
stored_location_type, display_url))
3992
4366
return stored_location
3993
4367
3994
4368
3995
4369
class cmd_remerge(Command):
3996
"""Redo a merge.
4370
__doc__ = """Redo a merge.
3997
4371
3998
4372
Use this if you want to try a different merge technique while resolving
3999
4373
conflicts. Some merge techniques are better than others, and remerge
4024
4398
4025
4399
def run(self, file_list=None, merge_type=None, show_base=False,
4026
4400
reprocess=False):
4401
from bzrlib.conflicts import restore
4027
4402
if merge_type is None:
4028
4403
merge_type = _mod_merge.Merge3Merger
4029
tree, file_list = tree_files(file_list)
4030
tree.lock_write()
4031
self.add_cleanup(tree.unlock)
4404
tree, file_list = WorkingTree.open_containing_paths(file_list)
4405
self.add_cleanup(tree.lock_write().unlock)
4032
4406
parents = tree.get_parent_ids()
4033
4407
if len(parents) != 2:
4034
raise errors.BzrCommandError("Sorry, remerge only works after normal"
4408
raise errors.BzrCommandError(gettext("Sorry, remerge only works after normal"
4035
4409
" merges. Not cherrypicking or"
4036
" multi-merges.")
4410
" multi-merges."))
4037
4411
repository = tree.branch.repository
4038
4412
interesting_ids = None
4039
4413
new_conflicts = []
4087
4461
4088
4462
4089
4463
class cmd_revert(Command):
4090
"""Revert files to a previous revision.
4464
__doc__ = """Revert files to a previous revision.
4091
4465
4092
4466
Giving a list of files will revert only those files. Otherwise, all files
4093
4467
will be reverted. If the revision is not specified with '--revision', the
4094
4468
last committed revision is used.
4095
4469
4096
4470
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.
4471
merge instead. For example, "merge . -r -2..-3" (don't forget the ".")
4472
will remove the changes introduced by the second last commit (-2), without
4473
affecting the changes introduced by the last commit (-1). To remove
4474
certain changes on a hunk-by-hunk basis, see the shelve command.
4100
4475
4101
4476
By default, any files that have been manually changed will be backed up
4102
4477
first. (Files changed only by merge are not backed up.) Backup files have
4132
4507
target branches.
4133
4508
"""
4134
4509
4135
_see_also = ['cat', 'export']
4510
_see_also = ['cat', 'export', 'merge', 'shelve']
4136
4511
takes_options = [
4137
4512
'revision',
4138
4513
Option('no-backup', "Do not save backups of reverted files."),
4143
4518
4144
4519
def run(self, revision=None, no_backup=False, file_list=None,
4145
4520
forget_merges=None):
4146
tree, file_list = tree_files(file_list)
4147
tree.lock_write()
4148
self.add_cleanup(tree.unlock)
4521
tree, file_list = WorkingTree.open_containing_paths(file_list)
4522
self.add_cleanup(tree.lock_tree_write().unlock)
4149
4523
if forget_merges:
4150
4524
tree.set_parent_ids(tree.get_parent_ids()[:1])
4151
4525
else:
4159
4533
4160
4534
4161
4535
class cmd_assert_fail(Command):
4162
"""Test reporting of assertion failures"""
4536
__doc__ = """Test reporting of assertion failures"""
4163
4537
# intended just for use in testing
4164
4538
4165
4539
hidden = True
4169
4543
4170
4544
4171
4545
class cmd_help(Command):
4172
"""Show help on a command or other topic.
4546
__doc__ = """Show help on a command or other topic.
4173
4547
"""
4174
4548
4175
4549
_see_also = ['topics']
4188
4562
4189
4563
4190
4564
class cmd_shell_complete(Command):
4191
"""Show appropriate completions for context.
4565
__doc__ = """Show appropriate completions for context.
4192
4566
4193
4567
For a list of all available commands, say 'bzr shell-complete'.
4194
4568
"""
4203
4577
4204
4578
4205
4579
class cmd_missing(Command):
4206
"""Show unmerged/unpulled revisions between two branches.
4580
__doc__ = """Show unmerged/unpulled revisions between two branches.
4207
4581
4208
4582
OTHER_BRANCH may be local or remote.
4209
4583
4240
4614
_see_also = ['merge', 'pull']
4241
4615
takes_args = ['other_branch?']
4242
4616
takes_options = [
4617
'directory',
4243
4618
Option('reverse', 'Reverse the order of revisions.'),
4244
4619
Option('mine-only',
4245
4620
'Display changes in the local branch only.'),
4257
4632
type=_parse_revision_str,
4258
4633
help='Filter on local branch revisions (inclusive). '
4259
4634
'See "help revisionspec" for details.'),
4260
Option('include-merges',
4635
Option('include-merged',
4261
4636
'Show all revisions in addition to the mainline ones.'),
4637
Option('include-merges', hidden=True,
4638
help='Historical alias for --include-merged.'),
4262
4639
]
4263
4640
encoding_type = 'replace'
4264
4641
4267
4644
theirs_only=False,
4268
4645
log_format=None, long=False, short=False, line=False,
4269
4646
show_ids=False, verbose=False, this=False, other=False,
4270
include_merges=False, revision=None, my_revision=None):
4647
include_merged=None, revision=None, my_revision=None,
4648
directory=u'.',
4649
include_merges=symbol_versioning.DEPRECATED_PARAMETER):
4271
4650
from bzrlib.missing import find_unmerged, iter_log_revisions
4272
4651
def message(s):
4273
4652
if not is_quiet():
4274
4653
self.outf.write(s)
4275
4654
4655
if symbol_versioning.deprecated_passed(include_merges):
4656
ui.ui_factory.show_user_warning(
4657
'deprecated_command_option',
4658
deprecated_name='--include-merges',
4659
recommended_name='--include-merged',
4660
deprecated_in_version='2.5',
4661
command=self.invoked_as)
4662
if include_merged is None:
4663
include_merged = include_merges
4664
else:
4665
raise errors.BzrCommandError(gettext(
4666
'{0} and {1} are mutually exclusive').format(
4667
'--include-merges', '--include-merged'))
4668
if include_merged is None:
4669
include_merged = False
4276
4670
if this:
4277
4671
mine_only = this
4278
4672
if other:
4286
4680
elif theirs_only:
4287
4681
restrict = 'remote'
4288
4682
4289
local_branch = Branch.open_containing(u".")[0]
4683
local_branch = Branch.open_containing(directory)[0]
4684
self.add_cleanup(local_branch.lock_read().unlock)
4685
4290
4686
parent = local_branch.get_parent()
4291
4687
if other_branch is None:
4292
4688
other_branch = parent
4293
4689
if other_branch is None:
4294
raise errors.BzrCommandError("No peer location known"
4295
" or specified.")
4690
raise errors.BzrCommandError(gettext("No peer location known"
4691
" or specified."))
4296
4692
display_url = urlutils.unescape_for_display(parent,
4297
4693
self.outf.encoding)
4298
message("Using saved parent location: "
4299
+ display_url + "\n")
4694
message(gettext("Using saved parent location: {0}\n").format(
4695
display_url))
4300
4696
4301
4697
remote_branch = Branch.open(other_branch)
4302
4698
if remote_branch.base == local_branch.base:
4303
4699
remote_branch = local_branch
4700
else:
4701
self.add_cleanup(remote_branch.lock_read().unlock)
4304
4702
4305
local_branch.lock_read()
4306
self.add_cleanup(local_branch.unlock)
4307
4703
local_revid_range = _revision_range_to_revid_range(
4308
4704
_get_revision_range(my_revision, local_branch,
4309
4705
self.name()))
4310
4706
4311
remote_branch.lock_read()
4312
self.add_cleanup(remote_branch.unlock)
4313
4707
remote_revid_range = _revision_range_to_revid_range(
4314
4708
_get_revision_range(revision,
4315
4709
remote_branch, self.name()))
4317
4711
local_extra, remote_extra = find_unmerged(
4318
4712
local_branch, remote_branch, restrict,
4319
4713
backward=not reverse,
4320
include_merges=include_merges,
4714
include_merged=include_merged,
4321
4715
local_revid_range=local_revid_range,
4322
4716
remote_revid_range=remote_revid_range)
4323
4717
4330
4724
4331
4725
status_code = 0
4332
4726
if local_extra and not theirs_only:
4333
message("You have %d extra revision(s):\n" %
4727
message(ngettext("You have %d extra revision:\n",
4728
"You have %d extra revisions:\n",
4729
len(local_extra)) %
4334
4730
len(local_extra))
4335
4731
for revision in iter_log_revisions(local_extra,
4336
4732
local_branch.repository,
4344
4740
if remote_extra and not mine_only:
4345
4741
if printed_local is True:
4346
4742
message("\n\n\n")
4347
message("You are missing %d revision(s):\n" %
4743
message(ngettext("You are missing %d revision:\n",
4744
"You are missing %d revisions:\n",
4745
len(remote_extra)) %
4348
4746
len(remote_extra))
4349
4747
for revision in iter_log_revisions(remote_extra,
4350
4748
remote_branch.repository,
4354
4752
4355
4753
if mine_only and not local_extra:
4356
4754
# We checked local, and found nothing extra
4357
message('This branch is up to date.\n')
4755
message(gettext('This branch has no new revisions.\n'))
4358
4756
elif theirs_only and not remote_extra:
4359
4757
# We checked remote, and found nothing extra
4360
message('Other branch is up to date.\n')
4758
message(gettext('Other branch has no new revisions.\n'))
4361
4759
elif not (mine_only or theirs_only or local_extra or
4362
4760
remote_extra):
4363
4761
# We checked both branches, and neither one had extra
4364
4762
# revisions
4365
message("Branches are up to date.\n")
4763
message(gettext("Branches are up to date.\n"))
4366
4764
self.cleanup_now()
4367
4765
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)
4766
self.add_cleanup(local_branch.lock_write().unlock)
4370
4767
# handle race conditions - a parent might be set while we run.
4371
4768
if local_branch.get_parent() is None:
4372
4769
local_branch.set_parent(remote_branch.base)
4374
4771
4375
4772
4376
4773
class cmd_pack(Command):
4377
"""Compress the data within a repository."""
4774
__doc__ = """Compress the data within a repository.
4775
4776
This operation compresses the data within a bazaar repository. As
4777
bazaar supports automatic packing of repository, this operation is
4778
normally not required to be done manually.
4779
4780
During the pack operation, bazaar takes a backup of existing repository
4781
data, i.e. pack files. This backup is eventually removed by bazaar
4782
automatically when it is safe to do so. To save disk space by removing
4783
the backed up pack files, the --clean-obsolete-packs option may be
4784
used.
4785
4786
Warning: If you use --clean-obsolete-packs and your machine crashes
4787
during or immediately after repacking, you may be left with a state
4788
where the deletion has been written to disk but the new packs have not
4789
been. In this case the repository may be unusable.
4790
"""
4378
4791
4379
4792
_see_also = ['repositories']
4380
4793
takes_args = ['branch_or_repo?']
4794
takes_options = [
4795
Option('clean-obsolete-packs', 'Delete obsolete packs to save disk space.'),
4796
]
4381
4797
4382
def run(self, branch_or_repo='.'):
4798
def run(self, branch_or_repo='.', clean_obsolete_packs=False):
4383
4799
dir = bzrdir.BzrDir.open_containing(branch_or_repo)[0]
4384
4800
try:
4385
4801
branch = dir.open_branch()
4386
4802
repository = branch.repository
4387
4803
except errors.NotBranchError:
4388
4804
repository = dir.open_repository()
4389
repository.pack()
4805
repository.pack(clean_obsolete_packs=clean_obsolete_packs)
4390
4806
4391
4807
4392
4808
class cmd_plugins(Command):
4393
"""List the installed plugins.
4809
__doc__ = """List the installed plugins.
4394
4810
4395
4811
This command displays the list of installed plugins including
4396
4812
version of plugin and a short description of each.
4412
4828
4413
4829
@display_command
4414
4830
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
4831
from bzrlib import plugin
4832
# Don't give writelines a generator as some codecs don't like that
4833
self.outf.writelines(
4834
list(plugin.describe_plugins(show_paths=verbose)))
4435
4835
4436
4836
4437
4837
class cmd_testament(Command):
4438
"""Show testament (signing-form) of a revision."""
4838
__doc__ = """Show testament (signing-form) of a revision."""
4439
4839
takes_options = [
4440
4840
'revision',
4441
4841
Option('long', help='Produce long-format testament.'),
4453
4853
b = Branch.open_containing(branch)[0]
4454
4854
else:
4455
4855
b = Branch.open(branch)
4456
b.lock_read()
4457
self.add_cleanup(b.unlock)
4856
self.add_cleanup(b.lock_read().unlock)
4458
4857
if revision is None:
4459
4858
rev_id = b.last_revision()
4460
4859
else:
4467
4866
4468
4867
4469
4868
class cmd_annotate(Command):
4470
"""Show the origin of each line in a file.
4869
__doc__ = """Show the origin of each line in a file.
4471
4870
4472
4871
This prints out the given file with an annotation on the left side
4473
4872
indicating which revision, author and date introduced the change.
4484
4883
Option('long', help='Show commit date in annotations.'),
4485
4884
'revision',
4486
4885
'show-ids',
4886
'directory',
4487
4887
]
4488
4888
encoding_type = 'exact'
4489
4889
4490
4890
@display_command
4491
4891
def run(self, filename, all=False, long=False, revision=None,
4492
show_ids=False):
4493
from bzrlib.annotate import annotate_file, annotate_file_tree
4892
show_ids=False, directory=None):
4893
from bzrlib.annotate import (
4894
annotate_file_tree,
4895
)
4494
4896
wt, branch, relpath = \
4495
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
4897
_open_directory_or_containing_tree_or_branch(filename, directory)
4496
4898
if wt is not None:
4497
wt.lock_read()
4498
self.add_cleanup(wt.unlock)
4899
self.add_cleanup(wt.lock_read().unlock)
4499
4900
else:
4500
branch.lock_read()
4501
self.add_cleanup(branch.unlock)
4901
self.add_cleanup(branch.lock_read().unlock)
4502
4902
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:
4903
self.add_cleanup(tree.lock_read().unlock)
4904
if wt is not None and revision is None:
4506
4905
file_id = wt.path2id(relpath)
4507
4906
else:
4508
4907
file_id = tree.path2id(relpath)
4509
4908
if file_id is None:
4510
4909
raise errors.NotVersionedError(filename)
4511
file_version = tree.inventory[file_id].revision
4512
4910
if wt is not None and revision is None:
4513
4911
# If there is a tree and we're not annotating historical
4514
4912
# versions, annotate the working tree's content.
4515
4913
annotate_file_tree(wt, file_id, self.outf, long, all,
4516
4914
show_ids=show_ids)
4517
4915
else:
4518
annotate_file(branch, file_version, file_id, long, all, self.outf,
4519
show_ids=show_ids)
4916
annotate_file_tree(tree, file_id, self.outf, long, all,
4917
show_ids=show_ids, branch=branch)
4520
4918
4521
4919
4522
4920
class cmd_re_sign(Command):
4523
"""Create a digital signature for an existing revision."""
4921
__doc__ = """Create a digital signature for an existing revision."""
4524
4922
# TODO be able to replace existing ones.
4525
4923
4526
4924
hidden = True # is this right ?
4527
4925
takes_args = ['revision_id*']
4528
takes_options = ['revision']
4926
takes_options = ['directory', 'revision']
4529
4927
4530
def run(self, revision_id_list=None, revision=None):
4928
def run(self, revision_id_list=None, revision=None, directory=u'.'):
4531
4929
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')
4930
raise errors.BzrCommandError(gettext('You can only supply one of revision_id or --revision'))
4533
4931
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)
4932
raise errors.BzrCommandError(gettext('You must supply either --revision or a revision_id'))
4933
b = WorkingTree.open_containing(directory)[0].branch
4934
self.add_cleanup(b.lock_write().unlock)
4538
4935
return self._run(b, revision_id_list, revision)
4539
4936
4540
4937
def _run(self, b, revision_id_list, revision):
4570
4967
if to_revid is None:
4571
4968
to_revno = b.revno()
4572
4969
if from_revno is None or to_revno is None:
4573
raise errors.BzrCommandError('Cannot sign a range of non-revision-history revisions')
4970
raise errors.BzrCommandError(gettext('Cannot sign a range of non-revision-history revisions'))
4574
4971
b.repository.start_write_group()
4575
4972
try:
4576
4973
for revno in range(from_revno, to_revno + 1):
4582
4979
else:
4583
4980
b.repository.commit_write_group()
4584
4981
else:
4585
raise errors.BzrCommandError('Please supply either one revision, or a range.')
4982
raise errors.BzrCommandError(gettext('Please supply either one revision, or a range.'))
4586
4983
4587
4984
4588
4985
class cmd_bind(Command):
4589
"""Convert the current branch into a checkout of the supplied branch.
4986
__doc__ = """Convert the current branch into a checkout of the supplied branch.
4987
If no branch is supplied, rebind to the last bound location.
4590
4988
4591
4989
Once converted into a checkout, commits must succeed on the master branch
4592
4990
before they will be applied to the local branch.
4598
4996
4599
4997
_see_also = ['checkouts', 'unbind']
4600
4998
takes_args = ['location?']
4601
takes_options = []
4999
takes_options = ['directory']
4602
5000
4603
def run(self, location=None):
4604
b, relpath = Branch.open_containing(u'.')
5001
def run(self, location=None, directory=u'.'):
5002
b, relpath = Branch.open_containing(directory)
4605
5003
if location is None:
4606
5004
try:
4607
5005
location = b.get_old_bound_location()
4608
5006
except errors.UpgradeRequired:
4609
raise errors.BzrCommandError('No location supplied. '
4610
'This format does not remember old locations.')
5007
raise errors.BzrCommandError(gettext('No location supplied. '
5008
'This format does not remember old locations.'))
4611
5009
else:
4612
5010
if location is None:
4613
5011
if b.get_bound_location() is not None:
4614
raise errors.BzrCommandError('Branch is already bound')
5012
raise errors.BzrCommandError(gettext('Branch is already bound'))
4615
5013
else:
4616
raise errors.BzrCommandError('No location supplied '
4617
'and no previous location known')
5014
raise errors.BzrCommandError(gettext('No location supplied '
5015
'and no previous location known'))
4618
5016
b_other = Branch.open(location)
4619
5017
try:
4620
5018
b.bind(b_other)
4621
5019
except errors.DivergedBranches:
4622
raise errors.BzrCommandError('These branches have diverged.'
4623
' Try merging, and then bind again.')
5020
raise errors.BzrCommandError(gettext('These branches have diverged.'
5021
' Try merging, and then bind again.'))
4624
5022
if b.get_config().has_explicit_nickname():
4625
5023
b.nick = b_other.nick
4626
5024
4627
5025
4628
5026
class cmd_unbind(Command):
4629
"""Convert the current checkout into a regular branch.
5027
__doc__ = """Convert the current checkout into a regular branch.
4630
5028
4631
5029
After unbinding, the local branch is considered independent and subsequent
4632
5030
commits will be local only.
4634
5032
4635
5033
_see_also = ['checkouts', 'bind']
4636
5034
takes_args = []
4637
takes_options = []
5035
takes_options = ['directory']
4638
5036
4639
def run(self):
4640
b, relpath = Branch.open_containing(u'.')
5037
def run(self, directory=u'.'):
5038
b, relpath = Branch.open_containing(directory)
4641
5039
if not b.unbind():
4642
raise errors.BzrCommandError('Local branch is not bound')
5040
raise errors.BzrCommandError(gettext('Local branch is not bound'))
4643
5041
4644
5042
4645
5043
class cmd_uncommit(Command):
4646
"""Remove the last committed revision.
5044
__doc__ = """Remove the last committed revision.
4647
5045
4648
5046
--verbose will print out what is being removed.
4649
5047
--dry-run will go through all the motions, but not actually
4666
5064
takes_options = ['verbose', 'revision',
4667
5065
Option('dry-run', help='Don\'t actually make changes.'),
4668
5066
Option('force', help='Say yes to all questions.'),
5067
Option('keep-tags',
5068
help='Keep tags that point to removed revisions.'),
4669
5069
Option('local',
4670
5070
help="Only remove the commits from the local branch"
4671
5071
" when in a checkout."
4675
5075
aliases = []
4676
5076
encoding_type = 'replace'
4677
5077
4678
def run(self, location=None,
4679
dry_run=False, verbose=False,
4680
revision=None, force=False, local=False):
5078
def run(self, location=None, dry_run=False, verbose=False,
5079
revision=None, force=False, local=False, keep_tags=False):
4681
5080
if location is None:
4682
5081
location = u'.'
4683
5082
control, relpath = bzrdir.BzrDir.open_containing(location)
4689
5088
b = control.open_branch()
4690
5089
4691
5090
if tree is not None:
4692
tree.lock_write()
4693
self.add_cleanup(tree.unlock)
5091
self.add_cleanup(tree.lock_write().unlock)
4694
5092
else:
4695
b.lock_write()
4696
self.add_cleanup(b.unlock)
4697
return self._run(b, tree, dry_run, verbose, revision, force, local=local)
5093
self.add_cleanup(b.lock_write().unlock)
5094
return self._run(b, tree, dry_run, verbose, revision, force,
5095
local, keep_tags)
4698
5096
4699
def _run(self, b, tree, dry_run, verbose, revision, force, local=False):
5097
def _run(self, b, tree, dry_run, verbose, revision, force, local,
5098
keep_tags):
4700
5099
from bzrlib.log import log_formatter, show_log
4701
5100
from bzrlib.uncommit import uncommit
4702
5101
4717
5116
rev_id = b.get_rev_id(revno)
4718
5117
4719
5118
if rev_id is None or _mod_revision.is_null(rev_id):
4720
ui.ui_factory.note('No revisions to uncommit.')
5119
self.outf.write(gettext('No revisions to uncommit.\n'))
4721
5120
return 1
4722
5121
4723
log_collector = ui.ui_factory.make_output_stream()
4724
5122
lf = log_formatter('short',
4725
to_file=log_collector,
5123
to_file=self.outf,
4726
5124
show_timezone='original')
4727
5125
4728
5126
show_log(b,
4733
5131
end_revision=last_revno)
4734
5132
4735
5133
if dry_run:
4736
ui.ui_factory.note('Dry-run, pretending to remove the above revisions.')
5134
self.outf.write(gettext('Dry-run, pretending to remove'
5135
' the above revisions.\n'))
4737
5136
else:
4738
ui.ui_factory.note('The above revision(s) will be removed.')
5137
self.outf.write(gettext('The above revision(s) will be removed.\n'))
4739
5138
4740
5139
if not force:
4741
if not ui.ui_factory.get_boolean('Are you sure [y/N]? '):
4742
ui.ui_factory.note('Canceled')
5140
if not ui.ui_factory.confirm_action(
5141
gettext(u'Uncommit these revisions'),
5142
'bzrlib.builtins.uncommit',
5143
{}):
5144
self.outf.write(gettext('Canceled\n'))
4743
5145
return 0
4744
5146
4745
5147
mutter('Uncommitting from {%s} to {%s}',
4746
5148
last_rev_id, rev_id)
4747
5149
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)
5150
revno=revno, local=local, keep_tags=keep_tags)
5151
self.outf.write(gettext('You can restore the old tip by running:\n'
5152
' bzr pull . -r revid:%s\n') % last_rev_id)
4751
5153
4752
5154
4753
5155
class cmd_break_lock(Command):
4754
"""Break a dead lock on a repository, branch or working directory.
5156
__doc__ = """Break a dead lock.
5157
5158
This command breaks a lock on a repository, branch, working directory or
5159
config file.
4755
5160
4756
5161
CAUTION: Locks should only be broken when you are sure that the process
4757
5162
holding the lock has been stopped.
4762
5167
:Examples:
4763
5168
bzr break-lock
4764
5169
bzr break-lock bzr+ssh://example.com/bzr/foo
5170
bzr break-lock --conf ~/.bazaar
4765
5171
"""
5172
4766
5173
takes_args = ['location?']
5174
takes_options = [
5175
Option('config',
5176
help='LOCATION is the directory where the config lock is.'),
5177
Option('force',
5178
help='Do not ask for confirmation before breaking the lock.'),
5179
]
4767
5180
4768
def run(self, location=None, show=False):
5181
def run(self, location=None, config=False, force=False):
4769
5182
if location is None:
4770
5183
location = u'.'
4771
control, relpath = bzrdir.BzrDir.open_containing(location)
4772
try:
4773
control.break_lock()
4774
except NotImplementedError:
4775
pass
5184
if force:
5185
ui.ui_factory = ui.ConfirmationUserInterfacePolicy(ui.ui_factory,
5186
None,
5187
{'bzrlib.lockdir.break': True})
5188
if config:
5189
conf = _mod_config.LockableConfig(file_name=location)
5190
conf.break_lock()
5191
else:
5192
control, relpath = bzrdir.BzrDir.open_containing(location)
5193
try:
5194
control.break_lock()
5195
except NotImplementedError:
5196
pass
4776
5197
4777
5198
4778
5199
class cmd_wait_until_signalled(Command):
4779
"""Test helper for test_start_and_stop_bzr_subprocess_send_signal.
5200
__doc__ = """Test helper for test_start_and_stop_bzr_subprocess_send_signal.
4780
5201
4781
5202
This just prints a line to signal when it is ready, then blocks on stdin.
4782
5203
"""
4790
5211
4791
5212
4792
5213
class cmd_serve(Command):
4793
"""Run the bzr server."""
5214
__doc__ = """Run the bzr server."""
4794
5215
4795
5216
aliases = ['server']
4796
5217
4807
5228
'result in a dynamically allocated port. The default port '
4808
5229
'depends on the protocol.',
4809
5230
type=str),
4810
Option('directory',
4811
help='Serve contents of this directory.',
4812
type=unicode),
5231
custom_help('directory',
5232
help='Serve contents of this directory.'),
4813
5233
Option('allow-writes',
4814
5234
help='By default the server is a readonly server. Supplying '
4815
5235
'--allow-writes enables write access to the contents of '
4842
5262
4843
5263
def run(self, port=None, inet=False, directory=None, allow_writes=False,
4844
5264
protocol=None):
4845
from bzrlib.transport import get_transport, transport_server_registry
5265
from bzrlib import transport
4846
5266
if directory is None:
4847
5267
directory = os.getcwd()
4848
5268
if protocol is None:
4849
protocol = transport_server_registry.get()
5269
protocol = transport.transport_server_registry.get()
4850
5270
host, port = self.get_host_and_port(port)
4851
5271
url = urlutils.local_path_to_url(directory)
4852
5272
if not allow_writes:
4853
5273
url = 'readonly+' + url
4854
transport = get_transport(url)
4855
protocol(transport, host, port, inet)
5274
t = transport.get_transport(url)
5275
protocol(t, host, port, inet)
4856
5276
4857
5277
4858
5278
class cmd_join(Command):
4859
"""Combine a tree into its containing tree.
5279
__doc__ = """Combine a tree into its containing tree.
4860
5280
4861
5281
This command requires the target tree to be in a rich-root format.
4862
5282
4864
5284
not part of it. (Such trees can be produced by "bzr split", but also by
4865
5285
running "bzr branch" with the target inside a tree.)
4866
5286
4867
The result is a combined tree, with the subtree no longer an independant
5287
The result is a combined tree, with the subtree no longer an independent
4868
5288
part. This is marked as a merge of the subtree into the containing tree,
4869
5289
and all history is preserved.
4870
5290
"""
4881
5301
containing_tree = WorkingTree.open_containing(parent_dir)[0]
4882
5302
repo = containing_tree.branch.repository
4883
5303
if not repo.supports_rich_root():
4884
raise errors.BzrCommandError(
5304
raise errors.BzrCommandError(gettext(
4885
5305
"Can't join trees because %s doesn't support rich root data.\n"
4886
"You can use bzr upgrade on the repository."
5306
"You can use bzr upgrade on the repository.")
4887
5307
% (repo,))
4888
5308
if reference:
4889
5309
try:
4891
5311
except errors.BadReferenceTarget, e:
4892
5312
# XXX: Would be better to just raise a nicely printable
4893
5313
# exception from the real origin. Also below. mbp 20070306
4894
raise errors.BzrCommandError("Cannot join %s. %s" %
4895
(tree, e.reason))
5314
raise errors.BzrCommandError(
5315
gettext("Cannot join {0}. {1}").format(tree, e.reason))
4896
5316
else:
4897
5317
try:
4898
5318
containing_tree.subsume(sub_tree)
4899
5319
except errors.BadSubsumeSource, e:
4900
raise errors.BzrCommandError("Cannot join %s. %s" %
4901
(tree, e.reason))
5320
raise errors.BzrCommandError(
5321
gettext("Cannot join {0}. {1}").format(tree, e.reason))
4902
5322
4903
5323
4904
5324
class cmd_split(Command):
4905
"""Split a subdirectory of a tree into a separate tree.
5325
__doc__ = """Split a subdirectory of a tree into a separate tree.
4906
5326
4907
5327
This command will produce a target tree in a format that supports
4908
5328
rich roots, like 'rich-root' or 'rich-root-pack'. These formats cannot be
4928
5348
4929
5349
4930
5350
class cmd_merge_directive(Command):
4931
"""Generate a merge directive for auto-merge tools.
5351
__doc__ = """Generate a merge directive for auto-merge tools.
4932
5352
4933
5353
A directive requests a merge to be performed, and also provides all the
4934
5354
information necessary to do so. This means it must either include a
4951
5371
_see_also = ['send']
4952
5372
4953
5373
takes_options = [
5374
'directory',
4954
5375
RegistryOption.from_kwargs('patch-type',
4955
5376
'The type of patch to include in the directive.',
4956
5377
title='Patch type',
4969
5390
encoding_type = 'exact'
4970
5391
4971
5392
def run(self, submit_branch=None, public_branch=None, patch_type='bundle',
4972
sign=False, revision=None, mail_to=None, message=None):
5393
sign=False, revision=None, mail_to=None, message=None,
5394
directory=u'.'):
4973
5395
from bzrlib.revision import ensure_null, NULL_REVISION
4974
5396
include_patch, include_bundle = {
4975
5397
'plain': (False, False),
4976
5398
'diff': (True, False),
4977
5399
'bundle': (True, True),
4978
5400
}[patch_type]
4979
branch = Branch.open('.')
5401
branch = Branch.open(directory)
4980
5402
stored_submit_branch = branch.get_submit_branch()
4981
5403
if submit_branch is None:
4982
5404
submit_branch = stored_submit_branch
4986
5408
if submit_branch is None:
4987
5409
submit_branch = branch.get_parent()
4988
5410
if submit_branch is None:
4989
raise errors.BzrCommandError('No submit branch specified or known')
5411
raise errors.BzrCommandError(gettext('No submit branch specified or known'))
4990
5412
4991
5413
stored_public_branch = branch.get_public_branch()
4992
5414
if public_branch is None:
4994
5416
elif stored_public_branch is None:
4995
5417
branch.set_public_branch(public_branch)
4996
5418
if not include_bundle and public_branch is None:
4997
raise errors.BzrCommandError('No public branch specified or'
4998
' known')
5419
raise errors.BzrCommandError(gettext('No public branch specified or'
5420
' known'))
4999
5421
base_revision_id = None
5000
5422
if revision is not None:
5001
5423
if len(revision) > 2:
5002
raise errors.BzrCommandError('bzr merge-directive takes '
5003
'at most two one revision identifiers')
5424
raise errors.BzrCommandError(gettext('bzr merge-directive takes '
5425
'at most two one revision identifiers'))
5004
5426
revision_id = revision[-1].as_revision_id(branch)
5005
5427
if len(revision) == 2:
5006
5428
base_revision_id = revision[0].as_revision_id(branch)
5008
5430
revision_id = branch.last_revision()
5009
5431
revision_id = ensure_null(revision_id)
5010
5432
if revision_id == NULL_REVISION:
5011
raise errors.BzrCommandError('No revisions to bundle.')
5433
raise errors.BzrCommandError(gettext('No revisions to bundle.'))
5012
5434
directive = merge_directive.MergeDirective2.from_objects(
5013
5435
branch.repository, revision_id, time.time(),
5014
5436
osutils.local_time_offset(), submit_branch,
5027
5449
5028
5450
5029
5451
class cmd_send(Command):
5030
"""Mail or create a merge-directive for submitting changes.
5452
__doc__ = """Mail or create a merge-directive for submitting changes.
5031
5453
5032
5454
A merge directive provides many things needed for requesting merges:
5033
5455
5058
5480
source branch defaults to that containing the working directory, but can
5059
5481
be changed using --from.
5060
5482
5483
Both the submit branch and the public branch follow the usual behavior with
5484
respect to --remember: If there is no default location set, the first send
5485
will set it (use --no-remember to avoid setting it). After that, you can
5486
omit the location to use the default. To change the default, use
5487
--remember. The value will only be saved if the location can be accessed.
5488
5061
5489
In order to calculate those changes, bzr must analyse the submit branch.
5062
5490
Therefore it is most efficient for the submit branch to be a local mirror.
5063
5491
If a public location is known for the submit_branch, that location is used
5067
5495
given, in which case it is sent to a file.
5068
5496
5069
5497
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.
5498
on Windows (it uses MAPI). On Unix, it requires the xdg-email utility.
5071
5499
If the preferred client can't be found (or used), your editor will be used.
5072
5500
5073
5501
To use a specific mail program, set the mail_client configuration option.
5115
5543
short_name='f',
5116
5544
type=unicode),
5117
5545
Option('output', short_name='o',
5118
help='Write merge directive to this file; '
5546
help='Write merge directive to this file or directory; '
5119
5547
'use - for stdout.',
5120
5548
type=unicode),
5121
5549
Option('strict',
5132
5560
]
5133
5561
5134
5562
def run(self, submit_branch=None, public_branch=None, no_bundle=False,
5135
no_patch=False, revision=None, remember=False, output=None,
5563
no_patch=False, revision=None, remember=None, output=None,
5136
5564
format=None, mail_to=None, message=None, body=None,
5137
5565
strict=None, **kwargs):
5138
5566
from bzrlib.send import send
5144
5572
5145
5573
5146
5574
class cmd_bundle_revisions(cmd_send):
5147
"""Create a merge-directive for submitting changes.
5575
__doc__ = """Create a merge-directive for submitting changes.
5148
5576
5149
5577
A merge directive provides many things needed for requesting merges:
5150
5578
5217
5645
5218
5646
5219
5647
class cmd_tag(Command):
5220
"""Create, remove or modify a tag naming a revision.
5648
__doc__ = """Create, remove or modify a tag naming a revision.
5221
5649
5222
5650
Tags give human-meaningful names to revisions. Commands that take a -r
5223
5651
(--revision) option can be given -rtag:X, where X is any previously
5231
5659
5232
5660
To rename a tag (change the name but keep it on the same revsion), run ``bzr
5233
5661
tag new-name -r tag:old-name`` and then ``bzr tag --delete oldname``.
5662
5663
If no tag name is specified it will be determined through the
5664
'automatic_tag_name' hook. This can e.g. be used to automatically tag
5665
upstream releases by reading configure.ac. See ``bzr help hooks`` for
5666
details.
5234
5667
"""
5235
5668
5236
5669
_see_also = ['commit', 'tags']
5237
takes_args = ['tag_name']
5670
takes_args = ['tag_name?']
5238
5671
takes_options = [
5239
5672
Option('delete',
5240
5673
help='Delete this tag rather than placing it.',
5241
5674
),
5242
Option('directory',
5243
help='Branch in which to place the tag.',
5244
short_name='d',
5245
type=unicode,
5246
),
5675
custom_help('directory',
5676
help='Branch in which to place the tag.'),
5247
5677
Option('force',
5248
5678
help='Replace existing tags.',
5249
5679
),
5250
5680
'revision',
5251
5681
]
5252
5682
5253
def run(self, tag_name,
5683
def run(self, tag_name=None,
5254
5684
delete=None,
5255
5685
directory='.',
5256
5686
force=None,
5257
5687
revision=None,
5258
5688
):
5259
5689
branch, relpath = Branch.open_containing(directory)
5260
branch.lock_write()
5261
self.add_cleanup(branch.unlock)
5690
self.add_cleanup(branch.lock_write().unlock)
5262
5691
if delete:
5692
if tag_name is None:
5693
raise errors.BzrCommandError(gettext("No tag specified to delete."))
5263
5694
branch.tags.delete_tag(tag_name)
5264
self.outf.write('Deleted tag %s.\n' % tag_name)
5695
note(gettext('Deleted tag %s.') % tag_name)
5265
5696
else:
5266
5697
if revision:
5267
5698
if len(revision) != 1:
5268
raise errors.BzrCommandError(
5699
raise errors.BzrCommandError(gettext(
5269
5700
"Tags can only be placed on a single revision, "
5270
"not on a range")
5701
"not on a range"))
5271
5702
revision_id = revision[0].as_revision_id(branch)
5272
5703
else:
5273
5704
revision_id = branch.last_revision()
5274
if (not force) and branch.tags.has_tag(tag_name):
5705
if tag_name is None:
5706
tag_name = branch.automatic_tag_name(revision_id)
5707
if tag_name is None:
5708
raise errors.BzrCommandError(gettext(
5709
"Please specify a tag name."))
5710
try:
5711
existing_target = branch.tags.lookup_tag(tag_name)
5712
except errors.NoSuchTag:
5713
existing_target = None
5714
if not force and existing_target not in (None, revision_id):
5275
5715
raise errors.TagAlreadyExists(tag_name)
5276
branch.tags.set_tag(tag_name, revision_id)
5277
self.outf.write('Created tag %s.\n' % tag_name)
5716
if existing_target == revision_id:
5717
note(gettext('Tag %s already exists for that revision.') % tag_name)
5718
else:
5719
branch.tags.set_tag(tag_name, revision_id)
5720
if existing_target is None:
5721
note(gettext('Created tag %s.') % tag_name)
5722
else:
5723
note(gettext('Updated tag %s.') % tag_name)
5278
5724
5279
5725
5280
5726
class cmd_tags(Command):
5281
"""List tags.
5727
__doc__ = """List tags.
5282
5728
5283
5729
This command shows a table of tag names and the revisions they reference.
5284
5730
"""
5285
5731
5286
5732
_see_also = ['tag']
5287
5733
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',
5734
custom_help('directory',
5735
help='Branch whose tags should be displayed.'),
5736
RegistryOption('sort',
5294
5737
'Sort tags by different criteria.', title='Sorting',
5295
alpha='Sort tags lexicographically (default).',
5296
time='Sort tags chronologically.',
5738
lazy_registry=('bzrlib.tag', 'tag_sort_methods')
5297
5739
),
5298
5740
'show-ids',
5299
5741
'revision',
5300
5742
]
5301
5743
5302
5744
@display_command
5303
def run(self,
5304
directory='.',
5305
sort='alpha',
5306
show_ids=False,
5307
revision=None,
5308
):
5745
def run(self, directory='.', sort=None, show_ids=False, revision=None):
5746
from bzrlib.tag import tag_sort_methods
5309
5747
branch, relpath = Branch.open_containing(directory)
5310
5748
5311
5749
tags = branch.tags.get_tag_dict().items()
5312
5750
if not tags:
5313
5751
return
5314
5752
5315
branch.lock_read()
5316
self.add_cleanup(branch.unlock)
5753
self.add_cleanup(branch.lock_read().unlock)
5317
5754
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]])
5755
# Restrict to the specified range
5756
tags = self._tags_for_range(branch, revision)
5757
if sort is None:
5758
sort = tag_sort_methods.get()
5759
sort(branch, tags)
5337
5760
if not show_ids:
5338
5761
# [ (tag, revid), ... ] -> [ (tag, dotted_revno), ... ]
5339
5762
for index, (tag, revid) in enumerate(tags):
5341
5764
revno = branch.revision_id_to_dotted_revno(revid)
5342
5765
if isinstance(revno, tuple):
5343
5766
revno = '.'.join(map(str, revno))
5344
except errors.NoSuchRevision:
5767
except (errors.NoSuchRevision,
5768
errors.GhostRevisionsHaveNoRevno):
5345
5769
# Bad tag data/merges can lead to tagged revisions
5346
5770
# which are not in this branch. Fail gracefully ...
5347
5771
revno = '?'
5350
5774
for tag, revspec in tags:
5351
5775
self.outf.write('%-20s %s\n' % (tag, revspec))
5352
5776
5777
def _tags_for_range(self, branch, revision):
5778
range_valid = True
5779
rev1, rev2 = _get_revision_range(revision, branch, self.name())
5780
revid1, revid2 = rev1.rev_id, rev2.rev_id
5781
# _get_revision_range will always set revid2 if it's not specified.
5782
# If revid1 is None, it means we want to start from the branch
5783
# origin which is always a valid ancestor. If revid1 == revid2, the
5784
# ancestry check is useless.
5785
if revid1 and revid1 != revid2:
5786
# FIXME: We really want to use the same graph than
5787
# branch.iter_merge_sorted_revisions below, but this is not
5788
# easily available -- vila 2011-09-23
5789
if branch.repository.get_graph().is_ancestor(revid2, revid1):
5790
# We don't want to output anything in this case...
5791
return []
5792
# only show revisions between revid1 and revid2 (inclusive)
5793
tagged_revids = branch.tags.get_reverse_tag_dict()
5794
found = []
5795
for r in branch.iter_merge_sorted_revisions(
5796
start_revision_id=revid2, stop_revision_id=revid1,
5797
stop_rule='include'):
5798
revid_tags = tagged_revids.get(r[0], None)
5799
if revid_tags:
5800
found.extend([(tag, r[0]) for tag in revid_tags])
5801
return found
5802
5353
5803
5354
5804
class cmd_reconfigure(Command):
5355
"""Reconfigure the type of a bzr directory.
5805
__doc__ = """Reconfigure the type of a bzr directory.
5356
5806
5357
5807
A target configuration must be specified.
5358
5808
5369
5819
takes_args = ['location?']
5370
5820
takes_options = [
5371
5821
RegistryOption.from_kwargs(
5372
'target_type',
5373
title='Target type',
5374
help='The type to reconfigure the directory to.',
5822
'tree_type',
5823
title='Tree type',
5824
help='The relation between branch and tree.',
5375
5825
value_switches=True, enum_switch=False,
5376
5826
branch='Reconfigure to be an unbound branch with no working tree.',
5377
5827
tree='Reconfigure to be an unbound branch with a working tree.',
5378
5828
checkout='Reconfigure to be a bound branch with a working tree.',
5379
5829
lightweight_checkout='Reconfigure to be a lightweight'
5380
5830
' checkout (with no local history).',
5831
),
5832
RegistryOption.from_kwargs(
5833
'repository_type',
5834
title='Repository type',
5835
help='Location fo the repository.',
5836
value_switches=True, enum_switch=False,
5381
5837
standalone='Reconfigure to be a standalone branch '
5382
5838
'(i.e. stop using shared repository).',
5383
5839
use_shared='Reconfigure to use a shared repository.',
5840
),
5841
RegistryOption.from_kwargs(
5842
'repository_trees',
5843
title='Trees in Repository',
5844
help='Whether new branches in the repository have trees.',
5845
value_switches=True, enum_switch=False,
5384
5846
with_trees='Reconfigure repository to create '
5385
5847
'working trees on branches by default.',
5386
5848
with_no_trees='Reconfigure repository to not create '
5400
5862
),
5401
5863
]
5402
5864
5403
def run(self, location=None, target_type=None, bind_to=None, force=False,
5404
stacked_on=None,
5405
unstacked=None):
5865
def run(self, location=None, bind_to=None, force=False,
5866
tree_type=None, repository_type=None, repository_trees=None,
5867
stacked_on=None, unstacked=None):
5406
5868
directory = bzrdir.BzrDir.open(location)
5407
5869
if stacked_on and unstacked:
5408
raise BzrCommandError("Can't use both --stacked-on and --unstacked")
5870
raise errors.BzrCommandError(gettext("Can't use both --stacked-on and --unstacked"))
5409
5871
elif stacked_on is not None:
5410
5872
reconfigure.ReconfigureStackedOn().apply(directory, stacked_on)
5411
5873
elif unstacked:
5413
5875
# At the moment you can use --stacked-on and a different
5414
5876
# reconfiguration shape at the same time; there seems no good reason
5415
5877
# to ban it.
5416
if target_type is None:
5878
if (tree_type is None and
5879
repository_type is None and
5880
repository_trees is None):
5417
5881
if stacked_on or unstacked:
5418
5882
return
5419
5883
else:
5420
raise errors.BzrCommandError('No target configuration '
5421
'specified')
5422
elif target_type == 'branch':
5884
raise errors.BzrCommandError(gettext('No target configuration '
5885
'specified'))
5886
reconfiguration = None
5887
if tree_type == 'branch':
5423
5888
reconfiguration = reconfigure.Reconfigure.to_branch(directory)
5424
elif target_type == 'tree':
5889
elif tree_type == 'tree':
5425
5890
reconfiguration = reconfigure.Reconfigure.to_tree(directory)
5426
elif target_type == 'checkout':
5891
elif tree_type == 'checkout':
5427
5892
reconfiguration = reconfigure.Reconfigure.to_checkout(
5428
5893
directory, bind_to)
5429
elif target_type == 'lightweight-checkout':
5894
elif tree_type == 'lightweight-checkout':
5430
5895
reconfiguration = reconfigure.Reconfigure.to_lightweight_checkout(
5431
5896
directory, bind_to)
5432
elif target_type == 'use-shared':
5897
if reconfiguration:
5898
reconfiguration.apply(force)
5899
reconfiguration = None
5900
if repository_type == 'use-shared':
5433
5901
reconfiguration = reconfigure.Reconfigure.to_use_shared(directory)
5434
elif target_type == 'standalone':
5902
elif repository_type == 'standalone':
5435
5903
reconfiguration = reconfigure.Reconfigure.to_standalone(directory)
5436
elif target_type == 'with-trees':
5904
if reconfiguration:
5905
reconfiguration.apply(force)
5906
reconfiguration = None
5907
if repository_trees == 'with-trees':
5437
5908
reconfiguration = reconfigure.Reconfigure.set_repository_trees(
5438
5909
directory, True)
5439
elif target_type == 'with-no-trees':
5910
elif repository_trees == 'with-no-trees':
5440
5911
reconfiguration = reconfigure.Reconfigure.set_repository_trees(
5441
5912
directory, False)
5442
reconfiguration.apply(force)
5913
if reconfiguration:
5914
reconfiguration.apply(force)
5915
reconfiguration = None
5443
5916
5444
5917
5445
5918
class cmd_switch(Command):
5446
"""Set the branch of a checkout and update.
5919
__doc__ = """Set the branch of a checkout and update.
5447
5920
5448
5921
For lightweight checkouts, this changes the branch being referenced.
5449
5922
For heavyweight checkouts, this checks that there are no local commits
5466
5939
"""
5467
5940
5468
5941
takes_args = ['to_location?']
5469
takes_options = [Option('force',
5942
takes_options = ['directory',
5943
Option('force',
5470
5944
help='Switch even if local commits will be lost.'),
5471
5945
'revision',
5472
5946
Option('create-branch', short_name='b',
5475
5949
]
5476
5950
5477
5951
def run(self, to_location=None, force=False, create_branch=False,
5478
revision=None):
5952
revision=None, directory=u'.'):
5479
5953
from bzrlib import switch
5480
tree_location = '.'
5954
tree_location = directory
5481
5955
revision = _get_one_revision('switch', revision)
5482
5956
control_dir = bzrdir.BzrDir.open_containing(tree_location)[0]
5483
5957
if to_location is None:
5484
5958
if revision is None:
5485
raise errors.BzrCommandError('You must supply either a'
5486
' revision or a location')
5487
to_location = '.'
5959
raise errors.BzrCommandError(gettext('You must supply either a'
5960
' revision or a location'))
5961
to_location = tree_location
5488
5962
try:
5489
5963
branch = control_dir.open_branch()
5490
5964
had_explicit_nick = branch.get_config().has_explicit_nickname()
5493
5967
had_explicit_nick = False
5494
5968
if create_branch:
5495
5969
if branch is None:
5496
raise errors.BzrCommandError('cannot create branch without'
5497
' source branch')
5970
raise errors.BzrCommandError(gettext('cannot create branch without'
5971
' source branch'))
5498
5972
to_location = directory_service.directories.dereference(
5499
5973
to_location)
5500
5974
if '/' not in to_location and '\\' not in to_location:
5517
5991
if had_explicit_nick:
5518
5992
branch = control_dir.open_branch() #get the new branch!
5519
5993
branch.nick = to_branch.nick
5520
note('Switched to branch: %s',
5994
note(gettext('Switched to branch: %s'),
5521
5995
urlutils.unescape_for_display(to_branch.base, 'utf-8'))
5522
5996
5523
5997
def _get_branch_location(self, control_dir):
5539
6013
5540
6014
5541
6015
class cmd_view(Command):
5542
"""Manage filtered views.
6016
__doc__ = """Manage filtered views.
5543
6017
5544
6018
Views provide a mask over the tree so that users can focus on
5545
6019
a subset of a tree when doing their work. After creating a view,
5625
6099
name=None,
5626
6100
switch=None,
5627
6101
):
5628
tree, file_list = tree_files(file_list, apply_view=False)
6102
tree, file_list = WorkingTree.open_containing_paths(file_list,
6103
apply_view=False)
5629
6104
current_view, view_dict = tree.views.get_view_info()
5630
6105
if name is None:
5631
6106
name = current_view
5632
6107
if delete:
5633
6108
if file_list:
5634
raise errors.BzrCommandError(
5635
"Both --delete and a file list specified")
6109
raise errors.BzrCommandError(gettext(
6110
"Both --delete and a file list specified"))
5636
6111
elif switch:
5637
raise errors.BzrCommandError(
5638
"Both --delete and --switch specified")
6112
raise errors.BzrCommandError(gettext(
6113
"Both --delete and --switch specified"))
5639
6114
elif all:
5640
6115
tree.views.set_view_info(None, {})
5641
self.outf.write("Deleted all views.\n")
6116
self.outf.write(gettext("Deleted all views.\n"))
5642
6117
elif name is None:
5643
raise errors.BzrCommandError("No current view to delete")
6118
raise errors.BzrCommandError(gettext("No current view to delete"))
5644
6119
else:
5645
6120
tree.views.delete_view(name)
5646
self.outf.write("Deleted '%s' view.\n" % name)
6121
self.outf.write(gettext("Deleted '%s' view.\n") % name)
5647
6122
elif switch:
5648
6123
if file_list:
5649
raise errors.BzrCommandError(
5650
"Both --switch and a file list specified")
6124
raise errors.BzrCommandError(gettext(
6125
"Both --switch and a file list specified"))
5651
6126
elif all:
5652
raise errors.BzrCommandError(
5653
"Both --switch and --all specified")
6127
raise errors.BzrCommandError(gettext(
6128
"Both --switch and --all specified"))
5654
6129
elif switch == 'off':
5655
6130
if current_view is None:
5656
raise errors.BzrCommandError("No current view to disable")
6131
raise errors.BzrCommandError(gettext("No current view to disable"))
5657
6132
tree.views.set_view_info(None, view_dict)
5658
self.outf.write("Disabled '%s' view.\n" % (current_view))
6133
self.outf.write(gettext("Disabled '%s' view.\n") % (current_view))
5659
6134
else:
5660
6135
tree.views.set_view_info(switch, view_dict)
5661
6136
view_str = views.view_display_str(tree.views.lookup_view())
5662
self.outf.write("Using '%s' view: %s\n" % (switch, view_str))
6137
self.outf.write(gettext("Using '{0}' view: {1}\n").format(switch, view_str))
5663
6138
elif all:
5664
6139
if view_dict:
5665
self.outf.write('Views defined:\n')
6140
self.outf.write(gettext('Views defined:\n'))
5666
6141
for view in sorted(view_dict):
5667
6142
if view == current_view:
5668
6143
active = "=>"
5671
6146
view_str = views.view_display_str(view_dict[view])
5672
6147
self.outf.write('%s %-20s %s\n' % (active, view, view_str))
5673
6148
else:
5674
self.outf.write('No views defined.\n')
6149
self.outf.write(gettext('No views defined.\n'))
5675
6150
elif file_list:
5676
6151
if name is None:
5677
6152
# No name given and no current view set
5678
6153
name = 'my'
5679
6154
elif name == 'off':
5680
raise errors.BzrCommandError(
5681
"Cannot change the 'off' pseudo view")
6155
raise errors.BzrCommandError(gettext(
6156
"Cannot change the 'off' pseudo view"))
5682
6157
tree.views.set_view(name, sorted(file_list))
5683
6158
view_str = views.view_display_str(tree.views.lookup_view())
5684
self.outf.write("Using '%s' view: %s\n" % (name, view_str))
6159
self.outf.write(gettext("Using '{0}' view: {1}\n").format(name, view_str))
5685
6160
else:
5686
6161
# list the files
5687
6162
if name is None:
5688
6163
# No name given and no current view set
5689
self.outf.write('No current view.\n')
6164
self.outf.write(gettext('No current view.\n'))
5690
6165
else:
5691
6166
view_str = views.view_display_str(tree.views.lookup_view(name))
5692
self.outf.write("'%s' view is: %s\n" % (name, view_str))
6167
self.outf.write(gettext("'{0}' view is: {1}\n").format(name, view_str))
5693
6168
5694
6169
5695
6170
class cmd_hooks(Command):
5696
"""Show hooks."""
6171
__doc__ = """Show hooks."""
5697
6172
5698
6173
hidden = True
5699
6174
5709
6184
self.outf.write(" %s\n" %
5710
6185
(some_hooks.get_hook_name(hook),))
5711
6186
else:
5712
self.outf.write(" <no hooks installed>\n")
6187
self.outf.write(gettext(" <no hooks installed>\n"))
6188
6189
6190
class cmd_remove_branch(Command):
6191
__doc__ = """Remove a branch.
6192
6193
This will remove the branch from the specified location but
6194
will keep any working tree or repository in place.
6195
6196
:Examples:
6197
6198
Remove the branch at repo/trunk::
6199
6200
bzr remove-branch repo/trunk
6201
6202
"""
6203
6204
takes_args = ["location?"]
6205
6206
aliases = ["rmbranch"]
6207
6208
def run(self, location=None):
6209
if location is None:
6210
location = "."
6211
branch = Branch.open_containing(location)[0]
6212
branch.bzrdir.destroy_branch()
5713
6213
5714
6214
5715
6215
class cmd_shelve(Command):
5716
"""Temporarily set aside some changes from the current tree.
6216
__doc__ = """Temporarily set aside some changes from the current tree.
5717
6217
5718
6218
Shelve allows you to temporarily put changes you've made "on the shelf",
5719
6219
ie. out of the way, until a later time when you can bring them back from
5735
6235
5736
6236
You can put multiple items on the shelf, and by default, 'unshelve' will
5737
6237
restore the most recently shelved changes.
6238
6239
For complicated changes, it is possible to edit the changes in a separate
6240
editor program to decide what the file remaining in the working copy
6241
should look like. To do this, add the configuration option
6242
6243
change_editor = PROGRAM @new_path @old_path
6244
6245
where @new_path is replaced with the path of the new version of the
6246
file and @old_path is replaced with the path of the old version of
6247
the file. The PROGRAM should save the new file with the desired
6248
contents of the file in the working tree.
6249
5738
6250
"""
5739
6251
5740
6252
takes_args = ['file*']
5741
6253
5742
6254
takes_options = [
6255
'directory',
5743
6256
'revision',
5744
6257
Option('all', help='Shelve all changes.'),
5745
6258
'message',
5751
6264
Option('destroy',
5752
6265
help='Destroy removed changes instead of shelving them.'),
5753
6266
]
5754
_see_also = ['unshelve']
6267
_see_also = ['unshelve', 'configuration']
5755
6268
5756
6269
def run(self, revision=None, all=False, file_list=None, message=None,
5757
writer=None, list=False, destroy=False):
6270
writer=None, list=False, destroy=False, directory=None):
5758
6271
if list:
5759
return self.run_for_list()
6272
return self.run_for_list(directory=directory)
5760
6273
from bzrlib.shelf_ui import Shelver
5761
6274
if writer is None:
5762
6275
writer = bzrlib.option.diff_writer_registry.get()
5763
6276
try:
5764
6277
shelver = Shelver.from_args(writer(sys.stdout), revision, all,
5765
file_list, message, destroy=destroy)
6278
file_list, message, destroy=destroy, directory=directory)
5766
6279
try:
5767
6280
shelver.run()
5768
6281
finally:
5770
6283
except errors.UserAbort:
5771
6284
return 0
5772
6285
5773
def run_for_list(self):
5774
tree = WorkingTree.open_containing('.')[0]
5775
tree.lock_read()
5776
self.add_cleanup(tree.unlock)
6286
def run_for_list(self, directory=None):
6287
if directory is None:
6288
directory = u'.'
6289
tree = WorkingTree.open_containing(directory)[0]
6290
self.add_cleanup(tree.lock_read().unlock)
5777
6291
manager = tree.get_shelf_manager()
5778
6292
shelves = manager.active_shelves()
5779
6293
if len(shelves) == 0:
5780
note('No shelved changes.')
6294
note(gettext('No shelved changes.'))
5781
6295
return 0
5782
6296
for shelf_id in reversed(shelves):
5783
6297
message = manager.get_metadata(shelf_id).get('message')
5788
6302
5789
6303
5790
6304
class cmd_unshelve(Command):
5791
"""Restore shelved changes.
6305
__doc__ = """Restore shelved changes.
5792
6306
5793
6307
By default, the most recently shelved changes are restored. However if you
5794
6308
specify a shelf by id those changes will be restored instead. This works
5797
6311
5798
6312
takes_args = ['shelf_id?']
5799
6313
takes_options = [
6314
'directory',
5800
6315
RegistryOption.from_kwargs(
5801
6316
'action', help="The action to perform.",
5802
6317
enum_switch=False, value_switches=True,
5810
6325
]
5811
6326
_see_also = ['shelve']
5812
6327
5813
def run(self, shelf_id=None, action='apply'):
6328
def run(self, shelf_id=None, action='apply', directory=u'.'):
5814
6329
from bzrlib.shelf_ui import Unshelver
5815
unshelver = Unshelver.from_args(shelf_id, action)
6330
unshelver = Unshelver.from_args(shelf_id, action, directory=directory)
5816
6331
try:
5817
6332
unshelver.run()
5818
6333
finally:
5820
6335
5821
6336
5822
6337
class cmd_clean_tree(Command):
5823
"""Remove unwanted files from working tree.
6338
__doc__ = """Remove unwanted files from working tree.
5824
6339
5825
6340
By default, only unknown files, not ignored files, are deleted. Versioned
5826
6341
files are never deleted.
5834
6349
5835
6350
To check what clean-tree will do, use --dry-run.
5836
6351
"""
5837
takes_options = [Option('ignored', help='Delete all ignored files.'),
5838
Option('detritus', help='Delete conflict files, merge'
6352
takes_options = ['directory',
6353
Option('ignored', help='Delete all ignored files.'),
6354
Option('detritus', help='Delete conflict files, merge and revert'
5839
6355
' backups, and failed selftest dirs.'),
5840
6356
Option('unknown',
5841
6357
help='Delete files unknown to bzr (default).'),
5843
6359
' deleting them.'),
5844
6360
Option('force', help='Do not prompt before deleting.')]
5845
6361
def run(self, unknown=False, ignored=False, detritus=False, dry_run=False,
5846
force=False):
6362
force=False, directory=u'.'):
5847
6363
from bzrlib.clean_tree import clean_tree
5848
6364
if not (unknown or ignored or detritus):
5849
6365
unknown = True
5850
6366
if dry_run:
5851
6367
force = True
5852
clean_tree('.', unknown=unknown, ignored=ignored, detritus=detritus,
5853
dry_run=dry_run, no_prompt=force)
6368
clean_tree(directory, unknown=unknown, ignored=ignored,
6369
detritus=detritus, dry_run=dry_run, no_prompt=force)
5854
6370
5855
6371
5856
6372
class cmd_reference(Command):
5857
"""list, view and set branch locations for nested trees.
6373
__doc__ = """list, view and set branch locations for nested trees.
5858
6374
5859
6375
If no arguments are provided, lists the branch locations for nested trees.
5860
6376
If one argument is provided, display the branch location for that tree.
5900
6416
self.outf.write('%s %s\n' % (path, location))
5901
6417
5902
6418
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
6419
class cmd_export_pot(Command):
6420
__doc__ = """Export command helps and error messages in po format."""
6421
6422
hidden = True
6423
6424
def run(self):
6425
from bzrlib.export_pot import export_pot
6426
export_pot(self.outf)
6427
6428
6429
def _register_lazy_builtins():
6430
# register lazy builtins from other modules; called at startup and should
6431
# be only called once.
6432
for (name, aliases, module_name) in [
6433
('cmd_bundle_info', [], 'bzrlib.bundle.commands'),
6434
('cmd_config', [], 'bzrlib.config'),
6435
('cmd_dpush', [], 'bzrlib.foreign'),
6436
('cmd_version_info', [], 'bzrlib.cmd_version_info'),
6437
('cmd_resolve', ['resolved'], 'bzrlib.conflicts'),
6438
('cmd_conflicts', [], 'bzrlib.conflicts'),
6439
('cmd_sign_my_commits', [], 'bzrlib.commit_signature_commands'),
6440
('cmd_verify_signatures', [],
6441
'bzrlib.commit_signature_commands'),
6442
('cmd_test_script', [], 'bzrlib.cmd_test_script'),
6443
]:
6444
builtin_command_registry.register_lazy(name, aliases, module_name)
Loggerhead is a web-based interface for Breezy
Version: 2.0.1