To get this branch, use:
bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
« back to all changes in this revision
Viewing changes to breezy/builtins.py
- browse files at revision 6631.2.3
- compare with another revision
- download diff
- download tarball
- view history from revision 6631.2.3
- Committer: Martin
- Date: 2017-05-24 23:30:47 UTC
- mto: This revision was merged to the branch mainline in revision 6633.
- Revision ID: gzlist@googlemail.com-20170524233047-5etu6ukzpgaxbw3y
Fix per_versionedfile test failures and rethink future_builtins
- files added:
- NEWS
- breezy/branchfmt
- breezy/plugins/bash_completion
- breezy/plugins/bash_completion/tests
- breezy/plugins/bisect
- breezy/plugins/changelog_merge
- breezy/plugins/changelog_merge/tests
- breezy/plugins/fastimport
- breezy/plugins/fastimport/doc
- breezy/plugins/fastimport/processors
- breezy/plugins/fastimport/tests
- breezy/plugins/grep
- breezy/plugins/po_merge
- breezy/plugins/po_merge/tests
- breezy/plugins/weave_fmt
- breezy/plugins/weave_fmt/tests
- breezy/tests/per_bzrdir
- breezy/tests/per_repository_vf
- po
- files removed:
- bzr.ico
- bzrlib/benchmarks
- bzrlib/benchmarks/tree_creator
- bzrlib/util/configobj
- bzrlib/util/effbot
- bzrlib/util/effbot/org
- bzrlib/util/elementtree
- files renamed:
- apport/bzr-crashdb.conf => apport/brz-crashdb.conf
- apport/source_bzr.py => apport/source_brz.py
- bzrlib/ => breezy/
- bzrlib/sign_my_commits.py => breezy/commit_signature_commands.py
- bzrlib/doc_generate/sphinx_conf.py => breezy/doc_generate/conf.py
- bzrlib/repofmt/weaverepo.py => breezy/plugins/weave_fmt/repository.py
- bzrlib/xml4.py => breezy/plugins/weave_fmt/xml4.py
- bzrlib/tests/per_bzrdir/ => breezy/tests/per_controldir/
- bzrlib/tests/per_bzrdir/test_bzrdir.py => breezy/tests/per_controldir/test_controldir.py
- bzrlib/tests/per_bzrdir_colo/ => breezy/tests/per_controldir_colo/
- bzrlib/tests/per_repository/test_is_write_locked.py => breezy/tests/per_repository/test_locking.py
- bzrlib/tests/per_repository/helpers.py => breezy/tests/per_repository_vf/helpers.py
- bzrlib/tests/per_repository/test__generate_text_key_index.py => breezy/tests/per_repository_vf/test__generate_text_key_index.py
- bzrlib/tests/per_repository/test_add_inventory_by_delta.py => breezy/tests/per_repository_vf/test_add_inventory_by_delta.py
- bzrlib/tests/per_repository/test_check_reconcile.py => breezy/tests/per_repository_vf/test_check_reconcile.py
- bzrlib/tests/per_repository/test_find_text_key_references.py => breezy/tests/per_repository_vf/test_find_text_key_references.py
- bzrlib/tests/per_repository/test_merge_directive.py => breezy/tests/per_repository_vf/test_merge_directive.py
- bzr => brz
- contrib/bash/bzrbashprompt.sh => contrib/bash/brzbashprompt.sh
- contrib/bzr_access => contrib/brz_access
- contrib/emacs/bzr-mode.el => contrib/emacs/brz-mode.el
- doc/developers/_static/bzr-doc.css => doc/developers/_static/brz-doc.css
- doc/en/_static/en/bzr-en-quick-reference.pdf => doc/en/_static/en/brz-en-quick-reference.pdf
- doc/en/_static/en/bzr-en-quick-reference.png => doc/en/_static/en/brz-en-quick-reference.png
- doc/en/_static/en/bzr-en-quick-reference.svg => doc/en/_static/en/brz-en-quick-reference.svg
- NEWS => doc/en/release-notes/bzr-2.3.txt
- NEWS-template.txt => doc/en/release-notes/release-template.txt
- doc/en/tutorials/using_bazaar_with_launchpad.txt => doc/en/tutorials/using_breezy_with_launchpad.txt
- tools/bzr_epydoc => tools/brz_epydoc
- tools/bzr_epydoc_uid.py => tools/brz_epydoc_uid.py
- tools/win32/bzr-win32-bdist-postinstall.py => tools/win32/brz-win32-bdist-postinstall.py
- tools/win32/bzr.iss.cog => tools/win32/brz.iss.cog
- tools/win32/bzr_postinstall.py => tools/win32/brz_postinstall.py
- tools/win32/start_bzr.bat => tools/win32/start_brz.bat
- files modified:
- .bzrignore
added
removed
breezy/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
14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
17
"""builtin bzr commands"""
18
17
"""builtin brz commands"""
18
19
from __future__ import absolute_import
20
21
import errno
19
22
import os
20
21
from bzrlib.lazy_import import lazy_import
22
lazy_import(globals(), """
23
import codecs
24
import cStringIO
25
23
import sys
24
25
import breezy.bzrdir
26
27
from . import lazy_import
28
lazy_import.lazy_import(globals(), """
26
29
import time
27
30
28
import bzrlib
29
from bzrlib import (
31
import breezy
32
from breezy import (
30
33
bugtracker,
31
34
bundle,
32
35
btree_index,
33
bzrdir,
36
controldir,
34
37
directory_service,
35
38
delta,
36
config,
39
config as _mod_config,
37
40
errors,
38
41
globbing,
39
42
hooks,
45
48
rename_map,
46
49
revision as _mod_revision,
47
50
static_tuple,
48
symbol_versioning,
49
51
timestamp,
50
52
transport,
51
53
ui,
52
54
urlutils,
53
55
views,
56
gpg,
54
57
)
55
from bzrlib.branch import Branch
56
from bzrlib.conflicts import ConflictList
57
from bzrlib.transport import memory
58
from bzrlib.revisionspec import RevisionSpec, RevisionInfo
59
from bzrlib.smtp_connection import SMTPConnection
60
from bzrlib.workingtree import WorkingTree
58
from breezy.branch import Branch
59
from breezy.conflicts import ConflictList
60
from breezy.transport import memory
61
from breezy.revisionspec import RevisionSpec, RevisionInfo
62
from breezy.smtp_connection import SMTPConnection
63
from breezy.workingtree import WorkingTree
64
from breezy.i18n import gettext, ngettext
61
65
""")
62
66
63
from bzrlib.commands import (
67
from .commands import (
64
68
Command,
65
69
builtin_command_registry,
66
70
display_command,
67
71
)
68
from bzrlib.option import (
72
from .option import (
69
73
ListOption,
70
74
Option,
71
75
RegistryOption,
72
76
custom_help,
73
77
_parse_revision_str,
74
78
)
75
from bzrlib.trace import mutter, note, warning, is_quiet, get_verbosity_level
76
77
78
def tree_files(file_list, default_branch=u'.', canonicalize=True,
79
apply_view=True):
80
try:
81
return internal_tree_files(file_list, default_branch, canonicalize,
82
apply_view)
83
except errors.FileInWrongBranch, e:
84
raise errors.BzrCommandError("%s is not in the same branch as %s" %
85
(e.path, file_list[0]))
79
from .sixish import (
80
BytesIO,
81
text_type,
82
)
83
from .trace import mutter, note, warning, is_quiet, get_verbosity_level
84
from . import (
85
symbol_versioning,
86
)
87
88
89
def _get_branch_location(control_dir, possible_transports=None):
90
"""Return location of branch for this control dir."""
91
try:
92
target = control_dir.get_branch_reference()
93
except errors.NotBranchError:
94
return control_dir.root_transport.base
95
if target is not None:
96
return target
97
this_branch = control_dir.open_branch(
98
possible_transports=possible_transports)
99
# This may be a heavy checkout, where we want the master branch
100
master_location = this_branch.get_bound_location()
101
if master_location is not None:
102
return master_location
103
# If not, use a local sibling
104
return this_branch.base
105
106
107
def _is_colocated(control_dir, possible_transports=None):
108
"""Check if the branch in control_dir is colocated.
109
110
:param control_dir: Control directory
111
:return: Tuple with boolean indicating whether the branch is colocated
112
and the full URL to the actual branch
113
"""
114
# This path is meant to be relative to the existing branch
115
this_url = _get_branch_location(control_dir,
116
possible_transports=possible_transports)
117
# Perhaps the target control dir supports colocated branches?
118
try:
119
root = controldir.ControlDir.open(this_url,
120
possible_transports=possible_transports)
121
except errors.NotBranchError:
122
return (False, this_url)
123
else:
124
try:
125
wt = control_dir.open_workingtree()
126
except (errors.NoWorkingTree, errors.NotLocalUrl):
127
return (False, this_url)
128
else:
129
return (
130
root._format.colocated_branches and
131
control_dir.control_url == root.control_url,
132
this_url)
133
134
135
def lookup_new_sibling_branch(control_dir, location, possible_transports=None):
136
"""Lookup the location for a new sibling branch.
137
138
:param control_dir: Control directory to find sibling branches from
139
:param location: Name of the new branch
140
:return: Full location to the new branch
141
"""
142
location = directory_service.directories.dereference(location)
143
if '/' not in location and '\\' not in location:
144
(colocated, this_url) = _is_colocated(control_dir, possible_transports)
145
146
if colocated:
147
return urlutils.join_segment_parameters(this_url,
148
{"branch": urlutils.escape(location)})
149
else:
150
return urlutils.join(this_url, '..', urlutils.escape(location))
151
return location
152
153
154
def open_sibling_branch(control_dir, location, possible_transports=None):
155
"""Open a branch, possibly a sibling of another.
156
157
:param control_dir: Control directory relative to which to lookup the
158
location.
159
:param location: Location to look up
160
:return: branch to open
161
"""
162
try:
163
# Perhaps it's a colocated branch?
164
return control_dir.open_branch(location,
165
possible_transports=possible_transports)
166
except (errors.NotBranchError, errors.NoColocatedBranchSupport):
167
this_url = _get_branch_location(control_dir)
168
return Branch.open(
169
urlutils.join(
170
this_url, '..', urlutils.escape(location)))
171
172
173
def open_nearby_branch(near=None, location=None, possible_transports=None):
174
"""Open a nearby branch.
175
176
:param near: Optional location of container from which to open branch
177
:param location: Location of the branch
178
:return: Branch instance
179
"""
180
if near is None:
181
if location is None:
182
location = "."
183
try:
184
return Branch.open(location,
185
possible_transports=possible_transports)
186
except errors.NotBranchError:
187
near = "."
188
cdir = controldir.ControlDir.open(near,
189
possible_transports=possible_transports)
190
return open_sibling_branch(cdir, location,
191
possible_transports=possible_transports)
192
193
194
def iter_sibling_branches(control_dir, possible_transports=None):
195
"""Iterate over the siblings of a branch.
196
197
:param control_dir: Control directory for which to look up the siblings
198
:return: Iterator over tuples with branch name and branch object
199
"""
200
seen_urls = set()
201
try:
202
reference = control_dir.get_branch_reference()
203
except errors.NotBranchError:
204
# There is no active branch, just return the colocated branches.
205
for name, branch in control_dir.get_branches().iteritems():
206
yield name, branch
207
return
208
if reference is not None:
209
ref_branch = Branch.open(reference,
210
possible_transports=possible_transports)
211
else:
212
ref_branch = None
213
if ref_branch is None or ref_branch.name:
214
if ref_branch is not None:
215
control_dir = ref_branch.bzrdir
216
for name, branch in control_dir.get_branches().iteritems():
217
yield name, branch
218
else:
219
repo = ref_branch.bzrdir.find_repository()
220
for branch in repo.find_branches(using=True):
221
name = urlutils.relative_url(repo.user_url,
222
branch.user_url).rstrip("/")
223
yield name, branch
86
224
87
225
88
226
def tree_files_for_add(file_list):
113
251
if view_files:
114
252
file_list = view_files
115
253
view_str = views.view_display_str(view_files)
116
note("Ignoring files outside view. View is %s" % view_str)
254
note(gettext("Ignoring files outside view. View is %s") % view_str)
117
255
return tree, file_list
118
256
119
257
121
259
if revisions is None:
122
260
return None
123
261
if len(revisions) != 1:
124
raise errors.BzrCommandError(
125
'bzr %s --revision takes exactly one revision identifier' % (
262
raise errors.BzrCommandError(gettext(
263
'brz %s --revision takes exactly one revision identifier') % (
126
264
command_name,))
127
265
return revisions[0]
128
266
150
288
return rev_tree
151
289
152
290
153
# XXX: Bad function name; should possibly also be a class method of
154
# WorkingTree rather than a function.
155
def internal_tree_files(file_list, default_branch=u'.', canonicalize=True,
156
apply_view=True):
157
"""Convert command-line paths to a WorkingTree and relative paths.
158
159
This is typically used for command-line processors that take one or
160
more filenames, and infer the workingtree that contains them.
161
162
The filenames given are not required to exist.
163
164
:param file_list: Filenames to convert.
165
166
:param default_branch: Fallback tree path to use if file_list is empty or
167
None.
168
169
:param apply_view: if True and a view is set, apply it or check that
170
specified files are within it
171
172
:return: workingtree, [relative_paths]
173
"""
174
if file_list is None or len(file_list) == 0:
175
tree = WorkingTree.open_containing(default_branch)[0]
176
if tree.supports_views() and apply_view:
177
view_files = tree.views.lookup_view()
178
if view_files:
179
file_list = view_files
180
view_str = views.view_display_str(view_files)
181
note("Ignoring files outside view. View is %s" % view_str)
182
return tree, file_list
183
tree = WorkingTree.open_containing(osutils.realpath(file_list[0]))[0]
184
return tree, safe_relpath_files(tree, file_list, canonicalize,
185
apply_view=apply_view)
186
187
188
def safe_relpath_files(tree, file_list, canonicalize=True, apply_view=True):
189
"""Convert file_list into a list of relpaths in tree.
190
191
:param tree: A tree to operate on.
192
:param file_list: A list of user provided paths or None.
193
:param apply_view: if True and a view is set, apply it or check that
194
specified files are within it
195
:return: A list of relative paths.
196
:raises errors.PathNotChild: When a provided path is in a different tree
197
than tree.
198
"""
199
if file_list is None:
200
return None
201
if tree.supports_views() and apply_view:
202
view_files = tree.views.lookup_view()
203
else:
204
view_files = []
205
new_list = []
206
# tree.relpath exists as a "thunk" to osutils, but canonical_relpath
207
# doesn't - fix that up here before we enter the loop.
208
if canonicalize:
209
fixer = lambda p: osutils.canonical_relpath(tree.basedir, p)
210
else:
211
fixer = tree.relpath
212
for filename in file_list:
213
try:
214
relpath = fixer(osutils.dereference_path(filename))
215
if view_files and not osutils.is_inside_any(view_files, relpath):
216
raise errors.FileOutsideView(filename, view_files)
217
new_list.append(relpath)
218
except errors.PathNotChild:
219
raise errors.FileInWrongBranch(tree.branch, filename)
220
return new_list
221
222
223
291
def _get_view_info_for_change_reporter(tree):
224
292
"""Get the view information from a tree for change reporting."""
225
293
view_info = None
232
300
return view_info
233
301
234
302
303
def _open_directory_or_containing_tree_or_branch(filename, directory):
304
"""Open the tree or branch containing the specified file, unless
305
the --directory option is used to specify a different branch."""
306
if directory is not None:
307
return (None, Branch.open(directory), filename)
308
return controldir.ControlDir.open_containing_tree_or_branch(filename)
309
310
235
311
# TODO: Make sure no commands unconditionally use the working directory as a
236
312
# branch. If a filename argument is used, the first of them should be used to
237
313
# specify the branch. (Perhaps this can be factored out into some kind of
265
341
unknown
266
342
Not versioned and not matching an ignore pattern.
267
343
268
Additionally for directories, symlinks and files with an executable
269
bit, Bazaar indicates their type using a trailing character: '/', '@'
270
or '*' respectively.
344
Additionally for directories, symlinks and files with a changed
345
executable bit, Bazaar indicates their type using a trailing
346
character: '/', '@' or '*' respectively. These decorations can be
347
disabled using the '--no-classify' option.
271
348
272
To see ignored files use 'bzr ignored'. For details on the
273
changes to file texts, use 'bzr diff'.
349
To see ignored files use 'brz ignored'. For details on the
350
changes to file texts, use 'brz diff'.
274
351
275
352
Note that --short or -S gives status flags for each item, similar
276
353
to Subversion's status command. To get output similar to svn -q,
277
use bzr status -SV.
354
use brz status -SV.
278
355
279
356
If no arguments are specified, the status of the entire working
280
357
directory is shown. Otherwise, only the status of the specified
286
363
To skip the display of pending merge information altogether, use
287
364
the no-pending option or specify a file/directory.
288
365
289
If a revision argument is given, the status is calculated against
290
that revision, or between two revisions if two are provided.
366
To compare the working directory to a specific revision, pass a
367
single revision to the revision argument.
368
369
To see which files have changed in a specific revision, or between
370
two revisions, pass a revision range to the revision argument.
371
This will produce the same results as calling 'brz diff --summarize'.
291
372
"""
292
373
293
# TODO: --no-recurse, --recurse options
374
# TODO: --no-recurse/-N, --recurse options
294
375
295
376
takes_args = ['file*']
296
377
takes_options = ['show-ids', 'revision', 'change', 'verbose',
300
381
short_name='V'),
301
382
Option('no-pending', help='Don\'t show pending merges.',
302
383
),
384
Option('no-classify',
385
help='Do not mark object type using indicator.',
386
),
303
387
]
304
388
aliases = ['st', 'stat']
305
389
308
392
309
393
@display_command
310
394
def run(self, show_ids=False, file_list=None, revision=None, short=False,
311
versioned=False, no_pending=False, verbose=False):
312
from bzrlib.status import show_tree_status
395
versioned=False, no_pending=False, verbose=False,
396
no_classify=False):
397
from .status import show_tree_status
313
398
314
399
if revision and len(revision) > 2:
315
raise errors.BzrCommandError('bzr status --revision takes exactly'
316
' one or two revision specifiers')
400
raise errors.BzrCommandError(gettext('brz status --revision takes exactly'
401
' one or two revision specifiers'))
317
402
318
tree, relfile_list = tree_files(file_list)
403
tree, relfile_list = WorkingTree.open_containing_paths(file_list)
319
404
# Avoid asking for specific files when that is not needed.
320
405
if relfile_list == ['']:
321
406
relfile_list = None
328
413
show_tree_status(tree, show_ids=show_ids,
329
414
specific_files=relfile_list, revision=revision,
330
415
to_file=self.outf, short=short, versioned=versioned,
331
show_pending=(not no_pending), verbose=verbose)
416
show_pending=(not no_pending), verbose=verbose,
417
classify=not no_classify)
332
418
333
419
334
420
class cmd_cat_revision(Command):
340
426
341
427
hidden = True
342
428
takes_args = ['revision_id?']
343
takes_options = ['revision']
429
takes_options = ['directory', 'revision']
344
430
# cat-revision is more for frontends so should be exact
345
431
encoding = 'strict'
346
432
353
439
self.outf.write(revtext.decode('utf-8'))
354
440
355
441
@display_command
356
def run(self, revision_id=None, revision=None):
442
def run(self, revision_id=None, revision=None, directory=u'.'):
357
443
if revision_id is not None and revision is not None:
358
raise errors.BzrCommandError('You can only supply one of'
359
' revision_id or --revision')
444
raise errors.BzrCommandError(gettext('You can only supply one of'
445
' revision_id or --revision'))
360
446
if revision_id is None and revision is None:
361
raise errors.BzrCommandError('You must supply either'
362
' --revision or a revision_id')
363
b = WorkingTree.open_containing(u'.')[0].branch
447
raise errors.BzrCommandError(gettext('You must supply either'
448
' --revision or a revision_id'))
449
450
b = controldir.ControlDir.open_containing_tree_or_branch(directory)[1]
364
451
365
452
revisions = b.repository.revisions
366
453
if revisions is None:
367
raise errors.BzrCommandError('Repository %r does not support '
368
'access to raw revision texts')
454
raise errors.BzrCommandError(gettext('Repository %r does not support '
455
'access to raw revision texts'))
369
456
370
457
b.repository.lock_read()
371
458
try:
375
462
try:
376
463
self.print_revision(revisions, revision_id)
377
464
except errors.NoSuchRevision:
378
msg = "The repository %s contains no revision %s." % (
465
msg = gettext("The repository {0} contains no revision {1}.").format(
379
466
b.repository.base, revision_id)
380
467
raise errors.BzrCommandError(msg)
381
468
elif revision is not None:
382
469
for rev in revision:
383
470
if rev is None:
384
471
raise errors.BzrCommandError(
385
'You cannot specify a NULL revision.')
472
gettext('You cannot specify a NULL revision.'))
386
473
rev_id = rev.as_revision_id(b)
387
474
self.print_revision(revisions, rev_id)
388
475
finally:
423
510
"""Create a BTreeGraphIndex and raw bytes."""
424
511
bt = btree_index.BTreeGraphIndex(trans, basename, None)
425
512
bytes = trans.get_bytes(basename)
426
bt._file = cStringIO.StringIO(bytes)
513
bt._file = BytesIO(bytes)
427
514
bt._size = len(bytes)
428
515
return bt, bytes
429
516
444
531
self.outf.write(page_bytes[:header_end])
445
532
page_bytes = data
446
533
self.outf.write('\nPage %d\n' % (page_idx,))
447
decomp_bytes = zlib.decompress(page_bytes)
448
self.outf.write(decomp_bytes)
449
self.outf.write('\n')
534
if len(page_bytes) == 0:
535
self.outf.write('(empty)\n');
536
else:
537
decomp_bytes = zlib.decompress(page_bytes)
538
self.outf.write(decomp_bytes)
539
self.outf.write('\n')
450
540
451
541
def _dump_entries(self, trans, basename):
452
542
try:
476
566
Since a lightweight checkout is little more than a working tree
477
567
this will refuse to run against one.
478
568
479
To re-create the working tree, use "bzr checkout".
569
To re-create the working tree, use "brz checkout".
480
570
"""
481
571
_see_also = ['checkout', 'working-trees']
482
572
takes_args = ['location*']
483
573
takes_options = [
484
574
Option('force',
485
575
help='Remove the working tree even if it has '
486
'uncommitted changes.'),
576
'uncommitted or shelved changes.'),
487
577
]
488
578
489
579
def run(self, location_list, force=False):
491
581
location_list=['.']
492
582
493
583
for location in location_list:
494
d = bzrdir.BzrDir.open(location)
495
584
d = controldir.ControlDir.open(location)
585
496
586
try:
497
587
working = d.open_workingtree()
498
588
except errors.NoWorkingTree:
499
raise errors.BzrCommandError("No working tree to remove")
589
raise errors.BzrCommandError(gettext("No working tree to remove"))
500
590
except errors.NotLocalUrl:
501
raise errors.BzrCommandError("You cannot remove the working tree"
502
" of a remote path")
591
raise errors.BzrCommandError(gettext("You cannot remove the working tree"
592
" of a remote path"))
503
593
if not force:
504
594
if (working.has_changes()):
505
595
raise errors.UncommittedChanges(working)
596
if working.get_shelf_manager().last_shelf() is not None:
597
raise errors.ShelvedChanges(working)
506
598
507
599
if working.user_url != working.branch.user_url:
508
raise errors.BzrCommandError("You cannot remove the working tree"
509
" from a lightweight checkout")
600
raise errors.BzrCommandError(gettext("You cannot remove the working tree"
601
" from a lightweight checkout"))
510
602
511
603
d.destroy_workingtree()
512
604
513
605
606
class cmd_repair_workingtree(Command):
607
__doc__ = """Reset the working tree state file.
608
609
This is not meant to be used normally, but more as a way to recover from
610
filesystem corruption, etc. This rebuilds the working inventory back to a
611
'known good' state. Any new modifications (adding a file, renaming, etc)
612
will be lost, though modified files will still be detected as such.
613
614
Most users will want something more like "brz revert" or "brz update"
615
unless the state file has become corrupted.
616
617
By default this attempts to recover the current state by looking at the
618
headers of the state file. If the state file is too corrupted to even do
619
that, you can supply --revision to force the state of the tree.
620
"""
621
622
takes_options = ['revision', 'directory',
623
Option('force',
624
help='Reset the tree even if it doesn\'t appear to be'
625
' corrupted.'),
626
]
627
hidden = True
628
629
def run(self, revision=None, directory='.', force=False):
630
tree, _ = WorkingTree.open_containing(directory)
631
self.add_cleanup(tree.lock_tree_write().unlock)
632
if not force:
633
try:
634
tree.check_state()
635
except errors.BzrError:
636
pass # There seems to be a real error here, so we'll reset
637
else:
638
# Refuse
639
raise errors.BzrCommandError(gettext(
640
'The tree does not appear to be corrupt. You probably'
641
' want "brz revert" instead. Use "--force" if you are'
642
' sure you want to reset the working tree.'))
643
if revision is None:
644
revision_ids = None
645
else:
646
revision_ids = [r.as_revision_id(tree.branch) for r in revision]
647
try:
648
tree.reset_state(revision_ids)
649
except errors.BzrError as e:
650
if revision_ids is None:
651
extra = (gettext(', the header appears corrupt, try passing -r -1'
652
' to set the state to the last commit'))
653
else:
654
extra = ''
655
raise errors.BzrCommandError(gettext('failed to reset the tree state{0}').format(extra))
656
657
514
658
class cmd_revno(Command):
515
659
__doc__ = """Show current revision number.
516
660
520
664
_see_also = ['info']
521
665
takes_args = ['location?']
522
666
takes_options = [
523
Option('tree', help='Show revno of working tree'),
667
Option('tree', help='Show revno of working tree.'),
668
'revision',
524
669
]
525
670
526
671
@display_command
527
def run(self, tree=False, location=u'.'):
672
def run(self, tree=False, location=u'.', revision=None):
673
if revision is not None and tree:
674
raise errors.BzrCommandError(gettext("--tree and --revision can "
675
"not be used together"))
676
528
677
if tree:
529
678
try:
530
679
wt = WorkingTree.open_containing(location)[0]
531
wt.lock_read()
680
self.add_cleanup(wt.lock_read().unlock)
532
681
except (errors.NoWorkingTree, errors.NotLocalUrl):
533
682
raise errors.NoWorkingTree(location)
534
self.add_cleanup(wt.unlock)
683
b = wt.branch
535
684
revid = wt.last_revision()
536
try:
537
revno_t = wt.branch.revision_id_to_dotted_revno(revid)
538
except errors.NoSuchRevision:
539
revno_t = ('???',)
540
revno = ".".join(str(n) for n in revno_t)
541
685
else:
542
686
b = Branch.open_containing(location)[0]
543
b.lock_read()
544
self.add_cleanup(b.unlock)
545
revno = b.revno()
687
self.add_cleanup(b.lock_read().unlock)
688
if revision:
689
if len(revision) != 1:
690
raise errors.BzrCommandError(gettext(
691
"Revision numbers only make sense for single "
692
"revisions, not ranges"))
693
revid = revision[0].as_revision_id(b)
694
else:
695
revid = b.last_revision()
696
try:
697
revno_t = b.revision_id_to_dotted_revno(revid)
698
except errors.NoSuchRevision:
699
revno_t = ('???',)
700
revno = ".".join(str(n) for n in revno_t)
546
701
self.cleanup_now()
547
self.outf.write(str(revno) + '\n')
702
self.outf.write(revno + '\n')
548
703
549
704
550
705
class cmd_revision_info(Command):
554
709
takes_args = ['revision_info*']
555
710
takes_options = [
556
711
'revision',
557
Option('directory',
712
custom_help('directory',
558
713
help='Branch to examine, '
559
'rather than the one containing the working directory.',
560
short_name='d',
561
type=unicode,
562
),
563
Option('tree', help='Show revno of working tree'),
714
'rather than the one containing the working directory.'),
715
Option('tree', help='Show revno of working tree.'),
564
716
]
565
717
566
718
@display_command
570
722
try:
571
723
wt = WorkingTree.open_containing(directory)[0]
572
724
b = wt.branch
573
wt.lock_read()
574
self.add_cleanup(wt.unlock)
725
self.add_cleanup(wt.lock_read().unlock)
575
726
except (errors.NoWorkingTree, errors.NotLocalUrl):
576
727
wt = None
577
728
b = Branch.open_containing(directory)[0]
578
b.lock_read()
579
self.add_cleanup(b.unlock)
729
self.add_cleanup(b.lock_read().unlock)
580
730
revision_ids = []
581
731
if revision is not None:
582
732
revision_ids.extend(rev.as_revision_id(b) for rev in revision)
624
774
are added. This search proceeds recursively into versioned
625
775
directories. If no names are given '.' is assumed.
626
776
627
Therefore simply saying 'bzr add' will version all files that
777
A warning will be printed when nested trees are encountered,
778
unless they are explicitly ignored.
779
780
Therefore simply saying 'brz add' will version all files that
628
781
are currently unknown.
629
782
630
783
Adding a file whose parent directory is not versioned will
645
798
646
799
Any files matching patterns in the ignore list will not be added
647
800
unless they are explicitly mentioned.
801
802
In recursive mode, files larger than the configuration option
803
add.maximum_file_size will be skipped. Named items are never skipped due
804
to file size.
648
805
"""
649
806
takes_args = ['file*']
650
807
takes_options = [
651
808
Option('no-recurse',
652
help="Don't recursively add the contents of directories."),
809
help="Don't recursively add the contents of directories.",
810
short_name='N'),
653
811
Option('dry-run',
654
812
help="Show what would be done, but don't actually do anything."),
655
813
'verbose',
656
814
Option('file-ids-from',
657
type=unicode,
815
type=text_type,
658
816
help='Lookup file ids from this tree.'),
659
817
]
660
818
encoding_type = 'replace'
662
820
663
821
def run(self, file_list, no_recurse=False, dry_run=False, verbose=False,
664
822
file_ids_from=None):
665
import bzrlib.add
823
import breezy.add
666
824
667
825
base_tree = None
668
826
if file_ids_from is not None:
674
832
file_ids_from)
675
833
base_tree = base_branch.basis_tree()
676
834
677
action = bzrlib.add.AddFromBaseAction(base_tree, base_path,
835
action = breezy.add.AddFromBaseAction(base_tree, base_path,
678
836
to_file=self.outf, should_print=(not is_quiet()))
679
837
else:
680
action = bzrlib.add.AddAction(to_file=self.outf,
838
action = breezy.add.AddWithSkipLargeAction(to_file=self.outf,
681
839
should_print=(not is_quiet()))
682
840
683
841
if base_tree:
684
base_tree.lock_read()
685
self.add_cleanup(base_tree.unlock)
842
self.add_cleanup(base_tree.lock_read().unlock)
686
843
tree, file_list = tree_files_for_add(file_list)
687
844
added, ignored = tree.smart_add(file_list, not
688
845
no_recurse, action=action, save=not dry_run)
691
848
if verbose:
692
849
for glob in sorted(ignored.keys()):
693
850
for path in ignored[glob]:
694
self.outf.write("ignored %s matching \"%s\"\n"
695
% (path, glob))
851
self.outf.write(
852
gettext("ignored {0} matching \"{1}\"\n").format(
853
path, glob))
696
854
697
855
698
856
class cmd_mkdir(Command):
702
860
"""
703
861
704
862
takes_args = ['dir+']
863
takes_options = [
864
Option(
865
'parents',
866
help='No error if existing, make parent directories as needed.',
867
short_name='p'
868
)
869
]
705
870
encoding_type = 'replace'
706
871
707
def run(self, dir_list):
708
for d in dir_list:
709
wt, dd = WorkingTree.open_containing(d)
710
base = os.path.dirname(dd)
711
id = wt.path2id(base)
712
if id != None:
713
os.mkdir(d)
714
wt.add([dd])
715
self.outf.write('added %s\n' % d)
872
@classmethod
873
def add_file_with_parents(cls, wt, relpath):
874
if wt.path2id(relpath) is not None:
875
return
876
cls.add_file_with_parents(wt, osutils.dirname(relpath))
877
wt.add([relpath])
878
879
@classmethod
880
def add_file_single(cls, wt, relpath):
881
wt.add([relpath])
882
883
def run(self, dir_list, parents=False):
884
if parents:
885
add_file = self.add_file_with_parents
886
else:
887
add_file = self.add_file_single
888
for dir in dir_list:
889
wt, relpath = WorkingTree.open_containing(dir)
890
if parents:
891
try:
892
os.makedirs(dir)
893
except OSError as e:
894
if e.errno != errno.EEXIST:
895
raise
716
896
else:
717
raise errors.NotVersionedError(path=base)
897
os.mkdir(dir)
898
add_file(wt, relpath)
899
if not is_quiet():
900
self.outf.write(gettext('added %s\n') % dir)
718
901
719
902
720
903
class cmd_relpath(Command):
739
922
type using the --kind option. For example: --kind file.
740
923
741
924
It is also possible to restrict the list of files to a specific
742
set. For example: bzr inventory --show-ids this/file
925
set. For example: brz inventory --show-ids this/file
743
926
"""
744
927
745
928
hidden = True
749
932
'show-ids',
750
933
Option('kind',
751
934
help='List entries of a particular kind: file, directory, symlink.',
752
type=unicode),
935
type=text_type),
753
936
]
754
937
takes_args = ['file*']
755
938
756
939
@display_command
757
940
def run(self, revision=None, show_ids=False, kind=None, file_list=None):
758
941
if kind and kind not in ['file', 'directory', 'symlink']:
759
raise errors.BzrCommandError('invalid kind %r specified' % (kind,))
942
raise errors.BzrCommandError(gettext('invalid kind %r specified') % (kind,))
760
943
761
944
revision = _get_one_revision('inventory', revision)
762
work_tree, file_list = tree_files(file_list)
763
work_tree.lock_read()
764
self.add_cleanup(work_tree.unlock)
945
work_tree, file_list = WorkingTree.open_containing_paths(file_list)
946
self.add_cleanup(work_tree.lock_read().unlock)
765
947
if revision is not None:
766
948
tree = revision.as_tree(work_tree.branch)
767
949
768
950
extra_trees = [work_tree]
769
tree.lock_read()
770
self.add_cleanup(tree.unlock)
951
self.add_cleanup(tree.lock_read().unlock)
771
952
else:
772
953
tree = work_tree
773
954
extra_trees = []
774
955
956
self.add_cleanup(tree.lock_read().unlock)
775
957
if file_list is not None:
776
958
file_ids = tree.paths2ids(file_list, trees=extra_trees,
777
959
require_versioned=True)
778
960
# find_ids_across_trees may include some paths that don't
779
961
# exist in 'tree'.
780
entries = sorted((tree.id2path(file_id), tree.inventory[file_id])
781
for file_id in file_ids if file_id in tree)
962
entries = tree.iter_entries_by_dir(specific_file_ids=file_ids)
782
963
else:
783
entries = tree.inventory.entries()
964
entries = tree.iter_entries_by_dir()
784
965
785
self.cleanup_now()
786
for path, entry in entries:
966
for path, entry in sorted(entries):
787
967
if kind and kind != entry.kind:
788
968
continue
969
if path == "":
970
continue
789
971
if show_ids:
790
972
self.outf.write('%-50s %s\n' % (path, entry.file_id))
791
973
else:
797
979
__doc__ = """Move or rename a file.
798
980
799
981
:Usage:
800
bzr mv OLDNAME NEWNAME
982
brz mv OLDNAME NEWNAME
801
983
802
bzr mv SOURCE... DESTINATION
984
brz mv SOURCE... DESTINATION
803
985
804
986
If the last argument is a versioned directory, all the other names
805
987
are moved into it. Otherwise, there must be exactly two arguments
815
997
"""
816
998
817
999
takes_args = ['names*']
818
takes_options = [Option("after", help="Move only the bzr identifier"
1000
takes_options = [Option("after", help="Move only the brz identifier"
819
1001
" of the file, because the file has already been moved."),
820
1002
Option('auto', help='Automatically guess renames.'),
821
1003
Option('dry-run', help='Avoid making changes when guessing renames.'),
827
1009
if auto:
828
1010
return self.run_auto(names_list, after, dry_run)
829
1011
elif dry_run:
830
raise errors.BzrCommandError('--dry-run requires --auto.')
1012
raise errors.BzrCommandError(gettext('--dry-run requires --auto.'))
831
1013
if names_list is None:
832
1014
names_list = []
833
1015
if len(names_list) < 2:
834
raise errors.BzrCommandError("missing file argument")
835
tree, rel_names = tree_files(names_list, canonicalize=False)
836
tree.lock_tree_write()
837
self.add_cleanup(tree.unlock)
1016
raise errors.BzrCommandError(gettext("missing file argument"))
1017
tree, rel_names = WorkingTree.open_containing_paths(names_list, canonicalize=False)
1018
for file_name in rel_names[0:-1]:
1019
if file_name == '':
1020
raise errors.BzrCommandError(gettext("can not move root of branch"))
1021
self.add_cleanup(tree.lock_tree_write().unlock)
838
1022
self._run(tree, names_list, rel_names, after)
839
1023
840
1024
def run_auto(self, names_list, after, dry_run):
841
1025
if names_list is not None and len(names_list) > 1:
842
raise errors.BzrCommandError('Only one path may be specified to'
843
' --auto.')
1026
raise errors.BzrCommandError(gettext('Only one path may be specified to'
1027
' --auto.'))
844
1028
if after:
845
raise errors.BzrCommandError('--after cannot be specified with'
846
' --auto.')
847
work_tree, file_list = tree_files(names_list, default_branch='.')
848
work_tree.lock_tree_write()
849
self.add_cleanup(work_tree.unlock)
1029
raise errors.BzrCommandError(gettext('--after cannot be specified with'
1030
' --auto.'))
1031
work_tree, file_list = WorkingTree.open_containing_paths(
1032
names_list, default_directory='.')
1033
self.add_cleanup(work_tree.lock_tree_write().unlock)
850
1034
rename_map.RenameMap.guess_renames(work_tree, dry_run)
851
1035
852
1036
def _run(self, tree, names_list, rel_names, after):
861
1045
and rel_names[0].lower() == rel_names[1].lower()):
862
1046
into_existing = False
863
1047
else:
864
inv = tree.inventory
865
1048
# 'fix' the case of a potential 'from'
866
1049
from_id = tree.path2id(
867
1050
tree.get_canonical_inventory_path(rel_names[0]))
868
1051
if (not osutils.lexists(names_list[0]) and
869
from_id and inv.get_file_kind(from_id) == "directory"):
1052
from_id and tree.stored_kind(from_id) == "directory"):
870
1053
into_existing = False
871
1054
# move/rename
872
1055
if into_existing:
879
1062
self.outf.write("%s => %s\n" % (src, dest))
880
1063
else:
881
1064
if len(names_list) != 2:
882
raise errors.BzrCommandError('to mv multiple files the'
1065
raise errors.BzrCommandError(gettext('to mv multiple files the'
883
1066
' destination must be a versioned'
884
' directory')
1067
' directory'))
885
1068
886
1069
# for cicp file-systems: the src references an existing inventory
887
1070
# item:
938
1121
commit is one that has not been merged (directly or indirectly) into the
939
1122
parent.
940
1123
941
If branches have diverged, you can use 'bzr merge' to integrate the changes
1124
If branches have diverged, you can use 'brz merge' to integrate the changes
942
1125
from one into the other. Once one branch has merged, the other should
943
1126
be able to pull it again.
944
1127
946
1129
match the remote one, use pull --overwrite. This will work even if the two
947
1130
branches have diverged.
948
1131
949
If there is no default location set, the first pull will set it. After
950
that, you can omit the location to use the default. To change the
951
default, use --remember. The value will only be saved if the remote
952
location can be accessed.
1132
If there is no default location set, the first pull will set it (use
1133
--no-remember to avoid setting it). After that, you can omit the
1134
location to use the default. To change the default, use --remember. The
1135
value will only be saved if the remote location can be accessed.
1136
1137
The --verbose option will display the revisions pulled using the log_format
1138
configuration option. You can use a different format by overriding it with
1139
-Olog_format=<other_format>.
953
1140
954
1141
Note: The location can be specified either in the form of a branch,
955
1142
or in the form of a path to a file containing a merge directive generated
956
with bzr send.
1143
with brz send.
957
1144
"""
958
1145
959
1146
_see_also = ['push', 'update', 'status-flags', 'send']
960
1147
takes_options = ['remember', 'overwrite', 'revision',
961
1148
custom_help('verbose',
962
1149
help='Show logs of pulled revisions.'),
963
Option('directory',
1150
custom_help('directory',
964
1151
help='Branch to pull into, '
965
'rather than the one containing the working directory.',
966
short_name='d',
967
type=unicode,
968
),
1152
'rather than the one containing the working directory.'),
969
1153
Option('local',
970
1154
help="Perform a local pull in a bound "
971
1155
"branch. Local pulls are not applied to "
972
1156
"the master branch."
973
1157
),
1158
Option('show-base',
1159
help="Show base revision text in conflicts."),
1160
Option('overwrite-tags',
1161
help="Overwrite tags only."),
974
1162
]
975
1163
takes_args = ['location?']
976
1164
encoding_type = 'replace'
977
1165
978
def run(self, location=None, remember=False, overwrite=False,
1166
def run(self, location=None, remember=None, overwrite=False,
979
1167
revision=None, verbose=False,
980
directory=None, local=False):
1168
directory=None, local=False,
1169
show_base=False, overwrite_tags=False):
1170
1171
if overwrite:
1172
overwrite = ["history", "tags"]
1173
elif overwrite_tags:
1174
overwrite = ["tags"]
1175
else:
1176
overwrite = []
981
1177
# FIXME: too much stuff is in the command class
982
1178
revision_id = None
983
1179
mergeable = None
986
1182
try:
987
1183
tree_to = WorkingTree.open_containing(directory)[0]
988
1184
branch_to = tree_to.branch
989
tree_to.lock_write()
990
self.add_cleanup(tree_to.unlock)
1185
self.add_cleanup(tree_to.lock_write().unlock)
991
1186
except errors.NoWorkingTree:
992
1187
tree_to = None
993
1188
branch_to = Branch.open_containing(directory)[0]
994
branch_to.lock_write()
995
self.add_cleanup(branch_to.unlock)
1189
self.add_cleanup(branch_to.lock_write().unlock)
1190
if show_base:
1191
warning(gettext("No working tree, ignoring --show-base"))
996
1192
997
1193
if local and not branch_to.get_bound_location():
998
1194
raise errors.LocalRequiresBoundBranch()
1008
1204
stored_loc = branch_to.get_parent()
1009
1205
if location is None:
1010
1206
if stored_loc is None:
1011
raise errors.BzrCommandError("No pull location known or"
1012
" specified.")
1207
raise errors.BzrCommandError(gettext("No pull location known or"
1208
" specified."))
1013
1209
else:
1014
1210
display_url = urlutils.unescape_for_display(stored_loc,
1015
1211
self.outf.encoding)
1016
1212
if not is_quiet():
1017
self.outf.write("Using saved parent location: %s\n" % display_url)
1213
self.outf.write(gettext("Using saved parent location: %s\n") % display_url)
1018
1214
location = stored_loc
1019
1215
1020
1216
revision = _get_one_revision('pull', revision)
1021
1217
if mergeable is not None:
1022
1218
if revision is not None:
1023
raise errors.BzrCommandError(
1024
'Cannot use -r with merge directives or bundles')
1219
raise errors.BzrCommandError(gettext(
1220
'Cannot use -r with merge directives or bundles'))
1025
1221
mergeable.install_revisions(branch_to.repository)
1026
1222
base_revision_id, revision_id, verified = \
1027
1223
mergeable.get_merge_request(branch_to.repository)
1029
1225
else:
1030
1226
branch_from = Branch.open(location,
1031
1227
possible_transports=possible_transports)
1032
branch_from.lock_read()
1033
self.add_cleanup(branch_from.unlock)
1034
1035
if branch_to.get_parent() is None or remember:
1228
self.add_cleanup(branch_from.lock_read().unlock)
1229
# Remembers if asked explicitly or no previous location is set
1230
if (remember
1231
or (remember is None and branch_to.get_parent() is None)):
1232
# FIXME: This shouldn't be done before the pull
1233
# succeeds... -- vila 2012-01-02
1036
1234
branch_to.set_parent(branch_from.base)
1037
1235
1038
1236
if revision is not None:
1045
1243
view_info=view_info)
1046
1244
result = tree_to.pull(
1047
1245
branch_from, overwrite, revision_id, change_reporter,
1048
possible_transports=possible_transports, local=local)
1246
local=local, show_base=show_base)
1049
1247
else:
1050
1248
result = branch_to.pull(
1051
1249
branch_from, overwrite, revision_id, local=local)
1055
1253
log.show_branch_change(
1056
1254
branch_to, self.outf, result.old_revno,
1057
1255
result.old_revid)
1256
if getattr(result, 'tag_conflicts', None):
1257
return 1
1258
else:
1259
return 0
1058
1260
1059
1261
1060
1262
class cmd_push(Command):
1070
1272
considered diverged if the destination branch's most recent commit is one
1071
1273
that has not been merged (directly or indirectly) by the source branch.
1072
1274
1073
If branches have diverged, you can use 'bzr push --overwrite' to replace
1275
If branches have diverged, you can use 'brz push --overwrite' to replace
1074
1276
the other branch completely, discarding its unmerged changes.
1075
1277
1076
1278
If you want to ensure you have the different changes in the other branch,
1077
do a merge (see bzr help merge) from the other branch, and commit that.
1279
do a merge (see brz help merge) from the other branch, and commit that.
1078
1280
After that you will be able to do a push without '--overwrite'.
1079
1281
1080
If there is no default push location set, the first push will set it.
1081
After that, you can omit the location to use the default. To change the
1082
default, use --remember. The value will only be saved if the remote
1083
location can be accessed.
1282
If there is no default push location set, the first push will set it (use
1283
--no-remember to avoid setting it). After that, you can omit the
1284
location to use the default. To change the default, use --remember. The
1285
value will only be saved if the remote location can be accessed.
1286
1287
The --verbose option will display the revisions pushed using the log_format
1288
configuration option. You can use a different format by overriding it with
1289
-Olog_format=<other_format>.
1084
1290
"""
1085
1291
1086
1292
_see_also = ['pull', 'update', 'working-trees']
1088
1294
Option('create-prefix',
1089
1295
help='Create the path leading up to the branch '
1090
1296
'if it does not already exist.'),
1091
Option('directory',
1297
custom_help('directory',
1092
1298
help='Branch to push from, '
1093
'rather than the one containing the working directory.',
1094
short_name='d',
1095
type=unicode,
1096
),
1299
'rather than the one containing the working directory.'),
1097
1300
Option('use-existing-dir',
1098
1301
help='By default push will fail if the target'
1099
1302
' directory exists, but does not already'
1106
1309
help='Create a stacked branch that refers to another branch '
1107
1310
'for the commit history. Only the work not present in the '
1108
1311
'referenced branch is included in the branch created.',
1109
type=unicode),
1312
type=text_type),
1110
1313
Option('strict',
1111
1314
help='Refuse to push if there are uncommitted changes in'
1112
1315
' the working tree, --no-strict disables the check.'),
1316
Option('no-tree',
1317
help="Don't populate the working tree, even for protocols"
1318
" that support it."),
1319
Option('overwrite-tags',
1320
help="Overwrite tags only."),
1113
1321
]
1114
1322
takes_args = ['location?']
1115
1323
encoding_type = 'replace'
1116
1324
1117
def run(self, location=None, remember=False, overwrite=False,
1325
def run(self, location=None, remember=None, overwrite=False,
1118
1326
create_prefix=False, verbose=False, revision=None,
1119
1327
use_existing_dir=False, directory=None, stacked_on=None,
1120
stacked=False, strict=None):
1121
from bzrlib.push import _show_push_branch
1328
stacked=False, strict=None, no_tree=False,
1329
overwrite_tags=False):
1330
from .push import _show_push_branch
1331
1332
if overwrite:
1333
overwrite = ["history", "tags"]
1334
elif overwrite_tags:
1335
overwrite = ["tags"]
1336
else:
1337
overwrite = []
1122
1338
1123
1339
if directory is None:
1124
1340
directory = '.'
1125
1341
# Get the source branch
1126
1342
(tree, br_from,
1127
_unused) = bzrdir.BzrDir.open_containing_tree_or_branch(directory)
1343
_unused) = controldir.ControlDir.open_containing_tree_or_branch(directory)
1128
1344
# Get the tip's revision_id
1129
1345
revision = _get_one_revision('push', revision)
1130
1346
if revision is not None:
1151
1367
# error by the feedback given to them. RBC 20080227.
1152
1368
stacked_on = parent_url
1153
1369
if not stacked_on:
1154
raise errors.BzrCommandError(
1155
"Could not determine branch to refer to.")
1370
raise errors.BzrCommandError(gettext(
1371
"Could not determine branch to refer to."))
1156
1372
1157
1373
# Get the destination location
1158
1374
if location is None:
1159
1375
stored_loc = br_from.get_push_location()
1160
1376
if stored_loc is None:
1161
raise errors.BzrCommandError(
1162
"No push location known or specified.")
1377
parent_loc = br_from.get_parent()
1378
if parent_loc:
1379
raise errors.BzrCommandError(gettext(
1380
"No push location known or specified. To push to the "
1381
"parent branch (at %s), use 'brz push :parent'." %
1382
urlutils.unescape_for_display(parent_loc,
1383
self.outf.encoding)))
1384
else:
1385
raise errors.BzrCommandError(gettext(
1386
"No push location known or specified."))
1163
1387
else:
1164
1388
display_url = urlutils.unescape_for_display(stored_loc,
1165
1389
self.outf.encoding)
1166
self.outf.write("Using saved push location: %s\n" % display_url)
1390
note(gettext("Using saved push location: %s") % display_url)
1167
1391
location = stored_loc
1168
1392
1169
1393
_show_push_branch(br_from, revision_id, location, self.outf,
1170
1394
verbose=verbose, overwrite=overwrite, remember=remember,
1171
1395
stacked_on=stacked_on, create_prefix=create_prefix,
1172
use_existing_dir=use_existing_dir)
1396
use_existing_dir=use_existing_dir, no_tree=no_tree)
1173
1397
1174
1398
1175
1399
class cmd_branch(Command):
1184
1408
1185
1409
To retrieve the branch as of a particular revision, supply the --revision
1186
1410
parameter, as in "branch foo/bar -r 5".
1411
1412
The synonyms 'clone' and 'get' for this command are deprecated.
1187
1413
"""
1188
1414
1189
1415
_see_also = ['checkout']
1190
1416
takes_args = ['from_location', 'to_location?']
1191
takes_options = ['revision', Option('hardlink',
1192
help='Hard-link working tree files where possible.'),
1417
takes_options = ['revision',
1418
Option('hardlink', help='Hard-link working tree files where possible.'),
1419
Option('files-from', type=str,
1420
help="Get file contents from this tree."),
1193
1421
Option('no-tree',
1194
1422
help="Create a branch without a working-tree."),
1195
1423
Option('switch',
1213
1441
1214
1442
def run(self, from_location, to_location=None, revision=None,
1215
1443
hardlink=False, stacked=False, standalone=False, no_tree=False,
1216
use_existing_dir=False, switch=False, bind=False):
1217
from bzrlib import switch as _mod_switch
1218
from bzrlib.tag import _merge_tags_if_possible
1219
accelerator_tree, br_from = bzrdir.BzrDir.open_tree_or_branch(
1444
use_existing_dir=False, switch=False, bind=False,
1445
files_from=None):
1446
from breezy import switch as _mod_switch
1447
from .tag import _merge_tags_if_possible
1448
if self.invoked_as in ['get', 'clone']:
1449
ui.ui_factory.show_user_warning(
1450
'deprecated_command',
1451
deprecated_name=self.invoked_as,
1452
recommended_name='branch',
1453
deprecated_in_version='2.4')
1454
accelerator_tree, br_from = controldir.ControlDir.open_tree_or_branch(
1220
1455
from_location)
1456
if not (hardlink or files_from):
1457
# accelerator_tree is usually slower because you have to read N
1458
# files (no readahead, lots of seeks, etc), but allow the user to
1459
# explicitly request it
1460
accelerator_tree = None
1461
if files_from is not None and files_from != from_location:
1462
accelerator_tree = WorkingTree.open(files_from)
1221
1463
revision = _get_one_revision('branch', revision)
1222
br_from.lock_read()
1223
self.add_cleanup(br_from.unlock)
1464
self.add_cleanup(br_from.lock_read().unlock)
1224
1465
if revision is not None:
1225
1466
revision_id = revision.as_revision_id(br_from)
1226
1467
else:
1229
1470
# RBC 20060209
1230
1471
revision_id = br_from.last_revision()
1231
1472
if to_location is None:
1232
to_location = urlutils.derive_to_location(from_location)
1473
to_location = getattr(br_from, "name", None)
1474
if not to_location:
1475
to_location = urlutils.derive_to_location(from_location)
1233
1476
to_transport = transport.get_transport(to_location)
1234
1477
try:
1235
1478
to_transport.mkdir('.')
1236
1479
except errors.FileExists:
1237
if not use_existing_dir:
1238
raise errors.BzrCommandError('Target directory "%s" '
1239
'already exists.' % to_location)
1480
try:
1481
to_dir = controldir.ControlDir.open_from_transport(
1482
to_transport)
1483
except errors.NotBranchError:
1484
if not use_existing_dir:
1485
raise errors.BzrCommandError(gettext('Target directory "%s" '
1486
'already exists.') % to_location)
1487
else:
1488
to_dir = None
1240
1489
else:
1241
1490
try:
1242
bzrdir.BzrDir.open_from_transport(to_transport)
1491
to_dir.open_branch()
1243
1492
except errors.NotBranchError:
1244
1493
pass
1245
1494
else:
1246
1495
raise errors.AlreadyBranchError(to_location)
1247
1496
except errors.NoSuchFile:
1248
raise errors.BzrCommandError('Parent of "%s" does not exist.'
1497
raise errors.BzrCommandError(gettext('Parent of "%s" does not exist.')
1249
1498
% to_location)
1250
try:
1251
# preserve whatever source format we have.
1252
dir = br_from.bzrdir.sprout(to_transport.base, revision_id,
1253
possible_transports=[to_transport],
1254
accelerator_tree=accelerator_tree,
1255
hardlink=hardlink, stacked=stacked,
1256
force_new_repo=standalone,
1257
create_tree_if_local=not no_tree,
1258
source_branch=br_from)
1259
branch = dir.open_branch()
1260
except errors.NoSuchRevision:
1261
to_transport.delete_tree('.')
1262
msg = "The branch %s has no revision %s." % (from_location,
1263
revision)
1264
raise errors.BzrCommandError(msg)
1499
else:
1500
to_dir = None
1501
if to_dir is None:
1502
try:
1503
# preserve whatever source format we have.
1504
to_dir = br_from.bzrdir.sprout(to_transport.base, revision_id,
1505
possible_transports=[to_transport],
1506
accelerator_tree=accelerator_tree,
1507
hardlink=hardlink, stacked=stacked,
1508
force_new_repo=standalone,
1509
create_tree_if_local=not no_tree,
1510
source_branch=br_from)
1511
branch = to_dir.open_branch(
1512
possible_transports=[
1513
br_from.bzrdir.root_transport, to_transport])
1514
except errors.NoSuchRevision:
1515
to_transport.delete_tree('.')
1516
msg = gettext("The branch {0} has no revision {1}.").format(
1517
from_location, revision)
1518
raise errors.BzrCommandError(msg)
1519
else:
1520
try:
1521
to_repo = to_dir.open_repository()
1522
except errors.NoRepositoryPresent:
1523
to_repo = to_dir.create_repository()
1524
to_repo.fetch(br_from.repository, revision_id=revision_id)
1525
branch = br_from.sprout(to_dir, revision_id=revision_id)
1265
1526
_merge_tags_if_possible(br_from, branch)
1266
1527
# If the source branch is stacked, the new branch may
1267
1528
# be stacked whether we asked for that explicitly or not.
1268
1529
# We therefore need a try/except here and not just 'if stacked:'
1269
1530
try:
1270
note('Created new stacked branch referring to %s.' %
1531
note(gettext('Created new stacked branch referring to %s.') %
1271
1532
branch.get_stacked_on_url())
1272
1533
except (errors.NotStacked, errors.UnstackableBranchFormat,
1273
errors.UnstackableRepositoryFormat), e:
1274
note('Branched %d revision(s).' % branch.revno())
1534
errors.UnstackableRepositoryFormat) as e:
1535
note(ngettext('Branched %d revision.', 'Branched %d revisions.', branch.revno()) % branch.revno())
1275
1536
if bind:
1276
1537
# Bind to the parent
1277
1538
parent_branch = Branch.open(from_location)
1278
1539
branch.bind(parent_branch)
1279
note('New branch bound to %s' % from_location)
1540
note(gettext('New branch bound to %s') % from_location)
1280
1541
if switch:
1281
1542
# Switch to the new branch
1282
1543
wt, _ = WorkingTree.open_containing('.')
1283
1544
_mod_switch.switch(wt.bzrdir, branch)
1284
note('Switched to branch: %s',
1545
note(gettext('Switched to branch: %s'),
1285
1546
urlutils.unescape_for_display(branch.base, 'utf-8'))
1286
1547
1287
1548
1549
class cmd_branches(Command):
1550
__doc__ = """List the branches available at the current location.
1551
1552
This command will print the names of all the branches at the current
1553
location.
1554
"""
1555
1556
takes_args = ['location?']
1557
takes_options = [
1558
Option('recursive', short_name='R',
1559
help='Recursively scan for branches rather than '
1560
'just looking in the specified location.')]
1561
1562
def run(self, location=".", recursive=False):
1563
if recursive:
1564
t = transport.get_transport(location)
1565
if not t.listable():
1566
raise errors.BzrCommandError(
1567
"Can't scan this type of location.")
1568
for b in controldir.ControlDir.find_branches(t):
1569
self.outf.write("%s\n" % urlutils.unescape_for_display(
1570
urlutils.relative_url(t.base, b.base),
1571
self.outf.encoding).rstrip("/"))
1572
else:
1573
dir = controldir.ControlDir.open_containing(location)[0]
1574
try:
1575
active_branch = dir.open_branch(name="")
1576
except errors.NotBranchError:
1577
active_branch = None
1578
names = {}
1579
for name, branch in iter_sibling_branches(dir):
1580
if name == "":
1581
continue
1582
active = (active_branch is not None and
1583
active_branch.base == branch.base)
1584
names[name] = active
1585
# Only mention the current branch explicitly if it's not
1586
# one of the colocated branches
1587
if not any(names.values()) and active_branch is not None:
1588
self.outf.write("* %s\n" % gettext("(default)"))
1589
for name in sorted(names.keys()):
1590
active = names[name]
1591
if active:
1592
prefix = "*"
1593
else:
1594
prefix = " "
1595
self.outf.write("%s %s\n" % (
1596
prefix, name.encode(self.outf.encoding)))
1597
1598
1288
1599
class cmd_checkout(Command):
1289
1600
__doc__ = """Create a new checkout of an existing branch.
1290
1601
1306
1617
code.)
1307
1618
"""
1308
1619
1309
_see_also = ['checkouts', 'branch']
1620
_see_also = ['checkouts', 'branch', 'working-trees', 'remove-tree']
1310
1621
takes_args = ['branch_location?', 'to_location?']
1311
1622
takes_options = ['revision',
1312
1623
Option('lightweight',
1329
1640
if branch_location is None:
1330
1641
branch_location = osutils.getcwd()
1331
1642
to_location = branch_location
1332
accelerator_tree, source = bzrdir.BzrDir.open_tree_or_branch(
1643
accelerator_tree, source = controldir.ControlDir.open_tree_or_branch(
1333
1644
branch_location)
1645
if not (hardlink or files_from):
1646
# accelerator_tree is usually slower because you have to read N
1647
# files (no readahead, lots of seeks, etc), but allow the user to
1648
# explicitly request it
1649
accelerator_tree = None
1334
1650
revision = _get_one_revision('checkout', revision)
1335
if files_from is not None:
1651
if files_from is not None and files_from != branch_location:
1336
1652
accelerator_tree = WorkingTree.open(files_from)
1337
1653
if revision is not None:
1338
1654
revision_id = revision.as_revision_id(source)
1366
1682
@display_command
1367
1683
def run(self, dir=u'.'):
1368
1684
tree = WorkingTree.open_containing(dir)[0]
1369
tree.lock_read()
1370
self.add_cleanup(tree.unlock)
1371
new_inv = tree.inventory
1685
self.add_cleanup(tree.lock_read().unlock)
1372
1686
old_tree = tree.basis_tree()
1373
old_tree.lock_read()
1374
self.add_cleanup(old_tree.unlock)
1375
old_inv = old_tree.inventory
1687
self.add_cleanup(old_tree.lock_read().unlock)
1376
1688
renames = []
1377
1689
iterator = tree.iter_changes(old_tree, include_unchanged=True)
1378
1690
for f, paths, c, v, p, n, k, e in iterator:
1387
1699
1388
1700
1389
1701
class cmd_update(Command):
1390
__doc__ = """Update a tree to have the latest code committed to its branch.
1391
1392
This will perform a merge into the working tree, and may generate
1393
conflicts. If you have any local changes, you will still
1394
need to commit them after the update for the update to be complete.
1395
1396
If you want to discard your local changes, you can just do a
1397
'bzr revert' instead of 'bzr commit' after the update.
1398
1399
If the tree's branch is bound to a master branch, it will also update
1702
__doc__ = """Update a working tree to a new revision.
1703
1704
This will perform a merge of the destination revision (the tip of the
1705
branch, or the specified revision) into the working tree, and then make
1706
that revision the basis revision for the working tree.
1707
1708
You can use this to visit an older revision, or to update a working tree
1709
that is out of date from its branch.
1710
1711
If there are any uncommitted changes in the tree, they will be carried
1712
across and remain as uncommitted changes after the update. To discard
1713
these changes, use 'brz revert'. The uncommitted changes may conflict
1714
with the changes brought in by the change in basis revision.
1715
1716
If the tree's branch is bound to a master branch, brz will also update
1400
1717
the branch from the master.
1718
1719
You cannot update just a single file or directory, because each Bazaar
1720
working tree has just a single basis revision. If you want to restore a
1721
file that has been removed locally, use 'brz revert' instead of 'brz
1722
update'. If you want to restore a file to its state in a previous
1723
revision, use 'brz revert' with a '-r' option, or use 'brz cat' to write
1724
out the old content of that file to a new location.
1725
1726
The 'dir' argument, if given, must be the location of the root of a
1727
working tree to update. By default, the working tree that contains the
1728
current working directory is used.
1401
1729
"""
1402
1730
1403
1731
_see_also = ['pull', 'working-trees', 'status-flags']
1404
1732
takes_args = ['dir?']
1405
takes_options = ['revision']
1733
takes_options = ['revision',
1734
Option('show-base',
1735
help="Show base revision text in conflicts."),
1736
]
1406
1737
aliases = ['up']
1407
1738
1408
def run(self, dir='.', revision=None):
1739
def run(self, dir=None, revision=None, show_base=None):
1409
1740
if revision is not None and len(revision) != 1:
1410
raise errors.BzrCommandError(
1411
"bzr update --revision takes exactly one revision")
1412
tree = WorkingTree.open_containing(dir)[0]
1741
raise errors.brzCommandError(gettext(
1742
"brz update --revision takes exactly one revision"))
1743
if dir is None:
1744
tree = WorkingTree.open_containing('.')[0]
1745
else:
1746
tree, relpath = WorkingTree.open_containing(dir)
1747
if relpath:
1748
# See bug 557886.
1749
raise errors.BzrCommandError(gettext(
1750
"brz update can only update a whole tree, "
1751
"not a file or subdirectory"))
1413
1752
branch = tree.branch
1414
1753
possible_transports = []
1415
1754
master = branch.get_master_branch(
1416
1755
possible_transports=possible_transports)
1417
1756
if master is not None:
1418
tree.lock_write()
1419
1757
branch_location = master.base
1758
tree.lock_write()
1420
1759
else:
1760
branch_location = tree.branch.base
1421
1761
tree.lock_tree_write()
1422
branch_location = tree.branch.base
1423
1762
self.add_cleanup(tree.unlock)
1424
1763
# get rid of the final '/' and be ready for display
1425
1764
branch_location = urlutils.unescape_for_display(
1439
1778
revision_id = branch.last_revision()
1440
1779
if revision_id == _mod_revision.ensure_null(tree.last_revision()):
1441
1780
revno = branch.revision_id_to_dotted_revno(revision_id)
1442
note("Tree is up to date at revision %s of branch %s" %
1443
('.'.join(map(str, revno)), branch_location))
1781
note(gettext("Tree is up to date at revision {0} of branch {1}"
1782
).format('.'.join(map(str, revno)), branch_location))
1444
1783
return 0
1445
1784
view_info = _get_view_info_for_change_reporter(tree)
1446
1785
change_reporter = delta._ChangeReporter(
1451
1790
change_reporter,
1452
1791
possible_transports=possible_transports,
1453
1792
revision=revision_id,
1454
old_tip=old_tip)
1455
except errors.NoSuchRevision, e:
1456
raise errors.BzrCommandError(
1793
old_tip=old_tip,
1794
show_base=show_base)
1795
except errors.NoSuchRevision as e:
1796
raise errors.BzrCommandError(gettext(
1457
1797
"branch has no revision %s\n"
1458
"bzr update --revision only works"
1459
" for a revision in the branch history"
1798
"brz update --revision only works"
1799
" for a revision in the branch history")
1460
1800
% (e.revision))
1461
1801
revno = tree.branch.revision_id_to_dotted_revno(
1462
1802
_mod_revision.ensure_null(tree.last_revision()))
1463
note('Updated to revision %s of branch %s' %
1464
('.'.join(map(str, revno)), branch_location))
1803
note(gettext('Updated to revision {0} of branch {1}').format(
1804
'.'.join(map(str, revno)), branch_location))
1465
1805
parent_ids = tree.get_parent_ids()
1466
1806
if parent_ids[1:] and parent_ids[1:] != existing_pending_merges:
1467
note('Your local commits will now show as pending merges with '
1468
"'bzr status', and can be committed with 'bzr commit'.")
1807
note(gettext('Your local commits will now show as pending merges with '
1808
"'brz status', and can be committed with 'brz commit'."))
1469
1809
if conflicts != 0:
1470
1810
return 1
1471
1811
else:
1488
1828
1489
1829
Display information on the format and related locations:
1490
1830
1491
bzr info
1831
brz info
1492
1832
1493
1833
Display the above together with extended format information and
1494
1834
basic statistics (like the number of files in the working tree and
1495
1835
number of revisions in the branch and repository):
1496
1836
1497
bzr info -v
1837
brz info -v
1498
1838
1499
1839
Display the above together with number of committers to the branch:
1500
1840
1501
bzr info -vv
1841
brz info -vv
1502
1842
"""
1503
1843
_see_also = ['revno', 'working-trees', 'repositories']
1504
1844
takes_args = ['location?']
1511
1851
noise_level = get_verbosity_level()
1512
1852
else:
1513
1853
noise_level = 0
1514
from bzrlib.info import show_bzrdir_info
1515
show_bzrdir_info(bzrdir.BzrDir.open_containing(location)[0],
1854
from .info import show_bzrdir_info
1855
show_bzrdir_info(controldir.ControlDir.open_containing(location)[0],
1516
1856
verbose=noise_level, outfile=self.outf)
1517
1857
1518
1858
1519
1859
class cmd_remove(Command):
1520
1860
__doc__ = """Remove files or directories.
1521
1861
1522
This makes bzr stop tracking changes to the specified files. bzr will delete
1523
them if they can easily be recovered using revert. If no options or
1524
parameters are given bzr will scan for files that are being tracked by bzr
1525
but missing in your tree and stop tracking them for you.
1862
This makes Bazaar stop tracking changes to the specified files. Bazaar will
1863
delete them if they can easily be recovered using revert otherwise they
1864
will be backed up (adding an extension of the form .~#~). If no options or
1865
parameters are given Bazaar will scan for files that are being tracked by
1866
Bazaar but missing in your tree and stop tracking them for you.
1526
1867
"""
1527
1868
takes_args = ['file*']
1528
1869
takes_options = ['verbose',
1530
1871
RegistryOption.from_kwargs('file-deletion-strategy',
1531
1872
'The file deletion mode to be used.',
1532
1873
title='Deletion Strategy', value_switches=True, enum_switch=False,
1533
safe='Only delete files if they can be'
1534
' safely recovered (default).',
1535
keep='Delete from bzr but leave the working copy.',
1536
force='Delete all the specified files, even if they can not be '
1537
'recovered and even if they are non-empty directories.')]
1874
safe='Backup changed files (default).',
1875
keep='Delete from brz but leave the working copy.',
1876
no_backup='Don\'t backup changed files.'),
1877
]
1538
1878
aliases = ['rm', 'del']
1539
1879
encoding_type = 'replace'
1540
1880
1541
1881
def run(self, file_list, verbose=False, new=False,
1542
1882
file_deletion_strategy='safe'):
1543
tree, file_list = tree_files(file_list)
1883
1884
tree, file_list = WorkingTree.open_containing_paths(file_list)
1544
1885
1545
1886
if file_list is not None:
1546
1887
file_list = [f for f in file_list]
1547
1888
1548
tree.lock_write()
1549
self.add_cleanup(tree.unlock)
1889
self.add_cleanup(tree.lock_write().unlock)
1550
1890
# Heuristics should probably all move into tree.remove_smart or
1551
1891
# some such?
1552
1892
if new:
1554
1894
specific_files=file_list).added
1555
1895
file_list = sorted([f[0] for f in added], reverse=True)
1556
1896
if len(file_list) == 0:
1557
raise errors.BzrCommandError('No matching files.')
1897
raise errors.BzrCommandError(gettext('No matching files.'))
1558
1898
elif file_list is None:
1559
1899
# missing files show up in iter_changes(basis) as
1560
1900
# versioned-with-no-kind.
1567
1907
file_deletion_strategy = 'keep'
1568
1908
tree.remove(file_list, verbose=verbose, to_file=self.outf,
1569
1909
keep_files=file_deletion_strategy=='keep',
1570
force=file_deletion_strategy=='force')
1910
force=(file_deletion_strategy=='no-backup'))
1571
1911
1572
1912
1573
1913
class cmd_file_id(Command):
1615
1955
1616
1956
1617
1957
class cmd_reconcile(Command):
1618
__doc__ = """Reconcile bzr metadata in a branch.
1958
__doc__ = """Reconcile brz metadata in a branch.
1619
1959
1620
1960
This can correct data mismatches that may have been caused by
1621
previous ghost operations or bzr upgrades. You should only
1622
need to run this command if 'bzr check' or a bzr developer
1961
previous ghost operations or brz upgrades. You should only
1962
need to run this command if 'brz check' or a brz developer
1623
1963
advises you to run it.
1624
1964
1625
1965
If a second branch is provided, cross-branch reconciliation is
1626
1966
also attempted, which will check that data like the tree root
1627
id which was not present in very early bzr versions is represented
1967
id which was not present in very early brz versions is represented
1628
1968
correctly in both branches.
1629
1969
1630
1970
At the same time it is run it may recompress data resulting in
1635
1975
1636
1976
_see_also = ['check']
1637
1977
takes_args = ['branch?']
1978
takes_options = [
1979
Option('canonicalize-chks',
1980
help='Make sure CHKs are in canonical form (repairs '
1981
'bug 522637).',
1982
hidden=True),
1983
]
1638
1984
1639
def run(self, branch="."):
1640
from bzrlib.reconcile import reconcile
1641
dir = bzrdir.BzrDir.open(branch)
1642
reconcile(dir)
1985
def run(self, branch=".", canonicalize_chks=False):
1986
from .reconcile import reconcile
1987
dir = controldir.ControlDir.open(branch)
1988
reconcile(dir, canonicalize_chks=canonicalize_chks)
1643
1989
1644
1990
1645
1991
class cmd_revision_history(Command):
1653
1999
@display_command
1654
2000
def run(self, location="."):
1655
2001
branch = Branch.open_containing(location)[0]
1656
for revid in branch.revision_history():
2002
self.add_cleanup(branch.lock_read().unlock)
2003
graph = branch.repository.get_graph()
2004
history = list(graph.iter_lefthand_ancestry(branch.last_revision(),
2005
[_mod_revision.NULL_REVISION]))
2006
for revid in reversed(history):
1657
2007
self.outf.write(revid)
1658
2008
self.outf.write('\n')
1659
2009
1677
2027
b = wt.branch
1678
2028
last_revision = wt.last_revision()
1679
2029
1680
revision_ids = b.repository.get_ancestry(last_revision)
1681
revision_ids.pop(0)
1682
for revision_id in revision_ids:
2030
self.add_cleanup(b.repository.lock_read().unlock)
2031
graph = b.repository.get_graph()
2032
revisions = [revid for revid, parents in
2033
graph.iter_ancestry([last_revision])]
2034
for revision_id in reversed(revisions):
2035
if _mod_revision.is_null(revision_id):
2036
continue
1683
2037
self.outf.write(revision_id + '\n')
1684
2038
1685
2039
1695
2049
in the .bzr directory.
1696
2050
1697
2051
If there is already a branch at the location but it has no working tree,
1698
the tree can be populated with 'bzr checkout'.
2052
the tree can be populated with 'brz checkout'.
1699
2053
1700
2054
Recipe for importing a tree of files::
1701
2055
1702
2056
cd ~/project
1703
bzr init
1704
bzr add .
1705
bzr status
1706
bzr commit -m "imported project"
2057
brz init
2058
brz add .
2059
brz status
2060
brz commit -m "imported project"
1707
2061
"""
1708
2062
1709
2063
_see_also = ['init-repository', 'branch', 'checkout']
1715
2069
RegistryOption('format',
1716
2070
help='Specify a format for this branch. '
1717
2071
'See "help formats".',
1718
lazy_registry=('bzrlib.bzrdir', 'format_registry'),
1719
converter=lambda name: bzrdir.format_registry.make_bzrdir(name),
2072
lazy_registry=('breezy.controldir', 'format_registry'),
2073
converter=lambda name: controldir.format_registry.make_bzrdir(name),
1720
2074
value_switches=True,
1721
2075
title="Branch format",
1722
2076
),
1723
2077
Option('append-revisions-only',
1724
2078
help='Never change revnos or the existing log.'
1725
' Append revisions to it only.')
2079
' Append revisions to it only.'),
2080
Option('no-tree',
2081
'Create a branch without a working tree.')
1726
2082
]
1727
2083
def run(self, location=None, format=None, append_revisions_only=False,
1728
create_prefix=False):
2084
create_prefix=False, no_tree=False):
1729
2085
if format is None:
1730
format = bzrdir.format_registry.make_bzrdir('default')
2086
format = controldir.format_registry.make_bzrdir('default')
1731
2087
if location is None:
1732
2088
location = u'.'
1733
2089
1742
2098
to_transport.ensure_base()
1743
2099
except errors.NoSuchFile:
1744
2100
if not create_prefix:
1745
raise errors.BzrCommandError("Parent directory of %s"
2101
raise errors.BzrCommandError(gettext("Parent directory of %s"
1746
2102
" does not exist."
1747
2103
"\nYou may supply --create-prefix to create all"
1748
" leading parent directories."
2104
" leading parent directories.")
1749
2105
% location)
1750
2106
to_transport.create_prefix()
1751
2107
1752
2108
try:
1753
a_bzrdir = bzrdir.BzrDir.open_from_transport(to_transport)
2109
a_bzrdir = controldir.ControlDir.open_from_transport(to_transport)
1754
2110
except errors.NotBranchError:
1755
2111
# really a NotBzrDir error...
1756
create_branch = bzrdir.BzrDir.create_branch_convenience
2112
create_branch = controldir.ControlDir.create_branch_convenience
2113
if no_tree:
2114
force_new_tree = False
2115
else:
2116
force_new_tree = None
1757
2117
branch = create_branch(to_transport.base, format=format,
1758
possible_transports=[to_transport])
2118
possible_transports=[to_transport],
2119
force_new_tree=force_new_tree)
1759
2120
a_bzrdir = branch.bzrdir
1760
2121
else:
1761
from bzrlib.transport.local import LocalTransport
2122
from .transport.local import LocalTransport
1762
2123
if a_bzrdir.has_branch():
1763
2124
if (isinstance(to_transport, LocalTransport)
1764
2125
and not a_bzrdir.has_workingtree()):
1765
2126
raise errors.BranchExistsWithoutWorkingTree(location)
1766
2127
raise errors.AlreadyBranchError(location)
1767
2128
branch = a_bzrdir.create_branch()
1768
a_bzrdir.create_workingtree()
2129
if not no_tree and not a_bzrdir.has_workingtree():
2130
a_bzrdir.create_workingtree()
1769
2131
if append_revisions_only:
1770
2132
try:
1771
2133
branch.set_append_revisions_only(True)
1772
2134
except errors.UpgradeRequired:
1773
raise errors.BzrCommandError('This branch format cannot be set'
1774
' to append-revisions-only. Try --default.')
2135
raise errors.BzrCommandError(gettext('This branch format cannot be set'
2136
' to append-revisions-only. Try --default.'))
1775
2137
if not is_quiet():
1776
from bzrlib.info import describe_layout, describe_format
2138
from .info import describe_layout, describe_format
1777
2139
try:
1778
2140
tree = a_bzrdir.open_workingtree(recommend_upgrade=False)
1779
2141
except (errors.NoWorkingTree, errors.NotLocalUrl):
1781
2143
repository = branch.repository
1782
2144
layout = describe_layout(repository, branch, tree).lower()
1783
2145
format = describe_format(a_bzrdir, repository, branch, tree)
1784
self.outf.write("Created a %s (format: %s)\n" % (layout, format))
2146
self.outf.write(gettext("Created a {0} (format: {1})\n").format(
2147
layout, format))
1785
2148
if repository.is_shared():
1786
2149
#XXX: maybe this can be refactored into transport.path_or_url()
1787
2150
url = repository.bzrdir.root_transport.external_url()
1789
2152
url = urlutils.local_path_from_url(url)
1790
2153
except errors.InvalidURL:
1791
2154
pass
1792
self.outf.write("Using shared repository: %s\n" % url)
2155
self.outf.write(gettext("Using shared repository: %s\n") % url)
1793
2156
1794
2157
1795
2158
class cmd_init_repository(Command):
1810
2173
:Examples:
1811
2174
Create a shared repository holding just branches::
1812
2175
1813
bzr init-repo --no-trees repo
1814
bzr init repo/trunk
2176
brz init-repo --no-trees repo
2177
brz init repo/trunk
1815
2178
1816
2179
Make a lightweight checkout elsewhere::
1817
2180
1818
bzr checkout --lightweight repo/trunk trunk-checkout
2181
brz checkout --lightweight repo/trunk trunk-checkout
1819
2182
cd trunk-checkout
1820
2183
(add files here)
1821
2184
"""
1824
2187
takes_args = ["location"]
1825
2188
takes_options = [RegistryOption('format',
1826
2189
help='Specify a format for this repository. See'
1827
' "bzr help formats" for details.',
1828
lazy_registry=('bzrlib.bzrdir', 'format_registry'),
1829
converter=lambda name: bzrdir.format_registry.make_bzrdir(name),
2190
' "brz help formats" for details.',
2191
lazy_registry=('breezy.controldir', 'format_registry'),
2192
converter=lambda name: controldir.format_registry.make_bzrdir(name),
1830
2193
value_switches=True, title='Repository format'),
1831
2194
Option('no-trees',
1832
2195
help='Branches in the repository will default to'
1836
2199
1837
2200
def run(self, location, format=None, no_trees=False):
1838
2201
if format is None:
1839
format = bzrdir.format_registry.make_bzrdir('default')
2202
format = controldir.format_registry.make_bzrdir('default')
1840
2203
1841
2204
if location is None:
1842
2205
location = '.'
1843
2206
1844
2207
to_transport = transport.get_transport(location)
1845
to_transport.ensure_base()
1846
2208
1847
newdir = format.initialize_on_transport(to_transport)
1848
repo = newdir.create_repository(shared=True)
1849
repo.set_make_working_trees(not no_trees)
2209
(repo, newdir, require_stacking, repository_policy) = (
2210
format.initialize_on_transport_ex(to_transport,
2211
create_prefix=True, make_working_trees=not no_trees,
2212
shared_repo=True, force_new_repo=True,
2213
use_existing_dir=True,
2214
repo_format_name=format.repository_format.get_format_string()))
1850
2215
if not is_quiet():
1851
from bzrlib.info import show_bzrdir_info
1852
show_bzrdir_info(repo.bzrdir, verbose=0, outfile=self.outf)
2216
from .info import show_bzrdir_info
2217
show_bzrdir_info(newdir, verbose=0, outfile=self.outf)
1853
2218
1854
2219
1855
2220
class cmd_diff(Command):
1862
2227
the first argument, if any, or the current tree if no arguments are
1863
2228
given.
1864
2229
1865
"bzr diff -p1" is equivalent to "bzr diff --prefix old/:new/", and
2230
"brz diff -p1" is equivalent to "brz diff --prefix old/:new/", and
1866
2231
produces patches suitable for "patch -p1".
1867
2232
2233
Note that when using the -r argument with a range of revisions, the
2234
differences are computed between the two specified revisions. That
2235
is, the command does not show the changes introduced by the first
2236
revision in the range. This differs from the interpretation of
2237
revision ranges used by "brz log" which includes the first revision
2238
in the range.
2239
1868
2240
:Exit values:
1869
2241
1 - changed
1870
2242
2 - unrepresentable changes
1874
2246
:Examples:
1875
2247
Shows the difference in the working tree versus the last commit::
1876
2248
1877
bzr diff
2249
brz diff
1878
2250
1879
2251
Difference between the working tree and revision 1::
1880
2252
1881
bzr diff -r1
2253
brz diff -r1
1882
2254
1883
2255
Difference between revision 3 and revision 1::
1884
2256
1885
bzr diff -r1..3
2257
brz diff -r1..3
1886
2258
1887
2259
Difference between revision 3 and revision 1 for branch xxx::
1888
2260
1889
bzr diff -r1..3 xxx
1890
1891
To see the changes introduced in revision X::
2261
brz diff -r1..3 xxx
2262
2263
The changes introduced by revision 2 (equivalent to -r1..2)::
2264
2265
brz diff -c2
2266
2267
To see the changes introduced by revision X::
1892
2268
1893
bzr diff -cX
2269
brz diff -cX
1894
2270
1895
2271
Note that in the case of a merge, the -c option shows the changes
1896
2272
compared to the left hand parent. To see the changes against
1897
2273
another parent, use::
1898
2274
1899
bzr diff -r<chosen_parent>..X
1900
1901
The changes introduced by revision 2 (equivalent to -r1..2)::
1902
1903
bzr diff -c2
2275
brz diff -r<chosen_parent>..X
2276
2277
The changes between the current revision and the previous revision
2278
(equivalent to -c-1 and -r-2..-1)
2279
2280
brz diff -r-2..
1904
2281
1905
2282
Show just the differences for file NEWS::
1906
2283
1907
bzr diff NEWS
2284
brz diff NEWS
1908
2285
1909
2286
Show the differences in working tree xxx for file NEWS::
1910
2287
1911
bzr diff xxx/NEWS
2288
brz diff xxx/NEWS
1912
2289
1913
2290
Show the differences from branch xxx to this working tree:
1914
2291
1915
bzr diff --old xxx
2292
brz diff --old xxx
1916
2293
1917
2294
Show the differences between two branches for file NEWS::
1918
2295
1919
bzr diff --old xxx --new yyy NEWS
1920
1921
Same as 'bzr diff' but prefix paths with old/ and new/::
1922
1923
bzr diff --prefix old/:new/
2296
brz diff --old xxx --new yyy NEWS
2297
2298
Same as 'brz diff' but prefix paths with old/ and new/::
2299
2300
brz diff --prefix old/:new/
2301
2302
Show the differences using a custom diff program with options::
2303
2304
brz diff --using /usr/bin/diff --diff-options -wu
1924
2305
"""
1925
2306
_see_also = ['status']
1926
2307
takes_args = ['file*']
1933
2314
'two values separated by a colon. (eg "old/:new/").'),
1934
2315
Option('old',
1935
2316
help='Branch/tree to compare from.',
1936
type=unicode,
2317
type=text_type,
1937
2318
),
1938
2319
Option('new',
1939
2320
help='Branch/tree to compare to.',
1940
type=unicode,
2321
type=text_type,
1941
2322
),
1942
2323
'revision',
1943
2324
'change',
1944
2325
Option('using',
1945
2326
help='Use this command to compare files.',
1946
type=unicode,
2327
type=text_type,
1947
2328
),
1948
2329
RegistryOption('format',
2330
short_name='F',
1949
2331
help='Diff format to use.',
1950
lazy_registry=('bzrlib.diff', 'format_registry'),
1951
value_switches=False, title='Diff format'),
2332
lazy_registry=('breezy.diff', 'format_registry'),
2333
title='Diff format'),
2334
Option('context',
2335
help='How many lines of context to show.',
2336
type=int,
2337
),
1952
2338
]
1953
2339
aliases = ['di', 'dif']
1954
2340
encoding_type = 'exact'
1955
2341
1956
2342
@display_command
1957
2343
def run(self, revision=None, file_list=None, diff_options=None,
1958
prefix=None, old=None, new=None, using=None, format=None):
1959
from bzrlib.diff import (get_trees_and_branches_to_diff_locked,
2344
prefix=None, old=None, new=None, using=None, format=None,
2345
context=None):
2346
from .diff import (get_trees_and_branches_to_diff_locked,
1960
2347
show_diff_trees)
1961
2348
1962
2349
if (prefix is None) or (prefix == '0'):
1969
2356
elif ':' in prefix:
1970
2357
old_label, new_label = prefix.split(":")
1971
2358
else:
1972
raise errors.BzrCommandError(
2359
raise errors.BzrCommandError(gettext(
1973
2360
'--prefix expects two values separated by a colon'
1974
' (eg "old/:new/")')
2361
' (eg "old/:new/")'))
1975
2362
1976
2363
if revision and len(revision) > 2:
1977
raise errors.BzrCommandError('bzr diff --revision takes exactly'
1978
' one or two revision specifiers')
2364
raise errors.BzrCommandError(gettext('brz diff --revision takes exactly'
2365
' one or two revision specifiers'))
1979
2366
1980
2367
if using is not None and format is not None:
1981
raise errors.BzrCommandError('--using and --format are mutually '
1982
'exclusive.')
2368
raise errors.BzrCommandError(gettext(
2369
'{0} and {1} are mutually exclusive').format(
2370
'--using', '--format'))
1983
2371
1984
2372
(old_tree, new_tree,
1985
2373
old_branch, new_branch,
1986
2374
specific_files, extra_trees) = get_trees_and_branches_to_diff_locked(
1987
2375
file_list, revision, old, new, self.add_cleanup, apply_view=True)
2376
# GNU diff on Windows uses ANSI encoding for filenames
2377
path_encoding = osutils.get_diff_header_encoding()
1988
2378
return show_diff_trees(old_tree, new_tree, sys.stdout,
1989
2379
specific_files=specific_files,
1990
2380
external_diff_options=diff_options,
1991
2381
old_label=old_label, new_label=new_label,
1992
extra_trees=extra_trees, using=using,
2382
extra_trees=extra_trees,
2383
path_encoding=path_encoding,
2384
using=using, context=context,
1993
2385
format_cls=format)
1994
2386
1995
2387
2003
2395
# level of effort but possibly much less IO. (Or possibly not,
2004
2396
# if the directories are very large...)
2005
2397
_see_also = ['status', 'ls']
2006
takes_options = ['show-ids']
2398
takes_options = ['directory', 'show-ids']
2007
2399
2008
2400
@display_command
2009
def run(self, show_ids=False):
2010
tree = WorkingTree.open_containing(u'.')[0]
2011
tree.lock_read()
2012
self.add_cleanup(tree.unlock)
2401
def run(self, show_ids=False, directory=u'.'):
2402
tree = WorkingTree.open_containing(directory)[0]
2403
self.add_cleanup(tree.lock_read().unlock)
2013
2404
old = tree.basis_tree()
2014
old.lock_read()
2015
self.add_cleanup(old.unlock)
2016
for path, ie in old.inventory.iter_entries():
2405
self.add_cleanup(old.lock_read().unlock)
2406
for path, ie in old.iter_entries_by_dir():
2017
2407
if not tree.has_id(ie.file_id):
2018
2408
self.outf.write(path)
2019
2409
if show_ids:
2028
2418
2029
2419
hidden = True
2030
2420
_see_also = ['status', 'ls']
2031
takes_options = [
2032
Option('null',
2033
help='Write an ascii NUL (\\0) separator '
2034
'between files rather than a newline.')
2035
]
2421
takes_options = ['directory', 'null']
2036
2422
2037
2423
@display_command
2038
def run(self, null=False):
2039
tree = WorkingTree.open_containing(u'.')[0]
2424
def run(self, null=False, directory=u'.'):
2425
tree = WorkingTree.open_containing(directory)[0]
2426
self.add_cleanup(tree.lock_read().unlock)
2040
2427
td = tree.changes_from(tree.basis_tree())
2428
self.cleanup_now()
2041
2429
for path, id, kind, text_modified, meta_modified in td.modified:
2042
2430
if null:
2043
2431
self.outf.write(path + '\0')
2051
2439
2052
2440
hidden = True
2053
2441
_see_also = ['status', 'ls']
2054
takes_options = [
2055
Option('null',
2056
help='Write an ascii NUL (\\0) separator '
2057
'between files rather than a newline.')
2058
]
2442
takes_options = ['directory', 'null']
2059
2443
2060
2444
@display_command
2061
def run(self, null=False):
2062
wt = WorkingTree.open_containing(u'.')[0]
2063
wt.lock_read()
2064
self.add_cleanup(wt.unlock)
2445
def run(self, null=False, directory=u'.'):
2446
wt = WorkingTree.open_containing(directory)[0]
2447
self.add_cleanup(wt.lock_read().unlock)
2065
2448
basis = wt.basis_tree()
2066
basis.lock_read()
2067
self.add_cleanup(basis.unlock)
2068
basis_inv = basis.inventory
2069
inv = wt.inventory
2070
for file_id in inv:
2071
if file_id in basis_inv:
2072
continue
2073
if inv.is_root(file_id) and len(basis_inv) == 0:
2074
continue
2075
path = inv.id2path(file_id)
2076
if not os.access(osutils.abspath(path), os.F_OK):
2449
self.add_cleanup(basis.lock_read().unlock)
2450
root_id = wt.get_root_id()
2451
for file_id in wt.all_file_ids():
2452
if basis.has_id(file_id):
2453
continue
2454
if root_id == file_id:
2455
continue
2456
path = wt.id2path(file_id)
2457
if not os.access(osutils.pathjoin(wt.basedir, path), os.F_OK):
2077
2458
continue
2078
2459
if null:
2079
2460
self.outf.write(path + '\0')
2099
2480
try:
2100
2481
return int(limitstring)
2101
2482
except ValueError:
2102
msg = "The limit argument must be an integer."
2483
msg = gettext("The limit argument must be an integer.")
2103
2484
raise errors.BzrCommandError(msg)
2104
2485
2105
2486
2107
2488
try:
2108
2489
return int(s)
2109
2490
except ValueError:
2110
msg = "The levels argument must be an integer."
2491
msg = gettext("The levels argument must be an integer.")
2111
2492
raise errors.BzrCommandError(msg)
2112
2493
2113
2494
2114
2495
class cmd_log(Command):
2115
2496
__doc__ = """Show historical log for a branch or subset of a branch.
2116
2497
2117
log is bzr's default tool for exploring the history of a branch.
2498
log is brz's default tool for exploring the history of a branch.
2118
2499
The branch to use is taken from the first parameter. If no parameters
2119
2500
are given, the branch containing the working directory is logged.
2120
2501
Here are some simple examples::
2121
2502
2122
bzr log log the current branch
2123
bzr log foo.py log a file in its branch
2124
bzr log http://server/branch log a branch on a server
2503
brz log log the current branch
2504
brz log foo.py log a file in its branch
2505
brz log http://server/branch log a branch on a server
2125
2506
2126
2507
The filtering, ordering and information shown for each revision can
2127
2508
be controlled as explained below. By default, all revisions are
2134
2515
2135
2516
The log format controls how information about each revision is
2136
2517
displayed. The standard log formats are called ``long``, ``short``
2137
and ``line``. The default is long. See ``bzr help log-formats``
2518
and ``line``. The default is long. See ``brz help log-formats``
2138
2519
for more details on log formats.
2139
2520
2140
2521
The following options can be used to control what information is
2171
2552
-r..Y display up to and including revision Y
2172
2553
-rX..Y display from X to Y inclusive
2173
2554
2174
See ``bzr help revisionspec`` for details on how to specify X and Y.
2555
See ``brz help revisionspec`` for details on how to specify X and Y.
2175
2556
Some common examples are given below::
2176
2557
2177
2558
-r-1 show just the tip
2207
2588
2208
2589
In this case:
2209
2590
2210
* ``bzr log guide.txt`` will log the file added in revision 1
2211
2212
* ``bzr log tutorial.txt`` will log the new file added in revision 3
2213
2214
* ``bzr log -r2 -p tutorial.txt`` will show the changes made to
2591
* ``brz log guide.txt`` will log the file added in revision 1
2592
2593
* ``brz log tutorial.txt`` will log the new file added in revision 3
2594
2595
* ``brz log -r2 -p tutorial.txt`` will show the changes made to
2215
2596
the original file in revision 2.
2216
2597
2217
* ``bzr log -r2 -p guide.txt`` will display an error message as there
2598
* ``brz log -r2 -p guide.txt`` will display an error message as there
2218
2599
was no file called guide.txt in revision 2.
2219
2600
2220
2601
Renames are always followed by log. By design, there is no need to
2223
2604
2224
2605
:Other filtering:
2225
2606
2226
The --message option can be used for finding revisions that match a
2227
regular expression in a commit message.
2607
The --match option can be used for finding revisions that match a
2608
regular expression in a commit message, committer, author or bug.
2609
Specifying the option several times will match any of the supplied
2610
expressions. --match-author, --match-bugs, --match-committer and
2611
--match-message can be used to only match a specific field.
2228
2612
2229
2613
:Tips & tricks:
2230
2614
2231
2615
GUI tools and IDEs are often better at exploring history than command
2232
2616
line tools: you may prefer qlog or viz from qbzr or bzr-gtk, the
2233
bzr-explorer shell, or the Loggerhead web interface. See the Plugin
2234
Guide <http://doc.bazaar.canonical.com/plugins/en/> and
2617
bzr-explorer shell, or the Loggerhead web interface. See the Bazaar
2618
Plugin Guide <http://doc.bazaar.canonical.com/plugins/en/> and
2235
2619
<http://wiki.bazaar.canonical.com/IDEIntegration>.
2236
2620
2237
2621
You may find it useful to add the aliases below to ``bazaar.conf``::
2241
2625
top = log -l10 --line
2242
2626
show = log -v -p
2243
2627
2244
``bzr tip`` will then show the latest revision while ``bzr top``
2628
``brz tip`` will then show the latest revision while ``brz top``
2245
2629
will show the last 10 mainline revisions. To see the details of a
2246
particular revision X, ``bzr show -rX``.
2630
particular revision X, ``brz show -rX``.
2247
2631
2248
2632
If you are interested in looking deeper into a particular merge X,
2249
use ``bzr log -n0 -rX``.
2633
use ``brz log -n0 -rX``.
2250
2634
2251
``bzr log -v`` on a branch with lots of history is currently
2635
``brz log -v`` on a branch with lots of history is currently
2252
2636
very slow. A fix for this issue is currently under development.
2253
2637
With or without that fix, it is recommended that a revision range
2254
2638
be given when using the -v option.
2255
2639
2256
bzr has a generic full-text matching plugin, bzr-search, that can be
2640
brz has a generic full-text matching plugin, brz-search, that can be
2257
2641
used to find revisions matching user names, commit messages, etc.
2258
2642
Among other features, this plugin can find all revisions containing
2259
2643
a list of words but not others.
2274
2658
'show-ids',
2275
2659
'revision',
2276
2660
Option('change',
2277
type=bzrlib.option._parse_revision_str,
2661
type=breezy.option._parse_revision_str,
2278
2662
short_name='c',
2279
2663
help='Show just the specified revision.'
2280
2664
' See also "help revisionspec".'),
2281
2665
'log-format',
2666
RegistryOption('authors',
2667
'What names to list as authors - first, all or committer.',
2668
title='Authors',
2669
lazy_registry=('breezy.log', 'author_list_registry'),
2670
),
2282
2671
Option('levels',
2283
2672
short_name='n',
2284
2673
help='Number of levels to display - 0 for all, 1 for flat.',
2285
2674
argname='N',
2286
2675
type=_parse_levels),
2287
2676
Option('message',
2288
short_name='m',
2289
2677
help='Show revisions whose message matches this '
2290
2678
'regular expression.',
2291
type=str),
2679
type=str,
2680
hidden=True),
2292
2681
Option('limit',
2293
2682
short_name='l',
2294
2683
help='Limit the output to the first N revisions.',
2297
2686
Option('show-diff',
2298
2687
short_name='p',
2299
2688
help='Show changes made in each revision as a patch.'),
2300
Option('include-merges',
2689
Option('include-merged',
2301
2690
help='Show merged revisions like --levels 0 does.'),
2691
Option('include-merges', hidden=True,
2692
help='Historical alias for --include-merged.'),
2693
Option('omit-merges',
2694
help='Do not report commits with more than one parent.'),
2302
2695
Option('exclude-common-ancestry',
2303
2696
help='Display only the revisions that are not part'
2304
' of both ancestries (require -rX..Y)'
2305
)
2697
' of both ancestries (require -rX..Y).'
2698
),
2699
Option('signatures',
2700
help='Show digital signature validity.'),
2701
ListOption('match',
2702
short_name='m',
2703
help='Show revisions whose properties match this '
2704
'expression.',
2705
type=str),
2706
ListOption('match-message',
2707
help='Show revisions whose message matches this '
2708
'expression.',
2709
type=str),
2710
ListOption('match-committer',
2711
help='Show revisions whose committer matches this '
2712
'expression.',
2713
type=str),
2714
ListOption('match-author',
2715
help='Show revisions whose authors match this '
2716
'expression.',
2717
type=str),
2718
ListOption('match-bugs',
2719
help='Show revisions whose bugs match this '
2720
'expression.',
2721
type=str)
2306
2722
]
2307
2723
encoding_type = 'replace'
2308
2724
2318
2734
message=None,
2319
2735
limit=None,
2320
2736
show_diff=False,
2321
include_merges=False,
2737
include_merged=None,
2738
authors=None,
2322
2739
exclude_common_ancestry=False,
2740
signatures=False,
2741
match=None,
2742
match_message=None,
2743
match_committer=None,
2744
match_author=None,
2745
match_bugs=None,
2746
omit_merges=False,
2747
include_merges=symbol_versioning.DEPRECATED_PARAMETER,
2323
2748
):
2324
from bzrlib.log import (
2749
from .log import (
2325
2750
Logger,
2326
2751
make_log_request_dict,
2327
2752
_get_info_for_log_files,
2328
2753
)
2329
2754
direction = (forward and 'forward') or 'reverse'
2755
if symbol_versioning.deprecated_passed(include_merges):
2756
ui.ui_factory.show_user_warning(
2757
'deprecated_command_option',
2758
deprecated_name='--include-merges',
2759
recommended_name='--include-merged',
2760
deprecated_in_version='2.5',
2761
command=self.invoked_as)
2762
if include_merged is None:
2763
include_merged = include_merges
2764
else:
2765
raise errors.BzrCommandError(gettext(
2766
'{0} and {1} are mutually exclusive').format(
2767
'--include-merges', '--include-merged'))
2768
if include_merged is None:
2769
include_merged = False
2330
2770
if (exclude_common_ancestry
2331
2771
and (revision is None or len(revision) != 2)):
2332
raise errors.BzrCommandError(
2333
'--exclude-common-ancestry requires -r with two revisions')
2334
if include_merges:
2772
raise errors.BzrCommandError(gettext(
2773
'--exclude-common-ancestry requires -r with two revisions'))
2774
if include_merged:
2335
2775
if levels is None:
2336
2776
levels = 0
2337
2777
else:
2338
raise errors.BzrCommandError(
2339
'--levels and --include-merges are mutually exclusive')
2778
raise errors.BzrCommandError(gettext(
2779
'{0} and {1} are mutually exclusive').format(
2780
'--levels', '--include-merged'))
2340
2781
2341
2782
if change is not None:
2342
2783
if len(change) > 1:
2343
2784
raise errors.RangeInChangeOption()
2344
2785
if revision is not None:
2345
raise errors.BzrCommandError(
2346
'--revision and --change are mutually exclusive')
2786
raise errors.BzrCommandError(gettext(
2787
'{0} and {1} are mutually exclusive').format(
2788
'--revision', '--change'))
2347
2789
else:
2348
2790
revision = change
2349
2791
2352
2794
if file_list:
2353
2795
# find the file ids to log and check for directory filtering
2354
2796
b, file_info_list, rev1, rev2 = _get_info_for_log_files(
2355
revision, file_list)
2356
self.add_cleanup(b.unlock)
2797
revision, file_list, self.add_cleanup)
2357
2798
for relpath, file_id, kind in file_info_list:
2358
2799
if file_id is None:
2359
raise errors.BzrCommandError(
2360
"Path unknown at end or start of revision range: %s" %
2800
raise errors.BzrCommandError(gettext(
2801
"Path unknown at end or start of revision range: %s") %
2361
2802
relpath)
2362
2803
# If the relpath is the top of the tree, we log everything
2363
2804
if relpath == '':
2375
2816
location = revision[0].get_branch()
2376
2817
else:
2377
2818
location = '.'
2378
dir, relpath = bzrdir.BzrDir.open_containing(location)
2819
dir, relpath = controldir.ControlDir.open_containing(location)
2379
2820
b = dir.open_branch()
2380
b.lock_read()
2381
self.add_cleanup(b.unlock)
2821
self.add_cleanup(b.lock_read().unlock)
2382
2822
rev1, rev2 = _get_revision_range(revision, b, self.name())
2383
2823
2824
if b.get_config_stack().get('validate_signatures_in_log'):
2825
signatures = True
2826
2827
if signatures:
2828
if not gpg.GPGStrategy.verify_signatures_available():
2829
raise errors.GpgmeNotInstalled(None)
2830
2384
2831
# Decide on the type of delta & diff filtering to use
2385
2832
# TODO: add an --all-files option to make this configurable & consistent
2386
2833
if not verbose:
2404
2851
show_timezone=timezone,
2405
2852
delta_format=get_verbosity_level(),
2406
2853
levels=levels,
2407
show_advice=levels is None)
2854
show_advice=levels is None,
2855
author_list_handler=authors)
2408
2856
2409
2857
# Choose the algorithm for doing the logging. It's annoying
2410
2858
# having multiple code paths like this but necessary until
2422
2870
match_using_deltas = (len(file_ids) != 1 or filter_by_dir
2423
2871
or delta_type or partial_history)
2424
2872
2873
match_dict = {}
2874
if match:
2875
match_dict[''] = match
2876
if match_message:
2877
match_dict['message'] = match_message
2878
if match_committer:
2879
match_dict['committer'] = match_committer
2880
if match_author:
2881
match_dict['author'] = match_author
2882
if match_bugs:
2883
match_dict['bugs'] = match_bugs
2884
2425
2885
# Build the LogRequest and execute it
2426
2886
if len(file_ids) == 0:
2427
2887
file_ids = None
2430
2890
start_revision=rev1, end_revision=rev2, limit=limit,
2431
2891
message_search=message, delta_type=delta_type,
2432
2892
diff_type=diff_type, _match_using_deltas=match_using_deltas,
2433
exclude_common_ancestry=exclude_common_ancestry,
2893
exclude_common_ancestry=exclude_common_ancestry, match=match_dict,
2894
signature=signatures, omit_merges=omit_merges,
2434
2895
)
2435
2896
Logger(b, rqst).show(lf)
2436
2897
2453
2914
# b is taken from revision[0].get_branch(), and
2454
2915
# show_log will use its revision_history. Having
2455
2916
# different branches will lead to weird behaviors.
2456
raise errors.BzrCommandError(
2457
"bzr %s doesn't accept two revisions in different"
2458
" branches." % command_name)
2917
raise errors.BzrCommandError(gettext(
2918
"brz %s doesn't accept two revisions in different"
2919
" branches.") % command_name)
2459
2920
if start_spec.spec is None:
2460
2921
# Avoid loading all the history.
2461
2922
rev1 = RevisionInfo(branch, None, None)
2469
2930
else:
2470
2931
rev2 = end_spec.in_history(branch)
2471
2932
else:
2472
raise errors.BzrCommandError(
2473
'bzr %s --revision takes one or two values.' % command_name)
2933
raise errors.BzrCommandError(gettext(
2934
'brz %s --revision takes one or two values.') % command_name)
2474
2935
return rev1, rev2
2475
2936
2476
2937
2497
2958
class cmd_touching_revisions(Command):
2498
2959
__doc__ = """Return revision-ids which affected a particular file.
2499
2960
2500
A more user-friendly interface is "bzr log FILE".
2961
A more user-friendly interface is "brz log FILE".
2501
2962
"""
2502
2963
2503
2964
hidden = True
2508
2969
tree, relpath = WorkingTree.open_containing(filename)
2509
2970
file_id = tree.path2id(relpath)
2510
2971
b = tree.branch
2511
b.lock_read()
2512
self.add_cleanup(b.unlock)
2972
self.add_cleanup(b.lock_read().unlock)
2513
2973
touching_revs = log.find_touching_revisions(b, file_id)
2514
2974
for revno, revision_id, what in touching_revs:
2515
2975
self.outf.write("%6d %s\n" % (revno, what))
2528
2988
help='Recurse into subdirectories.'),
2529
2989
Option('from-root',
2530
2990
help='Print paths relative to the root of the branch.'),
2531
Option('unknown', help='Print unknown files.'),
2991
Option('unknown', short_name='u',
2992
help='Print unknown files.'),
2532
2993
Option('versioned', help='Print versioned files.',
2533
2994
short_name='V'),
2534
Option('ignored', help='Print ignored files.'),
2535
Option('null',
2536
help='Write an ascii NUL (\\0) separator '
2537
'between files rather than a newline.'),
2538
Option('kind',
2995
Option('ignored', short_name='i',
2996
help='Print ignored files.'),
2997
Option('kind', short_name='k',
2539
2998
help='List entries of a particular kind: file, directory, symlink.',
2540
type=unicode),
2999
type=text_type),
3000
'null',
2541
3001
'show-ids',
3002
'directory',
2542
3003
]
2543
3004
@display_command
2544
3005
def run(self, revision=None, verbose=False,
2545
3006
recursive=False, from_root=False,
2546
3007
unknown=False, versioned=False, ignored=False,
2547
null=False, kind=None, show_ids=False, path=None):
3008
null=False, kind=None, show_ids=False, path=None, directory=None):
2548
3009
2549
3010
if kind and kind not in ('file', 'directory', 'symlink'):
2550
raise errors.BzrCommandError('invalid kind specified')
3011
raise errors.BzrCommandError(gettext('invalid kind specified'))
2551
3012
2552
3013
if verbose and null:
2553
raise errors.BzrCommandError('Cannot set both --verbose and --null')
3014
raise errors.BzrCommandError(gettext('Cannot set both --verbose and --null'))
2554
3015
all = not (unknown or versioned or ignored)
2555
3016
2556
3017
selection = {'I':ignored, '?':unknown, 'V':versioned}
2559
3020
fs_path = '.'
2560
3021
else:
2561
3022
if from_root:
2562
raise errors.BzrCommandError('cannot specify both --from-root'
2563
' and PATH')
3023
raise errors.BzrCommandError(gettext('cannot specify both --from-root'
3024
' and PATH'))
2564
3025
fs_path = path
2565
tree, branch, relpath = bzrdir.BzrDir.open_containing_tree_or_branch(
2566
fs_path)
3026
tree, branch, relpath = \
3027
_open_directory_or_containing_tree_or_branch(fs_path, directory)
2567
3028
2568
3029
# Calculate the prefix to use
2569
3030
prefix = None
2582
3043
if view_files:
2583
3044
apply_view = True
2584
3045
view_str = views.view_display_str(view_files)
2585
note("Ignoring files outside view. View is %s" % view_str)
3046
note(gettext("Ignoring files outside view. View is %s") % view_str)
2586
3047
2587
tree.lock_read()
2588
self.add_cleanup(tree.unlock)
3048
self.add_cleanup(tree.lock_read().unlock)
2589
3049
for fp, fc, fkind, fid, entry in tree.list_files(include_root=False,
2590
3050
from_dir=relpath, recursive=recursive):
2591
3051
# Apply additional masking
2638
3098
2639
3099
hidden = True
2640
3100
_see_also = ['ls']
3101
takes_options = ['directory']
2641
3102
2642
3103
@display_command
2643
def run(self):
2644
for f in WorkingTree.open_containing(u'.')[0].unknowns():
3104
def run(self, directory=u'.'):
3105
for f in WorkingTree.open_containing(directory)[0].unknowns():
2645
3106
self.outf.write(osutils.quotefn(f) + '\n')
2646
3107
2647
3108
2648
3109
class cmd_ignore(Command):
2649
3110
__doc__ = """Ignore specified files or patterns.
2650
3111
2651
See ``bzr help patterns`` for details on the syntax of patterns.
3112
See ``brz help patterns`` for details on the syntax of patterns.
2652
3113
2653
3114
If a .bzrignore file does not exist, the ignore command
2654
3115
will create one and add the specified files or patterns to the newly
2674
3135
Patterns prefixed with '!!' act as regular ignore patterns, but have
2675
3136
precedence over the '!' exception patterns.
2676
3137
2677
Note: ignore patterns containing shell wildcards must be quoted from
2678
the shell on Unix.
3138
:Notes:
3139
3140
* Ignore patterns containing shell wildcards must be quoted from
3141
the shell on Unix.
3142
3143
* Ignore patterns starting with "#" act as comments in the ignore file.
3144
To ignore patterns that begin with that character, use the "RE:" prefix.
2679
3145
2680
3146
:Examples:
2681
3147
Ignore the top level Makefile::
2682
3148
2683
bzr ignore ./Makefile
3149
brz ignore ./Makefile
2684
3150
2685
3151
Ignore .class files in all directories...::
2686
3152
2687
bzr ignore "*.class"
3153
brz ignore "*.class"
2688
3154
2689
3155
...but do not ignore "special.class"::
2690
3156
2691
bzr ignore "!special.class"
2692
2693
Ignore .o files under the lib directory::
2694
2695
bzr ignore "lib/**/*.o"
2696
2697
Ignore .o files under the lib directory::
2698
2699
bzr ignore "RE:lib/.*\.o"
3157
brz ignore "!special.class"
3158
3159
Ignore files whose name begins with the "#" character::
3160
3161
brz ignore "RE:^#"
3162
3163
Ignore .o files under the lib directory::
3164
3165
brz ignore "lib/**/*.o"
3166
3167
Ignore .o files under the lib directory::
3168
3169
brz ignore "RE:lib/.*\.o"
2700
3170
2701
3171
Ignore everything but the "debian" toplevel directory::
2702
3172
2703
bzr ignore "RE:(?!debian/).*"
3173
brz ignore "RE:(?!debian/).*"
2704
3174
2705
3175
Ignore everything except the "local" toplevel directory,
2706
but always ignore "*~" autosave files, even under local/::
3176
but always ignore autosave files ending in ~, even under local/::
2707
3177
2708
bzr ignore "*"
2709
bzr ignore "!./local"
2710
bzr ignore "!!*~"
3178
brz ignore "*"
3179
brz ignore "!./local"
3180
brz ignore "!!*~"
2711
3181
"""
2712
3182
2713
3183
_see_also = ['status', 'ignored', 'patterns']
2714
3184
takes_args = ['name_pattern*']
2715
takes_options = [
3185
takes_options = ['directory',
2716
3186
Option('default-rules',
2717
help='Display the default ignore rules that bzr uses.')
3187
help='Display the default ignore rules that brz uses.')
2718
3188
]
2719
3189
2720
def run(self, name_pattern_list=None, default_rules=None):
2721
from bzrlib import ignores
3190
def run(self, name_pattern_list=None, default_rules=None,
3191
directory=u'.'):
3192
from breezy import ignores
2722
3193
if default_rules is not None:
2723
3194
# dump the default rules and exit
2724
3195
for pattern in ignores.USER_DEFAULTS:
2725
3196
self.outf.write("%s\n" % pattern)
2726
3197
return
2727
3198
if not name_pattern_list:
2728
raise errors.BzrCommandError("ignore requires at least one "
2729
"NAME_PATTERN or --default-rules.")
3199
raise errors.BzrCommandError(gettext("ignore requires at least one "
3200
"NAME_PATTERN or --default-rules."))
2730
3201
name_pattern_list = [globbing.normalize_pattern(p)
2731
3202
for p in name_pattern_list]
3203
bad_patterns = ''
3204
bad_patterns_count = 0
3205
for p in name_pattern_list:
3206
if not globbing.Globster.is_pattern_valid(p):
3207
bad_patterns_count += 1
3208
bad_patterns += ('\n %s' % p)
3209
if bad_patterns:
3210
msg = (ngettext('Invalid ignore pattern found. %s',
3211
'Invalid ignore patterns found. %s',
3212
bad_patterns_count) % bad_patterns)
3213
ui.ui_factory.show_error(msg)
3214
raise errors.InvalidPattern('')
2732
3215
for name_pattern in name_pattern_list:
2733
3216
if (name_pattern[0] == '/' or
2734
3217
(len(name_pattern) > 1 and name_pattern[1] == ':')):
2735
raise errors.BzrCommandError(
2736
"NAME_PATTERN should not be an absolute path")
2737
tree, relpath = WorkingTree.open_containing(u'.')
3218
raise errors.BzrCommandError(gettext(
3219
"NAME_PATTERN should not be an absolute path"))
3220
tree, relpath = WorkingTree.open_containing(directory)
2738
3221
ignores.tree_ignores_add_patterns(tree, name_pattern_list)
2739
3222
ignored = globbing.Globster(name_pattern_list)
2740
3223
matches = []
2741
tree.lock_read()
3224
self.add_cleanup(tree.lock_read().unlock)
2742
3225
for entry in tree.list_files():
2743
3226
id = entry[3]
2744
3227
if id is not None:
2745
3228
filename = entry[0]
2746
3229
if ignored.match(filename):
2747
3230
matches.append(filename)
2748
tree.unlock()
2749
3231
if len(matches) > 0:
2750
self.outf.write("Warning: the following files are version controlled and"
2751
" match your ignore pattern:\n%s"
3232
self.outf.write(gettext("Warning: the following files are version "
3233
"controlled and match your ignore pattern:\n%s"
2752
3234
"\nThese files will continue to be version controlled"
2753
" unless you 'bzr remove' them.\n" % ("\n".join(matches),))
3235
" unless you 'brz remove' them.\n") % ("\n".join(matches),))
2754
3236
2755
3237
2756
3238
class cmd_ignored(Command):
2761
3243
2762
3244
Alternatively, to list just the files::
2763
3245
2764
bzr ls --ignored
3246
brz ls --ignored
2765
3247
"""
2766
3248
2767
3249
encoding_type = 'replace'
2768
3250
_see_also = ['ignore', 'ls']
3251
takes_options = ['directory']
2769
3252
2770
3253
@display_command
2771
def run(self):
2772
tree = WorkingTree.open_containing(u'.')[0]
2773
tree.lock_read()
2774
self.add_cleanup(tree.unlock)
3254
def run(self, directory=u'.'):
3255
tree = WorkingTree.open_containing(directory)[0]
3256
self.add_cleanup(tree.lock_read().unlock)
2775
3257
for path, file_class, kind, file_id, entry in tree.list_files():
2776
3258
if file_class != 'I':
2777
3259
continue
2784
3266
__doc__ = """Lookup the revision-id from a revision-number
2785
3267
2786
3268
:Examples:
2787
bzr lookup-revision 33
3269
brz lookup-revision 33
2788
3270
"""
2789
3271
hidden = True
2790
3272
takes_args = ['revno']
3273
takes_options = ['directory']
2791
3274
2792
3275
@display_command
2793
def run(self, revno):
3276
def run(self, revno, directory=u'.'):
2794
3277
try:
2795
3278
revno = int(revno)
2796
3279
except ValueError:
2797
raise errors.BzrCommandError("not a valid revision-number: %r"
3280
raise errors.BzrCommandError(gettext("not a valid revision-number: %r")
2798
3281
% revno)
2799
revid = WorkingTree.open_containing(u'.')[0].branch.get_rev_id(revno)
3282
revid = WorkingTree.open_containing(directory)[0].branch.get_rev_id(revno)
2800
3283
self.outf.write("%s\n" % revid)
2801
3284
2802
3285
2828
3311
zip .zip
2829
3312
================= =========================
2830
3313
"""
3314
encoding = 'exact'
2831
3315
takes_args = ['dest', 'branch_or_subdir?']
2832
takes_options = [
3316
takes_options = ['directory',
2833
3317
Option('format',
2834
3318
help="Type of file to export to.",
2835
type=unicode),
3319
type=text_type),
2836
3320
'revision',
2837
3321
Option('filters', help='Apply content filters to export the '
2838
3322
'convenient form.'),
2842
3326
Option('per-file-timestamps',
2843
3327
help='Set modification time of files to that of the last '
2844
3328
'revision in which it was changed.'),
3329
Option('uncommitted',
3330
help='Export the working tree contents rather than that of the '
3331
'last revision.'),
2845
3332
]
2846
3333
def run(self, dest, branch_or_subdir=None, revision=None, format=None,
2847
root=None, filters=False, per_file_timestamps=False):
2848
from bzrlib.export import export
3334
root=None, filters=False, per_file_timestamps=False, uncommitted=False,
3335
directory=u'.'):
3336
from .export import export
2849
3337
2850
3338
if branch_or_subdir is None:
2851
tree = WorkingTree.open_containing(u'.')[0]
2852
b = tree.branch
2853
subdir = None
3339
branch_or_subdir = directory
3340
3341
(tree, b, subdir) = controldir.ControlDir.open_containing_tree_or_branch(
3342
branch_or_subdir)
3343
if tree is not None:
3344
self.add_cleanup(tree.lock_read().unlock)
3345
3346
if uncommitted:
3347
if tree is None:
3348
raise errors.BzrCommandError(
3349
gettext("--uncommitted requires a working tree"))
3350
export_tree = tree
2854
3351
else:
2855
b, subdir = Branch.open_containing(branch_or_subdir)
2856
tree = None
2857
2858
rev_tree = _get_one_revision_tree('export', revision, branch=b, tree=tree)
3352
export_tree = _get_one_revision_tree('export', revision, branch=b, tree=tree)
2859
3353
try:
2860
export(rev_tree, dest, format, root, subdir, filtered=filters,
3354
export(export_tree, dest, format, root, subdir, filtered=filters,
2861
3355
per_file_timestamps=per_file_timestamps)
2862
except errors.NoSuchExportFormat, e:
2863
raise errors.BzrCommandError('Unsupported export format: %s' % e.format)
3356
except errors.NoSuchExportFormat as e:
3357
raise errors.BzrCommandError(
3358
gettext('Unsupported export format: %s') % e.format)
2864
3359
2865
3360
2866
3361
class cmd_cat(Command):
2873
3368
"""
2874
3369
2875
3370
_see_also = ['ls']
2876
takes_options = [
3371
takes_options = ['directory',
2877
3372
Option('name-from-revision', help='The path name in the old tree.'),
2878
3373
Option('filters', help='Apply content filters to display the '
2879
3374
'convenience form.'),
2884
3379
2885
3380
@display_command
2886
3381
def run(self, filename, revision=None, name_from_revision=False,
2887
filters=False):
3382
filters=False, directory=None):
2888
3383
if revision is not None and len(revision) != 1:
2889
raise errors.BzrCommandError("bzr cat --revision takes exactly"
2890
" one revision specifier")
3384
raise errors.BzrCommandError(gettext("brz cat --revision takes exactly"
3385
" one revision specifier"))
2891
3386
tree, branch, relpath = \
2892
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
2893
branch.lock_read()
2894
self.add_cleanup(branch.unlock)
3387
_open_directory_or_containing_tree_or_branch(filename, directory)
3388
self.add_cleanup(branch.lock_read().unlock)
2895
3389
return self._run(tree, branch, relpath, filename, revision,
2896
3390
name_from_revision, filters)
2897
3391
2900
3394
if tree is None:
2901
3395
tree = b.basis_tree()
2902
3396
rev_tree = _get_one_revision_tree('cat', revision, branch=b)
2903
rev_tree.lock_read()
2904
self.add_cleanup(rev_tree.unlock)
3397
self.add_cleanup(rev_tree.lock_read().unlock)
2905
3398
2906
3399
old_file_id = rev_tree.path2id(relpath)
2907
3400
3401
# TODO: Split out this code to something that generically finds the
3402
# best id for a path across one or more trees; it's like
3403
# find_ids_across_trees but restricted to find just one. -- mbp
3404
# 20110705.
2908
3405
if name_from_revision:
2909
3406
# Try in revision if requested
2910
3407
if old_file_id is None:
2911
raise errors.BzrCommandError(
2912
"%r is not present in revision %s" % (
3408
raise errors.BzrCommandError(gettext(
3409
"{0!r} is not present in revision {1}").format(
2913
3410
filename, rev_tree.get_revision_id()))
2914
3411
else:
2915
content = rev_tree.get_file_text(old_file_id)
3412
actual_file_id = old_file_id
2916
3413
else:
2917
3414
cur_file_id = tree.path2id(relpath)
2918
found = False
2919
if cur_file_id is not None:
2920
# Then try with the actual file id
2921
try:
2922
content = rev_tree.get_file_text(cur_file_id)
2923
found = True
2924
except errors.NoSuchId:
2925
# The actual file id didn't exist at that time
2926
pass
2927
if not found and old_file_id is not None:
2928
# Finally try with the old file id
2929
content = rev_tree.get_file_text(old_file_id)
2930
found = True
2931
if not found:
2932
# Can't be found anywhere
2933
raise errors.BzrCommandError(
2934
"%r is not present in revision %s" % (
3415
if cur_file_id is not None and rev_tree.has_id(cur_file_id):
3416
actual_file_id = cur_file_id
3417
elif old_file_id is not None:
3418
actual_file_id = old_file_id
3419
else:
3420
raise errors.BzrCommandError(gettext(
3421
"{0!r} is not present in revision {1}").format(
2935
3422
filename, rev_tree.get_revision_id()))
2936
3423
if filtered:
2937
from bzrlib.filters import (
2938
ContentFilterContext,
2939
filtered_output_bytes,
2940
)
2941
filters = rev_tree._content_filter_stack(relpath)
2942
chunks = content.splitlines(True)
2943
content = filtered_output_bytes(chunks, filters,
2944
ContentFilterContext(relpath, rev_tree))
2945
self.cleanup_now()
2946
self.outf.writelines(content)
3424
from .filter_tree import ContentFilterTree
3425
filter_tree = ContentFilterTree(rev_tree,
3426
rev_tree._content_filter_stack)
3427
content = filter_tree.get_file_text(actual_file_id)
2947
3428
else:
2948
self.cleanup_now()
2949
self.outf.write(content)
3429
content = rev_tree.get_file_text(actual_file_id)
3430
self.cleanup_now()
3431
self.outf.write(content)
2950
3432
2951
3433
2952
3434
class cmd_local_time_offset(Command):
2982
3464
For example, to commit only changes within foo, but not changes
2983
3465
within foo/bar::
2984
3466
2985
bzr commit foo -x foo/bar
3467
brz commit foo -x foo/bar
2986
3468
2987
3469
A selective commit after a merge is not yet supported.
2988
3470
3000
3482
A common mistake is to forget to add a new file or directory before
3001
3483
running the commit command. The --strict option checks for unknown
3002
3484
files and aborts the commit if any are found. More advanced pre-commit
3003
checks can be implemented by defining hooks. See ``bzr help hooks``
3485
checks can be implemented by defining hooks. See ``brz help hooks``
3004
3486
for details.
3005
3487
3006
3488
:Things to note:
3007
3489
3008
3490
If you accidentially commit the wrong changes or make a spelling
3009
3491
mistake in the commit message say, you can use the uncommit command
3010
to undo it. See ``bzr help uncommit`` for details.
3492
to undo it. See ``brz help uncommit`` for details.
3011
3493
3012
3494
Hooks can also be configured to run after a commit. This allows you
3013
3495
to trigger updates to external systems like bug trackers. The --fixes
3014
3496
option can be used to record the association between a revision and
3015
one or more bugs. See ``bzr help bugs`` for details.
3016
3017
A selective commit may fail in some cases where the committed
3018
tree would be invalid. Consider::
3019
3020
bzr init foo
3021
mkdir foo/bar
3022
bzr add foo/bar
3023
bzr commit foo -m "committing foo"
3024
bzr mv foo/bar foo/baz
3025
mkdir foo/bar
3026
bzr add foo/bar
3027
bzr commit foo/bar -m "committing bar but not baz"
3028
3029
In the example above, the last commit will fail by design. This gives
3030
the user the opportunity to decide whether they want to commit the
3031
rename at the same time, separately first, or not at all. (As a general
3032
rule, when in doubt, Bazaar has a policy of Doing the Safe Thing.)
3497
one or more bugs. See ``brz help bugs`` for details.
3033
3498
"""
3034
# TODO: Run hooks on tree to-be-committed, and after commit.
3035
3036
# TODO: Strict commit that fails if there are deleted files.
3037
# (what does "deleted files" mean ??)
3038
3039
# TODO: Give better message for -s, --summary, used by tla people
3040
3041
# XXX: verbose currently does nothing
3042
3499
3043
3500
_see_also = ['add', 'bugs', 'hooks', 'uncommit']
3044
3501
takes_args = ['selected*']
3045
3502
takes_options = [
3046
3503
ListOption('exclude', type=str, short_name='x',
3047
3504
help="Do not consider changes made to a given path."),
3048
Option('message', type=unicode,
3505
Option('message', type=text_type,
3049
3506
short_name='m',
3050
3507
help="Description of the new revision."),
3051
3508
'verbose',
3063
3520
"format, e.g. '2009-10-10 08:00:00 +0100'."),
3064
3521
ListOption('fixes', type=str,
3065
3522
help="Mark a bug as being fixed by this revision "
3066
"(see \"bzr help bugs\")."),
3067
ListOption('author', type=unicode,
3523
"(see \"brz help bugs\")."),
3524
ListOption('author', type=text_type,
3068
3525
help="Set the author's name, if it's different "
3069
3526
"from the committer."),
3070
3527
Option('local',
3076
3533
Option('show-diff', short_name='p',
3077
3534
help='When no message is supplied, show the diff along'
3078
3535
' with the status summary in the message editor.'),
3536
Option('lossy',
3537
help='When committing to a foreign version control '
3538
'system do not push data that can not be natively '
3539
'represented.'),
3079
3540
]
3080
3541
aliases = ['ci', 'checkin']
3081
3542
3082
3543
def _iter_bug_fix_urls(self, fixes, branch):
3544
default_bugtracker = None
3083
3545
# Configure the properties for bug fixing attributes.
3084
3546
for fixed_bug in fixes:
3085
3547
tokens = fixed_bug.split(':')
3086
if len(tokens) != 2:
3087
raise errors.BzrCommandError(
3548
if len(tokens) == 1:
3549
if default_bugtracker is None:
3550
branch_config = branch.get_config_stack()
3551
default_bugtracker = branch_config.get(
3552
"bugtracker")
3553
if default_bugtracker is None:
3554
raise errors.BzrCommandError(gettext(
3555
"No tracker specified for bug %s. Use the form "
3556
"'tracker:id' or specify a default bug tracker "
3557
"using the `bugtracker` option.\nSee "
3558
"\"brz help bugs\" for more information on this "
3559
"feature. Commit refused.") % fixed_bug)
3560
tag = default_bugtracker
3561
bug_id = tokens[0]
3562
elif len(tokens) != 2:
3563
raise errors.BzrCommandError(gettext(
3088
3564
"Invalid bug %s. Must be in the form of 'tracker:id'. "
3089
"See \"bzr help bugs\" for more information on this "
3090
"feature.\nCommit refused." % fixed_bug)
3091
tag, bug_id = tokens
3565
"See \"brz help bugs\" for more information on this "
3566
"feature.\nCommit refused.") % fixed_bug)
3567
else:
3568
tag, bug_id = tokens
3092
3569
try:
3093
3570
yield bugtracker.get_bug_url(tag, branch, bug_id)
3094
3571
except errors.UnknownBugTrackerAbbreviation:
3095
raise errors.BzrCommandError(
3096
'Unrecognized bug %s. Commit refused.' % fixed_bug)
3097
except errors.MalformedBugIdentifier, e:
3098
raise errors.BzrCommandError(
3099
"%s\nCommit refused." % (str(e),))
3572
raise errors.BzrCommandError(gettext(
3573
'Unrecognized bug %s. Commit refused.') % fixed_bug)
3574
except errors.MalformedBugIdentifier as e:
3575
raise errors.BzrCommandError(gettext(
3576
"%s\nCommit refused.") % (str(e),))
3100
3577
3101
3578
def run(self, message=None, file=None, verbose=False, selected_list=None,
3102
3579
unchanged=False, strict=False, local=False, fixes=None,
3103
author=None, show_diff=False, exclude=None, commit_time=None):
3104
from bzrlib.errors import (
3580
author=None, show_diff=False, exclude=None, commit_time=None,
3581
lossy=False):
3582
from .errors import (
3105
3583
PointlessCommit,
3106
3584
ConflictsInTree,
3107
3585
StrictCommitFailed
3108
3586
)
3109
from bzrlib.msgeditor import (
3587
from .msgeditor import (
3110
3588
edit_commit_message_encoded,
3111
3589
generate_commit_message_template,
3112
make_commit_message_template_encoded
3590
make_commit_message_template_encoded,
3591
set_commit_message,
3113
3592
)
3114
3593
3115
3594
commit_stamp = offset = None
3116
3595
if commit_time is not None:
3117
3596
try:
3118
3597
commit_stamp, offset = timestamp.parse_patch_date(commit_time)
3119
except ValueError, e:
3120
raise errors.BzrCommandError(
3121
"Could not parse --commit-time: " + str(e))
3122
3123
# TODO: Need a blackbox test for invoking the external editor; may be
3124
# slightly problematic to run this cross-platform.
3125
3126
# TODO: do more checks that the commit will succeed before
3127
# spending the user's valuable time typing a commit message.
3598
except ValueError as e:
3599
raise errors.BzrCommandError(gettext(
3600
"Could not parse --commit-time: " + str(e)))
3128
3601
3129
3602
properties = {}
3130
3603
3131
tree, selected_list = tree_files(selected_list)
3604
tree, selected_list = WorkingTree.open_containing_paths(selected_list)
3132
3605
if selected_list == ['']:
3133
3606
# workaround - commit of root of tree should be exactly the same
3134
3607
# as just default commit in that tree, and succeed even though
3163
3636
message = message.replace('\r\n', '\n')
3164
3637
message = message.replace('\r', '\n')
3165
3638
if file:
3166
raise errors.BzrCommandError(
3167
"please specify either --message or --file")
3639
raise errors.BzrCommandError(gettext(
3640
"please specify either --message or --file"))
3168
3641
3169
3642
def get_message(commit_obj):
3170
3643
"""Callback to get commit message"""
3171
3644
if file:
3172
my_message = codecs.open(
3173
file, 'rt', osutils.get_user_encoding()).read()
3645
f = open(file)
3646
try:
3647
my_message = f.read().decode(osutils.get_user_encoding())
3648
finally:
3649
f.close()
3174
3650
elif message is not None:
3175
3651
my_message = message
3176
3652
else:
3184
3660
# make_commit_message_template_encoded returns user encoding.
3185
3661
# We probably want to be using edit_commit_message instead to
3186
3662
# avoid this.
3187
start_message = generate_commit_message_template(commit_obj)
3188
my_message = edit_commit_message_encoded(text,
3189
start_message=start_message)
3190
if my_message is None:
3191
raise errors.BzrCommandError("please specify a commit"
3192
" message with either --message or --file")
3193
if my_message == "":
3194
raise errors.BzrCommandError("empty commit message specified")
3663
my_message = set_commit_message(commit_obj)
3664
if my_message is None:
3665
start_message = generate_commit_message_template(commit_obj)
3666
my_message = edit_commit_message_encoded(text,
3667
start_message=start_message)
3668
if my_message is None:
3669
raise errors.BzrCommandError(gettext("please specify a commit"
3670
" message with either --message or --file"))
3671
if my_message == "":
3672
raise errors.BzrCommandError(gettext("Empty commit message specified."
3673
" Please specify a commit message with either"
3674
" --message or --file or leave a blank message"
3675
" with --message \"\"."))
3195
3676
return my_message
3196
3677
3197
3678
# The API permits a commit with a filter of [] to mean 'select nothing'
3205
3686
reporter=None, verbose=verbose, revprops=properties,
3206
3687
authors=author, timestamp=commit_stamp,
3207
3688
timezone=offset,
3208
exclude=safe_relpath_files(tree, exclude))
3689
exclude=tree.safe_relpath_files(exclude),
3690
lossy=lossy)
3209
3691
except PointlessCommit:
3210
raise errors.BzrCommandError("No changes to commit."
3211
" Use --unchanged to commit anyhow.")
3692
raise errors.BzrCommandError(gettext("No changes to commit."
3693
" Please 'brz add' the files you want to commit, or use"
3694
" --unchanged to force an empty commit."))
3212
3695
except ConflictsInTree:
3213
raise errors.BzrCommandError('Conflicts detected in working '
3214
'tree. Use "bzr conflicts" to list, "bzr resolve FILE" to'
3215
' resolve.')
3696
raise errors.BzrCommandError(gettext('Conflicts detected in working '
3697
'tree. Use "brz conflicts" to list, "brz resolve FILE" to'
3698
' resolve.'))
3216
3699
except StrictCommitFailed:
3217
raise errors.BzrCommandError("Commit refused because there are"
3218
" unknown files in the working tree.")
3219
except errors.BoundBranchOutOfDate, e:
3220
e.extra_help = ("\n"
3700
raise errors.BzrCommandError(gettext("Commit refused because there are"
3701
" unknown files in the working tree."))
3702
except errors.BoundBranchOutOfDate as e:
3703
e.extra_help = (gettext("\n"
3221
3704
'To commit to master branch, run update and then commit.\n'
3222
3705
'You can also pass --local to commit to continue working '
3223
'disconnected.')
3706
'disconnected.'))
3224
3707
raise
3225
3708
3226
3709
3228
3711
__doc__ = """Validate working tree structure, branch consistency and repository history.
3229
3712
3230
3713
This command checks various invariants about branch and repository storage
3231
to detect data corruption or bzr bugs.
3714
to detect data corruption or brz bugs.
3232
3715
3233
3716
The working tree and branch checks will only give output if a problem is
3234
3717
detected. The output fields of the repository check are:
3263
3746
3264
3747
Check the tree and branch at 'foo'::
3265
3748
3266
bzr check --tree --branch foo
3749
brz check --tree --branch foo
3267
3750
3268
3751
Check only the repository at 'bar'::
3269
3752
3270
bzr check --repo bar
3753
brz check --repo bar
3271
3754
3272
3755
Check everything at 'baz'::
3273
3756
3274
bzr check baz
3757
brz check baz
3275
3758
"""
3276
3759
3277
3760
_see_also = ['reconcile']
3286
3769
3287
3770
def run(self, path=None, verbose=False, branch=False, repo=False,
3288
3771
tree=False):
3289
from bzrlib.check import check_dwim
3772
from .check import check_dwim
3290
3773
if path is None:
3291
3774
path = '.'
3292
3775
if not branch and not repo and not tree:
3295
3778
3296
3779
3297
3780
class cmd_upgrade(Command):
3298
__doc__ = """Upgrade branch storage to current format.
3299
3300
The check command or bzr developers may sometimes advise you to run
3301
this command. When the default format has changed you may also be warned
3302
during other operations to upgrade.
3781
__doc__ = """Upgrade a repository, branch or working tree to a newer format.
3782
3783
When the default format has changed after a major new release of
3784
Bazaar, you may be informed during certain operations that you
3785
should upgrade. Upgrading to a newer format may improve performance
3786
or make new features available. It may however limit interoperability
3787
with older repositories or with older versions of Bazaar.
3788
3789
If you wish to upgrade to a particular format rather than the
3790
current default, that can be specified using the --format option.
3791
As a consequence, you can use the upgrade command this way to
3792
"downgrade" to an earlier format, though some conversions are
3793
a one way process (e.g. changing from the 1.x default to the
3794
2.x default) so downgrading is not always possible.
3795
3796
A backup.bzr.~#~ directory is created at the start of the conversion
3797
process (where # is a number). By default, this is left there on
3798
completion. If the conversion fails, delete the new .bzr directory
3799
and rename this one back in its place. Use the --clean option to ask
3800
for the backup.bzr directory to be removed on successful conversion.
3801
Alternatively, you can delete it by hand if everything looks good
3802
afterwards.
3803
3804
If the location given is a shared repository, dependent branches
3805
are also converted provided the repository converts successfully.
3806
If the conversion of a branch fails, remaining branches are still
3807
tried.
3808
3809
For more information on upgrades, see the Bazaar Upgrade Guide,
3810
http://doc.bazaar.canonical.com/latest/en/upgrade-guide/.
3303
3811
"""
3304
3812
3305
_see_also = ['check']
3813
_see_also = ['check', 'reconcile', 'formats']
3306
3814
takes_args = ['url?']
3307
3815
takes_options = [
3308
RegistryOption('format',
3309
help='Upgrade to a specific format. See "bzr help'
3310
' formats" for details.',
3311
lazy_registry=('bzrlib.bzrdir', 'format_registry'),
3312
converter=lambda name: bzrdir.format_registry.make_bzrdir(name),
3313
value_switches=True, title='Branch format'),
3314
]
3816
RegistryOption('format',
3817
help='Upgrade to a specific format. See "brz help'
3818
' formats" for details.',
3819
lazy_registry=('breezy.controldir', 'format_registry'),
3820
converter=lambda name: controldir.format_registry.make_bzrdir(name),
3821
value_switches=True, title='Branch format'),
3822
Option('clean',
3823
help='Remove the backup.bzr directory if successful.'),
3824
Option('dry-run',
3825
help="Show what would be done, but don't actually do anything."),
3826
]
3315
3827
3316
def run(self, url='.', format=None):
3317
from bzrlib.upgrade import upgrade
3318
upgrade(url, format)
3828
def run(self, url='.', format=None, clean=False, dry_run=False):
3829
from .upgrade import upgrade
3830
exceptions = upgrade(url, format, clean_up=clean, dry_run=dry_run)
3831
if exceptions:
3832
if len(exceptions) == 1:
3833
# Compatibility with historical behavior
3834
raise exceptions[0]
3835
else:
3836
return 3
3319
3837
3320
3838
3321
3839
class cmd_whoami(Command):
3322
__doc__ = """Show or set bzr user id.
3840
__doc__ = """Show or set brz user id.
3323
3841
3324
3842
:Examples:
3325
3843
Show the email of the current user::
3326
3844
3327
bzr whoami --email
3845
brz whoami --email
3328
3846
3329
3847
Set the current user::
3330
3848
3331
bzr whoami "Frank Chu <fchu@example.com>"
3849
brz whoami "Frank Chu <fchu@example.com>"
3332
3850
"""
3333
takes_options = [ Option('email',
3851
takes_options = [ 'directory',
3852
Option('email',
3334
3853
help='Display email address only.'),
3335
3854
Option('branch',
3336
3855
help='Set identity for the current branch instead of '
3340
3859
encoding_type = 'replace'
3341
3860
3342
3861
@display_command
3343
def run(self, email=False, branch=False, name=None):
3862
def run(self, email=False, branch=False, name=None, directory=None):
3344
3863
if name is None:
3345
# use branch if we're inside one; otherwise global config
3346
try:
3347
c = Branch.open_containing('.')[0].get_config()
3348
except errors.NotBranchError:
3349
c = config.GlobalConfig()
3864
if directory is None:
3865
# use branch if we're inside one; otherwise global config
3866
try:
3867
c = Branch.open_containing(u'.')[0].get_config_stack()
3868
except errors.NotBranchError:
3869
c = _mod_config.GlobalStack()
3870
else:
3871
c = Branch.open(directory).get_config_stack()
3872
identity = c.get('email')
3350
3873
if email:
3351
self.outf.write(c.user_email() + '\n')
3874
self.outf.write(_mod_config.extract_email_address(identity)
3875
+ '\n')
3352
3876
else:
3353
self.outf.write(c.username() + '\n')
3877
self.outf.write(identity + '\n')
3354
3878
return
3355
3879
3880
if email:
3881
raise errors.BzrCommandError(gettext("--email can only be used to display existing "
3882
"identity"))
3883
3356
3884
# display a warning if an email address isn't included in the given name.
3357
3885
try:
3358
config.extract_email_address(name)
3359
except errors.NoEmailInUsername, e:
3886
_mod_config.extract_email_address(name)
3887
except errors.NoEmailInUsername as e:
3360
3888
warning('"%s" does not seem to contain an email address. '
3361
3889
'This is allowed, but not recommended.', name)
3362
3890
3363
3891
# use global config unless --branch given
3364
3892
if branch:
3365
c = Branch.open_containing('.')[0].get_config()
3893
if directory is None:
3894
c = Branch.open_containing(u'.')[0].get_config_stack()
3895
else:
3896
b = Branch.open(directory)
3897
self.add_cleanup(b.lock_write().unlock)
3898
c = b.get_config_stack()
3366
3899
else:
3367
c = config.GlobalConfig()
3368
c.set_user_option('email', name)
3900
c = _mod_config.GlobalStack()
3901
c.set('email', name)
3369
3902
3370
3903
3371
3904
class cmd_nick(Command):
3372
3905
__doc__ = """Print or set the branch nickname.
3373
3906
3374
If unset, the tree root directory name is used as the nickname.
3375
To print the current nickname, execute with no argument.
3907
If unset, the colocated branch name is used for colocated branches, and
3908
the branch directory name is used for other branches. To print the
3909
current nickname, execute with no argument.
3376
3910
3377
3911
Bound branches use the nickname of its master branch unless it is set
3378
3912
locally.
3380
3914
3381
3915
_see_also = ['info']
3382
3916
takes_args = ['nickname?']
3383
def run(self, nickname=None):
3384
branch = Branch.open_containing(u'.')[0]
3917
takes_options = ['directory']
3918
def run(self, nickname=None, directory=u'.'):
3919
branch = Branch.open_containing(directory)[0]
3385
3920
if nickname is None:
3386
3921
self.printme(branch)
3387
3922
else:
3398
3933
:Examples:
3399
3934
Show the current aliases::
3400
3935
3401
bzr alias
3936
brz alias
3402
3937
3403
3938
Show the alias specified for 'll'::
3404
3939
3405
bzr alias ll
3940
brz alias ll
3406
3941
3407
3942
Set an alias for 'll'::
3408
3943
3409
bzr alias ll="log --line -r-10..-1"
3944
brz alias ll="log --line -r-10..-1"
3410
3945
3411
3946
To remove an alias for 'll'::
3412
3947
3413
bzr alias --remove ll
3948
brz alias --remove ll
3414
3949
3415
3950
"""
3416
3951
takes_args = ['name?']
3432
3967
3433
3968
def remove_alias(self, alias_name):
3434
3969
if alias_name is None:
3435
raise errors.BzrCommandError(
3436
'bzr alias --remove expects an alias to remove.')
3970
raise errors.BzrCommandError(gettext(
3971
'brz alias --remove expects an alias to remove.'))
3437
3972
# If alias is not found, print something like:
3438
3973
# unalias: foo: not found
3439
c = config.GlobalConfig()
3974
c = _mod_config.GlobalConfig()
3440
3975
c.unset_alias(alias_name)
3441
3976
3442
3977
@display_command
3443
3978
def print_aliases(self):
3444
3979
"""Print out the defined aliases in a similar format to bash."""
3445
aliases = config.GlobalConfig().get_aliases()
3980
aliases = _mod_config.GlobalConfig().get_aliases()
3446
3981
for key, value in sorted(aliases.iteritems()):
3447
self.outf.write('bzr alias %s="%s"\n' % (key, value))
3982
self.outf.write('brz alias %s="%s"\n' % (key, value))
3448
3983
3449
3984
@display_command
3450
3985
def print_alias(self, alias_name):
3451
from bzrlib.commands import get_alias
3986
from .commands import get_alias
3452
3987
alias = get_alias(alias_name)
3453
3988
if alias is None:
3454
self.outf.write("bzr alias: %s: not found\n" % alias_name)
3989
self.outf.write("brz alias: %s: not found\n" % alias_name)
3455
3990
else:
3456
3991
self.outf.write(
3457
'bzr alias %s="%s"\n' % (alias_name, ' '.join(alias)))
3992
'brz alias %s="%s"\n' % (alias_name, ' '.join(alias)))
3458
3993
3459
3994
def set_alias(self, alias_name, alias_command):
3460
3995
"""Save the alias in the global config."""
3461
c = config.GlobalConfig()
3996
c = _mod_config.GlobalConfig()
3462
3997
c.set_alias(alias_name, alias_command)
3463
3998
3464
3999
3496
4031
Tests that need working space on disk use a common temporary directory,
3497
4032
typically inside $TMPDIR or /tmp.
3498
4033
3499
If you set BZR_TEST_PDB=1 when running selftest, failing tests will drop
4034
If you set BRZ_TEST_PDB=1 when running selftest, failing tests will drop
3500
4035
into a pdb postmortem session.
3501
4036
4037
The --coverage=DIRNAME global option produces a report with covered code
4038
indicated.
4039
3502
4040
:Examples:
3503
4041
Run only tests relating to 'ignore'::
3504
4042
3505
bzr selftest ignore
4043
brz selftest ignore
3506
4044
3507
4045
Disable plugins and list tests as they're run::
3508
4046
3509
bzr --no-plugins selftest -v
4047
brz --no-plugins selftest -v
3510
4048
"""
3511
4049
# NB: this is used from the class without creating an instance, which is
3512
4050
# why it does not have a self parameter.
3513
4051
def get_transport_type(typestring):
3514
4052
"""Parse and return a transport specifier."""
3515
4053
if typestring == "sftp":
3516
from bzrlib.tests import stub_sftp
4054
from .tests import stub_sftp
3517
4055
return stub_sftp.SFTPAbsoluteServer
3518
if typestring == "memory":
3519
from bzrlib.tests import test_server
4056
elif typestring == "memory":
4057
from .tests import test_server
3520
4058
return memory.MemoryServer
3521
if typestring == "fakenfs":
3522
from bzrlib.tests import test_server
4059
elif typestring == "fakenfs":
4060
from .tests import test_server
3523
4061
return test_server.FakeNFSServer
3524
4062
msg = "No known transport type %s. Supported types are: sftp\n" %\
3525
4063
(typestring)
3537
4075
'throughout the test suite.',
3538
4076
type=get_transport_type),
3539
4077
Option('benchmark',
3540
help='Run the benchmarks rather than selftests.'),
4078
help='Run the benchmarks rather than selftests.',
4079
hidden=True),
3541
4080
Option('lsprof-timed',
3542
4081
help='Generate lsprof output for benchmarked'
3543
4082
' sections of code.'),
3544
4083
Option('lsprof-tests',
3545
4084
help='Generate lsprof output for each test.'),
3546
Option('cache-dir', type=str,
3547
help='Cache intermediate benchmark output in this '
3548
'directory.'),
3549
4085
Option('first',
3550
4086
help='Run all tests, but run specified tests first.',
3551
4087
short_name='f',
3554
4090
help='List the tests instead of running them.'),
3555
4091
RegistryOption('parallel',
3556
4092
help="Run the test suite in parallel.",
3557
lazy_registry=('bzrlib.tests', 'parallel_registry'),
4093
lazy_registry=('breezy.tests', 'parallel_registry'),
3558
4094
value_switches=False,
3559
4095
),
3560
4096
Option('randomize', type=str, argname="SEED",
3561
4097
help='Randomize the order of tests using the given'
3562
4098
' seed or "now" for the current time.'),
3563
Option('exclude', type=str, argname="PATTERN",
3564
short_name='x',
3565
help='Exclude tests that match this regular'
3566
' expression.'),
4099
ListOption('exclude', type=str, argname="PATTERN",
4100
short_name='x',
4101
help='Exclude tests that match this regular'
4102
' expression.'),
3567
4103
Option('subunit',
3568
4104
help='Output test progress via subunit.'),
3569
4105
Option('strict', help='Fail on missing dependencies or '
3576
4112
param_name='starting_with', short_name='s',
3577
4113
help=
3578
4114
'Load only the tests starting with TESTID.'),
4115
Option('sync',
4116
help="By default we disable fsync and fdatasync"
4117
" while running the test suite.")
3579
4118
]
3580
4119
encoding_type = 'replace'
3581
4120
3585
4124
3586
4125
def run(self, testspecs_list=None, verbose=False, one=False,
3587
4126
transport=None, benchmark=None,
3588
lsprof_timed=None, cache_dir=None,
4127
lsprof_timed=None,
3589
4128
first=False, list_only=False,
3590
4129
randomize=None, exclude=None, strict=False,
3591
4130
load_list=None, debugflag=None, starting_with=None, subunit=False,
3592
parallel=None, lsprof_tests=False):
3593
from bzrlib.tests import selftest
3594
import bzrlib.benchmarks as benchmarks
3595
from bzrlib.benchmarks import tree_creator
3596
3597
# Make deprecation warnings visible, unless -Werror is set
3598
symbol_versioning.activate_deprecation_warnings(override=False)
3599
3600
if cache_dir is not None:
3601
tree_creator.TreeCreator.CACHE_ROOT = osutils.abspath(cache_dir)
4131
parallel=None, lsprof_tests=False,
4132
sync=False):
4133
4134
# During selftest, disallow proxying, as it can cause severe
4135
# performance penalties and is only needed for thread
4136
# safety. The selftest command is assumed to not use threads
4137
# too heavily. The call should be as early as possible, as
4138
# error reporting for past duplicate imports won't have useful
4139
# backtraces.
4140
lazy_import.disallow_proxying()
4141
4142
from . import tests
4143
3602
4144
if testspecs_list is not None:
3603
4145
pattern = '|'.join(testspecs_list)
3604
4146
else:
3605
4147
pattern = ".*"
3606
4148
if subunit:
3607
4149
try:
3608
from bzrlib.tests import SubUnitBzrRunner
4150
from .tests import SubUnitBzrRunner
3609
4151
except ImportError:
3610
raise errors.BzrCommandError("subunit not available. subunit "
3611
"needs to be installed to use --subunit.")
4152
raise errors.BzrCommandError(gettext("subunit not available. subunit "
4153
"needs to be installed to use --subunit."))
3612
4154
self.additional_selftest_args['runner_class'] = SubUnitBzrRunner
3613
4155
# On Windows, disable automatic conversion of '\n' to '\r\n' in
3614
4156
# stdout, which would corrupt the subunit stream.
3615
if sys.platform == "win32" and sys.stdout.fileno() >= 0:
4157
# FIXME: This has been fixed in subunit trunk (>0.0.5) so the
4158
# following code can be deleted when it's sufficiently deployed
4159
# -- vila/mgz 20100514
4160
if (sys.platform == "win32"
4161
and getattr(sys.stdout, 'fileno', None) is not None):
3616
4162
import msvcrt
3617
4163
msvcrt.setmode(sys.stdout.fileno(), os.O_BINARY)
3618
4164
if parallel:
3619
4165
self.additional_selftest_args.setdefault(
3620
4166
'suite_decorators', []).append(parallel)
3621
4167
if benchmark:
3622
test_suite_factory = benchmarks.test_suite
3623
# Unless user explicitly asks for quiet, be verbose in benchmarks
3624
verbose = not is_quiet()
3625
# TODO: should possibly lock the history file...
3626
benchfile = open(".perf_history", "at", buffering=1)
3627
self.add_cleanup(benchfile.close)
4168
raise errors.BzrCommandError(gettext(
4169
"--benchmark is no longer supported from brz 2.2; "
4170
"use bzr-usertest instead"))
4171
test_suite_factory = None
4172
if not exclude:
4173
exclude_pattern = None
3628
4174
else:
3629
test_suite_factory = None
3630
benchfile = None
4175
exclude_pattern = '(' + '|'.join(exclude) + ')'
4176
if not sync:
4177
self._disable_fsync()
3631
4178
selftest_kwargs = {"verbose": verbose,
3632
4179
"pattern": pattern,
3633
4180
"stop_on_failure": one,
3635
4182
"test_suite_factory": test_suite_factory,
3636
4183
"lsprof_timed": lsprof_timed,
3637
4184
"lsprof_tests": lsprof_tests,
3638
"bench_history": benchfile,
3639
4185
"matching_tests_first": first,
3640
4186
"list_only": list_only,
3641
4187
"random_seed": randomize,
3642
"exclude_pattern": exclude,
4188
"exclude_pattern": exclude_pattern,
3643
4189
"strict": strict,
3644
4190
"load_list": load_list,
3645
4191
"debug_flags": debugflag,
3646
4192
"starting_with": starting_with
3647
4193
}
3648
4194
selftest_kwargs.update(self.additional_selftest_args)
3649
result = selftest(**selftest_kwargs)
4195
4196
# Make deprecation warnings visible, unless -Werror is set
4197
cleanup = symbol_versioning.activate_deprecation_warnings(
4198
override=False)
4199
try:
4200
result = tests.selftest(**selftest_kwargs)
4201
finally:
4202
cleanup()
3650
4203
return int(not result)
3651
4204
4205
def _disable_fsync(self):
4206
"""Change the 'os' functionality to not synchronize."""
4207
self._orig_fsync = getattr(os, 'fsync', None)
4208
if self._orig_fsync is not None:
4209
os.fsync = lambda filedes: None
4210
self._orig_fdatasync = getattr(os, 'fdatasync', None)
4211
if self._orig_fdatasync is not None:
4212
os.fdatasync = lambda filedes: None
4213
3652
4214
3653
4215
class cmd_version(Command):
3654
__doc__ = """Show version of bzr."""
4216
__doc__ = """Show version of brz."""
3655
4217
3656
4218
encoding_type = 'replace'
3657
4219
takes_options = [
3660
4222
3661
4223
@display_command
3662
4224
def run(self, short=False):
3663
from bzrlib.version import show_version
4225
from .version import show_version
3664
4226
if short:
3665
self.outf.write(bzrlib.version_string + '\n')
4227
self.outf.write(breezy.version_string + '\n')
3666
4228
else:
3667
4229
show_version(to_file=self.outf)
3668
4230
3674
4236
3675
4237
@display_command
3676
4238
def run(self):
3677
self.outf.write("It sure does!\n")
4239
self.outf.write(gettext("It sure does!\n"))
3678
4240
3679
4241
3680
4242
class cmd_find_merge_base(Command):
3686
4248
3687
4249
@display_command
3688
4250
def run(self, branch, other):
3689
from bzrlib.revision import ensure_null
4251
from .revision import ensure_null
3690
4252
3691
4253
branch1 = Branch.open_containing(branch)[0]
3692
4254
branch2 = Branch.open_containing(other)[0]
3693
branch1.lock_read()
3694
self.add_cleanup(branch1.unlock)
3695
branch2.lock_read()
3696
self.add_cleanup(branch2.unlock)
4255
self.add_cleanup(branch1.lock_read().unlock)
4256
self.add_cleanup(branch2.lock_read().unlock)
3697
4257
last1 = ensure_null(branch1.last_revision())
3698
4258
last2 = ensure_null(branch2.last_revision())
3699
4259
3700
4260
graph = branch1.repository.get_graph(branch2.repository)
3701
4261
base_rev_id = graph.find_unique_lca(last1, last2)
3702
4262
3703
self.outf.write('merge base is revision %s\n' % base_rev_id)
4263
self.outf.write(gettext('merge base is revision %s\n') % base_rev_id)
3704
4264
3705
4265
3706
4266
class cmd_merge(Command):
3708
4268
3709
4269
The source of the merge can be specified either in the form of a branch,
3710
4270
or in the form of a path to a file containing a merge directive generated
3711
with bzr send. If neither is specified, the default is the upstream branch
3712
or the branch most recently merged using --remember.
3713
3714
When merging a branch, by default the tip will be merged. To pick a different
3715
revision, pass --revision. If you specify two values, the first will be used as
3716
BASE and the second one as OTHER. Merging individual revisions, or a subset of
3717
available revisions, like this is commonly referred to as "cherrypicking".
3718
3719
Revision numbers are always relative to the branch being merged.
3720
3721
By default, bzr will try to merge in all new work from the other
3722
branch, automatically determining an appropriate base. If this
3723
fails, you may need to give an explicit base.
4271
with brz send. If neither is specified, the default is the upstream branch
4272
or the branch most recently merged using --remember. The source of the
4273
merge may also be specified in the form of a path to a file in another
4274
branch: in this case, only the modifications to that file are merged into
4275
the current working tree.
4276
4277
When merging from a branch, by default brz will try to merge in all new
4278
work from the other branch, automatically determining an appropriate base
4279
revision. If this fails, you may need to give an explicit base.
4280
4281
To pick a different ending revision, pass "--revision OTHER". brz will
4282
try to merge in all new work up to and including revision OTHER.
4283
4284
If you specify two values, "--revision BASE..OTHER", only revisions BASE
4285
through OTHER, excluding BASE but including OTHER, will be merged. If this
4286
causes some revisions to be skipped, i.e. if the destination branch does
4287
not already contain revision BASE, such a merge is commonly referred to as
4288
a "cherrypick". Unlike a normal merge, Bazaar does not currently track
4289
cherrypicks. The changes look like a normal commit, and the history of the
4290
changes from the other branch is not stored in the commit.
4291
4292
Revision numbers are always relative to the source branch.
3724
4293
3725
4294
Merge will do its best to combine the changes in two branches, but there
3726
4295
are some kinds of problems only a human can fix. When it encounters those,
3727
4296
it will mark a conflict. A conflict means that you need to fix something,
3728
before you should commit.
3729
3730
Use bzr resolve when you have fixed a problem. See also bzr conflicts.
3731
3732
If there is no default branch set, the first merge will set it. After
3733
that, you can omit the branch to use the default. To change the
3734
default, use --remember. The value will only be saved if the remote
3735
location can be accessed.
4297
before you can commit.
4298
4299
Use brz resolve when you have fixed a problem. See also brz conflicts.
4300
4301
If there is no default branch set, the first merge will set it (use
4302
--no-remember to avoid setting it). After that, you can omit the branch
4303
to use the default. To change the default, use --remember. The value will
4304
only be saved if the remote location can be accessed.
3736
4305
3737
4306
The results of the merge are placed into the destination working
3738
directory, where they can be reviewed (with bzr diff), tested, and then
4307
directory, where they can be reviewed (with brz diff), tested, and then
3739
4308
committed to record the result of the merge.
3740
4309
3741
4310
merge refuses to run if there are any uncommitted changes, unless
3742
--force is given. The --force option can also be used to create a
4311
--force is given. If --force is given, then the changes from the source
4312
will be merged with the current working tree, including any uncommitted
4313
changes in the tree. The --force option can also be used to create a
3743
4314
merge revision which has more than two parents.
3744
4315
3745
4316
If one would like to merge changes from the working tree of the other
3750
4321
you to apply each diff hunk and file change, similar to "shelve".
3751
4322
3752
4323
:Examples:
3753
To merge the latest revision from bzr.dev::
3754
3755
bzr merge ../bzr.dev
3756
3757
To merge changes up to and including revision 82 from bzr.dev::
3758
3759
bzr merge -r 82 ../bzr.dev
4324
To merge all new revisions from brz.dev::
4325
4326
brz merge ../brz.dev
4327
4328
To merge changes up to and including revision 82 from brz.dev::
4329
4330
brz merge -r 82 ../brz.dev
3760
4331
3761
4332
To merge the changes introduced by 82, without previous changes::
3762
4333
3763
bzr merge -r 81..82 ../bzr.dev
4334
brz merge -r 81..82 ../brz.dev
3764
4335
3765
4336
To apply a merge directive contained in /tmp/merge::
3766
4337
3767
bzr merge /tmp/merge
4338
brz merge /tmp/merge
3768
4339
3769
4340
To create a merge revision with three parents from two branches
3770
4341
feature1a and feature1b:
3771
4342
3772
bzr merge ../feature1a
3773
bzr merge ../feature1b --force
3774
bzr commit -m 'revision with three parents'
4343
brz merge ../feature1a
4344
brz merge ../feature1b --force
4345
brz commit -m 'revision with three parents'
3775
4346
"""
3776
4347
3777
4348
encoding_type = 'exact'
3793
4364
' completely merged into the source, pull from the'
3794
4365
' source rather than merging. When this happens,'
3795
4366
' you do not need to commit the result.'),
3796
Option('directory',
4367
custom_help('directory',
3797
4368
help='Branch to merge into, '
3798
'rather than the one containing the working directory.',
3799
short_name='d',
3800
type=unicode,
3801
),
4369
'rather than the one containing the working directory.'),
3802
4370
Option('preview', help='Instead of merging, show a diff of the'
3803
4371
' merge.'),
3804
4372
Option('interactive', help='Select changes interactively.',
3806
4374
]
3807
4375
3808
4376
def run(self, location=None, revision=None, force=False,
3809
merge_type=None, show_base=False, reprocess=None, remember=False,
4377
merge_type=None, show_base=False, reprocess=None, remember=None,
3810
4378
uncommitted=False, pull=False,
3811
4379
directory=None,
3812
4380
preview=False,
3820
4388
merger = None
3821
4389
allow_pending = True
3822
4390
verified = 'inapplicable'
4391
3823
4392
tree = WorkingTree.open_containing(directory)[0]
4393
if tree.branch.revno() == 0:
4394
raise errors.BzrCommandError(gettext('Merging into empty branches not currently supported, '
4395
'https://bugs.launchpad.net/bzr/+bug/308562'))
3824
4396
3825
4397
try:
3826
4398
basis_tree = tree.revision_tree(tree.last_revision())
3837
4409
unversioned_filter=tree.is_ignored, view_info=view_info)
3838
4410
pb = ui.ui_factory.nested_progress_bar()
3839
4411
self.add_cleanup(pb.finished)
3840
tree.lock_write()
3841
self.add_cleanup(tree.unlock)
4412
self.add_cleanup(tree.lock_write().unlock)
3842
4413
if location is not None:
3843
4414
try:
3844
4415
mergeable = bundle.read_mergeable_from_url(location,
3847
4418
mergeable = None
3848
4419
else:
3849
4420
if uncommitted:
3850
raise errors.BzrCommandError('Cannot use --uncommitted'
3851
' with bundles or merge directives.')
4421
raise errors.BzrCommandError(gettext('Cannot use --uncommitted'
4422
' with bundles or merge directives.'))
3852
4423
3853
4424
if revision is not None:
3854
raise errors.BzrCommandError(
3855
'Cannot use -r with merge directives or bundles')
4425
raise errors.BzrCommandError(gettext(
4426
'Cannot use -r with merge directives or bundles'))
3856
4427
merger, verified = _mod_merge.Merger.from_mergeable(tree,
3857
4428
mergeable, None)
3858
4429
3859
4430
if merger is None and uncommitted:
3860
4431
if revision is not None and len(revision) > 0:
3861
raise errors.BzrCommandError('Cannot use --uncommitted and'
3862
' --revision at the same time.')
4432
raise errors.BzrCommandError(gettext('Cannot use --uncommitted and'
4433
' --revision at the same time.'))
3863
4434
merger = self.get_merger_from_uncommitted(tree, location, None)
3864
4435
allow_pending = False
3865
4436
3873
4444
self.sanity_check_merger(merger)
3874
4445
if (merger.base_rev_id == merger.other_rev_id and
3875
4446
merger.other_rev_id is not None):
3876
note('Nothing to do.')
4447
# check if location is a nonexistent file (and not a branch) to
4448
# disambiguate the 'Nothing to do'
4449
if merger.interesting_files:
4450
if not merger.other_tree.has_filename(
4451
merger.interesting_files[0]):
4452
note(gettext("merger: ") + str(merger))
4453
raise errors.PathsDoNotExist([location])
4454
note(gettext('Nothing to do.'))
3877
4455
return 0
3878
if pull:
4456
if pull and not preview:
3879
4457
if merger.interesting_files is not None:
3880
raise errors.BzrCommandError('Cannot pull individual files')
4458
raise errors.BzrCommandError(gettext('Cannot pull individual files'))
3881
4459
if (merger.base_rev_id == tree.last_revision()):
3882
4460
result = tree.pull(merger.other_branch, False,
3883
4461
merger.other_rev_id)
3884
4462
result.report(self.outf)
3885
4463
return 0
3886
4464
if merger.this_basis is None:
3887
raise errors.BzrCommandError(
4465
raise errors.BzrCommandError(gettext(
3888
4466
"This branch has no commits."
3889
" (perhaps you would prefer 'bzr pull')")
4467
" (perhaps you would prefer 'brz pull')"))
3890
4468
if preview:
3891
4469
return self._do_preview(merger)
3892
4470
elif interactive:
3903
4481
return result_tree
3904
4482
3905
4483
def _do_preview(self, merger):
3906
from bzrlib.diff import show_diff_trees
4484
from .diff import show_diff_trees
3907
4485
result_tree = self._get_preview(merger)
4486
path_encoding = osutils.get_diff_header_encoding()
3908
4487
show_diff_trees(merger.this_tree, result_tree, self.outf,
3909
old_label='', new_label='')
4488
old_label='', new_label='',
4489
path_encoding=path_encoding)
3910
4490
3911
4491
def _do_merge(self, merger, change_reporter, allow_pending, verified):
3912
4492
merger.change_reporter = change_reporter
3927
4507
Shelver to selectively remove the differences between the working tree
3928
4508
and the preview tree.
3929
4509
"""
3930
from bzrlib import shelf_ui
4510
from . import shelf_ui
3931
4511
result_tree = self._get_preview(merger)
3932
writer = bzrlib.option.diff_writer_registry.get()
4512
writer = breezy.option.diff_writer_registry.get()
3933
4513
shelver = shelf_ui.Shelver(merger.this_tree, result_tree, destroy=True,
3934
4514
reporter=shelf_ui.ApplyReporter(),
3935
4515
diff_writer=writer(sys.stdout))
3941
4521
def sanity_check_merger(self, merger):
3942
4522
if (merger.show_base and
3943
4523
not merger.merge_type is _mod_merge.Merge3Merger):
3944
raise errors.BzrCommandError("Show-base is not supported for this"
3945
" merge type. %s" % merger.merge_type)
4524
raise errors.BzrCommandError(gettext("Show-base is not supported for this"
4525
" merge type. %s") % merger.merge_type)
3946
4526
if merger.reprocess is None:
3947
4527
if merger.show_base:
3948
4528
merger.reprocess = False
3950
4530
# Use reprocess if the merger supports it
3951
4531
merger.reprocess = merger.merge_type.supports_reprocess
3952
4532
if merger.reprocess and not merger.merge_type.supports_reprocess:
3953
raise errors.BzrCommandError("Conflict reduction is not supported"
3954
" for merge type %s." %
4533
raise errors.BzrCommandError(gettext("Conflict reduction is not supported"
4534
" for merge type %s.") %
3955
4535
merger.merge_type)
3956
4536
if merger.reprocess and merger.show_base:
3957
raise errors.BzrCommandError("Cannot do conflict reduction and"
3958
" show base.")
4537
raise errors.BzrCommandError(gettext("Cannot do conflict reduction and"
4538
" show base."))
3959
4539
3960
4540
def _get_merger_from_branch(self, tree, location, revision, remember,
3961
4541
possible_transports, pb):
3962
4542
"""Produce a merger from a location, assuming it refers to a branch."""
3963
from bzrlib.tag import _merge_tags_if_possible
4543
from .tag import _merge_tags_if_possible
3964
4544
# find the branch locations
3965
4545
other_loc, user_location = self._select_branch_location(tree, location,
3966
4546
revision, -1)
3988
4568
if other_revision_id is None:
3989
4569
other_revision_id = _mod_revision.ensure_null(
3990
4570
other_branch.last_revision())
3991
# Remember where we merge from
3992
if ((remember or tree.branch.get_submit_branch() is None) and
3993
user_location is not None):
4571
# Remember where we merge from. We need to remember if:
4572
# - user specify a location (and we don't merge from the parent
4573
# branch)
4574
# - user ask to remember or there is no previous location set to merge
4575
# from and user didn't ask to *not* remember
4576
if (user_location is not None
4577
and ((remember
4578
or (remember is None
4579
and tree.branch.get_submit_branch() is None)))):
3994
4580
tree.branch.set_submit_branch(other_branch.base)
3995
_merge_tags_if_possible(other_branch, tree.branch)
4581
# Merge tags (but don't set them in the master branch yet, the user
4582
# might revert this merge). Commit will propagate them.
4583
_merge_tags_if_possible(other_branch, tree.branch, ignore_master=True)
3996
4584
merger = _mod_merge.Merger.from_revision_ids(pb, tree,
3997
4585
other_revision_id, base_revision_id, other_branch, base_branch)
3998
4586
if other_path != '':
4057
4645
stored_location_type = "parent"
4058
4646
mutter("%s", stored_location)
4059
4647
if stored_location is None:
4060
raise errors.BzrCommandError("No location specified or remembered")
4648
raise errors.BzrCommandError(gettext("No location specified or remembered"))
4061
4649
display_url = urlutils.unescape_for_display(stored_location, 'utf-8')
4062
note(u"%s remembered %s location %s", verb_string,
4063
stored_location_type, display_url)
4650
note(gettext("{0} remembered {1} location {2}").format(verb_string,
4651
stored_location_type, display_url))
4064
4652
return stored_location
4065
4653
4066
4654
4079
4667
Re-do the merge of all conflicted files, and show the base text in
4080
4668
conflict regions, in addition to the usual THIS and OTHER texts::
4081
4669
4082
bzr remerge --show-base
4670
brz remerge --show-base
4083
4671
4084
4672
Re-do the merge of "foobar", using the weave merge algorithm, with
4085
4673
additional processing to reduce the size of conflict regions::
4086
4674
4087
bzr remerge --merge-type weave --reprocess foobar
4675
brz remerge --merge-type weave --reprocess foobar
4088
4676
"""
4089
4677
takes_args = ['file*']
4090
4678
takes_options = [
4096
4684
4097
4685
def run(self, file_list=None, merge_type=None, show_base=False,
4098
4686
reprocess=False):
4099
from bzrlib.conflicts import restore
4687
from .conflicts import restore
4100
4688
if merge_type is None:
4101
4689
merge_type = _mod_merge.Merge3Merger
4102
tree, file_list = tree_files(file_list)
4103
tree.lock_write()
4104
self.add_cleanup(tree.unlock)
4690
tree, file_list = WorkingTree.open_containing_paths(file_list)
4691
self.add_cleanup(tree.lock_write().unlock)
4105
4692
parents = tree.get_parent_ids()
4106
4693
if len(parents) != 2:
4107
raise errors.BzrCommandError("Sorry, remerge only works after normal"
4694
raise errors.BzrCommandError(gettext("Sorry, remerge only works after normal"
4108
4695
" merges. Not cherrypicking or"
4109
" multi-merges.")
4696
" multi-merges."))
4110
4697
repository = tree.branch.repository
4111
4698
interesting_ids = None
4112
4699
new_conflicts = []
4121
4708
if tree.kind(file_id) != "directory":
4122
4709
continue
4123
4710
4124
for name, ie in tree.inventory.iter_entries(file_id):
4711
# FIXME: Support nested trees
4712
for name, ie in tree.root_inventory.iter_entries(file_id):
4125
4713
interesting_ids.add(ie.file_id)
4126
4714
new_conflicts = conflicts.select_conflicts(tree, file_list)[0]
4127
4715
else:
4160
4748
4161
4749
4162
4750
class cmd_revert(Command):
4163
__doc__ = """Revert files to a previous revision.
4751
__doc__ = """\
4752
Set files in the working tree back to the contents of a previous revision.
4164
4753
4165
4754
Giving a list of files will revert only those files. Otherwise, all files
4166
4755
will be reverted. If the revision is not specified with '--revision', the
4167
last committed revision is used.
4756
working tree basis revision is used. A revert operation affects only the
4757
working tree, not any revision history like the branch and repository or
4758
the working tree basis revision.
4168
4759
4169
4760
To remove only some changes, without reverting to a prior version, use
4170
merge instead. For example, "merge . --revision -2..-3" will remove the
4171
changes introduced by -2, without affecting the changes introduced by -1.
4172
Or to remove certain changes on a hunk-by-hunk basis, see the Shelf plugin.
4761
merge instead. For example, "merge . -r -2..-3" (don't forget the ".")
4762
will remove the changes introduced by the second last commit (-2), without
4763
affecting the changes introduced by the last commit (-1). To remove
4764
certain changes on a hunk-by-hunk basis, see the shelve command.
4765
To update the branch to a specific revision or the latest revision and
4766
update the working tree accordingly while preserving local changes, see the
4767
update command.
4173
4768
4174
By default, any files that have been manually changed will be backed up
4175
first. (Files changed only by merge are not backed up.) Backup files have
4176
'.~#~' appended to their name, where # is a number.
4769
Uncommitted changes to files that are reverted will be discarded.
4770
Howver, by default, any files that have been manually changed will be
4771
backed up first. (Files changed only by merge are not backed up.) Backup
4772
files have '.~#~' appended to their name, where # is a number.
4177
4773
4178
4774
When you provide files, you can use their current pathname or the pathname
4179
4775
from the target revision. So you can use revert to "undelete" a file by
4189
4785
not yet committed. These revisions will be included as additional parents
4190
4786
of the next commit. Normally, using revert clears that list as well as
4191
4787
reverting the files. If any files are specified, revert leaves the list
4192
of uncommitted merges alone and reverts only the files. Use ``bzr revert
4788
of uncommitted merges alone and reverts only the files. Use ``brz revert
4193
4789
.`` in the tree root to revert all files but keep the recorded merges,
4194
and ``bzr revert --forget-merges`` to clear the pending merge list without
4790
and ``brz revert --forget-merges`` to clear the pending merge list without
4195
4791
reverting any files.
4196
4792
4197
Using "bzr revert --forget-merges", it is possible to apply all of the
4793
Using "brz revert --forget-merges", it is possible to apply all of the
4198
4794
changes from a branch in a single revision. To do this, perform the merge
4199
4795
as desired. Then doing revert with the "--forget-merges" option will keep
4200
4796
the content of the tree as it was, but it will clear the list of pending
4205
4801
target branches.
4206
4802
"""
4207
4803
4208
_see_also = ['cat', 'export']
4804
_see_also = ['cat', 'export', 'merge', 'shelve']
4209
4805
takes_options = [
4210
4806
'revision',
4211
4807
Option('no-backup', "Do not save backups of reverted files."),
4216
4812
4217
4813
def run(self, revision=None, no_backup=False, file_list=None,
4218
4814
forget_merges=None):
4219
tree, file_list = tree_files(file_list)
4220
tree.lock_tree_write()
4221
self.add_cleanup(tree.unlock)
4815
tree, file_list = WorkingTree.open_containing_paths(file_list)
4816
self.add_cleanup(tree.lock_tree_write().unlock)
4222
4817
if forget_merges:
4223
4818
tree.set_parent_ids(tree.get_parent_ids()[:1])
4224
4819
else:
4254
4849
4255
4850
@display_command
4256
4851
def run(self, topic=None, long=False):
4257
import bzrlib.help
4852
import breezy.help
4258
4853
if topic is None and long:
4259
4854
topic = "commands"
4260
bzrlib.help.help(topic)
4855
breezy.help.help(topic)
4261
4856
4262
4857
4263
4858
class cmd_shell_complete(Command):
4264
4859
__doc__ = """Show appropriate completions for context.
4265
4860
4266
For a list of all available commands, say 'bzr shell-complete'.
4861
For a list of all available commands, say 'brz shell-complete'.
4267
4862
"""
4268
4863
takes_args = ['context?']
4269
4864
aliases = ['s-c']
4271
4866
4272
4867
@display_command
4273
4868
def run(self, context=None):
4274
import shellcomplete
4869
from . import shellcomplete
4275
4870
shellcomplete.shellcomplete(context)
4276
4871
4277
4872
4293
4888
Determine the missing revisions between this and the branch at the
4294
4889
remembered pull location::
4295
4890
4296
bzr missing
4891
brz missing
4297
4892
4298
4893
Determine the missing revisions between this and another branch::
4299
4894
4300
bzr missing http://server/branch
4895
brz missing http://server/branch
4301
4896
4302
4897
Determine the missing revisions up to a specific revision on the other
4303
4898
branch::
4304
4899
4305
bzr missing -r ..-10
4900
brz missing -r ..-10
4306
4901
4307
4902
Determine the missing revisions up to a specific revision on this
4308
4903
branch::
4309
4904
4310
bzr missing --my-revision ..-10
4905
brz missing --my-revision ..-10
4311
4906
"""
4312
4907
4313
4908
_see_also = ['merge', 'pull']
4314
4909
takes_args = ['other_branch?']
4315
4910
takes_options = [
4911
'directory',
4316
4912
Option('reverse', 'Reverse the order of revisions.'),
4317
4913
Option('mine-only',
4318
4914
'Display changes in the local branch only.'),
4330
4926
type=_parse_revision_str,
4331
4927
help='Filter on local branch revisions (inclusive). '
4332
4928
'See "help revisionspec" for details.'),
4333
Option('include-merges',
4929
Option('include-merged',
4334
4930
'Show all revisions in addition to the mainline ones.'),
4931
Option('include-merges', hidden=True,
4932
help='Historical alias for --include-merged.'),
4335
4933
]
4336
4934
encoding_type = 'replace'
4337
4935
4340
4938
theirs_only=False,
4341
4939
log_format=None, long=False, short=False, line=False,
4342
4940
show_ids=False, verbose=False, this=False, other=False,
4343
include_merges=False, revision=None, my_revision=None):
4344
from bzrlib.missing import find_unmerged, iter_log_revisions
4941
include_merged=None, revision=None, my_revision=None,
4942
directory=u'.',
4943
include_merges=symbol_versioning.DEPRECATED_PARAMETER):
4944
from breezy.missing import find_unmerged, iter_log_revisions
4345
4945
def message(s):
4346
4946
if not is_quiet():
4347
4947
self.outf.write(s)
4348
4948
4949
if symbol_versioning.deprecated_passed(include_merges):
4950
ui.ui_factory.show_user_warning(
4951
'deprecated_command_option',
4952
deprecated_name='--include-merges',
4953
recommended_name='--include-merged',
4954
deprecated_in_version='2.5',
4955
command=self.invoked_as)
4956
if include_merged is None:
4957
include_merged = include_merges
4958
else:
4959
raise errors.BzrCommandError(gettext(
4960
'{0} and {1} are mutually exclusive').format(
4961
'--include-merges', '--include-merged'))
4962
if include_merged is None:
4963
include_merged = False
4349
4964
if this:
4350
4965
mine_only = this
4351
4966
if other:
4359
4974
elif theirs_only:
4360
4975
restrict = 'remote'
4361
4976
4362
local_branch = Branch.open_containing(u".")[0]
4363
local_branch.lock_read()
4364
self.add_cleanup(local_branch.unlock)
4977
local_branch = Branch.open_containing(directory)[0]
4978
self.add_cleanup(local_branch.lock_read().unlock)
4365
4979
4366
4980
parent = local_branch.get_parent()
4367
4981
if other_branch is None:
4368
4982
other_branch = parent
4369
4983
if other_branch is None:
4370
raise errors.BzrCommandError("No peer location known"
4371
" or specified.")
4984
raise errors.BzrCommandError(gettext("No peer location known"
4985
" or specified."))
4372
4986
display_url = urlutils.unescape_for_display(parent,
4373
4987
self.outf.encoding)
4374
message("Using saved parent location: "
4375
+ display_url + "\n")
4988
message(gettext("Using saved parent location: {0}\n").format(
4989
display_url))
4376
4990
4377
4991
remote_branch = Branch.open(other_branch)
4378
4992
if remote_branch.base == local_branch.base:
4379
4993
remote_branch = local_branch
4380
4994
else:
4381
remote_branch.lock_read()
4382
self.add_cleanup(remote_branch.unlock)
4995
self.add_cleanup(remote_branch.lock_read().unlock)
4383
4996
4384
4997
local_revid_range = _revision_range_to_revid_range(
4385
4998
_get_revision_range(my_revision, local_branch,
4392
5005
local_extra, remote_extra = find_unmerged(
4393
5006
local_branch, remote_branch, restrict,
4394
5007
backward=not reverse,
4395
include_merges=include_merges,
5008
include_merged=include_merged,
4396
5009
local_revid_range=local_revid_range,
4397
5010
remote_revid_range=remote_revid_range)
4398
5011
4405
5018
4406
5019
status_code = 0
4407
5020
if local_extra and not theirs_only:
4408
message("You have %d extra revision(s):\n" %
5021
message(ngettext("You have %d extra revision:\n",
5022
"You have %d extra revisions:\n",
5023
len(local_extra)) %
4409
5024
len(local_extra))
5025
rev_tag_dict = {}
5026
if local_branch.supports_tags():
5027
rev_tag_dict = local_branch.tags.get_reverse_tag_dict()
4410
5028
for revision in iter_log_revisions(local_extra,
4411
5029
local_branch.repository,
4412
verbose):
5030
verbose,
5031
rev_tag_dict):
4413
5032
lf.log_revision(revision)
4414
5033
printed_local = True
4415
5034
status_code = 1
4419
5038
if remote_extra and not mine_only:
4420
5039
if printed_local is True:
4421
5040
message("\n\n\n")
4422
message("You are missing %d revision(s):\n" %
5041
message(ngettext("You are missing %d revision:\n",
5042
"You are missing %d revisions:\n",
5043
len(remote_extra)) %
4423
5044
len(remote_extra))
5045
if remote_branch.supports_tags():
5046
rev_tag_dict = remote_branch.tags.get_reverse_tag_dict()
4424
5047
for revision in iter_log_revisions(remote_extra,
4425
5048
remote_branch.repository,
4426
verbose):
5049
verbose,
5050
rev_tag_dict):
4427
5051
lf.log_revision(revision)
4428
5052
status_code = 1
4429
5053
4430
5054
if mine_only and not local_extra:
4431
5055
# We checked local, and found nothing extra
4432
message('This branch is up to date.\n')
5056
message(gettext('This branch has no new revisions.\n'))
4433
5057
elif theirs_only and not remote_extra:
4434
5058
# We checked remote, and found nothing extra
4435
message('Other branch is up to date.\n')
5059
message(gettext('Other branch has no new revisions.\n'))
4436
5060
elif not (mine_only or theirs_only or local_extra or
4437
5061
remote_extra):
4438
5062
# We checked both branches, and neither one had extra
4439
5063
# revisions
4440
message("Branches are up to date.\n")
5064
message(gettext("Branches are up to date.\n"))
4441
5065
self.cleanup_now()
4442
5066
if not status_code and parent is None and other_branch is not None:
4443
local_branch.lock_write()
4444
self.add_cleanup(local_branch.unlock)
5067
self.add_cleanup(local_branch.lock_write().unlock)
4445
5068
# handle race conditions - a parent might be set while we run.
4446
5069
if local_branch.get_parent() is None:
4447
5070
local_branch.set_parent(remote_branch.base)
4474
5097
]
4475
5098
4476
5099
def run(self, branch_or_repo='.', clean_obsolete_packs=False):
4477
dir = bzrdir.BzrDir.open_containing(branch_or_repo)[0]
5100
dir = controldir.ControlDir.open_containing(branch_or_repo)[0]
4478
5101
try:
4479
5102
branch = dir.open_branch()
4480
5103
repository = branch.repository
4506
5129
4507
5130
@display_command
4508
5131
def run(self, verbose=False):
4509
import bzrlib.plugin
4510
from inspect import getdoc
4511
result = []
4512
for name, plugin in bzrlib.plugin.plugins().items():
4513
version = plugin.__version__
4514
if version == 'unknown':
4515
version = ''
4516
name_ver = '%s %s' % (name, version)
4517
d = getdoc(plugin.module)
4518
if d:
4519
doc = d.split('\n')[0]
4520
else:
4521
doc = '(no description)'
4522
result.append((name_ver, doc, plugin.path()))
4523
for name_ver, doc, path in sorted(result):
4524
self.outf.write("%s\n" % name_ver)
4525
self.outf.write(" %s\n" % doc)
4526
if verbose:
4527
self.outf.write(" %s\n" % path)
4528
self.outf.write("\n")
5132
from . import plugin
5133
# Don't give writelines a generator as some codecs don't like that
5134
self.outf.writelines(
5135
list(plugin.describe_plugins(show_paths=verbose)))
4529
5136
4530
5137
4531
5138
class cmd_testament(Command):
4536
5143
Option('strict',
4537
5144
help='Produce a strict-format testament.')]
4538
5145
takes_args = ['branch?']
5146
encoding_type = 'exact'
4539
5147
@display_command
4540
5148
def run(self, branch=u'.', revision=None, long=False, strict=False):
4541
from bzrlib.testament import Testament, StrictTestament
5149
from .testament import Testament, StrictTestament
4542
5150
if strict is True:
4543
5151
testament_class = StrictTestament
4544
5152
else:
4547
5155
b = Branch.open_containing(branch)[0]
4548
5156
else:
4549
5157
b = Branch.open(branch)
4550
b.lock_read()
4551
self.add_cleanup(b.unlock)
5158
self.add_cleanup(b.lock_read().unlock)
4552
5159
if revision is None:
4553
5160
rev_id = b.last_revision()
4554
5161
else:
4555
5162
rev_id = revision[0].as_revision_id(b)
4556
5163
t = testament_class.from_revision(b.repository, rev_id)
4557
5164
if long:
4558
sys.stdout.writelines(t.as_text_lines())
5165
self.outf.writelines(t.as_text_lines())
4559
5166
else:
4560
sys.stdout.write(t.as_short_text())
5167
self.outf.write(t.as_short_text())
4561
5168
4562
5169
4563
5170
class cmd_annotate(Command):
4578
5185
Option('long', help='Show commit date in annotations.'),
4579
5186
'revision',
4580
5187
'show-ids',
5188
'directory',
4581
5189
]
4582
5190
encoding_type = 'exact'
4583
5191
4584
5192
@display_command
4585
5193
def run(self, filename, all=False, long=False, revision=None,
4586
show_ids=False):
4587
from bzrlib.annotate import annotate_file, annotate_file_tree
5194
show_ids=False, directory=None):
5195
from .annotate import (
5196
annotate_file_tree,
5197
)
4588
5198
wt, branch, relpath = \
4589
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
5199
_open_directory_or_containing_tree_or_branch(filename, directory)
4590
5200
if wt is not None:
4591
wt.lock_read()
4592
self.add_cleanup(wt.unlock)
5201
self.add_cleanup(wt.lock_read().unlock)
4593
5202
else:
4594
branch.lock_read()
4595
self.add_cleanup(branch.unlock)
5203
self.add_cleanup(branch.lock_read().unlock)
4596
5204
tree = _get_one_revision_tree('annotate', revision, branch=branch)
4597
tree.lock_read()
4598
self.add_cleanup(tree.unlock)
4599
if wt is not None:
5205
self.add_cleanup(tree.lock_read().unlock)
5206
if wt is not None and revision is None:
4600
5207
file_id = wt.path2id(relpath)
4601
5208
else:
4602
5209
file_id = tree.path2id(relpath)
4603
5210
if file_id is None:
4604
5211
raise errors.NotVersionedError(filename)
4605
file_version = tree.inventory[file_id].revision
4606
5212
if wt is not None and revision is None:
4607
5213
# If there is a tree and we're not annotating historical
4608
5214
# versions, annotate the working tree's content.
4609
5215
annotate_file_tree(wt, file_id, self.outf, long, all,
4610
5216
show_ids=show_ids)
4611
5217
else:
4612
annotate_file(branch, file_version, file_id, long, all, self.outf,
4613
show_ids=show_ids)
5218
annotate_file_tree(tree, file_id, self.outf, long, all,
5219
show_ids=show_ids, branch=branch)
4614
5220
4615
5221
4616
5222
class cmd_re_sign(Command):
4619
5225
4620
5226
hidden = True # is this right ?
4621
5227
takes_args = ['revision_id*']
4622
takes_options = ['revision']
5228
takes_options = ['directory', 'revision']
4623
5229
4624
def run(self, revision_id_list=None, revision=None):
5230
def run(self, revision_id_list=None, revision=None, directory=u'.'):
4625
5231
if revision_id_list is not None and revision is not None:
4626
raise errors.BzrCommandError('You can only supply one of revision_id or --revision')
5232
raise errors.BzrCommandError(gettext('You can only supply one of revision_id or --revision'))
4627
5233
if revision_id_list is None and revision is None:
4628
raise errors.BzrCommandError('You must supply either --revision or a revision_id')
4629
b = WorkingTree.open_containing(u'.')[0].branch
4630
b.lock_write()
4631
self.add_cleanup(b.unlock)
5234
raise errors.BzrCommandError(gettext('You must supply either --revision or a revision_id'))
5235
b = WorkingTree.open_containing(directory)[0].branch
5236
self.add_cleanup(b.lock_write().unlock)
4632
5237
return self._run(b, revision_id_list, revision)
4633
5238
4634
5239
def _run(self, b, revision_id_list, revision):
4635
import bzrlib.gpg as gpg
4636
gpg_strategy = gpg.GPGStrategy(b.get_config())
5240
from . import gpg
5241
gpg_strategy = gpg.GPGStrategy(b.get_config_stack())
4637
5242
if revision_id_list is not None:
4638
5243
b.repository.start_write_group()
4639
5244
try:
4664
5269
if to_revid is None:
4665
5270
to_revno = b.revno()
4666
5271
if from_revno is None or to_revno is None:
4667
raise errors.BzrCommandError('Cannot sign a range of non-revision-history revisions')
5272
raise errors.BzrCommandError(gettext('Cannot sign a range of non-revision-history revisions'))
4668
5273
b.repository.start_write_group()
4669
5274
try:
4670
5275
for revno in range(from_revno, to_revno + 1):
4676
5281
else:
4677
5282
b.repository.commit_write_group()
4678
5283
else:
4679
raise errors.BzrCommandError('Please supply either one revision, or a range.')
5284
raise errors.BzrCommandError(gettext('Please supply either one revision, or a range.'))
4680
5285
4681
5286
4682
5287
class cmd_bind(Command):
4693
5298
4694
5299
_see_also = ['checkouts', 'unbind']
4695
5300
takes_args = ['location?']
4696
takes_options = []
5301
takes_options = ['directory']
4697
5302
4698
def run(self, location=None):
4699
b, relpath = Branch.open_containing(u'.')
5303
def run(self, location=None, directory=u'.'):
5304
b, relpath = Branch.open_containing(directory)
4700
5305
if location is None:
4701
5306
try:
4702
5307
location = b.get_old_bound_location()
4703
5308
except errors.UpgradeRequired:
4704
raise errors.BzrCommandError('No location supplied. '
4705
'This format does not remember old locations.')
5309
raise errors.BzrCommandError(gettext('No location supplied. '
5310
'This format does not remember old locations.'))
4706
5311
else:
4707
5312
if location is None:
4708
5313
if b.get_bound_location() is not None:
4709
raise errors.BzrCommandError('Branch is already bound')
5314
raise errors.BzrCommandError(
5315
gettext('Branch is already bound'))
4710
5316
else:
4711
raise errors.BzrCommandError('No location supplied '
4712
'and no previous location known')
5317
raise errors.BzrCommandError(
5318
gettext('No location supplied'
5319
' and no previous location known'))
4713
5320
b_other = Branch.open(location)
4714
5321
try:
4715
5322
b.bind(b_other)
4716
5323
except errors.DivergedBranches:
4717
raise errors.BzrCommandError('These branches have diverged.'
4718
' Try merging, and then bind again.')
5324
raise errors.BzrCommandError(gettext('These branches have diverged.'
5325
' Try merging, and then bind again.'))
4719
5326
if b.get_config().has_explicit_nickname():
4720
5327
b.nick = b_other.nick
4721
5328
4729
5336
4730
5337
_see_also = ['checkouts', 'bind']
4731
5338
takes_args = []
4732
takes_options = []
5339
takes_options = ['directory']
4733
5340
4734
def run(self):
4735
b, relpath = Branch.open_containing(u'.')
5341
def run(self, directory=u'.'):
5342
b, relpath = Branch.open_containing(directory)
4736
5343
if not b.unbind():
4737
raise errors.BzrCommandError('Local branch is not bound')
5344
raise errors.BzrCommandError(gettext('Local branch is not bound'))
4738
5345
4739
5346
4740
5347
class cmd_uncommit(Command):
4745
5352
remove anything.
4746
5353
4747
5354
If --revision is specified, uncommit revisions to leave the branch at the
4748
specified revision. For example, "bzr uncommit -r 15" will leave the
5355
specified revision. For example, "brz uncommit -r 15" will leave the
4749
5356
branch at revision 15.
4750
5357
4751
5358
Uncommit leaves the working tree ready for a new commit. The only change
4761
5368
takes_options = ['verbose', 'revision',
4762
5369
Option('dry-run', help='Don\'t actually make changes.'),
4763
5370
Option('force', help='Say yes to all questions.'),
5371
Option('keep-tags',
5372
help='Keep tags that point to removed revisions.'),
4764
5373
Option('local',
4765
5374
help="Only remove the commits from the local branch"
4766
5375
" when in a checkout."
4770
5379
aliases = []
4771
5380
encoding_type = 'replace'
4772
5381
4773
def run(self, location=None,
4774
dry_run=False, verbose=False,
4775
revision=None, force=False, local=False):
5382
def run(self, location=None, dry_run=False, verbose=False,
5383
revision=None, force=False, local=False, keep_tags=False):
4776
5384
if location is None:
4777
5385
location = u'.'
4778
control, relpath = bzrdir.BzrDir.open_containing(location)
5386
control, relpath = controldir.ControlDir.open_containing(location)
4779
5387
try:
4780
5388
tree = control.open_workingtree()
4781
5389
b = tree.branch
4784
5392
b = control.open_branch()
4785
5393
4786
5394
if tree is not None:
4787
tree.lock_write()
4788
self.add_cleanup(tree.unlock)
5395
self.add_cleanup(tree.lock_write().unlock)
4789
5396
else:
4790
b.lock_write()
4791
self.add_cleanup(b.unlock)
4792
return self._run(b, tree, dry_run, verbose, revision, force, local=local)
5397
self.add_cleanup(b.lock_write().unlock)
5398
return self._run(b, tree, dry_run, verbose, revision, force,
5399
local, keep_tags)
4793
5400
4794
def _run(self, b, tree, dry_run, verbose, revision, force, local=False):
4795
from bzrlib.log import log_formatter, show_log
4796
from bzrlib.uncommit import uncommit
5401
def _run(self, b, tree, dry_run, verbose, revision, force, local,
5402
keep_tags):
5403
from .log import log_formatter, show_log
5404
from .uncommit import uncommit
4797
5405
4798
5406
last_revno, last_rev_id = b.last_revision_info()
4799
5407
4802
5410
revno = last_revno
4803
5411
rev_id = last_rev_id
4804
5412
else:
4805
# 'bzr uncommit -r 10' actually means uncommit
5413
# 'brz uncommit -r 10' actually means uncommit
4806
5414
# so that the final tree is at revno 10.
4807
# but bzrlib.uncommit.uncommit() actually uncommits
5415
# but breezy.uncommit.uncommit() actually uncommits
4808
5416
# the revisions that are supplied.
4809
5417
# So we need to offset it by one
4810
5418
revno = revision[0].in_history(b).revno + 1
4812
5420
rev_id = b.get_rev_id(revno)
4813
5421
4814
5422
if rev_id is None or _mod_revision.is_null(rev_id):
4815
self.outf.write('No revisions to uncommit.\n')
5423
self.outf.write(gettext('No revisions to uncommit.\n'))
4816
5424
return 1
4817
5425
4818
5426
lf = log_formatter('short',
4827
5435
end_revision=last_revno)
4828
5436
4829
5437
if dry_run:
4830
self.outf.write('Dry-run, pretending to remove'
4831
' the above revisions.\n')
5438
self.outf.write(gettext('Dry-run, pretending to remove'
5439
' the above revisions.\n'))
4832
5440
else:
4833
self.outf.write('The above revision(s) will be removed.\n')
5441
self.outf.write(gettext('The above revision(s) will be removed.\n'))
4834
5442
4835
5443
if not force:
4836
if not ui.ui_factory.get_boolean('Are you sure'):
4837
self.outf.write('Canceled')
5444
if not ui.ui_factory.confirm_action(
5445
gettext(u'Uncommit these revisions'),
5446
'breezy.builtins.uncommit',
5447
{}):
5448
self.outf.write(gettext('Canceled\n'))
4838
5449
return 0
4839
5450
4840
5451
mutter('Uncommitting from {%s} to {%s}',
4841
5452
last_rev_id, rev_id)
4842
5453
uncommit(b, tree=tree, dry_run=dry_run, verbose=verbose,
4843
revno=revno, local=local)
4844
self.outf.write('You can restore the old tip by running:\n'
4845
' bzr pull . -r revid:%s\n' % last_rev_id)
5454
revno=revno, local=local, keep_tags=keep_tags)
5455
self.outf.write(gettext('You can restore the old tip by running:\n'
5456
' brz pull . -r revid:%s\n') % last_rev_id)
4846
5457
4847
5458
4848
5459
class cmd_break_lock(Command):
4849
__doc__ = """Break a dead lock on a repository, branch or working directory.
5460
__doc__ = """Break a dead lock.
5461
5462
This command breaks a lock on a repository, branch, working directory or
5463
config file.
4850
5464
4851
5465
CAUTION: Locks should only be broken when you are sure that the process
4852
5466
holding the lock has been stopped.
4853
5467
4854
You can get information on what locks are open via the 'bzr info
5468
You can get information on what locks are open via the 'brz info
4855
5469
[location]' command.
4856
5470
4857
5471
:Examples:
4858
bzr break-lock
4859
bzr break-lock bzr+ssh://example.com/bzr/foo
5472
brz break-lock
5473
brz break-lock brz+ssh://example.com/brz/foo
5474
brz break-lock --conf ~/.bazaar
4860
5475
"""
5476
4861
5477
takes_args = ['location?']
5478
takes_options = [
5479
Option('config',
5480
help='LOCATION is the directory where the config lock is.'),
5481
Option('force',
5482
help='Do not ask for confirmation before breaking the lock.'),
5483
]
4862
5484
4863
def run(self, location=None, show=False):
5485
def run(self, location=None, config=False, force=False):
4864
5486
if location is None:
4865
5487
location = u'.'
4866
control, relpath = bzrdir.BzrDir.open_containing(location)
4867
try:
4868
control.break_lock()
4869
except NotImplementedError:
4870
pass
5488
if force:
5489
ui.ui_factory = ui.ConfirmationUserInterfacePolicy(ui.ui_factory,
5490
None,
5491
{'breezy.lockdir.break': True})
5492
if config:
5493
conf = _mod_config.LockableConfig(file_name=location)
5494
conf.break_lock()
5495
else:
5496
control, relpath = controldir.ControlDir.open_containing(location)
5497
try:
5498
control.break_lock()
5499
except NotImplementedError:
5500
pass
4871
5501
4872
5502
4873
5503
class cmd_wait_until_signalled(Command):
4874
__doc__ = """Test helper for test_start_and_stop_bzr_subprocess_send_signal.
5504
__doc__ = """Test helper for test_start_and_stop_brz_subprocess_send_signal.
4875
5505
4876
5506
This just prints a line to signal when it is ready, then blocks on stdin.
4877
5507
"""
4885
5515
4886
5516
4887
5517
class cmd_serve(Command):
4888
__doc__ = """Run the bzr server."""
5518
__doc__ = """Run the brz server."""
4889
5519
4890
5520
aliases = ['server']
4891
5521
4894
5524
help='Serve on stdin/out for use from inetd or sshd.'),
4895
5525
RegistryOption('protocol',
4896
5526
help="Protocol to serve.",
4897
lazy_registry=('bzrlib.transport', 'transport_server_registry'),
5527
lazy_registry=('breezy.transport', 'transport_server_registry'),
4898
5528
value_switches=True),
5529
Option('listen',
5530
help='Listen for connections on nominated address.', type=str),
4899
5531
Option('port',
4900
help='Listen for connections on nominated port of the form '
4901
'[hostname:]portnumber. Passing 0 as the port number will '
4902
'result in a dynamically allocated port. The default port '
4903
'depends on the protocol.',
4904
type=str),
4905
Option('directory',
4906
help='Serve contents of this directory.',
4907
type=unicode),
5532
help='Listen for connections on nominated port. Passing 0 as '
5533
'the port number will result in a dynamically allocated '
5534
'port. The default port depends on the protocol.',
5535
type=int),
5536
custom_help('directory',
5537
help='Serve contents of this directory.'),
4908
5538
Option('allow-writes',
4909
5539
help='By default the server is a readonly server. Supplying '
4910
5540
'--allow-writes enables write access to the contents of '
4911
'the served directory and below. Note that ``bzr serve`` '
5541
'the served directory and below. Note that ``brz serve`` '
4912
5542
'does not perform authentication, so unless some form of '
4913
5543
'external authentication is arranged supplying this '
4914
5544
'option leads to global uncontrolled write access to your '
4915
5545
'file system.'
4916
5546
),
5547
Option('client-timeout', type=float,
5548
help='Override the default idle client timeout (5min).'),
4917
5549
]
4918
5550
4919
def get_host_and_port(self, port):
4920
"""Return the host and port to run the smart server on.
4921
4922
If 'port' is None, None will be returned for the host and port.
4923
4924
If 'port' has a colon in it, the string before the colon will be
4925
interpreted as the host.
4926
4927
:param port: A string of the port to run the server on.
4928
:return: A tuple of (host, port), where 'host' is a host name or IP,
4929
and port is an integer TCP/IP port.
4930
"""
4931
host = None
4932
if port is not None:
4933
if ':' in port:
4934
host, port = port.split(':')
4935
port = int(port)
4936
return host, port
4937
4938
def run(self, port=None, inet=False, directory=None, allow_writes=False,
4939
protocol=None):
4940
from bzrlib.transport import get_transport, transport_server_registry
5551
def run(self, listen=None, port=None, inet=False, directory=None,
5552
allow_writes=False, protocol=None, client_timeout=None):
5553
from . import transport
4941
5554
if directory is None:
4942
directory = os.getcwd()
5555
directory = osutils.getcwd()
4943
5556
if protocol is None:
4944
protocol = transport_server_registry.get()
4945
host, port = self.get_host_and_port(port)
4946
url = urlutils.local_path_to_url(directory)
5557
protocol = transport.transport_server_registry.get()
5558
url = transport.location_to_url(directory)
4947
5559
if not allow_writes:
4948
5560
url = 'readonly+' + url
4949
transport = get_transport(url)
4950
protocol(transport, host, port, inet)
5561
t = transport.get_transport_from_url(url)
5562
protocol(t, listen, port, inet, client_timeout)
4951
5563
4952
5564
4953
5565
class cmd_join(Command):
4956
5568
This command requires the target tree to be in a rich-root format.
4957
5569
4958
5570
The TREE argument should be an independent tree, inside another tree, but
4959
not part of it. (Such trees can be produced by "bzr split", but also by
4960
running "bzr branch" with the target inside a tree.)
5571
not part of it. (Such trees can be produced by "brz split", but also by
5572
running "brz branch" with the target inside a tree.)
4961
5573
4962
The result is a combined tree, with the subtree no longer an independant
5574
The result is a combined tree, with the subtree no longer an independent
4963
5575
part. This is marked as a merge of the subtree into the containing tree,
4964
5576
and all history is preserved.
4965
5577
"""
4976
5588
containing_tree = WorkingTree.open_containing(parent_dir)[0]
4977
5589
repo = containing_tree.branch.repository
4978
5590
if not repo.supports_rich_root():
4979
raise errors.BzrCommandError(
5591
raise errors.BzrCommandError(gettext(
4980
5592
"Can't join trees because %s doesn't support rich root data.\n"
4981
"You can use bzr upgrade on the repository."
5593
"You can use brz upgrade on the repository.")
4982
5594
% (repo,))
4983
5595
if reference:
4984
5596
try:
4985
5597
containing_tree.add_reference(sub_tree)
4986
except errors.BadReferenceTarget, e:
5598
except errors.BadReferenceTarget as e:
4987
5599
# XXX: Would be better to just raise a nicely printable
4988
5600
# exception from the real origin. Also below. mbp 20070306
4989
raise errors.BzrCommandError("Cannot join %s. %s" %
4990
(tree, e.reason))
5601
raise errors.BzrCommandError(
5602
gettext("Cannot join {0}. {1}").format(tree, e.reason))
4991
5603
else:
4992
5604
try:
4993
5605
containing_tree.subsume(sub_tree)
4994
except errors.BadSubsumeSource, e:
4995
raise errors.BzrCommandError("Cannot join %s. %s" %
4996
(tree, e.reason))
5606
except errors.BadSubsumeSource as e:
5607
raise errors.BzrCommandError(
5608
gettext("Cannot join {0}. {1}").format(tree, e.reason))
4997
5609
4998
5610
4999
5611
class cmd_split(Command):
5046
5658
_see_also = ['send']
5047
5659
5048
5660
takes_options = [
5661
'directory',
5049
5662
RegistryOption.from_kwargs('patch-type',
5050
5663
'The type of patch to include in the directive.',
5051
5664
title='Patch type',
5064
5677
encoding_type = 'exact'
5065
5678
5066
5679
def run(self, submit_branch=None, public_branch=None, patch_type='bundle',
5067
sign=False, revision=None, mail_to=None, message=None):
5068
from bzrlib.revision import ensure_null, NULL_REVISION
5680
sign=False, revision=None, mail_to=None, message=None,
5681
directory=u'.'):
5682
from .revision import ensure_null, NULL_REVISION
5069
5683
include_patch, include_bundle = {
5070
5684
'plain': (False, False),
5071
5685
'diff': (True, False),
5072
5686
'bundle': (True, True),
5073
5687
}[patch_type]
5074
branch = Branch.open('.')
5688
branch = Branch.open(directory)
5075
5689
stored_submit_branch = branch.get_submit_branch()
5076
5690
if submit_branch is None:
5077
5691
submit_branch = stored_submit_branch
5081
5695
if submit_branch is None:
5082
5696
submit_branch = branch.get_parent()
5083
5697
if submit_branch is None:
5084
raise errors.BzrCommandError('No submit branch specified or known')
5698
raise errors.BzrCommandError(gettext('No submit branch specified or known'))
5085
5699
5086
5700
stored_public_branch = branch.get_public_branch()
5087
5701
if public_branch is None:
5088
5702
public_branch = stored_public_branch
5089
5703
elif stored_public_branch is None:
5704
# FIXME: Should be done only if we succeed ? -- vila 2012-01-03
5090
5705
branch.set_public_branch(public_branch)
5091
5706
if not include_bundle and public_branch is None:
5092
raise errors.BzrCommandError('No public branch specified or'
5093
' known')
5707
raise errors.BzrCommandError(gettext('No public branch specified or'
5708
' known'))
5094
5709
base_revision_id = None
5095
5710
if revision is not None:
5096
5711
if len(revision) > 2:
5097
raise errors.BzrCommandError('bzr merge-directive takes '
5098
'at most two one revision identifiers')
5712
raise errors.BzrCommandError(gettext('brz merge-directive takes '
5713
'at most two one revision identifiers'))
5099
5714
revision_id = revision[-1].as_revision_id(branch)
5100
5715
if len(revision) == 2:
5101
5716
base_revision_id = revision[0].as_revision_id(branch)
5103
5718
revision_id = branch.last_revision()
5104
5719
revision_id = ensure_null(revision_id)
5105
5720
if revision_id == NULL_REVISION:
5106
raise errors.BzrCommandError('No revisions to bundle.')
5721
raise errors.BzrCommandError(gettext('No revisions to bundle.'))
5107
5722
directive = merge_directive.MergeDirective2.from_objects(
5108
5723
branch.repository, revision_id, time.time(),
5109
5724
osutils.local_time_offset(), submit_branch,
5117
5732
self.outf.writelines(directive.to_lines())
5118
5733
else:
5119
5734
message = directive.to_email(mail_to, branch, sign)
5120
s = SMTPConnection(branch.get_config())
5735
s = SMTPConnection(branch.get_config_stack())
5121
5736
s.send_email(message)
5122
5737
5123
5738
5134
5749
directly from the merge directive, without retrieving data from a
5135
5750
branch.
5136
5751
5137
`bzr send` creates a compact data set that, when applied using bzr
5752
`brz send` creates a compact data set that, when applied using brz
5138
5753
merge, has the same effect as merging from the source branch.
5139
5754
5140
5755
By default the merge directive is self-contained and can be applied to any
5153
5768
source branch defaults to that containing the working directory, but can
5154
5769
be changed using --from.
5155
5770
5156
In order to calculate those changes, bzr must analyse the submit branch.
5771
Both the submit branch and the public branch follow the usual behavior with
5772
respect to --remember: If there is no default location set, the first send
5773
will set it (use --no-remember to avoid setting it). After that, you can
5774
omit the location to use the default. To change the default, use
5775
--remember. The value will only be saved if the location can be accessed.
5776
5777
In order to calculate those changes, brz must analyse the submit branch.
5157
5778
Therefore it is most efficient for the submit branch to be a local mirror.
5158
5779
If a public location is known for the submit_branch, that location is used
5159
5780
in the merge directive.
5162
5783
given, in which case it is sent to a file.
5163
5784
5164
5785
Mail is sent using your preferred mail program. This should be transparent
5165
on Windows (it uses MAPI). On Linux, it requires the xdg-email utility.
5786
on Windows (it uses MAPI). On Unix, it requires the xdg-email utility.
5166
5787
If the preferred client can't be found (or used), your editor will be used.
5167
5788
5168
5789
To use a specific mail program, set the mail_client configuration option.
5183
5804
default. "0.9" uses revision bundle format 0.9 and merge directive
5184
5805
format 1. It is compatible with Bazaar 0.12 - 0.18.
5185
5806
5186
The merge directives created by bzr send may be applied using bzr merge or
5187
bzr pull by specifying a file containing a merge directive as the location.
5807
The merge directives created by brz send may be applied using brz merge or
5808
brz pull by specifying a file containing a merge directive as the location.
5188
5809
5189
bzr send makes extensive use of public locations to map local locations into
5190
URLs that can be used by other people. See `bzr help configuration` to
5191
set them, and use `bzr info` to display them.
5810
brz send makes extensive use of public locations to map local locations into
5811
URLs that can be used by other people. See `brz help configuration` to
5812
set them, and use `brz info` to display them.
5192
5813
"""
5193
5814
5194
5815
encoding_type = 'exact'
5208
5829
help='Branch to generate the submission from, '
5209
5830
'rather than the one containing the working directory.',
5210
5831
short_name='f',
5211
type=unicode),
5832
type=text_type),
5212
5833
Option('output', short_name='o',
5213
5834
help='Write merge directive to this file or directory; '
5214
5835
'use - for stdout.',
5215
type=unicode),
5836
type=text_type),
5216
5837
Option('strict',
5217
5838
help='Refuse to send if there are uncommitted changes in'
5218
5839
' the working tree, --no-strict disables the check.'),
5219
5840
Option('mail-to', help='Mail the request to this address.',
5220
type=unicode),
5841
type=text_type),
5221
5842
'revision',
5222
5843
'message',
5223
Option('body', help='Body for the email.', type=unicode),
5844
Option('body', help='Body for the email.', type=text_type),
5224
5845
RegistryOption('format',
5225
5846
help='Use the specified output format.',
5226
lazy_registry=('bzrlib.send', 'format_registry')),
5847
lazy_registry=('breezy.send', 'format_registry')),
5227
5848
]
5228
5849
5229
5850
def run(self, submit_branch=None, public_branch=None, no_bundle=False,
5230
no_patch=False, revision=None, remember=False, output=None,
5851
no_patch=False, revision=None, remember=None, output=None,
5231
5852
format=None, mail_to=None, message=None, body=None,
5232
5853
strict=None, **kwargs):
5233
from bzrlib.send import send
5854
from .send import send
5234
5855
return send(submit_branch, revision, public_branch, remember,
5235
5856
format, no_bundle, no_patch, output,
5236
5857
kwargs.get('from', '.'), mail_to, message, body,
5282
5903
help='Branch to generate the submission from, '
5283
5904
'rather than the one containing the working directory.',
5284
5905
short_name='f',
5285
type=unicode),
5906
type=text_type),
5286
5907
Option('output', short_name='o', help='Write directive to this file.',
5287
type=unicode),
5908
type=text_type),
5288
5909
Option('strict',
5289
5910
help='Refuse to bundle revisions if there are uncommitted'
5290
5911
' changes in the working tree, --no-strict disables the check.'),
5291
5912
'revision',
5292
5913
RegistryOption('format',
5293
5914
help='Use the specified output format.',
5294
lazy_registry=('bzrlib.send', 'format_registry')),
5915
lazy_registry=('breezy.send', 'format_registry')),
5295
5916
]
5296
5917
aliases = ['bundle']
5297
5918
5304
5925
format=None, strict=None, **kwargs):
5305
5926
if output is None:
5306
5927
output = '-'
5307
from bzrlib.send import send
5928
from .send import send
5308
5929
return send(submit_branch, revision, public_branch, remember,
5309
5930
format, no_bundle, no_patch, output,
5310
5931
kwargs.get('from', '.'), None, None, None,
5324
5945
It is an error to give a tag name that already exists unless you pass
5325
5946
--force, in which case the tag is moved to point to the new revision.
5326
5947
5327
To rename a tag (change the name but keep it on the same revsion), run ``bzr
5328
tag new-name -r tag:old-name`` and then ``bzr tag --delete oldname``.
5948
To rename a tag (change the name but keep it on the same revsion), run ``brz
5949
tag new-name -r tag:old-name`` and then ``brz tag --delete oldname``.
5329
5950
5330
5951
If no tag name is specified it will be determined through the
5331
5952
'automatic_tag_name' hook. This can e.g. be used to automatically tag
5332
upstream releases by reading configure.ac. See ``bzr help hooks`` for
5953
upstream releases by reading configure.ac. See ``brz help hooks`` for
5333
5954
details.
5334
5955
"""
5335
5956
5339
5960
Option('delete',
5340
5961
help='Delete this tag rather than placing it.',
5341
5962
),
5342
Option('directory',
5343
help='Branch in which to place the tag.',
5344
short_name='d',
5345
type=unicode,
5346
),
5963
custom_help('directory',
5964
help='Branch in which to place the tag.'),
5347
5965
Option('force',
5348
5966
help='Replace existing tags.',
5349
5967
),
5357
5975
revision=None,
5358
5976
):
5359
5977
branch, relpath = Branch.open_containing(directory)
5360
branch.lock_write()
5361
self.add_cleanup(branch.unlock)
5978
self.add_cleanup(branch.lock_write().unlock)
5362
5979
if delete:
5363
5980
if tag_name is None:
5364
raise errors.BzrCommandError("No tag specified to delete.")
5981
raise errors.BzrCommandError(gettext("No tag specified to delete."))
5365
5982
branch.tags.delete_tag(tag_name)
5366
self.outf.write('Deleted tag %s.\n' % tag_name)
5983
note(gettext('Deleted tag %s.') % tag_name)
5367
5984
else:
5368
5985
if revision:
5369
5986
if len(revision) != 1:
5370
raise errors.BzrCommandError(
5987
raise errors.BzrCommandError(gettext(
5371
5988
"Tags can only be placed on a single revision, "
5372
"not on a range")
5989
"not on a range"))
5373
5990
revision_id = revision[0].as_revision_id(branch)
5374
5991
else:
5375
5992
revision_id = branch.last_revision()
5376
5993
if tag_name is None:
5377
5994
tag_name = branch.automatic_tag_name(revision_id)
5378
5995
if tag_name is None:
5379
raise errors.BzrCommandError(
5380
"Please specify a tag name.")
5381
if (not force) and branch.tags.has_tag(tag_name):
5996
raise errors.BzrCommandError(gettext(
5997
"Please specify a tag name."))
5998
try:
5999
existing_target = branch.tags.lookup_tag(tag_name)
6000
except errors.NoSuchTag:
6001
existing_target = None
6002
if not force and existing_target not in (None, revision_id):
5382
6003
raise errors.TagAlreadyExists(tag_name)
5383
branch.tags.set_tag(tag_name, revision_id)
5384
self.outf.write('Created tag %s.\n' % tag_name)
6004
if existing_target == revision_id:
6005
note(gettext('Tag %s already exists for that revision.') % tag_name)
6006
else:
6007
branch.tags.set_tag(tag_name, revision_id)
6008
if existing_target is None:
6009
note(gettext('Created tag %s.') % tag_name)
6010
else:
6011
note(gettext('Updated tag %s.') % tag_name)
5385
6012
5386
6013
5387
6014
class cmd_tags(Command):
5392
6019
5393
6020
_see_also = ['tag']
5394
6021
takes_options = [
5395
Option('directory',
5396
help='Branch whose tags should be displayed.',
5397
short_name='d',
5398
type=unicode,
5399
),
5400
RegistryOption.from_kwargs('sort',
6022
custom_help('directory',
6023
help='Branch whose tags should be displayed.'),
6024
RegistryOption('sort',
5401
6025
'Sort tags by different criteria.', title='Sorting',
5402
alpha='Sort tags lexicographically (default).',
5403
time='Sort tags chronologically.',
6026
lazy_registry=('breezy.tag', 'tag_sort_methods')
5404
6027
),
5405
6028
'show-ids',
5406
6029
'revision',
5407
6030
]
5408
6031
5409
6032
@display_command
5410
def run(self,
5411
directory='.',
5412
sort='alpha',
5413
show_ids=False,
5414
revision=None,
5415
):
6033
def run(self, directory='.', sort=None, show_ids=False, revision=None):
6034
from .tag import tag_sort_methods
5416
6035
branch, relpath = Branch.open_containing(directory)
5417
6036
5418
6037
tags = branch.tags.get_tag_dict().items()
5419
6038
if not tags:
5420
6039
return
5421
6040
5422
branch.lock_read()
5423
self.add_cleanup(branch.unlock)
6041
self.add_cleanup(branch.lock_read().unlock)
5424
6042
if revision:
5425
graph = branch.repository.get_graph()
5426
rev1, rev2 = _get_revision_range(revision, branch, self.name())
5427
revid1, revid2 = rev1.rev_id, rev2.rev_id
5428
# only show revisions between revid1 and revid2 (inclusive)
5429
tags = [(tag, revid) for tag, revid in tags if
5430
graph.is_between(revid, revid1, revid2)]
5431
if sort == 'alpha':
5432
tags.sort()
5433
elif sort == 'time':
5434
timestamps = {}
5435
for tag, revid in tags:
5436
try:
5437
revobj = branch.repository.get_revision(revid)
5438
except errors.NoSuchRevision:
5439
timestamp = sys.maxint # place them at the end
5440
else:
5441
timestamp = revobj.timestamp
5442
timestamps[revid] = timestamp
5443
tags.sort(key=lambda x: timestamps[x[1]])
6043
# Restrict to the specified range
6044
tags = self._tags_for_range(branch, revision)
6045
if sort is None:
6046
sort = tag_sort_methods.get()
6047
sort(branch, tags)
5444
6048
if not show_ids:
5445
6049
# [ (tag, revid), ... ] -> [ (tag, dotted_revno), ... ]
5446
6050
for index, (tag, revid) in enumerate(tags):
5448
6052
revno = branch.revision_id_to_dotted_revno(revid)
5449
6053
if isinstance(revno, tuple):
5450
6054
revno = '.'.join(map(str, revno))
5451
except errors.NoSuchRevision:
6055
except (errors.NoSuchRevision,
6056
errors.GhostRevisionsHaveNoRevno,
6057
errors.UnsupportedOperation):
5452
6058
# Bad tag data/merges can lead to tagged revisions
5453
6059
# which are not in this branch. Fail gracefully ...
5454
6060
revno = '?'
5457
6063
for tag, revspec in tags:
5458
6064
self.outf.write('%-20s %s\n' % (tag, revspec))
5459
6065
6066
def _tags_for_range(self, branch, revision):
6067
range_valid = True
6068
rev1, rev2 = _get_revision_range(revision, branch, self.name())
6069
revid1, revid2 = rev1.rev_id, rev2.rev_id
6070
# _get_revision_range will always set revid2 if it's not specified.
6071
# If revid1 is None, it means we want to start from the branch
6072
# origin which is always a valid ancestor. If revid1 == revid2, the
6073
# ancestry check is useless.
6074
if revid1 and revid1 != revid2:
6075
# FIXME: We really want to use the same graph than
6076
# branch.iter_merge_sorted_revisions below, but this is not
6077
# easily available -- vila 2011-09-23
6078
if branch.repository.get_graph().is_ancestor(revid2, revid1):
6079
# We don't want to output anything in this case...
6080
return []
6081
# only show revisions between revid1 and revid2 (inclusive)
6082
tagged_revids = branch.tags.get_reverse_tag_dict()
6083
found = []
6084
for r in branch.iter_merge_sorted_revisions(
6085
start_revision_id=revid2, stop_revision_id=revid1,
6086
stop_rule='include'):
6087
revid_tags = tagged_revids.get(r[0], None)
6088
if revid_tags:
6089
found.extend([(tag, r[0]) for tag in revid_tags])
6090
return found
6091
5460
6092
5461
6093
class cmd_reconfigure(Command):
5462
__doc__ = """Reconfigure the type of a bzr directory.
6094
__doc__ = """Reconfigure the type of a brz directory.
5463
6095
5464
6096
A target configuration must be specified.
5465
6097
5476
6108
takes_args = ['location?']
5477
6109
takes_options = [
5478
6110
RegistryOption.from_kwargs(
5479
'target_type',
5480
title='Target type',
5481
help='The type to reconfigure the directory to.',
6111
'tree_type',
6112
title='Tree type',
6113
help='The relation between branch and tree.',
5482
6114
value_switches=True, enum_switch=False,
5483
6115
branch='Reconfigure to be an unbound branch with no working tree.',
5484
6116
tree='Reconfigure to be an unbound branch with a working tree.',
5485
6117
checkout='Reconfigure to be a bound branch with a working tree.',
5486
6118
lightweight_checkout='Reconfigure to be a lightweight'
5487
6119
' checkout (with no local history).',
6120
),
6121
RegistryOption.from_kwargs(
6122
'repository_type',
6123
title='Repository type',
6124
help='Location fo the repository.',
6125
value_switches=True, enum_switch=False,
5488
6126
standalone='Reconfigure to be a standalone branch '
5489
6127
'(i.e. stop using shared repository).',
5490
6128
use_shared='Reconfigure to use a shared repository.',
6129
),
6130
RegistryOption.from_kwargs(
6131
'repository_trees',
6132
title='Trees in Repository',
6133
help='Whether new branches in the repository have trees.',
6134
value_switches=True, enum_switch=False,
5491
6135
with_trees='Reconfigure repository to create '
5492
6136
'working trees on branches by default.',
5493
6137
with_no_trees='Reconfigure repository to not create '
5499
6143
' will be lost.'),
5500
6144
Option('stacked-on',
5501
6145
help='Reconfigure a branch to be stacked on another branch.',
5502
type=unicode,
6146
type=text_type,
5503
6147
),
5504
6148
Option('unstacked',
5505
6149
help='Reconfigure a branch to be unstacked. This '
5507
6151
),
5508
6152
]
5509
6153
5510
def run(self, location=None, target_type=None, bind_to=None, force=False,
5511
stacked_on=None,
5512
unstacked=None):
5513
directory = bzrdir.BzrDir.open(location)
6154
def run(self, location=None, bind_to=None, force=False,
6155
tree_type=None, repository_type=None, repository_trees=None,
6156
stacked_on=None, unstacked=None):
6157
directory = controldir.ControlDir.open(location)
5514
6158
if stacked_on and unstacked:
5515
raise BzrCommandError("Can't use both --stacked-on and --unstacked")
6159
raise errors.BzrCommandError(gettext("Can't use both --stacked-on and --unstacked"))
5516
6160
elif stacked_on is not None:
5517
6161
reconfigure.ReconfigureStackedOn().apply(directory, stacked_on)
5518
6162
elif unstacked:
5520
6164
# At the moment you can use --stacked-on and a different
5521
6165
# reconfiguration shape at the same time; there seems no good reason
5522
6166
# to ban it.
5523
if target_type is None:
6167
if (tree_type is None and
6168
repository_type is None and
6169
repository_trees is None):
5524
6170
if stacked_on or unstacked:
5525
6171
return
5526
6172
else:
5527
raise errors.BzrCommandError('No target configuration '
5528
'specified')
5529
elif target_type == 'branch':
6173
raise errors.BzrCommandError(gettext('No target configuration '
6174
'specified'))
6175
reconfiguration = None
6176
if tree_type == 'branch':
5530
6177
reconfiguration = reconfigure.Reconfigure.to_branch(directory)
5531
elif target_type == 'tree':
6178
elif tree_type == 'tree':
5532
6179
reconfiguration = reconfigure.Reconfigure.to_tree(directory)
5533
elif target_type == 'checkout':
6180
elif tree_type == 'checkout':
5534
6181
reconfiguration = reconfigure.Reconfigure.to_checkout(
5535
6182
directory, bind_to)
5536
elif target_type == 'lightweight-checkout':
6183
elif tree_type == 'lightweight-checkout':
5537
6184
reconfiguration = reconfigure.Reconfigure.to_lightweight_checkout(
5538
6185
directory, bind_to)
5539
elif target_type == 'use-shared':
6186
if reconfiguration:
6187
reconfiguration.apply(force)
6188
reconfiguration = None
6189
if repository_type == 'use-shared':
5540
6190
reconfiguration = reconfigure.Reconfigure.to_use_shared(directory)
5541
elif target_type == 'standalone':
6191
elif repository_type == 'standalone':
5542
6192
reconfiguration = reconfigure.Reconfigure.to_standalone(directory)
5543
elif target_type == 'with-trees':
6193
if reconfiguration:
6194
reconfiguration.apply(force)
6195
reconfiguration = None
6196
if repository_trees == 'with-trees':
5544
6197
reconfiguration = reconfigure.Reconfigure.set_repository_trees(
5545
6198
directory, True)
5546
elif target_type == 'with-no-trees':
6199
elif repository_trees == 'with-no-trees':
5547
6200
reconfiguration = reconfigure.Reconfigure.set_repository_trees(
5548
6201
directory, False)
5549
reconfiguration.apply(force)
6202
if reconfiguration:
6203
reconfiguration.apply(force)
6204
reconfiguration = None
5550
6205
5551
6206
5552
6207
class cmd_switch(Command):
5573
6228
"""
5574
6229
5575
6230
takes_args = ['to_location?']
5576
takes_options = [Option('force',
6231
takes_options = ['directory',
6232
Option('force',
5577
6233
help='Switch even if local commits will be lost.'),
5578
6234
'revision',
5579
6235
Option('create-branch', short_name='b',
5580
6236
help='Create the target branch from this one before'
5581
6237
' switching to it.'),
6238
Option('store',
6239
help='Store and restore uncommitted changes in the'
6240
' branch.'),
5582
6241
]
5583
6242
5584
6243
def run(self, to_location=None, force=False, create_branch=False,
5585
revision=None):
5586
from bzrlib import switch
5587
tree_location = '.'
6244
revision=None, directory=u'.', store=False):
6245
from . import switch
6246
tree_location = directory
5588
6247
revision = _get_one_revision('switch', revision)
5589
control_dir = bzrdir.BzrDir.open_containing(tree_location)[0]
6248
possible_transports = []
6249
control_dir = controldir.ControlDir.open_containing(tree_location,
6250
possible_transports=possible_transports)[0]
5590
6251
if to_location is None:
5591
6252
if revision is None:
5592
raise errors.BzrCommandError('You must supply either a'
5593
' revision or a location')
5594
to_location = '.'
6253
raise errors.BzrCommandError(gettext('You must supply either a'
6254
' revision or a location'))
6255
to_location = tree_location
5595
6256
try:
5596
branch = control_dir.open_branch()
6257
branch = control_dir.open_branch(
6258
possible_transports=possible_transports)
5597
6259
had_explicit_nick = branch.get_config().has_explicit_nickname()
5598
6260
except errors.NotBranchError:
5599
6261
branch = None
5600
6262
had_explicit_nick = False
5601
6263
if create_branch:
5602
6264
if branch is None:
5603
raise errors.BzrCommandError('cannot create branch without'
5604
' source branch')
5605
to_location = directory_service.directories.dereference(
5606
to_location)
5607
if '/' not in to_location and '\\' not in to_location:
5608
# This path is meant to be relative to the existing branch
5609
this_url = self._get_branch_location(control_dir)
5610
to_location = urlutils.join(this_url, '..', to_location)
6265
raise errors.BzrCommandError(
6266
gettext('cannot create branch without source branch'))
6267
to_location = lookup_new_sibling_branch(control_dir, to_location,
6268
possible_transports=possible_transports)
5611
6269
to_branch = branch.bzrdir.sprout(to_location,
5612
possible_transports=[branch.bzrdir.root_transport],
5613
source_branch=branch).open_branch()
6270
possible_transports=possible_transports,
6271
source_branch=branch).open_branch()
5614
6272
else:
5615
6273
try:
5616
to_branch = Branch.open(to_location)
6274
to_branch = Branch.open(to_location,
6275
possible_transports=possible_transports)
5617
6276
except errors.NotBranchError:
5618
this_url = self._get_branch_location(control_dir)
5619
to_branch = Branch.open(
5620
urlutils.join(this_url, '..', to_location))
6277
to_branch = open_sibling_branch(control_dir, to_location,
6278
possible_transports=possible_transports)
5621
6279
if revision is not None:
5622
6280
revision = revision.as_revision_id(to_branch)
5623
switch.switch(control_dir, to_branch, force, revision_id=revision)
6281
switch.switch(control_dir, to_branch, force, revision_id=revision,
6282
store_uncommitted=store)
5624
6283
if had_explicit_nick:
5625
6284
branch = control_dir.open_branch() #get the new branch!
5626
6285
branch.nick = to_branch.nick
5627
note('Switched to branch: %s',
6286
note(gettext('Switched to branch: %s'),
5628
6287
urlutils.unescape_for_display(to_branch.base, 'utf-8'))
5629
6288
5630
def _get_branch_location(self, control_dir):
5631
"""Return location of branch for this control dir."""
5632
try:
5633
this_branch = control_dir.open_branch()
5634
# This may be a heavy checkout, where we want the master branch
5635
master_location = this_branch.get_bound_location()
5636
if master_location is not None:
5637
return master_location
5638
# If not, use a local sibling
5639
return this_branch.base
5640
except errors.NotBranchError:
5641
format = control_dir.find_branch_format()
5642
if getattr(format, 'get_reference', None) is not None:
5643
return format.get_reference(control_dir)
5644
else:
5645
return control_dir.root_transport.base
5646
6289
5647
6290
5648
6291
class cmd_view(Command):
5668
6311
:Examples:
5669
6312
To define the current view::
5670
6313
5671
bzr view file1 dir1 ...
6314
brz view file1 dir1 ...
5672
6315
5673
6316
To list the current view::
5674
6317
5675
bzr view
6318
brz view
5676
6319
5677
6320
To delete the current view::
5678
6321
5679
bzr view --delete
6322
brz view --delete
5680
6323
5681
6324
To disable the current view without deleting it::
5682
6325
5683
bzr view --switch off
6326
brz view --switch off
5684
6327
5685
6328
To define a named view and switch to it::
5686
6329
5687
bzr view --name view-name file1 dir1 ...
6330
brz view --name view-name file1 dir1 ...
5688
6331
5689
6332
To list a named view::
5690
6333
5691
bzr view --name view-name
6334
brz view --name view-name
5692
6335
5693
6336
To delete a named view::
5694
6337
5695
bzr view --name view-name --delete
6338
brz view --name view-name --delete
5696
6339
5697
6340
To switch to a named view::
5698
6341
5699
bzr view --switch view-name
6342
brz view --switch view-name
5700
6343
5701
6344
To list all views defined::
5702
6345
5703
bzr view --all
6346
brz view --all
5704
6347
5705
6348
To delete all views::
5706
6349
5707
bzr view --delete --all
6350
brz view --delete --all
5708
6351
"""
5709
6352
5710
6353
_see_also = []
5718
6361
),
5719
6362
Option('name',
5720
6363
help='Name of the view to define, list or delete.',
5721
type=unicode,
6364
type=text_type,
5722
6365
),
5723
6366
Option('switch',
5724
6367
help='Name of the view to switch to.',
5725
type=unicode,
6368
type=text_type,
5726
6369
),
5727
6370
]
5728
6371
5732
6375
name=None,
5733
6376
switch=None,
5734
6377
):
5735
tree, file_list = tree_files(file_list, apply_view=False)
6378
tree, file_list = WorkingTree.open_containing_paths(file_list,
6379
apply_view=False)
5736
6380
current_view, view_dict = tree.views.get_view_info()
5737
6381
if name is None:
5738
6382
name = current_view
5739
6383
if delete:
5740
6384
if file_list:
5741
raise errors.BzrCommandError(
5742
"Both --delete and a file list specified")
6385
raise errors.BzrCommandError(gettext(
6386
"Both --delete and a file list specified"))
5743
6387
elif switch:
5744
raise errors.BzrCommandError(
5745
"Both --delete and --switch specified")
6388
raise errors.BzrCommandError(gettext(
6389
"Both --delete and --switch specified"))
5746
6390
elif all:
5747
6391
tree.views.set_view_info(None, {})
5748
self.outf.write("Deleted all views.\n")
6392
self.outf.write(gettext("Deleted all views.\n"))
5749
6393
elif name is None:
5750
raise errors.BzrCommandError("No current view to delete")
6394
raise errors.BzrCommandError(gettext("No current view to delete"))
5751
6395
else:
5752
6396
tree.views.delete_view(name)
5753
self.outf.write("Deleted '%s' view.\n" % name)
6397
self.outf.write(gettext("Deleted '%s' view.\n") % name)
5754
6398
elif switch:
5755
6399
if file_list:
5756
raise errors.BzrCommandError(
5757
"Both --switch and a file list specified")
6400
raise errors.BzrCommandError(gettext(
6401
"Both --switch and a file list specified"))
5758
6402
elif all:
5759
raise errors.BzrCommandError(
5760
"Both --switch and --all specified")
6403
raise errors.BzrCommandError(gettext(
6404
"Both --switch and --all specified"))
5761
6405
elif switch == 'off':
5762
6406
if current_view is None:
5763
raise errors.BzrCommandError("No current view to disable")
6407
raise errors.BzrCommandError(gettext("No current view to disable"))
5764
6408
tree.views.set_view_info(None, view_dict)
5765
self.outf.write("Disabled '%s' view.\n" % (current_view))
6409
self.outf.write(gettext("Disabled '%s' view.\n") % (current_view))
5766
6410
else:
5767
6411
tree.views.set_view_info(switch, view_dict)
5768
6412
view_str = views.view_display_str(tree.views.lookup_view())
5769
self.outf.write("Using '%s' view: %s\n" % (switch, view_str))
6413
self.outf.write(gettext("Using '{0}' view: {1}\n").format(switch, view_str))
5770
6414
elif all:
5771
6415
if view_dict:
5772
self.outf.write('Views defined:\n')
6416
self.outf.write(gettext('Views defined:\n'))
5773
6417
for view in sorted(view_dict):
5774
6418
if view == current_view:
5775
6419
active = "=>"
5778
6422
view_str = views.view_display_str(view_dict[view])
5779
6423
self.outf.write('%s %-20s %s\n' % (active, view, view_str))
5780
6424
else:
5781
self.outf.write('No views defined.\n')
6425
self.outf.write(gettext('No views defined.\n'))
5782
6426
elif file_list:
5783
6427
if name is None:
5784
6428
# No name given and no current view set
5785
6429
name = 'my'
5786
6430
elif name == 'off':
5787
raise errors.BzrCommandError(
5788
"Cannot change the 'off' pseudo view")
6431
raise errors.BzrCommandError(gettext(
6432
"Cannot change the 'off' pseudo view"))
5789
6433
tree.views.set_view(name, sorted(file_list))
5790
6434
view_str = views.view_display_str(tree.views.lookup_view())
5791
self.outf.write("Using '%s' view: %s\n" % (name, view_str))
6435
self.outf.write(gettext("Using '{0}' view: {1}\n").format(name, view_str))
5792
6436
else:
5793
6437
# list the files
5794
6438
if name is None:
5795
6439
# No name given and no current view set
5796
self.outf.write('No current view.\n')
6440
self.outf.write(gettext('No current view.\n'))
5797
6441
else:
5798
6442
view_str = views.view_display_str(tree.views.lookup_view(name))
5799
self.outf.write("'%s' view is: %s\n" % (name, view_str))
6443
self.outf.write(gettext("'{0}' view is: {1}\n").format(name, view_str))
5800
6444
5801
6445
5802
6446
class cmd_hooks(Command):
5816
6460
self.outf.write(" %s\n" %
5817
6461
(some_hooks.get_hook_name(hook),))
5818
6462
else:
5819
self.outf.write(" <no hooks installed>\n")
6463
self.outf.write(gettext(" <no hooks installed>\n"))
5820
6464
5821
6465
5822
6466
class cmd_remove_branch(Command):
5829
6473
5830
6474
Remove the branch at repo/trunk::
5831
6475
5832
bzr remove-branch repo/trunk
6476
brz remove-branch repo/trunk
5833
6477
5834
6478
"""
5835
6479
5836
6480
takes_args = ["location?"]
5837
6481
6482
takes_options = ['directory',
6483
Option('force', help='Remove branch even if it is the active branch.')]
6484
5838
6485
aliases = ["rmbranch"]
5839
6486
5840
def run(self, location=None):
5841
if location is None:
5842
location = "."
5843
branch = Branch.open_containing(location)[0]
5844
branch.bzrdir.destroy_branch()
5845
6487
def run(self, directory=None, location=None, force=False):
6488
br = open_nearby_branch(near=directory, location=location)
6489
if not force and br.bzrdir.has_workingtree():
6490
try:
6491
active_branch = br.bzrdir.open_branch(name="")
6492
except errors.NotBranchError:
6493
active_branch = None
6494
if (active_branch is not None and
6495
br.control_url == active_branch.control_url):
6496
raise errors.BzrCommandError(
6497
gettext("Branch is active. Use --force to remove it."))
6498
br.bzrdir.destroy_branch(br.name)
6499
5846
6500
5847
6501
class cmd_shelve(Command):
5848
6502
__doc__ = """Temporarily set aside some changes from the current tree.
5867
6521
5868
6522
You can put multiple items on the shelf, and by default, 'unshelve' will
5869
6523
restore the most recently shelved changes.
6524
6525
For complicated changes, it is possible to edit the changes in a separate
6526
editor program to decide what the file remaining in the working copy
6527
should look like. To do this, add the configuration option
6528
6529
change_editor = PROGRAM @new_path @old_path
6530
6531
where @new_path is replaced with the path of the new version of the
6532
file and @old_path is replaced with the path of the old version of
6533
the file. The PROGRAM should save the new file with the desired
6534
contents of the file in the working tree.
6535
5870
6536
"""
5871
6537
5872
6538
takes_args = ['file*']
5873
6539
5874
6540
takes_options = [
6541
'directory',
5875
6542
'revision',
5876
6543
Option('all', help='Shelve all changes.'),
5877
6544
'message',
5878
6545
RegistryOption('writer', 'Method to use for writing diffs.',
5879
bzrlib.option.diff_writer_registry,
6546
breezy.option.diff_writer_registry,
5880
6547
value_switches=True, enum_switch=False),
5881
6548
5882
6549
Option('list', help='List shelved changes.'),
5883
6550
Option('destroy',
5884
6551
help='Destroy removed changes instead of shelving them.'),
5885
6552
]
5886
_see_also = ['unshelve']
6553
_see_also = ['unshelve', 'configuration']
5887
6554
5888
6555
def run(self, revision=None, all=False, file_list=None, message=None,
5889
writer=None, list=False, destroy=False):
6556
writer=None, list=False, destroy=False, directory=None):
5890
6557
if list:
5891
return self.run_for_list()
5892
from bzrlib.shelf_ui import Shelver
6558
return self.run_for_list(directory=directory)
6559
from .shelf_ui import Shelver
5893
6560
if writer is None:
5894
writer = bzrlib.option.diff_writer_registry.get()
6561
writer = breezy.option.diff_writer_registry.get()
5895
6562
try:
5896
6563
shelver = Shelver.from_args(writer(sys.stdout), revision, all,
5897
file_list, message, destroy=destroy)
6564
file_list, message, destroy=destroy, directory=directory)
5898
6565
try:
5899
6566
shelver.run()
5900
6567
finally:
5902
6569
except errors.UserAbort:
5903
6570
return 0
5904
6571
5905
def run_for_list(self):
5906
tree = WorkingTree.open_containing('.')[0]
5907
tree.lock_read()
5908
self.add_cleanup(tree.unlock)
6572
def run_for_list(self, directory=None):
6573
if directory is None:
6574
directory = u'.'
6575
tree = WorkingTree.open_containing(directory)[0]
6576
self.add_cleanup(tree.lock_read().unlock)
5909
6577
manager = tree.get_shelf_manager()
5910
6578
shelves = manager.active_shelves()
5911
6579
if len(shelves) == 0:
5912
note('No shelved changes.')
6580
note(gettext('No shelved changes.'))
5913
6581
return 0
5914
6582
for shelf_id in reversed(shelves):
5915
6583
message = manager.get_metadata(shelf_id).get('message')
5929
6597
5930
6598
takes_args = ['shelf_id?']
5931
6599
takes_options = [
6600
'directory',
5932
6601
RegistryOption.from_kwargs(
5933
6602
'action', help="The action to perform.",
5934
6603
enum_switch=False, value_switches=True,
5942
6611
]
5943
6612
_see_also = ['shelve']
5944
6613
5945
def run(self, shelf_id=None, action='apply'):
5946
from bzrlib.shelf_ui import Unshelver
5947
unshelver = Unshelver.from_args(shelf_id, action)
6614
def run(self, shelf_id=None, action='apply', directory=u'.'):
6615
from .shelf_ui import Unshelver
6616
unshelver = Unshelver.from_args(shelf_id, action, directory=directory)
5948
6617
try:
5949
6618
unshelver.run()
5950
6619
finally:
5957
6626
By default, only unknown files, not ignored files, are deleted. Versioned
5958
6627
files are never deleted.
5959
6628
5960
Another class is 'detritus', which includes files emitted by bzr during
6629
Another class is 'detritus', which includes files emitted by brz during
5961
6630
normal operations and selftests. (The value of these files decreases with
5962
6631
time.)
5963
6632
5966
6635
5967
6636
To check what clean-tree will do, use --dry-run.
5968
6637
"""
5969
takes_options = [Option('ignored', help='Delete all ignored files.'),
5970
Option('detritus', help='Delete conflict files, merge'
6638
takes_options = ['directory',
6639
Option('ignored', help='Delete all ignored files.'),
6640
Option('detritus', help='Delete conflict files, merge and revert'
5971
6641
' backups, and failed selftest dirs.'),
5972
6642
Option('unknown',
5973
help='Delete files unknown to bzr (default).'),
6643
help='Delete files unknown to brz (default).'),
5974
6644
Option('dry-run', help='Show files to delete instead of'
5975
6645
' deleting them.'),
5976
6646
Option('force', help='Do not prompt before deleting.')]
5977
6647
def run(self, unknown=False, ignored=False, detritus=False, dry_run=False,
5978
force=False):
5979
from bzrlib.clean_tree import clean_tree
6648
force=False, directory=u'.'):
6649
from .clean_tree import clean_tree
5980
6650
if not (unknown or ignored or detritus):
5981
6651
unknown = True
5982
6652
if dry_run:
5983
6653
force = True
5984
clean_tree('.', unknown=unknown, ignored=ignored, detritus=detritus,
5985
dry_run=dry_run, no_prompt=force)
6654
clean_tree(directory, unknown=unknown, ignored=ignored,
6655
detritus=detritus, dry_run=dry_run, no_prompt=force)
5986
6656
5987
6657
5988
6658
class cmd_reference(Command):
6002
6672
if path is not None:
6003
6673
branchdir = path
6004
6674
tree, branch, relpath =(
6005
bzrdir.BzrDir.open_containing_tree_or_branch(branchdir))
6675
controldir.ControlDir.open_containing_tree_or_branch(branchdir))
6006
6676
if path is not None:
6007
6677
path = relpath
6008
6678
if tree is None:
6032
6702
self.outf.write('%s %s\n' % (path, location))
6033
6703
6034
6704
6705
class cmd_export_pot(Command):
6706
__doc__ = """Export command helps and error messages in po format."""
6707
6708
hidden = True
6709
takes_options = [Option('plugin',
6710
help='Export help text from named command '\
6711
'(defaults to all built in commands).',
6712
type=str),
6713
Option('include-duplicates',
6714
help='Output multiple copies of the same msgid '
6715
'string if it appears more than once.'),
6716
]
6717
6718
def run(self, plugin=None, include_duplicates=False):
6719
from .export_pot import export_pot
6720
export_pot(self.outf, plugin, include_duplicates)
6721
6722
6035
6723
def _register_lazy_builtins():
6036
6724
# register lazy builtins from other modules; called at startup and should
6037
6725
# be only called once.
6038
6726
for (name, aliases, module_name) in [
6039
('cmd_bundle_info', [], 'bzrlib.bundle.commands'),
6040
('cmd_dpush', [], 'bzrlib.foreign'),
6041
('cmd_version_info', [], 'bzrlib.cmd_version_info'),
6042
('cmd_resolve', ['resolved'], 'bzrlib.conflicts'),
6043
('cmd_conflicts', [], 'bzrlib.conflicts'),
6044
('cmd_sign_my_commits', [], 'bzrlib.sign_my_commits'),
6727
('cmd_bundle_info', [], 'breezy.bundle.commands'),
6728
('cmd_config', [], 'breezy.config'),
6729
('cmd_dpush', [], 'breezy.foreign'),
6730
('cmd_version_info', [], 'breezy.cmd_version_info'),
6731
('cmd_resolve', ['resolved'], 'breezy.conflicts'),
6732
('cmd_conflicts', [], 'breezy.conflicts'),
6733
('cmd_ping', [], 'breezy.smart.ping'),
6734
('cmd_sign_my_commits', [], 'breezy.commit_signature_commands'),
6735
('cmd_verify_signatures', [], 'breezy.commit_signature_commands'),
6736
('cmd_test_script', [], 'breezy.cmd_test_script'),
6045
6737
]:
6046
6738
builtin_command_registry.register_lazy(name, aliases, module_name)
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0