« back to all changes in this revision
Viewing changes to bzrlib/builtins.py
- browse files at revision 6603.2.2
- compare with another revision
- download diff
- download tarball
- view history from revision 6603.2.2
- Committer: Colin Watson
- Date: 2015-07-02 11:30:47 UTC
- mto: This revision was merged to the branch mainline in revision 6605.
- Revision ID: cjwatson@canonical.com-20150702113047-359s4zsi07wvfwso
Use assertLength.
- files added:
- .testr.conf
- bzrlib/branchfmt
- bzrlib/plugins/bash_completion
- bzrlib/plugins/bash_completion/tests
- bzrlib/plugins/changelog_merge
- bzrlib/plugins/changelog_merge/tests
- bzrlib/plugins/grep
- bzrlib/plugins/po_merge
- bzrlib/plugins/po_merge/tests
- bzrlib/plugins/weave_fmt
- bzrlib/plugins/weave_fmt/tests
- 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
- bzrlib/util/effbot
- bzrlib/util/effbot/org
- bzrlib/util/elementtree
- 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-2012 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
16
16
17
17
"""builtin bzr commands"""
18
18
19
from __future__ import absolute_import
20
19
21
import os
20
22
21
from bzrlib.lazy_import import lazy_import
22
lazy_import(globals(), """
23
import codecs
23
import bzrlib.bzrdir
24
25
from bzrlib import lazy_import
26
lazy_import.lazy_import(globals(), """
24
27
import cStringIO
28
import errno
25
29
import sys
26
30
import time
27
31
30
34
bugtracker,
31
35
bundle,
32
36
btree_index,
33
bzrdir,
37
controldir,
34
38
directory_service,
35
39
delta,
36
config,
40
config as _mod_config,
37
41
errors,
38
42
globbing,
39
43
hooks,
45
49
rename_map,
46
50
revision as _mod_revision,
47
51
static_tuple,
48
symbol_versioning,
49
52
timestamp,
50
53
transport,
51
54
ui,
52
55
urlutils,
53
56
views,
57
gpg,
54
58
)
55
59
from bzrlib.branch import Branch
56
60
from bzrlib.conflicts import ConflictList
58
62
from bzrlib.revisionspec import RevisionSpec, RevisionInfo
59
63
from bzrlib.smtp_connection import SMTPConnection
60
64
from bzrlib.workingtree import WorkingTree
65
from bzrlib.i18n import gettext, ngettext
61
66
""")
62
67
63
from bzrlib.commands import Command, display_command
68
from bzrlib.commands import (
69
Command,
70
builtin_command_registry,
71
display_command,
72
)
64
73
from bzrlib.option import (
65
74
ListOption,
66
75
Option,
69
78
_parse_revision_str,
70
79
)
71
80
from bzrlib.trace import mutter, note, warning, is_quiet, get_verbosity_level
72
73
74
def tree_files(file_list, default_branch=u'.', canonicalize=True,
75
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]))
81
from bzrlib import (
82
symbol_versioning,
83
)
84
85
86
def _get_branch_location(control_dir, possible_transports=None):
87
"""Return location of branch for this control dir."""
88
try:
89
target = control_dir.get_branch_reference()
90
except errors.NotBranchError:
91
return control_dir.root_transport.base
92
if target is not None:
93
return target
94
this_branch = control_dir.open_branch(
95
possible_transports=possible_transports)
96
# This may be a heavy checkout, where we want the master branch
97
master_location = this_branch.get_bound_location()
98
if master_location is not None:
99
return master_location
100
# If not, use a local sibling
101
return this_branch.base
102
103
104
def _is_colocated(control_dir, possible_transports=None):
105
"""Check if the branch in control_dir is colocated.
106
107
:param control_dir: Control directory
108
:return: Tuple with boolean indicating whether the branch is colocated
109
and the full URL to the actual branch
110
"""
111
# This path is meant to be relative to the existing branch
112
this_url = _get_branch_location(control_dir,
113
possible_transports=possible_transports)
114
# Perhaps the target control dir supports colocated branches?
115
try:
116
root = controldir.ControlDir.open(this_url,
117
possible_transports=possible_transports)
118
except errors.NotBranchError:
119
return (False, this_url)
120
else:
121
try:
122
wt = control_dir.open_workingtree()
123
except (errors.NoWorkingTree, errors.NotLocalUrl):
124
return (False, this_url)
125
else:
126
return (
127
root._format.colocated_branches and
128
control_dir.control_url == root.control_url,
129
this_url)
130
131
132
def lookup_new_sibling_branch(control_dir, location, possible_transports=None):
133
"""Lookup the location for a new sibling branch.
134
135
:param control_dir: Control directory to find sibling branches from
136
:param location: Name of the new branch
137
:return: Full location to the new branch
138
"""
139
location = directory_service.directories.dereference(location)
140
if '/' not in location and '\\' not in location:
141
(colocated, this_url) = _is_colocated(control_dir, possible_transports)
142
143
if colocated:
144
return urlutils.join_segment_parameters(this_url,
145
{"branch": urlutils.escape(location)})
146
else:
147
return urlutils.join(this_url, '..', urlutils.escape(location))
148
return location
149
150
151
def open_sibling_branch(control_dir, location, possible_transports=None):
152
"""Open a branch, possibly a sibling of another.
153
154
:param control_dir: Control directory relative to which to lookup the
155
location.
156
:param location: Location to look up
157
:return: branch to open
158
"""
159
try:
160
# Perhaps it's a colocated branch?
161
return control_dir.open_branch(location,
162
possible_transports=possible_transports)
163
except (errors.NotBranchError, errors.NoColocatedBranchSupport):
164
this_url = _get_branch_location(control_dir)
165
return Branch.open(
166
urlutils.join(
167
this_url, '..', urlutils.escape(location)))
168
169
170
def open_nearby_branch(near=None, location=None, possible_transports=None):
171
"""Open a nearby branch.
172
173
:param near: Optional location of container from which to open branch
174
:param location: Location of the branch
175
:return: Branch instance
176
"""
177
if near is None:
178
if location is None:
179
location = "."
180
try:
181
return Branch.open(location,
182
possible_transports=possible_transports)
183
except errors.NotBranchError:
184
near = "."
185
cdir = controldir.ControlDir.open(near,
186
possible_transports=possible_transports)
187
return open_sibling_branch(cdir, location,
188
possible_transports=possible_transports)
189
190
191
def iter_sibling_branches(control_dir, possible_transports=None):
192
"""Iterate over the siblings of a branch.
193
194
:param control_dir: Control directory for which to look up the siblings
195
:return: Iterator over tuples with branch name and branch object
196
"""
197
seen_urls = set()
198
try:
199
reference = control_dir.get_branch_reference()
200
except errors.NotBranchError:
201
# There is no active branch, just return the colocated branches.
202
for name, branch in control_dir.get_branches().iteritems():
203
yield name, branch
204
return
205
if reference is not None:
206
ref_branch = Branch.open(reference,
207
possible_transports=possible_transports)
208
else:
209
ref_branch = None
210
if ref_branch is None or ref_branch.name:
211
if ref_branch is not None:
212
control_dir = ref_branch.bzrdir
213
for name, branch in control_dir.get_branches().iteritems():
214
yield name, branch
215
else:
216
repo = ref_branch.bzrdir.find_repository()
217
for branch in repo.find_branches(using=True):
218
name = urlutils.relative_url(repo.user_url,
219
branch.user_url).rstrip("/")
220
yield name, branch
82
221
83
222
84
223
def tree_files_for_add(file_list):
109
248
if view_files:
110
249
file_list = view_files
111
250
view_str = views.view_display_str(view_files)
112
note("Ignoring files outside view. View is %s" % view_str)
251
note(gettext("Ignoring files outside view. View is %s") % view_str)
113
252
return tree, file_list
114
253
115
254
117
256
if revisions is None:
118
257
return None
119
258
if len(revisions) != 1:
120
raise errors.BzrCommandError(
121
'bzr %s --revision takes exactly one revision identifier' % (
259
raise errors.BzrCommandError(gettext(
260
'bzr %s --revision takes exactly one revision identifier') % (
122
261
command_name,))
123
262
return revisions[0]
124
263
146
285
return rev_tree
147
286
148
287
149
# XXX: Bad function name; should possibly also be a class method of
150
# WorkingTree rather than a function.
151
def internal_tree_files(file_list, default_branch=u'.', canonicalize=True,
152
apply_view=True):
153
"""Convert command-line paths to a WorkingTree and relative paths.
154
155
This is typically used for command-line processors that take one or
156
more filenames, and infer the workingtree that contains them.
157
158
The filenames given are not required to exist.
159
160
:param file_list: Filenames to convert.
161
162
:param default_branch: Fallback tree path to use if file_list is empty or
163
None.
164
165
:param apply_view: if True and a view is set, apply it or check that
166
specified files are within it
167
168
:return: workingtree, [relative_paths]
169
"""
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
217
218
219
288
def _get_view_info_for_change_reporter(tree):
220
289
"""Get the view information from a tree for change reporting."""
221
290
view_info = None
228
297
return view_info
229
298
230
299
300
def _open_directory_or_containing_tree_or_branch(filename, directory):
301
"""Open the tree or branch containing the specified file, unless
302
the --directory option is used to specify a different branch."""
303
if directory is not None:
304
return (None, Branch.open(directory), filename)
305
return controldir.ControlDir.open_containing_tree_or_branch(filename)
306
307
231
308
# TODO: Make sure no commands unconditionally use the working directory as a
232
309
# branch. If a filename argument is used, the first of them should be used to
233
310
# specify the branch. (Perhaps this can be factored out into some kind of
235
312
# opens the branch?)
236
313
237
314
class cmd_status(Command):
238
"""Display status summary.
315
__doc__ = """Display status summary.
239
316
240
317
This reports on versioned and unknown files, reporting them
241
318
grouped by state. Possible states are:
261
338
unknown
262
339
Not versioned and not matching an ignore pattern.
263
340
264
Additionally for directories, symlinks and files with an executable
265
bit, Bazaar indicates their type using a trailing character: '/', '@'
266
or '*' respectively.
341
Additionally for directories, symlinks and files with a changed
342
executable bit, Bazaar indicates their type using a trailing
343
character: '/', '@' or '*' respectively. These decorations can be
344
disabled using the '--no-classify' option.
267
345
268
346
To see ignored files use 'bzr ignored'. For details on the
269
347
changes to file texts, use 'bzr diff'.
282
360
To skip the display of pending merge information altogether, use
283
361
the no-pending option or specify a file/directory.
284
362
285
If a revision argument is given, the status is calculated against
286
that revision, or between two revisions if two are provided.
363
To compare the working directory to a specific revision, pass a
364
single revision to the revision argument.
365
366
To see which files have changed in a specific revision, or between
367
two revisions, pass a revision range to the revision argument.
368
This will produce the same results as calling 'bzr diff --summarize'.
287
369
"""
288
370
289
# TODO: --no-recurse, --recurse options
371
# TODO: --no-recurse/-N, --recurse options
290
372
291
373
takes_args = ['file*']
292
374
takes_options = ['show-ids', 'revision', 'change', 'verbose',
296
378
short_name='V'),
297
379
Option('no-pending', help='Don\'t show pending merges.',
298
380
),
381
Option('no-classify',
382
help='Do not mark object type using indicator.',
383
),
299
384
]
300
385
aliases = ['st', 'stat']
301
386
304
389
305
390
@display_command
306
391
def run(self, show_ids=False, file_list=None, revision=None, short=False,
307
versioned=False, no_pending=False, verbose=False):
392
versioned=False, no_pending=False, verbose=False,
393
no_classify=False):
308
394
from bzrlib.status import show_tree_status
309
395
310
396
if revision and len(revision) > 2:
311
raise errors.BzrCommandError('bzr status --revision takes exactly'
312
' one or two revision specifiers')
397
raise errors.BzrCommandError(gettext('bzr status --revision takes exactly'
398
' one or two revision specifiers'))
313
399
314
tree, relfile_list = tree_files(file_list)
400
tree, relfile_list = WorkingTree.open_containing_paths(file_list)
315
401
# Avoid asking for specific files when that is not needed.
316
402
if relfile_list == ['']:
317
403
relfile_list = None
324
410
show_tree_status(tree, show_ids=show_ids,
325
411
specific_files=relfile_list, revision=revision,
326
412
to_file=self.outf, short=short, versioned=versioned,
327
show_pending=(not no_pending), verbose=verbose)
413
show_pending=(not no_pending), verbose=verbose,
414
classify=not no_classify)
328
415
329
416
330
417
class cmd_cat_revision(Command):
331
"""Write out metadata for a revision.
418
__doc__ = """Write out metadata for a revision.
332
419
333
420
The revision to print can either be specified by a specific
334
421
revision identifier, or you can use --revision.
336
423
337
424
hidden = True
338
425
takes_args = ['revision_id?']
339
takes_options = ['revision']
426
takes_options = ['directory', 'revision']
340
427
# cat-revision is more for frontends so should be exact
341
428
encoding = 'strict'
342
429
430
def print_revision(self, revisions, revid):
431
stream = revisions.get_record_stream([(revid,)], 'unordered', True)
432
record = stream.next()
433
if record.storage_kind == 'absent':
434
raise errors.NoSuchRevision(revisions, revid)
435
revtext = record.get_bytes_as('fulltext')
436
self.outf.write(revtext.decode('utf-8'))
437
343
438
@display_command
344
def run(self, revision_id=None, revision=None):
439
def run(self, revision_id=None, revision=None, directory=u'.'):
345
440
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')
441
raise errors.BzrCommandError(gettext('You can only supply one of'
442
' revision_id or --revision'))
348
443
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
444
raise errors.BzrCommandError(gettext('You must supply either'
445
' --revision or a revision_id'))
446
447
b = controldir.ControlDir.open_containing_tree_or_branch(directory)[1]
448
449
revisions = b.repository.revisions
450
if revisions is None:
451
raise errors.BzrCommandError(gettext('Repository %r does not support '
452
'access to raw revision texts'))
453
454
b.repository.lock_read()
455
try:
456
# TODO: jam 20060112 should cat-revision always output utf-8?
457
if revision_id is not None:
458
revision_id = osutils.safe_revision_id(revision_id, warn=False)
459
try:
460
self.print_revision(revisions, revision_id)
461
except errors.NoSuchRevision:
462
msg = gettext("The repository {0} contains no revision {1}.").format(
463
b.repository.base, revision_id)
464
raise errors.BzrCommandError(msg)
465
elif revision is not None:
466
for rev in revision:
467
if rev is None:
468
raise errors.BzrCommandError(
469
gettext('You cannot specify a NULL revision.'))
470
rev_id = rev.as_revision_id(b)
471
self.print_revision(revisions, rev_id)
472
finally:
473
b.repository.unlock()
474
370
475
371
476
class cmd_dump_btree(Command):
372
"""Dump the contents of a btree index file to stdout.
477
__doc__ = """Dump the contents of a btree index file to stdout.
373
478
374
479
PATH is a btree index file, it can be any URL. This includes things like
375
480
.bzr/repository/pack-names, or .bzr/repository/indices/a34b3a...ca4a4.iix
423
528
self.outf.write(page_bytes[:header_end])
424
529
page_bytes = data
425
530
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')
531
if len(page_bytes) == 0:
532
self.outf.write('(empty)\n');
533
else:
534
decomp_bytes = zlib.decompress(page_bytes)
535
self.outf.write(decomp_bytes)
536
self.outf.write('\n')
429
537
430
538
def _dump_entries(self, trans, basename):
431
539
try:
439
547
for node in bt.iter_all_entries():
440
548
# Node is made up of:
441
549
# (index, key, value, [references])
442
refs_as_tuples = static_tuple.as_tuples(node[3])
550
try:
551
refs = node[3]
552
except IndexError:
553
refs_as_tuples = None
554
else:
555
refs_as_tuples = static_tuple.as_tuples(refs)
443
556
as_tuple = (tuple(node[1]), node[2], refs_as_tuples)
444
557
self.outf.write('%s\n' % (as_tuple,))
445
558
446
559
447
560
class cmd_remove_tree(Command):
448
"""Remove the working tree from a given branch/checkout.
561
__doc__ = """Remove the working tree from a given branch/checkout.
449
562
450
563
Since a lightweight checkout is little more than a working tree
451
564
this will refuse to run against one.
457
570
takes_options = [
458
571
Option('force',
459
572
help='Remove the working tree even if it has '
460
'uncommitted changes.'),
573
'uncommitted or shelved changes.'),
461
574
]
462
575
463
576
def run(self, location_list, force=False):
465
578
location_list=['.']
466
579
467
580
for location in location_list:
468
d = bzrdir.BzrDir.open(location)
469
581
d = controldir.ControlDir.open(location)
582
470
583
try:
471
584
working = d.open_workingtree()
472
585
except errors.NoWorkingTree:
473
raise errors.BzrCommandError("No working tree to remove")
586
raise errors.BzrCommandError(gettext("No working tree to remove"))
474
587
except errors.NotLocalUrl:
475
raise errors.BzrCommandError("You cannot remove the working tree"
476
" of a remote path")
588
raise errors.BzrCommandError(gettext("You cannot remove the working tree"
589
" of a remote path"))
477
590
if not force:
478
591
if (working.has_changes()):
479
592
raise errors.UncommittedChanges(working)
593
if working.get_shelf_manager().last_shelf() is not None:
594
raise errors.ShelvedChanges(working)
480
595
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")
596
if working.user_url != working.branch.user_url:
597
raise errors.BzrCommandError(gettext("You cannot remove the working tree"
598
" from a lightweight checkout"))
486
599
487
600
d.destroy_workingtree()
488
601
489
602
603
class cmd_repair_workingtree(Command):
604
__doc__ = """Reset the working tree state file.
605
606
This is not meant to be used normally, but more as a way to recover from
607
filesystem corruption, etc. This rebuilds the working inventory back to a
608
'known good' state. Any new modifications (adding a file, renaming, etc)
609
will be lost, though modified files will still be detected as such.
610
611
Most users will want something more like "bzr revert" or "bzr update"
612
unless the state file has become corrupted.
613
614
By default this attempts to recover the current state by looking at the
615
headers of the state file. If the state file is too corrupted to even do
616
that, you can supply --revision to force the state of the tree.
617
"""
618
619
takes_options = ['revision', 'directory',
620
Option('force',
621
help='Reset the tree even if it doesn\'t appear to be'
622
' corrupted.'),
623
]
624
hidden = True
625
626
def run(self, revision=None, directory='.', force=False):
627
tree, _ = WorkingTree.open_containing(directory)
628
self.add_cleanup(tree.lock_tree_write().unlock)
629
if not force:
630
try:
631
tree.check_state()
632
except errors.BzrError:
633
pass # There seems to be a real error here, so we'll reset
634
else:
635
# Refuse
636
raise errors.BzrCommandError(gettext(
637
'The tree does not appear to be corrupt. You probably'
638
' want "bzr revert" instead. Use "--force" if you are'
639
' sure you want to reset the working tree.'))
640
if revision is None:
641
revision_ids = None
642
else:
643
revision_ids = [r.as_revision_id(tree.branch) for r in revision]
644
try:
645
tree.reset_state(revision_ids)
646
except errors.BzrError, e:
647
if revision_ids is None:
648
extra = (gettext(', the header appears corrupt, try passing -r -1'
649
' to set the state to the last commit'))
650
else:
651
extra = ''
652
raise errors.BzrCommandError(gettext('failed to reset the tree state{0}').format(extra))
653
654
490
655
class cmd_revno(Command):
491
"""Show current revision number.
656
__doc__ = """Show current revision number.
492
657
493
658
This is equal to the number of revisions on this branch.
494
659
"""
496
661
_see_also = ['info']
497
662
takes_args = ['location?']
498
663
takes_options = [
499
Option('tree', help='Show revno of working tree'),
664
Option('tree', help='Show revno of working tree.'),
665
'revision',
500
666
]
501
667
502
668
@display_command
503
def run(self, tree=False, location=u'.'):
669
def run(self, tree=False, location=u'.', revision=None):
670
if revision is not None and tree:
671
raise errors.BzrCommandError(gettext("--tree and --revision can "
672
"not be used together"))
673
504
674
if tree:
505
675
try:
506
676
wt = WorkingTree.open_containing(location)[0]
507
wt.lock_read()
677
self.add_cleanup(wt.lock_read().unlock)
508
678
except (errors.NoWorkingTree, errors.NotLocalUrl):
509
679
raise errors.NoWorkingTree(location)
510
self.add_cleanup(wt.unlock)
680
b = wt.branch
511
681
revid = wt.last_revision()
512
try:
513
revno_t = wt.branch.revision_id_to_dotted_revno(revid)
514
except errors.NoSuchRevision:
515
revno_t = ('???',)
516
revno = ".".join(str(n) for n in revno_t)
517
682
else:
518
683
b = Branch.open_containing(location)[0]
519
b.lock_read()
520
self.add_cleanup(b.unlock)
521
revno = b.revno()
684
self.add_cleanup(b.lock_read().unlock)
685
if revision:
686
if len(revision) != 1:
687
raise errors.BzrCommandError(gettext(
688
"Revision numbers only make sense for single "
689
"revisions, not ranges"))
690
revid = revision[0].as_revision_id(b)
691
else:
692
revid = b.last_revision()
693
try:
694
revno_t = b.revision_id_to_dotted_revno(revid)
695
except errors.NoSuchRevision:
696
revno_t = ('???',)
697
revno = ".".join(str(n) for n in revno_t)
522
698
self.cleanup_now()
523
self.outf.write(str(revno) + '\n')
699
self.outf.write(revno + '\n')
524
700
525
701
526
702
class cmd_revision_info(Command):
527
"""Show revision number and revision id for a given revision identifier.
703
__doc__ = """Show revision number and revision id for a given revision identifier.
528
704
"""
529
705
hidden = True
530
706
takes_args = ['revision_info*']
531
707
takes_options = [
532
708
'revision',
533
Option('directory',
709
custom_help('directory',
534
710
help='Branch to examine, '
535
'rather than the one containing the working directory.',
536
short_name='d',
537
type=unicode,
538
),
539
Option('tree', help='Show revno of working tree'),
711
'rather than the one containing the working directory.'),
712
Option('tree', help='Show revno of working tree.'),
540
713
]
541
714
542
715
@display_command
546
719
try:
547
720
wt = WorkingTree.open_containing(directory)[0]
548
721
b = wt.branch
549
wt.lock_read()
550
self.add_cleanup(wt.unlock)
722
self.add_cleanup(wt.lock_read().unlock)
551
723
except (errors.NoWorkingTree, errors.NotLocalUrl):
552
724
wt = None
553
725
b = Branch.open_containing(directory)[0]
554
b.lock_read()
555
self.add_cleanup(b.unlock)
726
self.add_cleanup(b.lock_read().unlock)
556
727
revision_ids = []
557
728
if revision is not None:
558
729
revision_ids.extend(rev.as_revision_id(b) for rev in revision)
586
757
587
758
588
759
class cmd_add(Command):
589
"""Add specified files or directories.
760
__doc__ = """Add specified files or directories.
590
761
591
762
In non-recursive mode, all the named items are added, regardless
592
763
of whether they were previously ignored. A warning is given if
600
771
are added. This search proceeds recursively into versioned
601
772
directories. If no names are given '.' is assumed.
602
773
774
A warning will be printed when nested trees are encountered,
775
unless they are explicitly ignored.
776
603
777
Therefore simply saying 'bzr add' will version all files that
604
778
are currently unknown.
605
779
621
795
622
796
Any files matching patterns in the ignore list will not be added
623
797
unless they are explicitly mentioned.
798
799
In recursive mode, files larger than the configuration option
800
add.maximum_file_size will be skipped. Named items are never skipped due
801
to file size.
624
802
"""
625
803
takes_args = ['file*']
626
804
takes_options = [
627
805
Option('no-recurse',
628
help="Don't recursively add the contents of directories."),
806
help="Don't recursively add the contents of directories.",
807
short_name='N'),
629
808
Option('dry-run',
630
809
help="Show what would be done, but don't actually do anything."),
631
810
'verbose',
653
832
action = bzrlib.add.AddFromBaseAction(base_tree, base_path,
654
833
to_file=self.outf, should_print=(not is_quiet()))
655
834
else:
656
action = bzrlib.add.AddAction(to_file=self.outf,
835
action = bzrlib.add.AddWithSkipLargeAction(to_file=self.outf,
657
836
should_print=(not is_quiet()))
658
837
659
838
if base_tree:
660
base_tree.lock_read()
661
self.add_cleanup(base_tree.unlock)
839
self.add_cleanup(base_tree.lock_read().unlock)
662
840
tree, file_list = tree_files_for_add(file_list)
663
841
added, ignored = tree.smart_add(file_list, not
664
842
no_recurse, action=action, save=not dry_run)
667
845
if verbose:
668
846
for glob in sorted(ignored.keys()):
669
847
for path in ignored[glob]:
670
self.outf.write("ignored %s matching \"%s\"\n"
671
% (path, glob))
848
self.outf.write(
849
gettext("ignored {0} matching \"{1}\"\n").format(
850
path, glob))
672
851
673
852
674
853
class cmd_mkdir(Command):
675
"""Create a new versioned directory.
854
__doc__ = """Create a new versioned directory.
676
855
677
856
This is equivalent to creating the directory and then adding it.
678
857
"""
679
858
680
859
takes_args = ['dir+']
860
takes_options = [
861
Option(
862
'parents',
863
help='No error if existing, make parent directories as needed.',
864
short_name='p'
865
)
866
]
681
867
encoding_type = 'replace'
682
868
683
def run(self, dir_list):
684
for d in dir_list:
685
os.mkdir(d)
686
wt, dd = WorkingTree.open_containing(d)
687
wt.add([dd])
688
self.outf.write('added %s\n' % d)
869
@classmethod
870
def add_file_with_parents(cls, wt, relpath):
871
if wt.path2id(relpath) is not None:
872
return
873
cls.add_file_with_parents(wt, osutils.dirname(relpath))
874
wt.add([relpath])
875
876
@classmethod
877
def add_file_single(cls, wt, relpath):
878
wt.add([relpath])
879
880
def run(self, dir_list, parents=False):
881
if parents:
882
add_file = self.add_file_with_parents
883
else:
884
add_file = self.add_file_single
885
for dir in dir_list:
886
wt, relpath = WorkingTree.open_containing(dir)
887
if parents:
888
try:
889
os.makedirs(dir)
890
except OSError, e:
891
if e.errno != errno.EEXIST:
892
raise
893
else:
894
os.mkdir(dir)
895
add_file(wt, relpath)
896
if not is_quiet():
897
self.outf.write(gettext('added %s\n') % dir)
689
898
690
899
691
900
class cmd_relpath(Command):
692
"""Show path of a file relative to root"""
901
__doc__ = """Show path of a file relative to root"""
693
902
694
903
takes_args = ['filename']
695
904
hidden = True
704
913
705
914
706
915
class cmd_inventory(Command):
707
"""Show inventory of the current working copy or a revision.
916
__doc__ = """Show inventory of the current working copy or a revision.
708
917
709
918
It is possible to limit the output to a particular entry
710
919
type using the --kind option. For example: --kind file.
727
936
@display_command
728
937
def run(self, revision=None, show_ids=False, kind=None, file_list=None):
729
938
if kind and kind not in ['file', 'directory', 'symlink']:
730
raise errors.BzrCommandError('invalid kind %r specified' % (kind,))
939
raise errors.BzrCommandError(gettext('invalid kind %r specified') % (kind,))
731
940
732
941
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)
942
work_tree, file_list = WorkingTree.open_containing_paths(file_list)
943
self.add_cleanup(work_tree.lock_read().unlock)
736
944
if revision is not None:
737
945
tree = revision.as_tree(work_tree.branch)
738
946
739
947
extra_trees = [work_tree]
740
tree.lock_read()
741
self.add_cleanup(tree.unlock)
948
self.add_cleanup(tree.lock_read().unlock)
742
949
else:
743
950
tree = work_tree
744
951
extra_trees = []
745
952
953
self.add_cleanup(tree.lock_read().unlock)
746
954
if file_list is not None:
747
955
file_ids = tree.paths2ids(file_list, trees=extra_trees,
748
956
require_versioned=True)
749
957
# find_ids_across_trees may include some paths that don't
750
958
# 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)
959
entries = tree.iter_entries_by_dir(specific_file_ids=file_ids)
753
960
else:
754
entries = tree.inventory.entries()
961
entries = tree.iter_entries_by_dir()
755
962
756
self.cleanup_now()
757
for path, entry in entries:
963
for path, entry in sorted(entries):
758
964
if kind and kind != entry.kind:
759
965
continue
966
if path == "":
967
continue
760
968
if show_ids:
761
969
self.outf.write('%-50s %s\n' % (path, entry.file_id))
762
970
else:
765
973
766
974
767
975
class cmd_mv(Command):
768
"""Move or rename a file.
976
__doc__ = """Move or rename a file.
769
977
770
978
:Usage:
771
979
bzr mv OLDNAME NEWNAME
798
1006
if auto:
799
1007
return self.run_auto(names_list, after, dry_run)
800
1008
elif dry_run:
801
raise errors.BzrCommandError('--dry-run requires --auto.')
1009
raise errors.BzrCommandError(gettext('--dry-run requires --auto.'))
802
1010
if names_list is None:
803
1011
names_list = []
804
1012
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)
1013
raise errors.BzrCommandError(gettext("missing file argument"))
1014
tree, rel_names = WorkingTree.open_containing_paths(names_list, canonicalize=False)
1015
for file_name in rel_names[0:-1]:
1016
if file_name == '':
1017
raise errors.BzrCommandError(gettext("can not move root of branch"))
1018
self.add_cleanup(tree.lock_tree_write().unlock)
809
1019
self._run(tree, names_list, rel_names, after)
810
1020
811
1021
def run_auto(self, names_list, after, dry_run):
812
1022
if names_list is not None and len(names_list) > 1:
813
raise errors.BzrCommandError('Only one path may be specified to'
814
' --auto.')
1023
raise errors.BzrCommandError(gettext('Only one path may be specified to'
1024
' --auto.'))
815
1025
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)
1026
raise errors.BzrCommandError(gettext('--after cannot be specified with'
1027
' --auto.'))
1028
work_tree, file_list = WorkingTree.open_containing_paths(
1029
names_list, default_directory='.')
1030
self.add_cleanup(work_tree.lock_tree_write().unlock)
821
1031
rename_map.RenameMap.guess_renames(work_tree, dry_run)
822
1032
823
1033
def _run(self, tree, names_list, rel_names, after):
832
1042
and rel_names[0].lower() == rel_names[1].lower()):
833
1043
into_existing = False
834
1044
else:
835
inv = tree.inventory
836
1045
# 'fix' the case of a potential 'from'
837
1046
from_id = tree.path2id(
838
1047
tree.get_canonical_inventory_path(rel_names[0]))
839
1048
if (not osutils.lexists(names_list[0]) and
840
from_id and inv.get_file_kind(from_id) == "directory"):
1049
from_id and tree.stored_kind(from_id) == "directory"):
841
1050
into_existing = False
842
1051
# move/rename
843
1052
if into_existing:
850
1059
self.outf.write("%s => %s\n" % (src, dest))
851
1060
else:
852
1061
if len(names_list) != 2:
853
raise errors.BzrCommandError('to mv multiple files the'
1062
raise errors.BzrCommandError(gettext('to mv multiple files the'
854
1063
' destination must be a versioned'
855
' directory')
1064
' directory'))
856
1065
857
1066
# for cicp file-systems: the src references an existing inventory
858
1067
# item:
902
1111
903
1112
904
1113
class cmd_pull(Command):
905
"""Turn this branch into a mirror of another branch.
1114
__doc__ = """Turn this branch into a mirror of another branch.
906
1115
907
1116
By default, this command only works on branches that have not diverged.
908
1117
Branches are considered diverged if the destination branch's most recent
917
1126
match the remote one, use pull --overwrite. This will work even if the two
918
1127
branches have diverged.
919
1128
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.
1129
If there is no default location set, the first pull will set it (use
1130
--no-remember to avoid setting it). After that, you can omit the
1131
location to use the default. To change the default, use --remember. The
1132
value will only be saved if the remote location can be accessed.
1133
1134
The --verbose option will display the revisions pulled using the log_format
1135
configuration option. You can use a different format by overriding it with
1136
-Olog_format=<other_format>.
924
1137
925
1138
Note: The location can be specified either in the form of a branch,
926
1139
or in the form of a path to a file containing a merge directive generated
931
1144
takes_options = ['remember', 'overwrite', 'revision',
932
1145
custom_help('verbose',
933
1146
help='Show logs of pulled revisions.'),
934
Option('directory',
1147
custom_help('directory',
935
1148
help='Branch to pull into, '
936
'rather than the one containing the working directory.',
937
short_name='d',
938
type=unicode,
939
),
1149
'rather than the one containing the working directory.'),
940
1150
Option('local',
941
1151
help="Perform a local pull in a bound "
942
1152
"branch. Local pulls are not applied to "
943
1153
"the master branch."
944
1154
),
1155
Option('show-base',
1156
help="Show base revision text in conflicts."),
1157
Option('overwrite-tags',
1158
help="Overwrite tags only."),
945
1159
]
946
1160
takes_args = ['location?']
947
1161
encoding_type = 'replace'
948
1162
949
def run(self, location=None, remember=False, overwrite=False,
1163
def run(self, location=None, remember=None, overwrite=False,
950
1164
revision=None, verbose=False,
951
directory=None, local=False):
1165
directory=None, local=False,
1166
show_base=False, overwrite_tags=False):
1167
1168
if overwrite:
1169
overwrite = ["history", "tags"]
1170
elif overwrite_tags:
1171
overwrite = ["tags"]
1172
else:
1173
overwrite = []
952
1174
# FIXME: too much stuff is in the command class
953
1175
revision_id = None
954
1176
mergeable = None
957
1179
try:
958
1180
tree_to = WorkingTree.open_containing(directory)[0]
959
1181
branch_to = tree_to.branch
1182
self.add_cleanup(tree_to.lock_write().unlock)
960
1183
except errors.NoWorkingTree:
961
1184
tree_to = None
962
1185
branch_to = Branch.open_containing(directory)[0]
963
1186
self.add_cleanup(branch_to.lock_write().unlock)
1187
if show_base:
1188
warning(gettext("No working tree, ignoring --show-base"))
1189
964
1190
if local and not branch_to.get_bound_location():
965
1191
raise errors.LocalRequiresBoundBranch()
966
1192
975
1201
stored_loc = branch_to.get_parent()
976
1202
if location is None:
977
1203
if stored_loc is None:
978
raise errors.BzrCommandError("No pull location known or"
979
" specified.")
1204
raise errors.BzrCommandError(gettext("No pull location known or"
1205
" specified."))
980
1206
else:
981
1207
display_url = urlutils.unescape_for_display(stored_loc,
982
1208
self.outf.encoding)
983
1209
if not is_quiet():
984
self.outf.write("Using saved parent location: %s\n" % display_url)
1210
self.outf.write(gettext("Using saved parent location: %s\n") % display_url)
985
1211
location = stored_loc
986
1212
987
1213
revision = _get_one_revision('pull', revision)
988
1214
if mergeable is not None:
989
1215
if revision is not None:
990
raise errors.BzrCommandError(
991
'Cannot use -r with merge directives or bundles')
1216
raise errors.BzrCommandError(gettext(
1217
'Cannot use -r with merge directives or bundles'))
992
1218
mergeable.install_revisions(branch_to.repository)
993
1219
base_revision_id, revision_id, verified = \
994
1220
mergeable.get_merge_request(branch_to.repository)
996
1222
else:
997
1223
branch_from = Branch.open(location,
998
1224
possible_transports=possible_transports)
999
1000
if branch_to.get_parent() is None or remember:
1225
self.add_cleanup(branch_from.lock_read().unlock)
1226
# Remembers if asked explicitly or no previous location is set
1227
if (remember
1228
or (remember is None and branch_to.get_parent() is None)):
1229
# FIXME: This shouldn't be done before the pull
1230
# succeeds... -- vila 2012-01-02
1001
1231
branch_to.set_parent(branch_from.base)
1002
1232
1003
if branch_from is not branch_to:
1004
branch_from.lock_read()
1005
self.add_cleanup(branch_from.unlock)
1006
1233
if revision is not None:
1007
1234
revision_id = revision.as_revision_id(branch_from)
1008
1235
1009
branch_to.lock_write()
1010
self.add_cleanup(branch_to.unlock)
1011
1236
if tree_to is not None:
1012
1237
view_info = _get_view_info_for_change_reporter(tree_to)
1013
1238
change_reporter = delta._ChangeReporter(
1015
1240
view_info=view_info)
1016
1241
result = tree_to.pull(
1017
1242
branch_from, overwrite, revision_id, change_reporter,
1018
possible_transports=possible_transports, local=local)
1243
local=local, show_base=show_base)
1019
1244
else:
1020
1245
result = branch_to.pull(
1021
1246
branch_from, overwrite, revision_id, local=local)
1025
1250
log.show_branch_change(
1026
1251
branch_to, self.outf, result.old_revno,
1027
1252
result.old_revid)
1253
if getattr(result, 'tag_conflicts', None):
1254
return 1
1255
else:
1256
return 0
1028
1257
1029
1258
1030
1259
class cmd_push(Command):
1031
"""Update a mirror of this branch.
1260
__doc__ = """Update a mirror of this branch.
1032
1261
1033
1262
The target branch will not have its working tree populated because this
1034
1263
is both expensive, and is not supported on remote file systems.
1047
1276
do a merge (see bzr help merge) from the other branch, and commit that.
1048
1277
After that you will be able to do a push without '--overwrite'.
1049
1278
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.
1279
If there is no default push location set, the first push will set it (use
1280
--no-remember to avoid setting it). After that, you can omit the
1281
location to use the default. To change the default, use --remember. The
1282
value will only be saved if the remote location can be accessed.
1283
1284
The --verbose option will display the revisions pushed using the log_format
1285
configuration option. You can use a different format by overriding it with
1286
-Olog_format=<other_format>.
1054
1287
"""
1055
1288
1056
1289
_see_also = ['pull', 'update', 'working-trees']
1058
1291
Option('create-prefix',
1059
1292
help='Create the path leading up to the branch '
1060
1293
'if it does not already exist.'),
1061
Option('directory',
1294
custom_help('directory',
1062
1295
help='Branch to push from, '
1063
'rather than the one containing the working directory.',
1064
short_name='d',
1065
type=unicode,
1066
),
1296
'rather than the one containing the working directory.'),
1067
1297
Option('use-existing-dir',
1068
1298
help='By default push will fail if the target'
1069
1299
' directory exists, but does not already'
1080
1310
Option('strict',
1081
1311
help='Refuse to push if there are uncommitted changes in'
1082
1312
' the working tree, --no-strict disables the check.'),
1313
Option('no-tree',
1314
help="Don't populate the working tree, even for protocols"
1315
" that support it."),
1316
Option('overwrite-tags',
1317
help="Overwrite tags only."),
1083
1318
]
1084
1319
takes_args = ['location?']
1085
1320
encoding_type = 'replace'
1086
1321
1087
def run(self, location=None, remember=False, overwrite=False,
1322
def run(self, location=None, remember=None, overwrite=False,
1088
1323
create_prefix=False, verbose=False, revision=None,
1089
1324
use_existing_dir=False, directory=None, stacked_on=None,
1090
stacked=False, strict=None):
1325
stacked=False, strict=None, no_tree=False,
1326
overwrite_tags=False):
1091
1327
from bzrlib.push import _show_push_branch
1092
1328
1329
if overwrite:
1330
overwrite = ["history", "tags"]
1331
elif overwrite_tags:
1332
overwrite = ["tags"]
1333
else:
1334
overwrite = []
1335
1093
1336
if directory is None:
1094
1337
directory = '.'
1095
1338
# Get the source branch
1096
1339
(tree, br_from,
1097
_unused) = bzrdir.BzrDir.open_containing_tree_or_branch(directory)
1098
if strict is None:
1099
strict = br_from.get_config().get_user_option_as_bool('push_strict')
1100
if strict is None: strict = True # default value
1340
_unused) = controldir.ControlDir.open_containing_tree_or_branch(directory)
1101
1341
# Get the tip's revision_id
1102
1342
revision = _get_one_revision('push', revision)
1103
1343
if revision is not None:
1104
1344
revision_id = revision.in_history(br_from).rev_id
1105
1345
else:
1106
1346
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
1347
if tree is not None and revision_id is None:
1348
tree.check_changed_or_out_of_date(
1349
strict, 'push_strict',
1350
more_error='Use --no-strict to force the push.',
1351
more_warning='Uncommitted changes will not be pushed.')
1118
1352
# Get the stacked_on branch, if any
1119
1353
if stacked_on is not None:
1120
1354
stacked_on = urlutils.normalize_url(stacked_on)
1130
1364
# error by the feedback given to them. RBC 20080227.
1131
1365
stacked_on = parent_url
1132
1366
if not stacked_on:
1133
raise errors.BzrCommandError(
1134
"Could not determine branch to refer to.")
1367
raise errors.BzrCommandError(gettext(
1368
"Could not determine branch to refer to."))
1135
1369
1136
1370
# Get the destination location
1137
1371
if location is None:
1138
1372
stored_loc = br_from.get_push_location()
1139
1373
if stored_loc is None:
1140
raise errors.BzrCommandError(
1141
"No push location known or specified.")
1374
parent_loc = br_from.get_parent()
1375
if parent_loc:
1376
raise errors.BzrCommandError(gettext(
1377
"No push location known or specified. To push to the "
1378
"parent branch (at %s), use 'bzr push :parent'." %
1379
urlutils.unescape_for_display(parent_loc,
1380
self.outf.encoding)))
1381
else:
1382
raise errors.BzrCommandError(gettext(
1383
"No push location known or specified."))
1142
1384
else:
1143
1385
display_url = urlutils.unescape_for_display(stored_loc,
1144
1386
self.outf.encoding)
1145
self.outf.write("Using saved push location: %s\n" % display_url)
1387
note(gettext("Using saved push location: %s") % display_url)
1146
1388
location = stored_loc
1147
1389
1148
1390
_show_push_branch(br_from, revision_id, location, self.outf,
1149
1391
verbose=verbose, overwrite=overwrite, remember=remember,
1150
1392
stacked_on=stacked_on, create_prefix=create_prefix,
1151
use_existing_dir=use_existing_dir)
1393
use_existing_dir=use_existing_dir, no_tree=no_tree)
1152
1394
1153
1395
1154
1396
class cmd_branch(Command):
1155
"""Create a new branch that is a copy of an existing branch.
1397
__doc__ = """Create a new branch that is a copy of an existing branch.
1156
1398
1157
1399
If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will
1158
1400
be used. In other words, "branch ../foo/bar" will attempt to create ./bar.
1163
1405
1164
1406
To retrieve the branch as of a particular revision, supply the --revision
1165
1407
parameter, as in "branch foo/bar -r 5".
1408
1409
The synonyms 'clone' and 'get' for this command are deprecated.
1166
1410
"""
1167
1411
1168
1412
_see_also = ['checkout']
1169
1413
takes_args = ['from_location', 'to_location?']
1170
takes_options = ['revision', Option('hardlink',
1171
help='Hard-link working tree files where possible.'),
1414
takes_options = ['revision',
1415
Option('hardlink', help='Hard-link working tree files where possible.'),
1416
Option('files-from', type=str,
1417
help="Get file contents from this tree."),
1172
1418
Option('no-tree',
1173
1419
help="Create a branch without a working-tree."),
1174
1420
Option('switch',
1192
1438
1193
1439
def run(self, from_location, to_location=None, revision=None,
1194
1440
hardlink=False, stacked=False, standalone=False, no_tree=False,
1195
use_existing_dir=False, switch=False, bind=False):
1441
use_existing_dir=False, switch=False, bind=False,
1442
files_from=None):
1196
1443
from bzrlib import switch as _mod_switch
1197
1444
from bzrlib.tag import _merge_tags_if_possible
1198
accelerator_tree, br_from = bzrdir.BzrDir.open_tree_or_branch(
1445
if self.invoked_as in ['get', 'clone']:
1446
ui.ui_factory.show_user_warning(
1447
'deprecated_command',
1448
deprecated_name=self.invoked_as,
1449
recommended_name='branch',
1450
deprecated_in_version='2.4')
1451
accelerator_tree, br_from = controldir.ControlDir.open_tree_or_branch(
1199
1452
from_location)
1453
if not (hardlink or files_from):
1454
# accelerator_tree is usually slower because you have to read N
1455
# files (no readahead, lots of seeks, etc), but allow the user to
1456
# explicitly request it
1457
accelerator_tree = None
1458
if files_from is not None and files_from != from_location:
1459
accelerator_tree = WorkingTree.open(files_from)
1200
1460
revision = _get_one_revision('branch', revision)
1201
br_from.lock_read()
1202
self.add_cleanup(br_from.unlock)
1461
self.add_cleanup(br_from.lock_read().unlock)
1203
1462
if revision is not None:
1204
1463
revision_id = revision.as_revision_id(br_from)
1205
1464
else:
1208
1467
# RBC 20060209
1209
1468
revision_id = br_from.last_revision()
1210
1469
if to_location is None:
1211
to_location = urlutils.derive_to_location(from_location)
1470
to_location = getattr(br_from, "name", None)
1471
if not to_location:
1472
to_location = urlutils.derive_to_location(from_location)
1212
1473
to_transport = transport.get_transport(to_location)
1213
1474
try:
1214
1475
to_transport.mkdir('.')
1215
1476
except errors.FileExists:
1216
if not use_existing_dir:
1217
raise errors.BzrCommandError('Target directory "%s" '
1218
'already exists.' % to_location)
1477
try:
1478
to_dir = controldir.ControlDir.open_from_transport(
1479
to_transport)
1480
except errors.NotBranchError:
1481
if not use_existing_dir:
1482
raise errors.BzrCommandError(gettext('Target directory "%s" '
1483
'already exists.') % to_location)
1484
else:
1485
to_dir = None
1219
1486
else:
1220
1487
try:
1221
bzrdir.BzrDir.open_from_transport(to_transport)
1488
to_dir.open_branch()
1222
1489
except errors.NotBranchError:
1223
1490
pass
1224
1491
else:
1225
1492
raise errors.AlreadyBranchError(to_location)
1226
1493
except errors.NoSuchFile:
1227
raise errors.BzrCommandError('Parent of "%s" does not exist.'
1494
raise errors.BzrCommandError(gettext('Parent of "%s" does not exist.')
1228
1495
% to_location)
1229
try:
1230
# preserve whatever source format we have.
1231
dir = br_from.bzrdir.sprout(to_transport.base, revision_id,
1232
possible_transports=[to_transport],
1233
accelerator_tree=accelerator_tree,
1234
hardlink=hardlink, stacked=stacked,
1235
force_new_repo=standalone,
1236
create_tree_if_local=not no_tree,
1237
source_branch=br_from)
1238
branch = dir.open_branch()
1239
except errors.NoSuchRevision:
1240
to_transport.delete_tree('.')
1241
msg = "The branch %s has no revision %s." % (from_location,
1242
revision)
1243
raise errors.BzrCommandError(msg)
1496
else:
1497
to_dir = None
1498
if to_dir is None:
1499
try:
1500
# preserve whatever source format we have.
1501
to_dir = br_from.bzrdir.sprout(to_transport.base, revision_id,
1502
possible_transports=[to_transport],
1503
accelerator_tree=accelerator_tree,
1504
hardlink=hardlink, stacked=stacked,
1505
force_new_repo=standalone,
1506
create_tree_if_local=not no_tree,
1507
source_branch=br_from)
1508
branch = to_dir.open_branch(
1509
possible_transports=[
1510
br_from.bzrdir.root_transport, to_transport])
1511
except errors.NoSuchRevision:
1512
to_transport.delete_tree('.')
1513
msg = gettext("The branch {0} has no revision {1}.").format(
1514
from_location, revision)
1515
raise errors.BzrCommandError(msg)
1516
else:
1517
try:
1518
to_repo = to_dir.open_repository()
1519
except errors.NoRepositoryPresent:
1520
to_repo = to_dir.create_repository()
1521
to_repo.fetch(br_from.repository, revision_id=revision_id)
1522
branch = br_from.sprout(to_dir, revision_id=revision_id)
1244
1523
_merge_tags_if_possible(br_from, branch)
1245
1524
# If the source branch is stacked, the new branch may
1246
1525
# be stacked whether we asked for that explicitly or not.
1247
1526
# We therefore need a try/except here and not just 'if stacked:'
1248
1527
try:
1249
note('Created new stacked branch referring to %s.' %
1528
note(gettext('Created new stacked branch referring to %s.') %
1250
1529
branch.get_stacked_on_url())
1251
1530
except (errors.NotStacked, errors.UnstackableBranchFormat,
1252
1531
errors.UnstackableRepositoryFormat), e:
1253
note('Branched %d revision(s).' % branch.revno())
1532
note(ngettext('Branched %d revision.', 'Branched %d revisions.', branch.revno()) % branch.revno())
1254
1533
if bind:
1255
1534
# Bind to the parent
1256
1535
parent_branch = Branch.open(from_location)
1257
1536
branch.bind(parent_branch)
1258
note('New branch bound to %s' % from_location)
1537
note(gettext('New branch bound to %s') % from_location)
1259
1538
if switch:
1260
1539
# Switch to the new branch
1261
1540
wt, _ = WorkingTree.open_containing('.')
1262
1541
_mod_switch.switch(wt.bzrdir, branch)
1263
note('Switched to branch: %s',
1542
note(gettext('Switched to branch: %s'),
1264
1543
urlutils.unescape_for_display(branch.base, 'utf-8'))
1265
1544
1266
1545
1546
class cmd_branches(Command):
1547
__doc__ = """List the branches available at the current location.
1548
1549
This command will print the names of all the branches at the current
1550
location.
1551
"""
1552
1553
takes_args = ['location?']
1554
takes_options = [
1555
Option('recursive', short_name='R',
1556
help='Recursively scan for branches rather than '
1557
'just looking in the specified location.')]
1558
1559
def run(self, location=".", recursive=False):
1560
if recursive:
1561
t = transport.get_transport(location)
1562
if not t.listable():
1563
raise errors.BzrCommandError(
1564
"Can't scan this type of location.")
1565
for b in controldir.ControlDir.find_branches(t):
1566
self.outf.write("%s\n" % urlutils.unescape_for_display(
1567
urlutils.relative_url(t.base, b.base),
1568
self.outf.encoding).rstrip("/"))
1569
else:
1570
dir = controldir.ControlDir.open_containing(location)[0]
1571
try:
1572
active_branch = dir.open_branch(name="")
1573
except errors.NotBranchError:
1574
active_branch = None
1575
names = {}
1576
for name, branch in iter_sibling_branches(dir):
1577
if name == "":
1578
continue
1579
active = (active_branch is not None and
1580
active_branch.base == branch.base)
1581
names[name] = active
1582
# Only mention the current branch explicitly if it's not
1583
# one of the colocated branches
1584
if not any(names.values()) and active_branch is not None:
1585
self.outf.write("* %s\n" % gettext("(default)"))
1586
for name in sorted(names.keys()):
1587
active = names[name]
1588
if active:
1589
prefix = "*"
1590
else:
1591
prefix = " "
1592
self.outf.write("%s %s\n" % (
1593
prefix, name.encode(self.outf.encoding)))
1594
1595
1267
1596
class cmd_checkout(Command):
1268
"""Create a new checkout of an existing branch.
1597
__doc__ = """Create a new checkout of an existing branch.
1269
1598
1270
1599
If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree for
1271
1600
the branch found in '.'. This is useful if you have removed the working tree
1285
1614
code.)
1286
1615
"""
1287
1616
1288
_see_also = ['checkouts', 'branch']
1617
_see_also = ['checkouts', 'branch', 'working-trees', 'remove-tree']
1289
1618
takes_args = ['branch_location?', 'to_location?']
1290
1619
takes_options = ['revision',
1291
1620
Option('lightweight',
1308
1637
if branch_location is None:
1309
1638
branch_location = osutils.getcwd()
1310
1639
to_location = branch_location
1311
accelerator_tree, source = bzrdir.BzrDir.open_tree_or_branch(
1640
accelerator_tree, source = controldir.ControlDir.open_tree_or_branch(
1312
1641
branch_location)
1642
if not (hardlink or files_from):
1643
# accelerator_tree is usually slower because you have to read N
1644
# files (no readahead, lots of seeks, etc), but allow the user to
1645
# explicitly request it
1646
accelerator_tree = None
1313
1647
revision = _get_one_revision('checkout', revision)
1314
if files_from is not None:
1648
if files_from is not None and files_from != branch_location:
1315
1649
accelerator_tree = WorkingTree.open(files_from)
1316
1650
if revision is not None:
1317
1651
revision_id = revision.as_revision_id(source)
1334
1668
1335
1669
1336
1670
class cmd_renames(Command):
1337
"""Show list of renamed files.
1671
__doc__ = """Show list of renamed files.
1338
1672
"""
1339
1673
# TODO: Option to show renames between two historical versions.
1340
1674
1345
1679
@display_command
1346
1680
def run(self, dir=u'.'):
1347
1681
tree = WorkingTree.open_containing(dir)[0]
1348
tree.lock_read()
1349
self.add_cleanup(tree.unlock)
1350
new_inv = tree.inventory
1682
self.add_cleanup(tree.lock_read().unlock)
1351
1683
old_tree = tree.basis_tree()
1352
old_tree.lock_read()
1353
self.add_cleanup(old_tree.unlock)
1354
old_inv = old_tree.inventory
1684
self.add_cleanup(old_tree.lock_read().unlock)
1355
1685
renames = []
1356
1686
iterator = tree.iter_changes(old_tree, include_unchanged=True)
1357
1687
for f, paths, c, v, p, n, k, e in iterator:
1366
1696
1367
1697
1368
1698
class cmd_update(Command):
1369
"""Update a tree to have the latest code committed to its branch.
1370
1371
This will perform a merge into the working tree, and may generate
1372
conflicts. If you have any local changes, you will still
1373
need to commit them after the update for the update to be complete.
1374
1375
If you want to discard your local changes, you can just do a
1376
'bzr revert' instead of 'bzr commit' after the update.
1377
1378
If the tree's branch is bound to a master branch, it will also update
1699
__doc__ = """Update a working tree to a new revision.
1700
1701
This will perform a merge of the destination revision (the tip of the
1702
branch, or the specified revision) into the working tree, and then make
1703
that revision the basis revision for the working tree.
1704
1705
You can use this to visit an older revision, or to update a working tree
1706
that is out of date from its branch.
1707
1708
If there are any uncommitted changes in the tree, they will be carried
1709
across and remain as uncommitted changes after the update. To discard
1710
these changes, use 'bzr revert'. The uncommitted changes may conflict
1711
with the changes brought in by the change in basis revision.
1712
1713
If the tree's branch is bound to a master branch, bzr will also update
1379
1714
the branch from the master.
1715
1716
You cannot update just a single file or directory, because each Bazaar
1717
working tree has just a single basis revision. If you want to restore a
1718
file that has been removed locally, use 'bzr revert' instead of 'bzr
1719
update'. If you want to restore a file to its state in a previous
1720
revision, use 'bzr revert' with a '-r' option, or use 'bzr cat' to write
1721
out the old content of that file to a new location.
1722
1723
The 'dir' argument, if given, must be the location of the root of a
1724
working tree to update. By default, the working tree that contains the
1725
current working directory is used.
1380
1726
"""
1381
1727
1382
1728
_see_also = ['pull', 'working-trees', 'status-flags']
1383
1729
takes_args = ['dir?']
1384
takes_options = ['revision']
1730
takes_options = ['revision',
1731
Option('show-base',
1732
help="Show base revision text in conflicts."),
1733
]
1385
1734
aliases = ['up']
1386
1735
1387
def run(self, dir='.', revision=None):
1736
def run(self, dir=None, revision=None, show_base=None):
1388
1737
if revision is not None and len(revision) != 1:
1389
raise errors.BzrCommandError(
1390
"bzr update --revision takes exactly one revision")
1391
tree = WorkingTree.open_containing(dir)[0]
1738
raise errors.BzrCommandError(gettext(
1739
"bzr update --revision takes exactly one revision"))
1740
if dir is None:
1741
tree = WorkingTree.open_containing('.')[0]
1742
else:
1743
tree, relpath = WorkingTree.open_containing(dir)
1744
if relpath:
1745
# See bug 557886.
1746
raise errors.BzrCommandError(gettext(
1747
"bzr update can only update a whole tree, "
1748
"not a file or subdirectory"))
1392
1749
branch = tree.branch
1393
1750
possible_transports = []
1394
1751
master = branch.get_master_branch(
1395
1752
possible_transports=possible_transports)
1396
1753
if master is not None:
1397
tree.lock_write()
1398
1754
branch_location = master.base
1755
tree.lock_write()
1399
1756
else:
1757
branch_location = tree.branch.base
1400
1758
tree.lock_tree_write()
1401
branch_location = tree.branch.base
1402
1759
self.add_cleanup(tree.unlock)
1403
1760
# get rid of the final '/' and be ready for display
1404
branch_location = urlutils.unescape_for_display(branch_location[:-1],
1405
self.outf.encoding)
1761
branch_location = urlutils.unescape_for_display(
1762
branch_location.rstrip('/'),
1763
self.outf.encoding)
1406
1764
existing_pending_merges = tree.get_parent_ids()[1:]
1407
1765
if master is None:
1408
1766
old_tip = None
1416
1774
else:
1417
1775
revision_id = branch.last_revision()
1418
1776
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))
1777
revno = branch.revision_id_to_dotted_revno(revision_id)
1778
note(gettext("Tree is up to date at revision {0} of branch {1}"
1779
).format('.'.join(map(str, revno)), branch_location))
1422
1780
return 0
1423
1781
view_info = _get_view_info_for_change_reporter(tree)
1424
1782
change_reporter = delta._ChangeReporter(
1429
1787
change_reporter,
1430
1788
possible_transports=possible_transports,
1431
1789
revision=revision_id,
1432
old_tip=old_tip)
1790
old_tip=old_tip,
1791
show_base=show_base)
1433
1792
except errors.NoSuchRevision, e:
1434
raise errors.BzrCommandError(
1793
raise errors.BzrCommandError(gettext(
1435
1794
"branch has no revision %s\n"
1436
1795
"bzr update --revision only works"
1437
" for a revision in the branch history"
1796
" for a revision in the branch history")
1438
1797
% (e.revision))
1439
revno = tree.branch.revision_id_to_revno(
1798
revno = tree.branch.revision_id_to_dotted_revno(
1440
1799
_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'.")
1800
note(gettext('Updated to revision {0} of branch {1}').format(
1801
'.'.join(map(str, revno)), branch_location))
1802
parent_ids = tree.get_parent_ids()
1803
if parent_ids[1:] and parent_ids[1:] != existing_pending_merges:
1804
note(gettext('Your local commits will now show as pending merges with '
1805
"'bzr status', and can be committed with 'bzr commit'."))
1446
1806
if conflicts != 0:
1447
1807
return 1
1448
1808
else:
1450
1810
1451
1811
1452
1812
class cmd_info(Command):
1453
"""Show information about a working tree, branch or repository.
1813
__doc__ = """Show information about a working tree, branch or repository.
1454
1814
1455
1815
This command will show all known locations and formats associated to the
1456
1816
tree, branch or repository.
1489
1849
else:
1490
1850
noise_level = 0
1491
1851
from bzrlib.info import show_bzrdir_info
1492
show_bzrdir_info(bzrdir.BzrDir.open_containing(location)[0],
1852
show_bzrdir_info(controldir.ControlDir.open_containing(location)[0],
1493
1853
verbose=noise_level, outfile=self.outf)
1494
1854
1495
1855
1496
1856
class cmd_remove(Command):
1497
"""Remove files or directories.
1857
__doc__ = """Remove files or directories.
1498
1858
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.
1859
This makes Bazaar stop tracking changes to the specified files. Bazaar will
1860
delete them if they can easily be recovered using revert otherwise they
1861
will be backed up (adding an extension of the form .~#~). If no options or
1862
parameters are given Bazaar will scan for files that are being tracked by
1863
Bazaar but missing in your tree and stop tracking them for you.
1503
1864
"""
1504
1865
takes_args = ['file*']
1505
1866
takes_options = ['verbose',
1507
1868
RegistryOption.from_kwargs('file-deletion-strategy',
1508
1869
'The file deletion mode to be used.',
1509
1870
title='Deletion Strategy', value_switches=True, enum_switch=False,
1510
safe='Only delete files if they can be'
1511
' safely recovered (default).',
1871
safe='Backup changed files (default).',
1512
1872
keep='Delete from bzr but leave the working copy.',
1513
force='Delete all the specified files, even if they can not be '
1514
'recovered and even if they are non-empty directories.')]
1873
no_backup='Don\'t backup changed files.'),
1874
]
1515
1875
aliases = ['rm', 'del']
1516
1876
encoding_type = 'replace'
1517
1877
1518
1878
def run(self, file_list, verbose=False, new=False,
1519
1879
file_deletion_strategy='safe'):
1520
tree, file_list = tree_files(file_list)
1880
1881
tree, file_list = WorkingTree.open_containing_paths(file_list)
1521
1882
1522
1883
if file_list is not None:
1523
1884
file_list = [f for f in file_list]
1524
1885
1525
tree.lock_write()
1526
self.add_cleanup(tree.unlock)
1886
self.add_cleanup(tree.lock_write().unlock)
1527
1887
# Heuristics should probably all move into tree.remove_smart or
1528
1888
# some such?
1529
1889
if new:
1531
1891
specific_files=file_list).added
1532
1892
file_list = sorted([f[0] for f in added], reverse=True)
1533
1893
if len(file_list) == 0:
1534
raise errors.BzrCommandError('No matching files.')
1894
raise errors.BzrCommandError(gettext('No matching files.'))
1535
1895
elif file_list is None:
1536
1896
# missing files show up in iter_changes(basis) as
1537
1897
# versioned-with-no-kind.
1544
1904
file_deletion_strategy = 'keep'
1545
1905
tree.remove(file_list, verbose=verbose, to_file=self.outf,
1546
1906
keep_files=file_deletion_strategy=='keep',
1547
force=file_deletion_strategy=='force')
1907
force=(file_deletion_strategy=='no-backup'))
1548
1908
1549
1909
1550
1910
class cmd_file_id(Command):
1551
"""Print file_id of a particular file or directory.
1911
__doc__ = """Print file_id of a particular file or directory.
1552
1912
1553
1913
The file_id is assigned when the file is first added and remains the
1554
1914
same through all revisions where the file exists, even when it is
1570
1930
1571
1931
1572
1932
class cmd_file_path(Command):
1573
"""Print path of file_ids to a file or directory.
1933
__doc__ = """Print path of file_ids to a file or directory.
1574
1934
1575
1935
This prints one line for each directory down to the target,
1576
1936
starting at the branch root.
1592
1952
1593
1953
1594
1954
class cmd_reconcile(Command):
1595
"""Reconcile bzr metadata in a branch.
1955
__doc__ = """Reconcile bzr metadata in a branch.
1596
1956
1597
1957
This can correct data mismatches that may have been caused by
1598
1958
previous ghost operations or bzr upgrades. You should only
1612
1972
1613
1973
_see_also = ['check']
1614
1974
takes_args = ['branch?']
1975
takes_options = [
1976
Option('canonicalize-chks',
1977
help='Make sure CHKs are in canonical form (repairs '
1978
'bug 522637).',
1979
hidden=True),
1980
]
1615
1981
1616
def run(self, branch="."):
1982
def run(self, branch=".", canonicalize_chks=False):
1617
1983
from bzrlib.reconcile import reconcile
1618
dir = bzrdir.BzrDir.open(branch)
1619
reconcile(dir)
1984
dir = controldir.ControlDir.open(branch)
1985
reconcile(dir, canonicalize_chks=canonicalize_chks)
1620
1986
1621
1987
1622
1988
class cmd_revision_history(Command):
1623
"""Display the list of revision ids on a branch."""
1989
__doc__ = """Display the list of revision ids on a branch."""
1624
1990
1625
1991
_see_also = ['log']
1626
1992
takes_args = ['location?']
1630
1996
@display_command
1631
1997
def run(self, location="."):
1632
1998
branch = Branch.open_containing(location)[0]
1633
for revid in branch.revision_history():
1999
self.add_cleanup(branch.lock_read().unlock)
2000
graph = branch.repository.get_graph()
2001
history = list(graph.iter_lefthand_ancestry(branch.last_revision(),
2002
[_mod_revision.NULL_REVISION]))
2003
for revid in reversed(history):
1634
2004
self.outf.write(revid)
1635
2005
self.outf.write('\n')
1636
2006
1637
2007
1638
2008
class cmd_ancestry(Command):
1639
"""List all revisions merged into this branch."""
2009
__doc__ = """List all revisions merged into this branch."""
1640
2010
1641
2011
_see_also = ['log', 'revision-history']
1642
2012
takes_args = ['location?']
1654
2024
b = wt.branch
1655
2025
last_revision = wt.last_revision()
1656
2026
1657
revision_ids = b.repository.get_ancestry(last_revision)
1658
revision_ids.pop(0)
1659
for revision_id in revision_ids:
2027
self.add_cleanup(b.repository.lock_read().unlock)
2028
graph = b.repository.get_graph()
2029
revisions = [revid for revid, parents in
2030
graph.iter_ancestry([last_revision])]
2031
for revision_id in reversed(revisions):
2032
if _mod_revision.is_null(revision_id):
2033
continue
1660
2034
self.outf.write(revision_id + '\n')
1661
2035
1662
2036
1663
2037
class cmd_init(Command):
1664
"""Make a directory into a versioned branch.
2038
__doc__ = """Make a directory into a versioned branch.
1665
2039
1666
2040
Use this to create an empty branch, or before importing an
1667
2041
existing project.
1692
2066
RegistryOption('format',
1693
2067
help='Specify a format for this branch. '
1694
2068
'See "help formats".',
1695
lazy_registry=('bzrlib.bzrdir', 'format_registry'),
1696
converter=lambda name: bzrdir.format_registry.make_bzrdir(name),
2069
lazy_registry=('bzrlib.controldir', 'format_registry'),
2070
converter=lambda name: controldir.format_registry.make_bzrdir(name),
1697
2071
value_switches=True,
1698
2072
title="Branch format",
1699
2073
),
1700
2074
Option('append-revisions-only',
1701
2075
help='Never change revnos or the existing log.'
1702
' Append revisions to it only.')
2076
' Append revisions to it only.'),
2077
Option('no-tree',
2078
'Create a branch without a working tree.')
1703
2079
]
1704
2080
def run(self, location=None, format=None, append_revisions_only=False,
1705
create_prefix=False):
2081
create_prefix=False, no_tree=False):
1706
2082
if format is None:
1707
format = bzrdir.format_registry.make_bzrdir('default')
2083
format = controldir.format_registry.make_bzrdir('default')
1708
2084
if location is None:
1709
2085
location = u'.'
1710
2086
1719
2095
to_transport.ensure_base()
1720
2096
except errors.NoSuchFile:
1721
2097
if not create_prefix:
1722
raise errors.BzrCommandError("Parent directory of %s"
2098
raise errors.BzrCommandError(gettext("Parent directory of %s"
1723
2099
" does not exist."
1724
2100
"\nYou may supply --create-prefix to create all"
1725
" leading parent directories."
2101
" leading parent directories.")
1726
2102
% location)
1727
2103
to_transport.create_prefix()
1728
2104
1729
2105
try:
1730
a_bzrdir = bzrdir.BzrDir.open_from_transport(to_transport)
2106
a_bzrdir = controldir.ControlDir.open_from_transport(to_transport)
1731
2107
except errors.NotBranchError:
1732
2108
# really a NotBzrDir error...
1733
create_branch = bzrdir.BzrDir.create_branch_convenience
2109
create_branch = controldir.ControlDir.create_branch_convenience
2110
if no_tree:
2111
force_new_tree = False
2112
else:
2113
force_new_tree = None
1734
2114
branch = create_branch(to_transport.base, format=format,
1735
possible_transports=[to_transport])
2115
possible_transports=[to_transport],
2116
force_new_tree=force_new_tree)
1736
2117
a_bzrdir = branch.bzrdir
1737
2118
else:
1738
2119
from bzrlib.transport.local import LocalTransport
1742
2123
raise errors.BranchExistsWithoutWorkingTree(location)
1743
2124
raise errors.AlreadyBranchError(location)
1744
2125
branch = a_bzrdir.create_branch()
1745
a_bzrdir.create_workingtree()
2126
if not no_tree and not a_bzrdir.has_workingtree():
2127
a_bzrdir.create_workingtree()
1746
2128
if append_revisions_only:
1747
2129
try:
1748
2130
branch.set_append_revisions_only(True)
1749
2131
except errors.UpgradeRequired:
1750
raise errors.BzrCommandError('This branch format cannot be set'
1751
' to append-revisions-only. Try --default.')
2132
raise errors.BzrCommandError(gettext('This branch format cannot be set'
2133
' to append-revisions-only. Try --default.'))
1752
2134
if not is_quiet():
1753
2135
from bzrlib.info import describe_layout, describe_format
1754
2136
try:
1758
2140
repository = branch.repository
1759
2141
layout = describe_layout(repository, branch, tree).lower()
1760
2142
format = describe_format(a_bzrdir, repository, branch, tree)
1761
self.outf.write("Created a %s (format: %s)\n" % (layout, format))
2143
self.outf.write(gettext("Created a {0} (format: {1})\n").format(
2144
layout, format))
1762
2145
if repository.is_shared():
1763
2146
#XXX: maybe this can be refactored into transport.path_or_url()
1764
2147
url = repository.bzrdir.root_transport.external_url()
1766
2149
url = urlutils.local_path_from_url(url)
1767
2150
except errors.InvalidURL:
1768
2151
pass
1769
self.outf.write("Using shared repository: %s\n" % url)
2152
self.outf.write(gettext("Using shared repository: %s\n") % url)
1770
2153
1771
2154
1772
2155
class cmd_init_repository(Command):
1773
"""Create a shared repository for branches to share storage space.
2156
__doc__ = """Create a shared repository for branches to share storage space.
1774
2157
1775
2158
New branches created under the repository directory will store their
1776
2159
revisions in the repository, not in the branch directory. For branches
1802
2185
takes_options = [RegistryOption('format',
1803
2186
help='Specify a format for this repository. See'
1804
2187
' "bzr help formats" for details.',
1805
lazy_registry=('bzrlib.bzrdir', 'format_registry'),
1806
converter=lambda name: bzrdir.format_registry.make_bzrdir(name),
2188
lazy_registry=('bzrlib.controldir', 'format_registry'),
2189
converter=lambda name: controldir.format_registry.make_bzrdir(name),
1807
2190
value_switches=True, title='Repository format'),
1808
2191
Option('no-trees',
1809
2192
help='Branches in the repository will default to'
1813
2196
1814
2197
def run(self, location, format=None, no_trees=False):
1815
2198
if format is None:
1816
format = bzrdir.format_registry.make_bzrdir('default')
2199
format = controldir.format_registry.make_bzrdir('default')
1817
2200
1818
2201
if location is None:
1819
2202
location = '.'
1820
2203
1821
2204
to_transport = transport.get_transport(location)
1822
to_transport.ensure_base()
1823
2205
1824
newdir = format.initialize_on_transport(to_transport)
1825
repo = newdir.create_repository(shared=True)
1826
repo.set_make_working_trees(not no_trees)
2206
(repo, newdir, require_stacking, repository_policy) = (
2207
format.initialize_on_transport_ex(to_transport,
2208
create_prefix=True, make_working_trees=not no_trees,
2209
shared_repo=True, force_new_repo=True,
2210
use_existing_dir=True,
2211
repo_format_name=format.repository_format.get_format_string()))
1827
2212
if not is_quiet():
1828
2213
from bzrlib.info import show_bzrdir_info
1829
show_bzrdir_info(repo.bzrdir, verbose=0, outfile=self.outf)
2214
show_bzrdir_info(newdir, verbose=0, outfile=self.outf)
1830
2215
1831
2216
1832
2217
class cmd_diff(Command):
1833
"""Show differences in the working tree, between revisions or branches.
2218
__doc__ = """Show differences in the working tree, between revisions or branches.
1834
2219
1835
2220
If no arguments are given, all changes for the current tree are listed.
1836
2221
If files are given, only the changes in those files are listed.
1842
2227
"bzr diff -p1" is equivalent to "bzr diff --prefix old/:new/", and
1843
2228
produces patches suitable for "patch -p1".
1844
2229
2230
Note that when using the -r argument with a range of revisions, the
2231
differences are computed between the two specified revisions. That
2232
is, the command does not show the changes introduced by the first
2233
revision in the range. This differs from the interpretation of
2234
revision ranges used by "bzr log" which includes the first revision
2235
in the range.
2236
1845
2237
:Exit values:
1846
2238
1 - changed
1847
2239
2 - unrepresentable changes
1865
2257
1866
2258
bzr diff -r1..3 xxx
1867
2259
1868
To see the changes introduced in revision X::
2260
The changes introduced by revision 2 (equivalent to -r1..2)::
2261
2262
bzr diff -c2
2263
2264
To see the changes introduced by revision X::
1869
2265
1870
2266
bzr diff -cX
1871
2267
1875
2271
1876
2272
bzr diff -r<chosen_parent>..X
1877
2273
1878
The changes introduced by revision 2 (equivalent to -r1..2)::
2274
The changes between the current revision and the previous revision
2275
(equivalent to -c-1 and -r-2..-1)
1879
2276
1880
bzr diff -c2
2277
bzr diff -r-2..
1881
2278
1882
2279
Show just the differences for file NEWS::
1883
2280
1898
2295
Same as 'bzr diff' but prefix paths with old/ and new/::
1899
2296
1900
2297
bzr diff --prefix old/:new/
2298
2299
Show the differences using a custom diff program with options::
2300
2301
bzr diff --using /usr/bin/diff --diff-options -wu
1901
2302
"""
1902
2303
_see_also = ['status']
1903
2304
takes_args = ['file*']
1922
2323
help='Use this command to compare files.',
1923
2324
type=unicode,
1924
2325
),
2326
RegistryOption('format',
2327
short_name='F',
2328
help='Diff format to use.',
2329
lazy_registry=('bzrlib.diff', 'format_registry'),
2330
title='Diff format'),
2331
Option('context',
2332
help='How many lines of context to show.',
2333
type=int,
2334
),
1925
2335
]
1926
2336
aliases = ['di', 'dif']
1927
2337
encoding_type = 'exact'
1928
2338
1929
2339
@display_command
1930
2340
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
2341
prefix=None, old=None, new=None, using=None, format=None,
2342
context=None):
2343
from bzrlib.diff import (get_trees_and_branches_to_diff_locked,
2344
show_diff_trees)
1933
2345
1934
2346
if (prefix is None) or (prefix == '0'):
1935
2347
# diff -p0 format
1941
2353
elif ':' in prefix:
1942
2354
old_label, new_label = prefix.split(":")
1943
2355
else:
1944
raise errors.BzrCommandError(
2356
raise errors.BzrCommandError(gettext(
1945
2357
'--prefix expects two values separated by a colon'
1946
' (eg "old/:new/")')
2358
' (eg "old/:new/")'))
1947
2359
1948
2360
if revision and len(revision) > 2:
1949
raise errors.BzrCommandError('bzr diff --revision takes exactly'
1950
' one or two revision specifiers')
2361
raise errors.BzrCommandError(gettext('bzr diff --revision takes exactly'
2362
' one or two revision specifiers'))
2363
2364
if using is not None and format is not None:
2365
raise errors.BzrCommandError(gettext(
2366
'{0} and {1} are mutually exclusive').format(
2367
'--using', '--format'))
1951
2368
1952
2369
(old_tree, new_tree,
1953
2370
old_branch, new_branch,
1954
specific_files, extra_trees) = get_trees_and_branches_to_diff(
1955
file_list, revision, old, new, apply_view=True)
2371
specific_files, extra_trees) = get_trees_and_branches_to_diff_locked(
2372
file_list, revision, old, new, self.add_cleanup, apply_view=True)
2373
# GNU diff on Windows uses ANSI encoding for filenames
2374
path_encoding = osutils.get_diff_header_encoding()
1956
2375
return show_diff_trees(old_tree, new_tree, sys.stdout,
1957
2376
specific_files=specific_files,
1958
2377
external_diff_options=diff_options,
1959
2378
old_label=old_label, new_label=new_label,
1960
extra_trees=extra_trees, using=using)
2379
extra_trees=extra_trees,
2380
path_encoding=path_encoding,
2381
using=using, context=context,
2382
format_cls=format)
1961
2383
1962
2384
1963
2385
class cmd_deleted(Command):
1964
"""List files deleted in the working tree.
2386
__doc__ = """List files deleted in the working tree.
1965
2387
"""
1966
2388
# TODO: Show files deleted since a previous revision, or
1967
2389
# between two revisions.
1970
2392
# level of effort but possibly much less IO. (Or possibly not,
1971
2393
# if the directories are very large...)
1972
2394
_see_also = ['status', 'ls']
1973
takes_options = ['show-ids']
2395
takes_options = ['directory', 'show-ids']
1974
2396
1975
2397
@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)
2398
def run(self, show_ids=False, directory=u'.'):
2399
tree = WorkingTree.open_containing(directory)[0]
2400
self.add_cleanup(tree.lock_read().unlock)
1980
2401
old = tree.basis_tree()
1981
old.lock_read()
1982
self.add_cleanup(old.unlock)
1983
for path, ie in old.inventory.iter_entries():
2402
self.add_cleanup(old.lock_read().unlock)
2403
for path, ie in old.iter_entries_by_dir():
1984
2404
if not tree.has_id(ie.file_id):
1985
2405
self.outf.write(path)
1986
2406
if show_ids:
1990
2410
1991
2411
1992
2412
class cmd_modified(Command):
1993
"""List files modified in working tree.
2413
__doc__ = """List files modified in working tree.
1994
2414
"""
1995
2415
1996
2416
hidden = True
1997
2417
_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
]
2418
takes_options = ['directory', 'null']
2003
2419
2004
2420
@display_command
2005
def run(self, null=False):
2006
tree = WorkingTree.open_containing(u'.')[0]
2421
def run(self, null=False, directory=u'.'):
2422
tree = WorkingTree.open_containing(directory)[0]
2423
self.add_cleanup(tree.lock_read().unlock)
2007
2424
td = tree.changes_from(tree.basis_tree())
2425
self.cleanup_now()
2008
2426
for path, id, kind, text_modified, meta_modified in td.modified:
2009
2427
if null:
2010
2428
self.outf.write(path + '\0')
2013
2431
2014
2432
2015
2433
class cmd_added(Command):
2016
"""List files added in working tree.
2434
__doc__ = """List files added in working tree.
2017
2435
"""
2018
2436
2019
2437
hidden = True
2020
2438
_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
]
2439
takes_options = ['directory', 'null']
2026
2440
2027
2441
@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)
2442
def run(self, null=False, directory=u'.'):
2443
wt = WorkingTree.open_containing(directory)[0]
2444
self.add_cleanup(wt.lock_read().unlock)
2032
2445
basis = wt.basis_tree()
2033
basis.lock_read()
2034
self.add_cleanup(basis.unlock)
2035
basis_inv = basis.inventory
2036
inv = wt.inventory
2037
for file_id in inv:
2038
if file_id in basis_inv:
2039
continue
2040
if inv.is_root(file_id) and len(basis_inv) == 0:
2041
continue
2042
path = inv.id2path(file_id)
2043
if not os.access(osutils.abspath(path), os.F_OK):
2446
self.add_cleanup(basis.lock_read().unlock)
2447
root_id = wt.get_root_id()
2448
for file_id in wt.all_file_ids():
2449
if basis.has_id(file_id):
2450
continue
2451
if root_id == file_id:
2452
continue
2453
path = wt.id2path(file_id)
2454
if not os.access(osutils.pathjoin(wt.basedir, path), os.F_OK):
2044
2455
continue
2045
2456
if null:
2046
2457
self.outf.write(path + '\0')
2049
2460
2050
2461
2051
2462
class cmd_root(Command):
2052
"""Show the tree root directory.
2463
__doc__ = """Show the tree root directory.
2053
2464
2054
2465
The root is the nearest enclosing directory with a .bzr control
2055
2466
directory."""
2066
2477
try:
2067
2478
return int(limitstring)
2068
2479
except ValueError:
2069
msg = "The limit argument must be an integer."
2480
msg = gettext("The limit argument must be an integer.")
2070
2481
raise errors.BzrCommandError(msg)
2071
2482
2072
2483
2074
2485
try:
2075
2486
return int(s)
2076
2487
except ValueError:
2077
msg = "The levels argument must be an integer."
2488
msg = gettext("The levels argument must be an integer.")
2078
2489
raise errors.BzrCommandError(msg)
2079
2490
2080
2491
2081
2492
class cmd_log(Command):
2082
"""Show historical log for a branch or subset of a branch.
2493
__doc__ = """Show historical log for a branch or subset of a branch.
2083
2494
2084
2495
log is bzr's default tool for exploring the history of a branch.
2085
2496
The branch to use is taken from the first parameter. If no parameters
2190
2601
2191
2602
:Other filtering:
2192
2603
2193
The --message option can be used for finding revisions that match a
2194
regular expression in a commit message.
2604
The --match option can be used for finding revisions that match a
2605
regular expression in a commit message, committer, author or bug.
2606
Specifying the option several times will match any of the supplied
2607
expressions. --match-author, --match-bugs, --match-committer and
2608
--match-message can be used to only match a specific field.
2195
2609
2196
2610
:Tips & tricks:
2197
2611
2246
2660
help='Show just the specified revision.'
2247
2661
' See also "help revisionspec".'),
2248
2662
'log-format',
2663
RegistryOption('authors',
2664
'What names to list as authors - first, all or committer.',
2665
title='Authors',
2666
lazy_registry=('bzrlib.log', 'author_list_registry'),
2667
),
2249
2668
Option('levels',
2250
2669
short_name='n',
2251
2670
help='Number of levels to display - 0 for all, 1 for flat.',
2252
2671
argname='N',
2253
2672
type=_parse_levels),
2254
2673
Option('message',
2255
short_name='m',
2256
2674
help='Show revisions whose message matches this '
2257
2675
'regular expression.',
2258
type=str),
2676
type=str,
2677
hidden=True),
2259
2678
Option('limit',
2260
2679
short_name='l',
2261
2680
help='Limit the output to the first N revisions.',
2264
2683
Option('show-diff',
2265
2684
short_name='p',
2266
2685
help='Show changes made in each revision as a patch.'),
2267
Option('include-merges',
2686
Option('include-merged',
2268
2687
help='Show merged revisions like --levels 0 does.'),
2688
Option('include-merges', hidden=True,
2689
help='Historical alias for --include-merged.'),
2690
Option('omit-merges',
2691
help='Do not report commits with more than one parent.'),
2692
Option('exclude-common-ancestry',
2693
help='Display only the revisions that are not part'
2694
' of both ancestries (require -rX..Y).'
2695
),
2696
Option('signatures',
2697
help='Show digital signature validity.'),
2698
ListOption('match',
2699
short_name='m',
2700
help='Show revisions whose properties match this '
2701
'expression.',
2702
type=str),
2703
ListOption('match-message',
2704
help='Show revisions whose message matches this '
2705
'expression.',
2706
type=str),
2707
ListOption('match-committer',
2708
help='Show revisions whose committer matches this '
2709
'expression.',
2710
type=str),
2711
ListOption('match-author',
2712
help='Show revisions whose authors match this '
2713
'expression.',
2714
type=str),
2715
ListOption('match-bugs',
2716
help='Show revisions whose bugs match this '
2717
'expression.',
2718
type=str)
2269
2719
]
2270
2720
encoding_type = 'replace'
2271
2721
2281
2731
message=None,
2282
2732
limit=None,
2283
2733
show_diff=False,
2284
include_merges=False):
2734
include_merged=None,
2735
authors=None,
2736
exclude_common_ancestry=False,
2737
signatures=False,
2738
match=None,
2739
match_message=None,
2740
match_committer=None,
2741
match_author=None,
2742
match_bugs=None,
2743
omit_merges=False,
2744
include_merges=symbol_versioning.DEPRECATED_PARAMETER,
2745
):
2285
2746
from bzrlib.log import (
2286
2747
Logger,
2287
2748
make_log_request_dict,
2288
2749
_get_info_for_log_files,
2289
2750
)
2290
2751
direction = (forward and 'forward') or 'reverse'
2291
if include_merges:
2752
if symbol_versioning.deprecated_passed(include_merges):
2753
ui.ui_factory.show_user_warning(
2754
'deprecated_command_option',
2755
deprecated_name='--include-merges',
2756
recommended_name='--include-merged',
2757
deprecated_in_version='2.5',
2758
command=self.invoked_as)
2759
if include_merged is None:
2760
include_merged = include_merges
2761
else:
2762
raise errors.BzrCommandError(gettext(
2763
'{0} and {1} are mutually exclusive').format(
2764
'--include-merges', '--include-merged'))
2765
if include_merged is None:
2766
include_merged = False
2767
if (exclude_common_ancestry
2768
and (revision is None or len(revision) != 2)):
2769
raise errors.BzrCommandError(gettext(
2770
'--exclude-common-ancestry requires -r with two revisions'))
2771
if include_merged:
2292
2772
if levels is None:
2293
2773
levels = 0
2294
2774
else:
2295
raise errors.BzrCommandError(
2296
'--levels and --include-merges are mutually exclusive')
2775
raise errors.BzrCommandError(gettext(
2776
'{0} and {1} are mutually exclusive').format(
2777
'--levels', '--include-merged'))
2297
2778
2298
2779
if change is not None:
2299
2780
if len(change) > 1:
2300
2781
raise errors.RangeInChangeOption()
2301
2782
if revision is not None:
2302
raise errors.BzrCommandError(
2303
'--revision and --change are mutually exclusive')
2783
raise errors.BzrCommandError(gettext(
2784
'{0} and {1} are mutually exclusive').format(
2785
'--revision', '--change'))
2304
2786
else:
2305
2787
revision = change
2306
2788
2309
2791
if file_list:
2310
2792
# find the file ids to log and check for directory filtering
2311
2793
b, file_info_list, rev1, rev2 = _get_info_for_log_files(
2312
revision, file_list)
2313
self.add_cleanup(b.unlock)
2794
revision, file_list, self.add_cleanup)
2314
2795
for relpath, file_id, kind in file_info_list:
2315
2796
if file_id is None:
2316
raise errors.BzrCommandError(
2317
"Path unknown at end or start of revision range: %s" %
2797
raise errors.BzrCommandError(gettext(
2798
"Path unknown at end or start of revision range: %s") %
2318
2799
relpath)
2319
2800
# If the relpath is the top of the tree, we log everything
2320
2801
if relpath == '':
2332
2813
location = revision[0].get_branch()
2333
2814
else:
2334
2815
location = '.'
2335
dir, relpath = bzrdir.BzrDir.open_containing(location)
2816
dir, relpath = controldir.ControlDir.open_containing(location)
2336
2817
b = dir.open_branch()
2337
b.lock_read()
2338
self.add_cleanup(b.unlock)
2818
self.add_cleanup(b.lock_read().unlock)
2339
2819
rev1, rev2 = _get_revision_range(revision, b, self.name())
2340
2820
2821
if b.get_config_stack().get('validate_signatures_in_log'):
2822
signatures = True
2823
2824
if signatures:
2825
if not gpg.GPGStrategy.verify_signatures_available():
2826
raise errors.GpgmeNotInstalled(None)
2827
2341
2828
# Decide on the type of delta & diff filtering to use
2342
2829
# TODO: add an --all-files option to make this configurable & consistent
2343
2830
if not verbose:
2361
2848
show_timezone=timezone,
2362
2849
delta_format=get_verbosity_level(),
2363
2850
levels=levels,
2364
show_advice=levels is None)
2851
show_advice=levels is None,
2852
author_list_handler=authors)
2365
2853
2366
2854
# Choose the algorithm for doing the logging. It's annoying
2367
2855
# having multiple code paths like this but necessary until
2379
2867
match_using_deltas = (len(file_ids) != 1 or filter_by_dir
2380
2868
or delta_type or partial_history)
2381
2869
2870
match_dict = {}
2871
if match:
2872
match_dict[''] = match
2873
if match_message:
2874
match_dict['message'] = match_message
2875
if match_committer:
2876
match_dict['committer'] = match_committer
2877
if match_author:
2878
match_dict['author'] = match_author
2879
if match_bugs:
2880
match_dict['bugs'] = match_bugs
2881
2382
2882
# Build the LogRequest and execute it
2383
2883
if len(file_ids) == 0:
2384
2884
file_ids = None
2386
2886
direction=direction, specific_fileids=file_ids,
2387
2887
start_revision=rev1, end_revision=rev2, limit=limit,
2388
2888
message_search=message, delta_type=delta_type,
2389
diff_type=diff_type, _match_using_deltas=match_using_deltas)
2889
diff_type=diff_type, _match_using_deltas=match_using_deltas,
2890
exclude_common_ancestry=exclude_common_ancestry, match=match_dict,
2891
signature=signatures, omit_merges=omit_merges,
2892
)
2390
2893
Logger(b, rqst).show(lf)
2391
2894
2392
2895
2408
2911
# b is taken from revision[0].get_branch(), and
2409
2912
# show_log will use its revision_history. Having
2410
2913
# different branches will lead to weird behaviors.
2411
raise errors.BzrCommandError(
2914
raise errors.BzrCommandError(gettext(
2412
2915
"bzr %s doesn't accept two revisions in different"
2413
" branches." % command_name)
2414
rev1 = start_spec.in_history(branch)
2916
" branches.") % command_name)
2917
if start_spec.spec is None:
2918
# Avoid loading all the history.
2919
rev1 = RevisionInfo(branch, None, None)
2920
else:
2921
rev1 = start_spec.in_history(branch)
2415
2922
# Avoid loading all of history when we know a missing
2416
2923
# end of range means the last revision ...
2417
2924
if end_spec.spec is None:
2420
2927
else:
2421
2928
rev2 = end_spec.in_history(branch)
2422
2929
else:
2423
raise errors.BzrCommandError(
2424
'bzr %s --revision takes one or two values.' % command_name)
2930
raise errors.BzrCommandError(gettext(
2931
'bzr %s --revision takes one or two values.') % command_name)
2425
2932
return rev1, rev2
2426
2933
2427
2934
2446
2953
2447
2954
2448
2955
class cmd_touching_revisions(Command):
2449
"""Return revision-ids which affected a particular file.
2956
__doc__ = """Return revision-ids which affected a particular file.
2450
2957
2451
2958
A more user-friendly interface is "bzr log FILE".
2452
2959
"""
2459
2966
tree, relpath = WorkingTree.open_containing(filename)
2460
2967
file_id = tree.path2id(relpath)
2461
2968
b = tree.branch
2462
b.lock_read()
2463
self.add_cleanup(b.unlock)
2969
self.add_cleanup(b.lock_read().unlock)
2464
2970
touching_revs = log.find_touching_revisions(b, file_id)
2465
2971
for revno, revision_id, what in touching_revs:
2466
2972
self.outf.write("%6d %s\n" % (revno, what))
2467
2973
2468
2974
2469
2975
class cmd_ls(Command):
2470
"""List files in a tree.
2976
__doc__ = """List files in a tree.
2471
2977
"""
2472
2978
2473
2979
_see_also = ['status', 'cat']
2479
2985
help='Recurse into subdirectories.'),
2480
2986
Option('from-root',
2481
2987
help='Print paths relative to the root of the branch.'),
2482
Option('unknown', help='Print unknown files.'),
2988
Option('unknown', short_name='u',
2989
help='Print unknown files.'),
2483
2990
Option('versioned', help='Print versioned files.',
2484
2991
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',
2992
Option('ignored', short_name='i',
2993
help='Print ignored files.'),
2994
Option('kind', short_name='k',
2490
2995
help='List entries of a particular kind: file, directory, symlink.',
2491
2996
type=unicode),
2997
'null',
2492
2998
'show-ids',
2999
'directory',
2493
3000
]
2494
3001
@display_command
2495
3002
def run(self, revision=None, verbose=False,
2496
3003
recursive=False, from_root=False,
2497
3004
unknown=False, versioned=False, ignored=False,
2498
null=False, kind=None, show_ids=False, path=None):
3005
null=False, kind=None, show_ids=False, path=None, directory=None):
2499
3006
2500
3007
if kind and kind not in ('file', 'directory', 'symlink'):
2501
raise errors.BzrCommandError('invalid kind specified')
3008
raise errors.BzrCommandError(gettext('invalid kind specified'))
2502
3009
2503
3010
if verbose and null:
2504
raise errors.BzrCommandError('Cannot set both --verbose and --null')
3011
raise errors.BzrCommandError(gettext('Cannot set both --verbose and --null'))
2505
3012
all = not (unknown or versioned or ignored)
2506
3013
2507
3014
selection = {'I':ignored, '?':unknown, 'V':versioned}
2510
3017
fs_path = '.'
2511
3018
else:
2512
3019
if from_root:
2513
raise errors.BzrCommandError('cannot specify both --from-root'
2514
' and PATH')
3020
raise errors.BzrCommandError(gettext('cannot specify both --from-root'
3021
' and PATH'))
2515
3022
fs_path = path
2516
tree, branch, relpath = bzrdir.BzrDir.open_containing_tree_or_branch(
2517
fs_path)
3023
tree, branch, relpath = \
3024
_open_directory_or_containing_tree_or_branch(fs_path, directory)
2518
3025
2519
3026
# Calculate the prefix to use
2520
3027
prefix = None
2533
3040
if view_files:
2534
3041
apply_view = True
2535
3042
view_str = views.view_display_str(view_files)
2536
note("Ignoring files outside view. View is %s" % view_str)
3043
note(gettext("Ignoring files outside view. View is %s") % view_str)
2537
3044
2538
tree.lock_read()
2539
self.add_cleanup(tree.unlock)
3045
self.add_cleanup(tree.lock_read().unlock)
2540
3046
for fp, fc, fkind, fid, entry in tree.list_files(include_root=False,
2541
3047
from_dir=relpath, recursive=recursive):
2542
3048
# Apply additional masking
2584
3090
2585
3091
2586
3092
class cmd_unknowns(Command):
2587
"""List unknown files.
3093
__doc__ = """List unknown files.
2588
3094
"""
2589
3095
2590
3096
hidden = True
2591
3097
_see_also = ['ls']
3098
takes_options = ['directory']
2592
3099
2593
3100
@display_command
2594
def run(self):
2595
for f in WorkingTree.open_containing(u'.')[0].unknowns():
3101
def run(self, directory=u'.'):
3102
for f in WorkingTree.open_containing(directory)[0].unknowns():
2596
3103
self.outf.write(osutils.quotefn(f) + '\n')
2597
3104
2598
3105
2599
3106
class cmd_ignore(Command):
2600
"""Ignore specified files or patterns.
3107
__doc__ = """Ignore specified files or patterns.
2601
3108
2602
3109
See ``bzr help patterns`` for details on the syntax of patterns.
2603
3110
2612
3119
using this command or directly by using an editor, be sure to commit
2613
3120
it.
2614
3121
3122
Bazaar also supports a global ignore file ~/.bazaar/ignore. On Windows
3123
the global ignore file can be found in the application data directory as
3124
C:\\Documents and Settings\\<user>\\Application Data\\Bazaar\\2.0\\ignore.
3125
Global ignores are not touched by this command. The global ignore file
3126
can be edited directly using an editor.
3127
2615
3128
Patterns prefixed with '!' are exceptions to ignore patterns and take
2616
3129
precedence over regular ignores. Such exceptions are used to specify
2617
3130
files that should be versioned which would otherwise be ignored.
2619
3132
Patterns prefixed with '!!' act as regular ignore patterns, but have
2620
3133
precedence over the '!' exception patterns.
2621
3134
2622
Note: ignore patterns containing shell wildcards must be quoted from
2623
the shell on Unix.
3135
:Notes:
3136
3137
* Ignore patterns containing shell wildcards must be quoted from
3138
the shell on Unix.
3139
3140
* Ignore patterns starting with "#" act as comments in the ignore file.
3141
To ignore patterns that begin with that character, use the "RE:" prefix.
2624
3142
2625
3143
:Examples:
2626
3144
Ignore the top level Makefile::
2635
3153
2636
3154
bzr ignore "!special.class"
2637
3155
3156
Ignore files whose name begins with the "#" character::
3157
3158
bzr ignore "RE:^#"
3159
2638
3160
Ignore .o files under the lib directory::
2639
3161
2640
3162
bzr ignore "lib/**/*.o"
2648
3170
bzr ignore "RE:(?!debian/).*"
2649
3171
2650
3172
Ignore everything except the "local" toplevel directory,
2651
but always ignore "*~" autosave files, even under local/::
3173
but always ignore autosave files ending in ~, even under local/::
2652
3174
2653
3175
bzr ignore "*"
2654
3176
bzr ignore "!./local"
2657
3179
2658
3180
_see_also = ['status', 'ignored', 'patterns']
2659
3181
takes_args = ['name_pattern*']
2660
takes_options = [
2661
Option('old-default-rules',
2662
help='Write out the ignore rules bzr < 0.9 always used.')
3182
takes_options = ['directory',
3183
Option('default-rules',
3184
help='Display the default ignore rules that bzr uses.')
2663
3185
]
2664
3186
2665
def run(self, name_pattern_list=None, old_default_rules=None):
3187
def run(self, name_pattern_list=None, default_rules=None,
3188
directory=u'.'):
2666
3189
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
3190
if default_rules is not None:
3191
# dump the default rules and exit
3192
for pattern in ignores.USER_DEFAULTS:
3193
self.outf.write("%s\n" % pattern)
2671
3194
return
2672
3195
if not name_pattern_list:
2673
raise errors.BzrCommandError("ignore requires at least one "
2674
"NAME_PATTERN or --old-default-rules")
3196
raise errors.BzrCommandError(gettext("ignore requires at least one "
3197
"NAME_PATTERN or --default-rules."))
2675
3198
name_pattern_list = [globbing.normalize_pattern(p)
2676
3199
for p in name_pattern_list]
3200
bad_patterns = ''
3201
bad_patterns_count = 0
3202
for p in name_pattern_list:
3203
if not globbing.Globster.is_pattern_valid(p):
3204
bad_patterns_count += 1
3205
bad_patterns += ('\n %s' % p)
3206
if bad_patterns:
3207
msg = (ngettext('Invalid ignore pattern found. %s',
3208
'Invalid ignore patterns found. %s',
3209
bad_patterns_count) % bad_patterns)
3210
ui.ui_factory.show_error(msg)
3211
raise errors.InvalidPattern('')
2677
3212
for name_pattern in name_pattern_list:
2678
3213
if (name_pattern[0] == '/' or
2679
3214
(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'.')
3215
raise errors.BzrCommandError(gettext(
3216
"NAME_PATTERN should not be an absolute path"))
3217
tree, relpath = WorkingTree.open_containing(directory)
2683
3218
ignores.tree_ignores_add_patterns(tree, name_pattern_list)
2684
3219
ignored = globbing.Globster(name_pattern_list)
2685
3220
matches = []
2686
tree.lock_read()
3221
self.add_cleanup(tree.lock_read().unlock)
2687
3222
for entry in tree.list_files():
2688
3223
id = entry[3]
2689
3224
if id is not None:
2690
3225
filename = entry[0]
2691
3226
if ignored.match(filename):
2692
matches.append(filename.encode('utf-8'))
2693
tree.unlock()
3227
matches.append(filename)
2694
3228
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),)
3229
self.outf.write(gettext("Warning: the following files are version "
3230
"controlled and match your ignore pattern:\n%s"
3231
"\nThese files will continue to be version controlled"
3232
" unless you 'bzr remove' them.\n") % ("\n".join(matches),))
2699
3233
2700
3234
2701
3235
class cmd_ignored(Command):
2702
"""List ignored files and the patterns that matched them.
3236
__doc__ = """List ignored files and the patterns that matched them.
2703
3237
2704
3238
List all the ignored files and the ignore pattern that caused the file to
2705
3239
be ignored.
2711
3245
2712
3246
encoding_type = 'replace'
2713
3247
_see_also = ['ignore', 'ls']
3248
takes_options = ['directory']
2714
3249
2715
3250
@display_command
2716
def run(self):
2717
tree = WorkingTree.open_containing(u'.')[0]
2718
tree.lock_read()
2719
self.add_cleanup(tree.unlock)
3251
def run(self, directory=u'.'):
3252
tree = WorkingTree.open_containing(directory)[0]
3253
self.add_cleanup(tree.lock_read().unlock)
2720
3254
for path, file_class, kind, file_id, entry in tree.list_files():
2721
3255
if file_class != 'I':
2722
3256
continue
2726
3260
2727
3261
2728
3262
class cmd_lookup_revision(Command):
2729
"""Lookup the revision-id from a revision-number
3263
__doc__ = """Lookup the revision-id from a revision-number
2730
3264
2731
3265
:Examples:
2732
3266
bzr lookup-revision 33
2733
3267
"""
2734
3268
hidden = True
2735
3269
takes_args = ['revno']
3270
takes_options = ['directory']
2736
3271
2737
3272
@display_command
2738
def run(self, revno):
3273
def run(self, revno, directory=u'.'):
2739
3274
try:
2740
3275
revno = int(revno)
2741
3276
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)
3277
raise errors.BzrCommandError(gettext("not a valid revision-number: %r")
3278
% revno)
3279
revid = WorkingTree.open_containing(directory)[0].branch.get_rev_id(revno)
3280
self.outf.write("%s\n" % revid)
2745
3281
2746
3282
2747
3283
class cmd_export(Command):
2748
"""Export current or past revision to a destination directory or archive.
3284
__doc__ = """Export current or past revision to a destination directory or archive.
2749
3285
2750
3286
If no revision is specified this exports the last committed revision.
2751
3287
2772
3308
zip .zip
2773
3309
================= =========================
2774
3310
"""
3311
encoding = 'exact'
2775
3312
takes_args = ['dest', 'branch_or_subdir?']
2776
takes_options = [
3313
takes_options = ['directory',
2777
3314
Option('format',
2778
3315
help="Type of file to export to.",
2779
3316
type=unicode),
2783
3320
Option('root',
2784
3321
type=str,
2785
3322
help="Name of the root directory inside the exported file."),
3323
Option('per-file-timestamps',
3324
help='Set modification time of files to that of the last '
3325
'revision in which it was changed.'),
3326
Option('uncommitted',
3327
help='Export the working tree contents rather than that of the '
3328
'last revision.'),
2786
3329
]
2787
3330
def run(self, dest, branch_or_subdir=None, revision=None, format=None,
2788
root=None, filters=False):
3331
root=None, filters=False, per_file_timestamps=False, uncommitted=False,
3332
directory=u'.'):
2789
3333
from bzrlib.export import export
2790
3334
2791
3335
if branch_or_subdir is None:
2792
tree = WorkingTree.open_containing(u'.')[0]
2793
b = tree.branch
2794
subdir = None
3336
branch_or_subdir = directory
3337
3338
(tree, b, subdir) = controldir.ControlDir.open_containing_tree_or_branch(
3339
branch_or_subdir)
3340
if tree is not None:
3341
self.add_cleanup(tree.lock_read().unlock)
3342
3343
if uncommitted:
3344
if tree is None:
3345
raise errors.BzrCommandError(
3346
gettext("--uncommitted requires a working tree"))
3347
export_tree = tree
2795
3348
else:
2796
b, subdir = Branch.open_containing(branch_or_subdir)
2797
tree = None
2798
2799
rev_tree = _get_one_revision_tree('export', revision, branch=b, tree=tree)
3349
export_tree = _get_one_revision_tree('export', revision, branch=b, tree=tree)
2800
3350
try:
2801
export(rev_tree, dest, format, root, subdir, filtered=filters)
3351
export(export_tree, dest, format, root, subdir, filtered=filters,
3352
per_file_timestamps=per_file_timestamps)
2802
3353
except errors.NoSuchExportFormat, e:
2803
raise errors.BzrCommandError('Unsupported export format: %s' % e.format)
3354
raise errors.BzrCommandError(
3355
gettext('Unsupported export format: %s') % e.format)
2804
3356
2805
3357
2806
3358
class cmd_cat(Command):
2807
"""Write the contents of a file as of a given revision to standard output.
3359
__doc__ = """Write the contents of a file as of a given revision to standard output.
2808
3360
2809
3361
If no revision is nominated, the last revision is used.
2810
3362
2813
3365
"""
2814
3366
2815
3367
_see_also = ['ls']
2816
takes_options = [
3368
takes_options = ['directory',
2817
3369
Option('name-from-revision', help='The path name in the old tree.'),
2818
3370
Option('filters', help='Apply content filters to display the '
2819
3371
'convenience form.'),
2824
3376
2825
3377
@display_command
2826
3378
def run(self, filename, revision=None, name_from_revision=False,
2827
filters=False):
3379
filters=False, directory=None):
2828
3380
if revision is not None and len(revision) != 1:
2829
raise errors.BzrCommandError("bzr cat --revision takes exactly"
2830
" one revision specifier")
3381
raise errors.BzrCommandError(gettext("bzr cat --revision takes exactly"
3382
" one revision specifier"))
2831
3383
tree, branch, relpath = \
2832
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
2833
branch.lock_read()
2834
self.add_cleanup(branch.unlock)
3384
_open_directory_or_containing_tree_or_branch(filename, directory)
3385
self.add_cleanup(branch.lock_read().unlock)
2835
3386
return self._run(tree, branch, relpath, filename, revision,
2836
3387
name_from_revision, filters)
2837
3388
2840
3391
if tree is None:
2841
3392
tree = b.basis_tree()
2842
3393
rev_tree = _get_one_revision_tree('cat', revision, branch=b)
2843
rev_tree.lock_read()
2844
self.add_cleanup(rev_tree.unlock)
3394
self.add_cleanup(rev_tree.lock_read().unlock)
2845
3395
2846
3396
old_file_id = rev_tree.path2id(relpath)
2847
3397
3398
# TODO: Split out this code to something that generically finds the
3399
# best id for a path across one or more trees; it's like
3400
# find_ids_across_trees but restricted to find just one. -- mbp
3401
# 20110705.
2848
3402
if name_from_revision:
2849
3403
# Try in revision if requested
2850
3404
if old_file_id is None:
2851
raise errors.BzrCommandError(
2852
"%r is not present in revision %s" % (
3405
raise errors.BzrCommandError(gettext(
3406
"{0!r} is not present in revision {1}").format(
2853
3407
filename, rev_tree.get_revision_id()))
2854
3408
else:
2855
content = rev_tree.get_file_text(old_file_id)
3409
actual_file_id = old_file_id
2856
3410
else:
2857
3411
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" % (
3412
if cur_file_id is not None and rev_tree.has_id(cur_file_id):
3413
actual_file_id = cur_file_id
3414
elif old_file_id is not None:
3415
actual_file_id = old_file_id
3416
else:
3417
raise errors.BzrCommandError(gettext(
3418
"{0!r} is not present in revision {1}").format(
2875
3419
filename, rev_tree.get_revision_id()))
2876
3420
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)
3421
from bzrlib.filter_tree import ContentFilterTree
3422
filter_tree = ContentFilterTree(rev_tree,
3423
rev_tree._content_filter_stack)
3424
content = filter_tree.get_file_text(actual_file_id)
2887
3425
else:
2888
self.cleanup_now()
2889
self.outf.write(content)
3426
content = rev_tree.get_file_text(actual_file_id)
3427
self.cleanup_now()
3428
self.outf.write(content)
2890
3429
2891
3430
2892
3431
class cmd_local_time_offset(Command):
2893
"""Show the offset in seconds from GMT to local time."""
3432
__doc__ = """Show the offset in seconds from GMT to local time."""
2894
3433
hidden = True
2895
3434
@display_command
2896
3435
def run(self):
2897
print osutils.local_time_offset()
3436
self.outf.write("%s\n" % osutils.local_time_offset())
2898
3437
2899
3438
2900
3439
2901
3440
class cmd_commit(Command):
2902
"""Commit changes into a new revision.
3441
__doc__ = """Commit changes into a new revision.
2903
3442
2904
3443
An explanatory message needs to be given for each commit. This is
2905
3444
often done by using the --message option (getting the message from the
2953
3492
to trigger updates to external systems like bug trackers. The --fixes
2954
3493
option can be used to record the association between a revision and
2955
3494
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
3495
"""
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
3496
2983
3497
_see_also = ['add', 'bugs', 'hooks', 'uncommit']
2984
3498
takes_args = ['selected*']
3013
3527
"the master branch until a normal commit "
3014
3528
"is performed."
3015
3529
),
3016
Option('show-diff',
3530
Option('show-diff', short_name='p',
3017
3531
help='When no message is supplied, show the diff along'
3018
3532
' with the status summary in the message editor.'),
3533
Option('lossy',
3534
help='When committing to a foreign version control '
3535
'system do not push data that can not be natively '
3536
'represented.'),
3019
3537
]
3020
3538
aliases = ['ci', 'checkin']
3021
3539
3022
3540
def _iter_bug_fix_urls(self, fixes, branch):
3541
default_bugtracker = None
3023
3542
# Configure the properties for bug fixing attributes.
3024
3543
for fixed_bug in fixes:
3025
3544
tokens = fixed_bug.split(':')
3026
if len(tokens) != 2:
3027
raise errors.BzrCommandError(
3545
if len(tokens) == 1:
3546
if default_bugtracker is None:
3547
branch_config = branch.get_config_stack()
3548
default_bugtracker = branch_config.get(
3549
"bugtracker")
3550
if default_bugtracker is None:
3551
raise errors.BzrCommandError(gettext(
3552
"No tracker specified for bug %s. Use the form "
3553
"'tracker:id' or specify a default bug tracker "
3554
"using the `bugtracker` option.\nSee "
3555
"\"bzr help bugs\" for more information on this "
3556
"feature. Commit refused.") % fixed_bug)
3557
tag = default_bugtracker
3558
bug_id = tokens[0]
3559
elif len(tokens) != 2:
3560
raise errors.BzrCommandError(gettext(
3028
3561
"Invalid bug %s. Must be in the form of 'tracker:id'. "
3029
3562
"See \"bzr help bugs\" for more information on this "
3030
"feature.\nCommit refused." % fixed_bug)
3031
tag, bug_id = tokens
3563
"feature.\nCommit refused.") % fixed_bug)
3564
else:
3565
tag, bug_id = tokens
3032
3566
try:
3033
3567
yield bugtracker.get_bug_url(tag, branch, bug_id)
3034
3568
except errors.UnknownBugTrackerAbbreviation:
3035
raise errors.BzrCommandError(
3036
'Unrecognized bug %s. Commit refused.' % fixed_bug)
3569
raise errors.BzrCommandError(gettext(
3570
'Unrecognized bug %s. Commit refused.') % fixed_bug)
3037
3571
except errors.MalformedBugIdentifier, e:
3038
raise errors.BzrCommandError(
3039
"%s\nCommit refused." % (str(e),))
3572
raise errors.BzrCommandError(gettext(
3573
"%s\nCommit refused.") % (str(e),))
3040
3574
3041
3575
def run(self, message=None, file=None, verbose=False, selected_list=None,
3042
3576
unchanged=False, strict=False, local=False, fixes=None,
3043
author=None, show_diff=False, exclude=None, commit_time=None):
3577
author=None, show_diff=False, exclude=None, commit_time=None,
3578
lossy=False):
3044
3579
from bzrlib.errors import (
3045
3580
PointlessCommit,
3046
3581
ConflictsInTree,
3049
3584
from bzrlib.msgeditor import (
3050
3585
edit_commit_message_encoded,
3051
3586
generate_commit_message_template,
3052
make_commit_message_template_encoded
3587
make_commit_message_template_encoded,
3588
set_commit_message,
3053
3589
)
3054
3590
3055
3591
commit_stamp = offset = None
3057
3593
try:
3058
3594
commit_stamp, offset = timestamp.parse_patch_date(commit_time)
3059
3595
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.
3596
raise errors.BzrCommandError(gettext(
3597
"Could not parse --commit-time: " + str(e)))
3068
3598
3069
3599
properties = {}
3070
3600
3071
tree, selected_list = tree_files(selected_list)
3601
tree, selected_list = WorkingTree.open_containing_paths(selected_list)
3072
3602
if selected_list == ['']:
3073
3603
# workaround - commit of root of tree should be exactly the same
3074
3604
# as just default commit in that tree, and succeed even though
3099
3629
'(use --file "%(f)s" to take commit message from that file)'
3100
3630
% { 'f': message })
3101
3631
ui.ui_factory.show_warning(warning_msg)
3632
if '\r' in message:
3633
message = message.replace('\r\n', '\n')
3634
message = message.replace('\r', '\n')
3635
if file:
3636
raise errors.BzrCommandError(gettext(
3637
"please specify either --message or --file"))
3102
3638
3103
3639
def get_message(commit_obj):
3104
3640
"""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,
3641
if file:
3642
f = open(file)
3643
try:
3644
my_message = f.read().decode(osutils.get_user_encoding())
3645
finally:
3646
f.close()
3647
elif message is not None:
3648
my_message = message
3649
else:
3650
# No message supplied: make one up.
3651
# text is the status of the tree
3652
text = make_commit_message_template_encoded(tree,
3111
3653
selected_list, diff=show_diff,
3112
3654
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")
3655
# start_message is the template generated from hooks
3656
# XXX: Warning - looks like hooks return unicode,
3657
# make_commit_message_template_encoded returns user encoding.
3658
# We probably want to be using edit_commit_message instead to
3659
# avoid this.
3660
my_message = set_commit_message(commit_obj)
3661
if my_message is None:
3662
start_message = generate_commit_message_template(commit_obj)
3663
my_message = edit_commit_message_encoded(text,
3664
start_message=start_message)
3665
if my_message is None:
3666
raise errors.BzrCommandError(gettext("please specify a commit"
3667
" message with either --message or --file"))
3668
if my_message == "":
3669
raise errors.BzrCommandError(gettext("Empty commit message specified."
3670
" Please specify a commit message with either"
3671
" --message or --file or leave a blank message"
3672
" with --message \"\"."))
3127
3673
return my_message
3128
3674
3129
3675
# The API permits a commit with a filter of [] to mean 'select nothing'
3137
3683
reporter=None, verbose=verbose, revprops=properties,
3138
3684
authors=author, timestamp=commit_stamp,
3139
3685
timezone=offset,
3140
exclude=safe_relpath_files(tree, exclude))
3686
exclude=tree.safe_relpath_files(exclude),
3687
lossy=lossy)
3141
3688
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.")
3689
raise errors.BzrCommandError(gettext("No changes to commit."
3690
" Please 'bzr add' the files you want to commit, or use"
3691
" --unchanged to force an empty commit."))
3146
3692
except ConflictsInTree:
3147
raise errors.BzrCommandError('Conflicts detected in working '
3693
raise errors.BzrCommandError(gettext('Conflicts detected in working '
3148
3694
'tree. Use "bzr conflicts" to list, "bzr resolve FILE" to'
3149
' resolve.')
3695
' resolve.'))
3150
3696
except StrictCommitFailed:
3151
raise errors.BzrCommandError("Commit refused because there are"
3152
" unknown files in the working tree.")
3697
raise errors.BzrCommandError(gettext("Commit refused because there are"
3698
" unknown files in the working tree."))
3153
3699
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.')
3700
e.extra_help = (gettext("\n"
3701
'To commit to master branch, run update and then commit.\n'
3702
'You can also pass --local to commit to continue working '
3703
'disconnected.'))
3704
raise
3158
3705
3159
3706
3160
3707
class cmd_check(Command):
3161
"""Validate working tree structure, branch consistency and repository history.
3708
__doc__ = """Validate working tree structure, branch consistency and repository history.
3162
3709
3163
3710
This command checks various invariants about branch and repository storage
3164
3711
to detect data corruption or bzr bugs.
3228
3775
3229
3776
3230
3777
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.
3778
__doc__ = """Upgrade a repository, branch or working tree to a newer format.
3779
3780
When the default format has changed after a major new release of
3781
Bazaar, you may be informed during certain operations that you
3782
should upgrade. Upgrading to a newer format may improve performance
3783
or make new features available. It may however limit interoperability
3784
with older repositories or with older versions of Bazaar.
3785
3786
If you wish to upgrade to a particular format rather than the
3787
current default, that can be specified using the --format option.
3788
As a consequence, you can use the upgrade command this way to
3789
"downgrade" to an earlier format, though some conversions are
3790
a one way process (e.g. changing from the 1.x default to the
3791
2.x default) so downgrading is not always possible.
3792
3793
A backup.bzr.~#~ directory is created at the start of the conversion
3794
process (where # is a number). By default, this is left there on
3795
completion. If the conversion fails, delete the new .bzr directory
3796
and rename this one back in its place. Use the --clean option to ask
3797
for the backup.bzr directory to be removed on successful conversion.
3798
Alternatively, you can delete it by hand if everything looks good
3799
afterwards.
3800
3801
If the location given is a shared repository, dependent branches
3802
are also converted provided the repository converts successfully.
3803
If the conversion of a branch fails, remaining branches are still
3804
tried.
3805
3806
For more information on upgrades, see the Bazaar Upgrade Guide,
3807
http://doc.bazaar.canonical.com/latest/en/upgrade-guide/.
3236
3808
"""
3237
3809
3238
_see_also = ['check']
3810
_see_also = ['check', 'reconcile', 'formats']
3239
3811
takes_args = ['url?']
3240
3812
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
]
3813
RegistryOption('format',
3814
help='Upgrade to a specific format. See "bzr help'
3815
' formats" for details.',
3816
lazy_registry=('bzrlib.controldir', 'format_registry'),
3817
converter=lambda name: controldir.format_registry.make_bzrdir(name),
3818
value_switches=True, title='Branch format'),
3819
Option('clean',
3820
help='Remove the backup.bzr directory if successful.'),
3821
Option('dry-run',
3822
help="Show what would be done, but don't actually do anything."),
3823
]
3248
3824
3249
def run(self, url='.', format=None):
3825
def run(self, url='.', format=None, clean=False, dry_run=False):
3250
3826
from bzrlib.upgrade import upgrade
3251
upgrade(url, format)
3827
exceptions = upgrade(url, format, clean_up=clean, dry_run=dry_run)
3828
if exceptions:
3829
if len(exceptions) == 1:
3830
# Compatibility with historical behavior
3831
raise exceptions[0]
3832
else:
3833
return 3
3252
3834
3253
3835
3254
3836
class cmd_whoami(Command):
3255
"""Show or set bzr user id.
3837
__doc__ = """Show or set bzr user id.
3256
3838
3257
3839
:Examples:
3258
3840
Show the email of the current user::
3263
3845
3264
3846
bzr whoami "Frank Chu <fchu@example.com>"
3265
3847
"""
3266
takes_options = [ Option('email',
3848
takes_options = [ 'directory',
3849
Option('email',
3267
3850
help='Display email address only.'),
3268
3851
Option('branch',
3269
3852
help='Set identity for the current branch instead of '
3273
3856
encoding_type = 'replace'
3274
3857
3275
3858
@display_command
3276
def run(self, email=False, branch=False, name=None):
3859
def run(self, email=False, branch=False, name=None, directory=None):
3277
3860
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()
3861
if directory is None:
3862
# use branch if we're inside one; otherwise global config
3863
try:
3864
c = Branch.open_containing(u'.')[0].get_config_stack()
3865
except errors.NotBranchError:
3866
c = _mod_config.GlobalStack()
3867
else:
3868
c = Branch.open(directory).get_config_stack()
3869
identity = c.get('email')
3283
3870
if email:
3284
self.outf.write(c.user_email() + '\n')
3871
self.outf.write(_mod_config.extract_email_address(identity)
3872
+ '\n')
3285
3873
else:
3286
self.outf.write(c.username() + '\n')
3874
self.outf.write(identity + '\n')
3287
3875
return
3288
3876
3877
if email:
3878
raise errors.BzrCommandError(gettext("--email can only be used to display existing "
3879
"identity"))
3880
3289
3881
# display a warning if an email address isn't included in the given name.
3290
3882
try:
3291
config.extract_email_address(name)
3883
_mod_config.extract_email_address(name)
3292
3884
except errors.NoEmailInUsername, e:
3293
3885
warning('"%s" does not seem to contain an email address. '
3294
3886
'This is allowed, but not recommended.', name)
3295
3887
3296
3888
# use global config unless --branch given
3297
3889
if branch:
3298
c = Branch.open_containing('.')[0].get_config()
3890
if directory is None:
3891
c = Branch.open_containing(u'.')[0].get_config_stack()
3892
else:
3893
b = Branch.open(directory)
3894
self.add_cleanup(b.lock_write().unlock)
3895
c = b.get_config_stack()
3299
3896
else:
3300
c = config.GlobalConfig()
3301
c.set_user_option('email', name)
3897
c = _mod_config.GlobalStack()
3898
c.set('email', name)
3302
3899
3303
3900
3304
3901
class cmd_nick(Command):
3305
"""Print or set the branch nickname.
3902
__doc__ = """Print or set the branch nickname.
3306
3903
3307
If unset, the tree root directory name is used as the nickname.
3308
To print the current nickname, execute with no argument.
3904
If unset, the colocated branch name is used for colocated branches, and
3905
the branch directory name is used for other branches. To print the
3906
current nickname, execute with no argument.
3309
3907
3310
3908
Bound branches use the nickname of its master branch unless it is set
3311
3909
locally.
3313
3911
3314
3912
_see_also = ['info']
3315
3913
takes_args = ['nickname?']
3316
def run(self, nickname=None):
3317
branch = Branch.open_containing(u'.')[0]
3914
takes_options = ['directory']
3915
def run(self, nickname=None, directory=u'.'):
3916
branch = Branch.open_containing(directory)[0]
3318
3917
if nickname is None:
3319
3918
self.printme(branch)
3320
3919
else:
3322
3921
3323
3922
@display_command
3324
3923
def printme(self, branch):
3325
print branch.nick
3924
self.outf.write('%s\n' % branch.nick)
3326
3925
3327
3926
3328
3927
class cmd_alias(Command):
3329
"""Set/unset and display aliases.
3928
__doc__ = """Set/unset and display aliases.
3330
3929
3331
3930
:Examples:
3332
3931
Show the current aliases::
3365
3964
3366
3965
def remove_alias(self, alias_name):
3367
3966
if alias_name is None:
3368
raise errors.BzrCommandError(
3369
'bzr alias --remove expects an alias to remove.')
3967
raise errors.BzrCommandError(gettext(
3968
'bzr alias --remove expects an alias to remove.'))
3370
3969
# If alias is not found, print something like:
3371
3970
# unalias: foo: not found
3372
c = config.GlobalConfig()
3971
c = _mod_config.GlobalConfig()
3373
3972
c.unset_alias(alias_name)
3374
3973
3375
3974
@display_command
3376
3975
def print_aliases(self):
3377
3976
"""Print out the defined aliases in a similar format to bash."""
3378
aliases = config.GlobalConfig().get_aliases()
3977
aliases = _mod_config.GlobalConfig().get_aliases()
3379
3978
for key, value in sorted(aliases.iteritems()):
3380
3979
self.outf.write('bzr alias %s="%s"\n' % (key, value))
3381
3980
3391
3990
3392
3991
def set_alias(self, alias_name, alias_command):
3393
3992
"""Save the alias in the global config."""
3394
c = config.GlobalConfig()
3993
c = _mod_config.GlobalConfig()
3395
3994
c.set_alias(alias_name, alias_command)
3396
3995
3397
3996
3398
3997
class cmd_selftest(Command):
3399
"""Run internal test suite.
3998
__doc__ = """Run internal test suite.
3400
3999
3401
4000
If arguments are given, they are regular expressions that say which tests
3402
4001
should run. Tests matching any expression are run, and other tests are
3432
4031
If you set BZR_TEST_PDB=1 when running selftest, failing tests will drop
3433
4032
into a pdb postmortem session.
3434
4033
4034
The --coverage=DIRNAME global option produces a report with covered code
4035
indicated.
4036
3435
4037
:Examples:
3436
4038
Run only tests relating to 'ignore'::
3437
4039
3448
4050
if typestring == "sftp":
3449
4051
from bzrlib.tests import stub_sftp
3450
4052
return stub_sftp.SFTPAbsoluteServer
3451
if typestring == "memory":
4053
elif typestring == "memory":
3452
4054
from bzrlib.tests import test_server
3453
4055
return memory.MemoryServer
3454
if typestring == "fakenfs":
4056
elif typestring == "fakenfs":
3455
4057
from bzrlib.tests import test_server
3456
4058
return test_server.FakeNFSServer
3457
4059
msg = "No known transport type %s. Supported types are: sftp\n" %\
3470
4072
'throughout the test suite.',
3471
4073
type=get_transport_type),
3472
4074
Option('benchmark',
3473
help='Run the benchmarks rather than selftests.'),
4075
help='Run the benchmarks rather than selftests.',
4076
hidden=True),
3474
4077
Option('lsprof-timed',
3475
4078
help='Generate lsprof output for benchmarked'
3476
4079
' sections of code.'),
3477
4080
Option('lsprof-tests',
3478
4081
help='Generate lsprof output for each test.'),
3479
Option('cache-dir', type=str,
3480
help='Cache intermediate benchmark output in this '
3481
'directory.'),
3482
4082
Option('first',
3483
4083
help='Run all tests, but run specified tests first.',
3484
4084
short_name='f',
3493
4093
Option('randomize', type=str, argname="SEED",
3494
4094
help='Randomize the order of tests using the given'
3495
4095
' 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.'),
4096
ListOption('exclude', type=str, argname="PATTERN",
4097
short_name='x',
4098
help='Exclude tests that match this regular'
4099
' expression.'),
3500
4100
Option('subunit',
3501
4101
help='Output test progress via subunit.'),
3502
4102
Option('strict', help='Fail on missing dependencies or '
3509
4109
param_name='starting_with', short_name='s',
3510
4110
help=
3511
4111
'Load only the tests starting with TESTID.'),
4112
Option('sync',
4113
help="By default we disable fsync and fdatasync"
4114
" while running the test suite.")
3512
4115
]
3513
4116
encoding_type = 'replace'
3514
4117
3518
4121
3519
4122
def run(self, testspecs_list=None, verbose=False, one=False,
3520
4123
transport=None, benchmark=None,
3521
lsprof_timed=None, cache_dir=None,
4124
lsprof_timed=None,
3522
4125
first=False, list_only=False,
3523
4126
randomize=None, exclude=None, strict=False,
3524
4127
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)
4128
parallel=None, lsprof_tests=False,
4129
sync=False):
4130
4131
# During selftest, disallow proxying, as it can cause severe
4132
# performance penalties and is only needed for thread
4133
# safety. The selftest command is assumed to not use threads
4134
# too heavily. The call should be as early as possible, as
4135
# error reporting for past duplicate imports won't have useful
4136
# backtraces.
4137
lazy_import.disallow_proxying()
4138
4139
from bzrlib import tests
4140
3535
4141
if testspecs_list is not None:
3536
4142
pattern = '|'.join(testspecs_list)
3537
4143
else:
3540
4146
try:
3541
4147
from bzrlib.tests import SubUnitBzrRunner
3542
4148
except ImportError:
3543
raise errors.BzrCommandError("subunit not available. subunit "
3544
"needs to be installed to use --subunit.")
4149
raise errors.BzrCommandError(gettext("subunit not available. subunit "
4150
"needs to be installed to use --subunit."))
3545
4151
self.additional_selftest_args['runner_class'] = SubUnitBzrRunner
4152
# On Windows, disable automatic conversion of '\n' to '\r\n' in
4153
# stdout, which would corrupt the subunit stream.
4154
# FIXME: This has been fixed in subunit trunk (>0.0.5) so the
4155
# following code can be deleted when it's sufficiently deployed
4156
# -- vila/mgz 20100514
4157
if (sys.platform == "win32"
4158
and getattr(sys.stdout, 'fileno', None) is not None):
4159
import msvcrt
4160
msvcrt.setmode(sys.stdout.fileno(), os.O_BINARY)
3546
4161
if parallel:
3547
4162
self.additional_selftest_args.setdefault(
3548
4163
'suite_decorators', []).append(parallel)
3549
4164
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)
4165
raise errors.BzrCommandError(gettext(
4166
"--benchmark is no longer supported from bzr 2.2; "
4167
"use bzr-usertest instead"))
4168
test_suite_factory = None
4169
if not exclude:
4170
exclude_pattern = None
3556
4171
else:
3557
test_suite_factory = None
3558
benchfile = None
4172
exclude_pattern = '(' + '|'.join(exclude) + ')'
4173
if not sync:
4174
self._disable_fsync()
3559
4175
selftest_kwargs = {"verbose": verbose,
3560
4176
"pattern": pattern,
3561
4177
"stop_on_failure": one,
3563
4179
"test_suite_factory": test_suite_factory,
3564
4180
"lsprof_timed": lsprof_timed,
3565
4181
"lsprof_tests": lsprof_tests,
3566
"bench_history": benchfile,
3567
4182
"matching_tests_first": first,
3568
4183
"list_only": list_only,
3569
4184
"random_seed": randomize,
3570
"exclude_pattern": exclude,
4185
"exclude_pattern": exclude_pattern,
3571
4186
"strict": strict,
3572
4187
"load_list": load_list,
3573
4188
"debug_flags": debugflag,
3574
4189
"starting_with": starting_with
3575
4190
}
3576
4191
selftest_kwargs.update(self.additional_selftest_args)
3577
result = selftest(**selftest_kwargs)
4192
4193
# Make deprecation warnings visible, unless -Werror is set
4194
cleanup = symbol_versioning.activate_deprecation_warnings(
4195
override=False)
4196
try:
4197
result = tests.selftest(**selftest_kwargs)
4198
finally:
4199
cleanup()
3578
4200
return int(not result)
3579
4201
4202
def _disable_fsync(self):
4203
"""Change the 'os' functionality to not synchronize."""
4204
self._orig_fsync = getattr(os, 'fsync', None)
4205
if self._orig_fsync is not None:
4206
os.fsync = lambda filedes: None
4207
self._orig_fdatasync = getattr(os, 'fdatasync', None)
4208
if self._orig_fdatasync is not None:
4209
os.fdatasync = lambda filedes: None
4210
3580
4211
3581
4212
class cmd_version(Command):
3582
"""Show version of bzr."""
4213
__doc__ = """Show version of bzr."""
3583
4214
3584
4215
encoding_type = 'replace'
3585
4216
takes_options = [
3596
4227
3597
4228
3598
4229
class cmd_rocks(Command):
3599
"""Statement of optimism."""
4230
__doc__ = """Statement of optimism."""
3600
4231
3601
4232
hidden = True
3602
4233
3603
4234
@display_command
3604
4235
def run(self):
3605
print "It sure does!"
4236
self.outf.write(gettext("It sure does!\n"))
3606
4237
3607
4238
3608
4239
class cmd_find_merge_base(Command):
3609
"""Find and print a base revision for merging two branches."""
4240
__doc__ = """Find and print a base revision for merging two branches."""
3610
4241
# TODO: Options to specify revisions on either side, as if
3611
4242
# merging only part of the history.
3612
4243
takes_args = ['branch', 'other']
3618
4249
3619
4250
branch1 = Branch.open_containing(branch)[0]
3620
4251
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)
4252
self.add_cleanup(branch1.lock_read().unlock)
4253
self.add_cleanup(branch2.lock_read().unlock)
3625
4254
last1 = ensure_null(branch1.last_revision())
3626
4255
last2 = ensure_null(branch2.last_revision())
3627
4256
3628
4257
graph = branch1.repository.get_graph(branch2.repository)
3629
4258
base_rev_id = graph.find_unique_lca(last1, last2)
3630
4259
3631
print 'merge base is revision %s' % base_rev_id
4260
self.outf.write(gettext('merge base is revision %s\n') % base_rev_id)
3632
4261
3633
4262
3634
4263
class cmd_merge(Command):
3635
"""Perform a three-way merge.
4264
__doc__ = """Perform a three-way merge.
3636
4265
3637
4266
The source of the merge can be specified either in the form of a branch,
3638
4267
or in the form of a path to a file containing a merge directive generated
3639
4268
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.
4269
or the branch most recently merged using --remember. The source of the
4270
merge may also be specified in the form of a path to a file in another
4271
branch: in this case, only the modifications to that file are merged into
4272
the current working tree.
4273
4274
When merging from a branch, by default bzr will try to merge in all new
4275
work from the other branch, automatically determining an appropriate base
4276
revision. If this fails, you may need to give an explicit base.
4277
4278
To pick a different ending revision, pass "--revision OTHER". bzr will
4279
try to merge in all new work up to and including revision OTHER.
4280
4281
If you specify two values, "--revision BASE..OTHER", only revisions BASE
4282
through OTHER, excluding BASE but including OTHER, will be merged. If this
4283
causes some revisions to be skipped, i.e. if the destination branch does
4284
not already contain revision BASE, such a merge is commonly referred to as
4285
a "cherrypick". Unlike a normal merge, Bazaar does not currently track
4286
cherrypicks. The changes look like a normal commit, and the history of the
4287
changes from the other branch is not stored in the commit.
4288
4289
Revision numbers are always relative to the source branch.
3652
4290
3653
4291
Merge will do its best to combine the changes in two branches, but there
3654
4292
are some kinds of problems only a human can fix. When it encounters those,
3655
4293
it will mark a conflict. A conflict means that you need to fix something,
3656
before you should commit.
4294
before you can commit.
3657
4295
3658
4296
Use bzr resolve when you have fixed a problem. See also bzr conflicts.
3659
4297
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.
4298
If there is no default branch set, the first merge will set it (use
4299
--no-remember to avoid setting it). After that, you can omit the branch
4300
to use the default. To change the default, use --remember. The value will
4301
only be saved if the remote location can be accessed.
3664
4302
3665
4303
The results of the merge are placed into the destination working
3666
4304
directory, where they can be reviewed (with bzr diff), tested, and then
3667
4305
committed to record the result of the merge.
3668
4306
3669
4307
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
4308
--force is given. If --force is given, then the changes from the source
4309
will be merged with the current working tree, including any uncommitted
4310
changes in the tree. The --force option can also be used to create a
3671
4311
merge revision which has more than two parents.
3672
4312
3673
4313
If one would like to merge changes from the working tree of the other
3678
4318
you to apply each diff hunk and file change, similar to "shelve".
3679
4319
3680
4320
:Examples:
3681
To merge the latest revision from bzr.dev::
4321
To merge all new revisions from bzr.dev::
3682
4322
3683
4323
bzr merge ../bzr.dev
3684
4324
3721
4361
' completely merged into the source, pull from the'
3722
4362
' source rather than merging. When this happens,'
3723
4363
' you do not need to commit the result.'),
3724
Option('directory',
4364
custom_help('directory',
3725
4365
help='Branch to merge into, '
3726
'rather than the one containing the working directory.',
3727
short_name='d',
3728
type=unicode,
3729
),
4366
'rather than the one containing the working directory.'),
3730
4367
Option('preview', help='Instead of merging, show a diff of the'
3731
4368
' merge.'),
3732
4369
Option('interactive', help='Select changes interactively.',
3734
4371
]
3735
4372
3736
4373
def run(self, location=None, revision=None, force=False,
3737
merge_type=None, show_base=False, reprocess=None, remember=False,
4374
merge_type=None, show_base=False, reprocess=None, remember=None,
3738
4375
uncommitted=False, pull=False,
3739
4376
directory=None,
3740
4377
preview=False,
3748
4385
merger = None
3749
4386
allow_pending = True
3750
4387
verified = 'inapplicable'
4388
3751
4389
tree = WorkingTree.open_containing(directory)[0]
4390
if tree.branch.revno() == 0:
4391
raise errors.BzrCommandError(gettext('Merging into empty branches not currently supported, '
4392
'https://bugs.launchpad.net/bzr/+bug/308562'))
3752
4393
3753
4394
try:
3754
4395
basis_tree = tree.revision_tree(tree.last_revision())
3765
4406
unversioned_filter=tree.is_ignored, view_info=view_info)
3766
4407
pb = ui.ui_factory.nested_progress_bar()
3767
4408
self.add_cleanup(pb.finished)
3768
tree.lock_write()
3769
self.add_cleanup(tree.unlock)
4409
self.add_cleanup(tree.lock_write().unlock)
3770
4410
if location is not None:
3771
4411
try:
3772
4412
mergeable = bundle.read_mergeable_from_url(location,
3775
4415
mergeable = None
3776
4416
else:
3777
4417
if uncommitted:
3778
raise errors.BzrCommandError('Cannot use --uncommitted'
3779
' with bundles or merge directives.')
4418
raise errors.BzrCommandError(gettext('Cannot use --uncommitted'
4419
' with bundles or merge directives.'))
3780
4420
3781
4421
if revision is not None:
3782
raise errors.BzrCommandError(
3783
'Cannot use -r with merge directives or bundles')
4422
raise errors.BzrCommandError(gettext(
4423
'Cannot use -r with merge directives or bundles'))
3784
4424
merger, verified = _mod_merge.Merger.from_mergeable(tree,
3785
4425
mergeable, None)
3786
4426
3787
4427
if merger is None and uncommitted:
3788
4428
if revision is not None and len(revision) > 0:
3789
raise errors.BzrCommandError('Cannot use --uncommitted and'
3790
' --revision at the same time.')
4429
raise errors.BzrCommandError(gettext('Cannot use --uncommitted and'
4430
' --revision at the same time.'))
3791
4431
merger = self.get_merger_from_uncommitted(tree, location, None)
3792
4432
allow_pending = False
3793
4433
3801
4441
self.sanity_check_merger(merger)
3802
4442
if (merger.base_rev_id == merger.other_rev_id and
3803
4443
merger.other_rev_id is not None):
3804
note('Nothing to do.')
4444
# check if location is a nonexistent file (and not a branch) to
4445
# disambiguate the 'Nothing to do'
4446
if merger.interesting_files:
4447
if not merger.other_tree.has_filename(
4448
merger.interesting_files[0]):
4449
note(gettext("merger: ") + str(merger))
4450
raise errors.PathsDoNotExist([location])
4451
note(gettext('Nothing to do.'))
3805
4452
return 0
3806
if pull:
4453
if pull and not preview:
3807
4454
if merger.interesting_files is not None:
3808
raise errors.BzrCommandError('Cannot pull individual files')
4455
raise errors.BzrCommandError(gettext('Cannot pull individual files'))
3809
4456
if (merger.base_rev_id == tree.last_revision()):
3810
4457
result = tree.pull(merger.other_branch, False,
3811
4458
merger.other_rev_id)
3812
4459
result.report(self.outf)
3813
4460
return 0
3814
4461
if merger.this_basis is None:
3815
raise errors.BzrCommandError(
4462
raise errors.BzrCommandError(gettext(
3816
4463
"This branch has no commits."
3817
" (perhaps you would prefer 'bzr pull')")
4464
" (perhaps you would prefer 'bzr pull')"))
3818
4465
if preview:
3819
4466
return self._do_preview(merger)
3820
4467
elif interactive:
3833
4480
def _do_preview(self, merger):
3834
4481
from bzrlib.diff import show_diff_trees
3835
4482
result_tree = self._get_preview(merger)
4483
path_encoding = osutils.get_diff_header_encoding()
3836
4484
show_diff_trees(merger.this_tree, result_tree, self.outf,
3837
old_label='', new_label='')
4485
old_label='', new_label='',
4486
path_encoding=path_encoding)
3838
4487
3839
4488
def _do_merge(self, merger, change_reporter, allow_pending, verified):
3840
4489
merger.change_reporter = change_reporter
3869
4518
def sanity_check_merger(self, merger):
3870
4519
if (merger.show_base and
3871
4520
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)
4521
raise errors.BzrCommandError(gettext("Show-base is not supported for this"
4522
" merge type. %s") % merger.merge_type)
3874
4523
if merger.reprocess is None:
3875
4524
if merger.show_base:
3876
4525
merger.reprocess = False
3878
4527
# Use reprocess if the merger supports it
3879
4528
merger.reprocess = merger.merge_type.supports_reprocess
3880
4529
if merger.reprocess and not merger.merge_type.supports_reprocess:
3881
raise errors.BzrCommandError("Conflict reduction is not supported"
3882
" for merge type %s." %
4530
raise errors.BzrCommandError(gettext("Conflict reduction is not supported"
4531
" for merge type %s.") %
3883
4532
merger.merge_type)
3884
4533
if merger.reprocess and merger.show_base:
3885
raise errors.BzrCommandError("Cannot do conflict reduction and"
3886
" show base.")
4534
raise errors.BzrCommandError(gettext("Cannot do conflict reduction and"
4535
" show base."))
3887
4536
3888
4537
def _get_merger_from_branch(self, tree, location, revision, remember,
3889
4538
possible_transports, pb):
3916
4565
if other_revision_id is None:
3917
4566
other_revision_id = _mod_revision.ensure_null(
3918
4567
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):
4568
# Remember where we merge from. We need to remember if:
4569
# - user specify a location (and we don't merge from the parent
4570
# branch)
4571
# - user ask to remember or there is no previous location set to merge
4572
# from and user didn't ask to *not* remember
4573
if (user_location is not None
4574
and ((remember
4575
or (remember is None
4576
and tree.branch.get_submit_branch() is None)))):
3922
4577
tree.branch.set_submit_branch(other_branch.base)
3923
_merge_tags_if_possible(other_branch, tree.branch)
4578
# Merge tags (but don't set them in the master branch yet, the user
4579
# might revert this merge). Commit will propagate them.
4580
_merge_tags_if_possible(other_branch, tree.branch, ignore_master=True)
3924
4581
merger = _mod_merge.Merger.from_revision_ids(pb, tree,
3925
4582
other_revision_id, base_revision_id, other_branch, base_branch)
3926
4583
if other_path != '':
3985
4642
stored_location_type = "parent"
3986
4643
mutter("%s", stored_location)
3987
4644
if stored_location is None:
3988
raise errors.BzrCommandError("No location specified or remembered")
4645
raise errors.BzrCommandError(gettext("No location specified or remembered"))
3989
4646
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)
4647
note(gettext("{0} remembered {1} location {2}").format(verb_string,
4648
stored_location_type, display_url))
3992
4649
return stored_location
3993
4650
3994
4651
3995
4652
class cmd_remerge(Command):
3996
"""Redo a merge.
4653
__doc__ = """Redo a merge.
3997
4654
3998
4655
Use this if you want to try a different merge technique while resolving
3999
4656
conflicts. Some merge techniques are better than others, and remerge
4024
4681
4025
4682
def run(self, file_list=None, merge_type=None, show_base=False,
4026
4683
reprocess=False):
4684
from bzrlib.conflicts import restore
4027
4685
if merge_type is None:
4028
4686
merge_type = _mod_merge.Merge3Merger
4029
tree, file_list = tree_files(file_list)
4030
tree.lock_write()
4031
self.add_cleanup(tree.unlock)
4687
tree, file_list = WorkingTree.open_containing_paths(file_list)
4688
self.add_cleanup(tree.lock_write().unlock)
4032
4689
parents = tree.get_parent_ids()
4033
4690
if len(parents) != 2:
4034
raise errors.BzrCommandError("Sorry, remerge only works after normal"
4691
raise errors.BzrCommandError(gettext("Sorry, remerge only works after normal"
4035
4692
" merges. Not cherrypicking or"
4036
" multi-merges.")
4693
" multi-merges."))
4037
4694
repository = tree.branch.repository
4038
4695
interesting_ids = None
4039
4696
new_conflicts = []
4048
4705
if tree.kind(file_id) != "directory":
4049
4706
continue
4050
4707
4051
for name, ie in tree.inventory.iter_entries(file_id):
4708
# FIXME: Support nested trees
4709
for name, ie in tree.root_inventory.iter_entries(file_id):
4052
4710
interesting_ids.add(ie.file_id)
4053
4711
new_conflicts = conflicts.select_conflicts(tree, file_list)[0]
4054
4712
else:
4087
4745
4088
4746
4089
4747
class cmd_revert(Command):
4090
"""Revert files to a previous revision.
4748
__doc__ = """\
4749
Set files in the working tree back to the contents of a previous revision.
4091
4750
4092
4751
Giving a list of files will revert only those files. Otherwise, all files
4093
4752
will be reverted. If the revision is not specified with '--revision', the
4094
last committed revision is used.
4753
working tree basis revision is used. A revert operation affects only the
4754
working tree, not any revision history like the branch and repository or
4755
the working tree basis revision.
4095
4756
4096
4757
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.
4758
merge instead. For example, "merge . -r -2..-3" (don't forget the ".")
4759
will remove the changes introduced by the second last commit (-2), without
4760
affecting the changes introduced by the last commit (-1). To remove
4761
certain changes on a hunk-by-hunk basis, see the shelve command.
4762
To update the branch to a specific revision or the latest revision and
4763
update the working tree accordingly while preserving local changes, see the
4764
update command.
4100
4765
4101
By default, any files that have been manually changed will be backed up
4102
first. (Files changed only by merge are not backed up.) Backup files have
4103
'.~#~' appended to their name, where # is a number.
4766
Uncommitted changes to files that are reverted will be discarded.
4767
Howver, by default, any files that have been manually changed will be
4768
backed up first. (Files changed only by merge are not backed up.) Backup
4769
files have '.~#~' appended to their name, where # is a number.
4104
4770
4105
4771
When you provide files, you can use their current pathname or the pathname
4106
4772
from the target revision. So you can use revert to "undelete" a file by
4132
4798
target branches.
4133
4799
"""
4134
4800
4135
_see_also = ['cat', 'export']
4801
_see_also = ['cat', 'export', 'merge', 'shelve']
4136
4802
takes_options = [
4137
4803
'revision',
4138
4804
Option('no-backup', "Do not save backups of reverted files."),
4143
4809
4144
4810
def run(self, revision=None, no_backup=False, file_list=None,
4145
4811
forget_merges=None):
4146
tree, file_list = tree_files(file_list)
4147
tree.lock_write()
4148
self.add_cleanup(tree.unlock)
4812
tree, file_list = WorkingTree.open_containing_paths(file_list)
4813
self.add_cleanup(tree.lock_tree_write().unlock)
4149
4814
if forget_merges:
4150
4815
tree.set_parent_ids(tree.get_parent_ids()[:1])
4151
4816
else:
4159
4824
4160
4825
4161
4826
class cmd_assert_fail(Command):
4162
"""Test reporting of assertion failures"""
4827
__doc__ = """Test reporting of assertion failures"""
4163
4828
# intended just for use in testing
4164
4829
4165
4830
hidden = True
4169
4834
4170
4835
4171
4836
class cmd_help(Command):
4172
"""Show help on a command or other topic.
4837
__doc__ = """Show help on a command or other topic.
4173
4838
"""
4174
4839
4175
4840
_see_also = ['topics']
4188
4853
4189
4854
4190
4855
class cmd_shell_complete(Command):
4191
"""Show appropriate completions for context.
4856
__doc__ = """Show appropriate completions for context.
4192
4857
4193
4858
For a list of all available commands, say 'bzr shell-complete'.
4194
4859
"""
4198
4863
4199
4864
@display_command
4200
4865
def run(self, context=None):
4201
import shellcomplete
4866
from bzrlib import shellcomplete
4202
4867
shellcomplete.shellcomplete(context)
4203
4868
4204
4869
4205
4870
class cmd_missing(Command):
4206
"""Show unmerged/unpulled revisions between two branches.
4871
__doc__ = """Show unmerged/unpulled revisions between two branches.
4207
4872
4208
4873
OTHER_BRANCH may be local or remote.
4209
4874
4240
4905
_see_also = ['merge', 'pull']
4241
4906
takes_args = ['other_branch?']
4242
4907
takes_options = [
4908
'directory',
4243
4909
Option('reverse', 'Reverse the order of revisions.'),
4244
4910
Option('mine-only',
4245
4911
'Display changes in the local branch only.'),
4257
4923
type=_parse_revision_str,
4258
4924
help='Filter on local branch revisions (inclusive). '
4259
4925
'See "help revisionspec" for details.'),
4260
Option('include-merges',
4926
Option('include-merged',
4261
4927
'Show all revisions in addition to the mainline ones.'),
4928
Option('include-merges', hidden=True,
4929
help='Historical alias for --include-merged.'),
4262
4930
]
4263
4931
encoding_type = 'replace'
4264
4932
4267
4935
theirs_only=False,
4268
4936
log_format=None, long=False, short=False, line=False,
4269
4937
show_ids=False, verbose=False, this=False, other=False,
4270
include_merges=False, revision=None, my_revision=None):
4938
include_merged=None, revision=None, my_revision=None,
4939
directory=u'.',
4940
include_merges=symbol_versioning.DEPRECATED_PARAMETER):
4271
4941
from bzrlib.missing import find_unmerged, iter_log_revisions
4272
4942
def message(s):
4273
4943
if not is_quiet():
4274
4944
self.outf.write(s)
4275
4945
4946
if symbol_versioning.deprecated_passed(include_merges):
4947
ui.ui_factory.show_user_warning(
4948
'deprecated_command_option',
4949
deprecated_name='--include-merges',
4950
recommended_name='--include-merged',
4951
deprecated_in_version='2.5',
4952
command=self.invoked_as)
4953
if include_merged is None:
4954
include_merged = include_merges
4955
else:
4956
raise errors.BzrCommandError(gettext(
4957
'{0} and {1} are mutually exclusive').format(
4958
'--include-merges', '--include-merged'))
4959
if include_merged is None:
4960
include_merged = False
4276
4961
if this:
4277
4962
mine_only = this
4278
4963
if other:
4286
4971
elif theirs_only:
4287
4972
restrict = 'remote'
4288
4973
4289
local_branch = Branch.open_containing(u".")[0]
4974
local_branch = Branch.open_containing(directory)[0]
4975
self.add_cleanup(local_branch.lock_read().unlock)
4976
4290
4977
parent = local_branch.get_parent()
4291
4978
if other_branch is None:
4292
4979
other_branch = parent
4293
4980
if other_branch is None:
4294
raise errors.BzrCommandError("No peer location known"
4295
" or specified.")
4981
raise errors.BzrCommandError(gettext("No peer location known"
4982
" or specified."))
4296
4983
display_url = urlutils.unescape_for_display(parent,
4297
4984
self.outf.encoding)
4298
message("Using saved parent location: "
4299
+ display_url + "\n")
4985
message(gettext("Using saved parent location: {0}\n").format(
4986
display_url))
4300
4987
4301
4988
remote_branch = Branch.open(other_branch)
4302
4989
if remote_branch.base == local_branch.base:
4303
4990
remote_branch = local_branch
4991
else:
4992
self.add_cleanup(remote_branch.lock_read().unlock)
4304
4993
4305
local_branch.lock_read()
4306
self.add_cleanup(local_branch.unlock)
4307
4994
local_revid_range = _revision_range_to_revid_range(
4308
4995
_get_revision_range(my_revision, local_branch,
4309
4996
self.name()))
4310
4997
4311
remote_branch.lock_read()
4312
self.add_cleanup(remote_branch.unlock)
4313
4998
remote_revid_range = _revision_range_to_revid_range(
4314
4999
_get_revision_range(revision,
4315
5000
remote_branch, self.name()))
4317
5002
local_extra, remote_extra = find_unmerged(
4318
5003
local_branch, remote_branch, restrict,
4319
5004
backward=not reverse,
4320
include_merges=include_merges,
5005
include_merged=include_merged,
4321
5006
local_revid_range=local_revid_range,
4322
5007
remote_revid_range=remote_revid_range)
4323
5008
4330
5015
4331
5016
status_code = 0
4332
5017
if local_extra and not theirs_only:
4333
message("You have %d extra revision(s):\n" %
5018
message(ngettext("You have %d extra revision:\n",
5019
"You have %d extra revisions:\n",
5020
len(local_extra)) %
4334
5021
len(local_extra))
5022
rev_tag_dict = {}
5023
if local_branch.supports_tags():
5024
rev_tag_dict = local_branch.tags.get_reverse_tag_dict()
4335
5025
for revision in iter_log_revisions(local_extra,
4336
5026
local_branch.repository,
4337
verbose):
5027
verbose,
5028
rev_tag_dict):
4338
5029
lf.log_revision(revision)
4339
5030
printed_local = True
4340
5031
status_code = 1
4344
5035
if remote_extra and not mine_only:
4345
5036
if printed_local is True:
4346
5037
message("\n\n\n")
4347
message("You are missing %d revision(s):\n" %
5038
message(ngettext("You are missing %d revision:\n",
5039
"You are missing %d revisions:\n",
5040
len(remote_extra)) %
4348
5041
len(remote_extra))
5042
if remote_branch.supports_tags():
5043
rev_tag_dict = remote_branch.tags.get_reverse_tag_dict()
4349
5044
for revision in iter_log_revisions(remote_extra,
4350
5045
remote_branch.repository,
4351
verbose):
5046
verbose,
5047
rev_tag_dict):
4352
5048
lf.log_revision(revision)
4353
5049
status_code = 1
4354
5050
4355
5051
if mine_only and not local_extra:
4356
5052
# We checked local, and found nothing extra
4357
message('This branch is up to date.\n')
5053
message(gettext('This branch has no new revisions.\n'))
4358
5054
elif theirs_only and not remote_extra:
4359
5055
# We checked remote, and found nothing extra
4360
message('Other branch is up to date.\n')
5056
message(gettext('Other branch has no new revisions.\n'))
4361
5057
elif not (mine_only or theirs_only or local_extra or
4362
5058
remote_extra):
4363
5059
# We checked both branches, and neither one had extra
4364
5060
# revisions
4365
message("Branches are up to date.\n")
5061
message(gettext("Branches are up to date.\n"))
4366
5062
self.cleanup_now()
4367
5063
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)
5064
self.add_cleanup(local_branch.lock_write().unlock)
4370
5065
# handle race conditions - a parent might be set while we run.
4371
5066
if local_branch.get_parent() is None:
4372
5067
local_branch.set_parent(remote_branch.base)
4374
5069
4375
5070
4376
5071
class cmd_pack(Command):
4377
"""Compress the data within a repository."""
5072
__doc__ = """Compress the data within a repository.
5073
5074
This operation compresses the data within a bazaar repository. As
5075
bazaar supports automatic packing of repository, this operation is
5076
normally not required to be done manually.
5077
5078
During the pack operation, bazaar takes a backup of existing repository
5079
data, i.e. pack files. This backup is eventually removed by bazaar
5080
automatically when it is safe to do so. To save disk space by removing
5081
the backed up pack files, the --clean-obsolete-packs option may be
5082
used.
5083
5084
Warning: If you use --clean-obsolete-packs and your machine crashes
5085
during or immediately after repacking, you may be left with a state
5086
where the deletion has been written to disk but the new packs have not
5087
been. In this case the repository may be unusable.
5088
"""
4378
5089
4379
5090
_see_also = ['repositories']
4380
5091
takes_args = ['branch_or_repo?']
5092
takes_options = [
5093
Option('clean-obsolete-packs', 'Delete obsolete packs to save disk space.'),
5094
]
4381
5095
4382
def run(self, branch_or_repo='.'):
4383
dir = bzrdir.BzrDir.open_containing(branch_or_repo)[0]
5096
def run(self, branch_or_repo='.', clean_obsolete_packs=False):
5097
dir = controldir.ControlDir.open_containing(branch_or_repo)[0]
4384
5098
try:
4385
5099
branch = dir.open_branch()
4386
5100
repository = branch.repository
4387
5101
except errors.NotBranchError:
4388
5102
repository = dir.open_repository()
4389
repository.pack()
5103
repository.pack(clean_obsolete_packs=clean_obsolete_packs)
4390
5104
4391
5105
4392
5106
class cmd_plugins(Command):
4393
"""List the installed plugins.
5107
__doc__ = """List the installed plugins.
4394
5108
4395
5109
This command displays the list of installed plugins including
4396
5110
version of plugin and a short description of each.
4412
5126
4413
5127
@display_command
4414
5128
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
5129
from bzrlib import plugin
5130
# Don't give writelines a generator as some codecs don't like that
5131
self.outf.writelines(
5132
list(plugin.describe_plugins(show_paths=verbose)))
4435
5133
4436
5134
4437
5135
class cmd_testament(Command):
4438
"""Show testament (signing-form) of a revision."""
5136
__doc__ = """Show testament (signing-form) of a revision."""
4439
5137
takes_options = [
4440
5138
'revision',
4441
5139
Option('long', help='Produce long-format testament.'),
4442
5140
Option('strict',
4443
5141
help='Produce a strict-format testament.')]
4444
5142
takes_args = ['branch?']
5143
encoding_type = 'exact'
4445
5144
@display_command
4446
5145
def run(self, branch=u'.', revision=None, long=False, strict=False):
4447
5146
from bzrlib.testament import Testament, StrictTestament
4453
5152
b = Branch.open_containing(branch)[0]
4454
5153
else:
4455
5154
b = Branch.open(branch)
4456
b.lock_read()
4457
self.add_cleanup(b.unlock)
5155
self.add_cleanup(b.lock_read().unlock)
4458
5156
if revision is None:
4459
5157
rev_id = b.last_revision()
4460
5158
else:
4461
5159
rev_id = revision[0].as_revision_id(b)
4462
5160
t = testament_class.from_revision(b.repository, rev_id)
4463
5161
if long:
4464
sys.stdout.writelines(t.as_text_lines())
5162
self.outf.writelines(t.as_text_lines())
4465
5163
else:
4466
sys.stdout.write(t.as_short_text())
5164
self.outf.write(t.as_short_text())
4467
5165
4468
5166
4469
5167
class cmd_annotate(Command):
4470
"""Show the origin of each line in a file.
5168
__doc__ = """Show the origin of each line in a file.
4471
5169
4472
5170
This prints out the given file with an annotation on the left side
4473
5171
indicating which revision, author and date introduced the change.
4484
5182
Option('long', help='Show commit date in annotations.'),
4485
5183
'revision',
4486
5184
'show-ids',
5185
'directory',
4487
5186
]
4488
5187
encoding_type = 'exact'
4489
5188
4490
5189
@display_command
4491
5190
def run(self, filename, all=False, long=False, revision=None,
4492
show_ids=False):
4493
from bzrlib.annotate import annotate_file, annotate_file_tree
5191
show_ids=False, directory=None):
5192
from bzrlib.annotate import (
5193
annotate_file_tree,
5194
)
4494
5195
wt, branch, relpath = \
4495
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
5196
_open_directory_or_containing_tree_or_branch(filename, directory)
4496
5197
if wt is not None:
4497
wt.lock_read()
4498
self.add_cleanup(wt.unlock)
5198
self.add_cleanup(wt.lock_read().unlock)
4499
5199
else:
4500
branch.lock_read()
4501
self.add_cleanup(branch.unlock)
5200
self.add_cleanup(branch.lock_read().unlock)
4502
5201
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:
5202
self.add_cleanup(tree.lock_read().unlock)
5203
if wt is not None and revision is None:
4506
5204
file_id = wt.path2id(relpath)
4507
5205
else:
4508
5206
file_id = tree.path2id(relpath)
4509
5207
if file_id is None:
4510
5208
raise errors.NotVersionedError(filename)
4511
file_version = tree.inventory[file_id].revision
4512
5209
if wt is not None and revision is None:
4513
5210
# If there is a tree and we're not annotating historical
4514
5211
# versions, annotate the working tree's content.
4515
5212
annotate_file_tree(wt, file_id, self.outf, long, all,
4516
5213
show_ids=show_ids)
4517
5214
else:
4518
annotate_file(branch, file_version, file_id, long, all, self.outf,
4519
show_ids=show_ids)
5215
annotate_file_tree(tree, file_id, self.outf, long, all,
5216
show_ids=show_ids, branch=branch)
4520
5217
4521
5218
4522
5219
class cmd_re_sign(Command):
4523
"""Create a digital signature for an existing revision."""
5220
__doc__ = """Create a digital signature for an existing revision."""
4524
5221
# TODO be able to replace existing ones.
4525
5222
4526
5223
hidden = True # is this right ?
4527
5224
takes_args = ['revision_id*']
4528
takes_options = ['revision']
5225
takes_options = ['directory', 'revision']
4529
5226
4530
def run(self, revision_id_list=None, revision=None):
5227
def run(self, revision_id_list=None, revision=None, directory=u'.'):
4531
5228
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')
5229
raise errors.BzrCommandError(gettext('You can only supply one of revision_id or --revision'))
4533
5230
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)
5231
raise errors.BzrCommandError(gettext('You must supply either --revision or a revision_id'))
5232
b = WorkingTree.open_containing(directory)[0].branch
5233
self.add_cleanup(b.lock_write().unlock)
4538
5234
return self._run(b, revision_id_list, revision)
4539
5235
4540
5236
def _run(self, b, revision_id_list, revision):
4541
5237
import bzrlib.gpg as gpg
4542
gpg_strategy = gpg.GPGStrategy(b.get_config())
5238
gpg_strategy = gpg.GPGStrategy(b.get_config_stack())
4543
5239
if revision_id_list is not None:
4544
5240
b.repository.start_write_group()
4545
5241
try:
4570
5266
if to_revid is None:
4571
5267
to_revno = b.revno()
4572
5268
if from_revno is None or to_revno is None:
4573
raise errors.BzrCommandError('Cannot sign a range of non-revision-history revisions')
5269
raise errors.BzrCommandError(gettext('Cannot sign a range of non-revision-history revisions'))
4574
5270
b.repository.start_write_group()
4575
5271
try:
4576
5272
for revno in range(from_revno, to_revno + 1):
4582
5278
else:
4583
5279
b.repository.commit_write_group()
4584
5280
else:
4585
raise errors.BzrCommandError('Please supply either one revision, or a range.')
5281
raise errors.BzrCommandError(gettext('Please supply either one revision, or a range.'))
4586
5282
4587
5283
4588
5284
class cmd_bind(Command):
4589
"""Convert the current branch into a checkout of the supplied branch.
5285
__doc__ = """Convert the current branch into a checkout of the supplied branch.
5286
If no branch is supplied, rebind to the last bound location.
4590
5287
4591
5288
Once converted into a checkout, commits must succeed on the master branch
4592
5289
before they will be applied to the local branch.
4598
5295
4599
5296
_see_also = ['checkouts', 'unbind']
4600
5297
takes_args = ['location?']
4601
takes_options = []
5298
takes_options = ['directory']
4602
5299
4603
def run(self, location=None):
4604
b, relpath = Branch.open_containing(u'.')
5300
def run(self, location=None, directory=u'.'):
5301
b, relpath = Branch.open_containing(directory)
4605
5302
if location is None:
4606
5303
try:
4607
5304
location = b.get_old_bound_location()
4608
5305
except errors.UpgradeRequired:
4609
raise errors.BzrCommandError('No location supplied. '
4610
'This format does not remember old locations.')
5306
raise errors.BzrCommandError(gettext('No location supplied. '
5307
'This format does not remember old locations.'))
4611
5308
else:
4612
5309
if location is None:
4613
5310
if b.get_bound_location() is not None:
4614
raise errors.BzrCommandError('Branch is already bound')
5311
raise errors.BzrCommandError(
5312
gettext('Branch is already bound'))
4615
5313
else:
4616
raise errors.BzrCommandError('No location supplied '
4617
'and no previous location known')
5314
raise errors.BzrCommandError(
5315
gettext('No location supplied'
5316
' and no previous location known'))
4618
5317
b_other = Branch.open(location)
4619
5318
try:
4620
5319
b.bind(b_other)
4621
5320
except errors.DivergedBranches:
4622
raise errors.BzrCommandError('These branches have diverged.'
4623
' Try merging, and then bind again.')
5321
raise errors.BzrCommandError(gettext('These branches have diverged.'
5322
' Try merging, and then bind again.'))
4624
5323
if b.get_config().has_explicit_nickname():
4625
5324
b.nick = b_other.nick
4626
5325
4627
5326
4628
5327
class cmd_unbind(Command):
4629
"""Convert the current checkout into a regular branch.
5328
__doc__ = """Convert the current checkout into a regular branch.
4630
5329
4631
5330
After unbinding, the local branch is considered independent and subsequent
4632
5331
commits will be local only.
4634
5333
4635
5334
_see_also = ['checkouts', 'bind']
4636
5335
takes_args = []
4637
takes_options = []
5336
takes_options = ['directory']
4638
5337
4639
def run(self):
4640
b, relpath = Branch.open_containing(u'.')
5338
def run(self, directory=u'.'):
5339
b, relpath = Branch.open_containing(directory)
4641
5340
if not b.unbind():
4642
raise errors.BzrCommandError('Local branch is not bound')
5341
raise errors.BzrCommandError(gettext('Local branch is not bound'))
4643
5342
4644
5343
4645
5344
class cmd_uncommit(Command):
4646
"""Remove the last committed revision.
5345
__doc__ = """Remove the last committed revision.
4647
5346
4648
5347
--verbose will print out what is being removed.
4649
5348
--dry-run will go through all the motions, but not actually
4666
5365
takes_options = ['verbose', 'revision',
4667
5366
Option('dry-run', help='Don\'t actually make changes.'),
4668
5367
Option('force', help='Say yes to all questions.'),
5368
Option('keep-tags',
5369
help='Keep tags that point to removed revisions.'),
4669
5370
Option('local',
4670
5371
help="Only remove the commits from the local branch"
4671
5372
" when in a checkout."
4675
5376
aliases = []
4676
5377
encoding_type = 'replace'
4677
5378
4678
def run(self, location=None,
4679
dry_run=False, verbose=False,
4680
revision=None, force=False, local=False):
5379
def run(self, location=None, dry_run=False, verbose=False,
5380
revision=None, force=False, local=False, keep_tags=False):
4681
5381
if location is None:
4682
5382
location = u'.'
4683
control, relpath = bzrdir.BzrDir.open_containing(location)
5383
control, relpath = controldir.ControlDir.open_containing(location)
4684
5384
try:
4685
5385
tree = control.open_workingtree()
4686
5386
b = tree.branch
4689
5389
b = control.open_branch()
4690
5390
4691
5391
if tree is not None:
4692
tree.lock_write()
4693
self.add_cleanup(tree.unlock)
5392
self.add_cleanup(tree.lock_write().unlock)
4694
5393
else:
4695
b.lock_write()
4696
self.add_cleanup(b.unlock)
4697
return self._run(b, tree, dry_run, verbose, revision, force, local=local)
5394
self.add_cleanup(b.lock_write().unlock)
5395
return self._run(b, tree, dry_run, verbose, revision, force,
5396
local, keep_tags)
4698
5397
4699
def _run(self, b, tree, dry_run, verbose, revision, force, local=False):
5398
def _run(self, b, tree, dry_run, verbose, revision, force, local,
5399
keep_tags):
4700
5400
from bzrlib.log import log_formatter, show_log
4701
5401
from bzrlib.uncommit import uncommit
4702
5402
4717
5417
rev_id = b.get_rev_id(revno)
4718
5418
4719
5419
if rev_id is None or _mod_revision.is_null(rev_id):
4720
ui.ui_factory.note('No revisions to uncommit.')
5420
self.outf.write(gettext('No revisions to uncommit.\n'))
4721
5421
return 1
4722
5422
4723
log_collector = ui.ui_factory.make_output_stream()
4724
5423
lf = log_formatter('short',
4725
to_file=log_collector,
5424
to_file=self.outf,
4726
5425
show_timezone='original')
4727
5426
4728
5427
show_log(b,
4733
5432
end_revision=last_revno)
4734
5433
4735
5434
if dry_run:
4736
ui.ui_factory.note('Dry-run, pretending to remove the above revisions.')
5435
self.outf.write(gettext('Dry-run, pretending to remove'
5436
' the above revisions.\n'))
4737
5437
else:
4738
ui.ui_factory.note('The above revision(s) will be removed.')
5438
self.outf.write(gettext('The above revision(s) will be removed.\n'))
4739
5439
4740
5440
if not force:
4741
if not ui.ui_factory.get_boolean('Are you sure [y/N]? '):
4742
ui.ui_factory.note('Canceled')
5441
if not ui.ui_factory.confirm_action(
5442
gettext(u'Uncommit these revisions'),
5443
'bzrlib.builtins.uncommit',
5444
{}):
5445
self.outf.write(gettext('Canceled\n'))
4743
5446
return 0
4744
5447
4745
5448
mutter('Uncommitting from {%s} to {%s}',
4746
5449
last_rev_id, rev_id)
4747
5450
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)
5451
revno=revno, local=local, keep_tags=keep_tags)
5452
self.outf.write(gettext('You can restore the old tip by running:\n'
5453
' bzr pull . -r revid:%s\n') % last_rev_id)
4751
5454
4752
5455
4753
5456
class cmd_break_lock(Command):
4754
"""Break a dead lock on a repository, branch or working directory.
5457
__doc__ = """Break a dead lock.
5458
5459
This command breaks a lock on a repository, branch, working directory or
5460
config file.
4755
5461
4756
5462
CAUTION: Locks should only be broken when you are sure that the process
4757
5463
holding the lock has been stopped.
4762
5468
:Examples:
4763
5469
bzr break-lock
4764
5470
bzr break-lock bzr+ssh://example.com/bzr/foo
5471
bzr break-lock --conf ~/.bazaar
4765
5472
"""
5473
4766
5474
takes_args = ['location?']
5475
takes_options = [
5476
Option('config',
5477
help='LOCATION is the directory where the config lock is.'),
5478
Option('force',
5479
help='Do not ask for confirmation before breaking the lock.'),
5480
]
4767
5481
4768
def run(self, location=None, show=False):
5482
def run(self, location=None, config=False, force=False):
4769
5483
if location is None:
4770
5484
location = u'.'
4771
control, relpath = bzrdir.BzrDir.open_containing(location)
4772
try:
4773
control.break_lock()
4774
except NotImplementedError:
4775
pass
5485
if force:
5486
ui.ui_factory = ui.ConfirmationUserInterfacePolicy(ui.ui_factory,
5487
None,
5488
{'bzrlib.lockdir.break': True})
5489
if config:
5490
conf = _mod_config.LockableConfig(file_name=location)
5491
conf.break_lock()
5492
else:
5493
control, relpath = controldir.ControlDir.open_containing(location)
5494
try:
5495
control.break_lock()
5496
except NotImplementedError:
5497
pass
4776
5498
4777
5499
4778
5500
class cmd_wait_until_signalled(Command):
4779
"""Test helper for test_start_and_stop_bzr_subprocess_send_signal.
5501
__doc__ = """Test helper for test_start_and_stop_bzr_subprocess_send_signal.
4780
5502
4781
5503
This just prints a line to signal when it is ready, then blocks on stdin.
4782
5504
"""
4790
5512
4791
5513
4792
5514
class cmd_serve(Command):
4793
"""Run the bzr server."""
5515
__doc__ = """Run the bzr server."""
4794
5516
4795
5517
aliases = ['server']
4796
5518
4801
5523
help="Protocol to serve.",
4802
5524
lazy_registry=('bzrlib.transport', 'transport_server_registry'),
4803
5525
value_switches=True),
5526
Option('listen',
5527
help='Listen for connections on nominated address.', type=str),
4804
5528
Option('port',
4805
help='Listen for connections on nominated port of the form '
4806
'[hostname:]portnumber. Passing 0 as the port number will '
4807
'result in a dynamically allocated port. The default port '
4808
'depends on the protocol.',
4809
type=str),
4810
Option('directory',
4811
help='Serve contents of this directory.',
4812
type=unicode),
5529
help='Listen for connections on nominated port. Passing 0 as '
5530
'the port number will result in a dynamically allocated '
5531
'port. The default port depends on the protocol.',
5532
type=int),
5533
custom_help('directory',
5534
help='Serve contents of this directory.'),
4813
5535
Option('allow-writes',
4814
5536
help='By default the server is a readonly server. Supplying '
4815
5537
'--allow-writes enables write access to the contents of '
4819
5541
'option leads to global uncontrolled write access to your '
4820
5542
'file system.'
4821
5543
),
5544
Option('client-timeout', type=float,
5545
help='Override the default idle client timeout (5min).'),
4822
5546
]
4823
5547
4824
def get_host_and_port(self, port):
4825
"""Return the host and port to run the smart server on.
4826
4827
If 'port' is None, None will be returned for the host and port.
4828
4829
If 'port' has a colon in it, the string before the colon will be
4830
interpreted as the host.
4831
4832
:param port: A string of the port to run the server on.
4833
:return: A tuple of (host, port), where 'host' is a host name or IP,
4834
and port is an integer TCP/IP port.
4835
"""
4836
host = None
4837
if port is not None:
4838
if ':' in port:
4839
host, port = port.split(':')
4840
port = int(port)
4841
return host, port
4842
4843
def run(self, port=None, inet=False, directory=None, allow_writes=False,
4844
protocol=None):
4845
from bzrlib.transport import get_transport, transport_server_registry
5548
def run(self, listen=None, port=None, inet=False, directory=None,
5549
allow_writes=False, protocol=None, client_timeout=None):
5550
from bzrlib import transport
4846
5551
if directory is None:
4847
5552
directory = os.getcwd()
4848
5553
if protocol is None:
4849
protocol = transport_server_registry.get()
4850
host, port = self.get_host_and_port(port)
4851
url = urlutils.local_path_to_url(directory)
5554
protocol = transport.transport_server_registry.get()
5555
url = transport.location_to_url(directory)
4852
5556
if not allow_writes:
4853
5557
url = 'readonly+' + url
4854
transport = get_transport(url)
4855
protocol(transport, host, port, inet)
5558
t = transport.get_transport_from_url(url)
5559
protocol(t, listen, port, inet, client_timeout)
4856
5560
4857
5561
4858
5562
class cmd_join(Command):
4859
"""Combine a tree into its containing tree.
5563
__doc__ = """Combine a tree into its containing tree.
4860
5564
4861
5565
This command requires the target tree to be in a rich-root format.
4862
5566
4864
5568
not part of it. (Such trees can be produced by "bzr split", but also by
4865
5569
running "bzr branch" with the target inside a tree.)
4866
5570
4867
The result is a combined tree, with the subtree no longer an independant
5571
The result is a combined tree, with the subtree no longer an independent
4868
5572
part. This is marked as a merge of the subtree into the containing tree,
4869
5573
and all history is preserved.
4870
5574
"""
4881
5585
containing_tree = WorkingTree.open_containing(parent_dir)[0]
4882
5586
repo = containing_tree.branch.repository
4883
5587
if not repo.supports_rich_root():
4884
raise errors.BzrCommandError(
5588
raise errors.BzrCommandError(gettext(
4885
5589
"Can't join trees because %s doesn't support rich root data.\n"
4886
"You can use bzr upgrade on the repository."
5590
"You can use bzr upgrade on the repository.")
4887
5591
% (repo,))
4888
5592
if reference:
4889
5593
try:
4891
5595
except errors.BadReferenceTarget, e:
4892
5596
# XXX: Would be better to just raise a nicely printable
4893
5597
# exception from the real origin. Also below. mbp 20070306
4894
raise errors.BzrCommandError("Cannot join %s. %s" %
4895
(tree, e.reason))
5598
raise errors.BzrCommandError(
5599
gettext("Cannot join {0}. {1}").format(tree, e.reason))
4896
5600
else:
4897
5601
try:
4898
5602
containing_tree.subsume(sub_tree)
4899
5603
except errors.BadSubsumeSource, e:
4900
raise errors.BzrCommandError("Cannot join %s. %s" %
4901
(tree, e.reason))
5604
raise errors.BzrCommandError(
5605
gettext("Cannot join {0}. {1}").format(tree, e.reason))
4902
5606
4903
5607
4904
5608
class cmd_split(Command):
4905
"""Split a subdirectory of a tree into a separate tree.
5609
__doc__ = """Split a subdirectory of a tree into a separate tree.
4906
5610
4907
5611
This command will produce a target tree in a format that supports
4908
5612
rich roots, like 'rich-root' or 'rich-root-pack'. These formats cannot be
4928
5632
4929
5633
4930
5634
class cmd_merge_directive(Command):
4931
"""Generate a merge directive for auto-merge tools.
5635
__doc__ = """Generate a merge directive for auto-merge tools.
4932
5636
4933
5637
A directive requests a merge to be performed, and also provides all the
4934
5638
information necessary to do so. This means it must either include a
4951
5655
_see_also = ['send']
4952
5656
4953
5657
takes_options = [
5658
'directory',
4954
5659
RegistryOption.from_kwargs('patch-type',
4955
5660
'The type of patch to include in the directive.',
4956
5661
title='Patch type',
4969
5674
encoding_type = 'exact'
4970
5675
4971
5676
def run(self, submit_branch=None, public_branch=None, patch_type='bundle',
4972
sign=False, revision=None, mail_to=None, message=None):
5677
sign=False, revision=None, mail_to=None, message=None,
5678
directory=u'.'):
4973
5679
from bzrlib.revision import ensure_null, NULL_REVISION
4974
5680
include_patch, include_bundle = {
4975
5681
'plain': (False, False),
4976
5682
'diff': (True, False),
4977
5683
'bundle': (True, True),
4978
5684
}[patch_type]
4979
branch = Branch.open('.')
5685
branch = Branch.open(directory)
4980
5686
stored_submit_branch = branch.get_submit_branch()
4981
5687
if submit_branch is None:
4982
5688
submit_branch = stored_submit_branch
4986
5692
if submit_branch is None:
4987
5693
submit_branch = branch.get_parent()
4988
5694
if submit_branch is None:
4989
raise errors.BzrCommandError('No submit branch specified or known')
5695
raise errors.BzrCommandError(gettext('No submit branch specified or known'))
4990
5696
4991
5697
stored_public_branch = branch.get_public_branch()
4992
5698
if public_branch is None:
4993
5699
public_branch = stored_public_branch
4994
5700
elif stored_public_branch is None:
5701
# FIXME: Should be done only if we succeed ? -- vila 2012-01-03
4995
5702
branch.set_public_branch(public_branch)
4996
5703
if not include_bundle and public_branch is None:
4997
raise errors.BzrCommandError('No public branch specified or'
4998
' known')
5704
raise errors.BzrCommandError(gettext('No public branch specified or'
5705
' known'))
4999
5706
base_revision_id = None
5000
5707
if revision is not None:
5001
5708
if len(revision) > 2:
5002
raise errors.BzrCommandError('bzr merge-directive takes '
5003
'at most two one revision identifiers')
5709
raise errors.BzrCommandError(gettext('bzr merge-directive takes '
5710
'at most two one revision identifiers'))
5004
5711
revision_id = revision[-1].as_revision_id(branch)
5005
5712
if len(revision) == 2:
5006
5713
base_revision_id = revision[0].as_revision_id(branch)
5008
5715
revision_id = branch.last_revision()
5009
5716
revision_id = ensure_null(revision_id)
5010
5717
if revision_id == NULL_REVISION:
5011
raise errors.BzrCommandError('No revisions to bundle.')
5718
raise errors.BzrCommandError(gettext('No revisions to bundle.'))
5012
5719
directive = merge_directive.MergeDirective2.from_objects(
5013
5720
branch.repository, revision_id, time.time(),
5014
5721
osutils.local_time_offset(), submit_branch,
5022
5729
self.outf.writelines(directive.to_lines())
5023
5730
else:
5024
5731
message = directive.to_email(mail_to, branch, sign)
5025
s = SMTPConnection(branch.get_config())
5732
s = SMTPConnection(branch.get_config_stack())
5026
5733
s.send_email(message)
5027
5734
5028
5735
5029
5736
class cmd_send(Command):
5030
"""Mail or create a merge-directive for submitting changes.
5737
__doc__ = """Mail or create a merge-directive for submitting changes.
5031
5738
5032
5739
A merge directive provides many things needed for requesting merges:
5033
5740
5058
5765
source branch defaults to that containing the working directory, but can
5059
5766
be changed using --from.
5060
5767
5768
Both the submit branch and the public branch follow the usual behavior with
5769
respect to --remember: If there is no default location set, the first send
5770
will set it (use --no-remember to avoid setting it). After that, you can
5771
omit the location to use the default. To change the default, use
5772
--remember. The value will only be saved if the location can be accessed.
5773
5061
5774
In order to calculate those changes, bzr must analyse the submit branch.
5062
5775
Therefore it is most efficient for the submit branch to be a local mirror.
5063
5776
If a public location is known for the submit_branch, that location is used
5067
5780
given, in which case it is sent to a file.
5068
5781
5069
5782
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.
5783
on Windows (it uses MAPI). On Unix, it requires the xdg-email utility.
5071
5784
If the preferred client can't be found (or used), your editor will be used.
5072
5785
5073
5786
To use a specific mail program, set the mail_client configuration option.
5115
5828
short_name='f',
5116
5829
type=unicode),
5117
5830
Option('output', short_name='o',
5118
help='Write merge directive to this file; '
5831
help='Write merge directive to this file or directory; '
5119
5832
'use - for stdout.',
5120
5833
type=unicode),
5121
5834
Option('strict',
5132
5845
]
5133
5846
5134
5847
def run(self, submit_branch=None, public_branch=None, no_bundle=False,
5135
no_patch=False, revision=None, remember=False, output=None,
5848
no_patch=False, revision=None, remember=None, output=None,
5136
5849
format=None, mail_to=None, message=None, body=None,
5137
5850
strict=None, **kwargs):
5138
5851
from bzrlib.send import send
5144
5857
5145
5858
5146
5859
class cmd_bundle_revisions(cmd_send):
5147
"""Create a merge-directive for submitting changes.
5860
__doc__ = """Create a merge-directive for submitting changes.
5148
5861
5149
5862
A merge directive provides many things needed for requesting merges:
5150
5863
5217
5930
5218
5931
5219
5932
class cmd_tag(Command):
5220
"""Create, remove or modify a tag naming a revision.
5933
__doc__ = """Create, remove or modify a tag naming a revision.
5221
5934
5222
5935
Tags give human-meaningful names to revisions. Commands that take a -r
5223
5936
(--revision) option can be given -rtag:X, where X is any previously
5231
5944
5232
5945
To rename a tag (change the name but keep it on the same revsion), run ``bzr
5233
5946
tag new-name -r tag:old-name`` and then ``bzr tag --delete oldname``.
5947
5948
If no tag name is specified it will be determined through the
5949
'automatic_tag_name' hook. This can e.g. be used to automatically tag
5950
upstream releases by reading configure.ac. See ``bzr help hooks`` for
5951
details.
5234
5952
"""
5235
5953
5236
5954
_see_also = ['commit', 'tags']
5237
takes_args = ['tag_name']
5955
takes_args = ['tag_name?']
5238
5956
takes_options = [
5239
5957
Option('delete',
5240
5958
help='Delete this tag rather than placing it.',
5241
5959
),
5242
Option('directory',
5243
help='Branch in which to place the tag.',
5244
short_name='d',
5245
type=unicode,
5246
),
5960
custom_help('directory',
5961
help='Branch in which to place the tag.'),
5247
5962
Option('force',
5248
5963
help='Replace existing tags.',
5249
5964
),
5250
5965
'revision',
5251
5966
]
5252
5967
5253
def run(self, tag_name,
5968
def run(self, tag_name=None,
5254
5969
delete=None,
5255
5970
directory='.',
5256
5971
force=None,
5257
5972
revision=None,
5258
5973
):
5259
5974
branch, relpath = Branch.open_containing(directory)
5260
branch.lock_write()
5261
self.add_cleanup(branch.unlock)
5975
self.add_cleanup(branch.lock_write().unlock)
5262
5976
if delete:
5977
if tag_name is None:
5978
raise errors.BzrCommandError(gettext("No tag specified to delete."))
5263
5979
branch.tags.delete_tag(tag_name)
5264
self.outf.write('Deleted tag %s.\n' % tag_name)
5980
note(gettext('Deleted tag %s.') % tag_name)
5265
5981
else:
5266
5982
if revision:
5267
5983
if len(revision) != 1:
5268
raise errors.BzrCommandError(
5984
raise errors.BzrCommandError(gettext(
5269
5985
"Tags can only be placed on a single revision, "
5270
"not on a range")
5986
"not on a range"))
5271
5987
revision_id = revision[0].as_revision_id(branch)
5272
5988
else:
5273
5989
revision_id = branch.last_revision()
5274
if (not force) and branch.tags.has_tag(tag_name):
5990
if tag_name is None:
5991
tag_name = branch.automatic_tag_name(revision_id)
5992
if tag_name is None:
5993
raise errors.BzrCommandError(gettext(
5994
"Please specify a tag name."))
5995
try:
5996
existing_target = branch.tags.lookup_tag(tag_name)
5997
except errors.NoSuchTag:
5998
existing_target = None
5999
if not force and existing_target not in (None, revision_id):
5275
6000
raise errors.TagAlreadyExists(tag_name)
5276
branch.tags.set_tag(tag_name, revision_id)
5277
self.outf.write('Created tag %s.\n' % tag_name)
6001
if existing_target == revision_id:
6002
note(gettext('Tag %s already exists for that revision.') % tag_name)
6003
else:
6004
branch.tags.set_tag(tag_name, revision_id)
6005
if existing_target is None:
6006
note(gettext('Created tag %s.') % tag_name)
6007
else:
6008
note(gettext('Updated tag %s.') % tag_name)
5278
6009
5279
6010
5280
6011
class cmd_tags(Command):
5281
"""List tags.
6012
__doc__ = """List tags.
5282
6013
5283
6014
This command shows a table of tag names and the revisions they reference.
5284
6015
"""
5285
6016
5286
6017
_see_also = ['tag']
5287
6018
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',
6019
custom_help('directory',
6020
help='Branch whose tags should be displayed.'),
6021
RegistryOption('sort',
5294
6022
'Sort tags by different criteria.', title='Sorting',
5295
alpha='Sort tags lexicographically (default).',
5296
time='Sort tags chronologically.',
6023
lazy_registry=('bzrlib.tag', 'tag_sort_methods')
5297
6024
),
5298
6025
'show-ids',
5299
6026
'revision',
5300
6027
]
5301
6028
5302
6029
@display_command
5303
def run(self,
5304
directory='.',
5305
sort='alpha',
5306
show_ids=False,
5307
revision=None,
5308
):
6030
def run(self, directory='.', sort=None, show_ids=False, revision=None):
6031
from bzrlib.tag import tag_sort_methods
5309
6032
branch, relpath = Branch.open_containing(directory)
5310
6033
5311
6034
tags = branch.tags.get_tag_dict().items()
5312
6035
if not tags:
5313
6036
return
5314
6037
5315
branch.lock_read()
5316
self.add_cleanup(branch.unlock)
6038
self.add_cleanup(branch.lock_read().unlock)
5317
6039
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]])
6040
# Restrict to the specified range
6041
tags = self._tags_for_range(branch, revision)
6042
if sort is None:
6043
sort = tag_sort_methods.get()
6044
sort(branch, tags)
5337
6045
if not show_ids:
5338
6046
# [ (tag, revid), ... ] -> [ (tag, dotted_revno), ... ]
5339
6047
for index, (tag, revid) in enumerate(tags):
5341
6049
revno = branch.revision_id_to_dotted_revno(revid)
5342
6050
if isinstance(revno, tuple):
5343
6051
revno = '.'.join(map(str, revno))
5344
except errors.NoSuchRevision:
6052
except (errors.NoSuchRevision,
6053
errors.GhostRevisionsHaveNoRevno,
6054
errors.UnsupportedOperation):
5345
6055
# Bad tag data/merges can lead to tagged revisions
5346
6056
# which are not in this branch. Fail gracefully ...
5347
6057
revno = '?'
5350
6060
for tag, revspec in tags:
5351
6061
self.outf.write('%-20s %s\n' % (tag, revspec))
5352
6062
6063
def _tags_for_range(self, branch, revision):
6064
range_valid = True
6065
rev1, rev2 = _get_revision_range(revision, branch, self.name())
6066
revid1, revid2 = rev1.rev_id, rev2.rev_id
6067
# _get_revision_range will always set revid2 if it's not specified.
6068
# If revid1 is None, it means we want to start from the branch
6069
# origin which is always a valid ancestor. If revid1 == revid2, the
6070
# ancestry check is useless.
6071
if revid1 and revid1 != revid2:
6072
# FIXME: We really want to use the same graph than
6073
# branch.iter_merge_sorted_revisions below, but this is not
6074
# easily available -- vila 2011-09-23
6075
if branch.repository.get_graph().is_ancestor(revid2, revid1):
6076
# We don't want to output anything in this case...
6077
return []
6078
# only show revisions between revid1 and revid2 (inclusive)
6079
tagged_revids = branch.tags.get_reverse_tag_dict()
6080
found = []
6081
for r in branch.iter_merge_sorted_revisions(
6082
start_revision_id=revid2, stop_revision_id=revid1,
6083
stop_rule='include'):
6084
revid_tags = tagged_revids.get(r[0], None)
6085
if revid_tags:
6086
found.extend([(tag, r[0]) for tag in revid_tags])
6087
return found
6088
5353
6089
5354
6090
class cmd_reconfigure(Command):
5355
"""Reconfigure the type of a bzr directory.
6091
__doc__ = """Reconfigure the type of a bzr directory.
5356
6092
5357
6093
A target configuration must be specified.
5358
6094
5369
6105
takes_args = ['location?']
5370
6106
takes_options = [
5371
6107
RegistryOption.from_kwargs(
5372
'target_type',
5373
title='Target type',
5374
help='The type to reconfigure the directory to.',
6108
'tree_type',
6109
title='Tree type',
6110
help='The relation between branch and tree.',
5375
6111
value_switches=True, enum_switch=False,
5376
6112
branch='Reconfigure to be an unbound branch with no working tree.',
5377
6113
tree='Reconfigure to be an unbound branch with a working tree.',
5378
6114
checkout='Reconfigure to be a bound branch with a working tree.',
5379
6115
lightweight_checkout='Reconfigure to be a lightweight'
5380
6116
' checkout (with no local history).',
6117
),
6118
RegistryOption.from_kwargs(
6119
'repository_type',
6120
title='Repository type',
6121
help='Location fo the repository.',
6122
value_switches=True, enum_switch=False,
5381
6123
standalone='Reconfigure to be a standalone branch '
5382
6124
'(i.e. stop using shared repository).',
5383
6125
use_shared='Reconfigure to use a shared repository.',
6126
),
6127
RegistryOption.from_kwargs(
6128
'repository_trees',
6129
title='Trees in Repository',
6130
help='Whether new branches in the repository have trees.',
6131
value_switches=True, enum_switch=False,
5384
6132
with_trees='Reconfigure repository to create '
5385
6133
'working trees on branches by default.',
5386
6134
with_no_trees='Reconfigure repository to not create '
5400
6148
),
5401
6149
]
5402
6150
5403
def run(self, location=None, target_type=None, bind_to=None, force=False,
5404
stacked_on=None,
5405
unstacked=None):
5406
directory = bzrdir.BzrDir.open(location)
6151
def run(self, location=None, bind_to=None, force=False,
6152
tree_type=None, repository_type=None, repository_trees=None,
6153
stacked_on=None, unstacked=None):
6154
directory = controldir.ControlDir.open(location)
5407
6155
if stacked_on and unstacked:
5408
raise BzrCommandError("Can't use both --stacked-on and --unstacked")
6156
raise errors.BzrCommandError(gettext("Can't use both --stacked-on and --unstacked"))
5409
6157
elif stacked_on is not None:
5410
6158
reconfigure.ReconfigureStackedOn().apply(directory, stacked_on)
5411
6159
elif unstacked:
5413
6161
# At the moment you can use --stacked-on and a different
5414
6162
# reconfiguration shape at the same time; there seems no good reason
5415
6163
# to ban it.
5416
if target_type is None:
6164
if (tree_type is None and
6165
repository_type is None and
6166
repository_trees is None):
5417
6167
if stacked_on or unstacked:
5418
6168
return
5419
6169
else:
5420
raise errors.BzrCommandError('No target configuration '
5421
'specified')
5422
elif target_type == 'branch':
6170
raise errors.BzrCommandError(gettext('No target configuration '
6171
'specified'))
6172
reconfiguration = None
6173
if tree_type == 'branch':
5423
6174
reconfiguration = reconfigure.Reconfigure.to_branch(directory)
5424
elif target_type == 'tree':
6175
elif tree_type == 'tree':
5425
6176
reconfiguration = reconfigure.Reconfigure.to_tree(directory)
5426
elif target_type == 'checkout':
6177
elif tree_type == 'checkout':
5427
6178
reconfiguration = reconfigure.Reconfigure.to_checkout(
5428
6179
directory, bind_to)
5429
elif target_type == 'lightweight-checkout':
6180
elif tree_type == 'lightweight-checkout':
5430
6181
reconfiguration = reconfigure.Reconfigure.to_lightweight_checkout(
5431
6182
directory, bind_to)
5432
elif target_type == 'use-shared':
6183
if reconfiguration:
6184
reconfiguration.apply(force)
6185
reconfiguration = None
6186
if repository_type == 'use-shared':
5433
6187
reconfiguration = reconfigure.Reconfigure.to_use_shared(directory)
5434
elif target_type == 'standalone':
6188
elif repository_type == 'standalone':
5435
6189
reconfiguration = reconfigure.Reconfigure.to_standalone(directory)
5436
elif target_type == 'with-trees':
6190
if reconfiguration:
6191
reconfiguration.apply(force)
6192
reconfiguration = None
6193
if repository_trees == 'with-trees':
5437
6194
reconfiguration = reconfigure.Reconfigure.set_repository_trees(
5438
6195
directory, True)
5439
elif target_type == 'with-no-trees':
6196
elif repository_trees == 'with-no-trees':
5440
6197
reconfiguration = reconfigure.Reconfigure.set_repository_trees(
5441
6198
directory, False)
5442
reconfiguration.apply(force)
6199
if reconfiguration:
6200
reconfiguration.apply(force)
6201
reconfiguration = None
5443
6202
5444
6203
5445
6204
class cmd_switch(Command):
5446
"""Set the branch of a checkout and update.
6205
__doc__ = """Set the branch of a checkout and update.
5447
6206
5448
6207
For lightweight checkouts, this changes the branch being referenced.
5449
6208
For heavyweight checkouts, this checks that there are no local commits
5466
6225
"""
5467
6226
5468
6227
takes_args = ['to_location?']
5469
takes_options = [Option('force',
6228
takes_options = ['directory',
6229
Option('force',
5470
6230
help='Switch even if local commits will be lost.'),
5471
6231
'revision',
5472
6232
Option('create-branch', short_name='b',
5473
6233
help='Create the target branch from this one before'
5474
6234
' switching to it.'),
6235
Option('store',
6236
help='Store and restore uncommitted changes in the'
6237
' branch.'),
5475
6238
]
5476
6239
5477
6240
def run(self, to_location=None, force=False, create_branch=False,
5478
revision=None):
6241
revision=None, directory=u'.', store=False):
5479
6242
from bzrlib import switch
5480
tree_location = '.'
6243
tree_location = directory
5481
6244
revision = _get_one_revision('switch', revision)
5482
control_dir = bzrdir.BzrDir.open_containing(tree_location)[0]
6245
possible_transports = []
6246
control_dir = controldir.ControlDir.open_containing(tree_location,
6247
possible_transports=possible_transports)[0]
5483
6248
if to_location is None:
5484
6249
if revision is None:
5485
raise errors.BzrCommandError('You must supply either a'
5486
' revision or a location')
5487
to_location = '.'
6250
raise errors.BzrCommandError(gettext('You must supply either a'
6251
' revision or a location'))
6252
to_location = tree_location
5488
6253
try:
5489
branch = control_dir.open_branch()
6254
branch = control_dir.open_branch(
6255
possible_transports=possible_transports)
5490
6256
had_explicit_nick = branch.get_config().has_explicit_nickname()
5491
6257
except errors.NotBranchError:
5492
6258
branch = None
5493
6259
had_explicit_nick = False
5494
6260
if create_branch:
5495
6261
if branch is None:
5496
raise errors.BzrCommandError('cannot create branch without'
5497
' source branch')
5498
to_location = directory_service.directories.dereference(
5499
to_location)
5500
if '/' not in to_location and '\\' not in to_location:
5501
# This path is meant to be relative to the existing branch
5502
this_url = self._get_branch_location(control_dir)
5503
to_location = urlutils.join(this_url, '..', to_location)
6262
raise errors.BzrCommandError(
6263
gettext('cannot create branch without source branch'))
6264
to_location = lookup_new_sibling_branch(control_dir, to_location,
6265
possible_transports=possible_transports)
5504
6266
to_branch = branch.bzrdir.sprout(to_location,
5505
possible_transports=[branch.bzrdir.root_transport],
5506
source_branch=branch).open_branch()
6267
possible_transports=possible_transports,
6268
source_branch=branch).open_branch()
5507
6269
else:
5508
6270
try:
5509
to_branch = Branch.open(to_location)
6271
to_branch = Branch.open(to_location,
6272
possible_transports=possible_transports)
5510
6273
except errors.NotBranchError:
5511
this_url = self._get_branch_location(control_dir)
5512
to_branch = Branch.open(
5513
urlutils.join(this_url, '..', to_location))
6274
to_branch = open_sibling_branch(control_dir, to_location,
6275
possible_transports=possible_transports)
5514
6276
if revision is not None:
5515
6277
revision = revision.as_revision_id(to_branch)
5516
switch.switch(control_dir, to_branch, force, revision_id=revision)
6278
switch.switch(control_dir, to_branch, force, revision_id=revision,
6279
store_uncommitted=store)
5517
6280
if had_explicit_nick:
5518
6281
branch = control_dir.open_branch() #get the new branch!
5519
6282
branch.nick = to_branch.nick
5520
note('Switched to branch: %s',
6283
note(gettext('Switched to branch: %s'),
5521
6284
urlutils.unescape_for_display(to_branch.base, 'utf-8'))
5522
6285
5523
def _get_branch_location(self, control_dir):
5524
"""Return location of branch for this control dir."""
5525
try:
5526
this_branch = control_dir.open_branch()
5527
# This may be a heavy checkout, where we want the master branch
5528
master_location = this_branch.get_bound_location()
5529
if master_location is not None:
5530
return master_location
5531
# If not, use a local sibling
5532
return this_branch.base
5533
except errors.NotBranchError:
5534
format = control_dir.find_branch_format()
5535
if getattr(format, 'get_reference', None) is not None:
5536
return format.get_reference(control_dir)
5537
else:
5538
return control_dir.root_transport.base
5539
6286
5540
6287
5541
6288
class cmd_view(Command):
5542
"""Manage filtered views.
6289
__doc__ = """Manage filtered views.
5543
6290
5544
6291
Views provide a mask over the tree so that users can focus on
5545
6292
a subset of a tree when doing their work. After creating a view,
5625
6372
name=None,
5626
6373
switch=None,
5627
6374
):
5628
tree, file_list = tree_files(file_list, apply_view=False)
6375
tree, file_list = WorkingTree.open_containing_paths(file_list,
6376
apply_view=False)
5629
6377
current_view, view_dict = tree.views.get_view_info()
5630
6378
if name is None:
5631
6379
name = current_view
5632
6380
if delete:
5633
6381
if file_list:
5634
raise errors.BzrCommandError(
5635
"Both --delete and a file list specified")
6382
raise errors.BzrCommandError(gettext(
6383
"Both --delete and a file list specified"))
5636
6384
elif switch:
5637
raise errors.BzrCommandError(
5638
"Both --delete and --switch specified")
6385
raise errors.BzrCommandError(gettext(
6386
"Both --delete and --switch specified"))
5639
6387
elif all:
5640
6388
tree.views.set_view_info(None, {})
5641
self.outf.write("Deleted all views.\n")
6389
self.outf.write(gettext("Deleted all views.\n"))
5642
6390
elif name is None:
5643
raise errors.BzrCommandError("No current view to delete")
6391
raise errors.BzrCommandError(gettext("No current view to delete"))
5644
6392
else:
5645
6393
tree.views.delete_view(name)
5646
self.outf.write("Deleted '%s' view.\n" % name)
6394
self.outf.write(gettext("Deleted '%s' view.\n") % name)
5647
6395
elif switch:
5648
6396
if file_list:
5649
raise errors.BzrCommandError(
5650
"Both --switch and a file list specified")
6397
raise errors.BzrCommandError(gettext(
6398
"Both --switch and a file list specified"))
5651
6399
elif all:
5652
raise errors.BzrCommandError(
5653
"Both --switch and --all specified")
6400
raise errors.BzrCommandError(gettext(
6401
"Both --switch and --all specified"))
5654
6402
elif switch == 'off':
5655
6403
if current_view is None:
5656
raise errors.BzrCommandError("No current view to disable")
6404
raise errors.BzrCommandError(gettext("No current view to disable"))
5657
6405
tree.views.set_view_info(None, view_dict)
5658
self.outf.write("Disabled '%s' view.\n" % (current_view))
6406
self.outf.write(gettext("Disabled '%s' view.\n") % (current_view))
5659
6407
else:
5660
6408
tree.views.set_view_info(switch, view_dict)
5661
6409
view_str = views.view_display_str(tree.views.lookup_view())
5662
self.outf.write("Using '%s' view: %s\n" % (switch, view_str))
6410
self.outf.write(gettext("Using '{0}' view: {1}\n").format(switch, view_str))
5663
6411
elif all:
5664
6412
if view_dict:
5665
self.outf.write('Views defined:\n')
6413
self.outf.write(gettext('Views defined:\n'))
5666
6414
for view in sorted(view_dict):
5667
6415
if view == current_view:
5668
6416
active = "=>"
5671
6419
view_str = views.view_display_str(view_dict[view])
5672
6420
self.outf.write('%s %-20s %s\n' % (active, view, view_str))
5673
6421
else:
5674
self.outf.write('No views defined.\n')
6422
self.outf.write(gettext('No views defined.\n'))
5675
6423
elif file_list:
5676
6424
if name is None:
5677
6425
# No name given and no current view set
5678
6426
name = 'my'
5679
6427
elif name == 'off':
5680
raise errors.BzrCommandError(
5681
"Cannot change the 'off' pseudo view")
6428
raise errors.BzrCommandError(gettext(
6429
"Cannot change the 'off' pseudo view"))
5682
6430
tree.views.set_view(name, sorted(file_list))
5683
6431
view_str = views.view_display_str(tree.views.lookup_view())
5684
self.outf.write("Using '%s' view: %s\n" % (name, view_str))
6432
self.outf.write(gettext("Using '{0}' view: {1}\n").format(name, view_str))
5685
6433
else:
5686
6434
# list the files
5687
6435
if name is None:
5688
6436
# No name given and no current view set
5689
self.outf.write('No current view.\n')
6437
self.outf.write(gettext('No current view.\n'))
5690
6438
else:
5691
6439
view_str = views.view_display_str(tree.views.lookup_view(name))
5692
self.outf.write("'%s' view is: %s\n" % (name, view_str))
6440
self.outf.write(gettext("'{0}' view is: {1}\n").format(name, view_str))
5693
6441
5694
6442
5695
6443
class cmd_hooks(Command):
5696
"""Show hooks."""
6444
__doc__ = """Show hooks."""
5697
6445
5698
6446
hidden = True
5699
6447
5709
6457
self.outf.write(" %s\n" %
5710
6458
(some_hooks.get_hook_name(hook),))
5711
6459
else:
5712
self.outf.write(" <no hooks installed>\n")
6460
self.outf.write(gettext(" <no hooks installed>\n"))
6461
6462
6463
class cmd_remove_branch(Command):
6464
__doc__ = """Remove a branch.
6465
6466
This will remove the branch from the specified location but
6467
will keep any working tree or repository in place.
6468
6469
:Examples:
6470
6471
Remove the branch at repo/trunk::
6472
6473
bzr remove-branch repo/trunk
6474
6475
"""
6476
6477
takes_args = ["location?"]
6478
6479
takes_options = ['directory',
6480
Option('force', help='Remove branch even if it is the active branch.')]
6481
6482
aliases = ["rmbranch"]
6483
6484
def run(self, directory=None, location=None, force=False):
6485
br = open_nearby_branch(near=directory, location=location)
6486
if not force and br.bzrdir.has_workingtree():
6487
try:
6488
active_branch = br.bzrdir.open_branch(name="")
6489
except errors.NotBranchError:
6490
active_branch = None
6491
if (active_branch is not None and
6492
br.control_url == active_branch.control_url):
6493
raise errors.BzrCommandError(
6494
gettext("Branch is active. Use --force to remove it."))
6495
br.bzrdir.destroy_branch(br.name)
5713
6496
5714
6497
5715
6498
class cmd_shelve(Command):
5716
"""Temporarily set aside some changes from the current tree.
6499
__doc__ = """Temporarily set aside some changes from the current tree.
5717
6500
5718
6501
Shelve allows you to temporarily put changes you've made "on the shelf",
5719
6502
ie. out of the way, until a later time when you can bring them back from
5735
6518
5736
6519
You can put multiple items on the shelf, and by default, 'unshelve' will
5737
6520
restore the most recently shelved changes.
6521
6522
For complicated changes, it is possible to edit the changes in a separate
6523
editor program to decide what the file remaining in the working copy
6524
should look like. To do this, add the configuration option
6525
6526
change_editor = PROGRAM @new_path @old_path
6527
6528
where @new_path is replaced with the path of the new version of the
6529
file and @old_path is replaced with the path of the old version of
6530
the file. The PROGRAM should save the new file with the desired
6531
contents of the file in the working tree.
6532
5738
6533
"""
5739
6534
5740
6535
takes_args = ['file*']
5741
6536
5742
6537
takes_options = [
6538
'directory',
5743
6539
'revision',
5744
6540
Option('all', help='Shelve all changes.'),
5745
6541
'message',
5751
6547
Option('destroy',
5752
6548
help='Destroy removed changes instead of shelving them.'),
5753
6549
]
5754
_see_also = ['unshelve']
6550
_see_also = ['unshelve', 'configuration']
5755
6551
5756
6552
def run(self, revision=None, all=False, file_list=None, message=None,
5757
writer=None, list=False, destroy=False):
6553
writer=None, list=False, destroy=False, directory=None):
5758
6554
if list:
5759
return self.run_for_list()
6555
return self.run_for_list(directory=directory)
5760
6556
from bzrlib.shelf_ui import Shelver
5761
6557
if writer is None:
5762
6558
writer = bzrlib.option.diff_writer_registry.get()
5763
6559
try:
5764
6560
shelver = Shelver.from_args(writer(sys.stdout), revision, all,
5765
file_list, message, destroy=destroy)
6561
file_list, message, destroy=destroy, directory=directory)
5766
6562
try:
5767
6563
shelver.run()
5768
6564
finally:
5770
6566
except errors.UserAbort:
5771
6567
return 0
5772
6568
5773
def run_for_list(self):
5774
tree = WorkingTree.open_containing('.')[0]
5775
tree.lock_read()
5776
self.add_cleanup(tree.unlock)
6569
def run_for_list(self, directory=None):
6570
if directory is None:
6571
directory = u'.'
6572
tree = WorkingTree.open_containing(directory)[0]
6573
self.add_cleanup(tree.lock_read().unlock)
5777
6574
manager = tree.get_shelf_manager()
5778
6575
shelves = manager.active_shelves()
5779
6576
if len(shelves) == 0:
5780
note('No shelved changes.')
6577
note(gettext('No shelved changes.'))
5781
6578
return 0
5782
6579
for shelf_id in reversed(shelves):
5783
6580
message = manager.get_metadata(shelf_id).get('message')
5788
6585
5789
6586
5790
6587
class cmd_unshelve(Command):
5791
"""Restore shelved changes.
6588
__doc__ = """Restore shelved changes.
5792
6589
5793
6590
By default, the most recently shelved changes are restored. However if you
5794
6591
specify a shelf by id those changes will be restored instead. This works
5797
6594
5798
6595
takes_args = ['shelf_id?']
5799
6596
takes_options = [
6597
'directory',
5800
6598
RegistryOption.from_kwargs(
5801
6599
'action', help="The action to perform.",
5802
6600
enum_switch=False, value_switches=True,
5810
6608
]
5811
6609
_see_also = ['shelve']
5812
6610
5813
def run(self, shelf_id=None, action='apply'):
6611
def run(self, shelf_id=None, action='apply', directory=u'.'):
5814
6612
from bzrlib.shelf_ui import Unshelver
5815
unshelver = Unshelver.from_args(shelf_id, action)
6613
unshelver = Unshelver.from_args(shelf_id, action, directory=directory)
5816
6614
try:
5817
6615
unshelver.run()
5818
6616
finally:
5820
6618
5821
6619
5822
6620
class cmd_clean_tree(Command):
5823
"""Remove unwanted files from working tree.
6621
__doc__ = """Remove unwanted files from working tree.
5824
6622
5825
6623
By default, only unknown files, not ignored files, are deleted. Versioned
5826
6624
files are never deleted.
5834
6632
5835
6633
To check what clean-tree will do, use --dry-run.
5836
6634
"""
5837
takes_options = [Option('ignored', help='Delete all ignored files.'),
5838
Option('detritus', help='Delete conflict files, merge'
6635
takes_options = ['directory',
6636
Option('ignored', help='Delete all ignored files.'),
6637
Option('detritus', help='Delete conflict files, merge and revert'
5839
6638
' backups, and failed selftest dirs.'),
5840
6639
Option('unknown',
5841
6640
help='Delete files unknown to bzr (default).'),
5843
6642
' deleting them.'),
5844
6643
Option('force', help='Do not prompt before deleting.')]
5845
6644
def run(self, unknown=False, ignored=False, detritus=False, dry_run=False,
5846
force=False):
6645
force=False, directory=u'.'):
5847
6646
from bzrlib.clean_tree import clean_tree
5848
6647
if not (unknown or ignored or detritus):
5849
6648
unknown = True
5850
6649
if dry_run:
5851
6650
force = True
5852
clean_tree('.', unknown=unknown, ignored=ignored, detritus=detritus,
5853
dry_run=dry_run, no_prompt=force)
6651
clean_tree(directory, unknown=unknown, ignored=ignored,
6652
detritus=detritus, dry_run=dry_run, no_prompt=force)
5854
6653
5855
6654
5856
6655
class cmd_reference(Command):
5857
"""list, view and set branch locations for nested trees.
6656
__doc__ = """list, view and set branch locations for nested trees.
5858
6657
5859
6658
If no arguments are provided, lists the branch locations for nested trees.
5860
6659
If one argument is provided, display the branch location for that tree.
5870
6669
if path is not None:
5871
6670
branchdir = path
5872
6671
tree, branch, relpath =(
5873
bzrdir.BzrDir.open_containing_tree_or_branch(branchdir))
6672
controldir.ControlDir.open_containing_tree_or_branch(branchdir))
5874
6673
if path is not None:
5875
6674
path = relpath
5876
6675
if tree is None:
5900
6699
self.outf.write('%s %s\n' % (path, location))
5901
6700
5902
6701
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
6702
class cmd_export_pot(Command):
6703
__doc__ = """Export command helps and error messages in po format."""
6704
6705
hidden = True
6706
takes_options = [Option('plugin',
6707
help='Export help text from named command '\
6708
'(defaults to all built in commands).',
6709
type=str),
6710
Option('include-duplicates',
6711
help='Output multiple copies of the same msgid '
6712
'string if it appears more than once.'),
6713
]
6714
6715
def run(self, plugin=None, include_duplicates=False):
6716
from bzrlib.export_pot import export_pot
6717
export_pot(self.outf, plugin, include_duplicates)
6718
6719
6720
def _register_lazy_builtins():
6721
# register lazy builtins from other modules; called at startup and should
6722
# be only called once.
6723
for (name, aliases, module_name) in [
6724
('cmd_bundle_info', [], 'bzrlib.bundle.commands'),
6725
('cmd_config', [], 'bzrlib.config'),
6726
('cmd_dpush', [], 'bzrlib.foreign'),
6727
('cmd_version_info', [], 'bzrlib.cmd_version_info'),
6728
('cmd_resolve', ['resolved'], 'bzrlib.conflicts'),
6729
('cmd_conflicts', [], 'bzrlib.conflicts'),
6730
('cmd_ping', [], 'bzrlib.smart.ping'),
6731
('cmd_sign_my_commits', [], 'bzrlib.commit_signature_commands'),
6732
('cmd_verify_signatures', [], 'bzrlib.commit_signature_commands'),
6733
('cmd_test_script', [], 'bzrlib.cmd_test_script'),
6734
]:
6735
builtin_command_registry.register_lazy(name, aliases, module_name)
Loggerhead is a web-based interface for Breezy
Version: 2.0.1